;;;;
;;;; source file of the GNU LilyPond music typesetter
;;;;
-;;;; (c) 2004 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;; (c) 2004--2006 Jan Nieuwenhuizen <janneke@gnu.org>
;;;; Han-Wen Nienhuys <hanwen@cs.uu.nl>
-(define-public (page-properties layout)
+(define-public (layout-extract-page-properties layout)
(list (append `((linewidth . ,(ly:paper-get-number
layout 'linewidth)))
(ly:output-def-lookup layout 'text-font-defaults))))
(define (interpret-in-page-env potential-markup)
(if (markup? potential-markup)
- (let* ((alists (map ly:module->alist scopes))
+ (let* ((alists (map ly:module->alist scopes))
(prefixed-alists
(map (lambda (alist)
(map (lambda (entry)
(cdr entry)))
alist))
alists))
- (tagline (ly:modules-lookup scopes 'tagline))
-
(pgnum-alist
(list
- (cons 'header:tagline (if (markup? tagline)
- tagline
- TAGLINE))
+ (cons 'header:tagline
+ (ly:modules-lookup scopes 'tagline
+ (ly:output-def-lookup layout 'tagline)))
(cons 'page:last? last?)
(cons 'page:page-number-string
(number->string page-number))
- (cons 'page:page-number page-number)))
+ (cons 'page:page-number page-number)))
(props (append
(list pgnum-alist)
prefixed-alists
- (page-properties layout))))
-
+ (layout-extract-page-properties layout))))
+
(interpret-markup layout props potential-markup))
-
+
empty-stencil))
(interpret-in-page-env
(let ((x (ly:modules-lookup scopes sym)))
(if (markup? x) x #f)))
- (let* ((alists (map ly:module->alist scopes))
+ (let* ((alists (map ly:module->alist scopes))
(prefixed-alist
(map (lambda (alist)
(map (lambda (entry)
alist))
alists))
(props (append prefixed-alist
- (page-properties layout)))
+ (layout-extract-page-properties layout)))
(markup (ly:output-def-lookup layout what)))