X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Farpeggio.cc;h=89bb54f677ae8d097f9f72fb61885e879d1f14b8;hb=e04d2f37f505bd6de6ae8b3923de9b68a3a64455;hp=0d432a41898227461ead843371b94df7d5019f7d;hpb=58bcc84c9480dae1b21bc24d8396b91fe19e0131;p=lilypond.git diff --git a/lily/arpeggio.cc b/lily/arpeggio.cc index 0d432a4189..89bb54f677 100644 --- a/lily/arpeggio.cc +++ b/lily/arpeggio.cc @@ -3,47 +3,59 @@ source file of the GNU LilyPond music typesetter - (c) 2000--2005 Jan Nieuwenhuizen + (c) 2000--2009 Jan Nieuwenhuizen */ #include "arpeggio.hh" +#include "bezier.hh" +#include "font-interface.hh" +#include "grob.hh" +#include "lookup.hh" #include "output-def.hh" -#include "stem.hh" +#include "pointer-group-interface.hh" #include "staff-symbol-referencer.hh" #include "staff-symbol.hh" +#include "stem.hh" #include "warn.hh" -#include "font-interface.hh" -#include "lookup.hh" -MAKE_SCHEME_CALLBACK (Arpeggio, print, 1); -SCM -Arpeggio::print (SCM smob) +Grob * +Arpeggio::get_common_y (Grob *me) { - 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); } + return common; +} + +MAKE_SCHEME_CALLBACK(Arpeggio, calc_positions, 1); +SCM +Arpeggio::calc_positions (SCM grob) +{ + Grob *me = unsmob_grob (grob); + Grob *common = get_common_y (me); + /* TODO: Using stems here is not very convenient; should store noteheads instead, and also put them into the support. Now we will mess up in vicinity of a collision. - */ 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)) + 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]; Grob *ss = Staff_symbol_referencer::get_staff_symbol (stem); Interval iv = Stem::head_positions (stem); iv *= Staff_symbol::staff_space (ss) / 2.0; @@ -52,28 +64,49 @@ Arpeggio::print (SCM smob) - my_y); } - if (heads.is_empty ()) - { - /* - Dumb blonde error + heads *= 1/Staff_symbol_referencer::staff_space(me); - :-) - */ - programming_error ("Huh, no heads for arpeggio found."); + return ly_interval2scm (heads); +} + +MAKE_SCHEME_CALLBACK (Arpeggio, print, 1); +SCM +Arpeggio::print (SCM smob) +{ + Grob *me = unsmob_grob (smob); + Interval heads = robust_scm2interval (me->get_property ("positions"), + Interval()) + * Staff_symbol_referencer::staff_space (me); + + if (heads.is_empty () || heads.length () < 0.5) + { + 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); Stencil squiggle = fm->find_by_name ("scripts.arpeggio"); + /* + Compensate for rounding error which may occur when a chord + reaches the center line, resulting in an extra squiggle + being added to the arpeggio stencil. This value is appreciably + larger than the rounding error, which is in the region of 1e-16 + for a global-staff-size of 20, but small enough that it does not + interfere with smaller staff sizes. + */ + const Real epsilon = 1e-3; + Stencil arrow; if (dir) { @@ -81,13 +114,14 @@ Arpeggio::print (SCM smob) 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); + while (mol.extent (Y_AXIS).length () + epsilon < heads.length ()) + { + mol.add_at_edge (Y_AXIS, UP, squiggle, 0.0); + } mol.translate_axis (heads[LEFT], Y_AXIS); if (dir) - mol.add_at_edge (Y_AXIS, dir, arrow, 0, 0); + mol.add_at_edge (Y_AXIS, dir, arrow, 0); return mol.smobbed_copy (); } @@ -100,28 +134,11 @@ SCM Arpeggio::brew_chord_bracket (SCM smob) { Grob *me = unsmob_grob (smob); + Interval heads = robust_scm2interval (me->get_property ("positions"), + Interval()) + * Staff_symbol_referencer::staff_space (me); - Grob *common = me; - for (SCM s = me->get_property ("stems"); scm_is_pair (s); s = scm_cdr (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"); scm_is_pair (s); s = scm_cdr (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_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; @@ -131,23 +148,69 @@ Arpeggio::brew_chord_bracket (SCM smob) return mol.smobbed_copy (); } +MAKE_SCHEME_CALLBACK (Arpeggio, brew_chord_slur, 1); +SCM +Arpeggio::brew_chord_slur (SCM smob) +{ + Grob *me = unsmob_grob (smob); + SCM dash_definition = me->get_property ("dash-definition"); + Interval heads = robust_scm2interval (me->get_property ("positions"), + Interval()) + * Staff_symbol_referencer::staff_space (me); + + Real lt = me->layout ()->get_dimension (ly_symbol2scm ("line-thickness")); + Real dy = heads.length (); + + Real height_limit = 1.5; + Real ratio = .33; + Bezier curve = slur_shape (dy, height_limit, ratio); + curve.rotate (M_PI / 2); + + Stencil mol (Lookup::slur (curve, lt, lt, dash_definition)); + mol.translate_axis (heads[LEFT], Y_AXIS); + return mol.smobbed_copy (); +} + /* 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); - Axis a = (Axis)scm_to_int (axis); - assert (a == 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", - "Functions and settings for drawing an arpeggio symbol (a wavy line left to noteheads.", - "stems arpeggio-direction"); +MAKE_SCHEME_CALLBACK (Arpeggio, height, 1); +SCM +Arpeggio::height (SCM smob) +{ + return Grob::stencil_height (smob); +} + +MAKE_SCHEME_CALLBACK (Arpeggio, pure_height, 3); +SCM +Arpeggio::pure_height (SCM smob, SCM, SCM) +{ + Grob *me = unsmob_grob (smob); + if (to_boolean (me->get_property ("cross-staff"))) + return ly_interval2scm (Interval ()); + + return height (smob); +} + +ADD_INTERFACE (Arpeggio, + "Functions and settings for drawing an arpeggio symbol.", + + /* properties */ + "arpeggio-direction " + "positions " + "script-priority " // TODO: make around-note-interface + "stems " + "dash-definition " // TODO: make apply to non-slur arpeggios + );