X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ffigured-bass-continuation.cc;h=6034a34641a0e0b6bfc86c23cc58550155408816;hb=20438eb70a75590b93ec9bad5dea9d289f5b45f4;hp=1969cf30d557be06ca99f3af942d8dd7168d0fe2;hpb=95007e0bdb368a9eb77e241e9952cb3a8651633d;p=lilypond.git

diff --git a/lily/figured-bass-continuation.cc b/lily/figured-bass-continuation.cc
index 1969cf30d5..6034a34641 100644
--- a/lily/figured-bass-continuation.cc
+++ b/lily/figured-bass-continuation.cc
@@ -1,14 +1,24 @@
 /*
-  figured-bass-continuation.cc -- implement Figured_bass_continuation
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2005--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2005 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
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "line-interface.hh"
-#include "lily-guile.hh"
 #include "spanner.hh"
 #include "output-def.hh"
 #include "item.hh"
@@ -16,30 +26,30 @@
 #include "pointer-group-interface.hh"
 #include "axis-group-interface.hh"
 
-
 #include "horizontal-bracket.hh"
 
 struct Figured_bass_continuation
 {
-  static bool has_interface (Grob*);
-  
+  DECLARE_GROB_INTERFACE ();
+
 public:
-  DECLARE_SCHEME_CALLBACK(print, (SCM));
-  DECLARE_SCHEME_CALLBACK(center_on_figures, (SCM, SCM));
+  DECLARE_SCHEME_CALLBACK (print, (SCM));
+  DECLARE_SCHEME_CALLBACK (center_on_figures, (SCM));
 };
 
-MAKE_SCHEME_CALLBACK (Figured_bass_continuation, center_on_figures, 2);
+MAKE_SCHEME_CALLBACK (Figured_bass_continuation, center_on_figures, 1);
 SCM
-Figured_bass_continuation::center_on_figures (SCM grob, SCM axis)
+Figured_bass_continuation::center_on_figures (SCM grob)
 {
-  Spanner *me = dynamic_cast<Spanner*> (unsmob_grob (grob));
-  (void) axis;
-  
+  Spanner *me = dynamic_cast<Spanner *> (unsmob_grob (grob));
   extract_grob_set (me, "figures", figures);
+  if (figures.empty ())
+    return scm_from_double (0.0);
   Grob *common = common_refpoint_of_array (figures, me, Y_AXIS);
 
   Interval ext = Axis_group_interface::relative_group_extent (figures, common, Y_AXIS);
-  
+  if (ext.is_empty ())
+    return scm_from_double (0.0);
   return scm_from_double (ext.center () - me->relative_coordinate (common, Y_AXIS));
 }
 
@@ -47,41 +57,45 @@ 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 *> (unsmob_grob (grob));
+
+  Real thick
+    = me->layout ()->get_dimension (ly_symbol2scm ("line-thickness"))
+      * robust_scm2double (me->get_property ("thickness"), 1);
 
-  Real thick =
-    me->get_layout ()->get_dimension (ly_symbol2scm ("linethickness"))
-    * 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);
+                                                        X_AXIS);
   do
     {
-      spanned[d] 
-	= robust_relative_extent (me->get_bound (d), common, X_AXIS)[RIGHT]
-	- me->relative_coordinate (common, X_AXIS);
+      Item *bound = me->get_bound (d);
+      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);
     }
-  while (flip (&d) !=  LEFT);
+  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,
-	      "figured-bass-continuation-interface",
-	      "Simple extender line between bounds.",
-	      
-	      /* props */
-	      "thickness "
-	      "padding "
-	      "figures "
-	      );
-	      
+ADD_INTERFACE (Figured_bass_continuation,
+               "Simple extender line between bounds.",
+
+               /* properties */
+               "thickness "
+               "padding "
+               "figures "
+              );
+