diff options
| author | Paul Morris <paulwmorris@gmail.com> | 2016-02-20 11:24:04 -0500 |
|---|---|---|
| committer | James Lowe <pkx166h@gmail.com> | 2016-02-28 09:21:24 +0000 |
| commit | ead2001959fa5bda0338e92a0f301fd1f26ad768 (patch) | |
| tree | 5362bf5f9bd08fbcbad948ac7ea52b2d7f6d1ee3 | |
| parent | 4299c96f609f79426a181ffed107d17fa6e1fdbd (diff) | |
Issue 4776/1 font.scm: better svg defaults for font-family
if the user has not set the font, use a
meaningful svg default ('serif' 'sans-serif'
or 'monospace') for the font-family property
| -rw-r--r-- | scm/font.scm | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/scm/font.scm b/scm/font.scm index f10809d00a..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) @@ -278,9 +281,9 @@ used. This is used to select the proper design size for the text fonts. (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 |