From: Phil Holmes <mail@philholmes.net>
Date: Wed, 22 Jun 2016 08:13:36 +0000 (+0100)
Subject: Merge remote branch 'origin/release/unstable' into HEAD
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=5dbaaca80b06fda4b0a3b9cdc67760a2735dbee1;hp=f869d8f6ebe878618588036e17971166721de9e0;p=lilypond.git

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 d169a8cae2..b8bbfd62a5 100644
--- 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 c874eae7b9..f525edd69a 100644
--- 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)