X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fdots.cc;h=2f8202a4653ec36d83d0943f145cc24cd7222734;hb=refs%2Ftags%2Frelease%2F1.5.19;hp=1a695c1a123275183a08f0c5593b8f66b0c6ac3d;hpb=df4a7c4a55148e065d878dcc2f7e09ac27ea9c32;p=lilypond.git diff --git a/lily/dots.cc b/lily/dots.cc index 1a695c1a12..2f8202a465 100644 --- a/lily/dots.cc +++ b/lily/dots.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include "dots.hh" @@ -16,11 +16,11 @@ #include "directional-element-interface.hh" -MAKE_SCHEME_CALLBACK(Dots,quantised_position_callback,2); +MAKE_SCHEME_CALLBACK (Dots,quantised_position_callback,2); SCM Dots::quantised_position_callback (SCM element_smob, SCM axis) { - Grob *me = unsmob_element (element_smob); + Grob *me = unsmob_grob (element_smob); Axis a = (Axis) gh_scm2int (axis); assert (a == Y_AXIS); @@ -34,15 +34,15 @@ Dots::quantised_position_callback (SCM element_smob, SCM axis) return gh_double2scm (Staff_symbol_referencer::staff_space (me) / 2.0 * Directional_element_interface::get (me)); } - return gh_double2scm (0.0); + return gh_double2scm (0.0); } -MAKE_SCHEME_CALLBACK(Dots,brew_molecule,1); +MAKE_SCHEME_CALLBACK (Dots,brew_molecule,1); SCM Dots::brew_molecule (SCM d) { - Grob *sc = unsmob_element (d); + Grob *sc = unsmob_grob (d); Molecule mol; SCM c = sc->get_grob_property ("dot-count"); @@ -59,7 +59,7 @@ Dots::brew_molecule (SCM d) mol = Lookup::blank (Box (Interval (0,0), Interval (0,0))); - for (int i = gh_scm2int (c); i--; ) + for (int i = gh_scm2int (c); i--;) { d.translate_axis (2*dw,X_AXIS); mol.add_at_edge (X_AXIS, RIGHT, d, dw);