X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fpaper.scm;h=5cd99e70cdbda708e8809f464d54a18d40bace43;hb=d9f0a129bd864743b639c499366bbccf79d27323;hp=8fd0b9a2f243e7acee3b53181870cb43861b0968;hpb=98ba77f9a972c75e431f29a47df18676c3d65621;p=lilypond.git diff --git a/scm/paper.scm b/scm/paper.scm index 8fd0b9a2f2..5cd99e70cd 100644 --- a/scm/paper.scm +++ b/scm/paper.scm @@ -2,15 +2,16 @@ ;;;; ;;;; source file of the GNU LilyPond music typesetter ;;;; -;;;; (c) 2004 Han-Wen Nienhuys +;;;; (c) 2004--2006 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 paper-width paper-height horizontal-shift + staff-space line-thickness ledgerline-thickness + blot-diameter left-margin right-margin))) (define-public (layout-set-staff-size sz) "Function to be called inside a \\layout{} block to set the staff size." @@ -32,20 +33,25 @@ (mm (eval 'mm m))) - (module-define! m 'text-font-size (* 12 (/ sz 20))) - (module-define! m 'outputscale ss) - (module-define! m 'fonts (make-cmr-tree (/ sz (* 20 pt)))) - (module-define! m 'staffheight sz) + (module-define! m 'text-font-size (* 12 (/ sz (* 20 pt)))) + + (module-define! m 'output-scale ss) + (module-define! m 'fonts + (if tex-backend? + (make-cmr-tree (/ sz (* 20 pt))) + (make-century-schoolbook-tree + (/ sz (* 20 pt))))) + (module-define! m 'staff-height sz) + (module-define! m 'staff-space ss) (module-define! m 'staff-space ss) - (module-define! m 'staffspace ss) ;; !! 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)))) + (module-define! m 'line-thickness lt) + (module-define! m 'ledgerline-thickness (+ (* 0.5 pt) (/ ss 10))) + (module-define! m 'blot-diameter (* 0.4 pt)) + )) -(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)) @@ -60,40 +66,40 @@ (new-scope (ly:output-def-scope new-paper))) (if in-layout? - (ly:warn "Not in toplevel scope")) + (ly:warning (_ "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))) (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) (* 149 mm))) + ("a5" . (cons (* 149 mm) (* 210 mm))) + ("a4" . (cons (* 210 mm) (* 298 mm))) + ("a3" . (cons (* 298 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 (* 20 mm))) (module-define! m 'indent (/ w 14)) ;; 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) @@ -105,8 +111,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)) @@ -115,13 +120,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 @@ -134,7 +138,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)) @@ -151,8 +155,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)