From b03713d0cb849dfe08684cc116f1981f63c5defc Mon Sep 17 00:00:00 2001
From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Thu, 16 Sep 2004 20:55:56 +0000
Subject: [PATCH] * scm/page-layout.scm (default-page-make-stencil): whoops.
 Add page header back.

* scm/documentation-generate.scm (top-node): move version  to top node.
---
 ChangeLog                      | 5 +++++
 lily/simple-spacer.cc          | 2 +-
 scm/documentation-generate.scm | 4 +++-
 scm/page-layout.scm            | 9 +++++++++
 4 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8ed66eee9c..973a58a5ee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2004-09-16  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
+	* scm/page-layout.scm (default-page-make-stencil): whoops. Add
+	page header back.
+
+	* scm/documentation-generate.scm (top-node): move version  to top node.
+
 	* lily/ledger-line-spanner.cc: add ledgered-interface, with
 	property no-ledgers.
 
diff --git a/lily/simple-spacer.cc b/lily/simple-spacer.cc
index 2915219c8f..e1d92ec043 100644
--- a/lily/simple-spacer.cc
+++ b/lily/simple-spacer.cc
@@ -293,7 +293,7 @@ LY_DEFINE(ly_solve_spring_rod_problem, "ly:solve-spring-rod-problem",
 	force_return  = scm_from_double ((spacer.line_len_ - len)
 					 * spacer.active_springs_stiffness ());
     }
-  else if (not isinf (spacer.force_)
+  else if (!isinf (spacer.force_)
 	   && spacer.is_active ())
     {
       force_return = scm_from_double (spacer.force_);
diff --git a/scm/documentation-generate.scm b/scm/documentation-generate.scm
index efb76d62ed..cedaf59095 100644
--- a/scm/documentation-generate.scm
+++ b/scm/documentation-generate.scm
@@ -142,13 +142,15 @@
 
 "
 
-  "This is the program reference for LilyPond version " (lilypond-version)
 
   ) out-port)
 
 (define top-node
   (make <texi-node>
     #:name "Top"
+    #:text 
+    (string-append  "This is the program reference for LilyPond version " (lilypond-version))
+
     #:children
     (list
      (music-doc-node)
diff --git a/scm/page-layout.scm b/scm/page-layout.scm
index 99b5bb6b39..265affbf7d 100644
--- a/scm/page-layout.scm
+++ b/scm/page-layout.scm
@@ -143,6 +143,11 @@
 		     
       (head (page-headfoot paper scopes number 'make-header 'headsep UP last?))
       (foot (page-headfoot paper scopes number 'make-footer 'footsep DOWN last?))
+
+      (head-height (if (ly:stencil? head)
+		       (interval-length (ly:stencil-extent head Y))
+		       0.0))
+
       (line-stencils (map ly:paper-system-stencil lines))
       (height-proc (ly:output-def-lookup paper 'page-music-height))
 
@@ -156,6 +161,7 @@
 			   (ly:stencil-translate-axis
 			    (car stencil-position)
 			    (- 0
+			       head-height
 			       (cadr stencil-position)
 			       topmargin)
 			       Y)
@@ -163,6 +169,9 @@
       )
 
 
+    (set! page-stencil (ly:stencil-combine-at-edge
+	  page-stencil Y DOWN head 0. 0.))
+
     (map add-system (zip line-stencils offsets))
     (if (ly:stencil? foot)
 	(set! page-stencil
-- 
2.39.2