X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fhairpin.cc;h=87f32017a491ca7b9d6a669bf8e25fa4c3c45c10;hb=9a14a394dfa23b38ab78c3eb09a2d7b5f504fa35;hp=4b9c215e2e9b7cbd4936a7262653ee0f06baa72f;hpb=dafef223123bb629eab05e53c443c6e6d20e9481;p=lilypond.git

diff --git a/lily/hairpin.cc b/lily/hairpin.cc
index 4b9c215e2e..87f32017a4 100644
--- a/lily/hairpin.cc
+++ b/lily/hairpin.cc
@@ -3,22 +3,21 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "hairpin.hh"
 
 #include "dimensions.hh"
-#include "font-interface.hh"
 #include "international.hh"
 #include "line-interface.hh"
-#include "lookup.hh"
 #include "output-def.hh"
 #include "paper-column.hh"
 #include "pointer-group-interface.hh"
 #include "spanner.hh"
 #include "staff-symbol-referencer.hh"
 #include "text-interface.hh"
+#include "note-column.hh"
 #include "warn.hh"
 
 MAKE_SCHEME_CALLBACK (Hairpin, after_line_breaking, 1);
@@ -58,7 +57,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 +82,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);
@@ -163,7 +166,12 @@ Hairpin::print (SCM smob)
 		}
 	      else
 		{
-		  x_points[d] = e[d];
+		  if (Note_column::has_interface (b)
+		      && Note_column::has_rests (b))
+		    x_points[d] = e[-d];
+		  else
+		    x_points[d] = e[d];
+		  
 		  Item *bound = me->get_bound (d);
 		  if (bound->is_non_musical (bound))
 		    x_points[d] -=  d * padding;
@@ -183,7 +191,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;
@@ -227,7 +236,7 @@ Hairpin::print (SCM smob)
       Box extent (Interval (-rad, rad), Interval (-rad, rad));
       
       /* Hmmm, perhaps we should have a Lookup::circle () method? */
-      Stencil circle(extent,
+      Stencil circle (extent,
 		     scm_list_4 (ly_symbol2scm ("circle"),
 				 scm_from_double (rad),
 				 scm_from_double (thick),
@@ -237,7 +246,7 @@ Hairpin::print (SCM smob)
 	don't add another circle the hairpin is broken
       */
       if (!broken[tip_dir])
-	mol.add_at_edge (X_AXIS, tip_dir, Stencil (circle), 0, 0);
+	mol.add_at_edge (X_AXIS, tip_dir, Stencil (circle), 0);
     }
 
   mol.translate_axis (x_points[LEFT]
@@ -246,8 +255,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 "