Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/lily/phrasing-slur-engraver.cc b/lily/phrasing-slur-engraver.cc
index 8357b05655171c10d92258263da3a6e41883b717..b3b9abbe0067947f7a9ec47ed51c986327c029d4 100644 (file)
--- a/lily/phrasing-slur-engraver.cc
+++ b/lily/phrasing-slur-engraver.cc
@@ -1,16 +1,20 @@
 /*
   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 "engraver.hh"
+
 #include "context.hh"
 #include "directional-element-interface.hh"
-#include "engraver.hh"
-#include "slur.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
@@ -22,21 +26,22 @@ class Phrasing_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_;
 
 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 ();
@@ -66,7 +71,7 @@ Phrasing_slur_engraver::try_music (Music *m)
        }
       else if (d == STOP)
        {
-         if (slurs_.is_empty ())
+         if (slurs_.empty ())
            return false;
 
          events_[STOP] = m;
@@ -80,37 +85,16 @@ void
 Phrasing_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
 Phrasing_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 (inside == SCM_BOOL_F)
-    {
-      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
@@ -119,6 +103,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 +133,6 @@ Phrasing_slur_engraver::acknowledge_tie (Grob_info info)
   acknowledge_extra_object (info);
 }
 
-
 void
 Phrasing_slur_engraver::acknowledge_slur (Grob_info info)
 {
@@ -167,7 +155,7 @@ Phrasing_slur_engraver::process_music ()
       slurs_.clear ();
     }
 
-  if (events_[START] && slurs_.is_empty ())
+  if (events_[START] && slurs_.empty ())
     {
       Music *ev = events_[START];
 
@@ -176,7 +164,7 @@ Phrasing_slur_engraver::process_music ()
       if (updown)
        set_grob_direction (slur, updown);
 
-      slurs_.push (slur);
+      slurs_.push_back (slur);
     }
 }
 
@@ -189,18 +177,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 */ "");