X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fframework-tex.scm;h=001da511130b6f488819fc7aaeb3d0c317b1f5d2;hb=8a11decb30733f20ade0deb0c9890eb076f15052;hp=59ed71e53ebc9bcec9775282305024e91ed9c904;hpb=e4ce7cdb97d06d731ef333f33aca25ad1e2a3a5e;p=lilypond.git

diff --git a/scm/framework-tex.scm b/scm/framework-tex.scm
index 59ed71e53e..001da51113 100644
--- a/scm/framework-tex.scm
+++ b/scm/framework-tex.scm
@@ -91,7 +91,7 @@
 			(inexact->exact
 			 (round (* 1000
 				   (ly:font-magnification font)
-				   (ly:paper-outputscale paper)))))))
+				   (ly:paper-output-scale paper)))))))
 	     sub-fonts)))))
 
 (define (simple-font-load-command paper font)
@@ -102,7 +102,7 @@
     (inexact->exact
      (round (* 1000
 	       (ly:font-magnification font)
-	       (ly:paper-outputscale paper))))))
+	       (ly:paper-output-scale paper))))))
 
 (define (font-load-command paper font)
   (if (pair? (ly:font-sub-fonts font))
@@ -113,14 +113,14 @@
   (string-append
    ;; UGH. FIXME.
    "\\def\\lilypondpaperunit{mm}%\n"
-   (tex-number-def "lilypondpaper" 'outputscale
+   (tex-number-def "lilypondpaper" 'output-scale
 		   (number->string (exact->inexact
-				    (ly:paper-outputscale paper))))
+				    (ly:paper-output-scale paper))))
    (tex-string-def "lilypondpaper" 'papersize
 		   (eval 'papersizename (ly:output-def-scope paper)))
    ;; paper/layout?
-   (tex-string-def "lilypondpaper" 'inputencoding
-		   (eval 'inputencoding (ly:output-def-scope paper)))
+   (tex-string-def "lilypondpaper" 'input-encoding
+		   (eval 'input-encoding (ly:output-def-scope paper)))
 
    (apply string-append
 	  (map (lambda (x) (font-load-command paper x))
@@ -133,7 +133,7 @@
 		     "{" (sanitize-tex-string str) "}%\n")))
 
 (define (header paper page-count classic?)
-  (let ((scale (ly:output-def-lookup paper 'outputscale))
+  (let ((scale (ly:output-def-lookup paper 'output-scale))
 	(texpaper (string-append
 		   (ly:output-def-lookup paper 'papersizename)
 		   "paper"))
@@ -151,8 +151,8 @@
 	 "")
 
      (tex-string-def
-      "lilypondpaper" 'linewidth
-      (ly:number->string (* scale (ly:output-def-lookup paper 'linewidth))))
+      "lilypondpaper" 'line-width
+      (ly:number->string (* scale (ly:output-def-lookup paper 'line-width))))
      "\\def\\lilyponddocumentclassoptions{"
      (sanitize-tex-string texpaper)
      (if landscape? ",landscape" "")
@@ -290,23 +290,27 @@
 
 (define-public (convert-to-pdf book name)
   (let* ((defs (ly:paper-book-paper book))
-	 (papersizename (ly:output-def-lookup defs 'papersizename)))
-    (postscript->pdf (if (string? papersizename) papersizename "a4")
+	 (paper-width (ly:output-def-lookup defs 'paper-width))
+	 (paper-height (ly:output-def-lookup defs 'paper-height))
+	 (output-scale (ly:output-def-lookup defs 'output-scale)))
+    (postscript->pdf (* paper-width output-scale (/ (ly:bp 1)))
+		     (* paper-height output-scale (/ (ly:bp 1)))
 		     (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))
-	 (papersizename (ly:output-def-lookup defs 'papersizename)))
+	 (paper-width (ly:output-def-lookup defs 'paper-width))
+	 (paper-height (ly:output-def-lookup defs 'paper-height))
+	 (output-scale (ly:output-def-lookup defs 'output-scale)))
     (postscript->png
      (if (number? resolution)
 	 resolution
 	 (ly:get-option 'resolution))
 
-     (if (string? papersizename)
-	 papersizename
-	 "a4")
-     
+     (* paper-width output-scale (/ (ly:bp 1)))
+     (* paper-height output-scale (/ (ly:bp 1)))
+
      (string-append (basename name ".tex") ".ps"))))
 
 (define-public (convert-to-ps book name)