X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ffigured-bass-continuation.cc;h=b3c36dace52317879c411b0138feae3b3850518b;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=283731ff80d4f22380513d39bddbd730780e9322;hpb=a6bd229f7fe1dc4a03478e14ccc0c0c66b225061;p=lilypond.git

diff --git a/lily/figured-bass-continuation.cc b/lily/figured-bass-continuation.cc
index 283731ff80..b3c36dace5 100644
--- a/lily/figured-bass-continuation.cc
+++ b/lily/figured-bass-continuation.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2005--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2005--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 
   LilyPond is free software: you can redistribute it and/or modify
@@ -26,13 +26,12 @@
 #include "pointer-group-interface.hh"
 #include "axis-group-interface.hh"
 
-
 #include "horizontal-bracket.hh"
 
 struct Figured_bass_continuation
 {
   DECLARE_GROB_INTERFACE ();
-  
+
 public:
   DECLARE_SCHEME_CALLBACK (print, (SCM));
   DECLARE_SCHEME_CALLBACK (center_on_figures, (SCM));
@@ -42,7 +41,7 @@ MAKE_SCHEME_CALLBACK (Figured_bass_continuation, center_on_figures, 1);
 SCM
 Figured_bass_continuation::center_on_figures (SCM grob)
 {
-  Spanner *me = dynamic_cast<Spanner*> (unsmob_grob (grob));
+  Spanner *me = dynamic_cast<Spanner *> (Grob::unsmob (grob));
   extract_grob_set (me, "figures", figures);
   if (figures.empty ())
     return scm_from_double (0.0);
@@ -58,45 +57,44 @@ MAKE_SCHEME_CALLBACK (Figured_bass_continuation, print, 1);
 SCM
 Figured_bass_continuation::print (SCM grob)
 {
-  Spanner *me = dynamic_cast<Spanner*> (unsmob_grob (grob));
+  Spanner *me = dynamic_cast<Spanner *> (Grob::unsmob (grob));
+
+  Real thick
+    = me->layout ()->get_dimension (ly_symbol2scm ("line-thickness"))
+      * robust_scm2double (me->get_property ("thickness"), 1);
 
-  Real thick =
-    me->layout ()->get_dimension (ly_symbol2scm ("line-thickness"))
-    * robust_scm2double (me->get_property ("thickness"), 1);
-  
   Interval spanned;
-  Direction d = LEFT;
+
   Grob *common = me->get_bound (LEFT)->common_refpoint (me->get_bound (RIGHT),
-							X_AXIS);
-  do
+                                                        X_AXIS);
+  for (LEFT_and_RIGHT (d))
     {
       Item *bound = me->get_bound (d);
-      Direction extdir =
-	(d == LEFT && to_boolean (bound->get_property ("implicit")))
-	? LEFT : RIGHT;
+      Direction extdir
+        = (d == LEFT && to_boolean (bound->get_property ("implicit")))
+          ? LEFT : RIGHT;
 
-      spanned[d] 
-	= robust_relative_extent (bound, common, X_AXIS)[extdir]
-	- me->relative_coordinate (common, X_AXIS);
+      spanned[d]
+        = robust_relative_extent (bound, common, X_AXIS)[extdir]
+          - me->relative_coordinate (common, X_AXIS);
     }
-  while (flip (&d) !=  LEFT);
   spanned.widen (- robust_scm2double (me->get_property ("padding"), 0.2));
-  
+
   Stencil extender;
   if (!spanned.is_empty ())
     extender = Line_interface::make_line (thick,
-					  Offset (spanned[LEFT], 0),
-					  Offset (spanned[RIGHT], 0));
-  
+                                          Offset (spanned[LEFT], 0),
+                                          Offset (spanned[RIGHT], 0));
+
   return extender.smobbed_copy ();
 }
 
 ADD_INTERFACE (Figured_bass_continuation,
-	      "Simple extender line between bounds.",
-	      
-	      /* properties */
-	      "thickness "
-	      "padding "
-	      "figures "
-	      );
-	      
+               "Simple extender line between bounds.",
+
+               /* properties */
+               "thickness "
+               "padding "
+               "figures "
+              );
+