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 (file)
index 0000000..488ae8b
--- /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 50cde13ea3b2833a26c290a5851e09570c70eb65..e21f681305e8c7955e76e48a5f8d8317372874fc 100644 (file)
--- 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);