X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Farpeggio.cc;h=56066912fb6e156a87ba938cba89bfc1118b7592;hb=848abb841bc7e17ec915a546bca09a7373dbee98;hp=39cc20ba499181378be67fea9c8458e67642f66b;hpb=c802622f935af83bb791ded58056428d6be31d0a;p=lilypond.git diff --git a/lily/arpeggio.cc b/lily/arpeggio.cc index 39cc20ba49..56066912fb 100644 --- a/lily/arpeggio.cc +++ b/lily/arpeggio.cc @@ -1,44 +1,42 @@ -/* - arpegggio.cc -- implement Arpeggio +/* + arpeggio.cc -- implement Arpeggio source file of the GNU LilyPond music typesetter - - (c) 2000 Jan Nieuwenhuizen - */ -#include "molecule.hh" -#include "paper-def.hh" + (c) 2000--2007 Jan Nieuwenhuizen +*/ + #include "arpeggio.hh" -#include "score-element.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 (Score_element* me) +MAKE_SCHEME_CALLBACK (Arpeggio, print, 1); +SCM +Arpeggio::print (SCM smob) { - return me && me->has_interface (ly_symbol2scm ("arpeggio-interface")); -} + Grob *me = unsmob_grob (smob); -MAKE_SCHEME_CALLBACK (Arpeggio, brew_molecule, 1); -SCM -Arpeggio::brew_molecule (SCM smob) -{ - Score_element *me = unsmob_element (smob); - - Score_element * common = me; - for (SCM s = me->get_elt_property ("stems"); gh_pair_p (s); s = gh_cdr (s)) + Grob *common = me; + + extract_grob_set (me, "stems", stems); + for (vsize i = 0; i < stems.size (); i++) { - Score_element * stem = unsmob_element (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); } /* 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. @@ -46,54 +44,150 @@ Arpeggio::brew_molecule (SCM smob) */ Interval heads; Real my_y = me->relative_coordinate (common, Y_AXIS); - - for (SCM s = me->get_elt_property ("stems"); gh_pair_p (s); s = gh_cdr (s)) + + for (vsize i = 0; i < stems.size (); i++) { - Score_element * stem = unsmob_element (gh_car (s)); - Score_element * 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 ()) + 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; } - - Molecule mol; - Molecule arpeggio = Font_interface::get_default_font (me)->find_by_name ("scripts-arpeggio"); - Real y = heads[LEFT]; - while (y < heads[RIGHT]) + 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,arpeggio, 0.0); - y+= arpeggio. 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); + 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); + Grob *common = me; + + extract_grob_set (me, "stems", stems); + for (vsize i = 0; i < stems.size (); i++) + { + 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); - return mol.smobbed_copy () ; + for (vsize i = 0; i < stems.size (); i++) + { + 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->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; + + 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) { - Score_element * me = unsmob_element (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) * 1.5); + return ly_interval2scm (arpeggio.extent (X_AXIS)); } + +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); +} + +MAKE_SCHEME_CALLBACK (Arpeggio, calc_cross_staff, 1); +SCM +Arpeggio::calc_cross_staff (SCM smob) +{ + Grob *me = unsmob_grob (smob); + extract_grob_set (me, "stems", stems); + + for (vsize i = 1; i < stems.size (); i++) + { + Grob *s1 = Staff_symbol_referencer::get_staff_symbol (stems[i-1]); + Grob *s2 = Staff_symbol_referencer::get_staff_symbol (stems[i]); + if (s1 != s2) + return SCM_BOOL_T; + } + return SCM_BOOL_F; +} + +ADD_INTERFACE (Arpeggio, + "Functions and settings for drawing an arpeggio symbol (a wavy line left to noteheads.", + + /* properties */ + "arpeggio-direction " + "stems " + "script-priority " // TODO: make around-note-interface + ); +