Mercurial > octave-nkf
changeset 11022:a5bee81bb69f
__print_parse_opts__.m: Recongize gs devices {eps/pdf/ps}write.
| author | Ben Abbott <bpabbott@mac.com> |
|---|---|
| date | Sat, 25 Sep 2010 11:59:01 -0400 |
| parents | 0ee74d581c00 |
| children | cb62c7401ea2 |
| files | scripts/ChangeLog scripts/plot/__print_parse_opts__.m |
| diffstat | 2 files changed, 25 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/scripts/ChangeLog Sat Sep 25 14:18:29 2010 +0200 +++ b/scripts/ChangeLog Sat Sep 25 11:59:01 2010 -0400 @@ -1,3 +1,7 @@ +2010-09-25 Ben Abbott <bpabbott@mac.com> + + * plot/__print_parse_opts__.m: Recongize gs devices {eps/pdf/ps}write. + 2010-09-23 John W. Eaton <jwe@octave.org> * miscellaneous/bug_report.m: Display information about how to
--- a/scripts/plot/__print_parse_opts__.m Sat Sep 25 14:18:29 2010 +0200 +++ b/scripts/plot/__print_parse_opts__.m Sat Sep 25 11:59:01 2010 -0400 @@ -212,7 +212,8 @@ "pstex", "tiff", "tiffn" "tikz", "pcxmono", ... "pcx24b", "pcx256", "pcx16", "pgm", "pgmraw", ... "ppm", "ppmraw", "pdflatex", "texdraw", ... - "pdfcairo", "pngcairo", "pstricks"}; + "pdfcairo", "pngcairo", "pstricks", ... + "epswrite", "pswrite", "ps2write", "pdfwrite"}; suffixes = {"ai", "cdr", "fig", "png", "jpg", ... "gif", "pbm", "pbm", "dxf", "mf", ... @@ -223,7 +224,8 @@ "ps", "tiff", "tiff", "tikz", "pcx", ... "pcx", "pcx", "pcx", "pgm", "pgm", ... "ppm", "ppm", "tex", "tex", ... - "pdf", "png", "tex"}; + "pdf", "png", "tex", ... + "eps", "ps", "ps", "pdf"}; if (isfigure (arg_st.figure) && strcmp (get (arg_st.figure, "__backend__"), "gnuplot") @@ -242,10 +244,6 @@ arg_st.name = strcat (arg_st.name, ".", default_suffix); endif - if (any (strcmp (arg_st.devopt, {"ps", "ps2", "psc", "psc2", "pdf"}))) - arg_st.formatted_for_printing = true; - endif - if (arg_st.append_to_file) if (isempty (arg_st.name)) arg_st.append_to_file = false; @@ -273,19 +271,25 @@ arg_st.send_to_printer = true; endif + if (any (strcmp (arg_st.devopt, {"ps", "ps2", "psc", "psc2", "pdf"}))) + arg_st.formatted_for_printing = true; + endif + aliases = gs_aliases (); if (any (strcmp (arg_st.devopt, fieldnames (aliases)))) arg_st.devopt = aliases.(arg_st.devopt); endif + ## FIXME - eps2 & epsc2 needs to be handled if (strcmp (arg_st.devopt, "pswrite")) arg_st.ghostscript.level = 1; elseif (strcmp (arg_st.devopt, "ps2write")) arg_st.ghostscript.level = 2; endif - if (any (strcmp (arg_st.devopt, gs_device_list)) && - ! arg_st.formatted_for_printing) + if ((any (strcmp (arg_st.devopt, gs_device_list)) + && ! arg_st.formatted_for_printing) + || 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; @@ -562,15 +566,15 @@ function device_list = gs_device_list (); ## Graphics formats/languages, not priners. device_list = {"bmp16"; "bmp16m"; "bmp256"; "bmp32b"; "bmpgray"; ... - "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"; "pswrite"; ... - "tiff12nc"; "tiff24nc"; "tiff32nc"; "tiffcrle"; ... - "tiffg3"; "tiffg32d"; "tiffg4"; "tiffgray"; "tifflzw"; ... - "tiffpack"; "tiffsep"}; + "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"; ... + "pswrite"; "tiff12nc"; "tiff24nc"; "tiff32nc"; ... + "tiffcrle"; "tiffg3"; "tiffg32d"; "tiffg4"; ... + "tiffgray"; "tifflzw"; "tiffpack"; "tiffsep"}; endfunction function aliases = gs_aliases ();