* lily/context-def.cc (filter_performers): don't go to cdrloc if

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

diff --git a/lily/horizontal-bracket.cc b/lily/horizontal-bracket.cc
index a172d85358199b156081a9f27427368edfe8d94f..4961721496ee18c0939e96fdfc7ac52b5e7420be 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--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+(c) 2002--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 
  */
 
@@ -12,10 +12,11 @@
 #include "group-interface.hh"
 #include "directional-element-interface.hh"
 #include "paper-def.hh"
+#include "staff-symbol-referencer.hh"
 
 struct Horizontal_bracket
 {
-  DECLARE_SCHEME_CALLBACK (brew_molecule, (SCM));
+  DECLARE_SCHEME_CALLBACK (print, (SCM));
   static bool has_interface (Grob*);
 };
 
@@ -26,43 +27,38 @@ struct Horizontal_bracket
   This doesn't look very elegant: should support winged edges.
 
   Support texts on the brackets?
-
 */
-
-MAKE_SCHEME_CALLBACK(Horizontal_bracket, brew_molecule, 1);
+MAKE_SCHEME_CALLBACK (Horizontal_bracket, print, 1);
 
 SCM
-Horizontal_bracket::brew_molecule (SCM smob)
+Horizontal_bracket::print (SCM smob)
 {
   Grob * me = unsmob_grob (smob);
   Spanner *sp = dynamic_cast<Spanner*> (me);
   Link_array<Grob> gs = Pointer_group_interface__extract_grobs (me,(Grob*)0, "columns");
 
-  if (!gs.size())
+  if (!gs.size ())
     {
-      me->suicide();
+      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);
+  Interval ext = gs.top ()->extent (cx, X_AXIS);
   ext.unite (gs[0]->extent (cx, X_AXIS));
 
   Direction d = get_grob_direction (me);
-  Real lt =me->get_paper()->get_realvar (ly_symbol2scm ("linethickness"));
-  Real t = lt;
 
-  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_property ("thickness"), 1.0);
   
-  Molecule b = Lookup::bracket (X_AXIS, ext, t, - d* 1.0, lt); 
+  Stencil 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);
 
-  return b.smobbed_copy();  
+  return b.smobbed_copy ();  
 }
 
 ADD_INTERFACE (Horizontal_bracket,"horizontal-bracket-interface",