Issue 5167/6: Changes: show \markup xxx = ... \etc assignments

[lilypond.git] / scm / song-util.scm

diff --git a/scm/song-util.scm b/scm/song-util.scm
index 5eec46fdd69a34db7b00ce24f8aac3f6a95f2059..31cb1e8d48c2d35565127a0117d9d77e4ae0f0d7 100644 (file)
--- a/scm/song-util.scm
+++ b/scm/song-util.scm
@@ -77,15 +77,14 @@
                (lambda (record) ((record-predicate ,record) record)))
          (set! ,$make-record
                (lambda* (#:key ,@slots)
-                 ((record-constructor ,record) ,@(map car slots*))))
+                        ((record-constructor ,record) ,@(map car slots*))))
          (set! ,$copy-record
                (lambda (record)
-                 (,$make-record ,@(apply
-                                   append
-                                   (map (lambda (slot)
-                                          (list (symbol->keyword slot)
-                                                (list (make-symbol reader-format slot) 'record)))
-                                        (map car slots*))))))
+                 (,$make-record ,@(append-map
+                                   (lambda (slot)
+                                     (list (symbol->keyword slot)
+                                           (list (make-symbol reader-format slot) 'record)))
+                                   (map car slots*)))))
          ,@(map (lambda (s)
                   `(set! ,(make-symbol reader-format (car s))
                          (record-accessor ,record (quote ,(car s)))))
@@ -160,11 +159,11 @@ If it unsets the property, return @code{#f}."
   "Return list of all @var{music}'s top-level children."
   (let ((elt (ly:music-property music 'element))
         (elts (ly:music-property music 'elements))
-       (arts (ly:music-property music 'articulations)))
+        (arts (ly:music-property music 'articulations)))
     (if (pair? arts)
-       (set! elts (append elts arts)))
+        (set! elts (append elts arts)))
     (if (null? elt)
-       elts
+        elts
         (cons elt elts))))
 
 (define-public (find-child music predicate)
@@ -193,9 +192,9 @@ If a non-boolean is returned, it is considered the material to recurse."
         (let* ((elt (car queue))
                (stop (function elt)))
           (process-music (if (boolean? stop)
-                            (if stop
-                                (cdr queue)
-                                (append (music-elements elt) (cdr queue)))
-                            ((if (cheap-list? stop) append cons)
-                             stop (cdr queue)))))))
+                             (if stop
+                                 (cdr queue)
+                                 (append (music-elements elt) (cdr queue)))
+                             ((if (cheap-list? stop) append cons)
+                              stop (cdr queue)))))))
   (process-music (list music)))