summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2009-05-17 23:08:29 +0000
committerKarl Berry <karl@freefriends.org>2009-05-17 23:08:29 +0000
commit2f305f1450f27dd46fc0fd6fb643d4f02698d232 (patch)
treefce88cedc560f92e9737a5e1b940cc2b5f7d20a4 /Master
parentd55fb5f4e69704bf78bff29b085a40e9912a9907 (diff)
vntex 3.1.8+ (13may09)
git-svn-id: svn://tug.org/texlive/trunk@13192 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/generic/vntex/INSTALL7
-rw-r--r--Master/texmf-dist/doc/generic/vntex/NEWS13
-rw-r--r--Master/texmf-dist/doc/generic/vntex/README67
-rw-r--r--Master/texmf-dist/doc/generic/vntex/tests/heros-p42.tex5
-rw-r--r--Master/texmf-dist/doc/generic/vntex/vntex-print.pdfbin0 -> 226340 bytes
-rw-r--r--Master/texmf-dist/doc/generic/vntex/vntex-update-maps2
-rw-r--r--Master/texmf-dist/doc/generic/vntex/vntex.pdfbin0 -> 228839 bytes
-rw-r--r--Master/texmf-dist/doc/generic/vntex/vntex.txt328
-rw-r--r--Master/texmf-dist/fonts/type1/vntex/cmbrightvn/vncmbr10.pfbbin30676 -> 30695 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/vntex/cmbrightvn/vncmbr17.pfbbin30542 -> 30561 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/vntex/cmbrightvn/vncmbr8.pfbbin30833 -> 30852 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/vntex/cmbrightvn/vncmbr9.pfbbin30840 -> 30859 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/vntex/cmbrightvn/vncmbrbx10.pfbbin31752 -> 31771 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/vntex/cmbrightvn/vncmbrsl10.pfbbin31620 -> 31639 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/vntex/cmbrightvn/vncmbrsl17.pfbbin31579 -> 31598 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/vntex/cmbrightvn/vncmbrsl8.pfbbin31872 -> 31891 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/vntex/cmbrightvn/vncmbrsl9.pfbbin31776 -> 31795 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/vntex/cmbrightvn/vncmsltl10.pfbbin41739 -> 41758 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/vntex/cmbrightvn/vncmtl10.pfbbin37911 -> 37930 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/vntex/concretevn/CMConcrete8v.pfbbin36081 -> 36100 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/vntex/concretevn/CMConcreteItalic8v.pfbbin44559 -> 44578 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/vntex/concretevn/CMConcreteSlanted8v.pfbbin36470 -> 36489 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/vntex/concretevn/CMConcreteSmallCaps8v.pfbbin35868 -> 35887 bytes
-rw-r--r--Master/texmf-dist/source/generic/vntex/GPL.txt (renamed from Master/texmf-dist/doc/generic/vntex/GPL.txt)0
-rw-r--r--Master/texmf-dist/source/generic/vntex/LGPL.txt (renamed from Master/texmf-dist/doc/generic/vntex/LGPL.txt)0
-rw-r--r--Master/texmf-dist/source/generic/vntex/LICENSE-utopia.txt (renamed from Master/texmf-dist/doc/generic/vntex/LICENSE-utopia.txt)0
-rw-r--r--Master/texmf-dist/source/generic/vntex/LPPL.txt (renamed from Master/texmf-dist/doc/generic/vntex/LPPL.txt)0
-rw-r--r--Master/texmf-dist/source/generic/vntex/README.vntopia (renamed from Master/texmf-dist/doc/generic/vntex/README.vntopia)0
-rw-r--r--Master/texmf-dist/source/generic/vntex/doc/abbr.tex (renamed from Master/texmf-dist/doc/generic/vntex/source/abbr.tex)0
-rw-r--r--Master/texmf-dist/source/generic/vntex/doc/test-accents.tex (renamed from Master/texmf-dist/doc/generic/vntex/tests/test-accents.tex)1
-rw-r--r--Master/texmf-dist/source/generic/vntex/doc/vn-fonts-print.tex (renamed from Master/texmf-dist/doc/generic/vntex/source/vn-fonts-print.tex)0
-rw-r--r--Master/texmf-dist/source/generic/vntex/doc/vn-fonts.tex (renamed from Master/texmf-dist/doc/generic/vntex/source/vn-fonts.tex)0
-rw-r--r--Master/texmf-dist/source/generic/vntex/doc/vn-min-print.tex (renamed from Master/texmf-dist/doc/generic/vntex/source/vn-min-print.tex)0
-rw-r--r--Master/texmf-dist/source/generic/vntex/doc/vn-min.tex (renamed from Master/texmf-dist/doc/generic/vntex/source/vn-min.tex)0
-rw-r--r--Master/texmf-dist/source/generic/vntex/doc/vntex-man-print.tex (renamed from Master/texmf-dist/doc/generic/vntex/source/vntex-man-print.tex)0
-rw-r--r--Master/texmf-dist/source/generic/vntex/doc/vntex-man.tex (renamed from Master/texmf-dist/doc/generic/vntex/source/vntex-man.tex)0
-rwxr-xr-xMaster/texmf-dist/source/generic/vntex/doc/vntex-print.tex4
-rwxr-xr-xMaster/texmf-dist/source/generic/vntex/doc/vntex.tex853
-rw-r--r--Master/texmf-dist/source/generic/vntex/tests/Makefile (renamed from Master/texmf-dist/doc/generic/vntex/tests/Makefile)13
-rw-r--r--Master/texmf-dist/source/generic/vntex/tests/README (renamed from Master/texmf-dist/doc/generic/vntex/tests/README)2
-rw-r--r--Master/texmf-dist/source/generic/vntex/tests/adventor-sample.tex (renamed from Master/texmf-dist/doc/generic/vntex/tests/adventor-sample.tex)0
-rw-r--r--Master/texmf-dist/source/generic/vntex/tests/adventor-test.tex (renamed from Master/texmf-dist/doc/generic/vntex/tests/adventor-test.tex)0
-rw-r--r--Master/texmf-dist/source/generic/vntex/tests/arevvn-sample.tex (renamed from Master/texmf-dist/doc/generic/vntex/tests/arevvn-sample.tex)0
-rw-r--r--Master/texmf-dist/source/generic/vntex/tests/arevvn-test.tex (renamed from Master/texmf-dist/doc/generic/vntex/tests/arevvn-test.tex)0
-rw-r--r--Master/texmf-dist/source/generic/vntex/tests/bonum-sample.tex (renamed from Master/texmf-dist/doc/generic/vntex/tests/bonum-sample.tex)0
-rw-r--r--Master/texmf-dist/source/generic/vntex/tests/bonum-test.tex (renamed from Master/texmf-dist/doc/generic/vntex/tests/bonum-test.tex)0
-rw-r--r--Master/texmf-dist/source/generic/vntex/tests/chartervn-sample.tex (renamed from Master/texmf-dist/doc/generic/vntex/tests/chartervn-sample.tex)0
-rw-r--r--Master/texmf-dist/source/generic/vntex/tests/chartervn-test.tex (renamed from Master/texmf-dist/doc/generic/vntex/tests/chartervn-test.tex)0
-rw-r--r--Master/texmf-dist/source/generic/vntex/tests/chorus-sample.tex (renamed from Master/texmf-dist/doc/generic/vntex/tests/chorus-sample.tex)0
-rw-r--r--Master/texmf-dist/source/generic/vntex/tests/chorus-test.tex (renamed from Master/texmf-dist/doc/generic/vntex/tests/chorus-test.tex)0
-rw-r--r--Master/texmf-dist/source/generic/vntex/tests/classicovn-sample.tex (renamed from Master/texmf-dist/doc/generic/vntex/tests/classicovn-sample.tex)0
-rw-r--r--Master/texmf-dist/source/generic/vntex/tests/classicovn-test.tex (renamed from Master/texmf-dist/doc/generic/vntex/tests/classicovn-test.tex)0
-rw-r--r--Master/texmf-dist/source/generic/vntex/tests/cmbrightvn-sample.tex (renamed from Master/texmf-dist/doc/generic/vntex/tests/cmbrightvn-sample.tex)0
-rw-r--r--Master/texmf-dist/source/generic/vntex/tests/cmbrightvn-test.tex (renamed from Master/texmf-dist/doc/generic/vntex/tests/cmbrightvn-test.tex)0
-rw-r--r--Master/texmf-dist/source/generic/vntex/tests/comicsansvn-sample.tex (renamed from Master/texmf-dist/doc/generic/vntex/tests/comicsansvn-sample.tex)0
-rw-r--r--Master/texmf-dist/source/generic/vntex/tests/comicsansvn-test.tex (renamed from Master/texmf-dist/doc/generic/vntex/tests/comicsansvn-test.tex)0
-rw-r--r--Master/texmf-dist/source/generic/vntex/tests/concretevn-sample.tex (renamed from Master/texmf-dist/doc/generic/vntex/tests/concretevn-sample.tex)0
-rw-r--r--Master/texmf-dist/source/generic/vntex/tests/concretevn-test.tex (renamed from Master/texmf-dist/doc/generic/vntex/tests/concretevn-test.tex)0
-rw-r--r--Master/texmf-dist/source/generic/vntex/tests/cursor-sample.tex (renamed from Master/texmf-dist/doc/generic/vntex/tests/cursor-sample.tex)0
-rw-r--r--Master/texmf-dist/source/generic/vntex/tests/cursor-test.tex (renamed from Master/texmf-dist/doc/generic/vntex/tests/cursor-test.tex)0
-rw-r--r--Master/texmf-dist/source/generic/vntex/tests/garamondvn-sample.tex (renamed from Master/texmf-dist/doc/generic/vntex/tests/garamondvn-sample.tex)0
-rw-r--r--Master/texmf-dist/source/generic/vntex/tests/garamondvn-test.tex (renamed from Master/texmf-dist/doc/generic/vntex/tests/garamondvn-test.tex)0
-rw-r--r--Master/texmf-dist/source/generic/vntex/tests/grotesqvn-sample.tex (renamed from Master/texmf-dist/doc/generic/vntex/tests/grotesqvn-sample.tex)0
-rw-r--r--Master/texmf-dist/source/generic/vntex/tests/grotesqvn-test.tex (renamed from Master/texmf-dist/doc/generic/vntex/tests/grotesqvn-test.tex)0
-rw-r--r--Master/texmf-dist/source/generic/vntex/tests/heros-sample.tex (renamed from Master/texmf-dist/doc/generic/vntex/tests/heros-sample.tex)0
-rw-r--r--Master/texmf-dist/source/generic/vntex/tests/heros-test.tex (renamed from Master/texmf-dist/doc/generic/vntex/tests/heros-test.tex)0
-rw-r--r--Master/texmf-dist/source/generic/vntex/tests/mscore-sample.tex (renamed from Master/texmf-dist/doc/generic/vntex/tests/mscore-sample.tex)0
-rw-r--r--Master/texmf-dist/source/generic/vntex/tests/mscore-test.tex (renamed from Master/texmf-dist/doc/generic/vntex/tests/mscore-test.tex)0
-rw-r--r--Master/texmf-dist/source/generic/vntex/tests/pagella-sample.tex (renamed from Master/texmf-dist/doc/generic/vntex/tests/pagella-sample.tex)0
-rw-r--r--Master/texmf-dist/source/generic/vntex/tests/pagella-test.tex (renamed from Master/texmf-dist/doc/generic/vntex/tests/pagella-test.tex)0
-rw-r--r--Master/texmf-dist/source/generic/vntex/tests/schola-sample.tex (renamed from Master/texmf-dist/doc/generic/vntex/tests/schola-sample.tex)0
-rw-r--r--Master/texmf-dist/source/generic/vntex/tests/schola-test.tex (renamed from Master/texmf-dist/doc/generic/vntex/tests/schola-test.tex)0
-rw-r--r--Master/texmf-dist/source/generic/vntex/tests/t5antt-sample.tex (renamed from Master/texmf-dist/doc/generic/vntex/tests/t5antt-sample.tex)0
-rw-r--r--Master/texmf-dist/source/generic/vntex/tests/t5antt-test.tex (renamed from Master/texmf-dist/doc/generic/vntex/tests/t5antt-test.tex)0
-rw-r--r--Master/texmf-dist/source/generic/vntex/tests/t5cyklop-sample.tex (renamed from Master/texmf-dist/doc/generic/vntex/tests/t5cyklop-sample.tex)0
-rw-r--r--Master/texmf-dist/source/generic/vntex/tests/t5cyklop-test.tex (renamed from Master/texmf-dist/doc/generic/vntex/tests/t5cyklop-test.tex)0
-rw-r--r--Master/texmf-dist/source/generic/vntex/tests/t5gentium-sample.tex (renamed from Master/texmf-dist/doc/generic/vntex/tests/t5gentium-sample.tex)0
-rw-r--r--Master/texmf-dist/source/generic/vntex/tests/t5gentium-test.tex (renamed from Master/texmf-dist/doc/generic/vntex/tests/t5gentium-test.tex)0
-rw-r--r--Master/texmf-dist/source/generic/vntex/tests/t5iwona-sample.tex (renamed from Master/texmf-dist/doc/generic/vntex/tests/t5iwona-sample.tex)0
-rw-r--r--Master/texmf-dist/source/generic/vntex/tests/t5iwona-test.tex (renamed from Master/texmf-dist/doc/generic/vntex/tests/t5iwona-test.tex)0
-rw-r--r--Master/texmf-dist/source/generic/vntex/tests/t5kurier-sample.tex (renamed from Master/texmf-dist/doc/generic/vntex/tests/t5kurier-sample.tex)0
-rw-r--r--Master/texmf-dist/source/generic/vntex/tests/t5kurier-test.tex (renamed from Master/texmf-dist/doc/generic/vntex/tests/t5kurier-test.tex)0
-rw-r--r--Master/texmf-dist/source/generic/vntex/tests/t5lm-sample.tex (renamed from Master/texmf-dist/doc/generic/vntex/tests/t5lm-sample.tex)0
-rw-r--r--Master/texmf-dist/source/generic/vntex/tests/t5lm-test.tex (renamed from Master/texmf-dist/doc/generic/vntex/tests/t5lm-test.tex)0
-rw-r--r--Master/texmf-dist/source/generic/vntex/tests/termes-sample.tex (renamed from Master/texmf-dist/doc/generic/vntex/tests/termes-sample.tex)0
-rw-r--r--Master/texmf-dist/source/generic/vntex/tests/termes-test.tex (renamed from Master/texmf-dist/doc/generic/vntex/tests/termes-test.tex)0
-rw-r--r--Master/texmf-dist/source/generic/vntex/tests/test-accents.tex (renamed from Master/texmf-dist/doc/generic/vntex/source/test-accents.tex)1
-rw-r--r--Master/texmf-dist/source/generic/vntex/tests/test-babel.tex (renamed from Master/texmf-dist/doc/generic/vntex/tests/test-babel.tex)0
-rw-r--r--Master/texmf-dist/source/generic/vntex/tests/test-captions.tex (renamed from Master/texmf-dist/doc/generic/vntex/tests/test-captions.tex)0
-rw-r--r--Master/texmf-dist/source/generic/vntex/tests/test-plain-tcx.tex (renamed from Master/texmf-dist/doc/generic/vntex/tests/test-plain-tcx.tex)0
-rw-r--r--Master/texmf-dist/source/generic/vntex/tests/test-plain.tex (renamed from Master/texmf-dist/doc/generic/vntex/tests/test-plain.tex)0
-rw-r--r--Master/texmf-dist/source/generic/vntex/tests/test-tcvn.tex (renamed from Master/texmf-dist/doc/generic/vntex/tests/test-tcvn.tex)0
-rw-r--r--Master/texmf-dist/source/generic/vntex/tests/test-utf8.tex (renamed from Master/texmf-dist/doc/generic/vntex/tests/test-utf8.tex)0
-rw-r--r--Master/texmf-dist/source/generic/vntex/tests/test-vietnam-tcx.tex (renamed from Master/texmf-dist/doc/generic/vntex/tests/test-vietnam-tcx.tex)0
-rw-r--r--Master/texmf-dist/source/generic/vntex/tests/test-vietnam.tex (renamed from Master/texmf-dist/doc/generic/vntex/tests/test-vietnam.tex)0
-rw-r--r--Master/texmf-dist/source/generic/vntex/tests/test-viscii.tex (renamed from Master/texmf-dist/doc/generic/vntex/tests/test-viscii.tex)0
-rw-r--r--Master/texmf-dist/source/generic/vntex/tests/txttvn-sample.tex (renamed from Master/texmf-dist/doc/generic/vntex/tests/txttvn-sample.tex)0
-rw-r--r--Master/texmf-dist/source/generic/vntex/tests/txttvn-test.tex (renamed from Master/texmf-dist/doc/generic/vntex/tests/txttvn-test.tex)0
-rw-r--r--Master/texmf-dist/source/generic/vntex/tests/urwvn-sample.tex (renamed from Master/texmf-dist/doc/generic/vntex/tests/urwvn-sample.tex)0
-rw-r--r--Master/texmf-dist/source/generic/vntex/tests/urwvn-test.tex (renamed from Master/texmf-dist/doc/generic/vntex/tests/urwvn-test.tex)0
-rw-r--r--Master/texmf-dist/source/generic/vntex/tests/vnr-sample.tex (renamed from Master/texmf-dist/doc/generic/vntex/tests/vnr-sample.tex)0
-rw-r--r--Master/texmf-dist/source/generic/vntex/tests/vnr-test.tex (renamed from Master/texmf-dist/doc/generic/vntex/tests/vnr-test.tex)0
-rw-r--r--Master/texmf-dist/source/generic/vntex/tests/vnsample.cls (renamed from Master/texmf-dist/doc/generic/vntex/tests/vnsample.cls)0
-rw-r--r--Master/texmf-dist/source/generic/vntex/tests/vntopia-sample.tex (renamed from Master/texmf-dist/doc/generic/vntex/tests/vntopia-sample.tex)0
-rw-r--r--Master/texmf-dist/source/generic/vntex/tests/vntopia-test.tex (renamed from Master/texmf-dist/doc/generic/vntex/tests/vntopia-test.tex)0
-rw-r--r--Master/texmf-dist/source/generic/vntex/vntex.dtx153
-rw-r--r--Master/texmf-dist/source/generic/vntex/vntex.ins10
-rw-r--r--Master/texmf-dist/tex/latex/vntex/t5phv.fd18
-rw-r--r--Master/texmf-dist/tex/latex/vntex/vietnam.sty56
-rw-r--r--Master/texmf-dist/tex/latex/vntex/vntex.sty99
110 files changed, 1182 insertions, 450 deletions
diff --git a/Master/texmf-dist/doc/generic/vntex/INSTALL b/Master/texmf-dist/doc/generic/vntex/INSTALL
index 4386aff35d7..eedb6df7fab 100644
--- a/Master/texmf-dist/doc/generic/vntex/INSTALL
+++ b/Master/texmf-dist/doc/generic/vntex/INSTALL
@@ -1,4 +1,4 @@
-vntex-3.1.7
+vntex-3.1.8
This file is part of VnTeX.
@@ -74,9 +74,6 @@ contains the word "beta" and you really want to install it.
-- Add c:\windows\fonts to TTFPath.
- -- Set font_mem_size to a value of at least 1100000 if you want to
- compile the font samples in texmf-vntex/doc/generic/vntex/tests.
-
TeX Live (UNIX, Linux, MacOS/X, Windows)
----------------------------------------
@@ -105,7 +102,7 @@ UNIX. Please consult the TeX Live manual.
=====================================================================
In order to install VnTeX on a web2c system you have to unpack
-vntex-3.1.7.zip inside of a texmf tree. There are two ways to
+vntex-3.1.8.zip inside of a texmf tree. There are two ways to
install VnTeX:
1. If you want to test beta versions it is recommended that you create
diff --git a/Master/texmf-dist/doc/generic/vntex/NEWS b/Master/texmf-dist/doc/generic/vntex/NEWS
index e2cb6e19e72..ff99d1ac7d8 100644
--- a/Master/texmf-dist/doc/generic/vntex/NEWS
+++ b/Master/texmf-dist/doc/generic/vntex/NEWS
@@ -1,4 +1,4 @@
-vntex-3.1.7
+vntex-3.1.8
Copyright 2003-2005 Han The Thanh <hanthethanh@gmx.net>.
This file is part of vntex. License: LPPL, version 1.3 or newer,
@@ -92,10 +92,19 @@ Changes from version 3.02 (released 2005/09/25 at vntex.sf.net):
* Add support for Scientific Workplace (swpvntex.sty).
Changes from version 3.1.6 (released 2007/05/27 at vntex.sf.net):
-===============================================================
+=================================================================
* The primary site of vntex is now
http://vntex.sourceforge.net or http://vntex.sf.net again.
http://vntex.org doesn't work any more.
* vntex-update-maps: new script.
+Changes from version 3.1.7 (released 2008/05/31 at vntex.sf.net):
+=================================================================
+ * CM Bright/Concrete fonts: bug fixed.
+
+ * Scaling support for Helvetica Vietnamese.
+
+ * All testfiles and doc sources moved to source/generic/vntex.
+
+ * vntex.txt replaced by vntex.pdf.
diff --git a/Master/texmf-dist/doc/generic/vntex/README b/Master/texmf-dist/doc/generic/vntex/README
deleted file mode 100644
index dfb462da3ed..00000000000
--- a/Master/texmf-dist/doc/generic/vntex/README
+++ /dev/null
@@ -1,67 +0,0 @@
-vntex-3.1.7
-
-Copyright 2005 Reinhard Kotucha <Reinhard.Kotucha@web.de>.
-This file is part of vntex. License: LPPL, version 1.3 or newer,
-according to http://www.latex-project.org/lppl.txt
-
-
-Description
-===========
-VnTeX is a package which supports typesetting Vietnamese. It provides
-macro packages for LaTeX and plain TeX as well as fonts.
-
----------------------------------------------------------
-The primary site of VnTeX is
-
- http://vntex.sf.net
----------------------------------------------------------
-
-Author
-======
-The author of VnTeX is Han The Thanh <HanTheThanh@gmx.net>.
-
-
-Contributors
-=============
-LaTeX support (input encoding files, font encoding file, babel support
-and vietnam.sty) is provided by Werner Lemberg.
-
-tex4ht support is provided by Han The Thanh 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
-
- http://ctan.tug.org/tex-archive/macros/plain/plnfss
-
-
-License
-=======
-The URW and Bitstream Type1 fonts are copyrighted under the GNU GPL,
-.map files are public domain, varioref-vi.sty is under LGPL, Vntopia
-is under the Adobe/TUG Utopia license agreement, all other files are
-under LPPL, version 1.3 or newer.
-
-See:
- http://www.gnu.org/licenses/gpl.txt
- http://www.gnu.org/licenses/lgpl.txt
- http://www.latex-project.org/lppl.txt
- http://tug.org/fonts/utopia/LICENSE-utopia.txt
-
-
-Support
-=======
-The current maintainers are:
-
- Han The Thanh <HanTheThanh@gmx.net>
- Werner Lemberg <WL@gnu.org>
- Reinhard Kotucha <Reinhard.Kotucha@web.de>
-
-The Vietnamese fonts for tex4ht are now part of tex4ht and maintained by
-Eitan Gurari <Gurari@cse.ohio-state.edu>.
-
-There is also a mailing list (very low traffic) for questions about
-VnTeX and typesetting Vietnamese. To subscribe to the list, visit
-
- http://lists.sourceforge.net/lists/listinfo/vntex-users
-
diff --git a/Master/texmf-dist/doc/generic/vntex/tests/heros-p42.tex b/Master/texmf-dist/doc/generic/vntex/tests/heros-p42.tex
deleted file mode 100644
index e73bbef2fe8..00000000000
--- a/Master/texmf-dist/doc/generic/vntex/tests/heros-p42.tex
+++ /dev/null
@@ -1,5 +0,0 @@
-\documentclass{article}
-\usepackage{pdfpages}
-\begin{document}
-\includepdf[pages={42}]{heros-sample}
-\end{document}
diff --git a/Master/texmf-dist/doc/generic/vntex/vntex-print.pdf b/Master/texmf-dist/doc/generic/vntex/vntex-print.pdf
new file mode 100644
index 00000000000..fde27124b9a
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/vntex/vntex-print.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/vntex/vntex-update-maps b/Master/texmf-dist/doc/generic/vntex/vntex-update-maps
index 9e7f6f97b74..250d83749ee 100644
--- a/Master/texmf-dist/doc/generic/vntex/vntex-update-maps
+++ b/Master/texmf-dist/doc/generic/vntex/vntex-update-maps
@@ -1,6 +1,6 @@
#!/usr/bin/env perl
#
-# vntex-3.1.7
+# vntex-3.1.8
#
# vntex-update-maps
#
diff --git a/Master/texmf-dist/doc/generic/vntex/vntex.pdf b/Master/texmf-dist/doc/generic/vntex/vntex.pdf
new file mode 100644
index 00000000000..c97bf563760
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/vntex/vntex.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/vntex/vntex.txt b/Master/texmf-dist/doc/generic/vntex/vntex.txt
deleted file mode 100644
index 69510eafdfe..00000000000
--- a/Master/texmf-dist/doc/generic/vntex/vntex.txt
+++ /dev/null
@@ -1,328 +0,0 @@
-vntex-3.1.7
-
-This file is part of VnTeX. License: LPPL, version 1.3 or newer,
-see: http://www.latex-project.org/lppl.txt
-
-Authors: Han The Thanh <HanTheThanh@gmx.net> and
- Reinhard Kotucha <Reinhard.Kotucha@web.de>
-
-The primary site of VnTeX is
-
- http://vntex.sf.net
-
-There is a mailing list (very low traffic) for questions about
-VnTeX and typesetting Vietnamese. To subscribe to the list, visit
-
- http://lists.sourceforge.net/lists/listinfo/vntex-users
-
-
-I. Typesetting Vietnamese
-*************************
-
-Editor
-======
-In order to typeset Vietnamese you need an editor in which you can
-write Vietnamese. This is highly system-dependent. The good news
-is that VnTeX supports most popular encodings used for Vietnamese
-like VISCII, TCVN or UTF8. VNI is however not supported (and will
-not be). In most cases, you can use your favourite editor or TeX shell
-(like WinEDT, Texniccenter, Emacs, VIM, ...) with a Vietnamese font.
-
-
-Typesetting with LaTeX
-======================
-Some examples and hints for a quick start:
-
-
-* The simplest case:
- ________________________________________________________
- \documentclass{report}
- \usepackage[viscii]{vietnam} % use VISCII input encoding
-
- \begin{document}
- <...text in VISCII encoding...>
- \end{document}
- ________________________________________________________
-
- vietnam.sty has the following options:
-
- viscii use VISCII input encoding
- mviscii use MVISCII input encoding
- tcvn use TCVN input encoding
- vps use VPS input encoding
- utf8 use UTF8 input encoding (LaTeX)
- utf8x use UTF8 input encoding (ucs package)
- noinputenc do not load the inputenc package (use of TCX is assumed)
- nocaptions do not define Vietnamese captions
-
-
-* Use babel instead of vietnam package:
- ________________________________________________________
- \documentclass{report}
- \usepackage[utf8]{inputenc} % other encoding as `viscii'
- % or `tcvn' can be used
- % instead of utf8
- \usepackage[vietnam]{babel}
-
- \begin{document}
- <...text in utf8 encoding...>
- \end{document}
- ________________________________________________________
-
-
-* TCX is useful if you want to able to read Vietnamese characters in
- messages about overfull/underfull boxes and the like. VnTeX comes
- with two TCX tables: viscii-t5 and tcvn-t5. This implies that you
- can use TCX only with VISCII or TCVN input encoding. Using TCX
- excludes using inputenc:
-
- ________________________________________________________
- %& -translate-file=viscii-t5
- \documentclass{report}
- \usepackage[noinputenc]{vietnam}
-
- \begin{document}
- <...text in VISCII encoding...>
- \end{document}
- ________________________________________________________
-
- The very first line says that the option `-translate-file=viscii-t5'
- is passed to TeX when compiling the document. It has the same effect
- as you run:
-
- latex -translate-file=viscii-t5 foo.tex
-
- Using TCVN is similar.
-
-
-Typesetting with plain TeX
-==========================
-UTF8 input encoding is not supported by plain TeX. Otherwise it is
-quite similar to LaTeX:
-
-* Use with plainenc and plnfss packages:
- ________________________________________________________
- \input t5code
- \input plnfss
- \input plainenc
-
- \fontencoding{T5}
- \inputencoding{viscii} % or any other encoding except utf8
- \setfontencoding{T5}
- \selectfont
-
- <...text in VISCII encoding...>
- \bye
- ________________________________________________________
-
-
-* Use with TCX:
- ________________________________________________________
- %& -translate-file=viscii-t5
- \input t5code
- \input plnfss
-
- \setfontencoding{T5}
- \selectfont
-
- <...text in VISCII encoding...>
- \bye
- ________________________________________________________
-
-
-Use with texinfo
-================
-TCX is required:
- ________________________________________________________
- %& -translate-file=viscii-t5
- \def\fontprefix{vn}
- \input t5code.tex
- \input texinfo
-
- <...text in VISCII encoding...>
- ________________________________________________________
-
-plainenc and plnfss are not part of the VnTeX distribution any more but
-it is very likely that they are part of the TeX system you are using.
-
-If you have a plnfss which does not support Vietnamese, please install
-
- http://vntex.sf.net/download/vntex-support/plnfss.zip
-
-
-Use with tex4ht
-===============
-In order to create HTML documents from LaTeX sources, run
-
- tex4ht "html,uni-html4,charset=utf8" yourfile.tex
-
-You cannot use TCX with tex4ht.
-
-
-There are some test files for VnTeX in the tests subdirectory.
-Please read the file README in this directory.
-
-
-II. Vietnamese Fonts
-********************
-
-VnTeX provides a lot of Vietnamese fonts. If you do not specify any
-font (as in the examples above) you get Vietnamese Computer Modern.
-This is an extension to Donald Knuth's Computern Modern Fonts designed
-by Han The Thanh.
-
-VnTeX provides Vietnamese characters for some free fonts donated by
-URW and Bitstream as well as the Microsoft core fonts.
-
-To get an overview, look at:
-
- http://vntex.sf.net/fonts/samples
-
-There are many fonts, but most of them do not provide support for
-mathematics. If you have to typeset math formulas, you are restricted
-to Computer Modern, Latin Modern, Times and Palatino.
-
-Latin Modern (Boguslaw Jackowski and Janusz M. Nowacki) is an
-extension to Computer Modern which supports (almost) all latin
-languages. It provides even different accents for Vietnamese
-uppercase and lowercase letters.
-
-
-We describe how to use fonts with LaTeX first. A description of
-plnfss (plain TeX) is given below.
-
-To use Latin Modern instead of VNR, simply
-
- \usepackage{lmodern}
- \usepackage[viscii]{vietnam}
-
-For Antikwa Torunska, do
-
- \usepackage{anttor}
- \usepackage[viscii]{vietnam}
-
-... or use inputenc and babel instead of vietnam.
-
-It is recommended to specify a roman font, a sans serif font and a
-typewriter font separately. You do not have to specify all of them.
-It makes sense, for instance, not to specify a typewriter font -- you
-get Computer Modern Typewriter then, which is by far the best
-typewriter font you can get today.
-
-\renewcommand\sfdefault{uag} VnURWGothicL (AvantGarde)
-\renewcommand\rmdefault{ubk} VnURWBookmanL (Bookman)
-\renewcommand\ttdefault{ucr} VnNimbusMonL (Courier)
-\renewcommand\sfdefault{uhv} VnNimbusSanL (Helvetica)
-\renewcommand\rmdefault{unc} VnCenturySchL (New Century Schoolbok)
-\usepackage{mathpazo} VnURWPalladioL (Palatino)
-\usepackage{mathptm} VnNimbusRomNo9L (Times)
-
-There is also a real small caps font for VnURWPalladioL, made by Ralf Stubner
-and extended by Han The Thanh. There are still some support files missing.
-
-By default, you get the faked small caps but you can use real small caps with
-some restrictions. To make use of it, put the following macro definition
-into the preamble of your document:
-
-\newcommand{\textfplsc}[1]{\bgroup\usefont{T5}{fpl}{m}{sc}#1\egroup}
-
-You can use it like this:
-
- some text \textfplsc{some text in small caps} some text
-
-The macro argument should not contain any numbers because they will appear
-as oldstyle numbers, but you cannot use oldstyle numbers with other font
-shapes in T5 encoding (Vietnamese) yet. This problem will be fixed in a
-future release.
-
-
-If you have to typeset mathematics, there are very few fonts available:
-
- * Computer Modern: do nothing
- * Latin Modern: \usepackage{lmodern}
- * Palatino: \usepackage{mathpazo}
- * Times: \usepackage{mathptm}
-
-The other fonts do not support mathematics.
-
-If you are using Windows, you also can use the fonts provided by
-Microsoft:
-
-\renewcommand\sfdefault{ma1} ArialMT (Arial)
-\renewcommand\ttdefault{mcr} CourierNewPSMT (Courier)
-\renewcommand\rmdefault{lpr} PalatinoLinotype (Palatino)
-\renewcommand\rmdefault{mns} TimesNewRomanPSMT (Times New Roman)
-\renewcommand\sfdefault{jth} Tahoma (Tahoma)
-\renewcommand\sfdefault{jvn} Verdana (Verdana)
-
-None of the Microsoft fonts supports mathematics. Though the quality of
-the fonts is quite high, not much care had been taken in the design of
-Vietnamese accents. See:
-
- http://vntex.sf.net/fontsamples
-
-Unless someone insists that you use these fonts, you can use
-
- * VnNimbusMonL instead of CourierNewPSMT (Courier)
- * VnNimbusSanL instead of ArialMT (Helvetica/Arial)
- * VnNimbusRomNo9L instead of TimesNewRomanPSMT (Times/Times New Roman)
- * VnURWPalladioL instead of PalatinoLinotype (Palatino)
-
-
-If you are using plain TeX, you can use plnfss.tex to select fonts.
-
-Instead of
-
- \renewcommand\rmdefault{...}
- \renewcommand\sfdefault{...}
- \renewcommand\ttdefault{...}
-
-you have to select fonts like this:
-
- \setrmdefault{...}
- \setsfdefault{...}
- \setttdefault{...}
-
-See the plnfss documentation for more details.
-
-
-III. Known Problems
-*******************
-
-* To use amsart.cls (and other AMS LaTeX document classes) with Unicode you
- must add the following lines right before `\begin{document}':
-
- \def\firstofone#1{#1}
- \let\uppercase\firstofone
- \let\MakeUppercase\firstofone
-
- This completely disables LaTeX's uppercasing commands which might cause
- bad secondary effects. Note that this problem is not specific to
- Vietnamese but affects any multibyte encoding.
-
-* In order to use VnTeX with Prosper, you have to install
-
- http://vntex.sf.net/download/vntex-support/prosper-vn.zip
-
-* In order to use VnTeX with Foiltex, you have to install
-
- http://vntex.sf.net/download/vntex-support/foiltex-vn.zip
-
-* If have an old version of LaTeX which does not support utf8, you have to
- use ucs.sty. If ucs.sty is not present on your system you can install
-
- http://vntex.sf.net/download/vntex-support/ucs-vn.zip
-
- We keep this file as long as ucs is unmaintained. If a maintainer is
- found you better download a fresh ucs distribution from the original site.
-
- This is a small subset of the ucs package which supports Vietnamese only.
- You can invoke it with \usepackage[utf8x]{inputenc}.
-
- Instead of installing ucs we recommend to update LaTeX. The latest version
- can be downloaded from
-
- ftp://dante.ctan.org/tex-archive/macros/latex/base.zip (Germany)
- ftp://cam.ctan.org/tex-archive/macros/latex/base.zip (United Kingdom)
- ftp://tug.ctan.org/tex-archive/macros/latex/base.zip (USA)
-
diff --git a/Master/texmf-dist/fonts/type1/vntex/cmbrightvn/vncmbr10.pfb b/Master/texmf-dist/fonts/type1/vntex/cmbrightvn/vncmbr10.pfb
index b62833414d3..ce8ec623b54 100644
--- a/Master/texmf-dist/fonts/type1/vntex/cmbrightvn/vncmbr10.pfb
+++ b/Master/texmf-dist/fonts/type1/vntex/cmbrightvn/vncmbr10.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/vntex/cmbrightvn/vncmbr17.pfb b/Master/texmf-dist/fonts/type1/vntex/cmbrightvn/vncmbr17.pfb
index f351c0e5c6c..9314dc36c21 100644
--- a/Master/texmf-dist/fonts/type1/vntex/cmbrightvn/vncmbr17.pfb
+++ b/Master/texmf-dist/fonts/type1/vntex/cmbrightvn/vncmbr17.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/vntex/cmbrightvn/vncmbr8.pfb b/Master/texmf-dist/fonts/type1/vntex/cmbrightvn/vncmbr8.pfb
index 76557902419..dcbe90dc139 100644
--- a/Master/texmf-dist/fonts/type1/vntex/cmbrightvn/vncmbr8.pfb
+++ b/Master/texmf-dist/fonts/type1/vntex/cmbrightvn/vncmbr8.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/vntex/cmbrightvn/vncmbr9.pfb b/Master/texmf-dist/fonts/type1/vntex/cmbrightvn/vncmbr9.pfb
index 77770c6b840..48ded5b0590 100644
--- a/Master/texmf-dist/fonts/type1/vntex/cmbrightvn/vncmbr9.pfb
+++ b/Master/texmf-dist/fonts/type1/vntex/cmbrightvn/vncmbr9.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/vntex/cmbrightvn/vncmbrbx10.pfb b/Master/texmf-dist/fonts/type1/vntex/cmbrightvn/vncmbrbx10.pfb
index fa174a02e57..3e571e8b9ad 100644
--- a/Master/texmf-dist/fonts/type1/vntex/cmbrightvn/vncmbrbx10.pfb
+++ b/Master/texmf-dist/fonts/type1/vntex/cmbrightvn/vncmbrbx10.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/vntex/cmbrightvn/vncmbrsl10.pfb b/Master/texmf-dist/fonts/type1/vntex/cmbrightvn/vncmbrsl10.pfb
index 8759c576813..2b3b9df54fd 100644
--- a/Master/texmf-dist/fonts/type1/vntex/cmbrightvn/vncmbrsl10.pfb
+++ b/Master/texmf-dist/fonts/type1/vntex/cmbrightvn/vncmbrsl10.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/vntex/cmbrightvn/vncmbrsl17.pfb b/Master/texmf-dist/fonts/type1/vntex/cmbrightvn/vncmbrsl17.pfb
index 49a30e8885f..329ad6174bf 100644
--- a/Master/texmf-dist/fonts/type1/vntex/cmbrightvn/vncmbrsl17.pfb
+++ b/Master/texmf-dist/fonts/type1/vntex/cmbrightvn/vncmbrsl17.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/vntex/cmbrightvn/vncmbrsl8.pfb b/Master/texmf-dist/fonts/type1/vntex/cmbrightvn/vncmbrsl8.pfb
index cdf684caaa1..2b3c4cc1e67 100644
--- a/Master/texmf-dist/fonts/type1/vntex/cmbrightvn/vncmbrsl8.pfb
+++ b/Master/texmf-dist/fonts/type1/vntex/cmbrightvn/vncmbrsl8.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/vntex/cmbrightvn/vncmbrsl9.pfb b/Master/texmf-dist/fonts/type1/vntex/cmbrightvn/vncmbrsl9.pfb
index 018efb592ca..dc4e3240b53 100644
--- a/Master/texmf-dist/fonts/type1/vntex/cmbrightvn/vncmbrsl9.pfb
+++ b/Master/texmf-dist/fonts/type1/vntex/cmbrightvn/vncmbrsl9.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/vntex/cmbrightvn/vncmsltl10.pfb b/Master/texmf-dist/fonts/type1/vntex/cmbrightvn/vncmsltl10.pfb
index 4381ce02f40..1cb005191ee 100644
--- a/Master/texmf-dist/fonts/type1/vntex/cmbrightvn/vncmsltl10.pfb
+++ b/Master/texmf-dist/fonts/type1/vntex/cmbrightvn/vncmsltl10.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/vntex/cmbrightvn/vncmtl10.pfb b/Master/texmf-dist/fonts/type1/vntex/cmbrightvn/vncmtl10.pfb
index 87019cd4796..ff5d0c1745d 100644
--- a/Master/texmf-dist/fonts/type1/vntex/cmbrightvn/vncmtl10.pfb
+++ b/Master/texmf-dist/fonts/type1/vntex/cmbrightvn/vncmtl10.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/vntex/concretevn/CMConcrete8v.pfb b/Master/texmf-dist/fonts/type1/vntex/concretevn/CMConcrete8v.pfb
index 48c5df71ea1..e59261b81b1 100644
--- a/Master/texmf-dist/fonts/type1/vntex/concretevn/CMConcrete8v.pfb
+++ b/Master/texmf-dist/fonts/type1/vntex/concretevn/CMConcrete8v.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/vntex/concretevn/CMConcreteItalic8v.pfb b/Master/texmf-dist/fonts/type1/vntex/concretevn/CMConcreteItalic8v.pfb
index 462f109d001..edf19b20aaa 100644
--- a/Master/texmf-dist/fonts/type1/vntex/concretevn/CMConcreteItalic8v.pfb
+++ b/Master/texmf-dist/fonts/type1/vntex/concretevn/CMConcreteItalic8v.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/vntex/concretevn/CMConcreteSlanted8v.pfb b/Master/texmf-dist/fonts/type1/vntex/concretevn/CMConcreteSlanted8v.pfb
index 54851210844..e677dda4eec 100644
--- a/Master/texmf-dist/fonts/type1/vntex/concretevn/CMConcreteSlanted8v.pfb
+++ b/Master/texmf-dist/fonts/type1/vntex/concretevn/CMConcreteSlanted8v.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/vntex/concretevn/CMConcreteSmallCaps8v.pfb b/Master/texmf-dist/fonts/type1/vntex/concretevn/CMConcreteSmallCaps8v.pfb
index 58fff314555..8388ec9d6b8 100644
--- a/Master/texmf-dist/fonts/type1/vntex/concretevn/CMConcreteSmallCaps8v.pfb
+++ b/Master/texmf-dist/fonts/type1/vntex/concretevn/CMConcreteSmallCaps8v.pfb
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/vntex/GPL.txt b/Master/texmf-dist/source/generic/vntex/GPL.txt
index 5b6e7c66c27..5b6e7c66c27 100644
--- a/Master/texmf-dist/doc/generic/vntex/GPL.txt
+++ b/Master/texmf-dist/source/generic/vntex/GPL.txt
diff --git a/Master/texmf-dist/doc/generic/vntex/LGPL.txt b/Master/texmf-dist/source/generic/vntex/LGPL.txt
index 5ab7695ab8c..5ab7695ab8c 100644
--- a/Master/texmf-dist/doc/generic/vntex/LGPL.txt
+++ b/Master/texmf-dist/source/generic/vntex/LGPL.txt
diff --git a/Master/texmf-dist/doc/generic/vntex/LICENSE-utopia.txt b/Master/texmf-dist/source/generic/vntex/LICENSE-utopia.txt
index 9755d3cec66..9755d3cec66 100644
--- a/Master/texmf-dist/doc/generic/vntex/LICENSE-utopia.txt
+++ b/Master/texmf-dist/source/generic/vntex/LICENSE-utopia.txt
diff --git a/Master/texmf-dist/doc/generic/vntex/LPPL.txt b/Master/texmf-dist/source/generic/vntex/LPPL.txt
index bfe13a27b8b..bfe13a27b8b 100644
--- a/Master/texmf-dist/doc/generic/vntex/LPPL.txt
+++ b/Master/texmf-dist/source/generic/vntex/LPPL.txt
diff --git a/Master/texmf-dist/doc/generic/vntex/README.vntopia b/Master/texmf-dist/source/generic/vntex/README.vntopia
index 656ef9d9ce7..656ef9d9ce7 100644
--- a/Master/texmf-dist/doc/generic/vntex/README.vntopia
+++ b/Master/texmf-dist/source/generic/vntex/README.vntopia
diff --git a/Master/texmf-dist/doc/generic/vntex/source/abbr.tex b/Master/texmf-dist/source/generic/vntex/doc/abbr.tex
index 84617cf0935..84617cf0935 100644
--- a/Master/texmf-dist/doc/generic/vntex/source/abbr.tex
+++ b/Master/texmf-dist/source/generic/vntex/doc/abbr.tex
diff --git a/Master/texmf-dist/doc/generic/vntex/tests/test-accents.tex b/Master/texmf-dist/source/generic/vntex/doc/test-accents.tex
index c0c9a43aeb1..3c9b8824d3c 100644
--- a/Master/texmf-dist/doc/generic/vntex/tests/test-accents.tex
+++ b/Master/texmf-dist/source/generic/vntex/doc/test-accents.tex
@@ -20,6 +20,7 @@
\X{\Uhorn} \verb|\Uhorn| \\
\X{\abreve} \verb|\abreve| \\
\X{\acircumflex} \verb|\acircumflex| \\
+\X{\DJ} \verb|\DJ| \\
\X{\dj} \verb|\dj| \\
\X{\ecircumflex} \verb|\ecircumflex| \\
\X{\i} \verb|\i| \\
diff --git a/Master/texmf-dist/doc/generic/vntex/source/vn-fonts-print.tex b/Master/texmf-dist/source/generic/vntex/doc/vn-fonts-print.tex
index 15f07c9cc3c..15f07c9cc3c 100644
--- a/Master/texmf-dist/doc/generic/vntex/source/vn-fonts-print.tex
+++ b/Master/texmf-dist/source/generic/vntex/doc/vn-fonts-print.tex
diff --git a/Master/texmf-dist/doc/generic/vntex/source/vn-fonts.tex b/Master/texmf-dist/source/generic/vntex/doc/vn-fonts.tex
index ad6bdbb8b20..ad6bdbb8b20 100644
--- a/Master/texmf-dist/doc/generic/vntex/source/vn-fonts.tex
+++ b/Master/texmf-dist/source/generic/vntex/doc/vn-fonts.tex
diff --git a/Master/texmf-dist/doc/generic/vntex/source/vn-min-print.tex b/Master/texmf-dist/source/generic/vntex/doc/vn-min-print.tex
index f610e7d9875..f610e7d9875 100644
--- a/Master/texmf-dist/doc/generic/vntex/source/vn-min-print.tex
+++ b/Master/texmf-dist/source/generic/vntex/doc/vn-min-print.tex
diff --git a/Master/texmf-dist/doc/generic/vntex/source/vn-min.tex b/Master/texmf-dist/source/generic/vntex/doc/vn-min.tex
index 459a98e18b3..459a98e18b3 100644
--- a/Master/texmf-dist/doc/generic/vntex/source/vn-min.tex
+++ b/Master/texmf-dist/source/generic/vntex/doc/vn-min.tex
diff --git a/Master/texmf-dist/doc/generic/vntex/source/vntex-man-print.tex b/Master/texmf-dist/source/generic/vntex/doc/vntex-man-print.tex
index 5c1c3a15287..5c1c3a15287 100644
--- a/Master/texmf-dist/doc/generic/vntex/source/vntex-man-print.tex
+++ b/Master/texmf-dist/source/generic/vntex/doc/vntex-man-print.tex
diff --git a/Master/texmf-dist/doc/generic/vntex/source/vntex-man.tex b/Master/texmf-dist/source/generic/vntex/doc/vntex-man.tex
index 63b57ecfdcc..63b57ecfdcc 100644
--- a/Master/texmf-dist/doc/generic/vntex/source/vntex-man.tex
+++ b/Master/texmf-dist/source/generic/vntex/doc/vntex-man.tex
diff --git a/Master/texmf-dist/source/generic/vntex/doc/vntex-print.tex b/Master/texmf-dist/source/generic/vntex/doc/vntex-print.tex
new file mode 100755
index 00000000000..3d06beb6864
--- /dev/null
+++ b/Master/texmf-dist/source/generic/vntex/doc/vntex-print.tex
@@ -0,0 +1,4 @@
+\RequirePackage[monochrome,dvipsnames]{color}
+\def\printversion{}
+\input{vntex.tex}
+
diff --git a/Master/texmf-dist/source/generic/vntex/doc/vntex.tex b/Master/texmf-dist/source/generic/vntex/doc/vntex.tex
new file mode 100755
index 00000000000..5d3bd1e68ba
--- /dev/null
+++ b/Master/texmf-dist/source/generic/vntex/doc/vntex.tex
@@ -0,0 +1,853 @@
+% vntex-@VERSION@
+%
+% Copyright 2003-2005 Han The Thanh <HanTheThanh@gmail.com>.
+%
+% Authors: Han The Thanh <HanTheThanh@gmx.net> and
+% Reinhard Kotucha <Reinhard.Kotucha@web.de>
+%
+% This file is part of vntex.
+%
+% This work may be distributed and/or modified under the conditions
+% of the LaTeX Project Public License, either version 1.3 of this
+% license or (at your option) any later version.
+%
+% The latest version of this license is
+%
+% http://www.latex-project.org/lppl.txt
+%
+% The current maintainers are Werner Lemberg, Han The Thanh, and
+% Reinhard Kotucha.
+
+\documentclass[a4paper,11pt]{article}
+% \InputIfFileExists{vntexdoc-conf.tex}{}{}
+% \makeatletter
+% \@ifundefined{vntexdoc-amsldoc-vi}
+% {\message{***undef***}}
+% {\message{***def***}}
+% \stop
+
+\usepackage{amsmath,amsfonts,amssymb}
+\usepackage[utf8]{inputenc}
+\usepackage[T1,T2A,T5]{fontenc}
+\usepackage[russian,vietnam]{babel}
+\usepackage{charter}
+%\usepackage{tgpagella}
+%\usepackage{mathpazo}\def\textsc#1{\bgroup\usefont{T5}{fpl}{m}{sc}#1\egroup}
+\usepackage{textcomp}
+\usepackage[scaled=.9]{helvet}
+\usepackage{parskip}
+\usepackage{upquote}
+\usepackage{microtype}
+\usepackage{url}
+\usepackage{fancyvrb}\DefineShortVerb{\|}
+%\usepackage{showframe}
+%\usepackage{mparhack}
+
+\RequirePackage[dvipsnames]{color}
+
+\newif\ifprint
+\ifdefined\printversion
+ \printtrue
+\else
+ \printfalse
+\fi
+
+\def\arraystretch{1.25}
+
+\raggedbottom
+
+\def\vi#1{\foreignlanguage{vietnam}{#1}}
+
+\makeatletter
+\let\ifundefined\@ifundefined
+
+\renewcommand\@seccntformat[1]{\llap{\@nameuse{the#1}\hspace{1em}}}
+
+\renewcommand\section{\@startsection {section}{1}{\z@}%
+ {-3.5ex \@plus -1ex \@minus -.2ex}%
+ {0.3ex \@plus.2ex}%
+ {\normalfont\Large\bfseries
+ \rightskip\z@ plus3em
+ \spaceskip.3333em
+ \xspaceskip.5em\color[named]{BrickRed}}}
+
+\renewcommand\subsection{\@startsection{subsection}{2}{\z@}%
+ {.25ex\@plus -1ex \@minus -.2ex}%
+ {0.2ex \@plus .2ex}%
+ {\normalfont\large\bfseries
+ \rightskip\z@ plus3em
+ \spaceskip.3333em
+ \xspaceskip.5em\color[named]{BrickRed}}}
+
+\renewcommand\subsubsection{\@startsection{subsubsection}{3}{\z@}%
+ {1.25ex\@plus -1ex \@minus -.2ex}%
+ {0.1ex}%
+ {\normalfont\normalsize\bfseries
+ \rightskip\z@ plus2em
+ \spaceskip.3333em
+ \xspaceskip.5em
+ \color[named]{BrickRed}}}
+
+\renewcommand\paragraph{\@startsection{paragraph}{4}{\z@}%
+ {\parskip}%
+ {-1em}%
+ {\normalfont\normalsize\bfseries\color[named]{BrickRed}}}
+\renewcommand\subparagraph{\@startsection{subparagraph}{5}{\parindent}%
+ {\parskip}%
+ {-1em}%
+ {\normalfont\normalsize\bfseries\color[named]{BrickRed}}}
+\makeatother
+
+
+
+%%% Colors
+
+\definecolor{labelitemicolor}{rgb}{0,.5,0}
+\definecolor{labelitemiicolor}{rgb}{.75,0,0}
+\definecolor{labelitemiiicolor}{rgb}{0,0,.6}
+
+\def\labelitemi{\color{labelitemicolor}{$\blacktriangleright$}}
+\def\labelitemii{\color{labelitemiicolor}{{\large$\bullet$}}}
+\def\labelitemiii{\color{labelitemiiicolor}
+ {{\raisebox{.3ex}{\mbox{\scriptsize$\blacksquare$}}}}}
+
+\def\bibcolor#1{{\color[named]{MidnightBlue}#1}}
+%\def\bibcolor#1{{\color[cmyk]{.8,.8,0,.4}#1}}
+
+\def\headcolor#1{{\color[named]{BrickRed}#1}}
+
+\def\hrefcolor#1{{\color[named]{Fuchsia}#1}}
+%\def\hrefcolor#1{{\color[cmyk]{.3,1,0,.6}#1}}
+\def\xbibcolor#1{{\color[named]{Fuchsia}#1}}
+%\def\xbibcolor#1{{\color[cmyk]{.3,1,0,.6}#1}}
+
+%\def\codecolor{\color[named]{OliveGreen}}
+\def\codecolor{\color[cmyk]{.65,0,.65,.7}}
+
+\def\marginnote#1{\marginpar{\headcolor{\textit{#1}}}}
+\def\marginnote#1{\vadjust{\llap{\smash{\headcolor{\textit{#1~~}}}}}}
+\def\marginnote#1{\leavevmode\llap{\headcolor{\textit{\smash{\parbox[t]{2.5cm}{\raggedleft #1}~~}}}}}
+
+\def\mailto#1{$\langle$\href{mailto:#1}{\texttt{\hrefcolor{#1}}}$\rangle$}
+
+\def\pkg#1{{\sffamily#1}}
+
+\def\URL#1{{\fontfamily{cmvtt}\selectfont{\xbibcolor{http://#1}}}}
+
+\def\indenturl{\leavevmode\texttt{\phantom{xx}}}
+\def\http#1{\ifvmode\leavevmode\texttt{\phantom{xx}}\fi\href{http://#1}{\URL{#1}}}
+\def\ftp#1{\ifvmode\leavevmode\texttt{\phantom{xx}}\fi\href{ftp://#1}{\URL{#1}}}
+
+%%% Internal/External Documentation
+
+\def\texmfdocvi{../../../../texmf-doc/doc/vietnamese}
+\def\CTANbase{ctan.org/tex-archive/info}
+
+\def\bibfile#1#2#3{\textit{#1, }\href{file:#2}{\bibcolor{#3}}}
+\def\bibfileprint#1{\ifx\printversion\undefined\hspace{\fill}\href{file:#1}{[\bibcolor{print~version}]}\fi}
+
+\def\xbibfile#1#2#3{\textit{#1, }\href{http://#2}{\xbibcolor{#3}}}
+\def\xbibfilenoauthor#1#2{\href{http://#1}{\xbibcolor{#2}}}
+
+\def\extbibfile#1#2#3{\textit{#1}, #2,\\\href{http://#3}{\fontfamily{cmvtt}\selectfont{\xbibcolor{http://#3}}}}
+
+\def\xbibfileprint#1{\hspace{\fill}\ifx\printversion\undefined\href{http://#1}{[\bibcolor{print~version}]}\fi}
+
+%%%\reversemarginpar
+
+\makeatletter
+\let\docpath\@namedef
+%\InputIfFileExists{vntexdoc-conf.tex}{}{}
+
+\makeatletter
+\let\docpath\@nameuse
+\makeatother
+
+%%% Verbatim
+
+\newenvironment{code}{\codecolor}{}
+\newenvironment{verbcode}{\codecolor\begin{verbatim}}{\end{verbatim}}
+\def\code{\ifvmode~~~\fi\codecolor} %%% \setbox0 \wd0
+
+\CustomVerbatimEnvironment{Code}{Verbatim}
+ {commandchars=\|\(\),formatcom=\codecolor}
+\def\texcomment#1{\textrm{\textcolor{black}{#1}}}
+\def\sometext#1{\textcolor{black}{\textrm
+ {$\langle$\ldots\textit{#1}\ldots$\rangle$}}}
+
+\AtBeginDocument{\def\abstractname{\headcolor{\textbf{\normalsize
+ Abstract}}}}
+
+\advance\oddsidemargin by -.5cm
+%\advance\marginparwidth 1cm
+\evensidemargin=\oddsidemargin
+\advance\textwidth by 2cm
+\advance\topmargin by -2cm
+\advance\textheight by 4cm
+\advance\textheight by 2pt
+
+\usepackage[colorlinks, urlcolor=black, filecolor=black]{hyperref}
+\hypersetup{pdfnewwindow=true}
+\begin{document}
+%\vrule
+%\vspace*{0cm}
+\leavevmode{\centering\Huge\textbf{\headcolor{Vn\TeX\ --- Typesetting
+ Vietnamese}}\par}
+\vspace{3mm}
+{\centering\Large Hàn Thế Thành~~~~Reinhard Kotucha\par}
+\vspace{1cm}
+
+\begin{abstract}
+\parskip=1ex \parindent=0pt \noindent
+Vn\TeX\ is an extension to Donald Knuth's \TeX\ typesetting system which
+provides support for typesetting Vietnamese.
+
+The primary site of Vn\TeX\ is {\normalsize\http{vntex.sf.net}}.
+\end{abstract}
+
+\section{Where to get Help}
+The current maintainers of Vn\TeX\ are:
+\begin{itemize}
+\item Hàn Thế Thành \mailto{HanTheThanh@gmail.com}
+\item Reinhard Kotucha \mailto{Reinhard.Kotucha@web.de}
+\item Werner Lemberg \mailto{WL@gnu.org}
+\end{itemize}
+
+There is a mailing list (very low traffic) for questions about
+Vn\TeX\ and typesetting Vietnamese. To subscribe to the list, visit
+
+\http{lists.sourceforge.net/lists/listinfo/vntex-users}
+
+\section{Related Documents}
+The following files are part of the Vn\TeX\
+distribution\ifx\printversion\undefined\footnote{The print versions
+ should be used with monochrome printers. A print version of this
+ file is \href{vntex-print.pdf}{\bibcolor{here}}.}\fi
+\begin{itemize}
+%\href{}{\bibcolor{here}}}
+%%%%\item \href{file:vntex-man.pdf}{VnTeX Manual}
+\item \bibfile{Hàn Thế Thành}{vntex-man.pdf}{Hỗ trợ tiếng Việt cho \TeX}
+ \ifx\printversion\undefined\bibfileprint{vntex-man-print.pdf}\fi
+\item \bibfile{Hàn Thế Thành} {vn-min.pdf}{Minimal steps to typeset
+ Vietnamese} \bibfileprint{vn-min-print.pdf}
+\item \bibfile{Hàn Thế Thành và Thái Phú Khánh Hòa} {vn-fonts.pdf}
+ {Dùng font với Vn\TeX} \bibfileprint{vn-fonts-print.pdf}
+\end{itemize}
+The following files are not part of Vn\TeX\ but might be part of the
+\TeX\ distribution you are using.
+% \begin{itemize}
+% \item \ifundefined{vntexdoc-amsldoc-vi}
+% {\xbibfile{The American Mathematical Society}{\CTANbase/amslatex/vietnamese/amsldoc-vi.pdf}
+% {Hướng dẫn sử dụng gói \pkg{amsmath}}.}
+% {\bibfile{The American Mathematical Society}{\docpath{vntexdoc-amsldoc-vi}}{Hướng dẫn sử dụng gói
+% \pkg{amsmath}}}
+% Translated by Huỳnh Kỳ Anh.
+% \ifundefined{vntexdoc-amsldoc-vi}
+% {\xbibfileprint{\CTANbase/amslatex/vietnamese/amsldoc-print-vi.pdf}}
+% {\bibfileprint{\docpath{vntexdoc-amsldoc-print-vi}}}
+% \item \ifundefined{vntexdoc-lshort-vi}
+% {\xbibfile{H.~Partl, E.~Schlegl, I.~Hyna, T.~Oetiker}
+% {\CTANbase/lshort/vietnamese/lshort-vi.pdf}{Một tài liệu ngắn gọn
+% giới thiệu về \LaTeXe}.}
+% {\bibfile{H.~Partl, E.~Schlegl, I.~Hyna, T.~Oetiker}
+% {\docpath{vnzexdoc-lshort-vi}} {Một tài liệu ngắn gọn
+% giới thiệu về \LaTeXe}.}
+% Translated by Nguyễn Tân Khoa.
+
+% \item \bibfile{Wolfgang May, Andreas
+% Schlechte}{\texmfdocvi/ntheorem-vn/ntheorem-doc-vn.pdf} {Mở rộng
+% môi trường định lý}. Translated by Huỳnh Kỳ Anh.
+%\end{itemize}
+
+\begin{itemize}
+\item \textit{The American Mathematical Society}, Hướng dẫn sử dụng gói
+ \pkg{amsmath},\\
+ \URL{\CTANbase/amslatex/vietnamese/amsldoc-vi.pdf}\\
+ \URL{\CTANbase/amslatex/vietnamese/amsldoc-print-vi.pdf}
+
+\item \textit{H.~Partl, E.~Schlegl, I.~Hyna, T.~Oetiker}, Một tài
+ liệu ngắn gọn giới thiệu về \LaTeXe, Translated by Nguyễn Tân Khoa.\\
+ \URL{\CTANbase/lshort/vietnamese/lshort-vi.pdf}
+
+\item \textit{Wolfgang May, Andreas Schlechte}, Mở rộng
+ môi trường định lý. Translated by Huỳnh Kỳ Anh.\\
+ \URL{\CTANbase/translations/vn/ntheorem-doc-vn.pdf}
+\end{itemize}
+
+
+\section{Typesetting Vietnamese}
+
+In order to typeset Vietnamese, you need a text editor which supports
+Vietnamese. In particular, it should support an \emph{input encoding}
+an an \emph{input method} suitable for Vietnamese.
+
+If you are not familiar with encodings, here is a brief explanation:
+Each key on your keyboard is assigned to a letter. Computers don't
+understand letters, they only understand numbers. The table which
+assigns letters to numbers is called \emph{input encoding}.
+
+\marginnote{input encoding}A popular input encoding system used in
+Vietnam is VISCII. The problem is that only 256 characters can be
+used at the same time. It's sufficient for typesetting Vietnamese,
+however, it's not well suited for multilingual texts. A better
+approach had been provided by the Unicode Consortium: UTF-8. This is
+a very efficient encoding system which supports all writing systems of
+the world. You can have Vietnamese, Arabic, Korean, Ethiopian,
+Hindi,\ldots characters in one and the same file. UTF-8 is the
+encoding system of the future and it becomes even more popular in
+Vietnam.
+
+Vn\TeX\ supports many input encodings such as VISCII, TCVN, or UTF-8, but
+there is no support for VNI (nor will there ever be).
+
+You can use the input encoding of your choice, but you have tell \TeX\
+which one you are using. How to do this is decribed below.
+
+\marginnote{font encoding}There is a similar issue with fonts. A font
+is a collection of \emph{glyphs}. A glyph is the graphical
+representation of a character. Graphical representations of the
+character \texttt{a} might be `a', `\textit{a}', or `\textbf{a}', for
+example. Fonts never contain characters; they contain only glyphs,
+sometimes more than a single glyph for a given character. A font
+usually contains more than 256 glyphs, but \TeX\ can only access 256
+characters at the same time. The table which maps characters to glyphs
+is called a \emph{font encoding}.
+
+However, if you are using \LaTeX, a name is assigned to each character
+read from the keyboard. This way it can deal with an arbitrary number
+of characters internally. You can specify more than one font encoding
+and \LaTeX\ switches between them automatically. In most cases it's
+sufficient to know that font encoding |T1| supports Western European
+languages and |T5| supports Vientamese.
+
+\marginnote{input method}But how to enter all the characters if you
+have only an American keyboard? You have to select an \emph{input
+ method}. An input method allows you to access characters which are
+not supported by your keyboard. If you select VIQR as an input
+method, you can write ``\verb/Ha` No^.i/'' on your keyboard but you
+see ``\texttt{H\`a N\d\ocircumflex i}'' on screen and you get ``H\`a
+N\d\ocircumflex i'' in your typeset document.
+
+However, input methods are quite system dependent. If your operating
+system doesn't support anything appropriate, check
+whether your editor or \TeX\ shell supports them.
+
+\marginnote{editors}It's not easy to propose a particular editor. If
+you are using a reasonably powerful editor for writing your own
+programs, then use it for \TeX\ too.
+
+Editors which are supposed to work on all operating systems are
+\xbibfilenoauthor{www.vim.org}{\pkg{vim}},
+\xbibfilenoauthor{gnu.org/software/emacs}{\pkg{Emacs}},
+\xbibfilenoauthor{www.xm1math.net/texmaker}{\pkg{\TeX{}Maker}}, and
+\xbibfilenoauthor{tug.org/texworks}{\pkg{\TeX{}works}}.
+On Windows there are some alternatives, like
+\xbibfilenoauthor{projectory.de/texshell}{\pkg{\TeX{}shell}},
+\xbibfilenoauthor{www.winedt.com}{\pkg{WinEDT}}, and
+\xbibfilenoauthor{www.texniccenter.org}{\pkg{\TeX{}nicCenter}}.
+
+If you are on Mac\,OS\,X,
+\xbibfilenoauthor{www.uoregon.edu/~koch/texshop}{\pkg{\TeX{}shop}} is
+a good choice. \pkg{\TeX{}shop} is aimed at beginners but it is
+extremely powerful though. It provides a very fast PDF viewer and if
+you click on a particular word in the PDF file, the cursor moves to
+this word in the text editor, and vice
+versa. \xbibfilenoauthor{tug.org/texworks}{\pkg{\TeX{}works}} is
+something very similar. But it is supposed to work on all operating
+systems and will probably be the default editor in \TeX~Live and
+Mik\TeX.
+
+
+There are some different flavours of
+\TeX, such as Plain \TeX, \LaTeX, and Context. \LaTeX\ is the most
+popular one and there are many books available about it.
+
+\subsection{Typesetting with \LaTeX}
+
+The idea of \LaTeX\ is to treat content and layout separately. If you
+never used \LaTeX\ before, please read {\xbibfilenoauthor
+ {\CTANbase/lshort/vietnamese/lshort-vi.pdf}{Một tài liệu ngắn gọn
+ giới thiệu về \LaTeXe}} first.
+
+\subsubsection{Using \pkg{vietnam} or \pkg{vntex}}
+
+There are two packages, \pkg{vietnam} and \pkg{vntex}. They are quite
+similar, the only difference is that the default input encoding is VISCII
+in \pkg{vietnam} and UTF-8 in \pkg{vntex}. However, both packages
+allow you to specify any supported input encoding. The following
+encoding systems are supported:
+
+\begin{tabular}{ll}\hline
+ \code{|viscii|} & use VISCII input encoding\\
+ \code{|mviscii|} & use MVISCII input encoding\\
+ \code{|tcvn|} & use TCVN input encoding\\
+ \code{|vps|} & use VPS input encoding\\
+ \code{|utf8|} & use UTF-8 input encoding (\LaTeX)\\
+ \code{|utf8x|} & use UTF-8 input encoding (ucs package)\\
+ \code{|noinputenc|} & do not load the inputenc package (use of TCX is assumed)\\\hline
+\end{tabular}
+
+Examples: %\par\kern -2pt % avoid and unpleasant page break
+\begin{Code}
+ \documentclass{report}
+ \usepackage{vietnam} % |texcomment(use VISCII input encoding)
+ \begin{document}
+ |sometext(text in VISCII encoding)
+ \end{document}
+\end{Code}
+
+\begin{Code}
+ \documentclass{report}
+ \usepackage{vntex} % |texcomment(use UTF-8 input encoding)
+ \begin{document}
+ |sometext(text in UTF-8 encoding)
+ \end{document}
+\end{Code}
+
+\begin{Code}
+ \documentclass{report}
+ \usepackage[tcvn]{vntex} % |texcomment(use TCVN input encoding)
+ \begin{document}
+ |sometext(text in TCVN encoding)
+ \end{document}
+\end{Code}
+
+
+Both packages, \pkg{vietnam} and \pkg{vntex}, have the following
+additional options:
+
+\begin{tabular}{ll}\hline
+ \code{|nocaptions|} & do not define Vietnamese captions\\
+ \code{|varioref|} & load the \pkg{varioref-vi} package\\
+ \code{|cmap|} & load the \pkg{cmap} package\\\hline
+\end{tabular}
+
+If the option {\code|nocaptions|} is set, then captions
+are typeset in English. On the other hand, if you are using the
+\pkg{varioref} package, you might want to set
+the {\code|varioref|} option in order to get
+``\h{\ohorn} trang li\`\ecircumflex{}n sau'' instead of ``on the
+following page'', for example.
+
+The \pkg{cmap} packages makes the PDF file searchable.
+
+\newpage
+\subsubsection{Using \pkg{babel} instead of
+ \pkg{vietnam}/\pkg{vntex}}
+
+
+For multilingual documents it's better to use the \pkg{babel} package,
+which is part of the \LaTeX\ core. Though the \pkg{inputenc} package
+allows you to select the input encoding of your choice, UTF-8 is the
+preferred encoding for multilingual documents.
+
+\begin{Code}
+ \documentclass{report}
+ \usepackage[T2A,T5]{fontenc}
+ \usepackage[utf8]{inputenc}
+ \usepackage[russian,vietnam]{babel}
+ \begin{document}
+ Tiếng Việt,
+ \selectlanguage{russian}%
+ |selectlanguage(russian)русский язык,
+ \selectlanguage{vietnam}%
+ |selectlanguage(vietnam)tiếng Việt.
+ \end{document}
+\end{Code}
+
+Note that last optional argument passed to \pkg{babel} is the language
+which is active at the beginning of your document.
+
+The result of the example above is:~~
+{\fboxsep5pt
+ \fbox{\fontfamily{lmr}\large
+ Tiếng Việt,
+ \selectlanguage{russian}%
+ русский язык,
+ \selectlanguage{vietnam}%
+ tiếng Việt.}}
+
+\subsubsection{Using \pkg{TCX} files}
+\TeX\ itself can't use non-ASCII characters when writing error
+messages to screen or to the log file. Instead, it prints non-ASCII
+chacters in hexadecimal notation, like |^^DF|. But there is an
+extension called \pkg{TCX}. If you activate \pkg{TCX}, a translation
+table is loaded, and all files \TeX\ reads are translated before they
+are processed. If you are using \pkg{TCX}, you can't use the
+\pkg{inputenc} package because the translation can be done only once.
+
+\pkg{TCX} and \pkg{inputenc} are more or less equivalent. The
+advantage of \pkg{TCX} is that you get Vietnamese characters in
+messages about overfull/underfull boxes and the like. The main
+drawback is that it doesn't support UTF-8.
+
+Vn\TeX\ provides two \pkg{TCX} tables, {\code|viscii-t5|}
+and {\code|tcvn-t5|}. Here is an example:
+
+\begin{Code}
+ %& -translate-file=viscii-t5
+ \documentclass{report}
+ \usepackage[noinputenc]{vietnam}
+ \begin{document}
+ |sometext(text in VISCII encoding)
+ \end{document}
+\end{Code}
+
+The very first line says that the option {\code|-translate-file=viscii-t5|}
+is passed to \TeX\ when compiling the document. It has the same effect
+as if you run
+
+ {\code|latex -translate-file=viscii-t5 foo.tex|}
+
+on the command line. Using TCVN is similar.
+
+%\newpage
+
+\subsubsection{Creating HTML from \LaTeX\ sources}
+
+In order to create HTML documents from La\TeX\ sources, run
+
+ {\code|tex4ht "html,uni-html4,charset=utf8"|} \textit{yourfile.tex}
+
+on the command line. You can't use \pkg{TCX} with \pkg{tex4ht}.
+
+\subsection{Typesetting with plain TeX}
+
+Unfortunately, there is no package for UTF-8 input encoding in plain
+TeX yet.
+
+\subsubsection{\pkg{plainenc} and \pkg{plnfss}}
+
+\pkg{plnfss} provides a \LaTeX-like interface for font selection.
+
+\begin{Code}
+ \input t5code
+ \input plnfss
+ \input plainenc
+ \fontencoding{T5}
+ \inputencoding{viscii} % |texcomment(or any other encoding mentioned)
+ % |texcomment(above except |texttt(utf8))
+ \setfontencoding{T5}
+ \selectfont
+ |sometext(text in VISCII encoding)
+ \bye
+\end{Code}
+
+\pkg{plainenc} and \pkg{plnfss} are not part of the Vn\TeX\
+distribution any more but it is very likely that they are part of the
+\TeX\ system you are using.
+
+If you have a version of \pkg{plnfss}\ which doesn't already support
+Vietnamese, please install
+
+\http{vntex.sf.net/download/vntex-support/plnfss.zip}
+
+\subsubsection{Using \pkg{TCX}}
+
+\pkg{TCX} files can be used as described in the \LaTeX\ section.
+
+\begin{Code}
+ %& -translate-file=viscii-t5
+ \input t5code
+ \input plnfss
+ \setfontencoding{T5}
+ \selectfont
+ |sometext(text in VISCII encoding)
+ \bye
+\end{Code}
+
+\subsection{Using \pkg{texinfo}}
+TCX is required:
+\begin{Code}
+ %& -translate-file=viscii-t5
+ \def\fontprefix{vn}
+ \input t5code.tex
+ \input texinfo
+ |sometext(text in VISCII encoding)
+\end{Code}
+
+There are some test files for Vn\TeX\ in |texmf*/source/latex/vntex/tests/|.
+Please read the file \pkg{README} in this directory.
+
+
+\section{Vietnamese Fonts}
+
+Vn\TeX\ provides a lot of Vietnamese fonts. If you are using
+{\code|T5|} font encoding but do not specify any font (as in the
+examples above) you get \pkg{Vietnamese Computer Modern}. These VNR
+fonts are extensions to Donald Knuth's \pkg{Computern Modern Fonts}
+and have been designed by Hàn Thế Thành.
+
+\marginnote{nonfree fonts}Vn\TeX\ provides Vietnamese versions of free
+fonts donated by Adobe, URW, and Bitstream. Some of the URW fonts can
+be used freely but they can't be distributed if money is charged for
+the distribution. These fonts are not part of the Vn\TeX\ core
+distribution because otherwise Vn\TeX\ can't be in \pkg{TeX Live} or
+in Linux distributions. There is an extra package containing these
+fonts:
+
+\indenturl\http{vntex.sourceforge.net/download/vntex/vntex-nonfree.zip}\\
+\indenturl\http{vntex.sourceforge.net/download/vntex/vntex-nonfree.tar.bz2}
+
+If you are using \pkg{TeX Live}, intallation is very simple. Just run
+
+{\code|getnonfreefonts --help|}
+
+on the command line in order to get more information.
+
+\marginnote{\pkg{Latin Modern} and \pkg{\TeX Gyre}}There are many other
+ fonts supporting Vietnamese which are not shipped with Vn\TeX\
+ because they are an integral part of any modern \TeX\ distribution
+ anyway. Some quite interesting fonts are the \pkg{Latin Modern} and
+ \pkg{\TeX\ Gyre} fonts created by Bogus\l{}aw Jackowski and Janusz
+ M. Nowacki. They fully support Vietnamese but their main advantage
+ is that they support virtually all Latin scripts used today. Thus,
+ they are well suited for multilingual documents.
+
+ \marginnote{MS core fonts}The Microsoft core fonts are supported
+ too. Vn\TeX\ only provides the additional files needed to make them
+ accessible to \TeX, but not the fonts themselves. If you are on
+ Windows, they are available already.
+
+If you are on Unix, you have to install them yourself.
+
+\http{sourceforge.net/project/showfiles.php?group\_id=34153}
+
+Though the quality of the original fonts was quite good, the
+Vietnamese accents were added later, and obviously not by
+the guys who designed the fonts. The only exception is \pkg{Palatino
+ Linotype}. Inspect the fonts carefully before you decide which one
+you want to use.
+
+\marginnote{font samples}There are sample files for all fonts which
+support Vietnamese, can be used with \TeX, and can be used freely,
+even commercially. However, some of them can't be distributed if you
+charge money for the distribution.
+
+\http{vntex.sf.net/fonts/samples}
+
+Not every font supports maths. If you have to typeset math
+formulas, consult:
+
+ \http{ctan.org/tex-archive/info/Free\_Math\_Font\_Survey/vn/survey-vn.pdf}
+
+\subsection{Selecting Fonts in \LaTeX}
+
+We describe how to use fonts with \LaTeX\ first. A description of
+\pkg{plnfss} (plain TeX) is given below.
+
+To use Latin Modern instead of VNR, simply
+\begin{Code}
+ \usepackage{lmodern}
+ \usepackage[viscii]{vietnam}
+\end{Code}
+
+For Antikwa Toru\'nska, do
+\begin{Code}
+ \usepackage{anttor}
+ \usepackage[viscii]{vietnam}
+\end{Code}
+
+\ldots or use \pkg{inputenc} and \pkg{babel} instead of \pkg{vietnam}.
+
+It is recommended to specify a roman font, a sans-serif font and a
+typewriter font separately. You do not have to specify all of them.
+It makes sense, for instance, not to specify a typewriter font --- you
+get Computer Modern Typewriter then, which is a good choice.
+
+\begin{tabular}{lll}\hline
+Command & PostScript Name & Font Family Name\\\hline
+{\code|\renewcommand\sfdefault{uag}|} & |VnURWGothicL| & AvantGarde\\
+{\code|\renewcommand\rmdefault{ubk}|} & |VnURWBookmanL| & Bookman\\
+{\code|\renewcommand\ttdefault{ucr}|} & |VnNimbusMonL| & Courier\\
+{\code|\renewcommand\sfdefault{uhv}|} & |VnNimbusSanL| & Helvetica\\
+{\code|\renewcommand\rmdefault{unc}|} & |VnCenturySchL| & New Century Schoolbook\\
+{\code|\usepackage{mathpazo}|} & |VnURWPalladioL| & Palatino\\
+{\code|\usepackage{mathptm}|} & |VnNimbusRomNo9L| & Times\\\hline
+\end{tabular}
+
+\marginnote{small caps}There is also a real small caps font for
+|VnURWPalladioL|, made by Ralf Stubner and extended by Hàn Thế Thành.
+There are still some support files missing.
+
+By default, you get the faked small caps but you can use real small caps with
+some restrictions. To make use of them, put the following macro definition
+into the preamble of your document:
+
+{\code|\newcommand{\textfplsc}[1]{\bgroup\usefont{T5}{fpl}{m}{sc}#1\egroup}|}
+
+You can use it like this:
+
+ {\code||\sometext{some text}
+ \code|\textfplsc{|\sometext{some text in small caps}\code|}|
+ \sometext{some text}}
+
+The macro argument should not contain any numbers because they will appear
+as oldstyle numbers, but you cannot use oldstyle numbers with other font
+shapes in T5 encoding (Vietnamese) yet. This problem will be fixed in a
+future release.
+
+\marginnote{math fonts}If you have to typeset math formulas, be aware
+that not all fonts support math. The following fonts support math
+very well:
+
+\begin{tabular}{ll}\hline
+ Font & Command \\\hline
+ Computer Modern & do nothing \\
+ Latin Modern & {\code|\usepackage{lmodern}|} \\
+ Palatino & {\code|\usepackage{mathpazo}|} \\
+ Times & {\code|\usepackage{mathptm}|} \\\hline
+\end{tabular}
+
+There are many others too, please consult:
+
+ \http{ctan.org/tex-archive/info/Free\_Math\_Font\_Survey/vn/survey-vn.pdf}
+
+ However, some of the fonts borrow math symbols from other fonts and
+ it's worthwhile to check whether all the symbols you need blend well
+ with the base font you are using. Be very careful when using
+ \textsf{sans-serif} fonts in math formulas. It's very
+ painful if there is no significant difference between ``\textsf{l}''
+ and ``\textsf{I}''. Do you see any difference at all? The first
+ one is a lowercase ``\texttt{L}'', the second one is an uppercase
+ ``\texttt{i}''.
+
+
+\clearpage
+
+\marginnote{MS core fonts}If you are using Windows, you also can use
+the fonts provided by Microsoft:
+
+\begin{tabular}{lll}\hline
+Command & PostScript Name & Font Family Name\\\hline
+ {\code|\renewcommand\sfdefault{ma1}|} & |ArialMT| & Arial \\
+ {\code|\renewcommand\ttdefault{mcr}|} & |CourierNewPSMT| & Courier \\
+ {\code|\renewcommand\rmdefault{lpr}|} & |PalatinoLinotype| & Palatino \\
+ {\code|\renewcommand\rmdefault{mns}|} & |TimesNewRomanPSMT| & Times New Roman \\
+ {\code|\renewcommand\sfdefault{jth}|} & |Tahoma| & Tahoma \\
+ {\code|\renewcommand\sfdefault{jvn}|} & |Verdana| & Verdana \\\hline
+\end{tabular}
+
+None of the Microsoft fonts supports mathematics. Though the quality of
+the fonts is quite high, not much care had been taken in the design of
+Vietnamese accents. See:
+
+ \http{vntex.sf.net/fonts/samples}
+
+Unless someone insists that you use these fonts, you can use
+
+\begin{tabular}{lll}\hline
+ |VnNimbusMonL| & instead of |CourierNewPSMT| & Courier\\
+ |VnNimbusSanL| & instead of |ArialMT| & Helvetica/Arial\\
+ |VnNimbusRomNo9L| & instead of |TimesNewRomanPSMT| & Times/Times New Roman\\
+ |VnURWPalladioL| & instead of |PalatinoLinotype| & Palatino\\\hline
+\end{tabular}
+
+
+If you are using plain \TeX, you can use \pkg{plnfss.tex} to select fonts.
+
+Instead of
+\begin{Code}
+ \renewcommand\rmdefault{...}
+ \renewcommand\sfdefault{...}
+ \renewcommand\ttdefault{...}
+\end{Code}
+
+you have to select fonts like this:
+\begin{Code}
+ \setrmdefault{...}
+ \setsfdefault{...}
+ \setttdefault{...}
+\end{Code}
+
+See the \pkg{plnfss} documentation for more details.
+
+\section{Licenses}
+
+The URW and Bitstream Type1 fonts are copyrighted under the GNU GPL,
+\texttt{.map} files are public domain, \pkg{varioref-vi.sty} is under
+LGPL, \pkg{Vntopia} is under the Adobe/TUG Utopia license agreement,
+all other files are under LPPL, version 1.3 or newer.
+
+\begin{itemize}
+\item \http{www.gnu.org/licenses/gpl.txt}
+\item \http{www.gnu.org/licenses/lgpl.txt}
+\item \http{www.latex-project.org/lppl.txt}
+\item \http{tug.org/fonts/utopia/LICENSE-utopia.txt}
+\end{itemize}
+\clearpage
+
+
+\section{Contributors}
+
+\LaTeX\ support (input encoding files, font encoding files, babel support
+and vietnam.sty) had been provided by Werner Lemberg. \pkg{vntex.sty}
+had been proposed by Huỳnh Kỳ Anh.
+
+Vietnamese fonts for \pkg{tex4ht} had originally been provided by Hàn
+Thế Thành, but they are now maintained by Eitan Gurari.
+
+\pkg{plnfss} had been removed from Vn\TeX\ because it supports many other
+languages as well. You can download it from
+
+ \http{ctan.tug.org/tex-archive/macros/plain/plnfss}
+
+
+\section{Known Problems}
+
+\begin{itemize}
+\item In order to use \pkg{amsart.cls} (and other AMS La\TeX\ document
+ classes) with Unicode you must add the following lines immediately
+ before {\code|\begin{document}|}:
+\begin{Code}
+ \def\firstofone#1{#1}
+ \let\uppercase\firstofone
+ \let\MakeUppercase\firstofone
+\end{Code}
+
+This completely disables \LaTeX's uppercasing commands which might
+cause bad secondary effects. Note that this problem is not specific
+to Vietnamese but affects any multibyte encoding.
+
+\item In order to use Vn\TeX\ with \pkg{Prosper}, you have to install
+
+ \http{vntex.sf.net/download/vntex-support/prosper-vn.zip}
+
+ \item In order to use Vn\TeX\ with Foil\TeX, you have to install
+
+ \http{vntex.sf.net/download/vntex-support/foiltex-vn.zip}
+
+ \item If have an old version of \LaTeX\ which does not support
+ UTF-8, you have to use \pkg{ucs.sty}. If \pkg{ucs.sty} is not
+ present on your system you can install
+
+ \http{vntex.sf.net/download/vntex-support/ucs-vn.zip}
+
+ We will keep this file as long as \pkg{ucs} is unmaintained. If
+ a maintainer is found you should download a fresh \pkg{ucs}
+ distribution from the original site.
+
+ This is a small subset of the \pkg{ucs} package which supports
+ Vietnamese only. You can invoke it with
+ {\code|\usepackage[utf8x]{inputenc}|}.
+
+ Instead of installing ucs we recommend you update \LaTeX. The
+ latest version can be downloaded from
+
+ \begin{itemize}
+ \item \leavevmode\http{www.dante.de/tex-archive/macros/latex/base.zip} (Germany)
+ \item \leavevmode\http{www.tex.ac.uk/tex-archive/macros/latex/base.zip} (UK)
+ \item \leavevmode\http{tug.ctan.org/tex-archive/macros/latex/base.zip} (USA)
+ \end{itemize}
+\end{itemize}
+
+\end{document}
+__
+Everything below the line above is ignored.
+
+Local Variables:
+coding: utf-8
+End:
+
+%%% initemxf --edit-config-file updmap
+
diff --git a/Master/texmf-dist/doc/generic/vntex/tests/Makefile b/Master/texmf-dist/source/generic/vntex/tests/Makefile
index 668205cae24..6ab1762b1b5 100644
--- a/Master/texmf-dist/doc/generic/vntex/tests/Makefile
+++ b/Master/texmf-dist/source/generic/vntex/tests/Makefile
@@ -1,4 +1,4 @@
-# vntex-3.1.7
+# vntex-3.1.8
#
# Author: Han The Thanh <hanthethanh@gmx.net>.
# This file is part of vntex. Public domain.
@@ -67,6 +67,13 @@ KURIER_SAMPLE = t5kurier-sample
# Comment out the next two lines if you don't have a recent version
+# of the Cyklop font family (look whether you have `cyklop.map'
+# in your TEXMF tree).
+CYKLOP_TEST = t5cyklop-test
+CYKLOP_SAMPLE = t5cyklop-sample
+
+
+# Comment out the next two lines if you don't have a recent version
# of the Gentium font family (look whether you have `gentium.map'
# in your TEXMF tree).
GENTIUM_TEST = t5gentium-test
@@ -225,7 +232,7 @@ TEST_LATEX_ALL = $(TEST_LATEX) test-vietnam-tcx
REFERENCES = vnr-test urwvn-test chartervn-test \
$(ANTT_TEST) $(T5LM_TEST) \
- $(IWONA_TEST) $(KURIER_TEST) \
+ $(IWONA_TEST) $(KURIER_TEST) $(CYKLOP_TEST) \
$(GROTESK_TEST) $(GARAMOND_TEST) \
$(AREV_TEST) $(VNTOPIA_TEST) $(CLASSICO_TEST) \
$(CMBRIGHT_TEST) $(CONCRETE_TEST) \
@@ -237,7 +244,7 @@ REFERENCES = vnr-test urwvn-test chartervn-test \
SAMPLES = vnr-sample urwvn-sample chartervn-sample \
$(ANTT_SAMPLE) $(T5LM_SAMPLE) \
- $(IWONA_SAMPLE) $(KURIER_SAMPLE) \
+ $(IWONA_SAMPLE) $(KURIER_SAMPLE) $(CYKLOP_SAMPLE) \
$(GROTESK_SAMPLE) $(GARAMOND_SAMPLE) \
$(AREV_SAMPLE) $(VNTOPIA_SAMPLE) $(CLASSICO_SAMPLE) \
$(CMBRIGHT_SAMPLE) $(CONCRETE_SAMPLE) \
diff --git a/Master/texmf-dist/doc/generic/vntex/tests/README b/Master/texmf-dist/source/generic/vntex/tests/README
index 803ecbcbd92..b23d7ab251b 100644
--- a/Master/texmf-dist/doc/generic/vntex/tests/README
+++ b/Master/texmf-dist/source/generic/vntex/tests/README
@@ -1,4 +1,4 @@
-vntex-3.1.7
+vntex-3.1.8
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/adventor-sample.tex b/Master/texmf-dist/source/generic/vntex/tests/adventor-sample.tex
index f32f7ea3d02..f32f7ea3d02 100644
--- a/Master/texmf-dist/doc/generic/vntex/tests/adventor-sample.tex
+++ b/Master/texmf-dist/source/generic/vntex/tests/adventor-sample.tex
diff --git a/Master/texmf-dist/doc/generic/vntex/tests/adventor-test.tex b/Master/texmf-dist/source/generic/vntex/tests/adventor-test.tex
index 1285f08fd37..1285f08fd37 100644
--- a/Master/texmf-dist/doc/generic/vntex/tests/adventor-test.tex
+++ b/Master/texmf-dist/source/generic/vntex/tests/adventor-test.tex
diff --git a/Master/texmf-dist/doc/generic/vntex/tests/arevvn-sample.tex b/Master/texmf-dist/source/generic/vntex/tests/arevvn-sample.tex
index 26f6656b48e..26f6656b48e 100644
--- a/Master/texmf-dist/doc/generic/vntex/tests/arevvn-sample.tex
+++ b/Master/texmf-dist/source/generic/vntex/tests/arevvn-sample.tex
diff --git a/Master/texmf-dist/doc/generic/vntex/tests/arevvn-test.tex b/Master/texmf-dist/source/generic/vntex/tests/arevvn-test.tex
index 1f808e16688..1f808e16688 100644
--- a/Master/texmf-dist/doc/generic/vntex/tests/arevvn-test.tex
+++ b/Master/texmf-dist/source/generic/vntex/tests/arevvn-test.tex
diff --git a/Master/texmf-dist/doc/generic/vntex/tests/bonum-sample.tex b/Master/texmf-dist/source/generic/vntex/tests/bonum-sample.tex
index 3bd324270da..3bd324270da 100644
--- a/Master/texmf-dist/doc/generic/vntex/tests/bonum-sample.tex
+++ b/Master/texmf-dist/source/generic/vntex/tests/bonum-sample.tex
diff --git a/Master/texmf-dist/doc/generic/vntex/tests/bonum-test.tex b/Master/texmf-dist/source/generic/vntex/tests/bonum-test.tex
index 9398674925e..9398674925e 100644
--- a/Master/texmf-dist/doc/generic/vntex/tests/bonum-test.tex
+++ b/Master/texmf-dist/source/generic/vntex/tests/bonum-test.tex
diff --git a/Master/texmf-dist/doc/generic/vntex/tests/chartervn-sample.tex b/Master/texmf-dist/source/generic/vntex/tests/chartervn-sample.tex
index 2321ba80657..2321ba80657 100644
--- a/Master/texmf-dist/doc/generic/vntex/tests/chartervn-sample.tex
+++ b/Master/texmf-dist/source/generic/vntex/tests/chartervn-sample.tex
diff --git a/Master/texmf-dist/doc/generic/vntex/tests/chartervn-test.tex b/Master/texmf-dist/source/generic/vntex/tests/chartervn-test.tex
index 0f3fb5dba87..0f3fb5dba87 100644
--- a/Master/texmf-dist/doc/generic/vntex/tests/chartervn-test.tex
+++ b/Master/texmf-dist/source/generic/vntex/tests/chartervn-test.tex
diff --git a/Master/texmf-dist/doc/generic/vntex/tests/chorus-sample.tex b/Master/texmf-dist/source/generic/vntex/tests/chorus-sample.tex
index 4e7b57f1809..4e7b57f1809 100644
--- a/Master/texmf-dist/doc/generic/vntex/tests/chorus-sample.tex
+++ b/Master/texmf-dist/source/generic/vntex/tests/chorus-sample.tex
diff --git a/Master/texmf-dist/doc/generic/vntex/tests/chorus-test.tex b/Master/texmf-dist/source/generic/vntex/tests/chorus-test.tex
index 1cabfbe3203..1cabfbe3203 100644
--- a/Master/texmf-dist/doc/generic/vntex/tests/chorus-test.tex
+++ b/Master/texmf-dist/source/generic/vntex/tests/chorus-test.tex
diff --git a/Master/texmf-dist/doc/generic/vntex/tests/classicovn-sample.tex b/Master/texmf-dist/source/generic/vntex/tests/classicovn-sample.tex
index 83380012a23..83380012a23 100644
--- a/Master/texmf-dist/doc/generic/vntex/tests/classicovn-sample.tex
+++ b/Master/texmf-dist/source/generic/vntex/tests/classicovn-sample.tex
diff --git a/Master/texmf-dist/doc/generic/vntex/tests/classicovn-test.tex b/Master/texmf-dist/source/generic/vntex/tests/classicovn-test.tex
index c76b5ef33b2..c76b5ef33b2 100644
--- a/Master/texmf-dist/doc/generic/vntex/tests/classicovn-test.tex
+++ b/Master/texmf-dist/source/generic/vntex/tests/classicovn-test.tex
diff --git a/Master/texmf-dist/doc/generic/vntex/tests/cmbrightvn-sample.tex b/Master/texmf-dist/source/generic/vntex/tests/cmbrightvn-sample.tex
index 48847876236..48847876236 100644
--- a/Master/texmf-dist/doc/generic/vntex/tests/cmbrightvn-sample.tex
+++ b/Master/texmf-dist/source/generic/vntex/tests/cmbrightvn-sample.tex
diff --git a/Master/texmf-dist/doc/generic/vntex/tests/cmbrightvn-test.tex b/Master/texmf-dist/source/generic/vntex/tests/cmbrightvn-test.tex
index 3f33e6192a8..3f33e6192a8 100644
--- a/Master/texmf-dist/doc/generic/vntex/tests/cmbrightvn-test.tex
+++ b/Master/texmf-dist/source/generic/vntex/tests/cmbrightvn-test.tex
diff --git a/Master/texmf-dist/doc/generic/vntex/tests/comicsansvn-sample.tex b/Master/texmf-dist/source/generic/vntex/tests/comicsansvn-sample.tex
index b8a7690e0af..b8a7690e0af 100644
--- a/Master/texmf-dist/doc/generic/vntex/tests/comicsansvn-sample.tex
+++ b/Master/texmf-dist/source/generic/vntex/tests/comicsansvn-sample.tex
diff --git a/Master/texmf-dist/doc/generic/vntex/tests/comicsansvn-test.tex b/Master/texmf-dist/source/generic/vntex/tests/comicsansvn-test.tex
index 918a7ca4ea0..918a7ca4ea0 100644
--- a/Master/texmf-dist/doc/generic/vntex/tests/comicsansvn-test.tex
+++ b/Master/texmf-dist/source/generic/vntex/tests/comicsansvn-test.tex
diff --git a/Master/texmf-dist/doc/generic/vntex/tests/concretevn-sample.tex b/Master/texmf-dist/source/generic/vntex/tests/concretevn-sample.tex
index e9ac0a3c571..e9ac0a3c571 100644
--- a/Master/texmf-dist/doc/generic/vntex/tests/concretevn-sample.tex
+++ b/Master/texmf-dist/source/generic/vntex/tests/concretevn-sample.tex
diff --git a/Master/texmf-dist/doc/generic/vntex/tests/concretevn-test.tex b/Master/texmf-dist/source/generic/vntex/tests/concretevn-test.tex
index 1ce48bbf4c9..1ce48bbf4c9 100644
--- a/Master/texmf-dist/doc/generic/vntex/tests/concretevn-test.tex
+++ b/Master/texmf-dist/source/generic/vntex/tests/concretevn-test.tex
diff --git a/Master/texmf-dist/doc/generic/vntex/tests/cursor-sample.tex b/Master/texmf-dist/source/generic/vntex/tests/cursor-sample.tex
index d2a255ee640..d2a255ee640 100644
--- a/Master/texmf-dist/doc/generic/vntex/tests/cursor-sample.tex
+++ b/Master/texmf-dist/source/generic/vntex/tests/cursor-sample.tex
diff --git a/Master/texmf-dist/doc/generic/vntex/tests/cursor-test.tex b/Master/texmf-dist/source/generic/vntex/tests/cursor-test.tex
index db02b0cbe70..db02b0cbe70 100644
--- a/Master/texmf-dist/doc/generic/vntex/tests/cursor-test.tex
+++ b/Master/texmf-dist/source/generic/vntex/tests/cursor-test.tex
diff --git a/Master/texmf-dist/doc/generic/vntex/tests/garamondvn-sample.tex b/Master/texmf-dist/source/generic/vntex/tests/garamondvn-sample.tex
index f64ecfe7f3c..f64ecfe7f3c 100644
--- a/Master/texmf-dist/doc/generic/vntex/tests/garamondvn-sample.tex
+++ b/Master/texmf-dist/source/generic/vntex/tests/garamondvn-sample.tex
diff --git a/Master/texmf-dist/doc/generic/vntex/tests/garamondvn-test.tex b/Master/texmf-dist/source/generic/vntex/tests/garamondvn-test.tex
index a884e387dbd..a884e387dbd 100644
--- a/Master/texmf-dist/doc/generic/vntex/tests/garamondvn-test.tex
+++ b/Master/texmf-dist/source/generic/vntex/tests/garamondvn-test.tex
diff --git a/Master/texmf-dist/doc/generic/vntex/tests/grotesqvn-sample.tex b/Master/texmf-dist/source/generic/vntex/tests/grotesqvn-sample.tex
index 39447b7060c..39447b7060c 100644
--- a/Master/texmf-dist/doc/generic/vntex/tests/grotesqvn-sample.tex
+++ b/Master/texmf-dist/source/generic/vntex/tests/grotesqvn-sample.tex
diff --git a/Master/texmf-dist/doc/generic/vntex/tests/grotesqvn-test.tex b/Master/texmf-dist/source/generic/vntex/tests/grotesqvn-test.tex
index 498e74529a5..498e74529a5 100644
--- a/Master/texmf-dist/doc/generic/vntex/tests/grotesqvn-test.tex
+++ b/Master/texmf-dist/source/generic/vntex/tests/grotesqvn-test.tex
diff --git a/Master/texmf-dist/doc/generic/vntex/tests/heros-sample.tex b/Master/texmf-dist/source/generic/vntex/tests/heros-sample.tex
index c5b40690291..c5b40690291 100644
--- a/Master/texmf-dist/doc/generic/vntex/tests/heros-sample.tex
+++ b/Master/texmf-dist/source/generic/vntex/tests/heros-sample.tex
diff --git a/Master/texmf-dist/doc/generic/vntex/tests/heros-test.tex b/Master/texmf-dist/source/generic/vntex/tests/heros-test.tex
index 10c8adc316b..10c8adc316b 100644
--- a/Master/texmf-dist/doc/generic/vntex/tests/heros-test.tex
+++ b/Master/texmf-dist/source/generic/vntex/tests/heros-test.tex
diff --git a/Master/texmf-dist/doc/generic/vntex/tests/mscore-sample.tex b/Master/texmf-dist/source/generic/vntex/tests/mscore-sample.tex
index d4795d8540a..d4795d8540a 100644
--- a/Master/texmf-dist/doc/generic/vntex/tests/mscore-sample.tex
+++ b/Master/texmf-dist/source/generic/vntex/tests/mscore-sample.tex
diff --git a/Master/texmf-dist/doc/generic/vntex/tests/mscore-test.tex b/Master/texmf-dist/source/generic/vntex/tests/mscore-test.tex
index aee39caae86..aee39caae86 100644
--- a/Master/texmf-dist/doc/generic/vntex/tests/mscore-test.tex
+++ b/Master/texmf-dist/source/generic/vntex/tests/mscore-test.tex
diff --git a/Master/texmf-dist/doc/generic/vntex/tests/pagella-sample.tex b/Master/texmf-dist/source/generic/vntex/tests/pagella-sample.tex
index f371a7446f9..f371a7446f9 100644
--- a/Master/texmf-dist/doc/generic/vntex/tests/pagella-sample.tex
+++ b/Master/texmf-dist/source/generic/vntex/tests/pagella-sample.tex
diff --git a/Master/texmf-dist/doc/generic/vntex/tests/pagella-test.tex b/Master/texmf-dist/source/generic/vntex/tests/pagella-test.tex
index f8ac90cf62b..f8ac90cf62b 100644
--- a/Master/texmf-dist/doc/generic/vntex/tests/pagella-test.tex
+++ b/Master/texmf-dist/source/generic/vntex/tests/pagella-test.tex
diff --git a/Master/texmf-dist/doc/generic/vntex/tests/schola-sample.tex b/Master/texmf-dist/source/generic/vntex/tests/schola-sample.tex
index 327d65b23d9..327d65b23d9 100644
--- a/Master/texmf-dist/doc/generic/vntex/tests/schola-sample.tex
+++ b/Master/texmf-dist/source/generic/vntex/tests/schola-sample.tex
diff --git a/Master/texmf-dist/doc/generic/vntex/tests/schola-test.tex b/Master/texmf-dist/source/generic/vntex/tests/schola-test.tex
index 535bbead5ec..535bbead5ec 100644
--- a/Master/texmf-dist/doc/generic/vntex/tests/schola-test.tex
+++ b/Master/texmf-dist/source/generic/vntex/tests/schola-test.tex
diff --git a/Master/texmf-dist/doc/generic/vntex/tests/t5antt-sample.tex b/Master/texmf-dist/source/generic/vntex/tests/t5antt-sample.tex
index 983203dce29..983203dce29 100644
--- a/Master/texmf-dist/doc/generic/vntex/tests/t5antt-sample.tex
+++ b/Master/texmf-dist/source/generic/vntex/tests/t5antt-sample.tex
diff --git a/Master/texmf-dist/doc/generic/vntex/tests/t5antt-test.tex b/Master/texmf-dist/source/generic/vntex/tests/t5antt-test.tex
index 229895d63f6..229895d63f6 100644
--- a/Master/texmf-dist/doc/generic/vntex/tests/t5antt-test.tex
+++ b/Master/texmf-dist/source/generic/vntex/tests/t5antt-test.tex
diff --git a/Master/texmf-dist/doc/generic/vntex/tests/t5cyklop-sample.tex b/Master/texmf-dist/source/generic/vntex/tests/t5cyklop-sample.tex
index a07e4db25f3..a07e4db25f3 100644
--- a/Master/texmf-dist/doc/generic/vntex/tests/t5cyklop-sample.tex
+++ b/Master/texmf-dist/source/generic/vntex/tests/t5cyklop-sample.tex
diff --git a/Master/texmf-dist/doc/generic/vntex/tests/t5cyklop-test.tex b/Master/texmf-dist/source/generic/vntex/tests/t5cyklop-test.tex
index 637da8426b9..637da8426b9 100644
--- a/Master/texmf-dist/doc/generic/vntex/tests/t5cyklop-test.tex
+++ b/Master/texmf-dist/source/generic/vntex/tests/t5cyklop-test.tex
diff --git a/Master/texmf-dist/doc/generic/vntex/tests/t5gentium-sample.tex b/Master/texmf-dist/source/generic/vntex/tests/t5gentium-sample.tex
index b0b602946d4..b0b602946d4 100644
--- a/Master/texmf-dist/doc/generic/vntex/tests/t5gentium-sample.tex
+++ b/Master/texmf-dist/source/generic/vntex/tests/t5gentium-sample.tex
diff --git a/Master/texmf-dist/doc/generic/vntex/tests/t5gentium-test.tex b/Master/texmf-dist/source/generic/vntex/tests/t5gentium-test.tex
index 0d5ee17d47d..0d5ee17d47d 100644
--- a/Master/texmf-dist/doc/generic/vntex/tests/t5gentium-test.tex
+++ b/Master/texmf-dist/source/generic/vntex/tests/t5gentium-test.tex
diff --git a/Master/texmf-dist/doc/generic/vntex/tests/t5iwona-sample.tex b/Master/texmf-dist/source/generic/vntex/tests/t5iwona-sample.tex
index 9499ddb0243..9499ddb0243 100644
--- a/Master/texmf-dist/doc/generic/vntex/tests/t5iwona-sample.tex
+++ b/Master/texmf-dist/source/generic/vntex/tests/t5iwona-sample.tex
diff --git a/Master/texmf-dist/doc/generic/vntex/tests/t5iwona-test.tex b/Master/texmf-dist/source/generic/vntex/tests/t5iwona-test.tex
index 34b2dc5046c..34b2dc5046c 100644
--- a/Master/texmf-dist/doc/generic/vntex/tests/t5iwona-test.tex
+++ b/Master/texmf-dist/source/generic/vntex/tests/t5iwona-test.tex
diff --git a/Master/texmf-dist/doc/generic/vntex/tests/t5kurier-sample.tex b/Master/texmf-dist/source/generic/vntex/tests/t5kurier-sample.tex
index 5403447748a..5403447748a 100644
--- a/Master/texmf-dist/doc/generic/vntex/tests/t5kurier-sample.tex
+++ b/Master/texmf-dist/source/generic/vntex/tests/t5kurier-sample.tex
diff --git a/Master/texmf-dist/doc/generic/vntex/tests/t5kurier-test.tex b/Master/texmf-dist/source/generic/vntex/tests/t5kurier-test.tex
index 6dfa7108262..6dfa7108262 100644
--- a/Master/texmf-dist/doc/generic/vntex/tests/t5kurier-test.tex
+++ b/Master/texmf-dist/source/generic/vntex/tests/t5kurier-test.tex
diff --git a/Master/texmf-dist/doc/generic/vntex/tests/t5lm-sample.tex b/Master/texmf-dist/source/generic/vntex/tests/t5lm-sample.tex
index 91ea5a73e48..91ea5a73e48 100644
--- a/Master/texmf-dist/doc/generic/vntex/tests/t5lm-sample.tex
+++ b/Master/texmf-dist/source/generic/vntex/tests/t5lm-sample.tex
diff --git a/Master/texmf-dist/doc/generic/vntex/tests/t5lm-test.tex b/Master/texmf-dist/source/generic/vntex/tests/t5lm-test.tex
index 41f7489b5bb..41f7489b5bb 100644
--- a/Master/texmf-dist/doc/generic/vntex/tests/t5lm-test.tex
+++ b/Master/texmf-dist/source/generic/vntex/tests/t5lm-test.tex
diff --git a/Master/texmf-dist/doc/generic/vntex/tests/termes-sample.tex b/Master/texmf-dist/source/generic/vntex/tests/termes-sample.tex
index 09803df1948..09803df1948 100644
--- a/Master/texmf-dist/doc/generic/vntex/tests/termes-sample.tex
+++ b/Master/texmf-dist/source/generic/vntex/tests/termes-sample.tex
diff --git a/Master/texmf-dist/doc/generic/vntex/tests/termes-test.tex b/Master/texmf-dist/source/generic/vntex/tests/termes-test.tex
index 9870580a94b..9870580a94b 100644
--- a/Master/texmf-dist/doc/generic/vntex/tests/termes-test.tex
+++ b/Master/texmf-dist/source/generic/vntex/tests/termes-test.tex
diff --git a/Master/texmf-dist/doc/generic/vntex/source/test-accents.tex b/Master/texmf-dist/source/generic/vntex/tests/test-accents.tex
index c0c9a43aeb1..3c9b8824d3c 100644
--- a/Master/texmf-dist/doc/generic/vntex/source/test-accents.tex
+++ b/Master/texmf-dist/source/generic/vntex/tests/test-accents.tex
@@ -20,6 +20,7 @@
\X{\Uhorn} \verb|\Uhorn| \\
\X{\abreve} \verb|\abreve| \\
\X{\acircumflex} \verb|\acircumflex| \\
+\X{\DJ} \verb|\DJ| \\
\X{\dj} \verb|\dj| \\
\X{\ecircumflex} \verb|\ecircumflex| \\
\X{\i} \verb|\i| \\
diff --git a/Master/texmf-dist/doc/generic/vntex/tests/test-babel.tex b/Master/texmf-dist/source/generic/vntex/tests/test-babel.tex
index fdf0d66e5f2..fdf0d66e5f2 100644
--- a/Master/texmf-dist/doc/generic/vntex/tests/test-babel.tex
+++ b/Master/texmf-dist/source/generic/vntex/tests/test-babel.tex
diff --git a/Master/texmf-dist/doc/generic/vntex/tests/test-captions.tex b/Master/texmf-dist/source/generic/vntex/tests/test-captions.tex
index 3c9b80abf5b..3c9b80abf5b 100644
--- a/Master/texmf-dist/doc/generic/vntex/tests/test-captions.tex
+++ b/Master/texmf-dist/source/generic/vntex/tests/test-captions.tex
diff --git a/Master/texmf-dist/doc/generic/vntex/tests/test-plain-tcx.tex b/Master/texmf-dist/source/generic/vntex/tests/test-plain-tcx.tex
index 35274887a30..35274887a30 100644
--- a/Master/texmf-dist/doc/generic/vntex/tests/test-plain-tcx.tex
+++ b/Master/texmf-dist/source/generic/vntex/tests/test-plain-tcx.tex
diff --git a/Master/texmf-dist/doc/generic/vntex/tests/test-plain.tex b/Master/texmf-dist/source/generic/vntex/tests/test-plain.tex
index 5afff7d444e..5afff7d444e 100644
--- a/Master/texmf-dist/doc/generic/vntex/tests/test-plain.tex
+++ b/Master/texmf-dist/source/generic/vntex/tests/test-plain.tex
diff --git a/Master/texmf-dist/doc/generic/vntex/tests/test-tcvn.tex b/Master/texmf-dist/source/generic/vntex/tests/test-tcvn.tex
index ba5b6b341d3..ba5b6b341d3 100644
--- a/Master/texmf-dist/doc/generic/vntex/tests/test-tcvn.tex
+++ b/Master/texmf-dist/source/generic/vntex/tests/test-tcvn.tex
diff --git a/Master/texmf-dist/doc/generic/vntex/tests/test-utf8.tex b/Master/texmf-dist/source/generic/vntex/tests/test-utf8.tex
index 7f8ec36b4d9..7f8ec36b4d9 100644
--- a/Master/texmf-dist/doc/generic/vntex/tests/test-utf8.tex
+++ b/Master/texmf-dist/source/generic/vntex/tests/test-utf8.tex
diff --git a/Master/texmf-dist/doc/generic/vntex/tests/test-vietnam-tcx.tex b/Master/texmf-dist/source/generic/vntex/tests/test-vietnam-tcx.tex
index 05a615ac1bb..05a615ac1bb 100644
--- a/Master/texmf-dist/doc/generic/vntex/tests/test-vietnam-tcx.tex
+++ b/Master/texmf-dist/source/generic/vntex/tests/test-vietnam-tcx.tex
diff --git a/Master/texmf-dist/doc/generic/vntex/tests/test-vietnam.tex b/Master/texmf-dist/source/generic/vntex/tests/test-vietnam.tex
index 0239df9f747..0239df9f747 100644
--- a/Master/texmf-dist/doc/generic/vntex/tests/test-vietnam.tex
+++ b/Master/texmf-dist/source/generic/vntex/tests/test-vietnam.tex
diff --git a/Master/texmf-dist/doc/generic/vntex/tests/test-viscii.tex b/Master/texmf-dist/source/generic/vntex/tests/test-viscii.tex
index 6b5b16beeff..6b5b16beeff 100644
--- a/Master/texmf-dist/doc/generic/vntex/tests/test-viscii.tex
+++ b/Master/texmf-dist/source/generic/vntex/tests/test-viscii.tex
diff --git a/Master/texmf-dist/doc/generic/vntex/tests/txttvn-sample.tex b/Master/texmf-dist/source/generic/vntex/tests/txttvn-sample.tex
index 08465a803a9..08465a803a9 100644
--- a/Master/texmf-dist/doc/generic/vntex/tests/txttvn-sample.tex
+++ b/Master/texmf-dist/source/generic/vntex/tests/txttvn-sample.tex
diff --git a/Master/texmf-dist/doc/generic/vntex/tests/txttvn-test.tex b/Master/texmf-dist/source/generic/vntex/tests/txttvn-test.tex
index 1a749071005..1a749071005 100644
--- a/Master/texmf-dist/doc/generic/vntex/tests/txttvn-test.tex
+++ b/Master/texmf-dist/source/generic/vntex/tests/txttvn-test.tex
diff --git a/Master/texmf-dist/doc/generic/vntex/tests/urwvn-sample.tex b/Master/texmf-dist/source/generic/vntex/tests/urwvn-sample.tex
index f860bb24d9a..f860bb24d9a 100644
--- a/Master/texmf-dist/doc/generic/vntex/tests/urwvn-sample.tex
+++ b/Master/texmf-dist/source/generic/vntex/tests/urwvn-sample.tex
diff --git a/Master/texmf-dist/doc/generic/vntex/tests/urwvn-test.tex b/Master/texmf-dist/source/generic/vntex/tests/urwvn-test.tex
index bb1276e3c19..bb1276e3c19 100644
--- a/Master/texmf-dist/doc/generic/vntex/tests/urwvn-test.tex
+++ b/Master/texmf-dist/source/generic/vntex/tests/urwvn-test.tex
diff --git a/Master/texmf-dist/doc/generic/vntex/tests/vnr-sample.tex b/Master/texmf-dist/source/generic/vntex/tests/vnr-sample.tex
index 3997f4b3d24..3997f4b3d24 100644
--- a/Master/texmf-dist/doc/generic/vntex/tests/vnr-sample.tex
+++ b/Master/texmf-dist/source/generic/vntex/tests/vnr-sample.tex
diff --git a/Master/texmf-dist/doc/generic/vntex/tests/vnr-test.tex b/Master/texmf-dist/source/generic/vntex/tests/vnr-test.tex
index af0b05850f2..af0b05850f2 100644
--- a/Master/texmf-dist/doc/generic/vntex/tests/vnr-test.tex
+++ b/Master/texmf-dist/source/generic/vntex/tests/vnr-test.tex
diff --git a/Master/texmf-dist/doc/generic/vntex/tests/vnsample.cls b/Master/texmf-dist/source/generic/vntex/tests/vnsample.cls
index 7e9de68150f..7e9de68150f 100644
--- a/Master/texmf-dist/doc/generic/vntex/tests/vnsample.cls
+++ b/Master/texmf-dist/source/generic/vntex/tests/vnsample.cls
diff --git a/Master/texmf-dist/doc/generic/vntex/tests/vntopia-sample.tex b/Master/texmf-dist/source/generic/vntex/tests/vntopia-sample.tex
index 1144edc21f9..1144edc21f9 100644
--- a/Master/texmf-dist/doc/generic/vntex/tests/vntopia-sample.tex
+++ b/Master/texmf-dist/source/generic/vntex/tests/vntopia-sample.tex
diff --git a/Master/texmf-dist/doc/generic/vntex/tests/vntopia-test.tex b/Master/texmf-dist/source/generic/vntex/tests/vntopia-test.tex
index b9076eb7dc6..b9076eb7dc6 100644
--- a/Master/texmf-dist/doc/generic/vntex/tests/vntopia-test.tex
+++ b/Master/texmf-dist/source/generic/vntex/tests/vntopia-test.tex
diff --git a/Master/texmf-dist/source/generic/vntex/vntex.dtx b/Master/texmf-dist/source/generic/vntex/vntex.dtx
new file mode 100644
index 00000000000..1456da4fc06
--- /dev/null
+++ b/Master/texmf-dist/source/generic/vntex/vntex.dtx
@@ -0,0 +1,153 @@
+% \iffalse
+%
+% 1.0 2000/01/27
+%
+% * Initial release.
+%
+% post 1.0 ?
+%
+% * Require 'ifthen' package.
+%
+% * Don't require 't5' package.
+%
+% * New options 'mviscii', 'noinputenc', 'nocaptions', 'utf8', and
+% 'utf8x'.
+%
+% * Don't define \prefacename and friends but include vncaps.tex (if
+% 'nocaptions' isn't set).
+%
+% 1.1 2005/05/22
+%
+% * Simplify logic for 'utf8' and 'utf8x' options.
+%
+% * Add copyright message and history.
+%
+% * Use \endlinechar to avoid '%' at end of line.
+%
+% * Fix package message.
+%
+% * Some other minor clean-up.
+%
+% 1.2 2006/10/18
+%
+% * Add option varioref.
+%
+% vntex 1.0 2009/03/14
+%
+% * Add vntex.sty.
+%
+%<*dtx>
+\newlinechar=`^^J
+\message{^^J^^JThis file currently doesn't contain any documantation.}
+\message{See 'vntex.tex' instead.^^J^^J}
+\csname stop\endcsname\end
+%</dtx>
+% \begin{macrocode}
+%%
+%<vietnam>%% File 'vietnam.sty', generated from vntex.dtx'.
+%<vntex>%% File 'vntex.sty', generated from 'vntex.dtx'.
+%%
+%% Copyright 2000-2005 Werner Lemberg <WL@gnu.org> and
+%% Han The Thanh <HanTheThanh@gmail.com>.
+%%
+%% This file is part of vntex.
+%%
+%% This work may be distributed and/or modified under the conditions
+%% of the LaTeX Project Public License, either version 1.3 of this
+%% license or (at your option) any later version.
+%%
+%% The latest version of this license is
+%%
+%% http://www.latex-project.org/lppl.txt
+%%
+%% The current maintainers are Werner Lemberg, Han The Thanh, and
+%% Reinhard Kotucha.
+%%
+%<vntex>%% vntex.sty is a variant of 'vietnam.sty' which is using UTF-8
+%<vntex>%% as the default input encoding.
+%<vntex>%% vntex.sty had been proposed by Huynh Ky Anh <xKyAnh@gmail.com>.
+%<vntex>%%
+%<vietnam>\ProvidesPackage{vietnam}[2006/10/18 v1.2 support for Vietnamese]
+%<vntex>\ProvidesPackage{vntex}[2009/03/14 v1.0 support for Vietnamese]
+%<vntex|vietnam>
+\RequirePackage{ifthen}
+
+\newboolean{optenc}
+\newboolean{noinputenc}
+\newboolean{nocaptions}
+\newboolean{vnutf8}
+\newboolean{varioref}
+
+\DeclareOption{viscii}
+ {\PassOptionsToPackage{viscii}{inputenc}
+ \setboolean{optenc}{true}}
+\DeclareOption{tcvn}
+ {\PassOptionsToPackage{tcvn}{inputenc}
+ \setboolean{optenc}{true}}
+\DeclareOption{vps}
+ {\PassOptionsToPackage{vps}{inputenc}
+ \setboolean{optenc}{true}}
+\DeclareOption{mviscii}
+ {\PassOptionsToPackage{mviscii}{inputenc}
+ \setboolean{optenc}{true}}
+\DeclareOption{noinputenc}
+ {\setboolean{noinputenc}{true}}
+\DeclareOption{nocaptions}
+ {\setboolean{nocaptions}{true}}
+\DeclareOption{utf8}
+ {\PassOptionsToPackage{utf8}{inputenc}
+ \setboolean{optenc}{true}}
+\DeclareOption{utf8x}
+ {\PassOptionsToPackage{utf8x}{inputenc}
+ \setboolean{optenc}{true}
+ \setboolean{vnutf8}{true}}
+\DeclareOption{varioref}{\setboolean{varioref}{true}}
+\DeclareOption{cmap}{\setboolean{cmap}{true}}
+
+\ProcessOptions
+
+\ifthenelse{\boolean{vnutf8}}
+ {\RequirePackage{ucs}}
+ {}
+
+\ifthenelse{\boolean{cmap}}
+ {\RequirePackage{ifpdf}
+ \ifpdf\RequirePackage{cmap}\fi}
+ {}
+
+\RequirePackage[T5]{fontenc}
+
+\ifthenelse{\boolean{varioref}}
+ {\RequirePackage{varioref-vi}}
+ {}
+
+\ifthenelse{\boolean{noinputenc}}
+ {\ifthenelse{\boolean{optenc}}
+%<vietnam> {\PackageWarning{vietnam}
+%<vntex> {\PackageWarning{vntex}
+ {Selected input encoding is ignored if `noinputenc' is used}}
+ {}}
+ {\ifthenelse{\boolean{optenc}}
+ {}
+%<vietnam> {\PackageWarning{vietnam}
+%<vietnam> {No input encoding specified, using VISCII as default}
+%<vietnam> \PassOptionsToPackage{viscii}{inputenc}}
+%<vntex> {\PackageWarning{vntex}
+%<vntex> {No input encoding specified, using UTF-8 as default}
+%<vntex> \PassOptionsToPackage{utf8}{inputenc}}
+ \RequirePackage{inputenc}}
+
+\ifthenelse{\boolean{nocaptions}}
+ {}
+ {\input{vncaps.tex}
+ \AtBeginDocument{\captionsvietnam
+ \datevietnam}}
+
+\frenchspacing
+
+\endinput
+%</package>
+% \end{macrocode}
+\endinput
+%%
+%% End of file 'vntex.dtx'.
diff --git a/Master/texmf-dist/source/generic/vntex/vntex.ins b/Master/texmf-dist/source/generic/vntex/vntex.ins
new file mode 100644
index 00000000000..8732b2c8df2
--- /dev/null
+++ b/Master/texmf-dist/source/generic/vntex/vntex.ins
@@ -0,0 +1,10 @@
+
+\input docstrip
+
+\nopreamble
+\askforoverwritefalse
+
+\generate{\file{vietnam.sty}{\from{vntex.dtx}{vietnam}}}
+\generate{\file{vntex.sty}{\from{vntex.dtx}{vntex}}}
+
+\endbatchfile
diff --git a/Master/texmf-dist/tex/latex/vntex/t5phv.fd b/Master/texmf-dist/tex/latex/vntex/t5phv.fd
index 21254f4896b..4281bba8e5a 100644
--- a/Master/texmf-dist/tex/latex/vntex/t5phv.fd
+++ b/Master/texmf-dist/tex/latex/vntex/t5phv.fd
@@ -11,30 +11,36 @@
\ProvidesFile{t5uhv.fd}
[2005/08/24 Fontinst v1.929 font definitions for T5/phv.]
+\expandafter\ifx\csname Hv@scale\endcsname\relax
+ \let\Hv@@scale\@empty
+\else
+ \edef\Hv@@scale{s*[\csname Hv@scale\endcsname]}%
+\fi
+
\DeclareFontFamily{T5}{phv}{}
\DeclareFontShape{T5}{phv}{m}{n}{
- <-> uhvr8v
+ <-> \Hv@@scale uhvr8v
}{}
\DeclareFontShape{T5}{phv}{m}{sl}{
- <-> uhvro8v
+ <-> \Hv@@scale uhvro8v
}{}
\DeclareFontShape{T5}{phv}{b}{n}{
- <-> uhvb8v
+ <-> \Hv@@scale uhvb8v
}{}
\DeclareFontShape{T5}{phv}{b}{sl}{
- <-> uhvbo8v
+ <-> \Hv@@scale uhvbo8v
}{}
\DeclareFontShape{T5}{phv}{m}{sc}{
- <-> uhvrc8v
+ <-> \Hv@@scale uhvrc8v
}{}
\DeclareFontShape{T5}{phv}{b}{sc}{
- <-> uhvbc8v
+ <-> \Hv@@scale uhvbc8v
}{}
\DeclareFontShape{T5}{phv}{m}{it}{<->ssub * phv/m/sl}{}
diff --git a/Master/texmf-dist/tex/latex/vntex/vietnam.sty b/Master/texmf-dist/tex/latex/vntex/vietnam.sty
index fc840372110..f02d87707db 100644
--- a/Master/texmf-dist/tex/latex/vntex/vietnam.sty
+++ b/Master/texmf-dist/tex/latex/vntex/vietnam.sty
@@ -1,35 +1,22 @@
-%% Copyright 2000-2005 Werner Lemberg <wl@gnu.org> and
-%% 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
%%
-%
-% 1.0 2000/01/27
-%
-% Initial release.
-%
-% post 1.0 ?
-%
-% . Require `ifthen' package.
-% . Don't require `t5' package.
-% . New options `mviscii', `noinputenc', `nocaptions', `utf8', and
-% `utf8x'.
-% . Don't define \prefacename and friends but include vncaps.tex (if
-% `nocaptions' isn't set).
-%
-% 1.1 2005/05/22
-%
-% . Simplify logic for `utf8' and `utf8x' options.
-% . Add copyright message and history.
-% . Use \endlinechar to avoid `%' at end of line.
-% . Fix package message.
-% . Some other minor clean-up.
-%
-% 1.2 2006/10/18
-%
-% . Add option varioref.
-%
-
+%% File 'vietnam.sty', generated from vntex.dtx'.
+%%
+%% Copyright 2000-2005 Werner Lemberg <WL@gnu.org> and
+%% Han The Thanh <HanTheThanh@gmail.com>.
+%%
+%% This file is part of vntex.
+%%
+%% This work may be distributed and/or modified under the conditions
+%% of the LaTeX Project Public License, either version 1.3 of this
+%% license or (at your option) any later version.
+%%
+%% The latest version of this license is
+%%
+%% http://www.latex-project.org/lppl.txt
+%%
+%% The current maintainers are Werner Lemberg, Han The Thanh, and
+%% Reinhard Kotucha.
+%%
\ProvidesPackage{vietnam}[2006/10/18 v1.2 support for Vietnamese]
\RequirePackage{ifthen}
@@ -64,7 +51,7 @@
\setboolean{optenc}{true}
\setboolean{vnutf8}{true}}
\DeclareOption{varioref}{\setboolean{varioref}{true}}
-
+\DeclareOption{cmap}{\setboolean{cmap}{true}}
\ProcessOptions
@@ -72,6 +59,11 @@
{\RequirePackage{ucs}}
{}
+\ifthenelse{\boolean{cmap}}
+ {\RequirePackage{ifpdf}
+ \ifpdf\RequirePackage{cmap}\fi}
+ {}
+
\RequirePackage[T5]{fontenc}
\ifthenelse{\boolean{varioref}}
diff --git a/Master/texmf-dist/tex/latex/vntex/vntex.sty b/Master/texmf-dist/tex/latex/vntex/vntex.sty
new file mode 100644
index 00000000000..4aeb2ab6560
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/vntex/vntex.sty
@@ -0,0 +1,99 @@
+%%
+%% File 'vntex.sty', generated from 'vntex.dtx'.
+%%
+%% Copyright 2000-2005 Werner Lemberg <WL@gnu.org> and
+%% Han The Thanh <HanTheThanh@gmail.com>.
+%%
+%% This file is part of vntex.
+%%
+%% This work may be distributed and/or modified under the conditions
+%% of the LaTeX Project Public License, either version 1.3 of this
+%% license or (at your option) any later version.
+%%
+%% The latest version of this license is
+%%
+%% http://www.latex-project.org/lppl.txt
+%%
+%% The current maintainers are Werner Lemberg, Han The Thanh, and
+%% Reinhard Kotucha.
+%%
+%% vntex.sty is a variant of 'vietnam.sty' which is using UTF-8
+%% as the default input encoding.
+%% vntex.sty had been proposed by Huynh Ky Anh <xKyAnh@gmail.com>.
+%%
+\ProvidesPackage{vntex}[2009/03/14 v1.0 support for Vietnamese]
+
+\RequirePackage{ifthen}
+
+\newboolean{optenc}
+\newboolean{noinputenc}
+\newboolean{nocaptions}
+\newboolean{vnutf8}
+\newboolean{varioref}
+
+\DeclareOption{viscii}
+ {\PassOptionsToPackage{viscii}{inputenc}
+ \setboolean{optenc}{true}}
+\DeclareOption{tcvn}
+ {\PassOptionsToPackage{tcvn}{inputenc}
+ \setboolean{optenc}{true}}
+\DeclareOption{vps}
+ {\PassOptionsToPackage{vps}{inputenc}
+ \setboolean{optenc}{true}}
+\DeclareOption{mviscii}
+ {\PassOptionsToPackage{mviscii}{inputenc}
+ \setboolean{optenc}{true}}
+\DeclareOption{noinputenc}
+ {\setboolean{noinputenc}{true}}
+\DeclareOption{nocaptions}
+ {\setboolean{nocaptions}{true}}
+\DeclareOption{utf8}
+ {\PassOptionsToPackage{utf8}{inputenc}
+ \setboolean{optenc}{true}}
+\DeclareOption{utf8x}
+ {\PassOptionsToPackage{utf8x}{inputenc}
+ \setboolean{optenc}{true}
+ \setboolean{vnutf8}{true}}
+\DeclareOption{varioref}{\setboolean{varioref}{true}}
+\DeclareOption{cmap}{\setboolean{cmap}{true}}
+
+\ProcessOptions
+
+\ifthenelse{\boolean{vnutf8}}
+ {\RequirePackage{ucs}}
+ {}
+
+\ifthenelse{\boolean{cmap}}
+ {\RequirePackage{ifpdf}
+ \ifpdf\RequirePackage{cmap}\fi}
+ {}
+
+\RequirePackage[T5]{fontenc}
+
+\ifthenelse{\boolean{varioref}}
+ {\RequirePackage{varioref-vi}}
+ {}
+
+\ifthenelse{\boolean{noinputenc}}
+ {\ifthenelse{\boolean{optenc}}
+ {\PackageWarning{vntex}
+ {Selected input encoding is ignored if `noinputenc' is used}}
+ {}}
+ {\ifthenelse{\boolean{optenc}}
+ {}
+ {\PackageWarning{vntex}
+ {No input encoding specified, using UTF-8 as default}
+ \PassOptionsToPackage{utf8}{inputenc}}
+ \RequirePackage{inputenc}}
+
+\ifthenelse{\boolean{nocaptions}}
+ {}
+ {\input{vncaps.tex}
+ \AtBeginDocument{\captionsvietnam
+ \datevietnam}}
+
+\frenchspacing
+
+\endinput
+%%
+%% End of file `vntex.sty'.