diff --git a/gnuplot-4.2.0-demo.dif b/gnuplot-4.2.0-demo.dif
new file mode 100644
index 0000000..aa5da7e
--- /dev/null
+++ b/gnuplot-4.2.0-demo.dif
@@ -0,0 +1,1806 @@
+--- demo/all.dem
++++ demo/all.dem	2007-08-15 20:54:29.000000000 +0200
+@@ -5,213 +5,213 @@
+ #
+ 
+ print "******************** file simple.dem ********************"
+-load "simple.dem"
++load "@@GNUPLOTDEMOPATH@@simple.dem"
+ reset
+ 
+ print "******************** file controls.dem ********************"
+-load "controls.dem"
++load "@@GNUPLOTDEMOPATH@@controls.dem"
+ reset
+ 
+ print "******************** file electron.dem ********************"
+-load "electron.dem"
++load "@@GNUPLOTDEMOPATH@@electron.dem"
+ reset
+ 
+ print "******************** file using.dem ********************"
+-load "using.dem"
++load "@@GNUPLOTDEMOPATH@@using.dem"
+ reset
+ 
+ print "******************** file fillstyle.dem ********************"
+-load "fillstyle.dem"
++load "@@GNUPLOTDEMOPATH@@fillstyle.dem"
+ reset
+ 
+ print "******************** file fillcvrs.dem ********************"
+-load "fillcrvs.dem"
+-load "fillbetween.dem"
++load "@@GNUPLOTDEMOPATH@@fillcrvs.dem"
++load "@@GNUPLOTDEMOPATH@@fillbetween.dem"
+ reset
+ 
+ print "******************** file candlesticks.dem ********************"
+-load "candlesticks.dem"
++load "@@GNUPLOTDEMOPATH@@candlesticks.dem"
+ reset
+ 
+ print "******************** file mgr.dem ********************"
+-load "mgr.dem"
++load "@@GNUPLOTDEMOPATH@@mgr.dem"
+ reset
+ 
+ print "******************** file fit.dem ********************"
+-load "fit.dem"
++load "@@GNUPLOTDEMOPATH@@fit.dem"
+ reset
+ 
+ print "******************** file param.dem ********************"
+-load "param.dem"
++load "@@GNUPLOTDEMOPATH@@param.dem"
+ reset
+ 
+ print "******************** file polar.dem ********************"
+-load "polar.dem"
++load "@@GNUPLOTDEMOPATH@@polar.dem"
+ reset
+ 
+ print "******************** file poldat.dem ********************"
+-load "poldat.dem"
++load "@@GNUPLOTDEMOPATH@@poldat.dem"
+ reset
+ 
+ print "******************** file multiplt.dem ********************"
+-load "multiplt.dem"
+-load "layout.dem"
++load "@@GNUPLOTDEMOPATH@@multiplt.dem"
++load "@@GNUPLOTDEMOPATH@@layout.dem"
+ reset
+ 
+ print "******************** file surface1.dem ********************"
+-load "surface1.dem"
++load "@@GNUPLOTDEMOPATH@@surface1.dem"
+ reset
+ 
+ print "******************** file discrete.dem ********************"
+-load "discrete.dem"
++load "@@GNUPLOTDEMOPATH@@discrete.dem"
+ reset
+ 
+ print "******************** file hidden.dem ********************"
+-load "hidden.dem"
++load "@@GNUPLOTDEMOPATH@@hidden.dem"
+ reset
+ 
+ print "******************** file world.dem ********************"
+-load "world.dem"
+-load "world2.dem"
++load "@@GNUPLOTDEMOPATH@@world.dem"
++load "@@GNUPLOTDEMOPATH@@world2.dem"
+ reset
+ 
+ print "******************** file prob.dem ********************"
+-load "prob.dem"
++load "@@GNUPLOTDEMOPATH@@prob.dem"
+ reset
+ 
+ print "******************** file prob2.dem ********************"
+-load "prob2.dem"
++load "@@GNUPLOTDEMOPATH@@prob2.dem"
+ reset
+ 
+ print "******************** file random.dem ********************"
+-load "random.dem"
++load "@@GNUPLOTDEMOPATH@@random.dem"
+ reset
+ 
+ print "******************** file spline.dem ********************"
+-load "spline.dem"
++load "@@GNUPLOTDEMOPATH@@spline.dem"
+ reset
+ 
+ print "******************** file binary.dem ********************"
+-load "binary.dem"
++load "@@GNUPLOTDEMOPATH@@binary.dem"
+ reset
+ 
+ print "******************** file steps.dem ********************"
+-load "steps.dem"
++load "@@GNUPLOTDEMOPATH@@steps.dem"
+ reset
+ 
+ print "******************** file scatter.dem ********************"
+-load "scatter.dem"
++load "@@GNUPLOTDEMOPATH@@scatter.dem"
+ reset
+ 
+ print "******************** file singulr.dem ********************"
+-load "singulr.dem"
++load "@@GNUPLOTDEMOPATH@@singulr.dem"
+ reset
+ 
+ print "******************** file airfoil.dem ********************"
+-load "airfoil.dem"
++load "@@GNUPLOTDEMOPATH@@airfoil.dem"
+ reset
+ 
+ print "******************** file surface2.dem ********************"
+-load "surface2.dem"
++load "@@GNUPLOTDEMOPATH@@surface2.dem"
+ reset
+ 
+ print "******************** file contours.dem ********************"
+-load "contours.dem"
++load "@@GNUPLOTDEMOPATH@@contours.dem"
+ reset
+ 
+ print "******************** file multimsh.dem ********************"
+-load "multimsh.dem"
++load "@@GNUPLOTDEMOPATH@@multimsh.dem"
+ reset
+ 
+ print "******************** file bivariat.dem ********************"
+-load "bivariat.dem"
++load "@@GNUPLOTDEMOPATH@@bivariat.dem"
+ reset
+ 
+ print "******************** file timedat.dem ********************"
+-load "timedat.dem"
++load "@@GNUPLOTDEMOPATH@@timedat.dem"
+ reset
+ 
+ print "******************** file animate.dem ********************"
+-load "animate.dem"
++load "@@GNUPLOTDEMOPATH@@animate.dem"
+ reset
+ 
+ print "********************** file rainbow.dem *********************"
+-load "rainbow.dem"
++load "@@GNUPLOTDEMOPATH@@rainbow.dem"
+ reset
+ 
+ print "********************** file rgb_variable.dem *********************"
+-load "rgb_variable.dem"
++load "@@GNUPLOTDEMOPATH@@rgb_variable.dem"
+ reset
+ 
+ print "********************** file pm3d.dem *********************"
+-load "pm3d.dem"
++load "@@GNUPLOTDEMOPATH@@pm3d.dem"
+ reset
+ 
+ print "********************** file pm3dcolors.dem *********************"
+-load "pm3dcolors.dem"
++load "@@GNUPLOTDEMOPATH@@pm3dcolors.dem"
+ reset
+ 
+ print "********************** file pm3dgamma.dem *********************"
+-load "pm3dgamma.dem"
++load "@@GNUPLOTDEMOPATH@@pm3dgamma.dem"
+ reset
+ 
+ print "********************** file hidden2.dem ***********************"
+-load "hidden2.dem"
++load "@@GNUPLOTDEMOPATH@@hidden2.dem"
+ reset
+ 
+ print "********************** file textcolor.dem *********************"
+-load "textcolor.dem"
++load "@@GNUPLOTDEMOPATH@@textcolor.dem"
+ reset
+ 
+ print "********************** file textrotate.dem *********************"
+-load "textrotate.dem"
++load "@@GNUPLOTDEMOPATH@@textrotate.dem"
+ reset
+ 
+ print "********************** file enhancedtext.dem *********************"
+-load "enhancedtext.dem"
++load "@@GNUPLOTDEMOPATH@@enhancedtext.dem"
+ reset
+ 
+ print "********************** file arrowstyle.dem *********************"
+-load "arrowstyle.dem"
++load "@@GNUPLOTDEMOPATH@@arrowstyle.dem"
+ reset
+ 
+ print "********************** file vector.dem *********************"
+-load "vector.dem"
++load "@@GNUPLOTDEMOPATH@@vector.dem"
+ reset
+ 
+ print "********************** file tics.dem *********************"
+-load "tics.dem"
++load "@@GNUPLOTDEMOPATH@@tics.dem"
+ reset
+ 
+ print "********************** file datastrings.dem *********************"
+-load "datastrings.dem"
++load "@@GNUPLOTDEMOPATH@@datastrings.dem"
+ reset
+ 
+ print "********************** file histograms.dem *********************"
+-load "histograms.dem"
+-load "histograms2.dem"
++load "@@GNUPLOTDEMOPATH@@histograms.dem"
++load "@@GNUPLOTDEMOPATH@@histograms2.dem"
+ reset
+ 
+ print "********************** file image.dem *********************"
+-load "image.dem"
++load "@@GNUPLOTDEMOPATH@@image.dem"
+ reset
+ 
+ print "********************** file stringvar.dem *********************"
+-load "stringvar.dem"
++load "@@GNUPLOTDEMOPATH@@stringvar.dem"
+ reset
+ 
+ print "********************** file pointsize.dem *********************"
+-load "pointsize.dem"
++load "@@GNUPLOTDEMOPATH@@pointsize.dem"
+ reset
+ 
+ print "********************** file key.dem *********************"
+-load "key.dem"
++load "@@GNUPLOTDEMOPATH@@key.dem"
+ reset
+ 
+ print "********************** file borders.dem *********************"
+-load "borders.dem"
++load "@@GNUPLOTDEMOPATH@@borders.dem"
+ reset
+ 
+ print "********************** file rectangle.dem *********************"
+-load "rectangle.dem"
++load "@@GNUPLOTDEMOPATH@@rectangle.dem"
+ reset
+--- demo/animate.dem
++++ demo/animate.dem	2007-08-15 20:52:01.000000000 +0200
+@@ -20,7 +20,7 @@
+ xview(xrot)=(50.+30.*sin((xrot%180)/180.*pi))
+ zview(zrot)=(60.+45.*sin(zrot/180.*pi))
+ set view xview(xrot),zview(zrot)
+-splot "glass.dat"
++splot "@@GNUPLOTDEMOPATH@@glass.dat"
+ 
+ limit_iterations=40 # limits number of iterations if nonzero
+ 
+@@ -32,5 +32,5 @@
+ pause -1 "Press a key to start the rotation..."
+ 
+ iteration_count=0
+-load "gnuplot.rot"
++load '@@GNUPLOTDEMOPATH@@gnuplot.rot'
+ reset
+--- demo/arrowstyle.dem
++++ demo/arrowstyle.dem	2007-08-15 20:52:01.000000000 +0200
+@@ -40,42 +40,42 @@
+ 
+ set title 'Top: plot with vectors arrowstyle 1, Bottom: explicit arrows'
+ plot \
+-     'arrowstyle.dat' using 1:2:(0):3 notitle with vectors arrowstyle 1
++     '@@GNUPLOTDEMOPATH@@arrowstyle.dat' using 1:2:(0):3 notitle with vectors arrowstyle 1
+ pause -1 "Hit return to continue"
+ 
+ set title 'Top: plot with vectors arrowstyle 2, Bottom: explicit arrows'
+ plot \
+-     'arrowstyle.dat' using 1:2:(0):3 notitle with vectors arrowstyle 2
++     '@@GNUPLOTDEMOPATH@@arrowstyle.dat' using 1:2:(0):3 notitle with vectors arrowstyle 2
+ pause -1 "Hit return to continue"
+ 
+ set title 'Top: plot with vectors arrowstyle 3, Bottom: explicit arrows'
+ plot \
+-     'arrowstyle.dat' using 1:2:(0):3 notitle with vectors arrowstyle 3
++     '@@GNUPLOTDEMOPATH@@arrowstyle.dat' using 1:2:(0):3 notitle with vectors arrowstyle 3
+ pause -1 "Hit return to continue"
+ 
+ set title 'Top: plot with vectors arrowstyle 4, Bottom: explicit arrows'
+ plot \
+-     'arrowstyle.dat' using 1:2:(0):3 notitle with vectors arrowstyle 4
++     '@@GNUPLOTDEMOPATH@@arrowstyle.dat' using 1:2:(0):3 notitle with vectors arrowstyle 4
+ pause -1 "Hit return to continue"
+ 
+ set title 'Top: plot with vectors arrowstyle 5, Bottom: explicit arrows'
+ plot \
+-     'arrowstyle.dat' using 1:2:(0):3 notitle with vectors arrowstyle 5
++     '@@GNUPLOTDEMOPATH@@arrowstyle.dat' using 1:2:(0):3 notitle with vectors arrowstyle 5
+ pause -1 "Hit return to continue"
+ 
+ set title 'Top: plot with vectors arrowstyle 6, Bottom: explicit arrows'
+ plot \
+-     'arrowstyle.dat' using 1:2:(0):3 notitle with vectors arrowstyle 6
++     '@@GNUPLOTDEMOPATH@@arrowstyle.dat' using 1:2:(0):3 notitle with vectors arrowstyle 6
+ pause -1 "Hit return to continue"
+ 
+ set title 'Top: plot with vectors arrowstyle 7, Bottom: explicit arrows'
+ plot \
+-     'arrowstyle.dat' using 1:2:(0):3 notitle with vectors arrowstyle 7
++     '@@GNUPLOTDEMOPATH@@arrowstyle.dat' using 1:2:(0):3 notitle with vectors arrowstyle 7
+ pause -1 "Hit return to continue"
+ 
+ set title 'Top: plot with vectors arrowstyle 8, Bottom: explicit arrows'
+ plot \
+-     'arrowstyle.dat' using 1:2:(0):3 notitle with vectors arrowstyle 8
++     '@@GNUPLOTDEMOPATH@@arrowstyle.dat' using 1:2:(0):3 notitle with vectors arrowstyle 8
+ pause -1 "Hit return to continue"
+ 
+ reset
+@@ -86,9 +86,9 @@
+ set title "Plot 'file' with vectors <arrowstyle>"
+ set key box
+ set yrange [*:10]
+-plot '1.dat' using 1:2:(+1):(+1) with vectors lt 4 filled title 'filled', \
+-     '2.dat' using 1:2:(+1):(+1) with vectors lt 1 heads title 'double-headed', \
+-     '2.dat' using ($1):(2-$2/3):(+1):(+.5) with vectors lt -1 lw 3 nohead title 'no head'
++plot '@@GNUPLOTDEMOPATH@@1.dat' using 1:2:(+1):(+1) with vectors lt 4 filled title 'filled', \
++     '@@GNUPLOTDEMOPATH@@2.dat' using 1:2:(+1):(+1) with vectors lt 1 heads title 'double-headed', \
++     '@@GNUPLOTDEMOPATH@@2.dat' using ($1):(2-$2/3):(+1):(+.5) with vectors lt -1 lw 3 nohead title 'no head'
+ #
+ pause -1 "Hi return to continue"
+ #
+--- demo/binary.dem
++++ demo/binary.dem	2007-08-15 20:52:01.000000000 +0200
+@@ -9,20 +9,20 @@
+ 
+ set xrange [-3:3]
+ set yrange [-2:2]
+-splot "binary1" binary
++splot "@@GNUPLOTDEMOPATH@@binary1" binary
+ pause -1 "Hit return to continue (1)"
+ 
+ set view 70,45
+ set xrange [-3:3]
+ set yrange [-3:3]
+-splot "binary2" binary
++splot "@@GNUPLOTDEMOPATH@@binary2" binary
+ pause -1 "Hit return to continue (2)"
+ 
+ set title "Notice that sampling rate can change"
+ set vi 70,10
+ set xrange [-3:6]
+ set yrange [-3:6]
+-splot "binary3" binary
++splot "@@GNUPLOTDEMOPATH@@binary3" binary
+ pause -1 "Hit return to continue (3)"
+ 
+ reset
+--- demo/candlesticks.dem
++++ demo/candlesticks.dem	2007-08-15 20:52:01.000000000 +0200
+@@ -8,7 +8,7 @@
+ set yrange [0:10]
+ #
+ set title "candlesticks with open boxes (default)"
+-plot 'candlesticks.dat' using 1:3:2:6:5 with candlesticks
++plot '@@GNUPLOTDEMOPATH@@candlesticks.dat' using 1:3:2:6:5 with candlesticks
+ #
+ pause -1 "Hit return to continue"
+ #
+@@ -27,13 +27,13 @@
+ #
+ set title "box-and-whisker plot adding median value as bar"
+ set style fill empty
+-plot 'candlesticks.dat' using 1:3:2:6:5 with candlesticks lt 3 lw 2 title 'Quartiles', \
++plot '@@GNUPLOTDEMOPATH@@candlesticks.dat' using 1:3:2:6:5 with candlesticks lt 3 lw 2 title 'Quartiles', \
+      ''                 using 1:4:4:4:4 with candlesticks lt -1 lw 2 notitle
+ #
+ pause -1 "Hit return to continue"
+ #
+ set title "box-and-whisker with median bar and whiskerbars"
+-plot 'candlesticks.dat' using 1:3:2:6:5 with candlesticks lt 3 lw 2 title 'Quartiles' whiskerbars, \
++plot '@@GNUPLOTDEMOPATH@@candlesticks.dat' using 1:3:2:6:5 with candlesticks lt 3 lw 2 title 'Quartiles' whiskerbars, \
+      ''                 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
+@@ -85,13 +85,13 @@
+ set style data lines
+ set title "3D gnuplot demo - contour of data grid plotting"
+ set parametric
+-splot "glass.dat"
++splot "@@GNUPLOTDEMOPATH@@glass.dat"
+ pause -1 "Hit return to continue (19)"
+ set xrange [0:15]
+ set yrange [0:15]
+ set zrange [-1.2:1.2]
+ unset parametric
+-splot "glass.dat" using 1
++splot "@@GNUPLOTDEMOPATH@@glass.dat" using 1
+ 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
+@@ -17,7 +17,7 @@
+ set yrange [0:200]
+ #
+ set key autotitle columnhead
+-plot 'ctg-y2.dat' using 2:xticlabel(1) index 2, \
++plot '@@GNUPLOTDEMOPATH@@ctg-y2.dat' using 2:xticlabel(1) index 2, \
+      ''           using 2 index 3 
+ #
+ pause -1 "<cr> to plot again using x2ticlabels"
+@@ -38,7 +38,7 @@
+ set xtics
+ #
+ set key autotitle columnhead
+-plot 'ctg-y2.dat' using ($0-0.2):2 index 0 with boxes title "precipitation 1992-2000", \
++plot '@@GNUPLOTDEMOPATH@@ctg-y2.dat' using ($0-0.2):2 index 0 with boxes title "precipitation 1992-2000", \
+      ''           using ($0+0.2):2 index 1 with boxes title "              2000-2001", \
+      ''           using ($0):2 index 2 with linespoints lw 3 title "runoff 1992-2000", \
+      ''           using ($0):2:xticlabels(1) index 3 with linespoints lw 3 title "       2000-2001"
+@@ -47,7 +47,7 @@
+ #
+ set title "Same plot using x2ticlabels also"
+ set x2tics
+-plot 'ctg-y2.dat' using ($0-0.2):2 index 0 with boxes title "precipitation 1992-2000", \
++plot '@@GNUPLOTDEMOPATH@@ctg-y2.dat' using ($0-0.2):2 index 0 with boxes title "precipitation 1992-2000", \
+      ''           using ($0+0.2):2 index 1 with boxes title "              2000-2001", \
+      ''           using ($0):2 index 2 with linespoints lw 3 title "runoff 1992-2000", \
+      ''           using ($0):2:x2ticlabels(1) index 3 with linespoints lw 3 title "       2000-2001"
+@@ -55,7 +55,7 @@
+ 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
+@@ -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, \
+      ''          using 0:2:2 with labels center offset 0,1 notitle
+ #
+ pause -1 "<cr> continue"
+@@ -81,7 +81,7 @@
+ set ylabel "Z--->"
+ set key bottom right
+ #
+-plot 'labelplot.pdb' using 7:9 with lines notitle, \
++plot '@@GNUPLOTDEMOPATH@@labelplot.pdb' using 7:9 with lines notitle, \
+       '' using 7:9:4 with labels tc lt 3 font "Helvetica,10" notitle
+ #     '' using 7:9 with points notitle ps 5 lt -1 
+ #
+@@ -95,13 +95,13 @@
+ set view 70,210, 1.0,1.7
+ set ticslevel 0.0
+ 
+-splot 'labelplot.pdb' using 7:8:9 with lines notitle, \
++splot '@@GNUPLOTDEMOPATH@@labelplot.pdb' using 7:8:9 with lines notitle, \
+       '' using 7:8:9:4 with labels left offset 1,0 point \
+ 	   ps 2 pt 1 tc lt 3 font "Helvetica,10" notitle
+ #
+ pause -1 "<cr> to view star map"
+ #
+ reset
+-load "starmap.dem"
++load '@@GNUPLOTDEMOPATH@@starmap.dem'
+ #
+ pause -1 "<cr> to end demo"
+--- demo/fillbetween.dem
++++ demo/fillbetween.dem	2007-08-15 20:52:01.000000000 +0200
+@@ -8,7 +8,7 @@
+ set style data lines
+ set xrange [10:*]
+ set yrange [0:175]
+-plot 'silver.dat' u 1:2:3 w filledcu, \
++plot '@@GNUPLOTDEMOPATH@@silver.dat' u 1:2:3 w filledcu, \
+       '' u 1:2 lt -1 notitle, '' u 1:3 lt -1 notitle
+ pause -1 "Hit return to continue"
+ set style fill pattern 2
+@@ -19,7 +19,7 @@
+ set style fill solid 1.0 noborder
+ set xrange [250:500]
+ set auto y
+-plot 'silver.dat' u 1:2:($3+$1/50.) w filledcurves above title 'Above', \
++plot '@@GNUPLOTDEMOPATH@@silver.dat' u 1:2:($3+$1/50.) w filledcurves above title 'Above', \
+                '' 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
+@@ -5,65 +5,66 @@
+ print "Some examples how data fitting using nonlinear least squares fit"
+ print "can be done."
+ print ""
++set fit logfile '/tmp/fit.log'
+ pause -1 "first plotting the pure data set  (-> return)"
+ 
+ set title 'data for first fit demo'
+-plot 'lcdemo.dat'
++plot '@@GNUPLOTDEMOPATH@@lcdemo.dat'
+ set xlabel "Temperature T  [deg Cels.]"
+ set ylabel "Density [g/cm3]"
+ set key below
+ 
+ print "now fitting a straight line to the data :-)"
+ print "only as a demo without physical meaning"
+-load 'line.fnc'
++load '@@GNUPLOTDEMOPATH@@line.fnc'
+ y0 = 0.0
+ m = 0.0
+ show variables
+ pause -1 "first a plot with all parameters set to zero  (-> return)"
+ set title 'all fit params set to 0'
+-plot 'lcdemo.dat', l(x)
++plot '@@GNUPLOTDEMOPATH@@lcdemo.dat', l(x)
+ pause -1 "now start fitting...  (-> return)"
+-fit l(x) 'lcdemo.dat' via y0, m
++fit l(x) '@@GNUPLOTDEMOPATH@@lcdemo.dat' via y0, m
+ pause -1 "now look at the result (-> return)"
+ set title 'unweighted fit'
+-plot 'lcdemo.dat', l(x)
++plot '@@GNUPLOTDEMOPATH@@lcdemo.dat', l(x)
+ 
+ pause -1 "see the influence of weights for single data points   (-> return)"
+-fit l(x) 'lcdemo.dat' using 1:2:3 via y0, m
++fit l(x) '@@GNUPLOTDEMOPATH@@lcdemo.dat' using 1:2:3 via y0, m
+ pause -1 "now look at the result (-> return)"
+ set title 'fit weighted towards low temperatures'
+-plot 'lcdemo.dat', l(x)
++plot '@@GNUPLOTDEMOPATH@@lcdemo.dat', l(x)
+ 
+ pause -1 "now prefer the high temperature data   (-> return)"
+-fit l(x) 'lcdemo.dat' using 1:2:4 via y0, m
++fit l(x) '@@GNUPLOTDEMOPATH@@lcdemo.dat' using 1:2:4 via y0, m
+ pause -1 "now look at the result (-> return)"
+ set title 'bias to high-temperates'
+-plot 'lcdemo.dat', l(x)
++plot '@@GNUPLOTDEMOPATH@@lcdemo.dat', l(x)
+ 
+ print "now use real single-measurement errors to reach such a result (-> return)"
+ print "(look at the file lcdemo.dat and compare the columns to see the difference)"
+ pause -1 "(-> return)"
+ set title 'data with experimental errors'
+-plot 'lcdemo.dat' using 1:2:5 with errorbars
+-fit l(x) 'lcdemo.dat' using 1:2:5 via y0, m
++plot '@@GNUPLOTDEMOPATH@@lcdemo.dat' using 1:2:5 with errorbars
++fit l(x) '@@GNUPLOTDEMOPATH@@lcdemo.dat' using 1:2:5 via y0, m
+ pause -1 "now look at the result (-> return)"
+ set title 'fit weighted by experimental errors'
+-plot 'lcdemo.dat' using 1:2:5 with errorbars, l(x)
++plot '@@GNUPLOTDEMOPATH@@lcdemo.dat' using 1:2:5 with errorbars, l(x)
+ 
+ print "It's time now to try a more realistic model function"
+-load 'density.fnc'
++load '@@GNUPLOTDEMOPATH@@density.fnc'
+ show functions
+ print "density(x) is a function which shall fit the whole temperature"
+ print "range using a ?: expression. It contains 6 model parameters which"
+ print "will all be varied. Now take the start parameters out of the"
+ pause -1 "file 'start.par' and plot the function    (-> return)"
+-load 'start.par'
++load '@@GNUPLOTDEMOPATH@@start.par'
+ set title 'initial parameters for realistic model function'
+-plot 'lcdemo.dat', density(x)
+-fit density(x) 'lcdemo.dat' via 'start.par'
++plot '@@GNUPLOTDEMOPATH@@lcdemo.dat', density(x)
++fit density(x) '@@GNUPLOTDEMOPATH@@lcdemo.dat' via '@@GNUPLOTDEMOPATH@@start.par'
+ pause -1 "now look at the result (-> return)"
+ set title 'fitted to realistic model function'
+-plot 'lcdemo.dat', density(x)
++plot '@@GNUPLOTDEMOPATH@@lcdemo.dat', density(x)
+ 
+ print  "looks already rather nice? We will do now the following: set"
+ print  "the epsilon limit higher so that we need more iteration steps"
+@@ -76,10 +77,10 @@
+ print  ""
+ pause -1  "(-> return)"
+ FIT_LIMIT = 1e-10
+-fit density(x) 'lcdemo.dat' via 'start.par'
++fit density(x) '@@GNUPLOTDEMOPATH@@lcdemo.dat' via '@@GNUPLOTDEMOPATH@@start.par'
+ pause -1 "now look at the result (-> return)"
+ set title 'fit with more iterations'
+-plot 'lcdemo.dat', density(x)
++plot '@@GNUPLOTDEMOPATH@@lcdemo.dat', density(x)
+ 
+ FIT_LIMIT = 1e-5
+ print "\nNow a brief demonstration of 3d fitting."
+@@ -96,16 +97,16 @@
+ r=0.5
+ FIT_MAXITER=50
+ set title 'the scattered points, and the initial parameter'
+-splot 'hemisphr.dat' using 1:2:3, h(x,y)
++splot '@@GNUPLOTDEMOPATH@@hemisphr.dat' using 1:2:3, h(x,y)
+ pause -1 "(-> return)"
+ 
+ # we *must* provide 4 columns for a 3d fit. We fake errors=1
+-fit h(x,y) 'hemisphr.dat' using 1:2:3:(1) via r, x0, y0, z0
++fit h(x,y) '@@GNUPLOTDEMOPATH@@hemisphr.dat' using 1:2:3:(1) via r, x0, y0, z0
+ set title 'the scattered points, fitted curve'
+-splot 'hemisphr.dat' using 1:2:3, h(x,y)
++splot '@@GNUPLOTDEMOPATH@@hemisphr.dat' using 1:2:3, h(x,y)
+ print "\n\nNotice, however, that this would converge much faster when"
+ print "fitted in a more appropriate co-ordinate system:"
+-print "fit r 'hemisphr.dat' using 0:($1*$1+$2*$2+$3*$3) via r"
++print "fit r '@@GNUPLOTDEMOPATH@@hemisphr.dat' using 0:($1*$1+$2*$2+$3*$3) via r"
+ print "where we are fitting f(x)=r to the radii calculated as the data"
+ print "is read from the file. No x value is required in this case."
+ pause -1 "(This is left as an excercise for the user). (-> return)"
+@@ -118,18 +119,18 @@
+ print  "The model uses these data in order to fit elastic stiffnesses"
+ print  "which occur differently in both branches.\n"
+ pause -1 "(-> return)"
+-load 'hexa.fnc'
+-load 'sound.par'
++load '@@GNUPLOTDEMOPATH@@hexa.fnc'
++load '@@GNUPLOTDEMOPATH@@sound.par'
+ set title 'sound data, and model with initial parameters'
+-plot 'soundvel.dat', vlong(x), vtrans(x)
++plot '@@GNUPLOTDEMOPATH@@soundvel.dat', vlong(x), vtrans(x)
+ # 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'
++fit f(x,y) '@@GNUPLOTDEMOPATH@@soundvel.dat' using 1:-2:2:(1) via '@@GNUPLOTDEMOPATH@@sound.par'
+ #create soundfit.par, reading from sound.par and updating values
+-update 'sound.par' 'soundfit.par'
++update '@@GNUPLOTDEMOPATH@@sound.par' '/tmp/soundfit.par'
+ print  ""
+ pause -1 "(-> return)"
+ set title 'pseudo-3d multi-branch fit to velocity data'
+-plot 'soundvel.dat', vlong(x), vtrans(x)
++plot '@@GNUPLOTDEMOPATH@@soundvel.dat', vlong(x), vtrans(x)
+ print  "Look at the file 'hexa.fnc' to see how the branches are realized"
+ print  "using the data index as a pseudo-3d fit"
+ print  ""
+@@ -138,10 +139,10 @@
+ print  "fitting result."
+ print  ""
+ pause -1 "(-> return)"
+-load 'sound.par'
+-fit f(x,y) 'soundvel.dat' every 5 using 1:-2:2:(1) via 'sound.par'
++load '@@GNUPLOTDEMOPATH@@sound.par'
++fit f(x,y) '@@GNUPLOTDEMOPATH@@soundvel.dat' every 5 using 1:-2:2:(1) via '@@GNUPLOTDEMOPATH@@sound.par'
+ set title 'fitted only every 5th data point'
+-plot 'soundvel.dat', vlong(x), vtrans(x)
++plot '@@GNUPLOTDEMOPATH@@soundvel.dat', vlong(x), vtrans(x)
+ print  "When you compare the results (see 'fit.log') you remark that"
+ print  "the uncertainties in the fitted constants have become larger,"
+ print  "the quality of the plot is only slightly affected."
+@@ -150,24 +151,24 @@
+ print  "you fit only the others (c44 and c13 fixed here)."
+ print  ""
+ pause -1 "(-> return)"
+-load 'sound2.par'
++load '@@GNUPLOTDEMOPATH@@sound2.par'
+ set title 'initial parameters'
+-plot 'soundvel.dat', vlong(x), vtrans(x)
+-fit f(x,y) 'soundvel.dat' using 1:-2:2:(1) via 'sound2.par'
++plot '@@GNUPLOTDEMOPATH@@soundvel.dat', vlong(x), vtrans(x)
++fit f(x,y) '@@GNUPLOTDEMOPATH@@soundvel.dat' using 1:-2:2:(1) via '@@GNUPLOTDEMOPATH@@sound2.par'
+ set title 'fit with c44 and c13 fixed'
+-plot 'soundvel.dat', vlong(x), vtrans(x)
++plot '@@GNUPLOTDEMOPATH@@soundvel.dat', vlong(x), vtrans(x)
+ print  "This has the same effect as specifying only the real free"
+ print  "parameters by the 'via' syntax."
+ print  ""
+ print  "fit f(x) 'soundvel.dat' via c33, c11, phi0"
+ print  ""
+ pause -1 "(-> return)"
+-load 'sound.par'
++load '@@GNUPLOTDEMOPATH@@sound.par'
+ set title 'initial parameters'
+-plot 'soundvel.dat', vlong(x), vtrans(x)
+-fit f(x,y) 'soundvel.dat' using 1:-2:2:(1) via c33, c11, phi0
++plot '@@GNUPLOTDEMOPATH@@soundvel.dat', vlong(x), vtrans(x)
++fit f(x,y) '@@GNUPLOTDEMOPATH@@soundvel.dat' using 1:-2:2:(1) via c33, c11, phi0
+ set title 'fit via c33,c11,phi0'
+-plot 'soundvel.dat', vlong(x), vtrans(x)
++plot '@@GNUPLOTDEMOPATH@@soundvel.dat', vlong(x), vtrans(x)
+ 
+ print  "Here comes an example of a very complex function..."
+ print  ""
+@@ -177,10 +178,10 @@
+ set ylabel "Reflectivity"
+ set title 'raw data'
+ #HBB 970522: here and below, use the error column present in moli3.dat:
+-plot 'moli3.dat' w e
++plot '@@GNUPLOTDEMOPATH@@moli3.dat' w e
+ 
+ print "now fitting the model function to the data"
+-load 'reflect.fnc'
++load '@@GNUPLOTDEMOPATH@@reflect.fnc'
+ 
+ #HBB 970522: Changed initial values to something sensible, i.e. 
+ #  something an experienced user of fit would actually use.
+@@ -193,9 +194,9 @@
+ show functions
+ pause -1 "first a plot with all parameters set to initial values  (-> return)"
+ set title 'initial parameters'
+-plot 'moli3.dat' w e, R(x)
++plot '@@GNUPLOTDEMOPATH@@moli3.dat' w e, R(x)
+ pause -1 "now start fitting...  (-> return)"
+-fit R(x) 'moli3.dat' u 1:2:3 via eta, tc
++fit R(x) '@@GNUPLOTDEMOPATH@@moli3.dat' u 1:2:3 via eta, tc
+ 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
+@@ -48,7 +48,7 @@
+ # autoranging loses the verticals
+ set xrange [0:15]
+ set yrange [0:15]
+-splot "glass.dat" using 1
++splot "@@GNUPLOTDEMOPATH@@glass.dat" using 1
+ 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 @@
+ #
+ # 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 boxwidth 0.9
+ set xtic rotate by -45
+ #set bmargin 10 
+-plot 'immigration.dat' using 6:xtic(1) ti col, '' u 12 ti col, '' u 13 ti col, '' u 14 ti col
++plot '@@GNUPLOTDEMOPATH@@immigration.dat' using 6:xtic(1) ti col, '' u 12 ti col, '' u 13 ti col, '' u 14 ti col
+ #
+ pause -1 "<cr> to change the gap between clusters"
+ #
+@@ -51,7 +51,7 @@
+ set style fill solid border -1
+ set boxwidth 0.75
+ #
+-plot 'immigration.dat' using 2:xtic(1), \
++plot '@@GNUPLOTDEMOPATH@@immigration.dat' using 2:xtic(1), \
+ '' using 3, \
+ '' using 4, \
+ '' using 5, \
+@@ -89,7 +89,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 @@
+ set ytics
+ unset xtics
+ set xtics norotate nomirror
+-plot 'immigration.dat' using 6 ti col, '' using 12 ti col, \
++plot '@@GNUPLOTDEMOPATH@@immigration.dat' using 6 ti col, '' using 12 ti col, \
+      '' using 13 ti col, '' using 14:key(1) ti col
+ #
+ pause -1 "Next we do several sets of parallel histograms"
+@@ -148,7 +148,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, \
+ newhistogram "Southern Europe", \
+ '' u 9:xtic(1) t 9, '' u 17 t 17, '' u 22 t 22, \
+ newhistogram "British Isles", \
+--- demo/image.dem
++++ demo/image.dem	2007-08-15 20:58:34.000000000 +0200
+@@ -32,7 +32,7 @@
+ set xrange [-10:137]
+ set yrange [-10:157]
+ set label "\"I flew here... by plane.  Why?  For the halibut.\"" at 64,135 center
+-plot 'blutux.rgb' binary array=128x128 flipy format='%uchar' with rgbimage
++plot '@@GNUPLOTDEMOPATH@@blutux.rgb' binary array=128x128 flipy format='%uchar' with rgbimage
+ pause -1 "Hit return to continue"
+ reset
+ 
+@@ -58,10 +58,10 @@
+ set yrange [-10:300]
+ unset key
+ set label "\"Time for a dip...\"" at 132,285 center
+-plot 'blutux.rgb' binary array=128x128 flipy center=( 64,201 ) format='%uchar' with rgbimage, \
+-     'blutux.rgb' binary array=128x128 flipy rotation=-90d center=(201,201) format='%uchar' with rgbimage, \
+-     'blutux.rgb' binary array=128x128 flip=y rotate=3.1415 center=(201,64) format='%uchar' with rgbimage, \
+-     'blutux.rgb' binary array=128x128 flip=y rot=0.5pi center=(64,64) format='%uchar' using 1:2:3 with rgbimage
++plot '@@GNUPLOTDEMOPATH@@blutux.rgb' binary array=128x128 flipy center=( 64,201 ) format='%uchar' with rgbimage, \
++     '@@GNUPLOTDEMOPATH@@blutux.rgb' binary array=128x128 flipy rotation=-90d center=(201,201) format='%uchar' with rgbimage, \
++     '@@GNUPLOTDEMOPATH@@blutux.rgb' binary array=128x128 flip=y rotate=3.1415 center=(201,64) format='%uchar' with rgbimage, \
++     '@@GNUPLOTDEMOPATH@@blutux.rgb' binary array=128x128 flip=y rot=0.5pi center=(64,64) format='%uchar' using 1:2:3 with rgbimage
+ pause -1 "Hit return to continue"
+ reset
+ 
+@@ -82,7 +82,7 @@
+ set label 1 "\"I am the penguin, GOO GOO GOO JOOB.\"" at 63,140 center
+ set title "Palette mode 'image' used to produce psychedelic bird"
+ unset colorbox
+-plot 'blutux.rgb' binary array=128x128 flipy format='%uchar%uchar%uchar' using ($1+$2+$3) with image
++plot '@@GNUPLOTDEMOPATH@@blutux.rgb' binary array=128x128 flipy format='%uchar%uchar%uchar' using ($1+$2+$3) with image
+ pause -1 "Hit return to continue"
+ reset
+ 
+@@ -106,7 +106,7 @@
+ set title "The palette can be changed from color to gray scale"
+ set palette gray
+ unset colorbox
+-plot 'blutux.rgb' binary array=128x128 flipy format='%uchar%uchar%uchar' using ($1+$2+$3)/3 with image
++plot '@@GNUPLOTDEMOPATH@@blutux.rgb' binary array=128x128 flipy format='%uchar%uchar%uchar' using ($1+$2+$3)/3 with image
+ pause -1 "Hit return to continue"
+ unset label 1
+ 
+@@ -133,7 +133,7 @@
+ set colorbox
+ set cbrange [0:255]
+ set title "As with 3d color surfaces, a color box may be added to the plot"
+-splot 'blutux.rgb' binary array=128x128 flipy format='%uchar%uchar%uchar' using ($1+$2+$3)/3 with image
++splot '@@GNUPLOTDEMOPATH@@blutux.rgb' binary array=128x128 flipy format='%uchar%uchar%uchar' using ($1+$2+$3)/3 with image
+ pause -1 "Hit return to continue"
+ 
+ print ""
+@@ -162,7 +162,7 @@
+ set tics out
+ set title "Polygons used to draw pixels for rotated images\nNotice the slower refresh rate than for the next plot"
+ unset colorbox
+-plot 'blutux.rgb' binary array=128x128 dx=0.70711 dy=0.70711 flipy rotation=45d center=(63.5,63.5) format='%uchar' using ($1+$2+$3)/3 with image
++plot '@@GNUPLOTDEMOPATH@@blutux.rgb' binary array=128x128 dx=0.70711 dy=0.70711 flipy rotation=45d center=(63.5,63.5) format='%uchar' using ($1+$2+$3)/3 with image
+ pause -1 "Hit return to continue"
+ reset
+ 
+@@ -182,7 +182,7 @@
+ set tics out
+ set title "Terminal image routine used to draw plot rotated about origin\nNotice the faster refresh rate than for the previous plot"
+ unset colorbox
+-plot 'blutux.rgb' binary array=128x128 dx=1 flip=y rotation=0.5pi origin=(0,0) format='%uchar' using ($1+$2+$3)/3 with image
++plot '@@GNUPLOTDEMOPATH@@blutux.rgb' binary array=128x128 dx=1 flip=y rotation=0.5pi origin=(0,0) format='%uchar' using ($1+$2+$3)/3 with image
+ pause -1 "Hit return to continue"
+ reset
+ 
+@@ -205,20 +205,20 @@
+ set tics out
+ set label 1 "Selection of the input channels via \`using\`" at 140,160 center
+ set title '"I do impersonations..."' offset 0,-0.5
+-plot 'blutux.rgb' binary array=128x128 flip=y format='%uchar' using 1:2:3 with rgbimage
++plot '@@GNUPLOTDEMOPATH@@blutux.rgb' binary array=128x128 flip=y format='%uchar' using 1:2:3 with rgbimage
+ unset label 1
+ set size 0.5,0.48
+ set origin 0.5,0.47
+ set title '"A cardinal."'
+-plot 'blutux.rgb' binary array=128x128 flip=y format='%uchar%*uchar%*uchar' using 1:(0):(0) with rgbimage
++plot '@@GNUPLOTDEMOPATH@@blutux.rgb' binary array=128x128 flip=y format='%uchar%*uchar%*uchar' using 1:(0):(0) with rgbimage
+ set size 0.5,0.48
+ set origin 0.0,0.0
+ set title '"A parrot."'
+-plot 'blutux.rgb' binary array=128x128 flipy format='%*uchar%uchar%*uchar' using (0):1:(0) with rgbimage
++plot '@@GNUPLOTDEMOPATH@@blutux.rgb' binary array=128x128 flipy format='%*uchar%uchar%*uchar' using (0):1:(0) with rgbimage
+ set size 0.5,0.48
+ set origin 0.5,0.0
+ set title '"A bluebird."'
+-plot 'blutux.rgb' binary array=128x128 flipy format='%*uchar%*uchar%uchar' using (0):(0):1 with rgbimage
++plot '@@GNUPLOTDEMOPATH@@blutux.rgb' binary array=128x128 flipy format='%*uchar%*uchar%uchar' using (0):(0):1 with rgbimage
+ unset multiplot
+ pause -1 "Hit return to continue"
+ reset
+@@ -248,23 +248,23 @@
+ set label 1 "Luminance adjustment via \`cbrange\`" at 140,160 center
+ set title 'Lake Mendota, "or Wonk-sheck-ho-mik-la!"' offset 0,-0.5
+ set cbrange [*:*]
+-plot 'blutux.rgb' binary array=128x128 flipy format='%uchar' using 1:2:3 with rgbimage
++plot '@@GNUPLOTDEMOPATH@@blutux.rgb' binary array=128x128 flipy format='%uchar' using 1:2:3 with rgbimage
+ unset label 1
+ set size 0.5,0.48
+ set origin 0.5,0.47
+ set title '"Lucky I brought sunscreen."'
+ set cbrange [0:200]
+-plot 'blutux.rgb' binary array=128x128 flip=y format='%uchar' using 1:2:3 with rgbimage
++plot '@@GNUPLOTDEMOPATH@@blutux.rgb' binary array=128x128 flip=y format='%uchar' using 1:2:3 with rgbimage
+ set size 0.5,0.48
+ set origin 0.0,0.0
+ set title 'Sunset on the Terrace'
+ set cbrange [0:400]
+-plot 'blutux.rgb' binary array=128x128 flip=y format='%uchar' using (1.5*$1):2:3 with rgbimage
++plot '@@GNUPLOTDEMOPATH@@blutux.rgb' binary array=128x128 flip=y format='%uchar' using (1.5*$1):2:3 with rgbimage
+ set size 0.5,0.48
+ set origin 0.5,0.0
+ set title 'Sultry evening'
+ set cbrange [0:400]
+-plot 'blutux.rgb' binary array=128x128 flipy format='%uchar' using 1:2:3 with rgbimage, '-' w points pt 7 ps 6 lt -2, '-' w points pt 7 ps 0.65 lt -2
++plot '@@GNUPLOTDEMOPATH@@blutux.rgb' binary array=128x128 flipy format='%uchar' using 1:2:3 with rgbimage, '-' w points pt 7 ps 6 lt -2, '-' w points pt 7 ps 0.65 lt -2
+ 110 100
+ e
+ 10 95
+@@ -295,8 +295,8 @@
+ set title "Convex     November 1-7 1989    Circadian"
+ set key left box
+ set xrange[-1:24]
+-plot 'using.bin' binary format='%*int32%int8%*int16%int8%*int16%*int16' using 1:2 title "Logged in" with impulses,\
+-     'using.bin' binary format='%*int32%int8%*int16%int8%*int16%*int16' using 1:2 title "Logged in" with points
++plot '@@GNUPLOTDEMOPATH@@using.bin' binary format='%*int32%int8%*int16%int8%*int16%*int16' using 1:2 title "Logged in" with impulses,\
++     '@@GNUPLOTDEMOPATH@@using.bin' binary format='%*int32%int8%*int16%int8%*int16%*int16' using 1:2 title "Logged in" with points
+ pause -1 "Hit return to continue"
+ reset
+ 
+@@ -308,9 +308,9 @@
+ set title "Convex     November 1-7 1989"
+ set key below
+ set label "(Weekend)" at 5,25 center
+-plot 'using.bin' binary format='%*int32%*int8%int16%int8%*int16%*int16' using ($1/100):2 title "Logged in" with impulses,\
+-     'using.bin' binary format='%*int32%*int8%int16%*int8%int16%*int16' using ($1/100):($2/100) t "Load average" with points,\
+-     'using.bin' binary format='%*int32%*int8%int16%*int8%*int16%int16' using ($1/100):($2/100) t "%CPU used" with lines
++plot '@@GNUPLOTDEMOPATH@@using.bin' binary format='%*int32%*int8%int16%int8%*int16%*int16' using ($1/100):2 title "Logged in" with impulses,\
++     '@@GNUPLOTDEMOPATH@@using.bin' binary format='%*int32%*int8%int16%*int8%int16%*int16' using ($1/100):($2/100) t "Load average" with points,\
++     '@@GNUPLOTDEMOPATH@@using.bin' binary format='%*int32%*int8%int16%*int8%*int16%int16' using ($1/100):($2/100) t "%CPU used" with lines
+ unset label
+ pause -1 "Hit return to continue"
+ reset
+@@ -422,7 +422,7 @@
+ set xrange [-10:137]
+ set yrange [-10:157]
+ set cbrange [0:255]
+-splot 'blutux.rgb' binary array=128x128 flip=y format='%uchar%uchar%uchar' using ($1+$2+$3)/3 with image
++splot '@@GNUPLOTDEMOPATH@@blutux.rgb' binary array=128x128 flip=y format='%uchar%uchar%uchar' using ($1+$2+$3)/3 with image
+ pause -1 "Hit return to continue"
+ reset
+ 
+@@ -433,7 +433,7 @@
+ print ""
+ unset colorbox
+ set title "Orientation operations from \'plot\' also apply to to \'splot\'"
+-splot 'blutux.rgb' binary array=128x128 flipy rotate=90d center = (63.5,63.5,50) format='%uchar%uchar%uchar' using ($1+$2+$3) with image
++splot '@@GNUPLOTDEMOPATH@@blutux.rgb' binary array=128x128 flipy rotate=90d center = (63.5,63.5,50) format='%uchar%uchar%uchar' using ($1+$2+$3) with image
+ pause -1 "Hit return to continue"
+ reset
+ 
+@@ -456,7 +456,7 @@
+ set arrow from 0,-10,0 to 0,10,0 as 1
+ set arrow from 0,0,-10 to 0,0,10 as 1
+ set arrow from 0,0,0 to 30,30,30 as 2
+-splot 'blutux.rgb' binary array=128x128 flipy rot=1.0pi center = (63.5,63.5,50) perp=(1,1,1) format='%uchar%uchar%uchar' using ($1+$2+$3)/3 with image
++splot '@@GNUPLOTDEMOPATH@@blutux.rgb' binary array=128x128 flipy rot=1.0pi center = (63.5,63.5,50) perp=(1,1,1) format='%uchar%uchar%uchar' using ($1+$2+$3)/3 with image
+ pause -1 "Hit return to continue"
+ reset
+ 
+@@ -542,7 +542,7 @@
+ set xrange [-1.3:1.3]
+ set yrange [-1.3:1.3]
+ # The sinusoid has period T=8/7.  Also, dx=0.01.  So solving 8/7 dt = 2/3 pi dx, we get dt = 0.018326.
+-plot 'sine.bin' binary endian=little array=201 dt=0.018326 origin=(0,0) format='%f' using 1 with lines
++plot '@@GNUPLOTDEMOPATH@@sine.bin' binary endian=little array=201 dt=0.018326 origin=(0,0) format='%f' using 1 with lines
+ pause -1 "Hit return to continue"
+ reset
+ 
+@@ -565,10 +565,10 @@
+ set xrange [-3:15]
+ set yrange [-3:15]
+ set zrange [-0.2:1.2]
+-splot "binary3" binary center=(1.5,1.5,0), \
+-  "binary3" binary center=(10.5,1.5,0) rotate=0.5pi u 1:2:3, \
+-  "binary3" binary center=(10.5,10.5,0) rotate=1.0pi u 1:2:3, \
+-  "binary3" binary center=(1.5,10.5,0) rotate=1.5pi u 1:2:3
++splot '@@GNUPLOTDEMOPATH@@binary3' binary center=(1.5,1.5,0), \
++  '@@GNUPLOTDEMOPATH@@binary3' binary center=(10.5,1.5,0) rotate=0.5pi u 1:2:3, \
++  '@@GNUPLOTDEMOPATH@@binary3' binary center=(10.5,10.5,0) rotate=1.0pi u 1:2:3, \
++  '@@GNUPLOTDEMOPATH@@binary3' binary center=(1.5,10.5,0) rotate=1.5pi u 1:2:3
+ pause -1 "Hit return to continue"
+ reset
+ 
+@@ -588,16 +588,16 @@
+ set view 70,45
+ set xrange [-3:3]
+ set yrange [-3:3]
+-splot "binary2" binary
++splot '@@GNUPLOTDEMOPATH@@binary2' binary
+ pause -1 "Hit return to continue"
+ set title "Decimate by two in first dimension"
+-splot "binary2" binary every 2
++splot '@@GNUPLOTDEMOPATH@@binary2' binary every 2
+ pause -1 "Hit return to continue"
+ set title "Decimate by three in second dimension"
+-splot "binary2" binary every :3
++splot '@@GNUPLOTDEMOPATH@@binary2' binary every :3
+ pause -1 "Hit return to continue"
+ set title "Decimate by four in both dimensions"
+-splot "binary2" binary every 4:4
++splot '@@GNUPLOTDEMOPATH@@binary2' binary every 4:4
+ pause -1 "Hit return to continue"
+ reset
+ 
+@@ -609,13 +609,13 @@
+ set xrange [28:98]
+ set yrange [55:125]
+ set label 1 "\"Can I do that?\"" at 64,116 center
+-plot 'blutux.rgb' binary array=128x128 flipy format='%uchar' every 1:1:43:15:83:65 with rgbimage
++plot '@@GNUPLOTDEMOPATH@@blutux.rgb' binary array=128x128 flipy format='%uchar' every 1:1:43:15:83:65 with rgbimage
+ pause -1 "Hit return to continue"
+ set title "... Sure, go ahead."
+ set xrange [-10:130]
+ set yrange [-8:157]
+ set label 1 "\"Picasso's \'Penguin on Beach\'\"" at 64,139 center
+-plot 'blutux.rgb' binary array=128x128 flipy format='%uchar' every 8:8 with rgbimage
++plot '@@GNUPLOTDEMOPATH@@blutux.rgb' binary array=128x128 flipy format='%uchar' every 8:8 with rgbimage
+ pause -1 "Hit return to continue"
+ reset
+ 
+@@ -635,7 +635,7 @@
+ print "line can still be used to over-ride in-file attributes."
+ print ""
+ set title "Automatically recognizing file type and extracting file information"
+-plot 'demo.edf' binary filetype=auto with image
++plot '@@GNUPLOTDEMOPATH@@demo.edf' binary filetype=auto with image
+ pause -1 "Hit return to continue"
+ reset
+ 
+@@ -748,19 +748,19 @@
+ unset key
+ set tics out
+ set title "'asciimat.dat' matrix index 0"
+-splot 'asciimat.dat' matrix index 0
++splot '@@GNUPLOTDEMOPATH@@asciimat.dat' matrix index 0
+ set size 0.5,0.5
+ set origin 0.5,0.5
+ set title "'asciimat.dat' matrix index 1"
+-splot 'asciimat.dat' matrix index 1
++splot '@@GNUPLOTDEMOPATH@@asciimat.dat' matrix index 1
+ set size 0.5,0.5
+ set origin 0.0,0.0
+ set title "'asciimat.dat' matrix index 2"
+-splot 'asciimat.dat' matrix index 2
++splot '@@GNUPLOTDEMOPATH@@asciimat.dat' matrix index 2
+ set size 0.5,0.5
+ set origin 0.5,0.0
+ set title "'asciimat.dat' matrix index 2 using 1:(2*$2):($3*$3)"
+-splot 'asciimat.dat' matrix index 2 using 1:(2*$2):($3*$3)
++splot '@@GNUPLOTDEMOPATH@@asciimat.dat' matrix index 2 using 1:(2*$2):($3*$3)
+ unset multiplot
+ pause -1 "Hit return to continue"
+ reset
+@@ -782,8 +782,8 @@
+ set lmargin 0
+ set view 60, 45, 1, 1
+ set label 1 "\"Mirror mirror on the wall,\nwho's the GNUiest penguin of all?\"" at 140,0,40 center
+-splot 'blutux.rgb' binary array=128x128 flip=y rot=90d origin=(0,0,0) perp = (1,0,0) format='%uchar' using ($1+$2+$3) with image, \
+-      'blutux.rgb' binary array=128x128 flipy rot=90d origin=(+137,+137,0) perp=(0,1,0) format='%uchar' using ($1+$2+$3) with image
++splot '@@GNUPLOTDEMOPATH@@blutux.rgb' binary array=128x128 flip=y rot=90d origin=(0,0,0) perp = (1,0,0) format='%uchar' using ($1+$2+$3) with image, \
++      '@@GNUPLOTDEMOPATH@@blutux.rgb' binary array=128x128 flipy rot=90d origin=(+137,+137,0) perp=(0,1,0) format='%uchar' using ($1+$2+$3) with image
+ pause -1 "Hit return to continue"
+ reset
+ 
+--- demo/layout.dem
++++ demo/layout.dem	2007-08-15 20:52:01.000000000 +0200
+@@ -8,7 +8,7 @@
+ plot sin(x)/x
+ #
+ set title "Plot 2"
+-plot 'silver.dat' using 1:2 ti 'silver.dat'
++plot '@@GNUPLOTDEMOPATH@@silver.dat' using 1:2 ti 'silver.dat'
+ #
+ set style histogram columns
+ set style fill solid
+@@ -17,7 +17,7 @@
+ set format y "    "
+ set tics scale 0
+ set title "Plot 3"
+-plot 'immigration.dat' using 2 with histograms, \
++plot '@@GNUPLOTDEMOPATH@@immigration.dat' using 2 with histograms, \
+      '' using 7  with histograms , \
+      '' using 8  with histograms , \
+      '' using 11 with histograms 
+@@ -36,7 +36,7 @@
+ plot sin(x)/x
+ #
+ set title "Plot 2"
+-plot 'silver.dat' using 1:2 ti 'silver.dat'
++plot '@@GNUPLOTDEMOPATH@@silver.dat' using 1:2 ti 'silver.dat'
+ #
+ set title "Plot 3"
+ set style histogram columns
+@@ -45,7 +45,7 @@
+ set boxwidth 0.8
+ set format y "    "
+ set tics scale 0
+-plot 'immigration.dat' using 2 with histograms , \
++plot '@@GNUPLOTDEMOPATH@@immigration.dat' using 2 with histograms , \
+      '' using  7 with histograms , \
+      '' using  8 with histograms , \
+      '' using 11 with histograms 
+@@ -65,7 +65,7 @@
+ plot sin(x)/x
+ #
+ set title "Plot 2"
+-plot 'silver.dat' using 1:2 ti 'silver.dat'
++plot '@@GNUPLOTDEMOPATH@@silver.dat' using 1:2 ti 'silver.dat'
+ #
+ set title "Plot 3"
+ set style histogram columns
+@@ -74,7 +74,7 @@
+ set boxwidth 0.8
+ set format y "    "
+ set tics scale 0
+-plot 'immigration.dat' using 2 with histograms , \
++plot '@@GNUPLOTDEMOPATH@@immigration.dat' using 2 with histograms , \
+      '' 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
+@@ -7,7 +7,7 @@
+ set ylabel "Amplitude"
+ set key box
+ set title "Bragg reflection -- Peak only"
+-plot "big_peak.dat" title "Rate" with errorbars, \
++plot "@@GNUPLOTDEMOPATH@@big_peak.dat" title "Rate" with errorbars, \
+                  "" smooth csplines t "Rate"
+ pause -1 "You would draw smaller bars? (-> return)"
+ set bars small
+@@ -19,16 +19,16 @@
+ set xlabel "Time (sec)"
+ set ylabel "Rate"
+ set title "Ag 108 decay data"
+-plot "silver.dat" t "experimental" w errorb, \
++plot "@@GNUPLOTDEMOPATH@@silver.dat" t "experimental" w errorb, \
+                ""  smooth csplines t "cubic smooth"
+ # error is column 3; weight larger errors less
+ # start with rel error = 1/($3/$2)
+ pause -1 "Now apply a smoothing spline, weighted by 1/rel error (-> return)"
+ S=1
+-plot "silver.dat" t "experimental" w errorb,\
++plot "@@GNUPLOTDEMOPATH@@silver.dat" t "experimental" w errorb,\
+                "" u 1:2:(S*$2/$3) smooth acsplines t "acspline Y/Z"
+ pause -1 "Make it smoother by changing the smoothing weights (-> return)"
+-plot "silver.dat" t "rate" w errorb,\
++plot "@@GNUPLOTDEMOPATH@@silver.dat" t "rate" w errorb,\
+                "" u 1:2:($2/($3*1.e1)) sm acs t "acspline Y/(Z*1.e1)",\
+                "" u 1:2:($2/($3*1.e3)) sm acs t "         Y/(Z*1.e3)",\
+                "" u 1:2:($2/($3*1.e5)) sm acs t "         Y/(Z*1.e5)"
+@@ -37,11 +37,11 @@
+ replot
+ pause -1 "Now approximate the data with a bezier curve between the endpoints (-> return)"
+ unset logscale y
+-plot "silver.dat" t "experimental" w errorb,\
++plot "@@GNUPLOTDEMOPATH@@silver.dat" t "experimental" w errorb,\
+                "" smooth sbezier t "bezier"
+ pause -1 "You would rather use log-scales ? (-> return)"
+ set logscale y
+-plot "silver.dat" t "rate" w errorb, \
++plot "@@GNUPLOTDEMOPATH@@silver.dat" t "rate" w errorb, \
+                "" smooth sbezier t "bezier"
+ #
+ pause -1 "Errorbar demo (-> return)"
+@@ -51,26 +51,26 @@
+ set ylabel "Power [W]"
+ set title "UM1-Cell Power"
+ n(x)=1.53**2*x/(5.67+x)**2
+-plot [0:50] "battery.dat" t "Power" with xyerrorbars, n(x) t "Theory" w lines
++plot [0:50] "@@GNUPLOTDEMOPATH@@battery.dat" t "Power" with xyerrorbars, n(x) t "Theory" w lines
+ pause -1 "Would you like boxes? (-> return)"
+-plot [0:50] "battery.dat" t "Power" with boxxy, n(x) t "Theory" w lines
++plot [0:50] "@@GNUPLOTDEMOPATH@@battery.dat" t "Power" with boxxy, n(x) t "Theory" w lines
+ pause -1 "Only X-Bars? (-> return)"
+-plot [0:50] "battery.dat" u 1:2:3 t "Power" w xerr, n(x) t "Theory" w lines
++plot [0:50] "@@GNUPLOTDEMOPATH@@battery.dat" u 1:2:3 t "Power" w xerr, n(x) t "Theory" w lines
+ pause -1 "Only Y-Bars? (-> return)"
+-plot [0:50] "battery.dat" u 1:2:4 t "Power" w yerr, n(x) t "Theory" w lines
++plot [0:50] "@@GNUPLOTDEMOPATH@@battery.dat" u 1:2:4 t "Power" w yerr, n(x) t "Theory" w lines
+ pause -1 "Logscaled? (-> return)"
+ set logscale y
+-plot [0:50] "battery.dat" u 1:2:4 t "Power" w yerr, n(x) t "Theory" w lines
++plot [0:50] "@@GNUPLOTDEMOPATH@@battery.dat" u 1:2:4 t "Power" w yerr, n(x) t "Theory" w lines
+ pause -1 "X as well? (-> return)"
+ set logscale xy
+-plot [1:50] "battery.dat" t "Power" w xyerr, n(x) t "Theory" w lines
++plot [1:50] "@@GNUPLOTDEMOPATH@@battery.dat" t "Power" w xyerr, n(x) t "Theory" w lines
+ pause -1 "If you like bars without tics (-> return)"
+ unset logscale
+ set bars small
+-plot [0:50] "battery.dat" t "Power" with xyerrorbars, n(x) t "Theory" w lines
++plot [0:50] "@@GNUPLOTDEMOPATH@@battery.dat" t "Power" with xyerrorbars, n(x) t "Theory" w lines
+ pause -1 "X-Bars only (-> return)"
+-plot [0:50] "battery.dat" u 1:2:3 t "Power" w xerr, n(x) t "Theory" w lines
++plot [0:50] "@@GNUPLOTDEMOPATH@@battery.dat" u 1:2:3 t "Power" w xerr, n(x) t "Theory" w lines
+ pause -1 "Y-Bars only (-> return)"
+-plot [0:50] "battery.dat" u 1:2:4 t "Power" w yerr, n(x) t "Theory" w lines
++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
+@@ -9,40 +9,40 @@
+ set zrange [-2:2]
+ set style data line
+ set title "Demo of multiple mesh per file capability - Digitized Blue Whale"
+-splot "whale.dat"
++splot "@@GNUPLOTDEMOPATH@@whale.dat"
+ pause -1 "Press Return"
+ set title "Demo of multiple mesh per file capability - Digitized Blue Whale"
+ set xlabel "Mesh or Network 0"
+-splot "whale.dat" index 0
++splot "@@GNUPLOTDEMOPATH@@whale.dat" index 0
+ pause -1 "Press Return"
+ 
+ set autoscale z
+ set xlabel "Mesh or Network 6"
+ set autoscale z
+-splot "whale.dat" index 6 using 3:2:1 
++splot "@@GNUPLOTDEMOPATH@@whale.dat" index 6 using 3:2:1 
+ pause -1 "Press Return"
+ 
+ set zrange [-2:2]
+ set xlabel "Mesh or Network 12"
+-splot "whale.dat" index 12 with points
++splot "@@GNUPLOTDEMOPATH@@whale.dat" index 12 with points
+ pause -1 "Press Return"
+ 
+ set xlabel "Mesh or Network 13"
+-splot "whale.dat" i 13
++splot "@@GNUPLOTDEMOPATH@@whale.dat" i 13
+ pause -1 "Press Return - A Loop over Indices could be done with reread"
+ 
+ #  #file "loop"
+ #  maxmsh = 16
+ #  ind = (ind + 1)%maxmsh
+-#  splot "whale.dat" i ind
++#  splot "@@GNUPLOTDEMOPATH@@whale.dat" i ind
+ #  reread "loop"
+ 
+ set xlabel "Mesh or Network 4"
+-splot "whale.dat" i 4
++splot "@@GNUPLOTDEMOPATH@@whale.dat" i 4
+ pause -1 "Press Return"
+ 
+ set xlabel "Mesh or Network 5"
+-splot "whale.dat" i 5
++splot "@@GNUPLOTDEMOPATH@@whale.dat" i 5
+ pause -1 "Press Return"
+ 
+ reset
+--- demo/pm3d.dem
++++ demo/pm3d.dem	2007-08-15 20:52:01.000000000 +0200
+@@ -8,7 +8,7 @@
+ # Otherwise you can use the output to postscript, for example:
+ #	set term push; set term postscript color enhanced
+ #	set out 'pm3d_demo.ps'
+-#	load 'pm3d.dem'
++#	load '@@GNUPLOTDEMOPATH@@pm3d.dem'
+ #	set out; set term pop
+ 
+ # Prepared by Petr Mikulik
+@@ -230,7 +230,7 @@
+ set pm3d flush begin
+ set title "Datafile with different nb of points in scans; pm3d flush begin"
+ set pm3d flush begin noftriangles scansforward
+-splot 'triangle.dat'
++splot '@@GNUPLOTDEMOPATH@@triangle.dat'
+ #show pm3d
+ pause -1 "Hit return to continue"
+ 
+@@ -249,7 +249,7 @@
+ set pm3d flush begin
+ set title "Data with different nb of points in scans; pm3d ftriangles flush begin"
+ set pm3d flush begin ftriangles scansforward
+-splot 'triangle.dat'
++splot '@@GNUPLOTDEMOPATH@@triangle.dat'
+ #show pm3d
+ pause -1 "Hit return to continue"
+ 
+@@ -332,12 +332,12 @@
+ set pm3d map
+ 
+ set xrange [0:2]
+-splot 'clip14in.dat'
++splot '@@GNUPLOTDEMOPATH@@clip14in.dat'
+ pause -1 "Hit return to continue"
+ 
+ set xrange [0:1.5]
+ set yrange [*:*]
+-set title "...and now xrange is [0:1.5] and 'set pm3d clip1in'"
++set title "... and now xrange is [0:1.5] and \'set pm3d clip1in\'"
+ set pm3d clip1in
+ replot
+ pause -1 "Hit return to continue"
+@@ -360,19 +360,19 @@
+ 
+ set pm3d at s explicit
+ 
+-#	'binary2' binary u 1:2:(column(3)+column(-1)/20.0):3 w pm3d, 
++#	'@@GNUPLOTDEMOPATH@@binary2' binary u 1:2:(column(3)+column(-1)/20.0):3 w pm3d, 
+ 
+ splot \
+-	'binary2' binary u 1:2:3:($2+($1+$2)/10) w pm3d, \
++	'@@GNUPLOTDEMOPATH@@binary2' binary u 1:2:3:($2+($1+$2)/10) w pm3d, \
+ 	1+sinc(x*4, y*4) w l
+ pause -1 "Hit return to continue"
+ 
+ set title "coloring according to the 3rd 'using' parameter (left) and to the z-value (bottom)"
+ set border 895
+ splot \
+-    'binary2' binary u 2:(12 - column(3) * 10):1 notitle w lines, \
+-    'binary2' binary u (-12 + column(3) * 10):2:1:(-12 + column(3) * 10) notitle w pm3d, \
+-    'binary2' binary u 1:2:(column(3) * 10 - 12) notitle w pm3d
++    '@@GNUPLOTDEMOPATH@@binary2' binary u 2:(12 - column(3) * 10):1 notitle w lines, \
++    '@@GNUPLOTDEMOPATH@@binary2' binary u (-12 + column(3) * 10):2:1:(-12 + column(3) * 10) notitle w pm3d, \
++    '@@GNUPLOTDEMOPATH@@binary2' binary u 1:2:(column(3) * 10 - 12) notitle w pm3d
+ 
+ pause -1 "Hit return to continue"
+ 
+--- demo/pointsize.dem
++++ demo/pointsize.dem	2007-08-15 20:52:01.000000000 +0200
+@@ -13,16 +13,16 @@
+ # plot a 2D map with locations marked by variable sized points
+ #
+ set title "plot with variable size points"
+-plot 'world.dat' with lines lt 3, \
+-     'world.cor' using 1:2:(5.*rand(0)) with points lt 1 pt 6 ps variable
++plot '@@GNUPLOTDEMOPATH@@world.dat' with lines lt 3, \
++     '@@GNUPLOTDEMOPATH@@world.cor' using 1:2:(5.*rand(0)) with points lt 1 pt 6 ps variable
+ pause -1 "Hit return to continue"
+ 
+ #
+ set title "splot with variable size points\nit is possible to specify size and color separately"
+ set view map
+ unset hidden3d
+-splot 'world.dat' using 1:2:(0) with lines lt 3, \
+-      'world.cor' using 1:2:(0.5-rand(0)):(5.*rand(0)) with points pt 5 ps var lt palette
++splot '@@GNUPLOTDEMOPATH@@world.dat' using 1:2:(0) with lines lt 3, \
++      '@@GNUPLOTDEMOPATH@@world.cor' using 1:2:(0.5-rand(0)):(5.*rand(0)) with points pt 5 ps var lt palette
+ pause -1 "Hit return to continue"
+ 
+ #
+@@ -38,8 +38,8 @@
+ set urange [-90:90]
+ set vrange [0:360]
+ splot cos(u)*cos(v),cos(u)*sin(v),sin(u) with lines lt 5,\
+-      'world.dat' with lines lt 3, \
+-      'world.cor' using 1:2:(1):(5.*rand(0)) with points lt 1 pt 6 ps variable
++      '@@GNUPLOTDEMOPATH@@world.dat' with lines lt 3, \
++      '@@GNUPLOTDEMOPATH@@world.cor' using 1:2:(1):(5.*rand(0)) with points lt 1 pt 6 ps variable
+ pause -1 "Hit return to continue"
+ 
+ #
+@@ -52,8 +52,8 @@
+ set arrow from -1.2, 0, 0 to 1.2, 0, 0 nohead lt 5 lw 1 
+ set arrow from 0, -1.2, 0 to 0, 1.2, 0 nohead lt 5 lw 1
+ splot cos(u)*cos(v),-cos(u)*sin(v),sin(u) with lines lt 5,\
+-      'world.dat' u 1:2:(1.001) with lines lt 3, \
+-      'world.cor' using 1:2:(1):(5.*rand(0))  with points lt 1 pt 6 ps var
++      '@@GNUPLOTDEMOPATH@@world.dat' u 1:2:(1.001) with lines lt 3, \
++      '@@GNUPLOTDEMOPATH@@world.cor' using 1:2:(1):(5.*rand(0))  with points lt 1 pt 6 ps var
+ 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
+@@ -17,7 +17,7 @@
+ print "                      Press Ctrl-C to exit right now"
+ pause -1 "                      Press Return to start demo ..."
+ 
+-load "stat.inc"
++load '@@GNUPLOTDEMOPATH@@stat.inc'
+ 
+ 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
+@@ -79,7 +79,7 @@
+ #
+ # Load terminal-independent colorwheel (HSV full saturation)
+ #
+-load 'colorwheel.dem'
++load '@@GNUPLOTDEMOPATH@@colorwheel.dem'
+ #
+ # define line styles using macros and a fixed palette
+ #
+--- demo/random.dem
++++ demo/random.dem	2007-08-15 21:15:37.000000000 +0200
+@@ -79,7 +79,7 @@
+ pause -1 "Hit return to continue"
+ unset contour
+ 
+-load "stat.inc"
++load "@@GNUPLOTDEMOPATH@@stat.inc"
+ 
+ print ""
+ print "Simple Monte Carlo simulation"
+--- demo/rgb_variable.dem
++++ demo/rgb_variable.dem	2007-08-16 10:40:03.000000000 +0200
+@@ -12,7 +12,7 @@
+ #
+ rgb(r,g,b) = int(r)*65536 + int(g)*256 + int(b)
+ #
+-splot 'rgb_variable.dat' using 1:2:3:(rgb($1,$2,$3)) with points pt 7 ps 4 lc rgb variable, \
++splot '@@GNUPLOTDEMOPATH@@rgb_variable.dat' using 1:2:3:(rgb($1,$2,$3)) with points pt 7 ps 4 lc rgb variable, \
+       '' using 1:2:3:(sprintf("0x%x",rgb($1,$2,$3))) with labels left offset 1 notitle
+ pause -1 "Hit return to continue"
+ #
+@@ -23,7 +23,7 @@
+ if (0 == int('0x01')) \
+    set label 99 at screen .05, screen .15 "If you see only black dots,\nthis means your platform does not \nsupport reading hexadecimal constants\nfrom a data file. Get a newer libc."
+ 
+-splot 'rgb_variable.dat' using 1:2:3:(5*rand(0)):4 with points pt 7 ps variable lc rgb variable \
++splot '@@GNUPLOTDEMOPATH@@rgb_variable.dat' using 1:2:3:(5*rand(0)):4 with points pt 7 ps variable lc rgb variable \
+       title "variable pointsize and rgb color read as hexidecimal"
+ 
+ pause -1 "Hit return to continue"
+@@ -38,7 +38,7 @@
+ set zzeroaxis lt -1 lc rgb "blue" lw 2
+ set xyplane at 0.0
+ 
+-splot 'rgb_variable.dat' using 1:2:3:(5*rand(0)):(rgb($1,$2,$3)) with points pt 7 ps variable lc rgb variable \
++splot '@@GNUPLOTDEMOPATH@@rgb_variable.dat' using 1:2:3:(5*rand(0)):(rgb($1,$2,$3)) with points pt 7 ps variable lc rgb variable \
+       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
+@@ -13,48 +13,48 @@
+ set style data points
+ set xlabel "data style point - no dgrid"
+ set key box
+-splot "hemisphr.dat"
++splot "@@GNUPLOTDEMOPATH@@hemisphr.dat"
+ pause -1 "Hit return to continue (1)"
+ 
+ set dgrid3d 10,10,1
+ set xlabel " data style lines, dgrid3d 10,10,1"
+ set style data lines
+-splot "hemisphr.dat"
++splot "@@GNUPLOTDEMOPATH@@hemisphr.dat"
+ pause -1 "Hit return to continue (2)"
+ 
+ set dgrid3d ,,4
+ set xlabel " data style lines, dgrid3d ,,4 "
+ set style data lines
+-splot "hemisphr.dat"
++splot "@@GNUPLOTDEMOPATH@@hemisphr.dat"
+ pause -1 "Hit return to continue (3)"
+ 
+ set dgrid3d ,,16
+ set xlabel " data style lines, dgrid3d ,,16"
+ set style data lines
+-splot "hemisphr.dat"
++splot "@@GNUPLOTDEMOPATH@@hemisphr.dat"
+ pause -1 "Hit return to continue (4)"
+ 
+ set contour
+ set xlabel "data style lines, dgrid3d ,,16, contour"
+-splot "hemisphr.dat"
++splot "@@GNUPLOTDEMOPATH@@hemisphr.dat"
+ pause -1 "Hit return to continue (5)"
+ 
+ unset dgrid3d
+ set style data points
+ set xlabel "data style points, nodgrid3d"
+-splot "scatter2.dat"
++splot "@@GNUPLOTDEMOPATH@@scatter2.dat"
+ pause -1 "Hit return to continue (6)"
+ 
+ set key nobox
+ set dgrid3d ,,1
+ set xlabel "data style lines, dgrid3d ,,1"
+ set style data lines
+-splot "scatter2.dat"
++splot "@@GNUPLOTDEMOPATH@@scatter2.dat"
+ pause -1 "Hit return to continue (7)"
+ 
+ set dgrid3d ,,4
+ set xlabel "data style lines, dgrid3d ,,4"
+ set style data lines
+-splot "scatter2.dat"
++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
+@@ -4,7 +4,7 @@
+ # Requires data files "[123].dat" from this directory,
+ # so change current working directory to this directory before running.
+ # gnuplot> set term <term-type>
+-# gnuplot> load 'simple.dem'
++# gnuplot> load '@@GNUPLOTDEMOPATH@@simple.dem'
+ #
+ set key left box
+ set samples 400
+@@ -37,10 +37,10 @@
+ plot [-30:20] sin(x*20)*atan(x)
+ pause -1 "Hit return to continue"
+ 
+-plot [-19:19] '1.dat'with impulses ,'2.dat' ,'3.dat' with lines
++plot [-19:19] '@@GNUPLOTDEMOPATH@@1.dat'with impulses ,'@@GNUPLOTDEMOPATH@@2.dat' ,'@@GNUPLOTDEMOPATH@@3.dat' with lines
+ pause -1 "Hit return to continue"
+ f(x) = x/100
+-plot [-19:19] '1.dat'with impulses ,'2.dat' thru f(x) ,'3.dat' with lines
++plot [-19:19] '@@GNUPLOTDEMOPATH@@1.dat'with impulses ,'@@GNUPLOTDEMOPATH@@2.dat' thru f(x) ,'@@GNUPLOTDEMOPATH@@3.dat' with lines
+ pause -1 "Hit return to continue"
+ reset
+ 
+--- demo/singulr.dem
++++ demo/singulr.dem	2007-08-15 20:59:07.000000000 +0200
+@@ -163,14 +163,14 @@
+ set ticslevel 0.
+ set view 50,15	#HBB: ,1,1.7
+ set title "Klein bottle, glassblowers' version (look-through)"
+-splot "klein.dat"
++splot "@@GNUPLOTDEMOPATH@@klein.dat"
+ pause -1 "Hit return to continue (19)"
+ 
+ 
+ set hidden3d
+ set view 70,305
+ set title "Klein bottle, glassblowers' version (solid)"
+-splot "klein.dat"
++splot "@@GNUPLOTDEMOPATH@@klein.dat"
+ pause -1 "Hit return to continue (20)"
+ 
+ reset
+--- demo/starmap.dem
++++ demo/starmap.dem	2007-08-15 20:59:07.000000000 +0200
+@@ -14,7 +14,7 @@
+ set title "Gliese star catalog - 7 parsec neighborhood centered on Earth"
+ set cblabel "Luminosity" offset 0,1
+ #
+-splot 'nearmap.csv' using 5:6:7:11 with points pt 6 ps 2 pal notitle, \
++splot '@@GNUPLOTDEMOPATH@@nearmap.csv' using 5:6:7:11 with points pt 6 ps 2 pal notitle, \
+       ''            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
+@@ -8,16 +8,16 @@
+ # function.
+ 
+ set title "Compare steps, fsteps and histeps"
+-plot [0:12][0:13] "steps.dat" notitle with points,  \
+- "steps.dat" title 'steps' with steps, \
+- 'steps.dat' title 'fsteps' with fsteps, \
+- 'steps.dat' title 'histeps' with histeps
++plot [0:12][0:13] '@@GNUPLOTDEMOPATH@@steps.dat' notitle with points,  \
++ '@@GNUPLOTDEMOPATH@@steps.dat' title 'steps' with steps, \
++ '@@GNUPLOTDEMOPATH@@steps.dat' title 'fsteps' with fsteps, \
++ '@@GNUPLOTDEMOPATH@@steps.dat' title 'histeps' with histeps
+ 
+ pause -1 "Hit return for demonstration of automatic histogram creation"
+ set title "Histogram built from unsorted data by 'smooth frequency'"
+ set ylabel 'counts per bin'
+ set xlabel 'bins'
+-plot 'hemisphr.dat' u (floor($1*20)):(1) smooth frequency with histeps
++plot '@@GNUPLOTDEMOPATH@@hemisphr.dat' u (floor($1*20)):(1) smooth frequency with histeps
+ unset xlabel
+ unset ylabel
+ 
+--- demo/stringvar.dem
++++ demo/stringvar.dem	2007-08-15 21:03:04.000000000 +0200
+@@ -73,7 +73,7 @@
+ #
+ set xrange [300:400]
+ set title "String-valued expression in using spec"
+-plot 'silver.dat' using 1:2 with linespoints notitle, \
++plot '@@GNUPLOTDEMOPATH@@silver.dat' using 1:2 with linespoints notitle, \
+      '' using 1:2:(sprintf("[%.0f,%.0f]",$1,$2)) with labels
+ #
+ pause -1 "Hit return to continue"
+@@ -84,7 +84,7 @@
+ set xrange [250:500]
+ set auto y
+ set style data lines
+-plot 'silver.dat' u 1:2:($3+$1/50.) w filledcurves above title 'Above', \
++plot '@@GNUPLOTDEMOPATH@@silver.dat' u 1:2:($3+$1/50.) w filledcurves above title 'Above', \
+      '' u 1:2:($3+$1/50.) w filledcurves below title 'Below', \
+      '' u 1:2 lt -1 lw 0.5 notitle, \
+      '' u 1:($3+$1/50.) lt 3 lw 0.5 notitle, \
+@@ -93,7 +93,7 @@
+ #
+ pause -1 "Hit return to continue"
+ #
+-plot 'silver.dat' \
++plot '@@GNUPLOTDEMOPATH@@silver.dat' \
+         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
+@@ -171,34 +171,34 @@
+ set style data lines
+ set title "Data grid plotting"
+ set parametric
+-splot "glass.dat"
++splot '@@GNUPLOTDEMOPATH@@glass.dat'
+ pause -1 "Hit return to continue (19)"
+-splot "glass.dat" using 3:2:1
++splot '@@GNUPLOTDEMOPATH@@glass.dat' using 3:2:1
+ pause -1 "Hit return to continue (20)"
+ set zrange [-1.2:1.2]
+ set ticslevel 0.5
+ unset parametric
+ set xlabel "line index within group"
+ set ylabel "group index"
+-splot "glass.dat" using 1, "glass.dat" using 2, "glass.dat" using 3
++splot '@@GNUPLOTDEMOPATH@@glass.dat' using 1, '@@GNUPLOTDEMOPATH@@glass.dat' using 2, '@@GNUPLOTDEMOPATH@@glass.dat' using 3
+ pause -1 "Hit return to continue (21)"
+ set title "splot of part of a data file"
+ set xlabel "X axis" offset -3,-2
+ set ylabel "Y axis" offset 3,-2
+ set hidden3d
+-splot 'glass.dat' every 2::0::12 with lines
++splot '@@GNUPLOTDEMOPATH@@glass.dat' every 2::0::12 with lines
+ pause -1 "Hit return to continue (22)"
+ set title "splot with \"set pm3d\" (implemented with some terminals)"
+ set pm3d
+ set hidden3d
+-splot 'glass.dat' every 2::0::12 with lines
++splot '@@GNUPLOTDEMOPATH@@glass.dat' every 2::0::12 with lines
+ pause -1 "Hit return to continue (23)"
+ unset hidden3d
+ unset pm3d
+ set param
+ set title "Test of spherical coordinates"
+ set mapping spherical
+-splot "glass.dat"
++splot '@@GNUPLOTDEMOPATH@@glass.dat'
+ pause -1 "Hit return to continue (24)"
+ 
+ # mandelbrot demo
+--- demo/timedat.dem
++++ demo/timedat.dem	2007-08-15 20:59:07.000000000 +0200
+@@ -13,10 +13,10 @@
+ set format x "%d/%m\n%H:%M"
+ set grid
+ set key left
+-plot 'timedat.dat' using 1:3 t '', \
+-     'timedat.dat' using 1:3 t 'Total P' with points, \
+-     'timedat.dat' using 1:4 t '', \
+-     'timedat.dat' using 1:4 t 'PO4' with points 
++plot '@@GNUPLOTDEMOPATH@@timedat.dat' using 1:3 t '', \
++     '@@GNUPLOTDEMOPATH@@timedat.dat' using 1:3 t 'Total P' with points, \
++     '@@GNUPLOTDEMOPATH@@timedat.dat' using 1:4 t '', \
++     '@@GNUPLOTDEMOPATH@@timedat.dat' using 1:4 t 'PO4' with points 
+ pause -1 "Hit return to continue"
+ 
+ reset
+--- demo/using.dem
++++ demo/using.dem	2007-08-15 20:59:07.000000000 +0200
+@@ -1,15 +1,15 @@
+ #
+ # $Id: using.dem,v 1.6 2003/10/28 05:35:54 sfeam Exp $
+ #
+-# Requires data file "using.dat" from this directory,
++# Requires data file "@@GNUPLOTDEMOPATH@@using.dat" from this directory,
+ # so change current working directory to this directory before running.
+ #
+ 
+ set title "Convex     November 1-7 1989    Circadian"
+ set key left box
+ set xrange[-1:24]
+-plot 'using.dat' using 2:4 title "Logged in" with impulses,\
+-     'using.dat' using 2:4 title "Logged in" with points
++plot '@@GNUPLOTDEMOPATH@@using.dat' using 2:4 title "Logged in" with impulses,\
++     '@@GNUPLOTDEMOPATH@@using.dat' using 2:4 title "Logged in" with points
+ pause -1 "Hit return to continue"
+ 
+ set xrange [1:8]
+@@ -17,9 +17,9 @@
+ set title "Convex     November 1-7 1989"
+ set key below
+ set label "(Weekend)" at 5,25 center
+-plot 'using.dat' using 3:4 title "Logged in" with impulses,\
+-     'using.dat' using 3:5 t "Load average" with points,\
+-     'using.dat' using 3:6 t "%CPU used" with lines
++plot '@@GNUPLOTDEMOPATH@@using.dat' using 3:4 title "Logged in" with impulses,\
++     '@@GNUPLOTDEMOPATH@@using.dat' using 3:5 t "Load average" with points,\
++     '@@GNUPLOTDEMOPATH@@using.dat' using 3:6 t "%CPU used" with lines
+ 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
+@@ -10,7 +10,7 @@
+ unset ytics
+ #
+ # plot world map and correspondent locations as a +
+-plot 'world.dat' with lines lt 3 , 'world.cor' with points lt 1 pt 2
++plot '@@GNUPLOTDEMOPATH@@world.dat' with lines lt 3 , '@@GNUPLOTDEMOPATH@@world.cor' with points lt 1 pt 2
+ set title ""
+ set key on
+ set border
+@@ -31,7 +31,7 @@
+ set urange [-90:90]
+ set vrange [0:360]
+ splot cos(u)*cos(v),cos(u)*sin(v),sin(u) with lines lt 5 ,\
+-'world.dat' with lines lt 3 , 'world.cor' with points lt 1 pt 2
++'@@GNUPLOTDEMOPATH@@world.dat' with lines lt 3 , '@@GNUPLOTDEMOPATH@@world.cor' with points lt 1 pt 2
+ pause -1 "Hit return to continue"
+ 
+ # HBB 20000715: new demo:
+@@ -43,7 +43,7 @@
+ set arrow from -1.2, 0, 0 to 1.2, 0, 0 nohead lt 5 lw 1 
+ set arrow from 0, -1.2, 0 to 0, 1.2, 0 nohead lt 5 lw 1
+ splot cos(u)*cos(v),-cos(u)*sin(v),sin(u) with lines lt 5 ,\
+-'world.dat' u 1:2:(1.001) with lines lt 3 , 'world.cor' with points lt 1 pt 2
++'@@GNUPLOTDEMOPATH@@world.dat' u 1:2:(1.001) with lines lt 3 , '@@GNUPLOTDEMOPATH@@world.cor' with points lt 1 pt 2
+ pause -1 "Hit return to continue"
+ 
+ unset arrow
+@@ -61,6 +61,6 @@
+ set urange [-180:180]
+ set vrange [-90:90]
+ splot cos(u),sin(u),v with lines lt 5 ,\
+-'world.dat' with lines lt 3 , 'world.cor' with points lt 1 pt 2
++'@@GNUPLOTDEMOPATH@@world.dat' with lines lt 3 , '@@GNUPLOTDEMOPATH@@world.cor' with points lt 1 pt 2
+ pause -1 "Hit return to continue"
+ reset
diff --git a/gnuplot.changes b/gnuplot.changes
index 2b23f0c..e5510ac 100644
--- a/gnuplot.changes
+++ b/gnuplot.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Sep  5 17:02:11 CEST 2007 - werner@suse.de
+
+- Correct name of app-defaults file
+- Make samples in demo directory usable from any path
+  thanks goes to Dieter Jurzitza
+
 -------------------------------------------------------------------
 Wed May 30 16:12:19 CEST 2007 - werner@suse.de
 
diff --git a/gnuplot.spec b/gnuplot.spec
index 83a378d..5fb49cf 100644
--- a/gnuplot.spec
+++ b/gnuplot.spec
@@ -13,12 +13,12 @@
 Name:           gnuplot
 BuildRequires:  cairo-devel freetype2-devel gcc-c++ gd-devel gtk2-devel latex2html libjpeg-devel libpng-devel pango-devel plotutils readline-devel texlive-latex wxGTK-devel xorg-x11-devel
 URL:            http://www.gnuplot.info/
-License:        BSD License and BSD-like, Einschraenkungen bei modifiziertem Code:
+License:        BSD 3-Clause, Change notification
 Group:          Productivity/Graphics/Visualization/Graph
 Autoreqprov:    on
 PreReq:         %install_info_prereq
 Version:        4.2.0
-Release:        26
+Release:        60
 Summary:        Function Plotting Utility
 Source0:        gnuplot-4.2.0.tar.bz2
 Source2:        gnuplot-fr.doc.bz2
@@ -27,6 +27,7 @@ Patch0:         gnuplot-4.2.0.dif
 Patch1:         gnuplot-4.2.0-x11ovf.dif
 Patch2:         gnuplot-4.2.0-fonts.dif
 Patch3:         gnuplot-4.2.0-wxt.dif
+Patch4:         gnuplot-4.2.0-demo.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"
@@ -66,6 +67,7 @@ test $? -eq 0 || exit 1
 %patch -P 3 -p 0
 %patch -P 0 -p 0
 %patch -P 2 -p 0
+%patch -P 4 -p 0
 
 %build
     SECSVGA="-DSVGA_IS_SECURE=1"
@@ -145,6 +147,12 @@ test $? -eq 0 || exit 1
     install -m 0444 NEWS VERSION BUGS $RPM_BUILD_ROOT/%{_docdir}/gnuplot/
     install -m 0444 %{SOURCE3}        $RPM_BUILD_ROOT/%{_docdir}/gnuplot/
     rm -f $RPM_BUILD_ROOT/%{_docdir}/gnuplot/demo/Makefile*
+    mv -f $RPM_BUILD_ROOT/%_appdef/Gnuplot.app-defaults $RPM_BUILD_ROOT/%_appdef/Gnuplot
+    for dem in $RPM_BUILD_ROOT/%{_docdir}/gnuplot/demo/* ; do
+	sed "s|@@GNUPLOTDEMOPATH@@|%{_docdir}/gnuplot/demo/|g" < ${dem} > ${dem}.tmp
+	touch -r ${dem}  ${dem}.tmp
+	mv -f ${dem}.tmp ${dem}
+    done
 
 %clean
     rm -rf $RPM_BUILD_ROOT
@@ -164,9 +172,13 @@ test $? -eq 0 || exit 1
 %doc %{_mandir}/man1/gnuplot.1.gz
 %{_datadir}/gnuplot
 %{_datadir}/texmf/tex/latex/gnuplot/
-%{_appdef}/Gnuplot.app-defaults
+%{_appdef}/Gnuplot
 
 %changelog
+* Wed Sep 05 2007 - werner@suse.de
+- Correct name of app-defaults file
+- Make samples in demo directory usable from any path
+  thanks goes to Dieter Jurzitza
 * Wed May 30 2007 - werner@suse.de
 - Overwrite empty default font for UTF-8 locale (bug #277876)
 - Get html docs fully build and installed