Merge branch 'jneeman' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond into jneeman

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

diff --git a/lily/grid-line-interface.cc b/lily/grid-line-interface.cc
index 29ae8c4595d29752b937e065038675e568f957b5..f24f96829f8445c6c470439d0880afc8854b58e4 100644 (file)
--- a/lily/grid-line-interface.cc
+++ b/lily/grid-line-interface.cc
@@ -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->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;
 
@@ -55,7 +54,7 @@ Grid_line_interface::width (SCM smob)
 {
   Grob *me = unsmob_grob (smob);
 
-  Real staffline = me->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;
 
@@ -68,10 +67,10 @@ 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",
+ADD_INTERFACE (Grid_line_interface,
               "A  line that spanned between grid-points. ",
               "elements thickness");
 
-ADD_INTERFACE (Grid_point_interface, "grid-point-interface",
+ADD_INTERFACE (Grid_point_interface,
               "A spanning point for grid lines. ",
               "");