diff -Nru gnuplot-4.6.4/ChangeLog gnuplot-4.6.5/ChangeLog --- gnuplot-4.6.4/ChangeLog 2013-10-06 22:24:18.000000000 +0000 +++ gnuplot-4.6.5/ChangeLog 2014-02-23 18:20:41.000000000 +0000 @@ -1,3 +1,303 @@ +2014-02-26 Release 4.6.5 (cvs tag Release_4_6_5) + +2014-02-14 Ethan A Merritt + + * src/qtterminal/qt_term.cpp (qt_waitforinput): + If the amount of data available via the socket from gnuplot_qt is too + small to be an event structure, issue an error and continue rather than + spinning futilely. Suggested by Yuriy Kaminskiy + + * src/qtterminal/qt_term.cpp (qt_connectToServer): + The timeout parameter in socket.waitForConnected() cannot be used to + wait for an unready socket, as that returns an error immediately. + Rewrite the delay loop using an explicit GP_SLEEP() instead. + Also increase the overall timeout for the retry loop. + +2014-02-11 Bastian Maerkisch + + * src/win/wgraph.c: Horizontal scroll wheel support. + +2014-02-04 Ethan A Merritt + + * configure.in src/wxterminal/wxt_gui.h: New configure option + --with-wx-single-threaded forces the WXT_MONOTHREADED code option even + if the platform otherwise would default to WXT_MULTITHREADED. + This is intended to provide a workaround for reported problems using + the wxt terminal on Haswell CPUs, where apparently gnuplot's use of a + mutex to synchronize communication with the gui can fail badly. + + * term/svg.trm: Remove "horrible kludge" added in 2011 to work around + a bug in Firefox 3.x rendering. Now it is causing more problems than it + solves. + +2014-01-31 Ethan A Merritt + + * src/datafile.c (df_tokenise): Fix off-by-one allocation error + affecting cvs files. + Bug #1333 + +2014-01-30 Jon Gjengset + + * src/gp_types.h src/interpol.c src/interpol.h src/plot2d.c + src/tables.c docs/gnuplot.doc: New smoothing option "unwrap" adjusts + input y values by multiples of 2pi so that the difference between two + successive y values is never more than pi. + +2014-01-30 Ethan A Merritt + + * src/qtterminal/QtGnuplotScene.cpp (mouseReleaseEvent): + Timing initialization failure of mouse clicks can result in a spurious + event that the program does not handle well. + +2014-01-29 Jérôme Lodewyck + + * src/command.c: Update GPVAL_* variables after a refresh command. + Bug #1327 + +2014-01-27 Ethan A Merritt + + * src/time.c (xstrftime): Explicit use of (double) when processing + fractional seconds. + + * src/datafile.c: [xyz]ticlabels were losing resolution due to being + passed through a float rather than a double. + +2014-01-26 Ethan A Merritt + + * src/plot2d.c: Fix several problems with autoscaling of plots in + polar mode (related to Bug #1323). + +2014-01-13 Ethan A Merritt + + * src/set.c (set_palette_defined set_clip set_encoding): + Fuzz-testing found improper handling of END_OF_COMMAND cases. + +2014-01-11 Bastian Maerkisch + + * src/readline.c (readline, ansi_getc) src/win/wtext.c (WndTextProc) + src/win/winmain.c (ConsoleGetch): Builtin-readline: Shift-Tab cycles + through the list of completions in reverse direction. + + * src/win/winmain.c: Current version of MinGW does not offer working + version of __argc/__argv, but _argv/_argv. A web search shows that + MinGW-w64 is different. This is a bug in MinGW's runtime. + + * win/gnuplot.iss (MinVersion): Minimum required version of the + installer is XP. + +2014-01-10 Ethan A Merritt + + * src/plot2d.c: Fix iteration over parametric function plots. + Bug #1314 + + * src/datafile.c (df_generate_pseudodata): Allow use of '++' pseudofile + to sample the parametric variables U and V in 3D parametric mode. + +2014-01-03 Christoph Bersch + + * src/graphics.c (do_key_sample): Apply requested border around filled + circle or ellipse used as a key sample. + Bug #1315 + +2014-01-03 Ethan A Merritt + + * src/datafile.c (df_generate_pseudodata): Allow use of '+' pseudofile + to sample the parametric variable T in 2D parametric mode. + +2013-12-31 Bastian Maerkisch + + * src/graphics.c (get_arrow) src/term.c (do_arc): The aspect ratio + of the internal coordinates of the windows terminal is always one. + Bug #1253 + + * src/win/wtext.c (WndTextProc) src/fit.c (regress): The ctrlc_flag + got clobbered due to a missing break statement. + +2013-12-31 Ethan A Merritt + + Increment patchlevel to 4.6.5 + +2013-12-29 Bastian Maerkisch + + * src/win/wgraph.c (drawgraph) term/win.trm (WIN_filled_polygon): + Rectangular filled polygons are drawn using boxfill. This routine + contained a bug in the allocation of an internal bitmap which prevented + those polygons from being drawn under certain circumstances. The + routine was also sensitive to the order of the corner points. + Bug #1279 + +2013-12-26 Ethan A Merritt + + * src/gp_types.h src/plot2d.c src/tables.c src/interpol.c src/interpol.h + docs/gnuplot.doc: + + New smoothing option "mcsplines" - piecewise monotonic cubic splines + calculated using the algorithm of FN Fritsch & RE Carlson (1980), + SIAM Journal on Numerical Analysis 17: 238-246. + +2013-12-21 Ethan A Merritt + + * src/Makefile.am: automake 1.14 wants an option subdir-objects + + * configure.in src/show.c: + The option --enable-thin-splines no longer does anything; remove it. + + * src/parse.c (next_iteration): survive clobbered iteration variable + Bug #1312 + +2013-12-15 Jyrki Yli-Nokari + + * src/bitmap.c configure.in: + Jyrki Yli-Nokari, the original author of the code in bitmap.c, + has agreed to relicense it as dual license (gnuplot + BSD). + This removes a restriction to non-commercial use imposed by the + license terms that appeared in earlier versions of file bitmap.c. + +2013-12-12 Erik Olofsen + + * term/tek.trm: New terminal driver "sixel" for old DEC terminals + and printers, emulated by some versions of xterm. + +2013-12-12 Ethan A Merritt + + * src/util.h (gprintf): Interpret %h as %g (forward compatibility + with version 4.7 save files). + + * term/emf.trm: Invalidate font name at start of each plot. + Bug #1306 + + * src/wxterminal/gp_cairo.c src/wxterminal/wxt_gui.*: + Modify vertical centering of enhanced text to match default case. + Bug #1309 + +2013-12-11 Ethan A Merritt + + * src/graph3d.c (key_text): Apply key title font to key entries. + Bug #1309 + +2013-12-11 Shigeharu Takeno + + * term/emf.trm: Support true pattern-fill. Apply global linewidth. + +2013-11-14 Ethan A Merritt + + * src/plot2d.c src/plot3d.c: + Allowed enhanced/noenhanced key word after individual plot titles. + +2013-11-10 Ethan A Merritt + + * src/mouse.c (event_buttonrelease): "pause mouse" only worked for + center and right mouse buttons, not for left mouse. + Bug #1301 + +2013-11-09 Ethan A Merritt + + * src/qtterminal/qt_term.cpp (qt_set_color): Do not change line type + just because a color request specifies a linetype color. + Bugfix. + + * Add a check for valid timer status. This reduces the number of + spurious events that are passed through to the main program. + +2013-11-07 Ethan A Merritt + + * src/save.c (save_range): Due to a typo, the fix/nofix axis property + was not written out by the "save" command. + +2013-10-29 Ethan A Merritt + + * src/datafile.c src/datafile.h (MAXDATACOLS): (MAXDATACOLS=7) assumed + that every column in a using spec needs to be stored in the coordinate + data structure. But that is no longer true since xticlabel and friends + take up a using spec column but store their content elsewhere. Increase + MAXDATACOLS from 7 to 11 (6 data + 1 variable color + 4 axis ticlabels). + Bug #1297 + +2013-10-27 Ethan A Merritt + + * src/graph3d.c src/plot3d.c src/misc.c(lp_parse): + Fix several bugs involving color assignment to contour lines. + Unfortunately this negates a previous fix that allowed explicit surface + colors in a hidden3d plot to implicitly do "set hidden3d offset 0". + Bug #1284 and others. + +2013-10-25 Ethan A Merritt + + * src/datafile.c (df_readascii df_readmatrix): If the first field of a + tab-separated csv file was empty, it would be incorrectly ignored when + processing that input line. + Bugfix. + + * src/wxterminal/wxt_gui.cpp: Extend toggling active region in key box + to include enhanced text as well as non-enhanced text. + Bugfix. + +2013-10-25 Thomas Bleher + + * src/getcolor.c (quantize_gray): Windows compile error ("small" is not + accepted as a variable name). + +2013-10-23 Ethan A Merritt + + * src/plot.c (main): If commands are being executed interactively + because the user said something like "gnuplot -", then execution should + continue after an error message just as in a normal interactive session. + Bug #1295 + + * src/mouse.c (event_reset): Must not send commands to the terminal if + it has not yet been initialized. + +2013-10-23 Ethan A Merritt + + * src/plot.c (main): If commands are being executed interactively + because the user said something like "gnuplot -", then execution should + continue after an error message just as in a normal interactive session. + Bug #1295 + +2013-10-21 Christoph Bersch + + * src/gadgets.h src/graphics.c src/graphics.h src/save.c src/set.c + demo/clipobject.dem docs/gnuplot.doc: + New object attribute clip/noclip. "clip" retains the current default, + clip to plot boundary unless one or more vertices are given in screen + coordinates. "noclip" clips to the canvas. Does not fix broken ellipse + clipping. + +2013-10-21 Ethan A Merritt + + * src/color.h src/set.c src/getcolor.c (quantize_gray): + Change the algorithm used to assign palette colors in the case + set palette defined (...) maxcolors N + where the gradient boundaries are unevenly spaced. Previous versions + of quantize_gray() have shown a variety of bad outcomes. This version + has fewer, less ugly, bad outcomes but it is still sensitive to the + choice of maxcolors. Try changing maxcolors by +/- one if the generated + palette is bad. + Bug #1140 and others + + * src/command.c (test_palette_subcommand): The "test palette" command + does not need to zero the current input line, and hasn't needed to since + lf_push/lf_pop were introduced 5 years ago. + +2013-10-17 Ethan A Merritt + + * src/save.c (place_objects): "show object N" was incorrectly printing + lines for other objects as well. + +2013-10-16 Shigeharu Takeno + + * docs/gnuplot-ja.doc docs/term-ja.diff: + Sync with English documentation rev. 1.701.2.30 + +2013-10-14 Ethan A Merritt + + * src/pm3d.c: Allow "set pm3d top/bottom" and "set pm3d interpolate N,M" + to be active at the same time. + + * src/axis.c (gen_tics): Suppress log-scaled mtics and minor grid lines + that would lie on top of the major tic/grid. + Bug #1292 + 2013-10-06 Tag Release_4_6_4 2013-10-02 Ethan A Merritt diff -Nru gnuplot-4.6.4/config.hin gnuplot-4.6.5/config.hin --- gnuplot-4.6.4/config.hin 2013-10-03 19:03:55.000000000 +0000 +++ gnuplot-4.6.5/config.hin 2014-02-23 18:21:09.000000000 +0000 @@ -487,9 +487,6 @@ /* Define if you want to use the sunview terminal (sun). */ #undef SUN -/* Define to use thin plate spines. */ -#undef THIN_PLATE_SPLINES_GRID - /* Define if the 3dkit libray is present. */ #undef THREEDKIT diff -Nru gnuplot-4.6.4/configure gnuplot-4.6.5/configure --- gnuplot-4.6.4/configure 2013-10-03 19:03:59.000000000 +0000 +++ gnuplot-4.6.5/configure 2014-02-23 18:21:13.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for gnuplot 4.6.4. +# Generated by GNU Autoconf 2.69 for gnuplot 4.6.5. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -577,8 +577,8 @@ # Identity of this package. PACKAGE_NAME='gnuplot' PACKAGE_TARNAME='gnuplot' -PACKAGE_VERSION='4.6.4' -PACKAGE_STRING='gnuplot 4.6.4' +PACKAGE_VERSION='4.6.5' +PACKAGE_STRING='gnuplot 4.6.5' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -829,7 +829,6 @@ enable_mouse enable_x11_mbfonts enable_x11_external -enable_thin_splines enable_volatile_data enable_raise_console enable_objects @@ -838,6 +837,7 @@ enable_h3d_gridbox enable_wxwidgets with_wx_config +with_wx_single_threaded with_bitmap_terminals with_cairo enable_backwards_compatibility @@ -1420,7 +1420,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.6.4 to adapt to many kinds of systems. +\`configure' configures gnuplot 4.6.5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1490,7 +1490,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of gnuplot 4.6.4:";; + short | recursive ) echo "Configuration of gnuplot 4.6.5:";; esac cat <<\_ACEOF @@ -1511,7 +1511,6 @@ --disable-mouse disable mouse for interactive terminals --disable-x11-mbfonts disable multi-byte font support for x11 --disable-x11-external disable drawing to windows belonging to external apps - --enable-thin-splines enable thin plate splines --disable-volatile-data disable zooming of volatile data --disable-raise-console spacebar in plot window does not raise console --disable-objects disable rectangles and other objects @@ -1558,6 +1557,7 @@ --with-tutorial process the LaTeX tutorial when building --with-wx-config=PATH Use the given path to wx-config, the wxWidgets configuration program (default search in $PATH) + --with-wx-single-threaded do not use multithreaded wxgtk even if available --with-bitmap-terminals dot-matrix printers and pbm --without-cairo cairo-based terminals (default enabled) @@ -1675,7 +1675,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -gnuplot configure 4.6.4 +gnuplot configure 4.6.5 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2253,7 +2253,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.6.4, which was +It was created by gnuplot $as_me 4.6.5, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3120,7 +3120,7 @@ # Define the identity of the package. PACKAGE='gnuplot' - VERSION='4.6.4' + VERSION='4.6.5' cat >>confdefs.h <<_ACEOF @@ -11496,16 +11496,6 @@ TERMLIBS="$VGAGLLIB $TERMLIBS" -# Check whether --enable-thin-splines was given. -if test "${enable_thin_splines+set}" = set; then : - enableval=$enable_thin_splines; if test "$enableval" = yes; then - -$as_echo "#define THIN_PLATE_SPLINES_GRID 1" >>confdefs.h - - fi -fi - - # Check whether --enable-volatile-data was given. if test "${enable_volatile_data+set}" = set; then : enableval=$enable_volatile_data; @@ -12867,6 +12857,13 @@ fi +# Check whether --with-wx-single-threaded was given. +if test "${with_wx_single_threaded+set}" = set; then : + withval=$with_wx_single_threaded; WX_CXXFLAGS="$WX_CXXFLAGS -DWXT_MONOTHREADED" +fi + + + pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK28" >&5 $as_echo_n "checking for GTK28... " >&6; } @@ -14284,7 +14281,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by gnuplot $as_me 4.6.4, which was +This file was extended by gnuplot $as_me 4.6.5, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -14350,7 +14347,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -gnuplot config.status 4.6.4 +gnuplot config.status 4.6.5 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -15404,8 +15401,6 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: dot-matrix terminals: no" >&5 $as_echo " dot-matrix terminals: no" >&6; } fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: NB: copyright may restrict commercial use" >&5 -$as_echo " NB: copyright may restrict commercial use" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: epson, nec, okidata, tandy, and seiko dp414 printers" >&5 $as_echo " epson, nec, okidata, tandy, and seiko dp414 printers" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: hp500c, hpdj, hpljii, hppj, pbm, starc" >&5 @@ -15562,8 +15557,13 @@ fi if test "$enable_wxwidgets_ok" = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: wxt terminal: yes " >&5 + if test "$with_wx_single_threaded" = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: wxt terminal: yes (single-threaded)" >&5 +$as_echo " wxt terminal: yes (single-threaded)" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: wxt terminal: yes " >&5 $as_echo " wxt terminal: yes " >&6; } + fi else { $as_echo "$as_me:${as_lineno-$LINENO}: result: wxt terminal: no (requires C++, wxWidgets>2.6, cairo>0.9, pango>1.10)" >&5 $as_echo " wxt terminal: no (requires C++, wxWidgets>2.6, cairo>0.9, pango>1.10)" >&6; } @@ -15723,14 +15723,6 @@ $as_echo " Use TeX kpsexpand to search for fonts: no (use --with-kpsexpand to enable)" >&6; } fi -if test "$enable_thin_splines" = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Thin plate splines: yes" >&5 -$as_echo " Thin plate splines: yes" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Thin plate splines: no (use --enable-thin-splines to enable)" >&5 -$as_echo " Thin plate splines: no (use --enable-thin-splines to enable)" >&6; } -fi - if test "$enable_h3d_gridbox" = yes; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: Hidden3d optimization: gridbox" >&5 $as_echo " Hidden3d optimization: gridbox" >&6; } diff -Nru gnuplot-4.6.4/configure.in gnuplot-4.6.5/configure.in --- gnuplot-4.6.4/configure.in 2013-09-05 19:10:58.000000000 +0000 +++ gnuplot-4.6.5/configure.in 2014-02-04 22:11:47.000000000 +0000 @@ -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.297.2.24 2013/09/05 19:10:58 sfeam Exp $ +dnl $Id: configure.in,v 1.297.2.28 2014/02/04 22:11:47 sfeam Exp $ dnl 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.6.4) +AC_INIT(gnuplot, 4.6.5) AC_CONFIG_SRCDIR(src/graphics.c) AC_PREREQ(2.60) AC_CONFIG_HEADERS(config.h:config.hin) @@ -861,14 +861,6 @@ TERMLIBS="$VGAGLLIB $TERMLIBS" -dnl thin plate splines patch -AC_ARG_ENABLE(thin-splines,dnl -[ --enable-thin-splines enable thin plate splines], - [if test "$enableval" = yes; then - AC_DEFINE(THIN_PLATE_SPLINES_GRID,1, - [ Define to use thin plate spines. ]) - fi]) - dnl zooming of volatile data AC_ARG_ENABLE(volatile-data,dnl [ --disable-volatile-data disable zooming of volatile data],, @@ -1042,6 +1034,12 @@ WX_LIBS="$WX_LIBS $GTK_LIBS" fi + dnl The user can force single-threaded mode + AC_ARG_WITH(wx-single-threaded, dnl + [--with-wx-single-threaded do not use multithreaded wxgtk even if available], + WX_CXXFLAGS="$WX_CXXFLAGS -DWXT_MONOTHREADED", + ) + dnl Check for gtk>2.8 for direct rendering to screen PKG_CHECK_MODULES(GTK28, [gtk+-2.0 >= 2.8.0], have_gtk28=yes, have_gtk28=no) if test "${have_gtk28}" = yes ; then @@ -1268,7 +1266,6 @@ else AC_MSG_RESULT([ dot-matrix terminals: no]) fi -AC_MSG_RESULT([ NB: copyright may restrict commercial use]) AC_MSG_RESULT([ epson, nec, okidata, tandy, and seiko dp414 printers]) AC_MSG_RESULT([ hp500c, hpdj, hpljii, hppj, pbm, starc]) AC_MSG_RESULT([]) @@ -1383,7 +1380,11 @@ fi if test "$enable_wxwidgets_ok" = yes; then - AC_MSG_RESULT([ wxt terminal: yes ]) + if test "$with_wx_single_threaded" = yes; then + AC_MSG_RESULT([ wxt terminal: yes (single-threaded)]) + else + AC_MSG_RESULT([ wxt terminal: yes ]) + fi else AC_MSG_RESULT([ wxt terminal: no (requires C++, wxWidgets>2.6, cairo>0.9, pango>1.10)]) fi @@ -1499,12 +1500,6 @@ AC_MSG_RESULT([ Use TeX kpsexpand to search for fonts: no (use --with-kpsexpand to enable)]) fi -if test "$enable_thin_splines" = yes; then - AC_MSG_RESULT([ Thin plate splines: yes]) -else - AC_MSG_RESULT([ Thin plate splines: no (use --enable-thin-splines to enable)]) -fi - if test "$enable_h3d_gridbox" = yes; then AC_MSG_RESULT([ Hidden3d optimization: gridbox]) else diff -Nru gnuplot-4.6.4/debian/changelog gnuplot-4.6.5/debian/changelog --- gnuplot-4.6.4/debian/changelog 2014-02-08 19:44:43.000000000 +0000 +++ gnuplot-4.6.5/debian/changelog 2014-02-28 22:20:23.000000000 +0000 @@ -1,3 +1,9 @@ +gnuplot (4.6.5-1) unstable; urgency=medium + + * [aec9b9b] Imported Upstream version 4.6.5 + + -- Anton Gladky Fri, 28 Feb 2014 23:20:14 +0100 + gnuplot (4.6.4-2) unstable; urgency=medium * [67fb69c] Add texlive-fonts-recommended to Build-Depends. (Closes: #738212) diff -Nru gnuplot-4.6.4/debian/patches/04_fix_libexecdir.diff gnuplot-4.6.5/debian/patches/04_fix_libexecdir.diff --- gnuplot-4.6.4/debian/patches/04_fix_libexecdir.diff 2013-05-01 18:26:16.000000000 +0000 +++ gnuplot-4.6.5/debian/patches/04_fix_libexecdir.diff 2014-02-28 22:17:56.000000000 +0000 @@ -3,7 +3,7 @@ --- a/src/Makefile.am +++ b/src/Makefile.am @@ -2,7 +2,7 @@ - AUTOMAKE_OPTIONS = foreign + AUTOMAKE_OPTIONS = foreign subdir-objects # in the spirit of automake ... -pkglibexecdir = $(libexecdir)/@PACKAGE@/@VERSION_MAJOR@ diff -Nru gnuplot-4.6.4/debian/patches/08_do_not_set_qt_default_term.patch gnuplot-4.6.5/debian/patches/08_do_not_set_qt_default_term.patch --- gnuplot-4.6.4/debian/patches/08_do_not_set_qt_default_term.patch 2013-05-01 18:27:20.000000000 +0000 +++ gnuplot-4.6.5/debian/patches/08_do_not_set_qt_default_term.patch 2014-02-28 22:18:11.000000000 +0000 @@ -5,7 +5,7 @@ --- a/src/term.c +++ b/src/term.c -@@ -1770,14 +1770,14 @@ +@@ -1774,14 +1774,14 @@ term_name = "sun"; #endif /* SUN */ diff -Nru gnuplot-4.6.4/demo/clipobject.dem gnuplot-4.6.5/demo/clipobject.dem --- gnuplot-4.6.4/demo/clipobject.dem 1970-01-01 00:00:00.000000000 +0000 +++ gnuplot-4.6.5/demo/clipobject.dem 2014-01-13 21:54:03.000000000 +0000 @@ -0,0 +1,79 @@ +# +# Demo and test for clipping applied to objects. +# axis coordinates run from [-1:1] +# graph coordinates from from [0:1] +# screen coordinates from from [0.2:0.8] +# +reset + +set title "Default object clipping" +set label 1 at graph 0.5, 0.9 center +set label 1 "Outer = screen coords\nMiddle = graph coords\nInner = axis coords" + +set xrange[-1:1] +set yrange[-1:1] +set macros +fs="fillstyle solid 1.0 border lc rgb 'black' lw 2" + +set lmargin at screen 0.2 +set rmargin at screen 0.8 +set tmargin at screen 0.8 +set bmargin at screen 0.2 + +set object 1 rectangle from screen 0.1,screen 0.1 to screen 0.4, screen 0.4 +set object 1 fc rgb '#880000' @fs + +set object 11 rectangle from first -1.1,first -1.1 to first -0.9, first -0.9 +set object 11 fc rgb 'red' @fs +set object 11 front + +set object 111 rectangle from graph -.1, -.1 to graph .1,.1 +set object 111 fc rgb "#DDAA00' @fs + + +set object 2 circle at screen 0.2, screen 0.8 radius screen 0.1 +set object 2 fc rgb '#008800' @fs + +set object 22 circle at first -1, 1 radius first .15 +set object 22 fc rgb 'green' @fs +set object 22 front + +set object 222 circle at graph 0, graph 1 radius graph 0.1 +set object 222 fc rgb '#00DDAA' @fs + + +set object 3 polygon from screen 0.6,screen 0.6 rto 0.4,0 rto -0.2,0.4 +set object 3 fc rgb '#BBBB00' @fs + +set object 33 polygon from first 0.8,first 0.8 rto first 0.4,0 rto first -0.2, 0.4 +set object 33 fc rgb 'yellow' @fs +set object 33 front + +set object 333 polygon from graph .8,graph .8 rto graph 0.4,0 rto graph -0.2, 0.4 +set object 333 fc rgb '#AAAA88' @fs + +set object 4 ellipse at screen 0.8, screen 0.2 size screen 0.3, 0.25 +set object 4 fc rgb '#4444bb' @fs + +set object 44 ellipse at first 1, -1 size first 0.4, first 0.25 +set object 44 fc rgb "cyan" @fs +set object 44 front + +set object 444 ellipse at graph 1,graph 0 size first 0.8, first 0.5 +set object 444 fc rgb '#6666ff' @fs + + +plot 0 + +pause -1 "Hit return to continue" + +set title "Object property 'noclip'" + +do for [i=1:4]{ set object i noclip; set object i*11 noclip; set object i*111 noclip; } + +plot 0 + +pause -1 "Hit return to continue" + +undefine fs +reset diff -Nru gnuplot-4.6.4/demo/datastrings.dem gnuplot-4.6.5/demo/datastrings.dem --- gnuplot-4.6.4/demo/datastrings.dem 2009-07-14 00:00:44.000000000 +0000 +++ gnuplot-4.6.5/demo/datastrings.dem 2014-01-13 21:56:04.000000000 +0000 @@ -99,9 +99,5 @@ '' 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 " to view star map" -# -reset -load "starmap.dem" -# pause -1 " to end demo" +reset diff -Nru gnuplot-4.6.4/demo/Makefile.am gnuplot-4.6.5/demo/Makefile.am --- gnuplot-4.6.4/demo/Makefile.am 2013-10-03 19:03:55.000000000 +0000 +++ gnuplot-4.6.5/demo/Makefile.am 2014-02-23 18:21:09.000000000 +0000 @@ -75,10 +75,10 @@ histerror.dat histopt.dat immigration.dat klein.dat lcdemo.dat moli3.dat \ optimize.dat orbital_elements.dat rgb_variable.dat scatter2.dat silver.dat \ soundvel.dat srl.dat steps.dat table.dat timedat.dat triangle.dat \ -using.dat whale.dat world.dat airfoil.dem all.dem animate2.dem \ -animate.dem approximate.dem arrowstyle.dem autoscale.dem barchart_art.dem \ -binary.dem bivariat.dem borders.dem boxplot.dem candlesticks.dem \ -charset.dem circles.dem cities.dem colorscheme.dem colorwheel.dem \ +using.dat whale.dat world.dat airfoil.dem all.dem animate2.dem animate.dem \ +approximate.dem arrowstyle.dem autoscale.dem barchart_art.dem binary.dem \ +bivariat.dem borders.dem boxplot.dem candlesticks.dem charset.dem \ +circles.dem cities.dem clipobject.dem colorscheme.dem colorwheel.dem \ contours.dem controls.dem dashcolor.dem datastrings.dem dgrid3d.dem \ discrete.dem electron.dem ellipse.dem ellipses_style.dem enhancedtext.dem \ enhanced_utf8.dem epslatex.dem fillbetween.dem fillcrvs.dem fillstyle.dem \ diff -Nru gnuplot-4.6.4/demo/Makefile.in gnuplot-4.6.5/demo/Makefile.in --- gnuplot-4.6.4/demo/Makefile.in 2013-10-03 19:03:58.000000000 +0000 +++ gnuplot-4.6.5/demo/Makefile.in 2014-02-23 18:21:11.000000000 +0000 @@ -252,10 +252,10 @@ histerror.dat histopt.dat immigration.dat klein.dat lcdemo.dat moli3.dat \ optimize.dat orbital_elements.dat rgb_variable.dat scatter2.dat silver.dat \ soundvel.dat srl.dat steps.dat table.dat timedat.dat triangle.dat \ -using.dat whale.dat world.dat airfoil.dem all.dem animate2.dem \ -animate.dem approximate.dem arrowstyle.dem autoscale.dem barchart_art.dem \ -binary.dem bivariat.dem borders.dem boxplot.dem candlesticks.dem \ -charset.dem circles.dem cities.dem colorscheme.dem colorwheel.dem \ +using.dat whale.dat world.dat airfoil.dem all.dem animate2.dem animate.dem \ +approximate.dem arrowstyle.dem autoscale.dem barchart_art.dem binary.dem \ +bivariat.dem borders.dem boxplot.dem candlesticks.dem charset.dem \ +circles.dem cities.dem clipobject.dem colorscheme.dem colorwheel.dem \ contours.dem controls.dem dashcolor.dem datastrings.dem dgrid3d.dem \ discrete.dem electron.dem ellipse.dem ellipses_style.dem enhancedtext.dem \ enhanced_utf8.dem epslatex.dem fillbetween.dem fillcrvs.dem fillstyle.dem \ diff -Nru gnuplot-4.6.4/demo/timedat.dem gnuplot-4.6.5/demo/timedat.dem --- gnuplot-4.6.4/demo/timedat.dem 2011-08-27 17:53:46.000000000 +0000 +++ gnuplot-4.6.5/demo/timedat.dem 2014-01-28 22:03:03.000000000 +0000 @@ -1,5 +1,5 @@ # -# $Id: timedat.dem,v 1.9 2011/08/27 17:53:46 juhaszp Exp $ +# $Id: timedat.dem,v 1.9.2.1 2014/01/28 22:03:03 sfeam Exp $ # set title "Fsteps plot\nwith date and time as x-values" @@ -21,3 +21,25 @@ reset +set title "Time data on Y, microsecond precision" font ",14" +set ydata time +set timefmt "%s" +set offset 0.5,1.5,.2,.2 +unset key + +fulltime(col) = strftime("%d %b %Y\n%H:%M:%.3S",column(col)) +parttime(col) = strftime("%H:%M:%.3S",column(col)) + +plot '-' using 0:1:(fulltime(1)):xticlabels(2):yticlabels(parttime(1)) \ + with labels point pt 7 left offset 1,1 font ",7" +1390852607.1 A +1390852607.2 B +1390852607.4 C +1390852607.8 D +1390852608.4 E +1390852610.001 F +e + +pause -1 "Hit return to continue" + +reset diff -Nru gnuplot-4.6.4/docs/gnuplot.doc gnuplot-4.6.5/docs/gnuplot.doc --- gnuplot-4.6.4/docs/gnuplot.doc 2013-09-17 18:52:45.000000000 +0000 +++ gnuplot-4.6.5/docs/gnuplot.doc 2014-01-31 17:23:26.000000000 +0000 @@ -1,4 +1,4 @@ -C RCS $Id: gnuplot.doc,v 1.701.2.30 2013/09/17 18:52:45 sfeam Exp $ +C RCS $Id: gnuplot.doc,v 1.701.2.35 2014/01/31 05:22:05 sfeam Exp $ C C Copyright (C) 1986 - 1993, 1998, 1999, 2000, 2001, 2004 Thomas Williams, Colin Kelley et al. C @@ -24,11 +24,12 @@ ^ 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

^

This manual was originally prepared by Dick Crawford

+^

2014 Version 4.6.5

2 Copyright ?copyright ?license @@ -5508,13 +5509,14 @@ externally or by using `fit` with an appropriate model. Syntax: - smooth {unique | frequency | cumulative | cnormal | kdensity - | csplines | acsplines | bezier | sbezier} + smooth {unique | frequency | cumulative | cnormal | kdensity | unwrap + | csplines | acsplines | mcsplines | bezier | sbezier} `unique`, `frequency`, `cumulative` and `cnormal` plot the data after - making them monotonic. Each of the other routines uses the data to - determine the coefficients of a continuous curve between the endpoints - of the data. This curve is then plotted in the same manner as a + making them monotonic. `unwrap` manipulates the data to avoid jumps of more + than pi between the y value of successive points. Each of the other routines + uses the data to determine the coefficients of a continuous curve between the + endpoints of the data. This curve is then plotted in the same manner as a function, that is, by finding its value at uniform intervals along the abscissa (see `set samples`) and connecting these points with straight line segments (if a line style is chosen). @@ -5585,6 +5587,21 @@ ?csplines The `csplines` option connects consecutive points by natural cubic splines after rendering the data monotonic (see `smooth unique`). +5 mcsplines +?commands plot datafile smooth mcsplines +?plot datafile smooth mcsplines +?plot smooth mcsplines +?data-file smooth mcsplines +?datafile smooth mcsplines +?plot mcsplines +?smooth mcsplines +?mcsplines + The `mcsplines` option connects consecutive points by cubic splines constrained + such that the smoothed function preserves the monotonicity and convexity of the + original data points. + FN Fritsch & RE Carlson (1980) "Monotone Piecewise Cubic Interpolation", + SIAM Journal on Numerical Analysis 17: 238–246. +5 sbezier 5 sbezier ?commands plot datafile smooth sbezier ?plot datafile smooth sbezier @@ -5608,6 +5625,20 @@ The `unique` option makes the data monotonic in x; points with the same x-value are replaced by a single point having the average y-value. The resulting points are then connected by straight line segments. +5 unwrap +?commands plot datafile smooth unwrap +?plot datafile smooth unwrap +?plot smooth unwrap +?data-file smooth unwrap +?datafile smooth unwrap +?plot unwrap +?smooth unwrap +?unwrap + The `unwrap` option modifies the input data so that any two successive + points will not differ by more than pi; a point whose y value is + outside this range will be incremented or decremented by multiples of + 2pi until it falls within pi of the previous point. This operation is + useful for making wrapped phase measurements continuous over time. 5 frequency ?commands plot datafile smooth frequency ?plot datafile smooth frequency @@ -5711,7 +5742,8 @@ Similarly the pseudo-file '++' returns 2 columns of data forming a regular grid of [x,y] coordinates with the number of points along x controlled by `set samples` and the number of points along y controlled by `set isosamples`. - You must set xrange and yrange before plotting '++'. + In parametric mode the samples are along u and v rather than along x and y. + You must set xrange and yrange (or urange and vrange) before plotting '++'. Examples: splot '++' using 1:2:(sin($1)*sin($2)) with pm3d @@ -9642,7 +9674,8 @@ Syntax: set object - {front|back|behind} {fc|fillcolor } {fs } + {front|back|behind} {clip|noclip} + {fc|fillcolor } {fs } {default} {lw|linewidth } is either `rectangle`, `ellipse`, `circle`, or `polygon`. @@ -9655,6 +9688,10 @@ set object rectangle from screen 0,0 to screen 1,1 behind can be used to provide a colored background for the entire graph or page. + By default, objects are clipped to the graph boundary unless one or more + vertices are given in screen coordinates. Setting `noclip` will disable + clipping to the graph boundary, but will still clip against the screen size. + The fill color of the object is taken from the . `fillcolor` may be abbreviated `fc`. The fill style is taken from . See `colorspec` and `fillstyle`. If the keyword `default` is given, @@ -10829,8 +10866,8 @@ Syntax: set style rectangle - set style circle radius - set style ellipse size units {xy|xx|yy} + set style circle radius {clip|noclip} + set style ellipse size units {xy|xx|yy} {clip|noclip} 4 set style arrow ?commands set style arrow @@ -11274,11 +11311,12 @@ ?show style circle Syntax: - set style circle {radius {graph|screen} } + set style circle {radius {graph|screen} } {clip|noclip} This command sets the default radius used in plot style "with circles". It applies to data plots with only 2 columns of data (x,y) and to function plots. - The default is "set style circle radius graph 0.02". + "noclip" disables clippling the circle to the plot boundary. + The default is "set style circle radius graph 0.02 clip". 4 set style rectangle ?commands set style rectangle @@ -11313,7 +11351,7 @@ ?show style ellipse Syntax: - set style ellipse {units xx|xy|yy} + set style ellipse {units xx|xy|yy} {clip|noclip} {size {graph|screen} , {{graph|screen} }} {angle } @@ -11345,6 +11383,8 @@ `angle` keyword. The orientation, which is defined as the angle between the major axis of the ellipse and the plot's x axis, must be given in degrees. + "noclip" disables clippling the circle to the plot boundary. + For defining ellipse objects, see `set object ellipse`; for the 2D plot style, see `ellipses`. diff -Nru gnuplot-4.6.4/docs/gnuplot-ja.doc gnuplot-4.6.5/docs/gnuplot-ja.doc --- gnuplot-4.6.4/docs/gnuplot-ja.doc 2012-05-21 20:42:57.000000000 +0000 +++ gnuplot-4.6.5/docs/gnuplot-ja.doc 2013-10-16 19:27:33.000000000 +0000 @@ -1,5 +1,5 @@ -C RCS $Id: gnuplot-ja.doc,v 1.39.2.2 2012/05/16 22:10:48 markisch Exp $ -C corresponding original gnuplot.doc revision: 1.701.2.14 +C RCS $Id: gnuplot-ja.doc,v 1.39.2.3 2013/10/16 19:27:33 sfeam Exp $ +C corresponding original gnuplot.doc revision: 1.701.2.30 C C Copyright (C) 1986 - 1993, 1998, 1999, 2000, 2001, 2004 Thomas Williams, Colin Kelley et al. C @@ -655,7 +655,7 @@ ƥʬ 2 3 㤨аʲΤ褦˻Ѥޤ: plot 'datafile' using 1:2:4 with labels - splot 'datafile using 1:2:3:4 with labels + splot 'datafile' using 1:2:3:4 with labels ƥʬǡ 1 ġޤʣ輴Υ٥Ȥ ƻѤǤޤϡϥǡ 3 ܤ 4 ܤ (X,Y) ɸ @@ -1502,7 +1502,7 @@ #defined(X) & ѿ̾ & [侩] X Ƥ 1, Ǥʤ 0\\ %defined(X)@ѿ̾@ [侩] X Ƥ 1, Ǥʤ 0 `defined(X)` [侩] ϡX Ƥ 1Ǥʤ 0 - ֤ޤ + ֤ޤ`exists("X")` ˻ѤƤ 4 exists ?expressions functions exists ?exists @@ -1954,8 +1954,11 @@ ϤǤޤ󡣤ǤʤѤޤ ϡ¤ͤ 0 Ȥʤޤ 3 Ѥѿ (Gnuplot-defined variables) +?expressions gnuplot-defined +?gnuplot-defined ?gnuplot-defined variables ?GPVAL +?gpval gnuplot ϡץθߤ֤ľȿǤ褦ɤ ФѤѿ򤤤ĤäƤޤѿ̾ϡ㤨 GPVAL_TERM, GPVAL_X_MIN, GPVAL_X_MAX, GPVAL_Y_MIN Τ褦 "GPVAL_" @@ -2419,7 +2422,7 @@ ֤ޤ 'q' ̾ϺϤǤޤ󡣤 ͣ㳰ˤĤƤϡʲ: `bind space` - ޥܥϺϤǤޤ + ޥܥ 1 Τߡ 2D ˴ؤƤΤߺǤޤ ۥåȥΰˤ `show bind`, ޤ `bind` ȥפ뤫 եɥǥۥåȥ 'h' ϤƤ @@ -2485,7 +2488,7 @@ ʲϡºݤΥǤϤʤɥ˴ؤ륤٥ȤǤ: - "Close" + "Button1" "Close" ʲ⻲: `mouse` 4 bind space @@ -3716,8 +3719,8 @@ CityName(String,Size) = sprintf("{/=%d %s}", Scale(Size), String) plot 'cities.dat' using 5:4:(CityName(stringcolumn(1),$3)) with labels - եȥ򡢸ġλԤ̾Фưۤʤ륵˹碌ʤƤ - ʤСޥɤϤäȴñǤ: + եȤ򡢸ġλԤФưۤʤ륵˹碌ʤƤʤС + ɤϤäȴñǤ: plot 'cities.dat' using 5:4:1 with labels font "Times,8" @@ -4046,7 +4049,7 @@ 줬 3 ζ̤ǤȤϤä狼褦ʻɽޤ ξ硢X, Y, Z Ϥ٤ɽޤ3 ŪʺФϡ 䡢Ǥοˤꡢޤʲ: - `hidden3d`, `set pm3d` ΥץǤ `depthorder` + `hidden3d`, `pm3d depthorder` Ffigure_surface+contours ޥ `splot` ϡ Z ͤФ׻褹뤳Ȥ ޤϡ̤켫Τξ˽񤯤ȤǤޤXY @@ -4055,8 +4058,6 @@ - - 3 2 ͱ (set view map) ?2D projection (set view map) ?projection @@ -5184,6 +5185,7 @@ "pdp") ǥ⥵ݡȤǤޤ 4 filetype ?binary filetype +?filetype gnuplot ϡĤɸŪʥХʥեˤĤƤɬפʾ Υե뤫ȴФȤǤޤ㤨 "format=edf" ESRF åեΥեȤɤ߹ߤޤߥݡȤƤ @@ -5451,27 +5453,27 @@ {:{<λݥ>} {:<λ֥å>}}}}} - ץåȤǡݥȤϡ<ϥݥ> <λݥ> - <ݥʬ> äФ졢֥å <ϥ֥å> <λ - ֥å> ޤ <֥åʬ> äФޤ + 褹ǡݥȤϡ<ϥݥ> <λݥ> ޤ < + ʬ> äӡ֥å <ϥ֥å> <λ֥å> + ޤ <֥åʬ> äӤޤ ƥ֥åκǽΥǡϡեκǽΥ֥åƱ褦ˡ - 0 ֡פȤޤ + 0 ֡פȿޤ - ץåȤǤʤޤǤԤ⥫Ȥ뤳ȤդƲ + ץåȤǤʤޤԤ⥫Ȥ뤳ȤդƲ - ĤοϾά뤳ȤǤޤ; ʬΥǥեȤ 1 Ϥ - ͤϺǽΥݥȤǽΥ֥åƽλͤϺǸΥݥȤ - Υ֥åꤵޤ`every` ꤵʤʤ顢ƤιԤ - ΥݥȤץåȤޤ - - : - every :::3::3 # 4 ܤΥ֥åФޤ (0 ֤ǽ) - every :::::9 # ǽ 10 ֥åФޤ - every 2:2 # 1 ĤΥ֥å 1 ĤΥݥȤ - # ޤ - every ::5::15 # 줾Υ֥åǥݥ 5 15 ޤǤ - # Фޤ + ĤοϾάǤޤ; ʬΥǥեȤ 1 ϤͤϺǽ + ݥȤǽΥ֥åƽλͤϺǸΥݥȤǸΥ֥ + ꤷޤ`every` Υץ ':' ǽΤϵƤޤ + `every` ꤷʤСƤιԤƤΥݥȤץåȤޤ + + : + every :::3::3 # 4 ܤΥ֥åӤޤ (0 ֤ǽ) + every :::::9 # ǽ 10 ֥åӤޤ + every 2:2 # 1 ĤΥ֥å 1 ĤΥݥȤ + # ޤ + every ::5::15 # 줾Υ֥åǥݥ 5 15 ޤǤ + # Ӥޤ : ^ @@ -5895,6 +5897,16 @@ ΥץϺǤޤ`using` 뤤 `thru` ɤѤñʥե륿󥰤ǹԤȤǽǤ + + fdopen() ؿĥƥǤϡǡ򡢥ե뤫ѥפ˷ӤĤ + 줿ǤդΥեǥץɤ߹ळȤǤޤ`n` ֤Υ + ǥץɤ߹ˤϡ`'<&n'` ȤƤˤꡢ + 1 POSIX shell θƤӽФǡʣΥǡե뤫Υ + Ϥưפ˹Ԥ褦ˤʤޤ: + + $ gnuplot -p -e "plot '<&3', '<&4'" 3 plot '<&5' 4 thru ?commands plot datafile thru ?plot datafile thru @@ -5962,6 +5974,7 @@ '' using (column("Age")):(column(2)) plot 'datafile' using "Age":"Height", '' using "Age":"Weight" + ʸ󤬴˰פɬפޤʸʸ̤ޤ Υ٥ plot ȥ˻Ȥˤϡ`set key autotitle columnhead` ȤƤ @@ -6121,11 +6134,14 @@ ʲ: `plot using xticlabels` 4 volatile ?datafile volatile +?data volatile ?plot datafile volatile -  `volatile` ϡϥȥ꡼फե뤫ɤ߹ - ǡɤ߹߻ˤͭǤϤʤȤ̣ޤϡǽ - ¤ץˡ`replot` ޥɤ `refresh` ޥɤȤ - 褦Ȥޤʲ: `refresh` +?plot volatile +?volatile + plot ޥɤΥ `volatile` ϡϥȥ꡼फե뤫 + ɤ߹ǡɤ߹߻ˤͭǤϤʤȤ̣ޤ + ϡ`replot` ޥɤˡǽʸ¤ `refresh` ޥ + Ȥ褦 gnuplot ˻ؼޤʲ: `refresh` 3 errorbars ?commands plot errorbars ?commands splot errorbars @@ -6278,11 +6294,9 @@ ?plot ranges ?splot ranges ?ranges - ץϰ (range) ϡɽ륰դΰϰϤꤷޤ - plot ޥɤȤ̤ `set range` ʸϰϻꤹΤǤϤʤ plot - ɾΤΰȤϰϻꤹ硢ΥդŪ˳礷 - ưϤǤʤʤǤ礦ϰϤѹ `replot` - 뤳ȤǤʤʤǤ礦 + plot ޥɤκǽ֤ץμϰ (range) ϡɽ륰 + դϰϤꤷޤϰϤϡΤɤ `set range` ˤ + ϻͥ褷ưޤ : [{=}{{}:{}}] @@ -9284,23 +9298,24 @@ show logscale ǡ () ϡ`x`, `x2`, `y`, `y2`, `z`, `cb`, `r` Ǥդ - Ȥ߹礻ǽǤ ϡпǤ (ǥե - 10)ꤷʤäϡ`r` ʳΤ٤ƤμоݤȤʤ - ޤޥ `unset logscale` ϡ٤Ƥμп - + Ȥ߹礻ǽǤ ϡпǤ (ǥեȤ + 10)ꤷʤäϡ`r` ʳΤ٤ƤμоݤȤʤ + ޥ `unset logscale` ϡ٤Ƥμпޤ + п˺줿ιߤϰʹֳ֤ǤϤʤȤդƤ + ʲ: `set xtics` : - x, z ξˤĤпꤹ: + x, z ξˤĤпꤹ: set logscale xz - y ˤĤ 2 Ȥпꤹ: + y ˤĤ 2 Ȥпꤹ: set logscale y 2 - pm3d plot Ѥ z ȿμпꤹ: + pm3d plot Ѥ z ȿμпꤹ: set logscale zcb - z п: + z п: unset logscale z 3 macros ?commands set macros @@ -9562,11 +9577,12 @@ ʣƱڡɥ꡼ɽΤǤ : - set multiplot { layout , - {rowsfirst|columnsfirst} {downwards|upwards} - {title } - {scale {,}} {offset {,}} - } + set multiplot + { title {font } {enhanced|noenhanced} } + { layout , + {rowsfirst|columnsfirst} {downwards|upwards} + {scale {,}} {offset {,}} + } unset multiplot Ϸ (terminal) ˤäƤϡޥ `unset multiplot` Ϳ @@ -9821,6 +9837,10 @@ # ĺϰưʤޤޡɤ٤ȿǥեȤѹ set object 2 rect default + Ĺĺ򥹥꡼ɸǻꤹȡϸߤΥդüޤǿ + Ӥ뤳ȤǤޤʳκɸϤǤϡĹϥ˼ޤ褦 + ˥åԥ󥰤ޤ + 4 ellipse ?ellipse ?commands set object ellipse @@ -11586,6 +11606,7 @@ 򼺤鷺˽񤯤Ȥޤ ܺ٤ϡʲ: `complete list of terminals` + 3 termoption ?commands set termoption ?set termoption @@ -13359,7 +13380,13 @@ # ֹ 100 200 ޤǤΥ٥ unset unset for [i=100:200] label i - +3 terminal +?unset terminal + ץκǽͭˤʤǥեȤνϷϡġΥƥĶ + gnuplot Υѥ륪ץ󡢤ӴĶѿ GNUTERM ˰¸ޤ + ΥǥեȤǤäƤ⡢gnuplot Ϥѿ GNUTERM ¸ + Ƥޤޥ `unset terminal` ϡνͤޤ + ϡ`set terminal GNUTERM` Ȥ뤳ȤƱǤ 2 update ?commands update ?update @@ -13423,6 +13450,13 @@ `seeking-assistance` 2 ΤƤ (limitations) + `do` `while` 롼פǤϡplot '-' ... Τ褦ʥ饤 + ǡϻѤǤޤ + + դ key ¤Ȱ֤ϡkey ʸȤƾդդʸ + 줿ꡢŪʥեȻ꤬ԤΤˤʤޤ (4.7 ǤϽ + Ѥ) + =gamma =bessel =timefmt Binary files /tmp/1acvXRLH9S/gnuplot-4.6.4/docs/gnuplot.pdf and /tmp/_yCAEi9ehf/gnuplot-4.6.5/docs/gnuplot.pdf differ diff -Nru gnuplot-4.6.4/docs/gnuplot.texi gnuplot-4.6.5/docs/gnuplot.texi --- gnuplot-4.6.4/docs/gnuplot.texi 2013-10-03 19:05:22.000000000 +0000 +++ gnuplot-4.6.5/docs/gnuplot.texi 2014-02-23 18:22:38.000000000 +0000 @@ -81,11 +81,12 @@ @c ^ James R. Van Zandt, Alex Woo, Johannes Zellner
@c ^

@c ^

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

+@c ^ Copyright (C) 2004 - 2014 various authors

@c ^

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

@c ^

This manual was originally prepared by Dick Crawford

+@c ^

2014 Version 4.6.5

@menu * Copyright:: @@ -7343,15 +7344,16 @@ Syntax: @example - smooth @{unique | frequency | cumulative | cnormal | kdensity - | csplines | acsplines | bezier | sbezier@} + smooth @{unique | frequency | cumulative | cnormal | kdensity | unwrap + | csplines | acsplines | mcsplines | bezier | sbezier@} @end example `unique`, `frequency`, `cumulative` and `cnormal` plot the data after -making them monotonic. Each of the other routines uses the data to -determine the coefficients of a continuous curve between the endpoints -of the data. This curve is then plotted in the same manner as a +making them monotonic. `unwrap` manipulates the data to avoid jumps of more +than pi between the y value of successive points. Each of the other routines +uses the data to determine the coefficients of a continuous curve between the +endpoints of the data. This curve is then plotted in the same manner as a function, that is, by finding its value at uniform intervals along the abscissa (see @ref{samples}) and connecting these points with straight line segments (if a line style is chosen). @@ -7442,6 +7444,28 @@ after rendering the data monotonic (see `smooth unique`). +@noindent --- MCSPLINES --- + +@c ?commands plot datafile smooth mcsplines +@c ?plot datafile smooth mcsplines +@c ?plot smooth mcsplines +@c ?data-file smooth mcsplines +@c ?datafile smooth mcsplines +@c ?plot mcsplines +@c ?smooth mcsplines +@cindex mcsplines + +The `mcsplines` option connects consecutive points by cubic splines constrained +such that the smoothed function preserves the monotonicity and convexity of the +original data points. +FN Fritsch & RE Carlson (1980) "Monotone Piecewise Cubic Interpolation", +SIAM Journal on Numerical Analysis 17: 238–246. + + +@noindent --- SBEZIER --- + + + @noindent --- SBEZIER --- @c ?commands plot datafile smooth sbezier @@ -7473,6 +7497,24 @@ resulting points are then connected by straight line segments. +@noindent --- UNWRAP --- + +@c ?commands plot datafile smooth unwrap +@c ?plot datafile smooth unwrap +@c ?plot smooth unwrap +@c ?data-file smooth unwrap +@c ?datafile smooth unwrap +@c ?plot unwrap +@c ?smooth unwrap +@cindex unwrap + +The `unwrap` option modifies the input data so that any two successive +points will not differ by more than pi; a point whose y value is +outside this range will be incremented or decremented by multiples of +2pi until it falls within pi of the previous point. This operation is +useful for making wrapped phase measurements continuous over time. + + @noindent --- FREQUENCY --- @c ?commands plot datafile smooth frequency @@ -7597,7 +7639,8 @@ Similarly the pseudo-file '++' returns 2 columns of data forming a regular grid of [x,y] coordinates with the number of points along x controlled by @ref{samples} and the number of points along y controlled by @ref{isosamples}. -You must set xrange and yrange before plotting '++'. +In parametric mode the samples are along u and v rather than along x and y. +You must set xrange and yrange (or urange and vrange) before plotting '++'. Examples: @example @@ -12752,7 +12795,8 @@ @example set object - @{front|back|behind@} @{fc|fillcolor @} @{fs @} + @{front|back|behind@} @{clip|noclip@} + @{fc|fillcolor @} @{fs @} @{default@} @{lw|linewidth @} @end example @@ -12770,6 +12814,10 @@ can be used to provide a colored background for the entire graph or page. +By default, objects are clipped to the graph boundary unless one or more +vertices are given in screen coordinates. Setting `noclip` will disable +clipping to the graph boundary, but will still clip against the screen size. + The fill color of the object is taken from the . `fillcolor` may be abbreviated `fc`. The fill style is taken from . See @ref{colorspec} and `fillstyle`. If the keyword `default` is given, @@ -14342,8 +14390,8 @@ Syntax: @example set style rectangle - set style circle radius - set style ellipse size units @{xy|xx|yy@} + set style circle radius @{clip|noclip@} + set style ellipse size units @{xy|xx|yy@} @{clip|noclip@} @end example @@ -14869,13 +14917,14 @@ Syntax: @example - set style circle @{radius @{graph|screen@} @} + set style circle @{radius @{graph|screen@} @} @{clip|noclip@} @end example This command sets the default radius used in plot style "with circles". It applies to data plots with only 2 columns of data (x,y) and to function plots. -The default is "set style circle radius graph 0.02". +"noclip" disables clippling the circle to the plot boundary. +The default is "set style circle radius graph 0.02 clip". @node set_style_rectangle, set_style_ellipse, set_style_circle, style @@ -14923,7 +14972,7 @@ Syntax: @example - set style ellipse @{units xx|xy|yy@} + set style ellipse @{units xx|xy|yy@} @{clip|noclip@} @{size @{graph|screen@} , @{@{graph|screen@} @}@} @{angle @} @@ -14957,6 +15006,8 @@ `angle` keyword. The orientation, which is defined as the angle between the major axis of the ellipse and the plot's x axis, must be given in degrees. +"noclip" disables clippling the circle to the plot boundary. + For defining ellipse objects, see `set object ellipse`; for the 2D plot style, see @ref{ellipses}. @@ -20681,6 +20732,26 @@ @c ?term selanar @cindex selanar +@c ?commands set terminal sixel +@c ?set terminal sixel +@c ?set term sixel +@c ?terminal sixel +@c ?term sixel +@cindex sixel +@tmindex sixel + + +Syntax: +@example + set terminal sixel @{@} @{@} @{size ,@} + +@end example + +The `sixel` output format was originally used by DEC terminals and printers. +For use with xterm emulation, xterm must be compiled/configured with +"--enable-sixel-graphics" and started with "-ti 340" on the command line. +Furthermore, the menu option "sixelScrolling" should be checked; +foreground black and background white. @c ?commands set terminal bitgraph @c ?set terminal bitgraph @c ?set term bitgraph diff -Nru gnuplot-4.6.4/docs/term-ja.diff gnuplot-4.6.5/docs/term-ja.diff --- gnuplot-4.6.4/docs/term-ja.diff 2012-09-05 16:14:51.000000000 +0000 +++ gnuplot-4.6.5/docs/term-ja.diff 2013-10-16 19:27:33.000000000 +0000 @@ -181,7 +181,7 @@ *** 0 **** --- 1,54 ---- + # -+ # $Id: term-ja.diff,v 1.32.2.2 2012/09/05 05:53:26 sfeam Exp $ ++ # $Id: term-ja.diff,v 1.32.2.3 2013/10/16 19:27:33 sfeam Exp $ + # doc2tex νϤθץ + # tex2ja.awk + # 06/20 2008 @@ -235,8 +235,8 @@ + } + diff -rc term/aed.trm.ORG term/aed.trm -*** term/aed.trm.ORG 2012-01-22 14:36:37.000000000 +0900 ---- term/aed.trm 2012-01-22 14:37:58.000000000 +0900 +*** term/aed.trm.ORG 2013-10-12 20:44:02.000000000 +0900 +--- term/aed.trm 2013-10-12 20:47:16.000000000 +0900 *************** *** 203,208 **** --- 203,209 ---- @@ -275,8 +275,8 @@ END_HELP(aed767) #endif diff -rc term/ai.trm.ORG term/ai.trm -*** term/ai.trm.ORG 2012-01-22 14:36:36.000000000 +0900 ---- term/ai.trm 2012-01-22 14:37:58.000000000 +0900 +*** term/ai.trm.ORG 2013-10-12 20:44:02.000000000 +0900 +--- term/ai.trm 2013-10-12 20:47:16.000000000 +0900 *************** *** 528,533 **** --- 528,534 ---- @@ -313,11 +313,11 @@ END_HELP(ai) #endif /* TERM_HELP */ diff -rc term/aquaterm.trm.ORG term/aquaterm.trm -*** term/aquaterm.trm.ORG 2012-01-22 14:36:37.000000000 +0900 ---- term/aquaterm.trm 2012-01-22 14:37:58.000000000 +0900 +*** term/aquaterm.trm.ORG 2013-10-12 20:44:02.000000000 +0900 +--- term/aquaterm.trm 2013-10-12 20:47:16.000000000 +0900 *************** -*** 903,908 **** ---- 903,909 ---- +*** 905,910 **** +--- 905,911 ---- #ifdef TERM_HELP START_HELP(aqua) @@ -326,8 +326,8 @@ "?commands set terminal aqua", "?set terminal aqua", *************** -*** 933,938 **** ---- 934,972 ---- +*** 935,940 **** +--- 936,974 ---- " Lines can be drawn either solid or dashed, (default is solid) and the dash", " spacing can be modified by which is a multiplier > 0.", "" @@ -368,8 +368,8 @@ #endif /* TERM_HELP */ diff -rc term/be.trm.ORG term/be.trm -*** term/be.trm.ORG 2012-01-22 14:36:37.000000000 +0900 ---- term/be.trm 2012-01-22 14:37:58.000000000 +0900 +*** term/be.trm.ORG 2013-10-12 20:44:02.000000000 +0900 +--- term/be.trm 2013-10-12 20:47:16.000000000 +0900 *************** *** 390,395 **** --- 390,396 ---- @@ -685,11 +685,11 @@ END_HELP(be) #endif /* TERM_HELP */ diff -rc term/cairo.trm.ORG term/cairo.trm -*** term/cairo.trm.ORG 2012-01-22 14:36:36.000000000 +0900 ---- term/cairo.trm 2012-01-22 14:37:58.000000000 +0900 +*** term/cairo.trm.ORG 2013-10-12 20:44:02.000000000 +0900 +--- term/cairo.trm 2013-10-12 20:47:16.000000000 +0900 *************** -*** 1334,1339 **** ---- 1334,1340 ---- +*** 1339,1344 **** +--- 1339,1345 ---- #ifdef TERM_HELP START_HELP(epscairo) @@ -698,8 +698,8 @@ "?set terminal epscairo", "?terminal epscairo", *************** -*** 1345,1355 **** ---- 1346,1371 ---- +*** 1350,1360 **** +--- 1351,1376 ---- "", " Please read the help for the `pdfcairo` terminal." "" @@ -727,8 +727,8 @@ "?set terminal cairolatex", "?terminal cairolatex", *************** -*** 1507,1517 **** ---- 1523,1695 ---- +*** 1512,1522 **** +--- 1528,1700 ---- " by the `header` command. Thus, you can use `header` to overwrite some of", " settings performed using \"gnuplot.cfg\"", "" @@ -903,8 +903,8 @@ "?set terminal pdfcairo", "?terminal pdfcairo", *************** -*** 1594,1604 **** ---- 1772,1870 ---- +*** 1599,1609 **** +--- 1777,1875 ---- " so that gnuplot can draw a line from non-integer coordinates. This avoids", " wobbling effects on diagonal lines ('plot x' for example).", "" @@ -1005,8 +1005,8 @@ "?set terminal pngcairo", "?terminal pngcairo", *************** -*** 1678,1683 **** ---- 1944,2033 ---- +*** 1683,1688 **** +--- 1949,2038 ---- " so that gnuplot can draw a line from non-integer coordinates. This avoids", " wobbling effects on diagonal lines ('plot x' for example).", "" @@ -1098,11 +1098,11 @@ #endif /* TERM_HELP */ diff -rc term/canvas.trm.ORG term/canvas.trm -*** term/canvas.trm.ORG 2012-01-22 14:36:36.000000000 +0900 ---- term/canvas.trm 2012-01-22 14:37:58.000000000 +0900 +*** term/canvas.trm.ORG 2013-10-12 20:44:02.000000000 +0900 +--- term/canvas.trm 2013-10-12 20:47:16.000000000 +0900 *************** -*** 1421,1426 **** ---- 1421,1427 ---- +*** 1477,1482 **** +--- 1477,1483 ---- #ifdef TERM_HELP START_HELP(canvas) @@ -1111,8 +1111,8 @@ "?commands set terminal canvas", "?set terminal canvas", *************** -*** 1494,1498 **** ---- 1495,1578 ---- +*** 1550,1554 **** +--- 1551,1634 ---- " fishplot_plot_2, and so on. These can be referenced by external javascript", " routines, for example gnuplot.toggle_visibility(\"fishplot_plot_2\").", "" @@ -1198,8 +1198,8 @@ END_HELP(canvas) #endif /* TERM_HELP */ diff -rc term/cgi.trm.ORG term/cgi.trm -*** term/cgi.trm.ORG 2012-01-22 14:36:36.000000000 +0900 ---- term/cgi.trm 2012-01-22 14:37:58.000000000 +0900 +*** term/cgi.trm.ORG 2013-10-12 20:44:02.000000000 +0900 +--- term/cgi.trm 2013-10-12 20:47:16.000000000 +0900 *************** *** 319,324 **** --- 319,325 ---- @@ -1239,8 +1239,8 @@ END_HELP(cgi) #endif diff -rc term/cgm.trm.ORG term/cgm.trm -*** term/cgm.trm.ORG 2012-01-22 14:36:36.000000000 +0900 ---- term/cgm.trm 2012-01-22 14:37:58.000000000 +0900 +*** term/cgm.trm.ORG 2013-10-12 20:44:02.000000000 +0900 +--- term/cgm.trm 2013-10-12 20:47:16.000000000 +0900 *************** *** 1750,1755 **** --- 1750,1756 ---- @@ -1537,11 +1537,11 @@ END_HELP(cgm) #endif /* TERM_HELP */ diff -rc term/context.trm.ORG term/context.trm -*** term/context.trm.ORG 2012-01-22 14:36:36.000000000 +0900 ---- term/context.trm 2012-01-22 14:37:58.000000000 +0900 +*** term/context.trm.ORG 2013-10-12 20:44:01.000000000 +0900 +--- term/context.trm 2013-10-12 20:47:16.000000000 +0900 *************** -*** 1965,1970 **** ---- 1965,1971 ---- +*** 1974,1979 **** +--- 1974,1980 ---- #ifdef TERM_HELP START_HELP(context) @@ -1550,8 +1550,8 @@ "?commands set terminal context", "?set terminal context", *************** -*** 2106,2111 **** ---- 2107,2262 ---- +*** 2117,2122 **** +--- 2118,2275 ---- " \\useGNUPLOTgraphic[sin]", " \\stoptext", " This will run gnuplot automatically and include the resulting figure in the document." @@ -1560,6 +1560,8 @@ + "?commands set terminal context", + "?set terminal context", + "?terminal context", ++ "?set term context", ++ "?term context", + "?context", + " ConTeXt (Τ) Metapost ȹ٤ͻ礷ʼ PDF ʸ", + " 뤿 TeX ΥޥѥåǤνϷϡMetafun", @@ -1709,8 +1711,8 @@ #endif /* TERM_HELP */ diff -rc term/corel.trm.ORG term/corel.trm -*** term/corel.trm.ORG 2012-01-22 14:36:36.000000000 +0900 ---- term/corel.trm 2012-01-22 14:37:58.000000000 +0900 +*** term/corel.trm.ORG 2013-10-12 20:44:02.000000000 +0900 +--- term/corel.trm 2013-10-12 20:47:16.000000000 +0900 *************** *** 431,436 **** --- 431,437 ---- @@ -1750,8 +1752,8 @@ END_HELP(corel) #endif /* TERM_HELP */ diff -rc term/debug.trm.ORG term/debug.trm -*** term/debug.trm.ORG 2012-01-22 14:36:36.000000000 +0900 ---- term/debug.trm 2012-01-22 14:37:58.000000000 +0900 +*** term/debug.trm.ORG 2013-10-12 20:44:02.000000000 +0900 +--- term/debug.trm 2013-10-12 20:47:16.000000000 +0900 *************** *** 309,314 **** --- 309,315 ---- @@ -1782,8 +1784,8 @@ END_HELP(debug) #endif diff -rc term/djsvga.trm.ORG term/djsvga.trm -*** term/djsvga.trm.ORG 2012-01-22 14:36:36.000000000 +0900 ---- term/djsvga.trm 2012-01-22 14:37:58.000000000 +0900 +*** term/djsvga.trm.ORG 2013-10-12 20:44:02.000000000 +0900 +--- term/djsvga.trm 2013-10-12 20:47:16.000000000 +0900 *************** *** 471,476 **** --- 471,477 ---- @@ -1818,8 +1820,8 @@ END_HELP(svga) #endif /* TERM_HELP */ diff -rc term/dumb.trm.ORG term/dumb.trm -*** term/dumb.trm.ORG 2012-01-22 14:36:37.000000000 +0900 ---- term/dumb.trm 2012-01-22 14:37:58.000000000 +0900 +*** term/dumb.trm.ORG 2013-10-12 20:44:02.000000000 +0900 +--- term/dumb.trm 2013-10-12 20:47:16.000000000 +0900 *************** *** 564,569 **** --- 564,570 ---- @@ -1877,8 +1879,8 @@ END_HELP(dumb) #endif /* TERM_HELP */ diff -rc term/dxf.trm.ORG term/dxf.trm -*** term/dxf.trm.ORG 2012-01-22 14:36:36.000000000 +0900 ---- term/dxf.trm 2012-01-22 14:37:58.000000000 +0900 +*** term/dxf.trm.ORG 2013-10-12 20:44:02.000000000 +0900 +--- term/dxf.trm 2013-10-12 20:47:16.000000000 +0900 *************** *** 404,409 **** --- 404,410 ---- @@ -1915,8 +1917,8 @@ END_HELP(dxf) #endif /* TERM_HELP */ diff -rc term/dxy.trm.ORG term/dxy.trm -*** term/dxy.trm.ORG 2012-01-22 14:36:36.000000000 +0900 ---- term/dxy.trm 2012-01-22 14:37:58.000000000 +0900 +*** term/dxy.trm.ORG 2013-10-12 20:44:02.000000000 +0900 +--- term/dxy.trm 2013-10-12 20:47:16.000000000 +0900 *************** *** 191,196 **** --- 191,197 ---- @@ -1947,8 +1949,8 @@ END_HELP(dxy800a) #endif diff -rc term/eepic.trm.ORG term/eepic.trm -*** term/eepic.trm.ORG 2012-01-22 14:36:36.000000000 +0900 ---- term/eepic.trm 2012-01-22 14:37:58.000000000 +0900 +*** term/eepic.trm.ORG 2013-10-12 20:44:02.000000000 +0900 +--- term/eepic.trm 2013-10-12 20:47:16.000000000 +0900 *************** *** 577,582 **** --- 577,583 ---- @@ -2056,11 +2058,11 @@ END_HELP(eepic) #endif /* TERM_HELP */ diff -rc term/emf.trm.ORG term/emf.trm -*** term/emf.trm.ORG 2012-01-22 14:36:37.000000000 +0900 ---- term/emf.trm 2012-01-22 14:37:58.000000000 +0900 +*** term/emf.trm.ORG 2013-10-12 20:44:02.000000000 +0900 +--- term/emf.trm 2013-10-12 20:47:16.000000000 +0900 *************** -*** 1771,1776 **** ---- 1771,1777 ---- +*** 1835,1840 **** +--- 1835,1841 ---- #ifdef TERM_HELP START_HELP(emf) @@ -2069,8 +2071,8 @@ "?commands set terminal emf", "?set terminal emf", *************** -*** 1812,1816 **** ---- 1813,1862 ---- +*** 1876,1880 **** +--- 1877,1926 ---- " Examples:", " set terminal emf 'Times Roman Italic, 12'", " set terminal emf dashed # otherwise all lines are solid" @@ -2112,18 +2114,18 @@ + " 򹥤ޤʤ硢ץ `noproportional` ȤȤǤ򥪥", + " ˤǤޤ", + "", -+ " ǥեȤϡ`color dashed font \"Arial,12\" size 1024,768` ǡ", ++ " ǥեȤϡ`color solid font \"Arial,12\" size 1024,768` ǡ", + " `default` 򤹤ƤΥץ󤬤ΥǥեȤͤˤʤޤ", + "", + " :", + " set terminal emf 'Times Roman Italic, 12'", -+ " set terminal emf color solid # ݤʤɾäƤޤ !" ++ " set terminal emf dashed # ʤʬϤ٤ƼǤ" + #endif /* JAPANESE_DOC */ END_HELP(emf) #endif /* TERM_HELP */ diff -rc term/emxvga.trm.ORG term/emxvga.trm -*** term/emxvga.trm.ORG 2012-01-22 14:36:36.000000000 +0900 ---- term/emxvga.trm 2012-01-22 14:37:58.000000000 +0900 +*** term/emxvga.trm.ORG 2013-10-12 20:44:02.000000000 +0900 +--- term/emxvga.trm 2013-10-12 20:47:16.000000000 +0900 *************** *** 475,480 **** --- 475,481 ---- @@ -2178,8 +2180,8 @@ END_HELP(emxvga) #endif /* TERM_HELP */ diff -rc term/epson.trm.ORG term/epson.trm -*** term/epson.trm.ORG 2012-01-22 14:36:37.000000000 +0900 ---- term/epson.trm 2012-01-22 14:37:58.000000000 +0900 +*** term/epson.trm.ORG 2013-10-12 20:44:01.000000000 +0900 +--- term/epson.trm 2013-10-12 20:47:16.000000000 +0900 *************** *** 1090,1095 **** --- 1090,1096 ---- @@ -2292,8 +2294,8 @@ END_HELP(epson_180dpi) #endif /* TERM_HELP */ diff -rc term/excl.trm.ORG term/excl.trm -*** term/excl.trm.ORG 2012-01-22 14:36:36.000000000 +0900 ---- term/excl.trm 2012-01-22 14:37:58.000000000 +0900 +*** term/excl.trm.ORG 2013-10-12 20:44:01.000000000 +0900 +--- term/excl.trm 2013-10-12 20:47:16.000000000 +0900 *************** *** 273,278 **** --- 273,279 ---- @@ -2324,8 +2326,8 @@ END_HELP(excl) #endif diff -rc term/fig.trm.ORG term/fig.trm -*** term/fig.trm.ORG 2012-01-22 14:36:37.000000000 +0900 ---- term/fig.trm 2012-01-22 14:37:58.000000000 +0900 +*** term/fig.trm.ORG 2013-10-12 20:44:02.000000000 +0900 +--- term/fig.trm 2013-10-12 20:47:16.000000000 +0900 *************** *** 1290,1295 **** --- 1290,1296 ---- @@ -2441,11 +2443,11 @@ #endif /* TERM_HELP */ diff -rc term/gd.trm.ORG term/gd.trm -*** term/gd.trm.ORG 2012-01-22 14:36:36.000000000 +0900 ---- term/gd.trm 2012-01-22 14:37:58.000000000 +0900 +*** term/gd.trm.ORG 2013-10-12 20:44:02.000000000 +0900 +--- term/gd.trm 2013-10-12 20:47:16.000000000 +0900 *************** -*** 2343,2348 **** ---- 2343,2349 ---- +*** 2345,2350 **** +--- 2345,2351 ---- #ifndef JPEG_HELP_ONLY #ifdef TERM_HELP START_HELP(png) @@ -2454,8 +2456,8 @@ "?commands set terminal png", "?set terminal png", *************** -*** 2424,2429 **** ---- 2425,2515 ---- +*** 2421,2426 **** +--- 2422,2509 ---- " Use 24 bits of color information per pixel, with a transparent background.", " Use the `enhanced text` mode to control the layout of strings to be printed.", "" @@ -2521,16 +2523,13 @@ + " 轪λü;ϡץ `crop` ǼȤǤη", + " ̤ȤƤβϾʤޤǥեȤ `nocrop` Ǥ", + "", -+ " طʿ 'xrrggbb' ηǻꤷޤǡx ϤΤޤʸ 'x' ", -+ " ̣'rrggbb' ֡СĤ 16 ʿǤʬǤ㤨 'x00ff00'", -+ " Фɽޤطʿʳɲäο侩Ǥ", -+ "", + "2 ", + "?set term png examples", -+ " set terminal png medium size 640,480 xffffff", ++ " set terminal png medium size 640,480 background '#ffffff'", + "", + " medium Ρ礭ѹǽDzžǤʤȤ߹ߥե", -+ " ѤƩʤطʿȤ (xffffff) Ѥޤ", ++ " ѤƩʤطʿȤ (16 ʿ 24bit RGB) Ѥ", ++ " ", + "", + " set terminal png font arial 14 size 800,600", + "", @@ -2548,8 +2547,8 @@ #endif /* TERM_HELP */ #endif /* JPEG_HELP_ONLY */ *************** -*** 2499,2504 **** ---- 2585,2591 ---- +*** 2496,2501 **** +--- 2579,2585 ---- #ifdef TERM_HELP START_HELP(jpeg) @@ -2558,10 +2557,10 @@ "?commands set terminal jpeg", "?set terminal jpeg", *************** -*** 2551,2556 **** ---- 2638,2696 ---- - " in hexadecimal. For example, 'x00ff00' is green. The specification of", - " additional colors other than the background is deprecated.", +*** 2543,2548 **** +--- 2627,2681 ---- + " Blank space at the edges of the finished plot may be trimmed using the `crop`", + " option, resulting in a smaller final image size. Default is `nocrop`.", "" + #else /* JAPANESE_DOC */ + "1 jpeg", @@ -2610,18 +2609,14 @@ + " ʲ⻲: `canvas`, `set size`", + " 轪λü;ϡץ `crop` ǼȤǤη", + " ̤ȤƤβϾʤޤǥեȤ `nocrop` Ǥ", -+ "", -+ " طʿ 'xrrggbb' ηǻꤷޤǡx ϤΤޤʸ 'x' ", -+ " ̣'rrggbb' ֡СĤ 16 ʿǤʬǤ㤨 'x00ff00'", -+ " Фɽޤطʿʳɲäο侩Ǥ", + "" + #endif /* JAPANESE_DOC */ END_HELP(jpeg) #endif /* TERM_HELP */ #endif /* HAVE_GD_JPEG */ *************** -*** 2653,2658 **** ---- 2793,2799 ---- +*** 2645,2650 **** +--- 2778,2784 ---- #ifdef TERM_HELP START_HELP(gif) @@ -2630,8 +2625,8 @@ "?commands set terminal gif", "?set terminal gif", *************** -*** 2754,2759 **** ---- 2895,3008 ---- +*** 2741,2746 **** +--- 2875,2985 ---- " frames of the animation sequence are created by the script file animate2.dem", " from the standard collection of demos.", "" @@ -2717,16 +2712,13 @@ + " 轪λü;ϡץ `crop` ǼȤǤη", + " ̤ȤƤβϾʤޤǥեȤ `nocrop` Ǥ", + "", -+ " طʿ 'xrrggbb' ηǻꤷޤǡx ϤΤޤʸ 'x' ", -+ " ̣'rrggbb' ֡СĤ 16 ʿǤʬǤ㤨 'x00ff00'", -+ " Фɽޤطʿʳɲäο侩Ǥ", -+ "", + "2 ", + "?set term gif examples", -+ " set terminal gif medium size 640,480 xffffff", ++ " set terminal gif medium size 640,480 background '#ffffff'", + "", + " medium Ρ礭ѹǽDzžǤʤȤ߹ߥե", -+ " ѤƩʤطʿȤ (xffffff) Ѥޤ", ++ " ѤƩʤطʿȤ (16 ʿ 24bit RGB) Ѥ", ++ " ", + "", + " set terminal gif font arial 14 enhanced", + "", @@ -2735,7 +2727,7 @@ + " Ƥϰʲ: `fonts`ϥ֥եȤʤΤǡĥʸ", + " ⡼ɤѤǤޤ", + "", -+ " set term gif animate transparent opt delay 10 size 200,200 x000000", ++ " set term gif animate transparent opt delay 10 size 200,200", + " load \"animate2.dem\"", + "", + " ϡ˥᡼ GIF եκѤ gif Ϸ򳫤ޤ", @@ -2747,8 +2739,8 @@ #endif /* TERM_HELP */ #endif /* HAVE_GD_GIF */ diff -rc term/ggi.trm.ORG term/ggi.trm -*** term/ggi.trm.ORG 2012-01-22 14:36:36.000000000 +0900 ---- term/ggi.trm 2012-01-22 14:37:59.000000000 +0900 +*** term/ggi.trm.ORG 2013-10-12 20:44:02.000000000 +0900 +--- term/ggi.trm 2013-10-12 20:47:16.000000000 +0900 *************** *** 1504,1509 **** --- 1504,1510 ---- @@ -2804,8 +2796,8 @@ END_HELP(ggi) #endif diff -rc term/gpic.trm.ORG term/gpic.trm -*** term/gpic.trm.ORG 2012-01-22 14:36:37.000000000 +0900 ---- term/gpic.trm 2012-01-22 14:37:59.000000000 +0900 +*** term/gpic.trm.ORG 2013-10-12 20:44:02.000000000 +0900 +--- term/gpic.trm 2013-10-12 20:47:16.000000000 +0900 *************** *** 294,299 **** --- 294,300 ---- @@ -2890,8 +2882,8 @@ END_HELP(gpic) #endif /* TERM_HELP */ diff -rc term/grass.trm.ORG term/grass.trm -*** term/grass.trm.ORG 2012-01-22 14:36:36.000000000 +0900 ---- term/grass.trm 2012-01-22 14:37:59.000000000 +0900 +*** term/grass.trm.ORG 2013-10-12 20:44:02.000000000 +0900 +--- term/grass.trm 2013-10-12 20:47:16.000000000 +0900 *************** *** 624,629 **** --- 624,630 ---- @@ -2924,8 +2916,8 @@ END_HELP(grass) #endif diff -rc term/hp26.trm.ORG term/hp26.trm -*** term/hp26.trm.ORG 2012-01-22 14:36:36.000000000 +0900 ---- term/hp26.trm 2012-01-22 14:37:59.000000000 +0900 +*** term/hp26.trm.ORG 2013-10-12 20:44:02.000000000 +0900 +--- term/hp26.trm 2013-10-12 20:47:16.000000000 +0900 *************** *** 691,696 **** --- 691,697 ---- @@ -2956,8 +2948,8 @@ END_HELP(hp2623a) #endif diff -rc term/hp2648.trm.ORG term/hp2648.trm -*** term/hp2648.trm.ORG 2012-01-22 14:36:37.000000000 +0900 ---- term/hp2648.trm 2012-01-22 14:37:59.000000000 +0900 +*** term/hp2648.trm.ORG 2013-10-12 20:44:01.000000000 +0900 +--- term/hp2648.trm 2013-10-12 20:47:16.000000000 +0900 *************** *** 188,193 **** --- 188,194 ---- @@ -2988,8 +2980,8 @@ END_HELP(hp2648) #endif diff -rc term/hp500c.trm.ORG term/hp500c.trm -*** term/hp500c.trm.ORG 2012-01-22 14:36:36.000000000 +0900 ---- term/hp500c.trm 2012-01-22 14:37:59.000000000 +0900 +*** term/hp500c.trm.ORG 2013-10-12 20:44:02.000000000 +0900 +--- term/hp500c.trm 2013-10-12 20:47:16.000000000 +0900 *************** *** 527,532 **** --- 527,533 ---- @@ -3029,8 +3021,8 @@ END_HELP(hp500c) #endif /* TERM_HELP */ diff -rc term/hpgl.trm.ORG term/hpgl.trm -*** term/hpgl.trm.ORG 2012-01-22 14:36:36.000000000 +0900 ---- term/hpgl.trm 2012-01-22 14:37:59.000000000 +0900 +*** term/hpgl.trm.ORG 2013-10-12 20:44:02.000000000 +0900 +--- term/hpgl.trm 2013-10-12 20:47:16.000000000 +0900 *************** *** 2611,2616 **** --- 2611,2617 ---- @@ -3131,8 +3123,8 @@ END_HELP(hpgl) #endif /* TERM_HELP */ diff -rc term/hpljii.trm.ORG term/hpljii.trm -*** term/hpljii.trm.ORG 2012-01-22 14:36:36.000000000 +0900 ---- term/hpljii.trm 2012-01-22 14:37:59.000000000 +0900 +*** term/hpljii.trm.ORG 2013-10-12 20:44:02.000000000 +0900 +--- term/hpljii.trm 2013-10-12 20:47:16.000000000 +0900 *************** *** 401,406 **** --- 401,407 ---- @@ -3180,8 +3172,8 @@ END_HELP(hpljii) #endif /* TERM_HELP */ diff -rc term/hppj.trm.ORG term/hppj.trm -*** term/hppj.trm.ORG 2012-01-22 14:36:36.000000000 +0900 ---- term/hppj.trm 2012-01-22 14:37:59.000000000 +0900 +*** term/hppj.trm.ORG 2013-10-12 20:44:02.000000000 +0900 +--- term/hppj.trm 2013-10-12 20:47:16.000000000 +0900 *************** *** 273,278 **** --- 273,279 ---- @@ -3217,8 +3209,8 @@ END_HELP(hppj) #endif diff -rc term/imagen.trm.ORG term/imagen.trm -*** term/imagen.trm.ORG 2012-01-22 14:36:37.000000000 +0900 ---- term/imagen.trm 2012-01-22 14:37:59.000000000 +0900 +*** term/imagen.trm.ORG 2013-10-12 20:44:02.000000000 +0900 +--- term/imagen.trm 2013-10-12 20:47:16.000000000 +0900 *************** *** 886,891 **** --- 886,892 ---- @@ -3263,8 +3255,8 @@ END_HELP(imagen) #endif diff -rc term/kyo.trm.ORG term/kyo.trm -*** term/kyo.trm.ORG 2012-01-22 14:36:36.000000000 +0900 ---- term/kyo.trm 2012-01-22 14:37:59.000000000 +0900 +*** term/kyo.trm.ORG 2013-10-12 20:44:02.000000000 +0900 +--- term/kyo.trm 2013-10-12 20:47:16.000000000 +0900 *************** *** 204,209 **** --- 204,210 ---- @@ -3303,8 +3295,8 @@ END_HELP(kyo) #endif diff -rc term/latex.trm.ORG term/latex.trm -*** term/latex.trm.ORG 2012-01-22 14:36:36.000000000 +0900 ---- term/latex.trm 2012-01-22 14:37:59.000000000 +0900 +*** term/latex.trm.ORG 2013-10-12 20:44:02.000000000 +0900 +--- term/latex.trm 2013-10-12 20:47:16.000000000 +0900 *************** *** 950,955 **** --- 950,956 ---- @@ -3386,11 +3378,11 @@ END_HELP(latex) #endif /* TERM_TABLE */ diff -rc term/linux.trm.ORG term/linux.trm -*** term/linux.trm.ORG 2012-01-22 14:36:36.000000000 +0900 ---- term/linux.trm 2012-01-22 14:37:59.000000000 +0900 +*** term/linux.trm.ORG 2013-10-12 20:44:01.000000000 +0900 +--- term/linux.trm 2013-10-12 20:47:16.000000000 +0900 *************** -*** 336,341 **** ---- 336,342 ---- +*** 451,456 **** +--- 451,457 ---- #ifdef TERM_HELP START_HELP(linux) @@ -3399,8 +3391,8 @@ "?commands set terminal linux", "?set terminal linux", *************** -*** 347,351 **** ---- 348,365 ---- +*** 462,466 **** +--- 463,480 ---- " environment variable GSVGAMODE for the default mode; if not set, it uses", " 1024x768x256 as default mode or, if that is not possible, 640x480x16", " (standard VGA)." @@ -3420,8 +3412,8 @@ END_HELP(linux) #endif diff -rc term/lua/gnuplot-tikz.help.ORG term/lua/gnuplot-tikz.help -*** term/lua/gnuplot-tikz.help.ORG 2012-01-22 14:36:36.000000000 +0900 ---- term/lua/gnuplot-tikz.help 2012-01-22 14:46:46.000000000 +0900 +*** term/lua/gnuplot-tikz.help.ORG 2013-10-12 20:44:02.000000000 +0900 +--- term/lua/gnuplot-tikz.help 2013-10-12 20:47:16.000000000 +0900 *************** *** 1,3 **** --- 1,4 ---- @@ -3608,11 +3600,11 @@ + "" + #endif /* JAPANESE_DOC */ diff -rc term/lua.trm.ORG term/lua.trm -*** term/lua.trm.ORG 2012-01-22 14:36:36.000000000 +0900 ---- term/lua.trm 2012-01-22 14:37:59.000000000 +0900 +*** term/lua.trm.ORG 2013-10-12 20:44:02.000000000 +0900 +--- term/lua.trm 2013-10-12 20:47:16.000000000 +0900 *************** -*** 1342,1347 **** ---- 1342,1348 ---- +*** 1395,1400 **** +--- 1395,1401 ---- #ifdef TERM_HELP START_HELP(lua) @@ -3621,8 +3613,8 @@ "?commands set terminal lua", "?set terminal lua", *************** -*** 1368,1377 **** ---- 1369,1407 ---- +*** 1421,1430 **** +--- 1422,1460 ---- " All arguments will be provided to the selected script for further", " evaluation. E.g. 'set term lua tikz help' will cause the script itself", " to print additional help on options and choices for the script.", @@ -3663,8 +3655,8 @@ "?commands set terminal tikz", "?set terminal tikz", *************** -*** 1384,1388 **** ---- 1414,1432 ---- +*** 1437,1441 **** +--- 1467,1485 ---- " `set term tikz` is a short form of the command `set term lua tikz`.", " See `term lua` for more information. Use the command `set term tikz help`", " to print terminal options." @@ -3685,8 +3677,8 @@ END_HELP(tikz) #endif /* TERM_HELP */ diff -rc term/mac.trm.ORG term/mac.trm -*** term/mac.trm.ORG 2012-01-22 14:36:37.000000000 +0900 ---- term/mac.trm 2012-01-22 14:49:13.000000000 +0900 +*** term/mac.trm.ORG 2013-10-12 20:44:02.000000000 +0900 +--- term/mac.trm 2013-10-12 20:47:16.000000000 +0900 *************** *** 137,142 **** --- 137,143 ---- @@ -3740,8 +3732,8 @@ END_HELP(mac) #endif /* TERM_HELP */ diff -rc term/metafont.trm.ORG term/metafont.trm -*** term/metafont.trm.ORG 2012-01-22 14:36:36.000000000 +0900 ---- term/metafont.trm 2012-01-22 14:37:59.000000000 +0900 +*** term/metafont.trm.ORG 2013-10-12 20:44:02.000000000 +0900 +--- term/metafont.trm 2013-10-12 20:47:16.000000000 +0900 *************** *** 540,545 **** --- 540,546 ---- @@ -3859,8 +3851,8 @@ END_HELP(mf) #endif /* TERM_HELP */ diff -rc term/metapost.trm.ORG term/metapost.trm -*** term/metapost.trm.ORG 2012-01-22 14:36:36.000000000 +0900 ---- term/metapost.trm 2012-01-22 14:37:59.000000000 +0900 +*** term/metapost.trm.ORG 2013-10-12 20:44:02.000000000 +0900 +--- term/metapost.trm 2013-10-12 20:47:16.000000000 +0900 *************** *** 993,998 **** --- 993,999 ---- @@ -4075,8 +4067,8 @@ END_HELP(mp) #endif /* TERM_HELP */ diff -rc term/mif.trm.ORG term/mif.trm -*** term/mif.trm.ORG 2012-01-22 14:36:36.000000000 +0900 ---- term/mif.trm 2012-01-22 14:37:59.000000000 +0900 +*** term/mif.trm.ORG 2013-10-12 20:44:02.000000000 +0900 +--- term/mif.trm 2013-10-12 20:47:16.000000000 +0900 *************** *** 965,970 **** --- 965,971 ---- @@ -4130,8 +4122,8 @@ END_HELP(mif) #endif /* TERM_HELP */ diff -rc term/next.trm.ORG term/next.trm -*** term/next.trm.ORG 2012-01-22 14:36:37.000000000 +0900 ---- term/next.trm 2012-01-22 14:37:59.000000000 +0900 +*** term/next.trm.ORG 2013-10-12 20:44:01.000000000 +0900 +--- term/next.trm 2013-10-12 20:47:16.000000000 +0900 *************** *** 1501,1506 **** --- 1501,1507 ---- @@ -4185,8 +4177,8 @@ #endif /* TERM_HELP */ diff -rc term/openstep.trm.ORG term/openstep.trm -*** term/openstep.trm.ORG 2012-01-22 14:36:36.000000000 +0900 ---- term/openstep.trm 2012-01-22 14:37:59.000000000 +0900 +*** term/openstep.trm.ORG 2013-10-12 20:44:02.000000000 +0900 +--- term/openstep.trm 2013-10-12 20:47:16.000000000 +0900 *************** *** 1373,1378 **** --- 1373,1379 ---- @@ -4247,8 +4239,8 @@ #endif /* TERM_HELP */ diff -rc term/pbm.trm.ORG term/pbm.trm -*** term/pbm.trm.ORG 2012-01-22 14:36:36.000000000 +0900 ---- term/pbm.trm 2012-01-22 14:37:59.000000000 +0900 +*** term/pbm.trm.ORG 2013-10-12 20:44:02.000000000 +0900 +--- term/pbm.trm 2013-10-12 20:47:16.000000000 +0900 *************** *** 483,488 **** --- 483,489 ---- @@ -4301,8 +4293,8 @@ END_HELP(pbm) #endif /* TERM_HELP */ diff -rc term/pc.trm.ORG term/pc.trm -*** term/pc.trm.ORG 2012-01-22 14:36:36.000000000 +0900 ---- term/pc.trm 2012-01-22 14:37:59.000000000 +0900 +*** term/pc.trm.ORG 2013-10-12 20:44:02.000000000 +0900 +--- term/pc.trm 2013-10-12 20:47:16.000000000 +0900 *************** *** 546,551 **** --- 546,552 ---- @@ -4334,8 +4326,8 @@ END_HELP(dospc) #endif /* TERM_HELP */ diff -rc term/pdf.trm.ORG term/pdf.trm -*** term/pdf.trm.ORG 2012-01-22 14:36:36.000000000 +0900 ---- term/pdf.trm 2012-01-22 14:37:59.000000000 +0900 +*** term/pdf.trm.ORG 2013-10-12 20:44:02.000000000 +0900 +--- term/pdf.trm 2013-10-12 20:47:16.000000000 +0900 *************** *** 1715,1720 **** --- 1715,1721 ---- @@ -4401,8 +4393,8 @@ END_HELP(pdf) #endif diff -rc term/pm.trm.ORG term/pm.trm -*** term/pm.trm.ORG 2012-01-22 14:36:37.000000000 +0900 ---- term/pm.trm 2012-01-22 14:37:59.000000000 +0900 +*** term/pm.trm.ORG 2013-10-12 20:44:02.000000000 +0900 +--- term/pm.trm 2013-10-12 20:47:16.000000000 +0900 *************** *** 1247,1252 **** --- 1247,1253 ---- @@ -4458,11 +4450,11 @@ END_HELP(pm) #endif /* TERM_HELP */ diff -rc term/post.trm.ORG term/post.trm -*** term/post.trm.ORG 2012-01-22 14:36:36.000000000 +0900 ---- term/post.trm 2012-01-22 14:37:59.000000000 +0900 +*** term/post.trm.ORG 2013-10-12 20:44:02.000000000 +0900 +--- term/post.trm 2013-10-12 20:47:16.000000000 +0900 *************** -*** 3821,3826 **** ---- 3821,3827 ---- +*** 3840,3845 **** +--- 3840,3846 ---- * of "text" that is necessary to avoid errors. */ START_HELP(00psglobal) @@ -4471,8 +4463,8 @@ " {level1 | leveldefault}",\ " {color | colour | monochrome}",\ *************** -*** 3893,3901 **** ---- 3894,3979 ---- +*** 3912,3920 **** +--- 3913,3998 ---- " actual limits of the plot.",\ "", "" @@ -4560,8 +4552,8 @@ "?commands set terminal epslatex", "?set terminal epslatex", *************** -*** 4063,4071 **** ---- 4141,4324 ---- +*** 4082,4090 **** +--- 4160,4343 ---- " by the `header` command. Thus, you can use `header` to overwrite some of", " settings performed using \"gnuplot.cfg\"", "" @@ -4747,8 +4739,8 @@ "?commands set terminal pslatex", "?set terminal pslatex", *************** -*** 4145,4153 **** ---- 4398,4486 ---- +*** 4164,4172 **** +--- 4417,4505 ---- "", " Linewidths and pointsizes may be changed with `set style line`." "" @@ -4839,8 +4831,8 @@ "?commands set terminal postscript", "?set terminal postscript", *************** -*** 4410,4414 **** ---- 4743,5009 ---- +*** 4429,4433 **** +--- 4762,5028 ---- " other fonts you may have to try both settings. See also `fontfile`.", "", "" @@ -5109,8 +5101,8 @@ END_HELP(post) #endif /* TERM_HELP */ diff -rc term/pstricks.trm.ORG term/pstricks.trm -*** term/pstricks.trm.ORG 2012-01-22 14:36:37.000000000 +0900 ---- term/pstricks.trm 2012-01-22 14:37:59.000000000 +0900 +*** term/pstricks.trm.ORG 2013-10-12 20:44:01.000000000 +0900 +--- term/pstricks.trm 2013-10-12 20:47:16.000000000 +0900 *************** *** 673,678 **** --- 673,679 ---- @@ -5154,8 +5146,8 @@ END_HELP(pstricks) #endif /* TERM_HELP */ diff -rc term/qms.trm.ORG term/qms.trm -*** term/qms.trm.ORG 2012-01-22 14:36:36.000000000 +0900 ---- term/qms.trm 2012-01-22 14:37:59.000000000 +0900 +*** term/qms.trm.ORG 2013-10-12 20:44:02.000000000 +0900 +--- term/qms.trm 2013-10-12 20:47:16.000000000 +0900 *************** *** 225,230 **** --- 225,231 ---- @@ -5186,8 +5178,8 @@ END_HELP(qms) #endif diff -rc term/qt.trm.ORG term/qt.trm -*** term/qt.trm.ORG 2012-01-22 14:36:36.000000000 +0900 ---- term/qt.trm 2012-01-22 14:37:59.000000000 +0900 +*** term/qt.trm.ORG 2013-10-12 20:44:02.000000000 +0900 +--- term/qt.trm 2013-10-12 20:47:16.000000000 +0900 *************** *** 73,78 **** --- 73,79 ---- @@ -5300,8 +5292,8 @@ END_HELP(qt) #endif /* TERM_HELP */ diff -rc term/regis.trm.ORG term/regis.trm -*** term/regis.trm.ORG 2012-01-22 14:36:36.000000000 +0900 ---- term/regis.trm 2012-01-22 14:37:59.000000000 +0900 +*** term/regis.trm.ORG 2013-10-12 20:44:02.000000000 +0900 +--- term/regis.trm 2013-10-12 20:47:16.000000000 +0900 *************** *** 258,263 **** --- 258,264 ---- @@ -5336,8 +5328,8 @@ END_HELP(regis) #endif diff -rc term/sun.trm.ORG term/sun.trm -*** term/sun.trm.ORG 2012-01-22 14:36:36.000000000 +0900 ---- term/sun.trm 2012-01-22 14:37:59.000000000 +0900 +*** term/sun.trm.ORG 2013-10-12 20:44:02.000000000 +0900 +--- term/sun.trm 2013-10-12 20:47:16.000000000 +0900 *************** *** 360,365 **** --- 360,366 ---- @@ -5368,11 +5360,11 @@ END_HELP(sun) #endif diff -rc term/svg.trm.ORG term/svg.trm -*** term/svg.trm.ORG 2012-01-22 14:36:36.000000000 +0900 ---- term/svg.trm 2012-01-22 14:37:59.000000000 +0900 +*** term/svg.trm.ORG 2013-10-12 20:44:02.000000000 +0900 +--- term/svg.trm 2013-10-12 20:47:16.000000000 +0900 *************** -*** 1943,1948 **** ---- 1943,1949 ---- +*** 1972,1977 **** +--- 1972,1978 ---- #ifdef TERM_HELP START_HELP(svg) @@ -5381,8 +5373,8 @@ "?commands set terminal svg", "?set terminal svg", *************** -*** 1994,1998 **** ---- 1995,2055 ---- +*** 2032,2036 **** +--- 2033,2102 ---- " the desired font. Gnuplot will look for the requested file using the", " directory list in the GNUPLOT_FONTPATH environmental variable.", " NB: You must embed an svg font, not a TrueType or PostScript font." @@ -5401,7 +5393,8 @@ + " set terminal svg {size , {|fixed|dynamic}}", + " {{no}enhanced}", + " {fname \"\"} {fsize }", -+ " {mouse} {jsdir } {name }", ++ " {mouse} {standalone | jsdir }", ++ " {name }", + " {font \"{,}\"}", + " {fontfile }", + " {rounded|butt} {solid|dashed} {linewidth }", @@ -5424,13 +5417,21 @@ + " ǽˤޤĥʸ⡼ɤν񼰻¾νϷξƱ", + " ܺ٤ϡʲ: `enhanced`", + "", -+ " ץ `mouse` ϡб key ǥå뤳ȤǤ줾Υ", -+ " On/Off ˤ뵡ǽ򥵥ݡȤ javascript ⥸塼ؤΥ", -+ " ळȤ gnuplot ˻ؼޤǥեȤǤϡΥץ", -+ " ϥǥ쥯ȥꡢ̤ /usr/local/share/gnuplot//js ", -+ " ޤץ `jsdir` ̤Υǥ쥯ȥ꤫̾", -+ " URL ꤹ뤳ȤǤѹǤޤSVG Web ڡ", -+ " ǤС̤ϸԤ URL ꤷޤ", ++ " ץ `mouse` ϡޥȥå󥰵ǽȡб key ǥ", ++ " å뤳ȤǤ줾Υդ On/Off ˤ뵡ǽ򥵥ݡȤ", ++ " ä뤳Ȥ gnuplot ˻ؼޤǥեȤǤϥǥ쥯ȥꡢ", ++ " ̾ /usr/local/share/gnuplot//js Τ륹ץȤؤ", ++ " 󥯤ळȤǹԤޤץ `jsdir` ̤Υǥ", ++ " 쥯ȥ꤫̾ URL ꤹ뤳ȤǤѹǤޤSVG ", ++ " Web ڡΤǤС̤ϸԤ URL ꤷޤ", ++ " ץ `standalone` ϡޥץ SVG ʸΤ", ++ " ߡ꥽ؤΥ󥯤ϹԤޤ", ++ "", ++ " SVG ե򲿤γեȤ߹碌Ѥ硢㤨Ф", ++ " 줬 PNG ˻äƤꡢ Web ڡ䤽줬Ǥ", ++ " ʸ javascriptɤ黲ȤƤ褦ʾ硢¾ SVG ", ++ " ؤλȤȤξͤ򤱤뤿˰Ū̾ɬפˤʤޤξ", ++ " ץ `name` ȤäƸͭ̾ݤƤ", + "", + " SVG ǤϡSVG ʸ˥եȤľळȤǤޤʥ", + " ȤؤΥϥѡ󥯤Ϳ뤳ȤǤޤ`fontfile` ץ", @@ -5445,8 +5446,8 @@ END_HELP(svg) #endif diff -rc term/t410x.trm.ORG term/t410x.trm -*** term/t410x.trm.ORG 2012-01-22 14:36:37.000000000 +0900 ---- term/t410x.trm 2012-01-22 14:37:59.000000000 +0900 +*** term/t410x.trm.ORG 2013-10-12 20:44:02.000000000 +0900 +--- term/t410x.trm 2013-10-12 20:47:16.000000000 +0900 *************** *** 315,320 **** --- 315,321 ---- @@ -5477,8 +5478,8 @@ END_HELP(tek410x) #endif diff -rc term/tek.trm.ORG term/tek.trm -*** term/tek.trm.ORG 2012-01-22 14:36:36.000000000 +0900 ---- term/tek.trm 2012-01-22 14:37:59.000000000 +0900 +*** term/tek.trm.ORG 2013-10-12 20:44:02.000000000 +0900 +--- term/tek.trm 2013-10-12 20:47:16.000000000 +0900 *************** *** 798,803 **** --- 798,804 ---- @@ -5558,8 +5559,8 @@ END_HELP(tek40) #endif /* TERM_HELP */ diff -rc term/texdraw.trm.ORG term/texdraw.trm -*** term/texdraw.trm.ORG 2012-01-22 14:36:36.000000000 +0900 ---- term/texdraw.trm 2012-01-22 14:37:59.000000000 +0900 +*** term/texdraw.trm.ORG 2013-10-12 20:44:02.000000000 +0900 +--- term/texdraw.trm 2013-10-12 20:47:16.000000000 +0900 *************** *** 368,373 **** --- 368,374 ---- @@ -5599,8 +5600,8 @@ END_HELP(texdraw) #endif /* TERM_HELP */ diff -rc term/tgif.trm.ORG term/tgif.trm -*** term/tgif.trm.ORG 2012-01-22 14:36:36.000000000 +0900 ---- term/tgif.trm 2012-01-22 14:37:59.000000000 +0900 +*** term/tgif.trm.ORG 2013-10-12 20:44:02.000000000 +0900 +--- term/tgif.trm 2013-10-12 20:47:16.000000000 +0900 *************** *** 1714,1719 **** --- 1714,1720 ---- @@ -5694,8 +5695,8 @@ #endif /*{{{}}}*/ diff -rc term/tkcanvas.trm.ORG term/tkcanvas.trm -*** term/tkcanvas.trm.ORG 2012-01-22 14:36:36.000000000 +0900 ---- term/tkcanvas.trm 2012-01-22 14:37:59.000000000 +0900 +*** term/tkcanvas.trm.ORG 2013-10-12 20:44:02.000000000 +0900 +--- term/tkcanvas.trm 2013-10-12 20:47:16.000000000 +0900 *************** *** 611,616 **** --- 611,617 ---- @@ -5769,8 +5770,8 @@ END_HELP(tkcanvas) #endif diff -rc term/tpic.trm.ORG term/tpic.trm -*** term/tpic.trm.ORG 2012-01-22 14:36:37.000000000 +0900 ---- term/tpic.trm 2012-01-22 14:37:59.000000000 +0900 +*** term/tpic.trm.ORG 2013-10-12 20:44:01.000000000 +0900 +--- term/tpic.trm 2013-10-12 20:47:17.000000000 +0900 *************** *** 928,933 **** --- 928,934 ---- @@ -5829,8 +5830,8 @@ END_HELP(tpic) #endif /* TERM_TABLE */ diff -rc term/unixpc.trm.ORG term/unixpc.trm -*** term/unixpc.trm.ORG 2012-01-22 14:36:37.000000000 +0900 ---- term/unixpc.trm 2012-01-22 14:37:59.000000000 +0900 +*** term/unixpc.trm.ORG 2013-10-12 20:44:02.000000000 +0900 +--- term/unixpc.trm 2013-10-12 20:47:17.000000000 +0900 *************** *** 615,620 **** --- 615,621 ---- @@ -5861,8 +5862,8 @@ END_HELP(unixpc) #endif /* TERM_HELP */ diff -rc term/v384.trm.ORG term/v384.trm -*** term/v384.trm.ORG 2012-01-22 14:36:36.000000000 +0900 ---- term/v384.trm 2012-01-22 14:37:59.000000000 +0900 +*** term/v384.trm.ORG 2013-10-12 20:44:02.000000000 +0900 +--- term/v384.trm 2013-10-12 20:47:17.000000000 +0900 *************** *** 194,199 **** --- 194,200 ---- @@ -5893,8 +5894,8 @@ END_HELP(vx384) #endif diff -rc term/vgagl.trm.ORG term/vgagl.trm -*** term/vgagl.trm.ORG 2012-01-22 14:36:36.000000000 +0900 ---- term/vgagl.trm 2012-01-22 14:37:59.000000000 +0900 +*** term/vgagl.trm.ORG 2013-10-12 20:44:01.000000000 +0900 +--- term/vgagl.trm 2013-10-12 20:47:17.000000000 +0900 *************** *** 1550,1555 **** --- 1550,1556 ---- @@ -5973,8 +5974,8 @@ #endif #endif /* defined(USE_MOUSE) */ diff -rc term/vws.trm.ORG term/vws.trm -*** term/vws.trm.ORG 2012-01-22 14:36:37.000000000 +0900 ---- term/vws.trm 2012-01-22 14:37:59.000000000 +0900 +*** term/vws.trm.ORG 2013-10-12 20:44:02.000000000 +0900 +--- term/vws.trm 2013-10-12 20:47:17.000000000 +0900 *************** *** 477,482 **** --- 477,483 ---- @@ -6006,11 +6007,11 @@ END_HELP(VWS) #endif /* TERM_HELP */ diff -rc term/win.trm.ORG term/win.trm -*** term/win.trm.ORG 2012-01-22 14:36:36.000000000 +0900 ---- term/win.trm 2012-01-22 14:37:59.000000000 +0900 +*** term/win.trm.ORG 2013-10-12 20:44:02.000000000 +0900 +--- term/win.trm 2013-10-12 20:47:17.000000000 +0900 *************** -*** 883,888 **** ---- 883,889 ---- +*** 891,896 **** +--- 891,897 ---- #ifdef TERM_HELP START_HELP(windows) @@ -6019,8 +6020,8 @@ "?commands set terminal windows", "?set terminal windows", *************** -*** 1151,1155 **** ---- 1152,1424 ---- +*** 1159,1163 **** +--- 1160,1432 ---- " must be SOLID with unit width.", "", " See `graph-menu`." @@ -6295,11 +6296,11 @@ END_HELP(windows) #endif /* TERM_HELP */ diff -rc term/wxt.trm.ORG term/wxt.trm -*** term/wxt.trm.ORG 2012-01-22 14:36:36.000000000 +0900 ---- term/wxt.trm 2012-01-22 14:37:59.000000000 +0900 +*** term/wxt.trm.ORG 2013-10-12 20:44:02.000000000 +0900 +--- term/wxt.trm 2013-10-12 20:47:17.000000000 +0900 *************** -*** 442,447 **** ---- 442,448 ---- +*** 447,452 **** +--- 447,453 ---- #ifdef TERM_HELP START_HELP(wxt) @@ -6308,8 +6309,8 @@ "?set terminal wxt", "?terminal wxt", *************** -*** 555,559 **** ---- 556,680 ---- +*** 560,564 **** +--- 561,685 ---- " bindings by + and +'q', respectively.", " These three keywords (raise, persist and ctrl) can also be set and remembered", " between sessions through the configuration dialog." @@ -6436,11 +6437,11 @@ END_HELP(wxt) #endif /* TERM_HELP */ diff -rc term/x11.trm.ORG term/x11.trm -*** term/x11.trm.ORG 2012-01-22 14:36:36.000000000 +0900 ---- term/x11.trm 2012-01-22 14:37:59.000000000 +0900 +*** term/x11.trm.ORG 2013-10-12 20:44:02.000000000 +0900 +--- term/x11.trm 2013-10-12 20:47:17.000000000 +0900 *************** -*** 2115,2120 **** ---- 2115,2121 ---- +*** 2119,2124 **** +--- 2119,2125 ---- #ifdef TERM_HELP START_HELP(x11) @@ -6449,8 +6450,8 @@ "?commands set terminal x11", "?set terminal x11", *************** -*** 2668,2673 **** ---- 2669,3231 ---- +*** 2672,2677 **** +--- 2673,3235 ---- "%@gnuplot*fastrotate: on", "%@gnuplot*ctrlq: off", "@end table" @@ -7015,11 +7016,11 @@ END_HELP(x11) #endif /* TERM_HELP */ diff -rc term/xlib.trm.ORG term/xlib.trm -*** term/xlib.trm.ORG 2012-01-22 14:36:36.000000000 +0900 ---- term/xlib.trm 2012-01-22 14:37:59.000000000 +0900 +*** term/xlib.trm.ORG 2013-10-12 20:44:02.000000000 +0900 +--- term/xlib.trm 2013-10-12 20:47:17.000000000 +0900 *************** -*** 89,94 **** ---- 89,95 ---- +*** 92,97 **** +--- 92,98 ---- #ifdef TERM_HELP START_HELP(xlib) @@ -7028,8 +7029,8 @@ "?commands set terminal xlib", "?set terminal xlib", *************** -*** 101,105 **** ---- 102,120 ---- +*** 104,108 **** +--- 105,123 ---- " `set output ''`. `set term x11` is equivalent to", " `set output \"|gnuplot_x11 -noevents\"; set term xlib`.", " `xlib` takes the same set of options as `x11`." diff -Nru gnuplot-4.6.4/docs/titlepag.tex gnuplot-4.6.5/docs/titlepag.tex --- gnuplot-4.6.4/docs/titlepag.tex 2013-09-05 19:10:58.000000000 +0000 +++ gnuplot-4.6.5/docs/titlepag.tex 2013-12-30 20:16:21.000000000 +0000 @@ -1,5 +1,5 @@ % -% $Id: titlepag.tex,v 1.32.2.4 2013/09/05 19:10:58 sfeam Exp $ +% $Id: titlepag.tex,v 1.32.2.6 2013/12/30 20:16:21 sfeam Exp $ % \ifx\LaTeXe\undefined @@ -32,6 +32,13 @@ % ,pdfkeywords={...} ]{hyperref} +% This replaces the default ugly red boxes around hyperlinks + \hypersetup{ + colorlinks = true, %Colours links instead of ugly boxes + linkcolor = blue, %Colour of internal links + urlcolor = blue %Colour for external hyperlinks + } + \usepackage{fancyhdr} \usepackage{makeidx} @@ -151,7 +158,7 @@ Alex Woo, Johannes Zellner\\ Copyright {\copyright} 1986 - 1993, 1998, 2004 Thomas Williams, Colin Kelley\\ - Copyright {\copyright} 2004 - 2012 various authors\\ + Copyright {\copyright} 2004 - 2014 various authors\\ \vspace{2ex} @@ -165,7 +172,7 @@ \vspace{2ex} % 14 February 2012 Version 4.6 - 2013 Version 4.6.4 + 2014 Version 4.6.5 \end{center} \newpage Binary files /tmp/1acvXRLH9S/gnuplot-4.6.4/FAQ.pdf and /tmp/_yCAEi9ehf/gnuplot-4.6.5/FAQ.pdf differ diff -Nru gnuplot-4.6.4/NEWS gnuplot-4.6.5/NEWS --- gnuplot-4.6.4/NEWS 2013-10-03 03:50:18.000000000 +0000 +++ gnuplot-4.6.5/NEWS 2014-02-03 04:55:03.000000000 +0000 @@ -1,5 +1,31 @@ -New features, changes and fixes since gnuplot version 4.6.3 -=========================================================== +New features, changes and fixes in gnuplot version 4.6.5 +======================================================== + +* NEW monotonic cubic splines using "smooth mcsplines" +* NEW phase-jump removal filter "smooth unwrap" +* NEW allow '+' pseudofile to sample the T axis in 2D parametric plots +* NEW allow '++' pseudofile to sample the U/V axes in 3D parametric plots +* NEW "sixel" terminal driver +* NEW new object attribute clip/noclip +* CHANGE maximum number of using spec columns increased from 7 to 11 +* CHANGE code in bitmap.c relicensed to remove restriction to noncommercial use +* FIX allow 'set pm3d' interpolate and top/bottom options to coexist +* FIX revised handling of defined palettes with explicit maxcolors +* FIX continue as normal after an interactive session error from "gnuplot -" +* FIX empty first field in a tab-separated-values file was incorrectly ignored +* FIX several problems with color assignment to contour lines +* FIX qt terminal incorrectly changed linetype (dot/dash) to match line color +* FIX "pause mouse" worked only for right- or center- click, not left-click +* FIX emf terminal font initialization +* FIX wxt terminal vertical centering of enhanced text +* FIX win terminal filled polygon bugs +* FIX iteration over parametric function plots +* FIX autoscaling of polar mode plots +* FIX increase precision of xticlabel placement from (float) to (double) +* FIX allocation error affecting certain cvs files + +New features, changes and fixes in gnuplot version 4.6.4 +======================================================== * NEW Ctrl-Break interrupts fitting run in wgnuplot * CHANGE treat empty fields in a csv file as "missing" rather than "bad" diff -Nru gnuplot-4.6.4/PATCHLEVEL gnuplot-4.6.5/PATCHLEVEL --- gnuplot-4.6.4/PATCHLEVEL 2013-09-05 19:09:20.000000000 +0000 +++ gnuplot-4.6.5/PATCHLEVEL 2014-01-17 20:36:08.000000000 +0000 @@ -1 +1 @@ -4 +5 diff -Nru gnuplot-4.6.4/src/axis.c gnuplot-4.6.5/src/axis.c --- gnuplot-4.6.4/src/axis.c 2013-08-13 23:33:12.000000000 +0000 +++ gnuplot-4.6.5/src/axis.c 2013-10-15 00:08:14.000000000 +0000 @@ -1,5 +1,5 @@ #ifndef lint -static char *RCSid() { return RCSid("$Id: axis.c,v 1.97.2.5 2013/08/08 06:45:31 sfeam Exp $"); } +static char *RCSid() { return RCSid("$Id: axis.c,v 1.97.2.6 2013/10/15 00:08:14 sfeam Exp $"); } #endif /* GNUPLOT - axis.c */ @@ -1029,6 +1029,9 @@ else if (axis_array[axis].log) { ministart = ministep = step / minifreq * axis_array[axis].base; miniend = step * axis_array[axis].base; + /* Suppress minitics that would lie on top of major tic */ + while (ministart <= 1) + ministart += ministep; } else { ministart = ministep = step / minifreq; miniend = step; diff -Nru gnuplot-4.6.4/src/bitmap.c gnuplot-4.6.5/src/bitmap.c --- gnuplot-4.6.4/src/bitmap.c 2008-11-15 19:38:54.000000000 +0000 +++ gnuplot-4.6.5/src/bitmap.c 2013-12-16 20:54:08.000000000 +0000 @@ -1,11 +1,13 @@ #ifndef lint -static char *RCSid() { return RCSid("$Id: bitmap.c,v 1.26 2008/11/15 19:38:54 sfeam Exp $"); } +static char *RCSid() { return RCSid("$Id: bitmap.c,v 1.26.4.1 2013/12/15 06:18:45 sfeam Exp $"); } #endif /* GNUPLOT - bitmap.c */ /*[ - * Copyright 1986 - 1993, 1998, 2004 Thomas Williams, Colin Kelley + * Copyright Jyrki Yli-Nokari 1987 + * + * Gnuplot license: * * Permission to use, copy, and distribute this software and its * documentation for any purpose with or without fee is hereby granted, @@ -32,33 +34,49 @@ * * This software is provided "as is" without express or implied warranty * to the extent permitted by applicable law. + * + * Alternative license: + * + * As an alternative to distributing code in this file under the gnuplot license, + * you may instead comply with the terms below. In this case, redistribution and + * use in source and binary forms, with or without modification, are permitted + * provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * ]*/ - /* * AUTHORS * * Original Software: - * Jyrki Yli-Nokari + * Jyrki Yli-Nokari (1987) + * Modified for use with gnuplot (1990): * Ronald J. Hartranft * Russell Lang */ - /* - ** General raster plotting routines. - ** Raster routines written and copyrighted 1987 by - ** Jyrki Yli-Nokari (jty@intrin.UUCP) - ** Intrinsic, Ltd. - ** - ** You may use this code for anything you like as long as - ** you are not selling it and the credit is given and - ** this message retained. - ** - */ - -/* Bitmap plotting routines derived from above raster plotting routines - * Russell Lang, 1990 + ** Jyrki Yli-Nokari, December 2013. + ** Change to dual licence (Gnuplot + BSD) and remove previous + ** restriction to noncommercial use. */ #include "bitmap.h" diff -Nru gnuplot-4.6.4/src/color.h gnuplot-4.6.5/src/color.h --- gnuplot-4.6.4/src/color.h 2011-10-08 00:07:41.000000000 +0000 +++ gnuplot-4.6.5/src/color.h 2013-10-21 22:31:47.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: color.h,v 1.35 2011/10/08 00:07:41 sfeam Exp $ + * $Id: color.h,v 1.35.2.1 2013/10/21 22:31:47 sfeam Exp $ */ /* GNUPLOT - color.h */ @@ -180,6 +180,9 @@ * Interpolated tables are used if colorMode==SMPAL_COLOR_MODE_GRADIENT */ int gradient_num; gradient_struct *gradient; + /* Smallest nonzero gradient[i+1] - gradient[i]. If this is < (1/colors) + * Then a truncated gray value may miss the gradient it belongs in. */ + double smallest_gradient_interval; /* the used color model: RGB, HSV, XYZ, etc. */ int cmodel; diff -Nru gnuplot-4.6.4/src/command.c gnuplot-4.6.5/src/command.c --- gnuplot-4.6.4/src/command.c 2013-07-22 22:19:10.000000000 +0000 +++ gnuplot-4.6.5/src/command.c 2014-01-29 19:08:57.000000000 +0000 @@ -1,5 +1,5 @@ #ifndef lint -static char *RCSid() { return RCSid("$Id: command.c,v 1.230.2.11 2013/07/22 22:19:10 sfeam Exp $"); } +static char *RCSid() { return RCSid("$Id: command.c,v 1.230.2.14 2014/01/29 19:08:57 sfeam Exp $"); } #endif /* GNUPLOT - command.c */ @@ -1641,12 +1641,15 @@ CHECK_REVERSE(SECOND_Y_AXIS); #undef CHECK_REVERSE - if (refresh_ok == 2) + if (refresh_ok == 2) { do_plot(first_plot, refresh_nplots); - else if (refresh_ok == 3) + update_gpval_variables(1); + } else if (refresh_ok == 3) { do_3dplot(first_3dplot, refresh_nplots, 0); - else + update_gpval_variables(1); + } else { int_error(NO_CARET, "Internal error - refresh of unknown plot type"); + } } @@ -1956,9 +1959,6 @@ free(replot_line); replot_line = save_replot_line; is_3d_plot = save_is_3d_plot; - - /* further, gp_input_line[] and token[] now destroyed! */ - c_token = num_tokens = 0; } @@ -3043,8 +3043,8 @@ while (isalnum(*c) || (*c=='_')) c++; temp_char = *c; *c = '\0'; /* Look up the key and restore the original following char */ - udv = add_udv_by_name(m); - if (udv && udv->udv_value.type == STRING) { + udv = get_udv_by_name(m); + if (udv && !udv->udv_undef && udv->udv_value.type == STRING) { nfound++; m = udv->udv_value.v.string_val; FPRINTF((stderr,"Replacing @%s with \"%s\"\n",udv->udv_name,m)); diff -Nru gnuplot-4.6.4/src/datafile.c gnuplot-4.6.5/src/datafile.c --- gnuplot-4.6.4/src/datafile.c 2013-08-13 23:33:12.000000000 +0000 +++ gnuplot-4.6.5/src/datafile.c 2014-02-03 04:55:04.000000000 +0000 @@ -1,5 +1,5 @@ #ifndef lint -static char *RCSid() { return RCSid("$Id: datafile.c,v 1.212.2.24 2013/08/08 07:02:35 sfeam Exp $"); } +static char *RCSid() { return RCSid("$Id: datafile.c,v 1.212.2.30 2014/02/01 06:41:39 sfeam Exp $"); } #endif /* GNUPLOT - datafile.c */ @@ -165,6 +165,9 @@ /* is it a comment line? */ #define is_comment(c) ((c) && (strchr(df_commentschars, (c)) != NULL)) +/* Used to skip whitespace but not cross a field boundary */ +#define NOTSEP (*s != df_separator) + /*{{{ static fns */ static int check_missing __PROTO((char *s)); @@ -660,13 +663,11 @@ for (i = 0; i= CT_XTICLABEL) { int axis, axcol; - float xpos; + double xpos; /* EAM FIXME - skip columnstacked histograms also */ if (df_current_plot) { @@ -4948,26 +4946,30 @@ df_generate_pseudodata() { /* Pseudofile '+' returns a set of (samples) x coordinates */ - /* This code copied from that in second pass through eval_plots() */ + /* This code based on that in second pass through eval_plots() */ if (df_pseudodata == 1) { static double t, t_min, t_max, t_step; if (df_pseudorecord >= samples_1) return NULL; if (df_pseudorecord == 0) { - if (parametric || polar) - int_error(NO_CARET,"Pseudodata not yet implemented for polar or parametric graphs"); - if (axis_array[FIRST_X_AXIS].max == -VERYLARGE) - axis_array[FIRST_X_AXIS].max = 10; - if (axis_array[FIRST_X_AXIS].min == VERYLARGE) - axis_array[FIRST_X_AXIS].min = -10; - t_min = X_AXIS.min; - t_max = X_AXIS.max; - axis_unlog_interval(x_axis, &t_min, &t_max, 1); + if (polar) { + int_error(NO_CARET,"Pseudodata not implemented for polar graphs"); + } else if (parametric) { + t_min = axis_array[T_AXIS].min; + t_max = axis_array[T_AXIS].max; + } else { + if (axis_array[FIRST_X_AXIS].max == -VERYLARGE) + axis_array[FIRST_X_AXIS].max = 10; + if (axis_array[FIRST_X_AXIS].min == VERYLARGE) + axis_array[FIRST_X_AXIS].min = -10; + t_min = X_AXIS.min; + t_max = X_AXIS.max; + axis_unlog_interval(x_axis, &t_min, &t_max, 1); + } t_step = (t_max - t_min) / (samples_1 - 1); } t = t_min + df_pseudorecord * t_step; - t = AXIS_DE_LOG_VALUE(x_axis, t); - sprintf(line,"%g",t); + sprintf(line,"%g", (parametric) ? t : AXIS_DE_LOG_VALUE(x_axis, t)); ++df_pseudorecord; } @@ -4992,12 +4994,19 @@ if (df_pseudospan == 0) { if (samples_1 < 2 || samples_2 < 2 || iso_samples_1 < 2 || iso_samples_2 < 2) int_error(NO_CARET, "samples or iso_samples < 2. Must be at least 2."); - axis_checked_extend_empty_range(FIRST_X_AXIS, "x range is invalid"); - axis_checked_extend_empty_range(FIRST_Y_AXIS, "y range is invalid"); - u_min = axis_log_value_checked(u_axis, axis_array[u_axis].min, "x range"); - u_max = axis_log_value_checked(u_axis, axis_array[u_axis].max, "x range"); - v_min = axis_log_value_checked(v_axis, axis_array[v_axis].min, "y range"); - v_max = axis_log_value_checked(v_axis, axis_array[v_axis].max, "y range"); + if (parametric) { + u_min = axis_array[U_AXIS].min; + u_max = axis_array[U_AXIS].max; + v_min = axis_array[V_AXIS].min; + v_max = axis_array[V_AXIS].max; + } else { + axis_checked_extend_empty_range(FIRST_X_AXIS, "x range is invalid"); + axis_checked_extend_empty_range(FIRST_Y_AXIS, "y range is invalid"); + u_min = axis_log_value_checked(u_axis, axis_array[u_axis].min, "x range"); + u_max = axis_log_value_checked(u_axis, axis_array[u_axis].max, "x range"); + v_min = axis_log_value_checked(v_axis, axis_array[v_axis].min, "y range"); + v_max = axis_log_value_checked(v_axis, axis_array[v_axis].max, "y range"); + } if (hidden3d) { u_step = (u_max - u_min) / (iso_samples_1 - 1); @@ -5016,7 +5025,10 @@ /* Duplicate algorithm from calculate_set_of_isolines() */ u = u_min + df_pseudorecord * u_step; v = v_max - df_pseudospan * v_isostep; - sprintf(line,"%g %g", AXIS_DE_LOG_VALUE(u_axis,u), AXIS_DE_LOG_VALUE(v_axis,v)); + if (parametric) + sprintf(line,"%g %g", u, v); + else + sprintf(line,"%g %g", AXIS_DE_LOG_VALUE(u_axis,u), AXIS_DE_LOG_VALUE(v_axis,v)); ++df_pseudorecord; } diff -Nru gnuplot-4.6.4/src/datafile.h gnuplot-4.6.5/src/datafile.h --- gnuplot-4.6.4/src/datafile.h 2013-03-14 19:40:33.000000000 +0000 +++ gnuplot-4.6.5/src/datafile.h 2013-10-31 21:06:23.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: datafile.h,v 1.35.2.3 2013/03/14 19:40:33 sfeam Exp $ + * $Id: datafile.h,v 1.35.2.4 2013/10/29 05:18:05 sfeam Exp $ */ /* GNUPLOT - datafile.h */ @@ -66,9 +66,11 @@ /* Variables of datafile.c needed by other modules: */ -/* how many using columns were specified, and max possible */ +/* how many using columns were specified */ extern int df_no_use_specs; -#define MAXDATACOLS 7 +/* Maximum allowed number of using specs */ +/* 6 data columns (boxxyerror) + 1 variable color + 4 axis tic labels */ +#define MAXDATACOLS 11 /* suggested x value if none given */ extern int df_datum; diff -Nru gnuplot-4.6.4/src/fit.c gnuplot-4.6.5/src/fit.c --- gnuplot-4.6.4/src/fit.c 2013-08-21 18:38:32.000000000 +0000 +++ gnuplot-4.6.5/src/fit.c 2013-12-31 18:43:49.000000000 +0000 @@ -1,5 +1,5 @@ #ifndef lint -static char *RCSid() { return RCSid("$Id: fit.c,v 1.78.2.7 2013/08/21 18:38:32 sfeam Exp $"); } +static char *RCSid() { return RCSid("$Id: fit.c,v 1.78.2.8 2013/12/31 15:59:55 markisch Exp $"); } #endif /* NOTICE: Change of Copyright Status @@ -625,8 +625,6 @@ /* HBB 981118: initialize new variable 'user_break' */ user_stop = FALSE; - /* FIXME: This really should not be necessary, but it is not properly initialised in wgnuplot otherwise. */ - ctrlc_flag = FALSE; do { /* diff -Nru gnuplot-4.6.4/src/gadgets.h gnuplot-4.6.5/src/gadgets.h --- gnuplot-4.6.4/src/gadgets.h 2011-10-10 21:17:04.000000000 +0000 +++ gnuplot-4.6.5/src/gadgets.h 2013-10-23 18:25:36.000000000 +0000 @@ -145,12 +145,19 @@ t_position *vertex; /* Array of vertices */ } t_polygon; +typedef enum en_clip_object { + OBJ_CLIP, /* Clip to graph unless coordinate type is screen */ + OBJ_NOCLIP, /* Clip to canvas, never to graph */ + OBJ_ALWAYS_CLIP /* Not yet implemented */ +} t_clip_object; + /* Datastructure for 'set object' */ typedef struct object { struct object *next; int tag; int layer; /* behind or back or front */ int object_type; /* OBJ_RECTANGLE */ + t_clip_object clip; fill_style_type fillstyle; lp_style_type lp_properties; union o {t_rectangle rectangle; t_circle circle; t_ellipse ellipse; t_polygon polygon;} o; @@ -486,24 +493,24 @@ #ifdef EAM_OBJECTS /* Warning: C89 does not like the union initializers */ extern struct object default_rectangle; -#define DEFAULT_RECTANGLE_STYLE { NULL, -1, 0, OBJ_RECTANGLE, \ +#define DEFAULT_RECTANGLE_STYLE { NULL, -1, 0, OBJ_RECTANGLE, OBJ_CLIP, \ {FS_SOLID, 100, 0, BLACK_COLORSPEC}, \ {0, LT_BACKGROUND, 0, 0, 1.0, 0.0, FALSE, BACKGROUND_COLORSPEC}, \ {.rectangle = {0, {0,0,0,0.,0.,0.}, {0,0,0,0.,0.,0.}, {0,0,0,0.,0.,0.}, {0,0,0,0.,0.,0.}}} } extern struct object default_circle; -#define DEFAULT_CIRCLE_STYLE { NULL, -1, 0, OBJ_CIRCLE, \ +#define DEFAULT_CIRCLE_STYLE { NULL, -1, 0, OBJ_CIRCLE, OBJ_CLIP, \ {FS_SOLID, 100, 0, BLACK_COLORSPEC}, \ - {0, LT_BACKGROUND, 0, 0, 1.0, 0.0, FALSE, BACKGROUND_COLORSPEC}, \ + {0, LT_BACKGROUND, 0, 0, 1.0, 0.0, FALSE, BACKGROUND_COLORSPEC}, \ {.circle = {1, {0,0,0,0.,0.,0.}, {graph,0,0,0.02,0.,0.}, 0., 360. }} } extern struct object default_ellipse; -#define DEFAULT_ELLIPSE_STYLE { NULL, -1, 0, OBJ_ELLIPSE, \ +#define DEFAULT_ELLIPSE_STYLE { NULL, -1, 0, OBJ_ELLIPSE, OBJ_CLIP, \ {FS_SOLID, 100, 0, BLACK_COLORSPEC}, \ {0, LT_BACKGROUND, 0, 0, 1.0, 0.0, FALSE, BACKGROUND_COLORSPEC}, \ {.ellipse = {ELLIPSEAXES_XY, {0,0,0,0.,0.,0.}, {graph,graph,0,0.05,0.03,0.}, 0. }} } -#define DEFAULT_POLYGON_STYLE { NULL, -1, 0, OBJ_POLYGON, \ +#define DEFAULT_POLYGON_STYLE { NULL, -1, 0, OBJ_POLYGON, OBJ_CLIP, \ {FS_SOLID, 100, 0, BLACK_COLORSPEC}, \ {0, LT_BLACK, 0, 0, 1.0, 0.0, FALSE, BLACK_COLORSPEC}, \ {.polygon = {0, NULL} } } diff -Nru gnuplot-4.6.4/src/getcolor.c gnuplot-4.6.5/src/getcolor.c --- gnuplot-4.6.4/src/getcolor.c 2011-10-08 00:07:41.000000000 +0000 +++ gnuplot-4.6.5/src/getcolor.c 2013-10-25 20:50:35.000000000 +0000 @@ -1,5 +1,5 @@ #ifndef lint -static char *RCSid() { return RCSid("$Id: getcolor.c,v 1.32 2011/10/08 00:07:41 sfeam Exp $"); } +static char *RCSid() { return RCSid("$Id: getcolor.c,v 1.32.2.2 2013/10/25 15:36:37 sfeam Exp $"); } #endif /* GNUPLOT - getcolor.c */ @@ -346,27 +346,44 @@ double quantize_gray( double gray ) { - double degray = floor(gray * sm_palette.use_maxcolors) - / (sm_palette.use_maxcolors-1); + double qgray = floor(gray * sm_palette.use_maxcolors) + / (sm_palette.use_maxcolors-1); if (sm_palette.colorMode == SMPAL_COLOR_MODE_GRADIENT) { int j; - if ((sm_palette.gradient_num <= 2) && (degray == 0)) - ; /* Backward compatibility with common case of 1 segment */ + gradient_struct *g = sm_palette.gradient; + double small_interval = 1. / sm_palette.use_maxcolors; + + /* Backward compatibility with common case of 1 segment */ + if ((sm_palette.gradient_num <= 2) && (qgray == 0)) + ; + + /* All palette segments are large compared to the sampling interval. + * Simple truncation of gray is good enough. + */ + else if (sm_palette.smallest_gradient_interval > small_interval) + ; + + /* There is at least one palette segment that is smaller than the sampling + * interval. Earlier versions of quantize_gray() handled this case poorly. + * This version isn't perfect either. In particular it fails to handle the + * converse problematic case where qgray is inside some small interval but + * the true gray value is not. This causes a color from the narrow segment + * to be applied incorrectly to neighoring segments as well. + */ else for (j=0; j= sm_palette.gradient[j].pos) - && (gray < sm_palette.gradient[j+1].pos)) { - if ((degray < sm_palette.gradient[j].pos) - || (degray > sm_palette.gradient[j+1].pos)) - degray = (sm_palette.gradient[j].pos - + sm_palette.gradient[j+1].pos) / 2.; - } - if (gray < sm_palette.gradient[j+1].pos) + /* Does the true gray value lie in this interval? */ + if ((gray >= g[j].pos) && (gray < g[j+1].pos)) { + /* See if it is so small that truncation missed it */ + if ((g[j+1].pos - g[j].pos) < small_interval) + qgray = (g[j].pos + g[j+1].pos) / 2.; break; + } + } } - return degray; + return qgray; } diff -Nru gnuplot-4.6.4/src/gp_types.h gnuplot-4.6.5/src/gp_types.h --- gnuplot-4.6.4/src/gp_types.h 2011-04-16 04:55:26.000000000 +0000 +++ gnuplot-4.6.5/src/gp_types.h 2014-01-31 17:23:26.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: gp_types.h,v 1.50 2011/04/16 04:55:26 sfeam Exp $ + * $Id: gp_types.h,v 1.50.2.2 2014/01/31 05:22:06 sfeam Exp $ */ /* GNUPLOT - gp_types.h */ @@ -116,10 +116,12 @@ SMOOTH_CSPLINES, SMOOTH_SBEZIER, SMOOTH_UNIQUE, + SMOOTH_UNWRAP, SMOOTH_FREQUENCY, SMOOTH_CUMULATIVE, SMOOTH_KDENSITY, - SMOOTH_CUMULATIVE_NORMALISED + SMOOTH_CUMULATIVE_NORMALISED, + SMOOTH_MONOTONE_CSPLINE } PLOT_SMOOTH; /* FIXME HBB 20000521: 'struct value' and its part, 'cmplx', should go diff -Nru gnuplot-4.6.4/src/graph3d.c gnuplot-4.6.5/src/graph3d.c --- gnuplot-4.6.4/src/graph3d.c 2013-07-03 16:18:21.000000000 +0000 +++ gnuplot-4.6.5/src/graph3d.c 2013-12-11 22:16:05.000000000 +0000 @@ -1,5 +1,5 @@ #ifndef lint -static char *RCSid() { return RCSid("$Id: graph3d.c,v 1.253.2.14 2013/07/03 16:18:21 sfeam Exp $"); } +static char *RCSid() { return RCSid("$Id: graph3d.c,v 1.253.2.16 2013/12/11 22:16:05 sfeam Exp $"); } #endif /* GNUPLOT - graph3d.c */ @@ -1206,6 +1206,7 @@ NEXT_KEY_LINE(); if (draw_contour && this_plot->contours != NULL) { + int ic = 1; /* ic will index the contour linetypes */ struct gnuplot_contours *cntrs = this_plot->contours; struct lp_style_type thiscontour_lp_properties = this_plot->lp_properties; @@ -1279,10 +1280,14 @@ thiscontour_lp_properties.l_type = 0; thiscontour_lp_properties.use_palette = TRUE; } + ic++; /* Increment linetype used for contour */ if (prefer_line_styles && label_contours) - lp_use_properties(&ls, ++thiscontour_lp_properties.l_type+1); - else - load_linetype(&ls, ++thiscontour_lp_properties.l_type+1); + lp_use_properties(&ls, this_plot->hidden3d_top_linetype + ic); + else { + thiscontour_lp_properties.l_type = this_plot->hidden3d_top_linetype + ic; + thiscontour_lp_properties.use_palette = TRUE; + load_linetype(&ls, this_plot->hidden3d_top_linetype + ic); + } thiscontour_lp_properties.pm3d_color = ls.pm3d_color; term_apply_lp_properties(&thiscontour_lp_properties); } @@ -3065,14 +3070,13 @@ (term->layer)(TERM_LAYER_BEGIN_KEYSAMPLE); if (key->just == GPKEY_LEFT && key->region != GPKEY_USER_PLACEMENT) { - (*term->justify_text) (LEFT); - (*term->put_text) (xl + key_text_left, yl, text); + write_multiline(xl + key_text_left, yl, text, LEFT, JUST_TOP, 0, key->font); } else { if ((*term->justify_text) (RIGHT)) { - (*term->put_text) (xl + key_text_right, yl, text); + write_multiline(xl + key_text_right, yl, text, RIGHT, JUST_TOP, 0, key->font); } else { int x = xl + key_text_right - (term->h_char) * estimate_strlen(text); - (*term->put_text) (x, yl, text); + write_multiline(x, yl, text, LEFT, JUST_TOP, 0, key->font); } } (term->layer)(TERM_LAYER_END_KEYSAMPLE); diff -Nru gnuplot-4.6.4/src/graphics.c gnuplot-4.6.5/src/graphics.c --- gnuplot-4.6.4/src/graphics.c 2013-10-01 18:48:19.000000000 +0000 +++ gnuplot-4.6.5/src/graphics.c 2014-01-04 00:16:15.000000000 +0000 @@ -1,5 +1,5 @@ #ifndef lint -static char *RCSid() { return RCSid("$Id: graphics.c,v 1.379.2.24 2013/10/01 03:00:06 sfeam Exp $"); } +static char *RCSid() { return RCSid("$Id: graphics.c,v 1.379.2.27 2014/01/04 00:16:15 sfeam Exp $"); } #endif /* GNUPLOT - graphics.c */ @@ -1489,7 +1489,8 @@ term_apply_lp_properties(&lpstyle); - if (e->center.scalex == screen && e->center.scaley == screen) + if ((e->center.scalex == screen || e->center.scaley == screen) + || (this_object->clip == OBJ_NOCLIP)) clip_area = &canvas; do_arc((int)x1, (int)y1, radius, e->arc_begin, e->arc_end, style); @@ -1504,19 +1505,27 @@ case OBJ_ELLIPSE: { + t_ellipse *e = &this_object->o.ellipse; + BoundingBox *clip_save = clip_area; + term_apply_lp_properties(&lpstyle); + if ((e->center.scalex == screen || e->center.scaley == screen) + || (this_object->clip == OBJ_NOCLIP)) + clip_area = &canvas; + if (dimensions == 2) - do_ellipse(2, &this_object->o.ellipse, style, TRUE); + do_ellipse(2, e, style, TRUE); else if (splot_map) - do_ellipse(3, &this_object->o.ellipse, style, TRUE); + do_ellipse(3, e, style, TRUE); else break; /* Retrace the border if the style requests it */ if (need_fill_border(fillstyle)) - do_ellipse(dimensions, &this_object->o.ellipse, 0, TRUE); + do_ellipse(dimensions, e, 0, TRUE); + clip_area = clip_save; break; } @@ -1524,11 +1533,11 @@ { term_apply_lp_properties(&lpstyle); - do_polygon(dimensions, &this_object->o.polygon, style); + do_polygon(dimensions, &this_object->o.polygon, style, this_object->clip); /* Retrace the border if the style requests it */ if (need_fill_border(fillstyle)) - do_polygon(dimensions, &this_object->o.polygon, 0); + do_polygon(dimensions, &this_object->o.polygon, 0, this_object->clip); break; } @@ -3750,6 +3759,10 @@ struct fill_style_type *fillstyle = &plot->fill_properties; int style = style_from_fill(fillstyle); TBOOLEAN withborder = FALSE; + BoundingBox *clip_save = clip_area; + + if (default_circle.clip == OBJ_NOCLIP) + clip_area = &canvas; if (fillstyle->border_color.type != TC_LT || fillstyle->border_color.lt != LT_NODRAW) @@ -3778,6 +3791,8 @@ } } } + + clip_area = clip_save; } /* plot_ellipses: @@ -3792,6 +3807,10 @@ struct fill_style_type *fillstyle = &plot->fill_properties; int style = style_from_fill(fillstyle); TBOOLEAN withborder = FALSE; + BoundingBox *clip_save = clip_area; + + if (default_ellipse.clip == OBJ_NOCLIP) + clip_area = &canvas; if (fillstyle->border_color.type != TC_LT || fillstyle->border_color.lt != LT_NODRAW) @@ -3859,7 +3878,7 @@ } } free(e); - /* free(willy); */ + clip_area = clip_save; } #endif @@ -3883,6 +3902,7 @@ (*t->point) (x, y, -1); } } + } /* plot_vectors: @@ -5663,7 +5683,7 @@ { #ifdef EAM_OBJECTS t_object raxis_circle = { - NULL, 1, 1, OBJ_CIRCLE, /* link, tag, layer (front), object_type */ + NULL, 1, 1, OBJ_CIRCLE, OBJ_CLIP, /* link, tag, layer (front), object_type, clip */ {FS_SOLID, 100, 0, BLACK_COLORSPEC}, {0, LT_BACKGROUND, 0, 0, 0.2, 0.0, FALSE, BACKGROUND_COLORSPEC}, {.circle = {1, {0,0,0,0.,0.,0.}, {graph,0,0,0.02,0.,0.}, 0., 360. }} @@ -5753,6 +5773,10 @@ #ifdef EAM_OBJECTS if (this_plot->plot_style == CIRCLES && w > 0) { do_arc(xl + key_point_offset, yl, key_entry_height/4, 0., 360., style); + /* Retrace the border if the style requests it */ + if (need_fill_border(fs)) { + do_arc(xl + key_point_offset, yl, key_entry_height/4, 0., 360., 0); + } } else if (this_plot->plot_style == ELLIPSES && w > 0) { t_ellipse *key_ellipse = (t_ellipse *) gp_alloc(sizeof(t_ellipse), "cute little ellipse for the key sample"); @@ -5763,6 +5787,10 @@ key_ellipse->orientation = 0.0; /* already in term coords, no need to map */ do_ellipse(2, key_ellipse, style, FALSE); + /* Retrace the border if the style requests it */ + if (need_fill_border(fs)) { + do_ellipse(2, key_ellipse, 0, FALSE); + } free(key_ellipse); } else #endif @@ -5863,12 +5891,14 @@ y2 = y1 + height; w = width; h = height; - if (this_rect->extent.scalex == first_axes - || this_rect->extent.scalex == second_axes) - clip_x = TRUE; - if (this_rect->extent.scaley == first_axes - || this_rect->extent.scaley == second_axes) - clip_y = TRUE; + if (this_object->clip == OBJ_CLIP) { + if (this_rect->extent.scalex == first_axes + || this_rect->extent.scalex == second_axes) + clip_x = TRUE; + if (this_rect->extent.scaley == first_axes + || this_rect->extent.scaley == second_axes) + clip_y = TRUE; + } } else { if ((dimensions == 2) @@ -5883,10 +5913,12 @@ if (x1 > x2) {double t=x1; x1=x2; x2=t;} if (y1 > y2) {double t=y1; y1=y2; y2=t;} - if (this_rect->bl.scalex != screen && this_rect->tr.scalex != screen) - clip_x = TRUE; - if (this_rect->bl.scaley != screen && this_rect->tr.scaley != screen) - clip_y = TRUE; + if (this_object->clip == OBJ_CLIP) { + if (this_rect->bl.scalex != screen && this_rect->tr.scalex != screen) + clip_x = TRUE; + if (this_rect->bl.scaley != screen && this_rect->tr.scaley != screen) + clip_y = TRUE; + } } /* FIXME - Should there be a generic clip_rectangle() routine? */ @@ -5976,6 +6008,13 @@ else map3d_position_double(&e->center, &cx, &cy, "ellipse"); + /* FIXME: Clipping of ellipses in 4.6 is so bad that it's better */ + /* to just omit an ellipse whose center is out of the clip area. */ + /* The clipping from 4.7 works fine but would be a major change. */ + if (floor(cx) <= clip_area->xleft || clip_area->xright <= cx + || floor(cy) <= clip_area->ybot || clip_area->ytop <= cy) + return; + /* Calculate the vertices */ vertex[0].style = style; for (i=0, angle = 0.0; i<=segments; i++, angle += ang_inc) { @@ -6058,12 +6097,11 @@ } void -do_polygon( int dimensions, t_polygon *p, int style ) +do_polygon( int dimensions, t_polygon *p, int style, t_clip_object clip ) { static gpiPoint *corners = NULL; static gpiPoint *clpcorn = NULL; BoundingBox *clip_save = clip_area; - TBOOLEAN noclip = FALSE; int nv; if (!p->vertex || p->type < 2) @@ -6071,20 +6109,19 @@ corners = gp_realloc(corners, p->type * sizeof(gpiPoint), "polygon"); clpcorn = gp_realloc(clpcorn, 2 * p->type * sizeof(gpiPoint), "polygon"); + for (nv = 0; nv < p->type; nv++) { if (dimensions == 3) map3d_position(&p->vertex[nv], &corners[nv].x, &corners[nv].y, "pvert"); else map_position(&p->vertex[nv], &corners[nv].x, &corners[nv].y, "pvert"); - /* Any vertex not given in plot coords will disable clipping */ + /* Any vertex given in screen coords will disable clipping */ if (p->vertex[nv].scalex == screen || p->vertex[nv].scaley == screen) - noclip = TRUE; - if (p->vertex[nv].scalex == graph || p->vertex[nv].scaley == graph) - noclip = TRUE; + clip = OBJ_NOCLIP; } - if (noclip) + if (clip == OBJ_NOCLIP) clip_area = &canvas; if (term->filled_polygon && style) { @@ -6121,7 +6158,6 @@ } clip_area = clip_save; - } #endif diff -Nru gnuplot-4.6.4/src/graphics.h gnuplot-4.6.5/src/graphics.h --- gnuplot-4.6.4/src/graphics.h 2011-12-29 18:15:58.000000000 +0000 +++ gnuplot-4.6.5/src/graphics.h 2013-10-23 18:25:36.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: graphics.h,v 1.52.2.1 2011/12/29 06:36:05 sfeam Exp $ + * $Id: graphics.h,v 1.52.2.2 2013/10/22 03:41:13 sfeam Exp $ */ /* GNUPLOT - graphics.h */ @@ -107,7 +107,7 @@ #ifdef EAM_OBJECTS void place_objects __PROTO((struct object *listhead, int layer, int dimensions)); void do_ellipse __PROTO((int dimensions, t_ellipse *e, int style, TBOOLEAN do_own_mapping )); -void do_polygon __PROTO((int dimensions, t_polygon *p, int style )); +void do_polygon __PROTO((int dimensions, t_polygon *p, int style, t_clip_object clip )); #else #define place_objects(listhead,layer,dimensions) /* void() */ #endif diff -Nru gnuplot-4.6.4/src/hidden3d.c gnuplot-4.6.5/src/hidden3d.c --- gnuplot-4.6.4/src/hidden3d.c 2013-01-21 17:46:51.000000000 +0000 +++ gnuplot-4.6.5/src/hidden3d.c 2013-10-28 15:38:05.000000000 +0000 @@ -1,5 +1,5 @@ #ifndef lint -static char *RCSid() { return RCSid("$Id: hidden3d.c,v 1.82.2.4 2013/01/21 17:46:51 sfeam Exp $"); } +static char *RCSid() { return RCSid("$Id: hidden3d.c,v 1.82.2.5 2013/10/27 22:13:43 sfeam Exp $"); } #endif /* GNUPLOT - hidden3d.c */ @@ -1174,6 +1174,7 @@ /* This is a special flag indicating that the user specified an */ /* explicit surface color in the splot command. */ + /* FIXME: Currently never set. */ if (above == LT_SINGLECOLOR-1) above = below = LT_SINGLECOLOR; diff -Nru gnuplot-4.6.4/src/interpol.c gnuplot-4.6.5/src/interpol.c --- gnuplot-4.6.4/src/interpol.c 2012-08-23 21:42:26.000000000 +0000 +++ gnuplot-4.6.5/src/interpol.c 2014-01-31 17:23:26.000000000 +0000 @@ -1,5 +1,5 @@ #ifndef lint -static char *RCSid() { return RCSid("$Id: interpol.c,v 1.39.2.2 2012/08/23 21:42:26 sfeam Exp $"); } +static char *RCSid() { return RCSid("$Id: interpol.c,v 1.39.2.4 2014/01/31 05:22:06 sfeam Exp $"); } #endif /* GNUPLOT - interpol.c */ @@ -840,6 +840,41 @@ return (sc); } +void +gen_interp_unwrap(struct curve_points *plot) +{ + int i, j, curves; + int first_point, num_points; + double y, lasty, diff; + + curves = num_curves(plot); + + first_point = 0; + for (i = 0; i < curves; i++) { + num_points = next_curve(plot, &first_point); + + lasty = 0; /* make all plots start the same place */ + for (j = first_point; j < first_point + num_points; j++) { + if (plot->points[j].type == UNDEFINED) + continue; + + y = plot->points[j].y; + do { + diff = y - lasty; + if (diff > M_PI) y -= 2*M_PI; + if (diff < -M_PI) y += 2*M_PI; + } while (fabs(diff) > M_PI); + plot->points[j].y = y; + + lasty = y; + } + + do_freq(plot, first_point, num_points); + first_point += num_points + 1; + } + return; +} + static void do_cubic( struct curve_points *plot, /* still containes old plot->points */ @@ -1064,8 +1099,8 @@ } /* - * This is the main entry point used for everything except frequencies. - * As stated in the header, it is fine, but I'm not too happy with it. + * This is the shared entry point used for the original smoothing options + * csplines acsplines bezier sbezier */ void @@ -1320,3 +1355,111 @@ cp->p_count = j; cp_extend(cp, j); } + +/* + * EAM December 2013 + * monotonic cubic spline using the Fritsch-Carlson algorithm + * FN Fritsch & RE Carlson (1980). "Monotone Piecewise Cubic Interpolation". + * SIAM Journal on Numerical Analysis (SIAM) 17 (2): 238–246. doi:10.1137/0717021. + */ + +void +mcs_interp(struct curve_points *plot) +{ + /* These track the original (pre-sorted) data points */ + int N = plot->p_count; + struct coordinate *p = gp_realloc(plot->points, (N+1) * sizeof(coordinate), "mcs"); + int i; + + /* These will track the resulting smoothed curve */ + struct coordinate *new_points = gp_alloc((samples_1+1) * sizeof(coordinate), "mcs"); + double sxmin = AXIS_LOG_VALUE(plot->x_axis, X_AXIS.min); + double sxmax = AXIS_LOG_VALUE(plot->x_axis, X_AXIS.max); + double xstart, xend, xstep; + + xstart = GPMAX(p[0].x, sxmin); + xend = GPMIN(p[N-1].x, sxmax); + xstep = (xend - xstart) / (samples_1 - 1); + + /* Calculate spline coefficients */ +#define DX xlow +#define SLOPE xhigh +#define C1 ylow +#define C2 yhigh +#define C3 z + + for (i = 0; i < N-1; i++) { + p[i].DX = p[i+1].x - p[i].x; + p[i].SLOPE = (p[i+1].y - p[i].y) / p[i].DX; + } + p[N-1].SLOPE = 0; + + p[0].C1 = p[0].SLOPE; + for (i = 0; i < N-1; i++) { + if (p[i].SLOPE * p[i+1].SLOPE <= 0) { + p[i+1].C1 = 0; + } else { + double sum = p[i].DX + p[i+1].DX; + p[i+1].C1 = (3. * sum) + / ((sum + p[i+1].DX) / p[i].SLOPE + (sum + p[i].DX) / p[i+1].SLOPE); + } + } + p[N].C1 = p[N-1].SLOPE; + + for (i = 0; i < N; i++) { + double temp = p[i].C1 + p[i+1].C1 - 2*p[i].SLOPE; + p[i].C2 = (p[i].SLOPE - p[i].C1 -temp) / p[i].DX; + p[i].C3 = temp / (p[i].DX * p[i].DX); + } + + /* Use the coefficients C1, C2, C3 to interpolate over the requested range */ + for (i = 0; i < samples_1; i++) { + double x = xstart + i * xstep; + double y; + TBOOLEAN exact = FALSE; + + if (x == p[N-1].x) { /* Exact value for right-most point of original data */ + y = p[N-1].y; + exact = TRUE; + } else { + int low = 0; + int mid; + int high = N-1; + while (low <= high) { + mid = floor((low + high) / 2); + if (p[mid].x < x) + low = mid + 1; + else if (p[mid].x > x) + high = mid - 1; + else { /* Exact value for some point in original data */ + y = p[mid].y; + exact = TRUE; + break; + } + } + if (!exact) { + int j = GPMAX(0, high); + double diff = x - p[j].x; + y = p[j].y + p[j].C1 * diff + p[j].C2 * diff * diff + p[j].C3 * diff * diff * diff; + } + } + + /* FIXME: Log x? autoscale x? */ + new_points[i].x = x; + new_points[i].type = INRANGE; + STORE_WITH_LOG_AND_UPDATE_RANGE(new_points[i].y, y, new_points[i].type, + plot->y_axis, plot->noautoscale, NOOP, NOOP); + } + + /* Replace original data with the interpolated curve */ + free(p); + plot->points = new_points; + plot->p_count = samples_1; + plot->p_max = samples_1 + 1; + +#undef DX +#undef SLOPE +#undef C1 +#undef C2 +#undef C3 +} diff -Nru gnuplot-4.6.4/src/interpol.h gnuplot-4.6.5/src/interpol.h --- gnuplot-4.6.4/src/interpol.h 2004-04-13 17:23:58.000000000 +0000 +++ gnuplot-4.6.5/src/interpol.h 2014-01-31 17:23:26.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: interpol.h,v 1.7 2004/04/13 17:23:58 broeker Exp $ + * $Id: interpol.h,v 1.7.8.2 2014/01/31 05:22:06 sfeam Exp $ */ /* GNUPLOT - interpol.h */ @@ -48,6 +48,8 @@ /* Prototypes of functions exported by interpol.c */ void gen_interp __PROTO((struct curve_points *plot)); +void gen_interp_unwrap __PROTO((struct curve_points *plot)); +void mcs_interp __PROTO((struct curve_points *plot)); void gen_interp_frequency __PROTO((struct curve_points *plot)); void sort_points __PROTO((struct curve_points *plot)); void cp_implode __PROTO((struct curve_points *cp)); diff -Nru gnuplot-4.6.4/src/Makefile.am gnuplot-4.6.5/src/Makefile.am --- gnuplot-4.6.4/src/Makefile.am 2012-09-11 22:38:34.000000000 +0000 +++ gnuplot-4.6.5/src/Makefile.am 2013-12-23 05:48:15.000000000 +0000 @@ -1,5 +1,5 @@ ## Process this file with automake to produce Makefile.in -*-Makefile-*- -AUTOMAKE_OPTIONS = foreign +AUTOMAKE_OPTIONS = foreign subdir-objects # in the spirit of automake ... pkglibexecdir = $(libexecdir)/@PACKAGE@/@VERSION_MAJOR@ diff -Nru gnuplot-4.6.4/src/Makefile.in gnuplot-4.6.5/src/Makefile.in --- gnuplot-4.6.4/src/Makefile.in 2013-10-03 19:03:58.000000000 +0000 +++ gnuplot-4.6.5/src/Makefile.in 2014-02-23 18:21:12.000000000 +0000 @@ -104,13 +104,13 @@ version.c version.h wxterminal/wxt_gui.cpp \ wxterminal/gp_cairo.c wxterminal/gp_cairo_helpers.c bitmap.c \ qtterminal/qt_term.cpp qtterminal/qt_term_mac.m -@BUILD_WXWIDGETS_TRUE@am__objects_1 = wxt_gui.$(OBJEXT) -@BUILD_GPCAIRO_TRUE@am__objects_2 = gp_cairo.$(OBJEXT) \ -@BUILD_GPCAIRO_TRUE@ gp_cairo_helpers.$(OBJEXT) +am__dirstamp = $(am__leading_dot)dirstamp +@BUILD_WXWIDGETS_TRUE@am__objects_1 = wxterminal/wxt_gui.$(OBJEXT) +@BUILD_GPCAIRO_TRUE@am__objects_2 = wxterminal/gp_cairo.$(OBJEXT) \ +@BUILD_GPCAIRO_TRUE@ wxterminal/gp_cairo_helpers.$(OBJEXT) @BUILD_BITMAP_TRUE@am__objects_3 = bitmap.$(OBJEXT) -@BUILD_QT_TRUE@am__objects_4 = qt_term.$(OBJEXT) -@BUILD_ON_APPLE_TRUE@@BUILD_QT_TRUE@am__objects_5 = \ -@BUILD_ON_APPLE_TRUE@@BUILD_QT_TRUE@ qt_term_mac.$(OBJEXT) +@BUILD_QT_TRUE@am__objects_4 = qtterminal/qt_term.$(OBJEXT) +@BUILD_ON_APPLE_TRUE@@BUILD_QT_TRUE@am__objects_5 = qtterminal/qt_term_mac.$(OBJEXT) am_gnuplot_OBJECTS = alloc.$(OBJEXT) axis.$(OBJEXT) binary.$(OBJEXT) \ breaders.$(OBJEXT) color.$(OBJEXT) command.$(OBJEXT) \ contour.$(OBJEXT) datafile.$(OBJEXT) dynarray.$(OBJEXT) \ @@ -137,13 +137,14 @@ qtterminal/QtGnuplotApplication.cpp \ qtterminal/QtGnuplotWidget.cpp qtterminal/QtGnuplotScene.cpp \ qtterminal/QtGnuplotItems.cpp qtterminal/QtGnuplotEvent.cpp -@BUILD_QT_TRUE@am_gnuplot_qt_OBJECTS = gnuplot_qt.$(OBJEXT) \ -@BUILD_QT_TRUE@ QtGnuplotWindow.$(OBJEXT) \ -@BUILD_QT_TRUE@ QtGnuplotApplication.$(OBJEXT) \ -@BUILD_QT_TRUE@ QtGnuplotWidget.$(OBJEXT) \ -@BUILD_QT_TRUE@ QtGnuplotScene.$(OBJEXT) \ -@BUILD_QT_TRUE@ QtGnuplotItems.$(OBJEXT) \ -@BUILD_QT_TRUE@ QtGnuplotEvent.$(OBJEXT) +@BUILD_QT_TRUE@am_gnuplot_qt_OBJECTS = \ +@BUILD_QT_TRUE@ qtterminal/gnuplot_qt.$(OBJEXT) \ +@BUILD_QT_TRUE@ qtterminal/QtGnuplotWindow.$(OBJEXT) \ +@BUILD_QT_TRUE@ qtterminal/QtGnuplotApplication.$(OBJEXT) \ +@BUILD_QT_TRUE@ qtterminal/QtGnuplotWidget.$(OBJEXT) \ +@BUILD_QT_TRUE@ qtterminal/QtGnuplotScene.$(OBJEXT) \ +@BUILD_QT_TRUE@ qtterminal/QtGnuplotItems.$(OBJEXT) \ +@BUILD_QT_TRUE@ qtterminal/QtGnuplotEvent.$(OBJEXT) @BUILD_QT_TRUE@nodist_gnuplot_qt_OBJECTS = \ @BUILD_QT_TRUE@ moc_QtGnuplotWindow.$(OBJEXT) \ @BUILD_QT_TRUE@ moc_QtGnuplotApplication.$(OBJEXT) \ @@ -177,10 +178,6 @@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles am__mv = mv -f -AM_V_lt = $(am__v_lt_@AM_V@) -am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -am__v_lt_0 = --silent -am__v_lt_1 = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) @@ -476,7 +473,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -AUTOMAKE_OPTIONS = foreign +AUTOMAKE_OPTIONS = foreign subdir-objects # Where to send email about bugs and comments (locally) EMAIL = gnuplot-bugs@lists.sourceforge.net @@ -733,9 +730,45 @@ bf_test$(EXEEXT): $(bf_test_OBJECTS) $(bf_test_DEPENDENCIES) $(EXTRA_bf_test_DEPENDENCIES) @rm -f bf_test$(EXEEXT) $(AM_V_CCLD)$(LINK) $(bf_test_OBJECTS) $(bf_test_LDADD) $(LIBS) +wxterminal/$(am__dirstamp): + @$(MKDIR_P) wxterminal + @: > wxterminal/$(am__dirstamp) +wxterminal/$(DEPDIR)/$(am__dirstamp): + @$(MKDIR_P) wxterminal/$(DEPDIR) + @: > wxterminal/$(DEPDIR)/$(am__dirstamp) +wxterminal/wxt_gui.$(OBJEXT): wxterminal/$(am__dirstamp) \ + wxterminal/$(DEPDIR)/$(am__dirstamp) +wxterminal/gp_cairo.$(OBJEXT): wxterminal/$(am__dirstamp) \ + wxterminal/$(DEPDIR)/$(am__dirstamp) +wxterminal/gp_cairo_helpers.$(OBJEXT): wxterminal/$(am__dirstamp) \ + wxterminal/$(DEPDIR)/$(am__dirstamp) +qtterminal/$(am__dirstamp): + @$(MKDIR_P) qtterminal + @: > qtterminal/$(am__dirstamp) +qtterminal/$(DEPDIR)/$(am__dirstamp): + @$(MKDIR_P) qtterminal/$(DEPDIR) + @: > qtterminal/$(DEPDIR)/$(am__dirstamp) +qtterminal/qt_term.$(OBJEXT): qtterminal/$(am__dirstamp) \ + qtterminal/$(DEPDIR)/$(am__dirstamp) +qtterminal/qt_term_mac.$(OBJEXT): qtterminal/$(am__dirstamp) \ + qtterminal/$(DEPDIR)/$(am__dirstamp) gnuplot$(EXEEXT): $(gnuplot_OBJECTS) $(gnuplot_DEPENDENCIES) $(EXTRA_gnuplot_DEPENDENCIES) @rm -f gnuplot$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(gnuplot_OBJECTS) $(gnuplot_LDADD) $(LIBS) +qtterminal/gnuplot_qt.$(OBJEXT): qtterminal/$(am__dirstamp) \ + qtterminal/$(DEPDIR)/$(am__dirstamp) +qtterminal/QtGnuplotWindow.$(OBJEXT): qtterminal/$(am__dirstamp) \ + qtterminal/$(DEPDIR)/$(am__dirstamp) +qtterminal/QtGnuplotApplication.$(OBJEXT): qtterminal/$(am__dirstamp) \ + qtterminal/$(DEPDIR)/$(am__dirstamp) +qtterminal/QtGnuplotWidget.$(OBJEXT): qtterminal/$(am__dirstamp) \ + qtterminal/$(DEPDIR)/$(am__dirstamp) +qtterminal/QtGnuplotScene.$(OBJEXT): qtterminal/$(am__dirstamp) \ + qtterminal/$(DEPDIR)/$(am__dirstamp) +qtterminal/QtGnuplotItems.$(OBJEXT): qtterminal/$(am__dirstamp) \ + qtterminal/$(DEPDIR)/$(am__dirstamp) +qtterminal/QtGnuplotEvent.$(OBJEXT): qtterminal/$(am__dirstamp) \ + qtterminal/$(DEPDIR)/$(am__dirstamp) gnuplot_qt$(EXEEXT): $(gnuplot_qt_OBJECTS) $(gnuplot_qt_DEPENDENCIES) $(EXTRA_gnuplot_qt_DEPENDENCIES) @rm -f gnuplot_qt$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(gnuplot_qt_OBJECTS) $(gnuplot_qt_LDADD) $(LIBS) @@ -745,16 +778,12 @@ mostlyclean-compile: -rm -f *.$(OBJEXT) + -rm -f qtterminal/*.$(OBJEXT) + -rm -f wxterminal/*.$(OBJEXT) distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/QtGnuplotApplication.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/QtGnuplotEvent.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/QtGnuplotItems.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/QtGnuplotScene.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/QtGnuplotWidget.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/QtGnuplotWindow.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/alloc.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/axis.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bf_test.Po@am__quote@ @@ -771,9 +800,6 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fit.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gadgets.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getcolor.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnuplot_qt.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gp_cairo.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gp_cairo_helpers.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gpexecute.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gplt_x11.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/graph3d.Po@am__quote@ @@ -798,8 +824,6 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/plot3d.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pm3d.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/qrc_QtGnuplotResource.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/qt_term.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/qt_term_mac.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/readline.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/save.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scanner.Po@am__quote@ @@ -820,217 +844,66 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/variable.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/version.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vms.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wxt_gui.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@qtterminal/$(DEPDIR)/QtGnuplotApplication.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@qtterminal/$(DEPDIR)/QtGnuplotEvent.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@qtterminal/$(DEPDIR)/QtGnuplotItems.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@qtterminal/$(DEPDIR)/QtGnuplotScene.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@qtterminal/$(DEPDIR)/QtGnuplotWidget.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@qtterminal/$(DEPDIR)/QtGnuplotWindow.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@qtterminal/$(DEPDIR)/gnuplot_qt.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@qtterminal/$(DEPDIR)/qt_term.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@qtterminal/$(DEPDIR)/qt_term_mac.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@wxterminal/$(DEPDIR)/gp_cairo.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@wxterminal/$(DEPDIR)/gp_cairo_helpers.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@wxterminal/$(DEPDIR)/wxt_gui.Po@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` - -gp_cairo.o: wxterminal/gp_cairo.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gp_cairo.o -MD -MP -MF $(DEPDIR)/gp_cairo.Tpo -c -o gp_cairo.o `test -f 'wxterminal/gp_cairo.c' || echo '$(srcdir)/'`wxterminal/gp_cairo.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gp_cairo.Tpo $(DEPDIR)/gp_cairo.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='wxterminal/gp_cairo.c' object='gp_cairo.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gp_cairo.o `test -f 'wxterminal/gp_cairo.c' || echo '$(srcdir)/'`wxterminal/gp_cairo.c - -gp_cairo.obj: wxterminal/gp_cairo.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gp_cairo.obj -MD -MP -MF $(DEPDIR)/gp_cairo.Tpo -c -o gp_cairo.obj `if test -f 'wxterminal/gp_cairo.c'; then $(CYGPATH_W) 'wxterminal/gp_cairo.c'; else $(CYGPATH_W) '$(srcdir)/wxterminal/gp_cairo.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gp_cairo.Tpo $(DEPDIR)/gp_cairo.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='wxterminal/gp_cairo.c' object='gp_cairo.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gp_cairo.obj `if test -f 'wxterminal/gp_cairo.c'; then $(CYGPATH_W) 'wxterminal/gp_cairo.c'; else $(CYGPATH_W) '$(srcdir)/wxterminal/gp_cairo.c'; fi` - -gp_cairo_helpers.o: wxterminal/gp_cairo_helpers.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gp_cairo_helpers.o -MD -MP -MF $(DEPDIR)/gp_cairo_helpers.Tpo -c -o gp_cairo_helpers.o `test -f 'wxterminal/gp_cairo_helpers.c' || echo '$(srcdir)/'`wxterminal/gp_cairo_helpers.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gp_cairo_helpers.Tpo $(DEPDIR)/gp_cairo_helpers.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='wxterminal/gp_cairo_helpers.c' object='gp_cairo_helpers.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gp_cairo_helpers.o `test -f 'wxterminal/gp_cairo_helpers.c' || echo '$(srcdir)/'`wxterminal/gp_cairo_helpers.c - -gp_cairo_helpers.obj: wxterminal/gp_cairo_helpers.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gp_cairo_helpers.obj -MD -MP -MF $(DEPDIR)/gp_cairo_helpers.Tpo -c -o gp_cairo_helpers.obj `if test -f 'wxterminal/gp_cairo_helpers.c'; then $(CYGPATH_W) 'wxterminal/gp_cairo_helpers.c'; else $(CYGPATH_W) '$(srcdir)/wxterminal/gp_cairo_helpers.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gp_cairo_helpers.Tpo $(DEPDIR)/gp_cairo_helpers.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='wxterminal/gp_cairo_helpers.c' object='gp_cairo_helpers.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gp_cairo_helpers.obj `if test -f 'wxterminal/gp_cairo_helpers.c'; then $(CYGPATH_W) 'wxterminal/gp_cairo_helpers.c'; else $(CYGPATH_W) '$(srcdir)/wxterminal/gp_cairo_helpers.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .cpp.o: -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ +@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +@am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< .cpp.obj: -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ +@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ +@am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -wxt_gui.o: wxterminal/wxt_gui.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT wxt_gui.o -MD -MP -MF $(DEPDIR)/wxt_gui.Tpo -c -o wxt_gui.o `test -f 'wxterminal/wxt_gui.cpp' || echo '$(srcdir)/'`wxterminal/wxt_gui.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/wxt_gui.Tpo $(DEPDIR)/wxt_gui.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='wxterminal/wxt_gui.cpp' object='wxt_gui.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o wxt_gui.o `test -f 'wxterminal/wxt_gui.cpp' || echo '$(srcdir)/'`wxterminal/wxt_gui.cpp - -wxt_gui.obj: wxterminal/wxt_gui.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT wxt_gui.obj -MD -MP -MF $(DEPDIR)/wxt_gui.Tpo -c -o wxt_gui.obj `if test -f 'wxterminal/wxt_gui.cpp'; then $(CYGPATH_W) 'wxterminal/wxt_gui.cpp'; else $(CYGPATH_W) '$(srcdir)/wxterminal/wxt_gui.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/wxt_gui.Tpo $(DEPDIR)/wxt_gui.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='wxterminal/wxt_gui.cpp' object='wxt_gui.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o wxt_gui.obj `if test -f 'wxterminal/wxt_gui.cpp'; then $(CYGPATH_W) 'wxterminal/wxt_gui.cpp'; else $(CYGPATH_W) '$(srcdir)/wxterminal/wxt_gui.cpp'; fi` - -qt_term.o: qtterminal/qt_term.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT qt_term.o -MD -MP -MF $(DEPDIR)/qt_term.Tpo -c -o qt_term.o `test -f 'qtterminal/qt_term.cpp' || echo '$(srcdir)/'`qtterminal/qt_term.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/qt_term.Tpo $(DEPDIR)/qt_term.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='qtterminal/qt_term.cpp' object='qt_term.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o qt_term.o `test -f 'qtterminal/qt_term.cpp' || echo '$(srcdir)/'`qtterminal/qt_term.cpp - -qt_term.obj: qtterminal/qt_term.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT qt_term.obj -MD -MP -MF $(DEPDIR)/qt_term.Tpo -c -o qt_term.obj `if test -f 'qtterminal/qt_term.cpp'; then $(CYGPATH_W) 'qtterminal/qt_term.cpp'; else $(CYGPATH_W) '$(srcdir)/qtterminal/qt_term.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/qt_term.Tpo $(DEPDIR)/qt_term.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='qtterminal/qt_term.cpp' object='qt_term.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o qt_term.obj `if test -f 'qtterminal/qt_term.cpp'; then $(CYGPATH_W) 'qtterminal/qt_term.cpp'; else $(CYGPATH_W) '$(srcdir)/qtterminal/qt_term.cpp'; fi` - -gnuplot_qt.o: qtterminal/gnuplot_qt.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gnuplot_qt.o -MD -MP -MF $(DEPDIR)/gnuplot_qt.Tpo -c -o gnuplot_qt.o `test -f 'qtterminal/gnuplot_qt.cpp' || echo '$(srcdir)/'`qtterminal/gnuplot_qt.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnuplot_qt.Tpo $(DEPDIR)/gnuplot_qt.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='qtterminal/gnuplot_qt.cpp' object='gnuplot_qt.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gnuplot_qt.o `test -f 'qtterminal/gnuplot_qt.cpp' || echo '$(srcdir)/'`qtterminal/gnuplot_qt.cpp - -gnuplot_qt.obj: qtterminal/gnuplot_qt.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gnuplot_qt.obj -MD -MP -MF $(DEPDIR)/gnuplot_qt.Tpo -c -o gnuplot_qt.obj `if test -f 'qtterminal/gnuplot_qt.cpp'; then $(CYGPATH_W) 'qtterminal/gnuplot_qt.cpp'; else $(CYGPATH_W) '$(srcdir)/qtterminal/gnuplot_qt.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnuplot_qt.Tpo $(DEPDIR)/gnuplot_qt.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='qtterminal/gnuplot_qt.cpp' object='gnuplot_qt.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gnuplot_qt.obj `if test -f 'qtterminal/gnuplot_qt.cpp'; then $(CYGPATH_W) 'qtterminal/gnuplot_qt.cpp'; else $(CYGPATH_W) '$(srcdir)/qtterminal/gnuplot_qt.cpp'; fi` - -QtGnuplotWindow.o: qtterminal/QtGnuplotWindow.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT QtGnuplotWindow.o -MD -MP -MF $(DEPDIR)/QtGnuplotWindow.Tpo -c -o QtGnuplotWindow.o `test -f 'qtterminal/QtGnuplotWindow.cpp' || echo '$(srcdir)/'`qtterminal/QtGnuplotWindow.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/QtGnuplotWindow.Tpo $(DEPDIR)/QtGnuplotWindow.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='qtterminal/QtGnuplotWindow.cpp' object='QtGnuplotWindow.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o QtGnuplotWindow.o `test -f 'qtterminal/QtGnuplotWindow.cpp' || echo '$(srcdir)/'`qtterminal/QtGnuplotWindow.cpp - -QtGnuplotWindow.obj: qtterminal/QtGnuplotWindow.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT QtGnuplotWindow.obj -MD -MP -MF $(DEPDIR)/QtGnuplotWindow.Tpo -c -o QtGnuplotWindow.obj `if test -f 'qtterminal/QtGnuplotWindow.cpp'; then $(CYGPATH_W) 'qtterminal/QtGnuplotWindow.cpp'; else $(CYGPATH_W) '$(srcdir)/qtterminal/QtGnuplotWindow.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/QtGnuplotWindow.Tpo $(DEPDIR)/QtGnuplotWindow.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='qtterminal/QtGnuplotWindow.cpp' object='QtGnuplotWindow.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o QtGnuplotWindow.obj `if test -f 'qtterminal/QtGnuplotWindow.cpp'; then $(CYGPATH_W) 'qtterminal/QtGnuplotWindow.cpp'; else $(CYGPATH_W) '$(srcdir)/qtterminal/QtGnuplotWindow.cpp'; fi` - -QtGnuplotApplication.o: qtterminal/QtGnuplotApplication.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT QtGnuplotApplication.o -MD -MP -MF $(DEPDIR)/QtGnuplotApplication.Tpo -c -o QtGnuplotApplication.o `test -f 'qtterminal/QtGnuplotApplication.cpp' || echo '$(srcdir)/'`qtterminal/QtGnuplotApplication.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/QtGnuplotApplication.Tpo $(DEPDIR)/QtGnuplotApplication.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='qtterminal/QtGnuplotApplication.cpp' object='QtGnuplotApplication.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o QtGnuplotApplication.o `test -f 'qtterminal/QtGnuplotApplication.cpp' || echo '$(srcdir)/'`qtterminal/QtGnuplotApplication.cpp - -QtGnuplotApplication.obj: qtterminal/QtGnuplotApplication.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT QtGnuplotApplication.obj -MD -MP -MF $(DEPDIR)/QtGnuplotApplication.Tpo -c -o QtGnuplotApplication.obj `if test -f 'qtterminal/QtGnuplotApplication.cpp'; then $(CYGPATH_W) 'qtterminal/QtGnuplotApplication.cpp'; else $(CYGPATH_W) '$(srcdir)/qtterminal/QtGnuplotApplication.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/QtGnuplotApplication.Tpo $(DEPDIR)/QtGnuplotApplication.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='qtterminal/QtGnuplotApplication.cpp' object='QtGnuplotApplication.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o QtGnuplotApplication.obj `if test -f 'qtterminal/QtGnuplotApplication.cpp'; then $(CYGPATH_W) 'qtterminal/QtGnuplotApplication.cpp'; else $(CYGPATH_W) '$(srcdir)/qtterminal/QtGnuplotApplication.cpp'; fi` - -QtGnuplotWidget.o: qtterminal/QtGnuplotWidget.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT QtGnuplotWidget.o -MD -MP -MF $(DEPDIR)/QtGnuplotWidget.Tpo -c -o QtGnuplotWidget.o `test -f 'qtterminal/QtGnuplotWidget.cpp' || echo '$(srcdir)/'`qtterminal/QtGnuplotWidget.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/QtGnuplotWidget.Tpo $(DEPDIR)/QtGnuplotWidget.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='qtterminal/QtGnuplotWidget.cpp' object='QtGnuplotWidget.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o QtGnuplotWidget.o `test -f 'qtterminal/QtGnuplotWidget.cpp' || echo '$(srcdir)/'`qtterminal/QtGnuplotWidget.cpp - -QtGnuplotWidget.obj: qtterminal/QtGnuplotWidget.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT QtGnuplotWidget.obj -MD -MP -MF $(DEPDIR)/QtGnuplotWidget.Tpo -c -o QtGnuplotWidget.obj `if test -f 'qtterminal/QtGnuplotWidget.cpp'; then $(CYGPATH_W) 'qtterminal/QtGnuplotWidget.cpp'; else $(CYGPATH_W) '$(srcdir)/qtterminal/QtGnuplotWidget.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/QtGnuplotWidget.Tpo $(DEPDIR)/QtGnuplotWidget.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='qtterminal/QtGnuplotWidget.cpp' object='QtGnuplotWidget.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o QtGnuplotWidget.obj `if test -f 'qtterminal/QtGnuplotWidget.cpp'; then $(CYGPATH_W) 'qtterminal/QtGnuplotWidget.cpp'; else $(CYGPATH_W) '$(srcdir)/qtterminal/QtGnuplotWidget.cpp'; fi` - -QtGnuplotScene.o: qtterminal/QtGnuplotScene.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT QtGnuplotScene.o -MD -MP -MF $(DEPDIR)/QtGnuplotScene.Tpo -c -o QtGnuplotScene.o `test -f 'qtterminal/QtGnuplotScene.cpp' || echo '$(srcdir)/'`qtterminal/QtGnuplotScene.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/QtGnuplotScene.Tpo $(DEPDIR)/QtGnuplotScene.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='qtterminal/QtGnuplotScene.cpp' object='QtGnuplotScene.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o QtGnuplotScene.o `test -f 'qtterminal/QtGnuplotScene.cpp' || echo '$(srcdir)/'`qtterminal/QtGnuplotScene.cpp - -QtGnuplotScene.obj: qtterminal/QtGnuplotScene.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT QtGnuplotScene.obj -MD -MP -MF $(DEPDIR)/QtGnuplotScene.Tpo -c -o QtGnuplotScene.obj `if test -f 'qtterminal/QtGnuplotScene.cpp'; then $(CYGPATH_W) 'qtterminal/QtGnuplotScene.cpp'; else $(CYGPATH_W) '$(srcdir)/qtterminal/QtGnuplotScene.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/QtGnuplotScene.Tpo $(DEPDIR)/QtGnuplotScene.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='qtterminal/QtGnuplotScene.cpp' object='QtGnuplotScene.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o QtGnuplotScene.obj `if test -f 'qtterminal/QtGnuplotScene.cpp'; then $(CYGPATH_W) 'qtterminal/QtGnuplotScene.cpp'; else $(CYGPATH_W) '$(srcdir)/qtterminal/QtGnuplotScene.cpp'; fi` - -QtGnuplotItems.o: qtterminal/QtGnuplotItems.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT QtGnuplotItems.o -MD -MP -MF $(DEPDIR)/QtGnuplotItems.Tpo -c -o QtGnuplotItems.o `test -f 'qtterminal/QtGnuplotItems.cpp' || echo '$(srcdir)/'`qtterminal/QtGnuplotItems.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/QtGnuplotItems.Tpo $(DEPDIR)/QtGnuplotItems.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='qtterminal/QtGnuplotItems.cpp' object='QtGnuplotItems.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o QtGnuplotItems.o `test -f 'qtterminal/QtGnuplotItems.cpp' || echo '$(srcdir)/'`qtterminal/QtGnuplotItems.cpp - -QtGnuplotItems.obj: qtterminal/QtGnuplotItems.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT QtGnuplotItems.obj -MD -MP -MF $(DEPDIR)/QtGnuplotItems.Tpo -c -o QtGnuplotItems.obj `if test -f 'qtterminal/QtGnuplotItems.cpp'; then $(CYGPATH_W) 'qtterminal/QtGnuplotItems.cpp'; else $(CYGPATH_W) '$(srcdir)/qtterminal/QtGnuplotItems.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/QtGnuplotItems.Tpo $(DEPDIR)/QtGnuplotItems.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='qtterminal/QtGnuplotItems.cpp' object='QtGnuplotItems.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o QtGnuplotItems.obj `if test -f 'qtterminal/QtGnuplotItems.cpp'; then $(CYGPATH_W) 'qtterminal/QtGnuplotItems.cpp'; else $(CYGPATH_W) '$(srcdir)/qtterminal/QtGnuplotItems.cpp'; fi` - -QtGnuplotEvent.o: qtterminal/QtGnuplotEvent.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT QtGnuplotEvent.o -MD -MP -MF $(DEPDIR)/QtGnuplotEvent.Tpo -c -o QtGnuplotEvent.o `test -f 'qtterminal/QtGnuplotEvent.cpp' || echo '$(srcdir)/'`qtterminal/QtGnuplotEvent.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/QtGnuplotEvent.Tpo $(DEPDIR)/QtGnuplotEvent.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='qtterminal/QtGnuplotEvent.cpp' object='QtGnuplotEvent.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o QtGnuplotEvent.o `test -f 'qtterminal/QtGnuplotEvent.cpp' || echo '$(srcdir)/'`qtterminal/QtGnuplotEvent.cpp - -QtGnuplotEvent.obj: qtterminal/QtGnuplotEvent.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT QtGnuplotEvent.obj -MD -MP -MF $(DEPDIR)/QtGnuplotEvent.Tpo -c -o QtGnuplotEvent.obj `if test -f 'qtterminal/QtGnuplotEvent.cpp'; then $(CYGPATH_W) 'qtterminal/QtGnuplotEvent.cpp'; else $(CYGPATH_W) '$(srcdir)/qtterminal/QtGnuplotEvent.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/QtGnuplotEvent.Tpo $(DEPDIR)/QtGnuplotEvent.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='qtterminal/QtGnuplotEvent.cpp' object='QtGnuplotEvent.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o QtGnuplotEvent.obj `if test -f 'qtterminal/QtGnuplotEvent.cpp'; then $(CYGPATH_W) 'qtterminal/QtGnuplotEvent.cpp'; else $(CYGPATH_W) '$(srcdir)/qtterminal/QtGnuplotEvent.cpp'; fi` - .m.o: -@am__fastdepOBJC_TRUE@ $(AM_V_OBJC)$(OBJCCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepOBJC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepOBJC_TRUE@ $(AM_V_OBJC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ +@am__fastdepOBJC_TRUE@ $(OBJCCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +@am__fastdepOBJC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po @AMDEP_TRUE@@am__fastdepOBJC_FALSE@ $(AM_V_OBJC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepOBJC_FALSE@ DEPDIR=$(DEPDIR) $(OBJCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepOBJC_FALSE@ $(AM_V_OBJC@am__nodep@)$(OBJCCOMPILE) -c -o $@ $< .m.obj: -@am__fastdepOBJC_TRUE@ $(AM_V_OBJC)$(OBJCCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepOBJC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepOBJC_TRUE@ $(AM_V_OBJC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ +@am__fastdepOBJC_TRUE@ $(OBJCCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ +@am__fastdepOBJC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po @AMDEP_TRUE@@am__fastdepOBJC_FALSE@ $(AM_V_OBJC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepOBJC_FALSE@ DEPDIR=$(DEPDIR) $(OBJCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepOBJC_FALSE@ $(AM_V_OBJC@am__nodep@)$(OBJCCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - -qt_term_mac.o: qtterminal/qt_term_mac.m -@am__fastdepOBJC_TRUE@ $(AM_V_OBJC)$(OBJC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_OBJCFLAGS) $(OBJCFLAGS) -MT qt_term_mac.o -MD -MP -MF $(DEPDIR)/qt_term_mac.Tpo -c -o qt_term_mac.o `test -f 'qtterminal/qt_term_mac.m' || echo '$(srcdir)/'`qtterminal/qt_term_mac.m -@am__fastdepOBJC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/qt_term_mac.Tpo $(DEPDIR)/qt_term_mac.Po -@AMDEP_TRUE@@am__fastdepOBJC_FALSE@ $(AM_V_OBJC)source='qtterminal/qt_term_mac.m' object='qt_term_mac.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepOBJC_FALSE@ DEPDIR=$(DEPDIR) $(OBJCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepOBJC_FALSE@ $(AM_V_OBJC@am__nodep@)$(OBJC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_OBJCFLAGS) $(OBJCFLAGS) -c -o qt_term_mac.o `test -f 'qtterminal/qt_term_mac.m' || echo '$(srcdir)/'`qtterminal/qt_term_mac.m - -qt_term_mac.obj: qtterminal/qt_term_mac.m -@am__fastdepOBJC_TRUE@ $(AM_V_OBJC)$(OBJC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_OBJCFLAGS) $(OBJCFLAGS) -MT qt_term_mac.obj -MD -MP -MF $(DEPDIR)/qt_term_mac.Tpo -c -o qt_term_mac.obj `if test -f 'qtterminal/qt_term_mac.m'; then $(CYGPATH_W) 'qtterminal/qt_term_mac.m'; else $(CYGPATH_W) '$(srcdir)/qtterminal/qt_term_mac.m'; fi` -@am__fastdepOBJC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/qt_term_mac.Tpo $(DEPDIR)/qt_term_mac.Po -@AMDEP_TRUE@@am__fastdepOBJC_FALSE@ $(AM_V_OBJC)source='qtterminal/qt_term_mac.m' object='qt_term_mac.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepOBJC_FALSE@ DEPDIR=$(DEPDIR) $(OBJCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepOBJC_FALSE@ $(AM_V_OBJC@am__nodep@)$(OBJC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_OBJCFLAGS) $(OBJCFLAGS) -c -o qt_term_mac.obj `if test -f 'qtterminal/qt_term_mac.m'; then $(CYGPATH_W) 'qtterminal/qt_term_mac.m'; else $(CYGPATH_W) '$(srcdir)/qtterminal/qt_term_mac.m'; fi` install-qtgnuplotDATA: $(qtgnuplot_DATA) @$(NORMAL_INSTALL) @list='$(qtgnuplot_DATA)'; test -n "$(qtgnuplotdir)" || list=; \ @@ -1242,6 +1115,10 @@ distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + -rm -f qtterminal/$(DEPDIR)/$(am__dirstamp) + -rm -f qtterminal/$(am__dirstamp) + -rm -f wxterminal/$(DEPDIR)/$(am__dirstamp) + -rm -f wxterminal/$(am__dirstamp) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -1253,7 +1130,7 @@ clean-noinstPROGRAMS clean-pkglibexecPROGRAMS mostlyclean-am distclean: distclean-recursive - -rm -rf ./$(DEPDIR) + -rm -rf ./$(DEPDIR) qtterminal/$(DEPDIR) wxterminal/$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -1299,7 +1176,7 @@ installcheck-am: maintainer-clean: maintainer-clean-recursive - -rm -rf ./$(DEPDIR) + -rm -rf ./$(DEPDIR) qtterminal/$(DEPDIR) wxterminal/$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic diff -Nru gnuplot-4.6.4/src/misc.c gnuplot-4.6.5/src/misc.c --- gnuplot-4.6.4/src/misc.c 2013-07-22 22:19:11.000000000 +0000 +++ gnuplot-4.6.5/src/misc.c 2013-10-28 15:38:05.000000000 +0000 @@ -1,5 +1,5 @@ #ifndef lint -static char *RCSid() { return RCSid("$Id: misc.c,v 1.138.2.15 2013/07/22 22:19:11 sfeam Exp $"); } +static char *RCSid() { return RCSid("$Id: misc.c,v 1.138.2.16 2013/10/27 22:13:43 sfeam Exp $"); } #endif /* GNUPLOT - misc.c */ @@ -969,7 +969,8 @@ if (set_pal) { lp->pm3d_color = newlp.pm3d_color; lp->use_palette = newlp.use_palette; - new_lt = LT_SINGLECOLOR; + /* FIXME: This was used by hidden3d, but breaks contour coloring */ + /* new_lt = LT_SINGLECOLOR; */ } if (set_lw) lp->l_width = newlp.l_width; diff -Nru gnuplot-4.6.4/src/mouse.c gnuplot-4.6.5/src/mouse.c --- gnuplot-4.6.4/src/mouse.c 2012-10-30 00:47:10.000000000 +0000 +++ gnuplot-4.6.5/src/mouse.c 2013-11-11 05:26:40.000000000 +0000 @@ -1,5 +1,5 @@ #ifndef lint -static char *RCSid() { return RCSid("$Id: mouse.c,v 1.133.2.3 2012/10/27 02:24:37 sfeam Exp $"); } +static char *RCSid() { return RCSid("$Id: mouse.c,v 1.133.2.5 2013/11/10 18:44:22 sfeam Exp $"); } #endif /* GNUPLOT - mouse.c */ @@ -1831,9 +1831,11 @@ /* In 2D mouse button 1 is available for "bind" commands */ if (!is_3d_plot && (b == 1)) { + int save = ge->par1; ge->par1 = GP_Button1; ge->par2 = 0; event_keypress(ge, TRUE); + ge->par1 = save; /* needed for "pause mouse" */ } #ifdef _Windows @@ -1986,7 +1988,7 @@ modifier_mask = 0; button = 0; builtin_cancel_zoom(ge); - if (term && term->set_cursor) { + if (term && term_initialised && term->set_cursor) { term->set_cursor(0, 0, 0); if (mouse_setting.annotate_zoom_box && term->put_tmptext) { term->put_tmptext(1, ""); diff -Nru gnuplot-4.6.4/src/parse.c gnuplot-4.6.5/src/parse.c --- gnuplot-4.6.4/src/parse.c 2012-10-31 20:14:44.000000000 +0000 +++ gnuplot-4.6.5/src/parse.c 2013-12-23 05:48:15.000000000 +0000 @@ -1,5 +1,5 @@ #ifndef lint -static char *RCSid() { return RCSid("$Id: parse.c,v 1.66.2.3 2012/10/31 20:14:44 sfeam Exp $"); } +static char *RCSid() { return RCSid("$Id: parse.c,v 1.66.2.4 2013/12/22 18:50:13 sfeam Exp $"); } #endif /* GNUPLOT - parse.c */ @@ -1145,9 +1145,9 @@ this_iter->iteration_current = this_iter->iteration_start; this_iter->done = FALSE; if (this_iter->iteration_string) { - free(this_iter->iteration_udv->udv_value.v.string_val); - this_iter->iteration_udv->udv_value.v.string_val - = gp_word(this_iter->iteration_string, this_iter->iteration_current); + gpfree_string(&(this_iter->iteration_udv->udv_value)); + Gstring(&(this_iter->iteration_udv->udv_value), + gp_word(this_iter->iteration_string, this_iter->iteration_current)); } else this_iter->iteration_udv->udv_value.v.int_val = this_iter->iteration_current; @@ -1163,9 +1163,9 @@ if (!iter->really_done) this_iter->iteration_current += this_iter->iteration_increment; if (this_iter->iteration_string) { - free(this_iter->iteration_udv->udv_value.v.string_val); - this_iter->iteration_udv->udv_value.v.string_val - = gp_word(this_iter->iteration_string, this_iter->iteration_current); + gpfree_string(&(this_iter->iteration_udv->udv_value)); + Gstring(&(this_iter->iteration_udv->udv_value), + gp_word(this_iter->iteration_string, this_iter->iteration_current)); } else this_iter->iteration_udv->udv_value.v.int_val = this_iter->iteration_current; diff -Nru gnuplot-4.6.4/src/plot2d.c gnuplot-4.6.5/src/plot2d.c --- gnuplot-4.6.4/src/plot2d.c 2013-10-03 03:50:19.000000000 +0000 +++ gnuplot-4.6.5/src/plot2d.c 2014-01-31 17:23:26.000000000 +0000 @@ -1,5 +1,5 @@ #ifndef lint -static char *RCSid() { return RCSid("$Id: plot2d.c,v 1.255.2.22 2013/10/03 03:11:20 sfeam Exp $"); } +static char *RCSid() { return RCSid("$Id: plot2d.c,v 1.255.2.29 2014/01/31 05:22:06 sfeam Exp $"); } #endif /* GNUPLOT - plot2d.c */ @@ -545,10 +545,19 @@ break; } - if (current_plot->plot_smooth == SMOOTH_ACSPLINES) { + /* Restictions on plots with "smooth" option */ + switch (current_plot->plot_smooth) { + case SMOOTH_NONE: + break; + case SMOOTH_ACSPLINES: max_cols = 3; current_plot->z_axis = FIRST_Z_AXIS; df_axis[2] = FIRST_Z_AXIS; + break; + default: + if (df_no_use_specs > 2) + int_warn(NO_CARET, "extra columns ignored by smoothing option"); + break; } /* EXPERIMENTAL May 2013 - Treating timedata columns as strings allows */ @@ -1137,8 +1146,11 @@ if (y < R_AXIS.data_min) R_AXIS.data_min = y; if (y < R_AXIS.min) { + /* Jan 2014 - The documentation says autoscaled R_AXIS.min is always 0 */ if (R_AXIS.autoscale & AUTOSCALE_MIN) - R_AXIS.min = (y>0) ? 0 : y; + R_AXIS.min = 0; + else + cp->type = OUTRANGE; } if (y > R_AXIS.data_max) R_AXIS.data_max = y; @@ -1624,14 +1636,17 @@ /* If the plot is in polar coordinates and the r axis range is autoscaled, * we need to apply the maximum radius found to both x and y. - * Otherwise the autoscaling with be done separately for x and y and the + * Otherwise the autoscaling will be done separately for x and y and the * resulting plot will not be centered at the origin. */ void polar_range_fiddling(struct curve_points *plot) { if (axis_array[POLAR_AXIS].set_autoscale & AUTOSCALE_MAX) { - double plotmax = GPMAX(axis_array[plot->x_axis].max, -axis_array[plot->x_axis].min); + double plotmax_x, plotmax_y, plotmax; + plotmax_x = GPMAX(axis_array[plot->x_axis].max, -axis_array[plot->x_axis].min); + plotmax_y = GPMAX(axis_array[plot->y_axis].max, -axis_array[plot->y_axis].min); + plotmax = GPMAX(plotmax_x, plotmax_y); if ((axis_array[plot->x_axis].set_autoscale & AUTOSCALE_BOTH) == AUTOSCALE_BOTH) { axis_array[plot->x_axis].max = plotmax; axis_array[plot->x_axis].min = -plotmax; @@ -1975,15 +1990,17 @@ case SMOOTH_CSPLINES: case SMOOTH_SBEZIER: case SMOOTH_UNIQUE: + case SMOOTH_UNWRAP: case SMOOTH_FREQUENCY: case SMOOTH_CUMULATIVE: case SMOOTH_KDENSITY: case SMOOTH_CUMULATIVE_NORMALISED: + case SMOOTH_MONOTONE_CSPLINE: this_plot->plot_smooth = found_token; break; case SMOOTH_NONE: default: - int_error(c_token, "expecting 'unique', 'frequency', 'cumulative', 'cnormal', 'kdensity', 'acsplines', 'csplines', 'bezier' or 'sbezier'"); + int_error(c_token, "unrecognized 'smooth' option"); break; } this_plot->plot_style = LINES; @@ -2079,6 +2096,16 @@ continue; } + if (almost_equals(c_token, "enh$anced")) { + c_token++; + this_plot->title_no_enhanced = FALSE; + continue; + } else if (almost_equals(c_token, "noenh$anced")) { + c_token++; + this_plot->title_no_enhanced = TRUE; + continue; + } + /* deal with style */ if (almost_equals(c_token, "w$ith")) { if (set_with) { @@ -2546,6 +2573,7 @@ case SMOOTH_CSPLINES: case SMOOTH_ACSPLINES: case SMOOTH_SBEZIER: + case SMOOTH_MONOTONE_CSPLINE: sort_points(this_plot); cp_implode(this_plot); case SMOOTH_NONE: @@ -2557,6 +2585,9 @@ switch (this_plot->plot_smooth) { /* create new data set by evaluation of * interpolation routines */ + case SMOOTH_UNWRAP: + gen_interp_unwrap(this_plot); + break; case SMOOTH_FREQUENCY: case SMOOTH_CUMULATIVE: case SMOOTH_CUMULATIVE_NORMALISED: @@ -2568,6 +2599,10 @@ case SMOOTH_SBEZIER: case SMOOTH_KDENSITY: gen_interp(this_plot); + break; + case SMOOTH_MONOTONE_CSPLINE: + mcs_interp(this_plot); + break; case SMOOTH_NONE: case SMOOTH_UNIQUE: default: @@ -2900,8 +2935,17 @@ this_plot = this_plot->next; } + /* Jan 2014: Earlier 2.6 versions missed this case, */ + /* breaking iteration over parametric plots */ + if (in_parametric) { + if (equals(c_token, ",")) { + c_token++; + continue; + } + } + /* Iterate-over-plot mechanism */ - if (!in_parametric && next_iteration(plot_iterator)) { + if (next_iteration(plot_iterator)) { c_token = start_token; continue; } @@ -2909,8 +2953,7 @@ plot_iterator = cleanup_iteration(plot_iterator); if (equals(c_token, ",")) { c_token++; - if (!in_parametric) - plot_iterator = check_for_iteration(); + plot_iterator = check_for_iteration(); } else break; } @@ -2926,6 +2969,12 @@ axis_checked_extend_empty_range(SECOND_X_AXIS, NULL); } } + + /* This is the earliest that polar autoscaling can be done for function plots */ + if (polar) { + polar_range_fiddling(first_plot); + } + } /* some_functions */ /* if first_plot is NULL, we have no functions or data at all. This can @@ -3097,6 +3146,8 @@ yp->points[i].type = OUTRANGE; if (!(R_AXIS.autoscale & AUTOSCALE_MIN)) { /* store internally as if plotting r(t)-rmin */ + if (r < R_AXIS.min) + yp->points[i].type = OUTRANGE; r -= R_AXIS.min; } x = r * cos(t); diff -Nru gnuplot-4.6.4/src/plot3d.c gnuplot-4.6.5/src/plot3d.c --- gnuplot-4.6.4/src/plot3d.c 2013-03-14 19:40:33.000000000 +0000 +++ gnuplot-4.6.5/src/plot3d.c 2013-11-14 23:12:57.000000000 +0000 @@ -1,5 +1,5 @@ #ifndef lint -static char *RCSid() { return RCSid("$Id: plot3d.c,v 1.191.2.6 2013/03/14 19:40:33 sfeam Exp $"); } +static char *RCSid() { return RCSid("$Id: plot3d.c,v 1.191.2.8 2013/11/14 23:12:57 sfeam Exp $"); } #endif /* GNUPLOT - plot3d.c */ @@ -1530,6 +1530,16 @@ continue; } + if (almost_equals(c_token, "enh$anced")) { + c_token++; + this_plot->title_no_enhanced = FALSE; + continue; + } else if (almost_equals(c_token, "noenh$anced")) { + c_token++; + this_plot->title_no_enhanced = TRUE; + continue; + } + /* deal with style */ if (almost_equals(c_token, "w$ith")) { if (set_with) { @@ -1659,6 +1669,8 @@ set_lpstyle = TRUE; if (new_lt) this_plot->hidden3d_top_linetype = new_lt - 1; + else + this_plot->hidden3d_top_linetype = line_num; continue; } } diff -Nru gnuplot-4.6.4/src/plot.c gnuplot-4.6.5/src/plot.c --- gnuplot-4.6.4/src/plot.c 2013-07-03 16:31:53.000000000 +0000 +++ gnuplot-4.6.5/src/plot.c 2013-10-23 18:31:53.000000000 +0000 @@ -1,5 +1,5 @@ #ifndef lint -static char *RCSid() { return RCSid("$Id: plot.c,v 1.128.2.17 2013/07/03 16:31:53 sfeam Exp $"); } +static char *RCSid() { return RCSid("$Id: plot.c,v 1.128.2.18 2013/10/23 18:31:53 sfeam Exp $"); } #endif /* GNUPLOT - plot.c */ @@ -136,6 +136,7 @@ TBOOLEAN interactive = TRUE; /* FALSE if stdin not a terminal */ TBOOLEAN noinputfiles = TRUE; /* FALSE if there are script files */ +TBOOLEAN reading_from_dash=FALSE; /* True if processing "-" as an input file */ TBOOLEAN skip_gnuplotrc = FALSE;/* skip system gnuplotrc and ~/.gnuplot */ TBOOLEAN persist_cl = FALSE; /* TRUE if -persist is parsed in the command line */ @@ -624,6 +625,19 @@ gpoutfile = stdout; } #endif /* VMS */ + + /* Why a goto? Because we exited the loop below via int_error */ + /* using LONGJMP. The compiler was not expecting this, and */ + /* "optimized" the handling of argc and argv such that simply */ + /* entering the loop again from the top finds them messed up. */ + /* If we reenter the loop via a goto then there is some hope */ + /* that code reordering does not hurt us. */ + /* NB: the test for interactive means that execution from a */ + /* pipe will not continue after an error. Do we want this? */ + if (reading_from_dash && interactive) + goto RECOVER_FROM_ERROR_IN_DASH; + reading_from_dash = FALSE; + if (!interactive && !noinputfiles) { term_reset(); exit(EXIT_FAILURE); /* exit on non-interactive error */ @@ -643,9 +657,15 @@ } else if (strcmp(*argv, "-") == 0) { #if defined(_Windows) && !defined(WGP_CONSOLE) TextShow(&textwin); -#endif interactive = TRUE; +#else + interactive = isatty(fileno(stdin)); +#endif + +RECOVER_FROM_ERROR_IN_DASH: + reading_from_dash = TRUE; while (!com_line()); + reading_from_dash = FALSE; interactive = FALSE; } else if (strcmp(*argv, "-e") == 0) { diff -Nru gnuplot-4.6.4/src/pm3d.c gnuplot-4.6.5/src/pm3d.c --- gnuplot-4.6.4/src/pm3d.c 2013-09-10 20:39:37.000000000 +0000 +++ gnuplot-4.6.5/src/pm3d.c 2013-10-14 23:54:28.000000000 +0000 @@ -1,5 +1,5 @@ #ifndef lint -static char *RCSid() { return RCSid("$Id: pm3d.c,v 1.85.2.3 2013/09/10 20:39:37 sfeam Exp $"); } +static char *RCSid() { return RCSid("$Id: pm3d.c,v 1.85.2.4 2013/10/14 23:54:28 sfeam Exp $"); } #endif /* GNUPLOT - pm3d.c */ @@ -899,19 +899,23 @@ else /* transform z value to gray, i.e. to interval [0,1] */ gray = cb2gray(avgC); - if (pm3d.direction != PM3D_DEPTH) { - if (color_from_rgbvar) - set_rgbcolor(gray); - else - set_color(gray); - filled_quadrangle(corners); - } else { + if (pm3d.direction == PM3D_DEPTH) { /* copy quadrangle */ quadrangle* qp = quadrangles + current_quadrangle; memcpy(qp->corners, corners, 4 * sizeof (gpdPoint)); qp->gray = gray; qp->border_color = &this_plot->lp_properties.pm3d_color; current_quadrangle++; + } else { + if (color_from_rgbvar) + set_rgbcolor(gray); + else + set_color(gray); + if (at_which_z == PM3D_AT_BASE) + corners[0].z = corners[1].z = corners[2].z = corners[3].z = base_z; + else if (at_which_z == PM3D_AT_TOP) + corners[0].z = corners[1].z = corners[2].z = corners[3].z = ceiling_z; + filled_quadrangle(corners); } } } diff -Nru gnuplot-4.6.4/src/qtterminal/QtGnuplotScene.cpp gnuplot-4.6.5/src/qtterminal/QtGnuplotScene.cpp --- gnuplot-4.6.4/src/qtterminal/QtGnuplotScene.cpp 2013-09-23 15:52:55.000000000 +0000 +++ gnuplot-4.6.5/src/qtterminal/QtGnuplotScene.cpp 2014-01-31 17:23:26.000000000 +0000 @@ -611,14 +611,17 @@ // EAM FIXME - If the press/release events get out of order or if we see // a very fast double-click then the following call causes the program - // to error out during event processing. Also note that I can't find - // where the timers are initialized on entry - maybe a problem there? - // Finally, why do we need or want a timer at all? - int time = m_watches[button].elapsed(); - if (time > 300) // purely empical work-around - if (m_eventHandler->postTermEvent(GE_buttonrelease, int(event->scenePos().x()), - int(event->scenePos().y()), button, time, 0)) + // to error out during event processing. Unfortunately I have not been + // able to reliably filter out these spurious events by setting a timing + // window. + qint64 time = 0; + if (m_watches[button].isValid()) + time = m_watches[button].elapsed(); + if (time > 300) { + m_eventHandler->postTermEvent(GE_buttonrelease, int(event->scenePos().x()), + int(event->scenePos().y()), button, time, 0); m_watches[button].start(); + } /* Check for click in one of the keysample boxes */ int i = m_key_boxes.count(); diff -Nru gnuplot-4.6.4/src/qtterminal/qt_term.cpp gnuplot-4.6.5/src/qtterminal/qt_term.cpp --- gnuplot-4.6.4/src/qtterminal/qt_term.cpp 2012-11-01 20:26:10.000000000 +0000 +++ gnuplot-4.6.5/src/qtterminal/qt_term.cpp 2014-02-15 05:33:46.000000000 +0000 @@ -182,13 +182,16 @@ bool connectToWidget = (server != qt_localServerName); // The QLocalSocket::waitForConnected does not respect the time out argument when the - // gnuplot_qt application is not yet started. To wait for it, we need to implement the timeout ourselves - QDateTime timeout = QDateTime::currentDateTime().addMSecs(1000); + // gnuplot_qt application is not yet started or has not yet self-initialized. + // To wait for it, we need to implement the timeout ourselves + QDateTime timeout = QDateTime::currentDateTime().addMSecs(30000); do { qt_socket.connectToServer(server); - qt_socket.waitForConnected(200); - // TODO: yield CPU ? + if (!qt_socket.waitForConnected(-1)) { + // qDebug() << qt->socket.errorString(); + GP_SLEEP(0.2); // yield CPU for 0.2 seconds + } } while((qt_socket.state() != QLocalSocket::ConnectedState) && (QDateTime::currentDateTime() < timeout)); @@ -205,7 +208,7 @@ // The gnuplot_qt program could not be reached: try to start a new one else { - qDebug() << "Could not connect gnuplot_qt" << qt_optionWidget << ". Starting a new one"; + qDebug() << "Could not connect gnuplot_qt" << server << ". Starting a new one"; execGnuplotQt(); qt_connectToServer(qt_localServerName, false); } @@ -607,8 +610,12 @@ void qt_set_color(t_colorspec* colorspec) { - if (colorspec->type == TC_LT) - qt_linetype(colorspec->lt); + if (colorspec->type == TC_LT) { + if (colorspec->lt <= LT_NODRAW) + qt_out << GEBackgroundColor; + else + qt_out << GEPenColor << qt_colorList[colorspec->lt % 9 + 3]; + } else if (colorspec->type == TC_FRAC) { rgb_color rgb; @@ -729,10 +736,14 @@ if (FD_ISSET(socket_fd, &read_fds)) { qt_socket.waitForReadyRead(-1); - // Temporary event for mouse move events. If several consecutive move events - // are received, only transmit the last one. + // Temporary event for mouse move events. If several consecutive + // move events are received, only transmit the last one. gp_event_t tempEvent; tempEvent.type = -1; + if (qt_socket.bytesAvailable() < sizeof(gp_event_t)) { + qDebug() << "Error: short read from gnuplot_qt socket"; + return '\0'; + } while (qt_socket.bytesAvailable() >= sizeof(gp_event_t)) { struct gp_event_t event; diff -Nru gnuplot-4.6.4/src/readline.c gnuplot-4.6.5/src/readline.c --- gnuplot-4.6.4/src/readline.c 2011-09-04 12:01:37.000000000 +0000 +++ gnuplot-4.6.5/src/readline.c 2014-01-12 23:34:11.000000000 +0000 @@ -1,5 +1,5 @@ #ifndef lint -static char *RCSid() { return RCSid("$Id: readline.c,v 1.58 2011/09/04 12:01:37 markisch Exp $"); } +static char *RCSid() { return RCSid("$Id: readline.c,v 1.58.2.1 2014/01/11 16:22:13 markisch Exp $"); } #endif /* GNUPLOT - readline.c */ @@ -250,7 +250,7 @@ # define special_getc() win_getch() static char win_getch __PROTO((void)); # else -# define special_getc() msdos_getch() +# define special_getc() msdos_getch() # endif /* WGP_CONSOLE */ static char msdos_getch __PROTO((void)); /* HBB 980308: PROTO'ed it */ # define DEL_ERASES_CURRENT_CHAR @@ -361,12 +361,12 @@ /* EAM FIXME * This test is intended to determine if the current character, of which * we have only seen the first byte so far, will require twice the width - * of an ascii character. The test catches glyphs above unicode 0x3000, + * of an ascii character. The test catches glyphs above unicode 0x3000, * which is roughly the set of CJK characters. * It should be replaced with a more accurate test. */ static int -mbwidth(char *c) +mbwidth(char *c) { switch (encoding) { @@ -375,7 +375,7 @@ wchar_t wc; if (mbtowc(&wc, c, MB_CUR_MAX) < 0) return 1; - else + else return wcwidth(wc); #else return ((unsigned char)(*c) >= 0xe3 ? 2 : 1); @@ -407,7 +407,7 @@ case S_ENC_UTF8: i = cur_pos; do {i++;} - while ((cur_line[i] & 0xc0) != 0xc0 + while ((cur_line[i] & 0xc0) != 0xc0 && (cur_line[i] & 0x80) != 0 && i < max_pos); return (i - cur_pos); @@ -431,10 +431,10 @@ case S_ENC_UTF8: seqlen = 0; do {cur_pos--; seqlen++;} - while ((cur_line[cur_pos] & 0xc0) != 0xc0 + while ((cur_line[cur_pos] & 0xc0) != 0xc0 && (cur_line[cur_pos] & 0x80) != 0 && cur_pos > 0); - + if ((cur_line[cur_pos] & 0xc0) == 0xc0 || isprint(cur_line[cur_pos])) user_putc(BACKSPACE); @@ -549,7 +549,7 @@ n_completions = 0; completion_idx = 0; } - + /* extract path to complete */ start = cur_line + anchor_pos; if (anchor_pos > 0) { @@ -604,7 +604,8 @@ struct dirent * entry; while ((entry = readdir(dir)) != NULL) { /* ignore files and directories starting with a dot */ - if (entry->d_name[0] == '.') continue; + if (entry->d_name[0] == '.') + continue; /* skip entries which don't match */ if (nlen > 0) @@ -619,10 +620,10 @@ closedir(dir); free(search); if (name) free(name); - if (n_completions > 0) - return completions[0]; - else - return NULL; + if (n_completions > 0) + return completions[0]; + else + return NULL; } free(search); if (name) free(name); @@ -686,8 +687,8 @@ /* insert completion string */ if (max_pos > (last_tab_pos - last_completion_len)) - memmove(cur_line + last_tab_pos + completion_len, - cur_line + last_tab_pos + last_completion_len, + memmove(cur_line + last_tab_pos + completion_len, + cur_line + last_tab_pos + last_completion_len, max_pos - last_tab_pos - last_completion_len); memcpy(cur_line + last_tab_pos, completion, completion_len); max_pos += completion_len - last_completion_len; @@ -766,7 +767,7 @@ fix_line(); /* Normal ascii character */ else if ((cur_char & 0xc0) == 0xc0) ; /* start of a multibyte sequence. */ - else if (((cur_char & 0xc0) == 0x80) && + else if (((cur_char & 0xc0) == 0x80) && ((unsigned char)(cur_line[cur_pos-2]) >= 0xe0)) ; /* second byte of a >2 byte sequence */ else { @@ -847,6 +848,9 @@ case 011: /* ^I / TAB */ tab_completion(TRUE); /* next tab completion */ break; + case 034: /* remapped by wtext.c or ansi_getc from Shift-Tab */ + tab_completion(FALSE); /* previous tab completion */ + break; #endif case 013: /* ^K */ clear_eoline(prompt); @@ -1113,6 +1117,9 @@ case 'H': /* home key */ c = 001; break; + case 'Z': /* shift-tab key */ + c = 034; /* FS: non-standard! */ + break; case '3': /* DEL can be [3~ */ getc(stdin); /* eat the ~ */ c = 023; /* DC3 ^S NB: non-standard!! */ @@ -1141,7 +1148,7 @@ msdos_getch() { char c; - + #ifdef DJGPP int ch = getkey(); c = (ch & 0xff00) ? 0 : ch & 0xff; diff -Nru gnuplot-4.6.4/src/save.c gnuplot-4.6.5/src/save.c --- gnuplot-4.6.4/src/save.c 2011-10-25 05:10:58.000000000 +0000 +++ gnuplot-4.6.5/src/save.c 2013-11-08 00:48:41.000000000 +0000 @@ -1,5 +1,5 @@ #ifndef lint -static char *RCSid() { return RCSid("$Id: save.c,v 1.197 2011/10/25 05:10:58 sfeam Exp $"); } +static char *RCSid() { return RCSid("$Id: save.c,v 1.197.2.3 2013/11/08 00:48:41 sfeam Exp $"); } #endif /* GNUPLOT - save.c */ @@ -1130,13 +1130,13 @@ SAVE_NUM_OR_TIME(fp, axis_array[axis].max, axis); } fputs("] )\n", fp); - - if (axis_array[axis].set_autoscale & (AUTOSCALE_FIXMIN)) - fprintf(fp, "set autoscale %sfixmin\n", axis_defaults[axis].name); - if (axis_array[axis].set_autoscale & AUTOSCALE_FIXMAX) - fprintf(fp, "set autoscale %sfixmax\n", axis_defaults[axis].name); } else putc('\n', fp); + + if (axis_array[axis].set_autoscale & (AUTOSCALE_FIXMIN)) + fprintf(fp, "set autoscale %sfixmin\n", axis_defaults[axis].name); + if (axis_array[axis].set_autoscale & AUTOSCALE_FIXMAX) + fprintf(fp, "set autoscale %sfixmax\n", axis_defaults[axis].name); } static void @@ -1451,19 +1451,26 @@ } /* Properties common to all objects */ - fprintf(fp, "\n%sobject %2d ", (fp==stderr) ? "\t" : "set ",this_object->tag); - fprintf(fp, "%s ", this_object->layer > 0 ? "front" : this_object->layer < 0 ? "behind" : "back"); - if (this_object->lp_properties.l_width) - fprintf(fp, "lw %.1f ",this_object->lp_properties.l_width); - fprintf(fp, "fc "); - if (this_object->lp_properties.l_type == LT_DEFAULT) - fprintf(fp,"default"); - else if (this_object->lp_properties.use_palette) - save_pm3dcolor(fp, &this_object->lp_properties.pm3d_color); - else - fprintf(fp, "lt %d",this_object->lp_properties.l_type+1); - fprintf(fp, " fillstyle "); - save_fillstyle(fp, &this_object->fillstyle); + if (tag == 0 || tag == this_object->tag) { + fprintf(fp, "\n%sobject %2d ", (fp==stderr) ? "\t" : "set ",this_object->tag); + fprintf(fp, "%s ", this_object->layer > 0 ? "front" : this_object->layer < 0 ? "behind" : "back"); + if (this_object->clip == OBJ_NOCLIP) + fputs("noclip ", fp); + else + fputs("clip ", fp); + + if (this_object->lp_properties.l_width) + fprintf(fp, "lw %.1f ",this_object->lp_properties.l_width); + fprintf(fp, "fc "); + if (this_object->lp_properties.l_type == LT_DEFAULT) + fprintf(fp,"default"); + else if (this_object->lp_properties.use_palette) + save_pm3dcolor(fp, &this_object->lp_properties.pm3d_color); + else + fprintf(fp, "lt %d",this_object->lp_properties.l_type+1); + fprintf(fp, " fillstyle "); + save_fillstyle(fp, &this_object->fillstyle); + } } if (tag > 0 && !showed) diff -Nru gnuplot-4.6.4/src/set.c gnuplot-4.6.5/src/set.c --- gnuplot-4.6.4/src/set.c 2013-09-11 23:38:37.000000000 +0000 +++ gnuplot-4.6.5/src/set.c 2014-01-27 17:07:53.000000000 +0000 @@ -1,5 +1,5 @@ #ifndef lint -static char *RCSid() { return RCSid("$Id: set.c,v 1.354.2.6 2013/09/11 23:38:37 sfeam Exp $"); } +static char *RCSid() { return RCSid("$Id: set.c,v 1.354.2.10 2014/01/27 02:00:50 sfeam Exp $"); } #endif /* GNUPLOT - set.c */ @@ -1111,18 +1111,20 @@ set_clip() { c_token++; - if (END_OF_COMMAND) + if (END_OF_COMMAND) { /* assuming same as points */ clip_points = TRUE; - else if (almost_equals(c_token, "p$oints")) + } else if (almost_equals(c_token, "p$oints")) { clip_points = TRUE; - else if (almost_equals(c_token, "o$ne")) + c_token++; + } else if (almost_equals(c_token, "o$ne")) { clip_lines1 = TRUE; - else if (almost_equals(c_token, "t$wo")) + c_token++; + } else if (almost_equals(c_token, "t$wo")) { clip_lines2 = TRUE; - else + c_token++; + } else int_error(c_token, "expecting 'points', 'one', or 'two'"); - c_token++; } @@ -1420,10 +1422,21 @@ } else { int temp = lookup_table(&set_encoding_tbl[0],c_token); + /* allow string variables as parameter */ + if ((temp == S_ENC_INVALID) && isstringvalue(c_token)) { + int i; + char *senc = try_to_get_string(); + for (i = 0; encoding_names[i] != NULL; i++) + if (strcmp(encoding_names[i], senc) == 0) + temp = i; + free(senc); + } else { + c_token++; + } + if (temp == S_ENC_INVALID) int_error(c_token, "unrecognized encoding specification; see 'help encoding'."); encoding = temp; - c_token++; } /* Set degree sign to match encoding */ @@ -2833,6 +2846,7 @@ free( sm_palette.gradient ); sm_palette.gradient = gp_alloc( actual_size*sizeof(gradient_struct), "pm3d gradient" ); + sm_palette.smallest_gradient_interval = 1; if (END_OF_COMMAND) { /* lets use some default gradient */ @@ -2849,6 +2863,8 @@ } sm_palette.gradient_num = 8; sm_palette.cmodel = C_MODEL_RGB; + sm_palette.smallest_gradient_interval = 0.1; /* From pal[][] */ + c_token--; /* Caller will increment! */ return 0; } @@ -3098,24 +3114,33 @@ { int i; double off, f; + gradient_struct *gradient = sm_palette.gradient; /* check if gray values are sorted */ for (i=0; i sm_palette.gradient[i+1].pos) { + if (gradient[i].pos > gradient[i+1].pos) { int_error( c_token, "Gray scale not sorted in gradient." ); } } /* fit gray axis into [0:1]: subtract offset and rescale */ - off = sm_palette.gradient[0].pos; - f = 1.0 / ( sm_palette.gradient[sm_palette.gradient_num-1].pos-off ); + off = gradient[0].pos; + f = 1.0 / ( gradient[sm_palette.gradient_num-1].pos-off ); for (i=1; i 0) + && (sm_palette.smallest_gradient_interval > (gradient[i].pos - gradient[i-1].pos))) + sm_palette.smallest_gradient_interval = (gradient[i].pos - gradient[i-1].pos); + } } @@ -3916,6 +3941,14 @@ got_fill = got_lt = TRUE; c_token++; continue; + } else if (equals(c_token, "clip")) { + this_object->clip = OBJ_CLIP; + c_token++; + continue; + } else if (equals(c_token, "noclip")) { + this_object->clip = OBJ_NOCLIP; + c_token++; + continue; } /* Now parse the style options; default to whatever the global style is */ @@ -4097,8 +4130,17 @@ break; case SHOW_STYLE_CIRCLE: c_token++; - if (almost_equals(c_token++,"r$adius")) { - get_position(&default_circle.o.circle.extent); + while (!END_OF_COMMAND) { + if (almost_equals(c_token++,"r$adius")) { + get_position(&default_circle.o.circle.extent); + } else if (equals(c_token, "clip")) { + c_token++; + default_circle.clip = OBJ_CLIP; + } else if (equals(c_token, "noclip")) { + c_token++; + default_circle.clip = OBJ_NOCLIP; + } else + int_error(c_token, "unrecognized style option" ); } break; case SHOW_STYLE_ELLIPSE: @@ -4125,8 +4167,14 @@ } else { int_error(c_token, "expecting 'xy', 'xx' or 'yy'" ); } + } else if (equals(c_token, "clip")) { + c_token++; + default_ellipse.clip = OBJ_CLIP; + } else if (equals(c_token, "noclip")) { + c_token++; + default_ellipse.clip = OBJ_NOCLIP; } else - int_error(c_token, "expecting 'units {xy|xx|yy}', 'angle ' or 'size '" ); + int_error(c_token, "unrecognized style option" ); c_token++; } @@ -4142,15 +4190,14 @@ else if (almost_equals(c_token,"u$serstyles")) prefer_line_styles = TRUE; else - int_error(c_token,"unrecognized option"); + int_error(c_token,"unrecognized style option"); c_token++; break; case SHOW_STYLE_BOXPLOT: set_boxplot(); break; default: - int_error(c_token, - "expecting 'data', 'function', 'line', 'fill', 'rectangle', 'circle', 'ellipse' or 'arrow'" ); + int_error(c_token, "unrecognized style"); } } diff -Nru gnuplot-4.6.4/src/show.c gnuplot-4.6.5/src/show.c --- gnuplot-4.6.4/src/show.c 2012-10-14 02:18:53.000000000 +0000 +++ gnuplot-4.6.5/src/show.c 2013-12-27 20:09:44.000000000 +0000 @@ -1,5 +1,5 @@ #ifndef lint -static char *RCSid() { return RCSid("$Id: show.c,v 1.261.2.4 2012/10/13 18:30:47 sfeam Exp $"); } +static char *RCSid() { return RCSid("$Id: show.c,v 1.261.2.5 2013/12/26 01:31:27 sfeam Exp $"); } #endif /* GNUPLOT - show.c */ @@ -996,9 +996,7 @@ #ifdef GP_MACROS "+MACROS " #endif -# ifdef THIN_PLATE_SPLINES_GRID "+THIN_SPLINES " -# endif "+IMAGE " "+USER_LINETYPES " #ifdef USE_STATS diff -Nru gnuplot-4.6.4/src/tables.c gnuplot-4.6.5/src/tables.c --- gnuplot-4.6.4/src/tables.c 2011-11-10 05:15:58.000000000 +0000 +++ gnuplot-4.6.5/src/tables.c 2014-01-31 17:23:26.000000000 +0000 @@ -1,5 +1,5 @@ #ifndef lint -static char *RCSid() { return RCSid("$Id: tables.c,v 1.110 2011/11/10 05:15:58 sfeam Exp $"); } +static char *RCSid() { return RCSid("$Id: tables.c,v 1.110.2.2 2014/01/31 05:22:06 sfeam Exp $"); } #endif /* GNUPLOT - tables.c */ @@ -117,10 +117,12 @@ { "c$splines", SMOOTH_CSPLINES }, { "s$bezier", SMOOTH_SBEZIER }, { "u$nique", SMOOTH_UNIQUE }, + { "unwrap", SMOOTH_UNWRAP }, { "f$requency", SMOOTH_FREQUENCY }, { "cum$ulative", SMOOTH_CUMULATIVE }, { "k$density", SMOOTH_KDENSITY }, { "cn$ormal", SMOOTH_CUMULATIVE_NORMALISED }, + { "mcs$plines", SMOOTH_MONOTONE_CSPLINE }, { NULL, SMOOTH_NONE } }; diff -Nru gnuplot-4.6.4/src/term.c gnuplot-4.6.5/src/term.c --- gnuplot-4.6.4/src/term.c 2013-08-26 17:22:01.000000000 +0000 +++ gnuplot-4.6.5/src/term.c 2013-12-31 18:43:49.000000000 +0000 @@ -1,5 +1,5 @@ #ifndef lint -static char *RCSid() { return RCSid("$Id: term.c,v 1.225.2.16 2013/08/23 09:50:36 mikulik Exp $"); } +static char *RCSid() { return RCSid("$Id: term.c,v 1.225.2.17 2013/12/31 16:01:19 markisch Exp $"); } #endif /* GNUPLOT - term.c */ @@ -1388,6 +1388,10 @@ /* Calculate the vertices */ aspect = (double)term->v_tic / (double)term->h_tic; +#ifdef WIN32 + if (strcmp(term->name, "windows") == 0) + aspect = 1.; +#endif vertex[0].style = style; for (i=0, in=0; i 0) { - double base = pow(10.,p); + double base = pow(10., (double)p); int msec = floor(0.5 + base * usec); char *f = &s[strlen(s)]; CHECK_SPACE(p+1); diff -Nru gnuplot-4.6.4/src/unset.c gnuplot-4.6.5/src/unset.c --- gnuplot-4.6.4/src/unset.c 2013-09-11 23:38:38.000000000 +0000 +++ gnuplot-4.6.5/src/unset.c 2014-01-27 17:07:53.000000000 +0000 @@ -1,5 +1,5 @@ #ifndef lint -static char *RCSid() { return RCSid("$Id: unset.c,v 1.149.2.3 2013/09/11 23:38:38 sfeam Exp $"); } +static char *RCSid() { return RCSid("$Id: unset.c,v 1.149.2.4 2014/01/27 02:00:51 sfeam Exp $"); } #endif /* GNUPLOT - unset.c */ @@ -1429,7 +1429,7 @@ c_token++; break; default: - int_error(c_token, "expecting 'data', 'function', 'line', 'fill' or 'arrow'"); + int_error(c_token, "unrecognized style option"); } } diff -Nru gnuplot-4.6.4/src/util.c gnuplot-4.6.5/src/util.c --- gnuplot-4.6.4/src/util.c 2013-06-25 02:32:46.000000000 +0000 +++ gnuplot-4.6.5/src/util.c 2013-12-12 20:49:57.000000000 +0000 @@ -1,5 +1,5 @@ #ifndef lint -static char *RCSid() { return RCSid("$Id: util.c,v 1.99.2.7 2013/06/23 22:13:35 markisch Exp $"); } +static char *RCSid() { return RCSid("$Id: util.c,v 1.99.2.8 2013/12/12 20:49:57 sfeam Exp $"); } #endif /* GNUPLOT - util.c */ @@ -607,6 +607,14 @@ t[1] = 0; snprintf(dest, remaining_space, temp, x); break; + /*}}} */ + /*{{{ Forward compatibility: treat %h as %g */ + case 'h': + case 'H': + t[0] = 'g'; + t[1] = 0; + snprintf(dest, remaining_space, temp, x); + break; /*}}} */ /*{{{ l --- mantissa to current log base */ case 'l': diff -Nru gnuplot-4.6.4/src/version.c gnuplot-4.6.5/src/version.c --- gnuplot-4.6.4/src/version.c 2013-10-03 19:04:19.000000000 +0000 +++ gnuplot-4.6.5/src/version.c 2014-02-23 18:20:43.000000000 +0000 @@ -1,5 +1,5 @@ #ifndef lint -static char *RCSid() { return RCSid("$Id: version.c,v 1.100.2.8 2013/09/05 19:10:58 sfeam Exp $"); } +static char *RCSid() { return RCSid("$Id: version.c,v 1.100.2.10 2014/02/23 18:04:27 sfeam Exp $"); } #endif /* GNUPLOT - version.c */ @@ -40,9 +40,9 @@ const char gnuplot_version[] = "4.6"; -const char gnuplot_patchlevel[] = "4"; -const char gnuplot_date[] = "2013-10-02 "; -const char gnuplot_copyright[] = "Copyright (C) 1986-1993, 1998, 2004, 2007-2013"; +const char gnuplot_patchlevel[] = "5"; +const char gnuplot_date[] = "February 2014"; +const char gnuplot_copyright[] = "Copyright (C) 1986-1993, 1998, 2004, 2007-2014"; const char faq_location[] = FAQ_LOCATION; diff -Nru gnuplot-4.6.4/src/win/wgraph.c gnuplot-4.6.5/src/win/wgraph.c --- gnuplot-4.6.4/src/win/wgraph.c 2013-06-18 19:37:43.000000000 +0000 +++ gnuplot-4.6.5/src/win/wgraph.c 2014-02-15 00:27:13.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: wgraph.c,v 1.144.2.8 2013/06/08 11:54:25 markisch Exp $ + * $Id: wgraph.c,v 1.144.2.10 2014/02/11 08:47:54 markisch Exp $ */ /* GNUPLOT - win/wgraph.c */ @@ -74,10 +74,14 @@ #include "color.h" #include "getcolor.h" #ifdef HAVE_GDIPLUS -#include "wgdiplus.h" +# include "wgdiplus.h" #endif #include "fit.h" +#ifndef WM_MOUSEHWHEEL /* requires _WIN32_WINNT >= 0x0600 */ +# define WM_MOUSEHWHEEL 0x020E +#endif + #ifdef USE_MOUSE /* Petr Mikulik, February 2001 * Declarations similar to src/os2/gclient.c -- see section @@ -559,7 +563,7 @@ M_PATTERNAA, "Antialiasing of Patt&erns"); #endif AppendMenu(lpgw->hPopMenu, MF_STRING, M_BACKGROUND, "&Background..."); - AppendMenu(lpgw->hPopMenu, MF_STRING, M_CHOOSE_FONT, "Choose &Font..."); + AppendMenu(lpgw->hPopMenu, MF_STRING, M_CHOOSE_FONT, "&Font..."); AppendMenu(lpgw->hPopMenu, MF_STRING, M_LINESTYLE, "&Line Styles..."); /* save settings */ AppendMenu(lpgw->hPopMenu, MF_SEPARATOR, 0, NULL); @@ -1126,11 +1130,8 @@ SetFont(enhstate.lpgw, enhstate.hdc); /* Scale fractional font height to vertical units of display */ - /* FIXME: - Font scaling is not done properly (yet) and will lead to - non-optimal results for most font and size selections. - OUTLINEFONTMETRICS could be used for better results here. - */ + /* TODO: Proper use of OUTLINEFONTMETRICS would yield better + results. */ enhstate.base = win_scale * base * enhstate.lpgw->sampling * enhstate.lpgw->fontscale * enhstate.res_scale; @@ -1242,9 +1243,9 @@ enhstate.sizeonly = TRUE; } - /* we actually print everything left to right */ + /* We actually print everything left to right. */ SetTextAlign(hdc, TA_LEFT|TA_BASELINE); - /* adjust baseline accordingly */ + /* Adjust baseline position: */ { TEXTMETRIC tm; if (GetTextMetrics(hdc, &tm)) { @@ -1264,12 +1265,12 @@ for (pass = 1; pass <= num_passes; pass++) { /* Set the recursion going. We say to keep going until a - * closing brace, but we don't really expect to find one. - * If the return value is not the nul-terminator of the - * string, that can only mean that we did find an unmatched - * closing brace in the string. We increment past it (else - * we get stuck in an infinite loop) and try again. - */ + * closing brace, but we don't really expect to find one. + * If the return value is not the nul-terminator of the + * string, that can only mean that we did find an unmatched + * closing brace in the string. We increment past it (else + * we get stuck in an infinite loop) and try again. + */ while (*(str = enhanced_recursion((char *)str, TRUE, save_fontname, save_fontsize, 0.0, TRUE, TRUE, 0))) { @@ -1851,7 +1852,7 @@ memdc = CreateCompatibleDC(hdc); /* create standard bitmap, no alpha channel needed */ - membmp = CreateCompatibleBitmap(hdc, xdash, abs(ydash)); + membmp = CreateCompatibleBitmap(hdc, width, height); oldbmp = (HBITMAP)SelectObject(memdc, membmp); /* prepare memory context */ @@ -3256,27 +3257,27 @@ Wnd_exec_event(lpgw, lParam, GE_buttonpress, 2); return 0L; -#if _WIN32_WINNT >= 0x0400 - /* shige : mouse wheel support */ - case WM_MOUSEWHEEL: { - WORD fwKeys; - short int zDelta; - int modifier_mask; - - fwKeys = LOWORD(wParam); - zDelta = HIWORD(wParam); - modifier_mask = ((fwKeys & MK_SHIFT)? Mod_Shift : 0) - | ((fwKeys & MK_CONTROL)? Mod_Ctrl : 0) - | ((fwKeys & MK_ALT)? Mod_Alt : 0); - if (last_modifier_mask != modifier_mask) - Wnd_exec_event(lpgw, lParam, GE_modifier, - modifier_mask); - Wnd_exec_event(lpgw, lParam, GE_buttonpress, - zDelta > 0 ? 4 : 5); - last_modifier_mask = modifier_mask; - return 0L; + case WM_MOUSEWHEEL: /* shige, BM : mouse wheel support */ + case WM_MOUSEHWHEEL: { + WORD fwKeys; + short int zDelta; + int modifier_mask; + + fwKeys = LOWORD(wParam); + zDelta = HIWORD(wParam); + modifier_mask = ((fwKeys & MK_SHIFT)? Mod_Shift : 0) | + ((fwKeys & MK_CONTROL)? Mod_Ctrl : 0) | + ((fwKeys & MK_ALT)? Mod_Alt : 0); + if (last_modifier_mask != modifier_mask) { + Wnd_exec_event(lpgw, lParam, GE_modifier, modifier_mask); + last_modifier_mask = modifier_mask; + } + if (message == WM_MOUSEWHEEL) + Wnd_exec_event(lpgw, lParam, GE_buttonpress, zDelta > 0 ? 4 : 5); + else + Wnd_exec_event(lpgw, lParam, GE_buttonpress, zDelta > 0 ? 6 : 7); + return 0L; } -#endif case WM_LBUTTONDBLCLK: Wnd_exec_event(lpgw, lParam, GE_buttonrelease, 1); @@ -3349,7 +3350,7 @@ return 0; #endif case M_COMMANDLINE: - sysmenu = GetSystemMenu(lpgw->hWndGraph,0); + sysmenu = GetSystemMenu(lpgw->hWndGraph, 0); i = GetMenuItemCount (sysmenu); DeleteMenu (sysmenu, --i, MF_BYPOSITION); DeleteMenu (sysmenu, --i, MF_BYPOSITION); @@ -3729,8 +3730,10 @@ if ( lpgw->lptw && (lpgw->lptw->DragPre!=(LPSTR)NULL) && (lpgw->lptw->DragPost!=(LPSTR)NULL) ) DragAcceptFiles(hwnd, TRUE); return(0); + case WM_ERASEBKGND: return(1); /* we erase the background ourselves */ + case WM_PAINT: { HDC memdc; HBITMAP membmp, oldbmp; @@ -4017,6 +4020,7 @@ } } + void WDPROC Graph_set_clipboard (LPGW lpgw, LPCSTR s) { diff -Nru gnuplot-4.6.4/src/win/winmain.c gnuplot-4.6.5/src/win/winmain.c --- gnuplot-4.6.4/src/win/winmain.c 2013-06-18 19:37:43.000000000 +0000 +++ gnuplot-4.6.5/src/win/winmain.c 2014-01-12 23:34:12.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: winmain.c,v 1.52.2.3 2013/06/08 11:52:33 markisch Exp $ + * $Id: winmain.c,v 1.52.2.5 2014/01/11 16:22:14 markisch Exp $ */ /* GNUPLOT - win/winmain.c */ @@ -432,18 +432,22 @@ int main(int argc, char **argv) #endif { - LPSTR tail; + LPSTR tail; int i; #ifdef WGP_CONSOLE -# define _argv argv -# define _argc argc - HINSTANCE hInstance = GetModuleHandle(NULL), hPrevInstance = NULL; -#else -#if defined(__MSC__) || defined(__WATCOMC__) || defined(__MINGW32__) -# define _argv __argv -# define _argc __argc + HINSTANCE hInstance = GetModuleHandle(NULL), hPrevInstance = NULL; #endif + + +#ifndef WGP_CONSOLE +# if defined( __MINGW32__) && !defined(_W64) +# define argc _argc +# define argv _argv +# else /* MSVC, WATCOM, MINGW-W64 */ +# define argc __argc +# define argv __argv +# endif #endif /* WGP_CONSOLE */ szModuleName = (LPSTR)malloc(MAXSTR+1); @@ -561,10 +565,10 @@ * command line arguments are file names or an explicit in-line "-e command". * (This is a copy of a code snippet from plot.c) */ - for (i = 1; i < _argc; i++) { - if (!stricmp(_argv[i], "/noend")) + for (i = 1; i < argc; i++) { + if (!stricmp(argv[i], "/noend")) continue; - if ((_argv[i][0] != '-') || (_argv[i][1] == 'e')) { + if ((argv[i][0] != '-') || (argv[i][1] == 'e')) { interactive = FALSE; break; } @@ -596,17 +600,17 @@ #endif #endif - atexit(WinExit); + atexit(WinExit); - if (!isatty(fileno(stdin))) - setmode(fileno(stdin), O_BINARY); + if (!isatty(fileno(stdin))) + setmode(fileno(stdin), O_BINARY); - gnu_main(_argc, _argv); + gnu_main(argc, argv); - /* First chance to close help system for console gnuplot, - second for wgnuplot */ - WinCloseHelp(); - return 0; + /* First chance to close help system for console gnuplot, + second for wgnuplot */ + WinCloseHelp(); + return 0; } @@ -881,12 +885,16 @@ DWORD recRead; ReadConsoleInput(h, &rec, 1, &recRead); + /* FIXME: We should handle rec.Event.KeyEvent.wRepeatCount > 1, too. */ if (recRead == 1 && rec.EventType == KEY_EVENT && rec.Event.KeyEvent.bKeyDown && (rec.Event.KeyEvent.wVirtualKeyCode < VK_SHIFT || rec.Event.KeyEvent.wVirtualKeyCode > VK_MENU)) { if (rec.Event.KeyEvent.uChar.AsciiChar) - return rec.Event.KeyEvent.uChar.AsciiChar; + if ((rec.Event.KeyEvent.dwControlKeyState == SHIFT_PRESSED) && (rec.Event.KeyEvent.wVirtualKeyCode == VK_TAB)) + return 034; /* remap Shift-Tab */ + else + return rec.Event.KeyEvent.uChar.AsciiChar; else switch (rec.Event.KeyEvent.wVirtualKeyCode) { @@ -1011,7 +1019,7 @@ } -/* return the number of graph windows (win terminal)*/ +/* returns true if there are any graph windows open (win terminal) */ TBOOLEAN WinWindowOpened(void) { @@ -1061,11 +1069,11 @@ WinRaiseConsole(void) { HWND console = NULL; -# ifndef WGP_CONSOLE +#ifndef WGP_CONSOLE console = textwin.hWndParent; -# else +#else console = GetConsoleWindow(); -# endif +#endif if (console != NULL) { ShowWindow(console, SW_SHOWNORMAL); BringWindowToTop(console); diff -Nru gnuplot-4.6.4/src/win/wtext.c gnuplot-4.6.5/src/win/wtext.c --- gnuplot-4.6.4/src/win/wtext.c 2013-07-08 18:17:24.000000000 +0000 +++ gnuplot-4.6.5/src/win/wtext.c 2014-01-12 23:34:12.000000000 +0000 @@ -1,5 +1,5 @@ /* - *$Id: wtext.c,v 1.37.2.3 2013/07/06 08:28:24 markisch Exp $ + *$Id: wtext.c,v 1.37.2.5 2014/01/11 16:22:14 markisch Exp $ */ /* GNUPLOT - win/wtext.c */ @@ -1419,6 +1419,7 @@ lptw->KeyBufIn = lptw->KeyBuf; /* wrap around */ } } + break; case VK_CANCEL: /* FIXME: Currently, this only supports interrupting fit. */ ctrlc_flag = TRUE; @@ -1589,6 +1590,11 @@ case WM_CHAR: { /* store key in circular buffer */ long count = lptw->KeyBufIn - lptw->KeyBufOut; + WPARAM key = wParam; + + /* Remap Shift-Tab to FS */ + if ((GetKeyState(VK_SHIFT) < 0) && (key == 0x09)) + key = 034; if (count < 0) count += lptw->KeyBufSize; @@ -1601,7 +1607,7 @@ return 0; /* not enough memory */ } if (count < lptw->KeyBufSize-1) { - *lptw->KeyBufIn++ = wParam; + *lptw->KeyBufIn++ = key; if (lptw->KeyBufIn - lptw->KeyBuf >= lptw->KeyBufSize) lptw->KeyBufIn = lptw->KeyBuf; /* wrap around */ } @@ -1638,7 +1644,7 @@ cbuf = (BYTE *) GlobalLock(hGMem); while (*cbuf) { if (*cbuf != '\n') - SendMessage(lptw->hWndText,WM_CHAR,*cbuf,1L); + SendMessage(lptw->hWndText, WM_CHAR, *cbuf, 1L); cbuf++; } GlobalUnlock(hGMem); diff -Nru gnuplot-4.6.4/src/wxterminal/gp_cairo.c gnuplot-4.6.5/src/wxterminal/gp_cairo.c --- gnuplot-4.6.4/src/wxterminal/gp_cairo.c 2013-05-24 19:42:05.000000000 +0000 +++ gnuplot-4.6.5/src/wxterminal/gp_cairo.c 2013-12-13 06:44:01.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: gp_cairo.c,v 1.60.2.5 2013/05/24 19:42:05 sfeam Exp $ + * $Id: gp_cairo.c,v 1.60.2.6 2013/12/13 05:44:09 sfeam Exp $ */ /* GNUPLOT - gp_cairo.c */ @@ -803,7 +803,6 @@ /* EAM Dec 2012 - The problem is that avg_vchar is not kept in sync with the */ /* font size. It is changed when the set_font command is received, not when */ /* it is executed in the display list. Try basing off plot->fontsize instead. */ - /* vert_just = ((double)ink_rect.height/2 +(double)ink_rect.y) / PANGO_SCALE; */ /* vert_just = avg_vchar/2; */ vert_just = 0.8 * (float)(plot->fontsize * plot->oversampling_scale); @@ -1490,8 +1489,9 @@ pango_layout_set_attributes (layout, gp_cairo_enhanced_AttrList); pango_layout_get_extents(layout, &ink_rect, &logical_rect); - /* vert_just = ((double)ink_rect.height/2 +(double)ink_rect.y) / PANGO_SCALE; */ - vert_just = avg_vchar/2; + + /* NB: See explanatory comments in gp_cairo_draw_text() */ + vert_just = 0.8 * (float)(plot->fontsize * plot->oversampling_scale); arg = plot->text_angle * M_PI/180; enh_x = x - vert_just * sin(arg); diff -Nru gnuplot-4.6.4/src/wxterminal/wxt_gui.cpp gnuplot-4.6.5/src/wxterminal/wxt_gui.cpp --- gnuplot-4.6.4/src/wxterminal/wxt_gui.cpp 2013-06-18 19:37:43.000000000 +0000 +++ gnuplot-4.6.5/src/wxterminal/wxt_gui.cpp 2013-12-13 06:44:01.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: wxt_gui.cpp,v 1.91.2.14 2013/06/08 11:52:33 markisch Exp $ + * $Id: wxt_gui.cpp,v 1.91.2.16 2013/12/13 05:44:09 sfeam Exp $ */ /* GNUPLOT - wxt_gui.cpp */ @@ -706,9 +706,8 @@ /* run through the list, and free allocated memory */ for(iter = command_list.begin(); iter != command_list.end(); ++iter) { - if (iter->command == command_enhanced_put_text || - iter->command == command_put_text || - iter->command == command_set_font) + if (iter->command == command_put_text + || iter->command == command_set_font) delete[] iter->string; if (iter->command == command_filled_polygon) delete[] iter->corners; @@ -1976,6 +1975,8 @@ /* init */ temp_command.command = command_enhanced_init; temp_command.integer_value = strlen(string); + temp_command.x1 = x; + temp_command.y1 = term->ymax - y; wxt_command_push(temp_command); /* set up the global variables needed by enhanced_recursion() */ @@ -2695,9 +2696,8 @@ text_justification_mode = command.mode; return; case command_put_text : - case command_enhanced_put_text : if (wxt_in_key_sample) { - int slen = strlen(command.string) * term->h_char * 0.75; + int slen = gp_strlen(command.string) * term->h_char * 0.75; if (text_justification_mode == RIGHT) slen = -slen; wxt_update_key_box(command.x1, command.y1); wxt_update_key_box(command.x1 + slen, command.y1 - term->v_tic); @@ -2705,6 +2705,12 @@ gp_cairo_draw_text(&plot, command.x1, command.y1, command.string); return; case command_enhanced_init : + if (wxt_in_key_sample) { + int slen = command.integer_value * term->h_char * 0.75; + if (text_justification_mode == RIGHT) slen = -slen; + wxt_update_key_box(command.x1, command.y1); + wxt_update_key_box(command.x1 + slen, command.y1 - term->v_tic); + } gp_cairo_enhanced_init(&plot, command.integer_value); return; case command_enhanced_finish : diff -Nru gnuplot-4.6.4/src/wxterminal/wxt_gui.h gnuplot-4.6.5/src/wxterminal/wxt_gui.h --- gnuplot-4.6.4/src/wxterminal/wxt_gui.h 2013-04-08 16:26:34.000000000 +0000 +++ gnuplot-4.6.5/src/wxterminal/wxt_gui.h 2014-02-04 22:11:48.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: wxt_gui.h,v 1.36.2.2 2013/04/05 16:39:47 markisch Exp $ + * $Id: wxt_gui.h,v 1.36.2.4 2014/02/04 22:11:48 sfeam Exp $ */ /* GNUPLOT - wxt_gui.h */ @@ -153,12 +153,14 @@ /* depending on the platform, and mostly because of the Windows terminal which * already has its event loop, we may or may not be multithreaded */ +#ifndef WXT_MONOTHREADED #if defined(__WXGTK__) # define WXT_MULTITHREADED #elif defined(__WXMSW__) || defined(__WXMAC__) # define WXT_MONOTHREADED #else -# error "wxt does not know if this platform has to be mono- or multi-threaded" +# error "wxt does not know if this platform has to be single- or multi-threaded" +#endif #endif extern "C" { @@ -265,7 +267,6 @@ command_move, command_vector, command_put_text, - command_enhanced_put_text, command_enhanced_init, command_enhanced_open, command_enhanced_writec, diff -Nru gnuplot-4.6.4/term/emf.trm gnuplot-4.6.5/term/emf.trm --- gnuplot-4.6.4/term/emf.trm 2013-09-17 23:40:33.000000000 +0000 +++ gnuplot-4.6.5/term/emf.trm 2013-12-13 06:44:02.000000000 +0000 @@ -1,5 +1,5 @@ /* Hey Emacs this is -*- C -*- - * $Id: emf.trm,v 1.78.2.9 2013/09/17 23:40:33 sfeam Exp $ + * $Id: emf.trm,v 1.78.2.12 2013/12/13 05:24:43 sfeam Exp $ */ /* GNUPLOT - emf.trm */ @@ -334,6 +334,29 @@ EMF_write_long(nvert); \ } +/* shige */ +/* Write the EMR, the header, and a single-entry colormap */ +#define EMF_CreateMonoBrush(handle) { \ + EMF_write_emr(93, 0x6c); \ + EMF_write_long(handle); \ + EMF_write_long(2); /* DIB_PAL_INDICES = use current color */ \ + EMF_write_long(0x24); /* offset to DIB header */ \ + EMF_write_long(0x28); /* size of DIB header */ \ + EMF_write_long(0x4c); /* offset to DIB bits */ \ + EMF_write_long(0x20); /* size of DIB bits */ \ + EMF_write_long(0x20000000); /* start of DIB header */ \ + EMF_write_long(0x28); \ + EMF_write_sizel(16, 8); /* width, height */ \ + EMF_write_short(1); /* must be 1 */ \ + EMF_write_short(1); /* bits per pixel */ \ + EMF_write_long(0); /* compression type */ \ + EMF_write_long(32); /* size of image in bytes */ \ + EMF_write_long(0); /* x pixels per meter */ \ + EMF_write_long(0); /* y pixels per meter */ \ + EMF_write_long(0); /* # entries in color table */ \ + EMF_write_long(0); /* # color table entries used */ \ +} + #endif /* TERM_PROTO */ #ifndef TERM_PROTO_ONLY @@ -363,6 +386,8 @@ static int emf_coords = 0; /* # polyline coordinates saved */ static char emf_fontname[255] = EMF_FONTNAME; static float emf_fontsize = EMF_FONTSIZE; +static float emf_last_fontsize = -1; +static char *emf_last_fontname = NULL; static enum JUSTIFY emf_justify = LEFT; static char emf_defaultfontname[255] = EMF_FONTNAME; static float emf_defaultfontsize = EMF_FONTSIZE; @@ -376,6 +401,27 @@ static double emf_fontscale = 1.0; static int emf_dashtype_count = 0; /* count > 0 if EMF_dashtype needed before drawing */ +/* shige: hatch pattern (from src/win/wgraph.c) */ +static unsigned char pattern_bitmaps[][16] = { + {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}, /* no fill */ + {0xFE, 0xFE, 0x7D, 0x7D, 0xBB, 0xBB, 0xD7, 0xD7, + 0xEF, 0xEF, 0xD7, 0xD7, 0xBB, 0xBB, 0x7D, 0x7D}, /* cross-hatch (1) */ + {0x77, 0x77, 0xAA, 0xAA, 0xDD, 0xDD, 0xAA, 0xAA, + 0x77, 0x77, 0xAA, 0xAA, 0xDD, 0xDD, 0xAA, 0xAA}, /* double cross-hatch (2) */ + {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, /* solid fill (3) */ + {0x7F, 0x7F, 0xBF, 0xBF, 0xDF, 0xDF, 0xEF, 0xEF, + 0xF7, 0xF7, 0xFB, 0xFB, 0xFD, 0xFD, 0xFE, 0xFE}, /* diagonals (4) */ + {0xFE, 0xFE, 0xFD, 0xFD, 0xFB, 0xFB, 0xF7, 0xF7, + 0xEF, 0xEF, 0xDF, 0xDF, 0xBF, 0xBF, 0x7F, 0x7F}, /* diagonals (5) */ + {0x77, 0x77, 0x77, 0x77, 0xBB, 0xBB, 0xBB, 0xBB, + 0xDD, 0xDD, 0xDD, 0xDD, 0xEE, 0xEE, 0xEE, 0xEE}, /* steep diagonals (6) */ + {0xEE, 0xEE, 0xEE, 0xEE, 0xDD, 0xDD, 0xDD, 0xDD, + 0xBB, 0xBB, 0xBB, 0xBB, 0x77, 0x77, 0x77, 0x77} /* steep diagonals (7) */ +}; +#define pattern_num (sizeof(pattern_bitmaps)/(sizeof(*pattern_bitmaps))) + static void EMF_flush_polyline __PROTO((void)); static void EMF_flush_polygon __PROTO((void)); static void EMF_write_byte __PROTO((int)); @@ -758,9 +804,6 @@ /* We have old-style bare font size specified */ emf_defaultfontsize = int_expression(); } -#if (0) /* Shige May 2013 - Does not function properly until we enter graphics mode */ - EMF_set_font(NULL); /* set default font */ -#endif sprintf(term_options, "%s %s %s font \"%s,%g\"", emf_monochrome ? "monochrome" : "color", @@ -847,6 +890,9 @@ EMF_SetBkMode(1); /* transparent background for text */ EMF_CreateBrush(EMF_HANDLE_BRUSH, 1, 0, 0); /* transparent brush for polygons */ EMF_SelectObject(EMF_HANDLE_BRUSH); + + free(emf_last_fontname); /* invalidate any previous font */ + emf_last_fontname = NULL; EMF_set_font(NULL); /* init default font */ emf_color = emf_textcolor = LT_UNDEFINED; @@ -855,9 +901,6 @@ TERM_PUBLIC int EMF_set_font(const char *font) { - static float last_fontsize = -1; - static char last_fontname[256] = {'\0'}; - /* FIXME: This condition is somehow triggered by enhanced_recursion */ if (font == emf_fontname) ; @@ -875,11 +918,13 @@ } /* Skip redundant requests for the same font */ - if (!strcmp(last_fontname, emf_fontname) && last_fontsize == emf_fontsize) { + if (emf_last_fontname && !strcmp(emf_last_fontname, emf_fontname) + && emf_last_fontsize == emf_fontsize) { return TRUE; } else { - safe_strncpy(last_fontname, emf_fontname, sizeof(last_fontname)); - last_fontsize = emf_fontsize; + free(emf_last_fontname); + emf_last_fontname = gp_strdup(emf_fontname); + emf_last_fontsize = emf_fontsize; } term->h_char = 0.6 * (emf_fontsize * EMF_PT2HM * emf_fontscale); @@ -1023,13 +1068,25 @@ unsigned long color = emf_color; int fillpar = corners->style >> 4; int style = corners->style & 0xf; +#if 1 + unsigned char *pattern; +#endif switch (style) { case FS_EMPTY: /* fill with background color */ color = emf_background; break; - case FS_PATTERN: /* pattern fill implemented as partial density */ + case FS_PATTERN: + case FS_TRANSPARENT_PATTERN: +#if 1 + /* shige */ + pattern = pattern_bitmaps[fillpar % pattern_num]; + break; +#else + /* pattern fill implemented as partial density */ fillpar *= 12; + /* Fall through */ +#endif case FS_SOLID: /* solid fill */ if (fillpar >= 0 && fillpar < 100) { double density = (double)fillpar / 100.; @@ -1052,11 +1109,21 @@ EMF_SelectObject(EMF_STOCK_OBJECT_WHITE_BRUSH); EMF_DeleteObject(EMF_HANDLE_BRUSH); - EMF_CreateBrush(EMF_HANDLE_BRUSH, 0, color, 0); +#if 1 + if (style == FS_PATTERN || style == FS_TRANSPARENT_PATTERN) { + emf_textcolor = color; + EMF_SetTextColor(emf_textcolor); + EMF_CreateMonoBrush(EMF_HANDLE_BRUSH); + for (i = 15; i >= 0; i -= 2) + EMF_write_long(pattern[i] | (pattern[i-1] << 8)); + } else +#endif + EMF_CreateBrush(EMF_HANDLE_BRUSH, 0, color, 0); + EMF_SelectObject(EMF_HANDLE_BRUSH); EMF_DeleteObject(EMF_HANDLE_PEN); - EMF_CreatePen(EMF_HANDLE_PEN, emf_pentype, 0, color); + EMF_CreatePen(EMF_HANDLE_PEN, emf_pentype, emf_linewidth * EMF_PX2HM, color); EMF_SelectObject(EMF_HANDLE_PEN); EMF_CreatePolygon(points); @@ -1477,7 +1544,7 @@ EMF_CreateBrush(EMF_HANDLE_BRUSH, 1, 0, 0); /* transparent brush */ EMF_SelectObject(EMF_HANDLE_BRUSH); EMF_DeleteObject(EMF_HANDLE_PEN); - EMF_CreatePen(EMF_HANDLE_PEN, emf_pentype, 1, emf_color); + EMF_CreatePen(EMF_HANDLE_PEN, emf_pentype, emf_linewidth * EMF_PX2HM, emf_color); EMF_SelectObject(EMF_HANDLE_PEN); EMF_Ellipse((long)(x-emf_tic),(long)(y-emf_tic),(long)(x+emf_tic),(long)(y+emf_tic)); break; @@ -1489,7 +1556,7 @@ EMF_SelectObject(EMF_HANDLE_BRUSH); EMF_SelectObject(EMF_STOCK_OBJECT_BLACK_PEN); EMF_DeleteObject(EMF_HANDLE_PEN); - EMF_CreatePen(EMF_HANDLE_PEN, emf_pentype, 1, emf_color); + EMF_CreatePen(EMF_HANDLE_PEN, emf_pentype, emf_linewidth * EMF_PX2HM, emf_color); EMF_SelectObject(EMF_HANDLE_PEN); EMF_Ellipse((long)(x-emf_tic),(long)(y-emf_tic),(long)(x+emf_tic),(long)(y+emf_tic)); break; diff -Nru gnuplot-4.6.4/term/gd.trm gnuplot-4.6.5/term/gd.trm --- gnuplot-4.6.4/term/gd.trm 2012-10-15 20:35:44.000000000 +0000 +++ gnuplot-4.6.5/term/gd.trm 2013-12-11 19:19:40.000000000 +0000 @@ -1,5 +1,5 @@ /* Hello, Emacs, this is -*-C-*- - * $Id: gd.trm,v 1.163.2.4 2012/10/15 20:35:44 sfeam Exp $ + * $Id: gd.trm,v 1.163.2.5 2013/11/12 06:36:24 sfeam Exp $ * based on gif.trm,v 1.26.2.1 2000/05/01 00:17:20 joze */ @@ -1287,7 +1287,6 @@ if (colorspec->type == TC_LT) { int savetype = png_state.linetype; PNG_linetype(colorspec->lt); - /* Harmless now; will be needed if we ever support dot/dash */ png_state.linetype = savetype; } diff -Nru gnuplot-4.6.4/term/svg.trm gnuplot-4.6.5/term/svg.trm --- gnuplot-4.6.4/term/svg.trm 2013-05-30 16:57:43.000000000 +0000 +++ gnuplot-4.6.5/term/svg.trm 2014-02-05 22:58:03.000000000 +0000 @@ -1,5 +1,5 @@ /* Hello, Emacs, this is -*-C-*- - * $Id: svg.trm,v 1.128.2.15 2013/05/30 05:53:14 sfeam Exp $ + * $Id: svg.trm,v 1.128.2.16 2014/02/05 22:58:03 sfeam Exp $ */ /*------------------------------------------------------------------------------------------------------------------------------------ @@ -307,8 +307,7 @@ { if (SVG_pathIsOpen) { SVG_GroupFilledClose(); - /* FIXME: HORRIBLE KLUDGE TO WORK AROUNG BUG IN FIREFOX V3.x */ - fprintf(gpoutfile," h0.01'/>"); + fprintf(gpoutfile," '/>"); SVG_path_count = 0; SVG_pathIsOpen = FALSE; } diff -Nru gnuplot-4.6.4/term/tek.trm gnuplot-4.6.5/term/tek.trm --- gnuplot-4.6.4/term/tek.trm 2009-08-14 01:16:58.000000000 +0000 +++ gnuplot-4.6.5/term/tek.trm 2013-12-12 20:59:52.000000000 +0000 @@ -1,5 +1,5 @@ /* Hello, Emacs, this is -*-C-*- - * $Id: tek.trm,v 1.20 2009/08/14 01:16:58 sfeam Exp $ + * $Id: tek.trm,v 1.20.2.2 2013/12/12 20:59:52 sfeam Exp $ * */ @@ -40,7 +40,7 @@ * * This terminal driver supports: * tek40xx, bitgraph, kermit_color_tek40xx, kermit_mono_tek40xx, selanar - * ln03plus, xterm + * sixel, ln03plus, xterm * * AUTHORS * Colin Kelley, Thomas Williams, Russell Lang @@ -52,10 +52,57 @@ /* * Modified June 1995 Ian MacPhedran to support newterm format */ + +/* + * Modified November 2013 Erik Olofsen to support DEC's Sixel graphics, + * natively, which is more practical than using the PBM driver and piping + * through e.g. `ppmtosixel`. + * Gnuplot should be configured with `--with-bitmap-terminals`. + * The code was inserted here as XTerm now supports Tek and Sixel codes; + * for this driver to work, the Xterm terminal type should be selected as + * VT340, and `sixelScrolling` is best selected; this was tested with + * XTerm version 2.9.7. + * Under VMS, the DECW$TERMINAL may be used (set to dark text and light + * background). + * The `set terminal` options are identical to that of the PBM driver, + * but `grayscale` not available (albeit via rgb specifications). + * `pm3d` palettes are not supported. + * Filled polygons are supported; the code was inspired by public domain + * code by Darel Rex Finley. + * Line widths greater than one are plotted using filled squares. + * RGB color specifications are supported and then override the + * defaults; the linetype is then set as well and may be adjusted as e.g.: + * `plot x with lines linetype 3 linecolor rgb 'cyan'`. + * This works only with linewidth 1 and colors are stored in the slot at + * the linetype index so therefore demo `dashcolor.dem` fails. + * The default colors are according to the XTerm source: + + * VT340: + * 0: 0% 0% (bg for light on dark mode) + * 1: 14% blue + * 2: 29% red + * 3: 43% green + * 4: 57% magenta + * 5: 71% cyan + * 6: 86% yellow + * 7: 100% 50% (fg for light on dark mode) + * 8: 0% 25% + * 9: 14% gray-blue + * 10: 29% gray-red + * 11: 43% gray-green + * 12: 57% gray-magenta + * 13: 71% gray-cyan + * 14: 86% gray-yellow + * 15: 100% 75% +*/ + #define TEK #define CTEK #define VTTEK #define XTERM +#ifndef NO_BITMAP_SUPPORT +#define SIXEL +#endif /* Version 4.3: still available, but no longer built by default */ #if 0 @@ -81,6 +128,9 @@ #ifdef SELANAR register_term(selanar) #endif +#ifdef SIXEL +register_term(sixel) +#endif #ifdef BITGRAPH register_term(bitgraph) #endif @@ -114,6 +164,23 @@ TERM_PUBLIC void SEL_text __PROTO((void)); TERM_PUBLIC void SEL_reset __PROTO((void)); #endif +#ifdef SIXEL +TERM_PUBLIC void SIXEL_options __PROTO((void)); +TERM_PUBLIC void SIXEL_init __PROTO((void)); +TERM_PUBLIC void SIXEL_reset __PROTO((void)); +TERM_PUBLIC void SIXEL_text __PROTO((void)); +TERM_PUBLIC void SIXEL_setfont __PROTO((void)); +TERM_PUBLIC void SIXEL_graphics __PROTO((void)); +TERM_PUBLIC void SIXEL_move __PROTO((unsigned int x, unsigned int y)); +TERM_PUBLIC void SIXEL_vector __PROTO((unsigned int x, unsigned int y)); +TERM_PUBLIC void SIXEL_linetype __PROTO((int linetype)); +TERM_PUBLIC void SIXEL_put_text __PROTO((unsigned int x, unsigned int y, const char str[])); +TERM_PUBLIC int SIXEL_text_angle __PROTO((int)); +TERM_PUBLIC void SIXEL_fillbox __PROTO((int style, unsigned int x1, unsigned int y1, unsigned int width, unsigned int height)); +TERM_PUBLIC void SIXEL_linewidth __PROTO((double linewidth)); +TERM_PUBLIC void SIXEL_set_color __PROTO((t_colorspec *colorspec)); +TERM_PUBLIC void SIXEL_filled_polygon __PROTO((int points, gpiPoint *corners)); +#endif TERM_PUBLIC void VTTEK40init __PROTO((void)); TERM_PUBLIC void VTTEK40reset __PROTO((void)); TERM_PUBLIC void VTTEK40linetype __PROTO((int linetype)); @@ -424,6 +491,507 @@ #endif /* SELANAR */ +#ifdef SIXEL + +#include "bitmap.h" + +#define SIXEL_XMAX (640) +#define SIXEL_YMAX (480) +#define SIXEL_VCHAR (FNT5X9_VCHAR) +#define SIXEL_HCHAR (FNT5X9_HCHAR) +#define SIXEL_VTIC (FNT5X9_HBITS) +#define SIXEL_HTIC (FNT5X9_HBITS) + +static int SIXEL_mode; +static int SIXEL_font; +static int SIXEL_lt; +static double SIXEL_lw; +static unsigned int SIXEL_xp, SIXEL_yp; + +struct SIXEL_colorspec { + int spcfd, /* when overridden with `rgb` as line color */ + r, g, b; +}; + +#define SIXEL_NCOL (16) +static struct SIXEL_colorspec SIXEL_palette[SIXEL_NCOL]; + +/* Only needed for dubious backwards compatibility with 'set size' + * in pre-4.2 versions that didn't support 'set term size' + */ +static TBOOLEAN SIXEL_explicit_size = FALSE; + +enum SIXEL_id { + SIXEL_SMALL, SIXEL_MEDIUM, SIXEL_LARGE, + SIXEL_MONOCHROME, SIXEL_COLOR, SIXEL_SIZE, + SIXEL_OTHER +}; + +static struct gen_table SIXEL_opts[] = +{ + { "s$mall", SIXEL_SMALL }, + { "me$dium", SIXEL_MEDIUM }, + { "l$arge", SIXEL_LARGE }, + { "mo$nochrome", SIXEL_MONOCHROME }, + { "c$olor", SIXEL_COLOR }, + { "c$olour", SIXEL_COLOR }, + { "size", SIXEL_SIZE }, + { NULL, SIXEL_OTHER } +}; + +TERM_PUBLIC void +SIXEL_options() +{ + int xpixels = SIXEL_XMAX; + int ypixels = SIXEL_YMAX; + struct value a; + SIXEL_font = 1; + SIXEL_mode = 1; + + term_options[0] = NUL; + + while (!END_OF_COMMAND) { + switch(lookup_table(&SIXEL_opts[0],c_token)) { + case SIXEL_SMALL: + SIXEL_font = 1; + c_token++; + break; + case SIXEL_MEDIUM: + SIXEL_font = 2; + c_token++; + break; + case SIXEL_LARGE: + SIXEL_font = 3; + c_token++; + break; + case SIXEL_MONOCHROME: + SIXEL_mode = 0; + term->flags |= TERM_MONOCHROME; + c_token++; + break; + case SIXEL_COLOR: + SIXEL_mode = 1; + term->flags &= ~TERM_MONOCHROME; + c_token++; + break; + case SIXEL_SIZE: + c_token++; + if (END_OF_COMMAND) { + term->xmax = SIXEL_XMAX; + term->ymax = SIXEL_YMAX; + SIXEL_explicit_size = FALSE; + } else { + xpixels = real(const_express(&a)); + if (equals(c_token, ",")) { + c_token++; + ypixels = real(const_express(&a)); + ypixels = (ypixels/6)*6; /* multiple of six */ + } + SIXEL_explicit_size = TRUE; + } + if (xpixels > 0) + term->xmax = xpixels; + if (ypixels > 0) + term->ymax = ypixels; + break; + case SIXEL_OTHER: + default: + /* reset to default, since term is already set */ + SIXEL_font = 1; + SIXEL_mode = 0; + int_error(c_token, "expecting: {small, medium, large}, {monochrome, color}, and {size x,y}"); + break; + } + } + + term->v_tic = (term->xmax < term->ymax) ? term->xmax/100 : term->ymax/100; + if (term->v_tic < 1) + term->v_tic = 1; + term->h_tic = term->v_tic; + + /* setup options string */ + + switch (SIXEL_font) { + case 1: + strcat(term_options, "small"); + break; + case 2: + strcat(term_options, "medium"); + break; + case 3: + strcat(term_options, "large"); + break; + } + + switch (SIXEL_mode) { + case 0: + strcat(term_options, " monochrome"); + break; + case 1: + strcat(term_options, " color"); + break; + } + + if (SIXEL_explicit_size) + sprintf(term_options + strlen(term_options), " size %d,%d", + term->xmax, term->ymax); +} + + +TERM_PUBLIC void +SIXEL_init() +{ + unsigned int xpixels = term->xmax; + unsigned int ypixels = term->ymax; + + /* 'set size' should not affect the size of the canvas in pixels, + * but versions prior to 4.2 did not have a separate 'set term size' + */ + if (!SIXEL_explicit_size) { + xpixels *= xsize; + ypixels *= ysize; + } + + b_makebitmap(xpixels, ypixels, SIXEL_NCOL); + + if (SIXEL_mode != 0) + b_setlinetype(0); /* solid lines */ + + SIXEL_setfont(); +} + + +TERM_PUBLIC void +SIXEL_reset() +{ + b_freebitmap(); +} + + +TERM_PUBLIC void +SIXEL_text() +{ + int i, j, k, l, ic, n, pr; + char c, pc; + +/* initialization to Sixel mode and pixel aspect ratio, + but do not change the background */ + + fprintf(gpoutfile,"\033Pq\"1;1\n"); + +/* output the specified rgb colors */ + + for (k=0; k=0; j-=6) { + for (k=1; k<=SIXEL_NCOL; k++) { + pr = 0; + pc = '\0'; + n = 0; + for (i=0; i0 && pr==0) { + pr++; + if (n3) { + fprintf(gpoutfile,"!%d%c",n,pc); + } else { + for (l=1; l<=n; l++) fputc(pc,gpoutfile); + } + if (i==b_xsize-1 && c!=pc) fputc(c,gpoutfile); + } + n = 1; + } + pc = c; + } + if (k==SIXEL_NCOL) { + fputs("-\n",gpoutfile); + } else if (pr==2) { + fputs("$\n",gpoutfile); + } + } + } + +/* get out of Sixel mode */ + + fputs("\033\\\n",gpoutfile); + + (void) fflush(gpoutfile); /* finish the graphics */ +} + + +TERM_PUBLIC void +SIXEL_setfont() +{ + switch (SIXEL_font) { + case 1: + b_charsize(FNT5X9); + term->v_char = FNT5X9_VCHAR; + term->h_char = FNT5X9_HCHAR; + break; + case 2: + b_charsize(FNT9X17); + term->v_char = FNT9X17_VCHAR; + term->h_char = FNT9X17_HCHAR; + break; + case 3: + b_charsize(FNT13X25); + term->v_char = FNT13X25_VCHAR; + term->h_char = FNT13X25_HCHAR; + break; + } +} + + +TERM_PUBLIC void +SIXEL_graphics() +{ + int i; + + b_boxfill(FS_EMPTY,0,0,b_xsize,b_ysize); + for (i=0; i x1) + xinc = 1; + else if (x2 == x1) + xinc = 0; + else + xinc = -1; + dy = abs((int) (y1) - (int) (y2)); + if (y2 > y1) + yinc = 1; + else if (y2 == y1) + yinc = 0; + else + yinc = -1; + xplot = x1; + yplot = y1; + if (dx > dy) { + /* iterate x */ + while (xplot != x2) { + xplot += xinc; + runcount += dy; + if (runcount >= (dx - runcount)) { + yplot += yinc; + runcount -= dx; + } + for (i=1; i<=wh; i++) { + b_move(xplot-wh2, yplot-wh2+i); + b_vector(xplot-wh2+wh, yplot-wh2+i); + } + } + } else { + /* iterate y */ + while (yplot != y2) { + yplot += yinc; + runcount += dx; + if (runcount >= (dy - runcount)) { + xplot += xinc; + runcount -= dy; + } + for (i=1; i<=wh; i++) { + b_move(xplot-wh2, yplot-wh2+i); + b_vector(xplot-wh2+wh, yplot-wh2+i); + } + } + } + + SIXEL_xp = x; + SIXEL_yp = y; +} + + +TERM_PUBLIC void +SIXEL_linetype(int linetype) +{ + int tp; + + tp = linetype; + + if (SIXEL_mode==0) { + b_setlinetype(linetype); + } else { + if (tp < 0) { + if (tp==-1) b_setlinetype(1); + b_setvalue(1); + } else { + tp = 1 + linetype%(SIXEL_NCOL-1); + b_setvalue(1+tp); + b_setlinetype(0); + } + } + + SIXEL_lt = linetype; +} + + +TERM_PUBLIC void +SIXEL_put_text(unsigned int x, unsigned int y, const char str[]) +{ + b_put_text(x,y,str); +} + + +TERM_PUBLIC int +SIXEL_text_angle(int ang) +{ + b_text_angle(ang); + return TRUE; +} + + +TERM_PUBLIC void +SIXEL_fillbox(int style, unsigned int x1, unsigned int y1, unsigned int width, unsigned int height) +{ + b_boxfill(style,x1,y1,width,height); +} + + +TERM_PUBLIC void +SIXEL_linewidth(double linewidth) +{ + SIXEL_lw = linewidth; +} + + +TERM_PUBLIC void +SIXEL_set_color(t_colorspec *colorspec) +{ + int tp; + + b_setlinetype(0); + + switch (colorspec->type) { + case TC_LT : tp = colorspec->lt; break; + case TC_RGB : tp = SIXEL_lt; break; + default : return; + } + + + if (tp == -1) { + b_setlinetype(1); + b_setvalue(1); + return; + } + + if (tp < 0) { + tp = colorspec->type==TC_RGB ? SIXEL_NCOL+1+tp : 0; + } else { + tp = 1 + tp%(SIXEL_NCOL-1); + } + + if (colorspec->type == TC_RGB) { + SIXEL_palette[tp].spcfd = 1; + SIXEL_palette[tp].r = (int) (((colorspec->lt & 0xff0000) >> 16) * 100./255.); + SIXEL_palette[tp].g = (int) (((colorspec->lt & 0x00ff00) >> 8) * 100./255.); + SIXEL_palette[tp].b = (int) ((colorspec->lt & 0x0000ff) * 100./255.); + if (SIXEL_lt >= 0) b_setlinetype(SIXEL_lt); /* to have the possibility of both linetype and linecolor */ + } + + b_setvalue(1+tp); +} + + +TERM_PUBLIC void +SIXEL_filled_polygon(int points, gpiPoint *corners) +{ + int nodes, *nodex, py, i, j, swap; + + b_setlinetype(0); + + nodex = (int *) malloc(sizeof(int)*points); + + for (py=0; py=py) || + (corners[j].y=py)) { + nodex[nodes++] = (int) ((corners[i].x + (double)(py - corners[i].y) / + (double)(corners[j].y - corners[i].y) * + (corners[j].x - corners[i].x)) + 0.5); + } + j = i; + } + + i = 0; + while (i < nodes-1) { + if (nodex[i] > nodex[i+1]) { + swap=nodex[i]; nodex[i]=nodex[i+1]; nodex[i+1]=swap; + if (i) i--; + } else { + i++; + } + } + + for (i=0; i} {} {size ,}", +"", +" The `sixel` output format was originally used by DEC terminals and printers.", +" For use with xterm emulation, xterm must be compiled/configured with", +" \"--enable-sixel-graphics\" and started with \"-ti 340\" on the command line.", +" Furthermore, the menu option \"sixelScrolling\" should be checked;", +" foreground black and background white.", +#endif #ifdef BITGRAPH "?commands set terminal bitgraph", "?set terminal bitgraph", diff -Nru gnuplot-4.6.4/term/win.trm gnuplot-4.6.5/term/win.trm --- gnuplot-4.6.4/term/win.trm 2013-06-18 19:37:43.000000000 +0000 +++ gnuplot-4.6.5/term/win.trm 2013-12-30 01:32:24.000000000 +0000 @@ -1,5 +1,5 @@ /* Hello, Emacs, this is -*-C-*- - * $Id: win.trm,v 1.107.2.3 2013/06/07 18:32:49 markisch Exp $ + * $Id: win.trm,v 1.107.2.4 2013/12/29 19:50:27 markisch Exp $ */ /* GNUPLOT - win.trm */ @@ -769,8 +769,8 @@ (corners[2].x == corners[3].x) && (corners[2].y == corners[1].y)))) { /* The polygon describes a rectangle. Thus we use boxfill, which is more efficient. */ - GraphOp(graphwin, W_move, corners[0].x, corners[0].y, NULL); - GraphOp(graphwin, W_boxfill, corners[2].x, corners[2].y, NULL); + GraphOp(graphwin, W_move, GPMIN(corners[0].x, corners[2].x), GPMIN(corners[0].y, corners[2].y), NULL); + GraphOp(graphwin, W_boxfill, GPMAX(corners[0].x, corners[2].x), GPMAX(corners[0].y, corners[2].y), NULL); } else { int i; for (i = 0; i < points; i++) diff -Nru gnuplot-4.6.4/win/gnuplot.iss gnuplot-4.6.5/win/gnuplot.iss --- gnuplot-4.6.4/win/gnuplot.iss 2013-04-19 18:21:46.000000000 +0000 +++ gnuplot-4.6.5/win/gnuplot.iss 2014-01-12 23:34:12.000000000 +0000 @@ -1,5 +1,5 @@ ; -; $Id: gnuplot.iss,v 1.2.2.9 2013/04/12 16:33:14 markisch Exp $ +; $Id: gnuplot.iss,v 1.2.2.11 2014/01/11 08:45:29 markisch Exp $ ; ; GNUPLOT - gnuplot.iss ; @@ -39,12 +39,12 @@ #define MyAppName "gnuplot" #define MyAppVersionShort "4.6" -#define MyAppVersion "4.6.3" -#define MyAppNumVersion "4.6.3" +#define MyAppVersion "4.6.5" +#define MyAppNumVersion "4.6.5" #define MyAppPublisher "gnuplot development team" #define MyAppURL "http://www.gnuplot.info/" #define MyAppExeName "wgnuplot.exe" -#define MyInstallerName "gp463-win32-setup" +#define MyInstallerName "gp465-win32-setup" [Setup] ; NOTE: The value of AppId uniquely identifies this application. @@ -71,7 +71,7 @@ SetupIconFile=bin\grpicon.ico Compression=lzma2/Max SolidCompression=true -MinVersion=,5.0.2195 +MinVersion=0,5.01 Uninstallable=true ChangesEnvironment=true PrivilegesRequired=admin diff -Nru gnuplot-4.6.4/win/README-Windows-ja.txt gnuplot-4.6.5/win/README-Windows-ja.txt --- gnuplot-4.6.4/win/README-Windows-ja.txt 2013-04-19 18:21:46.000000000 +0000 +++ gnuplot-4.6.5/win/README-Windows-ja.txt 2013-12-31 18:43:49.000000000 +0000 @@ -1,7 +1,7 @@ -# $Id: README-Windows-ja.txt,v 1.1.2.5 2013/04/12 16:33:14 markisch Exp $ +# $Id: README-Windows-ja.txt,v 1.1.2.6 2013/12/31 10:06:47 markisch Exp $ # README.Windows (installer t) ̖ -gnuplot o[W 4.6 pb`x 3 -- Windows poCizt +gnuplot o[W 4.6 pb`x 5 -- Windows poCizt ======================================================================= gnuplot ́AR}h͕̑Θb@\̃Ot[eBeBŁALinux, diff -Nru gnuplot-4.6.4/win/README-Windows.txt gnuplot-4.6.5/win/README-Windows.txt --- gnuplot-4.6.4/win/README-Windows.txt 2013-04-19 18:21:46.000000000 +0000 +++ gnuplot-4.6.5/win/README-Windows.txt 2013-12-31 18:43:49.000000000 +0000 @@ -1,4 +1,4 @@ -This is gnuplot version 4.6 patchlevel 3 -- binary distribution for Windows +This is gnuplot version 4.6 patchlevel 5 -- binary distribution for Windows =========================================================================== gnuplot is a command-line driven interactive function plotting utility @@ -47,16 +47,20 @@ gnuplot binaries ---------------- -* wgnuplot.exe: The default gnuplot executable. +* wgnuplot.exe: The default gnuplot executable. -* gnuplot.exe: Text (console) mode version of the gnuplot executable with full +* gnuplot.exe: Text (console) mode version of the gnuplot executable with full pipe functionality as it is common on other platforms. In contrast to wgnuplot.exe, this program can also accept commands on stdin (standard input) and print messages on stdout (standard output). It replaces pgnuplot.exe and is recommended to be used with 3rd party applications using gnuplot as graph engine, like e.g. Octave (www.octave.org). -* pgnuplot.exe: This program will accept commands on stdin (standard input), +* wgnuplot_pipes.exe: A variant of wgnuplot.exe with the added capability to + use piping in gnuplot commands. The drawback is that it opens an additional + console window or keeps attached to the console window it was launched from. + +* pgnuplot.exe: This program will accept commands on stdin (standard input), and pipe them to an active (or newly created) wgnuplot.exe text window. Command line options are passed on to wgnuplot. Effectively, this means `pgnuplot' is an almost complete substitute for @@ -199,4 +203,4 @@ -------------------------------------------------------------------------------- -The gnuplot team, September 2012 +The gnuplot team, December 2013