/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Copyright (C) 1997--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
LilyPond is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
#include "hairpin.hh"
+#include "axis-group-interface.hh"
+#include "bar-line.hh"
#include "dimensions.hh"
+#include "directional-element-interface.hh"
#include "international.hh"
#include "line-interface.hh"
#include "output-def.hh"
#include "staff-symbol-referencer.hh"
#include "text-interface.hh"
#include "note-column.hh"
+#include "system.hh"
#include "warn.hh"
MAKE_SCHEME_CALLBACK (Hairpin, pure_height, 3);
return ly_interval2scm (Interval (-height, height));
}
+MAKE_SCHEME_CALLBACK (Hairpin, broken_bound_padding, 1);
+SCM
+Hairpin::broken_bound_padding (SCM smob)
+{
+ Spanner *me = unsmob_spanner (smob);
+ Item *r_bound = me->get_bound (RIGHT);
+ if (r_bound->break_status_dir () != -1)
+ {
+ me->warning ("Asking for broken bound padding at a non-broken bound.");
+ return scm_from_double (0.0);
+ }
+
+ System *sys = dynamic_cast<System *> (me->get_system ());
+ Direction dir = get_grob_direction (me->get_parent (Y_AXIS));
+ if (!dir)
+ return scm_from_double (0.0);
+
+ Grob *my_vertical_axis_group = Grob::get_vertical_axis_group (me);
+ Drul_array<Grob *> vertical_axis_groups;
+ Direction d = DOWN;
+ do
+ vertical_axis_groups[d] = d == dir
+ ? sys->get_neighboring_staff (d, my_vertical_axis_group, Interval_t<int> (me->spanned_rank_interval ()))
+ : my_vertical_axis_group;
+ while (flip (&d) != DOWN);
+
+ if (!vertical_axis_groups[dir])
+ return scm_from_double (0.0);
+
+ Drul_array<Grob *> span_bars (0, 0);
+ d = DOWN;
+ do
+ {
+ extract_grob_set (vertical_axis_groups[d], "elements", elts);
+ for (vsize i = elts.size (); i--;)
+ if (Bar_line::has_interface (elts[i])
+ && dynamic_cast<Item *> (elts[i])->break_status_dir () == -1)
+ {
+ SCM hsb = elts[i]->get_property ("has-span-bar");
+ if (!scm_is_pair (hsb))
+ break;
+
+ span_bars[d] = unsmob_grob ((d == UP ? scm_car : scm_cdr) (hsb));
+ break;
+ }
+ if (!span_bars[d])
+ return scm_from_double (0.0);
+ }
+ while (flip (&d) != DOWN);
+
+ if (span_bars[DOWN] != span_bars[UP])
+ return scm_from_double (0.0);
+
+ return scm_from_double (robust_scm2double (me->get_property ("bound-padding"), 0.5)
+ / 2.0);
+}
+
MAKE_SCHEME_CALLBACK (Hairpin, print, 1);
SCM
Hairpin::print (SCM smob)
do
{
Item *b = bounds[d];
+ Interval e = (Paper_column::has_interface (b) && b->break_status_dir ())
+ ? Axis_group_interface::generic_bound_extent (b, common, X_AXIS)
+ : robust_relative_extent (b, common, X_AXIS);
+
x_points[d] = b->relative_coordinate (common, X_AXIS);
if (broken [d])
{
if (d == LEFT)
- x_points[d] = b->extent (common, X_AXIS)[RIGHT];
+ x_points[d] = e[-d];
+ else
+ {
+ Real broken_bound_padding
+ = robust_scm2double (me->get_property ("broken-bound-padding"), 0.0);
+ extract_grob_set (me, "concurrent-hairpins", chp);
+ for (vsize i = 0; i < chp.size (); i++)
+ {
+ Spanner *span_elt = dynamic_cast<Spanner *> (chp[i]);
+ if (span_elt->get_bound (RIGHT)->break_status_dir () == LEFT)
+ broken_bound_padding = max (broken_bound_padding,
+ robust_scm2double (span_elt->get_property ("broken-bound-padding"), 0.0));
+ }
+ x_points[d] -= d * broken_bound_padding;
+ }
}
else
{
if (Text_interface::has_interface (b))
{
- Interval e = b->extent (common, X_AXIS);
if (!e.is_empty ())
x_points[d] = e[-d] - d * padding;
}
else
{
bool neighbor_found = false;
- Spanner *adjacent;
+ Spanner *adjacent = NULL;
extract_grob_set (me, "adjacent-spanners", neighbors);
for (vsize i = 0; i < neighbors.size (); i++)
{
}
}
- Interval e = robust_relative_extent (b, common, X_AXIS);
if (neighbor_found)
{
if (Hairpin::has_interface (adjacent))
else
x_points[d] = e.center () - d * padding / 3;
}
- // Our neighbor is a dynamic text spanner, so add the
- // same amount of padding as for text dynamics
- else
+ // Our neighbor is a dynamic text spanner.
+ // If we end on the text, pad as for text dynamics
+ else if (d == RIGHT)
x_points[d] = e[-d] - d * padding;
}
else
else
x_points[d] = e[d];
- Item *bound = me->get_bound (d);
- if (bound->is_non_musical (bound))
+ if (Item::is_non_musical (b))
x_points[d] -= d * padding;
}
}
while (flip (&d) != LEFT);
Real width = x_points[RIGHT] - x_points[LEFT];
+
if (width < 0)
{
me->warning (_ ((grow_dir < 0) ? "decrescendo too small"
}
bool continued = broken[Direction (-grow_dir)];
+ bool continuing = broken[Direction (grow_dir)];
Real starth = 0;
Real endh = 0;
if (grow_dir < 0)
{
- starth = height;
- endh = continued ? height / 2 : 0.0;
+ starth = continuing ? 2 * height / 3 : height;
+ endh = continued ? height / 3 : 0.0;
}
else
{
- starth = continued ? height / 2 : 0.0;
- endh = height;
+ starth = continued ? height / 3 : 0.0;
+ endh = continuing ? 2 * height / 3 : height;
}
/*
/* properties */
"adjacent-spanners "
"circled-tip "
+ "concurrent-hairpins "
+ "broken-bound-padding "
"bound-padding "
"grow-direction "
"height "
projects / lilypond.git / blobdiff