X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fenclosing-bracket.cc;h=0ae950879e987f65564b2299bc4f9f371491f7fd;hb=5bbfc22fce036b9b69df5e420de93e11da23c05e;hp=2e10d71fdf60ea1bb42c3483c53dc76e4ac6df87;hpb=75eebcb49e52d296b1da3e1074e0825d2c780db4;p=lilypond.git

diff --git a/lily/enclosing-bracket.cc b/lily/enclosing-bracket.cc
index 2e10d71fdf..0ae950879e 100644
--- a/lily/enclosing-bracket.cc
+++ b/lily/enclosing-bracket.cc
@@ -1,10 +1,21 @@
 /*
-  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--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2005--2006 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"
@@ -15,54 +26,87 @@
 
 struct Enclosing_bracket
 {
-  static bool has_interface (Grob*);
-  
+  DECLARE_GROB_INTERFACE ();
+
 public:
-  DECLARE_SCHEME_CALLBACK(print, (SCM));
+  DECLARE_SCHEME_CALLBACK (print, (SCM));
+  DECLARE_SCHEME_CALLBACK (width, (SCM));
 };
 
+ADD_INTERFACE (Enclosing_bracket,
+               "Brackets alongside bass figures.",
 
-ADD_INTERFACE(Enclosing_bracket,
-	      "enclosing-bracket-interface",
-	      "Brackets alongside bass figures.",
-	      
-	      /* props */
-	      "bracket-flare "
-	      "shorten-pair "
-	      "edge-height "
-	      "padding "
-	      "thickness "
-	      "elements "
-	      );
+               /* properties */
+               "bracket-flare "
+               "edge-height "
+               "elements "
+               "padding "
+               "shorten-pair "
+               "thickness "
+              );
 
 /* ugh: should make bracket interface. */
 
+MAKE_SCHEME_CALLBACK (Enclosing_bracket, width, 1);
+SCM
+Enclosing_bracket::width (SCM grob)
+{
+  /*
+     UGH. cut & paste code.
+  */
+  Grob *me = Grob::unsmob (grob);
+  extract_grob_set (me, "elements", elements);
+  if (elements.empty ())
+    {
+      me->suicide ();
+      return SCM_EOL;
+    }
+
+  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);
+
+  left_br.add_stencil (right_br);
+  left_br.translate_axis (-me->relative_coordinate (common_x, X_AXIS), X_AXIS);
+
+  return ly_interval2scm (left_br.extent (X_AXIS));
+}
 
 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.is_empty ())
+  if (elements.empty ())
     {
       me->suicide ();
       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 ())
+    {
+      me->programming_error ("elements have no X extent.");
+      xext = Interval (0, 0);
+    }
 
   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);