X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fgrid-line-interface.cc;h=fd47291580c2fef8f2569b1eed32763ee79706d6;hb=c39943f60cffe2084c2f571fa838f0e34f89419b;hp=087aa2ba9a274b970889131f8a1322b6c6a36c58;hpb=e6caaa132f59006e5c47d0007b24bfedd07ad145;p=lilypond.git

diff --git a/lily/grid-line-interface.cc b/lily/grid-line-interface.cc
index 087aa2ba9a..fd47291580 100644
--- a/lily/grid-line-interface.cc
+++ b/lily/grid-line-interface.cc
@@ -3,8 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
-
+  (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "grid-line-interface.hh"
@@ -13,8 +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
@@ -26,8 +23,8 @@ Grid_line_interface::print (SCM smobbed_me)
   /* compute common refpoint of elements */
   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];
 
@@ -40,29 +37,27 @@ 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;
 
-  iv += - me->relative_coordinate (refp, Y_AXIS);
+  iv += -me->relative_coordinate (refp, Y_AXIS);
   Stencil st = Lookup::filled_box (Box (Interval (0, thick),
 					iv));
 
   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;
-  
+
   return ly_interval2scm (Interval (0, thick));
 }
 
@@ -70,14 +65,19 @@ void
 Grid_line_interface::add_grid_point (Grob *me, Grob *b)
 {
   Pointer_group_interface::add_grob (me, ly_symbol2scm ("elements"), b);
-  me->add_dependency (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.",
+
+	       /* properties */
+	       "elements "
+	       "thickness "
+	       );
 
+ADD_INTERFACE (Grid_point_interface,
+	       "A spanning point for grid lines.",
 
-ADD_INTERFACE (Grid_point_interface, "grid-point-interface",
-	       "A spanning point for grid lines. ",
-	       "");
+	       /* properties */
+	       ""
+	       );