Merge branch 'master' of git://git.sv.gnu.org/lilypond

[lilypond.git] / scm / font.scm

diff --git a/scm/font.scm b/scm/font.scm
index 2dd29cc9d49953672374295207e965bd700969db..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--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+;;;; (c) 2004--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 ;; TODO:
 ;;
@@ -34,9 +34,11 @@
 (define-method (display (leaf <Font-tree-leaf>) port)
   (map (lambda (x) (display x port))
        (list
-       "Font-size-family: \n"
+       "#<Font-size-family: \n"
        (slot-ref leaf 'default-size) 
-       (slot-ref leaf 'size-vector))))
+       (slot-ref leaf 'size-vector)
+       "#>"
+       )))
 
 (define-method (display (node <Font-tree-node>) port)
 
@@ -66,6 +68,7 @@
 (define-method (add-font (node <Font-tree-node>) fprops size-family)
   (define (assoc-delete key alist)
     (assoc-remove! (list-copy alist) key))
+  
   (define (make-node fprops size-family)
     (if (null? fprops)
        (make-font-tree-leaf (car size-family) (cdr size-family))
@@ -319,20 +322,24 @@
                       (ly:pt 12)))))))
 
   (add-node 'upright 'normal) 
+  (add-node 'caps 'normal) 
   (add-node 'upright 'bold) 
   (add-node 'italic 'normal)
   (add-node 'italic 'bold))
 
 (define-public (make-cmr-tree factor)
-  (let ((n (make-font-tree-node 'font-encoding 'fetaMusic)))
+  (let*
+      ((n (make-font-tree-node 'font-encoding 'fetaMusic))
+       (module (resolve-module '(scm kpathsea)))
+       (find (eval 'ly:kpathsea-find-file module))
+       )
     (add-music-fonts n factor)
     (add-cmr-fonts n factor)
-    (if (defined? 'ly:kpathsea-find-file)
-       (begin
-         (if (ly:kpathsea-find-file "lmr10.pfb")
-             (add-cork-lm-fonts n factor))
-         (if (ly:kpathsea-find-file "ecrm10.pfa")
-             (add-ec-fonts n factor))))
+    
+    (if (find "lmr10.pfb")
+       (add-cork-lm-fonts n factor))
+    (if (find "ecrm10.pfa")
+       (add-ec-fonts n factor))
     n))
 
 
@@ -352,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))))