heikkis patch

diff --git a/ChangeLog b/ChangeLog
index cd22684d9478265b70db7743d3ad72a61bb84f90..bf5d8fa7a441b0464f1d7856d96487219dd9ebe1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,11 +1,16 @@
+2002-04-13  Heikki Junes <hjunes@cc.hut.fi>
+
+       * lilypond-mode.el: Prevent recoloring strings and comments.
+
+       * lilypond-font-lock.el: Handle block comments: block comments
+       can have also ordinary comments inside.
+       
 2002-04-13  Han-Wen  <hanwen@cs.uu.nl>
 
        * input/regression/tie-grace.ly: new file.
 
        * lily/tie-engraver.cc (create_grobs): fix tied graces.
 
-2002-04-13  Han-Wen  <hanwen@cs.uu.nl>
-
        * lily/note-spacing.cc (stem_dir_correction): set fixed space for
        knee correction. Fixes tight spacing for knees.
 

diff --git a/VERSION b/VERSION
index 9917c63e221eeb70c3c9b7f44b7d63834fb43b79..3fbe9057cd5f18eb27fc6dd0151550efe69c9244 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=5
 PATCH_LEVEL=52
-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-font-lock.el b/lilypond-font-lock.el
index d67bc28a0e5bc0c088c445f93466538474950ea0..45f2e47b034f15f428fbdc469e6c1643614e2fef 100644 (file)
--- a/lilypond-font-lock.el
+++ b/lilypond-font-lock.el
@@ -9,8 +9,8 @@
 ;; Author: 1995-1996 Barry A. Warsaw
 ;;         1992-1994 Tim Peters
 ;; Created:       Feb 1992
-;; Version:       1.5.51
-;; Last Modified: 12APR2002
+;; Version:       1.5.52
+;; Last Modified: 13APR2002
 ;; Keywords: lilypond languages music notation
 
 ;; This software is provided as-is, without express or implied
@@ -150,11 +150,11 @@
 ;; highlight scheme; Urgh. should count '(':s, then continue up to last ')'
       '("[_^-]?#\\(#[ft]\\|['`](lines[^)]*))\\|['`][a-zA-Z-:]+\\|['`]?([^)]*)\\|-?[0-9.]+\\|\"[^\"]*\"\\)" 0 font-lock-string-face t)
 
-;; (re)highlight strings
+;; highlight strings
       '("[_^-]?\"[^\"]*\"" 0 font-lock-string-face t)
 
-;; (re)highlight comments
-      '("\\(%.*\\)" 0 font-lock-comment-face t)
+;; highlight (block) comments; urgh. block comments should be updatable
+      '("\\(%\\({[^%]*%\\(}\\|\\([^}][^%]*%\\)+}\\)\\|.*\\)\\)" 0 font-lock-comment-face t)
 
       )
     )

diff --git a/lilypond-mode.el b/lilypond-mode.el
index 5914ed201782c0bd434e66197465fc4da7837187..1e93d4cbcdbd0b9726b6b8810fd68b5f41682b87 100644 (file)
--- a/lilypond-mode.el
+++ b/lilypond-mode.el
@@ -25,7 +25,7 @@
 (require 'easymenu)
 (require 'compile)
 
-(defconst LilyPond-version "1.5.51"
+(defconst LilyPond-version "1.5.52"
   "`LilyPond-mode' version number.")
 
 (defconst LilyPond-help-address "bug-lilypond@gnu.org"
@@ -654,6 +654,10 @@ LilyPond-xdvi-command\t\tcommand to display dvi files -- bit superfluous"
   (make-local-variable 'font-lock-defaults)
   (setq font-lock-defaults '(LilyPond-font-lock-keywords))
 
+  ; string and comments are fontified explicitly
+  (make-local-variable 'font-lock-keywords-only)
+  (setq font-lock-keywords-only t)
+
   (make-local-variable 'paragraph-separate)
   (setq paragraph-separate "^[ \t]*$")