X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Ftitling.scm;h=b6c1e0583d1a3dd7fc39977df7e447a90faac538;hb=2411d0e11c5ca03997122c905bc2e58ea6a8682e;hp=f6ac5f0b124ecc84f08a0023a9da150116f70cbd;hpb=9f3572d98bb948c9689cd1f75401a029451fa001;p=lilypond.git diff --git a/scm/titling.scm b/scm/titling.scm index f6ac5f0b12..b6c1e0583d 100644 --- a/scm/titling.scm +++ b/scm/titling.scm @@ -1,9 +1,20 @@ -;;;; titling.scm -- titling functions +;;;; This file is part of LilyPond, the GNU music typesetter. ;;;; -;;;; source file of the GNU LilyPond music typesetter +;;;; Copyright (C) 2004--2012 Jan Nieuwenhuizen +;;;; Han-Wen Nienhuys ;;;; -;;;; (c) 2004--2006 Jan Nieuwenhuizen -;;;; Han-Wen Nienhuys +;;;; LilyPond is free software: you can redistribute it and/or modify +;;;; it under the terms of the GNU General Public License as published by +;;;; the Free Software Foundation, either version 3 of the License, or +;;;; (at your option) any later version. +;;;; +;;;; LilyPond is distributed in the hope that it will be useful, +;;;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;;; GNU General Public License for more details. +;;;; +;;;; You should have received a copy of the GNU General Public License +;;;; along with LilyPond. If not, see . (define-public (layout-extract-page-properties layout) (list (append `((line-width . ,(ly:paper-get-number @@ -12,12 +23,13 @@ ;;;;;;;;;;;;;;;;;; -(define-public ((marked-up-headfoot what-odd what-even) layout scopes page-number last?) - - "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 -" +(define-public ((marked-up-headfoot what-odd what-even) + layout scopes page-number is-last-bookpart is-bookpart-last-page) + "Read variables @var{what-odd}, @var{what-even} from @var{layout}, +and interpret them as markup. The @var{props} argument will include +variables set in @var{scopes} and @code{page:is-bookpart-last-page}, +@code{page:is-last-bookpart}, @code{page:page-number-string}, and +@code{page:page-number}." (define (get sym) (ly:output-def-lookup layout sym)) @@ -41,7 +53,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 +62,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)) @@ -61,10 +73,9 @@ page:last?, page:page-number-string and page:page-number (get what-odd)))) (define-public ((marked-up-title what) layout scopes) - "Read variables WHAT from SCOPES, and interpret it as markup. The -PROPS argument will include variables set in SCOPES (prefixed with -`header:' -" + "Read variables @var{what} from @var{scopes}, and interpret it as markup. +The @var{props} argument will include variables set in @var{scopes} (prefixed +with `header:'." (define (get sym) (let ((x (ly:modules-lookup scopes sym)))