(c) 2000--2004 Jan Nieuwenhuizen <janneke@gnu.org>
*/
-#include "molecule.hh"
-#include "paper-def.hh"
+#include "stencil.hh"
+#include "output-def.hh"
#include "arpeggio.hh"
#include "grob.hh"
#include "stem.hh"
Grob *me = unsmob_grob (smob);
Grob * common = me;
- for (SCM s = me->get_grob_property ("stems"); gh_pair_p (s); s = ly_cdr (s))
+ for (SCM s = me->get_property ("stems"); ly_c_pair_p (s); s = ly_cdr (s))
{
Grob * stem = unsmob_grob (ly_car (s));
common = common->common_refpoint (Staff_symbol_referencer::get_staff_symbol (stem),
Interval heads;
Real my_y = me->relative_coordinate (common, Y_AXIS);
- for (SCM s = me->get_grob_property ("stems"); gh_pair_p (s); s = ly_cdr (s))
+ for (SCM s = me->get_property ("stems"); ly_c_pair_p (s); s = ly_cdr (s))
{
Grob * stem = unsmob_grob (ly_car (s));
Grob * ss = Staff_symbol_referencer::get_staff_symbol (stem);
return SCM_EOL;
}
- SCM ad = me->get_grob_property ("arpeggio-direction");
+ SCM ad = me->get_property ("arpeggio-direction");
Direction dir = CENTER;
if (is_direction (ad))
{
dir = to_dir (ad);
}
- Molecule mol;
+ Stencil mol;
Font_metric *fm =Font_interface::get_default_font (me);
- Molecule squiggle = fm->find_by_name ("scripts-arpeggio");
+ Stencil squiggle = fm->find_by_name ("scripts-arpeggio");
- Molecule arrow ;
+ Stencil arrow ;
if (dir)
{
arrow = fm->find_by_name ("scripts-arpeggio-arrow-" + to_string (dir));
- heads[dir] -= dir * arrow.extent (Y_AXIS).length();
+ heads[dir] -= dir * arrow.extent (Y_AXIS).length ();
}
for (Real y= heads[LEFT] ; y < heads[RIGHT];
Grob *me = unsmob_grob (smob);
Grob * common = me;
- for (SCM s = me->get_grob_property ("stems"); gh_pair_p (s); s = ly_cdr (s))
+ for (SCM s = me->get_property ("stems"); ly_c_pair_p (s); s = ly_cdr (s))
{
Grob * stem = unsmob_grob (ly_car (s));
common = common->common_refpoint (Staff_symbol_referencer::get_staff_symbol (stem),
Interval heads;
Real my_y = me->relative_coordinate (common, Y_AXIS);
- for (SCM s = me->get_grob_property ("stems"); gh_pair_p (s); s = ly_cdr (s))
+ for (SCM s = me->get_property ("stems"); ly_c_pair_p (s); s = ly_cdr (s))
{
Grob * stem = unsmob_grob (ly_car (s));
Grob * ss = Staff_symbol_referencer::get_staff_symbol (stem);
heads.unite (iv + ss->relative_coordinate (common, Y_AXIS) - my_y);
}
- Real lt = me->get_paper ()->get_realvar (ly_symbol2scm ("linethickness"));
+ Real lt = me->get_paper ()->get_dimension (ly_symbol2scm ("linethickness"));
Real sp = 1.5 * Staff_symbol_referencer::staff_space (me);
- Real dy = heads.length() + sp;
+ Real dy = heads.length () + sp;
Real x = 0.7;
- Molecule mol (Lookup::bracket (Y_AXIS, Interval (0, dy), lt, x, lt));
+ Stencil mol (Lookup::bracket (Y_AXIS, Interval (0, dy), lt, x, lt));
mol.translate_axis (heads[LEFT] - sp/2.0, Y_AXIS);
- return mol.smobbed_copy();
+ return mol.smobbed_copy ();
}
/*
We have to do a callback, because print () triggers a
vertical alignment if it is cross-staff.
- This callback also adds padding.
*/
MAKE_SCHEME_CALLBACK (Arpeggio, width_callback,2);
SCM
Arpeggio::width_callback (SCM smob, SCM axis)
{
Grob * me = unsmob_grob (smob);
- Axis a = (Axis)gh_scm2int (axis);
+ Axis a = (Axis)ly_scm2int (axis);
assert (a == X_AXIS);
- Molecule arpeggio = Font_interface::get_default_font (me)->find_by_name ("scripts-arpeggio");
+ Stencil arpeggio = Font_interface::get_default_font (me)->find_by_name ("scripts-arpeggio");
- return ly_interval2scm (arpeggio.extent (X_AXIS) * 1.5);
+ return ly_interval2scm (arpeggio.extent (X_AXIS));
}