source file of the GNU LilyPond music typesetter
- (c) 2000--2002 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 2000--2003 Jan Nieuwenhuizen <janneke@gnu.org>
*/
#include "molecule.hh"
for (SCM s = me->get_grob_property ("stems"); gh_pair_p (s); s = ly_cdr (s))
{
Grob * stem = unsmob_grob (ly_car (s));
- common = common->common_refpoint (Staff_symbol_referencer::staff_symbol_l (stem),
+ common = common->common_refpoint (Staff_symbol_referencer::get_staff_symbol (stem),
Y_AXIS);
}
for (SCM s = me->get_grob_property ("stems"); gh_pair_p (s); s = ly_cdr (s))
{
Grob * stem = unsmob_grob (ly_car (s));
- Grob * ss = Staff_symbol_referencer::staff_symbol_l (stem);
+ Grob * ss = Staff_symbol_referencer::get_staff_symbol (stem);
Interval iv =Stem::head_positions (stem);
iv *= Staff_symbol::staff_space (ss)/2.0;
if (heads.empty_b ())
{
- programming_error ("Huh? Dumb blonde encountered?");
/*
- Nee Valerie, jij bent _niet_ dom.
+ Dumb blonde error
+
+ :-)
*/
+ programming_error ("Huh, no heads for arpeggio found.");
return SCM_EOL;
}
+ SCM ad = me->get_grob_property ("arpeggio-direction");
Direction dir = CENTER;
- if (ly_dir_p (me->get_grob_property ("arpeggio-direction")))
+ if (is_direction (ad))
{
- dir = to_dir (me->get_grob_property ("arpeggio-direction"));
+ dir = to_dir (ad);
}
Molecule mol;
Font_metric *fm =Font_interface::get_default_font (me);
Molecule squiggle = fm->find_by_name ("scripts-arpeggio");
- Real arrow_space = (dir) ? Staff_symbol_referencer::staff_space (me) : 0.0;
-
- Real y = heads[LEFT];
- while (y < heads[RIGHT] - arrow_space)
+ Molecule arrow ;
+ if (dir)
{
- mol.add_at_edge (Y_AXIS, UP,squiggle, 0.0);
- y+= squiggle. extent (Y_AXIS).length ();
+ 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];
+ y+= squiggle. extent (Y_AXIS).length ())
+ mol.add_at_edge (Y_AXIS, UP,squiggle, 0.0, 0);
+
mol.translate_axis (heads[LEFT], Y_AXIS);
if (dir)
- mol.add_at_edge (Y_AXIS, dir,
- fm->find_by_name ("scripts-arpeggio-arrow-" + to_str (dir)), 0.0);
+ mol.add_at_edge (Y_AXIS, dir,arrow, 0,0);
return mol.smobbed_copy () ;
}
for (SCM s = me->get_grob_property ("stems"); gh_pair_p (s); s = ly_cdr (s))
{
Grob * stem = unsmob_grob (ly_car (s));
- common = common->common_refpoint (Staff_symbol_referencer::staff_symbol_l (stem),
+ common = common->common_refpoint (Staff_symbol_referencer::get_staff_symbol (stem),
Y_AXIS);
}
for (SCM s = me->get_grob_property ("stems"); gh_pair_p (s); s = ly_cdr (s))
{
Grob * stem = unsmob_grob (ly_car (s));
- Grob * ss = Staff_symbol_referencer::staff_symbol_l (stem);
+ 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->paper_l ()->get_var ("linethickness");
+ Real lt = me->get_paper ()->get_realvar (ly_symbol2scm ("linethickness"));
Real sp = 1.5 * Staff_symbol_referencer::staff_space (me);
Real dy = heads.length() + sp;
Real x = 0.7;
- Molecule l1 = Lookup::line (lt, Offset(0, 0), Offset (0, dy));
- Molecule bottom = Lookup::line (lt, Offset(0, 0), Offset (x, 0));
- Molecule top = Lookup::line (lt, Offset(0, dy), Offset (x, dy));
- Molecule mol;
- mol.add_molecule (l1);
- mol.add_molecule (bottom);
- mol.add_molecule (top);
+ Molecule mol (Lookup::bracket (Y_AXIS, Interval (0, dy), lt, x));
mol.translate_axis (heads[LEFT] - sp/2.0, Y_AXIS);
return mol.smobbed_copy();
}