X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fhorizontal-bracket.cc;h=b453985b091b6ef31c7ff16f3b6f5110597d6232;hb=a6a51abfd0195a3cf7d6ea095cf69808852f21ce;hp=56f9d32cfa56a4d7a924dd9be8332b7172402162;hpb=a0d50b4476497264576d9a74e48cc97d75d35e4b;p=lilypond.git

diff --git a/lily/horizontal-bracket.cc b/lily/horizontal-bracket.cc
index 56f9d32cfa..b453985b09 100644
--- a/lily/horizontal-bracket.cc
+++ b/lily/horizontal-bracket.cc
@@ -1,95 +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>
+  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.
+
+  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.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "horizontal-bracket.hh"	
+#include "horizontal-bracket.hh"
 
-#include "lookup.hh"
-#include "side-position-interface.hh"
+#include "bracket.hh"
+#include "stencil.hh"
 #include "pointer-group-interface.hh"
 #include "directional-element-interface.hh"
-#include "output-def.hh"
-#include "staff-symbol-referencer.hh"
-#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);
-}
-
-
-Stencil
-Horizontal_bracket::make_enclosing_bracket (Grob *me, Grob *refpoint,
-					    Link_array<Grob> grobs,
-					    Axis a, Direction dir)
-{
-  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:
-
-  Support texts on the brackets?
-*/
+#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 *me = unsmob<Spanner> (smob);
   extract_grob_set (me, "columns", gs);
+
+  vector<Grob *> enclosed = gs;
   if (!gs.size ())
     {
       me->suicide ();
       return SCM_EOL;
     }
 
-  Stencil b = make_enclosing_bracket (me, me, gs, X_AXIS, get_grob_direction (me));
+  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");
+               "A horizontal bracket encompassing notes.",
+
+               /* properties */
+               "bracket-flare "
+               "bracket-text "
+               "columns "
+               "edge-height "
+               "shorten-pair "
+               "connect-to-neighbor "
+              );