X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fframework-tex.scm;h=5a602e4e489ec4f2d914b5ba5282f4f01d1e7f90;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=3f2821b78390700ea3aba07f5a4f2677dc3735ea;hpb=d372176add53661074bf57362acbdf31eb8350cb;p=lilypond.git diff --git a/scm/framework-tex.scm b/scm/framework-tex.scm index 3f2821b783..5a602e4e48 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--2005 Han-Wen Nienhuys +;;;; (c) 2004--2008 Han-Wen Nienhuys (define-module (scm framework-tex) #:export (output-framework-tex @@ -10,13 +10,17 @@ (use-modules (ice-9 regex) (ice-9 string-fun) - (ice-9 format) + (scm page) + (scm paper-system) (guile) (srfi srfi-1) (srfi srfi-13) (srfi srfi-14) + (scm kpathsea) (lily)) +(define format ergonomic-simple-format) + (define (output-formats) (define formats (ly:output-formats)) (set! formats (completize-formats formats)) @@ -80,7 +84,7 @@ (apply string-append (map (lambda (sub-name) - (format #f "\\font\\~a=~a scaled ~a%\n" + (format "\\font\\~a=~a scaled ~a%\n" (tex-font-command-raw sub-name (ly:font-magnification font)) sub-name @@ -88,7 +92,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) @@ -99,7 +103,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)) @@ -110,14 +114,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)) @@ -130,7 +134,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")) @@ -148,16 +152,13 @@ "") (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" "") "}%\n" - (tex-string-def - "lilypondpaper" 'interscoreline - (ly:number->string - (* scale (ly:output-def-lookup paper 'interscoreline))))))) + ))) (define (header-end) (string-append @@ -190,9 +191,9 @@ (define-public (output-framework basename book scopes fields) (let* ((filename (format "~a.tex" basename)) - (outputter (ly:make-paper-outputter (open-file filename "wb") "tex")) + (outputter (ly:make-paper-outputter (open-file filename "wb") 'tex)) (paper (ly:paper-book-paper book)) - (pages (ly:paper-book-pages book)) + (page-stencils (map page-stencil (ly:paper-book-pages book))) (last-page (car (last-pair pages))) (with-extents (eq? #t (ly:output-def-lookup paper 'dump-extents)))) @@ -200,14 +201,14 @@ (lambda (x) (ly:outputter-dump-string outputter x)) (list - (header paper (length pages) #f) + (header paper (length page-stencils) #f) (define-fonts paper) (header-end))) (ly:outputter-dump-string outputter "\\lilypondnopagebreak\n") (for-each (lambda (page) (dump-page outputter page (eq? last-page page) with-extents)) - pages) + page-stencils) (ly:outputter-dump-string outputter "\\lilypondend\n") (ly:outputter-close outputter) (postprocess-output book framework-tex-module filename @@ -233,7 +234,7 @@ basename book scopes fields) (let* ((filename (format "~a.tex" basename)) (outputter (ly:make-paper-outputter - (open-file filename "w") "tex")) + (open-file filename "w") 'tex)) (paper (ly:paper-book-paper book)) (lines (ly:paper-book-systems book)) (last-line (car (last-pair lines)))) @@ -260,7 +261,7 @@ basename book scopes fields) (let* ((filename (format "~a.tex" basename)) (outputter (ly:make-paper-outputter (open-file filename "wb") - "tex")) + 'tex)) (paper (ly:paper-book-paper book)) (lines (ly:paper-book-systems book)) (first-notes-index (list-index @@ -290,31 +291,35 @@ (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") - (string-append (basename name ".tex") ".ps")))) + (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 (dir-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") - - (string-append (basename name ".tex") ".ps")))) + (* paper-width output-scale (/ (ly:bp 1))) + (* paper-height output-scale (/ (ly:bp 1))) + + (string-append (dir-basename name ".tex") ".ps")))) (define-public (convert-to-ps book name) (let* ((paper (ly:paper-book-paper book)) (preview? (string-contains name ".preview")) (papersizename (ly:output-def-lookup paper 'papersizename)) (landscape? (eq? #t (ly:output-def-lookup paper 'landscape))) - (base (basename name ".tex")) + (base (dir-basename name ".tex")) (ps-name (format "~a.ps" base ".ps")) (cmd (string-append "dvips" (if preview? @@ -345,9 +350,9 @@ (string->number (regexp-substitute/global #f " *%.*\n?" - (ly:kpathsea-expand-variable "$extra_mem_top") + (ly:kpathsea-expand-variable "extra_mem_top") 'pre "" 'post))) - (base (basename name ".tex")) + (base (dir-basename name ".tex")) (cmd (format #f "latex \\\\nonstopmode \\\\input '~a'" name)))