X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fenclosing-bracket.cc;h=3ccc62b6682a72c38d8e3dae5b8d729559f99379;hb=b872748c6aa8bb721ced458691b38ac2fac5dfc8;hp=e16a8e9bbc5c4ef0873c4aba0a58792697f38fe2;hpb=2eb63c6977706ba261e4ee0674c734a34b3ee904;p=lilypond.git

diff --git a/lily/enclosing-bracket.cc b/lily/enclosing-bracket.cc
index e16a8e9bbc..3ccc62b668 100644
--- a/lily/enclosing-bracket.cc
+++ b/lily/enclosing-bracket.cc
@@ -1,42 +1,50 @@
 /*
-  enclosing-bracket.cc -- implement Enclosing_bracket
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2005--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2005--2007 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 "stencil.hh"
-#include "horizontal-bracket.hh"
+#include "bracket.hh"
 #include "grob.hh"
 #include "axis-group-interface.hh"
 #include "pointer-group-interface.hh"
 
 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
@@ -45,7 +53,7 @@ Enclosing_bracket::width (SCM grob)
   /*
      UGH. cut & paste code.
   */
-  Grob *me = unsmob_grob (grob);
+  Grob *me = unsmob<Grob> (grob);
   extract_grob_set (me, "elements", elements);
   if (elements.empty ())
     {
@@ -53,12 +61,13 @@ 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);
-
+  Stencil left_br =
+    Bracket::make_axis_constrained_bracket (me, 10.0, Y_AXIS, LEFT);
+  Stencil right_br =
+    Bracket::make_axis_constrained_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);
@@ -74,7 +83,7 @@ MAKE_SCHEME_CALLBACK (Enclosing_bracket, print, 1);
 SCM
 Enclosing_bracket::print (SCM grob)
 {
-  Grob *me = unsmob_grob (grob);
+  Grob *me = unsmob<Grob> (grob);
   extract_grob_set (me, "elements", elements);
   if (elements.empty ())
     {
@@ -82,7 +91,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 ())
     {
@@ -90,15 +99,15 @@ Enclosing_bracket::print (SCM grob)
       xext = Interval (0, 0);
     }
 
-  Stencil left_br = Horizontal_bracket::make_enclosing_bracket (me, me, elements,
-								Y_AXIS, LEFT);
-  Stencil right_br = Horizontal_bracket::make_enclosing_bracket (me, me, elements,
-								 Y_AXIS, RIGHT);
+  Stencil left_br =
+    Bracket::make_enclosing_bracket (me, me, elements, Y_AXIS, LEFT);
+  Stencil right_br =
+    Bracket::make_enclosing_bracket (me, me, elements, 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);