update vntex.

git-svn-id: svn://tug.org/texlive/trunk@2546 c570f23f-e606-0410-a88d-b1316a301751

30 files changed, 713 insertions, 117 deletions

diff --git a/Master/texmf-dist/tex/latex/vntex/t5ccr.fd b/Master/texmf-dist/tex/latex/vntex/t5ccr.fd
new file mode 100644
index 00000000000..17d723d7c66
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/vntex/t5ccr.fd
@@ -0,0 +1,36 @@
+%Filename: t5ccr.fd
+%Created by: tex mkfont
+%Created using fontinst v1.927
+
+%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
+
+\ProvidesFile{t5ccr.fd}
+   [2006/08/02 Fontinst v1.927 font definitions for T5/ccr.]
+
+\DeclareFontFamily{T5}{ccr}{}
+
+\DeclareFontShape{T5}{ccr}{m}{n}{
+   <-> vnccr10
+}{}
+
+\DeclareFontShape{T5}{ccr}{m}{sl}{
+   <-> vnccsl10
+}{}
+
+\DeclareFontShape{T5}{ccr}{m}{it}{
+   <-> vnccti10
+}{}
+
+\DeclareFontShape{T5}{ccr}{m}{sc}{
+   <-> vncccsc10
+}{}
+
+
+\DeclareFontShape{T5}{ccr}{bx}{n} {<-> ssub * cmr/bx/n}{}
+\DeclareFontShape{T5}{ccr}{bx}{sl}{<-> ssub * cmr/bx/sl}{}
+\DeclareFontShape{T5}{ccr}{bx}{it}{<-> ssub * cmr/bx/it}{}
+\DeclareFontShape{T5}{ccr}{sbc}{n} {<-> ssub * cmss/sbc/n}{}
+\DeclareFontShape{T5}{ccr}{sbc}{sl}{<-> ssub * cmss/sbc/n}{}
+\DeclareFontShape{T5}{ccr}{sbc}{it}{<-> ssub * cmss/sbc/n}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/vntex/t5cmbr.fd b/Master/texmf-dist/tex/latex/vntex/t5cmbr.fd
new file mode 100644
index 00000000000..17f3fa632ac
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/vntex/t5cmbr.fd
@@ -0,0 +1,29 @@
+% this file t5cmbr.fd was derived from ot1cmbr.fd by Thanh
+\ProvidesFile{t5cmbr.fd}
+   [2006/08/08 font definitions for T5/cmbr (thanh).]
+
+\DeclareFontFamily{T5}{cmbr}{\hyphenchar\font45}
+
+\DeclareFontShape{T5}{cmbr}{m}{n}{%
+<-8.5>vncmbr8%
+<8.5-9.5>vncmbr9%
+<9.5-15>vncmbr10%
+<15->vncmbr17%
+}{}
+\DeclareFontShape{T5}{cmbr}{m}{sl}{%
+<-8.5>vncmbrsl8%
+<8.5-9.5>vncmbrsl9%
+<9.5-15>vncmbrsl10%
+<15->vncmbrsl17%
+}{}
+\DeclareFontShape{T5}{cmbr}{m}{it}{%
+<->ssub*cmbr/m/sl%
+}{}
+\DeclareFontShape{T5}{cmbr}{b}{n}{%
+<->ssub*cmbr/bx/n%
+}{}
+\DeclareFontShape{T5}{cmbr}{bx}{n}{%
+<->vncmbrbx10%
+}{}
+\endinput
+%% End of file `t5cmbr.fd'.
diff --git a/Master/texmf-dist/tex/latex/vntex/t5cmdh.fd b/Master/texmf-dist/tex/latex/vntex/t5cmdh.fd
index d007c002bf1..9d961946295 100644
--- a/Master/texmf-dist/tex/latex/vntex/t5cmdh.fd
+++ b/Master/texmf-dist/tex/latex/vntex/t5cmdh.fd
@@ -7,6 +7,6 @@
         [1999/05/25 v2.5h Standard LaTeX font definitions]
 \DeclareFontFamily{T5}{cmdh}{\hyphenchar\font45 }
 \DeclareFontShape{T5}{cmdh}{m}{n}{%
-      <10>vndunh10%
+      <->vndunh10%
     }{}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/vntex/t5cmfib.fd b/Master/texmf-dist/tex/latex/vntex/t5cmfib.fd
index ba7f14d3472..914c76b53b7 100644
--- a/Master/texmf-dist/tex/latex/vntex/t5cmfib.fd
+++ b/Master/texmf-dist/tex/latex/vntex/t5cmfib.fd
@@ -7,6 +7,6 @@
         [1999/05/25 v2.5h Standard LaTeX font definitions]
 \DeclareFontFamily{T5}{cmfib}{\hyphenchar\font45 }
 \DeclareFontShape{T5}{cmfib}{m}{n}{%
-      <8>vnfib8%
+      <->vnfib8%
     }{}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/vntex/t5cmfr.fd b/Master/texmf-dist/tex/latex/vntex/t5cmfr.fd
index e0413ac4b27..816d827b24c 100644
--- a/Master/texmf-dist/tex/latex/vntex/t5cmfr.fd
+++ b/Master/texmf-dist/tex/latex/vntex/t5cmfr.fd
@@ -7,9 +7,9 @@
         [1999/05/25 v2.5h Standard LaTeX font definitions]
 \DeclareFontFamily{T5}{cmfr}{\hyphenchar\font45 }
 \DeclareFontShape{T5}{cmfr}{m}{n}{%
-      <10>vnff10%
+      <->vnff10%
     }{}
 \DeclareFontShape{T5}{cmfr}{m}{it}{%
-      <10>vnfi10%
+      <->vnfi10%
     }{}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/vntex/t5cmr.fd b/Master/texmf-dist/tex/latex/vntex/t5cmr.fd
index 58075f6a479..65b1679104d 100644
--- a/Master/texmf-dist/tex/latex/vntex/t5cmr.fd
+++ b/Master/texmf-dist/tex/latex/vntex/t5cmr.fd
@@ -7,56 +7,37 @@
         [1999/05/25 v2.5h Standard LaTeX font definitions]
 \DeclareFontFamily{T5}{cmr}{\hyphenchar\font45 }
 \DeclareFontShape{T5}{cmr}{m}{n}%
-     {<5><6><7><8><9><10><12>gen*vnr%
-      <10.95>vnr10%
-      <14.4>vnr12%
-      <17.28><20.74><24.88>vnr17}{}
+     {<-5.5>    vnr5     <5.5-6.5> vnr6
+      <6.5-7.5> vnr7     <7.5-8.5> vnr8
+      <8.5-9.5> vnr9     <9.5-11>  vnr10
+      <11-15>   vnr12
+      <15-> vnr17
+      }{}
 \DeclareFontShape{T5}{cmr}{m}{sl}%
-     {%
-      <5><6><7>vnsl8%
-      <8><9>gen*vnsl%
-      <10><10.95>vnsl10%
-      <12><14.4><17.28><20.74><24.88>vnsl12%
+     {<-8.5>    vnsl8    <8.5-9.5> vnsl9
+      <9.5-11>  vnsl10   <11->   vnsl12
       }{}
 \DeclareFontShape{T5}{cmr}{m}{it}%
-     {%
-      <5><6><7>vnti7%
-      <8>vnti8%
-      <9>vnti9%
-      <10><10.95>vnti10%
-      <12><14.4><17.28><20.74><24.88>vnti12%
+     {<-7.5>    vnti7
+      <7.5-8.5> vnti8    <8.5-9.5> vnti9
+      <9.5-11>  vnti10   <11->   vnti12
       }{}
 \DeclareFontShape{T5}{cmr}{m}{sc}%
-     {%
-      <5><6><7><8><9><10><10.95><12>%
-      <14.4><17.28><20.74><24.88>vncsc10%
-      }{}
+     {<-> vncsc10}{}
 \DeclareFontShape{T5}{cmr}{m}{ui}
-   {%
-      <5><6><7><8><9><10><10.95><12>%
-      <14.4><17.28><20.74><24.88>vnu10%
-      }{}
+     {<-> vnu10}{}
 \DeclareFontShape{T5}{cmr}{b}{n}
-     {%
-      <5><6><7><8><9><10><10.95><12>%
-      <14.4><17.28><20.74><24.88>vnb10%
-      }{}
+     {<-> vnb10}{}
 \DeclareFontShape{T5}{cmr}{bx}{n}
-   {%
-      <5><6><7><8><9>gen*vnbx%
-      <10><10.95>vnbx10%
-      <12><14.4><17.28><20.74><24.88>vnbx12%
+     {<-5.5>   vnbx5      <5.5-6.5> vnbx6
+      <6.5-7.5> vnbx7      <7.5-8.5> vnbx8
+      <8.5-9.5> vnbx9      <9.5-11>  vnbx10
+      <11->   vnbx12
       }{}
 \DeclareFontShape{T5}{cmr}{bx}{sl}
-      {%
-      <5><6><7><8><9>%
-      <10><10.95><12><14.4><17.28><20.74><24.88>vnbxsl10%
-      }{}
+     {<-> vnbxsl10}{}
 \DeclareFontShape{T5}{cmr}{bx}{it}
-      {%
-      <5><6><7><8><9>%
-      <10><10.95><12><14.4><17.28><20.74><24.88>vnbxti10%
-      }{}
+     {<-> vnbxti10}{}
 \DeclareFontShape{T5}{cmr}{bx}{ui}
       {<->sub*cmr/m/ui}{}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/vntex/t5cmss.fd b/Master/texmf-dist/tex/latex/vntex/t5cmss.fd
index 7ce93a449a8..f2132570b3c 100644
--- a/Master/texmf-dist/tex/latex/vntex/t5cmss.fd
+++ b/Master/texmf-dist/tex/latex/vntex/t5cmss.fd
@@ -7,37 +7,25 @@
         [1999/05/25 v2.5h Standard LaTeX font definitions]
 \DeclareFontFamily{T5}{cmss}{\hyphenchar\font45 }
 \DeclareFontShape{T5}{cmss}{m}{n}
-     {%
-      <5><6><7><8>vnss8%
-      <9>vnss9%
-      <10><10.95>vnss10%
-      <12><14.4>vnss12%
-      <17.28><20.74><24.88>vnss17%
+     {<-8.5> vnss8
+      <8.5-9.5> vnss9      <9.5-11>  vnss10
+      <11-15.5> vnss12     <15.5-> vnss17
       }{}
 \DeclareFontShape{T5}{cmss}{m}{it}
       {<->sub*cmss/m/sl}{}
 \DeclareFontShape{T5}{cmss}{m}{sl}
-    {%
-      <5><6><7><8>vnssi8<9>cmssi9%
-      <10><10.95>vnssi10%
-      <12><14.4>vnssi12%
-      <17.28><20.74><24.88>vnssi17%
+     {<-8.5> vnssi8
+      <8.5-9.5> vnssi9      <9.5-11>  vnssi10
+      <11-15.5> vnssi12     <15.5-> vnssi17
       }{}
 \DeclareFontShape{T5}{cmss}{m}{sc}
        {<->sub*cmr/m/sc}{}
 \DeclareFontShape{T5}{cmss}{m}{ui}
        {<->sub*cmr/m/ui}{}
 \DeclareFontShape{T5}{cmss}{sbc}{n}
-     {%
-      <5><6><7><8><9>vnssdc10%
-       <10><10.95><12><14.4><17.28><20.74><24.88>vnssdc10%
-       }{}
-
+    {<-> vnssdc10}{}
 \DeclareFontShape{T5}{cmss}{bx}{n}
-     {%
-      <5><6><7><8><9>vnssbx10%
-      <10><10.95><12><14.4><17.28><20.74><24.88>vnssbx10%
-      }{}
+    {<-> vnssbx10}{}
 \DeclareFontShape{T5}{cmss}{bx}{ui}
        {<->sub*cmr/bx/ui}{}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/vntex/t5cmssq.fd b/Master/texmf-dist/tex/latex/vntex/t5cmssq.fd
index f9fb79bc936..6135bf288c4 100644
--- a/Master/texmf-dist/tex/latex/vntex/t5cmssq.fd
+++ b/Master/texmf-dist/tex/latex/vntex/t5cmssq.fd
@@ -7,10 +7,10 @@
         [1999/05/25 v2.5h Standard LaTeX font definitions]
 \DeclareFontFamily{T5}{cmssq}{\hyphenchar\font45 }
 \DeclareFontShape{T5}{cmssq}{m}{n}{%
-      <8>vnssq8%
+      <->vnssq8%
     }{}
 \DeclareFontShape{T5}{cmssq}{m}{sl}{%
-      <8>vnssqi8%
+      <->vnssqi8%
     }{}
 \endinput
 
diff --git a/Master/texmf-dist/tex/latex/vntex/t5cmtl.fd b/Master/texmf-dist/tex/latex/vntex/t5cmtl.fd
new file mode 100644
index 00000000000..dde8ebb1808
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/vntex/t5cmtl.fd
@@ -0,0 +1,15 @@
+% this file t5cmtl.fd was derived from ot1cmtl.fd by Thanh
+\ProvidesFile{t5cmtl.fd}
+   [2006/08/08 font definitions for T5/cmtl (thanh).]
+
+\DeclareFontFamily{T5}{cmtl}{\hyphenchar\font\m@ne}
+
+\DeclareFontShape{T5}{cmtl}{m}{n}{%
+<->vncmtl10%
+}{}
+\DeclareFontShape{T5}{cmtl}{m}{sl}{%
+<->vncmsltl10%
+}{}
+\DeclareFontShape{T5}{cmtl}{m}{it}{<->ssub*cmtl/m/sl}{}
+\endinput
+%% End of file `t5cmtl.fd'.
diff --git a/Master/texmf-dist/tex/latex/vntex/t5cmtt.fd b/Master/texmf-dist/tex/latex/vntex/t5cmtt.fd
index 3d3621d20ef..e9c3f226c49 100644
--- a/Master/texmf-dist/tex/latex/vntex/t5cmtt.fd
+++ b/Master/texmf-dist/tex/latex/vntex/t5cmtt.fd
@@ -7,26 +7,15 @@
         [1999/05/25 v2.5h Standard LaTeX font definitions]
 \DeclareFontFamily{T5}{cmtt}{\hyphenchar \font\m@ne}
 \DeclareFontShape{T5}{cmtt}{m}{n}
-     {%
-      <5><6><7><8>vntt8<9>cmtt9%
-      <10><10.95>vntt10%
-      <12><14.4><17.28><20.74><24.88>vntt12%
+     {<-8.5>   vntt8     <8.5-9.5> vntt9
+      <9.5-11> vntt10    <11->     vntt12
       }{}
 \DeclareFontShape{T5}{cmtt}{m}{it}
-     {%
-      <5><6><7><8><9>%
-      <10><10.95><12><14.4><17.28><20.74><24.88>vnitt10%
-      }{}
+    {<-> vnitt10}{}
 \DeclareFontShape{T5}{cmtt}{m}{sl}
-     {%
-      <5><6><7><8><9>%
-      <10><10.95><12><14.4><17.28><20.74><24.88>vnsltt10%
-      }{}
+    {<-> vnsltt10}{}
 \DeclareFontShape{T5}{cmtt}{m}{sc}
-     {%
-      <5><6><7><8><9>%
-      <10><10.95><12><14.4><17.28><20.74><24.88>vntcsc10%
-      }{}
+    {<-> vntcsc10}{}
 \DeclareFontShape{T5}{cmtt}{m}{ui}
   {<->ssub*cmtt/m/it}{}
 \DeclareFontShape{T5}{cmtt}{bx}{n}
diff --git a/Master/texmf-dist/tex/latex/vntex/t5cmvtt.fd b/Master/texmf-dist/tex/latex/vntex/t5cmvtt.fd
index 62df9bb0f78..ea75c6519b6 100644
--- a/Master/texmf-dist/tex/latex/vntex/t5cmvtt.fd
+++ b/Master/texmf-dist/tex/latex/vntex/t5cmvtt.fd
@@ -7,13 +7,5 @@
         [1999/05/25 v2.5h Standard LaTeX font definitions]
 \DeclareFontFamily{T5}{cmvtt}{\hyphenchar\font45 }
 \DeclareFontShape{T5}{cmvtt}{m}{n}%
-     {%
-      <5><6><7><8><9><10><10.95>%
-      <12><14.4><17.28><20.74><24.88>vnvtt10%
-      }{}
-\DeclareFontShape{T5}{cmvtt}{m}{it}%
-     {%
-      <5><6><7><8><9><10><10.95>%
-      <12><14.4><17.28><20.74><24.88>vnvtti10%
-      }{}
+     {<-> vnvtt10}{}
 \endinput
diff --git a/Master/texmf-dist/tex/latex/vntex/t5comic.fd b/Master/texmf-dist/tex/latex/vntex/t5comic.fd
new file mode 100644
index 00000000000..e5697797b29
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/vntex/t5comic.fd
@@ -0,0 +1,34 @@
+%Filename: t5comic.fd
+%Created by: tex mkfont
+%Created using fontinst v1.927
+
+%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
+
+\ProvidesFile{t5comic.fd}
+   [2006/08/02 Fontinst v1.927 font definitions for T5/comic.]
+
+\DeclareFontFamily{T5}{comic}{}
+
+\DeclareFontShape{T5}{comic}{m}{n}{
+   <-> comic8v
+}{}
+
+\DeclareFontShape{T5}{comic}{b}{n}{
+   <-> comicbd8v
+}{}
+
+\DeclareFontShape{T5}{comic}{m}{sl}{
+   <-> comico8v
+}{}
+
+\DeclareFontShape{T5}{comic}{b}{sl}{
+   <-> comicbdo8v
+}{}
+
+\DeclareFontShape{T5}{comic}{bx}{n}{<->ssub * comic/b/n}{}
+\DeclareFontShape{T5}{comic}{m}{it}{<->ssub * comic/m/sl}{}
+\DeclareFontShape{T5}{comic}{bx}{sl}{<->ssub * comic/b/sl}{}
+\DeclareFontShape{T5}{comic}{b}{it}{<->ssub * comic/b/sl}{}
+\DeclareFontShape{T5}{comic}{bx}{it}{<->ssub * comic/b/it}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/vntex/t5enc.def b/Master/texmf-dist/tex/latex/vntex/t5enc.def
index de9741b5595..28f6443bf66 100644
--- a/Master/texmf-dist/tex/latex/vntex/t5enc.def
+++ b/Master/texmf-dist/tex/latex/vntex/t5enc.def
@@ -1,4 +1,4 @@
-% Copyright 2000-2005 Werner Lemberg <wl@gnu.org> and
+% Copyright 2000-2006 Werner Lemberg <wl@gnu.org> and
 %                     Vladimir Volovich <vvv@vsu.ru>.
 % This file is part of vntex.  License: LPPL, version 1.3 or newer,
 % according to http://www.latex-project.org/lppl.txt
@@ -36,8 +36,24 @@
 %   1.3  2005/04/21
 %
 %     Add copyright.
+%
+%   1.4  2006/11/21
+%
+%     Fix definition of \d.  Update definitions of \b and \c.
+
+\ProvidesFile{t5enc.def}[2006/11/21 v1.4 Vietnamese T5 encoding]
+
+
+% This temporary definition will vanish as soon as t5enc.def
+% will become part of the LaTeX kernel.
+%\@ifundefined{ltx@sh@ft}{%
+  \def\ltx@sh@ft#1{%
+    \dimen@ #1%
+    \kern \strip@pt
+      \fontdimen1\font \dimen@
+  }%
+%}{}
 
-\ProvidesFile{t5enc.def}[2005/04/21 v1.3 Vietnamese T5 encoding]
 
 \DeclareFontEncoding{T5}{%
   % this (taken from t5code.tex) is needed for use with TCX instead of
@@ -65,7 +81,6 @@
 \DeclareTextAccent{\^}{T5}{2}                       % circumflex
 \DeclareTextAccent{\~}{T5}{3}                       % tilde
 \DeclareTextAccent{\"}{T5}{4}                       % dieresis
-\DeclareTextAccent{\d}{T5}{5}                       % dotbelow
 \DeclareTextAccent{\r}{T5}{6}                       % ring
 \DeclareTextAccent{\v}{T5}{7}                       % caron
 \DeclareTextAccent{\u}{T5}{8}                       % breve
@@ -73,13 +88,16 @@
 \DeclareTextAccent{\.}{T5}{10}                      % dotaccent
 
 \DeclareTextCommand{\b}{T5}[1]
-  {{\o@lign{\relax#1\crcr\hidewidth\sh@ft{29}%
-    \vbox to.2ex{\hbox{\char9}\vss}\hidewidth}}}
+  {\hmode@bgroup\o@lign{\relax#1\crcr\hidewidth\ltx@sh@ft{-3ex}%
+    \vbox to.2ex{\hbox{\char9}\vss}\hidewidth}\egroup}
 
 \DeclareTextCommand{\c}{T5}[1]
   {\leavevmode\setbox\z@\hbox{#1}\ifdim\ht\z@=1ex\accent11 #1%
-    \else{\ooalign{\hidewidth\char11\hidewidth
-      \crcr\unhbox\z@}}\fi}
+    \else{\ooalign{\unhbox\z@\crcr\hidewidth\char11\hidewidth}}\fi}
+
+\DeclareTextCommand{\d}{T5}[1]
+   {\hmode@bgroup\o@lign{\relax#1\crcr\hidewidth\ltx@sh@ft{-1ex}.%
+     \hidewidth}\egroup}
 
 % Vietnamese hook accent
 \DeclareTextAccent{\h}{T5}{12}
diff --git a/Master/texmf-dist/tex/latex/vntex/t5enc.dfu b/Master/texmf-dist/tex/latex/vntex/t5enc.dfu
index 37802072863..40cc9dbf431 100644
--- a/Master/texmf-dist/tex/latex/vntex/t5enc.dfu
+++ b/Master/texmf-dist/tex/latex/vntex/t5enc.dfu
@@ -13,46 +13,52 @@
 %   1.0  2005/04/21
 %
 %     Initial release.
+%
+%   1.1  2006/08/19
+%
+%     Use \ACIRCUMFLEX and friends only if there are additional diacritics.
+%     Reported by Will Robertson.  Note that T5 encoding (and thus
+%     t5enc.dfu) will become part of the base LaTeX distribution.
 
-\ProvidesFile{t5enc.dfu}[2005/04/21 v1.0 UTF8 support for Vietnamese]
+\ProvidesFile{t5enc.dfu}[2006/08/19 v1.1 UTF8 support for Vietnamese]
 
 \DeclareUnicodeCharacter{00AB}{\guillemotleft}			% LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
 \DeclareUnicodeCharacter{00BB}{\guillemotright}			% RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
 
 \DeclareUnicodeCharacter{00C0}{\@tabacckludge`A}		% LATIN CAPITAL LETTER A WITH GRAVE
 \DeclareUnicodeCharacter{00C1}{\@tabacckludge'A}		% LATIN CAPITAL LETTER A WITH ACUTE
-\DeclareUnicodeCharacter{00C2}{\ACIRCUMFLEX}			% LATIN CAPITAL LETTER A WITH CIRCUMFLEX
+\DeclareUnicodeCharacter{00C2}{\^A}				% LATIN CAPITAL LETTER A WITH CIRCUMFLEX
 \DeclareUnicodeCharacter{00C3}{\~A}				% LATIN CAPITAL LETTER A WITH TILDE
 \DeclareUnicodeCharacter{00C8}{\@tabacckludge`E}		% LATIN CAPITAL LETTER E WITH GRAVE
 \DeclareUnicodeCharacter{00C9}{\@tabacckludge'E}		% LATIN CAPITAL LETTER E WITH ACUTE
-\DeclareUnicodeCharacter{00CA}{\ECIRCUMFLEX}			% LATIN CAPITAL LETTER E WITH CIRCUMFLEX
+\DeclareUnicodeCharacter{00CA}{\^E}				% LATIN CAPITAL LETTER E WITH CIRCUMFLEX
 \DeclareUnicodeCharacter{00CC}{\@tabacckludge`I}		% LATIN CAPITAL LETTER I WITH GRAVE
 \DeclareUnicodeCharacter{00CD}{\@tabacckludge'I}		% LATIN CAPITAL LETTER I WITH ACUTE
 \DeclareUnicodeCharacter{00D2}{\@tabacckludge`O}		% LATIN CAPITAL LETTER O WITH GRAVE
 \DeclareUnicodeCharacter{00D3}{\@tabacckludge'O}		% LATIN CAPITAL LETTER O WITH ACUTE
-\DeclareUnicodeCharacter{00D4}{\OCIRCUMFLEX}			% LATIN CAPITAL LETTER O WITH CIRCUMFLEX
+\DeclareUnicodeCharacter{00D4}{\^O}				% LATIN CAPITAL LETTER O WITH CIRCUMFLEX
 \DeclareUnicodeCharacter{00D5}{\~O}				% LATIN CAPITAL LETTER O WITH TILDE
 \DeclareUnicodeCharacter{00D9}{\@tabacckludge`U}		% LATIN CAPITAL LETTER U WITH GRAVE
 \DeclareUnicodeCharacter{00DA}{\@tabacckludge'U}		% LATIN CAPITAL LETTER U WITH ACUTE
 \DeclareUnicodeCharacter{00DD}{\@tabacckludge'Y}		% LATIN CAPITAL LETTER Y WITH ACUTE
 \DeclareUnicodeCharacter{00E0}{\@tabacckludge`a}		% LATIN SMALL LETTER A WITH GRAVE
 \DeclareUnicodeCharacter{00E1}{\@tabacckludge'a}		% LATIN SMALL LETTER A WITH ACUTE
-\DeclareUnicodeCharacter{00E2}{\acircumflex}			% LATIN SMALL LETTER A WITH CIRCUMFLEX
+\DeclareUnicodeCharacter{00E2}{\^a}				% LATIN SMALL LETTER A WITH CIRCUMFLEX
 \DeclareUnicodeCharacter{00E3}{\~a}				% LATIN SMALL LETTER A WITH TILDE
 \DeclareUnicodeCharacter{00E8}{\@tabacckludge`e}		% LATIN SMALL LETTER E WITH GRAVE
 \DeclareUnicodeCharacter{00E9}{\@tabacckludge'e}		% LATIN SMALL LETTER E WITH ACUTE
-\DeclareUnicodeCharacter{00EA}{\ecircumflex}			% LATIN SMALL LETTER E WITH CIRCUMFLEX
+\DeclareUnicodeCharacter{00EA}{\^e}				% LATIN SMALL LETTER E WITH CIRCUMFLEX
 \DeclareUnicodeCharacter{00EC}{\@tabacckludge`\i}		% LATIN SMALL LETTER I WITH GRAVE
 \DeclareUnicodeCharacter{00ED}{\@tabacckludge'\i}		% LATIN SMALL LETTER I WITH ACUTE
 \DeclareUnicodeCharacter{00F2}{\@tabacckludge`o}		% LATIN SMALL LETTER O WITH GRAVE
 \DeclareUnicodeCharacter{00F3}{\@tabacckludge'o}		% LATIN SMALL LETTER O WITH ACUTE
-\DeclareUnicodeCharacter{00F4}{\ocircumflex}			% LATIN SMALL LETTER O WITH CIRCUMFLEX
+\DeclareUnicodeCharacter{00F4}{\^o}				% LATIN SMALL LETTER O WITH CIRCUMFLEX
 \DeclareUnicodeCharacter{00F5}{\~o}				% LATIN SMALL LETTER O WITH TILDE
 \DeclareUnicodeCharacter{00F9}{\@tabacckludge`u}		% LATIN SMALL LETTER U WITH GRAVE
 \DeclareUnicodeCharacter{00FA}{\@tabacckludge'u}		% LATIN SMALL LETTER U WITH ACUTE
 \DeclareUnicodeCharacter{00FD}{\@tabacckludge'y}		% LATIN SMALL LETTER Y WITH ACUTE
-\DeclareUnicodeCharacter{0102}{\ABREVE}				% LATIN CAPITAL LETTER A WITH BREVE
-\DeclareUnicodeCharacter{0103}{\abreve}				% LATIN SMALL LETTER A WITH BREVE
+\DeclareUnicodeCharacter{0102}{\u A}				% LATIN CAPITAL LETTER A WITH BREVE
+\DeclareUnicodeCharacter{0103}{\u a}				% LATIN SMALL LETTER A WITH BREVE
 \DeclareUnicodeCharacter{0110}{\DJ}				% LATIN CAPITAL LETTER D WITH STROKE
 \DeclareUnicodeCharacter{0111}{\dj}				% LATIN SMALL LETTER D WITH STROKE
 \DeclareUnicodeCharacter{0128}{\~I}				% LATIN CAPITAL LETTER I WITH TILDE
diff --git a/Master/texmf-dist/tex/latex/vntex/t5fav.fd b/Master/texmf-dist/tex/latex/vntex/t5fav.fd
new file mode 100644
index 00000000000..da0d829c43a
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/vntex/t5fav.fd
@@ -0,0 +1,34 @@
+%Filename: t5fav.fd
+%Created by: tex mkfont
+%Created using fontinst v1.927
+
+%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
+
+\ProvidesFile{t5fav.fd}
+   [2006/08/02 Fontinst v1.927 font definitions for T5/fav.]
+
+\DeclareFontFamily{T5}{fav}{}
+
+\DeclareFontShape{T5}{fav}{m}{n}{
+   <-> favr8v
+}{}
+
+\DeclareFontShape{T5}{fav}{m}{it}{
+   <-> favri8v
+}{}
+
+\DeclareFontShape{T5}{fav}{b}{n}{
+   <-> favb8v
+}{}
+
+\DeclareFontShape{T5}{fav}{b}{it}{
+   <-> favbi8v
+}{}
+
+\DeclareFontShape{T5}{fav}{m}{sl}{<->ssub * fav/m/it}{}
+\DeclareFontShape{T5}{fav}{bx}{n}{<->ssub * fav/b/n}{}
+\DeclareFontShape{T5}{fav}{bx}{it}{<->ssub * fav/b/it}{}
+\DeclareFontShape{T5}{fav}{b}{sl}{<->ssub * fav/b/it}{}
+\DeclareFontShape{T5}{fav}{bx}{sl}{<->ssub * fav/b/sl}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/vntex/t5fnc.fd b/Master/texmf-dist/tex/latex/vntex/t5fnc.fd
new file mode 100644
index 00000000000..bad7ab1870e
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/vntex/t5fnc.fd
@@ -0,0 +1,20 @@
+% this file was derived from t5unc.fd by Thanh
+\ProvidesFile{t5fnc.fd}
+   [2006/07/24 font definitions for T5/fnc (thanh).]
+
+\DeclareFontFamily{T5}{fnc}{}
+
+\DeclareFontShape{T5}{fnc}{m}{n}{ <-> ssub * unc/m/n}{}
+\DeclareFontShape{T5}{fnc}{m}{it}{ <-> ssub * unc/m/it}{}
+\DeclareFontShape{T5}{fnc}{m}{sl}{ <-> ssub * unc/m/sl}{}
+\DeclareFontShape{T5}{fnc}{b}{n}{ <-> ssub * unc/b/n}{}
+\DeclareFontShape{T5}{fnc}{b}{it}{ <-> ssub * unc/b/it}{}
+\DeclareFontShape{T5}{fnc}{b}{sl}{ <-> ssub * unc/b/sl}{}
+\DeclareFontShape{T5}{fnc}{m}{sc}{ <-> ssub * unc/m/sc}{}
+\DeclareFontShape{T5}{fnc}{b}{sc}{ <-> ssub * unc/b/sc}{}
+\DeclareFontShape{T5}{fnc}{bx}{n}{ <-> ssub * unc/bx/n}{}
+\DeclareFontShape{T5}{fnc}{bx}{it}{ <-> ssub * unc/bx/it}{}
+\DeclareFontShape{T5}{fnc}{bx}{sl}{ <-> ssub * unc/bx/sl}{}
+\DeclareFontShape{T5}{fnc}{bx}{sc}{ <-> ssub * unc/bx/sc}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/vntex/t5futs.fd b/Master/texmf-dist/tex/latex/vntex/t5futs.fd
new file mode 100644
index 00000000000..68945273c84
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/vntex/t5futs.fd
@@ -0,0 +1,44 @@
+% this file was derived from t5put.fd by Thanh
+\ProvidesFile{t5futs.fd}
+   [2006/07/24 font definitions for T5/futs (thanh).]
+
+\DeclareFontFamily{T5}{futs}{}
+
+\DeclareFontShape{T5}{futs}{m}{n}{
+   <-> putr8v
+}{}
+
+\DeclareFontShape{T5}{futs}{m}{it}{
+   <-> putri8v
+}{}
+
+\DeclareFontShape{T5}{futs}{m}{sl}{
+   <-> putro8v
+}{}
+
+\DeclareFontShape{T5}{futs}{b}{n}{
+   <-> putb8v
+}{}
+
+\DeclareFontShape{T5}{futs}{b}{it}{
+   <-> putbi8v
+}{}
+
+\DeclareFontShape{T5}{futs}{b}{sl}{
+   <-> putbo8v
+}{}
+
+\DeclareFontShape{T5}{futs}{m}{sc}{
+   <-> putrc8v
+}{}
+
+\DeclareFontShape{T5}{futs}{b}{sc}{
+   <-> putbc8v
+}{}
+
+\DeclareFontShape{T5}{futs}{bx}{n}{<->ssub * futs/b/n}{}
+\DeclareFontShape{T5}{futs}{bx}{it}{<->ssub * futs/b/it}{}
+\DeclareFontShape{T5}{futs}{bx}{sl}{<->ssub * futs/b/sl}{}
+\DeclareFontShape{T5}{futs}{bx}{sc}{<->ssub * futs/b/sc}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/vntex/t5mak.fd b/Master/texmf-dist/tex/latex/vntex/t5mak.fd
new file mode 100644
index 00000000000..a2583b4c0ad
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/vntex/t5mak.fd
@@ -0,0 +1,52 @@
+% this file was derived from t5ubk.fd by Thanh
+\ProvidesFile{t5mak.fd}
+   [2006/07/24 font definitions for T5/mak (thanh).]
+
+\DeclareFontFamily{T5}{mak}{}
+
+\DeclareFontShape{T5}{mak}{l}{n}{
+   <-> s * [0.9] ubkl8v
+}{}
+
+\DeclareFontShape{T5}{mak}{l}{it}{
+   <-> s * [0.9] ubkli8v
+}{}
+
+\DeclareFontShape{T5}{mak}{l}{sl}{
+   <-> s * [0.9] ubklo8v
+}{}
+
+\DeclareFontShape{T5}{mak}{db}{n}{
+   <-> s * [0.9] ubkd8v
+}{}
+
+\DeclareFontShape{T5}{mak}{db}{it}{
+   <-> s * [0.9] ubkdi8v
+}{}
+
+\DeclareFontShape{T5}{mak}{db}{sl}{
+   <-> s * [0.9] ubkdo8v
+}{}
+
+\DeclareFontShape{T5}{mak}{l}{sc}{
+   <-> s * [0.9] ubklc8v
+}{}
+
+\DeclareFontShape{T5}{mak}{db}{sc}{
+   <-> s * [0.9] ubkdc8v
+}{}
+
+\DeclareFontShape{T5}{mak}{m}{n}{<->ssub * mak/l/n}{}
+\DeclareFontShape{T5}{mak}{m}{it}{<->ssub * mak/l/it}{}
+\DeclareFontShape{T5}{mak}{m}{sl}{<->ssub * mak/l/sl}{}
+\DeclareFontShape{T5}{mak}{b}{n}{<->ssub * mak/db/n}{}
+\DeclareFontShape{T5}{mak}{bx}{n}{<->ssub * mak/b/n}{}
+\DeclareFontShape{T5}{mak}{b}{it}{<->ssub * mak/db/it}{}
+\DeclareFontShape{T5}{mak}{bx}{it}{<->ssub * mak/b/it}{}
+\DeclareFontShape{T5}{mak}{b}{sl}{<->ssub * mak/db/sl}{}
+\DeclareFontShape{T5}{mak}{bx}{sl}{<->ssub * mak/b/sl}{}
+\DeclareFontShape{T5}{mak}{m}{sc}{<->ssub * mak/l/sc}{}
+\DeclareFontShape{T5}{mak}{b}{sc}{<->ssub * mak/db/sc}{}
+\DeclareFontShape{T5}{mak}{bx}{sc}{<->ssub * mak/b/sc}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/vntex/t5mdbch.fd b/Master/texmf-dist/tex/latex/vntex/t5mdbch.fd
new file mode 100644
index 00000000000..71f8aaad87e
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/vntex/t5mdbch.fd
@@ -0,0 +1,44 @@
+% this file was derived from t5bch.fd by Thanh
+\ProvidesFile{t5mdbch.fd}
+   [2006/07/24 font definitions for T5/mdbch (thanh).]
+
+\DeclareFontFamily{T5}{mdbch}{}
+
+\DeclareFontShape{T5}{mdbch}{m}{n}{
+   <-> s * [0.96] bchr8v
+}{}
+
+\DeclareFontShape{T5}{mdbch}{m}{it}{
+   <-> s * [0.96] bchri8v
+}{}
+
+\DeclareFontShape{T5}{mdbch}{m}{sl}{
+   <-> s * [0.96] bchro8v
+}{}
+
+\DeclareFontShape{T5}{mdbch}{b}{n}{
+   <-> s * [0.96] bchb8v
+}{}
+
+\DeclareFontShape{T5}{mdbch}{b}{it}{
+   <-> s * [0.96] bchbi8v
+}{}
+
+\DeclareFontShape{T5}{mdbch}{b}{sl}{
+   <-> s * [0.96] bchbo8v
+}{}
+
+\DeclareFontShape{T5}{mdbch}{m}{sc}{
+   <-> s * [0.96] bchrc8v
+}{}
+
+\DeclareFontShape{T5}{mdbch}{b}{sc}{
+   <-> s * [0.96] bchbc8v
+}{}
+
+\DeclareFontShape{T5}{mdbch}{bx}{n}{<->ssub * mdbch/b/n}{}
+\DeclareFontShape{T5}{mdbch}{bx}{it}{<->ssub * mdbch/b/it}{}
+\DeclareFontShape{T5}{mdbch}{bx}{sl}{<->ssub * mdbch/b/sl}{}
+\DeclareFontShape{T5}{mdbch}{bx}{sc}{<->ssub * mdbch/b/sc}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/vntex/t5mdput.fd b/Master/texmf-dist/tex/latex/vntex/t5mdput.fd
new file mode 100644
index 00000000000..8bbdca2d2d1
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/vntex/t5mdput.fd
@@ -0,0 +1,44 @@
+% this file was derived from t5put.fd by Thanh
+\ProvidesFile{t5mdput.fd}
+   [2006/07/24 font definitions for T5/mdput (thanh).]
+
+\DeclareFontFamily{T5}{mdput}{}
+
+\DeclareFontShape{T5}{mdput}{m}{n}{
+   <-> putr8v
+}{}
+
+\DeclareFontShape{T5}{mdput}{m}{it}{
+   <-> putri8v
+}{}
+
+\DeclareFontShape{T5}{mdput}{m}{sl}{
+   <-> putro8v
+}{}
+
+\DeclareFontShape{T5}{mdput}{b}{n}{
+   <-> putb8v
+}{}
+
+\DeclareFontShape{T5}{mdput}{b}{it}{
+   <-> putbi8v
+}{}
+
+\DeclareFontShape{T5}{mdput}{b}{sl}{
+   <-> putbo8v
+}{}
+
+\DeclareFontShape{T5}{mdput}{m}{sc}{
+   <-> putrc8v
+}{}
+
+\DeclareFontShape{T5}{mdput}{b}{sc}{
+   <-> putbc8v
+}{}
+
+\DeclareFontShape{T5}{mdput}{bx}{n}{<->ssub * mdput/b/n}{}
+\DeclareFontShape{T5}{mdput}{bx}{it}{<->ssub * mdput/b/it}{}
+\DeclareFontShape{T5}{mdput}{bx}{sl}{<->ssub * mdput/b/sl}{}
+\DeclareFontShape{T5}{mdput}{bx}{sc}{<->ssub * mdput/b/sc}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/vntex/t5mdugm.fd b/Master/texmf-dist/tex/latex/vntex/t5mdugm.fd
new file mode 100644
index 00000000000..dd8d4c0de55
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/vntex/t5mdugm.fd
@@ -0,0 +1,44 @@
+% this file was derived from t5ugm.fd by Thanh
+\ProvidesFile{t5mdugm.fd}
+   [2006/07/24 font definitions for T5/mdugm (thanh).]
+
+\DeclareFontFamily{T5}{mdugm}{}
+
+\DeclareFontShape{T5}{mdugm}{m}{n}{
+   <-> ugmr8v
+}{}
+
+\DeclareFontShape{T5}{mdugm}{m}{it}{
+   <-> ugmri8v
+}{}
+
+\DeclareFontShape{T5}{mdugm}{m}{sl}{
+   <-> ugmro8v
+}{}
+
+\DeclareFontShape{T5}{mdugm}{b}{n}{
+   <-> ugmm8v
+}{}
+
+\DeclareFontShape{T5}{mdugm}{b}{it}{
+   <-> ugmmi8v
+}{}
+
+\DeclareFontShape{T5}{mdugm}{b}{sl}{
+   <-> ugmmo8v
+}{}
+
+\DeclareFontShape{T5}{mdugm}{m}{sc}{
+   <-> ugmrc8v
+}{}
+
+\DeclareFontShape{T5}{mdugm}{b}{sc}{
+   <-> ugmmc8v
+}{}
+
+\DeclareFontShape{T5}{mdugm}{bx}{n}{<->ssub * mdugm/b/n}{}
+\DeclareFontShape{T5}{mdugm}{bx}{it}{<->ssub * mdugm/b/it}{}
+\DeclareFontShape{T5}{mdugm}{bx}{sl}{<->ssub * mdugm/b/sl}{}
+\DeclareFontShape{T5}{mdugm}{bx}{sc}{<->ssub * mdugm/b/sc}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/vntex/t5ptmom.fd b/Master/texmf-dist/tex/latex/vntex/t5ptmom.fd
new file mode 100644
index 00000000000..17d0798b6b4
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/vntex/t5ptmom.fd
@@ -0,0 +1,20 @@
+% this file was derived from t5utm.fd by Thanh
+\ProvidesFile{t5ptmom.fd}
+   [2006/07/24 font definitions for T5/ptmom (thanh).]
+
+\DeclareFontFamily{T5}{ptmom}{}
+
+\DeclareFontShape{T5}{ptmom}{m}{n}{ <-> ssub * utm/m/n}{}
+\DeclareFontShape{T5}{ptmom}{m}{it}{ <-> ssub * utm/m/it}{}
+\DeclareFontShape{T5}{ptmom}{m}{sl}{ <-> ssub * utm/m/sl}{}
+\DeclareFontShape{T5}{ptmom}{b}{n}{ <-> ssub * utm/b/n}{}
+\DeclareFontShape{T5}{ptmom}{b}{it}{ <-> ssub * utm/b/it}{}
+\DeclareFontShape{T5}{ptmom}{b}{sl}{ <-> ssub * utm/b/sl}{}
+\DeclareFontShape{T5}{ptmom}{m}{sc}{ <-> ssub * utm/m/sc}{}
+\DeclareFontShape{T5}{ptmom}{b}{sc}{ <-> ssub * utm/b/sc}{}
+\DeclareFontShape{T5}{ptmom}{bx}{n}{ <-> ssub * utm/bx/n}{}
+\DeclareFontShape{T5}{ptmom}{bx}{it}{ <-> ssub * utm/bx/it}{}
+\DeclareFontShape{T5}{ptmom}{bx}{sl}{ <-> ssub * utm/bx/sl}{}
+\DeclareFontShape{T5}{ptmom}{bx}{sc}{ <-> ssub * utm/bx/sc}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/vntex/t5put.fd b/Master/texmf-dist/tex/latex/vntex/t5put.fd
new file mode 100644
index 00000000000..ba8c858376f
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/vntex/t5put.fd
@@ -0,0 +1,49 @@
+%Filename: t5put.fd
+%Created by: tex mkfont
+%Created using fontinst v1.927
+
+%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
+
+\ProvidesFile{t5put.fd}
+   [2006/07/30 Fontinst v1.927 font definitions for T5/put.]
+
+\DeclareFontFamily{T5}{put}{}
+
+\DeclareFontShape{T5}{put}{m}{n}{
+   <-> putr8v
+}{}
+
+\DeclareFontShape{T5}{put}{m}{it}{
+   <-> putri8v
+}{}
+
+\DeclareFontShape{T5}{put}{m}{sl}{
+   <-> putro8v
+}{}
+
+\DeclareFontShape{T5}{put}{b}{n}{
+   <-> putb8v
+}{}
+
+\DeclareFontShape{T5}{put}{b}{it}{
+   <-> putbi8v
+}{}
+
+\DeclareFontShape{T5}{put}{b}{sl}{
+   <-> putbo8v
+}{}
+
+\DeclareFontShape{T5}{put}{m}{sc}{
+   <-> putrc8v
+}{}
+
+\DeclareFontShape{T5}{put}{b}{sc}{
+   <-> putbc8v
+}{}
+
+\DeclareFontShape{T5}{put}{bx}{n}{<->ssub * put/b/n}{}
+\DeclareFontShape{T5}{put}{bx}{it}{<->ssub * put/b/it}{}
+\DeclareFontShape{T5}{put}{bx}{sl}{<->ssub * put/b/sl}{}
+\DeclareFontShape{T5}{put}{bx}{sc}{<->ssub * put/b/sc}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/vntex/t5pxr.fd b/Master/texmf-dist/tex/latex/vntex/t5pxr.fd
new file mode 100644
index 00000000000..d9ee8e439d9
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/vntex/t5pxr.fd
@@ -0,0 +1,21 @@
+% this file was derived from t5ppl.fd by Thanh
+\ProvidesFile{t5pxr.fd}
+   [2006/07/24 font definitions for T5/pxr (thanh).]
+
+
+\DeclareFontFamily{T5}{pxr}{}
+
+\DeclareFontShape{T5}{pxr}{m}{n}{ <-> ssub * ppl/m/n}{}
+\DeclareFontShape{T5}{pxr}{m}{it}{ <-> ssub * ppl/m/it}{}
+\DeclareFontShape{T5}{pxr}{m}{sl}{ <-> ssub * ppl/m/sl}{}
+\DeclareFontShape{T5}{pxr}{b}{n}{ <-> ssub * ppl/b/n}{}
+\DeclareFontShape{T5}{pxr}{b}{it}{ <-> ssub * ppl/b/it}{}
+\DeclareFontShape{T5}{pxr}{b}{sl}{ <-> ssub * ppl/b/sl}{}
+\DeclareFontShape{T5}{pxr}{m}{sc}{ <-> ssub * ppl/m/sc}{}
+\DeclareFontShape{T5}{pxr}{b}{sc}{ <-> ssub * ppl/b/sc}{}
+\DeclareFontShape{T5}{pxr}{bx}{n}{ <-> ssub * ppl/bx/n}{}
+\DeclareFontShape{T5}{pxr}{bx}{it}{ <-> ssub * ppl/bx/it}{}
+\DeclareFontShape{T5}{pxr}{bx}{sl}{ <-> ssub * ppl/bx/sl}{}
+\DeclareFontShape{T5}{pxr}{bx}{sc}{ <-> ssub * ppl/bx/sc}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/vntex/t5txr.fd b/Master/texmf-dist/tex/latex/vntex/t5txr.fd
new file mode 100644
index 00000000000..fddaf105f89
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/vntex/t5txr.fd
@@ -0,0 +1,20 @@
+% this file was derived from t5utm.fd by Thanh
+\ProvidesFile{t5txr.fd}
+   [2006/07/24 font definitions for T5/txr (thanh).]
+
+\DeclareFontFamily{T5}{txr}{}
+
+\DeclareFontShape{T5}{txr}{m}{n}{ <-> ssub * utm/m/n}{}
+\DeclareFontShape{T5}{txr}{m}{it}{ <-> ssub * utm/m/it}{}
+\DeclareFontShape{T5}{txr}{m}{sl}{ <-> ssub * utm/m/sl}{}
+\DeclareFontShape{T5}{txr}{b}{n}{ <-> ssub * utm/b/n}{}
+\DeclareFontShape{T5}{txr}{b}{it}{ <-> ssub * utm/b/it}{}
+\DeclareFontShape{T5}{txr}{b}{sl}{ <-> ssub * utm/b/sl}{}
+\DeclareFontShape{T5}{txr}{m}{sc}{ <-> ssub * utm/m/sc}{}
+\DeclareFontShape{T5}{txr}{b}{sc}{ <-> ssub * utm/b/sc}{}
+\DeclareFontShape{T5}{txr}{bx}{n}{ <-> ssub * utm/bx/n}{}
+\DeclareFontShape{T5}{txr}{bx}{it}{ <-> ssub * utm/bx/it}{}
+\DeclareFontShape{T5}{txr}{bx}{sl}{ <-> ssub * utm/bx/sl}{}
+\DeclareFontShape{T5}{txr}{bx}{sc}{ <-> ssub * utm/bx/sc}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/vntex/t5txtt.fd b/Master/texmf-dist/tex/latex/vntex/t5txtt.fd
new file mode 100644
index 00000000000..f3e26be6d6b
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/vntex/t5txtt.fd
@@ -0,0 +1,43 @@
+%Filename: t5txtt.fd
+%Created by: tex mkfont
+%Created using fontinst v1.927
+
+%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
+
+\ProvidesFile{t5txtt.fd}
+   [2006/10/25 Fontinst v1.927 font definitions for T5/txtt.]
+
+\DeclareFontFamily{T5}{txtt}{\hyphenchar \font =-1}
+
+\DeclareFontShape{T5}{txtt}{m}{n}{
+   <-> txtt8v
+}{}
+
+\DeclareFontShape{T5}{txtt}{m}{sc}{
+   <-> txttsc8v
+}{}
+
+\DeclareFontShape{T5}{txtt}{m}{sl}{
+   <-> txttsl8v
+}{}
+
+\DeclareFontShape{T5}{txtt}{bx}{n}{
+   <-> txbtt8v
+}{}
+
+\DeclareFontShape{T5}{txtt}{bx}{sc}{
+   <-> txbttsc8v
+}{}
+
+\DeclareFontShape{T5}{txtt}{bx}{sl}{
+   <-> txbttsl8v
+}{}
+
+\DeclareFontShape{T5}{txtt}{m}{ui}{<->ssub * txtt/m/sl}{}
+\DeclareFontShape{T5}{txtt}{b}{n}{<->ssub * txtt/bx/n}{}
+\DeclareFontShape{T5}{txtt}{b}{sc}{<->ssub * txtt/bx/sc}{}
+\DeclareFontShape{T5}{txtt}{b}{sl}{<->ssub * txtt/bx/sl}{}
+\DeclareFontShape{T5}{txtt}{bx}{ui}{<->ssub * txtt/bx/sl}{}
+\DeclareFontShape{T5}{txtt}{b}{ui}{<->ssub * txtt/bx/ui}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/vntex/t5ugq.fd b/Master/texmf-dist/tex/latex/vntex/t5ugq.fd
new file mode 100644
index 00000000000..033431ccc2d
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/vntex/t5ugq.fd
@@ -0,0 +1,25 @@
+%Filename: t5ugq.fd
+%Created by: tex mkfont
+%Created using fontinst v1.927
+
+%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
+
+\ProvidesFile{t5ugq.fd}
+   [2006/07/30 Fontinst v1.927 font definitions for T5/ugq.]
+
+\DeclareFontFamily{T5}{ugq}{}
+
+\DeclareFontShape{T5}{ugq}{b}{n}{
+   <-> ugqb8v
+}{}
+
+\DeclareFontShape{T5}{ugq}{b}{sl}{
+   <-> ugqbo8v
+}{}
+
+\DeclareFontShape{T5}{ugq}{bx}{n}{<->ssub * ugq/b/n}{}
+\DeclareFontShape{T5}{ugq}{bx}{sl}{<->ssub * ugq/b/sl}{}
+\DeclareFontShape{T5}{ugq}{b}{it}{<->ssub * ugq/b/sl}{}
+\DeclareFontShape{T5}{ugq}{bx}{it}{<->ssub * ugq/b/it}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/vntex/varioref-vi.sty b/Master/texmf-dist/tex/latex/vntex/varioref-vi.sty
new file mode 100644
index 00000000000..414c360918a
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/vntex/varioref-vi.sty
@@ -0,0 +1,35 @@
+\ProvidesPackage{varioref-vi}[2005/04/09 v1.2 Vietnamese support for
+varioref]
+
+% This work may be distributed and/or modified under the conditions of
+% the GNU LESSER GENERAL PUBLIC LICENSE, either Version 2.1 of this
+% license or (at your option) any later version.  The latest version
+% of this license is in 
+%    http://www.gnu.org/licenses/lgpl.txt
+
+% This package is maintained by KyAnh <kyanh@o2.pl>
+
+\def\@varioref@vi{\def\reftextfaceafter{%
+    \h{\ohorn} trang \reftextvario{\dj\'\ocircumflex{}i 
+      di\d{\ecircumflex}n}{k\'\ecircumflex{} ti\'\ecircumflex{}p}}%
+  \def\reftextfacebefore{%
+    \h{\ohorn} trang \reftextvario{\dj{}\'\ocircumflex{}i
+      di\d{\ecircumflex}n}{k\'\ecircumflex{} tr\uhorn\'\ohorn{}c}}%
+  \def\reftextafter{\h{\ohorn} trang 
+    \reftextvario{li\`\ecircumflex{}n sau}{sau}}%
+  \def\reftextbefore{\h{\ohorn} trang
+    \reftextvario{li\`\ecircumflex{}n
+      tr\uhorn\'\ohorn{}c}{tr\uhorn\'\ohorn{}c}}%
+  \def\reftextcurrent{\h{\ohorn} trang 
+    \reftextvario{n\`ay}{hi\d{\ecircumflex}n t\d{a}i}}%
+  \def\reftextfaraway##1{\h{\ohorn} trang~\pageref{##1}}%
+  \def\reftextpagerange##1##2{\h\ohorn c\'ac trang
+    \pageref{##1}--\pageref{##2}}%
+  \def\reftextlabelrange##1##2{\ref{##1} \dj\'\ecircumflex{}n \ref{##2}}%
+}
+
+\@ifundefined{extrasvietnam}
+   {\AtBeginDocument{\@varioref@vi}}
+   {\addto\extrasvietnam{\@varioref@vi}}
+
+%%EOF
diff --git a/Master/texmf-dist/tex/latex/vntex/vietnam.sty b/Master/texmf-dist/tex/latex/vntex/vietnam.sty
index bd35b939eb4..fc840372110 100644
--- a/Master/texmf-dist/tex/latex/vntex/vietnam.sty
+++ b/Master/texmf-dist/tex/latex/vntex/vietnam.sty
@@ -25,8 +25,12 @@
 %     . Fix package message.
 %     . Some other minor clean-up.
 %
+%   1.2  2006/10/18
+%
+%     . Add option varioref.
+%
 
-\ProvidesPackage{vietnam}[2005/05/22 v1.1 support for Vietnamese]
+\ProvidesPackage{vietnam}[2006/10/18 v1.2 support for Vietnamese]
 
 \RequirePackage{ifthen}
 
@@ -34,6 +38,7 @@
 \newboolean{noinputenc}
 \newboolean{nocaptions}
 \newboolean{vnutf8}
+\newboolean{varioref}
 
 \DeclareOption{viscii}
   {\PassOptionsToPackage{viscii}{inputenc}
@@ -58,6 +63,8 @@
   {\PassOptionsToPackage{utf8x}{inputenc}
    \setboolean{optenc}{true}
    \setboolean{vnutf8}{true}}
+\DeclareOption{varioref}{\setboolean{varioref}{true}}
+
 
 \ProcessOptions
 
@@ -67,6 +74,10 @@
 
 \RequirePackage[T5]{fontenc}
 
+\ifthenelse{\boolean{varioref}}
+  {\RequirePackage{varioref-vi}}
+  {}
+
 \ifthenelse{\boolean{noinputenc}}
   {\ifthenelse{\boolean{optenc}}
      {\PackageWarning{vietnam}
diff --git a/Master/texmf-dist/tex/latex/vntex/vncaps.tex b/Master/texmf-dist/tex/latex/vntex/vncaps.tex
index 77d1eae7683..7f2522b271f 100644
--- a/Master/texmf-dist/tex/latex/vntex/vncaps.tex
+++ b/Master/texmf-dist/tex/latex/vntex/vncaps.tex
@@ -1,25 +1,27 @@
-% Copyright 2000-2005 Werner Lemberg <wl@gnu.org> and
+% Copyright 2000-2006 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
-%
-%
-% vncaps.tex
-%
+
+\ifx\ProvidesFile\undefined \else
+  \ProvidesFile{vncaps.tex}[2006/06/07 v1.1 Captions in Vietnamese]  
+\fi
+ 
 % Vietnamese captions; edit them in viscii/tcvn/utf8, then use
 % `vntovn viscii vntex' or a similar command to convert to vntex.
 %
 % History
 %
-%   ????/??/??
-%
+% ????/??/??:
 %     Split off captions from vietnam.ldf.
 %     Add \captionsenglish, \dateUSenglish, and \dateenglish.
 %
-%   2005/04/21
-%
+% 2005/04/21:
 %     Add copyright message.
 %     Don't use `{}' but a space after macros which don't have arguments.
+%
+% 2006/06/07:
+%     Fix bug in \indexname.  Add version number.
 
 \ifx\providecommand \undefined
   \let\providecommand \def
@@ -35,7 +37,7 @@
   \def\contentsname{M\d{u}c l\d{u}c}%
   \def\listfigurename{Danh s\'ach h\`inh v\~e}%
   \def\listtablename{Danh s\'ach b\h{a}ng}%
-  \def\indexname{Ch\h{i} s\'\ocircumflex{}}%
+  \def\indexname{Ch\h{i} m\d{u}c}%
   \def\figurename{H\`inh}%
   \def\tablename{B\h{a}ng}%
   \def\partname{Ph\`\acircumflex n}%