-;;;; font.scm -- construct font trees
+;;;; This file is part of LilyPond, the GNU music typesetter.
;;;;
-;;;; source file of the GNU LilyPond music typesetter
-;;;;
-;;;; (c) 2004--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+;;;; Copyright (C) 2004--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+;;;;
+;;;; LilyPond is free software: you can redistribute it and/or modify
+;;;; it under the terms of the GNU General Public License as published by
+;;;; the Free Software Foundation, either version 3 of the License, or
+;;;; (at your option) any later version.
+;;;;
+;;;; LilyPond is distributed in the hope that it will be useful,
+;;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;;;; GNU General Public License for more details.
+;;;;
+;;;; You should have received a copy of the GNU General Public License
+;;;; along with LilyPond. If not, see <http://www.gnu.org/licenses/>.
;; TODO:
;;
qualifier default)
(make <Font-tree-node>
#:qualifier qualifier
- #:default default
+ #:default default
#:children (make-hash-table 11)))
(define-method (display (leaf <Font-tree-leaf>) port)
(map (lambda (x) (display x port))
(list
"#<Font-size-family:\n"
- (slot-ref leaf 'default-size)
+ (slot-ref leaf 'default-size)
(slot-ref leaf 'size-vector)
"#>"
)))
"(def: "
(font-default node)
") {\n"))
- (for-each
+ (for-each
(lambda (x)
(display "\n")
(display (car x) 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))
;; 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)
+(define-public (add-music-fonts node name family design-size-list factor)
+ "Add fonts to NODE. DESIGN-SIZE-LIST is a list of numbers."
(for-each
(lambda (x)
(add-font node
- (list (cons 'font-encoding (car x)))
+ (list (cons 'font-encoding (car x))
+ (cons 'font-family family))
(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"))))
+ ,(list->vector
+ (map (lambda (size)
+ (delay (ly:system-font-load (format "~a-~a" name size))))
+ design-size-list
+ )))
(fetaBraces ,(ly:pt 20.0)
- #(,(delay (ly:system-font-load "aybabtu")))))))
+ #(,(delay (ly:system-font-load
+ ;;; TODO: rename aybabtu to emmentaler-brace
+ (if (string=? name "emmentaler")
+ "aybabtu"
+ (string-append name "-brace"))
+ )))))))
(define-public (add-pango-fonts node lily-family family factor)
+ ;; Synchronized with the `text-font-size' variable in
+ ;; layout-set-absolute-staff-size-in-module (see paper.scm).
+ (define text-font-size (ly:pt (* factor 11.0)))
+
(define (add-node shape series)
(add-font node
`((font-family . ,lily-family)
(font-series . ,series)
(font-encoding . latin1) ;; ugh.
)
- `(,(ly:pt (* factor 11.0))
+ `(,text-font-size
. #(,(cons
(ly:pt 12)
(ly:make-pango-description-string
(font-shape . ,shape)))
(ly:pt 12)))))))
- (add-node 'upright 'normal)
- (add-node 'caps 'normal)
- (add-node 'upright 'bold)
+ (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-music-fonts n "emmentaler" 'feta '(11 13 14 16 18 20 23 26) factor)
+;; Let's not do this [yet], see input/regression/gonville.ly
+;; (add-music-fonts n "gonville" 'gonville 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)
(define-public (make-century-schoolbook-tree factor)
(make-pango-font-tree
- "Century Schoolbook L"
- "Sans" "Mono" factor))
+ "Century Schoolbook L,serif"
+ "sans-serif" "monospace" factor))
+
+(define-public all-text-font-encodings
+ '(latin1))
+
+(define-public all-music-font-encodings
+ '(fetaBraces
+ fetaDynamic
+ fetaMusic
+ fetaNumber))
(define-public (magstep s)
(exp (* (/ s 6) (log 2))))
projects / lilypond.git / blobdiff