Merge branch 'jneeman' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond into jneeman

[lilypond.git] / lily / hairpin.cc

diff --git a/lily/hairpin.cc b/lily/hairpin.cc
index 8f0252acd252c00d5fdd4320f066f71879e69f5e..e0916cd99d98c4a0d524155d81fa57bf800b787a 100644 (file)
--- a/lily/hairpin.cc
+++ b/lily/hairpin.cc
@@ -58,7 +58,12 @@ Hairpin::print (SCM smob)
 {
   Spanner *me = dynamic_cast<Spanner *> (unsmob_grob (smob));
 
-  consider_suicide (me);
+  if (Spanner *orig = dynamic_cast<Spanner*> (me->original ()))
+    {
+      for (vsize i = 0; i < orig->broken_intos_.size (); i++)
+       Hairpin::consider_suicide (orig->broken_intos_[i]);
+    }
+  
   SCM s = me->get_property ("grow-direction");
   if (!is_direction (s))
     {
@@ -78,17 +83,16 @@ Hairpin::print (SCM smob)
       broken[d] = bounds[d]->break_status_dir () != CENTER;
     }
   while (flip (&d) != LEFT);
+
+  broken[RIGHT] = broken[RIGHT] && me->broken_neighbor (RIGHT);
+  broken[RIGHT] = broken[RIGHT] && me->broken_neighbor (RIGHT)->is_live ();
+  
   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;
-       }
+      Spanner *next = me->broken_neighbor (RIGHT);
+      Stencil *s = next->get_stencil ();
+      if (!s || s->is_empty ())
+       broken[RIGHT] = false;
     }
 
   Grob *common = bounds[LEFT]->common_refpoint (bounds[RIGHT], X_AXIS);
@@ -162,7 +166,12 @@ Hairpin::print (SCM smob)
                    x_points[d] = e.center () - d * padding / 3;
                }
              else
-               x_points[d] = e[d] - d * padding;
+               {
+                 x_points[d] = e[d];
+                 Item *bound = me->get_bound (d);
+                 if (bound->is_non_musical (bound))
+                   x_points[d] -=  d * padding;
+               }
            }
        }
     }
@@ -178,7 +187,8 @@ Hairpin::print (SCM smob)
 
   bool continued = broken[Direction (-grow_dir)];
 
-  Real starth, endh;
+  Real starth = 0;
+  Real endh = 0;
   if (grow_dir < 0)
     {
       starth = height;
@@ -241,8 +251,10 @@ Hairpin::print (SCM smob)
   return mol.smobbed_copy ();
 }
 
-ADD_INTERFACE (Hairpin, "hairpin-interface",
+ADD_INTERFACE (Hairpin,
               "A hairpin crescendo/decrescendo.",
+
+              /* props */
               "adjacent-hairpins "
               "circled-tip "
               "bound-padding "