Issue 3580: Replace unwarranted uses of map with for-each and other Scheme cleanups

[lilypond.git] / scm / display-woodwind-diagrams.scm

diff --git a/scm/display-woodwind-diagrams.scm b/scm/display-woodwind-diagrams.scm
index c5eeaefbb3828f02fce30407588e2d4af49ec598..5b34ac94fcda7212551236f542c52d85996f74e6 100644 (file)
--- a/scm/display-woodwind-diagrams.scm
+++ b/scm/display-woodwind-diagrams.scm
@@ -1671,7 +1671,7 @@
         `(((,(caaar possibility-list) .
             ,(assoc-get input-key (cdar possibility-list))) .
             ,(assoc-get (caar possibility-list) canonic-list)))
-        (assoc-remove (caar possibility-list) canonic-list))
+        (alist-delete (caar possibility-list) canonic-list))
        (update-possb-list input-key (cdr possibility-list) canonic-list))))
 
 (define (key-crawler input-list possibility-list)
@@ -1685,8 +1685,7 @@
         possibility-list))))
 
 (define (translate-draw-instructions input-alist key-name-alist)
-  (apply append
-         (map (lambda (short long)
+  (append-map (lambda (short long)
                 (let*
                     ((key-instructions
                       (map (lambda (instr)
@@ -1695,15 +1694,14 @@
                            (assoc-get long key-name-alist))))
                   (key-crawler (assoc-get short input-alist) key-instructions)))
               '(hd cc lh rh)
-              '(hidden central-column left-hand right-hand))))
+              '(hidden central-column left-hand right-hand)))
 
 (define (uniform-draw-instructions key-name-alist)
-  (apply append
-         (map (lambda (long)
+  (append-map (lambda (long)
                 (map (lambda (key-instructions)
                        `((,long . ,(car key-instructions)) . 1))
                      (assoc-get long key-name-alist)))
-              '(hidden central-column left-hand right-hand))))
+              '(hidden central-column left-hand right-hand)))
 
 (define (list-all-possible-keys key-name-alist)
   (map (lambda (short long)