X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpiano-pedal-bracket.cc;h=d13f56414f4f52c3f8939f6b7c306a94360477d9;hb=8659a99f233f5c4684292728e7ad4206669b35b0;hp=312459e67ba7addd5f9a4cd23eb021d870f8d807;hpb=ea4fdf1afa3e6bb9a7c586f5a533be93ff3312d3;p=lilypond.git

diff --git a/lily/piano-pedal-bracket.cc b/lily/piano-pedal-bracket.cc
index 312459e67b..d13f56414f 100644
--- a/lily/piano-pedal-bracket.cc
+++ b/lily/piano-pedal-bracket.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2003--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2003--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -20,19 +20,19 @@
 #include "stencil.hh"
 #include "spanner.hh"
 #include "item.hh"
-#include "tuplet-bracket.hh"
+#include "bracket.hh"
+#include "axis-group-interface.hh"
 
 struct Piano_pedal_bracket
 {
   DECLARE_SCHEME_CALLBACK (print, (SCM));
-  DECLARE_GROB_INTERFACE ();
 };
 
 MAKE_SCHEME_CALLBACK (Piano_pedal_bracket, print, 1);
 SCM
 Piano_pedal_bracket::print (SCM smob)
 {
-  Spanner *me = dynamic_cast<Spanner *> (unsmob_grob (smob));
+  Spanner *me = unsmob<Spanner> (smob);
   Spanner *orig = dynamic_cast<Spanner *> (me->original ());
 
   Drul_array<bool> broken (false, false);
@@ -45,14 +45,13 @@ 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_object ("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);
-  Direction d = LEFT;
-  do
+  for (LEFT_and_RIGHT (d))
     {
       Item *b = me->get_bound (d);
       broken[d] = b->break_status_dir () != CENTER;
@@ -66,12 +65,12 @@ Piano_pedal_bracket::print (SCM smob)
           else
             flare[d] = 0.0;
 
-          span_points[d] = robust_relative_extent (b, common, X_AXIS)[RIGHT];
+          span_points[d]
+            = Axis_group_interface::generic_bound_extent (b, common, X_AXIS)[RIGHT];
         }
       else
         span_points[d] = b->relative_coordinate (common, X_AXIS);
     }
-  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
@@ -90,11 +89,9 @@ Piano_pedal_bracket::print (SCM smob)
   if (!span_points.is_empty ()
       && span_points.length () > 0.001)
     {
-      m = Tuplet_bracket::make_bracket (me, Y_AXIS,
-                                        Offset (span_points.length (), 0),
-                                        height,
-                                        Interval (),
-                                        flare, shorten);
+      m = Bracket::make_bracket (
+        me, Y_AXIS, Offset (span_points.length (), 0), height,
+        Interval (), flare, shorten);
     }
   m.translate_axis (span_points[LEFT]
                     - me->relative_coordinate (common, X_AXIS), X_AXIS);