SHA256
1
0
forked from pool/gnuplot
2012-04-02 15:18:13 +00:00
committed by Git OBS Bridge
parent c28f2a38b4
commit fa0eea9781
6 changed files with 138 additions and 115 deletions

View File

@@ -1,7 +1,6 @@
diff -U 3 -H -d -r -N -x .git -x .svn -- gnuplot-4.6.0/demo/ellipse.dem gnuplot-4.6.0.demo/demo/ellipse.dem
--- gnuplot-4.6.0/demo/ellipse.dem 2008-08-19 20:48:20.000000000 +0200
+++ gnuplot-4.6.0.demo/demo/ellipse.dem 2012-03-15 12:05:53.781781358 +0100
@@ -9,6 +9,7 @@
--- demo/ellipse.dem
+++ demo/ellipse.dem 2012-03-15 11:05:54.000000000 +0000
@@ -9,6 +9,7 @@ if ((GPVAL_VERSION == 4.3 || GPVAL_VERSI
print "This copy of gnuplot was built without support for placing ellipses\n" ; \
exit ;
@@ -9,7 +8,7 @@ diff -U 3 -H -d -r -N -x .git -x .svn -- gnuplot-4.6.0/demo/ellipse.dem gnuplot-
unset key
set xrange [-8:8]
@@ -27,7 +28,7 @@
@@ -27,7 +28,7 @@ set object 1 ellipse center 1.5,1.0 size
set obj 2 ellipse center 1.5, 1 size 6, 12 angle 20 front fs empty bo 3
A = pi/9.
@@ -18,9 +17,8 @@ diff -U 3 -H -d -r -N -x .git -x .svn -- gnuplot-4.6.0/demo/ellipse.dem gnuplot-
pause -1 "Hit return to continue"
diff -U 3 -H -d -r -N -x .git -x .svn -- gnuplot-4.6.0/demo/fit.dem gnuplot-4.6.0.demo/demo/fit.dem
--- gnuplot-4.6.0/demo/fit.dem 2009-10-31 06:24:18.000000000 +0100
+++ gnuplot-4.6.0.demo/demo/fit.dem 2012-03-15 12:05:53.781781358 +0100
--- demo/fit.dem
+++ demo/fit.dem 2012-03-15 11:05:54.000000000 +0000
@@ -5,9 +5,11 @@
print "Some examples how data fitting using nonlinear least squares fit"
print "can be done."
@@ -33,7 +31,7 @@ diff -U 3 -H -d -r -N -x .git -x .svn -- gnuplot-4.6.0/demo/fit.dem gnuplot-4.6.
set title 'data for first fit demo'
set xlabel "Temperature T [deg Cels.]"
set ylabel "Density [g/cm3]"
@@ -162,7 +164,7 @@
@@ -162,7 +164,7 @@ pause -1 "(-> return)"
# Must provide an error estimate for a 3d fit. Use constant 1
fit f(x,y) 'soundvel.dat' using 1:-2:2:(1) via 'sound.par'
#create soundfit.par, reading from sound.par and updating values
@@ -42,7 +40,7 @@ diff -U 3 -H -d -r -N -x .git -x .svn -- gnuplot-4.6.0/demo/fit.dem gnuplot-4.6.
print ""
pause -1 "(-> return)"
set title 'pseudo-3d multi-branch fit to velocity data'
@@ -251,6 +253,7 @@
@@ -251,6 +253,7 @@ print ""
pause -1 "Hit return to continue"
reset
@@ -50,15 +48,14 @@ diff -U 3 -H -d -r -N -x .git -x .svn -- gnuplot-4.6.0/demo/fit.dem gnuplot-4.6.
set xlabel 'x'
set ylabel 'y'
set zlabel 'z'
@@ -340,3 +343,4 @@
@@ -340,3 +343,4 @@ print "from time to time!"
print ""
pause -1 "Done with fitting demo (-> return)"
reset
+set fit logfile logfile
diff -U 3 -H -d -r -N -x .git -x .svn -- gnuplot-4.6.0/demo/poldat.dem gnuplot-4.6.0.demo/demo/poldat.dem
--- gnuplot-4.6.0/demo/poldat.dem 2010-11-19 00:59:58.000000000 +0100
+++ gnuplot-4.6.0.demo/demo/poldat.dem 2012-03-15 12:05:53.782781367 +0100
@@ -11,7 +11,7 @@
--- demo/poldat.dem
+++ demo/poldat.dem 2012-03-15 11:05:54.000000000 +0000
@@ -11,7 +11,7 @@ unset grid
unset polar
set title "Primitive Smith Chart"
unset key
@@ -67,10 +64,9 @@ diff -U 3 -H -d -r -N -x .git -x .svn -- gnuplot-4.6.0/demo/poldat.dem gnuplot-4
set para
set rrange [-0 : 10]
set trange [-pi : pi]
diff -U 3 -H -d -r -N -x .git -x .svn -- gnuplot-4.6.0/demo/random.dem gnuplot-4.6.0.demo/demo/random.dem
--- gnuplot-4.6.0/demo/random.dem 2011-12-28 23:00:37.000000000 +0100
+++ gnuplot-4.6.0.demo/demo/random.dem 2012-03-15 12:08:48.975459282 +0100
@@ -46,7 +46,8 @@
--- demo/random.dem
+++ demo/random.dem 2012-03-15 11:08:49.000000000 +0000
@@ -46,7 +46,8 @@ print "this case is zero, i.e. a circle.
print ""
nsamp = 50
# Generate N random data points.
@@ -80,7 +76,7 @@ diff -U 3 -H -d -r -N -x .git -x .svn -- gnuplot-4.6.0/demo/random.dem gnuplot-4
do for [i=1:nsamp] {
print sprintf("%8.5g %8.5g", invnorm(rand(0)), invnorm(rand(0)))
}
@@ -73,7 +74,7 @@
@@ -73,7 +74,7 @@ set vrange [-3:3]
set ticslevel 0
set isosamples 30
splot u,v,( 1/(2*pi) * exp(-0.5 * (u**2 + v**2)) ) with line lc rgb "black", \
@@ -89,7 +85,7 @@ diff -U 3 -H -d -r -N -x .git -x .svn -- gnuplot-4.6.0/demo/random.dem gnuplot-4
pause -1 "Hit return to continue"
unset contour
unset parametric
@@ -96,7 +97,7 @@
@@ -96,7 +97,7 @@ xlow = -3.0
xhigh = 3.0
scale = (binwidth/(xhigh-xlow))
# Generate N random data points.
@@ -98,7 +94,7 @@ diff -U 3 -H -d -r -N -x .git -x .svn -- gnuplot-4.6.0/demo/random.dem gnuplot-4
do for [i=1:nsamp] {
print sprintf("%8.5g %8.5g", invnorm(rand(0)), (1.0*scale/nsamp))
}
@@ -110,7 +111,7 @@
@@ -110,7 +111,7 @@ set grid
set xrange [-3:3]
set yrange [0:0.45]
bin(x) = (1.0/scale)*floor(x*scale)
@@ -107,7 +103,7 @@ diff -U 3 -H -d -r -N -x .git -x .svn -- gnuplot-4.6.0/demo/random.dem gnuplot-4
title "scaled bin frequency", \
normal(x,0,1) with lines title "Gaussian p.d.f."
pause -1 "Hit return to continue"
@@ -126,7 +127,7 @@
@@ -126,7 +127,7 @@ print ""
reset
nsamp = 3000
# Generate N random data points.
@@ -116,7 +112,7 @@ diff -U 3 -H -d -r -N -x .git -x .svn -- gnuplot-4.6.0/demo/random.dem gnuplot-4
do for [i=1:nsamp] {
print sprintf("%8.5g %8.5g %8.5g", invnorm(rand(0)), invnorm(rand(0)), invnorm(rand(0)))
}
@@ -150,7 +151,7 @@
@@ -150,7 +151,7 @@ set zzeroaxis lt -1
set view 68, 28, 1.4, 0.9
tstring(n) = sprintf("Gaussian 3D cloud of %d random samples\n", n)
set title tstring(nsamp) offset graph 0.15, graph -0.33
@@ -125,7 +121,7 @@ diff -U 3 -H -d -r -N -x .git -x .svn -- gnuplot-4.6.0/demo/random.dem gnuplot-4
if (!oneplot) pause -1 "Hit return to continue"
unset parametric
@@ -170,7 +171,7 @@
@@ -170,7 +171,7 @@ scale = (binwidth/(xhigh-xlow))
set xrange [0:xhigh]
set yrange [0:0.65]
bin(x) = (1.0/scale)*floor(x*scale)
@@ -134,9 +130,8 @@ diff -U 3 -H -d -r -N -x .git -x .svn -- gnuplot-4.6.0/demo/random.dem gnuplot-4
title "scaled bin frequency", \
maxwell(x, 1/sqrt(2)) with lines title "Maxwell p.d.f."
#
diff -U 3 -H -d -r -N -x .git -x .svn -- gnuplot-4.6.0/demo/simple.dem gnuplot-4.6.0.demo/demo/simple.dem
--- gnuplot-4.6.0/demo/simple.dem 2011-08-19 23:01:41.000000000 +0200
+++ gnuplot-4.6.0.demo/demo/simple.dem 2012-03-15 12:05:53.782781367 +0100
--- demo/simple.dem
+++ demo/simple.dem 2012-03-15 11:05:54.000000000 +0000
@@ -7,12 +7,11 @@
# gnuplot> load 'simple.dem'
#
@@ -151,9 +146,8 @@ diff -U 3 -H -d -r -N -x .git -x .svn -- gnuplot-4.6.0/demo/simple.dem gnuplot-4
plot [-pi/2:pi] cos(x),-(sin(x) > sin(x+1) ? sin(x) : sin(x+1))
pause -1 "Hit return to continue"
diff -U 3 -H -d -r -N -x .git -x .svn -- gnuplot-4.6.0/demo/stringvar.dem gnuplot-4.6.0.demo/demo/stringvar.dem
--- gnuplot-4.6.0/demo/stringvar.dem 2007-03-30 07:18:46.000000000 +0200
+++ gnuplot-4.6.0.demo/demo/stringvar.dem 2012-03-15 12:05:53.782781367 +0100
--- demo/stringvar.dem
+++ demo/stringvar.dem 2012-03-15 11:05:54.000000000 +0000
@@ -1,7 +1,8 @@
#
# Miscellaneous neat things you can do using the string variables code
@@ -164,7 +158,7 @@ diff -U 3 -H -d -r -N -x .git -x .svn -- gnuplot-4.6.0/demo/stringvar.dem gnuplo
print ""
print "Exercise substring handling"
print ""
@@ -24,7 +25,7 @@
@@ -24,7 +25,7 @@ print "(foo.foo)[2:2]= ",(foo.foo)[2:2]
print ""
unset print
@@ -173,7 +167,7 @@ diff -U 3 -H -d -r -N -x .git -x .svn -- gnuplot-4.6.0/demo/stringvar.dem gnuplo
unset xtics
unset ytics
set yrange [0:1]
@@ -33,7 +34,7 @@
@@ -33,7 +34,7 @@ plot 0
pause -1 "Hit return to continue"
@@ -182,7 +176,7 @@ diff -U 3 -H -d -r -N -x .git -x .svn -- gnuplot-4.6.0/demo/stringvar.dem gnuplo
print "Exercise string handling functions"
print ""
print "foo = ",foo
@@ -62,7 +63,7 @@
@@ -62,7 +63,7 @@ if (strlen(foo) != 245) print "sprintf o
print ""
unset print
@@ -191,10 +185,9 @@ diff -U 3 -H -d -r -N -x .git -x .svn -- gnuplot-4.6.0/demo/stringvar.dem gnuplo
unset xtics
unset ytics
set yrange [0:1]
diff -U 3 -H -d -r -N -x .git -x .svn -- gnuplot-4.6.0/demo/vector.dem gnuplot-4.6.0.demo/demo/vector.dem
--- gnuplot-4.6.0/demo/vector.dem 2009-10-31 06:24:18.000000000 +0100
+++ gnuplot-4.6.0.demo/demo/vector.dem 2012-03-15 12:05:53.782781367 +0100
@@ -62,19 +62,21 @@
--- demo/vector.dem
+++ demo/vector.dem 2012-03-15 11:05:54.000000000 +0000
@@ -62,19 +62,21 @@ splot vtot(x,y) w l
print "Now create a file with equipotential lines"
pause -1 "Hit return to continue"
@@ -219,7 +212,7 @@ diff -U 3 -H -d -r -N -x .git -x .svn -- gnuplot-4.6.0/demo/vector.dem gnuplot-4
splot vtot(x,y) w l
unset table
pause 0
@@ -84,8 +86,8 @@
@@ -84,8 +86,8 @@ set xr [xmin:xmax]
set yr [ymin:ymax]
set isosam 31,31
set key under Left reverse
@@ -230,10 +223,9 @@ diff -U 3 -H -d -r -N -x .git -x .svn -- gnuplot-4.6.0/demo/vector.dem gnuplot-4
pause -1 "Hit return to continue"
reset
diff -U 3 -H -d -r -N -x .git -x .svn -- gnuplot-4.6.0/src/show.c gnuplot-4.6.0.demo/src/show.c
--- gnuplot-4.6.0/src/show.c 2012-03-02 21:00:04.000000000 +0100
+++ gnuplot-4.6.0.demo/src/show.c 2012-03-15 12:05:53.783781376 +0100
@@ -1074,6 +1074,15 @@
--- src/show.c
+++ src/show.c 2012-03-15 11:05:54.000000000 +0000
@@ -1074,6 +1074,15 @@ show_version(FILE *fp)
p /* type "help seeking-assistance" */
);
@@ -249,10 +241,9 @@ diff -U 3 -H -d -r -N -x .git -x .svn -- gnuplot-4.6.0/src/show.c gnuplot-4.6.0.
/* show version long */
if (almost_equals(c_token, "l$ong")) {
diff -U 3 -H -d -r -N -x .git -x .svn -- gnuplot-4.6.0/src/variable.c gnuplot-4.6.0.demo/src/variable.c
--- gnuplot-4.6.0/src/variable.c 2011-12-28 23:00:37.000000000 +0100
+++ gnuplot-4.6.0.demo/src/variable.c 2012-03-15 12:05:53.783781376 +0100
@@ -37,7 +37,10 @@
--- src/variable.c
+++ src/variable.c 2012-03-15 11:05:54.000000000 +0000
@@ -37,7 +37,10 @@ static char *RCSid() { return RCSid("$Id
/* The Death of Global Variables - part one. */
#include <string.h>
@@ -264,7 +255,7 @@ diff -U 3 -H -d -r -N -x .git -x .svn -- gnuplot-4.6.0/src/variable.c gnuplot-4.
#include "variable.h"
#include "alloc.h"
@@ -98,6 +101,17 @@
@@ -98,6 +101,17 @@ loadpath_handler(int action, char *path)
if (!loadpath)
{
char *envlib = getenv("GNUPLOT_LIB");
@@ -282,7 +273,7 @@ diff -U 3 -H -d -r -N -x .git -x .svn -- gnuplot-4.6.0/src/variable.c gnuplot-4.
if (envlib) {
int len = strlen(envlib);
loadpath = gp_strdup(envlib);
@@ -106,6 +120,10 @@
@@ -106,6 +120,10 @@ loadpath_handler(int action, char *path)
/* convert all PATHSEPs to \0 */
PATHSEP_TO_NUL(loadpath);
} /* else: NULL = empty */