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 23ee840792dac46a10f25ecbaffdba355f0f4e5b..041edd3a72dacb64e27ea023c4511ffe173eec1a 100644 (file)
--- a/scm/page.scm
+++ b/scm/page.scm
@@ -85,31 +85,37 @@
        (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)
@@ -318,10 +324,8 @@ create offsets.
            (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