* lily/font-select.cc (get_font_by_design_size): revert

[lilypond.git] / lily / piano-pedal-bracket.cc

diff --git a/lily/piano-pedal-bracket.cc b/lily/piano-pedal-bracket.cc
index b0d87558e9879b225ecfcd6d5063556121fbbce0..9d20e7aa544097b656798c197a6eda7f5f8428f8 100644 (file)
--- a/lily/piano-pedal-bracket.cc
+++ b/lily/piano-pedal-bracket.cc
@@ -1,9 +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>
+(c) 2003--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 */
 
@@ -14,25 +14,25 @@ source file of the GNU LilyPond music typesetter
 
 struct Piano_pedal_bracket
 {
-  DECLARE_SCHEME_CALLBACK (print,(SCM));
+  DECLARE_SCHEME_CALLBACK (print, (SCM));
   static bool has_interface (Grob*);
 };
 
 
-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));
   Spanner *orig = dynamic_cast<Spanner*> (me->original_); 
   
-  Drul_array<bool> broken (false,false);
+  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);
@@ -41,7 +41,7 @@ Piano_pedal_bracket::print (SCM smob)
   if (textbit)
     common = common->common_refpoint (textbit, X_AXIS);
 
-  Interval span_points (0,0);
+  Interval span_points (0, 0);
   Direction d = LEFT;
   do
     {
@@ -57,7 +57,7 @@ Piano_pedal_bracket::print (SCM smob)
            flare[d] = 0.0; 
        }
       
-      Interval ext   = b->extent (common,  X_AXIS);
+      Interval ext   = robust_relative_extent (b, common,  X_AXIS);
       span_points[d] = ext [broken[d] ?  RIGHT : LEFT];
     }
   while (flip (&d) != LEFT);
@@ -70,12 +70,11 @@ Piano_pedal_bracket::print (SCM smob)
     {
       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 () &&
@@ -94,7 +93,7 @@ Piano_pedal_bracket::print (SCM smob)
 
 
 
-ADD_INTERFACE (Piano_pedal_bracket,"piano-pedal-bracket-interface",
+ADD_INTERFACE (Piano_pedal_bracket, "piano-pedal-bracket-interface",
               "The bracket of the piano pedal.  It can be tuned through the regular "
               "bracket properties.",
-              "edge-height shorten-pair bracket-flare pedal-text");
+              "bound-padding edge-height shorten-pair bracket-flare pedal-text");