From 97e14e67c54fb81ba7ecbc4d82754b77249da11c Mon Sep 17 00:00:00 2001 From: fred Date: Wed, 27 Mar 2002 02:03:36 +0000 Subject: [PATCH] lilypond-1.5.17 --- Documentation/topdocs/AUTHORS.texi | 2 +- config.hh.in | 3 ++ configure | 2 +- configure.in | 2 +- lilypond-mode.el | 47 ++++++++++++++++++++++++++---- modules/midi.c | 2 ++ 6 files changed, 49 insertions(+), 9 deletions(-) diff --git a/Documentation/topdocs/AUTHORS.texi b/Documentation/topdocs/AUTHORS.texi index a6ec5460ca..600c935c35 100644 --- a/Documentation/topdocs/AUTHORS.texi +++ b/Documentation/topdocs/AUTHORS.texi @@ -84,7 +84,7 @@ list is alphabetically ordered. @item @email{august@@infran.ru, August S.Sigov} Russian translation @item @email{rune@@zedeler.dk, Rune Zedeler} - Drum notation + Drum notation, beaming and accidental fixes @end itemize @bye diff --git a/config.hh.in b/config.hh.in index aa81bd7190..972377ac50 100644 --- a/config.hh.in +++ b/config.hh.in @@ -41,6 +41,9 @@ /* define if you have kpse_find_tfm */ #define HAVE_KPSE_FIND_TFM 0 +/* define if you have python2.1/Python.h header */ +#define HAVE_PYTHON2_1_PYTHON_H 0 + /* define if you have python2.0/Python.h header */ #define HAVE_PYTHON2_0_PYTHON_H 0 diff --git a/configure b/configure index 3f9f6b4dcd..a46decc286 100755 --- a/configure +++ b/configure @@ -3497,7 +3497,7 @@ else fi -for ac_hdr in python2.0/Python.h python2/Python.h python/Python.h python1.5/Python.h Python.h +for ac_hdr in python2.1/Python.h python2.0/Python.h python2/Python.h python/Python.h python1.5/Python.h Python.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 diff --git a/configure.in b/configure.in index e64d0e859d..1597831177 100644 --- a/configure.in +++ b/configure.in @@ -53,7 +53,7 @@ AC_STEPMAKE_MAKEINFO AC_PATH_PROG(PERL, perl, error) -AC_HAVE_HEADERS(python2.0/Python.h python2/Python.h python/Python.h python1.5/Python.h Python.h) +AC_HAVE_HEADERS(python2.1/Python.h python2.0/Python.h python2/Python.h python/Python.h python1.5/Python.h Python.h) AC_STEPMAKE_END diff --git a/lilypond-mode.el b/lilypond-mode.el index 565aa04943..60e1a9c2cf 100644 --- a/lilypond-mode.el +++ b/lilypond-mode.el @@ -5,10 +5,10 @@ ;;; ;;; (c) 1999--2001 Jan Nieuwenhuizen ;;; -;;; Changed 29th Aug 2001 Heikki Junes -;;; * Add PS-compilation, PS-viewing and MIDI-play -;;; Changed 12th Sep 2001 Heikki Junes -;;; * Keyboard shortcuts +;;; Changed 2001 Heikki Junes +;;; * Add PS-compilation, PS-viewing and MIDI-play (29th Aug 2001) +;;; * Keyboard shortcuts (12th Sep 2001) +;;; * Inserting tags, inspired on sgml-mode (11th Oct 2001) ;;; Inspired on auctex @@ -426,10 +426,40 @@ command." (define-key LilyPond-mode-map "\C-c\C-v" 'LilyPond-command-view) (define-key LilyPond-mode-map "\C-c\C-p" 'LilyPond-command-viewps) (define-key LilyPond-mode-map "\C-c\C-m" 'LilyPond-command-midi) + (define-key LilyPond-mode-map "\C-cn" 'lilypond-notes) + (define-key LilyPond-mode-map "\C-cs" 'lilypond-score) ) ;;; Menu Support +(define-skeleton lilypond-notes + "Lilypond notes tag." + nil +; (if (bolp) nil ?\n) + "\\notes" + (if (y-or-n-p "Set \"\\relative\" attribute? ") + (concat " \\relative " (skeleton-read "Relative: " "" str))) + " { " _ " }") + +(define-skeleton lilypond-score + "Lilypond score tag." + nil + (if (bolp) nil ?\n) + "\\score {\n" + " " _ "\n" + " \\paper { }\n" + (if (y-or-n-p "Insert \"\\header\" field? ") + (concat " \\header {\n " + (skeleton-read "Piece: " "piece = " str) "\n" + (if (y-or-n-p "Insert \"opus\" field? ") + (concat " " (skeleton-read "Opus: " "opus = " str) "\n")) + " }\n")) + (if (y-or-n-p "Insert \"\\midi\" field? ") + (concat " \\midi { " + (skeleton-read "Midi: " "\\tempo 4 = " str) + " }\n")) + "}\n") + (defun LilyPond-command-menu-entry (entry) ;; Return LilyPond-command-alist ENTRY as a menu item. (let ((name (car entry))) @@ -458,6 +488,12 @@ command." [ "Region" LilyPond-command-select-region :keys "C-c C-r" :style radio :selected (eq LilyPond-command-current 'LilyPond-command-region) ])) + '(("Insert" + [ "\\notes..." lilypond-notes + :keys "C-c n" ] + [ "\\score..." lilypond-score + :keys "C-c s" ] + )) ; (let ((file 'LilyPond-command-on-current)) ; (mapcar 'LilyPond-command-menu-entry LilyPond-command-alist)) ;;; Some kind of mapping which includes :keys might be more elegant @@ -471,8 +507,7 @@ command." '([ "View" (LilyPond-command (LilyPond-command-menu "View") 'LilyPond-master-file) :keys "C-c C-v"]) '([ "ViewPS" (LilyPond-command (LilyPond-command-menu "ViewPS") 'LilyPond-master-file) :keys "C-c C-p"]) '([ "Midi" (LilyPond-command (LilyPond-command-menu "Midi") 'LilyPond-master-file) :keys "C-c C-m"]) - )) - + )) (defconst LilyPond-imenu-generic-re "^\\([a-zA-Z_][a-zA-Z0-9_]*\\) *=" "Regexp matching Identifier definitions.") diff --git a/modules/midi.c b/modules/midi.c index e3cbea7201..e1153f23d7 100644 --- a/modules/midi.c +++ b/modules/midi.c @@ -23,6 +23,8 @@ midi.parse (s) /* urg */ #if HAVE_PYTHON2_PYTHON_H #include +#elif HAVE_PYTHON2_1_PYTHON_H +#include #elif HAVE_PYTHON2_0_PYTHON_H #include #elif HAVE_PYTHON1_5_PYTHON_H -- 2.39.5