;;; (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"))
- )
- ))
-
+;; Should separate default sizes
+;; into separate list/alist ?
+
+
+"
+Each entry in this vector has the following format
+
+
+ (cons
+ #(QUALIFIERS)
+ (cons DEFAULT-SIZE
+ #(SIZE-FONT-ENTRIES... ) ))
+
+where each SIZE-FONT-ENTRY is
+
+ (cons DESIGN-SIZE FONT-NAME)
+
+or
+
+ (cons DESIGN-SIZE (list FONT-NAME1 FONT-NAME2 .. ))
+
+"
+
+
+(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 . "cmbxti7")
+ (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")
+ )))
+ (#(medium caps roman) .
+ (10.0 . #((10.0 . "cmcsc10"))))
+
+ ;; this is a little pointless, since feta-din scales linearly
+ (#(* * dynamic) .
+ (14.0 . #((8.0 . "feta-din10")
+ (10.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 *) . ("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" )
- ((-4 medium upright sans 6) . "cmss6" )
- ((-5 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)
- )))
-
-;;
-;; 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)
+ '((#(* * 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
- (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))
-
-
-
+ (map (lambda (y) (scale-font-entry y factor)) paper20-font-vector)
+ ))
+
+;