* scm/page-layout.scm (plain-header): fix bug that print page

	number in the first page if firstpagenumber was different than 1.

diff --git a/ChangeLog b/ChangeLog
index 5fe8c8287f347f211e5c5db3130df90bf1310470..3471e41d2323426305abcc03a2b4d811bf54b7bc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-08-23  Pedro Kroger  <kroeger@pedrokroeger.net>
+
+       * scm/page-layout.scm (plain-header): fix bug that print page
+       number in the first page if firstpagenumber was different than 1.
+
 2004-08-23  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
        * lily/new-slur.cc (add_column): remove set_interface()

diff --git a/scm/page-layout.scm b/scm/page-layout.scm
index f315e5e6cdabdc9d10c9379a231e0a93f8bc00f1..8672062a3d909ece9e9ffba56ff04046c1ac6f59 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?)