summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/thailatex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2011-03-21 22:00:40 +0000
committerKarl Berry <karl@freefriends.org>2011-03-21 22:00:40 +0000
commit1a51dbd81ad88df2bf01adc5e3659b23dbffca70 (patch)
treec6459d5d405bcf52bbeacce07773c150e21ce366 /Master/texmf-dist/source/latex/thailatex
parent4f243e567cce42bca2f019edec58026baf5b6162 (diff)
thailatex (21mar11)
git-svn-id: svn://tug.org/texlive/trunk@21788 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/thailatex')
-rw-r--r--Master/texmf-dist/source/latex/thailatex/ChangeLog107
-rw-r--r--Master/texmf-dist/source/latex/thailatex/Makefile.am46
-rw-r--r--Master/texmf-dist/source/latex/thailatex/Makefile.in74
-rw-r--r--Master/texmf-dist/source/latex/thailatex/NEWS16
-rw-r--r--Master/texmf-dist/source/latex/thailatex/aclocal.m410
-rw-r--r--Master/texmf-dist/source/latex/thailatex/babel/Makefile.am3
-rw-r--r--Master/texmf-dist/source/latex/thailatex/babel/Makefile.in5
-rw-r--r--Master/texmf-dist/source/latex/thailatex/babel/lthenc.def3
-rw-r--r--Master/texmf-dist/source/latex/thailatex/babel/thai.dtx46
-rw-r--r--Master/texmf-dist/source/latex/thailatex/babel/tis620.def108
-rw-r--r--Master/texmf-dist/source/latex/thailatex/configure283
-rw-r--r--Master/texmf-dist/source/latex/thailatex/configure.in5
-rw-r--r--Master/texmf-dist/source/latex/thailatex/doc/Makefile.in2
-rw-r--r--Master/texmf-dist/source/latex/thailatex/doc/teststd.tex265
-rw-r--r--Master/texmf-dist/source/latex/thailatex/doc/thai.pdfbin111598 -> 205112 bytes
-rw-r--r--Master/texmf-dist/source/latex/thailatex/emacs/Makefile.in2
-rw-r--r--Master/texmf-dist/source/latex/thailatex/fonts/Makefile.in2
-rw-r--r--Master/texmf-dist/source/latex/thailatex/fonts/lthuni.enc4
-rw-r--r--Master/texmf-dist/source/latex/thailatex/fonts/thailigs.enc50
-rw-r--r--Master/texmf-dist/source/latex/thailatex/scripts/Makefile.in2
-rw-r--r--Master/texmf-dist/source/latex/thailatex/thailatex.spec.in134
21 files changed, 832 insertions, 335 deletions
diff --git a/Master/texmf-dist/source/latex/thailatex/ChangeLog b/Master/texmf-dist/source/latex/thailatex/ChangeLog
index 3d5709f2dfa..4bb5e291c25 100644
--- a/Master/texmf-dist/source/latex/thailatex/ChangeLog
+++ b/Master/texmf-dist/source/latex/thailatex/ChangeLog
@@ -1,3 +1,110 @@
+2011-03-21 Theppitak Karoonboonyanan <thep@linux.thai.net>
+
+ * configure.in, NEWS:
+ === Version 0.4.5 ===
+
+2011-03-20 Theppitak Karoonboonyanan <thep@linux.thai.net>
+
+ * fonts/Makefile.am: Revert the if-block change, as it does not work.
+ The exit just exits a spawned shell, not the whole script.
+
+2011-03-20 Theppitak Karoonboonyanan <thep@linux.thai.net>
+
+ * babel/Makefile.am: Remove thai.ldf before re-compiling thai.dtx,
+ so it can build twice in a row.
+
+2011-03-20 Theppitak Karoonboonyanan <thep@linux.thai.net>
+
+ * fonts/Makefile.am:
+ Use exception-styled if-block instead of if-then-else for separating
+ normal and exceptional cases.
+
+ * Makefile.am: Remove old commented lines.
+
+2011-03-20 Theppitak Karoonboonyanan <thep@linux.thai.net>
+
+ * configure.in, Makefile.am, -thailatex.spec.in:
+ Remove the outdated, unmaintained RPM spec.
+
+2011-03-17 Theppitak Karoonboonyanan <thep@linux.thai.net>
+
+ * babel/thai.dtx: Add documentation sentences about \wbr being
+ ignored.
+
+2011-03-17 Theppitak Karoonboonyanan <thep@linux.thai.net>
+
+ * babel/thai.dtx: Update copyright years and changelog dates.
+
+2011-03-17 Theppitak Karoonboonyanan <thep@linux.thai.net>
+
+ * babel/thai.dtx: Disable \wbr effect in \textpali{} command, as Pali
+ is already space-delimited, and there is no proper tool to hyphenate
+ it yet.
+
+2011-03-17 Theppitak Karoonboonyanan <thep@linux.thai.net>
+
+ * Makefile.am: Add rules for preparing CTAN package in ZIP format,
+ which is preferred by Windows users, and let ZIP be the default,
+ .tar.gz be an option.
+
+2011-03-16 Theppitak Karoonboonyanan <thep@linux.thai.net>
+
+ Make sure \textpali{} also works on TIS-620 text, not just UTF-8.
+ This requires "inputenc" package.
+
+ * babel/Makefile.am, +babel/tis620.def: Add "tis620" input encoding
+ definition for use with "inputenc" package.
+ * doc/teststd.tex: Add Pali test text.
+
+2011-03-15 Theppitak Karoonboonyanan <thep@linux.thai.net>
+
+ * fonts/purisa*.{afm,pfb}: Update to version 002.012: 2011-03-11 from
+ thaifonts-scalable trunk.
+
+2011-02-15 Theppitak Karoonboonyanan <thep@linux.thai.net>
+
+ * babel/thai.dtx: Update translation for \refname from
+ "หนังสืออ้างอิง" to "เอกสารอ้างอิง".
+
+2011-02-15 Theppitak Karoonboonyanan <thep@linux.thai.net>
+
+ * babel/thai.dtx: Add revision history for previous commit.
+
+2010-09-23 Theppitak Karoonboonyanan <thep@linux.thai.net>
+
+ Add support for Pali-Sanskrit descender-less Yo Ying & Tho Than.
+
+ * babel/lthenc.def: Add text symbols \textYoYingPali and
+ \textThoThanPali according to encoding slots in fonts/lthuni.enc.
+ * babel/thai.dtx: Add \textpali macro for converting all Yo Ying &
+ Tho Than in its argument to their descender-less variations.
+
+2010-09-22 Theppitak Karoonboonyanan <thep@linux.thai.net>
+
+ Add support for high MaiTaikhu and Nikhahit.
+
+ * fonts/thai-dummy.afm, fonts/lthuni.enc, fonts/thailigs.enc:
+ Add code points for high MaiTaikhu, high Nikhahit, and dottedcircle,
+ wrt. current fonts.
+ * fonts/thailigs.enc: Add ligkern rules to convert Maitaikhu and
+ Nikhanit after upper vowels to their high versions.
+
+2010-09-22 Theppitak Karoonboonyanan <thep@linux.thai.net>
+
+ * fonts/thailigs.enc: Add ligkern rules for Thanthakhat and Nikhahit
+ when combined with Po Pla, Fo Fa, Fo Fan, Lo Chula.
+
+2010-08-01 Theppitak Karoonboonyanan <thep@linux.thai.net>
+
+ * fonts/garuda*.{afm,pfb}: Update to version 2.63: 2010-08-01 from
+ thaifonts-scalable trunk.
+
+2010-07-30 Theppitak Karoonboonyanan <thep@linux.thai.net>
+
+ * configure.in: Post-release version suffix added.
+
+ * fonts/*.{afm,pfb}: Update fonts from thaifonts-scalable 0.4.14.
+
2009-08-15 Theppitak Karoonboonyanan <thep@linux.thai.net>
* configure.in, NEWS:
diff --git a/Master/texmf-dist/source/latex/thailatex/Makefile.am b/Master/texmf-dist/source/latex/thailatex/Makefile.am
index f71e871aaaf..c78dac3f1c9 100644
--- a/Master/texmf-dist/source/latex/thailatex/Makefile.am
+++ b/Master/texmf-dist/source/latex/thailatex/Makefile.am
@@ -1,22 +1,21 @@
-EXTRA_DIST = HISTORY COPYING.fonts thailatex.spec.in
+EXTRA_DIST = HISTORY COPYING.fonts
SUBDIRS = babel emacs fonts scripts doc
-DISTCLEANFILES = thailatex.spec
+DISTCLEANFILES = thailatex.spec \
+ $(tdsdist_tgz) $(ctandist_tgz) \
+ $(tdsdist_zip) $(ctandist_zip)
doc_DATA = README
-#install-data-hook:
-# @TEXHASH@
+tdsdist_tgz = $(PACKAGE)-$(VERSION).tds.tar.gz
+ctandist_tgz = $(PACKAGE)-$(VERSION).ctan.tar.gz
-#uninstall-hook:
-# @TEXHASH@
-
-tdsdist = $(PACKAGE)-$(VERSION).tds.tar.gz
-ctandist = $(PACKAGE)-$(VERSION).ctan.tar.gz
+tdsdist_zip = $(PACKAGE)-$(VERSION).tds.zip
+ctandist_zip = $(PACKAGE)-$(VERSION).ctan.zip
tdsdistdir = $(PACKAGE)-$(VERSION)-tds
-dist-tds:
+inst-tds:
rm -rf $(tdsdistdir)
mkdir $(tdsdistdir)
confdir=`cd $(top_srcdir) && pwd` \
@@ -26,14 +25,31 @@ dist-tds:
&& $(MAKE) $(AM_MAKEFLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) DESTDIR=`pwd`/inst install \
&& rm -rf inst/usr
+
+dist-tds-tgz: inst-tds
+ cd $(tdsdistdir)/inst \
+ && tar cf - * | gzip -9 -c > ../../$(tdsdist_tgz)
+ rm -rf $(tdsdistdir)
+
+dist-tds-zip: inst-tds
cd $(tdsdistdir)/inst \
- && tar cf - * | gzip -9 -c > ../../$(tdsdist)
+ && zip -r ../../$(tdsdist_zip) *
rm -rf $(tdsdistdir)
-dist-ctan: dist-tds distdir
- tar xzOf $(tdsdist) doc/latex/thailatex/thai.pdf \
+dist-tds: dist-tds-zip
+
+dist-ctan-tgz: dist-tds-tgz distdir
+ tar xzOf $(tdsdist_tgz) doc/latex/thailatex/thai.pdf \
> $(distdir)/doc/thai.pdf
- tar cf - $(tdsdist) $(distdir) | gzip -9 -c > $(ctandist)
+ tar cf - $(tdsdist_tgz) $(distdir) | gzip -9 -c > $(ctandist_tgz)
$(am__remove_distdir)
-.PHONY: dist-ctan dist-tds
+dist-ctan-zip: dist-tds-zip distdir
+ unzip -p $(tdsdist_zip) doc/latex/thailatex/thai.pdf \
+ > $(distdir)/doc/thai.pdf
+ zip -r $(ctandist_zip) $(tdsdist_zip) $(distdir)
+ $(am__remove_distdir)
+
+dist-ctan: dist-ctan-zip
+
+.PHONY: dist-ctan dist-ctan-tgz dist-ctan-zip dist-tds dist-tds-tgz dist-tds-zip inst-tds
diff --git a/Master/texmf-dist/source/latex/thailatex/Makefile.in b/Master/texmf-dist/source/latex/thailatex/Makefile.in
index b0458a2d242..6b3c58cccff 100644
--- a/Master/texmf-dist/source/latex/thailatex/Makefile.in
+++ b/Master/texmf-dist/source/latex/thailatex/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -34,9 +34,8 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
subdir = .
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
- $(srcdir)/Makefile.in $(srcdir)/thailatex.spec.in \
- $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
- TODO install-sh missing
+ $(srcdir)/Makefile.in $(top_srcdir)/configure AUTHORS COPYING \
+ ChangeLog INSTALL NEWS TODO install-sh missing
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -44,7 +43,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno config.status.lineno
mkinstalldirs = $(install_sh) -d
-CONFIG_CLEAN_FILES = thailatex.spec
+CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
@@ -209,18 +208,17 @@ texmfdir = @texmfdir@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-EXTRA_DIST = HISTORY COPYING.fonts thailatex.spec.in
+EXTRA_DIST = HISTORY COPYING.fonts
SUBDIRS = babel emacs fonts scripts doc
-DISTCLEANFILES = thailatex.spec
-doc_DATA = README
-
-#install-data-hook:
-# @TEXHASH@
+DISTCLEANFILES = thailatex.spec \
+ $(tdsdist_tgz) $(ctandist_tgz) \
+ $(tdsdist_zip) $(ctandist_zip)
-#uninstall-hook:
-# @TEXHASH@
-tdsdist = $(PACKAGE)-$(VERSION).tds.tar.gz
-ctandist = $(PACKAGE)-$(VERSION).ctan.tar.gz
+doc_DATA = README
+tdsdist_tgz = $(PACKAGE)-$(VERSION).tds.tar.gz
+ctandist_tgz = $(PACKAGE)-$(VERSION).ctan.tar.gz
+tdsdist_zip = $(PACKAGE)-$(VERSION).tds.zip
+ctandist_zip = $(PACKAGE)-$(VERSION).ctan.zip
tdsdistdir = $(PACKAGE)-$(VERSION)-tds
all: all-recursive
@@ -259,8 +257,6 @@ $(top_srcdir)/configure: $(am__configure_deps)
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
$(am__aclocal_m4_deps):
-thailatex.spec: $(top_builddir)/config.status $(srcdir)/thailatex.spec.in
- cd $(top_builddir) && $(SHELL) ./config.status $@
install-docDATA: $(doc_DATA)
@$(NORMAL_INSTALL)
test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)"
@@ -289,7 +285,7 @@ uninstall-docDATA:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -314,7 +310,7 @@ $(RECURSIVE_TARGETS):
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -478,7 +474,8 @@ distdir: $(DISTFILES)
fi; \
done
-test -n "$(am__skip_mode_fix)" \
- || find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
+ || find "$(distdir)" -type d ! -perm -755 \
+ -exec chmod u+rwx,go+rx {} \; -o \
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
@@ -522,17 +519,17 @@ dist dist-all: distdir
distcheck: dist
case '$(DIST_ARCHIVES)' in \
*.tar.gz*) \
- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
+ GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
- bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
*.tar.lzma*) \
- unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
+ lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
*.tar.xz*) \
xz -dc $(distdir).tar.xz | $(am__untar) ;;\
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
- GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
+ GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
*.zip*) \
unzip $(distdir).zip ;;\
esac
@@ -714,7 +711,7 @@ uninstall-am: uninstall-docDATA
uninstall-docDATA
-dist-tds:
+inst-tds:
rm -rf $(tdsdistdir)
mkdir $(tdsdistdir)
confdir=`cd $(top_srcdir) && pwd` \
@@ -724,17 +721,34 @@ dist-tds:
&& $(MAKE) $(AM_MAKEFLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) DESTDIR=`pwd`/inst install \
&& rm -rf inst/usr
+
+dist-tds-tgz: inst-tds
+ cd $(tdsdistdir)/inst \
+ && tar cf - * | gzip -9 -c > ../../$(tdsdist_tgz)
+ rm -rf $(tdsdistdir)
+
+dist-tds-zip: inst-tds
cd $(tdsdistdir)/inst \
- && tar cf - * | gzip -9 -c > ../../$(tdsdist)
+ && zip -r ../../$(tdsdist_zip) *
rm -rf $(tdsdistdir)
-dist-ctan: dist-tds distdir
- tar xzOf $(tdsdist) doc/latex/thailatex/thai.pdf \
+dist-tds: dist-tds-zip
+
+dist-ctan-tgz: dist-tds-tgz distdir
+ tar xzOf $(tdsdist_tgz) doc/latex/thailatex/thai.pdf \
+ > $(distdir)/doc/thai.pdf
+ tar cf - $(tdsdist_tgz) $(distdir) | gzip -9 -c > $(ctandist_tgz)
+ $(am__remove_distdir)
+
+dist-ctan-zip: dist-tds-zip distdir
+ unzip -p $(tdsdist_zip) doc/latex/thailatex/thai.pdf \
> $(distdir)/doc/thai.pdf
- tar cf - $(tdsdist) $(distdir) | gzip -9 -c > $(ctandist)
+ zip -r $(ctandist_zip) $(tdsdist_zip) $(distdir)
$(am__remove_distdir)
-.PHONY: dist-ctan dist-tds
+dist-ctan: dist-ctan-zip
+
+.PHONY: dist-ctan dist-ctan-tgz dist-ctan-zip dist-tds dist-tds-tgz dist-tds-zip inst-tds
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/Master/texmf-dist/source/latex/thailatex/NEWS b/Master/texmf-dist/source/latex/thailatex/NEWS
index fa565e32763..c4cb7724452 100644
--- a/Master/texmf-dist/source/latex/thailatex/NEWS
+++ b/Master/texmf-dist/source/latex/thailatex/NEWS
@@ -1,3 +1,19 @@
+0.4.5 (2011-03-21)
+=====
+- Update fonts from thaifonts-scalable 0.4.15, changes include:
+ + Improved Latin glyphs in garuda
+ + Overlap-free Thai glyphs in ttypist
+ + Bug fixes in Purisa (clean wrong ligature and fix glyph name)
+- Correct positioning of THANTHAKHAT and NIKHAHIT over long-ascender Thai
+ glyphs.
+- Support for high MAITAIKHU (e.g. in Kuy) and high NIKHAHIT (e.g. in Pali).
+- Add \textpali{} command for Pali-Sanskrit text with descender-less YO YING
+ and THO THAN.
+- Add "tis620" inputenc option for proper Pali-Sanskrit support.
+- Adjust translation for \refname from "หนังสืออ้างอิง" to "เอกสารอ้างอิง".
+- CTAN package is now in ZIP format by default, as preferred by Windows users.
+- Outdated and unmaintained RPM spec is now removed.
+
0.4.4 (2009-08-15)
=====
- Fix installation problems in Makefiles and related scripts.
diff --git a/Master/texmf-dist/source/latex/thailatex/aclocal.m4 b/Master/texmf-dist/source/latex/thailatex/aclocal.m4
index 99803da4056..fa01d2d92b9 100644
--- a/Master/texmf-dist/source/latex/thailatex/aclocal.m4
+++ b/Master/texmf-dist/source/latex/thailatex/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.11 -*- Autoconf -*-
+# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
@@ -13,8 +13,8 @@
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.64],,
-[m4_warning([this file was generated for autoconf 2.64.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],,
+[m4_warning([this file was generated for autoconf 2.67.
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'.])])
@@ -34,7 +34,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.11'
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.11], [],
+m4_if([$1], [1.11.1], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -50,7 +50,7 @@ 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.11])dnl
+[AM_AUTOMAKE_VERSION([1.11.1])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
diff --git a/Master/texmf-dist/source/latex/thailatex/babel/Makefile.am b/Master/texmf-dist/source/latex/thailatex/babel/Makefile.am
index 8aa92d3523a..2bf4811be49 100644
--- a/Master/texmf-dist/source/latex/thailatex/babel/Makefile.am
+++ b/Master/texmf-dist/source/latex/thailatex/babel/Makefile.am
@@ -1,4 +1,4 @@
-BABEL_COMMON = thai.sty thswitch.sty lthenc.def \
+BABEL_COMMON = thai.sty thswitch.sty lthenc.def tis620.def \
lthkinnari.fd lthgaruda.fd lthnorasi.fd \
lthttype.fd lthttypist.fd \
lthpurisa.fd lthloma.fd \
@@ -24,6 +24,7 @@ thai.ldf: thai.ins thai.dtx
if [ ! -f thai.dtx ]; then \
$(LN_S) $(srcdir)/thai.dtx thai.dtx; \
fi
+ rm -f thai.ldf
latex thai.ins
thai.pdf: thai.dtx
diff --git a/Master/texmf-dist/source/latex/thailatex/babel/Makefile.in b/Master/texmf-dist/source/latex/thailatex/babel/Makefile.in
index 94ebdb2a49d..471c1f2bf42 100644
--- a/Master/texmf-dist/source/latex/thailatex/babel/Makefile.in
+++ b/Master/texmf-dist/source/latex/thailatex/babel/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -154,7 +154,7 @@ texmfdir = @texmfdir@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-BABEL_COMMON = thai.sty thswitch.sty lthenc.def \
+BABEL_COMMON = thai.sty thswitch.sty lthenc.def tis620.def \
lthkinnari.fd lthgaruda.fd lthnorasi.fd \
lthttype.fd lthttypist.fd \
lthpurisa.fd lthloma.fd \
@@ -400,6 +400,7 @@ thai.ldf: thai.ins thai.dtx
if [ ! -f thai.dtx ]; then \
$(LN_S) $(srcdir)/thai.dtx thai.dtx; \
fi
+ rm -f thai.ldf
latex thai.ins
thai.pdf: thai.dtx
diff --git a/Master/texmf-dist/source/latex/thailatex/babel/lthenc.def b/Master/texmf-dist/source/latex/thailatex/babel/lthenc.def
index c29d3a25228..ad265093eda 100644
--- a/Master/texmf-dist/source/latex/thailatex/babel/lthenc.def
+++ b/Master/texmf-dist/source/latex/thailatex/babel/lthenc.def
@@ -37,6 +37,9 @@
\DeclareTextSymbol{\textfongmun}{LTH}{239}
\DeclareTextSymbol{\textangkhankhu}{LTH}{250}
\DeclareTextSymbol{\textkhomut}{LTH}{251}
+% Pali-Sanskrit
+\DeclareTextSymbol{\textYoYingPali}{LTH}{144}
+\DeclareTextSymbol{\textThoThanPali}{LTH}{128}
% UCS support
\DeclareTextSymbol{\thaiKoKai}{LTH}{161}
\DeclareTextSymbol{\thaiKhoKhai}{LTH}{162}
diff --git a/Master/texmf-dist/source/latex/thailatex/babel/thai.dtx b/Master/texmf-dist/source/latex/thailatex/babel/thai.dtx
index 00defe494c8..131b3ab8a71 100644
--- a/Master/texmf-dist/source/latex/thailatex/babel/thai.dtx
+++ b/Master/texmf-dist/source/latex/thailatex/babel/thai.dtx
@@ -29,11 +29,11 @@
%<code>\ProvidesLanguage{thai}
%\fi
%\ProvidesFile{thai.dtx}
- [2009/07/27 v1.2 Thai support from the babel system]
+ [2011/03/17 v1.3 Thai support from the babel system]
%\iffalse
%% File `thai.dtx'
%% Thai Language Definition File
-%% Copyright (C) 1999 - 2009
+%% Copyright (C) 1999 - 2011
%% by Surapant Meknavin,
%% Theppitak Karoonboonyanan (thep at linux.thai.net),
%% Chanop Silpa-Anan (chanop at debian.org),
@@ -125,6 +125,10 @@
% TIS-620 bytes. Adjust documentation to cover UTF-8 support. Make
% \cs{ttypist} the default typewriter font instead of \cs{ttype}.
% Drop the obsolete \cs{\backslash{}thai} command.}
+% \changes{thai-1.3}{2011/03/17}{Theppitak Karoonboonyanan:
+% Add \cs{\backslash{}textpali} macro for typesetting Pali text with
+% descender-less Yo Ying and Tho Than. Update translation for
+% \cs{\backslash{}refname}}
%
% \section{The Thai language}
%
@@ -262,6 +266,41 @@
% \end{macrocode}
% \end{macro}
%
+% \subsubsection{Pali-Sanskrit Characters}
+%
+% Thai script can also be used for writing Pali and Sanskrit. Additional
+% conventions are applied when doing so: (a) Yo Ying and Tho Than must be
+% written without descender; (b) Phinthu is used for marking cluster;
+% (c) Nikhahit is used as a Pali-Sanskrit consonant.
+%
+% (b) is inherently applicable as combining character. So is (c), with
+% an exception for the case in which it is combined over upper vowel
+% (namely, Sara I), where it must be shifted to higher position. Nikhahit
+% shifting is implemented in the ligkern rules with the extra glyph
+% provision in the fonts.
+%
+% What is left here is (a). Yo Ying and Tho Than must be converted to
+% their descender-less vairations. The |\textpali| macro is defined
+% for this purpose. Note that |\wbr| commands which are normally inserted
+% by automatic tools are ignored here, as most of such tools are not
+% designed for Pali/Sanskrit. Besides, Pali/Sanskrit is already space
+% delimited.
+%
+% \begin{macro}{\textpali}
+% This command converts all Yo Ying and Tho Than in its argument to
+% their descender-less variations.
+% \begin{macrocode}
+\DeclareRobustCommand{\textpali}[1]{%
+ \begingroup
+ \def\thaiYoYing{\textYoYingPali{}}%
+ \def\thaiThoThan{\textThoThanPali{}}%
+ \def\wbr{}%
+ \scantokens\expandafter{#1}\relax
+ \endgroup
+}
+% \end{macrocode}
+% \end{macro}
+%
% \subsubsection{Hyphenation}
%
% We define |\thaihyphenmins| macro for hyphenation parameters. This is
@@ -288,8 +327,7 @@
% \begin{macrocode}
\addto\captionsthai{%
\def\prefacename{\thaiKhoKhwai\thaiSaraAm\thaiNoNu\thaiSaraAm}%
- \def\refname{\thaiHoHip\thaiNoNu\thaiMaiHanakat\thaiNgoNgu%
- \thaiSoSua\thaiSaraUee\thaiOAng%
+ \def\refname{\thaiSaraE\thaiOAng\thaiKoKai\thaiSoSua\thaiSaraAa\thaiRoRua%
\thaiOAng\thaiMaiTho\thaiSaraAa\thaiNgoNgu%
\thaiOAng\thaiSaraI\thaiNgoNgu}%
\def\abstractname{\thaiBoBaimai\thaiThoThahan%
diff --git a/Master/texmf-dist/source/latex/thailatex/babel/tis620.def b/Master/texmf-dist/source/latex/thailatex/babel/tis620.def
new file mode 100644
index 00000000000..589dea77e8f
--- /dev/null
+++ b/Master/texmf-dist/source/latex/thailatex/babel/tis620.def
@@ -0,0 +1,108 @@
+\ProvidesFile{tis620.def}
+ [2011/03/16 v1.0 Thai TIS-620 input encoding file]
+% tis620 input encoding file by Theppitak Karoonboonyanan
+%
+% Copyright 2011 Theppitak Karoonboonyanan. 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.
+%
+
+\DeclareInputText{161}{\thaiKoKai}
+\DeclareInputText{162}{\thaiKhoKhai}
+\DeclareInputText{163}{\thaiKhoKhuat}
+\DeclareInputText{164}{\thaiKhoKhwai}
+\DeclareInputText{165}{\thaiKhoKhon}
+\DeclareInputText{166}{\thaiKhoRakhang}
+\DeclareInputText{167}{\thaiNgoNgu}
+\DeclareInputText{168}{\thaiChoChan}
+\DeclareInputText{169}{\thaiChoChing}
+\DeclareInputText{170}{\thaiChoChang}
+\DeclareInputText{171}{\thaiSoSo}
+\DeclareInputText{172}{\thaiChoChoe}
+\DeclareInputText{173}{\thaiYoYing}
+\DeclareInputText{174}{\thaiDoChada}
+\DeclareInputText{175}{\thaiToPatak}
+\DeclareInputText{176}{\thaiThoThan}
+\DeclareInputText{177}{\thaiThoNangmontho}
+\DeclareInputText{178}{\thaiThoPhuthao}
+\DeclareInputText{179}{\thaiNoNen}
+\DeclareInputText{180}{\thaiDoDek}
+\DeclareInputText{181}{\thaiToTao}
+\DeclareInputText{182}{\thaiThoThung}
+\DeclareInputText{183}{\thaiThoThahan}
+\DeclareInputText{184}{\thaiThoThong}
+\DeclareInputText{185}{\thaiNoNu}
+\DeclareInputText{186}{\thaiBoBaimai}
+\DeclareInputText{187}{\thaiPoPla}
+\DeclareInputText{188}{\thaiPhoPhung}
+\DeclareInputText{189}{\thaiFoFa}
+\DeclareInputText{190}{\thaiPhoPhan}
+\DeclareInputText{191}{\thaiFoFan}
+\DeclareInputText{192}{\thaiPhoSamphao}
+\DeclareInputText{193}{\thaiMoMa}
+\DeclareInputText{194}{\thaiYoYak}
+\DeclareInputText{195}{\thaiRoRua}
+\DeclareInputText{196}{\thaiRu}
+\DeclareInputText{197}{\thaiLoLing}
+\DeclareInputText{198}{\thaiLu}
+\DeclareInputText{199}{\thaiWoWaen}
+\DeclareInputText{200}{\thaiSoSala}
+\DeclareInputText{201}{\thaiSoRusi}
+\DeclareInputText{202}{\thaiSoSua}
+\DeclareInputText{203}{\thaiHoHip}
+\DeclareInputText{204}{\thaiLoChula}
+\DeclareInputText{205}{\thaiOAng}
+\DeclareInputText{206}{\thaiHoNokhuk}
+\DeclareInputText{207}{\thaiPaiyannoi}
+\DeclareInputText{208}{\thaiSaraA}
+\DeclareInputText{209}{\thaiMaiHanakat}
+\DeclareInputText{210}{\thaiSaraAa}
+\DeclareInputText{211}{\thaiSaraAm}
+\DeclareInputText{212}{\thaiSaraI}
+\DeclareInputText{213}{\thaiSaraIi}
+\DeclareInputText{214}{\thaiSaraUe}
+\DeclareInputText{215}{\thaiSaraUee}
+\DeclareInputText{216}{\thaiSaraU}
+\DeclareInputText{217}{\thaiSaraUu}
+\DeclareInputText{218}{\thaiPhinthu}
+\DeclareInputText{223}{\textbaht}
+\DeclareInputText{224}{\thaiSaraE}
+\DeclareInputText{225}{\thaiSaraAe}
+\DeclareInputText{226}{\thaiSaraO}
+\DeclareInputText{227}{\thaiSaraAiMaimuan}
+\DeclareInputText{228}{\thaiSaraAiMaimalai}
+\DeclareInputText{229}{\thaiLakkhangyao}
+\DeclareInputText{230}{\thaiMaiyamok}
+\DeclareInputText{231}{\thaiMaitaikhu}
+\DeclareInputText{232}{\thaiMaiEk}
+\DeclareInputText{233}{\thaiMaiTho}
+\DeclareInputText{234}{\thaiMaiTri}
+\DeclareInputText{235}{\thaiMaiChattawa}
+\DeclareInputText{236}{\thaiThanthakhat}
+\DeclareInputText{237}{\thaiNikhahit}
+\DeclareInputText{238}{\thaiYamakkan}
+\DeclareInputText{239}{\thaiFongman}
+\DeclareInputText{240}{\thaizero}
+\DeclareInputText{241}{\thaione}
+\DeclareInputText{242}{\thaitwo}
+\DeclareInputText{243}{\thaithree}
+\DeclareInputText{244}{\thaifour}
+\DeclareInputText{245}{\thaifive}
+\DeclareInputText{246}{\thaisix}
+\DeclareInputText{247}{\thaiseven}
+\DeclareInputText{248}{\thaieight}
+\DeclareInputText{249}{\thainine}
+\DeclareInputText{250}{\thaiAngkhankhu}
+\DeclareInputText{251}{\thaiKhomut}
+
diff --git a/Master/texmf-dist/source/latex/thailatex/configure b/Master/texmf-dist/source/latex/thailatex/configure
index 6100e46e9bc..1e75be46788 100644
--- a/Master/texmf-dist/source/latex/thailatex/configure
+++ b/Master/texmf-dist/source/latex/thailatex/configure
@@ -1,11 +1,13 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.64.
+# Generated by GNU Autoconf 2.67.
+#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
# Foundation, Inc.
#
+#
# This configure script is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.
## -------------------- ##
@@ -314,7 +316,7 @@ $as_echo X"$as_dir" |
test -d "$as_dir" && break
done
test -z "$as_dirs" || eval "mkdir $as_dirs"
- } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
+ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
} # as_fn_mkdir_p
@@ -354,19 +356,19 @@ else
fi # as_fn_arith
-# as_fn_error ERROR [LINENO LOG_FD]
-# ---------------------------------
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with status $?, using 1 if that was 0.
+# script with STATUS, using 1 if that was 0.
as_fn_error ()
{
- as_status=$?; test $as_status -eq 0 && as_status=1
- if test "$3"; then
- as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
+ 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
fi
- $as_echo "$as_me: error: $1" >&2
+ $as_echo "$as_me: error: $2" >&2
as_fn_exit $as_status
} # as_fn_error
@@ -524,10 +526,11 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-exec 7<&0 </dev/null 6>&1
+test -n "$DJDIR" || exec 7<&0 </dev/null
+exec 6>&1
# Name of the host.
-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
# so uname gets run too.
ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
@@ -701,8 +704,9 @@ do
fi
case $ac_option in
- *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
- *) ac_optarg=yes ;;
+ *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+ *=) ac_optarg= ;;
+ *) ac_optarg=yes ;;
esac
# Accept the important Cygnus configure options, so we can diagnose typos.
@@ -747,7 +751,7 @@ 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'`
case $ac_user_opts in
@@ -773,7 +777,7 @@ 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'`
case $ac_user_opts in
@@ -977,7 +981,7 @@ 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'`
case $ac_user_opts in
@@ -993,7 +997,7 @@ 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'`
case $ac_user_opts in
@@ -1023,8 +1027,8 @@ do
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
x_libraries=$ac_optarg ;;
- -*) as_fn_error "unrecognized option: \`$ac_option'
-Try \`$0 --help' for more information."
+ -*) as_fn_error $? "unrecognized option: \`$ac_option'
+Try \`$0 --help' for more information"
;;
*=*)
@@ -1032,7 +1036,7 @@ Try \`$0 --help' for more information."
# Reject names that are not valid shell variable names.
case $ac_envvar in #(
'' | [0-9]* | *[!_$as_cr_alnum]* )
- as_fn_error "invalid variable name: \`$ac_envvar'" ;;
+ as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
esac
eval $ac_envvar=\$ac_optarg
export $ac_envvar ;;
@@ -1050,13 +1054,13 @@ done
if test -n "$ac_prev"; then
ac_option=--`echo $ac_prev | sed 's/_/-/g'`
- as_fn_error "missing argument to $ac_option"
+ as_fn_error $? "missing argument to $ac_option"
fi
if test -n "$ac_unrecognized_opts"; then
case $enable_option_checking in
no) ;;
- fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
+ fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
*) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
esac
fi
@@ -1079,7 +1083,7 @@ do
[\\/$]* | ?:[\\/]* ) continue;;
NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
esac
- as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
+ as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
done
# There might be people who depend on the old broken behavior: `$host'
@@ -1093,8 +1097,8 @@ target=$target_alias
if test "x$host_alias" != x; then
if test "x$build_alias" = x; then
cross_compiling=maybe
- $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
- If a cross compiler is detected then cross compile mode will be used." >&2
+ $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
+ If a cross compiler is detected then cross compile mode will be used" >&2
elif test "x$build_alias" != "x$host_alias"; then
cross_compiling=yes
fi
@@ -1109,9 +1113,9 @@ test "$silent" = yes && exec 6>/dev/null
ac_pwd=`pwd` && test -n "$ac_pwd" &&
ac_ls_di=`ls -di .` &&
ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
- as_fn_error "working directory cannot be determined"
+ as_fn_error $? "working directory cannot be determined"
test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
- as_fn_error "pwd does not report name of working directory"
+ as_fn_error $? "pwd does not report name of working directory"
# Find the source files, if location was not specified.
@@ -1150,11 +1154,11 @@ else
fi
if test ! -r "$srcdir/$ac_unique_file"; then
test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
- as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
+ as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
fi
ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
ac_abs_confdir=`(
- cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
+ cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
pwd)`
# When building in place, set srcdir=.
if test "$ac_abs_confdir" = "$ac_pwd"; then
@@ -1194,7 +1198,7 @@ Configuration:
--help=short display options specific to this package
--help=recursive display the short help of all the included packages
-V, --version display version information and exit
- -q, --quiet, --silent do not print \`checking...' messages
+ -q, --quiet, --silent do not print \`checking ...' messages
--cache-file=FILE cache test results in FILE [disabled]
-C, --config-cache alias for \`--cache-file=config.cache'
-n, --no-create do not create output files
@@ -1318,9 +1322,9 @@ test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
configure
-generated by GNU Autoconf 2.64
+generated by GNU Autoconf 2.67
-Copyright (C) 2009 Free Software Foundation, Inc.
+Copyright (C) 2010 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it.
_ACEOF
@@ -1335,7 +1339,7 @@ This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by $as_me, which was
-generated by GNU Autoconf 2.64. Invocation command line was
+generated by GNU Autoconf 2.67. Invocation command line was
$ $0 $@
@@ -1445,11 +1449,9 @@ trap 'exit_status=$?
{
echo
- cat <<\_ASBOX
-## ---------------- ##
+ $as_echo "## ---------------- ##
## Cache variables. ##
-## ---------------- ##
-_ASBOX
+## ---------------- ##"
echo
# The following way of writing the cache mishandles newlines in values,
(
@@ -1483,11 +1485,9 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
)
echo
- cat <<\_ASBOX
-## ----------------- ##
+ $as_echo "## ----------------- ##
## Output variables. ##
-## ----------------- ##
-_ASBOX
+## ----------------- ##"
echo
for ac_var in $ac_subst_vars
do
@@ -1500,11 +1500,9 @@ _ASBOX
echo
if test -n "$ac_subst_files"; then
- cat <<\_ASBOX
-## ------------------- ##
+ $as_echo "## ------------------- ##
## File substitutions. ##
-## ------------------- ##
-_ASBOX
+## ------------------- ##"
echo
for ac_var in $ac_subst_files
do
@@ -1518,11 +1516,9 @@ _ASBOX
fi
if test -s confdefs.h; then
- cat <<\_ASBOX
-## ----------- ##
+ $as_echo "## ----------- ##
## confdefs.h. ##
-## ----------- ##
-_ASBOX
+## ----------- ##"
echo
cat confdefs.h
echo
@@ -1577,7 +1573,12 @@ _ACEOF
ac_site_file1=NONE
ac_site_file2=NONE
if test -n "$CONFIG_SITE"; then
- ac_site_file1=$CONFIG_SITE
+ # 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
elif test "x$prefix" != xNONE; then
ac_site_file1=$prefix/share/config.site
ac_site_file2=$prefix/etc/config.site
@@ -1588,18 +1589,22 @@ fi
for ac_site_file in "$ac_site_file1" "$ac_site_file2"
do
test "x$ac_site_file" = xNONE && continue
- if test -r "$ac_site_file"; then
+ 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;}
sed 's/^/| /' "$ac_site_file" >&5
- . "$ac_site_file"
+ . "$ac_site_file" \
+ || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$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
done
if test -r "$cache_file"; then
- # Some versions of bash will fail to source /dev/null (special
- # files actually), so we avoid doing that.
- if test -f "$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;}
case $cache_file in
@@ -1668,7 +1673,7 @@ if $ac_cache_corrupted; then
$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
+ as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
fi
## -------------------- ##
## Main body of script. ##
@@ -1685,16 +1690,22 @@ am__api_version='1.11'
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
- for ac_t in install-sh install.sh shtool; do
- if test -f "$ac_dir/$ac_t"; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/$ac_t -c"
- break 2
- fi
- done
+ 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
+ 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,
@@ -1810,11 +1821,11 @@ am_lf='
'
case `pwd` in
*[\\\"\#\$\&\'\`$am_lf]*)
- as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;
+ as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5 ;;
esac
case $srcdir in
*[\\\"\#\$\&\'\`$am_lf\ \ ]*)
- as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
+ as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5 ;;
esac
# Do `set' in a subshell so we don't clobber the current shell's
@@ -1836,7 +1847,7 @@ if (
# if, for instance, CONFIG_SHELL is bash and it inherits a
# broken ls alias from the environment. This has actually
# happened. Such a system could not be considered "sane".
- as_fn_error "ls -t appears to fail. Make sure there is not a broken
+ as_fn_error $? "ls -t appears to fail. Make sure there is not a broken
alias in your environment" "$LINENO" 5
fi
@@ -1846,7 +1857,7 @@ then
# Ok.
:
else
- as_fn_error "newly created file is older than distributed files!
+ 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
@@ -2018,6 +2029,7 @@ IFS=$as_save_IFS
fi
+ test -d ./--version && rmdir ./--version
if test "${ac_cv_path_mkdir+set}" = set; then
MKDIR_P="$ac_cv_path_mkdir -p"
else
@@ -2025,7 +2037,6 @@ fi
# value for MKDIR_P within a source directory, because that will
# break other packages using the cache if that directory is
# removed, or if the value is a relative name.
- test -d ./--version && rmdir ./--version
MKDIR_P="$ac_install_sh -d"
fi
fi
@@ -2084,7 +2095,7 @@ done
$as_echo_n "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 { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then :
$as_echo_n "(cached) " >&6
else
cat >conftest.make <<\_ACEOF
@@ -2092,7 +2103,7 @@ SHELL = /bin/sh
all:
@echo '@@@%%%=$(MAKE)=@@@%%%'
_ACEOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
case `${MAKE-make} -f conftest.make 2>/dev/null` in
*@@@%%%=?*=@@@%%%*)
eval ac_cv_prog_make_${ac_make}_set=yes;;
@@ -2126,7 +2137,7 @@ if test "`cd $srcdir && pwd`" != "`pwd`"; then
am__isrc=' -I$(srcdir)'
# test to see if srcdir already configured
if test -f $srcdir/config.status; then
- as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
+ as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
fi
fi
@@ -2142,7 +2153,7 @@ fi
# Define the identity of the package.
PACKAGE=thailatex
- VERSION=0.4.4
+ VERSION=0.4.5
cat >>confdefs.h <<_ACEOF
@@ -2294,7 +2305,7 @@ esac
done
IFS=$as_save_IFS
if test -z "$ac_cv_path_SED"; then
- as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5
+ as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
fi
else
ac_cv_path_SED=$SED
@@ -2394,7 +2405,7 @@ done
test -n "$LATEX" || LATEX="no"
if test "x$LATEX" = "xno" ; then
- as_fn_error "You need latex (from texlive distribution)" "$LINENO" 5
+ as_fn_error $? "You need latex (from texlive distribution)" "$LINENO" 5
fi
for ac_prog in dvips
do
@@ -2440,7 +2451,7 @@ done
test -n "$DVIPS" || DVIPS="no"
if test "x$DVIPS" = "xno" ; then
- as_fn_error "You need dvips (from texlive distribution)" "$LINENO" 5
+ as_fn_error $? "You need dvips (from texlive distribution)" "$LINENO" 5
fi
for ac_prog in pf2afm
do
@@ -2486,7 +2497,7 @@ done
test -n "$PF2AFM" || PF2AFM="no"
if test "x$PF2AFM" = "xno" ; then
- as_fn_error "You need pf2afm (from ghostscript distribution)" "$LINENO" 5
+ as_fn_error $? "You need pf2afm (from ghostscript distribution)" "$LINENO" 5
fi
for ac_prog in afm2tfm
do
@@ -2532,7 +2543,7 @@ done
test -n "$AFM2TFM" || AFM2TFM="no"
if test "x$AFM2TFM" = "xno" ; then
- as_fn_error "You need afm2tfm (from texlive distribution)" "$LINENO" 5
+ as_fn_error $? "You need afm2tfm (from texlive distribution)" "$LINENO" 5
fi
for ac_prog in vptovf
do
@@ -2578,7 +2589,7 @@ done
test -n "$VPTOVF" || VPTOVF="no"
if test "x$VPTOVF" = "xno" ; then
- as_fn_error "You need vptovf (from texlive distribution)" "$LINENO" 5
+ as_fn_error $? "You need vptovf (from texlive distribution)" "$LINENO" 5
fi
for ac_prog in ps2pdf
do
@@ -2624,7 +2635,7 @@ done
test -n "$PS2PDF" || PS2PDF="no"
if test "x$PS2PDF" = "xno" ; then
- as_fn_error "You need ps2pdf (from ghostscipt distribution)" "$LINENO" 5
+ as_fn_error $? "You need ps2pdf (from ghostscipt distribution)" "$LINENO" 5
fi
for ac_prog in swath
do
@@ -2778,7 +2789,7 @@ done
test -n "$UPDMAP" || UPDMAP="no"
if test "x$UPDMAP" = "xno" ; then
- as_fn_error "You need updmap-sys or updmap (from texlive distribution)" "$LINENO" 5
+ as_fn_error $? "You need updmap-sys or updmap (from texlive distribution)" "$LINENO" 5
fi
# Extract the first word of "mktexlsr texhash", so it can be a program name with args.
@@ -2823,7 +2834,7 @@ fi
if test "x$TEXHASH" = "xno" ; then
- as_fn_error "You need mktexlsr or texhash (from texlive distribution)" "$LINENO" 5
+ as_fn_error $? "You need mktexlsr or texhash (from texlive distribution)" "$LINENO" 5
fi
@@ -2840,7 +2851,7 @@ $as_echo_n "checking --with-emacsdir... " >&6; }
$as_echo "\"$emacsdir\"" >&6; }
-ac_config_files="$ac_config_files Makefile babel/Makefile emacs/Makefile fonts/Makefile scripts/Makefile scripts/sync-thailatex doc/Makefile thailatex.spec"
+ac_config_files="$ac_config_files Makefile babel/Makefile emacs/Makefile fonts/Makefile scripts/Makefile scripts/sync-thailatex doc/Makefile"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@@ -2961,6 +2972,7 @@ DEFS=`sed -n "$ac_script" confdefs.h`
ac_libobjs=
ac_ltlibobjs=
+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$//'
@@ -3123,19 +3135,19 @@ export LANGUAGE
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-# as_fn_error ERROR [LINENO LOG_FD]
-# ---------------------------------
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with status $?, using 1 if that was 0.
+# script with STATUS, using 1 if that was 0.
as_fn_error ()
{
- as_status=$?; test $as_status -eq 0 && as_status=1
- if test "$3"; then
- as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
+ 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
fi
- $as_echo "$as_me: error: $1" >&2
+ $as_echo "$as_me: error: $2" >&2
as_fn_exit $as_status
} # as_fn_error
@@ -3331,7 +3343,7 @@ $as_echo X"$as_dir" |
test -d "$as_dir" && break
done
test -z "$as_dirs" || eval "mkdir $as_dirs"
- } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
+ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
} # as_fn_mkdir_p
@@ -3385,7 +3397,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# values after options handling.
ac_log="
This file was extended by $as_me, which was
-generated by GNU Autoconf 2.64. Invocation command line was
+generated by GNU Autoconf 2.67. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
@@ -3420,6 +3432,7 @@ Usage: $0 [OPTION]... [TAG]...
-h, --help print this help, then exit
-V, --version print version number and configuration settings, then exit
+ --config print configuration, then exit
-q, --quiet, --silent
do not print progress messages
-d, --debug don't remove temporary files
@@ -3434,12 +3447,13 @@ Report bugs to the package provider."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
config.status
-configured by $0, generated by GNU Autoconf 2.64,
- with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+configured by $0, generated by GNU Autoconf 2.67,
+ with options \\"\$ac_cs_config\\"
-Copyright (C) 2009 Free Software Foundation, Inc.
+Copyright (C) 2010 Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
@@ -3457,11 +3471,16 @@ ac_need_defaults=:
while test $# != 0
do
case $1 in
- --*=*)
+ --*=?*)
ac_option=`expr "X$1" : 'X\([^=]*\)='`
ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
ac_shift=:
;;
+ --*=)
+ ac_option=`expr "X$1" : 'X\([^=]*\)='`
+ ac_optarg=
+ ac_shift=:
+ ;;
*)
ac_option=$1
ac_optarg=$2
@@ -3475,12 +3494,15 @@ do
ac_cs_recheck=: ;;
--version | --versio | --versi | --vers | --ver | --ve | --v | -V )
$as_echo "$ac_cs_version"; exit ;;
+ --config | --confi | --conf | --con | --co | --c )
+ $as_echo "$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"` ;;
+ '') as_fn_error $? "missing file argument" ;;
esac
as_fn_append CONFIG_FILES " '$ac_optarg'"
ac_need_defaults=false;;
@@ -3491,7 +3513,7 @@ do
ac_cs_silent=: ;;
# This is an error.
- -*) as_fn_error "unrecognized option: \`$1'
+ -*) as_fn_error $? "unrecognized option: \`$1'
Try \`$0 --help' for more information." ;;
*) as_fn_append ac_config_targets " $1"
@@ -3547,9 +3569,8 @@ do
"scripts/Makefile") CONFIG_FILES="$CONFIG_FILES scripts/Makefile" ;;
"scripts/sync-thailatex") CONFIG_FILES="$CONFIG_FILES scripts/sync-thailatex" ;;
"doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
- "thailatex.spec") CONFIG_FILES="$CONFIG_FILES thailatex.spec" ;;
- *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
+ *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
esac
done
@@ -3585,7 +3606,7 @@ $debug ||
{
tmp=./conf$$-$RANDOM
(umask 077 && mkdir "$tmp")
-} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
+} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
# Set up the scripts for CONFIG_FILES section.
# No need to generate them if there are no CONFIG_FILES.
@@ -3602,7 +3623,7 @@ if test "x$ac_cr" = x; then
fi
ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
- ac_cs_awk_cr='\r'
+ ac_cs_awk_cr='\\r'
else
ac_cs_awk_cr=$ac_cr
fi
@@ -3616,18 +3637,18 @@ _ACEOF
echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
echo "_ACEOF"
} >conf$$subs.sh ||
- as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
. ./conf$$subs.sh ||
- as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
if test $ac_delim_n = $ac_delim_num; then
break
elif $ac_last_try; then
- as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
@@ -3649,7 +3670,7 @@ s/'"$ac_delim"'$//
t delim
:nl
h
-s/\(.\{148\}\).*/\1/
+s/\(.\{148\}\)..*/\1/
t more1
s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
p
@@ -3663,7 +3684,7 @@ s/.\{148\}//
t nl
:delim
h
-s/\(.\{148\}\).*/\1/
+s/\(.\{148\}\)..*/\1/
t more2
s/["\\]/\\&/g; s/^/"/; s/$/"/
p
@@ -3716,20 +3737,28 @@ if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
else
cat
fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
- || as_fn_error "could not setup config files machinery" "$LINENO" 5
+ || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
_ACEOF
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
+# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
+# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
# trailing colons and then remove the whole line if VPATH becomes empty
# (actually we leave an empty line to preserve line numbers).
if test "x$srcdir" = x.; then
- ac_vpsub='/^[ ]*VPATH[ ]*=/{
-s/:*\$(srcdir):*/:/
-s/:*\${srcdir}:*/:/
-s/:*@srcdir@:*/:/
-s/^\([^=]*=[ ]*\):*/\1/
+ ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{
+h
+s///
+s/^/:/
+s/[ ]*$/:/
+s/:\$(srcdir):/:/g
+s/:\${srcdir}:/:/g
+s/:@srcdir@:/:/g
+s/^:*//
s/:*$//
+x
+s/\(=[ ]*\).*/\1/
+G
+s/\n//
s/^[^=]*=[ ]*$//
}'
fi
@@ -3747,7 +3776,7 @@ do
esac
case $ac_mode$ac_tag in
:[FHL]*:*);;
- :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
+ :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;;
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
esac
@@ -3775,7 +3804,7 @@ do
[\\/$]*) false;;
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
esac ||
- as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
+ 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
as_fn_append ac_file_inputs " '$ac_f'"
@@ -3802,7 +3831,7 @@ $as_echo "$as_me: creating $ac_file" >&6;}
case $ac_tag in
*:-:* | *:-) cat >"$tmp/stdin" \
- || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
esac
;;
esac
@@ -3939,22 +3968,22 @@ s&@MKDIR_P@&$ac_MKDIR_P&;t t
$ac_datarootdir_hack
"
eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
- || as_fn_error "could not create $ac_file" "$LINENO" 5
+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5
test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
{ ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
{ ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
{ $as_echo "$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
+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'
-which seems to be undefined. Please make sure it is defined." >&2;}
+which seems to be undefined. Please make sure it is defined" >&2;}
rm -f "$tmp/stdin"
case $ac_file in
-) cat "$tmp/out" && rm -f "$tmp/out";;
*) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
esac \
- || as_fn_error "could not create $ac_file" "$LINENO" 5
+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5
;;
@@ -3969,7 +3998,7 @@ _ACEOF
ac_clean_files=$ac_clean_files_save
test $ac_write_fail = 0 ||
- as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
+ as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
# configure is writing to config.log, and then calls config.status.
@@ -3990,7 +4019,7 @@ if test "$no_create" != yes; then
exec 5>>config.log
# Use ||, not &&, to avoid exiting from the if with $? = 1, which
# would make configure fail if this is the last instruction.
- $ac_cs_success || as_fn_exit $?
+ $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
diff --git a/Master/texmf-dist/source/latex/thailatex/configure.in b/Master/texmf-dist/source/latex/thailatex/configure.in
index 22ab68fcd04..21dfb2e3515 100644
--- a/Master/texmf-dist/source/latex/thailatex/configure.in
+++ b/Master/texmf-dist/source/latex/thailatex/configure.in
@@ -1,5 +1,5 @@
AC_INIT(babel/thai.dtx)
-AM_INIT_AUTOMAKE(thailatex, 0.4.4)
+AM_INIT_AUTOMAKE(thailatex, 0.4.5)
AC_PROG_INSTALL
AC_PROG_LN_S
@@ -71,6 +71,5 @@ AC_OUTPUT(Makefile
fonts/Makefile
scripts/Makefile
scripts/sync-thailatex
- doc/Makefile
- thailatex.spec)
+ doc/Makefile)
diff --git a/Master/texmf-dist/source/latex/thailatex/doc/Makefile.in b/Master/texmf-dist/source/latex/thailatex/doc/Makefile.in
index e9741f436d3..9c4b40c775e 100644
--- a/Master/texmf-dist/source/latex/thailatex/doc/Makefile.in
+++ b/Master/texmf-dist/source/latex/thailatex/doc/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/Master/texmf-dist/source/latex/thailatex/doc/teststd.tex b/Master/texmf-dist/source/latex/thailatex/doc/teststd.tex
index b0b5d2b8c64..57921bb288c 100644
--- a/Master/texmf-dist/source/latex/thailatex/doc/teststd.tex
+++ b/Master/texmf-dist/source/latex/thailatex/doc/teststd.tex
@@ -5,6 +5,7 @@
%%
\documentclass[twocolumn,a4paper]{article}
\usepackage[english,thai]{babel}
+\usepackage[tis620]{inputenc}
\begin{document}
@@ -108,6 +109,32 @@ The quick brown fox jumps over the lazy dog.\\
, , , Թ Թ չ չ ѹ -\textyamakkan{} \textfongmun{} \textangkhankhu{} \textkhomut{} - -- --- `` '' ff fi tt ti AV\\
\usefont{LTH}{kinnari}{b}{it}
, , , Թ Թ չ չ ѹ -\textyamakkan{} \textfongmun{} \textangkhankhu{} \textkhomut{} - -- --- `` '' ff fi tt ti AV\\
+
+\subsection{Һ-ѹʡĵ}
+\usefont{LTH}{kinnari}{m}{n}
+\textpali{˵ ԡڢ ʵ, ҷҹԡࢻ ڭµ}\\
+\textpali{ ԡڢ}\\
+\textpali{ڢ ʵ}\\
+\textpali{ڢڼʻڨ ػڻڪ ͪڬڵ آء}\\
+\textpali{ԯڰ ԡڢ µԡ }\\
+\usefont{LTH}{kinnari}{b}{n}
+\textpali{˵ ԡڢ ʵ, ҷҹԡࢻ ڭµ}\\
+\textpali{ ԡڢ}\\
+\textpali{ڢ ʵ}\\
+\textpali{ڢڼʻڨ ػڻڪ ͪڬڵ آء}\\
+\textpali{ԯڰ ԡڢ µԡ }\\
+\usefont{LTH}{kinnari}{m}{it}
+\textpali{˵ ԡڢ ʵ, ҷҹԡࢻ ڭµ}\\
+\textpali{ ԡڢ}\\
+\textpali{ڢ ʵ}\\
+\textpali{ڢڼʻڨ ػڻڪ ͪڬڵ آء}\\
+\textpali{ԯڰ ԡڢ µԡ }\\
+\usefont{LTH}{kinnari}{b}{it}
+\textpali{˵ ԡڢ ʵ, ҷҹԡࢻ ڭµ}\\
+\textpali{ ԡڢ}\\
+\textpali{ڢ ʵ}\\
+\textpali{ڢڼʻڨ ػڻڪ ͪڬڵ آء}\\
+\textpali{ԯڰ ԡڢ µԡ }\\
\vfil
@@ -184,6 +211,32 @@ The quick brown fox jumps over the lazy dog.\\
, , , Թ Թ չ չ ѹ -\textyamakkan{} \textfongmun{} \textangkhankhu{} \textkhomut{} - -- --- `` '' ff fi tt ti AV\\
\usefont{LTH}{garuda}{b}{it}
, , , Թ Թ չ չ ѹ -\textyamakkan{} \textfongmun{} \textangkhankhu{} \textkhomut{} - -- --- `` '' ff fi tt ti AV\\
+
+\subsection{Һ-ѹʡĵ}
+\usefont{LTH}{garuda}{m}{n}
+\textpali{˵ ԡڢ ʵ, ҷҹԡࢻ ڭµ}\\
+\textpali{ ԡڢ}\\
+\textpali{ڢ ʵ}\\
+\textpali{ڢڼʻڨ ػڻڪ ͪڬڵ آء}\\
+\textpali{ԯڰ ԡڢ µԡ }\\
+\usefont{LTH}{garuda}{b}{n}
+\textpali{˵ ԡڢ ʵ, ҷҹԡࢻ ڭµ}\\
+\textpali{ ԡڢ}\\
+\textpali{ڢ ʵ}\\
+\textpali{ڢڼʻڨ ػڻڪ ͪڬڵ آء}\\
+\textpali{ԯڰ ԡڢ µԡ }\\
+\usefont{LTH}{garuda}{m}{it}
+\textpali{˵ ԡڢ ʵ, ҷҹԡࢻ ڭµ}\\
+\textpali{ ԡڢ}\\
+\textpali{ڢ ʵ}\\
+\textpali{ڢڼʻڨ ػڻڪ ͪڬڵ آء}\\
+\textpali{ԯڰ ԡڢ µԡ }\\
+\usefont{LTH}{garuda}{b}{it}
+\textpali{˵ ԡڢ ʵ, ҷҹԡࢻ ڭµ}\\
+\textpali{ ԡڢ}\\
+\textpali{ڢ ʵ}\\
+\textpali{ڢڼʻڨ ػڻڪ ͪڬڵ آء}\\
+\textpali{ԯڰ ԡڢ µԡ }\\
\vfil
\section{\usefont{LTH}{norasi}{b}{n}Norasi -- \protect\footnote{ҡçÿ͹觪ҵ (National Font Project)}}
@@ -267,6 +320,32 @@ The quick brown fox jumps over the lazy dog.\\
, , , Թ Թ չ չ ѹ -\textyamakkan{} \textfongmun{} \textangkhankhu{} \textkhomut{} - -- --- `` '' ff fi tt ti AV\\
\usefont{LTH}{norasi}{b}{it}
, , , Թ Թ չ չ ѹ -\textyamakkan{} \textfongmun{} \textangkhankhu{} \textkhomut{} - -- --- `` '' ff fi tt ti AV\\
+
+\subsection{Һ-ѹʡĵ}
+\usefont{LTH}{norasi}{m}{n}
+\textpali{˵ ԡڢ ʵ, ҷҹԡࢻ ڭµ}\\
+\textpali{ ԡڢ}\\
+\textpali{ڢ ʵ}\\
+\textpali{ڢڼʻڨ ػڻڪ ͪڬڵ آء}\\
+\textpali{ԯڰ ԡڢ µԡ }\\
+\usefont{LTH}{norasi}{b}{n}
+\textpali{˵ ԡڢ ʵ, ҷҹԡࢻ ڭµ}\\
+\textpali{ ԡڢ}\\
+\textpali{ڢ ʵ}\\
+\textpali{ڢڼʻڨ ػڻڪ ͪڬڵ آء}\\
+\textpali{ԯڰ ԡڢ µԡ }\\
+\usefont{LTH}{norasi}{m}{it}
+\textpali{˵ ԡڢ ʵ, ҷҹԡࢻ ڭµ}\\
+\textpali{ ԡڢ}\\
+\textpali{ڢ ʵ}\\
+\textpali{ڢڼʻڨ ػڻڪ ͪڬڵ آء}\\
+\textpali{ԯڰ ԡڢ µԡ }\\
+\usefont{LTH}{norasi}{b}{it}
+\textpali{˵ ԡڢ ʵ, ҷҹԡࢻ ڭµ}\\
+\textpali{ ԡڢ}\\
+\textpali{ڢ ʵ}\\
+\textpali{ڢڼʻڨ ػڻڪ ͪڬڵ آء}\\
+\textpali{ԯڰ ԡڢ µԡ }\\
\vfil
@@ -345,6 +424,34 @@ The quick brown fox jumps over the lazy dog.\\
, , , Թ Թ չ չ ѹ -\textyamakkan{} \textfongmun{} \textangkhankhu{} \textkhomut{} - -- --- `` '' ff fi tt ti AV\\
+\subsection{Һ-ѹʡĵ}
+\usefont{LTH}{ttype}{m}{n}
+\textpali{˵ ԡڢ ʵ, ҷҹԡࢻ ڭµ}\\
+\textpali{ ԡڢ}\\
+\textpali{ڢ ʵ}\\
+\textpali{ڢڼʻڨ ػڻڪ ͪڬڵ آء}\\
+\textpali{ԯڰ ԡڢ µԡ }\\
+\usefont{LTH}{ttype}{b}{n}
+\textpali{˵ ԡڢ ʵ, ҷҹԡࢻ ڭµ}\\
+\textpali{ ԡڢ}\\
+\textpali{ڢ ʵ}\\
+\textpali{ڢڼʻڨ ػڻڪ ͪڬڵ آء}\\
+\textpali{ԯڰ ԡڢ µԡ }\\
+\usefont{LTH}{ttype}{m}{it}
+\textpali{˵ ԡڢ ʵ, ҷҹԡࢻ ڭµ}\\
+\textpali{ ԡڢ}\\
+\textpali{ڢ ʵ}\\
+\textpali{ڢڼʻڨ ػڻڪ ͪڬڵ آء}\\
+\textpali{ԯڰ ԡڢ µԡ }\\
+\usefont{LTH}{ttype}{b}{it}
+\textpali{˵ ԡڢ ʵ, ҷҹԡࢻ ڭµ}\\
+\textpali{ ԡڢ}\\
+\textpali{ڢ ʵ}\\
+\textpali{ڢڼʻڨ ػڻڪ ͪڬڵ آء}\\
+\textpali{ԯڰ ԡڢ µԡ }\\
+\vfil
+
+
\section{\usefont{LTH}{ttypist}{b}{n}Tlwg Typist\protect\footnote{ Thai Linux Working Group (TLWG)}}
\subsection{ҧ¤}
@@ -419,6 +526,33 @@ The quick brown fox jumps over the lazy dog.\\
\usefont{LTH}{ttypist}{b}{it}
, , , Թ Թ չ չ ѹ -\textyamakkan{} \textfongmun{} \textangkhankhu{} \textkhomut{} - -- --- `` '' ff fi tt ti AV\\
+\subsection{Һ-ѹʡĵ}
+\usefont{LTH}{ttypist}{m}{n}
+\textpali{˵ ԡڢ ʵ, ҷҹԡࢻ ڭµ}\\
+\textpali{ ԡڢ}\\
+\textpali{ڢ ʵ}\\
+\textpali{ڢڼʻڨ ػڻڪ ͪڬڵ آء}\\
+\textpali{ԯڰ ԡڢ µԡ }\\
+\usefont{LTH}{ttypist}{b}{n}
+\textpali{˵ ԡڢ ʵ, ҷҹԡࢻ ڭµ}\\
+\textpali{ ԡڢ}\\
+\textpali{ڢ ʵ}\\
+\textpali{ڢڼʻڨ ػڻڪ ͪڬڵ آء}\\
+\textpali{ԯڰ ԡڢ µԡ }\\
+\usefont{LTH}{ttypist}{m}{it}
+\textpali{˵ ԡڢ ʵ, ҷҹԡࢻ ڭµ}\\
+\textpali{ ԡڢ}\\
+\textpali{ڢ ʵ}\\
+\textpali{ڢڼʻڨ ػڻڪ ͪڬڵ آء}\\
+\textpali{ԯڰ ԡڢ µԡ }\\
+\usefont{LTH}{ttypist}{b}{it}
+\textpali{˵ ԡڢ ʵ, ҷҹԡࢻ ڭµ}\\
+\textpali{ ԡڢ}\\
+\textpali{ڢ ʵ}\\
+\textpali{ڢڼʻڨ ػڻڪ ͪڬڵ آء}\\
+\textpali{ԯڰ ԡڢ µԡ }\\
+\vfil
+
\section{\usefont{LTH}{purisa}{m}{n}Purisa -- \protect\footnote{ Thai Linux Working Group (TLWG)}}
\subsection{ҧ¤}
@@ -494,6 +628,33 @@ The quick brown fox jumps over the lazy dog.\\
\usefont{LTH}{purisa}{b}{it}
, , , Թ Թ չ չ ѹ -\textyamakkan{} \textfongmun{} \textangkhankhu{} \textkhomut{} - -- --- `` '' ff fi tt ti AV\\
+\subsection{Һ-ѹʡĵ}
+\usefont{LTH}{purisa}{m}{n}
+\textpali{˵ ԡڢ ʵ, ҷҹԡࢻ ڭµ}\\
+\textpali{ ԡڢ}\\
+\textpali{ڢ ʵ}\\
+\textpali{ڢڼʻڨ ػڻڪ ͪڬڵ آء}\\
+\textpali{ԯڰ ԡڢ µԡ }\\
+\usefont{LTH}{purisa}{b}{n}
+\textpali{˵ ԡڢ ʵ, ҷҹԡࢻ ڭµ}\\
+\textpali{ ԡڢ}\\
+\textpali{ڢ ʵ}\\
+\textpali{ڢڼʻڨ ػڻڪ ͪڬڵ آء}\\
+\textpali{ԯڰ ԡڢ µԡ }\\
+\usefont{LTH}{purisa}{m}{it}
+\textpali{˵ ԡڢ ʵ, ҷҹԡࢻ ڭµ}\\
+\textpali{ ԡڢ}\\
+\textpali{ڢ ʵ}\\
+\textpali{ڢڼʻڨ ػڻڪ ͪڬڵ آء}\\
+\textpali{ԯڰ ԡڢ µԡ }\\
+\usefont{LTH}{purisa}{b}{it}
+\textpali{˵ ԡڢ ʵ, ҷҹԡࢻ ڭµ}\\
+\textpali{ ԡڢ}\\
+\textpali{ڢ ʵ}\\
+\textpali{ڢڼʻڨ ػڻڪ ͪڬڵ آء}\\
+\textpali{ԯڰ ԡڢ µԡ }\\
+\vfil
+
\section{\usefont{LTH}{loma}{b}{n}Loma -- \protect\footnote{ҡٹ෤硷͹ԡФ觪ҵ (NECTEC)}}
\subsection{ҧ¤}
@@ -567,6 +728,32 @@ The quick brown fox jumps over the lazy dog.\\
, , , Թ Թ չ չ ѹ -\textyamakkan{} \textfongmun{} \textangkhankhu{} \textkhomut{} - -- --- `` '' ff fi tt ti AV\\
\usefont{LTH}{loma}{b}{it}
, , , Թ Թ չ չ ѹ -\textyamakkan{} \textfongmun{} \textangkhankhu{} \textkhomut{} - -- --- `` '' ff fi tt ti AV\\
+
+\subsection{Һ-ѹʡĵ}
+\usefont{LTH}{loma}{m}{n}
+\textpali{˵ ԡڢ ʵ, ҷҹԡࢻ ڭµ}\\
+\textpali{ ԡڢ}\\
+\textpali{ڢ ʵ}\\
+\textpali{ڢڼʻڨ ػڻڪ ͪڬڵ آء}\\
+\textpali{ԯڰ ԡڢ µԡ }\\
+\usefont{LTH}{loma}{b}{n}
+\textpali{˵ ԡڢ ʵ, ҷҹԡࢻ ڭµ}\\
+\textpali{ ԡڢ}\\
+\textpali{ڢ ʵ}\\
+\textpali{ڢڼʻڨ ػڻڪ ͪڬڵ آء}\\
+\textpali{ԯڰ ԡڢ µԡ }\\
+\usefont{LTH}{loma}{m}{it}
+\textpali{˵ ԡڢ ʵ, ҷҹԡࢻ ڭµ}\\
+\textpali{ ԡڢ}\\
+\textpali{ڢ ʵ}\\
+\textpali{ڢڼʻڨ ػڻڪ ͪڬڵ آء}\\
+\textpali{ԯڰ ԡڢ µԡ }\\
+\usefont{LTH}{loma}{b}{it}
+\textpali{˵ ԡڢ ʵ, ҷҹԡࢻ ڭµ}\\
+\textpali{ ԡڢ}\\
+\textpali{ڢ ʵ}\\
+\textpali{ڢڼʻڨ ػڻڪ ͪڬڵ آء}\\
+\textpali{ԯڰ ԡڢ µԡ }\\
\vfil
@@ -642,6 +829,32 @@ The quick brown fox jumps over the lazy dog.\\
, , , Թ Թ չ չ ѹ -\textyamakkan{} \textfongmun{} \textangkhankhu{} \textkhomut{} - -- --- `` '' ff fi tt ti AV\\
\usefont{LTH}{waree}{b}{it}
, , , Թ Թ չ չ ѹ -\textyamakkan{} \textfongmun{} \textangkhankhu{} \textkhomut{} - -- --- `` '' ff fi tt ti AV\\
+
+\subsection{Һ-ѹʡĵ}
+\usefont{LTH}{waree}{m}{n}
+\textpali{˵ ԡڢ ʵ, ҷҹԡࢻ ڭµ}\\
+\textpali{ ԡڢ}\\
+\textpali{ڢ ʵ}\\
+\textpali{ڢڼʻڨ ػڻڪ ͪڬڵ آء}\\
+\textpali{ԯڰ ԡڢ µԡ }\\
+\usefont{LTH}{waree}{b}{n}
+\textpali{˵ ԡڢ ʵ, ҷҹԡࢻ ڭµ}\\
+\textpali{ ԡڢ}\\
+\textpali{ڢ ʵ}\\
+\textpali{ڢڼʻڨ ػڻڪ ͪڬڵ آء}\\
+\textpali{ԯڰ ԡڢ µԡ }\\
+\usefont{LTH}{waree}{m}{it}
+\textpali{˵ ԡڢ ʵ, ҷҹԡࢻ ڭµ}\\
+\textpali{ ԡڢ}\\
+\textpali{ڢ ʵ}\\
+\textpali{ڢڼʻڨ ػڻڪ ͪڬڵ آء}\\
+\textpali{ԯڰ ԡڢ µԡ }\\
+\usefont{LTH}{waree}{b}{it}
+\textpali{˵ ԡڢ ʵ, ҷҹԡࢻ ڭµ}\\
+\textpali{ ԡڢ}\\
+\textpali{ڢ ʵ}\\
+\textpali{ڢڼʻڨ ػڻڪ ͪڬڵ آء}\\
+\textpali{ԯڰ ԡڢ µԡ }\\
\vfil
@@ -717,6 +930,32 @@ The quick brown fox jumps over the lazy dog.\\
, , , Թ Թ չ չ ѹ -\textyamakkan{} \textfongmun{} \textangkhankhu{} \textkhomut{} - -- --- `` '' ff fi tt ti AV\\
\usefont{LTH}{umpush}{b}{it}
, , , Թ Թ չ չ ѹ -\textyamakkan{} \textfongmun{} \textangkhankhu{} \textkhomut{} - -- --- `` '' ff fi tt ti AV\\
+
+\subsection{Һ-ѹʡĵ}
+\usefont{LTH}{umpush}{m}{n}
+\textpali{˵ ԡڢ ʵ, ҷҹԡࢻ ڭµ}\\
+\textpali{ ԡڢ}\\
+\textpali{ڢ ʵ}\\
+\textpali{ڢڼʻڨ ػڻڪ ͪڬڵ آء}\\
+\textpali{ԯڰ ԡڢ µԡ }\\
+\usefont{LTH}{umpush}{b}{n}
+\textpali{˵ ԡڢ ʵ, ҷҹԡࢻ ڭµ}\\
+\textpali{ ԡڢ}\\
+\textpali{ڢ ʵ}\\
+\textpali{ڢڼʻڨ ػڻڪ ͪڬڵ آء}\\
+\textpali{ԯڰ ԡڢ µԡ }\\
+\usefont{LTH}{umpush}{m}{it}
+\textpali{˵ ԡڢ ʵ, ҷҹԡࢻ ڭµ}\\
+\textpali{ ԡڢ}\\
+\textpali{ڢ ʵ}\\
+\textpali{ڢڼʻڨ ػڻڪ ͪڬڵ آء}\\
+\textpali{ԯڰ ԡڢ µԡ }\\
+\usefont{LTH}{umpush}{b}{it}
+\textpali{˵ ԡڢ ʵ, ҷҹԡࢻ ڭµ}\\
+\textpali{ ԡڢ}\\
+\textpali{ڢ ʵ}\\
+\textpali{ڢڼʻڨ ػڻڪ ͪڬڵ آء}\\
+\textpali{ԯڰ ԡڢ µԡ }\\
\vfil
@@ -792,6 +1031,32 @@ The quick brown fox jumps over the lazy dog.\\
, , , Թ Թ չ չ ѹ -\textyamakkan{} \textfongmun{} \textangkhankhu{} \textkhomut{} - -- --- `` '' ff fi tt ti AV\\
\usefont{LTH}{sawasdee}{b}{it}
, , , Թ Թ չ չ ѹ -\textyamakkan{} \textfongmun{} \textangkhankhu{} \textkhomut{} - -- --- `` '' ff fi tt ti AV\\
+
+\subsection{Һ-ѹʡĵ}
+\usefont{LTH}{sawasdee}{m}{n}
+\textpali{˵ ԡڢ ʵ, ҷҹԡࢻ ڭµ}\\
+\textpali{ ԡڢ}\\
+\textpali{ڢ ʵ}\\
+\textpali{ڢڼʻڨ ػڻڪ ͪڬڵ آء}\\
+\textpali{ԯڰ ԡڢ µԡ }\\
+\usefont{LTH}{sawasdee}{b}{n}
+\textpali{˵ ԡڢ ʵ, ҷҹԡࢻ ڭµ}\\
+\textpali{ ԡڢ}\\
+\textpali{ڢ ʵ}\\
+\textpali{ڢڼʻڨ ػڻڪ ͪڬڵ آء}\\
+\textpali{ԯڰ ԡڢ µԡ }\\
+\usefont{LTH}{sawasdee}{m}{it}
+\textpali{˵ ԡڢ ʵ, ҷҹԡࢻ ڭµ}\\
+\textpali{ ԡڢ}\\
+\textpali{ڢ ʵ}\\
+\textpali{ڢڼʻڨ ػڻڪ ͪڬڵ آء}\\
+\textpali{ԯڰ ԡڢ µԡ }\\
+\usefont{LTH}{sawasdee}{b}{it}
+\textpali{˵ ԡڢ ʵ, ҷҹԡࢻ ڭµ}\\
+\textpali{ ԡڢ}\\
+\textpali{ڢ ʵ}\\
+\textpali{ڢڼʻڨ ػڻڪ ͪڬڵ آء}\\
+\textpali{ԯڰ ԡڢ µԡ }\\
\vfil
diff --git a/Master/texmf-dist/source/latex/thailatex/doc/thai.pdf b/Master/texmf-dist/source/latex/thailatex/doc/thai.pdf
index 2e6f6990e97..273678f4cee 100644
--- a/Master/texmf-dist/source/latex/thailatex/doc/thai.pdf
+++ b/Master/texmf-dist/source/latex/thailatex/doc/thai.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/thailatex/emacs/Makefile.in b/Master/texmf-dist/source/latex/thailatex/emacs/Makefile.in
index 3f6bd052b23..c4fe9023f5b 100644
--- a/Master/texmf-dist/source/latex/thailatex/emacs/Makefile.in
+++ b/Master/texmf-dist/source/latex/thailatex/emacs/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/Master/texmf-dist/source/latex/thailatex/fonts/Makefile.in b/Master/texmf-dist/source/latex/thailatex/fonts/Makefile.in
index 84b31d5d21c..f726740413f 100644
--- a/Master/texmf-dist/source/latex/thailatex/fonts/Makefile.in
+++ b/Master/texmf-dist/source/latex/thailatex/fonts/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/Master/texmf-dist/source/latex/thailatex/fonts/lthuni.enc b/Master/texmf-dist/source/latex/thailatex/fonts/lthuni.enc
index e5c098c4d93..6932ec33844 100644
--- a/Master/texmf-dist/source/latex/thailatex/fonts/lthuni.enc
+++ b/Master/texmf-dist/source/latex/thailatex/fonts/lthuni.enc
@@ -76,8 +76,8 @@
% 0xD0
/uni0E30 /uni0E31 /uni0E32 /uni0E33
/uni0E34 /uni0E35 /uni0E36 /uni0E37
-/uni0E38 /uni0E39 /uni0E3A /.notdef
-/zerowidthspace /.notdef /.notdef /uni0E3F
+/uni0E38 /uni0E39 /uni0E3A /uni0E4D.high
+/zerowidthspace /dottedcircle /uni0E47.high /uni0E3F
% 0xE0
/uni0E40 /uni0E41 /uni0E42 /uni0E43
/uni0E44 /uni0E45 /uni0E46 /uni0E47
diff --git a/Master/texmf-dist/source/latex/thailatex/fonts/thailigs.enc b/Master/texmf-dist/source/latex/thailatex/fonts/thailigs.enc
index 2de09ca3669..6ea87ac3eb2 100644
--- a/Master/texmf-dist/source/latex/thailatex/fonts/thailigs.enc
+++ b/Master/texmf-dist/source/latex/thailatex/fonts/thailigs.enc
@@ -17,11 +17,14 @@
%LIGKERN uni0E1B uni0E39 |=:> uni0E39.left ;
%LIGKERN uni0E1B uni0E3A |=:> uni0E3A.left ;
%LIGKERN uni0E1B uni0E47 |=:> uni0E47.left ;
-%Popla left tone marks
+%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 ;
@@ -35,11 +38,14 @@
%LIGKERN uni0E1D uni0E39 |=:> uni0E39.left ;
%LIGKERN uni0E1D uni0E3A |=:> uni0E3A.left ;
%LIGKERN uni0E1D uni0E47 |=:> uni0E47.left ;
-%FoFa left tone marks
+%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 ;
@@ -53,11 +59,14 @@
%LIGKERN uni0E1F uni0E39 |=:> uni0E39.left ;
%LIGKERN uni0E1F uni0E3A |=:> uni0E3A.left ;
%LIGKERN uni0E1F uni0E47 |=:> uni0E47.left ;
-%FoFan left tone marks
+%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 ;
@@ -71,11 +80,14 @@
%LIGKERN uni0E2C uni0E39 |=:> uni0E39.left ;
%LIGKERN uni0E2C uni0E3A |=:> uni0E3A.left ;
%LIGKERN uni0E2C uni0E47 |=:> uni0E47.left ;
-%LoChula left tone marks
+%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 ;
@@ -120,7 +132,7 @@
%LIGKERN uni0E37 uni0E4B.low |=:> uni0E4B ;
%LIGKERN uni0E37 uni0E4C.low |=:> uni0E4C ;
-%ligature for making LEFT HI tone marks and thantakhad
+%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 ;
@@ -147,7 +159,7 @@
%LIGKERN uni0E34.left uni0E4C.low |=:> uni0E4C.left ;
-%ligature for making LEFT LOW tone marks and thantakhad
+%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 ;
@@ -166,6 +178,28 @@
%LIGKERN uni0E38.left uni0E4C.low |=:> uni0E4C.low_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 ;
@@ -271,8 +305,8 @@
% 0xD0
/uni0E30 /uni0E31 /uni0E32 /uni0E33
/uni0E34 /uni0E35 /uni0E36 /uni0E37
-/uni0E38 /uni0E39 /uni0E3A /.notdef
-/zerowidthspace /.notdef /.notdef /uni0E3F
+/uni0E38 /uni0E39 /uni0E3A /uni0E4D.high
+/zerowidthspace /dottedcircle /uni0E47.high /uni0E3F
% 0xE0
/uni0E40 /uni0E41 /uni0E42 /uni0E43
/uni0E44 /uni0E45 /uni0E46 /uni0E47
diff --git a/Master/texmf-dist/source/latex/thailatex/scripts/Makefile.in b/Master/texmf-dist/source/latex/thailatex/scripts/Makefile.in
index fbe67961e37..2348eb3404e 100644
--- a/Master/texmf-dist/source/latex/thailatex/scripts/Makefile.in
+++ b/Master/texmf-dist/source/latex/thailatex/scripts/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/Master/texmf-dist/source/latex/thailatex/thailatex.spec.in b/Master/texmf-dist/source/latex/thailatex/thailatex.spec.in
deleted file mode 100644
index 24b251ec553..00000000000
--- a/Master/texmf-dist/source/latex/thailatex/thailatex.spec.in
+++ /dev/null
@@ -1,134 +0,0 @@
-%define name thailatex
-%define version @VERSION@
-%define release 1
-%define manifest %{_builddir}/%{name}-%{version}-%{release}.manifest
-
-Summary: Thai extension for LaTeX
-Name: %{name}
-Version: %{version}
-Release: %{release}
-Copyright: freely distributable
-Group: Applications/Publishing
-Source: %{name}-%{version}.tar.gz
-BuildArch: noarch
-BuildRoot: /var/tmp/%{name}-%{version}
-Vendor: Surapant Meknavin <surapan@nectec.or.th>, Theppitak Karoonboonyanan <thep@links.nectec.or.th>, NECTEC
-Packager: Theppitak Karoonboonyanan <thep@links.nectec.or.th>
-Distribution: Linux TLE, Thai Linux Working Group
-Requires: tetex >= 0.9, tetex-dvips >= 0.9
-BuildRequires: tetex >= 0.9, tetex-afm >= 0.9
-
-%description
-
-Thai fonts, style, etc. for publishing Thai documents with LaTeX.
-Thai word segmentation filter which inserts "\wbr " command as Thai word
-delimitor, such as "swath", is recommended to be used as a preprocessor.
-
-%prep
-%setup
-
-%build
-./configure --prefix=/usr
-make
-
-%install
-rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-
-# __os_install_post is implicitly expanded after the
-# install section... do it now, and then disable it,
-# so all work is done before building manifest.
-
-%{?__os_install_post}
-%define __os_install_post %{nil}
-
-# build the file list automagically into %{manifest}
-
-cd $RPM_BUILD_ROOT
-rm -f %{manifest}
-find . -type d \
- | sed '1,2d;s,^\.,\%attr(-\,root\,root) \%dir ,' >> %{manifest}
-find . -type f \
- | sed '/babel.sty/d;/config.ps/d;/pdftex.cfg/d;/site-start.el/d' \
- | sed 's,^\.,\%attr(-\,root\,root) ,' >> %{manifest}
-find . -type l \
- | sed 's,^\.,\%attr(-\,root\,root) ,' >> %{manifest}
-
-%clean
-rm -f %{manifest}
-rm -rf $RPM_BUILD_ROOT
-
-%post
-/usr/sbin/sync-thailatex
-/usr/sbin/sync-babel
-
-%triggerin -- tetex
-/usr/sbin/sync-thailatex
-/usr/sbin/sync-babel
-
-%preun
-if [ "$1" = "0" ]; then # last uninstall only, do not run when upgraded
- /usr/sbin/sync-thailatex
- /usr/sbin/sync-babel
-fi
-
-%files -f %{manifest}
-%defattr(-,root,root)
-#%doc README
-#%docdir
-#%config
-
-%changelog
-* Sun Dec 21 2003 Theppitak Karoonboonyanan <thep@linux.thai.net>
- - use argumentless sync scripts
-
-* Thu Mar 06 2003 Theppitak Karoonboonyanan <thep@linux.thai.net>
- - use the split sync-thailatex and sync-babel scripts separately
- - add preun script for unregistering thailatex at last uninstallation
-
-* Tue Mar 04 2003 Theppitak Karoonboonyanan <thep@linux.thai.net>
- - add tetex-dvips to Requires: (as suggested by Vee Sattayamas)
-
-* Tue Jan 28 2003 Poonlap Veerathanabutr <poonlap@linux.thai.net>
- - fix some comment in spec file which cause problems
-
-* Mon Aug 05 2002 Theppitak Karoonboonyanan <thep@links.nectec.or.th>
- - add BuildRequires
- - add %clean script
- - clear RPM build dir before installing
-
-* Tue Jan 08 2002 Theppitak Karoonboonyanan <thep@links.nectec.or.th>
- - update %post and %postun scripts according to new installing method
- - fix upgrading bug by adding %triggerpostun script to do the %post
- job again, after the %postun script of the older version removed
- every patch. (%post is still needed for rpm -i case.. Hmm.. messy)
- - change %postun to %preun, to be safe about the order of %postun
- of the older package and %triggerpostun of the newer package.
- - incorporate babel.sty patching.
- - split scriptlets into sync-thailatex script.
- - add %triggerin to get synchronized with tetex.
-
-* Wed Dec 05 2001 Theppitak Karoonboonyanan <thep@links.nectec.or.th>
- - use manifest
-
-* Wed Jan 03 2001 Theppitak Karoonboonyanan <thep@links.nectec.or.th>
- - thailatex.spec : use variables for sources, path names; use BuildRoot
-
-* Wed Aug 16 2000 Theppitak Karoonboonyanan <thep@links.nectec.or.th>
- - fix "norasi" "Bluevalues" parameter to fix Acrobat Distiller
- rejection, by Anutara
-
-* Thu May 25 2000 Theppitak Karoonboonyanan <thep@links.nectec.or.th>
- - rearrange package and create Makefiles
- - encoding changed from TIS to LTH, according to TeX convention
- - add "norasi" bold and bold-italic font; correct TeXTIS.enc
- - make "norasi" be Thai roman font, "dbttx" Thai sans serif
- - correct some Thai translations
- - release version 0.2
-
-* Mon Jun 21 1999 Surapant Meknavin <surapan@nectec.or.th>
- - create the original Thai LaTeX extension based on babel package
- - two fonts are available : dbtt (n,bx,i,bi) and nf3x (n,i)
- - release version 0.1
-