Imported Upstream version 2.14.2

[lilypond.git] / scm / framework-scm.scm

diff --git a/scm/framework-scm.scm b/scm/framework-scm.scm
index 5cb3a67490f43e9013375ea6964e34acf87f4ad0..51a14463021909086fb09aab0260e62733cfdb04 100644 (file)
--- a/scm/framework-scm.scm
+++ b/scm/framework-scm.scm
@@ -1,36 +1,36 @@
+;;;; framework-scm.scm -- output full-page stencil expressions
 
-(define-module (scm framework-scm)
-  #:export (output-framework)
-  )
+(define-module (scm framework-scm))
 
-(use-modules (ice-9 regex)
-            (ice-9 string-fun)
-            (guile)
-            (srfi srfi-1)
-            (ice-9 pretty-print)
-            (srfi srfi-13)
-            (scm page)
-            (lily))
+(use-modules
+  (ice-9 regex)
+  (ice-9 string-fun)
+  (guile)
+  (srfi srfi-1)
+  (ice-9 pretty-print)
+  (srfi srfi-13)
+  (scm page)
+  (lily))
 
-(define-public (output-framework basename book scopes fields )
-  (let*
-      ((file (open-output-file (format #f "~a.scm" basename))))
+(define format ergonomic-simple-format)
+
+(define-public (output-framework basename book scopes fields)
+  (let* ((file (open-output-file (format "~a.scm" basename))))
     
     (display ";;Creator: LilyPond\n" file)
     (display ";; raw SCM output\n" file)
-
-  (for-each
-   (lambda (page)
-     (display
-       ";;;;;;;;;;;;;;;;;;;;;;;;;;\n;;;PAGE\n" file)
-;     (pretty-print (ly:stencil-expr page) file)
-     (write (ly:stencil-expr page) file)
-     )
-   (map page-stencil (ly:paper-book-pages book)))))
+    
+    (for-each
+      (lambda (page)
+       (display ";;;;;;;;;;;;;;;;;;;;;;;;;;\n;;;PAGE\n" file)
+       ;; The following two lines are alternates
+       ;(pretty-print (ly:stencil-expr page) file)
+       (write (ly:stencil-expr page) file)
+       )
+      (map page-stencil (ly:paper-book-pages book)))))
 
 (define-public output-classic-framework output-framework)
 
-
 (define-public (convert-to-ps . args) #t)
 (define-public (convert-to-pdf . args) #t)
 (define-public (convert-to-png . args) #t)