Merge branch 'upstream'

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.

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

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"

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

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

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

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
 }

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 )
 #

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

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

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

demo/html/index.6new

@@ -194,6 +194,7 @@
     <li>٭<a href="iris.html">overlapping categories</a></li>
     <li>٭<a href="logic_timing.html">logic timing diagram</a></li>
     <li>٭<a href="rank_sequence.html">sequential ranking</a></li>
+    <li>٭<a href="waterfallplot.html">waterfall plot</a></li>
     </ul>
 
     <h4>Text options</h4>
@@ -291,7 +292,7 @@
 <tbody><tr valign="top">
 
     <td>
-    <i>This page generated August 2023</i>
+    <i>This page generated August 2024</i>
     </td>
 
     <td>

demo/html/index.special_functions

@@ -192,6 +192,7 @@
     <li><a href="iris.html">overlapping categories</a></li>
     <li><a href="logic_timing.html">logic timing diagram</a></li>
     <li><a href="rank_sequence.html">sequential ranking</a></li>
+    <li><a href="waterfallplot.html">waterfall plot</a></li>
     </ul>
 
     <h4>Text options</h4>
@@ -289,7 +290,7 @@
 <tbody><tr valign="top">
 
     <td>
-    <i>This page generated August 2023</i>
+    <i>This page generated August 2024</i>
     </td>
 
     <td>

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 (<expression>)"
+
+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 "<cr> to continue"
+reset

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
 

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"

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
 

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"
 

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 ]
 
 
 

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"