X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fpaper.scm;h=d3e299ddd80c4bd4d0646b16101067f9e014620d;hb=f1d34682d29f5c714cb4b02221043da5ae1e659c;hp=951addf12d621e8e00ca81f5cbc54e0c26756819;hpb=46153fde3123b7c01c27d30328e71deb366ac2a9;p=lilypond.git

diff --git a/scm/paper.scm b/scm/paper.scm
index 951addf12d..d3e299ddd8 100644
--- a/scm/paper.scm
+++ b/scm/paper.scm
@@ -2,16 +2,37 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c) 2004--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+;;;; (c) 2004--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 (define-public (set-paper-dimension-variables mod)
   (module-define! mod 'dimension-variables
-		  '(pt mm cm in staff-height staff-space
-		       page-top-space
-		       between-system-space between-system-padding
-		       line-width indent short-indent paper-width paper-height horizontal-shift
-		       staff-space line-thickness ledgerline-thickness
-		       blot-diameter left-margin right-margin)))
+		  '(after-title-space
+		    before-title-space
+		    between-system-padding
+		    between-system-space
+		    between-title-space
+		    blot-diameter
+		    bottom-margin
+		    cm
+		    foot-separation
+		    head-separation
+		    horizontal-shift
+		    in
+		    indent
+		    ledger-line-thickness
+		    left-margin
+		    line-thickness
+		    line-width
+		    mm
+		    page-top-space
+		    paper-height
+		    paper-width
+		    pt
+		    right-margin
+		    short-indent
+		    staff-height
+		    staff-space
+		    top-margin)))
 
 (define (calc-line-thickness staff-space pt)
   ;; linear interpolation.
@@ -40,17 +61,14 @@
     (setm! 'text-font-size (* 12 factor))
     
     (setm! 'output-scale ss)
-    (setm! 'fonts
-		    (if tex-backend?
-			(make-cmr-tree factor)
-			(make-century-schoolbook-tree factor)))
+    (setm! 'fonts (make-century-schoolbook-tree factor))
     (setm! 'staff-height staff-height)
     (setm! 'staff-space ss)
 
     (setm! 'line-thickness (calc-line-thickness ss pt))
 
     ;;  sync with feta  
-    (setm! 'ledgerline-thickness (+ (* 0.5 pt) (/ ss 10)))
+    (setm! 'ledger-line-thickness (+ (* 0.5 pt) (/ ss 10)))
 
     ;;  sync with feta  
     (setm! 'blot-diameter (* 0.4 pt))
@@ -207,7 +225,7 @@ size. SZ is in points"
 				     (ly:modules-lookup (list m) 'right-margin (* 10 mm))))
 
     (module-define! m 'indent (/ w 14))
-    (module-define! m 'short-indent (* 5 mm))
+    (module-define! m 'short-indent 0)
 
     ;; page layout - what to do with (printer specific!) margin settings?
 
@@ -223,7 +241,7 @@ size. SZ is in points"
     
     (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))
@@ -235,7 +253,7 @@ size. SZ is in points"
       (module-define! module 'landscape 
 		      (if landscape? #t #f)))
      (else
-      (ly:warning (_ "Unknown papersize: ~a" name))))))
+      (ly:warning (_ "Unknown paper size: ~a") name)))))
 
 (define-safe-public (set-default-paper-size name . rest)
   (internal-set-paper-size