2003 -> 2004

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

diff --git a/lily/horizontal-bracket.cc b/lily/horizontal-bracket.cc
index ef0cc486936ef7ecec62cbf908fd84e6ad425d9d..b2f5942d2f5e8ab414f76ec66734690465d3370b 100644 (file)
--- a/lily/horizontal-bracket.cc
+++ b/lily/horizontal-bracket.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-(c) 2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+(c) 2002--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 
  */
 
@@ -12,6 +12,7 @@
 #include "group-interface.hh"
 #include "directional-element-interface.hh"
 #include "paper-def.hh"
+#include "staff-symbol-referencer.hh"
 
 struct Horizontal_bracket
 {
@@ -50,14 +51,12 @@ Horizontal_bracket::brew_molecule (SCM smob)
   Interval ext = gs.top()->extent (cx, X_AXIS);
   ext.unite (gs[0]->extent (cx, X_AXIS));
 
-  Direction d = Directional_element_interface::get (me);
-  Real t = me->get_paper()->get_var ("linethickness");
+  Direction d = get_grob_direction (me);
 
-  SCM lthick = me->get_grob_property ("thickness");
-  if (gh_number_p (lthick))
-    t *= gh_scm2double (lthick);
+  Real thickness = Staff_symbol_referencer::line_thickness (me);
+  thickness *= robust_scm2double (me->get_grob_property ("thickness"), 1.0);
   
-  Molecule b = Lookup::bracket (X_AXIS, ext, t, - d* 1.0); 
+  Molecule 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);