Imported Upstream version 2.18.0

[lilypond.git] / scm / document-context-mods.scm

diff --git a/scm/document-context-mods.scm b/scm/document-context-mods.scm
index d115389a1f9329c84487d2d3f2bae6d6306c8ade..f5034d2ecc10129e8603ea52eeaf94157234bc41 100644 (file)
--- a/scm/document-context-mods.scm
+++ b/scm/document-context-mods.scm
@@ -73,19 +73,16 @@
 "
      name-sym
      name-sym
-     (if (pair? docstring) 
-         (cadar docstring) 
+     (if (pair? docstring)
+         (cadar docstring)
          (begin
            (ly:warning "context modification `~a' not documented." name-sym)
            "(undocumented; fixme)"))
      (map document-mod-list mod-list))))
 
 (define (document-mod obj-pair)
-  (cond
-   ((ly:context-mod? (cdr obj-pair))
-    (document-context-mod obj-pair))
-   (else
-    #f)))
+  (and (ly:context-mod? (cdr obj-pair))
+       (document-context-mod obj-pair)))
 
 (define context-mods-doc-string
   (format
@@ -94,11 +91,9 @@
 @end table
 "
    (string-join
-    (filter
-     identity
-     (map
-      document-mod
-      (sort
-       (ly:module->alist (current-module))
-       identifier<?)))
-    "")))
+    (filter-map
+     document-mod
+     (sort
+      (ly:module->alist (current-module))
+      identifier<?)))
+   ""))