Merge branch 'master' of git://git.savannah.gnu.org/lilypond.git

[lilypond.git] / scm / page.scm

diff --git a/scm/page.scm b/scm/page.scm
index 6be4d6450d1ba063ea8e18a33d75be3529ecbd5f..0a30acef4dd0471f837cb2d5acf2c9bb6fcffe71 100644 (file)
--- a/scm/page.scm
+++ b/scm/page.scm
@@ -1,6 +1,6 @@
 ;;;; This file is part of LilyPond, the GNU music typesetter.
 ;;;;
-;;;; Copyright (C) 2006--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+;;;; Copyright (C) 2006--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 ;;;;
 ;;;; LilyPond is free software: you can redistribute it and/or modify
 ;;;; it under the terms of the GNU General Public License as published by
@@ -69,7 +69,7 @@
  (lambda (j)
    (module-define!
     page-module
-    (string->symbol (format "page-~a" j))
+    (string->symbol (format #f "page-~a" j))
     (lambda (pg)
       (page-property pg j))))
 
@@ -96,7 +96,7 @@
 (define (annotate-top-space first-system layout header-stencil stencil)
   (let* ((top-margin (ly:output-def-lookup layout 'top-margin))
         (sym (if (paper-system-title? first-system)
-                 'top-title-spacing
+                 'top-markup-spacing
                  'top-system-spacing))
         (spacing-spec (ly:output-def-lookup layout sym))
         (X-offset (ly:prob-property first-system 'X-offset 5))
@@ -246,7 +246,7 @@
        (add-system
        (lambda (system)
          (let* ((stencil (paper-system-stencil system))
-                (y (ly:prob-property system 'Y-offset))
+                (y (ly:prob-property system 'Y-offset 0))
                 (is-title (paper-system-title?
                            system)))
            (add-to-page stencil