| FazBrowse GitHub Viewer | Trending | | Home |
| Tools: [Download Repo ZIP] [Original HTTPS Page] |
1 parent ff270ad commit ff81ae3
2 files changed
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -13,6 +13,10 @@ | |||
| 13 | 13 | UNDEFINED flag, which is almost certainly the wrong thing to do. | |
| 14 | 14 | Bug #1911 | |
| 15 | 15 | ||
| 16 | + * term/svg.trm: Default to embedding generated images rather than | ||
| 17 | + creating and linking to separate *.png files. | ||
| 18 | + Bug #1801 | ||
| 19 | + | ||
| 16 | 20 | 2017-02-17 Ethan A Merritt <merritt@u.washington.edu> | |
| 17 | 21 | ||
| 18 | 22 | * term/canvas.trm term/js/gnuplot_mouse.js term/js/gnuplot_svg.js | |
| 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.186 2017-02-17 20:19:25 sfeam Exp $ | ||
| 2 | + * $Id: svg.trm,v 1.187 2017-02-20 19:38:03 sfeam Exp $ | ||
| 3 | 3 | */ | |
| 4 | 4 | ||
| 5 | 5 | /*------------------------------------------------------------------------------------------------------------------------------------ | |
@@ -1811,7 +1811,8 @@ SVG_image (unsigned m, unsigned n, coordval *image, gpiPoint *corner, t_imagecol | |||
| 1811 | 1811 | PREC, X(corner[0].x), PREC, Y(corner[0].y), | |
| 1812 | 1812 | PREC, X(corner[1].x) - X(corner[0].x), PREC, Y(corner[1].y) - Y(corner[0].y)); | |
| 1813 | 1813 | ||
| 1814 | - if (SVG_standalone || SVG_domterm) { | ||
| 1814 | + /* Feb 2017 - always embed images */ | ||
| 1815 | + if (TRUE || SVG_standalone || SVG_domterm) { | ||
| 1815 | 1816 | /* Embed the PNG file in SVG by converting to base64 */ | |
| 1816 | 1817 | fprintf(gpoutfile, "xlink:href='data:image/png;base64,"); | |
| 1817 | 1818 | if (write_png_base64_image(m, n, image, color_mode, gpoutfile)) | |
@@ -2196,11 +2197,9 @@ START_HELP(svg) | |||
| 2196 | 2197 | "", | |
| 2197 | 2198 | " Syntax:", | |
| 2198 | 2199 | " set terminal svg {size <x>,<y> {|fixed|dynamic}}", | |
| 2199 | - " {{no}enhanced}", | ||
| 2200 | - " {fname \"<font>\"} {fsize <fontsize>}", | ||
| 2201 | 2200 | " {mouse} {standalone | jsdir <dirname>}", | |
| 2202 | 2201 | " {name <plotname>}", | |
| 2203 | - " {font \"<fontname>{,<fontsize>}\"}", | ||
| 2202 | + " {font \"<fontname>{,<fontsize>}\"} {{no}enhanced}", | ||
| 2204 | 2203 | " {rounded|butt|square} {solid|dashed} {linewidth <lw>}", | |
| 2205 | 2204 | " {background <rgb_color>}", | |
| 2206 | 2205 | "", | |
@@ -2215,10 +2214,8 @@ START_HELP(svg) | |||
| 2215 | 2214 | " <fontsize> is the font size (in points, default 12). SVG viewing", | |
| 2216 | 2215 | " programs may substitute other fonts when the file is displayed.", | |
| 2217 | 2216 | "", | |
| 2218 | - " The svg terminal supports an enhanced text mode, which allows font", | ||
| 2219 | - " and other formatting commands to be embedded in labels and other text", | ||
| 2220 | - " strings. The enhanced text mode syntax is shared with other gnuplot", | ||
| 2221 | - " terminal types. See `enhanced` for more details.", | ||
| 2217 | + " The enhanced text mode syntax is shared with other gnuplot terminal types.", | ||
| 2218 | + " See `enhanced` for more details.", | ||
| 2222 | 2219 | "", | |
| 2223 | 2220 | " The `mouse` option tells gnuplot to add support for mouse tracking and for", | |
| 2224 | 2221 | " toggling individual plots on/off by clicking on the corresponding key entry.", | |
@@ -2227,15 +2224,13 @@ START_HELP(svg) | |||
| 2227 | 2224 | " You can change this by using the `jsdir` option to specify either a", | |
| 2228 | 2225 | " different local directory or a general URL. The latter is usually", | |
| 2229 | 2226 | " appropriate if you are embedding the svg into a web page.", | |
| 2230 | - " Alternatively, the `standalone` option embeds the mousing code and any", | ||
| 2231 | - " images in the svg document itself rather than linking to an external", | ||
| 2232 | - " resource.", | ||
| 2227 | + " Alternatively, the `standalone` option embeds the mousing code in the svg", | ||
| 2228 | + " document itself rather than linking to an external resource.", | ||
| 2233 | 2229 | "", | |
| 2234 | 2230 | " When an SVG file will be used in conjunction with external files,", | |
| 2235 | - " e.g. if it embeds a PNG image or is referenced by javascript code", | ||
| 2236 | - " in a web page or embedding document, then a unique name is required", | ||
| 2237 | - " to avoid potential conflicting references to other SVG plots.", | ||
| 2238 | - " Use the `name` option to ensure uniqueness.", | ||
| 2231 | + " e.g. if it is referenced by javascript code in a web page or parent document,", | ||
| 2232 | + " then a unique name is required to avoid potential conflicting references", | ||
| 2233 | + " to other SVG plots. Use the `name` option to ensure uniqueness.", | ||
| 2239 | 2234 | "" | |
| 2240 | 2235 | END_HELP(svg) | |
| 2241 | 2236 | ||
| Back | FazBrowse Home | New Git URL |
0 commit comments