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

diff --git a/scm/font.scm b/scm/font.scm
index 5e91e34a43..c29258860c 100644
--- a/scm/font.scm
+++ b/scm/font.scm
@@ -1,333 +1,204 @@
-;;;
-;;; font.scm -- implement Font stuff
-;;;
-;;; source file of the GNU LilyPond music typesetter
-;;; 
-;;; (c) 2000 Jan Nieuwenhuizen <janneke@gnu.org>
-;;;
-
-(define style-to-font-alist
-  `(
-))
-
-(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-name) 4)
-	((eq? name 'font-point-size) 5)
-	(else (ly-warning "unknown font field name"))
-	)
-       ))
-  
-;; return that part of LIST for which PRED is true.
-(define (filter-list pred? list)
-  (if (null? list) '()
-      (let* (
-	     (rest  (filter-list pred? (cdr list)))
-	     )
-	(if (pred?  (car list))
-	    (cons (car list)  rest)
-	    rest
-	    )
-	)
-      )
-  )
-
-;;;;;;;;; TODO TODO . (should not use filtering?)
-;; this is bad, since we generate garbage every font-lookup.
-;; otoh, if the qualifiers is narrow enough , we don't generate much garbage.
-
-
-;; return those descriptions from FONT-DESCR-LIST whose FIELD-NAME matches VALUE
-(define (filter-field field-name value font-descr-alist)
-      (filter-list
-       (lambda (x) (eq? value (font-field field-name (car x))))
-       font-descr-alist)
-      )
-
-(define paper20-style-sheet-alist
-  '(
-    ((3 medium upright number feta-nummer 13) . "feta-nummer13")
-    ((2 medium upright number feta-nummer 13) . "feta-nummer13")
-    ((1 medium upright number feta-nummer 11) . "feta-nummer11")
-    ((0 medium upright number feta-nummer 10) . "feta-nummer10")
-    ((-1 medium upright number feta-nummer 8) . "feta-nummer8")
-    ((-2 medium upright number feta-nummer 6) . "feta-nummer6")
-    ((-3 medium upright number feta-nummer 5) . "feta-nummer5")
-    ((-4 medium upright number feta-nummer 4) . "feta-nummer4")
-    ((2 medium upright roman cmr 14) . "cmr14")
-    ((1 medium upright roman cmr 12) . "cmr12")
-    ((0 medium upright roman cmr 10) . "cmr10")
-    ((-1 medium upright roman cmr 8) . "cmr8" )
-    ((-2 medium upright roman cmr 7) . "cmr7" )
-    ((-3 medium upright roman cmr 6) . "cmr6" )
-    ((-4 medium upright roman cmr 5) . "cmr5" )
-    ((-5 medium upright roman cmr 4) . "cmr4" )
-    ((-3 medium italic roman cmti 5) . "cmti6")    
-    ((-2 medium italic roman cmti 6) . "cmti7")
-    ((-1 medium italic roman cmti 8) . "cmti8")    
-    ((0 medium italic roman cmti 10) . "cmti10")
-    ((1 medium italic roman cmti 12) . "cmti12")
-    ((2 bold upright roman cmbx 14) . "cmbx14")
-    ((1 bold upright roman cmbx 12) . "cmbx12")
-    ((0 bold upright roman cmbx 10) . "cmbx10")
-    ((-1 bold upright roman cmbx 8) . "cmbx8")
-    ((-2 bold upright roman cmbx 7) . "cmbx7")
-    ((-3 medium upright math msam 10) . "msam10")
-    ((-2 medium upright math msam 10) . "msam10")
-    ((-1 medium upright math msam 10) . "msam10")
-    ((0 medium upright math msam 10) . "msam10")
-    ;; should use the same brace font every where and fix C++ code.
-    ((0 medium upright braces feta-braces 20) . "feta-braces20")
-    ((2 medium upright braces feta-braces 26) . "feta-braces26")
-    ((1 medium upright braces feta-braces 23) . "feta-braces23")
-    ((3 bold italic dynamic feta 13) . "feta-din13")
-    ((2 bold italic dynamic feta 13) . "feta-din13")
-    ((1 bold italic dynamic feta 11) . "feta-din11")
-    ((0 bold italic dynamic feta 10) . "feta-din10")
-    ((-1 bold italic dynamic feta 8) . "feta-din8")
-    ((-2 bold italic dynamic feta 7) . "feta-din7")
-    ((-3 bold italic dynamic feta 6) . "feta-din6")
-    ((-4 bold italic dynamic feta 5) . "feta-din5")
-    ((-5 bold italic dynamic feta 4) . "feta-din4")
-    ((2 medium upright music feta 26) . "feta26")
-    ((1 medium upright music feta 23) . "feta23")
-    ((0 medium upright music feta 20) . "feta20")
-    ((-0.5 medium upright music feta 20) . "feta19")    
-    ((-1 medium upright music feta 16) . "feta16")
-    ((-2 medium upright music feta 13) . "feta13")
-    ((-3 medium upright music feta 13) . "feta11")
-    ((-4 medium upright music feta 13) . "feta11")
-    ((-1 medium upright math msam 10) . "msam10")
-    ((-2 medium upright math msam 10) . "msam10")
-    ((-3 medium upright math msam 10) . "msam10")
-   ))
-
-;; return a FONT-DESCR with relative size decremented by DECREMENT
-(define (change-relative-size font-desc decrement)
-  (cons (- (car font-desc) decrement) (cdr font-desc))
-  )
-
-;; map a  function FUNC over the keys of an alist LIST, leaving the vals. 
-(define (map-alist-keys func list)
-  (if (null?  list)
-      '()
-      (cons (cons (func (caar list)) (cdar list))
-	    (map-alist-keys func (cdr list)))
-      ))
- 
-;; map a function FUNC over the vals of  LIST, leaving the keys. 
-(define (map-alist-vals func list)
-  (if (null?  list)
-      '()
-      (cons (cons  (caar list) (func (cdar list)))
-	    (map-alist-vals func (cdr list)))
-      ))
-
-(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)
-		    (paper19 . -0.5)	
-		    (paper20 . 0)
-		    (paper23 . 1)
-		    (paper26 . 2)
-		    ))
-  )
-
-
-(define (make-style-sheet sym)
-  `((fonts . ,(cdr (assoc sym font-list-alist)))
-    (font-defaults
-     . ((font-family . music)
-	(font-relative-size . 0)
-	(font-shape . upright)
-	(font-series . medium)
-	))
-    (style-alist
-     . ((finger . ((font-family . number) (font-relative-size . -3)))
-	(volta . ((font-family . number) (font-relative-size . -2)))
-	(tuplet . ((font-family . roman) (font-shape . italic) (font-relative-size . -1)))
-	(timesig . ((font-family .  number) (font-relative-size . 0)))
-	(mmrest . ((font-family . number) (font-relative-size . 1)))
-	(mark . ((font-family . number) (font-relative-size . 1)))
-	(script . ((font-family . roman) (font-relative-size . -1)))
-	(large . ((font-family . roman) (font-relative-size . 1)))
-	(Large . ((font-series . bold) (font-family . roman) (font-relative-size . 2)))
-	(dynamic . ((font-series . bold) (font-family . dynamic) (font-relative-size . 0)))
-	))
-    (properties-to-font . ,properties-to-font-name)
-
-    ;; FIXME: this is a not-so-cool idea to use ALIGN
-    ;; RAISE, LOOKUP, since they are not proper elt-properties,
-    ;; and might interfere with them.
-    (markup-to-properties . ,markup-to-properties)
-    (abbreviation-alist
-     . ((rows . ((align . 0)))
-	(lines . ((align . 1)))
-	(roman . ((font-family . roman)))
-	(music . ((font-family . music) (font-shape . upright)))
-	(finger . ((font-style . finger)))
-	(bold . ((font-series . bold)))
-	(italic . ((font-shape . italic)))
-	(named . ((lookup . name)))
-	(super . ((raise . 1) (font-relative-size . -1)))
-	(sub . ((raise . -1) (font-relative-size . -1)))
-	(text . ((lookup . value)))
-	)
-     )
-    
-    )
-  )
-
-;; reduce the font list by successively applying a font-qualifier.
-(define (qualifiers-to-fontnames  qualifiers font-descr-alist)
-  (if (null? qualifiers)
-      font-descr-alist
-      
-      (qualifiers-to-fontnames
-       (cdr qualifiers)
-       (filter-field (caar qualifiers) (cdar qualifiers) font-descr-alist)
-      )
-  ))
-
-
-;; does FONT-DESC satisfy QUALIFIERS?
-(define (font-qualifies? qualifiers font-desc)
-  (if (null? qualifiers) #t
-      (if (eq? (font-field (caar qualifiers) font-desc) (cdar qualifiers))
-	  (font-qualifies? (cdr qualifiers) font-desc)
-	  #f
-	  )
-	)
-  )
-
-(define (find-first-font qualifiers fonts)
-  (if (null? fonts)
-      ""
-      (if (font-qualifies? qualifiers (caar fonts))
-	  (cdar fonts)
-	  (find-first-font qualifiers (cdr fonts))
-	)
-      ))
-
-
-;; return a single font from FONTS (or a default, if none found)
-;; and warn if the selected font is not unique.
-(define (select-unique-font qualifiers fonts)
-  (let*  (
-	  (err (current-error-port))
-	  )
-    
-
-  (if (not (= (length fonts) 1))
-      (begin
-	(display "\ncouldn't find unique font satisfying " err)
-	(write qualifiers err)
-	(display " found " err)
-	  (if (null? fonts)
-	      (display "none" err)
-	      (write (map cdr  fonts) err))
-	  ))
-
-  (if (null? fonts)
-      "cmr10"
-      (cdar fonts))	; return the topmost.
+;;;; 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.
+;;
+
+(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 (chain-assoc x alist-list)
-  (if (null? alist-list)
-      #f
-      (let* (
-	     (handle (assoc x (car alist-list)))
-	     )
-	(if (pair? handle)
-	    handle
-	    (chain-assoc x (cdr alist-list))
-	    )
-	)
-      )
-  )
-
-;; TODO
-;; add support for override by font-name
-;; very often-used; hard-code in C++, and use SCM glue code.
-
-(define (properties-to-font-name fonts properties-alist-list)
-  (let*  (
-	  ;; change order to change priorities of qualifiers.
-	  (q-order    '(font-name font-family font-series font-shape font-point-size font-relative-size))
-	  (rawqualifiers (map (lambda (x) (chain-assoc x  properties-alist-list))
-			      q-order))
-	  (qualifiers (filter-list pair? rawqualifiers))
-	  (selected     (find-first-font qualifiers fonts))
-	  (err (current-error-port))	  
-	  )
-
-    (if (equal? selected "")
+  (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
-	  (display "\ncouldn't find any font satisfying " err)
-	  (write qualifiers err)
-	  "cmr10"
-	  )
-	selected)	; return the topmost.
-    ))
-
-(define (markup-to-properties sheet markup)
-  ;;(display "markup: `")
-  ;;(write markup)
-  ;;(display "'\n")
-  (if (pair? markup)
-      (list markup)
-      (let ((entry (assoc markup
-			  ;; assoc-chain?
-			  (append (cdr (assoc 'abbreviation-alist sheet))
-				  (cdr (assoc 'style-alist sheet))))))
-	(if entry
-	    (cdr entry)
-	    (list (cons markup #t))))))
-
-; fixme, how's this supposed to work?
-; and why don't we import font-setting from elt?
-(define (style-to-font-name sheet style)
-  (let* ((entry (assoc style style-to-font-alist))
-	 (qualifiers (if entry (cdr entry) '()))
-	 (font (find-first-font qualifiers sheet))
-	 (err (current-error-port))
-	 )
-
-    (if (equal? font "")
-	(begin
-	  (display "\ncouldn't find any font satisfying " err)
-	  (write qualifiers err)
-	  "cmr10"
-	  )
-	font)	; return the topmost.
-    ))
-
-		    
-
-
-; (define (test-module)
-;  (display (filter-list pair? '(1 2 (1 2) (1 .2)))
-;(display (filter-field 'font-name 'cmbx paper20-style-sheet-alist))
-
-; (display (qualifiers-to-fontname '((font-name . cmbx)) paper20-style-sheet-alist))
-; (display (style-to-font-name 'paper20 'large))
-; )
-
-
+	  (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))))