From: Joe Neeman <joeneeman@gmail.com>
Date: Mon, 28 Feb 2011 04:59:33 +0000 (+1100)
Subject: Fix 1519.
X-Git-Tag: release/2.13.52-1~10
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=69aa7021254529b5f399861636b33674f57aa20d;p=lilypond.git

Fix 1519.

If a VerticalAxisGroup already has a StaffGrouper, don't override it.
---

diff --git a/input/regression/page-spacing-staff-group-nested.ly b/input/regression/page-spacing-staff-group-nested.ly
new file mode 100644
index 0000000000..95124a7cbd
--- /dev/null
+++ b/input/regression/page-spacing-staff-group-nested.ly
@@ -0,0 +1,29 @@
+\version "2.13.52"
+
+\header {
+  texidoc = "StaffGroups can be nested, in which case the inner StaffGroup wins."
+}
+
+\score {
+ <<
+   \new StaffGroup <<
+     \new Staff {
+       c'1
+     }
+     \new StaffGroup \with {
+       \override StaffGrouper #'staffgroup-staff-spacing #'basic-distance = #20
+     } <<
+       \new Staff {
+         c'1
+       }
+       \new Staff {
+         c'1
+       }
+     >>
+     \new Staff {
+       c'1
+     }
+   >>
+ >>
+}
+
diff --git a/lily/vertical-align-engraver.cc b/lily/vertical-align-engraver.cc
index 8516044f2a..094967d98d 100644
--- a/lily/vertical-align-engraver.cc
+++ b/lily/vertical-align-engraver.cc
@@ -163,7 +163,7 @@ Vertical_align_engraver::acknowledge_axis_group (Grob_info i)
 	    }
 	}
     }
-  else if (qualifies (i))
+  else if (qualifies (i) && !unsmob_grob (i.grob ()->get_object ("staff-grouper")))
     {
       Pointer_group_interface::add_grob (valign_, ly_symbol2scm ("elements"), i.grob ());
       i.grob ()->set_object ("staff-grouper", valign_->self_scm ());