/*
- arpeggio.cc -- implement Arpeggio
+ This file is part of LilyPond, the GNU music typesetter.
- source file of the GNU LilyPond music typesetter
+ Copyright (C) 2000--2011 Jan Nieuwenhuizen <janneke@gnu.org>
- (c) 2000--2009 Jan Nieuwenhuizen <janneke@gnu.org>
+ LilyPond is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ LilyPond is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with LilyPond. If not, see <http://www.gnu.org/licenses/>.
*/
#include "arpeggio.hh"
#include "stem.hh"
#include "warn.hh"
+static Stencil
+get_squiggle (Grob *me)
+{
+ Font_metric *fm = Font_interface::get_default_font (me);
+ Stencil squiggle = fm->find_by_name ("scripts.arpeggio");
+
+ return squiggle;
+}
+
Grob *
Arpeggio::get_common_y (Grob *me)
{
return common;
}
-MAKE_SCHEME_CALLBACK(Arpeggio, calc_positions, 1);
+MAKE_SCHEME_CALLBACK (Arpeggio, calc_positions, 1);
SCM
Arpeggio::calc_positions (SCM grob)
{
Grob *me = unsmob_grob (grob);
Grob *common = get_common_y (me);
-
+
/*
TODO:
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);
+ heads *= 1 / Staff_symbol_referencer::staff_space (me);
return ly_interval2scm (heads);
}
{
Grob *me = unsmob_grob (smob);
Interval heads = robust_scm2interval (me->get_property ("positions"),
- Interval())
+ Interval ())
* Staff_symbol_referencer::staff_space (me);
-
+
if (heads.is_empty () || heads.length () < 0.5)
{
- if (!to_boolean (me->get_property ("transparent")))
+ 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));
+ }
+ else
{
me->warning ("no heads for arpeggio found?");
me->suicide ();
+ return SCM_EOL;
}
- return SCM_EOL;
}
SCM ad = me->get_property ("arpeggio-direction");
dir = to_dir (ad);
Stencil mol;
- Font_metric *fm = Font_interface::get_default_font (me);
- Stencil squiggle = fm->find_by_name ("scripts.arpeggio");
+ Stencil squiggle (get_squiggle (me));
/*
Compensate for rounding error which may occur when a chord
Stencil arrow;
if (dir)
{
+ Font_metric *fm = Font_interface::get_default_font (me);
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)
{
Grob *me = unsmob_grob (smob);
Interval heads = robust_scm2interval (me->get_property ("positions"),
- Interval())
+ Interval ())
* Staff_symbol_referencer::staff_space (me);
Real lt = me->layout ()->get_dimension (ly_symbol2scm ("line-thickness"));
Arpeggio::brew_chord_slur (SCM smob)
{
Grob *me = unsmob_grob (smob);
+ SCM dash_definition = me->get_property ("dash-definition");
Interval heads = robust_scm2interval (me->get_property ("positions"),
- Interval())
+ Interval ())
* Staff_symbol_referencer::staff_space (me);
Real lt = me->layout ()->get_dimension (ly_symbol2scm ("line-thickness"));
Bezier curve = slur_shape (dy, height_limit, ratio);
curve.rotate (M_PI / 2);
- Stencil mol (Lookup::slur (curve, lt, lt));
+ Stencil mol (Lookup::slur (curve, lt, lt, dash_definition));
mol.translate_axis (heads[LEFT], Y_AXIS);
return mol.smobbed_copy ();
}
Arpeggio::width (SCM smob)
{
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));
-}
-
-MAKE_SCHEME_CALLBACK (Arpeggio, height, 1);
-SCM
-Arpeggio::height (SCM smob)
-{
- return Grob::stencil_height (smob);
+ return ly_interval2scm (get_squiggle (me).extent (X_AXIS));
}
MAKE_SCHEME_CALLBACK (Arpeggio, pure_height, 3);
if (to_boolean (me->get_property ("cross-staff")))
return ly_interval2scm (Interval ());
- return height (smob);
+ return Grob::stencil_height (smob);
}
ADD_INTERFACE (Arpeggio,
- "Functions and settings for drawing an arpeggio symbol (a"
- " wavy line left to noteheads.",
+ "Functions and settings for drawing an arpeggio symbol.",
/* properties */
"arpeggio-direction "
"positions "
"script-priority " // TODO: make around-note-interface
"stems "
+ "dash-definition " // TODO: make apply to non-slur arpeggios
);
projects / lilypond.git / blobdiff