*** empty log message ***

[lilypond.git] / scm / paper.scm

diff --git a/scm/paper.scm b/scm/paper.scm
index 8fd0b9a2f243e7acee3b53181870cb43861b0968..04ab27045b4c17244a733116fdb811a83fd069a9 100644 (file)
--- a/scm/paper.scm
+++ b/scm/paper.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c)  2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;; (c) 2004--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 
 (define-public (set-paper-dimension-variables mod)
   (module-define! mod 'dimension-variables
@@ -32,9 +32,14 @@
         
         (mm (eval 'mm m)))
 
-    (module-define! m 'text-font-size (* 12 (/ sz 20)))
+    (module-define! m 'text-font-size (* 12 (/ sz (* 20 pt))))
+    
     (module-define! m 'outputscale ss)
-    (module-define! m 'fonts (make-cmr-tree (/  sz (* 20 pt))))
+    (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-space ss)
     (module-define! m 'staffspace ss)
@@ -45,7 +50,7 @@
     (module-define! m 'blotdiameter (* 0.35 pt))
     (module-define! m 'interscoreline (* 4 mm))))
 
-(define-public (set-global-staff-size sz)
+(define-safe-public (set-global-staff-size sz)
   "Set the default staff size, where SZ is thought to be in PT."
   (let* ((old-mod (current-module))
         (pap (eval '$defaultpaper old-mod))
@@ -121,7 +126,7 @@
      (else
       (ly:warn (string-append "Unknown papersize: " name))))))
 
-(define-public (set-default-paper-size name . rest)
+(define-safe-public (set-default-paper-size name . rest)
   (internal-set-paper-size
    (ly:output-def-scope (eval '$defaultpaper (current-module)))
    name