From: David Kastrup Date: Tue, 9 Sep 2014 09:04:27 +0000 (+0200) Subject: Revert "Convert \new Staff ... \addlyrics into \new Staff \new Voice ... \addlyrics" X-Git-Tag: release/2.19.14-1~5^2~2 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=fc9070f6ca7945cf30c991b11874de570d90c9e6;p=lilypond.git Revert "Convert \new Staff ... \addlyrics into \new Staff \new Voice ... \addlyrics" This reverts commit 76f256075f0a4f481d7e11c19dd55ab09030fe5b. --- diff --git a/scm/ly-syntax-constructors.scm b/scm/ly-syntax-constructors.scm index 68bfb1f9f1..66f34cfceb 100644 --- a/scm/ly-syntax-constructors.scm +++ b/scm/ly-syntax-constructors.scm @@ -253,20 +253,11 @@ into a @code{MultiMeasureTextEvent}." (get-next-unique-voice-name))) (voice (if (string? existing-voice-name) music - (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))))) + (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)))