Merge branch 'lilypond/translation' of ssh://git.sv.gnu.org/srv/git/lilypond into...

[lilypond.git] / scm / paper.scm

diff --git a/scm/paper.scm b/scm/paper.scm
index 0ff9fbc8521712ae5ca1651d2e8e2670c43d5f32..48f4a46cb1a5645ccf7808cf36d64ec7f70b7d65 100644 (file)
--- a/scm/paper.scm
+++ b/scm/paper.scm
@@ -2,16 +2,11 @@
 ;;;;
 ;;;;  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
-                 '(after-title-space
-                   before-title-space
-                   between-system-padding
-                   between-system-space
-                   between-title-space
-                   blot-diameter
+                 '(blot-diameter
                    bottom-margin
                    cm
                    foot-separation
@@ -24,7 +19,6 @@
                    line-thickness
                    line-width
                    mm
-                   page-top-space
                    paper-height
                    paper-width
                    pt
@@ -61,10 +55,7 @@
     (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)
 
@@ -244,7 +235,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))
@@ -256,7 +247,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