From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Mon, 22 Jan 2007 17:12:47 +0000 (+0100)
Subject: Fix #250.
X-Git-Tag: release/2.11.13-1~4
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=2976557ee7f774f7c7bb670caebef0c51af0b91f;p=lilypond.git

Fix #250.

Use breakableSeparationItem as right bound, if available.
---

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 8df7f8fccc..49687a6b9b 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);