X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Farpeggio.cc;h=3f0d32fe81149baf362cf25e2ebc6126a9f4d1a5;hb=50ba2171c6a88789ef5ed3673a4c6a4549400113;hp=643edf5c29e69b246d9dbf70e9b0f7a4fb634346;hpb=be50e2580ab88b01ff5a903350c01ecba1b96d16;p=lilypond.git diff --git a/lily/arpeggio.cc b/lily/arpeggio.cc index 643edf5c29..3f0d32fe81 100644 --- a/lily/arpeggio.cc +++ b/lily/arpeggio.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 2000--2009 Jan Nieuwenhuizen + Copyright (C) 2000--2015 Jan Nieuwenhuizen LilyPond is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -22,6 +22,7 @@ #include "bezier.hh" #include "font-interface.hh" #include "grob.hh" +#include "international.hh" #include "lookup.hh" #include "output-def.hh" #include "pointer-group-interface.hh" @@ -49,19 +50,42 @@ Arpeggio::get_common_y (Grob *me) { Grob *stem = stems[i]; common = common->common_refpoint (Staff_symbol_referencer::get_staff_symbol (stem), - Y_AXIS); + Y_AXIS); } return common; } -MAKE_SCHEME_CALLBACK(Arpeggio, calc_positions, 1); +MAKE_SCHEME_CALLBACK (Arpeggio, calc_cross_staff, 1); +SCM +Arpeggio::calc_cross_staff (SCM grob) +{ + Grob *me = unsmob (grob); + + extract_grob_set (me, "stems", stems); + Grob *vag = 0; + + for (vsize i = 0; i < stems.size (); i++) + { + if (!i) + vag = Grob::get_vertical_axis_group (stems[i]); + else + { + if (vag != Grob::get_vertical_axis_group (stems[i])) + return SCM_BOOL_T; + } + } + + return SCM_BOOL_F; +} + +MAKE_SCHEME_CALLBACK (Arpeggio, calc_positions, 1); SCM Arpeggio::calc_positions (SCM grob) { - Grob *me = unsmob_grob (grob); + Grob *me = unsmob (grob); Grob *common = get_common_y (me); - + /* TODO: @@ -78,10 +102,9 @@ Arpeggio::calc_positions (SCM grob) 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_referencer::staff_space (me) / 2.0; + Real staff_y = ss ? ss->relative_coordinate (common, Y_AXIS) : 0.0; + heads.unite (iv + staff_y - my_y); } heads *= 1 / Staff_symbol_referencer::staff_space (me); @@ -93,29 +116,29 @@ MAKE_SCHEME_CALLBACK (Arpeggio, print, 1); SCM Arpeggio::print (SCM smob) { - Grob *me = unsmob_grob (smob); + Grob *me = unsmob (smob); Interval heads = robust_scm2interval (me->get_property ("positions"), - Interval()) - * Staff_symbol_referencer::staff_space (me); - + Interval ()) + * Staff_symbol_referencer::staff_space (me); + if (heads.is_empty () || heads.length () < 0.5) { if (to_boolean (me->get_property ("transparent"))) - { - /* - This is part of a cross-staff/-voice span-arpeggio, - so we need to ensure `heads' is large enough to encompass - a single trill-element since the span-arpeggio depends on - its children to prevent collisions. - */ - heads.unite (get_squiggle (me).extent (Y_AXIS)); - } + { + /* + This is part of a cross-staff/-voice span-arpeggio, + so we need to ensure `heads' is large enough to encompass + a single trill-element since the span-arpeggio depends on + its children to prevent collisions. + */ + heads.unite (get_squiggle (me).extent (Y_AXIS)); + } else - { - me->warning ("no heads for arpeggio found?"); - me->suicide (); - return SCM_EOL; - } + { + me->warning (_ ("no heads for arpeggio found?")); + me->suicide (); + return SCM_EOL; + } } SCM ad = me->get_property ("arpeggio-direction"); @@ -140,14 +163,12 @@ Arpeggio::print (SCM smob) if (dir) { Font_metric *fm = Font_interface::get_default_font (me); - 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 (); } while (mol.extent (Y_AXIS).length () + epsilon < heads.length ()) - { - mol.add_at_edge (Y_AXIS, UP, squiggle, 0.0); - } + mol.add_at_edge (Y_AXIS, UP, squiggle, 0.0); mol.translate_axis (heads[LEFT], Y_AXIS); if (dir) @@ -163,17 +184,19 @@ MAKE_SCHEME_CALLBACK (Arpeggio, brew_chord_bracket, 1); SCM Arpeggio::brew_chord_bracket (SCM smob) { - Grob *me = unsmob_grob (smob); + Grob *me = unsmob (smob); Interval heads = robust_scm2interval (me->get_property ("positions"), - Interval()) - * Staff_symbol_referencer::staff_space (me); + Interval ()) + * Staff_symbol_referencer::staff_space (me); - Real lt = me->layout ()->get_dimension (ly_symbol2scm ("line-thickness")); + Real th + = me->layout ()->get_dimension (ly_symbol2scm ("line-thickness")) + * robust_scm2double (me->get_property ("thickness"), 1); Real sp = 1.5 * Staff_symbol_referencer::staff_space (me); Real dy = heads.length () + sp; - Real x = 0.7; + Real x = robust_scm2double (me->get_property ("protrusion"), 0.4); - Stencil mol (Lookup::bracket (Y_AXIS, Interval (0, dy), lt, x, lt)); + Stencil mol (Lookup::bracket (Y_AXIS, Interval (0, dy), th, x, th)); mol.translate_axis (heads[LEFT] - sp / 2.0, Y_AXIS); return mol.smobbed_copy (); } @@ -182,21 +205,26 @@ MAKE_SCHEME_CALLBACK (Arpeggio, brew_chord_slur, 1); SCM Arpeggio::brew_chord_slur (SCM smob) { - Grob *me = unsmob_grob (smob); + Grob *me = unsmob (smob); SCM dash_definition = me->get_property ("dash-definition"); Interval heads = robust_scm2interval (me->get_property ("positions"), - Interval()) - * Staff_symbol_referencer::staff_space (me); - - Real lt = me->layout ()->get_dimension (ly_symbol2scm ("line-thickness")); + Interval ()) + * Staff_symbol_referencer::staff_space (me); + + Real lt + = me->layout ()->get_dimension (ly_symbol2scm ("line-thickness")) + * robust_scm2double (me->get_property ("line-thickness"), 1.0); + Real th + = me->layout ()->get_dimension (ly_symbol2scm ("line-thickness")) + * robust_scm2double (me->get_property ("thickness"), 1.0); Real dy = heads.length (); Real height_limit = 1.5; Real ratio = .33; Bezier curve = slur_shape (dy, height_limit, ratio); - curve.rotate (M_PI / 2); + curve.rotate (90.0); - Stencil mol (Lookup::slur (curve, lt, lt, dash_definition)); + Stencil mol (Lookup::slur (curve, th, lt, dash_definition)); mol.translate_axis (heads[LEFT], Y_AXIS); return mol.smobbed_copy (); } @@ -209,7 +237,7 @@ MAKE_SCHEME_CALLBACK (Arpeggio, width, 1); SCM Arpeggio::width (SCM smob) { - Grob *me = unsmob_grob (smob); + Grob *me = unsmob (smob); return ly_interval2scm (get_squiggle (me).extent (X_AXIS)); } @@ -217,7 +245,7 @@ MAKE_SCHEME_CALLBACK (Arpeggio, pure_height, 3); SCM Arpeggio::pure_height (SCM smob, SCM, SCM) { - Grob *me = unsmob_grob (smob); + Grob *me = unsmob (smob); if (to_boolean (me->get_property ("cross-staff"))) return ly_interval2scm (Interval ()); @@ -225,13 +253,16 @@ Arpeggio::pure_height (SCM smob, SCM, SCM) } ADD_INTERFACE (Arpeggio, - "Functions and settings for drawing an arpeggio symbol.", + "Functions and settings for drawing an arpeggio symbol.", - /* properties */ - "arpeggio-direction " - "positions " - "script-priority " // TODO: make around-note-interface - "stems " + /* properties */ + "arpeggio-direction " "dash-definition " // TODO: make apply to non-slur arpeggios - ); + "line-thickness " + "positions " + "protrusion " + "script-priority " // TODO: make around-note-interface + "stems " + "thickness " + );