X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Farpeggio.cc;h=56066912fb6e156a87ba938cba89bfc1118b7592;hb=848abb841bc7e17ec915a546bca09a7373dbee98;hp=5ca16b50535e547e0c06d9285572823b8a0eb612;hpb=811be522d0b79493159f47789e5621dc85493495;p=lilypond.git diff --git a/lily/arpeggio.cc b/lily/arpeggio.cc index 5ca16b5053..56066912fb 100644 --- a/lily/arpeggio.cc +++ b/lily/arpeggio.cc @@ -3,11 +3,12 @@ source file of the GNU LilyPond music typesetter - (c) 2000--2005 Jan Nieuwenhuizen + (c) 2000--2007 Jan Nieuwenhuizen */ #include "arpeggio.hh" +#include "grob.hh" #include "output-def.hh" #include "stem.hh" #include "staff-symbol-referencer.hh" @@ -26,7 +27,7 @@ Arpeggio::print (SCM smob) Grob *common = me; extract_grob_set (me, "stems", stems); - for (int i = 0; i < stems.size(); i++) + for (vsize i = 0; i < stems.size (); i++) { Grob *stem = stems[i]; common = common->common_refpoint (Staff_symbol_referencer::get_staff_symbol (stem), @@ -44,7 +45,7 @@ Arpeggio::print (SCM smob) Interval heads; Real my_y = me->relative_coordinate (common, Y_AXIS); - for (int i = 0; i < stems.size(); i++) + for (vsize i = 0; i < stems.size (); i++) { Grob *stem = stems[i]; Grob *ss = Staff_symbol_referencer::get_staff_symbol (stem); @@ -57,17 +58,18 @@ Arpeggio::print (SCM smob) if (heads.is_empty () || heads.length () < 0.5) { - programming_error ("no heads for arpeggio found?"); - me->suicide (); + 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); @@ -82,11 +84,11 @@ Arpeggio::print (SCM smob) 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.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,9 +102,9 @@ Arpeggio::brew_chord_bracket (SCM smob) { Grob *me = unsmob_grob (smob); Grob *common = me; - + extract_grob_set (me, "stems", stems); - for (int i = 0; i < stems.size(); i++) + for (vsize i = 0; i < stems.size (); i++) { Grob *stem = stems[i]; common = common->common_refpoint (Staff_symbol_referencer::get_staff_symbol (stem), @@ -112,7 +114,7 @@ Arpeggio::brew_chord_bracket (SCM smob) Interval heads; Real my_y = me->relative_coordinate (common, Y_AXIS); - for (int i = 0; i < stems.size(); i++) + for (vsize i = 0; i < stems.size (); i++) { Grob *stem = stems[i]; Grob *ss = Staff_symbol_referencer::get_staff_symbol (stem); @@ -121,7 +123,7 @@ Arpeggio::brew_chord_bracket (SCM smob) 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; @@ -135,20 +137,57 @@ Arpeggio::brew_chord_bracket (SCM smob) 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); - (void) axis; - - assert (scm_to_int (axis) == 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", +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.", - "stems arpeggio-direction"); + + /* properties */ + "arpeggio-direction " + "stems " + "script-priority " // TODO: make around-note-interface + );