* flower/include/std-string.hh:

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

diff --git a/lily/phrasing-slur-engraver.cc b/lily/phrasing-slur-engraver.cc
index 72b900c804e53bd8ae86db8a5d882872d89fa833..c7571f118cacc109b02a1a12f27c455c5c2caaaf 100644 (file)
--- a/lily/phrasing-slur-engraver.cc
+++ b/lily/phrasing-slur-engraver.cc
@@ -3,16 +3,19 @@
 
   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 "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
@@ -24,8 +27,8 @@ 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 *);
@@ -69,7 +72,7 @@ Phrasing_slur_engraver::try_music (Music *m)
        }
       else if (d == STOP)
        {
-         if (slurs_.is_empty ())
+         if (slurs_.empty ())
            return false;
 
          events_[STOP] = m;
@@ -83,9 +86,9 @@ 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);
 }
 
@@ -94,17 +97,17 @@ void
 Phrasing_slur_engraver::acknowledge_extra_object (Grob_info info)
 {
   Grob *e = info.grob ();
-  SCM inside = e->get_property ("inside-slur");
+  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--;)
+      for (vsize i = slurs_.size (); i--;)
        Slur::add_extra_encompass (slurs_[i], e);
-      for (int i = end_slurs_.size (); i--;)
+      for (vsize i = end_slurs_.size (); i--;)
        Slur::add_extra_encompass (end_slurs_[i], e);
     }
-  else if (inside == SCM_BOOL_F
-          && 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)
@@ -112,7 +115,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 ());
        }
     }
@@ -176,7 +179,7 @@ Phrasing_slur_engraver::process_music ()
       slurs_.clear ();
     }
 
-  if (events_[START] && slurs_.is_empty ())
+  if (events_[START] && slurs_.empty ())
     {
       Music *ev = events_[START];
 
@@ -185,7 +188,7 @@ Phrasing_slur_engraver::process_music ()
       if (updown)
        set_grob_direction (slur, updown);
 
-      slurs_.push (slur);
+      slurs_.push_back (slur);
     }
 }