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 2dfe2fec10df5942cd72ae554cc0ddea499bd3e2..0e649fe566165944aad7131a8f9edb4eacff558a 100644 (file)
--- a/lily/slur-engraver.cc
+++ b/lily/slur-engraver.cc
@@ -3,16 +3,17 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@xs4all.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"
 
 /*
@@ -24,8 +25,8 @@ 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);
 
@@ -84,41 +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 avoid = e->get_property ("avoid-slur");
-  if (Tie::has_interface (e)
-      || 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 ((avoid == ly_symbol2scm ("outside")
-           || avoid == ly_symbol2scm ("around"))
-          && e->name () != "DynamicText")
-    {
-      Grob *slur = slurs_.size () ? slurs_[0] : 0;
-      slur = (end_slurs_.size () && !slur)
-       ? end_slurs_[0] : slur;
-
-      if (slur)
-       {
-         chain_offset_callback (e, Slur::outside_slur_callback_proc, Y_AXIS);
-         e->set_object ("slur", slur->self_scm ());
-       }
-    }
-  else
-    e->warning ("Ignoring grob for slur. avoid-slur not set?");
+  Slur::auxiliary_acknowledge_extra_object (info, slurs_, end_slurs_);
 }
 
 void
@@ -149,7 +125,8 @@ Slur_engraver::acknowledge_tuplet_number (Grob_info info)
 void
 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
@@ -183,7 +160,7 @@ Slur_engraver::process_music ()
       slurs_.clear ();
     }
 
-  if (events_[START] && slurs_.is_empty ())
+  if (events_[START] && slurs_.empty ())
     {
       Music *ev = events_[START];
 
@@ -194,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 ());