Convert \new Staff ... \addlyrics into \new Staff \new Voice ... \addlyrics

diff --git a/scm/ly-syntax-constructors.scm b/scm/ly-syntax-constructors.scm
index 66f34cfceb7c8819659ed0dfd3f68effb1c86d71..68bfb1f9f163361ada22655459bd303ea0f96395 100644 (file)
--- a/scm/ly-syntax-constructors.scm
+++ b/scm/ly-syntax-constructors.scm
@@ -253,11 +253,20 @@ into a @code{MultiMeasureTextEvent}."
                          (get-next-unique-voice-name)))
          (voice (if (string? existing-voice-name)
                     music
-                    (make-music 'ContextSpeccedMusic
-                                'element music
-                                'context-type 'Voice
-                                'context-id voice-name
-                                'origin (ly:music-property music 'origin))))
+                    (if (eq? (ly:music-property music 'name) 'ContextSpeccedMusic)
+                        (begin
+                          (set! (ly:music-property music 'element)
+                                (make-music 'ContextSpeccedMusic
+                                            'element (ly:music-property music 'element)
+                                            'context-type 'Voice
+                                            'context-id voice-name
+                                            'origin (ly:music-property music 'origin)))
+                          music)
+                        (make-music 'ContextSpeccedMusic
+                                    'element music
+                                    'context-type 'Voice
+                                    'context-id voice-name
+                                    'origin (ly:music-property music 'origin)))))
          (lyricstos (map (lambda (mus)
                            (let* ((loc (ly:music-property mus 'origin))
                                   (lyr (lyric-combine-music voice-name mus loc)))