Merge commit 'origin/dev/jneeman' into systems-per-page

[lilypond.git] / scm / page.scm

diff --git a/scm/page.scm b/scm/page.scm
index 802c92ca17099a2969b19e59030ed73af12fba4d..a4862198010c206a36b72febae29b8d3ee3aeefa 100644 (file)
--- a/scm/page.scm
+++ b/scm/page.scm
@@ -136,8 +136,8 @@
 \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."
 
@@ -146,9 +146,8 @@
         (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)
@@ -158,7 +157,7 @@
          (set! head-stencil
                (ly:stencil-combine-at-edge
                 stencil Y dir head-stencil
-                sep 0.0))
+                sep))
 
          
          ;; add arrow markers 
@@ -198,8 +197,8 @@
        (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)
@@ -208,7 +207,7 @@
                (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))
@@ -221,8 +220,7 @@
   (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
@@ -240,12 +238,7 @@
       )))
 
 (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)
@@ -258,10 +251,9 @@ create offsets.
        (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)
@@ -272,10 +264,7 @@ create offsets.
                        (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)
@@ -286,7 +275,7 @@ create offsets.
                                                                  (cons
                                                                   (+ system-xoffset x)
                                                                   (- 0 head-height y (prop 'top-margin)))
-
+                                                                 
                                                                  )))))
        (add-system
        (lambda (system)
@@ -325,18 +314,18 @@ create offsets.
                    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
@@ -371,6 +360,7 @@ create offsets.
            (ly:output-def-lookup layout 'annotate-page #f))
        (set! page-stencil (annotate-page layout page-stencil)))
 
+
     page-stencil))