(default-page-make-stencil): always combine

the header stencil, even if empty. This prevents the body text to
reach up to the margins.

diff --git a/ChangeLog b/ChangeLog
index c5892f4f8dd4a67ff47141ceb3e270c33733c18b..c666f9c6af98a1968278d62a2b68a6db70a04356 100644 (file)
--- 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 9cc23eb4206ef892f55368ffa034bfe5ead6bac4..14d9b95c4db4698b5472a888ac2b7637576426b4 100644 (file)
--- 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 dacf385be083daf9496a01182ef5ac172a031e0e..64f1855a0499d713df10d016b92952dd7abaf042 100644 (file)
--- 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 bb288663dc53fa9c19f4b3eb9a5135095b0008a8..8f0c3ffe71e725612bf005e887bb04938c1374c6 100644 (file)
--- 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)