Issue 4421/1: Deal sensibly with non-existent parser/location

[lilypond.git] / scm / define-music-display-methods.scm

diff --git a/scm/define-music-display-methods.scm b/scm/define-music-display-methods.scm
index 2d2a178857ba97ccb414deef68b23fbb0c8227fd..e2412367b81f642629dd4ca5a4a2f3b854d01a4b 100644 (file)
--- a/scm/define-music-display-methods.scm
+++ b/scm/define-music-display-methods.scm
@@ -89,10 +89,11 @@ expression."
   (define (pitch= pitch1 pitch2)
     (and (= (ly:pitch-notename pitch1) (ly:pitch-notename pitch2))
          (= (ly:pitch-alteration pitch1) (ly:pitch-alteration pitch2))))
-  (let ((result (rassoc ly-pitch (ly:parser-lookup parser 'pitchnames) pitch=)))
-    (if result
-        (car result)
-        #f)))
+  (let* ((pitches (if parser (ly:parser-lookup parser 'pitchnames)
+                      (assoc-get (string->symbol default-language)
+                                 language-pitch-names '())))
+         (result (rassoc ly-pitch pitches pitch=)))
+    (and result (car result))))
 
 (define-public (octave->lily-string pitch)
   (let ((octave (ly:pitch-octave pitch)))