X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fslur-engraver.cc;h=13ca895e2e1e52a586efbbaac3bf96ebda84ec19;hb=455972425ff391f3c4ab80c689a8e9e803af8cc7;hp=81aac6823f13214cc13f4ae53d885492f9514028;hpb=885e7ed59b90bdfb8958198dbac00b5cee4cc164;p=lilypond.git diff --git a/lily/slur-engraver.cc b/lily/slur-engraver.cc index 81aac6823f..13ca895e2e 100644 --- a/lily/slur-engraver.cc +++ b/lily/slur-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2007 Han-Wen Nienhuys + (c) 1997--2009 Han-Wen Nienhuys */ #include "engraver.hh" @@ -47,7 +47,6 @@ class Slur_engraver : public Engraver protected: DECLARE_TRANSLATOR_LISTENER (slur); DECLARE_ACKNOWLEDGER (accidental); - DECLARE_ACKNOWLEDGER (dynamic_line_spanner); DECLARE_ACKNOWLEDGER (fingering); DECLARE_ACKNOWLEDGER (note_column); DECLARE_ACKNOWLEDGER (script); @@ -112,12 +111,6 @@ Slur_engraver::acknowledge_accidental (Grob_info info) acknowledge_extra_object (info); } -void -Slur_engraver::acknowledge_dynamic_line_spanner (Grob_info info) -{ - acknowledge_extra_object (info); -} - void Slur_engraver::acknowledge_fingering (Grob_info info) { @@ -201,7 +194,7 @@ Slur_engraver::process_music () void Slur_engraver::stop_translation_timestep () { - if (Grob *g = unsmob_grob (get_property ("breakableSeparationItem"))) + if (Grob *g = unsmob_grob (get_property ("currentCommandColumn"))) { for (vsize i = 0; i < end_slurs_.size (); i++) Slur::add_extra_encompass (end_slurs_[i], g); @@ -224,7 +217,6 @@ Slur_engraver::stop_translation_timestep () } ADD_ACKNOWLEDGER (Slur_engraver, accidental); -ADD_ACKNOWLEDGER (Slur_engraver, dynamic_line_spanner); ADD_ACKNOWLEDGER (Slur_engraver, fingering); ADD_ACKNOWLEDGER (Slur_engraver, note_column); ADD_ACKNOWLEDGER (Slur_engraver, script); @@ -232,10 +224,16 @@ ADD_ACKNOWLEDGER (Slur_engraver, text_script); ADD_ACKNOWLEDGER (Slur_engraver, tie); ADD_ACKNOWLEDGER (Slur_engraver, tuplet_number); ADD_TRANSLATOR (Slur_engraver, - /* doc */ "Build slur grobs from slur events", - /* create */ "Slur", + /* doc */ + "Build slur grobs from slur events.", + + /* create */ + "Slur ", + /* read */ "slurMelismaBusy " "doubleSlurs ", - /* write */ ""); + /* write */ + "" + );