From f860822135d603052df95fc535516a8b57699102 Mon Sep 17 00:00:00 2001
From: Keith OHara <k-ohara5a5a@oco.net>
Date: Sun, 21 Jun 2015 10:31:21 -0700
Subject: [PATCH] NullVoice: not accepted directly by Score; issue 4302

It gets an implicit enclosing Staff when nexted in staff-grouping
contexts, so create an implicit Staff around NullVoice at Score level
---
 Documentation/notation/vocal.itely | 2 +-
 ly/engraver-init.ly                | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/Documentation/notation/vocal.itely b/Documentation/notation/vocal.itely
index 54c7c88477..4f77e7a969 100644
--- a/Documentation/notation/vocal.itely
+++ b/Documentation/notation/vocal.itely
@@ -1729,7 +1729,7 @@ altoTwo = \relative { d'2 g4( fis8 g) }
 aligner = \relative { b'8( c d c) d( d d d) }
 words = \lyricmode { la __ la __ }
 
-\new ChoirStaff <<
+\new ChoirStaff \with {\accepts NullVoice } <<
   \new Staff \soprano
   \new NullVoice = "aligner" \aligner
   \new Lyrics \lyricsto "aligner" \words
diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly
index c6b8bfcd27..4d979cea24 100644
--- a/ly/engraver-init.ly
+++ b/ly/engraver-init.ly
@@ -578,7 +578,6 @@ automatically when an output definition (a @code{\\score} or
   \accepts "Lyrics"
   \accepts "MensuralStaff"
   \accepts "NoteNames"
-  \accepts "NullVoice"
   \accepts "PetrucciStaff"
   \accepts "PianoStaff"
   \accepts "RhythmicStaff"
-- 
2.39.5