fonts-tlwg (4oct17)

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

12 files changed, 237 insertions, 131 deletions

diff --git a/Master/texmf-dist/tex/latex/fonts-tlwg/fonts-tlwg.sty b/Master/texmf-dist/tex/latex/fonts-tlwg/fonts-tlwg.sty
index fc14f324a95..242009ff21b 100644
--- a/Master/texmf-dist/tex/latex/fonts-tlwg/fonts-tlwg.sty
+++ b/Master/texmf-dist/tex/latex/fonts-tlwg/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/tex/latex/fonts-tlwg/lthgaruda.fd b/Master/texmf-dist/tex/latex/fonts-tlwg/lthgaruda.fd
index 7e89f21f31e..1287fb31fe1 100644
--- a/Master/texmf-dist/tex/latex/fonts-tlwg/lthgaruda.fd
+++ b/Master/texmf-dist/tex/latex/fonts-tlwg/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/tex/latex/fonts-tlwg/lthkinnari.fd b/Master/texmf-dist/tex/latex/fonts-tlwg/lthkinnari.fd
index efce4a9d2ba..2da58b53932 100644
--- a/Master/texmf-dist/tex/latex/fonts-tlwg/lthkinnari.fd
+++ b/Master/texmf-dist/tex/latex/fonts-tlwg/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/tex/latex/fonts-tlwg/lthlaksaman.fd b/Master/texmf-dist/tex/latex/fonts-tlwg/lthlaksaman.fd
index c85f10e80d1..39379890a74 100644
--- a/Master/texmf-dist/tex/latex/fonts-tlwg/lthlaksaman.fd
+++ b/Master/texmf-dist/tex/latex/fonts-tlwg/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/tex/latex/fonts-tlwg/lthloma.fd b/Master/texmf-dist/tex/latex/fonts-tlwg/lthloma.fd
index f10defc16ab..c03ad77940b 100644
--- a/Master/texmf-dist/tex/latex/fonts-tlwg/lthloma.fd
+++ b/Master/texmf-dist/tex/latex/fonts-tlwg/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/tex/latex/fonts-tlwg/lthnorasi.fd b/Master/texmf-dist/tex/latex/fonts-tlwg/lthnorasi.fd
index 9d9becea47c..d50664d27d9 100644
--- a/Master/texmf-dist/tex/latex/fonts-tlwg/lthnorasi.fd
+++ b/Master/texmf-dist/tex/latex/fonts-tlwg/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/tex/latex/fonts-tlwg/lthpurisa.fd b/Master/texmf-dist/tex/latex/fonts-tlwg/lthpurisa.fd
index b70d4eca840..0c5e91efb5b 100644
--- a/Master/texmf-dist/tex/latex/fonts-tlwg/lthpurisa.fd
+++ b/Master/texmf-dist/tex/latex/fonts-tlwg/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/tex/latex/fonts-tlwg/lthsawasdee.fd b/Master/texmf-dist/tex/latex/fonts-tlwg/lthsawasdee.fd
index da24a2d3406..ff64d311a39 100644
--- a/Master/texmf-dist/tex/latex/fonts-tlwg/lthsawasdee.fd
+++ b/Master/texmf-dist/tex/latex/fonts-tlwg/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/tex/latex/fonts-tlwg/lthttype.fd b/Master/texmf-dist/tex/latex/fonts-tlwg/lthttype.fd
index 663f51db3ba..aec0c1b2e38 100644
--- a/Master/texmf-dist/tex/latex/fonts-tlwg/lthttype.fd
+++ b/Master/texmf-dist/tex/latex/fonts-tlwg/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/tex/latex/fonts-tlwg/lthttypist.fd b/Master/texmf-dist/tex/latex/fonts-tlwg/lthttypist.fd
index 4c213718a98..659ff2baa80 100644
--- a/Master/texmf-dist/tex/latex/fonts-tlwg/lthttypist.fd
+++ b/Master/texmf-dist/tex/latex/fonts-tlwg/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/tex/latex/fonts-tlwg/lthumpush.fd b/Master/texmf-dist/tex/latex/fonts-tlwg/lthumpush.fd
index 0d9da11fc98..f043cb21977 100644
--- a/Master/texmf-dist/tex/latex/fonts-tlwg/lthumpush.fd
+++ b/Master/texmf-dist/tex/latex/fonts-tlwg/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/tex/latex/fonts-tlwg/lthwaree.fd b/Master/texmf-dist/tex/latex/fonts-tlwg/lthwaree.fd
index ca22fc8fffc..2996b448dd5 100644
--- a/Master/texmf-dist/tex/latex/fonts-tlwg/lthwaree.fd
+++ b/Master/texmf-dist/tex/latex/fonts-tlwg/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
 %