Vincent's patch to implement printpagenumber, added docs for that feature.

diff --git a/ChangeLog b/ChangeLog
index c70228ecddc5a486969bff453e49d9238c431930..90bfc74852f92e3b0acaed2cf6cd5494bdbd6bde 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2005-06-27  Graham Percival  <gperlist@shaw.ca>
+
+       * ly/titling-init.ly: implements printpagenumber, increases
+       space between dedication and title (to avoid collisions with
+       "g" and "q" in dedication), and nicer logic about copyright
+       and instrument fields being printed on the first page.
+       Thanks Vincent!
+
+       * Documentation/user/global.itely: document printpagenumber.
+
 2005-06-27  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * Documentation/topdocs/NEWS.tely: Update to 2.6.

diff --git a/Documentation/user/global.itely b/Documentation/user/global.itely
index ba996d3875b015d44fbaa66a2a7dbeeab1598fa8..eb3d9cbe8d1b3bc9b8e8f0ce2aa60ff987ad1180 100644 (file)
--- a/Documentation/user/global.itely
+++ b/Documentation/user/global.itely
@@ -260,6 +260,9 @@ The value of the page number of the first page.  Default is@tie{}1.
 If set to true, will print the page number in the first page.  Default is
 false.
 
+@item printpagenumber
+If set to false, page numbers will not be printed.
+
 @item hsize
 The width of the page.
 

diff --git a/ly/titling-init.ly b/ly/titling-init.ly
index 02b53f2513de2184cbef5fae2faaebf17c131d46..0695ad5f42cc2aa371bb65785fcf9cd36820b16a 100644 (file)
--- a/ly/titling-init.ly
+++ b/ly/titling-init.ly
@@ -1,4 +1,4 @@
-\version "2.5.31"
+\version "2.6.0"
 
 slashSeparator = \markup {
   \hcenter
@@ -23,7 +23,7 @@ tagline = \markup {
 }
 
 bookTitleMarkup = \markup {
-  \override #'(baseline-skip . 3)
+  \override #'(baseline-skip . 3.5)
   \column {
     \fill-line { \fromproperty #'header:dedication }
     \override #'(baseline-skip . 3.5)
@@ -46,8 +46,8 @@ bookTitleMarkup = \markup {
         \fromproperty #'header:composer
       }
       \fill-line {
-          \fromproperty #'header:meter
-          \fromproperty #'header:arranger
+        \fromproperty #'header:meter
+        \fromproperty #'header:arranger
       }
     }
   }
@@ -61,8 +61,8 @@ scoreTitleMarkup = \markup {
 }
 
 #(define (first-page layout props arg)
-  (if (= (chain-assoc-get 'page:page-number props -1) 1)
-   (interpret-markup layout props arg)
+  (if (= (chain-assoc-get 'page:page-number props -1) 
+         (ly:output-def-lookup layout 'firstpagenumber))   (interpret-markup layout props arg)
    empty-stencil))
 
 #(define (last-page layout props arg)
@@ -71,42 +71,50 @@ scoreTitleMarkup = \markup {
    empty-stencil))
 
 #(define (not-first-page layout props arg)
-  (if (not (= (chain-assoc-get 'page:page-number props -1) 1))
+  (if (not (= (chain-assoc-get 'page:page-number props -1)
+              (ly:output-def-lookup layout 'firstpagenumber)))
    (interpret-markup layout props arg)
    empty-stencil))
 
+%% unused
 #(define (not-single-page layout props arg)
-  (if (not (and (= (chain-assoc-get 'page:page-number props -1) 1)
-           (chain-assoc-get 'page:last? props -1)))
+  (if (not (and (= (chain-assoc-get 'page:page-number props -1) 
+                   (ly:output-def-lookup layout 'firstpagenumber))
+               (chain-assoc-get 'page:last? props -1)))
    (interpret-markup layout props arg)
    empty-stencil))
 
-#(define (check-print-first-page-number layout props arg)
-  (if (eq? (ly:output-def-lookup layout 'printfirstpagenumber) #t)
+#(define (print-page-number layout props arg)
+  (if (eq? (ly:output-def-lookup layout 'printpagenumber) #t)
    (interpret-markup layout props arg)
-   (not-first-page layout props arg)))
+   empty-stencil))
+
+#(define (print-page-number-check-first layout props arg)
+  (if (or (not (= (chain-assoc-get 'page:page-number props -1) 
+                  (ly:output-def-lookup layout 'firstpagenumber)))
+          (eq? (ly:output-def-lookup layout 'printfirstpagenumber) #t))
+   (print-page-number layout props arg)
+   empty-stencil))
 
 oddHeaderMarkup = \markup
- % \on-the-fly #not-single-page
 \fill-line {
   %% force the header to take some space, otherwise the
-  %% page layout becomes a complete mess. 
+  %% page layout becomes a complete mess.
   " "
   \on-the-fly #not-first-page \fromproperty #'header:instrument
-  \on-the-fly #check-print-first-page-number \fromproperty #'page:page-number-string
+  \on-the-fly #print-page-number-check-first \fromproperty #'page:page-number-string
 }
 
 evenHeaderMarkup = \markup
 \fill-line {
-  \fromproperty #'page:page-number-string
-  \fromproperty #'header:instrument
+  \on-the-fly #print-page-number-check-first \fromproperty #'page:page-number-string
+  \on-the-fly #not-first-page \fromproperty #'header:instrument
   ""
 }
 
 oddFooterMarkup = \markup {
   \column {
     \fill-line {
-
       %% Copyright header field only on first page.
       \on-the-fly #first-page \fromproperty #'header:copyright
     }
@@ -117,4 +125,3 @@ oddFooterMarkup = \markup {
   }
 }
 
-