X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fframework-tex.scm;h=93c5fedbc320aaedab79bc8ee2c37c6d4b49811b;hb=b0d6e82437680bc7c8091db78524d91957c6af49;hp=38c085a48edf60c25df89dc8d1a62cb280529680;hpb=515fb7f83e12364c02948c3d077c52b605a96b9a;p=lilypond.git diff --git a/scm/framework-tex.scm b/scm/framework-tex.scm index 38c085a48e..93c5fedbc3 100644 --- a/scm/framework-tex.scm +++ b/scm/framework-tex.scm @@ -5,9 +5,8 @@ ;;;; (c) 2004 Han-Wen Nienhuys (define-module (scm framework-tex) - #:export (output-framework-tex - output-classic-framework-tex -)) + #:export (output-framework-tex + output-classic-framework-tex)) (use-modules (ice-9 regex) (ice-9 string-fun) @@ -23,11 +22,11 @@ ;; \lyitem{089.5557}{-15.3109}{\hbox{\magfontUGQLomTVo{}bla$\backslash${$\backslash$}}}% ;; --jcn (define-public (sanitize-tex-string s) - (if (ly:get-option 'safe) - (regexp-substitute/global #f "\\\\" - (regexp-substitute/global #f "([{}])" "bla{}" 'pre "\\" 1 'post ) - 'pre "$\\backslash$" 'post) - + (if (ly:get-option 'safe) + (regexp-substitute/global + #f "\\\\" + (regexp-substitute/global #f "([{}])" "bla{}" 'pre "\\" 1 'post ) + 'pre "$\\backslash$" 'post) s)) (define (symbol->tex-key sym) @@ -50,7 +49,6 @@ (define (font-load-command paper font) (let* ((coding-alist (ly:font-encoding-alist font)) (font-encoding (assoc-get 'output-name coding-alist))) - (string-append "\\font\\lilypond" (tex-font-command font) "=" (ly:font-filename font) @@ -66,19 +64,17 @@ " \\lilypondfontencoding{T1}" " ") "\\lilypond" (tex-font-command font) - "}\n" - ))) - + "}%\n"))) (define (define-fonts paper) (string-append - ;; UGH. FIXME. - "\\def\\lilypondpaperunit{mm}\n" + ;; UGH. FIXME. + "\\def\\lilypondpaperunit{mm}%\n" (tex-number-def "lilypondpaper" 'outputscale (number->string (exact->inexact (ly:paper-outputscale paper)))) (tex-string-def "lilypondpaper" 'papersize - (eval 'papersize (ly:output-def-scope paper))) + (eval 'papersizename (ly:output-def-scope paper))) ;; paper/layout? (tex-string-def "lilypondpaper" 'inputencoding (eval 'inputencoding (ly:output-def-scope paper))) @@ -102,15 +98,13 @@ (newline (current-error-port)) "") -(define (output-scopes scopes fields basename) +(define (output-scopes scopes fields basename) (define (output-scope scope) (apply string-append (module-map (lambda (sym var) - (let ((val (if (variable-bound? var) (variable-ref var) "")) - ) - + (let ((val (if (variable-bound? var) (variable-ref var) ""))) (if (and (memq sym fields) (string? val)) (header-to-file basename sym val)) "")) @@ -129,7 +123,6 @@ (ly:output-def-lookup paper 'papersizename) "paper")) (landscape? (eq? #t (ly:output-def-lookup paper 'landscape)))) - (string-append "% Generated by LilyPond " (lilypond-version) "\n" @@ -147,8 +140,8 @@ (ly:number->string (* scale (ly:output-def-lookup paper 'linewidth)))) "\\def\\lilyponddocumentclassoptions{" texpaper - (if landscape? ",landscape" "") - "}%\n" + (if landscape? ",landscape" "") + "}%\n" (tex-string-def "lilypondpaper" 'interscoreline (ly:number->string @@ -165,7 +158,6 @@ "\\ifx\\lilypondstart\\undefined\n" " \\input lilyponddefs\n" "\\fi\n" - "\\outputscale = \\lilypondpaperoutputscale\\lilypondpaperunit\n" "\\lilypondstart\n" "\\lilypondspecial\n" "\\lilypondpostscript\n")) @@ -173,25 +165,26 @@ (define (dump-page putter page last? with-extents?) (ly:outputter-dump-string putter - (format "\\vbox to ~a\\outputscale{%\n\\leavevmode\n\\lybox{0}{0}{0}{0}{%\n" + (format "\\lybox{~a}{~a}{%\n" + (if with-extents? + (interval-start (ly:stencil-extent page X)) + 0.0) (if with-extents? (- (interval-start (ly:stencil-extent page Y))) - 0.0 - ))) + 0.0))) (ly:outputter-dump-stencil putter page) (ly:outputter-dump-string putter (if last? - "}\\vss\n}\n\\vfill\n" - "}\\vss\n}\n\\vfill\\lilypondpagebreak\n"))) + "}%\n\\vfill\n" + "}%\n\\vfill\n\\lilypondpagebreak\n"))) (define-public (output-framework outputter book scopes fields basename ) (let* ((paper (ly:paper-book-paper book)) (pages (ly:paper-book-pages book)) (last-page (car (last-pair pages))) (with-extents - (eq? #t (ly:output-def-lookup paper 'dump-extents))) - ) + (eq? #t (ly:output-def-lookup paper 'dump-extents)))) (for-each (lambda (x) (ly:outputter-dump-string outputter x)) @@ -199,18 +192,23 @@ (header paper (length pages) #f) (define-fonts paper) (header-end))) - (ly:outputter-dump-string outputter "\\lilypondnopagebreak") + (ly:outputter-dump-string outputter "\\lilypondnopagebreak\n") (for-each - (lambda (page) (dump-page outputter page (eq? last-page page) with-extents)) + (lambda (page) + (dump-page outputter page (eq? last-page page) with-extents)) pages) (ly:outputter-dump-string outputter "\\lilypondend\n"))) (define (dump-line putter line last?) (ly:outputter-dump-string putter - (string-append "\\leavevmode\n\\lybox{0}{0}{0}{" - (ly:number->string (interval-length (ly:paper-system-extent line Y))) - "}{")) + (string-append "\\lybox{" + (ly:number->string + (interval-length (ly:paper-system-extent line X))) + "}{" + (ly:number->string + (interval-length (ly:paper-system-extent line Y))) + "}{%\n")) (ly:outputter-dump-stencil putter (ly:paper-system-stencil line)) (ly:outputter-dump-string @@ -239,7 +237,6 @@ (lambda (line) (dump-line outputter line (eq? line last-line))) lines) (ly:outputter-dump-string outputter "\\lilypondend\n"))) - (define-public (output-preview-framework outputter book scopes fields basename ) (let* ((paper (ly:paper-book-paper book)) @@ -258,59 +255,80 @@ (dump-line outputter (car lines) #t) (ly:outputter-dump-string outputter "\\lilypondend\n"))) - (define-public (convert-to-pdf book name) - (let* - ((defs (ly:paper-book-paper book)) - (size (ly:output-def-lookup defs 'papersize))) - - (postscript->pdf (if (string? size) size "a4") + (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") - ))) + ".ps")))) (define-public (convert-to-png book name) - (let* - ((defs (ly:paper-book-paper book)) - (resolution (ly:output-def-lookup defs 'pngresolution))) - + (let* ((defs (ly:paper-book-paper book)) + (resolution (ly:output-def-lookup defs 'pngresolution))) (postscript->png (if (number? resolution) resolution 90) - (string-append (basename name ".tex") ".ps") - ))) + (string-append (basename name ".tex") ".ps")))) (define-public (convert-to-ps book name) (let* ((paper (ly:paper-book-paper book)) - (papersize (ly:output-def-lookup paper 'papersizename)) + (preview? (string-contains name ".preview")) + (papersizename (ly:output-def-lookup paper 'papersizename)) (landscape? (eq? #t (ly:output-def-lookup paper 'landscape))) - (cmd (string-append "dvips -t " papersize - (if landscape? " -t landscape " " ") + (base (basename name ".tex")) + (cmd (string-append "dvips " + (if preview? + " -E " + (string-append " -t " papersizename)) + (if landscape? + " -t landscape " + " ") " -u+ec-mftrace.map -u+lilypond.map -Ppdf " - (basename name ".tex")))) - - (display (format #f (_ "Invoking ~S") cmd) (current-error-port)) - (newline (current-error-port)) + base + + (if (ly:get-option 'verbose) + " " + " 2>&1 1>& /dev/null ") + ))) + + (if (ly:get-option 'verbose) + (begin + (newline (current-error-port)) + + (display (format #f (_ "Invoking ~S") cmd) (current-error-port)) + (newline (current-error-port))) + (display (format #f "Converting to `~a.ps'...\n" base) (current-error-port)) + ) (system cmd))) (define-public (convert-to-dvi book name) - (let* - ((curr-extra-mem (string->number (regexp-substitute/global #f " *%.*\n?" - (ly:kpathsea-expand-variable "$extra_mem_top") - 'pre "" 'post))) - (cmd (string-append "latex \\\\nonstopmode \\\\input " name))) + (let* ((curr-extra-mem + (string->number + (regexp-substitute/global + #f " *%.*\n?" + (ly:kpathsea-expand-variable "$extra_mem_top") + 'pre "" 'post))) + (base (basename name ".tex")) + (cmd (string-append + "latex \\\\nonstopmode \\\\input " name + (if (ly:get-option 'verbose) + " " + " 2>&1 1>& /dev/null ") + ))) (setenv "extra_mem_top" (number->string (max curr-extra-mem 1024000))) - (newline (current-error-port)) - (display (format #f (_ "Invoking ~S") cmd) (current-error-port)) - (newline (current-error-port)) + (if (ly:get-option 'verbose) + (begin + (newline (current-error-port)) + (display (format #f (_ "Invoking ~S") cmd) (current-error-port)) + (newline (current-error-port))) + (format (current-error-port) "Converting to `~a.dvi'...\n" base)) ;; fixme: set in environment? (if (ly:get-option 'safe) (set! cmd (string-append "openout_any=p " cmd))) - + (system cmd))) (define-public (convert-to-tex book name) #t) -