* input/regression/tuplet-properties.ly:

* input/regression/tuplet-nest.ly: Fix.

* lilypond-font-lock.el (LilyPond-font-lock-keywords):
* input/test/improv.ly:
* input/test/cautionaries.ly: Accidentals -> Accidental.

* input/test/add-text-script.ly: Bugfix.  How did this ever work?

diff --git a/ChangeLog b/ChangeLog
index 773f7f987b55db47f059364967d643095e38af01..1e940cf4597493b01f62681adf16705b397c4b61 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2002-08-11  Jan Nieuwenhuizen  <janneke@gnu.org>
 
+       * input/regression/tuplet-properties.ly:
+       * input/regression/tuplet-nest.ly: Fix.
+
+       * lilypond-font-lock.el (LilyPond-font-lock-keywords):
+       * input/test/improv.ly:
+       * input/test/cautionaries.ly: Accidentals -> Accidental.
+
+       * input/test/add-text-script.ly: Bugfix.  How did this ever work?
+
        * Documentation/windows/installing.texi: 
        * Documentation/windows/compiling.texi:
        * cygwin/README: Update to reflect new binary release setup and

diff --git a/input/regression/tuplet-nest.ly b/input/regression/tuplet-nest.ly
index 82191457844316207f48a542a3517cc2c5c4b57b..d59418ea07737b4c9638b9e1c56382ba1d9ad79d 100644 (file)
--- a/input/regression/tuplet-nest.ly
+++ b/input/regression/tuplet-nest.ly
@@ -1,5 +1,5 @@
 \header {
-  texidoc="Manual hack for nested tuplets"
+  texidoc="Manual hack for nested tuplets, move outer tuplet up."
 }
 
 #(define (make-text-checker-once text)
@@ -17,7 +17,7 @@
     \property Voice.tupletNumberFormatFunction = #fraction-tuplet-formatter
 
     \outputproperty #(make-text-checker-once "2:3")
-      #'extra-offset = #'(0 . 1)
+      #'extra-offset = #'(0 . 1.5)
     \times 2/3 {
       \times 2/3 {
         a a a

diff --git a/input/regression/tuplet-properties.ly b/input/regression/tuplet-properties.ly
index 6ab3f337486e1731ccf3b6f48b9bb6f25709635d..740e45fb90a8b22120a360fdfa84b2564c73c953 100644 (file)
--- a/input/regression/tuplet-properties.ly
+++ b/input/regression/tuplet-properties.ly
@@ -34,7 +34,7 @@ NB should have no bracket, B should have bracket.
        \times 4/6 { c_"shorter, no edges" f b  b f c}  
        \property Voice.TupletBracket \revert #'edge-height
        \property Voice.TupletBracket \revert #'shorten-pair
-       \property Voice.TupletBracket \override #'edge-width = #'(-0.5 . 0.5)
+       \property Voice.TupletBracket \override #'edge-widen = #'(-0.5 . 0.5)
        \times 2/3 { b^""^""^"angled edges" b b }
        \property Voice.TupletBracket \revert #'direction
        \times 2/3 { b b b }

diff --git a/input/test/add-staccato.ly b/input/test/add-staccato.ly
index 141d908e34b5efdcf968f94e4f2941b5582b9a9d..bbf30f6feff69048fda8a3c007ec746b044f9aa7 100644 (file)
--- a/input/test/add-staccato.ly
+++ b/input/test/add-staccato.ly
@@ -7,25 +7,23 @@ one would not use scm constructs.  See separate-staccato.ly first."
 } 
 
 #(define (make-script x)
-  (let ((m (ly-make-music "Articulation_req")))
-     ;;(ly-set-mus-property! m 'articulation-type 'staccato)
-     ;; urg
+   (let ((m (ly-make-music "Articulation_req")))
      (ly-set-mus-property! m 'articulation-type x)
      (ly-set-mus-property! m 'script x)
      m))
-     
+    
 #(define (add-script m x)
-  (if (equal? (ly-music-name m) "Request_chord")
-      (ly-set-mus-property! m 'elements
-                          (cons (make-script x)
-                                (ly-get-mus-property m 'elements)))
-      
-      (let ((es (ly-get-mus-property m 'elements))
-           (e (ly-get-mus-property m 'element)) )
-       (map (lambda (y) (add-script y x)) es)
-       (if (music? e)
-           (add-script e x))))
-  m)
+   (if (equal? (ly-music-name m) "Request_chord")
+       (ly-set-mus-property! m 'elements
+                           (cons (make-script x)
+                                 (ly-get-mus-property m 'elements)))
+
+       (let ((es (ly-get-mus-property m 'elements))
+            (e (ly-get-mus-property m 'element)) )
+        (map (lambda (y) (add-script y x)) es)
+        (if (music? e)
+            (add-script e x))))
+   m)
 
 #(define (add-staccato m)
    (add-script m "staccato"))

diff --git a/input/test/add-text-script.ly b/input/test/add-text-script.ly
index 0e79aac6dfe6ca83eb043ba65ae21e3bd98b53ef..b459467c84c1e6b8ce2d557538cd30710c33b9f8 100644 (file)
--- a/input/test/add-text-script.ly
+++ b/input/test/add-text-script.ly
@@ -28,6 +28,6 @@ create, then write a function that will build the structure for you."
    m)
 
 \score {
-  \apply #(lambda (x) (add-script x "6") (display x) x ) \notes { c4-3 }
+  \apply #(lambda (x) (add-text-script x "6") (display x) x ) \notes { c4-3 }
 }
 

diff --git a/input/test/cautionaries.ly b/input/test/cautionaries.ly
index f67ee545899b3ce95faa4b3ec31a5b3ace7a61ee..79344c0a9191ce9fb7ab1175cca8ea786fb9d948 100644 (file)
--- a/input/test/cautionaries.ly
+++ b/input/test/cautionaries.ly
@@ -3,11 +3,11 @@
 \score { \notes \context Staff \transpose c''' {
   \key d \major
   \property Staff.autoReminders = #'cautionary
-  \property Staff.Accidentals \override #'font-relative-size = #0
+  \property Staff.Accidental \override #'font-relative-size = #0
   <dis1 c> cis2 d
-  \property Staff.Accidentals \override #'cautionary-size = #-1
+  \property Staff.Accidental \override #'cautionary-size = #-1
   <dis1 c> cis2 d
-  \property Staff.Accidentals \override #'paren-cautionaries = ##f
+  \property Staff.Accidental \override #'paren-cautionaries = ##f
   <dis1 c> cis2 d
 
 }

diff --git a/input/test/improv.ly b/input/test/improv.ly
index c85f08e983444307f85202b44669cb19c1f49d62..c3a5c93551d8209dac714e00d17014773d4b5aa4 100644 (file)
--- a/input/test/improv.ly
+++ b/input/test/improv.ly
@@ -34,7 +34,7 @@ global = \notes { s1*3 \bar "|." }
       \consists "Accidental_engraver"
       squashedPosition = #0
       NoteHead \override #'style = #'slash
-      Accidentals \override #'transparent = ##t
+      Accidental \override #'transparent = ##t
     }
     \translator {
       \VoiceContext

diff --git a/lilypond-font-lock.el b/lilypond-font-lock.el
index 044f821b0494d87523bdb74749eefa14d7de4622..e2ff2655f5c1110fbcb3b6daa0a32e965645c7f4 100644 (file)
--- a/lilypond-font-lock.el
+++ b/lilypond-font-lock.el
@@ -89,7 +89,7 @@
 "\\(archi\\|bassi\\|legni\\|ottoni\\|timpani\\|viole\\|violini\\)\\(Group\\)" ; *Group
 "melisma\\(End\\)?" "staff\\(One\\|Two\\)?" "rests\\(II\\)?" "specialKey"
 "noBreak" "paperTwentysix" "endHorizScript" "FontBody" "text(I)+"
-"\\(modern\\|forget\\)Accidentals" ; *Accidentals
+"\\(modern\\|forget\\)Accidental" ; *Accidentals
 "noResetKey" "modern\\(Voice\\)?Cautionaries" "unaCorda" "treCorde"
 
                       ))
@@ -97,7 +97,7 @@
   (reservedwords '(
 
 ;; Other words which look nicer when colored
-"Accidentals" "autoBeamSettings" "BarLine" "Beam"
+"Accidental" "autoBeamSettings" "BarLine" "Beam"
 "ChordName\\([s]?\\|s.[a-zA-Z]*\\)" "Dots" "DynamicText"
 "FiguredBass" "Hairpin" "\\(\\(Inner\\)?Choir\\|Grand\\|Piano\\|Tab\\)Staff"
 "Slur" "Stem" "SpacingSpanner" "System\\(StartDelimiter\\)?"