* The grand 2005-2006 replace.

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

diff --git a/lily/horizontal-bracket.cc b/lily/horizontal-bracket.cc
index 654a1e0015857a41cf59f4213867518ac2f19252..652370a8eb4f2913f527970c12773446608a2a21 100644 (file)
--- a/lily/horizontal-bracket.cc
+++ b/lily/horizontal-bracket.cc
@@ -1,73 +1,95 @@
 /*
-  horizontal-bracket.cc -- implement  Horizontal_bracket
+  horizontal-bracket.cc -- implement Horizontal_bracket
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2002--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2002--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-#include "side-position-interface.hh"
+#include "horizontal-bracket.hh"       
+
 #include "lookup.hh"
-#include "group-interface.hh"
+#include "side-position-interface.hh"
+#include "pointer-group-interface.hh"
 #include "directional-element-interface.hh"
 #include "output-def.hh"
 #include "staff-symbol-referencer.hh"
-#include "tuplet-bracket.hh"   // ugh.
+#include "tuplet-bracket.hh"
+#include "axis-group-interface.hh"
+
+
+Stencil
+Horizontal_bracket::make_bracket (Grob *me,
+                                 Real length,
+                                 Axis a, Direction dir)                                 
+{
+  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:
+  scale_drul (&edge_height, Real (-dir));
+ 
+  Interval empty;
+  Offset start;
+  start[a] = length;
+
+  /*
+    ugh, Tuplet_bracket should use Horizontal_bracket, not the other way around. 
+  */
+  return Tuplet_bracket::make_bracket (me, other_axis (a), start, 
+                                      edge_height, empty, flare, shorten);
+}
 
-struct Horizontal_bracket
+
+Stencil
+Horizontal_bracket::make_enclosing_bracket (Grob *me, Grob *refpoint,
+                                           Link_array<Grob> grobs,
+                                           Axis a, Direction dir)
 {
-  DECLARE_SCHEME_CALLBACK (print, (SCM));
-  static bool has_interface (Grob *);
-};
+  Grob *common = common_refpoint_of_array (grobs, refpoint, a);
+  Interval ext = Axis_group_interface::relative_group_extent (grobs, common, a);
+
+  Stencil b = make_bracket (me, ext.length(), a, dir);
+  b.translate_axis (ext[LEFT] - refpoint->relative_coordinate (common, a), a);
+
+  return b;
+}
+
 
 /*
   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 = extract_grob_array (me, ly_symbol2scm ("columns"));
-
+  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));
-
-  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));
-
-  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);
 
+  Stencil b = make_enclosing_bracket (me, me, gs, X_AXIS, get_grob_direction (me));
   return b.smobbed_copy ();
 }
 
-ADD_INTERFACE (Horizontal_bracket, "horizontal-bracket-interface",
+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");