Merge branch 'master' of git://git.sv.gnu.org/lilypond

diff --git a/input/regression/span-bar-spacing.ly b/input/regression/span-bar-spacing.ly
new file mode 100644 (file)
index 0000000..64ed1b3
--- /dev/null
+++ b/input/regression/span-bar-spacing.ly
@@ -0,0 +1,18 @@
+\header {
+  texidoc = "SpanBars participate in the horizontal collision system;
+the accidentals should not collide with the bar lines."
+}
+
+\version "2.11.34"
+
+upper = \relative c' {
+  \key f \minor \time 12/8 
+  r4. r8 r r r r r r r r 
+  e8 e e e e e e e e e e e 
+  e, e'! e! e! e! e! e! e! e! e! e! e!
+}
+
+lower = { R1. R1. R1. }
+
+\new PianoStaff << \new Staff \upper \new Staff \lower >>
+

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 658d2dfeb0c8ae5a2c615b08beeefa29fba62989..b445a190f2f4816d2d16235fb5a0d1227a79acdb 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -1530,6 +1530,7 @@
      . (
        (break-align-symbol . staff-bar)
        (Y-extent . ,ly:axis-group-interface::height)
+       (cross-staff . #t)
        (layer . 0)
        (non-musical . #t)
        (stencil . ,ly:span-bar::print)