changed from initialpagenumber to firstpagenumber

diff --git a/ChangeLog b/ChangeLog
index e05c895d23fc9465dca1831f0fff06f90e9d8f46..5fe8c8287f347f211e5c5db3130df90bf1310470 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -27,13 +27,18 @@
 
 2004-08-22  Pedro Kroger  <kroeger@pedrokroeger.net>
 
+       * Documentation/user/changing-defaults.itely (Page layout):
+       description of firstpagenumber. Moved @refbugs about rightmargin
+       to the end of the section (it was looking like the documentation
+       after the refbugs was part of the bug comment).
+
        * scm/framework-ps.scm (output-framework): set the first
-       postscript page number to initialpagenumber
+       postscript page number to firstpagenumber
 
        * scm/page-layout.scm (ly:optimal-page-breaks): print the first
-       page number according to initialpagenumber
+       page number according to firstpagenumber
 
-       * scm/paper.scm (set-paper-dimensions): added initialpagenumber
+       * scm/paper.scm (set-paper-dimensions): added firstpagenumber
        parameter
 
 2004-08-22  Han-Wen Nienhuys   <hanwen@xs4all.nl>

diff --git a/Documentation/user/changing-defaults.itely b/Documentation/user/changing-defaults.itely
index 35d4a1d2f5e7297e8c94c1c5177372e32a8eb231..dd86413436ecab64c614367c99f1c903fc725052 100644 (file)
--- a/Documentation/user/changing-defaults.itely
+++ b/Documentation/user/changing-defaults.itely
@@ -2433,6 +2433,8 @@ The default layout responds to the following settings in the
 @cindex \bookpaper
 
 @table @code
+@item firstpagenumber
+ The value of the page number of the first page. Default is 1.
 @item hsize
  The width of the page
 @item vsize
@@ -2475,19 +2477,6 @@ value has to be multiplied in the example above.
         @}
 @end example
 
-
-@refbugs
-
-The option rightmargin is defined but doesn't set the right margin
-yet. The value for the right margin has to be defined adjusting the
-values of the leftmargin and linewidth.
-
-The default page header puts the page number and the @code{instrument}
-field from the @code{\header} block on a line.
-
-
-
-
 @cindex copyright
 @cindex tagline
 
@@ -2509,8 +2498,6 @@ The following settings influence the header and footer layout.
   this boolean controls whether a pagenumber is printed. 
 @end table
 
-
-
 The page layout itself is done by two functions:
 @code{page-music-height} and @code{page-make-stencil}. The former
 tells the line-breaking algorithm how much space can be spent on a
@@ -2521,5 +2508,14 @@ page, the latter creates the actual page given the system to put on it.
 
 Examples: @inputfileref{input/test/,page-breaks.ly}
 
+@refbugs
+
+The option rightmargin is defined but doesn't set the right margin
+yet. The value for the right margin has to be defined adjusting the
+values of the leftmargin and linewidth.
+
+The default page header puts the page number and the @code{instrument}
+field from the @code{\header} block on a line.
+
 
 

diff --git a/scm/framework-ps.scm b/scm/framework-ps.scm
index 460b18a3e50399b7a241914b5faf819a5812695e..288e36ad20153a3f4bab72637865f186efff4a98 100644 (file)
--- a/scm/framework-ps.scm
+++ b/scm/framework-ps.scm
@@ -195,7 +195,7 @@
 (define-public (output-framework outputter book scopes fields basename)
   (let* ((bookpaper (ly:paper-book-book-paper book))
         (pages (ly:paper-book-pages book))
-        (page-number (1- (ly:output-def-lookup bookpaper 'initialpagenumber)))
+        (page-number (1- (ly:output-def-lookup bookpaper 'firstpagenumber)))
         (page-count (length pages)))
   (for-each
    (lambda (x)

diff --git a/scm/page-layout.scm b/scm/page-layout.scm
index 98db6b8e6fd8e76fb35aca31ecf64baa443be343..f315e5e6cdabdc9d10c9379a231e0a93f8bc00f1 100644 (file)
--- a/scm/page-layout.scm
+++ b/scm/page-layout.scm
@@ -275,7 +275,7 @@ 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

diff --git a/scm/paper.scm b/scm/paper.scm
index 24d42e26b6f4b691781a5279ce278d88ab015062..d430c36a32e9a4b062a0d4e8b70923e92b350a14 100644 (file)
--- a/scm/paper.scm
+++ b/scm/paper.scm
@@ -90,7 +90,7 @@
     (module-define! m 'headsep (* 4 mm))
     (module-define! m 'footsep (* 4 mm))
     (module-define! m 'leftmargin #f)
-    (module-define! m 'initialpagenumber 1)
+    (module-define! m 'firstpagenumber 1)
     (module-define! m 'rightmargin (* 10 mm))))
 
 (define (internal-set-paper-size module name)