X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fframework-scm.scm;h=915e97ded39ae23b439b7d7319c0cf0cc83e9161;hb=HEAD;hp=53905e087dcf56f6f93b1b94680c8b51d8feb8a0;hpb=f2f3bda6c3dd0ee1a1be7b2a5ca6a2c3d836ba9c;p=lilypond.git

diff --git a/scm/framework-scm.scm b/scm/framework-scm.scm
index 53905e087d..915e97ded3 100644
--- a/scm/framework-scm.scm
+++ b/scm/framework-scm.scm
@@ -1,38 +1,36 @@
+;;;; framework-scm.scm -- output full-page stencil expressions
+
+(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))
+
+(define format ergonomic-simple-format)
+
+(define-public (output-framework basename book scopes fields)
+  (let* ((file (open-output-file (format #f "~a.scm" basename))))
 
-(define-module (scm framework-scm)
-  #:export (output-framework)
-  )
-
-(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))))
-    
     (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)
-(define-public (convert-to-dvi . args) #t)
-(define-public (convert-to-tex . args) #t)