X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Farpeggio.cc;h=8ac92f1c3c3c06edb9e855812aac201dde428885;hb=dbf55d6ee960e31cd339e25d7d75439279be503f;hp=8cf27663c1a0b3ec8242d83e296be1eb4f40425a;hpb=28976d28a04cfb9abe97af7214d7dce11f732604;p=lilypond.git diff --git a/lily/arpeggio.cc b/lily/arpeggio.cc index 8cf27663c1..8ac92f1c3c 100644 --- a/lily/arpeggio.cc +++ b/lily/arpeggio.cc @@ -1,15 +1,14 @@ -/* +/* arpeggio.cc -- implement Arpeggio source file of the GNU LilyPond music typesetter - - (c) 2000--2004 Jan Nieuwenhuizen - */ -#include "stencil.hh" -#include "paper-def.hh" + (c) 2000--2005 Jan Nieuwenhuizen +*/ + #include "arpeggio.hh" -#include "grob.hh" + +#include "output-def.hh" #include "stem.hh" #include "staff-symbol-referencer.hh" #include "staff-symbol.hh" @@ -17,24 +16,23 @@ #include "font-interface.hh" #include "lookup.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_property ("stems"); is_pair (s); s = ly_cdr (s)) + + Grob *common = me; + for (SCM s = me->get_property ("stems"); scm_is_pair (s); s = scm_cdr (s)) { - Grob * stem = unsmob_grob (ly_car (s)); - common = common->common_refpoint (Staff_symbol_referencer::get_staff_symbol (stem), - Y_AXIS); + Grob *stem = unsmob_grob (scm_car (s)); + 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,14 +40,14 @@ Arpeggio::print (SCM smob) */ Interval heads; Real my_y = me->relative_coordinate (common, Y_AXIS); - - for (SCM s = me->get_property ("stems"); is_pair (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 * ss = Staff_symbol_referencer::get_staff_symbol (stem); - Interval iv =Stem::head_positions (stem); - iv *= Staff_symbol::staff_space (ss)/2.0; - + 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); } @@ -60,7 +58,7 @@ Arpeggio::print (SCM smob) Dumb blonde error :-) - */ + */ programming_error ("Huh, no heads for arpeggio found."); return SCM_EOL; } @@ -71,87 +69,85 @@ Arpeggio::print (SCM smob) { dir = to_dir (ad); } - + Stencil mol; - Font_metric *fm =Font_interface::get_default_font (me); - Stencil squiggle = fm->find_by_name ("scripts-arpeggio"); + Font_metric *fm = Font_interface::get_default_font (me); + Stencil squiggle = fm->find_by_name ("scripts.arpeggio"); - Stencil arrow ; + Stencil arrow; if (dir) { - arrow = fm->find_by_name ("scripts-arpeggio-arrow-" + to_string (dir)); + 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_property ("stems"); is_pair (s); s = ly_cdr (s)) + + Grob *common = me; + for (SCM s = me->get_property ("stems"); scm_is_pair (s); s = scm_cdr (s)) { - Grob * stem = unsmob_grob (ly_car (s)); - common = common->common_refpoint (Staff_symbol_referencer::get_staff_symbol (stem), - Y_AXIS); + Grob *stem = unsmob_grob (scm_car (s)); + 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_property ("stems"); is_pair (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 * ss = Staff_symbol_referencer::get_staff_symbol (stem); + 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); + 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_dimension (ly_symbol2scm ("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 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); + 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. */ -MAKE_SCHEME_CALLBACK (Arpeggio, width_callback,2); +MAKE_SCHEME_CALLBACK (Arpeggio, width_callback, 2); SCM Arpeggio::width_callback (SCM smob, SCM axis) { - Grob * me = unsmob_grob (smob); - Axis a = (Axis)ly_scm2int (axis); + Grob *me = unsmob_grob (smob); + Axis a = (Axis)scm_to_int (axis); assert (a == X_AXIS); - Stencil 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)); } - ADD_INTERFACE (Arpeggio, "arpeggio-interface", - "Functions and settings for drawing an arpeggio symbol (a wavy line left to noteheads.", - "stems arpeggio-direction"); + "Functions and settings for drawing an arpeggio symbol (a wavy line left to noteheads.", + "stems arpeggio-direction");