(srfi srfi-13)
(lily))
+(define (stderr string . rest)
+ (apply format (cons (current-error-port) (cons string rest)))
+ (force-output (current-error-port)))
+
+;;(define pdebug stderr)
+(define (pdebug . rest) #f)
+
(define mm-to-bigpoint
(/ 72 25.4))
(define-public (ps-font-command font . override-coding)
- (let* ((name (ly:font-filename font))
+ (let* ((name (ly:font-file-name font))
(magnify (ly:font-magnification font))
(coding-alist (ly:font-encoding-alist font))
(input-encoding (assoc-get 'input-name coding-alist))
#f font-encoding)
(car override-coding))))
- ;; FIXME: now feta stuff has feta* input-encoding (again?)
- ;;(format (current-error-port) "FONT: ~S, ~S\n" name font-encoding)
- ;;(format (current-error-port) "INPUT: ~S\n" input-encoding)
- (if (and coding-command
- (or
- (equal? (substring coding-command 0 4) "feta")
- (equal? (substring coding-command 0 8) "parmesan")
-
- ))
- (set! coding-command #f))
-
(string-append
"magfont" (string-encode-integer (hashq name 1000000))
"m" (string-encode-integer (inexact->exact (round (* 1000 magnify))))
(equal? (substring fontname 0 2) "cm")
(equal? (substring fontname 0 2) "ec")))
-(define (load-fonts bookpaper)
- (let* ((fonts (ly:bookpaper-fonts bookpaper))
- (font-names (uniq-list (sort (map ly:font-filename fonts) string<?)))
+(define (load-fonts paper)
+ (let* ((fonts (ly:paper-fonts paper))
+ (font-names (uniq-list (sort (map ly:font-file-name fonts) string<?)))
(pfas (map
(lambda (x)
- (let*
- ((aname (string-append x ".pfa"))
- (apath (ly:kpathsea-expand-path aname))
-
- (bpath (if (not apath)
- (ly:kpathsea-expand-path (string-append x ".pfb"))
- #f)))
-
-
- (cond
- (apath (ly:gulp-file apath))
- (bpath (ly:pfb->pfa bpath))
- (else
- (ly:warn "Can't find PFA font ~S" x)
- ""))))
+ (let* ((aname (string-append x ".pfa"))
+ (apath (ly:kpathsea-find-file aname))
+
+ (bpath (if (not apath)
+ (ly:kpathsea-find-file
+ (string-append x ".pfb"))
+ #f)))
+ (cond
+ (apath (ly:gulp-file apath))
+ (bpath (ly:pfb->pfa bpath))
+ (else
+ (ly:warn "cannot find PFA font ~S" x)
+ ""))))
(filter string? font-names))))
(string-join pfas "\n")))
-(define (define-fonts bookpaper)
+(define (define-fonts paper)
- (define font-list (ly:bookpaper-fonts bookpaper))
+ (define font-list (ly:paper-fonts paper))
(define (define-font command fontname scaling)
(string-append
"/" command " { /" fontname " findfont "
(ly:number->string scaling) " output-scale div scalefont } bind def\n"))
- (define (reencode-font plain encoding command)
+ (define (reencode-font fontname encoding scaling command)
(let ((coding-vector (get-coding-command encoding)))
(string-append
- plain " " coding-vector " /" command " reencode-font\n"
- "/" command "{ /" command " findfont 1 scalefont } bind def\n")))
-
- (define (guess-ps-fontname basename)
-
- "We do not have the FontName, try to guess is from basename."
- (cond
- (#t basename)
- ((tex-font? basename)
- ;; FIXME: we need proper Fontmap for the bluesky CM*, EC* fonts.
- ;; Only the fonts that we trace in mf/ are in our own FontMap.
- (string-append basename ".pfb"))
- (else (string-append basename ".pfa"))))
+ "/" fontname " findfont " coding-vector " /" command " reencode-font\n"
+ "/" command "{ /" command " findfont " (ly:number->string scaling) " output-scale div scalefont } bind def\n")))
+ (define (standard-tex-font? x)
+ (or (equal? (substring x 0 2) "ms")
+ (equal? (substring x 0 2) "cm")))
+
(define (font-load-command font)
(let* ((specced-font-name (ly:font-name font))
(fontname (if specced-font-name
specced-font-name
- (guess-ps-fontname (ly:font-filename font))))
+ (ly:font-file-name font)))
(coding-alist (ly:font-encoding-alist font))
(input-encoding (assoc-get 'input-name coding-alist))
(plain (ps-font-command font #f))
(designsize (ly:font-design-size font))
(magnification (* (ly:font-magnification font)))
- (ops (ly:output-def-lookup bookpaper 'outputscale))
+ (ops (ly:output-def-lookup paper 'outputscale))
(scaling (* ops magnification designsize)))
+ ;; Bluesky pfbs have UPCASE names (sigh.)
+ ;;
+ (if (standard-tex-font? fontname)
+ (set! fontname (string-upcase fontname)))
+
+ ;; debugging: [output]encoding is broken
+ ;; found so far: coding-alist is empty!
+ (pdebug "font: ~S\n" font)
+ (pdebug "fontname: ~S\n" fontname)
+ (pdebug "input-encoding:~S\n" input-encoding)
+ (pdebug "font-encoding:~S\n" font-encoding)
+
+ (pdebug "coding-alist:~S\n" coding-alist)
+
(string-append
(define-font plain fontname scaling)
- (if (or (equal? input-encoding font-encoding)
- ;; guh
- (equal? font-encoding "fetaBraces")
- (equal? font-encoding "fetaNumber")
- (equal? font-encoding "fetaMusic")
- (equal? font-encoding "parmesanMusic"))
- ""
- (reencode-font plain input-encoding command)))))
+ (if (equal? input-encoding font-encoding)
+ ""
+ (reencode-font fontname input-encoding scaling command)))))
(define (font-load-encoding encoding)
- (let ((filename (get-coding-filename encoding)))
- (ly:gulp-file (ly:kpathsea-expand-path filename))))
+ (let ((file-name (get-coding-file-name encoding)))
+ (ly:gulp-file (ly:kpathsea-find-file file-name))))
(let* ((encoding-list (map (lambda (x)
(assoc-get 'input-name
(encodings (uniq-list (sort-list (filter string? encoding-list)
string<?))))
+ (pdebug "encodings:~S\n" encodings)
(string-append
(apply string-append (map font-load-encoding encodings))
(apply string-append
;; FIXME: duplicated in other output backends
;; FIXME: silly interface name
-(define (output-variables paper)
- ;; FIXME: duplicates output-paper's scope-entry->string, mostly
+(define (output-variables layout)
+ ;; FIXME: duplicates output-layout's scope-entry->string, mostly
(define (value->string val)
(cond
((string? val) (string-append "(" val ")"))
(define (output-entry ps-key ly-key)
(string-append
"/" ps-key " "
- (value->string (ly:output-def-lookup paper ly-key)) " def \n"))
+ (value->string (ly:output-def-lookup layout ly-key)) " def \n"))
(string-append
- "/lily-output-units " (number->string mm-to-bigpoint) " def %% milimeter \n"
+ "/lily-output-units " (number->string mm-to-bigpoint) " def %% milimeter \n"
(output-entry "staff-line-thickness" 'linethickness)
(output-entry "line-width" 'linewidth)
- (output-entry "paper-size" 'papersize)
+ (output-entry "paper-size" 'papersizename)
(output-entry "staff-height" 'staffheight) ;junkme.
"/output-scale "
- (number->string (ly:output-def-lookup paper 'outputscale))
- " lily-output-units mul def \n"))
+ (number->string (ly:output-def-lookup layout 'outputscale))
+ " lily-output-units mul def \n"
+ (output-entry "page-height" 'vsize)
+ (output-entry "page-width" 'hsize)
+ ))
-(define (dump-page outputter page page-number page-count)
+(define (dump-page outputter page page-number page-count landscape?)
(ly:outputter-dump-string outputter
(string-append
"%%Page: "
(number->string page-number) " " (number->string page-count) "\n"
- "0 0 start-system { "
+
+ "%%BeginPageSetup\n"
+ (if landscape?
+ "page-width output-scale mul 0 translate 90 rotate\n"
+ "")
+ "%%EndPageSetup\n"
+
+ "start-system { "
"set-ps-scale-to-lily-scale "
"\n"))
(ly:outputter-dump-stencil outputter page)
(ly:outputter-dump-string outputter "} stop-system \nshowpage\n"))
-(define (eps-header bookpaper bbox)
+(define (eps-header paper bbox)
(string-append "%!PS-Adobe-2.0 EPSF-2.0\n"
"%%Creator: creator time-stamp\n"
- "%%BoundingBox: " (string-join (map number->string bbox) " ") "\n"
+ "%%BoundingBox: "
+ (string-join (map number->string bbox) " ") "\n"
+ "%%Orientation: "
+ (if (eq? (ly:output-def-lookup paper 'landscape) #t)
+ "Landscape\n"
+ "Portrait\n")
"%%EndComments\n"))
-(define (page-header bookpaper page-count)
+(define (page-header paper page-count)
(string-append "%!PS-Adobe-3.0\n"
"%%Creator: creator time-stamp\n"
"%%Pages: " (number->string page-count) "\n"
"%%PageOrder: Ascend\n"
- "%%DocumentPaperSizes: " (ly:output-def-lookup bookpaper 'papersize) "\n"))
-
-(define (preamble bookpaper)
+ "%%Orientation: "
+ (if (eq? (ly:output-def-lookup paper 'landscape) #t)
+ "Landscape\n"
+ "Portrait\n")
+ "%%DocumentPaperSizes: "
+ (ly:output-def-lookup paper 'papersizename) "\n"))
+
+(define (preamble paper)
(list
- (output-variables bookpaper)
+ (output-variables paper)
(ly:gulp-file "music-drawing-routines.ps")
(ly:gulp-file "lilyponddefs.ps")
- (load-fonts bookpaper)
- (define-fonts bookpaper)))
+ (load-fonts paper)
+ (define-fonts paper)))
(define-public (output-framework outputter book scopes fields basename)
- (let* ((bookpaper (ly:paper-book-book-paper book))
+ (let* ((paper (ly:paper-book-paper book))
(pages (ly:paper-book-pages book))
- (page-number 0)
+ (landscape? (eq? (ly:output-def-lookup paper 'landscape) #t))
+ (page-number (1- (ly:output-def-lookup paper 'firstpagenumber)))
(page-count (length pages)))
+
(for-each
(lambda (x)
(ly:outputter-dump-string outputter x))
(cons
- (page-header bookpaper page-count)
- (preamble bookpaper)))
+ (page-header paper page-count)
+ (preamble paper)))
(for-each
(lambda (page)
(set! page-number (1+ page-number))
- (dump-page outputter page page-number page-count))
+ (dump-page outputter page page-number page-count landscape?))
pages)
+
(ly:outputter-dump-string outputter "%%Trailer\n%%EOF\n")))
(define-public (output-preview-framework outputter book scopes fields basename)
- (let* ((bookpaper (ly:paper-book-book-paper book))
- (systems (ly:paper-book-lines book))
- (scale (ly:output-def-lookup bookpaper 'outputscale ))
+ (let* ((paper (ly:paper-book-paper book))
+ (systems (ly:paper-book-systems book))
+ (scale (ly:output-def-lookup paper 'outputscale ))
(titles (take-while ly:paper-system-title? systems))
- (non-title (find (lambda (x) (not (ly:paper-system-title? x))) systems))
+ (non-title (find (lambda (x)
+ (not (ly:paper-system-title? x))) systems))
(dump-me
(stack-stencils Y DOWN 0.0
(map ly:paper-system-stencil
(append titles (list non-title)))))
(xext (ly:stencil-extent dump-me X))
- (yext (ly:stencil-extent dump-me Y))
- )
+ (yext (ly:stencil-extent dump-me Y)))
(for-each
(lambda (x)
(ly:outputter-dump-string outputter x))
(cons
- (eps-header bookpaper
+ (eps-header paper
(map
(lambda (x)
(inexact->exact
(round (* x scale mm-to-bigpoint))))
(list (car xext) (car yext)
(cdr xext) (cdr yext))))
- (preamble bookpaper)))
+ (preamble paper)))
(ly:outputter-dump-string outputter
- (string-append "0 0 start-system { "
+ (string-append "start-system { "
"set-ps-scale-to-lily-scale "
"\n"))
+
(ly:outputter-dump-stencil outputter dump-me)
(ly:outputter-dump-string outputter "} stop-system\n%%Trailer\n%%EOF\n")))
(define-public (convert-to-pdf book name)
- (let*
- ((defs (ly:paper-book-book-paper book))
- (size (ly:output-def-lookup defs 'papersize)))
-
- (postscript->pdf (if (string? size) size "a4")
- name)))
+ (let* ((defs (ly:paper-book-paper book))
+ (papersizename (ly:output-def-lookup defs 'papersizename)))
+ (if (equal? name "-")
+ (ly:warn "Can't convert <stdout> to PDF")
+ (postscript->pdf (if (string? papersizename) papersizename "a4")
+ name))))
+
(define-public (convert-to-png book name)
- (let*
- ((defs (ly:paper-book-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)
+ (postscript->png (if (number? resolution) resolution
+
+ (ly:get-option 'resolution))
name)))
(define-public (convert-to-dvi book name)
(define-public (convert-to-ps book name)
#t)
-
projects / lilypond.git / blobdiff