''

diff --git a/ChangeLog b/ChangeLog
index 610650b20adfff51027a2da05321ffb9a1492eef..4ff23b3a4303c14ce87d3f5003ec49ec052acc96 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2002-04-08  Chris Jackson <chris@fluffhouse.org.uk>
+
+       * lilypond-indent.el: Bugfix of indentation of final point in buffer
+
+2002-04-09  Heikki Junes <hjunes@cc.hut.fi>
+
+       * lilypond-mode.el: new command: LilyPond-un-comment-region.
+       Added 2Midi to "Command"-menu. Inspired by latex.el and tex.el: 
+       separate "Command"-menu and "LilyPond"-menu. Added "Miscellanous"-
+       submenu to "LilyPond"-menu.
+
 2002-04-08  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
        * input/regression/script-stack-order.ly: new file.

diff --git a/VERSION b/VERSION
index 854cc6fc0493c500241e9e653c34324406bfc27a..c7e7eef60be4e5e70388a13f548226ac40933254 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=5
 PATCH_LEVEL=51
-MY_PATCH_LEVEL=
+MY_PATCH_LEVEL=hjj1
 
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a

diff --git a/lilypond-indent.el b/lilypond-indent.el
index 5427cc0dfb882369b06bd2515001cb7a56b5073b..06cfd50e3a4ec55b5cd29d9059db1876ed37b5f8 100644 (file)
--- a/lilypond-indent.el
+++ b/lilypond-indent.el
@@ -331,7 +331,8 @@ slur-paren-p defaults to nil.
   (let ( (test-point (point))
         (level 0) )
     (save-excursion 
-      (if (or (and (= (char-after (point)) ?\()
+      (if (or (and (/= (point) (point-max))
+                  (= (char-after (point)) ?\()
                   (or (= (char-after (- (point) 1)) ?#)
                       (and (= (char-after (- (point) 2)) ?#)
                            (= (char-after (- (point) 1)) ?`))))

diff --git a/lilypond-mode.el b/lilypond-mode.el
index c4e4bb96a134bbb0557835bfff132bb88142912d..af14b7c5b2d5da1bc8ee6f446b4bfe53d98a6cae 100644 (file)
--- a/lilypond-mode.el
+++ b/lilypond-mode.el
@@ -2,7 +2,7 @@
 ;;; lilypond-mode.el --- Major mode for editing GNU LilyPond music scores
 ;;;
 ;;; source file of the GNU LilyPond music typesetter
-;;; 
+;;;  
 ;;; (c) 1999--2001 Jan Nieuwenhuizen <janneke@gnu.org>
 ;;; 
 ;;; Changed 2001 Heikki Junes <heikki.junes@hut.fi>
@@ -25,7 +25,7 @@
 (require 'easymenu)
 (require 'compile)
 
-(defconst LilyPond-version "1.5.28"
+(defconst LilyPond-version "1.5.51"
   "`LilyPond-mode' version number.")
 
 (defconst LilyPond-help-address "bug-lilypond@gnu.org"
@@ -369,6 +369,11 @@ Must be the car of an entry in `LilyPond-command-alist'."
                ".midi"))
      "Midi")))
 
+(defun LilyPond-un-comment-region (start end level)
+  "Remove up to LEVEL comment characters from each line in the region."
+  (interactive "*r\np") 
+  (comment-region start end (- level)))
+
 ;; FIXME, this is broken
 (defun LilyPond-region-file (begin end)
   (let (
@@ -487,6 +492,7 @@ command."
   (define-key LilyPond-mode-map "\C-c\C-m" 'LilyPond-command-next-midi)
   (define-key LilyPond-mode-map "\C-cn" 'LilyPond-insert-tag-notes)
   (define-key LilyPond-mode-map "\C-cs" 'LilyPond-insert-tag-score)
+  (define-key LilyPond-mode-map "\C-c:" 'LilyPond-un-comment-region)
   (define-key LilyPond-mode-map "\C-c;" 'comment-region)
   (define-key LilyPond-mode-map ")" 'LilyPond-electric-close-paren)
   (define-key LilyPond-mode-map ">" 'LilyPond-electric-close-paren)
@@ -537,7 +543,7 @@ command."
           (vector name (list 'LilyPond-command-menu name) t)))))
 
 
-(easy-menu-define LilyPond-mode-menu
+(easy-menu-define LilyPond-command-menu
     LilyPond-mode-map
     "Menu used in LilyPond mode."
   (append '("Command")
@@ -551,12 +557,6 @@ command."
             [ "Region" LilyPond-command-select-region
               :keys "C-c C-r" :style radio
               :selected (eq LilyPond-command-current 'LilyPond-command-region) ]))
-         '(("Insert"
-            [ "\\notes..."  LilyPond-insert-tag-notes
-              :keys "C-c n" ]
-            [ "\\score..."  LilyPond-insert-tag-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
@@ -564,6 +564,7 @@ command."
          '([ "TeX" (LilyPond-command (LilyPond-command-menu "TeX") 'LilyPond-master-file) ])
          '([ "2Dvi" (LilyPond-command (LilyPond-command-menu "2Dvi") 'LilyPond-master-file) :keys "C-c C-d"])
          '([ "2PS" (LilyPond-command (LilyPond-command-menu "2PS") 'LilyPond-master-file) :keys "C-c C-f"])
+         '([ "2Midi" (LilyPond-command (LilyPond-command-menu "2Midi") 'LilyPond-master-file)])
          '([ "Book" (LilyPond-command (LilyPond-command-menu "Book") 'LilyPond-master-file) ])
          '([ "LaTeX" (LilyPond-command (LilyPond-command-menu "LaTeX") 'LilyPond-master-file) ])
          '([ "SmartView" (LilyPond-command (LilyPond-command-menu "SmartView") 'LilyPond-master-file) :keys "C-c C-s"])
@@ -572,6 +573,20 @@ command."
          '([ "Midi (off)" (LilyPond-command-next-midi) :keys "C-c C-m"])
          ))
 
+(easy-menu-define LilyPond-mode-menu
+  LilyPond-mode-map
+  "Menu used in LilyPond mode."
+  (append '("LilyPond")
+         '(("Insert"
+            [ "\\notes..."  LilyPond-insert-tag-notes t]
+            [ "\\score..."  LilyPond-insert-tag-score t]
+            ))
+         '(("Miscellaneous"
+            ["Uncomment Region" LilyPond-un-comment-region t]
+            ["Comment Region" comment-region t]
+            ))
+         ))
+
 (defconst LilyPond-imenu-generic-re "^\\([a-zA-Z_][a-zA-Z0-9_]*\\) *="
   "Regexp matching Identifier definitions.")