X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Farpeggio.cc;h=d9e9e80636854617517438444c42014b8ccad75b;hb=9e69cb84d6ee5b0a861cd97869b10e3bdf0c833c;hp=ee0c7ceab9ca71e6e66052bb47887153fadbd7e0;hpb=05fabaaf86fd44f9bd903f282bb98d343a991e40;p=lilypond.git diff --git a/lily/arpeggio.cc b/lily/arpeggio.cc index ee0c7ceab9..d9e9e80636 100644 --- a/lily/arpeggio.cc +++ b/lily/arpeggio.cc @@ -1,40 +1,42 @@ -/* +/* arpeggio.cc -- implement Arpeggio source file of the GNU LilyPond music typesetter - - (c) 2000--2004 Jan Nieuwenhuizen - */ -#include "molecule.hh" -#include "paper-def.hh" + (c) 2000--2006 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" MAKE_SCHEME_CALLBACK (Arpeggio, print, 1); -SCM -Arpeggio::print (SCM smob) +SCM +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)) + + Grob *common = me; + + extract_grob_set (me, "stems", stems); + for (vsize i = 0; i < stems.size (); i++) { - Grob * stem = unsmob_grob (ly_car (s)); - common = common->common_refpoint (Staff_symbol_referencer::get_staff_symbol (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. @@ -42,117 +44,115 @@ Arpeggio::print (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 (vsize i = 0; i < stems.size (); i++) { - Grob * stem = unsmob_grob (ly_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; - + 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.is_empty ()) + if (heads.is_empty () || heads.length () < 0.5) { - /* - Dumb blonde error - - :-) - */ - programming_error ("Huh, 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_grob_property ("arpeggio-direction"); + SCM ad = me->get_property ("arpeggio-direction"); Direction dir = CENTER; if (is_direction (ad)) - { - dir = to_dir (ad); - } - - Molecule mol; - Font_metric *fm =Font_interface::get_default_font (me); - Molecule squiggle = fm->find_by_name ("scripts-arpeggio"); + dir = to_dir (ad); - Molecule arrow ; + Stencil mol; + Font_metric *fm = Font_interface::get_default_font (me); + Stencil squiggle = fm->find_by_name ("scripts.arpeggio"); + + Stencil arrow; if (dir) { - arrow = fm->find_by_name ("scripts-arpeggio-arrow-" + to_string (dir)); - heads[dir] -= dir * arrow.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); + + 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,arrow, 0,0); - - return mol.smobbed_copy () ; + mol.add_at_edge (Y_AXIS, dir, arrow, 0, 0); + + return mol.smobbed_copy (); } -/* Draws a vertical bracket to the left of a chord +/* 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) +SCM +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)) + Grob *common = me; + + extract_grob_set (me, "stems", stems); + for (vsize i = 0; i < stems.size (); i++) { - Grob * stem = unsmob_grob (ly_car (s)); - common = common->common_refpoint (Staff_symbol_referencer::get_staff_symbol (stem), - Y_AXIS); + 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_grob_property ("stems"); gh_pair_p (s); s = ly_cdr (s)) + + for (vsize i = 0; i < stems.size (); i++) { - Grob * stem = unsmob_grob (ly_car (s)); - Grob * ss = Staff_symbol_referencer::get_staff_symbol (stem); + 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); + 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_realvar (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 dy = heads.length () + sp; Real x = 0.7; - Molecule 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(); + 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 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) * 1.5); + return ly_interval2scm (arpeggio.extent (X_AXIS)); } +ADD_INTERFACE (Arpeggio, + "Functions and settings for drawing an arpeggio symbol (a wavy line left to noteheads.", -ADD_INTERFACE (Arpeggio, "arpeggio-interface", - "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 + );