/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 2003--2011 Juergen Reuter <reuter@ipd.uka.de>
+ Copyright (C) 2003--2015 Juergen Reuter <reuter@ipd.uka.de>
LilyPond is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Real blotdiameter)
{
bool on_staffline = Staff_symbol_referencer::on_line (me, pos);
- int interspaces = Staff_symbol_referencer::line_count (me) - 1;
- bool above_staff = pos > interspaces;
+ bool above_staff = pos > Staff_symbol_referencer::staff_span (me)[UP];
if (delta_pitch > -1)
{
Real interval;
SCM flexa_height_scm = me->get_property ("flexa-height");
- if (flexa_height_scm != SCM_EOL)
+ if (!scm_is_null (flexa_height_scm))
interval = scm_to_int (flexa_height_scm);
else
{
Real staff_space = Staff_symbol_referencer::staff_space (me);
if (!delta_pitch)
{
- me->programming_error (_ ("Vaticana_ligature: "
- "zero join (delta_pitch == 0)"));
+ me->programming_error ("Vaticana_ligature: "
+ "zero join (delta_pitch == 0)");
return Lookup::blank (Box (Interval (0, 0), Interval (0, 0)));
}
Interval x_extent = Interval (0, join_thickness);
vaticana_brew_primitive (Grob *me)
{
SCM glyph_name_scm = me->get_property ("glyph-name");
- if (glyph_name_scm == SCM_EOL)
+ if (scm_is_null (glyph_name_scm))
{
me->programming_error ("Vaticana_ligature: "
"undefined glyph-name -> ignoring grob");
SCM delta_pitch_scm = me->get_property ("delta-position");
int delta_pitch;
- if (delta_pitch_scm != SCM_EOL)
+ if (!scm_is_null (delta_pitch_scm))
delta_pitch = scm_to_int (delta_pitch_scm);
else
delta_pitch = 0;
SCM
Vaticana_ligature::brew_ligature_primitive (SCM smob)
{
- Grob *me = unsmob_grob (smob);
+ Grob *me = unsmob<Grob> (smob);
SCM primitive = vaticana_brew_primitive (me).smobbed_copy ();
return primitive;
}