X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Ffont.scm;h=f10809d00aa45ffb2f06b27977635caa467b3470;hb=d8fb420c61d9fa46bc2507d933b7aec7f55cdbd5;hp=0582a492a1e18dec33db1c2533e3133b3f16740f;hpb=e8d5061834a5a658c5ffd078237e9cd660069a7d;p=lilypond.git diff --git a/scm/font.scm b/scm/font.scm index 0582a492a1..f10809d00a 100644 --- a/scm/font.scm +++ b/scm/font.scm @@ -249,12 +249,17 @@ used. This is used to select the proper design size for the text fonts. ; "emmentaler", "sans-serif", and "monospace", respectively. All fonts are ; still accesible through the usual scheme symbols: 'feta, 'roman, 'sans, and ; 'typewriter. +; +; Note that 'LilyPond Serif', 'LilyPond Sans Serif' and 'Lilypond Monospace' +; are aliases that are defined in mf/00-lilypond-fonts.conf.in (source file) +; or fonts/00-lilypond-fonts.conf (installed file). + (define*-public (set-global-fonts #:key (music "emmentaler") (brace "emmentaler") - (roman "Century Schoolbook L") - (sans "Nimbus Sans L") - (typewriter "Nimbus Mono L") + (roman "LilyPond Serif") + (sans "LilyPond Sans Serif") + (typewriter "LilyPond Monospace") (factor 1)) (let ((n (make-font-tree-node 'font-encoding 'fetaMusic))) (add-music-fonts n 'feta music brace feta-design-size-mapping factor) @@ -271,11 +276,11 @@ used. This is used to select the proper design size for the text fonts. (add-pango-fonts n 'typewriter typewrite-str factor) n)) -(define-public (make-century-schoolbook-tree factor) +(define-public (make-default-fonts-tree factor) (make-pango-font-tree - "Century Schoolbook L" - "Nimbus Sans L" - "Nimbus Mono L" + "LilyPond Serif" + "LilyPond Sans Serif" + "LilyPond Monospace" factor)) (define-public all-text-font-encodings