* scm/page-layout.scm (default-page-make-stencil): whoops. Add

page header back.

* scm/documentation-generate.scm (top-node): move version  to top node.

diff --git a/ChangeLog b/ChangeLog
index 8ed66eee9c9693ad92ceaecb5aee844d7d439f2e..973a58a5eeb0aabdca6396a3eae882b3686bd055 100644 (file)
--- 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 2915219c8f9ee1fce476873490e92322250227eb..e1d92ec0437e1e8c7ee2faaeb2cc645cbf0d6d04 100644 (file)
--- 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 efb76d62eddf54a0874fa3d637444978a234e45f..cedaf590958bef7cfe03a6705c90b5284fbccdae 100644 (file)
--- 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 99b5bb6b395f45a59ae2ded80ba247cbb58d90fe..265affbf7d9c7ddd29547aa3cd02569a2dbe7bd0 100644 (file)
--- 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