From 862f919962e0379f30767d49e1b5eb10b186fcf9 Mon Sep 17 00:00:00 2001
From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Wed, 6 Apr 2005 01:06:56 +0000
Subject: [PATCH] (default-page-make-stencil): always combine the header
 stencil, even if empty. This prevents the body text to reach up to the
 margins.

---
 ChangeLog                                |  4 ++++
 input/mutopia/W.A.Mozart/mozart-hrn-3.ly |  6 +++---
 ly/titling-init.ly                       |  6 ++++--
 scm/page-layout.scm                      | 13 ++++++++-----
 4 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c5892f4f8d..c666f9c6af 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2005-04-06  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+	* scm/page-layout.scm (default-page-make-stencil): always combine
+	the header stencil, even if empty. This prevents the body text to
+	reach up to the margins.
+
 	* po/rw.po (Module): new file, for Kinyarwanda.
 
 	* input/test/spacing-optical.ly (Module): new file.
diff --git a/input/mutopia/W.A.Mozart/mozart-hrn-3.ly b/input/mutopia/W.A.Mozart/mozart-hrn-3.ly
index 9cc23eb420..14d9b95c4d 100644
--- a/input/mutopia/W.A.Mozart/mozart-hrn-3.ly
+++ b/input/mutopia/W.A.Mozart/mozart-hrn-3.ly
@@ -58,13 +58,13 @@ virtuoso that taught in Geneva.
     \score {
 	{ \transpose c' bes \allegro }
 	\layout { }
-	\header { piece = "allegro" opus = "" }	
+	\header { piece = "Allegro" opus = "" }	
 	\midi { \tempo 4=90 }
     }
 
     \score {
 	{ \transpose c' bes \romanze }
-	\header { piece = "romanze" opus = "" }	
+	\header { piece = "Romanze" opus = "" }	
 	\midi { \tempo 4 = 70  }
 	\layout {}
     }
@@ -72,7 +72,7 @@ virtuoso that taught in Geneva.
     \score
     {
 	{ \transpose c' bes \rondo }
-	\header { piece = "rondo" opus = "" }
+	\header { piece = "Rondo" opus = "" }
 	\midi { \tempo 4 = 100 }
 	\layout { }
     }
diff --git a/ly/titling-init.ly b/ly/titling-init.ly
index dacf385be0..64f1855a04 100644
--- a/ly/titling-init.ly
+++ b/ly/titling-init.ly
@@ -79,9 +79,11 @@ scoreTitleMarkup = \markup {
    empty-stencil))
 
 oddHeaderMarkup = \markup
-\on-the-fly #not-single-page
+ % \on-the-fly #not-single-page
 \fill-line {
-  ""
+  %% force the header to take some space, otherwise the
+  %% page layout becomes a complete mess. 
+  " "
   \on-the-fly #not-first-page \fromproperty #'header:instrument
   \on-the-fly #not-first-page \fromproperty #'page:page-number-string
 }
diff --git a/scm/page-layout.scm b/scm/page-layout.scm
index bb288663dc..8f0c3ffe71 100644
--- a/scm/page-layout.scm
+++ b/scm/page-layout.scm
@@ -146,11 +146,14 @@ create offsets.
 		  "leftmargin " leftmargin "rightmargin " rightmargin
 		  )))
 
-    (if (and
-	 (ly:stencil? head)
-	 (not (ly:stencil-empty? head)))
-	(set! page-stencil (ly:stencil-combine-at-edge
-			    page-stencil Y DOWN head 0. 0.)))
+    (set! page-stencil (ly:stencil-combine-at-edge
+			page-stencil Y DOWN
+			(if (and
+			     (ly:stencil? head)
+			     (not (ly:stencil-empty? head)))
+			    head
+			    (ly:make-stencil "" (cons 0 0) (cons 0 0)))
+			    0. 0.))
 
     (map add-system (zip lines offsets))
     (if (and (ly:stencil? foot)
-- 
2.39.5