Merge branch 'jneeman' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond into jneeman

[lilypond.git] / scm / paper.scm

diff --git a/scm/paper.scm b/scm/paper.scm
index 666745faf4c8b6097543525681fbbc6b1071be12..6c0c031c02aa1ccb905dac3d9fddc358eb37afe1 100644 (file)
--- a/scm/paper.scm
+++ b/scm/paper.scm
@@ -78,10 +78,10 @@
   ;; 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)))
@@ -94,7 +94,10 @@
   (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?