* configure.in (LINK_GXX_STATICALLY): remove kpathsea checks.

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

diff --git a/scm/framework-tex.scm b/scm/framework-tex.scm
index b8907f76f064759b34ffcd805fd8940c191efd38..52ce2e982c162c84c68ae8a9dc190f0a8b27cbaf 100644 (file)
--- a/scm/framework-tex.scm
+++ b/scm/framework-tex.scm
@@ -1,6 +1,6 @@
-;;;; framework-tex.scm --
+;;;; framework-tex.scm -- structure for TeX output
 ;;;;
-;;;;  source file of the GNU LilyPond music typesetter
+;;;; source file of the GNU LilyPond music typesetter
 ;;;;
 ;;;; (c) 2004--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 
@@ -15,6 +15,7 @@
             (srfi srfi-1)
             (srfi srfi-13)
             (srfi srfi-14)
+            (scm kpathsea)
             (lily))
 
 (define (output-formats)
@@ -190,7 +191,7 @@
 
 (define-public (output-framework basename book scopes fields)
   (let* ((filename (format "~a.tex" basename))
-        (outputter  (ly:make-paper-outputter filename "tex"))
+        (outputter  (ly:make-paper-outputter (open-file filename "wb") "tex"))
         (paper (ly:paper-book-paper book))
         (pages (ly:paper-book-pages book))
         (last-page (car (last-pair pages)))
@@ -218,11 +219,11 @@
    putter
    (format "\\lybox{~a}{~a}{%\n"
           (ly:number->string
-           (max 0 (interval-end (ly:paper-system-extent line X))))
+           (max 0 (interval-end (paper-system-extent line X))))
           (ly:number->string
-           (interval-length (ly:paper-system-extent line Y)))))
+           (interval-length (paper-system-extent line Y)))))
 
-  (ly:outputter-dump-stencil putter (ly:paper-system-stencil line))
+  (ly:outputter-dump-stencil putter (paper-system-stencil line))
   (ly:outputter-dump-string
    putter
    (if last?
@@ -232,7 +233,8 @@
 (define-public (output-classic-framework
                basename book scopes fields)
   (let* ((filename (format "~a.tex" basename))
-        (outputter  (ly:make-paper-outputter filename "tex"))
+        (outputter  (ly:make-paper-outputter
+                     (open-file filename "w") "tex"))
         (paper (ly:paper-book-paper book))
         (lines (ly:paper-book-systems book))
         (last-line (car (last-pair lines))))
@@ -258,7 +260,7 @@
 (define-public (output-preview-framework
                basename book scopes fields)
   (let* ((filename (format "~a.tex" basename))
-        (outputter  (ly:make-paper-outputter filename
+        (outputter  (ly:make-paper-outputter (open-file filename "wb")
                                              "tex"))
         (paper (ly:paper-book-paper book))
         (lines (ly:paper-book-systems book))
@@ -344,7 +346,7 @@
          (string->number
           (regexp-substitute/global
            #f " *%.*\n?"
-           (ly:kpathsea-expand-variable "$extra_mem_top")
+           (ly:kpathsea-expand-variable "extra_mem_top")
            'pre "" 'post)))
         (base (basename name ".tex"))
         (cmd (format