X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Ffont.scm;h=859efcd46ef5c87c935d25dd3199d2aba3a19b2d;hb=750b714488c5af6eae22d07163bba8b554734ac6;hp=5adf258831ce73c49593b1cecf0b2ed9a0775770;hpb=0fbbdc6c58432060770d3d4f76e063c2028c0023;p=lilypond.git diff --git a/scm/font.scm b/scm/font.scm index 5adf258831..859efcd46e 100644 --- a/scm/font.scm +++ b/scm/font.scm @@ -254,12 +254,15 @@ used. This is used to select the proper design size for the text fonts. ; 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 +(define*-public (set-global-fonts #:key (music "emmentaler") (brace "emmentaler") - (roman "LilyPond Serif") - (sans "LilyPond Sans Serif") - (typewriter "LilyPond Monospace") + (roman (if (eq? (ly:get-option 'backend) 'svg) + "serif" "LilyPond Serif")) + (sans (if (eq? (ly:get-option 'backend) 'svg) + "sans-serif" "LilyPond Sans Serif")) + (typewriter (if (eq? (ly:get-option 'backend) 'svg) + "monospace" "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) @@ -267,7 +270,7 @@ used. This is used to select the proper design size for the text fonts. (add-pango-fonts n 'sans sans factor) (add-pango-fonts n 'typewriter typewriter factor) n)) - + (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 'feta "emmentaler" "emmentaler" feta-design-size-mapping factor) @@ -276,11 +279,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 - "LilyPond Serif" - "LilyPond Sans Serif" - "LilyPond Monospace" + (if (eq? (ly:get-option 'backend) 'svg) "serif" "LilyPond Serif") + (if (eq? (ly:get-option 'backend) 'svg) "sans-serif" "LilyPond Sans Serif") + (if (eq? (ly:get-option 'backend) 'svg) "monospace" "LilyPond Monospace") factor)) (define-public all-text-font-encodings