Prohibit Hairpins from colliding with Arpeggios

diff --git a/input/regression/hairpin-arpeggio.ly b/input/regression/hairpin-arpeggio.ly
new file mode 100644 (file)
index 0000000..25a16ac
--- /dev/null
+++ b/input/regression/hairpin-arpeggio.ly
@@ -0,0 +1,14 @@
+\version "2.15.37"
+
+\header {
+  texidoc = "Hairpins in @code{Dynamics} contexts do not collide with
+arpeggios.
+"
+}
+
+\new PianoStaff<<
+ \set PianoStaff.connectArpeggios = ##t
+ { c''\arpeggio c'' }
+ \new Dynamics { s\< s\! }
+ { c'\arpeggio c'' }
+>>

diff --git a/lily/hairpin.cc b/lily/hairpin.cc
index 7639ddd78e774210ebcea9de2da6b772a493564a..adaa20159376bb0e0b1f3ec2c1163d760014bd31 100644 (file)
--- a/lily/hairpin.cc
+++ b/lily/hairpin.cc
@@ -159,9 +159,7 @@ Hairpin::print (SCM smob)
   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])

diff --git a/lily/lyric-hyphen.cc b/lily/lyric-hyphen.cc
index 21ec770ea13d43c2a2f5ccba4ee6491f1f785a74..0e3a67e3482f0e6e5a455ebb2618f8d55c020d44 100644 (file)
--- a/lily/lyric-hyphen.cc
+++ b/lily/lyric-hyphen.cc
@@ -49,9 +49,7 @@ Lyric_hyphen::print (SCM smob)
   Interval span_points;
   for (LEFT_and_RIGHT (d))
     {
-      Interval iv = bounds[d]->break_status_dir ()
-                    ? Axis_group_interface::generic_bound_extent (bounds[d], common, X_AXIS)
-                    : robust_relative_extent (bounds[d], common, X_AXIS);
+      Interval iv = Axis_group_interface::generic_bound_extent (bounds[d], common, X_AXIS);
 
       span_points[d] = iv.is_empty ()
                        ? bounds[d]->relative_coordinate (common, X_AXIS)

diff --git a/lily/tuplet-bracket.cc b/lily/tuplet-bracket.cc
index 643d07ae67cc48dcebc51cacf07025a5e594cc00..d566027d2af5d2e82dc89c12e6e85cef7e0f4494 100644 (file)
--- a/lily/tuplet-bracket.cc
+++ b/lily/tuplet-bracket.cc
@@ -199,9 +199,8 @@ Tuplet_bracket::calc_x_positions (SCM smob)
   Interval x_span;
   for (LEFT_and_RIGHT (d))
     {
-      x_span[d] = bounds[d]->break_status_dir ()
-                  ? Axis_group_interface::generic_bound_extent (bounds[d], commonx, X_AXIS)[d]
-                  : robust_relative_extent (bounds[d], commonx, X_AXIS)[d];
+      x_span[d] = Axis_group_interface::generic_bound_extent (bounds[d], commonx, X_AXIS)[d];
+
       if (connect_to_other[d])
         {
           Interval overshoot (robust_scm2drul (me->get_property ("break-overshoot"),