Run `make grand-replace'.

[lilypond.git] / lily / grid-line-interface.cc

diff --git a/lily/grid-line-interface.cc b/lily/grid-line-interface.cc
index 82178f35e8a74e1b3904f6e3f90295cc262273af..6401f6ef199a42e1e9d37186c99f182d057bfc7d 100644 (file)
--- a/lily/grid-line-interface.cc
+++ b/lily/grid-line-interface.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "grid-line-interface.hh"
@@ -12,7 +12,6 @@
 #include "pointer-group-interface.hh"
 #include "lookup.hh"
 #include "output-def.hh"
-#include "stencil.hh"
 
 MAKE_SCHEME_CALLBACK (Grid_line_interface, print, 1);
 SCM
@@ -25,7 +24,7 @@ Grid_line_interface::print (SCM smobbed_me)
   Grob *refp = common_refpoint_of_array (elts, me, Y_AXIS);
   Interval iv;
 
-  for (int i = 0; i < elts.size (); i++)
+  for (vsize i = 0; i < elts.size (); i++)
     {
       Grob *point = elts[i];
 
@@ -38,7 +37,7 @@ Grid_line_interface::print (SCM smobbed_me)
       return SCM_EOL;
     }
 
-  Real staffline = me->get_layout ()->get_dimension (ly_symbol2scm ("linethickness"));
+  Real staffline = me->layout ()->get_dimension (ly_symbol2scm ("line-thickness"));
   Real thick = robust_scm2double (me->get_property ("thickness"), 1.0)
     * staffline;
 
@@ -49,15 +48,13 @@ Grid_line_interface::print (SCM smobbed_me)
   return st.smobbed_copy ();
 }
 
-MAKE_SCHEME_CALLBACK (Grid_line_interface, width_callback, 2);
+MAKE_SCHEME_CALLBACK (Grid_line_interface, width, 1);
 SCM
-Grid_line_interface::width_callback (SCM element_smob, SCM scm_axis)
+Grid_line_interface::width (SCM smob)
 {
-  Grob *me = unsmob_grob (element_smob);
-  (void) scm_axis;
-  assert (scm_to_int (scm_axis) == X_AXIS);
+  Grob *me = unsmob_grob (smob);
 
-  Real staffline = me->get_layout ()->get_dimension (ly_symbol2scm ("linethickness"));
+  Real staffline = me->layout ()->get_dimension (ly_symbol2scm ("line-thickness"));
   Real thick = robust_scm2double (me->get_property ("thickness"), 1.0)
     * staffline;
 
@@ -70,10 +67,17 @@ Grid_line_interface::add_grid_point (Grob *me, Grob *b)
   Pointer_group_interface::add_grob (me, ly_symbol2scm ("elements"), b);
 }
 
-ADD_INTERFACE (Grid_line_interface, "grid-line-interface",
-              "A  line that spanned between grid-points. ",
-              "elements thickness");
+ADD_INTERFACE (Grid_line_interface,
+              "A line that is spanned between grid-points.",
 
-ADD_INTERFACE (Grid_point_interface, "grid-point-interface",
-              "A spanning point for grid lines. ",
-              "");
+              /* properties */
+              "elements "
+              "thickness "
+              );
+
+ADD_INTERFACE (Grid_point_interface,
+              "A spanning point for grid lines.",
+
+              /* properties */
+              ""
+              );