X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fhairpin.cc;h=6a98e55bf9bd4b3964787b4b0267220e366febcd;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=8f0252acd252c00d5fdd4320f066f71879e69f5e;hpb=0ad4c4c0df570e26cca972402a070a8eead2f46d;p=lilypond.git

diff --git a/lily/hairpin.cc b/lily/hairpin.cc
index 8f0252acd2..6a98e55bf9 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--2008 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);
@@ -48,7 +47,6 @@ Hairpin::consider_suicide (Spanner*me)
       && ly_is_equal (bounds[RIGHT]->get_column ()->get_property ("when"),
 		      bounds[LEFT]->get_property ("when")))
     me->suicide ();
-  
 }
 
 MAKE_SCHEME_CALLBACK (Hairpin, print, 1);
@@ -58,7 +56,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 +81,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 +164,17 @@ Hairpin::print (SCM smob)
 		    x_points[d] = e.center () - d * padding / 3;
 		}
 	      else
-		x_points[d] = e[d] - d * padding;
+		{
+		  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;
+		}
 	    }
 	}
     }
@@ -178,7 +190,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;
@@ -193,7 +206,6 @@ Hairpin::print (SCM smob)
   /*
     should do relative to staff-symbol staff-space?
   */
-
   Stencil mol;
   Real x = 0.0;
 
@@ -222,7 +234,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),
@@ -232,7 +244,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]
@@ -241,8 +253,10 @@ Hairpin::print (SCM smob)
   return mol.smobbed_copy ();
 }
 
-ADD_INTERFACE (Hairpin, "hairpin-interface",
-	       "A hairpin crescendo/decrescendo.",
+ADD_INTERFACE (Hairpin,
+	       "A hairpin crescendo or decrescendo.",
+
+	       /* properties */
 	       "adjacent-hairpins "
 	       "circled-tip "
 	       "bound-padding "