Require log file if -dseparate-log-files is specified.

[lilypond.git] / scm / font.scm

diff --git a/scm/font.scm b/scm/font.scm
index 4173aa424269b79281269354cb1056538fa1f183..eefc1c26ee9627316e43e11e09101d9e4ceebbe2 100644 (file)
--- a/scm/font.scm
+++ b/scm/font.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c) 2004--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+;;;; (c) 2004--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 ;; TODO:
 ;;
@@ -322,6 +322,7 @@
                       (ly:pt 12)))))))
 
   (add-node 'upright 'normal) 
+  (add-node 'caps 'normal) 
   (add-node 'upright 'bold) 
   (add-node 'italic 'normal)
   (add-node 'italic 'bold))
@@ -358,5 +359,8 @@
     "Century Schoolbook L" 
     "Sans" "Mono" factor))
 
-(define-public (magstep x)
-  (exp (* (/ x 6) (log 2))))
+(define-public (magstep s)
+  (exp (* (/ s 6) (log 2))))
+
+(define-public (magnification->font-size m)
+  (* 6 (/ (log m) (log 2))))