source file of the GNU LilyPond music typesetter
- (c) 2000--2003 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 2000--2004 Jan Nieuwenhuizen <janneke@gnu.org>
*/
-#include "molecule.hh"
+#include "stencil.hh"
#include "paper-def.hh"
#include "arpeggio.hh"
#include "grob.hh"
#include "lookup.hh"
-MAKE_SCHEME_CALLBACK (Arpeggio, brew_molecule, 1);
+MAKE_SCHEME_CALLBACK (Arpeggio, print, 1);
SCM
-Arpeggio::brew_molecule (SCM smob)
+Arpeggio::print (SCM smob)
{
Grob *me = unsmob_grob (smob);
- my_y);
}
- if (heads.empty_b ())
+ if (heads.is_empty ())
{
- 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;
+ 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");
- Real arrow_space = (dir) ? Staff_symbol_referencer::staff_space (me) : 0.0;
-
- Real y = heads[LEFT];
- while (y < heads[RIGHT] - arrow_space)
+ Stencil arrow ;
+ if (dir)
{
- mol.add_at_edge (Y_AXIS, UP,squiggle, 0.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_string (dir)), 0.0, 0);
+ mol.add_at_edge (Y_AXIS, dir,arrow, 0,0);
return mol.smobbed_copy () ;
}
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);
+ 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();
}
/*
- We have to do a callback, because brew_molecule () triggers a
+ We have to do a callback, because print () triggers a
vertical alignment if it is cross-staff.
This callback also adds padding.
*/
Grob * me = unsmob_grob (smob);
Axis a = (Axis)gh_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);
}