X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Farpeggio.cc;h=5322a46c95fcdeceecb01cbc189f3903269d5a9d;hb=481e336f410e933bea8705862743fc078ccb49f7;hp=2df39d285b16713bc5a7cf46a8d7374ffba07685;hpb=1cc9a861dceeb8091853ebcc0c9a9306b012457f;p=lilypond.git diff --git a/lily/arpeggio.cc b/lily/arpeggio.cc index 2df39d285b..5322a46c95 100644 --- a/lily/arpeggio.cc +++ b/lily/arpeggio.cc @@ -1,124 +1,180 @@ -/* - arpegggio.cc -- implement Arpeggio +/* + arpeggio.cc -- implement Arpeggio source file of the GNU LilyPond music typesetter - - (c) 2000--2001 Jan Nieuwenhuizen - */ -#include "molecule.hh" -#include "paper-def.hh" + (c) 2000--2007 Jan Nieuwenhuizen +*/ + #include "arpeggio.hh" + #include "grob.hh" +#include "output-def.hh" #include "stem.hh" #include "staff-symbol-referencer.hh" #include "staff-symbol.hh" #include "warn.hh" #include "font-interface.hh" +#include "lookup.hh" +#include "pointer-group-interface.hh" -bool -Arpeggio::has_interface (Grob* me) +Grob * +Arpeggio::get_common_y (Grob *me) { - return me && me->has_interface (ly_symbol2scm ("arpeggio-interface")); -} + Grob *common = me; -MAKE_SCHEME_CALLBACK (Arpeggio, brew_molecule, 1); -SCM -Arpeggio::brew_molecule (SCM smob) -{ - Grob *me = unsmob_grob (smob); - - Grob * common = me; - for (SCM s = me->get_grob_property ("stems"); gh_pair_p (s); s = gh_cdr (s)) + extract_grob_set (me, "stems", stems); + for (vsize i = 0; i < stems.size (); i++) { - Grob * stem = unsmob_grob (gh_car (s)); - common = common->common_refpoint (Staff_symbol_referencer::staff_symbol_l (stem), - Y_AXIS); + 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_grob_property ("stems"); gh_pair_p (s); s = gh_cdr (s)) + + extract_grob_set (me, "stems", stems); + for (vsize i = 0; i < stems.size (); i++) { - Grob * stem = unsmob_grob (gh_car (s)); - Grob * ss = Staff_symbol_referencer::staff_symbol_l (stem); - Interval iv =Stem::head_positions (stem); - iv *= Staff_symbol::staff_space (ss)/2.0; - + 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); } - if (heads.empty_b ()) + heads *= 1/Staff_symbol_referencer::staff_space(me); + + 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) { - programming_error ("Huh? Dumb blonde encountered?"); - /* - Nee Valerie, jij bent _niet_ dom. - */ + if (!to_boolean (me->get_property ("transparent"))) + { + me->warning ("no heads for arpeggio found?"); + me->suicide (); + } return SCM_EOL; } - - SCM s = me->get_grob_property ("arpeggio-type"); - String arpegtype = ly_scm2string (scm_symbol_to_string (s)); - Molecule arpegbottom = ( (arpegtype=="bracket") ? - Font_interface::get_default_font (me)->find_by_name ("scripts-bracebottom") : - ((arpegtype=="down") ? - Font_interface::get_default_font (me)->find_by_name ("scripts-arrowdown") : - Font_interface::get_default_font (me)->find_by_name ("scripts-arpeggio")) - ); - Molecule arpegmiddle = ( (arpegtype=="bracket") ? - Font_interface::get_default_font (me)->find_by_name ("scripts-braceseg") : - Font_interface::get_default_font (me)->find_by_name ("scripts-arpeggio") ); - Molecule arpegtop = ( (arpegtype=="bracket") ? - Font_interface::get_default_font (me)->find_by_name ("scripts-bracetop") : - ((arpegtype=="up") ? - Font_interface::get_default_font (me)->find_by_name ("scripts-arrowup") : - Font_interface::get_default_font (me)->find_by_name ("scripts-arpeggio")) - ); - - Molecule mol; - Real y = heads[LEFT]; - - mol.add_at_edge (Y_AXIS, UP, arpegbottom, 0.0); - y+= arpegbottom. extent (Y_AXIS).length (); - - Grob * stem = unsmob_grob (gh_car ( me->get_grob_property ("stems") )); - Grob * ss = Staff_symbol_referencer::staff_symbol_l (stem); - - while (y < heads[RIGHT] - Staff_symbol::staff_space (ss)) + + SCM ad = me->get_property ("arpeggio-direction"); + Direction dir = CENTER; + if (is_direction (ad)) + dir = to_dir (ad); + + Stencil mol; + Font_metric *fm = Font_interface::get_default_font (me); + Stencil squiggle = fm->find_by_name ("scripts.arpeggio"); + + Stencil arrow; + if (dir) { - mol.add_at_edge (Y_AXIS, UP, arpegmiddle, 0.0); - y+= arpegmiddle. extent (Y_AXIS).length (); + arrow = fm->find_by_name ("scripts.arpeggio.arrow." + to_string (dir)); + heads[dir] -= dir * arrow.extent (Y_AXIS).length (); } - mol.add_at_edge (Y_AXIS, UP, arpegtop, 0.0); - + + for (Real y = heads[LEFT]; y < heads[RIGHT]; + y += squiggle.extent (Y_AXIS).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); + + return mol.smobbed_copy (); +} + +/* Draws a vertical bracket to the left of a chord + Chris Jackson */ + +MAKE_SCHEME_CALLBACK (Arpeggio, brew_chord_bracket, 1); +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); + + 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; - return mol.smobbed_copy () ; + 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. */ -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)gh_scm2int (axis); - assert (a == X_AXIS); - Molecule arpeggio = Font_interface::get_default_font (me)->find_by_name ("scripts-arpeggio"); + Grob *me = unsmob_grob (smob); + Stencil arpeggio = Font_interface::get_default_font (me)->find_by_name ("scripts.arpeggio"); + + return ly_interval2scm (arpeggio.extent (X_AXIS)); +} + +MAKE_SCHEME_CALLBACK (Arpeggio, height, 1); +SCM +Arpeggio::height (SCM smob) +{ + return Grob::stencil_height (smob); +} - return ly_interval2scm (arpeggio.extent (X_AXIS) * 1.5); +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 (a wavy line left to noteheads.", + + /* properties */ + "arpeggio-direction " + "positions " + "script-priority " // TODO: make around-note-interface + "stems " + ); +