Merge branch 'master' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond

[lilypond.git] / scm / page.scm

diff --git a/scm/page.scm b/scm/page.scm
index 258589ae53617e4576437a97e3477f504681c34e..3e25bdaaee3b46059ce22a90eb1578cb8b7b6426 100644 (file)
--- a/scm/page.scm
+++ b/scm/page.scm
@@ -37,10 +37,11 @@
 
 (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))
@@ -114,8 +115,8 @@
 
 (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
@@ -157,7 +158,7 @@
          (set! head-stencil
                (ly:stencil-combine-at-edge
                 stencil Y dir head-stencil
-                sep 0.0))
+                sep))
 
          
          ;; add arrow markers 
@@ -193,10 +194,9 @@
 
 (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))
        )
@@ -221,8 +221,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,25 +239,19 @@
       )))
 
 (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))
@@ -272,10 +265,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 +276,7 @@ create offsets.
                                                                  (cons
                                                                   (+ system-xoffset x)
                                                                   (- 0 head-height y (prop 'top-margin)))
-
+                                                                 
                                                                  )))))
        (add-system
        (lambda (system)
@@ -325,18 +315,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 +361,7 @@ create offsets.
            (ly:output-def-lookup layout 'annotate-page #f))
        (set! page-stencil (annotate-page layout page-stencil)))
 
+
     page-stencil))
               
 
@@ -386,8 +377,8 @@ create offsets.
 (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))
+      ((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)))