(list
"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 (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)))))
(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)
(define-method (g-lookup-font (node <Font-tree-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)
(list (cons 'font-encoding (car x)))
(cons (* factor (cadr x))
(caddr x))))
- `(
- (fetaNumber 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"))))
+ `((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 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"))))
-
- (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 100.0 #(,(delay
- (ly:font-load "aybabtu")))))))
+ (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))
(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"))))))))
(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"))))))))
(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 12.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 '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)))
(define-public (make-century-schoolbook-tree 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 "Century Schoolbook L" factor)
+ (add-pango-fonts n 'sans "Luxi Sans" factor)
n))
(define-public (magstep x)
projects / lilypond.git / blobdiff