-1;;;; framework-tex.scm --
+;;;; framework-tex.scm -- structure for TeX output
;;;;
-;;;; source file of the GNU LilyPond music typesetter
+;;;; source file of the GNU LilyPond music typesetter
;;;;
-;;;; (c) 2004--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;; (c) 2004--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
(define-module (scm framework-tex)
#:export (output-framework-tex
(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))
(if (member "ps" formats)
- (set! formats (cons "dvi" formats)))
+ (set! formats (cons "dvi" formats)))
(if (member "dvi" formats)
(set! formats (cons "tex" formats)))
(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
(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)
(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))
(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))
"{" (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"))
"")
(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
"\\def\\scaletounit{ "
- (number->string (cond
- ((equal? (ly:unit) "mm") (/ 72.0 25.4))
- ((equal? (ly:unit) "pt") (/ 72.0 72.27))
- (else (error "unknown unit" (ly:unit)))))
+ (number->string lily-unit->bigpoint-factor)
" mul }%\n"
"\\ifx\\lilypondstart\\undefined\n"
" \\input lilyponddefs\n"
(define-public (output-framework basename book scopes fields)
(let* ((filename (format "~a.tex" basename))
- (outputter (ly:make-paper-outputter filename "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))))
(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
putter
(format "\\lybox{~a}{~a}{%\n"
(ly:number->string
- (max 0 (interval-end (ly:paper-system-extent line X))))
+ (max 0 (interval-end (paper-system-extent line X))))
(ly:number->string
- (interval-length (ly:paper-system-extent line Y)))))
+ (interval-length (paper-system-extent line Y)))))
- (ly:outputter-dump-stencil putter (ly:paper-system-stencil line))
+ (ly:outputter-dump-stencil putter (paper-system-stencil line))
(ly:outputter-dump-string
putter
(if last?
(define-public (output-classic-framework
basename book scopes fields)
(let* ((filename (format "~a.tex" basename))
- (outputter (ly:make-paper-outputter filename "tex"))
+ (outputter (ly:make-paper-outputter
+ (open-file filename "w") 'tex))
(paper (ly:paper-book-paper book))
(lines (ly:paper-book-systems book))
(last-line (car (last-pair lines))))
(define-public (output-preview-framework
basename book scopes fields)
(let* ((filename (format "~a.tex" basename))
- (outputter (ly:make-paper-outputter filename
- "tex"))
+ (outputter (ly:make-paper-outputter (open-file filename "wb")
+ 'tex))
(paper (ly:paper-book-paper book))
(lines (ly:paper-book-systems book))
(first-notes-index (list-index
(ly:outputter-dump-string outputter "\\lilypondend\n")
(ly:outputter-close outputter)
(postprocess-output book framework-tex-module filename
- (output-formats))
-
-))
+ (output-formats))))
(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"))))
+ (if (number? resolution)
+ resolution
+ (ly:get-option 'resolution))
+
+ (* 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 "
+ (cmd (string-append "dvips"
(if preview?
- "-E "
+ " -E"
(string-append
- "-t"
+ " -t"
;; careful: papersizename is user-set.
(sanitize-command-option papersizename)
- " "))
- (if landscape? "-t landscape " "")
+ ""))
+ (if landscape? " -tlandscape" "")
(if (ly:kpathsea-find-file "lm.map")
- "-u+lm.map " "")
+ " -u+lm.map" "")
(if (ly:kpathsea-find-file "ecrm10.pfa")
- "-u+ec-mftrace.map " "")
- "-u+lilypond.map -Ppdf " ""
- "-o" ps-name
- base)))
+ " -u+ec-mftrace.map" "")
+ " -u+lilypond.map -Ppdf" ""
+ " -o" ps-name
+ " " base)))
(if (access? ps-name W_OK)
- (delete-file ps-name)))
+ (delete-file ps-name))
(if (not (ly:get-option 'verbose))
(begin
- (format (current-error-port) (_ "Converting to `~a'...")
- (string-append base ".dvi"))
- (newline (current-error-port))))
- (ly:system cmd))
+ (ly:message (_ "Converting to `~a'...") (string-append base ".ps"))
+ (ly:progress "\n")))
+ (ly: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")
+ (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)))
;; FIXME: latex 'foo bar' works, but \input 'foe bar' does not?
(if (string-index name (char-set #\space #\ht #\newline #\cr))
- (error (format
- #f
- (_"TeX file name must not contain whitespace: `~a'") name)))
+ (ly:error (_"TeX file name must not contain whitespace: `~a'") name))
(setenv "extra_mem_top" (number->string (max curr-extra-mem 1024000)))
(let ((dvi-name (string-append base ".dvi")))
(delete-file dvi-name)))
(if (not (ly:get-option 'verbose))
(begin
- (format (current-error-port) (_ "Converting to `~a'...")
- (string-append base ".dvi"))
- (newline (current-error-port))))
+ (ly:message (_ "Converting to `~a'...") (string-append base ".dvi"))
+ (ly:progress "\n")))
;; FIXME: set in environment?
(if (ly:get-option 'safe)
(define-public (convert-to-tex book name)
#t)
+
projects / lilypond.git / blobdiff