summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/fonts
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2021-10-20 21:44:12 +0000
committerKarl Berry <karl@freefriends.org>2021-10-20 21:44:12 +0000
commit31b32838ef38ec3587509fcb5a2a569e6fe5bce5 (patch)
tree7e054efec44d2667eb1e0d72b6455b90cf280223 /Master/texmf-dist/source/fonts
parentc853ff9c658499b16db581bcdbb2c5fa5ce9d0f4 (diff)
fonts-tlwg (19oct21)
git-svn-id: svn://tug.org/texlive/trunk@60817 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/fonts')
-rw-r--r--Master/texmf-dist/source/fonts/fonts-tlwg/ChangeLog222
-rw-r--r--Master/texmf-dist/source/fonts/fonts-tlwg/INSTALL6
-rw-r--r--Master/texmf-dist/source/fonts/fonts-tlwg/Makefile.in15
-rw-r--r--Master/texmf-dist/source/fonts/fonts-tlwg/NEWS11
-rw-r--r--Master/texmf-dist/source/fonts/fonts-tlwg/VERSION2
-rw-r--r--Master/texmf-dist/source/fonts/fonts-tlwg/aclocal.m4172
-rwxr-xr-xMaster/texmf-dist/source/fonts/fonts-tlwg/configure2105
-rw-r--r--Master/texmf-dist/source/fonts/fonts-tlwg/configure.ac38
-rw-r--r--Master/texmf-dist/source/fonts/fonts-tlwg/fontconfig/Makefile.in8
-rwxr-xr-xMaster/texmf-dist/source/fonts/fonts-tlwg/install-sh148
-rw-r--r--Master/texmf-dist/source/fonts/fonts-tlwg/latex/Makefile.am12
-rw-r--r--Master/texmf-dist/source/fonts/fonts-tlwg/latex/Makefile.in22
-rw-r--r--Master/texmf-dist/source/fonts/fonts-tlwg/latex/examples/Makefile.am3
-rw-r--r--Master/texmf-dist/source/fonts/fonts-tlwg/latex/examples/Makefile.in11
-rw-r--r--Master/texmf-dist/source/fonts/fonts-tlwg/latex/examples/digits-axes.tex38
-rw-r--r--Master/texmf-dist/source/fonts/fonts-tlwg/latex/examples/digits-cfr.tex30
-rw-r--r--Master/texmf-dist/source/fonts/fonts-tlwg/latex/examples/oldnum.tex335
-rw-r--r--Master/texmf-dist/source/fonts/fonts-tlwg/latex/examples/teststd.tex39
-rw-r--r--Master/texmf-dist/source/fonts/fonts-tlwg/latex/fonts-tlwg.sty4
-rw-r--r--Master/texmf-dist/source/fonts/fonts-tlwg/latex/lthnorasi.fd13
-rw-r--r--Master/texmf-dist/source/fonts/fonts-tlwg/latex/lthnorasij.fd69
-rw-r--r--Master/texmf-dist/source/fonts/fonts-tlwg/latex/lthnorj.fd68
-rw-r--r--Master/texmf-dist/source/fonts/fonts-tlwg/latex/lthnorx.fd68
-rw-r--r--Master/texmf-dist/source/fonts/fonts-tlwg/latex/lthtlwg-osf-sc.enc96
-rw-r--r--Master/texmf-dist/source/fonts/fonts-tlwg/latex/lthtlwg-osf.enc96
-rw-r--r--Master/texmf-dist/source/fonts/fonts-tlwg/latex/lthtlwg-sc.enc96
-rw-r--r--Master/texmf-dist/source/fonts/fonts-tlwg/latex/texfont.mk.am78
-rw-r--r--Master/texmf-dist/source/fonts/fonts-tlwg/latex/thailigs-osf-sc.enc425
-rw-r--r--Master/texmf-dist/source/fonts/fonts-tlwg/latex/thailigs-osf.enc427
-rw-r--r--Master/texmf-dist/source/fonts/fonts-tlwg/latex/thailigs-sc.enc420
-rwxr-xr-xMaster/texmf-dist/source/fonts/fonts-tlwg/missing2
-rw-r--r--Master/texmf-dist/source/fonts/fonts-tlwg/nectec/Makefile.am16
-rw-r--r--Master/texmf-dist/source/fonts/fonts-tlwg/nectec/Makefile.in102
-rw-r--r--Master/texmf-dist/source/fonts/fonts-tlwg/nf/Makefile.am85
-rw-r--r--Master/texmf-dist/source/fonts/fonts-tlwg/nf/Makefile.in171
-rw-r--r--Master/texmf-dist/source/fonts/fonts-tlwg/nf/Norasi-Bold.sfd46
-rw-r--r--Master/texmf-dist/source/fonts/fonts-tlwg/nf/Norasi-BoldItalic.sfd46
-rw-r--r--Master/texmf-dist/source/fonts/fonts-tlwg/nf/Norasi-BoldOblique.sfd44
-rw-r--r--Master/texmf-dist/source/fonts/fonts-tlwg/nf/Norasi-Italic.sfd44
-rw-r--r--Master/texmf-dist/source/fonts/fonts-tlwg/nf/Norasi-Oblique.sfd46
-rw-r--r--Master/texmf-dist/source/fonts/fonts-tlwg/nf/Norasi.sfd44
-rw-r--r--Master/texmf-dist/source/fonts/fonts-tlwg/scripts/Makefile.in8
-rw-r--r--Master/texmf-dist/source/fonts/fonts-tlwg/sipa/Makefile.am16
-rw-r--r--Master/texmf-dist/source/fonts/fonts-tlwg/sipa/Makefile.in102
-rwxr-xr-xMaster/texmf-dist/source/fonts/fonts-tlwg/test-driver19
-rw-r--r--Master/texmf-dist/source/fonts/fonts-tlwg/tests/Makefile.in11
-rw-r--r--Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/Makefile.am104
-rw-r--r--Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/Makefile.in190
-rw-r--r--Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/Purisa-Bold.sfd6
-rw-r--r--Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/Purisa-BoldOblique.sfd6
-rw-r--r--Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/Purisa-Oblique.sfd6
-rw-r--r--Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/Purisa.sfd6
-rw-r--r--Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/Sawasdee-Bold.sfd6
-rw-r--r--Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/Sawasdee-BoldOblique.sfd6
-rw-r--r--Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/Sawasdee-Oblique.sfd6
-rw-r--r--Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/Sawasdee.sfd6
-rw-r--r--Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/TlwgMono-Bold.sfd5
-rw-r--r--Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/TlwgMono-BoldOblique.sfd5
-rw-r--r--Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/TlwgMono-Oblique.sfd5
-rw-r--r--Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/TlwgMono.sfd5
-rw-r--r--Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/TlwgTypewriter-Bold.sfd5
-rw-r--r--Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/TlwgTypewriter-BoldOblique.sfd5
-rw-r--r--Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/TlwgTypewriter-Oblique.sfd5
-rw-r--r--Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/TlwgTypewriter.sfd5
-rw-r--r--Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/TlwgTypist-Bold.sfd39
-rw-r--r--Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/TlwgTypist-BoldOblique.sfd33
-rw-r--r--Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/TlwgTypist-Oblique.sfd5
-rw-r--r--Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/TlwgTypist.sfd5
-rw-r--r--Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/TlwgTypo-Bold.sfd13
-rw-r--r--Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/TlwgTypo-BoldOblique.sfd13
-rw-r--r--Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/TlwgTypo-Oblique.sfd5
-rw-r--r--Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/TlwgTypo.sfd5
72 files changed, 4953 insertions, 1426 deletions
diff --git a/Master/texmf-dist/source/fonts/fonts-tlwg/ChangeLog b/Master/texmf-dist/source/fonts/fonts-tlwg/ChangeLog
index e3fd73ffffa..bef7f54867d 100644
--- a/Master/texmf-dist/source/fonts/fonts-tlwg/ChangeLog
+++ b/Master/texmf-dist/source/fonts/fonts-tlwg/ChangeLog
@@ -1,3 +1,225 @@
+2021-10-18 Theppitak Karoonboonyanan <theppitak@gmail.com>
+
+ * NEWS:
+ === Version 0.7.3 ===
+
+2021-08-30 Theppitak Karoonboonyanan <theppitak@gmail.com>
+
+ Apply 'autoupdate' for autoconf 2.71
+
+ * configure.ac:
+ - Parenthesize m4 strings in AC_INIT() parameters with brackets.
+ - Replace deprecated AC_HELP_STRING() with AS_HELP_STRING().
+ - Replace parameterized AC_OUTPUT() with AC_CONFIG_FILES()
+ and parameter-less AC_OUTPUT.
+ - Update AC_PREREQ() from 2.59 to 2.71.
+
+2021-06-22 Theppitak Karoonboonyanan <theppitak@gmail.com>
+
+ LaTeX: Use 'norasij' family instead of 'norasi-OsF'.
+
+ 'norasij' is tried for all of plain, tabular, and proportional
+ old style figures when used via fontaxes.sty.
+ nfssext-cfr is more complicated. Only plain old style figures
+ are supported for now.
+
+ * latex/Makefile.am,
+ latex/lthnorasi-osf.fd -> latex/lthnorasij.fd:
+ - Rename font description file.
+ * latex/lthnorasij.fd:
+ - Replace 'norasi-OsF' family declarations with 'norasij'.
+ * latex/fonts-tlwg.sty:
+ - Replace 'norasi-OsF' referrals with 'norasij'.
+ * latex/examples/Makefile.am,
+ +latex/examples/digits-axes.tex,
+ +latex/examples/digits-cfr.tex:
+ - Add examples for fontaxes & nfssext-cfr usage.
+
+2021-06-17 Theppitak Karoonboonyanan <theppitak@gmail.com>
+
+ LaTeX: Add old style figures demonstration doc.
+
+ * latex/examples/Makefile.am, +latex/examples/oldnum.tex:
+ - Add example demonstrating the use of 'norasi-osf' option
+ for using old style figures in the entire document.
+
+2021-06-13 Theppitak Karoonboonyanan <theppitak@gmail.com>
+
+ LaTeX: Add Norasi old style figures test.
+
+ * latex/examples/teststd.tex:
+ - Add test for Norasi old style figures.
+
+2021-06-12 Theppitak Karoonboonyanan <theppitak@gmail.com>
+
+ LaTeX/Norasi: Add old style figures support.
+
+ * latex/Makefile.am,
+ +latex/lthtlwg-osf.enc, +latex/lthtlwg-osf-sc.enc,
+ +latex/thailigs-osf.enc, +latex/thailigs-osf-sc.enc:
+ - Add OsF font variant re-encoding, along with small caps versions.
+ * latex/texfont.mk.am:
+ - Add rules for creating TFMs and VFs for OsF font variants.
+ * latex/Makefile.am, +latex/lthnorasi-osf.fd:
+ - Add "norasi-OsF" font definition, using fontaxes naming convention.
+ * latex/lthnorasi.fd:
+ - Update file version to be the same as that of norasi-OsF (v2.0).
+ * latex/Makefile.am, +latex/lthnorj.fd, +latex/lthnorx.fd:
+ - Add "norj" and "norx" font definitions, according to Karl Berry's
+ font naming, to support nfssext-cfr.
+ - "norj" is essentially the same as "norasi-OsF" and share TFM
+ and VF files with it. And "norx" is the same as "norasi"
+ in the same manner.
+ * nf/Makefile.am:
+ - Add OsF synthetic fonts for Norasi.
+ * latex/fonts-tlwg.sty:
+ - Add 'norasi-osf' and 'rmnorasi-osf' options for using
+ old style figures by default.
+ - Update the file version to v2.0.
+
+2021-06-10 Theppitak Karoonboonyanan <theppitak@gmail.com>
+
+ Revert wrong make rules.
+
+ * nectec/Makefile.am:
+ * nf/Makefile.am:
+ * sipa/Makefile.am:
+ * tlwg/Makefile.am:
+ - Revert wrong "common generic rules". It's not shared by the
+ targets. 'make all' happened to pass somehow when I tested it,
+ probably by the help of kpathsea, but 'make install' fails
+ due to the missing symlinks.
+
+2021-06-10 Theppitak Karoonboonyanan <theppitak@gmail.com>
+
+ LaTeX: Add Norasi small caps test.
+
+ * latex/examples/teststd.tex:
+ - Add test messages for Norasi small caps.
+
+2021-06-10 Theppitak Karoonboonyanan <theppitak@gmail.com>
+
+ Make make rules concise.
+
+ * latex/texfont.mk.am:
+ * nectec/Makefile.am:
+ * nf/Makefile.am:
+ * sipa/Makefile.am:
+ * tlwg/Makefile.am:
+ - Use common generic rules for similar targets.
+
+2021-06-10 Theppitak Karoonboonyanan <theppitak@gmail.com>
+
+ LaTeX/Norasi: Add small caps support.
+
+ * latex/Makefile.am, +latex/lthtlwg-sc.enc, +latex/thailigs-sc.enc:
+ - Add small caps re-encoding version:
+ - Replace lower-case letters with small cap glyphs.
+ - Remove ligatures for ff, fi, fl, ffi, ffl,
+ which are specific to lower-case letters.
+ * latex/texfont.mk.am:
+ - Add rules for creating TFMs and VFs for small caps re-encoded
+ fonts, assuming fonts to be synthesized as such are listed
+ in SYNTH_FONTS variable.
+ * nf/Makefile.am:
+ - List 'norasi*-sc' in SYNTH_FONTS.
+ * latex/lthnorasi.fd:
+ - Add 'sc' shape declarations.
+
+2021-06-06 Theppitak Karoonboonyanan <theppitak@gmail.com>
+
+ Norasi: Unify DOTTED CIRCLE glyph name
+
+ * nf/Norasi-{Bold,BoldItalic,Oblique}.sfd:
+ - Rename 'uni25CC' glyph to 'dottedcircle', to be consistent
+ with other styles in the family.
+ * nf/Norasi*.sfd:
+ - Bump font version to 006.003.
+
+2021-06-04 Theppitak Karoonboonyanan <theppitak@gmail.com>
+
+ Norasi: Add 'onum' and 'smcp'
+
+ * nf/Norasi*.sfd:
+ - Add 'onum' and 'smcp' OpenType features.
+ - Bump font version to 006.002.
+
+2021-05-12 Theppitak Karoonboonyanan <theppitak@gmail.com>
+
+ TlwgTypewriter: Use default PANOSE
+
+ * tlwg/TlwgTypewriter*.sfd:
+ - Clear manual PANOSE to use calculated values.
+ This won't make its proportion Monospaced but other properties
+ such as weight should match those of TlwgMono.
+ - Bump font version to 003.003.
+
+2021-05-12 Theppitak Karoonboonyanan <theppitak@gmail.com>
+
+ TlwgTypist: Use default PANOSE
+
+ * tlwg/TlwgTypist*.sfd:
+ - Clear manual PANOSE to use calculated values.
+ This won't make its proportion Monospaced but other properties
+ such as weight should match those of TlwgTypo.
+ - Bump font version to 003.004.
+
+2021-05-12 Theppitak Karoonboonyanan <theppitak@gmail.com>
+
+ TlwgMono: Use default PANOSE
+
+ * tlwg/TlwgMono*.sfd:
+ - Clear manual PANOSE to use calculated values.
+ This makes its proportion Monospaced and should make it listed
+ by gvim.
+ - Bump font version to 002.003.
+
+2021-05-12 Theppitak Karoonboonyanan <theppitak@gmail.com>
+
+ TlwgTypo: Use default PANOSE
+
+ * tlwg/TlwgTypo*.sfd:
+ - Clear manual PANOSE to use calculated values.
+ This makes its proportion Monospaced and should make it listed
+ by gvim.
+ - Bump font version to 004.004.
+
+ Thanks Chaiwat Suttipongsakul (@cwt) for the report via mastodon.in.th.
+
+2021-05-05 Theppitak Karoonboonyanan <theppitak@gmail.com>
+
+ TlwgTypist: Fix uneven widths of several glyphs in bold faces
+
+ * tlwg/TlwgTypist-Bold*.sfd:
+ - Set widths of several glyphs to 600.
+ * tlwg/TlwgTypist*.sfd:
+ - Bump font version to 003.003.
+
+2021-05-05 Theppitak Karoonboonyanan <theppitak@gmail.com>
+
+ TlwgTypo: Fix uneven widths of two glyphs in bold faces
+
+ * tlwg/TlwgTypo-Bold*.sfd:
+ - Set widths of uni0E09.uline and uni0E17.uline to 600.
+ * tlwg/TlwgTypo*.sfd:
+ - Bump font version to 004.003.
+
+2020-05-01 Theppitak Karoonboonyanan <theppitak@gmail.com>
+
+ Sawasdee: Set FSType to installable embedding.
+
+ * tlwg/Sawasdee*.sfd:
+ - Set FSType to "Installable".
+ - Bump font version to 003.005.
+
+2020-05-01 Theppitak Karoonboonyanan <theppitak@gmail.com>
+
+ Purisa: Set FSType to installable embedding.
+
+ * tlwg/Purisa*.sfd:
+ - Set FSType to "Installable".
+ - Bump font version to 004.004.
+
2020-05-01 Theppitak Karoonboonyanan <theppitak@gmail.com>
* NEWS:
diff --git a/Master/texmf-dist/source/fonts/fonts-tlwg/INSTALL b/Master/texmf-dist/source/fonts/fonts-tlwg/INSTALL
index 8865734f81b..e82fd21de2e 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-2016 Free Software
-Foundation, Inc.
+ Copyright (C) 1994-1996, 1999-2002, 2004-2017, 2020-2021 Free
+Software Foundation, Inc.
Copying and distribution of this file, with or without modification,
are permitted in any medium without royalty provided the copyright
@@ -225,7 +225,7 @@ order to use an ANSI C compiler:
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
+ HP-UX 'make' updates targets which have the same timestamps as their
prerequisites, which makes it generally unusable when shipped generated
files such as 'configure' are involved. Use GNU 'make' instead.
diff --git a/Master/texmf-dist/source/fonts/fonts-tlwg/Makefile.in b/Master/texmf-dist/source/fonts/fonts-tlwg/Makefile.in
index 7570d0496ba..56576c5b39b 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.16.2 from Makefile.am.
+# Makefile.in generated by automake 1.16.4 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2020 Free Software Foundation, Inc.
+# Copyright (C) 1994-2021 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -149,9 +149,6 @@ am__define_uniq_tagged_files = \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | $(am__uniquify_input)`
-ETAGS = etags
-CTAGS = ctags
-CSCOPE = cscope
DIST_SUBDIRS = $(SUBDIRS)
am__DIST_COMMON = $(srcdir)/Makefile.in AUTHORS COPYING ChangeLog \
INSTALL NEWS README install-sh missing
@@ -193,6 +190,8 @@ am__relativize = \
GZIP_ENV = --best
DIST_ARCHIVES = $(distdir).tar.xz
DIST_TARGETS = dist-xz
+# Exists only to be overridden by the user if desired.
+AM_DISTCHECK_DVI_TARGET = dvi
distuninstallcheck_listfiles = find . -type f -print
am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
| sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
@@ -205,11 +204,14 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+CSCOPE = @CSCOPE@
+CTAGS = @CTAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
+ETAGS = @ETAGS@
FCCACHE = @FCCACHE@
FONTFORGE = @FONTFORGE@
INSTALL = @INSTALL@
@@ -475,7 +477,6 @@ cscopelist-am: $(am__tagged_files)
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
-
distdir: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) distdir-am
@@ -624,7 +625,7 @@ distcheck: dist
$(DISTCHECK_CONFIGURE_FLAGS) \
--srcdir=../.. --prefix="$$dc_install_base" \
&& $(MAKE) $(AM_MAKEFLAGS) \
- && $(MAKE) $(AM_MAKEFLAGS) dvi \
+ && $(MAKE) $(AM_MAKEFLAGS) $(AM_DISTCHECK_DVI_TARGET) \
&& $(MAKE) $(AM_MAKEFLAGS) check \
&& $(MAKE) $(AM_MAKEFLAGS) install \
&& $(MAKE) $(AM_MAKEFLAGS) installcheck \
diff --git a/Master/texmf-dist/source/fonts/fonts-tlwg/NEWS b/Master/texmf-dist/source/fonts/fonts-tlwg/NEWS
index 3ec6c043c92..8b2177f2506 100644
--- a/Master/texmf-dist/source/fonts/fonts-tlwg/NEWS
+++ b/Master/texmf-dist/source/fonts/fonts-tlwg/NEWS
@@ -1,3 +1,14 @@
+0.7.3 (2021-10-18)
+=====
+- Purisa, Sawasdee: now can be embeded as installable in PDF.
+- TlwgTypo, TlwgTypist: fix uneven widths of some glyphs.
+- TlwgTypo, TlwgTypist, TlwgMono, TlwgTypewriter: clear PANOSE to use
+ calculated values, so as to get listed in gvim.
+ (Thanks Chaiwat Suttipongsakul (@cwt) for the report.)
+- Norasi: add 'onum' and 'smcp' OpenType features for access to
+ old style figures and small caps glyphs.
+- LaTeX: Add old style figures and small caps supports for Norasi.
+
0.7.2 (2020-05-01)
=====
- Garuda has been fine-tuned by hand for balanced cubic splines
diff --git a/Master/texmf-dist/source/fonts/fonts-tlwg/VERSION b/Master/texmf-dist/source/fonts/fonts-tlwg/VERSION
index 7486fdbc50b..f38fc5393ff 100644
--- a/Master/texmf-dist/source/fonts/fonts-tlwg/VERSION
+++ b/Master/texmf-dist/source/fonts/fonts-tlwg/VERSION
@@ -1 +1 @@
-0.7.2
+0.7.3
diff --git a/Master/texmf-dist/source/fonts/fonts-tlwg/aclocal.m4 b/Master/texmf-dist/source/fonts/fonts-tlwg/aclocal.m4
index ae806b522ba..0e9aa263c03 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.16.2 -*- Autoconf -*-
+# generated automatically by aclocal 1.16.4 -*- Autoconf -*-
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -14,8 +14,8 @@
m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
-[m4_warning([this file was generated for autoconf 2.69.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.71],,
+[m4_warning([this file was generated for autoconf 2.71.
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'.])])
@@ -77,7 +77,7 @@ AC_DEFUN([AX_PYTHON_MODULE],[
fi
])
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -92,7 +92,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.16'
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.16.2], [],
+m4_if([$1], [1.16.4], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -108,14 +108,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.16.2])dnl
+[AM_AUTOMAKE_VERSION([1.16.4])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-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -167,7 +167,7 @@ am_aux_dir=`cd "$ac_aux_dir" && pwd`
# AM_CONDITIONAL -*- Autoconf -*-
-# Copyright (C) 1997-2020 Free Software Foundation, Inc.
+# Copyright (C) 1997-2021 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -200,7 +200,7 @@ fi])])
# Do all the work for Automake. -*- Autoconf -*-
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -264,7 +264,7 @@ m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
[_AM_SET_OPTIONS([$1])dnl
dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
m4_if(
- m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]),
+ m4_ifset([AC_PACKAGE_NAME], [ok]):m4_ifset([AC_PACKAGE_VERSION], [ok]),
[ok:ok],,
[m4_fatal([AC_INIT should be called with package and version arguments])])dnl
AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
@@ -316,6 +316,20 @@ AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
[m4_define([AC_PROG_OBJCXX],
m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl
])
+# Variables for tags utilities; see am/tags.am
+if test -z "$CTAGS"; then
+ CTAGS=ctags
+fi
+AC_SUBST([CTAGS])
+if test -z "$ETAGS"; then
+ ETAGS=etags
+fi
+AC_SUBST([ETAGS])
+if test -z "$CSCOPE"; then
+ CSCOPE=cscope
+fi
+AC_SUBST([CSCOPE])
+
AC_REQUIRE([AM_SILENT_RULES])dnl
dnl The testsuite driver may need to know about EXEEXT, so add the
dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This
@@ -397,7 +411,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-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -418,7 +432,7 @@ if test x"${install_sh+set}" != xset; then
fi
AC_SUBST([install_sh])])
-# Copyright (C) 2003-2020 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -439,7 +453,7 @@ AC_SUBST([am__leading_dot])])
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-# Copyright (C) 1997-2020 Free Software Foundation, Inc.
+# Copyright (C) 1997-2021 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -460,12 +474,7 @@ AC_DEFUN([AM_MISSING_HAS_RUN],
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
AC_REQUIRE_AUX_FILE([missing])dnl
if test x"${MISSING+set}" != xset; then
- case $am_aux_dir in
- *\ * | *\ *)
- MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
- *)
- MISSING="\${SHELL} $am_aux_dir/missing" ;;
- esac
+ MISSING="\${SHELL} '$am_aux_dir/missing'"
fi
# Use eval to expand $SHELL
if eval "$MISSING --is-lightweight"; then
@@ -478,7 +487,7 @@ fi
# Helper functions for option handling. -*- Autoconf -*-
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -507,7 +516,7 @@ AC_DEFUN([_AM_SET_OPTIONS],
AC_DEFUN([_AM_IF_OPTION],
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-# Copyright (C) 1999-2020 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -590,21 +599,90 @@ AC_DEFUN([AM_PATH_PYTHON],
m4_default([$3], [AC_MSG_ERROR([no suitable Python interpreter found])])
else
- dnl Query Python for its version number. Getting [:3] seems to be
- dnl the best way to do this; it's what "site.py" does in the standard
- dnl library.
+ dnl Query Python for its version number. Although site.py simply uses
+ dnl sys.version[:3], printing that failed with Python 3.10, since the
+ dnl trailing zero was eliminated. So now we output just the major
+ dnl and minor version numbers, as numbers. Apparently the tertiary
+ dnl version is not of interest.
AC_CACHE_CHECK([for $am_display_PYTHON version], [am_cv_python_version],
- [am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[[:3]])"`])
+ [am_cv_python_version=`$PYTHON -c "import sys; print ('%u.%u' % sys.version_info[[:2]])"`])
AC_SUBST([PYTHON_VERSION], [$am_cv_python_version])
- dnl Use the values of $prefix and $exec_prefix for the corresponding
+ dnl Use the values of sys.prefix and sys.exec_prefix for the corresponding
dnl values of PYTHON_PREFIX and PYTHON_EXEC_PREFIX. These are made
dnl distinct variables so they can be overridden if need be. However,
dnl general consensus is that you shouldn't need this ability.
+ dnl Also allow directly setting the prefixes via configure args.
+
+ if test "x$prefix" = xNONE
+ then
+ am__usable_prefix=$ac_default_prefix
+ else
+ am__usable_prefix=$prefix
+ fi
- AC_SUBST([PYTHON_PREFIX], ['${prefix}'])
- AC_SUBST([PYTHON_EXEC_PREFIX], ['${exec_prefix}'])
+ AC_ARG_WITH([python_prefix],
+ [AS_HELP_STRING([--with-python_prefix],
+ [override the default PYTHON_PREFIX])],
+ [ am_python_prefix_subst="$withval"
+ am_cv_python_prefix="$withval"
+ AC_MSG_CHECKING([for $am_display_PYTHON prefix])
+ AC_MSG_RESULT([$am_cv_python_prefix])],
+ [
+ AC_CACHE_CHECK([for $am_display_PYTHON prefix], [am_cv_python_prefix],
+ [am_cv_python_prefix=`$PYTHON -c "import sys; sys.stdout.write(sys.prefix)"`])
+
+ dnl If sys.prefix is a subdir of $prefix, replace the literal value of $prefix
+ dnl with a variable reference so it can be overridden.
+ case $am_cv_python_prefix in
+ $am__usable_prefix*)
+ am__strip_prefix=`echo "$am__usable_prefix" | sed 's|.|.|g'`
+ am_python_prefix_subst=`echo "$am_cv_python_prefix" | sed "s,^$am__strip_prefix,\\${prefix},"`
+ ;;
+ *)
+ am_python_prefix_subst=$am_cv_python_prefix
+ ;;
+ esac
+ ])
+ AC_SUBST([PYTHON_PREFIX], [$am_python_prefix_subst])
+
+ AC_ARG_WITH([python_exec_prefix],
+ [AS_HELP_STRING([--with-python_exec_prefix],
+ [override the default PYTHON_EXEC_PREFIX])],
+ [ am_python_exec_prefix_subst="$withval"
+ am_cv_python_exec_prefix="$withval"
+ AC_MSG_CHECKING([for $am_display_PYTHON exec_prefix])
+ AC_MSG_RESULT([$am_cv_python_exec_prefix])],
+ [
+ dnl --with-python_prefix was given - use its value for python_exec_prefix too
+ AS_IF([test -n "$with_python_prefix"], [am_python_exec_prefix_subst="$with_python_prefix"
+ am_cv_python_exec_prefix="$with_python_prefix"
+ AC_MSG_CHECKING([for $am_display_PYTHON exec_prefix])
+ AC_MSG_RESULT([$am_cv_python_exec_prefix])],
+ [
+ AC_CACHE_CHECK([for $am_display_PYTHON exec_prefix], [am_cv_python_exec_prefix],
+ [am_cv_python_exec_prefix=`$PYTHON -c "import sys; sys.stdout.write(sys.exec_prefix)"`])
+ dnl If sys.exec_prefix is a subdir of $exec_prefix, replace the
+ dnl literal value of $exec_prefix with a variable reference so it can
+ dnl be overridden.
+ if test "x$exec_prefix" = xNONE
+ then
+ am__usable_exec_prefix=$am__usable_prefix
+ else
+ am__usable_exec_prefix=$exec_prefix
+ fi
+ case $am_cv_python_exec_prefix in
+ $am__usable_exec_prefix*)
+ am__strip_prefix=`echo "$am__usable_exec_prefix" | sed 's|.|.|g'`
+ am_python_exec_prefix_subst=`echo "$am_cv_python_exec_prefix" | sed "s,^$am__strip_prefix,\\${exec_prefix},"`
+ ;;
+ *)
+ am_python_exec_prefix_subst=$am_cv_python_exec_prefix
+ ;;
+ esac
+ ])])
+ AC_SUBST([PYTHON_EXEC_PREFIX], [$am_python_exec_prefix_subst])
dnl At times (like when building shared libraries) you may want
dnl to know which OS platform Python thinks this is.
@@ -642,11 +720,11 @@ except ImportError:
dnl Query distutils for this directory.
AC_CACHE_CHECK([for $am_display_PYTHON script directory],
[am_cv_python_pythondir],
- [if test "x$prefix" = xNONE
+ [if test "x$am_cv_python_prefix" = x
then
- am_py_prefix=$ac_default_prefix
+ am_py_prefix=$am__usable_prefix
else
- am_py_prefix=$prefix
+ am_py_prefix=$am_cv_python_prefix
fi
am_cv_python_pythondir=`$PYTHON -c "
$am_python_setup_sysconfig
@@ -659,13 +737,13 @@ sys.stdout.write(sitedir)"`
case $am_cv_python_pythondir in
$am_py_prefix*)
am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`
- am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"`
+ am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,\\${PYTHON_PREFIX},"`
;;
*)
case $am_py_prefix in
/usr|/System*) ;;
*)
- am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages
+ am_cv_python_pythondir="\${PYTHON_PREFIX}/lib/python$PYTHON_VERSION/site-packages"
;;
esac
;;
@@ -684,30 +762,30 @@ sys.stdout.write(sitedir)"`
dnl Query distutils for this directory.
AC_CACHE_CHECK([for $am_display_PYTHON extension module directory],
[am_cv_python_pyexecdir],
- [if test "x$exec_prefix" = xNONE
+ [if test "x$am_cv_python_exec_prefix" = x
then
- am_py_exec_prefix=$am_py_prefix
+ am_py_exec_prefix=$am__usable_exec_prefix
else
- am_py_exec_prefix=$exec_prefix
+ am_py_exec_prefix=$am_cv_python_exec_prefix
fi
am_cv_python_pyexecdir=`$PYTHON -c "
$am_python_setup_sysconfig
if can_use_sysconfig:
- sitedir = sysconfig.get_path('platlib', vars={'platbase':'$am_py_prefix'})
+ sitedir = sysconfig.get_path('platlib', vars={'platbase':'$am_py_exec_prefix'})
else:
from distutils import sysconfig
- sitedir = sysconfig.get_python_lib(1, 0, prefix='$am_py_prefix')
+ sitedir = sysconfig.get_python_lib(1, 0, prefix='$am_py_exec_prefix')
sys.stdout.write(sitedir)"`
case $am_cv_python_pyexecdir in
$am_py_exec_prefix*)
am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`
- am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"`
+ am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,\\${PYTHON_EXEC_PREFIX},"`
;;
*)
case $am_py_exec_prefix in
/usr|/System*) ;;
*)
- am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages
+ am_cv_python_pyexecdir="\${PYTHON_EXEC_PREFIX}/lib/python$PYTHON_VERSION/site-packages"
;;
esac
;;
@@ -745,7 +823,7 @@ for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[[i]]
sys.exit(sys.hexversion < minverhex)"
AS_IF([AM_RUN_LOG([$1 -c "$prog"])], [$3], [$4])])
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -764,7 +842,7 @@ AC_DEFUN([AM_RUN_LOG],
# Check to make sure that the build environment is sane. -*- Autoconf -*-
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -845,7 +923,7 @@ AC_CONFIG_COMMANDS_PRE(
rm -f conftest.file
])
-# Copyright (C) 2009-2020 Free Software Foundation, Inc.
+# Copyright (C) 2009-2021 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -905,7 +983,7 @@ AC_SUBST([AM_BACKSLASH])dnl
_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
])
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -933,7 +1011,7 @@ fi
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
-# Copyright (C) 2006-2020 Free Software Foundation, Inc.
+# Copyright (C) 2006-2021 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -952,7 +1030,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
# Check how to create a tarball. -*- Autoconf -*-
-# Copyright (C) 2004-2020 Free Software Foundation, Inc.
+# Copyright (C) 2004-2021 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/configure b/Master/texmf-dist/source/fonts/fonts-tlwg/configure
index a92368ce231..a44eb517b12 100755
--- a/Master/texmf-dist/source/fonts/fonts-tlwg/configure
+++ b/Master/texmf-dist/source/fonts/fonts-tlwg/configure
@@ -1,11 +1,12 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for fonts-tlwg 0.7.2.
+# Generated by GNU Autoconf 2.71 for fonts-tlwg 0.7.3.
#
# Report bugs to <https://github.com/tlwg/fonts-tlwg/issues>.
#
#
-# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
+# Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation,
+# Inc.
#
#
# This configure script is free software; the Free Software Foundation
@@ -16,14 +17,16 @@
# Be more Bourne compatible
DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+as_nop=:
+if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1
+then :
emulate sh
NULLCMD=:
# Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
-else
+else $as_nop
case `(set -o) 2>/dev/null` in #(
*posix*) :
set -o posix ;; #(
@@ -33,46 +36,46 @@ esac
fi
+
+# Reset variables that may have inherited troublesome values from
+# the environment.
+
+# IFS needs to be set, to space, tab, and newline, in precisely that order.
+# (If _AS_PATH_WALK were called with IFS unset, it would have the
+# side effect of setting IFS to empty, thus disabling word splitting.)
+# Quoting is to prevent editors from complaining about space-tab.
as_nl='
'
export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-# Prefer a ksh shell builtin over an external printf program on Solaris,
-# but without wasting forks for bash or zsh.
-if test -z "$BASH_VERSION$ZSH_VERSION" \
- && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
- as_echo='print -r --'
- as_echo_n='print -rn --'
-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
- as_echo='printf %s\n'
- as_echo_n='printf %s'
-else
- if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
- as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
- as_echo_n='/usr/ucb/echo -n'
- else
- as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
- as_echo_n_body='eval
- arg=$1;
- case $arg in #(
- *"$as_nl"*)
- expr "X$arg" : "X\\(.*\\)$as_nl";
- arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
- esac;
- expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
- '
- export as_echo_n_body
- as_echo_n='sh -c $as_echo_n_body as_echo'
- fi
- export as_echo_body
- as_echo='sh -c $as_echo_body as_echo'
-fi
+IFS=" "" $as_nl"
+
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# Ensure predictable behavior from utilities with locale-dependent output.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# We cannot yet rely on "unset" to work, but we need these variables
+# to be unset--not just set to an empty or harmless value--now, to
+# avoid bugs in old shells (e.g. pre-3.0 UWIN ksh). This construct
+# also avoids known problems related to "unset" and subshell syntax
+# in other old shells (e.g. bash 2.01 and pdksh 5.2.14).
+for as_var in BASH_ENV ENV MAIL MAILPATH CDPATH
+do eval test \${$as_var+y} \
+ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+done
+
+# Ensure that fds 0, 1, and 2 are open.
+if (exec 3>&0) 2>/dev/null; then :; else exec 0</dev/null; fi
+if (exec 3>&1) 2>/dev/null; then :; else exec 1>/dev/null; fi
+if (exec 3>&2) ; then :; else exec 2>/dev/null; fi
# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
+if ${PATH_SEPARATOR+false} :; then
PATH_SEPARATOR=:
(PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
(PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
@@ -81,13 +84,6 @@ if test "${PATH_SEPARATOR+set}" != set; then
fi
-# IFS
-# We need space, tab and new line, in precisely that order. Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-IFS=" "" $as_nl"
-
# Find who we are. Look in the path if we contain no directory separator.
as_myself=
case $0 in #((
@@ -96,8 +92,12 @@ case $0 in #((
for as_dir in $PATH
do
IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+ case $as_dir in #(((
+ '') as_dir=./ ;;
+ */) ;;
+ *) as_dir=$as_dir/ ;;
+ esac
+ test -r "$as_dir$0" && as_myself=$as_dir$0 && break
done
IFS=$as_save_IFS
@@ -109,30 +109,10 @@ if test "x$as_myself" = x; then
as_myself=$0
fi
if test ! -f "$as_myself"; then
- $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+ printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
exit 1
fi
-# Unset variables that we do not need and which cause bugs (e.g. in
-# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1"
-# suppresses any "Segmentation fault" message there. '((' could
-# trigger a bug in pdksh 5.2.14.
-for as_var in BASH_ENV ENV MAIL MAILPATH
-do eval test x\${$as_var+set} = xset \
- && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# CDPATH.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
# Use a proper internal environment variable to ensure we don't fall
# into an infinite loop, continuously re-executing ourselves.
@@ -154,20 +134,22 @@ esac
exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
# Admittedly, this is quite paranoid, since all the known shells bail
# out after a failed `exec'.
-$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
-as_fn_exit 255
+printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
fi
# We don't want this to propagate to other subprocesses.
{ _as_can_reexec=; unset _as_can_reexec;}
if test "x$CONFIG_SHELL" = x; then
- as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
+ as_bourne_compatible="as_nop=:
+if test \${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1
+then :
emulate sh
NULLCMD=:
# Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
# is contrary to our usage. Disable this feature.
alias -g '\${1+\"\$@\"}'='\"\$@\"'
setopt NO_GLOB_SUBST
-else
+else \$as_nop
case \`(set -o) 2>/dev/null\` in #(
*posix*) :
set -o posix ;; #(
@@ -187,42 +169,53 @@ as_fn_success || { exitcode=1; echo as_fn_success failed.; }
as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
-if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
+if ( set x; as_fn_ret_success y && test x = \"\$1\" )
+then :
-else
+else \$as_nop
exitcode=1; echo positional parameters were not saved.
fi
test x\$exitcode = x0 || exit 1
+blah=\$(echo \$(echo blah))
+test x\"\$blah\" = xblah || exit 1
test -x / || exit 1"
as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
test \$(( 1 + 1 )) = 2 || exit 1"
- if (eval "$as_required") 2>/dev/null; then :
+ if (eval "$as_required") 2>/dev/null
+then :
as_have_required=yes
-else
+else $as_nop
as_have_required=no
fi
- if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
+ if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null
+then :
-else
+else $as_nop
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
as_found=false
for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
do
IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
+ case $as_dir in #(((
+ '') as_dir=./ ;;
+ */) ;;
+ *) as_dir=$as_dir/ ;;
+ esac
as_found=:
case $as_dir in #(
/*)
for as_base in sh bash ksh sh5; do
# Try only shells that exist, to save several forks.
- as_shell=$as_dir/$as_base
+ as_shell=$as_dir$as_base
if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
- { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
+ as_run=a "$as_shell" -c "$as_bourne_compatible""$as_required" 2>/dev/null
+then :
CONFIG_SHELL=$as_shell as_have_required=yes
- if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
+ if as_run=a "$as_shell" -c "$as_bourne_compatible""$as_suggested" 2>/dev/null
+then :
break 2
fi
fi
@@ -230,14 +223,21 @@ fi
esac
as_found=false
done
-$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
- { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
- CONFIG_SHELL=$SHELL as_have_required=yes
-fi; }
IFS=$as_save_IFS
+if $as_found
+then :
+else $as_nop
+ if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
+ as_run=a "$SHELL" -c "$as_bourne_compatible""$as_required" 2>/dev/null
+then :
+ CONFIG_SHELL=$SHELL as_have_required=yes
+fi
+fi
- if test "x$CONFIG_SHELL" != x; then :
+
+ if test "x$CONFIG_SHELL" != x
+then :
export CONFIG_SHELL
# We cannot yet assume a decent shell, so we have to provide a
# neutralization value for shells without unset; and this also
@@ -255,18 +255,19 @@ esac
exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
# Admittedly, this is quite paranoid, since all the known shells bail
# out after a failed `exec'.
-$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2
exit 255
fi
- if test x$as_have_required = xno; then :
- $as_echo "$0: This script requires a shell more modern than all"
- $as_echo "$0: the shells that I found on your system."
- if test x${ZSH_VERSION+set} = xset ; then
- $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
- $as_echo "$0: be upgraded to zsh 4.3.4 or later."
+ if test x$as_have_required = xno
+then :
+ printf "%s\n" "$0: This script requires a shell more modern than all"
+ printf "%s\n" "$0: the shells that I found on your system."
+ if test ${ZSH_VERSION+y} ; then
+ printf "%s\n" "$0: In particular, zsh $ZSH_VERSION has bugs and should"
+ printf "%s\n" "$0: be upgraded to zsh 4.3.4 or later."
else
- $as_echo "$0: Please tell bug-autoconf@gnu.org and
+ printf "%s\n" "$0: Please tell bug-autoconf@gnu.org and
$0: https://github.com/tlwg/fonts-tlwg/issues about your
$0: system, including any error possibly output before this
$0: message. Then install a modern shell, or manually run
@@ -294,6 +295,7 @@ as_fn_unset ()
}
as_unset=as_fn_unset
+
# as_fn_set_status STATUS
# -----------------------
# Set $? to STATUS, without forking.
@@ -311,6 +313,14 @@ as_fn_exit ()
as_fn_set_status $1
exit $1
} # as_fn_exit
+# as_fn_nop
+# ---------
+# Do nothing but, unlike ":", preserve the value of $?.
+as_fn_nop ()
+{
+ return $?
+}
+as_nop=as_fn_nop
# as_fn_mkdir_p
# -------------
@@ -325,7 +335,7 @@ as_fn_mkdir_p ()
as_dirs=
while :; do
case $as_dir in #(
- *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+ *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
*) as_qdir=$as_dir;;
esac
as_dirs="'$as_qdir' $as_dirs"
@@ -334,7 +344,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$as_dir" : 'X\(//\)[^/]' \| \
X"$as_dir" : 'X\(//\)$' \| \
X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
+printf "%s\n" X"$as_dir" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
@@ -373,12 +383,13 @@ as_fn_executable_p ()
# advantage of any shell optimizations that allow amortized linear growth over
# repeated appends, instead of the typical quadratic growth present in naive
# implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null
+then :
eval 'as_fn_append ()
{
eval $1+=\$2
}'
-else
+else $as_nop
as_fn_append ()
{
eval $1=\$$1\$2
@@ -390,18 +401,27 @@ fi # as_fn_append
# Perform arithmetic evaluation on the ARGs, and store the result in the
# global $as_val. Take advantage of shells that can avoid forks. The arguments
# must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null
+then :
eval 'as_fn_arith ()
{
as_val=$(( $* ))
}'
-else
+else $as_nop
as_fn_arith ()
{
as_val=`expr "$@" || test $? -eq 1`
}
fi # as_fn_arith
+# as_fn_nop
+# ---------
+# Do nothing but, unlike ":", preserve the value of $?.
+as_fn_nop ()
+{
+ return $?
+}
+as_nop=as_fn_nop
# as_fn_error STATUS ERROR [LINENO LOG_FD]
# ----------------------------------------
@@ -413,9 +433,9 @@ as_fn_error ()
as_status=$1; test $as_status -eq 0 && as_status=1
if test "$4"; then
as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
fi
- $as_echo "$as_me: error: $2" >&2
+ printf "%s\n" "$as_me: error: $2" >&2
as_fn_exit $as_status
} # as_fn_error
@@ -442,7 +462,7 @@ as_me=`$as_basename -- "$0" ||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
+printf "%s\n" X/"$0" |
sed '/^.*\/\([^/][^/]*\)\/*$/{
s//\1/
q
@@ -486,7 +506,7 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
s/-\n.*//
' >$as_me.lineno &&
chmod +x "$as_me.lineno" ||
- { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+ { printf "%s\n" "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
# If we had to re-execute with $CONFIG_SHELL, we're ensured to have
# already done that, so ensure we don't try to do so again and fall
@@ -500,6 +520,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
exit
}
+
+# Determine whether it's possible to make 'echo' print without a newline.
+# These variables are no longer used directly by Autoconf, but are AC_SUBSTed
+# for compatibility with existing Makefiles.
ECHO_C= ECHO_N= ECHO_T=
case `echo -n x` in #(((((
-n*)
@@ -513,6 +537,13 @@ case `echo -n x` in #(((((
ECHO_N='-n';;
esac
+# For backward compatibility with old third-party macros, we provide
+# the shell variables $as_echo and $as_echo_n. New code should use
+# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively.
+as_echo='printf %s\n'
+as_echo_n='printf %s'
+
+
rm -f conf$$ conf$$.exe conf$$.file
if test -d conf$$.dir; then
rm -f conf$$.dir/conf$$.file
@@ -580,8 +611,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='fonts-tlwg'
PACKAGE_TARNAME='fonts-tlwg'
-PACKAGE_VERSION='0.7.2'
-PACKAGE_STRING='fonts-tlwg 0.7.2'
+PACKAGE_VERSION='0.7.3'
+PACKAGE_STRING='fonts-tlwg 0.7.3'
PACKAGE_BUGREPORT='https://github.com/tlwg/fonts-tlwg/issues'
PACKAGE_URL=''
@@ -635,6 +666,9 @@ AM_BACKSLASH
AM_DEFAULT_VERBOSITY
AM_DEFAULT_V
AM_V
+CSCOPE
+ETAGS
+CTAGS
am__untar
am__tar
AMTAR
@@ -702,6 +736,8 @@ ac_user_opts='
enable_option_checking
enable_silent_rules
enable_ttf
+with_python_prefix
+with_python_exec_prefix
with_ttfdir
enable_pfb
with_type1dir
@@ -787,8 +823,6 @@ do
*) ac_optarg=yes ;;
esac
- # Accept the important Cygnus configure options, so we can diagnose typos.
-
case $ac_dashdash$ac_option in
--)
ac_dashdash=yes ;;
@@ -829,9 +863,9 @@ do
ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- as_fn_error $? "invalid feature name: $ac_useropt"
+ as_fn_error $? "invalid feature name: \`$ac_useropt'"
ac_useropt_orig=$ac_useropt
- ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+ ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
*"
"enable_$ac_useropt"
@@ -855,9 +889,9 @@ do
ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- as_fn_error $? "invalid feature name: $ac_useropt"
+ as_fn_error $? "invalid feature name: \`$ac_useropt'"
ac_useropt_orig=$ac_useropt
- ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+ ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
*"
"enable_$ac_useropt"
@@ -1068,9 +1102,9 @@ do
ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- as_fn_error $? "invalid package name: $ac_useropt"
+ as_fn_error $? "invalid package name: \`$ac_useropt'"
ac_useropt_orig=$ac_useropt
- ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+ ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
*"
"with_$ac_useropt"
@@ -1084,9 +1118,9 @@ do
ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- as_fn_error $? "invalid package name: $ac_useropt"
+ as_fn_error $? "invalid package name: \`$ac_useropt'"
ac_useropt_orig=$ac_useropt
- ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+ ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
*"
"with_$ac_useropt"
@@ -1130,9 +1164,9 @@ Try \`$0 --help' for more information"
*)
# FIXME: should be removed in autoconf 3.0.
- $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+ printf "%s\n" "$as_me: WARNING: you should use --build, --host, --target" >&2
expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
- $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+ printf "%s\n" "$as_me: WARNING: invalid host type: $ac_option" >&2
: "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
;;
@@ -1148,7 +1182,7 @@ if test -n "$ac_unrecognized_opts"; then
case $enable_option_checking in
no) ;;
fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
- *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+ *) printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
esac
fi
@@ -1212,7 +1246,7 @@ $as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$as_myself" : 'X\(//\)[^/]' \| \
X"$as_myself" : 'X\(//\)$' \| \
X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_myself" |
+printf "%s\n" X"$as_myself" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
@@ -1269,7 +1303,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.7.2 to adapt to many kinds of systems.
+\`configure' configures fonts-tlwg 0.7.3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1336,7 +1370,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of fonts-tlwg 0.7.2:";;
+ short | recursive ) echo "Configuration of fonts-tlwg 0.7.3:";;
esac
cat <<\_ACEOF
@@ -1357,6 +1391,9 @@ Optional Features:
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
+ --with-python_prefix override the default PYTHON_PREFIX
+ --with-python_exec_prefix
+ override the default PYTHON_EXEC_PREFIX
--with-ttfdir=DIR font directory in DIR
[PREFIX/share/fonts/truetype/thai]
--with-type1dir=DIR font directory in DIR
@@ -1389,9 +1426,9 @@ if test "$ac_init_help" = "recursive"; then
case "$ac_dir" in
.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
*)
- ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+ ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'`
# A ".." for each directory in $ac_dir_suffix.
- ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+ ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
case $ac_top_builddir_sub in
"") ac_top_builddir_sub=. ac_top_build_prefix= ;;
*) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -1419,7 +1456,8 @@ esac
ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
cd "$ac_dir" || { ac_status=$?; continue; }
- # Check for guested configure.
+ # Check for configure.gnu first; this name is used for a wrapper for
+ # Metaconfig's "Configure" on case-insensitive file systems.
if test -f "$ac_srcdir/configure.gnu"; then
echo &&
$SHELL "$ac_srcdir/configure.gnu" --help=recursive
@@ -1427,7 +1465,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
echo &&
$SHELL "$ac_srcdir/configure" --help=recursive
else
- $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+ printf "%s\n" "$as_me: WARNING: no configuration information is in $ac_dir" >&2
fi || ac_status=$?
cd "$ac_pwd" || { ac_status=$?; break; }
done
@@ -1436,10 +1474,10 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-fonts-tlwg configure 0.7.2
-generated by GNU Autoconf 2.69
+fonts-tlwg configure 0.7.3
+generated by GNU Autoconf 2.71
-Copyright (C) 2012 Free Software Foundation, Inc.
+Copyright (C) 2021 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it.
_ACEOF
@@ -1449,14 +1487,34 @@ fi
## ------------------------ ##
## Autoconf initialization. ##
## ------------------------ ##
+ac_configure_args_raw=
+for ac_arg
+do
+ case $ac_arg in
+ *\'*)
+ ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+ esac
+ as_fn_append ac_configure_args_raw " '$ac_arg'"
+done
+
+case $ac_configure_args_raw in
+ *$as_nl*)
+ ac_safe_unquote= ;;
+ *)
+ ac_unsafe_z='|&;<>()$`\\"*?[ '' ' # This string ends in space, tab.
+ ac_unsafe_a="$ac_unsafe_z#~"
+ ac_safe_unquote="s/ '\\([^$ac_unsafe_a][^$ac_unsafe_z]*\\)'/ \\1/g"
+ ac_configure_args_raw=` printf "%s\n" "$ac_configure_args_raw" | sed "$ac_safe_unquote"`;;
+esac
+
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.7.2, which was
-generated by GNU Autoconf 2.69. Invocation command line was
+It was created by fonts-tlwg $as_me 0.7.3, which was
+generated by GNU Autoconf 2.71. Invocation command line was
- $ $0 $@
+ $ $0$ac_configure_args_raw
_ACEOF
exec 5>>config.log
@@ -1489,8 +1547,12 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- $as_echo "PATH: $as_dir"
+ case $as_dir in #(((
+ '') as_dir=./ ;;
+ */) ;;
+ *) as_dir=$as_dir/ ;;
+ esac
+ printf "%s\n" "PATH: $as_dir"
done
IFS=$as_save_IFS
@@ -1525,7 +1587,7 @@ do
| -silent | --silent | --silen | --sile | --sil)
continue ;;
*\'*)
- ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+ ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
case $ac_pass in
1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
@@ -1560,11 +1622,13 @@ done
# WARNING: Use '\'' to represent an apostrophe within the trap.
# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
trap 'exit_status=$?
+ # Sanitize IFS.
+ IFS=" "" $as_nl"
# Save into config.log some information that might help in debugging.
{
echo
- $as_echo "## ---------------- ##
+ printf "%s\n" "## ---------------- ##
## Cache variables. ##
## ---------------- ##"
echo
@@ -1575,8 +1639,8 @@ trap 'exit_status=$?
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
- *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+ *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
esac
case $ac_var in #(
_ | IFS | as_nl) ;; #(
@@ -1600,7 +1664,7 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
)
echo
- $as_echo "## ----------------- ##
+ printf "%s\n" "## ----------------- ##
## Output variables. ##
## ----------------- ##"
echo
@@ -1608,14 +1672,14 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
do
eval ac_val=\$$ac_var
case $ac_val in
- *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+ *\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
esac
- $as_echo "$ac_var='\''$ac_val'\''"
+ printf "%s\n" "$ac_var='\''$ac_val'\''"
done | sort
echo
if test -n "$ac_subst_files"; then
- $as_echo "## ------------------- ##
+ printf "%s\n" "## ------------------- ##
## File substitutions. ##
## ------------------- ##"
echo
@@ -1623,15 +1687,15 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
do
eval ac_val=\$$ac_var
case $ac_val in
- *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+ *\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
esac
- $as_echo "$ac_var='\''$ac_val'\''"
+ printf "%s\n" "$ac_var='\''$ac_val'\''"
done | sort
echo
fi
if test -s confdefs.h; then
- $as_echo "## ----------- ##
+ printf "%s\n" "## ----------- ##
## confdefs.h. ##
## ----------- ##"
echo
@@ -1639,8 +1703,8 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
echo
fi
test "$ac_signal" != 0 &&
- $as_echo "$as_me: caught signal $ac_signal"
- $as_echo "$as_me: exit $exit_status"
+ printf "%s\n" "$as_me: caught signal $ac_signal"
+ printf "%s\n" "$as_me: exit $exit_status"
} >&5
rm -f core *.core core.conftest.* &&
rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
@@ -1654,63 +1718,48 @@ ac_signal=0
# confdefs.h avoids OS command line length limits that DEFS can exceed.
rm -f -r conftest* confdefs.h
-$as_echo "/* confdefs.h */" > confdefs.h
+printf "%s\n" "/* confdefs.h */" > confdefs.h
# Predefined preprocessor variables.
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_NAME "$PACKAGE_NAME"
-_ACEOF
+printf "%s\n" "#define PACKAGE_NAME \"$PACKAGE_NAME\"" >>confdefs.h
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
-_ACEOF
+printf "%s\n" "#define PACKAGE_TARNAME \"$PACKAGE_TARNAME\"" >>confdefs.h
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_VERSION "$PACKAGE_VERSION"
-_ACEOF
+printf "%s\n" "#define PACKAGE_VERSION \"$PACKAGE_VERSION\"" >>confdefs.h
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_STRING "$PACKAGE_STRING"
-_ACEOF
+printf "%s\n" "#define PACKAGE_STRING \"$PACKAGE_STRING\"" >>confdefs.h
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
-_ACEOF
+printf "%s\n" "#define PACKAGE_BUGREPORT \"$PACKAGE_BUGREPORT\"" >>confdefs.h
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_URL "$PACKAGE_URL"
-_ACEOF
+printf "%s\n" "#define PACKAGE_URL \"$PACKAGE_URL\"" >>confdefs.h
# Let the site file select an alternate cache file if it wants to.
# Prefer an explicitly selected file to automatically selected ones.
-ac_site_file1=NONE
-ac_site_file2=NONE
if test -n "$CONFIG_SITE"; then
- # We do not want a PATH search for config.site.
- case $CONFIG_SITE in #((
- -*) ac_site_file1=./$CONFIG_SITE;;
- */*) ac_site_file1=$CONFIG_SITE;;
- *) ac_site_file1=./$CONFIG_SITE;;
- esac
+ ac_site_files="$CONFIG_SITE"
elif test "x$prefix" != xNONE; then
- ac_site_file1=$prefix/share/config.site
- ac_site_file2=$prefix/etc/config.site
+ ac_site_files="$prefix/share/config.site $prefix/etc/config.site"
else
- ac_site_file1=$ac_default_prefix/share/config.site
- ac_site_file2=$ac_default_prefix/etc/config.site
+ ac_site_files="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
fi
-for ac_site_file in "$ac_site_file1" "$ac_site_file2"
+
+for ac_site_file in $ac_site_files
do
- test "x$ac_site_file" = xNONE && continue
- if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
-$as_echo "$as_me: loading site script $ac_site_file" >&6;}
+ case $ac_site_file in #(
+ */*) :
+ ;; #(
+ *) :
+ ac_site_file=./$ac_site_file ;;
+esac
+ if test -f "$ac_site_file" && test -r "$ac_site_file"; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
+printf "%s\n" "$as_me: loading site script $ac_site_file" >&6;}
sed 's/^/| /' "$ac_site_file" >&5
. "$ac_site_file" \
- || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ || { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "failed to load site script $ac_site_file
See \`config.log' for more details" "$LINENO" 5; }
fi
@@ -1720,19 +1769,117 @@ if test -r "$cache_file"; then
# Some versions of bash will fail to source /dev/null (special files
# actually), so we avoid doing that. DJGPP emulates it as a regular file.
if test /dev/null != "$cache_file" && test -f "$cache_file"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
-$as_echo "$as_me: loading cache $cache_file" >&6;}
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
+printf "%s\n" "$as_me: loading cache $cache_file" >&6;}
case $cache_file in
[\\/]* | ?:[\\/]* ) . "$cache_file";;
*) . "./$cache_file";;
esac
fi
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
-$as_echo "$as_me: creating cache $cache_file" >&6;}
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
+printf "%s\n" "$as_me: creating cache $cache_file" >&6;}
>$cache_file
fi
+
+# Auxiliary files required by this configure script.
+ac_aux_files="missing install-sh"
+
+# Locations in which to look for auxiliary files.
+ac_aux_dir_candidates="${srcdir}${PATH_SEPARATOR}${srcdir}/..${PATH_SEPARATOR}${srcdir}/../.."
+
+# Search for a directory containing all of the required auxiliary files,
+# $ac_aux_files, from the $PATH-style list $ac_aux_dir_candidates.
+# If we don't find one directory that contains all the files we need,
+# we report the set of missing files from the *first* directory in
+# $ac_aux_dir_candidates and give up.
+ac_missing_aux_files=""
+ac_first_candidate=:
+printf "%s\n" "$as_me:${as_lineno-$LINENO}: looking for aux files: $ac_aux_files" >&5
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_found=false
+for as_dir in $ac_aux_dir_candidates
+do
+ IFS=$as_save_IFS
+ case $as_dir in #(((
+ '') as_dir=./ ;;
+ */) ;;
+ *) as_dir=$as_dir/ ;;
+ esac
+ as_found=:
+
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: trying $as_dir" >&5
+ ac_aux_dir_found=yes
+ ac_install_sh=
+ for ac_aux in $ac_aux_files
+ do
+ # As a special case, if "install-sh" is required, that requirement
+ # can be satisfied by any of "install-sh", "install.sh", or "shtool",
+ # and $ac_install_sh is set appropriately for whichever one is found.
+ if test x"$ac_aux" = x"install-sh"
+ then
+ if test -f "${as_dir}install-sh"; then
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}install-sh found" >&5
+ ac_install_sh="${as_dir}install-sh -c"
+ elif test -f "${as_dir}install.sh"; then
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}install.sh found" >&5
+ ac_install_sh="${as_dir}install.sh -c"
+ elif test -f "${as_dir}shtool"; then
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}shtool found" >&5
+ ac_install_sh="${as_dir}shtool install -c"
+ else
+ ac_aux_dir_found=no
+ if $ac_first_candidate; then
+ ac_missing_aux_files="${ac_missing_aux_files} install-sh"
+ else
+ break
+ fi
+ fi
+ else
+ if test -f "${as_dir}${ac_aux}"; then
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}${ac_aux} found" >&5
+ else
+ ac_aux_dir_found=no
+ if $ac_first_candidate; then
+ ac_missing_aux_files="${ac_missing_aux_files} ${ac_aux}"
+ else
+ break
+ fi
+ fi
+ fi
+ done
+ if test "$ac_aux_dir_found" = yes; then
+ ac_aux_dir="$as_dir"
+ break
+ fi
+ ac_first_candidate=false
+
+ as_found=false
+done
+IFS=$as_save_IFS
+if $as_found
+then :
+
+else $as_nop
+ as_fn_error $? "cannot find required auxiliary files:$ac_missing_aux_files" "$LINENO" 5
+fi
+
+
+# These three variables are undocumented and unsupported,
+# and are intended to be withdrawn in a future Autoconf release.
+# They can cause serious problems if a builder's source tree is in a directory
+# whose full name contains unusual characters.
+if test -f "${ac_aux_dir}config.guess"; then
+ ac_config_guess="$SHELL ${ac_aux_dir}config.guess"
+fi
+if test -f "${ac_aux_dir}config.sub"; then
+ ac_config_sub="$SHELL ${ac_aux_dir}config.sub"
+fi
+if test -f "$ac_aux_dir/configure"; then
+ ac_configure="$SHELL ${ac_aux_dir}configure"
+fi
+
# Check that the precious variables saved in the cache have kept the same
# value.
ac_cache_corrupted=false
@@ -1743,12 +1890,12 @@ for ac_var in $ac_precious_vars; do
eval ac_new_val=\$ac_env_${ac_var}_value
case $ac_old_set,$ac_new_set in
set,)
- { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+printf "%s\n" "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
ac_cache_corrupted=: ;;
,set)
- { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
-$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
+printf "%s\n" "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
ac_cache_corrupted=: ;;
,);;
*)
@@ -1757,24 +1904,24 @@ $as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
ac_old_val_w=`echo x $ac_old_val`
ac_new_val_w=`echo x $ac_new_val`
if test "$ac_old_val_w" != "$ac_new_val_w"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
-$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
+printf "%s\n" "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
ac_cache_corrupted=:
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
-$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+printf "%s\n" "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
eval $ac_var=\$ac_old_val
fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5
-$as_echo "$as_me: former value: \`$ac_old_val'" >&2;}
- { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5
-$as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5
+printf "%s\n" "$as_me: former value: \`$ac_old_val'" >&2;}
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5
+printf "%s\n" "$as_me: current value: \`$ac_new_val'" >&2;}
fi;;
esac
# Pass precious variables to config.status.
if test "$ac_new_set" = set; then
case $ac_new_val in
- *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+ *\'*) ac_arg=$ac_var=`printf "%s\n" "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
*) ac_arg=$ac_var=$ac_new_val ;;
esac
case " $ac_configure_args " in
@@ -1784,11 +1931,12 @@ $as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
fi
done
if $ac_cache_corrupted; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
-$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
- as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
+printf "%s\n" "$as_me: error: changes in the environment can compromise the build" >&2;}
+ as_fn_error $? "run \`${MAKE-make} distclean' and/or \`rm $cache_file'
+ and start over" "$LINENO" 5
fi
## -------------------- ##
## Main body of script. ##
@@ -1805,36 +1953,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
am__api_version='1.16'
-ac_aux_dir=
-for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
- if test -f "$ac_dir/install-sh"; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/install-sh -c"
- break
- elif test -f "$ac_dir/install.sh"; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/install.sh -c"
- break
- elif test -f "$ac_dir/shtool"; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/shtool install -c"
- break
- fi
-done
-if test -z "$ac_aux_dir"; then
- as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
-fi
-
-# These three variables are undocumented and unsupported,
-# and are intended to be withdrawn in a future Autoconf release.
-# They can cause serious problems if a builder's source tree is in a directory
-# whose full name contains unusual characters.
-ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var.
-ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var.
-ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
-# Find a good install program. We prefer a C program (faster),
+ # Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or
# incompatible versions:
# SysV /etc/install, /usr/sbin/install
@@ -1848,20 +1969,25 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
# OS/2's system install, which has a completely different semantic
# ./install, which can be erroneously created by make from ./install.sh.
# Reject install programs that cannot install multiple files.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
-$as_echo_n "checking for a BSD-compatible install... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
+printf %s "checking for a BSD-compatible install... " >&6; }
if test -z "$INSTALL"; then
-if ${ac_cv_path_install+:} false; then :
- $as_echo_n "(cached) " >&6
-else
+if test ${ac_cv_path_install+y}
+then :
+ printf %s "(cached) " >&6
+else $as_nop
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in #((
- ./ | .// | /[cC]/* | \
+ case $as_dir in #(((
+ '') as_dir=./ ;;
+ */) ;;
+ *) as_dir=$as_dir/ ;;
+ esac
+ # Account for fact that we put trailing slashes in our PATH walk.
+case $as_dir in #((
+ ./ | /[cC]/* | \
/etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
/usr/ucb/* ) ;;
@@ -1871,13 +1997,13 @@ case $as_dir/ in #((
# by default.
for ac_prog in ginstall scoinst install; do
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
+ if as_fn_executable_p "$as_dir$ac_prog$ac_exec_ext"; then
if test $ac_prog = install &&
- grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+ grep dspmsg "$as_dir$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
# AIX install. It has an incompatible calling convention.
:
elif test $ac_prog = install &&
- grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+ grep pwplus "$as_dir$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
# program-specific install script used by HP pwplus--don't use.
:
else
@@ -1885,12 +2011,12 @@ case $as_dir/ in #((
echo one > conftest.one
echo two > conftest.two
mkdir conftest.dir
- if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
+ if "$as_dir$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir/" &&
test -s conftest.one && test -s conftest.two &&
test -s conftest.dir/conftest.one &&
test -s conftest.dir/conftest.two
then
- ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+ ac_cv_path_install="$as_dir$ac_prog$ac_exec_ext -c"
break 3
fi
fi
@@ -1906,7 +2032,7 @@ IFS=$as_save_IFS
rm -rf conftest.one conftest.two conftest.dir
fi
- if test "${ac_cv_path_install+set}" = set; then
+ if test ${ac_cv_path_install+y}; then
INSTALL=$ac_cv_path_install
else
# As a last resort, use the slow shell script. Don't cache a
@@ -1916,8 +2042,8 @@ fi
INSTALL=$ac_install_sh
fi
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
-$as_echo "$INSTALL" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
+printf "%s\n" "$INSTALL" >&6; }
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
# It thinks the first close brace ends the variable substitution.
@@ -1927,8 +2053,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
-$as_echo_n "checking whether build environment is sane... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
+printf %s "checking whether build environment is sane... " >&6; }
# Reject unsafe characters in $srcdir or the absolute working directory
# name. Accept space and tab only in the latter.
am_lf='
@@ -1982,8 +2108,8 @@ else
as_fn_error $? "newly created file is older than distributed files!
Check your system clock" "$LINENO" 5
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
# If we didn't sleep, we still need to ensure time stamps of config.status and
# generated files are strictly newer.
am_sleep_pid=
@@ -2002,26 +2128,23 @@ test "$program_suffix" != NONE &&
# Double any \ or $.
# By default was `s,x,x', remove it if useless.
ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
-program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
+program_transform_name=`printf "%s\n" "$program_transform_name" | sed "$ac_script"`
+
# Expand $ac_aux_dir to an absolute path.
am_aux_dir=`cd "$ac_aux_dir" && pwd`
-if test x"${MISSING+set}" != xset; then
- case $am_aux_dir in
- *\ * | *\ *)
- MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
- *)
- MISSING="\${SHELL} $am_aux_dir/missing" ;;
- esac
+
+ if test x"${MISSING+set}" != xset; then
+ MISSING="\${SHELL} '$am_aux_dir/missing'"
fi
# Use eval to expand $SHELL
if eval "$MISSING --is-lightweight"; then
am_missing_run="$MISSING "
else
am_missing_run=
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
-$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
+printf "%s\n" "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
fi
if test x"${install_sh+set}" != xset; then
@@ -2041,11 +2164,12 @@ if test "$cross_compiling" != no; then
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_STRIP+:} false; then :
- $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_STRIP+y}
+then :
+ printf %s "(cached) " >&6
+else $as_nop
if test -n "$STRIP"; then
ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
else
@@ -2053,11 +2177,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
+ case $as_dir in #(((
+ '') as_dir=./ ;;
+ */) ;;
+ *) as_dir=$as_dir/ ;;
+ esac
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
ac_cv_prog_STRIP="${ac_tool_prefix}strip"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -2068,11 +2196,11 @@ fi
fi
STRIP=$ac_cv_prog_STRIP
if test -n "$STRIP"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
-$as_echo "$STRIP" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
+printf "%s\n" "$STRIP" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
fi
@@ -2081,11 +2209,12 @@ if test -z "$ac_cv_prog_STRIP"; then
ac_ct_STRIP=$STRIP
# Extract the first word of "strip", so it can be a program name with args.
set dummy strip; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
- $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_STRIP+y}
+then :
+ printf %s "(cached) " >&6
+else $as_nop
if test -n "$ac_ct_STRIP"; then
ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
else
@@ -2093,11 +2222,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
+ case $as_dir in #(((
+ '') as_dir=./ ;;
+ */) ;;
+ *) as_dir=$as_dir/ ;;
+ esac
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_STRIP="strip"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -2108,11 +2241,11 @@ fi
fi
ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
if test -n "$ac_ct_STRIP"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
-$as_echo "$ac_ct_STRIP" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
+printf "%s\n" "$ac_ct_STRIP" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
fi
if test "x$ac_ct_STRIP" = x; then
@@ -2120,8 +2253,8 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
STRIP=$ac_ct_STRIP
@@ -2133,25 +2266,31 @@ fi
fi
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
-$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
+
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a race-free mkdir -p" >&5
+printf %s "checking for a race-free mkdir -p... " >&6; }
if test -z "$MKDIR_P"; then
- if ${ac_cv_path_mkdir+:} false; then :
- $as_echo_n "(cached) " >&6
-else
+ if test ${ac_cv_path_mkdir+y}
+then :
+ printf %s "(cached) " >&6
+else $as_nop
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
do
IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
+ case $as_dir in #(((
+ '') as_dir=./ ;;
+ */) ;;
+ *) as_dir=$as_dir/ ;;
+ esac
for ac_prog in mkdir gmkdir; do
for ac_exec_ext in '' $ac_executable_extensions; do
- as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
- case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
- 'mkdir (GNU coreutils) '* | \
- 'mkdir (coreutils) '* | \
+ as_fn_executable_p "$as_dir$ac_prog$ac_exec_ext" || continue
+ case `"$as_dir$ac_prog$ac_exec_ext" --version 2>&1` in #(
+ 'mkdir ('*'coreutils) '* | \
+ 'BusyBox '* | \
'mkdir (fileutils) '4.1*)
- ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
+ ac_cv_path_mkdir=$as_dir$ac_prog$ac_exec_ext
break 3;;
esac
done
@@ -2162,7 +2301,7 @@ IFS=$as_save_IFS
fi
test -d ./--version && rmdir ./--version
- if test "${ac_cv_path_mkdir+set}" = set; then
+ if test ${ac_cv_path_mkdir+y}; then
MKDIR_P="$ac_cv_path_mkdir -p"
else
# As a last resort, use the slow shell script. Don't cache a
@@ -2172,18 +2311,19 @@ fi
MKDIR_P="$ac_install_sh -d"
fi
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
-$as_echo "$MKDIR_P" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
+printf "%s\n" "$MKDIR_P" >&6; }
for ac_prog in gawk mawk nawk awk
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_AWK+:} false; then :
- $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_AWK+y}
+then :
+ printf %s "(cached) " >&6
+else $as_nop
if test -n "$AWK"; then
ac_cv_prog_AWK="$AWK" # Let the user override the test.
else
@@ -2191,11 +2331,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
+ case $as_dir in #(((
+ '') as_dir=./ ;;
+ */) ;;
+ *) as_dir=$as_dir/ ;;
+ esac
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
ac_cv_prog_AWK="$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -2206,24 +2350,25 @@ fi
fi
AWK=$ac_cv_prog_AWK
if test -n "$AWK"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
-$as_echo "$AWK" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
+printf "%s\n" "$AWK" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
fi
test -n "$AWK" && break
done
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+printf %s "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
set x ${MAKE-make}
-ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
- $as_echo_n "(cached) " >&6
-else
+ac_make=`printf "%s\n" "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+if eval test \${ac_cv_prog_make_${ac_make}_set+y}
+then :
+ printf %s "(cached) " >&6
+else $as_nop
cat >conftest.make <<\_ACEOF
SHELL = /bin/sh
all:
@@ -2239,12 +2384,12 @@ esac
rm -f conftest.make
fi
if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
SET_MAKE=
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
SET_MAKE="MAKE=${MAKE-make}"
fi
@@ -2258,7 +2403,8 @@ fi
rmdir .tst 2>/dev/null
# Check whether --enable-silent-rules was given.
-if test "${enable_silent_rules+set}" = set; then :
+if test ${enable_silent_rules+y}
+then :
enableval=$enable_silent_rules;
fi
@@ -2268,12 +2414,13 @@ case $enable_silent_rules in # (((
*) AM_DEFAULT_VERBOSITY=1;;
esac
am_make=${MAKE-make}
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
-$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
-if ${am_cv_make_support_nested_variables+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if $as_echo 'TRUE=$(BAR$(V))
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
+printf %s "checking whether $am_make supports nested variables... " >&6; }
+if test ${am_cv_make_support_nested_variables+y}
+then :
+ printf %s "(cached) " >&6
+else $as_nop
+ if printf "%s\n" 'TRUE=$(BAR$(V))
BAR0=false
BAR1=true
V=1
@@ -2285,8 +2432,8 @@ else
am_cv_make_support_nested_variables=no
fi
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
-$as_echo "$am_cv_make_support_nested_variables" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
+printf "%s\n" "$am_cv_make_support_nested_variables" >&6; }
if test $am_cv_make_support_nested_variables = yes; then
AM_V='$(V)'
AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
@@ -2318,17 +2465,13 @@ fi
# Define the identity of the package.
PACKAGE='fonts-tlwg'
- VERSION='0.7.2'
+ VERSION='0.7.3'
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE "$PACKAGE"
-_ACEOF
+printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
-cat >>confdefs.h <<_ACEOF
-#define VERSION "$VERSION"
-_ACEOF
+printf "%s\n" "#define VERSION \"$VERSION\"" >>confdefs.h
# Some tools Automake needs.
@@ -2368,6 +2511,20 @@ am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
+# Variables for tags utilities; see am/tags.am
+if test -z "$CTAGS"; then
+ CTAGS=ctags
+fi
+
+if test -z "$ETAGS"; then
+ ETAGS=etags
+fi
+
+if test -z "$CSCOPE"; then
+ CSCOPE=cscope
+fi
+
+
# POSIX will say in a future version that running "rm -f" with no argument
# is OK; and we want to be able to make that assumption in our Makefile
@@ -2418,9 +2575,10 @@ LATEX_PACKAGE="fonts-tlwg"
# Check whether --enable-ttf was given.
-if test "${enable_ttf+set}" = set; then :
+if test ${enable_ttf+y}
+then :
enableval=$enable_ttf;
-else
+else $as_nop
enable_ttf="no"
fi
@@ -2433,8 +2591,8 @@ if test "x$enable_ttf" = "xyes"; then
if test -n "$PYTHON"; then
# If the user set $PYTHON, use it and don't search something else.
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $PYTHON version is >= 3.7" >&5
-$as_echo_n "checking whether $PYTHON version is >= 3.7... " >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $PYTHON version is >= 3.7" >&5
+printf %s "checking whether $PYTHON version is >= 3.7... " >&6; }
prog="import sys
# split strings by '.' and convert to numeric. Append some zeros
# because we need at least 4 digits for the hex conversion.
@@ -2448,23 +2606,25 @@ sys.exit(sys.hexversion < minverhex)"
($PYTHON -c "$prog") >&5 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ (exit $ac_status); }
+then :
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+else $as_nop
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
as_fn_error $? "Python interpreter is too old" "$LINENO" 5
fi
am_display_PYTHON=$PYTHON
else
# Otherwise, try each interpreter until we find one that satisfies
# VERSION.
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a Python interpreter with version >= 3.7" >&5
-$as_echo_n "checking for a Python interpreter with version >= 3.7... " >&6; }
-if ${am_cv_pathless_PYTHON+:} false; then :
- $as_echo_n "(cached) " >&6
-else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a Python interpreter with version >= 3.7" >&5
+printf %s "checking for a Python interpreter with version >= 3.7... " >&6; }
+if test ${am_cv_pathless_PYTHON+y}
+then :
+ printf %s "(cached) " >&6
+else $as_nop
for am_cv_pathless_PYTHON in python python2 python3 python3.9 python3.8 python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do
test "$am_cv_pathless_PYTHON" = none && break
@@ -2481,24 +2641,26 @@ sys.exit(sys.hexversion < minverhex)"
($am_cv_pathless_PYTHON -c "$prog") >&5 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then :
+ (exit $ac_status); }
+then :
break
fi
done
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_pathless_PYTHON" >&5
-$as_echo "$am_cv_pathless_PYTHON" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_pathless_PYTHON" >&5
+printf "%s\n" "$am_cv_pathless_PYTHON" >&6; }
# Set $PYTHON to the absolute path of $am_cv_pathless_PYTHON.
if test "$am_cv_pathless_PYTHON" = none; then
PYTHON=:
else
# Extract the first word of "$am_cv_pathless_PYTHON", so it can be a program name with args.
set dummy $am_cv_pathless_PYTHON; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_PYTHON+:} false; then :
- $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_PYTHON+y}
+then :
+ printf %s "(cached) " >&6
+else $as_nop
case $PYTHON in
[\\/]* | ?:[\\/]*)
ac_cv_path_PYTHON="$PYTHON" # Let the user override the test with a path.
@@ -2508,11 +2670,15 @@ else
for as_dir in $PATH
do
IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
+ case $as_dir in #(((
+ '') as_dir=./ ;;
+ */) ;;
+ *) as_dir=$as_dir/ ;;
+ esac
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+ ac_cv_path_PYTHON="$as_dir$ac_word$ac_exec_ext"
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -2524,11 +2690,11 @@ esac
fi
PYTHON=$ac_cv_path_PYTHON
if test -n "$PYTHON"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON" >&5
-$as_echo "$PYTHON" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PYTHON" >&5
+printf "%s\n" "$PYTHON" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
fi
@@ -2542,34 +2708,130 @@ fi
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON version" >&5
-$as_echo_n "checking for $am_display_PYTHON version... " >&6; }
-if ${am_cv_python_version+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"`
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON version" >&5
+printf %s "checking for $am_display_PYTHON version... " >&6; }
+if test ${am_cv_python_version+y}
+then :
+ printf %s "(cached) " >&6
+else $as_nop
+ am_cv_python_version=`$PYTHON -c "import sys; print ('%u.%u' % sys.version_info[:2])"`
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5
-$as_echo "$am_cv_python_version" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5
+printf "%s\n" "$am_cv_python_version" >&6; }
PYTHON_VERSION=$am_cv_python_version
- PYTHON_PREFIX='${prefix}'
+ if test "x$prefix" = xNONE
+ then
+ am__usable_prefix=$ac_default_prefix
+ else
+ am__usable_prefix=$prefix
+ fi
- PYTHON_EXEC_PREFIX='${exec_prefix}'
+# Check whether --with-python_prefix was given.
+if test ${with_python_prefix+y}
+then :
+ withval=$with_python_prefix; am_python_prefix_subst="$withval"
+ am_cv_python_prefix="$withval"
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON prefix" >&5
+printf %s "checking for $am_display_PYTHON prefix... " >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_prefix" >&5
+printf "%s\n" "$am_cv_python_prefix" >&6; }
+else $as_nop
+
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON prefix" >&5
+printf %s "checking for $am_display_PYTHON prefix... " >&6; }
+if test ${am_cv_python_prefix+y}
+then :
+ printf %s "(cached) " >&6
+else $as_nop
+ am_cv_python_prefix=`$PYTHON -c "import sys; sys.stdout.write(sys.prefix)"`
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_prefix" >&5
+printf "%s\n" "$am_cv_python_prefix" >&6; }
+
+ case $am_cv_python_prefix in
+ $am__usable_prefix*)
+ am__strip_prefix=`echo "$am__usable_prefix" | sed 's|.|.|g'`
+ am_python_prefix_subst=`echo "$am_cv_python_prefix" | sed "s,^$am__strip_prefix,\\${prefix},"`
+ ;;
+ *)
+ am_python_prefix_subst=$am_cv_python_prefix
+ ;;
+ esac
+fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON platform" >&5
-$as_echo_n "checking for $am_display_PYTHON platform... " >&6; }
-if ${am_cv_python_platform+:} false; then :
- $as_echo_n "(cached) " >&6
-else
+ PYTHON_PREFIX=$am_python_prefix_subst
+
+
+
+# Check whether --with-python_exec_prefix was given.
+if test ${with_python_exec_prefix+y}
+then :
+ withval=$with_python_exec_prefix; am_python_exec_prefix_subst="$withval"
+ am_cv_python_exec_prefix="$withval"
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON exec_prefix" >&5
+printf %s "checking for $am_display_PYTHON exec_prefix... " >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_exec_prefix" >&5
+printf "%s\n" "$am_cv_python_exec_prefix" >&6; }
+else $as_nop
+
+ if test -n "$with_python_prefix"
+then :
+ am_python_exec_prefix_subst="$with_python_prefix"
+ am_cv_python_exec_prefix="$with_python_prefix"
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON exec_prefix" >&5
+printf %s "checking for $am_display_PYTHON exec_prefix... " >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_exec_prefix" >&5
+printf "%s\n" "$am_cv_python_exec_prefix" >&6; }
+else $as_nop
+
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON exec_prefix" >&5
+printf %s "checking for $am_display_PYTHON exec_prefix... " >&6; }
+if test ${am_cv_python_exec_prefix+y}
+then :
+ printf %s "(cached) " >&6
+else $as_nop
+ am_cv_python_exec_prefix=`$PYTHON -c "import sys; sys.stdout.write(sys.exec_prefix)"`
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_exec_prefix" >&5
+printf "%s\n" "$am_cv_python_exec_prefix" >&6; }
+ if test "x$exec_prefix" = xNONE
+ then
+ am__usable_exec_prefix=$am__usable_prefix
+ else
+ am__usable_exec_prefix=$exec_prefix
+ fi
+ case $am_cv_python_exec_prefix in
+ $am__usable_exec_prefix*)
+ am__strip_prefix=`echo "$am__usable_exec_prefix" | sed 's|.|.|g'`
+ am_python_exec_prefix_subst=`echo "$am_cv_python_exec_prefix" | sed "s,^$am__strip_prefix,\\${exec_prefix},"`
+ ;;
+ *)
+ am_python_exec_prefix_subst=$am_cv_python_exec_prefix
+ ;;
+ esac
+
+fi
+fi
+
+ PYTHON_EXEC_PREFIX=$am_python_exec_prefix_subst
+
+
+
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON platform" >&5
+printf %s "checking for $am_display_PYTHON platform... " >&6; }
+if test ${am_cv_python_platform+y}
+then :
+ printf %s "(cached) " >&6
+else $as_nop
am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"`
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_platform" >&5
-$as_echo "$am_cv_python_platform" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_platform" >&5
+printf "%s\n" "$am_cv_python_platform" >&6; }
PYTHON_PLATFORM=$am_cv_python_platform
@@ -2594,16 +2856,17 @@ except ImportError:
pass"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON script directory" >&5
-$as_echo_n "checking for $am_display_PYTHON script directory... " >&6; }
-if ${am_cv_python_pythondir+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test "x$prefix" = xNONE
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON script directory" >&5
+printf %s "checking for $am_display_PYTHON script directory... " >&6; }
+if test ${am_cv_python_pythondir+y}
+then :
+ printf %s "(cached) " >&6
+else $as_nop
+ if test "x$am_cv_python_prefix" = x
then
- am_py_prefix=$ac_default_prefix
+ am_py_prefix=$am__usable_prefix
else
- am_py_prefix=$prefix
+ am_py_prefix=$am_cv_python_prefix
fi
am_cv_python_pythondir=`$PYTHON -c "
$am_python_setup_sysconfig
@@ -2616,21 +2879,21 @@ sys.stdout.write(sitedir)"`
case $am_cv_python_pythondir in
$am_py_prefix*)
am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`
- am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"`
+ am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,\\${PYTHON_PREFIX},"`
;;
*)
case $am_py_prefix in
/usr|/System*) ;;
*)
- am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages
+ am_cv_python_pythondir="\${PYTHON_PREFIX}/lib/python$PYTHON_VERSION/site-packages"
;;
esac
;;
esac
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pythondir" >&5
-$as_echo "$am_cv_python_pythondir" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pythondir" >&5
+printf "%s\n" "$am_cv_python_pythondir" >&6; }
pythondir=$am_cv_python_pythondir
@@ -2638,43 +2901,44 @@ $as_echo "$am_cv_python_pythondir" >&6; }
pkgpythondir=\${pythondir}/$PACKAGE
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON extension module directory" >&5
-$as_echo_n "checking for $am_display_PYTHON extension module directory... " >&6; }
-if ${am_cv_python_pyexecdir+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test "x$exec_prefix" = xNONE
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON extension module directory" >&5
+printf %s "checking for $am_display_PYTHON extension module directory... " >&6; }
+if test ${am_cv_python_pyexecdir+y}
+then :
+ printf %s "(cached) " >&6
+else $as_nop
+ if test "x$am_cv_python_exec_prefix" = x
then
- am_py_exec_prefix=$am_py_prefix
+ am_py_exec_prefix=$am__usable_exec_prefix
else
- am_py_exec_prefix=$exec_prefix
+ am_py_exec_prefix=$am_cv_python_exec_prefix
fi
am_cv_python_pyexecdir=`$PYTHON -c "
$am_python_setup_sysconfig
if can_use_sysconfig:
- sitedir = sysconfig.get_path('platlib', vars={'platbase':'$am_py_prefix'})
+ sitedir = sysconfig.get_path('platlib', vars={'platbase':'$am_py_exec_prefix'})
else:
from distutils import sysconfig
- sitedir = sysconfig.get_python_lib(1, 0, prefix='$am_py_prefix')
+ sitedir = sysconfig.get_python_lib(1, 0, prefix='$am_py_exec_prefix')
sys.stdout.write(sitedir)"`
case $am_cv_python_pyexecdir in
$am_py_exec_prefix*)
am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`
- am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"`
+ am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,\\${PYTHON_EXEC_PREFIX},"`
;;
*)
case $am_py_exec_prefix in
/usr|/System*) ;;
*)
- am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages
+ am_cv_python_pyexecdir="\${PYTHON_EXEC_PREFIX}/lib/python$PYTHON_VERSION/site-packages"
;;
esac
;;
esac
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pyexecdir" >&5
-$as_echo "$am_cv_python_pyexecdir" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pyexecdir" >&5
+printf "%s\n" "$am_cv_python_pyexecdir" >&6; }
pyexecdir=$am_cv_python_pyexecdir
@@ -2697,17 +2961,17 @@ $as_echo "$am_cv_python_pyexecdir" >&6; }
fi
fi
PYTHON_NAME=`basename $PYTHON`
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking $PYTHON_NAME module: fontforge" >&5
-$as_echo_n "checking $PYTHON_NAME module: fontforge... " >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking $PYTHON_NAME module: fontforge" >&5
+printf %s "checking $PYTHON_NAME module: fontforge... " >&6; }
$PYTHON -c "import fontforge" 2>/dev/null
if test $? -eq 0;
then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
eval HAVE_PYMOD_FONTFORGE=yes
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
eval HAVE_PYMOD_FONTFORGE=no
#
if test -n "fatal"
@@ -2720,96 +2984,104 @@ $as_echo "no" >&6; }
# Check whether --with-ttfdir was given.
-if test "${with_ttfdir+set}" = set; then :
+if test ${with_ttfdir+y}
+then :
withval=$with_ttfdir; ttfdir="$withval"
-else
+else $as_nop
ttfdir=\$\{prefix\}/share/fonts/truetype/thai
fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking --with-ttfdir" >&5
-$as_echo_n "checking --with-ttfdir... " >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"$ttfdir\"" >&5
-$as_echo "\"$ttfdir\"" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --with-ttfdir" >&5
+printf %s "checking --with-ttfdir... " >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: \"$ttfdir\"" >&5
+printf "%s\n" "\"$ttfdir\"" >&6; }
fi
# Check whether --enable-pfb was given.
-if test "${enable_pfb+set}" = set; then :
+if test ${enable_pfb+y}
+then :
enableval=$enable_pfb;
-else
+else $as_nop
enable_pfb="no"
fi
if test "x$enable_pfb" = "xyes"; then
# Check whether --with-type1dir was given.
-if test "${with_type1dir+set}" = set; then :
+if test ${with_type1dir+y}
+then :
withval=$with_type1dir; type1dir="$withval"
-else
+else $as_nop
type1dir=\$\{prefix\}/share/fonts/type1/thai
fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking --with-type1dir" >&5
-$as_echo_n "checking --with-type1dir... " >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"$type1dir\"" >&5
-$as_echo "\"$type1dir\"" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --with-type1dir" >&5
+printf %s "checking --with-type1dir... " >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: \"$type1dir\"" >&5
+printf "%s\n" "\"$type1dir\"" >&6; }
fi
# Check whether --enable-otf was given.
-if test "${enable_otf+set}" = set; then :
+if test ${enable_otf+y}
+then :
enableval=$enable_otf;
-else
+else $as_nop
enable_otf="yes"
fi
if test "x$enable_otf" = "xyes"; then
# Check whether --with-otfdir was given.
-if test "${with_otfdir+set}" = set; then :
+if test ${with_otfdir+y}
+then :
withval=$with_otfdir; otfdir="$withval"
-else
+else $as_nop
otfdir=\$\{prefix\}/share/fonts/opentype/thai
fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking --with-otfdir" >&5
-$as_echo_n "checking --with-otfdir... " >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"$otfdir\"" >&5
-$as_echo "\"$otfdir\"" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --with-otfdir" >&5
+printf %s "checking --with-otfdir... " >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: \"$otfdir\"" >&5
+printf "%s\n" "\"$otfdir\"" >&6; }
fi
# Check whether --enable-woff was given.
-if test "${enable_woff+set}" = set; then :
+if test ${enable_woff+y}
+then :
enableval=$enable_woff;
-else
+else $as_nop
enable_woff="no"
fi
if test "x$enable_woff" = "xyes"; then
# Check whether --with-woffdir was given.
-if test "${with_woffdir+set}" = set; then :
+if test ${with_woffdir+y}
+then :
withval=$with_woffdir; woffdir="$withval"
-else
+else $as_nop
woffdir=\$\{prefix\}/share/fonts/woff/thai
fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking --with-woffdir" >&5
-$as_echo_n "checking --with-woffdir... " >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"$woffdir\"" >&5
-$as_echo "\"$woffdir\"" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --with-woffdir" >&5
+printf %s "checking --with-woffdir... " >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: \"$woffdir\"" >&5
+printf "%s\n" "\"$woffdir\"" >&6; }
fi
# Check whether --enable-testfont was given.
-if test "${enable_testfont+set}" = set; then :
+if test ${enable_testfont+y}
+then :
enableval=$enable_testfont;
-else
+else $as_nop
enable_testfont="no"
fi
@@ -2822,8 +3094,8 @@ if test "x$enable_testfont" = "xyes"; then
if test -n "$PYTHON"; then
# If the user set $PYTHON, use it and don't search something else.
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $PYTHON version is >= 3.7" >&5
-$as_echo_n "checking whether $PYTHON version is >= 3.7... " >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $PYTHON version is >= 3.7" >&5
+printf %s "checking whether $PYTHON version is >= 3.7... " >&6; }
prog="import sys
# split strings by '.' and convert to numeric. Append some zeros
# because we need at least 4 digits for the hex conversion.
@@ -2837,23 +3109,25 @@ sys.exit(sys.hexversion < minverhex)"
($PYTHON -c "$prog") >&5 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ (exit $ac_status); }
+then :
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+else $as_nop
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
as_fn_error $? "Python interpreter is too old" "$LINENO" 5
fi
am_display_PYTHON=$PYTHON
else
# Otherwise, try each interpreter until we find one that satisfies
# VERSION.
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a Python interpreter with version >= 3.7" >&5
-$as_echo_n "checking for a Python interpreter with version >= 3.7... " >&6; }
-if ${am_cv_pathless_PYTHON+:} false; then :
- $as_echo_n "(cached) " >&6
-else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a Python interpreter with version >= 3.7" >&5
+printf %s "checking for a Python interpreter with version >= 3.7... " >&6; }
+if test ${am_cv_pathless_PYTHON+y}
+then :
+ printf %s "(cached) " >&6
+else $as_nop
for am_cv_pathless_PYTHON in python python2 python3 python3.9 python3.8 python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do
test "$am_cv_pathless_PYTHON" = none && break
@@ -2870,24 +3144,26 @@ sys.exit(sys.hexversion < minverhex)"
($am_cv_pathless_PYTHON -c "$prog") >&5 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then :
+ (exit $ac_status); }
+then :
break
fi
done
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_pathless_PYTHON" >&5
-$as_echo "$am_cv_pathless_PYTHON" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_pathless_PYTHON" >&5
+printf "%s\n" "$am_cv_pathless_PYTHON" >&6; }
# Set $PYTHON to the absolute path of $am_cv_pathless_PYTHON.
if test "$am_cv_pathless_PYTHON" = none; then
PYTHON=:
else
# Extract the first word of "$am_cv_pathless_PYTHON", so it can be a program name with args.
set dummy $am_cv_pathless_PYTHON; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_PYTHON+:} false; then :
- $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_PYTHON+y}
+then :
+ printf %s "(cached) " >&6
+else $as_nop
case $PYTHON in
[\\/]* | ?:[\\/]*)
ac_cv_path_PYTHON="$PYTHON" # Let the user override the test with a path.
@@ -2897,11 +3173,15 @@ else
for as_dir in $PATH
do
IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
+ case $as_dir in #(((
+ '') as_dir=./ ;;
+ */) ;;
+ *) as_dir=$as_dir/ ;;
+ esac
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+ ac_cv_path_PYTHON="$as_dir$ac_word$ac_exec_ext"
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -2913,11 +3193,11 @@ esac
fi
PYTHON=$ac_cv_path_PYTHON
if test -n "$PYTHON"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON" >&5
-$as_echo "$PYTHON" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PYTHON" >&5
+printf "%s\n" "$PYTHON" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
fi
@@ -2931,34 +3211,130 @@ fi
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON version" >&5
-$as_echo_n "checking for $am_display_PYTHON version... " >&6; }
-if ${am_cv_python_version+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"`
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON version" >&5
+printf %s "checking for $am_display_PYTHON version... " >&6; }
+if test ${am_cv_python_version+y}
+then :
+ printf %s "(cached) " >&6
+else $as_nop
+ am_cv_python_version=`$PYTHON -c "import sys; print ('%u.%u' % sys.version_info[:2])"`
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5
-$as_echo "$am_cv_python_version" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5
+printf "%s\n" "$am_cv_python_version" >&6; }
PYTHON_VERSION=$am_cv_python_version
- PYTHON_PREFIX='${prefix}'
+ if test "x$prefix" = xNONE
+ then
+ am__usable_prefix=$ac_default_prefix
+ else
+ am__usable_prefix=$prefix
+ fi
- PYTHON_EXEC_PREFIX='${exec_prefix}'
+# Check whether --with-python_prefix was given.
+if test ${with_python_prefix+y}
+then :
+ withval=$with_python_prefix; am_python_prefix_subst="$withval"
+ am_cv_python_prefix="$withval"
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON prefix" >&5
+printf %s "checking for $am_display_PYTHON prefix... " >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_prefix" >&5
+printf "%s\n" "$am_cv_python_prefix" >&6; }
+else $as_nop
+
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON prefix" >&5
+printf %s "checking for $am_display_PYTHON prefix... " >&6; }
+if test ${am_cv_python_prefix+y}
+then :
+ printf %s "(cached) " >&6
+else $as_nop
+ am_cv_python_prefix=`$PYTHON -c "import sys; sys.stdout.write(sys.prefix)"`
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_prefix" >&5
+printf "%s\n" "$am_cv_python_prefix" >&6; }
+
+ case $am_cv_python_prefix in
+ $am__usable_prefix*)
+ am__strip_prefix=`echo "$am__usable_prefix" | sed 's|.|.|g'`
+ am_python_prefix_subst=`echo "$am_cv_python_prefix" | sed "s,^$am__strip_prefix,\\${prefix},"`
+ ;;
+ *)
+ am_python_prefix_subst=$am_cv_python_prefix
+ ;;
+ esac
+fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON platform" >&5
-$as_echo_n "checking for $am_display_PYTHON platform... " >&6; }
-if ${am_cv_python_platform+:} false; then :
- $as_echo_n "(cached) " >&6
-else
+ PYTHON_PREFIX=$am_python_prefix_subst
+
+
+
+# Check whether --with-python_exec_prefix was given.
+if test ${with_python_exec_prefix+y}
+then :
+ withval=$with_python_exec_prefix; am_python_exec_prefix_subst="$withval"
+ am_cv_python_exec_prefix="$withval"
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON exec_prefix" >&5
+printf %s "checking for $am_display_PYTHON exec_prefix... " >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_exec_prefix" >&5
+printf "%s\n" "$am_cv_python_exec_prefix" >&6; }
+else $as_nop
+
+ if test -n "$with_python_prefix"
+then :
+ am_python_exec_prefix_subst="$with_python_prefix"
+ am_cv_python_exec_prefix="$with_python_prefix"
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON exec_prefix" >&5
+printf %s "checking for $am_display_PYTHON exec_prefix... " >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_exec_prefix" >&5
+printf "%s\n" "$am_cv_python_exec_prefix" >&6; }
+else $as_nop
+
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON exec_prefix" >&5
+printf %s "checking for $am_display_PYTHON exec_prefix... " >&6; }
+if test ${am_cv_python_exec_prefix+y}
+then :
+ printf %s "(cached) " >&6
+else $as_nop
+ am_cv_python_exec_prefix=`$PYTHON -c "import sys; sys.stdout.write(sys.exec_prefix)"`
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_exec_prefix" >&5
+printf "%s\n" "$am_cv_python_exec_prefix" >&6; }
+ if test "x$exec_prefix" = xNONE
+ then
+ am__usable_exec_prefix=$am__usable_prefix
+ else
+ am__usable_exec_prefix=$exec_prefix
+ fi
+ case $am_cv_python_exec_prefix in
+ $am__usable_exec_prefix*)
+ am__strip_prefix=`echo "$am__usable_exec_prefix" | sed 's|.|.|g'`
+ am_python_exec_prefix_subst=`echo "$am_cv_python_exec_prefix" | sed "s,^$am__strip_prefix,\\${exec_prefix},"`
+ ;;
+ *)
+ am_python_exec_prefix_subst=$am_cv_python_exec_prefix
+ ;;
+ esac
+
+fi
+fi
+
+ PYTHON_EXEC_PREFIX=$am_python_exec_prefix_subst
+
+
+
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON platform" >&5
+printf %s "checking for $am_display_PYTHON platform... " >&6; }
+if test ${am_cv_python_platform+y}
+then :
+ printf %s "(cached) " >&6
+else $as_nop
am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"`
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_platform" >&5
-$as_echo "$am_cv_python_platform" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_platform" >&5
+printf "%s\n" "$am_cv_python_platform" >&6; }
PYTHON_PLATFORM=$am_cv_python_platform
@@ -2983,16 +3359,17 @@ except ImportError:
pass"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON script directory" >&5
-$as_echo_n "checking for $am_display_PYTHON script directory... " >&6; }
-if ${am_cv_python_pythondir+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test "x$prefix" = xNONE
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON script directory" >&5
+printf %s "checking for $am_display_PYTHON script directory... " >&6; }
+if test ${am_cv_python_pythondir+y}
+then :
+ printf %s "(cached) " >&6
+else $as_nop
+ if test "x$am_cv_python_prefix" = x
then
- am_py_prefix=$ac_default_prefix
+ am_py_prefix=$am__usable_prefix
else
- am_py_prefix=$prefix
+ am_py_prefix=$am_cv_python_prefix
fi
am_cv_python_pythondir=`$PYTHON -c "
$am_python_setup_sysconfig
@@ -3005,21 +3382,21 @@ sys.stdout.write(sitedir)"`
case $am_cv_python_pythondir in
$am_py_prefix*)
am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`
- am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"`
+ am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,\\${PYTHON_PREFIX},"`
;;
*)
case $am_py_prefix in
/usr|/System*) ;;
*)
- am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages
+ am_cv_python_pythondir="\${PYTHON_PREFIX}/lib/python$PYTHON_VERSION/site-packages"
;;
esac
;;
esac
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pythondir" >&5
-$as_echo "$am_cv_python_pythondir" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pythondir" >&5
+printf "%s\n" "$am_cv_python_pythondir" >&6; }
pythondir=$am_cv_python_pythondir
@@ -3027,43 +3404,44 @@ $as_echo "$am_cv_python_pythondir" >&6; }
pkgpythondir=\${pythondir}/$PACKAGE
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON extension module directory" >&5
-$as_echo_n "checking for $am_display_PYTHON extension module directory... " >&6; }
-if ${am_cv_python_pyexecdir+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test "x$exec_prefix" = xNONE
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON extension module directory" >&5
+printf %s "checking for $am_display_PYTHON extension module directory... " >&6; }
+if test ${am_cv_python_pyexecdir+y}
+then :
+ printf %s "(cached) " >&6
+else $as_nop
+ if test "x$am_cv_python_exec_prefix" = x
then
- am_py_exec_prefix=$am_py_prefix
+ am_py_exec_prefix=$am__usable_exec_prefix
else
- am_py_exec_prefix=$exec_prefix
+ am_py_exec_prefix=$am_cv_python_exec_prefix
fi
am_cv_python_pyexecdir=`$PYTHON -c "
$am_python_setup_sysconfig
if can_use_sysconfig:
- sitedir = sysconfig.get_path('platlib', vars={'platbase':'$am_py_prefix'})
+ sitedir = sysconfig.get_path('platlib', vars={'platbase':'$am_py_exec_prefix'})
else:
from distutils import sysconfig
- sitedir = sysconfig.get_python_lib(1, 0, prefix='$am_py_prefix')
+ sitedir = sysconfig.get_python_lib(1, 0, prefix='$am_py_exec_prefix')
sys.stdout.write(sitedir)"`
case $am_cv_python_pyexecdir in
$am_py_exec_prefix*)
am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`
- am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"`
+ am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,\\${PYTHON_EXEC_PREFIX},"`
;;
*)
case $am_py_exec_prefix in
/usr|/System*) ;;
*)
- am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages
+ am_cv_python_pyexecdir="\${PYTHON_EXEC_PREFIX}/lib/python$PYTHON_VERSION/site-packages"
;;
esac
;;
esac
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pyexecdir" >&5
-$as_echo "$am_cv_python_pyexecdir" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pyexecdir" >&5
+printf "%s\n" "$am_cv_python_pyexecdir" >&6; }
pyexecdir=$am_cv_python_pyexecdir
@@ -3086,17 +3464,17 @@ $as_echo "$am_cv_python_pyexecdir" >&6; }
fi
fi
PYTHON_NAME=`basename $PYTHON`
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking $PYTHON_NAME module: fontforge" >&5
-$as_echo_n "checking $PYTHON_NAME module: fontforge... " >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking $PYTHON_NAME module: fontforge" >&5
+printf %s "checking $PYTHON_NAME module: fontforge... " >&6; }
$PYTHON -c "import fontforge" 2>/dev/null
if test $? -eq 0;
then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
eval HAVE_PYMOD_FONTFORGE=yes
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
eval HAVE_PYMOD_FONTFORGE=no
#
if test -n "fatal"
@@ -3109,33 +3487,36 @@ $as_echo "no" >&6; }
# Check whether --with-testfontdir was given.
-if test "${with_testfontdir+set}" = set; then :
+if test ${with_testfontdir+y}
+then :
withval=$with_testfontdir; testfontdir="$withval"
-else
+else $as_nop
testfontdir=\$\{HOME\}/.fonts/testfont
fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking --with-testfontdir" >&5
-$as_echo_n "checking --with-testfontdir... " >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"$testfontdir\"" >&5
-$as_echo "\"$testfontdir\"" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --with-testfontdir" >&5
+printf %s "checking --with-testfontdir... " >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: \"$testfontdir\"" >&5
+printf "%s\n" "\"$testfontdir\"" >&6; }
fi
# Check whether --enable-xfontsdir was given.
-if test "${enable_xfontsdir+set}" = set; then :
+if test ${enable_xfontsdir+y}
+then :
enableval=$enable_xfontsdir;
-else
+else $as_nop
enable_xfontsdir="no"
fi
# Check whether --enable-latex was given.
-if test "${enable_latex+set}" = set; then :
+if test ${enable_latex+y}
+then :
enableval=$enable_latex;
-else
+else $as_nop
enable_latex="no"
fi
@@ -3200,22 +3581,23 @@ fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
-$as_echo_n "checking whether ln -s works... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
+printf %s "checking whether ln -s works... " >&6; }
LN_S=$as_ln_s
if test "$LN_S" = "ln -s"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
-$as_echo "no, using $LN_S" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
+printf "%s\n" "no, using $LN_S" >&6; }
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
-$as_echo_n "checking for a sed that does not truncate output... " >&6; }
-if ${ac_cv_path_SED+:} false; then :
- $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
+printf %s "checking for a sed that does not truncate output... " >&6; }
+if test ${ac_cv_path_SED+y}
+then :
+ printf %s "(cached) " >&6
+else $as_nop
ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
for ac_i in 1 2 3 4 5 6 7; do
ac_script="$ac_script$as_nl$ac_script"
@@ -3229,10 +3611,15 @@ else
for as_dir in $PATH
do
IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_prog in sed gsed; do
+ case $as_dir in #(((
+ '') as_dir=./ ;;
+ */) ;;
+ *) as_dir=$as_dir/ ;;
+ esac
+ for ac_prog in sed gsed
+ do
for ac_exec_ext in '' $ac_executable_extensions; do
- ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
+ ac_path_SED="$as_dir$ac_prog$ac_exec_ext"
as_fn_executable_p "$ac_path_SED" || continue
# Check for GNU ac_path_SED and select it if it is found.
# Check for GNU $ac_path_SED
@@ -3241,13 +3628,13 @@ case `"$ac_path_SED" --version 2>&1` in
ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
*)
ac_count=0
- $as_echo_n 0123456789 >"conftest.in"
+ printf %s 0123456789 >"conftest.in"
while :
do
cat "conftest.in" "conftest.in" >"conftest.tmp"
mv "conftest.tmp" "conftest.in"
cp "conftest.in" "conftest.nl"
- $as_echo '' >> "conftest.nl"
+ printf "%s\n" '' >> "conftest.nl"
"$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
as_fn_arith $ac_count + 1 && ac_count=$as_val
@@ -3275,8 +3662,8 @@ else
fi
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
-$as_echo "$ac_cv_path_SED" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
+printf "%s\n" "$ac_cv_path_SED" >&6; }
SED="$ac_cv_path_SED"
rm -f conftest.sed
@@ -3284,11 +3671,12 @@ for ac_prog in rmdir
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_RMDIR+:} false; then :
- $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_RMDIR+y}
+then :
+ printf %s "(cached) " >&6
+else $as_nop
if test -n "$RMDIR"; then
ac_cv_prog_RMDIR="$RMDIR" # Let the user override the test.
else
@@ -3296,11 +3684,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
+ case $as_dir in #(((
+ '') as_dir=./ ;;
+ */) ;;
+ *) as_dir=$as_dir/ ;;
+ esac
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
ac_cv_prog_RMDIR="$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -3311,11 +3703,11 @@ fi
fi
RMDIR=$ac_cv_prog_RMDIR
if test -n "$RMDIR"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RMDIR" >&5
-$as_echo "$RMDIR" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $RMDIR" >&5
+printf "%s\n" "$RMDIR" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
fi
@@ -3328,11 +3720,12 @@ for ac_prog in fontforge
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_FONTFORGE+:} false; then :
- $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_FONTFORGE+y}
+then :
+ printf %s "(cached) " >&6
+else $as_nop
if test -n "$FONTFORGE"; then
ac_cv_prog_FONTFORGE="$FONTFORGE" # Let the user override the test.
else
@@ -3340,11 +3733,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
+ case $as_dir in #(((
+ '') as_dir=./ ;;
+ */) ;;
+ *) as_dir=$as_dir/ ;;
+ esac
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
ac_cv_prog_FONTFORGE="$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -3355,11 +3752,11 @@ fi
fi
FONTFORGE=$ac_cv_prog_FONTFORGE
if test -n "$FONTFORGE"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FONTFORGE" >&5
-$as_echo "$FONTFORGE" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $FONTFORGE" >&5
+printf "%s\n" "$FONTFORGE" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
fi
@@ -3371,29 +3768,30 @@ test -n "$FONTFORGE" || FONTFORGE="no"
if test "x$FONTFORGE" = "xno"; then
as_fn_error $? "You need fontforge to generate fonts." "$LINENO" 5
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Fontforge >= $FONTFORGE_MIN_VER" >&5
-$as_echo_n "checking for Fontforge >= $FONTFORGE_MIN_VER... " >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Fontforge >= $FONTFORGE_MIN_VER" >&5
+printf %s "checking for Fontforge >= $FONTFORGE_MIN_VER... " >&6; }
FONTFORGE_VER=$($FONTFORGE --version 2>/dev/null | grep '^fontforge' | sed 's/fontforge //')
FONTFORGE_VER=$(TZ=UTC date -d "$FONTFORGE_VER" "+%Y%m%d")
if test $FONTFORGE_VER -lt $FONTFORGE_MIN_VER; then
as_fn_error $? "Requires Fontforge >= $FONTFORGE_MIN_VER but $FONTFORGE_VER was found)" "$LINENO" 5
fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FONTFORGE_VER found, ok" >&5
-$as_echo "$FONTFORGE_VER found, ok" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $FONTFORGE_VER found, ok" >&5
+printf "%s\n" "$FONTFORGE_VER found, ok" >&6; }
fi
if test "x$enable_xfontsdir" = "xno"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: X fonts dir not enabled, skipping checks for X fonts utils" >&5
-$as_echo "$as_me: X fonts dir not enabled, skipping checks for X fonts utils" >&6;}
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: X fonts dir not enabled, skipping checks for X fonts utils" >&5
+printf "%s\n" "$as_me: X fonts dir not enabled, skipping checks for X fonts utils" >&6;}
else
# Extract the first word of "mkfontscale", so it can be a program name with args.
set dummy mkfontscale; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_MKFONTSCALE+:} false; then :
- $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_MKFONTSCALE+y}
+then :
+ printf %s "(cached) " >&6
+else $as_nop
if test -n "$MKFONTSCALE"; then
ac_cv_prog_MKFONTSCALE="$MKFONTSCALE" # Let the user override the test.
else
@@ -3401,11 +3799,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
+ case $as_dir in #(((
+ '') as_dir=./ ;;
+ */) ;;
+ *) as_dir=$as_dir/ ;;
+ esac
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
ac_cv_prog_MKFONTSCALE="mkfontscale"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -3416,11 +3818,11 @@ fi
fi
MKFONTSCALE=$ac_cv_prog_MKFONTSCALE
if test -n "$MKFONTSCALE"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKFONTSCALE" >&5
-$as_echo "$MKFONTSCALE" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MKFONTSCALE" >&5
+printf "%s\n" "$MKFONTSCALE" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
fi
@@ -3441,11 +3843,12 @@ fi
if test "x$MKFONTSCALE" = "x"; then
# Extract the first word of "ttmkfdir", so it can be a program name with args.
set dummy ttmkfdir; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_TTMKFDIR+:} false; then :
- $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_TTMKFDIR+y}
+then :
+ printf %s "(cached) " >&6
+else $as_nop
if test -n "$TTMKFDIR"; then
ac_cv_prog_TTMKFDIR="$TTMKFDIR" # Let the user override the test.
else
@@ -3453,11 +3856,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
+ case $as_dir in #(((
+ '') as_dir=./ ;;
+ */) ;;
+ *) as_dir=$as_dir/ ;;
+ esac
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
ac_cv_prog_TTMKFDIR="ttmkfdir"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -3468,11 +3875,11 @@ fi
fi
TTMKFDIR=$ac_cv_prog_TTMKFDIR
if test -n "$TTMKFDIR"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TTMKFDIR" >&5
-$as_echo "$TTMKFDIR" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $TTMKFDIR" >&5
+printf "%s\n" "$TTMKFDIR" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
fi
@@ -3490,19 +3897,20 @@ fi
else
TTMKFDIR="$MKFONTSCALE"
fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: Will create fonts.scale for TTF using $TTMKFDIR" >&5
-$as_echo "Will create fonts.scale for TTF using $TTMKFDIR" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Will create fonts.scale for TTF using $TTMKFDIR" >&5
+printf "%s\n" "Will create fonts.scale for TTF using $TTMKFDIR" >&6; }
fi
if test "x$enable_pfb" = "xyes"; then
if test "x$MKFONTSCALE" = "x"; then
# Extract the first word of "type1inst", so it can be a program name with args.
set dummy type1inst; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_TYPE1INST+:} false; then :
- $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_TYPE1INST+y}
+then :
+ printf %s "(cached) " >&6
+else $as_nop
if test -n "$TYPE1INST"; then
ac_cv_prog_TYPE1INST="$TYPE1INST" # Let the user override the test.
else
@@ -3510,11 +3918,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
+ case $as_dir in #(((
+ '') as_dir=./ ;;
+ */) ;;
+ *) as_dir=$as_dir/ ;;
+ esac
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
ac_cv_prog_TYPE1INST="type1inst"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -3525,11 +3937,11 @@ fi
fi
TYPE1INST=$ac_cv_prog_TYPE1INST
if test -n "$TYPE1INST"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TYPE1INST" >&5
-$as_echo "$TYPE1INST" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $TYPE1INST" >&5
+printf "%s\n" "$TYPE1INST" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
fi
@@ -3539,17 +3951,18 @@ fi
else
TYPE1INST="$MKFONTSCALE"
fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: Will create fonts.scale for Type1 using $TYPE1INST" >&5
-$as_echo "Will create fonts.scale for Type1 using $TYPE1INST" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Will create fonts.scale for Type1 using $TYPE1INST" >&5
+printf "%s\n" "Will create fonts.scale for Type1 using $TYPE1INST" >&6; }
fi
# Extract the first word of "mkfontdir", so it can be a program name with args.
set dummy mkfontdir; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_MKFONTDIR+:} false; then :
- $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_MKFONTDIR+y}
+then :
+ printf %s "(cached) " >&6
+else $as_nop
if test -n "$MKFONTDIR"; then
ac_cv_prog_MKFONTDIR="$MKFONTDIR" # Let the user override the test.
else
@@ -3557,11 +3970,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
+ case $as_dir in #(((
+ '') as_dir=./ ;;
+ */) ;;
+ *) as_dir=$as_dir/ ;;
+ esac
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
ac_cv_prog_MKFONTDIR="mkfontdir"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -3572,11 +3989,11 @@ fi
fi
MKFONTDIR=$ac_cv_prog_MKFONTDIR
if test -n "$MKFONTDIR"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKFONTDIR" >&5
-$as_echo "$MKFONTDIR" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MKFONTDIR" >&5
+printf "%s\n" "$MKFONTDIR" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
fi
@@ -3592,16 +4009,17 @@ fi
if test "x$MKFONTDIR" = "xmkfontdir" && test "x$ENCDIR" != "x"; then
MKFONTDIR="$MKFONTDIR -e $ENCDIR"
fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: Will create fonts.dir using $MKFONTDIR" >&5
-$as_echo "Will create fonts.dir using $MKFONTDIR" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Will create fonts.dir using $MKFONTDIR" >&5
+printf "%s\n" "Will create fonts.dir using $MKFONTDIR" >&6; }
# Extract the first word of "fc-cache", so it can be a program name with args.
set dummy fc-cache; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_FCCACHE+:} false; then :
- $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_FCCACHE+y}
+then :
+ printf %s "(cached) " >&6
+else $as_nop
if test -n "$FCCACHE"; then
ac_cv_prog_FCCACHE="$FCCACHE" # Let the user override the test.
else
@@ -3609,11 +4027,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
+ case $as_dir in #(((
+ '') as_dir=./ ;;
+ */) ;;
+ *) as_dir=$as_dir/ ;;
+ esac
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
ac_cv_prog_FCCACHE="fc-cache"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -3624,11 +4046,11 @@ fi
fi
FCCACHE=$ac_cv_prog_FCCACHE
if test -n "$FCCACHE"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FCCACHE" >&5
-$as_echo "$FCCACHE" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $FCCACHE" >&5
+printf "%s\n" "$FCCACHE" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
fi
@@ -3640,11 +4062,12 @@ if test "x$enable_latex" = "xyes"; then
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_AFM2TFM+:} false; then :
- $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_AFM2TFM+y}
+then :
+ printf %s "(cached) " >&6
+else $as_nop
if test -n "$AFM2TFM"; then
ac_cv_prog_AFM2TFM="$AFM2TFM" # Let the user override the test.
else
@@ -3652,11 +4075,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
+ case $as_dir in #(((
+ '') as_dir=./ ;;
+ */) ;;
+ *) as_dir=$as_dir/ ;;
+ esac
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
ac_cv_prog_AFM2TFM="$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -3667,11 +4094,11 @@ fi
fi
AFM2TFM=$ac_cv_prog_AFM2TFM
if test -n "$AFM2TFM"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AFM2TFM" >&5
-$as_echo "$AFM2TFM" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AFM2TFM" >&5
+printf "%s\n" "$AFM2TFM" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
fi
@@ -3686,11 +4113,12 @@ test -n "$AFM2TFM" || AFM2TFM="no"
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_VPTOVF+:} false; then :
- $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_VPTOVF+y}
+then :
+ printf %s "(cached) " >&6
+else $as_nop
if test -n "$VPTOVF"; then
ac_cv_prog_VPTOVF="$VPTOVF" # Let the user override the test.
else
@@ -3698,11 +4126,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
+ case $as_dir in #(((
+ '') as_dir=./ ;;
+ */) ;;
+ *) as_dir=$as_dir/ ;;
+ esac
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
ac_cv_prog_VPTOVF="$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -3713,11 +4145,11 @@ fi
fi
VPTOVF=$ac_cv_prog_VPTOVF
if test -n "$VPTOVF"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $VPTOVF" >&5
-$as_echo "$VPTOVF" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $VPTOVF" >&5
+printf "%s\n" "$VPTOVF" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
fi
@@ -3731,27 +4163,29 @@ test -n "$VPTOVF" || VPTOVF="no"
# Check whether --with-texmfdir was given.
-if test "${with_texmfdir+set}" = set; then :
+if test ${with_texmfdir+y}
+then :
withval=$with_texmfdir; texmfdir="$withval"
-else
+else $as_nop
texmfdir=${datarootdir}/texmf
fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking --with-texmfdir" >&5
-$as_echo_n "checking --with-texmfdir... " >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"$texmfdir\"" >&5
-$as_echo "\"$texmfdir\"" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --with-texmfdir" >&5
+printf %s "checking --with-texmfdir... " >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: \"$texmfdir\"" >&5
+printf "%s\n" "\"$texmfdir\"" >&6; }
for ac_prog in updmap-sys updmap
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_UPDMAP+:} false; then :
- $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_UPDMAP+y}
+then :
+ printf %s "(cached) " >&6
+else $as_nop
case $UPDMAP in
[\\/]* | ?:[\\/]*)
ac_cv_path_UPDMAP="$UPDMAP" # Let the user override the test with a path.
@@ -3761,11 +4195,15 @@ else
for as_dir in $PATH
do
IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
+ case $as_dir in #(((
+ '') as_dir=./ ;;
+ */) ;;
+ *) as_dir=$as_dir/ ;;
+ esac
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_path_UPDMAP="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+ ac_cv_path_UPDMAP="$as_dir$ac_word$ac_exec_ext"
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -3777,11 +4215,11 @@ esac
fi
UPDMAP=$ac_cv_path_UPDMAP
if test -n "$UPDMAP"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $UPDMAP" >&5
-$as_echo "$UPDMAP" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $UPDMAP" >&5
+printf "%s\n" "$UPDMAP" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
fi
@@ -3795,11 +4233,12 @@ test -n "$UPDMAP" || UPDMAP="no"
# Extract the first word of "mktexlsr texhash", so it can be a program name with args.
set dummy mktexlsr texhash; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_TEXHASH+:} false; then :
- $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_TEXHASH+y}
+then :
+ printf %s "(cached) " >&6
+else $as_nop
case $TEXHASH in
[\\/]* | ?:[\\/]*)
ac_cv_path_TEXHASH="$TEXHASH" # Let the user override the test with a path.
@@ -3809,11 +4248,15 @@ else
for as_dir in $PATH
do
IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
+ case $as_dir in #(((
+ '') as_dir=./ ;;
+ */) ;;
+ *) as_dir=$as_dir/ ;;
+ esac
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_path_TEXHASH="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+ ac_cv_path_TEXHASH="$as_dir$ac_word$ac_exec_ext"
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -3826,11 +4269,11 @@ esac
fi
TEXHASH=$ac_cv_path_TEXHASH
if test -n "$TEXHASH"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TEXHASH" >&5
-$as_echo "$TEXHASH" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $TEXHASH" >&5
+printf "%s\n" "$TEXHASH" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
fi
@@ -3869,8 +4312,8 @@ _ACEOF
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
- *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+ *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
esac
case $ac_var in #(
_ | IFS | as_nl) ;; #(
@@ -3900,15 +4343,15 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
/^ac_cv_env_/b end
t clear
:clear
- s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+ s/^\([^=]*\)=\(.*[{}].*\)$/test ${\1+y} || &/
t end
s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
:end' >>confcache
if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
if test -w "$cache_file"; then
if test "x$cache_file" != "x/dev/null"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
-$as_echo "$as_me: updating cache $cache_file" >&6;}
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
+printf "%s\n" "$as_me: updating cache $cache_file" >&6;}
if test ! -f "$cache_file" || test -h "$cache_file"; then
cat confcache >"$cache_file"
else
@@ -3922,8 +4365,8 @@ $as_echo "$as_me: updating cache $cache_file" >&6;}
fi
fi
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
-$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
+printf "%s\n" "$as_me: not updating unwritable cache $cache_file" >&6;}
fi
fi
rm -f confcache
@@ -3976,7 +4419,7 @@ U=
for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
# 1. Remove the extension, and $U if already installed.
ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
- ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
+ ac_i=`printf "%s\n" "$ac_i" | sed "$ac_script"`
# 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
# will be set to the directory where LIBOBJS objects are built.
as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
@@ -3987,14 +4430,14 @@ LIBOBJS=$ac_libobjs
LTLIBOBJS=$ac_ltlibobjs
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
-$as_echo_n "checking that generated files are newer than configure... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
+printf %s "checking that generated files are newer than configure... " >&6; }
if test -n "$am_sleep_pid"; then
# Hide warnings about reused PIDs.
wait $am_sleep_pid 2>/dev/null
fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
-$as_echo "done" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: done" >&5
+printf "%s\n" "done" >&6; }
if test -z "${INCLUDE_TTF_TRUE}" && test -z "${INCLUDE_TTF_FALSE}"; then
as_fn_error $? "conditional \"INCLUDE_TTF\" was never defined.
@@ -4029,8 +4472,8 @@ fi
ac_write_fail=0
ac_clean_files_save=$ac_clean_files
ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
-$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
+printf "%s\n" "$as_me: creating $CONFIG_STATUS" >&6;}
as_write_fail=0
cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
#! $SHELL
@@ -4053,14 +4496,16 @@ cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
# Be more Bourne compatible
DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+as_nop=:
+if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1
+then :
emulate sh
NULLCMD=:
# Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
-else
+else $as_nop
case `(set -o) 2>/dev/null` in #(
*posix*) :
set -o posix ;; #(
@@ -4070,46 +4515,46 @@ esac
fi
+
+# Reset variables that may have inherited troublesome values from
+# the environment.
+
+# IFS needs to be set, to space, tab, and newline, in precisely that order.
+# (If _AS_PATH_WALK were called with IFS unset, it would have the
+# side effect of setting IFS to empty, thus disabling word splitting.)
+# Quoting is to prevent editors from complaining about space-tab.
as_nl='
'
export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-# Prefer a ksh shell builtin over an external printf program on Solaris,
-# but without wasting forks for bash or zsh.
-if test -z "$BASH_VERSION$ZSH_VERSION" \
- && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
- as_echo='print -r --'
- as_echo_n='print -rn --'
-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
- as_echo='printf %s\n'
- as_echo_n='printf %s'
-else
- if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
- as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
- as_echo_n='/usr/ucb/echo -n'
- else
- as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
- as_echo_n_body='eval
- arg=$1;
- case $arg in #(
- *"$as_nl"*)
- expr "X$arg" : "X\\(.*\\)$as_nl";
- arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
- esac;
- expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
- '
- export as_echo_n_body
- as_echo_n='sh -c $as_echo_n_body as_echo'
- fi
- export as_echo_body
- as_echo='sh -c $as_echo_body as_echo'
-fi
+IFS=" "" $as_nl"
+
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# Ensure predictable behavior from utilities with locale-dependent output.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# We cannot yet rely on "unset" to work, but we need these variables
+# to be unset--not just set to an empty or harmless value--now, to
+# avoid bugs in old shells (e.g. pre-3.0 UWIN ksh). This construct
+# also avoids known problems related to "unset" and subshell syntax
+# in other old shells (e.g. bash 2.01 and pdksh 5.2.14).
+for as_var in BASH_ENV ENV MAIL MAILPATH CDPATH
+do eval test \${$as_var+y} \
+ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+done
+
+# Ensure that fds 0, 1, and 2 are open.
+if (exec 3>&0) 2>/dev/null; then :; else exec 0</dev/null; fi
+if (exec 3>&1) 2>/dev/null; then :; else exec 1>/dev/null; fi
+if (exec 3>&2) ; then :; else exec 2>/dev/null; fi
# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
+if ${PATH_SEPARATOR+false} :; then
PATH_SEPARATOR=:
(PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
(PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
@@ -4118,13 +4563,6 @@ if test "${PATH_SEPARATOR+set}" != set; then
fi
-# IFS
-# We need space, tab and new line, in precisely that order. Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-IFS=" "" $as_nl"
-
# Find who we are. Look in the path if we contain no directory separator.
as_myself=
case $0 in #((
@@ -4133,8 +4571,12 @@ case $0 in #((
for as_dir in $PATH
do
IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+ case $as_dir in #(((
+ '') as_dir=./ ;;
+ */) ;;
+ *) as_dir=$as_dir/ ;;
+ esac
+ test -r "$as_dir$0" && as_myself=$as_dir$0 && break
done
IFS=$as_save_IFS
@@ -4146,30 +4588,10 @@ if test "x$as_myself" = x; then
as_myself=$0
fi
if test ! -f "$as_myself"; then
- $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+ printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
exit 1
fi
-# Unset variables that we do not need and which cause bugs (e.g. in
-# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1"
-# suppresses any "Segmentation fault" message there. '((' could
-# trigger a bug in pdksh 5.2.14.
-for as_var in BASH_ENV ENV MAIL MAILPATH
-do eval test x\${$as_var+set} = xset \
- && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# CDPATH.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
# as_fn_error STATUS ERROR [LINENO LOG_FD]
@@ -4182,13 +4604,14 @@ as_fn_error ()
as_status=$1; test $as_status -eq 0 && as_status=1
if test "$4"; then
as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
fi
- $as_echo "$as_me: error: $2" >&2
+ printf "%s\n" "$as_me: error: $2" >&2
as_fn_exit $as_status
} # as_fn_error
+
# as_fn_set_status STATUS
# -----------------------
# Set $? to STATUS, without forking.
@@ -4215,18 +4638,20 @@ as_fn_unset ()
{ eval $1=; unset $1;}
}
as_unset=as_fn_unset
+
# as_fn_append VAR VALUE
# ----------------------
# Append the text in VALUE to the end of the definition contained in VAR. Take
# advantage of any shell optimizations that allow amortized linear growth over
# repeated appends, instead of the typical quadratic growth present in naive
# implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null
+then :
eval 'as_fn_append ()
{
eval $1+=\$2
}'
-else
+else $as_nop
as_fn_append ()
{
eval $1=\$$1\$2
@@ -4238,12 +4663,13 @@ fi # as_fn_append
# Perform arithmetic evaluation on the ARGs, and store the result in the
# global $as_val. Take advantage of shells that can avoid forks. The arguments
# must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null
+then :
eval 'as_fn_arith ()
{
as_val=$(( $* ))
}'
-else
+else $as_nop
as_fn_arith ()
{
as_val=`expr "$@" || test $? -eq 1`
@@ -4274,7 +4700,7 @@ as_me=`$as_basename -- "$0" ||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
+printf "%s\n" X/"$0" |
sed '/^.*\/\([^/][^/]*\)\/*$/{
s//\1/
q
@@ -4296,6 +4722,10 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS
as_cr_digits='0123456789'
as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+# Determine whether it's possible to make 'echo' print without a newline.
+# These variables are no longer used directly by Autoconf, but are AC_SUBSTed
+# for compatibility with existing Makefiles.
ECHO_C= ECHO_N= ECHO_T=
case `echo -n x` in #(((((
-n*)
@@ -4309,6 +4739,12 @@ case `echo -n x` in #(((((
ECHO_N='-n';;
esac
+# For backward compatibility with old third-party macros, we provide
+# the shell variables $as_echo and $as_echo_n. New code should use
+# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively.
+as_echo='printf %s\n'
+as_echo_n='printf %s'
+
rm -f conf$$ conf$$.exe conf$$.file
if test -d conf$$.dir; then
rm -f conf$$.dir/conf$$.file
@@ -4350,7 +4786,7 @@ as_fn_mkdir_p ()
as_dirs=
while :; do
case $as_dir in #(
- *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+ *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
*) as_qdir=$as_dir;;
esac
as_dirs="'$as_qdir' $as_dirs"
@@ -4359,7 +4795,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$as_dir" : 'X\(//\)[^/]' \| \
X"$as_dir" : 'X\(//\)$' \| \
X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
+printf "%s\n" X"$as_dir" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
@@ -4421,8 +4857,8 @@ 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.7.2, which was
-generated by GNU Autoconf 2.69. Invocation command line was
+This file was extended by fonts-tlwg $as_me 0.7.3, which was
+generated by GNU Autoconf 2.71. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
@@ -4471,14 +4907,16 @@ $config_files
Report bugs to <https://github.com/tlwg/fonts-tlwg/issues>."
_ACEOF
+ac_cs_config=`printf "%s\n" "$ac_configure_args" | sed "$ac_safe_unquote"`
+ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\''/g"`
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
+ac_cs_config='$ac_cs_config_escaped'
ac_cs_version="\\
-fonts-tlwg config.status 0.7.2
-configured by $0, generated by GNU Autoconf 2.69,
+fonts-tlwg config.status 0.7.3
+configured by $0, generated by GNU Autoconf 2.71,
with options \\"\$ac_cs_config\\"
-Copyright (C) 2012 Free Software Foundation, Inc.
+Copyright (C) 2021 Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
@@ -4518,21 +4956,21 @@ do
-recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
ac_cs_recheck=: ;;
--version | --versio | --versi | --vers | --ver | --ve | --v | -V )
- $as_echo "$ac_cs_version"; exit ;;
+ printf "%s\n" "$ac_cs_version"; exit ;;
--config | --confi | --conf | --con | --co | --c )
- $as_echo "$ac_cs_config"; exit ;;
+ printf "%s\n" "$ac_cs_config"; exit ;;
--debug | --debu | --deb | --de | --d | -d )
debug=: ;;
--file | --fil | --fi | --f )
$ac_shift
case $ac_optarg in
- *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+ *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
'') as_fn_error $? "missing file argument" ;;
esac
as_fn_append CONFIG_FILES " '$ac_optarg'"
ac_need_defaults=false;;
--he | --h | --help | --hel | -h )
- $as_echo "$ac_cs_usage"; exit ;;
+ printf "%s\n" "$ac_cs_usage"; exit ;;
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
| -silent | --silent | --silen | --sile | --sil | --si | --s)
ac_cs_silent=: ;;
@@ -4560,7 +4998,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
if \$ac_cs_recheck; then
set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
shift
- \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
+ \printf "%s\n" "running CONFIG_SHELL=$SHELL \$*" >&6
CONFIG_SHELL='$SHELL'
export CONFIG_SHELL
exec "\$@"
@@ -4574,7 +5012,7 @@ exec 5>>config.log
sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
## Running $as_me. ##
_ASBOX
- $as_echo "$ac_log"
+ printf "%s\n" "$ac_log"
} >&5
_ACEOF
@@ -4608,7 +5046,7 @@ done
# We use the long form for the default assignment because of an extremely
# bizarre bug on SunOS 4.1.3.
if $ac_need_defaults; then
- test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
+ test ${CONFIG_FILES+y} || CONFIG_FILES=$config_files
fi
# Have a temporary directory for convenience. Make it in the build tree
@@ -4836,7 +5274,7 @@ do
esac ||
as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
esac
- case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+ case $ac_f in *\'*) ac_f=`printf "%s\n" "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
as_fn_append ac_file_inputs " '$ac_f'"
done
@@ -4844,17 +5282,17 @@ do
# use $as_me), people would be surprised to read:
# /* config.h. Generated by config.status. */
configure_input='Generated from '`
- $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+ printf "%s\n" "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
`' by configure.'
if test x"$ac_file" != x-; then
configure_input="$ac_file. $configure_input"
- { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
-$as_echo "$as_me: creating $ac_file" >&6;}
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
+printf "%s\n" "$as_me: creating $ac_file" >&6;}
fi
# Neutralize special characters interpreted by sed in replacement strings.
case $configure_input in #(
*\&* | *\|* | *\\* )
- ac_sed_conf_input=`$as_echo "$configure_input" |
+ ac_sed_conf_input=`printf "%s\n" "$configure_input" |
sed 's/[\\\\&|]/\\\\&/g'`;; #(
*) ac_sed_conf_input=$configure_input;;
esac
@@ -4871,7 +5309,7 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$ac_file" : 'X\(//\)[^/]' \| \
X"$ac_file" : 'X\(//\)$' \| \
X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$ac_file" |
+printf "%s\n" X"$ac_file" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
@@ -4895,9 +5333,9 @@ $as_echo X"$ac_file" |
case "$ac_dir" in
.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
*)
- ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+ ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'`
# A ".." for each directory in $ac_dir_suffix.
- ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+ ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
case $ac_top_builddir_sub in
"") ac_top_builddir_sub=. ac_top_build_prefix= ;;
*) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -4959,8 +5397,8 @@ ac_sed_dataroot='
case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
*datarootdir*) ac_datarootdir_seen=yes;;
*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+printf "%s\n" "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_datarootdir_hack='
@@ -5004,9 +5442,9 @@ test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
{ ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
{ ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \
"$ac_tmp/out"`; test -z "$ac_out"; } &&
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
which seems to be undefined. Please make sure it is defined" >&5
-$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+printf "%s\n" "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
which seems to be undefined. Please make sure it is defined" >&2;}
rm -f "$ac_tmp/stdin"
@@ -5053,8 +5491,9 @@ if test "$no_create" != yes; then
$ac_cs_success || as_fn_exit 1
fi
if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
-$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
fi
+
diff --git a/Master/texmf-dist/source/fonts/fonts-tlwg/configure.ac b/Master/texmf-dist/source/fonts/fonts-tlwg/configure.ac
index 4f4979e94c9..1d57a061f9b 100644
--- a/Master/texmf-dist/source/fonts/fonts-tlwg/configure.ac
+++ b/Master/texmf-dist/source/fonts/fonts-tlwg/configure.ac
@@ -1,6 +1,6 @@
-AC_PREREQ(2.59)
-AC_INIT(fonts-tlwg,
- m4_esyscmd([build-aux/git-version-gen]),
+AC_PREREQ([2.71])
+AC_INIT([fonts-tlwg],
+ [m4_esyscmd(build-aux/git-version-gen)],
[https://github.com/tlwg/fonts-tlwg/issues])
AC_CONFIG_SRCDIR([nf/Garuda.sfd])
@@ -15,7 +15,7 @@ dnl
dnl Check options
dnl
AC_ARG_ENABLE(ttf,
- [AC_HELP_STRING([--enable-ttf],
+ [AS_HELP_STRING([--enable-ttf],
[enable TTF generation])],
, enable_ttf="no")
if test "x$enable_ttf" = "xyes"; then
@@ -25,7 +25,7 @@ if test "x$enable_ttf" = "xyes"; then
dnl Check TTF installation dir
AC_ARG_WITH(ttfdir,
- [AC_HELP_STRING([--with-ttfdir=DIR],
+ [AS_HELP_STRING([--with-ttfdir=DIR],
[font directory in DIR [PREFIX/share/fonts/truetype/thai]])],
[ttfdir="$withval"], [ttfdir=\$\{prefix\}/share/fonts/truetype/thai])
AC_MSG_CHECKING(--with-ttfdir)
@@ -35,12 +35,12 @@ if test "x$enable_ttf" = "xyes"; then
fi
AC_ARG_ENABLE(pfb,
- [AC_HELP_STRING([--enable-pfb],
+ [AS_HELP_STRING([--enable-pfb],
[enable Type1 PFB generation])],
, enable_pfb="no")
if test "x$enable_pfb" = "xyes"; then
AC_ARG_WITH(type1dir,
- [AC_HELP_STRING([--with-type1dir=DIR],
+ [AS_HELP_STRING([--with-type1dir=DIR],
[font directory in DIR [PREFIX/share/fonts/type1/thai]])],
[type1dir="$withval"], [type1dir=\$\{prefix\}/share/fonts/type1/thai])
AC_MSG_CHECKING(--with-type1dir)
@@ -50,12 +50,12 @@ if test "x$enable_pfb" = "xyes"; then
fi
AC_ARG_ENABLE(otf,
- [AC_HELP_STRING([--disable-otf],
+ [AS_HELP_STRING([--disable-otf],
[disable OTF generation])],
, enable_otf="yes")
if test "x$enable_otf" = "xyes"; then
AC_ARG_WITH(otfdir,
- [AC_HELP_STRING([--with-otfdir=DIR],
+ [AS_HELP_STRING([--with-otfdir=DIR],
[font directory in DIR [PREFIX/share/fonts/opentype/thai]])],
[otfdir="$withval"], [otfdir=\$\{prefix\}/share/fonts/opentype/thai])
AC_MSG_CHECKING(--with-otfdir)
@@ -65,12 +65,12 @@ if test "x$enable_otf" = "xyes"; then
fi
AC_ARG_ENABLE(woff,
- [AC_HELP_STRING([--enable-woff],
+ [AS_HELP_STRING([--enable-woff],
[enable Web Open Font Format generation])],
, enable_woff="no")
if test "x$enable_woff" = "xyes"; then
AC_ARG_WITH(woffdir,
- [AC_HELP_STRING([--with-woffdir=DIR],
+ [AS_HELP_STRING([--with-woffdir=DIR],
[font directory in DIR [PREFIX/share/fonts/woff/thai]])],
[woffdir="$withval"], [woffdir=\$\{prefix\}/share/fonts/woff/thai])
AC_MSG_CHECKING(--with-woffdir)
@@ -80,7 +80,7 @@ if test "x$enable_woff" = "xyes"; then
fi
AC_ARG_ENABLE(testfont,
- [AC_HELP_STRING([--enable-testfont],
+ [AS_HELP_STRING([--enable-testfont],
[enable font generation with prefix {TTF,OTF,PS}])],
, enable_testfont="no")
if test "x$enable_testfont" = "xyes"; then
@@ -89,7 +89,7 @@ if test "x$enable_testfont" = "xyes"; then
AX_PYTHON_MODULE([fontforge],[fatal])
AC_ARG_WITH(testfontdir,
- [AC_HELP_STRING([--with-testfontdir=DIR],
+ [AS_HELP_STRING([--with-testfontdir=DIR],
[font directory in DIR [$HOME/.fonts/testfont]])],
[testfontdir="$withval"], [testfontdir=\$\{HOME\}/.fonts/testfont])
AC_MSG_CHECKING(--with-testfontdir)
@@ -100,12 +100,12 @@ fi
AC_ARG_ENABLE(xfontsdir,
- [AC_HELP_STRING([--enable-xfontsdir],
+ [AS_HELP_STRING([--enable-xfontsdir],
[enable X font index generation])],
, enable_xfontsdir="no")
AC_ARG_ENABLE(latex,
- [AC_HELP_STRING([--enable-latex],
+ [AS_HELP_STRING([--enable-latex],
[enable LaTeX fonts generation])],
, enable_latex="no")
@@ -229,7 +229,7 @@ if test "x$enable_latex" = "xyes"; then
fi
AC_ARG_WITH(texmfdir,
- [AC_HELP_STRING([--with-texmfdir=DIR],
+ [AS_HELP_STRING([--with-texmfdir=DIR],
[texmf directory in DIR [PREFIX/share/texmf]])],
[texmfdir="$withval"], [texmfdir=${datarootdir}/texmf])
AC_MSG_CHECKING(--with-texmfdir)
@@ -248,8 +248,7 @@ if test "x$enable_latex" = "xyes"; then
fi
-AC_OUTPUT(
- Makefile
+AC_CONFIG_FILES([Makefile
nf/Makefile
nectec/Makefile
sipa/Makefile
@@ -259,5 +258,6 @@ AC_OUTPUT(
latex/Makefile
latex/examples/Makefile
tests/Makefile
-)
+])
+AC_OUTPUT
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 25c41941b47..159dd276488 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.16.2 from Makefile.am.
+# Makefile.in generated by automake 1.16.4 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2020 Free Software Foundation, Inc.
+# Copyright (C) 1994-2021 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -154,11 +154,14 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+CSCOPE = @CSCOPE@
+CTAGS = @CTAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
+ETAGS = @ETAGS@
FCCACHE = @FCCACHE@
FONTFORGE = @FONTFORGE@
INSTALL = @INSTALL@
@@ -328,7 +331,6 @@ ctags CTAGS:
cscope cscopelist:
-
distdir: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) distdir-am
diff --git a/Master/texmf-dist/source/fonts/fonts-tlwg/install-sh b/Master/texmf-dist/source/fonts/fonts-tlwg/install-sh
index 20d8b2eaea9..ec298b53740 100755
--- a/Master/texmf-dist/source/fonts/fonts-tlwg/install-sh
+++ b/Master/texmf-dist/source/fonts/fonts-tlwg/install-sh
@@ -1,7 +1,7 @@
#!/bin/sh
# install - install a program, script, or datafile
-scriptversion=2018-03-11.20; # UTC
+scriptversion=2020-11-14.01; # UTC
# This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the
@@ -69,6 +69,11 @@ posix_mkdir=
# Desired mode of installed file.
mode=0755
+# Create dirs (including intermediate dirs) using mode 755.
+# This is like GNU 'install' as of coreutils 8.32 (2020).
+mkdir_umask=22
+
+backupsuffix=
chgrpcmd=
chmodcmd=$chmodprog
chowncmd=
@@ -99,18 +104,28 @@ Options:
--version display version info and exit.
-c (ignored)
- -C install only if different (preserve the last data modification time)
+ -C install only if different (preserve data modification time)
-d create directories instead of installing files.
-g GROUP $chgrpprog installed files to GROUP.
-m MODE $chmodprog installed files to MODE.
-o USER $chownprog installed files to USER.
+ -p pass -p to $cpprog.
-s $stripprog installed files.
+ -S SUFFIX attempt to back up existing files, with suffix SUFFIX.
-t DIRECTORY install into DIRECTORY.
-T report an error if DSTFILE is a directory.
Environment variables override the default commands:
CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
RMPROG STRIPPROG
+
+By default, rm is invoked with -f; when overridden with RMPROG,
+it's up to you to specify -f if you want it.
+
+If -S is not specified, no backups are attempted.
+
+Email bug reports to bug-automake@gnu.org.
+Automake home page: https://www.gnu.org/software/automake/
"
while test $# -ne 0; do
@@ -137,8 +152,13 @@ while test $# -ne 0; do
-o) chowncmd="$chownprog $2"
shift;;
+ -p) cpprog="$cpprog -p";;
+
-s) stripcmd=$stripprog;;
+ -S) backupsuffix="$2"
+ shift;;
+
-t)
is_target_a_directory=always
dst_arg=$2
@@ -255,6 +275,10 @@ do
dstdir=$dst
test -d "$dstdir"
dstdir_status=$?
+ # Don't chown directories that already exist.
+ if test $dstdir_status = 0; then
+ chowncmd=""
+ fi
else
# Waiting for this to be detected by the "$cpprog $src $dsttmp" command
@@ -301,22 +325,6 @@ do
if test $dstdir_status != 0; then
case $posix_mkdir in
'')
- # Create intermediate dirs using mode 755 as modified by the umask.
- # This is like FreeBSD 'install' as of 1997-10-28.
- umask=`umask`
- case $stripcmd.$umask in
- # Optimize common cases.
- *[2367][2367]) mkdir_umask=$umask;;
- .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
-
- *[0-7])
- mkdir_umask=`expr $umask + 22 \
- - $umask % 100 % 40 + $umask % 20 \
- - $umask % 10 % 4 + $umask % 2
- `;;
- *) mkdir_umask=$umask,go-w;;
- esac
-
# With -d, create the new directory with the user-specified mode.
# Otherwise, rely on $mkdir_umask.
if test -n "$dir_arg"; then
@@ -326,52 +334,49 @@ do
fi
posix_mkdir=false
- case $umask in
- *[123567][0-7][0-7])
- # POSIX mkdir -p sets u+wx bits regardless of umask, which
- # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
- ;;
- *)
- # Note that $RANDOM variable is not portable (e.g. dash); Use it
- # here however when possible just to lower collision chance.
- tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
-
- trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0
-
- # Because "mkdir -p" follows existing symlinks and we likely work
- # directly in world-writeable /tmp, make sure that the '$tmpdir'
- # directory is successfully created first before we actually test
- # 'mkdir -p' feature.
- if (umask $mkdir_umask &&
- $mkdirprog $mkdir_mode "$tmpdir" &&
- exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1
- then
- if test -z "$dir_arg" || {
- # Check for POSIX incompatibilities with -m.
- # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
- # other-writable bit of parent directory when it shouldn't.
- # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
- test_tmpdir="$tmpdir/a"
- ls_ld_tmpdir=`ls -ld "$test_tmpdir"`
- case $ls_ld_tmpdir in
- d????-?r-*) different_mode=700;;
- d????-?--*) different_mode=755;;
- *) false;;
- esac &&
- $mkdirprog -m$different_mode -p -- "$test_tmpdir" && {
- ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"`
- test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
- }
- }
- then posix_mkdir=:
- fi
- rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir"
- else
- # Remove any dirs left behind by ancient mkdir implementations.
- rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null
- fi
- trap '' 0;;
- esac;;
+ # The $RANDOM variable is not portable (e.g., dash). Use it
+ # here however when possible just to lower collision chance.
+ tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
+
+ trap '
+ ret=$?
+ rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null
+ exit $ret
+ ' 0
+
+ # Because "mkdir -p" follows existing symlinks and we likely work
+ # directly in world-writeable /tmp, make sure that the '$tmpdir'
+ # directory is successfully created first before we actually test
+ # 'mkdir -p'.
+ if (umask $mkdir_umask &&
+ $mkdirprog $mkdir_mode "$tmpdir" &&
+ exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1
+ then
+ if test -z "$dir_arg" || {
+ # Check for POSIX incompatibilities with -m.
+ # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
+ # other-writable bit of parent directory when it shouldn't.
+ # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
+ test_tmpdir="$tmpdir/a"
+ ls_ld_tmpdir=`ls -ld "$test_tmpdir"`
+ case $ls_ld_tmpdir in
+ d????-?r-*) different_mode=700;;
+ d????-?--*) different_mode=755;;
+ *) false;;
+ esac &&
+ $mkdirprog -m$different_mode -p -- "$test_tmpdir" && {
+ ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"`
+ test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
+ }
+ }
+ then posix_mkdir=:
+ fi
+ rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir"
+ else
+ # Remove any dirs left behind by ancient mkdir implementations.
+ rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null
+ fi
+ trap '' 0;;
esac
if
@@ -382,7 +387,7 @@ do
then :
else
- # The umask is ridiculous, or mkdir does not conform to POSIX,
+ # mkdir does not conform to POSIX,
# or it failed possibly due to a race condition. Create the
# directory the slow way, step by step, checking for races as we go.
@@ -411,7 +416,7 @@ do
prefixes=
else
if $posix_mkdir; then
- (umask=$mkdir_umask &&
+ (umask $mkdir_umask &&
$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
# Don't fail if two instances are running concurrently.
test -d "$prefix" || exit 1
@@ -488,6 +493,13 @@ do
then
rm -f "$dsttmp"
else
+ # If $backupsuffix is set, and the file being installed
+ # already exists, attempt a backup. Don't worry if it fails,
+ # e.g., if mv doesn't support -f.
+ if test -n "$backupsuffix" && test -f "$dst"; then
+ $doit $mvcmd -f "$dst" "$dst$backupsuffix" 2>/dev/null
+ fi
+
# Rename the file to the real destination.
$doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
@@ -502,9 +514,9 @@ do
# file should still install successfully.
{
test ! -f "$dst" ||
- $doit $rmcmd -f "$dst" 2>/dev/null ||
+ $doit $rmcmd "$dst" 2>/dev/null ||
{ $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
- { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
+ { $doit $rmcmd "$rmtmp" 2>/dev/null; :; }
} ||
{ echo "$0: cannot unlink or rename $dst" >&2
(exit 1); exit 1
diff --git a/Master/texmf-dist/source/fonts/fonts-tlwg/latex/Makefile.am b/Master/texmf-dist/source/fonts/fonts-tlwg/latex/Makefile.am
index a52c4f5c99b..d06863342ae 100644
--- a/Master/texmf-dist/source/fonts/fonts-tlwg/latex/Makefile.am
+++ b/Master/texmf-dist/source/fonts/fonts-tlwg/latex/Makefile.am
@@ -1,7 +1,9 @@
SUBDIRS = examples
FD_FILES = \
- lthkinnari.fd lthgaruda.fd lthnorasi.fd \
+ lthkinnari.fd lthgaruda.fd \
+ lthnorasi.fd lthnorasij.fd \
+ lthnorx.fd lthnorj.fd \
lthttype.fd lthttypist.fd \
lthpurisa.fd lthloma.fd \
lthwaree.fd lthumpush.fd \
@@ -13,14 +15,20 @@ EXTRA_DIST = \
texfont.mk.am \
fonts-tlwg.sty \
lthtlwg.enc \
+ lthtlwg-sc.enc \
thailigs.enc \
+ thailigs-sc.enc \
+ lthtlwg-osf.enc \
+ lthtlwg-osf-sc.enc \
+ thailigs-osf.enc \
+ thailigs-osf-sc.enc \
thai-dummy.afm \
$(FD_FILES)
if INCLUDE_LATEX
encdir = $(texmfdir)/fonts/enc/dvips/$(LATEX_PACKAGE)
-enc_DATA = lthtlwg.enc
+enc_DATA = lthtlwg.enc lthtlwg-sc.enc lthtlwg-osf.enc lthtlwg-osf-sc.enc
latexdir = $(texmfdir)/tex/latex/$(LATEX_PACKAGE)
latex_DATA = fonts-tlwg.sty $(FD_FILES)
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 56f37e5dbc6..9bd37367ea1 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.16.2 from Makefile.am.
+# Makefile.in generated by automake 1.16.4 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2020 Free Software Foundation, Inc.
+# Copyright (C) 1994-2021 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -177,8 +177,6 @@ am__define_uniq_tagged_files = \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | $(am__uniquify_input)`
-ETAGS = etags
-CTAGS = ctags
DIST_SUBDIRS = $(SUBDIRS)
am__DIST_COMMON = $(srcdir)/Makefile.in
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -215,11 +213,14 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+CSCOPE = @CSCOPE@
+CTAGS = @CTAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
+ETAGS = @ETAGS@
FCCACHE = @FCCACHE@
FONTFORGE = @FONTFORGE@
INSTALL = @INSTALL@
@@ -312,7 +313,9 @@ type1dir = @type1dir@
woffdir = @woffdir@
SUBDIRS = examples
FD_FILES = \
- lthkinnari.fd lthgaruda.fd lthnorasi.fd \
+ lthkinnari.fd lthgaruda.fd \
+ lthnorasi.fd lthnorasij.fd \
+ lthnorx.fd lthnorj.fd \
lthttype.fd lthttypist.fd \
lthpurisa.fd lthloma.fd \
lthwaree.fd lthumpush.fd \
@@ -324,12 +327,18 @@ EXTRA_DIST = \
texfont.mk.am \
fonts-tlwg.sty \
lthtlwg.enc \
+ lthtlwg-sc.enc \
thailigs.enc \
+ thailigs-sc.enc \
+ lthtlwg-osf.enc \
+ lthtlwg-osf-sc.enc \
+ thailigs-osf.enc \
+ thailigs-osf-sc.enc \
thai-dummy.afm \
$(FD_FILES)
@INCLUDE_LATEX_TRUE@encdir = $(texmfdir)/fonts/enc/dvips/$(LATEX_PACKAGE)
-@INCLUDE_LATEX_TRUE@enc_DATA = lthtlwg.enc
+@INCLUDE_LATEX_TRUE@enc_DATA = lthtlwg.enc lthtlwg-sc.enc lthtlwg-osf.enc lthtlwg-osf-sc.enc
@INCLUDE_LATEX_TRUE@latexdir = $(texmfdir)/tex/latex/$(LATEX_PACKAGE)
@INCLUDE_LATEX_TRUE@latex_DATA = fonts-tlwg.sty $(FD_FILES)
@INCLUDE_LATEX_TRUE@doc_DATA = README.latex
@@ -527,7 +536,6 @@ cscopelist-am: $(am__tagged_files)
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
distdir: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) distdir-am
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 446111269a9..8da42c221e6 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
@@ -3,6 +3,9 @@ EXAMPLES = \
testsans.tex \
testscaled-120.tex \
testscaled-65.tex \
+ oldnum.tex \
+ digits-axes.tex \
+ digits-cfr.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 8e331955c3b..d34bf568a35 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.16.2 from Makefile.am.
+# Makefile.in generated by automake 1.16.4 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2020 Free Software Foundation, Inc.
+# Copyright (C) 1994-2021 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -154,11 +154,14 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+CSCOPE = @CSCOPE@
+CTAGS = @CTAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
+ETAGS = @ETAGS@
FCCACHE = @FCCACHE@
FONTFORGE = @FONTFORGE@
INSTALL = @INSTALL@
@@ -254,6 +257,9 @@ EXAMPLES = \
testsans.tex \
testscaled-120.tex \
testscaled-65.tex \
+ oldnum.tex \
+ digits-axes.tex \
+ digits-cfr.tex \
$(NULL)
EXTRA_DIST = $(EXAMPLES)
@@ -321,7 +327,6 @@ ctags CTAGS:
cscope cscopelist:
-
distdir: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) distdir-am
diff --git a/Master/texmf-dist/source/fonts/fonts-tlwg/latex/examples/digits-axes.tex b/Master/texmf-dist/source/fonts/fonts-tlwg/latex/examples/digits-axes.tex
new file mode 100644
index 00000000000..fa89c0d9518
--- /dev/null
+++ b/Master/texmf-dist/source/fonts/fonts-tlwg/latex/examples/digits-axes.tex
@@ -0,0 +1,38 @@
+\documentclass[a4paper]{article}
+\usepackage[thai]{babel}
+\usepackage[utf8x]{inputenc}
+\usepackage[norasi]{fonts-tlwg}
+
+\usepackage{fontaxes}
+
+\begin{document}
+
+ระยะห่างของดวงจันทร์จากโลก
+\begin{itemize}
+ \item Perigee \liningfigures{362,600 km} \textfigures{(356,400--370,400 km)}
+ \item Apogee \liningfigures{405,400 km} \textfigures{(404,000--406,700 km)}
+\end{itemize}
+
+ทดสอบ tabular/proportional figures (\emph{ผ่าน!})
+
+\begin{tabular}{lrr}
+\hline
+ & Lining figures & Old style figures \\
+\hline
+Tabular figures &
+ \figureversion{lf,tab}{197,453,631.11} &
+ \figureversion{osf,tab}{197,453,631.11} \\
+ &
+ \figureversion{lf,tab}{81,142.21} &
+ \figureversion{osf,tab}{81,142.21} \\
+\hline
+Proportional figures &
+ \figureversion{lf,prop}{197,453,631.11} &
+ \figureversion{osf,prop}{197,453,631.11} \\
+ &
+ \figureversion{lf,prop}{81,142.21} &
+ \figureversion{osf,prop}{81,142.21} \\
+\hline
+\end{tabular}
+
+\end{document}
diff --git a/Master/texmf-dist/source/fonts/fonts-tlwg/latex/examples/digits-cfr.tex b/Master/texmf-dist/source/fonts/fonts-tlwg/latex/examples/digits-cfr.tex
new file mode 100644
index 00000000000..ec9af123856
--- /dev/null
+++ b/Master/texmf-dist/source/fonts/fonts-tlwg/latex/examples/digits-cfr.tex
@@ -0,0 +1,30 @@
+\documentclass[a4paper]{article}
+\usepackage[thai]{babel}
+\usepackage[utf8x]{inputenc}
+\usepackage[norasi]{fonts-tlwg}
+
+\usepackage{nfssext-cfr}
+
+\begin{document}
+
+ระยะห่างของดวงจันทร์จากโลก
+\begin{itemize}
+ \item Perigee \textln{362,600 km} \textos{(356,400--370,400 km)}
+ \item Apogee \textln{405,400 km} \textos{(404,000--406,700 km)}
+\end{itemize}
+
+ทดสอบ tabular/proportional figures (\emph{ไม่ผ่าน!})
+
+\begin{tabular}{lrr}
+\hline
+ & Lining figures & Old style figures \\
+\hline
+Tabular figures & \texttl{197,453,631.11} & \textto{197,453,631.11} \\
+ & \texttl{80,142.21} & \textto{81,142.21} \\
+\hline
+Proportional figures & \textpl{197,453,631.11} & \textpo{197,453,631.11} \\
+ & \textpl{81,142.21} & \textpo{81,142.21} \\
+\hline
+\end{tabular}
+
+\end{document}
diff --git a/Master/texmf-dist/source/fonts/fonts-tlwg/latex/examples/oldnum.tex b/Master/texmf-dist/source/fonts/fonts-tlwg/latex/examples/oldnum.tex
new file mode 100644
index 00000000000..b42a6431976
--- /dev/null
+++ b/Master/texmf-dist/source/fonts/fonts-tlwg/latex/examples/oldnum.tex
@@ -0,0 +1,335 @@
+\documentclass[a4paper]{article}
+\usepackage[thai]{babel}
+\usepackage[utf8x]{inputenc}
+\usepackage[norasi-osf]{fonts-tlwg}
+
+\usepackage[bf,sc]{titlesec}
+
+% For "มงคล 38 ประการ"
+\usepackage{enumitem}
+
+\newcommand{\texturl}[1]{\textit{#1}}
+
+\title{Old Style Figures Demonstration}
+\author{}
+\date{}
+
+\newcommand{\pali}[1]{\textit{\textpali{#1}}}
+\newcommand{\source}[2]{%
+ \par\noindent\rule{\textwidth}{0.4pt}
+ \emph{#1:} #2}
+
+\begin{document}
+\maketitle
+
+\section{Ten Commandments}
+
+\begin{enumerate}
+ \item I am the Lord thy God. Thou shalt have no other gods before me.
+ Thou shalt not make unto thee any graven image.
+ \item Thou shalt not take the name of the Lord thy God in vain.
+ \item Remember the sabbath day, to keep it holy.
+ \item Honour thy father and thy mother.
+ \item Thou shalt not murder.
+ \item Thou shalt not commit adultery.
+ \item Thou shalt not steal.
+ \item Thou shalt not bear false witness against thy neighbour.
+ \item Thou shalt not covet thy neighbour's wife.
+ \item Thou shalt not covet thy neighbour's house,
+ or his slaves, or his animals, or anything of thy neighbour.
+\end{enumerate}
+
+You shall set up these stones, which I command you today, on Mount Gerizim.
+
+\source{Source}{%
+ Wikipedia
+ \texturl{https://en.wikipedia.org/wiki/Ten\_Commandments}}
+
+\section{มงคล 38 ประการ}
+
+สมัยหนึ่ง พระผู้มีพระภาคประทับอยู่ ณ พระวิหารเชตวัน อารามของท่านอนาถบิณฑิกเศรษฐี
+ใกล้พระนครสาวัตถี ครั้งนั้นแล ครั้นปฐมยามล่วงไป เทวดาตนหนึ่งมีรัศมีงามยิ่งนัก
+ยังพระวิหารเชตวันทั้งสิ้นให้สว่างไสว เข้าไปเฝ้าพระผู้มีพระภาคถึงที่ประทับ ถวายบังคมแล้วยืนอยู่ ณ
+ที่ควรส่วนข้างหนึ่ง ครั้นแล้ว ได้กราบทูลพระผู้มีพระภาคด้วยคาถาว่า
+
+\begin{quote}
+เทวดาและมนุษย์เป็นอันมาก ผู้หวังความสวัสดี ได้พากันคิดมงคลทั้งหลาย ขอพระองค์จงตรัสอุดมมงคล
+\end{quote}
+
+พระผู้มีพระภาคตรัสพระคาถาตอบว่า (จัดหมวดหมู่ตามบทคาถา)
+
+\subsection{ฝึกให้เป็นคนดี}
+\begin{enumerate}
+ \item \pali{อเสวนา จ พาลานํ} (การไม่คบคนพาล ๑)
+ \item \pali{ปณฺฑิตานญฺจ เสวนา} (การคบบัณฑิต ๑)
+ \item \pali{ปูชา จ ปูชนียานํ} (การบูชาบุคคลที่ควรบูชา ๑)
+\end{enumerate}
+\pali{เอตมฺมงฺคลมุตฺตมํ ฯ} (นี้เป็นอุดมมงคล)
+
+\subsection{สร้างความพร้อมในการฝึกตนเอง}
+\begin{enumerate}[resume]
+ \item \pali{ปฏิรูปเทสวาโส จ} (การอยู่ในประเทศอันสมควร ๑)
+ \item \pali{ปุพฺเพ จ กตปุญฺญตา} (ความเป็นผู้มีบุญอันกระทำแล้วในกาลก่อน ๑)
+ \item \pali{อตฺตสมฺมาปณิธิ จ} (การตั้งตนไว้ชอบ ๑)
+\end{enumerate}
+\pali{เอตมฺมงฺคลมุตฺตมํ ฯ} (นี้เป็นอุดมมงคล)
+
+\subsection{ฝึกตนให้เป็นคนมีประโยชน์}
+\begin{enumerate}[resume]
+ \item \pali{พาหุสจฺจญฺจ} (พาหุสัจจะ ๑ ---มีความรอบรู้, ความเป็นพหูสูต)
+ \item \pali{สิปฺปญฺจ} (ศิลป ๑)
+ \item \pali{วินโย จ สุสิกฺขิโต} (วินัยที่ศึกษาดีแล้ว ๑)
+ \item \pali{สุภาสิตา จ ยา วาจา} (วาจาสุภาษิต ๑)
+\end{enumerate}
+\pali{เอตมฺมงฺคลมุตฺตมํ ฯ} (นี้เป็นอุดมมงคล)
+
+\subsection{บำเพ็ญประโยชน์ต่อครอบครัว}
+\begin{enumerate}[resume]
+ \item \pali{มาตาปิตุอุปฏฺฐานํ} (การบำรุงบิดามารดา ๑)
+ \item \pali{ปุตฺตสงฺคโห} (การเลี้ยงดูบุตร ๑ ---แยกมาจาก \pali{ปุตฺตทารสฺส สงฺคโห})
+ \item \pali{ทารสฺส สงฺคโห} (การสงเคราะห์ภรรยา-สามี ๑
+ ---แยกมาจาก \pali{ปุตฺตทารสฺส สงฺคโห})
+ \item \pali{อนากุลา จ กมฺมนฺตา} (การงานอันไม่อากูล ๑ ---การงานไม่คั่งค้าง)
+\end{enumerate}
+\pali{เอตมฺมงฺคลมุตฺตมํ ฯ} (นี้เป็นอุดมมงคล)
+
+\subsection{บำเพ็ญประโยชน์ต่อสังคม}
+\begin{enumerate}[resume]
+ \item \pali{ทานญฺจ} (ทาน ๑)
+ \item \pali{ธมฺมจริยา จ} (การประพฤติธรรม ๑)
+ \item \pali{ญาตกานญฺจ สงฺคโห} (การสงเคราะห์ญาติ ๑)
+ \item \pali{อนวชฺชานิ กมฺมานิ} (กรรมอันไม่มีโทษ ๑)
+\end{enumerate}
+\pali{เอตมฺมงฺคลมุตฺตมํ ฯ} (นี้เป็นอุดมมงคล)
+
+\subsection{ปรับเตรียมสภาพใจให้พร้อม}
+\begin{enumerate}[resume]
+ \item \pali{อารตี วิรตี ปาปา} (การงดเว้นจากบาป ๑)
+ \item \pali{มชฺชปานา จ สญฺญโม} (ความสำรวมจากการดื่มน้ำเมา ๑)
+ \item \pali{อปฺปมาโท จ ธมฺเมสุ} (ความไม่ประมาทในธรรมทั้งหลาย ๑)
+\end{enumerate}
+\pali{เอตมฺมงฺคลมุตฺตมํ ฯ} (นี้เป็นอุดมมงคล)
+
+\subsection{การแสวงหาธรรมะเบื้องต้นใส่ตัว}
+\begin{enumerate}[resume]
+ \item \pali{คารโว จ} (ความเคารพ ๑)
+ \item \pali{นิวาโต จ} (ความประพฤติถ่อมตน ๑)
+ \item \pali{สนฺตุฏฺฐี จ} (ความสันโดษ ๑)
+ \item \pali{กตญฺญุตา} (ความกตัญญู ๑)
+ \item \pali{กาเลน ธมฺมสฺสวนํ} (การฟังธรรมโดยกาล ๑)
+\end{enumerate}
+\pali{เอตมฺมงฺคลมุตฺตมํ ฯ} (นี้เป็นอุดมมงคล)
+
+\subsection{การแสวงหาธรรมะเบื้องสูงใส่ตัวให้เต็มที่}
+\begin{enumerate}[resume]
+ \item \pali{ขนฺตี จ} (ความอดทน ๑)
+ \item \pali{โสวจสฺสตา} (ความเป็นผู้ว่าง่าย ๑)
+ \item \pali{สมณานญฺจ ทสฺสนํ} (การได้เห็นสมณะทั้งหลาย ๑)
+ \item \pali{กาเลน ธมฺมสากจฺฉา} (การสนทนาธรรมโดยกาล ๑)
+\end{enumerate}
+\pali{เอตมฺมงฺคลมุตฺตมํ ฯ} (นี้เป็นอุดมมงคล)
+
+\subsection{การฝึกภาคปฏิบัติเพื่อกำจัดกิเลสให้สิ้นไป}
+\begin{enumerate}[resume]
+ \item \pali{ตโป จ} (ความเพียร ๑)
+ \item \pali{พฺรหฺมจริยญฺจ} (พรหมจรรย์ ๑)
+ \item \pali{อริยสจฺจานทสฺสนํ} (การเห็นอริยสัจ ๑)
+ \item \pali{นิพฺพานสจฺฉิกิริยา จ} (การกระทำนิพพานให้แจ้ง ๑)
+\end{enumerate}
+\pali{เอตมฺมงฺคลมุตฺตมํ ฯ} (นี้เป็นอุดมมงคล)
+
+\subsection{ผลจากการปฏิบัติตนจนหมดกิเลส}
+\begin{enumerate}[resume]
+ \item \pali{ผุฏฺฐสฺส โลกธมฺเมหิ จิตฺตํ ยสฺส น กมฺปติ} (จิตของผู้ใดอันโลกธรรมทั้งหลายถูกต้องแล้ว
+ ย่อมไม่หวั่นไหว ๑)
+ \item \pali{อโสกํ} (ไม่เศร้าโศก ๑)
+ \item \pali{วิรชํ} (ปราศจากธุลี ๑)
+ \item \pali{เขมํ} (เป็นจิตเกษม ๑)
+\end{enumerate}
+\pali{เอตมฺมงฺคลมุตฺตมํ ฯ} (นี้เป็นอุดมมงคล)
+
+เทวดาและมนุษย์ทั้งหลาย ทำมงคลเช่นนี้แล้ว เป็นผู้ไม่ปราชัยในข้าศึกทุกหมู่เหล่า
+ย่อมถึงความสวัสดีในที่ทุกสถาน นี้เป็นอุดมมงคลของเทวดาและมนุษย์เหล่านั้น ฯ
+
+\source{ที่มา}{%
+ \begin{itemize}
+ \item มงคลสูตรในขุททกปาฐะ พระสุตตันตปิฎก ขุททกนิกาย \\
+ \texturl{https://84000.org/tipitaka/book/v.php?B=25\&A=41\&Z=72} และ \\
+ \texturl{https://84000.org/tipitaka/pali/pali\_item\_s.php?book=25\&item=5\&items=2}
+ \item พ่อน้องกันต์. มงคลชีวิต 38 ประการ.
+ \texturl{https://www.gotoknow.org/posts/382786}
+ \end{itemize}}
+
+\section{Reply from the Observatory of Cambridge}
+
+Barbicane, however, lost not one moment amid all the enthusiasm of which he
+had become the object. His first care was to reassemble his colleagues in the
+board-room of the Gun Club. There, after some discussion, it was agreed to
+consult the astronomers regarding the astronomical part of the enterprise.
+Their reply once ascertained, they could then discuss the mechanical means, and
+nothing should be wanting to ensure the success of this great experiment.
+
+A note couched in precise terms, containing special interrogatories, was then
+drawn up and addressed to the Observatory of Cambridge in Massachusetts. This
+city, where the first university of the United States was founded, is justly
+celebrated for its astronomical staff. There are to be found assembled all the
+most eminent men of science. Here is to be seen at work that powerful telescope
+which enabled Bond to resolve the nebula of Andromeda, and Clarke to discover
+the satellite of Sirius. This celebrated institution fully justified on all
+points the confidence reposed in it by the Gun Club. So, after two days, the
+reply so impatiently awaited was placed in the hands of President Barbicane.
+
+It was couched in the following terms:
+
+\emph{The Director of the Cambridge Observatory to the President of the Gun Club at Baltimore.}
+
+CAMBRIDGE, October 7. On the receipt of your favor of the 6th instant,
+addressed to the Observatory of Cambridge in the name of the members of the
+Baltimore Gun Club, our staff was immediately called together, and it was
+judged expedient to reply as follows:
+
+The questions which have been proposed to it are these---
+
+``1.~Is it possible to transmit a projectile up to the moon?
+
+``2.~What is the exact distance which separates the earth from its satellite?
+
+``3.~What will be the period of transit of the projectile when endowed with
+sufficient initial velocity? and, consequently, at what moment ought it to be
+discharged in order that it may touch the moon at a particular point?
+
+``4.~At what precise moment will the moon present herself in the most favorable
+position to be reached by the projectile?
+
+``5.~What point in the heavens ought the cannon to be aimed at which is
+intended to discharge the projectile?
+
+``6.~What place will the moon occupy in the heavens at the moment of the
+projectile’s departure?''
+
+Regarding the \emph{first} question, ``Is it possible to transmit a projectile
+up to the moon?''
+
+\emph{Answer.}---Yes; provided it possess an initial velocity of 1,200 yards per
+second; calculations prove that to be sufficient. In proportion as we recede
+from the earth the action of gravitation diminishes in the inverse ratio of the
+square of the distance; that is to say, \emph{at three times a given distance
+the action is nine times less.} Consequently, the weight of a shot will
+decrease, and will become reduced to zero at the instant that the attraction of
+the moon exactly counterpoises that of the earth; that is to say at 47/52 of
+its passage. At that instant the projectile will have no weight whatever; and,
+if it passes that point, it will fall into the moon by the sole effect of the
+lunar attraction. The \emph{theoretical possibility} of the experiment is
+therefore absolutely demonstrated; its \emph{success} must depend upon the
+power of the engine employed.
+
+As to the \emph{second} question, ``What is the exact distance which separates
+the earth from its satellite?''
+
+\emph{Answer.}---The moon does not describe a \emph{circle} round the earth,
+but rather an \emph{ellipse,} of which our earth occupies one of the
+\emph{foci;} the consequence, therefore, is, that at certain times it
+approaches nearer to, and at others it recedes farther from, the earth; in
+astronomical language, it is at one time in \emph{apogee,} at another in
+\emph{perigee.} Now the difference between its greatest and its least distance
+is too considerable to be left out of consideration. In point of fact, in its
+apogee the moon is 247,552 miles, and in its perigee, 218,657 miles only
+distant; a fact which makes a difference of 28,895 miles, or more than
+one-ninth of the entire distance. The perigee distance, therefore, is that
+which ought to serve as the basis of all calculations.
+
+To the \emph{third} question:---
+
+\emph{Answer.}---If the shot should preserve continuously its initial velocity
+of 12,000 yards per second, it would require little more than nine hours to
+reach its destination; but, inasmuch as that initial velocity will be
+continually decreasing, it will occupy 300,000 seconds, that is 83hrs.\ 20m.\ in
+reaching the point where the attraction of the earth and moon will be in
+\emph{equilibrio.} From this point it will fall into the moon in 50,000
+seconds, or 13hrs.\ 53m.\ 20sec. It will be desirable, therefore, to discharge
+it 97hrs.\ 13m.\ 20sec.\ before the arrival of the moon at the point aimed at.
+
+Regarding question \emph{four,} ``At what precise moment will the moon present
+herself in the most favorable position, etc.?''
+
+\emph{Answer.}---After what has been said above, it will be necessary, first of
+all, to choose the period when the moon will be in perigee, and \emph{also} the
+moment when she will be crossing the zenith, which latter event will further
+diminish the entire distance by a length equal to the radius of the earth,
+\emph{i.~e.}\ 3,919 miles; the result of which will be that the final passage
+remaining to be accomplished will be 214,976 miles. But although the moon
+passes her perigee every month, she does not reach the zenith always \emph{at
+exactly the same moment.} She does not appear under these two conditions
+simultaneously, except at long intervals of time. It will be necessary,
+therefore, to wait for the moment when her passage in perigee shall coincide
+with that in the zenith. Now, by a fortunate circumstance, on the 4th of
+December in the ensuing year the moon \emph{will} present these two conditions.
+At midnight she will be in perigee, that is, at her shortest distance from the
+earth, and at the same moment she will be crossing the zenith.
+
+On the \emph{fifth} question, ``At what point in the heavens ought the cannon
+to be aimed?''
+
+\emph{Answer.}---The preceding remarks being admitted, the cannon ought to be
+pointed to the zenith of the place. Its fire, therefore, will be perpendicular
+to the plane of the horizon; and the projectile will soonest pass beyond the
+range of the terrestrial attraction. But, in order that the moon should reach
+the zenith of a given place, it is necessary that the place should not exceed
+in latitude the declination of the luminary; in other words, it must be
+comprised within the degrees 0$^\circ$ and 28$^\circ$ of lat.\ N.\ or S.
+In every other spot the fire must necessarily be oblique, which would seriously
+militate against the success of the experiment.
+
+As to the \emph{sixth} question, ``What place will the moon occupy in the
+heavens at the moment of the projectile’s departure?''
+
+\emph{Answer.}---At the moment when the projectile shall be discharged into
+space, the moon, which travels daily forward 13$^\circ$ 10$'$ 35$''$, will be
+distant from the zenith point by four times that quantity, \emph{i.~e.}\ by
+52$^\circ$ 41$'$ 20$''$, a space which corresponds to the path which she will
+describe during the entire journey of the projectile. But, inasmuch as it is
+equally necessary to take into account the deviation which the rotary motion of
+the earth will impart to the shot, and as the shot cannot reach the moon until
+after a deviation equal to 16 radii of the earth, which, calculated upon the
+moon’s orbit, are equal to about eleven degrees, it becomes necessary to add
+these eleven degrees to those which express the retardation of the moon just
+mentioned: that is to say, in round numbers, about sixty-four degrees.
+Consequently, at the moment of firing the visual radius applied to the moon
+will describe, with the vertical line of the place, an angle of sixty-four
+degrees.
+
+These are our answers to the questions proposed to the Observatory of Cambridge
+by the members of the Gun Club:---
+
+To sum up---
+
+1st. The cannon ought to be planted in a country situated between 0$^\circ$ and
+28$^\circ$ of N.\ or S.\ lat.
+
+2nd. It ought to be pointed directly toward the zenith of the place.
+
+3rd. The projectile ought to be propelled with an initial velocity of 12,000
+yards per second.
+
+4th. It ought to be discharged at 10hrs.\ 46m.\ 40sec.\ of the 1st of December
+of the ensuing year.
+
+5th. It will meet the moon four days after its discharge, precisely at midnight
+on the 4th of December, at the moment of its transit across the zenith.
+
+The members of the Gun Club ought, therefore, without delay, to commence the
+works necessary for such an experiment, and to be prepared to set to work at
+the moment determined upon; for, if they should suffer this 4th of December to
+go by, they will not find the moon again under the same conditions of perigee
+and of zenith until eighteen years and eleven days afterward.
+
+The staff of the Cambridge Observatory place themselves entirely at their
+disposal in respect of all questions of theoretical astronomy; and herewith add
+their congratulations to those of all the rest of America. For the Astronomical
+Staff, J. M. BELFAST, \emph{Director of the Observatory of Cambridge.}
+
+\source{Source}{%
+ The Project Gutenberg eBook of From the Earth to the Moon, by
+ Jules Verne. \texturl{https://www.gutenberg.org/files/83/83-h/83-h.htm}}
+
+\end{document}
diff --git a/Master/texmf-dist/source/fonts/fonts-tlwg/latex/examples/teststd.tex b/Master/texmf-dist/source/fonts/fonts-tlwg/latex/examples/teststd.tex
index e30c5c6e16e..74b0e8ee7ea 100644
--- a/Master/texmf-dist/source/fonts/fonts-tlwg/latex/examples/teststd.tex
+++ b/Master/texmf-dist/source/fonts/fonts-tlwg/latex/examples/teststd.tex
@@ -34,6 +34,20 @@
\noindent
\MakeUppercase{A quick brown fox jumps over the lazy dog.}}
+\newcommand{\testlnfigures}[3]{%
+ \usefont{LTH}{#1}{#2}{#3}
+ \noindent
+ Lining figures: 0123456789}
+
+\newcommand{\testoldfigures}[3]{%
+ \usefont{LTH}{#1-OsF}{#2}{#3}
+ \noindent
+ Old style figures: 0123456789}
+
+\newcommand{\testfigures}[3]{%
+ \testlnfigures{#1}{#2}{#3} \\
+ \testoldfigures{#1}{#2}{#3}}
+
\newcommand{\testligkern}[3]{%
\usefont{LTH}{#1}{#2}{#3}
\noindent
@@ -234,6 +248,18 @@
\testenglish{norasi}{b}{sl}
+\testenglish{norasi}{m}{sc}
+
+\testenglish{norasi}{b}{sc}
+
+\testenglish{norasi}{m}{scit}
+
+\testenglish{norasi}{b}{scit}
+
+\testenglish{norasi}{m}{scsl}
+
+\testenglish{norasi}{b}{scsl}
+
\testEnglish{norasi}{m}{n}
\testEnglish{norasi}{b}{n}
@@ -246,6 +272,19 @@
\testEnglish{norasi}{b}{sl}
+\subsection{ตัวเลข}
+
+\testfigures{norasi}{m}{n}
+
+\testfigures{norasi}{b}{n}
+
+\testfigures{norasi}{m}{it}
+
+\testfigures{norasi}{b}{it}
+
+\testfigures{norasi}{m}{sl}
+
+\testfigures{norasi}{b}{sl}
\subsection{การจัดระดับตัวอักษรและตัวอักษรพิเศษ}
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 242009ff21b..2d9787df29e 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
@@ -18,7 +18,7 @@
% The Current Maintainer of this work is Theppitak Karoonboonyanan.
%
-\ProvidesPackage{fonts-tlwg}[2014/07/05 v1.1 Thai TLWG Fonts]
+\ProvidesPackage{fonts-tlwg}[2021/06/12 v2.0 Thai TLWG Fonts]
\RequirePackage{xkeyval}
\newcommand\thairmdefault{norasi}
@@ -44,6 +44,7 @@
% Set default roman, sans-serif, and teletype fonts
\DeclareOptionX{rmkinnari}{\renewcommand{\thairmdefault}{kinnari}}
\DeclareOptionX{rmnorasi}{\renewcommand{\thairmdefault}{norasi}}
+\DeclareOptionX{rmnorasi-osf}{\renewcommand{\thairmdefault}{norasij}}
\DeclareOptionX{sfgaruda}{\renewcommand{\thaisfdefault}{garuda}}
\DeclareOptionX{sflaksaman}{\renewcommand{\thaisfdefault}{laksaman}}
\DeclareOptionX{sfumpush}{\renewcommand{\thaisfdefault}{umpush}}
@@ -56,6 +57,7 @@
\DeclareOptionX{kinnari}{\renewcommand{\thaifamilydefault}{kinnari}}
\DeclareOptionX{garuda}{\renewcommand{\thaifamilydefault}{garuda}}
\DeclareOptionX{norasi}{\renewcommand{\thaifamilydefault}{norasi}}
+\DeclareOptionX{norasi-osf}{\renewcommand{\thaifamilydefault}{norasij}}
\DeclareOptionX{laksaman}{\renewcommand{\thaifamilydefault}{laksaman}}
\DeclareOptionX{loma}{\renewcommand{\thaifamilydefault}{loma}}
\DeclareOptionX{purisa}{\renewcommand{\thaifamilydefault}{purisa}}
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 d50664d27d9..2198dd201d3 100644
--- a/Master/texmf-dist/source/fonts/fonts-tlwg/latex/lthnorasi.fd
+++ b/Master/texmf-dist/source/fonts/fonts-tlwg/latex/lthnorasi.fd
@@ -18,6 +18,8 @@
% The Current Maintainer of this work is Theppitak Karoonboonyanan.
%
% Created by Surapant Meknavin: surapan@nectec.or.th
+% 2021/06/08 Theppitak Karoonboonyanan <theppitak@gmail.com>
+% - add small cap shapes
% 2017/09/11 Abhabongse Janthong <abhabongse@gmail.com>
% - add font scaling
% 2003/06/02 Chanop Silpa-Anan <chanop@debian.org>
@@ -26,7 +28,7 @@
% - font name changed from "nf3x" to "norasi", with bold series added
% - encoding changed from TIS to LTH, according TeX convention
-\ProvidesFile{lthnorasi.fd}[2000/05/09 v1.0 Thai font definitions]
+\ProvidesFile{lthnorasi.fd}[2021/06/12 v2.0 Norasi font definition]
% Check if the scale factor has been defined
\ifcsname fontstlwg@scale\endcsname
@@ -40,15 +42,24 @@
\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}{}
+\DeclareFontShape{LTH}{norasi}{m}{sc}{<-> \fontstlwg@@scale norasi-sc}{}
+\DeclareFontShape{LTH}{norasi}{m}{scit}{<-> \fontstlwg@@scale norasi_i-sc}{}
+\DeclareFontShape{LTH}{norasi}{m}{scsl}{<-> \fontstlwg@@scale norasi_o-sc}{}
%%%%%%% bold series
\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}{}
+\DeclareFontShape{LTH}{norasi}{b}{sc}{<-> \fontstlwg@@scale norasi_b-sc}{}
+\DeclareFontShape{LTH}{norasi}{b}{scit}{<-> \fontstlwg@@scale norasi_bi-sc}{}
+\DeclareFontShape{LTH}{norasi}{b}{scsl}{<-> \fontstlwg@@scale norasi_bo-sc}{}
% Substitutions
\DeclareFontShape{LTH}{norasi}{bx}{n}{<->ssub * norasi/b/n}{}
\DeclareFontShape{LTH}{norasi}{bx}{sl}{<->ssub * norasi/b/sl}{}
\DeclareFontShape{LTH}{norasi}{bx}{it}{<->ssub * norasi/b/it}{}
+\DeclareFontShape{LTH}{norasi}{bx}{sc}{<->ssub * norasi/b/sc}{}
+\DeclareFontShape{LTH}{norasi}{bx}{scsl}{<->ssub * norasi/b/scsl}{}
+\DeclareFontShape{LTH}{norasi}{bx}{scit}{<->ssub * norasi/b/scit}{}
\endinput
%
diff --git a/Master/texmf-dist/source/fonts/fonts-tlwg/latex/lthnorasij.fd b/Master/texmf-dist/source/fonts/fonts-tlwg/latex/lthnorasij.fd
new file mode 100644
index 00000000000..c0952d49d9b
--- /dev/null
+++ b/Master/texmf-dist/source/fonts/fonts-tlwg/latex/lthnorasij.fd
@@ -0,0 +1,69 @@
+% LTHnorasij.fd
+%
+% This file is part of the fonts-tlwg package
+%
+% 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.
+% 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.
+%
+% Created by Surapant Meknavin: surapan@nectec.or.th
+% 2021/06/12 Theppitak Karoonboonyanan <theppitak@gmail.com>
+% - add old style figure version
+% 2021/06/08 Theppitak Karoonboonyanan <theppitak@gmail.com>
+% - add small cap shapes
+% 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>
+% - font name changed from "nf3x" to "norasi", with bold series added
+% - encoding changed from TIS to LTH, according TeX convention
+
+\ProvidesFile{lthnorasi-osf.fd}[2021/06/12 v2.0 Norasi-OsF font definition]
+
+% 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}{norasij}{}
+\DeclareFontShape{LTH}{norasij}{m}{n}{<-> \fontstlwg@@scale norasi-osf}{}
+\DeclareFontShape{LTH}{norasij}{m}{it}{<-> \fontstlwg@@scale norasi_i-osf}{}
+\DeclareFontShape{LTH}{norasij}{m}{sl}{<-> \fontstlwg@@scale norasi_o-osf}{}
+\DeclareFontShape{LTH}{norasij}{m}{sc}{<-> \fontstlwg@@scale norasi-osf-sc}{}
+\DeclareFontShape{LTH}{norasij}{m}{scit}{<-> \fontstlwg@@scale norasi_i-osf-sc}{}
+\DeclareFontShape{LTH}{norasij}{m}{scsl}{<-> \fontstlwg@@scale norasi_o-osf-sc}{}
+%%%%%%% bold series
+\DeclareFontShape{LTH}{norasij}{b}{n}{<-> \fontstlwg@@scale norasi_b-osf}{}
+\DeclareFontShape{LTH}{norasij}{b}{it}{<-> \fontstlwg@@scale norasi_bi-osf}{}
+\DeclareFontShape{LTH}{norasij}{b}{sl}{<-> \fontstlwg@@scale norasi_bo-osf}{}
+\DeclareFontShape{LTH}{norasij}{b}{sc}{<-> \fontstlwg@@scale norasi_b-osf-sc}{}
+\DeclareFontShape{LTH}{norasij}{b}{scit}{<-> \fontstlwg@@scale norasi_bi-osf-sc}{}
+\DeclareFontShape{LTH}{norasij}{b}{scsl}{<-> \fontstlwg@@scale norasi_bo-osf-sc}{}
+
+% Substitutions
+\DeclareFontShape{LTH}{norasij}{bx}{n}{<->ssub * norasij/b/n}{}
+\DeclareFontShape{LTH}{norasij}{bx}{sl}{<->ssub * norasij/b/sl}{}
+\DeclareFontShape{LTH}{norasij}{bx}{it}{<->ssub * norasij/b/it}{}
+\DeclareFontShape{LTH}{norasij}{bx}{sc}{<->ssub * norasij/b/sc}{}
+\DeclareFontShape{LTH}{norasij}{bx}{scsl}{<->ssub * norasij/b/scsl}{}
+\DeclareFontShape{LTH}{norasij}{bx}{scit}{<->ssub * norasij/b/scit}{}
+\endinput
+
+%
+% EOF
+%
diff --git a/Master/texmf-dist/source/fonts/fonts-tlwg/latex/lthnorj.fd b/Master/texmf-dist/source/fonts/fonts-tlwg/latex/lthnorj.fd
new file mode 100644
index 00000000000..ac4ef18d1d4
--- /dev/null
+++ b/Master/texmf-dist/source/fonts/fonts-tlwg/latex/lthnorj.fd
@@ -0,0 +1,68 @@
+% lthnorj.fd
+%
+% This file is part of the fonts-tlwg package
+%
+% 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.
+% 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.
+%
+% Created by Surapant Meknavin: surapan@nectec.or.th
+% 2021/06/12 Theppitak Karoonboonyanan <theppitak@gmail.com>
+% - create old style figure version under Karl Berry's font naming,
+% targeting nfssext-cfr package
+% 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>
+% - font name changed from "nf3x" to "norasi", with bold series added
+% - encoding changed from TIS to LTH, according TeX convention
+
+\ProvidesFile{lthnorj.fd}[2021/06/12 v2.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}{norj}{}
+\DeclareFontShape{LTH}{norj}{m}{n}{<-> \fontstlwg@@scale norasi-osf}{}
+\DeclareFontShape{LTH}{norj}{m}{it}{<-> \fontstlwg@@scale norasi_i-osf}{}
+\DeclareFontShape{LTH}{norj}{m}{sl}{<-> \fontstlwg@@scale norasi_o-osf}{}
+\DeclareFontShape{LTH}{norj}{m}{sc}{<-> \fontstlwg@@scale norasi-osf-sc}{}
+\DeclareFontShape{LTH}{norj}{m}{scit}{<-> \fontstlwg@@scale norasi_i-osf-sc}{}
+\DeclareFontShape{LTH}{norj}{m}{scsl}{<-> \fontstlwg@@scale norasi_o-osf-sc}{}
+%%%%%%% bold series
+\DeclareFontShape{LTH}{norj}{b}{n}{<-> \fontstlwg@@scale norasi_b-osf}{}
+\DeclareFontShape{LTH}{norj}{b}{it}{<-> \fontstlwg@@scale norasi_bi-osf}{}
+\DeclareFontShape{LTH}{norj}{b}{sl}{<-> \fontstlwg@@scale norasi_bo-osf}{}
+\DeclareFontShape{LTH}{norj}{b}{sc}{<-> \fontstlwg@@scale norasi_b-osf-sc}{}
+\DeclareFontShape{LTH}{norj}{b}{scit}{<-> \fontstlwg@@scale norasi_bi-osf-sc}{}
+\DeclareFontShape{LTH}{norj}{b}{scsl}{<-> \fontstlwg@@scale norasi_bo-osf-sc}{}
+
+% Substitutions
+\DeclareFontShape{LTH}{norj}{bx}{n}{<->ssub * norj/b/n}{}
+\DeclareFontShape{LTH}{norj}{bx}{sl}{<->ssub * norj/b/sl}{}
+\DeclareFontShape{LTH}{norj}{bx}{it}{<->ssub * norj/b/it}{}
+\DeclareFontShape{LTH}{norj}{bx}{sc}{<->ssub * norj/b/sc}{}
+\DeclareFontShape{LTH}{norj}{bx}{scsl}{<->ssub * norj/b/scsl}{}
+\DeclareFontShape{LTH}{norj}{bx}{scit}{<->ssub * norj/b/scit}{}
+\endinput
+
+%
+% EOF
+%
diff --git a/Master/texmf-dist/source/fonts/fonts-tlwg/latex/lthnorx.fd b/Master/texmf-dist/source/fonts/fonts-tlwg/latex/lthnorx.fd
new file mode 100644
index 00000000000..527cc2e60a7
--- /dev/null
+++ b/Master/texmf-dist/source/fonts/fonts-tlwg/latex/lthnorx.fd
@@ -0,0 +1,68 @@
+% LTHnorx.fd
+%
+% This file is part of the fonts-tlwg package
+%
+% 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.
+% 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.
+%
+% Created by Surapant Meknavin: surapan@nectec.or.th
+% 2021/06/12 Theppitak Karoonboonyanan <theppitak@gmail.com>
+% - create normal version under Karl Berry's font naming,
+% targeting nfssext-cfr package
+% 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>
+% - font name changed from "nf3x" to "norasi", with bold series added
+% - encoding changed from TIS to LTH, according TeX convention
+
+\ProvidesFile{lthnorx.fd}[2021/06/12 v2.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}{norx}{}
+\DeclareFontShape{LTH}{norx}{m}{n}{<-> \fontstlwg@@scale norasi}{}
+\DeclareFontShape{LTH}{norx}{m}{it}{<-> \fontstlwg@@scale norasi_i}{}
+\DeclareFontShape{LTH}{norx}{m}{sl}{<-> \fontstlwg@@scale norasi_o}{}
+\DeclareFontShape{LTH}{norx}{m}{sc}{<-> \fontstlwg@@scale norasi-sc}{}
+\DeclareFontShape{LTH}{norx}{m}{scit}{<-> \fontstlwg@@scale norasi_i-sc}{}
+\DeclareFontShape{LTH}{norx}{m}{scsl}{<-> \fontstlwg@@scale norasi_o-sc}{}
+%%%%%%% bold series
+\DeclareFontShape{LTH}{norx}{b}{n}{<-> \fontstlwg@@scale norasi_b}{}
+\DeclareFontShape{LTH}{norx}{b}{it}{<-> \fontstlwg@@scale norasi_bi}{}
+\DeclareFontShape{LTH}{norx}{b}{sl}{<-> \fontstlwg@@scale norasi_bo}{}
+\DeclareFontShape{LTH}{norx}{b}{sc}{<-> \fontstlwg@@scale norasi_b-sc}{}
+\DeclareFontShape{LTH}{norx}{b}{scit}{<-> \fontstlwg@@scale norasi_bi-sc}{}
+\DeclareFontShape{LTH}{norx}{b}{scsl}{<-> \fontstlwg@@scale norasi_bo-sc}{}
+
+% Substitutions
+\DeclareFontShape{LTH}{norx}{bx}{n}{<->ssub * norasi/b/n}{}
+\DeclareFontShape{LTH}{norx}{bx}{sl}{<->ssub * norasi/b/sl}{}
+\DeclareFontShape{LTH}{norx}{bx}{it}{<->ssub * norasi/b/it}{}
+\DeclareFontShape{LTH}{norx}{bx}{sc}{<->ssub * norasi/b/sc}{}
+\DeclareFontShape{LTH}{norx}{bx}{scsl}{<->ssub * norasi/b/scsl}{}
+\DeclareFontShape{LTH}{norx}{bx}{scit}{<->ssub * norasi/b/scit}{}
+\endinput
+
+%
+% EOF
+%
diff --git a/Master/texmf-dist/source/fonts/fonts-tlwg/latex/lthtlwg-osf-sc.enc b/Master/texmf-dist/source/fonts/fonts-tlwg/latex/lthtlwg-osf-sc.enc
new file mode 100644
index 00000000000..484512e92f9
--- /dev/null
+++ b/Master/texmf-dist/source/fonts/fonts-tlwg/latex/lthtlwg-osf-sc.enc
@@ -0,0 +1,96 @@
+% LTHTLWG-osf-sc.enc
+% based on LTHUNI.enc from thailatex project
+% by Poonlap Veerathanabutr <poonlap@linux.thai.net>
+% 2002-12-30
+% 2021-06-12 Theppitak Karoonboonyanan <theppitak@gmail.com>
+% * Create old style figure & small caps re-encoding version.
+% 2003-09-15 Chanop Silpa-Anan <chanop@debian.org>
+% * Use new unicode variant name.
+% 2011-12-26 Theppitak Karoonboonyanan <thep@linux.thai.net>
+% * Support more common Latin characters with native font glyphs.
+%
+% This is LaTeX LTH (Locale Thai) encoding for unicode encoded fonts
+%
+
+/LTHEncoding [
+% 0x00
+/.notdef /.notdef /.notdef /.notdef
+/dagger /daggerdbl /section /paragraph
+/copyright /registered /trademark /germandbls
+/ae /AE /oe /OE
+% 0x10
+/exclamdown /questiondown /quotedblbase /guillemotleft
+/guillemotright /uni0E38 /uni0E39 /uni0E3A
+/perthousand /dotlessi /dotlessj /.notdef
+/.notdef /.notdef /.notdef /.notdef
+% 0x20
+/space /exclam /quotedbl /numbersign
+/dollar /percent /ampersand /quoteright
+/parenleft /parenright /asterisk /plus
+/comma /hyphen /period /slash
+% 0x30
+/zerooldstyle /oneoldstyle /twooldstyle /threeoldstyle
+/fouroldstyle /fiveoldstyle /sixoldstyle /sevenoldstyle
+/eightoldstyle /nineoldstyle /colon /semicolon
+/less /equal /greater /question
+% 0x40
+/at /A /B /C
+/D /E /F /G
+/H /I /J /K
+/L /M /N /O
+% 0x50
+/P /Q /R /S
+/T /U /V /W
+/X /Y /Z /bracketleft
+/backslash /bracketright /asciicircum /underscore
+% 0x60
+/quoteleft /Asmall /Bsmall /Csmall
+/Dsmall /Esmall /Fsmall /Gsmall
+/Hsmall /Ismall /Jsmall /Ksmall
+/Lsmall /Msmall /Nsmall /Osmall
+% 0x70
+/Psmall /Qsmall /Rsmall /Ssmall
+/Tsmall /Usmall /Vsmall /Wsmall
+/Xsmall /Ysmall /Zsmall /braceleft
+/bar /braceright /asciitilde /.notdef
+% 0x80
+/uni0E10.descless /uni0E34.left /uni0E35.left /uni0E36.left
+/uni0E37.left /ellipsis /uni0E48.low_left /uni0E49.low_left
+/uni0E4A.low_left /uni0E4B.low_left /uni0E4C.low_left /uni0E48
+/uni0E49 /uni0E4A /uni0E4B /uni0E4C
+% 0x90
+/uni0E0D.descless /quoteleft /quoteright /quotedblleft
+/quotedblright /bullet /endash /emdash
+/uni0E31.left /uni0E4D.left /uni0E47.left /uni0E48.left
+/uni0E49.left /uni0E4A.left /uni0E4B.left /uni0E4C.left
+% 0xA0
+/nonbreakingspace /uni0E01 /uni0E02 /uni0E03
+/uni0E04 /uni0E05 /uni0E06 /uni0E07
+/uni0E08 /uni0E09 /uni0E0A /uni0E0B
+/uni0E0C /uni0E0D /uni0E0E /uni0E0F
+% 0xB0
+/uni0E10 /uni0E11 /uni0E12 /uni0E13
+/uni0E14 /uni0E15 /uni0E16 /uni0E17
+/uni0E18 /uni0E19 /uni0E1A /uni0E1B
+/uni0E1C /uni0E1D /uni0E1E /uni0E1F
+% 0xC0
+/uni0E20 /uni0E21 /uni0E22 /uni0E23
+/uni0E24 /uni0E25 /uni0E26 /uni0E27
+/uni0E28 /uni0E29 /uni0E2A /uni0E2B
+/uni0E2C /uni0E2D /uni0E2E /uni0E2F
+% 0xD0
+/uni0E30 /uni0E31 /uni0E32 /uni0E33
+/uni0E34 /uni0E35 /uni0E36 /uni0E37
+/uni0E38 /uni0E39 /uni0E3A /uni0E4D.high
+/zerowidthspace /dottedcircle /uni0E47.high /uni0E3F
+% 0xE0
+/uni0E40 /uni0E41 /uni0E42 /uni0E43
+/uni0E44 /uni0E45 /uni0E46 /uni0E47
+/uni0E48.low /uni0E49.low /uni0E4A.low /uni0E4B.low
+/uni0E4C.low /uni0E4D /uni0E4E /uni0E4F
+% 0xF0
+/uni0E50 /uni0E51 /uni0E52 /uni0E53
+/uni0E54 /uni0E55 /uni0E56 /uni0E57
+/uni0E58 /uni0E59 /uni0E5A /uni0E5B
+/uni0E38.low /uni0E39.low /uni0E3A.low /.notdef
+] def
diff --git a/Master/texmf-dist/source/fonts/fonts-tlwg/latex/lthtlwg-osf.enc b/Master/texmf-dist/source/fonts/fonts-tlwg/latex/lthtlwg-osf.enc
new file mode 100644
index 00000000000..16c77b1ce4c
--- /dev/null
+++ b/Master/texmf-dist/source/fonts/fonts-tlwg/latex/lthtlwg-osf.enc
@@ -0,0 +1,96 @@
+% LTHTLWG-osf.enc
+% based on LTHUNI.enc from thailatex project
+% by Poonlap Veerathanabutr <poonlap@linux.thai.net>
+% 2002-12-30
+% 2021-06-12 Theppitak Karoonboonyanan <theppitak@gmail.com>
+% * Create old style figure re-encoding version.
+% 2003-09-15 Chanop Silpa-Anan <chanop@debian.org>
+% * Use new unicode variant name.
+% 2011-12-26 Theppitak Karoonboonyanan <thep@linux.thai.net>
+% * Support more common Latin characters with native font glyphs.
+%
+% This is LaTeX LTH (Locale Thai) encoding for unicode encoded fonts
+%
+
+/LTHEncoding [
+% 0x00
+/.notdef /.notdef /.notdef /.notdef
+/dagger /daggerdbl /section /paragraph
+/copyright /registered /trademark /germandbls
+/ae /AE /oe /OE
+% 0x10
+/exclamdown /questiondown /quotedblbase /guillemotleft
+/guillemotright /uni0E38 /uni0E39 /uni0E3A
+/perthousand /dotlessi /dotlessj /ff
+/fi /fl /ffi /ffl
+% 0x20
+/space /exclam /quotedbl /numbersign
+/dollar /percent /ampersand /quoteright
+/parenleft /parenright /asterisk /plus
+/comma /hyphen /period /slash
+% 0x30
+/zerooldstyle /oneoldstyle /twooldstyle /threeoldstyle
+/fouroldstyle /fiveoldstyle /sixoldstyle /sevenoldstyle
+/eightoldstyle /nineoldstyle /colon /semicolon
+/less /equal /greater /question
+% 0x40
+/at /A /B /C
+/D /E /F /G
+/H /I /J /K
+/L /M /N /O
+% 0x50
+/P /Q /R /S
+/T /U /V /W
+/X /Y /Z /bracketleft
+/backslash /bracketright /asciicircum /underscore
+% 0x60
+/quoteleft /a /b /c
+/d /e /f /g
+/h /i /j /k
+/l /m /n /o
+% 0x70
+/p /q /r /s
+/t /u /v /w
+/x /y /z /braceleft
+/bar /braceright /asciitilde /.notdef
+% 0x80
+/uni0E10.descless /uni0E34.left /uni0E35.left /uni0E36.left
+/uni0E37.left /ellipsis /uni0E48.low_left /uni0E49.low_left
+/uni0E4A.low_left /uni0E4B.low_left /uni0E4C.low_left /uni0E48
+/uni0E49 /uni0E4A /uni0E4B /uni0E4C
+% 0x90
+/uni0E0D.descless /quoteleft /quoteright /quotedblleft
+/quotedblright /bullet /endash /emdash
+/uni0E31.left /uni0E4D.left /uni0E47.left /uni0E48.left
+/uni0E49.left /uni0E4A.left /uni0E4B.left /uni0E4C.left
+% 0xA0
+/nonbreakingspace /uni0E01 /uni0E02 /uni0E03
+/uni0E04 /uni0E05 /uni0E06 /uni0E07
+/uni0E08 /uni0E09 /uni0E0A /uni0E0B
+/uni0E0C /uni0E0D /uni0E0E /uni0E0F
+% 0xB0
+/uni0E10 /uni0E11 /uni0E12 /uni0E13
+/uni0E14 /uni0E15 /uni0E16 /uni0E17
+/uni0E18 /uni0E19 /uni0E1A /uni0E1B
+/uni0E1C /uni0E1D /uni0E1E /uni0E1F
+% 0xC0
+/uni0E20 /uni0E21 /uni0E22 /uni0E23
+/uni0E24 /uni0E25 /uni0E26 /uni0E27
+/uni0E28 /uni0E29 /uni0E2A /uni0E2B
+/uni0E2C /uni0E2D /uni0E2E /uni0E2F
+% 0xD0
+/uni0E30 /uni0E31 /uni0E32 /uni0E33
+/uni0E34 /uni0E35 /uni0E36 /uni0E37
+/uni0E38 /uni0E39 /uni0E3A /uni0E4D.high
+/zerowidthspace /dottedcircle /uni0E47.high /uni0E3F
+% 0xE0
+/uni0E40 /uni0E41 /uni0E42 /uni0E43
+/uni0E44 /uni0E45 /uni0E46 /uni0E47
+/uni0E48.low /uni0E49.low /uni0E4A.low /uni0E4B.low
+/uni0E4C.low /uni0E4D /uni0E4E /uni0E4F
+% 0xF0
+/uni0E50 /uni0E51 /uni0E52 /uni0E53
+/uni0E54 /uni0E55 /uni0E56 /uni0E57
+/uni0E58 /uni0E59 /uni0E5A /uni0E5B
+/uni0E38.low /uni0E39.low /uni0E3A.low /.notdef
+] def
diff --git a/Master/texmf-dist/source/fonts/fonts-tlwg/latex/lthtlwg-sc.enc b/Master/texmf-dist/source/fonts/fonts-tlwg/latex/lthtlwg-sc.enc
new file mode 100644
index 00000000000..edb7ddf7959
--- /dev/null
+++ b/Master/texmf-dist/source/fonts/fonts-tlwg/latex/lthtlwg-sc.enc
@@ -0,0 +1,96 @@
+% LTHTLWG-sc.enc
+% based on LTHUNI.enc from thailatex project
+% by Poonlap Veerathanabutr <poonlap@linux.thai.net>
+% 2002-12-30
+% 2021-06-08 Theppitak Karoonboonyanan <theppitak@gmail.com>
+% * Create small caps re-encoding version.
+% 2003-09-15 Chanop Silpa-Anan <chanop@debian.org>
+% * Use new unicode variant name.
+% 2011-12-26 Theppitak Karoonboonyanan <thep@linux.thai.net>
+% * Support more common Latin characters with native font glyphs.
+%
+% This is LaTeX LTH (Locale Thai) encoding for unicode encoded fonts
+%
+
+/LTHEncoding [
+% 0x00
+/.notdef /.notdef /.notdef /.notdef
+/dagger /daggerdbl /section /paragraph
+/copyright /registered /trademark /germandbls
+/ae /AE /oe /OE
+% 0x10
+/exclamdown /questiondown /quotedblbase /guillemotleft
+/guillemotright /uni0E38 /uni0E39 /uni0E3A
+/perthousand /dotlessi /dotlessj /.notdef
+/.notdef /.notdef /.notdef /.notdef
+% 0x20
+/space /exclam /quotedbl /numbersign
+/dollar /percent /ampersand /quoteright
+/parenleft /parenright /asterisk /plus
+/comma /hyphen /period /slash
+% 0x30
+/zero /one /two /three
+/four /five /six /seven
+/eight /nine /colon /semicolon
+/less /equal /greater /question
+% 0x40
+/at /A /B /C
+/D /E /F /G
+/H /I /J /K
+/L /M /N /O
+% 0x50
+/P /Q /R /S
+/T /U /V /W
+/X /Y /Z /bracketleft
+/backslash /bracketright /asciicircum /underscore
+% 0x60
+/quoteleft /Asmall /Bsmall /Csmall
+/Dsmall /Esmall /Fsmall /Gsmall
+/Hsmall /Ismall /Jsmall /Ksmall
+/Lsmall /Msmall /Nsmall /Osmall
+% 0x70
+/Psmall /Qsmall /Rsmall /Ssmall
+/Tsmall /Usmall /Vsmall /Wsmall
+/Xsmall /Ysmall /Zsmall /braceleft
+/bar /braceright /asciitilde /.notdef
+% 0x80
+/uni0E10.descless /uni0E34.left /uni0E35.left /uni0E36.left
+/uni0E37.left /ellipsis /uni0E48.low_left /uni0E49.low_left
+/uni0E4A.low_left /uni0E4B.low_left /uni0E4C.low_left /uni0E48
+/uni0E49 /uni0E4A /uni0E4B /uni0E4C
+% 0x90
+/uni0E0D.descless /quoteleft /quoteright /quotedblleft
+/quotedblright /bullet /endash /emdash
+/uni0E31.left /uni0E4D.left /uni0E47.left /uni0E48.left
+/uni0E49.left /uni0E4A.left /uni0E4B.left /uni0E4C.left
+% 0xA0
+/nonbreakingspace /uni0E01 /uni0E02 /uni0E03
+/uni0E04 /uni0E05 /uni0E06 /uni0E07
+/uni0E08 /uni0E09 /uni0E0A /uni0E0B
+/uni0E0C /uni0E0D /uni0E0E /uni0E0F
+% 0xB0
+/uni0E10 /uni0E11 /uni0E12 /uni0E13
+/uni0E14 /uni0E15 /uni0E16 /uni0E17
+/uni0E18 /uni0E19 /uni0E1A /uni0E1B
+/uni0E1C /uni0E1D /uni0E1E /uni0E1F
+% 0xC0
+/uni0E20 /uni0E21 /uni0E22 /uni0E23
+/uni0E24 /uni0E25 /uni0E26 /uni0E27
+/uni0E28 /uni0E29 /uni0E2A /uni0E2B
+/uni0E2C /uni0E2D /uni0E2E /uni0E2F
+% 0xD0
+/uni0E30 /uni0E31 /uni0E32 /uni0E33
+/uni0E34 /uni0E35 /uni0E36 /uni0E37
+/uni0E38 /uni0E39 /uni0E3A /uni0E4D.high
+/zerowidthspace /dottedcircle /uni0E47.high /uni0E3F
+% 0xE0
+/uni0E40 /uni0E41 /uni0E42 /uni0E43
+/uni0E44 /uni0E45 /uni0E46 /uni0E47
+/uni0E48.low /uni0E49.low /uni0E4A.low /uni0E4B.low
+/uni0E4C.low /uni0E4D /uni0E4E /uni0E4F
+% 0xF0
+/uni0E50 /uni0E51 /uni0E52 /uni0E53
+/uni0E54 /uni0E55 /uni0E56 /uni0E57
+/uni0E58 /uni0E59 /uni0E5A /uni0E5B
+/uni0E38.low /uni0E39.low /uni0E3A.low /.notdef
+] def
diff --git a/Master/texmf-dist/source/fonts/fonts-tlwg/latex/texfont.mk.am b/Master/texmf-dist/source/fonts/fonts-tlwg/latex/texfont.mk.am
index 27ffef426bc..f0fb93f11d7 100644
--- a/Master/texmf-dist/source/fonts/fonts-tlwg/latex/texfont.mk.am
+++ b/Master/texmf-dist/source/fonts/fonts-tlwg/latex/texfont.mk.am
@@ -13,13 +13,22 @@ LTX_TFMFILES = $(FONTS:%=%.tfm)
LTX_RTFMFILES = $(FONTS:%=r%.tfm)
LTX_VFFILES = $(FONTS:%=%.vf)
+LTX_SYNTH_TFMFILES = $(SYNTH_FONTS:%=%.tfm)
+LTX_SYNTH_RTFMFILES = $(SYNTH_FONTS:%=r%.tfm)
+LTX_SYNTH_VFFILES = $(SYNTH_FONTS:%=%.vf)
+
ltxtype1_DATA = $(LTX_PFBFILES)
ltxafm_DATA = $(LTX_AFMFILES)
-ltxtfm_DATA = $(LTX_TFMFILES) $(LTX_RTFMFILES)
+ltxtfm_DATA = \
+ $(LTX_TFMFILES) \
+ $(LTX_RTFMFILES) \
+ $(LTX_SYNTH_TFMFILES) \
+ $(LTX_SYNTH_RTFMFILES) \
+ $(NULL)
-ltxvf_DATA = $(LTX_VFFILES)
+ltxvf_DATA = $(LTX_VFFILES) $(LTX_SYNTH_VFFILES)
# OpenType fonts
@@ -31,27 +40,66 @@ ltxotf_DATA = ${LTX_OTFFILES}
# Local Rules
-thai-dummy.afm:
- [ -e thai-dummy.afm ] || $(LN_S) $(top_srcdir)/latex/thai-dummy.afm .
-
-thailigs.enc:
- [ -e thailigs.enc ] || $(LN_S) $(top_srcdir)/latex/thailigs.enc .
-
-lthtlwg.enc:
- [ -e lthtlwg.enc ] || $(LN_S) $(top_srcdir)/latex/lthtlwg.enc .
+thai-dummy.afm \
+thailigs.enc \
+lthtlwg.enc \
+thailigs-sc.enc \
+lthtlwg-sc.enc \
+thailigs-osf.enc \
+lthtlwg-osf.enc \
+thailigs-osf-sc.enc \
+lthtlwg-osf-sc.enc \
+:
+ [ -e $@ ] || $(LN_S) $(top_srcdir)/latex/$@ .
thailigs.vpl: thai-dummy.afm thailigs.enc
$(AFM2TFM) thai-dummy.afm -v $@ -T thailigs.enc thailigs.tfm
+thailigs-sc.vpl: thai-dummy.afm thailigs-sc.enc
+ $(AFM2TFM) thai-dummy.afm -v $@ -T thailigs-sc.enc thailigs-sc.tfm
+
+thailigs-osf.vpl: thai-dummy.afm thailigs-osf.enc
+ $(AFM2TFM) thai-dummy.afm -v $@ -T thailigs-osf.enc thailigs-osf.tfm
+
+thailigs-osf-sc.vpl: thai-dummy.afm thailigs-osf-sc.enc
+ $(AFM2TFM) thai-dummy.afm -v $@ -T thailigs-osf-sc.enc thailigs-osf-sc.tfm
+
+#
+# merge_ligs(font-vpl-file,ligs-vpl-file)
+#
+# Replaces LIGTABLE in font-vpl-file with that in ligs-vpl-file.
+#
+define merge_ligs
+ TMPFILE=`mktemp /tmp/tltx.XXXXXXXXX` && \
+ $(AWK) "BEGIN {show=1} /LIGTABLE/ {show=0} {if(show) print}" $(1) > $$TMPFILE && \
+ $(AWK) "BEGIN {show=0} /LIGTABLE/ {show=1} /CHARACTER/ {show=0} {if(show) print}" $(2) >> $$TMPFILE && \
+ $(AWK) "BEGIN {show=0} /CHARACTER/ {show=1} {if(show) print}" $(1) >> $$TMPFILE && \
+ mv $$TMPFILE $(1)
+endef
+
+r%-osf-sc.tfm: %.afm
+%-osf-sc.vpl: %.afm thailigs-osf-sc.vpl lthtlwg-osf-sc.enc
+ $(AFM2TFM) $*.afm -v $*-osf-sc.vpl -T lthtlwg-osf-sc.enc r$*-osf-sc.tfm \
+ | $(SED) "s/$$/ <$*.pfb/" >> $(MAP)
+ $(call merge_ligs,$*-osf-sc.vpl,thailigs-osf-sc.vpl)
+
+r%-osf.tfm: %.afm
+%-osf.vpl: %.afm thailigs-osf.vpl lthtlwg-osf.enc
+ $(AFM2TFM) $*.afm -v $*-osf.vpl -T lthtlwg-osf.enc r$*-osf.tfm \
+ | $(SED) "s/$$/ <$*.pfb/" >> $(MAP)
+ $(call merge_ligs,$*-osf.vpl,thailigs-osf.vpl)
+
+r%-sc.tfm: %.afm
+%-sc.vpl: %.afm thailigs-sc.vpl lthtlwg-sc.enc
+ $(AFM2TFM) $*.afm -v $*-sc.vpl -T lthtlwg-sc.enc r$*-sc.tfm \
+ | $(SED) "s/$$/ <$*.pfb/" >> $(MAP)
+ $(call merge_ligs,$*-sc.vpl,thailigs-sc.vpl)
+
r%.tfm: %.afm
%.vpl: %.afm thailigs.vpl lthtlwg.enc
$(AFM2TFM) $*.afm -v $*.vpl -T lthtlwg.enc r$*.tfm \
| $(SED) "s/$$/ <$*.pfb/" >> $(MAP)
- TMPFILE=`mktemp /tmp/tltx.XXXXXXXXX` && \
- $(AWK) "BEGIN {show=1} /LIGTABLE/ {show=0} {if(show) print}" $*.vpl > $$TMPFILE && \
- $(AWK) "BEGIN {show=0} /LIGTABLE/ {show=1} /CHARACTER/ {show=0} {if(show) print}" thailigs.vpl >> $$TMPFILE && \
- $(AWK) "BEGIN {show=0} /CHARACTER/ {show=1} {if(show) print}" $*.vpl >> $$TMPFILE && \
- mv $$TMPFILE $*.vpl
+ $(call merge_ligs,$*.vpl,thailigs.vpl)
%.tfm: %.vpl
$(VPTOVF) $*
diff --git a/Master/texmf-dist/source/fonts/fonts-tlwg/latex/thailigs-osf-sc.enc b/Master/texmf-dist/source/fonts/fonts-tlwg/latex/thailigs-osf-sc.enc
new file mode 100644
index 00000000000..7e52e702c64
--- /dev/null
+++ b/Master/texmf-dist/source/fonts/fonts-tlwg/latex/thailigs-osf-sc.enc
@@ -0,0 +1,425 @@
+% thailigs-osf-sc.enc
+% by Poonlap Veerathanabutr <poonlap@linux.thai.net>
+% 2002-12-30
+% 2021-06-12 Theppitak Karoonboonyanan <theppitak@gmail.com>
+% * Create old style figure & small caps re-encoding version.
+% 2003-09-15 Chanop Silpa-Anan <chanop@debian.org>
+% * Use new unicode variant name.
+% 2011-12-26 Theppitak Karoonboonyanan <thep@linux.thai.net>
+% * Support more common Latin characters with native font glyphs.
+%
+% This is LaTeX LTH (Locale Thai) encoding for unicode encoded fonts
+%
+%ligature for making LEFT vowels, tone marks and Nikhahit
+%PoPla left vowel
+%LIGKERN uni0E1B uni0E31 |=:> uni0E31.left ;
+%LIGKERN uni0E1B uni0E34 |=:> uni0E34.left ;
+%LIGKERN uni0E1B uni0E35 |=:> uni0E35.left ;
+%LIGKERN uni0E1B uni0E36 |=:> uni0E36.left ;
+%LIGKERN uni0E1B uni0E37 |=:> uni0E37.left ;
+%LIGKERN uni0E1B uni0E38 |=:> uni0E38.left ;
+%LIGKERN uni0E1B uni0E39 |=:> uni0E39.left ;
+%LIGKERN uni0E1B uni0E3A |=:> uni0E3A.left ;
+%LIGKERN uni0E1B uni0E47 |=:> uni0E47.left ;
+%Popla left tone marks, thanthakhat, nikhahit
+%LIGKERN uni0E1B uni0E48.low |=:> uni0E48.low_left ;
+%LIGKERN uni0E1B uni0E49.low |=:> uni0E49.low_left ;
+%LIGKERN uni0E1B uni0E4A.low |=:> uni0E4A.low_left ;
+%LIGKERN uni0E1B uni0E4B.low |=:> uni0E4B.low_left ;
+%LIGKERN uni0E1B uni0E4C.low |=:> uni0E4C.low_left ;
+%LIGKERN uni0E1B uni0E4D |=:> uni0E4D.left ;
+%Popla sara-am
+%LIGKERN uni0E1B uni0E33 |=:|> uni0E4D.left ;
+%LIGKERN uni0E4D.left uni0E33 |=:> uni0E32 ;
+
+%FoFa left vowel
+%LIGKERN uni0E1D uni0E31 |=:> uni0E31.left ;
+%LIGKERN uni0E1D uni0E34 |=:> uni0E34.left ;
+%LIGKERN uni0E1D uni0E35 |=:> uni0E35.left ;
+%LIGKERN uni0E1D uni0E36 |=:> uni0E36.left ;
+%LIGKERN uni0E1D uni0E37 |=:> uni0E37.left ;
+%LIGKERN uni0E1D uni0E38 |=:> uni0E38.left ;
+%LIGKERN uni0E1D uni0E39 |=:> uni0E39.left ;
+%LIGKERN uni0E1D uni0E3A |=:> uni0E3A.left ;
+%LIGKERN uni0E1D uni0E47 |=:> uni0E47.left ;
+%FoFa left tone marks, thanthakhat, nikhahit
+%LIGKERN uni0E1D uni0E48.low |=:> uni0E48.low_left ;
+%LIGKERN uni0E1D uni0E49.low |=:> uni0E49.low_left ;
+%LIGKERN uni0E1D uni0E4A.low |=:> uni0E4A.low_left ;
+%LIGKERN uni0E1D uni0E4B.low |=:> uni0E4B.low_left ;
+%LIGKERN uni0E1D uni0E4C.low |=:> uni0E4C.low_left ;
+%LIGKERN uni0E1D uni0E4D |=:> uni0E4D.left ;
+%FoFa sara-am
+%LIGKERN uni0E1D uni0E33 |=:|> uni0E4D.left ;
+%LIGKERN uni0E4D.left uni0E33 |=:> uni0E32 ;
+
+%FoFan left vowel
+%LIGKERN uni0E1F uni0E31 |=:> uni0E31.left ;
+%LIGKERN uni0E1F uni0E34 |=:> uni0E34.left ;
+%LIGKERN uni0E1F uni0E35 |=:> uni0E35.left ;
+%LIGKERN uni0E1F uni0E36 |=:> uni0E36.left ;
+%LIGKERN uni0E1F uni0E37 |=:> uni0E37.left ;
+%LIGKERN uni0E1F uni0E38 |=:> uni0E38.left ;
+%LIGKERN uni0E1F uni0E39 |=:> uni0E39.left ;
+%LIGKERN uni0E1F uni0E3A |=:> uni0E3A.left ;
+%LIGKERN uni0E1F uni0E47 |=:> uni0E47.left ;
+%FoFan left tone marks, thanthakhat, nikhahit
+%LIGKERN uni0E1F uni0E48.low |=:> uni0E48.low_left ;
+%LIGKERN uni0E1F uni0E49.low |=:> uni0E49.low_left ;
+%LIGKERN uni0E1F uni0E4A.low |=:> uni0E4A.low_left ;
+%LIGKERN uni0E1F uni0E4B.low |=:> uni0E4B.low_left ;
+%LIGKERN uni0E1F uni0E4C.low |=:> uni0E4C.low_left ;
+%LIGKERN uni0E1F uni0E4D |=:> uni0E4D.left ;
+%FoFan sara-am
+%LIGKERN uni0E1F uni0E33 |=:|> uni0E4D.left ;
+%LIGKERN uni0E4D.left uni0E33 |=:> uni0E32 ;
+
+%LoChula left vowel
+%LIGKERN uni0E2C uni0E31 |=:> uni0E31.left ;
+%LIGKERN uni0E2C uni0E34 |=:> uni0E34.left ;
+%LIGKERN uni0E2C uni0E35 |=:> uni0E35.left ;
+%LIGKERN uni0E2C uni0E36 |=:> uni0E36.left ;
+%LIGKERN uni0E2C uni0E37 |=:> uni0E37.left ;
+%LIGKERN uni0E2C uni0E38 |=:> uni0E38.left ;
+%LIGKERN uni0E2C uni0E39 |=:> uni0E39.left ;
+%LIGKERN uni0E2C uni0E3A |=:> uni0E3A.left ;
+%LIGKERN uni0E2C uni0E47 |=:> uni0E47.left ;
+%LoChula left tone marks, thanthakhat, nikhahit
+%LIGKERN uni0E2C uni0E48.low |=:> uni0E48.low_left ;
+%LIGKERN uni0E2C uni0E49.low |=:> uni0E49.low_left ;
+%LIGKERN uni0E2C uni0E4A.low |=:> uni0E4A.low_left ;
+%LIGKERN uni0E2C uni0E4B.low |=:> uni0E4B.low_left ;
+%LIGKERN uni0E2C uni0E4C.low |=:> uni0E4C.low_left ;
+%LIGKERN uni0E2C uni0E4D |=:> uni0E4D.left ;
+%LoChula sara-am
+%LIGKERN uni0E2C uni0E33 |=:|> uni0E4D.left ;
+%LIGKERN uni0E4D.left uni0E33 |=:> uni0E32 ;
+
+%ligature for making left SaraAm with HiLeft tone marks
+%LIGKERN uni0E48.low_left uni0E33 =:| uni0E48.left ;
+%LIGKERN uni0E48.left uni0E33 |=:|> uni0E4D.left ;
+%LIGKERN uni0E49.low_left uni0E33 =:| uni0E49.left ;
+%LIGKERN uni0E49.left uni0E33 |=:|> uni0E4D.left ;
+%LIGKERN uni0E4A.low_left uni0E33 =:| uni0E4A.left ;
+%LIGKERN uni0E4A.left uni0E33 |=:|> uni0E4D.left ;
+%LIGKERN uni0E4B.low_left uni0E33 =:| uni0E4B.left ;
+%LIGKERN uni0E4B.left uni0E33 |=:|> uni0E4D.left ;
+
+%LIGKERN uni0E48.low uni0E33 =:| uni0E48 ;
+%LIGKERN uni0E49.low uni0E33 =:| uni0E49 ;
+%LIGKERN uni0E4A.low uni0E33 =:| uni0E4A ;
+%LIGKERN uni0E4B.low uni0E33 =:| uni0E4B ;
+
+%ligature for making HI tone marks
+%LIGKERN uni0E31 uni0E48.low |=:> uni0E48 ;
+%LIGKERN uni0E31 uni0E49.low |=:> uni0E49 ;
+%LIGKERN uni0E31 uni0E4A.low |=:> uni0E4A ;
+%LIGKERN uni0E31 uni0E4B.low |=:> uni0E4B ;
+%LIGKERN uni0E34 uni0E48.low |=:> uni0E48 ;
+%LIGKERN uni0E34 uni0E49.low |=:> uni0E49 ;
+%LIGKERN uni0E34 uni0E4A.low |=:> uni0E4A ;
+%LIGKERN uni0E34 uni0E4B.low |=:> uni0E4B ;
+%LIGKERN uni0E34 uni0E4C.low |=:> uni0E4C ;
+%LIGKERN uni0E35 uni0E48.low |=:> uni0E48 ;
+%LIGKERN uni0E35 uni0E49.low |=:> uni0E49 ;
+%LIGKERN uni0E35 uni0E4A.low |=:> uni0E4A ;
+%LIGKERN uni0E35 uni0E4B.low |=:> uni0E4B ;
+%LIGKERN uni0E35 uni0E4C.low |=:> uni0E4C ;
+%LIGKERN uni0E36 uni0E48.low |=:> uni0E48 ;
+%LIGKERN uni0E36 uni0E49.low |=:> uni0E49 ;
+%LIGKERN uni0E36 uni0E4A.low |=:> uni0E4A ;
+%LIGKERN uni0E36 uni0E4B.low |=:> uni0E4B ;
+%LIGKERN uni0E36 uni0E4C.low |=:> uni0E4C ;
+%LIGKERN uni0E37 uni0E48.low |=:> uni0E48 ;
+%LIGKERN uni0E37 uni0E49.low |=:> uni0E49 ;
+%LIGKERN uni0E37 uni0E4A.low |=:> uni0E4A ;
+%LIGKERN uni0E37 uni0E4B.low |=:> uni0E4B ;
+%LIGKERN uni0E37 uni0E4C.low |=:> uni0E4C ;
+
+%[ethnic languages] HI tone marks over upper marks
+%LIGKERN uni0E47 uni0E48.low |=:> uni0E48 ;
+%LIGKERN uni0E47 uni0E49.low |=:> uni0E49 ;
+%LIGKERN uni0E47 uni0E4A.low |=:> uni0E4A ;
+%LIGKERN uni0E47 uni0E4B.low |=:> uni0E4B ;
+%LIGKERN uni0E47 uni0E4C.low |=:> uni0E4C ;
+%LIGKERN uni0E48.low uni0E48.low |=:> uni0E48 ;
+%LIGKERN uni0E48.low uni0E49.low |=:> uni0E49 ;
+%LIGKERN uni0E48.low uni0E4A.low |=:> uni0E4A ;
+%LIGKERN uni0E48.low uni0E4B.low |=:> uni0E4B ;
+%LIGKERN uni0E48.low uni0E4C.low |=:> uni0E4C ;
+%LIGKERN uni0E49.low uni0E48.low |=:> uni0E48 ;
+%LIGKERN uni0E49.low uni0E49.low |=:> uni0E49 ;
+%LIGKERN uni0E49.low uni0E4A.low |=:> uni0E4A ;
+%LIGKERN uni0E49.low uni0E4B.low |=:> uni0E4B ;
+%LIGKERN uni0E49.low uni0E4C.low |=:> uni0E4C ;
+%LIGKERN uni0E4A.low uni0E48.low |=:> uni0E48 ;
+%LIGKERN uni0E4A.low uni0E49.low |=:> uni0E49 ;
+%LIGKERN uni0E4A.low uni0E4A.low |=:> uni0E4A ;
+%LIGKERN uni0E4A.low uni0E4B.low |=:> uni0E4B ;
+%LIGKERN uni0E4A.low uni0E4C.low |=:> uni0E4C ;
+%LIGKERN uni0E4B.low uni0E48.low |=:> uni0E48 ;
+%LIGKERN uni0E4B.low uni0E49.low |=:> uni0E49 ;
+%LIGKERN uni0E4B.low uni0E4A.low |=:> uni0E4A ;
+%LIGKERN uni0E4B.low uni0E4B.low |=:> uni0E4B ;
+%LIGKERN uni0E4B.low uni0E4C.low |=:> uni0E4C ;
+%LIGKERN uni0E4C.low uni0E48.low |=:> uni0E48 ;
+%LIGKERN uni0E4C.low uni0E49.low |=:> uni0E49 ;
+%LIGKERN uni0E4C.low uni0E4A.low |=:> uni0E4A ;
+%LIGKERN uni0E4C.low uni0E4B.low |=:> uni0E4B ;
+%LIGKERN uni0E4C.low uni0E4C.low |=:> uni0E4C ;
+
+%ligature for making LEFT HI tone marks and thantakhat
+%LIGKERN uni0E31.left uni0E48.low |=:> uni0E48.left ;
+%LIGKERN uni0E34.left uni0E48.low |=:> uni0E48.left ;
+%LIGKERN uni0E35.left uni0E48.low |=:> uni0E48.left ;
+%LIGKERN uni0E36.left uni0E48.low |=:> uni0E48.left ;
+%LIGKERN uni0E37.left uni0E48.low |=:> uni0E48.left ;
+
+%LIGKERN uni0E31.left uni0E49.low |=:> uni0E49.left ;
+%LIGKERN uni0E34.left uni0E49.low |=:> uni0E49.left ;
+%LIGKERN uni0E35.left uni0E49.low |=:> uni0E49.left ;
+%LIGKERN uni0E36.left uni0E49.low |=:> uni0E49.left ;
+%LIGKERN uni0E37.left uni0E49.low |=:> uni0E49.left ;
+
+%LIGKERN uni0E31.left uni0E4A.low |=:> uni0E4A.left ;
+%LIGKERN uni0E34.left uni0E4A.low |=:> uni0E4A.left ;
+%LIGKERN uni0E35.left uni0E4A.low |=:> uni0E4A.left ;
+%LIGKERN uni0E36.left uni0E4A.low |=:> uni0E4A.left ;
+%LIGKERN uni0E37.left uni0E4A.low |=:> uni0E4A.left ;
+
+%LIGKERN uni0E31.left uni0E4B.low |=:> uni0E4B.left ;
+%LIGKERN uni0E34.left uni0E4B.low |=:> uni0E4B.left ;
+%LIGKERN uni0E35.left uni0E4B.low |=:> uni0E4B.left ;
+%LIGKERN uni0E36.left uni0E4B.low |=:> uni0E4B.left ;
+%LIGKERN uni0E37.left uni0E4B.low |=:> uni0E4B.left ;
+
+%LIGKERN uni0E34.left uni0E4C.low |=:> uni0E4C.left ;
+
+%[ethnic languages] LEFT HI tone marks over upper marks
+%LIGKERN uni0E47.left uni0E48.low |=:> uni0E48.left ;
+%LIGKERN uni0E47.left uni0E49.low |=:> uni0E49.left ;
+%LIGKERN uni0E47.left uni0E4A.low |=:> uni0E4A.left ;
+%LIGKERN uni0E47.left uni0E4B.low |=:> uni0E4B.left ;
+%LIGKERN uni0E47.left uni0E4C.low |=:> uni0E4C.left ;
+%LIGKERN uni0E48.low_left uni0E48.low |=:> uni0E48.left ;
+%LIGKERN uni0E48.low_left uni0E49.low |=:> uni0E49.left ;
+%LIGKERN uni0E48.low_left uni0E4A.low |=:> uni0E4A.left ;
+%LIGKERN uni0E48.low_left uni0E4B.low |=:> uni0E4B.left ;
+%LIGKERN uni0E48.low_left uni0E4C.low |=:> uni0E4C.left ;
+%LIGKERN uni0E49.low_left uni0E48.low |=:> uni0E48.left ;
+%LIGKERN uni0E49.low_left uni0E49.low |=:> uni0E49.left ;
+%LIGKERN uni0E49.low_left uni0E4A.low |=:> uni0E4A.left ;
+%LIGKERN uni0E49.low_left uni0E4B.low |=:> uni0E4B.left ;
+%LIGKERN uni0E49.low_left uni0E4C.low |=:> uni0E4C.left ;
+%LIGKERN uni0E4A.low_left uni0E48.low |=:> uni0E48.left ;
+%LIGKERN uni0E4A.low_left uni0E49.low |=:> uni0E49.left ;
+%LIGKERN uni0E4A.low_left uni0E4A.low |=:> uni0E4A.left ;
+%LIGKERN uni0E4A.low_left uni0E4B.low |=:> uni0E4B.left ;
+%LIGKERN uni0E4A.low_left uni0E4C.low |=:> uni0E4C.left ;
+%LIGKERN uni0E4B.low_left uni0E48.low |=:> uni0E48.left ;
+%LIGKERN uni0E4B.low_left uni0E49.low |=:> uni0E49.left ;
+%LIGKERN uni0E4B.low_left uni0E4A.low |=:> uni0E4A.left ;
+%LIGKERN uni0E4B.low_left uni0E4B.low |=:> uni0E4B.left ;
+%LIGKERN uni0E4B.low_left uni0E4C.low |=:> uni0E4C.left ;
+%LIGKERN uni0E4C.low_left uni0E48.low |=:> uni0E48.left ;
+%LIGKERN uni0E4C.low_left uni0E49.low |=:> uni0E49.left ;
+%LIGKERN uni0E4C.low_left uni0E4A.low |=:> uni0E4A.left ;
+%LIGKERN uni0E4C.low_left uni0E4B.low |=:> uni0E4B.left ;
+%LIGKERN uni0E4C.low_left uni0E4C.low |=:> uni0E4C.left ;
+
+%ligature for making LEFT LOW tone marks and thantakhat
+%LIGKERN uni0E38.left uni0E48.low |=:> uni0E48.low_left ;
+%LIGKERN uni0E39.left uni0E48.low |=:> uni0E48.low_left ;
+%LIGKERN uni0E3A.left uni0E48.low |=:> uni0E48.low_left ;
+
+%LIGKERN uni0E38.left uni0E49.low |=:> uni0E49.low_left ;
+%LIGKERN uni0E39.left uni0E49.low |=:> uni0E49.low_left ;
+%LIGKERN uni0E3A.left uni0E49.low |=:> uni0E49.low_left ;
+
+%LIGKERN uni0E38.left uni0E4A.low |=:> uni0E4A.low_left ;
+%LIGKERN uni0E39.left uni0E4A.low |=:> uni0E4A.low_left ;
+%LIGKERN uni0E3A.left uni0E4A.low |=:> uni0E4A.low_left ;
+
+%LIGKERN uni0E38.left uni0E4B.low |=:> uni0E4B.low_left ;
+%LIGKERN uni0E39.left uni0E4B.low |=:> uni0E4B.low_left ;
+%LIGKERN uni0E3A.left uni0E4B.low |=:> uni0E4B.low_left ;
+
+%LIGKERN uni0E38.left uni0E4C.low |=:> uni0E4C.low_left ;
+%LIGKERN uni0E39.left uni0E4C.low |=:> uni0E4C.low_left ;
+%LIGKERN uni0E3A.left uni0E4C.low |=:> uni0E4C.low_left ;
+
+%[ethnic languages] LEFT upper vowel after Phinthu
+%LIGKERN uni0E38.left uni0E31 |=:> uni0E31.left ;
+%LIGKERN uni0E39.left uni0E31 |=:> uni0E31.left ;
+%LIGKERN uni0E3A.left uni0E31 |=:> uni0E31.left ;
+
+%LIGKERN uni0E38.left uni0E34 |=:> uni0E34.left ;
+%LIGKERN uni0E39.left uni0E34 |=:> uni0E34.left ;
+%LIGKERN uni0E3A.left uni0E34 |=:> uni0E34.left ;
+
+%LIGKERN uni0E38.left uni0E35 |=:> uni0E35.left ;
+%LIGKERN uni0E39.left uni0E35 |=:> uni0E35.left ;
+%LIGKERN uni0E3A.left uni0E35 |=:> uni0E35.left ;
+
+%LIGKERN uni0E38.left uni0E36 |=:> uni0E36.left ;
+%LIGKERN uni0E39.left uni0E36 |=:> uni0E36.left ;
+%LIGKERN uni0E3A.left uni0E36 |=:> uni0E36.left ;
+
+%LIGKERN uni0E38.left uni0E37 |=:> uni0E37.left ;
+%LIGKERN uni0E39.left uni0E37 |=:> uni0E37.left ;
+%LIGKERN uni0E3A.left uni0E37 |=:> uni0E37.left ;
+
+%ligature for making HI MaiTaikhu and Nikhahit
+%LIGKERN uni0E31 uni0E47 |=:> uni0E47.high ;
+%LIGKERN uni0E34 uni0E47 |=:> uni0E47.high ;
+%LIGKERN uni0E35 uni0E47 |=:> uni0E47.high ;
+%LIGKERN uni0E36 uni0E47 |=:> uni0E47.high ;
+%LIGKERN uni0E37 uni0E47 |=:> uni0E47.high ;
+%LIGKERN uni0E31.left uni0E47 |=:> uni0E47.high ;
+%LIGKERN uni0E34.left uni0E47 |=:> uni0E47.high ;
+%LIGKERN uni0E35.left uni0E47 |=:> uni0E47.high ;
+%LIGKERN uni0E36.left uni0E47 |=:> uni0E47.high ;
+%LIGKERN uni0E37.left uni0E47 |=:> uni0E47.high ;
+%LIGKERN uni0E31 uni0E4D |=:> uni0E4D.high ;
+%LIGKERN uni0E34 uni0E4D |=:> uni0E4D.high ;
+%LIGKERN uni0E35 uni0E4D |=:> uni0E4D.high ;
+%LIGKERN uni0E36 uni0E4D |=:> uni0E4D.high ;
+%LIGKERN uni0E37 uni0E4D |=:> uni0E4D.high ;
+%LIGKERN uni0E31.left uni0E4D |=:> uni0E4D.high ;
+%LIGKERN uni0E34.left uni0E4D |=:> uni0E4D.high ;
+%LIGKERN uni0E35.left uni0E4D |=:> uni0E4D.high ;
+%LIGKERN uni0E36.left uni0E4D |=:> uni0E4D.high ;
+%LIGKERN uni0E37.left uni0E4D |=:> uni0E4D.high ;
+
+%ligature for making LOW SaraU SaraUu and Phinthu
+%LIGKERN uni0E0E uni0E38 |=:> uni0E38.low ;
+%LIGKERN uni0E0E uni0E39 |=:> uni0E39.low ;
+%LIGKERN uni0E0E uni0E3A |=:> uni0E3A.low ;
+%LIGKERN uni0E0F uni0E38 |=:> uni0E38.low ;
+%LIGKERN uni0E0F uni0E39 |=:> uni0E39.low ;
+%LIGKERN uni0E0F uni0E3A |=:> uni0E3A.low ;
+
+%[ethnic languages] LOW SaraU SaraUu and Phinthu below another
+%LIGKERN uni0E38 uni0E38 |=:> uni0E38.low ;
+%LIGKERN uni0E39 uni0E38 |=:> uni0E38.low ;
+%LIGKERN uni0E3A uni0E38 |=:> uni0E38.low ;
+%LIGKERN uni0E38 uni0E39 |=:> uni0E39.low ;
+%LIGKERN uni0E39 uni0E39 |=:> uni0E39.low ;
+%LIGKERN uni0E3A uni0E39 |=:> uni0E39.low ;
+%LIGKERN uni0E38 uni0E3A |=:> uni0E3A.low ;
+%LIGKERN uni0E39 uni0E3A |=:> uni0E3A.low ;
+%LIGKERN uni0E3A uni0E3A |=:> uni0E3A.low ;
+
+%ligature for making YoYingDescless and ThoThanDescless
+%LIGKERN uni0E0D uni0E38 =:|> uni0E0D.descless ;
+%LIGKERN uni0E0D uni0E39 =:|> uni0E0D.descless ;
+%LIGKERN uni0E0D uni0E3A =:|> uni0E0D.descless ;
+%LIGKERN uni0E10 uni0E38 =:|> uni0E10.descless ;
+%LIGKERN uni0E10 uni0E39 =:|> uni0E10.descless ;
+%LIGKERN uni0E10 uni0E3A =:|> uni0E10.descless ;
+
+%ligature for making Lakkhangyao
+%LIGKERN uni0E24 uni0E32 |=:> uni0E45 ;
+%LIGKERN uni0E26 uni0E32 |=:> uni0E45 ;
+
+%default ligature and kern set normally built-in in afm2tfm
+%LIGKERN question quoteleft =: questiondown ; exclam quoteleft =: exclamdown ;
+%LIGKERN hyphen hyphen =: endash ; endash hyphen =: emdash ;
+%LIGKERN quoteleft quoteleft =: quotedblleft ;
+%LIGKERN quoteright quoteright =: quotedblright ;
+%LIGKERN space {} * ; * {} space ;
+%LIGKERN zerooldstyle {} * ; * {} zerooldstyle ;
+%LIGKERN oneoldstyle {} * ; * {} oneoldstyle ;
+%LIGKERN twooldstyle {} * ; * {} twooldstyle ;
+%LIGLERN threeoldstyle {} * ; * {} threeoldstyle ;
+%LIGKERN fouroldstyle {} * ; * {} fouroldstyle ;
+%LIGLERN fiveoldstyle {} * ; * {} fiveoldstyle ;
+%LIGKERN sixoldstyle {} * ; * {} sixoldstyle ;
+%LIGKERN sevenoldstyle {} * ; * {} sevenoldstyle ;
+%LIGKERN eightoldstyle {} * ; * {} eightoldstyle ;
+%LIGKERN nineoldstyle {} * ; * {} nineoldstyle ;
+%LIGKERN comma comma =: quotedblbase ; less less =: guillemotleft ;
+%LIGKERN greater greater =: guillemotright ;
+
+/LTHEncoding [
+% 0x00
+/.notdef /.notdef /.notdef /.notdef
+/dagger /daggerdbl /section /paragraph
+/copyright /registered /trademark /germandbls
+/ae /AE /oe /OE
+% 0x10
+/exclamdown /questiondown /quotedblbase /guillemotleft
+/guillemotright /uni0E38.left /uni0E39.left /uni0E3A.left
+/perthousand /dotlessi /dotlessj /.notdef
+/.notdef /.notdef /.notdef /.notdef
+% 0x20
+/space /exclam /quotedbl /numbersign
+/dollar /percent /ampersand /quoteright
+/parenleft /parenright /asterisk /plus
+/comma /hyphen /period /slash
+% 0x30
+/zero /one /two /three
+/four /five /six /seven
+/eight /nine /colon /semicolon
+/less /equal /greater /question
+% 0x40
+/at /A /B /C
+/D /E /F /G
+/H /I /J /K
+/L /M /N /O
+% 0x50
+/P /Q /R /S
+/T /U /V /W
+/X /Y /Z /bracketleft
+/backslash /bracketright /asciicircum /underscore
+% 0x60
+/quoteleft /Asmall /Bsmall /Csmall
+/Dsmall /Esmall /Fsmall /Gsmall
+/Hsmall /Ismall /Jsmall /Ksmall
+/Lsmall /Msmall /Nsmall /Osmall
+% 0x70
+/Psmall /Qsmall /Rsmall /Ssmall
+/Tsmall /Usmall /Vsmall /Wsmall
+/Xsmall /Ysmall /Zsmall /braceleft
+/bar /braceright /asciitilde /.notdef
+% 0x80
+/uni0E10.descless /uni0E34.left /uni0E35.left /uni0E36.left
+/uni0E37.left /ellipsis /uni0E48.low_left /uni0E49.low_left
+/uni0E4A.low_left /uni0E4B.low_left /uni0E4C.low_left /uni0E48
+/uni0E49 /uni0E4A /uni0E4B /uni0E4C
+% 0x90
+/uni0E0D.descless /.notdef /.notdef /quotedblleft
+/quotedblright /bullet /endash /emdash
+/uni0E31.left /uni0E4D.left /uni0E47.left /uni0E48.left
+/uni0E49.left /uni0E4A.left /uni0E4B.left /uni0E4C.left
+% 0xA0
+/nonbreakingspace /uni0E01 /uni0E02 /uni0E03
+/uni0E04 /uni0E05 /uni0E06 /uni0E07
+/uni0E08 /uni0E09 /uni0E0A /uni0E0B
+/uni0E0C /uni0E0D /uni0E0E /uni0E0F
+% 0xB0
+/uni0E10 /uni0E11 /uni0E12 /uni0E13
+/uni0E14 /uni0E15 /uni0E16 /uni0E17
+/uni0E18 /uni0E19 /uni0E1A /uni0E1B
+/uni0E1C /uni0E1D /uni0E1E /uni0E1F
+% 0xC0
+/uni0E20 /uni0E21 /uni0E22 /uni0E23
+/uni0E24 /uni0E25 /uni0E26 /uni0E27
+/uni0E28 /uni0E29 /uni0E2A /uni0E2B
+/uni0E2C /uni0E2D /uni0E2E /uni0E2F
+% 0xD0
+/uni0E30 /uni0E31 /uni0E32 /uni0E33
+/uni0E34 /uni0E35 /uni0E36 /uni0E37
+/uni0E38 /uni0E39 /uni0E3A /uni0E4D.high
+/zerowidthspace /dottedcircle /uni0E47.high /uni0E3F
+% 0xE0
+/uni0E40 /uni0E41 /uni0E42 /uni0E43
+/uni0E44 /uni0E45 /uni0E46 /uni0E47
+/uni0E48.low /uni0E49.low /uni0E4A.low /uni0E4B.low
+/uni0E4C.low /uni0E4D /uni0E4E /uni0E4F
+% 0xF0
+/uni0E50 /uni0E51 /uni0E52 /uni0E53
+/uni0E54 /uni0E55 /uni0E56 /uni0E57
+/uni0E58 /uni0E59 /uni0E5A /uni0E5B
+/uni0E38.low /uni0E39.low /uni0E3A.low /.notdef
+] def
diff --git a/Master/texmf-dist/source/fonts/fonts-tlwg/latex/thailigs-osf.enc b/Master/texmf-dist/source/fonts/fonts-tlwg/latex/thailigs-osf.enc
new file mode 100644
index 00000000000..1e7faf2d181
--- /dev/null
+++ b/Master/texmf-dist/source/fonts/fonts-tlwg/latex/thailigs-osf.enc
@@ -0,0 +1,427 @@
+% thailigs-osf.enc
+% by Poonlap Veerathanabutr <poonlap@linux.thai.net>
+% 2002-12-30
+% 2021-06-12 Theppitak Karoonboonyanan <theppitak@gmail.com>
+% * Create old style figure re-encoding version.
+% 2003-09-15 Chanop Silpa-Anan <chanop@debian.org>
+% * Use new unicode variant name.
+% 2011-12-26 Theppitak Karoonboonyanan <thep@linux.thai.net>
+% * Support more common Latin characters with native font glyphs.
+%
+% This is LaTeX LTH (Locale Thai) encoding for unicode encoded fonts
+%
+%ligature for making LEFT vowels, tone marks and Nikhahit
+%PoPla left vowel
+%LIGKERN uni0E1B uni0E31 |=:> uni0E31.left ;
+%LIGKERN uni0E1B uni0E34 |=:> uni0E34.left ;
+%LIGKERN uni0E1B uni0E35 |=:> uni0E35.left ;
+%LIGKERN uni0E1B uni0E36 |=:> uni0E36.left ;
+%LIGKERN uni0E1B uni0E37 |=:> uni0E37.left ;
+%LIGKERN uni0E1B uni0E38 |=:> uni0E38.left ;
+%LIGKERN uni0E1B uni0E39 |=:> uni0E39.left ;
+%LIGKERN uni0E1B uni0E3A |=:> uni0E3A.left ;
+%LIGKERN uni0E1B uni0E47 |=:> uni0E47.left ;
+%Popla left tone marks, thanthakhat, nikhahit
+%LIGKERN uni0E1B uni0E48.low |=:> uni0E48.low_left ;
+%LIGKERN uni0E1B uni0E49.low |=:> uni0E49.low_left ;
+%LIGKERN uni0E1B uni0E4A.low |=:> uni0E4A.low_left ;
+%LIGKERN uni0E1B uni0E4B.low |=:> uni0E4B.low_left ;
+%LIGKERN uni0E1B uni0E4C.low |=:> uni0E4C.low_left ;
+%LIGKERN uni0E1B uni0E4D |=:> uni0E4D.left ;
+%Popla sara-am
+%LIGKERN uni0E1B uni0E33 |=:|> uni0E4D.left ;
+%LIGKERN uni0E4D.left uni0E33 |=:> uni0E32 ;
+
+%FoFa left vowel
+%LIGKERN uni0E1D uni0E31 |=:> uni0E31.left ;
+%LIGKERN uni0E1D uni0E34 |=:> uni0E34.left ;
+%LIGKERN uni0E1D uni0E35 |=:> uni0E35.left ;
+%LIGKERN uni0E1D uni0E36 |=:> uni0E36.left ;
+%LIGKERN uni0E1D uni0E37 |=:> uni0E37.left ;
+%LIGKERN uni0E1D uni0E38 |=:> uni0E38.left ;
+%LIGKERN uni0E1D uni0E39 |=:> uni0E39.left ;
+%LIGKERN uni0E1D uni0E3A |=:> uni0E3A.left ;
+%LIGKERN uni0E1D uni0E47 |=:> uni0E47.left ;
+%FoFa left tone marks, thanthakhat, nikhahit
+%LIGKERN uni0E1D uni0E48.low |=:> uni0E48.low_left ;
+%LIGKERN uni0E1D uni0E49.low |=:> uni0E49.low_left ;
+%LIGKERN uni0E1D uni0E4A.low |=:> uni0E4A.low_left ;
+%LIGKERN uni0E1D uni0E4B.low |=:> uni0E4B.low_left ;
+%LIGKERN uni0E1D uni0E4C.low |=:> uni0E4C.low_left ;
+%LIGKERN uni0E1D uni0E4D |=:> uni0E4D.left ;
+%FoFa sara-am
+%LIGKERN uni0E1D uni0E33 |=:|> uni0E4D.left ;
+%LIGKERN uni0E4D.left uni0E33 |=:> uni0E32 ;
+
+%FoFan left vowel
+%LIGKERN uni0E1F uni0E31 |=:> uni0E31.left ;
+%LIGKERN uni0E1F uni0E34 |=:> uni0E34.left ;
+%LIGKERN uni0E1F uni0E35 |=:> uni0E35.left ;
+%LIGKERN uni0E1F uni0E36 |=:> uni0E36.left ;
+%LIGKERN uni0E1F uni0E37 |=:> uni0E37.left ;
+%LIGKERN uni0E1F uni0E38 |=:> uni0E38.left ;
+%LIGKERN uni0E1F uni0E39 |=:> uni0E39.left ;
+%LIGKERN uni0E1F uni0E3A |=:> uni0E3A.left ;
+%LIGKERN uni0E1F uni0E47 |=:> uni0E47.left ;
+%FoFan left tone marks, thanthakhat, nikhahit
+%LIGKERN uni0E1F uni0E48.low |=:> uni0E48.low_left ;
+%LIGKERN uni0E1F uni0E49.low |=:> uni0E49.low_left ;
+%LIGKERN uni0E1F uni0E4A.low |=:> uni0E4A.low_left ;
+%LIGKERN uni0E1F uni0E4B.low |=:> uni0E4B.low_left ;
+%LIGKERN uni0E1F uni0E4C.low |=:> uni0E4C.low_left ;
+%LIGKERN uni0E1F uni0E4D |=:> uni0E4D.left ;
+%FoFan sara-am
+%LIGKERN uni0E1F uni0E33 |=:|> uni0E4D.left ;
+%LIGKERN uni0E4D.left uni0E33 |=:> uni0E32 ;
+
+%LoChula left vowel
+%LIGKERN uni0E2C uni0E31 |=:> uni0E31.left ;
+%LIGKERN uni0E2C uni0E34 |=:> uni0E34.left ;
+%LIGKERN uni0E2C uni0E35 |=:> uni0E35.left ;
+%LIGKERN uni0E2C uni0E36 |=:> uni0E36.left ;
+%LIGKERN uni0E2C uni0E37 |=:> uni0E37.left ;
+%LIGKERN uni0E2C uni0E38 |=:> uni0E38.left ;
+%LIGKERN uni0E2C uni0E39 |=:> uni0E39.left ;
+%LIGKERN uni0E2C uni0E3A |=:> uni0E3A.left ;
+%LIGKERN uni0E2C uni0E47 |=:> uni0E47.left ;
+%LoChula left tone marks, thanthakhat, nikhahit
+%LIGKERN uni0E2C uni0E48.low |=:> uni0E48.low_left ;
+%LIGKERN uni0E2C uni0E49.low |=:> uni0E49.low_left ;
+%LIGKERN uni0E2C uni0E4A.low |=:> uni0E4A.low_left ;
+%LIGKERN uni0E2C uni0E4B.low |=:> uni0E4B.low_left ;
+%LIGKERN uni0E2C uni0E4C.low |=:> uni0E4C.low_left ;
+%LIGKERN uni0E2C uni0E4D |=:> uni0E4D.left ;
+%LoChula sara-am
+%LIGKERN uni0E2C uni0E33 |=:|> uni0E4D.left ;
+%LIGKERN uni0E4D.left uni0E33 |=:> uni0E32 ;
+
+%ligature for making left SaraAm with HiLeft tone marks
+%LIGKERN uni0E48.low_left uni0E33 =:| uni0E48.left ;
+%LIGKERN uni0E48.left uni0E33 |=:|> uni0E4D.left ;
+%LIGKERN uni0E49.low_left uni0E33 =:| uni0E49.left ;
+%LIGKERN uni0E49.left uni0E33 |=:|> uni0E4D.left ;
+%LIGKERN uni0E4A.low_left uni0E33 =:| uni0E4A.left ;
+%LIGKERN uni0E4A.left uni0E33 |=:|> uni0E4D.left ;
+%LIGKERN uni0E4B.low_left uni0E33 =:| uni0E4B.left ;
+%LIGKERN uni0E4B.left uni0E33 |=:|> uni0E4D.left ;
+
+%LIGKERN uni0E48.low uni0E33 =:| uni0E48 ;
+%LIGKERN uni0E49.low uni0E33 =:| uni0E49 ;
+%LIGKERN uni0E4A.low uni0E33 =:| uni0E4A ;
+%LIGKERN uni0E4B.low uni0E33 =:| uni0E4B ;
+
+%ligature for making HI tone marks
+%LIGKERN uni0E31 uni0E48.low |=:> uni0E48 ;
+%LIGKERN uni0E31 uni0E49.low |=:> uni0E49 ;
+%LIGKERN uni0E31 uni0E4A.low |=:> uni0E4A ;
+%LIGKERN uni0E31 uni0E4B.low |=:> uni0E4B ;
+%LIGKERN uni0E34 uni0E48.low |=:> uni0E48 ;
+%LIGKERN uni0E34 uni0E49.low |=:> uni0E49 ;
+%LIGKERN uni0E34 uni0E4A.low |=:> uni0E4A ;
+%LIGKERN uni0E34 uni0E4B.low |=:> uni0E4B ;
+%LIGKERN uni0E34 uni0E4C.low |=:> uni0E4C ;
+%LIGKERN uni0E35 uni0E48.low |=:> uni0E48 ;
+%LIGKERN uni0E35 uni0E49.low |=:> uni0E49 ;
+%LIGKERN uni0E35 uni0E4A.low |=:> uni0E4A ;
+%LIGKERN uni0E35 uni0E4B.low |=:> uni0E4B ;
+%LIGKERN uni0E35 uni0E4C.low |=:> uni0E4C ;
+%LIGKERN uni0E36 uni0E48.low |=:> uni0E48 ;
+%LIGKERN uni0E36 uni0E49.low |=:> uni0E49 ;
+%LIGKERN uni0E36 uni0E4A.low |=:> uni0E4A ;
+%LIGKERN uni0E36 uni0E4B.low |=:> uni0E4B ;
+%LIGKERN uni0E36 uni0E4C.low |=:> uni0E4C ;
+%LIGKERN uni0E37 uni0E48.low |=:> uni0E48 ;
+%LIGKERN uni0E37 uni0E49.low |=:> uni0E49 ;
+%LIGKERN uni0E37 uni0E4A.low |=:> uni0E4A ;
+%LIGKERN uni0E37 uni0E4B.low |=:> uni0E4B ;
+%LIGKERN uni0E37 uni0E4C.low |=:> uni0E4C ;
+
+%[ethnic languages] HI tone marks over upper marks
+%LIGKERN uni0E47 uni0E48.low |=:> uni0E48 ;
+%LIGKERN uni0E47 uni0E49.low |=:> uni0E49 ;
+%LIGKERN uni0E47 uni0E4A.low |=:> uni0E4A ;
+%LIGKERN uni0E47 uni0E4B.low |=:> uni0E4B ;
+%LIGKERN uni0E47 uni0E4C.low |=:> uni0E4C ;
+%LIGKERN uni0E48.low uni0E48.low |=:> uni0E48 ;
+%LIGKERN uni0E48.low uni0E49.low |=:> uni0E49 ;
+%LIGKERN uni0E48.low uni0E4A.low |=:> uni0E4A ;
+%LIGKERN uni0E48.low uni0E4B.low |=:> uni0E4B ;
+%LIGKERN uni0E48.low uni0E4C.low |=:> uni0E4C ;
+%LIGKERN uni0E49.low uni0E48.low |=:> uni0E48 ;
+%LIGKERN uni0E49.low uni0E49.low |=:> uni0E49 ;
+%LIGKERN uni0E49.low uni0E4A.low |=:> uni0E4A ;
+%LIGKERN uni0E49.low uni0E4B.low |=:> uni0E4B ;
+%LIGKERN uni0E49.low uni0E4C.low |=:> uni0E4C ;
+%LIGKERN uni0E4A.low uni0E48.low |=:> uni0E48 ;
+%LIGKERN uni0E4A.low uni0E49.low |=:> uni0E49 ;
+%LIGKERN uni0E4A.low uni0E4A.low |=:> uni0E4A ;
+%LIGKERN uni0E4A.low uni0E4B.low |=:> uni0E4B ;
+%LIGKERN uni0E4A.low uni0E4C.low |=:> uni0E4C ;
+%LIGKERN uni0E4B.low uni0E48.low |=:> uni0E48 ;
+%LIGKERN uni0E4B.low uni0E49.low |=:> uni0E49 ;
+%LIGKERN uni0E4B.low uni0E4A.low |=:> uni0E4A ;
+%LIGKERN uni0E4B.low uni0E4B.low |=:> uni0E4B ;
+%LIGKERN uni0E4B.low uni0E4C.low |=:> uni0E4C ;
+%LIGKERN uni0E4C.low uni0E48.low |=:> uni0E48 ;
+%LIGKERN uni0E4C.low uni0E49.low |=:> uni0E49 ;
+%LIGKERN uni0E4C.low uni0E4A.low |=:> uni0E4A ;
+%LIGKERN uni0E4C.low uni0E4B.low |=:> uni0E4B ;
+%LIGKERN uni0E4C.low uni0E4C.low |=:> uni0E4C ;
+
+%ligature for making LEFT HI tone marks and thantakhat
+%LIGKERN uni0E31.left uni0E48.low |=:> uni0E48.left ;
+%LIGKERN uni0E34.left uni0E48.low |=:> uni0E48.left ;
+%LIGKERN uni0E35.left uni0E48.low |=:> uni0E48.left ;
+%LIGKERN uni0E36.left uni0E48.low |=:> uni0E48.left ;
+%LIGKERN uni0E37.left uni0E48.low |=:> uni0E48.left ;
+
+%LIGKERN uni0E31.left uni0E49.low |=:> uni0E49.left ;
+%LIGKERN uni0E34.left uni0E49.low |=:> uni0E49.left ;
+%LIGKERN uni0E35.left uni0E49.low |=:> uni0E49.left ;
+%LIGKERN uni0E36.left uni0E49.low |=:> uni0E49.left ;
+%LIGKERN uni0E37.left uni0E49.low |=:> uni0E49.left ;
+
+%LIGKERN uni0E31.left uni0E4A.low |=:> uni0E4A.left ;
+%LIGKERN uni0E34.left uni0E4A.low |=:> uni0E4A.left ;
+%LIGKERN uni0E35.left uni0E4A.low |=:> uni0E4A.left ;
+%LIGKERN uni0E36.left uni0E4A.low |=:> uni0E4A.left ;
+%LIGKERN uni0E37.left uni0E4A.low |=:> uni0E4A.left ;
+
+%LIGKERN uni0E31.left uni0E4B.low |=:> uni0E4B.left ;
+%LIGKERN uni0E34.left uni0E4B.low |=:> uni0E4B.left ;
+%LIGKERN uni0E35.left uni0E4B.low |=:> uni0E4B.left ;
+%LIGKERN uni0E36.left uni0E4B.low |=:> uni0E4B.left ;
+%LIGKERN uni0E37.left uni0E4B.low |=:> uni0E4B.left ;
+
+%LIGKERN uni0E34.left uni0E4C.low |=:> uni0E4C.left ;
+
+%[ethnic languages] LEFT HI tone marks over upper marks
+%LIGKERN uni0E47.left uni0E48.low |=:> uni0E48.left ;
+%LIGKERN uni0E47.left uni0E49.low |=:> uni0E49.left ;
+%LIGKERN uni0E47.left uni0E4A.low |=:> uni0E4A.left ;
+%LIGKERN uni0E47.left uni0E4B.low |=:> uni0E4B.left ;
+%LIGKERN uni0E47.left uni0E4C.low |=:> uni0E4C.left ;
+%LIGKERN uni0E48.low_left uni0E48.low |=:> uni0E48.left ;
+%LIGKERN uni0E48.low_left uni0E49.low |=:> uni0E49.left ;
+%LIGKERN uni0E48.low_left uni0E4A.low |=:> uni0E4A.left ;
+%LIGKERN uni0E48.low_left uni0E4B.low |=:> uni0E4B.left ;
+%LIGKERN uni0E48.low_left uni0E4C.low |=:> uni0E4C.left ;
+%LIGKERN uni0E49.low_left uni0E48.low |=:> uni0E48.left ;
+%LIGKERN uni0E49.low_left uni0E49.low |=:> uni0E49.left ;
+%LIGKERN uni0E49.low_left uni0E4A.low |=:> uni0E4A.left ;
+%LIGKERN uni0E49.low_left uni0E4B.low |=:> uni0E4B.left ;
+%LIGKERN uni0E49.low_left uni0E4C.low |=:> uni0E4C.left ;
+%LIGKERN uni0E4A.low_left uni0E48.low |=:> uni0E48.left ;
+%LIGKERN uni0E4A.low_left uni0E49.low |=:> uni0E49.left ;
+%LIGKERN uni0E4A.low_left uni0E4A.low |=:> uni0E4A.left ;
+%LIGKERN uni0E4A.low_left uni0E4B.low |=:> uni0E4B.left ;
+%LIGKERN uni0E4A.low_left uni0E4C.low |=:> uni0E4C.left ;
+%LIGKERN uni0E4B.low_left uni0E48.low |=:> uni0E48.left ;
+%LIGKERN uni0E4B.low_left uni0E49.low |=:> uni0E49.left ;
+%LIGKERN uni0E4B.low_left uni0E4A.low |=:> uni0E4A.left ;
+%LIGKERN uni0E4B.low_left uni0E4B.low |=:> uni0E4B.left ;
+%LIGKERN uni0E4B.low_left uni0E4C.low |=:> uni0E4C.left ;
+%LIGKERN uni0E4C.low_left uni0E48.low |=:> uni0E48.left ;
+%LIGKERN uni0E4C.low_left uni0E49.low |=:> uni0E49.left ;
+%LIGKERN uni0E4C.low_left uni0E4A.low |=:> uni0E4A.left ;
+%LIGKERN uni0E4C.low_left uni0E4B.low |=:> uni0E4B.left ;
+%LIGKERN uni0E4C.low_left uni0E4C.low |=:> uni0E4C.left ;
+
+%ligature for making LEFT LOW tone marks and thantakhat
+%LIGKERN uni0E38.left uni0E48.low |=:> uni0E48.low_left ;
+%LIGKERN uni0E39.left uni0E48.low |=:> uni0E48.low_left ;
+%LIGKERN uni0E3A.left uni0E48.low |=:> uni0E48.low_left ;
+
+%LIGKERN uni0E38.left uni0E49.low |=:> uni0E49.low_left ;
+%LIGKERN uni0E39.left uni0E49.low |=:> uni0E49.low_left ;
+%LIGKERN uni0E3A.left uni0E49.low |=:> uni0E49.low_left ;
+
+%LIGKERN uni0E38.left uni0E4A.low |=:> uni0E4A.low_left ;
+%LIGKERN uni0E39.left uni0E4A.low |=:> uni0E4A.low_left ;
+%LIGKERN uni0E3A.left uni0E4A.low |=:> uni0E4A.low_left ;
+
+%LIGKERN uni0E38.left uni0E4B.low |=:> uni0E4B.low_left ;
+%LIGKERN uni0E39.left uni0E4B.low |=:> uni0E4B.low_left ;
+%LIGKERN uni0E3A.left uni0E4B.low |=:> uni0E4B.low_left ;
+
+%LIGKERN uni0E38.left uni0E4C.low |=:> uni0E4C.low_left ;
+%LIGKERN uni0E39.left uni0E4C.low |=:> uni0E4C.low_left ;
+%LIGKERN uni0E3A.left uni0E4C.low |=:> uni0E4C.low_left ;
+
+%[ethnic languages] LEFT upper vowel after Phinthu
+%LIGKERN uni0E38.left uni0E31 |=:> uni0E31.left ;
+%LIGKERN uni0E39.left uni0E31 |=:> uni0E31.left ;
+%LIGKERN uni0E3A.left uni0E31 |=:> uni0E31.left ;
+
+%LIGKERN uni0E38.left uni0E34 |=:> uni0E34.left ;
+%LIGKERN uni0E39.left uni0E34 |=:> uni0E34.left ;
+%LIGKERN uni0E3A.left uni0E34 |=:> uni0E34.left ;
+
+%LIGKERN uni0E38.left uni0E35 |=:> uni0E35.left ;
+%LIGKERN uni0E39.left uni0E35 |=:> uni0E35.left ;
+%LIGKERN uni0E3A.left uni0E35 |=:> uni0E35.left ;
+
+%LIGKERN uni0E38.left uni0E36 |=:> uni0E36.left ;
+%LIGKERN uni0E39.left uni0E36 |=:> uni0E36.left ;
+%LIGKERN uni0E3A.left uni0E36 |=:> uni0E36.left ;
+
+%LIGKERN uni0E38.left uni0E37 |=:> uni0E37.left ;
+%LIGKERN uni0E39.left uni0E37 |=:> uni0E37.left ;
+%LIGKERN uni0E3A.left uni0E37 |=:> uni0E37.left ;
+
+%ligature for making HI MaiTaikhu and Nikhahit
+%LIGKERN uni0E31 uni0E47 |=:> uni0E47.high ;
+%LIGKERN uni0E34 uni0E47 |=:> uni0E47.high ;
+%LIGKERN uni0E35 uni0E47 |=:> uni0E47.high ;
+%LIGKERN uni0E36 uni0E47 |=:> uni0E47.high ;
+%LIGKERN uni0E37 uni0E47 |=:> uni0E47.high ;
+%LIGKERN uni0E31.left uni0E47 |=:> uni0E47.high ;
+%LIGKERN uni0E34.left uni0E47 |=:> uni0E47.high ;
+%LIGKERN uni0E35.left uni0E47 |=:> uni0E47.high ;
+%LIGKERN uni0E36.left uni0E47 |=:> uni0E47.high ;
+%LIGKERN uni0E37.left uni0E47 |=:> uni0E47.high ;
+%LIGKERN uni0E31 uni0E4D |=:> uni0E4D.high ;
+%LIGKERN uni0E34 uni0E4D |=:> uni0E4D.high ;
+%LIGKERN uni0E35 uni0E4D |=:> uni0E4D.high ;
+%LIGKERN uni0E36 uni0E4D |=:> uni0E4D.high ;
+%LIGKERN uni0E37 uni0E4D |=:> uni0E4D.high ;
+%LIGKERN uni0E31.left uni0E4D |=:> uni0E4D.high ;
+%LIGKERN uni0E34.left uni0E4D |=:> uni0E4D.high ;
+%LIGKERN uni0E35.left uni0E4D |=:> uni0E4D.high ;
+%LIGKERN uni0E36.left uni0E4D |=:> uni0E4D.high ;
+%LIGKERN uni0E37.left uni0E4D |=:> uni0E4D.high ;
+
+%ligature for making LOW SaraU SaraUu and Phinthu
+%LIGKERN uni0E0E uni0E38 |=:> uni0E38.low ;
+%LIGKERN uni0E0E uni0E39 |=:> uni0E39.low ;
+%LIGKERN uni0E0E uni0E3A |=:> uni0E3A.low ;
+%LIGKERN uni0E0F uni0E38 |=:> uni0E38.low ;
+%LIGKERN uni0E0F uni0E39 |=:> uni0E39.low ;
+%LIGKERN uni0E0F uni0E3A |=:> uni0E3A.low ;
+
+%[ethnic languages] LOW SaraU SaraUu and Phinthu below another
+%LIGKERN uni0E38 uni0E38 |=:> uni0E38.low ;
+%LIGKERN uni0E39 uni0E38 |=:> uni0E38.low ;
+%LIGKERN uni0E3A uni0E38 |=:> uni0E38.low ;
+%LIGKERN uni0E38 uni0E39 |=:> uni0E39.low ;
+%LIGKERN uni0E39 uni0E39 |=:> uni0E39.low ;
+%LIGKERN uni0E3A uni0E39 |=:> uni0E39.low ;
+%LIGKERN uni0E38 uni0E3A |=:> uni0E3A.low ;
+%LIGKERN uni0E39 uni0E3A |=:> uni0E3A.low ;
+%LIGKERN uni0E3A uni0E3A |=:> uni0E3A.low ;
+
+%ligature for making YoYingDescless and ThoThanDescless
+%LIGKERN uni0E0D uni0E38 =:|> uni0E0D.descless ;
+%LIGKERN uni0E0D uni0E39 =:|> uni0E0D.descless ;
+%LIGKERN uni0E0D uni0E3A =:|> uni0E0D.descless ;
+%LIGKERN uni0E10 uni0E38 =:|> uni0E10.descless ;
+%LIGKERN uni0E10 uni0E39 =:|> uni0E10.descless ;
+%LIGKERN uni0E10 uni0E3A =:|> uni0E10.descless ;
+
+%ligature for making Lakkhangyao
+%LIGKERN uni0E24 uni0E32 |=:> uni0E45 ;
+%LIGKERN uni0E26 uni0E32 |=:> uni0E45 ;
+
+%default ligature and kern set normally built-in in afm2tfm
+%LIGKERN question quoteleft =: questiondown ; exclam quoteleft =: exclamdown ;
+%LIGKERN hyphen hyphen =: endash ; endash hyphen =: emdash ;
+%LIGKERN quoteleft quoteleft =: quotedblleft ;
+%LIGKERN quoteright quoteright =: quotedblright ;
+%LIGKERN space {} * ; * {} space ;
+%LIGKERN zerooldstyle {} * ; * {} zerooldstyle ;
+%LIGKERN oneoldstyle {} * ; * {} oneoldstyle ;
+%LIGKERN twooldstyle {} * ; * {} twooldstyle ;
+%LIGLERN threeoldstyle {} * ; * {} threeoldstyle ;
+%LIGKERN fouroldstyle {} * ; * {} fouroldstyle ;
+%LIGLERN fiveoldstyle {} * ; * {} fiveoldstyle ;
+%LIGKERN sixoldstyle {} * ; * {} sixoldstyle ;
+%LIGKERN sevenoldstyle {} * ; * {} sevenoldstyle ;
+%LIGKERN eightoldstyle {} * ; * {} eightoldstyle ;
+%LIGKERN nineoldstyle {} * ; * {} nineoldstyle ;
+%LIGKERN comma comma =: quotedblbase ; less less =: guillemotleft ;
+%LIGKERN greater greater =: guillemotright ;
+%LIGKERN f f =: ff ; f i =: fi ; f l =: fl ;
+%LIGKERN ff i =: ffi ; ff l =: ffl ;
+
+/LTHEncoding [
+% 0x00
+/.notdef /.notdef /.notdef /.notdef
+/dagger /daggerdbl /section /paragraph
+/copyright /registered /trademark /germandbls
+/ae /AE /oe /OE
+% 0x10
+/exclamdown /questiondown /quotedblbase /guillemotleft
+/guillemotright /uni0E38.left /uni0E39.left /uni0E3A.left
+/perthousand /dotlessi /dotlessj /ff
+/fi /fl /ffi /ffl
+% 0x20
+/space /exclam /quotedbl /numbersign
+/dollar /percent /ampersand /quoteright
+/parenleft /parenright /asterisk /plus
+/comma /hyphen /period /slash
+% 0x30
+/zerooldstyle /oneoldstyle /twooldstyle /threeoldstyle
+/fouroldstyle /fiveoldstyle /sixoldstyle /sevenoldstyle
+/eightoldstyle /nineoldstyle /colon /semicolon
+/less /equal /greater /question
+% 0x40
+/at /A /B /C
+/D /E /F /G
+/H /I /J /K
+/L /M /N /O
+% 0x50
+/P /Q /R /S
+/T /U /V /W
+/X /Y /Z /bracketleft
+/backslash /bracketright /asciicircum /underscore
+% 0x60
+/quoteleft /a /b /c
+/d /e /f /g
+/h /i /j /k
+/l /m /n /o
+% 0x70
+/p /q /r /s
+/t /u /v /w
+/x /y /z /braceleft
+/bar /braceright /asciitilde /.notdef
+% 0x80
+/uni0E10.descless /uni0E34.left /uni0E35.left /uni0E36.left
+/uni0E37.left /ellipsis /uni0E48.low_left /uni0E49.low_left
+/uni0E4A.low_left /uni0E4B.low_left /uni0E4C.low_left /uni0E48
+/uni0E49 /uni0E4A /uni0E4B /uni0E4C
+% 0x90
+/uni0E0D.descless /.notdef /.notdef /quotedblleft
+/quotedblright /bullet /endash /emdash
+/uni0E31.left /uni0E4D.left /uni0E47.left /uni0E48.left
+/uni0E49.left /uni0E4A.left /uni0E4B.left /uni0E4C.left
+% 0xA0
+/nonbreakingspace /uni0E01 /uni0E02 /uni0E03
+/uni0E04 /uni0E05 /uni0E06 /uni0E07
+/uni0E08 /uni0E09 /uni0E0A /uni0E0B
+/uni0E0C /uni0E0D /uni0E0E /uni0E0F
+% 0xB0
+/uni0E10 /uni0E11 /uni0E12 /uni0E13
+/uni0E14 /uni0E15 /uni0E16 /uni0E17
+/uni0E18 /uni0E19 /uni0E1A /uni0E1B
+/uni0E1C /uni0E1D /uni0E1E /uni0E1F
+% 0xC0
+/uni0E20 /uni0E21 /uni0E22 /uni0E23
+/uni0E24 /uni0E25 /uni0E26 /uni0E27
+/uni0E28 /uni0E29 /uni0E2A /uni0E2B
+/uni0E2C /uni0E2D /uni0E2E /uni0E2F
+% 0xD0
+/uni0E30 /uni0E31 /uni0E32 /uni0E33
+/uni0E34 /uni0E35 /uni0E36 /uni0E37
+/uni0E38 /uni0E39 /uni0E3A /uni0E4D.high
+/zerowidthspace /dottedcircle /uni0E47.high /uni0E3F
+% 0xE0
+/uni0E40 /uni0E41 /uni0E42 /uni0E43
+/uni0E44 /uni0E45 /uni0E46 /uni0E47
+/uni0E48.low /uni0E49.low /uni0E4A.low /uni0E4B.low
+/uni0E4C.low /uni0E4D /uni0E4E /uni0E4F
+% 0xF0
+/uni0E50 /uni0E51 /uni0E52 /uni0E53
+/uni0E54 /uni0E55 /uni0E56 /uni0E57
+/uni0E58 /uni0E59 /uni0E5A /uni0E5B
+/uni0E38.low /uni0E39.low /uni0E3A.low /.notdef
+] def
diff --git a/Master/texmf-dist/source/fonts/fonts-tlwg/latex/thailigs-sc.enc b/Master/texmf-dist/source/fonts/fonts-tlwg/latex/thailigs-sc.enc
new file mode 100644
index 00000000000..fa871080405
--- /dev/null
+++ b/Master/texmf-dist/source/fonts/fonts-tlwg/latex/thailigs-sc.enc
@@ -0,0 +1,420 @@
+% thailigs-sc.enc
+% by Poonlap Veerathanabutr <poonlap@linux.thai.net>
+% 2002-12-30
+% 2021-06-08 Theppitak Karoonboonyanan <theppitak@gmail.com>
+% * Create small caps re-encoding version.
+% 2003-09-15 Chanop Silpa-Anan <chanop@debian.org>
+% * Use new unicode variant name.
+% 2011-12-26 Theppitak Karoonboonyanan <thep@linux.thai.net>
+% * Support more common Latin characters with native font glyphs.
+%
+% This is LaTeX LTH (Locale Thai) encoding for unicode encoded fonts
+%
+%ligature for making LEFT vowels, tone marks and Nikhahit
+%PoPla left vowel
+%LIGKERN uni0E1B uni0E31 |=:> uni0E31.left ;
+%LIGKERN uni0E1B uni0E34 |=:> uni0E34.left ;
+%LIGKERN uni0E1B uni0E35 |=:> uni0E35.left ;
+%LIGKERN uni0E1B uni0E36 |=:> uni0E36.left ;
+%LIGKERN uni0E1B uni0E37 |=:> uni0E37.left ;
+%LIGKERN uni0E1B uni0E38 |=:> uni0E38.left ;
+%LIGKERN uni0E1B uni0E39 |=:> uni0E39.left ;
+%LIGKERN uni0E1B uni0E3A |=:> uni0E3A.left ;
+%LIGKERN uni0E1B uni0E47 |=:> uni0E47.left ;
+%Popla left tone marks, thanthakhat, nikhahit
+%LIGKERN uni0E1B uni0E48.low |=:> uni0E48.low_left ;
+%LIGKERN uni0E1B uni0E49.low |=:> uni0E49.low_left ;
+%LIGKERN uni0E1B uni0E4A.low |=:> uni0E4A.low_left ;
+%LIGKERN uni0E1B uni0E4B.low |=:> uni0E4B.low_left ;
+%LIGKERN uni0E1B uni0E4C.low |=:> uni0E4C.low_left ;
+%LIGKERN uni0E1B uni0E4D |=:> uni0E4D.left ;
+%Popla sara-am
+%LIGKERN uni0E1B uni0E33 |=:|> uni0E4D.left ;
+%LIGKERN uni0E4D.left uni0E33 |=:> uni0E32 ;
+
+%FoFa left vowel
+%LIGKERN uni0E1D uni0E31 |=:> uni0E31.left ;
+%LIGKERN uni0E1D uni0E34 |=:> uni0E34.left ;
+%LIGKERN uni0E1D uni0E35 |=:> uni0E35.left ;
+%LIGKERN uni0E1D uni0E36 |=:> uni0E36.left ;
+%LIGKERN uni0E1D uni0E37 |=:> uni0E37.left ;
+%LIGKERN uni0E1D uni0E38 |=:> uni0E38.left ;
+%LIGKERN uni0E1D uni0E39 |=:> uni0E39.left ;
+%LIGKERN uni0E1D uni0E3A |=:> uni0E3A.left ;
+%LIGKERN uni0E1D uni0E47 |=:> uni0E47.left ;
+%FoFa left tone marks, thanthakhat, nikhahit
+%LIGKERN uni0E1D uni0E48.low |=:> uni0E48.low_left ;
+%LIGKERN uni0E1D uni0E49.low |=:> uni0E49.low_left ;
+%LIGKERN uni0E1D uni0E4A.low |=:> uni0E4A.low_left ;
+%LIGKERN uni0E1D uni0E4B.low |=:> uni0E4B.low_left ;
+%LIGKERN uni0E1D uni0E4C.low |=:> uni0E4C.low_left ;
+%LIGKERN uni0E1D uni0E4D |=:> uni0E4D.left ;
+%FoFa sara-am
+%LIGKERN uni0E1D uni0E33 |=:|> uni0E4D.left ;
+%LIGKERN uni0E4D.left uni0E33 |=:> uni0E32 ;
+
+%FoFan left vowel
+%LIGKERN uni0E1F uni0E31 |=:> uni0E31.left ;
+%LIGKERN uni0E1F uni0E34 |=:> uni0E34.left ;
+%LIGKERN uni0E1F uni0E35 |=:> uni0E35.left ;
+%LIGKERN uni0E1F uni0E36 |=:> uni0E36.left ;
+%LIGKERN uni0E1F uni0E37 |=:> uni0E37.left ;
+%LIGKERN uni0E1F uni0E38 |=:> uni0E38.left ;
+%LIGKERN uni0E1F uni0E39 |=:> uni0E39.left ;
+%LIGKERN uni0E1F uni0E3A |=:> uni0E3A.left ;
+%LIGKERN uni0E1F uni0E47 |=:> uni0E47.left ;
+%FoFan left tone marks, thanthakhat, nikhahit
+%LIGKERN uni0E1F uni0E48.low |=:> uni0E48.low_left ;
+%LIGKERN uni0E1F uni0E49.low |=:> uni0E49.low_left ;
+%LIGKERN uni0E1F uni0E4A.low |=:> uni0E4A.low_left ;
+%LIGKERN uni0E1F uni0E4B.low |=:> uni0E4B.low_left ;
+%LIGKERN uni0E1F uni0E4C.low |=:> uni0E4C.low_left ;
+%LIGKERN uni0E1F uni0E4D |=:> uni0E4D.left ;
+%FoFan sara-am
+%LIGKERN uni0E1F uni0E33 |=:|> uni0E4D.left ;
+%LIGKERN uni0E4D.left uni0E33 |=:> uni0E32 ;
+
+%LoChula left vowel
+%LIGKERN uni0E2C uni0E31 |=:> uni0E31.left ;
+%LIGKERN uni0E2C uni0E34 |=:> uni0E34.left ;
+%LIGKERN uni0E2C uni0E35 |=:> uni0E35.left ;
+%LIGKERN uni0E2C uni0E36 |=:> uni0E36.left ;
+%LIGKERN uni0E2C uni0E37 |=:> uni0E37.left ;
+%LIGKERN uni0E2C uni0E38 |=:> uni0E38.left ;
+%LIGKERN uni0E2C uni0E39 |=:> uni0E39.left ;
+%LIGKERN uni0E2C uni0E3A |=:> uni0E3A.left ;
+%LIGKERN uni0E2C uni0E47 |=:> uni0E47.left ;
+%LoChula left tone marks, thanthakhat, nikhahit
+%LIGKERN uni0E2C uni0E48.low |=:> uni0E48.low_left ;
+%LIGKERN uni0E2C uni0E49.low |=:> uni0E49.low_left ;
+%LIGKERN uni0E2C uni0E4A.low |=:> uni0E4A.low_left ;
+%LIGKERN uni0E2C uni0E4B.low |=:> uni0E4B.low_left ;
+%LIGKERN uni0E2C uni0E4C.low |=:> uni0E4C.low_left ;
+%LIGKERN uni0E2C uni0E4D |=:> uni0E4D.left ;
+%LoChula sara-am
+%LIGKERN uni0E2C uni0E33 |=:|> uni0E4D.left ;
+%LIGKERN uni0E4D.left uni0E33 |=:> uni0E32 ;
+
+%ligature for making left SaraAm with HiLeft tone marks
+%LIGKERN uni0E48.low_left uni0E33 =:| uni0E48.left ;
+%LIGKERN uni0E48.left uni0E33 |=:|> uni0E4D.left ;
+%LIGKERN uni0E49.low_left uni0E33 =:| uni0E49.left ;
+%LIGKERN uni0E49.left uni0E33 |=:|> uni0E4D.left ;
+%LIGKERN uni0E4A.low_left uni0E33 =:| uni0E4A.left ;
+%LIGKERN uni0E4A.left uni0E33 |=:|> uni0E4D.left ;
+%LIGKERN uni0E4B.low_left uni0E33 =:| uni0E4B.left ;
+%LIGKERN uni0E4B.left uni0E33 |=:|> uni0E4D.left ;
+
+%LIGKERN uni0E48.low uni0E33 =:| uni0E48 ;
+%LIGKERN uni0E49.low uni0E33 =:| uni0E49 ;
+%LIGKERN uni0E4A.low uni0E33 =:| uni0E4A ;
+%LIGKERN uni0E4B.low uni0E33 =:| uni0E4B ;
+
+%ligature for making HI tone marks
+%LIGKERN uni0E31 uni0E48.low |=:> uni0E48 ;
+%LIGKERN uni0E31 uni0E49.low |=:> uni0E49 ;
+%LIGKERN uni0E31 uni0E4A.low |=:> uni0E4A ;
+%LIGKERN uni0E31 uni0E4B.low |=:> uni0E4B ;
+%LIGKERN uni0E34 uni0E48.low |=:> uni0E48 ;
+%LIGKERN uni0E34 uni0E49.low |=:> uni0E49 ;
+%LIGKERN uni0E34 uni0E4A.low |=:> uni0E4A ;
+%LIGKERN uni0E34 uni0E4B.low |=:> uni0E4B ;
+%LIGKERN uni0E34 uni0E4C.low |=:> uni0E4C ;
+%LIGKERN uni0E35 uni0E48.low |=:> uni0E48 ;
+%LIGKERN uni0E35 uni0E49.low |=:> uni0E49 ;
+%LIGKERN uni0E35 uni0E4A.low |=:> uni0E4A ;
+%LIGKERN uni0E35 uni0E4B.low |=:> uni0E4B ;
+%LIGKERN uni0E35 uni0E4C.low |=:> uni0E4C ;
+%LIGKERN uni0E36 uni0E48.low |=:> uni0E48 ;
+%LIGKERN uni0E36 uni0E49.low |=:> uni0E49 ;
+%LIGKERN uni0E36 uni0E4A.low |=:> uni0E4A ;
+%LIGKERN uni0E36 uni0E4B.low |=:> uni0E4B ;
+%LIGKERN uni0E36 uni0E4C.low |=:> uni0E4C ;
+%LIGKERN uni0E37 uni0E48.low |=:> uni0E48 ;
+%LIGKERN uni0E37 uni0E49.low |=:> uni0E49 ;
+%LIGKERN uni0E37 uni0E4A.low |=:> uni0E4A ;
+%LIGKERN uni0E37 uni0E4B.low |=:> uni0E4B ;
+%LIGKERN uni0E37 uni0E4C.low |=:> uni0E4C ;
+
+%[ethnic languages] HI tone marks over upper marks
+%LIGKERN uni0E47 uni0E48.low |=:> uni0E48 ;
+%LIGKERN uni0E47 uni0E49.low |=:> uni0E49 ;
+%LIGKERN uni0E47 uni0E4A.low |=:> uni0E4A ;
+%LIGKERN uni0E47 uni0E4B.low |=:> uni0E4B ;
+%LIGKERN uni0E47 uni0E4C.low |=:> uni0E4C ;
+%LIGKERN uni0E48.low uni0E48.low |=:> uni0E48 ;
+%LIGKERN uni0E48.low uni0E49.low |=:> uni0E49 ;
+%LIGKERN uni0E48.low uni0E4A.low |=:> uni0E4A ;
+%LIGKERN uni0E48.low uni0E4B.low |=:> uni0E4B ;
+%LIGKERN uni0E48.low uni0E4C.low |=:> uni0E4C ;
+%LIGKERN uni0E49.low uni0E48.low |=:> uni0E48 ;
+%LIGKERN uni0E49.low uni0E49.low |=:> uni0E49 ;
+%LIGKERN uni0E49.low uni0E4A.low |=:> uni0E4A ;
+%LIGKERN uni0E49.low uni0E4B.low |=:> uni0E4B ;
+%LIGKERN uni0E49.low uni0E4C.low |=:> uni0E4C ;
+%LIGKERN uni0E4A.low uni0E48.low |=:> uni0E48 ;
+%LIGKERN uni0E4A.low uni0E49.low |=:> uni0E49 ;
+%LIGKERN uni0E4A.low uni0E4A.low |=:> uni0E4A ;
+%LIGKERN uni0E4A.low uni0E4B.low |=:> uni0E4B ;
+%LIGKERN uni0E4A.low uni0E4C.low |=:> uni0E4C ;
+%LIGKERN uni0E4B.low uni0E48.low |=:> uni0E48 ;
+%LIGKERN uni0E4B.low uni0E49.low |=:> uni0E49 ;
+%LIGKERN uni0E4B.low uni0E4A.low |=:> uni0E4A ;
+%LIGKERN uni0E4B.low uni0E4B.low |=:> uni0E4B ;
+%LIGKERN uni0E4B.low uni0E4C.low |=:> uni0E4C ;
+%LIGKERN uni0E4C.low uni0E48.low |=:> uni0E48 ;
+%LIGKERN uni0E4C.low uni0E49.low |=:> uni0E49 ;
+%LIGKERN uni0E4C.low uni0E4A.low |=:> uni0E4A ;
+%LIGKERN uni0E4C.low uni0E4B.low |=:> uni0E4B ;
+%LIGKERN uni0E4C.low uni0E4C.low |=:> uni0E4C ;
+
+%ligature for making LEFT HI tone marks and thantakhat
+%LIGKERN uni0E31.left uni0E48.low |=:> uni0E48.left ;
+%LIGKERN uni0E34.left uni0E48.low |=:> uni0E48.left ;
+%LIGKERN uni0E35.left uni0E48.low |=:> uni0E48.left ;
+%LIGKERN uni0E36.left uni0E48.low |=:> uni0E48.left ;
+%LIGKERN uni0E37.left uni0E48.low |=:> uni0E48.left ;
+
+%LIGKERN uni0E31.left uni0E49.low |=:> uni0E49.left ;
+%LIGKERN uni0E34.left uni0E49.low |=:> uni0E49.left ;
+%LIGKERN uni0E35.left uni0E49.low |=:> uni0E49.left ;
+%LIGKERN uni0E36.left uni0E49.low |=:> uni0E49.left ;
+%LIGKERN uni0E37.left uni0E49.low |=:> uni0E49.left ;
+
+%LIGKERN uni0E31.left uni0E4A.low |=:> uni0E4A.left ;
+%LIGKERN uni0E34.left uni0E4A.low |=:> uni0E4A.left ;
+%LIGKERN uni0E35.left uni0E4A.low |=:> uni0E4A.left ;
+%LIGKERN uni0E36.left uni0E4A.low |=:> uni0E4A.left ;
+%LIGKERN uni0E37.left uni0E4A.low |=:> uni0E4A.left ;
+
+%LIGKERN uni0E31.left uni0E4B.low |=:> uni0E4B.left ;
+%LIGKERN uni0E34.left uni0E4B.low |=:> uni0E4B.left ;
+%LIGKERN uni0E35.left uni0E4B.low |=:> uni0E4B.left ;
+%LIGKERN uni0E36.left uni0E4B.low |=:> uni0E4B.left ;
+%LIGKERN uni0E37.left uni0E4B.low |=:> uni0E4B.left ;
+
+%LIGKERN uni0E34.left uni0E4C.low |=:> uni0E4C.left ;
+
+%[ethnic languages] LEFT HI tone marks over upper marks
+%LIGKERN uni0E47.left uni0E48.low |=:> uni0E48.left ;
+%LIGKERN uni0E47.left uni0E49.low |=:> uni0E49.left ;
+%LIGKERN uni0E47.left uni0E4A.low |=:> uni0E4A.left ;
+%LIGKERN uni0E47.left uni0E4B.low |=:> uni0E4B.left ;
+%LIGKERN uni0E47.left uni0E4C.low |=:> uni0E4C.left ;
+%LIGKERN uni0E48.low_left uni0E48.low |=:> uni0E48.left ;
+%LIGKERN uni0E48.low_left uni0E49.low |=:> uni0E49.left ;
+%LIGKERN uni0E48.low_left uni0E4A.low |=:> uni0E4A.left ;
+%LIGKERN uni0E48.low_left uni0E4B.low |=:> uni0E4B.left ;
+%LIGKERN uni0E48.low_left uni0E4C.low |=:> uni0E4C.left ;
+%LIGKERN uni0E49.low_left uni0E48.low |=:> uni0E48.left ;
+%LIGKERN uni0E49.low_left uni0E49.low |=:> uni0E49.left ;
+%LIGKERN uni0E49.low_left uni0E4A.low |=:> uni0E4A.left ;
+%LIGKERN uni0E49.low_left uni0E4B.low |=:> uni0E4B.left ;
+%LIGKERN uni0E49.low_left uni0E4C.low |=:> uni0E4C.left ;
+%LIGKERN uni0E4A.low_left uni0E48.low |=:> uni0E48.left ;
+%LIGKERN uni0E4A.low_left uni0E49.low |=:> uni0E49.left ;
+%LIGKERN uni0E4A.low_left uni0E4A.low |=:> uni0E4A.left ;
+%LIGKERN uni0E4A.low_left uni0E4B.low |=:> uni0E4B.left ;
+%LIGKERN uni0E4A.low_left uni0E4C.low |=:> uni0E4C.left ;
+%LIGKERN uni0E4B.low_left uni0E48.low |=:> uni0E48.left ;
+%LIGKERN uni0E4B.low_left uni0E49.low |=:> uni0E49.left ;
+%LIGKERN uni0E4B.low_left uni0E4A.low |=:> uni0E4A.left ;
+%LIGKERN uni0E4B.low_left uni0E4B.low |=:> uni0E4B.left ;
+%LIGKERN uni0E4B.low_left uni0E4C.low |=:> uni0E4C.left ;
+%LIGKERN uni0E4C.low_left uni0E48.low |=:> uni0E48.left ;
+%LIGKERN uni0E4C.low_left uni0E49.low |=:> uni0E49.left ;
+%LIGKERN uni0E4C.low_left uni0E4A.low |=:> uni0E4A.left ;
+%LIGKERN uni0E4C.low_left uni0E4B.low |=:> uni0E4B.left ;
+%LIGKERN uni0E4C.low_left uni0E4C.low |=:> uni0E4C.left ;
+
+%ligature for making LEFT LOW tone marks and thantakhat
+%LIGKERN uni0E38.left uni0E48.low |=:> uni0E48.low_left ;
+%LIGKERN uni0E39.left uni0E48.low |=:> uni0E48.low_left ;
+%LIGKERN uni0E3A.left uni0E48.low |=:> uni0E48.low_left ;
+
+%LIGKERN uni0E38.left uni0E49.low |=:> uni0E49.low_left ;
+%LIGKERN uni0E39.left uni0E49.low |=:> uni0E49.low_left ;
+%LIGKERN uni0E3A.left uni0E49.low |=:> uni0E49.low_left ;
+
+%LIGKERN uni0E38.left uni0E4A.low |=:> uni0E4A.low_left ;
+%LIGKERN uni0E39.left uni0E4A.low |=:> uni0E4A.low_left ;
+%LIGKERN uni0E3A.left uni0E4A.low |=:> uni0E4A.low_left ;
+
+%LIGKERN uni0E38.left uni0E4B.low |=:> uni0E4B.low_left ;
+%LIGKERN uni0E39.left uni0E4B.low |=:> uni0E4B.low_left ;
+%LIGKERN uni0E3A.left uni0E4B.low |=:> uni0E4B.low_left ;
+
+%LIGKERN uni0E38.left uni0E4C.low |=:> uni0E4C.low_left ;
+%LIGKERN uni0E39.left uni0E4C.low |=:> uni0E4C.low_left ;
+%LIGKERN uni0E3A.left uni0E4C.low |=:> uni0E4C.low_left ;
+
+%[ethnic languages] LEFT upper vowel after Phinthu
+%LIGKERN uni0E38.left uni0E31 |=:> uni0E31.left ;
+%LIGKERN uni0E39.left uni0E31 |=:> uni0E31.left ;
+%LIGKERN uni0E3A.left uni0E31 |=:> uni0E31.left ;
+
+%LIGKERN uni0E38.left uni0E34 |=:> uni0E34.left ;
+%LIGKERN uni0E39.left uni0E34 |=:> uni0E34.left ;
+%LIGKERN uni0E3A.left uni0E34 |=:> uni0E34.left ;
+
+%LIGKERN uni0E38.left uni0E35 |=:> uni0E35.left ;
+%LIGKERN uni0E39.left uni0E35 |=:> uni0E35.left ;
+%LIGKERN uni0E3A.left uni0E35 |=:> uni0E35.left ;
+
+%LIGKERN uni0E38.left uni0E36 |=:> uni0E36.left ;
+%LIGKERN uni0E39.left uni0E36 |=:> uni0E36.left ;
+%LIGKERN uni0E3A.left uni0E36 |=:> uni0E36.left ;
+
+%LIGKERN uni0E38.left uni0E37 |=:> uni0E37.left ;
+%LIGKERN uni0E39.left uni0E37 |=:> uni0E37.left ;
+%LIGKERN uni0E3A.left uni0E37 |=:> uni0E37.left ;
+
+%ligature for making HI MaiTaikhu and Nikhahit
+%LIGKERN uni0E31 uni0E47 |=:> uni0E47.high ;
+%LIGKERN uni0E34 uni0E47 |=:> uni0E47.high ;
+%LIGKERN uni0E35 uni0E47 |=:> uni0E47.high ;
+%LIGKERN uni0E36 uni0E47 |=:> uni0E47.high ;
+%LIGKERN uni0E37 uni0E47 |=:> uni0E47.high ;
+%LIGKERN uni0E31.left uni0E47 |=:> uni0E47.high ;
+%LIGKERN uni0E34.left uni0E47 |=:> uni0E47.high ;
+%LIGKERN uni0E35.left uni0E47 |=:> uni0E47.high ;
+%LIGKERN uni0E36.left uni0E47 |=:> uni0E47.high ;
+%LIGKERN uni0E37.left uni0E47 |=:> uni0E47.high ;
+%LIGKERN uni0E31 uni0E4D |=:> uni0E4D.high ;
+%LIGKERN uni0E34 uni0E4D |=:> uni0E4D.high ;
+%LIGKERN uni0E35 uni0E4D |=:> uni0E4D.high ;
+%LIGKERN uni0E36 uni0E4D |=:> uni0E4D.high ;
+%LIGKERN uni0E37 uni0E4D |=:> uni0E4D.high ;
+%LIGKERN uni0E31.left uni0E4D |=:> uni0E4D.high ;
+%LIGKERN uni0E34.left uni0E4D |=:> uni0E4D.high ;
+%LIGKERN uni0E35.left uni0E4D |=:> uni0E4D.high ;
+%LIGKERN uni0E36.left uni0E4D |=:> uni0E4D.high ;
+%LIGKERN uni0E37.left uni0E4D |=:> uni0E4D.high ;
+
+%ligature for making LOW SaraU SaraUu and Phinthu
+%LIGKERN uni0E0E uni0E38 |=:> uni0E38.low ;
+%LIGKERN uni0E0E uni0E39 |=:> uni0E39.low ;
+%LIGKERN uni0E0E uni0E3A |=:> uni0E3A.low ;
+%LIGKERN uni0E0F uni0E38 |=:> uni0E38.low ;
+%LIGKERN uni0E0F uni0E39 |=:> uni0E39.low ;
+%LIGKERN uni0E0F uni0E3A |=:> uni0E3A.low ;
+
+%[ethnic languages] LOW SaraU SaraUu and Phinthu below another
+%LIGKERN uni0E38 uni0E38 |=:> uni0E38.low ;
+%LIGKERN uni0E39 uni0E38 |=:> uni0E38.low ;
+%LIGKERN uni0E3A uni0E38 |=:> uni0E38.low ;
+%LIGKERN uni0E38 uni0E39 |=:> uni0E39.low ;
+%LIGKERN uni0E39 uni0E39 |=:> uni0E39.low ;
+%LIGKERN uni0E3A uni0E39 |=:> uni0E39.low ;
+%LIGKERN uni0E38 uni0E3A |=:> uni0E3A.low ;
+%LIGKERN uni0E39 uni0E3A |=:> uni0E3A.low ;
+%LIGKERN uni0E3A uni0E3A |=:> uni0E3A.low ;
+
+%ligature for making YoYingDescless and ThoThanDescless
+%LIGKERN uni0E0D uni0E38 =:|> uni0E0D.descless ;
+%LIGKERN uni0E0D uni0E39 =:|> uni0E0D.descless ;
+%LIGKERN uni0E0D uni0E3A =:|> uni0E0D.descless ;
+%LIGKERN uni0E10 uni0E38 =:|> uni0E10.descless ;
+%LIGKERN uni0E10 uni0E39 =:|> uni0E10.descless ;
+%LIGKERN uni0E10 uni0E3A =:|> uni0E10.descless ;
+
+%ligature for making Lakkhangyao
+%LIGKERN uni0E24 uni0E32 |=:> uni0E45 ;
+%LIGKERN uni0E26 uni0E32 |=:> uni0E45 ;
+
+%default ligature and kern set normally built-in in afm2tfm
+%LIGKERN question quoteleft =: questiondown ; exclam quoteleft =: exclamdown ;
+%LIGKERN hyphen hyphen =: endash ; endash hyphen =: emdash ;
+%LIGKERN quoteleft quoteleft =: quotedblleft ;
+%LIGKERN quoteright quoteright =: quotedblright ;
+%LIGKERN space {} * ; * {} space ; zero {} * ; * {} zero ;
+%LIGKERN one {} * ; * {} one ; two {} * ; * {} two ;
+%LIGLERN three {} * ; * {} three ; four {} * ; * {} four ;
+%LIGLERN five {} * ; * {} five ; six {} * ; * {} six ;
+%LIGKERN seven {} * ; * {} seven ; eight {} * ; * {} eight ;
+%LIGKERN nine {} * ; * {} nine ;
+%LIGKERN comma comma =: quotedblbase ; less less =: guillemotleft ;
+%LIGKERN greater greater =: guillemotright ;
+
+/LTHEncoding [
+% 0x00
+/.notdef /.notdef /.notdef /.notdef
+/dagger /daggerdbl /section /paragraph
+/copyright /registered /trademark /germandbls
+/ae /AE /oe /OE
+% 0x10
+/exclamdown /questiondown /quotedblbase /guillemotleft
+/guillemotright /uni0E38.left /uni0E39.left /uni0E3A.left
+/perthousand /dotlessi /dotlessj /.notdef
+/.notdef /.notdef /.notdef /.notdef
+% 0x20
+/space /exclam /quotedbl /numbersign
+/dollar /percent /ampersand /quoteright
+/parenleft /parenright /asterisk /plus
+/comma /hyphen /period /slash
+% 0x30
+/zero /one /two /three
+/four /five /six /seven
+/eight /nine /colon /semicolon
+/less /equal /greater /question
+% 0x40
+/at /A /B /C
+/D /E /F /G
+/H /I /J /K
+/L /M /N /O
+% 0x50
+/P /Q /R /S
+/T /U /V /W
+/X /Y /Z /bracketleft
+/backslash /bracketright /asciicircum /underscore
+% 0x60
+/quoteleft /Asmall /Bsmall /Csmall
+/Dsmall /Esmall /Fsmall /Gsmall
+/Hsmall /Ismall /Jsmall /Ksmall
+/Lsmall /Msmall /Nsmall /Osmall
+% 0x70
+/Psmall /Qsmall /Rsmall /Ssmall
+/Tsmall /Usmall /Vsmall /Wsmall
+/Xsmall /Ysmall /Zsmall /braceleft
+/bar /braceright /asciitilde /.notdef
+% 0x80
+/uni0E10.descless /uni0E34.left /uni0E35.left /uni0E36.left
+/uni0E37.left /ellipsis /uni0E48.low_left /uni0E49.low_left
+/uni0E4A.low_left /uni0E4B.low_left /uni0E4C.low_left /uni0E48
+/uni0E49 /uni0E4A /uni0E4B /uni0E4C
+% 0x90
+/uni0E0D.descless /.notdef /.notdef /quotedblleft
+/quotedblright /bullet /endash /emdash
+/uni0E31.left /uni0E4D.left /uni0E47.left /uni0E48.left
+/uni0E49.left /uni0E4A.left /uni0E4B.left /uni0E4C.left
+% 0xA0
+/nonbreakingspace /uni0E01 /uni0E02 /uni0E03
+/uni0E04 /uni0E05 /uni0E06 /uni0E07
+/uni0E08 /uni0E09 /uni0E0A /uni0E0B
+/uni0E0C /uni0E0D /uni0E0E /uni0E0F
+% 0xB0
+/uni0E10 /uni0E11 /uni0E12 /uni0E13
+/uni0E14 /uni0E15 /uni0E16 /uni0E17
+/uni0E18 /uni0E19 /uni0E1A /uni0E1B
+/uni0E1C /uni0E1D /uni0E1E /uni0E1F
+% 0xC0
+/uni0E20 /uni0E21 /uni0E22 /uni0E23
+/uni0E24 /uni0E25 /uni0E26 /uni0E27
+/uni0E28 /uni0E29 /uni0E2A /uni0E2B
+/uni0E2C /uni0E2D /uni0E2E /uni0E2F
+% 0xD0
+/uni0E30 /uni0E31 /uni0E32 /uni0E33
+/uni0E34 /uni0E35 /uni0E36 /uni0E37
+/uni0E38 /uni0E39 /uni0E3A /uni0E4D.high
+/zerowidthspace /dottedcircle /uni0E47.high /uni0E3F
+% 0xE0
+/uni0E40 /uni0E41 /uni0E42 /uni0E43
+/uni0E44 /uni0E45 /uni0E46 /uni0E47
+/uni0E48.low /uni0E49.low /uni0E4A.low /uni0E4B.low
+/uni0E4C.low /uni0E4D /uni0E4E /uni0E4F
+% 0xF0
+/uni0E50 /uni0E51 /uni0E52 /uni0E53
+/uni0E54 /uni0E55 /uni0E56 /uni0E57
+/uni0E58 /uni0E59 /uni0E5A /uni0E5B
+/uni0E38.low /uni0E39.low /uni0E3A.low /.notdef
+] def
diff --git a/Master/texmf-dist/source/fonts/fonts-tlwg/missing b/Master/texmf-dist/source/fonts/fonts-tlwg/missing
index 8d0eaad250f..1fe1611f185 100755
--- a/Master/texmf-dist/source/fonts/fonts-tlwg/missing
+++ b/Master/texmf-dist/source/fonts/fonts-tlwg/missing
@@ -3,7 +3,7 @@
scriptversion=2018-03-07.03; # UTC
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 Free Software Foundation, Inc.
# Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
# This program is free software; you can redistribute it and/or modify
diff --git a/Master/texmf-dist/source/fonts/fonts-tlwg/nectec/Makefile.am b/Master/texmf-dist/source/fonts/fonts-tlwg/nectec/Makefile.am
index 919578e654d..235df25fb9f 100644
--- a/Master/texmf-dist/source/fonts/fonts-tlwg/nectec/Makefile.am
+++ b/Master/texmf-dist/source/fonts/fonts-tlwg/nectec/Makefile.am
@@ -11,21 +11,21 @@ include $(top_srcdir)/scripts/gen.mk.am
if INCLUDE_LATEX
loma.afm: Loma.afm
- [ -f $@ ] || $(LN_S) $< $@
+ [ -e $@ ] || $(LN_S) $< $@
loma_b.afm: Loma-Bold.afm
- [ -f $@ ] || $(LN_S) $< $@
+ [ -e $@ ] || $(LN_S) $< $@
loma_o.afm: Loma-Oblique.afm
- [ -f $@ ] || $(LN_S) $< $@
+ [ -e $@ ] || $(LN_S) $< $@
loma_bo.afm: Loma-BoldOblique.afm
- [ -f $@ ] || $(LN_S) $< $@
+ [ -e $@ ] || $(LN_S) $< $@
loma.pfb: Loma.pfb
- [ -f $@ ] || $(LN_S) $< $@
+ [ -e $@ ] || $(LN_S) $< $@
loma_b.pfb: Loma-Bold.pfb
- [ -f $@ ] || $(LN_S) $< $@
+ [ -e $@ ] || $(LN_S) $< $@
loma_o.pfb: Loma-Oblique.pfb
- [ -f $@ ] || $(LN_S) $< $@
+ [ -e $@ ] || $(LN_S) $< $@
loma_bo.pfb: Loma-BoldOblique.pfb
- [ -f $@ ] || $(LN_S) $< $@
+ [ -e $@ ] || $(LN_S) $< $@
FONTS = \
loma \
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 81845a93647..14030867afe 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.16.2 from Makefile.am.
+# Makefile.in generated by automake 1.16.4 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2020 Free Software Foundation, Inc.
+# Copyright (C) 1994-2021 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -182,11 +182,14 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+CSCOPE = @CSCOPE@
+CTAGS = @CTAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
+ETAGS = @ETAGS@
FCCACHE = @FCCACHE@
FONTFORGE = @FONTFORGE@
INSTALL = @INSTALL@
@@ -320,10 +323,19 @@ CLEANFILES = *.ttf *.g2n *.pfb *.afm *.pfm *.otf *.woff *.enc *.tfm \
@INCLUDE_LATEX_TRUE@LTX_TFMFILES = $(FONTS:%=%.tfm)
@INCLUDE_LATEX_TRUE@LTX_RTFMFILES = $(FONTS:%=r%.tfm)
@INCLUDE_LATEX_TRUE@LTX_VFFILES = $(FONTS:%=%.vf)
+@INCLUDE_LATEX_TRUE@LTX_SYNTH_TFMFILES = $(SYNTH_FONTS:%=%.tfm)
+@INCLUDE_LATEX_TRUE@LTX_SYNTH_RTFMFILES = $(SYNTH_FONTS:%=r%.tfm)
+@INCLUDE_LATEX_TRUE@LTX_SYNTH_VFFILES = $(SYNTH_FONTS:%=%.vf)
@INCLUDE_LATEX_TRUE@ltxtype1_DATA = $(LTX_PFBFILES)
@INCLUDE_LATEX_TRUE@ltxafm_DATA = $(LTX_AFMFILES)
-@INCLUDE_LATEX_TRUE@ltxtfm_DATA = $(LTX_TFMFILES) $(LTX_RTFMFILES)
-@INCLUDE_LATEX_TRUE@ltxvf_DATA = $(LTX_VFFILES)
+@INCLUDE_LATEX_TRUE@ltxtfm_DATA = \
+@INCLUDE_LATEX_TRUE@ $(LTX_TFMFILES) \
+@INCLUDE_LATEX_TRUE@ $(LTX_RTFMFILES) \
+@INCLUDE_LATEX_TRUE@ $(LTX_SYNTH_TFMFILES) \
+@INCLUDE_LATEX_TRUE@ $(LTX_SYNTH_RTFMFILES) \
+@INCLUDE_LATEX_TRUE@ $(NULL)
+
+@INCLUDE_LATEX_TRUE@ltxvf_DATA = $(LTX_VFFILES) $(LTX_SYNTH_VFFILES)
# OpenType fonts
@INCLUDE_LATEX_TRUE@ltxotfdir = $(texmfdir)/fonts/opentype/public/$(LATEX_PACKAGE)
@@ -599,7 +611,6 @@ ctags CTAGS:
cscope cscopelist:
-
distdir: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) distdir-am
@@ -796,45 +807,84 @@ PS%.afm PS%.pfb: %.sfd
$(FONTFORGE) -script $(top_srcdir)/scripts/gen-pfb.pe $<
@INCLUDE_LATEX_TRUE@loma.afm: Loma.afm
-@INCLUDE_LATEX_TRUE@ [ -f $@ ] || $(LN_S) $< $@
+@INCLUDE_LATEX_TRUE@ [ -e $@ ] || $(LN_S) $< $@
@INCLUDE_LATEX_TRUE@loma_b.afm: Loma-Bold.afm
-@INCLUDE_LATEX_TRUE@ [ -f $@ ] || $(LN_S) $< $@
+@INCLUDE_LATEX_TRUE@ [ -e $@ ] || $(LN_S) $< $@
@INCLUDE_LATEX_TRUE@loma_o.afm: Loma-Oblique.afm
-@INCLUDE_LATEX_TRUE@ [ -f $@ ] || $(LN_S) $< $@
+@INCLUDE_LATEX_TRUE@ [ -e $@ ] || $(LN_S) $< $@
@INCLUDE_LATEX_TRUE@loma_bo.afm: Loma-BoldOblique.afm
-@INCLUDE_LATEX_TRUE@ [ -f $@ ] || $(LN_S) $< $@
+@INCLUDE_LATEX_TRUE@ [ -e $@ ] || $(LN_S) $< $@
@INCLUDE_LATEX_TRUE@loma.pfb: Loma.pfb
-@INCLUDE_LATEX_TRUE@ [ -f $@ ] || $(LN_S) $< $@
+@INCLUDE_LATEX_TRUE@ [ -e $@ ] || $(LN_S) $< $@
@INCLUDE_LATEX_TRUE@loma_b.pfb: Loma-Bold.pfb
-@INCLUDE_LATEX_TRUE@ [ -f $@ ] || $(LN_S) $< $@
+@INCLUDE_LATEX_TRUE@ [ -e $@ ] || $(LN_S) $< $@
@INCLUDE_LATEX_TRUE@loma_o.pfb: Loma-Oblique.pfb
-@INCLUDE_LATEX_TRUE@ [ -f $@ ] || $(LN_S) $< $@
+@INCLUDE_LATEX_TRUE@ [ -e $@ ] || $(LN_S) $< $@
@INCLUDE_LATEX_TRUE@loma_bo.pfb: Loma-BoldOblique.pfb
-@INCLUDE_LATEX_TRUE@ [ -f $@ ] || $(LN_S) $< $@
+@INCLUDE_LATEX_TRUE@ [ -e $@ ] || $(LN_S) $< $@
# Local Rules
-@INCLUDE_LATEX_TRUE@thai-dummy.afm:
-@INCLUDE_LATEX_TRUE@ [ -e thai-dummy.afm ] || $(LN_S) $(top_srcdir)/latex/thai-dummy.afm .
-
-@INCLUDE_LATEX_TRUE@thailigs.enc:
-@INCLUDE_LATEX_TRUE@ [ -e thailigs.enc ] || $(LN_S) $(top_srcdir)/latex/thailigs.enc .
-
-@INCLUDE_LATEX_TRUE@lthtlwg.enc:
-@INCLUDE_LATEX_TRUE@ [ -e lthtlwg.enc ] || $(LN_S) $(top_srcdir)/latex/lthtlwg.enc .
+@INCLUDE_LATEX_TRUE@thai-dummy.afm \
+@INCLUDE_LATEX_TRUE@thailigs.enc \
+@INCLUDE_LATEX_TRUE@lthtlwg.enc \
+@INCLUDE_LATEX_TRUE@thailigs-sc.enc \
+@INCLUDE_LATEX_TRUE@lthtlwg-sc.enc \
+@INCLUDE_LATEX_TRUE@thailigs-osf.enc \
+@INCLUDE_LATEX_TRUE@lthtlwg-osf.enc \
+@INCLUDE_LATEX_TRUE@thailigs-osf-sc.enc \
+@INCLUDE_LATEX_TRUE@lthtlwg-osf-sc.enc \
+@INCLUDE_LATEX_TRUE@:
+@INCLUDE_LATEX_TRUE@ [ -e $@ ] || $(LN_S) $(top_srcdir)/latex/$@ .
@INCLUDE_LATEX_TRUE@thailigs.vpl: thai-dummy.afm thailigs.enc
@INCLUDE_LATEX_TRUE@ $(AFM2TFM) thai-dummy.afm -v $@ -T thailigs.enc thailigs.tfm
+@INCLUDE_LATEX_TRUE@thailigs-sc.vpl: thai-dummy.afm thailigs-sc.enc
+@INCLUDE_LATEX_TRUE@ $(AFM2TFM) thai-dummy.afm -v $@ -T thailigs-sc.enc thailigs-sc.tfm
+
+@INCLUDE_LATEX_TRUE@thailigs-osf.vpl: thai-dummy.afm thailigs-osf.enc
+@INCLUDE_LATEX_TRUE@ $(AFM2TFM) thai-dummy.afm -v $@ -T thailigs-osf.enc thailigs-osf.tfm
+
+@INCLUDE_LATEX_TRUE@thailigs-osf-sc.vpl: thai-dummy.afm thailigs-osf-sc.enc
+@INCLUDE_LATEX_TRUE@ $(AFM2TFM) thai-dummy.afm -v $@ -T thailigs-osf-sc.enc thailigs-osf-sc.tfm
+
+#
+# merge_ligs(font-vpl-file,ligs-vpl-file)
+#
+# Replaces LIGTABLE in font-vpl-file with that in ligs-vpl-file.
+#
+@INCLUDE_LATEX_TRUE@define merge_ligs
+@INCLUDE_LATEX_TRUE@ TMPFILE=`mktemp /tmp/tltx.XXXXXXXXX` && \
+@INCLUDE_LATEX_TRUE@ $(AWK) "BEGIN {show=1} /LIGTABLE/ {show=0} {if(show) print}" $(1) > $$TMPFILE && \
+@INCLUDE_LATEX_TRUE@ $(AWK) "BEGIN {show=0} /LIGTABLE/ {show=1} /CHARACTER/ {show=0} {if(show) print}" $(2) >> $$TMPFILE && \
+@INCLUDE_LATEX_TRUE@ $(AWK) "BEGIN {show=0} /CHARACTER/ {show=1} {if(show) print}" $(1) >> $$TMPFILE && \
+@INCLUDE_LATEX_TRUE@ mv $$TMPFILE $(1)
+@INCLUDE_LATEX_TRUE@endef
+
+@INCLUDE_LATEX_TRUE@r%-osf-sc.tfm: %.afm
+@INCLUDE_LATEX_TRUE@%-osf-sc.vpl: %.afm thailigs-osf-sc.vpl lthtlwg-osf-sc.enc
+@INCLUDE_LATEX_TRUE@ $(AFM2TFM) $*.afm -v $*-osf-sc.vpl -T lthtlwg-osf-sc.enc r$*-osf-sc.tfm \
+@INCLUDE_LATEX_TRUE@ | $(SED) "s/$$/ <$*.pfb/" >> $(MAP)
+@INCLUDE_LATEX_TRUE@ $(call merge_ligs,$*-osf-sc.vpl,thailigs-osf-sc.vpl)
+
+@INCLUDE_LATEX_TRUE@r%-osf.tfm: %.afm
+@INCLUDE_LATEX_TRUE@%-osf.vpl: %.afm thailigs-osf.vpl lthtlwg-osf.enc
+@INCLUDE_LATEX_TRUE@ $(AFM2TFM) $*.afm -v $*-osf.vpl -T lthtlwg-osf.enc r$*-osf.tfm \
+@INCLUDE_LATEX_TRUE@ | $(SED) "s/$$/ <$*.pfb/" >> $(MAP)
+@INCLUDE_LATEX_TRUE@ $(call merge_ligs,$*-osf.vpl,thailigs-osf.vpl)
+
+@INCLUDE_LATEX_TRUE@r%-sc.tfm: %.afm
+@INCLUDE_LATEX_TRUE@%-sc.vpl: %.afm thailigs-sc.vpl lthtlwg-sc.enc
+@INCLUDE_LATEX_TRUE@ $(AFM2TFM) $*.afm -v $*-sc.vpl -T lthtlwg-sc.enc r$*-sc.tfm \
+@INCLUDE_LATEX_TRUE@ | $(SED) "s/$$/ <$*.pfb/" >> $(MAP)
+@INCLUDE_LATEX_TRUE@ $(call merge_ligs,$*-sc.vpl,thailigs-sc.vpl)
+
@INCLUDE_LATEX_TRUE@r%.tfm: %.afm
@INCLUDE_LATEX_TRUE@%.vpl: %.afm thailigs.vpl lthtlwg.enc
@INCLUDE_LATEX_TRUE@ $(AFM2TFM) $*.afm -v $*.vpl -T lthtlwg.enc r$*.tfm \
@INCLUDE_LATEX_TRUE@ | $(SED) "s/$$/ <$*.pfb/" >> $(MAP)
-@INCLUDE_LATEX_TRUE@ TMPFILE=`mktemp /tmp/tltx.XXXXXXXXX` && \
-@INCLUDE_LATEX_TRUE@ $(AWK) "BEGIN {show=1} /LIGTABLE/ {show=0} {if(show) print}" $*.vpl > $$TMPFILE && \
-@INCLUDE_LATEX_TRUE@ $(AWK) "BEGIN {show=0} /LIGTABLE/ {show=1} /CHARACTER/ {show=0} {if(show) print}" thailigs.vpl >> $$TMPFILE && \
-@INCLUDE_LATEX_TRUE@ $(AWK) "BEGIN {show=0} /CHARACTER/ {show=1} {if(show) print}" $*.vpl >> $$TMPFILE && \
-@INCLUDE_LATEX_TRUE@ mv $$TMPFILE $*.vpl
+@INCLUDE_LATEX_TRUE@ $(call merge_ligs,$*.vpl,thailigs.vpl)
@INCLUDE_LATEX_TRUE@%.tfm: %.vpl
@INCLUDE_LATEX_TRUE@ $(VPTOVF) $*
diff --git a/Master/texmf-dist/source/fonts/fonts-tlwg/nf/Makefile.am b/Master/texmf-dist/source/fonts/fonts-tlwg/nf/Makefile.am
index 05f17838a0b..a72cc73dcc0 100644
--- a/Master/texmf-dist/source/fonts/fonts-tlwg/nf/Makefile.am
+++ b/Master/texmf-dist/source/fonts/fonts-tlwg/nf/Makefile.am
@@ -23,69 +23,69 @@ include $(top_srcdir)/scripts/gen.mk.am
if INCLUDE_LATEX
kinnari.afm: Kinnari.afm
- [ -f $@ ] || $(LN_S) $< $@
+ [ -e $@ ] || $(LN_S) $< $@
kinnari_b.afm: Kinnari-Bold.afm
- [ -f $@ ] || $(LN_S) $< $@
+ [ -e $@ ] || $(LN_S) $< $@
kinnari_o.afm: Kinnari-Oblique.afm
- [ -f $@ ] || $(LN_S) $< $@
+ [ -e $@ ] || $(LN_S) $< $@
kinnari_i.afm: Kinnari-Italic.afm
- [ -f $@ ] || $(LN_S) $< $@
+ [ -e $@ ] || $(LN_S) $< $@
kinnari_bo.afm: Kinnari-BoldOblique.afm
- [ -f $@ ] || $(LN_S) $< $@
+ [ -e $@ ] || $(LN_S) $< $@
kinnari_bi.afm: Kinnari-BoldItalic.afm
- [ -f $@ ] || $(LN_S) $< $@
+ [ -e $@ ] || $(LN_S) $< $@
garuda.afm: Garuda.afm
- [ -f $@ ] || $(LN_S) $< $@
+ [ -e $@ ] || $(LN_S) $< $@
garuda_b.afm: Garuda-Bold.afm
- [ -f $@ ] || $(LN_S) $< $@
+ [ -e $@ ] || $(LN_S) $< $@
garuda_o.afm: Garuda-Oblique.afm
- [ -f $@ ] || $(LN_S) $< $@
+ [ -e $@ ] || $(LN_S) $< $@
garuda_bo.afm: Garuda-BoldOblique.afm
- [ -f $@ ] || $(LN_S) $< $@
+ [ -e $@ ] || $(LN_S) $< $@
norasi.afm: Norasi.afm
- [ -f $@ ] || $(LN_S) $< $@
+ [ -e $@ ] || $(LN_S) $< $@
norasi_b.afm: Norasi-Bold.afm
- [ -f $@ ] || $(LN_S) $< $@
+ [ -e $@ ] || $(LN_S) $< $@
norasi_o.afm: Norasi-Oblique.afm
- [ -f $@ ] || $(LN_S) $< $@
+ [ -e $@ ] || $(LN_S) $< $@
norasi_i.afm: Norasi-Italic.afm
- [ -f $@ ] || $(LN_S) $< $@
+ [ -e $@ ] || $(LN_S) $< $@
norasi_bo.afm: Norasi-BoldOblique.afm
- [ -f $@ ] || $(LN_S) $< $@
+ [ -e $@ ] || $(LN_S) $< $@
norasi_bi.afm: Norasi-BoldItalic.afm
- [ -f $@ ] || $(LN_S) $< $@
+ [ -e $@ ] || $(LN_S) $< $@
kinnari.pfb: Kinnari.pfb
- [ -f $@ ] || $(LN_S) $< $@
+ [ -e $@ ] || $(LN_S) $< $@
kinnari_b.pfb: Kinnari-Bold.pfb
- [ -f $@ ] || $(LN_S) $< $@
+ [ -e $@ ] || $(LN_S) $< $@
kinnari_o.pfb: Kinnari-Oblique.pfb
- [ -f $@ ] || $(LN_S) $< $@
+ [ -e $@ ] || $(LN_S) $< $@
kinnari_i.pfb: Kinnari-Italic.pfb
- [ -f $@ ] || $(LN_S) $< $@
+ [ -e $@ ] || $(LN_S) $< $@
kinnari_bo.pfb: Kinnari-BoldOblique.pfb
- [ -f $@ ] || $(LN_S) $< $@
+ [ -e $@ ] || $(LN_S) $< $@
kinnari_bi.pfb: Kinnari-BoldItalic.pfb
- [ -f $@ ] || $(LN_S) $< $@
+ [ -e $@ ] || $(LN_S) $< $@
garuda.pfb: Garuda.pfb
- [ -f $@ ] || $(LN_S) $< $@
+ [ -e $@ ] || $(LN_S) $< $@
garuda_b.pfb: Garuda-Bold.pfb
- [ -f $@ ] || $(LN_S) $< $@
+ [ -e $@ ] || $(LN_S) $< $@
garuda_o.pfb: Garuda-Oblique.pfb
- [ -f $@ ] || $(LN_S) $< $@
+ [ -e $@ ] || $(LN_S) $< $@
garuda_bo.pfb: Garuda-BoldOblique.pfb
- [ -f $@ ] || $(LN_S) $< $@
+ [ -e $@ ] || $(LN_S) $< $@
norasi.pfb: Norasi.pfb
- [ -f $@ ] || $(LN_S) $< $@
+ [ -e $@ ] || $(LN_S) $< $@
norasi_b.pfb: Norasi-Bold.pfb
- [ -f $@ ] || $(LN_S) $< $@
+ [ -e $@ ] || $(LN_S) $< $@
norasi_o.pfb: Norasi-Oblique.pfb
- [ -f $@ ] || $(LN_S) $< $@
+ [ -e $@ ] || $(LN_S) $< $@
norasi_i.pfb: Norasi-Italic.pfb
- [ -f $@ ] || $(LN_S) $< $@
+ [ -e $@ ] || $(LN_S) $< $@
norasi_bo.pfb: Norasi-BoldOblique.pfb
- [ -f $@ ] || $(LN_S) $< $@
+ [ -e $@ ] || $(LN_S) $< $@
norasi_bi.pfb: Norasi-BoldItalic.pfb
- [ -f $@ ] || $(LN_S) $< $@
+ [ -e $@ ] || $(LN_S) $< $@
FONTS = \
kinnari \
@@ -105,6 +105,27 @@ FONTS = \
norasi_bo \
norasi_bi
+SYNTH_FONTS = \
+ norasi-sc \
+ norasi_b-sc \
+ norasi_o-sc \
+ norasi_i-sc \
+ norasi_bo-sc \
+ norasi_bi-sc \
+ norasi-osf \
+ norasi_b-osf \
+ norasi_o-osf \
+ norasi_i-osf \
+ norasi_bo-osf \
+ norasi_bi-osf \
+ norasi-osf-sc \
+ norasi_b-osf-sc \
+ norasi_o-osf-sc \
+ norasi_i-osf-sc \
+ norasi_bo-osf-sc \
+ norasi_bi-osf-sc \
+ $(NULL)
+
MAP = nf.map
include $(top_srcdir)/latex/texfont.mk.am
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 1e555734aa4..4b19e5aaa80 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.16.2 from Makefile.am.
+# Makefile.in generated by automake 1.16.4 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2020 Free Software Foundation, Inc.
+# Copyright (C) 1994-2021 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -182,11 +182,14 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+CSCOPE = @CSCOPE@
+CTAGS = @CTAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
+ETAGS = @ETAGS@
FCCACHE = @FCCACHE@
FONTFORGE = @FONTFORGE@
INSTALL = @INSTALL@
@@ -332,6 +335,27 @@ CLEANFILES = *.ttf *.g2n *.pfb *.afm *.pfm *.otf *.woff *.enc *.tfm \
@INCLUDE_LATEX_TRUE@ norasi_bo \
@INCLUDE_LATEX_TRUE@ norasi_bi
+@INCLUDE_LATEX_TRUE@SYNTH_FONTS = \
+@INCLUDE_LATEX_TRUE@ norasi-sc \
+@INCLUDE_LATEX_TRUE@ norasi_b-sc \
+@INCLUDE_LATEX_TRUE@ norasi_o-sc \
+@INCLUDE_LATEX_TRUE@ norasi_i-sc \
+@INCLUDE_LATEX_TRUE@ norasi_bo-sc \
+@INCLUDE_LATEX_TRUE@ norasi_bi-sc \
+@INCLUDE_LATEX_TRUE@ norasi-osf \
+@INCLUDE_LATEX_TRUE@ norasi_b-osf \
+@INCLUDE_LATEX_TRUE@ norasi_o-osf \
+@INCLUDE_LATEX_TRUE@ norasi_i-osf \
+@INCLUDE_LATEX_TRUE@ norasi_bo-osf \
+@INCLUDE_LATEX_TRUE@ norasi_bi-osf \
+@INCLUDE_LATEX_TRUE@ norasi-osf-sc \
+@INCLUDE_LATEX_TRUE@ norasi_b-osf-sc \
+@INCLUDE_LATEX_TRUE@ norasi_o-osf-sc \
+@INCLUDE_LATEX_TRUE@ norasi_i-osf-sc \
+@INCLUDE_LATEX_TRUE@ norasi_bo-osf-sc \
+@INCLUDE_LATEX_TRUE@ norasi_bi-osf-sc \
+@INCLUDE_LATEX_TRUE@ $(NULL)
+
@INCLUDE_LATEX_TRUE@MAP = nf.map
@INCLUDE_LATEX_TRUE@ltxtype1dir = $(texmfdir)/fonts/type1/public/$(LATEX_PACKAGE)
@INCLUDE_LATEX_TRUE@ltxafmdir = $(texmfdir)/fonts/afm/public/$(LATEX_PACKAGE)
@@ -344,10 +368,19 @@ CLEANFILES = *.ttf *.g2n *.pfb *.afm *.pfm *.otf *.woff *.enc *.tfm \
@INCLUDE_LATEX_TRUE@LTX_TFMFILES = $(FONTS:%=%.tfm)
@INCLUDE_LATEX_TRUE@LTX_RTFMFILES = $(FONTS:%=r%.tfm)
@INCLUDE_LATEX_TRUE@LTX_VFFILES = $(FONTS:%=%.vf)
+@INCLUDE_LATEX_TRUE@LTX_SYNTH_TFMFILES = $(SYNTH_FONTS:%=%.tfm)
+@INCLUDE_LATEX_TRUE@LTX_SYNTH_RTFMFILES = $(SYNTH_FONTS:%=r%.tfm)
+@INCLUDE_LATEX_TRUE@LTX_SYNTH_VFFILES = $(SYNTH_FONTS:%=%.vf)
@INCLUDE_LATEX_TRUE@ltxtype1_DATA = $(LTX_PFBFILES)
@INCLUDE_LATEX_TRUE@ltxafm_DATA = $(LTX_AFMFILES)
-@INCLUDE_LATEX_TRUE@ltxtfm_DATA = $(LTX_TFMFILES) $(LTX_RTFMFILES)
-@INCLUDE_LATEX_TRUE@ltxvf_DATA = $(LTX_VFFILES)
+@INCLUDE_LATEX_TRUE@ltxtfm_DATA = \
+@INCLUDE_LATEX_TRUE@ $(LTX_TFMFILES) \
+@INCLUDE_LATEX_TRUE@ $(LTX_RTFMFILES) \
+@INCLUDE_LATEX_TRUE@ $(LTX_SYNTH_TFMFILES) \
+@INCLUDE_LATEX_TRUE@ $(LTX_SYNTH_RTFMFILES) \
+@INCLUDE_LATEX_TRUE@ $(NULL)
+
+@INCLUDE_LATEX_TRUE@ltxvf_DATA = $(LTX_VFFILES) $(LTX_SYNTH_VFFILES)
# OpenType fonts
@INCLUDE_LATEX_TRUE@ltxotfdir = $(texmfdir)/fonts/opentype/public/$(LATEX_PACKAGE)
@@ -623,7 +656,6 @@ ctags CTAGS:
cscope cscopelist:
-
distdir: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) distdir-am
@@ -820,93 +852,132 @@ PS%.afm PS%.pfb: %.sfd
$(FONTFORGE) -script $(top_srcdir)/scripts/gen-pfb.pe $<
@INCLUDE_LATEX_TRUE@kinnari.afm: Kinnari.afm
-@INCLUDE_LATEX_TRUE@ [ -f $@ ] || $(LN_S) $< $@
+@INCLUDE_LATEX_TRUE@ [ -e $@ ] || $(LN_S) $< $@
@INCLUDE_LATEX_TRUE@kinnari_b.afm: Kinnari-Bold.afm
-@INCLUDE_LATEX_TRUE@ [ -f $@ ] || $(LN_S) $< $@
+@INCLUDE_LATEX_TRUE@ [ -e $@ ] || $(LN_S) $< $@
@INCLUDE_LATEX_TRUE@kinnari_o.afm: Kinnari-Oblique.afm
-@INCLUDE_LATEX_TRUE@ [ -f $@ ] || $(LN_S) $< $@
+@INCLUDE_LATEX_TRUE@ [ -e $@ ] || $(LN_S) $< $@
@INCLUDE_LATEX_TRUE@kinnari_i.afm: Kinnari-Italic.afm
-@INCLUDE_LATEX_TRUE@ [ -f $@ ] || $(LN_S) $< $@
+@INCLUDE_LATEX_TRUE@ [ -e $@ ] || $(LN_S) $< $@
@INCLUDE_LATEX_TRUE@kinnari_bo.afm: Kinnari-BoldOblique.afm
-@INCLUDE_LATEX_TRUE@ [ -f $@ ] || $(LN_S) $< $@
+@INCLUDE_LATEX_TRUE@ [ -e $@ ] || $(LN_S) $< $@
@INCLUDE_LATEX_TRUE@kinnari_bi.afm: Kinnari-BoldItalic.afm
-@INCLUDE_LATEX_TRUE@ [ -f $@ ] || $(LN_S) $< $@
+@INCLUDE_LATEX_TRUE@ [ -e $@ ] || $(LN_S) $< $@
@INCLUDE_LATEX_TRUE@garuda.afm: Garuda.afm
-@INCLUDE_LATEX_TRUE@ [ -f $@ ] || $(LN_S) $< $@
+@INCLUDE_LATEX_TRUE@ [ -e $@ ] || $(LN_S) $< $@
@INCLUDE_LATEX_TRUE@garuda_b.afm: Garuda-Bold.afm
-@INCLUDE_LATEX_TRUE@ [ -f $@ ] || $(LN_S) $< $@
+@INCLUDE_LATEX_TRUE@ [ -e $@ ] || $(LN_S) $< $@
@INCLUDE_LATEX_TRUE@garuda_o.afm: Garuda-Oblique.afm
-@INCLUDE_LATEX_TRUE@ [ -f $@ ] || $(LN_S) $< $@
+@INCLUDE_LATEX_TRUE@ [ -e $@ ] || $(LN_S) $< $@
@INCLUDE_LATEX_TRUE@garuda_bo.afm: Garuda-BoldOblique.afm
-@INCLUDE_LATEX_TRUE@ [ -f $@ ] || $(LN_S) $< $@
+@INCLUDE_LATEX_TRUE@ [ -e $@ ] || $(LN_S) $< $@
@INCLUDE_LATEX_TRUE@norasi.afm: Norasi.afm
-@INCLUDE_LATEX_TRUE@ [ -f $@ ] || $(LN_S) $< $@
+@INCLUDE_LATEX_TRUE@ [ -e $@ ] || $(LN_S) $< $@
@INCLUDE_LATEX_TRUE@norasi_b.afm: Norasi-Bold.afm
-@INCLUDE_LATEX_TRUE@ [ -f $@ ] || $(LN_S) $< $@
+@INCLUDE_LATEX_TRUE@ [ -e $@ ] || $(LN_S) $< $@
@INCLUDE_LATEX_TRUE@norasi_o.afm: Norasi-Oblique.afm
-@INCLUDE_LATEX_TRUE@ [ -f $@ ] || $(LN_S) $< $@
+@INCLUDE_LATEX_TRUE@ [ -e $@ ] || $(LN_S) $< $@
@INCLUDE_LATEX_TRUE@norasi_i.afm: Norasi-Italic.afm
-@INCLUDE_LATEX_TRUE@ [ -f $@ ] || $(LN_S) $< $@
+@INCLUDE_LATEX_TRUE@ [ -e $@ ] || $(LN_S) $< $@
@INCLUDE_LATEX_TRUE@norasi_bo.afm: Norasi-BoldOblique.afm
-@INCLUDE_LATEX_TRUE@ [ -f $@ ] || $(LN_S) $< $@
+@INCLUDE_LATEX_TRUE@ [ -e $@ ] || $(LN_S) $< $@
@INCLUDE_LATEX_TRUE@norasi_bi.afm: Norasi-BoldItalic.afm
-@INCLUDE_LATEX_TRUE@ [ -f $@ ] || $(LN_S) $< $@
+@INCLUDE_LATEX_TRUE@ [ -e $@ ] || $(LN_S) $< $@
@INCLUDE_LATEX_TRUE@kinnari.pfb: Kinnari.pfb
-@INCLUDE_LATEX_TRUE@ [ -f $@ ] || $(LN_S) $< $@
+@INCLUDE_LATEX_TRUE@ [ -e $@ ] || $(LN_S) $< $@
@INCLUDE_LATEX_TRUE@kinnari_b.pfb: Kinnari-Bold.pfb
-@INCLUDE_LATEX_TRUE@ [ -f $@ ] || $(LN_S) $< $@
+@INCLUDE_LATEX_TRUE@ [ -e $@ ] || $(LN_S) $< $@
@INCLUDE_LATEX_TRUE@kinnari_o.pfb: Kinnari-Oblique.pfb
-@INCLUDE_LATEX_TRUE@ [ -f $@ ] || $(LN_S) $< $@
+@INCLUDE_LATEX_TRUE@ [ -e $@ ] || $(LN_S) $< $@
@INCLUDE_LATEX_TRUE@kinnari_i.pfb: Kinnari-Italic.pfb
-@INCLUDE_LATEX_TRUE@ [ -f $@ ] || $(LN_S) $< $@
+@INCLUDE_LATEX_TRUE@ [ -e $@ ] || $(LN_S) $< $@
@INCLUDE_LATEX_TRUE@kinnari_bo.pfb: Kinnari-BoldOblique.pfb
-@INCLUDE_LATEX_TRUE@ [ -f $@ ] || $(LN_S) $< $@
+@INCLUDE_LATEX_TRUE@ [ -e $@ ] || $(LN_S) $< $@
@INCLUDE_LATEX_TRUE@kinnari_bi.pfb: Kinnari-BoldItalic.pfb
-@INCLUDE_LATEX_TRUE@ [ -f $@ ] || $(LN_S) $< $@
+@INCLUDE_LATEX_TRUE@ [ -e $@ ] || $(LN_S) $< $@
@INCLUDE_LATEX_TRUE@garuda.pfb: Garuda.pfb
-@INCLUDE_LATEX_TRUE@ [ -f $@ ] || $(LN_S) $< $@
+@INCLUDE_LATEX_TRUE@ [ -e $@ ] || $(LN_S) $< $@
@INCLUDE_LATEX_TRUE@garuda_b.pfb: Garuda-Bold.pfb
-@INCLUDE_LATEX_TRUE@ [ -f $@ ] || $(LN_S) $< $@
+@INCLUDE_LATEX_TRUE@ [ -e $@ ] || $(LN_S) $< $@
@INCLUDE_LATEX_TRUE@garuda_o.pfb: Garuda-Oblique.pfb
-@INCLUDE_LATEX_TRUE@ [ -f $@ ] || $(LN_S) $< $@
+@INCLUDE_LATEX_TRUE@ [ -e $@ ] || $(LN_S) $< $@
@INCLUDE_LATEX_TRUE@garuda_bo.pfb: Garuda-BoldOblique.pfb
-@INCLUDE_LATEX_TRUE@ [ -f $@ ] || $(LN_S) $< $@
+@INCLUDE_LATEX_TRUE@ [ -e $@ ] || $(LN_S) $< $@
@INCLUDE_LATEX_TRUE@norasi.pfb: Norasi.pfb
-@INCLUDE_LATEX_TRUE@ [ -f $@ ] || $(LN_S) $< $@
+@INCLUDE_LATEX_TRUE@ [ -e $@ ] || $(LN_S) $< $@
@INCLUDE_LATEX_TRUE@norasi_b.pfb: Norasi-Bold.pfb
-@INCLUDE_LATEX_TRUE@ [ -f $@ ] || $(LN_S) $< $@
+@INCLUDE_LATEX_TRUE@ [ -e $@ ] || $(LN_S) $< $@
@INCLUDE_LATEX_TRUE@norasi_o.pfb: Norasi-Oblique.pfb
-@INCLUDE_LATEX_TRUE@ [ -f $@ ] || $(LN_S) $< $@
+@INCLUDE_LATEX_TRUE@ [ -e $@ ] || $(LN_S) $< $@
@INCLUDE_LATEX_TRUE@norasi_i.pfb: Norasi-Italic.pfb
-@INCLUDE_LATEX_TRUE@ [ -f $@ ] || $(LN_S) $< $@
+@INCLUDE_LATEX_TRUE@ [ -e $@ ] || $(LN_S) $< $@
@INCLUDE_LATEX_TRUE@norasi_bo.pfb: Norasi-BoldOblique.pfb
-@INCLUDE_LATEX_TRUE@ [ -f $@ ] || $(LN_S) $< $@
+@INCLUDE_LATEX_TRUE@ [ -e $@ ] || $(LN_S) $< $@
@INCLUDE_LATEX_TRUE@norasi_bi.pfb: Norasi-BoldItalic.pfb
-@INCLUDE_LATEX_TRUE@ [ -f $@ ] || $(LN_S) $< $@
+@INCLUDE_LATEX_TRUE@ [ -e $@ ] || $(LN_S) $< $@
# Local Rules
-@INCLUDE_LATEX_TRUE@thai-dummy.afm:
-@INCLUDE_LATEX_TRUE@ [ -e thai-dummy.afm ] || $(LN_S) $(top_srcdir)/latex/thai-dummy.afm .
-
-@INCLUDE_LATEX_TRUE@thailigs.enc:
-@INCLUDE_LATEX_TRUE@ [ -e thailigs.enc ] || $(LN_S) $(top_srcdir)/latex/thailigs.enc .
-
-@INCLUDE_LATEX_TRUE@lthtlwg.enc:
-@INCLUDE_LATEX_TRUE@ [ -e lthtlwg.enc ] || $(LN_S) $(top_srcdir)/latex/lthtlwg.enc .
+@INCLUDE_LATEX_TRUE@thai-dummy.afm \
+@INCLUDE_LATEX_TRUE@thailigs.enc \
+@INCLUDE_LATEX_TRUE@lthtlwg.enc \
+@INCLUDE_LATEX_TRUE@thailigs-sc.enc \
+@INCLUDE_LATEX_TRUE@lthtlwg-sc.enc \
+@INCLUDE_LATEX_TRUE@thailigs-osf.enc \
+@INCLUDE_LATEX_TRUE@lthtlwg-osf.enc \
+@INCLUDE_LATEX_TRUE@thailigs-osf-sc.enc \
+@INCLUDE_LATEX_TRUE@lthtlwg-osf-sc.enc \
+@INCLUDE_LATEX_TRUE@:
+@INCLUDE_LATEX_TRUE@ [ -e $@ ] || $(LN_S) $(top_srcdir)/latex/$@ .
@INCLUDE_LATEX_TRUE@thailigs.vpl: thai-dummy.afm thailigs.enc
@INCLUDE_LATEX_TRUE@ $(AFM2TFM) thai-dummy.afm -v $@ -T thailigs.enc thailigs.tfm
+@INCLUDE_LATEX_TRUE@thailigs-sc.vpl: thai-dummy.afm thailigs-sc.enc
+@INCLUDE_LATEX_TRUE@ $(AFM2TFM) thai-dummy.afm -v $@ -T thailigs-sc.enc thailigs-sc.tfm
+
+@INCLUDE_LATEX_TRUE@thailigs-osf.vpl: thai-dummy.afm thailigs-osf.enc
+@INCLUDE_LATEX_TRUE@ $(AFM2TFM) thai-dummy.afm -v $@ -T thailigs-osf.enc thailigs-osf.tfm
+
+@INCLUDE_LATEX_TRUE@thailigs-osf-sc.vpl: thai-dummy.afm thailigs-osf-sc.enc
+@INCLUDE_LATEX_TRUE@ $(AFM2TFM) thai-dummy.afm -v $@ -T thailigs-osf-sc.enc thailigs-osf-sc.tfm
+
+#
+# merge_ligs(font-vpl-file,ligs-vpl-file)
+#
+# Replaces LIGTABLE in font-vpl-file with that in ligs-vpl-file.
+#
+@INCLUDE_LATEX_TRUE@define merge_ligs
+@INCLUDE_LATEX_TRUE@ TMPFILE=`mktemp /tmp/tltx.XXXXXXXXX` && \
+@INCLUDE_LATEX_TRUE@ $(AWK) "BEGIN {show=1} /LIGTABLE/ {show=0} {if(show) print}" $(1) > $$TMPFILE && \
+@INCLUDE_LATEX_TRUE@ $(AWK) "BEGIN {show=0} /LIGTABLE/ {show=1} /CHARACTER/ {show=0} {if(show) print}" $(2) >> $$TMPFILE && \
+@INCLUDE_LATEX_TRUE@ $(AWK) "BEGIN {show=0} /CHARACTER/ {show=1} {if(show) print}" $(1) >> $$TMPFILE && \
+@INCLUDE_LATEX_TRUE@ mv $$TMPFILE $(1)
+@INCLUDE_LATEX_TRUE@endef
+
+@INCLUDE_LATEX_TRUE@r%-osf-sc.tfm: %.afm
+@INCLUDE_LATEX_TRUE@%-osf-sc.vpl: %.afm thailigs-osf-sc.vpl lthtlwg-osf-sc.enc
+@INCLUDE_LATEX_TRUE@ $(AFM2TFM) $*.afm -v $*-osf-sc.vpl -T lthtlwg-osf-sc.enc r$*-osf-sc.tfm \
+@INCLUDE_LATEX_TRUE@ | $(SED) "s/$$/ <$*.pfb/" >> $(MAP)
+@INCLUDE_LATEX_TRUE@ $(call merge_ligs,$*-osf-sc.vpl,thailigs-osf-sc.vpl)
+
+@INCLUDE_LATEX_TRUE@r%-osf.tfm: %.afm
+@INCLUDE_LATEX_TRUE@%-osf.vpl: %.afm thailigs-osf.vpl lthtlwg-osf.enc
+@INCLUDE_LATEX_TRUE@ $(AFM2TFM) $*.afm -v $*-osf.vpl -T lthtlwg-osf.enc r$*-osf.tfm \
+@INCLUDE_LATEX_TRUE@ | $(SED) "s/$$/ <$*.pfb/" >> $(MAP)
+@INCLUDE_LATEX_TRUE@ $(call merge_ligs,$*-osf.vpl,thailigs-osf.vpl)
+
+@INCLUDE_LATEX_TRUE@r%-sc.tfm: %.afm
+@INCLUDE_LATEX_TRUE@%-sc.vpl: %.afm thailigs-sc.vpl lthtlwg-sc.enc
+@INCLUDE_LATEX_TRUE@ $(AFM2TFM) $*.afm -v $*-sc.vpl -T lthtlwg-sc.enc r$*-sc.tfm \
+@INCLUDE_LATEX_TRUE@ | $(SED) "s/$$/ <$*.pfb/" >> $(MAP)
+@INCLUDE_LATEX_TRUE@ $(call merge_ligs,$*-sc.vpl,thailigs-sc.vpl)
+
@INCLUDE_LATEX_TRUE@r%.tfm: %.afm
@INCLUDE_LATEX_TRUE@%.vpl: %.afm thailigs.vpl lthtlwg.enc
@INCLUDE_LATEX_TRUE@ $(AFM2TFM) $*.afm -v $*.vpl -T lthtlwg.enc r$*.tfm \
@INCLUDE_LATEX_TRUE@ | $(SED) "s/$$/ <$*.pfb/" >> $(MAP)
-@INCLUDE_LATEX_TRUE@ TMPFILE=`mktemp /tmp/tltx.XXXXXXXXX` && \
-@INCLUDE_LATEX_TRUE@ $(AWK) "BEGIN {show=1} /LIGTABLE/ {show=0} {if(show) print}" $*.vpl > $$TMPFILE && \
-@INCLUDE_LATEX_TRUE@ $(AWK) "BEGIN {show=0} /LIGTABLE/ {show=1} /CHARACTER/ {show=0} {if(show) print}" thailigs.vpl >> $$TMPFILE && \
-@INCLUDE_LATEX_TRUE@ $(AWK) "BEGIN {show=0} /CHARACTER/ {show=1} {if(show) print}" $*.vpl >> $$TMPFILE && \
-@INCLUDE_LATEX_TRUE@ mv $$TMPFILE $*.vpl
+@INCLUDE_LATEX_TRUE@ $(call merge_ligs,$*.vpl,thailigs.vpl)
@INCLUDE_LATEX_TRUE@%.tfm: %.vpl
@INCLUDE_LATEX_TRUE@ $(VPTOVF) $*
diff --git a/Master/texmf-dist/source/fonts/fonts-tlwg/nf/Norasi-Bold.sfd b/Master/texmf-dist/source/fonts/fonts-tlwg/nf/Norasi-Bold.sfd
index e11a126b0c5..887ea1921b4 100644
--- a/Master/texmf-dist/source/fonts/fonts-tlwg/nf/Norasi-Bold.sfd
+++ b/Master/texmf-dist/source/fonts/fonts-tlwg/nf/Norasi-Bold.sfd
@@ -4,7 +4,7 @@ FullName: Norasi Bold
FamilyName: Norasi
Weight: Bold
Copyright: Copyright (C) 1999, The National Font Project (v.beta). Yannis Haralambous, Virach Sornlertlamvanich and Anutara Tantraporn. All rights reserved.\n\nModified under GNU General Public License, with creators' permission, by Thai Linux Working Group (TLWG).
-Version: 006.001
+Version: 006.003
ItalicAngle: 0
UnderlinePosition: -100
UnderlineWidth: 50
@@ -20,7 +20,7 @@ OS2Version: 4
OS2_WeightWidthSlopeOnly: 0
OS2_UseTypoMetrics: 1
CreationTime: 1153665578
-ModificationTime: 1587808317
+ModificationTime: 1622977050
PfmFamily: 17
TTFWeight: 700
TTFWidth: 5
@@ -41,6 +41,8 @@ HheadAOffset: 0
HheadDescent: -488
HheadDOffset: 0
OS2Vendor: 'PfEd'
+Lookup: 1 0 0 "'onum' Oldstyle Figures" { "'onum' Oldstyle Figures" ("oldstyle") } ['onum' ('latn' <'dflt' > ) ]
+Lookup: 1 0 0 "'smcp' Lowercase to Small Capitals in Latin" { "'smcp' Lowercase to Small Capitals in Latin" } ['smcp' ('latn' <'dflt' > ) ]
Lookup: 4 0 1 "'liga' Standard Ligatures in Latin lookup 3" { "'liga' Standard Ligatures in Latin lookup 3 subtable" } ['liga' ('latn' <'dflt' > ) ]
Lookup: 4 0 1 "'liga' Standard Ligatures lookup 2" { "'liga' Standard Ligatures lookup 2 subtable" } ['liga' ('DFLT' <'dflt' > 'latn' <'dflt' > ) ]
Lookup: 4 0 0 "'frac' Diagonal Fractions lookup 4" { "'frac' Diagonal Fractions lookup 4 subtable" } ['frac' ('DFLT' <'dflt' > ) ]
@@ -1450,7 +1452,7 @@ DisplaySize: -72
DisplayLayer: 2
AntiAlias: 1
FitToEm: 1
-WinInfo: 200 8 2
+WinInfo: 320 8 2
BeginPrivate: 8
BlueValues 31 [-19 0 461 473 564 576 677 691]
OtherBlues 11 [-163 -151]
@@ -4803,6 +4805,7 @@ SplineSet
213 15 213 15 250 15 c 0,14,15
EndSplineSet
Kerns2: 21 10 "'kern' Horizontal Kerning lookup 5 subtable" 18 -31 "'kern' Horizontal Kerning lookup 5 subtable" 24 6 "'kern' Horizontal Kerning lookup 5 subtable"
+Substitution2: "'onum' Oldstyle Figures" zerooldstyle
EndChar
StartChar: one
@@ -4940,6 +4943,7 @@ SplineSet
186 579 186 579 149 579 c 0,0,1
EndSplineSet
Kerns2: 13 -15 "'kern' Horizontal Kerning lookup 5 subtable" 25 -34 "'kern' Horizontal Kerning lookup 5 subtable" 22 -15 "'kern' Horizontal Kerning lookup 5 subtable" 21 -56 "'kern' Horizontal Kerning lookup 5 subtable" 26 -9 "'kern' Horizontal Kerning lookup 5 subtable" 18 -26 "'kern' Horizontal Kerning lookup 5 subtable" 15 -16 "'kern' Horizontal Kerning lookup 5 subtable" 24 -56 "'kern' Horizontal Kerning lookup 5 subtable" 23 -47 "'kern' Horizontal Kerning lookup 5 subtable" 20 -9 "'kern' Horizontal Kerning lookup 5 subtable" 19 -1 "'kern' Horizontal Kerning lookup 5 subtable" 17 -34 "'kern' Horizontal Kerning lookup 5 subtable"
+Substitution2: "'onum' Oldstyle Figures" oneoldstyle
EndChar
StartChar: two
@@ -5106,6 +5110,7 @@ SplineSet
300 368 300 368 300 447 c 0,0,1
EndSplineSet
Kerns2: 21 13 "'kern' Horizontal Kerning lookup 5 subtable" 18 -28 "'kern' Horizontal Kerning lookup 5 subtable" 24 -6 "'kern' Horizontal Kerning lookup 5 subtable"
+Substitution2: "'onum' Oldstyle Figures" twooldstyle
EndChar
StartChar: three
@@ -5308,6 +5313,7 @@ SplineSet
354 100 354 100 354 154 c 0,0,1
EndSplineSet
Kerns2: 21 9 "'kern' Horizontal Kerning lookup 5 subtable" 18 -32 "'kern' Horizontal Kerning lookup 5 subtable" 24 -15 "'kern' Horizontal Kerning lookup 5 subtable"
+Substitution2: "'onum' Oldstyle Figures" threeoldstyle
EndChar
StartChar: four
@@ -5475,6 +5481,7 @@ SplineSet
270 255 l 1,13,-1
EndSplineSet
Kerns2: 21 12 "'kern' Horizontal Kerning lookup 5 subtable" 18 -34 "'kern' Horizontal Kerning lookup 5 subtable" 24 -15 "'kern' Horizontal Kerning lookup 5 subtable"
+Substitution2: "'onum' Oldstyle Figures" fouroldstyle
EndChar
StartChar: five
@@ -5682,6 +5689,7 @@ SplineSet
57 141 57 141 83 141 c 0,0,1
EndSplineSet
Kerns2: 18 -28 "'kern' Horizontal Kerning lookup 5 subtable" 24 -9 "'kern' Horizontal Kerning lookup 5 subtable"
+Substitution2: "'onum' Oldstyle Figures" fiveoldstyle
EndChar
StartChar: six
@@ -5878,6 +5886,7 @@ SplineSet
185 355 185 355 185 242 c 0,20,21
EndSplineSet
Kerns2: 21 12 "'kern' Horizontal Kerning lookup 5 subtable" 18 -42 "'kern' Horizontal Kerning lookup 5 subtable" 24 -6 "'kern' Horizontal Kerning lookup 5 subtable"
+Substitution2: "'onum' Oldstyle Figures" sixoldstyle
EndChar
StartChar: seven
@@ -6019,6 +6028,7 @@ SplineSet
478 677 l 1,0,-1
EndSplineSet
Kerns2: 27 -63 "'kern' Horizontal Kerning lookup 5 subtable" 13 -56 "'kern' Horizontal Kerning lookup 5 subtable" 25 -18 "'kern' Horizontal Kerning lookup 5 subtable" 22 -34 "'kern' Horizontal Kerning lookup 5 subtable" 21 -53 "'kern' Horizontal Kerning lookup 5 subtable" 18 -25 "'kern' Horizontal Kerning lookup 5 subtable" 15 -57 "'kern' Horizontal Kerning lookup 5 subtable" 24 -6 "'kern' Horizontal Kerning lookup 5 subtable" 23 -37 "'kern' Horizontal Kerning lookup 5 subtable" 20 -19 "'kern' Horizontal Kerning lookup 5 subtable" 19 -21 "'kern' Horizontal Kerning lookup 5 subtable"
+Substitution2: "'onum' Oldstyle Figures" sevenoldstyle
EndChar
StartChar: eight
@@ -6255,6 +6265,7 @@ SplineSet
282 251 282 251 201 306 c 1,36,37
EndSplineSet
Kerns2: 21 10 "'kern' Horizontal Kerning lookup 5 subtable" 18 -18 "'kern' Horizontal Kerning lookup 5 subtable"
+Substitution2: "'onum' Oldstyle Figures" eightoldstyle
EndChar
StartChar: nine
@@ -6437,6 +6448,7 @@ SplineSet
316 414 316 414 316 458 c 0,20,21
EndSplineSet
Kerns2: 21 1 "'kern' Horizontal Kerning lookup 5 subtable" 18 -25 "'kern' Horizontal Kerning lookup 5 subtable" 24 9 "'kern' Horizontal Kerning lookup 5 subtable"
+Substitution2: "'onum' Oldstyle Figures" nineoldstyle
EndChar
StartChar: colon
@@ -15015,6 +15027,7 @@ SplineSet
257 57 257 57 293 100 c 1,41,-1
EndSplineSet
Kerns2: 75 -38 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 114 -34 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 87 -38 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 88 -40 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 90 -44 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Asmall
EndChar
StartChar: b
@@ -15214,6 +15227,7 @@ SplineSet
224 392 224 392 211 360 c 1,19,-1
EndSplineSet
Kerns2: 87 -38 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 88 -40 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 90 -41 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Bsmall
EndChar
StartChar: c
@@ -15388,6 +15402,7 @@ SplineSet
384 77 384 77 412 108 c 1,0,-1
EndSplineSet
Kerns2: 73 -16 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 76 -18 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Csmall
EndChar
StartChar: d
@@ -15619,6 +15634,7 @@ SplineSet
285 42 285 42 313 76 c 1,37,38
335 96 335 96 335 111 c 2,27,-1
EndSplineSet
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Dsmall
EndChar
StartChar: e
@@ -15766,6 +15782,7 @@ SplineSet
297 297 l 2,23,24
EndSplineSet
Kerns2: 114 -18 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 85 -9 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 87 -28 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 88 -29 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 89 -18 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 90 -31 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Esmall
EndChar
StartChar: f
@@ -15999,6 +16016,7 @@ SplineSet
267 561 267 561 267 584 c 0,0,1
EndSplineSet
Kerns2: 66 -16 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 277 -16 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 280 13 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 233 -21 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 281 -15 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 70 -28 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 284 -28 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 71 12 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 74 22 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 77 32 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 80 -31 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 293 -31 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 296 10 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 234 -28 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 308 -31 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 114 18 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 84 -7 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 85 -3 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Fsmall
EndChar
StartChar: g
@@ -16337,6 +16355,7 @@ SplineSet
275 442 275 442 240 442 c 128,-1,51
EndSplineSet
Kerns2: 66 -15 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 280 -15 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 233 -18 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 281 -15 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 70 -19 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 284 -19 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 293 -19 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 296 -19 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Gsmall
EndChar
StartChar: h
@@ -16583,6 +16602,7 @@ SplineSet
346 406 346 406 294 406 c 0,0,1
EndSplineSet
Kerns2: 114 -29 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 90 -34 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Hsmall
EndChar
StartChar: i
@@ -16776,6 +16796,7 @@ SplineSet
106 691 106 691 138 691 c 0,16,17
EndSplineSet
Kerns2: 53 -18 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 75 -35 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Ismall
EndChar
StartChar: j
@@ -17001,6 +17022,7 @@ SplineSet
108 646 108 646 130.5 668.5 c 128,-1,36
153 691 153 691 185 691 c 0,26,27
EndSplineSet
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Jsmall
EndChar
StartChar: k
@@ -17265,6 +17287,7 @@ SplineSet
357 391 357 391 357 412 c 128,-1,1
EndSplineSet
Kerns2: 66 -3 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 277 -3 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 280 -3 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 233 -6 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 281 -3 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 70 -32 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 284 -32 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 72 -3 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 14 -47 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 80 -37 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 293 -37 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 296 -37 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 84 4 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 86 -4 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 300 -4 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Ksmall
EndChar
StartChar: l
@@ -17391,6 +17414,7 @@ SplineSet
207 677 l 1,0,-1
EndSplineSet
Kerns2: 87 -22 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 90 -18 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Lsmall
EndChar
StartChar: m
@@ -17734,6 +17758,7 @@ SplineSet
323 406 323 406 294 406 c 0,0,1
EndSplineSet
Kerns2: 81 -15 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 87 -31 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 88 -32 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 90 -32 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Msmall
EndChar
StartChar: n
@@ -17984,6 +18009,7 @@ SplineSet
352 406 352 406 299 406 c 0,0,1
EndSplineSet
Kerns2: 53 -56 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 81 -13 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 114 -28 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 87 -31 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 88 -31 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 90 -31 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Nsmall
EndChar
StartChar: o
@@ -18148,6 +18174,7 @@ SplineSet
296 442 296 442 252 442 c 0,10,11
EndSplineSet
Kerns2: 53 -88 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 114 -26 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 85 -9 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 87 -41 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 88 -37 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 89 -28 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 90 -41 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Osmall
EndChar
StartChar: p
@@ -18382,6 +18409,7 @@ SplineSet
376 416 376 416 300 416 c 0,29,30
EndSplineSet
Kerns2: 85 -10 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 90 -34 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Psmall
EndChar
StartChar: q
@@ -18602,6 +18630,7 @@ SplineSet
328 40 328 40 341 98 c 1,24,-1
EndSplineSet
Kerns2: 68 -12 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 86 -15 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Qsmall
EndChar
StartChar: r
@@ -18799,6 +18828,7 @@ SplineSet
399 328 399 328 371 328 c 0,0,1
EndSplineSet
Kerns2: 66 -6 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 277 -6 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 278 -6 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 280 -6 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 233 -7 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 276 -6 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 281 -6 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 68 -15 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 282 -9 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 27 -15 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 13 -66 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 69 -12 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 70 -10 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 284 -10 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 285 -10 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 283 -10 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 71 10 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 72 -4 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 73 -15 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 14 -18 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 74 6 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 75 -12 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 76 -15 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 77 -13 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 78 6 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 79 3 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 80 -13 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 293 -13 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 294 -13 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 296 -13 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 234 -12 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 292 -13 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 308 -13 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 81 3 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 15 -67 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 82 -15 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 114 -7 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 28 -15 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 85 9 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 86 9 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 87 7 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 88 6 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 89 10 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 90 9 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Rsmall
EndChar
StartChar: s
@@ -19158,6 +19188,7 @@ SplineSet
115 473 115 473 185 473 c 0,0,1
EndSplineSet
Kerns2: 114 -16 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 85 -6 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Ssmall
EndChar
StartChar: t
@@ -19337,6 +19368,7 @@ SplineSet
305 461 l 1,0,-1
EndSplineSet
Kerns2: 52 10 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 66 10 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 277 10 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 280 10 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 233 6 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 281 10 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 27 -12 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 73 -3 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 80 -3 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 293 -3 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 296 -3 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 114 -31 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 28 -12 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Tsmall
EndChar
StartChar: u
@@ -19552,6 +19584,7 @@ SplineSet
399 5 399 5 343 -13 c 1,0,-1
EndSplineSet
Kerns2: 114 -25 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Usmall
EndChar
StartChar: v
@@ -19764,6 +19797,7 @@ SplineSet
485 461 l 1,0,-1
EndSplineSet
Kerns2: 66 -22 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 277 -22 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 278 -22 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 280 -22 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 233 -25 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 276 -22 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 281 -22 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 279 -22 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 68 -40 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 27 -22 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 13 -56 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 70 -34 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 284 -34 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 285 -34 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 283 -34 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 72 -22 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 14 -26 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 77 -15 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 80 -40 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 293 -40 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 296 -40 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 292 -40 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 308 -38 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 15 -56 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 84 -15 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 28 -22 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Vsmall
EndChar
StartChar: w
@@ -20201,6 +20235,7 @@ SplineSet
707 461 l 1,0,-1
EndSplineSet
Kerns2: 66 -22 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 277 -22 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 278 -22 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 280 -22 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 233 -25 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 276 -22 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 281 -22 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 279 -22 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 68 -35 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 27 -22 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 13 -50 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 70 -32 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 284 -32 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 285 -32 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 283 -32 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 72 -22 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 14 -22 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 77 -15 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 80 -35 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 293 -35 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 296 -35 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 292 -35 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 308 -34 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 15 -50 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 84 -15 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 28 -22 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Wsmall
EndChar
StartChar: x
@@ -20505,6 +20540,7 @@ SplineSet
280 311 280 311 286 303 c 1,0,1
EndSplineSet
Kerns2: 66 -1 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 68 -29 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 70 -26 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 284 -26 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 80 -29 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 82 -31 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Xsmall
EndChar
StartChar: y
@@ -20928,6 +20964,7 @@ SplineSet
138 -89 138 -89 138 -111 c 0,0,1
EndSplineSet
Kerns2: 66 -31 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 277 -31 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 278 -31 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 280 -31 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 233 -34 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 276 -31 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 281 -31 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 279 -31 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 68 -41 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 27 -28 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 13 -56 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 70 -40 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 284 -40 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 285 -40 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 283 -40 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 72 -31 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 14 -28 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 77 -18 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 80 -41 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 293 -41 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 296 -41 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 292 -41 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 308 -40 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 15 -56 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 84 -23 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 28 -28 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Ysmall
EndChar
StartChar: z
@@ -21113,6 +21150,7 @@ SplineSet
369 89 369 89 393 160 c 1,17,-1
420 160 l 1,0,-1
EndSplineSet
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Zsmall
EndChar
StartChar: braceleft
@@ -42094,7 +42132,7 @@ SplineSet
EndSplineSet
EndChar
-StartChar: uni25CC
+StartChar: dottedcircle
Encoding: 9676 9676 188
Width: 602
Flags: W
diff --git a/Master/texmf-dist/source/fonts/fonts-tlwg/nf/Norasi-BoldItalic.sfd b/Master/texmf-dist/source/fonts/fonts-tlwg/nf/Norasi-BoldItalic.sfd
index bcd310d3537..b4810e9f5a0 100644
--- a/Master/texmf-dist/source/fonts/fonts-tlwg/nf/Norasi-BoldItalic.sfd
+++ b/Master/texmf-dist/source/fonts/fonts-tlwg/nf/Norasi-BoldItalic.sfd
@@ -4,7 +4,7 @@ FullName: Norasi Bold Italic
FamilyName: Norasi
Weight: Bold
Copyright: Copyright (C) 1999, The National Font Project (v.beta). Yannis Haralambous, Virach Sornlertlamvanich and Anutara Tantraporn. All rights reserved.\n\nModified under GNU General Public License, with creators' permission, by Thai Linux Working Group (TLWG).
-Version: 006.000
+Version: 006.003
ItalicAngle: -15.5
UnderlinePosition: -100
UnderlineWidth: 50
@@ -20,7 +20,7 @@ OS2Version: 4
OS2_WeightWidthSlopeOnly: 0
OS2_UseTypoMetrics: 1
CreationTime: 1153665670
-ModificationTime: 1587807227
+ModificationTime: 1622977091
PfmFamily: 17
TTFWeight: 700
TTFWidth: 5
@@ -41,6 +41,8 @@ HheadAOffset: 0
HheadDescent: -488
HheadDOffset: 0
OS2Vendor: 'PfEd'
+Lookup: 1 0 0 "'onum' Oldstyle Figures" { "'onum' Oldstyle Figures" ("oldstyle") } ['onum' ('latn' <'dflt' > ) ]
+Lookup: 1 0 0 "'smcp' Lowercase to Small Capitals in Latin" { "'smcp' Lowercase to Small Capitals in Latin" } ['smcp' ('latn' <'dflt' > ) ]
Lookup: 4 0 1 "'liga' Standard Ligatures lookup 2" { "'liga' Standard Ligatures lookup 2 subtable" } ['liga' ('DFLT' <'dflt' > 'latn' <'dflt' > ) ]
Lookup: 4 0 1 "'liga' Standard Ligatures in Latin lookup 3" { "'liga' Standard Ligatures in Latin lookup 3 subtable" } ['liga' ('latn' <'dflt' > ) ]
Lookup: 4 0 0 "'frac' Diagonal Fractions lookup 4" { "'frac' Diagonal Fractions lookup 4 subtable" } ['frac' ('DFLT' <'dflt' > ) ]
@@ -1573,7 +1575,7 @@ DisplaySize: -72
DisplayLayer: 2
AntiAlias: 1
FitToEm: 1
-WinInfo: 200 8 2
+WinInfo: 320 8 2
BeginPrivate: 8
BlueValues 39 [-18 0 450 461 562 576 669 686 699 699]
OtherBlues 11 [-205 -205]
@@ -5046,6 +5048,7 @@ SplineSet
374 653 374 653 325 653 c 0,14,15
EndSplineSet
Kerns2: 18 -50 "'kern' Horizontal Kerning lookup 5 subtable" 24 -12 "'kern' Horizontal Kerning lookup 5 subtable"
+Substitution2: "'onum' Oldstyle Figures" zerooldstyle
EndChar
StartChar: one
@@ -5213,6 +5216,7 @@ SplineSet
4 0 l 1,0,-1
EndSplineSet
Kerns2: 13 -37 "'kern' Horizontal Kerning lookup 5 subtable" 25 -56 "'kern' Horizontal Kerning lookup 5 subtable" 22 -44 "'kern' Horizontal Kerning lookup 5 subtable" 21 -75 "'kern' Horizontal Kerning lookup 5 subtable" 26 -40 "'kern' Horizontal Kerning lookup 5 subtable" 18 -47 "'kern' Horizontal Kerning lookup 5 subtable" 15 -38 "'kern' Horizontal Kerning lookup 5 subtable" 24 -64 "'kern' Horizontal Kerning lookup 5 subtable" 23 -62 "'kern' Horizontal Kerning lookup 5 subtable" 20 -42 "'kern' Horizontal Kerning lookup 5 subtable" 19 -31 "'kern' Horizontal Kerning lookup 5 subtable" 17 -47 "'kern' Horizontal Kerning lookup 5 subtable"
+Substitution2: "'onum' Oldstyle Figures" oneoldstyle
EndChar
StartChar: two
@@ -5366,6 +5370,7 @@ SplineSet
419 190 l 1,0,-1
EndSplineSet
Kerns2: 21 -7 "'kern' Horizontal Kerning lookup 5 subtable" 18 -47 "'kern' Horizontal Kerning lookup 5 subtable" 24 -26 "'kern' Horizontal Kerning lookup 5 subtable"
+Substitution2: "'onum' Oldstyle Figures" twooldstyle
EndChar
StartChar: three
@@ -5570,6 +5575,7 @@ SplineSet
286 122 286 122 286 189 c 0,0,1
EndSplineSet
Kerns2: 21 -15 "'kern' Horizontal Kerning lookup 5 subtable" 18 -66 "'kern' Horizontal Kerning lookup 5 subtable" 24 -26 "'kern' Horizontal Kerning lookup 5 subtable"
+Substitution2: "'onum' Oldstyle Figures" threeoldstyle
EndChar
StartChar: four
@@ -5818,6 +5824,7 @@ SplineSet
53 248 l 1,11,-1
EndSplineSet
Kerns2: 18 -50 "'kern' Horizontal Kerning lookup 5 subtable" 24 -21 "'kern' Horizontal Kerning lookup 5 subtable"
+Substitution2: "'onum' Oldstyle Figures" fouroldstyle
EndChar
StartChar: five
@@ -6021,6 +6028,7 @@ SplineSet
23 123 23 123 48 123 c 0,0,1
EndSplineSet
Kerns2: 21 -12 "'kern' Horizontal Kerning lookup 5 subtable" 18 -56 "'kern' Horizontal Kerning lookup 5 subtable" 24 -37 "'kern' Horizontal Kerning lookup 5 subtable"
+Substitution2: "'onum' Oldstyle Figures" fiveoldstyle
EndChar
StartChar: six
@@ -6210,6 +6218,7 @@ SplineSet
319 382 319 382 250 382 c 0,21,22
EndSplineSet
Kerns2: 21 1 "'kern' Horizontal Kerning lookup 5 subtable" 18 -51 "'kern' Horizontal Kerning lookup 5 subtable" 24 -31 "'kern' Horizontal Kerning lookup 5 subtable"
+Substitution2: "'onum' Oldstyle Figures" sixoldstyle
EndChar
StartChar: seven
@@ -6344,6 +6353,7 @@ SplineSet
111 528 111 528 83 479 c 1,0,-1
EndSplineSet
Kerns2: 27 -89 "'kern' Horizontal Kerning lookup 5 subtable" 13 -79 "'kern' Horizontal Kerning lookup 5 subtable" 25 -45 "'kern' Horizontal Kerning lookup 5 subtable" 22 -59 "'kern' Horizontal Kerning lookup 5 subtable" 21 -78 "'kern' Horizontal Kerning lookup 5 subtable" 18 -42 "'kern' Horizontal Kerning lookup 5 subtable" 15 -81 "'kern' Horizontal Kerning lookup 5 subtable" 24 -26 "'kern' Horizontal Kerning lookup 5 subtable" 23 -59 "'kern' Horizontal Kerning lookup 5 subtable" 20 -41 "'kern' Horizontal Kerning lookup 5 subtable" 19 -29 "'kern' Horizontal Kerning lookup 5 subtable"
+Substitution2: "'onum' Oldstyle Figures" sevenoldstyle
EndChar
StartChar: eight
@@ -6604,6 +6614,7 @@ SplineSet
259 453 259 453 311 403 c 1,34,35
EndSplineSet
Kerns2: 21 -3 "'kern' Horizontal Kerning lookup 5 subtable" 18 -51 "'kern' Horizontal Kerning lookup 5 subtable" 24 -12 "'kern' Horizontal Kerning lookup 5 subtable"
+Substitution2: "'onum' Oldstyle Figures" eightoldstyle
EndChar
StartChar: nine
@@ -6783,6 +6794,7 @@ SplineSet
363 650 363 650 313 650 c 0,23,24
EndSplineSet
Kerns2: 21 -18 "'kern' Horizontal Kerning lookup 5 subtable" 18 -66 "'kern' Horizontal Kerning lookup 5 subtable" 24 -12 "'kern' Horizontal Kerning lookup 5 subtable"
+Substitution2: "'onum' Oldstyle Figures" nineoldstyle
EndChar
StartChar: colon
@@ -16452,6 +16464,7 @@ SplineSet
303 335 303 335 303 374 c 0,30,31
EndSplineSet
Kerns2: 75 -1 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 114 -22 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 87 -4 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 88 -4 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 90 -3 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Asmall
EndChar
StartChar: b
@@ -16763,6 +16776,7 @@ SplineSet
127 21 127 21 141 21 c 0,24,25
EndSplineSet
Kerns2: 87 -12 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 88 -12 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 90 -16 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Bsmall
EndChar
StartChar: c
@@ -16950,6 +16964,7 @@ SplineSet
293 429 293 429 271 429 c 0,0,1
EndSplineSet
Kerns2: 73 -19 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 76 -15 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Csmall
EndChar
StartChar: d
@@ -17263,6 +17278,7 @@ SplineSet
256 181 256 181 282 260 c 128,-1,51
308 339 308 339 308 371 c 0,37,38
EndSplineSet
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Dsmall
EndChar
StartChar: e
@@ -17427,6 +17443,7 @@ SplineSet
206 429 206 429 148 214 c 1,25,26
EndSplineSet
Kerns2: 114 -12 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 85 -3 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 87 -3 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 88 -3 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 89 -15 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 90 -6 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Esmall
EndChar
StartChar: f
@@ -17799,6 +17816,7 @@ SplineSet
346 594 346 594 346 614 c 0,0,1
EndSplineSet
Kerns2: 277 -23 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 280 16 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 233 -31 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 281 -19 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 284 -35 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 293 -31 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 296 19 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 234 -34 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 308 -28 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 66 -22 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 70 -34 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 71 1 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 74 19 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 75 12 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 77 42 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 80 -29 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 114 12 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 84 -13 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 85 9 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Fsmall
EndChar
StartChar: g
@@ -18155,6 +18173,7 @@ SplineSet
151 185 151 185 193 185 c 0,62,63
EndSplineSet
Kerns2: 280 -25 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 233 -34 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 281 -25 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 284 -31 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 293 -26 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 296 -26 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 66 -25 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 70 -31 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 77 -21 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 83 3 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Gsmall
EndChar
StartChar: h
@@ -18457,6 +18476,7 @@ SplineSet
187 283 l 1,0,1
EndSplineSet
Kerns2: 114 -31 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 90 -19 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Hsmall
EndChar
StartChar: i
@@ -18701,6 +18721,7 @@ SplineSet
168 686 168 686 193 686 c 0,25,26
EndSplineSet
Kerns2: 53 -19 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 75 -4 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Ismall
EndChar
StartChar: j
@@ -18943,6 +18964,7 @@ SplineSet
144 645 144 645 163.5 665.5 c 128,-1,40
183 686 183 686 209 686 c 0,30,31
EndSplineSet
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Jsmall
EndChar
StartChar: k
@@ -19222,6 +19244,7 @@ SplineSet
149 187 l 1,0,-1
EndSplineSet
Kerns2: 277 9 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 280 9 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 233 1 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 281 9 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 284 -1 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 300 1 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 66 9 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 13 18 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 70 -1 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 72 -13 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 15 16 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 86 1 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Ksmall
EndChar
StartChar: l
@@ -19412,6 +19435,7 @@ SplineSet
163 62 163 62 215 141 c 1,0,-1
EndSplineSet
Kerns2: 87 -12 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 90 -7 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Lsmall
EndChar
StartChar: m
@@ -19888,6 +19912,7 @@ SplineSet
625 59 625 59 631 59 c 0,0,1
EndSplineSet
Kerns2: 87 -15 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 88 -15 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 90 -15 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Msmall
EndChar
StartChar: n
@@ -20249,6 +20274,7 @@ SplineSet
179 264 l 1,0,1
EndSplineSet
Kerns2: 53 -59 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 81 -3 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 114 -31 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 87 -19 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 88 -19 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 90 -19 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Nsmall
EndChar
StartChar: o
@@ -20404,6 +20430,7 @@ SplineSet
143 16 143 16 166 16 c 0,12,13
EndSplineSet
Kerns2: 53 -75 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 114 -22 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 85 -1 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 87 -21 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 88 -21 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 89 -25 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 90 -28 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Osmall
EndChar
StartChar: p
@@ -20681,6 +20708,7 @@ SplineSet
321 315 321 315 321 342 c 0,33,34
EndSplineSet
Kerns2: 85 -1 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 90 -12 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Psmall
EndChar
StartChar: q
@@ -21110,6 +21138,7 @@ SplineSet
325 334 325 334 325 371 c 0,33,34
EndSplineSet
Kerns2: 68 -6 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 86 -4 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Qsmall
EndChar
StartChar: r
@@ -21258,6 +21287,7 @@ SplineSet
356 324 356 324 330 324 c 0,0,1
EndSplineSet
Kerns2: 277 -12 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 278 -12 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 280 -12 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 233 -22 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 276 -12 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 281 -12 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 282 -7 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 284 -19 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 285 -19 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 283 -19 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 293 -15 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 294 -15 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 296 -15 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 234 -18 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 292 -15 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 308 -12 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 66 -12 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 68 -15 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 27 -29 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 13 -66 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 69 -13 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 70 -19 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 71 7 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 72 -3 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 73 -15 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 14 -12 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 74 16 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 75 12 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 76 -10 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 77 -12 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 78 9 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 79 6 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 80 -15 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 81 15 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 15 -69 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 82 -18 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 83 13 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 28 -29 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 85 12 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 86 10 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 87 19 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 88 19 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 89 6 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 90 19 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 91 9 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Rsmall
EndChar
StartChar: s
@@ -21552,6 +21582,7 @@ SplineSet
120 461 120 461 182 461 c 0,0,1
EndSplineSet
Kerns2: 114 -22 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 85 -6 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Ssmall
EndChar
StartChar: t
@@ -21858,6 +21889,7 @@ SplineSet
198 407 l 1,0,1
EndSplineSet
Kerns2: 277 9 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 280 9 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 233 1 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 281 9 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 284 -1 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 52 -10 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 66 9 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 27 -22 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 70 -1 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 73 -4 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 114 -18 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 28 -22 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Tsmall
EndChar
StartChar: u
@@ -22125,6 +22157,7 @@ SplineSet
422 59 422 59 472 133 c 1,0,-1
EndSplineSet
Kerns2: 114 -32 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Usmall
EndChar
StartChar: v
@@ -22313,6 +22346,7 @@ SplineSet
401 422 401 422 401 395 c 0,0,1
EndSplineSet
Kerns2: 277 -19 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 278 -19 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 280 -19 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 233 -28 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 276 -19 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 281 -19 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 279 -19 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 284 -28 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 285 -28 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 283 -28 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 293 -23 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 296 -23 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 292 -23 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 308 -22 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 66 -19 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 68 -23 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 27 -50 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 13 -50 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 70 -28 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 72 -19 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 77 -23 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 80 -23 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 15 -50 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 84 -18 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 28 -50 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Vsmall
EndChar
StartChar: w
@@ -22636,6 +22670,7 @@ SplineSet
538 269 538 269 538 311 c 0,0,1
EndSplineSet
Kerns2: 277 -23 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 278 -23 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 280 -23 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 233 -31 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 276 -23 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 281 -23 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 279 -23 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 284 -34 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 285 -34 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 283 -34 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 293 -29 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 296 -29 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 292 -29 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 308 -28 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 66 -23 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 68 -29 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 27 -56 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 13 -53 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 70 -34 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 72 -25 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 14 -6 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 77 -28 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 80 -29 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 15 -53 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 84 -23 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 28 -56 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Wsmall
EndChar
StartChar: x
@@ -23104,6 +23139,7 @@ SplineSet
435 349 435 349 413 349 c 0,0,1
EndSplineSet
Kerns2: 284 -13 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 68 -9 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 70 -13 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 80 -10 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 82 -12 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Xsmall
EndChar
StartChar: y
@@ -23287,6 +23323,7 @@ SplineSet
38 -125 38 -125 50 -125 c 0,0,1
EndSplineSet
Kerns2: 277 -12 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 278 -12 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 280 -12 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 233 -18 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 276 -12 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 281 -12 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 279 -12 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 284 -22 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 285 -22 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 283 -22 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 293 -18 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 296 -18 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 292 -18 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 308 -16 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 66 -10 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 68 -16 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 27 -42 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 13 -25 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 70 -22 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 72 -22 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 14 1 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 77 -15 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 80 -16 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 15 -25 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 84 -12 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 28 -44 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Ysmall
EndChar
StartChar: z
@@ -23520,6 +23557,7 @@ SplineSet
119 -37 119 -37 87.5 -16.5 c 128,-1,38
56 4 56 4 34 4 c 0,0,1
EndSplineSet
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Zsmall
EndChar
StartChar: braceleft
@@ -48367,7 +48405,7 @@ SplineSet
EndSplineSet
EndChar
-StartChar: uni25CC
+StartChar: dottedcircle
Encoding: 9676 9676 188
Width: 602
Flags: W
diff --git a/Master/texmf-dist/source/fonts/fonts-tlwg/nf/Norasi-BoldOblique.sfd b/Master/texmf-dist/source/fonts/fonts-tlwg/nf/Norasi-BoldOblique.sfd
index e8a5951b84f..13de0ca8aeb 100644
--- a/Master/texmf-dist/source/fonts/fonts-tlwg/nf/Norasi-BoldOblique.sfd
+++ b/Master/texmf-dist/source/fonts/fonts-tlwg/nf/Norasi-BoldOblique.sfd
@@ -4,7 +4,7 @@ FullName: Norasi Bold Oblique
FamilyName: Norasi
Weight: Bold
Copyright: Copyright (C) 1999, The National Font Project (v.beta). Yannis Haralambous, Virach Sornlertlamvanich and Anutara Tantraporn. All rights reserved.\n\nModified under GNU General Public License, with creators' permission, by Thai Linux Working Group (TLWG).
-Version: 006.001
+Version: 006.003
ItalicAngle: -12
UnderlinePosition: -100
UnderlineWidth: 50
@@ -20,7 +20,7 @@ OS2Version: 4
OS2_WeightWidthSlopeOnly: 0
OS2_UseTypoMetrics: 1
CreationTime: 1153665622
-ModificationTime: 1587807160
+ModificationTime: 1622977068
PfmFamily: 17
TTFWeight: 700
TTFWidth: 5
@@ -41,6 +41,8 @@ HheadAOffset: 0
HheadDescent: -488
HheadDOffset: 0
OS2Vendor: 'PfEd'
+Lookup: 1 0 0 "'onum' Oldstyle Figures" { "'onum' Oldstyle Figures" ("oldstyle") } ['onum' ('latn' <'dflt' > ) ]
+Lookup: 1 0 0 "'smcp' Lowercase to Small Capitals in Latin" { "'smcp' Lowercase to Small Capitals in Latin" } ['smcp' ('latn' <'dflt' > ) ]
Lookup: 4 0 1 "'liga' Standard Ligatures lookup 2" { "'liga' Standard Ligatures lookup 2 subtable" } ['liga' ('DFLT' <'dflt' > 'latn' <'dflt' > ) ]
Lookup: 4 0 1 "'liga' Standard Ligatures in Latin lookup 3" { "'liga' Standard Ligatures in Latin lookup 3 subtable" } ['liga' ('latn' <'dflt' > ) ]
Lookup: 4 0 0 "'frac' Diagonal Fractions lookup 4" { "'frac' Diagonal Fractions lookup 4 subtable" } ['frac' ('DFLT' <'dflt' > ) ]
@@ -1585,7 +1587,7 @@ DisplaySize: -72
DisplayLayer: 2
AntiAlias: 1
FitToEm: 1
-WinInfo: 200 8 2
+WinInfo: 312 8 2
BeginPrivate: 8
BlueValues 31 [-19 0 461 473 564 576 677 691]
OtherBlues 11 [-163 -151]
@@ -5087,6 +5089,7 @@ SplineSet
342 110 342 110 365 223 c 2,16,-1
EndSplineSet
Kerns2: 21 10 "'kern' Horizontal Kerning lookup 5 subtable" 18 -31 "'kern' Horizontal Kerning lookup 5 subtable" 24 6 "'kern' Horizontal Kerning lookup 5 subtable"
+Substitution2: "'onum' Oldstyle Figures" zerooldstyle
EndChar
StartChar: one
@@ -5233,6 +5236,7 @@ SplineSet
299 579 299 579 272 579 c 0,0,1
EndSplineSet
Kerns2: 13 -15 "'kern' Horizontal Kerning lookup 5 subtable" 25 -34 "'kern' Horizontal Kerning lookup 5 subtable" 22 -15 "'kern' Horizontal Kerning lookup 5 subtable" 21 -56 "'kern' Horizontal Kerning lookup 5 subtable" 26 -9 "'kern' Horizontal Kerning lookup 5 subtable" 18 -26 "'kern' Horizontal Kerning lookup 5 subtable" 15 -16 "'kern' Horizontal Kerning lookup 5 subtable" 24 -56 "'kern' Horizontal Kerning lookup 5 subtable" 23 -47 "'kern' Horizontal Kerning lookup 5 subtable" 20 -9 "'kern' Horizontal Kerning lookup 5 subtable" 19 -1 "'kern' Horizontal Kerning lookup 5 subtable" 17 -34 "'kern' Horizontal Kerning lookup 5 subtable"
+Substitution2: "'onum' Oldstyle Figures" oneoldstyle
EndChar
StartChar: two
@@ -5405,6 +5409,7 @@ SplineSet
397 397 397 397 397 470 c 0,0,1
EndSplineSet
Kerns2: 21 13 "'kern' Horizontal Kerning lookup 5 subtable" 18 -28 "'kern' Horizontal Kerning lookup 5 subtable" 24 -6 "'kern' Horizontal Kerning lookup 5 subtable"
+Substitution2: "'onum' Oldstyle Figures" twooldstyle
EndChar
StartChar: three
@@ -5589,6 +5594,7 @@ SplineSet
76 133 76 133 108 133 c 0,0,1
EndSplineSet
Kerns2: 21 9 "'kern' Horizontal Kerning lookup 5 subtable" 18 -32 "'kern' Horizontal Kerning lookup 5 subtable" 24 -15 "'kern' Horizontal Kerning lookup 5 subtable"
+Substitution2: "'onum' Oldstyle Figures" threeoldstyle
EndChar
StartChar: four
@@ -5832,6 +5838,7 @@ SplineSet
324 255 l 1,13,-1
EndSplineSet
Kerns2: 21 12 "'kern' Horizontal Kerning lookup 5 subtable" 18 -34 "'kern' Horizontal Kerning lookup 5 subtable" 24 -15 "'kern' Horizontal Kerning lookup 5 subtable"
+Substitution2: "'onum' Oldstyle Figures" fouroldstyle
EndChar
StartChar: five
@@ -6027,6 +6034,7 @@ SplineSet
83 141 83 141 113 141 c 0,0,1
EndSplineSet
Kerns2: 18 -28 "'kern' Horizontal Kerning lookup 5 subtable" 24 -9 "'kern' Horizontal Kerning lookup 5 subtable"
+Substitution2: "'onum' Oldstyle Figures" fiveoldstyle
EndChar
StartChar: six
@@ -6222,6 +6230,7 @@ SplineSet
215 151 215 151 215 83 c 0,21,22
EndSplineSet
Kerns2: 21 12 "'kern' Horizontal Kerning lookup 5 subtable" 18 -42 "'kern' Horizontal Kerning lookup 5 subtable" 24 -6 "'kern' Horizontal Kerning lookup 5 subtable"
+Substitution2: "'onum' Oldstyle Figures" sixoldstyle
EndChar
StartChar: seven
@@ -6359,6 +6368,7 @@ SplineSet
621 677 l 1,0,-1
EndSplineSet
Kerns2: 27 -63 "'kern' Horizontal Kerning lookup 5 subtable" 13 -56 "'kern' Horizontal Kerning lookup 5 subtable" 25 -18 "'kern' Horizontal Kerning lookup 5 subtable" 22 -34 "'kern' Horizontal Kerning lookup 5 subtable" 21 -53 "'kern' Horizontal Kerning lookup 5 subtable" 18 -25 "'kern' Horizontal Kerning lookup 5 subtable" 15 -57 "'kern' Horizontal Kerning lookup 5 subtable" 24 -6 "'kern' Horizontal Kerning lookup 5 subtable" 23 -37 "'kern' Horizontal Kerning lookup 5 subtable" 20 -19 "'kern' Horizontal Kerning lookup 5 subtable" 19 -21 "'kern' Horizontal Kerning lookup 5 subtable"
+Substitution2: "'onum' Oldstyle Figures" sevenoldstyle
EndChar
StartChar: eight
@@ -6616,6 +6626,7 @@ SplineSet
177 19 177 19 250 19 c 0,36,37
EndSplineSet
Kerns2: 21 10 "'kern' Horizontal Kerning lookup 5 subtable" 18 -18 "'kern' Horizontal Kerning lookup 5 subtable"
+Substitution2: "'onum' Oldstyle Figures" eightoldstyle
EndChar
StartChar: nine
@@ -6800,6 +6811,7 @@ SplineSet
431 534 431 534 431 584 c 0,21,22
EndSplineSet
Kerns2: 21 1 "'kern' Horizontal Kerning lookup 5 subtable" 18 -25 "'kern' Horizontal Kerning lookup 5 subtable" 24 9 "'kern' Horizontal Kerning lookup 5 subtable"
+Substitution2: "'onum' Oldstyle Figures" nineoldstyle
EndChar
StartChar: colon
@@ -16393,6 +16405,7 @@ SplineSet
344 245 l 1,51,52
EndSplineSet
Kerns2: 75 -38 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 114 -34 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 87 -38 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 88 -40 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 90 -44 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Asmall
EndChar
StartChar: b
@@ -16694,6 +16707,7 @@ SplineSet
323 419 323 419 287 360 c 1,23,-1
EndSplineSet
Kerns2: 87 -38 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 88 -40 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 90 -41 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Bsmall
EndChar
StartChar: c
@@ -16881,6 +16895,7 @@ SplineSet
495 421 495 421 495 381 c 0,0,1
EndSplineSet
Kerns2: 73 -16 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 76 -18 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Csmall
EndChar
StartChar: d
@@ -17192,6 +17207,7 @@ SplineSet
407 383 407 383 390 400 c 128,-1,43
373 417 373 417 347 417 c 0,30,31
EndSplineSet
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Dsmall
EndChar
StartChar: e
@@ -17378,6 +17394,7 @@ SplineSet
245 372 245 372 224 283 c 1,22,-1
EndSplineSet
Kerns2: 114 -18 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 85 -9 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 87 -28 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 88 -29 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 89 -18 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 90 -31 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Esmall
EndChar
StartChar: f
@@ -17642,6 +17659,7 @@ SplineSet
517 645 517 645 517 606 c 0,0,1
EndSplineSet
Kerns2: 66 -16 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 277 -16 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 280 13 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 233 -21 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 281 -15 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 70 -28 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 284 -28 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 71 12 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 74 22 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 77 32 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 80 -31 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 293 -31 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 296 10 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 234 -28 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 308 -31 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 114 18 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 84 -7 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 85 -3 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Fsmall
EndChar
StartChar: g
@@ -17981,6 +17999,7 @@ SplineSet
382 442 382 442 334 442 c 0,54,55
EndSplineSet
Kerns2: 66 -15 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 280 -15 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 233 -18 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 281 -15 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 70 -19 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 284 -19 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 293 -19 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 296 -19 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Gsmall
EndChar
StartChar: h
@@ -18337,6 +18356,7 @@ SplineSet
419 406 419 406 381 406 c 0,0,1
EndSplineSet
Kerns2: 114 -29 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 90 -34 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Hsmall
EndChar
StartChar: i
@@ -18538,6 +18558,7 @@ SplineSet
187 569 187 569 187 595 c 0,20,21
EndSplineSet
Kerns2: 53 -18 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 75 -35 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Ismall
EndChar
StartChar: j
@@ -18780,6 +18801,7 @@ SplineSet
271 536 271 536 253.5 552.5 c 128,-1,38
236 569 236 569 236 595 c 0,27,28
EndSplineSet
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Jsmall
EndChar
StartChar: k
@@ -19094,6 +19116,7 @@ SplineSet
445 408 445 408 445 415 c 0,0,1
EndSplineSet
Kerns2: 66 -3 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 277 -3 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 280 -3 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 233 -6 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 281 -3 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 70 -32 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 284 -32 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 72 -3 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 14 -47 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 80 -37 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 293 -37 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 296 -37 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 84 4 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 86 -4 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 300 -4 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Ksmall
EndChar
StartChar: l
@@ -19281,6 +19304,7 @@ SplineSet
350 677 l 1,0,-1
EndSplineSet
Kerns2: 87 -22 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 90 -18 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Lsmall
EndChar
StartChar: m
@@ -19766,6 +19790,7 @@ SplineSet
422 406 422 406 381 406 c 0,0,1
EndSplineSet
Kerns2: 81 -15 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 87 -31 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 88 -32 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 90 -32 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Msmall
EndChar
StartChar: n
@@ -20120,6 +20145,7 @@ SplineSet
425 406 425 406 385 406 c 0,0,1
EndSplineSet
Kerns2: 53 -56 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 81 -13 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 114 -28 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 87 -31 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 88 -31 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 90 -31 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Nsmall
EndChar
StartChar: o
@@ -20276,6 +20302,7 @@ SplineSet
373 442 373 442 346 442 c 0,13,14
EndSplineSet
Kerns2: 53 -88 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 114 -26 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 85 -9 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 87 -41 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 88 -37 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 89 -28 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 90 -41 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Osmall
EndChar
StartChar: p
@@ -20591,6 +20618,7 @@ SplineSet
275 42 275 42 300 42 c 0,33,34
EndSplineSet
Kerns2: 85 -10 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 90 -34 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Psmall
EndChar
StartChar: q
@@ -20891,6 +20919,7 @@ SplineSet
393 441 393 441 369 441 c 0,27,28
EndSplineSet
Kerns2: 68 -12 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 86 -15 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Qsmall
EndChar
StartChar: r
@@ -21129,6 +21158,7 @@ SplineSet
479 328 479 328 441 328 c 0,0,1
EndSplineSet
Kerns2: 66 -6 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 277 -6 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 278 -6 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 280 -6 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 233 -7 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 276 -6 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 281 -6 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 68 -15 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 282 -9 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 27 -15 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 13 -66 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 69 -12 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 70 -10 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 284 -10 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 285 -10 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 283 -10 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 71 10 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 72 -4 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 73 -15 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 14 -18 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 74 6 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 75 -12 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 76 -15 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 77 -13 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 78 6 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 79 3 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 80 -13 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 293 -13 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 294 -13 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 296 -13 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 234 -12 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 292 -13 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 308 -13 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 81 3 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 15 -67 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 82 -15 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 114 -7 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 28 -15 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 85 9 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 86 9 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 87 7 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 88 6 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 89 10 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 90 9 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Rsmall
EndChar
StartChar: s
@@ -21413,6 +21443,7 @@ SplineSet
288 -15 288 -15 204 -15 c 0,0,1
EndSplineSet
Kerns2: 114 -16 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 85 -6 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Ssmall
EndChar
StartChar: t
@@ -21629,6 +21660,7 @@ SplineSet
403 461 l 1,0,-1
EndSplineSet
Kerns2: 52 10 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 66 10 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 277 10 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 280 10 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 233 6 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 281 10 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 27 -12 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 73 -3 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 80 -3 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 293 -3 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 296 -3 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 114 -31 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 28 -12 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Tsmall
EndChar
StartChar: u
@@ -22008,6 +22040,7 @@ SplineSet
383 1 383 1 340 -13 c 1,0,-1
EndSplineSet
Kerns2: 114 -25 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Usmall
EndChar
StartChar: v
@@ -22204,6 +22237,7 @@ SplineSet
583 461 l 1,0,-1
EndSplineSet
Kerns2: 66 -22 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 277 -22 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 278 -22 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 280 -22 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 233 -25 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 276 -22 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 281 -22 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 279 -22 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 68 -40 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 27 -22 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 13 -56 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 70 -34 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 284 -34 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 285 -34 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 283 -34 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 72 -22 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 14 -26 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 77 -15 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 80 -40 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 293 -40 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 296 -40 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 292 -40 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 308 -38 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 15 -56 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 84 -15 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 28 -22 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Vsmall
EndChar
StartChar: w
@@ -22546,6 +22580,7 @@ SplineSet
579 195 579 195 579 180 c 1,0,1
EndSplineSet
Kerns2: 66 -22 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 277 -22 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 278 -22 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 280 -22 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 233 -25 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 276 -22 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 281 -22 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 279 -22 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 68 -35 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 27 -22 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 13 -50 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 70 -32 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 284 -32 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 285 -32 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 283 -32 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 72 -22 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 14 -22 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 77 -15 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 80 -35 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 293 -35 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 296 -35 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 292 -35 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 308 -34 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 15 -50 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 84 -15 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 28 -22 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Wsmall
EndChar
StartChar: x
@@ -23022,6 +23057,7 @@ SplineSet
249 171 l 1,0,1
EndSplineSet
Kerns2: 66 -1 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 68 -29 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 70 -26 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 284 -26 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 80 -29 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 82 -31 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Xsmall
EndChar
StartChar: y
@@ -23309,6 +23345,7 @@ SplineSet
107 -133 l 1,0,1
EndSplineSet
Kerns2: 66 -31 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 277 -31 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 278 -31 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 280 -31 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 233 -34 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 276 -31 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 281 -31 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 279 -31 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 68 -41 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 27 -28 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 13 -56 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 70 -40 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 284 -40 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 285 -40 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 283 -40 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 72 -31 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 14 -28 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 77 -18 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 80 -41 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 293 -41 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 296 -41 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 292 -41 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 308 -40 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 15 -56 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 84 -23 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 28 -28 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Ysmall
EndChar
StartChar: z
@@ -23477,6 +23514,7 @@ SplineSet
192 32 l 1,18,-1
221 32 l 2,0,1
EndSplineSet
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Zsmall
EndChar
StartChar: braceleft
diff --git a/Master/texmf-dist/source/fonts/fonts-tlwg/nf/Norasi-Italic.sfd b/Master/texmf-dist/source/fonts/fonts-tlwg/nf/Norasi-Italic.sfd
index 82b26535d2c..4b57d494b3c 100644
--- a/Master/texmf-dist/source/fonts/fonts-tlwg/nf/Norasi-Italic.sfd
+++ b/Master/texmf-dist/source/fonts/fonts-tlwg/nf/Norasi-Italic.sfd
@@ -4,7 +4,7 @@ FullName: Norasi Italic
FamilyName: Norasi
Weight: Regular
Copyright: Copyright (C) 1999, The National Font Project (v.beta). Yannis Haralambous, Virach Sornlertlamvanich and Anutara Tantraporn. All rights reserved.\n\nModified under GNU General Public License, with creators' permission, by Thai Linux Working Group (TLWG).
-Version: 006.001
+Version: 006.003
ItalicAngle: -15.5
UnderlinePosition: -100
UnderlineWidth: 50
@@ -20,7 +20,7 @@ OS2Version: 4
OS2_WeightWidthSlopeOnly: 0
OS2_UseTypoMetrics: 1
CreationTime: 1153665708
-ModificationTime: 1587807044
+ModificationTime: 1622977019
PfmFamily: 17
TTFWeight: 400
TTFWidth: 5
@@ -41,6 +41,8 @@ HheadAOffset: 0
HheadDescent: -488
HheadDOffset: 0
OS2Vendor: 'PfEd'
+Lookup: 1 0 0 "'onum' Oldstyle Figures" { "'onum' Oldstyle Figures" ("oldstyle") } ['onum' ('latn' <'dflt' > ) ]
+Lookup: 1 0 0 "'smcp' Lowercase to Small Capitals in Latin" { "'smcp' Lowercase to Small Capitals in Latin" } ['smcp' ('latn' <'dflt' > ) ]
Lookup: 4 0 1 "'liga' Standard Ligatures lookup 2" { "'liga' Standard Ligatures lookup 2 subtable" } ['liga' ('DFLT' <'dflt' > 'latn' <'dflt' > ) ]
Lookup: 4 0 1 "'liga' Standard Ligatures in Latin lookup 3" { "'liga' Standard Ligatures in Latin lookup 3 subtable" } ['liga' ('latn' <'dflt' > ) ]
Lookup: 4 0 0 "'frac' Diagonal Fractions lookup 4" { "'frac' Diagonal Fractions lookup 4 subtable" } ['frac' ('DFLT' <'dflt' > ) ]
@@ -1450,7 +1452,7 @@ DisplaySize: -72
DisplayLayer: 2
AntiAlias: 1
FitToEm: 1
-WinInfo: 200 8 2
+WinInfo: 312 8 2
BeginPrivate: 9
BlueValues 55 [-18 0 432 442 450 458 551 564 653 666 677 677 683 683]
OtherBlues 11 [-207 -207]
@@ -4750,6 +4752,7 @@ SplineSet
417 647 417 647 334 647 c 0,15,16
EndSplineSet
Kerns2: 20 13 "'kern' Horizontal Kerning lookup 5 subtable" 17 -50 "'kern' Horizontal Kerning lookup 5 subtable" 23 -3 "'kern' Horizontal Kerning lookup 5 subtable"
+Substitution2: "'onum' Oldstyle Figures" zerooldstyle
EndChar
StartChar: one
@@ -4955,6 +4958,7 @@ SplineSet
48 0 l 1,0,-1
EndSplineSet
Kerns2: 12 -51 "'kern' Horizontal Kerning lookup 5 subtable" 24 -56 "'kern' Horizontal Kerning lookup 5 subtable" 21 -54 "'kern' Horizontal Kerning lookup 5 subtable" 20 -69 "'kern' Horizontal Kerning lookup 5 subtable" 25 -60 "'kern' Horizontal Kerning lookup 5 subtable" 17 -69 "'kern' Horizontal Kerning lookup 5 subtable" 14 -56 "'kern' Horizontal Kerning lookup 5 subtable" 23 -59 "'kern' Horizontal Kerning lookup 5 subtable" 22 -50 "'kern' Horizontal Kerning lookup 5 subtable" 19 -54 "'kern' Horizontal Kerning lookup 5 subtable" 18 -50 "'kern' Horizontal Kerning lookup 5 subtable" 16 -40 "'kern' Horizontal Kerning lookup 5 subtable"
+Substitution2: "'onum' Oldstyle Figures" oneoldstyle
EndChar
StartChar: two
@@ -5160,6 +5164,7 @@ SplineSet
382 102 382 102 400 139 c 1,0,-1
EndSplineSet
Kerns2: 20 -12 "'kern' Horizontal Kerning lookup 5 subtable" 17 -44 "'kern' Horizontal Kerning lookup 5 subtable" 23 -22 "'kern' Horizontal Kerning lookup 5 subtable"
+Substitution2: "'onum' Oldstyle Figures" twooldstyle
EndChar
StartChar: three
@@ -5361,6 +5366,7 @@ SplineSet
327 151 327 151 327 195 c 0,0,1
EndSplineSet
Kerns2: 20 -9 "'kern' Horizontal Kerning lookup 5 subtable" 17 -75 "'kern' Horizontal Kerning lookup 5 subtable" 23 -15 "'kern' Horizontal Kerning lookup 5 subtable"
+Substitution2: "'onum' Oldstyle Figures" threeoldstyle
EndChar
StartChar: four
@@ -5612,6 +5618,7 @@ SplineSet
277 242 l 1,11,-1
EndSplineSet
Kerns2: 20 12 "'kern' Horizontal Kerning lookup 5 subtable" 17 -69 "'kern' Horizontal Kerning lookup 5 subtable" 23 -26 "'kern' Horizontal Kerning lookup 5 subtable"
+Substitution2: "'onum' Oldstyle Figures" fouroldstyle
EndChar
StartChar: five
@@ -5829,6 +5836,7 @@ SplineSet
350 160 350 160 350 242 c 0,0,1
EndSplineSet
Kerns2: 20 -4 "'kern' Horizontal Kerning lookup 5 subtable" 17 -70 "'kern' Horizontal Kerning lookup 5 subtable" 23 -28 "'kern' Horizontal Kerning lookup 5 subtable"
+Substitution2: "'onum' Oldstyle Figures" fiveoldstyle
EndChar
StartChar: six
@@ -6018,6 +6026,7 @@ SplineSet
157 19 157 19 204 19 c 0,22,23
EndSplineSet
Kerns2: 20 16 "'kern' Horizontal Kerning lookup 5 subtable" 17 -63 "'kern' Horizontal Kerning lookup 5 subtable" 23 -37 "'kern' Horizontal Kerning lookup 5 subtable"
+Substitution2: "'onum' Oldstyle Figures" sixoldstyle
EndChar
StartChar: seven
@@ -6127,6 +6136,7 @@ SplineSet
538 656 l 1,0,-1
EndSplineSet
Kerns2: 26 -88 "'kern' Horizontal Kerning lookup 5 subtable" 12 -78 "'kern' Horizontal Kerning lookup 5 subtable" 24 -31 "'kern' Horizontal Kerning lookup 5 subtable" 21 -53 "'kern' Horizontal Kerning lookup 5 subtable" 20 -64 "'kern' Horizontal Kerning lookup 5 subtable" 17 -47 "'kern' Horizontal Kerning lookup 5 subtable" 14 -82 "'kern' Horizontal Kerning lookup 5 subtable" 23 -10 "'kern' Horizontal Kerning lookup 5 subtable" 22 -37 "'kern' Horizontal Kerning lookup 5 subtable" 19 -41 "'kern' Horizontal Kerning lookup 5 subtable" 18 -12 "'kern' Horizontal Kerning lookup 5 subtable"
+Substitution2: "'onum' Oldstyle Figures" sevenoldstyle
EndChar
StartChar: eight
@@ -6450,6 +6460,7 @@ SplineSet
252 454 252 454 311 398 c 1,38,39
EndSplineSet
Kerns2: 20 12 "'kern' Horizontal Kerning lookup 5 subtable" 17 -50 "'kern' Horizontal Kerning lookup 5 subtable"
+Substitution2: "'onum' Oldstyle Figures" eightoldstyle
EndChar
StartChar: nine
@@ -6636,6 +6647,7 @@ SplineSet
364 650 364 650 318 650 c 0,24,25
EndSplineSet
Kerns2: 20 1 "'kern' Horizontal Kerning lookup 5 subtable" 17 -63 "'kern' Horizontal Kerning lookup 5 subtable" 23 -4 "'kern' Horizontal Kerning lookup 5 subtable"
+Substitution2: "'onum' Oldstyle Figures" nineoldstyle
EndChar
StartChar: colon
@@ -15736,6 +15748,7 @@ SplineSet
332 419 332 419 304 419 c 0,31,32
EndSplineSet
Kerns2: 74 -22 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 113 -28 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 87 3 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 89 1 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Asmall
EndChar
StartChar: b
@@ -16005,6 +16018,7 @@ SplineSet
350 393 350 393 318 393 c 0,25,26
EndSplineSet
Kerns2: 86 -9 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 87 -6 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 89 -3 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Bsmall
EndChar
StartChar: c
@@ -16188,6 +16202,7 @@ SplineSet
353 420 353 420 315 420 c 0,0,1
EndSplineSet
Kerns2: 72 -29 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 75 -28 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Csmall
EndChar
StartChar: d
@@ -16498,6 +16513,7 @@ SplineSet
297 135 297 135 326.5 210.5 c 128,-1,52
356 286 356 286 356 360 c 0,40,41
EndSplineSet
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Dsmall
EndChar
StartChar: e
@@ -16668,6 +16684,7 @@ SplineSet
177 318 177 318 152 252 c 2,25,-1
EndSplineSet
Kerns2: 113 -21 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 84 -15 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 87 1 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 88 -9 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 89 3 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Esmall
EndChar
StartChar: f
@@ -16972,6 +16989,7 @@ SplineSet
-70 -128 -70 -128 -70 -144 c 0,0,1
EndSplineSet
Kerns2: 65 -25 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 276 -26 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 279 -1 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 232 -29 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 280 -16 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 69 -31 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 283 -34 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 70 29 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 73 16 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 74 12 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 76 41 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 79 -28 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 292 -29 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 295 -1 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 233 -23 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 307 -31 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 113 18 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 84 18 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Fsmall
EndChar
StartChar: g
@@ -17314,6 +17332,7 @@ SplineSet
206 171 206 171 234 171 c 0,60,61
EndSplineSet
Kerns2: 65 -40 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 279 -41 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 232 -45 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 280 -41 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 69 -44 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 283 -44 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 76 -45 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 292 -40 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 295 -40 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 82 -21 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Gsmall
EndChar
StartChar: h
@@ -17612,6 +17631,7 @@ SplineSet
448 404 448 404 448 374 c 0,0,1
EndSplineSet
Kerns2: 113 -31 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 89 -3 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Hsmall
EndChar
StartChar: i
@@ -17865,6 +17885,7 @@ SplineSet
194 653 194 653 214 653 c 0,26,27
EndSplineSet
Kerns2: 52 -9 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 74 -31 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Ismall
EndChar
StartChar: j
@@ -18121,6 +18142,7 @@ SplineSet
179 623 179 623 192.5 638 c 128,-1,30
206 653 206 653 226 653 c 128,-1,31
EndSplineSet
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Jsmall
EndChar
StartChar: k
@@ -18430,6 +18452,7 @@ SplineSet
342 354 342 354 236 258 c 1,0,1
EndSplineSet
Kerns2: 65 12 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 276 12 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 279 12 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 232 9 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 280 12 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 12 26 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 69 4 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 283 4 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 71 -26 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 13 -26 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 79 6 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 292 6 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 295 6 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 14 25 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 85 7 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 299 7 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Ksmall
EndChar
StartChar: l
@@ -18612,6 +18635,7 @@ SplineSet
127 100 l 2,0,1
EndSplineSet
Kerns2: 86 -12 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 89 -10 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Lsmall
EndChar
StartChar: m
@@ -19072,6 +19096,7 @@ SplineSet
590 38 590 38 603 38 c 0,0,1
EndSplineSet
Kerns2: 80 -3 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 86 -6 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 87 -3 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 89 -3 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Msmall
EndChar
StartChar: n
@@ -19420,6 +19445,7 @@ SplineSet
460 117 l 1,0,-1
EndSplineSet
Kerns2: 52 -40 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 80 -6 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 113 -34 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 86 -9 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 87 -6 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 89 -6 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Nsmall
EndChar
StartChar: o
@@ -19575,6 +19601,7 @@ SplineSet
154 10 154 10 189 10 c 0,13,14
EndSplineSet
Kerns2: 52 -63 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 113 -23 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 84 -15 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 86 -18 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 87 -15 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 88 -32 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 89 -9 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Osmall
EndChar
StartChar: p
@@ -19788,6 +19815,7 @@ SplineSet
379 254 379 254 379 312 c 0,36,37
EndSplineSet
Kerns2: 84 -13 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 89 -3 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Psmall
EndChar
StartChar: q
@@ -20115,6 +20143,7 @@ SplineSet
141 42 141 42 167 42 c 0,31,32
EndSplineSet
Kerns2: 67 -12 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 85 -10 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Qsmall
EndChar
StartChar: r
@@ -20326,6 +20355,7 @@ SplineSet
412 340 412 340 366 340 c 0,0,1
EndSplineSet
Kerns2: 65 -28 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 276 -28 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 277 -28 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 279 -28 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 232 -35 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 275 -28 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 280 -28 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 67 -25 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 281 -16 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 26 -28 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 12 -67 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 68 -31 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 69 -34 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 283 -34 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 284 -34 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 282 -34 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 70 22 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 71 -21 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 72 -16 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 13 -51 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 73 7 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 74 3 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 75 -15 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 76 -21 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 77 16 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 78 15 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 79 -28 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 292 -28 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 293 -28 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 295 -28 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 233 -22 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 291 -28 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 307 -28 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 80 12 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 14 -72 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 81 -31 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 113 -3 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 82 3 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 27 -28 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 84 12 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 85 10 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 86 29 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 87 31 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 88 6 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 89 32 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Rsmall
EndChar
StartChar: s
@@ -20698,6 +20728,7 @@ SplineSet
305 61 305 61 264.5 24.5 c 128,-1,40
224 -12 224 -12 160 -12 c 0,0,1
EndSplineSet
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Ssmall
EndChar
StartChar: t
@@ -21005,6 +21036,7 @@ SplineSet
296 428 l 1,0,-1
EndSplineSet
Kerns2: 51 -9 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 65 -6 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 276 -6 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 279 -6 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 232 -9 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 280 -6 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 26 -28 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 69 -12 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 283 -12 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 72 -10 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 79 -10 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 292 -10 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 295 -10 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 113 -18 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 27 -25 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Tsmall
EndChar
StartChar: u
@@ -21311,6 +21343,7 @@ SplineSet
119 366 119 366 119 376 c 0,0,1
EndSplineSet
Kerns2: 113 -31 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Usmall
EndChar
StartChar: v
@@ -21611,6 +21644,7 @@ SplineSet
375 298 375 298 375 333 c 0,0,1
EndSplineSet
Kerns2: 65 -23 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 276 -25 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 277 -25 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 279 -25 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 232 -28 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 275 -25 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 280 -25 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 278 -25 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 67 -25 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 26 -47 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 12 -45 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 69 -29 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 283 -31 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 284 -31 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 282 -31 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 71 -35 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 76 -28 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 79 -25 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 292 -28 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 295 -28 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 291 -28 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 307 -28 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 14 -50 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 27 -47 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Vsmall
EndChar
StartChar: w
@@ -21864,6 +21898,7 @@ SplineSet
647 412 647 412 647 390 c 0,0,1
EndSplineSet
Kerns2: 65 -25 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 276 -28 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 277 -28 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 279 -28 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 232 -31 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 275 -28 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 280 -28 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 278 -28 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 67 -28 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 26 -48 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 12 -47 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 69 -31 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 283 -34 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 284 -34 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 282 -34 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 71 -37 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 13 -3 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 76 -29 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 79 -28 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 292 -29 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 295 -29 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 291 -29 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 307 -31 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 14 -50 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 27 -48 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Wsmall
EndChar
StartChar: x
@@ -22245,6 +22280,7 @@ SplineSet
315 44 315 44 334 44 c 0,0,1
EndSplineSet
Kerns2: 65 6 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 81 1 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Xsmall
EndChar
StartChar: y
@@ -22438,6 +22474,7 @@ SplineSet
-1 -123 -1 -123 15 -123 c 0,0,1
EndSplineSet
Kerns2: 65 -12 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 276 -12 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 277 -12 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 279 -12 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 232 -16 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 275 -12 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 280 -12 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 278 -12 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 67 -15 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 26 -47 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 12 -21 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 69 -18 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 283 -18 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 284 -18 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 282 -18 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 71 -34 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 13 6 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 76 -18 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 79 -15 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 292 -15 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 295 -15 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 291 -15 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 307 -15 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 14 -25 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 27 -44 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Ysmall
EndChar
StartChar: z
@@ -22708,6 +22745,7 @@ SplineSet
363 -35 363 -35 335 -58 c 128,-1,0
307 -81 307 -81 270 -81 c 128,-1,1
EndSplineSet
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Zsmall
EndChar
StartChar: braceleft
diff --git a/Master/texmf-dist/source/fonts/fonts-tlwg/nf/Norasi-Oblique.sfd b/Master/texmf-dist/source/fonts/fonts-tlwg/nf/Norasi-Oblique.sfd
index 4e3615bb50f..0107fcf2440 100644
--- a/Master/texmf-dist/source/fonts/fonts-tlwg/nf/Norasi-Oblique.sfd
+++ b/Master/texmf-dist/source/fonts/fonts-tlwg/nf/Norasi-Oblique.sfd
@@ -4,7 +4,7 @@ FullName: Norasi Oblique
FamilyName: Norasi
Weight: Regular
Copyright: Copyright (C) 1999, The National Font Project (v.beta). Yannis Haralambous, Virach Sornlertlamvanich and Anutara Tantraporn. All rights reserved.\n\nModified under GNU General Public License, with creators' permission, by Thai Linux Working Group (TLWG).
-Version: 006.001
+Version: 006.003
ItalicAngle: -12
UnderlinePosition: -100
UnderlineWidth: 50
@@ -20,7 +20,7 @@ OS2Version: 4
OS2_WeightWidthSlopeOnly: 0
OS2_UseTypoMetrics: 1
CreationTime: 1153665480
-ModificationTime: 1587806914
+ModificationTime: 1622976998
PfmFamily: 17
TTFWeight: 400
TTFWidth: 5
@@ -41,6 +41,8 @@ HheadAOffset: 0
HheadDescent: -488
HheadDOffset: 0
OS2Vendor: 'PfEd'
+Lookup: 1 0 0 "'onum' Oldstyle Figures" { "'onum' Oldstyle Figures" ("oldstyle") } ['onum' ('latn' <'dflt' > ) ]
+Lookup: 1 0 0 "'smcp' Lowercase to Small Capitals in Latin" { "'smcp' Lowercase to Small Capitals in Latin" } ['smcp' ('latn' <'dflt' > ) ]
Lookup: 4 0 1 "'liga' Standard Ligatures lookup 2" { "'liga' Standard Ligatures lookup 2 subtable" } ['liga' ('DFLT' <'dflt' > 'latn' <'dflt' > ) ]
Lookup: 4 0 1 "'liga' Standard Ligatures in Latin lookup 3" { "'liga' Standard Ligatures in Latin lookup 3 subtable" } ['liga' ('latn' <'dflt' > ) ]
Lookup: 4 0 0 "'frac' Diagonal Fractions lookup 4" { "'frac' Diagonal Fractions lookup 4 subtable" } ['frac' ('DFLT' <'dflt' > ) ]
@@ -1520,7 +1522,7 @@ DisplaySize: -72
DisplayLayer: 2
AntiAlias: 1
FitToEm: 1
-WinInfo: 208 8 2
+WinInfo: 320 8 2
BeginPrivate: 8
BlueValues 39 [-15 0 450 460 551 564 662 677 683 683]
ForceBold 5 false
@@ -4895,6 +4897,7 @@ SplineSet
472 650 472 650 388 650 c 0,15,16
EndSplineSet
Kerns2: 21 12 "'kern' Horizontal Kerning lookup 5 subtable" 18 -54 "'kern' Horizontal Kerning lookup 5 subtable" 24 -4 "'kern' Horizontal Kerning lookup 5 subtable"
+Substitution2: "'onum' Oldstyle Figures" zerooldstyle
EndChar
StartChar: one
@@ -5064,6 +5067,7 @@ SplineSet
331 593 331 593 309 593 c 0,0,1
EndSplineSet
Kerns2: 13 -47 "'kern' Horizontal Kerning lookup 5 subtable" 25 -67 "'kern' Horizontal Kerning lookup 5 subtable" 22 -37 "'kern' Horizontal Kerning lookup 5 subtable" 21 -72 "'kern' Horizontal Kerning lookup 5 subtable" 26 -60 "'kern' Horizontal Kerning lookup 5 subtable" 18 -78 "'kern' Horizontal Kerning lookup 5 subtable" 15 -54 "'kern' Horizontal Kerning lookup 5 subtable" 24 -78 "'kern' Horizontal Kerning lookup 5 subtable" 23 -66 "'kern' Horizontal Kerning lookup 5 subtable" 20 -41 "'kern' Horizontal Kerning lookup 5 subtable" 19 -34 "'kern' Horizontal Kerning lookup 5 subtable" 17 -53 "'kern' Horizontal Kerning lookup 5 subtable"
+Substitution2: "'onum' Oldstyle Figures" oneoldstyle
EndChar
StartChar: two
@@ -5286,6 +5290,7 @@ SplineSet
504 138 l 1,0,-1
EndSplineSet
Kerns2: 18 -59 "'kern' Horizontal Kerning lookup 5 subtable" 24 -15 "'kern' Horizontal Kerning lookup 5 subtable"
+Substitution2: "'onum' Oldstyle Figures" twooldstyle
EndChar
StartChar: three
@@ -5462,6 +5467,7 @@ SplineSet
392 402 392 402 390 401 c 1,0,1
EndSplineSet
Kerns2: 21 -6 "'kern' Horizontal Kerning lookup 5 subtable" 18 -75 "'kern' Horizontal Kerning lookup 5 subtable" 24 -28 "'kern' Horizontal Kerning lookup 5 subtable"
+Substitution2: "'onum' Oldstyle Figures" threeoldstyle
EndChar
StartChar: four
@@ -5710,6 +5716,7 @@ SplineSet
341 231 l 1,11,-1
EndSplineSet
Kerns2: 21 13 "'kern' Horizontal Kerning lookup 5 subtable" 18 -75 "'kern' Horizontal Kerning lookup 5 subtable" 24 -41 "'kern' Horizontal Kerning lookup 5 subtable"
+Substitution2: "'onum' Oldstyle Figures" fouroldstyle
EndChar
StartChar: five
@@ -5929,6 +5936,7 @@ SplineSet
404 156 404 156 404 242 c 0,0,1
EndSplineSet
Kerns2: 21 -7 "'kern' Horizontal Kerning lookup 5 subtable" 18 -69 "'kern' Horizontal Kerning lookup 5 subtable" 24 -35 "'kern' Horizontal Kerning lookup 5 subtable"
+Substitution2: "'onum' Oldstyle Figures" fiveoldstyle
EndChar
StartChar: six
@@ -6123,6 +6131,7 @@ SplineSet
223 15 223 15 272 15 c 0,22,23
EndSplineSet
Kerns2: 21 12 "'kern' Horizontal Kerning lookup 5 subtable" 18 -73 "'kern' Horizontal Kerning lookup 5 subtable" 24 -28 "'kern' Horizontal Kerning lookup 5 subtable"
+Substitution2: "'onum' Oldstyle Figures" sixoldstyle
EndChar
StartChar: seven
@@ -6221,6 +6230,7 @@ SplineSet
590 662 l 1,0,-1
EndSplineSet
Kerns2: 27 -67 "'kern' Horizontal Kerning lookup 5 subtable" 13 -72 "'kern' Horizontal Kerning lookup 5 subtable" 25 -40 "'kern' Horizontal Kerning lookup 5 subtable" 22 -59 "'kern' Horizontal Kerning lookup 5 subtable" 21 -63 "'kern' Horizontal Kerning lookup 5 subtable" 18 -56 "'kern' Horizontal Kerning lookup 5 subtable" 15 -78 "'kern' Horizontal Kerning lookup 5 subtable" 24 -19 "'kern' Horizontal Kerning lookup 5 subtable" 23 -45 "'kern' Horizontal Kerning lookup 5 subtable" 20 -34 "'kern' Horizontal Kerning lookup 5 subtable" 19 -31 "'kern' Horizontal Kerning lookup 5 subtable"
+Substitution2: "'onum' Oldstyle Figures" sevenoldstyle
EndChar
StartChar: eight
@@ -6497,6 +6507,7 @@ SplineSet
425 647 425 647 382 647 c 0,45,46
EndSplineSet
Kerns2: 18 -63 "'kern' Horizontal Kerning lookup 5 subtable" 24 -15 "'kern' Horizontal Kerning lookup 5 subtable"
+Substitution2: "'onum' Oldstyle Figures" eightoldstyle
EndChar
StartChar: nine
@@ -6677,6 +6688,7 @@ SplineSet
262 280 262 280 306 280 c 0,21,22
EndSplineSet
Kerns2: 21 -6 "'kern' Horizontal Kerning lookup 5 subtable" 18 -63 "'kern' Horizontal Kerning lookup 5 subtable" 24 -6 "'kern' Horizontal Kerning lookup 5 subtable"
+Substitution2: "'onum' Oldstyle Figures" nineoldstyle
EndChar
StartChar: colon
@@ -16194,6 +16206,7 @@ SplineSet
344 268 l 1,50,51
EndSplineSet
Kerns2: 75 -25 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 114 -40 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 87 -29 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 88 -31 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 90 -31 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Asmall
EndChar
StartChar: b
@@ -16465,6 +16478,7 @@ SplineSet
218 22 218 22 255 22 c 0,27,28
EndSplineSet
Kerns2: 87 -28 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 88 -29 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 90 -31 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Bsmall
EndChar
StartChar: c
@@ -16649,6 +16663,7 @@ SplineSet
476 408 476 408 476 371 c 0,0,1
EndSplineSet
Kerns2: 73 -15 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 76 -18 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Csmall
EndChar
StartChar: d
@@ -16981,6 +16996,7 @@ SplineSet
412 385 412 385 389 408.5 c 128,-1,50
366 432 366 432 331 432 c 0,36,37
EndSplineSet
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Dsmall
EndChar
StartChar: e
@@ -17172,6 +17188,7 @@ SplineSet
204 423 204 423 166 309 c 1,23,-1
EndSplineSet
Kerns2: 114 -29 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 85 -9 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 87 -26 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 88 -28 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 89 -34 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 90 -29 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Esmall
EndChar
StartChar: f
@@ -17424,6 +17441,7 @@ SplineSet
486 580 486 580 464 580 c 0,0,1
EndSplineSet
Kerns2: 66 -25 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 298 -25 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 301 12 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 232 -25 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 302 -6 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 70 -34 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 305 -34 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 71 6 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 74 15 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 75 7 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 77 44 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 80 -37 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 314 -37 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 233 -35 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 329 -37 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 114 16 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 84 -21 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 85 9 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Fsmall
EndChar
StartChar: g
@@ -17851,6 +17869,7 @@ SplineSet
255 174 255 174 290 174 c 0,68,69
EndSplineSet
Kerns2: 66 -16 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 301 -16 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 232 -18 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 302 -16 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 70 -25 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 305 -25 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 77 -6 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 314 -25 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 317 -25 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 83 10 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Gsmall
EndChar
StartChar: h
@@ -18194,6 +18213,7 @@ SplineSet
301 406 301 406 230 343 c 1,0,-1
EndSplineSet
Kerns2: 114 -37 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 90 -29 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Hsmall
EndChar
StartChar: i
@@ -18423,6 +18443,7 @@ SplineSet
211 604 211 604 211 621 c 0,23,24
EndSplineSet
Kerns2: 53 -28 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 75 -35 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Ismall
EndChar
StartChar: j
@@ -18709,6 +18730,7 @@ SplineSet
248 582 248 582 237 593 c 128,-1,42
226 604 226 604 226 621 c 0,31,32
EndSplineSet
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Jsmall
EndChar
StartChar: k
@@ -19130,6 +19152,7 @@ SplineSet
333 15 333 15 333 34 c 0,0,1
EndSplineSet
Kerns2: 13 3 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 70 -18 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 305 -18 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 72 -12 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 14 -64 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 80 -31 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 314 -31 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 317 -31 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 15 -1 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 84 4 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 86 13 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 321 13 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Ksmall
EndChar
StartChar: l
@@ -19318,6 +19341,7 @@ SplineSet
177 625 177 625 151 623 c 1,0,-1
EndSplineSet
Kerns2: 87 -28 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 90 -25 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Lsmall
EndChar
StartChar: m
@@ -19797,6 +19821,7 @@ SplineSet
117 401 117 401 104 398 c 1,0,-1
EndSplineSet
Kerns2: 81 -9 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 87 -29 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 88 -31 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 90 -31 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Msmall
EndChar
StartChar: n
@@ -20142,6 +20167,7 @@ SplineSet
107 401 107 401 101 398 c 1,0,-1
EndSplineSet
Kerns2: 53 -54 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 81 -12 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 114 -38 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 87 -29 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 88 -31 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 90 -31 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Nsmall
EndChar
StartChar: o
@@ -20307,6 +20333,7 @@ SplineSet
167 18 167 18 265 18 c 0,12,13
EndSplineSet
Kerns2: 53 -91 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 114 -34 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 85 -9 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 87 -35 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 88 -35 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 89 -35 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 90 -41 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Osmall
EndChar
StartChar: p
@@ -20629,6 +20656,7 @@ SplineSet
235 22 235 22 268 22 c 0,36,37
EndSplineSet
Kerns2: 85 -6 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 90 -28 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Psmall
EndChar
StartChar: q
@@ -20895,6 +20923,7 @@ SplineSet
416 434 416 434 340 434 c 0,25,26
EndSplineSet
Kerns2: 68 -6 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 86 -12 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Qsmall
EndChar
StartChar: r
@@ -21157,6 +21186,7 @@ SplineSet
394 362 394 362 374 362 c 0,0,1
EndSplineSet
Kerns2: 232 -3 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 68 -7 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 303 -7 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 27 -6 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 13 -41 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 69 -9 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 70 -6 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 305 -6 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 306 -6 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 304 -6 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 71 18 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 72 -15 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 73 -6 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 14 -45 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 74 19 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 75 13 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 76 -9 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 77 -18 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 78 19 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 79 22 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 80 -7 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 314 -7 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 315 -7 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 317 -7 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 233 -6 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 313 -7 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 329 -6 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 81 25 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 15 -47 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 82 -9 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 114 -18 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 83 25 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 28 -6 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 85 22 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 86 18 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 87 19 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 88 18 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 89 16 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 90 22 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 91 1 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Rsmall
EndChar
StartChar: s
@@ -21452,6 +21482,7 @@ SplineSet
100 152 l 1,0,1
EndSplineSet
Kerns2: 114 -37 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 85 -15 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Ssmall
EndChar
StartChar: t
@@ -21674,6 +21705,7 @@ SplineSet
350 450 l 1,0,-1
EndSplineSet
Kerns2: 52 1 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 66 9 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 298 9 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 301 9 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 232 9 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 302 9 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 27 -7 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 73 9 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 80 -7 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 314 -7 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 317 -7 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 114 -28 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 28 -7 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Tsmall
EndChar
StartChar: u
@@ -22013,6 +22045,7 @@ SplineSet
459 50 459 50 489 50 c 1,0,-1
EndSplineSet
Kerns2: 114 -35 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Usmall
EndChar
StartChar: v
@@ -22323,6 +22356,7 @@ SplineSet
573 450 l 1,0,-1
EndSplineSet
Kerns2: 66 -23 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 298 -23 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 299 -23 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 301 -23 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 232 -23 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 297 -23 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 302 -23 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 300 -23 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 68 -37 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 27 -19 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 13 -69 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 70 -35 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 305 -35 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 306 -35 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 304 -35 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 72 -41 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 14 -28 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 77 -31 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 80 -37 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 314 -37 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 317 -37 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 313 -37 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 329 -37 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 15 -75 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 84 -21 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 28 -19 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Vsmall
EndChar
StartChar: w
@@ -22689,6 +22723,7 @@ SplineSet
666 450 l 1,0,-1
EndSplineSet
Kerns2: 66 -26 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 298 -26 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 299 -26 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 301 -26 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 232 -26 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 297 -26 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 302 -26 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 300 -26 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 68 -32 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 27 -22 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 13 -63 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 70 -31 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 305 -31 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 306 -31 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 304 -31 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 72 -42 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 14 -23 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 77 -32 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 80 -34 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 314 -34 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 317 -34 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 313 -34 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 329 -34 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 15 -70 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 84 -22 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 28 -22 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Wsmall
EndChar
StartChar: x
@@ -23154,6 +23189,7 @@ SplineSet
278 0 l 1,0,-1
EndSplineSet
Kerns2: 66 -10 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 68 -34 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 70 -31 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 305 -31 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 80 -44 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 82 -25 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Xsmall
EndChar
StartChar: y
@@ -23360,6 +23396,7 @@ SplineSet
115 -133 115 -133 123 -133 c 0,0,1
EndSplineSet
Kerns2: 66 -31 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 298 -31 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 299 -31 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 301 -31 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 232 -31 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 297 -31 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 302 -31 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 300 -31 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 68 -37 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 27 -22 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 13 -66 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 70 -34 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 305 -34 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 306 -34 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 304 -34 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 72 -47 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 14 -26 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 77 -31 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 80 -38 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 314 -38 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 317 -38 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 313 -38 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 329 -37 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 15 -72 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 84 -25 "'kern' Horizontal Kerning in Latin lookup 4 subtable" 28 -22 "'kern' Horizontal Kerning in Latin lookup 4 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Ysmall
EndChar
StartChar: z
@@ -23533,6 +23570,7 @@ SplineSet
410 93 410 93 429 139 c 1,18,-1
447 135 l 1,0,-1
EndSplineSet
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Zsmall
EndChar
StartChar: braceleft
@@ -49112,7 +49150,7 @@ SplineSet
EndSplineSet
EndChar
-StartChar: uni25CC
+StartChar: dottedcircle
Encoding: 9676 9676 188
Width: 604
Flags: W
diff --git a/Master/texmf-dist/source/fonts/fonts-tlwg/nf/Norasi.sfd b/Master/texmf-dist/source/fonts/fonts-tlwg/nf/Norasi.sfd
index c0235653fc5..d855df5e087 100644
--- a/Master/texmf-dist/source/fonts/fonts-tlwg/nf/Norasi.sfd
+++ b/Master/texmf-dist/source/fonts/fonts-tlwg/nf/Norasi.sfd
@@ -4,7 +4,7 @@ FullName: Norasi
FamilyName: Norasi
Weight: Regular
Copyright: Copyright (C) 1999, The National Font Project (v.beta). Yannis Haralambous, Virach Sornlertlamvanich and Anutara Tantraporn. All rights reserved.\n\nModified under GNU General Public License, with creators' permission, by Thai Linux Working Group (TLWG).
-Version: 006.001
+Version: 006.003
ItalicAngle: 0
UnderlinePosition: -100
UnderlineWidth: 50
@@ -20,7 +20,7 @@ OS2Version: 4
OS2_WeightWidthSlopeOnly: 0
OS2_UseTypoMetrics: 1
CreationTime: 1153665735
-ModificationTime: 1587806842
+ModificationTime: 1622976951
PfmFamily: 17
TTFWeight: 400
TTFWidth: 5
@@ -41,6 +41,8 @@ HheadAOffset: 0
HheadDescent: -488
HheadDOffset: 0
OS2Vendor: 'PfEd'
+Lookup: 1 0 0 "'onum' Oldstyle Figures" { "'onum' Oldstyle Figures" ("oldstyle") } ['onum' ('latn' <'dflt' > ) ]
+Lookup: 1 0 0 "'smcp' Lowercase to Small Capitals in Latin" { "'smcp' Lowercase to Small Capitals in Latin" } ['smcp' ('latn' <'dflt' > ) ]
Lookup: 4 0 1 "'liga' Standard Ligatures in Latin lookup 1" { "'liga' Standard Ligatures in Latin lookup 1 subtable" } ['liga' ('latn' <'dflt' > ) ]
Lookup: 4 0 1 "'liga' Standard Ligatures lookup 0" { "'liga' Standard Ligatures lookup 0 subtable" } ['liga' ('DFLT' <'dflt' > 'latn' <'dflt' > ) ]
Lookup: 4 0 0 "'frac' Diagonal Fractions lookup 2" { "'frac' Diagonal Fractions lookup 2 subtable" } ['frac' ('DFLT' <'dflt' > ) ]
@@ -1338,7 +1340,7 @@ DisplaySize: -72
DisplayLayer: 2
AntiAlias: 1
FitToEm: 1
-WinInfo: 200 8 2
+WinInfo: 312 8 2
BeginPrivate: 8
BlueValues 39 [-15 0 450 460 551 564 662 677 683 683]
ForceBold 5 false
@@ -4210,6 +4212,7 @@ SplineSet
379 650 379 650 250 650 c 0,18,19
EndSplineSet
Kerns2: 20 18 "'kern' Horizontal Kerning lookup 4 subtable" 17 -79 "'kern' Horizontal Kerning lookup 4 subtable" 23 -6 "'kern' Horizontal Kerning lookup 4 subtable"
+Substitution2: "'onum' Oldstyle Figures" zerooldstyle
EndChar
StartChar: one
@@ -4326,6 +4329,7 @@ SplineSet
212 593 212 593 183 593 c 0,0,1
EndSplineSet
Kerns2: 12 -69 "'kern' Horizontal Kerning lookup 4 subtable" 24 -98 "'kern' Horizontal Kerning lookup 4 subtable" 21 -54 "'kern' Horizontal Kerning lookup 4 subtable" 20 -105 "'kern' Horizontal Kerning lookup 4 subtable" 25 -88 "'kern' Horizontal Kerning lookup 4 subtable" 17 -114 "'kern' Horizontal Kerning lookup 4 subtable" 14 -79 "'kern' Horizontal Kerning lookup 4 subtable" 23 -114 "'kern' Horizontal Kerning lookup 4 subtable" 22 -97 "'kern' Horizontal Kerning lookup 4 subtable" 19 -60 "'kern' Horizontal Kerning lookup 4 subtable" 18 -50 "'kern' Horizontal Kerning lookup 4 subtable" 16 -78 "'kern' Horizontal Kerning lookup 4 subtable"
+Substitution2: "'onum' Oldstyle Figures" oneoldstyle
EndChar
StartChar: two
@@ -4533,6 +4537,7 @@ SplineSet
475 138 l 1,0,-1
EndSplineSet
Kerns2: 17 -86 "'kern' Horizontal Kerning lookup 4 subtable" 23 -22 "'kern' Horizontal Kerning lookup 4 subtable"
+Substitution2: "'onum' Oldstyle Figures" twooldstyle
EndChar
StartChar: three
@@ -4724,6 +4729,7 @@ SplineSet
228 330 228 330 152 330 c 1,0,-1
EndSplineSet
Kerns2: 20 -9 "'kern' Horizontal Kerning lookup 4 subtable" 17 -110 "'kern' Horizontal Kerning lookup 4 subtable" 23 -41 "'kern' Horizontal Kerning lookup 4 subtable"
+Substitution2: "'onum' Oldstyle Figures" threeoldstyle
EndChar
StartChar: four
@@ -4900,6 +4906,7 @@ SplineSet
291 231 l 1,11,-1
EndSplineSet
Kerns2: 20 19 "'kern' Horizontal Kerning lookup 4 subtable" 17 -110 "'kern' Horizontal Kerning lookup 4 subtable" 23 -60 "'kern' Horizontal Kerning lookup 4 subtable"
+Substitution2: "'onum' Oldstyle Figures" fouroldstyle
EndChar
StartChar: five
@@ -5089,6 +5096,7 @@ SplineSet
182 583 l 1,0,-1
EndSplineSet
Kerns2: 20 -10 "'kern' Horizontal Kerning lookup 4 subtable" 17 -101 "'kern' Horizontal Kerning lookup 4 subtable" 23 -51 "'kern' Horizontal Kerning lookup 4 subtable"
+Substitution2: "'onum' Oldstyle Figures" fiveoldstyle
EndChar
StartChar: six
@@ -5259,6 +5267,7 @@ SplineSet
307 382 307 382 242 382 c 0,23,24
EndSplineSet
Kerns2: 20 18 "'kern' Horizontal Kerning lookup 4 subtable" 17 -107 "'kern' Horizontal Kerning lookup 4 subtable" 23 -41 "'kern' Horizontal Kerning lookup 4 subtable"
+Substitution2: "'onum' Oldstyle Figures" sixoldstyle
EndChar
StartChar: seven
@@ -5361,6 +5370,7 @@ SplineSet
450 662 l 1,0,-1
EndSplineSet
Kerns2: 26 -98 "'kern' Horizontal Kerning lookup 4 subtable" 12 -105 "'kern' Horizontal Kerning lookup 4 subtable" 24 -59 "'kern' Horizontal Kerning lookup 4 subtable" 21 -86 "'kern' Horizontal Kerning lookup 4 subtable" 20 -92 "'kern' Horizontal Kerning lookup 4 subtable" 17 -82 "'kern' Horizontal Kerning lookup 4 subtable" 14 -114 "'kern' Horizontal Kerning lookup 4 subtable" 23 -28 "'kern' Horizontal Kerning lookup 4 subtable" 22 -66 "'kern' Horizontal Kerning lookup 4 subtable" 19 -50 "'kern' Horizontal Kerning lookup 4 subtable" 18 -45 "'kern' Horizontal Kerning lookup 4 subtable"
+Substitution2: "'onum' Oldstyle Figures" sevenoldstyle
EndChar
StartChar: eight
@@ -5536,6 +5546,7 @@ SplineSet
194 432 194 432 261 390 c 1,37,38
EndSplineSet
Kerns2: 17 -92 "'kern' Horizontal Kerning lookup 4 subtable" 23 -22 "'kern' Horizontal Kerning lookup 4 subtable"
+Substitution2: "'onum' Oldstyle Figures" eightoldstyle
EndChar
StartChar: nine
@@ -5701,6 +5712,7 @@ SplineSet
362 332 362 332 362 354 c 2,21,-1
EndSplineSet
Kerns2: 20 -9 "'kern' Horizontal Kerning lookup 4 subtable" 17 -92 "'kern' Horizontal Kerning lookup 4 subtable" 23 -9 "'kern' Horizontal Kerning lookup 4 subtable"
+Substitution2: "'onum' Oldstyle Figures" nineoldstyle
EndChar
StartChar: colon
@@ -14872,6 +14884,7 @@ SplineSet
287 100 287 100 287 123 c 2,50,-1
EndSplineSet
Kerns2: 74 -37 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 113 -59 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 89 -45 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 86 -42 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 87 -45 "'kern' Horizontal Kerning in Latin lookup 3 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Asmall
EndChar
StartChar: b
@@ -15064,6 +15077,7 @@ SplineSet
152 351 152 351 152 322 c 2,24,-1
EndSplineSet
Kerns2: 87 -42 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 89 -45 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 14 -59 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 85 -28 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 86 -41 "'kern' Horizontal Kerning in Latin lookup 3 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Bsmall
EndChar
StartChar: c
@@ -15224,6 +15238,7 @@ SplineSet
25 115 25 115 25 212 c 0,0,1
EndSplineSet
Kerns2: 72 -22 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 75 -26 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 89 -22 "'kern' Horizontal Kerning in Latin lookup 3 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Csmall
EndChar
StartChar: d
@@ -15442,6 +15457,7 @@ SplineSet
113 153 113 153 150.5 97.5 c 128,-1,42
188 42 188 42 250 42 c 0,30,31
EndSplineSet
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Dsmall
EndChar
StartChar: e
@@ -15562,6 +15578,7 @@ SplineSet
115 423 115 423 100 309 c 1,22,-1
EndSplineSet
Kerns2: 113 -42 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 84 -13 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 71 -22 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 86 -38 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 87 -41 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 88 -50 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 89 -42 "'kern' Horizontal Kerning in Latin lookup 3 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Esmall
EndChar
StartChar: f
@@ -15738,6 +15755,7 @@ SplineSet
359 580 359 580 341 580 c 0,0,1
EndSplineSet
Kerns2: 295 -37 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 298 18 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 231 -37 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 299 -9 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 69 -50 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 302 -50 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 74 10 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 76 64 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 79 -54 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 312 -54 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 232 -51 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 254 -54 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 83 -31 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 84 13 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 65 -37 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 226 -73 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 70 9 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 73 22 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 113 23 "'kern' Horizontal Kerning in Latin lookup 3 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Fsmall
EndChar
StartChar: g
@@ -16077,6 +16095,7 @@ SplineSet
152 390 152 390 152 335 c 0,62,63
EndSplineSet
Kerns2: 298 -23 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 231 -26 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 299 -23 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 69 -37 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 302 -37 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 76 -9 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 312 -37 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 315 -37 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 82 15 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 65 -23 "'kern' Horizontal Kerning in Latin lookup 3 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Gsmall
EndChar
StartChar: h
@@ -16311,6 +16330,7 @@ SplineSet
213 406 213 406 157 343 c 1,0,-1
EndSplineSet
Kerns2: 113 -54 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 89 -42 "'kern' Horizontal Kerning in Latin lookup 3 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Hsmall
EndChar
StartChar: i
@@ -16474,6 +16494,7 @@ SplineSet
107 683 107 683 127 683 c 0,19,20
EndSplineSet
Kerns2: 52 -41 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 74 -51 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 86 -37 "'kern' Horizontal Kerning in Latin lookup 3 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Ismall
EndChar
StartChar: j
@@ -16652,6 +16673,7 @@ SplineSet
92 654 92 654 107 668.5 c 128,-1,37
122 683 122 683 142 683 c 0,26,27
EndSplineSet
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Jsmall
EndChar
StartChar: k
@@ -17013,6 +17035,7 @@ SplineSet
35 625 35 625 7 623 c 1,0,-1
EndSplineSet
Kerns2: 12 4 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 302 -26 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 71 -18 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 13 -94 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 312 -45 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 315 -45 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 14 -1 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 83 6 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 85 19 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 319 19 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 69 -26 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 79 -45 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 89 -22 "'kern' Horizontal Kerning in Latin lookup 3 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Ksmall
EndChar
StartChar: l
@@ -17146,6 +17169,7 @@ SplineSet
19 623 l 1,0,-1
EndSplineSet
Kerns2: 86 -41 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 89 -37 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 87 -13 "'kern' Horizontal Kerning in Latin lookup 3 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Lsmall
EndChar
StartChar: m
@@ -17469,6 +17493,7 @@ SplineSet
32 401 32 401 19 398 c 1,0,-1
EndSplineSet
Kerns2: 80 -13 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 86 -42 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 87 -45 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 89 -45 "'kern' Horizontal Kerning in Latin lookup 3 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Msmall
EndChar
StartChar: n
@@ -17704,6 +17729,7 @@ SplineSet
22 401 22 401 16 398 c 1,0,-1
EndSplineSet
Kerns2: 52 -79 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 80 -18 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 113 -56 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 87 -45 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 86 -42 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 89 -45 "'kern' Horizontal Kerning in Latin lookup 3 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Nsmall
EndChar
StartChar: o
@@ -17829,6 +17855,7 @@ SplineSet
119 347 119 347 119 275 c 0,11,12
EndSplineSet
Kerns2: 52 -133 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 113 -50 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 84 -13 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 88 -51 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 86 -51 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 87 -51 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 89 -60 "'kern' Horizontal Kerning in Latin lookup 3 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Osmall
EndChar
StartChar: p
@@ -18051,6 +18078,7 @@ SplineSet
160 357 160 357 160 334 c 2,32,-1
EndSplineSet
Kerns2: 84 -9 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 89 -41 "'kern' Horizontal Kerning in Latin lookup 3 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Psmall
EndChar
StartChar: q
@@ -18251,6 +18279,7 @@ SplineSet
110 330 110 330 110 242 c 0,23,24
EndSplineSet
Kerns2: 67 -9 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 85 -18 "'kern' Horizontal Kerning in Latin lookup 3 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Qsmall
EndChar
StartChar: r
@@ -18428,6 +18457,7 @@ SplineSet
313 362 313 362 296 362 c 0,0,1
EndSplineSet
Kerns2: 231 -4 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 67 -10 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 300 -10 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 26 -9 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 68 -13 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 69 -9 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 302 -9 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 303 -9 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 301 -9 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 70 26 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 72 -9 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 73 28 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 74 19 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 75 -13 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 76 -26 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 77 28 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 78 32 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 79 -10 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 312 -10 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 313 -10 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 315 -10 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 232 -9 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 311 -10 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 254 -9 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 80 37 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 81 -13 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 113 -26 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 82 37 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 27 -9 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 84 32 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 85 26 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 86 28 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 87 26 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 88 23 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 89 32 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 90 1 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 12 -60 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 71 -22 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 13 -66 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 14 -69 "'kern' Horizontal Kerning in Latin lookup 3 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Rsmall
EndChar
StartChar: s
@@ -18694,6 +18724,7 @@ SplineSet
278 439 278 439 284 439 c 0,0,1
EndSplineSet
Kerns2: 113 -54 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 84 -22 "'kern' Horizontal Kerning in Latin lookup 3 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Ssmall
EndChar
StartChar: t
@@ -18858,6 +18889,7 @@ SplineSet
255 450 l 1,0,-1
EndSplineSet
Kerns2: 51 1 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 65 13 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 295 13 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 298 13 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 231 13 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 299 13 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 26 -10 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 72 13 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 79 -10 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 312 -10 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 315 -10 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 113 -41 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 27 -10 "'kern' Horizontal Kerning in Latin lookup 3 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Tsmall
EndChar
StartChar: u
@@ -19055,6 +19087,7 @@ SplineSet
479 50 l 1,0,-1
EndSplineSet
Kerns2: 113 -51 "'kern' Horizontal Kerning in Latin lookup 3 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Usmall
EndChar
StartChar: v
@@ -19298,6 +19331,7 @@ SplineSet
478 450 l 1,0,-1
EndSplineSet
Kerns2: 295 -34 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 296 -34 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 298 -34 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 231 -34 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 294 -34 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 299 -34 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 297 -34 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 67 -54 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 26 -28 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 302 -51 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 303 -51 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 301 -51 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 71 -60 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 13 -41 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 76 -45 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 312 -54 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 315 -54 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 311 -54 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 254 -54 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 83 -31 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 27 -28 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 65 -34 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 12 -101 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 69 -51 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 79 -54 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 14 -110 "'kern' Horizontal Kerning in Latin lookup 3 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Vsmall
EndChar
StartChar: w
@@ -19599,6 +19633,7 @@ SplineSet
352 311 l 1,0,1
EndSplineSet
Kerns2: 295 -38 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 296 -38 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 298 -38 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 231 -38 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 294 -38 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 299 -38 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 297 -38 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 67 -47 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 26 -32 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 69 -45 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 302 -45 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 303 -45 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 301 -45 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 71 -62 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 13 -34 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 76 -47 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 312 -50 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 315 -50 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 311 -50 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 254 -50 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 83 -32 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 27 -32 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 65 -38 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 12 -92 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 79 -50 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 14 -103 "'kern' Horizontal Kerning in Latin lookup 3 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Wsmall
EndChar
StartChar: x
@@ -19976,6 +20011,7 @@ SplineSet
278 0 l 1,0,-1
EndSplineSet
Kerns2: 65 -15 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 67 -50 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 302 -45 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 79 -64 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 81 -37 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 69 -45 "'kern' Horizontal Kerning in Latin lookup 3 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Xsmall
EndChar
StartChar: y
@@ -20200,6 +20236,7 @@ SplineSet
475 450 l 1,0,-1
EndSplineSet
Kerns2: 65 -45 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 295 -45 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 296 -45 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 298 -45 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 231 -45 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 294 -45 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 299 -45 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 297 -45 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 67 -54 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 26 -32 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 69 -50 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 302 -50 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 303 -50 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 301 -50 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 71 -69 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 13 -38 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 76 -45 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 79 -56 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 312 -56 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 315 -56 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 311 -56 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 254 -54 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 83 -37 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 27 -32 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 12 -97 "'kern' Horizontal Kerning in Latin lookup 3 subtable" 14 -105 "'kern' Horizontal Kerning in Latin lookup 3 subtable"
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Ysmall
EndChar
StartChar: z
@@ -20387,6 +20424,7 @@ SplineSet
388 78 388 78 400 139 c 1,18,-1
417 135 l 1,0,-1
EndSplineSet
+Substitution2: "'smcp' Lowercase to Small Capitals in Latin" Zsmall
EndChar
StartChar: braceleft
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 7fc4ed1d682..e5b3b820cf1 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.16.2 from Makefile.am.
+# Makefile.in generated by automake 1.16.4 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2020 Free Software Foundation, Inc.
+# Copyright (C) 1994-2021 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -124,11 +124,14 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+CSCOPE = @CSCOPE@
+CTAGS = @CTAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
+ETAGS = @ETAGS@
FCCACHE = @FCCACHE@
FONTFORGE = @FONTFORGE@
INSTALL = @INSTALL@
@@ -265,7 +268,6 @@ ctags CTAGS:
cscope cscopelist:
-
distdir: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) distdir-am
diff --git a/Master/texmf-dist/source/fonts/fonts-tlwg/sipa/Makefile.am b/Master/texmf-dist/source/fonts/fonts-tlwg/sipa/Makefile.am
index 9d09cf7a0f9..876ebe5f5d2 100644
--- a/Master/texmf-dist/source/fonts/fonts-tlwg/sipa/Makefile.am
+++ b/Master/texmf-dist/source/fonts/fonts-tlwg/sipa/Makefile.am
@@ -11,21 +11,21 @@ include $(top_srcdir)/scripts/gen.mk.am
if INCLUDE_LATEX
laksaman.afm: Laksaman.afm
- [ -f $@ ] || $(LN_S) $< $@
+ [ -e $@ ] || $(LN_S) $< $@
laksaman_b.afm: Laksaman-Bold.afm
- [ -f $@ ] || $(LN_S) $< $@
+ [ -e $@ ] || $(LN_S) $< $@
laksaman_i.afm: Laksaman-Italic.afm
- [ -f $@ ] || $(LN_S) $< $@
+ [ -e $@ ] || $(LN_S) $< $@
laksaman_bi.afm: Laksaman-BoldItalic.afm
- [ -f $@ ] || $(LN_S) $< $@
+ [ -e $@ ] || $(LN_S) $< $@
laksaman.pfb: Laksaman.pfb
- [ -f $@ ] || $(LN_S) $< $@
+ [ -e $@ ] || $(LN_S) $< $@
laksaman_b.pfb: Laksaman-Bold.pfb
- [ -f $@ ] || $(LN_S) $< $@
+ [ -e $@ ] || $(LN_S) $< $@
laksaman_i.pfb: Laksaman-Italic.pfb
- [ -f $@ ] || $(LN_S) $< $@
+ [ -e $@ ] || $(LN_S) $< $@
laksaman_bi.pfb: Laksaman-BoldItalic.pfb
- [ -f $@ ] || $(LN_S) $< $@
+ [ -e $@ ] || $(LN_S) $< $@
FONTS = \
laksaman \
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 2c215e8d8f0..63cb450a386 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.16.2 from Makefile.am.
+# Makefile.in generated by automake 1.16.4 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2020 Free Software Foundation, Inc.
+# Copyright (C) 1994-2021 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -182,11 +182,14 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+CSCOPE = @CSCOPE@
+CTAGS = @CTAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
+ETAGS = @ETAGS@
FCCACHE = @FCCACHE@
FONTFORGE = @FONTFORGE@
INSTALL = @INSTALL@
@@ -320,10 +323,19 @@ CLEANFILES = *.ttf *.g2n *.pfb *.afm *.pfm *.otf *.woff *.enc *.tfm \
@INCLUDE_LATEX_TRUE@LTX_TFMFILES = $(FONTS:%=%.tfm)
@INCLUDE_LATEX_TRUE@LTX_RTFMFILES = $(FONTS:%=r%.tfm)
@INCLUDE_LATEX_TRUE@LTX_VFFILES = $(FONTS:%=%.vf)
+@INCLUDE_LATEX_TRUE@LTX_SYNTH_TFMFILES = $(SYNTH_FONTS:%=%.tfm)
+@INCLUDE_LATEX_TRUE@LTX_SYNTH_RTFMFILES = $(SYNTH_FONTS:%=r%.tfm)
+@INCLUDE_LATEX_TRUE@LTX_SYNTH_VFFILES = $(SYNTH_FONTS:%=%.vf)
@INCLUDE_LATEX_TRUE@ltxtype1_DATA = $(LTX_PFBFILES)
@INCLUDE_LATEX_TRUE@ltxafm_DATA = $(LTX_AFMFILES)
-@INCLUDE_LATEX_TRUE@ltxtfm_DATA = $(LTX_TFMFILES) $(LTX_RTFMFILES)
-@INCLUDE_LATEX_TRUE@ltxvf_DATA = $(LTX_VFFILES)
+@INCLUDE_LATEX_TRUE@ltxtfm_DATA = \
+@INCLUDE_LATEX_TRUE@ $(LTX_TFMFILES) \
+@INCLUDE_LATEX_TRUE@ $(LTX_RTFMFILES) \
+@INCLUDE_LATEX_TRUE@ $(LTX_SYNTH_TFMFILES) \
+@INCLUDE_LATEX_TRUE@ $(LTX_SYNTH_RTFMFILES) \
+@INCLUDE_LATEX_TRUE@ $(NULL)
+
+@INCLUDE_LATEX_TRUE@ltxvf_DATA = $(LTX_VFFILES) $(LTX_SYNTH_VFFILES)
# OpenType fonts
@INCLUDE_LATEX_TRUE@ltxotfdir = $(texmfdir)/fonts/opentype/public/$(LATEX_PACKAGE)
@@ -599,7 +611,6 @@ ctags CTAGS:
cscope cscopelist:
-
distdir: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) distdir-am
@@ -796,45 +807,84 @@ PS%.afm PS%.pfb: %.sfd
$(FONTFORGE) -script $(top_srcdir)/scripts/gen-pfb.pe $<
@INCLUDE_LATEX_TRUE@laksaman.afm: Laksaman.afm
-@INCLUDE_LATEX_TRUE@ [ -f $@ ] || $(LN_S) $< $@
+@INCLUDE_LATEX_TRUE@ [ -e $@ ] || $(LN_S) $< $@
@INCLUDE_LATEX_TRUE@laksaman_b.afm: Laksaman-Bold.afm
-@INCLUDE_LATEX_TRUE@ [ -f $@ ] || $(LN_S) $< $@
+@INCLUDE_LATEX_TRUE@ [ -e $@ ] || $(LN_S) $< $@
@INCLUDE_LATEX_TRUE@laksaman_i.afm: Laksaman-Italic.afm
-@INCLUDE_LATEX_TRUE@ [ -f $@ ] || $(LN_S) $< $@
+@INCLUDE_LATEX_TRUE@ [ -e $@ ] || $(LN_S) $< $@
@INCLUDE_LATEX_TRUE@laksaman_bi.afm: Laksaman-BoldItalic.afm
-@INCLUDE_LATEX_TRUE@ [ -f $@ ] || $(LN_S) $< $@
+@INCLUDE_LATEX_TRUE@ [ -e $@ ] || $(LN_S) $< $@
@INCLUDE_LATEX_TRUE@laksaman.pfb: Laksaman.pfb
-@INCLUDE_LATEX_TRUE@ [ -f $@ ] || $(LN_S) $< $@
+@INCLUDE_LATEX_TRUE@ [ -e $@ ] || $(LN_S) $< $@
@INCLUDE_LATEX_TRUE@laksaman_b.pfb: Laksaman-Bold.pfb
-@INCLUDE_LATEX_TRUE@ [ -f $@ ] || $(LN_S) $< $@
+@INCLUDE_LATEX_TRUE@ [ -e $@ ] || $(LN_S) $< $@
@INCLUDE_LATEX_TRUE@laksaman_i.pfb: Laksaman-Italic.pfb
-@INCLUDE_LATEX_TRUE@ [ -f $@ ] || $(LN_S) $< $@
+@INCLUDE_LATEX_TRUE@ [ -e $@ ] || $(LN_S) $< $@
@INCLUDE_LATEX_TRUE@laksaman_bi.pfb: Laksaman-BoldItalic.pfb
-@INCLUDE_LATEX_TRUE@ [ -f $@ ] || $(LN_S) $< $@
+@INCLUDE_LATEX_TRUE@ [ -e $@ ] || $(LN_S) $< $@
# Local Rules
-@INCLUDE_LATEX_TRUE@thai-dummy.afm:
-@INCLUDE_LATEX_TRUE@ [ -e thai-dummy.afm ] || $(LN_S) $(top_srcdir)/latex/thai-dummy.afm .
-
-@INCLUDE_LATEX_TRUE@thailigs.enc:
-@INCLUDE_LATEX_TRUE@ [ -e thailigs.enc ] || $(LN_S) $(top_srcdir)/latex/thailigs.enc .
-
-@INCLUDE_LATEX_TRUE@lthtlwg.enc:
-@INCLUDE_LATEX_TRUE@ [ -e lthtlwg.enc ] || $(LN_S) $(top_srcdir)/latex/lthtlwg.enc .
+@INCLUDE_LATEX_TRUE@thai-dummy.afm \
+@INCLUDE_LATEX_TRUE@thailigs.enc \
+@INCLUDE_LATEX_TRUE@lthtlwg.enc \
+@INCLUDE_LATEX_TRUE@thailigs-sc.enc \
+@INCLUDE_LATEX_TRUE@lthtlwg-sc.enc \
+@INCLUDE_LATEX_TRUE@thailigs-osf.enc \
+@INCLUDE_LATEX_TRUE@lthtlwg-osf.enc \
+@INCLUDE_LATEX_TRUE@thailigs-osf-sc.enc \
+@INCLUDE_LATEX_TRUE@lthtlwg-osf-sc.enc \
+@INCLUDE_LATEX_TRUE@:
+@INCLUDE_LATEX_TRUE@ [ -e $@ ] || $(LN_S) $(top_srcdir)/latex/$@ .
@INCLUDE_LATEX_TRUE@thailigs.vpl: thai-dummy.afm thailigs.enc
@INCLUDE_LATEX_TRUE@ $(AFM2TFM) thai-dummy.afm -v $@ -T thailigs.enc thailigs.tfm
+@INCLUDE_LATEX_TRUE@thailigs-sc.vpl: thai-dummy.afm thailigs-sc.enc
+@INCLUDE_LATEX_TRUE@ $(AFM2TFM) thai-dummy.afm -v $@ -T thailigs-sc.enc thailigs-sc.tfm
+
+@INCLUDE_LATEX_TRUE@thailigs-osf.vpl: thai-dummy.afm thailigs-osf.enc
+@INCLUDE_LATEX_TRUE@ $(AFM2TFM) thai-dummy.afm -v $@ -T thailigs-osf.enc thailigs-osf.tfm
+
+@INCLUDE_LATEX_TRUE@thailigs-osf-sc.vpl: thai-dummy.afm thailigs-osf-sc.enc
+@INCLUDE_LATEX_TRUE@ $(AFM2TFM) thai-dummy.afm -v $@ -T thailigs-osf-sc.enc thailigs-osf-sc.tfm
+
+#
+# merge_ligs(font-vpl-file,ligs-vpl-file)
+#
+# Replaces LIGTABLE in font-vpl-file with that in ligs-vpl-file.
+#
+@INCLUDE_LATEX_TRUE@define merge_ligs
+@INCLUDE_LATEX_TRUE@ TMPFILE=`mktemp /tmp/tltx.XXXXXXXXX` && \
+@INCLUDE_LATEX_TRUE@ $(AWK) "BEGIN {show=1} /LIGTABLE/ {show=0} {if(show) print}" $(1) > $$TMPFILE && \
+@INCLUDE_LATEX_TRUE@ $(AWK) "BEGIN {show=0} /LIGTABLE/ {show=1} /CHARACTER/ {show=0} {if(show) print}" $(2) >> $$TMPFILE && \
+@INCLUDE_LATEX_TRUE@ $(AWK) "BEGIN {show=0} /CHARACTER/ {show=1} {if(show) print}" $(1) >> $$TMPFILE && \
+@INCLUDE_LATEX_TRUE@ mv $$TMPFILE $(1)
+@INCLUDE_LATEX_TRUE@endef
+
+@INCLUDE_LATEX_TRUE@r%-osf-sc.tfm: %.afm
+@INCLUDE_LATEX_TRUE@%-osf-sc.vpl: %.afm thailigs-osf-sc.vpl lthtlwg-osf-sc.enc
+@INCLUDE_LATEX_TRUE@ $(AFM2TFM) $*.afm -v $*-osf-sc.vpl -T lthtlwg-osf-sc.enc r$*-osf-sc.tfm \
+@INCLUDE_LATEX_TRUE@ | $(SED) "s/$$/ <$*.pfb/" >> $(MAP)
+@INCLUDE_LATEX_TRUE@ $(call merge_ligs,$*-osf-sc.vpl,thailigs-osf-sc.vpl)
+
+@INCLUDE_LATEX_TRUE@r%-osf.tfm: %.afm
+@INCLUDE_LATEX_TRUE@%-osf.vpl: %.afm thailigs-osf.vpl lthtlwg-osf.enc
+@INCLUDE_LATEX_TRUE@ $(AFM2TFM) $*.afm -v $*-osf.vpl -T lthtlwg-osf.enc r$*-osf.tfm \
+@INCLUDE_LATEX_TRUE@ | $(SED) "s/$$/ <$*.pfb/" >> $(MAP)
+@INCLUDE_LATEX_TRUE@ $(call merge_ligs,$*-osf.vpl,thailigs-osf.vpl)
+
+@INCLUDE_LATEX_TRUE@r%-sc.tfm: %.afm
+@INCLUDE_LATEX_TRUE@%-sc.vpl: %.afm thailigs-sc.vpl lthtlwg-sc.enc
+@INCLUDE_LATEX_TRUE@ $(AFM2TFM) $*.afm -v $*-sc.vpl -T lthtlwg-sc.enc r$*-sc.tfm \
+@INCLUDE_LATEX_TRUE@ | $(SED) "s/$$/ <$*.pfb/" >> $(MAP)
+@INCLUDE_LATEX_TRUE@ $(call merge_ligs,$*-sc.vpl,thailigs-sc.vpl)
+
@INCLUDE_LATEX_TRUE@r%.tfm: %.afm
@INCLUDE_LATEX_TRUE@%.vpl: %.afm thailigs.vpl lthtlwg.enc
@INCLUDE_LATEX_TRUE@ $(AFM2TFM) $*.afm -v $*.vpl -T lthtlwg.enc r$*.tfm \
@INCLUDE_LATEX_TRUE@ | $(SED) "s/$$/ <$*.pfb/" >> $(MAP)
-@INCLUDE_LATEX_TRUE@ TMPFILE=`mktemp /tmp/tltx.XXXXXXXXX` && \
-@INCLUDE_LATEX_TRUE@ $(AWK) "BEGIN {show=1} /LIGTABLE/ {show=0} {if(show) print}" $*.vpl > $$TMPFILE && \
-@INCLUDE_LATEX_TRUE@ $(AWK) "BEGIN {show=0} /LIGTABLE/ {show=1} /CHARACTER/ {show=0} {if(show) print}" thailigs.vpl >> $$TMPFILE && \
-@INCLUDE_LATEX_TRUE@ $(AWK) "BEGIN {show=0} /CHARACTER/ {show=1} {if(show) print}" $*.vpl >> $$TMPFILE && \
-@INCLUDE_LATEX_TRUE@ mv $$TMPFILE $*.vpl
+@INCLUDE_LATEX_TRUE@ $(call merge_ligs,$*.vpl,thailigs.vpl)
@INCLUDE_LATEX_TRUE@%.tfm: %.vpl
@INCLUDE_LATEX_TRUE@ $(VPTOVF) $*
diff --git a/Master/texmf-dist/source/fonts/fonts-tlwg/test-driver b/Master/texmf-dist/source/fonts/fonts-tlwg/test-driver
index 89dba1e075c..be73b80adf9 100755
--- a/Master/texmf-dist/source/fonts/fonts-tlwg/test-driver
+++ b/Master/texmf-dist/source/fonts/fonts-tlwg/test-driver
@@ -3,7 +3,7 @@
scriptversion=2018-03-07.03; # UTC
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -42,11 +42,13 @@ print_usage ()
{
cat <<END
Usage:
- test-driver --test-name=NAME --log-file=PATH --trs-file=PATH
- [--expect-failure={yes|no}] [--color-tests={yes|no}]
- [--enable-hard-errors={yes|no}] [--]
+ test-driver --test-name NAME --log-file PATH --trs-file PATH
+ [--expect-failure {yes|no}] [--color-tests {yes|no}]
+ [--enable-hard-errors {yes|no}] [--]
TEST-SCRIPT [TEST-SCRIPT-ARGUMENTS]
+
The '--test-name', '--log-file' and '--trs-file' options are mandatory.
+See the GNU Automake documentation for information.
END
}
@@ -103,8 +105,11 @@ trap "st=130; $do_exit" 2
trap "st=141; $do_exit" 13
trap "st=143; $do_exit" 15
-# Test script is run here.
-"$@" >$log_file 2>&1
+# Test script is run here. We create the file first, then append to it,
+# to ameliorate tests themselves also writing to the log file. Our tests
+# don't, but others can (automake bug#35762).
+: >"$log_file"
+"$@" >>"$log_file" 2>&1
estatus=$?
if test $enable_hard_errors = no && test $estatus -eq 99; then
@@ -126,7 +131,7 @@ esac
# know whether the test passed or failed simply by looking at the '.log'
# file, without the need of also peaking into the corresponding '.trs'
# file (automake bug#11814).
-echo "$res $test_name (exit status: $estatus)" >>$log_file
+echo "$res $test_name (exit status: $estatus)" >>"$log_file"
# Report outcome to console.
echo "${col}${res}${std}: $test_name"
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 64a4836c0cc..98cee92ec3a 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.16.2 from Makefile.am.
+# Makefile.in generated by automake 1.16.4 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2020 Free Software Foundation, Inc.
+# Copyright (C) 1994-2021 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -301,6 +301,7 @@ am__set_TESTS_bases = \
bases='$(TEST_LOGS)'; \
bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
bases=`echo $$bases`
+AM_TESTSUITE_SUMMARY_HEADER = ' for $(PACKAGE_STRING)'
RECHECK_LOGS = $(TEST_LOGS)
AM_RECURSIVE_TARGETS = check recheck
TEST_SUITE_LOG = test-suite.log
@@ -332,11 +333,14 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+CSCOPE = @CSCOPE@
+CTAGS = @CTAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
+ETAGS = @ETAGS@
FCCACHE = @FCCACHE@
FONTFORGE = @FONTFORGE@
INSTALL = @INSTALL@
@@ -595,7 +599,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS)
test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \
fi; \
echo "$${col}$$br$${std}"; \
- echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \
+ echo "$${col}Testsuite summary"$(AM_TESTSUITE_SUMMARY_HEADER)"$${std}"; \
echo "$${col}$$br$${std}"; \
create_testsuite_report --maybe-color; \
echo "$$col$$br$$std"; \
@@ -650,7 +654,6 @@ test-pfb.sh.log: test-pfb.sh
--log-file $$b.log --trs-file $$b.trs \
$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
"$$tst" $(AM_TESTS_FD_REDIRECT)
-
distdir: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) distdir-am
diff --git a/Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/Makefile.am b/Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/Makefile.am
index faffef16ea1..191a6d8eb05 100644
--- a/Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/Makefile.am
+++ b/Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/Makefile.am
@@ -41,109 +41,109 @@ include $(top_srcdir)/scripts/gen.mk.am
if INCLUDE_LATEX
ttype.afm: TlwgTypewriter.afm
- [ -f $@ ] || $(LN_S) $< $@
+ [ -e $@ ] || $(LN_S) $< $@
ttype_b.afm: TlwgTypewriter-Bold.afm
- [ -f $@ ] || $(LN_S) $< $@
+ [ -e $@ ] || $(LN_S) $< $@
ttype_o.afm: TlwgTypewriter-Oblique.afm
- [ -f $@ ] || $(LN_S) $< $@
+ [ -e $@ ] || $(LN_S) $< $@
ttype_bo.afm: TlwgTypewriter-BoldOblique.afm
- [ -f $@ ] || $(LN_S) $< $@
+ [ -e $@ ] || $(LN_S) $< $@
ttypist.afm: TlwgTypist.afm
- [ -f $@ ] || $(LN_S) $< $@
+ [ -e $@ ] || $(LN_S) $< $@
ttypist_b.afm: TlwgTypist-Bold.afm
- [ -f $@ ] || $(LN_S) $< $@
+ [ -e $@ ] || $(LN_S) $< $@
ttypist_o.afm: TlwgTypist-Oblique.afm
- [ -f $@ ] || $(LN_S) $< $@
+ [ -e $@ ] || $(LN_S) $< $@
ttypist_bo.afm: TlwgTypist-BoldOblique.afm
- [ -f $@ ] || $(LN_S) $< $@
+ [ -e $@ ] || $(LN_S) $< $@
purisa.afm: Purisa.afm
- [ -f $@ ] || $(LN_S) $< $@
+ [ -e $@ ] || $(LN_S) $< $@
purisa_b.afm: Purisa-Bold.afm
- [ -f $@ ] || $(LN_S) $< $@
+ [ -e $@ ] || $(LN_S) $< $@
purisa_o.afm: Purisa-Oblique.afm
- [ -f $@ ] || $(LN_S) $< $@
+ [ -e $@ ] || $(LN_S) $< $@
purisa_bo.afm: Purisa-BoldOblique.afm
- [ -f $@ ] || $(LN_S) $< $@
+ [ -e $@ ] || $(LN_S) $< $@
waree.afm: Waree.afm
- [ -f $@ ] || $(LN_S) $< $@
+ [ -e $@ ] || $(LN_S) $< $@
waree_b.afm: Waree-Bold.afm
- [ -f $@ ] || $(LN_S) $< $@
+ [ -e $@ ] || $(LN_S) $< $@
waree_o.afm: Waree-Oblique.afm
- [ -f $@ ] || $(LN_S) $< $@
+ [ -e $@ ] || $(LN_S) $< $@
waree_bo.afm: Waree-BoldOblique.afm
- [ -f $@ ] || $(LN_S) $< $@
+ [ -e $@ ] || $(LN_S) $< $@
umpush.afm: Umpush.afm
- [ -f $@ ] || $(LN_S) $< $@
+ [ -e $@ ] || $(LN_S) $< $@
umpush_b.afm: Umpush-Bold.afm
- [ -f $@ ] || $(LN_S) $< $@
+ [ -e $@ ] || $(LN_S) $< $@
umpush_l.afm: Umpush-Light.afm
- [ -f $@ ] || $(LN_S) $< $@
+ [ -e $@ ] || $(LN_S) $< $@
umpush_o.afm: Umpush-Oblique.afm
- [ -f $@ ] || $(LN_S) $< $@
+ [ -e $@ ] || $(LN_S) $< $@
umpush_bo.afm: Umpush-BoldOblique.afm
- [ -f $@ ] || $(LN_S) $< $@
+ [ -e $@ ] || $(LN_S) $< $@
umpush_lo.afm: Umpush-LightOblique.afm
- [ -f $@ ] || $(LN_S) $< $@
+ [ -e $@ ] || $(LN_S) $< $@
sawasdee.afm: Sawasdee.afm
- [ -f $@ ] || $(LN_S) $< $@
+ [ -e $@ ] || $(LN_S) $< $@
sawasdee_b.afm: Sawasdee-Bold.afm
- [ -f $@ ] || $(LN_S) $< $@
+ [ -e $@ ] || $(LN_S) $< $@
sawasdee_o.afm: Sawasdee-Oblique.afm
- [ -f $@ ] || $(LN_S) $< $@
+ [ -e $@ ] || $(LN_S) $< $@
sawasdee_bo.afm: Sawasdee-BoldOblique.afm
- [ -f $@ ] || $(LN_S) $< $@
+ [ -e $@ ] || $(LN_S) $< $@
ttype.pfb: TlwgTypewriter.pfb
- [ -f $@ ] || $(LN_S) $< $@
+ [ -e $@ ] || $(LN_S) $< $@
ttype_b.pfb: TlwgTypewriter-Bold.pfb
- [ -f $@ ] || $(LN_S) $< $@
+ [ -e $@ ] || $(LN_S) $< $@
ttype_o.pfb: TlwgTypewriter-Oblique.pfb
- [ -f $@ ] || $(LN_S) $< $@
+ [ -e $@ ] || $(LN_S) $< $@
ttype_bo.pfb: TlwgTypewriter-BoldOblique.pfb
- [ -f $@ ] || $(LN_S) $< $@
+ [ -e $@ ] || $(LN_S) $< $@
ttypist.pfb: TlwgTypist.pfb
- [ -f $@ ] || $(LN_S) $< $@
+ [ -e $@ ] || $(LN_S) $< $@
ttypist_b.pfb: TlwgTypist-Bold.pfb
- [ -f $@ ] || $(LN_S) $< $@
+ [ -e $@ ] || $(LN_S) $< $@
ttypist_o.pfb: TlwgTypist-Oblique.pfb
- [ -f $@ ] || $(LN_S) $< $@
+ [ -e $@ ] || $(LN_S) $< $@
ttypist_bo.pfb: TlwgTypist-BoldOblique.pfb
- [ -f $@ ] || $(LN_S) $< $@
+ [ -e $@ ] || $(LN_S) $< $@
purisa.pfb: Purisa.pfb
- [ -f $@ ] || $(LN_S) $< $@
+ [ -e $@ ] || $(LN_S) $< $@
purisa_b.pfb: Purisa-Bold.pfb
- [ -f $@ ] || $(LN_S) $< $@
+ [ -e $@ ] || $(LN_S) $< $@
purisa_o.pfb: Purisa-Oblique.pfb
- [ -f $@ ] || $(LN_S) $< $@
+ [ -e $@ ] || $(LN_S) $< $@
purisa_bo.pfb: Purisa-BoldOblique.pfb
- [ -f $@ ] || $(LN_S) $< $@
+ [ -e $@ ] || $(LN_S) $< $@
waree.pfb: Waree.pfb
- [ -f $@ ] || $(LN_S) $< $@
+ [ -e $@ ] || $(LN_S) $< $@
waree_b.pfb: Waree-Bold.pfb
- [ -f $@ ] || $(LN_S) $< $@
+ [ -e $@ ] || $(LN_S) $< $@
waree_o.pfb: Waree-Oblique.pfb
- [ -f $@ ] || $(LN_S) $< $@
+ [ -e $@ ] || $(LN_S) $< $@
waree_bo.pfb: Waree-BoldOblique.pfb
- [ -f $@ ] || $(LN_S) $< $@
+ [ -e $@ ] || $(LN_S) $< $@
umpush.pfb: Umpush.pfb
- [ -f $@ ] || $(LN_S) $< $@
+ [ -e $@ ] || $(LN_S) $< $@
umpush_b.pfb: Umpush-Bold.pfb
- [ -f $@ ] || $(LN_S) $< $@
+ [ -e $@ ] || $(LN_S) $< $@
umpush_l.pfb: Umpush-Light.pfb
- [ -f $@ ] || $(LN_S) $< $@
+ [ -e $@ ] || $(LN_S) $< $@
umpush_o.pfb: Umpush-Oblique.pfb
- [ -f $@ ] || $(LN_S) $< $@
+ [ -e $@ ] || $(LN_S) $< $@
umpush_bo.pfb: Umpush-BoldOblique.pfb
- [ -f $@ ] || $(LN_S) $< $@
+ [ -e $@ ] || $(LN_S) $< $@
umpush_lo.pfb: Umpush-LightOblique.pfb
- [ -f $@ ] || $(LN_S) $< $@
+ [ -e $@ ] || $(LN_S) $< $@
sawasdee.pfb: Sawasdee.pfb
- [ -f $@ ] || $(LN_S) $< $@
+ [ -e $@ ] || $(LN_S) $< $@
sawasdee_b.pfb: Sawasdee-Bold.pfb
- [ -f $@ ] || $(LN_S) $< $@
+ [ -e $@ ] || $(LN_S) $< $@
sawasdee_o.pfb: Sawasdee-Oblique.pfb
- [ -f $@ ] || $(LN_S) $< $@
+ [ -e $@ ] || $(LN_S) $< $@
sawasdee_bo.pfb: Sawasdee-BoldOblique.pfb
- [ -f $@ ] || $(LN_S) $< $@
+ [ -e $@ ] || $(LN_S) $< $@
FONTS = \
ttype \
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 dd4f849b80a..25bb232ecb7 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.16.2 from Makefile.am.
+# Makefile.in generated by automake 1.16.4 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2020 Free Software Foundation, Inc.
+# Copyright (C) 1994-2021 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -182,11 +182,14 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+CSCOPE = @CSCOPE@
+CTAGS = @CTAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
+ETAGS = @ETAGS@
FCCACHE = @FCCACHE@
FONTFORGE = @FONTFORGE@
INSTALL = @INSTALL@
@@ -372,10 +375,19 @@ CLEANFILES = *.ttf *.g2n *.pfb *.afm *.pfm *.otf *.woff *.enc *.tfm \
@INCLUDE_LATEX_TRUE@LTX_TFMFILES = $(FONTS:%=%.tfm)
@INCLUDE_LATEX_TRUE@LTX_RTFMFILES = $(FONTS:%=r%.tfm)
@INCLUDE_LATEX_TRUE@LTX_VFFILES = $(FONTS:%=%.vf)
+@INCLUDE_LATEX_TRUE@LTX_SYNTH_TFMFILES = $(SYNTH_FONTS:%=%.tfm)
+@INCLUDE_LATEX_TRUE@LTX_SYNTH_RTFMFILES = $(SYNTH_FONTS:%=r%.tfm)
+@INCLUDE_LATEX_TRUE@LTX_SYNTH_VFFILES = $(SYNTH_FONTS:%=%.vf)
@INCLUDE_LATEX_TRUE@ltxtype1_DATA = $(LTX_PFBFILES)
@INCLUDE_LATEX_TRUE@ltxafm_DATA = $(LTX_AFMFILES)
-@INCLUDE_LATEX_TRUE@ltxtfm_DATA = $(LTX_TFMFILES) $(LTX_RTFMFILES)
-@INCLUDE_LATEX_TRUE@ltxvf_DATA = $(LTX_VFFILES)
+@INCLUDE_LATEX_TRUE@ltxtfm_DATA = \
+@INCLUDE_LATEX_TRUE@ $(LTX_TFMFILES) \
+@INCLUDE_LATEX_TRUE@ $(LTX_RTFMFILES) \
+@INCLUDE_LATEX_TRUE@ $(LTX_SYNTH_TFMFILES) \
+@INCLUDE_LATEX_TRUE@ $(LTX_SYNTH_RTFMFILES) \
+@INCLUDE_LATEX_TRUE@ $(NULL)
+
+@INCLUDE_LATEX_TRUE@ltxvf_DATA = $(LTX_VFFILES) $(LTX_SYNTH_VFFILES)
# OpenType fonts
@INCLUDE_LATEX_TRUE@ltxotfdir = $(texmfdir)/fonts/opentype/public/$(LATEX_PACKAGE)
@@ -651,7 +663,6 @@ ctags CTAGS:
cscope cscopelist:
-
distdir: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) distdir-am
@@ -848,133 +859,172 @@ PS%.afm PS%.pfb: %.sfd
$(FONTFORGE) -script $(top_srcdir)/scripts/gen-pfb.pe $<
@INCLUDE_LATEX_TRUE@ttype.afm: TlwgTypewriter.afm
-@INCLUDE_LATEX_TRUE@ [ -f $@ ] || $(LN_S) $< $@
+@INCLUDE_LATEX_TRUE@ [ -e $@ ] || $(LN_S) $< $@
@INCLUDE_LATEX_TRUE@ttype_b.afm: TlwgTypewriter-Bold.afm
-@INCLUDE_LATEX_TRUE@ [ -f $@ ] || $(LN_S) $< $@
+@INCLUDE_LATEX_TRUE@ [ -e $@ ] || $(LN_S) $< $@
@INCLUDE_LATEX_TRUE@ttype_o.afm: TlwgTypewriter-Oblique.afm
-@INCLUDE_LATEX_TRUE@ [ -f $@ ] || $(LN_S) $< $@
+@INCLUDE_LATEX_TRUE@ [ -e $@ ] || $(LN_S) $< $@
@INCLUDE_LATEX_TRUE@ttype_bo.afm: TlwgTypewriter-BoldOblique.afm
-@INCLUDE_LATEX_TRUE@ [ -f $@ ] || $(LN_S) $< $@
+@INCLUDE_LATEX_TRUE@ [ -e $@ ] || $(LN_S) $< $@
@INCLUDE_LATEX_TRUE@ttypist.afm: TlwgTypist.afm
-@INCLUDE_LATEX_TRUE@ [ -f $@ ] || $(LN_S) $< $@
+@INCLUDE_LATEX_TRUE@ [ -e $@ ] || $(LN_S) $< $@
@INCLUDE_LATEX_TRUE@ttypist_b.afm: TlwgTypist-Bold.afm
-@INCLUDE_LATEX_TRUE@ [ -f $@ ] || $(LN_S) $< $@
+@INCLUDE_LATEX_TRUE@ [ -e $@ ] || $(LN_S) $< $@
@INCLUDE_LATEX_TRUE@ttypist_o.afm: TlwgTypist-Oblique.afm
-@INCLUDE_LATEX_TRUE@ [ -f $@ ] || $(LN_S) $< $@
+@INCLUDE_LATEX_TRUE@ [ -e $@ ] || $(LN_S) $< $@
@INCLUDE_LATEX_TRUE@ttypist_bo.afm: TlwgTypist-BoldOblique.afm
-@INCLUDE_LATEX_TRUE@ [ -f $@ ] || $(LN_S) $< $@
+@INCLUDE_LATEX_TRUE@ [ -e $@ ] || $(LN_S) $< $@
@INCLUDE_LATEX_TRUE@purisa.afm: Purisa.afm
-@INCLUDE_LATEX_TRUE@ [ -f $@ ] || $(LN_S) $< $@
+@INCLUDE_LATEX_TRUE@ [ -e $@ ] || $(LN_S) $< $@
@INCLUDE_LATEX_TRUE@purisa_b.afm: Purisa-Bold.afm
-@INCLUDE_LATEX_TRUE@ [ -f $@ ] || $(LN_S) $< $@
+@INCLUDE_LATEX_TRUE@ [ -e $@ ] || $(LN_S) $< $@
@INCLUDE_LATEX_TRUE@purisa_o.afm: Purisa-Oblique.afm
-@INCLUDE_LATEX_TRUE@ [ -f $@ ] || $(LN_S) $< $@
+@INCLUDE_LATEX_TRUE@ [ -e $@ ] || $(LN_S) $< $@
@INCLUDE_LATEX_TRUE@purisa_bo.afm: Purisa-BoldOblique.afm
-@INCLUDE_LATEX_TRUE@ [ -f $@ ] || $(LN_S) $< $@
+@INCLUDE_LATEX_TRUE@ [ -e $@ ] || $(LN_S) $< $@
@INCLUDE_LATEX_TRUE@waree.afm: Waree.afm
-@INCLUDE_LATEX_TRUE@ [ -f $@ ] || $(LN_S) $< $@
+@INCLUDE_LATEX_TRUE@ [ -e $@ ] || $(LN_S) $< $@
@INCLUDE_LATEX_TRUE@waree_b.afm: Waree-Bold.afm
-@INCLUDE_LATEX_TRUE@ [ -f $@ ] || $(LN_S) $< $@
+@INCLUDE_LATEX_TRUE@ [ -e $@ ] || $(LN_S) $< $@
@INCLUDE_LATEX_TRUE@waree_o.afm: Waree-Oblique.afm
-@INCLUDE_LATEX_TRUE@ [ -f $@ ] || $(LN_S) $< $@
+@INCLUDE_LATEX_TRUE@ [ -e $@ ] || $(LN_S) $< $@
@INCLUDE_LATEX_TRUE@waree_bo.afm: Waree-BoldOblique.afm
-@INCLUDE_LATEX_TRUE@ [ -f $@ ] || $(LN_S) $< $@
+@INCLUDE_LATEX_TRUE@ [ -e $@ ] || $(LN_S) $< $@
@INCLUDE_LATEX_TRUE@umpush.afm: Umpush.afm
-@INCLUDE_LATEX_TRUE@ [ -f $@ ] || $(LN_S) $< $@
+@INCLUDE_LATEX_TRUE@ [ -e $@ ] || $(LN_S) $< $@
@INCLUDE_LATEX_TRUE@umpush_b.afm: Umpush-Bold.afm
-@INCLUDE_LATEX_TRUE@ [ -f $@ ] || $(LN_S) $< $@
+@INCLUDE_LATEX_TRUE@ [ -e $@ ] || $(LN_S) $< $@
@INCLUDE_LATEX_TRUE@umpush_l.afm: Umpush-Light.afm
-@INCLUDE_LATEX_TRUE@ [ -f $@ ] || $(LN_S) $< $@
+@INCLUDE_LATEX_TRUE@ [ -e $@ ] || $(LN_S) $< $@
@INCLUDE_LATEX_TRUE@umpush_o.afm: Umpush-Oblique.afm
-@INCLUDE_LATEX_TRUE@ [ -f $@ ] || $(LN_S) $< $@
+@INCLUDE_LATEX_TRUE@ [ -e $@ ] || $(LN_S) $< $@
@INCLUDE_LATEX_TRUE@umpush_bo.afm: Umpush-BoldOblique.afm
-@INCLUDE_LATEX_TRUE@ [ -f $@ ] || $(LN_S) $< $@
+@INCLUDE_LATEX_TRUE@ [ -e $@ ] || $(LN_S) $< $@
@INCLUDE_LATEX_TRUE@umpush_lo.afm: Umpush-LightOblique.afm
-@INCLUDE_LATEX_TRUE@ [ -f $@ ] || $(LN_S) $< $@
+@INCLUDE_LATEX_TRUE@ [ -e $@ ] || $(LN_S) $< $@
@INCLUDE_LATEX_TRUE@sawasdee.afm: Sawasdee.afm
-@INCLUDE_LATEX_TRUE@ [ -f $@ ] || $(LN_S) $< $@
+@INCLUDE_LATEX_TRUE@ [ -e $@ ] || $(LN_S) $< $@
@INCLUDE_LATEX_TRUE@sawasdee_b.afm: Sawasdee-Bold.afm
-@INCLUDE_LATEX_TRUE@ [ -f $@ ] || $(LN_S) $< $@
+@INCLUDE_LATEX_TRUE@ [ -e $@ ] || $(LN_S) $< $@
@INCLUDE_LATEX_TRUE@sawasdee_o.afm: Sawasdee-Oblique.afm
-@INCLUDE_LATEX_TRUE@ [ -f $@ ] || $(LN_S) $< $@
+@INCLUDE_LATEX_TRUE@ [ -e $@ ] || $(LN_S) $< $@
@INCLUDE_LATEX_TRUE@sawasdee_bo.afm: Sawasdee-BoldOblique.afm
-@INCLUDE_LATEX_TRUE@ [ -f $@ ] || $(LN_S) $< $@
+@INCLUDE_LATEX_TRUE@ [ -e $@ ] || $(LN_S) $< $@
@INCLUDE_LATEX_TRUE@ttype.pfb: TlwgTypewriter.pfb
-@INCLUDE_LATEX_TRUE@ [ -f $@ ] || $(LN_S) $< $@
+@INCLUDE_LATEX_TRUE@ [ -e $@ ] || $(LN_S) $< $@
@INCLUDE_LATEX_TRUE@ttype_b.pfb: TlwgTypewriter-Bold.pfb
-@INCLUDE_LATEX_TRUE@ [ -f $@ ] || $(LN_S) $< $@
+@INCLUDE_LATEX_TRUE@ [ -e $@ ] || $(LN_S) $< $@
@INCLUDE_LATEX_TRUE@ttype_o.pfb: TlwgTypewriter-Oblique.pfb
-@INCLUDE_LATEX_TRUE@ [ -f $@ ] || $(LN_S) $< $@
+@INCLUDE_LATEX_TRUE@ [ -e $@ ] || $(LN_S) $< $@
@INCLUDE_LATEX_TRUE@ttype_bo.pfb: TlwgTypewriter-BoldOblique.pfb
-@INCLUDE_LATEX_TRUE@ [ -f $@ ] || $(LN_S) $< $@
+@INCLUDE_LATEX_TRUE@ [ -e $@ ] || $(LN_S) $< $@
@INCLUDE_LATEX_TRUE@ttypist.pfb: TlwgTypist.pfb
-@INCLUDE_LATEX_TRUE@ [ -f $@ ] || $(LN_S) $< $@
+@INCLUDE_LATEX_TRUE@ [ -e $@ ] || $(LN_S) $< $@
@INCLUDE_LATEX_TRUE@ttypist_b.pfb: TlwgTypist-Bold.pfb
-@INCLUDE_LATEX_TRUE@ [ -f $@ ] || $(LN_S) $< $@
+@INCLUDE_LATEX_TRUE@ [ -e $@ ] || $(LN_S) $< $@
@INCLUDE_LATEX_TRUE@ttypist_o.pfb: TlwgTypist-Oblique.pfb
-@INCLUDE_LATEX_TRUE@ [ -f $@ ] || $(LN_S) $< $@
+@INCLUDE_LATEX_TRUE@ [ -e $@ ] || $(LN_S) $< $@
@INCLUDE_LATEX_TRUE@ttypist_bo.pfb: TlwgTypist-BoldOblique.pfb
-@INCLUDE_LATEX_TRUE@ [ -f $@ ] || $(LN_S) $< $@
+@INCLUDE_LATEX_TRUE@ [ -e $@ ] || $(LN_S) $< $@
@INCLUDE_LATEX_TRUE@purisa.pfb: Purisa.pfb
-@INCLUDE_LATEX_TRUE@ [ -f $@ ] || $(LN_S) $< $@
+@INCLUDE_LATEX_TRUE@ [ -e $@ ] || $(LN_S) $< $@
@INCLUDE_LATEX_TRUE@purisa_b.pfb: Purisa-Bold.pfb
-@INCLUDE_LATEX_TRUE@ [ -f $@ ] || $(LN_S) $< $@
+@INCLUDE_LATEX_TRUE@ [ -e $@ ] || $(LN_S) $< $@
@INCLUDE_LATEX_TRUE@purisa_o.pfb: Purisa-Oblique.pfb
-@INCLUDE_LATEX_TRUE@ [ -f $@ ] || $(LN_S) $< $@
+@INCLUDE_LATEX_TRUE@ [ -e $@ ] || $(LN_S) $< $@
@INCLUDE_LATEX_TRUE@purisa_bo.pfb: Purisa-BoldOblique.pfb
-@INCLUDE_LATEX_TRUE@ [ -f $@ ] || $(LN_S) $< $@
+@INCLUDE_LATEX_TRUE@ [ -e $@ ] || $(LN_S) $< $@
@INCLUDE_LATEX_TRUE@waree.pfb: Waree.pfb
-@INCLUDE_LATEX_TRUE@ [ -f $@ ] || $(LN_S) $< $@
+@INCLUDE_LATEX_TRUE@ [ -e $@ ] || $(LN_S) $< $@
@INCLUDE_LATEX_TRUE@waree_b.pfb: Waree-Bold.pfb
-@INCLUDE_LATEX_TRUE@ [ -f $@ ] || $(LN_S) $< $@
+@INCLUDE_LATEX_TRUE@ [ -e $@ ] || $(LN_S) $< $@
@INCLUDE_LATEX_TRUE@waree_o.pfb: Waree-Oblique.pfb
-@INCLUDE_LATEX_TRUE@ [ -f $@ ] || $(LN_S) $< $@
+@INCLUDE_LATEX_TRUE@ [ -e $@ ] || $(LN_S) $< $@
@INCLUDE_LATEX_TRUE@waree_bo.pfb: Waree-BoldOblique.pfb
-@INCLUDE_LATEX_TRUE@ [ -f $@ ] || $(LN_S) $< $@
+@INCLUDE_LATEX_TRUE@ [ -e $@ ] || $(LN_S) $< $@
@INCLUDE_LATEX_TRUE@umpush.pfb: Umpush.pfb
-@INCLUDE_LATEX_TRUE@ [ -f $@ ] || $(LN_S) $< $@
+@INCLUDE_LATEX_TRUE@ [ -e $@ ] || $(LN_S) $< $@
@INCLUDE_LATEX_TRUE@umpush_b.pfb: Umpush-Bold.pfb
-@INCLUDE_LATEX_TRUE@ [ -f $@ ] || $(LN_S) $< $@
+@INCLUDE_LATEX_TRUE@ [ -e $@ ] || $(LN_S) $< $@
@INCLUDE_LATEX_TRUE@umpush_l.pfb: Umpush-Light.pfb
-@INCLUDE_LATEX_TRUE@ [ -f $@ ] || $(LN_S) $< $@
+@INCLUDE_LATEX_TRUE@ [ -e $@ ] || $(LN_S) $< $@
@INCLUDE_LATEX_TRUE@umpush_o.pfb: Umpush-Oblique.pfb
-@INCLUDE_LATEX_TRUE@ [ -f $@ ] || $(LN_S) $< $@
+@INCLUDE_LATEX_TRUE@ [ -e $@ ] || $(LN_S) $< $@
@INCLUDE_LATEX_TRUE@umpush_bo.pfb: Umpush-BoldOblique.pfb
-@INCLUDE_LATEX_TRUE@ [ -f $@ ] || $(LN_S) $< $@
+@INCLUDE_LATEX_TRUE@ [ -e $@ ] || $(LN_S) $< $@
@INCLUDE_LATEX_TRUE@umpush_lo.pfb: Umpush-LightOblique.pfb
-@INCLUDE_LATEX_TRUE@ [ -f $@ ] || $(LN_S) $< $@
+@INCLUDE_LATEX_TRUE@ [ -e $@ ] || $(LN_S) $< $@
@INCLUDE_LATEX_TRUE@sawasdee.pfb: Sawasdee.pfb
-@INCLUDE_LATEX_TRUE@ [ -f $@ ] || $(LN_S) $< $@
+@INCLUDE_LATEX_TRUE@ [ -e $@ ] || $(LN_S) $< $@
@INCLUDE_LATEX_TRUE@sawasdee_b.pfb: Sawasdee-Bold.pfb
-@INCLUDE_LATEX_TRUE@ [ -f $@ ] || $(LN_S) $< $@
+@INCLUDE_LATEX_TRUE@ [ -e $@ ] || $(LN_S) $< $@
@INCLUDE_LATEX_TRUE@sawasdee_o.pfb: Sawasdee-Oblique.pfb
-@INCLUDE_LATEX_TRUE@ [ -f $@ ] || $(LN_S) $< $@
+@INCLUDE_LATEX_TRUE@ [ -e $@ ] || $(LN_S) $< $@
@INCLUDE_LATEX_TRUE@sawasdee_bo.pfb: Sawasdee-BoldOblique.pfb
-@INCLUDE_LATEX_TRUE@ [ -f $@ ] || $(LN_S) $< $@
+@INCLUDE_LATEX_TRUE@ [ -e $@ ] || $(LN_S) $< $@
# Local Rules
-@INCLUDE_LATEX_TRUE@thai-dummy.afm:
-@INCLUDE_LATEX_TRUE@ [ -e thai-dummy.afm ] || $(LN_S) $(top_srcdir)/latex/thai-dummy.afm .
-
-@INCLUDE_LATEX_TRUE@thailigs.enc:
-@INCLUDE_LATEX_TRUE@ [ -e thailigs.enc ] || $(LN_S) $(top_srcdir)/latex/thailigs.enc .
-
-@INCLUDE_LATEX_TRUE@lthtlwg.enc:
-@INCLUDE_LATEX_TRUE@ [ -e lthtlwg.enc ] || $(LN_S) $(top_srcdir)/latex/lthtlwg.enc .
+@INCLUDE_LATEX_TRUE@thai-dummy.afm \
+@INCLUDE_LATEX_TRUE@thailigs.enc \
+@INCLUDE_LATEX_TRUE@lthtlwg.enc \
+@INCLUDE_LATEX_TRUE@thailigs-sc.enc \
+@INCLUDE_LATEX_TRUE@lthtlwg-sc.enc \
+@INCLUDE_LATEX_TRUE@thailigs-osf.enc \
+@INCLUDE_LATEX_TRUE@lthtlwg-osf.enc \
+@INCLUDE_LATEX_TRUE@thailigs-osf-sc.enc \
+@INCLUDE_LATEX_TRUE@lthtlwg-osf-sc.enc \
+@INCLUDE_LATEX_TRUE@:
+@INCLUDE_LATEX_TRUE@ [ -e $@ ] || $(LN_S) $(top_srcdir)/latex/$@ .
@INCLUDE_LATEX_TRUE@thailigs.vpl: thai-dummy.afm thailigs.enc
@INCLUDE_LATEX_TRUE@ $(AFM2TFM) thai-dummy.afm -v $@ -T thailigs.enc thailigs.tfm
+@INCLUDE_LATEX_TRUE@thailigs-sc.vpl: thai-dummy.afm thailigs-sc.enc
+@INCLUDE_LATEX_TRUE@ $(AFM2TFM) thai-dummy.afm -v $@ -T thailigs-sc.enc thailigs-sc.tfm
+
+@INCLUDE_LATEX_TRUE@thailigs-osf.vpl: thai-dummy.afm thailigs-osf.enc
+@INCLUDE_LATEX_TRUE@ $(AFM2TFM) thai-dummy.afm -v $@ -T thailigs-osf.enc thailigs-osf.tfm
+
+@INCLUDE_LATEX_TRUE@thailigs-osf-sc.vpl: thai-dummy.afm thailigs-osf-sc.enc
+@INCLUDE_LATEX_TRUE@ $(AFM2TFM) thai-dummy.afm -v $@ -T thailigs-osf-sc.enc thailigs-osf-sc.tfm
+
+#
+# merge_ligs(font-vpl-file,ligs-vpl-file)
+#
+# Replaces LIGTABLE in font-vpl-file with that in ligs-vpl-file.
+#
+@INCLUDE_LATEX_TRUE@define merge_ligs
+@INCLUDE_LATEX_TRUE@ TMPFILE=`mktemp /tmp/tltx.XXXXXXXXX` && \
+@INCLUDE_LATEX_TRUE@ $(AWK) "BEGIN {show=1} /LIGTABLE/ {show=0} {if(show) print}" $(1) > $$TMPFILE && \
+@INCLUDE_LATEX_TRUE@ $(AWK) "BEGIN {show=0} /LIGTABLE/ {show=1} /CHARACTER/ {show=0} {if(show) print}" $(2) >> $$TMPFILE && \
+@INCLUDE_LATEX_TRUE@ $(AWK) "BEGIN {show=0} /CHARACTER/ {show=1} {if(show) print}" $(1) >> $$TMPFILE && \
+@INCLUDE_LATEX_TRUE@ mv $$TMPFILE $(1)
+@INCLUDE_LATEX_TRUE@endef
+
+@INCLUDE_LATEX_TRUE@r%-osf-sc.tfm: %.afm
+@INCLUDE_LATEX_TRUE@%-osf-sc.vpl: %.afm thailigs-osf-sc.vpl lthtlwg-osf-sc.enc
+@INCLUDE_LATEX_TRUE@ $(AFM2TFM) $*.afm -v $*-osf-sc.vpl -T lthtlwg-osf-sc.enc r$*-osf-sc.tfm \
+@INCLUDE_LATEX_TRUE@ | $(SED) "s/$$/ <$*.pfb/" >> $(MAP)
+@INCLUDE_LATEX_TRUE@ $(call merge_ligs,$*-osf-sc.vpl,thailigs-osf-sc.vpl)
+
+@INCLUDE_LATEX_TRUE@r%-osf.tfm: %.afm
+@INCLUDE_LATEX_TRUE@%-osf.vpl: %.afm thailigs-osf.vpl lthtlwg-osf.enc
+@INCLUDE_LATEX_TRUE@ $(AFM2TFM) $*.afm -v $*-osf.vpl -T lthtlwg-osf.enc r$*-osf.tfm \
+@INCLUDE_LATEX_TRUE@ | $(SED) "s/$$/ <$*.pfb/" >> $(MAP)
+@INCLUDE_LATEX_TRUE@ $(call merge_ligs,$*-osf.vpl,thailigs-osf.vpl)
+
+@INCLUDE_LATEX_TRUE@r%-sc.tfm: %.afm
+@INCLUDE_LATEX_TRUE@%-sc.vpl: %.afm thailigs-sc.vpl lthtlwg-sc.enc
+@INCLUDE_LATEX_TRUE@ $(AFM2TFM) $*.afm -v $*-sc.vpl -T lthtlwg-sc.enc r$*-sc.tfm \
+@INCLUDE_LATEX_TRUE@ | $(SED) "s/$$/ <$*.pfb/" >> $(MAP)
+@INCLUDE_LATEX_TRUE@ $(call merge_ligs,$*-sc.vpl,thailigs-sc.vpl)
+
@INCLUDE_LATEX_TRUE@r%.tfm: %.afm
@INCLUDE_LATEX_TRUE@%.vpl: %.afm thailigs.vpl lthtlwg.enc
@INCLUDE_LATEX_TRUE@ $(AFM2TFM) $*.afm -v $*.vpl -T lthtlwg.enc r$*.tfm \
@INCLUDE_LATEX_TRUE@ | $(SED) "s/$$/ <$*.pfb/" >> $(MAP)
-@INCLUDE_LATEX_TRUE@ TMPFILE=`mktemp /tmp/tltx.XXXXXXXXX` && \
-@INCLUDE_LATEX_TRUE@ $(AWK) "BEGIN {show=1} /LIGTABLE/ {show=0} {if(show) print}" $*.vpl > $$TMPFILE && \
-@INCLUDE_LATEX_TRUE@ $(AWK) "BEGIN {show=0} /LIGTABLE/ {show=1} /CHARACTER/ {show=0} {if(show) print}" thailigs.vpl >> $$TMPFILE && \
-@INCLUDE_LATEX_TRUE@ $(AWK) "BEGIN {show=0} /CHARACTER/ {show=1} {if(show) print}" $*.vpl >> $$TMPFILE && \
-@INCLUDE_LATEX_TRUE@ mv $$TMPFILE $*.vpl
+@INCLUDE_LATEX_TRUE@ $(call merge_ligs,$*.vpl,thailigs.vpl)
@INCLUDE_LATEX_TRUE@%.tfm: %.vpl
@INCLUDE_LATEX_TRUE@ $(VPTOVF) $*
diff --git a/Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/Purisa-Bold.sfd b/Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/Purisa-Bold.sfd
index 25856c060be..bef8cdb0d60 100644
--- a/Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/Purisa-Bold.sfd
+++ b/Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/Purisa-Bold.sfd
@@ -5,7 +5,7 @@ FamilyName: Purisa
Weight: Bold
Copyright: Purisa, Thai handwriting outline font.\n\nCopyright (C) 2003, 2004 Poonlap Veerathanabutr <poonlap@linux.thai.net>
UComments: "2003-11-27: Created.+AAoACgAA-Acknowlegement:+AAoA-Hanwriting by Ms.Purisa Cholasueksa. +AAoA-Co-operated by Mr.Teeratep Sosakul.+AAoACgAA-2004-02-14:+AAoA-Modified most characters. Make numbers bigger."
-Version: 004.003
+Version: 004.004
ItalicAngle: 0
UnderlinePosition: -100
UnderlineWidth: 50
@@ -16,12 +16,12 @@ LayerCount: 3
Layer: 0 0 "Back" 1
Layer: 1 0 "Fore" 0
Layer: 2 1 "Quad" 0
-FSType: 8
+FSType: 0
OS2Version: 4
OS2_WeightWidthSlopeOnly: 0
OS2_UseTypoMetrics: 1
CreationTime: 1153666222
-ModificationTime: 1587960980
+ModificationTime: 1588320510
PfmFamily: 65
TTFWeight: 700
TTFWidth: 5
diff --git a/Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/Purisa-BoldOblique.sfd b/Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/Purisa-BoldOblique.sfd
index 62f103a0032..6107255adc0 100644
--- a/Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/Purisa-BoldOblique.sfd
+++ b/Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/Purisa-BoldOblique.sfd
@@ -5,7 +5,7 @@ FamilyName: Purisa
Weight: Bold
Copyright: Purisa, Thai handwriting outline font.\n\nCopyright (C) 2003, 2004 Poonlap Veerathanabutr <poonlap@linux.thai.net>
UComments: "2003-11-27: Created.+AAoACgAA-Acknowlegement:+AAoA-Hanwriting by Ms.Purisa Cholasueksa. +AAoA-Co-operated by Mr.Teeratep Sosakul.+AAoACgAA-2004-02-14:+AAoA-Modified most characters. Make numbers bigger."
-Version: 004.003
+Version: 004.004
ItalicAngle: -12
UnderlinePosition: -100
UnderlineWidth: 50
@@ -16,12 +16,12 @@ LayerCount: 3
Layer: 0 0 "Back" 1
Layer: 1 0 "Fore" 0
Layer: 2 1 "Quad" 0
-FSType: 8
+FSType: 0
OS2Version: 4
OS2_WeightWidthSlopeOnly: 0
OS2_UseTypoMetrics: 1
CreationTime: 1153666222
-ModificationTime: 1587960991
+ModificationTime: 1588320522
PfmFamily: 65
TTFWeight: 700
TTFWidth: 5
diff --git a/Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/Purisa-Oblique.sfd b/Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/Purisa-Oblique.sfd
index 172c095855b..1248bb1da13 100644
--- a/Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/Purisa-Oblique.sfd
+++ b/Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/Purisa-Oblique.sfd
@@ -5,7 +5,7 @@ FamilyName: Purisa
Weight: Regular
Copyright: Purisa, Thai handwriting outline font.\n\nCopyright (C) 2003, 2004 Poonlap Veerathanabutr <poonlap@linux.thai.net>
UComments: "2003-11-27: Created.+AAoACgAA-Acknowlegement:+AAoA-Hanwriting by Ms.Purisa Cholasueksa. +AAoA-Co-operated by Mr.Teeratep Sosakul.+AAoACgAA-2004-02-14:+AAoA-Modified most characters. Make numbers bigger."
-Version: 004.003
+Version: 004.004
ItalicAngle: -12
UnderlinePosition: -100
UnderlineWidth: 50
@@ -16,12 +16,12 @@ LayerCount: 3
Layer: 0 0 "Back" 1
Layer: 1 0 "Fore" 0
Layer: 2 1 "Quad" 0
-FSType: 8
+FSType: 0
OS2Version: 4
OS2_WeightWidthSlopeOnly: 0
OS2_UseTypoMetrics: 1
CreationTime: 1153666222
-ModificationTime: 1587960972
+ModificationTime: 1588320498
PfmFamily: 65
TTFWeight: 400
TTFWidth: 5
diff --git a/Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/Purisa.sfd b/Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/Purisa.sfd
index 7fba75af86d..1faf2f0ee7b 100644
--- a/Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/Purisa.sfd
+++ b/Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/Purisa.sfd
@@ -5,7 +5,7 @@ FamilyName: Purisa
Weight: Regular
Copyright: Purisa, Thai handwriting outline font.\n\nCopyright (C) 2003, 2004 Poonlap Veerathanabutr <poonlap@linux.thai.net>
UComments: "2003-11-27: Created.+AAoACgAA-Acknowlegement:+AAoA-Hanwriting by Ms.Purisa Cholasueksa. +AAoA-Co-operated by Mr.Teeratep Sosakul.+AAoACgAA-2004-02-14:+AAoA-Modified most characters. Make numbers bigger."
-Version: 004.003
+Version: 004.004
ItalicAngle: 0
UnderlinePosition: -100
UnderlineWidth: 50
@@ -16,12 +16,12 @@ LayerCount: 3
Layer: 0 0 "Back" 1
Layer: 1 0 "Fore" 0
Layer: 2 1 "Quad" 0
-FSType: 8
+FSType: 0
OS2Version: 4
OS2_WeightWidthSlopeOnly: 0
OS2_UseTypoMetrics: 1
CreationTime: 1153666222
-ModificationTime: 1587960964
+ModificationTime: 1588320485
PfmFamily: 65
TTFWeight: 400
TTFWidth: 5
diff --git a/Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/Sawasdee-Bold.sfd b/Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/Sawasdee-Bold.sfd
index 97c22f66334..caa581432fa 100644
--- a/Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/Sawasdee-Bold.sfd
+++ b/Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/Sawasdee-Bold.sfd
@@ -4,7 +4,7 @@ FullName: Sawasdee Bold
FamilyName: Sawasdee
Weight: Bold
Copyright: Copyright (c) 2007 Pol Udomwittayanukul. All rights reserved.
-Version: 003.004
+Version: 003.005
ItalicAngle: 0
UnderlinePosition: -153
UnderlineWidth: 102
@@ -17,12 +17,12 @@ Layer: 1 0 "Fore" 0
Layer: 2 1 "Quad" 0
XUID: [1021 180 1442959360 14105406]
UniqueID: 4256560
-FSType: 8
+FSType: 0
OS2Version: 4
OS2_WeightWidthSlopeOnly: 0
OS2_UseTypoMetrics: 1
CreationTime: 1178430034
-ModificationTime: 1587961606
+ModificationTime: 1588320772
PfmFamily: 17
TTFWeight: 700
TTFWidth: 5
diff --git a/Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/Sawasdee-BoldOblique.sfd b/Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/Sawasdee-BoldOblique.sfd
index 35c6b220f60..29e4dec1c48 100644
--- a/Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/Sawasdee-BoldOblique.sfd
+++ b/Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/Sawasdee-BoldOblique.sfd
@@ -4,7 +4,7 @@ FullName: Sawasdee Bold Oblique
FamilyName: Sawasdee
Weight: Bold
Copyright: Copyright (c) 2007 Pol Udomwittayanukul. All rights reserved.
-Version: 003.004
+Version: 003.005
ItalicAngle: -12
UnderlinePosition: -153
UnderlineWidth: 102
@@ -17,12 +17,12 @@ Layer: 1 0 "Fore" 0
Layer: 2 1 "Quad" 0
XUID: [1021 180 1442959360 14302000]
UniqueID: 4076113
-FSType: 8
+FSType: 0
OS2Version: 4
OS2_WeightWidthSlopeOnly: 0
OS2_UseTypoMetrics: 1
CreationTime: 1178430034
-ModificationTime: 1587961926
+ModificationTime: 1588320784
PfmFamily: 17
TTFWeight: 700
TTFWidth: 5
diff --git a/Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/Sawasdee-Oblique.sfd b/Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/Sawasdee-Oblique.sfd
index 7a9acacc818..39a1fdac105 100644
--- a/Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/Sawasdee-Oblique.sfd
+++ b/Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/Sawasdee-Oblique.sfd
@@ -4,7 +4,7 @@ FullName: Sawasdee Oblique
FamilyName: Sawasdee
Weight: Regular
Copyright: Copyright (c) 2007 Pol Udomwittayanukul. All rights reserved.
-Version: 003.004
+Version: 003.005
ItalicAngle: -12
UnderlinePosition: -153
UnderlineWidth: 102
@@ -17,12 +17,12 @@ Layer: 1 0 "Fore" 0
Layer: 2 1 "Quad" 0
XUID: [1021 180 1442959360 14105407]
UniqueID: 4256560
-FSType: 8
+FSType: 0
OS2Version: 4
OS2_WeightWidthSlopeOnly: 0
OS2_UseTypoMetrics: 1
CreationTime: 1178430034
-ModificationTime: 1587961558
+ModificationTime: 1588320758
PfmFamily: 17
TTFWeight: 400
TTFWidth: 5
diff --git a/Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/Sawasdee.sfd b/Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/Sawasdee.sfd
index 956821005d8..e9e85fe41e7 100644
--- a/Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/Sawasdee.sfd
+++ b/Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/Sawasdee.sfd
@@ -4,7 +4,7 @@ FullName: Sawasdee
FamilyName: Sawasdee
Weight: Regular
Copyright: Copyright (c) 2007 Pol Udomwittayanukul. All rights reserved.
-Version: 003.004
+Version: 003.005
ItalicAngle: 0
UnderlinePosition: -153
UnderlineWidth: 102
@@ -17,12 +17,12 @@ Layer: 1 0 "Fore" 0
Layer: 2 1 "Quad" 0
XUID: [1021 180 1442959360 14105409]
UniqueID: 4256560
-FSType: 8
+FSType: 0
OS2Version: 4
OS2_WeightWidthSlopeOnly: 0
OS2_UseTypoMetrics: 1
CreationTime: 1178430034
-ModificationTime: 1587962128
+ModificationTime: 1588320743
PfmFamily: 17
TTFWeight: 400
TTFWidth: 5
diff --git a/Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/TlwgMono-Bold.sfd b/Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/TlwgMono-Bold.sfd
index a09c61dc879..5b384e8cb61 100644
--- a/Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/TlwgMono-Bold.sfd
+++ b/Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/TlwgMono-Bold.sfd
@@ -5,7 +5,7 @@ FamilyName: TlwgMono
Weight: Bold
Copyright: TlwgMono-Bold, Free Thai Monospace outline font.\n\nCopyright (C) 2003 Poonlap Veerathanabutr <poonlap@linux.thai.net>
UComments: "2003-11-26: Created. +AAoA-PfaEdit 1.0 (http://pfaedit.sf.net).+AAoACgAA-TLWG is Thai Linux Working Group http://linux.thai.net+AAoACgAA-Imported ISO-8859-1 from FreeMono.sfd.+AAoA-http://www.nongnu.org/freefont/+AAoACgAA-Created from PseudoMono-Bold"
-Version: 002.002
+Version: 002.003
ItalicAngle: 0
UnderlinePosition: -100
UnderlineWidth: 50
@@ -21,13 +21,12 @@ OS2Version: 4
OS2_WeightWidthSlopeOnly: 0
OS2_UseTypoMetrics: 1
CreationTime: 1153666223
-ModificationTime: 1587973844
+ModificationTime: 1620797537
PfmFamily: 49
TTFWeight: 700
TTFWidth: 5
LineGap: 0
VLineGap: 0
-Panose: 2 0 6 3 0 0 0 0 0 0
OS2TypoAscent: 861
OS2TypoAOffset: 0
OS2TypoDescent: -371
diff --git a/Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/TlwgMono-BoldOblique.sfd b/Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/TlwgMono-BoldOblique.sfd
index cd33f8848d0..e1e5334dc4e 100644
--- a/Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/TlwgMono-BoldOblique.sfd
+++ b/Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/TlwgMono-BoldOblique.sfd
@@ -5,7 +5,7 @@ FamilyName: TlwgMono
Weight: Bold
Copyright: TlwgMono-Bold, Free Thai Monospace outline font.\n\nCopyright (C) 2003 Poonlap Veerathanabutr <poonlap@linux.thai.net>
UComments: "2003-11-26: Created. +AAoA-PfaEdit 1.0 (http://pfaedit.sf.net).+AAoACgAA-TLWG is Thai Linux Working Group http://linux.thai.net+AAoACgAA-Imported ISO-8859-1 from FreeMono.sfd.+AAoA-http://www.nongnu.org/freefont/+AAoACgAA-Created from PseudoMono-BoldOblique+AAoA"
-Version: 002.002
+Version: 002.003
ItalicAngle: -12
UnderlinePosition: -100
UnderlineWidth: 50
@@ -21,13 +21,12 @@ OS2Version: 4
OS2_WeightWidthSlopeOnly: 0
OS2_UseTypoMetrics: 1
CreationTime: 1153666223
-ModificationTime: 1587973910
+ModificationTime: 1620797552
PfmFamily: 49
TTFWeight: 700
TTFWidth: 5
LineGap: 0
VLineGap: 0
-Panose: 2 0 6 3 0 0 0 0 0 0
OS2TypoAscent: 861
OS2TypoAOffset: 0
OS2TypoDescent: -371
diff --git a/Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/TlwgMono-Oblique.sfd b/Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/TlwgMono-Oblique.sfd
index c8c1ac70c31..f4b7692d4bf 100644
--- a/Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/TlwgMono-Oblique.sfd
+++ b/Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/TlwgMono-Oblique.sfd
@@ -5,7 +5,7 @@ FamilyName: TlwgMono
Weight: Regular
Copyright: TlwgMono, Free Thai Monospace outline font.\n\nCopyright (C) 2003 Poonlap Veerathanabutr <poonlap@linux.thai.net>
UComments: "2003-11-26: Created. +AAoA-PfaEdit 1.0 (http://pfaedit.sf.net).+AAoACgAA-TLWG is Thai Linux Working Group http://linux.thai.net+AAoACgAA-This font was derived from TlwgMono.Most characters have fixed width except some vowels and tone marks.+AAoACgAA-Created from PseudoMono-Oblique"
-Version: 002.002
+Version: 002.003
ItalicAngle: -12
UnderlinePosition: -100
UnderlineWidth: 50
@@ -21,13 +21,12 @@ OS2Version: 4
OS2_WeightWidthSlopeOnly: 0
OS2_UseTypoMetrics: 1
CreationTime: 1153666223
-ModificationTime: 1587973777
+ModificationTime: 1620797523
PfmFamily: 49
TTFWeight: 400
TTFWidth: 5
LineGap: 0
VLineGap: 0
-Panose: 2 0 6 3 0 0 0 0 0 0
OS2TypoAscent: 861
OS2TypoAOffset: 0
OS2TypoDescent: -371
diff --git a/Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/TlwgMono.sfd b/Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/TlwgMono.sfd
index 0ac1b1216b9..9af61021e43 100644
--- a/Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/TlwgMono.sfd
+++ b/Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/TlwgMono.sfd
@@ -5,7 +5,7 @@ FamilyName: TlwgMono
Weight: Regular
Copyright: TlwgMono, Free Thai monospace outline font.\n\nCopyright (C) 2003 Poonlap Veerathanabutr <poonlap@linux.thai.net>
UComments: "2003-11-8: Created. +AAoA-PfaEdit 1.0 (http://pfaedit.sf.net).+AAoACgAA-TLWG is Thai Linux Working Group http://linux.thai.net+AAoACgAA-Imported ISO-8859-1 from FreeMono.sfd.+AAoA-http://www.nongnu.org/freefont/+AAoACgAA-Imported thai18.bdf as background for reference.+AAoACgAA-2003-11-15: Used +ACIA-Copy reference+ACIA to variants. But some cannot. I don't know why.+AAoACgAA-2003-11-17: First release+AAoA-See sample of this font in PDF from http://linux/thai.net/Members/poonlap/font/TlwgMono.pdf+AAoACgAA-2003-11-18: fixed some characters and make every character monospace.+AAoACgAA-2003-11-18: fixed font width and name (dottedcircke, uni0E10descless)"
-Version: 002.002
+Version: 002.003
ItalicAngle: 0
UnderlinePosition: -100
UnderlineWidth: 50
@@ -21,13 +21,12 @@ OS2Version: 4
OS2_WeightWidthSlopeOnly: 0
OS2_UseTypoMetrics: 1
CreationTime: 1153666223
-ModificationTime: 1587973666
+ModificationTime: 1620797510
PfmFamily: 49
TTFWeight: 400
TTFWidth: 5
LineGap: 0
VLineGap: 0
-Panose: 2 0 6 3 0 0 0 0 0 0
OS2TypoAscent: 861
OS2TypoAOffset: 0
OS2TypoDescent: -371
diff --git a/Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/TlwgTypewriter-Bold.sfd b/Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/TlwgTypewriter-Bold.sfd
index 6e7debe45bb..461c4ef1416 100644
--- a/Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/TlwgTypewriter-Bold.sfd
+++ b/Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/TlwgTypewriter-Bold.sfd
@@ -5,7 +5,7 @@ FamilyName: TlwgTypewriter
Weight: Bold
Copyright: Tlwg Typewriter-Bold, Free Thai Pseudo Monospace outline font. Copyright (C) 2003, 2004 Poonlap Veerathanabutr <poonlap@linux.thai.net>
UComments: "2003-11-20: Created. +AAoA-PfaEdit 1.0 (http://pfaedit.sf.net).+AAoACgAA-TLWG is Thai Linux Working Group http://linux.thai.net+AAoACgAA-Imported ISO-8859-1 from FreeMono.sfd.+AAoA-http://www.nongnu.org/freefont/+AAoACgAA-2003-11-22: first release+AAoACgAA-2003-11-25: Fixed vowel and tone marks' level."
-Version: 003.002
+Version: 003.003
ItalicAngle: 0
UnderlinePosition: -100
UnderlineWidth: 50
@@ -21,13 +21,12 @@ OS2Version: 4
OS2_WeightWidthSlopeOnly: 0
OS2_UseTypoMetrics: 1
CreationTime: 1153666223
-ModificationTime: 1587974720
+ModificationTime: 1620808976
PfmFamily: 49
TTFWeight: 700
TTFWidth: 5
LineGap: 0
VLineGap: 0
-Panose: 2 0 6 3 0 0 0 0 0 0
OS2TypoAscent: 942
OS2TypoAOffset: 0
OS2TypoDescent: -379
diff --git a/Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/TlwgTypewriter-BoldOblique.sfd b/Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/TlwgTypewriter-BoldOblique.sfd
index 6ab337ce7ae..7ef50c90b81 100644
--- a/Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/TlwgTypewriter-BoldOblique.sfd
+++ b/Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/TlwgTypewriter-BoldOblique.sfd
@@ -5,7 +5,7 @@ FamilyName: TlwgTypewriter
Weight: Bold
Copyright: Tlwg Typewriter-Bold, Free Thai Pseudo Monospace outline font. Copyright (C) 2003, 2004 Poonlap Veerathanabutr <poonlap@linux.thai.net>
UComments: "2003-11-25: Created. +AAoA-PfaEdit 1.0 (http://pfaedit.sf.net).+AAoACgAA-TLWG is Thai Linux Working Group http://linux.thai.net+AAoACgAA-Imported ISO-8859-1 from FreeMono.sfd.+AAoA-http://www.nongnu.org/freefont/+AAoACgAA"
-Version: 003.002
+Version: 003.003
ItalicAngle: -12
UnderlinePosition: -100
UnderlineWidth: 50
@@ -21,13 +21,12 @@ OS2Version: 4
OS2_WeightWidthSlopeOnly: 0
OS2_UseTypoMetrics: 1
CreationTime: 1153666223
-ModificationTime: 1587974822
+ModificationTime: 1620808998
PfmFamily: 49
TTFWeight: 700
TTFWidth: 5
LineGap: 0
VLineGap: 0
-Panose: 2 0 6 3 0 0 0 0 0 0
OS2TypoAscent: 942
OS2TypoAOffset: 0
OS2TypoDescent: -379
diff --git a/Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/TlwgTypewriter-Oblique.sfd b/Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/TlwgTypewriter-Oblique.sfd
index 34dfec3d7bc..e535c0f9e2f 100644
--- a/Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/TlwgTypewriter-Oblique.sfd
+++ b/Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/TlwgTypewriter-Oblique.sfd
@@ -5,7 +5,7 @@ FamilyName: TlwgTypewriter
Weight: Regular
Copyright: Tlwg Typewriter, Free Thai Pseudo Monospace outline font. Copyright (C) 2003, 2004 Poonlap Veerathanabutr <poonlap@linux.thai.net>
UComments: "2003-11-25: Created. +AAoA-PfaEdit 1.0 (http://pfaedit.sf.net).+AAoACgAA-TLWG is Thai Linux Working Group http://linux.thai.net+AAoACgAA-This font was derived from TlwgMono.Most characters have fixed width except some vowels and tone marks.+AAoA"
-Version: 003.002
+Version: 003.003
ItalicAngle: -12
UnderlinePosition: -100
UnderlineWidth: 50
@@ -21,13 +21,12 @@ OS2Version: 4
OS2_WeightWidthSlopeOnly: 0
OS2_UseTypoMetrics: 1
CreationTime: 1153666223
-ModificationTime: 1587974613
+ModificationTime: 1620808966
PfmFamily: 49
TTFWeight: 400
TTFWidth: 5
LineGap: 0
VLineGap: 0
-Panose: 2 0 6 3 0 0 0 0 0 0
OS2TypoAscent: 942
OS2TypoAOffset: 0
OS2TypoDescent: -379
diff --git a/Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/TlwgTypewriter.sfd b/Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/TlwgTypewriter.sfd
index f79aaddacd2..e4be6f3efc0 100644
--- a/Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/TlwgTypewriter.sfd
+++ b/Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/TlwgTypewriter.sfd
@@ -5,7 +5,7 @@ FamilyName: TlwgTypewriter
Weight: Regular
Copyright: Tlwg Typewriter, Free Thai Pseudo Monospace outline font. Copyright (C) 2003, 2004 Poonlap Veerathanabutr <poonlap@linux.thai.net>
UComments: "2003-11-20: Created. +AAoA-PfaEdit 1.0 (http://pfaedit.sf.net).+AAoACgAA-TLWG is Thai Linux Working Group http://linux.thai.net+AAoACgAA-This font was derived from TlwgMono.Most characters have fixed width except some vowels and tone marks.+AAoACgAA-2003-11-25: Fixed above vowel and tone mark level.+AAoA"
-Version: 003.002
+Version: 003.003
ItalicAngle: 0
UnderlinePosition: -100
UnderlineWidth: 50
@@ -21,13 +21,12 @@ OS2Version: 4
OS2_WeightWidthSlopeOnly: 0
OS2_UseTypoMetrics: 1
CreationTime: 1153666223
-ModificationTime: 1587974496
+ModificationTime: 1620808955
PfmFamily: 49
TTFWeight: 400
TTFWidth: 5
LineGap: 0
VLineGap: 0
-Panose: 2 0 6 3 0 0 0 0 0 0
OS2TypoAscent: 942
OS2TypoAOffset: 0
OS2TypoDescent: -379
diff --git a/Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/TlwgTypist-Bold.sfd b/Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/TlwgTypist-Bold.sfd
index fe2154299fb..6b52cd5fbd0 100644
--- a/Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/TlwgTypist-Bold.sfd
+++ b/Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/TlwgTypist-Bold.sfd
@@ -5,7 +5,7 @@ FamilyName: Tlwg Typist
Weight: Bold
Copyright: Tlwg Typist, based on Poonlap Veerathanabutr's Tlwg Typewriter.\n\nCopyright (C) 2005-2014 Theppitak Karoonboonyanan.\n\nTlwg Typewriter, Free Thai Pseudo Monospace outline font.\n\nCopyright (C) 2003, 2004 Poonlap Veerathanabutr <poonlap@linux.thai.net>
UComments: "2003-11-20: Created. +AAoA-PfaEdit 1.0 (http://pfaedit.sf.net).+AAoACgAA-TLWG is Thai Linux Working Group http://linux.thai.net+AAoACgAA-Imported ISO-8859-1 from FreeMono.sfd.+AAoA-http://www.nongnu.org/freefont/+AAoACgAA-2003-11-22: first release+AAoACgAA-2003-11-25: Fixed vowel and tone marks' level."
-Version: 003.002
+Version: 003.004
ItalicAngle: 0
UnderlinePosition: -100
UnderlineWidth: 50
@@ -21,13 +21,12 @@ OS2Version: 4
OS2_WeightWidthSlopeOnly: 0
OS2_UseTypoMetrics: 1
CreationTime: 1153664010
-ModificationTime: 1587976673
+ModificationTime: 1620808676
PfmFamily: 49
TTFWeight: 700
TTFWidth: 5
LineGap: 0
VLineGap: 0
-Panose: 2 0 6 3 0 0 0 0 0 0
OS2TypoAscent: 882
OS2TypoAOffset: 0
OS2TypoDescent: -364
@@ -1260,7 +1259,7 @@ DisplaySize: -48
DisplayLayer: 2
AntiAlias: 1
FitToEm: 1
-WinInfo: 192 12 8
+WinInfo: 204 12 8
BeginPrivate: 7
BlueValues 39 [-16 0 437 451 470 482 583 597 622 638]
OtherBlues 11 [-205 -205]
@@ -44757,7 +44756,7 @@ EndChar
StartChar: uni0E04
Encoding: 3588 3588 204
-Width: 613
+Width: 600
Flags: W
HStem: -0 21G<152 252 426 526> 138 86<288.354 333.595> 268 86<288.096 333.595> 394 88<230.696 379.281>
VStem: 78 100<247.126 346.164> 152 100<0 158.445> 334 86<224.081 266.72> 426 100<0 349.117>
@@ -45667,7 +45666,7 @@ EndChar
StartChar: uni0E07
Encoding: 3591 3591 207
-Width: 615
+Width: 600
Flags: W
HStem: -0 21G<318.244 482> 462 20G<336.5 401>
VStem: 262 89<356.174 393.954> 382 100<92 271 356.008 391.504>
@@ -51551,7 +51550,7 @@ EndChar
StartChar: uni0E19
Encoding: 3609 3609 225
-Width: 614
+Width: 600
Flags: W
HStem: -12 86<428.573 477.263> 0 21G<148 265.533> 268 88<114.159 147.757> 394 88<114.159 151.288> 450 20G<404 504>
VStem: 28 86<356.175 393.955> 148 100<100 270 356.007 391.735> 404 100<196 470> 478 88<75.439 122.758>
@@ -53918,7 +53917,7 @@ EndChar
StartChar: uni0E23
Encoding: 3619 3619 235
-Width: 605
+Width: 600
Flags: W
HStem: -12 21G<301.5 366> 114 86<315.94 345.87> 354 88<390.274 504.661> 394 88<237.678 376.277>
VStem: 228 87<74.6902 113.307> 348 100<76.0319 113.997 199 263.951>
@@ -54416,7 +54415,7 @@ EndChar
StartChar: uni0E25
Encoding: 3621 3621 237
-Width: 608
+Width: 600
Flags: W
HStem: -12 87<234.159 264.06> 0 21G<402.5 512> 252 86<253.107 320.498> 394 88<206.438 382.59>
VStem: 148 100<200 247.439> 148 86<75.3774 113.993> 265 87<75.1923 113.178> 412 100<0 81.6135 267 366.069>
@@ -54912,7 +54911,7 @@ EndChar
StartChar: uni0E27
Encoding: 3623 3623 239
-Width: 615
+Width: 600
Flags: W
HStem: -12 21G<381.5 446> 394 88<209.62 390.297>
VStem: 308 87<74.6902 113.307> 428 100<75.1171 113.997 199 359.662>
@@ -55096,7 +55095,7 @@ EndChar
StartChar: uni0E28
Encoding: 3624 3624 240
-Width: 614
+Width: 600
Flags: W
HStem: 0 21G<148 248 428 528> 136 90<290.416 326.914> 266 90<290.562 327.901> 398 88<232.345 370.429>
VStem: 78 100<258.492 350.622> 148 100<0 148.168> 328 92<226.235 265.679> 428 100<0 320.944> 436 96<460.608 512>
@@ -55424,7 +55423,7 @@ EndChar
StartChar: uni0E29
Encoding: 3625 3625 241
-Width: 610
+Width: 600
Flags: W
HStem: 0 86<92 148 248 416> 154 80<302.843 374.5> 276 76<103.437 147.668> 290 74<303.097 355.211> 406 76<103.437 156.587> 450 20G<416 516>
VStem: 28 74<352.954 405.046> 148 100<86 198> 158 90<352.687 403.232> 416 100<86 159 347 470>
@@ -55791,7 +55790,7 @@ EndChar
StartChar: uni0E2A
Encoding: 3626 3626 242
-Width: 604
+Width: 600
Flags: W
HStem: -16 89<230.235 269.765> 0 21G<410 520> 250 90<245.854 316.369> 398 88<216.451 358.848>
VStem: 140 101<202 246.422> 140 90<74.4635 112.993> 270 90<73.735 111.877> 420 100<0 76.6094 256 327.968> 428 96<463.926 512>
@@ -57645,7 +57644,7 @@ EndChar
StartChar: uni0E30
Encoding: 3632 3632 248
-Width: 607
+Width: 600
Flags: W
HStem: 32 100<204.195 332.5> 174 80<204.555 235.895> 252 100<204.415 332.5> 388 82<204.555 235.883>
VStem: 122 82<132.795 173.228 353.666 387.819> 236 81<152 172.751 372 387.493>
@@ -57897,7 +57896,7 @@ EndChar
StartChar: uni0E32
Encoding: 3634 3634 249
-Width: 615
+Width: 600
Flags: W
HStem: 0 21G<428 528> 394 88<211.393 389.262>
VStem: 428 100<0 359.614>
@@ -59390,7 +59389,7 @@ EndChar
StartChar: uni0E42
Encoding: 3650 3650 261
-Width: 615
+Width: 600
Flags: W
HStem: -12 21G<336.5 393> 566 88<348.15 460.613> 610 86<189.387 327.975>
VStem: 262 100<200 481.875> 262 88<77.0072 113.993> 379 87<75.1923 113.178>
@@ -59757,7 +59756,7 @@ EndChar
StartChar: uni0E43
Encoding: 3651 3651 262
-Width: 599
+Width: 600
Flags: W
HStem: -12 21G<371 431> 386 74<167.775 200.335> 505 75<170.185 201.265> 610 86<178.697 274.291>
VStem: 64 102<460.248 555.314> 202 74<460.854 504.07> 286 100<74.8568 113.992 199 596.421> 418 86<74.6927 113.309>
@@ -69376,7 +69375,7 @@ EndChar
StartChar: uni0E07.uline
Encoding: 65536 -1 346
-Width: 615
+Width: 600
Flags: W
HStem: -126 86<16 552> 0 21G<318.244 482> 462 20G<336.5 401>
VStem: 262 89<356.174 393.954> 382 100<92 271 356.008 391.504>
@@ -69390,6 +69389,7 @@ Validated: 1
Layer: 2
Refer: 345 817 N 1 0 0 1 600 0 2
Refer: 207 3591 N 1 0 0 1 0 0 2
+LCarets2: 1 0
Ligature2: "'ccmp' Patani Malay Ligatures" uni0E07 macronbelowcmb
EndChar
@@ -69413,7 +69413,7 @@ EndChar
StartChar: uni0E19.uline
Encoding: 65538 -1 348
-Width: 614
+Width: 600
Flags: W
HStem: -126 86<16 552> -12 86<428.573 477.263> 0 21G<148 265.533> 268 88<114.159 147.757> 394 88<114.159 151.288> 450 20G<404 504>
VStem: 28 86<356.175 393.955> 148 100<100 270 356.007 391.735> 404 100<196 470> 478 88<75.439 122.758>
@@ -69426,6 +69426,7 @@ Validated: 1
Layer: 2
Refer: 345 817 N 1 0 0 1 600 0 2
Refer: 225 3609 N 1 0 0 1 0 0 2
+LCarets2: 1 0
Ligature2: "'ccmp' Patani Malay Ligatures" uni0E19 macronbelowcmb
EndChar
diff --git a/Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/TlwgTypist-BoldOblique.sfd b/Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/TlwgTypist-BoldOblique.sfd
index 8b4e7422a12..ab5dc2f3e64 100644
--- a/Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/TlwgTypist-BoldOblique.sfd
+++ b/Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/TlwgTypist-BoldOblique.sfd
@@ -5,7 +5,7 @@ FamilyName: Tlwg Typist
Weight: Bold
Copyright: Tlwg Typist, based on Poonlap Veerathanabutr's Tlwg Typewriter.\n\nCopyright (C) 2005-2014 Theppitak Karoonboonyanan.\n\nTlwg Typewriter, Free Thai Pseudo Monospace outline font.\n\nCopyright (C) 2003, 2004 Poonlap Veerathanabutr <poonlap@linux.thai.net>
UComments: "2003-11-20: Created. +AAoA-PfaEdit 1.0 (http://pfaedit.sf.net).+AAoACgAA-TLWG is Thai Linux Working Group http://linux.thai.net+AAoACgAA-Imported ISO-8859-1 from FreeMono.sfd.+AAoA-http://www.nongnu.org/freefont/+AAoACgAA-2003-11-22: first release+AAoACgAA-2003-11-25: Fixed vowel and tone marks' level."
-Version: 003.002
+Version: 003.004
ItalicAngle: -12
UnderlinePosition: -100
UnderlineWidth: 50
@@ -21,13 +21,12 @@ OS2Version: 4
OS2_WeightWidthSlopeOnly: 0
OS2_UseTypoMetrics: 1
CreationTime: 1153664121
-ModificationTime: 1587976686
+ModificationTime: 1620808695
PfmFamily: 49
TTFWeight: 700
TTFWidth: 5
LineGap: 0
VLineGap: 0
-Panose: 2 0 6 3 0 0 0 0 0 0
OS2TypoAscent: 882
OS2TypoAOffset: 0
OS2TypoDescent: -364
@@ -48927,7 +48926,7 @@ EndChar
StartChar: uni0E04
Encoding: 3588 3588 204
-Width: 613
+Width: 600
Flags: W
HStem: 0 21G<152 256.314 426 530.228> 138 86<333 385.781> 268 86<340.609 412.997> 394 88<310.081 459.301>
VStem: 139 99<247.24 331.968> 387 88<225.283 293.5> 491 103<267.324 361.091>
@@ -49854,7 +49853,7 @@ EndChar
StartChar: uni0E07
Encoding: 3591 3591 207
-Width: 615
+Width: 600
Flags: W
HStem: 0 21G<322.529 486.267> 394 88<431.284 498>
VStem: 339 91<328 393.582> 460 104<356.716 423>
@@ -56072,7 +56071,7 @@ EndChar
StartChar: uni0E19
Encoding: 3609 3609 225
-Width: 614
+Width: 600
Flags: W
HStem: -12 86<421 497.522> 0 21G<148 269.8> 394 88<194.713 260> 450 20G<499.766 604>
VStem: 105 89<328.5 393.971> 232 98<356.925 421> 500 89<76.4189 123.258>
@@ -58570,7 +58569,7 @@ EndChar
StartChar: uni0E23
Encoding: 3619 3619 235
-Width: 605
+Width: 600
Flags: W
HStem: -12 86<302.5 366.171> 114 86<334.759 376> 354 88<489.026 592.927> 394 88<318.755 455.819>
VStem: 246 88<47.5 112.555>
@@ -59011,7 +59010,7 @@ EndChar
StartChar: uni0E25
Encoding: 3621 3621 237
-Width: 608
+Width: 600
Flags: W
HStem: -12 87<222.5 285.427> 0 21G<414.5 516.259> 252 86<301.33 369.874> 394 88<291.698 461.369>
VStem: 166 87<47.5 112.906> 286 89<75.1936 142.5> 482 102<268.102 373.452>
@@ -59491,7 +59490,7 @@ EndChar
StartChar: uni0E27
Encoding: 3623 3623 239
-Width: 615
+Width: 600
Flags: W
HStem: -12 86<382.5 444.028> 114 86<414.747 456> 394 88<292.339 470.469>
VStem: 326 88<47.5 112.554> 496 102<227.43 368.557>
@@ -59704,7 +59703,7 @@ EndChar
StartChar: uni0E28
Encoding: 3624 3624 240
-Width: 614
+Width: 600
Flags: W
HStem: 0 21G<148 252.34 428 532.267> 136 90<327.5 380.632> 266 90<343.016 391> 398 88<312.782 451.051>
VStem: 139 99<259.254 335.722> 381 94<227.5 275.5>
@@ -60073,7 +60072,7 @@ EndChar
StartChar: uni0E29
Encoding: 3625 3625 241
-Width: 610
+Width: 600
Flags: W
HStem: 0 86<110 166 266 434> 154 80<357.035 409.468> 276 76<182.109 206.417> 290 74<360.103 411.502> 406 76<185.215 238.939> 450 20G<511.686 616>
VStem: 106 76<352.375 403.1> 239 91<354.779 405.671>
@@ -60481,7 +60480,7 @@ EndChar
StartChar: uni0E2A
Encoding: 3626 3626 242
-Width: 604
+Width: 600
Flags: W
HStem: -16 89<220.5 288.569> 0 21G<419.5 524.277> 250 90<293.881 372.013> 398 88<294.343 441.212>
VStem: 157 93<46 112.22> 290 92<73.9981 141.5>
@@ -62216,7 +62215,7 @@ EndChar
StartChar: uni0E30
Encoding: 3632 3632 248
-Width: 607
+Width: 600
Flags: W
HStem: 32 100<236.87 339.5> 174 80<237.053 299> 252 100<282.165 386.5> 388 82<282.889 345.5>
VStem: 152 84<94.5 173.543> 198 84<314 386.98> 269 82<152.052 173.981>
@@ -62450,7 +62449,7 @@ EndChar
StartChar: uni0E32
Encoding: 3634 3634 249
-Width: 615
+Width: 600
Flags: W
HStem: 0 21G<428 532.258> 394 88<294.453 466.983>
VStem: 496 101<222.812 368.178>
@@ -65284,7 +65283,7 @@ EndChar
StartChar: uni0E45
Encoding: 3653 3653 264
-Width: 615
+Width: 600
Flags: W
HStem: 394 88<294.314 467.183>
VStem: 496 101<220.75 368.178>
@@ -74972,7 +74971,7 @@ EndChar
StartChar: uni0E07.uline
Encoding: 65536 -1 346
-Width: 615
+Width: 600
Flags: W
HStem: -126 86<7 525> 0 21G<322.529 486.267> 394 88<431.284 498>
VStem: 339 91<328 393.582> 460 104<356.716 423>
@@ -75010,7 +75009,7 @@ EndChar
StartChar: uni0E19.uline
Encoding: 65538 -1 348
-Width: 614
+Width: 600
Flags: W
HStem: -126 86<7 525> -12 86<421 497.522> 0 21G<148 269.8> 394 88<194.713 260> 450 20G<499.766 604>
VStem: 105 89<328.5 393.971> 232 98<356.925 421> 500 89<76.4189 123.258>
diff --git a/Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/TlwgTypist-Oblique.sfd b/Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/TlwgTypist-Oblique.sfd
index 1e47de927d0..9db40cd6c42 100644
--- a/Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/TlwgTypist-Oblique.sfd
+++ b/Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/TlwgTypist-Oblique.sfd
@@ -5,7 +5,7 @@ FamilyName: Tlwg Typist
Weight: Regular
Copyright: Tlwg Typist, based on Poonlap Veerathanabutr's Tlwg Typewriter.\n\nCopyright (C) 2005-2014 Theppitak Karoonboonyanan.\n\nTlwg Typewriter, Free Thai Pseudo Monospace outline font.\n\nCopyright (C) 2003, 2004 Poonlap Veerathanabutr <poonlap@linux.thai.net>
UComments: "2003-11-20: Created. +AAoA-PfaEdit 1.0 (http://pfaedit.sf.net).+AAoACgAA-TLWG is Thai Linux Working Group http://linux.thai.net+AAoACgAA-This font was derived from TlwgMono.Most characters have fixed width except some vowels and tone marks.+AAoACgAA-2003-11-25: Fixed above vowel and tone mark level.+AAoA"
-Version: 003.002
+Version: 003.004
ItalicAngle: -12
UnderlinePosition: -100
UnderlineWidth: 50
@@ -21,13 +21,12 @@ OS2Version: 4
OS2_WeightWidthSlopeOnly: 0
OS2_UseTypoMetrics: 1
CreationTime: 1153663934
-ModificationTime: 1587975274
+ModificationTime: 1620808661
PfmFamily: 49
TTFWeight: 400
TTFWidth: 5
LineGap: 0
VLineGap: 0
-Panose: 2 0 6 3 0 0 0 0 0 0
OS2TypoAscent: 882
OS2TypoAOffset: 0
OS2TypoDescent: -364
diff --git a/Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/TlwgTypist.sfd b/Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/TlwgTypist.sfd
index 67bfc4d3b8f..a807f2070ae 100644
--- a/Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/TlwgTypist.sfd
+++ b/Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/TlwgTypist.sfd
@@ -5,7 +5,7 @@ FamilyName: Tlwg Typist
Weight: Regular
Copyright: Tlwg Typist, based on Poonlap Veerathanabutr's Tlwg Typewriter.\n\nCopyright (C) 2005-2014 Theppitak Karoonboonyanan.\n\nTlwg Typewriter, Free Thai Pseudo Monospace outline font.\n\nCopyright (C) 2003, 2004 Poonlap Veerathanabutr <poonlap@linux.thai.net>
UComments: "2003-11-20: Created. +AAoA-PfaEdit 1.0 (http://pfaedit.sf.net).+AAoACgAA-TLWG is Thai Linux Working Group http://linux.thai.net+AAoACgAA-This font was derived from TlwgMono.Most characters have fixed width except some vowels and tone marks.+AAoACgAA-2003-11-25: Fixed above vowel and tone mark level.+AAoA"
-Version: 003.002
+Version: 003.004
ItalicAngle: 0
UnderlinePosition: -100
UnderlineWidth: 50
@@ -21,13 +21,12 @@ OS2Version: 4
OS2_WeightWidthSlopeOnly: 0
OS2_UseTypoMetrics: 1
CreationTime: 1153663876
-ModificationTime: 1587975189
+ModificationTime: 1620808646
PfmFamily: 49
TTFWeight: 400
TTFWidth: 5
LineGap: 0
VLineGap: 0
-Panose: 2 0 6 3 0 0 0 0 0 0
OS2TypoAscent: 882
OS2TypoAOffset: 0
OS2TypoDescent: -364
diff --git a/Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/TlwgTypo-Bold.sfd b/Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/TlwgTypo-Bold.sfd
index 080ed384ee9..9b47683cd79 100644
--- a/Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/TlwgTypo-Bold.sfd
+++ b/Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/TlwgTypo-Bold.sfd
@@ -5,7 +5,7 @@ FamilyName: Tlwg Typo
Weight: Bold
Copyright: Tlwg Typo, based on Poonlap Veerathanabutr's Tlwg Typewriter.\n\nCopyright (C) 2005-2014 Theppitak Karoonboonyanan.\n\nTlwg Typewriter, Free Thai Pseudo Monospace outline font.\n\nCopyright (C) 2003, 2004 Poonlap Veerathanabutr <poonlap@linux.thai.net>
UComments: "2003-11-20: Created. +AAoA-PfaEdit 1.0 (http://pfaedit.sf.net).+AAoACgAA-TLWG is Thai Linux Working Group http://linux.thai.net+AAoACgAA-Imported ISO-8859-1 from FreeMono.sfd.+AAoA-http://www.nongnu.org/freefont/+AAoACgAA-2003-11-22: first release+AAoACgAA-2003-11-25: Fixed vowel and tone marks' level."
-Version: 004.002
+Version: 004.004
ItalicAngle: 0
UnderlinePosition: -100
UnderlineWidth: 50
@@ -21,13 +21,12 @@ OS2Version: 4
OS2_WeightWidthSlopeOnly: 0
OS2_UseTypoMetrics: 1
CreationTime: 1153664010
-ModificationTime: 1587976253
+ModificationTime: 1620796529
PfmFamily: 49
TTFWeight: 700
TTFWidth: 5
LineGap: 0
VLineGap: 0
-Panose: 2 0 6 3 0 0 0 0 0 0
OS2TypoAscent: 882
OS2TypoAOffset: 0
OS2TypoDescent: -364
@@ -1251,7 +1250,7 @@ DisplaySize: -48
DisplayLayer: 2
AntiAlias: 1
FitToEm: 1
-WinInfo: 192 12 8
+WinInfo: 252 12 8
BeginPrivate: 7
BlueValues 39 [-16 0 437 451 470 482 583 597 622 638]
OtherBlues 11 [-205 -205]
@@ -69861,7 +69860,7 @@ EndChar
StartChar: uni0E07.uline
Encoding: 65536 -1 341
-Width: 615
+Width: 600
Flags: W
HStem: -126 86<16 552> 0 21G<342.244 506> 462 20G<360.5 425>
VStem: 286 89<357.981 394.454> 406 100<92 271 357.007 394.176>
@@ -69876,6 +69875,7 @@ Validated: 1
Layer: 2
Refer: 207 3591 N 1 0 0 1 0 0 2
Refer: 340 817 N 1 0 0 1 0 0 2
+LCarets2: 1 0
Ligature2: "'ccmp' Patani Malay Ligatures" uni0E07 macronbelowcmb
EndChar
@@ -69900,7 +69900,7 @@ EndChar
StartChar: uni0E19.uline
Encoding: 65538 -1 343
-Width: 614
+Width: 600
Flags: W
HStem: -126 86<16 552> -12 86<428.573 477.263> 0 21G<148 265.533> 268 88<114.159 147.757> 394 88<114.159 151.288> 450 20G<404 504>
VStem: 28 86<356.175 393.955> 148 100<100 270 356.007 391.735> 404 100<196 470> 478 88<75.439 122.758>
@@ -69914,6 +69914,7 @@ Validated: 1
Layer: 2
Refer: 225 3609 N 1 0 0 1 0 0 2
Refer: 340 817 N 1 0 0 1 0 0 2
+LCarets2: 1 0
Ligature2: "'ccmp' Patani Malay Ligatures" uni0E19 macronbelowcmb
EndChar
diff --git a/Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/TlwgTypo-BoldOblique.sfd b/Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/TlwgTypo-BoldOblique.sfd
index 3d4f60a8c65..9e39570fbf5 100644
--- a/Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/TlwgTypo-BoldOblique.sfd
+++ b/Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/TlwgTypo-BoldOblique.sfd
@@ -5,7 +5,7 @@ FamilyName: Tlwg Typo
Weight: Bold
Copyright: Tlwg Typo, based on Poonlap Veerathanabutr's Tlwg Typewriter.\n\nCopyright (C) 2005-2014 Theppitak Karoonboonyanan.\n\nTlwg Typewriter, Free Thai Pseudo Monospace outline font.\n\nCopyright (C) 2003, 2004 Poonlap Veerathanabutr <poonlap@linux.thai.net>
UComments: "2003-11-20: Created. +AAoA-PfaEdit 1.0 (http://pfaedit.sf.net).+AAoACgAA-TLWG is Thai Linux Working Group http://linux.thai.net+AAoACgAA-Imported ISO-8859-1 from FreeMono.sfd.+AAoA-http://www.nongnu.org/freefont/+AAoACgAA-2003-11-22: first release+AAoACgAA-2003-11-25: Fixed vowel and tone marks' level."
-Version: 004.002
+Version: 004.004
ItalicAngle: -12
UnderlinePosition: -100
UnderlineWidth: 50
@@ -21,13 +21,12 @@ OS2Version: 4
OS2_WeightWidthSlopeOnly: 0
OS2_UseTypoMetrics: 1
CreationTime: 1153664121
-ModificationTime: 1587976344
+ModificationTime: 1620796553
PfmFamily: 49
TTFWeight: 700
TTFWidth: 5
LineGap: 0
VLineGap: 0
-Panose: 2 0 6 3 0 0 0 0 0 0
OS2TypoAscent: 882
OS2TypoAOffset: 0
OS2TypoDescent: -364
@@ -1274,7 +1273,7 @@ DisplaySize: -48
DisplayLayer: 2
AntiAlias: 1
FitToEm: 1
-WinInfo: 192 12 8
+WinInfo: 252 12 8
BeginPrivate: 7
BlueValues 39 [-16 0 437 451 470 482 583 597 622 638]
OtherBlues 11 [-205 -205]
@@ -76936,7 +76935,7 @@ EndChar
StartChar: uni0E07.uline
Encoding: 65536 -1 341
-Width: 615
+Width: 600
Flags: W
HStem: -126 86<7 525> 0 21G<346.529 510.267> 395 87<455.482 522.5>
VStem: 363 91<328.5 394.082> 484 104<357.216 423>
@@ -76951,6 +76950,7 @@ Validated: 1
Layer: 2
Refer: 340 817 N 1 0 0 1 0 0 2
Refer: 207 3591 N 1 0 0 1 0 0 2
+LCarets2: 1 0
Ligature2: "'ccmp' Patani Malay Ligatures" uni0E07 macronbelowcmb
EndChar
@@ -76976,7 +76976,7 @@ EndChar
StartChar: uni0E19.uline
Encoding: 65538 -1 343
-Width: 614
+Width: 600
Flags: W
HStem: -126 86<7 525> -12 86<421 497.685> 0 21G<148 269.8> 394 88<194.726 260.5> 450 20G<499.766 604>
VStem: 105 89<328.5 393.969> 232 98<356.925 421> 500 89<76.4189 123.981>
@@ -76991,6 +76991,7 @@ Validated: 1
Layer: 2
Refer: 340 817 N 1 0 0 1 0 0 2
Refer: 225 3609 N 1 0 0 1 0 0 2
+LCarets2: 1 0
Ligature2: "'ccmp' Patani Malay Ligatures" uni0E19 macronbelowcmb
EndChar
diff --git a/Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/TlwgTypo-Oblique.sfd b/Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/TlwgTypo-Oblique.sfd
index 63da3993b23..46677baae65 100644
--- a/Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/TlwgTypo-Oblique.sfd
+++ b/Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/TlwgTypo-Oblique.sfd
@@ -5,7 +5,7 @@ FamilyName: Tlwg Typo
Weight: Regular
Copyright: Tlwg Typo, based on Poonlap Veerathanabutr's Tlwg Typewriter.\n\nCopyright (C) 2005-2014 Theppitak Karoonboonyanan.\n\nTlwg Typewriter, Free Thai Pseudo Monospace outline font.\n\nCopyright (C) 2003, 2004 Poonlap Veerathanabutr <poonlap@linux.thai.net>
UComments: "2003-11-20: Created. +AAoA-PfaEdit 1.0 (http://pfaedit.sf.net).+AAoACgAA-TLWG is Thai Linux Working Group http://linux.thai.net+AAoACgAA-This font was derived from TlwgMono.Most characters have fixed width except some vowels and tone marks.+AAoACgAA-2003-11-25: Fixed above vowel and tone mark level.+AAoA"
-Version: 004.002
+Version: 004.004
ItalicAngle: -12
UnderlinePosition: -100
UnderlineWidth: 50
@@ -21,13 +21,12 @@ OS2Version: 4
OS2_WeightWidthSlopeOnly: 0
OS2_UseTypoMetrics: 1
CreationTime: 1153663934
-ModificationTime: 1587976151
+ModificationTime: 1620796540
PfmFamily: 49
TTFWeight: 400
TTFWidth: 5
LineGap: 0
VLineGap: 0
-Panose: 2 0 6 3 0 0 0 0 0 0
OS2TypoAscent: 882
OS2TypoAOffset: 0
OS2TypoDescent: -364
diff --git a/Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/TlwgTypo.sfd b/Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/TlwgTypo.sfd
index e5d407564a7..d997a536691 100644
--- a/Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/TlwgTypo.sfd
+++ b/Master/texmf-dist/source/fonts/fonts-tlwg/tlwg/TlwgTypo.sfd
@@ -5,7 +5,7 @@ FamilyName: Tlwg Typo
Weight: Regular
Copyright: Tlwg Typo, based on Poonlap Veerathanabutr's Tlwg Typewriter.\n\nCopyright (C) 2005-2014 Theppitak Karoonboonyanan.\n\nTlwg Typewriter, Free Thai Pseudo Monospace outline font.\n\nCopyright (C) 2003, 2004 Poonlap Veerathanabutr <poonlap@linux.thai.net>
UComments: "2003-11-20: Created. +AAoA-PfaEdit 1.0 (http://pfaedit.sf.net).+AAoACgAA-TLWG is Thai Linux Working Group http://linux.thai.net+AAoACgAA-This font was derived from TlwgMono.Most characters have fixed width except some vowels and tone marks.+AAoACgAA-2003-11-25: Fixed above vowel and tone mark level.+AAoA"
-Version: 004.002
+Version: 004.004
ItalicAngle: 0
UnderlinePosition: -100
UnderlineWidth: 50
@@ -21,13 +21,12 @@ OS2Version: 4
OS2_WeightWidthSlopeOnly: 0
OS2_UseTypoMetrics: 1
CreationTime: 1153663876
-ModificationTime: 1587976044
+ModificationTime: 1620796390
PfmFamily: 49
TTFWeight: 400
TTFWidth: 5
LineGap: 0
VLineGap: 0
-Panose: 2 0 6 3 0 0 0 0 0 0
OS2TypoAscent: 882
OS2TypoAOffset: 0
OS2TypoDescent: -364