X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Ffont.scm;h=d05cc2fd78efdeddf3d85b7fdc19602bf6e393a3;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=ba6f8feb161d20a793f6d6511b1945ef89acc012;hpb=78f82bc5e0e509e0734d1dea28718d26fa1f8b2b;p=lilypond.git

diff --git a/scm/font.scm b/scm/font.scm
index ba6f8feb16..d05cc2fd78 100644
--- a/scm/font.scm
+++ b/scm/font.scm
@@ -1,232 +1,204 @@
-;;;
-;;; font.scm -- implement Font stuff
-;;;
-;;; source file of the GNU LilyPond music typesetter
-;;; 
-;;; (c)  2000--2003 Jan Nieuwenhuizen <janneke@gnu.org>
-;;;
-
-(define (font-field name font-descr)
-      (list-ref
-       font-descr
-       (cond
-	((eq? name 'font-relative-size)  0)
-	((eq? name 'font-series) 1)
-	((eq? name 'font-shape) 2)
-	((eq? name 'font-family) 3)
-	((eq? name 'font-design-size) 4)
-	(else (ly:warning "unknown font field name"))
-	)
-       ))
-
-
-(define size-independent-fonts
-  `(
-    ((* * * braces *) . ("feta-braces00"
-			 "feta-braces10"
-			 "feta-braces20"
-			 "feta-braces30"
-			 "feta-braces40"
-			 "feta-braces50"
-			 "feta-braces60"
-			 "feta-braces70"
-			 "feta-braces80") )))
-
-;; FIXME: what about this comment?:
-
-;; font-lookup seems a  little inefficient -- walking this entire list
-;; for a single font.
-;;
-;;   should really have name/pt size at the front of the list.
-;;   (also tried to vary the order of this list, with little effect)
-;;
-;; (font-relative-size font-series font-shape font-family 
-;; font-design-size)
-
-(define paper20-style-sheet-alist
-  '(
-    ;; why are font file names strings, not symbols?
-    ((3 medium upright number 13) . "feta-nummer13")
-    ((2 medium upright number 13) . "feta-nummer13")
-    ((1 medium upright number 11) . "feta-nummer11")
-    ((0 medium upright number 10) . "feta-nummer10")
-    ((-1 medium upright number 8) . "feta-nummer8")
-    ((-2 medium upright number 7) . "feta-nummer7")
-    ((-3 medium upright number 6) . "feta-nummer6")
-    ((-4 medium upright number 5) . "feta-nummer5")
-    ((-5 medium upright number 4) . "feta-nummer4")
-
-    ((4 medium upright roman 17) . "cmr17")
-    ((3 medium upright roman 17) . "cmr17")
-    ((2 medium upright roman 12) . "cmr12")
-    ((1 medium upright roman 12) . "cmr12")
-    ((0 medium upright roman 10) . "cmr10")
-    ((-1 medium upright roman 8) . "cmr8" )
-    ((-2 medium upright roman 7) . "cmr7" )
-    ((-3 medium upright roman 6) . "cmr6" )
-    ((-4 medium upright roman 5) . "cmr5" )
-    ((-5 medium upright roman 5) . "cmr5" )
-
-    ((4 medium upright sans 17) . "cmss17")
-    ((3 medium upright sans 17) . "cmss17")
-    ((2 medium upright sans 14) . "cmss14")
-    ((1 medium upright sans 12) . "cmss12")
-    ((0 medium upright sans 10) . "cmss10")
-    ((-1 medium upright sans 9) . "cmss9" )
-    ((-2 medium upright sans 8) . "cmss8" )
-    ((-3 medium upright sans 7) . "cmss7" )
-    ((-3 medium upright sans 6) . "cmss6" )
-    ((-4 medium upright sans 5) . "cmss5" )
-    
-    ((3 medium italic roman 12) . "cmti12")
-    ((2 medium italic roman 12) . "cmti12")
-    ((1 medium italic roman 12) . "cmti12") ;;; ugh. Should add magnification here! 
-    ((0 medium italic roman 10) . "cmti10")
-    ((-1 medium italic roman 8) . "cmti8")    
-    ((-2 medium italic roman 7) . "cmti7")
-    ((-3 medium italic roman 6) . "cmti6")    
-    ((-4 medium italic roman 5) . "cmti5")    
-    ((-5 medium italic roman 5) . "cmti5")    
-
-    ;;; cmbx17 is sauter, not commonly available as Type1.
-    ((4 bold upright roman 17) . "cmbx17") 
-    ((3 bold upright roman 17) . "cmbx17")
-    
-    ((2 bold upright roman 14) . "cmbx14")
-    ((1 bold upright roman 12) . "cmbx12")
-    ((0 bold upright roman 10) . "cmbx10")
-    ((-1 bold upright roman 8) . "cmbx8")
-    ((-2 bold upright roman 7) . "cmbx7")
-    ((-3 bold upright roman 6) . "cmbx6")
-    ((-4 bold upright roman 5) . "cmbx5")
-    ((-5 bold upright roman 5) . "cmbx5")
-     
-     
-    ((2 bold italic roman 12) . "cmbxti12")
-    ((1 bold italic roman 12) . "cmbxti12")
-    ((0 bold italic roman 10) . "cmbxti10")
-
-    ((-1 bold italic roman 8) . "cmbxti8")
-    ((-2 bold italic roman 7) . "cmbxti7")
-    ((-3 bold italic roman 6) . "cmbxti6")
-    ((-4 bold italic roman 5) . "cmbxti5")
-    ((-5 bold italic roman 5) . "cmbxti5")
-     
-    ((4 medium upright typewriter 17) . "cmtt17")
-    ((3 medium upright typewriter 17) . "cmtt17")
-    ((2 medium upright typewriter 12) . "cmtt12")
-    ((1 medium upright typewriter 12) . "cmtt12")
-    ((0 medium upright typewriter 10) . "cmtt10")
-    ((-1 medium upright typewriter 8) . "cmtt8" )
-    ((-2 medium upright typewriter 7) . "cmtt7" )
-    ((-3 medium upright typewriter 6) . "cmtt6" )
-    ((-4 medium upright typewriter 5) . "cmtt5" )
-    ((-5 medium upright typewriter 5) . "cmtt5" )
-    
-    ((3 medium caps roman 12) . "cmcsc12")
-    ((2 medium caps roman 12) . "cmcsc12")
-    ((1 medium caps roman 12) . "cmcsc12")
-    ((0 medium caps roman 10) . "cmcsc10")
-    ((-1 medium caps roman 8) . "cmcsc8")
-    ((-2 medium caps roman 7) . "cmcsc7")
-    ((-3 medium caps roman 7) . "cmcsc7")
-
-    ((3 * * dynamic 19) . "feta-din19")
-    ((2 * * dynamic 19) . "feta-din19")
-    ((1 * * dynamic 17) . "feta-din17")
-    ((0 * * dynamic 14) . "feta-din14")
-    ((-1 * * dynamic 12) . "feta-din12")
-    ((-2 * * dynamic 9) . "feta-din9")
-    ((-3 * * dynamic 8) . "feta-din8")
-    ((-4 * * dynamic 7) . "feta-din7")
-    ((-5 * * dynamic 6) . "feta-din6")
-
-    ((2 * * music 26) . ("feta26" "parmesan26"))
-    ((1 * * music 23) . ("feta23" "parmesan23"))
-    ((0 * * music 20) . ("feta20" "parmesan20"))
-    ((-1 * * music 16) . ("feta16" "parmesan16"))
-    ((-2 * * music 13) . ("feta13" "parmesan13"))
-    ((-3 * * music 11) . ("feta11" "parmesan11"))
-    ((-4 * * music 11) . ("feta11" "parmesan11"))
-    
-    ((2 * * ancient 26) . ("feta26" "parmesan26"))
-    ((1 * * ancient 23) . ("feta23" "parmesan23"))
-    ((0 * * ancient 20) . ("feta20" "parmesan20"))
-    ((-1 * * ancient 16) . ("feta16" "parmesan16"))
-    ((-2 * * ancient 13) . ("feta13" "parmesan13"))
-    ((-3 * * ancient 11) . ("feta11" "parmesan11"))
-    ((-4 * * ancient 11) . ("feta11" "parmesan11"))
-
-    ((0 * * math 10) . "msam10")
-    ((-1 * * math 10) . "msam10")
-    ((-2 * * math 10) . "msam10")
-    ((-3 * * math 10) . "msam10")
-   ))
-
-;; 
-(define (change-relative-size font-desc decrement)
-  "return a FONT-DESCR with relative size decremented by DECREMENT"
-
-  (if (number? (car font-desc))
-      (cons (- (car font-desc) decrement) (cdr font-desc))
-      font-desc)
-  )
-
-(define (change-rhs-size font-desc from to )
-  (cons (car font-desc)
-	(regexp-substitute/global #f from (cdr font-desc) 'pre to 'post)))
-  
-
-(define (change-style-sheet-relative-size sheet x)
-  (map-alist-keys (lambda (descr) (change-relative-size descr  x)) sheet))
-
-
-;; make style sheet for each paper version.
-(define font-list-alist
-  (map-alist-vals (lambda (x) (change-style-sheet-relative-size
-			       paper20-style-sheet-alist x))
-		  '((paper11 . -3)
-		    (paper13 . -2)
-		    (paper16 . -1)
-		    (paper20 . 0)
-		    (paper23 . 1)
-		    (paper26 . 2)
-		    )))
+;;;; font.scm -- construct font trees
+;;;;
+;;;;  source file of the GNU LilyPond music typesetter
+;;;; 
+;;;; (c) 2004--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
+;; TODO:
 ;;
-;; make a kludged up paper-19 style sheet. Broken by virtual fonts.
+;; lookup-font should be written in  C.
 ;;
-(if #f
-    (set! font-list-alist
-      (cons
-       (cons
-	'paper19
-	(map (lambda (x) (change-rhs-size x "20" "19"))
-	     paper20-style-sheet-alist))
-       font-list-alist)))
-
-(define-public (make-font-list sym)
-  (append size-independent-fonts
-	  (cdr (assoc sym font-list-alist))))
-
-
-;;; ascii-script font init
-(define as-font-sheet-alist
-  '((as5 . (((* * * braces *) . ("as-braces9"))
-	    ((* * * number *) . "as-number1")
-	    ((0 * * music *) . ("as5"))
-	    ((0 * * roman *) . "as-dummy")))
-    (as9 . (((* * * braces *) . ("as-braces9"))
-	    ((0 medium upright number 10) . "as-number4")
-	    ((* * * number 5) . "as-number1")
-	    ((0 * * music *) . ("as9"))
-	    ((0 * * roman *) . "as-dummy")))))
-
-(define-public (as-make-font-list sym)
-  (set! font-list-alist
-	(append font-list-alist as-font-sheet-alist))
-  (make-font-list sym))
-
-
-
 
+(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))
+
+(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))
+
+(define (make-font-tree-leaf size size-font-vector)
+  (make <Font-tree-leaf> #:default-size size #:size-vector size-font-vector))
+
+(define (make-font-tree-node
+	 qualifier default)
+  (make <Font-tree-node>
+    #:qualifier qualifier
+    #:default default 
+    #:children (make-hash-table 11)))
+
+(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-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))
+
+
+;; Ugh.  Currently, we load the PFB Feta fonts for `fetaDynamic' with
+;; Pango.  This should be changed to load the Emmentaler fonts instead
+;; (with Pango too), but then we need support for a `font-style'
+;; property which isn't implemented yet.
+(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)))))
+
+;; 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))))
+   `((fetaDynamic ,(ly:pt 20.0) ,feta-alphabet-size-vector)
+     (fetaNumber ,(ly:pt 20.0) ,feta-alphabet-size-vector)
+     (fetaMusic ,(ly:pt 20.0)
+		#(,(delay (ly:system-font-load "emmentaler-11"))
+		  ,(delay (ly:system-font-load "emmentaler-13"))		  
+		  ,(delay (ly:system-font-load "emmentaler-14"))
+		  ,(delay (ly:system-font-load "emmentaler-16"))		  
+		  ,(delay (ly:system-font-load "emmentaler-18"))
+		  ,(delay (ly:system-font-load "emmentaler-20"))		  
+		  ,(delay (ly:system-font-load "emmentaler-23"))		  
+		  ,(delay (ly:system-font-load "emmentaler-26"))))
+     (fetaBraces ,(ly:pt 20.0)
+		 #(,(delay (ly:system-font-load "aybabtu")))))))
+
+(define-public (add-pango-fonts node lily-family family factor)
+  (define (add-node shape series)
+    (add-font node
+	      `((font-family . ,lily-family)
+		(font-shape . ,shape)
+		(font-series . ,series)
+		(font-encoding . latin1) ;; ugh.
+		)
+	      `(,(ly:pt (* factor 11.0))
+		. #(,(cons
+		     (ly:pt 12)
+		     (ly:make-pango-description-string
+		       `(((font-family . ,family)
+			  (font-series . ,series)
+			  (font-shape . ,shape)))
+		       (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-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 roman-str factor)
+    (add-pango-fonts n 'sans sans-str factor)
+    (add-pango-fonts n 'typewriter typewrite-str factor)
+    n))
+
+(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))))