X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Ffont.scm;h=c29258860c2a6cabedf3623a3ec7c25da3fb21d8;hb=cb4a3b3cc10f145d31a890cdb7ea3e29592f0caf;hp=a17dc3be6921e37010b23ff827f2907956c1fe0e;hpb=d7495f035d2eef8b1a1f719dc3c6aa32098135f7;p=lilypond.git

diff --git a/scm/font.scm b/scm/font.scm
index a17dc3be69..c29258860c 100644
--- a/scm/font.scm
+++ b/scm/font.scm
@@ -1,21 +1,16 @@
-;; As an excercise, do it with records.
-;; Should use GOOPS, really.
+;;;; font.scm -- construct font trees
+;;;;
+;;;;  source file of the GNU LilyPond music typesetter
+;;;; 
+;;;; (c) 2004--2009 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)
@@ -32,38 +27,37 @@
 (define (make-font-tree-node
 	 qualifier default)
   (make <Font-tree-node>
-     #:qualifier qualifier
-     #:default default 
-     #:children (make-hash-table 11)))
+    #: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"))
+       (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))
@@ -71,14 +65,14 @@
 (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)))
+	(let* ((qual (next-qualifier default-qualifier-order fprops)))
 	  (make-font-tree-node qual
-			       (assoc-get qual fprops)))
-	))
+			       (assoc-get qual fprops)))))
+
   (define (next-qualifier order props)
     (cond
      ((and (null? props) (null? order))
@@ -88,18 +82,14 @@
      (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)))
-
-
+	  (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))
@@ -107,35 +97,49 @@
     (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))
+  (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)
-	)))
+	(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.
+;; 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.
-;
 
+;; 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)
@@ -143,277 +147,58 @@
 	       (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"))
-		)))))
-
-  ;; lmodern: super-cm using metapost
-  ;; lm.map: Reencoding, at fontlevel for TeX ?:
-  ;; cork-lmb10 LMRomanDemi10-Regular "enccorklm ReEncodeFont" <cork-lm.enc <lmb10.pf
-  
-  (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))
-      ))
-
-;;; super-cm, aka lmodern (on Debian) seems rather broken:
-;;; * no usable TFM files  (no lmr10.tfm, only cork-lmr10.tfm)
-;;; * broken AFM files:
-;;;    - invalid keyword 'Generated'
-;;;    - lists FontEncoding Fontspecific  -- duh
-;;; revert to ec-fonts-mftraced for now
-;;; make this easily switchable?
-   
-;;;    `((#(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 "lmbi8"))
-;;; 		,(delay (ly:font-load "lmbi10"))
-;;; 		,(delay (ly:font-load "lmbi14")))))
-     
-;;;      (#(roman caps medium) .
-;;;       (10.0 . #(,(delay (ly:font-load "lmcs10")))))
-
-;;;      (#(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"))))))))
-   `((#(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 filenames 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)))
-
+   `((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-cmr-fonts n factor)
-    n
-  ))
-
+    (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))
 
-  (let
-      ((n (make-font-tree-node 'font-encoding 'fetaMusic)))
-
-    (add-music-fonts n factor)
-    (add-century-schoolbook-fonts n factor)
-    n
-  ))
-
+(define-public (magstep s)
+  (exp (* (/ s 6) (log 2))))
 
-(define-public (magstep x)
-  (exp (* (/ x 6) (log 2))))
+(define-public (magnification->font-size m)
+  (* 6 (/ (log m) (log 2))))