From: David Kastrup Date: Mon, 8 Sep 2014 15:24:37 +0000 (+0200) Subject: Convert \new Staff ... \addlyrics into \new Staff \new Voice ... \addlyrics X-Git-Tag: release/2.19.14-1~6^2~1 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=21af7576f26f9b79bc7a4dfcfa041b3b5ced47e7;p=lilypond.git 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 66f34cfceb..68bfb1f9f1 100644 --- 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)))