Merge http://git.sv.gnu.org/r/lilypond

[lilypond.git] / scm / framework-texstr.scm

diff --git a/scm/framework-texstr.scm b/scm/framework-texstr.scm
index 6bde0616bd2ebfb2d65691f0bb687efd65814ca2..2dcbebe9fc20df719f9da28676376d026b8a3a54 100644 (file)
--- a/scm/framework-texstr.scm
+++ b/scm/framework-texstr.scm
@@ -11,12 +11,13 @@
 (use-modules (ice-9 regex)
             (scm paper-system)
             (ice-9 string-fun)
-            (ice-9 format)
             (guile)
             (srfi srfi-1)
             (srfi srfi-13)
             (lily))
 
+(define format ergonomic-simple-format)
+
 (define (header filename)
   (format  "% header
 \\input{lilypond-tex-metrics}
@@ -32,7 +33,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 +47,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")