X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fframework-ps.scm;h=10934b84e86812e3d2e4c97c568386c350578686;hb=5d576b1299d374ae478cb38075cc05d5cb691046;hp=a32979b529bd14d9aca4e972c94ef355ee4ad3b1;hpb=582186f60e5103f11a0cc54cc5dfb3319b9ea114;p=lilypond.git

diff --git a/scm/framework-ps.scm b/scm/framework-ps.scm
index a32979b529..10934b84e8 100644
--- a/scm/framework-ps.scm
+++ b/scm/framework-ps.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;;
-;;;; (c) 2004--2006 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;; (c) 2004--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 (define-module (scm framework-ps))
 
@@ -409,7 +409,7 @@
 		   (lambda (x y) (string<? (cadr x) (cadr y))))))
 
 
-	   (font-loader (if (ly:get-option 'gs-font-load)
+	   (font-loader (if (ly:get-option 'gs-load-fonts)
 			    load-font-via-GS
 			    load-font))
 			 
@@ -518,8 +518,13 @@
 	   ;; the left-overshoot is to make sure that
 	   ;; bar numbers  stick out of margin uniformly.
 	   ;;
-	   (list (min left-overshoot (car xext))
-		 (car yext) (cdr xext) (cdr yext))))
+	   (list
+
+	    (if (ly:get-option 'pad-eps-boxes) 
+		(min left-overshoot (car xext))
+		(car xext))
+	    (car yext) (cdr xext) (cdr yext))))
+	 
 	 (rounded-bbox (to-bp-box bbox))
 	 (port (ly:outputter-port outputter))
 	 (header (eps-header paper rounded-bbox load-fonts?)))
@@ -539,7 +544,7 @@
 
     ;; skip booktitles.
     (if (and
-	 (not (ly:get-option 'preview-include-book-title))
+	 (not (ly:get-option 'include-book-title-preview))
 	 (pair? systems)
 	 (ly:prob-property (car systems) 'is-book-title #f))
 
@@ -590,12 +595,20 @@
 
 (define-public (convert-to-pdf book name)
   (let* ((defs (ly:paper-book-paper book))
-	 (papersizename (ly:output-def-lookup defs 'papersizename)))
+	 (landscape (ly:output-def-lookup defs 'landscape))
+	 (output-scale (ly:output-def-lookup defs 'output-scale))
+	 (convert (lambda (x) (* x output-scale (/ (ly:bp 1)))))
+	 
+	 (paper-width (convert (ly:output-def-lookup defs 'paper-width)))
+	 (paper-height (convert (ly:output-def-lookup defs 'paper-height)))
+
+	 (w (if landscape paper-height paper-width))
+	 (h (if landscape paper-width paper-height))
+	 )
 
     (if (equal? (basename name ".ps") "-")
 	(ly:warning (_ "can't convert <stdout> to ~S" "PDF"))
-	(postscript->pdf (if (string? papersizename) papersizename "a4")
-			 name))))
+	(postscript->pdf w h name))))
 
 (define-public (convert-to-png book name)
   (let* ((defs (ly:paper-book-paper book))
@@ -603,10 +616,13 @@
 	 (resolution (if (number? defs-resolution)
 			 defs-resolution
 			 (ly:get-option 'resolution)))
-	 (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 resolution
-		     (if (string? papersizename) papersizename "a4")
+		     (* paper-width output-scale (/ (ly:bp 1)))
+		     (* paper-height output-scale (/ (ly:bp 1)))
 		     name)))
 
 (define-public (convert-to-dvi book name)