* The grand 2005-2006 replace.

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

diff --git a/lily/phrasing-slur-engraver.cc b/lily/phrasing-slur-engraver.cc
index 8357b05655171c10d92258263da3a6e41883b717..7276302f574d5d6bff926c50e9ac19cffa330633 100644 (file)
--- a/lily/phrasing-slur-engraver.cc
+++ b/lily/phrasing-slur-engraver.cc
@@ -1,7 +1,9 @@
 /*
   phrasing-slur-engraver.cc -- implement Phrasing_slur_engraver
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  source file of the GNU LilyPond music typesetter
+
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "context.hh"
@@ -11,6 +13,7 @@
 #include "note-column.hh"
 #include "spanner.hh"
 #include "tie.hh"
+#include "warn.hh"
 
 /*
   It is possible that a slur starts and ends on the same note.  At
@@ -29,14 +32,15 @@ protected:
   virtual bool try_music (Music *);
 
   void acknowledge_extra_object (Grob_info);
-  DECLARE_ACKNOWLEDGER(note_column);
-  DECLARE_ACKNOWLEDGER(accidental);
-  DECLARE_ACKNOWLEDGER(fingering);
-  DECLARE_ACKNOWLEDGER(script);
-  DECLARE_ACKNOWLEDGER(tie);
-  DECLARE_ACKNOWLEDGER(text_script);
-  DECLARE_ACKNOWLEDGER(slur);
-  
+  DECLARE_ACKNOWLEDGER (accidental);
+  DECLARE_ACKNOWLEDGER (dynamic_line_spanner);
+  DECLARE_ACKNOWLEDGER (fingering);
+  DECLARE_ACKNOWLEDGER (note_column);
+  DECLARE_ACKNOWLEDGER (script);
+  DECLARE_ACKNOWLEDGER (slur);
+  DECLARE_ACKNOWLEDGER (text_script);
+  DECLARE_ACKNOWLEDGER (tie);
+
   void stop_translation_timestep ();
   virtual void finalize ();
   void process_music ();
@@ -86,20 +90,22 @@ Phrasing_slur_engraver::acknowledge_note_column (Grob_info info)
     Slur::add_column (end_slurs_[i], e);
 }
 
+/* FIXME: cut + paste job from Slur:: */
 void
 Phrasing_slur_engraver::acknowledge_extra_object (Grob_info info)
 {
-  Grob*e = info.grob ();
-  SCM inside = e->get_property ("inside-slur");
+  Grob *e = info.grob ();
+  SCM avoid = e->get_property ("avoid-slur");
   if (Tie::has_interface (e)
-      || to_boolean (inside))
+      || avoid == ly_symbol2scm ("inside"))
     {
       for (int i = slurs_.size (); i--;)
        Slur::add_extra_encompass (slurs_[i], e);
       for (int i = end_slurs_.size (); i--;)
        Slur::add_extra_encompass (end_slurs_[i], e);
     }
-  else if (inside == SCM_BOOL_F)
+  else if (avoid == ly_symbol2scm ("outside")
+          || avoid == ly_symbol2scm ("around"))
     {
       Grob *slur = slurs_.size () ? slurs_[0] : 0;
       slur = (end_slurs_.size () && !slur)
@@ -107,7 +113,7 @@ Phrasing_slur_engraver::acknowledge_extra_object (Grob_info info)
 
       if (slur)
        {
-         e->add_offset_callback (Slur::outside_slur_callback_proc, Y_AXIS);
+         chain_offset_callback (e, Slur::outside_slur_callback_proc, Y_AXIS);
          e->set_object ("slur", slur->self_scm ());
        }
     }
@@ -119,6 +125,11 @@ Phrasing_slur_engraver::acknowledge_accidental (Grob_info info)
   acknowledge_extra_object (info);
 }
 
+void
+Phrasing_slur_engraver::acknowledge_dynamic_line_spanner (Grob_info info)
+{
+  acknowledge_extra_object (info);
+}
 
 void
 Phrasing_slur_engraver::acknowledge_fingering (Grob_info info)
@@ -144,7 +155,6 @@ Phrasing_slur_engraver::acknowledge_tie (Grob_info info)
   acknowledge_extra_object (info);
 }
 
-
 void
 Phrasing_slur_engraver::acknowledge_slur (Grob_info info)
 {
@@ -189,18 +199,18 @@ Phrasing_slur_engraver::stop_translation_timestep ()
 
 #include "translator.icc"
 
-
-ADD_ACKNOWLEDGER(Phrasing_slur_engraver,note_column);
-ADD_ACKNOWLEDGER(Phrasing_slur_engraver,accidental);
-ADD_ACKNOWLEDGER(Phrasing_slur_engraver,fingering)
-ADD_ACKNOWLEDGER(Phrasing_slur_engraver,script);
-ADD_ACKNOWLEDGER(Phrasing_slur_engraver,tie);
-ADD_ACKNOWLEDGER(Phrasing_slur_engraver,text_script);
-ADD_ACKNOWLEDGER(Phrasing_slur_engraver,slur);
+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, script);
+ADD_ACKNOWLEDGER (Phrasing_slur_engraver, slur);
+ADD_ACKNOWLEDGER (Phrasing_slur_engraver, text_script);
+ADD_ACKNOWLEDGER (Phrasing_slur_engraver, tie);
 
 ADD_TRANSLATOR (Phrasing_slur_engraver,
-               /* descr */ "Print phrasing slurs. Similar to @ref{Slur_engraver}",
-               /* creats*/ "PhrasingSlur",
-               /* accepts */ "phrasing-slur-event",
-               /* reads */ "",
+               /* doc */ "Print phrasing slurs. Similar to @ref{Slur_engraver}",
+               /* create */ "PhrasingSlur",
+               /* accept */ "phrasing-slur-event",
+               /* read */ "",
                /* write */ "");