X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmeasure-grouping-spanner.cc;h=62c7c287ab0d3148a40310aca28feab2dcd621f9;hb=d1d00ad7111adbd421dd7f1d72863cde14fd7497;hp=8f432c3320036c11e4efbaf6227d6f694377b4de;hpb=2957751eb22511572d9ba7862a22c64e617c7724;p=lilypond.git

diff --git a/lily/measure-grouping-spanner.cc b/lily/measure-grouping-spanner.cc
index 8f432c3320..62c7c287ab 100644
--- a/lily/measure-grouping-spanner.cc
+++ b/lily/measure-grouping-spanner.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>
 
  */
 
@@ -14,20 +14,20 @@
 #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 ("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);
@@ -40,7 +40,7 @@ Measure_grouping::brew_molecule (SCM grob)
 
   Interval iv (0,w);
 
-  Molecule m;
+  Stencil m;
 
   /*
     TODO: use line interface
@@ -55,11 +55,12 @@ Measure_grouping::brew_molecule (SCM grob)
     }
 
   m.align_to (Y_AXIS, DOWN);
-  return m.smobbed_copy();
+  return m.smobbed_copy ();
 }
 
 ADD_INTERFACE (Measure_grouping,"measure-grouping-interface",
-	       "indicate groups of beats. Valid choices for 'type are 'bracket and 'triangle.",
+	       "This objectt indicates groups of beats. "
+	       "Valid choices for @code{style} are @code{bracket} and @code{triangle}.",
 	       "thickness style height");