*** 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 d6b4b6f6ce10cdfdc02a3dccea87348080e06080..1c9e03fbdf42fff0abb18559d5f52c8eecf05484 100644 (file)
--- a/lily/measure-grouping-spanner.cc
+++ b/lily/measure-grouping-spanner.cc
@@ -3,13 +3,14 @@
 
        source file of the GNU LilyPond music typesetter
 
-       (c) 2002--2004 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"
@@ -20,28 +21,22 @@ Measure_grouping::print (SCM grob)
 {
   Spanner * me = dynamic_cast<Spanner*> (unsmob_grob (grob));
 
-  /*
-    TODO: robustify.
-   */
-  SCM which = me->get_grob_property ("style");
-  Real height = robust_scm2double (me->get_grob_property ("height"), 1);
+  SCM which = me->get_property ("style");
+  Real height = robust_scm2double (me->get_property ("height"), 1);
 
-  Real t = Staff_symbol_referencer::line_thickness (me) * robust_scm2double (me->get_grob_property ("thickness"), 1);
-  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.is_empty ()
-          ? 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);
 
+  
+  Interval iv (left_point, right_point);
   Stencil m;
-
+  
   /*
     TODO: use line interface
    */
@@ -55,11 +50,12 @@ Measure_grouping::print (SCM grob)
     }
 
   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",
-              "This objectt indicates groups of beats. "
+              "This object indicates groups of beats. "
               "Valid choices for @code{style} are @code{bracket} and @code{triangle}.",
               "thickness style height");