X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Ftitling.scm;h=d34b7113d46aa89eee62234d4c45f1db76832f4f;hb=53ed6257ae65d5a12b45da9fce930267ed12db48;hp=28e0e9c8c8fc4c81ec80682e817fb51e64a40b00;hpb=4d8f773563ad6b84f08d1c30667f444178fb75d0;p=lilypond.git diff --git a/scm/titling.scm b/scm/titling.scm index 28e0e9c8c8..d34b7113d4 100644 --- a/scm/titling.scm +++ b/scm/titling.scm @@ -2,7 +2,7 @@ ;;;; ;;;; source file of the GNU LilyPond music typesetter ;;;; -;;;; (c) 2004--2007 Jan Nieuwenhuizen +;;;; (c) 2004--2008 Jan Nieuwenhuizen ;;;; Han-Wen Nienhuys (define-public (layout-extract-page-properties layout) @@ -13,12 +13,12 @@ ;;;;;;;;;;;;;;;;;; (define-public ((marked-up-headfoot what-odd what-even) - layout scopes page-number is-book-last-page is-part-last-page) + layout scopes page-number is-last-bookpart is-bookpart-last-page) "Read variables WHAT-ODD, WHAT-EVEN from LAYOUT, and interpret them as markup. The PROPS argument will include variables set in SCOPES and -page:last?, page:page-number-string and page:page-number -" +page:is-bookpart-last-page, page:is-last-bookpart, page:page-number-string +and page:page-number" (define (get sym) (ly:output-def-lookup layout sym)) @@ -42,8 +42,8 @@ page:last?, page:page-number-string and page:page-number (cons 'header:tagline (ly:modules-lookup scopes 'tagline (ly:output-def-lookup layout 'tagline))) - (cons 'page:last? is-book-last-page) - (cons 'page:part-last? is-part-last-page) + (cons 'page:is-last-bookpart is-last-bookpart) + (cons 'page:is-bookpart-last-page is-bookpart-last-page) (cons 'page:page-number-string (number->string page-number)) (cons 'page:page-number page-number))) @@ -51,7 +51,6 @@ page:last?, page:page-number-string and page:page-number (list pgnum-alist) prefixed-alists (layout-extract-page-properties layout)))) - (interpret-markup layout props potential-markup)) empty-stencil))