From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Tue, 3 Oct 2006 12:05:26 +0000 (+0000)
Subject: (acknowledge_script): only ack
X-Git-Tag: release/2.10.0-2~256
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=cac3c1f657606f6dee0badf461c59159f15c9340;p=lilypond.git

(acknowledge_script): only ack
non-dynamic scripts. Fixes #30.
---

diff --git a/ChangeLog b/ChangeLog
index 2d7d3e60cf..93f026cae9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 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.
diff --git a/lily/phrasing-slur-engraver.cc b/lily/phrasing-slur-engraver.cc
index bb93668ca9..cb0c2e20bf 100644
--- a/lily/phrasing-slur-engraver.cc
+++ b/lily/phrasing-slur-engraver.cc
@@ -108,7 +108,8 @@ Phrasing_slur_engraver::acknowledge_fingering (Grob_info info)
 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
@@ -168,7 +169,7 @@ Phrasing_slur_engraver::stop_translation_timestep ()
 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);
diff --git a/lily/slur-engraver.cc b/lily/slur-engraver.cc
index 3ee546c3bf..2b2aafafb0 100644
--- a/lily/slur-engraver.cc
+++ b/lily/slur-engraver.cc
@@ -43,11 +43,14 @@ protected:
   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);
 };