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 653c373085c376d6bb253e8d8de46ce8081553dd..041edd3a72dacb64e27ea023c4511ffe173eec1a 100644 (file)
--- a/scm/page.scm
+++ b/scm/page.scm
@@ -32,7 +32,7 @@
 
 
 (define (annotate? layout)
-  (eq? #t (ly:output-def-lookup layout 'annotatespacing)))
+  (eq? #t (ly:output-def-lookup layout 'annotate-spacing)))
 
 
 (define page-module (current-module))
@@ -124,7 +124,13 @@
        (layout (ly:paper-book-paper p-book))
        (arrow (annotate-y-interval layout
                                   "space left"
-                                  (cons (- (page-property page 'bottom-edge))
+                                  (cons (- 0.0
+                                           (page-property page 'bottom-edge)
+                                           (let ((foot (page-property page 'foot-stencil)))
+                                             (if (and (ly:stencil? foot)
+                                                      (not (ly:stencil-empty? foot)))
+                                                 (car (ly:stencil-extent foot Y))
+                                                 0.0)))
                                         (page-property page  'bottom-system-edge))
                                   #t)))
 
@@ -336,7 +342,12 @@ create offsets.
     (ly:prob-set-property! page 'bottom-system-edge
                           (car (ly:stencil-extent page-stencil Y)))
     (ly:prob-set-property! page 'space-left
-                          (car (ly:stencil-extent page-stencil Y)))
+                          (+ (prop 'bottom-edge)
+                             (prop 'bottom-system-edge)
+                             (if (and (ly:stencil? foot)
+                                      (not (ly:stencil-empty? foot)))
+                                 (car (ly:stencil-extent foot Y))
+                                 0.0)))
 
     (if (annotate? layout)
        (set! page-stencil
@@ -365,7 +376,7 @@ create offsets.
     page-stencil))
               
 
-(define (page-stencil page)
+(define-public (page-stencil page)
   (if (not (ly:stencil? (page-property page 'stencil)))
 
       ;; todo: make tweakable.