FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Bump version in to 5.0 alpha in development source · gnuplot/gnuplot-old@90542de · GitHub

Repository navigation

Commit 90542de

Browse files
sfeam
committed
Bump version in to 5.0 alpha in development source
1 parent 70290dd commit 90542de

12 files changed

Lines changed: 49 additions & 80 deletions

File tree

‎ChangeLog‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
2014-03-15 Ethan A Merritt <merritt@u.washington.edu>
2+
3+
* configure.in VERSION PATCHLEVEL share/gnuplotrc src/version.c
4+
demo/html/index.canvas demo/html/index.save demo/html/index.svg
5+
docs/doc2texi.el docs/gnuplot.doc docs/titlepag.tex:
6+
7+
>>>>> Bump version to 5.0 alpha <<<<<
8+
19
2014-03-15 Bastian Maerkisch <bmaerkisch@web.de>
210

311
* src/win/wgraph.c (MakeFonts) src/win/wgdiplus.c (SetFont_gdiplus):

‎PATCHLEVEL‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0
1+
alpha

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.7
1+
5.0

‎configure.in‎

Lines changed: 3 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
dnl Process this file with autoconf to produce a configure script.
22
dnl configure.in for gnuplot on Unix.
33
dnl
4-
dnl $Id: configure.in,v 1.356 2014/03/04 21:23:52 sfeam Exp $
4+
dnl $Id: configure.in,v 1.358 2014/03/15 17:59:31 sfeam Exp $
55
dnl
66
dnl this is actually major.minor ...
77
dnl note that for a non-beta release, we need to disable DEVELOPMENT_RELEASE
88
dnl
9-
AC_INIT(gnuplot, 4.7)
9+
AC_INIT(gnuplot, 5.0)
1010
AC_CONFIG_SRCDIR(src/graphics.c)
1111
AC_PREREQ(2.60)
1212
AC_CONFIG_HEADERS(config.h:config.hin)
@@ -90,9 +90,7 @@ AC_SEARCH_LIBS([cdawson], [cerf],
9090
)
9191

9292
dnl Various programs
93-
dnl X/Emacs for building lisp packages and creating .texi version of docs
94-
# If set to t, that means we are running in a shell under Emacs.
95-
# If you have an Emacs named "t", then use the full path.
93+
dnl X/Emacs for building .texi version of docs
9694
test x"$EMACS" = xt && EMACS=
9795
AC_CHECK_PROGS(EMACS, emacs xemacs, no)
9896

@@ -815,29 +813,6 @@ if test "$with_cwdrc" = yes; then
815813
[ Define if you want to read .gnuplot from current directory (SECURITY RISK!).])
816814
fi
817815

818-
819-
dnl Conditional actions based on whether or not we want to build the lisp files
820-
dnl This replaces a separate configure.in file in the lisp subdirectory
821-
if test "$EMACS" = no; then
822-
LISPFILES=noelcs
823-
INSTALL_LISP=install-nolisp
824-
else
825-
LISPFILES=elcs
826-
INSTALL_LISP=install-lisp
827-
fi
828-
AC_ARG_WITH(lisp-files,dnl
829-
[ --without-lisp-files do not build emacs lisp files],
830-
[if test "$with_lisp_files" = no; then
831-
LISPFILES=noelcs
832-
INSTALL_LISP=install-nolisp
833-
fi])
834-
AM_PATH_LISPDIR
835-
AC_SUBST(lispdir)
836-
AC_SUBST(LISPFILES)
837-
AC_SUBST(INSTALL_LISP)
838-
839-
840-
841816
dnl Sort help/subtopic tables by row or column
842817
AC_ARG_WITH(row-help,dnl
843818
[ --with-row-help format help and subtopic tables by row (default)
@@ -1301,15 +1276,6 @@ if test -n "${DIST_CONTACT}"; then
13011276
AC_DEFINE_UNQUOTED([DIST_CONTACT],["$DIST_CONTACT"],[Contact address for modified and binary distributed gnuplot versions])
13021277
fi
13031278

1304-
dnl build lisp files
1305-
if test "$with_lisp_files" != no; then
1306-
LISPDIR=lisp
1307-
else
1308-
LISPDIR=
1309-
fi
1310-
AC_SUBST(LISPDIR)
1311-
AM_CONDITIONAL(BUILD_LISP, test "${with_lisp_files}" != no)
1312-
13131279
dnl No configuration option for this one yet
13141280
AC_DEFINE(MAX_PARALLEL_AXES,7, [Maximum number of parallel axes supported])
13151281

@@ -1331,7 +1297,6 @@ AC_OUTPUT([Makefile
13311297
demo/Makefile
13321298
demo/plugin/Makefile
13331299
docs/Makefile
1334-
lisp/Makefile
13351300
m4/Makefile
13361301
man/Makefile
13371302
share/Makefile
@@ -1620,12 +1585,6 @@ AC_MSG_RESULT([])
16201585
AC_MSG_RESULT([gnuplot will install the following additional materials:])
16211586
AC_MSG_RESULT([])
16221587

1623-
if test "$with_lisp_files" != no; then
1624-
AC_MSG_RESULT([ gnuplot-mode for X/Emacs: yes])
1625-
else
1626-
AC_MSG_RESULT([ gnuplot-mode for X/Emacs: no])
1627-
fi
1628-
16291588
if test "$TUTORIAL" = tutorial; then
16301589
AC_MSG_RESULT([ LaTeX tutorial: yes])
16311590
else

‎demo/html/index.canvas‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22
<html>
33
<head>
44
<meta charset="UTF-8">
5-
<title>Gnuplot 4.7 demo scripts run through the HTML canvas terminal</title>
5+
<title>Gnuplot 5.0 demo scripts run through the HTML canvas terminal</title>
66
<link type="text/css" href="gnuplot_demo.css" rel="stylesheet">
77
<link type="text/css" href="gnuplot_mouse.css" rel="stylesheet">
88
</head>
99

1010
<body oncontextmenu="return false;">
1111

12-
<h2 align=center>Gnuplot 4.7 demo scripts run through the HTML canvas terminal<br>
12+
<h2 align=center>Gnuplot 5.0 demo scripts run through the HTML canvas terminal<br>
1313
See also the demo output for the
14-
<a href="http://gnuplot.sourceforge.net/demo_4.7/">PNG</a> and
15-
<a href="http://gnuplot.sourceforge.net/demo_svg_4.7/">SVG</a> terminals.
14+
<a href="http://gnuplot.sourceforge.net/demo_5.0/">PNG</a> and
15+
<a href="http://gnuplot.sourceforge.net/demo_svg_5.0/">SVG</a> terminals.
1616
</h2>
1717
<canvas id="warning" width=1 height=1>
1818
<div class='box'><h2>Your browser may not support the HTML 5 canvas element</h2></div>

‎demo/html/index.save‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55

66
<h2 align=center>Demo scripts for gnuplot CVS version (PNG terminal)<br>
77
See also the demo output for the
8-
<a href="../demo_svg_4.7/">SVG</a> and
9-
<a href="../demo_canvas_4.7/">canvas</a> terminals.
8+
<a href="../demo_svg_5.0/">SVG</a> and
9+
<a href="../demo_canvas_5.0/">canvas</a> terminals.
1010
</h2>
1111

1212
<p>

‎demo/html/index.svg‎

Lines changed: 4 additions & 4 deletions
LoadingViewer requires iframe.

‎docs/doc2texi.el‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -180,8 +180,8 @@ If PATTERN is omitted, it defaults to \"[ \\f\\t\\n\\r\\v]+\"."
180180
181181
An Interactive Plotting Program
182182
Thomas Williams & Colin Kelley
183-
Version 4.7 organized by:
184-
Hans-Bernhard Broeker, Ethan A Merritt, and others
183+
Version 5.0 organized by
184+
Ethan A Merritt with help from many others
185185
186186
Copyright (C) 1986 - 1993, 1998, 2004 Thomas Williams, Colin Kelley
187187
Copyright (C) 2004 - 2012 various authors
@@ -190,7 +190,7 @@ If PATTERN is omitted, it defaults to \"[ \\f\\t\\n\\r\\v]+\"."
190190
Mailing list for bug reports: gnuplot-bugs@@lists.sourceforge.net
191191
192192
This manual was originally prepared by Dick Crawford
193-
Version 4.7 - March 2012
193+
Version 5.0 - March 2014
194194
195195
196196
Major contributors (alphabetic order):

‎docs/gnuplot.doc‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
C RCS $Id: gnuplot.doc,v 1.865 2014/03/14 00:10:11 sfeam Exp $
1+
C RCS $Id: gnuplot.doc,v 1.866 2014/03/15 17:59:31 sfeam Exp $
22
C
33
C Copyright (C) 1986 - 1993, 1998, 1999, 2000, 2001, 2004 Thomas Williams, Colin Kelley et al.
44
C
55
1 gnuplot
66
?gnuplot
77
^<h2 align="center"> An Interactive Plotting Program </h2>
88
^<p align="center"> Thomas Williams & Colin Kelley</p>
9-
^<p align="center"> Version 4.4 organized by Ethan A Merritt and others</p>
9+
^<p align="center"> Version 5.0 organized by Ethan A Merritt and others</p>
1010
^<p align="center">Major contributors (alphabetic order):<br>
1111
^<br>
1212
^ Hans-Bernhard Broeker, John Campbell,<br>
@@ -24,7 +24,7 @@ C
2424
^ James R. Van Zandt, Alex Woo, Johannes Zellner<br>
2525
^</p>
2626
^<p align="center"> Copyright (C) 1986 - 1993, 1998 - 2004 Thomas Williams, Colin Kelley<br>
27-
^ Copyright (C) 2004 - 2011 various authors</p>
27+
^ Copyright (C) 2004 - 2014 various authors</p>
2828
^<p align="center"> Mailing list for comments: <tt>gnuplot-info@lists.sourceforge.net</tt><br>
2929
^ Mailing list for bug reports: <tt>gnuplot-bugs@lists.sourceforge.net</tt><br>
3030
^ Web access (preferred): <tt>http://sourceforge.net/projects/gnuplot</tt></p>
@@ -72,7 +72,7 @@ C
7272
Gnuplot 3.0 additions:
7373
Gershon Elber and many others.
7474

75-
Gnuplot 4.0 additions:
75+
Gnuplot 4.0 and 5.0 additions:
7676
See list of contributors at head of this document.
7777
2 Introduction
7878
?introduction
@@ -4237,8 +4237,8 @@ Ffigure_mapcontours
42374237
modifiers (`using`, `every`,...) except `smooth` are applicable to `fit`.
42384238
See `plot datafile`.
42394239

4240-
The function being fit may have up to five independent variables (more in
4241-
gnuplot version 4.7). In the absence of a `using` specification, the fit
4240+
The function being fit may have up to 12 independent variables (more if
4241+
specially configured). In the absence of a `using` specification, the fit
42424242
implicitly assumes there is only a single independent variable:
42434243

42444244
z # 1 independent variable (line number)
@@ -4267,7 +4267,7 @@ Ffigure_mapcontours
42674267

42684268
x:y:s yerror (similar to `plot` with `yerrorbars`)
42694269

4270-
Note that for compatibility reasons with `gnuplot` versions prior to 4.7,
4270+
Note that for compatibility reasons with `gnuplot` versions prior to 5.0,
42714271
the `error` keyword is not required. If you do not specify the error columns
42724272
explicitly, there must be two more `using` qualifiers (z and s) than there are
42734273
independent variables, unless there is only one variable. `gnuplot` then uses
@@ -4605,7 +4605,7 @@ Ffigure_mapcontours
46054605
?commands fit control
46064606
?fit control
46074607
Settings of the `fit` command are controlled by `set fit`. The old `gnuplot`
4608-
user variables are deprecated as of version 4.7, see `fit control variables`.
4608+
user variables are deprecated as of version 5, see `fit control variables`.
46094609

46104610
There are a number of environment variables that can be defined to affect
46114611
`fit` before starting `gnuplot`, see `fit control environment`.
@@ -8282,7 +8282,7 @@ Ffigure_missing
82828282
terminal session. `set fit quiet` turns off the echo, whereas `results`
82838283
prints only final results. `brief` gives one line summaries for every
82848284
iteration of the fit in addition. `verbose` yields detailed iteration
8285-
reports as it was the default before version 4.7.
8285+
reports as it was the default before version 5.
82868286

82878287
If the `errorvariables` option is turned on, the error of each fitted
82888288
parameter computed by `fit` will be copied to a user-defined variable

‎docs/titlepag.tex‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
%
2-
% $Id: titlepag.tex,v 1.36 2013/11/01 05:34:16 sfeam Exp $
2+
% $Id: titlepag.tex,v 1.37 2014/03/15 17:59:31 sfeam Exp $
33
%
44

55
\ifx\LaTeXe\undefined
@@ -125,12 +125,13 @@
125125

126126
Version
127127
\gnuplotVersion
128-
organized by: Hans-Bernhard Bröker, Ethan A Merritt, and others\\
128+
organized by: Ethan A Merritt and many others\\
129129

130130
\vspace{2ex}
131131

132132
Major contributors (alphabetic order):\\
133133

134+
Christoph Bersch,
134135
Hans-Bernhard Bröker,
135136
John Campbell,\\
136137
Robert Cunningham,
@@ -146,7 +147,8 @@
146147
Ed Kubaitis,
147148
Russell Lang,\\
148149
Timothée Lecomte,
149-
Alexander Lehmann,\\
150+
Alexander Lehmann,
151+
Jérôme Lodewyck,\\
150152
Alexander Mai,
151153
Bastian Märkisch, \\
152154
Ethan A Merritt,
@@ -159,7 +161,7 @@
159161
Alex Woo,
160162
Johannes Zellner\\
161163
Copyright {\copyright} 1986 - 1993, 1998, 2004 Thomas Williams, Colin Kelley\\
162-
Copyright {\copyright} 2004 - 2013 various authors\\
164+
Copyright {\copyright} 2004 - 2014 various authors\\
163165

164166
\vspace{2ex}
165167

@@ -172,8 +174,8 @@
172174

173175
\vspace{2ex}
174176

175-
% 8 March 2012 Version 4.7
176-
Version 4.7 (cvs snapshot Oct 2013)
177+
% 1 April 2014 Version 5.0
178+
Version 5.0 (cvs snapshot Mar 2014)
177179

178180
\end{center}
179181
\newpage

0 commit comments

Comments
 (0)

Back | FazBrowse Home | New Git URL