* lily/accidental-engraver.cc (process_acknowledged_grobs): use

	properties from Voice context. This fixes staff-switches during
	grace contexts.

diff --git a/ChangeLog b/ChangeLog
index f124ce859bf3ffc6ad1a9b4f721e6e2bb61f8637..51f9decf7bb0fb861eed7546d61640a4890dc93d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,10 @@
 
 2004-02-17  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
+       * lily/accidental-engraver.cc (process_acknowledged_grobs): use
+       properties from Voice context. This fixes staff-switches during
+       grace contexts.
+
        * lily/note-collision.cc (check_meshing_chords): only wipe heads
        if necessary. Else, simply wipe dots.
 

diff --git a/lily/accidental-engraver.cc b/lily/accidental-engraver.cc
index ae3fe262a8f747c363842060f378c455e4aa212b..7b24e37cde3ea8ea75aae8a2682fa15b506071bd 100644 (file)
--- a/lily/accidental-engraver.cc
+++ b/lily/accidental-engraver.cc
@@ -283,7 +283,13 @@ Accidental_engraver::process_acknowledged_grobs ()
 
          if (num)
            {
-             Grob * a = make_item ("Accidental");
+             /*
+               We construct the accidentals at the originating Voice
+               level, so that we get the property settings for
+               Accidental from the respective Voice.
+              */
+             Grob * a = make_item_from_properties (origin,
+                                                   ly_symbol2scm ("Accidental"));
              a->set_parent (support, Y_AXIS);
 
              if (!accidental_placement_)
@@ -483,11 +489,14 @@ Accidental_engraver::process_music ()
 
 
 ENTER_DESCRIPTION (Accidental_engraver,
-"Make accidentals.  Catches note heads, ties and notices key-change "
-" events.  Due to interaction with ties (which don't come together "
-" with note heads), this needs to be in a context higher than Tie_engraver.",
-              "Accidental",
-/* accepts */     "",
+                  "Make accidentals.  Catches note heads, ties and notices key-change "
+                  "events.  This engraver usually lives at Staff level, but "
+                  "reads the settings for Accidental at @code{Voice} level, " 
+                  "so you can @code{\\override} them at @code{Voice}. "
+                  ,
+                  
+                  "Accidental",
+                  "",
               "finger-interface rhythmic-head-interface tie-interface arpeggio-interface",
               "localKeySignature extraNatural autoAccidentals autoCautionaries",
                   "localKeySignature");

diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly
index 4581cd611543e9075f778d95e9a5ad70bf043d12..74c260355d371ea474b75df08bef600509d9becb 100644 (file)
--- a/ly/engraver-init.ly
+++ b/ly/engraver-init.ly
@@ -557,7 +557,7 @@ AncientRemoveEmptyStaffContext = \translator {
        (Voice Beam position-callbacks (,Beam::least_squares
                                        ,Beam::check_concave
                                        ,Beam::slope_damping))
-       (Staff Accidental font-size -4)
+       (Voice Accidental font-size -4)
        (Voice Slur direction -1)
     )