source file of the GNU LilyPond music typesetter
- (c) 2000--2005 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 2000--2006 Jan Nieuwenhuizen <janneke@gnu.org>
*/
#include "arpeggio.hh"
+#include "grob.hh"
#include "output-def.hh"
#include "stem.hh"
#include "staff-symbol-referencer.hh"
#include "warn.hh"
#include "font-interface.hh"
#include "lookup.hh"
+#include "pointer-group-interface.hh"
MAKE_SCHEME_CALLBACK (Arpeggio, print, 1);
SCM
Grob *me = unsmob_grob (smob);
Grob *common = me;
- for (SCM s = me->get_property ("stems"); scm_is_pair (s); s = scm_cdr (s))
+
+ extract_grob_set (me, "stems", stems);
+ for (vsize i = 0; i < stems.size (); i++)
{
- Grob *stem = unsmob_grob (scm_car (s));
+ Grob *stem = stems[i];
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"); scm_is_pair (s); s = scm_cdr (s))
+ for (vsize i = 0; i < stems.size (); i++)
{
- Grob *stem = unsmob_grob (scm_car (s));
+ Grob *stem = stems[i];
Grob *ss = Staff_symbol_referencer::get_staff_symbol (stem);
Interval iv = Stem::head_positions (stem);
iv *= Staff_symbol::staff_space (ss) / 2.0;
- my_y);
}
- if (heads.is_empty ())
+ if (heads.is_empty () || heads.length () < 0.5)
{
- /*
- Dumb blonde error
-
- :-)
- */
- programming_error ("no heads for arpeggio found?");
+ if (!to_boolean (me->get_property ("transparent")))
+ {
+ me->warning ("no heads for arpeggio found?");
+ me->suicide ();
+ }
return SCM_EOL;
}
SCM ad = me->get_property ("arpeggio-direction");
Direction dir = CENTER;
if (is_direction (ad))
- {
- dir = to_dir (ad);
- }
+ dir = to_dir (ad);
Stencil mol;
Font_metric *fm = Font_interface::get_default_font (me);
Arpeggio::brew_chord_bracket (SCM smob)
{
Grob *me = unsmob_grob (smob);
-
Grob *common = me;
- for (SCM s = me->get_property ("stems"); scm_is_pair (s); s = scm_cdr (s))
+
+ extract_grob_set (me, "stems", stems);
+ for (vsize i = 0; i < stems.size (); i++)
{
- Grob *stem = unsmob_grob (scm_car (s));
+ Grob *stem = stems[i];
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"); scm_is_pair (s); s = scm_cdr (s))
+ for (vsize i = 0; i < stems.size (); i++)
{
- Grob *stem = unsmob_grob (scm_car (s));
+ Grob *stem = stems[i];
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_layout ()->get_dimension (ly_symbol2scm ("linethickness"));
+ Real lt = me->layout ()->get_dimension (ly_symbol2scm ("line-thickness"));
Real sp = 1.5 * Staff_symbol_referencer::staff_space (me);
Real dy = heads.length () + sp;
Real x = 0.7;
We have to do a callback, because print () triggers a
vertical alignment if it is cross-staff.
*/
-MAKE_SCHEME_CALLBACK (Arpeggio, width_callback, 2);
+MAKE_SCHEME_CALLBACK (Arpeggio, width, 1);
SCM
-Arpeggio::width_callback (SCM smob, SCM axis)
+Arpeggio::width (SCM smob)
{
Grob *me = unsmob_grob (smob);
- (void) axis;
-
- assert (scm_to_int (axis) == X_AXIS);
Stencil arpeggio = Font_interface::get_default_font (me)->find_by_name ("scripts.arpeggio");
return ly_interval2scm (arpeggio.extent (X_AXIS));
}
-ADD_INTERFACE (Arpeggio, "arpeggio-interface",
+ADD_INTERFACE (Arpeggio,
"Functions and settings for drawing an arpeggio symbol (a wavy line left to noteheads.",
- "stems arpeggio-direction");
+
+ /* properties */
+ "arpeggio-direction "
+ "stems "
+ "script-priority " // TODO: make around-note-interface
+ );