From 6db73a86526a965ddfb3ef1f9873e0f7499e9aa3 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Mon, 17 Jul 2006 09:50:21 +0000 Subject: [PATCH] * scm/paper.scm (internal-set-paper-size): define landscape to #f if unset. * scm/framework-ps.scm (convert-to-pdf): swap h and w in case of landscape. * scm/backend-library.scm (postscript->pdf): use -dEPSCrop for PDF. * scm/backend-library.scm (postscript->pdf): strip .eps too. --- ChangeLog | 5 +++++ scm/backend-library.scm | 3 +-- scm/framework-ps.scm | 17 +++++++++++------ scm/paper.scm | 5 ++--- 4 files changed, 19 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 56e88a65f4..fde27e5a72 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2006-07-17 Han-Wen Nienhuys + * scm/paper.scm (internal-set-paper-size): define landscape to #f + if unset. + + * scm/framework-ps.scm (convert-to-pdf): swap h and w in case of landscape. + * stepmake/stepmake/texinfo-rules.make: strip DVI support. * scm/framework-eps.scm (dump-stencils-as-EPSes): generate diff --git a/scm/backend-library.scm b/scm/backend-library.scm index 42cc2688da..de44c4054a 100644 --- a/scm/backend-library.scm +++ b/scm/backend-library.scm @@ -58,8 +58,7 @@ " -dEPSCrop " (format "-dDEVICEWIDTHPOINTS=~,2f \ -dDEVICEHEIGHTPOINTS=~,2f " - paper-width - paper-height))) + paper-width paper-height ))) (cmd (format #f "~a\ diff --git a/scm/framework-ps.scm b/scm/framework-ps.scm index e39b245233..9095c1a9b9 100644 --- a/scm/framework-ps.scm +++ b/scm/framework-ps.scm @@ -590,15 +590,20 @@ (define-public (convert-to-pdf book name) (let* ((defs (ly:paper-book-paper book)) - (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))) + (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 to ~S" "PDF")) - (postscript->pdf (* paper-width output-scale (/ (ly:bp 1))) - (* paper-height output-scale (/ (ly:bp 1))) - name)))) + (postscript->pdf w h name)))) (define-public (convert-to-png book name) (let* ((defs (ly:paper-book-paper book)) diff --git a/scm/paper.scm b/scm/paper.scm index 6d1c9ec64f..5cd99e70cd 100644 --- a/scm/paper.scm +++ b/scm/paper.scm @@ -120,9 +120,8 @@ (set-paper-dimensions module (car entry) (cdr entry)) (module-define! module 'papersizename name) - - (if landscape? - (module-define! module 'landscape #t))) + (module-define! module 'landscape + (if landscape? #t #f))) (else (ly:warning (_ "Unknown papersize: ~a" name)))))) -- 2.39.2