forked from pool/gnuplot
This commit is contained in:
parent
299eda3565
commit
af5ef76438
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:b0981514eb21605c0f872f4ed3a595e4874b213d9c5f2c4ab1d85e69acd041e8
|
||||
size 2315568
|
@ -1,6 +1,6 @@
|
||||
--- demo/all.dem
|
||||
+++ demo/all.dem 2007-08-15 20:54:29.000000000 +0200
|
||||
@@ -5,213 +5,213 @@
|
||||
--- demo/all.dem 2009-02-19 22:16:03.000000000 +0100
|
||||
+++ demo/all.dem 2009-05-09 14:44:57.000000000 +0200
|
||||
@@ -5,218 +5,218 @@
|
||||
#
|
||||
|
||||
print "******************** file simple.dem ********************"
|
||||
@ -68,8 +68,10 @@
|
||||
print "******************** file multiplt.dem ********************"
|
||||
-load "multiplt.dem"
|
||||
-load "layout.dem"
|
||||
-load "margins.dem"
|
||||
+load "@@GNUPLOTDEMOPATH@@multiplt.dem"
|
||||
+load "@@GNUPLOTDEMOPATH@@layout.dem"
|
||||
+load "@@GNUPLOTDEMOPATH@@margins.dem"
|
||||
reset
|
||||
|
||||
print "******************** file surface1.dem ********************"
|
||||
@ -194,6 +196,11 @@
|
||||
+load "@@GNUPLOTDEMOPATH@@pm3dgamma.dem"
|
||||
reset
|
||||
|
||||
print "********************** file heatmaps.dem ***********************"
|
||||
-load "heatmaps.dem"
|
||||
+load "@@GNUPLOTDEMOPATH@@heatmaps.dem"
|
||||
reset
|
||||
|
||||
print "********************** file hidden2.dem ***********************"
|
||||
-load "hidden2.dem"
|
||||
+load "@@GNUPLOTDEMOPATH@@hidden2.dem"
|
||||
@ -270,8 +277,9 @@
|
||||
-load "rectangle.dem"
|
||||
+load "@@GNUPLOTDEMOPATH@@rectangle.dem"
|
||||
reset
|
||||
--- demo/animate.dem
|
||||
+++ demo/animate.dem 2007-08-15 20:52:01.000000000 +0200
|
||||
diff -U 3 -H -d -r -N -- demo/animate.dem demo/animate.dem
|
||||
--- demo/animate.dem 2006-01-08 00:21:02.000000000 +0100
|
||||
+++ demo/animate.dem 2009-05-09 14:44:57.000000000 +0200
|
||||
@@ -20,7 +20,7 @@
|
||||
xview(xrot)=(50.+30.*sin((xrot%180)/180.*pi))
|
||||
zview(zrot)=(60.+45.*sin(zrot/180.*pi))
|
||||
@ -288,8 +296,9 @@
|
||||
-load "gnuplot.rot"
|
||||
+load '@@GNUPLOTDEMOPATH@@gnuplot.rot'
|
||||
reset
|
||||
--- demo/arrowstyle.dem
|
||||
+++ demo/arrowstyle.dem 2007-08-15 20:52:01.000000000 +0200
|
||||
diff -U 3 -H -d -r -N -- demo/arrowstyle.dem demo/arrowstyle.dem
|
||||
--- demo/arrowstyle.dem 2003-07-03 02:13:29.000000000 +0200
|
||||
+++ demo/arrowstyle.dem 2009-05-09 14:44:57.000000000 +0200
|
||||
@@ -40,42 +40,42 @@
|
||||
|
||||
set title 'Top: plot with vectors arrowstyle 1, Bottom: explicit arrows'
|
||||
@ -354,8 +363,9 @@
|
||||
#
|
||||
pause -1 "Hi return to continue"
|
||||
#
|
||||
--- demo/binary.dem
|
||||
+++ demo/binary.dem 2007-08-15 20:52:01.000000000 +0200
|
||||
diff -U 3 -H -d -r -N -- demo/binary.dem demo/binary.dem
|
||||
--- demo/binary.dem 2003-10-28 06:35:54.000000000 +0100
|
||||
+++ demo/binary.dem 2009-05-09 14:44:57.000000000 +0200
|
||||
@@ -9,20 +9,20 @@
|
||||
|
||||
set xrange [-3:3]
|
||||
@ -380,8 +390,9 @@
|
||||
pause -1 "Hit return to continue (3)"
|
||||
|
||||
reset
|
||||
--- demo/candlesticks.dem
|
||||
+++ demo/candlesticks.dem 2007-08-15 20:52:01.000000000 +0200
|
||||
diff -U 3 -H -d -r -N -- demo/candlesticks.dem demo/candlesticks.dem
|
||||
--- demo/candlesticks.dem 2005-03-30 08:02:45.000000000 +0200
|
||||
+++ demo/candlesticks.dem 2009-05-09 14:44:57.000000000 +0200
|
||||
@@ -8,7 +8,7 @@
|
||||
set yrange [0:10]
|
||||
#
|
||||
@ -407,8 +418,9 @@
|
||||
'' using 1:4:4:4:4 with candlesticks lt -1 lw 2 notitle
|
||||
pause -1 "Hit return to continue"
|
||||
#
|
||||
--- demo/contours.dem
|
||||
+++ demo/contours.dem 2007-08-15 20:55:56.000000000 +0200
|
||||
diff -U 3 -H -d -r -N -- demo/contours.dem demo/contours.dem
|
||||
--- demo/contours.dem 2006-06-25 19:24:32.000000000 +0200
|
||||
+++ demo/contours.dem 2009-05-09 14:44:57.000000000 +0200
|
||||
@@ -85,13 +85,13 @@
|
||||
set style data lines
|
||||
set title "3D gnuplot demo - contour of data grid plotting"
|
||||
@ -425,8 +437,9 @@
|
||||
pause -1 "Hit return to continue (20)"
|
||||
set view map
|
||||
unset surface
|
||||
--- demo/datastrings.dem
|
||||
+++ demo/datastrings.dem 2007-08-15 20:52:01.000000000 +0200
|
||||
diff -U 3 -H -d -r -N -- demo/datastrings.dem demo/datastrings.dem
|
||||
--- demo/datastrings.dem 2009-03-14 01:11:12.000000000 +0100
|
||||
+++ demo/datastrings.dem 2009-05-09 14:44:57.000000000 +0200
|
||||
@@ -17,7 +17,7 @@
|
||||
set yrange [0:200]
|
||||
#
|
||||
@ -458,17 +471,17 @@
|
||||
pause -1 "<cr> to plot same data from table format"
|
||||
set title "Plot from table format (titles taken from column headers)"
|
||||
unset x2tics
|
||||
-plot 'table.dat' using ($0-0.2):2 title 2 with boxes, \
|
||||
+plot '@@GNUPLOTDEMOPATH@@table.dat' using ($0-0.2):2 title 2 with boxes, \
|
||||
'' using ($0+0.2):3 title 3 with boxes, \
|
||||
'' using ($0):4 title 4 with linespoints, \
|
||||
'' using ($0):5:xtic(1) title 5 with linespoints
|
||||
-plot 'table.dat' using ($0-0.2):2 title column(2) with boxes, \
|
||||
+plot '@@GNUPLOTDEMOPATH@@table.dat' using ($0-0.2):2 title column(2) with boxes, \
|
||||
'' using ($0+0.2):3 title column(3) with boxes, \
|
||||
'' using ($0):4 title column(4) with linespoints, \
|
||||
'' using ($0):5:xtic(1) title column(5) with linespoints
|
||||
@@ -63,7 +63,7 @@
|
||||
pause -1 "<cr> to show double use of y values"
|
||||
#
|
||||
set title "Plot actual y-value as a label"
|
||||
-plot 'table.dat' using 0:2 title 2 with boxes, \
|
||||
+plot '@@GNUPLOTDEMOPATH@@table.dat' using 0:2 title 2 with boxes, \
|
||||
-plot 'table.dat' using 0:2 title columnhead with boxes, \
|
||||
+plot '@@GNUPLOTDEMOPATH@@table.dat' using 0:2 title columnhead with boxes, \
|
||||
'' using 0:2:2 with labels center offset 0,1 notitle
|
||||
#
|
||||
pause -1 "<cr> continue"
|
||||
@ -497,8 +510,9 @@
|
||||
+load '@@GNUPLOTDEMOPATH@@starmap.dem'
|
||||
#
|
||||
pause -1 "<cr> to end demo"
|
||||
--- demo/fillbetween.dem
|
||||
+++ demo/fillbetween.dem 2007-08-15 20:52:01.000000000 +0200
|
||||
diff -U 3 -H -d -r -N -- demo/fillbetween.dem demo/fillbetween.dem
|
||||
--- demo/fillbetween.dem 2004-07-09 02:32:34.000000000 +0200
|
||||
+++ demo/fillbetween.dem 2009-05-09 14:44:57.000000000 +0200
|
||||
@@ -8,7 +8,7 @@
|
||||
set style data lines
|
||||
set xrange [10:*]
|
||||
@ -517,8 +531,9 @@
|
||||
'' u 1:2:($3+$1/50.) w filledcurves below title 'Below', \
|
||||
'' u 1:2 lt -1 lw 2 title 'curve 1', \
|
||||
'' u 1:($3+$1/50.) lt 3 lw 2 title 'curve 2'
|
||||
--- demo/fit.dem
|
||||
+++ demo/fit.dem 2007-08-15 20:52:01.000000000 +0200
|
||||
diff -U 3 -H -d -r -N -- demo/fit.dem demo/fit.dem
|
||||
--- demo/fit.dem 2004-09-25 05:39:20.000000000 +0200
|
||||
+++ demo/fit.dem 2009-05-09 14:44:57.000000000 +0200
|
||||
@@ -5,65 +5,66 @@
|
||||
print "Some examples how data fitting using nonlinear least squares fit"
|
||||
print "can be done."
|
||||
@ -734,8 +749,9 @@
|
||||
pause -1 "Hit return to continue"
|
||||
set title 'fitted parameters'
|
||||
replot
|
||||
--- demo/hidden.dem
|
||||
+++ demo/hidden.dem 2007-08-15 20:52:01.000000000 +0200
|
||||
diff -U 3 -H -d -r -N -- demo/hidden.dem demo/hidden.dem
|
||||
--- demo/hidden.dem 2003-10-28 06:35:54.000000000 +0100
|
||||
+++ demo/hidden.dem 2009-05-09 14:44:57.000000000 +0200
|
||||
@@ -48,7 +48,7 @@
|
||||
# autoranging loses the verticals
|
||||
set xrange [0:15]
|
||||
@ -745,56 +761,19 @@
|
||||
pause -1 "Hit return to continue (6)"
|
||||
|
||||
set view 50
|
||||
--- demo/histograms2.dem
|
||||
+++ demo/histograms2.dem 2007-08-15 20:52:01.000000000 +0200
|
||||
@@ -25,7 +25,7 @@
|
||||
#
|
||||
plot \
|
||||
newhistogram "Northern Europe", \
|
||||
-'immigration.dat' using 6:xtic(1) t 6, '' u 13 t 13, '' u 14 t 14, \
|
||||
+'@@GNUPLOTDEMOPATH@@immigration.dat' using 6:xtic(1) t 6, '' u 13 t 13, '' u 14 t 14, \
|
||||
newhistogram "Southern Europe", \
|
||||
'' u 9:xtic(1) t 9, '' u 17 t 17, '' u 22 t 22, \
|
||||
newhistogram "British Isles", \
|
||||
@@ -35,7 +35,7 @@
|
||||
set title "Explicit start color in 'newhistogram' command"
|
||||
plot \
|
||||
newhistogram "Northern Europe" lt 4, \
|
||||
-'immigration.dat' using 6:xtic(1) t 6, '' u 13 t 13, '' u 14 t 14, \
|
||||
+'@@GNUPLOTDEMOPATH@@immigration.dat' using 6:xtic(1) t 6, '' u 13 t 13, '' u 14 t 14, \
|
||||
newhistogram "Southern Europe" lt 4, \
|
||||
'' u 9:xtic(1) t 9, '' u 17 t 17, '' u 22 t 22, \
|
||||
newhistogram "British Isles" lt 4, \
|
||||
@@ -47,7 +47,7 @@
|
||||
set style fill pattern 1 border -1
|
||||
plot \
|
||||
newhistogram "Northern Europe" fs pattern 1, \
|
||||
-'immigration.dat' using 6:xtic(1) t 6, '' u 13 t 13, '' u 14 t 14, \
|
||||
+'@@GNUPLOTDEMOPATH@@immigration.dat' using 6:xtic(1) t 6, '' u 13 t 13, '' u 14 t 14, \
|
||||
newhistogram "Southern Europe" fs pattern 1, \
|
||||
'' u 9:xtic(1) t 9, '' u 17 t 17, '' u 22 t 22, \
|
||||
newhistogram "British Isles" fs pattern 1, \
|
||||
@@ -59,7 +59,7 @@
|
||||
set style fill pattern 1 border -1
|
||||
plot \
|
||||
newhistogram "Northern Europe" lt 2 fs pattern 1, \
|
||||
-'immigration.dat' using 6:xtic(1) t 6, '' u 13 t 13, '' u 14 t 14, \
|
||||
+'@@GNUPLOTDEMOPATH@@immigration.dat' using 6:xtic(1) t 6, '' u 13 t 13, '' u 14 t 14, \
|
||||
newhistogram "Southern Europe" lt 2 fs pattern 1, \
|
||||
'' u 9:xtic(1) t 9, '' u 17 t 17, '' u 22 t 22, \
|
||||
newhistogram "British Isles" lt 2 fs pattern 1, \
|
||||
--- demo/histograms.dem
|
||||
+++ demo/histograms.dem 2007-08-15 20:56:59.000000000 +0200
|
||||
@@ -8,7 +8,7 @@
|
||||
#
|
||||
diff -U 3 -H -d -r -N -- demo/histograms.dem demo/histograms.dem
|
||||
--- demo/histograms.dem 2009-03-14 01:11:12.000000000 +0100
|
||||
+++ demo/histograms.dem 2009-05-09 14:44:57.000000000 +0200
|
||||
@@ -9,7 +9,7 @@
|
||||
# First plot using linespoints
|
||||
set style data linespoints
|
||||
-plot 'immigration.dat' using 2:xtic(1) t 2, \
|
||||
+plot '@@GNUPLOTDEMOPATH@@immigration.dat' using 2:xtic(1) t 2, \
|
||||
'' u 3 t 3, '' u 4 t 4, '' u 5 t 5, '' u 6 t 6, \
|
||||
'' u 7 t 7, '' u 8 t 8, '' u 9 t 9, '' u 10 t 10, \
|
||||
'' u 11 t 11, '' u 12 t 12, '' u 13 t 13, '' u 14 t 14, \
|
||||
@@ -26,7 +26,7 @@
|
||||
set key autotitle columnhead
|
||||
-plot 'immigration.dat' using 2:xtic(1), \
|
||||
+plot '@@GNUPLOTDEMOPATH@@immigration.dat' using 2:xtic(1), \
|
||||
'' u 3, '' u 4, '' u 5, '' u 6, \
|
||||
'' u 7, '' u 8, '' u 9, '' u 10, \
|
||||
'' u 11, '' u 12, '' u 13, '' u 14, \
|
||||
@@ -27,7 +27,7 @@
|
||||
set boxwidth 0.9
|
||||
set xtic rotate by -45
|
||||
#set bmargin 10
|
||||
@ -803,7 +782,7 @@
|
||||
#
|
||||
pause -1 "<cr> to change the gap between clusters"
|
||||
#
|
||||
@@ -51,7 +51,7 @@
|
||||
@@ -52,7 +52,7 @@
|
||||
set style fill solid border -1
|
||||
set boxwidth 0.75
|
||||
#
|
||||
@ -812,16 +791,16 @@
|
||||
'' using 3, \
|
||||
'' using 4, \
|
||||
'' using 5, \
|
||||
@@ -89,7 +89,7 @@
|
||||
@@ -90,7 +90,7 @@
|
||||
set style fill solid border -1
|
||||
set boxwidth 0.75
|
||||
#
|
||||
-plot 'immigration.dat' using (100.*$2/$24):xtic(1) t 2, \
|
||||
+plot '@@GNUPLOTDEMOPATH@@immigration.dat' using (100.*$2/$24):xtic(1) t 2, \
|
||||
'' using (100.*$3/$24) t 3, \
|
||||
'' using (100.*$4/$24) t 4, \
|
||||
'' using (100.*$5/$24) t 5, \
|
||||
@@ -128,7 +128,7 @@
|
||||
-plot 'immigration.dat' using (100.*$2/$24):xtic(1) title column(2), \
|
||||
+plot '@@GNUPLOTDEMOPATH@@immigration.dat' using (100.*$2/$24):xtic(1) title column(2), \
|
||||
'' using (100.*$3/$24) title column(3), \
|
||||
'' using (100.*$4/$24) title column(4), \
|
||||
'' using (100.*$5/$24) title column(5), \
|
||||
@@ -129,7 +129,7 @@
|
||||
set ytics
|
||||
unset xtics
|
||||
set xtics norotate nomirror
|
||||
@ -830,17 +809,57 @@
|
||||
'' using 13 ti col, '' using 14:key(1) ti col
|
||||
#
|
||||
pause -1 "Next we do several sets of parallel histograms"
|
||||
@@ -148,7 +148,7 @@
|
||||
@@ -150,7 +150,7 @@
|
||||
set auto y
|
||||
plot \
|
||||
newhistogram "Northern Europe", \
|
||||
-'immigration.dat' using 6:xtic(1) t 6, '' u 13 t 13, '' u 14 t 14, \
|
||||
+'@@GNUPLOTDEMOPATH@@immigration.dat' using 6:xtic(1) t 6, '' u 13 t 13, '' u 14 t 14, \
|
||||
-'immigration.dat' using 6:xtic(1), '' u 13, '' u 14, \
|
||||
+'@@GNUPLOTDEMOPATH@@immigration.dat' using 6:xtic(1), '' u 13, '' u 14, \
|
||||
newhistogram "Southern Europe", \
|
||||
'' u 9:xtic(1) t 9, '' u 17 t 17, '' u 22 t 22, \
|
||||
'' u 9:xtic(1), '' u 17, '' u 22, \
|
||||
newhistogram "British Isles", \
|
||||
--- demo/image.dem
|
||||
+++ demo/image.dem 2007-08-15 20:58:34.000000000 +0200
|
||||
diff -U 3 -H -d -r -N -- demo/histograms2.dem demo/histograms2.dem
|
||||
--- demo/histograms2.dem 2009-03-14 01:11:12.000000000 +0100
|
||||
+++ demo/histograms2.dem 2009-05-09 14:44:57.000000000 +0200
|
||||
@@ -26,7 +26,7 @@
|
||||
#
|
||||
plot \
|
||||
newhistogram "Northern Europe", \
|
||||
-'immigration.dat' using 6:xtic(1), '' u 13, '' u 14, \
|
||||
+'@@GNUPLOTDEMOPATH@@immigration.dat' using 6:xtic(1), '' u 13, '' u 14, \
|
||||
newhistogram "Southern Europe", \
|
||||
'' u 9:xtic(1), '' u 17, '' u 22, \
|
||||
newhistogram "British Isles", \
|
||||
@@ -36,7 +36,7 @@
|
||||
set title "Explicit start color in 'newhistogram' command"
|
||||
plot \
|
||||
newhistogram "Northern Europe" lt 4, \
|
||||
-'immigration.dat' using 6:xtic(1), '' u 13, '' u 14, \
|
||||
+'@@GNUPLOTDEMOPATH@@immigration.dat' using 6:xtic(1), '' u 13, '' u 14, \
|
||||
newhistogram "Southern Europe" lt 4, \
|
||||
'' u 9:xtic(1), '' u 17, '' u 22, \
|
||||
newhistogram "British Isles" lt 4, \
|
||||
@@ -48,7 +48,7 @@
|
||||
set style fill pattern 1 border -1
|
||||
plot \
|
||||
newhistogram "Northern Europe" fs pattern 1, \
|
||||
-'immigration.dat' using 6:xtic(1), '' u 13, '' u 14, \
|
||||
+'@@GNUPLOTDEMOPATH@@immigration.dat' using 6:xtic(1), '' u 13, '' u 14, \
|
||||
newhistogram "Southern Europe" fs pattern 1, \
|
||||
'' u 9:xtic(1), '' u 17, '' u 22, \
|
||||
newhistogram "British Isles" fs pattern 1, \
|
||||
@@ -60,7 +60,7 @@
|
||||
set style fill pattern 1 border -1
|
||||
plot \
|
||||
newhistogram "Northern Europe" lt 2 fs pattern 1, \
|
||||
-'immigration.dat' using 6:xtic(1), '' u 13, '' u 14, \
|
||||
+'@@GNUPLOTDEMOPATH@@immigration.dat' using 6:xtic(1), '' u 13, '' u 14, \
|
||||
newhistogram "Southern Europe" lt 2 fs pattern 1, \
|
||||
'' u 9:xtic(1), '' u 17, '' u 22, \
|
||||
newhistogram "British Isles" lt 2 fs pattern 1, \
|
||||
diff -U 3 -H -d -r -N -- demo/image.dem demo/image.dem
|
||||
--- demo/image.dem 2006-12-28 22:19:20.000000000 +0100
|
||||
+++ demo/image.dem 2009-05-09 14:44:57.000000000 +0200
|
||||
@@ -32,7 +32,7 @@
|
||||
set xrange [-10:137]
|
||||
set yrange [-10:157]
|
||||
@ -1119,8 +1138,9 @@
|
||||
pause -1 "Hit return to continue"
|
||||
reset
|
||||
|
||||
--- demo/layout.dem
|
||||
+++ demo/layout.dem 2007-08-15 20:52:01.000000000 +0200
|
||||
diff -U 3 -H -d -r -N -- demo/layout.dem demo/layout.dem
|
||||
--- demo/layout.dem 2005-08-08 11:13:02.000000000 +0200
|
||||
+++ demo/layout.dem 2009-05-09 14:44:57.000000000 +0200
|
||||
@@ -8,7 +8,7 @@
|
||||
plot sin(x)/x
|
||||
#
|
||||
@ -1175,8 +1195,9 @@
|
||||
'' using 7 with histograms , \
|
||||
'' using 8 with histograms , \
|
||||
'' using 11 with histograms
|
||||
--- demo/mgr.dem
|
||||
+++ demo/mgr.dem 2007-08-15 20:52:01.000000000 +0200
|
||||
diff -U 3 -H -d -r -N -- demo/mgr.dem demo/mgr.dem
|
||||
--- demo/mgr.dem 2004-01-13 08:01:10.000000000 +0100
|
||||
+++ demo/mgr.dem 2009-05-09 14:44:57.000000000 +0200
|
||||
@@ -7,7 +7,7 @@
|
||||
set ylabel "Amplitude"
|
||||
set key box
|
||||
@ -1256,8 +1277,9 @@
|
||||
+plot [0:50] "@@GNUPLOTDEMOPATH@@battery.dat" u 1:2:4 t "Power" w yerr, n(x) t "Theory" w lines
|
||||
reset
|
||||
|
||||
--- demo/multimsh.dem
|
||||
+++ demo/multimsh.dem 2007-08-15 20:52:01.000000000 +0200
|
||||
diff -U 3 -H -d -r -N -- demo/multimsh.dem demo/multimsh.dem
|
||||
--- demo/multimsh.dem 2003-10-28 06:35:54.000000000 +0100
|
||||
+++ demo/multimsh.dem 2009-05-09 14:44:57.000000000 +0200
|
||||
@@ -9,40 +9,40 @@
|
||||
set zrange [-2:2]
|
||||
set style data line
|
||||
@ -1307,8 +1329,9 @@
|
||||
pause -1 "Press Return"
|
||||
|
||||
reset
|
||||
--- demo/pm3d.dem
|
||||
+++ demo/pm3d.dem 2007-08-15 20:52:01.000000000 +0200
|
||||
diff -U 3 -H -d -r -N -- demo/pm3d.dem demo/pm3d.dem
|
||||
--- demo/pm3d.dem 2007-01-19 22:15:47.000000000 +0100
|
||||
+++ demo/pm3d.dem 2009-05-09 14:44:57.000000000 +0200
|
||||
@@ -8,7 +8,7 @@
|
||||
# Otherwise you can use the output to postscript, for example:
|
||||
# set term push; set term postscript color enhanced
|
||||
@ -1376,8 +1399,9 @@
|
||||
|
||||
pause -1 "Hit return to continue"
|
||||
|
||||
--- demo/pointsize.dem
|
||||
+++ demo/pointsize.dem 2007-08-15 20:52:01.000000000 +0200
|
||||
diff -U 3 -H -d -r -N -- demo/pointsize.dem demo/pointsize.dem
|
||||
--- demo/pointsize.dem 2006-02-23 09:10:57.000000000 +0100
|
||||
+++ demo/pointsize.dem 2009-05-09 14:44:57.000000000 +0200
|
||||
@@ -13,16 +13,16 @@
|
||||
# plot a 2D map with locations marked by variable sized points
|
||||
#
|
||||
@ -1421,19 +1445,9 @@
|
||||
pause -1 "Hit return to continue"
|
||||
|
||||
reset
|
||||
--- demo/prob2.dem
|
||||
+++ demo/prob2.dem 2007-08-15 21:00:52.000000000 +0200
|
||||
@@ -34,7 +34,7 @@
|
||||
print ""
|
||||
pause -1 " Press Return to start demo ..."
|
||||
|
||||
-load "stat.inc"
|
||||
+load "@@GNUPLOTDEMOPATH@@stat.inc"
|
||||
rnd(x) = floor(x+0.5)
|
||||
r_xmin = -1
|
||||
r_sigma = 4.0
|
||||
--- demo/prob.dem
|
||||
+++ demo/prob.dem 2007-08-15 20:59:07.000000000 +0200
|
||||
diff -U 3 -H -d -r -N -- demo/prob.dem demo/prob.dem
|
||||
--- demo/prob.dem 2006-06-14 05:24:09.000000000 +0200
|
||||
+++ demo/prob.dem 2009-05-09 14:44:57.000000000 +0200
|
||||
@@ -17,7 +17,7 @@
|
||||
print " Press Ctrl-C to exit right now"
|
||||
pause -1 " Press Return to start demo ..."
|
||||
@ -1443,8 +1457,21 @@
|
||||
|
||||
eps = 1.0e-10 # Supposed to be float resolution (nice if were defined internally)
|
||||
|
||||
--- demo/rainbow.dem
|
||||
+++ demo/rainbow.dem 2007-08-16 10:04:44.000000000 +0200
|
||||
diff -U 3 -H -d -r -N -- demo/prob2.dem demo/prob2.dem
|
||||
--- demo/prob2.dem 2006-06-14 05:24:09.000000000 +0200
|
||||
+++ demo/prob2.dem 2009-05-09 14:44:57.000000000 +0200
|
||||
@@ -34,7 +34,7 @@
|
||||
print ""
|
||||
pause -1 " Press Return to start demo ..."
|
||||
|
||||
-load "stat.inc"
|
||||
+load "@@GNUPLOTDEMOPATH@@stat.inc"
|
||||
rnd(x) = floor(x+0.5)
|
||||
r_xmin = -1
|
||||
r_sigma = 4.0
|
||||
diff -U 3 -H -d -r -N -- demo/rainbow.dem demo/rainbow.dem
|
||||
--- demo/rainbow.dem 2006-08-07 22:27:13.000000000 +0200
|
||||
+++ demo/rainbow.dem 2009-05-09 14:44:57.000000000 +0200
|
||||
@@ -79,7 +79,7 @@
|
||||
#
|
||||
# Load terminal-independent colorwheel (HSV full saturation)
|
||||
@ -1454,8 +1481,9 @@
|
||||
#
|
||||
# define line styles using macros and a fixed palette
|
||||
#
|
||||
--- demo/random.dem
|
||||
+++ demo/random.dem 2007-08-15 21:15:37.000000000 +0200
|
||||
diff -U 3 -H -d -r -N -- demo/random.dem demo/random.dem
|
||||
--- demo/random.dem 2008-09-24 01:11:31.000000000 +0200
|
||||
+++ demo/random.dem 2009-05-09 14:44:57.000000000 +0200
|
||||
@@ -79,7 +79,7 @@
|
||||
pause -1 "Hit return to continue"
|
||||
unset contour
|
||||
@ -1465,8 +1493,9 @@
|
||||
|
||||
print ""
|
||||
print "Simple Monte Carlo simulation"
|
||||
--- demo/rgb_variable.dem
|
||||
+++ demo/rgb_variable.dem 2007-08-16 10:40:03.000000000 +0200
|
||||
diff -U 3 -H -d -r -N -- demo/rgb_variable.dem demo/rgb_variable.dem
|
||||
--- demo/rgb_variable.dem 2006-10-16 18:09:00.000000000 +0200
|
||||
+++ demo/rgb_variable.dem 2009-05-09 14:44:57.000000000 +0200
|
||||
@@ -12,7 +12,7 @@
|
||||
#
|
||||
rgb(r,g,b) = int(r)*65536 + int(g)*256 + int(b)
|
||||
@ -1494,8 +1523,9 @@
|
||||
title "variable pointsize and rgb color computed from coords"
|
||||
pause -1 "Hit return to continue"
|
||||
|
||||
--- demo/scatter.dem
|
||||
+++ demo/scatter.dem 2007-08-15 20:59:07.000000000 +0200
|
||||
diff -U 3 -H -d -r -N -- demo/scatter.dem demo/scatter.dem
|
||||
--- demo/scatter.dem 2003-10-28 06:35:54.000000000 +0100
|
||||
+++ demo/scatter.dem 2009-05-09 14:44:57.000000000 +0200
|
||||
@@ -13,48 +13,48 @@
|
||||
set style data points
|
||||
set xlabel "data style point - no dgrid"
|
||||
@ -1553,8 +1583,9 @@
|
||||
+splot "@@GNUPLOTDEMOPATH@@scatter2.dat"
|
||||
pause -1 "Hit return to continue (8)"
|
||||
reset
|
||||
--- demo/simple.dem
|
||||
+++ demo/simple.dem 2007-08-15 21:02:07.000000000 +0200
|
||||
diff -U 3 -H -d -r -N -- demo/simple.dem demo/simple.dem
|
||||
--- demo/simple.dem 2009-05-09 14:44:29.000000000 +0200
|
||||
+++ demo/simple.dem 2009-05-09 14:44:57.000000000 +0200
|
||||
@@ -4,7 +4,7 @@
|
||||
# Requires data files "[123].dat" from this directory,
|
||||
# so change current working directory to this directory before running.
|
||||
@ -1577,8 +1608,9 @@
|
||||
pause -1 "Hit return to continue"
|
||||
reset
|
||||
|
||||
--- demo/singulr.dem
|
||||
+++ demo/singulr.dem 2007-08-15 20:59:07.000000000 +0200
|
||||
diff -U 3 -H -d -r -N -- demo/singulr.dem demo/singulr.dem
|
||||
--- demo/singulr.dem 2003-10-28 06:35:54.000000000 +0100
|
||||
+++ demo/singulr.dem 2009-05-09 14:44:57.000000000 +0200
|
||||
@@ -163,14 +163,14 @@
|
||||
set ticslevel 0.
|
||||
set view 50,15 #HBB: ,1,1.7
|
||||
@ -1596,8 +1628,9 @@
|
||||
pause -1 "Hit return to continue (20)"
|
||||
|
||||
reset
|
||||
--- demo/starmap.dem
|
||||
+++ demo/starmap.dem 2007-08-15 20:59:07.000000000 +0200
|
||||
diff -U 3 -H -d -r -N -- demo/starmap.dem demo/starmap.dem
|
||||
--- demo/starmap.dem 2006-06-30 04:17:22.000000000 +0200
|
||||
+++ demo/starmap.dem 2009-05-09 14:44:57.000000000 +0200
|
||||
@@ -14,7 +14,7 @@
|
||||
set title "Gliese star catalog - 7 parsec neighborhood centered on Earth"
|
||||
set cblabel "Luminosity" offset 0,1
|
||||
@ -1607,8 +1640,9 @@
|
||||
'' using 5:6:7:11 with points pt 7 ps 1 pal notitle, \
|
||||
'' using 5:6:7:2 with labels font "Helvetica,9" left \
|
||||
point pt 0 offset 1,0 notitle
|
||||
--- demo/steps.dem
|
||||
+++ demo/steps.dem 2007-08-15 20:59:07.000000000 +0200
|
||||
diff -U 3 -H -d -r -N -- demo/steps.dem demo/steps.dem
|
||||
--- demo/steps.dem 2003-10-17 17:02:21.000000000 +0200
|
||||
+++ demo/steps.dem 2009-05-09 14:44:57.000000000 +0200
|
||||
@@ -8,16 +8,16 @@
|
||||
# function.
|
||||
|
||||
@ -1631,8 +1665,9 @@
|
||||
unset xlabel
|
||||
unset ylabel
|
||||
|
||||
--- demo/stringvar.dem
|
||||
+++ demo/stringvar.dem 2007-08-15 21:03:04.000000000 +0200
|
||||
diff -U 3 -H -d -r -N -- demo/stringvar.dem demo/stringvar.dem
|
||||
--- demo/stringvar.dem 2008-09-02 23:06:44.000000000 +0200
|
||||
+++ demo/stringvar.dem 2009-05-09 14:44:57.000000000 +0200
|
||||
@@ -73,7 +73,7 @@
|
||||
#
|
||||
set xrange [300:400]
|
||||
@ -1660,8 +1695,9 @@
|
||||
u 1:2 lt -1 lw 0.5 notitle, \
|
||||
'' u 1:($3+$1/50.) lt 3 lw 0.5 notitle, \
|
||||
'' using 1:2:( ($2>($3+$1/50.)) ? "J" : "D" ) with labels font "WingDings,28"\
|
||||
--- demo/surface1.dem
|
||||
+++ demo/surface1.dem 2007-08-15 20:59:07.000000000 +0200
|
||||
diff -U 3 -H -d -r -N -- demo/surface1.dem demo/surface1.dem
|
||||
--- demo/surface1.dem 2004-09-17 07:01:12.000000000 +0200
|
||||
+++ demo/surface1.dem 2009-05-09 14:44:57.000000000 +0200
|
||||
@@ -171,34 +171,34 @@
|
||||
set style data lines
|
||||
set title "Data grid plotting"
|
||||
@ -1703,8 +1739,9 @@
|
||||
pause -1 "Hit return to continue (24)"
|
||||
|
||||
# mandelbrot demo
|
||||
--- demo/timedat.dem
|
||||
+++ demo/timedat.dem 2007-08-15 20:59:07.000000000 +0200
|
||||
diff -U 3 -H -d -r -N -- demo/timedat.dem demo/timedat.dem
|
||||
--- demo/timedat.dem 2003-10-28 06:35:54.000000000 +0100
|
||||
+++ demo/timedat.dem 2009-05-09 14:44:57.000000000 +0200
|
||||
@@ -13,10 +13,10 @@
|
||||
set format x "%d/%m\n%H:%M"
|
||||
set grid
|
||||
@ -1720,8 +1757,9 @@
|
||||
pause -1 "Hit return to continue"
|
||||
|
||||
reset
|
||||
--- demo/using.dem
|
||||
+++ demo/using.dem 2007-08-15 20:59:07.000000000 +0200
|
||||
diff -U 3 -H -d -r -N -- demo/using.dem demo/using.dem
|
||||
--- demo/using.dem 2003-10-28 06:35:54.000000000 +0100
|
||||
+++ demo/using.dem 2009-05-09 14:44:57.000000000 +0200
|
||||
@@ -1,15 +1,15 @@
|
||||
#
|
||||
# $Id: using.dem,v 1.6 2003/10/28 05:35:54 sfeam Exp $
|
||||
@ -1754,21 +1792,9 @@
|
||||
unset label
|
||||
pause -1 "Hit return to continue"
|
||||
reset
|
||||
--- demo/world2.dem
|
||||
+++ demo/world2.dem 2007-08-15 20:59:07.000000000 +0200
|
||||
@@ -22,8 +22,8 @@
|
||||
set colorb vert user size 0.02, 0.75
|
||||
unset hidden
|
||||
splot cos(u)*cos(v),cos(u)*sin(v),sin(u) notitle with lines lt 5, \
|
||||
- 'world.dat' notitle with lines lt 2, \
|
||||
- 'srl.dat' using 3:2:(1):1:4 with labels notitle point pt 6 lw .1 left offset 1,0 font "Helvetica,7" tc pal
|
||||
+ '@@GNUPLOTDEMOPATH@@world.dat' notitle with lines lt 2, \
|
||||
+ '@@GNUPLOTDEMOPATH@@srl.dat' using 3:2:(1):1:4 with labels notitle point pt 6 lw .1 left offset 1,0 font "Helvetica,7" tc pal
|
||||
pause -1 "Same plot with hidden line removal"
|
||||
set title "Labels with hidden line removal"
|
||||
set hidden nooffset
|
||||
--- demo/world.dem
|
||||
+++ demo/world.dem 2007-08-15 20:59:07.000000000 +0200
|
||||
diff -U 3 -H -d -r -N -- demo/world.dem demo/world.dem
|
||||
--- demo/world.dem 2004-09-28 08:06:10.000000000 +0200
|
||||
+++ demo/world.dem 2009-05-09 14:44:57.000000000 +0200
|
||||
@@ -10,7 +10,7 @@
|
||||
unset ytics
|
||||
#
|
||||
@ -1804,3 +1830,17 @@
|
||||
+'@@GNUPLOTDEMOPATH@@world.dat' with lines lt 3 , '@@GNUPLOTDEMOPATH@@world.cor' with points lt 1 pt 2
|
||||
pause -1 "Hit return to continue"
|
||||
reset
|
||||
diff -U 3 -H -d -r -N -- demo/world2.dem demo/world2.dem
|
||||
--- demo/world2.dem 2005-08-07 11:43:27.000000000 +0200
|
||||
+++ demo/world2.dem 2009-05-09 14:44:57.000000000 +0200
|
||||
@@ -22,8 +22,8 @@
|
||||
set colorb vert user size 0.02, 0.75
|
||||
unset hidden
|
||||
splot cos(u)*cos(v),cos(u)*sin(v),sin(u) notitle with lines lt 5, \
|
||||
- 'world.dat' notitle with lines lt 2, \
|
||||
- 'srl.dat' using 3:2:(1):1:4 with labels notitle point pt 6 lw .1 left offset 1,0 font "Helvetica,7" tc pal
|
||||
+ '@@GNUPLOTDEMOPATH@@world.dat' notitle with lines lt 2, \
|
||||
+ '@@GNUPLOTDEMOPATH@@srl.dat' using 3:2:(1):1:4 with labels notitle point pt 6 lw .1 left offset 1,0 font "Helvetica,7" tc pal
|
||||
pause -1 "Same plot with hidden line removal"
|
||||
set title "Labels with hidden line removal"
|
||||
set hidden nooffset
|
40
gnuplot-4.2.5-fix-format-errors.dif
Normal file
40
gnuplot-4.2.5-fix-format-errors.dif
Normal file
@ -0,0 +1,40 @@
|
||||
--- src/gplt_x11.c 2009-01-14 19:42:02.000000000 +0100
|
||||
+++ src/gplt_x11.c 2009-05-09 13:50:34.000000000 +0200
|
||||
@@ -2889,22 +2889,22 @@
|
||||
|
||||
case PseudoColor:
|
||||
fprintf(stderr, ERROR_NOTICE("PseudoColor"));
|
||||
- fprintf(stderr, display_error_text_after);
|
||||
+ fprintf(stderr, "%s", display_error_text_after);
|
||||
break;
|
||||
|
||||
case GrayScale:
|
||||
fprintf(stderr, ERROR_NOTICE("GrayScale"));
|
||||
- fprintf(stderr, display_error_text_after);
|
||||
+ fprintf(stderr, "%s", display_error_text_after);
|
||||
break;
|
||||
|
||||
case StaticColor:
|
||||
fprintf(stderr, ERROR_NOTICE("StaticColor"));
|
||||
- fprintf(stderr, display_error_text_after);
|
||||
+ fprintf(stderr, "%s", display_error_text_after);
|
||||
break;
|
||||
|
||||
case StaticGray:
|
||||
fprintf(stderr, ERROR_NOTICE("StaticGray"));
|
||||
- fprintf(stderr, display_error_text_after);
|
||||
+ fprintf(stderr, "%s", display_error_text_after);
|
||||
break;
|
||||
|
||||
case DirectColor:
|
||||
--- term/post.trm 2009-03-03 03:44:07.000000000 +0100
|
||||
+++ term/post.trm 2009-05-09 13:50:34.000000000 +0200
|
||||
@@ -1665,7 +1665,7 @@
|
||||
(ps_params->psformat == PSTERM_EPS ? 0.5 : 1.0)/PS_SC);
|
||||
if (ps_params->psformat == PSTERM_LANDSCAPE)
|
||||
fprintf(gppsfile,"90 rotate\n0 %d translate\n", -(int)(term->ymax));
|
||||
- fprintf(gppsfile, psg1);
|
||||
+ fprintf(gppsfile, "%s", psg1);
|
||||
if (ps_common_uses_fonts)
|
||||
fprintf(gppsfile, "(%s) findfont %d scalefont setfont\n",
|
||||
ps_params->font, (t->v_char));
|
File diff suppressed because it is too large
Load Diff
@ -1,10 +1,10 @@
|
||||
--- .pkgextract
|
||||
+++ .pkgextract 2004-04-27 18:48:07.000000000 +0200
|
||||
--- .pkgextract 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ .pkgextract 2009-05-09 13:32:24.000000000 +0200
|
||||
@@ -0,0 +1 @@
|
||||
+bzcat ../gnuplot-fr.doc.bz2 > docs/gnuplot-fr.doc
|
||||
--- configure.in
|
||||
+++ configure.in 2004-04-27 18:48:07.000000000 +0200
|
||||
@@ -230,7 +230,7 @@ if test "$with_linux_vga" = yes; then
|
||||
--- configure.in 2009-03-15 04:39:15.000000000 +0100
|
||||
+++ configure.in 2009-05-09 13:32:24.000000000 +0200
|
||||
@@ -230,7 +230,7 @@
|
||||
[AC_DEFINE(LINUXVGA,1,
|
||||
[ Define if this is a Linux system with SuperVGA library. ])
|
||||
LINUXSUID='chown root $(bindir)/gnuplot; chmod u+s $(bindir)/gnuplot'
|
||||
@ -13,9 +13,9 @@
|
||||
with_linux_vga=no)
|
||||
fi
|
||||
|
||||
--- demo/poldat.dem
|
||||
+++ demo/poldat.dem 2004-04-27 18:48:07.000000000 +0200
|
||||
@@ -11,7 +11,7 @@ unset grid
|
||||
--- demo/poldat.dem 2003-10-28 06:35:54.000000000 +0100
|
||||
+++ demo/poldat.dem 2009-05-09 13:32:24.000000000 +0200
|
||||
@@ -11,7 +11,7 @@
|
||||
unset polar
|
||||
set title "Primitive Smith Chart"
|
||||
unset key
|
||||
@ -24,8 +24,8 @@
|
||||
set para
|
||||
set rrange [-0 : 10]
|
||||
set trange [-pi : pi]
|
||||
--- demo/simple.dem
|
||||
+++ demo/simple.dem 2004-04-27 18:48:07.000000000 +0200
|
||||
--- demo/simple.dem 2006-06-30 04:17:22.000000000 +0200
|
||||
+++ demo/simple.dem 2009-05-09 13:32:24.000000000 +0200
|
||||
@@ -7,12 +7,11 @@
|
||||
# gnuplot> load 'simple.dem'
|
||||
#
|
||||
@ -40,9 +40,9 @@
|
||||
plot [-pi/2:pi] cos(x),-(sin(x) > sin(x+1) ? sin(x) : sin(x+1))
|
||||
pause -1 "Hit return to continue"
|
||||
|
||||
--- demo/vector.dem
|
||||
+++ demo/vector.dem 2007-04-05 17:36:08.325186000 +0200
|
||||
@@ -62,19 +62,19 @@ splot vtot(x,y) w l
|
||||
--- demo/vector.dem 2006-07-12 19:21:14.000000000 +0200
|
||||
+++ demo/vector.dem 2009-05-09 13:32:24.000000000 +0200
|
||||
@@ -62,19 +62,19 @@
|
||||
print "Now create a file with equipotential lines"
|
||||
pause -1 "Hit return to continue"
|
||||
|
||||
@ -65,7 +65,7 @@
|
||||
splot vtot(x,y) w l
|
||||
unset table
|
||||
pause 0
|
||||
@@ -84,8 +84,8 @@ set xr [xmin:xmax]
|
||||
@@ -84,8 +84,8 @@
|
||||
set yr [ymin:ymax]
|
||||
set isosam 31,31
|
||||
set key under Left reverse
|
||||
@ -76,8 +76,8 @@
|
||||
pause -1 "Hit return to continue"
|
||||
|
||||
reset
|
||||
--- docs/Makefile.in
|
||||
+++ docs/Makefile.in 2007-05-30 15:40:43.577475000 +0200
|
||||
--- docs/Makefile.in 2006-08-09 23:09:48.000000000 +0200
|
||||
+++ docs/Makefile.in 2009-05-09 13:32:24.000000000 +0200
|
||||
@@ -37,7 +37,7 @@
|
||||
#
|
||||
|
||||
@ -87,7 +87,7 @@
|
||||
|
||||
# this tells GNU make not to export variables into the environment
|
||||
# But other makes dont understand its significance, so it must
|
||||
@@ -239,6 +239,8 @@ html: htmldocs/gnuplot.html
|
||||
@@ -239,6 +239,8 @@
|
||||
# emacs around to do lisp pre-processing
|
||||
htmldocs/gnuplot.html: $(srcdir)/gnuplot.tex
|
||||
mkdir -p htmldocs
|
||||
@ -96,7 +96,7 @@
|
||||
latex2html -dir htmldocs -local_icons gnuplot
|
||||
|
||||
### PDF documentation
|
||||
@@ -321,12 +323,16 @@ doc2hlp: doc2hlp.o termdoc.o
|
||||
@@ -321,12 +323,16 @@
|
||||
$(LINK) doc2hlp.o termdoc.o $(LIBS)
|
||||
|
||||
### gnuplot interactive help format
|
||||
@ -114,7 +114,7 @@
|
||||
doc2gih: doc2gih.o termdoc.o
|
||||
$(LINK) doc2gih.o termdoc.o $(LIBS)
|
||||
|
||||
@@ -415,6 +421,7 @@ install: install-gih install-info
|
||||
@@ -415,6 +421,7 @@
|
||||
install-gih: gnuplot.gih
|
||||
$(top_srcdir)/mkinstalldirs $(DESTDIR)$(GIHDIR)
|
||||
$(INSTALL_DATA) gnuplot.gih $(DESTDIR)$(GIHDIR)/gnuplot.gih
|
||||
@ -122,7 +122,7 @@
|
||||
|
||||
install-info: gnuplot.info
|
||||
$(top_srcdir)/mkinstalldirs $(DESTDIR)$(infodir)
|
||||
@@ -434,6 +441,7 @@ uninstall: uninstall-gih uninstall-info
|
||||
@@ -434,6 +441,7 @@
|
||||
|
||||
uninstall-gih:
|
||||
rm -f $(DESTDIR)$(GIHDIR)/gnuplot.gih
|
||||
@ -130,9 +130,9 @@
|
||||
|
||||
uninstall-info:
|
||||
$(PRE_UNINSTALL)
|
||||
--- docs/gnuplot-fr.doc
|
||||
+++ docs/gnuplot-fr.doc 2004-04-27 18:48:41.000000000 +0200
|
||||
@@ -436,8 +436,8 @@ C
|
||||
--- docs/gnuplot-fr.doc 2009-05-09 11:53:20.000000000 +0200
|
||||
+++ docs/gnuplot-fr.doc 2009-05-09 13:32:24.000000000 +0200
|
||||
@@ -436,8 +436,8 @@
|
||||
#Home & same as \verb~^A~. \\
|
||||
#Ctrl Home & same as \verb~^E~. \\
|
||||
#Esc & same as \verb~^U~. \\
|
||||
@ -143,9 +143,9 @@
|
||||
%c l .
|
||||
%Touche fléchée@Fonction
|
||||
%_
|
||||
--- src/command.c
|
||||
+++ src/command.c 2004-04-27 18:48:07.000000000 +0200
|
||||
@@ -1145,14 +1145,24 @@ pause_command()
|
||||
--- src/command.c 2008-12-15 05:18:36.000000000 +0100
|
||||
+++ src/command.c 2009-05-09 13:32:24.000000000 +0200
|
||||
@@ -1177,14 +1177,24 @@
|
||||
(void) fgets(buf, strlen(buf), stdin);
|
||||
}
|
||||
} else if (strcmp(term->name, "atari") == 0) {
|
||||
@ -172,7 +172,7 @@
|
||||
if (line)
|
||||
free(line);
|
||||
} else
|
||||
@@ -2660,6 +2670,13 @@ read_line(const char *prompt)
|
||||
@@ -2696,6 +2706,13 @@
|
||||
# endif /* no READLINE */
|
||||
|
||||
do {
|
||||
@ -184,11 +184,11 @@
|
||||
+# endif
|
||||
+# endif
|
||||
/* grab some input */
|
||||
# if defined(READLINE) || defined(HAVE_LIBREADLINE)
|
||||
# if defined(READLINE) || defined(HAVE_LIBREADLINE) || defined(HAVE_LIBEDITLINE)
|
||||
if (((interactive)
|
||||
--- src/gplt_x11.c
|
||||
+++ src/gplt_x11.c 2008-03-26 12:52:10.843886602 +0100
|
||||
@@ -2273,8 +2273,11 @@ exec_cmd(plot_struct *plot, char *comman
|
||||
--- src/gplt_x11.c 2009-01-14 19:42:02.000000000 +0100
|
||||
+++ src/gplt_x11.c 2009-05-09 13:32:24.000000000 +0200
|
||||
@@ -2240,8 +2240,11 @@
|
||||
}
|
||||
}
|
||||
/* X11_justify_text(mode) - set text justification mode */
|
||||
@ -202,7 +202,7 @@
|
||||
|
||||
else if (*buffer == 'A')
|
||||
sscanf(buffer + 1, "%lf", &plot->angle);
|
||||
@@ -4787,7 +4790,9 @@ process_event(XEvent *event)
|
||||
@@ -4710,7 +4713,9 @@
|
||||
*/
|
||||
#define On(v) ( !strncasecmp(v, "on", 2) || !strncasecmp(v, "true", 4) )
|
||||
|
||||
@ -212,9 +212,9 @@
|
||||
#ifndef MAXHOSTNAMELEN
|
||||
#define MAXHOSTNAMELEN 64
|
||||
#endif
|
||||
--- src/plot.c
|
||||
+++ src/plot.c 2004-04-27 18:51:49.000000000 +0200
|
||||
@@ -228,6 +228,7 @@ static int asked_privi = 0;
|
||||
--- src/plot.c 2008-12-15 05:18:36.000000000 +0100
|
||||
+++ src/plot.c 2009-05-09 13:32:24.000000000 +0200
|
||||
@@ -234,6 +234,7 @@
|
||||
void
|
||||
drop_privilege()
|
||||
{
|
||||
@ -222,7 +222,7 @@
|
||||
if (!asked_privi) {
|
||||
euid = geteuid();
|
||||
egid = getegid();
|
||||
@@ -241,11 +242,13 @@ drop_privilege()
|
||||
@@ -247,11 +248,13 @@
|
||||
if (seteuid(ruid) == -1)
|
||||
(void) fprintf(stderr, "seteuid(%d): %s\n",
|
||||
(int) ruid, strerror(errno));
|
||||
@ -236,7 +236,7 @@
|
||||
if (!asked_privi) {
|
||||
euid = geteuid();
|
||||
egid = getegid();
|
||||
@@ -259,6 +262,7 @@ take_privilege()
|
||||
@@ -265,6 +268,7 @@
|
||||
if (seteuid(euid) == -1)
|
||||
(void) fprintf(stderr, "seteuid(%d): %s\n",
|
||||
(int) euid, strerror(errno));
|
||||
@ -244,7 +244,7 @@
|
||||
}
|
||||
|
||||
#endif /* LINUXVGA */
|
||||
@@ -284,8 +288,8 @@ main(int argc, char **argv)
|
||||
@@ -290,8 +294,8 @@
|
||||
int i;
|
||||
|
||||
#ifdef LINUXVGA
|
||||
@ -254,10 +254,11 @@
|
||||
#endif
|
||||
/* make sure that we really have revoked root access, this might happen if
|
||||
gnuplot is compiled without vga support but is installed suid by mistake */
|
||||
@@ -348,6 +352,22 @@ main(int argc, char **argv)
|
||||
unsigned int status[2] = { 1, 0 };
|
||||
@@ -357,6 +361,23 @@
|
||||
#if defined(HAVE_LIBEDITLINE)
|
||||
rl_getc_function = getc_wrapper;
|
||||
#endif
|
||||
|
||||
+
|
||||
+#ifdef __linux__
|
||||
+ if (!getenv("GNUHELP")) {
|
||||
+ const char* msg = setlocale(LC_MESSAGES, NULL);
|
||||
@ -274,11 +275,11 @@
|
||||
+ }
|
||||
+#endif
|
||||
+
|
||||
#ifdef HAVE_LIBREADLINE
|
||||
#if defined(HAVE_LIBREADLINE) || defined(HAVE_LIBEDITLINE)
|
||||
using_history();
|
||||
/* T.Walter 1999-06-24: 'rl_readline_name' must be this fix name.
|
||||
--- src/term.h
|
||||
+++ src/term.h 2004-04-27 18:48:07.000000000 +0200
|
||||
--- src/term.h 2006-04-29 07:30:07.000000000 +0200
|
||||
+++ src/term.h 2009-05-09 13:32:24.000000000 +0200
|
||||
@@ -321,9 +321,9 @@
|
||||
#include "emf.trm"
|
||||
|
||||
@ -309,9 +310,9 @@
|
||||
|
||||
/* wire printers */
|
||||
/* Epson LX-800, Star NL-10, NX-1000 and lots of others */
|
||||
--- src/time.c
|
||||
+++ src/time.c 2004-04-27 18:48:07.000000000 +0200
|
||||
@@ -291,11 +291,12 @@ gstrptime(char *s, char *fmt, struct tm
|
||||
--- src/time.c 2008-09-02 23:12:59.000000000 +0200
|
||||
+++ src/time.c 2009-05-09 13:32:24.000000000 +0200
|
||||
@@ -291,11 +291,12 @@
|
||||
case 's':
|
||||
#if 0 /* HBB 20040213: comment this out, but keep it around for now */
|
||||
{
|
||||
@ -328,9 +329,9 @@
|
||||
tmwhen->tm_year += 1900;
|
||||
*tm = *tmwhen;
|
||||
break;
|
||||
--- term/linux.trm
|
||||
+++ term/linux.trm 2007-04-05 17:38:15.433841000 +0200
|
||||
@@ -80,7 +80,7 @@ TERM_PUBLIC void LINUX_linetype __PROTO(
|
||||
--- term/linux.trm 2006-07-21 04:35:47.000000000 +0200
|
||||
+++ term/linux.trm 2009-05-09 13:32:24.000000000 +0200
|
||||
@@ -80,7 +80,7 @@
|
||||
TERM_PUBLIC void LINUX_move __PROTO((unsigned int x, unsigned int y));
|
||||
TERM_PUBLIC void LINUX_vector __PROTO((unsigned int x, unsigned int y));
|
||||
TERM_PUBLIC int LINUX_text_angle __PROTO((int ang));
|
||||
@ -339,7 +340,7 @@
|
||||
TERM_PUBLIC void LINUX_suspend __PROTO((void));
|
||||
TERM_PUBLIC void LINUX_resume __PROTO((void));
|
||||
|
||||
@@ -293,7 +293,7 @@ LINUX_putc(
|
||||
@@ -293,7 +293,7 @@
|
||||
}
|
||||
|
||||
TERM_PUBLIC void
|
3
gnuplot-4.2.5.tar.bz2
Normal file
3
gnuplot-4.2.5.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:36fbbf48f6561a087c664272b991268bb299ac926b5fc72e5cd2bf67347b6a15
|
||||
size 2347067
|
@ -1,3 +1,14 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue May 26 11:19:52 CEST 2009 - werner@suse.de
|
||||
|
||||
- Update changes file
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat May 9 12:00:00 CEST 2009 - nico.laus.2001@gmx.de
|
||||
|
||||
- update to gnuplot 4.2.5
|
||||
- put docs into gnuplot-doc sub-package
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jan 15 13:38:04 CET 2009 - sbrabec@suse.cz
|
||||
|
||||
|
78
gnuplot.spec
78
gnuplot.spec
@ -1,5 +1,5 @@
|
||||
#
|
||||
# spec file for package gnuplot (Version 4.2.3)
|
||||
# spec file for package gnuplot (Version 4.2.5)
|
||||
#
|
||||
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
#
|
||||
@ -19,24 +19,30 @@
|
||||
|
||||
|
||||
Name: gnuplot
|
||||
BuildRequires: cairo-devel freetype2-devel gcc-c++ gd-devel gtk2-devel latex2html libjpeg-devel libpng-devel pango-devel plotutils-devel readline-devel texlive-latex wxGTK-devel xorg-x11-devel
|
||||
BuildRequires: cairo-devel freetype2-devel gcc-c++ gd-devel gtk2-devel latex2html libjpeg-devel libpng-devel pango-devel readline-devel texlive-latex wxGTK-devel xorg-x11-devel
|
||||
%if 0%{?suse_version} > 1110
|
||||
BuildRequires: plotutils-devel
|
||||
%else
|
||||
BuildRequires: plotutils
|
||||
%endif
|
||||
Url: http://www.gnuplot.info/
|
||||
License: BSD 3-Clause
|
||||
Group: Productivity/Graphics/Visualization/Graph
|
||||
AutoReqProv: on
|
||||
PreReq: %install_info_prereq
|
||||
Version: 4.2.3
|
||||
Release: 78
|
||||
Summary: Function Plotting Utility
|
||||
Source0: gnuplot-4.2.3.tar.bz2
|
||||
Version: 4.2.5
|
||||
Release: 1
|
||||
Summary: GNUplot a Function Plotting Utility
|
||||
Source0: gnuplot-%{version}.tar.bz2
|
||||
Source2: gnuplot-fr.doc.bz2
|
||||
Source3: README.whynot
|
||||
Patch0: gnuplot-4.2.3.dif
|
||||
Patch0: gnuplot-4.2.5.dif
|
||||
Patch1: gnuplot-4.2.0-x11ovf.dif
|
||||
Patch2: gnuplot-4.2.2-fonts.dif
|
||||
Patch3: gnuplot-4.2.0-wxt.dif
|
||||
Patch4: gnuplot-4.2.0-demo.dif
|
||||
Patch5: gnuplot-4.2.3-utf8.dif
|
||||
Patch4: gnuplot-4.2.5-demo.dif
|
||||
Patch5: gnuplot-4.2.5-utf8.dif
|
||||
Patch6: gnuplot-4.2.5-fix-format-errors.dif
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
%{expand: %%global _exec_prefix %(type -p pkg-config &>/dev/null && pkg-config --variable prefix x11 || echo /usr/X11R6)}
|
||||
%if "%_exec_prefix" == "/usr/X11R6"
|
||||
@ -68,6 +74,31 @@ Authors:
|
||||
Mailingliste <info-gnuplot-beta@dartmouth.edu>
|
||||
Mailingliste <info-gnuplot-request@dartmouth.edu>
|
||||
|
||||
%package doc
|
||||
License: BSD 3-Clause
|
||||
Summary: Documentation of GNUplot
|
||||
Group: Productivity/Graphics/Visualization/Graph
|
||||
Requires: %{name}
|
||||
PreReq: %install_info_prereq
|
||||
|
||||
%description doc
|
||||
GNUplot documentation files including the man and info pages. GNUplot
|
||||
is a command line driven interactive function plotting utility.
|
||||
GNUplot supports many different types of terminals, plotters, and
|
||||
printers (including many color devices and pseudodevices like LaTeX)
|
||||
and can easily be extended to include new devices.
|
||||
|
||||
|
||||
|
||||
Authors:
|
||||
--------
|
||||
Mailingliste <bug-gnuplot@dartmouth.edu>
|
||||
Mailingliste <info-gnuplot@dartmouth.edu>
|
||||
Mailingliste <info-gnuplot-beta@dartmouth.edu>
|
||||
Mailingliste <info-gnuplot-request@dartmouth.edu>
|
||||
|
||||
%{name} documentation files including the man and info pages
|
||||
|
||||
%prep
|
||||
%setup -q -n gnuplot-%{version}
|
||||
bunzip2 -dc %{_sourcedir}/gnuplot-fr.doc.bz2 > docs/gnuplot-fr.doc
|
||||
@ -78,6 +109,7 @@ test $? -eq 0 || exit 1
|
||||
%patch -P 2 -p 0
|
||||
%patch -P 4 -p 0
|
||||
%patch -P 5 -p 0
|
||||
%patch -P 6 -p 0
|
||||
|
||||
%build
|
||||
SECSVGA="-DSVGA_IS_SECURE=1"
|
||||
@ -117,15 +149,15 @@ test $? -eq 0 || exit 1
|
||||
--without-row-help \
|
||||
--with-kpsexpand \
|
||||
--with-plot=%{_libdir}
|
||||
make -f Makefile
|
||||
make %{?jobs:-j%jobs}
|
||||
pushd docs/
|
||||
make -f Makefile srcdir=. clean all html pdf gpcard.ps
|
||||
make srcdir=. clean all html pdf gpcard.ps
|
||||
pushd psdoc/
|
||||
make -f Makefile srcdir=. clean pdf
|
||||
make srcdir=. clean pdf
|
||||
popd
|
||||
popd
|
||||
pushd tutorial/
|
||||
make -f Makefile srcdir=. clean pdf
|
||||
make srcdir=. clean pdf
|
||||
popd
|
||||
|
||||
%install
|
||||
@ -167,24 +199,32 @@ test $? -eq 0 || exit 1
|
||||
%clean
|
||||
rm -rf %{buildroot}
|
||||
|
||||
%post
|
||||
%post doc
|
||||
%install_info --info-dir=.%{_infodir} .%{_infodir}/%{name}.info.gz
|
||||
|
||||
%postun
|
||||
%postun doc
|
||||
%install_info_delete --info-dir=.%{_infodir} .%{_infodir}/%{name}.info.gz
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%doc %{_docdir}/gnuplot/
|
||||
%{_bindir}/gnuplot
|
||||
%{_libdir}/gnuplot
|
||||
%doc %{_infodir}/%{name}.info.gz
|
||||
%doc %{_mandir}/man1/gnuplot.1.gz
|
||||
%{_datadir}/gnuplot
|
||||
%{_datadir}/texmf/tex/latex/gnuplot/
|
||||
%{_appdef}/Gnuplot
|
||||
|
||||
%files doc
|
||||
%defattr(-,root,root,-)
|
||||
%doc %{_docdir}/gnuplot/
|
||||
%doc %{_infodir}/%{name}.info.gz
|
||||
%doc %{_mandir}/man1/gnuplot.1.gz
|
||||
|
||||
%changelog
|
||||
* Tue May 26 2009 werner@suse.de
|
||||
- Update changes file
|
||||
* Sat May 09 2009 nico.laus.2001@gmx.de
|
||||
- update to gnuplot 4.2.5
|
||||
- put docs into gnuplot-doc sub-package
|
||||
* Thu Jan 15 2009 sbrabec@suse.cz
|
||||
- Changed BuildRequires: plotutils -> plotutils-devel.
|
||||
* Mon Mar 31 2008 werner@suse.de
|
||||
@ -430,7 +470,7 @@ test $? -eq 0 || exit 1
|
||||
* Some bug fixes
|
||||
* Thu Oct 23 1997 werner@suse.de
|
||||
- New version: 3.5beta6.336
|
||||
* Mon Feb 03 1997 werner@suse.de
|
||||
* Tue Feb 04 1997 werner@suse.de
|
||||
- Update auf Version 3.5-beta-3.6pl319
|
||||
- Diese Version hat splines und bezier zum Fit für
|
||||
von Messdaten.
|
||||
|
Loading…
Reference in New Issue
Block a user