X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fpaper.scm;h=8c2b5dc71025a7e18fe5deef9dd5c866e8ff560a;hb=2f996385b21b9d5006c7369c2c496ccbee001e97;hp=0f747a15649e3e68f6e8b56d8cf8ab7f1969253c;hpb=ffe9abeff111a8342ab82e6f203aa405336e010b;p=lilypond.git diff --git a/scm/paper.scm b/scm/paper.scm index 0f747a1564..8c2b5dc710 100644 --- a/scm/paper.scm +++ b/scm/paper.scm @@ -2,54 +2,77 @@ ;;;; ;;;; source file of the GNU LilyPond music typesetter ;;;; -;;;; (c) 2004 Han-Wen Nienhuys +;;;; (c) 2004--2007 Han-Wen Nienhuys (define-public (set-paper-dimension-variables mod) (module-define! mod 'dimension-variables - '(pt mm cm in staffheight staff-space - betweensystemspace betweensystempadding - linewidth indent hsize vsize - staffspace linethickness ledgerlinethickness - blotdiameter interscoreline leftmargin rightmargin))) + '(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))) + +(define (calc-line-thickness staff-space pt) + ;; linear interpolation. + + ;; !! synchronize with feta-params.mf + (let* + ((x1 (* 4.125 pt)) + (x0 (* 5 pt)) + (f1 (* 0.47 pt)) + (f0 (* 0.50 pt))) + + (/ + (+ + (* f1 (- staff-space x0)) + (* f0 (- x1 staff-space))) + (- x1 x0)))) + +(define-public (layout-set-absolute-staff-size-in-module module staff-height) + (let* + ((pt (eval 'pt module)) + (ss (/ staff-height 4)) + (factor (/ staff-height (* 20 pt))) + (setm! (lambda (sym val) + (module-define! module sym val)))) + + (setm! 'text-font-size (* 12 factor)) + + (setm! 'output-scale ss) + (setm! 'fonts + (if tex-backend? + (make-cmr-tree factor) + (make-century-schoolbook-tree factor))) + (setm! 'staff-height staff-height) + (setm! 'staff-space ss) -(define-public (layout-set-staff-size sz) - "Function to be called inside a \\layout{} block to set the staff size." - (let* ((m (current-module)) - (ss (/ sz 4)) - (pt (eval 'pt m)) + (setm! 'line-thickness (calc-line-thickness ss pt)) - - ;; linear interpolation. - (x1 (* 4.125 pt)) - (x0 (* 5 pt)) - (f1 (* 0.47 pt)) - (f0 (* 0.50 pt)) - (lt (/ - (+ - (* f1 (- ss x0)) - (* f0 (- x1 ss))) - (- x1 x0))) - - (mm (eval 'mm m))) + ;; sync with feta + (setm! 'ledgerline-thickness (+ (* 0.5 pt) (/ ss 10))) - (module-define! m 'outputscale ss) - (module-define! m 'fonts (make-cmr-tree (/ sz (* 20 pt)))) - (module-define! m 'staffheight sz) - (module-define! m 'staff-space ss) - (module-define! m 'staffspace ss) + ;; sync with feta + (setm! 'blot-diameter (* 0.4 pt)) + )) + +(define-public (layout-set-absolute-staff-size sz) + "Function to be called inside a \\layout{} block to set the staff +size. SZ is in points" + (layout-set-absolute-staff-size-in-module (current-module) sz)) + +(define-public (layout-set-staff-size sz) + "Function to be called inside a \\layout{} block to set the staff +size. SZ is in points" - ;; !! synchronize with feta-params.mf - (module-define! m 'linethickness lt) - (module-define! m 'ledgerlinethickness (+ (* 0.5 pt) (/ ss 10))) - (module-define! m 'blotdiameter (* 0.35 pt)) - (module-define! m 'interscoreline (* 4 mm)))) + (layout-set-absolute-staff-size (* (eval 'pt (current-module)) sz))) -(define-public (set-global-staff-size sz) +(define-safe-public (set-global-staff-size sz) "Set the default staff size, where SZ is thought to be in PT." - (let* ((old-mod (current-module)) - (pap (eval '$defaultpaper old-mod)) - (in-layout? (or (module-defined? old-mod 'is-paper) - (module-defined? old-mod 'is-layout))) + (let* ((current-mod (current-module)) + (pap (eval '$defaultpaper current-mod)) + (in-layout? (or (module-defined? current-mod 'is-paper) + (module-defined? current-mod 'is-layout))) ; maybe not necessary. ; but let's be paranoid. Maybe someone still refers to the @@ -59,40 +82,44 @@ (new-scope (ly:output-def-scope new-paper))) (if in-layout? - (ly:warn "Not in toplevel scope")) - (set-current-module new-scope) - (layout-set-staff-size (* sz (eval 'pt new-scope))) - (set-current-module old-mod) - (module-define! old-mod '$defaultpaper new-paper))) + (ly:warning (_ "set-global-staff-size: not in toplevel scope"))) + + (layout-set-absolute-staff-size-in-module new-scope + (* sz (eval 'pt new-scope))) + (module-define! current-mod '$defaultpaper new-paper))) (define-public paper-alist - '(("a6" . (cons (* 105 mm) (* 148.95 mm))) - ("a5" . (cons (* 148.95 mm) (* 210 mm))) - ("a4" . (cons (* 210 mm) (* 297.9 mm))) - ("a3" . (cons (* 297.9 mm) (* 420 mm))) + + ;; don't use decimals. + ;; ISO 216 has a tolerance of +- 2mm + + '(("a7" . (cons (* 74 mm) (* 105 mm))) + ("a6" . (cons (* 105 mm) (* 148 mm))) + ("a5" . (cons (* 148 mm) (* 210 mm))) + ("a4" . (cons (* 210 mm) (* 297 mm))) + ("a3" . (cons (* 297 mm) (* 420 mm))) ("legal" . (cons (* 8.5 in) (* 14.0 in))) ("letter" . (cons (* 8.5 in) (* 11.0 in))) - ("tabloid" . (cons (* 11.0 in) (* 17.0 in))))) + ("11x17" . (cons (* 11.0 in) (* 17.0 in))) + )) ;; todo: take dimension arguments. (define (set-paper-dimensions m w h) "M is a module (i.e. layout->scope_ )" (let* ((mm (eval 'mm m))) - (module-define! m 'hsize w) - (module-define! m 'vsize h) - (module-define! m 'linewidth (- w (* 20 mm))) + (module-define! m 'paper-width w) + (module-define! m 'paper-height h) + (module-define! m 'line-width (- w + (ly:modules-lookup (list m) 'left-margin (* 10 mm)) + (ly:modules-lookup (list m) 'right-margin (* 10 mm)))) + (module-define! m 'indent (/ w 14)) + (module-define! m 'short-indent (* 5 mm)) ;; page layout - what to do with (printer specific!) margin settings? - (module-define! m 'topmargin (* 5 mm)) - (module-define! m 'bottommargin (* 6 mm)) - (module-define! m 'headsep (* 4 mm)) - (module-define! m 'footsep (* 4 mm)) - (module-define! m 'leftmargin #f) - (module-define! m 'firstpagenumber 1) - (module-define! m 'printfirstpagenumber #f) - (module-define! m 'rightmargin (* 10 mm)))) + + )) (define (internal-set-paper-size module name landscape?) (define (swap x) @@ -104,8 +131,7 @@ (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)) @@ -114,13 +140,12 @@ (set-paper-dimensions module (car entry) (cdr entry)) (module-define! module 'papersizename name) - - (if landscape? - (module-define! module 'landscape #t))) + (module-define! module 'landscape + (if landscape? #t #f))) (else - (ly:warn (string-append "Unknown papersize: " name)))))) + (ly:warning (_ "Unknown papersize: ~a" name)))))) -(define-public (set-default-paper-size name . rest) +(define-safe-public (set-default-paper-size name . rest) (internal-set-paper-size (ly:output-def-scope (eval '$defaultpaper (current-module))) name @@ -133,7 +158,7 @@ ;;; TODO: should raise (generic) exception with throw, and catch ;;; that in parse-scm.cc - (ly:warn "Must use #(set-paper-size .. ) within \\paper { ... }"))) + (ly:warning (_ "Must use #(set-paper-size .. ) within \\paper { ... }")))) (define-public (scale-layout pap scale) (let* ((new-pap (ly:output-def-clone pap)) @@ -150,8 +175,8 @@ (module-define! scope v (/ val scale)) - ;; spurious warnings, eg. for hsize, vsize. - ;; (ly:warn "not a number, ~S = ~S " v val) + ;; spurious warnings, eg. for paper-width, paper-height. + ;; (ly:warning (_ "not a number, ~S = ~S " v val)) ))) dim-vars)