* lily/modified-font-metric.cc (text_dimension): try

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

diff --git a/lily/measure-grouping-spanner.cc b/lily/measure-grouping-spanner.cc
index 62c7c287ab0d3148a40310aca28feab2dcd621f9..f6a751c7b895200039f63d79a42f8c5c7d2fda62 100644 (file)
--- a/lily/measure-grouping-spanner.cc
+++ b/lily/measure-grouping-spanner.cc
@@ -7,9 +7,10 @@
 
  */
 
-#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,9 +21,6 @@ Measure_grouping::print (SCM grob)
 {
   Spanner * me = dynamic_cast<Spanner*> (unsmob_grob (grob));
 
-  /*
-    TODO: robustify.
-   */
   SCM which = me->get_property ("style");
   Real height = robust_scm2double (me->get_property ("height"), 1);
 
@@ -30,18 +28,15 @@ Measure_grouping::print (SCM grob)
   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);
+  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");