release commit

diff --git a/ChangeLog b/ChangeLog
index 10940a351dc54cf43ff696a498d16cd143af8502..29e321ec936a7b236adac7a57140dd0ce6934ed0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,12 @@
 2004-02-18  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
+       * VERSION: release 2.1.25
+
        * scm/define-translator-properties.scm
        (all-user-translation-properties): add printOctaveNames
 
-       * ly/engraver-init.ly: remove Note_event_swallower.
+       * ly/engraver-init.ly: remove Note_event_swallower from
+       NoteNamesContext.
 
        * lily/note-name-engraver.cc (process_music): new property
        printOctaveNames

diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely
index 697f83eeeab1c63d9e84d66296822b3349cdc9ee..a31f1cabce3ee59869b101777ff1c8eabde49736 100644 (file)
--- a/Documentation/user/refman.itely
+++ b/Documentation/user/refman.itely
@@ -1597,7 +1597,7 @@ instead.
      @code{default}) are typeset as cautionary accidentals.
      They are printed in reduced size or with parentheses:
 @lilypond[raggedright,fragment,verbatim]
-      modern-cautionary
+      #(set-accidental-style 'modern-cautionary)
       cis' c'' cis'2 | c'' c'
 @end lilypond
 
@@ -1650,7 +1650,7 @@ some of them are typeset as cautionaries.
 @end table
 
 @node Customized accidental rules
-@subsection  Customized accidental rules
+@subsection Customized accidental rules
 
 For determining when to print an accidental, several different rules
 are tried.  The rule that gives the highest number of accidentals is

diff --git a/input/mutopia/F.Schubert/morgenlied.ly b/input/mutopia/F.Schubert/morgenlied.ly
index e6b28ad4d31bd6a782f332f94a2de0bc11bf5a41..50409a78eabf3646eb5b850c432ed3fa967c340a 100644 (file)
--- a/input/mutopia/F.Schubert/morgenlied.ly
+++ b/input/mutopia/F.Schubert/morgenlied.ly
@@ -27,7 +27,7 @@ been lowered
 
 }
 
-\version "2.1.23"
+\version "2.1.25"
 manuscriptBreak = { \break }
 
 
@@ -103,7 +103,7 @@ secondVerse = \lyrics {
     }
 
 pianoRH = \notes \relative c''' \repeat volta 2 {
-    \modernAccidentals
+    #(set-accidental-style 'modern)
     g16(_\p fis a g fis g f e d c b a ) | 
     <g e>8( <es fis a> <d f b> <c e c'>) r8 r | 
     r8 c'( e,) f r a |
@@ -124,7 +124,7 @@ pianoRH = \notes \relative c''' \repeat volta 2 {
 }
 
 pianoLH = \notes \relative c'' \repeat volta 2 {
-    \modernAccidentals
+    #(set-accidental-style 'modern)
     g16( fis a g fis g f e d c b a) | 
     \clef bass g4.( c,8) r r
     \clef treble r4 <bes' c>8([ <a c>)] r <f c'> |
@@ -151,7 +151,7 @@ pianoLH = \notes \relative c'' \repeat volta 2 {
 
     << \time 6/8
      \new Staff <<
-        \context Staff \modernAccidentals
+        \context Staff #(set-accidental-style 'modern)
         \melody >>
         \lyricsto "singer" \new Lyrics \firstVerse
         \lyricsto "singer" \new Lyrics \secondVerse

diff --git a/input/mutopia/R.Schumann/romanze-op28-2.ly b/input/mutopia/R.Schumann/romanze-op28-2.ly
index 1ca66490025557e309f2975343c44aa67ff89036..011662e0d49b7683aa879fb7cf0ea0fefe926682 100644 (file)
--- a/input/mutopia/R.Schumann/romanze-op28-2.ly
+++ b/input/mutopia/R.Schumann/romanze-op28-2.ly
@@ -4,7 +4,7 @@
 \include "deutsch.ly"
 
 #(set-global-staff-size 16)
-\version "2.1.23"
+\version "2.1.25"
 
 \header {
   title = "Romanzen"
@@ -238,7 +238,7 @@ leftb = \notes \transpose c cis {
 
 \score { \notes
   \context PianoStaff <<
-    \pianoCautionaries
+    #(set-accidental-style 'piano-cautionary)
     \override PianoStaff.NoteCollision   #'merge-differently-dotted = ##t
     \set PianoStaff.connectArpeggios = ##t
     \override PianoStaff.Arpeggio   #'print-function = \arpeggioBracket

diff --git a/input/regression/spacing-accidental-stretch.ly b/input/regression/spacing-accidental-stretch.ly
index 2db2bde6934080ec971541bb7be8ebc7a40a8407..1366f06a2d0360e53fef5f8344cb2e8f95180687 100644 (file)
--- a/input/regression/spacing-accidental-stretch.ly
+++ b/input/regression/spacing-accidental-stretch.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.22"
+\version "2.1.25"
 
 \header {
     texidoc = "Accidentals don't influence the amount of stretchable space. "
@@ -7,7 +7,7 @@
 
 \score {
      \notes \relative c'' \context GrandStaff {
-       \pianoCautionaries
+       #(set-accidental-style 'piano-cautionary)
        d16 d d d d d cis d 
        
      }

diff --git a/input/test/beam-alternate.ly b/input/test/beam-alternate.ly
index dd499510140c001b82003c9eae60e7279999646b..a0dd6ad3b3cf6265395b4903998bbc5632d07574 100644 (file)
--- a/input/test/beam-alternate.ly
+++ b/input/test/beam-alternate.ly
@@ -7,6 +7,8 @@
 
 }
 
+\version "2.1.25"
+
 wipeNote = {
     \once \override NoteHead #'transparent = ##t
     \once \override Stem #'transparent = ##t 

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 2326ae35f7a03ad50cd1781c4bd5f5fa04d94f77..e72ee69694fdfda54eab19edc13363622d590a72 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -663,7 +663,8 @@
      . (
        (print-function . ,Text_item::print)
        (font-family . roman)
-       (meta . ((interfaces . (note-name-interface text-interface font-interface item-interface ))))
+       (meta . ((interfaces . (note-name-interface
+                               text-interface font-interface item-interface ))))
        ))
 
     (OctavateEight
@@ -773,8 +774,7 @@
        (meta . (
                 (interfaces . (font-interface
                                rhythmic-head-interface
-                                                                                       rhythmic-grob-interface
-
+                               rhythmic-grob-interface
                                staff-symbol-referencer-interface
                                rest-interface item-interface ))
                ))))