diff --git a/ChangeLog b/ChangeLog index fa7563a1a..7328aad70 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2014-03-15 Ethan A Merritt + + * configure.in VERSION PATCHLEVEL share/gnuplotrc src/version.c + demo/html/index.canvas demo/html/index.save demo/html/index.svg + docs/doc2texi.el docs/gnuplot.doc docs/titlepag.tex: + + >>>>> Bump version to 5.0 alpha <<<<< + 2014-03-15 Bastian Maerkisch * src/win/wgraph.c (MakeFonts) src/win/wgdiplus.c (SetFont_gdiplus): diff --git a/PATCHLEVEL b/PATCHLEVEL index 573541ac9..4a5800705 100644 --- a/PATCHLEVEL +++ b/PATCHLEVEL @@ -1 +1 @@ -0 +alpha diff --git a/VERSION b/VERSION index 4f8c63965..819e07a22 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.7 +5.0 diff --git a/configure.in b/configure.in index b3a27262c..5aadc6d47 100755 --- a/configure.in +++ b/configure.in @@ -1,12 +1,12 @@ dnl Process this file with autoconf to produce a configure script. dnl configure.in for gnuplot on Unix. dnl -dnl $Id: configure.in,v 1.356 2014/03/04 21:23:52 sfeam Exp $ +dnl $Id: configure.in,v 1.358 2014/03/15 17:59:31 sfeam Exp $ dnl dnl this is actually major.minor ... dnl note that for a non-beta release, we need to disable DEVELOPMENT_RELEASE dnl -AC_INIT(gnuplot, 4.7) +AC_INIT(gnuplot, 5.0) AC_CONFIG_SRCDIR(src/graphics.c) AC_PREREQ(2.60) AC_CONFIG_HEADERS(config.h:config.hin) @@ -90,9 +90,7 @@ AC_SEARCH_LIBS([cdawson], [cerf], ) dnl Various programs -dnl X/Emacs for building lisp packages and creating .texi version of docs -# If set to t, that means we are running in a shell under Emacs. -# If you have an Emacs named "t", then use the full path. +dnl X/Emacs for building .texi version of docs test x"$EMACS" = xt && EMACS= AC_CHECK_PROGS(EMACS, emacs xemacs, no) @@ -815,29 +813,6 @@ if test "$with_cwdrc" = yes; then [ Define if you want to read .gnuplot from current directory (SECURITY RISK!).]) fi - -dnl Conditional actions based on whether or not we want to build the lisp files -dnl This replaces a separate configure.in file in the lisp subdirectory -if test "$EMACS" = no; then - LISPFILES=noelcs - INSTALL_LISP=install-nolisp -else - LISPFILES=elcs - INSTALL_LISP=install-lisp -fi -AC_ARG_WITH(lisp-files,dnl -[ --without-lisp-files do not build emacs lisp files], - [if test "$with_lisp_files" = no; then - LISPFILES=noelcs - INSTALL_LISP=install-nolisp - fi]) -AM_PATH_LISPDIR -AC_SUBST(lispdir) -AC_SUBST(LISPFILES) -AC_SUBST(INSTALL_LISP) - - - dnl Sort help/subtopic tables by row or column AC_ARG_WITH(row-help,dnl [ --with-row-help format help and subtopic tables by row (default) @@ -1301,15 +1276,6 @@ if test -n "${DIST_CONTACT}"; then AC_DEFINE_UNQUOTED([DIST_CONTACT],["$DIST_CONTACT"],[Contact address for modified and binary distributed gnuplot versions]) fi -dnl build lisp files -if test "$with_lisp_files" != no; then - LISPDIR=lisp -else - LISPDIR= -fi -AC_SUBST(LISPDIR) -AM_CONDITIONAL(BUILD_LISP, test "${with_lisp_files}" != no) - dnl No configuration option for this one yet AC_DEFINE(MAX_PARALLEL_AXES,7, [Maximum number of parallel axes supported]) @@ -1331,7 +1297,6 @@ AC_OUTPUT([Makefile demo/Makefile demo/plugin/Makefile docs/Makefile - lisp/Makefile m4/Makefile man/Makefile share/Makefile @@ -1620,12 +1585,6 @@ AC_MSG_RESULT([]) AC_MSG_RESULT([gnuplot will install the following additional materials:]) AC_MSG_RESULT([]) -if test "$with_lisp_files" != no; then - AC_MSG_RESULT([ gnuplot-mode for X/Emacs: yes]) -else - AC_MSG_RESULT([ gnuplot-mode for X/Emacs: no]) -fi - if test "$TUTORIAL" = tutorial; then AC_MSG_RESULT([ LaTeX tutorial: yes]) else diff --git a/demo/html/index.canvas b/demo/html/index.canvas index 2d987f3b8..3ba1ef514 100644 --- a/demo/html/index.canvas +++ b/demo/html/index.canvas @@ -2,17 +2,17 @@ -Gnuplot 4.7 demo scripts run through the HTML canvas terminal +Gnuplot 5.0 demo scripts run through the HTML canvas terminal -

Gnuplot 4.7 demo scripts run through the HTML canvas terminal
+

Gnuplot 5.0 demo scripts run through the HTML canvas terminal
See also the demo output for the - PNG and - SVG terminals. + PNG and + SVG terminals.

Your browser may not support the HTML 5 canvas element

diff --git a/demo/html/index.save b/demo/html/index.save index 7a528d2eb..910b4eb84 100644 --- a/demo/html/index.save +++ b/demo/html/index.save @@ -5,8 +5,8 @@

Demo scripts for gnuplot CVS version (PNG terminal)
See also the demo output for the - SVG and - canvas terminals. + SVG and + canvas terminals.

diff --git a/demo/html/index.svg b/demo/html/index.svg index b2cf42274..7eff28eee 100644 --- a/demo/html/index.svg +++ b/demo/html/index.svg @@ -1,6 +1,6 @@ -Gnuplot Version 4.7 SVG terminal demos +Gnuplot Version 5.0 SVG terminal demos @@ -8,10 +8,10 @@

- Gnuplot Version 4.7 SVG terminal demos
+ Gnuplot Version 5.0 SVG terminal demos
See also the demo output for the - PNG and - canvas terminals. + PNG and + canvas terminals.

diff --git a/docs/doc2texi.el b/docs/doc2texi.el index 65cddaecd..b771b614a 100644 --- a/docs/doc2texi.el +++ b/docs/doc2texi.el @@ -180,8 +180,8 @@ If PATTERN is omitted, it defaults to \"[ \\f\\t\\n\\r\\v]+\"." An Interactive Plotting Program Thomas Williams & Colin Kelley - Version 4.7 organized by: - Hans-Bernhard Broeker, Ethan A Merritt, and others + Version 5.0 organized by + Ethan A Merritt with help from many others Copyright (C) 1986 - 1993, 1998, 2004 Thomas Williams, Colin Kelley Copyright (C) 2004 - 2012 various authors @@ -190,7 +190,7 @@ If PATTERN is omitted, it defaults to \"[ \\f\\t\\n\\r\\v]+\"." Mailing list for bug reports: gnuplot-bugs@@lists.sourceforge.net This manual was originally prepared by Dick Crawford - Version 4.7 - March 2012 + Version 5.0 - March 2014 Major contributors (alphabetic order): diff --git a/docs/gnuplot.doc b/docs/gnuplot.doc index 35ffbb47a..366648574 100644 --- a/docs/gnuplot.doc +++ b/docs/gnuplot.doc @@ -1,4 +1,4 @@ -C RCS $Id: gnuplot.doc,v 1.865 2014/03/14 00:10:11 sfeam Exp $ +C RCS $Id: gnuplot.doc,v 1.866 2014/03/15 17:59:31 sfeam Exp $ C C Copyright (C) 1986 - 1993, 1998, 1999, 2000, 2001, 2004 Thomas Williams, Colin Kelley et al. C @@ -6,7 +6,7 @@ C ?gnuplot ^

An Interactive Plotting Program

^

Thomas Williams & Colin Kelley

-^

Version 4.4 organized by Ethan A Merritt and others

+^

Version 5.0 organized by Ethan A Merritt and others

^

Major contributors (alphabetic order):
^
^ Hans-Bernhard Broeker, John Campbell,
@@ -24,7 +24,7 @@ C ^ James R. Van Zandt, Alex Woo, Johannes Zellner
^

^

Copyright (C) 1986 - 1993, 1998 - 2004 Thomas Williams, Colin Kelley
-^ Copyright (C) 2004 - 2011 various authors

+^ Copyright (C) 2004 - 2014 various authors

^

Mailing list for comments: gnuplot-info@lists.sourceforge.net
^ Mailing list for bug reports: gnuplot-bugs@lists.sourceforge.net
^ Web access (preferred): http://sourceforge.net/projects/gnuplot

@@ -72,7 +72,7 @@ C Gnuplot 3.0 additions: Gershon Elber and many others. - Gnuplot 4.0 additions: + Gnuplot 4.0 and 5.0 additions: See list of contributors at head of this document. 2 Introduction ?introduction @@ -4237,8 +4237,8 @@ Ffigure_mapcontours modifiers (`using`, `every`,...) except `smooth` are applicable to `fit`. See `plot datafile`. - The function being fit may have up to five independent variables (more in - gnuplot version 4.7). In the absence of a `using` specification, the fit + The function being fit may have up to 12 independent variables (more if + specially configured). In the absence of a `using` specification, the fit implicitly assumes there is only a single independent variable: z # 1 independent variable (line number) @@ -4267,7 +4267,7 @@ Ffigure_mapcontours x:y:s yerror (similar to `plot` with `yerrorbars`) - Note that for compatibility reasons with `gnuplot` versions prior to 4.7, + Note that for compatibility reasons with `gnuplot` versions prior to 5.0, the `error` keyword is not required. If you do not specify the error columns explicitly, there must be two more `using` qualifiers (z and s) than there are independent variables, unless there is only one variable. `gnuplot` then uses @@ -4605,7 +4605,7 @@ Ffigure_mapcontours ?commands fit control ?fit control Settings of the `fit` command are controlled by `set fit`. The old `gnuplot` - user variables are deprecated as of version 4.7, see `fit control variables`. + user variables are deprecated as of version 5, see `fit control variables`. There are a number of environment variables that can be defined to affect `fit` before starting `gnuplot`, see `fit control environment`. @@ -8282,7 +8282,7 @@ Ffigure_missing terminal session. `set fit quiet` turns off the echo, whereas `results` prints only final results. `brief` gives one line summaries for every iteration of the fit in addition. `verbose` yields detailed iteration - reports as it was the default before version 4.7. + reports as it was the default before version 5. If the `errorvariables` option is turned on, the error of each fitted parameter computed by `fit` will be copied to a user-defined variable diff --git a/docs/titlepag.tex b/docs/titlepag.tex index fe9c44c08..d2ff9bd4e 100644 --- a/docs/titlepag.tex +++ b/docs/titlepag.tex @@ -1,5 +1,5 @@ % -% $Id: titlepag.tex,v 1.36 2013/11/01 05:34:16 sfeam Exp $ +% $Id: titlepag.tex,v 1.37 2014/03/15 17:59:31 sfeam Exp $ % \ifx\LaTeXe\undefined @@ -125,12 +125,13 @@ Version \gnuplotVersion - organized by: Hans-Bernhard Bröker, Ethan A Merritt, and others\\ + organized by: Ethan A Merritt and many others\\ \vspace{2ex} Major contributors (alphabetic order):\\ + Christoph Bersch, Hans-Bernhard Bröker, John Campbell,\\ Robert Cunningham, @@ -146,7 +147,8 @@ Ed Kubaitis, Russell Lang,\\ Timothée Lecomte, - Alexander Lehmann,\\ + Alexander Lehmann, + Jérôme Lodewyck,\\ Alexander Mai, Bastian Märkisch, \\ Ethan A Merritt, @@ -159,7 +161,7 @@ Alex Woo, Johannes Zellner\\ Copyright {\copyright} 1986 - 1993, 1998, 2004 Thomas Williams, Colin Kelley\\ - Copyright {\copyright} 2004 - 2013 various authors\\ + Copyright {\copyright} 2004 - 2014 various authors\\ \vspace{2ex} @@ -172,8 +174,8 @@ \vspace{2ex} -% 8 March 2012 Version 4.7 - Version 4.7 (cvs snapshot Oct 2013) +% 1 April 2014 Version 5.0 + Version 5.0 (cvs snapshot Mar 2014) \end{center} \newpage diff --git a/share/gnuplotrc b/share/gnuplotrc index d46b881de..263228e3b 100644 --- a/share/gnuplotrc +++ b/share/gnuplotrc @@ -1,5 +1,5 @@ ### -### Gnuplot version 4.7 intialization file +### Gnuplot version 5.0 intialization file ### This file is loaded by gnuplot at the start of each run. ### It is provided as a template, with all commands commented out. ### Uncomment and customize lines for local use. diff --git a/src/version.c b/src/version.c index 8efe252c3..d31c7085a 100644 --- a/src/version.c +++ b/src/version.c @@ -1,5 +1,5 @@ #ifndef lint -static char *RCSid() { return RCSid("$Id: version.c,v 1.109 2013/09/18 00:03:05 sfeam Exp $"); } +static char *RCSid() { return RCSid("$Id: version.c,v 1.110 2014/03/15 17:59:32 sfeam Exp $"); } #endif /* GNUPLOT - version.c */ @@ -39,14 +39,14 @@ static char *RCSid() { return RCSid("$Id: version.c,v 1.109 2013/09/18 00:03:05 #include "syscfg.h" /* for FAQ_LOCATION */ -const char gnuplot_version[] = "4.7"; -const char gnuplot_patchlevel[] = "0"; +const char gnuplot_version[] = "5.0"; +const char gnuplot_patchlevel[] = "alpha"; #ifdef DEVELOPMENT_VERSION #include "timestamp.h" #else -const char gnuplot_date[] = "2013-09-17 "; +const char gnuplot_date[] = "2014-04-01 "; #endif -const char gnuplot_copyright[] = "Copyright (C) 1986-1993, 1998, 2004, 2007-2013"; +const char gnuplot_copyright[] = "Copyright (C) 1986-1993, 1998, 2004, 2007-2014"; const char faq_location[] = FAQ_LOCATION;