X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fframework-scm.scm;h=e4895ae2e0fd6cb2fe011edd673145bb8ca023a5;hb=6d575f3fd3a822e9446829ffad03dd8561afffb2;hp=23fc0c19e92444cfb014967e3a9e9f3bbc5175bd;hpb=a899e55a62af2421792b7c72db042646acf520a3;p=lilypond.git

diff --git a/scm/framework-scm.scm b/scm/framework-scm.scm
index 23fc0c19e9..e4895ae2e0 100644
--- a/scm/framework-scm.scm
+++ b/scm/framework-scm.scm
@@ -1,6 +1,6 @@
 
 (define-module (scm framework-scm)
- #:export (output-framework)
+  #:export (output-framework)
   )
 
 (use-modules (ice-9 regex)
@@ -10,21 +10,25 @@
 	     (srfi srfi-1)
 	     (ice-9 pretty-print)
 	     (srfi srfi-13)
+	     (scm page)
 	     (lily))
 
-(define-public (output-framework outputter book scopes fields basename)
-  (ly:outputter-dump-string outputter ";; raw SCM output\n")
+(define-public (output-framework basename book scopes fields )
+  (let*
+      ((file (open-output-file (format "~a.scm" basename))))
+    
+    (display ";; raw SCM output\n" file)
 
   (for-each
    (lambda (page)
-     (ly:outputter-dump-string
-      outputter ";;;;;;;;;;;;;;;;;;;;;;;;;;\n;;;PAGE\n") 
-     (ly:outputter-dump-string
-      outputter
-      (call-with-output-string
-       (lambda (port)
-	 (pretty-print (ly:stencil-expr page) port)))))
-   (ly:paper-book-pages book)))
+     (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)))))
+
+(define-public output-classic-framework output-framework)
 
 
 (define-public (convert-to-ps . args) #t)