* scm/framework-tex.scm (header-end): Don't set \outputscale.

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

diff --git a/scm/framework-tex.scm b/scm/framework-tex.scm
index 8e27a74be03c19d186abee016aefaae9b4d47892..6204512aa059ab46b9a93f55fbd6bd829157f45c 100644 (file)
--- a/scm/framework-tex.scm
+++ b/scm/framework-tex.scm
@@ -66,19 +66,19 @@
         "  \\lilypondfontencoding{T1}"
         "  ")
      "\\lilypond" (tex-font-command font)
-     "}\n"
+     "}%\n"
      )))
 
 
 (define (define-fonts paper)
   (string-append
    ;; UGH. FIXME.   
-   "\\def\\lilypondpaperunit{mm}\n"
+   "\\def\\lilypondpaperunit{mm}%\n"
    (tex-number-def "lilypondpaper" 'outputscale
                   (number->string (exact->inexact
                                    (ly:paper-outputscale paper))))
    (tex-string-def "lilypondpaper" 'papersize
-                  (eval 'papersize (ly:output-def-scope paper)))
+                  (eval 'papersizename (ly:output-def-scope paper)))
    ;; paper/layout?
    (tex-string-def "lilypondpaper" 'inputencoding
                   (eval 'inputencoding (ly:output-def-scope paper)))
@@ -165,7 +165,6 @@
    "\\ifx\\lilypondstart\\undefined\n"
    "  \\input lilyponddefs\n"
    "\\fi\n"
-   "\\outputscale = \\lilypondpaperoutputscale\\lilypondpaperunit\n"
    "\\lilypondstart\n"
    "\\lilypondspecial\n"
    "\\lilypondpostscript\n"))
@@ -210,7 +209,7 @@
    putter
    (string-append "\\leavevmode\n\\lybox{0}{0}{0}{"
                  (ly:number->string (interval-length (ly:paper-system-extent line Y)))
-                 "}{"))
+                 "}{%\n"))
 
   (ly:outputter-dump-stencil putter (ly:paper-system-stencil line))
   (ly:outputter-dump-string
@@ -261,15 +260,14 @@
 
 (define-public (convert-to-pdf book name)
   (let* ((defs (ly:paper-book-paper book))
-        (size (ly:output-def-lookup defs 'papersize)))
+        (papersizename (ly:output-def-lookup defs 'papersizename)))
 
-    (postscript->pdf (if (string? size) size "a4")
+    (postscript->pdf (if (string? papersizename) papersizename "a4")
                     (string-append (basename name ".tex") ".ps"))))
 
 (define-public (convert-to-png book name)
-  (let*
-      ((defs (ly:paper-book-paper book))
-       (resolution (ly:output-def-lookup defs 'pngresolution)))
+  (let* ((defs (ly:paper-book-paper book))
+        (resolution (ly:output-def-lookup defs 'pngresolution)))
 
     (postscript->png
      (if (number? resolution) resolution 90)
@@ -277,9 +275,9 @@
 
 (define-public (convert-to-ps book name)
   (let* ((paper (ly:paper-book-paper book))
-        (papersize (ly:output-def-lookup paper 'papersizename))
+        (papersizename (ly:output-def-lookup paper 'papersizename))
         (landscape? (eq? #t (ly:output-def-lookup paper 'landscape)))
-        (cmd (string-append "dvips -t " papersize
+        (cmd (string-append "dvips -t " papersizename
                             (if landscape? " -t landscape " " ") 
                             "  -u+ec-mftrace.map -u+lilypond.map -Ppdf "
                             (basename name ".tex"))))
@@ -289,10 +287,11 @@
     (system cmd)))
 
 (define-public (convert-to-dvi book name)
-  (let*
-      ((curr-extra-mem (string->number (regexp-substitute/global #f " *%.*\n?"
-                                                                (ly:kpathsea-expand-variable "$extra_mem_top")
-                                                                'pre "" 'post)))
+  (let* ((curr-extra-mem (string->number
+                         (regexp-substitute/global
+                          #f " *%.*\n?"
+                          (ly:kpathsea-expand-variable "$extra_mem_top")
+                          'pre "" 'post)))
        (cmd (string-append "latex \\\\nonstopmode \\\\input " name)))
 
     (setenv "extra_mem_top" (number->string (max curr-extra-mem 1024000)))