source file of the GNU LilyPond music typesetter
- (c) 2002--2006 Juergen Reuter <reuter@ipd.uka.de>,
+ (c) 2002--2009 Juergen Reuter <reuter@ipd.uka.de>,
Pal Benko <benkop@freestart.hu>
*/
{
programming_error ("Mensural_ligature: "
"undefined primitive -> ignoring grob");
- return Stencil ();
+ return Lookup::blank (Box (Interval (0, 0), Interval (0, 0)));
}
int primitive = scm_to_int (primitive_scm);
if (primitive & MLP_FLEXA)
{
- delta_pitch = robust_scm2int (me->get_property ("delta-pitch"),
+ delta_pitch = robust_scm2int (me->get_property ("delta-position"),
0);
width
= robust_scm2double (me->get_property ("flexa-width"), 2.0 * staff_space);
switch (primitive & MLP_ANY)
{
case MLP_NONE:
- return Stencil ();
+ return Lookup::blank (Box (Interval (0, 0), Interval (0, 0)));
case MLP_LONGA: // mensural brevis head with right cauda
out = Font_interface::get_default_font (me)->find_by_name
- ("noteheads.s-2mensural");
+ ("noteheads.sM2mensural");
break;
case MLP_BREVIS: // mensural brevis head
out = Font_interface::get_default_font (me)->find_by_name
- ("noteheads.s-1mensural");
+ ("noteheads.sM1mensural");
break;
case MLP_MAXIMA: // should be mensural maxima head without stem
out = Font_interface::get_default_font (me)->find_by_name
- ("noteheads.s-1neomensural");
+ ("noteheads.sM1neomensural");
break;
case MLP_FLEXA:
out = brew_flexa (me, delta_pitch, false, width, thickness);
break;
default:
- programming_error (_f ("Mensural_ligature: "
- "unexpected case fall-through"));
- return Stencil ();
+ programming_error (_ ("Mensural_ligature: "
+ "unexpected case fall-through"));
+ return Lookup::blank (Box (Interval (0, 0), Interval (0, 0)));
}
Real blotdiameter
- = (me->layout ()->get_dimension (ly_symbol2scm ("blotdiameter")));
+ = (me->layout ()->get_dimension (ly_symbol2scm ("blot-diameter")));
if (primitive & MLP_STEM)
{
SCM join_right_scm = me->get_property ("join-right-amount");
- if (join_right_scm != SCM_EOL)
+ if (scm_is_number (join_right_scm))
{
int join_right = scm_to_int (join_right_scm);
if (join_right)
out.add_stencil (join);
}
else
- programming_error (_f ("Mensural_ligature: (join_right == 0)"));
+ programming_error (_ ("Mensural_ligature: (join_right == 0)"));
}
#if 0 /* what happend with the ledger lines? */
return SCM_EOL;
}
-ADD_INTERFACE (Mensural_ligature, "mensural-ligature-interface",
- "A mensural ligature",
- "delta-pitch flexa-width head-width join-right-amount " // "add-join "
- "primitive thickness");
+ADD_INTERFACE (Mensural_ligature,
+ "A mensural ligature.",
+
+ /* properties */
+ "delta-position "
+ "flexa-width "
+ "head-width "
+ "join-right-amount "
+ "primitive "
+ "thickness "
+ );
+