X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fenclosing-bracket.cc;h=61462de17a789f21595c3f4d1d0cfa4eb0ca04df;hb=c9720d4d521eb2fe7dd916334239fa0f607b256a;hp=90b9211c63f49e80cc9db0bd7a425c2517369ca2;hpb=4348b2762d1101d731add0c01bb77a9ce162efec;p=lilypond.git

diff --git a/lily/enclosing-bracket.cc b/lily/enclosing-bracket.cc
index 90b9211c63..61462de17a 100644
--- a/lily/enclosing-bracket.cc
+++ b/lily/enclosing-bracket.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 */
 
@@ -15,36 +15,69 @@
 
 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,
-	      "enclosing-bracket-interface",
+ADD_INTERFACE (Enclosing_bracket,
+	      
 	      "Brackets alongside bass figures.",
 	      
 	      /* props */
 	      "bracket-flare "
-	      "shorten-pair "
 	      "edge-height "
+	      "elements "
 	      "padding "
+	      "shorten-pair "
 	      "thickness "
-	      "elements "
 	      );
 
 /* ugh: should make bracket interface. */
 
 
+MAKE_SCHEME_CALLBACK (Enclosing_bracket, width, 1);
+SCM
+Enclosing_bracket::width (SCM grob)
+{
+  /*
+     UGH. cut & paste code.
+  */
+  Grob *me = unsmob_grob (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);
   extract_grob_set (me, "elements", elements);
-  if (elements.is_empty ())
+  if (elements.empty ())
     {
       me->suicide ();
       return SCM_EOL;
@@ -52,12 +85,16 @@ Enclosing_bracket::print (SCM grob)
 
   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_bracket (me, me, elements,
-						      Y_AXIS, LEFT);
-  Stencil right_br = Horizontal_bracket::make_bracket (me, me, elements,
-						       Y_AXIS, RIGHT);
+  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);
 
   xext.widen (robust_scm2double (me->get_property ("padding"), 0.25));
   left_br.translate_axis (xext[LEFT], X_AXIS);