X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fpaper.scm;h=6c0c031c02aa1ccb905dac3d9fddc358eb37afe1;hb=5693fcf8ea6357d19f3f4960c81e443104424ab6;hp=f86aeb0161591d6f7a36b245e51dcc4fb6569012;hpb=81e278e6bdd27e41e05f8d336e8ace777c0b7a56;p=lilypond.git

diff --git a/scm/paper.scm b/scm/paper.scm
index f86aeb0161..6c0c031c02 100644
--- a/scm/paper.scm
+++ b/scm/paper.scm
@@ -2,16 +2,16 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c) 2004--2005 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
-		  '(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) (* 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)))
@@ -88,20 +92,17 @@
 (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))
 
     ;; 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)
@@ -122,11 +123,10 @@
       (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:warning (_ ("Unknown papersize: ~a" name)))))))
+      (ly:warning (_ "Unknown papersize: ~a" name))))))
 
 (define-safe-public (set-default-paper-size name . rest)
   (internal-set-paper-size
@@ -158,7 +158,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))
 	     )))