Mercurial > octave-nkf
changeset 19602:f88ee85d4da9 gui-release
Restore valid uses of pswrite device in cset a402493c0605.
* __ghostscript__.m: Restore making decisions (if statements) based on
pswrite device since someone may have explicitly passed -dpswrite option.
* __print_parse_opts__.m: Restore making decisions (if statements) based on
pswrite device since someone may have explicitly passed -dpswrite option.
| author | Rik <rik@octave.org> |
|---|---|
| date | Mon, 12 Jan 2015 09:13:19 -0800 |
| parents | 6a9bde1ba0ea |
| children | 9b90d8579c61 6561179c6c22 |
| files | scripts/plot/util/private/__ghostscript__.m scripts/plot/util/private/__print_parse_opts__.m |
| diffstat | 2 files changed, 14 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/scripts/plot/util/private/__ghostscript__.m Mon Jan 12 08:47:12 2015 -0800 +++ b/scripts/plot/util/private/__ghostscript__.m Mon Jan 12 09:13:19 2015 -0800 @@ -76,7 +76,7 @@ gs_opts, opts.antialiasing_textalphabits, opts.antialiasing_graphicsalphabits); gs_opts = sprintf ("%s -r%dx%d", gs_opts, [1, 1] * opts.resolution); - elseif (any (strcmp (opts.device, {"ps2write", "pdfwrite"}))) + elseif (any (strcmp (opts.device, {"pswrite", "ps2write", "pdfwrite"}))) gs_opts = sprintf ("%s -dEmbedAllFonts=true", gs_opts); if (strcmp (opts.device, "pdfwrite")) ## Optimize for loading @@ -142,7 +142,7 @@ cmd = sprintf ("%s %s -sOutputFile=\"%s\"", opts.binary, gs_opts, opts.output); endif if (! isempty (opts.prepend) - && any (strcmpi (opts.device, {"ps2write", "pdfwrite"}))) + && any (strcmpi (opts.device, {"pswrite", "ps2write", "pdfwrite"}))) ## FIXME - Fonts get may be mangled when appending ps/ps2. ## See "How to concatenate several PS files" at the link, ## http://en.wikibooks.org/wiki/PostScript_FAQ
--- a/scripts/plot/util/private/__print_parse_opts__.m Mon Jan 12 08:47:12 2015 -0800 +++ b/scripts/plot/util/private/__print_parse_opts__.m Mon Jan 12 09:13:19 2015 -0800 @@ -225,7 +225,7 @@ "pcx24b", "pcx256", "pcx16", "pgm", "pgmraw", ... "ppm", "ppmraw", "pdflatex", "texdraw", ... "pdfcairo", "pngcairo", "pstricks", ... - "epswrite", "ps2write", "pdfwrite"}; + "epswrite", "pswrite", "ps2write", "pdfwrite"}; suffixes = {"ai", "cdr", "fig", "png", "jpg", ... "gif", "pbm", "pbm", "dxf", "mf", ... @@ -298,11 +298,9 @@ arg_st.devopt = aliases.(arg_st.devopt); endif - ## FIXME - eps2 & epsc2 needs to be handled - if ((any (strcmp (arg_st.devopt, gs_device_list)) && ! arg_st.formatted_for_printing) - || any (strcmp (arg_st.devopt, {"ps2write", "pdfwrite"}))) + || any (strcmp (arg_st.devopt, {"pswrite", "ps2write", "pdfwrite"}))) ## Use ghostscript for graphic formats arg_st.ghostscript.device = arg_st.devopt; arg_st.ghostscript.output = arg_st.name; @@ -617,14 +615,14 @@ endfunction function device_list = gs_device_list (); - ## Graphics formats/languages, not priners. + ## Graphics formats/languages, not printers. device_list = {"bmp16"; "bmp16m"; "bmp256"; "bmp32b"; "bmpgray"; ... "epswrite"; "jpeg"; "jpegcymk"; "jpeggray"; "pbm"; ... "pbmraw"; "pcx16"; "pcx24b"; "pcx256"; "pcx2up"; ... "pcxcmyk"; "pcxgray"; "pcxmono"; "pdfwrite"; "pgm"; ... "pgmraw"; "pgnm"; "pgnmraw"; "png16"; "png16m"; ... "png256"; "png48"; "pngalpha"; "pnggray"; "pngmono"; ... - "pnm"; "pnmraw"; "ppm"; "ppmraw"; "ps2write"; ... + "pnm"; "pnmraw"; "ppm"; "ppmraw"; "pswrite"; ... "ps2write"; "tiff12nc"; "tiff24nc"; "tiff32nc"; ... "tiffcrle"; "tiffg3"; "tiffg32d"; "tiffg4"; ... "tiffgray"; "tifflzw"; "tiffpack"; "tiffsep"}; @@ -636,14 +634,14 @@ ## ## eps, epsc, eps2, epsc2 are not included here because those are ## are generated by the graphics toolkit. - aliases.bmp = "bmp32b"; - aliases.pdf = "pdfwrite"; - aliases.png = "png16m"; - aliases.ps = "ps2write"; - aliases.ps2 = "ps2write"; - aliases.psc = "ps2write"; - aliases.psc2 = "ps2write"; - aliases.tiff = "tiff24nc"; + aliases.bmp = "bmp32b"; + aliases.pdf = "pdfwrite"; + aliases.png = "png16m"; + aliases.ps = "ps2write"; + aliases.ps2 = "ps2write"; + aliases.psc = "ps2write"; + aliases.psc2 = "ps2write"; + aliases.tiff = "tiff24nc"; aliases.tiffn = "tiff24nc"; endfunction