X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fframework-scm.scm;h=a47eb185fd602112956fff3bf14e4f5caf5d30d4;hb=b293e2046fc5a4cedf01d602c77b55ff41376735;hp=0d03320712ddc3ec12370d273fb5ddfcdb1daec6;hpb=a5457b887fc91e5a582e6460c9d557a4bb077054;p=lilypond.git

diff --git a/scm/framework-scm.scm b/scm/framework-scm.scm
index 0d03320712..a47eb185fd 100644
--- a/scm/framework-scm.scm
+++ b/scm/framework-scm.scm
@@ -1,33 +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)
-	     (ice-9 format)
-	     (guile)
-	     (srfi srfi-1)
-	     (ice-9 pretty-print)
-	     (srfi srfi-13)
-	     (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 "~a.scm" basename))))
+(define format ergonomic-simple-format)
+
+(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)
+	;; 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)))))
 
-  (for-each
-   (lambda (page)
-     (display
-       ";;;;;;;;;;;;;;;;;;;;;;;;;;\n;;;PAGE\n" file)
-     (pretty-print (ly:stencil-expr page) file))
-   (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)