Revert "Apply scripts/auxiliar/fixscm.sh"

[lilypond.git] / scm / titling.scm

diff --git a/scm/titling.scm b/scm/titling.scm
index b5f8b1bb8a64218a5d3e4dbbdb186a5a1100d986..7118fb1a06a91bba99ac4e5aae8b5718b8849eb1 100644 (file)
--- a/scm/titling.scm
+++ b/scm/titling.scm
@@ -18,8 +18,8 @@
 
 (define-public (layout-extract-page-properties layout)
   (list (append `((line-width . ,(ly:paper-get-number
-                                  layout 'line-width)))
-                (ly:output-def-lookup layout 'text-font-defaults))))
+                                layout 'line-width)))
+               (ly:output-def-lookup layout 'text-font-defaults))))
 
 ;;;;;;;;;;;;;;;;;;
 
@@ -29,46 +29,46 @@
 and interpret them as markup.  The @var{props} argument will include
 variables set in @var{scopes} and @code{page:is-bookpart-last-page},
 @code{page:is-last-bookpart}, @code{page:page-number-string}, and
-@code{page:page-number}."
+@code{page:page-number}." 
 
   (define (get sym)
     (ly:output-def-lookup layout sym))
 
   (define (interpret-in-page-env potential-markup)
     (if (markup? potential-markup)
-        (let* ((alists (map ly:module->alist scopes))
-               (prefixed-alists
-                (map (lambda (alist)
-                       (map (lambda (entry)
-                              (cons
-                               (string->symbol
-                                (string-append
-                                 "header:"
-                                 (symbol->string (car entry))))
-                               (cdr entry)))
-                            alist))
-                     alists))
-               (pgnum-alist
-                (list
-                 (cons 'header:tagline
-                       (ly:modules-lookup scopes 'tagline
-                                          (ly:output-def-lookup layout 'tagline)))
-                 (cons 'page:is-last-bookpart is-last-bookpart)
-                 (cons 'page:is-bookpart-last-page is-bookpart-last-page)
-                 (cons 'page:page-number-string
-                       (number->string page-number))
-                 (cons 'page:page-number page-number)))
-               (props (append
-                       (list pgnum-alist)
-                       prefixed-alists
-                       (layout-extract-page-properties layout))))
-          (interpret-markup layout props potential-markup))
+       (let* ((alists (map ly:module->alist scopes))
+              (prefixed-alists
+               (map (lambda (alist)
+                      (map (lambda (entry)
+                             (cons
+                              (string->symbol
+                               (string-append
+                                "header:"
+                                (symbol->string (car entry))))
+                              (cdr entry)))
+                           alist))
+                    alists))
+              (pgnum-alist
+               (list
+                (cons 'header:tagline
+                      (ly:modules-lookup scopes 'tagline
+                                         (ly:output-def-lookup layout 'tagline)))
+                (cons 'page:is-last-bookpart is-last-bookpart)
+                (cons 'page:is-bookpart-last-page is-bookpart-last-page)
+                (cons 'page:page-number-string
+                      (number->string page-number))
+                (cons 'page:page-number page-number)))
+              (props (append
+                      (list pgnum-alist)
+                      prefixed-alists
+                      (layout-extract-page-properties layout))))
+         (interpret-markup layout props potential-markup))
 
-        empty-stencil))
+       empty-stencil))
 
   (interpret-in-page-env
    (if (and (even? page-number)
-            (markup? (get what-even)))
+           (markup? (get what-even)))
        (get what-even)
        (get what-odd))))
 
@@ -76,28 +76,28 @@ variables set in @var{scopes} and @code{page:is-bookpart-last-page},
   "Read variables @var{what} from @var{scopes}, and interpret it as markup.
 The @var{props} argument will include variables set in @var{scopes} (prefixed
 with `header:'."
-
+  
   (define (get sym)
     (let ((x (ly:modules-lookup scopes sym)))
       (if (markup? x) x #f)))
 
   (let* ((alists (map ly:module->alist scopes))
-         (prefixed-alist
-          (map (lambda (alist)
-                 (map (lambda (entry)
-                        (cons
-                         (string->symbol
-                          (string-append
-                           "header:"
-                           (symbol->string (car entry))))
-                         (cdr entry)))
-                      alist))
-               alists))
-         (props (append prefixed-alist
-                        (layout-extract-page-properties layout)))
+        (prefixed-alist
+         (map (lambda (alist)
+                (map (lambda (entry)
+                       (cons
+                        (string->symbol
+                         (string-append
+                          "header:"
+                          (symbol->string (car entry))))
+                        (cdr entry)))
+                     alist))
+              alists))
+        (props (append prefixed-alist
+                       (layout-extract-page-properties layout)))
 
-         (markup (ly:output-def-lookup layout what)))
+        (markup (ly:output-def-lookup layout what)))
 
     (if (markup? markup)
-        (interpret-markup layout props markup)
+       (interpret-markup layout props markup)
         empty-stencil)))