X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fhairpin.cc;h=afd94f3ee06ada9f66d16a851fed3da119037de5;hb=b872748c6aa8bb721ced458691b38ac2fac5dfc8;hp=7ef0f847a1e8fdf30e3231434cbb84209d119f57;hpb=743f0d4b067e76d591487f085240a7ff9ace85a7;p=lilypond.git diff --git a/lily/hairpin.cc b/lily/hairpin.cc index 7ef0f847a1..afd94f3ee0 100644 --- a/lily/hairpin.cc +++ b/lily/hairpin.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1997--2012 Han-Wen Nienhuys + Copyright (C) 1997--2015 Han-Wen Nienhuys LilyPond is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -20,7 +20,6 @@ #include "hairpin.hh" #include "axis-group-interface.hh" -#include "bar-line.hh" #include "dimensions.hh" #include "directional-element-interface.hh" #include "international.hh" @@ -39,7 +38,7 @@ MAKE_SCHEME_CALLBACK (Hairpin, pure_height, 3); SCM Hairpin::pure_height (SCM smob, SCM, SCM) { - Grob *me = unsmob_grob (smob); + Grob *me = unsmob (smob); Real height = robust_scm2double (me->get_property ("height"), 0.0) * Staff_symbol_referencer::staff_space (me); @@ -54,11 +53,11 @@ MAKE_SCHEME_CALLBACK (Hairpin, broken_bound_padding, 1); SCM Hairpin::broken_bound_padding (SCM smob) { - Spanner *me = unsmob_spanner (smob); + Spanner *me = unsmob (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."); + me->warning (_ ("Asking for broken bound padding at a non-broken bound.")); return scm_from_double (0.0); } @@ -69,36 +68,33 @@ Hairpin::broken_bound_padding (SCM smob) Grob *my_vertical_axis_group = Grob::get_vertical_axis_group (me); Drul_array vertical_axis_groups; - Direction d = DOWN; - do + for (DOWN_and_UP (d)) vertical_axis_groups[d] = d == dir ? sys->get_neighboring_staff (d, my_vertical_axis_group, Interval_t (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 span_bars (0, 0); - d = DOWN; - do + for (DOWN_and_UP (d)) { extract_grob_set (vertical_axis_groups[d], "elements", elts); for (vsize i = elts.size (); i--;) - if (Bar_line::has_interface (elts[i]) + if (elts[i]->internal_has_interface (ly_symbol2scm ("bar-line-interface")) && dynamic_cast (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)); + span_bars[d] = unsmob ((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); @@ -111,7 +107,7 @@ MAKE_SCHEME_CALLBACK (Hairpin, print, 1); SCM Hairpin::print (SCM smob) { - Spanner *me = unsmob_spanner (smob); + Spanner *me = unsmob (smob); SCM s = me->get_property ("grow-direction"); if (!is_direction (s)) @@ -125,22 +121,22 @@ Hairpin::print (SCM smob) Drul_array broken; Drul_array bounds; - Direction d = LEFT; - do + for (LEFT_and_RIGHT (d)) { bounds[d] = me->get_bound (d); broken[d] = bounds[d]->break_status_dir () != CENTER; } - while (flip (&d) != LEFT); - - broken[RIGHT] = broken[RIGHT] && me->broken_neighbor (RIGHT); - broken[RIGHT] = broken[RIGHT] && me->broken_neighbor (RIGHT)->is_live (); if (broken[RIGHT]) { Spanner *next = me->broken_neighbor (RIGHT); - Stencil *s = next->get_stencil (); - if (!s || s->is_empty ()) + // Hairpin-parts suicide in after-line-breaking if they need not be drawn + if (next) + { + (void) next->get_property ("after-line-breaking"); + broken[RIGHT] = next->is_live (); + } + else broken[RIGHT] = false; } @@ -161,13 +157,13 @@ Hairpin::print (SCM smob) if (circled_tip) thick = robust_scm2double (me->get_property ("thickness"), 1.0) * Staff_symbol_referencer::line_thickness (me); + Drul_array shorten = robust_scm2interval (me->get_property ("shorten-pair"), + Interval (0, 0)); - do + for (LEFT_and_RIGHT (d)) { 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); + Interval e = Axis_group_interface::generic_bound_extent (b, common, X_AXIS); x_points[d] = b->relative_coordinate (common, X_AXIS); if (broken [d]) @@ -191,7 +187,7 @@ Hairpin::print (SCM smob) } else { - if (Text_interface::has_interface (b)) + if (has_interface (b)) { if (!e.is_empty ()) x_points[d] = e[-d] - d * padding; @@ -220,13 +216,16 @@ Hairpin::print (SCM smob) if (neighbor_found) { - if (Hairpin::has_interface (adjacent)) + if (has_interface (adjacent)) { /* Handle back-to-back hairpins with a circle in the middle */ if (circled_tip && (grow_dir != d)) - x_points[d] = e.center () + d * (rad - thick / 2.0); + { + x_points[d] = e.center () + d * (rad - thick / 2.0); + shorten[d] = 0.0; + } /* If we're hung on a paper column, that means we're not adjacent to a text-dynamic, and we may move closer. We @@ -242,7 +241,8 @@ Hairpin::print (SCM smob) } else { - if (Note_column::has_interface (b) + if (d == RIGHT // end at the left edge of a rest + && has_interface (b) && Note_column::has_rests (b)) x_points[d] = e[-d]; else @@ -253,8 +253,9 @@ Hairpin::print (SCM smob) } } } + + x_points[d] -= shorten[d] * d; } - while (flip (&d) != LEFT); Real width = x_points[RIGHT] - x_points[LEFT]; @@ -342,4 +343,5 @@ ADD_INTERFACE (Hairpin, "bound-padding " "grow-direction " "height " + "shorten-pair " );