diff --git a/RELEASE_NOTES b/RELEASE_NOTES index 2958d9446..238d8c620 100644 --- a/RELEASE_NOTES +++ b/RELEASE_NOTES @@ -1,5 +1,5 @@ - GNUPLOT VERSION 5.5 NOTES + GNUPLOT VERSION 6.1 NOTES ========================= This file is a placeholder for the release notes that accompany a -stable gnuplot release. The current stable release series is 5.4. +stable gnuplot release. The current stable release series is 6.0. diff --git a/configure.ac b/configure.ac index 7f5660fd8..5cd7480bb 100644 --- a/configure.ac +++ b/configure.ac @@ -296,7 +296,7 @@ AC_CHECK_FUNCS(atexit memcpy memmove memset \ setvbuf strerror strchr strrchr strstr \ index rindex \ erf erfc gamma lgamma tgamma \ - getcwd poll pclose popen fdopen select sleep stpcpy \ + getcwd poll pclose popen fdopen select sleep stpcpy strlcpy \ strcspn strdup strndup strnlen strcasecmp stricmp strncasecmp strnicmp \ sysinfo tcgetattr vfprintf doprnt uname usleep \ cbrt jn diff --git a/demo/all.dem b/demo/all.dem index af6f592ce..558ad8609 100644 --- a/demo/all.dem +++ b/demo/all.dem @@ -26,6 +26,7 @@ reset print "******************** file fillcvrs.dem ********************" load "fillcrvs.dem" load "fillbetween.dem" +load "waterfallplot.dem" reset print "******************** file candlesticks.dem ********************" @@ -208,6 +209,10 @@ load "binary.dem" load "binary_polygon.dem" reset +print "*********** 3D polygons from Delaunay tessellation ***********" +load "delaunay.dem" +reset + print "******************** hsteps demos ********************" load "steps.dem" load "hsteps.dem" diff --git a/demo/animate2.dem b/demo/animate2.dem index 5857d15a4..5e4b7f96f 100644 --- a/demo/animate2.dem +++ b/demo/animate2.dem @@ -28,8 +28,8 @@ set samples 64,64 set isosamples 13,13 set mapping spherical set dummy u,v -set urange [ -90.0000 : 90.0000 ] noreverse nowriteback -set vrange [ 0.00000 : 360.000 ] noreverse nowriteback +set urange [ -90.0000 : 90.0000 ] +set vrange [ 0.00000 : 360.000 ] set style data line # Defines for gnuplot.rot script diff --git a/demo/cerf.dem b/demo/cerf.dem index 41c02d24f..94e380988 100644 --- a/demo/cerf.dem +++ b/demo/cerf.dem @@ -66,7 +66,7 @@ set vrange [ -3 : 3 ] set tics scale 0 set cblabel "Phase Angle" set cblabel offset character -2, 0, 0 font "" textcolor lt -1 rotate by -270 -set cbrange [ -pi : pi ] noreverse nowriteback +set cbrange [ -pi : pi ] set contour set cntrparam levels discrete 0.1, 0.2, 0.5, 1, 2, 5, 10, 20, 50, 100, 200, 500 diff --git a/demo/clip_radial.dem b/demo/clip_radial.dem index fdd128c67..ce29f8db4 100644 --- a/demo/clip_radial.dem +++ b/demo/clip_radial.dem @@ -15,9 +15,9 @@ set dummy t, y set angles degrees set raxis set polar -set rrange [ 0.00 : 0.60 ] noreverse nowriteback -set xrange [ -1.00 : 1.00 ] noreverse nowriteback -set yrange [ -1.00 : 1.00 ] noreverse nowriteback +set rrange [ 0.00 : 0.60 ] +set xrange [ -1.00 : 1.00 ] +set yrange [ -1.00 : 1.00 ] set border polar set size square # @@ -28,9 +28,9 @@ unset clip radial unset polar plot $DATA using ($2*cos($1)):($2*sin($1)) lw 4 lc "yellow" notitle set polar -set rrange [ 0.00 : 0.60 ] noreverse nowriteback -set xrange [ -1.00 : 1.00 ] noreverse nowriteback -set yrange [ -1.00 : 1.00 ] noreverse nowriteback +set rrange [ 0.00 : 0.60 ] +set xrange [ -1.00 : 1.00 ] +set yrange [ -1.00 : 1.00 ] plot $DATA using 1:2:(sprintf("%d",$0)) with labels notitle set clip radial set key samplen 2 diff --git a/demo/delaunay.dem b/demo/delaunay.dem index 868431475..3ce7f3789 100644 --- a/demo/delaunay.dem +++ b/demo/delaunay.dem @@ -1,23 +1,19 @@ # -# The Delaunay triangulation filter is an undocumented adjunct to the -# support for concave hulls. It may become a fully supported feature -# after some cleanup, modifications to make it easier to use, and -# documentation. +# The Delaunay triangulation filter is an adjunct to the support for +# concave hulls. It can be used on its own either for original use +# in 2D plots or as a way to generate a triangular tessellation for +# a 3D surface defined by a scattered set of points as shown here. # if (!strstrt(GPVAL_COMPILE_OPTIONS, "+CHI_SHAPES")) { print "Your copy of gnuplot was not built with support for chi shapes" } else { - set table $hemisphere - plot 'hemisphr.dat' using 1:2:3 delaunay with polygons - unset table - - set pm3d lighting primary 0.5 spec 0.2 spec2 0.3 - set pm3d border lc "black" lw 0.5 + set style fill solid border lc "black" + unset colorbox set palette viridis set xyplane 0 set isotropic - set view 60,127, 1.63 + set view 60,127, 1.55 set border 15 set tics format "" unset ztics @@ -26,10 +22,10 @@ if (!strstrt(GPVAL_COMPILE_OPTIONS, "+CHI_SHAPES")) { set multiplot layout 1,2 set pm3d lighting primary 0.5 spec 0.2 spec2 0.3 - splot $hemisphere with polygons title "pm3d lighting" + splot 'hemisphr.dat' using 1:2:3 delaunay with polygons fc palette z title "pm3d lighting" set pm3d nolighting - splot $hemisphere with polygons title "no lighting model" + splot 'hemisphr.dat' using 1:2:3 delaunay with polygons fc palette z title "no lighting model" unset multiplot } diff --git a/demo/expint.dem b/demo/expint.dem index e074724b6..c9c5a4236 100644 --- a/demo/expint.dem +++ b/demo/expint.dem @@ -49,7 +49,7 @@ set ylabel "Imag(z)" set zlabel "Abs(E_2(z))" rotate set cblabel "Phase Angle" set cblabel offset -1, 0, 0 rotate -set cbrange [ -3.14159 : 3.14159 ] noreverse writeback +set cbrange [ -3.14159 : 3.14159 ] set pm3d corners2color c1 set palette color model HSV defined ( 0 0 1 1, 1 1 1 1 ) # diff --git a/demo/heatmap_4D.dem b/demo/heatmap_4D.dem index 82aa51e1b..c51ad2d3f 100644 --- a/demo/heatmap_4D.dem +++ b/demo/heatmap_4D.dem @@ -4,9 +4,9 @@ # This plot is nice for exploring the effect of the 'l' and 'L' hotkeys. # set view 49, 28, 1, 1.48 -set urange [ 5 : 35 ] noreverse nowriteback -set vrange [ 5 : 35 ] noreverse nowriteback -# set zrange [ 1.0 : 3.0 ] noreverse nowriteback +set urange [ 5 : 35 ] +set vrange [ 5 : 35 ] +# set zrange [ 1.0 : 3.0 ] set ticslevel 0 set format cb "%4.1f" set colorbox user size .03, .6 noborder diff --git a/demo/hidden_compare.dem b/demo/hidden_compare.dem index 958bc31ec..61b1ed3ce 100644 --- a/demo/hidden_compare.dem +++ b/demo/hidden_compare.dem @@ -11,8 +11,8 @@ unset colorbox set parametric set dummy u,v -set urange [ -3.14159 : 3.14159 ] noreverse nowriteback -set vrange [ 0.250000 : 3.14159 ] noreverse nowriteback +set urange [ -3.14159 : 3.14159 ] +set vrange [ 0.250000 : 3.14159 ] set isosamples 50, 20 set multiplot layout 1,2 margins .05,.95,.2,.8 spacing 0.05 diff --git a/demo/html/Makefile b/demo/html/Makefile index 844c04f30..8c919c672 100644 --- a/demo/html/Makefile +++ b/demo/html/Makefile @@ -12,7 +12,39 @@ GNUPLOT_LIB = .. # Several of the demos need manual intervention: # fontfile vector epslatex # -html: airfoil.html animation.html approximate.html armillary.html array.html arrowstyle.html barchart_art.html binary.html bins.html bivariat.html boxplot.html boxclusters.html candlesticks.html chi_shapes.html circles.html cities.html columnhead.html contourfill.html contours.html convex_hull.html custom_contours.html controls.html custom_key.html dashtypes.html datastrings.html dgrid3d.html discrete.html electron.html ellipse.html enhanced_utf8.html epslatex.html errorbars.html fenceplot.html fillbetween.html fillcrvs.html fillstyle.html finance.html fit.html function_block.html hidden.html hidden2.html hidden_compare.html histograms.html histograms2.html histerror.html histogram_colors.html hsteps.html histeps_histogram.html gantt.html image.html image2.html imageNaN.html index.html iris.html iterate.html jitter.html keyentry.html label_stacked_histograms.html layout.html lines_arrows.html linkedaxes.html logic_timing.html map_projection.html margins.html mask_pm3d.html monotonic_spline.html multiaxis.html multiplt.html named_palettes.html nokey.html nonlinear1.html nonlinear2.html nonlinear3.html parallel.html param.html piecewise.html pixmap.html pm3dcolors.html pm3d.html pm3dgamma.html pm3d_clip.html pm3d_lighting.html pointsize.html polar.html polargrid.html poldat.html polar_quadrants.html polygons.html prob2.html prob.html projection.html rainbow.html random.html rank_sequence.html rectangle.html rgba_lines.html argb_hexdata.html rgb_variable.html rotate_labels.html rugplot.html running_avg.html sampling.html scatter.html simple.html singulr.html sectors.html sharpen.html spotlight.html smooth.html smooth_path.html solar_path.html spiderplot.html spline.html smooth_splines.html steps.html stringvar.html surface1.html surface2.html azimuth.html transparent.html transparent_solids.html textbox.html tics.html timedat.html ttics.html using.html varcolor.html vector.html violinplot.html walls.html world.html heatmaps.html heatmap_4D.html heatmap_points.html stats.html unicode.html viridis.html windrose.html zerror.html boxes3d.html voxel.html vplot.html isosurface.html +html: airfoil.html animation.html approximate.html armillary.html array.html arrowstyle.html \ + barchart_art.html binary.html bins.html bivariat.html boxplot.html boxclusters.html \ + candlesticks.html chi_shapes.html circles.html cities.html columnhead.html \ + concave_hull.html contourfill.html contours.html convex_hull.html \ + custom_contours.html controls.html custom_key.html \ + dashtypes.html datastrings.html dgrid3d.html delaunay.html discrete.html \ + electron.html ellipse.html enhanced_utf8.html epslatex.html errorbars.html \ + fenceplot.html fillbetween.html fillcrvs.html fillstyle.html finance.html \ + fit.html function_block.html gantt.html \ + heatmaps.html heatmap_4D.html heatmap_points.html \ + hidden.html hidden2.html hidden_compare.html histograms.html histograms2.html \ + histerror.html histogram_colors.html hsteps.html hsteps_histogram.html \ + image.html image2.html imageNaN.html index.html iris.html iterate.html \ + jitter.html keyentry.html label_stacked_histograms.html layout.html \ + lines_arrows.html linkedaxes.html logic_timing.html \ + map_projection.html margins.html mask_pm3d.html monotonic_spline.html \ + multiaxis.html multiplt.html \ + named_palettes.html nokey.html nonlinear1.html nonlinear2.html nonlinear3.html \ + parallel.html param.html piecewise.html pixmap.html pm3dcolors.html pm3d.html \ + pm3dgamma.html pm3d_clip.html pm3d_lighting.html pointsize.html polar.html \ + polargrid.html poldat.html polar_quadrants.html polygons.html prob2.html \ + prob.html projection.html \ + rainbow.html random.html rank_sequence.html rectangle.html rgba_lines.html \ + argb_hexdata.html rgb_variable.html rotate_labels.html rugplot.html running_avg.html \ + sampling.html scatter.html simple.html singulr.html sectors.html sharpen.html \ + spotlight.html smooth.html smooth_path.html solar_path.html spiderplot.html \ + spline.html smooth_splines.html steps.html stringvar.html stats.html \ + surface1.html surface2.html \ + transparent.html transparent_solids.html textbox.html tics.html timedat.html ttics.html \ + unicode.html using.html \ + varcolor.html vector.html violinplot.html viridis.html voxel.html vplot.html \ + walls.html waterfallplot.html windrose.html world.html zerror.html \ + isosurface.html azimuth.html boxes3d.html index.html: index.save cp index.save index.html diff --git a/demo/html/Makefile.svg b/demo/html/Makefile.svg index aef8abd8e..e93ad5ef0 100644 --- a/demo/html/Makefile.svg +++ b/demo/html/Makefile.svg @@ -9,7 +9,7 @@ GNUPLOT_LIB = .. # # Auto-generation of the svg demo set. # -html: airfoil.html approximate.html armillary.html array.html barchart_art.html binary.html bins.html bivariat.html boxplot.html boxclusters.html candlesticks.html cerf.html chi_shapes.html circles.html cities.html columnhead.html contourfill.html contours.html custom_contours.html controls.html convex_hull.html custom_key.html dashtypes.html datastrings.html discrete.html electron.html enhanced_utf8.html errorbars.html fenceplot.html fillbetween.html fillcrvs.html fillstyle.html finance.html hidden.html hidden2.html hidden_compare.html histograms.html histograms2.html histerror.html histogram_colors.html hsteps.html hsteps_histogram.html hypertext.html hypertext_surface.html gantt.html imageNaN.html index.html iris.html iterate.html jitter.html keyentry.html label_stacked_histograms.html layout.html lines_arrows.html linkedaxes.html logic_timing.html map_projection.html margins.html mask_pm3d.html monotonic_spline.html multiaxis.html multiplt.html nonlinear1.html nonlinear2.html nonlinear3.html named_palettes.html nokey.html parallel.html param.html piecewise.html pixmap.html pm3dcolors.html pm3d.html pm3d_clip.html pm3d_lighting.html pointsize.html polar.html polargrid.html poldat.html polar_quadrants.html polygons.html prob2.html prob.html rainbow.html random.html rank_sequence.html rectangle.html rgba_lines.html argb_hexdata.html rgb_variable.html rotate_labels.html rugplot.html running_avg.html sampling.html scatter.html simple.html singulr.html sectors.html sharpen.html smooth.html smooth_path.html smooth_splines.html spiderplot.html spline.html solar_path.html steps.html stringvar.html surface1.html surface2.html azimuth.html projection.html textbox.html transparent.html transparent_solids.html tics.html timedat.html ttics.html using.html varcolor.html vector.html violinplot.html walls.html world.html heatmaps.html heatmap_4D.html heatmap_points.html ellipse.html stats.html unicode.html windrose.html zerror.html boxes3d.html +html: airfoil.html approximate.html armillary.html array.html barchart_art.html binary.html bins.html bivariat.html boxplot.html boxclusters.html candlesticks.html cerf.html chi_shapes.html circles.html cities.html columnhead.html contourfill.html contours.html custom_contours.html controls.html convex_hull.html custom_key.html dashtypes.html datastrings.html discrete.html electron.html enhanced_utf8.html errorbars.html fenceplot.html fillbetween.html fillcrvs.html fillstyle.html finance.html hidden.html hidden2.html hidden_compare.html histograms.html histograms2.html histerror.html histogram_colors.html hsteps.html hsteps_histogram.html hypertext.html hypertext_surface.html gantt.html imageNaN.html index.html iris.html iterate.html jitter.html keyentry.html label_stacked_histograms.html layout.html lines_arrows.html linkedaxes.html logic_timing.html map_projection.html margins.html mask_pm3d.html monotonic_spline.html multiaxis.html multiplt.html nonlinear1.html nonlinear2.html nonlinear3.html named_palettes.html nokey.html parallel.html param.html piecewise.html pixmap.html pm3dcolors.html pm3d.html pm3d_clip.html pm3d_lighting.html pointsize.html polar.html polargrid.html poldat.html polar_quadrants.html polygons.html prob2.html prob.html rainbow.html random.html rank_sequence.html rectangle.html rgba_lines.html argb_hexdata.html rgb_variable.html rotate_labels.html rugplot.html running_avg.html sampling.html scatter.html simple.html singulr.html sectors.html sharpen.html smooth.html smooth_path.html smooth_splines.html spiderplot.html spline.html solar_path.html steps.html stringvar.html surface1.html surface2.html azimuth.html projection.html textbox.html transparent.html transparent_solids.html tics.html timedat.html ttics.html using.html varcolor.html vector.html violinplot.html walls.html world.html heatmaps.html heatmap_4D.html heatmap_points.html ellipse.html stats.html unicode.html windrose.html zerror.html boxes3d.html waterfallplot.html index.html: index.svg cp index.svg index.html diff --git a/demo/html/index.6new b/demo/html/index.6new index 7075d5743..18a6770e6 100644 --- a/demo/html/index.6new +++ b/demo/html/index.6new @@ -194,6 +194,7 @@
  • Ù­overlapping categories
  • Ù­logic timing diagram
  • Ù­sequential ranking
    • +
  • Ù­waterfall plot

    • Text options

    @@ -291,7 +292,7 @@ - This page generated August 2023 + This page generated August 2024 diff --git a/demo/html/index.special_functions b/demo/html/index.special_functions index 1bc565f24..70a962f1a 100644 --- a/demo/html/index.special_functions +++ b/demo/html/index.special_functions @@ -192,6 +192,7 @@
  • overlapping categories
  • logic timing diagram
  • sequential ranking
    • +
  • waterfall plot

    • Text options

    @@ -289,7 +290,7 @@ - This page generated August 2023 + This page generated August 2024 diff --git a/demo/html/index.svg b/demo/html/index.svg index 5b311916a..9652d4f62 100644 --- a/demo/html/index.svg +++ b/demo/html/index.svg @@ -194,6 +194,7 @@ on mouse-coordinate tracking.
  • overlapping categories
  • logic timing diagram
  • sequential ranking
    • +
  • waterfall plot

    • Text options

    @@ -256,7 +257,7 @@ on mouse-coordinate tracking. - This page generated August 2023 + This page generated August 2024 diff --git a/demo/if_filter.dem b/demo/if_filter.dem new file mode 100644 index 000000000..f27c39aed --- /dev/null +++ b/demo/if_filter.dem @@ -0,0 +1,22 @@ +# Input filter for data files, usable from plot or splot +# +set title "Extract desired lines from unsorted input using\n"."plot .. if ()" + +set margins 15,5,12 +unset tics +set xtics nomirror scale 0.0, 0.0 +set xtics rotate by -90 +unset border +set offsets 0,0,0, graph .1 +set style data linespoints +LC = 7 + +DATA = "energy_circles.dat" +array LIST = ["Coal", "Oil", "Gas", "Nuclear", "Renewable"] + +plot for [type in LIST] DATA using (int($0)/6):7:xticlabel(3) \ + lc (LC=LC+1) lw 2 pt 6 pi -1 title type." " at beg \ + if (strcol(4) eq type) + +pause -1 " to continue" +reset diff --git a/demo/invibeta.dem b/demo/invibeta.dem index 26f5722d8..24518f10d 100644 --- a/demo/invibeta.dem +++ b/demo/invibeta.dem @@ -17,9 +17,9 @@ set style data lines set xyplane relative 0 set log z set xlabel "a" -set xrange [ 0.00000 : 0.200000 ] noreverse writeback +set xrange [ 0.00000 : 0.200000 ] set ylabel "b" -set yrange [ 0.00000 : 0.200000 ] noreverse writeback +set yrange [ 0.00000 : 0.200000 ] set zlabel "Residual" set zlabel offset character -2, 0, 0 font "" textcolor lt -1 rotate diff --git a/demo/mask_pm3d.dem b/demo/mask_pm3d.dem index 45c540a26..3b51ce3d3 100644 --- a/demo/mask_pm3d.dem +++ b/demo/mask_pm3d.dem @@ -16,7 +16,7 @@ set tics scale 0 set title "Convex hull constructed around scattered points" plot 'mask_pm3d.dat' using 1:2:3 with points lc palette pt 7 ps 2, \ - '' using 1:2 convexhull lc "black" lw 3 + '' using 1:2 convexhull with lines lc "black" lw 3 set table $HULL plot 'mask_pm3d.dat' using 1:2 convexhull with lines title "Convex hull" diff --git a/demo/piecewise.dem b/demo/piecewise.dem index 995b964cf..9db3ae13f 100644 --- a/demo/piecewise.dem +++ b/demo/piecewise.dem @@ -9,7 +9,7 @@ set xtics axis out scale 1,8 set xtics add (1.00000 1, 6.28319 1) set ytics axis set title "Piecewise function sampling" font ",15" -set xrange [ -2 : 10 ] noreverse nowriteback +set xrange [ -2 : 10 ] plot sample [*:1] x, [1:2.*pi] cos(x), [2.*pi:10] (x-8)**2 diff --git a/demo/polygons.dem b/demo/polygons.dem index bd358bef4..3e51960a7 100644 --- a/demo/polygons.dem +++ b/demo/polygons.dem @@ -61,13 +61,17 @@ do for [i=1:5] { eval( sprintf("set obj %d polygon from v9[1], v9[2], v9[3] to v3[1],v3[2],v3[3] to v6[1],v6[2],v6[3]", n) ) n = n+1 -set for [o=1:n] obj o polygon depthorder fs transparent solid 0.8 fc "gray75" -set pm3d depthorder border lc "black" lw 2 +# border color and linewidth is now per-object rather than taken from pm3d +set for [o=1:n] obj o polygon depthorder fc "gray75" +set for [o=1:n] obj o polygon fs transparent solid 0.8 border lc "black" lw 2.0 + +set pm3d depthorder border lc "black" lw 2 # old version set xrange [-2:2]; set yrange [-2:2]; set zrange [-2:2] set view equal xyz set view 30,30,1.5 unset border +unset colorbox unset tics unset key unset label @@ -91,23 +95,23 @@ set pm3d lighting spec2 0.6 set title "splot icosahedron.dat with polygons" -splot 'icosahedron.dat' with polygons fc "gray75" +splot 'icosahedron.dat' with polygons fc "gray75" lw 2 pause -1 "Hit return to continue" -set title "splot dodecahedron.dat with polygons lc variable" +set title "splot dodecahedron.dat with polygons fc variable" set view 148, 55, 2.7 set pm3d lighting spec2 0.3 set palette cubehelix set for [i=1:12] linetype 99+i lc palette frac i/12. -splot 'dodecahedron.dat' using 1:2:3:(column(-1)+3) with polygons lc variable +splot 'dodecahedron.dat' using 1:2:3:(column(-1)+3) with polygons fc variable lw 2 pause -1 "Hit return to continue" set title "splot dodecahedron with polygons fc rgb variable" -splot 'dodecahedron.dat' using 1:2:3:(0xffffff * rand(0)) with polygons fc rgb variable +splot 'dodecahedron.dat' using 1:2:3:(0xffffff * rand(0)) with polygons fc rgb variable lw 2 pause -1 "Hit return to continue" @@ -116,7 +120,7 @@ set view 36, 60, 4.2 set style fill transparent solid 0.75 set pm3d nolighting border lt -1 lw 2 -splot 'truncated_cube.dat' using ($1-0.5):($2-0.5):($3-0.5) with polygons fc bgnd +splot 'truncated_cube.dat' using ($1-0.5):($2-0.5):($3-0.5) with polygons fc bgnd lw 2 pause -1 "Hit return to continue" diff --git a/demo/sampling.dem b/demo/sampling.dem index 88b7ec516..c1863a21c 100644 --- a/demo/sampling.dem +++ b/demo/sampling.dem @@ -81,7 +81,7 @@ set yzeroaxis set xtics axis out scale 1,8 set xtics add (1.00000 1, 6.28319 1) set ytics axis -set xrange [ .1 : 12 ] noreverse nowriteback +set xrange [ .1 : 12 ] diff --git a/demo/tics.dem b/demo/tics.dem index 2f9a94bd1..c5b1836fd 100644 --- a/demo/tics.dem +++ b/demo/tics.dem @@ -11,7 +11,7 @@ plot sin(sqrt(x**2))/sqrt(x**2) notitle pause -1 "Hit return to continue" set title "Different modification of tics settings" -set tics scale 3,2 rotate by 45 +set tics scale 3,2 rotate by 45 nomirror set xtics out offset 0,-1.0 replot pause -1 "Hit return to continue" diff --git a/demo/watchpoints.dem b/demo/watchpoints.dem index 3faa50819..2f23bead7 100644 --- a/demo/watchpoints.dem +++ b/demo/watchpoints.dem @@ -63,6 +63,12 @@ plot 'silver.dat' using 1:2 lw 2, '' using 1:($0+$3) lw 2, \ pause -1 " to continue" reset + +if (!strstrt(GPVAL_COMPILE_OPTIONS, "+LIBCERF")) { + print "This copy of gnuplot does not support FresnelC, FresnelS" + exit; +} + unset key set title "Find y intercepts of a parametric function" offset 0,-1 set xrange [-0.1 : 0.9] diff --git a/demo/waterfallplot.dem b/demo/waterfallplot.dem new file mode 100644 index 000000000..2b9a42df4 --- /dev/null +++ b/demo/waterfallplot.dem @@ -0,0 +1,45 @@ +# Waterfall plot created using plot style "splot with filledcurves" +# +# Note that scan lines must be plotted from back to front +# in order for the depth-occlusion visual effect to work. +# + +# Generate data +Gauss(x,mu,sigma) = 1./(sigma*sqrt(2*pi)) * exp( -(x-mu)**2 / (2*sigma**2) ) +A(x) = Gauss(x, 0.2, 0.05) +B(x) = 0.8 * Gauss(x, 0.2 + s, 0.03) +C(x) = 0.1 * Gauss(x, 0.2 + 1.5*s, 0.02) + +set xrange [0.0:1.0] +set sample 101 + +set table $DATA +s = 0.0 +do for [j=1:50] { + f = (75-j)/75. + F(x) = f * A(x) + (1-f) * B(x) + C(x) + plot F(x) + s = s + 0.005 +} +unset table + +# set print "DATA" +# print $DATA + +set title "Waterfall plot" offset 0,-5 +unset key +set view 42, 27, 1, 1.2 +set xyplane at 0 +set xtics scale 0 +set ytics scale 0 10,10,50 +set xrange [0:0.9] +set yrange [0:50] +set zrange [ 0.0 : 15.0 ] +set xlabel 'x' +set ylabel 'scan' + +splot for [scan=48:2:-2] $DATA index scan \ + using 1:(scan):2 with filledcurves lc "black" fc background + +pause -1 " to continue" +reset diff --git a/demo/world2.dem b/demo/world2.dem index 1b90cfca6..b56a13409 100644 --- a/demo/world2.dem +++ b/demo/world2.dem @@ -15,8 +15,8 @@ unset ytics unset ztics set border 0 set title "Labels colored by GeV plotted in spherical coordinate system" -set urange [ -90.0000 : 90.0000 ] noreverse nowriteback -set vrange [ 0.00000 : 360.000 ] noreverse nowriteback +set urange [ -90.0000 : 90.0000 ] +set vrange [ 0.00000 : 360.000 ] set cblabel "GeV" set cbrange [0:8] set colorb vert user size 0.02, 0.75 @@ -29,4 +29,4 @@ set title "Labels with hidden line removal" set hidden nooffset replot pause -1 "Hit return to continue" -reset \ No newline at end of file +reset diff --git a/demo/zeta.dem b/demo/zeta.dem index 6c78a158e..6178a6b88 100644 --- a/demo/zeta.dem +++ b/demo/zeta.dem @@ -61,7 +61,7 @@ set key right opaque box samplen 0 set colorbox set cblabel "Phase Angle" set cblabel offset -1, 0, 0 rotate -set cbrange [ -3.14159 : 3.14159 ] noreverse writeback +set cbrange [ -3.14159 : 3.14159 ] set cbtics ("-Ï€" -pi, "+Ï€" pi) set pm3d interp 1,1 nolighting corners2color c1 set palette color model HSV defined ( 0 0 1 1, 1 1 1 1 ) diff --git a/docs/gnuplot-ja.doc b/docs/gnuplot-ja.doc index 0ab524b93..b409c289d 100644 --- a/docs/gnuplot-ja.doc +++ b/docs/gnuplot-ja.doc @@ -1,5 +1,5 @@ -C RCS $Id: gnuplot-ja.doc,v 1.805 2023-11-28 18:28:17+09 shige Exp $ -C corresponding original gnuplot.doc at 2023-11-28 +C RCS $Id: gnuplot-ja.doc,v 1.815 2024-08-23 14:05:54+09 shige Exp $ +C corresponding original gnuplot.doc at 2024-08-22 C C Copyright (C) 1986 - 1993, 1998, 1999, 2000, 2001, 2004 Thomas Williams, Colin Kelley et al. C @@ -27,7 +27,7 @@ C ^ James R. Van Zandt, Alex Woo, Johannes Zellner
    ^

    ^

    Copyright (C) 1986 - 1993, 1998 - 2004 Thomas Williams, Colin Kelley
    -^ Copyright (C) 2004 - 2023 various authors

    +^ Copyright (C) 2004 - 2024 various authors

    ^

    Mailing list for comments: gnuplot-info@lists.sourceforge.net
    ^ Gnuplot home page
    ^ Issue trackers:   @@ -40,7 +40,7 @@ C ?copyright ?license Copyright (C) 1986 - 1993, 1998, 2004, 2007 Thomas Williams, Colin Kelley - Copyright (C) 2004-2023 various authors + Copyright (C) 2004-2024 various authors Permission to use, copy, and distribute this software and its documentation for any purpose with or without fee is hereby granted, @@ -81,7 +81,7 @@ C ¤òÅö¤¿¤Ã¤Æ¤¯¤À¤µ¤¤¡£Ìõ¼Ô¤ÏÀÕǤ¤ò»ý¤Á¤Þ¤»¤ó¡£) Copyright (C) 1986 - 1993, 1998, 2004, 2007 Thomas Williams, Colin Kelley - Copyright (C) 2004-2023 ¿¤¯¤ÎÃø¼Ô + Copyright (C) 2004-2024 ¿¤¯¤ÎÃø¼Ô ¤³¤Î¥½¥Õ¥È¥¦¥§¥¢¤È¤½¤ÎÉÕ°ʸ½ñ¤Î»ÈÍÑ¡¢Ê£À½¡¢ÇÛÉۤεö²Ä¤Ï¡¢¾åµ­¤ÎÃøºî¸¢ (copyright) ɽ¼¨¤¬¡¢Á´¤Æ¤ÎÊ£À½Êª¤Ë½ñ¤«¤ì¤Æ¤¤¤ë¤³¤È¡¢¤ª¤è¤ÓÃøºî¸¢É½¼¨¤È @@ -608,6 +608,8 @@ D epi_data 1 #b ËÞÎã (key) ¤ÎÈ¢¤Î°ÌÃ֤ϡ¢gnuplot ¤¬Â¾¤Ë¹Ô¤¦»ÅÁȤߤˤè¤ë¤É¤ó¤Ê°ÌÃÖ·è ## ¤á¤ËÂФ·¤Æ¤â¡¢¥ª¥Õ¥»¥Ã¥È¤òÍ¿¤¨¤ë¤³¤È¤Ç¼êÆ°¤ÇÄ´À°¤Ç¤­¤Þ¤¹¡£°Ê²¼»²¾È: ## `set key offset`¡£ +#b plot ¤È splot ¥³¥Þ¥ó¥É¤ËÂФ¹¤ë¿·¤·¤¤¥Õ¥£¥ë¥¿ `plot .. if (<¼°>)` ¤Ï +## ¼°¤Ë¥Þ¥Ã¥Á¤¹¤ëÆþÎϹԤΤߤòÁªÂò¤·¤Þ¤¹¡£°Ê²¼»²¾È: `filters if`¡£ #end 3 ¥Ð¡¼¥¸¥ç¥ó 5 ¤ÇƳÆþ¤µ¤ì¤¿µ¡Ç½¤ÎÍ×Ìó (3 Brief summary of features introduced in version 5) @@ -667,7 +669,6 @@ D epi_data 1 #end 2 ¥Ð¡¼¥¸¥ç¥ó 5 ¤È 6 ¤È¤Î°ã¤¤ (2 Differences between versions 5 and 6) - ¥Ð¡¼¥¸¥ç¥ó 5 ¤ÇƳÆþ¤·¤¿¤¤¤¯¤Ä¤«¤ÎÊѹ¹¤Ï¡¢gnuplot ¤Î°ÊÁ°¤Î¥Ð¡¼¥¸¥ç¥óÍÑ ¤Î¥¹¥¯¥ê¥×¥È¤ò¼ºÇÔ¤µ¤»¤ë¡¢¤Þ¤¿¤Ï°Û¤Ê¤ë¿¶Éñ¤¤¤ò¤µ¤»¤ë¤³¤È¤¬¤¢¤ê¤Þ¤·¤¿¡£ ¥Ð¡¼¥¸¥ç¥ó 6 ¤ÇƳÆþ¤·¤¿Êѹ¹¤Ç¤Ï¡¢¤½¤¦¤¤¤¦¤³¤È¤Ï¤È¤Æ¤â¾¯¤Ê¤¤¤Ç¤¹¡£ @@ -697,10 +698,45 @@ D epi_data 1 set style increment user ¸½ºß¤Ï°Ê²¼¤ÈƱÅù ɬÍפÊÈϰϤÎÀþ¼ï¤ò "set linetype" ¤ò»ÈÍѤ·¤ÆºÆÄêµÁ + ÌÀ¼¨Åª¤Ê "linestyle N" ¤« "linestyle variable" ¤ÎÍøÍÑ ¥Ð¡¼¥¸¥ç¥ó 5.0 ¤Ç¤ÏÈó¿ä¾©¡¢6.0 ¤Ç¤Ïºï½ü show palette fit2rgbformulae +2 ³«È¯¥Ö¥é¥ó¥Á (Development branch (version 6.1)) +?development + ¥Ð¡¼¥¸¥ç¥ó 6.0 ¤ÏºÇ¤âºÇ¶á¤Î gnuplot °ÂÄê¥ê¥ê¡¼¥¹ÈǤǤ¹¡£¿·¤·¤¤µ¡Ç½¤Î³« + ȯ¤ÈÇ˲õÀ­¤òÆâºß¤¹¤ë¥½¡¼¥¹¥³¡¼¥É¤Î²þÊѤϡ¢¥Ð¡¼¥¸¥ç¥ó 6.1 ¤È¸Æ¤Ð¤ì¤ëÊÌ¤Ê + ¥Ö¥é¥ó¥Á¤Ç¹Ô¤ï¤ì¤Æ¤¤¤Þ¤¹¡£³«È¯¥Ö¥é¥ó¥Á¤Î¥½¡¼¥¹¥³¡¼¥É¤Ï¡¢¤¤¤Ä²¿»þ¤Ç¤âÊÑ + ¹¹¤·¤¦¤ë¤Î¤Ç¡¢µ¯Æ°»þ¡¢¤¢¤ë¤¤¤Ï `gnuplot --version` ¤Çɽ¼¨¤µ¤ì¤ëºÇ½ª¹¹ + ¿·Æü¤â¥Á¥§¥Ã¥¯¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£ + + °Ê²¼¤Ë¡¢¤Þ¤À°ÂÄê¥ê¥ê¡¼¥¹¤Ë¤ÏºÜ¤»¤Æ¤¤¤Ê¤¤³«È¯¥Ö¥é¥ó¥Á¤Ç¤Îµ¡Ç½¤ÎÉôʬŪ¤Ê + °ìÍ÷¤ò¼¨¤·¤Þ¤¹¡£°ìÍ÷¤ÎÀèƬ¤Ë¶á¤¤¹àÌܤϡ¢¸½ºß¤Î¥ê¥ê¡¼¥¹ÈǤΰú¤­Â³¤¯¹¹¿· + »þ (6.0.x) ¤Ë¸åÊýƳÆþ¤¹¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£¤³¤Î¥æ¡¼¥¶¡¼¥Þ¥Ë¥å¥¢¥ë¤Ï¡¢¤½ + ¤ì¤é¤ËÂФ¹¤ëÀâÌÀ¤ÎͽÈ÷¤ò»ý¤Ã¤Æ¤¤¤Þ¤¹¡£°ìÍ÷¤Î²¼¤ÎÊý¤Ë¤¢¤ë¹àÌܤϡ¢¥Ð¡¼¥¸ + ¥ç¥ó 6.2 ¤Þ¤Ç¤Ï°ÂÄê¥ê¥ê¡¼¥¹ÈǤˤÏƳÆþ¤·¤Ê¤¤¤«¤â¤·¤ì¤Þ¤»¤ó¡£ +#start +#b ¿·¤·¤¤ÉÁ²è¥â¡¼¥É "with hsteps" +#b ¶É½êÊÑ¿ô¤Î¼ÂÁõ¤Î²þÎÉ +#b ¥Ð¥¤¥Ê¥ê¥Ç¡¼¥¿¥Õ¥¡¥¤¥ë¤ËÂФ¹¤ë¶õ¹Ô¤ÎƱÅùÉÊ¡£¥Ç¡¼¥¿¹àÌܤòʬΥ¤¹¤ë¤Î¤Ë +## ¶õ¹Ô¤òɬÍפȤ¹¤ë¤è¤¦¤ÊÉÁ²è¥¹¥¿¥¤¥ë¤ËÂФ¹¤ë¥Ð¥¤¥Ê¥êÆþÎϤò¥µ¥Ý¡¼¥È¤¹¤ë +## ¤Î¤ËɬÍס£ +#b "linestyle variable" +#b 3 ¼¡¸µÌÌÂΤËÂФ¹¤ë pm3d ¿§ÉÕ¤± (Î㤨¤Ð Delaunay ¥â¥¶¥¤¥¯¶ÊÌÌ) +#b splot with contourfill at base +#b plot ¤È splot ¤Ë¾ò·ï¼°¤òÍ¿¤¨¤ëÆþÎϥǡ¼¥¿¥Õ¥£¥ë¥¿¡£Î㤨¤Ð +## `plot DATA using 2:3 if (stringcolumn(1) eq "ABC")` +#b °ÊÁ°³°Éô¥¹¥¯¥ê¥×¥È `gpsavediff` ¤È¤·¤ÆÇÛÉÛ¤·¤Æ¤¿¤â¤Î¤ÈƱÅù¤Î¿·¤·¤¤¥³ +## ¥Þ¥ó¥É `save changes` +#b ¤è¤ê´è·ò¤Ê¥¹¥ì¥Ã¥É¤Ë¤è¤ë wxt ½ÐÎϥɥ饤¥Ð¤Î²þÎÉ +#b ²èÁü¥Õ¥¡¥¤¥ë¤Î¥Ç¡¼¥¿½èÍý¤Ç¤Î gdlib ¤ÎÂåÍÑÉÊ +#b ÇÛÎóÍ×ÁǤËÅϤ뷫¤êÊÖ¤· `array A; for [e in A] { ... }` +#b ¥­¡¼¥ï¡¼¥É "sample" ¤ÎÈó¿ä¾© +#b "marks" ¤È¸Æ¤Ö¿·¤·¤¤¥°¥é¥Õ¥£¥«¥ë¤ÊʪÂΤΥ«¥Æ¥´¥ê¡£¤³¤ì¤Ï¡¢Ê£»¨¤Êµ­¹æ +## ¤òÄêµÁ¤·¡¢plot ¤ÇÍøÍѤǤ­¤Þ¤¹¡£ÀâÌÀ¤ä¥Ç¥â¤Ï¤Þ¤À¤¢¤ê¤Þ¤»¤ó¡£ +#end + 2 ¥Ç¥â¡¢¥Í¥Ã¥È¾å¤Î¥µ¥ó¥×¥ë (Demos and Online Examples) ?demos ?online examples @@ -2601,8 +2637,8 @@ C C 4 weekdata_cdc ?expressions functions LambertW ?LambertW Ê£ÁÇÄêµÁ°è¤ÈÊ£ÁÇÃÍ°è¤ò»ý¤Ä Lambert W ´Ø¿ô¤Ç¤¹¡£ - LambertW( z, k ) ¤Ï¡¢ÊýÄø¼° W(z) * exp(z) = z ¤ÇÄêµÁ¤µ¤ì¤ë ´Ø¿ô W ¤ÎÂè - k ʬ´ô¤òÊÖ¤·¤Þ¤¹¡£ + LambertW( z, k ) ¤Ï¡¢ÊýÄø¼° W(z) * exp(W(z)) = z ¤ÇÄêµÁ¤µ¤ì¤ë ´Ø¿ô W + ¤ÎÂè k ʬ´ô¤òÊÖ¤·¤Þ¤¹¡£ ¤½¤ÎÊ£ÁÇ¿ôÃͤϡ¢Corless et al [1996], Adv. Comp. Math 5:329 ¤Ëµ­ºÜ¤µ¤ì ¤Æ¤¤¤ë Halley ¤ÎÊýË¡¤ò»È¤Ã¤Æµá¤á¤Þ¤¹¡£ ̾Ìܾå¤ÎÀºÅÙ¤Ï 1.E-13 ¤Ç¤¹¤¬¡¢ÉÔϢ³¡¢¤¹¤Ê¤ï¤Áʬ´ôÅÀ¤Î¶á¤¯¤Ç¤Ï¼ý«¤ÏÎÉ @@ -3659,16 +3695,19 @@ Ffigure_newsyntax ·«¤êÊÖ¤·¤Ï¡¢°Ê²¼¤Î¤è¤¦¤Ê½ñ¼°¤Ë¤è¤ë·«¤êÊÖ¤·»ØÄê¤ÇÀ©¸æ¤·¤Þ¤¹¡£ for [ in "string of N elements"] - - ¤Þ¤¿¤Ï - for [ = : { : }] + for [ in Array] ºÇ½é¤Î½ñ¼°¤Ç¤Ï ¤Ïʸ»úÎóÊÑ¿ô¤Ç¡¢¤½¤Î¸å¤í¤Ë»ØÄꤷ¤¿Ê¸»úÎó¤Ë´Þ¤Þ¤ì ¤ë 1 ÈÖÌܤ«¤é N ÈÖÌܤޤǤÎñ¸ìʸ»úÎó¤ò½ç¤ËÃͤȤ·¤Æ¼è¤ê¤Þ¤¹¡£ 2 ÈÖÌܤνñ¼°¤Ç¤Ï¡¢, , ¤ÏÀ°¿ô¡¢¤Þ¤¿¤ÏÀ°¿ôÃͤò¼è ¤ë¿ô¼°¤Ç¤¹¡£ + 3 ÈÖÌܤνñ¼°¤Ç¤Ï ¤ÏÇÛÎó Array ¤ÎÍ×ÁǤò½çÈ֤˼è¤ê¤Þ¤¹¤¬¡¢Í×ÁǤ¬¿ô + ÃͤǤ¢¤ë¤«Ê¸»úÎó¤Ç¤¢¤ë¤«¤Ï¹Íθ¤·¤Þ¤»¤ó¡£Ì¤ÄêµÁÍ×ÁǤϡ¢Ìۤäƥ¹¥­¥Ã¥×¤· + ¤Þ¤¹¡£ÇÛÎóÍ×ÁǤËÅϤ뷫¤êÊÖ¤·¤Ï»î¸³Ãʳ¬¤Ç¤¹ (¾ÜºÙ¤Ï¡¢gnuplot ¤Î°ÂÄê¥ê¥ê + ¡¼¥¹ÈǤ¬½Ð¤ë¤Þ¤¨¤ËÊѹ¹¤µ¤ì¤ë¤«¤â¤·¤ì¤Þ¤»¤ó)¡£ + =scope ·«¤êÊÖ¤·ÊÑ¿ô¤ÎÍ­¸úÈÏ°Ï (scope) ¤Ï¡¢¤½¤Î·«¤êÊÖ¤·¤ÎÃæ¤À¤±¤Ç¤¹¡£°Ê²¼»²¾È: `scope`¡£·«¤êÊÖ¤·ÊÑ¿ô¤ÎÃͤò¡¢¤½¤Î¼Â¹Ô¥Ö¥í¥Ã¥¯Æâ¤Ç±Ê³Ū¤ËÊѹ¹¤¹¤ë¤³¤È @@ -3811,14 +3850,18 @@ Ffigure_newsyntax plot 0 lt bgnd 4 linecolor variable ?linecolor variable +?linestyle variable ?lc variable +?ls variable ?textcolor variable ?tc variable ?variable linecolor `lc variable` ¤Ï¡¢ÆþÎϥǡ¼¥¿¤Î°ì¤Ä¤ÎÎ󤫤éÆɤó¤ÀÃͤòÀþ¼ï (linetype) ¤Î ÈÖ¹æ¤È¤·¤Æ»È¤¤¡¢¤½¤ÎÀþ¼ï¤Ë°¤¹¤ë¿§¤ò»È¤¦¤è¤¦¥×¥í¥°¥é¥à¤Ë»Ø¼¨¤·¤Þ¤¹¡£¤è - ¤Ã¤Æ¤³¤ì¤Ï¡¢`using` »ØÄê»Ò¤ØÂбþ¤¹¤ëÎó¤Î»ØÄê¤ÎÄɲäòɬÍפȤ·¤Þ¤¹¡£Ê¸»ú - ¤Î¿§¤âƱÍͤˡ¢`tc variable` ¤Ç»ØÄê¤Ç¤­¤Þ¤¹¡£ + ¤Ã¤Æ¤³¤ì¤Ï¡¢`using` »ØÄê»Ò¤ØÂбþ¤¹¤ëÎó¤Î»ØÄê¤ÎÄɲäòɬÍפȤ·¤Þ¤¹¡£ + `ls variable` ¤Ï¡¢ÆþÎϥǡ¼¥¿Î󤫤éÆɤ߹þ¤ó¤ÀÃͤ¬Àþ¼ï¤Ç¤Ê¤¯ linestyle + ÈÖ¹æ¤È¤·¤Æ²ò¼á¤µ¤ì¤ë¤³¤È¤ò½ü¤¤¤ÆƱ¤¸¤³¤È¤ò¤·¤Þ¤¹¡£Ê¸»ú¤Î¿§¤âƱÍͤˡ¢ + `tc variable` ¤Ç»ØÄê¤Ç¤­¤Þ¤¹¡£ Îã: # ¥Ç¡¼¥¿¤Î 3 ÎóÌܤò¡¢¸Ä¡¹¤ÎÅÀ¤Ë¿§¤ò³ä¤êÅö¤Æ¤ë¤Î¤Ë»ÈÍÑ @@ -4760,10 +4803,10 @@ Ffigure_watchpoints 4 Îó: x y length angle - ¥­¡¼¥ï¡¼¥É `with arrows` ¤Î¸å¤í¤Ë¤Ï¡¢¥¤¥ó¥é¥¤¥ó¤Î arrow style °À­¤ä¡¢ - ÄêµÁºÑ¤ß¤Î arrow style ¤Î»²¾È¡¢¤Þ¤¿ `arrowstyle variable` ¤Ë¤è¤ë³ÆÌð°õ - Ëè¤ËŬÍѤ·¤¿¤¤ arrow style ÈÖ¹æ¤ò¾¤ÎÎ󤫤éÆɤ߹þ¤Þ¤»¤ë¤³¤È¡¢¤Ê¤É¤ò - ÄɲûØÄê¤Ç¤­¤Þ¤¹¡£ + ¥­¡¼¥ï¡¼¥É `with arrows` ¤Î¸å¤í¤Ë¤Ï¡¢Ä¾ÀÜ arrow style °À­¤ò»ØÄꤷ¤¿¤ê + ÄêµÁºÑ¤ß¤Î arrow style ÈÖ¹æ¤ò»ØÄê¡¢¤Þ¤¿¤Ï `arrowstyle variable` ¤Ë¤è¤ë + ³ÆÌð°õËè¤ËŬÍѤ·¤¿¤¤ arrow style ÈÖ¹æ¤ò¾¤ÎÎ󤫤éÆɤ߹þ¤Þ¤»¤ë¤³¤È¤Î»Ø + Äê¡¢¤Ê¤É¤òÄɲäǤ­¤Þ¤¹¡£ Àµ¤Î `length` Ãͤϡ¢x ¼´¤ÎºÂɸ¤Ç²ò¼á¤·¤Þ¤¹¡£ -1 < `length` < 0 ¤ÎÃͤϡ¢¿åÊ¿¥°¥é¥ÕºÂɸ¡¢¤¹¤Ê¤ï¤Á |length| ¤òÁ´ÂΤΥ° @@ -4936,7 +4979,8 @@ Ffigure_boxplot (¥á¥¸¥¢¥ó) °Ê²¼¤ÎÃͤò»ý¤Ä¤è¤¦¤Ë¡¢Åù¤È·èÄꤵ¤ì¤Þ¤¹¡£Âè°ì»Íʬ°Ì¤ÈÂè»°»Í ʬ°Ì¤Î´Ö¤ÎÎΰè¤ò°Ï¤à¤è¤¦¤ËÈ¢¤òÉÁ²è¤·¡¢¥á¥¸¥¢¥óÃͤΤȤ³¤í¤Ë¤Ï¿åÊ¿Àþ¤òÉÁ ¤­¤Þ¤¹¡£È¢¤Ò¤²¤Ï¡¢È¢¤«¤é¥æ¡¼¥¶»ØÄê¸Â³¦¤Þ¤Ç±äŤµ¤ì¤Þ¤¹¡£¤½¤ì¤é¤Î¸Â³¦¤Î - ³°¤Ë¤¢¤ëÅÀ¤Ï¡¢¤Ò¤È¤Ä¤Ò¤È¤ÄÉÁ²è¤µ¤ì¤Þ¤¹¡£ + ³°¤Ë¤¢¤ëÅÀ¤Ï¡¢¤Ò¤È¤Ä¤Ò¤È¤ÄÉÁ²è¤µ¤ì¤Þ¤¹¡£y ¤ÎÃͤ¬½Å¤Ê¤ëÈϰϳ°¤ÎÅÀ¤Î¿åÊ¿ + ¤Î¹­¤¬¤ê¤Ï¡¢`set jitter` ¤ÇÄ´À°¤Ç¤­¤Þ¤¹¡£ Îã: @@ -4966,9 +5010,9 @@ Ffigure_boxplot ¤È 3 ÈÖÌܤÎÎó (x ºÂɸ¤ÈÉý) ¤ÏÄ̾ï¥Ç¡¼¥¿Îó¤Ç¤Ï¤Ê¤¯Äê¿ô¤È¤·¤ÆÍ¿¤¨¤Þ¤¹¡£ ¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡¢È¢¤Ò¤²¤ÏÈ¢¤Îü¤«¤é¡¢y ¤ÎÃͤ¬»Íʬ°ÌÈϰϤΠ1.5 ÇܤÎÃæ¤Ë - ¼ý¤Þ¤Ã¤Æ¤¤¤ÆºÇ¤âÎ¥¤ì¤Æ¤¤¤ë¤è¤¦¤ÊÅÀ¤Þ¤Ç±äŤµ¤ì¤Þ¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡¢ÈÏ - °Ï³°¤ÎÅÀ (outlier) ¤Ï±ß (pointtype 7) ¤ÇÉÁ¤«¤ì¤Þ¤¹¡£È¢¤Ò¤²¤Îü¤ÎËÀ¤ÎÉý - ¤Ï `set bars` ¤Þ¤¿¤Ï `set errorbars` ¤ò»È¤Ã¤ÆÀ©¸æ¤Ç¤­¤Þ¤¹¡£ + ¼ý¤Þ¤Ã¤Æ¤¤¤ÆºÇ¤âÎ¥¤ì¤Æ¤¤¤ë¤è¤¦¤ÊÅÀ¤Þ¤Ç±äŤ·¤Þ¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡¢ÈÏ°Ï + ³°¤ÎÅÀ (outlier) ¤Ï±ß (pointtype 7) ¤ÇÉÁ¤­¤Þ¤¹¡£È¢¤Ò¤²¤Îü¤ÎËÀ¤ÎÉý¤Ï + `set bars` ¤Þ¤¿¤Ï `set errorbars` ¤ò»È¤Ã¤ÆÀ©¸æ¤Ç¤­¤Þ¤¹¡£ ¤³¤ì¤é¤Î¥Ç¥Õ¥©¥ë¥È¤ÎÀ­¼Á¤Ï `set style boxplot` ¥³¥Þ¥ó¥É¤ÇÊѹ¹¤Ç¤­¤Þ¤¹¡£ °Ê²¼»²¾È: `set style boxplot`, `bars`, `boxwidth`, `fillstyle`, @@ -5137,11 +5181,17 @@ Ffigure_piechart ?with contourfill ?contourfill Ffigure_contourfill + ½ñ¼°: + splot f(x,y) with contourfill {at base} {fillstyle