Merge branch 'upstream'

AlexanderTaeschner · Feb 24, 2023 · 45ffc2d · 45ffc2d
2 parents 894da62 + 40de1fb
commit 45ffc2d
Show file tree

Hide file tree

Showing 31 changed files with 399 additions and 207 deletions.
diff --git a/demo/boxplot.dem b/demo/boxplot.dem
@@ -28,6 +28,7 @@ set xtics auto
 set yrange [*:*]
 set title "Distribution of energy usage of the continents, grouped by type of energy source\n"
 set ylabel "Billion Tons of Oil Equivalent"
+set datafile columnheaders
 
 plot 'energy_circles.dat' using (1):($8/1.e6):(0):4
 
@@ -82,4 +83,5 @@ plot for [i=1:NF-2]  'energy_circles.dat' using (i):(filter(8, 4, i)), \
 
 pause -1 'Hit <cr> to continue: boxplot demo finished'
 
+unset datafile
 reset
diff --git a/demo/energy_circles.dat b/demo/energy_circles.dat
@@ -1,4 +1,4 @@
-#Latitude	Longitude	Continent	Source	Color_index	Angle_start_at	Angle	Value	Continent_total
+Latitude	Longitude	Continent	Source	Color_index	Angle_start_at	Angle	Value	Continent_total
 55.0	85.0	"ASIA (EXCL. MIDDLE EAST)"	Coal	0	215.410	144.590	947639	2362223
 55.0	85.0	"ASIA (EXCL. MIDDLE EAST)"	Oil	1	154.375	61.034	400017	2362223
 55.0	85.0	"ASIA (EXCL. MIDDLE EAST)"	Gas	2	112.828	41.544	272284	2362223

diff --git a/demo/histerror.dem b/demo/histerror.dem
@@ -19,3 +19,5 @@ plot 'histerror.dat' using 2:3 fs solid 0.5 lw 2 ti 'A', \
 
 pause -1 "<cr> to continue"
 
+unset datafile
+reset
diff --git a/demo/html/Makefile b/demo/html/Makefile
@@ -12,14 +12,15 @@ 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 circles.html cities.html columnhead.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 gantt.html image.html image2.html imageNaN.html index.html iterate.html jitter.html keyentry.html label_stacked_histograms.html layout.html lines_arrows.html linkedaxes.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 poldat.html polar_quadrants.html polygons.html prob2.html prob.html projection.html rainbow.html random.html rectangle.html rgba_lines.html rgbalpha.html rgb_variable.html rotate_labels.html rugplot.html running_avg.html sampling.html scatter.html simple.html singulr.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 world2.html heatmaps.html heatmap_points.html stats.html unicode.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 circles.html cities.html columnhead.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 gantt.html image.html image2.html imageNaN.html index.html iterate.html jitter.html keyentry.html label_stacked_histograms.html layout.html lines_arrows.html linkedaxes.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 poldat.html polar_quadrants.html polygons.html prob2.html prob.html projection.html rainbow.html random.html rectangle.html rgba_lines.html rgbalpha.html rgb_variable.html rotate_labels.html rugplot.html running_avg.html sampling.html scatter.html simple.html singulr.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_points.html stats.html unicode.html zerror.html boxes3d.html voxel.html vplot.html isosurface.html
 
 index.html: index.save
 	cp index.save index.html
 	cp ../../term/js/*.png .
 
 animation.html: animation.html.save
 	cp animation.html.save animation.html
+	../../src/gnuplot animation.gp
 
 special_functions: index.html showcase_plots complex_trig.html cerf.html elliptic.html expint.html ibeta.html igamma.html BesselK.html complex_airy.html Dawson.html Fresnel.html lambert.html lnGamma.html synchrotron.html uigamma.html zeta.html
 	cp index.special_functions index.html

diff --git a/demo/html/Makefile.canvas b/demo/html/Makefile.canvas
@@ -9,7 +9,7 @@ GNUPLOT_LIB = ..
 #
 # Auto-generation of html demo set.
 #
-html_3d: binary.html bivariat.html contours.html custom_contours.html datastrings.html discrete.html errorbars.html fenceplot.html hidden.html hidden2.html hidden_compare.html margins.html pixmap.html pm3dcolors.html pm3d.html pm3d_clip.html pm3d_lighting.html pointsize.html polygons.html random.html rgb_variable.html sampling.html scatter.html singulr.html surface1.html surface2.html azimuth.html projection.html transparent_solids.html vector.html walls.html world.html world2.html zerror.html boxes3d.html vplot.html voxel.html isosurface.html
+html_3d: binary.html bivariat.html contours.html custom_contours.html datastrings.html discrete.html errorbars.html fenceplot.html hidden.html hidden2.html hidden_compare.html margins.html pixmap.html pm3dcolors.html pm3d.html pm3d_clip.html pm3d_lighting.html pointsize.html polygons.html random.html rgb_variable.html sampling.html scatter.html singulr.html surface1.html surface2.html azimuth.html projection.html transparent_solids.html vector.html walls.html world.html zerror.html boxes3d.html vplot.html voxel.html isosurface.html
 
 html_2d: airfoil.html approximate.html array.html barchart_art.html bins.html boxplot.html boxclusters.html candlesticks.html canvas_utf8.html circles.html cities.html columnhead.html controls.html convex_hull.html custom_key.html dashtypes.html electron.html enhanced_utf8.html fillbetween.html fillcrvs.html fillstyle.html finance.html histograms.html histograms2.html histerror.html histogram_colors.html hypertext.html hypertext_surface.html gantt.html imageNaN.html index.html iterate.html jitter.html keyentry.html label_stacked_histograms.html layout.html lines_arrows.html linkedaxes.html map_projection.html mask_pm3d.html monotonic_spline.html multiaxis.html multiplt.html nonlinear1.html nonlinear2.html nonlinear3.html named_palettes.html nokey.html param.html piecewise.html polar.html poldat.html polar_quadrants.html prob2.html prob.html rainbow.html ellipse.html rectangle.html rgba_lines.html rgbalpha.html rotate_labels.html rugplot.html running_avg.html simple.html smooth.html smooth_path.html solar_path.html smooth_splines.html spiderplot.html spline.html steps.html transparent.html timedat.html ttics.html using.html varcolor.html world.html heatmaps.html heatmap_points.html stats.html violinplot.html
 

diff --git a/demo/html/Makefile.svg b/demo/html/Makefile.svg
diff --git a/demo/html/animation.html.save b/demo/html/animation.html.save
@@ -7,8 +7,8 @@
 <body>
 <a href=index.html><image src=return.png alt="Back to demo index" class="icon-image"></a>
 <h2>gnuplot demo script: <font color=blue>animation.dem</font> </h2>
-<i>generated by animation.gp on Mon Dec  7 11:31:05 2020</i>
-<br><i>gnuplot version gnuplot 5.5</i>
+<i>generated by animation.gp on Tue Feb  7 11:31:05 2023</i>
+<br><i>gnuplot version gnuplot 6.1</i>
 <hr>
 <table>
 <tr>

diff --git a/demo/html/index.canvas b/demo/html/index.canvas
@@ -2,17 +2,17 @@
 <html>
 <head>
 <meta charset="UTF-8"> 
-<title>Gnuplot 5.5 demos (HTML canvas terminal)</title>
+<title>Gnuplot 6.1 demos (HTML canvas terminal)</title>
 <link type="text/css" href="gnuplot_demo.css" rel="stylesheet">
 <link type="text/css" href="gnuplot_mouse.css" rel="stylesheet">
 </head>
 
 <body oncontextmenu="return false;">
 
-<h2 align=center>Gnuplot 5.5 demos (HTML canvas terminal)<br>
+<h2 align=center>Gnuplot 6.1 demos (HTML canvas terminal)<br>
     See also the demo output for the
-    <a href="http://gnuplot.sourceforge.net/demo_5.5/">PNG</a> and
-    <a href="http://gnuplot.sourceforge.net/demo_svg_5.5/">SVG</a> terminals.
+    <a href="http://gnuplot.sourceforge.net/demo_6.1/">PNG</a> and
+    <a href="http://gnuplot.sourceforge.net/demo_svg_6.1/">SVG</a> terminals.
 </h2>
 <canvas id="warning" width=1 height=1>
     <div class='box'><h2>Your browser may not support the HTML 5 canvas element</h2></div>
@@ -91,7 +91,6 @@
     <li><a href="pm3d.html">pm3d coloring</a></li>
     <li><a href="hidden2.html">pm3d hidden surfaces</a></li>
     <li><a href="pm3d_clip.html">pm3d clipping</a></li>
-    <li><a href="world2.html">3D mapping</a></li>
     <li><a href="projection.html">2D projection of 3D surface</a></li>
     <li><a href="zerror.html">shaded error region</a></li>
     <li><a href="azimuth.html">azimuth</a></li>
@@ -125,7 +124,7 @@
     <li><a href="polar_quadrants.html">polar quadrants</a></li>
     <li><a href="world.html">cylindrical/spherical</a></li>
     <li><a href="timedat.html">time/date coords</a></li>
-    <li><a href="sampling.html">coord sampling ranges</a></li>
+    <li><a href="sampling.html">coordinate sampling ranges</a></li>
     </ul>
 
     <h4>Binary and Image data </h4>
@@ -255,7 +254,7 @@
 <tbody><tr valign="top">
 
     <td>
-    <i>This page generated October 2022</i>
+    <i>This page generated February 2023</i>
     </td>
 
     <td>

diff --git a/demo/html/index.save b/demo/html/index.save
@@ -1,12 +1,12 @@
-<html><head><title>Demos for gnuplot version 5.5</title>
+<html><head><title>Demos for gnuplot version 6.1</title>
 
 <link text="text/css" href="gnuplot_demo.css" rel="stylesheet"></head><body>
 
 
-<h2 align=center>Demos for gnuplot version 5.5 (pngcairo terminal)<br>
+<h2 align=center>Demos for gnuplot version 6.1 (pngcairo terminal)<br>
     See also the demo output for the
-    <a href="../demo_svg_5.5/">SVG</a> and
-    <a href="../demo_canvas_5.5/">canvas</a> terminals.
+    <a href="../demo_svg_6.1/">SVG</a> and
+    <a href="../demo_canvas_6.1/">canvas</a> terminals.
 </h2>
 
 <p>
@@ -92,7 +92,6 @@ Here are samples of PNG output from some of the demos.
     <li><a href="pm3d.html">pm3d coloring</a></li>
     <li><a href="hidden2.html">pm3d hidden surfaces</a></li>
     <li><a href="pm3d_clip.html">pm3d clipping</a></li>
-    <li><a href="world2.html">3D mapping</a></li>
     <li><a href="projection.html">2D projection of 3D surface</a></li>
     <li><a href="zerror.html">shaded error region</a></li>
     <li><a href="azimuth.html">azimuth</a></li>
@@ -128,7 +127,7 @@ Here are samples of PNG output from some of the demos.
     <li><a href="polar_quadrants.html">polar quadrants</a></li>
     <li><a href="world.html">cylindrical/spherical</a></li>
     <li><a href="timedat.html">time/date coords</a></li>
-    <li><a href="sampling.html">coord sampling ranges</a></li>
+    <li><a href="sampling.html">coordinate sampling ranges</a></li>
     </ul>
 
     <h4>Binary and Image data </h4>
@@ -229,17 +228,17 @@ Here are samples of PNG output from some of the demos.
 <tbody><tr valign="top">
 
     <td>
-    <i>This page generated October 2022</i>
+    <i>This page generated February 2023</i>
     </td>
 
     <td>
     <ul>
     <li><a href="http://sourceforge.net/projects/gnuplot/">
 	Gnuplot development pages on SourceForge</a></li>
     <li>On-line PDF documentation in
-	<a href="http://gnuplot.sourceforge.net/docs_5.5/gnuplot.pdf">English</a>
+	<a href="http://gnuplot.sourceforge.net/docs_6.1/gnuplot.pdf">English</a>
 	and
-	<a href="http://gnuplot.sourceforge.net/docs_5.5/gnuplot-ja.pdf">Japanese</a>
+	<a href="http://gnuplot.sourceforge.net/docs_6.1/gnuplot-ja.pdf">Japanese</a>
     </li>
     </ul>
     </td>

diff --git a/demo/html/index.special_functions b/demo/html/index.special_functions
@@ -1,12 +1,12 @@
-<html><head><title>Demos for gnuplot version 5.5</title>
+<html><head><title>Demos for gnuplot version 6.1</title>
 
 <link text="text/css" href="gnuplot_demo.css" rel="stylesheet"></head><body>
 
 
-<h2 align=center>Demos for gnuplot version 5.5 (pngcairo terminal)<br>
+<h2 align=center>Demos for gnuplot version 6.1 (pngcairo terminal)<br>
     See also the demo output for the
-    <a href="../demo_svg_5.5/">SVG</a> and
-    <a href="../demo_canvas_5.5/">canvas</a> terminals.
+    <a href="../demo_svg_6.1/">SVG</a> and
+    <a href="../demo_canvas_6.1/">canvas</a> terminals.
 </h2>
 
 <table border="0" width="100%">
@@ -84,7 +84,6 @@
     <li><a href="pm3d.html">pm3d coloring</a></li>
     <li><a href="hidden2.html">pm3d hidden surfaces</a></li>
     <li><a href="pm3d_clip.html">pm3d clipping</a></li>
-    <li><a href="world2.html">3D mapping</a></li>
     <li><a href="projection.html">2D projection of 3D surface</a></li>
     <li><a href="zerror.html">shaded error region</a></li>
     <li><a href="azimuth.html">azimuth</a></li>
@@ -125,7 +124,7 @@
     <li><a href="polar_quadrants.html">polar quadrants</a></li>
     <li><a href="world.html">cylindrical/spherical</a></li>
     <li><a href="timedat.html">time/date coords</a></li>
-    <li><a href="sampling.html">coord sampling ranges</a></li>
+    <li><a href="sampling.html">coordinate sampling ranges</a></li>
     </ul>
 
     <h4>Binary and Image data </h4>
@@ -270,17 +269,17 @@
 <tbody><tr valign="top">
 
     <td>
-    <i>This page generated October 2022</i>
+    <i>This page generated February 2023</i>
     </td>
 
     <td>
     <ul>
     <li><a href="http://sourceforge.net/projects/gnuplot/">
 	Gnuplot development pages on SourceForge</a></li>
     <li>On-line PDF documentation in
-	<a href="http://gnuplot.sourceforge.net/docs_5.5/gnuplot.pdf">English</a>
+	<a href="http://gnuplot.sourceforge.net/docs_6.1/gnuplot.pdf">English</a>
 	and
-	<a href="http://gnuplot.sourceforge.net/docs_5.5/gnuplot-ja.pdf">Japanese</a>
+	<a href="http://gnuplot.sourceforge.net/docs_6.1/gnuplot-ja.pdf">Japanese</a>
     </li>
     </ul>
     </td>

diff --git a/demo/html/index.svg b/demo/html/index.svg
Original file line number	Diff line number	Diff line change
Expand Up		@@ -19,3 +19,5 @@ plot 'histerror.dat' using 2:3 fs solid 0.5 lw 2 ti 'A', \

		pause -1 "<cr> to continue"

		unset datafile
		reset