12 files changed, 152 insertions, 120 deletions
diff --git a/Master/texmf-dist/README.html b/Master/texmf-dist/README.html
new file mode 100644
index 00000000000..84f3cad4b99
--- /dev/null
+++ b/Master/texmf-dist/README.html
@@ -0,0 +1,144 @@
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+<title>VnTeX-README</title>
+</head>
+<body>
+vntex-3.1.2
+<p>
+This file is part of VnTeX.
+License: <a href="http://www.latex-project.org/lppl.txt">LPPL</a>,
+version 1.3 or newer.<br>
+Author: <a href="mailto:reinhard.kotucha@web.de">Reinhard Kotucha</a>.
+
+<h1>VnTeX</h1>
+
+<h2>Description</h2>
+VnTeX is a package which supports typesetting Vietnamese.  It provides
+macro packages for LaTeX and plain TeX as well as fonts.
+<p>
+The primary site of VnTeX is
+
+<ul>
+<li><a href="http://vntex.org"><tt>http://vntex.org</tt></a>.</li>
+</ul>
+
+There are also some fonts which cannot be freely distributed.
+Download them
+from <a
+href="http://vntex.org/download/vntex"><tt>http://vntex.org/download/vntex</tt></a>.
+<p>
+<a href="http://tug.org/texlive">TeXLive</a> users can
+use the program <tt>getnonfreefonts</tt> to download and install them.
+
+
+<h2>Author</h2>
+
+The author of VnTeX is <a href="mailto:HanTheThanh@gmx.net">Hàn Thế Thành</a>.
+
+
+<h2>Contributors</h2>
+
+LaTeX support (input encoding files, font encoding file, babel support
+and vietnam.sty) is provided by Werner Lemberg.
+
+<a href="http://www.cse.ohio-state.edu/~gurari/TeX4ht">TeX4ht</a> support is
+provided by Hàn Thế Thành and Eitan Gurari. The fonts are now part of
+the tex4ht distribution and maintained by Eitan Gurari.
+
+plnfss has been removed from VnTeX because it supports many other
+languages as well.  You can download it from
+<ul>
+<li><a href="http://ctan.tug.org/tex-archive/macros/plain/plnfss"><tt>http://ctan.tug.org/tex-archive/macros/plain/plnfss</tt></a>.</li>
+</ul>
+
+<h2>License</h2>
+
+The URW Type1 fonts are copyrighted under the 
+<a href="http://www.gnu.org/licenses/gpl.txt">GNU
+ GPL</a>, <tt>.map</tt> files are public
+ domain, <tt>varioref-vi.sty</tt> is
+ under <a href="http://www.gnu.org/licenses/lgpl.txt">LGPL</a>,
+ Vntopia fonts are under
+ the <a href="http://tug.org/fonts/utopia/LICENSE-utopia.txt">Utopia
+ license agreement</a>, all other files are
+ under <a href="http://www.latex-project.org/lppl.txt">LPPL</a>,
+ version 1.3 or newer.
+
+
+<h2>Support</h2>
+The current maintainers are
+<ul>
+<li>Hàn Thế Thành &lt;<a href="mailto:HanTheThanh@gmail.com"><tt>HanTheThanh@gmail.com</tt></a>&gt;</li>
+<li>Werner Lemberg &lt;<a href="mailto:WL@gnu.org"><tt>WL@gnu.org></tt></a>&gt;</li>
+<li>Reinhard Kotucha &lt;<a href="mailto:Reinhard.Kotucha@web.de"><tt>Reinhard.Kotucha@web.de</tt></a>&gt;</li>
+</ul>
+
+There is a mailing list (very low traffic) for questions about
+VnTeX and typesetting Vietnamese.  To subscribe to the list, visit
+<ul>
+<li> <a
+href="http://lists.sourceforge.net/lists/listinfo/vntex-users"><tt>http://lists.sourceforge.net/lists/listinfo/vntex-users</tt></a></li>
+</ul>
+
+The Vietnamese fonts
+for <a href="http://www.cse.ohio-state.edu/~gurari/TeX4ht">TeX4ht</a>
+are now part
+of <a href="http://www.cse.ohio-state.edu/~gurari/TeX4ht">TeX4ht</a>
+and maintained by <a href="mailto:gurari@cse.ohio-state.edu>">Eitan
+Gurari</a>.
+
+
+<h2>When do I have to upgrade?</h2>
+
+If the directory<br>
+&nbsp;&nbsp;&nbsp;&nbsp;<code>&lt;texmf*&gt;/doc/generic/vntex/tests</code><br>
+doesn't exist you should upgrade.  In this case you have a very old version of VnTeX.
+<p>
+The version number of the release you actually have installed appears
+in the first line of the file<br>
+&nbsp;&nbsp;&nbsp;&nbsp;<code>&lt;texmf*&gt;/doc/generic/vntex/vntex.txt</code>.<br>
+The version number of <em>this</em> release is 3.1.2.
+<p>
+The latest stable release can be downloaded from 
+<a href="http://vntex.org/download/vntex"><tt>http://vntex.org/download/vntex</tt></a>. 
+<p>     
+Beta releases can be downloaded from
+<a href="http://vntex.org/download/vntex-beta"><tt>http://vntex.org/download/vntex-beta</tt></a>.
+<p>
+Bugfixes can be found at <a href="http://vntex.org/download/vntex-update"><tt>http://vntex.org/download/vntex-update</tt></a>.
+Read the instructions on this page to find out whether you have to
+install it.
+
+<h2>Installation</h2>
+It is recommended to create an own directory tree for vntex so that
+you can remove it easily when you update your TeX system.
+<p>
+This directory tree should be the first item of TeX's search path,
+otherwise you have to remove old versions of VnTeX or vncmr completely.
+<p>
+On UNIX systems this is something like <tt>/usr/local/share/texmf-vntex</tt>
+for a system-wide installation or <tt>$HOME/texmf-vntex</tt> if you do not have
+access to this directory.  On Windows <tt>c:\texmf-vntex</tt> is a good place.
+<p>
+Unpack <tt>vntex-3.1.2.zip</tt> or <tt>vntex-nonfree-3.1.2.zip</tt> in this
+directory.
+<p>
+Read <tt>doc/generic/vntex/INSTALL</tt> for further instructions.
+
+See also <a href="http://vntex.sf.net/fonts/samples"><tt>http://vntex.sf.net/fonts/samples</tt></a>.
+
+
+<h2>Files</h2>
+<ul>
+<li><tt>README.html</tt>&nbsp;&nbsp;&nbsp;&nbsp; <i>This file.</i></li>
+<li><tt>vntex-3.1.2.zip</tt>&nbsp;&nbsp;&nbsp;&nbsp; <i>The VnTeX package.</i></li>
+<li><tt>vntex-nonfree-3.1.2.zip</tt>&nbsp;&nbsp;&nbsp;&nbsp; <i>Additional
+  fonts with license restrictions.  These fonts can be freely used and
+  distributed unless money is taken for the distribution.</i></li>
+</ul>
+
+</body>
+</html>
+
+
diff --git a/Master/texmf-dist/doc/generic/vntex/INSTALL b/Master/texmf-dist/doc/generic/vntex/INSTALL
index c586014cf2d..ea6963b9e99 100644
--- a/Master/texmf-dist/doc/generic/vntex/INSTALL
+++ b/Master/texmf-dist/doc/generic/vntex/INSTALL
@@ -1,4 +1,4 @@
-vntex-3.1.5
+vntex-3.1.2
 
 This file is part of VnTeX.  License: LPPL, version 1.3 or newer,
 see: http://www.latex-project.org/lppl.txt 
@@ -13,7 +13,7 @@ Installation
 
 UNIX, Linux, MacOS/X, TeXLive (UNIX or Windows)
 -----------------------------------------------
-To install VnTeX on a web2c system you have to unpack vntex-3.1.5.zip 
+To install VnTeX on a web2c system you have to unpack vntex-3.1.2.zip 
 inside of a texmf tree.  It is recommended to create an own directory tree
 for vntex so that you can remove it easily when you update your TeX system.
 
diff --git a/Master/texmf-dist/doc/generic/vntex/NEWS b/Master/texmf-dist/doc/generic/vntex/NEWS
index eaaa4c934fb..594b5935777 100644
--- a/Master/texmf-dist/doc/generic/vntex/NEWS
+++ b/Master/texmf-dist/doc/generic/vntex/NEWS
@@ -1,4 +1,4 @@
-vntex-3.1.5
+vntex-3.1.2
 
 Copyright 2003-2005 Han The Thanh <hanthethanh@gmx.net>.
 This file is part of vntex.  License: LPPL, version 1.3 or newer,
@@ -87,7 +87,3 @@ Changes from version 3.02 (released 2005/09/25 at vntex.sf.net):
 
   * Add new font Vntopia.
 
-  * Supplier directories for VNR fonts are now 'vntex' instead of 'public'.
-
-  * Add support for Scientific Workplace (swpvntex.sty).
-
diff --git a/Master/texmf-dist/doc/generic/vntex/README b/Master/texmf-dist/doc/generic/vntex/README
index 0a68fbc9003..ca749c2b62c 100644
--- a/Master/texmf-dist/doc/generic/vntex/README
+++ b/Master/texmf-dist/doc/generic/vntex/README
@@ -1,4 +1,4 @@
-vntex-3.1.5
+vntex-3.1.2
 
 Copyright 2005 Reinhard Kotucha <Reinhard.Kotucha@web.de>.
 This file is part of vntex.  License: LPPL, version 1.3 or newer,
diff --git a/Master/texmf-dist/doc/generic/vntex/tests/Makefile b/Master/texmf-dist/doc/generic/vntex/tests/Makefile
index edc01cd7b7e..803e9861b3f 100644
--- a/Master/texmf-dist/doc/generic/vntex/tests/Makefile
+++ b/Master/texmf-dist/doc/generic/vntex/tests/Makefile
@@ -1,4 +1,4 @@
-# vntex-3.1.5
+# vntex-3.1.2
 #
 # Author: Han The Thanh <hanthethanh@gmx.net>.
 # This file is part of vntex.  Public domain.
diff --git a/Master/texmf-dist/doc/generic/vntex/tests/README b/Master/texmf-dist/doc/generic/vntex/tests/README
index 139af05ef71..694c6294975 100644
--- a/Master/texmf-dist/doc/generic/vntex/tests/README
+++ b/Master/texmf-dist/doc/generic/vntex/tests/README
@@ -1,4 +1,4 @@
-vntex-3.1.5
+vntex-3.1.2
 
 Copyright 2003-2005 Han The Thanh <HanTheThanh@gmx.net>
 	  	and Reinhard Kotucha <Reinhard.Kotucha@web.de>.
diff --git a/Master/texmf-dist/doc/generic/vntex/tests/vnsample.cls b/Master/texmf-dist/doc/generic/vntex/tests/vnsample.cls
index 18293e75e8f..6a8af729733 100644
--- a/Master/texmf-dist/doc/generic/vntex/tests/vnsample.cls
+++ b/Master/texmf-dist/doc/generic/vntex/tests/vnsample.cls
@@ -13,12 +13,7 @@
 \LoadClass[a4paper]{article}
 
 \RequirePackage{ifpdf}
-
-\ifpdf\IfFileExists{cmap.sty}{\RequirePackage{cmap}}{
-\ClassWarningNoLine{vnsample}{I can't find the file `cmap.sty'.\MessageBreak
-The search tool in your PDF browser will miss many\MessageBreak
-words containing Vietnamese characters}}\fi
-
+\ifpdf\IfFileExists{cmap.sty}{\RequirePackage{cmap}}{}\fi
 \RequirePackage[viscii]{vietnam}
 \RequirePackage{multicol}
 \RequirePackage{geometry}
diff --git a/Master/texmf-dist/doc/generic/vntex/vntex.txt b/Master/texmf-dist/doc/generic/vntex/vntex.txt
index 0541bcc7a91..fdfbdf966b1 100644
--- a/Master/texmf-dist/doc/generic/vntex/vntex.txt
+++ b/Master/texmf-dist/doc/generic/vntex/vntex.txt
@@ -1,4 +1,4 @@
-vntex-3.1.5
+vntex-3.1.2
 
 This file is part of VnTeX.  License: LPPL, version 1.3 or newer,
 see: http://www.latex-project.org/lppl.txt 
diff --git a/Master/texmf-dist/fonts/type1/vntex/vnr/vnss17.pfb b/Master/texmf-dist/fonts/type1/vntex/vnr/vnss17.pfb
index ae2602ff05c..38fae68223d 100644
--- a/Master/texmf-dist/fonts/type1/vntex/vnr/vnss17.pfb
+++ b/Master/texmf-dist/fonts/type1/vntex/vnr/vnss17.pfb
diff --git a/Master/texmf-dist/fonts/type1/vntex/vnr/vnssi17.pfb b/Master/texmf-dist/fonts/type1/vntex/vnr/vnssi17.pfb
index e11edcf9653..84387b68a53 100644
--- a/Master/texmf-dist/fonts/type1/vntex/vnr/vnssi17.pfb
+++ b/Master/texmf-dist/fonts/type1/vntex/vnr/vnssi17.pfb
diff --git a/Master/texmf-dist/tex/latex/vntex/swpvntex.sty b/Master/texmf-dist/tex/latex/vntex/swpvntex.sty
deleted file mode 100644
index 58aa0e8d024..00000000000
--- a/Master/texmf-dist/tex/latex/vntex/swpvntex.sty
+++ /dev/null
@@ -1,103 +0,0 @@
-% Copyright 2005 Han The Thanh <hanthethanh@gmx.net>.
-% This file is part of vntex.  License: LPPL, version 1.3 or newer,
-% according to http://www.latex-project.org/lppl.txt
-
-% derived from t5enc.dfu to support vntex with SWP
-
-\def\DeclareUnicodeChar#1#2{\expandafter\def\csname u#1\endcsname{#2}}
-\def\U#1{\csname u#1\endcsname}
-
-\DeclareUnicodeChar{1a0}{\OHORN}
-\DeclareUnicodeChar{1a1}{\ohorn}
-\DeclareUnicodeChar{1af}{\UHORN}
-\DeclareUnicodeChar{1b0}{\uhorn}
-\DeclareUnicodeChar{1ea0}{\d A}
-\DeclareUnicodeChar{1ea1}{\d a}
-\DeclareUnicodeChar{1ea2}{\h A}
-\DeclareUnicodeChar{1ea3}{\h a}
-\DeclareUnicodeChar{1ea4}{\@tabacckludge'\ACIRCUMFLEX}
-\DeclareUnicodeChar{1ea5}{\@tabacckludge'\acircumflex}
-\DeclareUnicodeChar{1ea6}{\@tabacckludge`\ACIRCUMFLEX}
-\DeclareUnicodeChar{1ea7}{\@tabacckludge`\acircumflex}
-\DeclareUnicodeChar{1ea8}{\h\ACIRCUMFLEX}
-\DeclareUnicodeChar{1ea9}{\h\acircumflex}
-\DeclareUnicodeChar{1eaa}{\~\ACIRCUMFLEX}
-\DeclareUnicodeChar{1eab}{\~\acircumflex}
-\DeclareUnicodeChar{1eac}{\d\ACIRCUMFLEX}
-\DeclareUnicodeChar{1ead}{\d\acircumflex}
-\DeclareUnicodeChar{1eae}{\@tabacckludge'\ABREVE}
-\DeclareUnicodeChar{1eaf}{\@tabacckludge'\abreve}
-\DeclareUnicodeChar{1eb0}{\@tabacckludge`\ABREVE}
-\DeclareUnicodeChar{1eb1}{\@tabacckludge`\abreve}
-\DeclareUnicodeChar{1eb2}{\h\ABREVE}
-\DeclareUnicodeChar{1eb3}{\h\abreve}
-\DeclareUnicodeChar{1eb4}{\~\ABREVE}
-\DeclareUnicodeChar{1eb5}{\~\abreve}
-\DeclareUnicodeChar{1eb6}{\d\ABREVE}
-\DeclareUnicodeChar{1eb7}{\d\abreve}
-\DeclareUnicodeChar{1eb8}{\d E}
-\DeclareUnicodeChar{1eb9}{\d e}
-\DeclareUnicodeChar{1eba}{\h E}
-\DeclareUnicodeChar{1ebb}{\h e}
-\DeclareUnicodeChar{1ebc}{\~ E}
-\DeclareUnicodeChar{1ebd}{\~ e}
-\DeclareUnicodeChar{1ebe}{\@tabacckludge'\ECIRCUMFLEX}
-\DeclareUnicodeChar{1ebf}{\@tabacckludge'\ecircumflex}
-\DeclareUnicodeChar{1ec0}{\@tabacckludge`\ECIRCUMFLEX}
-\DeclareUnicodeChar{1ec1}{\@tabacckludge`\ecircumflex}
-\DeclareUnicodeChar{1ec2}{\h\ECIRCUMFLEX}
-\DeclareUnicodeChar{1ec3}{\h\ecircumflex}
-\DeclareUnicodeChar{1ec4}{\~\ECIRCUMFLEX}
-\DeclareUnicodeChar{1ec5}{\~\ecircumflex}
-\DeclareUnicodeChar{1ec6}{\d\ECIRCUMFLEX}
-\DeclareUnicodeChar{1ec7}{\d\ecircumflex}
-\DeclareUnicodeChar{1ec8}{\h I}
-\DeclareUnicodeChar{1ec9}{\h i}
-\DeclareUnicodeChar{1eca}{\d I}
-\DeclareUnicodeChar{1ecb}{\d i}
-\DeclareUnicodeChar{1ecc}{\d O}
-\DeclareUnicodeChar{1ecd}{\d o}
-\DeclareUnicodeChar{1ece}{\h O}
-\DeclareUnicodeChar{1ecf}{\h o}
-\DeclareUnicodeChar{1ed0}{\@tabacckludge'\OCIRCUMFLEX}
-\DeclareUnicodeChar{1ed1}{\@tabacckludge'\ocircumflex}
-\DeclareUnicodeChar{1ed2}{\@tabacckludge`\OCIRCUMFLEX}
-\DeclareUnicodeChar{1ed3}{\@tabacckludge`\ocircumflex}
-\DeclareUnicodeChar{1ed4}{\h\OCIRCUMFLEX}
-\DeclareUnicodeChar{1ed5}{\h\ocircumflex}
-\DeclareUnicodeChar{1ed6}{\~\OCIRCUMFLEX}
-\DeclareUnicodeChar{1ed7}{\~\ocircumflex}
-\DeclareUnicodeChar{1ed8}{\d\OCIRCUMFLEX}
-\DeclareUnicodeChar{1ed9}{\d\ocircumflex}
-\DeclareUnicodeChar{1eda}{\@tabacckludge'\OHORN}
-\DeclareUnicodeChar{1edb}{\@tabacckludge'\ohorn}
-\DeclareUnicodeChar{1edc}{\@tabacckludge`\OHORN}
-\DeclareUnicodeChar{1edd}{\@tabacckludge`\ohorn}
-\DeclareUnicodeChar{1ede}{\h\OHORN}
-\DeclareUnicodeChar{1edf}{\h\ohorn}
-\DeclareUnicodeChar{1ee0}{\~\OHORN}
-\DeclareUnicodeChar{1ee1}{\~\ohorn}
-\DeclareUnicodeChar{1ee2}{\d\OHORN}
-\DeclareUnicodeChar{1ee3}{\d\ohorn}
-\DeclareUnicodeChar{1ee4}{\d U}
-\DeclareUnicodeChar{1ee5}{\d u}
-\DeclareUnicodeChar{1ee6}{\h U}
-\DeclareUnicodeChar{1ee7}{\h u}
-\DeclareUnicodeChar{1ee8}{\@tabacckludge'\UHORN}
-\DeclareUnicodeChar{1ee9}{\@tabacckludge'\uhorn}
-\DeclareUnicodeChar{1eea}{\@tabacckludge`\UHORN}
-\DeclareUnicodeChar{1eeb}{\@tabacckludge`\uhorn}
-\DeclareUnicodeChar{1eec}{\h\UHORN}
-\DeclareUnicodeChar{1eed}{\h\uhorn}
-\DeclareUnicodeChar{1eee}{\~\UHORN}
-\DeclareUnicodeChar{1eef}{\~\uhorn}
-\DeclareUnicodeChar{1ef0}{\d\UHORN}
-\DeclareUnicodeChar{1ef1}{\d\uhorn}
-\DeclareUnicodeChar{1ef2}{\@tabacckludge`Y}
-\DeclareUnicodeChar{1ef3}{\@tabacckludge`y}
-\DeclareUnicodeChar{1ef4}{\d Y}
-\DeclareUnicodeChar{1ef5}{\d y}
-\DeclareUnicodeChar{1ef6}{\h Y}
-\DeclareUnicodeChar{1ef7}{\h y}
-\DeclareUnicodeChar{1ef8}{\~Y}
-\DeclareUnicodeChar{1ef9}{\~y}
diff --git a/Master/texmf-dist/vntex.zip b/Master/texmf-dist/vntex.zip
new file mode 100644
index 00000000000..e4de9385b40
--- /dev/null
+++ b/Master/texmf-dist/vntex.zip