* The grand 2005-2006 replace.

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

diff --git a/lily/slur-engraver.cc b/lily/slur-engraver.cc
index 4d6fd001dd0b0c3a19f583309efbed9a09209ee3..2481ea41acec36ccbfdeda097faf133523706a63 100644 (file)
--- a/lily/slur-engraver.cc
+++ b/lily/slur-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "slur.hh"
@@ -39,6 +39,7 @@ protected:
   DECLARE_ACKNOWLEDGER (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 ();
@@ -92,6 +93,10 @@ Slur_engraver::acknowledge_note_column (Grob_info info)
 void
 Slur_engraver::acknowledge_extra_object (Grob_info info)
 {
+  if (slurs_.is_empty ()
+      && end_slurs_.is_empty ())
+    return ;
+  
   Grob *e = info.grob ();
   SCM avoid = e->get_property ("avoid-slur");
   if (Tie::has_interface (e)
@@ -102,9 +107,8 @@ Slur_engraver::acknowledge_extra_object (Grob_info info)
       for (int i = end_slurs_.size (); i--;)
        Slur::add_extra_encompass (end_slurs_[i], e);
     }
-  else if ((avoid == ly_symbol2scm ("outside")
-           || avoid == ly_symbol2scm ("around"))
-          && e->name () != "DynamicText")
+  else if (avoid == ly_symbol2scm ("outside")
+          || avoid == ly_symbol2scm ("around"))
     {
       Grob *slur = slurs_.size () ? slurs_[0] : 0;
       slur = (end_slurs_.size () && !slur)
@@ -116,6 +120,8 @@ Slur_engraver::acknowledge_extra_object (Grob_info info)
          e->set_object ("slur", slur->self_scm ());
        }
     }
+  else
+    e->warning ("Ignoring grob for slur. avoid-slur not set?");
 }
 
 void
@@ -136,6 +142,13 @@ Slur_engraver::acknowledge_fingering (Grob_info info)
   acknowledge_extra_object (info);
 }
 
+void
+Slur_engraver::acknowledge_tuplet_number (Grob_info info)
+{
+  acknowledge_extra_object (info);
+}
+
+
 void
 Slur_engraver::acknowledge_script (Grob_info info)
 {
@@ -145,6 +158,7 @@ Slur_engraver::acknowledge_script (Grob_info info)
 void
 Slur_engraver::acknowledge_text_script (Grob_info info)
 {
+  //  if (!info.grob ()->internal_has_interface (ly_symbol2scm ("DynamicText")))
   acknowledge_extra_object (info);
 }
 
@@ -213,6 +227,7 @@ ADD_ACKNOWLEDGER (Slur_engraver, note_column);
 ADD_ACKNOWLEDGER (Slur_engraver, script);
 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",