)
))
-;; return that part of LIST for which PRED is true.
(define (filter-list pred? list)
+ "return that part of LIST for which PRED is true."
(if (null? list) '()
(let* (
(rest (filter-list pred? (cdr list)))
;; this is bad, since we generate garbage every font-lookup.
;; otoh, if the qualifiers is narrow enough , we don't generate much garbage.
-
-;; return those descriptions from FONT-DESCR-LIST whose FIELD-NAME matches VALUE
(define (filter-field field-name value font-descr-alist)
+ "return those descriptions from FONT-DESCR-LIST whose FIELD-NAME matches VALUE"
(filter-list
(lambda (x) (eq? value (font-field field-name (car x))))
font-descr-alist)
((-1 bold upright roman cmbx 8) . "cmbx8")
((-2 bold upright roman cmbx 7) . "cmbx7")
+ ((4 medium upright typewriter cmtt 20) . "cmtt20")
+ ((3 medium upright typewriter cmtt 16) . "cmtt16")
+ ((2 medium upright typewriter cmtt 14) . "cmtt14")
+ ((1 medium upright typewriter cmtt 12) . "cmtt12")
+ ((0 medium upright typewriter cmtt 10) . "cmtt10")
+ ((-1 medium upright typewriter cmtt 8) . "cmtt8" )
+ ((-2 medium upright typewriter cmtt 7) . "cmtt7" )
+ ((-3 medium upright typewriter cmtt 6) . "cmtt6" )
+ ((-4 medium upright typewriter cmtt 5) . "cmtt5" )
+ ((-5 medium upright typewriter cmtt 4) . "cmtt4" )
+
;; should use the same brace font every where and fix C++ code.
((2 medium upright braces feta-braces 26) . "feta-braces26")
((1 medium upright braces feta-braces 23) . "feta-braces23")
((-2 medium upright braces feta-braces 13) . "feta-braces13")
((-3 medium upright braces feta-braces 11) . "feta-braces11")
- ((3 bold italic dynamic feta-din 13) . "feta-din13")
- ((2 bold italic dynamic feta-din 13) . "feta-din13")
- ((1 bold italic dynamic feta-din 11) . "feta-din11")
- ((0 bold italic dynamic feta-din 10) . "feta-din10")
- ((-1 bold italic dynamic feta-din 8) . "feta-din8")
- ((-2 bold italic dynamic feta-din 7) . "feta-din7")
- ((-3 bold italic dynamic feta-din 6) . "feta-din6")
- ((-4 bold italic dynamic feta-din 5) . "feta-din5")
- ((-5 bold italic dynamic feta-din 4) . "feta-din4")
+ ((3 bold italic dynamic feta-din 19) . "feta-din19")
+ ((2 bold italic dynamic feta-din 19) . "feta-din19")
+ ((1 bold italic dynamic feta-din 17) . "feta-din17")
+ ((0 bold italic dynamic feta-din 14) . "feta-din14")
+ ((-1 bold italic dynamic feta-din 12) . "feta-din12")
+ ((-2 bold italic dynamic feta-din 9) . "feta-din9")
+ ((-3 bold italic dynamic feta-din 8) . "feta-din8")
+ ((-4 bold italic dynamic feta-din 7) . "feta-din7")
+ ((-5 bold italic dynamic feta-din 6) . "feta-din6")
((2 medium upright music feta 26) . "feta26")
((1 medium upright music feta 23) . "feta23")
((-3 medium upright math msam 10) . "msam10")
))
-;; return a FONT-DESCR with relative size decremented by DECREMENT
+;;
(define (change-relative-size font-desc decrement)
+ "return a FONT-DESCR with relative size decremented by DECREMENT"
(cons (- (car font-desc) decrement) (cdr font-desc))
)
-;; map a function FUNC over the keys of an alist LIST, leaving the vals.
+;;
(define (map-alist-keys func list)
+ "map a function FUNC over the keys of an alist LIST, leaving the vals. "
(if (null? list)
'()
(cons (cons (func (caar list)) (cdar list))
(map-alist-keys func (cdr list)))
))
-;; map a function FUNC over the vals of LIST, leaving the keys.
+;;
(define (map-alist-vals func list)
+ "map a function FUNC over the vals of LIST, leaving the keys."
(if (null? list)
'()
(cons (cons (caar list) (func (cdar list)))
(dynamic . ((font-series . bold) (font-family . dynamic) (font-relative-size . 0)))
))
(properties-to-font .
-
,Font_interface::properties_to_font_name)
- ; ,properties-to-font-name)
;; FIXME: this is a not-so-cool idea to use ALIGN
;; RAISE, LOOKUP, since they are not proper elt-properties,
. ((rows . ((align . 0)))
(lines . ((align . 1)))
(roman . ((font-family . roman)))
- (music . ((font-family . music) (font-shape . upright)))
+ (music . ((font-family . music) (font-shape . upright) (lookup . name)))
(finger . ((font-style . finger)))
(bold . ((font-series . bold)))
(italic . ((font-shape . italic)))
)
)
-;; reduce the font list by successively applying a font-qualifier.
(define (qualifiers-to-fontnames qualifiers font-descr-alist)
+ " reduce the font list by successively applying a font-qualifier."
(if (null? qualifiers)
font-descr-alist
)
))
-
-;; does FONT-DESC satisfy QUALIFIERS?
(define (font-qualifies? qualifiers font-desc)
+ "does FONT-DESC satisfy QUALIFIERS?"
(if (null? qualifiers) #t
(if (eq? (font-field (caar qualifiers) font-desc) (cdar qualifiers))
(font-qualifies? (cdr qualifiers) font-desc)
))
-;; return a single font from FONTS (or a default, if none found)
-;; and warn if the selected font is not unique.
(define (select-unique-font qualifiers fonts)
+ "return a single font from FONTS (or a default, if none found)
+and warn if the selected font is not unique.
+"
(let* (
(err (current-error-port))
)
)
;; TODO
-;; add support for override by font-name
-;; very often-used; hard-code in C++, and use SCM glue code.
-
+;; the C++ version in font-interface.cc is usually used.
(define (properties-to-font-name fonts properties-alist-list)
(let* (
;; change order to change priorities of qualifiers.
font) ; return the topmost.
))
+(if #f (begin
+ (define (test-module)
+ (display (filter-list pair? '(1 2 (1 2) (1 .2)))
+ (display (filter-field 'font-name 'cmbx paper20-style-sheet-alist))
+ (display (qualifiers-to-fontname '((font-name . cmbx)) paper20-style-sheet-alist))
+ (display (style-to-font-name 'paper20 'large))
+ )
+ )
+ )
-; (define (test-module)
-; (display (filter-list pair? '(1 2 (1 2) (1 .2)))
-;(display (filter-field 'font-name 'cmbx paper20-style-sheet-alist))
-
-; (display (qualifiers-to-fontname '((font-name . cmbx)) paper20-style-sheet-alist))
-; (display (style-to-font-name 'paper20 'large))
-; )
-
-
+)
projects / lilypond.git / blobdiff