#include "rhythmic-head.hh"
#include "note-head.hh"
#include "staff-symbol-referencer.hh"
-#include "paper-def.hh"
+#include "output-def.hh"
#include "font-interface.hh"
/*
Spanner *
Mensural_ligature_engraver::create_ligature_spanner ()
{
- return make_spanner ("MensuralLigature");
+ return make_spanner ("MensuralLigature", SCM_EOL);
}
/*
programming_error ("last_primitive undefined");
break;
}
- last_primitive->set_property ("primitive", gh_int2scm (output));
+ last_primitive->set_property ("primitive", scm_int2num (output));
break;
case MLP_BB:
case MLP_LB:
programming_error ("primitive undefined");
break;
}
- last_primitive->set_property ("primitive", gh_int2scm (output));
- primitive->set_property ("primitive", gh_int2scm (MLP_NONE));
+ last_primitive->set_property ("primitive", scm_int2num (output));
+ primitive->set_property ("primitive", scm_int2num (MLP_NONE));
break;
case MLP_SS:
// delayed primitive with two note heads
programming_error ("last_primitive undefined");
break;
}
- last_last_primitive->set_property ("primitive", gh_int2scm (output));
- last_primitive->set_property ("primitive", gh_int2scm (MLP_NONE));
+ last_last_primitive->set_property ("primitive", scm_int2num (output));
+ last_primitive->set_property ("primitive", scm_int2num (MLP_NONE));
break;
default:
programming_error (_f ("unexpected case fall-through"));
Array<Grob_info> primitives)
{
Real thickness = robust_scm2double (ligature->get_property ("thickness"), 1.4);
- thickness *= ligature->get_paper ()->get_realvar (ly_symbol2scm ("linethickness"));
+ thickness *= ligature->get_paper ()->get_dimension (ly_symbol2scm ("linethickness"));
Real head_width =
Font_interface::get_default_font (ligature)->
for (int i = 0; i < primitives.size (); i++)
{
Item *primitive = dynamic_cast<Item*> (primitives[i].grob_);
- int output = gh_scm2int (primitive->get_property ("primitive"));
+ int output = ly_scm2int (primitive->get_property ("primitive"));
primitive->set_property ("thickness",
- gh_double2scm (thickness));
+ scm_make_real (thickness));
switch (output) {
case MLP_NONE:
primitive->set_property ("head-width",
- gh_double2scm (half_flexa_width));
+ scm_make_real (half_flexa_width));
break;
case MLP_sc:
case MLP_ss:
case MLP_cs:
primitive->set_property ("head-width",
- gh_double2scm (head_width));
+ scm_make_real (head_width));
break;
case MLP_BB:
case MLP_LB:
case MLP_SS:
primitive->set_property ("head-width",
- gh_double2scm (half_flexa_width));
+ scm_make_real (half_flexa_width));
primitive->set_property ("flexa-width",
- gh_double2scm (flexa_width));
+ scm_make_real (flexa_width));
break;
default:
programming_error (_f ("unexpected case fall-through"));
}
distance +=
- gh_scm2double (current->get_property ("head-width")) -
- gh_scm2double (current->get_property ("thickness"));
+ ly_scm2double (current->get_property ("head-width")) -
+ ly_scm2double (current->get_property ("thickness"));
}
}
if (i > 0)
{
Item *primitive = dynamic_cast<Item*> (info.grob_);
- int output = gh_scm2int (primitive->get_property ("primitive"));
+ int output = ly_scm2int (primitive->get_property ("primitive"));
if (output & MLP_ANY)
{
int delta_pitch = (pitch.steps () - last_pitch.steps ());
primitive->set_property ("join-left-amount",
- gh_int2scm (delta_pitch));
+ scm_int2num (delta_pitch));
}
}
last_pitch = pitch;