From c7e5f9c05366efc42885cd4e9d98bb077725bfa3 Mon Sep 17 00:00:00 2001 From: fred Date: Wed, 27 Mar 2002 02:05:33 +0000 Subject: [PATCH] lilypond-1.5.32 --- scm/font.scm | 194 +++++++++++++++++++++++++++------------------------ 1 file changed, 101 insertions(+), 93 deletions(-) diff --git a/scm/font.scm b/scm/font.scm index ffdae61043..93fd56addf 100644 --- a/scm/font.scm +++ b/scm/font.scm @@ -18,8 +18,7 @@ ((eq? name 'font-series) 1) ((eq? name 'font-shape) 2) ((eq? name 'font-family) 3) - ((eq? name 'font-name) 4) - ((eq? name 'font-design-size) 5) + ((eq? name 'font-design-size) 4) (else (ly-warning "unknown font field name")) ) )) @@ -42,109 +41,118 @@ (define paper-style-sheet-alist '( - ((8 * * braces feta-braces 8) . "feta-braces8") - ((7 * * braces feta-braces 7) . "feta-braces7") - ((6 * * braces feta-braces 6) . "feta-braces6") - ((5 * * braces feta-braces 5) . "feta-braces5") - ((4 * * braces feta-braces 4) . "feta-braces4") - ((3 * * braces feta-braces 3) . "feta-braces3") - ((2 * * braces feta-braces 2) . "feta-braces2") - ((1 * * braces feta-braces 1) . "feta-braces1") - ((0 * * braces feta-braces 0) . "feta-braces0") + ((8 * * braces 8) . "feta-braces8") + ((7 * * braces 7) . "feta-braces7") + ((6 * * braces 6) . "feta-braces6") + ((5 * * braces 5) . "feta-braces5") + ((4 * * braces 4) . "feta-braces4") + ((3 * * braces 3) . "feta-braces3") + ((2 * * braces 2) . "feta-braces2") + ((1 * * braces 1) . "feta-braces1") + ((0 * * braces 0) . "feta-braces0") )) ;; FIXME: what about this comment?: ;; should really have name/pt size at the front of the list. ;; (also tried to vary the order of this list, with little effect) ;; -;; (font-relative-size font-series font-shape font-family font-name +;; (font-relative-size font-series font-shape font-family ;; font-design-size) (define paper20-style-sheet-alist '( ;; why are font file names strings, not symbols? - ((3 medium upright number feta-nummer 13) . "feta-nummer13") - ((2 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 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 17) . "cmr17") - ((3 medium upright roman cmr 17) . "cmr17") - ((2 medium upright roman cmr 12) . "cmr12") - ((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 5) . "cmr5" ) - - ((3 medium italic roman cmti 12) . "cmti12") - ((2 medium italic roman cmti 12) . "cmti12") - ((1 medium italic roman cmti 12) . "cmti12") - ((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 7) . "cmti7") - - ((2 bold upright roman cmbx 12) . "cmbx12") - ((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") + ((3 medium upright number 13) . "feta-nummer13") + ((2 medium upright number 13) . "feta-nummer13") + ((1 medium upright number 11) . "feta-nummer11") + ((0 medium upright number 10) . "feta-nummer10") + ((-1 medium upright number 8) . "feta-nummer8") + ((-2 medium upright number 7) . "feta-nummer7") + ((-3 medium upright number 6) . "feta-nummer6") + ((-4 medium upright number 5) . "feta-nummer5") + ((-5 medium upright number 4) . "feta-nummer4") + + ((4 medium upright roman 17) . "cmr17") + ((3 medium upright roman 17) . "cmr17") + ((2 medium upright roman 12) . "cmr12") + ((1 medium upright roman 12) . "cmr12") + ((0 medium upright roman 10) . "cmr10") + ((-1 medium upright roman 8) . "cmr8" ) + ((-2 medium upright roman 7) . "cmr7" ) + ((-3 medium upright roman 6) . "cmr6" ) + ((-4 medium upright roman 5) . "cmr5" ) + ((-5 medium upright roman 5) . "cmr5" ) + + ((3 medium italic roman 12) . "cmti12") + ((2 medium italic roman 12) . "cmti12") + ((1 medium italic roman 12) . "cmti12") + ((0 medium italic roman 10) . "cmti10") + ((-1 medium italic roman 8) . "cmti8") + ((-2 medium italic roman 7) . "cmti7") + ((-3 medium italic roman 7) . "cmti7") + + ((2 bold upright roman 12) . "cmbx12") + ((1 bold upright roman 12) . "cmbx12") + ((0 bold upright roman 10) . "cmbx10") + ((-1 bold upright roman 8) . "cmbx8") + ((-2 bold upright roman 7) . "cmbx7") - ((2 bold italic roman cmbxti 12) . "cmbxti12") - ((1 bold italic roman cmbxti 12) . "cmbxti12") - ((0 bold italic roman cmbxti 10) . "cmbxti10") - ((-1 bold italic roman cmbxti 8) . "cmbxti8") - ((-2 bold italic roman cmbxti 7) . "cmbxti7") + ((2 bold italic roman 12) . "cmbxti12") + ((1 bold italic roman 12) . "cmbxti12") + ((0 bold italic roman 10) . "cmbxti10") + ((-1 bold italic roman 8) . "cmbxti8") + ((-2 bold italic roman 7) . "cmbxti7") - ((4 medium upright typewriter cmtt 17) . "cmtt17") - ((3 medium upright typewriter cmtt 17) . "cmtt17") - ((2 medium upright typewriter cmtt 12) . "cmtt12") - ((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 5) . "cmtt5" ) + ((4 medium upright typewriter 17) . "cmtt17") + ((3 medium upright typewriter 17) . "cmtt17") + ((2 medium upright typewriter 12) . "cmtt12") + ((1 medium upright typewriter 12) . "cmtt12") + ((0 medium upright typewriter 10) . "cmtt10") + ((-1 medium upright typewriter 8) . "cmtt8" ) + ((-2 medium upright typewriter 7) . "cmtt7" ) + ((-3 medium upright typewriter 6) . "cmtt6" ) + ((-4 medium upright typewriter 5) . "cmtt5" ) + ((-5 medium upright typewriter 5) . "cmtt5" ) - ((3 medium caps roman cmcsc 12) . "cmcsc12") - ((2 medium caps roman cmcsc 12) . "cmcsc12") - ((1 medium caps roman cmcsc 12) . "cmcsc12") - ((0 medium caps roman cmcsc 10) . "cmcsc10") - ((-1 medium caps roman cmcsc 8) . "cmcsc8") - ((-2 medium caps roman cmcsc 7) . "cmcsc7") - ((-3 medium caps roman cmcsc 7) . "cmcsc7") - - ((3 * * dynamic feta-din 19) . "feta-din19") - ((2 * * dynamic feta-din 19) . "feta-din19") - ((1 * * dynamic feta-din 17) . "feta-din17") - ((0 * * dynamic feta-din 14) . "feta-din14") - ((-1 * * dynamic feta-din 12) . "feta-din12") - ((-2 * * dynamic feta-din 9) . "feta-din9") - ((-3 * * dynamic feta-din 8) . "feta-din8") - ((-4 * * dynamic feta-din 7) . "feta-din7") - ((-5 * * dynamic feta-din 6) . "feta-din6") - - ((2 * * music feta 26) . "feta26") - ((1 * * music feta 23) . "feta23") - ((0 * * music feta 20) . "feta20") - ((-0.5 * * music feta 20) . "feta19") - ((-1 * * music feta 16) . "feta16") - ((-2 * * music feta 13) . "feta13") - ((-3 * * music feta 11) . "feta11") - ((-4 * * music feta 11) . "feta11") - - ((0 * * math msam 10) . "msam10") - ((-1 * * math msam 10) . "msam10") - ((-2 * * math msam 10) . "msam10") - ((-3 * * math msam 10) . "msam10") + ((3 medium caps roman 12) . "cmcsc12") + ((2 medium caps roman 12) . "cmcsc12") + ((1 medium caps roman 12) . "cmcsc12") + ((0 medium caps roman 10) . "cmcsc10") + ((-1 medium caps roman 8) . "cmcsc8") + ((-2 medium caps roman 7) . "cmcsc7") + ((-3 medium caps roman 7) . "cmcsc7") + + ((3 * * dynamic 19) . "feta-din19") + ((2 * * dynamic 19) . "feta-din19") + ((1 * * dynamic 17) . "feta-din17") + ((0 * * dynamic 14) . "feta-din14") + ((-1 * * dynamic 12) . "feta-din12") + ((-2 * * dynamic 9) . "feta-din9") + ((-3 * * dynamic 8) . "feta-din8") + ((-4 * * dynamic 7) . "feta-din7") + ((-5 * * dynamic 6) . "feta-din6") + + ((2 * * music 26) . "feta26") + ((1 * * music 23) . "feta23") + ((0 * * music 20) . "feta20") + ((-0.5 * * music 20) . "feta19") + ((-1 * * music 16) . "feta16") + ((-2 * * music 13) . "feta13") + ((-3 * * music 11) . "feta11") + ((-4 * * music 11) . "feta11") + + ((2 * * ancient 26) . "parmesan26") + ((1 * * ancient 23) . "parmesan23") + ((0 * * ancient 20) . "parmesan20") + ((-0.5 * * ancient 20) . "parmesan19") + ((-1 * * ancient 16) . "parmesan16") + ((-2 * * ancient 13) . "parmesan13") + ((-3 * * ancient 11) . "parmesan11") + ((-4 * * ancient 11) . "parmesan11") + + ((0 * * math 10) . "msam10") + ((-1 * * math 10) . "msam10") + ((-2 * * math 10) . "msam10") + ((-3 * * math 10) . "msam10") )) ;; @@ -316,7 +324,7 @@ and warn if the selected font is not unique. (define (properties-to-font-name fonts properties-alist-list) (let* ( ;; change order to change priorities of qualifiers. - (q-order '(font-name font-family font-series font-shape + (q-order '(font-family font-series font-shape font-design-size font-relative-size)) (rawqualifiers (map (lambda (x) (chain-assoc x properties-alist-list)) -- 2.39.5