Mercurial > octave
changeset 25308:74fbe0d91994
maint: merge stable to default.
| author | Rik <rik@octave.org> |
|---|---|
| date | Tue, 24 Apr 2018 18:32:22 -0700 |
| parents | d73dfd34230b (current diff) f2eb8bfcccb6 (diff) |
| children | bb43ec3a304e |
| files | scripts/pkg/pkg.m |
| diffstat | 5 files changed, 42 insertions(+), 33 deletions(-) [+] |
line wrap: on
line diff
--- a/libinterp/octave-value/ov-java.cc Tue Apr 24 12:00:59 2018 -0400 +++ b/libinterp/octave-value/ov-java.cc Tue Apr 24 18:32:22 2018 -0700 @@ -3393,7 +3393,7 @@ %! assert (n.compareTo (1), 0); %! assert (n.compareTo (2), -1); -%!testif HAVE_JAVA; usejava ("jvm") +%!testif HAVE_JAVA; usejava ("jvm") <51804> %! n = javaObject ("java.lang.Short", 1.35); %! assert (n.compareTo (0), 1); %! assert (n.compareTo (1), 0);
--- a/scripts/pkg/pkg.m Tue Apr 24 12:00:59 2018 -0400 +++ b/scripts/pkg/pkg.m Tue Apr 24 18:32:22 2018 -0700 @@ -441,6 +441,7 @@ global_list, global_install); unwind_protect_cleanup + cellfun ("unlink", local_files); if (exist (tmp_dir, "file")) rmdir (tmp_dir, "s"); endif
--- a/scripts/plot/util/print.m Tue Apr 24 12:00:59 2018 -0400 +++ b/scripts/plot/util/print.m Tue Apr 24 18:32:22 2018 -0700 @@ -151,6 +151,10 @@ ## @itemx @nospell{corel} ## @nospell{CorelDraw} ## +## @item cgm +## Computer Graphics Metafile, Version 1, ANSI X3.122-1986 +## (only available for the Gnuplot graphics toolkit). +## ## @item dxf ## AutoCAD ## @@ -165,7 +169,8 @@ ## (default is @option{-textnormal}) ## ## @item gif -## GIF image (only available for the Gnuplot graphics toolkit) +## GIF image +## (only available for the Gnuplot graphics toolkit). ## ## @item hpgl ## HP plotter language @@ -175,8 +180,9 @@ ## JPEG image ## ## @item latex -## @LaTeX{} picture environment (only available for the Gnuplot graphics -## toolkit). +## @itemx eepic +## @LaTeX{} picture environment and extended picture environment +## (only available for the Gnuplot graphics toolkit). ## ## @item mf ## Metafont
--- a/scripts/plot/util/private/__gnuplot_print__.m Tue Apr 24 12:00:59 2018 -0400 +++ b/scripts/plot/util/private/__gnuplot_print__.m Tue Apr 24 18:32:22 2018 -0700 @@ -45,12 +45,15 @@ ## The axes-label and tick-label spacing is determined by ## the font spec given in "set terminal ..." gp_opts = font_spec (opts); - bg = get (opts.figure, "color"); - if (isnumeric (bg)) - gp_opts = sprintf ('%s background rgb "#%02x%02x%02x"', - gp_opts, round (255 * bg)); - else - gp_opts = sprintf ("%s nobackground", gp_opts); + if (! any (strcmpi (opts.devopt, {"fig", "dxf", "hpgl", "mf", "pstricks", ... + "texdraw", "latex", "eepic"}))) + bg = get (opts.figure, "color"); + if (isnumeric (bg)) + gp_opts = sprintf ('%s background rgb "#%02x%02x%02x"', + gp_opts, round (255 * bg)); + else + gp_opts = sprintf ("%s nobackground", gp_opts); + endif endif pipeline = ""; @@ -144,7 +147,8 @@ "print.m: '%s' output is not available for gnuplot-%s", upper (opts.devopt), __gnuplot_version__ ()); endif - case {"canvas", "dxf", "hpgl", "latex", "mf", "gif", "pstricks", "texdraw"} + case {"canvas", "cgm", "dxf", "hpgl", "latex", "mf", "gif", ... + "pstricks", "texdraw"} if (__gnuplot_has_terminal__ (opts.devopt)) local_drawnow ([opts.devopt " " gp_opts], opts.name, opts); else @@ -246,7 +250,7 @@ elseif (! isempty (opts.font)) f = sprintf ('font "%s"', opts.font); elseif (! isempty (opts.fontsize)) - f = sprintf ("%d", opts.fontsize); + f = sprintf ('font ",%d"', opts.fontsize); endif case {"eps", "eps2", "epsc", "epsc2"} ## Gnuplot renders fonts as half their specification, which @@ -258,19 +262,15 @@ elseif (! isempty (opts.font)) f = sprintf ('font "%s"', opts.font); elseif (! isempty (opts.fontsize)) - f = sprintf ("%d", 2 * opts.fontsize); + f = sprintf ('font ",%d"', 2 * opts.fontsize); endif case "svg" - ## FIXME: Why does svg format use round on the fontsize while - ## other terminals don't? if (! isempty (opts.font) && ! isempty (opts.fontsize)) - fontsize = round (opts.fontsize * 0.75); - f = sprintf ('fname "%s" fsize %d', opts.font, fontsize); + f = sprintf ('font "%s,%d"', opts.font, opts.fontsize * 0.75); elseif (! isempty (opts.font)) - f = sprintf ('fname "%s"', opts.font); + f = sprintf ('font "%s"', opts.font); elseif (! isempty (opts.fontsize)) - fontsize = round (opts.fontsize * 0.75); - f = sprintf ("fsize %d", fontsize); + f = sprintf ('font ",%d"', opts.fontsize * 0.75); endif case "pdf" if (! isempty (opts.font) && ! isempty (opts.fontsize)) @@ -305,7 +305,7 @@ endif case {"gif", "jpeg", "png"} if (! isempty (opts.font) && ! isempty (opts.fontsize)) - f = sprintf ('font "%s ,%d"', opts.font, opts.fontsize); + f = sprintf ('font "%s,%d"', opts.font, opts.fontsize); elseif (! isempty (opts.font)) f = sprintf ('font "%s"', opts.font); elseif (! isempty (opts.fontsize)) @@ -313,31 +313,31 @@ endif case "emf" if (! isempty (opts.font) && ! isempty (opts.fontsize)) - f = sprintf ('"%s" %d', opts.font, opts.fontsize); + f = sprintf ('font "%s,%d"', opts.font, opts.fontsize); elseif (! isempty (opts.font)) - f = sprintf ('"%s"', opts.font); + f = sprintf ('font "%s"', opts.font); elseif (! isempty (opts.fontsize)) - f = sprintf ("%d", opts.fontsize); + f = sprintf ('font ",%d"', opts.fontsize); endif case "canvas" if (! isempty (opts.fontsize)) - f = sprintf ("fsize %d", opts.fontsize); + f = sprintf ('font ",%d"', opts.fontsize); endif case {"aifm", "corel"} if (! isempty (opts.font) && ! isempty (opts.fontsize)) - f = sprintf ("%s %d", opts.font, opts.fontsize); + f = sprintf ('font "%s,%d"', opts.font, opts.fontsize); elseif (! isempty (opts.font)) - f = sprintf ("%s", opts.font); + f = sprintf ('font "%s"', opts.font); elseif (! isempty (opts.fontsize)) - f = sprintf ("%d", opts.fontsize); + f = sprintf ('font ",%d"', opts.fontsize); endif case "fig" if (! isempty (opts.font) && ! isempty (opts.fontsize)) - f = sprintf ("font %s fontsize %d", opts.font, opts.fontsize); + f = sprintf ('font "%s,%d"', opts.font, opts.fontsize); elseif (! isempty (opts.font)) - f = sprintf ("font %s", opts.font); + f = sprintf ('font "%s"', opts.font); elseif (! isempty (opts.fontsize)) - f = sprintf ("fontsize %d", opts.fontsize); + f = sprintf ('font ",%d"', opts.fontsize); endif endswitch
--- a/scripts/plot/util/private/__print_parse_opts__.m Tue Apr 24 12:00:59 2018 -0400 +++ b/scripts/plot/util/private/__print_parse_opts__.m Tue Apr 24 18:32:22 2018 -0700 @@ -225,7 +225,8 @@ "epscairo", "pdfcairo", "pngcairo", "cairolatex", ... "pdfcairolatex", "pdfcairolatexstandalone", ... "epscairolatex", "epscairolatexstandalone", "pstricks", ... - "epswrite", "eps2write", "pswrite", "ps2write", "pdfwrite"}; + "epswrite", "eps2write", "pswrite", "ps2write", "pdfwrite", ... + "canvas", "cgm", "latex", "eepic"}; persistent suffixes = {"ai", "cdr", "fig", "png", "jpg", ... "gif", "pbm", "pbm", "dxf", "mf", ... @@ -239,7 +240,8 @@ "eps", "pdf", "png", "tex", ... "tex", "tex", ... "tex", "tex", "tex", ... - "eps", "eps", "ps", "ps", "pdf"}; + "eps", "eps", "ps", "ps", "pdf", ... + "js", "cgm", "tex", "tex"}; if (isfigure (arg_st.figure)) __graphics_toolkit__ = get (arg_st.figure, "__graphics_toolkit__");