)
))
-;; 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)
)
+;; should really have name/pt size at the front of the list.
+;;
+;; (also tried to vary the order of this list, with little effect)
(define paper20-style-sheet-alist
'(
((3 medium upright number feta-nummer 13) . "feta-nummer13")
((1 medium upright number feta-nummer 11) . "feta-nummer11")
((0 medium upright number feta-nummer 10) . "feta-nummer10")
((-1 medium upright number feta-nummer 8) . "feta-nummer8")
- ((-2 medium upright number feta-nummer 6) . "feta-nummer6")
- ((-3 medium upright number feta-nummer 5) . "feta-nummer5")
- ((-4 medium upright number feta-nummer 4) . "feta-nummer4")
- ((0 medium upright roman cmr 10) . "cmr10")
+ ((-2 medium upright number feta-nummer 7) . "feta-nummer7")
+ ((-3 medium upright number feta-nummer 6) . "feta-nummer6")
+ ((-4 medium upright number feta-nummer 5) . "feta-nummer5")
+ ((-5 medium upright number feta-nummer 4) . "feta-nummer4")
+
+ ((4 medium upright roman cmr 20) . "cmr20")
+ ((3 medium upright roman cmr 16) . "cmr16")
+ ((2 medium upright roman cmr 14) . "cmr14")
((1 medium upright roman cmr 12) . "cmr12")
+ ((0 medium upright roman cmr 10) . "cmr10")
((-1 medium upright roman cmr 8) . "cmr8" )
((-2 medium upright roman cmr 7) . "cmr7" )
((-3 medium upright roman cmr 6) . "cmr6" )
((-4 medium upright roman cmr 5) . "cmr5" )
((-5 medium upright roman cmr 4) . "cmr4" )
- ((-1 medium italic roman cmti 8) . "cmti8")
- ((0 medium italic roman cmti 10) . "cmti10")
+
+ ((3 medium italic roman cmti 16) . "cmti16")
+ ((2 medium italic roman cmti 14) . "cmti14")
((1 medium italic roman cmti 12) . "cmti12")
- ((2 bold upright roman cmbx 10) . "cmbx10")
- ((1 bold upright roman cmbx 12) . "cmbx12")
+ ((0 medium italic roman cmti 10) . "cmti10")
+ ((-1 medium italic roman cmti 8) . "cmti8")
+ ((-2 medium italic roman cmti 7) . "cmti7")
+ ((-3 medium italic roman cmti 6) . "cmti6")
+
((2 bold upright roman cmbx 14) . "cmbx14")
- ((-3 medium upright math msam 10) . "msam10")
- ((-2 medium upright math msam 10) . "msam10")
- ((-1 medium upright math msam 10) . "msam10")
- ((0 medium upright math msam 10) . "msam10")
+ ((1 bold upright roman cmbx 12) . "cmbx12")
+ ((0 bold upright roman cmbx 10) . "cmbx10")
+ ((-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.
- ((0 medium upright braces feta-braces 20) . "feta-braces20")
((2 medium upright braces feta-braces 26) . "feta-braces26")
((1 medium upright braces feta-braces 23) . "feta-braces23")
- ((3 bold italic dynamic feta 16) . "feta-din16")
- ((2 bold italic dynamic feta 16) . "feta-din16")
- ((3 bold italic dynamic feta 10) . "feta-din13")
- ((2 bold italic dynamic feta 10) . "feta-din13")
- ((1 bold italic dynamic feta 10) . "feta-din12")
- ((0 bold italic dynamic feta 10) . "feta-din10")
- ((-1 bold italic dynamic feta 10) . "feta-din8")
- ((-2 bold italic dynamic feta 10) . "feta-din7")
- ((-3 bold italic dynamic feta 10) . "feta-din6")
- ((-4 bold italic dynamic feta 10) . "feta-din5")
- ((-5 bold italic dynamic feta 10) . "feta-din4")
+ ((0 medium upright braces feta-braces 20) . "feta-braces20")
+ ((-1 medium upright braces feta-braces 16) . "feta-braces16")
+ ((-2 medium upright braces feta-braces 13) . "feta-braces13")
+ ((-3 medium upright braces feta-braces 11) . "feta-braces11")
+
+ ((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")
((0 medium upright music feta 20) . "feta20")
+ ((-0.5 medium upright music feta 20) . "feta19")
((-1 medium upright music feta 16) . "feta16")
((-2 medium upright music feta 13) . "feta13")
- ((-3 medium upright music feta 13) . "feta11")
- ((-4 medium upright music feta 13) . "feta11")
- ((1 medium upright music feta 23) . "feta23")
- ((2 medium upright music feta 26) . "feta26")
+ ((-3 medium upright music feta 11) . "feta11")
+ ((-4 medium upright music feta 11) . "feta11")
+
+ ((0 medium upright math msam 10) . "msam10")
((-1 medium upright math msam 10) . "msam10")
((-2 medium upright math msam 10) . "msam10")
((-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)))
'((paper11 . -3)
(paper13 . -2)
(paper16 . -1)
+ (paper19 . -0.5)
(paper20 . 0)
(paper23 . 1)
(paper26 . 2)
. ((finger . ((font-family . number) (font-relative-size . -3)))
(volta . ((font-family . number) (font-relative-size . -2)))
(tuplet . ((font-family . roman) (font-shape . italic) (font-relative-size . -1)))
- (timesig . ((font-family . number) (font-relative-size . 0)))
+
+ (timesig . ((font-family . number) (font-relative-size . 0)))
+ (timesig-symbol . ((font-family . music) (font-relative-size . 0)))
+
(mmrest . ((font-family . number) (font-relative-size . 1)))
+ (mmrest-symbol . ((font-family . music) (font-relative-size . 0)))
+
(mark . ((font-family . number) (font-relative-size . 1)))
(script . ((font-family . roman) (font-relative-size . -1)))
(large . ((font-family . roman) (font-relative-size . 1)))
(Large . ((font-series . bold) (font-family . roman) (font-relative-size . 2)))
(dynamic . ((font-series . bold) (font-family . dynamic) (font-relative-size . 0)))
))
- (properties-to-font . ,properties-to-font-name)
+ (properties-to-font .
+ ,Font_interface::properties_to_font_name)
;; FIXME: this is a not-so-cool idea to use ALIGN
;; RAISE, LOOKUP, since they are not proper elt-properties,
;; and might interfere with them.
- (markup-abbrev-to-properties-alist
+ (markup-to-properties . ,markup-to-properties)
+ (abbreviation-alist
. ((rows . ((align . 0)))
(lines . ((align . 1)))
(roman . ((font-family . roman)))
- (music . ((font-family . music)))
+ (music . ((font-family . music) (font-shape . upright) (lookup . name)))
(finger . ((font-style . finger)))
(bold . ((font-series . bold)))
(italic . ((font-shape . italic)))
)
)
-
-
-(define (font-regexp-to-font-name paper regexp)
- (let ((style-sheet (cdr (assoc paper style-sheet-alist))))
- (let loop ((fonts style-sheet))
- (if (string-match regexp (caar fonts))
- (cdar fonts)
- (if (pair? (cdr fonts))
- (loop (cdr fonts))
- '())))))
-
-;; 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.
selected) ; return the topmost.
))
-(define markup-abbrev-to-properties-alist
- (append
- (map (lambda (x) (cons (car x) (cons 'font-style (car x))))
- style-to-font-alist)))
-
-(define (markup-to-properties markup)
+(define (markup-to-properties sheet markup)
;;(display "markup: `")
- ;;(display markup)
+ ;;(write markup)
;;(display "'\n")
(if (pair? markup)
(list markup)
- (let ((entry (assoc markup markup-abbrev-to-properties-alist)))
- (if entry (cdr entry)
+ (let ((entry (assoc markup
+ ;; assoc-chain?
+ (append (cdr (assoc 'abbreviation-alist sheet))
+ (cdr (assoc 'style-alist sheet))))))
+ (if entry
+ (cdr entry)
(list (cons markup #t))))))
; fixme, how's this supposed to work?
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