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

diff --git a/Documentation/notation/vocal.itely b/Documentation/notation/vocal.itely
index 54c7c884770dcceee7d7ca3b17c10ba8703d0605..4f77e7a96946cad2ef7f338c2e6fbead553ca771 100644 (file)
--- 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 c6b8bfcd2765b9cf0d89cf9dfdba636bd9cd9e14..4d979cea247501046e917c35cb5fa5bc105d2d8b 100644 (file)
--- 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"