X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fenclosing-bracket.cc;h=be22297ad7ee50ef85c69e979d7cc4567b41f7f7;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=04ef6094c2a8fdd1bb96741e82aa857a536005df;hpb=b7a0cffbf9d1069860368f289a5b50e9d1d90ba8;p=lilypond.git

diff --git a/lily/enclosing-bracket.cc b/lily/enclosing-bracket.cc
index 04ef6094c2..be22297ad7 100644
--- a/lily/enclosing-bracket.cc
+++ b/lily/enclosing-bracket.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2005--2009 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
@@ -27,27 +27,25 @@
 struct Enclosing_bracket
 {
   DECLARE_GROB_INTERFACE ();
-  
+
 public:
   DECLARE_SCHEME_CALLBACK (print, (SCM));
   DECLARE_SCHEME_CALLBACK (width, (SCM));
 };
 
-
 ADD_INTERFACE (Enclosing_bracket,
-	      "Brackets alongside bass figures.",
-	      
-	      /* properties */
-	      "bracket-flare "
-	      "edge-height "
-	      "elements "
-	      "padding "
-	      "shorten-pair "
-	      "thickness "
-	      );
+               "Brackets alongside bass figures.",
 
-/* ugh: should make bracket interface. */
+               /* properties */
+               "bracket-flare "
+               "edge-height "
+               "elements "
+               "padding "
+               "shorten-pair "
+               "thickness "
+              );
 
+/* ugh: should make bracket interface. */
 
 MAKE_SCHEME_CALLBACK (Enclosing_bracket, width, 1);
 SCM
@@ -56,7 +54,7 @@ Enclosing_bracket::width (SCM grob)
   /*
      UGH. cut & paste code.
   */
-  Grob *me = unsmob_grob (grob);
+  Grob *me = Grob::unsmob (grob);
   extract_grob_set (me, "elements", elements);
   if (elements.empty ())
     {
@@ -64,13 +62,12 @@ Enclosing_bracket::width (SCM grob)
       return SCM_EOL;
     }
 
-  Grob *common_x = common_refpoint_of_array (elements, me, X_AXIS); 
+  Grob *common_x = common_refpoint_of_array (elements, me, X_AXIS);
   Interval xext = Axis_group_interface::relative_group_extent (elements, common_x, X_AXIS);
 
   Stencil left_br = Horizontal_bracket::make_bracket (me, 10.0, Y_AXIS, LEFT);
   Stencil right_br = Horizontal_bracket::make_bracket (me, 10.0, Y_AXIS, LEFT);
 
-
   xext.widen (robust_scm2double (me->get_property ("padding"), 0.25));
   left_br.translate_axis (xext[LEFT], X_AXIS);
   right_br.translate_axis (xext[RIGHT], X_AXIS);
@@ -85,7 +82,7 @@ MAKE_SCHEME_CALLBACK (Enclosing_bracket, print, 1);
 SCM
 Enclosing_bracket::print (SCM grob)
 {
-  Grob *me = unsmob_grob (grob);
+  Grob *me = Grob::unsmob (grob);
   extract_grob_set (me, "elements", elements);
   if (elements.empty ())
     {
@@ -93,7 +90,7 @@ Enclosing_bracket::print (SCM grob)
       return SCM_EOL;
     }
 
-  Grob *common_x = common_refpoint_of_array (elements, me, X_AXIS); 
+  Grob *common_x = common_refpoint_of_array (elements, me, X_AXIS);
   Interval xext = Axis_group_interface::relative_group_extent (elements, common_x, X_AXIS);
   if (xext.is_empty ())
     {
@@ -102,14 +99,14 @@ Enclosing_bracket::print (SCM grob)
     }
 
   Stencil left_br = Horizontal_bracket::make_enclosing_bracket (me, me, elements,
-								Y_AXIS, LEFT);
+                    Y_AXIS, LEFT);
   Stencil right_br = Horizontal_bracket::make_enclosing_bracket (me, me, elements,
-								 Y_AXIS, RIGHT);
+                     Y_AXIS, RIGHT);
 
   xext.widen (robust_scm2double (me->get_property ("padding"), 0.25));
   left_br.translate_axis (xext[LEFT], X_AXIS);
   right_br.translate_axis (xext[RIGHT], X_AXIS);
-  
+
   left_br.add_stencil (right_br);
   left_br.translate_axis (-me->relative_coordinate (common_x, X_AXIS), X_AXIS);