X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Farpeggio.cc;h=e14e551dd8bf29b9a3ad792bd2bcc113c3c0f181;hb=388121aed1734e9e536ede58bd3de98b68367842;hp=0d3531f6b26ef68b13a0c86af8523c2bba4bb3d2;hpb=d7be2ca7f331d94c9525bb0658f7e767c5e39230;p=lilypond.git diff --git a/lily/arpeggio.cc b/lily/arpeggio.cc index 0d3531f6b2..e14e551dd8 100644 --- a/lily/arpeggio.cc +++ b/lily/arpeggio.cc @@ -3,13 +3,12 @@ source file of the GNU LilyPond music typesetter - (c) 2000--2002 Jan Nieuwenhuizen + (c) 2000--2004 Jan Nieuwenhuizen */ -#include "molecule.hh" -#include "paper-def.hh" #include "arpeggio.hh" -#include "grob.hh" + +#include "output-def.hh" #include "stem.hh" #include "staff-symbol-referencer.hh" #include "staff-symbol.hh" @@ -18,16 +17,16 @@ #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); Grob * common = me; - for (SCM s = me->get_grob_property ("stems"); gh_pair_p (s); s = ly_cdr (s)) + for (SCM s = me->get_property ("stems"); scm_is_pair (s); s = scm_cdr (s)) { - Grob * stem = unsmob_grob (ly_car (s)); + Grob * stem = unsmob_grob (scm_car (s)); common = common->common_refpoint (Staff_symbol_referencer::get_staff_symbol (stem), Y_AXIS); } @@ -43,48 +42,53 @@ Arpeggio::brew_molecule (SCM smob) Interval heads; Real my_y = me->relative_coordinate (common, Y_AXIS); - for (SCM s = me->get_grob_property ("stems"); gh_pair_p (s); s = ly_cdr (s)) + for (SCM s = me->get_property ("stems"); scm_is_pair (s); s = scm_cdr (s)) { - Grob * stem = unsmob_grob (ly_car (s)); + Grob * stem = unsmob_grob (scm_car (s)); Grob * ss = Staff_symbol_referencer::get_staff_symbol (stem); - Interval iv =Stem::head_positions (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 ()) { - 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_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; - Font_metric *fm =Font_interface::get_default_font (me); - Molecule squiggle = fm->find_by_name ("scripts-arpeggio"); + Stencil mol; + Font_metric *fm = Font_interface::get_default_font (me); + 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 () ; } @@ -99,9 +103,9 @@ Arpeggio::brew_chord_bracket (SCM smob) Grob *me = unsmob_grob (smob); Grob * common = me; - for (SCM s = me->get_grob_property ("stems"); gh_pair_p (s); s = ly_cdr (s)) + for (SCM s = me->get_property ("stems"); scm_is_pair (s); s = scm_cdr (s)) { - Grob * stem = unsmob_grob (ly_car (s)); + Grob * stem = unsmob_grob (scm_car (s)); common = common->common_refpoint (Staff_symbol_referencer::get_staff_symbol (stem), Y_AXIS); } @@ -109,47 +113,40 @@ Arpeggio::brew_chord_bracket (SCM smob) Interval heads; Real my_y = me->relative_coordinate (common, Y_AXIS); - for (SCM s = me->get_grob_property ("stems"); gh_pair_p (s); s = ly_cdr (s)) + for (SCM s = me->get_property ("stems"); scm_is_pair (s); s = scm_cdr (s)) { - Grob * stem = unsmob_grob (ly_car (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_paper ()->get_var ("linethickness"); + Real lt = me->get_layout ()->get_dimension (ly_symbol2scm ("linethickness")); Real sp = 1.5 * Staff_symbol_referencer::staff_space (me); - Real dy = heads.length() + sp; + 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(); + 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); SCM Arpeggio::width_callback (SCM smob, SCM axis) { Grob * me = unsmob_grob (smob); - Axis a = (Axis)gh_scm2int (axis); + Axis a = (Axis)scm_to_int (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); + return ly_interval2scm (arpeggio.extent (X_AXIS)); }