]> henry.ined.fr Git - .git/commitdiff
*** empty log message ***
authorN. Brouard <brouard@ined.fr>
Tue, 18 Aug 2015 23:23:08 +0000 (23:23 +0000)
committerN. Brouard <brouard@ined.fr>
Tue, 18 Aug 2015 23:23:08 +0000 (23:23 +0000)
35 files changed:
CMakeLists.txt
distributions/windows/gnuplot_bin/windows-265/bin/freetype6.dll [new file with mode: 0755]
distributions/windows/gnuplot_bin/windows-265/bin/intl.dll [new file with mode: 0755]
distributions/windows/gnuplot_bin/windows-265/bin/libcaca-0.dll [new file with mode: 0755]
distributions/windows/gnuplot_bin/windows-265/bin/libcairo-2.dll [new file with mode: 0755]
distributions/windows/gnuplot_bin/windows-265/bin/libexpat-1.dll [new file with mode: 0755]
distributions/windows/gnuplot_bin/windows-265/bin/libfontconfig-1.dll [new file with mode: 0755]
distributions/windows/gnuplot_bin/windows-265/bin/libgcc_s_dw2-1.dll [new file with mode: 0755]
distributions/windows/gnuplot_bin/windows-265/bin/libgd-3.dll [new file with mode: 0755]
distributions/windows/gnuplot_bin/windows-265/bin/libglib-2.0-0.dll [new file with mode: 0755]
distributions/windows/gnuplot_bin/windows-265/bin/libgmodule-2.0-0.dll [new file with mode: 0755]
distributions/windows/gnuplot_bin/windows-265/bin/libgobject-2.0-0.dll [new file with mode: 0755]
distributions/windows/gnuplot_bin/windows-265/bin/libgthread-2.0-0.dll [new file with mode: 0755]
distributions/windows/gnuplot_bin/windows-265/bin/libiconv-2.dll [new file with mode: 0755]
distributions/windows/gnuplot_bin/windows-265/bin/libjpeg-62.dll [new file with mode: 0755]
distributions/windows/gnuplot_bin/windows-265/bin/libpango-1.0-0.dll [new file with mode: 0755]
distributions/windows/gnuplot_bin/windows-265/bin/libpangocairo-1.0-0.dll [new file with mode: 0755]
distributions/windows/gnuplot_bin/windows-265/bin/libpangoft2-1.0-0.dll [new file with mode: 0755]
distributions/windows/gnuplot_bin/windows-265/bin/libpangowin32-1.0-0.dll [new file with mode: 0755]
distributions/windows/gnuplot_bin/windows-265/bin/libpng14-14.dll [new file with mode: 0755]
distributions/windows/gnuplot_bin/windows-265/bin/libstdc++-6.dll [new file with mode: 0755]
distributions/windows/gnuplot_bin/windows-265/bin/lua52.dll [new file with mode: 0755]
distributions/windows/gnuplot_bin/windows-265/bin/wgnuplot-ja.chm [new file with mode: 0644]
distributions/windows/gnuplot_bin/windows-265/bin/wgnuplot-ja.mnu [new file with mode: 0644]
distributions/windows/gnuplot_bin/windows-265/bin/wgnuplot.chm [new file with mode: 0644]
distributions/windows/gnuplot_bin/windows-265/bin/wgnuplot.mnu [new file with mode: 0644]
distributions/windows/gnuplot_bin/windows-265/bin/wxbase28u_gcc_custom.dll [new file with mode: 0755]
distributions/windows/gnuplot_bin/windows-265/bin/wxmsw28u_core_gcc_custom.dll [new file with mode: 0755]
distributions/windows/gnuplot_bin/windows-265/bin/zlib1.dll [new file with mode: 0755]
distributions/windows/mybuildicl32.bat [new file with mode: 0644]
distributions/windows/mybuildicl64.bat [new file with mode: 0644]
src/Makefile
src/setup.iss
src/setup.iss.in
version.h.in

index e8433311d8047e5bcbf0544d19561dd2646ea4d5..992fd88eacabc11e409d42ab619b01d31a5ce1e4 100644 (file)
@@ -21,7 +21,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.11)
 
 CONFIGURE_FILE(
   "${PROJECT_SOURCE_DIR}/version.h.in"
-  "${PROJECT_BINARY_DIR}/version.h"
+  "${PROJECT_SOURCE_DIR}/src/version.h"
   )
 CONFIGURE_FILE(
   "${PROJECT_SOURCE_DIR}/config.h.in"
@@ -48,6 +48,7 @@ if(UNIX)
   set(ICONDIR "${CMAKE_INSTALL_PREFIX}/share/icons")
 endif()
 if(MSVC)
+  set(DOCDIR "${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}/doc")
   set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /MTd")
   set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /MT")
   set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /MTd")
diff --git a/distributions/windows/gnuplot_bin/windows-265/bin/freetype6.dll b/distributions/windows/gnuplot_bin/windows-265/bin/freetype6.dll
new file mode 100755 (executable)
index 0000000..b9c3ab5
Binary files /dev/null and b/distributions/windows/gnuplot_bin/windows-265/bin/freetype6.dll differ
diff --git a/distributions/windows/gnuplot_bin/windows-265/bin/intl.dll b/distributions/windows/gnuplot_bin/windows-265/bin/intl.dll
new file mode 100755 (executable)
index 0000000..c3261a8
Binary files /dev/null and b/distributions/windows/gnuplot_bin/windows-265/bin/intl.dll differ
diff --git a/distributions/windows/gnuplot_bin/windows-265/bin/libcaca-0.dll b/distributions/windows/gnuplot_bin/windows-265/bin/libcaca-0.dll
new file mode 100755 (executable)
index 0000000..fe09c82
Binary files /dev/null and b/distributions/windows/gnuplot_bin/windows-265/bin/libcaca-0.dll differ
diff --git a/distributions/windows/gnuplot_bin/windows-265/bin/libcairo-2.dll b/distributions/windows/gnuplot_bin/windows-265/bin/libcairo-2.dll
new file mode 100755 (executable)
index 0000000..b304e5e
Binary files /dev/null and b/distributions/windows/gnuplot_bin/windows-265/bin/libcairo-2.dll differ
diff --git a/distributions/windows/gnuplot_bin/windows-265/bin/libexpat-1.dll b/distributions/windows/gnuplot_bin/windows-265/bin/libexpat-1.dll
new file mode 100755 (executable)
index 0000000..92836aa
Binary files /dev/null and b/distributions/windows/gnuplot_bin/windows-265/bin/libexpat-1.dll differ
diff --git a/distributions/windows/gnuplot_bin/windows-265/bin/libfontconfig-1.dll b/distributions/windows/gnuplot_bin/windows-265/bin/libfontconfig-1.dll
new file mode 100755 (executable)
index 0000000..7b70d14
Binary files /dev/null and b/distributions/windows/gnuplot_bin/windows-265/bin/libfontconfig-1.dll differ
diff --git a/distributions/windows/gnuplot_bin/windows-265/bin/libgcc_s_dw2-1.dll b/distributions/windows/gnuplot_bin/windows-265/bin/libgcc_s_dw2-1.dll
new file mode 100755 (executable)
index 0000000..1f4c0ca
Binary files /dev/null and b/distributions/windows/gnuplot_bin/windows-265/bin/libgcc_s_dw2-1.dll differ
diff --git a/distributions/windows/gnuplot_bin/windows-265/bin/libgd-3.dll b/distributions/windows/gnuplot_bin/windows-265/bin/libgd-3.dll
new file mode 100755 (executable)
index 0000000..516ead6
Binary files /dev/null and b/distributions/windows/gnuplot_bin/windows-265/bin/libgd-3.dll differ
diff --git a/distributions/windows/gnuplot_bin/windows-265/bin/libglib-2.0-0.dll b/distributions/windows/gnuplot_bin/windows-265/bin/libglib-2.0-0.dll
new file mode 100755 (executable)
index 0000000..9b2b38f
Binary files /dev/null and b/distributions/windows/gnuplot_bin/windows-265/bin/libglib-2.0-0.dll differ
diff --git a/distributions/windows/gnuplot_bin/windows-265/bin/libgmodule-2.0-0.dll b/distributions/windows/gnuplot_bin/windows-265/bin/libgmodule-2.0-0.dll
new file mode 100755 (executable)
index 0000000..f55b4da
Binary files /dev/null and b/distributions/windows/gnuplot_bin/windows-265/bin/libgmodule-2.0-0.dll differ
diff --git a/distributions/windows/gnuplot_bin/windows-265/bin/libgobject-2.0-0.dll b/distributions/windows/gnuplot_bin/windows-265/bin/libgobject-2.0-0.dll
new file mode 100755 (executable)
index 0000000..6198fa3
Binary files /dev/null and b/distributions/windows/gnuplot_bin/windows-265/bin/libgobject-2.0-0.dll differ
diff --git a/distributions/windows/gnuplot_bin/windows-265/bin/libgthread-2.0-0.dll b/distributions/windows/gnuplot_bin/windows-265/bin/libgthread-2.0-0.dll
new file mode 100755 (executable)
index 0000000..9e1d5a4
Binary files /dev/null and b/distributions/windows/gnuplot_bin/windows-265/bin/libgthread-2.0-0.dll differ
diff --git a/distributions/windows/gnuplot_bin/windows-265/bin/libiconv-2.dll b/distributions/windows/gnuplot_bin/windows-265/bin/libiconv-2.dll
new file mode 100755 (executable)
index 0000000..db88a8d
Binary files /dev/null and b/distributions/windows/gnuplot_bin/windows-265/bin/libiconv-2.dll differ
diff --git a/distributions/windows/gnuplot_bin/windows-265/bin/libjpeg-62.dll b/distributions/windows/gnuplot_bin/windows-265/bin/libjpeg-62.dll
new file mode 100755 (executable)
index 0000000..2ec5039
Binary files /dev/null and b/distributions/windows/gnuplot_bin/windows-265/bin/libjpeg-62.dll differ
diff --git a/distributions/windows/gnuplot_bin/windows-265/bin/libpango-1.0-0.dll b/distributions/windows/gnuplot_bin/windows-265/bin/libpango-1.0-0.dll
new file mode 100755 (executable)
index 0000000..8659e2c
Binary files /dev/null and b/distributions/windows/gnuplot_bin/windows-265/bin/libpango-1.0-0.dll differ
diff --git a/distributions/windows/gnuplot_bin/windows-265/bin/libpangocairo-1.0-0.dll b/distributions/windows/gnuplot_bin/windows-265/bin/libpangocairo-1.0-0.dll
new file mode 100755 (executable)
index 0000000..2804528
Binary files /dev/null and b/distributions/windows/gnuplot_bin/windows-265/bin/libpangocairo-1.0-0.dll differ
diff --git a/distributions/windows/gnuplot_bin/windows-265/bin/libpangoft2-1.0-0.dll b/distributions/windows/gnuplot_bin/windows-265/bin/libpangoft2-1.0-0.dll
new file mode 100755 (executable)
index 0000000..7de80e0
Binary files /dev/null and b/distributions/windows/gnuplot_bin/windows-265/bin/libpangoft2-1.0-0.dll differ
diff --git a/distributions/windows/gnuplot_bin/windows-265/bin/libpangowin32-1.0-0.dll b/distributions/windows/gnuplot_bin/windows-265/bin/libpangowin32-1.0-0.dll
new file mode 100755 (executable)
index 0000000..7ffc552
Binary files /dev/null and b/distributions/windows/gnuplot_bin/windows-265/bin/libpangowin32-1.0-0.dll differ
diff --git a/distributions/windows/gnuplot_bin/windows-265/bin/libpng14-14.dll b/distributions/windows/gnuplot_bin/windows-265/bin/libpng14-14.dll
new file mode 100755 (executable)
index 0000000..91c5bc2
Binary files /dev/null and b/distributions/windows/gnuplot_bin/windows-265/bin/libpng14-14.dll differ
diff --git a/distributions/windows/gnuplot_bin/windows-265/bin/libstdc++-6.dll b/distributions/windows/gnuplot_bin/windows-265/bin/libstdc++-6.dll
new file mode 100755 (executable)
index 0000000..29f0cb0
Binary files /dev/null and b/distributions/windows/gnuplot_bin/windows-265/bin/libstdc++-6.dll differ
diff --git a/distributions/windows/gnuplot_bin/windows-265/bin/lua52.dll b/distributions/windows/gnuplot_bin/windows-265/bin/lua52.dll
new file mode 100755 (executable)
index 0000000..d3ea862
Binary files /dev/null and b/distributions/windows/gnuplot_bin/windows-265/bin/lua52.dll differ
diff --git a/distributions/windows/gnuplot_bin/windows-265/bin/wgnuplot-ja.chm b/distributions/windows/gnuplot_bin/windows-265/bin/wgnuplot-ja.chm
new file mode 100644 (file)
index 0000000..6f4006d
Binary files /dev/null and b/distributions/windows/gnuplot_bin/windows-265/bin/wgnuplot-ja.chm differ
diff --git a/distributions/windows/gnuplot_bin/windows-265/bin/wgnuplot-ja.mnu b/distributions/windows/gnuplot_bin/windows-265/bin/wgnuplot-ja.mnu
new file mode 100644 (file)
index 0000000..70fd63d
--- /dev/null
@@ -0,0 +1,755 @@
+; Menu file for Windows gnuplot\r
+; Roger Hadgraft, 26-5-92\r
+; Russell Lang, 30 Nov 1992\r
+; Modified for 4.0, John Bollinger, 31 Dec 2002\r
+; translated by Masahito Yamaga (ma@yama-ga.com) (for 3.7.2)\r
+; translated by Shigeharu TAKENO 03/25 2006 (for 4.1)\r
+; $Id$\r
+\r
+[Menu]\r
+\83t\83@\83C\83\8b(&F)\r
+       \8aJ\82­(&O) ...\r
+               load '[OPEN]load[EOS]*.plt[EOS]'{ENTER}\r
+       \95Û\91¶(&S) ...\r
+               save '[SAVE]save[EOS]*.plt[EOS]'{ENTER}\r
+       \83f\83\82(&D) ...\r
+               load '[OPEN]load[EOS]*.dem[EOS]'{ENTER}\r
+       --\r
+       \83f\83B\83\8c\83N\83g\83\8a\82Ì\88Ú\93®(&C) ...\r
+               cd '[DIRECTORY]New directory?[EOS]'{ENTER}\r
+       \8c»\8dÝ\82Ì\83f\83B\83\8c\83N\83g\83\8a(&D)\r
+               pwd{ENTER}\r
+       --\r
+       \8fo\97Í\90æ\82Ì\90Ý\92è(&U) ...\r
+               set output "[INPUT]Output filename?[EOS]"{ENTER}\r
+       \83v\83\8a\83\93\83^\82Ö(&P)\r
+               set output "PRN"{ENTER}\r
+       \83E\83B\83\93\83h\83E\95\\8e¦(&W)\r
+               set output{ENTER}set terminal win{ENTER} \r
+       \8c»\8dÝ\82Ì\8fo\97Í\90æ\r
+               show output{ENTER}\r
+       \8fo\97Í\83f\83o\83C\83X\82Ì\90Ý\92è(&T) ...\r
+               set terminal [INPUT]Terminal type?{ENTER}\r
+       \8fo\97Í\83f\83o\83C\83X\82Ì\95\\8e¦\r
+               set terminal{ENTER}show terminal{ENTER}\r
+       --\r
+       [Menu]\r
+       \8ds\95Ò\8fW\r
+               \91O\82É\8eÀ\8ds\82µ\82½\83R\83}\83\93\83h    ^P\r
+                       {^P}\r
+               \8e\9f\82É\8eÀ\8ds\82µ\82½\83R\83}\83\93\83h    ^N\r
+                       {^N}\r
+               --\r
+               \88ê\95\8e\9a\96ß\82é      ^B\r
+                       {^B}\r
+               \88ê\95\8e\9a\90i\82Þ      ^F\r
+                       {^F}\r
+               --\r
+               \8ds\93ª\82Ö\88Ú\93®      ^A\r
+                       {^A}\r
+               \8ds\96\96\82Ö\88Ú\93®      ^E\r
+                       {^E}\r
+               --\r
+               \83J\81[\83\\83\8b\82Ì\91O\82Ì\88ê\95\8e\9a\82ð\8dí\8f\9c      ^H\r
+                       {^H}\r
+               \83J\81[\83\\83\8b\8fã\82Ì\88ê\95\8e\9a\8dí\8f\9c  ^D\r
+                       {^D}\r
+               \83J\81[\83\\83\8b\82Ì\91O\82Ì\88ê\8cê\82ð\8dí\8f\9c        ^W\r
+                       {^W}\r
+               \83J\81[\83\\83\8b\88È\8d~\82ð\82·\82×\82Ä\8dí\8f\9c        ^K\r
+                       {^K}\r
+               \8ds\82ð\82·\82×\82Ä\8dí\8f\9c  ^U\r
+                       {^U}\r
+               --\r
+               \8ds\82ð\8dÄ\95\\8e¦      ^L\r
+                       {^L}\r
+               [EndMenu]\r
+               DOS \91\8b\82ð\8aJ\82­\r
+                       shell{ENTER}\r
+               DOS \82Ì\83R\83}\83\93\83h\82ð\8eÀ\8ds ...\r
+                       ![INPUT]DOS command?{ENTER}\r
+               --\r
+               \8fI\97¹(&X)\r
+               quit{ENTER}\r
+[EndMenu]\r
+\r
+[Menu]\r
+\83v\83\8d\83b\83g(&P)\r
+       \83v\83\8d\83b\83g (plot)\r
+               plot \r
+       3\8e\9f\8c³\83v\83\8d\83b\83g (splot)\r
+               splot \r
+       \8dÄ\83v\83\8d\83b\83g (replot)\r
+               replot{ENTER}\r
+       \83f\83o\83C\83X\82ð\83N\83\8a\83A (clear)\r
+               clear{ENTER}\r
+       --\r
+       \94Í\88Í\8ew\92è\r
+               [[INPUT]Lower bound?[EOS]:[INPUT]Upper bound?[EOS]] [EOS]\r
+       \93Á\92è\82Ì\95Ï\90\94\82Ì\94Í\88Í\8ew\92è\r
+               [[INPUT]Variable name?[EOS]=[INPUT]Lower bound?[EOS]:[INPUT]Upper bound?[EOS]] [EOS]\r
+       --\r
+       \83f\81[\83^\83t\83@\83C\83\8b\96¼ ...\r
+               '[OPEN]Open[EOS]*.dat[EOS]' [EOS]\r
+       x,y \82Æ\82µ\82Ä\8eg\82¤\97ñ\r
+               using [INPUT]X column?[EOS]:[INPUT]Y column?[EOS] [EOS]\r
+       x,y,ydelta \82Æ\82µ\82Ä\8eg\82¤\97ñ\r
+               using [INPUT]X column?[EOS]:[INPUT]Y column?[EOS]:[INPUT]Ydelta column?[EOS] [EOS]\r
+       x,y,ylow,yhigh \82Æ\82µ\82Ä\8eg\82¤\97ñ\r
+               using [INPUT]X column?[EOS]:[INPUT]Y column?[EOS]:[INPUT]Ylow column?[EOS]:[INPUT]Yhigh column?[EOS] [EOS]\r
+       --\r
+       [Menu]\r
+       \83X\83^\83C\83\8b (\92P\88ê)\r
+               \90ü (Lines)\r
+                       with lines\r
+               \83|\83C\83\93\83g (Points)\r
+                       with points\r
+               \90ü\82Æ\83|\83C\83\93\83g (Lines and Points)\r
+                       with linespoints\r
+               \90\82\90ü (Impulses)\r
+                       with impulses\r
+               \83h\83b\83g (Dots)\r
+                       with dots\r
+               \83X\83e\83b\83v (Steps)\r
+                       with steps\r
+               \8e\9f\82Ì\8d\82\82³\82Ì\83X\83e\83b\83v (Fsteps)\r
+                       with fsteps\r
+               \83q\83X\83g\83O\83\89\83\80\83X\83e\83b\83v (Histeps)\r
+                       with histeps\r
+       [EndMenu]\r
+       [Menu]\r
+       \83X\83^\83C\83\8b (\95¡\8d\87)\r
+               \83G\83\89\81[\83o\81[ (Error Bars)\r
+                       with errorbars\r
+               X \83G\83\89\81[\83o\81[\r
+                       with xerrorbars\r
+               Y \83G\83\89\81[\83o\81[\r
+                       with yerrorbars\r
+               XY \83G\83\89\81[\83o\81[\r
+                       with xyerrorbars\r
+               \83G\83\89\81[\83\89\83C\83\93 (Error Lines)\r
+                       with errorlines\r
+               X \83G\83\89\81[\83\89\83C\83\93\r
+                       with xerrorlines\r
+               Y \83G\83\89\81[\83\89\83C\83\93\r
+                       with yerrorlines\r
+               XY \83G\83\89\81[\83\89\83C\83\93\r
+                       with xyerrorlines\r
+               \8bé\8c` (Boxes)\r
+                       with boxes\r
+               \97Ì\88æ\93h\82è\82Â\82Ô\82µ (Filled Curves)\r
+                       with filledcurves\r
+               \8bé\8c`\82Æ\83G\83\89\81[\83o\81[ (Box Error Bars)\r
+                       with boxerrorbars\r
+               \8bé\8c`\82Æ XY \83G\83\89\81[\83o\81[\r
+                       with boxxyerrorbars\r
+               \8bà\97Z\83f\81[\83^\8c`\8e® (Finance Bars)\r
+                       with financebars\r
+               \93\95\91ä\8c`\8e® (Candlesticks)\r
+                       with candlesticks\r
+       [EndMenu]\r
+[EndMenu]\r
+\r
+[Menu]\r
+\95\\8c»(&E)\r
+       \95Ï\90\94\r
+               print \r
+       \95¡\91f\90\94 ...\r
+               {[INPUT]Real part?[EOS],[INPUT]Imaginary part?[EOS]}\r
+       [Menu]\r
+       \92P\8d\80\89\89\8eZ\8eq\r
+               \95\89\95\84\8d\86  -a\r
+                       -[INPUT]Arg\r
+               \90³\95\84\8d\86  +a\r
+                       +[INPUT]Arg\r
+               \95â\90\94    ~a\r
+                       ~[INPUT]Arg\r
+               \98_\97\9d\94Û\92è        !a\r
+                       ![INPUT]Arg\r
+               \8aK\8fæ    a!\r
+                       [INPUT]Arg[EOS]!\r
+       [EndMenu]\r
+       [Menu]\r
+       2 \8d\80\89\89\8eZ\8eq\r
+               \8ew\90\94\89\89\8eZ\8eq      **\r
+               **\r
+               \90Ï      *\r
+                       *\r
+               \8f¤      /\r
+                       /\r
+               \98a      +\r
+                       +\r
+               \8d·      -\r
+                       -\r
+               --\r
+               \83\82\83W\83\85\83\8d\89\89\8eZ\8eq  %\r
+                       %\r
+       [EndMenu]\r
+       [Menu]\r
+       \98_\97\9d\89\89\8eZ\8eq\r
+               \93\99\82µ\82¢  ==\r
+                       ==\r
+               \93\99\82µ\82­\82È\82¢      !=\r
+                       !=\r
+               --\r
+               \82æ\82è\8f¬\82³\82¢      <\r
+                       <\r
+               \88È\89º    <=\r
+                       <=\r
+               \82æ\82è\91å\82«\82¢      >\r
+                       >\r
+               \88È\8fã    >=\r
+                       >=\r
+               --\r
+               \83r\83b\83g\82²\82Æ\82Ì AND        &\r
+                       &\r
+               \83r\83b\83g\82²\82Æ\82Ì\94r\91¼\93I OR   ^\r
+                       ^\r
+               \83r\83b\83g\82²\82Æ\82Ì OR |\r
+                       |\r
+               --\r
+               \98_\97\9d\93I AND      &&\r
+                       &&\r
+               \98_\97\9d\93I OR       ||\r
+                       ||\r
+               --\r
+               3 \8d\80\89\89\8eZ\8eq      a?b:c\r
+                       [INPUT]First arg[EOS]?[INPUT]Second arg[EOS]:[INPUT]Third arg[EOS]\r
+       [EndMenu]\r
+[EndMenu]\r
+[Menu]\r
+\8aÖ\90\94(&N)\r
+       [Menu]\r
+       \8f\89\93\99\8aÖ\90\94\r
+               \97\90\90\94\r
+                       rand([INPUT]Argument[EOS])\r
+               \90â\91Î\92l (abs)\r
+                       abs([INPUT]Argument[EOS])\r
+               \95\84\8d\86 (sgn)\r
+                       sgn([INPUT]Argument[EOS])\r
+               --\r
+               \88ø\90\94\82æ\82è\8f¬\82³\82­\82È\82¢\8dÅ\8f¬\82Ì\90®\90\94 (ceil)\r
+                       ceil([INPUT]Argument[EOS])\r
+               \88ø\90\94\82æ\82è\91å\82«\82­\82È\82¢\8dÅ\91å\82Ì\90®\90\94 (floor)\r
+                       floor([INPUT]Argument[EOS])\r
+               \90®\90\94 (int)\r
+                       int([INPUT]Argument[EOS])\r
+               --\r
+               \95½\95û\8dª (sqrt)\r
+                       sqrt([INPUT]Argument[EOS])\r
+               \8ew\90\94 (exp)\r
+                       exp([INPUT]Argument[EOS])\r
+               \8e©\91R\91Î\90\94 (log)\r
+                       log([INPUT]Argument[EOS])\r
+               \8fí\97p\91Î\90\94 (log10)\r
+                       log10([INPUT]Argument[EOS])\r
+               --\r
+               cos\r
+                       cos([INPUT]Argument[EOS])\r
+               sin\r
+                       sin([INPUT]Argument[EOS])\r
+               tan\r
+                       tan([INPUT]Argument[EOS])\r
+               --\r
+               arc cos\r
+                       acos([INPUT]Argument[EOS])\r
+               arc sin\r
+                       asin([INPUT]Argument[EOS])\r
+               arc tan\r
+                       atan([INPUT]Argument[EOS])\r
+               arc tan 2\r
+                       atan2([INPUT]Argument[EOS])\r
+               --\r
+               cosh\r
+                       cosh([INPUT]Argument[EOS])\r
+               sinh\r
+                       sinh([INPUT]Argument[EOS])\r
+               tanh\r
+                       tanh([INPUT]Argument[EOS])\r
+               --\r
+               \8b\95\95\94 (imag)\r
+                       imag([INPUT]Argument[EOS])\r
+               \8eÀ\95\94 (real)\r
+                       real([INPUT]Argument[EOS])\r
+               \95Î\8ap (arg)\r
+                       arg([INPUT]Argument[EOS])\r
+       [EndMenu]\r
+       [Menu]\r
+       \93Á\8eê\8aÖ\90\94\r
+               \8cë\8d·\8aÖ\90\94 (erf)\r
+                       erf([INPUT]Argument[EOS])\r
+               \8cë\8d·\95â\8aÖ\90\94 (erfc)\r
+                       erfc([INPUT]Argument[EOS])\r
+               \8bt\8cë\8d·\8aÖ\90\94 (inverf)\r
+                       inverf([INPUT]Argument[EOS])\r
+               --\r
+               \83K\83\93\83}\8aÖ\90\94 (gamma)\r
+                       gamma([INPUT]Argument[EOS])\r
+               \95s\8a®\91S\83K\83\93\83}\8aÖ\90\94 (igamma)\r
+                       igamma([INPUT]First argument[EOS],[INPUT]Second argument[EOS])\r
+               \91Î\90\94\83K\83\93\83}\8aÖ\90\94 (lgamma)\r
+                       lgamma([INPUT]Argument[EOS])\r
+               --\r
+               \95s\8a®\91S\83x\81[\83^\8aÖ\90\94 (ibeta)\r
+                       ibeta([INPUT]First argument[EOS],[INPUT]Second argument[EOS],[INPUT]Third argument[EOS])\r
+               --\r
+               \91æj0\8e\9f\83x\83b\83Z\83\8b\8aÖ\90\94 (besj0)\r
+                       besj0([INPUT]Argument[EOS])\r
+               \91æj1\8e\9f\83x\83b\83Z\83\8b\8aÖ\90\94 (besj1)\r
+                       besj1([INPUT]Argument[EOS])\r
+               \91æy0\8e\9f\83x\83b\83Z\83\8b\8aÖ\90\94 (besy0)\r
+                       besy0([INPUT]Argument[EOS])\r
+               \91æy1\8e\9f\83x\83b\83Z\83\8b\8aÖ\90\94 (besy1)\r
+                       besy1([INPUT]Argument[EOS])\r
+               --\r
+               \83\89\83\93\83x\83\8b\83g W \8aÖ\90\94 (lanbertw)\r
+                       lambertw([INPUT]Argument[EOS])\r
+\r
+       [EndMenu]\r
+       [Menu]\r
+       \93\9d\8cv\8aw\8aÖ\90\94\r
+               \90³\8bK\95ª\95z\8aÖ\90\94 (norm)\r
+                       norm([INPUT]Argument[EOS])\r
+               \8bt\90³\8bK\95ª\95z\8aÖ\90\94 (invnrom)\r
+                       invnorm([INPUT]Argument[EOS])\r
+       [EndMenu]\r
+       --\r
+       \8aÖ\90\94\82ð\92è\8b` ...\r
+               [INPUT]Name for function?[EOS][INPUT]Variable/s, eg. (a,b) ?[EOS]=\r
+       \92è\8b`\82µ\82½\8aÖ\90\94\82ð\95\\8e¦\r
+               show functions{ENTER}\r
+       --\r
+       \95Ï\90\94\82ð\92è\8b` ...\r
+               [INPUT]Name for variable?[EOS]=[INPUT]Value, eg. 9.81 ?{ENTER}\r
+       \92è\8b`\82µ\82½\95Ï\90\94\82ð\95\\8e¦\r
+               show variables{ENTER}\r
+       --\r
+       x \83_\83~\81[\95Ï\90\94\r
+               set dummy [INPUT]Variable name?{ENTER}\r
+       x,y \83_\83~\81[\95Ï\90\94\r
+               set dummy [INPUT]Variable names (eg. u,v)?{ENTER}\r
+       \83_\83~\81[\95Ï\90\94\82ð\95\\8e¦\r
+               show dummy{ENTER}\r
+[EndMenu]\r
+\r
+[Menu]\r
+\88ê\94Ê(&G)\r
+       \98g\82ð\82Â\82¯\82é\r
+               set border{ENTER}\r
+       \98g\82ð\82Â\82¯\82È\82¢\r
+               unset border{ENTER}\r
+       \98g\82Ì\8fó\91Ô\82ð\95\\8e¦\r
+               show border{ENTER}\r
+       --\r
+       \8bé\8c`\82Ì\95\9d\82ð\90Ý\92è\r
+               set boxwidth [INPUT]Box Width?{ENTER}\r
+       \8bé\8c`\82Ì\95\9d\82ð\8e©\93®\90Ý\92è\r
+               set boxwidth{ENTER}\r
+       \8bé\8c`\82Ì\95\9d\82ð\95\\8e¦\r
+               show boxwidth{ENTER}\r
+       --\r
+       \90ü\8eí\82Ì\95\\8e¦\r
+               test{ENTER}\r
+       --\r
+       [Menu]\r
+       \94}\89î\95Ï\90\94\r
+               \94}\89î\95Ï\90\94\95\\8e¦\82É\82·\82é\r
+                       set parametric{ENTER}\r
+               \94}\89î\95Ï\90\94\95\\8e¦\82ð\82µ\82È\82¢\r
+                       unset parametric{ENTER}\r
+               \94}\89î\95Ï\90\94\95\\8e¦\82Ì\8fó\91Ô\82ð\95\\8e¦\r
+                       show parametric{ENTER}\r
+               --\r
+               t \82Ì\94Í\88Í\r
+                       set trange [[INPUT]Lower bound?[EOS]:[INPUT]Upper bound?[EOS]]{ENTER}\r
+               u \82Ì\94Í\88Í\r
+                       set urange [[INPUT]Lower bound?[EOS]:[INPUT]Upper bound?[EOS]]{ENTER}\r
+               v \82Ì\94Í\88Í\r
+                       set vrange [[INPUT]Lower bound?[EOS]:[INPUT]Upper bound?[EOS]]{ENTER}\r
+       [EndMenu]\r
+       --\r
+       [Menu]\r
+       \90Ø\82è\94²\82«\r
+       \8b«\8aE\82É\8bß\82¢\93_\82ð\8dí\82é\r
+               set clip points{ENTER}\r
+       \88ê\95û\82Ì\92[\82¾\82¯\90Ø\82è\8eæ\82é\r
+               set clip one{ENTER}\r
+       \97¼\92[\82ð\90Ø\82è\8eæ\82é\r
+               set clip two{ENTER}\r
+       \90Ø\82è\8eæ\82ç\82È\82¢\r
+               unset clip{ENTER}\r
+       \90Ø\82è\94²\82«\95û\82Ì\8fó\91Ô\82ð\95\\8e¦\r
+               show clip{ENTER}\r
+       [EndMenu]\r
+       --\r
+       [Menu]\r
+       \8bÉ\8dÀ\95W\r
+       \8bÉ\8dÀ\95W\8cn\82É\95Ï\8dX\r
+               set polar{ENTER}\r
+       \92¼\8cð\8dÀ\95W\82É\95Ï\8dX\r
+               unset polar{ENTER}\r
+       \8bÉ\8dÀ\95W\8cn\82©\82Ç\82¤\82©\82ð\95\\8e¦\r
+               show polar{ENTER}\r
+       \93®\8ca\95û\8cü\82Ì\94Í\88Í\8ew\92è\r
+               set rrange [[INPUT]Lower bound?[EOS]:[INPUT]Upper bound?[EOS]]{ENTER}\r
+       \8ap\93x\82ð\93x\82Å\8ew\92è\r
+               set angles degrees{ENTER}\r
+       \8ap\93x\82ð\83\89\83W\83A\83\93\82Å\8ew\92è\r
+               set angles radians{ENTER}\r
+       \8ap\93x\82Ì\92P\88Ê\82ð\95\\8e¦\r
+               show angles{ENTER}\r
+       [EndMenu]\r
+       --\r
+       \8fk\8eÚ\82ð\90Ý\92è\r
+               set size [INPUT]Xscale?[EOS],[INPUT]Yscale?{ENTER}\r
+       \8fk\8eÚ\82ð\95\\8e¦\r
+               show size{ENTER}\r
+       --\r
+       \8aÖ\90\94\82Ì\83T\83\93\83v\83\8a\83\93\83O\90\94\82ð\8ew\92è\r
+               set sample [INPUT]Sampling rate (default=100)?{ENTER}\r
+       \8aÖ\90\94\82Ì\83T\83\93\83v\83\8a\83\93\83O\90\94\82ð\95\\8e¦\r
+               show sample{ENTER}\r
+[EndMenu]\r
+\r
+[Menu]\r
+\8e²(&A)\r
+       \8e©\93®\8fk\8eÚ\82ð\8eg\82¤\r
+               set autoscale [INPUT]Which axes (eg. xy)?{ENTER}\r
+       \8e©\93®\8fk\8eÚ\82ð\8eg\82í\82È\82¢\r
+               unset autoscale [INPUT]Which axes (eg. xy)?{ENTER}\r
+       \8e©\93®\8fk\8eÚ\82Ì\8fó\91Ô\82ð\95\\8e¦\r
+               show autoscale{ENTER}\r
+       --\r
+       \91Î\90\94\8e²\82ð\8eg\82¤\r
+               set logscale [INPUT]Which axes (eg. xy)?{ENTER}\r
+       \91Î\90\94\8e²\82ð\8eg\82í\82È\82¢\r
+               unset logscale [INPUT]Which axes (eg. xy)?{ENTER}\r
+       \91Î\90\94\8e²\82Ì\8fó\91Ô\82ð\95\\8e¦\r
+               show logscale{ENTER}\r
+       --\r
+       [Menu]\r
+       \96Ú\90·\r
+               \96Ú\90·\8c©\8fo\82µ\82Ì\8f\91\8e®\82ð\8ew\92è\r
+                       set format [INPUT]Axes?[EOS] "[INPUT]Format string?[EOS]"{ENTER}\r
+               \96Ú\90·\8c©\8fo\82µ\82Ì\8f\91\8e®\82ð\95\\8e¦\r
+                       show format{ENTER}\r
+               --\r
+               \96Ú\90·\82ð\93à\91¤\82É (\83f\83t\83H\83\8b\83g)\r
+                       set tics in{ENTER}\r
+               \96Ú\90·\82ð\8aO\91¤\82É\r
+                       set tics out{ENTER}\r
+               \96Ú\90·\82Ì\90Ý\92è\82ð\95\\8e¦\r
+                       show tics{ENTER}\r
+               --\r
+               z\8e²\82Ì\8d\82\82³\82Ì\8ew\92è\r
+                       set ticslevel [INPUT]Level (default=0.5)?{ENTER}\r
+               --\r
+               \96Ú\90·\82Ì\8aÔ\8au\82Ì\8ew\92è\r
+                       set [INPUT]Axis: x, y or z ?[EOS]tics [INPUT]Start, Increment, End (eg. 0,0.5,10) ?{ENTER}\r
+               --\r
+               \96Ú\90·\82Ì\90Ý\92è\8aJ\8en\r
+                       set [INPUT]Axis: x, y or z ?[EOS]tics ("[INPUT]Label text?[EOS]" [INPUT]Position?[EOS]\r
+               \96Ú\90·\82Ì\83\89\83x\83\8b\82Æ\88Ê\92u\82Ì\8ew\92è\r
+                       ,"[INPUT]Label text?[EOS]" [INPUT]Position?[EOS]\r
+               \96Ú\90·\82Ì\90Ý\92è\8fI\97¹\r
+                       ){ENTER}\r
+       [EndMenu]\r
+       --\r
+       X \82Ì\94Í\88Í\r
+               set xrange [[INPUT]Lower bound?[EOS]:[INPUT]Upper bound?[EOS]]{ENTER}\r
+       Y \82Ì\94Í\88Í\r
+               set yrange [[INPUT]Lower bound?[EOS]:[INPUT]Upper bound?[EOS]]{ENTER}\r
+       Z \82Ì\94Í\88Í\r
+               set zrange [[INPUT]Lower bound?[EOS]:[INPUT]Upper bound?[EOS]]{ENTER}\r
+       --\r
+       X \8e²\82Ì\83\89\83x\83\8b\r
+               set xlabel "[INPUT]Label text?[EOS]" [INPUT]X offset, Y offset (eg. 2,3) ?{ENTER}\r
+       Y \8e²\82Ì\83\89\83x\83\8b\r
+               set ylabel "[INPUT]Label text?[EOS]" [INPUT]X offset, Y offset (eg. 2,3) ?{ENTER}\r
+       Z \8e²\82Ì\83\89\83x\83\8b\r
+               set zlabel "[INPUT]Label text?[EOS]" [INPUT]X offset, Y offset (eg. 2,3) ?{ENTER}\r
+       \8e²\82Ì\83\89\83x\83\8b\82ð\95\\8e¦\r
+               show xlabel{ENTER}show ylabel{ENTER}show zlabel{ENTER}\r
+       --\r
+       X \8e²\82ð\82Ð\82©\82È\82¢\r
+               unset xzeroaxis{ENTER}\r
+       Y \8e²\82ð\82Ð\82©\82È\82¢\r
+               unset yzeroaxis{ENTER}\r
+       X,Y \97¼\8e²\82ð\82Ð\82­\r
+               set zeroaxis{ENTER}\r
+       \8e²\82Ì\8fó\91Ô\82ð\95\\8e¦\r
+               show zeroaxis{ENTER}\r
+[EndMenu]\r
+\r
+[Menu]\r
+\83`\83\83\81[\83g(&C)\r
+       \83O\83\8a\83b\83h\82ð\95\\8e¦\82·\82é\r
+               set grid{ENTER}\r
+       \83O\83\8a\83b\83h\82ð\95\\8e¦\82µ\82È\82¢\r
+               unset grid{ENTER}\r
+       \83O\83\8a\83b\83h\82Ì\8fó\91Ô\82ð\95\\8e¦\r
+               show grid{ENTER}\r
+       --\r
+       \96î\88ó\82ð\92Ç\89Á\r
+               set arrow [INPUT]Tag (1-99)?[EOS] from [INPUT]From coordinate?[EOS] to [INPUT]To coordinate?{ENTER}\r
+       \96î\88ó\82ð\8dí\8f\9c\r
+               unset arrow [INPUT]Tag (1-99)?{ENTER}\r
+       \96î\88ó\82Ì\8fó\91Ô\82ð\95\\8e¦\r
+               show arrow{ENTER}\r
+       --\r
+       \83\89\83x\83\8b\82ð\92Ç\89Á\r
+               set label [INPUT]Tag?[EOS] "[INPUT]Label?[EOS]" at [INPUT]Coordinate?[EOS] [INPUT]Justification (l,c,r)?{ENTER}\r
+       \83\89\83x\83\8b\82ð\8dí\8f\9c\r
+               unset label [INPUT]Tag?{ENTER}\r
+       \83\89\83x\83\8b\82Ì\8fó\91Ô\82ð\95\\8e¦\r
+               show label{ENTER}\r
+       --\r
+       \83^\83C\83g\83\8b\82ð\90Ý\92è\r
+               set title "[INPUT]Title text?[EOS]" [INPUT]X position, Y position (eg. 2,4)?{ENTER}\r
+       \83^\83C\83g\83\8b\82ð\95\\8e¦\r
+               show title{ENTER}\r
+       --\r
+       \96}\97á\82Ì\88Ê\92u\82ð\90Ý\92è\r
+               set key [INPUT]Key position?{ENTER}\r
+       \96}\97á\82Ì\88Ê\92u\82ð\83f\83t\83H\83\8b\83g\82É\r
+               set key{ENTER}\r
+       \96}\97á\82ð\95\\8e¦\82µ\82È\82¢\r
+               unset key{ENTER}\r
+       \96}\97á\82Ì\88Ê\92u\82ð\95\\8e¦\r
+               show key{ENTER}\r
+       --\r
+       \83I\83t\83Z\83b\83g\82ð\90Ý\92è\r
+               set offsets [INPUT]Offsets left,right,top,bottom ?{ENTER}\r
+       \83I\83t\83Z\83b\83g\82ð\95\\8e¦\r
+               show offsets{ENTER}\r
+       --\r
+       \8e\9e\8d\8f\82Ì\95\\8e¦\88Ê\92u\82ð\90Ý\92è\r
+               set time [INPUT]Location (eg. 1,1)?{ENTER}\r
+       \8e\9e\8d\8f\82ð\95\\8e¦\82µ\82È\82¢\r
+               unset time{ENTER}\r
+       \8e\9e\8d\8f\82Ì\95\\8e¦\88Ê\92u\82ð\95\\8e¦\r
+               show time{ENTER}\r
+[EndMenu]\r
+\r
+[Menu]\r
+\83X\83^\83C\83\8b(&S)\r
+       [Menu]\r
+       \83f\81[\83^\82Ì\95\\8e¦\83X\83^\83C\83\8b\r
+       \90ü (Lines)\r
+               set style data lines{ENTER}\r
+       \83|\83C\83\93\83g (Points)\r
+               set style data points{ENTER}\r
+       \90ü\82Æ\83|\83C\83\93\83g (Lines + Points)\r
+               set style data linespoints{ENTER}\r
+       \83h\83b\83g (Dots)\r
+               set style data dots{ENTER}\r
+       \90\82\90ü (Impulses)\r
+               set style data impulses{ENTER}\r
+       --\r
+       \83G\83\89\81[\83o\81[ (Error Bars)\r
+               set style data errorbars{ENTER}\r
+       \8bé\8c` (Boxes)\r
+               set style data boxes{ENTER}\r
+       \8bé\8c`\82Æ\83G\83\89\81[\83o\81[ (Box Error Bars)\r
+               set style data boxerrorbars{ENTER}\r
+       --\r
+       \93\95\91ä\8c`\8e® (Candlesticks)\r
+               set style data candlesticks{ENTER}\r
+       \8bà\97Z\83f\81[\83^\8c`\8e® (Finance Bars)\r
+               set style data financebars{ENTER}\r
+       [EndMenu]\r
+       \83f\81[\83^\82Ì\83X\83^\83C\83\8b\82ð\95\\8e¦\r
+               show style data{ENTER}\r
+       \83f\81[\83^\82Ì\83X\83^\83C\83\8b\82ð\8f\89\8aú\89»\r
+               unset style data{ENTER}\r
+       --\r
+       [Menu]\r
+       \8aÖ\90\94\82Ì\95\\8e¦\83X\83^\83C\83\8b\r
+       \90ü (Lines)\r
+               set style function lines{ENTER}\r
+       \83|\83C\83\93\83g (Points)\r
+               set style function points{ENTER}\r
+       \90ü\82Æ\83|\83C\83\93\83g (Lines + Points)\r
+               set style function linespoints{ENTER}\r
+       \83h\83b\83g (Dots)\r
+               set style function dots{ENTER}\r
+       \90\82\90ü (Impulses)\r
+               set style function impulses{ENTER}\r
+       --\r
+       \83G\83\89\81[\83o\81[ (Error Bars)\r
+               set style function errorbars{ENTER}\r
+       \8bé\8c` (Boxes)\r
+               set style function boxes{ENTER}\r
+       \8bé\8c`\82Æ\83G\83\89\81[\83o\81[ (Box Error Bars)\r
+               set style function boxerrorbars{ENTER}\r
+       --\r
+       \93\95\91ä\8c`\8e® (Candlesticks)\r
+               set style function candlesticks{ENTER}\r
+       \8bà\97Z\83f\81[\83^\8c`\8e® (Finance Bars)\r
+               set style function financebars{ENTER}\r
+       [EndMenu]\r
+       \8aÖ\90\94\82Ì\83X\83^\83C\83\8b\82ð\95\\8e¦\r
+               show style function{ENTER}\r
+       \8aÖ\90\94\82Ì\83X\83^\83C\83\8b\82ð\8f\89\8aú\89»\r
+               unset style function{ENTER}\r
+       --\r
+       [Menu]\r
+       \96î\82Ì\95\\8e¦\83X\83^\83C\83\8b\r
+       \96î\90æ (Head)\r
+               set style arrow [INPUT]Arrow number?[EOS] head{ENTER}\r
+       \97¼\96î\90æ (Heads)\r
+               set style arrow [INPUT]Arrow number?[EOS] heads{ENTER}\r
+       \96î\90æ\82È\82µ (No Heads)\r
+               set style arrow [INPUT]Arrow number?[EOS] nohead{ENTER}\r
+       [EndMenu]\r
+       \96î\82Ì\83X\83^\83C\83\8b\82ð\95\\8e¦\r
+               show style arrow [INPUT]Arrow number? {ENTER}\r
+       \96î\82Ì\83X\83^\83C\83\8b\82ð\8f\89\8aú\89»\r
+               unset style arrow [INPUT]Arrow number? {ENTER}\r
+       --\r
+       [Menu]\r
+       \93h\82è\82Â\82Ô\82µ\83X\83^\83C\83\8b\r
+       \93h\82è\82Â\82Ô\82³\82È\82¢ (Empty)\r
+               set style fill empty{ENTER}\r
+       \83x\83^\93h\82è (Solid)\r
+               set style fill solid [INPUT]Density?{ENTER}\r
+       \83p\83^\81[\83\93\93h\82è (Pattern)\r
+               set style fill pattern [INPUT]Pattern number?{ENTER}\r
+       \8b«\8aE (Border)\r
+               set style fill border [INPUT]Line Type?{ENTER}\r
+       \8b«\8aE\82È\82µ (No Border)\r
+               set style fill noborder{ENTER}\r
+       [EndMenu]\r
+       \93h\82è\82Â\82Ô\82µ\83X\83^\83C\83\8b\82Ì\95\\8e¦\r
+               show style fill{ENTER}\r
+       \93h\82è\82Â\82Ô\82µ\83X\83^\83C\83\8b\82Ì\8f\89\8aú\89»\r
+               unset style fill{ENTER}\r
+       --\r
+       [Menu]\r
+       \90ü\81A\93_\82Ì\95\\8e¦\83X\83^\83C\83\8b\r
+       \90ü\82Ì\8eí\97Þ (Line Type)\r
+               set style linetype [INPUT]Line Type?{ENTER}\r
+       \90ü\82Ì\95\9d (Line Width)\r
+               set style linewidth [INPUT]Line Width?{ENTER}\r
+       \93_\82Ì\8eí\97Þ (Point Type)\r
+               set style pointtype [INPUT]Point Type?{ENTER}\r
+       \93_\82Ì\91å\82«\82³ (Point Size)\r
+               set style pointsize [INPUT]Point Size?{ENTER}\r
+;      \90F (Palette)\r
+;              set style line{ENTER}\r
+       [EndMenu]\r
+       \90ü\81A\93_\82Ì\83X\83^\83C\83\8b\82Ì\95\\8e¦\r
+               show style line{ENTER}\r
+       \90ü\81A\93_\82Ì\83X\83^\83C\83\8b\82Ì\8f\89\8aú\89»\r
+               unset style line{ENTER}\r
+[EndMenu]\r
+\r
+[Menu]\r
+&3\8e\9f\8c³\r
+       [Menu]\r
+       \93\99\8d\82\90ü\r
+               \92¼\90ü\82Å\95`\89æ\r
+                       set cntrparam linear{ENTER}\r
+               \8bÈ\90ü\82Å\95`\89æ\r
+                       set cntrparam cubicspline{ENTER}\r
+               B-spline \95â\8aÔ\82Å\95`\89æ\r
+                       set cntrparam bspline{ENTER}\r
+               \93\99\8d\82\90ü\82Ì\90\94\r
+                       set cntrparam levels [INPUT]How many contours?{ENTER}\r
+               \95â\8aÔ\82·\82é\93_\82Ì\90\94\r
+                       set cntrparam points [INPUT]How many points for the contours?{ENTER}\r
+               B-spline \95â\8aÔ\82Ì\8e\9f\90\94\r
+                       set cntrparam order [INPUT]Order of B-splines (2-10)?{ENTER}\r
+               --\r
+               \8f°\82É\93\99\8d\82\90ü\82ð\95\\8e¦\82·\82é\r
+                       set contour base{ENTER}\r
+               \95\\96Ê\82É\93\99\8d\82\90ü\82ð\95\\8e¦\82·\82é\r
+                       set contour surface{ENTER}\r
+               \8f°\82Æ\95\\96Ê\82Ì\97¼\95û\82É\93\99\8d\82\90ü\82ð\95\\8e¦\r
+                       set contour both{ENTER}\r
+               \93\99\8d\82\90ü\82ð\95\\8e¦\82µ\82È\82¢\r
+                       unset contour{ENTER}\r
+               \93\99\8d\82\90ü\82Ì\8fó\91Ô\82ð\95\\8e¦\r
+                       show contour{ENTER}\r
+               --\r
+               \96Ê\95`\89æ\82É\8eg\82¤\90ü\82Ì\90\94\82ð\8ew\92è\r
+                       set isosamples [INPUT]Number of isosamples?{ENTER}\r
+               \96Ê\95`\89æ\82É\8eg\82¤\90ü\82Ì\90\94\82ð\95\\8e¦\r
+                       show isosamples{ENTER}\r
+       [EndMenu]\r
+       --\r
+       \92¼\8cð\8dÀ\95W\8cn\r
+               set mapping cartesian{ENTER}\r
+       \8b\85\8dÀ\95W\8cn\r
+               set mapping spherical{ENTER}\r
+       \89~\93\9b\8dÀ\95W\8cn\r
+               set mapping cylindrical{ENTER}\r
+       \8eÊ\91\9c\82Ì\90Ý\92è\82ð\95\\8e¦\r
+               show mapping{ENTER}\r
+       --\r
+       \89A\90ü\8f\88\97\9d\82ð\82·\82é\r
+               set hidden3d{ENTER}\r
+       \89A\90ü\8f\88\97\9d\82ð\82µ\82È\82¢\r
+               unset hidden3d{ENTER}\r
+       \89A\90ü\8f\88\97\9d\82Ì\8fó\91Ô\82ð\95\\8e¦\r
+               show hidden3d{ENTER}\r
+       --\r
+       \95\\96Ê\82ð\96Ô\82Å\95\\8e¦\82·\82é\r
+               set surface{ENTER}\r
+       \95\\96Ê\82ð\96Ô\82Å\95\\8e¦\82µ\82È\82¢\r
+               unset surface{ENTER}\r
+       \95\\96Ê\82Ì\95\\8e¦\8fó\91Ô\82ð\95\\8e¦\r
+               show surface{ENTER}\r
+       --\r
+       \8e\8b\8ap\82ð\90Ý\92è\r
+               set view [INPUT]X rotation (degrees)?[EOS],[INPUT]Z rotation?[EOS],[INPUT]Scale?[EOS],[INPUT]Z scale?{ENTER}\r
+       \8e\8b\8ap\82ð\95\\8e¦\r
+               show view{ENTER}\r
+[EndMenu]\r
+\r
+[Menu]\r
+\83w\83\8b\83v(&H)\r
+       \96Ú\8e\9f(&I)\r
+               help{ENTER}\r
+       \83C\83\93\83g\83\8d\83_\83N\83V\83\87\83\93\r
+               help introduction{ENTER}\r
+       \83g\83s\83b\83N(&T)\r
+               help [INPUT]Help Topic?{ENTER}\r
+       \83E\83B\83\93\83h\83E\83Y(&W)\r
+               help windows{ENTER}\r
+       --\r
+       gnuplot \82É\8aÖ\82µ\82Ä(&A)\r
+               [ABOUT]\r
+[EndMenu]\r
+\r
+; \83{\83^\83\93\82ð\82¢\82­\82Â\82©\r
+;   \83^\83C\83g\83\8b\95\8e\9a\97ñ\93à\82Ì\83Z\83~\83R\83\8d\83\93\82Ì\8e\9f\82Ì\90\94\8e\9a\82Í\83A\83C\83R\83\93\82Ì\83C\83\93\83f\83b\83N\83X\81B\r
+;   MSDN \82Ì\88È\89º\8eQ\8fÆ: "Toolbar Standard Button Image Index Values"\r
+;   http://msdn.microsoft.com/en-us/library/bb760433%28v=vs.85%29.aspx\r
+[Button]\r
+       \8dÄ\95\\8e¦;4\r
+               replot{ENTER}\r
+[Button]\r
+       \8aJ\82­;7\r
+               load '[OPEN]load[EOS]*.plt[EOS]'{ENTER}\r
+[Button]\r
+       \95Û\91¶;8\r
+               save '[SAVE]save[EOS]*.plt[EOS]'{ENTER}\r
+[Button]\r
+       \88Ú\93®;31\r
+               cd '[DIRECTORY]New directory?[EOS]'{ENTER}\r
+[Button]\r
+       \88ó\8dü;14\r
+               set terminal [INPUT]Terminal type?{ENTER}set output "PRN"{ENTER}replot{ENTER}set terminal win{ENTER}set output{ENTER}\r
+[Button]\r
+       \83_\83\93\83v;14\r
+               screendump{ENTER}\r
+[Button]\r
+       \91O;15\r
+               {^P}\r
+[Button]\r
+       \8e\9f;16\r
+               {^N}\r
+[Button]\r
+       \83I\83v\83V\83\87\83\93;10\r
+               [OPTIONS]\r
diff --git a/distributions/windows/gnuplot_bin/windows-265/bin/wgnuplot.chm b/distributions/windows/gnuplot_bin/windows-265/bin/wgnuplot.chm
new file mode 100644 (file)
index 0000000..fdd8992
Binary files /dev/null and b/distributions/windows/gnuplot_bin/windows-265/bin/wgnuplot.chm differ
diff --git a/distributions/windows/gnuplot_bin/windows-265/bin/wgnuplot.mnu b/distributions/windows/gnuplot_bin/windows-265/bin/wgnuplot.mnu
new file mode 100644 (file)
index 0000000..5da1377
--- /dev/null
@@ -0,0 +1,752 @@
+; Menu file for Windows gnuplot\r
+; Roger Hadgraft, 26-5-92\r
+; Russell Lang, 30 Nov 1992\r
+; Modified for 4.0, John Bollinger, 31 Dec 2002\r
+\r
+[Menu]\r
+&File\r
+       &Open ...\r
+               load '[OPEN]load[EOS]*.plt[EOS]'{ENTER}\r
+       &Save ...\r
+               save '[SAVE]save[EOS]*.plt[EOS]'{ENTER}\r
+       &Demos ...\r
+               load '[OPEN]load[EOS]*.dem[EOS]'{ENTER}\r
+       --\r
+       &Change Directory ...\r
+               cd '[DIRECTORY]New directory?[EOS]'{ENTER}\r
+       show Current &Directory\r
+               pwd{ENTER}\r
+       --\r
+       O&utput ...\r
+               set output "[INPUT]Output filename?[EOS]"{ENTER}\r
+       &Printer Output\r
+               set output "PRN"{ENTER}\r
+       &Window Output\r
+                set output{ENTER}set terminal win{ENTER} \r
+       Show Output\r
+               show output{ENTER}\r
+       Ou&tput Device ...\r
+               set terminal [INPUT]Terminal type?{ENTER}\r
+       Show Output Devices\r
+               set terminal{ENTER}show terminal{ENTER}\r
+       --\r
+       [Menu]\r
+       History\r
+               Previous command        ^P\r
+                       {^P}\r
+               Next command    ^N\r
+                       {^N}\r
+               --\r
+               Back one character      ^B\r
+                       {^B}\r
+               Forward one character   ^F\r
+                       {^F}\r
+               --\r
+               Beginning of the line   ^A\r
+                       {^A}\r
+               End of the line ^E\r
+                       {^E}\r
+               --\r
+               Delete previous character       ^H\r
+                       {^H}\r
+               Delete current character        ^D\r
+                       {^D}\r
+               Delete last word        ^W\r
+                       {^W}\r
+               Delete to end of line   ^K\r
+                       {^K}\r
+               Delete entire line      ^U\r
+                       {^U}\r
+               --\r
+               Redraw the line ^L\r
+                       {^L}\r
+               [EndMenu]\r
+               open DOS window\r
+                       shell{ENTER}\r
+               run DOS command ...\r
+                       ![INPUT]DOS command?{ENTER}\r
+               --\r
+               E&xit\r
+               quit{ENTER}\r
+[EndMenu]\r
+\r
+[Menu]\r
+&Plot\r
+       Plot\r
+               plot \r
+       3D Plot\r
+               splot \r
+       Replot\r
+               replot{ENTER}\r
+       Clear device\r
+               clear{ENTER}\r
+       --\r
+       Simple Range\r
+               [[INPUT]Lower bound?[EOS]:[INPUT]Upper bound?[EOS]] [EOS]\r
+       Named Range\r
+               [[INPUT]Variable name?[EOS]=[INPUT]Lower bound?[EOS]:[INPUT]Upper bound?[EOS]] [EOS]\r
+       --\r
+       Data filename ...\r
+               '[OPEN]Open[EOS]*.dat[EOS]' [EOS]\r
+       using x,y columns\r
+               using [INPUT]X column?[EOS]:[INPUT]Y column?[EOS] [EOS]\r
+       using x,y,ydelta columns\r
+               using [INPUT]X column?[EOS]:[INPUT]Y column?[EOS]:[INPUT]Ydelta column?[EOS] [EOS]\r
+       using x,y,ylow,yhigh columns\r
+               using [INPUT]X column?[EOS]:[INPUT]Y column?[EOS]:[INPUT]Ylow column?[EOS]:[INPUT]Yhigh column?[EOS] [EOS]\r
+       --\r
+       [Menu]\r
+       with Style (simple)\r
+               Lines\r
+                       with lines\r
+               Points\r
+                       with points\r
+               Lines and Points\r
+                       with linespoints\r
+               Impulses\r
+                       with impulses\r
+               Dots\r
+                       with dots\r
+               Steps\r
+                       with steps\r
+               Fsteps\r
+                       with fsteps\r
+               Histeps\r
+                       with histeps            \r
+       [EndMenu]\r
+       [Menu]\r
+       with Style (compound)\r
+               Error Bars\r
+                       with errorbars\r
+               X Error Bars\r
+                       with xerrorbars\r
+               Y Error Bars\r
+                       with yerrorbars\r
+               XY Error Bars\r
+                       with xyerrorbars\r
+               Error Lines\r
+                       with errorlines\r
+               X Error Lines\r
+                       with xerrorlines\r
+               Y Error Lines\r
+                       with yerrorlines\r
+               XY Error Lines\r
+                       with xyerrorlines\r
+               Boxes\r
+                       with boxes\r
+               Filled Curves\r
+                       with filledcurves\r
+               Box Error Bars\r
+                       with boxerrorbars\r
+               Box XY Error Bars\r
+                       with boxxyerrorbars\r
+               Finance Bars\r
+                       with financebars\r
+               Candlesticks\r
+                       with candlesticks\r
+       [EndMenu]\r
+[EndMenu]\r
+\r
+[Menu]\r
+&Expressions\r
+       Evaluate\r
+               print \r
+       Complex number ...\r
+               {[INPUT]Real part?[EOS],[INPUT]Imaginary part?[EOS]}\r
+       [Menu]\r
+       Unary\r
+               Minus   -a\r
+                       -[INPUT]Arg\r
+               Plus    +a\r
+                       +[INPUT]Arg\r
+               One's compliment        ~a\r
+                       ~[INPUT]Arg\r
+               Logcial negation        !a\r
+                       ![INPUT]Arg\r
+               Factorial       a!\r
+                       [INPUT]Arg[EOS]!\r
+       [EndMenu]\r
+       [Menu]\r
+       Binary\r
+               Exponentiation  **\r
+                       **\r
+               Multiply        *\r
+                       *\r
+               Divide  /\r
+                       /\r
+               Add     +\r
+                       +\r
+               Subtract        -\r
+                       -\r
+               --\r
+               Modulo  %\r
+                       %\r
+       [EndMenu]\r
+       [Menu]\r
+       Logical\r
+               Equality        ==\r
+                       ==\r
+               Inequality      !=\r
+                       !=\r
+               --\r
+               less than       <\r
+                       <\r
+               less than or equal      <=\r
+                       <=\r
+               greater than    >\r
+                       >\r
+               greater than or equal   >=\r
+                       >=\r
+               --\r
+               Bitwise AND     &\r
+                       &\r
+               Bitwise exclusive OR    ^\r
+                       ^\r
+               Bitwise inclusive OR    |\r
+                       |\r
+               --\r
+               Logical AND     &&\r
+                       &&\r
+               Logical OR      ||\r
+                       ||\r
+               --\r
+               Ternary operator        a?b:c\r
+                       [INPUT]First arg[EOS]?[INPUT]Second arg[EOS]:[INPUT]Third arg[EOS]\r
+       [EndMenu]\r
+[EndMenu]\r
+[Menu]\r
+Fu&nctions\r
+       [Menu]\r
+       Elementary\r
+               random number\r
+                       rand([INPUT]Argument[EOS])\r
+               absolute value\r
+                       abs([INPUT]Argument[EOS])\r
+               sign\r
+                       sgn([INPUT]Argument[EOS])\r
+               --\r
+               ceiling\r
+                       ceil([INPUT]Argument[EOS])\r
+               floor\r
+                       floor([INPUT]Argument[EOS])\r
+               integer\r
+                       int([INPUT]Argument[EOS])\r
+               --\r
+               square root\r
+                       sqrt([INPUT]Argument[EOS])\r
+               exponent\r
+                       exp([INPUT]Argument[EOS])\r
+               logarithm (e)\r
+                       log([INPUT]Argument[EOS])\r
+               logarithm (10)\r
+                       log10([INPUT]Argument[EOS])\r
+               --\r
+               cosine\r
+                       cos([INPUT]Argument[EOS])\r
+               sine\r
+                       sin([INPUT]Argument[EOS])\r
+               tangent\r
+                       tan([INPUT]Argument[EOS])\r
+               --\r
+               arc cosine\r
+                       acos([INPUT]Argument[EOS])\r
+               arc sine\r
+                       asin([INPUT]Argument[EOS])\r
+               arc tangent\r
+                       atan([INPUT]Argument[EOS])\r
+               arc tangent 2\r
+                       atan2([INPUT]Argument[EOS])\r
+               --\r
+               hyperbolic cosine\r
+                       cosh([INPUT]Argument[EOS])\r
+               hyperbolic sine\r
+                       sinh([INPUT]Argument[EOS])\r
+               hyperbolic tangent\r
+                       tanh([INPUT]Argument[EOS])\r
+               --\r
+               imaginary\r
+                       imag([INPUT]Argument[EOS])\r
+               real\r
+                       real([INPUT]Argument[EOS])\r
+               arg\r
+                       arg([INPUT]Argument[EOS])\r
+       [EndMenu]\r
+       [Menu]\r
+       Special\r
+               error \r
+                       erf([INPUT]Argument[EOS])\r
+               error c\r
+                       erfc([INPUT]Argument[EOS])\r
+               inv error\r
+                       inverf([INPUT]Argument[EOS])\r
+               --\r
+               gamma\r
+                       gamma([INPUT]Argument[EOS])\r
+               igamma\r
+                       igamma([INPUT]First argument[EOS],[INPUT]Second argument[EOS])\r
+               lgamma\r
+                       lgamma([INPUT]Argument[EOS])\r
+               --\r
+               ibeta\r
+                       ibeta([INPUT]First argument[EOS],[INPUT]Second argument[EOS],[INPUT]Third argument[EOS])\r
+               --\r
+               bessel j0\r
+                       besj0([INPUT]Argument[EOS])\r
+               bessel j1\r
+                       besj1([INPUT]Argument[EOS])\r
+               bessel y0\r
+                       besy0([INPUT]Argument[EOS])\r
+               bessel y1\r
+                       besy1([INPUT]Argument[EOS])\r
+               --\r
+               lambertw\r
+                       lambertw([INPUT]Argument[EOS])\r
+\r
+       [EndMenu]\r
+       [Menu]\r
+       Statistical\r
+               normal\r
+                       norm([INPUT]Argument[EOS])\r
+               inverse normal\r
+                       invnorm([INPUT]Argument[EOS])\r
+       [EndMenu]\r
+       --\r
+       Define User Function ...\r
+               [INPUT]Name for function?[EOS][INPUT]Variable/s, eg. (a,b) ?[EOS]=\r
+       Show User Functions\r
+               show functions{ENTER}\r
+       --\r
+       Define User Variable ...\r
+               [INPUT]Name for variable?[EOS]=[INPUT]Value, eg. 9.81 ?{ENTER}\r
+       Show User Variables\r
+               show variables{ENTER}\r
+       --\r
+       x Dummy variable\r
+               set dummy [INPUT]Variable name?{ENTER}\r
+       x,y Dummy variables\r
+               set dummy [INPUT]Variable names (eg. u,v)?{ENTER}\r
+       Show Dummy variables\r
+               show dummy{ENTER}\r
+[EndMenu]\r
+\r
+[Menu]\r
+&General\r
+       Border on\r
+               set border{ENTER}\r
+       Border off\r
+               unset border{ENTER}\r
+       Show Border\r
+               show border{ENTER}\r
+       --\r
+       Box width\r
+               set boxwidth [INPUT]Box Width?{ENTER}\r
+       Auto Box Width\r
+               set boxwidth{ENTER}\r
+       Show Box width\r
+               show boxwidth{ENTER}\r
+       --\r
+       Show Line Types\r
+               test{ENTER}\r
+       --\r
+       [Menu]\r
+       Parametric\r
+               Set Parametric\r
+                       set parametric{ENTER}\r
+               Not Parametric\r
+                       unset parametric{ENTER}\r
+               Show Parametric\r
+                       show parametric{ENTER}\r
+               --\r
+               t Range\r
+                       set trange [[INPUT]Lower bound?[EOS]:[INPUT]Upper bound?[EOS]]{ENTER}\r
+               u Range\r
+                       set urange [[INPUT]Lower bound?[EOS]:[INPUT]Upper bound?[EOS]]{ENTER}\r
+               v Range\r
+                       set vrange [[INPUT]Lower bound?[EOS]:[INPUT]Upper bound?[EOS]]{ENTER}\r
+       [EndMenu]\r
+       --\r
+       [Menu]\r
+       Clipping\r
+       Clip near points\r
+               set clip points{ENTER}\r
+       Clip one point\r
+               set clip one{ENTER}\r
+       Clip two points\r
+               set clip two{ENTER}\r
+       No Clipping\r
+               unset clip{ENTER}\r
+       Show Clip type\r
+               show clip{ENTER}\r
+       [EndMenu]\r
+       --\r
+       [Menu]\r
+       Polar\r
+       Polar\r
+               set polar{ENTER}\r
+       Not Polar\r
+               unset polar{ENTER}\r
+       Show Polar\r
+               show polar{ENTER}\r
+       Radial Range\r
+               set rrange [[INPUT]Lower bound?[EOS]:[INPUT]Upper bound?[EOS]]{ENTER}\r
+       Angles in Degrees\r
+               set angles degrees{ENTER}\r
+       Angles in Radians\r
+               set angles radians{ENTER}\r
+       Show Angle units\r
+               show angles{ENTER}\r
+       [EndMenu]\r
+       --\r
+       Set Plot Size\r
+               set size [INPUT]Xscale?[EOS],[INPUT]Yscale?{ENTER}\r
+       Show Plot Size\r
+               show size{ENTER}\r
+       --\r
+       Sampling Rate\r
+               set sample [INPUT]Sampling rate (default=100)?{ENTER}\r
+       Show Sampling Rate\r
+               show sample{ENTER}\r
+[EndMenu]\r
+\r
+[Menu]\r
+&Axes\r
+       Autoscale xy\r
+               set autoscale [INPUT]Which axes (eg. xy)?{ENTER}\r
+       No Autoscale xy\r
+               unset autoscale [INPUT]Which axes (eg. xy)?{ENTER}\r
+       Show Autoscale\r
+               show autoscale{ENTER}\r
+       --\r
+       Logscale xyz\r
+               set logscale [INPUT]Which axes (eg. xy)?{ENTER}\r
+       No Logscale xyz\r
+               unset logscale [INPUT]Which axes (eg. xy)?{ENTER}\r
+       Show Logscale\r
+               show logscale{ENTER}\r
+       --\r
+       [Menu]\r
+       Tics\r
+               Tic format string\r
+                       set format [INPUT]Axes?[EOS] "[INPUT]Format string?[EOS]"{ENTER}\r
+               Tic marks format\r
+                       show format{ENTER}\r
+               --\r
+               Inward facing tics (default)\r
+                       set tics in{ENTER}\r
+               Outward facing tics\r
+                       set tics out{ENTER}\r
+               Show tics\r
+                       show tics{ENTER}\r
+               --\r
+               Tics level\r
+                       set ticslevel [INPUT]Level (default=0.5)?{ENTER}\r
+               --\r
+               Tic interval\r
+                       set [INPUT]Axis: x, y or z ?[EOS]tics [INPUT]Start, Increment, End (eg. 0,0.5,10) ?{ENTER}\r
+               --\r
+               Tic labels start\r
+                       set [INPUT]Axis: x, y or z ?[EOS]tics ("[INPUT]Label text?[EOS]" [INPUT]Position?[EOS]\r
+               another Tic label\r
+                       ,"[INPUT]Label text?[EOS]" [INPUT]Position?[EOS]\r
+               Tic labels finish\r
+                       ){ENTER}\r
+       [EndMenu]\r
+       --\r
+       X Range\r
+               set xrange [[INPUT]Lower bound?[EOS]:[INPUT]Upper bound?[EOS]]{ENTER}\r
+       Y Range\r
+               set yrange [[INPUT]Lower bound?[EOS]:[INPUT]Upper bound?[EOS]]{ENTER}\r
+       Z Range\r
+               set zrange [[INPUT]Lower bound?[EOS]:[INPUT]Upper bound?[EOS]]{ENTER}\r
+       --\r
+       X Label\r
+               set xlabel "[INPUT]Label text?[EOS]" [INPUT]X offset, Y offset (eg. 2,3) ?{ENTER}\r
+       Y Label\r
+               set ylabel "[INPUT]Label text?[EOS]" [INPUT]X offset, Y offset (eg. 2,3) ?{ENTER}\r
+       Z Label\r
+               set zlabel "[INPUT]Label text?[EOS]" [INPUT]X offset, Y offset (eg. 2,3) ?{ENTER}\r
+       Show axis Labels\r
+               show xlabel{ENTER}show ylabel{ENTER}show zlabel{ENTER}\r
+       --\r
+       No X zero axis\r
+               unset xzeroaxis{ENTER}\r
+       No Y zero axis\r
+               unset yzeroaxis{ENTER}\r
+       X,Y zero axes on\r
+               set zeroaxis{ENTER}\r
+       Show zero axis status\r
+               show zeroaxis{ENTER}\r
+[EndMenu]\r
+\r
+[Menu]\r
+&Chart\r
+       Grid on\r
+               set grid{ENTER}\r
+       Grid off\r
+               unset grid{ENTER}\r
+       Show Grid\r
+               show grid{ENTER}\r
+       --\r
+       Add Arrow\r
+               set arrow [INPUT]Tag (1-99)?[EOS] from [INPUT]From coordinate?[EOS] to [INPUT]To coordinate?{ENTER}\r
+       Remove arrow\r
+               unset arrow [INPUT]Tag (1-99)?{ENTER}\r
+       Show Arrows\r
+               show arrow{ENTER}\r
+       --\r
+       Add Label\r
+               set label [INPUT]Tag?[EOS] "[INPUT]Label?[EOS]" at [INPUT]Coordinate?[EOS] [INPUT]Justification (l,c,r)?{ENTER}\r
+       Remove Label\r
+               unset label [INPUT]Tag?{ENTER}\r
+       Show Labels\r
+               show label{ENTER}\r
+       --\r
+       Set Title\r
+               set title "[INPUT]Title text?[EOS]" [INPUT]X position, Y position (eg. 2,4)?{ENTER}\r
+       Show Title\r
+               show title{ENTER}\r
+       --\r
+       Key (legend) position\r
+               set key [INPUT]Key position?{ENTER}\r
+       Default Key position\r
+               set key{ENTER}\r
+       No Key\r
+               unset key{ENTER}\r
+       Show Key position\r
+               show key{ENTER}\r
+       --\r
+       Offsets\r
+               set offsets [INPUT]Offsets left,right,top,bottom ?{ENTER}\r
+       Show Offsets\r
+               show offsets{ENTER}\r
+       --\r
+       Time location\r
+               set time [INPUT]Location (eg. 1,1)?{ENTER}\r
+       No Time\r
+               unset time{ENTER}\r
+       Show Time Location\r
+               show time{ENTER}\r
+[EndMenu]\r
+\r
+[Menu]\r
+&Styles\r
+       [Menu]\r
+       Data Style\r
+       Lines\r
+               set style data lines{ENTER}\r
+       Points\r
+               set style data points{ENTER}\r
+       Lines + Points\r
+               set style data linespoints{ENTER}\r
+       Dots\r
+               set style data dots{ENTER}\r
+       Impulses\r
+               set style data impulses{ENTER}\r
+       --\r
+       Error Bars\r
+               set style data errorbars{ENTER}\r
+       Boxes\r
+               set style data boxes{ENTER}\r
+       Box Error Bars\r
+               set style data boxerrorbars{ENTER}\r
+       --\r
+       Candlesticks\r
+               set style data candlesticks{ENTER}\r
+       Finance Bars\r
+               set style data financebars{ENTER}\r
+       [EndMenu]\r
+       Show Data Style\r
+               show style data{ENTER}\r
+       Clear Data Style\r
+               unset style data{ENTER}\r
+       --\r
+       [Menu]\r
+       Function Style\r
+       Lines\r
+               set style function lines{ENTER}\r
+       Points\r
+               set style function points{ENTER}\r
+       Lines + Points\r
+               set style function linespoints{ENTER}\r
+       Dots\r
+               set style function dots{ENTER}\r
+       Impulses\r
+               set style function impulses{ENTER}\r
+       --\r
+       Error Bars\r
+               set style function errorbars{ENTER}\r
+       Boxes\r
+               set style function boxes{ENTER}\r
+       Box Error Bars\r
+               set style function boxerrorbars{ENTER}\r
+       --\r
+       Candlesticks\r
+               set style function candlesticks{ENTER}\r
+       Finance Bars\r
+               set style function financebars{ENTER}\r
+       [EndMenu]\r
+       Show Function Style\r
+               show style function{ENTER}\r
+       Clear Function Style\r
+               unset style function{ENTER}\r
+       --\r
+       [Menu]\r
+       Arrow Style\r
+       Head\r
+               set style arrow [INPUT]Arrow number?[EOS] head{ENTER}\r
+       Heads\r
+               set style arrow [INPUT]Arrow number?[EOS] heads{ENTER}\r
+       No Heads\r
+               set style arrow [INPUT]Arrow number?[EOS] nohead{ENTER}\r
+       [EndMenu]\r
+       Show Arrow Style\r
+               show style arrow [INPUT]Arrow number? {ENTER}\r
+       Clear Arrow Style\r
+               unset style arrow [INPUT]Arrow number? {ENTER}\r
+       --\r
+       [Menu]\r
+       Fill Style\r
+       Empty\r
+               set style fill empty{ENTER}\r
+       Solid\r
+               set style fill solid [INPUT]Density?{ENTER}\r
+       Pattern\r
+               set style fill pattern [INPUT]Pattern number?{ENTER}\r
+       Border\r
+               set style fill border [INPUT]Line Type?{ENTER}\r
+       No Border\r
+               set style fill noborder{ENTER}\r
+       [EndMenu]\r
+       Show Fill Style\r
+               show style fill{ENTER}\r
+       Clear Fill Style\r
+               unset style fill{ENTER}\r
+       --\r
+       [Menu]\r
+       Line Style\r
+       Line Type\r
+               set style linetype [INPUT]Line Type?{ENTER}\r
+       Line Width\r
+               set style linewidth [INPUT]Line Width?{ENTER}\r
+       Point Type\r
+               set style pointtype [INPUT]Point Type?{ENTER}\r
+       Point Size\r
+               set style pointsize [INPUT]Point Size?{ENTER}\r
+;      Palette\r
+;              set style line{ENTER}\r
+       [EndMenu]\r
+       Show Line Style\r
+               show style line{ENTER}\r
+       Clear Line Style\r
+               unset style line{ENTER}\r
+[EndMenu]\r
+\r
+[Menu]\r
+&3D\r
+       [Menu]\r
+       Contours\r
+               Linear Contours\r
+                       set cntrparam linear{ENTER}\r
+               Cubic Spline Contours\r
+                       set cntrparam cubicspline{ENTER}\r
+               B-spline Contours\r
+                       set cntrparam bspline{ENTER}\r
+               Number of Contours\r
+                       set cntrparam levels [INPUT]How many contours?{ENTER}\r
+               Points for Contours\r
+                       set cntrparam points [INPUT]How many points for the contours?{ENTER}\r
+               Order of B-splines\r
+                       set cntrparam order [INPUT]Order of B-splines (2-10)?{ENTER}\r
+               --\r
+               Contours on Base\r
+                       set contour base{ENTER}\r
+               Contours on Surfaces\r
+                       set contour surface{ENTER}\r
+               Contours on Both\r
+                       set contour both{ENTER}\r
+               No Contours\r
+                       unset contour{ENTER}\r
+               Show Contour\r
+                       show contour{ENTER}\r
+               --\r
+               Number of Isosamples\r
+                       set isosamples [INPUT]Number of isosamples?{ENTER}\r
+               Show Isosamples\r
+                       show isosamples{ENTER}\r
+       [EndMenu]\r
+       --\r
+       Cartesian Mapping\r
+               set mapping cartesian{ENTER}\r
+       Spherical Mapping\r
+               set mapping spherical{ENTER}\r
+       Cylindrical Mapping\r
+               set mapping cylindrical{ENTER}\r
+       Show Mapping\r
+               show mapping{ENTER}\r
+       --\r
+       Hidden line removal\r
+               set hidden3d{ENTER}\r
+       No Hidden line removal\r
+               unset hidden3d{ENTER}\r
+       Show Hidden line removal\r
+               show hidden3d{ENTER}\r
+       --\r
+       Display Surface mesh\r
+               set surface{ENTER}\r
+       No Surface mesh\r
+               unset surface{ENTER}\r
+       Show Surface status\r
+               show surface{ENTER}\r
+       --\r
+       Set View\r
+               set view [INPUT]X rotation (degrees)?[EOS],[INPUT]Z rotation?[EOS],[INPUT]Scale?[EOS],[INPUT]Z scale?{ENTER}\r
+       Show View\r
+               show view{ENTER}\r
+[EndMenu]\r
+\r
+[Menu]\r
+&Help\r
+       &Index\r
+               help{ENTER}\r
+       Introduction\r
+               help introduction{ENTER}\r
+       &Topic\r
+               help [INPUT]Help Topic?{ENTER}\r
+       &Windows\r
+               help windows{ENTER}\r
+       --\r
+       &About\r
+               [ABOUT]\r
+[EndMenu]\r
+\r
+; now some buttons\r
+;   a number after a semicolon in the title string is interpreted as icon index\r
+;   see the article "Toolbar Standard Button Image Index Values" on MSDN\r
+;   http://msdn.microsoft.com/en-us/library/bb760433%28v=vs.85%29.aspx\r
+[Button]\r
+       Replot;4\r
+               replot{ENTER}\r
+[Button]\r
+       Open;7\r
+               load '[OPEN]load[EOS]*.plt[EOS]'{ENTER}\r
+[Button]\r
+       Save;8\r
+               save '[SAVE]save[EOS]*.plt[EOS]'{ENTER}\r
+[Button]\r
+       ChDir;31\r
+               cd '[DIRECTORY]New directory?[EOS]'{ENTER}\r
+[Button]\r
+       Print;14\r
+               set terminal [INPUT]Terminal type?{ENTER}set output "PRN"{ENTER}replot{ENTER}set terminal win{ENTER}set output{ENTER}\r
+[Button]\r
+       PrtSc;14\r
+               screendump{ENTER}\r
+[Button]\r
+       Prev;15\r
+               {^P}\r
+[Button]\r
+       Next;16\r
+               {^N}\r
+[Button]\r
+       Options;10\r
+               [OPTIONS]\r
diff --git a/distributions/windows/gnuplot_bin/windows-265/bin/wxbase28u_gcc_custom.dll b/distributions/windows/gnuplot_bin/windows-265/bin/wxbase28u_gcc_custom.dll
new file mode 100755 (executable)
index 0000000..6e37233
Binary files /dev/null and b/distributions/windows/gnuplot_bin/windows-265/bin/wxbase28u_gcc_custom.dll differ
diff --git a/distributions/windows/gnuplot_bin/windows-265/bin/wxmsw28u_core_gcc_custom.dll b/distributions/windows/gnuplot_bin/windows-265/bin/wxmsw28u_core_gcc_custom.dll
new file mode 100755 (executable)
index 0000000..e9cf3d5
Binary files /dev/null and b/distributions/windows/gnuplot_bin/windows-265/bin/wxmsw28u_core_gcc_custom.dll differ
diff --git a/distributions/windows/gnuplot_bin/windows-265/bin/zlib1.dll b/distributions/windows/gnuplot_bin/windows-265/bin/zlib1.dll
new file mode 100755 (executable)
index 0000000..4f70d17
Binary files /dev/null and b/distributions/windows/gnuplot_bin/windows-265/bin/zlib1.dll differ
diff --git a/distributions/windows/mybuildicl32.bat b/distributions/windows/mybuildicl32.bat
new file mode 100644 (file)
index 0000000..a57a0ef
--- /dev/null
@@ -0,0 +1,22 @@
+@echo on\r
+rem Visual Studio environment\r
+@REM C:\Windows\SysWOW64\cmd.exe /c\r
+call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\Tools\VsDevCmd.bat"\r
+rem --- VS done\r
+echo version=%1 %2 %3
+%2
+rem cd\r
+rem cd imachcvs\NetBeans\imach\build\icl32\r
+rem cd imach\imach-gui\build\icl32\r
+cd %2%3\icl32\r
+call "C:\Program Files (x86)\Intel\Composer XE 2015\bin\ipsxe-comp-vars.bat" ia32 vs2013\r
+call cmake ../.. -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS_RELEASE:STRING="/MT /O2 /Ob2 /D NDEBUG"\r
+call cmake --config Release\r
+@rem call cmake --build . --config Release\r
+call "C:\Program Files (x86)\Common Files\Intel\shared files\ia32\Bin\ICProjConvert150" IMaCh.sln /IC:"Intel C++ Compiler XE 15.0" /s /f
+call cmake --build . --config Release -- /p:PlatformToolset="Intel C++ Compiler XE 15.0" /p:BasePlatformToolset=v120_xp\r
+@rem <BasePlatformToolset>v120_xp</BasePlatformToolset>
+@rem "C:\Program Files (x86)\Common Files\Intel\shared files\ia32\Bin\ICProjConvert150" IMaCh-%1.vcxproj /IC:"Intel C++ Compiler XE 15.0" /s /f
+@rem --- Intel Done\r
+@rem call msbuild g:\imach\imach-gui\build\icl32\imach-0.98q3.vcxproj /t:Build /p:Configuration=Release\r
+@rem call msbuild g:\imach\imach-gui\build\icl32\IMaCh-%1.vcxproj /t:Build /p:Configuration=Release /p:PlatformToolset="Intel C++ Compiler XE 15.0" /p:BasePlatformToolset=v120_xp
diff --git a/distributions/windows/mybuildicl64.bat b/distributions/windows/mybuildicl64.bat
new file mode 100644 (file)
index 0000000..211bb5f
--- /dev/null
@@ -0,0 +1,23 @@
+@echo on\r
+rem Visual Studio environment\r
+@REM C:\Windows\SysWOW64\cmd.exe /c\r
+@rem call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" amd64
+@rem call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\Tools\VsDevCmd.bat"\r
+rem --- VS done\r
+rem cd imach\imach-gui\build\icl64\r
+rem cd imachcvs\NetBeans\imach\build\icl64
+echo version=%1 %2 %3
+%2\r
+rem cd imach\cvs\imach\build\icl64
+cd %2%3\icl64
+call cmake -G "Visual Studio 12 2013 Win64" ../..\r
+call "C:\Program Files (x86)\Common Files\Intel\shared files\ia32\Bin\ICProjConvert150" IMaCh.sln /IC:"Intel C++ Compiler XE 15.0"  /s /f\r
+call cmake --build . --config Release\r
+@rem call cmake -G "Visual Studio 12 2013 Win64" ../../src -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS_RELEASE:STRING="/MT /O2 /Ob2 /D NDEBUG"\r
+@rem call cmake --build . --config Release\r
+@rem call "C:\Program Files (x86)\Intel\Composer XE 2015\bin\ipsxe-comp-vars.bat" intel64 vs2013\r
+@rem call "C:\Program Files (x86)\Common Files\Intel\shared files\ia32\Bin\ICProjConvert150" IMaCh.vcxproj /IC:"Intel C++ Compiler XE 15.0"  /s /f
+rem --- Intel Done\r
+@rem g:\r
+@rem call msbuild g:\imachcvs\NetBeans\imach\build\icl32\imach-0.98q3.vcxproj /t:Build /p:Configuration=Release\r
+@rem call msbuild g:\imachcvs\NetBeans\imach\build\icl64\IMaCh-%1.vcxproj /t:Build /p:Configuration=Release\r
index 7e2033873eb5a0d84be372eac5bee4ae005d5437..a52f17f497825725ee023c7c14111bd3c7eda614 100644 (file)
@@ -1,4 +1,9 @@
-VERSION=0.98q4
+#Version has to be set in ../CMakeLists.txt too.
+VERSION=0.98q5
+# DRIVEG is for VirtualBox Windows 64bit 
+DRIVEG=g:
+#DIRG is the corresponding build directory for Virtual Windows
+DIRG=\imach\cvs\imach\build
 COPYRIGHT=Copyright (C)  2002-2015 INED-EUROREVES-Institut de longevite-Japan Society for the Promotion of Science (Grant-in-Aid for Scientific Research 25293121) - Intel Software 2015
 IMACHSETUPVERSION=icl
 # This is for Windows only
@@ -305,8 +310,9 @@ imachICL-build: imach.c
 #/GS /W3 /Gy /Zc:wchar_t /Zi /O2 /Fd"x64\Release\vc120.pdb" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_LIB" /D "_UNICODE" /D "UNICODE" /Qipo /Zc:forScope /Oi /MT /Fa"x64\Release\" /EHsc /nologo /Fo"x64\Release\" /Qprof-dir "x64\Release\" /Fp"x64\Release\IMaCh-icl-x64-0.98q2.pch"
 #  /Users/nbrouard/Documents/imach/imach-gui/build/icl64/Release/imach.exe
 # both 32 and 64 executables should have been built on Windows with Intel compiler.
-imachICL-setup: ../build/icl64/Release/IMaCh-$(VERSION).exe ../build/icl32/Release/IMaCh-$(VERSION).exe setup.iss mybuildicl64.bat mybuildicl32.bat
+imachICL-setup: ../build/icl64/Release/IMaCh-$(VERSION).exe ../build/icl32/Release/IMaCh-$(VERSION).exe setup.iss ../distributions/windows/mybuildicl64.bat ../distributions/windows/mybuildicl32.bat 
        pwd
+       touch setup.iss.in
        $(SETUPCOMP) /cc setup.iss
        $(CP) Output/$(TMPSETUPEXE) imachICL-setup
 
@@ -321,19 +327,19 @@ imachICL64-noreg-setup: IMaCh-icl64-$(VERSION).exe noreg-setup.iss
        $(SETUPCOMP) /cc $(TMPNOREGSETUPSCRIPT)
        $(CP) Output/$(TMPSETUPEXE) imachICL64-noreg-setup
 
-../build/icl64/Release/IMaCh-$(VERSION).exe: imach.c mybuildicl64.bat
+../build/icl64/Release/IMaCh-$(VERSION).exe: imach.c ../distributions/windows/mybuildicl64.bat
        rm -rf ../build/icl64  && mkdir ../build/icl64
-       cp mybuildicl64.bat ../build/icl64/
+       cp ../distributions/windows/mybuildicl64.bat ../build/icl64/
        cd ../build/icl64
        VBoxManage --nologo guestcontrol "Windows7-64" execute --image "C:\Windows\SysWOW64\cmd.exe" \
-       --username brouard  --verbose --wait-exit --wait-stdout  --wait-stderr -- "/c" "g:\imachcvs\NetBeans\imach\build\icl64\mybuildicl64.bat" "$(VERSION)"
+       --username brouard  --verbose --wait-exit --wait-stdout  --wait-stderr -- "/c" "$(DRIVEG)$(DIRG)\icl64\mybuildicl64.bat" "$(VERSION)" "$(DRIVEG)" "$(DIRG)"
 
-../build/icl32/Release/IMaCh-$(VERSION).exe: imach.c mybuildicl32.bat
+../build/icl32/Release/IMaCh-$(VERSION).exe: imach.c ../distributions/windows/mybuildicl32.bat
        rm -rf ../build/icl32 && mkdir -p ../build/icl32
-       cp mybuildicl32.bat ../build/icl32/
+       cp ../distributions/windows/mybuildicl32.bat ../build/icl32/
        cd ../build/icl32
        VBoxManage --nologo guestcontrol "Windows7-64" execute --image "C:\Windows\SysWOW64\cmd.exe" \
-       --username brouard  --verbose --wait-exit --wait-stdout -- "/c" "g:\imachcvs\NetBeans\imach\build\icl32\mybuildicl32.bat" "$(VERSION)"
+       --username brouard  --verbose --wait-exit --wait-stdout -- "/c" "$(DRIVEG)$(DIRG)\icl32\mybuildicl32.bat" "$(VERSION)" "$(DRIVEG)" "$(DIRG)"
 
 ../build/vs32/Release/IMaCh-$(VERSION).exe: imach.c mybuildvs32.bat
        rm -rf ../build/vs32 && mkdir -p ../build/vs32
index e1bdb148aef53410e637018fb3acfa99180fe4ee..c193c8fcd9af1fd722c6ccc89bd116a728acb24b 100644 (file)
@@ -2,6 +2,9 @@
 ; $Id$\r
 ;  $State$\r
 ;  $Log$
+;  Revision 1.13  2015/08/04 07:18:28  brouard
+;  *** empty log message ***
+;
 ;  Revision 1.12  2015/03/11 13:28:31  brouard
 ;  Summary: newer including both binaries 32 and 64 bits in a single installer with InnoSetup 5.5.5
 ;
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING .ISS SCRIPT FILES!\r
 \r
 [Setup]\r
-AppName=IMaCh-0.98q4\r
-AppVerName=IMaCh-0.98q4 Version 0.98q4\r
+AppName=IMaCh-0.98q5\r
+AppVerName=IMaCh-0.98q5 Version 0.98q5\r
 AppCopyright=Copyright (C)  2002-2015 INED-EUROREVES-Institut de longevite-Japan Society for the Promotion of Science (Grant-in-Aid for Scientific Research 25293121) - Intel Software 2015\r
-DefaultDirName={pf}\IMaCh-0.98q4\r
+DefaultDirName={pf}\IMaCh-0.98q5\r
 DefaultGroupName=IMaCh\r
-OutputBaseFilename=imach-0.98q4-icl-setup\r
+OutputBaseFilename=imach-0.98q5-icl-setup\r
 UninstallDisplayIcon={app}\imach.exe\r
 Compression=lzma2\r
 SolidCompression=yes\r
@@ -66,18 +69,18 @@ ArchitecturesInstallIn64BitMode=x64
 ChangesAssociations=yes\r
 \r
 [Files]\r
-; Install IMaCh-x640.98q4.exe if running in 64-bit mode (x64; see above),\r
+; Install IMaCh-x640.98q5.exe if running in 64-bit mode (x64; see above),\r
 ; IMaCh.exe otherwise.\r
-;Source: "IMaCh-icl64-0.98q4.exe"; DestDir: "{app}\bin"; DestName: "IMaCh.exe"; Check: Is64BitInstallMode
-Source: "..\build\icl64\Release\IMaCh-0.98q4.exe"; DestDir: "{app}\bin"; DestName: "IMaCh.exe"; Check: Is64BitInstallMode
-;Source: "IMaCh-icl32-0.98q4.exe"; DestDir: "{app}\bin"; DestName: "IMaCh.exe"; Check: not Is64BitInstallMode
-Source: "..\build\icl32\Release\IMaCh-0.98q4.exe"; DestDir: "{app}\bin"; DestName: "IMaCh.exe"; Check: not Is64BitInstallMode
+;Source: "IMaCh-icl64-0.98q5.exe"; DestDir: "{app}\bin"; DestName: "IMaCh.exe"; Check: Is64BitInstallMode
+Source: "..\build\icl64\Release\IMaCh-0.98q5.exe"; DestDir: "{app}\bin"; DestName: "IMaCh.exe"; Check: Is64BitInstallMode
+;Source: "IMaCh-icl32-0.98q5.exe"; DestDir: "{app}\bin"; DestName: "IMaCh.exe"; Check: not Is64BitInstallMode
+Source: "..\build\icl32\Release\IMaCh-0.98q5.exe"; DestDir: "{app}\bin"; DestName: "IMaCh.exe"; Check: not Is64BitInstallMode
 ;Source: "IMaCh.chm"; DestDir: "{app}\bin"\r
 Source: ..\html\doc\imach.htm; DestDir: {app}\doc\r
 Source: README.txt; DestDir: {app}; Flags: isreadme\r
 Source: imach.ico; DestDir: {app}\bin\r
 ;;Source: gnuplot.exe; DestDir: {app}\bin
-Source: gnuplot_bin\windows-265\bin\*; DestDir: {app}\bin
+Source: ..\distributions\windows\gnuplot_bin\windows-265\bin\*; DestDir: {app}\bin
 ;;Source: wgnuplot.hlp; DestDir: {app}\bin\r
 Source: website.url; DestDir: {app}\r
 \r
@@ -147,8 +150,8 @@ Source: ..\html\doc\data1.txt; DestDir: {app}\doc
 ;P.S. -silent is recommended for use in install scripts\r
 \r
 [Icons]\r
-Name: {group}\IMaCH; Filename: {app}\bin\imach.exe; Comment: IMaCh-0.98q4 0.98q4; IconFilename: {app}\imach.ico\r
-Name: {userdesktop}\IMaCH; Filename: {app}\bin\imach.exe; Comment: IMaCh-0.98q4 0.98q4; Flags: runmaximized\r
+Name: {group}\IMaCH; Filename: {app}\bin\imach.exe; Comment: IMaCh-0.98q5 0.98q5; IconFilename: {app}\imach.ico\r
+Name: {userdesktop}\IMaCH; Filename: {app}\bin\imach.exe; Comment: IMaCh-0.98q5 0.98q5; Flags: runmaximized\r
 Name: {group}\Visit the IMaCh web site; Filename: {app}\website.url\r
 \r
 ; NOTE: Most apps do not need registry entries to be pre-created. If you\r
@@ -164,7 +167,7 @@ Name: {group}\Visit the IMaCh web site; Filename: {app}\website.url
 ;;Root: HKCU; Subkey: "Software\EuroREVES_INED\IMaCh"; Flags: uninsdeletekey\r
 ;;Root: HKLM; Subkey: "Software\EuroREVES_INED"; Flags: uninsdeletekeyifempty\r
 Root: HKLM; Subkey: Software\IMaCh; Flags: uninsdeletekeyifempty\r
-Root: HKLM; Subkey: Software\IMaCh\imach; ValueType: string; ValueName: Current Version; ValueData: 0.98q4; Flags: uninsdeletekeyifempty\r
+Root: HKLM; Subkey: Software\IMaCh\imach; ValueType: string; ValueName: Current Version; ValueData: 0.98q5; Flags: uninsdeletekeyifempty\r
 Root: HKLM; Subkey: Software\IMaCh\imach; ValueType: string; ValueName: InstallPath; ValueData: {app}\r
 Root: HKLM; Subkey: Software\IMaCh\gnuplot; ValueType: string; ValueName: Current Version; ValueData: 4.6; Flags: uninsdeletekeyifempty\r
 Root: HKLM; Subkey: Software\IMaCh\gnuplot; ValueType: string; ValueName: InstallPath; ValueData: {app}\r
index 0e80d861a44c2cf57d096572ff61114380ffecb1..02a215b90ea40ae14790472889ef26567a7d4792 100644 (file)
@@ -2,6 +2,9 @@
 ; $Id$\r
 ;  $State$\r
 ;  $Log$
+;  Revision 1.13  2015/08/04 07:18:28  brouard
+;  *** empty log message ***
+;
 ;  Revision 1.12  2015/03/11 13:28:31  brouard
 ;  Summary: newer including both binaries 32 and 64 bits in a single installer with InnoSetup 5.5.5
 ;
@@ -77,7 +80,7 @@ Source: ..\html\doc\imach.htm; DestDir: {app}\doc
 Source: README.txt; DestDir: {app}; Flags: isreadme\r
 Source: imach.ico; DestDir: {app}\bin\r
 ;;Source: gnuplot.exe; DestDir: {app}\bin
-Source: gnuplot_bin\windows-265\bin\*; DestDir: {app}\bin
+Source: ..\distributions\windows\gnuplot_bin\windows-265\bin\*; DestDir: {app}\bin
 ;;Source: wgnuplot.hlp; DestDir: {app}\bin\r
 Source: website.url; DestDir: {app}\r
 \r
index 2a4932fa96c94a1d0d89f4a8135a76553e8a4af2..9c7f3eaee36ebeea4786dea0ebee99c96fdd0e18 100644 (file)
@@ -2,4 +2,4 @@
 #define __IMACH_VERSION_MINOR__ @IMACH_VERSION_MINOR@
 #define __IMACH_VERSION_PATCH__ @IMACH_VERSION_PATCH@
 
-#define __IMACH_VERSION__ "@IMACH_VERSION_MAJOR@.@IMACH_VERSION_MINOR@.@IMACH_VERSION_PATCH@@IMACH_VERSION_NOTE@"
+#define __IMACH_VERSION__ "@IMACH_VERSION_MAJOR@.@IMACH_VERSION_MINOR@"