From: Joe Neeman <joeneeman@gmail.com>
Date: Mon, 10 Aug 2009 01:17:15 +0000 (+1000)
Subject: Fix the positioning of the header.
X-Git-Tag: release/2.13.4-1~179^2~136
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=96acd6eed4f9a3ae4ea4184a0d52439ec6a07e58;p=lilypond.git

Fix the positioning of the header.
---

diff --git a/scm/page.scm b/scm/page.scm
index 3d897c1465..2b63218766 100644
--- 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