Fix some bugs in the dynamic engraver and PostScript backend

[lilypond.git] / scm / paper.scm

diff --git a/scm/paper.scm b/scm/paper.scm
index 1ee7fc31792f9cbb8ed7f95884fe4012f030e2f2..dae489f9b3511573f4730963e51aeb4c47dffffb 100644 (file)
--- a/scm/paper.scm
+++ b/scm/paper.scm
@@ -6,12 +6,12 @@
 
 (define-public (set-paper-dimension-variables mod)
   (module-define! mod 'dimension-variables
-                 '(pt mm cm in staffheight staff-space
-                      pagetopspace
-                      betweensystemspace betweensystempadding
-                      linewidth indent hsize vsize horizontalshift
-                      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."
@@ -35,21 +35,21 @@
 
     (module-define! m 'text-font-size (* 12 (/ sz (* 20 pt))))
     
-    (module-define! m 'outputscale ss)
+    (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 'staffheight sz)
+    (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.4 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-safe-public (set-global-staff-size sz)
   "Set the default staff size, where SZ is thought to be in PT."
@@ -73,11 +73,15 @@
     (module-define! old-mod '$defaultpaper new-paper)))
 
 (define-public paper-alist
-  '(("a7" . (cons (* 74.48 mm) (* 105 mm)))
-    ("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)))
     ("11x17" . (cons (* 11.0 in) (* 17.0 in)))
@@ -88,9 +92,9 @@
 (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?
@@ -152,7 +156,7 @@
             (module-define! scope v
                             (/ val scale))
 
-            ;; spurious warnings, eg. for hsize, vsize. 
+            ;; spurious warnings, eg. for paper-width, paper-height. 
             ;; (ly:warning (_ "not a number, ~S = ~S " v  val))
             )))