X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fhorizontal-bracket.cc;h=b453985b091b6ef31c7ff16f3b6f5110597d6232;hb=90e4d7057f3857da049dfda3d130017d4719bd6b;hp=8c206bb7292a06e518414eb6a7890db688dab1df;hpb=30eb1ded55e8d8b17495b96a3741750fe34d3599;p=lilypond.git

diff --git a/lily/horizontal-bracket.cc b/lily/horizontal-bracket.cc
index 8c206bb729..b453985b09 100644
--- a/lily/horizontal-bracket.cc
+++ b/lily/horizontal-bracket.cc
@@ -1,91 +1,66 @@
 /*
-  horizontal-bracket.cc -- implement  Horizontal_bracket
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2002--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2002--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-*/
-
-#include "side-position-interface.hh"
-#include "lookup.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 "horizontal-bracket.hh"	// ugh.
-
-/*
-  TODO:
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
 
-  This doesn't look very elegant: should support winged edges.
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
 
-  Support texts on the brackets?
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-Stencil
-Horizontal_bracket::make_bracket (Grob *me, Grob *common,
-				  Link_array<Grob> grobs, Axis a, Direction dir)
-{
-  Axis other = other_axis (a);
-  
-  Grob *cx = common_refpoint_of_array (grobs, common, a);
-
-  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:
-  scale_drul (&edge_height, Real (-dir));
-
-  Interval empty;
-  Offset start;
-  start[a] = ext.length ();
-  Stencil b
-    = Tuplet_bracket::make_bracket (me, other, start, 
-				    edge_height, empty, flare, shorten);
+#include "horizontal-bracket.hh"
 
-  b.translate_axis (ext[LEFT], a);
-
-  return b;
-}
+#include "bracket.hh"
+#include "stencil.hh"
+#include "pointer-group-interface.hh"
+#include "directional-element-interface.hh"
+#include "spanner.hh"
+#include "item.hh"
 
 MAKE_SCHEME_CALLBACK (Horizontal_bracket, print, 1);
 SCM
 Horizontal_bracket::print (SCM smob)
 {
-  Grob *me = unsmob_grob (smob);
-  Spanner *sp = dynamic_cast<Spanner *> (me);
-
+  Spanner *me = unsmob<Spanner> (smob);
   extract_grob_set (me, "columns", gs);
+
+  vector<Grob *> enclosed = 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);
+  for (LEFT_and_RIGHT (d))
+    {
+      Item *b = me->get_bound (d);
+      if (b->break_status_dir ())
+        enclosed.push_back (b);
+    }
 
+  Stencil b = Bracket::make_enclosing_bracket (me, me, enclosed, X_AXIS,
+                                               get_grob_direction (me));
   return b.smobbed_copy ();
 }
 
-ADD_INTERFACE (Horizontal_bracket, "horizontal-bracket-interface",
-	       "A horizontal bracket encompassing notes.",
-
-	       /* props */		  
-	       "columns "
-	       "bracket-flare "
-	       "shorten-pair "
-	       "edge-height");
+ADD_INTERFACE (Horizontal_bracket,
+               "A horizontal bracket encompassing notes.",
+
+               /* properties */
+               "bracket-flare "
+               "bracket-text "
+               "columns "
+               "edge-height "
+               "shorten-pair "
+               "connect-to-neighbor "
+              );