*** empty log message ***

[lilypond.git] / lily / measure-grouping-spanner.cc

diff --git a/lily/measure-grouping-spanner.cc b/lily/measure-grouping-spanner.cc
index 7892e7cbb1f9c721bdb1da853a3ac79e175f8e3e..1c9e03fbdf42fff0abb18559d5f52c8eecf05484 100644 (file)
--- a/lily/measure-grouping-spanner.cc
+++ b/lily/measure-grouping-spanner.cc
@@ -1,60 +1,62 @@
 /*   
-measure-grouping-spanner.cc --  implement Measure_grouping
+       measure-grouping-spanner.cc --  implement Measure_grouping
 
-source file of the GNU LilyPond music typesetter
+       source file of the GNU LilyPond music typesetter
 
-(c) 2002--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+       (c) 2002--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 
  */
-#include "paper-def.hh"
-#include "spanner.hh"
+
 #include "measure-grouping-spanner.hh"
+
+#include "output-def.hh"
+#include "spanner.hh"
 #include "lookup.hh" 
 #include "item.hh"
+#include "staff-symbol-referencer.hh"
 
-MAKE_SCHEME_CALLBACK (Measure_grouping, brew_molecule, 1);
+MAKE_SCHEME_CALLBACK (Measure_grouping, print, 1);
 SCM 
-Measure_grouping::brew_molecule (SCM grob)
+Measure_grouping::print (SCM grob)
 {
   Spanner * me = dynamic_cast<Spanner*> (unsmob_grob (grob));
 
-  /*
-    TODO: robustify.
-   */
-  SCM which = me->get_grob_property ("type");
-  SCM thick = me->get_grob_property ("thickness");
-  SCM height = me->get_grob_property ("height");
+  SCM which = me->get_property ("style");
+  Real height = robust_scm2double (me->get_property ("height"), 1);
 
-  Real t = me->get_paper ()->get_var ("linethickness") *   gh_scm2double (thick); 
-  Grob *common = me->get_bound(LEFT)->common_refpoint (me->get_bound (RIGHT),
+  Real t = Staff_symbol_referencer::line_thickness (me) * robust_scm2double (me->get_property ("thickness"), 1);
+  Grob *common = me->get_bound (LEFT)->common_refpoint (me->get_bound (RIGHT),
                                                       X_AXIS);
 
-  Interval rext = me->get_bound (RIGHT)->extent (common, X_AXIS);
-  
-  
-  Real w =(rext.empty_b()
-          ? me->get_bound (RIGHT)->relative_coordinate (common, X_AXIS)
-          : rext[RIGHT])
-    - me->get_bound (LEFT)->relative_coordinate (common, X_AXIS);
+  Real right_point = robust_relative_extent (me->get_bound (RIGHT),
+                                            common, X_AXIS).linear_combination (CENTER);
+  Real left_point = me->get_bound (LEFT)->relative_coordinate (common, X_AXIS);
 
-  Interval iv (0,w);
 
-  Molecule m; 
+  
+  Interval iv (left_point, right_point);
+  Stencil m;
+  
+  /*
+    TODO: use line interface
+   */
   if (which == ly_symbol2scm ("bracket"))
     {
-      m = Lookup::bracket (X_AXIS, iv, t,-gh_scm2double (height));
+      m = Lookup::bracket (X_AXIS, iv, t, -height, t);
     }
   else if (which == ly_symbol2scm ("triangle"))
     {
-      m = Lookup::triangle (iv, t, gh_scm2double (height));
+      m = Lookup::triangle (iv, t, height);
     }
 
   m.align_to (Y_AXIS, DOWN);
-  return m.smobbed_copy();
+  m.translate_axis (- me->relative_coordinate (common, X_AXIS), X_AXIS);
+  return m.smobbed_copy ();
 }
 
 ADD_INTERFACE (Measure_grouping,"measure-grouping-interface",
-              "indicate groups of beats. Valid choices for 'type are 'bracket and 'triangle.",
-              "thickness type height");
+              "This object indicates groups of beats. "
+              "Valid choices for @code{style} are @code{bracket} and @code{triangle}.",
+              "thickness style height");