X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpiano-pedal-bracket.cc;h=8c76a60d138d793ddb236fc855cec947c626d27d;hb=9e69cb84d6ee5b0a861cd97869b10e3bdf0c833c;hp=52afd47c530f2f1c8c67d6066926b4df7dc5fb47;hpb=304b5f3aa7eee7b0ff8d4ba7526a1410735f6e74;p=lilypond.git

diff --git a/lily/piano-pedal-bracket.cc b/lily/piano-pedal-bracket.cc
index 52afd47c53..8c76a60d13 100644
--- a/lily/piano-pedal-bracket.cc
+++ b/lily/piano-pedal-bracket.cc
@@ -1,10 +1,9 @@
-/*   
-  piano-pedal-bracket.cc --  implement  Piano_pedal_bracket
+/*
+  piano-pedal-bracket.cc -- implement  Piano_pedal_bracket
 
-source file of the GNU LilyPond music typesetter
-
-(c) 2003--2004 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  source file of the GNU LilyPond music typesetter
 
+  (c) 2003--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "stencil.hh"
@@ -14,69 +13,75 @@ source file of the GNU LilyPond music typesetter
 
 struct Piano_pedal_bracket
 {
-  DECLARE_SCHEME_CALLBACK (print,(SCM));
-  static bool has_interface (Grob*);
+  DECLARE_SCHEME_CALLBACK (print, (SCM));
+  DECLARE_GROB_INTERFACE();
 };
 
-
-MAKE_SCHEME_CALLBACK (Piano_pedal_bracket,print,1);
+MAKE_SCHEME_CALLBACK (Piano_pedal_bracket, print, 1);
 SCM
 Piano_pedal_bracket::print (SCM smob)
 {
-  Spanner *me = dynamic_cast<Spanner*> (unsmob_grob (smob));
-  
-  Drul_array<bool> broken (false,false);
+  Spanner *me = dynamic_cast<Spanner *> (unsmob_grob (smob));
+  Spanner *orig = dynamic_cast<Spanner *> (me->original ());
+
+  Drul_array<bool> broken (false, false);
   Drul_array<Real> height = robust_scm2drul
-    (me->get_property ("edge-height"), Interval (0,0));
+    (me->get_property ("edge-height"), Interval (0, 0));
   Drul_array<Real> shorten = robust_scm2drul
-    (me->get_property ("shorten-pair"), Interval (0,0));
+    (me->get_property ("shorten-pair"), Interval (0, 0));
   Drul_array<Real> flare = robust_scm2drul
-    (me->get_property ("bracket-flare"), Interval (0,0));
+    (me->get_property ("bracket-flare"), Interval (0, 0));
 
   Grob *common = me->get_bound (LEFT)
     ->common_refpoint (me->get_bound (RIGHT), X_AXIS);
-  Grob *textbit = unsmob_grob (me->get_property ("pedal-text"));
+  Grob *textbit = unsmob_grob (me->get_object ("pedal-text"));
 
   if (textbit)
     common = common->common_refpoint (textbit, X_AXIS);
 
-  Interval span_points (0,0);
+  Interval span_points (0, 0);
   Direction d = LEFT;
   do
     {
       Item *b = me->get_bound (d);
       broken[d] = b->break_status_dir () != CENTER;
       if (broken[d])
-	height[d] = 0.0;
-
-      Interval ext   = b->extent (common,  X_AXIS);
-      span_points[d] = ext [broken[d] ?  RIGHT : LEFT];
+	{
+	  if (orig
+	      && ((d == RIGHT
+		   && me->get_break_index () != orig->broken_intos_.size () - 1)
+		  || (d == LEFT && me->get_break_index ())))
+	    height[d] = 0.0;
+	  else
+	    flare[d] = 0.0;
+	}
+
+      Interval ext = robust_relative_extent (b, common, X_AXIS);
+      span_points[d] = ext [broken[d] ? RIGHT : LEFT];
     }
   while (flip (&d) != LEFT);
 
-  
   /* For 'Mixed' style pedals, i.e.  a bracket preceded by text:  Ped._____|
-   need to shorten by the extent of the text grob
+     need to shorten by the extent of the text grob
   */
   if (textbit)
     {
       height[LEFT] = 0;
-      
-      Real padding = robust_scm2double (me->get_property ("if-text-padding"), 0);
-      
+
+      Real padding = robust_scm2double (me->get_property ("bound-padding"), 0);
+
       span_points[LEFT] = padding
-	+ textbit->extent (common, X_AXIS)[RIGHT];
+	+ robust_relative_extent (textbit, common, X_AXIS)[RIGHT];
     }
-  
 
-  Stencil m ;
-  if (!span_points.is_empty () &&
-      span_points.length () > 0.001)
+  Stencil m;
+  if (!span_points.is_empty ()
+      && span_points.length () > 0.001)
     {
       m = Tuplet_bracket::make_bracket (me, Y_AXIS,
 					Offset (span_points.length (), 0),
 					height,
-					0.0,
+					Interval (),
 					flare, shorten);
     }
   m.translate_axis (span_points[LEFT]
@@ -84,9 +89,15 @@ Piano_pedal_bracket::print (SCM smob)
   return m.smobbed_copy ();
 }
 
+ADD_INTERFACE (Piano_pedal_bracket,
 
-
-ADD_INTERFACE (Piano_pedal_bracket,"piano-pedal-bracket-interface",
-	       "The bracket of the piano pedal.  It can be tuned through the regular "
+	       "The bracket of the piano pedal.  "
+	       "It can be tuned through the regular "
 	       "bracket properties.",
-	       "edge-height shorten-pair bracket-flare pedal-text");
+
+	       /* props */
+	       "bound-padding "
+	       "edge-height "
+	       "shorten-pair "
+	       "bracket-flare "
+	       "pedal-text");