X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=scm%2Ffont.scm;h=eefc1c26ee9627316e43e11e09101d9e4ceebbe2;hb=6d8ba7d06484047d9ee5afdd8ba3f3f47a693e31;hp=3b10f93a594d4e7d9da11d39ea66b8c9076081c1;hpb=46b41fe6cef4d1a9746e21f809c0ee62662aa145;p=lilypond.git diff --git a/scm/font.scm b/scm/font.scm index 3b10f93a59..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,6 +68,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)) @@ -133,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 @@ -145,36 +159,19 @@ (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 + #(,(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) @@ -306,16 +303,16 @@ ,(delay (ly:font-load "ectt10")) ,(delay (ly:font-load "ectt12")))))))) -(define-public (add-pango-fonts node family factor) +(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 +321,46 @@ (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) - (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-pango-fonts n "Century Schoolbook L" 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))))