X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Ffont.scm;h=eefc1c26ee9627316e43e11e09101d9e4ceebbe2;hb=8f2b7704b353e11bb85128498200e7f8d09d040d;hp=7e1677764a4524c156726cbecfdb5cadb5aa6048;hpb=a33165e3b6af2d807d069e6eacd0e220ba2ef68a;p=lilypond.git diff --git a/scm/font.scm b/scm/font.scm index 7e1677764a..eefc1c26ee 100644 --- a/scm/font.scm +++ b/scm/font.scm @@ -2,27 +2,16 @@ ;;;; ;;;; source file of the GNU LilyPond music typesetter ;;;; -;;;; (c) 2004 Han-Wen Nienhuys - -;; As an excercise, do it with records. -;; Should use GOOPS, really. +;;;; (c) 2004--2007 Han-Wen Nienhuys ;; 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 ()) - (define-class () (default-size #:init-keyword #:default-size) (size-vector #:init-keyword #:size-vector)) @@ -45,9 +34,11 @@ (define-method (display (leaf ) port) (map (lambda (x) (display x port)) (list - "Font-size-family: \n" + "#" + ))) (define-method (display (node ) port) @@ -77,11 +68,11 @@ (define-method (add-font (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))))) @@ -96,14 +87,12 @@ (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))) + (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) @@ -119,11 +108,10 @@ (define-method (g-lookup-font (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))) + (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) @@ -137,10 +125,32 @@ (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. - ; +;; Each size family is a vector of fonts, loaded with a delay. The +;; vector should be sorted according to ascending design size. +(define feta-alphabet-size-vector + (if (defined? 'ly:kpathsea-find-file) + `#(,(delay (ly:font-load "feta-alphabet11")) + ,(delay (ly:font-load "feta-alphabet13")) + ,(delay (ly:font-load "feta-alphabet14")) + ,(delay (ly:font-load "feta-alphabet16")) + ,(delay (ly:font-load "feta-alphabet18")) + ,(delay (ly:font-load "feta-alphabet20")) + ,(delay (ly:font-load "feta-alphabet23")) + ,(delay (ly:font-load "feta-alphabet26"))) + (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)))))) (define-public (add-music-fonts node factor) (for-each @@ -149,50 +159,20 @@ (list (cons 'font-encoding (car x))) (cons (* factor (cadr x)) (caddr x)))) - `( - (fetaNumber 14 - #( - ,(delay (ly:font-load "bigcheese11")) - ,(delay (ly:font-load "bigcheese13")) - ,(delay (ly:font-load "bigcheese14")) - ,(delay (ly:font-load "bigcheese16")) - ,(delay (ly:font-load "bigcheese18")) - ,(delay (ly:font-load "bigcheese20")) - ,(delay (ly:font-load "bigcheese23")) - ,(delay (ly:font-load "bigcheese26")))) - - (fetaDynamic 20.0 #( - ,(delay (ly:font-load "bigcheese11")) - ,(delay (ly:font-load "bigcheese13")) - ,(delay (ly:font-load "bigcheese14")) - ,(delay (ly:font-load "bigcheese16")) - ,(delay (ly:font-load "bigcheese18")) - ,(delay (ly:font-load "bigcheese20")) - ,(delay (ly:font-load "bigcheese23")) - ,(delay (ly:font-load "bigcheese26")))) - - (fetaMusic 20.0 - #( - ,(delay (ly:font-load "bigcheese11")) - ,(delay (ly:font-load "bigcheese13")) - ,(delay (ly:font-load "bigcheese14")) - ,(delay (ly:font-load "bigcheese16")) - ,(delay (ly:font-load "bigcheese18")) - ,(delay (ly:font-load "bigcheese20")) - ,(delay (ly:font-load "bigcheese23")) - ,(delay (ly:font-load "bigcheese26")))) - - (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")))))))) + `((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:font-load "emmentaler-11")) + ,(delay (ly:font-load "emmentaler-13")) + ,(delay (ly:font-load "emmentaler-14")) + ,(delay (ly:font-load "emmentaler-16")) + ,(delay (ly:font-load "emmentaler-18")) + ,(delay (ly:font-load "emmentaler-20")) + ,(delay (ly:font-load "emmentaler-23")) + ,(delay (ly:font-load "emmentaler-26")))) + + (fetaBraces ,(ly:pt 20.0) #(,(delay + (ly:font-load "aybabtu"))))))) (define-public (add-cmr-fonts node factor) (add-font node '((font-encoding . TeX-math)) @@ -206,34 +186,34 @@ (cons (* factor (cadr x)) (cddr x)))) `((#(roman upright medium) - . (10.0 . #(,(delay (ly:font-load "cmr6")) + . (,(ly:pt 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")) + . (,(ly:pt 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")) + . (,(ly:pt 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")) + . (,(ly:pt 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"))))) + . (,(ly:pt 10.0) . #(,(delay (ly:font-load "cmcsc10"))))) (#(roman upright bold-narrow ) - . (10.0 . #(,(delay (ly:font-load "cmb10"))))) + . (,(ly:pt 10.0) . #(,(delay (ly:font-load "cmb10"))))) (#(sans upright medium) - . (10.0 . #(,(delay (ly:font-load "cmss8")) + . (,(ly:pt 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")) + . (,(ly:pt 10.0) . #(,(delay (ly:font-load "cmtt8")) ,(delay (ly:font-load "cmtt10")) ,(delay (ly:font-load "cmtt12")))))))) @@ -247,35 +227,35 @@ (font-family . ,(vector-ref (car x) 0))) (cons (* factor (cadr x)) (cddr x)))) `((#(roman upright medium) - . (10.0 . #(,(delay (ly:font-load "lmr6")) + . (,(ly:pt 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")) + . (,(ly:pt 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")) + . (,(ly:pt 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 "lmbxi10"))))) + . (,(ly:pt 10.0) . #(,(delay (ly:font-load "lmbxi10"))))) (#(roman caps medium) - . (10.0 . #(,(delay (ly:font-load "lmcsc10"))))) + . (,(ly:pt 10.0) . #(,(delay (ly:font-load "lmcsc10"))))) (#(roman upright bold-narrow ) - . (10.0 . #(,(delay (ly:font-load "lmb10"))))) + . (,(ly:pt 10.0) . #(,(delay (ly:font-load "lmb10"))))) (#(sans upright medium) - . (10.0 . #(,(delay (ly:font-load "lmss8")) + . (,(ly:pt 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"))))) + . (,(ly:pt 10.0) . #(,(delay (ly:font-load "lmssbx10"))))) (#(typewriter upright medium) - . (10.0 . #(,(delay (ly:font-load "lmtt8")) + . (,(ly:pt 10.0) . #(,(delay (ly:font-load "lmtt8")) ,(delay (ly:font-load "lmtt10")) ,(delay (ly:font-load "lmtt12")))))))) @@ -290,83 +270,97 @@ (cons (* factor (cadr x)) (cddr x)))) `((#(roman upright medium) - . (10.0 . #(,(delay (ly:font-load "ecrm6")) + . (,(ly:pt 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")) + . (,(ly:pt 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")) + . (,(ly:pt 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")) + . (,(ly:pt 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"))))) + . (,(ly:pt 10.0) . #(,(delay (ly:font-load "eccc10"))))) (#(roman slanted-caps medium) - . (10.0 . #(,(delay (ly:font-load "ecsc10"))))) + . (,(ly:pt 10.0) . #(,(delay (ly:font-load "ecsc10"))))) (#(roman upright bold-narrow ) - . (10.0 . #(,(delay (ly:font-load "ecrb10"))))) + . (,(ly:pt 10.0) . #(,(delay (ly:font-load "ecrb10"))))) (#(sans upright medium) - . (10.0 . #(,(delay (ly:font-load "ecss8")) + . (,(ly:pt 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")) + . (,(ly:pt 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 file names 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 (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-cmr-tree factor) - (let ((n (make-font-tree-node 'font-encoding 'fetaMusic))) + (let* + ((n (make-font-tree-node 'font-encoding 'fetaMusic)) + (module (resolve-module '(scm kpathsea))) + (find (eval 'ly:kpathsea-find-file module)) + ) (add-music-fonts n factor) (add-cmr-fonts n factor) - (if (ly:kpathsea-find-file "lmr10.pfb") + + (if (find "lmr10.pfb") (add-cork-lm-fonts n factor)) - (if (ly:kpathsea-find-file "ecrm10.pfa") + (if (find "ecrm10.pfa") (add-ec-fonts n factor)) n)) -(define-public (make-century-schoolbook-tree factor) + + + +(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-century-schoolbook-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 (magstep x) - (exp (* (/ x 6) (log 2)))) + +(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))))