(struct Simple_spacer): remove

[lilypond.git] / scm / page-layout.scm

diff --git a/scm/page-layout.scm b/scm/page-layout.scm
index 98db6b8e6fd8e76fb35aca31ecf64baa443be343..1b2f7db5f08cfa8b6d30eea438996934b03c1fab 100644 (file)
--- a/scm/page-layout.scm
+++ b/scm/page-layout.scm
@@ -37,24 +37,21 @@
   "Standard header for a part: page number --outside--  and instrument--centered."
 
   (let* ((props (page-properties paper))
-        (pnum
-         (if (ly:output-def-lookup paper 'printpagenumber)
-             (markup #:bold (number->string page-number))
-             ""
-             ))
-        (instr (ly:modules-lookup scopes 'instrument))
-        
-        (line (list "" (if (markup? instr) instr "") pnum)))
-
+         (pnum
+          (if (ly:output-def-lookup paper 'printpagenumber)
+              (markup #:bold (number->string page-number))
+              ""))
+         (instr (ly:modules-lookup scopes 'instrument))
+         
+         (line (list "" (if (markup? instr) instr "") pnum)))
+    
     (if (even? page-number)
-       (set! line (reverse line)))
-
-    (if (< 1 page-number)
-       (interpret-markup
-        paper props (make-fill-line-markup line))
-       '())
-    ))
-
+        (set! line (reverse line)))
+    
+    (if (< (ly:output-def-lookup paper 'firstpagenumber) page-number)
+        (interpret-markup
+         paper props (make-fill-line-markup line))
+        '())))
 
 ;; TODO: add publisher ID on non-first page.
 (define-public (plain-footer paper scopes page-number last?)
@@ -275,14 +272,14 @@ corresponding to DONE-LINES.
 CURRENT-BEST is the best result sofar, or #f."
 
     (let* ((this-page-num (if (null? best-paths)
-                              (ly:output-def-lookup bookpaper 'initialpagenumber)
+                              (ly:output-def-lookup bookpaper 'firstpagenumber)
                               (1+ (node-page-number (car best-paths)))))
            (prev-penalty (if (null? best-paths)
                              0.0
                              (node-penalty (car best-paths))))
            (page-height (page-height this-page-num last?))
            (space-used (cumulative-height current-lines))
-           (this-page-penalty (height-penalty  page-height space-used))
+           (this-page-penalty (height-penalty page-height space-used))
            (user-penalty (ly:paper-system-break-penalty (car current-lines)))
            (total-penalty (combine-penalties
                            user-penalty this-page-penalty prev-penalty))