From f2f3bda6c3dd0ee1a1be7b2a5ca6a2c3d836ba9c Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Sun, 10 Jun 2007 00:26:10 -0300 Subject: [PATCH] junk (ice-9 format) in backend --- scm/framework-eps.scm | 1 - scm/framework-null.scm | 3 +-- scm/framework-scm.scm | 3 +-- scm/framework-tex.scm | 15 +++++++-------- scm/framework-texstr.scm | 5 ++--- 5 files changed, 11 insertions(+), 16 deletions(-) diff --git a/scm/framework-eps.scm b/scm/framework-eps.scm index fab2d77177..1662491d86 100644 --- a/scm/framework-eps.scm +++ b/scm/framework-eps.scm @@ -10,7 +10,6 @@ (use-modules (ice-9 regex) (ice-9 string-fun) - (ice-9 format) (guile) (scm framework-ps) (scm paper-system) diff --git a/scm/framework-null.scm b/scm/framework-null.scm index 89fae350c2..a035dc9b92 100644 --- a/scm/framework-null.scm +++ b/scm/framework-null.scm @@ -6,14 +6,13 @@ (use-modules (ice-9 regex) (ice-9 string-fun) - (ice-9 format) (guile) (srfi srfi-1) (ice-9 pretty-print) (srfi srfi-13) (lily)) -(define-public (output-framework channel book scopes fields ) +(define-public (output-framework channel book scopes fields) #t) diff --git a/scm/framework-scm.scm b/scm/framework-scm.scm index ecbe711af8..53905e087d 100644 --- a/scm/framework-scm.scm +++ b/scm/framework-scm.scm @@ -5,7 +5,6 @@ (use-modules (ice-9 regex) (ice-9 string-fun) - (ice-9 format) (guile) (srfi srfi-1) (ice-9 pretty-print) @@ -15,7 +14,7 @@ (define-public (output-framework basename book scopes fields ) (let* - ((file (open-output-file (format "~a.scm" basename)))) + ((file (open-output-file (format #f "~a.scm" basename)))) (display ";;Creator: LilyPond\n" file) (display ";; raw SCM output\n" file) diff --git a/scm/framework-tex.scm b/scm/framework-tex.scm index a60f9877b1..1cf3a08e08 100644 --- a/scm/framework-tex.scm +++ b/scm/framework-tex.scm @@ -10,7 +10,6 @@ (use-modules (ice-9 regex) (ice-9 string-fun) - (ice-9 format) (scm page) (scm paper-system) (guile) @@ -68,7 +67,7 @@ (define-public (tex-font-command-raw name magnification) (string-append "magfont" - (digits->letters (format "~a" name)) + (digits->letters (format #f "~a" name)) "m" (string-encode-integer (inexact->exact (round (* 1000 magnification)))))) @@ -174,7 +173,7 @@ (define (dump-page putter page last? with-extents?) (ly:outputter-dump-string putter - (format "\\lybox{~a}{~a}{%\n" + (format #f "\\lybox{~a}{~a}{%\n" (if with-extents? (interval-start (ly:stencil-extent page X)) 0.0) @@ -189,7 +188,7 @@ "}%\n\\vfill\n\\lilypondpagebreak\n"))) (define-public (output-framework basename book scopes fields) - (let* ((filename (format "~a.tex" basename)) + (let* ((filename (format #f "~a.tex" basename)) (outputter (ly:make-paper-outputter (open-file filename "wb") 'tex)) (paper (ly:paper-book-paper book)) (page-stencils (map page-stencil (ly:paper-book-pages book))) @@ -216,7 +215,7 @@ (define (dump-line putter line last?) (ly:outputter-dump-string putter - (format "\\lybox{~a}{~a}{%\n" + (format #f "\\lybox{~a}{~a}{%\n" (ly:number->string (max 0 (interval-end (paper-system-extent line X)))) (ly:number->string @@ -231,7 +230,7 @@ (define-public (output-classic-framework basename book scopes fields) - (let* ((filename (format "~a.tex" basename)) + (let* ((filename (format #f "~a.tex" basename)) (outputter (ly:make-paper-outputter (open-file filename "w") 'tex)) (paper (ly:paper-book-paper book)) @@ -258,7 +257,7 @@ (define-public (output-preview-framework basename book scopes fields) - (let* ((filename (format "~a.tex" basename)) + (let* ((filename (format #f "~a.tex" basename)) (outputter (ly:make-paper-outputter (open-file filename "wb") 'tex)) (paper (ly:paper-book-paper book)) @@ -319,7 +318,7 @@ (papersizename (ly:output-def-lookup paper 'papersizename)) (landscape? (eq? #t (ly:output-def-lookup paper 'landscape))) (base (basename name ".tex")) - (ps-name (format "~a.ps" base ".ps")) + (ps-name (format #f "~a.ps" base ".ps")) (cmd (string-append "dvips" (if preview? " -E" diff --git a/scm/framework-texstr.scm b/scm/framework-texstr.scm index 6bde0616bd..ebc6b0c2b2 100644 --- a/scm/framework-texstr.scm +++ b/scm/framework-texstr.scm @@ -11,7 +11,6 @@ (use-modules (ice-9 regex) (scm paper-system) (ice-9 string-fun) - (ice-9 format) (guile) (srfi srfi-1) (srfi srfi-13) @@ -32,7 +31,7 @@ ") (define-public (output-classic-framework basename book scopes fields) - (let* ((filename (format "~a.texstr" basename)) + (let* ((filename (format #f "~a.texstr" basename)) (outputter (ly:make-paper-outputter (open-file filename "wb") (ly:get-option 'backend))) @@ -46,7 +45,7 @@ (ly:outputter-dump-string outputter (footer)))) (define-public (output-framework basename book scopes fields ) - (let* ((filename (format "~a.texstr" basename)) + (let* ((filename (format #f "~a.texstr" basename)) (outputter (ly:make-paper-outputter (open-file filename "wb") -- 2.39.5