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 (file)
index 0000000..95124a7
--- /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 8516044f2a590052feb23f5437fcd65692b5713a..094967d98dc30518c576dbdc4cdf0ee0dfdf8ebd 100644 (file)
--- 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 ());