Merge branch 'master' of ssh+git://git.sv.gnu.org/srv/git/lilypond

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

diff --git a/scm/framework-tex.scm b/scm/framework-tex.scm
index a60f9877b11477f9173818605efb2548fbab9444..8b10bac42c8ab0cc8803660ce1cd3be6c1d11cdc 100644 (file)
--- a/scm/framework-tex.scm
+++ b/scm/framework-tex.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;; source file of the GNU LilyPond music typesetter
 ;;;;
-;;;; (c) 2004--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+;;;; (c) 2004--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 (define-module (scm framework-tex)
   #:export (output-framework-tex       
@@ -10,7 +10,6 @@
 
 (use-modules (ice-9 regex)
             (ice-9 string-fun)
-            (ice-9 format)
             (scm page)
             (scm paper-system)
             (guile)
@@ -20,6 +19,8 @@
             (scm kpathsea)
             (lily))
 
+(define format ergonomic-simple-format)
+
 (define (output-formats)
   (define formats (ly:output-formats))
   (set! formats (completize-formats formats))
@@ -83,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