From 28539dbc8d26f932133bf1c79ec1548968b8725f Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Mon, 22 Jan 2007 18:12:47 +0100 Subject: [PATCH] Fix #250. Use breakableSeparationItem as right bound, if available. --- input/regression/hairpin-to-barline-mark.ly | 13 +++++++++++++ lily/dynamic-engraver.cc | 16 ++++++++++++---- 2 files changed, 25 insertions(+), 4 deletions(-) create mode 100644 input/regression/hairpin-to-barline-mark.ly diff --git a/input/regression/hairpin-to-barline-mark.ly b/input/regression/hairpin-to-barline-mark.ly new file mode 100644 index 0000000000..488ae8bc80 --- /dev/null +++ b/input/regression/hairpin-to-barline-mark.ly @@ -0,0 +1,13 @@ +\version "2.11.12" +\paper { ragged-right = ##t } +\header { + + texidoc = "hairpinToBarline is not confused by very long marks." + +} + +\new Staff \relative c' { + c1\< | + \mark "Very long mark" + c4\> c c c\! | +} diff --git a/lily/dynamic-engraver.cc b/lily/dynamic-engraver.cc index 50cde13ea3..e21f681305 100644 --- a/lily/dynamic-engraver.cc +++ b/lily/dynamic-engraver.cc @@ -339,10 +339,18 @@ Dynamic_engraver::typeset_all () if (!finished_cresc_->get_bound (RIGHT) || use_bar) { - Grob *column_bound = unsmob_grob (use_bar - ? get_property ("currentCommandColumn") - : get_property ("currentMusicalColumn")); - + + Grob *column_bound = 0; + if (use_bar) + { + column_bound = unsmob_grob (get_property ("breakableSeparationItem")); + } + + if (!column_bound) + column_bound = unsmob_grob (use_bar + ? get_property ("currentCommandColumn") + : get_property ("currentMusicalColumn")); + finished_cresc_->set_bound (RIGHT, script_ ? script_ : column_bound); -- 2.39.5