- (add-font
- node
- `((font-encoding . ec)
- (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))
- ))
-
-;;; super-cm, aka lmodern (on Debian) seems rather broken:
-;;; * no usable TFM files (no lmr10.tfm, only cork-lmr10.tfm)
-;;; * broken AFM files:
-;;; - invalid keyword 'Generated'
-;;; - lists FontEncoding Fontspecific -- duh
-;;; revert to ec-fonts-mftraced for now
-;;; make this easily switchable?
-
-;;; `((#(roman upright medium) .
-;;; (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"))
-;;; ,(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"))
-;;; ,(delay (ly:font-load "lmri10"))
-;;; ,(delay (ly:font-load "lmri12")))))
-;;; (#(roman italic bold) .
-;;; (10.0 . #(,(delay (ly:font-load "lmbi8"))
-;;; ,(delay (ly:font-load "lmbi10"))
-;;; ,(delay (ly:font-load "lmbi14")))))
-
-;;; (#(roman caps medium) .
-;;; (10.0 . #(,(delay (ly:font-load "lmcs10")))))
-
-;;; (#(roman upright bold-narrow ) .
-;;; (10.0 . #(,(delay (ly:font-load "lmb10")))))
-
-;;; (#(sans upright medium) .
-;;; (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")))))
-
-;;; (#(typewriter upright medium) .
-;;; (10.0 . #(,(delay (ly:font-load "lmtt8"))
-;;; ,(delay (ly:font-load "lmtt10"))
-;;; ,(delay (ly:font-load "lmtt12"))))))))
- `((#(roman upright medium) .
- (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"))
- ,(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"))
- ,(delay (ly:font-load "ecti10"))
- ,(delay (ly:font-load "ecti12")))))
- (#(roman italic bold) .
- (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")))))
- (#(roman slanted-caps medium) .
- (10.0 . #(,(delay (ly:font-load "ecsc10")))))
- (#(roman upright bold-narrow ) .
- (10.0 . #(,(delay (ly:font-load "ecrb10")))))
- (#(sans upright medium) .
- (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"))
- ,(delay (ly:font-load "ectt10"))
- ,(delay (ly:font-load "ectt12"))))))))
-
-
-
-
-;; (display (make-font-tree 1.0))
-
-;; Century Schoolbook fonts filenames 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")))))
- )
-
+ (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 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))