Merge remote branch 'origin/release/unstable' into HEAD

diff --git a/input/regression/system-start-nesting.ly b/input/regression/system-start-nesting.ly
index d169a8cae2dd8883a50a36b62e7bef0037b617e1..b8bbfd62a58d3f6e72080a833c23132990e16038 100644 (file)
--- a/input/regression/system-start-nesting.ly
+++ b/input/regression/system-start-nesting.ly
@@ -11,7 +11,7 @@
 \new StaffGroup
 \relative <<
   \set StaffGroup.systemStartDelimiterHierarchy
-    = #'(SystemStartSquare (SystemStartBracket a (SystemStartSquare b)) d)
+    = #'(SystemStartSquare (SystemStartBracket a (SystemStartSquare b c)) d)
   \new Staff { c'1 }
   \new Staff { c1 }
   \new Staff { c1 }

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index c874eae7b9e82f15248a1c4d4ffe4e630029a7df..f525edd69a4040cb5acbec48b052ac006e96da34 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -2328,6 +2328,7 @@
 
     (SystemStartSquare
      . (
+        (collapse-height . 5.0)
         (direction . ,LEFT)
         (stencil . ,ly:system-start-delimiter::print)
         (style . line-bracket)