Commit 9cf5b1f
sfeam
svg terminal option fontscale
1 parent 668504f commit 9cf5b1f
2 files changed
Lines changed: 12 additions & 7 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1,3 +1,8 @@ | |||
| 1 | + 2017-06-14 Ethan A Merritt <merritt@u.washington.edu> | ||
| 2 | + | ||
| 3 | + * term/svg.trm: Normalize handling of terminal option "fontscale" to | ||
| 4 | + match other terminals. Remove obsolete keyword "fsize". | ||
| 5 | + | ||
| 1 | 6 | 2017-06-14 Bastian Maerkisch <bmaerkisch@web.de> | |
| 2 | 7 | ||
| 3 | 8 | * src/win/wd2d.cpp: When compiled with D2DDEBUG defined, enable the | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1,5 +1,5 @@ | |||
| 1 | 1 | /* Hello, Emacs, this is -*-C-*- | |
| 2 | - * $Id: svg.trm,v 1.187 2017-02-20 19:38:03 sfeam Exp $ | ||
| 2 | + * $Id: svg.trm,v 1.188 2017-06-14 18:29:53 sfeam Exp $ | ||
| 3 | 3 | */ | |
| 4 | 4 | ||
| 5 | 5 | /*------------------------------------------------------------------------------------------------------------------------------------ | |
@@ -640,12 +640,11 @@ SVG_options () | |||
| 640 | 640 | continue; | |
| 641 | 641 | } | |
| 642 | 642 | ||
| 643 | - if (almost_equals(c_token, "fs$ize")) { | ||
| 643 | + if (equals(c_token, "fontscale")) { | ||
| 644 | 644 | c_token++; | |
| 645 | - | ||
| 646 | - if (END_OF_COMMAND) | ||
| 647 | - int_error(c_token,"fsize: expecting font size"); | ||
| 648 | - SVG_fontSizeDef = real_expression(); | ||
| 645 | + SVG_fontscale = real_expression(); | ||
| 646 | + if (SVG_fontscale <= 0) | ||
| 647 | + SVG_fontscale = 1.0; | ||
| 649 | 648 | continue; | |
| 650 | 649 | } | |
| 651 | 650 | ||
@@ -702,7 +701,7 @@ SVG_options () | |||
| 702 | 701 | SVG_set_font(""); | |
| 703 | 702 | ||
| 704 | 703 | /* Save options back into options string in normalized format */ | |
| 705 | - sprintf(term_options, "size %d,%d%s %s fname '%s' fsize %g ", | ||
| 704 | + sprintf(term_options, "size %d,%d%s %s font '%s,%g' ", | ||
| 706 | 705 | (int)(SVG_xSize/SVG_SCALE), (int)(SVG_ySize/SVG_SCALE), | |
| 707 | 706 | SVG_fixed_size ? " fixed": " dynamic", | |
| 708 | 707 | term->put_text == ENHsvg_put_text ? "enhanced" : "", | |
@@ -2200,6 +2199,7 @@ START_HELP(svg) | |||
| 2200 | 2199 | " {mouse} {standalone | jsdir <dirname>}", | |
| 2201 | 2200 | " {name <plotname>}", | |
| 2202 | 2201 | " {font \"<fontname>{,<fontsize>}\"} {{no}enhanced}", | |
| 2202 | + " {fontscale <multiplier>}", | ||
| 2203 | 2203 | " {rounded|butt|square} {solid|dashed} {linewidth <lw>}", | |
| 2204 | 2204 | " {background <rgb_color>}", | |
| 2205 | 2205 | "", | |
0 commit comments