X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fpaper.scm;h=d4a1f42f3f3949c6452cda7b1d0402fa2d9be124;hb=5c14a087ca6cbd665fd631452b7b1283ba0387c3;hp=d587f5e9c04465699358b2a7cb986cc665a90876;hpb=f6adc1bbf732e42c62c94c872a0fd9078615b239;p=lilypond.git diff --git a/scm/paper.scm b/scm/paper.scm index d587f5e9c0..d4a1f42f3f 100644 --- a/scm/paper.scm +++ b/scm/paper.scm @@ -6,12 +6,33 @@ (define-public (set-paper-dimension-variables mod) (module-define! mod 'dimension-variables - '(pt mm cm in staff-height staff-space - page-top-space - between-system-space between-system-padding - line-width indent short-indent paper-width paper-height horizontal-shift - staff-space line-thickness ledgerline-thickness - blot-diameter left-margin right-margin))) + '(after-title-space + before-title-space + between-system-padding + between-system-space + between-title-space + blot-diameter + bottom-margin + cm + foot-separation + head-separation + horizontal-shift + in + indent + ledger-line-thickness + left-margin + line-thickness + line-width + mm + page-top-space + paper-height + paper-width + pt + right-margin + short-indent + staff-height + staff-space + top-margin))) (define (calc-line-thickness staff-space pt) ;; linear interpolation. @@ -50,7 +71,7 @@ (setm! 'line-thickness (calc-line-thickness ss pt)) ;; sync with feta - (setm! 'ledgerline-thickness (+ (* 0.5 pt) (/ ss 10))) + (setm! 'ledger-line-thickness (+ (* 0.5 pt) (/ ss 10))) ;; sync with feta (setm! 'blot-diameter (* 0.4 pt)) @@ -223,7 +244,7 @@ size. SZ is in points" (cond ((not is-paper?) - (ly:warning (_ "This is not a \\layout {} object, ~S" module))) + (ly:warning (_ "This is not a \\layout {} object, ~S") module)) ((pair? entry) (set! entry (eval (cdr entry) module)) @@ -235,7 +256,7 @@ size. SZ is in points" (module-define! module 'landscape (if landscape? #t #f))) (else - (ly:warning (_ "Unknown papersize: ~a" name)))))) + (ly:warning (_ "Unknown paper size: ~a") name))))) (define-safe-public (set-default-paper-size name . rest) (internal-set-paper-size