(ice-9 string-fun)
(ice-9 format)
(guile)
+ (scm page)
+ (scm paper-system)
(srfi srfi-1)
(srfi srfi-13)
(lily))
(plain (ps-font-command font))
(designsize (ly:font-design-size font))
(magnification (* (ly:font-magnification font)))
- (ops (ly:output-def-lookup paper 'outputscale))
+ (ops (ly:output-def-lookup paper 'output-scale))
(scaling (* ops magnification designsize)))
;; Bluesky pfbs have UPCASE names (sigh.)
"/lily-output-units "
(number->string mm-to-bigpoint)
" def %% millimeter\n"
- (output-entry "staff-line-thickness" 'linethickness)
- (output-entry "line-width" 'linewidth)
+ (output-entry "staff-line-thickness" 'line-thickness)
+ (output-entry "line-width" 'line-width)
(output-entry "paper-size" 'papersizename)
- (output-entry "staff-height" 'staffheight) ;junkme.
+ (output-entry "staff-height" 'staff-height) ;junkme.
"/output-scale "
- (number->string (ly:output-def-lookup layout 'outputscale))
+ (number->string (ly:output-def-lookup layout 'output-scale))
" def\n"
- (output-entry "page-height" 'vsize)
- (output-entry "page-width" 'hsize)))
+ (output-entry "page-height" 'paper-height)
+ (output-entry "page-width" 'paper-width)))
(define (dump-page outputter page page-number page-count landscape?)
(ly:outputter-dump-string
"")
"%%EndPageSetup\n"
- "start-page { "
+ "gsave 0 paper-height translate "
"set-ps-scale-to-lily-scale "
"\n"))
(ly:outputter-dump-stencil outputter page)
- (ly:outputter-dump-string outputter "} stop-system \nshowpage\n"))
+ (ly:outputter-dump-string outputter "stroke grestore \nshowpage\n"))
(define (supplies-or-needs paper load-fonts?)
(define (extract-names font)
(open-file filename "wb")
"ps"))
(paper (ly:paper-book-paper book))
- (pages (ly:paper-book-pages book))
+ (page-stencils (map page-stencil (ly:paper-book-pages book)))
+
(landscape? (eq? (ly:output-def-lookup paper 'landscape) #t))
- (page-number (1- (ly:output-def-lookup paper 'firstpagenumber)))
- (page-count (length pages))
+ (page-number (1- (ly:output-def-lookup paper 'first-page-number)))
+ (page-count (length page-stencils))
(port (ly:outputter-port outputter)))
(output-scopes scopes fields basename)
(lambda (page)
(set! page-number (1+ page-number))
(dump-page outputter page page-number page-count landscape?))
- pages)
+ page-stencils)
(display "%%Trailer\n%%EOF\n" port)
(ly:outputter-close outputter)
(define-public (dump-stencil-as-EPS paper dump-me filename load-fonts?)
(define (mm-to-bp-box mmbox)
- (let* ((scale (ly:output-def-lookup paper 'outputscale))
+ (let* ((scale (ly:output-def-lookup paper 'output-scale))
(box (map
(lambda (x)
(inexact->exact
(round (* x scale mm-to-bigpoint)))) mmbox)))
- (list (car box) (cadr box)
+ (list (car box)
+ (cadr box)
(max (1+ (car box)) (caddr box))
- (max (1+ (cadr box)) (cadddr box)))))
+ (max (1+ (cadr box)) (cadddr box))
+ )))
(let* ((outputter (ly:make-paper-outputter
;; FIXME: better wrap open/open-file,
;; MINGW hack: need to have "b"inary for embedding CFFs
(open-file (format "~a.eps" filename) "wb")
"ps"))
+
+ (left-overshoot -3)
(port (ly:outputter-port outputter))
(xext (ly:stencil-extent dump-me X))
(yext (ly:stencil-extent dump-me Y))
(equal? (format #f "~S" x) "+#.#")
(equal? (format #f "~S" x) "-#.#"))
0.0 x))
- ;; set left of X to 0, to prevent barnumbers
- ;; from sticking out of margin.
- (list 0.0 (car yext) (cdr xext) (cdr yext))))
+
+ ;; the left-overshoot is to make sure that
+ ;; bar numbers stick out of margin uniformly.
+ ;;
+ (list (min left-overshoot (car xext))
+ (car yext) (cdr xext) (cdr yext))))
(rounded-bbox (mm-to-bp-box bbox))
(port (ly:outputter-port outputter))
(header (eps-header paper rounded-bbox load-fonts?)))
(display header port)
(write-preamble paper load-fonts? port)
- (display "start-system { set-ps-scale-to-lily-scale \n" port)
+ (display "gsave set-ps-scale-to-lily-scale \n" port)
(ly:outputter-dump-stencil outputter dump-me)
- (display "} stop-system\n%%Trailer\n%%EOF\n" port)
+ (display "stroke grestore\n%%Trailer\n%%EOF\n" port)
(ly:outputter-close outputter)))
(define-public (output-preview-framework basename book scopes fields)
(let* ((paper (ly:paper-book-paper book))
(systems (ly:paper-book-systems book))
- (scale (ly:output-def-lookup paper 'outputscale))
+ (scale (ly:output-def-lookup paper 'output-scale))
(to-dump-systems '()))
;; skip booktitles.
(if (and
(not (ly:get-option 'preview-include-book-title))
(pair? systems)
- (ly:paper-system-property (car systems) 'is-book-title #f))
+ (ly:prob-property (car systems) 'is-book-title #f))
(set! systems (cdr systems)))
(postprocess-output book framework-ps-module
(format "~a.preview.eps" basename)
(cons "png" (ly:output-formats)))))
+
(if #f
(define-public (output-preview-framework basename book scopes fields)
(let* ((paper (ly:paper-book-paper book))
(systems (ly:paper-book-systems book))
- (scale (ly:output-def-lookup paper 'outputscale))
+ (scale (ly:output-def-lookup paper 'output-scale))
(titles (take-while paper-system-title? systems))
(non-title (find (lambda (x)
(not (paper-system-title? x))) systems))