]> henry.ined.fr Git - .git/commitdiff
*** empty log message ***
authorN. Brouard <brouard@ined.fr>
Tue, 8 Dec 2015 16:09:16 +0000 (16:09 +0000)
committerN. Brouard <brouard@ined.fr>
Tue, 8 Dec 2015 16:09:16 +0000 (16:09 +0000)
73 files changed:
distributions/osx/gnuplot_bin/bin/gnuplot [new file with mode: 0755]
distributions/osx/gnuplot_bin/bin/gnuplot-5.1_cvs8Dec13:19:21-aquaterm [new file with mode: 0755]
distributions/osx/gnuplot_bin/bin/install_name.sh [new file with mode: 0644]
distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/Qt5Core.dll [new file with mode: 0644]
distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/Qt5Gui.dll [new file with mode: 0644]
distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/Qt5Network.dll [new file with mode: 0644]
distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/Qt5PrintSupport.dll [new file with mode: 0644]
distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/Qt5Svg.dll [new file with mode: 0644]
distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/Qt5Widgets.dll [new file with mode: 0644]
distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/libcaca-0.dll [new file with mode: 0644]
distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/libcairo-2.dll [new file with mode: 0644]
distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/libexpat-1.dll [new file with mode: 0644]
distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/libffi-6.dll [new file with mode: 0644]
distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/libfontconfig-1.dll [new file with mode: 0644]
distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/libfreetype-6.dll [new file with mode: 0644]
distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/libgcc_s_dw2-1.dll [new file with mode: 0644]
distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/libgd-3.dll [new file with mode: 0644]
distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/libgio-2.0-0.dll [new file with mode: 0644]
distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/libglib-2.0-0.dll [new file with mode: 0644]
distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/libgmodule-2.0-0.dll [new file with mode: 0644]
distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/libgobject-2.0-0.dll [new file with mode: 0644]
distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/libiconv-2.dll [new file with mode: 0644]
distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/libintl-8.dll [new file with mode: 0644]
distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/libjpeg-62.dll [new file with mode: 0644]
distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/libpango-1.0-0.dll [new file with mode: 0644]
distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/libpangocairo-1.0-0.dll [new file with mode: 0644]
distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/libpangoft2-1.0-0.dll [new file with mode: 0644]
distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/libpangowin32-1.0-0.dll [new file with mode: 0644]
distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/libpixman-1-0.dll [new file with mode: 0644]
distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/libpng16-16.dll [new file with mode: 0644]
distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/libstdc++-6.dll [new file with mode: 0644]
distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/lua52.dll [new file with mode: 0644]
distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/wgnuplot-ja.chm [new file with mode: 0644]
distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/wgnuplot-ja.mnu [new file with mode: 0644]
distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/wgnuplot.chm [new file with mode: 0644]
distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/wgnuplot.chw [new file with mode: 0644]
distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/wgnuplot.mnu [new file with mode: 0644]
distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/wxbase30u_gcc_custom.dll [new file with mode: 0644]
distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/wxmsw30u_core_gcc_custom.dll [new file with mode: 0644]
distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/zlib1.dll [new file with mode: 0644]
distributions/windows/gnuplot_bin/gnuplot_bin_501/etc/fonts/conf.d/10-scale-bitmap-fonts.conf [new file with mode: 0644]
distributions/windows/gnuplot_bin/gnuplot_bin_501/etc/fonts/conf.d/20-unhint-small-vera.conf [new file with mode: 0644]
distributions/windows/gnuplot_bin/gnuplot_bin_501/etc/fonts/conf.d/30-metric-aliases.conf [new file with mode: 0644]
distributions/windows/gnuplot_bin/gnuplot_bin_501/etc/fonts/conf.d/30-urw-aliases.conf [new file with mode: 0644]
distributions/windows/gnuplot_bin/gnuplot_bin_501/etc/fonts/conf.d/40-nonlatin.conf [new file with mode: 0644]
distributions/windows/gnuplot_bin/gnuplot_bin_501/etc/fonts/conf.d/45-latin.conf [new file with mode: 0644]
distributions/windows/gnuplot_bin/gnuplot_bin_501/etc/fonts/conf.d/49-sansserif.conf [new file with mode: 0644]
distributions/windows/gnuplot_bin/gnuplot_bin_501/etc/fonts/conf.d/50-user.conf [new file with mode: 0644]
distributions/windows/gnuplot_bin/gnuplot_bin_501/etc/fonts/conf.d/51-local.conf [new file with mode: 0644]
distributions/windows/gnuplot_bin/gnuplot_bin_501/etc/fonts/conf.d/60-latin.conf [new file with mode: 0644]
distributions/windows/gnuplot_bin/gnuplot_bin_501/etc/fonts/conf.d/65-fonts-persian.conf [new file with mode: 0644]
distributions/windows/gnuplot_bin/gnuplot_bin_501/etc/fonts/conf.d/65-nonlatin.conf [new file with mode: 0644]
distributions/windows/gnuplot_bin/gnuplot_bin_501/etc/fonts/conf.d/69-unifont.conf [new file with mode: 0644]
distributions/windows/gnuplot_bin/gnuplot_bin_501/etc/fonts/conf.d/80-delicious.conf [new file with mode: 0644]
distributions/windows/gnuplot_bin/gnuplot_bin_501/etc/fonts/conf.d/90-synthetic.conf [new file with mode: 0644]
distributions/windows/gnuplot_bin/gnuplot_bin_501/etc/fonts/conf.d/README [new file with mode: 0644]
distributions/windows/gnuplot_bin/gnuplot_bin_501/etc/fonts/fonts.conf [new file with mode: 0644]
distributions/windows/gnuplot_bin/gnuplot_bin_501/etc/pango/1.6.0/modules/pango-arabic-fc.dll [new file with mode: 0755]
distributions/windows/gnuplot_bin/gnuplot_bin_501/etc/pango/1.6.0/modules/pango-arabic-lang.dll [new file with mode: 0755]
distributions/windows/gnuplot_bin/gnuplot_bin_501/etc/pango/1.6.0/modules/pango-basic-fc.dll [new file with mode: 0755]
distributions/windows/gnuplot_bin/gnuplot_bin_501/etc/pango/1.6.0/modules/pango-basic-win32.dll [new file with mode: 0755]
distributions/windows/gnuplot_bin/gnuplot_bin_501/etc/pango/1.6.0/modules/pango-hangul-fc.dll [new file with mode: 0755]
distributions/windows/gnuplot_bin/gnuplot_bin_501/etc/pango/1.6.0/modules/pango-hebrew-fc.dll [new file with mode: 0755]
distributions/windows/gnuplot_bin/gnuplot_bin_501/etc/pango/1.6.0/modules/pango-indic-fc.dll [new file with mode: 0755]
distributions/windows/gnuplot_bin/gnuplot_bin_501/etc/pango/1.6.0/modules/pango-indic-lang.dll [new file with mode: 0755]
distributions/windows/gnuplot_bin/gnuplot_bin_501/etc/pango/1.6.0/modules/pango-khmer-fc.dll [new file with mode: 0755]
distributions/windows/gnuplot_bin/gnuplot_bin_501/etc/pango/1.6.0/modules/pango-syriac-fc.dll [new file with mode: 0755]
distributions/windows/gnuplot_bin/gnuplot_bin_501/etc/pango/1.6.0/modules/pango-thai-fc.dll [new file with mode: 0755]
distributions/windows/gnuplot_bin/gnuplot_bin_501/etc/pango/1.6.0/modules/pango-tibetan-fc.dll [new file with mode: 0755]
distributions/windows/gnuplot_bin/gnuplot_bin_501/etc/pango/pango.modules [new file with mode: 0644]
html/doc/biaspar.imach
html/doc/mypar.imach
src/Makefile

diff --git a/distributions/osx/gnuplot_bin/bin/gnuplot b/distributions/osx/gnuplot_bin/bin/gnuplot
new file mode 100755 (executable)
index 0000000..b62c20a
Binary files /dev/null and b/distributions/osx/gnuplot_bin/bin/gnuplot differ
diff --git a/distributions/osx/gnuplot_bin/bin/gnuplot-5.1_cvs8Dec13:19:21-aquaterm b/distributions/osx/gnuplot_bin/bin/gnuplot-5.1_cvs8Dec13:19:21-aquaterm
new file mode 100755 (executable)
index 0000000..b62c20a
Binary files /dev/null and b/distributions/osx/gnuplot_bin/bin/gnuplot-5.1_cvs8Dec13:19:21-aquaterm differ
diff --git a/distributions/osx/gnuplot_bin/bin/install_name.sh b/distributions/osx/gnuplot_bin/bin/install_name.sh
new file mode 100644 (file)
index 0000000..65c3e1d
--- /dev/null
@@ -0,0 +1,69 @@
+#!/bin/bash
+cp /Users/nbrouard/RPMS/gnuplot-cvs/gnuplot/gnuplot-5.1_cvs8Dec13\:19\:21-aquaterm .
+ln -f gnuplot-5.1_cvs8Dec13\:19\:21-aquaterm gnuplot
+otool -L gnuplot
+mv /usr/local/libold /usr/local/lib
+# libgd.3.dylib libjpeg.8.dylib libpng16.16.dylib libtiff.5.dylib libpangocairo-1.0.0.dylib libpango-1.0.0.dylib libgobject-2.0.0.dylib libglib-2.0.0.dylib libintl.8.dylib  libcairo.2.dylib
+rm -rf ../lib
+mkdir ../lib
+for i in `otool -L gnuplot |grep /usr/local|awk '{print $1}'`
+do
+    cp -n ${i} ../lib
+    ii=`echo ${i} | awk -F / '{print $NF}'`
+    echo ii=${ii}
+#otool -L ../lib/${i} |grep /usr/local/lib|awk -F "[/ ]" '{print $5}'`
+    echo TO BE DONE 2 `otool -L ../lib/${ii} |grep /usr/local|awk '{print $1}'`
+    for j in `otool -L ../lib/${ii} |grep /usr/local|awk '{print $1}'`
+    do
+       jj=`echo ${j} | awk -F / '{print $NF}'`
+       echo jj=${jj}
+       chmod -R u+rw ../lib
+       cp -n ${j} ../lib
+       if [ ${i} == ${j} ]; then
+           install_name_tool -id @executable_path/../lib/${jj} ../lib/${ii}
+       else
+           install_name_tool -change ${j} @executable_path/../lib/${jj} ../lib/${ii}
+       fi
+       echo TO BE DONE 3 `otool -L ../lib/${jj} |grep /usr/local|awk '{print $1}'`
+       for k in `otool -L ../lib/${jj} |grep /usr/local|awk '{print $1}'`
+       do
+           kk=`echo ${k} | awk -F / '{print $NF}'`
+       echo kk=${kk}
+       chmod -R u+rw ../lib
+       cp -n ${k} ../lib
+       if [ ${k} == ${j} ]; then
+           install_name_tool -id @executable_path/../lib/${kk} ../lib/${jj}
+       else
+           install_name_tool -change ${k} @executable_path/../lib/${kk} ../lib/${jj}
+       fi  
+       done
+       echo DONE 3 OTOOL -L 
+       otool -L ../lib/${jj}
+    done
+    DONE 2 OTOOL -L
+    otool -L ../lib/${ii}
+    install_name_tool -change ${i} @executable_path/../lib/${ii} gnuplot 
+done
+#for i in libfreetype.6.dylib libfontconfig.1.dylib
+# for i in libfreetype.6.dylib libfontconfig.1.dylib
+# do
+#     cp -f /opt/X11/lib/${i} ../lib
+#     echo TO BE DONE 2 `otool -L ../lib/${i} |grep /usr/local/lib|awk -F "[/ ]" '{print $5}'`
+#     for j in `otool -L ../lib/${i} |grep /usr/local/lib|awk -F "[/ ]" '{print $5}'`
+#     do
+#      chmod -R u+rw ../lib
+#      cp /opt/X11/lib/${j} ../lib
+#      if [ ${i} == ${j} ]; then
+#          install_name_tool -id @executable_path/../lib/${j} ../lib/${i}
+#      else
+#          install_name_tool -change /opt/X11/lib/${j} @executable_path/../lib/${j} ../lib/${i}
+#      fi
+#      otool -L ../lib/${i}
+#     done
+#     install_name_tool -change /opt/X11/lib/${i} @executable_path/../lib/${i} gnuplot 
+# done
+mv /usr/local/lib /usr/local/libold
+PATH=/usr/bin:/bin:/usr/sbin:/sbin::/Users/nbrouard/bin DYLD_PRINT_LIBRARIES=y ./gnuplot -e "set out 'toto.png'; set ter pngcairo; plot sin(x);"
+exit
+
diff --git a/distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/Qt5Core.dll b/distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/Qt5Core.dll
new file mode 100644 (file)
index 0000000..62148b7
Binary files /dev/null and b/distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/Qt5Core.dll differ
diff --git a/distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/Qt5Gui.dll b/distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/Qt5Gui.dll
new file mode 100644 (file)
index 0000000..831cba5
Binary files /dev/null and b/distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/Qt5Gui.dll differ
diff --git a/distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/Qt5Network.dll b/distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/Qt5Network.dll
new file mode 100644 (file)
index 0000000..d53e3aa
Binary files /dev/null and b/distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/Qt5Network.dll differ
diff --git a/distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/Qt5PrintSupport.dll b/distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/Qt5PrintSupport.dll
new file mode 100644 (file)
index 0000000..e2b778d
Binary files /dev/null and b/distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/Qt5PrintSupport.dll differ
diff --git a/distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/Qt5Svg.dll b/distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/Qt5Svg.dll
new file mode 100644 (file)
index 0000000..3cbd2ce
Binary files /dev/null and b/distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/Qt5Svg.dll differ
diff --git a/distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/Qt5Widgets.dll b/distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/Qt5Widgets.dll
new file mode 100644 (file)
index 0000000..c5f0d7e
Binary files /dev/null and b/distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/Qt5Widgets.dll differ
diff --git a/distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/libcaca-0.dll b/distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/libcaca-0.dll
new file mode 100644 (file)
index 0000000..ceb09e7
Binary files /dev/null and b/distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/libcaca-0.dll differ
diff --git a/distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/libcairo-2.dll b/distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/libcairo-2.dll
new file mode 100644 (file)
index 0000000..a82cc48
Binary files /dev/null and b/distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/libcairo-2.dll differ
diff --git a/distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/libexpat-1.dll b/distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/libexpat-1.dll
new file mode 100644 (file)
index 0000000..cfbca5b
Binary files /dev/null and b/distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/libexpat-1.dll differ
diff --git a/distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/libffi-6.dll b/distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/libffi-6.dll
new file mode 100644 (file)
index 0000000..0e5a55a
Binary files /dev/null and b/distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/libffi-6.dll differ
diff --git a/distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/libfontconfig-1.dll b/distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/libfontconfig-1.dll
new file mode 100644 (file)
index 0000000..0adb88f
Binary files /dev/null and b/distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/libfontconfig-1.dll differ
diff --git a/distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/libfreetype-6.dll b/distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/libfreetype-6.dll
new file mode 100644 (file)
index 0000000..9063756
Binary files /dev/null and b/distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/libfreetype-6.dll differ
diff --git a/distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/libgcc_s_dw2-1.dll b/distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/libgcc_s_dw2-1.dll
new file mode 100644 (file)
index 0000000..410dc57
Binary files /dev/null and b/distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/libgcc_s_dw2-1.dll differ
diff --git a/distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/libgd-3.dll b/distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/libgd-3.dll
new file mode 100644 (file)
index 0000000..53f6c53
Binary files /dev/null and b/distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/libgd-3.dll differ
diff --git a/distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/libgio-2.0-0.dll b/distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/libgio-2.0-0.dll
new file mode 100644 (file)
index 0000000..7ef7113
Binary files /dev/null and b/distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/libgio-2.0-0.dll differ
diff --git a/distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/libglib-2.0-0.dll b/distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/libglib-2.0-0.dll
new file mode 100644 (file)
index 0000000..7d3701a
Binary files /dev/null and b/distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/libglib-2.0-0.dll differ
diff --git a/distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/libgmodule-2.0-0.dll b/distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/libgmodule-2.0-0.dll
new file mode 100644 (file)
index 0000000..b29ba32
Binary files /dev/null and b/distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/libgmodule-2.0-0.dll differ
diff --git a/distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/libgobject-2.0-0.dll b/distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/libgobject-2.0-0.dll
new file mode 100644 (file)
index 0000000..2aa5953
Binary files /dev/null and b/distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/libgobject-2.0-0.dll differ
diff --git a/distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/libiconv-2.dll b/distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/libiconv-2.dll
new file mode 100644 (file)
index 0000000..462fa5f
Binary files /dev/null and b/distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/libiconv-2.dll differ
diff --git a/distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/libintl-8.dll b/distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/libintl-8.dll
new file mode 100644 (file)
index 0000000..f2529ca
Binary files /dev/null and b/distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/libintl-8.dll differ
diff --git a/distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/libjpeg-62.dll b/distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/libjpeg-62.dll
new file mode 100644 (file)
index 0000000..6e94127
Binary files /dev/null and b/distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/libjpeg-62.dll differ
diff --git a/distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/libpango-1.0-0.dll b/distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/libpango-1.0-0.dll
new file mode 100644 (file)
index 0000000..ae5789d
Binary files /dev/null and b/distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/libpango-1.0-0.dll differ
diff --git a/distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/libpangocairo-1.0-0.dll b/distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/libpangocairo-1.0-0.dll
new file mode 100644 (file)
index 0000000..0d62bcd
Binary files /dev/null and b/distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/libpangocairo-1.0-0.dll differ
diff --git a/distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/libpangoft2-1.0-0.dll b/distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/libpangoft2-1.0-0.dll
new file mode 100644 (file)
index 0000000..bf29a4f
Binary files /dev/null and b/distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/libpangoft2-1.0-0.dll differ
diff --git a/distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/libpangowin32-1.0-0.dll b/distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/libpangowin32-1.0-0.dll
new file mode 100644 (file)
index 0000000..8bb635f
Binary files /dev/null and b/distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/libpangowin32-1.0-0.dll differ
diff --git a/distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/libpixman-1-0.dll b/distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/libpixman-1-0.dll
new file mode 100644 (file)
index 0000000..7fbccae
Binary files /dev/null and b/distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/libpixman-1-0.dll differ
diff --git a/distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/libpng16-16.dll b/distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/libpng16-16.dll
new file mode 100644 (file)
index 0000000..bba036a
Binary files /dev/null and b/distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/libpng16-16.dll differ
diff --git a/distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/libstdc++-6.dll b/distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/libstdc++-6.dll
new file mode 100644 (file)
index 0000000..93e34a8
Binary files /dev/null and b/distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/libstdc++-6.dll differ
diff --git a/distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/lua52.dll b/distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/lua52.dll
new file mode 100644 (file)
index 0000000..d8db590
Binary files /dev/null and b/distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/lua52.dll differ
diff --git a/distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/wgnuplot-ja.chm b/distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/wgnuplot-ja.chm
new file mode 100644 (file)
index 0000000..d78d27a
Binary files /dev/null and b/distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/wgnuplot-ja.chm differ
diff --git a/distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/wgnuplot-ja.mnu b/distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/wgnuplot-ja.mnu
new file mode 100644 (file)
index 0000000..61c9c84
--- /dev/null
@@ -0,0 +1,755 @@
+; Menu file for Windows gnuplot
+; Roger Hadgraft, 26-5-92
+; Russell Lang, 30 Nov 1992
+; Modified for 4.0, John Bollinger, 31 Dec 2002
+; translated by Masahito Yamaga (ma@yama-ga.com) (for 3.7.2)
+; translated by Shigeharu TAKENO 03/25 2006 (for 4.1)
+; $Id$
+
+[Menu]
+\83t\83@\83C\83\8b(&F)
+       \8aJ\82­(&O) ...
+               load '[OPEN]load[EOS]*.plt[EOS]'{ENTER}
+       \95Û\91¶(&S) ...
+               save '[SAVE]save[EOS]*.plt[EOS]'{ENTER}
+       \83f\83\82(&D) ...
+               load '[OPEN]load[EOS]*.dem[EOS]'{ENTER}
+       --
+       \83f\83B\83\8c\83N\83g\83\8a\82Ì\88Ú\93®(&C) ...
+               cd '[DIRECTORY]New directory?[EOS]'{ENTER}
+       \8c»\8dÝ\82Ì\83f\83B\83\8c\83N\83g\83\8a(&D)
+               pwd{ENTER}
+       --
+       \8fo\97Í\90æ\82Ì\90Ý\92è(&U) ...
+               set output "[INPUT]Output filename?[EOS]"{ENTER}
+       \83v\83\8a\83\93\83^\82Ö(&P)
+               set output "PRN"{ENTER}
+       \83E\83B\83\93\83h\83E\95\\8e¦(&W)
+               set output{ENTER}set terminal win{ENTER} 
+       \8c»\8dÝ\82Ì\8fo\97Í\90æ
+               show output{ENTER}
+       \8fo\97Í\83f\83o\83C\83X\82Ì\90Ý\92è(&T) ...
+               set terminal [INPUT]Terminal type?{ENTER}
+       \8fo\97Í\83f\83o\83C\83X\82Ì\95\\8e¦
+               set terminal{ENTER}show terminal{ENTER}
+       --
+       [Menu]
+       \8ds\95Ò\8fW
+               \91O\82É\8eÀ\8ds\82µ\82½\83R\83}\83\93\83h    ^P
+                       {^P}
+               \8e\9f\82É\8eÀ\8ds\82µ\82½\83R\83}\83\93\83h    ^N
+                       {^N}
+               --
+               \88ê\95\8e\9a\96ß\82é      ^B
+                       {^B}
+               \88ê\95\8e\9a\90i\82Þ      ^F
+                       {^F}
+               --
+               \8ds\93ª\82Ö\88Ú\93®      ^A
+                       {^A}
+               \8ds\96\96\82Ö\88Ú\93®      ^E
+                       {^E}
+               --
+               \83J\81[\83\\83\8b\82Ì\91O\82Ì\88ê\95\8e\9a\82ð\8dí\8f\9c      ^H
+                       {^H}
+               \83J\81[\83\\83\8b\8fã\82Ì\88ê\95\8e\9a\8dí\8f\9c  ^D
+                       {^D}
+               \83J\81[\83\\83\8b\82Ì\91O\82Ì\88ê\8cê\82ð\8dí\8f\9c        ^W
+                       {^W}
+               \83J\81[\83\\83\8b\88È\8d~\82ð\82·\82×\82Ä\8dí\8f\9c        ^K
+                       {^K}
+               \8ds\82ð\82·\82×\82Ä\8dí\8f\9c  ^U
+                       {^U}
+               --
+               \8ds\82ð\8dÄ\95\\8e¦      ^L
+                       {^L}
+               [EndMenu]
+               DOS \91\8b\82ð\8aJ\82­
+                       shell{ENTER}
+               DOS \82Ì\83R\83}\83\93\83h\82ð\8eÀ\8ds ...
+                       ![INPUT]DOS command?{ENTER}
+               --
+               \8fI\97¹(&X)
+               quit{ENTER}
+[EndMenu]
+
+[Menu]
+\83v\83\8d\83b\83g(&P)
+       \83v\83\8d\83b\83g (plot)
+               plot 
+       3\8e\9f\8c³\83v\83\8d\83b\83g (splot)
+               splot 
+       \8dÄ\83v\83\8d\83b\83g (replot)
+               replot{ENTER}
+       \83f\83o\83C\83X\82ð\83N\83\8a\83A (clear)
+               clear{ENTER}
+       --
+       \94Í\88Í\8ew\92è
+               [[INPUT]Lower bound?[EOS]:[INPUT]Upper bound?[EOS]] [EOS]
+       \93Á\92è\82Ì\95Ï\90\94\82Ì\94Í\88Í\8ew\92è
+               [[INPUT]Variable name?[EOS]=[INPUT]Lower bound?[EOS]:[INPUT]Upper bound?[EOS]] [EOS]
+       --
+       \83f\81[\83^\83t\83@\83C\83\8b\96¼ ...
+               '[OPEN]Open[EOS]*.dat[EOS]' [EOS]
+       x,y \82Æ\82µ\82Ä\8eg\82¤\97ñ
+               using [INPUT]X column?[EOS]:[INPUT]Y column?[EOS] [EOS]
+       x,y,ydelta \82Æ\82µ\82Ä\8eg\82¤\97ñ
+               using [INPUT]X column?[EOS]:[INPUT]Y column?[EOS]:[INPUT]Ydelta column?[EOS] [EOS]
+       x,y,ylow,yhigh \82Æ\82µ\82Ä\8eg\82¤\97ñ
+               using [INPUT]X column?[EOS]:[INPUT]Y column?[EOS]:[INPUT]Ylow column?[EOS]:[INPUT]Yhigh column?[EOS] [EOS]
+       --
+       [Menu]
+       \83X\83^\83C\83\8b (\92P\88ê)
+               \90ü (Lines)
+                       with lines
+               \83|\83C\83\93\83g (Points)
+                       with points
+               \90ü\82Æ\83|\83C\83\93\83g (Lines and Points)
+                       with linespoints
+               \90\82\90ü (Impulses)
+                       with impulses
+               \83h\83b\83g (Dots)
+                       with dots
+               \83X\83e\83b\83v (Steps)
+                       with steps
+               \8e\9f\82Ì\8d\82\82³\82Ì\83X\83e\83b\83v (Fsteps)
+                       with fsteps
+               \83q\83X\83g\83O\83\89\83\80\83X\83e\83b\83v (Histeps)
+                       with histeps
+       [EndMenu]
+       [Menu]
+       \83X\83^\83C\83\8b (\95¡\8d\87)
+               \83G\83\89\81[\83o\81[ (Error Bars)
+                       with errorbars
+               X \83G\83\89\81[\83o\81[
+                       with xerrorbars
+               Y \83G\83\89\81[\83o\81[
+                       with yerrorbars
+               XY \83G\83\89\81[\83o\81[
+                       with xyerrorbars
+               \83G\83\89\81[\83\89\83C\83\93 (Error Lines)
+                       with errorlines
+               X \83G\83\89\81[\83\89\83C\83\93
+                       with xerrorlines
+               Y \83G\83\89\81[\83\89\83C\83\93
+                       with yerrorlines
+               XY \83G\83\89\81[\83\89\83C\83\93
+                       with xyerrorlines
+               \8bé\8c` (Boxes)
+                       with boxes
+               \97Ì\88æ\93h\82è\82Â\82Ô\82µ (Filled Curves)
+                       with filledcurves
+               \8bé\8c`\82Æ\83G\83\89\81[\83o\81[ (Box Error Bars)
+                       with boxerrorbars
+               \8bé\8c`\82Æ XY \83G\83\89\81[\83o\81[
+                       with boxxyerrorbars
+               \8bà\97Z\83f\81[\83^\8c`\8e® (Finance Bars)
+                       with financebars
+               \93\95\91ä\8c`\8e® (Candlesticks)
+                       with candlesticks
+       [EndMenu]
+[EndMenu]
+
+[Menu]
+\95\\8c»(&E)
+       \95Ï\90\94
+               print 
+       \95¡\91f\90\94 ...
+               {[INPUT]Real part?[EOS],[INPUT]Imaginary part?[EOS]}
+       [Menu]
+       \92P\8d\80\89\89\8eZ\8eq
+               \95\89\95\84\8d\86  -a
+                       -[INPUT]Arg
+               \90³\95\84\8d\86  +a
+                       +[INPUT]Arg
+               \95â\90\94    ~a
+                       ~[INPUT]Arg
+               \98_\97\9d\94Û\92è        !a
+                       ![INPUT]Arg
+               \8aK\8fæ    a!
+                       [INPUT]Arg[EOS]!
+       [EndMenu]
+       [Menu]
+       2 \8d\80\89\89\8eZ\8eq
+               \97Ý\8fæ    **
+                       **
+               \90Ï      *
+                       *
+               \8f¤      /
+                       /
+               \98a      +
+                       +
+               \8d·      -
+                       -
+               --
+               \8fè\97]    %
+                       %
+       [EndMenu]
+       [Menu]
+       \98_\97\9d\89\89\8eZ\8eq
+               \93\99\82µ\82¢  ==
+                       ==
+               \93\99\82µ\82­\82È\82¢      !=
+                       !=
+               --
+               \82æ\82è\8f¬\82³\82¢      <
+                       <
+               \88È\89º    <=
+                       <=
+               \82æ\82è\91å\82«\82¢      >
+                       >
+               \88È\8fã    >=
+                       >=
+               --
+               \83r\83b\83g\82²\82Æ\82Ì AND        &
+                       &
+               \83r\83b\83g\82²\82Æ\82Ì\94r\91¼\93I OR   ^
+                       ^
+               \83r\83b\83g\82²\82Æ\82Ì OR |
+                       |
+               --
+               \98_\97\9d\93I AND      &&
+                       &&
+               \98_\97\9d\93I OR       ||
+                       ||
+               --
+               3 \8d\80\89\89\8eZ\8eq      a?b:c
+                       [INPUT]First arg[EOS]?[INPUT]Second arg[EOS]:[INPUT]Third arg[EOS]
+       [EndMenu]
+[EndMenu]
+[Menu]
+\8aÖ\90\94(&N)
+       [Menu]
+       \8f\89\93\99\8aÖ\90\94
+               \97\90\90\94
+                       rand([INPUT]Argument[EOS])
+               \90â\91Î\92l (abs)
+                       abs([INPUT]Argument[EOS])
+               \95\84\8d\86 (sgn)
+                       sgn([INPUT]Argument[EOS])
+               --
+               \88ø\90\94\82æ\82è\8f¬\82³\82­\82È\82¢\8dÅ\8f¬\82Ì\90®\90\94 (ceil)
+                       ceil([INPUT]Argument[EOS])
+               \88ø\90\94\82æ\82è\91å\82«\82­\82È\82¢\8dÅ\91å\82Ì\90®\90\94 (floor)
+                       floor([INPUT]Argument[EOS])
+               \90®\90\94 (int)
+                       int([INPUT]Argument[EOS])
+               --
+               \95½\95û\8dª (sqrt)
+                       sqrt([INPUT]Argument[EOS])
+               \8ew\90\94 (exp)
+                       exp([INPUT]Argument[EOS])
+               \8e©\91R\91Î\90\94 (log)
+                       log([INPUT]Argument[EOS])
+               \8fí\97p\91Î\90\94 (log10)
+                       log10([INPUT]Argument[EOS])
+               --
+               cos
+                       cos([INPUT]Argument[EOS])
+               sin
+                       sin([INPUT]Argument[EOS])
+               tan
+                       tan([INPUT]Argument[EOS])
+               --
+               arc cos
+                       acos([INPUT]Argument[EOS])
+               arc sin
+                       asin([INPUT]Argument[EOS])
+               arc tan
+                       atan([INPUT]Argument[EOS])
+               arc tan 2
+                       atan2([INPUT]"y" argument[EOS],[INPUT]"x" argument[EOS])
+               --
+               cosh
+                       cosh([INPUT]Argument[EOS])
+               sinh
+                       sinh([INPUT]Argument[EOS])
+               tanh
+                       tanh([INPUT]Argument[EOS])
+               --
+               \8b\95\95\94 (imag)
+                       imag([INPUT]Argument[EOS])
+               \8eÀ\95\94 (real)
+                       real([INPUT]Argument[EOS])
+               \95Î\8ap (arg)
+                       arg([INPUT]Argument[EOS])
+       [EndMenu]
+       [Menu]
+       \93Á\8eê\8aÖ\90\94
+               \8cë\8d·\8aÖ\90\94 (erf)
+                       erf([INPUT]Argument[EOS])
+               \8cë\8d·\95â\8aÖ\90\94 (erfc)
+                       erfc([INPUT]Argument[EOS])
+               \8bt\8cë\8d·\8aÖ\90\94 (inverf)
+                       inverf([INPUT]Argument[EOS])
+               --
+               \83K\83\93\83}\8aÖ\90\94 (gamma)
+                       gamma([INPUT]Argument[EOS])
+               \95s\8a®\91S\83K\83\93\83}\8aÖ\90\94 (igamma)
+                       igamma([INPUT]First argument[EOS],[INPUT]Second argument[EOS])
+               \91Î\90\94\83K\83\93\83}\8aÖ\90\94 (lgamma)
+                       lgamma([INPUT]Argument[EOS])
+               --
+               \95s\8a®\91S\83x\81[\83^\8aÖ\90\94 (ibeta)
+                       ibeta([INPUT]First argument[EOS],[INPUT]Second argument[EOS],[INPUT]Third argument[EOS])
+               --
+               J0 \83x\83b\83Z\83\8b\8aÖ\90\94 (besj0)
+                       besj0([INPUT]Argument[EOS])
+               J1 \83x\83b\83Z\83\8b\8aÖ\90\94 (besj1)
+                       besj1([INPUT]Argument[EOS])
+               Y0 \83x\83b\83Z\83\8b\8aÖ\90\94 (besy0)
+                       besy0([INPUT]Argument[EOS])
+               Y1 \83x\83b\83Z\83\8b\8aÖ\90\94 (besy1)
+                       besy1([INPUT]Argument[EOS])
+               --
+               \83\89\83\93\83x\83\8b\83g W \8aÖ\90\94 (lambertw)
+                       lambertw([INPUT]Argument[EOS])
+
+       [EndMenu]
+       [Menu]
+       \93\9d\8cv\8aw\8aÖ\90\94
+               \90³\8bK\95ª\95z\8aÖ\90\94 (norm)
+                       norm([INPUT]Argument[EOS])
+               \8bt\90³\8bK\95ª\95z\8aÖ\90\94 (invnrom)
+                       invnorm([INPUT]Argument[EOS])
+       [EndMenu]
+       --
+       \8aÖ\90\94\82ð\92è\8b` ...
+               [INPUT]Name for function?[EOS][INPUT]Variable/s, eg. (a,b) ?[EOS]=
+       \92è\8b`\82µ\82½\8aÖ\90\94\82ð\95\\8e¦
+               show functions{ENTER}
+       --
+       \95Ï\90\94\82ð\92è\8b` ...
+               [INPUT]Name for variable?[EOS]=[INPUT]Value, eg. 9.81 ?{ENTER}
+       \92è\8b`\82µ\82½\95Ï\90\94\82ð\95\\8e¦
+               show variables{ENTER}
+       --
+       x \83_\83~\81[\95Ï\90\94
+               set dummy [INPUT]Variable name?{ENTER}
+       x,y \83_\83~\81[\95Ï\90\94
+               set dummy [INPUT]Variable names (eg. u,v)?{ENTER}
+       \83_\83~\81[\95Ï\90\94\82ð\95\\8e¦
+               show dummy{ENTER}
+[EndMenu]
+
+[Menu]
+\88ê\94Ê(&G)
+       \98g\82ð\82Â\82¯\82é
+               set border{ENTER}
+       \98g\82ð\82Â\82¯\82È\82¢
+               unset border{ENTER}
+       \98g\82Ì\8fó\91Ô\82ð\95\\8e¦
+               show border{ENTER}
+       --
+       \8bé\8c`\82Ì\95\9d\82ð\90Ý\92è
+               set boxwidth [INPUT]Box Width?{ENTER}
+       \8bé\8c`\82Ì\95\9d\82ð\8e©\93®\90Ý\92è
+               set boxwidth{ENTER}
+       \8bé\8c`\82Ì\95\9d\82ð\95\\8e¦
+               show boxwidth{ENTER}
+       --
+       \90ü\8eí\82Ì\95\\8e¦
+               test{ENTER}
+       --
+       [Menu]
+       \94}\89î\95Ï\90\94
+               \94}\89î\95Ï\90\94\95\\8e¦\82É\82·\82é
+                       set parametric{ENTER}
+               \94}\89î\95Ï\90\94\95\\8e¦\82ð\82µ\82È\82¢
+                       unset parametric{ENTER}
+               \94}\89î\95Ï\90\94\95\\8e¦\82Ì\8fó\91Ô\82ð\95\\8e¦
+                       show parametric{ENTER}
+               --
+               t \82Ì\94Í\88Í
+                       set trange [[INPUT]Lower bound?[EOS]:[INPUT]Upper bound?[EOS]]{ENTER}
+               u \82Ì\94Í\88Í
+                       set urange [[INPUT]Lower bound?[EOS]:[INPUT]Upper bound?[EOS]]{ENTER}
+               v \82Ì\94Í\88Í
+                       set vrange [[INPUT]Lower bound?[EOS]:[INPUT]Upper bound?[EOS]]{ENTER}
+       [EndMenu]
+       --
+       [Menu]
+       \90Ø\82è\94²\82«
+       \8b«\8aE\82É\8bß\82¢\93_\82ð\8dí\82é
+               set clip points{ENTER}
+       \88ê\95û\82Ì\92[\82¾\82¯\90Ø\82è\8eæ\82é
+               set clip one{ENTER}
+       \97¼\92[\82ð\90Ø\82è\8eæ\82é
+               set clip two{ENTER}
+       \90Ø\82è\8eæ\82ç\82È\82¢
+               unset clip{ENTER}
+       \90Ø\82è\94²\82«\95û\82Ì\8fó\91Ô\82ð\95\\8e¦
+               show clip{ENTER}
+       [EndMenu]
+       --
+       [Menu]
+       \8bÉ\8dÀ\95W
+       \8bÉ\8dÀ\95W\8cn\82É\95Ï\8dX
+               set polar{ENTER}
+       \92¼\8cð\8dÀ\95W\82É\95Ï\8dX
+               unset polar{ENTER}
+       \8bÉ\8dÀ\95W\8cn\82©\82Ç\82¤\82©\82ð\95\\8e¦
+               show polar{ENTER}
+       \93®\8ca\95û\8cü\82Ì\94Í\88Í\8ew\92è
+               set rrange [[INPUT]Lower bound?[EOS]:[INPUT]Upper bound?[EOS]]{ENTER}
+       \8ap\93x\82ð\93x\82Å\8ew\92è
+               set angles degrees{ENTER}
+       \8ap\93x\82ð\83\89\83W\83A\83\93\82Å\8ew\92è
+               set angles radians{ENTER}
+       \8ap\93x\82Ì\92P\88Ê\82ð\95\\8e¦
+               show angles{ENTER}
+       [EndMenu]
+       --
+       \8fk\8eÚ\82ð\90Ý\92è
+               set size [INPUT]Xscale?[EOS],[INPUT]Yscale?{ENTER}
+       \8fk\8eÚ\82ð\95\\8e¦
+               show size{ENTER}
+       --
+       \8aÖ\90\94\82Ì\83T\83\93\83v\83\8a\83\93\83O\90\94\82ð\8ew\92è
+               set sample [INPUT]Sampling rate (default=100)?{ENTER}
+       \8aÖ\90\94\82Ì\83T\83\93\83v\83\8a\83\93\83O\90\94\82ð\95\\8e¦
+               show sample{ENTER}
+[EndMenu]
+
+[Menu]
+\8e²(&A)
+       \8e©\93®\8fk\8eÚ\82ð\8eg\82¤
+               set autoscale [INPUT]Which axes (eg. xy)?{ENTER}
+       \8e©\93®\8fk\8eÚ\82ð\8eg\82í\82È\82¢
+               unset autoscale [INPUT]Which axes (eg. xy)?{ENTER}
+       \8e©\93®\8fk\8eÚ\82Ì\8fó\91Ô\82ð\95\\8e¦
+               show autoscale{ENTER}
+       --
+       \91Î\90\94\8e²\82ð\8eg\82¤
+               set logscale [INPUT]Which axes (eg. xy)?{ENTER}
+       \91Î\90\94\8e²\82ð\8eg\82í\82È\82¢
+               unset logscale [INPUT]Which axes (eg. xy)?{ENTER}
+       \91Î\90\94\8e²\82Ì\8fó\91Ô\82ð\95\\8e¦
+               show logscale{ENTER}
+       --
+       [Menu]
+       \96Ú\90·
+               \96Ú\90·\8c©\8fo\82µ\82Ì\8f\91\8e®\82ð\8ew\92è
+                       set format [INPUT]Axes?[EOS] "[INPUT]Format string?[EOS]"{ENTER}
+               \96Ú\90·\8c©\8fo\82µ\82Ì\8f\91\8e®\82ð\95\\8e¦
+                       show format{ENTER}
+               --
+               \96Ú\90·\82ð\93à\91¤\82É (\83f\83t\83H\83\8b\83g)
+                       set tics in{ENTER}
+               \96Ú\90·\82ð\8aO\91¤\82É
+                       set tics out{ENTER}
+               \96Ú\90·\82Ì\90Ý\92è\82ð\95\\8e¦
+                       show tics{ENTER}
+               --
+               z\8e²\82Ì\8d\82\82³\82Ì\8ew\92è
+                       set ticslevel [INPUT]Level (default=0.5)?{ENTER}
+               --
+               \96Ú\90·\82Ì\8aÔ\8au\82Ì\8ew\92è
+                       set [INPUT]Axis: x, y or z ?[EOS]tics [INPUT]Start, Increment, End (eg. 0,0.5,10) ?{ENTER}
+               --
+               \96Ú\90·\82Ì\90Ý\92è\8aJ\8en
+                       set [INPUT]Axis: x, y or z ?[EOS]tics ("[INPUT]Label text?[EOS]" [INPUT]Position?[EOS]
+               \96Ú\90·\82Ì\83\89\83x\83\8b\82Æ\88Ê\92u\82Ì\8ew\92è
+                       ,"[INPUT]Label text?[EOS]" [INPUT]Position?[EOS]
+               \96Ú\90·\82Ì\90Ý\92è\8fI\97¹
+                       ){ENTER}
+       [EndMenu]
+       --
+       X \82Ì\94Í\88Í
+               set xrange [[INPUT]Lower bound?[EOS]:[INPUT]Upper bound?[EOS]]{ENTER}
+       Y \82Ì\94Í\88Í
+               set yrange [[INPUT]Lower bound?[EOS]:[INPUT]Upper bound?[EOS]]{ENTER}
+       Z \82Ì\94Í\88Í
+               set zrange [[INPUT]Lower bound?[EOS]:[INPUT]Upper bound?[EOS]]{ENTER}
+       --
+       X \8e²\82Ì\83\89\83x\83\8b
+               set xlabel "[INPUT]Label text?[EOS]" [INPUT]X offset, Y offset (eg. 2,3) ?{ENTER}
+       Y \8e²\82Ì\83\89\83x\83\8b
+               set ylabel "[INPUT]Label text?[EOS]" [INPUT]X offset, Y offset (eg. 2,3) ?{ENTER}
+       Z \8e²\82Ì\83\89\83x\83\8b
+               set zlabel "[INPUT]Label text?[EOS]" [INPUT]X offset, Y offset (eg. 2,3) ?{ENTER}
+       \8e²\82Ì\83\89\83x\83\8b\82ð\95\\8e¦
+               show xlabel{ENTER}show ylabel{ENTER}show zlabel{ENTER}
+       --
+       X \8e²\82ð\82Ð\82©\82È\82¢
+               unset xzeroaxis{ENTER}
+       Y \8e²\82ð\82Ð\82©\82È\82¢
+               unset yzeroaxis{ENTER}
+       X,Y \97¼\8e²\82ð\82Ð\82­
+               set zeroaxis{ENTER}
+       \8e²\82Ì\8fó\91Ô\82ð\95\\8e¦
+               show zeroaxis{ENTER}
+[EndMenu]
+
+[Menu]
+\83`\83\83\81[\83g(&C)
+       \83O\83\8a\83b\83h\82ð\95\\8e¦\82·\82é
+               set grid{ENTER}
+       \83O\83\8a\83b\83h\82ð\95\\8e¦\82µ\82È\82¢
+               unset grid{ENTER}
+       \83O\83\8a\83b\83h\82Ì\8fó\91Ô\82ð\95\\8e¦
+               show grid{ENTER}
+       --
+       \96î\88ó\82ð\92Ç\89Á
+               set arrow [INPUT]Tag (1-99)?[EOS] from [INPUT]From coordinate?[EOS] to [INPUT]To coordinate?{ENTER}
+       \96î\88ó\82ð\8dí\8f\9c
+               unset arrow [INPUT]Tag (1-99)?{ENTER}
+       \96î\88ó\82Ì\8fó\91Ô\82ð\95\\8e¦
+               show arrow{ENTER}
+       --
+       \83\89\83x\83\8b\82ð\92Ç\89Á
+               set label [INPUT]Tag?[EOS] "[INPUT]Label?[EOS]" at [INPUT]Coordinate?[EOS] [INPUT]Justification (l,c,r)?{ENTER}
+       \83\89\83x\83\8b\82ð\8dí\8f\9c
+               unset label [INPUT]Tag?{ENTER}
+       \83\89\83x\83\8b\82Ì\8fó\91Ô\82ð\95\\8e¦
+               show label{ENTER}
+       --
+       \83^\83C\83g\83\8b\82ð\90Ý\92è
+               set title "[INPUT]Title text?[EOS]" [INPUT]X position, Y position (eg. 2,4)?{ENTER}
+       \83^\83C\83g\83\8b\82ð\95\\8e¦
+               show title{ENTER}
+       --
+       \96}\97á\82Ì\88Ê\92u\82ð\90Ý\92è
+               set key [INPUT]Key position?{ENTER}
+       \96}\97á\82Ì\88Ê\92u\82ð\83f\83t\83H\83\8b\83g\82É
+               set key{ENTER}
+       \96}\97á\82ð\95\\8e¦\82µ\82È\82¢
+               unset key{ENTER}
+       \96}\97á\82Ì\88Ê\92u\82ð\95\\8e¦
+               show key{ENTER}
+       --
+       \83I\83t\83Z\83b\83g\82ð\90Ý\92è
+               set offsets [INPUT]Offsets left,right,top,bottom ?{ENTER}
+       \83I\83t\83Z\83b\83g\82ð\95\\8e¦
+               show offsets{ENTER}
+       --
+       \8e\9e\8d\8f\82Ì\95\\8e¦\88Ê\92u\82ð\90Ý\92è
+               set time [INPUT]Location (eg. 1,1)?{ENTER}
+       \8e\9e\8d\8f\82ð\95\\8e¦\82µ\82È\82¢
+               unset time{ENTER}
+       \8e\9e\8d\8f\82Ì\95\\8e¦\88Ê\92u\82ð\95\\8e¦
+               show time{ENTER}
+[EndMenu]
+
+[Menu]
+\83X\83^\83C\83\8b(&S)
+       [Menu]
+       \83f\81[\83^\82Ì\95\\8e¦\83X\83^\83C\83\8b
+       \90ü (Lines)
+               set style data lines{ENTER}
+       \83|\83C\83\93\83g (Points)
+               set style data points{ENTER}
+       \90ü\82Æ\83|\83C\83\93\83g (Lines + Points)
+               set style data linespoints{ENTER}
+       \83h\83b\83g (Dots)
+               set style data dots{ENTER}
+       \90\82\90ü (Impulses)
+               set style data impulses{ENTER}
+       --
+       \83G\83\89\81[\83o\81[ (Error Bars)
+               set style data errorbars{ENTER}
+       \8bé\8c` (Boxes)
+               set style data boxes{ENTER}
+       \8bé\8c`\82Æ\83G\83\89\81[\83o\81[ (Box Error Bars)
+               set style data boxerrorbars{ENTER}
+       --
+       \93\95\91ä\8c`\8e® (Candlesticks)
+               set style data candlesticks{ENTER}
+       \8bà\97Z\83f\81[\83^\8c`\8e® (Finance Bars)
+               set style data financebars{ENTER}
+       [EndMenu]
+       \83f\81[\83^\82Ì\83X\83^\83C\83\8b\82ð\95\\8e¦
+               show style data{ENTER}
+       \83f\81[\83^\82Ì\83X\83^\83C\83\8b\82ð\8f\89\8aú\89»
+               unset style data{ENTER}
+       --
+       [Menu]
+       \8aÖ\90\94\82Ì\95\\8e¦\83X\83^\83C\83\8b
+       \90ü (Lines)
+               set style function lines{ENTER}
+       \83|\83C\83\93\83g (Points)
+               set style function points{ENTER}
+       \90ü\82Æ\83|\83C\83\93\83g (Lines + Points)
+               set style function linespoints{ENTER}
+       \83h\83b\83g (Dots)
+               set style function dots{ENTER}
+       \90\82\90ü (Impulses)
+               set style function impulses{ENTER}
+       --
+       \83G\83\89\81[\83o\81[ (Error Bars)
+               set style function errorbars{ENTER}
+       \8bé\8c` (Boxes)
+               set style function boxes{ENTER}
+       \8bé\8c`\82Æ\83G\83\89\81[\83o\81[ (Box Error Bars)
+               set style function boxerrorbars{ENTER}
+       --
+       \93\95\91ä\8c`\8e® (Candlesticks)
+               set style function candlesticks{ENTER}
+       \8bà\97Z\83f\81[\83^\8c`\8e® (Finance Bars)
+               set style function financebars{ENTER}
+       [EndMenu]
+       \8aÖ\90\94\82Ì\83X\83^\83C\83\8b\82ð\95\\8e¦
+               show style function{ENTER}
+       \8aÖ\90\94\82Ì\83X\83^\83C\83\8b\82ð\8f\89\8aú\89»
+               unset style function{ENTER}
+       --
+       [Menu]
+       \96î\82Ì\95\\8e¦\83X\83^\83C\83\8b
+       \96î\90æ (Head)
+               set style arrow [INPUT]Arrow number?[EOS] head{ENTER}
+       \97¼\96î\90æ (Heads)
+               set style arrow [INPUT]Arrow number?[EOS] heads{ENTER}
+       \96î\90æ\82È\82µ (No Heads)
+               set style arrow [INPUT]Arrow number?[EOS] nohead{ENTER}
+       [EndMenu]
+       \96î\82Ì\83X\83^\83C\83\8b\82ð\95\\8e¦
+               show style arrow [INPUT]Arrow number? {ENTER}
+       \96î\82Ì\83X\83^\83C\83\8b\82ð\8f\89\8aú\89»
+               unset style arrow [INPUT]Arrow number? {ENTER}
+       --
+       [Menu]
+       \93h\82è\82Â\82Ô\82µ\83X\83^\83C\83\8b
+       \93h\82è\82Â\82Ô\82³\82È\82¢ (Empty)
+               set style fill empty{ENTER}
+       \83x\83^\93h\82è (Solid)
+               set style fill solid [INPUT]Density?{ENTER}
+       \83p\83^\81[\83\93\93h\82è (Pattern)
+               set style fill pattern [INPUT]Pattern number?{ENTER}
+       \8b«\8aE (Border)
+               set style fill border [INPUT]Line Type?{ENTER}
+       \8b«\8aE\82È\82µ (No Border)
+               set style fill noborder{ENTER}
+       [EndMenu]
+       \93h\82è\82Â\82Ô\82µ\83X\83^\83C\83\8b\82Ì\95\\8e¦
+               show style fill{ENTER}
+       \93h\82è\82Â\82Ô\82µ\83X\83^\83C\83\8b\82Ì\8f\89\8aú\89»
+               unset style fill{ENTER}
+       --
+       [Menu]
+       \90ü\81A\93_\82Ì\95\\8e¦\83X\83^\83C\83\8b
+       \90ü\82Ì\8eí\97Þ (Line Type)
+               set style linetype [INPUT]Line Type?{ENTER}
+       \90ü\82Ì\95\9d (Line Width)
+               set style linewidth [INPUT]Line Width?{ENTER}
+       \93_\82Ì\8eí\97Þ (Point Type)
+               set style pointtype [INPUT]Point Type?{ENTER}
+       \93_\82Ì\91å\82«\82³ (Point Size)
+               set style pointsize [INPUT]Point Size?{ENTER}
+;      \90F (Palette)
+;              set style line{ENTER}
+       [EndMenu]
+       \90ü\81A\93_\82Ì\83X\83^\83C\83\8b\82Ì\95\\8e¦
+               show style line{ENTER}
+       \90ü\81A\93_\82Ì\83X\83^\83C\83\8b\82Ì\8f\89\8aú\89»
+               unset style line{ENTER}
+[EndMenu]
+
+[Menu]
+&3\8e\9f\8c³
+       [Menu]
+       \93\99\8d\82\90ü
+               \92¼\90ü\82Å\95`\89æ
+                       set cntrparam linear{ENTER}
+               \8bÈ\90ü\82Å\95`\89æ
+                       set cntrparam cubicspline{ENTER}
+               B-spline \95â\8aÔ\82Å\95`\89æ
+                       set cntrparam bspline{ENTER}
+               \93\99\8d\82\90ü\82Ì\90\94
+                       set cntrparam levels [INPUT]How many contours?{ENTER}
+               \95â\8aÔ\82·\82é\93_\82Ì\90\94
+                       set cntrparam points [INPUT]How many points for the contours?{ENTER}
+               B-spline \95â\8aÔ\82Ì\8e\9f\90\94
+                       set cntrparam order [INPUT]Order of B-splines (2-10)?{ENTER}
+               --
+               \8f°\82É\93\99\8d\82\90ü\82ð\95\\8e¦\82·\82é
+                       set contour base{ENTER}
+               \95\\96Ê\82É\93\99\8d\82\90ü\82ð\95\\8e¦\82·\82é
+                       set contour surface{ENTER}
+               \8f°\82Æ\95\\96Ê\82Ì\97¼\95û\82É\93\99\8d\82\90ü\82ð\95\\8e¦
+                       set contour both{ENTER}
+               \93\99\8d\82\90ü\82ð\95\\8e¦\82µ\82È\82¢
+                       unset contour{ENTER}
+               \93\99\8d\82\90ü\82Ì\8fó\91Ô\82ð\95\\8e¦
+                       show contour{ENTER}
+               --
+               \96Ê\95`\89æ\82É\8eg\82¤\90ü\82Ì\90\94\82ð\8ew\92è
+                       set isosamples [INPUT]Number of isosamples?{ENTER}
+               \96Ê\95`\89æ\82É\8eg\82¤\90ü\82Ì\90\94\82ð\95\\8e¦
+                       show isosamples{ENTER}
+       [EndMenu]
+       --
+       \92¼\8cð\8dÀ\95W\8cn
+               set mapping cartesian{ENTER}
+       \8b\85\8dÀ\95W\8cn
+               set mapping spherical{ENTER}
+       \89~\93\9b\8dÀ\95W\8cn
+               set mapping cylindrical{ENTER}
+       \8eÊ\91\9c\82Ì\90Ý\92è\82ð\95\\8e¦
+               show mapping{ENTER}
+       --
+       \89A\90ü\8f\88\97\9d\82ð\82·\82é
+               set hidden3d{ENTER}
+       \89A\90ü\8f\88\97\9d\82ð\82µ\82È\82¢
+               unset hidden3d{ENTER}
+       \89A\90ü\8f\88\97\9d\82Ì\8fó\91Ô\82ð\95\\8e¦
+               show hidden3d{ENTER}
+       --
+       \95\\96Ê\82ð\96Ô\82Å\95\\8e¦\82·\82é
+               set surface{ENTER}
+       \95\\96Ê\82ð\96Ô\82Å\95\\8e¦\82µ\82È\82¢
+               unset surface{ENTER}
+       \95\\96Ê\82Ì\95\\8e¦\8fó\91Ô\82ð\95\\8e¦
+               show surface{ENTER}
+       --
+       \8e\8b\8ap\82ð\90Ý\92è
+               set view [INPUT]X rotation (degrees)?[EOS],[INPUT]Z rotation?[EOS],[INPUT]Scale?[EOS],[INPUT]Z scale?{ENTER}
+       \8e\8b\8ap\82ð\95\\8e¦
+               show view{ENTER}
+[EndMenu]
+
+[Menu]
+\83w\83\8b\83v(&H)
+       \96Ú\8e\9f(&I)
+               help{ENTER}
+       \83C\83\93\83g\83\8d\83_\83N\83V\83\87\83\93
+               help introduction{ENTER}
+       \83g\83s\83b\83N(&T)
+               help [INPUT]Help Topic?{ENTER}
+       \83E\83B\83\93\83h\83E\83Y(&W)
+               help windows{ENTER}
+       --
+       gnuplot \82É\8aÖ\82µ\82Ä(&A)
+               [ABOUT]
+[EndMenu]
+
+; \83{\83^\83\93\82ð\82¢\82­\82Â\82©
+;   \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
+;   MSDN \82Ì\88È\89º\8eQ\8fÆ: "Toolbar Standard Button Image Index Values"
+;   http://msdn.microsoft.com/en-us/library/bb760433%28v=vs.85%29.aspx
+[Button]
+       \8dÄ\95\\8e¦;4
+               replot{ENTER}
+[Button]
+       \8aJ\82­;7
+               load '[OPEN]load[EOS]*.plt[EOS]'{ENTER}
+[Button]
+       \95Û\91¶;8
+               save '[SAVE]save[EOS]*.plt[EOS]'{ENTER}
+[Button]
+       \88Ú\93®;31
+               cd '[DIRECTORY]New directory?[EOS]'{ENTER}
+[Button]
+       \88ó\8dü;14
+               set terminal [INPUT]Terminal type?{ENTER}set output "PRN"{ENTER}replot{ENTER}set terminal win{ENTER}set output{ENTER}
+[Button]
+       \83_\83\93\83v;14
+               screendump{ENTER}
+[Button]
+       \91O;15
+               {^P}
+[Button]
+       \8e\9f;16
+               {^N}
+[Button]
+       \83I\83v\83V\83\87\83\93;10
+               [OPTIONS]
diff --git a/distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/wgnuplot.chm b/distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/wgnuplot.chm
new file mode 100644 (file)
index 0000000..98801ac
Binary files /dev/null and b/distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/wgnuplot.chm differ
diff --git a/distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/wgnuplot.chw b/distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/wgnuplot.chw
new file mode 100644 (file)
index 0000000..7f97123
Binary files /dev/null and b/distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/wgnuplot.chw differ
diff --git a/distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/wgnuplot.mnu b/distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/wgnuplot.mnu
new file mode 100644 (file)
index 0000000..a39d2e3
--- /dev/null
@@ -0,0 +1,752 @@
+; Menu file for Windows gnuplot
+; Roger Hadgraft, 26-5-92
+; Russell Lang, 30 Nov 1992
+; Modified for 4.0, John Bollinger, 31 Dec 2002
+
+[Menu]
+&File
+       &Open ...
+               load '[OPEN]load[EOS]*.plt[EOS]'{ENTER}
+       &Save ...
+               save '[SAVE]save[EOS]*.plt[EOS]'{ENTER}
+       &Demos ...
+               load '[OPEN]load[EOS]*.dem[EOS]'{ENTER}
+       --
+       &Change Directory ...
+               cd '[DIRECTORY]New directory?[EOS]'{ENTER}
+       show Current &Directory
+               pwd{ENTER}
+       --
+       O&utput ...
+               set output "[INPUT]Output filename?[EOS]"{ENTER}
+       &Printer Output
+               set output "PRN"{ENTER}
+       &Window Output
+                set output{ENTER}set terminal win{ENTER} 
+       Show Output
+               show output{ENTER}
+       Ou&tput Device ...
+               set terminal [INPUT]Terminal type?{ENTER}
+       Show Output Devices
+               set terminal{ENTER}show terminal{ENTER}
+       --
+       [Menu]
+       History
+               Previous command        ^P
+                       {^P}
+               Next command    ^N
+                       {^N}
+               --
+               Back one character      ^B
+                       {^B}
+               Forward one character   ^F
+                       {^F}
+               --
+               Beginning of the line   ^A
+                       {^A}
+               End of the line ^E
+                       {^E}
+               --
+               Delete previous character       ^H
+                       {^H}
+               Delete current character        ^D
+                       {^D}
+               Delete last word        ^W
+                       {^W}
+               Delete to end of line   ^K
+                       {^K}
+               Delete entire line      ^U
+                       {^U}
+               --
+               Redraw the line ^L
+                       {^L}
+               [EndMenu]
+               open DOS window
+                       shell{ENTER}
+               run DOS command ...
+                       ![INPUT]DOS command?{ENTER}
+               --
+               E&xit
+               quit{ENTER}
+[EndMenu]
+
+[Menu]
+&Plot
+       Plot
+               plot 
+       3D Plot
+               splot 
+       Replot
+               replot{ENTER}
+       Clear device
+               clear{ENTER}
+       --
+       Simple Range
+               [[INPUT]Lower bound?[EOS]:[INPUT]Upper bound?[EOS]] [EOS]
+       Named Range
+               [[INPUT]Variable name?[EOS]=[INPUT]Lower bound?[EOS]:[INPUT]Upper bound?[EOS]] [EOS]
+       --
+       Data filename ...
+               '[OPEN]Open[EOS]*.dat[EOS]' [EOS]
+       using x,y columns
+               using [INPUT]X column?[EOS]:[INPUT]Y column?[EOS] [EOS]
+       using x,y,ydelta columns
+               using [INPUT]X column?[EOS]:[INPUT]Y column?[EOS]:[INPUT]Ydelta column?[EOS] [EOS]
+       using x,y,ylow,yhigh columns
+               using [INPUT]X column?[EOS]:[INPUT]Y column?[EOS]:[INPUT]Ylow column?[EOS]:[INPUT]Yhigh column?[EOS] [EOS]
+       --
+       [Menu]
+       with Style (simple)
+               Lines
+                       with lines
+               Points
+                       with points
+               Lines and Points
+                       with linespoints
+               Impulses
+                       with impulses
+               Dots
+                       with dots
+               Steps
+                       with steps
+               Fsteps
+                       with fsteps
+               Histeps
+                       with histeps            
+       [EndMenu]
+       [Menu]
+       with Style (compound)
+               Error Bars
+                       with errorbars
+               X Error Bars
+                       with xerrorbars
+               Y Error Bars
+                       with yerrorbars
+               XY Error Bars
+                       with xyerrorbars
+               Error Lines
+                       with errorlines
+               X Error Lines
+                       with xerrorlines
+               Y Error Lines
+                       with yerrorlines
+               XY Error Lines
+                       with xyerrorlines
+               Boxes
+                       with boxes
+               Filled Curves
+                       with filledcurves
+               Box Error Bars
+                       with boxerrorbars
+               Box XY Error Bars
+                       with boxxyerrorbars
+               Finance Bars
+                       with financebars
+               Candlesticks
+                       with candlesticks
+       [EndMenu]
+[EndMenu]
+
+[Menu]
+&Expressions
+       Evaluate
+               print 
+       Complex number ...
+               {[INPUT]Real part?[EOS],[INPUT]Imaginary part?[EOS]}
+       [Menu]
+       Unary
+               Minus   -a
+                       -[INPUT]Arg
+               Plus    +a
+                       +[INPUT]Arg
+               One's compliment        ~a
+                       ~[INPUT]Arg
+               Logcial negation        !a
+                       ![INPUT]Arg
+               Factorial       a!
+                       [INPUT]Arg[EOS]!
+       [EndMenu]
+       [Menu]
+       Binary
+               Exponentiation  **
+                       **
+               Multiply        *
+                       *
+               Divide  /
+                       /
+               Add     +
+                       +
+               Subtract        -
+                       -
+               --
+               Modulo  %
+                       %
+       [EndMenu]
+       [Menu]
+       Logical
+               Equality        ==
+                       ==
+               Inequality      !=
+                       !=
+               --
+               less than       <
+                       <
+               less than or equal      <=
+                       <=
+               greater than    >
+                       >
+               greater than or equal   >=
+                       >=
+               --
+               Bitwise AND     &
+                       &
+               Bitwise exclusive OR    ^
+                       ^
+               Bitwise inclusive OR    |
+                       |
+               --
+               Logical AND     &&
+                       &&
+               Logical OR      ||
+                       ||
+               --
+               Ternary operator        a?b:c
+                       [INPUT]First arg[EOS]?[INPUT]Second arg[EOS]:[INPUT]Third arg[EOS]
+       [EndMenu]
+[EndMenu]
+[Menu]
+Fu&nctions
+       [Menu]
+       Elementary
+               random number
+                       rand([INPUT]Argument[EOS])
+               absolute value
+                       abs([INPUT]Argument[EOS])
+               sign
+                       sgn([INPUT]Argument[EOS])
+               --
+               ceiling
+                       ceil([INPUT]Argument[EOS])
+               floor
+                       floor([INPUT]Argument[EOS])
+               integer
+                       int([INPUT]Argument[EOS])
+               --
+               square root
+                       sqrt([INPUT]Argument[EOS])
+               exponent
+                       exp([INPUT]Argument[EOS])
+               logarithm (e)
+                       log([INPUT]Argument[EOS])
+               logarithm (10)
+                       log10([INPUT]Argument[EOS])
+               --
+               cosine
+                       cos([INPUT]Argument[EOS])
+               sine
+                       sin([INPUT]Argument[EOS])
+               tangent
+                       tan([INPUT]Argument[EOS])
+               --
+               arc cosine
+                       acos([INPUT]Argument[EOS])
+               arc sine
+                       asin([INPUT]Argument[EOS])
+               arc tangent
+                       atan([INPUT]Argument[EOS])
+               arc tangent 2
+                       atan2([INPUT]"y" argument[EOS],[INPUT]"x" argument[EOS])
+               --
+               hyperbolic cosine
+                       cosh([INPUT]Argument[EOS])
+               hyperbolic sine
+                       sinh([INPUT]Argument[EOS])
+               hyperbolic tangent
+                       tanh([INPUT]Argument[EOS])
+               --
+               imaginary
+                       imag([INPUT]Argument[EOS])
+               real
+                       real([INPUT]Argument[EOS])
+               arg
+                       arg([INPUT]Argument[EOS])
+       [EndMenu]
+       [Menu]
+       Special
+               error 
+                       erf([INPUT]Argument[EOS])
+               error c
+                       erfc([INPUT]Argument[EOS])
+               inv error
+                       inverf([INPUT]Argument[EOS])
+               --
+               gamma
+                       gamma([INPUT]Argument[EOS])
+               igamma
+                       igamma([INPUT]First argument[EOS],[INPUT]Second argument[EOS])
+               lgamma
+                       lgamma([INPUT]Argument[EOS])
+               --
+               ibeta
+                       ibeta([INPUT]First argument[EOS],[INPUT]Second argument[EOS],[INPUT]Third argument[EOS])
+               --
+               bessel j0
+                       besj0([INPUT]Argument[EOS])
+               bessel j1
+                       besj1([INPUT]Argument[EOS])
+               bessel y0
+                       besy0([INPUT]Argument[EOS])
+               bessel y1
+                       besy1([INPUT]Argument[EOS])
+               --
+               lambertw
+                       lambertw([INPUT]Argument[EOS])
+
+       [EndMenu]
+       [Menu]
+       Statistical
+               normal
+                       norm([INPUT]Argument[EOS])
+               inverse normal
+                       invnorm([INPUT]Argument[EOS])
+       [EndMenu]
+       --
+       Define User Function ...
+               [INPUT]Name for function?[EOS][INPUT]Variable/s, eg. (a,b) ?[EOS]=
+       Show User Functions
+               show functions{ENTER}
+       --
+       Define User Variable ...
+               [INPUT]Name for variable?[EOS]=[INPUT]Value, eg. 9.81 ?{ENTER}
+       Show User Variables
+               show variables{ENTER}
+       --
+       x Dummy variable
+               set dummy [INPUT]Variable name?{ENTER}
+       x,y Dummy variables
+               set dummy [INPUT]Variable names (eg. u,v)?{ENTER}
+       Show Dummy variables
+               show dummy{ENTER}
+[EndMenu]
+
+[Menu]
+&General
+       Border on
+               set border{ENTER}
+       Border off
+               unset border{ENTER}
+       Show Border
+               show border{ENTER}
+       --
+       Box width
+               set boxwidth [INPUT]Box Width?{ENTER}
+       Auto Box Width
+               set boxwidth{ENTER}
+       Show Box width
+               show boxwidth{ENTER}
+       --
+       Show Line Types
+               test{ENTER}
+       --
+       [Menu]
+       Parametric
+               Set Parametric
+                       set parametric{ENTER}
+               Not Parametric
+                       unset parametric{ENTER}
+               Show Parametric
+                       show parametric{ENTER}
+               --
+               t Range
+                       set trange [[INPUT]Lower bound?[EOS]:[INPUT]Upper bound?[EOS]]{ENTER}
+               u Range
+                       set urange [[INPUT]Lower bound?[EOS]:[INPUT]Upper bound?[EOS]]{ENTER}
+               v Range
+                       set vrange [[INPUT]Lower bound?[EOS]:[INPUT]Upper bound?[EOS]]{ENTER}
+       [EndMenu]
+       --
+       [Menu]
+       Clipping
+       Clip near points
+               set clip points{ENTER}
+       Clip one point
+               set clip one{ENTER}
+       Clip two points
+               set clip two{ENTER}
+       No Clipping
+               unset clip{ENTER}
+       Show Clip type
+               show clip{ENTER}
+       [EndMenu]
+       --
+       [Menu]
+       Polar
+       Polar
+               set polar{ENTER}
+       Not Polar
+               unset polar{ENTER}
+       Show Polar
+               show polar{ENTER}
+       Radial Range
+               set rrange [[INPUT]Lower bound?[EOS]:[INPUT]Upper bound?[EOS]]{ENTER}
+       Angles in Degrees
+               set angles degrees{ENTER}
+       Angles in Radians
+               set angles radians{ENTER}
+       Show Angle units
+               show angles{ENTER}
+       [EndMenu]
+       --
+       Set Plot Size
+               set size [INPUT]Xscale?[EOS],[INPUT]Yscale?{ENTER}
+       Show Plot Size
+               show size{ENTER}
+       --
+       Sampling Rate
+               set sample [INPUT]Sampling rate (default=100)?{ENTER}
+       Show Sampling Rate
+               show sample{ENTER}
+[EndMenu]
+
+[Menu]
+&Axes
+       Autoscale xy
+               set autoscale [INPUT]Which axes (eg. xy)?{ENTER}
+       No Autoscale xy
+               unset autoscale [INPUT]Which axes (eg. xy)?{ENTER}
+       Show Autoscale
+               show autoscale{ENTER}
+       --
+       Logscale xyz
+               set logscale [INPUT]Which axes (eg. xy)?{ENTER}
+       No Logscale xyz
+               unset logscale [INPUT]Which axes (eg. xy)?{ENTER}
+       Show Logscale
+               show logscale{ENTER}
+       --
+       [Menu]
+       Tics
+               Tic format string
+                       set format [INPUT]Axes?[EOS] "[INPUT]Format string?[EOS]"{ENTER}
+               Tic marks format
+                       show format{ENTER}
+               --
+               Inward facing tics (default)
+                       set tics in{ENTER}
+               Outward facing tics
+                       set tics out{ENTER}
+               Show tics
+                       show tics{ENTER}
+               --
+               Tics level
+                       set ticslevel [INPUT]Level (default=0.5)?{ENTER}
+               --
+               Tic interval
+                       set [INPUT]Axis: x, y or z ?[EOS]tics [INPUT]Start, Increment, End (eg. 0,0.5,10) ?{ENTER}
+               --
+               Tic labels start
+                       set [INPUT]Axis: x, y or z ?[EOS]tics ("[INPUT]Label text?[EOS]" [INPUT]Position?[EOS]
+               another Tic label
+                       ,"[INPUT]Label text?[EOS]" [INPUT]Position?[EOS]
+               Tic labels finish
+                       ){ENTER}
+       [EndMenu]
+       --
+       X Range
+               set xrange [[INPUT]Lower bound?[EOS]:[INPUT]Upper bound?[EOS]]{ENTER}
+       Y Range
+               set yrange [[INPUT]Lower bound?[EOS]:[INPUT]Upper bound?[EOS]]{ENTER}
+       Z Range
+               set zrange [[INPUT]Lower bound?[EOS]:[INPUT]Upper bound?[EOS]]{ENTER}
+       --
+       X Label
+               set xlabel "[INPUT]Label text?[EOS]" [INPUT]X offset, Y offset (eg. 2,3) ?{ENTER}
+       Y Label
+               set ylabel "[INPUT]Label text?[EOS]" [INPUT]X offset, Y offset (eg. 2,3) ?{ENTER}
+       Z Label
+               set zlabel "[INPUT]Label text?[EOS]" [INPUT]X offset, Y offset (eg. 2,3) ?{ENTER}
+       Show axis Labels
+               show xlabel{ENTER}show ylabel{ENTER}show zlabel{ENTER}
+       --
+       No X zero axis
+               unset xzeroaxis{ENTER}
+       No Y zero axis
+               unset yzeroaxis{ENTER}
+       X,Y zero axes on
+               set zeroaxis{ENTER}
+       Show zero axis status
+               show zeroaxis{ENTER}
+[EndMenu]
+
+[Menu]
+&Chart
+       Grid on
+               set grid{ENTER}
+       Grid off
+               unset grid{ENTER}
+       Show Grid
+               show grid{ENTER}
+       --
+       Add Arrow
+               set arrow [INPUT]Tag (1-99)?[EOS] from [INPUT]From coordinate?[EOS] to [INPUT]To coordinate?{ENTER}
+       Remove arrow
+               unset arrow [INPUT]Tag (1-99)?{ENTER}
+       Show Arrows
+               show arrow{ENTER}
+       --
+       Add Label
+               set label [INPUT]Tag?[EOS] "[INPUT]Label?[EOS]" at [INPUT]Coordinate?[EOS] [INPUT]Justification (l,c,r)?{ENTER}
+       Remove Label
+               unset label [INPUT]Tag?{ENTER}
+       Show Labels
+               show label{ENTER}
+       --
+       Set Title
+               set title "[INPUT]Title text?[EOS]" [INPUT]X position, Y position (eg. 2,4)?{ENTER}
+       Show Title
+               show title{ENTER}
+       --
+       Key (legend) position
+               set key [INPUT]Key position?{ENTER}
+       Default Key position
+               set key{ENTER}
+       No Key
+               unset key{ENTER}
+       Show Key position
+               show key{ENTER}
+       --
+       Offsets
+               set offsets [INPUT]Offsets left,right,top,bottom ?{ENTER}
+       Show Offsets
+               show offsets{ENTER}
+       --
+       Time location
+               set time [INPUT]Location (eg. 1,1)?{ENTER}
+       No Time
+               unset time{ENTER}
+       Show Time Location
+               show time{ENTER}
+[EndMenu]
+
+[Menu]
+&Styles
+       [Menu]
+       Data Style
+       Lines
+               set style data lines{ENTER}
+       Points
+               set style data points{ENTER}
+       Lines + Points
+               set style data linespoints{ENTER}
+       Dots
+               set style data dots{ENTER}
+       Impulses
+               set style data impulses{ENTER}
+       --
+       Error Bars
+               set style data errorbars{ENTER}
+       Boxes
+               set style data boxes{ENTER}
+       Box Error Bars
+               set style data boxerrorbars{ENTER}
+       --
+       Candlesticks
+               set style data candlesticks{ENTER}
+       Finance Bars
+               set style data financebars{ENTER}
+       [EndMenu]
+       Show Data Style
+               show style data{ENTER}
+       Clear Data Style
+               unset style data{ENTER}
+       --
+       [Menu]
+       Function Style
+       Lines
+               set style function lines{ENTER}
+       Points
+               set style function points{ENTER}
+       Lines + Points
+               set style function linespoints{ENTER}
+       Dots
+               set style function dots{ENTER}
+       Impulses
+               set style function impulses{ENTER}
+       --
+       Error Bars
+               set style function errorbars{ENTER}
+       Boxes
+               set style function boxes{ENTER}
+       Box Error Bars
+               set style function boxerrorbars{ENTER}
+       --
+       Candlesticks
+               set style function candlesticks{ENTER}
+       Finance Bars
+               set style function financebars{ENTER}
+       [EndMenu]
+       Show Function Style
+               show style function{ENTER}
+       Clear Function Style
+               unset style function{ENTER}
+       --
+       [Menu]
+       Arrow Style
+       Head
+               set style arrow [INPUT]Arrow number?[EOS] head{ENTER}
+       Heads
+               set style arrow [INPUT]Arrow number?[EOS] heads{ENTER}
+       No Heads
+               set style arrow [INPUT]Arrow number?[EOS] nohead{ENTER}
+       [EndMenu]
+       Show Arrow Style
+               show style arrow [INPUT]Arrow number? {ENTER}
+       Clear Arrow Style
+               unset style arrow [INPUT]Arrow number? {ENTER}
+       --
+       [Menu]
+       Fill Style
+       Empty
+               set style fill empty{ENTER}
+       Solid
+               set style fill solid [INPUT]Density?{ENTER}
+       Pattern
+               set style fill pattern [INPUT]Pattern number?{ENTER}
+       Border
+               set style fill border [INPUT]Line Type?{ENTER}
+       No Border
+               set style fill noborder{ENTER}
+       [EndMenu]
+       Show Fill Style
+               show style fill{ENTER}
+       Clear Fill Style
+               unset style fill{ENTER}
+       --
+       [Menu]
+       Line Style
+       Line Type
+               set style linetype [INPUT]Line Type?{ENTER}
+       Line Width
+               set style linewidth [INPUT]Line Width?{ENTER}
+       Point Type
+               set style pointtype [INPUT]Point Type?{ENTER}
+       Point Size
+               set style pointsize [INPUT]Point Size?{ENTER}
+;      Palette
+;              set style line{ENTER}
+       [EndMenu]
+       Show Line Style
+               show style line{ENTER}
+       Clear Line Style
+               unset style line{ENTER}
+[EndMenu]
+
+[Menu]
+&3D
+       [Menu]
+       Contours
+               Linear Contours
+                       set cntrparam linear{ENTER}
+               Cubic Spline Contours
+                       set cntrparam cubicspline{ENTER}
+               B-spline Contours
+                       set cntrparam bspline{ENTER}
+               Number of Contours
+                       set cntrparam levels [INPUT]How many contours?{ENTER}
+               Points for Contours
+                       set cntrparam points [INPUT]How many points for the contours?{ENTER}
+               Order of B-splines
+                       set cntrparam order [INPUT]Order of B-splines (2-10)?{ENTER}
+               --
+               Contours on Base
+                       set contour base{ENTER}
+               Contours on Surfaces
+                       set contour surface{ENTER}
+               Contours on Both
+                       set contour both{ENTER}
+               No Contours
+                       unset contour{ENTER}
+               Show Contour
+                       show contour{ENTER}
+               --
+               Number of Isosamples
+                       set isosamples [INPUT]Number of isosamples?{ENTER}
+               Show Isosamples
+                       show isosamples{ENTER}
+       [EndMenu]
+       --
+       Cartesian Mapping
+               set mapping cartesian{ENTER}
+       Spherical Mapping
+               set mapping spherical{ENTER}
+       Cylindrical Mapping
+               set mapping cylindrical{ENTER}
+       Show Mapping
+               show mapping{ENTER}
+       --
+       Hidden line removal
+               set hidden3d{ENTER}
+       No Hidden line removal
+               unset hidden3d{ENTER}
+       Show Hidden line removal
+               show hidden3d{ENTER}
+       --
+       Display Surface mesh
+               set surface{ENTER}
+       No Surface mesh
+               unset surface{ENTER}
+       Show Surface status
+               show surface{ENTER}
+       --
+       Set View
+               set view [INPUT]X rotation (degrees)?[EOS],[INPUT]Z rotation?[EOS],[INPUT]Scale?[EOS],[INPUT]Z scale?{ENTER}
+       Show View
+               show view{ENTER}
+[EndMenu]
+
+[Menu]
+&Help
+       &Index
+               help{ENTER}
+       Introduction
+               help introduction{ENTER}
+       &Topic
+               help [INPUT]Help Topic?{ENTER}
+       &Windows
+               help windows{ENTER}
+       --
+       &About
+               [ABOUT]
+[EndMenu]
+
+; now some buttons
+;   a number after a semicolon in the title string is interpreted as icon index
+;   see the article "Toolbar Standard Button Image Index Values" on MSDN
+;   http://msdn.microsoft.com/en-us/library/bb760433%28v=vs.85%29.aspx
+[Button]
+       Replot;4
+               replot{ENTER}
+[Button]
+       Open;7
+               load '[OPEN]load[EOS]*.plt[EOS]'{ENTER}
+[Button]
+       Save;8
+               save '[SAVE]save[EOS]*.plt[EOS]'{ENTER}
+[Button]
+       ChDir;31
+               cd '[DIRECTORY]New directory?[EOS]'{ENTER}
+[Button]
+       Print;14
+               set terminal [INPUT]Terminal type?{ENTER}set output "PRN"{ENTER}replot{ENTER}set terminal win{ENTER}set output{ENTER}
+[Button]
+       PrtSc;14
+               screendump{ENTER}
+[Button]
+       Prev;15
+               {^P}
+[Button]
+       Next;16
+               {^N}
+[Button]
+       Options;10
+               [OPTIONS]
diff --git a/distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/wxbase30u_gcc_custom.dll b/distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/wxbase30u_gcc_custom.dll
new file mode 100644 (file)
index 0000000..8ea02ad
Binary files /dev/null and b/distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/wxbase30u_gcc_custom.dll differ
diff --git a/distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/wxmsw30u_core_gcc_custom.dll b/distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/wxmsw30u_core_gcc_custom.dll
new file mode 100644 (file)
index 0000000..fd7f2ba
Binary files /dev/null and b/distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/wxmsw30u_core_gcc_custom.dll differ
diff --git a/distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/zlib1.dll b/distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/zlib1.dll
new file mode 100644 (file)
index 0000000..55d06fc
Binary files /dev/null and b/distributions/windows/gnuplot_bin/gnuplot_bin_501/bin/zlib1.dll differ
diff --git a/distributions/windows/gnuplot_bin/gnuplot_bin_501/etc/fonts/conf.d/10-scale-bitmap-fonts.conf b/distributions/windows/gnuplot_bin/gnuplot_bin_501/etc/fonts/conf.d/10-scale-bitmap-fonts.conf
new file mode 100644 (file)
index 0000000..e3bcd46
--- /dev/null
@@ -0,0 +1,81 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+
+<match target="font">
+  <test name="scalable" compare="eq">
+    <bool>false</bool>
+  </test>
+  <edit name="pixelsizefixupfactor" mode="assign">
+    <divide>
+      <name target="pattern">pixelsize</name>
+      <name target="font"   >pixelsize</name>
+    </divide>
+  </edit>
+</match>
+<match target="font">
+  <test name="scalable" compare="eq">
+    <bool>false</bool>
+  </test>
+  <edit name="scalingnotneeded" mode="assign">
+    <and>
+      <less>
+        <name>pixelsizefixupfactor</name>
+        <double>1.2</double>
+      </less>
+      <more>
+        <name>pixelsizefixupfactor</name>
+        <double>0.8</double>
+      </more>
+    </and>
+  </edit>
+</match>
+<!--
+  So far we determined the scale factor.  Now, check and if
+  scaling is NOT desirable, just reset the scale factor to 1.0.
+  -->
+<match target="font">
+  <test name="scalable" compare="eq">
+    <bool>false</bool>
+  </test>
+  <test name="pixelsize" target="pattern" compare="less">
+    <double>64</double>
+  </test>
+  <test name="hinting" compare="eq">
+    <bool>true</bool>
+  </test>
+  <test name="scalingnotneeded" compare="eq">
+    <bool>true</bool>
+  </test>
+  <edit name="pixelsizefixupfactor" mode="assign">
+    <double>1.0</double>
+  </edit>
+</match>
+<!--
+  If we *are* going to scale, go ahead and do it.
+  -->
+<match target="font">
+  <test name="scalable" compare="eq">
+    <bool>false</bool>
+  </test>
+  <test name="pixelsizefixupfactor" compare="not_eq">
+    <double>1.0</double>
+  </test>
+  <edit name="matrix" mode="assign">
+    <times>
+      <name>matrix</name>
+      <matrix>
+        <name>pixelsizefixupfactor</name> <double>0</double>
+        <double>0</double> <name>pixelsizefixupfactor</name>
+       </matrix>
+    </times>
+  </edit>
+  <edit name="size" mode="assign">
+    <divide>
+      <name>size</name>
+      <name>pixelsizefixupfactor</name>
+    </divide>
+  </edit>
+</match>
+
+</fontconfig>
diff --git a/distributions/windows/gnuplot_bin/gnuplot_bin_501/etc/fonts/conf.d/20-unhint-small-vera.conf b/distributions/windows/gnuplot_bin/gnuplot_bin_501/etc/fonts/conf.d/20-unhint-small-vera.conf
new file mode 100644 (file)
index 0000000..c9505ca
--- /dev/null
@@ -0,0 +1,48 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+<!-- 
+       The Bitstream Vera fonts have GASP entries suggesting that hinting be
+       disabled below 8 ppem, but FreeType ignores those, preferring to use
+       the data found in the instructed hints.  The initial Vera release
+       didn't include the right instructions in the 'prep' table. Fix this
+       by disabling hinting manually at smaller sizes (< 8ppem)
+ -->
+
+       <match target="font">
+               <test name="family" compare="eq" ignore-blanks="true">
+                       <string>Bitstream Vera Sans</string>
+               </test>
+               <test name="pixelsize" compare="less">
+                       <double>7.5</double>
+               </test>
+               <edit name="hinting">
+                       <bool>false</bool>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family" compare="eq" ignore-blanks="true">
+                       <string>Bitstream Vera Serif</string>
+               </test>
+               <test name="pixelsize" compare="less">
+                       <double>7.5</double>
+               </test>
+               <edit name="hinting">
+                       <bool>false</bool>
+               </edit>
+       </match>
+
+       <match target="font">
+               <test name="family" compare="eq" ignore-blanks="true">
+                       <string>Bitstream Vera Sans Mono</string>
+               </test>
+               <test name="pixelsize" compare="less">
+                       <double>7.5</double>
+               </test>
+               <edit name="hinting">
+                       <bool>false</bool>
+               </edit>
+       </match>
+
+</fontconfig>
diff --git a/distributions/windows/gnuplot_bin/gnuplot_bin_501/etc/fonts/conf.d/30-metric-aliases.conf b/distributions/windows/gnuplot_bin/gnuplot_bin_501/etc/fonts/conf.d/30-metric-aliases.conf
new file mode 100644 (file)
index 0000000..ccc3e24
--- /dev/null
@@ -0,0 +1,275 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+
+       <!-- Alias similar/metric-compatible families from various sources:
+
+               PostScript fonts:
+                       Helvetica
+                       Times
+                       Courier
+               URW fonts:
+                       Nimbus Sans L
+                       Nimbus Roman No9 L
+                       Nimbus Mono L
+
+               Microsoft fonts:
+                       Arial
+                       Times New Roman
+                       Courier New
+               Liberation fonts:
+                       Liberation Sans
+                       Liberation Serif
+                       Liberation Mono
+               StarOffice fonts:
+                       Albany
+                       Thorndale
+                       Cumberland
+               AMT fonts:
+                       Albany AMT
+                       Thorndale AMT
+                       Cumberland AMT
+               Google CrOS Core fonts:
+                       Arimo
+                       Cousine
+                       Tinos
+
+            Of these, URW fonts are design compatible with PostScrict fonts,
+            and the Liberation, StarOffice, AMT and CrOS Core ones are
+            compatible with Microsoft fonts.
+
+            We want for each of them to fallback to any of these
+            available, but in an order preferring similar designs
+            first.  We do this in three steps:
+
+               1) Alias each specific to it's generic family.
+                  eg. Liberation Sans to Arial
+
+               2) Weak alias each generic to the other generic of its family.
+                  eg. Arial to Helvetica
+
+               3) Alias each generic to its specifics.
+                  eg. Arial to Liberation Sans, Albany, and Albany AMT
+       -->
+
+<!-- Map specifics to generics -->
+
+       <!-- PostScript -->
+       <alias binding="same">
+         <family>Nimbus Sans L</family>
+         <default>
+         <family>Helvetica</family>
+         </default>
+       </alias>
+
+       <alias binding="same">
+         <family>Nimbus Roman No9 L</family>
+         <default>
+         <family>Times</family>
+         </default>
+       </alias>
+
+       <alias binding="same">
+         <family>Nimbus Mono L</family>
+         <default>
+         <family>Courier</family>
+         </default>
+       </alias>
+
+
+       <!-- Microsoft -->
+       <alias binding="same">
+         <family>Arimo</family>
+         <default>
+           <family>Arial</family>
+         </default>
+       </alias>
+
+       <alias binding="same">
+         <family>Liberation Sans</family>
+         <default>
+         <family>Arial</family>
+         </default>
+       </alias>
+
+       <alias binding="same">
+         <family>Albany</family>
+         <default>
+         <family>Arial</family>
+         </default>
+       </alias>
+
+       <alias binding="same">
+         <family>Albany AMT</family>
+         <default>
+         <family>Arial</family>
+         </default>
+       </alias>
+
+       <alias binding="same">
+         <family>Tinos</family>
+         <default>
+           <family>Times New Roman</family>
+         </default>
+       </alias>
+
+       <alias binding="same">
+         <family>Liberation Serif</family>
+         <default>
+         <family>Times New Roman</family>
+         </default>
+       </alias>
+
+       <alias binding="same">
+         <family>Thorndale</family>
+         <default>
+         <family>Times New Roman</family>
+         </default>
+       </alias>
+
+       <alias binding="same">
+         <family>Thorndale AMT</family>
+         <default>
+         <family>Times New Roman</family>
+         </default>
+       </alias>
+
+       <alias binding="same">
+         <family>Cousine</family>
+         <default>
+           <family>Courier New</family>
+         </default>
+       </alias>
+
+       <alias binding="same">
+         <family>Liberation Mono</family>
+         <default>
+         <family>Courier New</family>
+         </default>
+       </alias>
+
+       <alias binding="same">
+         <family>Cumberland</family>
+         <default>
+         <family>Courier New</family>
+         </default>
+       </alias>
+
+       <alias binding="same">
+         <family>Cumberland AMT</family>
+         <default>
+         <family>Courier New</family>
+         </default>
+       </alias>
+
+
+
+<!-- Accept the other group as fallback -->
+
+
+       <!-- PostScript -->
+       <alias>
+         <family>Helvetica</family>
+         <default>
+         <family>Arial</family>
+         </default>
+       </alias>
+
+       <alias>
+         <family>Times</family>
+         <default>
+         <family>Times New Roman</family>
+         </default>
+       </alias>
+
+       <alias>
+         <family>Courier</family>
+         <default>
+         <family>Courier New</family>
+         </default>
+       </alias>
+
+
+       <!-- Microsoft -->
+       <alias>
+         <family>Arial</family>
+         <default>
+         <family>Helvetica</family>
+         </default>
+       </alias>
+
+       <alias>
+         <family>Times New Roman</family>
+         <default>
+         <family>Times</family>
+         </default>
+       </alias>
+
+       <alias>
+         <family>Courier New</family>
+         <default>
+         <family>Courier</family>
+         </default>
+       </alias>
+
+
+
+<!-- Map generics to specifics -->
+
+
+       <!-- PostScript -->
+       <alias binding="same">
+         <family>Helvetica</family>
+         <accept>
+         <family>Nimbus Sans L</family>
+         </accept>
+       </alias>
+
+       <alias binding="same">
+         <family>Times</family>
+         <accept>
+         <family>Nimbus Roman No9 L</family>
+         </accept>
+       </alias>
+
+       <alias binding="same">
+         <family>Courier</family>
+         <accept>
+         <family>Nimbus Mono L</family>
+         </accept>
+       </alias>
+
+
+       <!-- Microsoft -->
+       <alias binding="same">
+         <family>Arial</family>
+         <accept>
+           <family>Arimo</family>
+           <family>Liberation Sans</family>
+           <family>Albany</family>
+           <family>Albany AMT</family>
+         </accept>
+       </alias>
+
+       <alias binding="same">
+         <family>Times New Roman</family>
+         <accept>
+           <family>Tinos</family>
+           <family>Liberation Serif</family>
+           <family>Thorndale</family>
+           <family>Thorndale AMT</family>
+         </accept>
+       </alias>
+
+       <alias binding="same">
+         <family>Courier New</family>
+         <accept>
+           <family>Cousine</family>
+           <family>Liberation Mono</family>
+           <family>Cumberland</family>
+           <family>Cumberland AMT</family>
+         </accept>
+       </alias>
+
+
+</fontconfig>
diff --git a/distributions/windows/gnuplot_bin/gnuplot_bin_501/etc/fonts/conf.d/30-urw-aliases.conf b/distributions/windows/gnuplot_bin/gnuplot_bin_501/etc/fonts/conf.d/30-urw-aliases.conf
new file mode 100644 (file)
index 0000000..aae06ac
--- /dev/null
@@ -0,0 +1,40 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+<!--
+  URW provides metric and shape compatible fonts for some Adobe families.
+  Helvetica, Courier, and Times are handled in 30-metric-aliases.conf.
+  -->
+       <alias binding="same">
+         <family>Avant Garde</family>
+         <accept><family>URW Gothic L</family></accept>
+       </alias>
+       <alias binding="same">
+         <family>Bookman</family>
+         <accept><family>URW Bookman L</family></accept>
+       </alias>
+       <alias binding="same">
+         <family>New Century Schoolbook</family>
+         <accept><family>Century Schoolbook L</family></accept>
+       </alias>
+       <alias binding="same">
+         <family>Palatino</family>
+         <accept><family>URW Palladio L</family></accept>
+       </alias>
+       <alias binding="same">
+         <family>Zapf Chancery</family>
+         <accept><family>URW Chancery L</family></accept>
+       </alias>
+       <alias binding="same">
+         <family>Zapf Dingbats</family>
+         <accept><family>Dingbats</family></accept>
+       </alias>
+       <match target="pattern">
+         <test name="family" compare="eq" ignore-blanks="true">
+           <string>Symbol</string>
+         </test>
+         <edit name="family" mode="append" binding="same">
+           <string>Standard Symbols L</string>
+         </edit>
+       </match>
+</fontconfig>
diff --git a/distributions/windows/gnuplot_bin/gnuplot_bin_501/etc/fonts/conf.d/40-nonlatin.conf b/distributions/windows/gnuplot_bin/gnuplot_bin_501/etc/fonts/conf.d/40-nonlatin.conf
new file mode 100644 (file)
index 0000000..c900fd4
--- /dev/null
@@ -0,0 +1,231 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+<!--
+  Mark common families with their generics so we'll get
+  something reasonable
+-->
+
+<!--
+  Serif faces
+ -->
+       <alias>
+               <family>Nazli</family>
+               <default><family>serif</family></default>
+       </alias>
+       <alias>
+               <family>Lotoos</family>
+               <default><family>serif</family></default>
+       </alias>
+       <alias>
+               <family>Mitra</family>
+               <default><family>serif</family></default>
+       </alias>
+       <alias>
+               <family>Ferdosi</family>
+               <default><family>serif</family></default>
+       </alias>
+       <alias>
+               <family>Badr</family>
+               <default><family>serif</family></default>
+       </alias>
+       <alias>
+               <family>Zar</family>
+               <default><family>serif</family></default>
+       </alias>
+       <alias>
+               <family>Titr</family>
+               <default><family>serif</family></default>
+       </alias>
+       <alias>
+               <family>Jadid</family>
+               <default><family>serif</family></default>
+       </alias>
+       <alias>
+               <family>Kochi Mincho</family>
+               <default><family>serif</family></default>
+       </alias>
+       <alias>
+               <family>AR PL SungtiL GB</family>
+               <default><family>serif</family></default>
+       </alias>
+       <alias>
+               <family>AR PL Mingti2L Big5</family>
+               <default><family>serif</family></default>
+       </alias>
+       <alias>
+               <family>MS 明朝</family>
+               <default><family>serif</family></default>
+       </alias>
+       <alias>
+               <family>NanumMyeongjo</family>
+               <default><family>serif</family></default>
+       </alias>
+       <alias>
+               <family>UnBatang</family>
+               <default><family>serif</family></default>
+       </alias>
+       <alias>
+               <family>Baekmuk Batang</family>
+               <default><family>serif</family></default>
+       </alias>
+       <alias>
+               <family>MgOpen Canonica</family>
+               <default><family>serif</family></default>
+       </alias>
+       <alias>
+               <family>Sazanami Mincho</family>
+               <default><family>serif</family></default>
+       </alias>
+       <alias>
+               <family>AR PL ZenKai Uni</family>
+               <default><family>serif</family></default>
+       </alias>
+       <alias>
+               <family>ZYSong18030</family>
+               <default><family>serif</family></default>
+       </alias>
+       <alias>
+               <family>FreeSerif</family>
+               <default><family>serif</family></default>
+       </alias>
+       <alias>
+               <family>SimSun</family>
+               <default><family>serif</family></default>
+       </alias>
+<!--
+  Sans-serif faces
+ -->
+       <alias>
+               <family>Arshia</family>
+               <default><family>sans-serif</family></default>
+       </alias>
+       <alias>
+               <family>Elham</family>
+               <default><family>sans-serif</family></default>
+       </alias>
+       <alias>
+               <family>Farnaz</family>
+               <default><family>sans-serif</family></default>
+       </alias>
+       <alias>
+               <family>Nasim</family>
+               <default><family>sans-serif</family></default>
+       </alias>
+       <alias>
+               <family>Sina</family>
+               <default><family>sans-serif</family></default>
+       </alias>
+       <alias>
+               <family>Roya</family>
+               <default><family>sans-serif</family></default>
+       </alias>
+       <alias>
+               <family>Koodak</family>
+               <default><family>sans-serif</family></default>
+       </alias>
+       <alias>
+               <family>Terafik</family>
+               <default><family>sans-serif</family></default>
+       </alias>
+       <alias>
+               <family>Kochi Gothic</family>
+               <default><family>sans-serif</family></default>
+       </alias>
+       <alias>
+               <family>AR PL KaitiM GB</family>
+               <default><family>sans-serif</family></default>
+       </alias>
+       <alias>
+               <family>AR PL KaitiM Big5</family>
+               <default><family>sans-serif</family></default>
+       </alias>
+       <alias>
+               <family>MS ゴシック</family>
+               <default><family>sans-serif</family></default>
+       </alias>
+       <alias>
+               <family>NanumGothic</family>
+               <default><family>sans-serif</family></default>
+       </alias>
+       <alias>
+               <family>UnDotum</family>
+               <default><family>sans-serif</family></default>
+       </alias>
+       <alias>
+               <family>Baekmuk Dotum</family>
+               <default><family>sans-serif</family></default>
+       </alias>
+       <alias>
+               <family>MgOpen Modata</family>
+               <default><family>sans-serif</family></default>
+       </alias>
+       <alias>
+               <family>Sazanami Gothic</family>
+               <default><family>sans-serif</family></default>
+       </alias>
+       <alias>
+               <family>AR PL ShanHeiSun Uni</family>
+               <default><family>sans-serif</family></default>
+       </alias>
+       <alias>
+               <family>ZYSong18030</family>
+               <default><family>sans-serif</family></default>
+       </alias>
+       <alias>
+               <family>FreeSans</family>
+               <default><family>sans-serif</family></default>
+       </alias>
+<!--
+  Monospace faces
+ -->
+       <alias>
+               <family>NSimSun</family>
+               <default><family>monospace</family></default>
+       </alias>
+       <alias>
+               <family>ZYSong18030</family>
+               <default><family>monospace</family></default>
+       </alias>
+       <alias>
+               <family>NanumGothicCoding</family>
+               <default><family>monospace</family></default>
+       </alias>
+       <alias>
+               <family>FreeMono</family>
+               <default><family>monospace</family></default>
+       </alias>
+
+<!--
+  Fantasy faces
+ -->
+       <alias>
+               <family>Homa</family>
+               <default><family>fantasy</family></default>
+       </alias>
+       <alias>
+               <family>Kamran</family>
+               <default><family>fantasy</family></default>
+       </alias>
+       <alias>
+               <family>Fantezi</family>
+               <default><family>fantasy</family></default>
+       </alias>
+       <alias>
+               <family>Tabassom</family>
+               <default><family>fantasy</family></default>
+       </alias>
+
+<!--
+  Cursive faces
+ -->
+       <alias>
+               <family>IranNastaliq</family>
+               <default><family>cursive</family></default>
+       </alias>
+       <alias>
+               <family>Nafees Nastaleeq</family>
+               <default><family>cursive</family></default>
+       </alias>
+
+</fontconfig>
diff --git a/distributions/windows/gnuplot_bin/gnuplot_bin_501/etc/fonts/conf.d/45-latin.conf b/distributions/windows/gnuplot_bin/gnuplot_bin_501/etc/fonts/conf.d/45-latin.conf
new file mode 100644 (file)
index 0000000..09fd526
--- /dev/null
@@ -0,0 +1,173 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+<!--
+  Mark common families with their generics so we'll get
+  something reasonable
+-->
+
+<!--
+  Serif faces
+ -->
+       <alias>
+               <family>Bitstream Vera Serif</family>
+               <default><family>serif</family></default>
+       </alias>
+       <alias>
+               <family>DejaVu Serif</family>
+               <default><family>serif</family></default>
+       </alias>
+       <alias>
+               <family>Liberation Serif</family>
+               <default><family>serif</family></default>
+       </alias>
+       <alias>
+               <family>Times New Roman</family>
+               <default><family>serif</family></default>
+       </alias>
+       <alias>
+               <family>Times</family>
+               <default><family>serif</family></default>
+       </alias>
+       <alias>
+               <family>Nimbus Roman No9 L</family>
+               <default><family>serif</family></default>
+       </alias>
+       <alias>
+               <family>Luxi Serif</family>
+               <default><family>serif</family></default>
+       </alias>
+       <alias>
+               <family>Thorndale AMT</family>
+               <default><family>serif</family></default>
+       </alias>
+       <alias>
+               <family>Thorndale</family>
+               <default><family>serif</family></default>
+       </alias>
+<!--
+  Sans-serif faces
+ -->
+       <alias>
+               <family>Bitstream Vera Sans</family>
+               <default><family>sans-serif</family></default>
+       </alias>
+       <alias>
+               <family>DejaVu Sans</family>
+               <default><family>sans-serif</family></default>
+       </alias>
+       <alias>
+               <family>Liberation Sans</family>
+               <default><family>sans-serif</family></default>
+       </alias>
+       <alias>
+               <family>Arial</family>
+               <default><family>sans-serif</family></default>
+       </alias>
+       <alias>
+               <family>Helvetica</family>
+               <default><family>sans-serif</family></default>
+       </alias>
+       <alias>
+               <family>Verdana</family>
+               <default><family>sans-serif</family></default>
+       </alias>
+       <alias>
+               <family>Albany AMT</family>
+               <default><family>sans-serif</family></default>
+       </alias>
+       <alias>
+               <family>Albany</family>
+               <default><family>sans-serif</family></default>
+       </alias>
+       <alias>
+               <family>Nimbus Sans L</family>
+               <default><family>sans-serif</family></default>
+       </alias>
+       <alias>
+               <family>Luxi Sans</family>
+               <default><family>sans-serif</family></default>
+       </alias>
+<!--
+  Monospace faces
+ -->
+       <alias>
+               <family>Bitstream Vera Sans Mono</family>
+               <default><family>monospace</family></default>
+       </alias>
+       <alias>
+               <family>DejaVu Sans Mono</family>
+               <default><family>monospace</family></default>
+       </alias>
+       <alias>
+               <family>Liberation Mono</family>
+               <default><family>monospace</family></default>
+       </alias>
+       <alias>
+               <family>Inconsolata</family>
+               <default><family>monospace</family></default>
+       </alias>
+       <alias>
+               <family>Courier New</family>
+               <default><family>monospace</family></default>
+       </alias>
+       <alias>
+               <family>Courier</family>
+               <default><family>monospace</family></default>
+       </alias>
+       <alias>
+               <family>Andale Mono</family>
+               <default><family>monospace</family></default>
+       </alias>
+       <alias>
+               <family>Luxi Mono</family>
+               <default><family>monospace</family></default>
+       </alias>
+       <alias>
+               <family>Cumberland AMT</family>
+               <default><family>monospace</family></default>
+       </alias>
+       <alias>
+               <family>Cumberland</family>
+               <default><family>monospace</family></default>
+       </alias>
+       <alias>
+               <family>Nimbus Mono L</family>
+               <default><family>monospace</family></default>
+       </alias>
+<!--
+  Fantasy faces
+ -->
+       <alias>
+               <family>Impact</family>
+               <default><family>fantasy</family></default>
+       </alias>
+       <alias>
+               <family>Copperplate Gothic Std</family>
+               <default><family>fantasy</family></default>
+       </alias>
+       <alias>
+               <family>Cooper Std</family>
+               <default><family>fantasy</family></default>
+       </alias>
+       <alias>
+               <family>Bauhaus Std</family>
+               <default><family>fantasy</family></default>
+       </alias>
+<!--
+  Cursive faces
+  -->
+       <alias>
+               <family>ITC Zapf Chancery Std</family>
+               <default><family>cursive</family></default>
+       </alias>
+       <alias>
+               <family>Zapfino</family>
+               <default><family>cursive</family></default>
+       </alias>
+       <alias>
+               <family>Comic Sans MS</family>
+               <default><family>cursive</family></default>
+       </alias>
+
+</fontconfig>
diff --git a/distributions/windows/gnuplot_bin/gnuplot_bin_501/etc/fonts/conf.d/49-sansserif.conf b/distributions/windows/gnuplot_bin/gnuplot_bin_501/etc/fonts/conf.d/49-sansserif.conf
new file mode 100644 (file)
index 0000000..c6209a7
--- /dev/null
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+<!--
+  If the font still has no generic name, add sans-serif
+ -->
+       <match target="pattern">
+               <test qual="all" name="family" compare="not_eq">
+                       <string>sans-serif</string>
+               </test>
+               <test qual="all" name="family" compare="not_eq">
+                       <string>serif</string>
+               </test>
+               <test qual="all" name="family" compare="not_eq">
+                       <string>monospace</string>
+               </test>
+               <edit name="family" mode="append_last">
+                       <string>sans-serif</string>
+               </edit>
+       </match>
+</fontconfig>
diff --git a/distributions/windows/gnuplot_bin/gnuplot_bin_501/etc/fonts/conf.d/50-user.conf b/distributions/windows/gnuplot_bin/gnuplot_bin_501/etc/fonts/conf.d/50-user.conf
new file mode 100644 (file)
index 0000000..2f10408
--- /dev/null
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+       <!-- Load per-user customization file -->
+       <include ignore_missing="yes" prefix="xdg">fontconfig/conf.d</include>
+       <include ignore_missing="yes" prefix="xdg">fontconfig/fonts.conf</include>
+       <!-- the following elements will be removed in the future -->
+       <include ignore_missing="yes" deprecated="yes">~/.fonts.conf.d</include>
+       <include ignore_missing="yes" deprecated="yes">~/.fonts.conf</include>
+</fontconfig>
diff --git a/distributions/windows/gnuplot_bin/gnuplot_bin_501/etc/fonts/conf.d/51-local.conf b/distributions/windows/gnuplot_bin/gnuplot_bin_501/etc/fonts/conf.d/51-local.conf
new file mode 100644 (file)
index 0000000..ca9fbe1
--- /dev/null
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+       <!-- Load local system customization file -->
+       <include ignore_missing="yes">local.conf</include>
+</fontconfig>
diff --git a/distributions/windows/gnuplot_bin/gnuplot_bin_501/etc/fonts/conf.d/60-latin.conf b/distributions/windows/gnuplot_bin/gnuplot_bin_501/etc/fonts/conf.d/60-latin.conf
new file mode 100644 (file)
index 0000000..2107e31
--- /dev/null
@@ -0,0 +1,70 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+       <alias>
+               <family>serif</family>
+               <prefer>
+                       <family>Bitstream Vera Serif</family>
+                       <family>DejaVu Serif</family>
+                       <family>Times New Roman</family>
+                       <family>Thorndale AMT</family>
+                       <family>Luxi Serif</family>
+                       <family>Nimbus Roman No9 L</family>
+                       <family>Times</family>
+               </prefer>
+       </alias>
+       <alias>
+               <family>sans-serif</family>
+               <prefer>
+                       <family>Bitstream Vera Sans</family>
+                       <family>DejaVu Sans</family>
+                       <family>Verdana</family>
+                       <family>Arial</family>
+                       <family>Albany AMT</family>
+                       <family>Luxi Sans</family>
+                       <family>Nimbus Sans L</family>
+                       <family>Helvetica</family>
+                       <family>Lucida Sans Unicode</family>
+                       <family>BPG Glaho International</family> <!-- lat,cyr,arab,geor -->
+                       <family>Tahoma</family> <!-- lat,cyr,greek,heb,arab,thai -->
+               </prefer>
+       </alias>
+       <alias>
+               <family>monospace</family>
+               <prefer>
+                       <family>Bitstream Vera Sans Mono</family>
+                       <family>DejaVu Sans Mono</family>
+                       <family>Inconsolata</family>
+                       <family>Andale Mono</family>
+                       <family>Courier New</family>
+                       <family>Cumberland AMT</family>
+                       <family>Luxi Mono</family>
+                       <family>Nimbus Mono L</family>
+                       <family>Courier</family>
+               </prefer>
+       </alias>
+<!--
+  Fantasy faces
+ -->
+       <alias>
+               <family>fantasy</family>
+               <prefer>
+                       <family>Impact</family>
+                       <family>Copperplate Gothic Std</family>
+                       <family>Cooper Std</family>
+                       <family>Bauhaus Std</family>
+               </prefer>
+       </alias>
+<!--
+  Cursive faces
+  -->
+       <alias>
+               <family>cursive</family>
+               <prefer>
+                       <family>ITC Zapf Chancery Std</family>
+                       <family>Zapfino</family>
+                       <family>Comic Sans MS</family>
+               </prefer>
+       </alias>
+
+</fontconfig>
diff --git a/distributions/windows/gnuplot_bin/gnuplot_bin_501/etc/fonts/conf.d/65-fonts-persian.conf b/distributions/windows/gnuplot_bin/gnuplot_bin_501/etc/fonts/conf.d/65-fonts-persian.conf
new file mode 100644 (file)
index 0000000..ea00661
--- /dev/null
@@ -0,0 +1,419 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<!--
+  fonts-persian.conf
+  To configure Persian fonts from The FarsiWeb Project.
+
+  Copyright (C) 2005  Sharif FarsiWeb, Inc. <license@farsiweb.info>
+
+  Permission to use, copy, modify, distribute, and sell this software and its
+  documentation for any purpose is hereby granted without fee, provided that
+  the above copyright notice appear in all copies and that both that
+  copyright notice and this permission notice appear in supporting
+  documentation, and that the name of Sharif FarsiWeb, Inc. not be used in
+  advertising or publicity pertaining to distribution of the software without
+  specific, written prior permission.  Sharif FarsiWeb, Inc. makes no
+  representations about the suitability of this software for any purpose.  It
+  is provided "as is" without express or implied warranty.
+
+  SHARIF FARSIWEB, INC. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+  EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+  CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+  DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+  PERFORMANCE OF THIS SOFTWARE.
+
+  ChangeLog:
+    2005-04-03  Behdad Esfahbod:  Initial revision.
+    2005-10-09  Behdad Esfahbod:  Turned off back-slant and Tahoma sections.
+    2005-11-30  Behdad Esfahbod:  Set Titr susbtitution size to 24 points.
+    2008       Behdad Esfahbod:  Cleanup.  Add fantasy and cursive.
+  -->
+<fontconfig>
+
+
+<!-- Deprecated fonts are discouraged -->
+
+       <!-- Nesf[2] is officially deprecated and has problematic tables -->
+       <alias binding="same">
+         <family>Nesf</family>
+         <accept><family>Nesf2</family></accept>
+       </alias>
+       <alias binding="same">
+         <family>Nesf2</family>
+         <accept><family>Persian_sansserif_default</family></accept>
+       </alias>
+
+<!-- Name changes and spelling variant aliases -->
+
+       <alias binding="same">
+         <family>Nazanin</family>
+         <accept><family>Nazli</family></accept>
+       </alias>
+       <alias binding="same">
+         <family>Lotus</family>
+         <accept><family>Lotoos</family></accept>
+       </alias>
+       <alias binding="same">
+         <family>Yaqut</family>
+         <accept><family>Yaghoot</family></accept>
+       </alias>
+       <alias binding="same">
+         <family>Yaghut</family>
+         <accept><family>Yaghoot</family></accept>
+       </alias>
+       <alias binding="same">
+         <family>Traffic</family>
+         <accept><family>Terafik</family></accept>
+       </alias>
+       <alias binding="same">
+         <family>Ferdowsi</family>
+         <accept><family>Ferdosi</family></accept>
+       </alias>
+       <alias binding="same">
+         <family>Fantezy</family>
+         <accept><family>Fantezi</family></accept>
+       </alias>
+
+
+<!-- Classify fonts. -->
+
+       <!-- Persian_title class -->
+       <alias binding="same">
+         <family>Jadid</family>
+         <accept><family>Persian_title</family></accept>
+       </alias>
+       <alias binding="same">
+         <family>Titr</family>
+         <accept><family>Persian_title</family></accept>
+       </alias>
+
+       <!-- Persian_fantasy class -->
+       <alias binding="same">
+         <family>Kamran</family>
+         <accept>
+         <family>Persian_fantasy</family>
+         <family>Homa</family>
+         </accept>
+       </alias>
+       <alias binding="same">
+         <family>Homa</family>
+         <accept>
+         <family>Persian_fantasy</family>
+         <family>Kamran</family>
+         </accept>
+       </alias>
+       <alias binding="same">
+         <family>Fantezi</family>
+         <accept><family>Persian_fantasy</family></accept>
+       </alias>
+       <alias binding="same">
+         <family>Tabassom</family>
+         <accept><family>Persian_fantasy</family></accept>
+       </alias>
+
+       <!-- Persian_square class -->
+       <alias binding="same">
+         <family>Arshia</family>
+         <accept><family>Persian_square</family></accept>
+       </alias>
+       <alias binding="same">
+         <family>Nasim</family>
+         <accept><family>Persian_square</family></accept>
+       </alias>
+       <alias binding="same">
+         <family>Elham</family>
+         <accept>
+         <family>Persian_square</family>
+         <family>Farnaz</family>
+         </accept>
+       </alias>
+       <alias binding="same">
+         <family>Farnaz</family>
+         <accept>
+         <family>Persian_square</family>
+         <family>Elham</family>
+         </accept>
+       </alias>
+       <alias binding="same">
+         <family>Sina</family>
+         <accept><family>Persian_square</family></accept>
+       </alias>
+
+<!-- Font ordering per class -->
+
+       <!-- Persian_title class -->
+       <alias binding="same">
+         <family>Persian_title</family>
+         <accept>
+         <family>Titr</family>
+         <family>Jadid</family>
+         <family>Persian_serif</family>
+         </accept>
+       </alias>
+
+       <!-- Persian_fantasy class -->
+       <alias binding="same">
+         <family>Persian_fantasy</family>
+         <accept>
+         <family>Homa</family>
+         <family>Kamran</family>
+         <family>Fantezi</family>
+         <family>Tabassom</family>
+         <family>Persian_square</family>
+         </accept>
+       </alias>
+
+       <!-- Persian_square class -->
+       <alias binding="same">
+         <family>Persian_square</family>
+         <accept>
+         <family>Arshia</family>
+         <family>Elham</family>
+         <family>Farnaz</family>
+         <family>Nasim</family>
+         <family>Sina</family>
+         <family>Persian_serif</family>
+         </accept>
+       </alias>
+
+<!-- Register the fonts that we actually do have -->
+
+       <match target="scan">
+               <test name="family" compare="eq" ignore-blanks="true">
+                       <string>Elham</string>
+               </test>
+               <edit name="foundry">
+                       <string>farsiweb</string>
+               </edit>
+       </match>
+
+       <match target="scan">
+               <test name="family" compare="eq" ignore-blanks="true">
+                       <string>Homa</string>
+               </test>
+               <edit name="foundry">
+                       <string>farsiweb</string>
+               </edit>
+       </match>
+
+       <match target="scan">
+               <test name="family" compare="eq" ignore-blanks="true">
+                       <string>Koodak</string>
+               </test>
+               <edit name="foundry">
+                       <string>farsiweb</string>
+               </edit>
+       </match>
+
+       <match target="scan">
+               <test name="family" compare="eq" ignore-blanks="true">
+                       <string>Nazli</string>
+               </test>
+               <edit name="foundry">
+                       <string>farsiweb</string>
+               </edit>
+       </match>
+
+       <match target="scan">
+               <test name="family" compare="eq" ignore-blanks="true">
+                       <string>Roya</string>
+               </test>
+               <edit name="foundry">
+                       <string>farsiweb</string>
+               </edit>
+       </match>
+
+       <match target="scan">
+               <test name="family" compare="eq" ignore-blanks="true">
+                       <string>Terafik</string>
+               </test>
+               <edit name="foundry">
+                       <string>farsiweb</string>
+               </edit>
+       </match>
+
+       <match target="scan">
+               <test name="family" compare="eq" ignore-blanks="true">
+                       <string>Titr</string>
+               </test>
+               <edit name="foundry">
+                       <string>farsiweb</string>
+               </edit>
+       </match>
+
+
+<!-- Our fonts should oblique to the other side (TURNED-OFF) -->
+
+       <match target="font">
+               <test name="foundry">
+                       <!--string>farsiweb</string-->
+                       <string>TURNED-OFF</string>
+               </test>
+               <test name="foundry">
+                       <string>farsiweb</string>
+               </test>
+               <!-- check to see if the font is roman -->
+               <test name="slant">
+                       <const>roman</const>
+               </test>
+               <!-- check to see if the pattern requested non-roman -->
+               <test target="pattern" name="slant" compare="not_eq">
+                       <const>roman</const>
+               </test>
+               <!-- multiply the matrix to slant the font -->
+               <edit name="matrix" mode="assign">
+                       <times>
+                               <name>matrix</name>
+                               <matrix><double>1</double><double>-0.2</double>
+                                       <double>0</double><double>1</double>
+                               </matrix>
+                       </times>
+               </edit>
+               <!-- pretend the font is oblique now -->
+               <edit name="slant" mode="assign">
+                       <const>oblique</const>
+               </edit>
+       </match>
+
+
+<!--
+  We can't hint our fonts well, so turn off hinting.
+  Moreover, the bitmaps we have designed (well, they
+  have designed), suck, so disable them too.
+  -->
+
+       <match target="font">
+               <test name="foundry">
+                       <string>farsiweb</string>
+               </test>
+               <edit name="autohint">
+                       <bool>false</bool>
+               </edit>
+               <edit name="hinting">
+                       <bool>false</bool>
+               </edit>
+               <edit name="embeddedbitmap">
+                       <bool>false</bool>
+               </edit>
+       </match>
+
+
+<!-- Alias our fonts to common families -->
+
+       <!-- Persian serif fonts -->
+       <alias>
+               <family>serif</family>
+               <accept>
+                       <family>Nazli</family>
+                       <family>Lotoos</family>
+                       <family>Mitra</family>
+                       <family>Ferdosi</family>
+                       <family>Badr</family>
+                       <family>Zar</family>
+               </accept>
+       </alias>
+
+       <!-- Persian sans-serif fonts -->
+       <alias>
+               <family>sans-serif</family>
+               <accept>
+                       <family>Roya</family>
+                       <family>Koodak</family>
+                       <family>Terafik</family>
+               </accept>
+       </alias>
+
+       <!-- Persian monospace fonts -->
+       <alias>
+               <family>monospace</family>
+               <accept>
+                       <!-- Not really monospace -->
+                       <family>Terafik</family>
+               </accept>
+       </alias>
+
+       <!-- Persian fantasy fonts -->
+       <alias>
+               <family>fantasy</family>
+               <accept>
+                       <family>Homa</family>
+                       <family>Kamran</family>
+                       <family>Fantezi</family>
+                       <family>Tabassom</family>
+               </accept>
+       </alias>
+
+       <!-- Persian (and Urdu) Nastaliq/cursive fonts -->
+       <alias>
+               <family>cursive</family>
+               <accept>
+                       <family>IranNastaliq</family>
+                       <family>Nafees Nastaleeq</family>
+               </accept>
+       </alias>
+
+<!-- Use Titr in titles -->
+
+       <!-- Both serif... -->
+       <match>
+               <test name="family">
+                       <string>serif</string>
+               </test>
+               <test name="weight" compare="more_eq">
+                       <int>200</int>
+               </test>
+               <test name="size" compare="more_eq">
+                       <double>24</double>
+               </test>
+               <edit name="family" mode="prepend">
+                       <string>Titr</string>
+               </edit>
+       </match>
+
+       <!-- and sans-serif. -->
+       <match>
+               <test name="family">
+                       <string>sans-serif</string>
+               </test>
+               <test name="weight" compare="more_eq">
+                       <int>200</int>
+               </test>
+               <test name="size" compare="more_eq">
+                       <double>24</double>
+               </test>
+               <edit name="family" mode="prepend">
+                       <string>Titr</string>
+               </edit>
+       </match>
+
+       <!-- and more. -->
+       <match>
+               <test name="family">
+                       <string>Persian_sansserif_default</string>
+               </test>
+               <test name="weight" compare="more_eq">
+                       <int>200</int>
+               </test>
+               <test name="size" compare="more_eq">
+                       <double>24</double>
+               </test>
+               <edit name="family" mode="prepend" binding="same">
+                       <string>Titr</string>
+               </edit>
+       </match>
+
+
+<!-- Default substituted for deprecated sans-serif fonts -->
+
+       <match>
+               <test name="family">
+                       <string>Persian_sansserif_default</string>
+               </test>
+               <edit name="family" mode="assign" binding="same">
+                       <string>Roya</string>
+               </edit>
+       </match>
+
+</fontconfig>
diff --git a/distributions/windows/gnuplot_bin/gnuplot_bin_501/etc/fonts/conf.d/65-nonlatin.conf b/distributions/windows/gnuplot_bin/gnuplot_bin_501/etc/fonts/conf.d/65-nonlatin.conf
new file mode 100644 (file)
index 0000000..9306f74
--- /dev/null
@@ -0,0 +1,196 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+       <alias>
+               <family>serif</family>
+               <prefer>
+                       <family>Artsounk</family> <!-- armenian -->
+                       <family>BPG UTF8 M</family> <!-- georgian -->
+                       <family>Kinnari</family> <!-- thai -->
+                       <family>Norasi</family> <!-- thai -->
+                       <family>Frank Ruehl</family> <!-- hebrew -->
+                       <family>Dror</family>  <!-- hebrew -->
+                       <family>JG LaoTimes</family>  <!-- lao -->
+                       <family>Saysettha Unicode</family>  <!-- lao -->
+                       <family>Pigiarniq</family> <!-- canadian syllabics -->
+                       <family>B Davat</family> <!-- arabic (fa) -->
+                       <family>B Compset</family>  <!-- arabic (fa) -->
+                       <family>Kacst-Qr</family> <!-- arabic (ar) -->
+                       <family>Urdu Nastaliq Unicode</family> <!-- arabic (ur) -->
+                       <family>Raghindi</family> <!-- devanagari -->
+                       <family>Mukti Narrow</family> <!-- bengali -->
+                       <family>malayalam</family> <!-- malayalam -->
+                       <family>Sampige</family> <!-- kannada -->
+                       <family>padmaa</family> <!-- gujarati -->
+                       <family>Hapax Berbère</family> <!-- tifinagh -->
+                       <family>MS Mincho</family> <!-- han (ja) -->
+                       <family>SimSun</family> <!-- han (zh-cn,zh-tw) -->
+                       <family>PMingLiu</family> <!-- han (zh-tw) -->
+                       <family>WenQuanYi Zen Hei</family> <!-- han (zh-cn,zh-tw) -->
+                       <family>WenQuanYi Bitmap Song</family> <!-- han (zh-cn,zh-tw) -->
+                       <family>AR PL ShanHeiSun Uni</family> <!-- han (ja,zh-cn,zh-tw) -->
+                       <family>AR PL New Sung</family> <!-- han (zh-cn,zh-tw) -->
+                       <family>ZYSong18030</family> <!-- han (zh-cn,zh-tw) -->
+                       <family>HanyiSong</family> <!-- han (zh-cn,zh-tw) -->
+                       <family>MgOpen Canonica</family>
+                       <family>Sazanami Mincho</family>
+                       <family>IPAMonaMincho</family>
+                       <family>IPAMincho</family>
+                       <family>Kochi Mincho</family>
+                       <family>AR PL SungtiL GB</family>
+                       <family>AR PL Mingti2L Big5</family>
+                       <family>AR PL Zenkai Uni</family>
+                       <family>MS 明朝</family>
+                       <family>ZYSong18030</family>
+                       <family>NanumMyeongjo</family> <!-- hangul (ko) -->
+                       <family>UnBatang</family> <!-- hangul (ko) -->
+                       <family>Baekmuk Batang</family> <!-- hangul (ko) -->
+                       <family>KacstQura</family>
+                       <family>Frank Ruehl CLM</family>
+                       <family>Lohit Bengali</family>
+                       <family>Lohit Gujarati</family>
+                       <family>Lohit Hindi</family>
+                       <family>Lohit Marathi</family>
+                       <family>Lohit Maithili</family>
+                       <family>Lohit Kashmiri</family>
+                       <family>Lohit Konkani</family>
+                       <family>Lohit Nepali</family>
+                       <family>Lohit Sindhi</family>
+                       <family>Lohit Punjabi</family>
+                       <family>Lohit Tamil</family>
+                       <family>Meera</family>
+                       <family>Lohit Malayalam</family>
+                       <family>Lohit Kannada</family>
+                       <family>Lohit Telugu</family>
+                       <family>Lohit Oriya</family>
+                       <family>LKLUG</family>
+               </prefer>
+       </alias>
+       <alias>
+               <family>sans-serif</family>
+               <prefer>
+                       <family>Nachlieli</family> <!-- hebrew -->
+                       <family>Lucida Sans Unicode</family>
+                       <family>Yudit Unicode</family>
+                       <family>Kerkis</family> <!-- greek -->
+                       <family>ArmNet Helvetica</family> <!-- armenian -->
+                       <family>Artsounk</family> <!-- armenian -->
+                       <family>BPG UTF8 M</family> <!-- georgian -->
+                       <family>Waree</family> <!-- thai -->
+                       <family>Loma</family> <!-- thai -->
+                       <family>Garuda</family> <!-- thai -->
+                       <family>Umpush</family> <!-- thai -->
+                       <family>Saysettha Unicode</family> <!-- lao? -->
+                       <family>JG Lao Old Arial</family> <!-- lao -->
+                       <family>GF Zemen Unicode</family> <!-- ethiopic -->
+                       <family>Pigiarniq</family> <!-- canadian syllabics -->
+                       <family>B Davat</family> <!-- arabic (fa) -->
+                       <family>B Compset</family> <!-- arabic (fa) -->
+                       <family>Kacst-Qr</family> <!-- arabic (ar) -->
+                       <family>Urdu Nastaliq Unicode</family> <!-- arabic (ur) -->
+                       <family>Raghindi</family> <!-- devanagari -->
+                       <family>Mukti Narrow</family> <!-- bengali -->
+                       <family>malayalam</family> <!-- malayalam -->
+                       <family>Sampige</family> <!-- kannada -->
+                       <family>padmaa</family> <!-- gujarati -->
+                       <family>Hapax Berbère</family> <!-- tifinagh -->
+                       <family>MS Gothic</family> <!-- han (ja) -->
+                       <family>UmePlus P Gothic</family> <!-- han (ja) -->
+                       <!-- chinese fonts are actually serifed -->
+                       <family>SimSun</family> <!-- han (zh-cn,zh-tw) -->
+                       <family>PMingLiu</family> <!-- han (zh-tw) -->
+                       <family>WenQuanYi Zen Hei</family> <!-- han (zh-cn,zh-tw) -->
+                       <family>WenQuanYi Bitmap Song</family> <!-- han (zh-cn,zh-tw) -->
+                       <family>AR PL ShanHeiSun Uni</family> <!--han (ja,zh-cn,zh-tw) -->
+                       <family>AR PL New Sung</family> <!-- han (zh-cn,zh-tw) -->
+                       <family>MgOpen Modata</family>
+                       <family>VL Gothic</family>
+                       <family>IPAMonaGothic</family>
+                       <family>IPAGothic</family>
+                       <family>Sazanami Gothic</family>
+                       <family>Kochi Gothic</family>
+                       <family>AR PL KaitiM GB</family>
+                       <family>AR PL KaitiM Big5</family>
+                       <family>AR PL ShanHeiSun Uni</family>
+                       <family>AR PL SungtiL GB</family>
+                       <family>AR PL Mingti2L Big5</family>
+                       <family>MS ゴシック</family>
+                       <family>ZYSong18030</family> <!-- han (zh-cn,zh-tw) -->
+                       <family>TSCu_Paranar</family> <!-- tamil -->
+                       <family>NanumGothic</family> <!-- hangul (ko) -->
+                       <family>UnDotum</family> <!-- hangul (ko) -->
+                       <family>Baekmuk Dotum</family> <!-- hangul (ko) -->
+                       <family>Baekmuk Gulim</family> <!-- hangul (ko) -->
+                       <family>KacstQura</family>
+                       <family>Lohit Bengali</family>
+                       <family>Lohit Gujarati</family>
+                       <family>Lohit Hindi</family>
+                       <family>Lohit Marathi</family>
+                       <family>Lohit Maithili</family>
+                       <family>Lohit Kashmiri</family>
+                       <family>Lohit Konkani</family>
+                       <family>Lohit Nepali</family>
+                       <family>Lohit Sindhi</family>
+                       <family>Lohit Punjabi</family>
+                       <family>Lohit Tamil</family>
+                       <family>Meera</family>
+                       <family>Lohit Malayalam</family>
+                       <family>Lohit Kannada</family>
+                       <family>Lohit Telugu</family>
+                       <family>Lohit Oriya</family>
+                       <family>LKLUG</family>
+               </prefer>
+       </alias>
+       <alias>
+               <family>monospace</family>
+               <prefer>
+                       <family>Miriam Mono</family> <!-- hebrew -->
+                       <family>VL Gothic</family>
+                       <family>IPAMonaGothic</family>
+                       <family>IPAGothic</family>
+                       <family>Sazanami Gothic</family>
+                       <family>Kochi Gothic</family>
+                       <family>AR PL KaitiM GB</family>
+                       <family>MS Gothic</family> <!-- han (ja) -->
+                       <family>UmePlus Gothic</family> <!-- han (ja) -->
+                       <family>NSimSun</family> <!-- han (zh-cn,zh-tw) -->
+                       <family>MingLiu</family> <!-- han (zh-tw) -->
+                       <family>AR PL ShanHeiSun Uni</family> <!-- han (ja,zh-cn,zh-tw) -->
+                       <family>AR PL New Sung Mono</family> <!-- han (zh-cn,zh-tw) -->
+                       <family>HanyiSong</family> <!-- han (zh-cn) -->
+                       <family>AR PL SungtiL GB</family>
+                       <family>AR PL Mingti2L Big5</family>
+                       <family>ZYSong18030</family> <!-- han (zh-cn,zh-tw) -->
+                       <family>NanumGothicCoding</family> <!-- hangul (ko) -->
+                       <family>NanumGothic</family> <!-- hangul (ko) -->
+                       <family>UnDotum</family> <!-- hangul (ko) -->
+                       <family>Baekmuk Dotum</family> <!-- hangul (ko) -->
+                       <family>Baekmuk Gulim</family> <!-- hangul (ko) -->
+                       <family>TlwgTypo</family> <!-- thai -->
+                       <family>TlwgTypist</family> <!-- thai -->
+                       <family>TlwgTypewriter</family> <!-- thai -->
+                       <family>TlwgMono</family> <!-- thai -->
+                       <family>Hasida</family> <!-- hebrew -->
+                       <family>Mitra Mono</family> <!-- bengali -->
+                       <family>GF Zemen Unicode</family> <!-- ethiopic -->
+                       <family>Hapax Berbère</family> <!-- tifinagh -->
+                       <family>Lohit Bengali</family>
+                       <family>Lohit Gujarati</family>
+                       <family>Lohit Hindi</family>
+                       <family>Lohit Marathi</family>
+                       <family>Lohit Maithili</family>
+                       <family>Lohit Kashmiri</family>
+                       <family>Lohit Konkani</family>
+                       <family>Lohit Nepali</family>
+                       <family>Lohit Sindhi</family>
+                       <family>Lohit Punjabi</family>
+                       <family>Lohit Tamil</family>
+                       <family>Meera</family>
+                       <family>Lohit Malayalam</family>
+                       <family>Lohit Kannada</family>
+                       <family>Lohit Telugu</family>
+                       <family>Lohit Oriya</family>
+                       <family>LKLUG</family>
+               </prefer>
+       </alias>
+</fontconfig>
diff --git a/distributions/windows/gnuplot_bin/gnuplot_bin_501/etc/fonts/conf.d/69-unifont.conf b/distributions/windows/gnuplot_bin/gnuplot_bin_501/etc/fonts/conf.d/69-unifont.conf
new file mode 100644 (file)
index 0000000..177dec5
--- /dev/null
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+       <alias>
+               <family>serif</family>
+               <prefer>
+                       <family>FreeSerif</family>
+                       <family>Code2000</family>
+                       <family>Code2001</family> <!-- plane1 and beyond -->
+               </prefer>
+       </alias>
+       <alias>
+               <family>sans-serif</family>
+               <prefer>
+                       <family>FreeSans</family>
+                       <family>Arial Unicode MS</family>
+                       <family>Arial Unicode</family>
+                       <family>Code2000</family> <!-- almost everything; serif actually -->
+                       <family>Code2001</family> <!-- plane1 and beyond -->
+               </prefer>
+       </alias>
+       <alias>
+               <family>monospace</family>
+               <prefer>
+                       <family>FreeMono</family>
+               </prefer>
+       </alias>
+</fontconfig>
diff --git a/distributions/windows/gnuplot_bin/gnuplot_bin_501/etc/fonts/conf.d/80-delicious.conf b/distributions/windows/gnuplot_bin/gnuplot_bin_501/etc/fonts/conf.d/80-delicious.conf
new file mode 100644 (file)
index 0000000..845647b
--- /dev/null
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+<!-- Fix-ups for Delicious family -->
+
+<!-- Delicious 'heavy' variant says its Medium weight -->
+<match target="scan">
+       <test name="family" compare="eq" ignore-blanks="true">
+               <string>Delicious</string>
+       </test>
+       <test name="style">
+               <string>Heavy</string>
+       </test>
+       <edit name="weight">
+               <const>heavy</const>
+       </edit>
+</match>
+
+</fontconfig>
diff --git a/distributions/windows/gnuplot_bin/gnuplot_bin_501/etc/fonts/conf.d/90-synthetic.conf b/distributions/windows/gnuplot_bin/gnuplot_bin_501/etc/fonts/conf.d/90-synthetic.conf
new file mode 100644 (file)
index 0000000..b8d1e85
--- /dev/null
@@ -0,0 +1,64 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+<!-- 
+ Artificial oblique for fonts without an italic or oblique version
+ -->
+       <match target="font">
+               <!-- check to see if the font is roman -->
+               <test name="slant">
+                       <const>roman</const>
+               </test>
+               <!-- check to see if the pattern requested non-roman -->
+               <test target="pattern" name="slant" compare="not_eq">
+                       <const>roman</const>
+               </test>
+               <!-- multiply the matrix to slant the font -->
+               <edit name="matrix" mode="assign">
+                       <times>
+                               <name>matrix</name>
+                               <matrix><double>1</double><double>0.2</double>
+                                       <double>0</double><double>1</double>
+                               </matrix>
+                       </times>
+               </edit>
+               <!-- pretend the font is oblique now -->
+               <edit name="slant" mode="assign">
+                       <const>oblique</const>
+               </edit>
+               <!-- and disable embedded bitmaps for artificial oblique -->
+               <edit name="embeddedbitmap" mode="assign">
+                       <bool>false</bool>
+               </edit>
+       </match>
+
+<!--
+ Synthetic emboldening for fonts that do not have bold face available
+ -->
+
+       <match target="font">
+               <!-- check to see if the font is just regular -->
+               <test name="weight" compare="less_eq">
+                       <const>medium</const>
+               </test>
+               <!-- check to see if the pattern requests bold -->
+               <test target="pattern" name="weight" compare="more">
+                       <const>medium</const>
+               </test>
+               <!--
+                 set the embolden flag
+                 needed for applications using cairo, e.g. gucharmap, gedit, ...
+               -->
+               <edit name="embolden" mode="assign">
+                       <bool>true</bool>
+               </edit>
+               <!--
+                set weight to bold
+                needed for applications using Xft directly, e.g. Firefox, ...
+               -->
+               <edit name="weight" mode="assign">
+                       <const>bold</const>
+               </edit>
+       </match>
+</fontconfig>
diff --git a/distributions/windows/gnuplot_bin/gnuplot_bin_501/etc/fonts/conf.d/README b/distributions/windows/gnuplot_bin/gnuplot_bin_501/etc/fonts/conf.d/README
new file mode 100644 (file)
index 0000000..c2fb52c
--- /dev/null
@@ -0,0 +1,23 @@
+conf.d/README
+
+Each file in this directory is a fontconfig configuration file.  Fontconfig
+scans this directory, loading all files of the form [0-9][0-9]*.conf.
+These files are normally installed in ../conf.avail and then symlinked here,
+allowing them to be easily installed and then enabled/disabled by adjusting
+the symlinks.
+
+The files are loaded in numeric order, the structure of the configuration
+has led to the following conventions in usage:
+
+ Files begining with:  Contain:
+ 00 through 09         Font directories
+ 10 through 19         system rendering defaults (AA, etc)
+ 20 through 29         font rendering options
+ 30 through 39         family substitution
+ 40 through 49         generic identification, map family->generic
+ 50 through 59         alternate config file loading
+ 60 through 69         generic aliases, map generic->family
+ 70 through 79         select font (adjust which fonts are available)
+ 80 through 89         match target="scan" (modify scanned patterns)
+ 90 through 99         font synthesis
diff --git a/distributions/windows/gnuplot_bin/gnuplot_bin_501/etc/fonts/fonts.conf b/distributions/windows/gnuplot_bin/gnuplot_bin_501/etc/fonts/fonts.conf
new file mode 100644 (file)
index 0000000..55944ab
--- /dev/null
@@ -0,0 +1,155 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<!-- /etc/fonts/fonts.conf file to configure system font access -->
+<fontconfig>
+
+<!--
+       DO NOT EDIT THIS FILE.
+       IT WILL BE REPLACED WHEN FONTCONFIG IS UPDATED.
+       LOCAL CHANGES BELONG IN 'local.conf'.
+
+       The intent of this standard configuration file is to be adequate for
+       most environments.  If you have a reasonably normal environment and
+       have found problems with this configuration, they are probably
+       things that others will also want fixed.  Please submit any
+       problems to the fontconfig bugzilla system located at fontconfig.org
+
+       Note that the normal 'make install' procedure for fontconfig is to
+       replace any existing fonts.conf file with the new version.  Place
+       any local customizations in local.conf which this file references.
+
+       Keith Packard
+-->
+
+<!-- Font directory list -->
+
+       <dir>WINDOWSFONTDIR</dir>
+       
+       <dir prefix="xdg">fonts</dir>
+       <!-- the following element will be removed in the future -->
+       <dir>~/.fonts</dir>
+
+<!--
+  Accept deprecated 'mono' alias, replacing it with 'monospace'
+-->
+       <match target="pattern">
+               <test qual="any" name="family">
+                       <string>mono</string>
+               </test>
+               <edit name="family" mode="assign" binding="same">
+                       <string>monospace</string>
+               </edit>
+       </match>
+
+<!--
+  Accept alternate 'sans serif' spelling, replacing it with 'sans-serif'
+-->
+       <match target="pattern">
+               <test qual="any" name="family">
+                       <string>sans serif</string>
+               </test>
+               <edit name="family" mode="assign" binding="same">
+                       <string>sans-serif</string>
+               </edit>
+       </match>
+
+<!--
+  Accept deprecated 'sans' alias, replacing it with 'sans-serif'
+-->
+       <match target="pattern">
+               <test qual="any" name="family">
+                       <string>sans</string>
+               </test>
+               <edit name="family" mode="assign" binding="same">
+                       <string>sans-serif</string>
+               </edit>
+       </match>
+
+<!--
+  Load local system customization file
+-->
+       <include ignore_missing="yes">/c/Programs/gplibs64_gcc490/etc/fonts/conf.d</include>
+
+<!-- Font cache directory list -->
+
+       <cachedir>WINDOWSTEMPDIR_FONTCONFIG_CACHE</cachedir>
+       <cachedir prefix="xdg">fontconfig</cachedir>
+       <!-- the following element will be removed in the future -->
+       <cachedir>~/.fontconfig</cachedir>
+
+       <config>
+<!--
+  These are the default Unicode chars that are expected to be blank
+  in fonts.  All other blank chars are assumed to be broken and
+  won't appear in the resulting charsets
+ -->
+               <blank>
+                       <int>0x0020</int>       <!-- SPACE -->
+                       <int>0x00A0</int>       <!-- NO-BREAK SPACE -->
+                       <int>0x00AD</int>       <!-- SOFT HYPHEN -->
+                       <int>0x034F</int>       <!-- COMBINING GRAPHEME JOINER -->
+                       <int>0x0600</int>       <!-- ARABIC NUMBER SIGN -->
+                       <int>0x0601</int>       <!-- ARABIC SIGN SANAH -->
+                       <int>0x0602</int>       <!-- ARABIC FOOTNOTE MARKER -->
+                       <int>0x0603</int>       <!-- ARABIC SIGN SAFHA -->
+                       <int>0x06DD</int>       <!-- ARABIC END OF AYAH -->
+                       <int>0x070F</int>       <!-- SYRIAC ABBREVIATION MARK -->
+                       <int>0x115F</int>       <!-- HANGUL CHOSEONG FILLER -->
+                       <int>0x1160</int>       <!-- HANGUL JUNGSEONG FILLER -->
+                       <int>0x1680</int>       <!-- OGHAM SPACE MARK -->
+                       <int>0x17B4</int>       <!-- KHMER VOWEL INHERENT AQ -->
+                       <int>0x17B5</int>       <!-- KHMER VOWEL INHERENT AA -->
+                       <int>0x180E</int>       <!-- MONGOLIAN VOWEL SEPARATOR -->
+                       <int>0x2000</int>       <!-- EN QUAD -->
+                       <int>0x2001</int>       <!-- EM QUAD -->
+                       <int>0x2002</int>       <!-- EN SPACE -->
+                       <int>0x2003</int>       <!-- EM SPACE -->
+                       <int>0x2004</int>       <!-- THREE-PER-EM SPACE -->
+                       <int>0x2005</int>       <!-- FOUR-PER-EM SPACE -->
+                       <int>0x2006</int>       <!-- SIX-PER-EM SPACE -->
+                       <int>0x2007</int>       <!-- FIGURE SPACE -->
+                       <int>0x2008</int>       <!-- PUNCTUATION SPACE -->
+                       <int>0x2009</int>       <!-- THIN SPACE -->
+                       <int>0x200A</int>       <!-- HAIR SPACE -->
+                       <int>0x200B</int>       <!-- ZERO WIDTH SPACE -->
+                       <int>0x200C</int>       <!-- ZERO WIDTH NON-JOINER -->
+                       <int>0x200D</int>       <!-- ZERO WIDTH JOINER -->
+                       <int>0x200E</int>       <!-- LEFT-TO-RIGHT MARK -->
+                       <int>0x200F</int>       <!-- RIGHT-TO-LEFT MARK -->
+                       <int>0x2028</int>       <!-- LINE SEPARATOR -->
+                       <int>0x2029</int>       <!-- PARAGRAPH SEPARATOR -->
+                       <int>0x202A</int>       <!-- LEFT-TO-RIGHT EMBEDDING -->
+                       <int>0x202B</int>       <!-- RIGHT-TO-LEFT EMBEDDING -->
+                       <int>0x202C</int>       <!-- POP DIRECTIONAL FORMATTING -->
+                       <int>0x202D</int>       <!-- LEFT-TO-RIGHT OVERRIDE -->
+                       <int>0x202E</int>       <!-- RIGHT-TO-LEFT OVERRIDE -->
+                       <int>0x202F</int>       <!-- NARROW NO-BREAK SPACE -->
+                       <int>0x205F</int>       <!-- MEDIUM MATHEMATICAL SPACE -->
+                       <int>0x2060</int>       <!-- WORD JOINER -->
+                       <int>0x2061</int>       <!-- FUNCTION APPLICATION -->
+                       <int>0x2062</int>       <!-- INVISIBLE TIMES -->
+                       <int>0x2063</int>       <!-- INVISIBLE SEPARATOR -->
+                       <int>0x206A</int>       <!-- INHIBIT SYMMETRIC SWAPPING -->
+                       <int>0x206B</int>       <!-- ACTIVATE SYMMETRIC SWAPPING -->
+                       <int>0x206C</int>       <!-- INHIBIT ARABIC FORM SHAPING -->
+                       <int>0x206D</int>       <!-- ACTIVATE ARABIC FORM SHAPING -->
+                       <int>0x206E</int>       <!-- NATIONAL DIGIT SHAPES -->
+                       <int>0x206F</int>       <!-- NOMINAL DIGIT SHAPES -->
+                       <int>0x2800</int>       <!-- BRAILLE PATTERN BLANK -->
+                       <int>0x3000</int>       <!-- IDEOGRAPHIC SPACE -->
+                       <int>0x3164</int>       <!-- HANGUL FILLER -->
+                       <int>0xFEFF</int>       <!-- ZERO WIDTH NO-BREAK SPACE -->
+                       <int>0xFFA0</int>       <!-- HALFWIDTH HANGUL FILLER -->
+                       <int>0xFFF9</int>       <!-- INTERLINEAR ANNOTATION ANCHOR -->
+                       <int>0xFFFA</int>       <!-- INTERLINEAR ANNOTATION SEPARATOR -->
+                       <int>0xFFFB</int>       <!-- INTERLINEAR ANNOTATION TERMINATOR -->
+               </blank>
+<!--
+  Rescan configuration every 30 seconds when FcFontSetList is called
+ -->
+               <rescan>
+                       <int>30</int>
+               </rescan>
+       </config>
+
+</fontconfig>
diff --git a/distributions/windows/gnuplot_bin/gnuplot_bin_501/etc/pango/1.6.0/modules/pango-arabic-fc.dll b/distributions/windows/gnuplot_bin/gnuplot_bin_501/etc/pango/1.6.0/modules/pango-arabic-fc.dll
new file mode 100755 (executable)
index 0000000..5213e68
Binary files /dev/null and b/distributions/windows/gnuplot_bin/gnuplot_bin_501/etc/pango/1.6.0/modules/pango-arabic-fc.dll differ
diff --git a/distributions/windows/gnuplot_bin/gnuplot_bin_501/etc/pango/1.6.0/modules/pango-arabic-lang.dll b/distributions/windows/gnuplot_bin/gnuplot_bin_501/etc/pango/1.6.0/modules/pango-arabic-lang.dll
new file mode 100755 (executable)
index 0000000..f9a547d
Binary files /dev/null and b/distributions/windows/gnuplot_bin/gnuplot_bin_501/etc/pango/1.6.0/modules/pango-arabic-lang.dll differ
diff --git a/distributions/windows/gnuplot_bin/gnuplot_bin_501/etc/pango/1.6.0/modules/pango-basic-fc.dll b/distributions/windows/gnuplot_bin/gnuplot_bin_501/etc/pango/1.6.0/modules/pango-basic-fc.dll
new file mode 100755 (executable)
index 0000000..5dc405e
Binary files /dev/null and b/distributions/windows/gnuplot_bin/gnuplot_bin_501/etc/pango/1.6.0/modules/pango-basic-fc.dll differ
diff --git a/distributions/windows/gnuplot_bin/gnuplot_bin_501/etc/pango/1.6.0/modules/pango-basic-win32.dll b/distributions/windows/gnuplot_bin/gnuplot_bin_501/etc/pango/1.6.0/modules/pango-basic-win32.dll
new file mode 100755 (executable)
index 0000000..94fa54b
Binary files /dev/null and b/distributions/windows/gnuplot_bin/gnuplot_bin_501/etc/pango/1.6.0/modules/pango-basic-win32.dll differ
diff --git a/distributions/windows/gnuplot_bin/gnuplot_bin_501/etc/pango/1.6.0/modules/pango-hangul-fc.dll b/distributions/windows/gnuplot_bin/gnuplot_bin_501/etc/pango/1.6.0/modules/pango-hangul-fc.dll
new file mode 100755 (executable)
index 0000000..aa94db1
Binary files /dev/null and b/distributions/windows/gnuplot_bin/gnuplot_bin_501/etc/pango/1.6.0/modules/pango-hangul-fc.dll differ
diff --git a/distributions/windows/gnuplot_bin/gnuplot_bin_501/etc/pango/1.6.0/modules/pango-hebrew-fc.dll b/distributions/windows/gnuplot_bin/gnuplot_bin_501/etc/pango/1.6.0/modules/pango-hebrew-fc.dll
new file mode 100755 (executable)
index 0000000..c049915
Binary files /dev/null and b/distributions/windows/gnuplot_bin/gnuplot_bin_501/etc/pango/1.6.0/modules/pango-hebrew-fc.dll differ
diff --git a/distributions/windows/gnuplot_bin/gnuplot_bin_501/etc/pango/1.6.0/modules/pango-indic-fc.dll b/distributions/windows/gnuplot_bin/gnuplot_bin_501/etc/pango/1.6.0/modules/pango-indic-fc.dll
new file mode 100755 (executable)
index 0000000..33ab9b6
Binary files /dev/null and b/distributions/windows/gnuplot_bin/gnuplot_bin_501/etc/pango/1.6.0/modules/pango-indic-fc.dll differ
diff --git a/distributions/windows/gnuplot_bin/gnuplot_bin_501/etc/pango/1.6.0/modules/pango-indic-lang.dll b/distributions/windows/gnuplot_bin/gnuplot_bin_501/etc/pango/1.6.0/modules/pango-indic-lang.dll
new file mode 100755 (executable)
index 0000000..6d980bc
Binary files /dev/null and b/distributions/windows/gnuplot_bin/gnuplot_bin_501/etc/pango/1.6.0/modules/pango-indic-lang.dll differ
diff --git a/distributions/windows/gnuplot_bin/gnuplot_bin_501/etc/pango/1.6.0/modules/pango-khmer-fc.dll b/distributions/windows/gnuplot_bin/gnuplot_bin_501/etc/pango/1.6.0/modules/pango-khmer-fc.dll
new file mode 100755 (executable)
index 0000000..c020f4e
Binary files /dev/null and b/distributions/windows/gnuplot_bin/gnuplot_bin_501/etc/pango/1.6.0/modules/pango-khmer-fc.dll differ
diff --git a/distributions/windows/gnuplot_bin/gnuplot_bin_501/etc/pango/1.6.0/modules/pango-syriac-fc.dll b/distributions/windows/gnuplot_bin/gnuplot_bin_501/etc/pango/1.6.0/modules/pango-syriac-fc.dll
new file mode 100755 (executable)
index 0000000..f430762
Binary files /dev/null and b/distributions/windows/gnuplot_bin/gnuplot_bin_501/etc/pango/1.6.0/modules/pango-syriac-fc.dll differ
diff --git a/distributions/windows/gnuplot_bin/gnuplot_bin_501/etc/pango/1.6.0/modules/pango-thai-fc.dll b/distributions/windows/gnuplot_bin/gnuplot_bin_501/etc/pango/1.6.0/modules/pango-thai-fc.dll
new file mode 100755 (executable)
index 0000000..38b02e4
Binary files /dev/null and b/distributions/windows/gnuplot_bin/gnuplot_bin_501/etc/pango/1.6.0/modules/pango-thai-fc.dll differ
diff --git a/distributions/windows/gnuplot_bin/gnuplot_bin_501/etc/pango/1.6.0/modules/pango-tibetan-fc.dll b/distributions/windows/gnuplot_bin/gnuplot_bin_501/etc/pango/1.6.0/modules/pango-tibetan-fc.dll
new file mode 100755 (executable)
index 0000000..fd5d18d
Binary files /dev/null and b/distributions/windows/gnuplot_bin/gnuplot_bin_501/etc/pango/1.6.0/modules/pango-tibetan-fc.dll differ
diff --git a/distributions/windows/gnuplot_bin/gnuplot_bin_501/etc/pango/pango.modules b/distributions/windows/gnuplot_bin/gnuplot_bin_501/etc/pango/pango.modules
new file mode 100644 (file)
index 0000000..024684a
--- /dev/null
@@ -0,0 +1,35 @@
+# Pango Modules file\r
+# Automatically generated file, do not edit\r
+#\r
+# ModulesPath = .\1.6.0\modules\r
+#\r
+".\\1.6.0\\modules\\pango-arabic-fc.dll" ArabicScriptEngineFc PangoEngineShape PangoRenderFc arabic:* nko:*\r
+".\\1.6.0\\modules\\pango-arabic-lang.dll" ArabicScriptEngineLang PangoEngineLang PangoRenderNone arabic:*\r
+".\\1.6.0\\modules\\pango-basic-fc.dll" BasicScriptEngineFc PangoEngineShape PangoRenderFc latin:* cyrillic:* greek:* armenian:* georgian:* runic:* ogham:* bopomofo:* cherokee:* coptic:* deseret:* ethiopic:* gothic:* han:* hiragana:* katakana:* old-italic:* canadian-aboriginal:* yi:* braille:* cypriot:* limbu:* osmanya:* shavian:* linear-b:* ugaritic:* glagolitic:* cuneiform:* phoenician:* common:\r
+".\\1.6.0\\modules\\pango-basic-win32.dll" BasicScriptEngineWin32 PangoEngineShape PangoRenderWin32 common:\r
+".\\1.6.0\\modules\\pango-hangul-fc.dll" HangulScriptEngineFc PangoEngineShape PangoRenderFc hangul:*\r
+".\\1.6.0\\modules\\pango-hebrew-fc.dll" HebrewScriptEngineFc PangoEngineShape PangoRenderFc hebrew:*\r
+".\\1.6.0\\modules\\pango-indic-fc.dll" devaScriptEngineFc PangoEngineShape PangoRenderFc devanagari:*\r
+".\\1.6.0\\modules\\pango-indic-fc.dll" bengScriptEngineFc PangoEngineShape PangoRenderFc bengali:*\r
+".\\1.6.0\\modules\\pango-indic-fc.dll" guruScriptEngineFc PangoEngineShape PangoRenderFc gurmukhi:*\r
+".\\1.6.0\\modules\\pango-indic-fc.dll" gujrScriptEngineFc PangoEngineShape PangoRenderFc gujarati:*\r
+".\\1.6.0\\modules\\pango-indic-fc.dll" oryaScriptEngineFc PangoEngineShape PangoRenderFc oriya:*\r
+".\\1.6.0\\modules\\pango-indic-fc.dll" tamlScriptEngineFc PangoEngineShape PangoRenderFc tamil:*\r
+".\\1.6.0\\modules\\pango-indic-fc.dll" teluScriptEngineFc PangoEngineShape PangoRenderFc telugu:*\r
+".\\1.6.0\\modules\\pango-indic-fc.dll" kndaScriptEngineFc PangoEngineShape PangoRenderFc kannada:*\r
+".\\1.6.0\\modules\\pango-indic-fc.dll" mlymScriptEngineFc PangoEngineShape PangoRenderFc malayalam:*\r
+".\\1.6.0\\modules\\pango-indic-fc.dll" sinhScriptEngineFc PangoEngineShape PangoRenderFc sinhala:*\r
+".\\1.6.0\\modules\\pango-indic-lang.dll" devaIndicScriptEngineLang PangoEngineLang PangoRenderNone devanagari:*\r
+".\\1.6.0\\modules\\pango-indic-lang.dll" bengIndicScriptEngineLang PangoEngineLang PangoRenderNone bengali:*\r
+".\\1.6.0\\modules\\pango-indic-lang.dll" guruIndicScriptEngineLang PangoEngineLang PangoRenderNone gurmukhi:*\r
+".\\1.6.0\\modules\\pango-indic-lang.dll" gujrIndicScriptEngineLang PangoEngineLang PangoRenderNone gujarati:*\r
+".\\1.6.0\\modules\\pango-indic-lang.dll" oryaIndicScriptEngineLang PangoEngineLang PangoRenderNone oriya:*\r
+".\\1.6.0\\modules\\pango-indic-lang.dll" tamlIndicScriptEngineLang PangoEngineLang PangoRenderNone tamil:*\r
+".\\1.6.0\\modules\\pango-indic-lang.dll" teluIndicScriptEngineLang PangoEngineLang PangoRenderNone telugu:*\r
+".\\1.6.0\\modules\\pango-indic-lang.dll" kndaIndicScriptEngineLang PangoEngineLang PangoRenderNone kannada:*\r
+".\\1.6.0\\modules\\pango-indic-lang.dll" mlymIndicScriptEngineLang PangoEngineLang PangoRenderNone malayalam:*\r
+".\\1.6.0\\modules\\pango-indic-lang.dll" sinhIndicScriptEngineLang PangoEngineLang PangoRenderNone sinhala:*\r
+".\\1.6.0\\modules\\pango-khmer-fc.dll" KhmerScriptEngineFc PangoEngineShape PangoRenderFc khmer:*\r
+".\\1.6.0\\modules\\pango-syriac-fc.dll" SyriacScriptEngineFc PangoEngineShape PangoRenderFc syriac:*\r
+".\\1.6.0\\modules\\pango-thai-fc.dll" ThaiScriptEngineFc PangoEngineShape PangoRenderFc thai:* lao:*\r
+".\\1.6.0\\modules\\pango-tibetan-fc.dll" TibetanScriptEngineFc PangoEngineShape PangoRenderFc tibetan:*\r
index e5f82a5b34d79222ea40e25880695f5a6533db68..792d378019f049fef03483aaac5d1d9deee226b2 100644 (file)
@@ -1,8 +1,7 @@
-# Imach version 0.98q2, April 2015, INED-EUROREVES \r
+# Imach version 0.98r3, December 2015, INED-EUROREVES \r
 title=1st_example datafile=data1.txt lastobs=8600 firstpass=1 lastpass=4\r
 ftol=1.000000e-008 stepm=1 ncovcol=2 nlstate=2 ndeath=1 maxwav=4 mle=1 weight=0\r
-model=1+age+.\r
-#q Parameters\r
+model=1+age.\r
 12 -12.245240 0.092358 \r
 13 -10.671890 0.060969 \r
 21 -2.645345 -0.022325 \r
@@ -22,10 +21,10 @@ model=1+age+.
 231 0. 0. 0. 0. 0. 0. 0. \r
 232 0. 0. 0. 0. 0. 0. 0. 0.\r
 # agemin agemax for life expectancy, bage fage (if mle==0 ie no data nor Max likelihood).\r
-agemin=70 agemax=95 bage=65 fage=95\r
+agemin=70 agemax=95 bage=65 fage=95 estepm=1 ftolpl=6e-4\r
 # Observed prevalence period\r
-begin-prev-date=1/1/1984 end-prev-date=1/6/1988 estepm=1\r
+begin-prev-date=1/1/1984 end-prev-date=1/6/1988 \r
 # Health expectancies computed from stationary prevalence (pop_based=0) or population based (1)\r
-pop_based=0\r
+pop_based=1\r
 # Prevalence forecasting\r
-starting-proj-date=1/1/1989 final-proj-date=1/1/1990 mov_average=0\r
+prevforecast=1 starting-proj-date=1/1/1989 final-proj-date=1/1/1990 mov_average=0\r
index 2ca37f81c8664b167a35d7c5b0880a58bae648ea..06f941bef9b0c3e0da02d6f32d993feafd82d8ff 100755 (executable)
@@ -2,7 +2,7 @@
 #\r
 title=MLE datafile=../doc/data/mydata.txt lastobs=3000 firstpass=1 lastpass=4\r
 ftol=1e-8 stepm=24 ncovcol=2 nlstate=2 ndeath=1 maxwav=4 mle=1 weight=0\r
-model=1+age+.\r
+model=1+age.\r
 #q Parameters nlstate*nlstate*ncov a12*1 + b12 * age + ...\r
 12 0. 0.\r
 13 0. 0.\r
@@ -23,7 +23,7 @@ model=1+age+.
 231 0. 0. 0. 0. 0. 0. 0. \r
 232 0. 0. 0. 0. 0. 0. 0. 0.\r
 # agemin agemax for lifexpectancy, bage fage (if mle==0 ie no data nor Max likelihood).\r
-agemin=70 agemax=100 bage=50 fage=100 estepm=24\r
+agemin=70 agemax=100 bage=50 fage=100 estepm=24 ftolpl=6e-4\r
 #Observed prevalence period\r
 begin-prev-date=1/1/1984 end-prev-date=1/6/1988 mov_average=0\r
 # Population or status based\r
index b8432a9a54a8226373c2d6de540846f4b31e28a4..ded5a77f75340ad949387a86c2e4c5c03d5937a9 100644 (file)
@@ -315,6 +315,7 @@ 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 ../distributions/windows/mybuildicl64.bat ../distributions/windows/mybuildicl32.bat setup.iss 
        pwd
        touch setup.iss.in
@@ -333,17 +334,20 @@ imachICL64-noreg-setup: IMaCh-icl64-$(VERSION).exe noreg-setup.iss
        $(CP) Output/$(TMPSETUPEXE) imachICL64-noreg-setup
 
 ../build/icl64/Release/IMaCh-$(VERSION).exe: imach.c ../distributions/windows/mybuildicl64.bat
-       rm -rf ../build/icl64  && mkdir ../build/icl64
+#      rm -rf ../build/icl64  && mkdir ../build/icl64
        cp ../distributions/windows/mybuildicl64.bat ../build/icl64/
        cd ../build/icl64
-       VBoxManage --nologo guestcontrol "Windows7-64" run --exe "C:\Windows\SysWOW64\cmd.exe" \
+#      VBoxManage --nologo guestcontrol "Windows7-64" run --exe "C:\Windows\SysWOW64\cmd.exe" --username brouard  --verbose  --wait-stdout  --wait-stderr -- "/c" "DIR" 
+#      VBoxManage --nologo guestcontrol "Windows7-64" run --exe "c:\\windows\\system32\\ipconfig.exe" --username brouard  --verbose  --wait-stdout  --wait-stderr -- "/all"
+#VBoxManage --nologo guestcontrol "Windows7-64" run --exe "C:\Windows\SysWOW64\cmd.exe" \
        --username brouard  --verbose  --wait-stdout  --wait-stderr -- "/c" "$(DRIVEG)$(DIRG)\icl64\mybuildicl64.bat" "$(VERSION)" "$(DRIVEG)" "$(DIRG)"
 
 ../build/icl32/Release/IMaCh-$(VERSION).exe: imach.c ../distributions/windows/mybuildicl32.bat
-       rm -rf ../build/icl32 && mkdir -p ../build/icl32
+#      rm -rf ../build/icl32 && mkdir -p ../build/icl32
        cp ../distributions/windows/mybuildicl32.bat ../build/icl32/
        cd ../build/icl32
-       VBoxManage --nologo guestcontrol "Windows7-64" run --exe "C:\Windows\SysWOW64\cmd.exe" \
+
+#VBoxManage --nologo guestcontrol "Windows7-64" run --exe "C:\Windows\SysWOW64\cmd.exe" \
        --username brouard  --verbose  --wait-stdout -- "/c" "$(DRIVEG)$(DIRG)\icl32\mybuildicl32.bat" "$(VERSION)" "$(DRIVEG)" "$(DIRG)"
 
 ../build/vs32/Release/IMaCh-$(VERSION).exe: imach.c mybuildvs32.bat
@@ -489,9 +493,11 @@ imachdmg : imachopt.o ../distributions/osx/create-dmg ../distributions/osx/creat
        mkdir -p imach$(VERSION).app/Contents/Resources;\
        mkdir -p imach$(VERSION).app/Contents/Resources/Scripts;\
        mkdir -p imach$(VERSION).app/Contents/Resources/bin;\
+       mkdir -p imach$(VERSION).app/Contents/Resources/lib;\
        mkdir -p imach$(VERSION).app/Contents/Resources/html;\
        cp IMaCh-$(VERSION) imach$(VERSION).app/Contents/Resources/bin/imach;\
-       cp ../../distributions/osx/gnuplot_bin/gnuplot_5_1_OSX imach$(VERSION).app/Contents/Resources/bin/gnuplot;\
+       cp ../../distributions/osx/gnuplot_bin/bin/gnuplot imach$(VERSION).app/Contents/Resources/bin/gnuplot;\
+       cp ../../distributions/osx/gnuplot_bin/lib/* imach$(VERSION).app/Contents/Resources/lib;\
        mkdir -p imach$(VERSION).app/Contents/Resources/description.rtfd;\
        cp -p ../../distributions/osx/TXT.rtf imach$(VERSION).app/Contents/Resources/description.rtfd ;\
        $(SED) -e "s/@VERSION@/$(VERSION)/g;" ../../distributions/osx/IMaChInfo.plist.in  >imach$(VERSION).app/Contents/Info.plist ;\
@@ -508,15 +514,15 @@ imachdmg : imachopt.o ../distributions/osx/create-dmg ../distributions/osx/creat
        cp ../../distributions/osx/Background.png .;\
        pwd ;\
        ./createdmg3.sh  --volname "IMaCh $(VERSION)" imach$(VERSION).dmg imach$(VERSION) ;\
-       mv  imach$(VERSION).dmg ../../src/Output/ ;)
+       cp  imach$(VERSION).dmg ../../src/Output/ ;)
 #      ./create-dmg --volname "IMaCh $(VERSION)" imach$(VERSION).dmg imach$(VERSION).app 
 #      ./createdmg2.sh --volname "IMaCh $(VERSION)" imach$(VERSION).dmg imach$(VERSION)
 
 md5:
        ls Output/* | xargs md5sum
 upload:
-       rsync -v Output/IMaCh-0.98r2-icl-setup.exe brouard@henry.ined.fr:/home/euroreves/html/imach/Download
-       rsync -v Output/imach0.98r2.dmg brouard@henry.ined.fr:/home/euroreves/html/imach/Download
+       rsync -v Output/IMaCh-0.98r3-icl-setup.exe brouard@henry.ined.fr:/home/euroreves/html/imach/Download
+       rsync -v Output/imach0.98r3.dmg brouard@henry.ined.fr:/home/euroreves/html/imach/Download
 #      rsync -v Output/* brouard@henry.ined.fr:/home/euroreves/html/imach/Download
 
 imachcyg : imachcyg.o