vntex 3.1.8+ (13may09)

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

84 files changed, 7330 insertions, 0 deletions

diff --git a/Master/texmf-dist/source/generic/vntex/GPL.txt b/Master/texmf-dist/source/generic/vntex/GPL.txt
new file mode 100644
index 00000000000..5b6e7c66c27
--- /dev/null
+++ b/Master/texmf-dist/source/generic/vntex/GPL.txt
@@ -0,0 +1,340 @@
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+                       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
diff --git a/Master/texmf-dist/source/generic/vntex/LGPL.txt b/Master/texmf-dist/source/generic/vntex/LGPL.txt
new file mode 100644
index 00000000000..5ab7695ab8c
--- /dev/null
+++ b/Master/texmf-dist/source/generic/vntex/LGPL.txt
@@ -0,0 +1,504 @@
+		  GNU LESSER GENERAL PUBLIC LICENSE
+		       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+		  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+  
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+			    NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!
+
+
diff --git a/Master/texmf-dist/source/generic/vntex/LICENSE-utopia.txt b/Master/texmf-dist/source/generic/vntex/LICENSE-utopia.txt
new file mode 100644
index 00000000000..9755d3cec66
--- /dev/null
+++ b/Master/texmf-dist/source/generic/vntex/LICENSE-utopia.txt
@@ -0,0 +1,84 @@
+The agreement below gives the TeX Users Group (TUG) the right to
+sublicense, and grant such sublicensees the right to further sublicense,
+any or all of the rights enumerated below.  TUG hereby does so
+sublicense all such rights, irrevocably and in perpetuity, to any and
+all interested parties.
+
+--Karl Berry, TUG President,
+on behalf of the TeX Users Group board and members
+17 November 2006
+http://tug.org/fonts/utopia
+
+------------------------------------------------------------
+October 11, 2006
+
+RE: License to TeX Users Group for the Utopia Typeface
+
+Adobe Systems Incorporated ("Adobe") hereby grants to the TeX Users
+Group and its members a nonexclusive, royalty-free, perpetual license to
+the typeface software for the Utopia Regular, Utopia Italic, Utopia Bold
+and Utopia bold Italic typefaces, including Adobe Type 1 font programs
+for each style (collectively, the "Software") as set forth below.
+
+Adobe grants the TeX Users Group a license under its copyrights, to use,
+reproduce, display and distribute the Software for any purpose and
+without fee provided that the following copyright notice appears in all
+whole and partial copies of the Software and provided that the following
+trademark symbol and attribution appear in all unmodified copies of the
+Software:
+
+Copyright 1989, 1991 Adobe Systems Incorporated. All rights reserved.
+(alternatively, @1989, 1991 Adobe Systems Incorporated. All rights reserved.)
+Utopia(R)
+Utopia is either a registered trademark or trademark of Adobe Systems
+Incorporated in the United States and/or other countries. Used under
+license. 
+
+Adobe also grants to the TeX Users Group a license to modify the
+Software for any purpose and redistribute such modifications, for any
+purpose and royalty-free, provided that the modified Software shall not
+use the font name(s) or trademark(s), in whole or in part, unless
+explicit written permission is granted by Adobe. This restriction
+applies to all references stored in the Software for identification
+purposes, such as the font menu name and other font description
+fields. The TeX Users Group is also permitted to sublicense, and grant
+such sublicensees the right to further sublicense, any or all the
+foregoing rights through multiple tiers of distribution. The licenses
+granted herein are granted in perpetuity and may not be terminated by
+either party unless such termination is based on a breach of the terms
+and conditions herein stated.
+
+Adobe retains ownership of the copyright in the Software. The TeX Users
+Group agrees that Adobe and its suppliers are the sole and exclusive
+owners of all rights, title and interest, including all copyrights,
+patents, trademarks, trade names, trade secrets and other intellectual
+property rights in the Software. No title or ownership of the Software,
+any copies of the Software, or the patent, copyright, trade secret,
+trademark, trade name or other proprietary rights contained in the
+Software is transferred to the TeX Users Group.
+
+The Adobe trademarks shall not be used in advertising pertaining to the
+distribution of the Software without express prior permission from
+Adobe. Any such use shall be in accordance with the Adobe trademark
+guidelines, available on the Adobe website at
+http://www.adobe.com/misc/pdfs/TM GuideforThirdPartiesFinal.pdf.
+If any portion of the Software is changed, it cannot be marketed under
+Adobe's trademarks unless Adobe, in its sole discretion, approves by a
+prior writing the quality of the resulting implementation.
+
+The TeX Users Group shall have the right to evaluate the Software
+provided by Adobe.
+
+ADOBE MAKES NO REPRESENTATIONS ABOUT THE SUITABILITY OF THE SOFTWARE FOR
+ANY PURPOSE. IT IS PROVIDED "AS-IS" WITHOUT EXPRESS OR IMPLIED
+WARRANTY. ADOBE DISCLAIMS ALL WARRANTIES WITH REGARD TO THE SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE, AND NON-INFRINGEMENT OF THIRD PARTY RIGHTS. IN NO
+EVENT SHALL ADOBE BE LIABLE TO YOU OR ANY OTHER PARTY FOR ANY SPECIAL,
+INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER WHETHER IN
+AN ACTION OF CONTRACT NEGLIGENCE, STRICT LIABILITY OR ANY OTHER ACTION
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+SOFTWARE. ADOBE WILL NOT PROVIDE ANY TRAINING OR OTHER SUPPORT FOR THE
+SOFTWARE.
+
+Adobe Document Id: 4400078611
diff --git a/Master/texmf-dist/source/generic/vntex/LPPL.txt b/Master/texmf-dist/source/generic/vntex/LPPL.txt
new file mode 100644
index 00000000000..bfe13a27b8b
--- /dev/null
+++ b/Master/texmf-dist/source/generic/vntex/LPPL.txt
@@ -0,0 +1,405 @@
+The LaTeX Project Public License
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+
+LPPL Version 1.3a  2004-10-01
+
+Copyright 1999 2002-04 LaTeX3 Project
+    Everyone is allowed to distribute verbatim copies of this
+    license document, but modification of it is not allowed.
+
+
+PREAMBLE
+========
+
+The LaTeX Project Public License (LPPL) is the primary license under
+which the the LaTeX kernel and the base LaTeX packages are distributed.
+
+You may use this license for any work of which you hold the copyright
+and which you wish to distribute.  This license may be particularly
+suitable if your work is TeX-related (such as a LaTeX package), but
+you may use it with small modifications even if your work is unrelated
+to TeX.
+
+The section `WHETHER AND HOW TO DISTRIBUTE WORKS UNDER THIS LICENSE',
+below, gives instructions, examples, and recommendations for authors
+who are considering distributing their works under this license.
+
+This license gives conditions under which a work may be distributed
+and modified, as well as conditions under which modified versions of
+that work may be distributed.
+
+We, the LaTeX3 Project, believe that the conditions below give you
+the freedom to make and distribute modified versions of your work
+that conform with whatever technical specifications you wish while
+maintaining the availability, integrity, and reliability of
+that work.  If you do not see how to achieve your goal while
+meeting these conditions, then read the document `cfgguide.tex'
+and `modguide.tex' in the base LaTeX distribution for suggestions.
+
+
+DEFINITIONS
+===========
+
+In this license document the following terms are used:
+
+   `Work'
+    Any work being distributed under this License.
+    
+   `Derived Work'
+    Any work that under any applicable law is derived from the Work.
+
+   `Modification' 
+    Any procedure that produces a Derived Work under any applicable
+    law -- for example, the production of a file containing an
+    original file associated with the Work or a significant portion of
+    such a file, either verbatim or with modifications and/or
+    translated into another language.
+
+   `Modify'
+    To apply any procedure that produces a Derived Work under any
+    applicable law.
+    
+   `Distribution'
+    Making copies of the Work available from one person to another, in
+    whole or in part.  Distribution includes (but is not limited to)
+    making any electronic components of the Work accessible by
+    file transfer protocols such as FTP or HTTP or by shared file
+    systems such as Sun's Network File System (NFS).
+
+   `Compiled Work'
+    A version of the Work that has been processed into a form where it
+    is directly usable on a computer system.  This processing may
+    include using installation facilities provided by the Work,
+    transformations of the Work, copying of components of the Work, or
+    other activities.  Note that modification of any installation
+    facilities provided by the Work constitutes modification of the Work.
+
+   `Current Maintainer'
+    A person or persons nominated as such within the Work.  If there is
+    no such explicit nomination then it is the `Copyright Holder' under
+    any applicable law.
+
+   `Base Interpreter' 
+    A program or process that is normally needed for running or
+    interpreting a part or the whole of the Work.    
+    A Base Interpreter may depend on external components but these
+    are not considered part of the Base Interpreter provided that each
+    external component clearly identifies itself whenever it is used
+    interactively.  Unless explicitly specified when applying the
+    license to the Work, the only applicable Base Interpreter is a
+    "LaTeX-Format".
+
+
+
+CONDITIONS ON DISTRIBUTION AND MODIFICATION
+===========================================
+
+1.  Activities other than distribution and/or modification of the Work
+are not covered by this license; they are outside its scope.  In
+particular, the act of running the Work is not restricted and no
+requirements are made concerning any offers of support for the Work.
+
+2.  You may distribute a complete, unmodified copy of the Work as you
+received it.  Distribution of only part of the Work is considered
+modification of the Work, and no right to distribute such a Derived
+Work may be assumed under the terms of this clause.
+
+3.  You may distribute a Compiled Work that has been generated from a
+complete, unmodified copy of the Work as distributed under Clause 2
+above, as long as that Compiled Work is distributed in such a way that
+the recipients may install the Compiled Work on their system exactly
+as it would have been installed if they generated a Compiled Work
+directly from the Work.
+
+4.  If you are the Current Maintainer of the Work, you may, without
+restriction, modify the Work, thus creating a Derived Work.  You may
+also distribute the Derived Work without restriction, including
+Compiled Works generated from the Derived Work.  Derived Works
+distributed in this manner by the Current Maintainer are considered to
+be updated versions of the Work.
+
+5.  If you are not the Current Maintainer of the Work, you may modify
+your copy of the Work, thus creating a Derived Work based on the Work,
+and compile this Derived Work, thus creating a Compiled Work based on
+the Derived Work.
+
+6.  If you are not the Current Maintainer of the Work, you may
+distribute a Derived Work provided the following conditions are met
+for every component of the Work unless that component clearly states
+in the copyright notice that it is exempt from that condition.  Only
+the Current Maintainer is allowed to add such statements of exemption 
+to a component of the Work. 
+
+  a. If a component of this Derived Work can be a direct replacement
+     for a component of the Work when that component is used with the
+     Base Interpreter, then, wherever this component of the Work
+     identifies itself to the user when used interactively with that
+     Base Interpreter, the replacement component of this Derived Work
+     clearly and unambiguously identifies itself as a modified version
+     of this component to the user when used interactively with that
+     Base Interpreter.
+     
+  b. Every component of the Derived Work contains prominent notices
+     detailing the nature of the changes to that component, or a
+     prominent reference to another file that is distributed as part
+     of the Derived Work and that contains a complete and accurate log
+     of the changes.
+  
+  c. No information in the Derived Work implies that any persons,
+     including (but not limited to) the authors of the original version
+     of the Work, provide any support, including (but not limited to)
+     the reporting and handling of errors, to recipients of the
+     Derived Work unless those persons have stated explicitly that
+     they do provide such support for the Derived Work.
+
+  d. You distribute at least one of the following with the Derived Work:
+
+       1. A complete, unmodified copy of the Work; 
+          if your distribution of a modified component is made by
+          offering access to copy the modified component from a
+          designated place, then offering equivalent access to copy
+          the Work from the same or some similar place meets this
+          condition, even though third parties are not compelled to
+          copy the Work along with the modified component;
+
+       2. Information that is sufficient to obtain a complete, unmodified
+          copy of the Work.
+
+7.  If you are not the Current Maintainer of the Work, you may
+distribute a Compiled Work generated from a Derived Work, as long as
+the Derived Work is distributed to all recipients of the Compiled
+Work, and as long as the conditions of Clause 6, above, are met with
+regard to the Derived Work.
+
+8.  The conditions above are not intended to prohibit, and hence do
+not apply to, the modification, by any method, of any component so that it
+becomes identical to an  updated version of that component of the Work as
+it is distributed by the Current Maintainer under Clause 4, above.
+
+9.  Distribution of the Work or any Derived Work in an alternative
+format, where the Work or that Derived Work (in whole or in part) is
+then produced by applying some process to that format, does not relax or
+nullify any sections of this license as they pertain to the results of
+applying that process.
+     
+10. a. A Derived Work may be distributed under a different license
+       provided that license itself honors the conditions listed in
+       Clause 6 above, in regard to the Work, though it does not have
+       to honor the rest of the conditions in this license.
+      
+    b. If a Derived Work is distributed under this license, that
+       Derived Work must provide sufficient documentation as part of
+       itself to allow each recipient of that Derived Work to honor the 
+       restrictions in Clause 6 above, concerning changes from the Work.
+
+11. This license places no restrictions on works that are unrelated to
+the Work, nor does this license place any restrictions on aggregating
+such works with the Work by any means.
+
+12.  Nothing in this license is intended to, or may be used to, prevent
+complete compliance by all parties with all applicable laws.
+
+
+NO WARRANTY
+===========
+
+There is no warranty for the Work.  Except when otherwise stated in
+writing, the Copyright Holder provides the Work `as is', without
+warranty of any kind, either expressed or implied, including, but not
+limited to, the implied warranties of merchantability and fitness for
+a particular purpose.  The entire risk as to the quality and performance
+of the Work is with you.  Should the Work prove defective, you
+assume the cost of all necessary servicing, repair, or correction.
+
+In no event unless required by applicable law or agreed to in writing
+will The Copyright Holder, or any author named in the components of
+the Work, or any other party who may distribute and/or modify the Work
+as permitted above, be liable to you for damages, including any
+general, special, incidental or consequential damages arising out of
+any use of the Work or out of inability to use the Work (including,
+but not limited to, loss of data, data being rendered inaccurate, or
+losses sustained by anyone as a result of any failure of the Work to
+operate with any other programs), even if the Copyright Holder or said
+author or said other party has been advised of the possibility of such
+damages.
+
+
+MAINTENANCE OF THE WORK
+=======================
+
+The Work has the status `author-maintained' if the Copyright Holder
+explicitly and prominently states near the primary copyright notice in
+the Work that the Work can only be maintained by the Copyright Holder
+or simply that is `author-maintained'.
+
+The Work has the status `maintained' if there is a Current Maintainer
+who has indicated in the Work that they are willing to receive error
+reports for the Work (for example, by supplying a valid e-mail
+address). It is not required for the Current Maintainer to acknowledge
+or act upon these error reports.
+
+The Work changes from status `maintained' to `unmaintained' if there
+is no Current Maintainer, or the person stated to be Current
+Maintainer of the work cannot be reached through the indicated means
+of communication for a period of six months, and there are no other
+significant signs of active maintenance.
+
+You can become the Current Maintainer of the Work by agreement with
+any existing Current Maintainer to take over this role.
+
+If the Work is unmaintained, you can become the Current Maintainer of
+the Work through the following steps:
+
+ 1.  Make a reasonable attempt to trace the Current Maintainer (and
+     the Copyright Holder, if the two differ) through the means of
+     an Internet or similar search.
+
+ 2.  If this search is successful, then enquire whether the Work
+     is still maintained.
+
+  a. If it is being maintained, then ask the Current Maintainer
+     to update their communication data within one month.
+     
+  b. If the search is unsuccessful or no action to resume active
+     maintenance is taken by the Current Maintainer, then announce
+     within the pertinent community your intention to take over
+     maintenance.  (If the Work is a LaTeX work, this could be
+     done, for example, by posting to comp.text.tex.)
+
+ 3a. If the Current Maintainer is reachable and agrees to pass
+     maintenance of the Work to you, then this takes effect
+     immediately upon announcement.
+     
+  b. If the Current Maintainer is not reachable and the Copyright
+     Holder agrees that maintenance of the Work be passed to you,
+     then this takes effect immediately upon announcement.  
+    
+ 4.  If you make an `intention announcement' as described in 2b. above
+     and after three months your intention is challenged neither by
+     the Current Maintainer nor by the Copyright Holder nor by other
+     people, then you may arrange for the Work to be changed so as
+     to name you as the (new) Current Maintainer.
+     
+ 5.  If the previously unreachable Current Maintainer becomes
+     reachable once more within three months of a change completed
+     under the terms of 3b) or 4), then that Current Maintainer must
+     become or remain the Current Maintainer upon request provided
+     they then update their communication data within one month.
+
+A change in the Current Maintainer does not, of itself, alter the fact
+that the Work is distributed under the LPPL license.
+
+If you become the Current Maintainer of the Work, you should
+immediately provide, within the Work, a prominent and unambiguous
+statement of your status as Current Maintainer.  You should also
+announce your new status to the same pertinent community as
+in 2b) above.
+
+
+WHETHER AND HOW TO DISTRIBUTE WORKS UNDER THIS LICENSE
+======================================================
+
+This section contains important instructions, examples, and
+recommendations for authors who are considering distributing their
+works under this license.  These authors are addressed as `you' in
+this section.
+
+Choosing This License or Another License
+----------------------------------------
+
+If for any part of your work you want or need to use *distribution*
+conditions that differ significantly from those in this license, then
+do not refer to this license anywhere in your work but, instead,
+distribute your work under a different license.  You may use the text
+of this license as a model for your own license, but your license
+should not refer to the LPPL or otherwise give the impression that
+your work is distributed under the LPPL.
+
+The document `modguide.tex' in the base LaTeX distribution explains
+the motivation behind the conditions of this license.  It explains,
+for example, why distributing LaTeX under the GNU General Public
+License (GPL) was considered inappropriate.  Even if your work is
+unrelated to LaTeX, the discussion in `modguide.tex' may still be
+relevant, and authors intending to distribute their works under any
+license are encouraged to read it.
+
+A Recommendation on Modification Without Distribution
+-----------------------------------------------------
+
+It is wise never to modify a component of the Work, even for your own
+personal use, without also meeting the above conditions for
+distributing the modified component.  While you might intend that such
+modifications will never be distributed, often this will happen by
+accident -- you may forget that you have modified that component; or
+it may not occur to you when allowing others to access the modified
+version that you are thus distributing it and violating the conditions
+of this license in ways that could have legal implications and, worse,
+cause problems for the community.  It is therefore usually in your
+best interest to keep your copy of the Work identical with the public
+one.  Many works provide ways to control the behavior of that work
+without altering any of its licensed components.
+
+How to Use This License
+-----------------------
+
+To use this license, place in each of the components of your work both
+an explicit copyright notice including your name and the year the work
+was authored and/or last substantially modified.  Include also a
+statement that the distribution and/or modification of that
+component is constrained by the conditions in this license.
+
+Here is an example of such a notice and statement:
+
+  %% pig.dtx
+  %% Copyright 2003 M. Y. Name
+  %
+  % 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 in
+  %   http://www.latex-project.org/lppl.txt
+  % and version 1.3 or later is part of all distributions of LaTeX
+  % version 2003/12/01 or later.
+  %
+  % This work has the LPPL maintenance status "maintained".
+  % 
+  % This Current Maintainer of this work is M. Y. Name.
+  %
+  % This work consists of the files pig.dtx and pig.ins
+  % and the derived file pig.sty.
+
+Given such a notice and statement in a file, the conditions
+given in this license document would apply, with the `Work' referring
+to the three files `pig.dtx', `pig.ins', and `pig.sty' (the last being
+generated from `pig.dtx' using `pig.ins'), the `Base Interpreter'
+referring to any "LaTeX-Format", and both `Copyright Holder' and
+`Current Maintainer' referring to the person `M. Y. Name'.
+
+If you do not want the Maintenance section of LPPL to apply to your
+Work, change "maintained" above into "author-maintained".  
+However, we recommend that you use "maintained" as the Maintenance
+section was added in order to ensure that your Work remains useful to
+the community even when you can no longer maintain and support it
+yourself.
+
+
+Important Recommendations
+-------------------------
+
+ Defining What Constitutes the Work
+
+   The LPPL requires that distributions of the Work contain all the
+   files of the Work.  It is therefore important that you provide a
+   way for the licensee to determine which files constitute the Work.
+   This could, for example, be achieved by explicitly listing all the
+   files of the Work near the copyright notice of each file or by
+   using a line such as:
+
+    % This work consists of all files listed in manifest.txt.
+   
+   in that place.  In the absence of an unequivocal list it might be
+   impossible for the licensee to determine what is considered by you
+   to comprise the Work and, in such a case, the licensee would be
+   entitled to make reasonable conjectures as to which files comprise
+   the Work.
+
diff --git a/Master/texmf-dist/source/generic/vntex/README.vntopia b/Master/texmf-dist/source/generic/vntex/README.vntopia
new file mode 100644
index 00000000000..656ef9d9ce7
--- /dev/null
+++ b/Master/texmf-dist/source/generic/vntex/README.vntopia
@@ -0,0 +1,4 @@
+Vietnamese glyphs has been added by Han The Thanh <HanTheThanh@gmail.com>
+according to the conditions of the Adobe/TUG license agreement.
+
+See http://tug.org/fonts/utopia/LICENSE-utopia.txt for more information.
diff --git a/Master/texmf-dist/source/generic/vntex/doc/abbr.tex b/Master/texmf-dist/source/generic/vntex/doc/abbr.tex
new file mode 100644
index 00000000000..84617cf0935
--- /dev/null
+++ b/Master/texmf-dist/source/generic/vntex/doc/abbr.tex
@@ -0,0 +1,268 @@
+\ifx\abbrloaded\relax
+    \let\next=\endinput
+\else
+    \let\next=\relax
+\fi
+
+\next
+
+\let\abbrloaded=y
+
+\def\<#1>{%
+    \expandafter\ifx\csname<#1>\endcsname\relax
+        \errmessage{abbreviation <#1> undefined!}%
+    \else
+        \csname<#1>\endcsname
+    \fi
+}
+
+\def\abbrA#1#2#3{%
+    \expandafter\def\csname<#1>\endcsname{#2}%
+}
+
+\def\abbrB#1#2#3{%
+    \def\abbrdef{#3}%
+    \ifx\abbrdef\empty
+        \expandafter\def\csname<#1>\endcsname{#2}%
+    \else
+        \expandafter\def\csname<#1>\endcsname{#3}%
+    \fi
+}
+
+\ifx\HCode\undefined % tex4ht is not being used
+    \let\abbr=\abbrA
+\else 
+    \let\abbr=\abbrB
+\fi
+
+\abbr{.}{.\,}{}
+\abbr{3B2}{3B2}{}
+\abbr{A2AC}{\texttt{a2ac}}{}
+\abbr{ADOBE}{Adobe}{}
+\abbr{AFM}{AFM}{}
+\abbr{AFM}{AFM}{}
+\abbr{AMIGA}{Amiga}{}
+\abbr{AND}{\char038\relax}{&}
+\abbr{APACHE}{Apache}{}
+\abbr{AR}{Acrobat Reader}{}
+\abbr{ASCII}{ASCII}{}
+\abbr{BASH}{Bash}{}
+\abbr{BLUESKY}{BlueSky}{}
+\abbr{BS}{\char92}{}
+\abbr{bull}{$\bullet$}{}
+\abbr{C}{C}{}
+\abbr{CMACTEX}{CMac\TeX}{CMacTeX}
+\abbr{CM}{Computer Modern}{}
+\abbr{CMR}{CMR}{}
+\abbr{CMSS}{CMSS}{}
+\abbr{CMSUPER}{CM-Super}{}
+\abbr{CPP}{C++}{}
+\abbr{CS}{CS}{}
+\abbr{DANTE}{DANTE}{}
+\abbr{DEBIAN}{Debian}{}
+\abbr{DHSP}{�HSP}{}
+\abbr{DJBDNS}{\textsf{djbdns}}{}
+\abbr{DJGPP}{DJGPP}{}
+\abbr{DNSCACHE}{\textsf{dnscache}}{}
+\abbr{DOS}{DOS}{}
+\abbr{DOTNET}{Visual~.NET}{}
+\abbr{...}{\dots}{}
+\abbr{DTP}{DTP}{}
+\abbr{DVI}{DVI}{}
+\abbr{DVIPDFM}{\textsf{dvipdfm}}{}
+\abbr{DVIPDFMX}{\textsf{dvipdfmx}}{}
+\abbr{DVIPS}{\textsf{dvips}}{}
+\abbr{EC}{EC}{}
+\abbr{EK}{\textit{{\Large$\varepsilon$\kern-.1em}k}}{}
+\abbr{ELIB}{eLib}{}
+\abbr{EMACS}{Emacs}{}
+\abbr{EMAIL}{Email}{}
+\abbr{EOF}{EOF}{}
+\abbr{ET5}{ET5}{}
+% \abbr{ETEX}{$\varepsilon$-\TeX}{eTeX}
+\abbr{ETEX}{e\TeX}{eTeX}
+\abbr{EUROTEX}{Euro\TeX}{EuroTeX}
+\abbr{FLOITEX}{Floi\TeX}{}
+\abbr{FMP}{FMP}{}
+\abbr{FONTINST}{\texttt{fontinst}}{}
+\abbr{FONTLAB}{FontLab}{}
+\abbr{FPTEX}{fp\TeX}{}
+\abbr{FTP}{Ftp}{}
+\abbr{GCC}{GCC}{}
+\abbr{GOOGLE}{Google}{}
+\abbr{GS}{\textsf{ghostscript}}{}
+\abbr{GUST}{GUST}{}
+\abbr{GUT}{GUTenberg}{}
+\abbr{GVSBK}{GVSBK}{}
+\abbr{HCMUP}{HCMUP}{}
+\abbr{HJ}{H\kern.1em<AND>\kern.1emJ}{}
+\abbr{HREF}{hyperref}{}
+\abbr{HSQL}{HSQL}{}
+\abbr{HTML}{HTML}{}
+\abbr{HZ}{\textit{hz}}{}
+\abbr{ID}{InDesign}{}
+\abbr{IIS}{IIS}{}
+\abbr{INTERNET}{Internet}{}
+\abbr{JAVA}{Java}{}
+\abbr{JP}{\textit{jp}}{}
+\abbr{KF}{\textit{kf\kern-.05em}}{}
+\abbr{KR}{\textit{K$\varrho$}}{}
+\abbr{LATEX}{\LaTeX}{LaTeX}
+\abbr{LDAP}{LDAP}{}
+\abbr{LF}{\textrm{\it letter\!\_\kern.1emfit}}{}
+\abbr{LIBPNG}{LIBPNG}{}
+\abbr{LIBTIFF}{LIBTIFF}{}
+\abbr{LINUX}{Linux}{}
+\abbr{LISP}{LISP}{}
+\abbr{LM}{LM}{LM}
+\abbr{M2}{\,m$^2$}{}
+\abbr{MAC}{Macintosh}{}
+\abbr{MF}{\MF}{}
+\abbr{MG}{MetaFog}{}
+\abbr{MIKTEX}{Mik\TeX}{MikTeX}
+\abbr{MIRKA}{Miroslava Mis\'akov\'a}{}
+\abbr{MMINSTANCE}{MMInstance}{}
+\abbr{MM}{Multiple Master}{}
+\abbr{MMTOOLS}{MMTOOLS}{}
+\abbr{MP}{\MP}{}
+\abbr{MVISCII}{Mac VISCII}{}
+\abbr{MYSQL}{MySQL}{}
+\abbr{NL}{\hfil\break}{}
+\abbr{NTG}{NTG}{}
+\abbr{NTS}{NTS}{}
+\abbr{OMEGA}{$\Omega$}{}
+\abbr{OPENTYPE}{OpenType}{}
+\abbr{PASCAL}{Pascal}{}
+\abbr{PDFETEX}{pdf\<ETEX>}{pdfeTeX}
+\abbr{PDF}{PDF}{}
+\abbr{PDFTEX}{pdf\TeX}{pdfTeX}
+\abbr{PDFLATEX}{pdf\LaTeX}{pdfLaTeX}
+\abbr{PDFXTEX}{pdfx\kern-.1em\TeX}{pdfxTeX}
+\abbr{CONTEXT}{Con\TeX{}t}{ConTeXt}
+\abbr{PERCENT}{\unskip\,\%}{}
+\abbr{PERL}{Perl}{}
+\abbr{PFA}{PFA}{}
+\abbr{PFB}{PFB}{}
+\abbr{PHP}{PHP}{}
+\abbr{PK}{PK}{}
+\abbr{PLAIN}{plain \TeX}{plain TeX}
+\abbr{POSTGRESQL}{PostgreSQL}{}
+\abbr{PROSPER}{Prosper}{}
+\abbr{PS}{PS}{}
+\abbr{RA}{$\longrightarrow$}{-->}
+\abbr{RESIN}{Resin}{}
+\abbr{SGML}{SGML}{}
+\abbr{SP}{\hskip1cm}{}
+\abbr{STL}{STL}{}
+\abbr{T1}{Type\nobreak\,1}{Type1}
+\abbr{T3}{Type\nobreak\,3}{}
+\abbr{T5}{T5}{}
+\abbr{TCVN}{TCVN1}{}
+\abbr{TCX}{TCX}{}
+\abbr{TETEX}{\textsf{te\TeX}}{teTeX}
+\abbr{TEX4HT}{\TeX{}4ht}{TeX4ht}
+\abbr{TEXINFO}{\texttt{texinfo}}{}
+\abbr{TEXLIVE}{\TeX{}Live}{TeXLive}
+\abbr{TEXME}{\TeX{}Me}{TeXMe}
+\abbr{TEXMF}{\textsf{texmf}}{}
+\abbr{TEXNICCENTER}{TeXnicCenter}{}
+\abbr{TEX}{\TeX}{TeX}
+\abbr{TEXTRACE}{\TeX{}trace}{TeXtrace}
+\abbr{TFM}{TFM}{}
+\abbr{TFTOPL}{TFtoPL}{}
+% \abbr{THANH}{H\`an Th\^e\llap{\raise 0.5ex\hbox{\'{}}} Th\`anh}{Han The Thanh}
+% \abbr{THANH}{H\`an Th\^e\llap{\raise 0.5ex\hbox{\'{}}} Th\`anh}{}
+\abbr{THANH}{H\`an Th\'\ecircumflex{} Th\`anh}{}
+\abbr{TINYDNS}{\textsf{tinydns}}{}
+\abbr{TOMCAT}{Tomcat}{}
+\abbr{TPHCM}{Tp.\,HCM}{}
+\abbr{TRUETYPE}{True\kern-.1em Type}{TrueType}
+\abbr{TUG}{TUG}{}
+\abbr{UNICODE}{Unicode}{}
+\abbr{UNIKEY}{Unikey}{}
+\abbr{UNIX}{UNIX}{}
+\abbr{UPORTAL}{uPortal}{}
+\abbr{URW}{URW}{}
+\abbr{URWVN}{URWVN}{}
+\abbr{UTF8}{UTF8}{}
+\abbr{VB}{Visual Basic}{}
+\abbr{VC6}{Visual~C++~6.0}{}
+\abbr{VIETLUG}{VietLUG}{}
+\abbr{VIM}{Vim}{}
+\abbr{VIM}{Vim}{}
+\abbr{VISCII}{VISCII}{}
+\abbr{VI}{Vi}{}
+\abbr{VNCMR}{\textsf{vncmr}}{}
+\abbr{VNI}{VNI}{}
+\abbr{VNR}{VNR}{}
+\abbr{VNTEX}{V\kern-.1em n\TeX}{VnTeX}
+\abbr{VPS}{VPS}{}
+\abbr{WC}{Windows Commander}{}
+\abbr{WEB}{Web}{}
+\abbr{WIN32}{Win32}{}
+\abbr{WINDOWS}{Windows}{}
+\abbr{WINEDT}{WinEdt}{}
+\abbr{WWW}{WWW}{}
+\abbr{XEMACS}{XEmacs}{}
+\abbr{XEMTEX}{Xem\TeX}{XemTeX}
+\abbr{XML}{XML}{}
+\abbr{XPDF}{XPDF}{}
+\abbr{YANDY}{Y<AND>Y}{}
+\abbr{ZLIB}{ZLIB}{}
+\abbr{EMAIL}{Email}{}
+\abbr{WEBSITE}{Website}{}
+\abbr{ASP}{ASP}{}
+\abbr{FRONTPAGE}{FrontPage}{}
+\abbr{DRW}{DreamWeaver}{}
+\abbr{ABC}{ABC}{}
+\abbr{VNI}{VNI}{}
+\abbr{CTAN}{CTAN}{}
+\abbr{PDFCPROT}{\textsf{pdfcprot}}{}
+\abbr{PDFEXPAND}{\textsf{pdfexpand}}{}
+\abbr{MICROTYPE}{\textsf{microtype}}{}
+\abbr{PDFFONTS}{\textsf{pdffonts}}{}
+\abbr{AFM2TFM}{\textsf{afm2tfm}}{}
+\abbr{VF}{VF}{}
+\abbr{TUGBOAT}{TUGboat}{}
+\abbr{PSTRICKS}{\textsf{PStricks}}{}
+\abbr{WEB2C}{\textsf{web2c}}{}
+\abbr{IE}{i.\,e.\,\ignorespaces}{}
+\abbr{ie}{i.\,e.\,\ignorespaces}{}
+\abbr{GNU}{GNU}{}
+\abbr{LIBAVL}{\textsf{libAVL}}{}
+\abbr{TTF2AFM}{\textsf{ttf2afm}}{}
+\abbr{PDFSYNC}{\textsf{pdfsync}}{}
+\abbr{CFF}{CFF}{}
+\abbr{GNOME}{GNOME}{}
+\abbr{SGLUG}{SaigonLUG}{}
+\abbr{SAIGON}{S�i G�n}{}
+\abbr{SQL}{SQL}{}
+\abbr{RVT}{RVT}{}
+\abbr{XML2PDF}{XML2PDF}{}
+\abbr{GUI}{GUI}{}
+\abbr{NFSS}{NFSS}{}
+\abbr{VNOSS}{VnOSS}{}
+\abbr{GPL}{GPL}{}
+\abbr{LPPL}{LPPL}{}
+\abbr{AFPL}{AFPL}{}
+\abbr{X11}{X11}{}
+\abbr{XETEX}{Xe\TeX}{}
+\abbr{EXTEX}{Ex\TeX}{}
+\abbr{LUATEX}{Lua\TeX}{}
+\abbr{XDVI}{XDvi}{}
+\abbr{YAP}{Yap}{}
+\abbr{DVIPSONE}{DVIPSONE}{}
+\abbr{PLNFSS}{PLNFSS}{}
+\abbr{MSWORD}{MS~Word}{}
+\abbr{OOWRITER}{OpenOffice~Writer}{}
+\abbr{THAIHOA}{Th\'ai Ph\'u Kh\'anh H\`oa}{}
+\abbr{TEXMAKER}{TeXMaker}{}
+\abbr{WINSHELL}{WinShell}{}
+\abbr{XUNIKEY}{XUniKey}{}
+\abbr{XVNKB}{Xvnkb}{}
+\abbr{URL}{URL}{}
+\abbr{KILE}{Kile}{}
+\abbr{LM}{Latin Modern}{}
+\abbr{SRC}{SRC}{}
+
+\endinput
diff --git a/Master/texmf-dist/source/generic/vntex/doc/test-accents.tex b/Master/texmf-dist/source/generic/vntex/doc/test-accents.tex
new file mode 100644
index 00000000000..3c9b8824d3c
--- /dev/null
+++ b/Master/texmf-dist/source/generic/vntex/doc/test-accents.tex
@@ -0,0 +1,186 @@
+% Copyright 2003-2005 Han The Thanh <hanthethanh@gmx.net>.
+% This file is part of vntex.  License: LPPL, version 1.3 or newer,
+% according to http://www.latex-project.org/lppl.txt
+
+\large
+\def\X#1{\hbox to 2em{\hss#1\hss}}
+\begin{multicols}{2}
+\noindent
+\X{\ABREVE} \verb|\ABREVE| \\
+\X{\Abreve} \verb|\Abreve| \\
+\X{\ACIRCUMFLEX} \verb|\ACIRCUMFLEX| \\
+\X{\Acircumflex} \verb|\Acircumflex| \\
+\X{\ECIRCUMFLEX} \verb|\ECIRCUMFLEX| \\
+\X{\Ecircumflex} \verb|\Ecircumflex| \\
+\X{\Ocircumflex} \verb|\Ocircumflex| \\
+\X{\OCIRCUMFLEX} \verb|\OCIRCUMFLEX| \\
+\X{\OHORN} \verb|\OHORN| \\
+\X{\Ohorn} \verb|\Ohorn| \\
+\X{\UHORN} \verb|\UHORN| \\
+\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| \\
+\X{\ocircumflex} \verb|\ocircumflex| \\
+\X{\ohorn} \verb|\ohorn| \\
+\X{\uhorn} \verb|\uhorn| \\
+\X{\'A} \verb|\'A| \\
+\X{\'E} \verb|\'E| \\
+\X{\'I} \verb|\'I| \\
+\X{\'O} \verb|\'O| \\
+\X{\'U} \verb|\'U| \\
+\X{\'Y} \verb|\'Y| \\
+\X{\'\ABREVE} \verb|\'\ABREVE| \\
+\X{\'\Abreve} \verb|\'\Abreve| \\
+\X{\'\ACIRCUMFLEX} \verb|\'\ACIRCUMFLEX| \\
+\X{\'\Acircumflex} \verb|\'\Acircumflex| \\
+\X{\'\ECIRCUMFLEX} \verb|\'\ECIRCUMFLEX| \\
+\X{\'\Ecircumflex} \verb|\'\Ecircumflex| \\
+\X{\'\OCIRCUMFLEX} \verb|\'\OCIRCUMFLEX| \\
+\X{\'\Ocircumflex} \verb|\'\Ocircumflex| \\
+\X{\'\OHORN} \verb|\'\OHORN| \\
+\X{\'\Ohorn} \verb|\'\Ohorn| \\
+\X{\'\UHORN} \verb|\'\UHORN| \\
+\X{\'\Uhorn} \verb|\'\Uhorn| \\
+\X{\'\abreve} \verb|\'\abreve| \\
+\X{\'\acircumflex} \verb|\'\acircumflex| \\
+\X{\'\ecircumflex} \verb|\'\ecircumflex| \\
+\X{\'\ocircumflex} \verb|\'\ocircumflex| \\
+\X{\'\ohorn} \verb|\'\ohorn| \\
+\X{\'\uhorn} \verb|\'\uhorn| \\
+\X{\'a} \verb|\'a| \\
+\X{\'e} \verb|\'e| \\
+\X{\'i} \verb|\'i| \\
+\X{\'o} \verb|\'o| \\
+\X{\'u} \verb|\'u| \\
+\X{\'y} \verb|\'y| \\
+\X{\^A} \verb|\^A| \\
+\X{\^E} \verb|\^E| \\
+\X{\^O} \verb|\^O| \\
+\X{\^a} \verb|\^a| \\
+\X{\^e} \verb|\^e| \\
+\X{\^o} \verb|\^o| \\
+\X{\`A} \verb|\`A| \\
+\X{\`E} \verb|\`E| \\
+\X{\`I} \verb|\`I| \\
+\X{\`O} \verb|\`O| \\
+\X{\`U} \verb|\`U| \\
+\X{\`Y} \verb|\`Y| \\
+\X{\`\ABREVE} \verb|\`\ABREVE| \\
+\X{\`\Abreve} \verb|\`\Abreve| \\
+\X{\`\ACIRCUMFLEX} \verb|\`\ACIRCUMFLEX| \\
+\X{\`\Acircumflex} \verb|\`\Acircumflex| \\
+\X{\`\ECIRCUMFLEX} \verb|\`\ECIRCUMFLEX| \\
+\X{\`\Ecircumflex} \verb|\`\Ecircumflex| \\
+\X{\`\OCIRCUMFLEX} \verb|\`\OCIRCUMFLEX| \\
+\X{\`\Ocircumflex} \verb|\`\Ocircumflex| \\
+\X{\`\OHORN} \verb|\`\OHORN| \\
+\X{\`\Ohorn} \verb|\`\Ohorn| \\
+\X{\`\UHORN} \verb|\`\UHORN| \\
+\X{\`\Uhorn} \verb|\`\Uhorn| \\
+\X{\`\abreve} \verb|\`\abreve| \\
+\X{\`\acircumflex} \verb|\`\acircumflex| \\
+\X{\`\ecircumflex} \verb|\`\ecircumflex| \\
+\X{\`\ocircumflex} \verb|\`\ocircumflex| \\
+\X{\`\ohorn} \verb|\`\ohorn| \\
+\X{\`\uhorn} \verb|\`\uhorn| \\
+\X{\`a} \verb|\`a| \\
+\X{\`e} \verb|\`e| \\
+\X{\`i} \verb|\`i| \\
+\X{\`o} \verb|\`o| \\
+\X{\`u} \verb|\`u| \\
+\X{\`y} \verb|\`y| \\
+\X{\d A} \verb|\d A| \\
+\X{\d E} \verb|\d E| \\
+\X{\d I} \verb|\d I| \\
+\X{\d O} \verb|\d O| \\
+\X{\d U} \verb|\d U| \\
+\X{\d Y} \verb|\d Y| \\
+\X{\d \ABREVE} \verb|\d \ABREVE| \\
+\X{\d \Abreve} \verb|\d \Abreve| \\
+\X{\d \ACIRCUMFLEX} \verb|\d \ACIRCUMFLEX| \\
+\X{\d \Acircumflex} \verb|\d \Acircumflex| \\
+\X{\d \ECIRCUMFLEX} \verb|\d \ECIRCUMFLEX| \\
+\X{\d \Ecircumflex} \verb|\d \Ecircumflex| \\
+\X{\d \OCIRCUMFLEX} \verb|\d \OCIRCUMFLEX| \\
+\X{\d \Ocircumflex} \verb|\d \Ocircumflex| \\
+\X{\d \OHORN} \verb|\d \OHORN| \\
+\X{\d \Ohorn} \verb|\d \Ohorn| \\
+\X{\d \UHORN} \verb|\d \UHORN| \\
+\X{\d \Uhorn} \verb|\d \Uhorn| \\
+\X{\d \abreve} \verb|\d \abreve| \\
+\X{\d \acircumflex} \verb|\d \acircumflex| \\
+\X{\d \ecircumflex} \verb|\d \ecircumflex| \\
+\X{\d \ocircumflex} \verb|\d \ocircumflex| \\
+\X{\d \ohorn} \verb|\d \ohorn| \\
+\X{\d \uhorn} \verb|\d \uhorn| \\
+\X{\d a} \verb|\d a| \\
+\X{\d e} \verb|\d e| \\
+\X{\d i} \verb|\d i| \\
+\X{\d o} \verb|\d o| \\
+\X{\d u} \verb|\d u| \\
+\X{\d y} \verb|\d y| \\
+\X{\h A} \verb|\h A| \\
+\X{\h E} \verb|\h E| \\
+\X{\h I} \verb|\h I| \\
+\X{\h O} \verb|\h O| \\
+\X{\h U} \verb|\h U| \\
+\X{\h Y} \verb|\h Y| \\
+\X{\h \ABREVE} \verb|\h \ABREVE| \\
+\X{\h \Abreve} \verb|\h \Abreve| \\
+\X{\h \ACIRCUMFLEX} \verb|\h \ACIRCUMFLEX| \\
+\X{\h \Acircumflex} \verb|\h \Acircumflex| \\
+\X{\h \ECIRCUMFLEX} \verb|\h \ECIRCUMFLEX| \\
+\X{\h \Ecircumflex} \verb|\h \Ecircumflex| \\
+\X{\h \OCIRCUMFLEX} \verb|\h \OCIRCUMFLEX| \\
+\X{\h \Ocircumflex} \verb|\h \Ocircumflex| \\
+\X{\h \OHORN} \verb|\h \OHORN| \\
+\X{\h \Ohorn} \verb|\h \Ohorn| \\
+\X{\h \UHORN} \verb|\h \UHORN| \\
+\X{\h \Uhorn} \verb|\h \Uhorn| \\
+\X{\h \abreve} \verb|\h \abreve| \\
+\X{\h \acircumflex} \verb|\h \acircumflex| \\
+\X{\h \ecircumflex} \verb|\h \ecircumflex| \\
+\X{\h \ocircumflex} \verb|\h \ocircumflex| \\
+\X{\h \ohorn} \verb|\h \ohorn| \\
+\X{\h \uhorn} \verb|\h \uhorn| \\
+\X{\h a} \verb|\h a| \\
+\X{\h e} \verb|\h e| \\
+\X{\h i} \verb|\h i| \\
+\X{\h o} \verb|\h o| \\
+\X{\h u} \verb|\h u| \\
+\X{\h y} \verb|\h y| \\
+\X{\~A} \verb|\~A| \\
+\X{\~E} \verb|\~E| \\
+\X{\~I} \verb|\~I| \\
+\X{\~O} \verb|\~O| \\
+\X{\~U} \verb|\~U| \\
+\X{\~Y} \verb|\~Y| \\
+\X{\~\ABREVE} \verb|\~\ABREVE| \\
+\X{\~\Abreve} \verb|\~\Abreve| \\
+\X{\~\ACIRCUMFLEX} \verb|\~\ACIRCUMFLEX| \\
+\X{\~\Acircumflex} \verb|\~\Acircumflex| \\
+\X{\~\ECIRCUMFLEX} \verb|\~\ECIRCUMFLEX| \\
+\X{\~\Ecircumflex} \verb|\~\Ecircumflex| \\
+\X{\~\OCIRCUMFLEX} \verb|\~\OCIRCUMFLEX| \\
+\X{\~\Ocircumflex} \verb|\~\Ocircumflex| \\
+\X{\~\OHORN} \verb|\~\OHORN| \\
+\X{\~\Ohorn} \verb|\~\Ohorn| \\
+\X{\~\UHORN} \verb|\~\UHORN| \\
+\X{\~\Uhorn} \verb|\~\Uhorn| \\
+\X{\~\abreve} \verb|\~\abreve| \\
+\X{\~\acircumflex} \verb|\~\acircumflex| \\
+\X{\~\ecircumflex} \verb|\~\ecircumflex| \\
+\X{\~\ocircumflex} \verb|\~\ocircumflex| \\
+\X{\~\ohorn} \verb|\~\ohorn| \\
+\X{\~\uhorn} \verb|\~\uhorn| \\
+\X{\~a} \verb|\~a| \\
+\X{\~e} \verb|\~e| \\
+\X{\~i} \verb|\~i| \\
+\X{\~o} \verb|\~o| \\
+\X{\~u} \verb|\~u| \\
+\X{\~y} \verb|\~y| \\
+\end{multicols}
diff --git a/Master/texmf-dist/source/generic/vntex/doc/vn-fonts-print.tex b/Master/texmf-dist/source/generic/vntex/doc/vn-fonts-print.tex
new file mode 100644
index 00000000000..15f07c9cc3c
--- /dev/null
+++ b/Master/texmf-dist/source/generic/vntex/doc/vn-fonts-print.tex
@@ -0,0 +1,2 @@
+\def\printversion{true}
+\input vn-fonts.tex
diff --git a/Master/texmf-dist/source/generic/vntex/doc/vn-fonts.tex b/Master/texmf-dist/source/generic/vntex/doc/vn-fonts.tex
new file mode 100644
index 00000000000..ad6bdbb8b20
--- /dev/null
+++ b/Master/texmf-dist/source/generic/vntex/doc/vn-fonts.tex
@@ -0,0 +1,610 @@
+\ifx\printversion\undefined
+  \documentclass[12pt]{article}
+%  \advance\textwidth by 32.4pt
+\else
+  \documentclass[11pt,a4paper]{article}
+  \RequirePackage[monochrome]{color}
+  \advance\topmargin by -2.2cm
+  \advance\textheight by 3.3cm
+  \advance\footskip by .5cm
+  \advance\oddsidemargin by -0.5cm
+  \advance\textwidth by 1cm
+\fi
+\usepackage{url}
+\usepackage[colorlinks,bookmarks=false]{hyperref}
+\usepackage{mflogo}
+\usepackage{fancyvrb}
+\usepackage[utf8]{vietnam}
+\usepackage{charter}
+\usepackage{microtype}
+
+%%\parskip.5\baselineskip
+%%\parindent0pt
+\usepackage{parskip}
+\raggedbottom
+\DefineShortVerb{\|}
+\input{abbr.tex}
+
+\begin{document}
+
+\title{Dùng font với \<VNTEX>} 
+\author{Hàn Thế Thành và Thái Phú Khánh Hòa}
+\maketitle
+
+\section{Giới thiệu}
+Tài liệu này hướng dẫn cách sử dụng các font tiếng Việt với
+\<VNTEX>. Tài liệu giả sử rằng bạn đã
+\begin{itemize}
+\item cài đặt được \<VNTEX> lên hệ thống \<TEX> của bạn (nếu bạn dùng
+  \<TEXLIVE>\,$\ge$\,2005 hoặc \<MIKTEX>\,$\ge$\,2.5 thì \<VNTEX> đã
+  được tích hợp sẵn, bạn không phải tự cài đặt);
+\item gõ (và hiển thị) được tiếng Việt;
+\item đã biên dịch được một tài liệu ví dụ với nội dung tương tự sau:
+\begin{verbatim}
+\documentclass{report}
+\usepackage[utf8]{vietnam}
+\begin{document}
+Tiếng Việt
+\end{document}
+\end{verbatim}
+\end{itemize}
+
+Nếu bạn chưa thực hiện được các bước trên, xin vui lòng tham khảo các
+tài liệu hoặc các diễn đàn liên quan trước khi tiếp tục.
+
+Tài liệu này chỉ đề cập đến các font có trong \<VNTEX>, và các font có
+hỗ trợ cho tiếng Việt được phân phối cùng với các hệ thống \<TEX>
+thông dụng hiện nay như \<TEXLIVE> hay \<MIKTEX>. Còn nhiều font khác
+tuy cũng hỗ trợ tiếng Việt nhưng không được đề cập ở đây vì nhiều lý
+do khác nhau. \<VNTEX> chỉ hỗ trợ các font:
+\begin{itemize}
+\item có chất lượng tương đối tốt;
+\item miễn phí, có bản quyền rõ ràng và có thể phân phối lại;
+\item có thể dùng được với ``classic'' (8-bit) \<TEX> và các \<DVI>
+  driver thông dụng như \<XDVI>, \<YAP>, \<DVIPS>, \<DVIPSONE> hay
+  \<DVIPDFM>. Ngoại lệ duy nhất là một số font \<TRUETYPE> (MS core)
+  yêu cầu phải có driver hỗ trợ font \<TRUETYPE>, ví dụ \<PDFTEX> hay
+  \<DVIPDFMX>.
+\end{itemize}
+
+Các hướng dẫn ở đây chỉ dùng cho \<LATEX>. Nếu bạn dùng \<CONTEXT>,
+xin vui lòng đọc tài liệu hướng dẫn dành cho \<CONTEXT>. Còn nếu bạn
+dùng \<PLAIN>, thì bạn phải tự mày mò lấy |:)|. Mẹo: có thể dùng gói
+\<PLNFSS> để dùng \<NFSS> với \<PLAIN>.
+
+\section{Cơ chế chọn font trong \<LATEX>} 
+Một chút kiến thức về \<NFSS> (cơ chế chọn font trong \<LATEX>) sẽ rất
+có ích ở đây. Chúng tôi sẽ giới thiệu \<NFSS> một cách nôm na (và đôi
+khi có thể thiếu chính xác), với hy vọng là làm như vậy sẽ dễ hiểu
+hơn.
+
+\subsection{Các thuộc tính của font}
+Khi chúng ta dùng \<MSWORD>, \<OOWRITER> hay một trình soạn thảo tương
+tự tạo một văn bản mới thì luôn có một font chữ mặc định, thường là
+Times New Roman, cỡ chữ 12pt, chữ thường (không nghiêng không
+đậm). Chúng ta có thể thay đổi font chữ mặc định bằng cách chọn chữ
+nghiêng, chữ đậm, hay thay đổi cỡ chữ. Như vậy để xác định một font,
+ta thấy chỉ dùng tên của font (Times) chưa đủ, mà ta còn phải mô tả
+thêm các tính chất khác, như độ nghiêng, độ đậm hay cỡ chữ. Các tính
+chất của một font ta gọi là các thuộc tính (attribute) của font. Khi
+ta thay đổi một font, thực ra là ta thay đổi (chọn) các thuộc tính
+khác nhau của font. Ta cũng có thể coi tên gọi của font là một thuộc
+tính. Ta có thể chọn kiểu chữ khác, ví dụ Arial, bằng cách thay đổi
+tên (hay ``thuộc tính tên'') của font.
+
+Khi ta dùng \<LATEX> thì cơ chế chọn font cũng hoạt động tương tự. Khi
+ta tạo một văn bản \<LATEX>, thì ban đầu cũng có một font mặc định,
+thường là font |cmr10| (Computer Modern, cỡ chữ 10pt, chữ thường).
+Các câu lệnh \<LATEX> dùng để thay đổi kiểu font mà ta vẫn hay gặp như
+|\textit|, |\texttt|, |\bf|, |\large|, \<...> thực ra là các lệnh dùng
+để thay đổi các thuộc tính của font. Ví dụ lệnh |\textit| sẽ chọn
+``thuộc tính nghiêng'' của font.
+
+Vậy giờ ta chỉ cần biết font trong \<LATEX> có các thuộc tính nào và
+cách thay đổi các thuộc tính đó là có thể chọn lựa font theo ý thích
+của mình.
+
+Các thuộc tính của font trong \<LATEX> là:
+\begin{description}
+\item[bảng mã (font encoding):] xác định font chứa các ký tự nào. Các
+  bảng mã thường gặp:
+\begin{itemize}
+\item |OT1| -- bảng mã dùng cho các font Compuder Modern (7-bit)
+\item |T1| -- bảng mã cho các font chứa các ký tự trong các ngôn ngữ latin
+Tây Âu (iso-8859-1) và Đông Âu (iso-8859-2)
+\item |T5| -- bảng mã cho tiếng Việt
+\end{itemize}
+
+\item[họ font (font family):] xác định kiểu (họ) font, tương tự như Times
+New Roman hay Arial. Vì nhiều lý do mà họ font trong \<LATEX> thường có tên
+rất ngắn (3--5 ký tự) và tương đối khó nhớ. Một số họ font thường gặp:
+\begin{itemize}
+\item |cmr| -- Computer Modern Roman
+\item |ptm| -- Times Roman
+\item |phv| -- Helvetica
+\end{itemize}
+
+\item [độ đậm (font series):] xác định độ đậm nhạt của font. Đôi khi cả
+thuộc tính chiều rộng (width) cũng được gán vào đây. Các giá trị
+thường gặp:
+\begin{itemize}
+\item |m| (medium) -- chữ thường (không đậm)
+\item |b| (bold) -- chữ đậm
+\item |bx| (bold extended) -- chữ đậm và rộng hơn chữ thường
+\end{itemize}
+
+\item [kiểu dáng (font shape):] xác định kiểu dáng font, ví dụ chữ thẳng
+hay chữ nghiêng. Các giá trị thường gặp:
+\begin{itemize}
+\item |n| -- chữ thường (thẳng)
+\item |it| -- chữ nghiêng ``italic''
+\item |sl| -- chữ nghiêng ``oblique''
+\item |sc| -- chữ ``smallcap'' (các chữ thường có hình dáng như chữ hoa,
+nhưng bé hơn)
+\end{itemize}
+Chữ nghiêng italic và oblique khác nhau ở chỗ hình dáng chữ nghiêng
+oblique trông giống như chữ thẳng (chỉ trừ mỗi khoản ``nghiêng''), còn
+chữ italic có hình dáng khác khá nhiều so với chữ thẳng, thường chữ
+italic có hình dáng gần với chữ viết tay hơn. Muốn biết rõ hơn bạn có
+thể phóng to và so sánh chữ |a| của chữ nghiêng italic với chữ thẳng.
+
+\item [cỡ chữ (font size):] xác định cỡ chữ.
+\end{description}
+
+Để thay đổi thuộc tính của font, ta có thể xem ví dụ sau:
+
+\begin{verbatim}
+\fontshape{it}
+\selectfont
+\end{verbatim}
+
+Ví dụ trên chọn giá trị ``nghiêng italic'' cho thuộc tính ``kiểu
+dáng'' (|fontshape|). Lưu ý là sau khi thay đổi thuộc tính font, ta
+phải dùng lệnh |\selectfont| để chọn font có thuộc tính mới. Cách chọn
+font như trong ví dụ trên ta ít khi gặp, vì ta hay dùng lệnh |\it|
+hoặc |\textit| để chọn chữ nghiêng. Các lệnh này thực ra là các lệnh
+gõ tắt (shortcut) để tiện cho người dùng. Dựa trên nguyên tắc này, ta
+có thể đoán được lệnh dùng để chọn font chữ đậm ta hay dùng (|\bf| hay
+|\textbf|) thực ra là lệnh gõ tắt của:
+
+\begin{verbatim}
+\fontseries{b}
+\selectfont
+\end{verbatim}
+
+Ta cũng có thể thay đổi nhiều thuộc tính cùng một lúc rồi dùng
+|\selectfont| để chọn font. Ví dụ sau sẽ chọn font vừa nghiêng vừa đậm:
+
+\begin{verbatim}
+\fontshape{it}
+\fontseries{b}
+\selectfont
+\end{verbatim}
+
+Đến đây chắc bạn cũng có thể đoán ra là các lệnh thay đổi cỡ chữ như
+|\large|, |\huge|,\<...> là các lệnh gõ tắt dùng để thay đổi thuộc
+tính |fontsize| của font.
+
+\subsection{Các họ (kiểu) chữ mặc định}
+Ta sẽ tìm hiểu thêm về việc thay đổi thuộc tính |fontfamily| của một
+font.  Còn |fontencoding| thì \emph{rất ít khi} cần thay đổi nên ta
+không đề cập đến ở đây.
+
+Khi ta bắt đầu một văn bản \<LATEX>, font chữ mặc định là kiểu chữ
+``có chân'' (roman, serif). Khi ta dùng lệnh |\sf| hay |\textsf|, thì
+\<LATEX> chuyển sang font chữ ``không chân'' (sans serif). Việc chuyển
+font này được thực hiện bởi các lệnh thay đổi thuộc tính ta đã biết:
+
+\begin{verbatim}
+\fontfamily{\sfdefault}
+\selectfont
+\end{verbatim}
+
+|\sfdefault| là một macro chứa giá trị |fontfamily| của font không
+chân mặc định, thường là |cmss| (Computer Modern Sans Serif). Tương tự
+như vậy, việc chuyển sang font ``máy chữ'' (typewriter) bằng lệnh
+|\tt| hay |\texttt| thực ra là việc thay đổi thuộc tính |fontfamily|
+như sau:
+
+\begin{verbatim}
+\fontfamily{\ttdefault}
+\selectfont
+\end{verbatim}
+
+Thông thường |\ttdefault| có giá trị |cmtt| (Computer Modern Typewriter).
+
+Ta tóm tắt lại các giá trị mặc định của |fontfamily| mà \<LATEX> dùng
+cho các họ chữ:
+\begin{itemize}
+\item |\rmdefault| -- dùng cho font có chân, thường là |cmr|. Font này
+  được chọn sau dòng |\begin{document}|
+\item |\sfdefault| -- dùng cho font không chân, thường là
+  |cmss|. Font này được chọn khi ta dùng lệnh |\sf| hay |\textsf|
+\item |\sfdefault| -- dùng cho font máy chữ, thường là |cmtt|. Font
+  này được chọn khi ta dùng lệnh |\tt| hay |\texttt|
+\end{itemize}
+
+Ví dụ khi ta muốn dùng font Bitstream Charter như font có chân mặc định
+trong văn bản, thì ta thêm dòng sau vào ``preamble'' của văn bản (phần
+trước |\begin{document}|):
+
+\begin{verbatim}
+\renewcommand{\rmdefault}{bch}
+\end{verbatim}
+
+Ta cũng có thể dùng gói |charter.sty| để kích hoạt font Bitstream Charter
+cho văn bản của mình bằng cách thêm vào preamble dòng sau:
+
+\begin{verbatim}
+\usepackage{charter}
+\end{verbatim}
+
+Nếu ta xem nội dung của gói |charter.sty| thì cũng sẽ thấy nội dung tương
+tự như trên.
+
+\section{Làm sao biết được có thể chọn font nào?}
+Đến đây chắc bạn đọc cũng hình dung ra được việc thay đổi font có
+chân, không chân và font máy chữ cho một văn bản thực ra chỉ là việc
+định nghĩa lại các macro |\rmdefault|, |\sfdefault| và
+|\ttdefault|. Vấn đề còn lại là làm sao biết được các giá trị
+|fontfamily| của font mà ta muốn dùng. Ví dụ ta muốn dùng font
+Palatino, làm sao biết được giá trị |fontfamily| của font này mà chọn?
+
+Cách đơn giản nhất là xem các mẫu font của \<VNTEX> (và một số font
+khác cũng hỗ trợ tiếng Việt) tại
+\href{http://vntex.sf.net/fonts/samples}{đây}. Ta xem thử một ví dụ sau:
+xem mẫu font \<URWVN>
+(\href{http://vntex.sf.net/fonts/samples/urwvn-test.pdf}{urwvn-test.pdf}),
+ta thấy có các cột (theo thứ tự từ trái sang phải):
+\begin{description}
+\item [NFSS] -- các thuộc tính của font như ta đã tìm hiểu, theo thứ tự\\
+|fontencoding/fontfamily/fontseries/fontshape|. Thuộc tính |fontsize| không
+được đề cập đến ở đây vì không cần thiết.
+\item [TFM] -- tên tập tin chứa font (tạm thời ta không cần quan tâm)
+\item [PostScript] -- tên ``thông thường'' của font
+\item [Sample] -- mẫu font
+\end{description}
+
+Ví dụ xem dòng đầu tiên ta thấy \textbf{NFSS} = |T5/uag/db/n| và
+\textbf{PostScript} = |VnURWGothicL-Demi|, có thể hiểu như sau: font
+này có tên thông thường là |VnURWGothicL-Demi|, và các thuộc tính
+\<NFSS> của font này là:\\[1ex]
+\begin{tabular}{ll}
+|fontencoding| & = |T5|\\
+|fontfamily|   & = |uag|\\
+|fontseries|   & = |db|\\
+|fontshape|    & = |n|\\
+\end{tabular}
+
+\selectfont
+
+
+Giả sử bây giờ ta muốn chọn font Century Schoolbook làm font có chân
+mặc định trong văn bản. Xem ở cột \textbf{PostScript} ta thấy các font
+trong họ này có tên bắt đầu với |VnCenturySchoolbookL| (có một số font
+cùng trong họ font này có tên \textbf{PostScript} là |N/A|, điều này
+tạm thời ta cũng chưa cần quan tâm). Xem ở cột \textbf{NFSS} ta thấy
+các font này có |fontfamily| là |unc|. Để chọn font này ta thêm vào
+preamble dòng:
+
+\begin{verbatim}
+\renewcommand{\rmdefault}{unc}
+\end{verbatim}
+
+Tương tự như vậy, nếu ta muốn chọn font VnNimbusSansL (giống như
+Helvetica) làm font không chân mặc định, thì ta dùng:
+
+\begin{verbatim}
+\renewcommand{\sfdefault}{uhv}
+\end{verbatim}
+
+Ta cũng có thể chọn một font tùy ý mà không cần phải thay đổi các giá
+trị mặc định. Ví dụ ta muốn dùng font VnURWGothicL-Demi chỉ cho một
+đoạn ngắn nào đó trong văn bản thì ta chọn font này dựa vào các thuộc
+tính ở cột \textbf{NFSS} như sau:
+
+\begin{verbatim}
+\fontencoding{T5}
+\fontfamily{uag}
+\fontseries{db}
+\fontshape{n}
+\selectfont
+\end{verbatim}
+
+Các lệnh trên có thể viết gọn hơn:
+\begin{verbatim}
+\usefont{T5}{uag}{db}{n}
+\end{verbatim}
+
+\section{Một số vấn đề liên quan}
+\subsection{Chọn font như thế nào là hợp lý?}
+Chọn font cũng như trang điểm, nếu không rành mà cứ dùng thật nhiều font
+cho một văn bản thì cũng như trang điểm dùng thật nhiều các mỹ phẩm khác
+nhau cho một khuôn mặt. Kết quả là ta tưởng ta đẹp trong khi người khác
+nhìn vào thấy buồn cười.
+
+Vậy làm sao để có thể ``rành''? Câu trả lời duy nhất theo chúng tôi là qua
+học hỏi, tìm tòi và kinh nghiệm thực tế. Bước đầu thì nên theo những hướng
+dẫn cơ bản, khi đã có kinh nghiệm thì ta có thể làm theo sở thích của mình.
+Các qui tắc có ích khi mới bắt đầu là:
+\begin{itemize}
+\item nên tránh dùng các lệnh chọn font của \<LATEX> phiên bản cũ (2.09) như
+|\bf|, |\it|, |\tt|\<...> Thay vào đó hãy dùng các lệnh tương ứng của
+\<LATEX>2e như |\textbf|, |\textit|, |\texttt|,\<...>  
+
+\item trong một văn bản chỉ nên dùng tối đa 3 họ font: có chân, không
+  chân và máy chữ
+
+\item nên thay đổi các họ font mặc định bằng các gói tương ứng nếu
+  có. Ví dụ nếu đã có gói |charter.sty| thì ta nên dùng
+
+\begin{verbatim}
+\usepackage{charter}
+\end{verbatim}
+
+thay vì 
+
+\begin{verbatim}
+\renewcommand{\rmdefault}{bch}
+\end{verbatim}
+
+Lý do chính là một số gói có thể chứa thêm các điều chỉnh cần thiết
+ngoài việc định nghĩa lại |\rmdefault|, |\sfdefault| hay
+|\ttdefault|. Ngoài ra một số gói có thể chọn nhiều font ``hợp nhau''
+cùng một lúc, Ví dụ gói |newcent.sty| ngoài việc chọn |pnc| (New
+Century SchoolBook) cho font có chân mặc định (|\rmdefault|) còn chọn
+|pag| (Avant Garde) cho font không chân mặc định (|\sfdefault|) và
+|pcr| (Courier) cho font máy chữ mặc định (|\ttdefault|), vì 3 font
+này có vẻ ``hợp nhau''.
+
+Các gói để chọn font cho \<VNTEX> sẽ được mô tả ở phần sau. 
+
+\item Chú ý là không phải cứ chọn font bằng gói là tối ưu, vì có một
+  số gói đã ``lỗi thời'' (obsolete). Nên đọc tài liệu
+  \href{http://ctan.org/tex-archive/info/l2tabu/english/l2tabuen.pdf}{l2tabuen}
+  để biết thêm thông tin về các gói lỗi thời và cách dùng các gói
+  tương ứng.
+
+\item nếu bạn muốn dùng một font mà không tìm được gói tương ứng, thì
+  nên nên tìm hiểu kỹ (qua tài liệu, Internet, các diễn đàn,\<...>) để
+  biết các họ font nào thích hợp với nhau,
+\end{itemize}
+
+\subsection{Chọn font toán như thế nào cho hợp lý?}
+Tài liệu tốt nhất cho đề tài này là
+\href{http://ctan.tug.org/tex-archive/info/Free_Math_Font_Survey/survey.html}{Free
+  Math Font Survey}. Hiện bản tiếng Việt chưa được dịch. Lưu ý có một
+số font trong tài liệu này chưa hỗ trợ tiếng Việt. Trong tương lai có
+thể chúng tôi sẽ Việt hóa các font này.
+
+\section{Cách chọn các font với \<VNTEX>} 
+\subsection{\<VNR>} 
+Các font \<VNR> là font mặc định khi dùng \<VNTEX> nên không cần phải
+làm gì thêm.
+
+\subsection{\<LM>} 
+Dự án font \<LM> nhằm thống nhất các bản ``địa phương hóa'' font \<CM>
+cho các ngôn ngữ khác nhau. Để dùng các font \<LM> thay cho font
+\<VNR>, bạn chỉ cần dùng:
+
+\begin{verbatim}
+\usepackage{lmodern}
+\end{verbatim}
+
+\subsection{Antykwa Torunska}
+Đây là bộ font có chân do nhà thiết kế chữ người Ba Lan Zygfryd
+Gardzielewski tạo ra, sau đó được Janusz Marian Nowacki chuyển sang
+định dạng \<T1> và thêm hỗ trợ cho nhiều ngôn ngữ khác trong đó có cả
+tiếng Việt. Bộ font này miễn phí và có sẵn trong nhiều bản phân phối
+\<TEX> thông dụng.  Bạn có thể đọc thêm về bộ font này tại
+\href{http://www.janusz.nowacki.strefa.pl}{đây}.
+
+Để dùng bộ font này bạn có thể dùng gói |anttor| với các lựa chọn khác
+nhau:\\[1ex]
+\begin{tabular}{ll}
+|\usepackage{anttor}| & chọn kiểu font thường\\
+|\usepackage[light]{anttor}| & chọn kiểu font mảnh\\
+|\usepackage[condensed]{anttor}| & chọn kiểu font hẹp\\
+|\usepackage[light,condensed]{anttor}| & chọn kiểu font vừa mảnh vừa hẹp\\
+\end{tabular}\\[1ex]
+
+\subsection{Kurier}
+Bộ font Kurier cũng do Janusz Marian Nowacki thực hiện và được công bố
+tại cùng địa chỉ với font Antykwa Torunska.
+
+Tương tự, để dùng bộ font này bạn có thể dùng gói |kurier| với các lựa
+chọn khác nhau:\\[1ex]
+\begin{tabular}{ll}
+|\usepackage{kurier}| & chọn kiểu font thường\\
+|\usepackage[light]{kurier}| & chọn kiểu font mảnh\\
+|\usepackage[condensed]{kurier}| & chọn kiểu font hẹp\\
+|\usepackage[light,condensed]{kurier}| & chọn kiểu font vừa mảnh vừa hẹp\\
+\end{tabular}\\[1ex]
+
+\subsection{Iwona}
+Bộ font Iwona cũng do Janusz Marian Nowacki thực hiện và được công bố tại 
+cùng địa chỉ với font Antykwa Torunska.
+
+Tương tự, để dùng bộ font này bạn có thể dùng gói |iwona| với các lựa chọn
+khác nhau:\\[1ex]
+\begin{tabular}{ll}
+|\usepackage{iwona}| & chọn kiểu font thường\\
+|\usepackage[light]{iwona}| & chọn kiểu font mảnh\\
+|\usepackage[condensed]{iwona}| & chọn kiểu font hẹp\\
+|\usepackage[light,condensed]{iwona}| & chọn kiểu font vừa mảnh vừa hẹp\\
+\end{tabular}\\[1ex]
+
+\subsection{\<URWVN>}
+Tài liệu hướng dẫn sử dụng cho các font \<PS> thông thường (35 font \<PS>
+``chuẩn'') cũng dùng được với các font \<URWVN>. Tài liệu này có tên là
+|psnfss2e.pdf| hoặc |psnfss2e.dvi| và thường có sẵn trong các bản \<TEX>.
+Nếu chưa có tài liệu này trên máy thì bạn có thể tải về từ 
+\href{http://www.ctan.org/tex-archive/macros/latex/required/psnfss/psnfss2e.pdf}{đây}.
+
+Ở đây chúng tôi chỉ ghi lại phần giới thiệu để bạn có thể sử dụng ngay các
+font này. Nếu bạn có thắc mắc gì xin hãy đọc tài liệu nguyên bản để biết
+thêm chi tiết.
+\begin{quotation}
+\parindent0pt
+\noindent Cách đơn giản nhất để sử dụng các font \<PS> thông dụng là
+định nghĩa lại các giá trị mặc định của các font có chân (roman),
+không chân (sans serif) và font máy chữ (typewriter). Để làm việc này
+bạn có thể sử dụng các gói trong bảng dưới đây. Dòng đầu tiên liệt kê
+các họ font mặc định (Computer Modern). Cột nào trống có nghĩa là gói
+tương ứng không thay đổi giá trị font mặc định cho cột đó. Có một số
+gói được giải thích chi tiết hơn, ví dụ gói |helvet|, |mathpazo| và
+|mathptmx|.
+
+\begin{table}[!htb]
+\caption{Các gói dùng cho việc sử dụng các font \<PS> thông dụng}
+\medskip
+\begin{center}
+\UndefineShortVerb{\|}
+\renewcommand{\arraystretch}{1.2}
+\newcommand{\Lpack}[1]{\textsf{#1}}
+\def\NL{\hfil\break}
+\ifx\printversion\undefined
+  %\footnotesize
+  %\begin{tabular}{|l|p{1.8cm}p{2.2cm}p{2.4cm}p{2.2cm}|}
+  \small
+  \begin{tabular}{|l|p{2.8cm}p{2.4cm}p{2.6cm}p{2.3cm}|}
+\else
+  \small
+  \begin{tabular}{|l|p{2.8cm}p{2.4cm}p{2.6cm}p{2.3cm}|}
+\fi
+  \hline
+  \textbf{tên gói} & \textbf{font có \NL chân \NL(roman)}  &
+  \textbf{font \NL không chân \NL (sans serif)} & 
+  \textbf{font máy chữ \NL(typewriter)} &
+  \textbf{font công \NL thức toán} \\\hline\hline
+  (none)           & CM Roman        & CM Sans Serif 
+  & CM Typewriter       & $\approx$ CM Roman\\\hline
+  \Lpack{mathpazo} & Palatino 
+  &
+  &
+  & $\approx$ Palatino\\\hline
+  \Lpack{mathptmx} & Times  
+  &
+  &
+  & $\approx$ Times\\\hline
+  \Lpack{helvet}   & 
+  & Helvetica
+  &
+  & \\\hline
+  \Lpack{avant}    & 
+  & Avant~Garde
+  &
+  & \\\hline
+  \Lpack{courier}  &
+  &
+  & Courier 
+  & \\\hline
+  \Lpack{chancery} & Zapf Chancery
+  & 
+  & 
+  & \\\hline
+  \Lpack{bookman}  & Bookman
+  & Avant~Garde
+  & Courier
+  & \\\hline
+  \Lpack{newcent}  & \raggedright New Century Schoolbook
+  & Avant~Garde
+  & Courier
+  & \\\hline
+  \Lpack{charter}  & Charter
+  & 
+  & 
+  & \\\hline
+\end{tabular}
+\end{center}
+\end{table}
+
+
+Ví dụ khi ta dùng 
+\begin{verbatim}
+\usepackage{bookman}
+\end{verbatim}
+
+thì sẽ được\\[1ex]
+\begin{tabular}{ll}
+font có chân & = Bookman\\
+font không  chân & = Avant~Garde\\
+font máy chữ & = Courier\\
+\end{tabular}\\[1ex]
+do gói này định nghĩa lại cả 3 họ font. Còn nếu ta dùng
+\begin{verbatim}
+\usepackage{charter}
+\end{verbatim}
+
+thì sẽ được\\[1ex]
+\begin{tabular}{ll}
+font có chân & = Charter\\
+font không  chân & = CM Sans Serif (default)\\
+font máy chữ & = CM Typewriter (default)\\
+\end{tabular}\\[1ex]
+do gói này chỉ định nghĩa lại họ font có chân, còn 2 họ font kia vẫn giữ giá
+trị mặc định.
+
+\end{quotation}
+
+Một lưu ý quan trọng là các tên \<PS> của các font \<URWVN> (thực chất
+là tên các font \<URW> có thêm prefix |Vn|) không giống như tên của 35
+font \<PS> chuẩn, vì các tên này do \<URW> đặt cho các font của mình
+trong khi tên của 35 font \<PS> chuẩn do Adobe đặt.  Bạn có thể tham
+khảo bảng dưới đây để biết các font nào tương đương với nhau:
+
+\begin{center}
+\UndefineShortVerb{\|}
+\renewcommand{\arraystretch}{1.2}
+\begin{tabular}{|l|l|}
+\hline
+VnURWGothicL & AvantGarde\\
+VnURWBookmanL & Bookman\\
+VnNimbusMonoL & Courier\\
+VnNimbusSansL & Helvetica\\
+VnURWPalladioL & Palatino\\
+VnNimbusRomanNo9L & Times\\
+VnURWChanceryL & ZapfChancery\\
+\hline
+\end{tabular}
+\end{center}
+
+
+\subsection{Bitstream Charter}
+Dùng gói |charter| như sau:
+\begin{verbatim}
+\usepackage{charter}
+\end{verbatim}
+
+\subsection{MS core}
+Các font MS core do Monotype và Linotype thực hiện và bán lại cho
+Microsoft (trừ các font Tahoma và Verdana do Microsoft tự thực
+hiện). Các font này có định dạng \<TRUETYPE> và yêu cầu phải có driver
+hỗ trợ font \<TRUETYPE>, ví dụ \<PDFTEX> hay \<DVIPDFMX>.
+
+Hiện nay chưa có gói nào hỗ trợ việc dùng các font này, do đó ta phải
+tự định nghĩa lại các họ font mặc định |\rmdefault|, |\sfdefault| và
+|\ttdefault| như đã trình bày ở trên.  Ở đây chúng tôi chỉ nêu một ví
+dụ: giả sử sau khi xem mẫu font mscore tại
+\href{http://vntex.sf.net/fonts/samples/mscore-test.pdf}{đây}, ta muốn
+dùng font Verdana làm font không chân mặc định. Các font này có thuộc
+tính |fontfamily| là |jvn|, do đó ta cần thêm vào preamble dòng:
+
+\begin{verbatim}
+\renewcommand{\sfdefault}{jvn}
+\end{verbatim}
+
+Muốn sử dụng các font còn lại ta làm tương tự.
+
+Nếu bạn muốn viết các gói để hỗ trợ các font này thì chúng tôi rất
+hoan nghênh.
+
+Đa số các font trong bộ font này đều có phiên bản tương ứng trong bộ
+\<URWVN> (trừ các font Tahoma và Verdana). Bạn có thể dùng font nào
+bạn thích hơn. Theo ý kiến chủ quan của chúng tôi thì các font
+\<URWVN> có các dấu tiếng Việt ``đẹp'' hơn.
+
+\section{Góp ý}
+Mọi ý kiến đóng góp xin gởi đến các tác giả |hanthethanh| hoặc
+|h2vnteam| tại |gmail| chấm |com|.
+\end{document}
diff --git a/Master/texmf-dist/source/generic/vntex/doc/vn-min-print.tex b/Master/texmf-dist/source/generic/vntex/doc/vn-min-print.tex
new file mode 100644
index 00000000000..f610e7d9875
--- /dev/null
+++ b/Master/texmf-dist/source/generic/vntex/doc/vn-min-print.tex
@@ -0,0 +1,2 @@
+\RequirePackage[monochrome]{color}
+\input{vn-min.tex}
diff --git a/Master/texmf-dist/source/generic/vntex/doc/vn-min.tex b/Master/texmf-dist/source/generic/vntex/doc/vn-min.tex
new file mode 100644
index 00000000000..459a98e18b3
--- /dev/null
+++ b/Master/texmf-dist/source/generic/vntex/doc/vn-min.tex
@@ -0,0 +1,109 @@
+\documentclass[a4paper,12pt]{article}
+\usepackage[
+ a4paper,
+ nohead,
+ nofoot,
+ top=2cm,
+ bottom=2cm,
+ left=2cm,
+ right=2cm,
+ pdftex]{geometry}
+% \usepackage{array}
+\usepackage{fancyvrb}
+\usepackage{url}
+\usepackage{charter}
+\usepackage{multicol}
+\usepackage[colorlinks,bookmarks=false]{hyperref}
+\usepackage[vietnam,english]{babel}
+
+% \pagestyle{empty}
+\def\arraystretch{1.3}
+\DefineShortVerb{\|}
+\parskip.5\baselineskip
+\parindent0pt
+\raggedbottom
+
+\input{abbr.tex}
+\begin{document}
+
+\title{\bfseries Minimal steps to typeset Vietnamese}
+\author{\fontencoding{T5}\selectfont H\`an Th\'\ecircumflex{} Th\`anh}
+\maketitle
+
+This document tries to answer the question that has been often asked:
+\textit{How can I typeset \textbf{just a few Vietnamese words} in my
+document, which is in English (or French/German/...)?}
+
+The answer depends very much on a particular scenario, however I
+assume that you are in a hurry, you don't want to bother with issues like
+how to display and write Vietnamese in your \<TEX>  editor. You only have a few
+Vietnamese words in your \<LATEX> file and you would like to see them
+properly displayed in your final \<PDF> or \<PS> file.
+
+\begin{enumerate}
+\item As the very first requirement, you must have some minimal \<LATEX>
+support for Vietnamese:
+\begin{itemize}
+\item Check whether you have \<VNTEX> installed. \<VNTEX> is included
+in \<TETEX>, \<MIKTEX> and \<TEXLIVE>. 
+
+\item If the above is not the case, try to download and install \<VNTEX> by
+following the instructions at \url{http://vntex.sf.net/download/vntex}.
+
+\item If you can't install \<VNTEX>, you must have at least Latin Modern
+fonts installed. Then download
+\url{http://vntex.sf.net/download/vntex-support/t5enc.def} and put it to the
+directory where your \<LATEX> file is.
+
+\item If all the above fails, try to get help from someone else to solve
+at least one of those issues.
+\end{itemize}
+
+\item  Make sure you have package |fontenc| loaded with T5 encoding. For
+example, if your document contains European languague(s) only, then you
+should have a line saying
+
+\begin{verbatim}
+\usepackage[T1,T5]{fontenc}
+\end{verbatim}
+
+in your preamble.
+
+\item An example how to input Vietnamese words may look like this:
+
+\begin{verbatim}
+{\fontencoding{T5}\selectfont Ti\'\ecircumflex{}ng Vi\d\ecircumflex{}t}
+\end{verbatim}
+
+which gives the output as \texttt{\fontencoding{T5}\selectfont
+Ti\'\ecircumflex{}ng Vi\d\ecircumflex{}t}.
+
+\item The following table contains all Vietnamese letters for your
+reference:
+
+{\fontencoding{T5}\selectfont
+\input{test-accents}
+}
+
+\item If you have quite a lot of Vietnamese words, then it can be somewhat
+tedious to translate them to the above form (often called as \<LATEX>
+Internal Character Representation -- LICR). On \<WINDOWS> you can use the
+package \url{http://vntex.sf.net/download/vntex-support/tovntex.zip}
+to translate text in clipboard from VIQR or UTF-8 to LICR by one key press.
+
+The same (or close) convenience could be made for \<UNIX>/\<LINUX>
+users, but at somewhat higher cost due to deficiencies of \<UNIX>-like
+systems. So if you don't use \<WINDOWS> then you are out of luck, sorry.
+However, if you use \<VIM>, you can still download the package mentioned
+above, and use the vim script inside the zip archive to do the conversion.
+If you want to make this easier for \<UNIX> users then let me know.
+
+\item If you still have questions, join the \<VNTEX> mailing list
+at \url{https://lists.sourceforge.net/lists/listinfo/vntex-users}.
+
+\end{enumerate}
+
+Good luck!
+
+% \DefineShortVerb{\|}
+\end{document}
diff --git a/Master/texmf-dist/source/generic/vntex/doc/vntex-man-print.tex b/Master/texmf-dist/source/generic/vntex/doc/vntex-man-print.tex
new file mode 100644
index 00000000000..5c1c3a15287
--- /dev/null
+++ b/Master/texmf-dist/source/generic/vntex/doc/vntex-man-print.tex
@@ -0,0 +1,2 @@
+\RequirePackage[monochrome]{color}
+\input{vntex-man.tex}
diff --git a/Master/texmf-dist/source/generic/vntex/doc/vntex-man.tex b/Master/texmf-dist/source/generic/vntex/doc/vntex-man.tex
new file mode 100644
index 00000000000..63b57ecfdcc
--- /dev/null
+++ b/Master/texmf-dist/source/generic/vntex/doc/vntex-man.tex
@@ -0,0 +1,514 @@
+\documentclass[12pt,a4paper]{article}
+\usepackage{url}
+\usepackage[colorlinks,bookmarks=false]{hyperref}
+\usepackage{fancyvrb}
+\usepackage[utf8]{vietnam}
+\usepackage{charter}
+\usepackage{ifpdf}
+\usepackage{microtype}
+% \usepackage{graphicx}
+% \usepackage{array}
+
+\parindent0pt
+\parskip.4\baselineskip
+\def\arraystretch{1.3}
+\hyperlinkfileprefix{}
+
+
+\advance\topmargin by -2cm
+\advance\textheight by 3cm
+\advance\footskip by .5cm
+\advance\oddsidemargin by -0.5cm
+\advance\textwidth by 1cm
+
+\input{abbr.tex}
+
+%% These abbrs are are not defined in abbr.tex:
+\abbr{FD}{FD}{}
+\abbr{MAKEINDEX}{MakeIndex}{}
+\abbr{LATEXPIX}{LaTeXPIX}{}
+
+\newcommand{\htmlheader}
+{Hỗ trợ tiếng Việt cho \<TEX>}
+
+\newcommand{\htmlfooter}{}
+
+\begin{document}
+\setcounter{tocdepth}{1}
+\setcounter{secnumdepth}{1}
+\DefineShortVerb{\|}
+
+\title{\<VNTEX>}
+
+% \noindent
+% Chào bạn đã đến với trang web của \<VNTEX>.  
+
+% \HCode{<h2>}
+% Các tin đáng chú ý
+% \HCode{</h2>}
+% \begin{itemize}
+% \item 06/10/2006: thêm phần hướng dẫn dịch bản tiếng Việt của 
+% \href{http://www.tug.org/tex-archive/info/Free_Math_Font_Survey/survey.html}
+% {Free Math Font Survey} ở phần \hyperlink{tai-lieu-vntex}{Tài liệu}
+
+% \item 05/10/2006: cập nhật bản dịch Free Math Font Survey tại 
+% \href{doc/survey-vn.pdf}{trang chủ} và
+% \href{http://vntex.sarovar.org/survey-vn.pdf}{mirror tại sarovar}
+
+% \item 04/09/2006: công bố \href{download/vntex-beta}{vntex-beta-20060904}
+
+% \item 19/08/2006: công bố phiên bản \<TRUETYPE> của bộ font \<URWVN>-3.03
+% tại \href{http://forum.vnoss.org/viewtopic.php?id=3334}{\<VNOSS>}. Xem 
+% \href{fonts/urwvn-ttf}{hướng dẫn cài đặt}.
+
+% \item 08/08/2006: hoàn thành việc Việt hóa các text font trong
+% tài liệu
+% \href{http://www.tug.org/tex-archive/info/Free_Math_Font_Survey/survey.html}
+% {Free Math Font Survey} và công bố
+% \href{fonts/samples/survey-vn.pdf}{bản dịch}
+
+% % \item 18/07/2006: cập nhật mục \hyperlink{du-dinh-phat-trien}{dự
+% % định phát triển}.
+
+% \item 16/07/2006: thêm mẫu font mới: 
+% VnGaramond
+% (\href{http://vntex.sf.net/fonts/samples/garamondvn-test.pdf}{test},
+%  \href{http://vntex.sf.net/fonts/samples/garamondvn-sample.pdf}{sample})
+% và VnGrotesq
+% (\href{http://vntex.sf.net/fonts/samples/grotesqvn-test.pdf}{test},
+%  \href{http://vntex.sf.net/fonts/samples/grotesqvn-sample.pdf}{sample}). Các
+%  font này sẽ được công bố để người dùng tải về trong thời gian tới.
+
+% \item 13/07/2006: hướng dẫn cách tạo ``searchable'' \<PDF> với tiếng Việt. 
+% Xem \hyperlink{cmap-vn}{chi tiết}.
+
+% \item 24/06/2006: hỗ trợ \<UNICODE> bookmarks cho \<PDF>.
+% Xem \hyperlink{bookmark-vn}{chi tiết}.
+
+% \item 16/06/2006: công bố phiên bản chính thức mới của trang web \<VNTEX>
+
+% \item 05/06/2006: công bố phiên bản thử nghiệm mới của trang web
+% \<VNTEX>, cùng với một số gói mới: \hyperlink{more-extsizes}{more-extsizes}
+% và \hyperlink{makeindex-vn}{makeindex-vn}.
+
+% \item 03/06/2006: sửa lỗi các tập \<FD> cho font \<VNR>. Xem 
+% \hyperlink{cap-nhat-vnr-fd}{chi tiết}.
+
+% \item 26/05/2006: công bố phiên bản \<TRUETYPE> của bộ font \<URWVN>. Xem 
+% \href{fonts/urwvn-ttf}{chi tiết}.
+
+% \item 20/09/2005: công bố \<VNTEX>-3.02
+
+% \item 20/09/2005: công bố \href{fonts/samples}{mẫu font}
+% cho \<VNTEX>
+
+% \item 01/12/2004: \<CONTEXT> đã
+% \href{http://vnoss.org/forum/viewtopic.php?id=506}{hỗ trợ tiếng Việt}
+
+% \end{itemize}
+
+{\huge\centering\htmlheader\par}
+%\vspace*{10pt}
+\begin{center}
+  Hàn Thế Thành
+\end{center}
+
+\section{Giới thiệu}
+% \subsection{\<VNTEX>, \<LATEX>, \<CONTEXT>,\<...> là gì vậy?}
+% If you are new to \<TEX>, see \url{http://en.wikipedia.org/wiki/TeX} for a
+% basic explanation of \<TEX> and related programs. The \<TUG> (\<TEX> Users
+        % roup) homepage at \url{http://tug.org} also contains useful introductory
+% material to \<TEX>.
+
+\subsection{\<VNTEX> là gì?}
+\<VNTEX> là một gói chứa các hỗ trợ cần thiết cho việc sử dụng tiếng Việt
+với \<TEX>. Trang web này chứa các thông tin về gói \<VNTEX> và các vấn đề
+liên quan đến tiếng Việt trong \<TEX>. Chắc hẳn khi tìm đến với \<VNTEX>
+bạn đã ít nhiều biết đến thế giới \<TEX>, và bạn cần \<VNTEX> cho việc dùng
+tiếng Việt với \<TEX>.
+
+Nếu bạn chưa từng sử dụng \<TEX>, có lẽ trang web này không
+thích hợp lắm cho việc bắt đầu tìm hiểu về \<TEX>; bạn có thể
+tham khảo một số địa chỉ sau:
+\begin{enumerate}
+\item Tiếng Việt:
+\begin{itemize}
+\item \href{http://forum.vnoss.org/viewforum.php?id=10}{Diễn đàn \<VNOSS>}
+\item \href{http://viettug.org}{ViệtTUG}
+\item \href{http://vi.wikipedia.org/wiki/TeX}{Định nghĩa \<TEX> tại
+wikipedia bằng tiếng Việt} 
+\end{itemize}
+\item Tiếng Anh:
+\begin{itemize}
+\item \href{http://tug.org}{TUG}
+\item \href{http://en.wikipedia.org/wiki/TeX}{Định nghĩa \<TEX> tại
+wikipedia bằng tiếng Anh}
+\end{itemize}
+\end{enumerate}
+
+Còn nếu bạn đang tìm câu trả lời cho một vấn đề trong \<TEX> nhưng không
+liên quan đến tiếng Việt (ví dụ làm sao để gõ một công thức hay chèn một
+hình ảnh vào văn bản) thì bạn có thể tìm hiểu tại các diễn đàn hay
+đọc các tài liệu trong mục \hyperlink{tro-giup}{Tài liệu}.
+
+Gói \<VNTEX> chứa các thành phần sau:
+\begin{itemize}
+\item các font tiếng Việt,
+\item hỗ trợ tiếng Việt cho \<LATEX> (input encoding + font encoding)
+\item một số (ít) tài liệu và ví dụ, cùng với các mẫu font hỗ trợ tiếng
+Việt
+\end{itemize}
+
+\<VNTEX> được xây dựng tuân theo các qui ước chung của cộng đồng người dùng
+\<TEX>. Việc này nhằm hạn chế bớt các xung đột có thể xảy ra khi dùng
+\<VNTEX> với các ngôn ngữ hay các gói khác, cũng như giúp việc tích hợp
+\<VNTEX> vào các hệ thống \<TEX> thuận lợi hơn.
+
+\<VNTEX> đã được tích hợp vào một số hệ thống \<TEX> thông dụng như
+\<TEXLIVE>, \<TETEX> và \<MIKTEX>.
+
+\subsection{Tóm tắt lịch sử phát triển}
+\begin{itemize}
+\item 01/2000 -- phát hành phiên bản đầu tiên của \<VNTEX> (chưa được đánh số).
+Phiên bản này chưa có các font \<T1>.
+
+\item 08/2002 -- phát hành phiên bản 1.2 của \<VNTEX>. Bản này đã chứa dạng
+\<T1> của các font \<VNR> (được tạo ra tự động bằng \<TEXTRACE>, chất lượng
+tạm dùng được). Các font \<PS> thông dụng cũng được hỗ trợ tiếng Việt qua
+cơ chế ``virtual font'' (dấu khá xấu do dùng các ký tự có sẵn để vẽ).
+
+\item 03/2003 -- phát hành phiên bản 2.0 của \<VNTEX>. Phiên bản này đã
+chứa định dạng \<T1> của các font \<VNR>, dựa trên các font \<T1> \<CMR> do
+\<BLUESKY> thực hiện. Các font \<URWVN> cũng được phát hành trong phiên bản
+này. Chi tiết về việc tạo ra các font này có thể xem tại
+\href{http://www.tug.org/TUGboat/Articles/tb24-1/thanh.pdf}{đây}. Phiên bản
+\<VNTEX> này sau đó đã được đưa vào \<TETEX>, \<MIKTEX> và \<TEXLIVE>.
+
+\item 09/2005 -- phát hành phiên bản 3.02 của \<VNTEX>.
+\end{itemize}
+
+\subsection{Tác giả}
+Phần lớn \<VNTEX> do \<THANH> viết, phần hỗ trợ cho \<LATEX> do Werner
+Lemberg viết. Ngoài ra còn có sự đóng góp của nhiều người khác (xin xem
+tiếp ở mục sau).
+
+\subsection{Những người tham gia đóng góp cho \<VNTEX>}
+Những người trong danh sách dưới đây (theo thứ tự ABC) đã tham gia đóng
+góp cho sự phát triển của \<VNTEX> dưới các hình thức khác nhau: 
+
+Huỳnh Kỳ Anh,
+Nguyễn Đại Quý,
+Nguyễn Phi Hùng,
+Nguyễn Tân Khoa,
+Reinhard Kotucha,
+Thái Phú Khánh Hòa,
+Ulrich Dirr,
+Vladimir Volovich.
+
+Nếu bạn thấy cần thêm ai vào danh sách này xin vui lòng góp ý
+cho chúng tôi.
+
+\subsection{Quản lý}
+Hiện nay gói \<VNTEX> do \<THANH>, Werner Lemberg và Reinhard Kotucha quản
+lý.
+
+\subsection{Giấy phép và bản quyền}
+Các font \<URWVN> và Bitstream được phân phối theo giấy phép
+\<GPL>, các thứ còn lại theo giấy phép \<LPPL> ($\ge$\,1.3).
+
+Vui lòng xem \href{http://www.gnu.org/licenses/gpl.txt}{\<GPL>} và
+\href{http://www.latex-project.org/lppl.txt}{\<LPPL>} nếu cần biết thêm chi tiết.
+
+\subsection{Về trang web này}
+Trang web này do \<THANH> và \<THAIHOA> xây dựng và quản lý, cùng với
+sự đóng góp của Tôn Nữ Thục Anh. Riêng phần
+\href{http://vntex.sf.net/download}{download} do Reinhard Kotucha quản
+lý. Mọi ý kiến đóng góp xin gởi đến |hanthethanh| hoặc |h2vnteam| tại
+|gmail| chấm |com|.
+
+\section{Cài đặt và cập nhật}
+\subsection{Cài đặt}
+Phiên bản chính thức mới nhất của \<VNTEX> được công bố tại
+\href{http://vntex.sf.net/download/vntex}{đây}, có hướng dẫn cài đặt kèm theo.  Tuy nhiên
+bạn nên kiểm tra kỹ xem hệ thống \<TEX> bạn đang sử dụng đã có sẵn
+\<VNTEX> chưa. Nếu bạn dùng \<UNIX> thì nên dùng \<TEXLIVE>
+($\ge$\,2005), còn nếu dùng \<WINDOWS> thì nên dùng \<MIKTEX>
+($\ge$\,2.5). Làm như vậy bạn sẽ có sẵn \<VNTEX> mà không cần phải tự
+cài đặt. Lưu ý là bản \<VNTEX> có trong \<TETEX>-3.0 có một số trục
+trặc khi dùng mã \<UTF8>; nếu bạn dùng \<TETEX> thì nên tự cài đặt
+thêm \<VNTEX> phiên bản $\ge$\,3.02, hoặc chuyển sang dùng \<TEXLIVE>.
+
+Ngoài ra, để sử dụng được \<VNTEX> bạn cần phải có một trình soạn thảo để
+gõ và hiển thị được tiếng Việt. Việc cài đặt những thứ này phụ thuộc vào
+từng hệ thống nên chúng tôi không mô tả chi tiết ở đây được. Chúng tôi chỉ
+có vài gợi ý cho người mới làm quen:
+\begin{itemize}
+\item Nếu bạn dùng \<WINDOWS>, hãy chọn:
+\begin{itemize}
+\item hệ thống \<TEX>: \<MIKTEX>
+\item bộ gõ tiếng Việt: \<UNIKEY>
+\item trình soạn thảo: \<TEXMAKER> hoặc \<WINSHELL>
+\end{itemize}
+
+\item Nếu bạn dùng \<UNIX>, hãy chọn:
+\begin{itemize}
+\item hệ thống \<TEX>: \<TEXLIVE>
+\item bộ gõ tiếng Việt: \<XUNIKEY>  hoặc \<XVNKB>
+\item trình soạn thảo: \<TEXMAKER> hoặc \<KILE>
+\end{itemize}
+\end{itemize}
+
+Hướng dẫn cài đặt \<VNTEX> cụ thể cho từng hệ thống hiện chưa có. Nếu bạn
+biết có tài liệu nào viết về vấn đề này, hoặc bạn muốn viết hướng dẫn cài
+đặt \<VNTEX> cho 1 hệ thống cụ thể, xin vui lòng liên hệ với chúng tôi.
+
+\subsection{Cập nhật}
+\hypertarget{cap-nhat}{}
+Đây là nơi công bố các gói sửa lỗi cho bản \<VNTEX> đã chính thức công bố,
+hoặc những thành phần mới của \<VNTEX> chưa được tích hợp vào bản chính
+thức. Những thứ công bố ở đây sẽ được đưa vào phiên bản \<VNTEX> kế tiếp.
+
+\begin{description}
+\item[Bản sửa lỗi cho các tập \<FD> của bộ font \<VNR>:]
+  \hypertarget{cap-nhat-vnr-fd}{} sửa một số lỗi trong các tập \<FD>
+  của font \<VNR>. Tải gói
+  \href{http://vntex.sf.net/download/vntex-updates/vntex-update-20060603.zip}{này}
+  về, sau đó bung nén và ghi đè các tập này lên các tập \<FD> của
+  \<VNTEX>.
+\end{description}
+
+
+\section{Tài liệu}
+\hypertarget{tai-lieu}{}
+Đây là nơi thu thập các tài liệu tiếng Việt về \<TEX> và các  chủ đề liên
+quan. Đang được cập nhật và sắp xếp dần.
+
+\subsection{Tài liệu viết cho \<VNTEX>} 
+\hypertarget{tai-lieu-vntex}{}
+Bao gồm các tài liệu về các chủ đề liên quan trực tiếp đến \<VNTEX>.
+\begin{description}
+\item [Hướng dẫn sử dụng font với \<VNTEX>:]
+Tài liệu hướng dẫn sử dụng font với \<VNTEX> do \<THANH> và \<THAIHOA>
+viết. Xem:
+\href{http://vntex.sf.net/doc/vn-fonts.html}{\<HTML>},
+\href{http://vntex.sf.net/doc/vn-fonts.pdf}{\<PDF>},
+\href{http://vntex.sf.net/doc/vn-fonts-src.zip}{\<SRC>}.
+
+\item [Dịch ``Free Math Font Survey'' với \<MIKTEX>:]
+Tài liệu mô tả các bước cần thiết để dịch bản tiếng Việt của tài liệu
+\href{http://www.tug.org/tex-archive/info/Free_Math_Font_Survey/survey.html}
+{Free Math Font Survey} với \<MIKTEX>-2.5. Xem:
+\href{http://vntex.sf.net/doc/survey-vn-miktex.html}{\<HTML>},
+\href{http://vntex.sf.net/doc/survey-vn-miktex.pdf}{\<PDF>}.
+\end{description}
+
+
+\subsection{Tài liệu viết cho \<LATEX>} 
+Bao gồm các tài liệu được viết cho \<LATEX> và các vấn đề liên quan, được
+dịch từ tiếng Anh.
+
+\subsubsection{Các tài liệu hướng dẫn sử dụng \<LATEX>} 
+\begin{description}
+\item[Giới thiệu ngắn về \<LATEX>2e:]
+Tài liệu ``Giới thiệu ngắn về \<LATEX>2e'' (A not so short
+introduction to \<LATEX>) của Tobias Oetiker 
+do Nguyễn Tân Khoa dịch. Tải về:
+\href{http://vntex.sf.net/doc/lshort-vn.pdf}{\<PDF>},
+\href{http://vntex.sf.net/doc/lshort-vn-src.zip}{\<SRC>}.
+
+\item[Giáo trình \<LATEX>:]
+Tài liệu ``Giáo trình \<LATEX>'' (A course of \<LATEX>) của Gary
+L.~Gray do Nguyễn Phi Hùng dịch. Tải về:
+\href{http://vntex.sf.net/doc/latex-course-vn.pdf}{\<PDF>},
+\href{http://vntex.sf.net/doc/latex-course-vn-src.zip}{\<SRC>}.
+
+\item[Hướng dẫn viết luận án bằng \<LATEX>:]
+Tài liệu hướng dẫn thiết kế luận án tốt nghiệp bằng \<LATEX> được biên soạn bởi by
+Dr.~Nicola Talbot và do \<THAIHOA> dịch. Có thể tải về từ
+\href{http://theoval.cmp.uea.ac.uk/~nlct/latex/thesis_viet/index.html}{đây}.
+\end{description}
+
+% \subsubsection{Các tài liệu hướng dẫn sử dụng font với \<LATEX>2e} 
+% \begin{description}
+% \item[
+% \end{description}
+
+\subsection{Tài liệu cho một số công cụ liên quan}
+\begin{description}
+\item[Hướng dẫn sử dụng \<TEXMAKER>]
+\<TEXMAKER> là một chương trình soạn thảo \<TEX> chạy trên \<UNIX>/\<LINUX>
+và \<WINDOWS>, hỗ trợ \<UNICODE> và thích hợp với người dùng mới bắt đầu. Hướng dẫn
+sử dụng \<TEXMAKER> do \<THAIHOA> dịch. Tải về:  
+\href{http://vntex.sf.net/doc/texmaker-vn.pdf}{\<PDF>}.
+
+\item[Hướng dẫn sử dụng \<LATEXPIX>]
+\<LATEXPIX> một công cụ dùng để vẽ hình cho \<LATEX>. Phần mềm này 
+thích hợp cho những ai mới bắt đầu với \<LATEX>. 
+Tài liệu hướng dẫn sử dụng do \<THAIHOA> dịch. Tải về:
+\href{http://vntex.sf.net/doc/LaTeXPiX-vn.pdf}{\<PDF>}, hoặc bản \<PDF>
+\href{http://members.home.nl/nickvanbeurden/LaTeXPiX_vietnamese.pdf}{gốc}.
+\end{description}
+
+
+\section{Vấn đề liên quan}
+\hypertarget{van-de-lien-quan}{}
+\subsection{Sử dụng tiếng Việt với \<CONTEXT>}
+\<CONTEXT> đã hỗ trợ tiếng Việt. Xem
+\href{http://forum.vnoss.org/viewtopic.php?id=506}{tại đây} để biết thêm chi tiết
+
+\hypertarget{more-extsizes}{}
+\subsection{Sử dụng gói \texttt{extsizes} với \<VNTEX>}
+Để sử dụng gói |extsizes| với \<VNTEX>, trước tiên cần phải cập nhật các
+tập \<FD> cho các font \<VNR>. Xem thêm 
+\href{http://vntex.sf.net/download/vntex-updates}{chi tiết}.
+
+Để sử dụng được gói |extsizes| với các cỡ chữ khác như 13pt và 13.5pt,
+tải và cài đặt gói
+\href{http://vntex.sf.net/download/vntex-support/more-extsizes.zip}{more-extsizes}
+do \<THAIHOA> viết. Ví dụ:
+
+\begin{verbatim}
+\documentclass[13pt]{extarticle}
+\usepackage[utf8]{vietnam}
+\usepackage{type1cm}
+
+\begin{document}
+Văn bản này dùng cỡ chữ 13pt.
+\end{document}
+\end{verbatim}
+
+Lưu ý \emph{phải} dùng gói |type1cm| nếu văn bản có chứa các công thức
+toán.
+
+Các cỡ chữ được gói |more-extsizes| hỗ trợ thêm: 13, 13p5, 15 và 16.
+
+\hypertarget{makeindex-vn}{}
+\subsection{Sử dụng \<MAKEINDEX> với \<VNTEX>}
+\<MAKEINDEX> là một chương trình sắp xếp chỉ mục cho
+\<LATEX>. \<MAKEINDEX> không hỗ trợ tiếng Việt nên để dùng
+\<MAKEINDEX> với \<VNTEX> ta cần một chút ``mẹo''.
+
+Nếu bạn dùng \<UNIX>/\<LINUX>, hãy tải gói
+\href{http://vntex.sf.net/download/vntex-support/makeindex-vn.zip}{makeindex-vn
+  cho \<UNIX>/\<LINUX>}. Người dùng \<WINDOWS> có thể sử dụng gói
+\href{http://vntex.sf.net/download/vntex-support/vnindexwin.zip}{makeindex-vn
+  cho \<WINDOWS>} Sau khi tải về hãy bung nén và xem hướng dẫn đi kèm
+để biết cách sử dụng.
+
+Các ký tự Việt được sắp xếp theo qui tắc mô tả tại 
+\href{http://www.vietlex.com/vietnamese/quytacABC.html}{đây}.
+
+% Hướng dẫn chi tiết cho \<WINDOWS> hiện chưa có. Nếu bạn muốn viết phần này
+% chúng tôi rất hoan nghênh.
+
+\subsection{Chuyển đổi từ \<LATEX> sang \<HTML>}
+Trước đây \<VNTEX> có chứa hỗ trợ cho \<TEX4HT>, sau đó các hỗ trợ này đã
+được đưa vào bản phân phối chính thức của \<TEX4HT> nên đã được xóa khỏi
+\<VNTEX>.
+
+Để chuyển từ \<LATEX> sang \<HTML> bạn có thể dùng lệnh sau:
+\begin{verbatim}
+htlatex filename.tex "html,uni-html4,charset=utf-8" " -cunihtf -utf8"
+\end{verbatim}
+
+Bạn phải có bản \<TEX4HT> tương đối mới, ít nhất là như bản \<TEX4HT> trong
+\<TEXLIVE>2005. File \<LATEX> có thể dùng một trong các bảng mã mà
+\<VNTEX> hỗ trợ (ví dụ \<VISCII> hay \<UTF8>). \<TEX4HT> sẽ tự động ghi kết
+quả dưới mã \<UTF8>. 
+
+Trang web này cũng được viết bằng \<LATEX> và chuyển sang \<HTML> bằng
+\<TEX4HT>.   
+
+\hypertarget{bookmark-vn}{}
+\subsection{Bookmark cho \<PDF> và tiếng Việt}
+Gói |hyperref| cho phép tạo \<UNICODE> bookmark cho \<PDF>, tuy nhiên một
+số ký tự Việt chưa được hỗ trợ. Để khắc phục ta làm như sau:
+\begin{itemize}
+\item tải về gói
+  \href{http://vntex.sf.net/download/vntex-support/puenc-vn.zip}{puenc-vn}
+
+\item bung nén và chép tập |puenc.def| đè lên tập |puenc.def| của
+  |hyperref| (hoặc bạn có thể chép tập này vào thư mục chứa văn bản
+  của bạn)
+
+\item dùng gói |hyperref| trong văn bản \<LATEX> của bạn theo ví dụ sau:
+
+\begin{verbatim}
+\documentclass{article}
+\usepackage[unicode]{hyperref}
+\usepackage[utf8]{vietnam}
+\begin{document}
+\section{Tiếng Việt}
+\end{document}
+\end{verbatim}
+
+(lưu ý để bookmark hiển thị đúng bạn phải dịch văn bản \<LATEX> của bạn ít
+nhất là 2 lần)
+\end{itemize}
+
+\<UNICODE> bookmark không ``portable'' -- bạn phải dùng \<AR> phiên
+bản $\ge$\,5.0 mới xem được đầy đủ các ký tự.
+
+Nếu bạn không dùng \<UNICODE> bookmark thì \<PDF> của bạn sẽ portable hơn
+và bookmark sẽ hiển thị tốt với đa số trình duyệt \<PDF>. Tuy nhiên  một
+số ký tự Việt không được hỗ trợ trong bảng mã dùng cho \<PDF> bookmark
+(PD1), do đó các ký tự này sẽ bị mất khi tạo bookmark. Bạn có thể hạn chế điều
+này bằng cách thay thế các ký tự Việt bằng các ký tự ``gần giống'' trong
+bảng mã PD1 (ví dụ `ắ' sẽ được thay thế bằng `á') theo cách sau:
+
+\begin{verbatim}
+\documentclass{article}
+\usepackage{hyperref}
+\usepackage[utf8]{vietnam}
+\input{pd1supp.def}
+\begin{document}
+\section{Tiếng Việt}
+\end{document}
+\end{verbatim}
+
+\hypertarget{cmap-vn}{}
+\subsection{Tạo ``searchable'' \<PDF> với tiếng Việt}
+Để có thể tìm kiếm hay cắt/dán tiếng Việt với các file \<PDF>, bạn có thể
+dùng gói |cmap| của Vladimir Volovich như sau:
+
+\begin{verbatim}
+\documentclass{article}
+\usepackage{cmap}
+\usepackage[utf8]{vietnam}
+\begin{document}
+Tiếng Việt
+\end{document}
+\end{verbatim}
+
+Lưu ý phải nạp (load) gói |cmap| trước khi nạp các gói khác. Nếu bạn quên
+điều này thì |cmap| sẽ ghi ra một số cảnh báo (warning) và file \<PDF> của
+bạn có thể sẽ không ``searchable'' (không thể tìm kiếm hoặc cắt/dán).
+
+Một số hạn chế: gói |cmap| chỉ dùng với \<PDFTEX> và không có tác dụng đối
+với ``virtual font''. Điều này có nghĩa là bạn phải dùng \<PDFTEX> để dịch
+văn bản, và các đoạn text dùng font smallcap (chọn bằng lệnh |\textsc|) sẽ
+không searchable.
+
+\section{Trợ giúp}
+\hypertarget{tro-giup}{}
+Dưới đây là một số địa chỉ bạn có thể tham khảo khi gặp một vấn
+đề nào đó với \<VNTEX> (để nhanh chóng có được câu trả lời, xin vui lòng
+dành ít phút để đọc tài liệu
+\href{http://forum.vnoss.org/pub/smart-question-vi.html}{Cách đặt một câu
+hỏi thông minh} nếu bạn chưa đọc).
+
+\begin{itemize}
+\item \<VNOSS> có diễn dàn dành cho
+\href{http://forum.vnoss.org/viewforum.php?id=10}{\<TEX>/\<LATEX>}. Ở đây
+bạn có thể hỏi về \<VNTEX>, \<CONTEXT> và các vấn đề liên quan đến tiếng
+Việt trong \<TEX>. 
+
+\item Trang web \href{http://viettug.org/}{ViệtTUG} do Huỳnh Kỳ Anh quản
+lý, chứa nhiều thông tin hữu ích cho người muốn học sử dụng \<LATEX>.
+
+\item Mailing list của \<VNTEX> có tại
+\href{http://lists.sourceforge.net/lists/listinfo/vntex-users}{đây}
+\end{itemize}
+
+
+\end{document}
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/source/generic/vntex/tests/Makefile b/Master/texmf-dist/source/generic/vntex/tests/Makefile
new file mode 100644
index 00000000000..6ab1762b1b5
--- /dev/null
+++ b/Master/texmf-dist/source/generic/vntex/tests/Makefile
@@ -0,0 +1,376 @@
+# vntex-3.1.8
+#
+# Author: Han The Thanh <hanthethanh@gmx.net>.
+# This file is part of vntex.  Public domain.
+
+# The primary site of vntex is:
+#
+#       http://vntex.sf.net
+
+# This file has been tested with GNU make and Linux only.
+
+# Usage:
+# First edit the variables below according to what you have installed.
+# 
+# Run `make' to produce all files.
+#
+# Instead, you can
+#   run `make testpdf'  to produce all PDF files,
+#   run `make testps'   to produce all PS files,
+#   run `make samples'  to produce all samples (as PDF),
+#   run `make testht'   to produce the HTML files.
+# 
+# To view the the output files,
+#   run `make viewpdf'  to view all PDF files,
+#   run `make viewps'   to view all PS files,
+#   run `make viewhtml' to view all HTML files.
+#   run `make viewsamples' to view all *-sample.pdf files.
+#   run `make viewfonts' to view all *-test.pdf files.
+#   
+# Finally, to remove generated files,
+#   run `make clean' to remove all temporary files,
+#   run `make distclean' to remove everything except the source files.
+
+# Select a viewer of your choice.  You can add commandline arguments.
+VIEWER_PDF  = acroread
+VIEWER_PS   = gv -antialias
+VIEWER_HTML = firefox
+
+# Set this variable to `false' if you don't have tex4ht installed 
+# on your system (look whether the program `htlatex' exists). 
+TEX4HT = true
+
+# Comment out the next two lines if you don't have a recent version
+# of the Antykwa Torunska font family (antt) with T5 support (look
+# whether you have `t5-antt.enc' in your TEXMF tree).
+ANTT_TEST   = t5antt-test
+ANTT_SAMPLE = t5antt-sample
+
+# Comment out the next two lines if you don't have a recent version
+# of Latin Modern (look whether you have `t5-lmr10.tfm' in your TEXMF
+# tree).
+T5LM_TEST   = t5lm-test
+T5LM_SAMPLE = t5lm-sample
+
+# Comment out the next two lines if you don't have a recent version
+# of the Iwona font family (look whether you have `iwona.map' 
+# in your TEXMF tree).
+IWONA_TEST   = t5iwona-test
+IWONA_SAMPLE = t5iwona-sample
+
+
+# Comment out the next two lines if you don't have a recent version
+# of the Kurier font family (look whether you have `kurier.map' 
+# in your TEXMF tree).
+KURIER_TEST   = t5kurier-test
+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
+GENTIUM_SAMPLE = t5gentium-sample
+
+
+# Comment out the next two lines if you don't have a recent version
+# of the GrotesquVn font family (look whether you have `grotesqvn.map' 
+# in your TEXMF tree).
+GROTESK_TEST   = grotesqvn-test
+GROTESK_SAMPLE = grotesqvn-sample
+
+
+# Comment out the next two lines if you don't have a recent version
+# of the GaramondVn font family (look whether you have `garamondvn.map' 
+# in your TEXMF tree).
+GARAMOND_TEST   = garamondvn-test
+GARAMOND_SAMPLE = garamondvn-sample
+
+
+# Comment out the next two lines if you don't have a recent version
+# of the TeXGyre-Bonum font family (look whether you have `qbk.map' 
+# in your TEXMF tree).
+BONUM_TEST     = bonum-test
+BONUM_SAMPLE   = bonum-sample
+
+
+# Comment out the next two lines if you don't have a recent version
+# of the TeXGyre-Termes font family (look whether you have `qpl.map' 
+# in your TEXMF tree).
+PAGELLA_TEST   = termes-test
+PAGELLA_SAMPLE = termes-sample
+
+
+# Comment out the next two lines if you don't have a recent version
+# of the TeXGyre-Pagella font family (look whether you have `qtm.map' 
+# in your TEXMF tree).
+TERMES_TEST    = pagella-test
+TERMES_SAMPLE  = pagella-sample
+
+
+# Comment out the next two lines if you don't have a recent version
+# of the TeXGyre-Adventor font family (look whether you have `qag.map' 
+# in your TEXMF tree).
+ADVENTOR_TEST     = adventor-test
+ADVENTOR_SAMPLE   = adventor-sample
+
+
+# Comment out the next two lines if you don't have a recent version
+# of the TeXGyre-Chorus font family (look whether you have `qzc.map' 
+# in your TEXMF tree).
+CHORUS_TEST     = chorus-test
+CHORUS_SAMPLE   = chorus-sample
+
+
+# Comment out the next two lines if you don't have a recent version
+# of the TeXGyre-Cursor font family (look whether you have `qcr.map' 
+# in your TEXMF tree).
+CURSOR_TEST     = cursor-test
+CURSOR_SAMPLE   = cursor-sample
+
+
+# Comment out the next two lines if you don't have a recent version
+# of the TeXGyre-Schola font family (look whether you have `qcs.map' 
+# in your TEXMF tree).
+SCHOLA_TEST     = schola-test
+SCHOLA_SAMPLE   = schola-sample
+
+
+# Comment out the next two lines if you don't have a recent version
+# of the TeXGyre-Heros font family (look whether you have `qhv.map' 
+# in your TEXMF tree).
+HEROS_TEST     = heros-test
+HEROS_SAMPLE   = heros-sample
+
+
+# Comment out the next two lines if you don't have a recent version
+# of the ArevSansVn font family (look whether you have `arevvn.map' 
+# in your TEXMF tree).
+AREV_TEST       = arevvn-test
+AREV_SAMPLE     = arevvn-sample
+
+
+# Comment out the next two lines if you don't have a recent version
+# of the CMBrightVn font family (look whether you have `cmbrightvn.map' 
+# in your TEXMF tree).
+CMBRIGHT_TEST	= cmbrightvn-test
+CMBRIGHT_SAMPLE	= cmbrightvn-sample
+
+
+# Comment out the next two lines if you don't have a recent version
+# of the ClassicoVn font family (look whether you have `classicovn.map' 
+# in your TEXMF tree).
+CLASSICO_TEST	= classicovn-test
+CLASSICO_SAMPLE	= classicovn-sample
+
+
+# Comment out the next two lines if you don't have a recent version
+# of the ConcreteVn font family (look whether you have `concretevn.map' 
+# in your TEXMF tree).
+CONCRETE_TEST	= concretevn-test
+CONCRETE_SAMPLE	= concretevn-sample
+
+
+# Comment out the next two lines if you don't have a recent version
+# of the Vntopia font family (look whether you have `vntopia.map' 
+# in your TEXMF tree).
+VNTOPIA_TEST	= vntopia-test
+VNTOPIA_SAMPLE	= vntopia-sample
+
+
+# Comment out the next two lines if you don't have a recent version
+# of the txttvn font family (look whether you have `txttvn.map' 
+# in your TEXMF tree).
+TXTT_TEST	= txttvn-test
+TXTT_SAMPLE	= txttvn-sample
+
+
+# Comment out the next two lines if you don't have a recent version
+# of the ComicsansVn font family (look whether you have `comicsansvn.map' 
+# in your TEXMF tree).
+COMIC_TEST	= comicsansvn-test
+COMIC_SAMPLE	= comicsansvn-sample
+
+
+# Comment out the next two lines if you don't have the MS core font
+# files like `arial.ttf' or `tahomabd.ttf' installed in your TEXMF
+# tree.
+MSCORE_TEST   = mscore-test
+MSCORE_SAMPLE = mscore-sample
+
+# Comment out the next line if you don't have plnfss installed on your
+# system (look whether `plnfss.tex' and `t5cmr.pfd' exists. 
+TEST_PLAIN  = test-plain test-plain-tcx
+
+
+#====================================================#
+# There is no need to edit anything below this line. #
+#====================================================#
+
+
+TEXOPTS    = -parse-first-line -recorder
+TEX4HTOPTS = "html,uni-html4,charset=utf8" " -cunihtf -utf8"
+FONTMEM    = env font_mem_size=1200000
+
+PDFLATEX = pdflatex $(TEXOPTS)
+LATEX    = latex $(TEXOPTS)
+PDFTEX   = pdftex $(TEXOPTS)
+TEX      = tex $(TEXOPTS)
+DVIPS    = dvips
+
+
+TEST_LATEX     = test-vietnam test-babel
+
+TEST_LATEX_ALL = $(TEST_LATEX) test-vietnam-tcx
+
+REFERENCES     = vnr-test urwvn-test chartervn-test \
+		 $(ANTT_TEST) $(T5LM_TEST) \
+		 $(IWONA_TEST) $(KURIER_TEST) $(CYKLOP_TEST) \
+		 $(GROTESK_TEST) $(GARAMOND_TEST) \
+ 		 $(AREV_TEST) $(VNTOPIA_TEST) $(CLASSICO_TEST) \
+		 $(CMBRIGHT_TEST) $(CONCRETE_TEST) \
+		 $(GENTIUM_TEST) $(TXTT_TEST) \
+		 $(BONUM_TEST) $(PAGELLA_TEST) $(TERMES_TEST) \
+		 $(ADVENTOR_TEST) $(CHORUS_TEST) $(CURSOR_TEST) \
+		 $(SCHOLA_TEST) $(HEROS_TEST) \
+		 $(MSCORE_TEST) $(COMIC_TEST)
+
+SAMPLES        = vnr-sample urwvn-sample chartervn-sample \
+		 $(ANTT_SAMPLE) $(T5LM_SAMPLE) \
+		 $(IWONA_SAMPLE) $(KURIER_SAMPLE) $(CYKLOP_SAMPLE) \
+		 $(GROTESK_SAMPLE) $(GARAMOND_SAMPLE) \
+ 		 $(AREV_SAMPLE) $(VNTOPIA_SAMPLE) $(CLASSICO_SAMPLE) \
+		 $(CMBRIGHT_SAMPLE) $(CONCRETE_SAMPLE) \
+		 $(GENTIUM_SAMPLE) $(TXTT_SAMPLE) \
+		 $(BONUM_SAMPLE) $(PAGELLA_SAMPLE) $(TERMES_SAMPLE) \
+		 $(ADVENTOR_SAMPLE) $(CHORUS_SAMPLE) $(CURSOR_SAMPLE) \
+		 $(SCHOLA_SAMPLE) $(HEROS_SAMPLE) \
+		 $(MSCORE_SAMPLE) $(COMIC_SAMPLE)
+
+
+default: testpdf testps samples
+
+
+vntovn:  test-tcvn.tex test-utf8.tex
+
+
+test-tcvn.tex: test-viscii.tex
+	vntovn viscii tcvn $< > $@
+
+
+test-utf8.tex: test-viscii.tex
+	vntovn viscii utf8 $< > $@
+
+
+testpdf:
+	for f in $(TEST_LATEX_ALL); do \
+	   test -f $$f.aux || $(PDFLATEX) $$f.tex; \
+	   $(PDFLATEX) $$f.tex; \
+	done	
+	for f in $(TEST_PLAIN); do \
+	   $(PDFTEX) $$f.tex; \
+	done
+
+
+testps:
+	for f in $(TEST_LATEX_ALL); do \
+	   test -f $$f.aux || $(LATEX) $$f.tex; \
+	   $(LATEX) $$f.tex ; $(DVIPS) $$f.dvi -o; \
+	done	
+	for f in $(TEST_PLAIN); do \
+	   $(TEX) $$f.tex ; $(DVIPS) $$f.dvi -o; \
+	done
+
+
+testht:
+	   for f in $(TEST_LATEX) $(REFERENCES); do \
+	      htlatex $$f.tex $(TEX4HTOPTS); \
+	   done
+
+
+samples:
+	for f in $(SAMPLES) ; do \
+	    test -f $$f.aux || \
+	    $(FONTMEM) $(PDFLATEX) $$f.tex; \
+	done
+	for f in $(REFERENCES) $(SAMPLES) ; do \
+	    $(FONTMEM) $(PDFLATEX) $$f.tex; \
+	done
+
+
+refs:
+	for f in $(REFERENCES) ; do \
+	    $(FONTMEM) $(PDFLATEX) $$f.tex; \
+	done
+
+
+
+viewpdf:
+	for f in $(TEST_LATEX_ALL) $(TEST_PLAIN); do \
+	   (test ! -f $$f.pdf && \
+		echo "WARNING: File \"$$f.pdf\" not found.") \
+	   	|| $(VIEWER_PDF) $$f.pdf; \
+	done
+
+
+viewps:
+	for f in $(TEST_LATEX_ALL) $(TEST_PLAIN); do \
+	   (test ! -f $$f.ps && \
+		echo "WARNING: File \"$$f.ps\" not found.") \
+	   	|| $(VIEWER_PS) $$f.ps; \
+	done
+
+
+viewhtml:
+	for f in $(TEST_LATEX) $(REFERENCES); do \
+	   (test ! -f $$f.html && \
+		echo "WARNING: File \"$$f.html\" not found.") \
+		|| $(VIEWER_HTML) file://`pwd`/$$f.html; \
+	done
+
+
+viewsamples:
+	for f in $(SAMPLES); do \
+	   (test ! -f $$f.pdf && \
+		echo "WARNING: File \"$$f.pdf\" not found.") \
+		|| $(VIEWER_PDF) $$f.pdf; \
+	done
+
+
+viewfonts:
+	for f in $(REFERENCES); do \
+	   (test ! -f $$f.pdf && \
+		echo "WARNING: File \"$$f.pdf\" not found.") \
+		|| $(VIEWER_PDF) $$f.pdf; \
+	done
+
+htmldir:
+	test -d vntex-html || mkdir vntex-html
+	rm -f vntex-html/*
+	cp -p *.html *.css vntex-html
+	echo '<html><head>' > vntex-html/index.html 
+	echo '<title>VnTeX HTML Fonts</title>' >> vntex-html/index.html
+	echo '</head>' >> vntex-html/index.html 
+	echo '<body><h1>VnTeX HTML Fonts</h1><p>' >> vntex-html/index.html
+	for f in $(TEST_LATEX) $(REFERENCES); do \
+          echo "<a href=\"$$f.html\">$$f</a><p>" >> vntex-html/index.html; \
+	done
+	echo '</body></html>' >> vntex-html/index.html
+	tar -cjvf vntex-html.tar.bz2 vntex-html
+
+clean:
+	rm -f *.dvi *.out *.toc *.aux *.log *.4ct *.4tc *.idv *.lg \
+              *.tmp *.xref *.fls *.lof
+
+
+distclean: clean
+	rm -f *.pdf *.ps *.css *.html nocompress vntex-html.tar.bz2
+	rm -rf vntex-html
+
diff --git a/Master/texmf-dist/source/generic/vntex/tests/README b/Master/texmf-dist/source/generic/vntex/tests/README
new file mode 100644
index 00000000000..b23d7ab251b
--- /dev/null
+++ b/Master/texmf-dist/source/generic/vntex/tests/README
@@ -0,0 +1,167 @@
+vntex-3.1.8
+
+Copyright 2003-2005 Han The Thanh <HanTheThanh@gmx.net>
+	  	and 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
+
+For installation instructions see http://vntex.sf.net/
+
+This directory contains some TeX files to test the functionality
+of vntex, as well as to create vietnamese font samples.
+
+
+Makefile
+========
+There is a Makefile which can be used to compile the test files and
+font samples.  Usage information is provided in the Makefile
+itself.  You have to edit the top of the file for customization.
+If it doesn't work for you, instructions are given below how you can
+compile the test files manually.
+
+
+Test Files
+==========
+test-vietnam.tex:       test of Vietnamese support in LaTeX using
+                        vietnam.sty and inputenc
+
+test-vietnam-tcx.tex:   test of Vietnamese support in LaTeX using
+                        vietnam.sty and TCX
+
+test-babel.tex:         test of Vietnamese support in LaTeX using
+                        babel and inputenc
+
+test-plain.tex:         test of Vietnamese in plain using plainenc
+
+test-plain-tcx.tex:     test of Vietnamese in plain using TCX
+
+
+What is tcx?
+------------ 
+  TCX is an extension that allows translation of input encoding. The 
+  advantage over using inputenc is that it allows vietnamese text in
+  logging messages instead of TeX's hexadecimal representation (^^ab).
+
+  The disadvantage is that it is not portable (TCX is web2c-specific),
+  it allows only one input encoding in a single document and utf8 is 
+  not supported. If you don't mind those carets in logging messages,
+  simply use inputenc.
+
+  It is impossible to use utf8 with plain; to do so an extension
+  called enctex by Petr Olsak is required. However so far nobody
+  ever asked for plain TeX support.
+
+-------------------------------------------------------------
+If tcx is not supported by your system, just ignore the files
+  test-vietnam-tcx.tex
+and
+  test-plain-tcx.tex
+-------------------------------------------------------------
+
+There are also some other files that are included by the
+above test files:
+
+test-accents.tex:       test of accent commands
+test-captions.tex:      test of Vietnamese captions
+test-tcvn.tex:          test of TCVN input encoding
+test-viscii.tex:        test of VISCII input encoding
+test-utf8.tex:          test of UTF8 input encoding
+
+
+To compile the test files, run:
+
+pdflatex test-vietnam
+pdflatex -parse-first-line test-vietnam-tcx
+pdflatex test-babel
+pdftex test-plain
+pdftex -parse-first-line test-plain-tcx
+
+(or use tex/latex instead of pdftex/pdflatex)
+
+Run latex/pdflatex twice to get a table of cotents.
+
+
+Font samples
+============
+All font sample files require vnsample.sty.
+
+vnr-test.tex:            quick test of vnr fonts
+vnr-sample.tex:          sample of vnr fonts
+
+t5lm-test.tex:           quick test of lmodern fonts
+t5lm-sample.tex:         sample of lmodern fonts
+
+urwvn-test.tex:          quick test of urwvn fonts
+urwvn-sample.tex:        sample of urwvn fonts
+
+chartervn-test.tex	 quick test of charter fonts
+chartervn-sample.tex     sample of charter fonts
+
+t5antt-test.tex:         quick test of antt fonts
+t5antt-sample.tex:       sample of antt fonts
+
+t5iwona-test.tex         quick test of iwona fonts
+t5iwona-sample.tex       sample of iwona fonts
+
+t5kurier-test.tex        quick test of kurier fonts
+t5kurier-sample.tex      sample of kurier fonts
+
+mscore-test.tex:         quick test of mscore fonts
+mscore-sample.tex:       sample of mscore fonts
+
+
+These sample files use LaTeX, and require certain packages
+to compile.  To compile these font samples, of course, the
+corresponding font package must be installed as well. 
+
+If you do not have all the required files installed, you can
+download the samples as PDF files from
+
+   http://vntex.sf.net/fonts/samples
+
+Run pdflatex twice to get bookmarks.  Some of the sample files 
+are very large and bookmarks will be helpful.
+
+Some of the sample files require a vast amount of memory.
+If you have a web2c based system (look whether you have 
+a file `texmf.cnf' somewhere), you have to set the environment
+variable 
+
+  font_mem_size=1200000
+
+Linux, UNIX, Mac OS X:
+----------------------
+  Either set it in the current shell:
+
+    font_mem_size=1200000; export font_mem_size
+    pdflatex vnrsample.tex
+
+  or for a single process:
+
+    env font_mem_size=1200000 pdflatex vnrsample.tex
+    
+Windows:
+--------
+    set font_mem_size=1200000
+    pdflatex vnrsample.tex
+
+MikTeX:
+-------
+    Edit the file MIKTEX.INI.  Look for a line beginning with
+    "font_mem_size=" and set the value to at least 1200000.
+    
+Systems not based on web2c:
+---------------------------
+    Read the manual of your TeX system to find out how to 
+    increase font_mem_size.  If it is not explained in the
+    manual, maybe memory is allocated dynamically and you
+    don't have to do anything. In this case, just try
+
+    pdflatex vnrsample.tex
+    
+----------------------------------------------------------
+Please note that you do not have to increase font_mem_size
+to use vntex, the huge amount of memory is needed for the 
+font samples only.
+----------------------------------------------------------
+
diff --git a/Master/texmf-dist/source/generic/vntex/tests/adventor-sample.tex b/Master/texmf-dist/source/generic/vntex/tests/adventor-sample.tex
new file mode 100644
index 00000000000..f32f7ea3d02
--- /dev/null
+++ b/Master/texmf-dist/source/generic/vntex/tests/adventor-sample.tex
@@ -0,0 +1,19 @@
+% Copyright 2003-2005 Han The Thanh <hanthethanh@gmx.net>.
+% This file is part of vntex.  License: LPPL, version 1.3 or newer,
+% according to http://www.latex-project.org/lppl.txt
+
+\documentclass[sample]{vnsample}
+
+\mapfile{qag}
+
+\begin{document}
+\section{TeX Gyre Adventor}
+\showletters{T5}{qag}{m}{n}    {t5-qagr}     {TeXGyreAdventor-Regular}
+\showletters{T5}{qag}{m}{it}   {t5-qagri}    {TeXGyreAdventor-Italic}
+\showletters{T5}{qag}{b}{n}    {t5-qagb}     {TeXGyreAdventor-Bold}
+\showletters{T5}{qag}{b}{it}   {t5-qagbi}    {TeXGyreAdventor-BoldItalic}
+\showletters{T5}{qag}{m}{sc}   {t5-qagr-sc}  {TeXGyreAdventor-Regular}
+\showletters{T5}{qag}{m}{scit} {t5-qagri-sc} {TeXGyreAdventor-Italic}
+\showletters{T5}{qag}{b}{sc}   {t5-qagb-sc}  {TeXGyreAdventor-Bold}
+\showtext   {T5}{qag}{m}{n}    {t5-qagr}     {TeXGyreAdventor-Regular}
+\end{document}
diff --git a/Master/texmf-dist/source/generic/vntex/tests/adventor-test.tex b/Master/texmf-dist/source/generic/vntex/tests/adventor-test.tex
new file mode 100644
index 00000000000..1285f08fd37
--- /dev/null
+++ b/Master/texmf-dist/source/generic/vntex/tests/adventor-test.tex
@@ -0,0 +1,20 @@
+% Copyright 2003-2005 Han The Thanh <hanthethanh@gmx.net>.
+% This file is part of vntex.  License: LPPL, version 1.3 or newer,
+% according to http://www.latex-project.org/lppl.txt
+
+\documentclass[test]{vnsample}
+
+\mapfile{qag}
+
+\begin{document}
+\begin{shortsample}
+\shorttext{T5}{qag}{m}{n}    {t5-qagr}     {TeXGyreAdventor-Regular}
+\shorttext{T5}{qag}{m}{it}   {t5-qagri}    {TeXGyreAdventor-Italic}
+\shorttext{T5}{qag}{b}{n}    {t5-qagb}     {TeXGyreAdventor-Bold}
+\shorttext{T5}{qag}{b}{it}   {t5-qagbi}    {TeXGyreAdventor-BoldItalic}
+\shorttext{T5}{qag}{m}{sc}   {t5-qagr-sc}  {TeXGyreAdventor-Regular}
+\shorttext{T5}{qag}{m}{scit} {t5-qagri-sc} {TeXGyreAdventor-Italic}
+\shorttext{T5}{qag}{b}{sc}   {t5-qagb-sc}  {TeXGyreAdventor-Bold}
+\shorttext{T5}{qag}{b}{scit} {t5-qagbi-sc} {TeXGyreAdventor-BoldItalic}
+\end{shortsample}
+\end{document}
diff --git a/Master/texmf-dist/source/generic/vntex/tests/arevvn-sample.tex b/Master/texmf-dist/source/generic/vntex/tests/arevvn-sample.tex
new file mode 100644
index 00000000000..26f6656b48e
--- /dev/null
+++ b/Master/texmf-dist/source/generic/vntex/tests/arevvn-sample.tex
@@ -0,0 +1,16 @@
+% Copyright 2003-2005 Han The Thanh <hanthethanh@gmx.net>.
+% This file is part of vntex.  License: LPPL, version 1.3 or newer,
+% according to http://www.latex-project.org/lppl.txt
+
+\documentclass[sample]{vnsample}
+
+\mapfile{arevvn}
+
+\begin{document}
+\section{VnArev}
+\showletters{T5}{fav}{m}{n}  {favr8v}  {ArevSans-Roman-T5}
+\showletters{T5}{fav}{m}{it} {favri8v} {ArevSans-Oblique-T5}
+\showletters{T5}{fav}{b}{n}  {favb8v}  {ArevSans-Bold-T5}
+\showletters{T5}{fav}{b}{it} {favbi8v} {ArevSans-BoldOblique-T5}
+\showtext   {T5}{fav}{m}{n}  {favr8v}  {ArevSans-Roman-T5}
+\end{document}
diff --git a/Master/texmf-dist/source/generic/vntex/tests/arevvn-test.tex b/Master/texmf-dist/source/generic/vntex/tests/arevvn-test.tex
new file mode 100644
index 00000000000..1f808e16688
--- /dev/null
+++ b/Master/texmf-dist/source/generic/vntex/tests/arevvn-test.tex
@@ -0,0 +1,16 @@
+% Copyright 2003-2005 Han The Thanh <hanthethanh@gmx.net>.
+% This file is part of vntex.  License: LPPL, version 1.3 or newer,
+% according to http://www.latex-project.org/lppl.txt
+
+\documentclass[test]{vnsample}
+
+\mapfile{arevvn}
+
+\begin{document}
+\begin{shortsample}
+\shorttext{T5}{fav}{m}{n}  {favr8v}  {ArevSans-Roman-T5}
+\shorttext{T5}{fav}{m}{it} {favri8v} {ArevSans-Oblique-T5}
+\shorttext{T5}{fav}{b}{n}  {favb8v}  {ArevSans-Bold-T5}
+\shorttext{T5}{fav}{b}{it} {favbi8v} {ArevSans-BoldOblique-T5}
+\end{shortsample}
+\end{document}
diff --git a/Master/texmf-dist/source/generic/vntex/tests/bonum-sample.tex b/Master/texmf-dist/source/generic/vntex/tests/bonum-sample.tex
new file mode 100644
index 00000000000..3bd324270da
--- /dev/null
+++ b/Master/texmf-dist/source/generic/vntex/tests/bonum-sample.tex
@@ -0,0 +1,19 @@
+% Copyright 2003-2005 Han The Thanh <hanthethanh@gmx.net>.
+% This file is part of vntex.  License: LPPL, version 1.3 or newer,
+% according to http://www.latex-project.org/lppl.txt
+
+\documentclass[sample]{vnsample}
+
+\mapfile{qbk}
+
+\begin{document}
+\section{TeX Gyre Bonum}
+\showletters{T5}{qbk}{m}{n}    {t5-qbkr}     {TeXGyreBonum-Regular}
+\showletters{T5}{qbk}{m}{it}   {t5-qbkri}    {TeXGyreBonum-Italic}
+\showletters{T5}{qbk}{b}{n}    {t5-qbkb}     {TeXGyreBonum-Bold}
+\showletters{T5}{qbk}{b}{it}   {t5-qbkbi}    {TeXGyreBonum-BoldItalic}
+\showletters{T5}{qbk}{m}{sc}   {t5-qbkr-sc}  {TeXGyreBonum-Regular}
+\showletters{T5}{qbk}{m}{scit} {t5-qbkri-sc} {TeXGyreBonum-Italic}
+\showletters{T5}{qbk}{b}{sc}   {t5-qbkb-sc}  {TeXGyreBonum-Bold}
+\showtext   {T5}{qbk}{m}{n}    {t5-qbkr}     {TeXGyreBonum-Regular}
+\end{document}
diff --git a/Master/texmf-dist/source/generic/vntex/tests/bonum-test.tex b/Master/texmf-dist/source/generic/vntex/tests/bonum-test.tex
new file mode 100644
index 00000000000..9398674925e
--- /dev/null
+++ b/Master/texmf-dist/source/generic/vntex/tests/bonum-test.tex
@@ -0,0 +1,20 @@
+% Copyright 2003-2005 Han The Thanh <hanthethanh@gmx.net>.
+% This file is part of vntex.  License: LPPL, version 1.3 or newer,
+% according to http://www.latex-project.org/lppl.txt
+
+\documentclass[test]{vnsample}
+
+\mapfile{qbk}
+
+\begin{document}
+\begin{shortsample}
+\shorttext{T5}{qbk}{m}{n}    {t5-qbkr}     {TeXGyreBonum-Regular}
+\shorttext{T5}{qbk}{m}{it}   {t5-qbkri}    {TeXGyreBonum-Italic}
+\shorttext{T5}{qbk}{b}{n}    {t5-qbkb}     {TeXGyreBonum-Bold}
+\shorttext{T5}{qbk}{b}{it}   {t5-qbkbi}    {TeXGyreBonum-BoldItalic}
+\shorttext{T5}{qbk}{m}{sc}   {t5-qbkr-sc}  {TeXGyreBonum-Regular}
+\shorttext{T5}{qbk}{m}{scit} {t5-qbkri-sc} {TeXGyreBonum-Italic}
+\shorttext{T5}{qbk}{b}{sc}   {t5-qbkb-sc}  {TeXGyreBonum-Bold}
+\shorttext{T5}{qbk}{b}{scit} {t5-qbkbi-sc} {TeXGyreBonum-BoldItalic}
+\end{shortsample}
+\end{document}
diff --git a/Master/texmf-dist/source/generic/vntex/tests/chartervn-sample.tex b/Master/texmf-dist/source/generic/vntex/tests/chartervn-sample.tex
new file mode 100644
index 00000000000..2321ba80657
--- /dev/null
+++ b/Master/texmf-dist/source/generic/vntex/tests/chartervn-sample.tex
@@ -0,0 +1,20 @@
+% Copyright 2003-2005 Han The Thanh <hanthethanh@gmx.net>.
+% This file is part of vntex.  License: LPPL, version 1.3 or newer,
+% according to http://www.latex-project.org/lppl.txt
+
+\documentclass[sample]{vnsample}
+
+\mapfile{chartervn}
+
+\begin{document}
+\section{VnCharterBT}
+\showletters{T5}{bch}{m}{n}  {bchr8v}   {VnBitstreamCharter}
+\showletters{T5}{bch}{m}{it} {bchri8v}  {VnCharterBT-Italic}
+\showletters{T5}{bch}{m}{sl} {bchro8v}  {VnBitstreamCharter}
+\showletters{T5}{bch}{b}{n}  {bchb8v}   {VnCharterBT-Bold}
+\showletters{T5}{bch}{b}{it} {bchbi8v}  {VnCharterBT-BoldItalic}
+\showletters{T5}{bch}{b}{sl} {bchbo8v}  {VnCharterBT-Bold}
+\showletters{T5}{bch}{m}{sc} {bchrc8v}  {N/A}
+\showletters{T5}{bch}{b}{sc} {bchbc8v}  {N/A}
+\showtext   {T5}{bch}{m}{n}  {bchr8v}   {VnBitstreamCharter}
+\end{document}
diff --git a/Master/texmf-dist/source/generic/vntex/tests/chartervn-test.tex b/Master/texmf-dist/source/generic/vntex/tests/chartervn-test.tex
new file mode 100644
index 00000000000..0f3fb5dba87
--- /dev/null
+++ b/Master/texmf-dist/source/generic/vntex/tests/chartervn-test.tex
@@ -0,0 +1,20 @@
+% Copyright 2003-2005 Han The Thanh <hanthethanh@gmx.net>.
+% This file is part of vntex.  License: LPPL, version 1.3 or newer,
+% according to http://www.latex-project.org/lppl.txt
+
+\documentclass[test]{vnsample}
+
+\mapfile{chartervn.map}
+
+\begin{document}
+\begin{shortsample}
+\shorttext{T5}{bch}{m}{n}  {bchr8v}   {VnBitstreamCharter}
+\shorttext{T5}{bch}{m}{it} {bchri8v}  {VnCharterBT-Italic}
+\shorttext{T5}{bch}{m}{sl} {bchro8v}  {VnBitstreamCharter}
+\shorttext{T5}{bch}{b}{n}  {bchb8v}   {VnCharterBT-Bold}
+\shorttext{T5}{bch}{b}{it} {bchbi8v}  {VnCharterBT-BoldItalic}
+\shorttext{T5}{bch}{b}{sl} {bchbo8v}  {VnCharterBT-Bold}
+\shorttext{T5}{bch}{m}{sc} {bchrc8v}  {N/A}
+\shorttext{T5}{bch}{b}{sc} {bchbc8v}  {N/A}
+\end{shortsample}
+\end{document}
diff --git a/Master/texmf-dist/source/generic/vntex/tests/chorus-sample.tex b/Master/texmf-dist/source/generic/vntex/tests/chorus-sample.tex
new file mode 100644
index 00000000000..4e7b57f1809
--- /dev/null
+++ b/Master/texmf-dist/source/generic/vntex/tests/chorus-sample.tex
@@ -0,0 +1,13 @@
+% Copyright 2003-2005 Han The Thanh <hanthethanh@gmx.net>.
+% This file is part of vntex.  License: LPPL, version 1.3 or newer,
+% according to http://www.latex-project.org/lppl.txt
+
+\documentclass[sample]{vnsample}
+
+\mapfile{qzc}
+
+\begin{document}
+\section{TeX Gyre Chorus-MediumItalic}
+\showletters{T5}{qzc}{m}{n}    {t5-qzcmi}     {TeXGyreChorus-MediumItalic}
+\showtext   {T5}{qzc}{m}{n}    {t5-qzcmi}     {TeXGyreChorus-MediumItalic}
+\end{document}
diff --git a/Master/texmf-dist/source/generic/vntex/tests/chorus-test.tex b/Master/texmf-dist/source/generic/vntex/tests/chorus-test.tex
new file mode 100644
index 00000000000..1cabfbe3203
--- /dev/null
+++ b/Master/texmf-dist/source/generic/vntex/tests/chorus-test.tex
@@ -0,0 +1,13 @@
+% Copyright 2003-2005 Han The Thanh <hanthethanh@gmx.net>.
+% This file is part of vntex.  License: LPPL, version 1.3 or newer,
+% according to http://www.latex-project.org/lppl.txt
+
+\documentclass[test]{vnsample}
+
+\mapfile{qzc}
+
+\begin{document}
+\begin{shortsample}
+\shorttext{T5}{qzc}{m}{it}    {t5-qzcmi}     {TeXGyreChorus-MediumItalic}
+\end{shortsample}
+\end{document}
diff --git a/Master/texmf-dist/source/generic/vntex/tests/classicovn-sample.tex b/Master/texmf-dist/source/generic/vntex/tests/classicovn-sample.tex
new file mode 100644
index 00000000000..83380012a23
--- /dev/null
+++ b/Master/texmf-dist/source/generic/vntex/tests/classicovn-sample.tex
@@ -0,0 +1,20 @@
+% Copyright 2003-2005 Han The Thanh <hanthethanh@gmx.net>.
+% This file is part of vntex.  License: LPPL, version 1.3 or newer,
+% according to http://www.latex-project.org/lppl.txt
+
+\documentclass[sample]{vnsample}
+
+\mapfile{classicovn}
+
+\begin{document}
+\section{VnURWClassico}
+\showletters{T5}{uop}{m}{n}  {uopr8v}   {VnURWClassico}
+\showletters{T5}{uop}{m}{it} {uopri8v}  {VnURWClassico-Italic}
+\showletters{T5}{uop}{m}{sl} {uopro8v}  {VnURWClassico}
+\showletters{T5}{uop}{b}{n}  {uopb8v}   {VnURWClassico-Bold}
+\showletters{T5}{uop}{b}{it} {uopbi8v}  {VnURWClassico-BoldItalic}
+\showletters{T5}{uop}{b}{sl} {uopbo8v}  {VnURWClassico-Bold}
+\showletters{T5}{uop}{m}{sc} {uoprc8v}  {N/A}
+\showletters{T5}{uop}{b}{sc} {uopbc8v}  {N/A}
+\showtext   {T5}{uop}{m}{n}  {uopr8v}   {VnURWClassico}
+\end{document}
diff --git a/Master/texmf-dist/source/generic/vntex/tests/classicovn-test.tex b/Master/texmf-dist/source/generic/vntex/tests/classicovn-test.tex
new file mode 100644
index 00000000000..c76b5ef33b2
--- /dev/null
+++ b/Master/texmf-dist/source/generic/vntex/tests/classicovn-test.tex
@@ -0,0 +1,20 @@
+% Copyright 2003-2005 Han The Thanh <hanthethanh@gmx.net>.
+% This file is part of vntex.  License: LPPL, version 1.3 or newer,
+% according to http://www.latex-project.org/lppl.txt
+
+\documentclass[test]{vnsample}
+
+\mapfile{classicovn}
+
+\begin{document}
+\begin{shortsample}
+\shorttext{T5}{uop}{m}{n}  {uopr8v}   {VnURWClassico}
+\shorttext{T5}{uop}{m}{it} {uopri8v}  {VnURWClassico-Italic}
+\shorttext{T5}{uop}{m}{sl} {uopro8v}  {VnURWClassico}
+\shorttext{T5}{uop}{b}{n}  {uopb8v}   {VnURWClassico-Bold}
+\shorttext{T5}{uop}{b}{it} {uopbi8v}  {VnURWClassico-BoldItalic}
+\shorttext{T5}{uop}{b}{sl} {uopbo8v}  {VnURWClassico-Bold}
+\shorttext{T5}{uop}{m}{sc} {uoprc8v}  {N/A}
+\shorttext{T5}{uop}{b}{sc} {uopbc8v}  {N/A}
+\end{shortsample}
+\end{document}
diff --git a/Master/texmf-dist/source/generic/vntex/tests/cmbrightvn-sample.tex b/Master/texmf-dist/source/generic/vntex/tests/cmbrightvn-sample.tex
new file mode 100644
index 00000000000..48847876236
--- /dev/null
+++ b/Master/texmf-dist/source/generic/vntex/tests/cmbrightvn-sample.tex
@@ -0,0 +1,18 @@
+% Copyright 2003-2005 Han The Thanh <hanthethanh@gmx.net>.
+% This file is part of vntex.  License: LPPL, version 1.3 or newer,
+% according to http://www.latex-project.org/lppl.txt
+
+\documentclass[sample]{vnsample}
+
+\mapfile{cmbrightvn}
+
+\begin{document}
+\section{VnCMBright}
+\showletters{T5}{cmbr}{m}{n}{vncmbr10}{vncmbr10}
+\showletters{T5}{cmbr}{m}{sl}{vncmbrsl10}{vncmbrsl10}
+\showletters{T5}{cmbr}{bx}{n}{vncmbrbx10}{vncmbrbx10}
+\showtext   {T5}{cmbr}{m}{n}{vncmbr10}{vncmbr10}
+\showletters{T5}{cmtl}{m}{n}{vncmtl10}{vncmtl10}
+\showletters{T5}{cmtl}{m}{sl}{vncmsltl10}{vncmsltl10}
+\showtext   {T5}{cmtl}{m}{n}{vncmtl10}{vncmtl10}
+\end{document}
diff --git a/Master/texmf-dist/source/generic/vntex/tests/cmbrightvn-test.tex b/Master/texmf-dist/source/generic/vntex/tests/cmbrightvn-test.tex
new file mode 100644
index 00000000000..3f33e6192a8
--- /dev/null
+++ b/Master/texmf-dist/source/generic/vntex/tests/cmbrightvn-test.tex
@@ -0,0 +1,17 @@
+% Copyright 2003-2005 Han The Thanh <hanthethanh@gmx.net>.
+% This file is part of vntex.  License: LPPL, version 1.3 or newer,
+% according to http://www.latex-project.org/lppl.txt
+
+\documentclass[test]{vnsample}
+
+\mapfile{cmbrightvn}
+
+\begin{document}
+\begin{shortsample}
+\shorttext{T5}{cmbr}{m}{n}{vncmbr10}{vncmbr10}
+\shorttext{T5}{cmbr}{m}{sl}{vncmbrsl10}{vncmbrsl10}
+\shorttext{T5}{cmbr}{bx}{n}{vncmbrbx10}{vncmbrbx10}
+\shorttext{T5}{cmtl}{m}{n}{vncmtl10}{vncmtl10}
+\shorttext{T5}{cmtl}{m}{sl}{vncmsltl10}{vncmsltl10}
+\end{shortsample}
+\end{document}
diff --git a/Master/texmf-dist/source/generic/vntex/tests/comicsansvn-sample.tex b/Master/texmf-dist/source/generic/vntex/tests/comicsansvn-sample.tex
new file mode 100644
index 00000000000..b8a7690e0af
--- /dev/null
+++ b/Master/texmf-dist/source/generic/vntex/tests/comicsansvn-sample.tex
@@ -0,0 +1,16 @@
+% Copyright 2003-2005 Han The Thanh <hanthethanh@gmx.net>.
+% This file is part of vntex.  License: LPPL, version 1.3 or newer,
+% according to http://www.latex-project.org/lppl.txt
+
+\documentclass[sample]{vnsample}
+
+\mapfile{comicvn}
+
+\begin{document}
+\section{Comicsans}
+\showletters{T5}{comic}{m}{n}  {comic8v}    {N/A}
+\showletters{T5}{comic}{m}{sl} {comico8v}   {N/A}
+\showletters{T5}{comic}{b}{n}  {comicbd8v}  {N/A}
+\showletters{T5}{comic}{b}{sl} {comicbdo8v} {N/A}
+\showtext   {T5}{comic}{m}{n}  {comic8v}    {N/A}
+\end{document}
diff --git a/Master/texmf-dist/source/generic/vntex/tests/comicsansvn-test.tex b/Master/texmf-dist/source/generic/vntex/tests/comicsansvn-test.tex
new file mode 100644
index 00000000000..918a7ca4ea0
--- /dev/null
+++ b/Master/texmf-dist/source/generic/vntex/tests/comicsansvn-test.tex
@@ -0,0 +1,16 @@
+% Copyright 2003-2005 Han The Thanh <hanthethanh@gmx.net>.
+% This file is part of vntex.  License: LPPL, version 1.3 or newer,
+% according to http://www.latex-project.org/lppl.txt
+
+\documentclass[test]{vnsample}
+
+\mapfile{comicvn}
+
+\begin{document}
+\begin{shortsample}
+\shorttext{T5}{comic}{m}{n} {comic8v}  {N/A}
+\shorttext{T5}{comic}{b}{n} {comicbd8v}  {N/A}
+\shorttext{T5}{comic}{m}{sl} {comico8v}  {N/A}
+\shorttext{T5}{comic}{b}{sl} {comicbdo8v}  {N/A}
+\end{shortsample}
+\end{document}
diff --git a/Master/texmf-dist/source/generic/vntex/tests/concretevn-sample.tex b/Master/texmf-dist/source/generic/vntex/tests/concretevn-sample.tex
new file mode 100644
index 00000000000..e9ac0a3c571
--- /dev/null
+++ b/Master/texmf-dist/source/generic/vntex/tests/concretevn-sample.tex
@@ -0,0 +1,16 @@
+% Copyright 2003-2005 Han The Thanh <hanthethanh@gmx.net>.
+% This file is part of vntex.  License: LPPL, version 1.3 or newer,
+% according to http://www.latex-project.org/lppl.txt
+
+\documentclass[sample]{vnsample}
+
+\mapfile{concretevn}
+
+\begin{document}
+\section{VnConcrete}
+\showletters{T5}{ccr}{m}{n}   {vnccr10}   {Vnccr10}
+\showletters{T5}{ccr}{m}{sl}  {vnccsl10}  {Vnccsl10}
+\showletters{T5}{ccr}{m}{it}  {vnccti10}  {Vnccti10}
+\showletters{T5}{ccr}{m}{sc}  {vncccsc10} {Vncccsc10}
+\showtext   {T5}{ccr}{m}{n}   {vnccr10}   {Vnccr10}
+\end{document}
diff --git a/Master/texmf-dist/source/generic/vntex/tests/concretevn-test.tex b/Master/texmf-dist/source/generic/vntex/tests/concretevn-test.tex
new file mode 100644
index 00000000000..1ce48bbf4c9
--- /dev/null
+++ b/Master/texmf-dist/source/generic/vntex/tests/concretevn-test.tex
@@ -0,0 +1,16 @@
+% Copyright 2003-2005 Han The Thanh <hanthethanh@gmx.net>.
+% This file is part of vntex.  License: LPPL, version 1.3 or newer,
+% according to http://www.latex-project.org/lppl.txt
+
+\documentclass[test]{vnsample}
+
+\mapfile{concretevn}
+
+\begin{document}
+\begin{shortsample}
+\shorttext{T5}{ccr}{m}{n}   {vnccr10}   {Vnccr10}
+\shorttext{T5}{ccr}{m}{sl}  {vnccsl10}  {Vnccsl10}
+\shorttext{T5}{ccr}{m}{it}  {vnccti10}  {Vnccti10}
+\shorttext{T5}{ccr}{m}{sc}  {vncccsc10} {Vncccsc10}
+\end{shortsample}
+\end{document}
diff --git a/Master/texmf-dist/source/generic/vntex/tests/cursor-sample.tex b/Master/texmf-dist/source/generic/vntex/tests/cursor-sample.tex
new file mode 100644
index 00000000000..d2a255ee640
--- /dev/null
+++ b/Master/texmf-dist/source/generic/vntex/tests/cursor-sample.tex
@@ -0,0 +1,19 @@
+% Copyright 2003-2005 Han The Thanh <hanthethanh@gmx.net>.
+% This file is part of vntex.  License: LPPL, version 1.3 or newer,
+% according to http://www.latex-project.org/lppl.txt
+
+\documentclass[sample]{vnsample}
+
+\mapfile{qcr}
+
+\begin{document}
+\section{TeX Gyre Cursor}
+\showletters{T5}{qcr}{m}{n}    {t5-qcrr}     {TeXGyreCursor-Regular}
+\showletters{T5}{qcr}{m}{it}   {t5-qcrri}    {TeXGyreCursor-Italic}
+\showletters{T5}{qcr}{b}{n}    {t5-qcrb}     {TeXGyreCursor-Bold}
+\showletters{T5}{qcr}{b}{it}   {t5-qcrbi}    {TeXGyreCursor-BoldItalic}
+\showletters{T5}{qcr}{m}{sc}   {t5-qcrr-sc}  {TeXGyreCursor-Regular}
+\showletters{T5}{qcr}{m}{scit} {t5-qcrri-sc} {TeXGyreCursor-Italic}
+\showletters{T5}{qcr}{b}{sc}   {t5-qcrb-sc}  {TeXGyreCursor-Bold}
+\showtext   {T5}{qcr}{m}{n}    {t5-qcrr}     {TeXGyreCursor-Regular}
+\end{document}
diff --git a/Master/texmf-dist/source/generic/vntex/tests/cursor-test.tex b/Master/texmf-dist/source/generic/vntex/tests/cursor-test.tex
new file mode 100644
index 00000000000..db02b0cbe70
--- /dev/null
+++ b/Master/texmf-dist/source/generic/vntex/tests/cursor-test.tex
@@ -0,0 +1,20 @@
+% Copyright 2003-2005 Han The Thanh <hanthethanh@gmx.net>.
+% This file is part of vntex.  License: LPPL, version 1.3 or newer,
+% according to http://www.latex-project.org/lppl.txt
+
+\documentclass[test]{vnsample}
+
+\mapfile{qcr}
+
+\begin{document}
+\begin{shortsample}
+\shorttext{T5}{qcr}{m}{n}    {t5-qcrr}     {TeXGyreCursor-Regular}
+\shorttext{T5}{qcr}{m}{it}   {t5-qcrri}    {TeXGyreCursor-Italic}
+\shorttext{T5}{qcr}{b}{n}    {t5-qcrb}     {TeXGyreCursor-Bold}
+\shorttext{T5}{qcr}{b}{it}   {t5-qcrbi}    {TeXGyreCursor-BoldItalic}
+\shorttext{T5}{qcr}{m}{sc}   {t5-qcrr-sc}  {TeXGyreCursor-Regular}
+\shorttext{T5}{qcr}{m}{scit} {t5-qcrri-sc} {TeXGyreCursor-Italic}
+\shorttext{T5}{qcr}{b}{sc}   {t5-qcrb-sc}  {TeXGyreCursor-Bold}
+\shorttext{T5}{qcr}{b}{scit} {t5-qcrbi-sc} {TeXGyreCursor-BoldItalic}
+\end{shortsample}
+\end{document}
diff --git a/Master/texmf-dist/source/generic/vntex/tests/garamondvn-sample.tex b/Master/texmf-dist/source/generic/vntex/tests/garamondvn-sample.tex
new file mode 100644
index 00000000000..f64ecfe7f3c
--- /dev/null
+++ b/Master/texmf-dist/source/generic/vntex/tests/garamondvn-sample.tex
@@ -0,0 +1,20 @@
+% Copyright 2003-2005 Han The Thanh <hanthethanh@gmx.net>.
+% This file is part of vntex.  License: LPPL, version 1.3 or newer,
+% according to http://www.latex-project.org/lppl.txt
+
+\documentclass[sample]{vnsample}
+
+\mapfile{garamondvn}
+
+\begin{document}
+\section{VnGaramondNo8}
+\showletters{T5}{ugm}{m}{n}  {ugmr8v}   {VnGaramondNo8-Reg}
+\showletters{T5}{ugm}{m}{it} {ugmri8v}  {VnGaramondNo8-Ita}
+\showletters{T5}{ugm}{m}{sl} {ugmro8v}  {VnGaramondNo8-Reg}
+\showletters{T5}{ugm}{b}{n}  {ugmm8v}   {VnGaramondNo8-Med}
+\showletters{T5}{ugm}{b}{it} {ugmmi8v}  {VnGaramondNo8-MedIta}
+\showletters{T5}{ugm}{b}{sl} {ugmmo8v}  {VnGaramondNo8-Med}
+\showletters{T5}{ugm}{m}{sc} {ugmrc8v}  {N/A}
+\showletters{T5}{ugm}{b}{sc} {ugmmc8v}  {N/A}
+\showtext   {T5}{ugm}{m}{n}  {ugmr8v}   {VnGaramondNo8-Reg}
+\end{document}
diff --git a/Master/texmf-dist/source/generic/vntex/tests/garamondvn-test.tex b/Master/texmf-dist/source/generic/vntex/tests/garamondvn-test.tex
new file mode 100644
index 00000000000..a884e387dbd
--- /dev/null
+++ b/Master/texmf-dist/source/generic/vntex/tests/garamondvn-test.tex
@@ -0,0 +1,20 @@
+% Copyright 2003-2005 Han The Thanh <hanthethanh@gmx.net>.
+% This file is part of vntex.  License: LPPL, version 1.3 or newer,
+% according to http://www.latex-project.org/lppl.txt
+
+\documentclass[test]{vnsample}
+
+\mapfile{garamondvn}
+
+\begin{document}
+\begin{shortsample}
+\shorttext{T5}{ugm}{m}{n}  {ugmr8v}   {VnGaramondNo8-Reg}
+\shorttext{T5}{ugm}{m}{it} {ugmri8v}  {VnGaramondNo8-Ita}
+\shorttext{T5}{ugm}{m}{sl} {ugmro8v}  {VnGaramondNo8-Reg}
+\shorttext{T5}{ugm}{b}{n}  {ugmm8v}   {VnGaramondNo8-Med}
+\shorttext{T5}{ugm}{b}{it} {ugmmi8v}  {VnGaramondNo8-MedIta}
+\shorttext{T5}{ugm}{b}{sl} {ugmmo8v}  {VnGaramondNo8-Med}
+\shorttext{T5}{ugm}{m}{sc} {ugmrc8v}  {N/A}
+\shorttext{T5}{ugm}{b}{sc} {ugmmc8v}  {N/A}
+\end{shortsample}
+\end{document}
diff --git a/Master/texmf-dist/source/generic/vntex/tests/grotesqvn-sample.tex b/Master/texmf-dist/source/generic/vntex/tests/grotesqvn-sample.tex
new file mode 100644
index 00000000000..39447b7060c
--- /dev/null
+++ b/Master/texmf-dist/source/generic/vntex/tests/grotesqvn-sample.tex
@@ -0,0 +1,14 @@
+% Copyright 2003-2005 Han The Thanh <hanthethanh@gmx.net>.
+% This file is part of vntex.  License: LPPL, version 1.3 or newer,
+% according to http://www.latex-project.org/lppl.txt
+
+\documentclass[sample]{vnsample}
+
+\mapfile{grotesqvn}
+
+\begin{document}
+\section{VnURWGroteskT-Bold}
+\showletters{T5}{ugq}{b}{n}    {ugqb8v}   {VnURWGroteskT-Bold}
+\showletters{T5}{ugq}{b}{sl}   {ugqbo8v}  {N/A}
+\showtext   {T5}{ugq}{b}{n}    {ugqb8v}   {VnURWGroteskT-Bold}
+\end{document}
diff --git a/Master/texmf-dist/source/generic/vntex/tests/grotesqvn-test.tex b/Master/texmf-dist/source/generic/vntex/tests/grotesqvn-test.tex
new file mode 100644
index 00000000000..498e74529a5
--- /dev/null
+++ b/Master/texmf-dist/source/generic/vntex/tests/grotesqvn-test.tex
@@ -0,0 +1,14 @@
+% Copyright 2003-2005 Han The Thanh <hanthethanh@gmx.net>.
+% This file is part of vntex.  License: LPPL, version 1.3 or newer,
+% according to http://www.latex-project.org/lppl.txt
+
+\documentclass[test]{vnsample}
+
+\mapfile{grotesqvn}
+
+\begin{document}
+\begin{shortsample}
+\shorttext{T5}{ugq}{b}{n}  {ugqb8v}   {VnURWGroteskT-Bold}
+\shorttext{T5}{ugq}{b}{sl} {ugqbo8v}  {N/A}
+\end{shortsample}
+\end{document}
diff --git a/Master/texmf-dist/source/generic/vntex/tests/heros-sample.tex b/Master/texmf-dist/source/generic/vntex/tests/heros-sample.tex
new file mode 100644
index 00000000000..c5b40690291
--- /dev/null
+++ b/Master/texmf-dist/source/generic/vntex/tests/heros-sample.tex
@@ -0,0 +1,28 @@
+% Copyright 2003-2005 Han The Thanh <hanthethanh@gmx.net>.
+% This file is part of vntex.  License: LPPL, version 1.3 or newer,
+% according to http://www.latex-project.org/lppl.txt
+
+\documentclass[sample]{vnsample}
+
+\mapfile{qhv}
+
+\begin{document}
+\section{TeX Gyre Heros}
+\showletters{T5}{qhv}{m}{n}    {t5-qhvr}     {TeXGyreHeros-Regular}
+\showletters{T5}{qhv}{m}{it}   {t5-qhvri}    {TeXGyreHeros-Italic}
+\showletters{T5}{qhv}{b}{n}    {t5-qhvb}     {TeXGyreHeros-Bold}
+\showletters{T5}{qhv}{b}{it}   {t5-qhvbi}    {TeXGyreHeros-BoldItalic}
+\showletters{T5}{qhv}{m}{sc}   {t5-qhvr-sc}  {TeXGyreHeros-Regular}
+\showletters{T5}{qhv}{m}{scit} {t5-qhvri-sc} {TeXGyreHeros-Italic}
+\showletters{T5}{qhv}{b}{sc}   {t5-qhvb-sc}  {TeXGyreHeros-Bold}
+\showtext   {T5}{qhv}{m}{n}    {t5-qhvr}     {TeXGyreHeros-Regular}
+
+\showletters{T5}{qhv}{c}{n}    {t5-qhvcr}     {TeXGyreHerosCondensed-Regular}
+\showletters{T5}{qhv}{c}{it}   {t5-qhvcri}    {TeXGyreHerosCondensed-Italic}
+\showletters{T5}{qhv}{bc}{n}   {t5-qhvcb}     {TeXGyreHerosCondensed-Bold}
+\showletters{T5}{qhv}{bc}{it}  {t5-qhvcbi}    {TeXGyreHerosCondensed-BoldItalic}
+\showletters{T5}{qhv}{c}{sc}   {t5-qhvcr-sc}  {TeXGyreHerosCondensed-Regular}
+\showletters{T5}{qhv}{c}{scit} {t5-qhvcri-sc} {TeXGyreHerosCondensed-Italic}
+\showletters{T5}{qhv}{bc}{sc}  {t5-qhvcb-sc}  {TeXGyreHerosCondensed-Bold}
+\showtext   {T5}{qhv}{c}{n}    {t5-qhvcr}     {TeXGyreHerosCondensed-Regular}
+\end{document}
diff --git a/Master/texmf-dist/source/generic/vntex/tests/heros-test.tex b/Master/texmf-dist/source/generic/vntex/tests/heros-test.tex
new file mode 100644
index 00000000000..10c8adc316b
--- /dev/null
+++ b/Master/texmf-dist/source/generic/vntex/tests/heros-test.tex
@@ -0,0 +1,29 @@
+% Copyright 2003-2005 Han The Thanh <hanthethanh@gmx.net>.
+% This file is part of vntex.  License: LPPL, version 1.3 or newer,
+% according to http://www.latex-project.org/lppl.txt
+
+\documentclass[test]{vnsample}
+
+\mapfile{qhv}
+
+\begin{document}
+\begin{shortsample}
+\shorttext{T5}{qhv}{m}{n}    {t5-qhvr}     {TeXGyreHeros-Regular}
+\shorttext{T5}{qhv}{m}{it}   {t5-qhvri}    {TeXGyreHeros-Italic}
+\shorttext{T5}{qhv}{b}{n}    {t5-qhvb}     {TeXGyreHeros-Bold}
+\shorttext{T5}{qhv}{b}{it}   {t5-qhvbi}    {TeXGyreHeros-BoldItalic}
+\shorttext{T5}{qhv}{m}{sc}   {t5-qhvr-sc}  {TeXGyreHeros-Regular}
+\shorttext{T5}{qhv}{m}{scit} {t5-qhvri-sc} {TeXGyreHeros-Italic}
+\shorttext{T5}{qhv}{b}{sc}   {t5-qhvb-sc}  {TeXGyreHeros-Bold}
+\shorttext{T5}{qhv}{b}{scit} {t5-qhvbi-sc} {TeXGyreHeros-BoldItalic}
+
+\shorttext{T5}{qhv}{c}{n}     {t5-qhvcr}     {TeXGyreHerosCondensed-Regular}
+\shorttext{T5}{qhv}{c}{it}    {t5-qhvcri}    {TeXGyreHerosCondensed-Italic}
+\shorttext{T5}{qhv}{bc}{n}    {t5-qhvcb}     {TeXGyreHerosCondensed-Bold}
+\shorttext{T5}{qhv}{bc}{it}   {t5-qhvcbi}    {TeXGyreHerosCondensed-BoldItalic}
+\shorttext{T5}{qhv}{c}{sc}    {t5-qhvcr-sc}  {TeXGyreHerosCondensed-Regular}
+\shorttext{T5}{qhv}{c}{scit}  {t5-qhvcri-sc} {TeXGyreHerosCondensed-Italic}
+\shorttext{T5}{qhv}{bc}{sc}   {t5-qhvcb-sc}  {TeXGyreHerosCondensed-Bold}
+\shorttext{T5}{qhv}{bc}{scit} {t5-qhvcbi-sc} {TeXGyreHerosCondensed-BoldItalic}
+\end{shortsample}
+\end{document}
diff --git a/Master/texmf-dist/source/generic/vntex/tests/mscore-sample.tex b/Master/texmf-dist/source/generic/vntex/tests/mscore-sample.tex
new file mode 100644
index 00000000000..d4795d8540a
--- /dev/null
+++ b/Master/texmf-dist/source/generic/vntex/tests/mscore-sample.tex
@@ -0,0 +1,61 @@
+% Copyright 2003-2005 Han The Thanh <hanthethanh@gmx.net>.
+% This file is part of vntex.  License: LPPL, version 1.3 or newer,
+% according to http://www.latex-project.org/lppl.txt
+
+\documentclass[sample]{vnsample}
+
+\mapfile{mscore}
+
+\begin{document}
+\section{ArialMT}
+\showletters{T5}{ma1}{m}{n}  {ma1r8v}  {ArialMT}
+\showletters{T5}{ma1}{b}{n}  {ma1b8v}  {Arial-BoldMT}
+\showletters{T5}{ma1}{m}{it} {ma1ri8v} {Arial-ItalicMT}
+\showletters{T5}{ma1}{b}{it} {ma1bi8v} {Arial-BoldItalicMT}
+\showletters{T5}{ma1}{m}{sc} {ma1rc8v} {N/A}
+\showletters{T5}{ma1}{b}{sc} {ma1bc8v} {N/A}
+\showtext   {T5}{ma1}{m}{n}  {ma1r8v}  {ArialMT}
+
+\section{CourierNewPSMT}
+\showletters{T5}{mcr}{m}{n}  {mcrr8v}  {CourierNewPSMT}
+\showletters{T5}{mcr}{b}{n}  {mcrb8v}  {CourierNewPS-BoldMT}
+\showletters{T5}{mcr}{m}{it} {mcrri8v} {CourierNewPS-ItalicMT}
+\showletters{T5}{mcr}{b}{it} {mcrbi8v} {CourierNewPS-BoldItalicMT}
+\showletters{T5}{mcr}{m}{sc} {mcrrc8v} {N/A}
+\showletters{T5}{mcr}{b}{sc} {mcrbc8v} {N/A}
+\showtext   {T5}{mcr}{m}{n}  {mcrr8v}  {CourierNewPSMT}
+
+\section{PalatinoLinotype}
+\showletters{T5}{lpr}{m}{n}  {lprr8v}  {PalatinoLinotype-Roman}
+\showletters{T5}{lpr}{b}{n}  {lprb8v}  {PalatinoLinotype-Bold}
+\showletters{T5}{lpr}{m}{it} {lprri8v} {PalatinoLinotype-Italic}
+\showletters{T5}{lpr}{b}{it} {lprbi8v} {PalatinoLinotype-BoldItalic}
+\showletters{T5}{lpr}{m}{sc} {lprrc8v} {N/A}
+\showletters{T5}{lpr}{b}{sc} {lprbc8v} {N/A}
+\showtext   {T5}{lpr}{m}{n}  {lprr8v}  {PalatinoLinotype-Roman}
+
+\section{TimesNewRomanPSMT}
+\showletters{T5}{mns}{m}{n}  {mnsr8v}  {TimesNewRomanPSMT}
+\showletters{T5}{mns}{b}{n}  {mnsb8v}  {TimesNewRomanPS-BoldMT}
+\showletters{T5}{mns}{m}{it} {mnsri8v} {TimesNewRomanPS-ItalicMT}
+\showletters{T5}{mns}{b}{it} {mnsbi8v} {TimesNewRomanPS-BoldItalicMT}
+\showletters{T5}{mns}{m}{sc} {mnsrc8v} {N/A}
+\showletters{T5}{mns}{b}{sc} {mnsbc8v} {N/A}
+\showtext   {T5}{mns}{m}{n}  {mnsr8v}  {TimesNewRomanPSMT}
+
+\section{Tahoma}
+\showletters{T5}{jth}{m}{n}  {jthr8v}  {Tahoma}
+\showletters{T5}{jth}{b}{n}  {jthb8v}  {Tahoma-Bold}
+\showletters{T5}{jth}{m}{sc} {jthrc8v} {N/A}
+\showletters{T5}{jth}{b}{sc} {jthbc8v} {N/A}
+\showtext   {T5}{jth}{m}{n}  {jthr8v}  {Tahoma}
+
+\section{Verdana}
+\showletters{T5}{jvn}{m}{n}  {jvnr8v}  {Verdana}
+\showletters{T5}{jvn}{b}{n}  {jvnb8v}  {Verdana-Bold}
+\showletters{T5}{jvn}{m}{it} {jvnri8v} {Verdana-Italic}
+\showletters{T5}{jvn}{b}{it} {jvnbi8v} {Verdana-BoldItalic}
+\showletters{T5}{jvn}{m}{sc} {jvnrc8v} {N/A}
+\showletters{T5}{jvn}{b}{sc} {jvnbc8v} {N/A}
+\showtext   {T5}{jvn}{m}{n}  {jvnr8v}  {Verdana}
+\end{document}
diff --git a/Master/texmf-dist/source/generic/vntex/tests/mscore-test.tex b/Master/texmf-dist/source/generic/vntex/tests/mscore-test.tex
new file mode 100644
index 00000000000..aee39caae86
--- /dev/null
+++ b/Master/texmf-dist/source/generic/vntex/tests/mscore-test.tex
@@ -0,0 +1,49 @@
+% Copyright 2003-2005 Han The Thanh <hanthethanh@gmx.net>.
+% This file is part of vntex.  License: LPPL, version 1.3 or newer,
+% according to http://www.latex-project.org/lppl.txt
+
+\documentclass[test]{vnsample}
+
+\mapfile{mscore}
+
+\begin{document}
+\begin{shortsample}
+\shorttext{T5}{ma1}{m}{n}  {ma1r8v}  {ArialMT}
+\shorttext{T5}{ma1}{b}{n}  {ma1b8v}  {Arial-BoldMT}
+\shorttext{T5}{ma1}{m}{it} {ma1ri8v} {Arial-ItalicMT}
+\shorttext{T5}{ma1}{b}{it} {ma1bi8v} {Arial-BoldItalicMT}
+\shorttext{T5}{ma1}{m}{sc} {ma1rc8v} {N/A}
+\shorttext{T5}{ma1}{b}{sc} {ma1bc8v} {N/A}
+\shorttext{T5}{mcr}{m}{n}  {mcrr8v}  {CourierNewPSMT}
+\shorttext{T5}{mcr}{b}{n}  {mcrb8v}  {CourierNewPS-BoldMT}
+\shorttext{T5}{mcr}{m}{it} {mcrri8v} {CourierNewPS-ItalicMT}
+\shorttext{T5}{mcr}{b}{it} {mcrbi8v} {CourierNewPS-BoldItalicMT}
+\shorttext{T5}{mcr}{m}{sc} {mcrrc8v} {N/A}
+\shorttext{T5}{mcr}{b}{sc} {mcrbc8v} {N/A}
+\shorttext{T5}{lpr}{m}{n}  {lprr8v}  {PalatinoLinotype-Roman}
+\shorttext{T5}{lpr}{b}{n}  {lprb8v}  {PalatinoLinotype-Bold}
+\shorttext{T5}{lpr}{m}{it} {lprri8v} {PalatinoLinotype-Italic}
+\shorttext{T5}{lpr}{b}{it} {lprbi8v} {PalatinoLinotype-BoldItalic}
+\shorttext{T5}{lpr}{m}{sc} {lprrc8v} {N/A}
+\shorttext{T5}{lpr}{b}{sc} {lprbc8v} {N/A}
+\end{shortsample}
+\clearpage
+\begin{shortsample}
+\shorttext{T5}{mns}{m}{n}  {mnsr8v}  {TimesNewRomanPSMT}
+\shorttext{T5}{mns}{b}{n}  {mnsb8v}  {TimesNewRomanPS-BoldMT}
+\shorttext{T5}{mns}{m}{it} {mnsri8v} {TimesNewRomanPS-ItalicMT}
+\shorttext{T5}{mns}{b}{it} {mnsbi8v} {TimesNewRomanPS-BoldItalicMT}
+\shorttext{T5}{mns}{m}{sc} {mnsrc8v} {N/A}
+\shorttext{T5}{mns}{b}{sc} {mnsbc8v} {N/A}
+\shorttext{T5}{jth}{m}{n}  {jthr8v}  {Tahoma}
+\shorttext{T5}{jth}{b}{n}  {jthb8v}  {Tahoma-Bold}
+\shorttext{T5}{jth}{m}{sc} {jthrc8v} {N/A}
+\shorttext{T5}{jth}{b}{sc} {jthbc8v} {N/A}
+\shorttext{T5}{jvn}{m}{n}  {jvnr8v}  {Verdana}
+\shorttext{T5}{jvn}{b}{n}  {jvnb8v}  {Verdana-Bold}
+\shorttext{T5}{jvn}{m}{it} {jvnri8v} {Verdana-Italic}
+\shorttext{T5}{jvn}{b}{it} {jvnbi8v} {Verdana-BoldItalic}
+\shorttext{T5}{jvn}{m}{sc} {jvnrc8v} {N/A}
+\shorttext{T5}{jvn}{b}{sc} {jvnbc8v} {N/A}
+\end{shortsample}
+\end{document}
diff --git a/Master/texmf-dist/source/generic/vntex/tests/pagella-sample.tex b/Master/texmf-dist/source/generic/vntex/tests/pagella-sample.tex
new file mode 100644
index 00000000000..f371a7446f9
--- /dev/null
+++ b/Master/texmf-dist/source/generic/vntex/tests/pagella-sample.tex
@@ -0,0 +1,19 @@
+% Copyright 2003-2005 Han The Thanh <hanthethanh@gmx.net>.
+% This file is part of vntex.  License: LPPL, version 1.3 or newer,
+% according to http://www.latex-project.org/lppl.txt
+
+\documentclass[sample]{vnsample}
+
+\mapfile{qpl}
+
+\begin{document}
+\section{TeX Gyre Pagella}
+\showletters{T5}{qpl}{m}{n}    {t5-qplr}     {TeXGyrePagella-Regular}
+\showletters{T5}{qpl}{m}{it}   {t5-qplri}    {TeXGyrePagella-Italic}
+\showletters{T5}{qpl}{b}{n}    {t5-qplb}     {TeXGyrePagella-Bold}
+\showletters{T5}{qpl}{b}{it}   {t5-qplbi}    {TeXGyrePagella-BoldItalic}
+\showletters{T5}{qpl}{m}{sc}   {t5-qplr-sc}  {TeXGyrePagella-Regular}
+\showletters{T5}{qpl}{m}{scit} {t5-qplri-sc} {TeXGyrePagella-Italic}
+\showletters{T5}{qpl}{b}{sc}   {t5-qplb-sc}  {TeXGyrePagella-Bold}
+\showtext   {T5}{qpl}{m}{n}    {t5-qplr}     {TeXGyrePagella-Regular}
+\end{document}
diff --git a/Master/texmf-dist/source/generic/vntex/tests/pagella-test.tex b/Master/texmf-dist/source/generic/vntex/tests/pagella-test.tex
new file mode 100644
index 00000000000..f8ac90cf62b
--- /dev/null
+++ b/Master/texmf-dist/source/generic/vntex/tests/pagella-test.tex
@@ -0,0 +1,20 @@
+% Copyright 2003-2005 Han The Thanh <hanthethanh@gmx.net>.
+% This file is part of vntex.  License: LPPL, version 1.3 or newer,
+% according to http://www.latex-project.org/lppl.txt
+
+\documentclass[test]{vnsample}
+
+\mapfile{qpl}
+
+\begin{document}
+\begin{shortsample}
+\shorttext{T5}{qpl}{m}{n}    {t5-qplr}     {TeXGyrePagella-Regular}
+\shorttext{T5}{qpl}{m}{it}   {t5-qplri}    {TeXGyrePagella-Italic}
+\shorttext{T5}{qpl}{b}{n}    {t5-qplb}     {TeXGyrePagella-Bold}
+\shorttext{T5}{qpl}{b}{it}   {t5-qplbi}    {TeXGyrePagella-BoldItalic}
+\shorttext{T5}{qpl}{m}{sc}   {t5-qplr-sc}  {TeXGyrePagella-Regular}
+\shorttext{T5}{qpl}{m}{scit} {t5-qplri-sc} {TeXGyrePagella-Italic}
+\shorttext{T5}{qpl}{b}{sc}   {t5-qplb-sc}  {TeXGyrePagella-Bold}
+\shorttext{T5}{qpl}{b}{scit} {t5-qplbi-sc} {TeXGyrePagella-BoldItalic}
+\end{shortsample}
+\end{document}
diff --git a/Master/texmf-dist/source/generic/vntex/tests/schola-sample.tex b/Master/texmf-dist/source/generic/vntex/tests/schola-sample.tex
new file mode 100644
index 00000000000..327d65b23d9
--- /dev/null
+++ b/Master/texmf-dist/source/generic/vntex/tests/schola-sample.tex
@@ -0,0 +1,19 @@
+% Copyright 2003-2005 Han The Thanh <hanthethanh@gmx.net>.
+% This file is part of vntex.  License: LPPL, version 1.3 or newer,
+% according to http://www.latex-project.org/lppl.txt
+
+\documentclass[sample]{vnsample}
+
+\mapfile{qcs}
+
+\begin{document}
+\section{TeX Gyre Schola}
+\showletters{T5}{qcs}{m}{n}    {t5-qcsr}     {TeXGyreSchola-Regular}
+\showletters{T5}{qcs}{m}{it}   {t5-qcsri}    {TeXGyreSchola-Italic}
+\showletters{T5}{qcs}{b}{n}    {t5-qcsb}     {TeXGyreSchola-Bold}
+\showletters{T5}{qcs}{b}{it}   {t5-qcsbi}    {TeXGyreSchola-BoldItalic}
+\showletters{T5}{qcs}{m}{sc}   {t5-qcsr-sc}  {TeXGyreSchola-Regular}
+\showletters{T5}{qcs}{m}{scit} {t5-qcsri-sc} {TeXGyreSchola-Italic}
+\showletters{T5}{qcs}{b}{sc}   {t5-qcsb-sc}  {TeXGyreSchola-Bold}
+\showtext   {T5}{qcs}{m}{n}    {t5-qcsr}     {TeXGyreSchola-Regular}
+\end{document}
diff --git a/Master/texmf-dist/source/generic/vntex/tests/schola-test.tex b/Master/texmf-dist/source/generic/vntex/tests/schola-test.tex
new file mode 100644
index 00000000000..535bbead5ec
--- /dev/null
+++ b/Master/texmf-dist/source/generic/vntex/tests/schola-test.tex
@@ -0,0 +1,20 @@
+% Copyright 2003-2005 Han The Thanh <hanthethanh@gmx.net>.
+% This file is part of vntex.  License: LPPL, version 1.3 or newer,
+% according to http://www.latex-project.org/lppl.txt
+
+\documentclass[test]{vnsample}
+
+\mapfile{qcs}
+
+\begin{document}
+\begin{shortsample}
+\shorttext{T5}{qcs}{m}{n}    {t5-qcsr}     {TeXGyreSchola-Regular}
+\shorttext{T5}{qcs}{m}{it}   {t5-qcsri}    {TeXGyreSchola-Italic}
+\shorttext{T5}{qcs}{b}{n}    {t5-qcsb}     {TeXGyreSchola-Bold}
+\shorttext{T5}{qcs}{b}{it}   {t5-qcsbi}    {TeXGyreSchola-BoldItalic}
+\shorttext{T5}{qcs}{m}{sc}   {t5-qcsr-sc}  {TeXGyreSchola-Regular}
+\shorttext{T5}{qcs}{m}{scit} {t5-qcsri-sc} {TeXGyreSchola-Italic}
+\shorttext{T5}{qcs}{b}{sc}   {t5-qcsb-sc}  {TeXGyreSchola-Bold}
+\shorttext{T5}{qcs}{b}{scit} {t5-qcsbi-sc} {TeXGyreSchola-BoldItalic}
+\end{shortsample}
+\end{document}
diff --git a/Master/texmf-dist/source/generic/vntex/tests/t5antt-sample.tex b/Master/texmf-dist/source/generic/vntex/tests/t5antt-sample.tex
new file mode 100644
index 00000000000..983203dce29
--- /dev/null
+++ b/Master/texmf-dist/source/generic/vntex/tests/t5antt-sample.tex
@@ -0,0 +1,59 @@
+% Copyright 2003-2005 Han The Thanh <hanthethanh@gmx.net>.
+% This file is part of vntex.  License: LPPL, version 1.3 or newer,
+% according to http://www.latex-project.org/lppl.txt
+
+\documentclass[sample]{vnsample}
+
+\mapfile{t5-antt}
+
+\begin{document}
+\section{AntykwaTorunskaLigh}
+\showletters{T5}{antt}{l}{n}      {t5-anttl}      {AntykwaTorunskaLigh-Regular}
+\showletters{T5}{antt}{l}{it}     {t5-anttli}     {AntykwaTorunskaLigh-Italic}
+\showletters{T5}{antt}{l}{sc}     {t5-anttlcap}   {AntykwaTorunskaLigh-Regular}
+\showletters{T5}{antt}{l}{scit}   {t5-anttlicap}  {AntykwaTorunskaLigh-Italic}
+\showtext   {T5}{antt}{l}{n}      {t5-anttl}      {AntykwaTorunskaLigh-Regular}
+
+\section{AntykwaTorunska}
+\showletters{T5}{antt}{m}{n}      {t5-anttr}      {AntykwaTorunska-Regular}
+\showletters{T5}{antt}{m}{it}     {t5-anttri}     {AntykwaTorunska-Italic}
+\showletters{T5}{antt}{m}{sc}     {t5-anttrcap}   {AntykwaTorunska-Regular}
+\showletters{T5}{antt}{m}{scit}   {t5-anttricap}  {AntykwaTorunska-Italic}
+\showletters{T5}{antt}{b}{n}      {t5-anttb}      {AntykwaTorunska-Bold}
+\showletters{T5}{antt}{b}{it}     {t5-anttbi}     {AntykwaTorunska-BoldItalic}
+\showletters{T5}{antt}{b}{sc}     {t5-anttbcap}   {AntykwaTorunska-Bold}
+\showletters{T5}{antt}{b}{scit}   {t5-anttbicap}  {AntykwaTorunska-BoldItalic}
+\showtext   {T5}{antt}{m}{n}      {t5-anttr}      {AntykwaTorunska-Regular}
+
+\section{AntykwaTorunskaMed}
+\showletters{T5}{antt}{sb}{n}     {t5-anttm}      {AntykwaTorunskaMed-Regular}
+\showletters{T5}{antt}{sb}{it}    {t5-anttmi}     {AntykwaTorunskaMed-Italic}
+\showletters{T5}{antt}{sb}{sc}    {t5-anttmcap}   {AntykwaTorunskaMed-Regular}
+\showletters{T5}{antt}{sb}{scit}  {t5-anttmicap}  {AntykwaTorunskaMed-Italic}
+\showtext   {T5}{antt}{sb}{n}     {t5-anttm}      {AntykwaTorunskaMed-Regular}
+
+\section{AntykwaTorunskaCondLigh}
+\showletters{T5}{antt}{lc}{n}     {t5-anttcl}     {AntykwaTorunskaCondLigh-Regular}
+\showletters{T5}{antt}{lc}{it}    {t5-anttcli}    {AntykwaTorunskaCondLigh-Italic}
+\showletters{T5}{antt}{lc}{sc}    {t5-anttclcap}  {AntykwaTorunskaCondLigh-Regular}
+\showletters{T5}{antt}{lc}{scit}  {t5-anttclicap} {AntykwaTorunskaCondLigh-Italic}
+\showtext   {T5}{antt}{lc}{n}     {t5-anttcl}     {AntykwaTorunskaCondLigh-Regular}
+
+\section{AntykwaTorunskaCond}
+\showletters{T5}{antt}{mc}{n}     {t5-anttcr}     {AntykwaTorunskaCond-Regular}
+\showletters{T5}{antt}{mc}{it}    {t5-anttcri}    {AntykwaTorunskaCond-Italic}
+\showletters{T5}{antt}{mc}{sc}    {t5-anttcrcap}  {AntykwaTorunskaCond-Regular}
+\showletters{T5}{antt}{mc}{scit}  {t5-anttcricap} {AntykwaTorunskaCond-Italic}
+\showletters{T5}{antt}{bc}{n}     {t5-anttcb}     {AntykwaTorunskaCond-Bold}
+\showletters{T5}{antt}{bc}{it}    {t5-anttcbi}    {AntykwaTorunskaCond-BoldItalic}
+\showletters{T5}{antt}{bc}{sc}    {t5-anttcbcap}  {AntykwaTorunskaCond-Bold}
+\showletters{T5}{antt}{bc}{scit}  {t5-anttcbicap} {AntykwaTorunskaCond-BoldItalic}
+\showtext   {T5}{antt}{mc}{n}     {t5-anttcr}     {AntykwaTorunskaCond-Regular}
+
+\section{AntykwaTorunskaCondMed}
+\showletters{T5}{antt}{sbc}{n}    {t5-anttcm}     {AntykwaTorunskaCondMed-Regular}
+\showletters{T5}{antt}{sbc}{it}   {t5-anttcmi}    {AntykwaTorunskaCondMed-Italic}
+\showletters{T5}{antt}{sbc}{sc}   {t5-anttcmcap}  {AntykwaTorunskaCondMed-Regular}
+\showletters{T5}{antt}{sbc}{scit} {t5-anttcmicap} {AntykwaTorunskaCondMed-Italic}
+\showtext   {T5}{antt}{sbc}{n}    {t5-anttcm}     {AntykwaTorunskaCondMed-Regular}
+\end{document}
diff --git a/Master/texmf-dist/source/generic/vntex/tests/t5antt-test.tex b/Master/texmf-dist/source/generic/vntex/tests/t5antt-test.tex
new file mode 100644
index 00000000000..229895d63f6
--- /dev/null
+++ b/Master/texmf-dist/source/generic/vntex/tests/t5antt-test.tex
@@ -0,0 +1,47 @@
+% Copyright 2003-2005 Han The Thanh <hanthethanh@gmx.net>.
+% This file is part of vntex.  License: LPPL, version 1.3 or newer,
+% according to http://www.latex-project.org/lppl.txt
+
+\documentclass[test]{vnsample}
+
+\mapfile{t5-antt}
+
+\begin{document}
+\begin{shortsample}
+\shorttext{T5}{antt}{l}{n}      {t5-anttl}      {AntykwaTorunskaLigh-Regular}
+\shorttext{T5}{antt}{l}{it}     {t5-anttli}     {AntykwaTorunskaLigh-Italic}
+\shorttext{T5}{antt}{l}{sc}     {t5-anttlcap}   {AntykwaTorunskaLigh-Regular}
+\shorttext{T5}{antt}{l}{scit}   {t5-anttlicap}  {AntykwaTorunskaLigh-Italic}
+\shorttext{T5}{antt}{m}{n}      {t5-anttr}      {AntykwaTorunska-Regular}
+\shorttext{T5}{antt}{m}{it}     {t5-anttri}     {AntykwaTorunska-Italic}
+\shorttext{T5}{antt}{m}{sc}     {t5-anttrcap}   {AntykwaTorunska-Regular}
+\shorttext{T5}{antt}{m}{scit}   {t5-anttricap}  {AntykwaTorunska-Italic}
+\shorttext{T5}{antt}{sb}{n}     {t5-anttm}      {AntykwaTorunskaMed-Regular}
+\shorttext{T5}{antt}{sb}{it}    {t5-anttmi}     {AntykwaTorunskaMed-Italic}
+\shorttext{T5}{antt}{sb}{sc}    {t5-anttmcap}   {AntykwaTorunskaMed-Regular}
+\shorttext{T5}{antt}{sb}{scit}  {t5-anttmicap}  {AntykwaTorunskaMed-Italic}
+\shorttext{T5}{antt}{b}{n}      {t5-anttb}      {AntykwaTorunska-Bold}
+\shorttext{T5}{antt}{b}{it}     {t5-anttbi}     {AntykwaTorunska-BoldItalic}
+\shorttext{T5}{antt}{b}{sc}     {t5-anttbcap}   {AntykwaTorunska-Bold}
+\shorttext{T5}{antt}{b}{scit}   {t5-anttbicap}  {AntykwaTorunska-BoldItalic}
+\end{shortsample}
+\clearpage
+\begin{shortsample}
+\shorttext{T5}{antt}{lc}{n}     {t5-anttcl}     {AntykwaTorunskaCondLigh-Regular}
+\shorttext{T5}{antt}{lc}{it}    {t5-anttcli}    {AntykwaTorunskaCondLigh-Italic}
+\shorttext{T5}{antt}{lc}{sc}    {t5-anttclcap}  {AntykwaTorunskaCondLigh-Regular}
+\shorttext{T5}{antt}{lc}{scit}  {t5-anttclicap} {AntykwaTorunskaCondLigh-Italic}
+\shorttext{T5}{antt}{mc}{n}     {t5-anttcr}     {AntykwaTorunskaCond-Regular}
+\shorttext{T5}{antt}{mc}{it}    {t5-anttcri}    {AntykwaTorunskaCond-Italic}
+\shorttext{T5}{antt}{mc}{sc}    {t5-anttcrcap}  {AntykwaTorunskaCond-Regular}
+\shorttext{T5}{antt}{mc}{scit}  {t5-anttcricap} {AntykwaTorunskaCond-Italic}
+\shorttext{T5}{antt}{sbc}{n}    {t5-anttcm}     {AntykwaTorunskaCondMed-Regular}
+\shorttext{T5}{antt}{sbc}{it}   {t5-anttcmi}    {AntykwaTorunskaCondMed-Italic}
+\shorttext{T5}{antt}{sbc}{sc}   {t5-anttcmcap}  {AntykwaTorunskaCondMed-Regular}
+\shorttext{T5}{antt}{sbc}{scit} {t5-anttcmicap} {AntykwaTorunskaCondMed-Italic}
+\shorttext{T5}{antt}{bc}{n}     {t5-anttcb}     {AntykwaTorunskaCond-Bold}
+\shorttext{T5}{antt}{bc}{it}    {t5-anttcbi}    {AntykwaTorunskaCond-BoldItalic}
+\shorttext{T5}{antt}{bc}{sc}    {t5-anttcbcap}  {AntykwaTorunskaCond-Bold}
+\shorttext{T5}{antt}{bc}{scit}  {t5-anttcbicap} {AntykwaTorunskaCond-BoldItalic}
+\end{shortsample}
+\end{document}
diff --git a/Master/texmf-dist/source/generic/vntex/tests/t5cyklop-sample.tex b/Master/texmf-dist/source/generic/vntex/tests/t5cyklop-sample.tex
new file mode 100644
index 00000000000..a07e4db25f3
--- /dev/null
+++ b/Master/texmf-dist/source/generic/vntex/tests/t5cyklop-sample.tex
@@ -0,0 +1,16 @@
+% Copyright 2003-2005 Han The Thanh <hanthethanh@gmx.net>.
+% This file is part of vntex.  License: LPPL, version 1.3 or newer,
+% according to http://www.latex-project.org/lppl.txt
+
+\documentclass[sample]{vnsample}
+
+\mapfile{cyklop}
+
+\begin{document}
+\section{Cyklop}
+\showletters{T5}{cyklop}{m}{n}    {t5-cyklopr}    {Cyklop-Regular}
+\showletters{T5}{cyklop}{m}{it}   {t5-cyklopi}    {Cyklop-Italic}
+\showletters{T5}{cyklop}{m}{sc}   {t5-cyklopr-sc} {Cyklop-Regular}
+\showletters{T5}{cyklop}{m}{scit} {t5-cyklopi-sc} {Cyklop-Italic}
+\showtext   {T5}{cyklop}{m}{n}    {t5-cyklopr}    {Cyklop-Regular}
+\end{document}
diff --git a/Master/texmf-dist/source/generic/vntex/tests/t5cyklop-test.tex b/Master/texmf-dist/source/generic/vntex/tests/t5cyklop-test.tex
new file mode 100644
index 00000000000..637da8426b9
--- /dev/null
+++ b/Master/texmf-dist/source/generic/vntex/tests/t5cyklop-test.tex
@@ -0,0 +1,16 @@
+% Copyright 2003-2005 Han The Thanh <hanthethanh@gmx.net>.
+% This file is part of vntex.  License: LPPL, version 1.3 or newer,
+% according to http://www.latex-project.org/lppl.txt
+
+\documentclass[test]{vnsample}
+
+\mapfile{cyklop}
+
+\begin{document}
+\begin{shortsample}
+\shorttext{T5}{cyklop}{m}{n}    {t5-cyklopr}    {Cyklop-Regular}
+\shorttext{T5}{cyklop}{m}{it}   {t5-cyklopi}    {Cyklop-Italic}
+\shorttext{T5}{cyklop}{m}{sc}   {t5-cyklopr-sc} {Cyklop-Regular}
+\shorttext{T5}{cyklop}{m}{scit} {t5-cyklopi-sc} {Cyklop-Italic}
+\end{shortsample}
+\end{document}
diff --git a/Master/texmf-dist/source/generic/vntex/tests/t5gentium-sample.tex b/Master/texmf-dist/source/generic/vntex/tests/t5gentium-sample.tex
new file mode 100644
index 00000000000..b0b602946d4
--- /dev/null
+++ b/Master/texmf-dist/source/generic/vntex/tests/t5gentium-sample.tex
@@ -0,0 +1,14 @@
+% Copyright 2003-2005 Han The Thanh <hanthethanh@gmx.net>.
+% This file is part of vntex.  License: LPPL, version 1.3 or newer,
+% according to http://www.latex-project.org/lppl.txt
+
+\documentclass[sample]{vnsample}
+
+\mapfile{gentium}
+
+\begin{document}
+\section{Gentium}
+\showletters{T5}{vgn}{m}{n}  {vgnr-t5}  {Gentium}
+\showletters{T5}{vgn}{m}{it} {vgnri-t5} {Gentium-Italic}
+\showtext   {T5}{vgn}{m}{n}  {vgnr-t5}  {Gentium}
+\end{document}
diff --git a/Master/texmf-dist/source/generic/vntex/tests/t5gentium-test.tex b/Master/texmf-dist/source/generic/vntex/tests/t5gentium-test.tex
new file mode 100644
index 00000000000..0d5ee17d47d
--- /dev/null
+++ b/Master/texmf-dist/source/generic/vntex/tests/t5gentium-test.tex
@@ -0,0 +1,14 @@
+% Copyright 2003-2005 Han The Thanh <hanthethanh@gmx.net>.
+% This file is part of vntex.  License: LPPL, version 1.3 or newer,
+% according to http://www.latex-project.org/lppl.txt
+
+\documentclass[test]{vnsample}
+
+\mapfile{gentium}
+
+\begin{document}
+\begin{shortsample}
+\shorttext{T5}{vgn}{m}{n}   {vgnr-t5}  {Gentium}
+\shorttext{T5}{vgn}{m}{it}  {vgnri-t5} {Gentium-Italic}
+\end{shortsample}
+\end{document}
diff --git a/Master/texmf-dist/source/generic/vntex/tests/t5iwona-sample.tex b/Master/texmf-dist/source/generic/vntex/tests/t5iwona-sample.tex
new file mode 100644
index 00000000000..9499ddb0243
--- /dev/null
+++ b/Master/texmf-dist/source/generic/vntex/tests/t5iwona-sample.tex
@@ -0,0 +1,65 @@
+% Copyright 2003-2005 Han The Thanh <hanthethanh@gmx.net>.
+% This file is part of vntex.  License: LPPL, version 1.3 or newer,
+% according to http://www.latex-project.org/lppl.txt
+
+\documentclass[sample]{vnsample}
+
+\mapfile{t5-iwona}
+
+\begin{document}
+\section{IwonaLight-Regular}
+\showletters{T5}{iwona}{l}{n}      {t5-iwonal}      {IwonaLight-Regular}
+\showletters{T5}{iwona}{l}{it}     {t5-iwonali}     {IwonaLight-Italic}
+\showletters{T5}{iwona}{l}{sc}     {t5-iwonalcap}   {IwonaLight-Regular}
+\showletters{T5}{iwona}{l}{scit}   {t5-iwonalicap}  {IwonaLight-Italic}
+\showtext   {T5}{iwona}{l}{n}      {t5-iwonal}      {IwonaLight-Regular}
+
+\section{Iwona-Regular}
+\showletters{T5}{iwona}{m}{n}      {t5-iwonar}      {Iwona-Regular}
+\showletters{T5}{iwona}{m}{it}     {t5-iwonari}     {Iwona-Italic}
+\showletters{T5}{iwona}{m}{sc}     {t5-iwonarcap}   {Iwona-Regular}
+\showletters{T5}{iwona}{m}{scit}   {t5-iwonaricap}  {Iwona-Italic}
+\showtext   {T5}{iwona}{m}{n}      {t5-iwonar}      {Iwona-Regular}
+
+\section{IwonaMedium-Regular}
+\showletters{T5}{iwona}{sb}{n}     {t5-iwonam}      {IwonaMedium-Regular}
+\showletters{T5}{iwona}{sb}{it}    {t5-iwonami}     {IwonaMedium-Italic}
+\showletters{T5}{iwona}{sb}{sc}    {t5-iwonamcap}   {IwonaMedium-Regular}
+\showletters{T5}{iwona}{sb}{scit}  {t5-iwonamicap}  {IwonaMedium-Italic}
+\showtext   {T5}{iwona}{sb}{n}     {t5-iwonam}      {IwonaMedium-Regular}
+
+\section{Iwona-Bold}
+\showletters{T5}{iwona}{b}{n}      {t5-iwonab}      {Iwona-Bold}
+\showletters{T5}{iwona}{b}{it}     {t5-iwonabi}     {Iwona-BoldItalic}
+\showletters{T5}{iwona}{b}{sc}     {t5-iwonabcap}   {Iwona-Bold}
+\showletters{T5}{iwona}{b}{scit}   {t5-iwonabicap}  {Iwona-BoldItalic}
+\showtext   {T5}{iwona}{b}{n}      {t5-iwonab}      {Iwona-Bold}
+
+\section{IwonaCondLight-Regular}
+\showletters{T5}{iwona}{lc}{n}     {t5-iwonacl}     {IwonaCondLight-Regular}
+\showletters{T5}{iwona}{lc}{it}    {t5-iwonacli}    {IwonaCondLight-Italic}
+\showletters{T5}{iwona}{lc}{sc}    {t5-iwonaclcap}  {IwonaCondLight-Regular}
+\showletters{T5}{iwona}{lc}{scit}  {t5-iwonaclicap} {IwonaCondLight-Italic}
+\showtext   {T5}{iwona}{lc}{n}     {t5-iwonacl}     {IwonaCondLight-Regular}
+
+\section{IwonaCond-Regular}
+\showletters{T5}{iwona}{mc}{n}     {t5-iwonacr}     {IwonaCond-Regular}
+\showletters{T5}{iwona}{mc}{it}    {t5-iwonacri}    {IwonaCond-Italic}
+\showletters{T5}{iwona}{mc}{sc}    {t5-iwonacrcap}  {IwonaCond-Regular}
+\showletters{T5}{iwona}{mc}{scit}  {t5-iwonacricap} {IwonaCond-Italic}
+\showtext   {T5}{iwona}{mc}{n}     {t5-iwonacr}     {IwonaCond-Regular}
+
+\section{IwonaCondMedium-Regular}
+\showletters{T5}{iwona}{sbc}{n}    {t5-iwonacm}     {IwonaCondMedium-Regular}
+\showletters{T5}{iwona}{sbc}{it}   {t5-iwonacmi}    {IwonaCondMedium-Italic}
+\showletters{T5}{iwona}{sbc}{sc}   {t5-iwonacmcap}  {IwonaCondMedium-Regular}
+\showletters{T5}{iwona}{sbc}{scit} {t5-iwonacmicap} {IwonaCondMedium-Italic}
+\showtext   {T5}{iwona}{sbc}{n}    {t5-iwonacm}     {IwonaCondMedium-Regular}
+
+\section{IwonaCond-Bold}
+\showletters{T5}{iwona}{bc}{n}     {t5-iwonacb}     {IwonaCond-Bold}
+\showletters{T5}{iwona}{bc}{it}    {t5-iwonacbi}    {IwonaCond-BoldItalic}
+\showletters{T5}{iwona}{bc}{sc}    {t5-iwonacbcap}  {IwonaCond-Bold}
+\showletters{T5}{iwona}{bc}{scit}  {t5-iwonacbicap} {IwonaCond-BoldItalic}
+\showtext   {T5}{iwona}{bc}{n}     {t5-iwonacb}     {IwonaCond-Bold}
+\end{document}
diff --git a/Master/texmf-dist/source/generic/vntex/tests/t5iwona-test.tex b/Master/texmf-dist/source/generic/vntex/tests/t5iwona-test.tex
new file mode 100644
index 00000000000..34b2dc5046c
--- /dev/null
+++ b/Master/texmf-dist/source/generic/vntex/tests/t5iwona-test.tex
@@ -0,0 +1,47 @@
+% Copyright 2003-2005 Han The Thanh <hanthethanh@gmx.net>.
+% This file is part of vntex.  License: LPPL, version 1.3 or newer,
+% according to http://www.latex-project.org/lppl.txt
+
+\documentclass[test]{vnsample}
+
+\mapfile{t5-iwona}
+
+\begin{document}
+\begin{shortsample}
+\shorttext{T5}{iwona}{l}{n}      {t5-iwonal}      {IwonaLight-Regular}
+\shorttext{T5}{iwona}{l}{it}     {t5-iwonali}     {IwonaLight-Italic}
+\shorttext{T5}{iwona}{l}{sc}     {t5-iwonalcap}   {IwonaLight-Regular}
+\shorttext{T5}{iwona}{l}{scit}   {t5-iwonalicap}  {IwonaLight-Italic}
+\shorttext{T5}{iwona}{m}{n}      {t5-iwonar}      {Iwona-Regular}
+\shorttext{T5}{iwona}{m}{it}     {t5-iwonari}     {Iwona-Italic}
+\shorttext{T5}{iwona}{m}{sc}     {t5-iwonarcap}   {Iwona-Regular}
+\shorttext{T5}{iwona}{m}{scit}   {t5-iwonaricap}  {Iwona-Italic}
+\shorttext{T5}{iwona}{sb}{n}     {t5-iwonam}      {IwonaMedium-Regular}
+\shorttext{T5}{iwona}{sb}{it}    {t5-iwonami}     {IwonaMedium-Italic}
+\shorttext{T5}{iwona}{sb}{sc}    {t5-iwonamcap}   {IwonaMedium-Regular}
+\shorttext{T5}{iwona}{sb}{scit}  {t5-iwonamicap}  {IwonaMedium-Italic}
+\shorttext{T5}{iwona}{b}{n}      {t5-iwonab}      {Iwona-Bold}
+\shorttext{T5}{iwona}{b}{it}     {t5-iwonabi}     {Iwona-BoldItalic}
+\shorttext{T5}{iwona}{b}{sc}     {t5-iwonabcap}   {Iwona-Bold}
+\shorttext{T5}{iwona}{b}{scit}   {t5-iwonabicap}  {Iwona-BoldItalic}
+\end{shortsample}
+\clearpage
+\begin{shortsample}
+\shorttext{T5}{iwona}{lc}{n}     {t5-iwonacl}     {IwonaCondLight-Regular}
+\shorttext{T5}{iwona}{lc}{it}    {t5-iwonacli}    {IwonaCondLight-Italic}
+\shorttext{T5}{iwona}{lc}{sc}    {t5-iwonaclcap}  {IwonaCondLight-Regular}
+\shorttext{T5}{iwona}{lc}{scit}  {t5-iwonaclicap} {IwonaCondLight-Italic}
+\shorttext{T5}{iwona}{mc}{n}     {t5-iwonacr}     {IwonaCond-Regular}
+\shorttext{T5}{iwona}{mc}{it}    {t5-iwonacri}    {IwonaCond-Italic}
+\shorttext{T5}{iwona}{mc}{sc}    {t5-iwonacrcap}  {IwonaCond-Regular}
+\shorttext{T5}{iwona}{mc}{scit}  {t5-iwonacricap} {IwonaCond-Italic}
+\shorttext{T5}{iwona}{sbc}{n}    {t5-iwonacm}     {IwonaCondMedium-Regular}
+\shorttext{T5}{iwona}{sbc}{it}   {t5-iwonacmi}    {IwonaCondMedium-Italic}
+\shorttext{T5}{iwona}{sbc}{sc}   {t5-iwonacmcap}  {IwonaCondMedium-Regular}
+\shorttext{T5}{iwona}{sbc}{scit} {t5-iwonacmicap} {IwonaCondMedium-Italic}
+\shorttext{T5}{iwona}{bc}{n}     {t5-iwonacb}     {IwonaCond-Bold}
+\shorttext{T5}{iwona}{bc}{it}    {t5-iwonacbi}    {IwonaCond-BoldItalic}
+\shorttext{T5}{iwona}{bc}{sc}    {t5-iwonacbcap}  {IwonaCond-Bold}
+\shorttext{T5}{iwona}{bc}{scit}  {t5-iwonacbicap} {IwonaCond-BoldItalic}
+\end{shortsample}
+\end{document}
diff --git a/Master/texmf-dist/source/generic/vntex/tests/t5kurier-sample.tex b/Master/texmf-dist/source/generic/vntex/tests/t5kurier-sample.tex
new file mode 100644
index 00000000000..5403447748a
--- /dev/null
+++ b/Master/texmf-dist/source/generic/vntex/tests/t5kurier-sample.tex
@@ -0,0 +1,66 @@
+% Copyright 2003-2005 Han The Thanh <hanthethanh@gmx.net>.
+% This file is part of vntex.  License: LPPL, version 1.3 or newer,
+% according to http://www.latex-project.org/lppl.txt
+
+\documentclass[sample]{vnsample}
+
+\mapfile{t5-kurier}
+
+\begin{document}
+\section{KurierLight-Regular}
+\showletters{T5}{kurier}{l}{n}      {t5-kurierl}      {KurierLight-Regular}
+\showletters{T5}{kurier}{l}{it}     {t5-kurierli}     {KurierLight-Italic}
+\showletters{T5}{kurier}{l}{sc}     {t5-kurierlcap}   {KurierLight-Regular}
+\showletters{T5}{kurier}{l}{scit}   {t5-kurierlicap}  {KurierLight-Italic}
+\showtext   {T5}{kurier}{l}{n}      {t5-kurierl}      {KurierLight-Regular}
+
+\section{Kurier-Regular}
+\showletters{T5}{kurier}{m}{n}      {t5-kurierr}      {Kurier-Regular}
+\showletters{T5}{kurier}{m}{it}     {t5-kurierri}     {Kurier-Italic}
+\showletters{T5}{kurier}{m}{sc}     {t5-kurierrcap}   {Kurier-Regular}
+\showletters{T5}{kurier}{m}{scit}   {t5-kurierricap}  {Kurier-Italic}
+\showtext   {T5}{kurier}{m}{n}      {t5-kurierr}      {Kurier-Regular}
+
+\section{KurierMedium-Regular}
+\showletters{T5}{kurier}{sb}{n}     {t5-kurierm}      {KurierMedium-Regular}
+\showletters{T5}{kurier}{sb}{it}    {t5-kuriermi}     {KurierMedium-Italic}
+\showletters{T5}{kurier}{sb}{sc}    {t5-kuriermcap}   {KurierMedium-Regular}
+\showletters{T5}{kurier}{sb}{scit}  {t5-kuriermicap}  {KurierMedium-Italic}
+\showtext   {T5}{kurier}{sb}{n}     {t5-kurierm}      {KurierMedium-Regular}
+
+\section{Kurier-Bold}
+\showletters{T5}{kurier}{b}{n}      {t5-kurierb}      {Kurier-Bold}
+\showletters{T5}{kurier}{b}{it}     {t5-kurierbi}     {Kurier-BoldItalic}
+\showletters{T5}{kurier}{b}{sc}     {t5-kurierbcap}   {Kurier-Bold}
+\showletters{T5}{kurier}{b}{scit}   {t5-kurierbicap}  {Kurier-BoldItalic}
+\showtext   {T5}{kurier}{b}{n}      {t5-kurierb}      {Kurier-Bold}
+
+\section{KurierCondLight-Regular}
+\showletters{T5}{kurier}{lc}{n}     {t5-kuriercl}     {KurierCondLight-Regular}
+\showletters{T5}{kurier}{lc}{it}    {t5-kuriercli}    {KurierCondLight-Italic}
+\showletters{T5}{kurier}{lc}{sc}    {t5-kurierclcap}  {KurierCondLight-Regular}
+\showletters{T5}{kurier}{lc}{scit}  {t5-kurierclicap} {KurierCondLight-Italic}
+\showtext   {T5}{kurier}{lc}{n}     {t5-kuriercl}     {KurierCondLight-Regular}
+
+\section{KurierCond-Regular}
+\showletters{T5}{kurier}{mc}{n}     {t5-kuriercr}     {KurierCond-Regular}
+\showletters{T5}{kurier}{mc}{it}    {t5-kuriercri}    {KurierCond-Italic}
+\showletters{T5}{kurier}{mc}{sc}    {t5-kuriercrcap}  {KurierCond-Regular}
+\showletters{T5}{kurier}{mc}{scit}  {t5-kuriercricap} {KurierCond-Italic}
+\showtext   {T5}{kurier}{mc}{n}     {t5-kuriercr}     {KurierCond-Regular}
+
+\section{KurierCondMedium-Regular}
+\showletters{T5}{kurier}{sbc}{n}    {t5-kuriercm}     {KurierCondMedium-Regular}
+\showletters{T5}{kurier}{sbc}{it}   {t5-kuriercmi}    {KurierCondMedium-Italic}
+\showletters{T5}{kurier}{sbc}{sc}   {t5-kuriercmcap}  {KurierCondMedium-Regular}
+\showletters{T5}{kurier}{sbc}{scit} {t5-kuriercmicap} {KurierCondMedium-Italic}
+\showtext   {T5}{kurier}{sbc}{n}    {t5-kuriercm}     {KurierCondMedium-Regular}
+
+\section{KurierCond-Bold}
+\showletters{T5}{kurier}{bc}{n}     {t5-kuriercb}     {KurierCond-Bold}
+\showletters{T5}{kurier}{bc}{it}    {t5-kuriercbi}    {KurierCond-BoldItalic}
+\showletters{T5}{kurier}{bc}{sc}    {t5-kuriercbcap}  {KurierCond-Bold}
+\showletters{T5}{kurier}{bc}{scit}  {t5-kuriercbicap} {KurierCond-BoldItalic}
+\showtext   {T5}{kurier}{bc}{n}     {t5-kuriercb}     {KurierCond-Bold}
+\end{document}
+
diff --git a/Master/texmf-dist/source/generic/vntex/tests/t5kurier-test.tex b/Master/texmf-dist/source/generic/vntex/tests/t5kurier-test.tex
new file mode 100644
index 00000000000..6dfa7108262
--- /dev/null
+++ b/Master/texmf-dist/source/generic/vntex/tests/t5kurier-test.tex
@@ -0,0 +1,47 @@
+% Copyright 2003-2005 Han The Thanh <hanthethanh@gmx.net>.
+% This file is part of vntex.  License: LPPL, version 1.3 or newer,
+% according to http://www.latex-project.org/lppl.txt
+
+\documentclass[test]{vnsample}
+
+\mapfile{t5-kurier}
+
+\begin{document}
+\begin{shortsample}
+\shorttext{T5}{kurier}{l}{n}      {t5-kurierl}      {KurierLight-Regular}
+\shorttext{T5}{kurier}{l}{it}     {t5-kurierli}     {KurierLight-Italic}
+\shorttext{T5}{kurier}{l}{sc}     {t5-kurierlcap}   {KurierLight-Regular}
+\shorttext{T5}{kurier}{l}{scit}   {t5-kurierlicap}  {KurierLight-Italic}
+\shorttext{T5}{kurier}{m}{n}      {t5-kurierr}      {Kurier-Regular}
+\shorttext{T5}{kurier}{m}{it}     {t5-kurierri}     {Kurier-Italic}
+\shorttext{T5}{kurier}{m}{sc}     {t5-kurierrcap}   {Kurier-Regular}
+\shorttext{T5}{kurier}{m}{scit}   {t5-kurierricap}  {Kurier-Italic}
+\shorttext{T5}{kurier}{sb}{n}     {t5-kurierm}      {KurierMedium-Regular}
+\shorttext{T5}{kurier}{sb}{it}    {t5-kuriermi}     {KurierMedium-Italic}
+\shorttext{T5}{kurier}{sb}{sc}    {t5-kuriermcap}   {KurierMedium-Regular}
+\shorttext{T5}{kurier}{sb}{scit}  {t5-kuriermicap}  {KurierMedium-Italic}
+\shorttext{T5}{kurier}{b}{n}      {t5-kurierb}      {Kurier-Bold}
+\shorttext{T5}{kurier}{b}{it}     {t5-kurierbi}     {Kurier-BoldItalic}
+\shorttext{T5}{kurier}{b}{sc}     {t5-kurierbcap}   {Kurier-Bold}
+\shorttext{T5}{kurier}{b}{scit}   {t5-kurierbicap}  {Kurier-BoldItalic}
+\end{shortsample}
+\clearpage
+\begin{shortsample}
+\shorttext{T5}{kurier}{lc}{n}     {t5-kuriercl}     {KurierCondLight-Regular}
+\shorttext{T5}{kurier}{lc}{it}    {t5-kuriercli}    {KurierCondLight-Italic}
+\shorttext{T5}{kurier}{lc}{sc}    {t5-kurierclcap}  {KurierCondLight-Regular}
+\shorttext{T5}{kurier}{lc}{scit}  {t5-kurierclicap} {KurierCondLight-Italic}
+\shorttext{T5}{kurier}{mc}{n}     {t5-kuriercr}     {KurierCond-Regular}
+\shorttext{T5}{kurier}{mc}{it}    {t5-kuriercri}    {KurierCond-Italic}
+\shorttext{T5}{kurier}{mc}{sc}    {t5-kuriercrcap}  {KurierCond-Regular}
+\shorttext{T5}{kurier}{mc}{scit}  {t5-kuriercricap} {KurierCond-Italic}
+\shorttext{T5}{kurier}{sbc}{n}    {t5-kuriercm}     {KurierCondMedium-Regular}
+\shorttext{T5}{kurier}{sbc}{it}   {t5-kuriercmi}    {KurierCondMedium-Italic}
+\shorttext{T5}{kurier}{sbc}{sc}   {t5-kuriercmcap}  {KurierCondMedium-Regular}
+\shorttext{T5}{kurier}{sbc}{scit} {t5-kuriercmicap} {KurierCondMedium-Italic}
+\shorttext{T5}{kurier}{bc}{n}     {t5-kuriercb}     {KurierCond-Bold}
+\shorttext{T5}{kurier}{bc}{it}    {t5-kuriercbi}    {KurierCond-BoldItalic}
+\shorttext{T5}{kurier}{bc}{sc}    {t5-kuriercbcap}  {KurierCond-Bold}
+\shorttext{T5}{kurier}{bc}{scit}  {t5-kuriercbicap} {KurierCond-BoldItalic}
+\end{shortsample}
+\end{document}
diff --git a/Master/texmf-dist/source/generic/vntex/tests/t5lm-sample.tex b/Master/texmf-dist/source/generic/vntex/tests/t5lm-sample.tex
new file mode 100644
index 00000000000..91ea5a73e48
--- /dev/null
+++ b/Master/texmf-dist/source/generic/vntex/tests/t5lm-sample.tex
@@ -0,0 +1,124 @@
+% Copyright 2003-2005 Han The Thanh <hanthethanh@gmx.net>.
+% This file is part of vntex.  License: LPPL, version 1.3 or newer,
+% according to http://www.latex-project.org/lppl.txt
+
+\documentclass[sample]{vnsample}
+
+\HasDesignSizes
+
+\mapfile{lm.map}
+
+\begin{document}
+\section{lmr}
+\showCMfont{T5}{lmr}{m}{n}      {t5-lmr5}            {N/A}
+\showCMfont{T5}{lmr}{m}{n}      {t5-lmr6}            {N/A}
+\showCMfont{T5}{lmr}{m}{n}      {t5-lmr7}            {N/A}
+\showCMfont{T5}{lmr}{m}{n}      {t5-lmr8}            {N/A}
+\showCMfont{T5}{lmr}{m}{n}      {t5-lmr9}            {N/A}
+\showCMfont{T5}{lmr}{m}{n}      {t5-lmr10}           {N/A}
+\showCMfont{T5}{lmr}{m}{n}      {t5-lmr12}           {N/A}
+\showCMfont{T5}{lmr}{m}{n}      {t5-lmr17}           {N/A}
+
+\section{lmro}
+\showCMfont{T5}{lmr}{m}{sl}     {t5-lmro8}           {N/A}
+\showCMfont{T5}{lmr}{m}{sl}     {t5-lmro9}           {N/A}
+\showCMfont{T5}{lmr}{m}{sl}     {t5-lmro10}          {N/A}
+\showCMfont{T5}{lmr}{m}{sl}     {t5-lmro12}          {N/A}
+\showCMfont{T5}{lmr}{m}{sl}     {t5-lmro17}          {N/A}
+
+\section{lmri}
+\showCMfont{T5}{lmr}{m}{it}     {t5-lmri7}           {N/A}
+\showCMfont{T5}{lmr}{m}{it}     {t5-lmri8}           {N/A}
+\showCMfont{T5}{lmr}{m}{it}     {t5-lmri9}           {N/A}
+\showCMfont{T5}{lmr}{m}{it}     {t5-lmri10}          {N/A}
+\showCMfont{T5}{lmr}{m}{it}     {t5-lmri12}          {N/A}
+
+\section{lmcsc}
+\showCMfont{T5}{lmr}{m}{sc}     {t5-lmcsc10}         {N/A}
+
+\section{lmcsco}
+\showCMfont{T5}{lmr}{m}{scsl}   {t5-lmcsco10}        {N/A}
+
+\section{lmb}
+\showCMfont{T5}{lmr}{b}{n}      {t5-lmb10}           {N/A}
+
+\section{lmbo}
+\showCMfont{T5}{lmr}{b}{sl}     {t5-lmbo10}          {N/A}
+
+\section{lmbx}
+\showCMfont{T5}{lmr}{bx}{n}     {t5-lmbx5}           {N/A}
+\showCMfont{T5}{lmr}{bx}{n}     {t5-lmbx6}           {N/A}
+\showCMfont{T5}{lmr}{bx}{n}     {t5-lmbx7}           {N/A}
+\showCMfont{T5}{lmr}{bx}{n}     {t5-lmbx8}           {N/A}
+\showCMfont{T5}{lmr}{bx}{n}     {t5-lmbx9}           {N/A}
+\showCMfont{T5}{lmr}{bx}{n}     {t5-lmbx10}          {N/A}
+\showCMfont{T5}{lmr}{bx}{n}     {t5-lmbx12}          {N/A}
+
+\section{lmbxi}
+\showCMfont{T5}{lmr}{bx}{it}    {t5-lmbxi10}         {N/A}
+
+\section{lmbxo}
+\showCMfont{T5}{lmr}{bx}{sl}    {t5-lmbxo10}         {N/A}
+
+\section{lmss}
+\showCMfont{T5}{lmss}{m}{n}     {t5-lmss8}           {N/A}
+\showCMfont{T5}{lmss}{m}{n}     {t5-lmss9}           {N/A}
+\showCMfont{T5}{lmss}{m}{n}     {t5-lmss10}          {N/A}
+\showCMfont{T5}{lmss}{m}{n}     {t5-lmss12}          {N/A}
+\showCMfont{T5}{lmss}{m}{n}     {t5-lmss17}          {N/A}
+
+\section{lmsso}
+\showCMfont{T5}{lmss}{m}{sl}    {t5-lmsso8}          {N/A}
+\showCMfont{T5}{lmss}{m}{sl}    {t5-lmsso9}          {N/A}
+\showCMfont{T5}{lmss}{m}{sl}    {t5-lmsso10}         {N/A}
+\showCMfont{T5}{lmss}{m}{sl}    {t5-lmsso12}         {N/A}
+\showCMfont{T5}{lmss}{m}{sl}    {t5-lmsso17}         {N/A}
+
+\section{lmssdc}
+\showCMfont{T5}{lmss}{sbc}{n}   {t5-lmssdc10}        {N/A}
+
+\section{lmssdo}
+\showCMfont{T5}{lmss}{sbc}{sl}  {t5-lmssdo10}        {N/A}
+
+\section{lmssbx}
+\showCMfont{T5}{lmss}{bx}{n}    {t5-lmssbx10}        {N/A}
+
+\section{lmssbo}
+\showCMfont{T5}{lmss}{bx}{sl}   {t5-lmssbo10}        {N/A}
+
+\section{lmssq}
+\showCMfont{T5}{lmssq}{m}{n}    {t5-lmssq8}          {N/A}
+
+\section{lmssqo}
+\showCMfont{T5}{lmssq}{m}{sl}   {t5-lmssqo8}         {N/A}
+
+\section{lmssqbx}
+\showCMfont{T5}{lmssq}{bx}{n}   {t5-lmssqbx8}        {N/A}
+
+\section{lmssqbo}
+\showCMfont{T5}{lmssq}{bx}{sl}  {t5-lmssqbo8}        {N/A}
+
+\section{lmtt}
+\showCMfont{T5}{lmtt}{m}{n}     {t5-lmtt8}           {N/A}
+\showCMfont{T5}{lmtt}{m}{n}     {t5-lmtt9}           {N/A}
+\showCMfont{T5}{lmtt}{m}{n}     {t5-lmtt10}          {N/A}
+\showCMfont{T5}{lmtt}{m}{n}     {t5-lmtt12}          {N/A}
+\showCMfont{T5}{lmtt}{m}{it}    {t5-lmtti10}         {N/A}
+\showCMfont{T5}{lmtt}{m}{sl}    {t5-lmtto10}         {N/A}
+\showCMfont{T5}{lmtt}{m}{sc}    {t5-lmtcsc10}        {N/A}
+\showCMfont{T5}{lmtt}{m}{scsl}  {t5-lmtcso10}        {N/A}
+\showCMfont{T5}{lmtt}{lt}{n}    {t5-lmtl10}          {N/A}
+\showCMfont{T5}{lmtt}{lt}{sl}   {t5-lmtlo10}         {N/A}
+\showCMfont{T5}{lmtt}{lc}{n}    {t5-lmtlc10}         {N/A}
+\showCMfont{T5}{lmtt}{lc}{sl}   {t5-lmtlco10}        {N/A}
+\showCMfont{T5}{lmtt}{dk}{n}    {t5-lmtk10}          {N/A}
+\showCMfont{T5}{lmtt}{dk}{sl}   {t5-lmtko10}         {N/A}
+
+\section{lmvtt}
+\showCMfont{T5}{lmvtt}{m}{n}    {t5-lmvtt10}         {N/A}
+\showCMfont{T5}{lmvtt}{m}{sl}   {t5-lmvtto10}        {N/A}
+\showCMfont{T5}{lmvtt}{lt}{n}   {t5-lmvtl10}         {N/A}
+\showCMfont{T5}{lmvtt}{lt}{sl}  {t5-lmvtlo10}        {N/A}
+\showCMfont{T5}{lmvtt}{dk}{n}   {t5-lmvtk10}         {N/A}
+\showCMfont{T5}{lmvtt}{dk}{sl}  {t5-lmvtko10}        {N/A}
+\end{document}
diff --git a/Master/texmf-dist/source/generic/vntex/tests/t5lm-test.tex b/Master/texmf-dist/source/generic/vntex/tests/t5lm-test.tex
new file mode 100644
index 00000000000..41f7489b5bb
--- /dev/null
+++ b/Master/texmf-dist/source/generic/vntex/tests/t5lm-test.tex
@@ -0,0 +1,52 @@
+% Copyright 2003-2005 Han The Thanh <hanthethanh@gmx.net>.
+% This file is part of vntex.  License: LPPL, version 1.3 or newer,
+% according to http://www.latex-project.org/lppl.txt
+
+\documentclass[test]{vnsample}
+
+\mapfile{lm}
+
+\begin{document}
+\begin{shortsample}
+\shorttext{T5}{lmr}{m}{n}       {t5-lmr\{5,6,7,8,9,10,12,17\}}  {N/A}
+\shorttext{T5}{lmr}{m}{sl}      {t5-lmro\{8,9,10,12\}}          {N/A}
+\shorttext{T5}{lmr}{m}{it}      {t5-lmri\{7,8,9,10,12\}}        {N/A}
+\shorttext{T5}{lmr}{m}{sc}      {t5-lmcsc10}                    {N/A}
+\shorttext{T5}{lmr}{m}{scsl}    {t5-lmcsco10}                   {N/A}
+\shorttext{T5}{lmr}{b}{n}       {t5-lmb10}                      {N/A}
+\shorttext{T5}{lmr}{b}{sl}      {t5-lmbo10}                     {N/A}
+\shorttext{T5}{lmr}{bx}{n}      {t5-lmbx\{5,6,7,8,9,10,12\}}    {N/A}
+\shorttext{T5}{lmr}{bx}{it}     {t5-lmbxi10}                    {N/A}
+\shorttext{T5}{lmr}{bx}{sl}     {t5-lmbxo10}                    {N/A}
+\shorttext{T5}{lmss}{m}{n}      {t5-lmss\{8,9,10,12,17\}}       {N/A}
+\shorttext{T5}{lmss}{m}{sl}     {t5-lmsso\{8,9,10,12,17\}}      {N/A}
+\shorttext{T5}{lmss}{sbc}{n}    {t5-lmssdc10}                   {N/A}
+\shorttext{T5}{lmss}{sbc}{sl}   {t5-lmssdo10}                   {N/A}
+\shorttext{T5}{lmss}{bx}{n}     {t5-lmssbx10}                   {N/A}
+\shorttext{T5}{lmss}{bx}{sl}    {t5-lmssbo10}                   {N/A}
+\shorttext{T5}{lmssq}{m}{n}     {t5-lmssq8}                     {N/A}
+\shorttext{T5}{lmssq}{m}{sl}    {t5-lmssqo8}                    {N/A}
+\shorttext{T5}{lmssq}{bx}{n}    {t5-lmssqbx8}                   {N/A}
+\shorttext{T5}{lmssq}{bx}{sl}   {t5-lmssqbo8}                   {N/A}
+\end{shortsample}
+\clearpage
+\begin{shortsample}
+\shorttext{T5}{lmtt}{lc}{n}     {t5-lmtlc10}         {N/A}
+\shorttext{T5}{lmtt}{lc}{sl}    {t5-lmtlco10}        {N/A}
+\shorttext{T5}{lmtt}{lt}{n}     {t5-lmtl10}          {N/A}
+\shorttext{T5}{lmtt}{lt}{sl}    {t5-lmtlo10}         {N/A}
+\shorttext{T5}{lmtt}{dk}{n}     {t5-lmtk10}          {N/A}
+\shorttext{T5}{lmtt}{dk}{sl}    {t5-lmtko10}         {N/A}
+\shorttext{T5}{lmtt}{m}{n}      {t5-lmtt\{8,9,10,12\}}          {N/A}
+\shorttext{T5}{lmtt}{m}{it}     {t5-lmtti10}                    {N/A}
+\shorttext{T5}{lmtt}{m}{sl}     {t5-lmtto10}                    {N/A}
+\shorttext{T5}{lmtt}{m}{sc}     {t5-lmtcsc10}                   {N/A}
+\shorttext{T5}{lmtt}{m}{scsl}   {t5-lmtcso10}        {N/A}
+\shorttext{T5}{lmvtt}{m}{n}     {t5-lmvtt10}                    {N/A}
+\shorttext{T5}{lmvtt}{m}{sl}    {t5-lmvtto10}                   {N/A}
+\shorttext{T5}{lmvtt}{lt}{n}    {t5-lmvtl10}         {N/A}
+\shorttext{T5}{lmvtt}{lt}{sl}   {t5-lmvtlo10}        {N/A}
+\shorttext{T5}{lmvtt}{dk}{n}    {t5-lmvtk10}         {N/A}
+\shorttext{T5}{lmvtt}{dk}{sl}   {t5-lmvtko10}        {N/A}
+\end{shortsample}
+\end{document}
diff --git a/Master/texmf-dist/source/generic/vntex/tests/termes-sample.tex b/Master/texmf-dist/source/generic/vntex/tests/termes-sample.tex
new file mode 100644
index 00000000000..09803df1948
--- /dev/null
+++ b/Master/texmf-dist/source/generic/vntex/tests/termes-sample.tex
@@ -0,0 +1,19 @@
+% Copyright 2003-2005 Han The Thanh <hanthethanh@gmx.net>.
+% This file is part of vntex.  License: LPPL, version 1.3 or newer,
+% according to http://www.latex-project.org/lppl.txt
+
+\documentclass[sample]{vnsample}
+
+\mapfile{qtm}
+
+\begin{document}
+\section{TeX Gyre Termes}
+\showletters{T5}{qtm}{m}{n}    {t5-qtmr}     {TeXGyreTermes-Regular}
+\showletters{T5}{qtm}{m}{it}   {t5-qtmri}    {TeXGyreTermes-Italic}
+\showletters{T5}{qtm}{b}{n}    {t5-qtmb}     {TeXGyreTermes-Bold}
+\showletters{T5}{qtm}{b}{it}   {t5-qtmbi}    {TeXGyreTermes-BoldItalic}
+\showletters{T5}{qtm}{m}{sc}   {t5-qtmr-sc}  {TeXGyreTermes-Regular}
+\showletters{T5}{qtm}{m}{scit} {t5-qtmri-sc} {TeXGyreTermes-Italic}
+\showletters{T5}{qtm}{b}{sc}   {t5-qtmb-sc}  {TeXGyreTermes-Bold}
+\showtext   {T5}{qtm}{m}{n}    {t5-qtmr}     {TeXGyreTermes-Regular}
+\end{document}
diff --git a/Master/texmf-dist/source/generic/vntex/tests/termes-test.tex b/Master/texmf-dist/source/generic/vntex/tests/termes-test.tex
new file mode 100644
index 00000000000..9870580a94b
--- /dev/null
+++ b/Master/texmf-dist/source/generic/vntex/tests/termes-test.tex
@@ -0,0 +1,20 @@
+% Copyright 2003-2005 Han The Thanh <hanthethanh@gmx.net>.
+% This file is part of vntex.  License: LPPL, version 1.3 or newer,
+% according to http://www.latex-project.org/lppl.txt
+
+\documentclass[test]{vnsample}
+
+\mapfile{qtm}
+
+\begin{document}
+\begin{shortsample}
+\shorttext{T5}{qtm}{m}{n}    {t5-qtmr}     {TeXGyreTermes-Regular}
+\shorttext{T5}{qtm}{m}{it}   {t5-qtmri}    {TeXGyreTermes-Italic}
+\shorttext{T5}{qtm}{b}{n}    {t5-qtmb}     {TeXGyreTermes-Bold}
+\shorttext{T5}{qtm}{b}{it}   {t5-qtmbi}    {TeXGyreTermes-BoldItalic}
+\shorttext{T5}{qtm}{m}{sc}   {t5-qtmr-sc}  {TeXGyreTermes-Regular}
+\shorttext{T5}{qtm}{m}{scit} {t5-qtmri-sc} {TeXGyreTermes-Italic}
+\shorttext{T5}{qtm}{b}{sc}   {t5-qtmb-sc}  {TeXGyreTermes-Bold}
+\shorttext{T5}{qtm}{b}{scit} {t5-qtmbi-sc} {TeXGyreTermes-BoldItalic}
+\end{shortsample}
+\end{document}
diff --git a/Master/texmf-dist/source/generic/vntex/tests/test-accents.tex b/Master/texmf-dist/source/generic/vntex/tests/test-accents.tex
new file mode 100644
index 00000000000..3c9b8824d3c
--- /dev/null
+++ b/Master/texmf-dist/source/generic/vntex/tests/test-accents.tex
@@ -0,0 +1,186 @@
+% Copyright 2003-2005 Han The Thanh <hanthethanh@gmx.net>.
+% This file is part of vntex.  License: LPPL, version 1.3 or newer,
+% according to http://www.latex-project.org/lppl.txt
+
+\large
+\def\X#1{\hbox to 2em{\hss#1\hss}}
+\begin{multicols}{2}
+\noindent
+\X{\ABREVE} \verb|\ABREVE| \\
+\X{\Abreve} \verb|\Abreve| \\
+\X{\ACIRCUMFLEX} \verb|\ACIRCUMFLEX| \\
+\X{\Acircumflex} \verb|\Acircumflex| \\
+\X{\ECIRCUMFLEX} \verb|\ECIRCUMFLEX| \\
+\X{\Ecircumflex} \verb|\Ecircumflex| \\
+\X{\Ocircumflex} \verb|\Ocircumflex| \\
+\X{\OCIRCUMFLEX} \verb|\OCIRCUMFLEX| \\
+\X{\OHORN} \verb|\OHORN| \\
+\X{\Ohorn} \verb|\Ohorn| \\
+\X{\UHORN} \verb|\UHORN| \\
+\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| \\
+\X{\ocircumflex} \verb|\ocircumflex| \\
+\X{\ohorn} \verb|\ohorn| \\
+\X{\uhorn} \verb|\uhorn| \\
+\X{\'A} \verb|\'A| \\
+\X{\'E} \verb|\'E| \\
+\X{\'I} \verb|\'I| \\
+\X{\'O} \verb|\'O| \\
+\X{\'U} \verb|\'U| \\
+\X{\'Y} \verb|\'Y| \\
+\X{\'\ABREVE} \verb|\'\ABREVE| \\
+\X{\'\Abreve} \verb|\'\Abreve| \\
+\X{\'\ACIRCUMFLEX} \verb|\'\ACIRCUMFLEX| \\
+\X{\'\Acircumflex} \verb|\'\Acircumflex| \\
+\X{\'\ECIRCUMFLEX} \verb|\'\ECIRCUMFLEX| \\
+\X{\'\Ecircumflex} \verb|\'\Ecircumflex| \\
+\X{\'\OCIRCUMFLEX} \verb|\'\OCIRCUMFLEX| \\
+\X{\'\Ocircumflex} \verb|\'\Ocircumflex| \\
+\X{\'\OHORN} \verb|\'\OHORN| \\
+\X{\'\Ohorn} \verb|\'\Ohorn| \\
+\X{\'\UHORN} \verb|\'\UHORN| \\
+\X{\'\Uhorn} \verb|\'\Uhorn| \\
+\X{\'\abreve} \verb|\'\abreve| \\
+\X{\'\acircumflex} \verb|\'\acircumflex| \\
+\X{\'\ecircumflex} \verb|\'\ecircumflex| \\
+\X{\'\ocircumflex} \verb|\'\ocircumflex| \\
+\X{\'\ohorn} \verb|\'\ohorn| \\
+\X{\'\uhorn} \verb|\'\uhorn| \\
+\X{\'a} \verb|\'a| \\
+\X{\'e} \verb|\'e| \\
+\X{\'i} \verb|\'i| \\
+\X{\'o} \verb|\'o| \\
+\X{\'u} \verb|\'u| \\
+\X{\'y} \verb|\'y| \\
+\X{\^A} \verb|\^A| \\
+\X{\^E} \verb|\^E| \\
+\X{\^O} \verb|\^O| \\
+\X{\^a} \verb|\^a| \\
+\X{\^e} \verb|\^e| \\
+\X{\^o} \verb|\^o| \\
+\X{\`A} \verb|\`A| \\
+\X{\`E} \verb|\`E| \\
+\X{\`I} \verb|\`I| \\
+\X{\`O} \verb|\`O| \\
+\X{\`U} \verb|\`U| \\
+\X{\`Y} \verb|\`Y| \\
+\X{\`\ABREVE} \verb|\`\ABREVE| \\
+\X{\`\Abreve} \verb|\`\Abreve| \\
+\X{\`\ACIRCUMFLEX} \verb|\`\ACIRCUMFLEX| \\
+\X{\`\Acircumflex} \verb|\`\Acircumflex| \\
+\X{\`\ECIRCUMFLEX} \verb|\`\ECIRCUMFLEX| \\
+\X{\`\Ecircumflex} \verb|\`\Ecircumflex| \\
+\X{\`\OCIRCUMFLEX} \verb|\`\OCIRCUMFLEX| \\
+\X{\`\Ocircumflex} \verb|\`\Ocircumflex| \\
+\X{\`\OHORN} \verb|\`\OHORN| \\
+\X{\`\Ohorn} \verb|\`\Ohorn| \\
+\X{\`\UHORN} \verb|\`\UHORN| \\
+\X{\`\Uhorn} \verb|\`\Uhorn| \\
+\X{\`\abreve} \verb|\`\abreve| \\
+\X{\`\acircumflex} \verb|\`\acircumflex| \\
+\X{\`\ecircumflex} \verb|\`\ecircumflex| \\
+\X{\`\ocircumflex} \verb|\`\ocircumflex| \\
+\X{\`\ohorn} \verb|\`\ohorn| \\
+\X{\`\uhorn} \verb|\`\uhorn| \\
+\X{\`a} \verb|\`a| \\
+\X{\`e} \verb|\`e| \\
+\X{\`i} \verb|\`i| \\
+\X{\`o} \verb|\`o| \\
+\X{\`u} \verb|\`u| \\
+\X{\`y} \verb|\`y| \\
+\X{\d A} \verb|\d A| \\
+\X{\d E} \verb|\d E| \\
+\X{\d I} \verb|\d I| \\
+\X{\d O} \verb|\d O| \\
+\X{\d U} \verb|\d U| \\
+\X{\d Y} \verb|\d Y| \\
+\X{\d \ABREVE} \verb|\d \ABREVE| \\
+\X{\d \Abreve} \verb|\d \Abreve| \\
+\X{\d \ACIRCUMFLEX} \verb|\d \ACIRCUMFLEX| \\
+\X{\d \Acircumflex} \verb|\d \Acircumflex| \\
+\X{\d \ECIRCUMFLEX} \verb|\d \ECIRCUMFLEX| \\
+\X{\d \Ecircumflex} \verb|\d \Ecircumflex| \\
+\X{\d \OCIRCUMFLEX} \verb|\d \OCIRCUMFLEX| \\
+\X{\d \Ocircumflex} \verb|\d \Ocircumflex| \\
+\X{\d \OHORN} \verb|\d \OHORN| \\
+\X{\d \Ohorn} \verb|\d \Ohorn| \\
+\X{\d \UHORN} \verb|\d \UHORN| \\
+\X{\d \Uhorn} \verb|\d \Uhorn| \\
+\X{\d \abreve} \verb|\d \abreve| \\
+\X{\d \acircumflex} \verb|\d \acircumflex| \\
+\X{\d \ecircumflex} \verb|\d \ecircumflex| \\
+\X{\d \ocircumflex} \verb|\d \ocircumflex| \\
+\X{\d \ohorn} \verb|\d \ohorn| \\
+\X{\d \uhorn} \verb|\d \uhorn| \\
+\X{\d a} \verb|\d a| \\
+\X{\d e} \verb|\d e| \\
+\X{\d i} \verb|\d i| \\
+\X{\d o} \verb|\d o| \\
+\X{\d u} \verb|\d u| \\
+\X{\d y} \verb|\d y| \\
+\X{\h A} \verb|\h A| \\
+\X{\h E} \verb|\h E| \\
+\X{\h I} \verb|\h I| \\
+\X{\h O} \verb|\h O| \\
+\X{\h U} \verb|\h U| \\
+\X{\h Y} \verb|\h Y| \\
+\X{\h \ABREVE} \verb|\h \ABREVE| \\
+\X{\h \Abreve} \verb|\h \Abreve| \\
+\X{\h \ACIRCUMFLEX} \verb|\h \ACIRCUMFLEX| \\
+\X{\h \Acircumflex} \verb|\h \Acircumflex| \\
+\X{\h \ECIRCUMFLEX} \verb|\h \ECIRCUMFLEX| \\
+\X{\h \Ecircumflex} \verb|\h \Ecircumflex| \\
+\X{\h \OCIRCUMFLEX} \verb|\h \OCIRCUMFLEX| \\
+\X{\h \Ocircumflex} \verb|\h \Ocircumflex| \\
+\X{\h \OHORN} \verb|\h \OHORN| \\
+\X{\h \Ohorn} \verb|\h \Ohorn| \\
+\X{\h \UHORN} \verb|\h \UHORN| \\
+\X{\h \Uhorn} \verb|\h \Uhorn| \\
+\X{\h \abreve} \verb|\h \abreve| \\
+\X{\h \acircumflex} \verb|\h \acircumflex| \\
+\X{\h \ecircumflex} \verb|\h \ecircumflex| \\
+\X{\h \ocircumflex} \verb|\h \ocircumflex| \\
+\X{\h \ohorn} \verb|\h \ohorn| \\
+\X{\h \uhorn} \verb|\h \uhorn| \\
+\X{\h a} \verb|\h a| \\
+\X{\h e} \verb|\h e| \\
+\X{\h i} \verb|\h i| \\
+\X{\h o} \verb|\h o| \\
+\X{\h u} \verb|\h u| \\
+\X{\h y} \verb|\h y| \\
+\X{\~A} \verb|\~A| \\
+\X{\~E} \verb|\~E| \\
+\X{\~I} \verb|\~I| \\
+\X{\~O} \verb|\~O| \\
+\X{\~U} \verb|\~U| \\
+\X{\~Y} \verb|\~Y| \\
+\X{\~\ABREVE} \verb|\~\ABREVE| \\
+\X{\~\Abreve} \verb|\~\Abreve| \\
+\X{\~\ACIRCUMFLEX} \verb|\~\ACIRCUMFLEX| \\
+\X{\~\Acircumflex} \verb|\~\Acircumflex| \\
+\X{\~\ECIRCUMFLEX} \verb|\~\ECIRCUMFLEX| \\
+\X{\~\Ecircumflex} \verb|\~\Ecircumflex| \\
+\X{\~\OCIRCUMFLEX} \verb|\~\OCIRCUMFLEX| \\
+\X{\~\Ocircumflex} \verb|\~\Ocircumflex| \\
+\X{\~\OHORN} \verb|\~\OHORN| \\
+\X{\~\Ohorn} \verb|\~\Ohorn| \\
+\X{\~\UHORN} \verb|\~\UHORN| \\
+\X{\~\Uhorn} \verb|\~\Uhorn| \\
+\X{\~\abreve} \verb|\~\abreve| \\
+\X{\~\acircumflex} \verb|\~\acircumflex| \\
+\X{\~\ecircumflex} \verb|\~\ecircumflex| \\
+\X{\~\ocircumflex} \verb|\~\ocircumflex| \\
+\X{\~\ohorn} \verb|\~\ohorn| \\
+\X{\~\uhorn} \verb|\~\uhorn| \\
+\X{\~a} \verb|\~a| \\
+\X{\~e} \verb|\~e| \\
+\X{\~i} \verb|\~i| \\
+\X{\~o} \verb|\~o| \\
+\X{\~u} \verb|\~u| \\
+\X{\~y} \verb|\~y| \\
+\end{multicols}
diff --git a/Master/texmf-dist/source/generic/vntex/tests/test-babel.tex b/Master/texmf-dist/source/generic/vntex/tests/test-babel.tex
new file mode 100644
index 00000000000..fdf0d66e5f2
--- /dev/null
+++ b/Master/texmf-dist/source/generic/vntex/tests/test-babel.tex
@@ -0,0 +1,59 @@
+% Copyright 2003-2005 Han The Thanh <hanthethanh@gmx.net>.
+% This file is part of vntex.  License: LPPL, version 1.3 or newer,
+% according to http://www.latex-project.org/lppl.txt
+
+\documentclass[openany]{book}
+\IfFileExists{ucs.sty}
+{\usepackage{ucs}        % only needed when utf8x input encoding is being used 
+  \usepackage[utf8x,utf8]{inputenc}}
+{\usepackage[utf8]{inputenc}}
+                                    % inputenc must be loaded explicitly
+                                    % with options `utf8x' and `utf8' since
+                                    % we test both inputencodings
+                                    % simultaneously
+\usepackage[vietnam,english]{babel}
+
+\usepackage{multicol}   % needed for testing accent commands
+\usepackage[colorlinks]{hyperref} % let's try vietnamese with hyperref
+\input{pd1supp.def}     % supplement for characters missing in PD1 encoding
+                        % (used for PDF bookmarks) 
+
+\begin{document}
+\selectlanguage{vietnam}
+\title{\bfseries Test of Vietnamese support for \LaTeX{} using \texttt{babel}}
+\author{H\`an Th\'\ecircumflex{} Th\`anh}
+\maketitle
+
+\tableofcontents
+\listoffigures
+
+\chapter{Test input encodings}
+\section{Test of VISCII encoding support}
+\inputencoding{viscii}
+\input{test-viscii}
+
+\section{Test of TCVN encoding support}
+\inputencoding{tcvn}
+\input{test-tcvn}
+
+\section{Test of UTF8 encoding support}
+\inputencoding{utf8}
+\input{test-utf8}
+
+\IfFileExists{ucs.sty}{%
+\section[Test of UTF8x encoding support]
+   {Test of UTF8x encoding support (of the Unicode package)}
+\inputencoding{utf8x}
+\input{test-utf8}
+}{\typeout{^^JWARNING: File ucs.sty not found, skipping test.^^J}}
+
+\clearpage
+\appendix
+
+\chapter{Test of Vietnamese captions}
+\input{test-captions}
+
+\chapter{Test of accent commands for T5 encoding}
+\input{test-accents}
+
+\end{document}
diff --git a/Master/texmf-dist/source/generic/vntex/tests/test-captions.tex b/Master/texmf-dist/source/generic/vntex/tests/test-captions.tex
new file mode 100644
index 00000000000..3c9b80abf5b
--- /dev/null
+++ b/Master/texmf-dist/source/generic/vntex/tests/test-captions.tex
@@ -0,0 +1,27 @@
+% Copyright 2003-2005 Han The Thanh <hanthethanh@gmx.net>.
+% This file is part of vntex.  License: LPPL, version 1.3 or newer,
+% according to http://www.latex-project.org/lppl.txt
+
+\begin{tabular}{ll}
+\verb|\prefacename|    & \prefacename \\
+\verb|\refname|        & \refname \\
+\verb|\abstractname|   & \abstractname \\
+\verb|\bibname|        & \bibname \\
+\verb|\chaptername|    & \chaptername \\
+\verb|\appendixname|   & \appendixname \\
+\verb|\contentsname|   & \contentsname \\
+\verb|\listfigurename| & \listfigurename \\
+\verb|\listtablename|  & \listtablename \\
+\verb|\indexname|      & \indexname \\
+\verb|\figurename|     & \figurename \\
+\verb|\tablename|      & \tablename \\
+\verb|\partname|       & \partname \\
+\verb|\enclname|       & \enclname \\
+\verb|\ccname|         & \ccname \\
+\verb|\headtoname|     & \headtoname \\
+\verb|\pagename|       & \pagename \\
+\verb|\headpagename|   & \headpagename \\
+\verb|\prefacename|    & \prefacename \\
+\verb|\seename|        & \seename \\
+\verb|\alsoname|       & \alsoname \\
+\end{tabular}
diff --git a/Master/texmf-dist/source/generic/vntex/tests/test-plain-tcx.tex b/Master/texmf-dist/source/generic/vntex/tests/test-plain-tcx.tex
new file mode 100644
index 00000000000..35274887a30
--- /dev/null
+++ b/Master/texmf-dist/source/generic/vntex/tests/test-plain-tcx.tex
@@ -0,0 +1,26 @@
+%& -translate-file=viscii-t5
+
+% Copyright 2003-2005 Han The Thanh <hanthethanh@gmx.net>.
+% This file is part of vntex.  License: LPPL, version 1.3 or newer,
+% according to http://www.latex-project.org/lppl.txt
+
+\input plnfss           % load PLNFSS
+\setfontencoding{T5}    % default is OT1 by plnfss
+\selectfont             % active the font switch
+
+\input t5code.tex   % to get \uppercase and \lowercase work properly
+
+% some definitions used in included test files
+\def\subsection#1{%
+    \bigskip
+    \leftline{\bfseries #1}
+    \smallskip
+    \noindent\ignorespaces}
+\let\subsubsection=\subsection
+\def\\{\hfil\break}
+\def\MakeUppercase#1{\edef\x{\uppercase{#1}}\x}
+\def\MakeLowercase#1{\edef\x{\lowercase{#1}}\x}
+
+
+\input test-viscii
+\bye
diff --git a/Master/texmf-dist/source/generic/vntex/tests/test-plain.tex b/Master/texmf-dist/source/generic/vntex/tests/test-plain.tex
new file mode 100644
index 00000000000..5afff7d444e
--- /dev/null
+++ b/Master/texmf-dist/source/generic/vntex/tests/test-plain.tex
@@ -0,0 +1,30 @@
+% Copyright 2003-2005 Han The Thanh <hanthethanh@gmx.net>.
+% This file is part of vntex.  License: LPPL, version 1.3 or newer,
+% according to http://www.latex-project.org/lppl.txt
+
+\input plnfss           % load PLNFSS; must be loaded before plainenc 
+
+\setfontencoding{T5}    % default is OT1 by plnfss
+\selectfont             % active the font switch
+
+\input plainenc         % load support for inputenc mechanism
+\fontencoding{T5}       % load the T5 encoding definition file (t5enc.def)
+
+% some definitions used in included test files
+\def\subsection#1{%
+    \bigskip
+    \leftline{\bfseries #1}
+    \smallskip
+    \noindent\ignorespaces}
+\let\subsubsection=\subsection
+\def\\{\hfil\break}
+\def\MakeUppercase#1{\edef\x{\uppercase{#1}}\x}
+\def\MakeLowercase#1{\edef\x{\lowercase{#1}}\x}
+
+
+\inputencoding{viscii}
+\input test-viscii
+
+\inputencoding{tcvn}
+\input test-tcvn
+\bye
diff --git a/Master/texmf-dist/source/generic/vntex/tests/test-tcvn.tex b/Master/texmf-dist/source/generic/vntex/tests/test-tcvn.tex
new file mode 100644
index 00000000000..ba5b6b341d3
--- /dev/null
+++ b/Master/texmf-dist/source/generic/vntex/tests/test-tcvn.tex
@@ -0,0 +1,67 @@
+% Copyright 2003-2005 Han The Thanh <hanthethanh@gmx.net>.
+% This file is part of vntex.  License: LPPL, version 1.3 or newer,
+% according to http://www.latex-project.org/lppl.txt
+
+\subsection{Test of lowercase letters}
+� � � � � � � � � � � � � � � � � � \\
+� � � � � � � � � � � � � � � �\\
+� � � � � � � � � � � � � � � � � \\
+� � � � � � � � � � � � � � � � 
+
+\subsection{Test of uppercase letters}
+� � � � � � � � � � � � � � � � � � \\
+� � � � � � � � � � � � � � � �\\
+� � � � � � � � � � � � � � � � � \\
+
  � � � �           
+
+\subsection{Test whether \texttt{MakeLowercase} works correctly}
+\MakeLowercase{%
+� � � � � � � � � � � � � � � � � � \\
+� � � � � � � � � � � � � � � � \\ 
+� � � � � � � � � � � � � � � � � \\
+
  � � � �           } 
+
+\subsection{Test whether \texttt{MakeUppercase} works correctly}
+\MakeUppercase{%
+� � � � � � � � � � � � � � � � � � \\
+� � � � � � � � � � � � � � � � \\ 
+� � � � � � � � � � � � � � � � � \\
+� � � � � � � � � � � � � � � � } 
+
+\subsection{Some text sample}
+
+\ifx\documentclass\undefined\else
+\begin{figure}[htb]
+  \centering
+  \rule{4cm}{3cm}
+  \caption{��m H� N�i}
+\end{figure}
+\fi
+
+\ifx\documentclass\undefined
+   \def\fn{\footnote*{Th� coi ch� th�ch c� ch�y kh�ng h�.}}
+\else
+   \def\fn{\footnote{Th� coi ch� th�ch c� ch�y kh�ng h�.}}
+\fi
+
+H�n v�a �i v�a ch�i\fn. Bao gi� c�ng th�, c� r��u xong l� h�n ch�i. B�t ��u
+ch�i tr�i. C� h� g�? Tr�i c� c�a ri�ng nh� n�o? R�i h�n ch�i ��i. Th�
+c�ng ch�ng sao: ��i l� t�t c� nh�ng ch�ng l� ai. T�c m�nh h�n ch�i ngay t�t
+c� l�ng V� ��i. Nh�ng c� l�ng V� ��i ai c�ng nh�, \textit{``Ch�c n� tr�
+m�nh ra!''} Kh�ng ai l�n ti�ng c�. T�c th�t! �! Th� n�y th� t�c th�t! T�c
+ch�t �i ���c m�t! �� th�, h�n ph�i ch�i cha ��a n�o kh�ng ch�i nhau v�i
+h�n. Nh�ng c�ng kh�ng ai ra �i�u. M� ki�p! Th� th� c� ph� r��u kh�ng? Th�
+th� c� kh� h�n kh�ng? Kh�ng bi�t ��a ch�t m� n�o �� ra th�n h�n cho h�n kh�
+��n n�ng n�i n�y? A ha! Ph�i ��y, h�n c� th� m� ch�i, h�n ch�i ��a ch�t m�
+n�o �� ra th�n h�n, �� ra c�i th�ng \textbf{Ch� Ph�o}! H�n nghi�n r�ng v�o
+m� ch�i c�i ��a �� �� ra Ch� Ph�o. Nh�ng m� bi�t ��a n�o �� �� ra
+Ch� Ph�o? C� tr�i m� bi�t! H�n kh�ng bi�t, c� l�ng V� ��i c�ng kh�ng ai
+bi�t.
+
+\subsection{Test of Vietnamese in sectioning commands}
+\subsubsection{��m qua t�t n��c ��u ��nh}
+\subsubsection{B� qu�n chi�c �o tr�n c�nh hoa sen}
+\subsubsection{Em ���c th� cho anh xin}
+\subsubsection{Hay l� em �� l�m tin trong nh�}
+
+\endinput
diff --git a/Master/texmf-dist/source/generic/vntex/tests/test-utf8.tex b/Master/texmf-dist/source/generic/vntex/tests/test-utf8.tex
new file mode 100644
index 00000000000..7f8ec36b4d9
--- /dev/null
+++ b/Master/texmf-dist/source/generic/vntex/tests/test-utf8.tex
@@ -0,0 +1,71 @@
+% Copyright 2003-2005 Han The Thanh <hanthethanh@gmx.net>.
+% This file is part of vntex.  License: LPPL, version 1.3 or newer,
+% according to http://www.latex-project.org/lppl.txt
+
+\subsection{Test of lowercase letters}
+á ạ à ả ã ă ắ ặ ằ ẳ ẵ â ấ ậ ầ ẩ ẫ đ \\
+é ẹ è ẻ ẽ ê ế ệ ề ể ễ í ị ì ỉ ĩ\\
+ó ọ ò ỏ õ ô ố ộ ồ ổ ỗ ơ ớ ợ ờ ở ỡ \\
+ú ụ ù ủ ũ ư ứ ự ừ ử ữ ý ỵ ỳ ỷ ỹ 
+
+\subsection{Test of uppercase letters}
+Á Ạ À Ả Ã Ă Ắ Ặ Ằ Ẳ Ẵ Â Ấ Ậ Ầ Ẩ Ẫ Đ \\
+É Ẹ È Ẻ Ẽ Ê Ế Ệ Ề Ể Ễ Í Ị Ì Ỉ Ĩ\\
+Ó Ọ Ò Ỏ Õ Ô Ố Ộ Ồ Ổ Ỗ Ơ Ớ Ợ Ờ Ở Ỡ \\
+Ú Ụ Ù Ủ Ũ Ư Ứ Ự Ừ Ử Ữ Ý Ỵ Ỳ Ỷ Ỹ 
+
+\subsection{Test whether \texttt{MakeLowercase} works correctly}
+\MakeLowercase{%
+Á Ạ À Ả Ã Ă Ắ Ặ Ằ Ẳ Ẵ Â Ấ Ậ Ầ Ẩ Ẫ Đ \\
+É Ẹ È Ẻ Ẽ Ê Ế Ệ Ề Ể Ễ Í Ị Ì Ỉ Ĩ \\ 
+Ó Ọ Ò Ỏ Õ Ô Ố Ộ Ồ Ổ Ỗ Ơ Ớ Ợ Ờ Ở Ỡ \\
+Ú Ụ Ù Ủ Ũ Ư Ứ Ự Ừ Ử Ữ Ý Ỵ Ỳ Ỷ Ỹ } 
+
+\subsection{Test whether \texttt{MakeUppercase} works correctly}
+\MakeUppercase{%
+á ạ à ả ã ă ắ ặ ằ ẳ ẵ â ấ ậ ầ ẩ ẫ đ \\
+é ẹ è ẻ ẽ ê ế ệ ề ể ễ í ị ì ỉ ĩ \\ 
+ó ọ ò ỏ õ ô ố ộ ồ ổ ỗ ơ ớ ợ ờ ở ỡ \\
+ú ụ ù ủ ũ ư ứ ự ừ ử ữ ý ỵ ỳ ỷ ỹ } 
+
+\subsection{Some text sample}
+
+\ifx\documentclass\undefined\else
+\begin{figure}[htb]
+  \centering
+  \rule{4cm}{3cm}
+  \caption{Đêm Hà Nội}
+\end{figure}
+\fi
+
+\ifx\documentclass\undefined
+  \def\fn{\footnote*{Thử coi chú thích có chạy không hè.}}
+\else
+  \def\fn{\footnote{Thử coi chú thích có chạy không hè.}}
+\fi
+
+Hắn vừa đi vừa chửi\fn. Bao giờ cũng thế, cứ rượu xong là hắn chửi. Bắt đầu
+chửi trời. Có hề gì? Trời có của riêng nhà nào? Rồi hắn chửi đời. Thế
+cũng chẳng sao: đời là tất cả nhưng chẳng là ai. Tức mình hắn chửi ngay tất
+cả làng Vũ Đại. Nhưng cả làng Vũ Đại ai cũng nhủ, \textit{``Chắc nó trừ
+mình ra!''} Không ai lên tiếng cả. Tức thật! Ồ! Thế này thì tức thật! Tức
+chết đi được mất! Đã thế, hắn phải chửi cha đứa nào không chửi nhau với
+hắn. Nhưng cũng không ai ra điều. Mẹ kiếp! Thế thì có phí rượu không? Thế
+thì có khổ hắn không? Không biết đứa chết mẹ nào đẻ ra thân hắn cho hắn khổ
+đến nông nỗi này? A ha! Phải đấy, hắn cứ thế mà chửi, hắn chửi đứa chết mẹ
+nào đẻ ra thân hắn, đẻ ra cái thằng \textbf{Chí Phèo}! Hắn nghiến răng vào
+mà chửi cái đứa đã đẻ ra Chí Phèo. Nhưng mà biết đứa nào đã đẻ ra
+Chí Phèo? Có trời mà biết! Hắn không biết, cả làng Vũ Đại cũng không ai
+biết.
+
+\subsection{Test of Vietnamese in sectioning commands}
+\subsubsection{Đêm qua tát nước đầu đình}
+\subsubsection{Bỏ quên chiếc áo trên cành hoa sen}
+\subsubsection{Em được thì cho anh xin}
+\subsubsection{Hay là em để làm tin trong nhà}
+
+\endinput
+
+% Local Variables:
+% coding: utf-8
+% End:
\ No newline at end of file
diff --git a/Master/texmf-dist/source/generic/vntex/tests/test-vietnam-tcx.tex b/Master/texmf-dist/source/generic/vntex/tests/test-vietnam-tcx.tex
new file mode 100644
index 00000000000..05a615ac1bb
--- /dev/null
+++ b/Master/texmf-dist/source/generic/vntex/tests/test-vietnam-tcx.tex
@@ -0,0 +1,45 @@
+%& -translate-file=viscii-t5
+
+% Copyright 2003-2005 Han The Thanh <hanthethanh@gmx.net>.
+% This file is part of vntex.  License: LPPL, version 1.3 or newer,
+% according to http://www.latex-project.org/lppl.txt
+
+
+\documentclass[openany]{book}
+\usepackage[noinputenc]{vietnam} % option `noinputenc' is required to use TCX 
+                                 % pros: vietnamese text in logging messages
+                                 % cons: - utf8 is not supported;
+                                 %       - web2c-specific
+                                 %       - cannot support multiple input
+                                 %         encodings in a single document
+                                 %       - babel cannot be used
+
+\usepackage{multicol}   % needed for testing accent commands
+\usepackage[colorlinks]{hyperref} % let's try vietnamese with hyperref
+\input{pd1supp.def}     % supplement for characters missing in PD1 encoding
+                        % (used for PDF bookmarks) 
+
+\begin{document}
+
+\title{\bfseries Test of Vietnamese support for \LaTeX{} using
+    \texttt{vietnam.sty} and TCX}
+\author{H\`an Th\'\ecircumflex{} Th\`anh}
+\maketitle
+
+\tableofcontents
+\listoffigures
+
+\chapter{Test input encodings}
+\section{Test of VISCII encoding support}
+\input{test-viscii}
+
+\clearpage
+\appendix
+
+\chapter{Test of Vietnamese captions}
+\input{test-captions}
+
+\chapter{Test of accent commands for T5 encoding}
+\input{test-accents}
+
+\end{document}
diff --git a/Master/texmf-dist/source/generic/vntex/tests/test-vietnam.tex b/Master/texmf-dist/source/generic/vntex/tests/test-vietnam.tex
new file mode 100644
index 00000000000..0239df9f747
--- /dev/null
+++ b/Master/texmf-dist/source/generic/vntex/tests/test-vietnam.tex
@@ -0,0 +1,74 @@
+% Copyright 2003-2005 Han The Thanh <hanthethanh@gmx.net>.
+% This file is part of vntex.  License: LPPL, version 1.3 or newer,
+% according to http://www.latex-project.org/lppl.txt
+%
+%
+% You need LaTeX 2003/12/01 (or newer) and ucs newer than August 2004!
+
+\documentclass[openany]{book}
+
+\IfFileExists{ucs.sty}
+{\usepackage[utf8x,utf8]{vietnam}} 
+{\usepackage[utf8]{vietnam}} 
+                                 % We must load both utf8x and utf8 (in
+                                 % this order) to make vietnam.sty load
+                                 % ucs.sty, and to tell ucs.sty that it
+                                 % should disable compatibility mode,
+                                 % allowing to test utf8 and utf8x input
+                                 % simultaneously.
+                                 %
+                                 % Supported input encoding: viscii,
+                                 % mviscii, tcvn, vps, utf8, utf8x
+                                 %
+                                 % Other options: 
+                                 %   noinputenc: don't use inputenc (for
+                                 %       use with TCX)
+                                 %   nocaptions: don't redefine captions
+                                 %       to Vietnamese
+
+
+\usepackage{multicol}   % needed for testing accent commands
+\usepackage[colorlinks]{hyperref} % let's try vietnamese with hyperref
+\input{pd1supp.def}     % supplement for characters missing in PD1 encoding
+                        % (used for PDF bookmarks) 
+
+\begin{document}
+
+\title{\bfseries Test of Vietnamese support for \LaTeX{} using \texttt{vietnam.sty}}
+\author{H\`an Th\'\ecircumflex{} Th\`anh}
+\maketitle
+
+\tableofcontents
+\listoffigures
+
+\chapter{Test input encodings}
+\section{Test of VISCII encoding support}
+\inputencoding{viscii}
+\input{test-viscii}
+
+\section{Test of TCVN encoding support}
+\inputencoding{tcvn}
+\input{test-tcvn}
+
+\section{Test of UTF8 encoding support}
+\inputencoding{utf8}
+\input{test-utf8}
+
+\IfFileExists{ucs.sty}{%
+\section[Test of UTF8x encoding support]
+   {Test of UTF8x encoding support (from Unicode package)}
+\inputencoding{utf8x}
+\input{test-utf8}
+}{\typeout{^^JWARNING: File ucs.sty not found, skipping test.^^J}}
+
+\clearpage
+
+\appendix
+
+\chapter{Test of Vietnamese captions}
+\input{test-captions}
+
+\chapter{Test of accent commands for T5 encoding}
+\input{test-accents}
+
+\end{document}
diff --git a/Master/texmf-dist/source/generic/vntex/tests/test-viscii.tex b/Master/texmf-dist/source/generic/vntex/tests/test-viscii.tex
new file mode 100644
index 00000000000..6b5b16beeff
--- /dev/null
+++ b/Master/texmf-dist/source/generic/vntex/tests/test-viscii.tex
@@ -0,0 +1,67 @@
+% Copyright 2003-2005 Han The Thanh <hanthethanh@gmx.net>.
+% This file is part of vntex.  License: LPPL, version 1.3 or newer,
+% according to http://www.latex-project.org/lppl.txt
+
+\subsection{Test of lowercase letters}
+� � � � � � � � � � � � � � � � � � \\
+� � � � � � � � � � � � � � � �\\
+� � � � � � � � � � � � � � � � � \\
+� � � � � � � � � � � � � � � � 
+
+\subsection{Test of uppercase letters}
+� � � � � � � � �   � � � � �  � \\
+� � � � � � � � � � � � � � � �\\
+� � � � � � � � � � � � � � � � � \\
+� � � � � � � � � � � �  �   
+
+\subsection{Test whether \texttt{MakeLowercase} works correctly}
+\MakeLowercase{%
+� � � � � � � � �   � � � � �  � \\
+� � � � � � � � � � � � � � � � \\ 
+� � � � � � � � � � � � � � � � � \\
+� � � � � � � � � � � �  �   } 
+
+\subsection{Test whether \texttt{MakeUppercase} works correctly}
+\MakeUppercase{%
+� � � � � � � � � � � � � � � � � � \\
+� � � � � � � � � � � � � � � � \\ 
+� � � � � � � � � � � � � � � � � \\
+� � � � � � � � � � � � � � � � } 
+
+\subsection{Some text sample}
+
+\ifx\documentclass\undefined\else
+\begin{figure}[htb]
+  \centering
+  \rule{4cm}{3cm}
+  \caption{��m H� N�i}
+\end{figure}
+\fi
+
+\ifx\documentclass\undefined
+  \def\fn{\footnote*{Th� coi ch� th�ch c� ch�y kh�ng h�.}}
+\else
+  \def\fn{\footnote{Th� coi ch� th�ch c� ch�y kh�ng h�.}}
+\fi
+
+H�n v�a �i v�a ch�i\fn. Bao gi� c�ng th�, c� r��u xong l� h�n ch�i. B�t �u
+ch�i tr�i. C� h� g�? Tr�i c� c�a ri�ng nh� n�o? R�i h�n ch�i �i. Th�
+c�ng ch�ng sao: �i l� t�t c� nh�ng ch�ng l� ai. T�c m�nh h�n ch�i ngay t�t
+c� l�ng V� ��i. Nh�ng c� l�ng V� ��i ai c�ng nh�, \textit{``Ch�c n� tr�
+m�nh ra!''} Kh�ng ai l�n ti�ng c�. T�c th�t! �! Th� n�y th� t�c th�t! T�c
+ch�t �i ���c m�t! �� th�, h�n ph�i ch�i cha ��a n�o kh�ng ch�i nhau v�i
+h�n. Nh�ng c�ng kh�ng ai ra �i�u. M� ki�p! Th� th� c� ph� r��u kh�ng? Th�
+th� c� kh� h�n kh�ng? Kh�ng bi�t ��a ch�t m� n�o �� ra th�n h�n cho h�n kh�
+�n n�ng n�i n�y? A ha! Ph�i �y, h�n c� th� m� ch�i, h�n ch�i ��a ch�t m�
+n�o �� ra th�n h�n, �� ra c�i th�ng \textbf{Ch� Ph�o}! H�n nghi�n r�ng v�o
+m� ch�i c�i ��a �� �� ra Ch� Ph�o. Nh�ng m� bi�t ��a n�o �� �� ra
+Ch� Ph�o? C� tr�i m� bi�t! H�n kh�ng bi�t, c� l�ng V� ��i c�ng kh�ng ai
+bi�t.
+
+\subsection{Test of Vietnamese in sectioning commands}
+\subsubsection{��m qua t�t n߾c �u ��nh}
+\subsubsection{B� qu�n chi�c �o tr�n c�nh hoa sen}
+\subsubsection{Em ���c th� cho anh xin}
+\subsubsection{Hay l� em � l�m tin trong nh�}
+
+\endinput
diff --git a/Master/texmf-dist/source/generic/vntex/tests/txttvn-sample.tex b/Master/texmf-dist/source/generic/vntex/tests/txttvn-sample.tex
new file mode 100644
index 00000000000..08465a803a9
--- /dev/null
+++ b/Master/texmf-dist/source/generic/vntex/tests/txttvn-sample.tex
@@ -0,0 +1,18 @@
+% Copyright 2003-2006 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
+
+\documentclass[sample]{vnsample}
+
+\mapfile{txttvn}
+
+\begin{document}
+\section{VnTXTT}
+\showletters{T5}{txtt}{m}{n} {txtt8v}        {VnTXTT-Medium}
+\showletters{T5}{txtt}{m}{sc} {txttsc8v}        {VnTXTTSC-Medium}
+\showletters{T5}{txtt}{m}{sl} {txttsl8v}        {VnTXTT-Medium}
+\showletters{T5}{txtt}{bx}{n} {txbtt8v}        {VnTXTT-Bold}
+\showletters{T5}{txtt}{bx}{sc} {txbttsc8v}        {VnTXTTSC-Bold}
+\showletters{T5}{txtt}{bx}{sl} {txbttsl8v}        {VnTXTT-Bold}
+\showtext   {T5}{txtt}{m}{n} {txtt8v}        {VnTXTT-Medium}
+\end{document}
diff --git a/Master/texmf-dist/source/generic/vntex/tests/txttvn-test.tex b/Master/texmf-dist/source/generic/vntex/tests/txttvn-test.tex
new file mode 100644
index 00000000000..1a749071005
--- /dev/null
+++ b/Master/texmf-dist/source/generic/vntex/tests/txttvn-test.tex
@@ -0,0 +1,18 @@
+% Copyright 2003-2005 Han The Thanh <hanthethanh@gmx.net>.
+% This file is part of vntex.  License: LPPL, version 1.3 or newer,
+% according to http://www.latex-project.org/lppl.txt
+
+\documentclass[test]{vnsample}
+
+\mapfile{txttvn}
+
+\begin{document}
+\begin{shortsample}
+\shorttext{T5}{txtt}{m}{n} {txtt8v}        {VnTXTT-Medium}
+\shorttext{T5}{txtt}{m}{sc} {txttsc8v}        {VnTXTTSC-Medium}
+\shorttext{T5}{txtt}{m}{sl} {txttsl8v}        {VnTXTT-Medium}
+\shorttext{T5}{txtt}{bx}{n} {txbtt8v}        {VnTXTT-Bold}
+\shorttext{T5}{txtt}{bx}{sc} {txbttsc8v}        {VnTXTTSC-Bold}
+\shorttext{T5}{txtt}{bx}{sl} {txbttsl8v}        {VnTXTT-Bold}
+\end{shortsample}
+\end{document}
diff --git a/Master/texmf-dist/source/generic/vntex/tests/urwvn-sample.tex b/Master/texmf-dist/source/generic/vntex/tests/urwvn-sample.tex
new file mode 100644
index 00000000000..f860bb24d9a
--- /dev/null
+++ b/Master/texmf-dist/source/generic/vntex/tests/urwvn-sample.tex
@@ -0,0 +1,85 @@
+% Copyright 2003-2005 Han The Thanh <hanthethanh@gmx.net>.
+% This file is part of vntex.  License: LPPL, version 1.3 or newer,
+% according to http://www.latex-project.org/lppl.txt
+
+\documentclass[sample]{vnsample}
+
+\mapfile{urwvn}
+
+\begin{document}
+\section{VnURWGothicL}
+\showletters{T5}{uag}{db}{n}  {uagd8v}  {VnURWGothicL-Demi}
+\showletters{T5}{uag}{db}{sc} {uagdc8v} {N/A}
+\showletters{T5}{uag}{db}{sl} {uagdo8v} {VnURWGothicL-DemiItalic}
+\showletters{T5}{uag}{m}{n}   {uagk8v}  {VnURWGothicL}
+\showletters{T5}{uag}{m}{sc}  {uagkc8v} {N/A}
+\showletters{T5}{uag}{m}{sl}  {uagko8v} {VnURWGothicL-Italic}
+\showtext   {T5}{uag}{m}{n}   {uagk8v}  {VnURWGothicL}
+
+\section{VnURWBookmanL}
+\showletters{T5}{ubk}{db}{n}  {ubkd8v}  {VnURWBookmanL-Bold}
+\showletters{T5}{ubk}{db}{sc} {ubkdc8v} {N/A}
+\showletters{T5}{ubk}{db}{it} {ubkdi8v} {VnURWBookmanL-BoldItalic}
+\showletters{T5}{ubk}{db}{sl} {ubkdo8v} {N/A}
+\showletters{T5}{ubk}{l}{n}   {ubkl8v}  {VnURWBookmanL}
+\showletters{T5}{ubk}{l}{sc}  {ubklc8v} {N/A}
+\showletters{T5}{ubk}{l}{it}  {ubkli8v} {VnURWBookmanL-Italic}
+\showletters{T5}{ubk}{l}{sl}  {ubklo8v} {N/A}
+\showtext   {T5}{ubk}{l}{n}   {ubkl8v}  {VnURWBookmanL}
+
+\section{VnNimbusMonL}
+\showletters{T5}{ucr}{b}{n}   {ucrb8v}  {VnNimbusMonoL-Bold}
+\showletters{T5}{ucr}{b}{sc}  {ucrbc8v} {N/A}
+\showletters{T5}{ucr}{b}{sl}  {ucrbo8v} {VnNimbusMonoL-BoldItalic}
+\showletters{T5}{ucr}{m}{n}   {ucrr8v}  {VnNimbusMonoL}
+\showletters{T5}{ucr}{m}{sc}  {ucrrc8v} {N/A}
+\showletters{T5}{ucr}{m}{sl}  {ucrro8v} {VnNimbusMonoL-Italic}
+\showtext   {T5}{ucr}{m}{n}   {ucrr8v}  {VnNimbusMonoL}
+
+\section{VnNimbusSanL}
+\showletters{T5}{uhv}{b}{n}   {uhvb8v}  {VnNimbusSansL-Bold}
+\showletters{T5}{uhv}{b}{sc}  {uhvbc8v} {N/A}
+\showletters{T5}{uhv}{b}{sl}  {uhvbo8v} {VnNimbusSansL-BoldItalic}
+\showletters{T5}{uhv}{m}{n}   {uhvr8v}  {VnNimbusSansL}
+\showletters{T5}{uhv}{m}{sc}  {uhvrc8v} {N/A}
+\showletters{T5}{uhv}{m}{sl}  {uhvro8v} {VnNimbusSansL-Italic}
+\showtext   {T5}{uhv}{m}{n}   {uhvr8v}  {VnNimbusSansL}
+
+\section{VnCenturySchoolbookL}
+\showletters{T5}{unc}{b}{n}   {uncb8v}  {VnCenturySchoolbookL-Bold}
+\showletters{T5}{unc}{b}{sc}  {uncbc8v} {N/A}
+\showletters{T5}{unc}{b}{it}  {uncbi8v} {VnCenturySchoolbookL-BoldItalic}
+\showletters{T5}{unc}{b}{sl}  {uncbo8v} {N/A}
+\showletters{T5}{unc}{m}{n}   {uncr8v}  {VnCenturySchoolbookL}
+\showletters{T5}{unc}{m}{sc}  {uncrc8v} {N/A}
+\showletters{T5}{unc}{m}{it}  {uncri8v} {VnCenturySchoolbookL-Italic}
+\showletters{T5}{unc}{m}{sl}  {uncro8v} {N/A}
+\showtext   {T5}{unc}{m}{n}   {uncr8v}  {VnCenturySchoolbookL}
+
+\section{VnURWPalladioL}
+\showletters{T5}{upl}{b}{n}   {uplb8v}  {VnURWPalladioL-Bold}
+\showletters{T5}{upl}{b}{sc}  {uplbc8v} {N/A}
+\showletters{T5}{upl}{b}{it}  {uplbi8v} {VnURWPalladioL-BoldItalic}
+\showletters{T5}{upl}{b}{sl}  {uplbo8v} {N/A}
+\showletters{T5}{upl}{m}{n}   {uplr8v}  {VnURWPalladioL}
+\showletters{T5}{upl}{m}{sc}  {uplrc8v} {N/A}
+\showletters{T5}{fpl}{m}{sc}  {fplrc8v} {VnTeXPalladioL-SC}
+\showletters{T5}{upl}{m}{it}  {uplri8v} {VnURWPalladioL-Italic}
+\showletters{T5}{upl}{m}{sl}  {uplro8v} {N/A}
+\showtext   {T5}{upl}{m}{n}   {uplr8v}  {VnURWPalladioL}
+
+\section{VnNimbusRomanNo9L}
+\showletters{T5}{utm}{b}{n}   {utmb8v}  {VnNimbusRomanNo9L-Bold}
+\showletters{T5}{utm}{b}{sc}  {utmbc8v} {N/A}
+\showletters{T5}{utm}{b}{it}  {utmbi8v} {VnNimbusRomanNo9L-BoldItalic}
+\showletters{T5}{utm}{b}{sl}  {utmbo8v} {N/A}
+\showletters{T5}{utm}{m}{n}   {utmr8v}  {VnNimbusRomanNo9L}
+\showletters{T5}{utm}{m}{sc}  {utmrc8v} {N/A}
+\showletters{T5}{utm}{m}{it}  {utmri8v} {VnNimbusRomanNo9L-Italic}
+\showletters{T5}{utm}{m}{sl}  {utmro8v} {N/A}
+\showtext   {T5}{utm}{m}{n}   {utmr8v}  {VnNimbusRomanNo9L}
+
+\section{VnURWChanceryL-MediItal}
+\showletters{T5}{uzcm}{b}{n} {uzcmi8v}  {VnURWChanceryL-MediItal}
+\showtext   {T5}{uzcm}{b}{n} {uzcmi8v}  {VnURWChanceryL-MediItal}
+\end{document}
diff --git a/Master/texmf-dist/source/generic/vntex/tests/urwvn-test.tex b/Master/texmf-dist/source/generic/vntex/tests/urwvn-test.tex
new file mode 100644
index 00000000000..bb1276e3c19
--- /dev/null
+++ b/Master/texmf-dist/source/generic/vntex/tests/urwvn-test.tex
@@ -0,0 +1,138 @@
+% Copyright 2003-2005 Han The Thanh <hanthethanh@gmx.net>.
+% This file is part of vntex.  License: LPPL, version 1.3 or newer,
+% according to http://www.latex-project.org/lppl.txt
+
+\documentclass[test]{vnsample}
+
+\mapfile{urwvn}
+
+\begin{document}
+\begin{shortsample}
+\shorttext{T5}{uag}{db}{n}  {uagd8v}  {VnURWGothicL-Demi}
+\shorttext{T5}{uag}{db}{sc} {uagdc8v} {N/A}
+\shorttext{T5}{uag}{db}{sl} {uagdo8v} {VnURWGothicL-DemiItalic}
+\shorttext{T5}{uag}{m}{n}   {uagk8v}  {VnURWGothicL}
+\shorttext{T5}{uag}{m}{sc}  {uagkc8v} {N/A}
+\shorttext{T5}{uag}{m}{sl}  {uagko8v} {VnURWGothicL-Italic}
+%
+\shorttext{T5}{ubk}{db}{n}  {ubkd8v}  {VnURWBookmanL-Bold}
+\shorttext{T5}{ubk}{db}{sc} {ubkdc8v} {N/A}
+\shorttext{T5}{ubk}{db}{it} {ubkdi8v} {VnURWBookmanL-BoldItalic}
+\shorttext{T5}{ubk}{db}{sl} {ubkdo8v} {N/A}
+\shorttext{T5}{ubk}{l}{n}   {ubkl8v}  {VnURWBookmanL}
+\shorttext{T5}{ubk}{l}{sc}  {ubklc8v} {N/A}
+\shorttext{T5}{ubk}{l}{it}  {ubkli8v} {VnURWBookmanL-Italic}
+\shorttext{T5}{ubk}{l}{sl}  {ubklo8v} {N/A}
+%
+\shorttext{T5}{ucr}{b}{n}   {ucrb8v}  {VnNimbusMonoL-Bold}
+\shorttext{T5}{ucr}{b}{sc}  {ucrbc8v} {N/A}
+\shorttext{T5}{ucr}{b}{sl}  {ucrbo8v} {VnNimbusMonoL-BoldItalic}
+\shorttext{T5}{ucr}{m}{n}   {ucrr8v}  {VnNimbusMonoL}
+\shorttext{T5}{ucr}{m}{sc}  {ucrrc8v} {N/A}
+\shorttext{T5}{ucr}{m}{sl}  {ucrro8v} {VnNimbusMonoL-Italic}
+%
+\shorttext{T5}{uhv}{b}{n}   {uhvb8v}  {VnNimbusSansL-Bold}
+\shorttext{T5}{uhv}{b}{sc}  {uhvbc8v} {N/A}
+\shorttext{T5}{uhv}{b}{sl}  {uhvbo8v} {VnNimbusSansL-BoldItalic}
+\shorttext{T5}{uhv}{m}{n}   {uhvr8v}  {VnNimbusSansL}
+\shorttext{T5}{uhv}{m}{sc}  {uhvrc8v} {N/A}
+\shorttext{T5}{uhv}{m}{sl}  {uhvro8v} {VnNimbusSansL-Italic}
+\end{shortsample}
+\clearpage
+\begin{shortsample}
+\shorttext{T5}{unc}{b}{n}   {uncb8v}  {VnCenturySchoolbookL-Bold}
+\shorttext{T5}{unc}{b}{sc}  {uncbc8v} {N/A}
+\shorttext{T5}{unc}{b}{it}  {uncbi8v} {VnCenturySchoolbookL-BoldItalic}
+\shorttext{T5}{unc}{b}{sl}  {uncbo8v} {N/A}
+\shorttext{T5}{unc}{m}{n}   {uncr8v}  {VnCenturySchoolbookL}
+\shorttext{T5}{unc}{m}{sc}  {uncrc8v} {N/A}
+\shorttext{T5}{unc}{m}{it}  {uncri8v} {VnCenturySchoolbookL-Italic}
+\shorttext{T5}{unc}{m}{sl}  {uncro8v} {N/A}
+%
+\shorttext{T5}{upl}{b}{n}   {uplb8v}  {VnURWPalladioL-Bold}
+\shorttext{T5}{upl}{b}{sc}  {uplbc8v} {N/A}
+\shorttext{T5}{upl}{b}{it}  {uplbi8v} {VnURWPalladioL-BoldItalic}
+\shorttext{T5}{upl}{b}{sl}  {uplbo8v} {N/A}
+\shorttext{T5}{upl}{m}{n}   {uplr8v}  {VnURWPalladioL}
+%%%%
+\shorttext{T5}{upl}{m}{sc}  {uplrc8v} {N/A}
+\shorttext{T5}{fpl}{m}{sc}  {fplrc8v} {VnTeXPalladioL-SC}
+%%%%
+\shorttext{T5}{upl}{m}{it}  {uplri8v} {VnURWPalladioL-Italic}
+\shorttext{T5}{upl}{m}{sl}  {uplro8v} {N/A}
+%
+\shorttext{T5}{utm}{b}{n}   {utmb8v}  {VnNimbusRomanNo9L-Bold}
+\shorttext{T5}{utm}{b}{sc}  {utmbc8v} {N/A}
+\shorttext{T5}{utm}{b}{it}  {utmbi8v} {VnNimbusRomanNo9L-BoldItalic}
+\shorttext{T5}{utm}{b}{sl}  {utmbo8v} {N/A}
+\shorttext{T5}{utm}{m}{n}   {utmr8v}  {VnNimbusRomanNo9L}
+\shorttext{T5}{utm}{m}{sc}  {utmrc8v} {N/A}
+\shorttext{T5}{utm}{m}{it}  {utmri8v} {VnNimbusRomanNo9L-Italic}
+\shorttext{T5}{utm}{m}{sl}  {utmro8v} {N/A}
+\end{shortsample}
+\clearpage
+\begin{shortsample}
+\shorttext{T5}{pag}{db}{n}  {uagd8v}  {VnURWGothicL-Demi}
+\shorttext{T5}{pag}{db}{sc} {uagdc8v} {N/A}
+\shorttext{T5}{pag}{db}{sl} {uagdo8v} {VnURWGothicL-DemiItalic}
+\shorttext{T5}{pag}{m}{n}   {uagk8v}  {VnURWGothicL}
+\shorttext{T5}{pag}{m}{sc}  {uagkc8v} {N/A}
+\shorttext{T5}{pag}{m}{sl}  {uagko8v} {VnURWGothicL-Italic}
+%
+\shorttext{T5}{pbk}{db}{n}  {ubkd8v}  {VnURWBookmanL-Bold}
+\shorttext{T5}{pbk}{db}{sc} {ubkdc8v} {N/A}
+\shorttext{T5}{pbk}{db}{it} {ubkdi8v} {VnURWBookmanL-BoldItalic}
+\shorttext{T5}{pbk}{db}{sl} {ubkdo8v} {N/A}
+\shorttext{T5}{pbk}{l}{n}   {ubkl8v}  {VnURWBookmanL}
+\shorttext{T5}{pbk}{l}{sc}  {ubklc8v} {N/A}
+\shorttext{T5}{pbk}{l}{it}  {ubkli8v} {VnURWBookmanL-Italic}
+\shorttext{T5}{pbk}{l}{sl}  {ubklo8v} {N/A}
+%
+\shorttext{T5}{pcr}{b}{n}   {ucrb8v}  {VnNimbusMonoL-Bold}
+\shorttext{T5}{pcr}{b}{sc}  {ucrbc8v} {N/A}
+\shorttext{T5}{pcr}{b}{sl}  {ucrbo8v} {VnNimbusMonoL-BoldItalic}
+\shorttext{T5}{pcr}{m}{n}   {ucrr8v}  {VnNimbusMonoL}
+\shorttext{T5}{pcr}{m}{sc}  {ucrrc8v} {N/A}
+\shorttext{T5}{pcr}{m}{sl}  {ucrro8v} {VnNimbusMonoL-Italic}
+%
+\shorttext{T5}{phv}{b}{n}   {uhvb8v}  {VnNimbusSansL-Bold}
+\shorttext{T5}{phv}{b}{sc}  {uhvbc8v} {N/A}
+\shorttext{T5}{phv}{b}{sl}  {uhvbo8v} {VnNimbusSansL-BoldItalic}
+\shorttext{T5}{phv}{m}{n}   {uhvr8v}  {VnNimbusSansL}
+\shorttext{T5}{phv}{m}{sc}  {uhvrc8v} {N/A}
+\shorttext{T5}{phv}{m}{sl}  {uhvro8v} {VnNimbusSansL-Italic}
+\end{shortsample}
+\clearpage
+\begin{shortsample}
+\shorttext{T5}{pnc}{b}{n}   {uncb8v}  {VnCenturySchoolbookL-Bold}
+\shorttext{T5}{pnc}{b}{sc}  {uncbc8v} {N/A}
+\shorttext{T5}{pnc}{b}{it}  {uncbi8v} {VnCenturySchoolbookL-BoldItalic}
+\shorttext{T5}{pnc}{b}{sl}  {uncbo8v} {N/A}
+\shorttext{T5}{pnc}{m}{n}   {uncr8v}  {VnCenturySchoolbookL}
+\shorttext{T5}{pnc}{m}{sc}  {uncrc8v} {N/A}
+\shorttext{T5}{pnc}{m}{it}  {uncri8v} {VnCenturySchoolbookL-Italic}
+\shorttext{T5}{pnc}{m}{sl}  {uncro8v} {N/A}
+%
+\shorttext{T5}{ppl}{b}{n}   {uplb8v}  {VnURWPalladioL-Bold}
+\shorttext{T5}{ppl}{b}{sc}  {uplbc8v} {N/A}
+\shorttext{T5}{ppl}{b}{it}  {uplbi8v} {VnURWPalladioL-BoldItalic}
+\shorttext{T5}{ppl}{b}{sl}  {uplbo8v} {N/A}
+\shorttext{T5}{ppl}{m}{n}   {uplr8v}  {VnURWPalladioL}
+%
+\shorttext{T5}{ppl}{m}{sc}  {uplrc8v} {N/A}
+\shorttext{T5}{fpl}{m}{sc}  {fplrc8v} {VnTeXPalladioL-SC}
+%
+\shorttext{T5}{ppl}{m}{it}  {uplri8v} {VnURWPalladioL-Italic}
+\shorttext{T5}{ppl}{m}{sl}  {uplro8v} {N/A}
+%
+\shorttext{T5}{ptm}{b}{n}   {utmb8v}  {VnNimbusRomanNo9L-Bold}
+\shorttext{T5}{ptm}{b}{sc}  {utmbc8v} {N/A}
+\shorttext{T5}{ptm}{b}{it}  {utmbi8v} {VnNimbusRomanNo9L-BoldItalic}
+\shorttext{T5}{ptm}{b}{sl}  {utmbo8v} {N/A}
+\shorttext{T5}{ptm}{m}{n}   {utmr8v}  {VnNimbusRomanNo9L}
+\shorttext{T5}{ptm}{m}{sc}  {utmrc8v} {N/A}
+\shorttext{T5}{ptm}{m}{it}  {utmri8v} {VnNimbusRomanNo9L-Italic}
+\shorttext{T5}{ptm}{m}{sl}  {utmro8v} {N/A}
+\shorttext{T5}{uzcm}{b}{n} {uzcmi8v}  {VnURWChanceryL-MediItal}
+\end{shortsample}
+\end{document}
diff --git a/Master/texmf-dist/source/generic/vntex/tests/vnr-sample.tex b/Master/texmf-dist/source/generic/vntex/tests/vnr-sample.tex
new file mode 100644
index 00000000000..3997f4b3d24
--- /dev/null
+++ b/Master/texmf-dist/source/generic/vntex/tests/vnr-sample.tex
@@ -0,0 +1,115 @@
+% Copyright 2003-2005 Han The Thanh <hanthethanh@gmx.net>.
+% This file is part of vntex.  License: LPPL, version 1.3 or newer,
+% according to http://www.latex-project.org/lppl.txt
+
+\documentclass[sample]{vnsample}
+
+\HasDesignSizes
+
+\mapfile{vnrtext.map}
+\mapfile{vnrother.map}
+
+\begin{document}
+\section{vnb}
+\showCMfont{T5}{cmr}{b}{n}    {vnb10}    {N/A}
+
+\section{vnbx}
+\showCMfont{T5}{cmr}{bx}{n}   {vnbx5}    {N/A}
+\showCMfont{T5}{cmr}{bx}{n}   {vnbx6}    {N/A}
+\showCMfont{T5}{cmr}{bx}{n}   {vnbx7}    {N/A}
+\showCMfont{T5}{cmr}{bx}{n}   {vnbx8}    {N/A}
+\showCMfont{T5}{cmr}{bx}{n}   {vnbx9}    {N/A}
+\showCMfont{T5}{cmr}{bx}{n}   {vnbx10}   {N/A}
+\showCMfont{T5}{cmr}{bx}{n}   {vnbx12}   {N/A}
+
+\section{vnbxsl}
+\showCMfont{T5}{cmr}{bx}{sl}  {vnbxsl10} {N/A}
+
+\section{vnbxit}
+\showCMfont{T5}{cmr}{bx}{it}  {vnbxti10} {N/A}
+
+\section{vncsc}
+\showCMfont{T5}{cmr}{m}{sc}   {vncsc10}  {N/A}
+
+\section{vndunh}
+\showCMfont{T5}{cmdh}{m}{n}   {vndunh10} {N/A}
+
+\section{vnff}
+\showCMfont{T5}{cmfr}{m}{n}   {vnff10}   {N/A}
+
+\section{vnfi}
+\showCMfont{T5}{cmfr}{m}{it}  {vnfi10}   {N/A}
+
+\section{vnfib}
+\showCMfont{T5}{cmfib}{bx}{n} {vnfib8}   {N/A}
+
+\section{vnitt}
+\showCMfont{T5}{cmtt}{m}{it}  {vnitt10}  {N/A}
+
+\section{vnr}
+\showCMfont{T5}{cmr}{m}{n}    {vnr5}     {N/A}
+\showCMfont{T5}{cmr}{m}{n}    {vnr6}     {N/A}
+\showCMfont{T5}{cmr}{m}{n}    {vnr7}     {N/A}
+\showCMfont{T5}{cmr}{m}{n}    {vnr8}     {N/A}
+\showCMfont{T5}{cmr}{m}{n}    {vnr9}     {N/A}
+\showCMfont{T5}{cmr}{m}{n}    {vnr10}    {N/A}
+\showCMfont{T5}{cmr}{m}{n}    {vnr12}    {N/A}
+\showCMfont{T5}{cmr}{m}{n}    {vnr17}    {N/A}
+
+\section{vnsl}
+\showCMfont{T5}{cmr}{m}{sl}   {vnsl8}    {N/A}
+\showCMfont{T5}{cmr}{m}{sl}   {vnsl9}    {N/A}
+\showCMfont{T5}{cmr}{m}{sl}   {vnsl10}   {N/A}
+\showCMfont{T5}{cmr}{m}{sl}   {vnsl12}   {N/A}
+
+\section{vnsltt}
+\showCMfont{T5}{cmtt}{m}{sl}  {vnsltt10} {N/A}
+
+\section{vnss}
+\showCMfont{T5}{cmss}{m}{n}   {vnss8}    {N/A}
+\showCMfont{T5}{cmss}{m}{n}   {vnss9}    {N/A}
+\showCMfont{T5}{cmss}{m}{n}   {vnss10}   {N/A}
+\showCMfont{T5}{cmss}{m}{n}   {vnss12}   {N/A}
+\showCMfont{T5}{cmss}{m}{n}   {vnss17}   {N/A}
+
+\section{vnssbx}
+\showCMfont{T5}{cmss}{bx}{n}  {vnssbx10} {N/A}
+
+\section{vnssdc}
+\showCMfont{T5}{cmss}{dc}{n}  {vnssdc10} {N/A}
+
+\section{vnssi}
+\showCMfont{T5}{cmss}{m}{it}  {vnssi8}   {N/A}
+\showCMfont{T5}{cmss}{m}{it}  {vnssi9}   {N/A}
+\showCMfont{T5}{cmss}{m}{it}  {vnssi10}  {N/A}
+\showCMfont{T5}{cmss}{m}{it}  {vnssi12}  {N/A}
+\showCMfont{T5}{cmss}{m}{it}  {vnssi17}  {N/A}
+
+\section{vnssq}
+\showCMfont{T5}{cmss}{q}{n}   {vnssq8}   {N/A}
+
+\section{vnssqi}
+\showCMfont{T5}{cmss}{q}{it}  {vnssqi8}  {N/A}
+
+\section{vntcsc}
+\showCMfont{T5}{cmtt}{m}{sc}  {vntcsc10} {N/A}
+
+\section{vnti}
+\showCMfont{T5}{cmr}{m}{it}   {vnti7}    {N/A}
+\showCMfont{T5}{cmr}{m}{it}   {vnti8}    {N/A}
+\showCMfont{T5}{cmr}{m}{it}   {vnti9}    {N/A}
+\showCMfont{T5}{cmr}{m}{it}   {vnti10}   {N/A}
+\showCMfont{T5}{cmr}{m}{it}   {vnti12}   {N/A}
+
+\section{vntt}
+\showCMfont{T5}{cmtt}{m}{n}   {vntt8}    {N/A}
+\showCMfont{T5}{cmtt}{m}{n}   {vntt9}    {N/A}
+\showCMfont{T5}{cmtt}{m}{n}   {vntt10}   {N/A}
+\showCMfont{T5}{cmtt}{m}{n}   {vntt12}   {N/A}
+
+\section{vnu}
+\showCMfont{T5}{cmr}{m}{u}    {vnu10}    {N/A}
+
+\section{vnvtt}
+\showCMfont{T5}{cmvtt}{m}{n}  {vnvtt10}  {N/A}
+\end{document}
diff --git a/Master/texmf-dist/source/generic/vntex/tests/vnr-test.tex b/Master/texmf-dist/source/generic/vntex/tests/vnr-test.tex
new file mode 100644
index 00000000000..af0b05850f2
--- /dev/null
+++ b/Master/texmf-dist/source/generic/vntex/tests/vnr-test.tex
@@ -0,0 +1,35 @@
+% Copyright 2003-2005 Han The Thanh <hanthethanh@gmx.net>.
+% This file is part of vntex.  License: LPPL, version 1.3 or newer,
+% according to http://www.latex-project.org/lppl.txt
+
+\documentclass[test]{vnsample}
+
+\begin{document}
+\begin{shortsample}
+\shorttext{T5}{cmdh}{m}{n}   {vndunh10}                  {N/A}
+\shorttext{T5}{cmfr}{m}{it}  {vnfi10}                    {N/A}
+\shorttext{T5}{cmfr}{m}{n}   {vnff10}                    {N/A}
+\shorttext{T5}{cmfib}{m}{n}  {vnfib8}                    {N/A}
+\shorttext{T5}{cmr}{b}{n}    {vnb10}                     {N/A}
+\shorttext{T5}{cmr}{bx}{it}  {vnbxti10}                  {N/A}
+\shorttext{T5}{cmr}{bx}{n}   {vnbx\{5,6,7,8,9,10,12\}}   {N/A}
+\shorttext{T5}{cmr}{bx}{sl}  {vnbxsl10}                  {N/A}
+\shorttext{T5}{cmr}{m}{it}   {vnti\{7,8,9,10,12\}}       {N/A}
+\shorttext{T5}{cmr}{m}{n}    {vnr\{5,6,7,8,9,10,12,17\}} {N/A}
+\shorttext{T5}{cmr}{m}{sc}   {vncsc10}                   {N/A}
+\shorttext{T5}{cmr}{m}{sl}   {vnsl\{8,9,10,12\}}         {N/A}
+\shorttext{T5}{cmr}{m}{ui}   {vnu10}                     {N/A}
+\shorttext{T5}{cmss}{bx}{n}  {vnssbx10}                  {N/A}
+\shorttext{T5}{cmss}{sbc}{n} {vnssdc10}                  {N/A}
+\shorttext{T5}{cmss}{m}{sl}  {vnssi\{8,9,10,12,17\}}     {N/A}
+\shorttext{T5}{cmss}{m}{n}   {vnss\{8,9,10,12,17\}}      {N/A}
+\shorttext{T5}{cmssq}{m}{sl} {vnssqi8}                   {N/A}
+\shorttext{T5}{cmssq}{m}{n}  {vnssq8}                    {N/A}
+\shorttext{T5}{cmtt}{m}{it}  {vnitt10}                   {N/A}
+\shorttext{T5}{cmtt}{m}{n}   {vntt\{8,9,10,12\}}         {N/A}
+\shorttext{T5}{cmtt}{m}{sc}  {vntcsc10}                  {N/A}
+\shorttext{T5}{cmtt}{m}{sl}  {vnsltt10}                  {N/A}
+\shorttext{T5}{cmvtt}{m}{n}  {vnvtt10}                   {N/A}
+\end{shortsample}
+\end{document}
+
diff --git a/Master/texmf-dist/source/generic/vntex/tests/vnsample.cls b/Master/texmf-dist/source/generic/vntex/tests/vnsample.cls
new file mode 100644
index 00000000000..7e9de68150f
--- /dev/null
+++ b/Master/texmf-dist/source/generic/vntex/tests/vnsample.cls
@@ -0,0 +1,363 @@
+% -*-LaTeX-*-
+% Copyright 2003-2006 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
+
+\ifx\documentclass\undefined\endinput\fi
+
+\newif\ifbookmarks
+
+\ProvidesClass{vnsample}[2005/08/27]
+\NeedsTeXFormat{LaTeX2e}
+
+\LoadClass[a4paper]{article}
+
+\RequirePackage{ifpdf}
+
+\ifpdf\IfFileExists{cmap.sty}{\RequirePackage{cmap}}{
+\ClassWarningNoLine{vnsample}{I can't find the file `cmap.sty'.\MessageBreak
+The search tool in your PDF browser will miss many\MessageBreak
+words containing Vietnamese characters}}\fi
+
+\RequirePackage[viscii]{vietnam}
+\RequirePackage{multicol}
+\RequirePackage{geometry}
+\RequirePackage{array}
+\RequirePackage{fancyhdr}
+
+\DeclareOption{sample}{
+  \geometry{a4paper,nofoot,left=1cm,right=1cm,top=2cm,bottom=1cm}
+  \pagestyle{fancy}
+  \rhead{\thepage}
+  \lhead{\textrm{\rightmark}}\cfoot{}\lfoot{}\rfoot{}
+  \raggedright
+  \parindent0pt
+  \lineskiplimit -100pt
+  \bookmarkstrue
+}
+
+\DeclareOption{test}{
+  \geometry{a4paper,landscape,top=1cm,bottom=1cm,left=1cm,right=1cm,%
+    nofoot,nohead}
+  \pagestyle{empty}
+  \bookmarksfalse
+  \advance\oddsidemargin -7mm \evensidemargin=\oddsidemargin
+  \hbadness=10000\relax\hfuzz=\maxdimen
+  \AtBeginDocument{\extrarowheight=5pt}
+}
+
+\ProcessOptions
+
+\newdimen\dimenA
+\newbox\boxA
+\newbox\boxB
+
+\def\vnchars{%
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+% \break
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar 
+\dochar 
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar 
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar �
+\dochar 
+\dochar �
+\dochar 
+\dochar 
+\par
+}
+
+\def\dochar #1 {%
+    #1\kern.1em\penalty0%
+}
+
+\def\SL{-Slant}
+\def\EMPH#1{\textbf{\textit{#1}}}
+
+\long\def\vntext{%
+\centerline{\textbf{Ch� Ph�o}}
+\vskip -.5\baselineskip
+\rightline{\textsc{--- Nam Cao}}
+H�n v�a �i v�a ch�i. Bao gi� c�ng th�, c� r��u xong l� h�n ch�i. B�t �u
+ch�i tr�i. C� h� g�? Tr�i c� c�a ri�ng nh� n�o? R�i h�n ch�i �i. Th�
+c�ng ch�ng sao: �i l� t�t c� nh�ng ch�ng l� ai. T�c m�nh h�n ch�i ngay t�t
+c� l�ng V� ��i. Nh�ng c� l�ng V� ��i ai c�ng nh�, \textit{``Ch�c n� tr�
+m�nh ra!''} Kh�ng ai l�n ti�ng c�. T�c th�t! �! Th� n�y th� t�c th�t! T�c
+ch�t �i ���c m�t! �� th�, h�n ph�i ch�i cha ��a n�o kh�ng ch�i nhau v�i
+h�n. Nh�ng c�ng kh�ng ai ra �i�u. M� ki�p! Th� th� c� ph� r��u kh�ng? Th�
+th� c� kh� h�n kh�ng? Kh�ng bi�t ��a ch�t m� n�o �� ra th�n h�n cho h�n kh�
+�n n�ng n�i n�y? A ha! Ph�i �y, h�n c� th� m� ch�i, h�n ch�i ��a ch�t m�
+n�o �� ra th�n h�n, �� ra c�i th�ng \EMPH{Ch� Ph�o}! H�n nghi�n r�ng v�o
+m� ch�i c�i ��a �� �� ra Ch� Ph�o. Nh�ng m� bi�t ��a n�o �� �� ra
+Ch� Ph�o? C� tr�i m� bi�t! H�n kh�ng bi�t, c� l�ng V� ��i c�ng kh�ng ai
+bi�t.
+
+M�t anh �i th� �ng l߽n, m�t bu�i s�ng tinh s߽ng �� th�y h�n
+tr�n tru�ng v� x�m ng�t trong m�t v�y ��p � b�n m�t l� g�ch b�
+kh�ng, anh ta r߾c l�y v� �em v� cho m�t ng߶i ��n b� g�a m�.
+Ng߶i ��n b� g�a m� n�y b�n h�n cho m�t b�c ph� c�i kh�ng con, v�
+khi b�c ph� c�i n�y ch�t th� h�n b� v�, h�t �i � cho nh� n�y l�i �i
+� cho nh� n�. N�m hai m߽i tu�i, h�n l�m canh �i�n cho �ng l� Ki�n,
+b�y gi� c� b� Ki�n, �n ti�n ch� l�ng. H�nh nh� c� m�y l�n b� ba nh�
+�ng l�, c�n tr� l�m m� l�i hay �m l�ng, b�t h�n b�p ch�n, hay xoa
+b�ng, �m l�ng g� �y. Ng߶i ta b�o �ng l� ra ��nh th� h�ch d�ch,
+c� l�ng ph�i s�, m� v� nh� th� l�i s� c�i b� ba c�n tr� n�y. Ng߶i
+b� �y ph�p ph�p, m� b� �y h�y h�y, m� �ng l� th� hay �au l�ng l�m;
+nh�ng ng߶i c� b�nh �au l�ng hay s� v� m� ch�a �i l� kho� ghen.
+C� ng߶i b�o �ng l� ghen v�i anh canh �i�n kho� m�nh m� s� b� ba
+kh�ng d�m n�i. C� ng߶i th� b�o anh canh �i�n �y ���c b� ba quy�n
+thu quy�n b� trong nh� tin c�n n�n l�y tr�m ti�n tr�m th�c nhi�u.
+M�i ng߶i n�i m�t c�ch. Ch�ng bi�t ��u m� l�n. Ch� bi�t m�t h�m
+Ch� b� ng߶i ta gi�i huy�n r�i bi�t t�m �n b�y, t�m n�m r�i m�t
+h�m, h�n l�i l� l� � ��u l�n v�. H�n v� l�p n�y tr�ng kh�c
+h�n, m�i �u ch�ng ai bi�t h�n l� ai. Tr�ng �c nh� th�ng s�ng
+c�! C�i �u th� tr�c l�c, c�i r�ng c�o tr�ng h�n, c�i m�t th� �en
+m� r�t c�ng c�ng, hai m�t g߶m g߶m tr�ng g�m ch�t! H�n m�c qu�n
+�o n�i �en v�i �o T�y v�ng. C�i ng�c phanh, �y nh�ng n�t ch�m tr�
+r�ng, ph��ng v�i m�t �ng th�y t߾ng c�m chu�, c� hai c�nh tay c�ng
+th�. Tr�ng g�m ch�t!
+}
+
+\def\mksample#1{%
+    \leftline{\normalsize\bf\fbox{line spacing #1}\hrulefill}
+    \vskip 5pt
+    \ifnum\pdftexversion<130\relax
+      \dimenA=\pdffontsize\font pt\relax
+    \else
+      \dimenA=\pdffontsize\font
+    \fi
+    \setbox\boxA=\vbox{%
+        \baselineskip=#1\dimenA
+        \parskip=.5\baselineskip
+        \noindent\vntext\par}%
+    \setbox\boxB=\vsplit\boxA to 3in
+    \nobreak
+    \box\boxB
+    \vskip 10pt
+}
+
+\def\showfontsize#1#2#3{{%
+    \leftline{\large\bf\fbox{#2}\hrulefill}
+    \nobreak
+    \font\f=#1 at #2\f
+    \baselineskip=#3
+    \noindent
+    \vnchars\par
+    \vskip .5\baselineskip
+}}
+
+\def\mkfontname#1#2#3{\hbox{%
+    \hbox to .25\textwidth{NFSS:\kern1em \texttt{#1}\hss}%
+    \hbox to .25\textwidth{TFM:\kern1em \texttt{#2}\hss}%
+    PostScript:\kern1em \texttt{#3}}}
+
+
+\def\HasDesignSizes{\let\hasdesignsizes\relax}
+
+\def\getdesignsize#1{\xdef\designsize{}%
+  \expandafter\@tfor\expandafter\x\expandafter:\expandafter=#1
+  \do{\ifcat\x0\edef\designsize{\designsize\x}\fi%
+    \if\x-\def\designsize{}\fi}}
+
+
+\def\showletters#1#2#3#4#5#6{%
+    \ifx\hasdesignsizes\undefined
+      \subsection{#2-#3-#4}{#5}%
+    \else
+      \getdesignsize{#5}%
+      \subsection{#2-#3-#4 (\designsize pt)}{#5}%
+    \fi
+    \markright{\mkfontname{#1/#2/#3/#4}{#5}{#6}}
+    \showfontsize{#5}{18pt}{27pt}
+    \showfontsize{#5}{36pt}{54pt}
+    \showfontsize{#5}{72pt}{108pt}
+    \clearpage
+}
+
+\def\showCMfont#1#2#3#4#5#6{
+    \showletters{#1}{#2}{#3}{#4}{#5}{#6}
+    \clearpage
+    \markright{#5}
+    \subsection{Text}{#5-text}%
+    \showtextsize{%
+        \font\f=#5\f 
+        \let\EMPH=\relax 
+        \let\textit=\relax
+        \let\textsc=\relax}
+}
+
+\def\showtextsize#1{
+    \columnsep=20pt
+    \columnseprule=.4pt
+    \begin{multicols}{2}
+    #1
+    \mksample{1}
+    \mksample{1.2}
+    \mksample{1.4}
+    \mksample{1.1}
+    \mksample{1.3}
+    \mksample{1.5}
+    \end{multicols}
+    \clearpage
+}
+
+\def\showtext#1#2#3#4#5#6{\subsection{Text}{#5-text}%
+    \markright{#6 at 8pt}\showtextsize{\fontsize{8pt}{8pt}\usefont{#1}{#2}{#3}{#4}}
+    \markright{#6 at 10pt}\showtextsize{\fontsize{10pt}{10pt}\usefont{#1}{#2}{#3}{#4}}
+    \markright{#6 at 12pt}\showtextsize{\fontsize{12pt}{12pt}\usefont{#1}{#2}{#3}{#4}}
+    \clearpage
+}
+
+\def\samplesentence{%
+     H�n nghi�n r�ng v�o m� ch�i c�i ��a �� �� ra Ch� Ph�o l�ng V� ��i}
+
+\newenvironment{shortsample}
+    {\normalfont\fontencoding{OT1}\ttfamily \selectfont
+     \begin{tabular*}{\textwidth}{llll<{\samplesentence}}
+     NFSS&TFM&PostScript&\multicolumn{1}{l}{Sample}\\ \hline
+    }
+    {\end{tabular*}}
+
+\def\shorttext#1#2#3#4#5#6{%
+    #1/#2/#3/#4 & #5 & #6 & \normalsize\usefont{#1}{#2}{#3}{#4}\\}
+
+%%%\endinput
+
+\ifbookmarks\RequirePackage{hyperref}
+  \def\section#1{\gdef\currsec{#1}\hypertarget{#1}{}\pdfbookmark[0]{#1}{#1}}
+%\subsection{<Text>}{<label>}
+  \def\subsection#1#2{\def\target{\currsec-#2}%
+    \hypertarget{\target}{}\pdfbookmark[1]{#1}{\target}}
+\fi
+
+
+\def\mapfile#1{\ifpdf\IfFileExists{./useinternalmap}{\pdfmapfile{=#1.map}}{}\fi}
+\IfFileExists{./nocompress}{\pdfcompresslevel0 }{\pdfcompresslevel9 }
+
+% Local Variables:
+% coding: viscii
+% End:
diff --git a/Master/texmf-dist/source/generic/vntex/tests/vntopia-sample.tex b/Master/texmf-dist/source/generic/vntex/tests/vntopia-sample.tex
new file mode 100644
index 00000000000..1144edc21f9
--- /dev/null
+++ b/Master/texmf-dist/source/generic/vntex/tests/vntopia-sample.tex
@@ -0,0 +1,20 @@
+% Copyright 2003-2005 Han The Thanh <hanthethanh@gmx.net>.
+% This file is part of vntex.  License: LPPL, version 1.3 or newer,
+% according to http://www.latex-project.org/lppl.txt
+
+\documentclass[sample]{vnsample}
+
+\mapfile{vntopia}
+
+\begin{document}
+\section{VnUtopia-Regular}
+\showletters{T5}{put}{m}{n}  {putr8v}   {Vntopia-Regular}
+\showletters{T5}{put}{m}{it} {putri8v}  {Vntopia-Italic}
+\showletters{T5}{put}{m}{sl} {putro8v}  {Vntopia-Regular}
+\showletters{T5}{put}{b}{n}  {putb8v}   {Vntopia-Bold}
+\showletters{T5}{put}{b}{it} {putbi8v}  {Vntopia-BoldItalic}
+\showletters{T5}{put}{b}{sl} {putbo8v}  {Vntopia-Bold}
+\showletters{T5}{put}{m}{sc} {putrc8v}  {N/A}
+\showletters{T5}{put}{b}{sc} {putbc8v}  {N/A}
+\showtext   {T5}{put}{m}{n}  {putr8v}   {Vntopia-Regular}
+\end{document}
diff --git a/Master/texmf-dist/source/generic/vntex/tests/vntopia-test.tex b/Master/texmf-dist/source/generic/vntex/tests/vntopia-test.tex
new file mode 100644
index 00000000000..b9076eb7dc6
--- /dev/null
+++ b/Master/texmf-dist/source/generic/vntex/tests/vntopia-test.tex
@@ -0,0 +1,20 @@
+% Copyright 2003-2005 Han The Thanh <hanthethanh@gmx.net>.
+% This file is part of vntex.  License: LPPL, version 1.3 or newer,
+% according to http://www.latex-project.org/lppl.txt
+
+\documentclass[test]{vnsample}
+
+\mapfile{vntopia}
+
+\begin{document}
+\begin{shortsample}
+\shorttext{T5}{put}{m}{n}  {putr8v}   {Vntopia-Regular}
+\shorttext{T5}{put}{m}{it} {putri8v}  {Vntopia-Italic}
+\shorttext{T5}{put}{m}{sl} {putro8v}  {Vntopia-Regular}
+\shorttext{T5}{put}{b}{n}  {putb8v}   {Vntopia-Bold}
+\shorttext{T5}{put}{b}{it} {putbi8v}  {Vntopia-BoldItalic}
+\shorttext{T5}{put}{b}{sl} {putbo8v}  {Vntopia-Bold}
+\shorttext{T5}{put}{m}{sc} {putrc8v}  {N/A}
+\shorttext{T5}{put}{b}{sc} {putbc8v}  {N/A}
+\end{shortsample}
+\end{document}
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