;;;;
;;;; source file of the GNU LilyPond music typesetter
;;;;
-;;;; (c) 2004 Han-Wen Nienhuys <hanwen@xs4all.nl>
-
-;; As an excercise, do it with records.
-;; Should use GOOPS, really.
+;;;; (c) 2004--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
;; 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 <Font-tree-element>
())
-
(define-class <Font-tree-leaf> (<Font-tree-element>)
(default-size #:init-keyword #:default-size)
(size-vector #:init-keyword #:size-vector))
(define-method (display (leaf <Font-tree-leaf>) port)
(map (lambda (x) (display x port))
(list
- "Font-size-family: \n"
+ "#<Font-size-family: \n"
(slot-ref leaf 'default-size)
- (slot-ref leaf 'size-vector))))
+ (slot-ref leaf 'size-vector)
+ "#>"
+ )))
(define-method (display (node <Font-tree-node>) port)
(define-method (add-font (node <Font-tree-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))
(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
(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 "emmentaler-11"))
,(delay (ly:font-load "emmentaler-13"))
,(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
(add-node 'upright 'normal)
(add-node 'upright 'bold)
(add-node 'italic 'normal)
- (add-node 'italic 'bold)
- )
+ (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 (make-century-schoolbook-tree factor)
+ (make-pango-font-tree
+ "Century Schoolbook L"
+ "Sans" "Mono" factor))
+
(define-public (magstep x)
(exp (* (/ x 6) (log 2))))
projects / lilypond.git / blobdiff