X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Ffont.scm;h=d05cc2fd78efdeddf3d85b7fdc19602bf6e393a3;hb=a6a4b3fc2009f17a1a48cca0c11bfd3f38645937;hp=3b10f93a594d4e7d9da11d39ea66b8c9076081c1;hpb=46b41fe6cef4d1a9746e21f809c0ee62662aa145;p=lilypond.git diff --git a/scm/font.scm b/scm/font.scm index 3b10f93a59..d05cc2fd78 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--2008 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,18 +34,18 @@ (define-method (display (leaf ) port) (map (lambda (x) (display x port)) (list - "Font-size-family: \n" + "#" + ))) (define-method (display (node ) port) - (map (lambda (x) (display x port)) - (list - "Font_node { \nqual: " + "Font_node {\nqual: " (font-qualifier node) "(def: " (font-default node) @@ -68,8 +57,7 @@ (display "=" port) (display (cdr x) port)) (hash-table->alist (font-children node))) - (display "} } \n")) - + (display "} }\n")) (define default-qualifier-order '(font-encoding font-family font-shape font-series)) @@ -77,6 +65,7 @@ (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)) @@ -101,8 +90,6 @@ (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)) @@ -110,11 +97,9 @@ (if (pair? new-fprops) (add-font child new-fprops size-family)))) - (define-method (add-font (node ) fprops size-family) (throw "must add to node, not leaf")) - (define-method (g-lookup-font (node ) alist-chain) (let* ((qual (font-qualifier node)) (def (font-default node)) @@ -125,19 +110,36 @@ (g-lookup-font desired-child alist-chain) (g-lookup-font (hashq-ref (font-children node) def) alist-chain)))) - (define-method (g-lookup-font (node ) 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) @@ -145,177 +147,29 @@ (list (cons 'font-encoding (car x))) (cons (* factor (cadr x)) (caddr x)))) - `((fetaNumber ,(ly:pt 20) - #(,(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")))) - - (fetaDynamic ,(ly:pt 20.0) #(,(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")))) - + `((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 "emmentaler11")) - ,(delay (ly:font-load "emmentaler13")) - ,(delay (ly:font-load "emmentaler14")) - ,(delay (ly:font-load "emmentaler16")) - ,(delay (ly:font-load "emmentaler18")) - ,(delay (ly:font-load "emmentaler20")) - ,(delay (ly:font-load "emmentaler23")) - ,(delay (ly:font-load "emmentaler26")))) - - (fetaBraces 100.0 #(,(delay - (ly:font-load "aybabtu"))))))) - -(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) - . (,(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) - . (,(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) - . (,(ly:pt 10.0) . #(,(delay (ly:font-load "cmti7")) - ,(delay (ly:font-load "cmti10")) - ,(delay (ly:font-load "cmti12"))))) - (#(roman italic bold) - . (,(ly:pt 10.0) . #(,(delay (ly:font-load "cmbxti8")) - ,(delay (ly:font-load "cmbxti10")) - ,(delay (ly:font-load "cmbxti14"))))) - (#(roman caps medium) - . (,(ly:pt 10.0) . #(,(delay (ly:font-load "cmcsc10"))))) - (#(roman upright bold-narrow ) - . (,(ly:pt 10.0) . #(,(delay (ly:font-load "cmb10"))))) - (#(sans upright medium) - . (,(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) - . (,(ly:pt 10.0) . #(,(delay (ly:font-load "cmtt8")) - ,(delay (ly:font-load "cmtt10")) - ,(delay (ly:font-load "cmtt12")))))))) - -;; Debian lmodern font support. -(define-public (add-cork-lm-fonts node factor) - (for-each - (lambda (x) - (add-font node `((font-encoding . cork-lm) - (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) - . (,(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) - . (,(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) - . (,(ly:pt 10.0) . #(,(delay (ly:font-load "lmri7")) - ,(delay (ly:font-load "lmri10")) - ,(delay (ly:font-load "lmri12"))))) - (#(roman italic bold) - . (,(ly:pt 10.0) . #(,(delay (ly:font-load "lmbxi10"))))) - (#(roman caps medium) - . (,(ly:pt 10.0) . #(,(delay (ly:font-load "lmcsc10"))))) - (#(roman upright bold-narrow ) - . (,(ly:pt 10.0) . #(,(delay (ly:font-load "lmb10"))))) - (#(sans upright medium) - . (,(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) - . (,(ly:pt 10.0) . #(,(delay (ly:font-load "lmssbx10"))))) - - (#(typewriter upright medium) - . (,(ly:pt 10.0) . #(,(delay (ly:font-load "lmtt8")) - ,(delay (ly:font-load "lmtt10")) - ,(delay (ly:font-load "lmtt12")))))))) - -;; ec-fonts-mftraced font support. -(define-public (add-ec-fonts node factor) - (for-each - (lambda (x) (add-font node - `((font-encoding . Extended-TeX-Font-Encoding---Latin) - (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) - . (,(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) - . (,(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) - . (,(ly:pt 10.0) . #(,(delay (ly:font-load "ecti7")) - ,(delay (ly:font-load "ecti10")) - ,(delay (ly:font-load "ecti12"))))) - (#(roman italic bold) - . (,(ly:pt 10.0) . #(,(delay (ly:font-load "ecbi8")) - ,(delay (ly:font-load "ecbi10")) - ,(delay (ly:font-load "ecbi14"))))) - (#(roman caps medium) - . (,(ly:pt 10.0) . #(,(delay (ly:font-load "eccc10"))))) - (#(roman slanted-caps medium) - . (,(ly:pt 10.0) . #(,(delay (ly:font-load "ecsc10"))))) - (#(roman upright bold-narrow ) - . (,(ly:pt 10.0) . #(,(delay (ly:font-load "ecrb10"))))) - (#(sans upright medium) - . (,(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) - . (,(ly:pt 10.0) . #(,(delay (ly:font-load "ectt8")) - ,(delay (ly:font-load "ectt10")) - ,(delay (ly:font-load "ectt12")))))))) - -(define-public (add-pango-fonts node family factor) + #(,(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 . ,family) + `((font-family . ,lily-family) (font-shape . ,shape) (font-series . ,series) (font-encoding . latin1) ;; ugh. ) - - `(,(ly:pt (* factor 12.0)) + `(,(ly:pt (* factor 11.0)) . #(,(cons (ly:pt 12) (ly:make-pango-description-string @@ -324,26 +178,27 @@ (font-shape . ,shape))) (ly:pt 12))))))) - (add-node 'upright 'medium) + (add-node 'upright 'normal) + (add-node 'caps 'normal) (add-node 'upright 'bold) - (add-node 'italic 'bold) - (add-node 'italic 'medium)) + (add-node 'italic 'normal) + (add-node 'italic 'bold)) -(define-public (make-cmr-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-cmr-fonts n factor) - (if (ly:kpathsea-find-file "lmr10.pfb") - (add-cork-lm-fonts n factor)) - (if (ly:kpathsea-find-file "ecrm10.pfa") - (add-ec-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) - (let ((n (make-font-tree-node 'font-encoding 'fetaMusic))) - (add-music-fonts n factor) - (add-pango-fonts n "Century Schoolbook L" factor) - n)) + (make-pango-font-tree + "Century Schoolbook L" + "Sans" "Mono" factor)) + +(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))))