# # There was a serious bug in the 4.2.1 source release that caused # the axis labels to be ignored in 3D plots with "set view map". # This patch fixes that bug and another relatively trivial bug. # It is the complete set of differences between 4.2.1 and 4.2.2. # diff -urNP gnuplot-4.2.1/ChangeLog gnuplot-4.2.2/ChangeLog --- gnuplot-4.2.1/ChangeLog 2007-08-25 23:12:33.000000000 -0700 +++ gnuplot-4.2.2/ChangeLog 2007-08-30 23:33:03.000000000 -0700 @@ -1,3 +1,32 @@ +2007-08-31 Ethan Merritt + + The axis label bug is serious enough to warrant an updated release + IMHO. Obviously the release candidate for 4.2.1 didn't get enough + testing. + + src/version.c PATCHLEVEL configure.in docs/titlepag.tex + Increment patchlevel to 2 + +2007-08-28 Ethan Merritt + + * src/graph3d.c (draw_3d_graphbox): Fix bug that caused axis labels + not to be drawn in 'set view map' mode. This was supposed to have been + applied 2007-03-14 but somehow never made it into cvs. + Serious bug in 4.2.1 + +2007-08-28 Ethan Merritt + + * src/graphics.c (plot_c_bars): Apply border color from + 'set style fill' to filled candlesticks. + +2007-08-26 Ethan Merritt + + Tag version 4.2.1 using command + cvs tag -c "Release_4_2_1" + + Version 4.2.1 released via SourceForge. Any further commits to + this tree will be in 4.2.2 if such a version is ever released. + 2007-08-25 Ethan Merritt * src/version.c src/syscfg.h src/Makefile.am src/win/pgnuplot.c diff -urNP gnuplot-4.2.1/configure gnuplot-4.2.2/configure --- gnuplot-4.2.1/configure 2007-08-25 23:16:27.000000000 -0700 +++ gnuplot-4.2.2/configure 2007-08-30 23:35:07.000000000 -0700 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for gnuplot 4.2.1. +# Generated by GNU Autoconf 2.59 for gnuplot 4.2.2. # # Copyright (C) 2003 Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation @@ -267,8 +267,8 @@ # Identity of this package. PACKAGE_NAME='gnuplot' PACKAGE_TARNAME='gnuplot' -PACKAGE_VERSION='4.2.1' -PACKAGE_STRING='gnuplot 4.2.1' +PACKAGE_VERSION='4.2.2' +PACKAGE_STRING='gnuplot 4.2.2' PACKAGE_BUGREPORT='' ac_unique_file="src/graphics.c" @@ -827,7 +827,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures gnuplot 4.2.1 to adapt to many kinds of systems. +\`configure' configures gnuplot 4.2.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -893,7 +893,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of gnuplot 4.2.1:";; + short | recursive ) echo "Configuration of gnuplot 4.2.2:";; esac cat <<\_ACEOF @@ -1076,7 +1076,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -gnuplot configure 4.2.1 +gnuplot configure 4.2.2 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -1090,7 +1090,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by gnuplot $as_me 4.2.1, which was +It was created by gnuplot $as_me 4.2.2, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1737,7 +1737,7 @@ # Define the identity of the package. PACKAGE='gnuplot' - VERSION='4.2.1' + VERSION='4.2.2' cat >>confdefs.h <<_ACEOF @@ -14780,7 +14780,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by gnuplot $as_me 4.2.1, which was +This file was extended by gnuplot $as_me 4.2.2, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -14843,7 +14843,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -gnuplot config.status 4.2.1 +gnuplot config.status 4.2.2 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff -urNP gnuplot-4.2.1/configure.in gnuplot-4.2.2/configure.in --- gnuplot-4.2.1/configure.in 2007-08-04 15:43:36.000000000 -0700 +++ gnuplot-4.2.2/configure.in 2007-08-30 23:28:21.000000000 -0700 @@ -6,7 +6,7 @@ dnl this is actually major.minor ... dnl note that for a non-beta release, we need to dnl remove the letter from VERSION -AC_INIT(gnuplot, 4.2.1) +AC_INIT(gnuplot, 4.2.2) AC_CONFIG_SRCDIR(src/graphics.c) AC_PREREQ(2.58) AM_CONFIG_HEADER(config.h:config.hin) diff -urNP gnuplot-4.2.1/docs/titlepag.tex gnuplot-4.2.2/docs/titlepag.tex --- gnuplot-4.2.1/docs/titlepag.tex 2007-03-03 16:19:12.000000000 -0800 +++ gnuplot-4.2.2/docs/titlepag.tex 2007-08-30 23:29:58.000000000 -0700 @@ -147,14 +147,15 @@ \vspace{2ex} Mailing list for comments: \verb+gnuplot-info@lists.sourceforge.net+\\ - Mailing list for bug reports: \verb+gnuplot-bugs@lists.sourceforge.net+ + Mailing list for bug reports: \verb+gnuplot-bugs@lists.sourceforge.net+\\ + Web access (preferred): \verb+http://sourceforge.net/projects/gnuplot+ \vfill - This manual was prepared by Dick Crawford. \\ + This manual was originally prepared by Dick Crawford. \\ \vspace{2ex} - 3 March 2007 + 31 August 2007 \end{center} \newpage diff -urNP gnuplot-4.2.1/PATCHLEVEL gnuplot-4.2.2/PATCHLEVEL --- gnuplot-4.2.1/PATCHLEVEL 2007-08-04 15:09:30.000000000 -0700 +++ gnuplot-4.2.2/PATCHLEVEL 2007-08-30 23:26:58.000000000 -0700 @@ -1 +1 @@ -1 +2 diff -urNP gnuplot-4.2.1/src/graph3d.c gnuplot-4.2.2/src/graph3d.c --- gnuplot-4.2.1/src/graph3d.c 2007-08-12 11:01:44.000000000 -0700 +++ gnuplot-4.2.2/src/graph3d.c 2007-08-30 18:40:32.000000000 -0700 @@ -1,5 +1,5 @@ #ifndef lint -static char *RCSid() { return RCSid("$Id: graph3d.c,v 1.157.2.11 2007/08/12 18:01:44 sfeam Exp $"); } +static char *RCSid() { return RCSid("$Id: graph3d.c,v 1.157.2.12 2007/08/30 19:24:02 sfeam Exp $"); } #endif /* GNUPLOT - graph3d.c */ @@ -2341,7 +2341,8 @@ /* label at xaxis_y + 1/4 of (xaxis_y-other_y) */ #ifdef USE_GRID_LAYERS /* FIXME: still needed??? what for? */ if ((surface_rot_x <= 90 && BACKGRID != whichgrid) || - (surface_rot_x > 90 && FRONTGRID != whichgrid)) { + (surface_rot_x > 90 && FRONTGRID != whichgrid) || + splot_map) { #endif unsigned int x1, y1; int tmpx, tmpy; @@ -2434,7 +2435,8 @@ if (Y_AXIS.label.text) { #ifdef USE_GRID_LAYERS if ((surface_rot_x <= 90 && BACKGRID != whichgrid) || - (surface_rot_x > 90 && FRONTGRID != whichgrid)) { + (surface_rot_x > 90 && FRONTGRID != whichgrid) || + splot_map) { #endif unsigned int x1, y1; int tmpx, tmpy; diff -urNP gnuplot-4.2.1/src/graphics.c gnuplot-4.2.2/src/graphics.c --- gnuplot-4.2.1/src/graphics.c 2007-08-12 11:01:44.000000000 -0700 +++ gnuplot-4.2.2/src/graphics.c 2007-08-28 22:00:46.000000000 -0700 @@ -1,5 +1,5 @@ #ifndef lint -static char *RCSid() { return RCSid("$Id: graphics.c,v 1.194.2.13 2007/08/12 18:01:44 sfeam Exp $"); } +static char *RCSid() { return RCSid("$Id: graphics.c,v 1.194.2.14 2007/08/29 05:00:46 sfeam Exp $"); } #endif /* GNUPLOT - graphics.c */ @@ -3830,7 +3830,7 @@ ymax = map_y(yopen); ymin = map_y(yclose); } - if (term->fillbox) { + if ((plot->fill_properties.fillstyle != FS_EMPTY) && term->fillbox) { int style = style_from_fill(&plot->fill_properties); unsigned int x = xlowM; unsigned int y = ymin; @@ -3841,6 +3841,10 @@ (*t->filled_polygon)(4, fill_corners(style,x,y,w,h)); else (*t->fillbox)(style, x, y, w, h); + + if ((plot->fill_properties.border_linetype != LT_NODRAW) + && (plot->fill_properties.border_linetype != LT_UNDEFINED)) + (*t->linetype)(plot->fill_properties.border_linetype); } /* Draw whiskers and an open box */ @@ -3868,6 +3872,16 @@ (*t->vector) (xhighM-d, ylowM); } + /* Reset to original color, if we changed it for the border */ + if ((plot->fill_properties.fillstyle != FS_EMPTY) && term->fillbox) { + if ((plot->fill_properties.border_linetype != LT_NODRAW) + && (plot->fill_properties.border_linetype != LT_UNDEFINED)) { + (*t->linetype)(plot->lp_properties.l_type); + if (plot->lp_properties.use_palette) + apply_pm3dcolor(&plot->lp_properties.pm3d_color,t); + } + } + /* draw two extra vertical bars to indicate open > close */ if (yopen > yclose) { (*t->move) ( (xM + xlowM) / 2, ymin); diff -urNP gnuplot-4.2.1/src/version.c gnuplot-4.2.2/src/version.c --- gnuplot-4.2.1/src/version.c 2007-08-25 23:15:51.000000000 -0700 +++ gnuplot-4.2.2/src/version.c 2007-08-30 23:26:20.000000000 -0700 @@ -40,8 +40,8 @@ const char gnuplot_version[] = "4.2"; -const char gnuplot_patchlevel[] = "1 "; -const char gnuplot_date[] = "27 Aug 2007"; +const char gnuplot_patchlevel[] = "2 "; +const char gnuplot_date[] = "31 Aug 2007"; const char gnuplot_copyright[] = "Copyright (C) 1986 - 1993, 1998, 2004, 2007"; const char faq_location[] = FAQ_LOCATION;