Fix the positioning of the header.

diff --git a/scm/page.scm b/scm/page.scm
index 3d897c1465919af7bdd1359334460978d4eba690..2b63218766f7f6ab3690133e7b5bb91d362db497 100644 (file)
--- a/scm/page.scm
+++ b/scm/page.scm
@@ -224,10 +224,6 @@
                                                       system-separator-markup)
                                     #f))
        
-       (head-height (if (ly:stencil? (prop 'head-stencil))
-                       (interval-length (ly:stencil-extent (prop 'head-stencil) Y))
-                       0.0))
-
        (page-stencil (ly:make-stencil '()))
 
        (last-system #f)
@@ -271,8 +267,9 @@
         (ly:stencil? head)
         (not (ly:stencil-empty? head)))
        (begin
+         ;; Ensure that the top of the header just touches the top margin.
          (set! head (ly:stencil-translate-axis head
-                                               (- 0 head-height (prop 'top-margin)) Y))
+                                               (- 0 (cdr (ly:stencil-extent head Y)) (prop 'top-margin)) Y))
          (set! page-stencil (ly:stencil-add page-stencil head))))
 
     (if (and