From a1cf6794106f26cd7f2603910ed6eef5f0feda59 Mon Sep 17 00:00:00 2001 From: Patrick McCarty Date: Fri, 7 Aug 2009 13:55:08 -0700 Subject: [PATCH] SCM backend: cleanup --- scm/framework-scm.scm | 49 +++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 25 deletions(-) diff --git a/scm/framework-scm.scm b/scm/framework-scm.scm index 7c7c7e1045..51a1446302 100644 --- a/scm/framework-scm.scm +++ b/scm/framework-scm.scm @@ -1,37 +1,36 @@ -;;;; framework-scm.scm +;;;; 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) -- 2.39.2