X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Ffont.scm;h=921cddeb06d9c860a02148fbb4d6d7da11d796fa;hb=1487d6190220ca2952b09e4539b794f7c56684a9;hp=7118c072056539aa6eb52f332722c685e998a1ce;hpb=12186b6828aee7aa298076d684835d629b757f2a;p=lilypond.git

diff --git a/scm/font.scm b/scm/font.scm
index 7118c07205..921cddeb06 100644
--- a/scm/font.scm
+++ b/scm/font.scm
@@ -1,120 +1,380 @@
-;;;; font.scm -- implement Font stuff
+;;;; font.scm -- construct font trees
 ;;;;
-;;;; source file of the GNU LilyPond music typesetter
+;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c)  2000--2004 Jan Nieuwenhuizen <janneke@gnu.org>
-;;;;                 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;; (c) 2004 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-;; Should separate default sizes
-;; into separate list/alist ?
+;; As an excercise, do it with records.
+;; Should use GOOPS, really.
 
+;; 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")  .. )
+;;
 
-"
-Each entry in this vector has the following format
+(define-class <Font-tree-element>
+  ())
 
 
- (cons
-  #(QUALIFIERS)
-  (cons DEFAULT-SIZE
-        #(SIZE-FONT-ENTRIES... ) ))
+(define-class <Font-tree-leaf> (<Font-tree-element>)
+  (default-size #:init-keyword #:default-size)
+  (size-vector  #:init-keyword #:size-vector))
 
-where each SIZE-FONT-ENTRY is
+(define-class <Font-tree-node> (<Font-tree-element>)
+  (qualifier #:init-keyword #:qualifier  #:accessor font-qualifier)
+  (default #:init-keyword #:default #:accessor font-default)
+  (children #:init-keyword #:children #:accessor font-children))
 
-  (cons DESIGN-SIZE FONT-NAME)
+(define (make-font-tree-leaf size size-font-vector)
+  (make <Font-tree-leaf> #:default-size size #:size-vector size-font-vector))
 
-or
+(define (make-font-tree-node
+	 qualifier default)
+  (make <Font-tree-node>
+    #:qualifier qualifier
+    #:default default 
+    #:children (make-hash-table 11)))
 
-  (cons DESIGN-SIZE (list FONT-NAME1 FONT-NAME2 .. )) 
+(define-method (display (leaf <Font-tree-leaf>) port)
+  (map (lambda (x) (display x port))
+       (list
+	"Font-size-family: \n"
+	(slot-ref leaf 'default-size) 
+	(slot-ref leaf 'size-vector) )))
 
-"
+(define-method (display (node <Font-tree-node>) port)
+
+  (map
+   (lambda (x)
+     (display x port))
+
+   (list
+    "Font_node { \nqual: "
+    (font-qualifier node)
+    "(def: "
+    (font-default node)
+    ") {\n"))
+  (for-each 
+   (lambda (x)
+     (display "\n")
+     (display (car x) port)
+     (display "=" port)
+     (display (cdr x) port))
+   (hash-table->alist (font-children node)))
+  (display "} } \n"))
+
+
+(define default-qualifier-order
+  '(font-encoding font-family font-shape font-series))
+
+(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))
+	(let*
+	    ((qual (next-qualifier default-qualifier-order fprops)))
+	  (make-font-tree-node qual
+			       (assoc-get qual fprops)))))
+
+  (define (next-qualifier order props)
+    (cond
+     ((and (null? props) (null? order))
+      #f)
+     ((null? props) (car order))
+     ((null? order) (caar props))
+     (else
+      (if (assoc-get (car order) props)
+	  (car order)
+	  (next-qualifier (cdr order) props)))))
+
+
+  (let*
+      ((q (font-qualifier node))
+       (d (font-default node))
+       (v (assoc-get q fprops d))
+       (new-fprops (assoc-delete q fprops))
+       (child (hashq-ref (slot-ref node 'children)
+			 v #f)))
+
+
+    (if (not child)
+	(begin
+	  (set! child (make-node new-fprops size-family))
+	  (hashq-set! (slot-ref node 'children) v child)))
+    (if (pair? new-fprops)
+	(add-font child new-fprops size-family))))
+
+
+(define-method (add-font (node <Font-tree-leaf>) fprops size-family)
+  (throw "must add to node, not leaf"))
+
+
+(define-method (g-lookup-font (node <Font-tree-node>) alist-chain)
+  (let*
+      ((qual (font-qualifier node))
+       (def (font-default node))
+       (val (chain-assoc-get qual alist-chain def))
+       (desired-child (hashq-ref (font-children node) val)))
+
+    (if desired-child
+	(g-lookup-font desired-child alist-chain)
+	(g-lookup-font (hashq-ref (font-children node) def) alist-chain))))
 
-(define-public (magstep x)
-  (exp (* (/ x 6) (log 2))))
 
-(define-public paper20-font-vector
-  '((#(medium upright number) .
-     (10 . #((10.0  . "feta-nummer10"))))
-    (#(medium upright roman) .
-     (10.0 . #((6.0 . "cmr6")
-	       (8.0 . "cmr8") 
-	       (10.0 . "cmr10")
-	       (17.0 . "cmr17")
-	       )))
-    (#(* * music). 
-     (20.0 . #((11.22 . ("feta11" "parmesan11"))
-	       (12.60 . ("feta13" "parmesan13"))
-	       (14.14 . ("feta14" "parmesan14"))
-	       (15.87 . ("feta16" "parmesan16"))
-	       (17.82 . ("feta18" "parmesan18"))
-	       (20.0 . ("feta20" "parmesan20"))
-	       (22.45 . ("feta23" "parmesan23"))
-	       (25.20 . ("feta26" "parmesan26"))
-	       )))
-    (#(medium upright sans) .
-     (10.0  . #((8.0 . "cmss8")
-		(10.0 . "cmss10")
-		(12.0 . "cmss12")
-		(17.0 . "cmss17")
-		)))
-    (#(medium upright typewriter) .
-     (10.0 . #((8.0 .  "cmtt8")
-	       (10.0 . "cmtt10")
-	       (12.0 . "cmtt12")
-	       )))
-    (#(bold italic roman) .
-     (10.0 . #((8.0 . "cmbxti8")
-	       (10.0 . "cmbxti10")
-	       (14.0 . "cmbxti14")
-	       )))
-    (#(medium italic roman) .
-     (10.0 . #((7.0 . "cmti7")
-	       (10.0 . "cmti10")
-	       (12.0 . "cmti12")
-	       )))
-    (#(bold upright roman) .
-     (10.0 . #((6.0 . "cmbx6")
-	       (8.0 . "cmbx8")
-	       (10.0 . "cmbx10")
-	       (12.0 . "cmbx12")
-	       )))
-    (#(bold-narrow upright roman) .
-     (10.0 . #((10.0 . "cmb10")
-	       )))
-    (#(medium caps roman) .
-     (10.0 . #((10.0 . "cmcsc10"))))
-
-    (#(* * dynamic) .
-     (14.0 .  #((6.0 . "feta-din6")
-		(8.0 . "feta-din8")
-		(10.0 . "feta-din10")
-		(12.0 . "feta-din10")
-		(14.0 . "feta-din14")
-		(17.0 . "feta-din17")
-		)))
-    (#(* * math) .
-     (10.0 . #((10.0 . "msam10"))))
-     ))
-
-(define (scale-font-entry entry factor)
-  (cons
-   (car entry)
-   (cons (* (cadr entry) factor)
-	 (cddr entry))))
-
-(define size-independent-fonts
-  '((#(* * braces) .
-     (10 . #((10.0 . ("feta-braces00"
-		      "feta-braces10"
-		      "feta-braces20"
-		      "feta-braces30"
-		      "feta-braces40"
-		      "feta-braces50"
-		      "feta-braces60"
-		      "feta-braces70"
-		      "feta-braces80")))))))
-
-(define-public (scale-font-list factor)
-  (append size-independent-fonts
-	  (map (lambda (y) (scale-font-entry y factor)) paper20-font-vector)))
+(define-method (g-lookup-font (node <Font-tree-leaf>) alist-chain)
+  node)
 
+;; two step call  is handy for debugging.
+(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.
+					;
+
+(define-public (add-music-fonts node factor)
+  (for-each
+   (lambda (x)
+     (add-font node
+	       (list (cons 'font-encoding (car x)))
+	       (cons (* factor (cadr x))
+		     (caddr x))))
+   `((fetaNumber 10
+		 #(,(delay (ly:font-load "feta-nummer4"))
+		   ,(delay (ly:font-load "feta-nummer6"))
+		   ,(delay (ly:font-load "feta-nummer8"))
+		   ,(delay (ly:font-load "feta-nummer10"))
+		   ,(delay (ly:font-load "feta-nummer12"))
+		   ,(delay (ly:font-load "feta-nummer16"))))
+     (fetaDynamic 14.0  #(,(delay (ly:font-load "feta-din6"))
+			  ,(delay (ly:font-load "feta-din8"))
+			  ,(delay (ly:font-load "feta-din10"))
+			  ,(delay (ly:font-load "feta-din12"))
+			  ,(delay (ly:font-load "feta-din14"))
+			  ,(delay (ly:font-load "feta-din17"))))
+
+     (fetaMusic 20.0
+		#(,(delay (ly:make-virtual-font
+			   (ly:font-load "feta11")
+			   (ly:font-load "parmesan11")))
+		  ,(delay (ly:make-virtual-font
+			   (ly:font-load "feta13")
+			   (ly:font-load "parmesan13")))
+		  ,(delay (ly:make-virtual-font
+			   (ly:font-load "feta14")
+			   (ly:font-load "parmesan14")))
+		  ,(delay (ly:make-virtual-font
+			   (ly:font-load "feta16")
+			   (ly:font-load "parmesan16")))
+		  ,(delay (ly:make-virtual-font
+			   (ly:font-load "feta18")
+			   (ly:font-load "parmesan18")))
+		  ,(delay (ly:make-virtual-font
+			   (ly:font-load "feta20")
+			   (ly:font-load "parmesan20")))
+		  ,(delay (ly:make-virtual-font
+			   (ly:font-load "feta23")
+			   (ly:font-load "parmesan23")))
+		  ,(delay (ly:make-virtual-font
+			   (ly:font-load "feta26")
+			   (ly:font-load "parmesan26")))))
+
+
+     (fetaBraces 15 #(,(delay
+			 (ly:make-virtual-font
+			  (ly:font-load "feta-braces-a")
+			  (ly:font-load "feta-braces-b")
+			  (ly:font-load "feta-braces-c")
+			  (ly:font-load "feta-braces-d")
+			  (ly:font-load "feta-braces-e")
+			  (ly:font-load "feta-braces-f")
+			  (ly:font-load "feta-braces-g")
+			  (ly:font-load "feta-braces-h")
+			  (ly:font-load "feta-braces-i"))))))))
+
+(define-public (add-cmr-fonts node factor)
+  (add-font node '((font-encoding . TeX-math))
+	    `(,(* factor 10) . #(,(delay (ly:font-load "msam10")))))
+  (for-each
+   (lambda (x)
+     (add-font node `((font-encoding . TeX-text)
+		      (font-series . ,(vector-ref (car x) 2))
+		      (font-shape . ,(vector-ref (car x) 1))
+		      (font-family . ,(vector-ref (car x) 0)))
+	       (cons (* factor (cadr x))
+		     (cddr x))))
+   `((#(roman upright medium) 
+      . (10.0 . #(,(delay (ly:font-load "cmr6"))
+		  ,(delay (ly:font-load "cmr8")) 
+		  ,(delay (ly:font-load "cmr10"))
+		  ,(delay (ly:font-load "cmr17")))))
+     (#(roman upright bold) 
+      . (10.0 . #(,(delay (ly:font-load "cmbx6"))
+		  ,(delay (ly:font-load "cmbx8"))
+		  ,(delay (ly:font-load "cmbx10"))
+		  ,(delay (ly:font-load "cmbx12")))))
+     (#(roman italic medium) 
+      . (10.0 . #(,(delay (ly:font-load "cmti7"))
+		  ,(delay (ly:font-load "cmti10"))
+		  ,(delay (ly:font-load "cmti12")))))
+     (#(roman italic bold) 
+      . (10.0 . #(,(delay (ly:font-load "cmbxti8"))
+		  ,(delay (ly:font-load "cmbxti10"))
+		  ,(delay (ly:font-load "cmbxti14")))))
+     (#(roman caps medium) 
+      . (10.0 . #(,(delay (ly:font-load "cmcsc10")))))
+     (#(roman upright bold-narrow ) 
+      . (10.0 . #(,(delay (ly:font-load "cmb10")))))
+     (#(sans upright medium) 
+      . (10.0  . #(,(delay (ly:font-load "cmss8"))
+		   ,(delay (ly:font-load "cmss10"))
+		   ,(delay (ly:font-load "cmss12"))
+		   ,(delay (ly:font-load "cmss17")))))
+     (#(typewriter upright medium) 
+      . (10.0 . #(,(delay (ly:font-load "cmtt8"))
+		  ,(delay (ly:font-load "cmtt10"))
+		  ,(delay (ly:font-load "cmtt12"))))))))
+
+;; Debian lmodern font support.
+(define-public (add-cork-lm-fonts node factor)
+  (for-each
+   (lambda (x)
+     (add-font node `((font-encoding . cork-lm)
+		      (font-series . ,(vector-ref (car x) 2))
+		      (font-shape . ,(vector-ref (car x) 1))
+		      (font-family . ,(vector-ref (car x) 0)))
+	       (cons (* factor (cadr x)) (cddr x))))
+   `((#(roman upright medium) 
+      . (10.0 . #(,(delay (ly:font-load "lmr6"))
+		  ,(delay (ly:font-load "lmr8"))
+		  ,(delay (ly:font-load "lmr10"))
+		  ,(delay (ly:font-load "lmr17")))))
+     (#(roman upright bold) 
+      . (10.0 . #(,(delay (ly:font-load "lmbx6"))
+		  ,(delay (ly:font-load "lmbx8"))
+		  ,(delay (ly:font-load "lmbx10"))
+		  ,(delay (ly:font-load "lmbx12")))))
+     (#(roman italic medium) 
+      . (10.0 . #(,(delay (ly:font-load "lmri7"))
+		  ,(delay (ly:font-load "lmri10"))
+		  ,(delay (ly:font-load "lmri12")))))
+     (#(roman italic bold)
+      . (10.0 . #(,(delay (ly:font-load "lmbxi10")))))
+     (#(roman caps medium)
+      . (10.0 . #(,(delay (ly:font-load "lmcsc10")))))
+     (#(roman upright bold-narrow ) 
+      . (10.0 . #(,(delay (ly:font-load "lmb10")))))
+     (#(sans upright medium) 
+      . (10.0  . #(,(delay (ly:font-load "lmss8"))
+		   ,(delay (ly:font-load "lmss10"))
+		   ,(delay (ly:font-load "lmss12"))
+		   ,(delay (ly:font-load "lmss17")))))
+     (#(sans upright bold) 
+      . (10.0  . #(,(delay (ly:font-load "lmssbx10")))))
+
+     (#(typewriter upright medium) 
+      . (10.0 . #(,(delay (ly:font-load "lmtt8"))
+		  ,(delay (ly:font-load "lmtt10"))
+		  ,(delay (ly:font-load "lmtt12"))))))))
+
+;; ec-fonts-mftraced font support.
+(define-public (add-ec-fonts node factor)
+  (for-each
+   (lambda (x) (add-font node
+			 `((font-encoding . ec)
+			   (font-series . ,(vector-ref (car x) 2))
+			   (font-shape . ,(vector-ref (car x) 1))
+			   (font-family . ,(vector-ref (car x) 0)))
+			 (cons (* factor (cadr x)) (cddr x))))
+
+   `((#(roman upright medium) 
+      . (10.0 . #(,(delay (ly:font-load "ecrm6"))
+		  ,(delay (ly:font-load "ecrm8"))
+		  ,(delay (ly:font-load "ecrm10"))
+		  ,(delay (ly:font-load "ecrm17")))))
+     (#(roman upright bold) 
+      . (10.0 . #(,(delay (ly:font-load "ecbx6"))
+		  ,(delay (ly:font-load "ecbx8"))
+		  ,(delay (ly:font-load "ecbx10"))
+		  ,(delay (ly:font-load "ecbx12")))))
+     (#(roman italic medium) 
+      . (10.0 . #(,(delay (ly:font-load "ecti7"))
+		  ,(delay (ly:font-load "ecti10"))
+		  ,(delay (ly:font-load "ecti12")))))
+     (#(roman italic bold) 
+      . (10.0 . #(,(delay (ly:font-load "ecbi8"))
+		  ,(delay (ly:font-load "ecbi10"))
+		  ,(delay (ly:font-load "ecbi14")))))
+     (#(roman caps medium) 
+      . (10.0 . #(,(delay (ly:font-load "eccc10")))))
+     (#(roman slanted-caps medium) 
+      . (10.0 . #(,(delay (ly:font-load "ecsc10")))))
+     (#(roman upright bold-narrow ) 
+      . (10.0 . #(,(delay (ly:font-load "ecrb10")))))
+     (#(sans upright medium) 
+      . (10.0  . #(,(delay (ly:font-load "ecss8"))
+		   ,(delay (ly:font-load "ecss10"))
+		   ,(delay (ly:font-load "ecss12"))
+		   ,(delay (ly:font-load "ecss17")))))
+     (#(typewriter upright medium) 
+      . (10.0 . #(,(delay (ly:font-load "ectt8"))
+		  ,(delay (ly:font-load "ectt10"))
+		  ,(delay (ly:font-load "ectt12"))))))))
+
+;; (display (make-font-tree 1.0))
+
+;; Century Schoolbook fonts file names on Debian/Sid
+(define-public (add-century-schoolbook-fonts node factor)
+  (add-font node
+	    '((font-family . roman)
+	      (font-shape . upright)
+	      (font-series . medium)
+	      (font-encoding . latin1))
+	    `(10.0 . #(,(delay (ly:font-load "uncr8a")))))
+  (add-font node
+	    '((font-family . roman)
+	      (font-shape . italic)
+	      (font-series . medium)
+	      (font-encoding . latin1))
+	    `(10.0 . #(,(delay (ly:font-load "uncri8a")))))
+  (add-font node
+	    '((font-family . roman)
+	      (font-shape . upright)
+	      (font-series . bold)
+	      (font-encoding . latin1))
+	    `(10.0 . #(,(delay (ly:font-load "uncb8a")))))
+  (add-font node
+	    '((font-family . roman)
+	      (font-shape . italic)
+	      (font-series . bold)
+	      (font-encoding . latin1))
+	    `(10.0 . #(,(delay (ly:font-load "uncbi8a"))))))
+
+(define-public (make-cmr-tree factor)
+  (let ((n (make-font-tree-node 'font-encoding 'fetaMusic)))
+    (add-music-fonts n factor)
+    (add-cmr-fonts n factor)
+    (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))
+    n))
+
+(define-public (make-century-schoolbook-tree factor)
+  (let ((n (make-font-tree-node 'font-encoding 'fetaMusic)))
+    (add-music-fonts n factor)
+    (add-century-schoolbook-fonts n factor)
+    n))
+
+(define-public (magstep x)
+  (exp (* (/ x 6) (log 2))))