X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Ffont.scm;h=7118c072056539aa6eb52f332722c685e998a1ce;hb=12186b6828aee7aa298076d684835d629b757f2a;hp=840515a9c10ce2c38c67d3d2575aedf2b021b29d;hpb=899a5926b98860f3d5db399616d9211927fbfa3c;p=lilypond.git

diff --git a/scm/font.scm b/scm/font.scm
index 840515a9c1..7118c07205 100644
--- a/scm/font.scm
+++ b/scm/font.scm
@@ -1,389 +1,120 @@
-;;;
-;;; font.scm -- implement Font stuff
-;;;
-;;; source file of the GNU LilyPond music typesetter
-;;; 
-;;; (c) 2000--2002 Jan Nieuwenhuizen <janneke@gnu.org>
-;;;
+;;;; font.scm -- implement Font stuff
+;;;;
+;;;; source file of the GNU LilyPond music typesetter
+;;;; 
+;;;; (c)  2000--2004 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;;                 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 
-(define style-to-font-alist
-  `(
-))
+;; Should separate default sizes
+;; into separate list/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-design-size) 4)
-	(else (ly:warning "unknown font field name"))
-	)
-       ))
 
-
-
-;; most of these routines have been reimplemented in C++ 
-
-;; 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.
-
-(define (filter-field field-name value font-descr-alist)
-  "return those descriptions from FONT-DESCR-LIST whose FIELD-NAME matches VALUE"
-      (filter-list
-       (lambda (x) (let* (field-value (font-field field-name (car x))) 
-		     (or (eq? field-value '*) (eq? value field-value))))
-       font-descr-alist)
-      )
-
-
-(define size-independent-fonts
-  `(
-    ((* * * braces *) . ("feta-braces0"
-			 "feta-braces1"
-			 "feta-braces2"
-			 "feta-braces3"
-			 "feta-braces4"
-			 "feta-braces5"
-			 "feta-braces6"
-			 "feta-braces7"
-			 "feta-braces8") )))
-
-;; 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" )
-
-    ((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) . "cmti12")
-    ((-1 medium italic roman 8) . "cmti10")    
-    ((-2 medium italic roman 7) . "cmti8")
-    ((-3 medium italic roman 7) . "cmti7")    
-
-    ;;; cmbx17 is sauter, not commonly available as Type1.
-    ((4 bold upright roman 17) . "cmr17") 
-    ((3 bold upright roman 17) . "cmr17")
-    
-    ((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")
-    
-    ((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")
-    
-    ((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 (map-alist-keys func list)
-  "map a  function FUNC over the keys of an alist LIST, leaving the vals. "
-  (if (null?  list)
-      '()
-      (cons (cons (func (caar list)) (cdar list))
-	    (map-alist-keys func (cdr list)))
-      ))
- 
-
-;; 
-(define (map-alist-vals func list)
-  "map a function FUNC over the vals of  LIST, leaving the keys."
-  (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)
-		    (paper20 . 0)
-		    (paper23 . 1)
-		    (paper26 . 2)
-		    ))
-  )
-
-;;
-;; make a kludged up paper-19 style sheet. Broken by virtual fonts.
-;;
-(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))))
-
-(define (qualifiers-to-fontnames  qualifiers font-descr-alist)
-  " reduce the font list by successively applying a font-qualifier."
-  (if (null? qualifiers)
-      font-descr-alist
-      
-      (qualifiers-to-fontnames
-       (cdr qualifiers)
-       (filter-field (caar qualifiers) (cdar qualifiers) font-descr-alist)
-      )
-  ))
-
-(define (wild-eq? x y)
-  (or (eq? x y)
-      (eq? x '*)
-      (eq? y '*)))
-       
-(define (font-qualifies? qualifiers font-desc)
-  "does FONT-DESC satisfy QUALIFIERS?"
-  (if (null? qualifiers) #t
-      (if (wild-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))
-	)
-      ))
-
-
-(define (select-unique-font qualifiers fonts)
-  "return a single font from FONTS (or a default, if none found)
-and warn if the selected font is not unique.
 "
-  (let*  (
-	  (err (current-error-port))
-	  )
-    
+Each entry in this vector has the following format
 
-  (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.
-  
-  ))
 
+ (cons
+  #(QUALIFIERS)
+  (cons DEFAULT-SIZE
+        #(SIZE-FONT-ENTRIES... ) ))
 
-(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))))))
+where each SIZE-FONT-ENTRY is
 
-;; TODO
-;; the C++ version  in font-interface.cc is usually used.
-;;
-;; FIXME: this has silently been broken by the introduction
-;;        of wildcards in the font list.    
-(define (properties-to-font-name fonts properties-alist-list)
-  (let*  (
-	  ;; change order to change priorities of qualifiers.
-	  (q-order '(font-family font-series font-shape
-			       font-design-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)))
+  (cons DESIGN-SIZE FONT-NAME)
 
-    (if (equal? selected "")
-	(begin
-	  (display "\ncouldn't find any font satisfying " err)
-	  (write qualifiers err)
-	  "cmr10"
-	  )
-	selected)	; return the topmost.
-    ))
+or
 
-(define-public (markup-to-properties abbrev-alist style-alist markup)
-  "DOCME."
-  ;; (display "markup: `")
-  ;; (write markup)
-  ;; (display "'\n")
-  
-  (if (pair? markup)
-      ;; This is hairy.  We want to allow:
-      ;;    ((foo bar) "text")
-      ;;    ((foo (bar . 1)) "text")
-      ;;    ((foo . (0 . 1))) 
-      
-      (if (and (symbol? (car markup))
-	       (or (not (pair? (cdr markup)))
-		   (number? (cadr markup))))
-	  (if (equal? '() (cdr markup))
-	      (markup-to-properties abbrev-alist style-alist (car markup))
-	      (list markup))
-	  
-	  (if (equal? '() (cdr markup))
-	      (markup-to-properties abbrev-alist style-alist (car markup))
-	      (append (markup-to-properties abbrev-alist style-alist (car markup))
-		      (markup-to-properties abbrev-alist style-alist (cdr markup)))))
-      
-      ;; markup is single abbreviation
-      (let ((entry (assoc markup
-			  ;; assoc-chain?
-			  (append abbrev-alist style-alist))))
-	(if entry
-	    (cdr entry)
-	    (list (cons markup #t))))))
+  (cons DESIGN-SIZE (list FONT-NAME1 FONT-NAME2 .. )) 
 
+"
 
-; 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-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))))
 
-(if #f (begin
-	 (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))
-		    )
-	   )
-	 )
+(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)))
 
 
-)