Fix bugs preventing \addlyrics from finding an existing context to attach to

[lilypond.git] / scm / ly-syntax-constructors.scm

diff --git a/scm/ly-syntax-constructors.scm b/scm/ly-syntax-constructors.scm
index 73e871686e3ee079f488ec646b0d550d870206ba..7741914b0f8fa50125ec2d5275c97224c4b62287 100644 (file)
--- a/scm/ly-syntax-constructors.scm
+++ b/scm/ly-syntax-constructors.scm
@@ -207,11 +207,10 @@ into a @code{MultiMeasureTextEvent}."
                 'context-type ctx
                 'origin location)))
 
-;; TODO: It seems that this function rarely returns anything useful.
 (define (get-first-context-id type mus)
   "Find the name of a ContextSpeccedMusic with given type"
   (let ((id (ly:music-property mus 'context-id)))
-    (if (and (eq? (ly:music-property mus 'type) 'ContextSpeccedMusic)
+    (if (and (eq? (ly:music-property mus 'name) 'ContextSpeccedMusic)
              (eq? (ly:music-property mus 'context-type) type)
              (string? id)
              (not (string-null? id)))
@@ -246,7 +245,7 @@ into a @code{MultiMeasureTextEvent}."
                          existing-voice-name
                          (get-next-unique-voice-name)))
          (voice (if (string? existing-voice-name)
-                    (music)
+                    music
                     (make-music 'ContextSpeccedMusic
                                 'element music
                                 'context-type 'Voice