rpm/gnuplot
SHA256
1
0
Fork 0
forked from pool/gnuplot
Code Pull Requests Activity

Accepting request 282275 from home:burnus:branches:Publishing

Browse Source 
Update to gnuplot 5.0.0

OBS-URL: https://build.opensuse.org/request/show/282275
OBS-URL: https://build.opensuse.org/package/show/Publishing/gnuplot?expand=0&rev=59
This commit is contained in:
Dr. Werner Fink 2015-01-23 14:40:26 +00:00 committed by Git OBS Bridge
parent ae9e591a29
commit 011db28dee
11 changed files with 887 additions and 315 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gnuplot-4.4.0-x11ovf.dif
View File

@ -1,6 +1,6 @@
--- src/gplt_x11.c.orig 2012-05-07 18:53:08.000000000 +0200
+++ src/gplt_x11.c 2012-11-06 10:24:58.000000000 +0100
@@ -900,6 +900,8 @@
--- src/gplt_x11.c.orig 2015-01-21 20:03:55.735504922 +0100
+++ src/gplt_x11.c 2015-01-21 20:04:14.327506641 +0100
@@ -951,6 +951,8 @@
nfds = cn + 1;
while (1) {
@ -9,7 +9,7 @@
XFlush(dpy); /* see above */
FD_ZERO(&tset);
@@ -937,7 +939,11 @@
@@ -988,7 +990,11 @@
process_event(&xe);
}
}
@ -22,7 +22,7 @@
unlink(X11_ipcpath);
record();
fclose(X11_ipc);
@@ -1160,8 +1166,8 @@
@@ -1216,8 +1222,8 @@
static int
read_input()
{

21
gnuplot-4.6.0-backtick.diff
View File

@ -1,21 +0,0 @@
--- ../gnuplot-4.6.1.orig/lisp/gnuplot.el 2012-09-18 23:33:37.000000000 +0200
+++ lisp/gnuplot.el 2012-11-06 11:19:15.000000000 +0100
@@ -343,15 +343,15 @@
nil
(defmacro defface (var values doc &rest args)
`(progn
- (defvar (, var) (quote (, var)))
+ (defvar ,var (quote ,var))
;; To make colors for your faces you need to set your .Xdefaults
;; or set them up ahead of time in your .emacs file.
- (make-face (, var))
+ (make-face ,var)
)))
(if (fboundp 'defcustom)
nil
(defmacro defcustom (var value doc &rest args)
- `(defvar (, var) (, value) (, doc))))))
+ `(defvar ,var ,value ,doc)))))
;; (eval-and-compile
;; (condition-case ()

224
gnuplot-4.6.0-demo.diff
View File

@ -1,61 +1,51 @@
--- 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 ;
diff -ur ../gnuplot-5.0.0.orig/demo/fit.dem ./demo/fit.dem
--- ../gnuplot-5.0.0.orig/demo/fit.dem 2014-09-21 06:54:31.000000000 +0200
+++ ./demo/fit.dem 2015-01-21 20:35:15.303678726 +0100
@@ -10,6 +10,7 @@
+random="`mktemp /tmp/random.XXXXXX`
unset key
set xrange [-8:8]
@@ -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.
-plot 'random.tmp' using (1.5 + $1*cos(A)-2.*$2*sin(A)):(1.0 + $1*sin(A)+2.*$2*cos(A)) with dots
+plot random using (1.5 + $1*cos(A)-2.*$2*sin(A)):(1.0 + $1*sin(A)+2.*$2*cos(A)) with dots
pause -1 "Hit return to continue"
--- 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."
print ""
print "Some examples how data fitting using nonlinear least squares fit can be done."
print ''
+logfile = "`mktemp /tmp/fit.log.XXXXXX`"
pause -1 "first plotting the pure data set (-> return)"
reset
print "We fit a straight line to the data -- only as a demo without physical meaning."
l(x) = y0 + m*x
@@ -29,6 +30,7 @@
plot 'lcdemo.dat', l(x)
pause -1 "Now start fitting... (-> return)"
+set fit logfile logfile
set title 'data for first fit demo'
set xlabel "Temperature T [deg Cels.]"
set ylabel "Density [g/cm3]"
@@ -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'
fit l(x) 'lcdemo.dat' via y0, m
set title 'unweighted fit'
plot 'lcdemo.dat', l(x)
@@ -167,7 +169,7 @@
fit f(x,y) 'soundvel.dat' using 1:-2:2 via 'sound.par'
#create soundfit.par, reading from sound.par and updating values
-update 'sound.par' 'soundfit.par'
+update 'sound.par' "`mktemp /tmp/soundfit.par.XXXXXX`"
print ""
pause -1 "(-> return)"
set title 'pseudo-3d multi-branch fit to velocity data'
@@ -251,6 +253,7 @@ print ""
pause -1 "Hit return to continue"
plot 'soundvel.dat', vlong(x), vtrans(x)
print ''
@@ -323,6 +325,7 @@
pause -1 "Press enter to proceed with the next example."
reset
+set fit logfile logfile
set xlabel 'x'
set ylabel 'y'
set zlabel 'z'
@@ -340,3 +343,4 @@ print "from time to time!"
print ""
print "\n"
print "The fit command can handle errors in the independent variable, too."
print "The problem shown here is Pearson's data with York's weights.\n"
@@ -428,6 +431,7 @@
print ''
pause -1 "Done with fitting demo (-> return)"
reset
+set fit logfile logfile
--- demo/poldat.dem
+++ demo/poldat.dem 2012-03-15 11:05:54.000000000 +0000
@@ -11,7 +11,7 @@ unset grid
set encoding myencoding
# release datablock
undefine $PearsonYork
diff -ur ../gnuplot-5.0.0.orig/demo/poldat.dem ./demo/poldat.dem
--- ../gnuplot-5.0.0.orig/demo/poldat.dem 2014-07-23 18:56:13.000000000 +0200
+++ ./demo/poldat.dem 2015-01-21 20:27:11.764634013 +0100
@@ -11,7 +11,7 @@
unset polar
set title "Primitive Smith Chart"
unset key
@ -64,80 +54,17 @@
set para
set rrange [-0 : 10]
set trange [-pi : pi]
--- 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.
-set print "random.tmp"
+random="`mktemp /tmp/random.XXXXXX`"
+set print random
do for [i=1:nsamp] {
print sprintf("%8.5g %8.5g", invnorm(rand(0)), invnorm(rand(0)))
}
@@ -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", \
- "random.tmp" using 1:2:(-0.2) with points pointtype 7 lc rgb "black"
+ random using 1:2:(-0.2) with points pointtype 7 lc rgb "black"
pause -1 "Hit return to continue"
unset contour
unset parametric
@@ -96,7 +97,7 @@ xlow = -3.0
xhigh = 3.0
scale = (binwidth/(xhigh-xlow))
# Generate N random data points.
-set print "random.tmp"
+set print random
do for [i=1:nsamp] {
print sprintf("%8.5g %8.5g", invnorm(rand(0)), (1.0*scale/nsamp))
}
@@ -110,7 +111,7 @@ set grid
set xrange [-3:3]
set yrange [0:0.45]
bin(x) = (1.0/scale)*floor(x*scale)
-plot "random.tmp" using (bin($1)):2 smooth frequency with steps \
+plot random using (bin($1)):2 smooth frequency with steps \
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 @@ print ""
reset
nsamp = 3000
# Generate N random data points.
-set print "random.tmp"
+set print random
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 @@ 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
-splot "random.tmp" every :::::0 with dots
+splot random every :::::0 with dots
if (!oneplot) pause -1 "Hit return to continue"
unset parametric
@@ -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)
-plot "random.tmp" using (bin(sqrt($1**2+$2**2+$3**2))):(1.0*scale/nsamp) every :::::0 smooth frequency with steps \
+plot random using (bin(sqrt($1**2+$2**2+$3**2))):(1.0*scale/nsamp) every :::::0 smooth frequency with steps \
title "scaled bin frequency", \
maxwell(x, 1/sqrt(2)) with lines title "Maxwell p.d.f."
#
--- demo/simple.dem
+++ demo/simple.dem 2012-03-15 11:05:54.000000000 +0000
@@ -7,12 +7,11 @@
# gnuplot> load 'simple.dem'
diff -ur ../gnuplot-5.0.0.orig/demo/simple.dem ./demo/simple.dem
--- ../gnuplot-5.0.0.orig/demo/simple.dem 2012-11-19 18:35:09.000000000 +0100
+++ ./demo/simple.dem 2015-01-21 20:38:52.998698856 +0100
@@ -8,14 +8,13 @@
#
set title "Simple Plots" font ",20"
set key left box
-set samples 50
+set samples 400
set style data points
plot [-10:10] sin(x),atan(x),cos(atan(x))
pause -1 "Hit return to continue"
@ -146,8 +73,9 @@
plot [-pi/2:pi] cos(x),-(sin(x) > sin(x+1) ? sin(x) : sin(x+1))
pause -1 "Hit return to continue"
--- demo/stringvar.dem
+++ demo/stringvar.dem 2012-03-15 11:05:54.000000000 +0000
diff -ur ../gnuplot-5.0.0.orig/demo/stringvar.dem ./demo/stringvar.dem
--- ../gnuplot-5.0.0.orig/demo/stringvar.dem 2014-09-09 05:35:33.000000000 +0200
+++ ./demo/stringvar.dem 2015-01-21 20:27:11.765634013 +0100
@@ -1,7 +1,8 @@
#
# Miscellaneous neat things you can do using the string variables code
@ -158,8 +86,8 @@
print ""
print "Exercise substring handling"
print ""
@@ -24,7 +25,7 @@ print "(foo.foo)[2:2]= ",(foo.foo)[2:2]
print ""
@@ -27,7 +28,7 @@
unset print
-set label 1 system("cat stringvar.tmp") at graph 0.1, graph 0.9
@ -167,7 +95,7 @@
unset xtics
unset ytics
set yrange [0:1]
@@ -33,7 +34,7 @@ plot 0
@@ -36,7 +37,7 @@
pause -1 "Hit return to continue"
@ -176,7 +104,7 @@
print "Exercise string handling functions"
print ""
print "foo = ",foo
@@ -62,7 +63,7 @@ if (strlen(foo) != 245) print "sprintf o
@@ -65,7 +66,7 @@
print ""
unset print
@ -185,47 +113,10 @@
unset xtics
unset ytics
set yrange [0:1]
--- 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"
-set table "equipo2.tmp"
+equipo2="`mktemp /tmp/equipo2.XXXXXX`"
+set table equipo2
replot
unset table
reset
pause 0
-plot "equipo2.tmp" w l
+plot equipo2 w l
print "Now create a x/y datafile for plotting with vectors "
print "and display vectors parallel to the electrostatic field"
pause -1 "Hit return to continue"
set isosam 31,31
-set table "field2xy.tmp"
+field2xy="`mktemp /tmp/field2xy.XXXXXX`"
+set table field2xy
splot vtot(x,y) w l
unset table
pause 0
@@ -84,8 +86,8 @@ set xr [xmin:xmax]
set yr [ymin:ymax]
set isosam 31,31
set key under Left reverse
-plot "field2xy.tmp" u 1:2:(coef*dx1($1,$2)):(coef*dy1($1,$2)) w vec, \
- "equipo2.tmp" w l
+plot field2xy u 1:2:(coef*dx1($1,$2)):(coef*dy1($1,$2)) w vec, \
+ equipo2 w l
pause -1 "Hit return to continue"
reset
--- src/show.c
+++ src/show.c 2012-03-15 11:05:54.000000000 +0000
@@ -1074,6 +1074,15 @@ show_version(FILE *fp)
diff -ur ../gnuplot-5.0.0.orig/src/show.c ./src/show.c
--- ../gnuplot-5.0.0.orig/src/show.c 2014-11-22 05:10:50.000000000 +0100
+++ ./src/show.c 2015-01-21 20:27:11.767634013 +0100
@@ -1038,6 +1038,15 @@
p /* type "help seeking-assistance" */
);
@ -241,9 +132,10 @@
/* show version long */
if (almost_equals(c_token, "l$ong")) {
--- src/variable.c
+++ src/variable.c 2012-03-15 11:05:54.000000000 +0000
@@ -37,7 +37,10 @@ static char *RCSid() { return RCSid("$Id
diff -ur ../gnuplot-5.0.0.orig/src/variable.c ./src/variable.c
--- ../gnuplot-5.0.0.orig/src/variable.c 2013-07-03 00:19:09.000000000 +0200
+++ ./src/variable.c 2015-01-21 20:27:11.767634013 +0100
@@ -37,7 +37,10 @@
/* The Death of Global Variables - part one. */
#include <string.h>
@ -255,7 +147,7 @@
#include "variable.h"
#include "alloc.h"
@@ -98,6 +101,17 @@ loadpath_handler(int action, char *path)
@@ -98,6 +101,17 @@
if (!loadpath)
{
char *envlib = getenv("GNUPLOT_LIB");
@ -273,7 +165,7 @@
if (envlib) {
int len = strlen(envlib);
loadpath = gp_strdup(envlib);
@@ -106,6 +120,10 @@ loadpath_handler(int action, char *path)
@@ -106,6 +120,10 @@
/* convert all PATHSEPs to \0 */
PATHSEP_TO_NUL(loadpath);
} /* else: NULL = empty */

38
gnuplot-4.6.0-fonts.diff
View File

@ -1,7 +1,7 @@
diff -upr ../gnuplot-4.6.2.orig/src/gplt_x11.c ./src/gplt_x11.c
--- ../gnuplot-4.6.2.orig/src/gplt_x11.c 2013-03-31 23:35:15.000000000 +0200
+++ ./src/gplt_x11.c 2013-03-31 23:35:57.000000000 +0200
@@ -104,15 +104,16 @@ static char *RCSid() { return RCSid("$Id
diff -p -u -r ../gnuplot-5.0.0.orig/src/gplt_x11.c src/gplt_x11.c
--- ../gnuplot-5.0.0.orig/src/gplt_x11.c 2014-12-15 05:24:07.000000000 +0100
+++ src/gplt_x11.c 2015-01-21 08:49:39.558763938 +0100
@@ -103,15 +103,16 @@ static char *RCSid() { return RCSid("$Id
* patches by Masahito Yamaga <ma@yama-ga.com>
*/
@ -18,9 +18,9 @@ diff -upr ../gnuplot-4.6.2.orig/src/gplt_x11.c ./src/gplt_x11.c
-#ifdef USE_X11_MULTIBYTE
-# include <X11/Xlocale.h>
-#endif
#include <X11/XKBlib.h> /* for XkbKeycodeToKeysym */
#include <assert.h>
#include "syscfg.h"
@@ -122,6 +123,12 @@ static char *RCSid() { return RCSid("$Id
#include "gplt_x11.h"
#include "version.h"
@ -34,27 +34,18 @@ diff -upr ../gnuplot-4.6.2.orig/src/gplt_x11.c ./src/gplt_x11.c
#ifdef EXPORT_SELECTION
# undef EXPORT_SELECTION
#endif /* EXPORT SELECTION */
@@ -482,7 +489,7 @@ static double mouse_to_axis __PROTO((int
static char *FallbackFont = "fixed";
#ifdef USE_X11_MULTIBYTE
static char *FallbackFontMB =
- "mbfont:*-medium-r-normal--14-*;*-medium-r-normal--16-*";
+ "mbfont:*-medium-r-normal--14-*,*-medium-r-normal--16-*";
# define FontSetSep ';'
static int usemultibyte = 0;
static int multibyte_fonts_usable=1;
@@ -499,8 +506,8 @@ static char *gpFallbackFont __PROTO((voi
@@ -523,8 +530,8 @@ static char *gpFallbackFont __PROTO((voi
static int gpXGetFontascent __PROTO((XFontStruct *cfont));
enum set_encoding_id encoding = S_ENC_DEFAULT; /* EAM - mirrored from core code by 'QE' */
-static char default_font[64] = { '\0' };
-static char default_font[196] = { '\0' };
-static char default_encoding[16] = { '\0' };
+static char default_font[256] = { '\0' };
+static char default_encoding[64] = { '\0' };
#define Nwidths 10
static unsigned int widths[Nwidths] = { 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
@@ -2116,6 +2123,8 @@ exec_cmd(plot_struct *plot, char *comman
static unsigned int widths[Nwidths] = { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
@@ -2287,6 +2294,8 @@ exec_cmd(plot_struct *plot, char *comman
/* Save the request default font */
c = &(buffer[strlen(buffer)-1]);
while (*c <= ' ') *c-- = '\0';
@ -63,7 +54,7 @@ diff -upr ../gnuplot-4.6.2.orig/src/gplt_x11.c ./src/gplt_x11.c
strncpy(default_font, &buffer[2], strlen(&buffer[2])+1);
FPRINTF((stderr, "gnuplot_x11: exec_cmd() set default_font to \"%s\"\n", default_font));
break;
@@ -5397,7 +5406,7 @@ XFontStruct *gpXLoadQueryFont (Display *
@@ -5757,7 +5766,7 @@ XFontStruct *gpXLoadQueryFont (Display *
}
#else
if (first_time) {
@ -72,7 +63,7 @@ diff -upr ../gnuplot-4.6.2.orig/src/gplt_x11.c ./src/gplt_x11.c
first_time = FALSE;
}
while (n_miss-- > 0)
@@ -5492,6 +5501,18 @@ char *fontname;
@@ -5912,6 +5921,18 @@ char *fontname;
}
#ifdef USE_X11_MULTIBYTE
@ -91,10 +82,9 @@ diff -upr ../gnuplot-4.6.2.orig/src/gplt_x11.c ./src/gplt_x11.c
if (fontname && strncmp(fontname, "mbfont:", 7) == 0) {
if (multibyte_fonts_usable) {
usemultibyte = 1;
Nur in ./src: gplt_x11.c.orig.
diff -upr ../gnuplot-4.6.2.orig/src/variable.c ./src/variable.c
--- ../gnuplot-4.6.2.orig/src/variable.c 2013-03-31 23:35:15.000000000 +0200
+++ ./src/variable.c 2013-03-31 23:35:57.000000000 +0200
diff -p -u -r ../gnuplot-5.0.0.orig/src/variable.c src/variable.c
--- ../gnuplot-5.0.0.orig/src/variable.c 2013-07-03 00:19:09.000000000 +0200
+++ src/variable.c 2015-01-21 08:47:20.056751038 +0100
@@ -282,6 +282,8 @@ static const struct path_table fontpath_
{ "$`kpsexpand '$TEXMFDIST'`/fonts/type1!" },
#endif

201
gnuplot-4.6.0.dif
View File

@ -1,7 +1,7 @@
diff -upr ../gnuplot-4.6.2.orig/configure.in ./configure.in
--- ../gnuplot-4.6.2.orig/configure.in 2013-03-31 23:12:33.000000000 +0200
+++ ./configure.in 2013-03-31 23:15:44.000000000 +0200
@@ -332,7 +332,7 @@ if test "$with_linux_vga" = yes; then
diff -upr ../gnuplot-5.0.0.orig/configure.in ./configure.in
--- ../gnuplot-5.0.0.orig/configure.in 2014-12-06 07:23:29.000000000 +0100
+++ ./configure.in 2015-01-21 19:43:16.398390320 +0100
@@ -369,7 +369,7 @@ if test "$with_linux_vga" = yes; then
[AC_DEFINE(LINUXVGA,1,
[ Define if this is a Linux system with SuperVGA library. ])
LINUXSUID='chown root $(bindir)/gnuplot; chmod u+s $(bindir)/gnuplot'
@ -10,69 +10,101 @@ diff -upr ../gnuplot-4.6.2.orig/configure.in ./configure.in
with_linux_vga=no)
fi
diff -upr ../gnuplot-4.6.2.orig/docs/Makefile.in ./docs/Makefile.in
--- ../gnuplot-4.6.2.orig/docs/Makefile.in 2013-03-31 23:12:33.000000000 +0200
+++ ./docs/Makefile.in 2013-03-31 23:15:44.000000000 +0200
diff -upr ../gnuplot-5.0.0.orig/docs/Makefile.am ./docs/Makefile.am
--- ../gnuplot-5.0.0.orig/docs/Makefile.am 2014-10-01 04:36:59.000000000 +0200
+++ ./docs/Makefile.am 2015-01-21 19:43:16.399390320 +0100
@@ -38,7 +38,7 @@
#
# default is what is needed for interactive gnuplot
-all: gnuplot.gih
+all: gnuplot.gih gnuplot-fr.gih gnuplot.info
-gih_DATA = gnuplot.gih
+gih_DATA = gnuplot.gih gnuplot-fr.gih
gihdir = @GIHDIR@
# this tells GNU make not to export variables into the environment
# But other makes dont understand its significance, so it must
@@ -243,10 +243,12 @@ html: htmldocs/gnuplot.html
# requires a working latex2html, which is hard to find these days
# htmldocs/gnuplot.html: $(srcdir)/gnuplot.tex
# mkdir -p htmldocs
+# ln -sf ../../VERSION htmldocs/
+# ln -sf ../toc_entr.sty htmldocs/
# latex2html -dir htmldocs -local_icons gnuplot
noinst_PROGRAMS = checkdoc doc2ipf doc2tex doc2gih doc2rnh doc2hlp \
@@ -86,7 +86,7 @@ gnuplot.ms doc2rnh gnuplot.rnh doc2rtf g
checkdoc gnuplot.txt gnuplot.tmp VERSION gnuplot.4tc gnuplot.4ct \
gnuplot.idv gnuplot.xref gnuplot.lg figures pdffigures.* \
wxhelp/*.html wxhelp/wgnuplot.htc windows/wgnuplot.htk gnuplot.pdf \
-gnuplot.htb gnuplot.texi gnuplot-eldoc.el $(ELCS)
+gnuplot.htb gnuplot.texi gnuplot-eldoc.el $(ELCS) gnuplot-fr.gih
htmldocs/gnuplot.html: $(srcdir)/gnuplot.dvi
- rm -f VERSION; ln -s ../VERSION .
+ ln -sf ../VERSION .
htlatex gnuplot
mkdir -p htmldocs
mv gnuplot.html gnuplot.css gnuplot*.png gnuplot.log htmldocs/
@@ -348,12 +350,16 @@ doc2hlp: doc2hlp.o termdoc.o
$(LINK) doc2hlp.o termdoc.o $(LIBS)
DISTFILES = $(DIST_COMMON) $(SOURCES) $(DOCHEADERS) $(EXTRA_DIST)
@@ -268,16 +268,20 @@ gnuplot.hlp: doc2hlp$(EXEEXT) $(srcdir)/
doc2hlp_SOURCES = doc2hlp.c termdoc.c
### gnuplot interactive help format
-gih: gnuplot.gih
+gih: gnuplot.gih gnuplot-fr.gih
gnuplot.gih: doc2gih $(srcdir)/gnuplot.doc
@rm -f alldoc2gih
./doc2gih $(srcdir)/gnuplot.doc gnuplot.gih
gnuplot.gih: doc2gih$(EXEEXT) $(srcdir)/gnuplot.doc
./doc2gih$(EXEEXT) $(srcdir)/gnuplot.doc gnuplot.gih
+gnuplot-fr.gih: doc2gih $(srcdir)/gnuplot-fr.doc
+ @rm -f alldoc2gih
+ ./doc2gih $(srcdir)/gnuplot-fr.doc gnuplot-fr.gih
+gnuplot-fr.gih: doc2gih$(EXEEXT) $(srcdir)/gnuplot-fr.doc
+ ./doc2gih$(EXEEXT) $(srcdir)/gnuplot-fr.doc gnuplot-fr.gih
+
doc2gih: doc2gih.o termdoc.o
$(LINK) doc2gih.o termdoc.o $(LIBS)
doc2gih_SOURCES = doc2gih.c termdoc.c
@@ -454,6 +460,7 @@ install: install-gih install-info instal
install-gih: gnuplot.gih
$(top_srcdir)/mkinstalldirs $(DESTDIR)$(GIHDIR)
$(INSTALL_DATA) gnuplot.gih $(DESTDIR)$(GIHDIR)/gnuplot.gih
+ $(INSTALL_DATA) gnuplot-fr.gih $(DESTDIR)$(GIHDIR)/gnuplot-fr.gih
# To include all terminals in the .gih file
-allgih: alldoc2gih$(EXEEXT) $(srcdir)/gnuplot.doc
+allgih: alldoc2gih$(EXEEXT) $(srcdir)/gnuplot.doc $(srcdir)/gnuplot-fr.doc
./alldoc2gih$(EXEEXT) $(srcdir)/gnuplot.doc gnuplot.gih
+ ./alldoc2gih$(EXEEXT) $(srcdir)/gnuplot-fr.doc gnuplot-fr.gih
install-pdf:
$(top_srcdir)/mkinstalldirs $(DESTDIR)$(GIHDIR)
@@ -483,6 +490,7 @@ uninstall: uninstall-gih uninstall-info
alldoc2gih_SOURCES = doc2gih.c termdoc.c
alldoc2gih_CPPFLAGS = -DALL_TERM_DOC $(AM_CPPFLAGS)
diff -upr ../gnuplot-5.0.0.orig/docs/Makefile.in ./docs/Makefile.in
--- ../gnuplot-5.0.0.orig/docs/Makefile.in 2015-01-01 20:27:52.000000000 +0100
+++ ./docs/Makefile.in 2015-01-21 19:43:16.400390321 +0100
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.14 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
# @configure_input@
uninstall-gih:
rm -f $(DESTDIR)$(GIHDIR)/gnuplot.gih
+ rm -f $(DESTDIR)$(GIHDIR)/gnuplot-fr.gih
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
@@ -406,7 +406,7 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
uninstall-pdf:
rm -f $(DESTDIR)$(GIHDIR)/gnuplot.pdf
diff -upr ../gnuplot-4.6.2.orig/docs/gnuplot-fr.doc ./docs/gnuplot-fr.doc
--- ../gnuplot-4.6.2.orig/docs/gnuplot-fr.doc 2013-03-31 23:12:33.000000000 +0200
+++ ./docs/gnuplot-fr.doc 2013-03-31 23:15:44.000000000 +0200
# default is what is needed for interactive gnuplot
-gih_DATA = gnuplot.gih
+gih_DATA = gnuplot.gih gnuplot-fr.gih
gihdir = @GIHDIR@
AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/term
T = $(top_srcdir)/term/
@@ -446,7 +446,7 @@ gnuplot.ms doc2rnh gnuplot.rnh doc2rtf g
checkdoc gnuplot.txt gnuplot.tmp VERSION gnuplot.4tc gnuplot.4ct \
gnuplot.idv gnuplot.xref gnuplot.lg figures pdffigures.* \
wxhelp/*.html wxhelp/wgnuplot.htc windows/wgnuplot.htk gnuplot.pdf \
-gnuplot.htb gnuplot.texi gnuplot-eldoc.el $(ELCS)
+gnuplot.htb gnuplot.texi gnuplot-eldoc.el $(ELCS) gnuplot-fr.gih
DISTFILES = $(DIST_COMMON) $(SOURCES) $(DOCHEADERS) $(EXTRA_DIST)
BUILT_SOURCES = allterm.h
@@ -1042,14 +1042,18 @@ gnuplot.hlp: doc2hlp$(EXEEXT) $(srcdir)/
./doc2hlp$(EXEEXT) $(srcdir)/gnuplot.doc gnuplot.hlp
### gnuplot interactive help format
-gih: gnuplot.gih
+gih: gnuplot.gih gnuplot-fr.gih
gnuplot.gih: doc2gih$(EXEEXT) $(srcdir)/gnuplot.doc
./doc2gih$(EXEEXT) $(srcdir)/gnuplot.doc gnuplot.gih
+gnuplot-fr.gih: doc2gih$(EXEEXT) $(srcdir)/gnuplot-fr.doc
+ ./doc2gih$(EXEEXT) $(srcdir)/gnuplot-fr.doc gnuplot-fr.gih
+
# To include all terminals in the .gih file
-allgih: alldoc2gih$(EXEEXT) $(srcdir)/gnuplot.doc
+allgih: alldoc2gih$(EXEEXT) $(srcdir)/gnuplot.doc $(srcdir)/gnuplot-fr.doc
./alldoc2gih$(EXEEXT) $(srcdir)/gnuplot.doc gnuplot.gih
+ ./alldoc2gih$(EXEEXT) $(srcdir)/gnuplot-fr.doc gnuplot-fr.gih
### wxhelp format
htb: gnuplot.htb
diff -upr ../gnuplot-5.0.0.orig/docs/gnuplot-fr.doc ./docs/gnuplot-fr.doc
--- ../gnuplot-5.0.0.orig/docs/gnuplot-fr.doc 2015-01-21 19:31:33.000000000 +0100
+++ ./docs/gnuplot-fr.doc 2015-01-21 19:59:22.858479689 +0100
@@ -436,8 +436,8 @@ C
#Home & same as \verb~^A~. \\
#Ctrl Home & same as \verb~^E~. \\
@ -84,10 +116,10 @@ diff -upr ../gnuplot-4.6.2.orig/docs/gnuplot-fr.doc ./docs/gnuplot-fr.doc
%c l .
%Touche fléchée@Fonction
%_
diff -upr ../gnuplot-4.6.2.orig/src/gadgets.h ./src/gadgets.h
--- ../gnuplot-4.6.2.orig/src/gadgets.h 2013-03-31 23:12:33.000000000 +0200
+++ ./src/gadgets.h 2013-03-31 23:15:44.000000000 +0200
@@ -424,7 +424,7 @@ extern TBOOLEAN clip_lines1;
diff -upr ../gnuplot-5.0.0.orig/src/gadgets.h ./src/gadgets.h
--- ../gnuplot-5.0.0.orig/src/gadgets.h 2014-07-14 19:06:00.000000000 +0200
+++ ./src/gadgets.h 2015-01-21 19:44:18.308396045 +0100
@@ -470,7 +470,7 @@ extern TBOOLEAN clip_lines1;
extern TBOOLEAN clip_lines2;
extern TBOOLEAN clip_points;
@ -96,27 +128,29 @@ diff -upr ../gnuplot-4.6.2.orig/src/gadgets.h ./src/gadgets.h
extern int samples_1;
extern int samples_2;
diff -upr ../gnuplot-4.6.3.orig/src/gplt_x11.c ./src/gplt_x11.c
--- ../gnuplot-4.6.3.orig/src/gplt_x11.c 2013-04-25 10:01:45.000000000 +0200
+++ ./src/gplt_x11.c 2013-04-25 09:58:02.000000000 +0200
@@ -2256,8 +2256,11 @@ exec_cmd(plot_struct *plot, char *comman
diff -upr ../gnuplot-5.0.0.orig/src/gplt_x11.c ./src/gplt_x11.c
--- ../gnuplot-5.0.0.orig/src/gplt_x11.c 2014-12-15 05:24:07.000000000 +0100
+++ ./src/gplt_x11.c 2015-01-21 19:55:05.112455855 +0100
@@ -2515,9 +2515,12 @@ exec_cmd(plot_struct *plot, char *comman
}
}
/* X11_justify_text(mode) - set text justification mode */
- else if (*buffer == 'J')
- sscanf(buffer, "J%4d", (int *) &plot->jmode);
- sscanf(buffer, "J%d", (int *) &plot->jmode);
-
+ else if (*buffer == 'J') {
+ int jmode;
+ sscanf(buffer, "J%4d", &jmode);
+ sscanf(buffer, "J%d", &jmode);
+ plot->jmode = jmode;
+ }
+
else if (*buffer == 'A')
sscanf(buffer + 1, "%lf", &plot->angle);
diff -upr ../gnuplot-4.6.2.orig/src/plot.c ./src/plot.c
--- ../gnuplot-4.6.2.orig/src/plot.c 2013-03-31 23:12:33.000000000 +0200
+++ ./src/plot.c 2013-03-31 23:15:44.000000000 +0200
@@ -215,6 +215,7 @@ static int asked_privi = 0;
diff -upr ../gnuplot-5.0.0.orig/src/plot.c ./src/plot.c
--- ../gnuplot-5.0.0.orig/src/plot.c 2014-12-31 05:32:09.000000000 +0100
+++ ./src/plot.c 2015-01-21 19:49:19.917423935 +0100
@@ -216,6 +216,7 @@ static int asked_privi = 0;
void
drop_privilege()
{
@ -124,7 +158,7 @@ diff -upr ../gnuplot-4.6.2.orig/src/plot.c ./src/plot.c
if (!asked_privi) {
euid = geteuid();
egid = getegid();
@@ -228,11 +229,13 @@ drop_privilege()
@@ -229,11 +230,13 @@ drop_privilege()
if (seteuid(ruid) == -1)
(void) fprintf(stderr, "seteuid(%d): %s\n",
(int) ruid, strerror(errno));
@ -138,7 +172,7 @@ diff -upr ../gnuplot-4.6.2.orig/src/plot.c ./src/plot.c
if (!asked_privi) {
euid = geteuid();
egid = getegid();
@@ -246,6 +249,7 @@ take_privilege()
@@ -247,6 +250,7 @@ take_privilege()
if (seteuid(euid) == -1)
(void) fprintf(stderr, "seteuid(%d): %s\n",
(int) euid, strerror(errno));
@ -146,7 +180,7 @@ diff -upr ../gnuplot-4.6.2.orig/src/plot.c ./src/plot.c
}
#endif /* LINUXVGA */
@@ -271,8 +275,8 @@ main(int argc, char **argv)
@@ -273,8 +277,8 @@ main(int argc, char **argv)
int i;
#ifdef LINUXVGA
@ -156,7 +190,7 @@ diff -upr ../gnuplot-4.6.2.orig/src/plot.c ./src/plot.c
#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 */
@@ -327,6 +331,22 @@ main(int argc, char **argv)
@@ -329,6 +333,22 @@ main(int argc, char **argv)
rl_getc_function = getc_wrapper;
#endif
@ -179,10 +213,10 @@ diff -upr ../gnuplot-4.6.2.orig/src/plot.c ./src/plot.c
#if defined(HAVE_LIBREADLINE) || defined(HAVE_LIBEDITLINE)
/* T.Walter 1999-06-24: 'rl_readline_name' must be this fix name.
* It is used to parse a 'gnuplot' specific section in '~/.inputrc'
diff -upr ../gnuplot-4.6.2.orig/src/term.h ./src/term.h
--- ../gnuplot-4.6.2.orig/src/term.h 2013-03-31 23:12:33.000000000 +0200
+++ ./src/term.h 2013-03-31 23:15:44.000000000 +0200
@@ -272,9 +272,9 @@
diff -upr ../gnuplot-5.0.0.orig/src/term.h ./src/term.h
--- ../gnuplot-5.0.0.orig/src/term.h 2014-10-01 04:40:29.000000000 +0200
+++ ./src/term.h 2015-01-21 19:49:50.522426765 +0100
@@ -261,9 +261,9 @@
#include "emf.trm"
/* Roland DXY800A plotter */
@ -194,27 +228,18 @@ diff -upr ../gnuplot-4.6.2.orig/src/term.h ./src/term.h
/* fig graphics */
#include "fig.trm"
@@ -307,7 +307,7 @@
#include "imagen.trm"
@@ -296,7 +296,7 @@
/* #include "imagen.trm" */
/* Kyocera Prescribe printer */
-/* #include "kyo.trm" */
+#include "kyo.trm"
/* Frame Maker MIF 3.00 format driver */
#include "mif.trm"
@@ -340,7 +340,7 @@
#include "tkcanvas.trm"
/* Vectrix 384 printer, also Tandy colour */
-/* #include "v384.trm" */
+#include "v384.trm"
#ifndef NO_BITMAP_SUPPORT
diff -upr ../gnuplot-4.6.2.orig/term/linux.trm ./term/linux.trm
--- ../gnuplot-4.6.2.orig/term/linux.trm 2013-03-31 23:12:33.000000000 +0200
+++ ./term/linux.trm 2013-03-31 23:15:44.000000000 +0200
#ifdef HAVE_MIF
diff -upr ../gnuplot-5.0.0.orig/term/linux.trm ./term/linux.trm
--- ../gnuplot-5.0.0.orig/term/linux.trm 2012-01-30 20:31:01.000000000 +0100
+++ ./term/linux.trm 2015-01-21 19:50:41.692431497 +0100
@@ -195,7 +195,7 @@ TERM_PUBLIC void LINUX_linetype __PROTO(
TERM_PUBLIC void LINUX_move __PROTO((unsigned int x, unsigned int y));
TERM_PUBLIC void LINUX_vector __PROTO((unsigned int x, unsigned int y));

3
gnuplot-4.6.6.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1f19596fd09045f22225afbfec11fa91b9ad1d95b9f48406362f517d4f130274
size 5059214

3
gnuplot-5.0.0.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:417d4bc5bc914a60409bb75cf18dd14f48b07f53c6ad3c4a4d3cd9a8d7370faf
size 4955900

3
gnuplot-el.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0535c31cf7c8b4417ac88eedd3e5133048c43a0226c6bcb495d44c66a2534381
size 52480

85
gnuplot.changes
View File

@ -1,3 +1,88 @@
-------------------------------------------------------------------
Wed Jan 21 07:29:58 UTC 2015 - burnus@net-b.de
- Update to 5.0.0
* NEW new command set {xyz}tics {timedate|geographic|numeric} sets
axis->tictype
* NEW add the tictype keywords to
set format {axis} {time|geographic|numeric}
* NEW format modifier 't' in timedate mode indicates a time
rather than a date
* NEW grey out key entries when corresponding plot is toggled off
* NEW allow parenthesized expressions as call parameters
* NEW set margins <left>, <right>, <top>, <bottom>
* NEW set trange [theta_min:theta_max] filters input data in polar plots
* NEW "set mouse zoomfactors <xfact>,<yfact>"
* NEW New matrix keywords for text data: "columnheaders" and "rowheaders"
* NEW The dashtype property on any line can be seperately controlled
* NEW custom dashtypes
* NEW LFS support for datafiles
* NEW timecolumn(col,"timeformat') now requires 2nd parameter, the format
* NEW 'set view map {scale}' allows resizing a 3D projection plot
* NEW 'nodraw' keyword to suppress lines (e.g. in style linespoints)
* NEW bold/italic text markup in enhanced text mode
* NEW bit-shifing binary operators << and >>
* NEW stat calculates skewness, kurtosis, and standard errors
* NEW function plugins, e.g. 'import f(x) from "plugins.so"'
* NEW option to tabulate all input columns "set table;
plot ... with table"
* NEW smoothing option "mcsplines" for piecewise monotonic
cubic splines
* NEW 'history !N' reexecutes the command at history entry N.
* NEW 'set history {size <N>} {quiet|numbers} {full|trim} {default}'
* NEW piecewise functions via separate sampling ranges for each plot
element
* NEW function hsv2rgb(H,S,V) creates a 24-bit RGB value
* NEW plot title can be placed next to the plot line in
the graph proper
* NEW inline data can be stored for reuse in named data blocks
* NEW 'set print|table $datablock' to redirect output to a named
data block
* NEW hypertext labels can be displayed on mouse-over
* NEW geographic (Degrees Minutes Seconds) data axes
* NEW set arrow <tag> from <start> length <len> angle <ang>
* NEW arrow style keywords "noborder" and "fixed"
* NEW the high bits of RGB colors are treated as an alpha channel
* NEW 'set surface explicit' disables automatic generation of
a surface mesh
* NEW 'set link [x2|y2]' ties secondary axis range to the primary axis
* NEW 'set link x2 via f(x) inverse g(x)' introduces generic nonlinear
axes
* NEW linked axes can be used to place x2 and y2 labels on 3D plots
in map mode
* NEW 'set key opaque' works for 3D plots also
* NEW x11 terminal is aware of current and requested plot aspect ratio
* NEW x11 support for toggling plots on/off with left mouseclick on
the key
* NEW post term can use /FlateDecode to reduce the size of embedded
images
* NEW 'set fit quiet|results|brief|verbose' changes fit's verbosity
* NEW fit optionally stores final covariances to user variables
* NEW fit command takes errors of independent variables into account
* NEW 'set multiplot next/previous'
* NEW 'set contours; splot FOO with labels' places labels on the
contour lines
* NEW Additional levels of user-specified axis tics
* NEW complex math routines cerf, cdawson, erfi, faddeeva from
libcerf if present
* NEW i/v/V hotkeys to toggle all plots on the screen on/off
* NEW 'set mrtics' (minor tics on polar axis)
* NEW 'reset session'
* NEW call argument convention ARGC, ARG0 ARG1 ... ARG<ARGC>
* NEW shell invocation gnuplot -c scriptfile ARG1 ARG2 ARG3
* NEW format %h is like %g but uses LaTeX or enhanced markup for the
exponent
* NEW LaTeX terminals use math mode for axis tic labels
* NEW Interrupt scripts or fits by pressing Ctrl-C in Windows console
mode gnuplot or Ctrl-Break in wgnuplot.
* NEW optional faster windows terminal variant using GDI+
* NEW plot option to "skip N" lines at start of an ascii data file
* NEW interactive color character art terminal "caca"
- Rediff gnuplot-4.6.0-fonts.diff, gnuplot-4.4.0-x11ovf.dif,
gnuplot-4.6.0.dif and gnuplot-4.6.0-demo.diff.
- Remove gnuplot-4.6.0-backtick.diff as to-be-patched file no longer
exists.
-------------------------------------------------------------------
Tue Oct 28 20:57:31 UTC 2014 - kruber@zib.de

36
gnuplot.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package gnuplot
#
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -35,8 +35,10 @@ BuildRequires: readline-devel
%if %suse_version <= 1140
BuildRequires: zziplib
%endif
BuildRequires: latex2html
BuildRequires: texlive-latex
BuildRequires: texlive-tex4ht
BuildRequires: texlive-ucs
%if %suse_version >= 1220
BuildRequires: makeinfo
%endif
@ -64,7 +66,7 @@ BuildRequires: plotutils-devel
BuildRequires: plotutils
%endif
Url: http://www.gnuplot.info/
Version: 4.6.6
Version: 5.0.0
Release: 0
Summary: GNUplot a Function Plotting Utility
License: SUSE-Gnuplot and GPL-2.0+
@ -73,11 +75,18 @@ Group: Productivity/Graphics/Visualization/Graph
Source0: gnuplot-%{version}.tar.gz
Source2: gnuplot-fr.doc.bz2
Source3: README.whynot
# According to the gnuplot 5.0.0 release notes, the emacs .el should now be
# available at https://github.com/rudi/gnuplot-el but it doesn't exist anymore.
# Use the files from the lisp/ directory from gnuplot' CVS just before it was
# removed on 6 March 2014.
Source4: gnuplot-el.tar.bz2
# http://mirrors.ctan.org/macros/latex209/contrib/picins/picins.sty
# That's a build requirement, not provided by Tex Live
Source5: picins.sty
Patch0: gnuplot-4.6.0.dif
Patch1: gnuplot-4.4.0-x11ovf.dif
Patch2: gnuplot-4.6.0-fonts.diff
Patch4: gnuplot-4.6.0-demo.diff
Patch8: gnuplot-4.6.0-backtick.diff
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"
@ -125,13 +134,14 @@ and can easily be extended to include new devices.
%prep
%setup -q
%setup -T -D -a 4
bunzip2 -dc %{_sourcedir}/gnuplot-fr.doc.bz2 > docs/gnuplot-fr.doc
test $? -eq 0 || exit 1
%patch1 -p 0 -b .x11ovf
cp %{_sourcedir}/picins.sty docs
%patch2 -p 0 -b .font
%patch4 -p 0 -b .demo
%patch8 -p 0 -b .btick
%patch0 -p 0 -b .0
%patch1 -p 0 -b .x11ovf
%build
SECSVGA="-DSVGA_IS_SECURE=1"
@ -180,7 +190,7 @@ test $? -eq 0 || exit 1
make %{?_smp_mflags}
%endif
pushd docs/
make srcdir=. clean all html pdf gpcard.ps
make srcdir=. clean all html pdf gpcard.ps info
pushd psdoc/
make srcdir=. clean pdf
popd
@ -188,14 +198,22 @@ test $? -eq 0 || exit 1
pushd tutorial/
make srcdir=. clean pdf
popd
pushd lisp/
for el_file in gnuplot.el gnuplot-gui.el; do
emacs -batch -q -no-site-file -l "dot.el" -f batch-byte-compile \
"$el_file"
done
popd
%install
rm -rf %{buildroot}
make DESTDIR=%{buildroot} appdefaultdir=%{_appdef} install
mkdir -p %{buildroot}/%{_infodir}
mkdir -p %{buildroot}/%{_mandir}/ja/man1
mkdir -p %{buildroot}/%{_docdir}/gnuplot/doc
mkdir -p %{buildroot}/%{_docdir}/gnuplot/doc/html
mkdir -p %{buildroot}/%{_docdir}/gnuplot/demo
mkdir -p %{buildroot}/%{_datadir}/emacs/site-lisp
rm -vf docs/htmldocs/images.{aux,idx,log,out,tex}
rm -vf docs/htmldocs/*.pl
rm -vf docs/htmldocs/*.sty
@ -212,14 +230,15 @@ test $? -eq 0 || exit 1
install -m 0444 docs/psdoc/*.doc %{buildroot}/%{_docdir}/gnuplot/doc/
install -m 0444 docs/psdoc/README %{buildroot}/%{_docdir}/gnuplot/doc/
install -m 0444 tutorial/*.pdf %{buildroot}/%{_docdir}/gnuplot/doc/
install -m 0444 demo/* %{buildroot}/%{_docdir}/gnuplot/demo/
install -m 0444 demo/*.* %{buildroot}/%{_docdir}/gnuplot/demo/
install -m 0444 README* %{buildroot}/%{_docdir}/gnuplot/
install -m 0444 Copyright %{buildroot}/%{_docdir}/gnuplot/
install -m 0444 VERSION %{buildroot}/%{_docdir}/gnuplot/
install -m 0444 NEWS BUGS %{buildroot}/%{_docdir}/gnuplot/
install -m 0444 %{SOURCE3} %{buildroot}/%{_docdir}/gnuplot/
install -m 0444 lisp/gnuplot*.el* %{buildroot}/%{_datadir}/emacs/site-lisp/
mv %{buildroot}/%{_mandir}/man1/gnuplot-ja.1 %{buildroot}/%{_mandir}/ja/man1/gnuplot.1
rm -f %{buildroot}/%{_docdir}/gnuplot/demo/Makefile*
rm -f %{buildroot}/%{_datadir}/emacs/site-lisp/info-look.*
%post doc
%install_info --info-dir=.%{_infodir} .%{_infodir}/%{name}.info.gz
@ -241,5 +260,6 @@ test $? -eq 0 || exit 1
%doc %{_docdir}/gnuplot/
%doc %{_infodir}/%{name}.info.gz
%doc %{_mandir}/man1/gnuplot.1.gz
%doc %{_mandir}/ja/man1/gnuplot.1.gz
%changelog

578
picins.sty Normal file
View File

@ -0,0 +1,578 @@
% PICINS.STY --- Style File zum Einbinden von Bildern
% Autor: J. Bleser, E. Lang
% Hochschulrechenzentrum
% Technische Hochschule Darmstadt
% !!! Dieses Style-File ist urheberrechtlich geschuetzt !!!
% !!! Aenderungen nur mit Zustimmung der Autoren !!!
\message{Option `picins' Version 3.0 Sep. 1992, TH Darmstadt/HRZ}
\newbox\@BILD%
\newbox\@TEXT%
\newdimen\d@breite%
\newdimen\d@hoehe%
\newdimen\d@xoff%
\newdimen\d@yoff%
\newdimen\d@shad%
\newdimen\d@dash%
\newdimen\d@boxl%
\newdimen\d@pichskip%
\newdimen\d@tmp
\newdimen\d@tmpa
\newdimen\d@bskip
\newdimen\hsiz@%
\newdimen\p@getot@l%
\newcount\c@breite
\newcount\c@hoehe
\newcount\c@xoff
\newcount\c@yoff
\newcount\c@pos
\newcount\c@shad
\newcount\c@dash
\newcount\c@boxl
\newcount\c@zeilen%
\newcount\@changemode%
\newcount\c@piccaption%
\newcount\c@piccaptionpos%
\newcount\c@picpos
\newcount\c@whole%
\newcount\c@half%
\newcount\c@tmp
\newcount\c@tmpa
\newcount\c@tmpb
\newcount\c@tmpc
\newcount\c@tmpd
\newskip\d@leftskip
\newif\if@list \@listfalse%
\newif\if@offset%
\c@piccaptionpos=1%
\c@picpos=0
\d@shad=4pt%
\d@dash=4pt%
\d@boxl=10pt%
\d@pichskip=1em%
\@changemode=0%
\def\@captype{figure}%
\let\old@par=\par%
\def\pichskip#1{\d@pichskip #1\relax}
\def\shadowthickness#1{\d@shad #1\relax}
\def\dashlength#1{\d@dash #1\relax}
\def\boxlength#1{\d@boxl #1\relax}
\def\picchangemode{\@changemode=1}%
\def\nopicchangemode{\@changemode=0}%
\def\piccaptionoutside{\c@piccaptionpos=1}%
\def\piccaptioninside{\c@piccaptionpos=2}%
\def\piccaptionside{\c@piccaptionpos=3}%
\def\piccaptiontopside{\c@piccaptionpos=4}%
\def\piccaption{\@ifnextchar [{\@piccaption}{\@piccaption[]}}
\def\@piccaption[#1]#2{\c@piccaption=1\def\sh@rtf@rm{#1}\def\capti@nt@xt{#2}}
\def\make@piccaption{%
\hsiz@\d@breite%
\ifnum\c@piccaptionpos=2%
\advance\hsiz@ -2\fboxsep%
\fi%
\ifnum\c@piccaptionpos>2%
\hsiz@\hsize\advance\hsiz@-\d@breite\advance\hsiz@-\d@pichskip%
\fi%
\setbox\@TEXT=\vbox{\hsize\hsiz@\caption[\sh@rtf@rm]{\capti@nt@xt}}%
}
\def\newcaption{\refstepcounter\@captype\@dblarg{\@newcaption\@captype}}
\long\def\@newcaption#1[#2]#3{%
\old@par%
\addcontentsline{\csname ext@#1\endcsname }{#1}%
{\protect\numberline{\csname the#1\endcsname}{\ignorespaces #2}}
\begingroup\@parboxrestore\normalsize%
\@newmakecaption{\csname fnum@#1\endcsname}{\ignorespaces #3}\old@par%
\endgroup%
}
\long\def\@newmakecaption#1#2{%
\vskip 10pt%
\setbox\@tempboxa \hbox {#1: #2}%
\ifdim \wd\@tempboxa >\hsize%
\setbox0=\hbox{#1: }\dimen0=\hsize\advance\dimen0 by-\wd0
\setbox1=\vtop{\hsize=\dimen0 #2}
\hbox{\box0 \box1}
\par
\else \hbox to\hsize {\hfil \box \@tempboxa \hfil}
\fi
}
\def\parpic{%
\@ifnextchar ({\iparpic}{\iparpic(0pt,0pt)}
}
\def\iparpic(#1,#2){%
\@ifnextchar ({\@offsettrue\iiparpic(#1,#2)}%
{\@offsetfalse\iiparpic(#1,#2)(0pt,0pt)}
}
\def\iiparpic(#1,#2)(#3,#4){%
\@ifnextchar [{\iiiparpic(#1,#2)(#3,#4)}{\iiiparpic(#1,#2)(#3,#4)[l]}
}
\def\iiiparpic(#1,#2)(#3,#4)[#5]{%
\@ifnextchar [{\ivparpic(#1,#2)(#3,#4)[#5]}{\ivparpic(#1,#2)(#3,#4)[#5][]}
}
\def\ivparpic(#1,#2)(#3,#4)[#5][#6]#7{%
\let\par=\old@par\par%
\hangindent0pt\hangafter1%
\setbox\@BILD=\hbox{#7}%
\d@breite=#1\d@breite=\the\d@breite%
\ifdim\d@breite=0pt\d@breite=\wd\@BILD\fi%
\c@breite=\d@breite\divide\c@breite by65536%
\multiply\c@piccaption\c@piccaptionpos%
\d@hoehe=#2\d@hoehe=\the\d@hoehe%
\ifdim\d@hoehe=0pt\d@hoehe=\ht\@BILD\advance\d@hoehe by\dp\@BILD\fi%
\c@hoehe=\d@hoehe\divide\c@hoehe by65536%
\d@xoff=#3\c@xoff=\d@xoff\divide\c@xoff by65536%
\d@yoff=\d@hoehe%
\advance\d@yoff by-#4\c@yoff=\d@yoff\divide\c@yoff by65536%
\c@pos=1\unitlength1pt%
\if@offset%
\setbox\@BILD=\hbox{%
\begin{picture}(\c@breite,\c@hoehe)%
\put(0,0){\makebox(\c@breite,\c@hoehe){}}%
\put(\c@xoff,\c@yoff){\box\@BILD}%
\end{picture}%
}%
\else%
\setbox\@BILD=\hbox{%
\begin{picture}(\c@breite,\c@hoehe)%
\put(0,0){\makebox(\c@breite,\c@hoehe)[#6]{\box\@BILD}}%
\end{picture}%
}%
\fi%
\ifnum\c@piccaption=2%
\make@piccaption%
\advance\d@hoehe\ht\@TEXT\advance\d@hoehe\dp\@TEXT%
\c@hoehe=\d@hoehe\divide\c@hoehe by65536%
\setbox\@BILD=\vbox{\box\@BILD\vspace{-5pt}%
\hbox{\hspace{\fboxsep}\box\@TEXT}%
\vspace{4pt}}%
\fi%
\@tfor\@tempa := #5\do{%
\if\@tempa f\setbox\@BILD=\hbox{\Rahmen(\c@breite,\c@hoehe){\box\@BILD}}\fi%
\if\@tempa s\setbox\@BILD=\hbox{\Schatten(\c@breite,\c@hoehe){\box\@BILD}}\fi%
\if\@tempa o\setbox\@BILD=\hbox{\Oval(\c@breite,\c@hoehe){\box\@BILD}}\fi%
\if\@tempa d\setbox\@BILD=\hbox{\Strich(\c@breite,\c@hoehe){\box\@BILD}}\fi%
\if\@tempa x\setbox\@BILD=\hbox{\Kasten(\c@breite,\c@hoehe){\box\@BILD}}\fi%
\if\@tempa l\c@pos=1\fi%
\if\@tempa r\c@pos=2\fi%
}%
\ifnum\c@piccaption=1%
\make@piccaption%
\advance\d@hoehe\ht\@TEXT\advance\d@hoehe\dp\@TEXT%
\c@hoehe=\d@hoehe\divide\c@hoehe by65536%
\setbox\@BILD=\vbox{\box\@BILD\vspace{-5pt}\hbox{\box\@TEXT}\vspace{4pt}}%
\fi%
\ifodd\count0\c@picpos=0\else\c@picpos=\@changemode\fi%
\pagetotal=\the\pagetotal%
\d@tmp=\pagegoal\advance\d@tmp by-\pagetotal\advance\d@tmp by-\baselineskip%
\ifdim\d@hoehe>\d@tmp%
\vskip 0pt plus\d@hoehe\relax\pagebreak[3]\vskip 0pt plus-\d@hoehe\relax%
\ifnum\c@picpos=1\c@picpos=0\else\c@picpos=\@changemode\fi%
\fi%
\ifnum\c@picpos=1\ifnum\c@pos=1\c@pos=2\else\c@pos=1\fi\fi%
\ifnum\@listdepth>0
\@listtrue\parshape 0%
\advance\hsize -\rightmargin%
\d@leftskip \leftskip%
\leftskip \@totalleftmargin%
\if@inlabel\rule{\linewidth}{0pt}\vskip-\baselineskip\relax\fi%
\else\@listfalse\medskip%
\fi%
\if@list\d@tmpa=\linewidth\else\d@tmpa=\hsize\fi%
\ifnum\c@piccaption=3%
\make@piccaption%
\d@tmp\ht\@TEXT\advance\d@tmp\dp\@TEXT%
\ifdim\d@hoehe>\d@tmp%
\setbox\@TEXT=\vbox to\d@hoehe{\vfill\box\@TEXT\vspace{.2\baselineskip}\vfill}%
\else%
\setbox\@BILD=\vbox to\d@tmp{\vfill\box\@BILD\vfill}%
\d@hoehe\d@tmp%
\fi%
\fi%
\ifnum\c@piccaption=4%
\make@piccaption%
\d@tmp\ht\@TEXT\advance\d@tmp\dp\@TEXT%
\setbox\@TEXT=\vbox to\d@hoehe{\vspace{-10pt}\box\@TEXT\vfil}%
\advance\d@hoehe-\d@tmp%
\fi%
\ifnum\c@pos=1\d@tmpa=0pt%
\ifnum\c@piccaption>2%
\setbox\@BILD=\hbox{\box\@BILD\hspace{\d@pichskip}\hbox{\box\@TEXT}}%
\fi%
\else\advance\d@tmpa by-\wd\@BILD\d@breite=-\d@breite%
\ifnum\c@piccaption>2%
\d@tmpa=0pt%
\setbox\@BILD=\hbox{\hbox{\box\@TEXT}\hspace{\d@pichskip}\box\@BILD}%
\fi%
\fi%
\p@getot@l\the\pagetotal%
\d@bskip\d@hoehe\advance\d@bskip by\parskip\advance\d@bskip by.3\baselineskip%
{\noindent\hspace*{\d@tmpa}\relax%
\box\@BILD\nopagebreak\vskip-\d@bskip\relax\nopagebreak}%
\d@tmp=-\d@hoehe\divide\d@tmp by\baselineskip%
\c@zeilen=\d@tmp\advance\c@zeilen by-1%
\ifdim\d@breite<0pt\advance\d@breite by-\d@pichskip%
\else\advance\d@breite by\d@pichskip%
\fi%
\hangindent=\d@breite%
\hangafter=\c@zeilen%
\let\par=\x@par%
\ifnum\c@piccaption=3%
\hangindent0pt\hangafter1\let\par=\old@par%
\vskip\d@hoehe\vskip.2\baselineskip%
\fi%
\c@piccaption=0%
}
\newdimen\ptoti
\newdimen\ptotii
\def\x@par{%
\ptoti\pagetotal%
\old@par%
\ptotii\pagetotal%
\ifdim\ptoti=\ptotii%
\d@tmp\d@hoehe%
\else%
\d@tmp\baselineskip%
\multiply\d@tmp by\prevgraf%
\advance\d@tmp by\parskip%
\global\advance\d@hoehe by-\d@tmp\d@tmp=\d@hoehe%
\fi%
\ifdim\d@hoehe>0pt%
\divide\d@tmp by\baselineskip\c@zeilen=-\d@tmp\advance\c@zeilen by-1%
\c@zeilen=\the\c@zeilen%
\else\c@zeilen=0
\fi
\ifnum\c@zeilen<0\hangafter=\c@zeilen\hangindent=\d@breite%
\else\let\par=\old@par%
\hangindent 0pt%
\leftskip \d@leftskip%
\if@list\parshape \@ne \@totalleftmargin \linewidth%
\advance\hsize \rightmargin%
\fi%
\fi%
}
\def\picskip#1{%
\let\par=\old@par%
\par%
\pagetotal\the\pagetotal%
\c@tmp=#1\relax%
\ifnum\c@tmp=0%
\d@tmp\baselineskip\multiply\d@tmp by\prevgraf\advance\d@tmp\parskip%
\ifdim\p@getot@l<\pagetotal
\advance\d@hoehe by-\d@tmp\advance\d@hoehe by1ex%
\ifdim\d@hoehe>0pt\vspace*{\d@hoehe}\fi%
\fi%
\ifdim\p@getot@l=\pagetotal%
\advance\d@hoehe by-\d@tmp\advance\d@hoehe by1ex%
\ifdim\d@hoehe>0pt\vspace*{\d@hoehe}\fi%
\fi%
\else\hangafter=-\c@tmp\hangindent=\d@breite%
\fi%
\leftskip \d@leftskip%
\if@list\parshape \@ne \@totalleftmargin \linewidth%
\advance\hsize \rightmargin%
\fi%
}
\def\hpic{%
\@ifnextchar ({\ihpic}{\ihpic(0pt,0pt)}
}
\def\ihpic(#1,#2){%
\@ifnextchar ({\@offsettrue\iihpic(#1,#2)}%
{\@offsetfalse\iihpic(#1,#2)(0pt,0pt)}
}
\def\iihpic(#1,#2)(#3,#4){%
\@ifnextchar [{\iiihpic(#1,#2)(#3,#4)}{\iiihpic(#1,#2)(#3,#4)[l]}
}
\def\iiihpic(#1,#2)(#3,#4)[#5]{%
\@ifnextchar [{\ivhpic(#1,#2)(#3,#4)[#5]}{\ivhpic(#1,#2)(#3,#4)[#5][]}
}
\def\ivhpic(#1,#2)(#3,#4)[#5][#6]#7{%
\setbox\@BILD=\hbox{#7}%
\d@breite=#1\d@breite=\the\d@breite%
\ifdim\d@breite=0pt\d@breite=\wd\@BILD\fi%
\c@breite=\d@breite\divide\c@breite by65536%
\d@hoehe=#2\d@hoehe=\the\d@hoehe%
\ifdim\d@hoehe=0pt\d@hoehe=\ht\@BILD\advance\d@hoehe by\dp\@BILD\fi%
\c@hoehe=\d@hoehe\divide\c@hoehe by65536%
\d@xoff=#3\c@xoff=\d@xoff\divide\c@xoff by65536%
\d@yoff=\d@hoehe%
\advance\d@yoff by-#4\c@yoff=\d@yoff\divide\c@yoff by65536%
\c@pos=0\d@tmpa=\parindent\parindent=0pt\unitlength1pt%
\if@offset
\setbox\@BILD=\hbox{%
\begin{picture}(\c@breite,\c@hoehe)%
\put(0,0){\makebox(\c@breite,\c@hoehe){}}%
\put(\c@xoff,\c@yoff){\box\@BILD}%
\end{picture}%
}%
\else%
\setbox\@BILD=\hbox{%
\begin{picture}(\c@breite,\c@hoehe)%
\put(0,0){\makebox(\c@breite,\c@hoehe)[#6]{\box\@BILD}}%
\end{picture}%
}%
\fi%
\@tfor\@tempa := #5\do{%
\if\@tempa f\setbox\@BILD=\hbox{\Rahmen(\c@breite,\c@hoehe){\box\@BILD}}\fi%
\if\@tempa s\setbox\@BILD=\hbox{\Schatten(\c@breite,\c@hoehe){\box\@BILD}}\fi%
\if\@tempa o\setbox\@BILD=\hbox{\Oval(\c@breite,\c@hoehe){\box\@BILD}}\fi%
\if\@tempa d\setbox\@BILD=\hbox{\Strich(\c@breite,\c@hoehe){\box\@BILD}}\fi%
\if\@tempa x\setbox\@BILD=\hbox{\Kasten(\c@breite,\c@hoehe){\box\@BILD}}\fi%
\if\@tempa t\c@pos=1\fi%
\if\@tempa b\c@pos=2\fi%
}%
\ifnum\c@pos=0\parbox{\d@breite}{\makebox[0cm]{}\\\box\@BILD\smallskip}\fi%
\ifnum\c@pos=1\parbox[t]{\d@breite}{\makebox[0cm]{}\\\box\@BILD\smallskip}\fi%
\ifnum\c@pos=2\parbox[b]{\d@breite}{\makebox[0cm]{}\\\box\@BILD\smallskip}\fi%
\parindent=\d@tmpa%
}
\def\Rahmen(#1,#2)#3{%
\c@whole=\@wholewidth\divide\c@whole by65536%
\c@half=\@halfwidth\divide\c@half by65536%
\c@tmpa=#1\advance\c@tmpa by\c@whole\advance\c@tmpa by\c@whole%
\c@tmpb=#2\advance\c@tmpb by\c@whole\advance\c@tmpb by\c@whole%
\begin{picture}(\c@tmpa,\c@tmpb)%
\put(\c@whole,\c@half){\framebox(#1,#2){#3}}%
\end{picture}%
\global\advance\d@breite by2\@wholewidth%
\global\advance\d@hoehe by2\@wholewidth%
}
\def\Schatten(#1,#2)#3{%
\c@whole=\@wholewidth\divide\c@whole by65536%
\c@half=\@halfwidth\divide\c@half by65536%
\c@shad=\d@shad\divide\c@shad by65536%
\c@tmp=\c@whole\advance\c@tmp by\c@whole\c@tmpd=\c@tmp%
\advance\c@tmp by\c@shad%
\advance\c@tmpd by#1%
\advance\c@half by\c@shad%
\c@tmpa=#1\advance\c@tmpa by\c@tmp%
\c@tmpb=#2\advance\c@tmpb by\c@tmp%
\begin{picture}(\c@tmpa,\c@tmpb)%
\put(\c@whole,\c@half){\framebox(#1,#2){#3}}%
\put(\c@shad,0){\rule{\c@tmpd pt}{\c@shad pt}}%
\put(\c@tmpd,0){\rule{\c@shad pt}{#2 pt}}%
\end{picture}%
\global\advance\d@breite by2\@wholewidth\global\advance\d@breite by\d@shad%
\global\advance\d@hoehe by2\@wholewidth\global\advance\d@hoehe by\d@shad%
}
\def\Oval(#1,#2)#3{%
\@wholewidth=0.4pt%
\c@tmpa=\the#1\divide\c@tmpa by2%
\c@tmpb=\the#2\divide\c@tmpb by2%
\begin{picture}(#1,#2)%
\put(\c@tmpa,\c@tmpb){\oval(#1,#2)}%
\put(0.4,0.4){#3}%
\end{picture}%
\global\advance\d@breite by1pt\global\advance\d@hoehe by1pt%
}
\def\Strich(#1,#2)#3{%
\c@whole=\@wholewidth\divide\c@whole by65536%
\c@half=\@halfwidth\divide\c@half by65536%
\c@dash=\d@dash\divide\c@dash by65536%
\c@tmp=\c@whole\advance\c@tmp by\c@whole%
\c@tmpa=#1\advance\c@tmpa by\c@tmp%
\c@tmpb=#2\advance\c@tmpb by\c@tmp%
\c@tmpc=#1\advance\c@tmpc by\c@whole%
\c@tmpd=#2\advance\c@tmpd by\c@whole%
\begin{picture}(\c@tmpa,\c@tmpb)%
\put(\c@half,\c@half){\dashbox{\c@dash}(\c@tmpc,\c@tmpd){#3}}%
\end{picture}%
\global\advance\d@breite by2\@wholewidth%
\global\advance\d@hoehe by2\@wholewidth%
}
\def\Kasten(#1,#2)#3{%
\@wholewidth=0.4pt%
\c@boxl=\d@boxl\divide\c@boxl by65536\c@boxl=\the\c@boxl%
\c@tmpa=#1\advance\c@tmpa by\c@boxl%
\c@tmpb=#2\advance\c@tmpb by\c@boxl%
\c@tmp=#2%
\begin{picture}(\c@tmpa,\c@tmpb)%
\put(0,\c@boxl){\framebox(#1,#2){#3}}%
\put(\c@boxl,0){\line(-1,1){\c@boxl}}%
\put(\c@boxl,0){\line(1,0){#1}\line(-1,1){\c@boxl}}%
\put(\c@boxl,0){\put(#1,0){\line(0,1){\c@tmp}%
\put(0,\c@tmp){\line(-1,1){\c@boxl}}}}%
\end{picture}%
\global\advance\d@breite by\d@boxl%
\global\advance\d@hoehe by\d@boxl%
}
\newbox\env@box%
\newdimen\d@envdp
\newcount\c@hsize
\newcount\c@envdp
\newdimen\d@envb
\long\def\frameenv{\@ifnextchar [{\@frameenv}{\@frameenv[\textwidth]}}
\long\def\@frameenv[#1]{%
\hsiz@=\textwidth \textwidth=#1 \d@envb=#1
\advance\textwidth by-2\@wholewidth
\advance\textwidth by-2\fboxsep
\hsize=\textwidth \linewidth=\textwidth
\setbox\env@box=\vbox\bgroup}%
\def\endframeenv{%
\egroup%
\hsize=\hsiz@ \textwidth=\hsiz@ \linewidth=\hsiz@
\c@breite=\d@envb \divide\c@breite by65536
\advance\d@envb by-2\@wholewidth
\c@hsize=\d@envb \divide\c@hsize by65536%
\d@envdp=\dp\env@box \advance\d@envdp by\ht\env@box%
\advance\d@envdp by2\fboxsep%
\d@hoehe=\d@envdp \advance\d@hoehe by2\@wholewidth
\c@hoehe=\d@hoehe \divide\c@hoehe by65536
\c@envdp=\d@envdp \divide\c@envdp by65536%
\c@tmp=\@wholewidth \divide\c@tmp by65536
\vskip\@wholewidth%
\unitlength 1pt\noindent%
\begin{picture}(\c@breite,\c@hoehe)(0,0)
\put(\c@tmp,\c@tmp){\framebox(\c@hsize,\c@envdp){\box\env@box}}
\end{picture}%
}
\long\def\shadowenv{\@ifnextchar [{\@shadowenv}{\@shadowenv[\textwidth]}}
\long\def\@shadowenv[#1]{%
\hsiz@=\textwidth \textwidth=#1 \d@envb=#1
\advance\textwidth by-2\@wholewidth
\advance\textwidth by-2\fboxsep
\advance\textwidth by-\d@shad%
\hsize=\textwidth \linewidth=\textwidth
\setbox\env@box=\vbox\bgroup}%
\def\endshadowenv{%
\egroup
\hsize=\hsiz@ \textwidth=\hsiz@ \linewidth=\hsiz@
\d@tmpa=\d@envb
\c@breite=\d@envb \divide\c@breite by65536
\advance\d@envb by-2\@wholewidth \advance\d@envb by-\d@shad
\c@hsize=\d@envb \divide\c@hsize by65536%
\d@envdp=\dp\env@box \advance\d@envdp by\ht\env@box%
\advance\d@envdp by2\fboxsep%
\c@envdp=\d@envdp \divide\c@envdp by65536%
\d@hoehe=\d@envdp
\advance\d@hoehe by2\@wholewidth \advance\d@hoehe by\d@shad
\c@hoehe=\d@hoehe \divide\c@hoehe by65536
\c@shad =\d@shad \divide\c@shad by65536
\c@tmp=\@wholewidth \divide\c@tmp by65536
\advance\d@tmpa by-2\d@shad
\c@xoff =\d@tmpa \divide\c@xoff by65536
\advance\c@xoff by\c@shad \advance\c@xoff by-1
\advance\d@envdp by\@wholewidth
\vskip\@halfwidth
\unitlength 1pt\noindent%
\begin{picture}(\c@breite,\c@hoehe)(0,0)
\put(\c@tmp,\c@shad){\framebox(\c@hsize,\c@envdp){\box\env@box}}
\put(\c@shad,0){\rule{\d@tmpa}{\d@shad}}%
\put(\c@xoff,0){\rule{\d@shad}{\d@envdp}}%
\end{picture}%
\vskip\@halfwidth
}
\long\def\dashenv{\@ifnextchar [{\@dashenv}{\@dashenv[\textwidth]}}
\long\def\@dashenv[#1]{%
\hsiz@=\textwidth \textwidth=#1 \d@envb=#1
\advance\textwidth by-2\@wholewidth \advance\textwidth by-2\fboxsep
\hsize=\textwidth \linewidth=\textwidth
\setbox\env@box=\vbox\bgroup}%
\long\def\enddashenv{%
\egroup
\hsize=\hsiz@ \textwidth=\hsiz@ \linewidth=\hsiz@
\c@breite=\d@envb \divide\c@breite by65536
\advance\d@envb by-\@wholewidth
\c@hsize=\d@envb \divide\c@hsize by65536%
\d@envdp=\dp\env@box \advance\d@envdp by\ht\env@box%
\advance\d@envdp by2\fboxsep%
\advance\d@envdp by\@wholewidth
\d@hoehe=\d@envdp \advance\d@hoehe by2\@wholewidth
\c@hoehe=\d@hoehe \divide\c@hoehe by65536
\c@envdp=\d@envdp \divide\c@envdp by65536%
\c@dash=\d@dash \divide\c@dash by65536%
\c@whole=\@wholewidth \divide\c@whole by65536
\c@half=\@halfwidth \divide\c@half by 65536
\noindent\unitlength 1pt
\begin{picture}(\c@breite,\c@hoehe)(0,0)
\put(\c@half,\c@whole){\dashbox{\c@dash}(\c@hsize,\c@envdp){\box\env@box}}
\end{picture}%
}
\long\def\ovalenv{\@ifnextchar [{\@ovalenv}{\@ovalenv[\textwidth]}}%
\long\def\@ovalenv[#1]{%
\hsiz@=\textwidth \textwidth=#1 \d@envb=#1
\advance\textwidth by-4\fboxsep
\hsize=\textwidth \linewidth=\textwidth
\setbox\env@box=\vbox\bgroup}%
\long\def\endovalenv{%
\egroup
\hsize=\hsiz@ \textwidth=\hsiz@ \linewidth=\hsiz@
\@wholewidth=0.4pt
\c@breite=\d@envb \divide\c@breite by65536
\advance\d@envb by-2\@wholewidth
\c@hsize=\d@envb \divide\c@hsize by65536%
\d@envdp=\dp\env@box \advance\d@envdp by\ht\env@box%
\advance\d@envdp by4\fboxsep%
\c@envdp=\d@envdp \divide\c@envdp by65536%
\d@hoehe=\d@envdp \advance\d@hoehe by2\@wholewidth
\c@hoehe=\d@hoehe \divide\c@hoehe by65536
\c@tmpa=\c@hsize \divide\c@tmpa by2%
\c@tmpb=\c@envdp \divide\c@tmpb by2%
\d@tmpa=2\fboxsep \advance\d@tmpa by\@wholewidth
\c@xoff=\d@tmpa \divide\c@xoff by65536%
\advance\d@tmpa by\dp\env@box
\c@yoff=\d@tmpa \divide\c@yoff by65536%
\unitlength 1pt\noindent
\begin{picture}(\c@breite,\c@hoehe)(0,0)
\put(\c@tmpa,\c@tmpb){\oval(\c@hsize,\c@envdp)}
\put(\c@xoff,\c@yoff){\box\env@box}%
\end{picture}%
}