X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fframework-tex.scm;h=27e7d66013134fa980efb4f80626bce38069b938;hb=9f3572d98bb948c9689cd1f75401a029451fa001;hp=83c64820e566d0b1cc48d1514d121d81a410ecc3;hpb=04265f11d1f21416ccebd2dcaa1d903dc781b36e;p=lilypond.git diff --git a/scm/framework-tex.scm b/scm/framework-tex.scm index 83c64820e5..27e7d66013 100644 --- a/scm/framework-tex.scm +++ b/scm/framework-tex.scm @@ -2,7 +2,7 @@ ;;;; ;;;; source file of the GNU LilyPond music typesetter ;;;; -;;;; (c) 2004--2006 Han-Wen Nienhuys +;;;; (c) 2004--2006 Han-Wen Nienhuys (define-module (scm framework-tex) #:export (output-framework-tex @@ -290,27 +290,23 @@ (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))) - (postscript->pdf (* paper-width output-scale (/ (ly:bp 1))) - (* paper-height output-scale (/ (ly:bp 1))) + (papersizename (ly:output-def-lookup defs 'papersizename))) + (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)) - (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))) + (papersizename (ly:output-def-lookup defs 'papersizename))) (postscript->png (if (number? resolution) resolution (ly:get-option 'resolution)) - (* paper-width output-scale (/ (ly:bp 1))) - (* paper-height output-scale (/ (ly:bp 1))) - + (if (string? papersizename) + papersizename + "a4") + (string-append (basename name ".tex") ".ps")))) (define-public (convert-to-ps book name)