Merge branch 'upstream'

configure.ac

@@ -1084,12 +1084,18 @@ if test "${enable_qt}" = yes ; then
           UIC=${QT6LOC}/uic
           MOC=${QT6LOC}/moc
           RCC=${QT6LOC}/rcc
-      else
+      elif test "x${UIC}" = "x"; then
           UIC=uic-qt6
           MOC=moc-qt6
           RCC=rcc-qt6
       fi
-      LRELEASE=lrelease-qt6
+      QT6BIN=`$PKG_CONFIG --variable=bindir Qt6Core`
+      if test "x${QT6BIN}" != "x"; then
+          LRELEASE=${QT6BIN}/lrelease
+      elif test "x${LRELEASE}" = "x"; then
+          LRELEASE=lrelease-qt6
+      fi
+
       CXXFLAGS="$CXXFLAGS -fPIC"
       AC_MSG_RESULT([The Qt terminal will use Qt6.])
       QTVER="6"

demo/all.dem

@@ -206,8 +206,12 @@ print "******************** file binary.dem ********************"
 load "binary.dem"
 reset
 
-print "******************** file steps.dem ********************"
+print "******************** hsteps demos ********************"
 load "steps.dem"
+load "hsteps.dem"
+load "hsteps_histogram.dem"
+load "rank_sequence.dem"
+load "logic_timing.dem"
 reset
 
 print "******************** file scatter.dem ********************"

demo/callargs.dem

@@ -11,7 +11,7 @@ $DATA << EOD
 1 2
 3 4
 EOD
-set table
+set table $OUT
 
 print "\nEntering ", ARG0, " with ", ARGC, " parameters"
 if (ARGC == 0) {

demo/colornames.dem

@@ -1,5 +1,6 @@
 #
 # Draw a table of named colors
+# Note: These names and values must match those in .../src/tables.c
 #
 unset tics
 unset border
@@ -92,7 +93,7 @@ plot 0 lt nodraw notitle,\
  keyentry w boxes title "sienna1"            lc rgb 0xff8040, \
  keyentry w boxes title "sienna4"            lc rgb 0x804014, \
  keyentry w boxes title "skyblue"            lc rgb 0x87ceeb, \
- keyentry w boxes title "slateblue1"         lc rgb 0x8060ff, \
+ keyentry w boxes title "slateblue"          lc rgb 0x8060ff, \
  keyentry w boxes title "slategray"          lc rgb 0xa0b6cd, \
  keyentry w boxes title "spring-green"       lc rgb 0x00ff7f, \
  keyentry w boxes title "steelblue"          lc rgb 0x306080, \

demo/contourfill.dem

@@ -19,6 +19,7 @@ set samples 51
 set pm3d border lt -1 lw 0.5
 set pm3d depth
 
+sinc(x) = (x==0) ? 1.0 : sin(x) / x
 f(x,y) = sinc( sqrt(x*x + y*y) )
 
 set label 1 "set palette cubehelix\nmaxcolors 7"
@@ -44,11 +45,10 @@ reset
 # Illustrate work in progress on new plot style "with contourfill"
 # The style options are
 #   set contourfill
-#	auto N			N evenly spaced slices spanning zrange
-#       ztics {level L} 	slice boundary at every ztic with level L
-#	cbtics {level L}	slice boundary at every cbtic with level L
+#	auto N		N evenly spaced slices spanning zrange
+#       ztics   	slice boundary at every z axis major tic
+#	cbtics  	slice boundary at every cb axis major tic
 #
-# The tics level L defaults to 0 (major tics).
 # cbtics are still active even if the colorbox isn't shown,
 # so an arbitrary set of slice boundaries can be constructe via
 #   set cbtics ( z1, z2, z3, z4, ... )

demo/hsteps.dem

@@ -0,0 +1,116 @@
+#
+# 2D plot style "with hsteps"
+#	1) variations of connecting line shape
+#
+
+$data <<EOD
+1 5
+2 8
+3 10
+4 7
+5 5
+6 3
+EOD
+
+set border 3 lw 2 lc 'gray'
+set style line 1 lw 2 lc "goldenrod"
+set style line 2 lw 3 lc "red"
+set xrange [ 0:10]
+set yrange [-2:13]
+unset tics
+set key top right reverse Left samplen 2
+set key offset 2,1
+
+set multiplot layout 3,2
+
+  set title offset 0,-1.5
+  set label 1 "baseline" at 7, first 0 offset 0,0.5 
+  set xzeroaxis
+
+  set key title "full width"
+  plot $data using 1:2 ls 1 with hsteps title "default", \
+       $data using 1:2 ls 2 with hsteps nolink title "nolink"
+
+  set key title "narrow width"
+  plot $data using 1:2:(0.7) ls 1 with hsteps title "default", \
+       $data using 1:2:(0.7) ls 2 with hsteps nolink  title "nolink"
+
+  set key title "full width"
+  plot $data using 1:2 ls 1 with hsteps pillar title "pillar", \
+       $data using 1:2 ls 2 with hsteps nolink title "nolink"
+
+  set key title "narrow width"
+  plot $data using 1:2:(0.7) ls 1 with hsteps pillar title "pillar", \
+       $data using 1:2:(0.7) ls 2 with hsteps nolink title "nolink"
+
+  unset label 1
+  unset xzeroaxis
+
+  set key title "full width"
+  plot $data using 1:2 ls 1 with hsteps link title "link", \
+       $data using 1:2 ls 2 with hsteps nolink title "nolink"
+
+  set key title "narrow width"
+  plot $data using 1:2:(0.7) ls 1 with hsteps link title "link", \
+       $data using 1:2:(0.7) ls 2 with hsteps nolink title "nolink"
+
+unset multiplot
+pause -1 "<cr> to continue"
+
+
+#
+# 2D plot style "with hsteps"
+#	1) variations of connecting line shape
+#
+unset key
+set xrange [0:7]
+
+set multiplot layout 3,3 columnsfirst offset 0,0 scale 1.1,1.1
+
+  set title "full width"
+  plot $data using 1:2 ls 1 with hsteps, \
+       $data using 1:2 with points pt 7 ps 1 lc black
+
+  set title "width 0.8"
+  plot $data using 1:2:(0.8) ls 1 with hsteps, \
+       $data using 1:2 with points pt 7 ps 1 lc black
+
+  set title "width 0.4"
+  plot $data using 1:2:(0.4) ls 1 with hsteps, \
+       $data using 1:2 with points pt 7 ps 1 lc black
+
+  set title "forward"
+  plot $data using 1:2 ls 1 with hsteps forward, \
+       $data using 1:2 with points pt 7 ps 1 lc black
+
+  set title "forward"
+  plot $data using 1:2:(0.8) ls 1 with hsteps forward, \
+       $data using 1:2 with points pt 7 ps 1 lc black
+
+  set title "forward"
+  plot $data using 1:2:(0.4) ls 1 with hsteps forward, \
+       $data using 1:2 with points pt 7 ps 1 lc black
+
+  set title "backward"
+  plot $data using 1:2 ls 1 with hsteps backward, \
+       $data using 1:2 with points pt 7 ps 1 lc black
+
+  set title "backward"
+  plot $data using 1:2:(0.8) ls 1 with hsteps backward, \
+       $data using 1:2 with points pt 7 ps 1 lc black
+
+  set title "backward"
+  plot $data using 1:2:(0.4) ls 1 with hsteps backward, \
+       $data using 1:2 with points pt 7 ps 1 lc black
+
+unset multiplot
+
+pause -1 "<cr> to continue"
+
+set yrange [-1:13]
+set title "hsteps with variable fill color"
+set style fill solid 0.5 border lc "black"
+plot $data using 1:2:(0.7):1 with hsteps fc variable
+
+pause -1 "<cr> to continue"
+reset

demo/hsteps_histogram.dem

@@ -0,0 +1,35 @@
+#
+# Two plot style options "with hsteps link" and "with hsteps pillar"
+# can be combined to create a stacked histogram with connecting lines
+# between category boundaries.
+#
+
+set title "Stacked histogram constructed from plot style hsteps"
+
+$data <<EOD
+1 2018 60 30
+2 2019 65 35
+3 2020 61 25
+4 2021 57 33
+5 2022 65 40
+6 2023 62 20
+EOD
+
+set xrange [0:7]
+set yrange [0:80]
+unset ytics
+set xtics scale 0
+set border 3 lw 2 front
+set bmargin 4
+unset key
+
+set style line 11 linecolor 'gray50' linewidth 2 dashtype (4,10) 
+set style line 12 linecolor variable linewidth 2 dashtype solid
+
+plot $data using 1:3:(0.5):xtic(2) ls 11 with hsteps link, \
+     $data using 1:3:(0.5):1       ls 12 with hsteps pillar fs solid 0.5 border, \
+     $data using 1:4:(0.5)         ls 11 with hsteps link, \
+     $data using 1:4:(0.5):1       ls 12 with hsteps pillar fs transparent pattern 1 border
+
+pause -1 "<cr> to continue"
+reset

demo/html/Makefile

@@ -12,7 +12,7 @@ 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 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 iris.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 polargrid.html poldat.html polar_quadrants.html polygons.html prob2.html prob.html projection.html rainbow.html random.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 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
 
 index.html: index.save
 	cp index.save index.html

demo/html/Makefile.canvas

@@ -9,9 +9,9 @@ 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 zerror.html boxes3d.html vplot.html voxel.html isosurface.html
+html_3d: binary.html bivariat.html contourfill.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 chi_shapes.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 iris.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 polargrid.html poldat.html polar_quadrants.html prob2.html prob.html rainbow.html ellipse.html rectangle.html rgba_lines.html argb_hexdata.html rotate_labels.html rugplot.html running_avg.html simple.html sectors.html sharpen.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_4D.html heatmap_points.html stats.html violinplot.html windrose.html
+html_2d: airfoil.html approximate.html array.html barchart_art.html bins.html boxplot.html boxclusters.html candlesticks.html canvas_utf8.html chi_shapes.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 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 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 polargrid.html poldat.html polar_quadrants.html prob2.html prob.html rainbow.html ellipse.html rank_sequence.html rectangle.html rgba_lines.html argb_hexdata.html rotate_labels.html rugplot.html running_avg.html simple.html sectors.html sharpen.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_4D.html heatmap_points.html stats.html violinplot.html windrose.html
 
 html: html_2d html_3d