* 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 a6b28b1d23f9bca887c56fc464f498df8c7e674a..52ce2e982c162c84c68ae8a9dc190f0a8b27cbaf 100644 (file)
--- a/scm/framework-tex.scm
+++ b/scm/framework-tex.scm
@@ -1,9 +1,8 @@
-;;
-;; framework-tex.scm -- structure for TeX output
-;;
-;; source file of the GNU LilyPond music typesetter
-;;
-;; (c) 2004--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;; framework-tex.scm -- structure for TeX output
+;;;;
+;;;; source file of the GNU LilyPond music typesetter
+;;;;
+;;;; (c) 2004--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 
 (define-module (scm framework-tex)
   #:export (output-framework-tex       
@@ -16,6 +15,7 @@
             (srfi srfi-1)
             (srfi srfi-13)
             (srfi srfi-14)
+            (scm kpathsea)
             (lily))
 
 (define (output-formats)
@@ -219,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?
@@ -346,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