source file of the GNU LilyPond music typesetter
- (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
+#include "staff-symbol.hh"
+
#include "lookup.hh"
#include "dimensions.hh"
#include "output-def.hh"
-#include "stencil.hh"
#include "warn.hh"
#include "item.hh"
-#include "staff-symbol.hh"
#include "staff-symbol-referencer.hh"
#include "spanner.hh"
-
-
-MAKE_SCHEME_CALLBACK (Staff_symbol,print,1);
+MAKE_SCHEME_CALLBACK (Staff_symbol, print, 1);
SCM
Staff_symbol::print (SCM smob)
Grob * common
= sp->get_bound (LEFT)->common_refpoint (sp->get_bound (RIGHT), X_AXIS);
- Interval span_points (0,0);
+ Interval span_points (0, 0);
/*
--hwn.
*/
- Real t = me->get_paper ()->get_dimension (ly_symbol2scm ("linethickness"));
+ Real t = me->get_layout ()->get_dimension (ly_symbol2scm ("linethickness"));
t *= robust_scm2double (me->get_property ("thickness"), 1.0);
Direction d = LEFT;
do
{
SCM width_scm = me->get_property ("width");
- if (d == RIGHT && ly_c_number_p (width_scm))
+ if (d == RIGHT && scm_is_number (width_scm))
{
/*
don't multiply by Staff_symbol_referencer::staff_space (me),
since that would make aligning staff symbols of different sizes to
one right margin hell.
*/
- span_points[RIGHT] = ly_scm2double (width_scm);
+ span_points[RIGHT] = scm_to_double (width_scm);
}
else
{
span_points[d] -= d* t/2;
}
- while (flip (&d) !=LEFT);
+ while (flip (&d) != LEFT);
int l = Staff_symbol::line_count (me);
t);
Stencil m;
- for (int i=0; i < l; i++)
+ for (int i = 0; i < l; i++)
{
Stencil b(a);
b.translate_axis (height - i * staff_space (me), Y_AXIS);
Staff_symbol::line_count (Grob*me)
{
SCM c = me->get_property ("line-count");
- if (ly_c_number_p (c))
+ if (scm_is_number (c))
return scm_to_int (c);
else
return 0;
Real
Staff_symbol::get_line_thickness (Grob* me)
{
- Real lt = me->get_paper ()->get_dimension (ly_symbol2scm ("linethickness"));
+ Real lt = me->get_layout ()->get_dimension (ly_symbol2scm ("linethickness"));
return robust_scm2double (me->get_property ("thickness"), 1.0) * lt;
}
}
-ADD_INTERFACE (Staff_symbol,"staff-symbol-interface",
+ADD_INTERFACE (Staff_symbol, "staff-symbol-interface",
"This spanner draws the lines of a staff. "
"A staff symbol definines a vertical unit, the staff space. "
"Quantities that go by a half staff space are called positions "