2006-10-03 Han-Wen Nienhuys <hanwen@lilypond.org>
+ * lily/phrasing-slur-engraver.cc (acknowledge_script): only ack
+ non-dynamic scripts. Fixes #30.
+
* lily/slur.cc (outside_slur_callback): make offset_scm optional.
* lily/beam.cc (rest_collision_callback): make prev_offset optional.
void
Phrasing_slur_engraver::acknowledge_script (Grob_info info)
{
- acknowledge_extra_object (info);
+ if (!info.grob ()->internal_has_interface (ly_symbol2scm ("dynamic-interface")))
+ acknowledge_extra_object (info);
}
void
ADD_ACKNOWLEDGER (Phrasing_slur_engraver, accidental);
ADD_ACKNOWLEDGER (Phrasing_slur_engraver, dynamic_line_spanner);
ADD_ACKNOWLEDGER (Phrasing_slur_engraver, fingering)
- ADD_ACKNOWLEDGER (Phrasing_slur_engraver, note_column);
+ADD_ACKNOWLEDGER (Phrasing_slur_engraver, note_column);
ADD_ACKNOWLEDGER (Phrasing_slur_engraver, script);
ADD_ACKNOWLEDGER (Phrasing_slur_engraver, slur);
ADD_ACKNOWLEDGER (Phrasing_slur_engraver, text_script);
DECLARE_ACKNOWLEDGER (text_script);
DECLARE_ACKNOWLEDGER (tie);
DECLARE_ACKNOWLEDGER (tuplet_number);
+
void acknowledge_extra_object (Grob_info);
void stop_translation_timestep ();
- virtual void finalize ();
void process_music ();
+ virtual void finalize ();
+
+
public:
TRANSLATOR_DECLARATIONS (Slur_engraver);
};