(c) 2002--2004 Juergen Reuter <reuter@ipd.uka.de>
*/
+#include "mensural-ligature.hh"
+
#include <math.h>
+
#include "item.hh"
-#include "mensural-ligature.hh"
#include "font-interface.hh"
-#include "stencil.hh"
#include "lookup.hh"
#include "staff-symbol-referencer.hh"
#include "note-head.hh"
}
Stencil
-internal_brew_primitive (Grob *me, bool ledger_take_space)
+internal_brew_primitive (Grob *me)
{
SCM primitive_scm = me->get_property ("primitive");
if (primitive_scm == SCM_EOL)
}
Stencil out;
- int primitive = ly_scm2int (primitive_scm);
+ int primitive = scm_to_int (primitive_scm);
int delta_pitch = 0;
Real thickness = 0.0;
Real flexa_width = 0.0;
out = brew_flexa (me, delta_pitch, false,
flexa_width, thickness, true, DOWN);
break;
- case MLP_sc:
- out = Font_interface::get_default_font (me)->find_by_name ("noteheads--2mensural");
+ case MLP_sc: // mensural brevis head with right cauda
+ out = Font_interface::get_default_font (me)->find_by_name ("noteheads.-2mensural");
break;
- case MLP_ss:
- out = Font_interface::get_default_font (me)->find_by_name ("noteheads--1mensural");
+ case MLP_ss: // mensural brevis head
+ out = Font_interface::get_default_font (me)->find_by_name ("noteheads.-1mensural");
break;
- case MLP_cs:
- out = Font_interface::get_default_font (me)->find_by_name ("noteheads-lmensural");
+ case MLP_cs: // mensural brevis head with left cauda
+ out = Font_interface::get_default_font (me)->find_by_name ("noteheads.lmensural");
break;
case MLP_SS:
out = brew_flexa (me, delta_pitch, false,
SCM join_left_scm = me->get_property ("join-left-amount");
if (join_left_scm != SCM_EOL)
{
- int join_left = ly_scm2int (join_left_scm);
+ int join_left = scm_to_int (join_left_scm);
if (!join_left)
programming_error (_f ("Mensural_ligature: (join_left == 0)"));
- Real blotdiameter = (me->get_paper ()->get_dimension (ly_symbol2scm ("blotdiameter")));
+ Real blotdiameter = (me->get_layout ()->get_dimension (ly_symbol2scm ("blotdiameter")));
Interval x_extent = Interval (0, thickness);
Interval y_extent = (join_left > 0) ?
Interval (-join_left * 0.5 * staff_space, 0) :
Mensural_ligature::brew_ligature_primitive (SCM smob)
{
Grob *me = unsmob_grob (smob);
- return internal_brew_primitive (me, false).smobbed_copy ();
+ return internal_brew_primitive (me).smobbed_copy ();
}
MAKE_SCHEME_CALLBACK (Mensural_ligature, print, 1);