;;;;
;;;; source file of the GNU LilyPond music typesetter
;;;;
-;;;; (c) 2004--2006 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;; (c) 2004--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
(define-public (set-paper-dimension-variables mod)
(module-define! mod 'dimension-variables
;; 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)))
+ ("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)))
("11x17" . (cons (* 11.0 in) (* 17.0 in)))
(let* ((mm (eval 'mm m)))
(module-define! m 'paper-width w)
(module-define! m 'paper-height h)
- (module-define! m 'line-width (- w (* 20 mm)))
+ (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))
;; page layout - what to do with (printer specific!) margin settings?