X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fhorizontal-bracket.cc;h=c4b598761ab52078d853e53d9ad1842078111df7;hb=30a7c603fa9977c1a4a68868475d465e8f7132ca;hp=0164092e81a2c41fa0f066afa8ef75306ea5f687;hpb=b1323f33e9aa4b9eea05eefb8755c907d4d762d4;p=lilypond.git

diff --git a/lily/horizontal-bracket.cc b/lily/horizontal-bracket.cc
index 0164092e81..c4b598761a 100644
--- a/lily/horizontal-bracket.cc
+++ b/lily/horizontal-bracket.cc
@@ -1,69 +1,77 @@
-/*   
-  horizontal-bracket.cc --  implement  Horizontal_bracket
+/*
+  horizontal-bracket.cc -- implement  Horizontal_bracket
 
   source file of the GNU LilyPond music typesetter
 
-(c) 2002--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-
- */
+  (c) 2002--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+*/
 
 #include "side-position-interface.hh"
 #include "lookup.hh"
 #include "group-interface.hh"
 #include "directional-element-interface.hh"
-#include "paper-def.hh"
+#include "output-def.hh"
 #include "staff-symbol-referencer.hh"
+#include "tuplet-bracket.hh"	// ugh.
 
 struct Horizontal_bracket
 {
   DECLARE_SCHEME_CALLBACK (print, (SCM));
-  static bool has_interface (Grob*);
+  static bool has_interface (Grob *);
 };
 
-
 /*
   TODO:
 
   This doesn't look very elegant: should support winged edges.
 
   Support texts on the brackets?
-
 */
-
-MAKE_SCHEME_CALLBACK(Horizontal_bracket, print, 1);
+MAKE_SCHEME_CALLBACK (Horizontal_bracket, print, 1);
 
 SCM
 Horizontal_bracket::print (SCM smob)
 {
-  Grob * me = unsmob_grob (smob);
-  Spanner *sp = dynamic_cast<Spanner*> (me);
-  Link_array<Grob> gs = Pointer_group_interface__extract_grobs (me,(Grob*)0, "columns");
+  Grob *me = unsmob_grob (smob);
+  Spanner *sp = dynamic_cast<Spanner *> (me);
+  Link_array<Grob> gs = extract_grob_array (me, ly_symbol2scm ("columns"));
 
-  if (!gs.size())
+  if (!gs.size ())
     {
-      me->suicide();
+      me->suicide ();
       return SCM_EOL;
     }
-  Grob * cx = common_refpoint_of_array (gs, me, X_AXIS);
+  Grob *cx = common_refpoint_of_array (gs, me, X_AXIS);
   cx = cx->common_refpoint (sp->get_bound (LEFT), X_AXIS);
-  cx = cx->common_refpoint (sp->get_bound (RIGHT),X_AXIS);
+  cx = cx->common_refpoint (sp->get_bound (RIGHT), X_AXIS);
 
-  Interval ext = gs.top()->extent (cx, X_AXIS);
+  Interval ext = gs.top ()->extent (cx, X_AXIS);
   ext.unite (gs[0]->extent (cx, X_AXIS));
 
-  Direction d = get_grob_direction (me);
+  Drul_array<Real> edge_height = robust_scm2interval (me->get_property ("edge-height"),
+						      Interval (1.0, 1.0));
+
+  Drul_array<Real> flare = robust_scm2interval (me->get_property ("bracket-flare"),
+						Interval (0, 0));
+
+  Drul_array<Real> shorten = robust_scm2interval (me->get_property ("shorten-pair"),
+						  Interval (0, 0));
+
+  // Make sure that it points in the correct direction:
+  Real dir = get_grob_direction (me);
+  scale_drul (&edge_height, -dir);
+
+  Interval empty;
+  Stencil b
+    = Tuplet_bracket::make_bracket (me, Y_AXIS, Offset (ext.length (), 0),
+				    edge_height, empty, flare, shorten);
 
-  Real thickness = Staff_symbol_referencer::line_thickness (me);
-  thickness *= robust_scm2double (me->get_property ("thickness"), 1.0);
-  
-  Stencil b = Lookup::bracket (X_AXIS, ext, thickness, - d* 1.0, thickness/2); 
-  
-  b.translate_axis ( - sp->get_bound (LEFT)->relative_coordinate (cx, X_AXIS), X_AXIS);
+  b.translate_axis (ext[LEFT] - sp->get_bound (LEFT)->relative_coordinate (cx, X_AXIS), X_AXIS);
 
-  return b.smobbed_copy();  
+  return b.smobbed_copy ();
 }
 
-ADD_INTERFACE (Horizontal_bracket,"horizontal-bracket-interface",
-  "A horizontal bracket encompassing notes.",
-  "thickness columns direction");
+ADD_INTERFACE (Horizontal_bracket, "horizontal-bracket-interface",
+	       "A horizontal bracket encompassing notes.",
+	       "columns bracket-flare shorten-pair edge-height");