(define page-module (current-module))
-(define (make-page init . args)
+(define (make-page paper-book . args)
(let*
((p (apply ly:make-prob (append
- (list 'page init)
+ (list 'page (layout->page-init (ly:paper-book-paper paper-book))
+ 'paper-book paper-book)
args))))
(page-set-property! p 'head-stencil (page-header p))
(define (annotate-space-left page)
(let*
- ((p-book (page-property page 'paper-book))
- (layout (ly:paper-book-paper p-book))
+ ((paper-book (page-property page 'paper-book))
+ (layout (ly:paper-book-paper paper-book))
(arrow (annotate-y-interval layout
"space left"
(cons (- 0.0
\f
-(define (page-headfoot layout scopes number
- sym separation-symbol dir last?)
+(define (page-headfoot layout scopes number sym separation-symbol dir
+ is-last-bookpart is-bookpart-last-page)
"Create a stencil including separating space."
(stencil (ly:make-stencil "" '(0 . 0) '(0 . 0)))
(head-stencil
(if (procedure? header-proc)
- (header-proc layout scopes number last?)
- #f))
- )
+ (header-proc layout scopes number is-last-bookpart is-bookpart-last-page)
+ #f)))
(if (and (number? sep)
(ly:stencil? head-stencil)
(set! head-stencil
(ly:stencil-combine-at-edge
stencil Y dir head-stencil
- sep 0.0))
+ sep))
;; add arrow markers
(if (or (annotate? layout)
- (ly:output-def-lookup layout 'annotateheaders #f))
+ (ly:output-def-lookup layout 'annotate-headers #f))
(set! head-stencil
(ly:stencil-add
(ly:stencil-translate-axis
(define (page-header-or-footer page dir)
(let*
- ((p-book (page-property page 'paper-book))
- (layout (ly:paper-book-paper p-book))
- (scopes (ly:paper-book-scopes p-book))
- (lines (page-lines page))
+ ((paper-book (page-property page 'paper-book))
+ (layout (ly:paper-book-paper paper-book))
+ (scopes (ly:paper-book-scopes paper-book))
(number (page-page-number page))
- (last? (page-property page 'is-last))
- )
+ (is-last-bookpart (page-property page 'is-last-bookpart))
+ (is-bookpart-last-page (page-property page 'is-bookpart-last-page)))
(page-headfoot layout scopes number
(if (= dir UP)
(if (= dir UP)
'head-separation
'foot-separation)
- dir last?)))
+ dir is-last-bookpart is-bookpart-last-page)))
(define (page-header page)
(page-header-or-footer page UP))
(let*
((paper-height (ly:output-def-lookup layout 'paper-height))
(paper-width (ly:output-def-lookup layout 'paper-width))
-
- (lmargin (ly:output-def-lookup layout 'left-margin))
+ (lmargin (ly:output-def-lookup layout 'left-margin #f))
(left-margin (if lmargin
lmargin
(/ (- paper-width
)))
(define (make-page-stencil page)
- "Construct a stencil representing the page from LINES.
-
- Offsets is a list of increasing numbers. They must be negated to
-create offsets.
-"
-
+ "Construct a stencil representing the page from PAGE."
(page-translate-systems page)
(let*
- ((p-book (page-property page 'paper-book))
+ ((paper-book (page-property page 'paper-book))
(prop (lambda (sym) (page-property page sym)))
- (layout (ly:paper-book-paper p-book))
- (scopes (ly:paper-book-scopes p-book))
+ (layout (ly:paper-book-paper paper-book))
+ (scopes (ly:paper-book-scopes paper-book))
(lines (page-lines page))
(number (page-page-number page))
;; TODO: naming paper-height/paper-width not analogous to TeX.
-
(system-xoffset (ly:output-def-lookup layout 'horizontal-shift 0.0))
- (system-separator-markup (ly:output-def-lookup layout 'systemSeparatorMarkup))
+ (system-separator-markup (ly:output-def-lookup layout 'system-separator-markup))
(system-separator-stencil (if (markup? system-separator-markup)
(interpret-markup layout
(layout-extract-page-properties layout)
(interval-length (ly:stencil-extent (prop 'head-stencil) Y))
0.0))
- (page-stencil (ly:make-stencil
- '()
- (cons (prop 'left-margin) (prop 'paper-width))
- (cons (- (prop 'top-margin)) 0)))
+ (page-stencil (ly:make-stencil '()))
(last-system #f)
(last-y 0.0)
(cons
(+ system-xoffset x)
(- 0 head-height y (prop 'top-margin)))
-
+
)))))
(add-system
(lambda (system)
(foot (prop 'foot-stencil))
)
- (if (or (annotate? layout)
- (ly:output-def-lookup layout 'annotatesystems #f))
+ (if (and
+ (or (annotate? layout)
+ (ly:output-def-lookup layout 'annotate-systems #f))
+ (pair? lines))
(begin
(for-each (lambda (sys next-sys)
lines
(append (cdr lines) (list #f)))
(paper-system-annotate-last (car (last-pair lines)) layout)))
-
- (set! page-stencil (ly:stencil-combine-at-edge
- page-stencil Y DOWN
- (if (and
- (ly:stencil? head)
- (not (ly:stencil-empty? head)))
- head
- (ly:make-stencil "" (cons 0 0) (cons 0 0)))
- 0. 0.))
+ (if (and
+ (ly:stencil? head)
+ (not (ly:stencil-empty? head)))
+
+ (set! page-stencil (ly:stencil-add page-stencil
+ (ly:stencil-translate-axis head
+ (- 0 head-height (prop 'top-margin)) Y))))
+
(map add-system lines)
+
(ly:prob-set-property! page 'bottom-system-edge
(car (ly:stencil-extent page-stencil Y)))
(ly:prob-set-property! page 'space-left
;; annotation.
(if (or (annotate? layout)
- (ly:output-def-lookup layout 'annotatepage #f))
+ (ly:output-def-lookup layout 'annotate-page #f))
(set! page-stencil (annotate-page layout page-stencil)))
+
page-stencil))
(define (calc-printable-height page)
"Printable area for music and titles; matches default-page-make-stencil."
(let*
- ((p-book (page-property page 'paper-book))
- (layout (ly:paper-book-paper p-book))
- (scopes (ly:paper-book-scopes p-book))
- (number (page-page-number page))
- (last? (page-property page 'is-last))
+ ((paper-book (page-property page 'paper-book))
+ (layout (ly:paper-book-paper paper-book))
(h (- (ly:output-def-lookup layout 'paper-height)
(ly:output-def-lookup layout 'top-margin)
(ly:output-def-lookup layout 'bottom-margin)))