From 32e6f682a7d2f929a663d39aa26763de68da8a59 Mon Sep 17 00:00:00 2001 From: Pedro Kroger Date: Mon, 23 Aug 2004 16:22:02 +0000 Subject: [PATCH] * scm/page-layout.scm (plain-header): fix bug that print page number in the first page if firstpagenumber was different than 1. --- ChangeLog | 5 +++++ scm/page-layout.scm | 31 ++++++++++++++----------------- 2 files changed, 19 insertions(+), 17 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5fe8c8287f..3471e41d23 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2004-08-23 Pedro Kroger + + * 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 * lily/new-slur.cc (add_column): remove set_interface() diff --git a/scm/page-layout.scm b/scm/page-layout.scm index f315e5e6cd..8672062a3d 100644 --- 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?) -- 2.39.5