(c) 2000--2004 Jan Nieuwenhuizen <janneke@gnu.org>
*/
-#include "stencil.hh"
-#include "output-def.hh"
#include "arpeggio.hh"
-#include "grob.hh"
+
+#include "output-def.hh"
#include "stem.hh"
#include "staff-symbol-referencer.hh"
#include "staff-symbol.hh"
Grob *me = unsmob_grob (smob);
Grob * common = me;
- for (SCM s = me->get_property ("stems"); ly_c_pair_p (s); s = ly_cdr (s))
+ for (SCM s = me->get_property ("stems"); scm_is_pair (s); s = scm_cdr (s))
{
- Grob * stem = unsmob_grob (ly_car (s));
+ Grob * stem = unsmob_grob (scm_car (s));
common = common->common_refpoint (Staff_symbol_referencer::get_staff_symbol (stem),
Y_AXIS);
}
Interval heads;
Real my_y = me->relative_coordinate (common, Y_AXIS);
- for (SCM s = me->get_property ("stems"); ly_c_pair_p (s); s = ly_cdr (s))
+ for (SCM s = me->get_property ("stems"); scm_is_pair (s); s = scm_cdr (s))
{
- Grob * stem = unsmob_grob (ly_car (s));
+ Grob * stem = unsmob_grob (scm_car (s));
Grob * ss = Staff_symbol_referencer::get_staff_symbol (stem);
- Interval iv =Stem::head_positions (stem);
+ Interval iv = Stem::head_positions (stem);
iv *= Staff_symbol::staff_space (ss)/2.0;
heads.unite (iv + ss->relative_coordinate (common, Y_AXIS)
}
Stencil mol;
- Font_metric *fm =Font_interface::get_default_font (me);
- Stencil squiggle = fm->find_by_name ("scripts-arpeggio");
+ Font_metric *fm = Font_interface::get_default_font (me);
+ Stencil squiggle = fm->find_by_name ("scripts.arpeggio");
Stencil arrow ;
if (dir)
{
- arrow = fm->find_by_name ("scripts-arpeggio-arrow-" + to_string (dir));
+ arrow = fm->find_by_name ("scripts.arpeggio.arrow." + to_string (dir));
heads[dir] -= dir * arrow.extent (Y_AXIS).length ();
}
- for (Real y= heads[LEFT] ; y < heads[RIGHT];
+ for (Real y = heads[LEFT] ; y < heads[RIGHT];
y+= squiggle. extent (Y_AXIS).length ())
mol.add_at_edge (Y_AXIS, UP,squiggle, 0.0, 0);
Grob *me = unsmob_grob (smob);
Grob * common = me;
- for (SCM s = me->get_property ("stems"); ly_c_pair_p (s); s = ly_cdr (s))
+ for (SCM s = me->get_property ("stems"); scm_is_pair (s); s = scm_cdr (s))
{
- Grob * stem = unsmob_grob (ly_car (s));
+ Grob * stem = unsmob_grob (scm_car (s));
common = common->common_refpoint (Staff_symbol_referencer::get_staff_symbol (stem),
Y_AXIS);
}
Interval heads;
Real my_y = me->relative_coordinate (common, Y_AXIS);
- for (SCM s = me->get_property ("stems"); ly_c_pair_p (s); s = ly_cdr (s))
+ for (SCM s = me->get_property ("stems"); scm_is_pair (s); s = scm_cdr (s))
{
- Grob * stem = unsmob_grob (ly_car (s));
+ Grob * stem = unsmob_grob (scm_car (s));
Grob * ss = Staff_symbol_referencer::get_staff_symbol (stem);
Interval iv = Stem::head_positions (stem);
iv *= Staff_symbol::staff_space (ss)/2.0;
heads.unite (iv + ss->relative_coordinate (common, Y_AXIS) - my_y);
}
- Real lt = me->get_paper ()->get_dimension (ly_symbol2scm ("linethickness"));
+ Real lt = me->get_layout ()->get_dimension (ly_symbol2scm ("linethickness"));
Real sp = 1.5 * Staff_symbol_referencer::staff_space (me);
Real dy = heads.length () + sp;
Real x = 0.7;
Grob * me = unsmob_grob (smob);
Axis a = (Axis)scm_to_int (axis);
assert (a == X_AXIS);
- Stencil 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));
}