Mercurial > octave-nkf
diff scripts/plot/util/private/__print_parse_opts__.m @ 19603:9b90d8579c61
maint: Periodic merge of gui-release to default.
author | Rik <rik@octave.org> |
---|---|
date | Mon, 12 Jan 2015 09:17:35 -0800 |
parents | 7bbe3658c5ef f88ee85d4da9 |
children | 2058d87174c8 |
line wrap: on
line diff
--- a/scripts/plot/util/private/__print_parse_opts__.m Mon Jan 12 13:44:24 2015 +0100 +++ b/scripts/plot/util/private/__print_parse_opts__.m Mon Jan 12 09:17:35 2015 -0800 @@ -43,7 +43,7 @@ arg_st.ghostscript.debug = false; arg_st.ghostscript.device = ""; arg_st.ghostscript.epscrop = true; - arg_st.ghostscript.level = []; + arg_st.ghostscript.level = 2; arg_st.ghostscript.output = ""; arg_st.ghostscript.papersize = ""; arg_st.ghostscript.pageoffset = []; @@ -298,13 +298,6 @@ 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) || any (strcmp (arg_st.devopt, {"pswrite", "ps2write", "pdfwrite"}))) @@ -621,15 +614,15 @@ 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"; ... - "pswrite"; "tiff12nc"; "tiff24nc"; "tiff32nc"; ... + "pnm"; "pnmraw"; "ppm"; "ppmraw"; "pswrite"; ... + "ps2write"; "tiff12nc"; "tiff24nc"; "tiff32nc"; ... "tiffcrle"; "tiffg3"; "tiffg32d"; "tiffg4"; ... "tiffgray"; "tifflzw"; "tiffpack"; "tiffsep"}; endfunction @@ -640,14 +633,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 = "pswrite"; - aliases.ps2 = "ps2write"; - aliases.psc = "pswrite"; - 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