summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/fonts
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-10-05 00:40:03 +0000
committerKarl Berry <karl@freefriends.org>2017-10-05 00:40:03 +0000
commit1464527159aa1d2463f505eacc5e09aea1cbcd00 (patch)
treedfa283928d19b529d5a06f3edab3ba5ba1329eb8 /Master/texmf-dist/source/fonts
parent7071967abdc4ecd0ebbbb1bab886b78d0e3e4aeb (diff)
fonts-tlwg (4oct17)
git-svn-id: svn://tug.org/texlive/trunk@45469 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/fonts')
-rw-r--r--Master/texmf-dist/source/fonts/fonts-tlwg/COPYING24
-rw-r--r--Master/texmf-dist/source/fonts/fonts-tlwg/ChangeLog76
-rw-r--r--Master/texmf-dist/source/fonts/fonts-tlwg/INSTALL320
-rw-r--r--Master/texmf-dist/source/fonts/fonts-tlwg/Makefile.am9
-rw-r--r--Master/texmf-dist/source/fonts/fonts-tlwg/Makefile.in29
-rw-r--r--Master/texmf-dist/source/fonts/fonts-tlwg/NEWS8
-rw-r--r--Master/texmf-dist/source/fonts/fonts-tlwg/VERSION1
-rw-r--r--Master/texmf-dist/source/fonts/fonts-tlwg/aclocal.m434
-rwxr-xr-xMaster/texmf-dist/source/fonts/fonts-tlwg/build-aux/git-version-gen29
-rwxr-xr-xMaster/texmf-dist/source/fonts/fonts-tlwg/configure20
-rw-r--r--Master/texmf-dist/source/fonts/fonts-tlwg/configure.ac4
-rw-r--r--Master/texmf-dist/source/fonts/fonts-tlwg/fontconfig/Makefile.in4
-rw-r--r--Master/texmf-dist/source/fonts/fonts-tlwg/latex/Makefile.in4
-rw-r--r--Master/texmf-dist/source/fonts/fonts-tlwg/latex/README.latex17
-rw-r--r--Master/texmf-dist/source/fonts/fonts-tlwg/latex/examples/Makefile.am7
-rw-r--r--Master/texmf-dist/source/fonts/fonts-tlwg/latex/examples/Makefile.in12
-rw-r--r--Master/texmf-dist/source/fonts/fonts-tlwg/latex/examples/testsans.tex37
-rw-r--r--Master/texmf-dist/source/fonts/fonts-tlwg/latex/examples/testscaled-120.tex734
-rw-r--r--Master/texmf-dist/source/fonts/fonts-tlwg/latex/examples/testscaled-65.tex734
-rw-r--r--Master/texmf-dist/source/fonts/fonts-tlwg/latex/fonts-tlwg.sty59
-rw-r--r--Master/texmf-dist/source/fonts/fonts-tlwg/latex/lthgaruda.fd27
-rw-r--r--Master/texmf-dist/source/fonts/fonts-tlwg/latex/lthkinnari.fd31
-rw-r--r--Master/texmf-dist/source/fonts/fonts-tlwg/latex/lthlaksaman.fd27
-rw-r--r--Master/texmf-dist/source/fonts/fonts-tlwg/latex/lthloma.fd27
-rw-r--r--Master/texmf-dist/source/fonts/fonts-tlwg/latex/lthnorasi.fd31
-rw-r--r--Master/texmf-dist/source/fonts/fonts-tlwg/latex/lthpurisa.fd27
-rw-r--r--Master/texmf-dist/source/fonts/fonts-tlwg/latex/lthsawasdee.fd27
-rw-r--r--Master/texmf-dist/source/fonts/fonts-tlwg/latex/lthttype.fd27
-rw-r--r--Master/texmf-dist/source/fonts/fonts-tlwg/latex/lthttypist.fd27
-rw-r--r--Master/texmf-dist/source/fonts/fonts-tlwg/latex/lthumpush.fd31
-rw-r--r--Master/texmf-dist/source/fonts/fonts-tlwg/latex/lthwaree.fd27
-rw-r--r--Master/texmf-dist/source/fonts/fonts-tlwg/nectec/Makefile.in4
-rw-r--r--Master/texmf-dist/source/fonts/fonts-tlwg/nf/Makefile.in4
-rw-r--r--Master/texmf-dist/source/fonts/fonts-tlwg/scripts/Makefile.in4
-rw-r--r--Master/texmf-dist/source/fonts/fonts-tlwg/sipa/Makefile.in4
-rw-r--r--Master/texmf-dist/source/fonts/fonts-tlwg/tests/Makefile.in4
-rw-r--r--Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/Makefile.in4
37 files changed, 2144 insertions, 351 deletions
diff --git a/Master/texmf-dist/source/fonts/fonts-tlwg/COPYING b/Master/texmf-dist/source/fonts/fonts-tlwg/COPYING
index 724bfe4111f..c0d005d344d 100644
--- a/Master/texmf-dist/source/fonts/fonts-tlwg/COPYING
+++ b/Master/texmf-dist/source/fonts/fonts-tlwg/COPYING
@@ -171,3 +171,27 @@ License:
or Bitstream Inc., respectively. For further information, contact:
fonts at gnome dot org.
+
+* LaTeX Supports
+
+LaTeX package "fonts-tlwg" was moved from the thailatex package, so that
+fonts are maintained and generated from a single place. Therefore,
+the original copyright and license are retained here.
+
+Copyright:
+ Copyright (C) 1999 National Electronics and Computer Technology Center
+ (NECTEC), Thailand. All rights reserved.
+
+License:
+ It 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 2005/12/01 or later.
+
+ This work has the LPPL maintenance status "maintained".
+
+ The Current Maintainer of this work is Theppitak Karoonboonyanan.
+
diff --git a/Master/texmf-dist/source/fonts/fonts-tlwg/ChangeLog b/Master/texmf-dist/source/fonts/fonts-tlwg/ChangeLog
index e255e62fd23..a2282c0c4ef 100644
--- a/Master/texmf-dist/source/fonts/fonts-tlwg/ChangeLog
+++ b/Master/texmf-dist/source/fonts/fonts-tlwg/ChangeLog
@@ -1,3 +1,79 @@
+2017-10-03 Theppitak Karoonboonyanan <theppitak@gmail.com>
+
+ * NEWS:
+ === Version 0.6.4 ===
+
+2017-10-03 Theppitak Karoonboonyanan <theppitak@gmail.com>
+
+ * COPYING:
+ - Add copyright & license info for LaTeX stuffs.
+
+2017-09-27 Theppitak Karoonboonyanan <theppitak@gmail.com>
+
+ LaTeX: include scaling tests in dist tarball.
+
+ * latex/examples/Makefile.am:
+ - Append testscaled-120.tex and testscaled-65.tex to EXAMPLES list
+
+2017-09-27 Abhabongse Janthong <abhabongse@gmail.com>
+
+ LaTeX: Add font scaling option
+
+ * latex/fonts-tlwg.sty:
+ - Require package xkeyval and use \DeclareOptionX instead of
+ \DeclareOption to allow options with value
+ - Also use \ProcessOptionsX instead of \ProcessOptions
+ - Add option 'scale' and define \fontstlwg@scale command from
+ its value
+ * latex/lthgaruda.fd:
+ * latex/lthkinnari.fd:
+ * latex/lthlaksaman.fd:
+ * latex/lthloma.fd:
+ * latex/lthnorasi.fd:
+ * latex/lthpurisa.fd:
+ * latex/lthsawasdee.fd:
+ * latex/lthttype.fd:
+ * latex/lthttypist.fd:
+ * latex/lthumpush.fd:
+ * latex/lthwaree.fd:
+ - Check if \fontstlwg@scale has been defined and use it
+ as scaling factor in \DeclareFontShape
+ * latex/README.latex:
+ - Document the new 'scale' option
+ * latex/examples/testscaled-120.tex:
+ * latex/examples/testscaled-65.tex:
+ - Add test docs
+
+2017-09-04 Abhabongse Janthong <abhabongse@gmail.com>
+
+ LaTeX: Fix familydefault upon switching between scripts
+
+ * latex/fonts-tlwg.sty:
+ - Also redefine \familydefault in \thaitext and \latintext
+ * latex/examples/Makefile.am, +latex/examples/testsans.tex:
+ - Add test doc with \normalfont macro
+
+ https://github.com/tlwg/fonts-tlwg/issues/1
+
+2016-12-15 Theppitak Karoonboonyanan <theppitak@gmail.com>
+
+ Include git-version-gen in tarball
+
+ * Makefile.am:
+ - Add build-aux/git-version-gen to EXTRA_DIST.
+
+2016-07-11 Theppitak Karoonboonyanan <theppitak@gmail.com>
+
+ Use versioning based on Git snapshot.
+
+ * Makefile.am:
+ - Add dist-hook to generate VERSION file on tarball generation.
+ * +build-aux/git-version-gen:
+ - Add script to generate version based on 'git describe'
+ if in git tree, or using VERSION file if in release tarball.
+ * configure.ac:
+ - Call git-version-gen to get package version.
+
2016-06-09 Theppitak Karoonboonyanan <theppitak@gmail.com>
* configure.ac, NEWS:
diff --git a/Master/texmf-dist/source/fonts/fonts-tlwg/INSTALL b/Master/texmf-dist/source/fonts/fonts-tlwg/INSTALL
index 2099840756e..8865734f81b 100644
--- a/Master/texmf-dist/source/fonts/fonts-tlwg/INSTALL
+++ b/Master/texmf-dist/source/fonts/fonts-tlwg/INSTALL
@@ -1,8 +1,8 @@
Installation Instructions
*************************
-Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation,
-Inc.
+ Copyright (C) 1994-1996, 1999-2002, 2004-2016 Free Software
+Foundation, Inc.
Copying and distribution of this file, with or without modification,
are permitted in any medium without royalty provided the copyright
@@ -12,97 +12,96 @@ without warranty of any kind.
Basic Installation
==================
- Briefly, the shell command `./configure && make && make install'
+ Briefly, the shell command './configure && make && make install'
should configure, build, and install this package. The following
-more-detailed instructions are generic; see the `README' file for
+more-detailed instructions are generic; see the 'README' file for
instructions specific to this package. Some packages provide this
-`INSTALL' file but do not implement all of the features documented
+'INSTALL' file but do not implement all of the features documented
below. The lack of an optional feature in a given package is not
necessarily a bug. More recommendations for GNU packages can be found
in *note Makefile Conventions: (standards)Makefile Conventions.
- The `configure' shell script attempts to guess correct values for
+ The 'configure' shell script attempts to guess correct values for
various system-dependent variables used during compilation. It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions. Finally, it creates a shell script `config.status' that
+those values to create a 'Makefile' in each directory of the package.
+It may also create one or more '.h' files containing system-dependent
+definitions. Finally, it creates a shell script 'config.status' that
you can run in the future to recreate the current configuration, and a
-file `config.log' containing compiler output (useful mainly for
-debugging `configure').
+file 'config.log' containing compiler output (useful mainly for
+debugging 'configure').
- It can also use an optional file (typically called `config.cache'
-and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring. Caching is
-disabled by default to prevent problems with accidental use of stale
-cache files.
+ It can also use an optional file (typically called 'config.cache' and
+enabled with '--cache-file=config.cache' or simply '-C') that saves the
+results of its tests to speed up reconfiguring. Caching is disabled by
+default to prevent problems with accidental use of stale cache files.
If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
+to figure out how 'configure' could check whether to do them, and mail
+diffs or instructions to the address given in the 'README' so they can
be considered for the next release. If you are using the cache, and at
-some point `config.cache' contains results you don't want to keep, you
+some point 'config.cache' contains results you don't want to keep, you
may remove or edit it.
- The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'. You need `configure.ac' if
-you want to change it or regenerate `configure' using a newer version
-of `autoconf'.
+ The file 'configure.ac' (or 'configure.in') is used to create
+'configure' by a program called 'autoconf'. You need 'configure.ac' if
+you want to change it or regenerate 'configure' using a newer version of
+'autoconf'.
The simplest way to compile this package is:
- 1. `cd' to the directory containing the package's source code and type
- `./configure' to configure the package for your system.
+ 1. 'cd' to the directory containing the package's source code and type
+ './configure' to configure the package for your system.
- Running `configure' might take a while. While running, it prints
+ Running 'configure' might take a while. While running, it prints
some messages telling which features it is checking for.
- 2. Type `make' to compile the package.
+ 2. Type 'make' to compile the package.
- 3. Optionally, type `make check' to run any self-tests that come with
+ 3. Optionally, type 'make check' to run any self-tests that come with
the package, generally using the just-built uninstalled binaries.
- 4. Type `make install' to install the programs and any data files and
+ 4. Type 'make install' to install the programs and any data files and
documentation. When installing into a prefix owned by root, it is
recommended that the package be configured and built as a regular
- user, and only the `make install' phase executed with root
+ user, and only the 'make install' phase executed with root
privileges.
- 5. Optionally, type `make installcheck' to repeat any self-tests, but
+ 5. Optionally, type 'make installcheck' to repeat any self-tests, but
this time using the binaries in their final installed location.
This target does not install anything. Running this target as a
- regular user, particularly if the prior `make install' required
+ regular user, particularly if the prior 'make install' required
root privileges, verifies that the installation completed
correctly.
6. You can remove the program binaries and object files from the
- source code directory by typing `make clean'. To also remove the
- files that `configure' created (so you can compile the package for
- a different kind of computer), type `make distclean'. There is
- also a `make maintainer-clean' target, but that is intended mainly
+ source code directory by typing 'make clean'. To also remove the
+ files that 'configure' created (so you can compile the package for
+ a different kind of computer), type 'make distclean'. There is
+ also a 'make maintainer-clean' target, but that is intended mainly
for the package's developers. If you use it, you may have to get
all sorts of other programs in order to regenerate files that came
with the distribution.
- 7. Often, you can also type `make uninstall' to remove the installed
+ 7. Often, you can also type 'make uninstall' to remove the installed
files again. In practice, not all packages have tested that
uninstallation works correctly, even though it is required by the
GNU Coding Standards.
- 8. Some packages, particularly those that use Automake, provide `make
+ 8. Some packages, particularly those that use Automake, provide 'make
distcheck', which can by used by developers to test that all other
- targets like `make install' and `make uninstall' work correctly.
+ targets like 'make install' and 'make uninstall' work correctly.
This target is generally not run by end users.
Compilers and Options
=====================
Some systems require unusual options for compilation or linking that
-the `configure' script does not know about. Run `./configure --help'
+the 'configure' script does not know about. Run './configure --help'
for details on some of the pertinent environment variables.
- You can give `configure' initial values for configuration parameters
-by setting variables in the command line or in the environment. Here
-is an example:
+ You can give 'configure' initial values for configuration parameters
+by setting variables in the command line or in the environment. Here is
+an example:
./configure CC=c99 CFLAGS=-g LIBS=-lposix
@@ -113,21 +112,21 @@ Compiling For Multiple Architectures
You can compile the package for more than one kind of computer at the
same time, by placing the object files for each architecture in their
-own directory. To do this, you can use GNU `make'. `cd' to the
+own directory. To do this, you can use GNU 'make'. 'cd' to the
directory where you want the object files and executables to go and run
-the `configure' script. `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'. This
-is known as a "VPATH" build.
+the 'configure' script. 'configure' automatically checks for the source
+code in the directory that 'configure' is in and in '..'. This is known
+as a "VPATH" build.
- With a non-GNU `make', it is safer to compile the package for one
+ With a non-GNU 'make', it is safer to compile the package for one
architecture at a time in the source code directory. After you have
-installed the package for one architecture, use `make distclean' before
+installed the package for one architecture, use 'make distclean' before
reconfiguring for another architecture.
On MacOS X 10.5 and later systems, you can create libraries and
executables that work on multiple system types--known as "fat" or
-"universal" binaries--by specifying multiple `-arch' options to the
-compiler but only a single `-arch' option to the preprocessor. Like
+"universal" binaries--by specifying multiple '-arch' options to the
+compiler but only a single '-arch' option to the preprocessor. Like
this:
./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
@@ -136,105 +135,104 @@ this:
This is not guaranteed to produce working output in all cases, you
may have to build one architecture at a time and combine the results
-using the `lipo' tool if you have problems.
+using the 'lipo' tool if you have problems.
Installation Names
==================
- By default, `make install' installs the package's commands under
-`/usr/local/bin', include files under `/usr/local/include', etc. You
-can specify an installation prefix other than `/usr/local' by giving
-`configure' the option `--prefix=PREFIX', where PREFIX must be an
+ By default, 'make install' installs the package's commands under
+'/usr/local/bin', include files under '/usr/local/include', etc. You
+can specify an installation prefix other than '/usr/local' by giving
+'configure' the option '--prefix=PREFIX', where PREFIX must be an
absolute file name.
You can specify separate installation prefixes for
architecture-specific files and architecture-independent files. If you
-pass the option `--exec-prefix=PREFIX' to `configure', the package uses
+pass the option '--exec-prefix=PREFIX' to 'configure', the package uses
PREFIX as the prefix for installing programs and libraries.
Documentation and other data files still use the regular prefix.
In addition, if you use an unusual directory layout you can give
-options like `--bindir=DIR' to specify different values for particular
-kinds of files. Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them. In general, the
-default for these options is expressed in terms of `${prefix}', so that
-specifying just `--prefix' will affect all of the other directory
+options like '--bindir=DIR' to specify different values for particular
+kinds of files. Run 'configure --help' for a list of the directories
+you can set and what kinds of files go in them. In general, the default
+for these options is expressed in terms of '${prefix}', so that
+specifying just '--prefix' will affect all of the other directory
specifications that were not explicitly provided.
The most portable way to affect installation locations is to pass the
-correct locations to `configure'; however, many packages provide one or
+correct locations to 'configure'; however, many packages provide one or
both of the following shortcuts of passing variable assignments to the
-`make install' command line to change installation locations without
+'make install' command line to change installation locations without
having to reconfigure or recompile.
The first method involves providing an override variable for each
-affected directory. For example, `make install
+affected directory. For example, 'make install
prefix=/alternate/directory' will choose an alternate location for all
directory configuration variables that were expressed in terms of
-`${prefix}'. Any directories that were specified during `configure',
-but not in terms of `${prefix}', must each be overridden at install
-time for the entire installation to be relocated. The approach of
-makefile variable overrides for each directory variable is required by
-the GNU Coding Standards, and ideally causes no recompilation.
-However, some platforms have known limitations with the semantics of
-shared libraries that end up requiring recompilation when using this
-method, particularly noticeable in packages that use GNU Libtool.
-
- The second method involves providing the `DESTDIR' variable. For
-example, `make install DESTDIR=/alternate/directory' will prepend
-`/alternate/directory' before all installation names. The approach of
-`DESTDIR' overrides is not required by the GNU Coding Standards, and
+'${prefix}'. Any directories that were specified during 'configure',
+but not in terms of '${prefix}', must each be overridden at install time
+for the entire installation to be relocated. The approach of makefile
+variable overrides for each directory variable is required by the GNU
+Coding Standards, and ideally causes no recompilation. However, some
+platforms have known limitations with the semantics of shared libraries
+that end up requiring recompilation when using this method, particularly
+noticeable in packages that use GNU Libtool.
+
+ The second method involves providing the 'DESTDIR' variable. For
+example, 'make install DESTDIR=/alternate/directory' will prepend
+'/alternate/directory' before all installation names. The approach of
+'DESTDIR' overrides is not required by the GNU Coding Standards, and
does not work on platforms that have drive letters. On the other hand,
it does better at avoiding recompilation issues, and works well even
-when some directory options were not specified in terms of `${prefix}'
-at `configure' time.
+when some directory options were not specified in terms of '${prefix}'
+at 'configure' time.
Optional Features
=================
If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-
- Some packages pay attention to `--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System). The
-`README' should mention any `--enable-' and `--with-' options that the
+with an extra prefix or suffix on their names by giving 'configure' the
+option '--program-prefix=PREFIX' or '--program-suffix=SUFFIX'.
+
+ Some packages pay attention to '--enable-FEATURE' options to
+'configure', where FEATURE indicates an optional part of the package.
+They may also pay attention to '--with-PACKAGE' options, where PACKAGE
+is something like 'gnu-as' or 'x' (for the X Window System). The
+'README' should mention any '--enable-' and '--with-' options that the
package recognizes.
- For packages that use the X Window System, `configure' can usually
+ For packages that use the X Window System, 'configure' can usually
find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
+you can use the 'configure' options '--x-includes=DIR' and
+'--x-libraries=DIR' to specify their locations.
Some packages offer the ability to configure how verbose the
-execution of `make' will be. For these packages, running `./configure
+execution of 'make' will be. For these packages, running './configure
--enable-silent-rules' sets the default to minimal output, which can be
-overridden with `make V=1'; while running `./configure
+overridden with 'make V=1'; while running './configure
--disable-silent-rules' sets the default to verbose, which can be
-overridden with `make V=0'.
+overridden with 'make V=0'.
Particular systems
==================
- On HP-UX, the default C compiler is not ANSI C compatible. If GNU
-CC is not installed, it is recommended to use the following options in
+ On HP-UX, the default C compiler is not ANSI C compatible. If GNU CC
+is not installed, it is recommended to use the following options in
order to use an ANSI C compiler:
./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
and if that doesn't work, install pre-built binaries of GCC for HP-UX.
- HP-UX `make' updates targets which have the same time stamps as
-their prerequisites, which makes it generally unusable when shipped
-generated files such as `configure' are involved. Use GNU `make'
-instead.
+ HP-UX 'make' updates targets which have the same time stamps as their
+prerequisites, which makes it generally unusable when shipped generated
+files such as 'configure' are involved. Use GNU 'make' instead.
On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
-parse its `<wchar.h>' header file. The option `-nodtk' can be used as
-a workaround. If GNU CC is not installed, it is therefore recommended
-to try
+parse its '<wchar.h>' header file. The option '-nodtk' can be used as a
+workaround. If GNU CC is not installed, it is therefore recommended to
+try
./configure CC="cc"
@@ -242,26 +240,26 @@ and if that doesn't work, try
./configure CC="cc -nodtk"
- On Solaris, don't put `/usr/ucb' early in your `PATH'. This
+ On Solaris, don't put '/usr/ucb' early in your 'PATH'. This
directory contains several dysfunctional programs; working variants of
-these programs are available in `/usr/bin'. So, if you need `/usr/ucb'
-in your `PATH', put it _after_ `/usr/bin'.
+these programs are available in '/usr/bin'. So, if you need '/usr/ucb'
+in your 'PATH', put it _after_ '/usr/bin'.
- On Haiku, software installed for all users goes in `/boot/common',
-not `/usr/local'. It is recommended to use the following options:
+ On Haiku, software installed for all users goes in '/boot/common',
+not '/usr/local'. It is recommended to use the following options:
./configure --prefix=/boot/common
Specifying the System Type
==========================
- There may be some features `configure' cannot figure out
+ There may be some features 'configure' cannot figure out
automatically, but needs to determine by the type of machine the package
will run on. Usually, assuming the package is built to be run on the
-_same_ architectures, `configure' can figure that out, but if it prints
+_same_ architectures, 'configure' can figure that out, but if it prints
a message saying it cannot guess the machine type, give it the
-`--build=TYPE' option. TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name which has the form:
+'--build=TYPE' option. TYPE can either be a short name for the system
+type, such as 'sun4', or a canonical name which has the form:
CPU-COMPANY-SYSTEM
@@ -270,101 +268,101 @@ where SYSTEM can have one of these forms:
OS
KERNEL-OS
- See the file `config.sub' for the possible values of each field. If
-`config.sub' isn't included in this package, then this package doesn't
+ See the file 'config.sub' for the possible values of each field. If
+'config.sub' isn't included in this package, then this package doesn't
need to know the machine type.
If you are _building_ compiler tools for cross-compiling, you should
-use the option `--target=TYPE' to select the type of system they will
+use the option '--target=TYPE' to select the type of system they will
produce code for.
If you want to _use_ a cross compiler, that generates code for a
platform different from the build platform, you should specify the
"host" platform (i.e., that on which the generated programs will
-eventually be run) with `--host=TYPE'.
+eventually be run) with '--host=TYPE'.
Sharing Defaults
================
- If you want to set default values for `configure' scripts to share,
-you can create a site shell script called `config.site' that gives
-default values for variables like `CC', `cache_file', and `prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists. Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
+ If you want to set default values for 'configure' scripts to share,
+you can create a site shell script called 'config.site' that gives
+default values for variables like 'CC', 'cache_file', and 'prefix'.
+'configure' looks for 'PREFIX/share/config.site' if it exists, then
+'PREFIX/etc/config.site' if it exists. Or, you can set the
+'CONFIG_SITE' environment variable to the location of the site script.
+A warning: not all 'configure' scripts look for a site script.
Defining Variables
==================
Variables not defined in a site shell script can be set in the
-environment passed to `configure'. However, some packages may run
+environment passed to 'configure'. However, some packages may run
configure again during the build, and the customized values of these
variables may be lost. In order to avoid this problem, you should set
-them in the `configure' command line, using `VAR=value'. For example:
+them in the 'configure' command line, using 'VAR=value'. For example:
./configure CC=/usr/local2/bin/gcc
-causes the specified `gcc' to be used as the C compiler (unless it is
+causes the specified 'gcc' to be used as the C compiler (unless it is
overridden in the site shell script).
-Unfortunately, this technique does not work for `CONFIG_SHELL' due to
-an Autoconf limitation. Until the limitation is lifted, you can use
-this workaround:
+Unfortunately, this technique does not work for 'CONFIG_SHELL' due to an
+Autoconf limitation. Until the limitation is lifted, you can use this
+workaround:
CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash
-`configure' Invocation
+'configure' Invocation
======================
- `configure' recognizes the following options to control how it
+ 'configure' recognizes the following options to control how it
operates.
-`--help'
-`-h'
- Print a summary of all of the options to `configure', and exit.
+'--help'
+'-h'
+ Print a summary of all of the options to 'configure', and exit.
-`--help=short'
-`--help=recursive'
+'--help=short'
+'--help=recursive'
Print a summary of the options unique to this package's
- `configure', and exit. The `short' variant lists options used
- only in the top level, while the `recursive' variant lists options
- also present in any nested packages.
+ 'configure', and exit. The 'short' variant lists options used only
+ in the top level, while the 'recursive' variant lists options also
+ present in any nested packages.
-`--version'
-`-V'
- Print the version of Autoconf used to generate the `configure'
+'--version'
+'-V'
+ Print the version of Autoconf used to generate the 'configure'
script, and exit.
-`--cache-file=FILE'
+'--cache-file=FILE'
Enable the cache: use and save the results of the tests in FILE,
- traditionally `config.cache'. FILE defaults to `/dev/null' to
+ traditionally 'config.cache'. FILE defaults to '/dev/null' to
disable caching.
-`--config-cache'
-`-C'
- Alias for `--cache-file=config.cache'.
+'--config-cache'
+'-C'
+ Alias for '--cache-file=config.cache'.
-`--quiet'
-`--silent'
-`-q'
+'--quiet'
+'--silent'
+'-q'
Do not print messages saying which checks are being made. To
- suppress all normal output, redirect it to `/dev/null' (any error
+ suppress all normal output, redirect it to '/dev/null' (any error
messages will still be shown).
-`--srcdir=DIR'
+'--srcdir=DIR'
Look for the package's source code in directory DIR. Usually
- `configure' can determine that directory automatically.
+ 'configure' can determine that directory automatically.
-`--prefix=DIR'
- Use DIR as the installation prefix. *note Installation Names::
- for more details, including other options available for fine-tuning
- the installation locations.
+'--prefix=DIR'
+ Use DIR as the installation prefix. *note Installation Names:: for
+ more details, including other options available for fine-tuning the
+ installation locations.
-`--no-create'
-`-n'
+'--no-create'
+'-n'
Run the configure checks, but stop before creating any output
files.
-`configure' also accepts some other, not widely useful, options. Run
-`configure --help' for more details.
+'configure' also accepts some other, not widely useful, options. Run
+'configure --help' for more details.
diff --git a/Master/texmf-dist/source/fonts/fonts-tlwg/Makefile.am b/Master/texmf-dist/source/fonts/fonts-tlwg/Makefile.am
index 824b629b0c9..4260986eb61 100644
--- a/Master/texmf-dist/source/fonts/fonts-tlwg/Makefile.am
+++ b/Master/texmf-dist/source/fonts/fonts-tlwg/Makefile.am
@@ -1,6 +1,10 @@
MAINTAINERCLEANFILES = Makefile.in configure aclocal.m4
-EXTRA_DIST = ChangeLog.thai-ttf GPL
+EXTRA_DIST = \
+ ChangeLog.thai-ttf \
+ GPL \
+ build-aux/git-version-gen \
+ $(NULL)
SUBDIRS = scripts latex nf nectec sipa tlwg fontconfig tests
@@ -61,6 +65,9 @@ if INCLUDE_PFB
endif
endif # INCLUDE_XFONTSDIR
+dist-hook:
+ echo $(VERSION) > $(distdir)/VERSION
+
if INCLUDE_LATEX
tdsdist_tgz = $(LATEX_PACKAGE)-$(VERSION).tds.tar.gz
ctandist_tgz = $(LATEX_PACKAGE)-$(VERSION).ctan.tar.gz
diff --git a/Master/texmf-dist/source/fonts/fonts-tlwg/Makefile.in b/Master/texmf-dist/source/fonts/fonts-tlwg/Makefile.in
index 5515de22020..a3c22500f34 100644
--- a/Master/texmf-dist/source/fonts/fonts-tlwg/Makefile.in
+++ b/Master/texmf-dist/source/fonts/fonts-tlwg/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -292,7 +292,12 @@ ttfdir = @ttfdir@
type1dir = @type1dir@
woffdir = @woffdir@
MAINTAINERCLEANFILES = Makefile.in configure aclocal.m4
-EXTRA_DIST = ChangeLog.thai-ttf GPL
+EXTRA_DIST = \
+ ChangeLog.thai-ttf \
+ GPL \
+ build-aux/git-version-gen \
+ $(NULL)
+
SUBDIRS = scripts latex nf nectec sipa tlwg fontconfig tests
@INCLUDE_LATEX_TRUE@tdsdist_tgz = $(LATEX_PACKAGE)-$(VERSION).tds.tar.gz
@INCLUDE_LATEX_TRUE@ctandist_tgz = $(LATEX_PACKAGE)-$(VERSION).ctan.tar.gz
@@ -499,6 +504,9 @@ distdir: $(DISTFILES)
|| exit 1; \
fi; \
done
+ $(MAKE) $(AM_MAKEFLAGS) \
+ top_distdir="$(top_distdir)" distdir="$(distdir)" \
+ dist-hook
-test -n "$(am__skip_mode_fix)" \
|| find "$(distdir)" -type d ! -perm -755 \
-exec chmod u+rwx,go+rx {} \; -o \
@@ -507,7 +515,7 @@ distdir: $(DISTFILES)
! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
|| chmod -R a+r "$(distdir)"
dist-gzip: distdir
- tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+ tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz
$(am__post_remove_distdir)
dist-bzip2: distdir
@@ -532,7 +540,7 @@ dist-shar: distdir
@echo WARNING: "Support for shar distribution archives is" \
"deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
- shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
+ shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz
$(am__post_remove_distdir)
dist-zip: distdir
@@ -550,7 +558,7 @@ dist dist-all:
distcheck: dist
case '$(DIST_ARCHIVES)' in \
*.tar.gz*) \
- GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
+ eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
*.tar.lz*) \
@@ -560,7 +568,7 @@ distcheck: dist
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
- GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
+ eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
*.zip*) \
unzip $(distdir).zip ;;\
esac
@@ -744,8 +752,8 @@ uninstall-am:
.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
am--refresh check check-am clean clean-cscope clean-generic \
cscope cscopelist-am ctags ctags-am dist dist-all dist-bzip2 \
- dist-gzip dist-lzip dist-shar dist-tarZ dist-xz dist-zip \
- distcheck distclean distclean-generic distclean-tags \
+ dist-gzip dist-hook dist-lzip dist-shar dist-tarZ dist-xz \
+ dist-zip distcheck distclean distclean-generic distclean-tags \
distcleancheck distdir distuninstallcheck dvi dvi-am html \
html-am info info-am install install-am install-data \
install-data-am install-data-hook install-dvi install-dvi-am \
@@ -807,6 +815,9 @@ uninstall-am:
@INCLUDE_PFB_TRUE@@INCLUDE_XFONTSDIR_TRUE@ $(RMDIR) $(DESTDIR)$(type1dir); \
@INCLUDE_PFB_TRUE@@INCLUDE_XFONTSDIR_TRUE@ fi
+dist-hook:
+ echo $(VERSION) > $(distdir)/VERSION
+
@INCLUDE_LATEX_TRUE@inst-tds:
@INCLUDE_LATEX_TRUE@ rm -rf $(tdsdistdir)
@INCLUDE_LATEX_TRUE@ mkdir $(tdsdistdir)
diff --git a/Master/texmf-dist/source/fonts/fonts-tlwg/NEWS b/Master/texmf-dist/source/fonts/fonts-tlwg/NEWS
index 0bc8ee962d8..19f8392f917 100644
--- a/Master/texmf-dist/source/fonts/fonts-tlwg/NEWS
+++ b/Master/texmf-dist/source/fonts/fonts-tlwg/NEWS
@@ -1,3 +1,11 @@
+0.6.4 (2017-10-03) : The "TeXnical Boost" release
+=====
+- Use package versioning based on Git snapshot.
+- Fix LaTeX familydefault upon switching between scripts.
+ (Thanks Abhabongse Janthong for the pull request.)
+- Add LaTeX option for font scaling.
+ (Thanks Abhabongse Janthong for another pull request.)
+
0.6.3 (2016-06-09) : The "Loma Jump" release
=====
- The first release from GitHub.
diff --git a/Master/texmf-dist/source/fonts/fonts-tlwg/VERSION b/Master/texmf-dist/source/fonts/fonts-tlwg/VERSION
new file mode 100644
index 00000000000..d2b13eb644d
--- /dev/null
+++ b/Master/texmf-dist/source/fonts/fonts-tlwg/VERSION
@@ -0,0 +1 @@
+0.6.4
diff --git a/Master/texmf-dist/source/fonts/fonts-tlwg/aclocal.m4 b/Master/texmf-dist/source/fonts/fonts-tlwg/aclocal.m4
index c24039fe42c..22dd4fca749 100644
--- a/Master/texmf-dist/source/fonts/fonts-tlwg/aclocal.m4
+++ b/Master/texmf-dist/source/fonts/fonts-tlwg/aclocal.m4
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.15 -*- Autoconf -*-
+# generated automatically by aclocal 1.15.1 -*- Autoconf -*-
-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -20,7 +20,7 @@ You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically 'autoreconf'.])])
-# Copyright (C) 2002-2014 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -35,7 +35,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.15'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.15], [],
+m4_if([$1], [1.15.1], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -51,14 +51,14 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.15])dnl
+[AM_AUTOMAKE_VERSION([1.15.1])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -110,7 +110,7 @@ am_aux_dir=`cd "$ac_aux_dir" && pwd`
# AM_CONDITIONAL -*- Autoconf -*-
-# Copyright (C) 1997-2014 Free Software Foundation, Inc.
+# Copyright (C) 1997-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -143,7 +143,7 @@ fi])])
# Do all the work for Automake. -*- Autoconf -*-
-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -340,7 +340,7 @@ for _am_header in $config_headers :; do
done
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -361,7 +361,7 @@ if test x"${install_sh+set}" != xset; then
fi
AC_SUBST([install_sh])])
-# Copyright (C) 2003-2014 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -382,7 +382,7 @@ AC_SUBST([am__leading_dot])])
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-# Copyright (C) 1997-2014 Free Software Foundation, Inc.
+# Copyright (C) 1997-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -421,7 +421,7 @@ fi
# Helper functions for option handling. -*- Autoconf -*-
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -452,7 +452,7 @@ AC_DEFUN([_AM_IF_OPTION],
# Check to make sure that the build environment is sane. -*- Autoconf -*-
-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -533,7 +533,7 @@ AC_CONFIG_COMMANDS_PRE(
rm -f conftest.file
])
-# Copyright (C) 2009-2014 Free Software Foundation, Inc.
+# Copyright (C) 2009-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -593,7 +593,7 @@ AC_SUBST([AM_BACKSLASH])dnl
_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
])
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -621,7 +621,7 @@ fi
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
-# Copyright (C) 2006-2014 Free Software Foundation, Inc.
+# Copyright (C) 2006-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -640,7 +640,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
# Check how to create a tarball. -*- Autoconf -*-
-# Copyright (C) 2004-2014 Free Software Foundation, Inc.
+# Copyright (C) 2004-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/Master/texmf-dist/source/fonts/fonts-tlwg/build-aux/git-version-gen b/Master/texmf-dist/source/fonts/fonts-tlwg/build-aux/git-version-gen
new file mode 100755
index 00000000000..3d78ba2dd7b
--- /dev/null
+++ b/Master/texmf-dist/source/fonts/fonts-tlwg/build-aux/git-version-gen
@@ -0,0 +1,29 @@
+#!/bin/sh
+
+tarball_version_file=VERSION
+
+# Use tarball version file (included in release tarballs) if present,
+# otherwise, try git-describe
+if test -f $tarball_version_file
+then
+ v=$(cat $tarball_version_file) || v=
+fi
+
+if test "x$v" != "x"
+then
+ : # use $v
+# Make sure it's a Git tree
+elif test "$(git log -1 --pretty=format:x 2>&1)" = "x"
+then
+ v=$(git describe --match 'v[0-9]*' HEAD 2>/dev/null | sed -e 's/^v//') \
+ || v="UNKNOWN"
+
+ # Append "-dirty" suffix if there is local change
+ git update-index --refresh > /dev/null 2>&1
+ if test "x$(git diff-index --name-only HEAD 2>/dev/null)" != "x"
+ then
+ v="$v-dirty"
+ fi
+fi
+
+printf "%s" "$v"
diff --git a/Master/texmf-dist/source/fonts/fonts-tlwg/configure b/Master/texmf-dist/source/fonts/fonts-tlwg/configure
index 4709a306e19..90cecb99690 100755
--- a/Master/texmf-dist/source/fonts/fonts-tlwg/configure
+++ b/Master/texmf-dist/source/fonts/fonts-tlwg/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for fonts-tlwg 0.6.3.
+# Generated by GNU Autoconf 2.69 for fonts-tlwg 0.6.4.
#
# Report bugs to <thai-linux-foss-devel@googlegroups.com>.
#
@@ -580,8 +580,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='fonts-tlwg'
PACKAGE_TARNAME='fonts-tlwg'
-PACKAGE_VERSION='0.6.3'
-PACKAGE_STRING='fonts-tlwg 0.6.3'
+PACKAGE_VERSION='0.6.4'
+PACKAGE_STRING='fonts-tlwg 0.6.4'
PACKAGE_BUGREPORT='thai-linux-foss-devel@googlegroups.com'
PACKAGE_URL=''
@@ -1259,7 +1259,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures fonts-tlwg 0.6.3 to adapt to many kinds of systems.
+\`configure' configures fonts-tlwg 0.6.4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1326,7 +1326,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of fonts-tlwg 0.6.3:";;
+ short | recursive ) echo "Configuration of fonts-tlwg 0.6.4:";;
esac
cat <<\_ACEOF
@@ -1420,7 +1420,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-fonts-tlwg configure 0.6.3
+fonts-tlwg configure 0.6.4
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1437,7 +1437,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by fonts-tlwg $as_me 0.6.3, which was
+It was created by fonts-tlwg $as_me 0.6.4, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2302,7 +2302,7 @@ fi
# Define the identity of the package.
PACKAGE='fonts-tlwg'
- VERSION='0.6.3'
+ VERSION='0.6.4'
cat >>confdefs.h <<_ACEOF
@@ -3818,7 +3818,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by fonts-tlwg $as_me 0.6.3, which was
+This file was extended by fonts-tlwg $as_me 0.6.4, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3871,7 +3871,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-fonts-tlwg config.status 0.6.3
+fonts-tlwg config.status 0.6.4
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/Master/texmf-dist/source/fonts/fonts-tlwg/configure.ac b/Master/texmf-dist/source/fonts/fonts-tlwg/configure.ac
index f2e48eeded1..a1f08319fe5 100644
--- a/Master/texmf-dist/source/fonts/fonts-tlwg/configure.ac
+++ b/Master/texmf-dist/source/fonts/fonts-tlwg/configure.ac
@@ -1,5 +1,7 @@
AC_PREREQ(2.59)
-AC_INIT(fonts-tlwg, 0.6.3, thai-linux-foss-devel@googlegroups.com)
+AC_INIT(fonts-tlwg,
+ m4_esyscmd([build-aux/git-version-gen]),
+ thai-linux-foss-devel@googlegroups.com)
AC_CONFIG_SRCDIR([nf/Garuda.sfd])
AM_INIT_AUTOMAKE(dist-xz no-dist-gzip -Wno-portability)
diff --git a/Master/texmf-dist/source/fonts/fonts-tlwg/fontconfig/Makefile.in b/Master/texmf-dist/source/fonts/fonts-tlwg/fontconfig/Makefile.in
index 581838e6ffc..c01e4c8e8dd 100644
--- a/Master/texmf-dist/source/fonts/fonts-tlwg/fontconfig/Makefile.in
+++ b/Master/texmf-dist/source/fonts/fonts-tlwg/fontconfig/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/Master/texmf-dist/source/fonts/fonts-tlwg/latex/Makefile.in b/Master/texmf-dist/source/fonts/fonts-tlwg/latex/Makefile.in
index 6721a9bcf3a..c717d56b73a 100644
--- a/Master/texmf-dist/source/fonts/fonts-tlwg/latex/Makefile.in
+++ b/Master/texmf-dist/source/fonts/fonts-tlwg/latex/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/Master/texmf-dist/source/fonts/fonts-tlwg/latex/README.latex b/Master/texmf-dist/source/fonts/fonts-tlwg/latex/README.latex
index d22a99f9802..67283e0ac79 100644
--- a/Master/texmf-dist/source/fonts/fonts-tlwg/latex/README.latex
+++ b/Master/texmf-dist/source/fonts/fonts-tlwg/latex/README.latex
@@ -52,6 +52,18 @@ in the document when switching to Thai in Babel:
These options define the default Thai font when switching to Thai language
in Babel. They do not define fonts for the three families.
+
+There is also another option for this package which would scale all Thai fonts
+up or down by a given factor value. This is useful when there are discrepancies
+between the size of the font for Latin script and the size of Thai fonts in
+this package.
+
+* Specifying the font scaling factor for every font in this package:
+
+ - scale=<value> : Set the scaling factor to the specified value.
+ The default value is 1.
+
+
Example:
* To use "laksaman" font all over the document (e.g. in Thai official letters):
@@ -74,6 +86,10 @@ Example:
\usepackage[laksaman,rmkinnari]{fonts-tlwg}
+* To use "laksaman" font with the size 20% larger than normal:
+
+ \usepackage[laksaman,scaled=1.2]{fonts-tlwg}
+
\USEFONT COMMAND
----------------
@@ -93,4 +109,3 @@ text portions, for example:
slant shape:
\usefont{LTH}{umpush}{l}{sl}
-
diff --git a/Master/texmf-dist/source/fonts/fonts-tlwg/latex/examples/Makefile.am b/Master/texmf-dist/source/fonts/fonts-tlwg/latex/examples/Makefile.am
index f17d390d7b5..446111269a9 100644
--- a/Master/texmf-dist/source/fonts/fonts-tlwg/latex/examples/Makefile.am
+++ b/Master/texmf-dist/source/fonts/fonts-tlwg/latex/examples/Makefile.am
@@ -1,4 +1,9 @@
-EXAMPLES = teststd.tex
+EXAMPLES = \
+ teststd.tex \
+ testsans.tex \
+ testscaled-120.tex \
+ testscaled-65.tex \
+ $(NULL)
EXTRA_DIST = $(EXAMPLES)
diff --git a/Master/texmf-dist/source/fonts/fonts-tlwg/latex/examples/Makefile.in b/Master/texmf-dist/source/fonts/fonts-tlwg/latex/examples/Makefile.in
index d3aec88137e..02709feefa7 100644
--- a/Master/texmf-dist/source/fonts/fonts-tlwg/latex/examples/Makefile.in
+++ b/Master/texmf-dist/source/fonts/fonts-tlwg/latex/examples/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -240,7 +240,13 @@ top_srcdir = @top_srcdir@
ttfdir = @ttfdir@
type1dir = @type1dir@
woffdir = @woffdir@
-EXAMPLES = teststd.tex
+EXAMPLES = \
+ teststd.tex \
+ testsans.tex \
+ testscaled-120.tex \
+ testscaled-65.tex \
+ $(NULL)
+
EXTRA_DIST = $(EXAMPLES)
@INCLUDE_LATEX_TRUE@examplesdir = $(docdir)/examples
@INCLUDE_LATEX_TRUE@examples_DATA = $(EXAMPLES)
diff --git a/Master/texmf-dist/source/fonts/fonts-tlwg/latex/examples/testsans.tex b/Master/texmf-dist/source/fonts/fonts-tlwg/latex/examples/testsans.tex
new file mode 100644
index 00000000000..600894e6e0f
--- /dev/null
+++ b/Master/texmf-dist/source/fonts/fonts-tlwg/latex/examples/testsans.tex
@@ -0,0 +1,37 @@
+%%
+%% Test sans option with \normalfont
+%% 2017/05/10 Abhabongse Janthong <abhabongse@gmail.edu>
+%% - write a new test reproducing errors
+%%
+\documentclass[a4paper]{article}
+\usepackage[thai]{babel}
+\usepackage[utf8x]{inputenc}
+\usepackage[sans,sflaksaman,rmnorasi]{fonts-tlwg}
+
+\begin{document}
+
+ \begin{tabbing}
+ {\usefont{LTH}{norasi}{b}{n}XXXXXXXXXXXXXXXXXXXXXXXXX}\=
+ {\usefont{LTH}{norasi}{b}{n}XXXXXXXXXXXXXXXXXXXXXXXXX}\kill
+ \hspace{1em}
+ ๏ เป็นมนุษย์สุดประเสริฐเลิศคุณค่า \> กว่าบรรดาฝูงสัตว์เดรัจฉาน \\
+ จงฝ่าฟันพัฒนาวิชาการ \> อย่าล้างผลาญฤๅเข่นฆ่าบีฑาใคร\\
+ ไม่ถือโทษโกรธแช่งซัดฮึดฮัดด่า \> หัดอภัยเหมือนกีฬาอัชฌาสัย \\
+ ปฏิบัติประพฤติกฎกำหนดใจ \> พูดจาให้จ๊ะๆ จ๋าๆ น่าฟังเอย ฯ\\
+ \end{tabbing}
+
+ % Should switch to defaultfont, which should have been \thaisffamily
+ ประโยคภาษาไทย \normalfont ประโยคภาษาไทย
+
+ \bigskip
+ \begin{tabbing}
+ {\usefont{LTH}{norasi}{b}{n}XXXXXXXXXXXXXXXXXXXXXXXXX}\=
+ {\usefont{LTH}{norasi}{b}{n}XXXXXXXXXXXXXXXXXXXXXXXXX}\kill
+ \hspace{1em}
+ ๏ เป็นมนุษย์สุดประเสริฐเลิศคุณค่า \> กว่าบรรดาฝูงสัตว์เดรัจฉาน \\
+ จงฝ่าฟันพัฒนาวิชาการ \> อย่าล้างผลาญฤๅเข่นฆ่าบีฑาใคร\\
+ ไม่ถือโทษโกรธแช่งซัดฮึดฮัดด่า \> หัดอภัยเหมือนกีฬาอัชฌาสัย \\
+ ปฏิบัติประพฤติกฎกำหนดใจ \> พูดจาให้จ๊ะๆ จ๋าๆ น่าฟังเอย ฯ\\
+ \end{tabbing}
+
+\end{document}
diff --git a/Master/texmf-dist/source/fonts/fonts-tlwg/latex/examples/testscaled-120.tex b/Master/texmf-dist/source/fonts/fonts-tlwg/latex/examples/testscaled-120.tex
new file mode 100644
index 00000000000..d233dff92ca
--- /dev/null
+++ b/Master/texmf-dist/source/fonts/fonts-tlwg/latex/examples/testscaled-120.tex
@@ -0,0 +1,734 @@
+%%
+%% Test for font scaling at 120%
+%% 2017/09/11 Abhabongse Janthong <abhabongse@gmail.edu>
+%% - write a new test introducing the usage of package option
+%%
+\documentclass[a4paper]{article}
+\usepackage[english,thai]{babel}
+\usepackage[utf8x]{inputenc}
+\usepackage[scale=1.2]{fonts-tlwg}
+
+\newcommand{\testthaipoem}[3]{%
+ \usefont{LTH}{#1}{#2}{#3}
+ \noindent
+ \begin{tabbing}
+ {\usefont{LTH}{norasi}{b}{n}
+ XXXXXXXXXXXXXXXXXXXXXXXXX} \=
+ {\usefont{LTH}{norasi}{b}{n}
+ XXXXXXXXXXXXXXXXXXXXXXXXX}\kill
+ \hspace{1em}๏ เป็นมนุษย์สุดประเสริฐเลิศคุณค่า \> กว่าบรรดาฝูงสัตว์เดรัจฉาน \\
+ จงฝ่าฟันพัฒนาวิชาการ \> อย่าล้างผลาญฤๅเข่นฆ่าบีฑาใคร\\
+ ไม่ถือโทษโกรธแช่งซัดฮึดฮัดด่า \> หัดอภัยเหมือนกีฬาอัชฌาสัย \\
+ ปฏิบัติประพฤติกฎกำหนดใจ \> พูดจาให้จ๊ะๆ จ๋าๆ น่าฟังเอย ฯ\\
+ \end{tabbing}}
+
+\newcommand{\testenglish}[3]{%
+ \usefont{LTH}{#1}{#2}{#3}
+ \noindent
+ A quick brown fox jumps over the lazy dog.}
+
+\newcommand{\testEnglish}[3]{%
+ \usefont{LTH}{#1}{#2}{#3}
+ \noindent
+ \MakeUppercase{A quick brown fox jumps over the lazy dog.}}
+
+\newcommand{\testligkern}[3]{%
+ \usefont{LTH}{#1}{#2}{#3}
+ \noindent
+ ที่ ท่า ทิ้ง ท้า กิ๊ง ก๊ง ตี๋ ต๋า บ่น ป่น, บ้น ป้น, บ๊น ป๊น, บ๋น ป๋น บิน ปิน บีน ปีน บิ่น ปิ่น บัน ปั่น บั่น
+ ก็ ป็ ปู่ ญ ญุ ญู ญฺ ฐ ฐุ ฐู ฐฺ กุ ฎุ ฎู ฎฺ ฏุ ฏู ฏฺ บำ บ่ำ ปำ ป่ำ -\textyamakkan{}
+ \textfongmun{} \textangkhankhu{} \textkhomut{}
+ ปะเฺติ็ลฺ โฺญฺ็จฺ ปั็วฮฺ ทฺ็อง เปฺิ็ว มูํย
+ แต็่ง เจฺํอ เปรฺิ่ห์ โจ๊่ เปฺี่ย โฺทร ม็่อง เติ็ง อาื ยาึ ปิํปี็ป็่ป๊่ปฺ่
+ จือรฺุ การฺู
+ - -- --- `` '' \dag{} \ddag{} \S{} \P{} \${} \ae{} \AE{} \oe{} \OE{} \aa{}
+ \AA{} \ss{} \copyright{} \textregistered{} \texttrademark{} \textbackslash{}
+ \textasciicircum{} \textasciitilde{} \textbar{} \textbraceleft{}
+ \textbraceright{} ?` !` ff fi fl ffi ffl tt ti AV\\}
+
+\newcommand{\testpali}[3]{%
+ \usefont{LTH}{#1}{#2}{#3}
+ \noindent
+ \textpali{หตฺเถสุ ภิกฺขเว สติ, อาทานนิกฺเขปนํ ปญฺญายติ}\\
+ \textpali{เอวเมว โข ภิกฺขเว}\\
+ \textpali{จกฺขุสมิํปิ สติ}\\
+ \textpali{จกฺขุสมฺผสฺสปจฺจยา อุปฺปชฺชติ อชฺฌตฺตํ สุขทุกฺขํ}\\
+ \textpali{ทิฏฺฐา มยา ภิกฺขเว ฉ ผสฺสายตนิกา นาม นิรยา}\\}
+
+\begin{document}
+\pagestyle{empty}
+\vfil
+\begin{figure*}
+\Huge
+\hspace*{.2\textwidth}\usefont{LTH}{kinnari}{m}{n}แบบอักษรไทยใน \LaTeX\\
+\hspace*{.2\textwidth}\usefont{LTH}{garuda}{m}{n}แบบอักษรไทยใน \LaTeX\\
+\hspace*{.2\textwidth}\usefont{LTH}{norasi}{m}{n}แบบอักษรไทยใน \LaTeX\\
+\hspace*{.2\textwidth}\usefont{LTH}{laksaman}{m}{n}แบบอักษรไทยใน \LaTeX\\
+\hspace*{.2\textwidth}\usefont{LTH}{ttype}{m}{n}แบบอักษรไทยใน \LaTeX\\
+\hspace*{.2\textwidth}\usefont{LTH}{ttypist}{m}{n}แบบอักษรไทยใน \LaTeX\\
+\hspace*{.2\textwidth}\usefont{LTH}{purisa}{m}{n}แบบอักษรไทยใน \LaTeX\\
+\hspace*{.2\textwidth}\usefont{LTH}{loma}{m}{n}แบบอักษรไทยใน \LaTeX\\
+\hspace*{.2\textwidth}\usefont{LTH}{waree}{m}{n}แบบอักษรไทยใน \LaTeX\\
+\hspace*{.2\textwidth}\usefont{LTH}{umpush}{m}{n}แบบอักษรไทยใน \LaTeX\\
+\hspace*{.2\textwidth}\usefont{LTH}{sawasdee}{m}{n}แบบอักษรไทยใน \LaTeX\\
+\end{figure*}
+\vfil
+\clearpage
+
+\pagestyle{plain}
+\section{\usefont{LTH}{kinnari}{b}{n}Kinnari -- กินรี\protect\footnote{จากโครงการฟอนต์แห่งชาติ (National Font Project)}}
+
+\subsection{ตัวอย่างประโยคภาษาไทย\protect\footnote{โดยสมาคมคอมพิวเตอร์แห่งประเทศไทยในพระบรมราชูปถัมภ์}}
+
+\testthaipoem{kinnari}{m}{n}
+
+\testthaipoem{kinnari}{b}{n}
+
+\testthaipoem{kinnari}{m}{it}
+
+\testthaipoem{kinnari}{b}{it}
+
+\testthaipoem{kinnari}{m}{sl}
+
+\testthaipoem{kinnari}{b}{sl}
+
+\subsection{ตัวอย่างภาษาอังกฤษ}
+
+\testenglish{kinnari}{m}{n}
+
+\testenglish{kinnari}{b}{n}
+
+\testenglish{kinnari}{m}{it}
+
+\testenglish{kinnari}{b}{it}
+
+\testenglish{kinnari}{m}{sl}
+
+\testenglish{kinnari}{b}{sl}
+
+\testEnglish{kinnari}{m}{n}
+
+\testEnglish{kinnari}{b}{n}
+
+\testEnglish{kinnari}{m}{it}
+
+\testEnglish{kinnari}{b}{it}
+
+\testEnglish{kinnari}{m}{sl}
+
+\testEnglish{kinnari}{b}{sl}
+
+
+\subsection{การจัดระดับตัวอักษรและตัวอักษรพิเศษ}
+\noindent
+\testligkern{kinnari}{m}{n}
+
+\testligkern{kinnari}{b}{n}
+
+\testligkern{kinnari}{m}{it}
+
+\testligkern{kinnari}{b}{it}
+
+\testligkern{kinnari}{m}{sl}
+
+\testligkern{kinnari}{b}{sl}
+
+\subsection{ภาษาบาลี-สันสกฤต}
+\testpali{kinnari}{m}{n}
+
+\testpali{kinnari}{b}{n}
+
+\testpali{kinnari}{m}{it}
+
+\testpali{kinnari}{b}{it}
+
+\testpali{kinnari}{m}{sl}
+
+\testpali{kinnari}{b}{sl}
+
+\vfil\pagebreak
+
+
+\section{\usefont{LTH}{garuda}{b}{n}Garuda -- ครุฑ\protect\footnote{จากโครงการฟอนต์แห่งชาติ (National Font Project)}}
+
+\subsection{ตัวอย่างประโยคภาษาไทย}
+
+\testthaipoem{garuda}{m}{n}
+
+\testthaipoem{garuda}{b}{n}
+
+\testthaipoem{garuda}{m}{it}
+
+\testthaipoem{garuda}{b}{it}
+
+\subsection{ตัวอย่างภาษาอังกฤษ}
+
+\testenglish{garuda}{m}{n}
+
+\testenglish{garuda}{b}{n}
+
+\testenglish{garuda}{m}{it}
+
+\testenglish{garuda}{b}{it}
+
+\testEnglish{garuda}{m}{n}
+
+\testEnglish{garuda}{b}{n}
+
+\testEnglish{garuda}{m}{it}
+
+\testEnglish{garuda}{b}{it}
+
+
+\subsection{การจัดระดับตัวอักษรและตัวอักษรพิเศษ}
+
+\testligkern{garuda}{m}{n}
+
+\testligkern{garuda}{b}{n}
+
+\testligkern{garuda}{m}{it}
+
+\testligkern{garuda}{b}{it}
+
+
+\subsection{ภาษาบาลี-สันสกฤต}
+
+\testpali{garuda}{m}{n}
+
+\testpali{garuda}{b}{n}
+
+\testpali{garuda}{m}{it}
+
+\testpali{garuda}{b}{it}
+
+\vfil\pagebreak
+
+\section{\usefont{LTH}{norasi}{b}{n}Norasi -- นรสีห์\protect\footnote{จากโครงการฟอนต์แห่งชาติ (National Font Project)}}
+
+\subsection{ตัวอย่างประโยคภาษาไทย}
+
+\testthaipoem{norasi}{m}{n}
+
+\testthaipoem{norasi}{b}{n}
+
+\testthaipoem{norasi}{m}{it}
+
+\testthaipoem{norasi}{b}{it}
+
+\testthaipoem{norasi}{m}{sl}
+
+\testthaipoem{norasi}{b}{sl}
+
+\subsection{ตัวอย่างภาษาอังกฤษ}
+\testenglish{norasi}{m}{n}
+
+\testenglish{norasi}{b}{n}
+
+\testenglish{norasi}{m}{it}
+
+\testenglish{norasi}{b}{it}
+
+\testenglish{norasi}{m}{sl}
+
+\testenglish{norasi}{b}{sl}
+
+\testEnglish{norasi}{m}{n}
+
+\testEnglish{norasi}{b}{n}
+
+\testEnglish{norasi}{m}{it}
+
+\testEnglish{norasi}{b}{it}
+
+\testEnglish{norasi}{m}{sl}
+
+\testEnglish{norasi}{b}{sl}
+
+
+\subsection{การจัดระดับตัวอักษรและตัวอักษรพิเศษ}
+
+\testligkern{norasi}{m}{n}
+
+\testligkern{norasi}{b}{n}
+
+\testligkern{norasi}{m}{it}
+
+\testligkern{norasi}{b}{it}
+
+\testligkern{norasi}{m}{sl}
+
+\testligkern{norasi}{b}{sl}
+
+\subsection{ภาษาบาลี-สันสกฤต}
+
+\testpali{norasi}{m}{n}
+
+\testpali{norasi}{b}{n}
+
+\testpali{norasi}{m}{it}
+
+\testpali{norasi}{b}{it}
+
+\vfil\pagebreak
+
+
+\section{\usefont{LTH}{laksaman}{b}{n}Laksaman -- ลักษมัณ\protect\footnote{ดัดแปลงจาก TH Sarabun New ของคุณศุภกิจ เฉลิมลาภ}}
+
+\subsection{ตัวอย่างประโยคภาษาไทย}
+
+\testthaipoem{laksaman}{m}{n}
+
+\testthaipoem{laksaman}{b}{n}
+
+\testthaipoem{laksaman}{m}{it}
+
+\testthaipoem{laksaman}{b}{it}
+
+\subsection{ตัวอย่างภาษาอังกฤษ}
+
+\testenglish{laksaman}{m}{n}
+
+\testenglish{laksaman}{b}{n}
+
+\testenglish{laksaman}{m}{it}
+
+\testenglish{laksaman}{b}{it}
+
+\testEnglish{laksaman}{m}{n}
+
+\testEnglish{laksaman}{b}{n}
+
+\testEnglish{laksaman}{m}{it}
+
+\testEnglish{laksaman}{b}{it}
+
+
+\subsection{การจัดระดับตัวอักษรและตัวอักษรพิเศษ}
+
+\testligkern{laksaman}{m}{n}
+
+\testligkern{laksaman}{b}{n}
+
+\testligkern{laksaman}{m}{it}
+
+\testligkern{laksaman}{b}{it}
+
+
+\subsection{ภาษาบาลี-สันสกฤต}
+
+\testpali{laksaman}{m}{n}
+
+\testpali{laksaman}{b}{n}
+
+\testpali{laksaman}{m}{it}
+
+\testpali{laksaman}{b}{it}
+
+\vfil\pagebreak
+
+
+\section{\usefont{LTH}{ttype}{b}{n}Tlwg Typewriter\protect\footnote{โดย Thai Linux Working Group (TLWG)}}
+
+\subsection{ตัวอย่างประโยคภาษาไทย}
+
+\testthaipoem{ttype}{m}{n}
+
+\testthaipoem{ttype}{b}{n}
+
+\testthaipoem{ttype}{m}{it}
+
+\testthaipoem{ttype}{b}{it}
+
+\subsection{ตัวอย่างภาษาอังกฤษ}
+
+\testenglish{ttype}{m}{n}
+
+\testenglish{ttype}{b}{n}
+
+\testenglish{ttype}{m}{it}
+
+\testenglish{ttype}{b}{it}
+
+\testEnglish{ttype}{m}{n}
+
+\testEnglish{ttype}{b}{n}
+
+\testEnglish{ttype}{m}{it}
+
+\testEnglish{ttype}{b}{it}
+
+
+\subsection{การจัดระดับตัวอักษรและตัวอักษรพิเศษ}
+
+\testligkern{ttype}{m}{n}
+
+\testligkern{ttype}{b}{n}
+
+\testligkern{ttype}{m}{it}
+
+\testligkern{ttype}{b}{it}
+
+
+\subsection{ภาษาบาลี-สันสกฤต}
+
+\testpali{ttype}{m}{n}
+
+\testpali{ttype}{b}{n}
+
+\testpali{ttype}{m}{it}
+
+\testpali{ttype}{b}{it}
+
+\vfil\pagebreak
+
+
+\section{\usefont{LTH}{ttypist}{b}{n}Tlwg Typist\protect\footnote{โดย Thai Linux Working Group (TLWG)}}
+
+\subsection{ตัวอย่างประโยคภาษาไทย}
+
+\testthaipoem{ttypist}{m}{n}
+
+\testthaipoem{ttypist}{b}{n}
+
+\testthaipoem{ttypist}{m}{it}
+
+\testthaipoem{ttypist}{b}{it}
+
+\subsection{ตัวอย่างภาษาอังกฤษ}
+
+\testenglish{ttypist}{m}{n}
+
+\testenglish{ttypist}{b}{n}
+
+\testenglish{ttypist}{m}{it}
+
+\testenglish{ttypist}{b}{it}
+
+\testEnglish{ttypist}{m}{n}
+
+\testEnglish{ttypist}{b}{n}
+
+\testEnglish{ttypist}{m}{it}
+
+\testEnglish{ttypist}{b}{it}
+
+
+\subsection{การจัดระดับตัวอักษรและตัวอักษรพิเศษ}
+
+\testligkern{ttypist}{m}{n}
+
+\testligkern{ttypist}{b}{n}
+
+\testligkern{ttypist}{m}{it}
+
+\testligkern{ttypist}{b}{it}
+
+
+\subsection{ภาษาบาลี-สันสกฤต}
+
+\testpali{ttypist}{m}{n}
+
+\testpali{ttypist}{b}{n}
+
+\testpali{ttypist}{m}{it}
+
+\testpali{ttypist}{b}{it}
+
+\vfil\pagebreak
+
+
+\section{\usefont{LTH}{purisa}{m}{n}Purisa -- ภูริสา\protect\footnote{โดย Thai Linux Working Group (TLWG)}}
+
+\subsection{ตัวอย่างประโยคภาษาไทย}
+
+\testthaipoem{purisa}{m}{n}
+
+\testthaipoem{purisa}{b}{n}
+
+\testthaipoem{purisa}{m}{it}
+
+\testthaipoem{purisa}{b}{it}
+
+\subsection{ตัวอย่างภาษาอังกฤษ}
+
+\testenglish{purisa}{m}{n}
+
+\testenglish{purisa}{b}{n}
+
+\testenglish{purisa}{m}{it}
+
+\testenglish{purisa}{b}{it}
+
+\testEnglish{purisa}{m}{n}
+
+\testEnglish{purisa}{b}{n}
+
+\testEnglish{purisa}{m}{it}
+
+\testEnglish{purisa}{b}{it}
+
+
+\subsection{การจัดระดับตัวอักษรและตัวอักษรพิเศษ}
+
+\testligkern{purisa}{m}{n}
+
+\testligkern{purisa}{b}{n}
+
+\testligkern{purisa}{m}{it}
+
+\testligkern{purisa}{b}{it}
+
+
+\subsection{ภาษาบาลี-สันสกฤต}
+
+\testpali{purisa}{m}{n}
+
+\testpali{purisa}{b}{n}
+
+\testpali{purisa}{m}{it}
+
+\testpali{purisa}{b}{it}
+
+\vfil\pagebreak
+
+
+\section{\usefont{LTH}{loma}{b}{n}Loma -- โลมา\protect\footnote{จากศูนย์เทคโนโลยีอิเล็กทรอนิกส์และคอมพิวเตอร์แห่งชาติ (NECTEC)}}
+
+\subsection{ตัวอย่างประโยคภาษาไทย}
+
+\testthaipoem{loma}{m}{n}
+
+\testthaipoem{loma}{b}{n}
+
+\testthaipoem{loma}{m}{it}
+
+\testthaipoem{loma}{b}{it}
+
+\subsection{ตัวอย่างภาษาอังกฤษ}
+
+\testenglish{loma}{m}{n}
+
+\testenglish{loma}{b}{n}
+
+\testenglish{loma}{m}{it}
+
+\testenglish{loma}{b}{it}
+
+\testEnglish{loma}{m}{n}
+
+\testEnglish{loma}{b}{n}
+
+\testEnglish{loma}{m}{it}
+
+\testEnglish{loma}{b}{it}
+
+
+\subsection{การจัดระดับตัวอักษรและตัวอักษรพิเศษ}
+
+\testligkern{loma}{m}{n}
+
+\testligkern{loma}{b}{n}
+
+\testligkern{loma}{m}{it}
+
+\testligkern{loma}{b}{it}
+
+
+\subsection{ภาษาบาลี-สันสกฤต}
+
+\testpali{loma}{m}{n}
+
+\testpali{loma}{b}{n}
+
+\testpali{loma}{m}{it}
+
+\testpali{loma}{b}{it}
+
+\vfil\pagebreak
+
+
+\section{\usefont{LTH}{waree}{b}{n}Waree -- วารี\protect\footnote{โดย คุณวิทยา ไตรสารวัฒนะ}}
+
+\subsection{ตัวอย่างประโยคภาษาไทย}
+
+\testthaipoem{waree}{m}{n}
+
+\testthaipoem{waree}{b}{n}
+
+\testthaipoem{waree}{m}{it}
+
+\testthaipoem{waree}{b}{it}
+
+\subsection{ตัวอย่างภาษาอังกฤษ}
+
+\testenglish{waree}{m}{n}
+
+\testenglish{waree}{b}{n}
+
+\testenglish{waree}{m}{it}
+
+\testenglish{waree}{b}{it}
+
+\testEnglish{waree}{m}{n}
+
+\testEnglish{waree}{b}{n}
+
+\testEnglish{waree}{m}{it}
+
+\testEnglish{waree}{b}{it}
+
+
+\subsection{การจัดระดับตัวอักษรและตัวอักษรพิเศษ}
+
+\testligkern{waree}{m}{n}
+
+\testligkern{waree}{b}{n}
+
+\testligkern{waree}{m}{it}
+
+\testligkern{waree}{b}{it}
+
+\subsection{ภาษาบาลี-สันสกฤต}
+
+\testpali{waree}{m}{n}
+
+\testpali{waree}{b}{n}
+
+\testpali{waree}{m}{it}
+
+\testpali{waree}{b}{it}
+
+\vfil\pagebreak
+
+
+\section{\usefont{LTH}{umpush}{b}{n}Umpush -- อัมพุช\protect\footnote{โดย คุณวิทยา ไตรสารวัฒนะ}}
+
+\subsection{ตัวอย่างประโยคภาษาไทย}
+
+\testthaipoem{umpush}{l}{n}
+
+\testthaipoem{umpush}{m}{n}
+
+\testthaipoem{umpush}{b}{n}
+
+\testthaipoem{umpush}{l}{it}
+
+\testthaipoem{umpush}{m}{it}
+
+\testthaipoem{umpush}{b}{it}
+
+\subsection{ตัวอย่างภาษาอังกฤษ}
+
+\testenglish{umpush}{l}{n}
+
+\testenglish{umpush}{m}{n}
+
+\testenglish{umpush}{b}{n}
+
+\testenglish{umpush}{l}{it}
+
+\testenglish{umpush}{m}{it}
+
+\testenglish{umpush}{b}{it}
+
+\testEnglish{umpush}{l}{n}
+
+\testEnglish{umpush}{m}{n}
+
+\testEnglish{umpush}{b}{n}
+
+\testEnglish{umpush}{l}{it}
+
+\testEnglish{umpush}{m}{it}
+
+\testEnglish{umpush}{b}{it}
+
+
+\subsection{การจัดระดับตัวอักษรและตัวอักษรพิเศษ}
+
+\testligkern{umpush}{l}{n}
+
+\testligkern{umpush}{m}{n}
+
+\testligkern{umpush}{b}{n}
+
+\testligkern{umpush}{l}{it}
+
+\testligkern{umpush}{m}{it}
+
+\testligkern{umpush}{b}{it}
+
+
+\subsection{ภาษาบาลี-สันสกฤต}
+
+\testpali{umpush}{l}{n}
+
+\testpali{umpush}{m}{n}
+
+\testpali{umpush}{b}{n}
+
+\testpali{umpush}{l}{it}
+
+\testpali{umpush}{m}{it}
+
+\testpali{umpush}{b}{it}
+
+\vfil\pagebreak
+
+
+\section{\usefont{LTH}{sawasdee}{b}{n}Sawasdee -- สวัสดี\protect\footnote{โดย คุณพล อุดมวิทยานุกูล}}
+
+\subsection{ตัวอย่างประโยคภาษาไทย}
+
+\testthaipoem{sawasdee}{m}{n}
+
+\testthaipoem{sawasdee}{b}{n}
+
+\testthaipoem{sawasdee}{m}{it}
+
+\testthaipoem{sawasdee}{b}{it}
+
+\subsection{ตัวอย่างภาษาอังกฤษ}
+
+\testenglish{sawasdee}{m}{n}
+
+\testenglish{sawasdee}{b}{n}
+
+\testenglish{sawasdee}{m}{it}
+
+\testenglish{sawasdee}{b}{it}
+
+\testEnglish{sawasdee}{m}{n}
+
+\testEnglish{sawasdee}{b}{n}
+
+\testEnglish{sawasdee}{m}{it}
+
+\testEnglish{sawasdee}{b}{it}
+
+
+\subsection{การจัดระดับตัวอักษรและตัวอักษรพิเศษ}
+
+\testligkern{sawasdee}{m}{n}
+
+\testligkern{sawasdee}{b}{n}
+
+\testligkern{sawasdee}{m}{it}
+
+\testligkern{sawasdee}{b}{it}
+
+
+\subsection{ภาษาบาลี-สันสกฤต}
+
+\testpali{sawasdee}{m}{n}
+
+\testpali{sawasdee}{b}{n}
+
+\testpali{sawasdee}{m}{it}
+
+\testpali{sawasdee}{b}{it}
+
+\vfil\pagebreak
+
+
+\end{document}
diff --git a/Master/texmf-dist/source/fonts/fonts-tlwg/latex/examples/testscaled-65.tex b/Master/texmf-dist/source/fonts/fonts-tlwg/latex/examples/testscaled-65.tex
new file mode 100644
index 00000000000..9471e4a6a45
--- /dev/null
+++ b/Master/texmf-dist/source/fonts/fonts-tlwg/latex/examples/testscaled-65.tex
@@ -0,0 +1,734 @@
+%%
+%% Test for font scaling at 65%
+%% 2017/09/11 Abhabongse Janthong <abhabongse@gmail.edu>
+%% - write a new test introducing the usage of package option
+%%
+\documentclass[a4paper]{article}
+\usepackage[english,thai]{babel}
+\usepackage[utf8x]{inputenc}
+\usepackage[scale=0.65]{fonts-tlwg}
+
+\newcommand{\testthaipoem}[3]{%
+ \usefont{LTH}{#1}{#2}{#3}
+ \noindent
+ \begin{tabbing}
+ {\usefont{LTH}{norasi}{b}{n}
+ XXXXXXXXXXXXXXXXXXXXXXXXX} \=
+ {\usefont{LTH}{norasi}{b}{n}
+ XXXXXXXXXXXXXXXXXXXXXXXXX}\kill
+ \hspace{1em}๏ เป็นมนุษย์สุดประเสริฐเลิศคุณค่า \> กว่าบรรดาฝูงสัตว์เดรัจฉาน \\
+ จงฝ่าฟันพัฒนาวิชาการ \> อย่าล้างผลาญฤๅเข่นฆ่าบีฑาใคร\\
+ ไม่ถือโทษโกรธแช่งซัดฮึดฮัดด่า \> หัดอภัยเหมือนกีฬาอัชฌาสัย \\
+ ปฏิบัติประพฤติกฎกำหนดใจ \> พูดจาให้จ๊ะๆ จ๋าๆ น่าฟังเอย ฯ\\
+ \end{tabbing}}
+
+\newcommand{\testenglish}[3]{%
+ \usefont{LTH}{#1}{#2}{#3}
+ \noindent
+ A quick brown fox jumps over the lazy dog.}
+
+\newcommand{\testEnglish}[3]{%
+ \usefont{LTH}{#1}{#2}{#3}
+ \noindent
+ \MakeUppercase{A quick brown fox jumps over the lazy dog.}}
+
+\newcommand{\testligkern}[3]{%
+ \usefont{LTH}{#1}{#2}{#3}
+ \noindent
+ ที่ ท่า ทิ้ง ท้า กิ๊ง ก๊ง ตี๋ ต๋า บ่น ป่น, บ้น ป้น, บ๊น ป๊น, บ๋น ป๋น บิน ปิน บีน ปีน บิ่น ปิ่น บัน ปั่น บั่น
+ ก็ ป็ ปู่ ญ ญุ ญู ญฺ ฐ ฐุ ฐู ฐฺ กุ ฎุ ฎู ฎฺ ฏุ ฏู ฏฺ บำ บ่ำ ปำ ป่ำ -\textyamakkan{}
+ \textfongmun{} \textangkhankhu{} \textkhomut{}
+ ปะเฺติ็ลฺ โฺญฺ็จฺ ปั็วฮฺ ทฺ็อง เปฺิ็ว มูํย
+ แต็่ง เจฺํอ เปรฺิ่ห์ โจ๊่ เปฺี่ย โฺทร ม็่อง เติ็ง อาื ยาึ ปิํปี็ป็่ป๊่ปฺ่
+ จือรฺุ การฺู
+ - -- --- `` '' \dag{} \ddag{} \S{} \P{} \${} \ae{} \AE{} \oe{} \OE{} \aa{}
+ \AA{} \ss{} \copyright{} \textregistered{} \texttrademark{} \textbackslash{}
+ \textasciicircum{} \textasciitilde{} \textbar{} \textbraceleft{}
+ \textbraceright{} ?` !` ff fi fl ffi ffl tt ti AV\\}
+
+\newcommand{\testpali}[3]{%
+ \usefont{LTH}{#1}{#2}{#3}
+ \noindent
+ \textpali{หตฺเถสุ ภิกฺขเว สติ, อาทานนิกฺเขปนํ ปญฺญายติ}\\
+ \textpali{เอวเมว โข ภิกฺขเว}\\
+ \textpali{จกฺขุสมิํปิ สติ}\\
+ \textpali{จกฺขุสมฺผสฺสปจฺจยา อุปฺปชฺชติ อชฺฌตฺตํ สุขทุกฺขํ}\\
+ \textpali{ทิฏฺฐา มยา ภิกฺขเว ฉ ผสฺสายตนิกา นาม นิรยา}\\}
+
+\begin{document}
+\pagestyle{empty}
+\vfil
+\begin{figure*}
+\Huge
+\hspace*{.2\textwidth}\usefont{LTH}{kinnari}{m}{n}แบบอักษรไทยใน \LaTeX\\
+\hspace*{.2\textwidth}\usefont{LTH}{garuda}{m}{n}แบบอักษรไทยใน \LaTeX\\
+\hspace*{.2\textwidth}\usefont{LTH}{norasi}{m}{n}แบบอักษรไทยใน \LaTeX\\
+\hspace*{.2\textwidth}\usefont{LTH}{laksaman}{m}{n}แบบอักษรไทยใน \LaTeX\\
+\hspace*{.2\textwidth}\usefont{LTH}{ttype}{m}{n}แบบอักษรไทยใน \LaTeX\\
+\hspace*{.2\textwidth}\usefont{LTH}{ttypist}{m}{n}แบบอักษรไทยใน \LaTeX\\
+\hspace*{.2\textwidth}\usefont{LTH}{purisa}{m}{n}แบบอักษรไทยใน \LaTeX\\
+\hspace*{.2\textwidth}\usefont{LTH}{loma}{m}{n}แบบอักษรไทยใน \LaTeX\\
+\hspace*{.2\textwidth}\usefont{LTH}{waree}{m}{n}แบบอักษรไทยใน \LaTeX\\
+\hspace*{.2\textwidth}\usefont{LTH}{umpush}{m}{n}แบบอักษรไทยใน \LaTeX\\
+\hspace*{.2\textwidth}\usefont{LTH}{sawasdee}{m}{n}แบบอักษรไทยใน \LaTeX\\
+\end{figure*}
+\vfil
+\clearpage
+
+\pagestyle{plain}
+\section{\usefont{LTH}{kinnari}{b}{n}Kinnari -- กินรี\protect\footnote{จากโครงการฟอนต์แห่งชาติ (National Font Project)}}
+
+\subsection{ตัวอย่างประโยคภาษาไทย\protect\footnote{โดยสมาคมคอมพิวเตอร์แห่งประเทศไทยในพระบรมราชูปถัมภ์}}
+
+\testthaipoem{kinnari}{m}{n}
+
+\testthaipoem{kinnari}{b}{n}
+
+\testthaipoem{kinnari}{m}{it}
+
+\testthaipoem{kinnari}{b}{it}
+
+\testthaipoem{kinnari}{m}{sl}
+
+\testthaipoem{kinnari}{b}{sl}
+
+\subsection{ตัวอย่างภาษาอังกฤษ}
+
+\testenglish{kinnari}{m}{n}
+
+\testenglish{kinnari}{b}{n}
+
+\testenglish{kinnari}{m}{it}
+
+\testenglish{kinnari}{b}{it}
+
+\testenglish{kinnari}{m}{sl}
+
+\testenglish{kinnari}{b}{sl}
+
+\testEnglish{kinnari}{m}{n}
+
+\testEnglish{kinnari}{b}{n}
+
+\testEnglish{kinnari}{m}{it}
+
+\testEnglish{kinnari}{b}{it}
+
+\testEnglish{kinnari}{m}{sl}
+
+\testEnglish{kinnari}{b}{sl}
+
+
+\subsection{การจัดระดับตัวอักษรและตัวอักษรพิเศษ}
+\noindent
+\testligkern{kinnari}{m}{n}
+
+\testligkern{kinnari}{b}{n}
+
+\testligkern{kinnari}{m}{it}
+
+\testligkern{kinnari}{b}{it}
+
+\testligkern{kinnari}{m}{sl}
+
+\testligkern{kinnari}{b}{sl}
+
+\subsection{ภาษาบาลี-สันสกฤต}
+\testpali{kinnari}{m}{n}
+
+\testpali{kinnari}{b}{n}
+
+\testpali{kinnari}{m}{it}
+
+\testpali{kinnari}{b}{it}
+
+\testpali{kinnari}{m}{sl}
+
+\testpali{kinnari}{b}{sl}
+
+\vfil\pagebreak
+
+
+\section{\usefont{LTH}{garuda}{b}{n}Garuda -- ครุฑ\protect\footnote{จากโครงการฟอนต์แห่งชาติ (National Font Project)}}
+
+\subsection{ตัวอย่างประโยคภาษาไทย}
+
+\testthaipoem{garuda}{m}{n}
+
+\testthaipoem{garuda}{b}{n}
+
+\testthaipoem{garuda}{m}{it}
+
+\testthaipoem{garuda}{b}{it}
+
+\subsection{ตัวอย่างภาษาอังกฤษ}
+
+\testenglish{garuda}{m}{n}
+
+\testenglish{garuda}{b}{n}
+
+\testenglish{garuda}{m}{it}
+
+\testenglish{garuda}{b}{it}
+
+\testEnglish{garuda}{m}{n}
+
+\testEnglish{garuda}{b}{n}
+
+\testEnglish{garuda}{m}{it}
+
+\testEnglish{garuda}{b}{it}
+
+
+\subsection{การจัดระดับตัวอักษรและตัวอักษรพิเศษ}
+
+\testligkern{garuda}{m}{n}
+
+\testligkern{garuda}{b}{n}
+
+\testligkern{garuda}{m}{it}
+
+\testligkern{garuda}{b}{it}
+
+
+\subsection{ภาษาบาลี-สันสกฤต}
+
+\testpali{garuda}{m}{n}
+
+\testpali{garuda}{b}{n}
+
+\testpali{garuda}{m}{it}
+
+\testpali{garuda}{b}{it}
+
+\vfil\pagebreak
+
+\section{\usefont{LTH}{norasi}{b}{n}Norasi -- นรสีห์\protect\footnote{จากโครงการฟอนต์แห่งชาติ (National Font Project)}}
+
+\subsection{ตัวอย่างประโยคภาษาไทย}
+
+\testthaipoem{norasi}{m}{n}
+
+\testthaipoem{norasi}{b}{n}
+
+\testthaipoem{norasi}{m}{it}
+
+\testthaipoem{norasi}{b}{it}
+
+\testthaipoem{norasi}{m}{sl}
+
+\testthaipoem{norasi}{b}{sl}
+
+\subsection{ตัวอย่างภาษาอังกฤษ}
+\testenglish{norasi}{m}{n}
+
+\testenglish{norasi}{b}{n}
+
+\testenglish{norasi}{m}{it}
+
+\testenglish{norasi}{b}{it}
+
+\testenglish{norasi}{m}{sl}
+
+\testenglish{norasi}{b}{sl}
+
+\testEnglish{norasi}{m}{n}
+
+\testEnglish{norasi}{b}{n}
+
+\testEnglish{norasi}{m}{it}
+
+\testEnglish{norasi}{b}{it}
+
+\testEnglish{norasi}{m}{sl}
+
+\testEnglish{norasi}{b}{sl}
+
+
+\subsection{การจัดระดับตัวอักษรและตัวอักษรพิเศษ}
+
+\testligkern{norasi}{m}{n}
+
+\testligkern{norasi}{b}{n}
+
+\testligkern{norasi}{m}{it}
+
+\testligkern{norasi}{b}{it}
+
+\testligkern{norasi}{m}{sl}
+
+\testligkern{norasi}{b}{sl}
+
+\subsection{ภาษาบาลี-สันสกฤต}
+
+\testpali{norasi}{m}{n}
+
+\testpali{norasi}{b}{n}
+
+\testpali{norasi}{m}{it}
+
+\testpali{norasi}{b}{it}
+
+\vfil\pagebreak
+
+
+\section{\usefont{LTH}{laksaman}{b}{n}Laksaman -- ลักษมัณ\protect\footnote{ดัดแปลงจาก TH Sarabun New ของคุณศุภกิจ เฉลิมลาภ}}
+
+\subsection{ตัวอย่างประโยคภาษาไทย}
+
+\testthaipoem{laksaman}{m}{n}
+
+\testthaipoem{laksaman}{b}{n}
+
+\testthaipoem{laksaman}{m}{it}
+
+\testthaipoem{laksaman}{b}{it}
+
+\subsection{ตัวอย่างภาษาอังกฤษ}
+
+\testenglish{laksaman}{m}{n}
+
+\testenglish{laksaman}{b}{n}
+
+\testenglish{laksaman}{m}{it}
+
+\testenglish{laksaman}{b}{it}
+
+\testEnglish{laksaman}{m}{n}
+
+\testEnglish{laksaman}{b}{n}
+
+\testEnglish{laksaman}{m}{it}
+
+\testEnglish{laksaman}{b}{it}
+
+
+\subsection{การจัดระดับตัวอักษรและตัวอักษรพิเศษ}
+
+\testligkern{laksaman}{m}{n}
+
+\testligkern{laksaman}{b}{n}
+
+\testligkern{laksaman}{m}{it}
+
+\testligkern{laksaman}{b}{it}
+
+
+\subsection{ภาษาบาลี-สันสกฤต}
+
+\testpali{laksaman}{m}{n}
+
+\testpali{laksaman}{b}{n}
+
+\testpali{laksaman}{m}{it}
+
+\testpali{laksaman}{b}{it}
+
+\vfil\pagebreak
+
+
+\section{\usefont{LTH}{ttype}{b}{n}Tlwg Typewriter\protect\footnote{โดย Thai Linux Working Group (TLWG)}}
+
+\subsection{ตัวอย่างประโยคภาษาไทย}
+
+\testthaipoem{ttype}{m}{n}
+
+\testthaipoem{ttype}{b}{n}
+
+\testthaipoem{ttype}{m}{it}
+
+\testthaipoem{ttype}{b}{it}
+
+\subsection{ตัวอย่างภาษาอังกฤษ}
+
+\testenglish{ttype}{m}{n}
+
+\testenglish{ttype}{b}{n}
+
+\testenglish{ttype}{m}{it}
+
+\testenglish{ttype}{b}{it}
+
+\testEnglish{ttype}{m}{n}
+
+\testEnglish{ttype}{b}{n}
+
+\testEnglish{ttype}{m}{it}
+
+\testEnglish{ttype}{b}{it}
+
+
+\subsection{การจัดระดับตัวอักษรและตัวอักษรพิเศษ}
+
+\testligkern{ttype}{m}{n}
+
+\testligkern{ttype}{b}{n}
+
+\testligkern{ttype}{m}{it}
+
+\testligkern{ttype}{b}{it}
+
+
+\subsection{ภาษาบาลี-สันสกฤต}
+
+\testpali{ttype}{m}{n}
+
+\testpali{ttype}{b}{n}
+
+\testpali{ttype}{m}{it}
+
+\testpali{ttype}{b}{it}
+
+\vfil\pagebreak
+
+
+\section{\usefont{LTH}{ttypist}{b}{n}Tlwg Typist\protect\footnote{โดย Thai Linux Working Group (TLWG)}}
+
+\subsection{ตัวอย่างประโยคภาษาไทย}
+
+\testthaipoem{ttypist}{m}{n}
+
+\testthaipoem{ttypist}{b}{n}
+
+\testthaipoem{ttypist}{m}{it}
+
+\testthaipoem{ttypist}{b}{it}
+
+\subsection{ตัวอย่างภาษาอังกฤษ}
+
+\testenglish{ttypist}{m}{n}
+
+\testenglish{ttypist}{b}{n}
+
+\testenglish{ttypist}{m}{it}
+
+\testenglish{ttypist}{b}{it}
+
+\testEnglish{ttypist}{m}{n}
+
+\testEnglish{ttypist}{b}{n}
+
+\testEnglish{ttypist}{m}{it}
+
+\testEnglish{ttypist}{b}{it}
+
+
+\subsection{การจัดระดับตัวอักษรและตัวอักษรพิเศษ}
+
+\testligkern{ttypist}{m}{n}
+
+\testligkern{ttypist}{b}{n}
+
+\testligkern{ttypist}{m}{it}
+
+\testligkern{ttypist}{b}{it}
+
+
+\subsection{ภาษาบาลี-สันสกฤต}
+
+\testpali{ttypist}{m}{n}
+
+\testpali{ttypist}{b}{n}
+
+\testpali{ttypist}{m}{it}
+
+\testpali{ttypist}{b}{it}
+
+\vfil\pagebreak
+
+
+\section{\usefont{LTH}{purisa}{m}{n}Purisa -- ภูริสา\protect\footnote{โดย Thai Linux Working Group (TLWG)}}
+
+\subsection{ตัวอย่างประโยคภาษาไทย}
+
+\testthaipoem{purisa}{m}{n}
+
+\testthaipoem{purisa}{b}{n}
+
+\testthaipoem{purisa}{m}{it}
+
+\testthaipoem{purisa}{b}{it}
+
+\subsection{ตัวอย่างภาษาอังกฤษ}
+
+\testenglish{purisa}{m}{n}
+
+\testenglish{purisa}{b}{n}
+
+\testenglish{purisa}{m}{it}
+
+\testenglish{purisa}{b}{it}
+
+\testEnglish{purisa}{m}{n}
+
+\testEnglish{purisa}{b}{n}
+
+\testEnglish{purisa}{m}{it}
+
+\testEnglish{purisa}{b}{it}
+
+
+\subsection{การจัดระดับตัวอักษรและตัวอักษรพิเศษ}
+
+\testligkern{purisa}{m}{n}
+
+\testligkern{purisa}{b}{n}
+
+\testligkern{purisa}{m}{it}
+
+\testligkern{purisa}{b}{it}
+
+
+\subsection{ภาษาบาลี-สันสกฤต}
+
+\testpali{purisa}{m}{n}
+
+\testpali{purisa}{b}{n}
+
+\testpali{purisa}{m}{it}
+
+\testpali{purisa}{b}{it}
+
+\vfil\pagebreak
+
+
+\section{\usefont{LTH}{loma}{b}{n}Loma -- โลมา\protect\footnote{จากศูนย์เทคโนโลยีอิเล็กทรอนิกส์และคอมพิวเตอร์แห่งชาติ (NECTEC)}}
+
+\subsection{ตัวอย่างประโยคภาษาไทย}
+
+\testthaipoem{loma}{m}{n}
+
+\testthaipoem{loma}{b}{n}
+
+\testthaipoem{loma}{m}{it}
+
+\testthaipoem{loma}{b}{it}
+
+\subsection{ตัวอย่างภาษาอังกฤษ}
+
+\testenglish{loma}{m}{n}
+
+\testenglish{loma}{b}{n}
+
+\testenglish{loma}{m}{it}
+
+\testenglish{loma}{b}{it}
+
+\testEnglish{loma}{m}{n}
+
+\testEnglish{loma}{b}{n}
+
+\testEnglish{loma}{m}{it}
+
+\testEnglish{loma}{b}{it}
+
+
+\subsection{การจัดระดับตัวอักษรและตัวอักษรพิเศษ}
+
+\testligkern{loma}{m}{n}
+
+\testligkern{loma}{b}{n}
+
+\testligkern{loma}{m}{it}
+
+\testligkern{loma}{b}{it}
+
+
+\subsection{ภาษาบาลี-สันสกฤต}
+
+\testpali{loma}{m}{n}
+
+\testpali{loma}{b}{n}
+
+\testpali{loma}{m}{it}
+
+\testpali{loma}{b}{it}
+
+\vfil\pagebreak
+
+
+\section{\usefont{LTH}{waree}{b}{n}Waree -- วารี\protect\footnote{โดย คุณวิทยา ไตรสารวัฒนะ}}
+
+\subsection{ตัวอย่างประโยคภาษาไทย}
+
+\testthaipoem{waree}{m}{n}
+
+\testthaipoem{waree}{b}{n}
+
+\testthaipoem{waree}{m}{it}
+
+\testthaipoem{waree}{b}{it}
+
+\subsection{ตัวอย่างภาษาอังกฤษ}
+
+\testenglish{waree}{m}{n}
+
+\testenglish{waree}{b}{n}
+
+\testenglish{waree}{m}{it}
+
+\testenglish{waree}{b}{it}
+
+\testEnglish{waree}{m}{n}
+
+\testEnglish{waree}{b}{n}
+
+\testEnglish{waree}{m}{it}
+
+\testEnglish{waree}{b}{it}
+
+
+\subsection{การจัดระดับตัวอักษรและตัวอักษรพิเศษ}
+
+\testligkern{waree}{m}{n}
+
+\testligkern{waree}{b}{n}
+
+\testligkern{waree}{m}{it}
+
+\testligkern{waree}{b}{it}
+
+\subsection{ภาษาบาลี-สันสกฤต}
+
+\testpali{waree}{m}{n}
+
+\testpali{waree}{b}{n}
+
+\testpali{waree}{m}{it}
+
+\testpali{waree}{b}{it}
+
+\vfil\pagebreak
+
+
+\section{\usefont{LTH}{umpush}{b}{n}Umpush -- อัมพุช\protect\footnote{โดย คุณวิทยา ไตรสารวัฒนะ}}
+
+\subsection{ตัวอย่างประโยคภาษาไทย}
+
+\testthaipoem{umpush}{l}{n}
+
+\testthaipoem{umpush}{m}{n}
+
+\testthaipoem{umpush}{b}{n}
+
+\testthaipoem{umpush}{l}{it}
+
+\testthaipoem{umpush}{m}{it}
+
+\testthaipoem{umpush}{b}{it}
+
+\subsection{ตัวอย่างภาษาอังกฤษ}
+
+\testenglish{umpush}{l}{n}
+
+\testenglish{umpush}{m}{n}
+
+\testenglish{umpush}{b}{n}
+
+\testenglish{umpush}{l}{it}
+
+\testenglish{umpush}{m}{it}
+
+\testenglish{umpush}{b}{it}
+
+\testEnglish{umpush}{l}{n}
+
+\testEnglish{umpush}{m}{n}
+
+\testEnglish{umpush}{b}{n}
+
+\testEnglish{umpush}{l}{it}
+
+\testEnglish{umpush}{m}{it}
+
+\testEnglish{umpush}{b}{it}
+
+
+\subsection{การจัดระดับตัวอักษรและตัวอักษรพิเศษ}
+
+\testligkern{umpush}{l}{n}
+
+\testligkern{umpush}{m}{n}
+
+\testligkern{umpush}{b}{n}
+
+\testligkern{umpush}{l}{it}
+
+\testligkern{umpush}{m}{it}
+
+\testligkern{umpush}{b}{it}
+
+
+\subsection{ภาษาบาลี-สันสกฤต}
+
+\testpali{umpush}{l}{n}
+
+\testpali{umpush}{m}{n}
+
+\testpali{umpush}{b}{n}
+
+\testpali{umpush}{l}{it}
+
+\testpali{umpush}{m}{it}
+
+\testpali{umpush}{b}{it}
+
+\vfil\pagebreak
+
+
+\section{\usefont{LTH}{sawasdee}{b}{n}Sawasdee -- สวัสดี\protect\footnote{โดย คุณพล อุดมวิทยานุกูล}}
+
+\subsection{ตัวอย่างประโยคภาษาไทย}
+
+\testthaipoem{sawasdee}{m}{n}
+
+\testthaipoem{sawasdee}{b}{n}
+
+\testthaipoem{sawasdee}{m}{it}
+
+\testthaipoem{sawasdee}{b}{it}
+
+\subsection{ตัวอย่างภาษาอังกฤษ}
+
+\testenglish{sawasdee}{m}{n}
+
+\testenglish{sawasdee}{b}{n}
+
+\testenglish{sawasdee}{m}{it}
+
+\testenglish{sawasdee}{b}{it}
+
+\testEnglish{sawasdee}{m}{n}
+
+\testEnglish{sawasdee}{b}{n}
+
+\testEnglish{sawasdee}{m}{it}
+
+\testEnglish{sawasdee}{b}{it}
+
+
+\subsection{การจัดระดับตัวอักษรและตัวอักษรพิเศษ}
+
+\testligkern{sawasdee}{m}{n}
+
+\testligkern{sawasdee}{b}{n}
+
+\testligkern{sawasdee}{m}{it}
+
+\testligkern{sawasdee}{b}{it}
+
+
+\subsection{ภาษาบาลี-สันสกฤต}
+
+\testpali{sawasdee}{m}{n}
+
+\testpali{sawasdee}{b}{n}
+
+\testpali{sawasdee}{m}{it}
+
+\testpali{sawasdee}{b}{it}
+
+\vfil\pagebreak
+
+
+\end{document}
diff --git a/Master/texmf-dist/source/fonts/fonts-tlwg/latex/fonts-tlwg.sty b/Master/texmf-dist/source/fonts/fonts-tlwg/latex/fonts-tlwg.sty
index fc14f324a95..242009ff21b 100644
--- a/Master/texmf-dist/source/fonts/fonts-tlwg/latex/fonts-tlwg.sty
+++ b/Master/texmf-dist/source/fonts/fonts-tlwg/latex/fonts-tlwg.sty
@@ -4,7 +4,7 @@
%
% Copyright (C) 1999 National Electronics and Computer Technology Center
% (NECTEC), Thailand. All rights reserved.
-%
+%
% It 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.
@@ -12,13 +12,14 @@
% http://www.latex-project.org/lppl.txt
% and version 1.3 or later is part of all distributions of LaTeX
% version 2005/12/01 or later.
-%
+%
% This work has the LPPL maintenance status "maintained".
-%
+%
% The Current Maintainer of this work is Theppitak Karoonboonyanan.
-%
+%
\ProvidesPackage{fonts-tlwg}[2014/07/05 v1.1 Thai TLWG Fonts]
+\RequirePackage{xkeyval}
\newcommand\thairmdefault{norasi}
\newcommand\thaisfdefault{garuda}
@@ -30,40 +31,45 @@
\newcommand{\thaifamilydefault}{\thairmdefault}
\newcommand{\englishfamilydefault}{\englishrmdefault}
+% Introduce scaled option
+\newcommand*{\fontstlwg@scale}{1}
+\DeclareOptionX{scale}{\renewcommand*{\fontstlwg@scale}{#1}}
+
% Use sans-serif font by default
-\DeclareOption{sans}{
+\DeclareOptionX{sans}{
\renewcommand{\thaifamilydefault}{\thaisfdefault}
\renewcommand{\englishfamilydefault}{\englishsfdefault}
}
% Set default roman, sans-serif, and teletype fonts
-\DeclareOption{rmkinnari}{\renewcommand{\thairmdefault}{kinnari}}
-\DeclareOption{rmnorasi}{\renewcommand{\thairmdefault}{norasi}}
-\DeclareOption{sfgaruda}{\renewcommand{\thaisfdefault}{garuda}}
-\DeclareOption{sflaksaman}{\renewcommand{\thaisfdefault}{laksaman}}
-\DeclareOption{sfumpush}{\renewcommand{\thaisfdefault}{umpush}}
-\DeclareOption{sfloma}{\renewcommand{\thaisfdefault}{loma}}
-\DeclareOption{sfwaree}{\renewcommand{\thaisfdefault}{waree}}
-\DeclareOption{ttttype}{\renewcommand{\thaittdefault}{ttype}}
-\DeclareOption{ttttypist}{\renewcommand{\thaittdefault}{ttypist}}
+\DeclareOptionX{rmkinnari}{\renewcommand{\thairmdefault}{kinnari}}
+\DeclareOptionX{rmnorasi}{\renewcommand{\thairmdefault}{norasi}}
+\DeclareOptionX{sfgaruda}{\renewcommand{\thaisfdefault}{garuda}}
+\DeclareOptionX{sflaksaman}{\renewcommand{\thaisfdefault}{laksaman}}
+\DeclareOptionX{sfumpush}{\renewcommand{\thaisfdefault}{umpush}}
+\DeclareOptionX{sfloma}{\renewcommand{\thaisfdefault}{loma}}
+\DeclareOptionX{sfwaree}{\renewcommand{\thaisfdefault}{waree}}
+\DeclareOptionX{ttttype}{\renewcommand{\thaittdefault}{ttype}}
+\DeclareOptionX{ttttypist}{\renewcommand{\thaittdefault}{ttypist}}
% Set default font
-\DeclareOption{kinnari}{\renewcommand{\thaifamilydefault}{kinnari}}
-\DeclareOption{garuda}{\renewcommand{\thaifamilydefault}{garuda}}
-\DeclareOption{norasi}{\renewcommand{\thaifamilydefault}{norasi}}
-\DeclareOption{laksaman}{\renewcommand{\thaifamilydefault}{laksaman}}
-\DeclareOption{loma}{\renewcommand{\thaifamilydefault}{loma}}
-\DeclareOption{purisa}{\renewcommand{\thaifamilydefault}{purisa}}
-\DeclareOption{sawasdee}{\renewcommand{\thaifamilydefault}{sawasdee}}
-\DeclareOption{ttype}{\renewcommand{\thaifamilydefault}{ttype}}
-\DeclareOption{ttypist}{\renewcommand{\thaifamilydefault}{ttypist}}
-\DeclareOption{umpush}{\renewcommand{\thaifamilydefault}{umpush}}
-\DeclareOption{waree}{\renewcommand{\thaifamilydefault}{waree}}
+\DeclareOptionX{kinnari}{\renewcommand{\thaifamilydefault}{kinnari}}
+\DeclareOptionX{garuda}{\renewcommand{\thaifamilydefault}{garuda}}
+\DeclareOptionX{norasi}{\renewcommand{\thaifamilydefault}{norasi}}
+\DeclareOptionX{laksaman}{\renewcommand{\thaifamilydefault}{laksaman}}
+\DeclareOptionX{loma}{\renewcommand{\thaifamilydefault}{loma}}
+\DeclareOptionX{purisa}{\renewcommand{\thaifamilydefault}{purisa}}
+\DeclareOptionX{sawasdee}{\renewcommand{\thaifamilydefault}{sawasdee}}
+\DeclareOptionX{ttype}{\renewcommand{\thaifamilydefault}{ttype}}
+\DeclareOptionX{ttypist}{\renewcommand{\thaifamilydefault}{ttypist}}
+\DeclareOptionX{umpush}{\renewcommand{\thaifamilydefault}{umpush}}
+\DeclareOptionX{waree}{\renewcommand{\thaifamilydefault}{waree}}
-\ProcessOptions\relax
+\ProcessOptionsX\relax
\DeclareRobustCommand{\thaitext}{%
\fontencoding{LTH}\fontfamily{\thaifamilydefault}\selectfont
+ \def\familydefault{\thaifamilydefault}%
\def\rmdefault{\thairmdefault}%
\def\sfdefault{\thaisfdefault}%
\def\ttdefault{\thaittdefault}%
@@ -71,6 +77,7 @@
\DeclareRobustCommand{\latintext}{%
\fontencoding{\latinencoding}\fontfamily{\englishfamilydefault}\selectfont
+ \def\familydefault{\englishfamilydefault}%
\def\rmdefault{\englishrmdefault}%
\def\sfdefault{\englishsfdefault}%
\def\ttdefault{\englishttdefault}%
diff --git a/Master/texmf-dist/source/fonts/fonts-tlwg/latex/lthgaruda.fd b/Master/texmf-dist/source/fonts/fonts-tlwg/latex/lthgaruda.fd
index 7e89f21f31e..1287fb31fe1 100644
--- a/Master/texmf-dist/source/fonts/fonts-tlwg/latex/lthgaruda.fd
+++ b/Master/texmf-dist/source/fonts/fonts-tlwg/latex/lthgaruda.fd
@@ -4,7 +4,7 @@
%
% Copyright (C) 1999 National Electronics and Computer Technology Center
% (NECTEC), Thailand. All rights reserved.
-%
+%
% It 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.
@@ -12,12 +12,14 @@
% http://www.latex-project.org/lppl.txt
% and version 1.3 or later is part of all distributions of LaTeX
% version 2005/12/01 or later.
-%
+%
% This work has the LPPL maintenance status "maintained".
-%
+%
% The Current Maintainer of this work is Theppitak Karoonboonyanan.
-%
+%
% Created by Surapant Meknavin: surapan@nectec.or.th
+% 2017/09/11 Abhabongse Janthong <abhabongse@gmail.com>
+% - add font scaling
% 2003/06/02 Chanop Silpa-Anan <chanop@debian.org>
% - update using basic slant font
% 2002/12/30 Poonlap Veerathanabutr <poonlap@linux.thai.net>
@@ -28,13 +30,20 @@
\ProvidesFile{lthgaruda.fd}[2002/12/30 v1.0 Thai font definitions]
+% Check if the scale factor has been defined
+\ifcsname fontstlwg@scale\endcsname
+ \edef\fontstlwg@@scale{s * [\csname fontstlwg@scale\endcsname] }%
+\else
+ \def\fontstlwg@@scale{s * }%
+\fi
+
% Primary declarations
\DeclareFontFamily{LTH}{garuda}{}
-\DeclareFontShape{LTH}{garuda}{m}{n}{<->s * garuda}{}
-\DeclareFontShape{LTH}{garuda}{m}{sl}{<->s * garuda_o}{}
+\DeclareFontShape{LTH}{garuda}{m}{n}{<-> \fontstlwg@@scale garuda}{}
+\DeclareFontShape{LTH}{garuda}{m}{sl}{<-> \fontstlwg@@scale garuda_o}{}
%%%%%%% bold series
-\DeclareFontShape{LTH}{garuda}{b}{n}{<->s * garuda_b}{}
-\DeclareFontShape{LTH}{garuda}{b}{sl}{<->s * garuda_bo}{}
+\DeclareFontShape{LTH}{garuda}{b}{n}{<-> \fontstlwg@@scale garuda_b}{}
+\DeclareFontShape{LTH}{garuda}{b}{sl}{<-> \fontstlwg@@scale garuda_bo}{}
% Substitutions
\DeclareFontShape{LTH}{garuda}{m}{it}{<->ssub * garuda/m/sl}{}
@@ -45,6 +54,6 @@
\DeclareFontShape{LTH}{garuda}{bx}{it}{<->ssub * garuda/b/sl}{}
\endinput
-%
+%
% EOF
%
diff --git a/Master/texmf-dist/source/fonts/fonts-tlwg/latex/lthkinnari.fd b/Master/texmf-dist/source/fonts/fonts-tlwg/latex/lthkinnari.fd
index efce4a9d2ba..2da58b53932 100644
--- a/Master/texmf-dist/source/fonts/fonts-tlwg/latex/lthkinnari.fd
+++ b/Master/texmf-dist/source/fonts/fonts-tlwg/latex/lthkinnari.fd
@@ -4,7 +4,7 @@
%
% Copyright (C) 1999 National Electronics and Computer Technology Center
% (NECTEC), Thailand. All rights reserved.
-%
+%
% It 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.
@@ -12,11 +12,13 @@
% http://www.latex-project.org/lppl.txt
% and version 1.3 or later is part of all distributions of LaTeX
% version 2005/12/01 or later.
-%
+%
% This work has the LPPL maintenance status "maintained".
-%
+%
% The Current Maintainer of this work is Theppitak Karoonboonyanan.
-%
+%
+% 2017/09/11 Abhabongse Janthong <abhabongse@gmail.com>
+% - add font scaling
% 2005/01/24 Theppitak Karoonboonyanan <thep@linux.thai.net>
% - italic shape added for medium and bold face series
% 2004/02/05 Poonlap Veerathanabutr <poonlap@linux.thai.net>
@@ -24,15 +26,22 @@
\ProvidesFile{lthkinnari.fd}[2004/02/05 v1.0 Thai font definitions]
+% Check if the scale factor has been defined
+\ifcsname fontstlwg@scale\endcsname
+ \edef\fontstlwg@@scale{s * [\csname fontstlwg@scale\endcsname] }%
+\else
+ \def\fontstlwg@@scale{s * }%
+\fi
+
% Primary declarations
\DeclareFontFamily{LTH}{kinnari}{}
-\DeclareFontShape{LTH}{kinnari}{m}{n}{<->s * kinnari}{}
-\DeclareFontShape{LTH}{kinnari}{m}{it}{<->s * kinnari_i}{}
-\DeclareFontShape{LTH}{kinnari}{m}{sl}{<->s * kinnari_o}{}
+\DeclareFontShape{LTH}{kinnari}{m}{n}{<-> \fontstlwg@@scale kinnari}{}
+\DeclareFontShape{LTH}{kinnari}{m}{it}{<-> \fontstlwg@@scale kinnari_i}{}
+\DeclareFontShape{LTH}{kinnari}{m}{sl}{<-> \fontstlwg@@scale kinnari_o}{}
%%%%%%% bold series
-\DeclareFontShape{LTH}{kinnari}{b}{n}{<->s * kinnari_b}{}
-\DeclareFontShape{LTH}{kinnari}{b}{it}{<->s * kinnari_bi}{}
-\DeclareFontShape{LTH}{kinnari}{b}{sl}{<->s * kinnari_bo}{}
+\DeclareFontShape{LTH}{kinnari}{b}{n}{<-> \fontstlwg@@scale kinnari_b}{}
+\DeclareFontShape{LTH}{kinnari}{b}{it}{<-> \fontstlwg@@scale kinnari_bi}{}
+\DeclareFontShape{LTH}{kinnari}{b}{sl}{<-> \fontstlwg@@scale kinnari_bo}{}
% Substitutions
\DeclareFontShape{LTH}{kinnari}{bx}{n}{<->ssub * kinnari/b/n}{}
@@ -40,6 +49,6 @@
\DeclareFontShape{LTH}{kinnari}{bx}{it}{<->ssub * kinnari/b/it}{}
\endinput
-%
+%
% EOF
%
diff --git a/Master/texmf-dist/source/fonts/fonts-tlwg/latex/lthlaksaman.fd b/Master/texmf-dist/source/fonts/fonts-tlwg/latex/lthlaksaman.fd
index c85f10e80d1..39379890a74 100644
--- a/Master/texmf-dist/source/fonts/fonts-tlwg/latex/lthlaksaman.fd
+++ b/Master/texmf-dist/source/fonts/fonts-tlwg/latex/lthlaksaman.fd
@@ -4,7 +4,7 @@
%
% Copyright (C) 1999 National Electronics and Computer Technology Center
% (NECTEC), Thailand. All rights reserved.
-%
+%
% It 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.
@@ -12,23 +12,32 @@
% http://www.latex-project.org/lppl.txt
% and version 1.3 or later is part of all distributions of LaTeX
% version 2005/12/01 or later.
-%
+%
% This work has the LPPL maintenance status "maintained".
-%
+%
% The Current Maintainer of this work is Theppitak Karoonboonyanan.
-%
+%
+% 2017/09/11 Abhabongse Janthong <abhabongse@gmail.com>
+% - add font scaling
% 2014/06/26 Theppitak Karoonboonyanan <thep@linux.thai.net>
% - first version
\ProvidesFile{lthlaksaman.fd}[2014/06/24 v1.0 Thai font definitions]
+% Check if the scale factor has been defined
+\ifcsname fontstlwg@scale\endcsname
+ \edef\fontstlwg@@scale{s * [\csname fontstlwg@scale\endcsname] }%
+\else
+ \def\fontstlwg@@scale{s * }%
+\fi
+
% Primary declarations
\DeclareFontFamily{LTH}{laksaman}{}
-\DeclareFontShape{LTH}{laksaman}{m}{n}{<->s * laksaman}{}
-\DeclareFontShape{LTH}{laksaman}{m}{it}{<->s * laksaman_i}{}
+\DeclareFontShape{LTH}{laksaman}{m}{n}{<-> \fontstlwg@@scale laksaman}{}
+\DeclareFontShape{LTH}{laksaman}{m}{it}{<-> \fontstlwg@@scale laksaman_i}{}
%%%%%%% bold series
-\DeclareFontShape{LTH}{laksaman}{b}{n}{<->s * laksaman_b}{}
-\DeclareFontShape{LTH}{laksaman}{b}{it}{<->s * laksaman_bi}{}
+\DeclareFontShape{LTH}{laksaman}{b}{n}{<-> \fontstlwg@@scale laksaman_b}{}
+\DeclareFontShape{LTH}{laksaman}{b}{it}{<-> \fontstlwg@@scale laksaman_bi}{}
% Substitutions
\DeclareFontShape{LTH}{laksaman}{m}{sl}{<->ssub * laksaman/m/it}{}
@@ -39,6 +48,6 @@
\DeclareFontShape{LTH}{laksaman}{bx}{sl}{<->ssub * laksaman/b/it}{}
\endinput
-%
+%
% EOF
%
diff --git a/Master/texmf-dist/source/fonts/fonts-tlwg/latex/lthloma.fd b/Master/texmf-dist/source/fonts/fonts-tlwg/latex/lthloma.fd
index f10defc16ab..c03ad77940b 100644
--- a/Master/texmf-dist/source/fonts/fonts-tlwg/latex/lthloma.fd
+++ b/Master/texmf-dist/source/fonts/fonts-tlwg/latex/lthloma.fd
@@ -4,7 +4,7 @@
%
% Copyright (C) 1999 National Electronics and Computer Technology Center
% (NECTEC), Thailand. All rights reserved.
-%
+%
% It 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.
@@ -12,23 +12,32 @@
% http://www.latex-project.org/lppl.txt
% and version 1.3 or later is part of all distributions of LaTeX
% version 2005/12/01 or later.
-%
+%
% This work has the LPPL maintenance status "maintained".
-%
+%
% The Current Maintainer of this work is Theppitak Karoonboonyanan.
-%
+%
+% 2017/09/11 Abhabongse Janthong <abhabongse@gmail.com>
+% - add font scaling
% 2006/03/26 Theppitak Karoonboonyanan <thep@linux.thai.net>
% - first version based on lthloma.fd
\ProvidesFile{lthloma.fd}[2006/03/26 v1.0 Thai font definitions]
+% Check if the scale factor has been defined
+\ifcsname fontstlwg@scale\endcsname
+ \edef\fontstlwg@@scale{s * [\csname fontstlwg@scale\endcsname] }%
+\else
+ \def\fontstlwg@@scale{s * }%
+\fi
+
% Primary declarations
\DeclareFontFamily{LTH}{loma}{}
-\DeclareFontShape{LTH}{loma}{m}{n}{<->s * loma}{}
-\DeclareFontShape{LTH}{loma}{m}{sl}{<->s * loma_o}{}
+\DeclareFontShape{LTH}{loma}{m}{n}{<-> \fontstlwg@@scale loma}{}
+\DeclareFontShape{LTH}{loma}{m}{sl}{<-> \fontstlwg@@scale loma_o}{}
%%%%%%% bold series
-\DeclareFontShape{LTH}{loma}{b}{n}{<->s * loma_b}{}
-\DeclareFontShape{LTH}{loma}{b}{sl}{<->s * loma_bo}{}
+\DeclareFontShape{LTH}{loma}{b}{n}{<-> \fontstlwg@@scale loma_b}{}
+\DeclareFontShape{LTH}{loma}{b}{sl}{<-> \fontstlwg@@scale loma_bo}{}
% Substitutions
\DeclareFontShape{LTH}{loma}{m}{it}{<->ssub * loma/m/sl}{}
@@ -39,6 +48,6 @@
\DeclareFontShape{LTH}{loma}{bx}{it}{<->ssub * loma/b/sl}{}
\endinput
-%
+%
% EOF
%
diff --git a/Master/texmf-dist/source/fonts/fonts-tlwg/latex/lthnorasi.fd b/Master/texmf-dist/source/fonts/fonts-tlwg/latex/lthnorasi.fd
index 9d9becea47c..d50664d27d9 100644
--- a/Master/texmf-dist/source/fonts/fonts-tlwg/latex/lthnorasi.fd
+++ b/Master/texmf-dist/source/fonts/fonts-tlwg/latex/lthnorasi.fd
@@ -4,7 +4,7 @@
%
% Copyright (C) 1999 National Electronics and Computer Technology Center
% (NECTEC), Thailand. All rights reserved.
-%
+%
% It 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.
@@ -12,12 +12,14 @@
% http://www.latex-project.org/lppl.txt
% and version 1.3 or later is part of all distributions of LaTeX
% version 2005/12/01 or later.
-%
+%
% This work has the LPPL maintenance status "maintained".
-%
+%
% The Current Maintainer of this work is Theppitak Karoonboonyanan.
-%
+%
% Created by Surapant Meknavin: surapan@nectec.or.th
+% 2017/09/11 Abhabongse Janthong <abhabongse@gmail.com>
+% - add font scaling
% 2003/06/02 Chanop Silpa-Anan <chanop@debian.org>
% - update using basic slant font
% 2000/05/09 Theppitak Karoonboonyanan <thep@links.nectec.or.th>
@@ -26,15 +28,22 @@
\ProvidesFile{lthnorasi.fd}[2000/05/09 v1.0 Thai font definitions]
+% Check if the scale factor has been defined
+\ifcsname fontstlwg@scale\endcsname
+ \edef\fontstlwg@@scale{s * [\csname fontstlwg@scale\endcsname] }%
+\else
+ \def\fontstlwg@@scale{s * }%
+\fi
+
% Primary declarations
\DeclareFontFamily{LTH}{norasi}{}
-\DeclareFontShape{LTH}{norasi}{m}{n}{<->s * norasi}{}
-\DeclareFontShape{LTH}{norasi}{m}{it}{<->s * norasi_i}{}
-\DeclareFontShape{LTH}{norasi}{m}{sl}{<->s * norasi_o}{}
+\DeclareFontShape{LTH}{norasi}{m}{n}{<-> \fontstlwg@@scale norasi}{}
+\DeclareFontShape{LTH}{norasi}{m}{it}{<-> \fontstlwg@@scale norasi_i}{}
+\DeclareFontShape{LTH}{norasi}{m}{sl}{<-> \fontstlwg@@scale norasi_o}{}
%%%%%%% bold series
-\DeclareFontShape{LTH}{norasi}{b}{n}{<->s * norasi_b}{}
-\DeclareFontShape{LTH}{norasi}{b}{it}{<->s * norasi_bi}{}
-\DeclareFontShape{LTH}{norasi}{b}{sl}{<->s * norasi_bo}{}
+\DeclareFontShape{LTH}{norasi}{b}{n}{<-> \fontstlwg@@scale norasi_b}{}
+\DeclareFontShape{LTH}{norasi}{b}{it}{<-> \fontstlwg@@scale norasi_bi}{}
+\DeclareFontShape{LTH}{norasi}{b}{sl}{<-> \fontstlwg@@scale norasi_bo}{}
% Substitutions
\DeclareFontShape{LTH}{norasi}{bx}{n}{<->ssub * norasi/b/n}{}
@@ -42,6 +51,6 @@
\DeclareFontShape{LTH}{norasi}{bx}{it}{<->ssub * norasi/b/it}{}
\endinput
-%
+%
% EOF
%
diff --git a/Master/texmf-dist/source/fonts/fonts-tlwg/latex/lthpurisa.fd b/Master/texmf-dist/source/fonts/fonts-tlwg/latex/lthpurisa.fd
index b70d4eca840..0c5e91efb5b 100644
--- a/Master/texmf-dist/source/fonts/fonts-tlwg/latex/lthpurisa.fd
+++ b/Master/texmf-dist/source/fonts/fonts-tlwg/latex/lthpurisa.fd
@@ -4,7 +4,7 @@
%
% Copyright (C) 1999 National Electronics and Computer Technology Center
% (NECTEC), Thailand. All rights reserved.
-%
+%
% It 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.
@@ -12,23 +12,32 @@
% http://www.latex-project.org/lppl.txt
% and version 1.3 or later is part of all distributions of LaTeX
% version 2005/12/01 or later.
-%
+%
% This work has the LPPL maintenance status "maintained".
-%
+%
% The Current Maintainer of this work is Theppitak Karoonboonyanan.
-%
+%
+% 2017/09/11 Abhabongse Janthong <abhabongse@gmail.com>
+% - add font scaling
% 2004/02/05 Poonlap Veerathanabutr <poonlap@linux.thai.net>
% - first release (based on lthgaruda.fd)
\ProvidesFile{lthpurisa.fd}[2004/02/05 v1.0 Thai font definitions]
+% Check if the scale factor has been defined
+\ifcsname fontstlwg@scale\endcsname
+ \edef\fontstlwg@@scale{s * [\csname fontstlwg@scale\endcsname] }%
+\else
+ \def\fontstlwg@@scale{s * }%
+\fi
+
% Primary declarations
\DeclareFontFamily{LTH}{purisa}{}
-\DeclareFontShape{LTH}{purisa}{m}{n}{<->s * purisa}{}
-\DeclareFontShape{LTH}{purisa}{m}{sl}{<->s * purisa_o}{}
+\DeclareFontShape{LTH}{purisa}{m}{n}{<-> \fontstlwg@@scale purisa}{}
+\DeclareFontShape{LTH}{purisa}{m}{sl}{<-> \fontstlwg@@scale purisa_o}{}
%%%%%%% bold series
-\DeclareFontShape{LTH}{purisa}{b}{n}{<->s * purisa_b}{}
-\DeclareFontShape{LTH}{purisa}{b}{sl}{<->s * purisa_bo}{}
+\DeclareFontShape{LTH}{purisa}{b}{n}{<-> \fontstlwg@@scale purisa_b}{}
+\DeclareFontShape{LTH}{purisa}{b}{sl}{<-> \fontstlwg@@scale purisa_bo}{}
% Substitutions
\DeclareFontShape{LTH}{purisa}{m}{it}{<->ssub * purisa/m/sl}{}
@@ -39,6 +48,6 @@
\DeclareFontShape{LTH}{purisa}{bx}{it}{<->ssub * purisa/b/sl}{}
\endinput
-%
+%
% EOF
%
diff --git a/Master/texmf-dist/source/fonts/fonts-tlwg/latex/lthsawasdee.fd b/Master/texmf-dist/source/fonts/fonts-tlwg/latex/lthsawasdee.fd
index da24a2d3406..ff64d311a39 100644
--- a/Master/texmf-dist/source/fonts/fonts-tlwg/latex/lthsawasdee.fd
+++ b/Master/texmf-dist/source/fonts/fonts-tlwg/latex/lthsawasdee.fd
@@ -4,7 +4,7 @@
%
% Copyright (C) 1999 National Electronics and Computer Technology Center
% (NECTEC), Thailand. All rights reserved.
-%
+%
% It 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.
@@ -12,23 +12,32 @@
% http://www.latex-project.org/lppl.txt
% and version 1.3 or later is part of all distributions of LaTeX
% version 2005/12/01 or later.
-%
+%
% This work has the LPPL maintenance status "maintained".
-%
+%
% The Current Maintainer of this work is Theppitak Karoonboonyanan.
-%
+%
+% 2017/09/11 Abhabongse Janthong <abhabongse@gmail.com>
+% - add font scaling
% 2008/01/21 Theppitak Karoonboonyanan <thep@linux.thai.net>
% - first version
\ProvidesFile{lthsawasdee.fd}[2008/01/21 v1.0 Thai font definitions]
+% Check if the scale factor has been defined
+\ifcsname fontstlwg@scale\endcsname
+ \edef\fontstlwg@@scale{s * [\csname fontstlwg@scale\endcsname] }%
+\else
+ \def\fontstlwg@@scale{s * }%
+\fi
+
% Primary declarations
\DeclareFontFamily{LTH}{sawasdee}{}
-\DeclareFontShape{LTH}{sawasdee}{m}{n}{<->s * sawasdee}{}
-\DeclareFontShape{LTH}{sawasdee}{m}{sl}{<->s * sawasdee_o}{}
+\DeclareFontShape{LTH}{sawasdee}{m}{n}{<-> \fontstlwg@@scale sawasdee}{}
+\DeclareFontShape{LTH}{sawasdee}{m}{sl}{<-> \fontstlwg@@scale sawasdee_o}{}
%%%%%%% bold series
-\DeclareFontShape{LTH}{sawasdee}{b}{n}{<->s * sawasdee_b}{}
-\DeclareFontShape{LTH}{sawasdee}{b}{sl}{<->s * sawasdee_bo}{}
+\DeclareFontShape{LTH}{sawasdee}{b}{n}{<-> \fontstlwg@@scale sawasdee_b}{}
+\DeclareFontShape{LTH}{sawasdee}{b}{sl}{<-> \fontstlwg@@scale sawasdee_bo}{}
% Substitutions
\DeclareFontShape{LTH}{sawasdee}{m}{it}{<->ssub * sawasdee/m/sl}{}
@@ -39,6 +48,6 @@
\DeclareFontShape{LTH}{sawasdee}{bx}{it}{<->ssub * sawasdee/b/sl}{}
\endinput
-%
+%
% EOF
%
diff --git a/Master/texmf-dist/source/fonts/fonts-tlwg/latex/lthttype.fd b/Master/texmf-dist/source/fonts/fonts-tlwg/latex/lthttype.fd
index 663f51db3ba..aec0c1b2e38 100644
--- a/Master/texmf-dist/source/fonts/fonts-tlwg/latex/lthttype.fd
+++ b/Master/texmf-dist/source/fonts/fonts-tlwg/latex/lthttype.fd
@@ -4,7 +4,7 @@
%
% Copyright (C) 1999 National Electronics and Computer Technology Center
% (NECTEC), Thailand. All rights reserved.
-%
+%
% It 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.
@@ -12,11 +12,13 @@
% http://www.latex-project.org/lppl.txt
% and version 1.3 or later is part of all distributions of LaTeX
% version 2005/12/01 or later.
-%
+%
% This work has the LPPL maintenance status "maintained".
-%
+%
% The Current Maintainer of this work is Theppitak Karoonboonyanan.
-%
+%
+% 2017/09/11 Abhabongse Janthong <abhabongse@gmail.com>
+% - add font scaling
% 2004/11/15 Theppitak Karoonboonyanan <thep@linux.thai.net>
% - pmono is now ttype (TlwgTypewriter)
% 2004/02/05 Poonlap Veerathanabutr <poonlap@linux.thai.net>
@@ -25,13 +27,20 @@
\ProvidesFile{lthttype.fd}[2004/02/05 v1.0 Thai font definitions]
+% Check if the scale factor has been defined
+\ifcsname fontstlwg@scale\endcsname
+ \edef\fontstlwg@@scale{s * [\csname fontstlwg@scale\endcsname] }%
+\else
+ \def\fontstlwg@@scale{s * }%
+\fi
+
% Primary declarations
\DeclareFontFamily{LTH}{ttype}{}
-\DeclareFontShape{LTH}{ttype}{m}{n}{<->s * ttype}{}
-\DeclareFontShape{LTH}{ttype}{m}{sl}{<->s * ttype_o}{}
+\DeclareFontShape{LTH}{ttype}{m}{n}{<-> \fontstlwg@@scale ttype}{}
+\DeclareFontShape{LTH}{ttype}{m}{sl}{<-> \fontstlwg@@scale ttype_o}{}
%%%%%%% bold series
-\DeclareFontShape{LTH}{ttype}{b}{n}{<->s * ttype_b}{}
-\DeclareFontShape{LTH}{ttype}{b}{sl}{<->s * ttype_bo}{}
+\DeclareFontShape{LTH}{ttype}{b}{n}{<-> \fontstlwg@@scale ttype_b}{}
+\DeclareFontShape{LTH}{ttype}{b}{sl}{<-> \fontstlwg@@scale ttype_bo}{}
% Substitutions
\DeclareFontShape{LTH}{ttype}{m}{it}{<->ssub * ttype/m/sl}{}
@@ -42,6 +51,6 @@
\DeclareFontShape{LTH}{ttype}{bx}{it}{<->ssub * ttype/b/sl}{}
\endinput
-%
+%
% EOF
%
diff --git a/Master/texmf-dist/source/fonts/fonts-tlwg/latex/lthttypist.fd b/Master/texmf-dist/source/fonts/fonts-tlwg/latex/lthttypist.fd
index 4c213718a98..659ff2baa80 100644
--- a/Master/texmf-dist/source/fonts/fonts-tlwg/latex/lthttypist.fd
+++ b/Master/texmf-dist/source/fonts/fonts-tlwg/latex/lthttypist.fd
@@ -4,7 +4,7 @@
%
% Copyright (C) 1999 National Electronics and Computer Technology Center
% (NECTEC), Thailand. All rights reserved.
-%
+%
% It 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.
@@ -12,23 +12,32 @@
% http://www.latex-project.org/lppl.txt
% and version 1.3 or later is part of all distributions of LaTeX
% version 2005/12/01 or later.
-%
+%
% This work has the LPPL maintenance status "maintained".
-%
+%
% The Current Maintainer of this work is Theppitak Karoonboonyanan.
-%
+%
+% 2017/09/11 Abhabongse Janthong <abhabongse@gmail.com>
+% - add font scaling
% 2006/10/23 Theppitak Karoonboonyanan <thep@linux.thai.net>
% - first release (based on lthttypist.fd)
\ProvidesFile{lthttypist.fd}[2004/02/05 v1.0 Thai font definitions]
+% Check if the scale factor has been defined
+\ifcsname fontstlwg@scale\endcsname
+ \edef\fontstlwg@@scale{s * [\csname fontstlwg@scale\endcsname] }%
+\else
+ \def\fontstlwg@@scale{s * }%
+\fi
+
% Primary declarations
\DeclareFontFamily{LTH}{ttypist}{}
-\DeclareFontShape{LTH}{ttypist}{m}{n}{<->s * ttypist}{}
-\DeclareFontShape{LTH}{ttypist}{m}{sl}{<->s * ttypist_o}{}
+\DeclareFontShape{LTH}{ttypist}{m}{n}{<-> \fontstlwg@@scale ttypist}{}
+\DeclareFontShape{LTH}{ttypist}{m}{sl}{<-> \fontstlwg@@scale ttypist_o}{}
%%%%%%% bold series
-\DeclareFontShape{LTH}{ttypist}{b}{n}{<->s * ttypist_b}{}
-\DeclareFontShape{LTH}{ttypist}{b}{sl}{<->s * ttypist_bo}{}
+\DeclareFontShape{LTH}{ttypist}{b}{n}{<-> \fontstlwg@@scale ttypist_b}{}
+\DeclareFontShape{LTH}{ttypist}{b}{sl}{<-> \fontstlwg@@scale ttypist_bo}{}
% Substitutions
\DeclareFontShape{LTH}{ttypist}{m}{it}{<->ssub * ttypist/m/sl}{}
@@ -39,6 +48,6 @@
\DeclareFontShape{LTH}{ttypist}{bx}{it}{<->ssub * ttypist/b/sl}{}
\endinput
-%
+%
% EOF
%
diff --git a/Master/texmf-dist/source/fonts/fonts-tlwg/latex/lthumpush.fd b/Master/texmf-dist/source/fonts/fonts-tlwg/latex/lthumpush.fd
index 0d9da11fc98..f043cb21977 100644
--- a/Master/texmf-dist/source/fonts/fonts-tlwg/latex/lthumpush.fd
+++ b/Master/texmf-dist/source/fonts/fonts-tlwg/latex/lthumpush.fd
@@ -4,7 +4,7 @@
%
% Copyright (C) 1999 National Electronics and Computer Technology Center
% (NECTEC), Thailand. All rights reserved.
-%
+%
% It 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.
@@ -12,26 +12,35 @@
% http://www.latex-project.org/lppl.txt
% and version 1.3 or later is part of all distributions of LaTeX
% version 2005/12/01 or later.
-%
+%
% This work has the LPPL maintenance status "maintained".
-%
+%
% The Current Maintainer of this work is Theppitak Karoonboonyanan.
-%
+%
+% 2017/09/11 Abhabongse Janthong <abhabongse@gmail.com>
+% - add font scaling
% 2008/01/21 Theppitak Karoonboonyanan <thep@linux.thai.net>
% - first version
\ProvidesFile{lthumpush.fd}[2008/01/21 v1.0 Thai font definitions]
+% Check if the scale factor has been defined
+\ifcsname fontstlwg@scale\endcsname
+ \edef\fontstlwg@@scale{s * [\csname fontstlwg@scale\endcsname] }%
+\else
+ \def\fontstlwg@@scale{s * }%
+\fi
+
% Primary declarations
\DeclareFontFamily{LTH}{umpush}{}
-\DeclareFontShape{LTH}{umpush}{m}{n}{<->s * umpush}{}
-\DeclareFontShape{LTH}{umpush}{m}{sl}{<->s * umpush_o}{}
+\DeclareFontShape{LTH}{umpush}{m}{n}{<-> \fontstlwg@@scale umpush}{}
+\DeclareFontShape{LTH}{umpush}{m}{sl}{<-> \fontstlwg@@scale umpush_o}{}
%%%%%%% bold series
-\DeclareFontShape{LTH}{umpush}{b}{n}{<->s * umpush_b}{}
-\DeclareFontShape{LTH}{umpush}{b}{sl}{<->s * umpush_bo}{}
+\DeclareFontShape{LTH}{umpush}{b}{n}{<-> \fontstlwg@@scale umpush_b}{}
+\DeclareFontShape{LTH}{umpush}{b}{sl}{<-> \fontstlwg@@scale umpush_bo}{}
%%%%%%% light series
-\DeclareFontShape{LTH}{umpush}{l}{n}{<->s * umpush_l}{}
-\DeclareFontShape{LTH}{umpush}{l}{sl}{<->s * umpush_lo}{}
+\DeclareFontShape{LTH}{umpush}{l}{n}{<-> \fontstlwg@@scale umpush_l}{}
+\DeclareFontShape{LTH}{umpush}{l}{sl}{<-> \fontstlwg@@scale umpush_lo}{}
% Substitutions
\DeclareFontShape{LTH}{umpush}{m}{it}{<->ssub * umpush/m/sl}{}
@@ -43,6 +52,6 @@
\DeclareFontShape{LTH}{umpush}{bx}{it}{<->ssub * umpush/b/sl}{}
\endinput
-%
+%
% EOF
%
diff --git a/Master/texmf-dist/source/fonts/fonts-tlwg/latex/lthwaree.fd b/Master/texmf-dist/source/fonts/fonts-tlwg/latex/lthwaree.fd
index ca22fc8fffc..2996b448dd5 100644
--- a/Master/texmf-dist/source/fonts/fonts-tlwg/latex/lthwaree.fd
+++ b/Master/texmf-dist/source/fonts/fonts-tlwg/latex/lthwaree.fd
@@ -4,7 +4,7 @@
%
% Copyright (C) 1999 National Electronics and Computer Technology Center
% (NECTEC), Thailand. All rights reserved.
-%
+%
% It 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.
@@ -12,23 +12,32 @@
% http://www.latex-project.org/lppl.txt
% and version 1.3 or later is part of all distributions of LaTeX
% version 2005/12/01 or later.
-%
+%
% This work has the LPPL maintenance status "maintained".
-%
+%
% The Current Maintainer of this work is Theppitak Karoonboonyanan.
-%
+%
+% 2017/09/11 Abhabongse Janthong <abhabongse@gmail.com>
+% - add font scaling
% 2008/01/21 Theppitak Karoonboonyanan <thep@linux.thai.net>
% - first version
\ProvidesFile{lthwaree.fd}[2008/01/21 v1.0 Thai font definitions]
+% Check if the scale factor has been defined
+\ifcsname fontstlwg@scale\endcsname
+ \edef\fontstlwg@@scale{s * [\csname fontstlwg@scale\endcsname] }%
+\else
+ \def\fontstlwg@@scale{s * }%
+\fi
+
% Primary declarations
\DeclareFontFamily{LTH}{waree}{}
-\DeclareFontShape{LTH}{waree}{m}{n}{<->s * waree}{}
-\DeclareFontShape{LTH}{waree}{m}{sl}{<->s * waree_o}{}
+\DeclareFontShape{LTH}{waree}{m}{n}{<-> \fontstlwg@@scale waree}{}
+\DeclareFontShape{LTH}{waree}{m}{sl}{<-> \fontstlwg@@scale waree_o}{}
%%%%%%% bold series
-\DeclareFontShape{LTH}{waree}{b}{n}{<->s * waree_b}{}
-\DeclareFontShape{LTH}{waree}{b}{sl}{<->s * waree_bo}{}
+\DeclareFontShape{LTH}{waree}{b}{n}{<-> \fontstlwg@@scale waree_b}{}
+\DeclareFontShape{LTH}{waree}{b}{sl}{<-> \fontstlwg@@scale waree_bo}{}
% Substitutions
\DeclareFontShape{LTH}{waree}{m}{it}{<->ssub * waree/m/sl}{}
@@ -39,6 +48,6 @@
\DeclareFontShape{LTH}{waree}{bx}{it}{<->ssub * waree/b/sl}{}
\endinput
-%
+%
% EOF
%
diff --git a/Master/texmf-dist/source/fonts/fonts-tlwg/nectec/Makefile.in b/Master/texmf-dist/source/fonts/fonts-tlwg/nectec/Makefile.in
index c08cf387909..fed733168c0 100644
--- a/Master/texmf-dist/source/fonts/fonts-tlwg/nectec/Makefile.in
+++ b/Master/texmf-dist/source/fonts/fonts-tlwg/nectec/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/Master/texmf-dist/source/fonts/fonts-tlwg/nf/Makefile.in b/Master/texmf-dist/source/fonts/fonts-tlwg/nf/Makefile.in
index dcadff27092..cd1bcc0b2bb 100644
--- a/Master/texmf-dist/source/fonts/fonts-tlwg/nf/Makefile.in
+++ b/Master/texmf-dist/source/fonts/fonts-tlwg/nf/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/Master/texmf-dist/source/fonts/fonts-tlwg/scripts/Makefile.in b/Master/texmf-dist/source/fonts/fonts-tlwg/scripts/Makefile.in
index 4432636fee6..1dbd60f4e4e 100644
--- a/Master/texmf-dist/source/fonts/fonts-tlwg/scripts/Makefile.in
+++ b/Master/texmf-dist/source/fonts/fonts-tlwg/scripts/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/Master/texmf-dist/source/fonts/fonts-tlwg/sipa/Makefile.in b/Master/texmf-dist/source/fonts/fonts-tlwg/sipa/Makefile.in
index 13ac271ad45..6266eddc2c7 100644
--- a/Master/texmf-dist/source/fonts/fonts-tlwg/sipa/Makefile.in
+++ b/Master/texmf-dist/source/fonts/fonts-tlwg/sipa/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/Master/texmf-dist/source/fonts/fonts-tlwg/tests/Makefile.in b/Master/texmf-dist/source/fonts/fonts-tlwg/tests/Makefile.in
index b24b937f8b1..6ca25db8070 100644
--- a/Master/texmf-dist/source/fonts/fonts-tlwg/tests/Makefile.in
+++ b/Master/texmf-dist/source/fonts/fonts-tlwg/tests/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/Makefile.in b/Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/Makefile.in
index 58c51d51087..f7592218e4b 100644
--- a/Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/Makefile.in
+++ b/Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,