(mail_address_url): don't add

[lilypond.git] / lily / hairpin.cc

diff --git a/lily/hairpin.cc b/lily/hairpin.cc
index b3e5c6edce0d9889a25f2b0f48a4d124a1a43b80..addd26b1c25e7aa568da8f180f836e4e67805086 100644 (file)
--- a/lily/hairpin.cc
+++ b/lily/hairpin.cc
@@ -3,30 +3,62 @@
 
   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 "hairpin.hh"
 
-#include "staff-symbol-referencer.hh"
-#include "line-interface.hh"
-#include "spanner.hh"
-#include "font-interface.hh"
 #include "dimensions.hh"
+#include "font-interface.hh"
+#include "international.hh"
+#include "line-interface.hh"
+#include "lookup.hh"
 #include "output-def.hh"
-#include "warn.hh"
 #include "paper-column.hh"
-#include "lookup.hh"
-#include "text-item.hh"
+#include "pointer-group-interface.hh"
+#include "spanner.hh"
+#include "staff-symbol-referencer.hh"
+#include "text-interface.hh"
+#include "warn.hh"
+
+MAKE_SCHEME_CALLBACK (Hairpin, after_line_breaking, 1);
+SCM
+Hairpin::after_line_breaking (SCM smob)
+{
+  Spanner *me = dynamic_cast<Spanner *> (unsmob_grob (smob));
+  consider_suicide (me);
+
+  return SCM_UNSPECIFIED;
+}
+
+void
+Hairpin::consider_suicide (Spanner*me)
+{
+  Drul_array<bool> broken;
+  Drul_array<Item *> bounds;
+  Direction d = LEFT;
+  do
+    {
+      bounds[d] = me->get_bound (d);
+      broken[d] = bounds[d]->break_status_dir () != CENTER;
+    }
+  while (flip (&d) != LEFT);
+
+  if (broken[LEFT]
+      && ly_is_equal (bounds[RIGHT]->get_column ()->get_property ("when"),
+                     bounds[LEFT]->get_property ("when")))
+    me->suicide ();
+  
+}
 
 MAKE_SCHEME_CALLBACK (Hairpin, print, 1);
 
 SCM
 Hairpin::print (SCM smob)
 {
-  Grob *me = unsmob_grob (smob);
-  Spanner *spanner = dynamic_cast<Spanner *> (me);
+  Spanner *me = dynamic_cast<Spanner *> (unsmob_grob (smob));
 
+  consider_suicide (me);
   SCM s = me->get_property ("grow-direction");
   if (!is_direction (s))
     {
@@ -42,10 +74,22 @@ Hairpin::print (SCM smob)
   Direction d = LEFT;
   do
     {
-      bounds[d] = spanner->get_bound (d);
+      bounds[d] = me->get_bound (d);
       broken[d] = bounds[d]->break_status_dir () != CENTER;
     }
   while (flip (&d) != LEFT);
+  if (broken[RIGHT])
+    {
+      Spanner *orig = dynamic_cast<Spanner*> (me->original ());
+      if (me->get_break_index ()
+         < orig->broken_intos_.size () - 1)
+       {
+         Spanner *next = orig->broken_intos_[me->get_break_index () + 1];
+         Stencil *s = next->get_stencil ();
+         if (!s || s->is_empty ())
+           broken[RIGHT] = false;
+       }
+    }
 
   Grob *common = bounds[LEFT]->common_refpoint (bounds[RIGHT], X_AXIS);
   Drul_array<Real> x_points;
@@ -65,13 +109,13 @@ Hairpin::print (SCM smob)
            {
              Interval e = b->extent (common, X_AXIS);
              if (!e.is_empty ())
-               x_points[d] = e[-d] - d*padding;
+               x_points[d] = e[-d] - d * padding;
            }
          else
            {
              bool neighbor_found = false;
-             for (SCM adj = me->get_property ("adjacent-hairpins");
-                  scm_is_pair (adj); adj = scm_cdr (adj))
+             extract_grob_set (me, "adjacent-hairpins", pins);
+             for (vsize i = 0; i < pins.size (); i++)
                {
                  /*
                    FIXME: this will fuck up in case of polyphonic
@@ -79,7 +123,7 @@ Hairpin::print (SCM smob)
                    in the current staff/voice.
                  */
 
-                 Spanner *pin = unsmob_spanner (scm_car (adj));
+                 Spanner *pin = dynamic_cast<Spanner *> (pins[i]);
                  if (pin
                      && (pin->get_bound (LEFT)->get_column () == b->get_column ()
                          || pin->get_bound (RIGHT)->get_column () == b->get_column ()))
@@ -140,6 +184,10 @@ Hairpin::print (SCM smob)
 }
 
 ADD_INTERFACE (Hairpin, "hairpin-interface",
-              "A hairpin (de)crescendo.",
-              "grow-direction height bound-padding adjacent-hairpins");
+              "A hairpin crescendo/decrescendo.",
+              "adjacent-hairpins "
+              "bound-padding "
+              "grow-direction "
+              "height "
+              );