From: Han-Wen Nienhuys Date: Sun, 10 Jun 2007 04:04:22 +0000 (-0300) Subject: define and use ergonomic-simple-format X-Git-Tag: release/2.11.27-1~15^2~4^2~4 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=a6fba9e9d69be3e5c2567f121d956e28a7d1b3a8;p=lilypond.git define and use ergonomic-simple-format --- diff --git a/scm/framework-eps.scm b/scm/framework-eps.scm index 1662491d86..85a4a98636 100644 --- a/scm/framework-eps.scm +++ b/scm/framework-eps.scm @@ -19,6 +19,8 @@ (srfi srfi-13) (lily)) +(define format ergonomic-simple-format) + (define framework-eps-module (current-module)) diff --git a/scm/framework-ps.scm b/scm/framework-ps.scm index 0eb622fe48..5d693358bf 100644 --- a/scm/framework-ps.scm +++ b/scm/framework-ps.scm @@ -17,10 +17,7 @@ (scm clip-region) (lily)) -(define (format dest . rest) - (if (string? dest) - (apply simple-format (cons #f (cons dest rest))) - (apply simple-format (cons dest rest)))) +(define format ergonomic-simple-format) (define framework-ps-module (current-module)) diff --git a/scm/framework-svg.scm b/scm/framework-svg.scm index 8f5f34d7c0..87480f1955 100644 --- a/scm/framework-svg.scm +++ b/scm/framework-svg.scm @@ -17,6 +17,8 @@ (srfi srfi-13) (ice-9 regex)) +(define format ergonomic-simple-format) + (define-public (output-framework basename book scopes fields) (let* ((filename (format "~a.svg" basename)) (outputter (ly:make-paper-outputter (open-file filename "wb") @@ -44,8 +46,8 @@ '(version . "1.2") ;; Argggghhhh: SVG takes the px <-> mm mapping from the windowing system - `(width . ,(format #f "~s" page-width)) - `(height . ,(format #f "~s" page-height)))) + `(width . ,(format "~s" page-width)) + `(height . ,(format "~s" page-height)))) (dump (dump-fonts outputter paper)) (dump @@ -75,7 +77,7 @@ (define (dump-page outputter page page-number page-count landscape? page-set?) (define (dump str) (display str (ly:outputter-port outputter))) - (dump (comment (format #f "Page: ~S/~S" page-number page-count))) + (dump (comment (format "Page: ~S/~S" page-number page-count))) (if (or landscape? page-set?) (dump (if landscape? diff --git a/scm/framework-tex.scm b/scm/framework-tex.scm index 1cf3a08e08..5553b5b442 100644 --- a/scm/framework-tex.scm +++ b/scm/framework-tex.scm @@ -19,6 +19,8 @@ (scm kpathsea) (lily)) +(define format ergonomic-simple-format) + (define (output-formats) (define formats (ly:output-formats)) (set! formats (completize-formats formats)) @@ -67,7 +69,7 @@ (define-public (tex-font-command-raw name magnification) (string-append "magfont" - (digits->letters (format #f "~a" name)) + (digits->letters (format "~a" name)) "m" (string-encode-integer (inexact->exact (round (* 1000 magnification)))))) @@ -82,7 +84,7 @@ (apply string-append (map (lambda (sub-name) - (format #f "\\font\\~a=~a scaled ~a%\n" + (format "\\font\\~a=~a scaled ~a%\n" (tex-font-command-raw sub-name (ly:font-magnification font)) sub-name @@ -173,7 +175,7 @@ (define (dump-page putter page last? with-extents?) (ly:outputter-dump-string putter - (format #f "\\lybox{~a}{~a}{%\n" + (format "\\lybox{~a}{~a}{%\n" (if with-extents? (interval-start (ly:stencil-extent page X)) 0.0) @@ -188,7 +190,7 @@ "}%\n\\vfill\n\\lilypondpagebreak\n"))) (define-public (output-framework basename book scopes fields) - (let* ((filename (format #f "~a.tex" basename)) + (let* ((filename (format "~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))) @@ -215,7 +217,7 @@ (define (dump-line putter line last?) (ly:outputter-dump-string putter - (format #f "\\lybox{~a}{~a}{%\n" + (format "\\lybox{~a}{~a}{%\n" (ly:number->string (max 0 (interval-end (paper-system-extent line X)))) (ly:number->string @@ -230,7 +232,7 @@ (define-public (output-classic-framework basename book scopes fields) - (let* ((filename (format #f "~a.tex" basename)) + (let* ((filename (format "~a.tex" basename)) (outputter (ly:make-paper-outputter (open-file filename "w") 'tex)) (paper (ly:paper-book-paper book)) @@ -257,7 +259,7 @@ (define-public (output-preview-framework basename book scopes fields) - (let* ((filename (format #f "~a.tex" basename)) + (let* ((filename (format "~a.tex" basename)) (outputter (ly:make-paper-outputter (open-file filename "wb") 'tex)) (paper (ly:paper-book-paper book)) @@ -318,7 +320,7 @@ (papersizename (ly:output-def-lookup paper 'papersizename)) (landscape? (eq? #t (ly:output-def-lookup paper 'landscape))) (base (basename name ".tex")) - (ps-name (format #f "~a.ps" base ".ps")) + (ps-name (format "~a.ps" base ".ps")) (cmd (string-append "dvips" (if preview? " -E" diff --git a/scm/framework-texstr.scm b/scm/framework-texstr.scm index ebc6b0c2b2..2dcbebe9fc 100644 --- a/scm/framework-texstr.scm +++ b/scm/framework-texstr.scm @@ -16,6 +16,8 @@ (srfi srfi-13) (lily)) +(define format ergonomic-simple-format) + (define (header filename) (format "% header \\input{lilypond-tex-metrics} diff --git a/scm/lily.scm b/scm/lily.scm index 101e94a61c..b85f354e00 100644 --- a/scm/lily.scm +++ b/scm/lily.scm @@ -17,8 +17,6 @@ (read-enable 'positions) (debug-enable 'debug) - - (define scheme-options-definitions `( @@ -115,12 +113,15 @@ on errors, and print a stack trace.") (scm memory-trace) (scm coverage) ) -(define-public (format . rest) - "We don't want to use ice-9 format, due to its memory use." +(define-public (ergonomic-simple-format dest . rest) + "Like ice-9 format, but without the memory consumption." - (if (string? (car rest)) - (apply simple-format (cons #f rest)) - (apply simple-format rest))) + (if (string? dest) + (apply simple-format (cons #f (cons dest rest))) + (apply simple-format (cons dest rest)))) + + +(define format ergonomic-simple-format) ;; my display (define-public (myd k v) (display k) (display ": ") (display v) (display ", ")