source file of the GNU LilyPond music typesetter
- (c) 2003--2006 Juergen Reuter <reuter@ipd.uka.de>
+ (c) 2003--2009 Juergen Reuter <reuter@ipd.uka.de>
*/
#include "vaticana-ligature.hh"
-
-#include "item.hh"
+#include "bezier.hh"
#include "font-interface.hh"
+#include "international.hh"
+#include "item.hh"
#include "lookup.hh"
-#include "staff-symbol-referencer.hh"
#include "note-head.hh"
#include "output-def.hh"
-#include "bezier.hh"
+#include "staff-symbol-referencer.hh"
#include "warn.hh"
Stencil
Real thickness,
Real blotdiameter)
{
- bool on_staffline = Staff_symbol_referencer::on_staffline (me, pos);
+ bool on_staffline = Staff_symbol_referencer::on_line (me, pos);
int interspaces = Staff_symbol_referencer::line_count (me) - 1;
bool above_staff = pos > interspaces;
Real staff_space = Staff_symbol_referencer::staff_space (me);
if (!delta_pitch)
{
- me->programming_error (_f ("Vaticana_ligature: "
- "zero join (delta_pitch == 0)"));
- return Stencil ();
+ 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);
Interval y_extent = (delta_pitch > 0)
{
me->programming_error ("Vaticana_ligature: "
"undefined glyph-name -> ignoring grob");
- return Stencil ();
+ return Lookup::blank (Box (Interval (0, 0), Interval (0, 0)));
}
- String glyph_name = ly_scm2string (glyph_name_scm);
+ string glyph_name = ly_scm2string (glyph_name_scm);
Stencil out;
Real thickness = robust_scm2double (me->get_property ("thickness"), 1);
Real line_thickness
- = thickness * me->layout ()->get_dimension (ly_symbol2scm ("linethickness"));
+ = thickness * me->layout ()->get_dimension (ly_symbol2scm ("line-thickness"));
Real blotdiameter
- = (me->layout ()->get_dimension (ly_symbol2scm ("blotdiameter")));
+ = (me->layout ()->get_dimension (ly_symbol2scm ("blot-diameter")));
int pos = Staff_symbol_referencer::get_rounded_position (me);
- SCM delta_pitch_scm = me->get_property ("delta-pitch");
+ SCM delta_pitch_scm = me->get_property ("delta-position");
int delta_pitch;
if (delta_pitch_scm != SCM_EOL)
delta_pitch = scm_to_int (delta_pitch_scm);
bool add_cauda = to_boolean (me->get_property ("add-cauda"));
bool add_join = to_boolean (me->get_property ("add-join"));
- if (!String::compare (glyph_name, ""))
+ if (glyph_name == "")
{
/*
* This is an empty head. This typically applies for the right
out
= Lookup::blank (Box (Interval (0, 0.5 * flexa_width), Interval (0, 0)));
}
- else if (!String::compare (glyph_name, "flexa"))
+ else if (glyph_name == "flexa")
out = vaticana_brew_flexa (me, true, line_thickness);
else
{
return SCM_EOL;
}
-ADD_INTERFACE (Vaticana_ligature, "vaticana-ligature-interface",
- "A vaticana style gregorian ligature",
+ADD_INTERFACE (Vaticana_ligature,
+ "A vaticana style Gregorian ligature.",
/* properties */
"glyph-name "
- "flexa-height "
+ "flexa-height "
"flexa-width "
"thickness "
"add-cauda "
"add-stem "
"add-join "
- "delta-pitch "
+ "delta-position "
"x-offset "
);