Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/lily/slur-engraver.cc b/lily/slur-engraver.cc
index 32c233e581ec6033982398f8042b17f4ff5a3b4e..0e649fe566165944aad7131a8f9edb4eacff558a 100644 (file)
--- a/lily/slur-engraver.cc
+++ b/lily/slur-engraver.cc
@@ -3,29 +3,30 @@
 
   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"
-#include "note-column.hh"
+#include "engraver.hh"
+
 #include "context.hh"
 #include "directional-element-interface.hh"
-#include "engraver.hh"
+#include "international.hh"
+#include "note-column.hh"
+#include "slur.hh"
 #include "spanner.hh"
-#include "tie.hh"
+#include "warn.hh"
 
 /*
   It is possible that a slur starts and ends on the same note.  At
   least, it is for phrasing slurs: a note can be both beginning and
   ending of a phrase.
 */
-
 class Slur_engraver : public Engraver
 {
   Drul_array<Music *> events_;
   Music *running_slur_start_;
-  Link_array<Grob> slurs_;
-  Link_array<Grob> end_slurs_;
+  vector<Grob*> slurs_;
+  vector<Grob*> end_slurs_;
 
   void set_melisma (bool);
 
@@ -33,12 +34,13 @@ protected:
   virtual bool try_music (Music *);
 
   DECLARE_ACKNOWLEDGER (accidental);
-  DECLARE_ACKNOWLEDGER (fingering);
   DECLARE_ACKNOWLEDGER (dynamic_line_spanner);
+  DECLARE_ACKNOWLEDGER (fingering);
   DECLARE_ACKNOWLEDGER (note_column);
   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 ();
@@ -83,38 +85,16 @@ void
 Slur_engraver::acknowledge_note_column (Grob_info info)
 {
   Grob *e = info.grob ();
-  for (int i = slurs_.size (); i--;)
+  for (vsize i = slurs_.size (); i--;)
     Slur::add_column (slurs_[i], e);
-  for (int i = end_slurs_.size (); i--;)
+  for (vsize i = end_slurs_.size (); i--;)
     Slur::add_column (end_slurs_[i], e);
 }
 
 void
 Slur_engraver::acknowledge_extra_object (Grob_info info)
 {
-  Grob *e = info.grob ();
-  SCM inside = e->get_property ("inside-slur");
-  if (Tie::has_interface (e)
-      || to_boolean (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 (!to_boolean (inside)
-          && e->name () != "DynamicText")
-    {
-      Grob *slur = slurs_.size () ? slurs_[0] : 0;
-      slur = (end_slurs_.size () && !slur)
-       ? end_slurs_[0] : slur;
-
-      if (slur)
-       {
-         e->add_offset_callback (Slur::outside_slur_callback_proc, Y_AXIS);
-         e->set_object ("slur", slur->self_scm ());
-       }
-    }
+  Slur::auxiliary_acknowledge_extra_object (info, slurs_, end_slurs_);
 }
 
 void
@@ -136,11 +116,19 @@ Slur_engraver::acknowledge_fingering (Grob_info info)
 }
 
 void
-Slur_engraver::acknowledge_script (Grob_info info)
+Slur_engraver::acknowledge_tuplet_number (Grob_info info)
 {
   acknowledge_extra_object (info);
 }
 
+
+void
+Slur_engraver::acknowledge_script (Grob_info info)
+{
+  if (!info.grob ()->internal_has_interface (ly_symbol2scm ("dynamic-interface")))
+    acknowledge_extra_object (info);
+}
+
 void
 Slur_engraver::acknowledge_text_script (Grob_info info)
 {
@@ -172,7 +160,7 @@ Slur_engraver::process_music ()
       slurs_.clear ();
     }
 
-  if (events_[START] && slurs_.is_empty ())
+  if (events_[START] && slurs_.empty ())
     {
       Music *ev = events_[START];
 
@@ -183,14 +171,14 @@ Slur_engraver::process_music ()
       if (updown && !double_slurs)
        set_grob_direction (slur, updown);
 
-      slurs_.push (slur);
+      slurs_.push_back (slur);
 
       if (double_slurs)
        {
          set_grob_direction (slur, DOWN);
          slur = make_spanner ("Slur", events_[START]->self_scm ());
          set_grob_direction (slur, UP);
-         slurs_.push (slur);
+         slurs_.push_back (slur);
        }
     }
   set_melisma (slurs_.size ());
@@ -205,16 +193,17 @@ Slur_engraver::stop_translation_timestep ()
 
 #include "translator.icc"
 
-ADD_ACKNOWLEDGER (Slur_engraver,accidental);
-ADD_ACKNOWLEDGER (Slur_engraver,dynamic_line_spanner);
-ADD_ACKNOWLEDGER (Slur_engraver,fingering)
-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, accidental);
+ADD_ACKNOWLEDGER (Slur_engraver, dynamic_line_spanner);
+ADD_ACKNOWLEDGER (Slur_engraver, fingering);
+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,
-               /* descr */ "Build slur grobs from slur events",
-               /* creats*/ "Slur",
-               /* accepts */ "slur-event",
-               /* reads */ "slurMelismaBusy doubleSlurs",
+               /* doc */ "Build slur grobs from slur events",
+               /* create */ "Slur",
+               /* accept */ "slur-event",
+               /* read */ "slurMelismaBusy doubleSlurs",
                /* write */ "");