X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Ffont.scm;h=eefc1c26ee9627316e43e11e09101d9e4ceebbe2;hb=8bb707c295338bb85ec28ebc8a6d9465fa43a69e;hp=bede4008e233863f7dba59c11a58549b7ef0d806;hpb=b2af7c63b35227778a5368e40d0e72ff6c769dbf;p=lilypond.git

diff --git a/scm/font.scm b/scm/font.scm
index bede4008e2..eefc1c26ee 100644
--- a/scm/font.scm
+++ b/scm/font.scm
@@ -2,27 +2,16 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c) 2004--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
-
-;; As an excercise, do it with records.
-;; Should use GOOPS, really.
+;;;; (c) 2004--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 ;; TODO:
 ;;
 ;; lookup-font should be written in  C.
 ;;
-;; should dump tree to .texi as internal documentation
-;; 
-;; * should extract design sizes from fonts: fonts should 
-;; be read off the disk, on demand, something like:
-;;  
-;; cmr -> ((font-load "cmr6") (font-load "cmr8")  .. )
-;;
 
 (define-class <Font-tree-element>
   ())
 
-
 (define-class <Font-tree-leaf> (<Font-tree-element>)
   (default-size #:init-keyword #:default-size)
   (size-vector  #:init-keyword #:size-vector))
@@ -45,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)
 
@@ -77,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))
@@ -133,25 +125,32 @@
 (define (lookup-font node alist-chain)
   (g-lookup-font node alist-chain))
 
-					;
-					; Each size family is a vector of fonts, loaded with a delay.
-					; The vector should be sorted according to ascending design size.
-					;
+;; Each size family is a vector of fonts, loaded with a delay.  The
+;; vector should be sorted according to ascending design size.
 (define feta-alphabet-size-vector
-  (list->vector
-   (map (lambda (tup)
-	  (cons (ly:pt (cdr tup))
-		(format "feta-alphabet~a ~a"
-			(car tup)
-			(ly:pt (cdr tup)))))
-	'((11 . 11.22)
-	  (13 . 12.60)
-	  (14 .  14.14)
-	  (16 . 15.87)
-	  (18 . 17.82)
-	  (20 . 20)
-	  (23 . 22.45)
-	  (26 . 25.20)))))
+  (if (defined? 'ly:kpathsea-find-file)
+      `#(,(delay  (ly:font-load "feta-alphabet11"))
+	 ,(delay  (ly:font-load "feta-alphabet13"))
+	 ,(delay  (ly:font-load "feta-alphabet14"))
+	 ,(delay  (ly:font-load "feta-alphabet16"))
+	 ,(delay  (ly:font-load "feta-alphabet18"))
+	 ,(delay  (ly:font-load "feta-alphabet20"))
+	 ,(delay  (ly:font-load "feta-alphabet23"))
+	 ,(delay  (ly:font-load "feta-alphabet26")))
+      (list->vector
+       (map (lambda (tup)
+	      (cons (ly:pt (cdr tup))
+		    (format "feta-alphabet~a ~a"
+			    (car tup)
+			    (ly:pt (cdr tup)))))
+	    '((11 . 11.22)
+	      (13 . 12.60)
+	      (14 .  14.14)
+	      (16 . 15.87)
+	      (18 . 17.82)
+	      (20 . 20)
+	      (23 . 22.45)
+	      (26 . 25.20))))))
 
 (define-public (add-music-fonts node factor)
   (for-each
@@ -313,7 +312,7 @@
 		(font-encoding . latin1) ;; ugh.
 		)
 	      
-	      `(,(ly:pt (* factor 12.0))
+	      `(,(ly:pt (* factor 11.0))
 		. #(,(cons
 		     (ly:pt 12)
 		     (ly:make-pango-description-string
@@ -323,27 +322,45 @@
 		       (ly:pt 12)))))))
 
   (add-node 'upright 'normal) 
+  (add-node 'caps 'normal) 
   (add-node 'upright 'bold) 
   (add-node 'italic 'normal)
-  (add-node 'italic 'bold)
-  )
+  (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 (ly:kpathsea-find-file "lmr10.pfb")
+    
+    (if (find "lmr10.pfb")
 	(add-cork-lm-fonts n factor))
-    (if (ly:kpathsea-find-file "ecrm10.pfa")
+    (if (find "ecrm10.pfa")
 	(add-ec-fonts n factor))
     n))
 
-(define-public (make-century-schoolbook-tree factor)
+
+
+
+(define-public (make-pango-font-tree roman-str sans-str typewrite-str factor)
   (let ((n (make-font-tree-node 'font-encoding 'fetaMusic)))
     (add-music-fonts n factor)
-    (add-pango-fonts n 'roman "Century Schoolbook L" factor)
-    (add-pango-fonts n 'sans "Luxi Sans" factor)
+    (add-pango-fonts n 'roman roman-str factor)
+    (add-pango-fonts n 'sans sans-str factor)
+    (add-pango-fonts n 'typewriter typewrite-str factor)
     n))
 
-(define-public (magstep x)
-  (exp (* (/ x 6) (log 2))))
+
+(define-public (make-century-schoolbook-tree factor)
+  (make-pango-font-tree
+    "Century Schoolbook L" 
+    "Sans" "Mono" factor))
+
+(define-public (magstep s)
+  (exp (* (/ s 6) (log 2))))
+
+(define-public (magnification->font-size m)
+  (* 6 (/ (log m) (log 2))))