Fix some bugs in the dynamic engraver and PostScript backend

[lilypond.git] / scm / page.scm

diff --git a/scm/page.scm b/scm/page.scm
index 802c92ca17099a2969b19e59030ed73af12fba4d..041edd3a72dacb64e27ea023c4511ffe173eec1a 100644 (file)
--- a/scm/page.scm
+++ b/scm/page.scm
@@ -37,11 +37,10 @@
 
 (define page-module (current-module))
 
-(define (make-page paper-book  . args)
+(define (make-page init  . args)
   (let*
       ((p (apply ly:make-prob (append
-                              (list 'page (layout->page-init (ly:paper-book-paper paper-book))
-                                    'paper-book paper-book)
+                              (list 'page init)
                               args))))
 
     (page-set-property! p 'head-stencil (page-header p))
@@ -86,37 +85,43 @@
        (page-property page 'configuration))))
 
 (define (annotate-page layout stencil)
-  (let ((top-margin (ly:output-def-lookup layout 'top-margin))
-       (paper-height (ly:output-def-lookup layout 'paper-height))
-       (bottom-margin (ly:output-def-lookup layout 'bottom-margin))
-       (add-stencil (lambda (y)
-                      (set! stencil
-                            (ly:stencil-add stencil
-                                            (ly:stencil-translate-axis y 6 X))))))
+  (let*
+      ((top-margin (ly:output-def-lookup layout 'top-margin))
+       (paper-height (ly:output-def-lookup layout 'paper-height))
+       (bottom-margin (ly:output-def-lookup layout 'bottom-margin))
+       (add-stencil (lambda (y)
+                     (set! stencil
+                           (ly:stencil-add stencil y))
+                     )))
+
     (add-stencil
      (ly:stencil-translate-axis 
       (annotate-y-interval layout "paper-height"
                           (cons (- paper-height) 0)
                           #t)
       1 X))
+    
+
     (add-stencil
      (ly:stencil-translate-axis 
       (annotate-y-interval layout "top-margin"
                           (cons (- top-margin) 0)
                           #t)
       2 X))
+    
     (add-stencil
      (ly:stencil-translate-axis 
       (annotate-y-interval layout "bottom-margin"
                           (cons (- paper-height) (- bottom-margin paper-height))
                           #t)
       2 X))
+    
     stencil))
 
 (define (annotate-space-left page)
   (let*
-      ((paper-book (page-property page 'paper-book))
-       (layout (ly:paper-book-paper paper-book))
+      ((p-book (page-property page 'paper-book))
+       (layout (ly:paper-book-paper p-book))
        (arrow (annotate-y-interval layout
                                   "space left"
                                   (cons (- 0.0
@@ -163,7 +168,7 @@
          
          ;; add arrow markers 
          (if (or (annotate? layout)
-                 (ly:output-def-lookup layout 'annotate-headers #f)) 
+                 (ly:output-def-lookup layout 'annotateheaders #f)) 
              (set! head-stencil
                    (ly:stencil-add
                     (ly:stencil-translate-axis
@@ -194,9 +199,10 @@
 
 (define (page-header-or-footer page dir)
     (let*
-      ((paper-book (page-property page 'paper-book))
-       (layout (ly:paper-book-paper paper-book))
-       (scopes (ly:paper-book-scopes paper-book))
+      ((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))
        (number (page-page-number page))
        (last? (page-property page 'is-last))
        )
@@ -250,10 +256,10 @@ create offsets.
 
   (page-translate-systems page)
   (let*
-      ((paper-book (page-property page 'paper-book))
+      ((p-book (page-property page 'paper-book))
        (prop (lambda (sym) (page-property page sym)))
-       (layout (ly:paper-book-paper paper-book))
-       (scopes (ly:paper-book-scopes paper-book))
+       (layout (ly:paper-book-paper p-book))
+       (scopes (ly:paper-book-scopes p-book))
        (lines (page-lines page))
        (number (page-page-number page))
 
@@ -314,16 +320,12 @@ create offsets.
        (foot (prop 'foot-stencil))
        )
 
-    (if (and
-        (or (annotate? layout)
-            (ly:output-def-lookup layout 'annotate-systems #f))
-        (pair? lines))
+    (if (or (annotate? layout)
+           (ly:output-def-lookup layout 'annotatesystems #f))
 
        (begin
-         (for-each (lambda (sys next-sys)
-                     (paper-system-annotate sys next-sys layout))
-                   lines
-                   (append (cdr lines) (list #f)))
+         (for-each (lambda (sys) (paper-system-annotate sys layout))
+                   lines)
          (paper-system-annotate-last (car (last-pair lines)) layout)))
     
     (set! page-stencil (ly:stencil-combine-at-edge
@@ -368,7 +370,7 @@ create offsets.
 
     ;; annotation.
     (if (or (annotate? layout)
-           (ly:output-def-lookup layout 'annotate-page #f))
+           (ly:output-def-lookup layout 'annotatepage #f))
        (set! page-stencil (annotate-page layout page-stencil)))
 
     page-stencil))
@@ -386,8 +388,11 @@ create offsets.
 (define (calc-printable-height page)
   "Printable area for music and titles; matches default-page-make-stencil."
   (let*
-      ((paper-book (page-property page 'paper-book))
-       (layout (ly:paper-book-paper paper-book))
+      ((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))
        (h (- (ly:output-def-lookup layout 'paper-height)
               (ly:output-def-lookup layout 'top-margin)
               (ly:output-def-lookup layout 'bottom-margin)))