* lily/lyric-engraver.cc (get_current_rest): New function.

[lilypond.git] / lily / horizontal-bracket.cc

diff --git a/lily/horizontal-bracket.cc b/lily/horizontal-bracket.cc
index 8d74224bfa3307aa64d2e573a3aa50a15b42e6dd..406a4a5279da77d4e3f834bb80c0265963e3fb04 100644 (file)
--- a/lily/horizontal-bracket.cc
+++ b/lily/horizontal-bracket.cc
@@ -11,8 +11,9 @@
 #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
 {
@@ -27,10 +28,8 @@ struct Horizontal_bracket
   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)
@@ -39,31 +38,39 @@ Horizontal_bracket::print (SCM smob)
   Spanner *sp = dynamic_cast<Spanner*> (me);
   Link_array<Grob> gs = Pointer_group_interface__extract_grobs (me,(Grob*)0, "columns");
 
-  if (!gs.size())
+  if (!gs.size ())
     {
-      me->suicide();
+      me->suicide ();
       return SCM_EOL;
     }
   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);
 
-  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));
 
-  Real thickness = Staff_symbol_referencer::line_thickness (me);
-  thickness *= robust_scm2double (me->get_grob_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);
+  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));
+
+  Interval empty;
+  Stencil b
+    = Tuplet_bracket::make_bracket (me, Y_AXIS, Offset (ext.length (), 0),
+                                   edge_height, empty, flare, shorten);
+    
+  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");
+  "columns bracket-flare shorten-pair edge-height");