X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Ffont.scm;h=d05cc2fd78efdeddf3d85b7fdc19602bf6e393a3;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=1f1023514e02f646d69549e3ef16b70e8628dd71;hpb=5547ff00446ba0ac2bdbd1fe3205c2fb8411bb2f;p=lilypond.git diff --git a/scm/font.scm b/scm/font.scm index 1f1023514e..d05cc2fd78 100644 --- a/scm/font.scm +++ b/scm/font.scm @@ -1,21 +1,16 @@ -;; As an excercise, do it with records. -;; Should use GOOPS, really. +;;;; font.scm -- construct font trees +;;;; +;;;; source file of the GNU LilyPond music typesetter +;;;; +;;;; (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) @@ -32,39 +27,37 @@ (define (make-font-tree-node qualifier default) (make - #:qualifier qualifier - #:default default - #:children (make-hash-table 11))) + #:qualifier qualifier + #:default default + #:children (make-hash-table 11))) (define-method (display (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 ) 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")) - + (list + "#" + ))) +(define-method (display (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)) @@ -72,14 +65,14 @@ (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))) - )) + (assoc-get qual fprops))))) + (define (next-qualifier order props) (cond ((and (null? props) (null? order)) @@ -89,18 +82,14 @@ (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))) - - + (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 (set! child (make-node new-fprops size-family)) @@ -108,157 +97,108 @@ (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)) + (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)) - ) + (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) - ))) + (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)) - -(define-public (make-font-tree factor) - (let* - ((n (make-font-tree-node 'font-encoding 'music)) - ) - - (for-each - (lambda (x) - (add-font n - (list (cons 'font-encoding (car x))) - (cons (* factor (cadr x)) - (caddr x)))) - `((number 10 - #(,(delay (ly:font-load "feta-nummer4")) - ,(delay (ly:font-load "feta-nummer6")) - ,(delay (ly:font-load "feta-nummer8")) - ,(delay (ly:font-load "feta-nummer10")) - ,(delay (ly:font-load "feta-nummer12")) - ,(delay (ly:font-load "feta-nummer16")))) - (dynamic 14.0 #(,(delay (ly:font-load "feta-din6")) - ,(delay (ly:font-load "feta-din8")) - ,(delay (ly:font-load "feta-din10")) - ,(delay (ly:font-load "feta-din12")) - ,(delay (ly:font-load "feta-din14")) - ,(delay (ly:font-load "feta-din17")) - )) - (math 10 #(,(delay (ly:font-load "msam10")))) - (music 20.0 - #(,(delay (ly:make-virtual-font - (ly:font-load "feta11") - (ly:font-load "parmesan11"))) - ,(delay (ly:make-virtual-font - (ly:font-load "feta13") - (ly:font-load "parmesan13"))) - ,(delay (ly:make-virtual-font - (ly:font-load "feta14") - (ly:font-load "parmesan14"))) - ,(delay (ly:make-virtual-font - (ly:font-load "feta16") - (ly:font-load "parmesan16"))) - ,(delay (ly:make-virtual-font - (ly:font-load "feta18") - (ly:font-load "parmesan18"))) - ,(delay (ly:make-virtual-font - (ly:font-load "feta20") - (ly:font-load "parmesan20"))) - ,(delay (ly:make-virtual-font - (ly:font-load "feta23") - (ly:font-load "parmesan23"))) - ,(delay (ly:make-virtual-font - (ly:font-load "feta26") - (ly:font-load "parmesan26"))) - )) - - (braces 10 #(,(delay - (ly:make-virtual-font - (ly:font-load "feta-braces00") - (ly:font-load "feta-braces10") - (ly:font-load "feta-braces20") - (ly:font-load "feta-braces30") - (ly:font-load "feta-braces40") - (ly:font-load "feta-braces50") - (ly:font-load "feta-braces60") - (ly:font-load "feta-braces70") - (ly:font-load "feta-braces80")) - ))))) - - (for-each - (lambda (x) - (add-font - n - `((font-encoding . 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) . - (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")) - ,(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")) - ,(delay (ly:font-load "cmti10")) - ,(delay (ly:font-load "cmti12")) - ))) - (#(roman italic bold) . - (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"))))) - - (#(roman upright bold-narrow ) . - (10.0 . #(,(delay (ly:font-load "cmb10")) - ))) - - (#(sans upright medium) . - (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")) - ,(delay (ly:font-load "cmtt10")) - ,(delay (ly:font-load "cmtt12")) - ))) - )) +;; 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)) -; (display (make-font-tree 1.0)) +(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 (magstep x) - (exp (* (/ x 6) (log 2)))) +(define-public (magnification->font-size m) + (* 6 (/ (log m) (log 2))))