X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpiano-pedal-bracket.cc;h=a61474e51ba9a06bd291bbfc5ad5960a4db1330a;hb=1e81814ea61ea5c32bf351428b8a243dfa111660;hp=75caaea3db1ffd39c8084a2e1ab185506507871f;hpb=58bcc84c9480dae1b21bc24d8396b91fe19e0131;p=lilypond.git

diff --git a/lily/piano-pedal-bracket.cc b/lily/piano-pedal-bracket.cc
index 75caaea3db..a61474e51b 100644
--- a/lily/piano-pedal-bracket.cc
+++ b/lily/piano-pedal-bracket.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2003--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2003--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "stencil.hh"
@@ -14,7 +14,7 @@
 struct Piano_pedal_bracket
 {
   DECLARE_SCHEME_CALLBACK (print, (SCM));
-  static bool has_interface (Grob *);
+  DECLARE_GROB_INTERFACE ();
 };
 
 MAKE_SCHEME_CALLBACK (Piano_pedal_bracket, print, 1);
@@ -22,7 +22,7 @@ SCM
 Piano_pedal_bracket::print (SCM smob)
 {
   Spanner *me = dynamic_cast<Spanner *> (unsmob_grob (smob));
-  Spanner *orig = dynamic_cast<Spanner *> (me->original_);
+  Spanner *orig = dynamic_cast<Spanner *> (me->original ());
 
   Drul_array<bool> broken (false, false);
   Drul_array<Real> height = robust_scm2drul
@@ -34,7 +34,7 @@ Piano_pedal_bracket::print (SCM smob)
 
   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);
@@ -48,7 +48,8 @@ Piano_pedal_bracket::print (SCM smob)
       if (broken[d])
 	{
 	  if (orig
-	      && ((d == RIGHT && me->get_break_index () != orig->broken_intos_.size () - 1)
+	      && ((d == RIGHT
+		   && me->get_break_index () != orig->broken_intos_.size () - 1)
 		  || (d == LEFT && me->get_break_index ())))
 	    height[d] = 0.0;
 	  else
@@ -88,7 +89,14 @@ Piano_pedal_bracket::print (SCM smob)
   return m.smobbed_copy ();
 }
 
-ADD_INTERFACE (Piano_pedal_bracket, "piano-pedal-bracket-interface",
-	       "The bracket of the piano pedal.  It can be tuned through the regular "
-	       "bracket properties.",
-	       "bound-padding edge-height shorten-pair bracket-flare pedal-text");
+ADD_INTERFACE (Piano_pedal_bracket,
+	       "The bracket of the piano pedal.  It can be tuned through"
+	       " the regular bracket properties.",
+
+	       /* properties */
+	       "bound-padding "
+	       "edge-height "
+	       "shorten-pair "
+	       "bracket-flare "
+	       "pedal-text "
+	       );