(mail_address_url): don't add

[lilypond.git] / lily / hairpin.cc

diff --git a/lily/hairpin.cc b/lily/hairpin.cc
index 5a9a885b231a3020c2c1c3c02852c193b70bd00f..addd26b1c25e7aa568da8f180f836e4e67805086 100644 (file)
--- a/lily/hairpin.cc
+++ b/lily/hairpin.cc
@@ -7,24 +7,33 @@
 */
 
 #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-interface.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;
@@ -39,7 +48,7 @@ Hairpin::after_line_breaking (SCM smob)
       && ly_is_equal (bounds[RIGHT]->get_column ()->get_property ("when"),
                      bounds[LEFT]->get_property ("when")))
     me->suicide ();
-  return SCM_UNSPECIFIED;
+  
 }
 
 MAKE_SCHEME_CALLBACK (Hairpin, print, 1);
@@ -49,6 +58,7 @@ Hairpin::print (SCM smob)
 {
   Spanner *me = dynamic_cast<Spanner *> (unsmob_grob (smob));
 
+  consider_suicide (me);
   SCM s = me->get_property ("grow-direction");
   if (!is_direction (s))
     {
@@ -68,6 +78,18 @@ Hairpin::print (SCM smob)
       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;
@@ -93,7 +115,7 @@ Hairpin::print (SCM smob)
            {
              bool neighbor_found = false;
              extract_grob_set (me, "adjacent-hairpins", pins);
-             for (int i = 0; i < pins.size (); i++)
+             for (vsize i = 0; i < pins.size (); i++)
                {
                  /*
                    FIXME: this will fuck up in case of polyphonic