Fix potential NULL dereference in Staff_symbol::on_line().

[lilypond.git] / lily / phrasing-slur-engraver.cc

diff --git a/lily/phrasing-slur-engraver.cc b/lily/phrasing-slur-engraver.cc
index 76b4ac6ef3a440db32ff23df0e20a83e422e3476..b0ef2b2d74ab69a63aca41b1dc3e49692bbdf85e 100644 (file)
--- a/lily/phrasing-slur-engraver.cc
+++ b/lily/phrasing-slur-engraver.cc
@@ -47,6 +47,7 @@ protected:
   DECLARE_ACKNOWLEDGER (fingering);
   DECLARE_ACKNOWLEDGER (note_column);
   DECLARE_ACKNOWLEDGER (slur);
+  DECLARE_ACKNOWLEDGER (script);
   DECLARE_ACKNOWLEDGER (text_script);
   DECLARE_ACKNOWLEDGER (tie);
   DECLARE_TRANSLATOR_LISTENER (phrasing_slur);
@@ -112,6 +113,13 @@ Phrasing_slur_engraver::acknowledge_text_script (Grob_info info)
   acknowledge_extra_object (info);
 }
 
+void
+Phrasing_slur_engraver::acknowledge_script (Grob_info info)
+{
+  if (!info.grob ()->internal_has_interface (ly_symbol2scm ("dynamic-interface")))
+    acknowledge_extra_object (info);
+}
+
 void
 Phrasing_slur_engraver::acknowledge_tie (Grob_info info)
 {
@@ -164,11 +172,20 @@ ADD_ACKNOWLEDGER (Phrasing_slur_engraver, accidental);
 ADD_ACKNOWLEDGER (Phrasing_slur_engraver, fingering)
 ADD_ACKNOWLEDGER (Phrasing_slur_engraver, note_column);
 ADD_ACKNOWLEDGER (Phrasing_slur_engraver, slur);
+ADD_ACKNOWLEDGER (Phrasing_slur_engraver, script);
 ADD_ACKNOWLEDGER (Phrasing_slur_engraver, text_script);
 ADD_ACKNOWLEDGER (Phrasing_slur_engraver, tie);
 
 ADD_TRANSLATOR (Phrasing_slur_engraver,
-               /* doc */ "Print phrasing slurs. Similar to @ref{Slur_engraver}",
-               /* create */ "PhrasingSlur",
-               /* read */ "",
-               /* write */ "");
+               /* doc */
+               "Print phrasing slurs.  Similar to @ref{Slur_engraver}.",
+
+               /* create */
+               "PhrasingSlur ",
+
+               /* read */
+               "",
+
+               /* write */
+               ""
+               );