X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fgrid-line-interface.cc;h=8fb2690caa7cb8202ca02c6641664689b7e12249;hb=a6a51abfd0195a3cf7d6ea095cf69808852f21ce;hp=49befddff8653fba050309ceaaaf0be4c7d390a4;hpb=bbcb58184883768ca35d64451d7f693d2db11bb7;p=lilypond.git diff --git a/lily/grid-line-interface.cc b/lily/grid-line-interface.cc index 49befddff8..8fb2690caa 100644 --- a/lily/grid-line-interface.cc +++ b/lily/grid-line-interface.cc @@ -1,9 +1,20 @@ /* - grid-line-interface.cc -- implement Grid_line_interface + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 2005--2015 Han-Wen Nienhuys - (c) 2005--2006 Han-Wen Nienhuys + LilyPond is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + LilyPond is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . */ #include "grid-line-interface.hh" @@ -12,13 +23,12 @@ #include "pointer-group-interface.hh" #include "lookup.hh" #include "output-def.hh" -#include "stencil.hh" MAKE_SCHEME_CALLBACK (Grid_line_interface, print, 1); SCM Grid_line_interface::print (SCM smobbed_me) { - Grob *me = unsmob_grob (smobbed_me); + Grob *me = unsmob (smobbed_me); extract_grob_set (me, "elements", elts); /* compute common refpoint of elements */ @@ -40,11 +50,11 @@ Grid_line_interface::print (SCM smobbed_me) Real staffline = me->layout ()->get_dimension (ly_symbol2scm ("line-thickness")); Real thick = robust_scm2double (me->get_property ("thickness"), 1.0) - * staffline; + * staffline; iv += -me->relative_coordinate (refp, Y_AXIS); Stencil st = Lookup::filled_box (Box (Interval (0, thick), - iv)); + iv)); return st.smobbed_copy (); } @@ -53,11 +63,11 @@ MAKE_SCHEME_CALLBACK (Grid_line_interface, width, 1); SCM Grid_line_interface::width (SCM smob) { - Grob *me = unsmob_grob (smob); + Grob *me = unsmob (smob); Real staffline = me->layout ()->get_dimension (ly_symbol2scm ("line-thickness")); Real thick = robust_scm2double (me->get_property ("thickness"), 1.0) - * staffline; + * staffline; return ly_interval2scm (Interval (0, thick)); } @@ -68,10 +78,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.", + + /* 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 */ + "" + );