X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Ftitling.scm;h=66f45fc8a5566e2d5de7dfbb0f460abde6db5e8c;hb=646ef7938ab587c23bf120b9f00c68cef744b365;hp=7eae28e66df9e78300e7f694de1a4783626b0d42;hpb=d84c7587117731add28b3b3591e9ef3d92fa827c;p=lilypond.git diff --git a/scm/titling.scm b/scm/titling.scm index 7eae28e66d..66f45fc8a5 100644 --- a/scm/titling.scm +++ b/scm/titling.scm @@ -2,7 +2,7 @@ ;;;; ;;;; source file of the GNU LilyPond music typesetter ;;;; -;;;; (c) 2004--2006 Jan Nieuwenhuizen +;;;; (c) 2004--2009 Jan Nieuwenhuizen ;;;; Han-Wen Nienhuys (define-public (layout-extract-page-properties layout) @@ -12,12 +12,13 @@ ;;;;;;;;;;;;;;;;;; -(define-public ((marked-up-headfoot what-odd what-even) layout scopes page-number last?) +(define-public ((marked-up-headfoot what-odd what-even) + 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)) @@ -41,7 +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? last?) + (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))) @@ -49,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))