* lily/horizontal-bracket.cc (make_bracket): new function.

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

diff --git a/lily/horizontal-bracket.cc b/lily/horizontal-bracket.cc
index 57225c49d44d0f9f51a3ca679732455dedf9f4bb..8c206bb7292a06e518414eb6a7890db688dab1df 100644 (file)
--- a/lily/horizontal-bracket.cc
+++ b/lily/horizontal-bracket.cc
@@ -13,12 +13,7 @@
 #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 *);
-};
+#include "horizontal-bracket.hh"       // ugh.
 
 /*
   TODO:
@@ -27,51 +22,70 @@ struct Horizontal_bracket
 
   Support texts on the brackets?
 */
-MAKE_SCHEME_CALLBACK (Horizontal_bracket, print, 1);
 
-SCM
-Horizontal_bracket::print (SCM smob)
+Stencil
+Horizontal_bracket::make_bracket (Grob *me, Grob *common,
+                                 Link_array<Grob> grobs, Axis a, Direction dir)
 {
-  Grob *me = unsmob_grob (smob);
-  Spanner *sp = dynamic_cast<Spanner *> (me);
+  Axis other = other_axis (a);
+  
+  Grob *cx = common_refpoint_of_array (grobs, common, a);
 
-  extract_grob_set (me, "columns", gs);
-  if (!gs.size ())
-    {
-      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);
-  ext.unite (gs[0]->extent (cx, X_AXIS));
+  Interval ext = grobs.top ()->extent (cx, a);
+  ext.unite (grobs[0]->extent (cx, a));
 
   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);
+  scale_drul (&edge_height, Real (-dir));
 
   Interval empty;
+  Offset start;
+  start[a] = ext.length ();
   Stencil b
-    = Tuplet_bracket::make_bracket (me, Y_AXIS, Offset (ext.length (), 0),
+    = Tuplet_bracket::make_bracket (me, other, start, 
                                    edge_height, empty, flare, shorten);
 
-  b.translate_axis (ext[LEFT] - sp->get_bound (LEFT)->relative_coordinate (cx, X_AXIS), X_AXIS);
+  b.translate_axis (ext[LEFT], a);
+
+  return b;
+}
+
+MAKE_SCHEME_CALLBACK (Horizontal_bracket, print, 1);
+SCM
+Horizontal_bracket::print (SCM smob)
+{
+  Grob *me = unsmob_grob (smob);
+  Spanner *sp = dynamic_cast<Spanner *> (me);
+
+  extract_grob_set (me, "columns", gs);
+  if (!gs.size ())
+    {
+      me->suicide ();
+      return SCM_EOL;
+    }
+
+  Grob *cx = me->common_refpoint (sp->get_bound (LEFT), X_AXIS);
+  cx = cx->common_refpoint (sp->get_bound (RIGHT), X_AXIS);
+
+  Stencil b = make_bracket (me, cx, gs, X_AXIS, get_grob_direction (me));
+ 
+  b.translate_axis (- sp->get_bound (LEFT)->relative_coordinate (cx, X_AXIS), X_AXIS);
 
   return b.smobbed_copy ();
 }
 
 ADD_INTERFACE (Horizontal_bracket, "horizontal-bracket-interface",
               "A horizontal bracket encompassing notes.",
-              "columns bracket-flare shorten-pair edge-height");
+
+              /* props */                
+              "columns "
+              "bracket-flare "
+              "shorten-pair "
+              "edge-height");