summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/doc
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2021-10-21 21:53:45 +0000
committerKarl Berry <karl@freefriends.org>2021-10-21 21:53:45 +0000
commitb02107eda020fcf744cd893cb8157ff030e8b73b (patch)
tree0d19dcb76c6a749c193169f4533c4b2a63debf71 /Master/texmf-dist/doc
parent112eb735b477217c2d39ccb9b81191bbdc28f026 (diff)
cjk 4.8.5
git-svn-id: svn://tug.org/texlive/trunk@60829 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/doc')
-rw-r--r--Master/texmf-dist/doc/latex/cjk/ChangeLog121
-rw-r--r--Master/texmf-dist/doc/latex/cjk/MANIFEST12
-rw-r--r--Master/texmf-dist/doc/latex/cjk/Makefile4
-rw-r--r--Master/texmf-dist/doc/latex/cjk/README8
-rw-r--r--Master/texmf-dist/doc/latex/cjk/doc/CEF.txt2
-rw-r--r--Master/texmf-dist/doc/latex/cjk/doc/CJK.txt2
-rw-r--r--Master/texmf-dist/doc/latex/cjk/doc/CJKnumb.txt4
-rw-r--r--Master/texmf-dist/doc/latex/cjk/doc/CJKspace.txt4
-rw-r--r--Master/texmf-dist/doc/latex/cjk/doc/CJKutf8.txt4
-rw-r--r--Master/texmf-dist/doc/latex/cjk/doc/INSTALL6
-rw-r--r--Master/texmf-dist/doc/latex/cjk/doc/TDS.txt2
-rw-r--r--Master/texmf-dist/doc/latex/cjk/doc/cjk-enc.txt4
-rw-r--r--Master/texmf-dist/doc/latex/cjk/doc/cjk/READMEb5.cjk2
-rw-r--r--Master/texmf-dist/doc/latex/cjk/doc/commands.txt4
-rw-r--r--Master/texmf-dist/doc/latex/cjk/doc/fdxfiles.txt4
-rw-r--r--Master/texmf-dist/doc/latex/cjk/doc/fonts.txt4
-rw-r--r--Master/texmf-dist/doc/latex/cjk/doc/hbf2gf.txt4
-rw-r--r--Master/texmf-dist/doc/latex/cjk/doc/history.2_52
-rw-r--r--Master/texmf-dist/doc/latex/cjk/doc/history.txt27
-rw-r--r--Master/texmf-dist/doc/latex/cjk/doc/pdf/READMEb5.pdfbin395722 -> 409157 bytes
-rw-r--r--Master/texmf-dist/doc/latex/cjk/doc/pdf/READMEgb.pdfbin98996 -> 102016 bytes
-rw-r--r--Master/texmf-dist/doc/latex/cjk/doc/pdfhowto/examples/texinput/Bg5/c00cwtb.fd4
-rw-r--r--Master/texmf-dist/doc/latex/cjk/doc/pdfhowto/examples/texinput/Bg5/c00tmpl.fd4
-rw-r--r--Master/texmf-dist/doc/latex/cjk/doc/pdfhowto/examples/texinput/GB/c10tmpl.fd4
-rw-r--r--Master/texmf-dist/doc/latex/cjk/doc/pdfhowto/examples/texinput/JIS/c40tmpl.fd4
-rw-r--r--Master/texmf-dist/doc/latex/cjk/doc/pdfhowto/examples/texinput/SJIS/c49tmpl.fd4
-rw-r--r--Master/texmf-dist/doc/latex/cjk/doc/pinyin.txt4
-rw-r--r--Master/texmf-dist/doc/latex/cjk/doc/pyhyphen.txt94
-rw-r--r--Master/texmf-dist/doc/latex/cjk/doc/reftex.txt4
-rw-r--r--Master/texmf-dist/doc/latex/cjk/doc/ruby.txt2
-rw-r--r--Master/texmf-dist/doc/latex/cjk/doc/thaifont.txt6
-rw-r--r--Master/texmf-dist/doc/latex/cjk/doc/vertical.txt4
-rw-r--r--Master/texmf-dist/doc/latex/cjk/examples/Big5.tex4
-rw-r--r--Master/texmf-dist/doc/latex/cjk/examples/Big5vert.tex4
-rw-r--r--Master/texmf-dist/doc/latex/cjk/examples/CEF_test.tex4
-rw-r--r--Master/texmf-dist/doc/latex/cjk/examples/CJKbabel.tex11
-rw-r--r--Master/texmf-dist/doc/latex/cjk/examples/CJKfntef.tex2
-rw-r--r--Master/texmf-dist/doc/latex/cjk/examples/CJKmixed.tex8
-rw-r--r--Master/texmf-dist/doc/latex/cjk/examples/CJKspace.tex2
-rw-r--r--Master/texmf-dist/doc/latex/cjk/examples/CJKutf8.tex13
-rw-r--r--Master/texmf-dist/doc/latex/cjk/examples/GB.tex2
-rw-r--r--Master/texmf-dist/doc/latex/cjk/examples/JIS.tex2
-rw-r--r--Master/texmf-dist/doc/latex/cjk/examples/KS.tex2
-rw-r--r--Master/texmf-dist/doc/latex/cjk/examples/SJIS.tex2
-rw-r--r--Master/texmf-dist/doc/latex/cjk/examples/UTF8.tex2
-rw-r--r--Master/texmf-dist/doc/latex/cjk/examples/cjk/Big5.cjk6
-rw-r--r--Master/texmf-dist/doc/latex/cjk/examples/cjk/Big5vert.cjk6
-rw-r--r--Master/texmf-dist/doc/latex/cjk/examples/cjk/CEF_test.cjk6
-rw-r--r--Master/texmf-dist/doc/latex/cjk/examples/cjk/CJKbabel.cjk11
-rw-r--r--Master/texmf-dist/doc/latex/cjk/examples/cjk/SJIS.cjk4
-rw-r--r--Master/texmf-dist/doc/latex/cjk/examples/cjk/muletest.cjk5
-rw-r--r--Master/texmf-dist/doc/latex/cjk/examples/cjk/rubytest.cjk2
-rw-r--r--Master/texmf-dist/doc/latex/cjk/examples/cjk/thai.cjk2
-rw-r--r--Master/texmf-dist/doc/latex/cjk/examples/muletest.tex5
-rw-r--r--Master/texmf-dist/doc/latex/cjk/examples/pdf/Big5.pdfbin50309 -> 50939 bytes
-rw-r--r--Master/texmf-dist/doc/latex/cjk/examples/pdf/Big5vert.pdfbin51375 -> 52091 bytes
-rw-r--r--Master/texmf-dist/doc/latex/cjk/examples/pdf/CEF_test.pdfbin7064 -> 7912 bytes
-rw-r--r--Master/texmf-dist/doc/latex/cjk/examples/pdf/CJKbabel.pdfbin192008 -> 195293 bytes
-rw-r--r--Master/texmf-dist/doc/latex/cjk/examples/pdf/CJKfntef.pdfbin33090 -> 34952 bytes
-rw-r--r--Master/texmf-dist/doc/latex/cjk/examples/pdf/CJKmixed.pdfbin67977 -> 69510 bytes
-rw-r--r--Master/texmf-dist/doc/latex/cjk/examples/pdf/CJKspace.pdfbin36920 -> 38646 bytes
-rw-r--r--Master/texmf-dist/doc/latex/cjk/examples/pdf/CJKutf8.pdfbin181416 -> 184585 bytes
-rw-r--r--Master/texmf-dist/doc/latex/cjk/examples/pdf/GB.pdfbin45543 -> 46183 bytes
-rw-r--r--Master/texmf-dist/doc/latex/cjk/examples/pdf/JIS.pdfbin25624 -> 26528 bytes
-rw-r--r--Master/texmf-dist/doc/latex/cjk/examples/pdf/KS.pdfbin25196 -> 26261 bytes
-rw-r--r--Master/texmf-dist/doc/latex/cjk/examples/pdf/SJIS.pdfbin25630 -> 26525 bytes
-rw-r--r--Master/texmf-dist/doc/latex/cjk/examples/pdf/UTF8.pdfbin13764 -> 13772 bytes
-rw-r--r--Master/texmf-dist/doc/latex/cjk/examples/pdf/muletest.pdfbin176318 -> 179315 bytes
-rw-r--r--Master/texmf-dist/doc/latex/cjk/examples/pdf/py_test.pdfbin17205 -> 20715 bytes
-rw-r--r--Master/texmf-dist/doc/latex/cjk/examples/pdf/pytest.pdfbin5802 -> 6298 bytes
-rw-r--r--Master/texmf-dist/doc/latex/cjk/examples/pdf/rubytest.pdfbin22182 -> 22790 bytes
-rw-r--r--Master/texmf-dist/doc/latex/cjk/examples/pdf/thai.pdfbin12567 -> 13328 bytes
-rw-r--r--Master/texmf-dist/doc/latex/cjk/examples/pdf/thai_utf8.pdfbin12563 -> 13328 bytes
-rw-r--r--Master/texmf-dist/doc/latex/cjk/examples/py_test.tex2
-rw-r--r--Master/texmf-dist/doc/latex/cjk/examples/rubytest.tex2
-rw-r--r--Master/texmf-dist/doc/latex/cjk/examples/thai.tex2
-rw-r--r--Master/texmf-dist/doc/latex/cjk/examples/thai_utf8.tex43
-rwxr-xr-xMaster/texmf-dist/doc/latex/cjk/texlive/bin-cjkutils.pl6
-rwxr-xr-xMaster/texmf-dist/doc/latex/cjk/texlive/c90.pl2
-rwxr-xr-xMaster/texmf-dist/doc/latex/cjk/texlive/cjk-build.pl2
-rwxr-xr-xMaster/texmf-dist/doc/latex/cjk/texlive/cjk.pl6
-rwxr-xr-xMaster/texmf-dist/doc/latex/cjk/texlive/dnp.pl2
-rwxr-xr-xMaster/texmf-dist/doc/latex/cjk/texlive/garuda-c90.pl2
-rwxr-xr-xMaster/texmf-dist/doc/latex/cjk/texlive/norasi-c90.pl2
-rw-r--r--Master/texmf-dist/doc/latex/cjk/utils/pyhyphen/pytest.tex42
-rw-r--r--Master/texmf-dist/doc/latex/cjk/utils/pyhyphen/pytestutf8.tex68
86 files changed, 475 insertions, 165 deletions
diff --git a/Master/texmf-dist/doc/latex/cjk/ChangeLog b/Master/texmf-dist/doc/latex/cjk/ChangeLog
index f943ead7ea7..d5563c1f7b0 100644
--- a/Master/texmf-dist/doc/latex/cjk/ChangeLog
+++ b/Master/texmf-dist/doc/latex/cjk/ChangeLog
@@ -1,3 +1,120 @@
+2021-10-16 Werner LEMBERG <wl@gnu.org>
+
+ Version 4.8.5 released
+ ======================
+
+ Set version to 4.8.5.
+
+ * doc/history.txt: Updated.
+
+ Update headers in all text files.
+
+2021-10-16 Werner LEMBERG <wl@gnu.org>
+
+ [hbf2gf] Update config and auxiliary scripts.
+
+ * utils/hbf2gf/config.guess, utils/hbf2gf/config.sub,
+ utils/hbf2gf/install-sh, utils/hbf2gf/mkinstalldirs: Updated to
+ current versions.
+
+ * utils/hbf2gf/configure: Regenerated with autoconf 2.71.
+
+2021-10-16 Werner Lemberg <wl@gnu.org>
+
+ Update to current LaTeX version.
+
+ Currently, there is a first-aid patch in the LaTeX kernel to make
+ the CJK package work. This commit moves the corresponding code to
+ here so that the first-aid stuff can be removed.
+
+ * texinput/CJK.sty (\IfFormatAtLeastTF): New macro.
+ (\selectfont): Use the `\selectfont' hook for recent LaTeX versions.
+
+2018-11-25 Werner Lemberg <wl@gnu.org>
+
+ Generate pinyin hyphenation pattern files from last commit.
+
+ * utils/pyhyphen/hyph-zh-latn-pinyin.tex,
+ utils/pyhyphen/hyph-zh-latn-tonepinyin.tex: New files.
+
+2018-11-25 Werner Lemberg <wl@gnu.org>
+
+ Rewrite pinyin hyphenation support.
+
+ Investigation has shown that the apostrophe before a syllable
+ starting with `a', `e', or `o' should vanish if a line break occurs.
+ This commit fixes this bug: The apostrophe should now be entered
+ with the Babel shorthand "'; character ' itself is no longer part of
+ the hyphenation patterns.
+
+ It also adds support for pinyin syllables with tone markers, to be
+ used with Unicode engines like XeTeX or luatex.
+
+ Finally, the license for the resulting pattern files have been
+ changed from GPL to MIT to allow broader usage.
+
+ * utils/pyhyphen/GNUmakefile: New file. Saying `make' will generate
+ the hyphenation pattern files `hyph-zh-latn-pinyin.tex' and
+ `hyph-zh-latn-tonepinyin.tex'.
+
+ * utils/pyhyphen/hyph-zh-latn-pinyin.in,
+ utils/pyhyphen/make-patterns.sh: New auxiliary files.
+
+ * utils/pyhyphen/pyhyph.tex: Removed. Obsolete.
+
+ * utils/pyhyphen/pytestutf8.tex: New file to demonstrate patterns
+ for tone pinyin.
+
+ * utils/pyhyphen/pinyin.c, utils/pyhyphen/pinyin.ldf,
+ utils/pyhyphen/pinyin.tr, utils/pytest.tex: Updated.
+
+ * doc/pyhyphen.txt, MANIFEST: Updated.
+
+2016-12-27 Werner Lemberg <wl@gnu.org>
+
+ * utils/lisp/emacs/cjk-enc.el (cjk-coding): Remove `chinese-big5'.
+
+ Hin-Tak reports this doesn't work...
+
+2016-12-26 Hin-Tak Leung <htl10@users.sourceforge.net>
+
+ [cjk-enc.el] Updated to work with Emacs 25 and later.
+
+ In batch mode, `message' in Emacs 25+ obeys coding-system-for-write.
+
+ http://git.savannah.gnu.org/cgit/emacs.git/commit/?h=emacs-25&id=c63246628461f748d66a8a07ba008de2e00fd33a
+
+ `cjk-encode' can mis-behave and, at worst, crash from `message'
+ recursing.
+
+ https://debbugs.gnu.org/cgi/bugreport.cgi?bug=25203
+
+ The charset priority system introduced with Emacs 23+ changes
+ further in Emacs 25+. Charset `big5' has been updated (together
+ with `big5-hkscs') and now takes priority over the historical
+ `chinese-big5-2' and `chinese-big5-1'.
+
+ http://git.savannah.gnu.org/cgit/emacs.git/commit/?h=emacs-25&id=9f89ea1f84dbf708228ced0202774b36f30f2b01
+ http://git.savannah.gnu.org/cgit/emacs.git/commit/?h=emacs-25&id=49fa1919e9be863f22ec8042704bf3436d0ec26d
+
+ Also worth noting is that, "Wrote output.cjk" is no longer seen with
+ Emacs 25+.
+
+ http://git.savannah.gnu.org/cgit/emacs.git/commit/?h=emacs-25&id=d20f82e6f1ab902469723ebd530ca21bea9cc41b
+
+ Tested against example/{Big5.tex, Big5vert.tex, CJKbabel.tex,
+ muletest.tex, rubytest.tex, thai.tex}, and LANG'ed non-'coding:'ed
+ big5 example, with emacs 21.4, 22.3, 23.3, 24.5 and 25.1.
+
+ Thanks for advice from Eli Zaretskii.
+
+ * utils/lisp/emacs/cjk-enc.el (cjk-enc-table,
+ cjk-format-spec-table): Add `big5' encoding.
+ (cjk-coding): Add `chinese-big5'.
+ (cjk-encode): Adjust Big5 language detection heuristics for Emacs
+ 25+; support `big5' encoding.
+ Use `terminal-coding-system' while emitting messages.
+
2015-04-18 Werner LEMBERG <wl@gnu.org>
Version 4.8.4 released
@@ -47,7 +164,7 @@
This finally works due to the recent lgrx package which delivers
good Babel UTF8 support for LGR encoding.
- An unsolved problem yet, however, is proper cut-and-paste support.
+ An unsolved problem yet, however, is proper cut-and-paste support.
While dvipdfmx properly generates CMaps for CJK encodings (even
for virtual fonts which pdftex doesn't handle at all), it doesn't
handle encodings like LGR correctly, something the `cmap' package
@@ -181,7 +298,7 @@
original charset is preserved in the text property `charset'.
Another change is the new charset/text-property called `tis620-2533'
- (a superset of `ascii' and `thai-tis620'), introduced in emacs 23.
+ (a superset of `ascii' and `thai-tis620'), introduced in emacs 23.
This has the tendency of swallowing up every ASCII character and
goes into an infinite loop with `examples/thai.tex', so we have to
handle this also.
diff --git a/Master/texmf-dist/doc/latex/cjk/MANIFEST b/Master/texmf-dist/doc/latex/cjk/MANIFEST
index 14d9e3d5013..cd56d518bcd 100644
--- a/Master/texmf-dist/doc/latex/cjk/MANIFEST
+++ b/Master/texmf-dist/doc/latex/cjk/MANIFEST
@@ -1,4 +1,4 @@
-Copyright (C) 1994-2015 Werner Lemberg <wl@gnu.org>
+Copyright (C) 1994-2021 Werner Lemberg <wl@gnu.org>
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
@@ -25,6 +25,7 @@ The CJK package contains the following files:
MANIFEST
Makefile
README
+ TODO
contrib/wadalab/DNP.sfd
contrib/wadalab/c42goth.fd
contrib/wadalab/c42goth.fdx
@@ -310,6 +311,7 @@ The CJK package contains the following files:
texinput/thai/c90gar.fd
texinput/thai/c90nrsr.fd
texinput/thai/thaicjk.ldf
+ texlive/README
texlive/bin-cjkutils.pl
texlive/c63mj.fd
texlive/c64mj.fd
@@ -320,7 +322,6 @@ The CJK package contains the following files:
texlive/dnp.pl
texlive/garuda-c90.pl
texlive/norasi-c90.pl
- texlive/README
utils/Bg5conv/bg5conv.1
utils/Bg5conv/bg5conv.c
utils/Bg5conv/bg5conv.w
@@ -421,11 +422,16 @@ The CJK package contains the following files:
utils/lisp/emacs/cjk-enc.el
utils/lisp/emacs/thai-word.el
utils/lisp/mule-2.3/cjk-enc.el
+ utils/pyhyphen/GNUmakefile
+ utils/pyhyphen/hyph-zh-latn-pinyin.in
+ utils/pyhyphen/hyph-zh-latn-pinyin.tex
+ utils/pyhyphen/hyph-zh-latn-tonepinyin.tex
+ utils/pyhyphen/make-patterns.sh
utils/pyhyphen/pinyin.c
utils/pyhyphen/pinyin.ldf
utils/pyhyphen/pinyin.tr
- utils/pyhyphen/pyhyph.tex
utils/pyhyphen/pytest.tex
+ utils/pyhyphen/pytestutf8.tex
utils/subfonts/clonevf.pl
utils/subfonts/hlatex2agl.pl
utils/subfonts/makefdx.pl
diff --git a/Master/texmf-dist/doc/latex/cjk/Makefile b/Master/texmf-dist/doc/latex/cjk/Makefile
index d80bb6fb3aa..bb2d1e07539 100644
--- a/Master/texmf-dist/doc/latex/cjk/Makefile
+++ b/Master/texmf-dist/doc/latex/cjk/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1994-2015 Werner Lemberg <wl@gnu.org>
+# Copyright (C) 1994-2021 Werner Lemberg <wl@gnu.org>
#
# 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
@@ -33,7 +33,7 @@
# o The TeXLive version of some font definition files are used (in the
# `texlive' subdirectory).
-version=4.8.4
+version=4.8.5
distdir=cjk-$(version)
abs-distdir=$(shell pwd)/$(distdir)
diff --git a/Master/texmf-dist/doc/latex/cjk/README b/Master/texmf-dist/doc/latex/cjk/README
index cf33f17eb75..17f44a66d94 100644
--- a/Master/texmf-dist/doc/latex/cjk/README
+++ b/Master/texmf-dist/doc/latex/cjk/README
@@ -1,4 +1,4 @@
-Welcome to CJK version 4.8.4 (18-Apr-2015), a LaTeX2e macro package which
+Welcome to CJK version 4.8.5 (16-Oct-2021), a LaTeX2e macro package which
enables the use of CJK scripts (Chinese/Japanese/Korean) in various
encodings, written by Werner Lemberg <wl@gnu.org>.
@@ -17,7 +17,7 @@ also provides snapshots.
The home site of the CJK package is
- http://cjk.ffii.org
+ http://www.nongnu.org/cjk
Additionally, the latest non-development version can be found on all CTAN
hosts and its mirrors in the directory <CTAN>/language/chinese.
@@ -25,8 +25,8 @@ hosts and its mirrors in the directory <CTAN>/language/chinese.
The package comes in two parts:
- cjk-4.8.4.tar.gz: The source files. Needed for all platforms.
- cjk-4.8.4-doc.tar.gz: Preformatted documentation files: DVI, PS,
+ cjk-4.8.5.tar.gz: The source files. Needed for all platforms.
+ cjk-4.8.5-doc.tar.gz: Preformatted documentation files: DVI, PS,
output from cjk-enc.el, etc.
Note that on CTAN and its mirrors, the `src' archive is unpacked; you must
diff --git a/Master/texmf-dist/doc/latex/cjk/doc/CEF.txt b/Master/texmf-dist/doc/latex/cjk/doc/CEF.txt
index 48571c64aca..0cc2bccfd54 100644
--- a/Master/texmf-dist/doc/latex/cjk/doc/CEF.txt
+++ b/Master/texmf-dist/doc/latex/cjk/doc/CEF.txt
@@ -1,4 +1,4 @@
-This is the file CEF.txt of the CJK macro package ver. 4.8.4 (18-Apr-2015).
+This is the file CEF.txt of the CJK macro package ver. 4.8.5 (16-Oct-2021).
The Chinese Encoding Framework (CEF)
------------------------------------
diff --git a/Master/texmf-dist/doc/latex/cjk/doc/CJK.txt b/Master/texmf-dist/doc/latex/cjk/doc/CJK.txt
index 1432ae81be8..fe1660bbc81 100644
--- a/Master/texmf-dist/doc/latex/cjk/doc/CJK.txt
+++ b/Master/texmf-dist/doc/latex/cjk/doc/CJK.txt
@@ -1,5 +1,5 @@
-This is the LaTeX2e style package CJK Version 4.8.4 (18-Apr-2015)
+This is the LaTeX2e style package CJK Version 4.8.5 (16-Oct-2021)
=================================================================
It is freely distributable under the GNU Public License.
diff --git a/Master/texmf-dist/doc/latex/cjk/doc/CJKnumb.txt b/Master/texmf-dist/doc/latex/cjk/doc/CJKnumb.txt
index 5f0ca179f21..16723f8bc09 100644
--- a/Master/texmf-dist/doc/latex/cjk/doc/CJKnumb.txt
+++ b/Master/texmf-dist/doc/latex/cjk/doc/CJKnumb.txt
@@ -1,5 +1,5 @@
-This is the file CJKnumb.txt of the CJK macro package ver. 4.8.4
-(18-Apr-2015).
+This is the file CJKnumb.txt of the CJK macro package ver. 4.8.5
+(16-Oct-2021).
CJKnumb.sty
------------
diff --git a/Master/texmf-dist/doc/latex/cjk/doc/CJKspace.txt b/Master/texmf-dist/doc/latex/cjk/doc/CJKspace.txt
index 6743c3b0494..87d2a7e621f 100644
--- a/Master/texmf-dist/doc/latex/cjk/doc/CJKspace.txt
+++ b/Master/texmf-dist/doc/latex/cjk/doc/CJKspace.txt
@@ -1,5 +1,5 @@
-This is the file CJKspace.txt of the CJK macro package ver. 4.8.4
-(18-Apr-2015).
+This is the file CJKspace.txt of the CJK macro package ver. 4.8.5
+(16-Oct-2021).
CJKspace.sty
------------
diff --git a/Master/texmf-dist/doc/latex/cjk/doc/CJKutf8.txt b/Master/texmf-dist/doc/latex/cjk/doc/CJKutf8.txt
index f244d233bbc..c0c6f2c8f48 100644
--- a/Master/texmf-dist/doc/latex/cjk/doc/CJKutf8.txt
+++ b/Master/texmf-dist/doc/latex/cjk/doc/CJKutf8.txt
@@ -1,5 +1,5 @@
-This is the file CJKutf8.txt of the CJK macro package ver. 4.8.4
-(18-Apr-2015).
+This is the file CJKutf8.txt of the CJK macro package ver. 4.8.5
+(16-Oct-2021).
CJKutf8.sty
-----------
diff --git a/Master/texmf-dist/doc/latex/cjk/doc/INSTALL b/Master/texmf-dist/doc/latex/cjk/doc/INSTALL
index 6707649932c..396187f01eb 100644
--- a/Master/texmf-dist/doc/latex/cjk/doc/INSTALL
+++ b/Master/texmf-dist/doc/latex/cjk/doc/INSTALL
@@ -1,4 +1,4 @@
-This is the file INSTALL of the CJK macro package ver. 4.8.4 (18-Apr-2015).
+This is the file INSTALL of the CJK macro package ver. 4.8.5 (16-Oct-2021).
Installation Guide
==================
@@ -624,11 +624,11 @@ How to get CJK and related software
. The documentation bundle of the CJK package is not unpackaged; download it
as
- get cjk-4.8.4-doc.tar.gz
+ get cjk-4.8.5-doc.tar.gz
or
- get cjk-4.8.4-doc.tar.gz cjkdoc.tgz
+ get cjk-4.8.5-doc.tar.gz cjkdoc.tgz
whatever is appropriate for your system. It contains precompiled versions
(in DVI, PDF, text format) of all documentation and example files.
diff --git a/Master/texmf-dist/doc/latex/cjk/doc/TDS.txt b/Master/texmf-dist/doc/latex/cjk/doc/TDS.txt
index 81bba5d650c..2473659bc85 100644
--- a/Master/texmf-dist/doc/latex/cjk/doc/TDS.txt
+++ b/Master/texmf-dist/doc/latex/cjk/doc/TDS.txt
@@ -1,4 +1,4 @@
-This is the file TDS.txt of the CJK macro package ver. 4.8.4 (18-Apr-2015).
+This is the file TDS.txt of the CJK macro package ver. 4.8.5 (16-Oct-2021).
The TeX Directory Structure (TDS)
---------------------------------
diff --git a/Master/texmf-dist/doc/latex/cjk/doc/cjk-enc.txt b/Master/texmf-dist/doc/latex/cjk/doc/cjk-enc.txt
index 5297236e355..67ad57fc4f8 100644
--- a/Master/texmf-dist/doc/latex/cjk/doc/cjk-enc.txt
+++ b/Master/texmf-dist/doc/latex/cjk/doc/cjk-enc.txt
@@ -1,5 +1,5 @@
-This is the file cjk-enc.txt of the CJK macro package ver. 4.8.4
-(18-Apr-2015).
+This is the file cjk-enc.txt of the CJK macro package ver. 4.8.5
+(16-Oct-2021).
cjk-enc.el
----------
diff --git a/Master/texmf-dist/doc/latex/cjk/doc/cjk/READMEb5.cjk b/Master/texmf-dist/doc/latex/cjk/doc/cjk/READMEb5.cjk
index 03c4332306c..fbe2a4ea319 100644
--- a/Master/texmf-dist/doc/latex/cjk/doc/cjk/READMEb5.cjk
+++ b/Master/texmf-dist/doc/latex/cjk/doc/cjk/READMEb5.cjk
@@ -1,4 +1,4 @@
-\def\CJKpreproc{bg5conv (CJK ver. 4.8.3)}%%% The file READMEb5.tex . This file is part of LaTeX2e CJK package.
+\def\CJKpreproc{bg5conv (CJK ver. 4.8.4)}%%% The file READMEb5.tex . This file is part of LaTeX2e CJK package.
%%%
%%% Note that this document is a very first version. Therefore, lots
%%% of installation steps and issues are still left blank. Please be
diff --git a/Master/texmf-dist/doc/latex/cjk/doc/commands.txt b/Master/texmf-dist/doc/latex/cjk/doc/commands.txt
index 1ece44b5eeb..0cfba3263ee 100644
--- a/Master/texmf-dist/doc/latex/cjk/doc/commands.txt
+++ b/Master/texmf-dist/doc/latex/cjk/doc/commands.txt
@@ -1,5 +1,5 @@
-This is the file commands.txt of the CJK macro package ver. 4.8.4
-(18-Apr-2015).
+This is the file commands.txt of the CJK macro package ver. 4.8.5
+(16-Oct-2021).
Here is a list of all commands of CJK.
diff --git a/Master/texmf-dist/doc/latex/cjk/doc/fdxfiles.txt b/Master/texmf-dist/doc/latex/cjk/doc/fdxfiles.txt
index c4bdffa8034..cc60d089486 100644
--- a/Master/texmf-dist/doc/latex/cjk/doc/fdxfiles.txt
+++ b/Master/texmf-dist/doc/latex/cjk/doc/fdxfiles.txt
@@ -1,5 +1,5 @@
-This is the file fdxfiles.txt of the CJK macro package ver. 4.8.4
-(18-Apr-2015).
+This is the file fdxfiles.txt of the CJK macro package ver. 4.8.5
+(16-Oct-2021).
Extended font definition files
diff --git a/Master/texmf-dist/doc/latex/cjk/doc/fonts.txt b/Master/texmf-dist/doc/latex/cjk/doc/fonts.txt
index b68a82838fd..0e07dcd46bf 100644
--- a/Master/texmf-dist/doc/latex/cjk/doc/fonts.txt
+++ b/Master/texmf-dist/doc/latex/cjk/doc/fonts.txt
@@ -1,5 +1,5 @@
-This is the file fonts.txt of the CJK macro package ver. 4.8.4
-(18-Apr-2015).
+This is the file fonts.txt of the CJK macro package ver. 4.8.5
+(16-Oct-2021).
The fonts
---------
diff --git a/Master/texmf-dist/doc/latex/cjk/doc/hbf2gf.txt b/Master/texmf-dist/doc/latex/cjk/doc/hbf2gf.txt
index 1ebc4e2ccc5..6484a8c2367 100644
--- a/Master/texmf-dist/doc/latex/cjk/doc/hbf2gf.txt
+++ b/Master/texmf-dist/doc/latex/cjk/doc/hbf2gf.txt
@@ -1,5 +1,5 @@
-This is the file hbf2gf.txt of the CJK macro package ver. 4.8.4
-(18-Apr-2015).
+This is the file hbf2gf.txt of the CJK macro package ver. 4.8.5
+(16-Oct-2021).
Using hbf2gf
-------------
diff --git a/Master/texmf-dist/doc/latex/cjk/doc/history.2_5 b/Master/texmf-dist/doc/latex/cjk/doc/history.2_5
index a9d29ef4c42..b09d60ea460 100644
--- a/Master/texmf-dist/doc/latex/cjk/doc/history.2_5
+++ b/Master/texmf-dist/doc/latex/cjk/doc/history.2_5
@@ -1,4 +1,4 @@
-This file is part of the CJK package Ver. 4.8.4 (18-Apr-2015).
+This file is part of the CJK package Ver. 4.8.5 (16-Oct-2021).
The history of the beta versions of the never released version 2.5 .
--------------------------------------------------------------------
diff --git a/Master/texmf-dist/doc/latex/cjk/doc/history.txt b/Master/texmf-dist/doc/latex/cjk/doc/history.txt
index ca35f64de5f..d29a1807837 100644
--- a/Master/texmf-dist/doc/latex/cjk/doc/history.txt
+++ b/Master/texmf-dist/doc/latex/cjk/doc/history.txt
@@ -1546,4 +1546,31 @@ Version 4.8.4:
In \Unicode, fix conditional to allow line breaks.
+Version 4.8.5:
+16-Oct-2021
+ new:
+ Hyphenation patterns for pinyin syllables:
+ The patterns have been extended to cover accented pinyin
+ syllables, too.
+
+ [Pinyin patterns are distributed via the `tex-hyphen'
+ package and are by default activated in TeXLive.]
+
+ errors:
+ CJK.sty:
+ Make it work with recent LaTeX versions. Note, however,
+ that this problem was not visible to the end user since
+ the LaTeX kernel contained a first-aid fix to circumvent
+ the issue.
+
+ cjk-enc.el:
+ Make it work with Emacs 25 and later.
+
+ Hyphenation patterns for pinyin syllables:
+ Investigation has shown that the apostrophe before a
+ syllable starting with `a', `e', or `o' should vanish if
+ a line break occurs. Consequently, character ' is no
+ longer part of the hyphenation patterns. The apostrophe
+ should now be entered with the Babel shorthand "'.
+
---End of history.txt---
diff --git a/Master/texmf-dist/doc/latex/cjk/doc/pdf/READMEb5.pdf b/Master/texmf-dist/doc/latex/cjk/doc/pdf/READMEb5.pdf
index ee692405633..a686b9b7629 100644
--- a/Master/texmf-dist/doc/latex/cjk/doc/pdf/READMEb5.pdf
+++ b/Master/texmf-dist/doc/latex/cjk/doc/pdf/READMEb5.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/cjk/doc/pdf/READMEgb.pdf b/Master/texmf-dist/doc/latex/cjk/doc/pdf/READMEgb.pdf
index 109dd90c956..88570eb8d09 100644
--- a/Master/texmf-dist/doc/latex/cjk/doc/pdf/READMEgb.pdf
+++ b/Master/texmf-dist/doc/latex/cjk/doc/pdf/READMEgb.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/cjk/doc/pdfhowto/examples/texinput/Bg5/c00cwtb.fd b/Master/texmf-dist/doc/latex/cjk/doc/pdfhowto/examples/texinput/Bg5/c00cwtb.fd
index 8cc9004f21a..d7ff990e8bf 100644
--- a/Master/texmf-dist/doc/latex/cjk/doc/pdfhowto/examples/texinput/Bg5/c00cwtb.fd
+++ b/Master/texmf-dist/doc/latex/cjk/doc/pdfhowto/examples/texinput/Bg5/c00cwtb.fd
@@ -1,6 +1,6 @@
% This is the file c00cwtb.fd of the CJK package
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c00cwtb.fd}[\filedate\space\fileversion]
\DeclareFontFamily{C00}{cwtb}{\hyphenchar \font\m@ne}
diff --git a/Master/texmf-dist/doc/latex/cjk/doc/pdfhowto/examples/texinput/Bg5/c00tmpl.fd b/Master/texmf-dist/doc/latex/cjk/doc/pdfhowto/examples/texinput/Bg5/c00tmpl.fd
index e61183c4435..8881d699744 100644
--- a/Master/texmf-dist/doc/latex/cjk/doc/pdfhowto/examples/texinput/Bg5/c00tmpl.fd
+++ b/Master/texmf-dist/doc/latex/cjk/doc/pdfhowto/examples/texinput/Bg5/c00tmpl.fd
@@ -1,6 +1,6 @@
% This is the file c00tmpl.fd of the CJK package
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c00tmpl.fd}[\filedate\space\fileversion]
\DeclareFontFamily{C00}{tmpl}{\hyphenchar \font\m@ne}
diff --git a/Master/texmf-dist/doc/latex/cjk/doc/pdfhowto/examples/texinput/GB/c10tmpl.fd b/Master/texmf-dist/doc/latex/cjk/doc/pdfhowto/examples/texinput/GB/c10tmpl.fd
index aa2ad661932..3f1aea21d7e 100644
--- a/Master/texmf-dist/doc/latex/cjk/doc/pdfhowto/examples/texinput/GB/c10tmpl.fd
+++ b/Master/texmf-dist/doc/latex/cjk/doc/pdfhowto/examples/texinput/GB/c10tmpl.fd
@@ -1,6 +1,6 @@
% This is the file c10tmpl.fd of the CJK package
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c10tmpl.fd}[\filedate\space\fileversion]
\DeclareFontFamily{C10}{tmpl}{\hyphenchar \font\m@ne}
diff --git a/Master/texmf-dist/doc/latex/cjk/doc/pdfhowto/examples/texinput/JIS/c40tmpl.fd b/Master/texmf-dist/doc/latex/cjk/doc/pdfhowto/examples/texinput/JIS/c40tmpl.fd
index 5b6efbd6f56..d1d15459fca 100644
--- a/Master/texmf-dist/doc/latex/cjk/doc/pdfhowto/examples/texinput/JIS/c40tmpl.fd
+++ b/Master/texmf-dist/doc/latex/cjk/doc/pdfhowto/examples/texinput/JIS/c40tmpl.fd
@@ -1,6 +1,6 @@
% This is the file c40tmpl.fd of the CJK package
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c40tmpl.fd}[\filedate\space\fileversion]
\DeclareFontFamily{C40}{tmpl}{\hyphenchar \font\m@ne}
diff --git a/Master/texmf-dist/doc/latex/cjk/doc/pdfhowto/examples/texinput/SJIS/c49tmpl.fd b/Master/texmf-dist/doc/latex/cjk/doc/pdfhowto/examples/texinput/SJIS/c49tmpl.fd
index 2e844d102f5..498f136f4dd 100644
--- a/Master/texmf-dist/doc/latex/cjk/doc/pdfhowto/examples/texinput/SJIS/c49tmpl.fd
+++ b/Master/texmf-dist/doc/latex/cjk/doc/pdfhowto/examples/texinput/SJIS/c49tmpl.fd
@@ -1,6 +1,6 @@
% This is the file c49song.fd of the CJK package
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c49song.fd}[\filedate\space\fileversion]
\DeclareFontFamily{C49}{song}{\hyphenchar \font\m@ne}
diff --git a/Master/texmf-dist/doc/latex/cjk/doc/pinyin.txt b/Master/texmf-dist/doc/latex/cjk/doc/pinyin.txt
index 3cd92184d41..326202899e4 100644
--- a/Master/texmf-dist/doc/latex/cjk/doc/pinyin.txt
+++ b/Master/texmf-dist/doc/latex/cjk/doc/pinyin.txt
@@ -1,5 +1,5 @@
-This is the file pinyin.txt of the CJK macro package ver. 4.8.4
-(18-Apr-2015).
+This is the file pinyin.txt of the CJK macro package ver. 4.8.5
+(16-Oct-2021).
pinyin.sty
----------
diff --git a/Master/texmf-dist/doc/latex/cjk/doc/pyhyphen.txt b/Master/texmf-dist/doc/latex/cjk/doc/pyhyphen.txt
index b742c8758c1..63e68dce323 100644
--- a/Master/texmf-dist/doc/latex/cjk/doc/pyhyphen.txt
+++ b/Master/texmf-dist/doc/latex/cjk/doc/pyhyphen.txt
@@ -1,8 +1,8 @@
-This is the file pyhyphen.txt of the CJK macro package ver. 4.8.4
-(18-Apr-2015).
+This is the file pyhyphen.txt of the CJK macro package ver. 4.8.5
+(16-Oct-2021).
-Hyphenation patterns for unaccented pinyin syllables
-----------------------------------------------------
+Hyphenation patterns for pinyin syllables with and without tone markers
+-----------------------------------------------------------------------
Sometimes it makes sense to use unaccented pinyin syllables for common names
and phrases which are repeated frequently; sometimes you are in an
@@ -19,21 +19,31 @@ this can be found in the directory utils/pyhyphen.
Installation
------------
+[Note: The hyphenation patterns have been submitted to the `tex-hyphen'
+ project. In recent TeX distributions it is no longer necessary to set
+ up pinyin support manually since everything should work out of the
+ box.]
+
This is fairly straightforward. Move the Babel language definition file
-pinyin.ldf file to a place found by TeX. If you e.g., maintain a local TEXMF
-tree, a good place would be $TEXMFLOCAL/tex/generic/babel/pinyin.ldf.
-Similarly, move the pinyin hyphenation pattern file pyhyph.tex into your
-(local) TEXMF tree: The analogous place would be
-$TEXMFLOCAL/tex/generic/hyphen/pyhyph.tex.
+pinyin.ldf file to a place found by TeX. If you e.g., maintain a local
+TEXMF tree, a good place would be $TEXMFLOCAL/tex/generic/babel/pinyin.ldf.
+Similarly, move the pinyin hyphenation pattern files hyph-zh-latn-pinyin.tex
+and hyph-zh-latin-tonepinyin.tex into your (local) TEXMF tree: The analogous
+place would be directory $TEXMFLOCAL/tex/generic/hyphen.
+
+Now run texconfig (or a similar tool) to add hyph-zh-latn-pinyin.tex and
+hyph-zh-latin-tonepinyin.tex to the used hyphenation patterns. In the usual
+case you have to add a line saying
+
+ pinyin hyph-zh-latn-tonepinyin.tex
-Now run texconfig (or a similar tool) to add pyhyph.tex to the used
-hyphenation patterns. In the usual case you have to add a line saying
+for Unicode-aware TeX engines (XeTeX, luatex, upTeX) or
- pinyin pyhyph.tex
+ pinyin hyph-zh-latn-pinyin.tex
-to the hyphenation configuration file language.dat. Finally, build a new
-format file (usually the command `initex latex.ltx'); in most cases this
-happens automatically.
+for all other engines to the hyphenation configuration file language.dat.
+Finally, build a new format file (usually the command `initex latex.ltx');
+in most cases this happens automatically.
Using Babel ensures that it works both with LaTeX and Plain TeX.
@@ -41,6 +51,26 @@ Using Babel ensures that it works both with LaTeX and Plain TeX.
Usage
-----
+Unicode-aware engines
+- - - - - - - - - - -
+
+Do something like this:
+
+ \documentclass[...]{...}
+
+ \usepackage[pinyin,german,english]{babel}
+ ...
+
+ \begin{document}
+ ...
+ \foreignlanguage{pinyin}{pinyin with tone markers like Běijīng}
+ ...
+ \end{document}
+
+
+Other engines
+- - - - - - -
+
Do something like this:
\documentclass[...]{...}
@@ -51,7 +81,7 @@ Do something like this:
\begin{document}
...
- \foreignlanguage{pinyin}{some pinyin syllables}
+ \foreignlanguage{pinyin}{pinyin without tone markers like Beijing}
...
\end{document}
@@ -66,21 +96,20 @@ Note 1: pinyin.ldf is intentionally very minimal. Don't expect that e.g.,
\py{Beijing}
-Note 2: The hyphenation patterns use `umlaut u' with code position 0xFC
- (this is latin-1 and T1 encoding). You can also use OT1 encoding,
- but then the patterns containing `umlaut u' won't work.
- Additionally, the quote character `'' is used as a letter which is
- needed to resolve ambiguities like this:
+Note 2: The apostrophe character `'' is used as to precede syllables
+ starting with `a', `e', or `u'. This is needed to resolve
+ ambiguities like this:
- Xi'an <-> Xian
+ Xi'an -> Xi-an (two syllables)
+ Xian -> Xian (one syllable)
- If a syllable not at the beginning of a word starts with a vowel
- (i.e., `a', `e', or `o'), you must precede it with a quote
- character. Example:
+ If a line break occurs, the apostrophe should vanish, e.g.,
- Tian'anmen
+ Tian'anmen -> Tian-
+ anmen
- The hyphenation patterns correctly treat it as Tian'-an-men.
+ Use the Babel shorthand "' to enter '; this internally resolves to
+ \discretionary.
The shorthand `"u' (as used in German) is available to input
`umlaut u'.
@@ -95,13 +124,12 @@ Technical details
-----------------
The dictionary used to construct the hyphenation patterns has been created
-with the small C program `pinyin.c' which simply combines all existing
-Chinese syllable pairs, inserting quote characters where needed. Then,
-`patgen' has been run on the dictionary; `pinyin.tr' defines the used
-character set.
+with a small C program `pinyin.c' which simply combines all existing Chinese
+syllable pairs that don't need an apostrophe inbetween. Then, `patgen' has
+been run on the dictionary; `pinyin.tr' defines the used character set.
Due to the regularity of the word combinations, only two-letter patterns of
-the first level are needed to find all possible breaks without a single
-error or omission.
+the first and second level are needed to find all possible breaks without a
+single error or omission.
---End of pyhyphen.txt---
diff --git a/Master/texmf-dist/doc/latex/cjk/doc/reftex.txt b/Master/texmf-dist/doc/latex/cjk/doc/reftex.txt
index eb7f37cd005..3dc79352432 100644
--- a/Master/texmf-dist/doc/latex/cjk/doc/reftex.txt
+++ b/Master/texmf-dist/doc/latex/cjk/doc/reftex.txt
@@ -1,5 +1,5 @@
-This is the file reftex.txt of the CJK macro package ver. 4.8.4
-(18-Apr-2015).
+This is the file reftex.txt of the CJK macro package ver. 4.8.5
+(16-Oct-2021).
RefTeX
------
diff --git a/Master/texmf-dist/doc/latex/cjk/doc/ruby.txt b/Master/texmf-dist/doc/latex/cjk/doc/ruby.txt
index 788ebdcdee0..68f82abc9d7 100644
--- a/Master/texmf-dist/doc/latex/cjk/doc/ruby.txt
+++ b/Master/texmf-dist/doc/latex/cjk/doc/ruby.txt
@@ -1,4 +1,4 @@
-This is the file ruby.txt of the CJK macro package ver. 4.8.4 (18-Apr-2015).
+This is the file ruby.txt of the CJK macro package ver. 4.8.5 (16-Oct-2021).
What is ruby?
-------------
diff --git a/Master/texmf-dist/doc/latex/cjk/doc/thaifont.txt b/Master/texmf-dist/doc/latex/cjk/doc/thaifont.txt
index d1833968050..1a98eba8822 100644
--- a/Master/texmf-dist/doc/latex/cjk/doc/thaifont.txt
+++ b/Master/texmf-dist/doc/latex/cjk/doc/thaifont.txt
@@ -1,10 +1,10 @@
-This is the file thaifont.txt of the CJK macro package ver. 4.8.4
-(18-Apr-2015).
+This is the file thaifont.txt of the CJK macro package ver. 4.8.5
+(16-Oct-2021).
Thai font support in the CJK package
------------------------------------
-Version 4.8.4 of the CJK package has improved support for Thai. This file
+Version 4.8.5 of the CJK package has improved support for Thai. This file
describes how to install and use the fonts. Please refer to cjk-enc.txt how
to set up cjk-enc.el (which automatically loads thai-word.el for finding
word breaks).
diff --git a/Master/texmf-dist/doc/latex/cjk/doc/vertical.txt b/Master/texmf-dist/doc/latex/cjk/doc/vertical.txt
index 6e16a9a21f4..e9d7c784fd6 100644
--- a/Master/texmf-dist/doc/latex/cjk/doc/vertical.txt
+++ b/Master/texmf-dist/doc/latex/cjk/doc/vertical.txt
@@ -1,5 +1,5 @@
-This is the file vertical.txt of the CJK macro package ver. 4.8.4
-(18-Apr-2015).
+This is the file vertical.txt of the CJK macro package ver. 4.8.5
+(16-Oct-2021).
Vertical typesetting
diff --git a/Master/texmf-dist/doc/latex/cjk/examples/Big5.tex b/Master/texmf-dist/doc/latex/cjk/examples/Big5.tex
index 9f6ce11d30e..91938c9099b 100644
--- a/Master/texmf-dist/doc/latex/cjk/examples/Big5.tex
+++ b/Master/texmf-dist/doc/latex/cjk/examples/Big5.tex
@@ -3,10 +3,10 @@
%
% written by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
%
%
-% process this file with bg5latex
+% process this file with bg5latex (or cjk-enc.el; see cjk-enc.txt)
\documentclass[12pt]{article}
diff --git a/Master/texmf-dist/doc/latex/cjk/examples/Big5vert.tex b/Master/texmf-dist/doc/latex/cjk/examples/Big5vert.tex
index a2523a3e290..57537f3f505 100644
--- a/Master/texmf-dist/doc/latex/cjk/examples/Big5vert.tex
+++ b/Master/texmf-dist/doc/latex/cjk/examples/Big5vert.tex
@@ -1,11 +1,11 @@
% This is the file Big5vert.tex of the CJK package
% for testing vertical typesetting (in Big 5 encoding).
%
-% process this file with bg5latex
+% process this file with bg5latex (or cjk-enc.el; see cjk-enc.txt)
%
% written by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
\documentclass[12pt]{article}
diff --git a/Master/texmf-dist/doc/latex/cjk/examples/CEF_test.tex b/Master/texmf-dist/doc/latex/cjk/examples/CEF_test.tex
index 9cd04277495..f0712449a2c 100644
--- a/Master/texmf-dist/doc/latex/cjk/examples/CEF_test.tex
+++ b/Master/texmf-dist/doc/latex/cjk/examples/CEF_test.tex
@@ -1,10 +1,12 @@
% This is the file CEF_test.tex of the CJK package
% for testing CEF encoded text with LaTeX2e
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
%
% process this text with ceflatex
+% - requires fonts from the cns package
+
\documentclass[12pt]{article}
\usepackage[global]{CJK}
diff --git a/Master/texmf-dist/doc/latex/cjk/examples/CJKbabel.tex b/Master/texmf-dist/doc/latex/cjk/examples/CJKbabel.tex
index 468557398e6..045465ee6ea 100644
--- a/Master/texmf-dist/doc/latex/cjk/examples/CJKbabel.tex
+++ b/Master/texmf-dist/doc/latex/cjk/examples/CJKbabel.tex
@@ -4,7 +4,7 @@
%
% written by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
% You need Emacs 20 to process this file!
@@ -15,7 +15,10 @@
% `cjk-write-file' will be available after loading cjk-enc.el into
% Emacs 20 with the commands load-file or load-library.
%
-% Vietnamese support for Babel comes with the VnTeX package.
+% Vietnamese support comes with the VnTeX package.
+% - T2A encoding for Computer Modern Cyrillic requires LH fonts
+% - uses CB Greek fonts and CM-Super fonts
+% - requires cyrillic, greek-fontenc, vntex
%
% Read cjk-enc.txt for more details.
@@ -31,7 +34,7 @@
russian, % T2A font encoding
thaicjk, % C90 font encoding
greek, % LGR font encoding
- vietnam, % T5 font encoding
+ vietnamese, % T5 font encoding
USenglish]{babel}
\usepackage[overlap, CJK]{ruby}
@@ -91,7 +94,7 @@ and their answers in a convenient form. \uline{The structure of this
ΒɒߒȒΒ¤גΒܒ\ruby{}{}\ruby{}{璤}ƒ
}
-\begin{otherlanguage}{vietnam}
+\begin{otherlanguage}{vietnamese}
Phn ``Nhng cu hi v gii p thߚng gp'' (vit tt t ting Anh
l FAQ) ߚc nu ra y nhm mc ch thu thp nhng cu hi thߚng
gp trong thc t v nhng li gii p thch hp nht ca n.
diff --git a/Master/texmf-dist/doc/latex/cjk/examples/CJKfntef.tex b/Master/texmf-dist/doc/latex/cjk/examples/CJKfntef.tex
index 38417887f9e..242b0d9ee44 100644
--- a/Master/texmf-dist/doc/latex/cjk/examples/CJKfntef.tex
+++ b/Master/texmf-dist/doc/latex/cjk/examples/CJKfntef.tex
@@ -3,7 +3,7 @@
%
% written by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
\documentclass[12pt]{article}
diff --git a/Master/texmf-dist/doc/latex/cjk/examples/CJKmixed.tex b/Master/texmf-dist/doc/latex/cjk/examples/CJKmixed.tex
index 98d2e5f725e..cbcb8796fc3 100644
--- a/Master/texmf-dist/doc/latex/cjk/examples/CJKmixed.tex
+++ b/Master/texmf-dist/doc/latex/cjk/examples/CJKmixed.tex
@@ -3,9 +3,9 @@
%
% written by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
%
-% Vietnamese support for Babel comes with the VnTeX package.
+% Vietnamese support comes with the VnTeX package.
\documentclass[12pt]{article}
@@ -16,7 +16,7 @@
\usepackage{inputenc} % load it without argument
% to avoid Babel warnings
-\usepackage[vietnam, % T5 font encoding
+\usepackage[vietnamese, % T5 font encoding
USenglish]{babel}
\newenvironment{TChinese}{%
@@ -51,7 +51,7 @@ defines how to set up the font for vertical typesetting.
}%
\hspace{0.5cm}%
\begin{minipage}[c]{8cm}
- \begin{otherlanguage}{vietnam}
+ \begin{otherlanguage}{vietnamese}
Phần ``Những câu hỏi và giải đáp thường gặp'' (viết tắt từ tiếng
Anh là FAQ) được nêu ra ở đây nhằm mục đích thu thập những câu
hỏi thường gặp trong thực tế và những lời giải đáp thích hợp
diff --git a/Master/texmf-dist/doc/latex/cjk/examples/CJKspace.tex b/Master/texmf-dist/doc/latex/cjk/examples/CJKspace.tex
index cb96c2ec3b0..4acfb0230ac 100644
--- a/Master/texmf-dist/doc/latex/cjk/examples/CJKspace.tex
+++ b/Master/texmf-dist/doc/latex/cjk/examples/CJKspace.tex
@@ -3,7 +3,7 @@
%
% written by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
%
% Read CJKspace.txt for more details.
diff --git a/Master/texmf-dist/doc/latex/cjk/examples/CJKutf8.tex b/Master/texmf-dist/doc/latex/cjk/examples/CJKutf8.tex
index 18cfa92e810..f7a6b23ec9c 100644
--- a/Master/texmf-dist/doc/latex/cjk/examples/CJKutf8.tex
+++ b/Master/texmf-dist/doc/latex/cjk/examples/CJKutf8.tex
@@ -3,9 +3,14 @@
%
% written by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-% Vietnamese support for Babel comes with the VnTeX package.
+% Vietnamese support comes with the VnTeX package.
+% UTF-8 support for Greek comes with the greek-inputenc package.
+%
+% - T2A encoding for Computer Modern Cyrillic requires LH fonts
+% - uses CB Greek fonts, CM-Super fonts
+% - requires cyrillic, greek-fontenc, greek-inputenc, vntex
%
% Read CJKutf8.txt for more details.
@@ -16,7 +21,7 @@
\usepackage[10pt]{type1ec} % use only 10pt fonts
\usepackage[T1]{fontenc}
-\usepackage{CJKutf8}
+\usepackage{CJKutf8} % CJK wrapper of [utf8]{inputenc}
\usepackage[german,
russian, % T2A font encoding
vietnamese, % T5 font encoding
@@ -26,7 +31,7 @@
\usepackage{textalpha} % improved LGR support
\usepackage[overlap, CJK]{ruby}
-\usepackage{CJKulem}
+\usepackage{CJKulem} % CJK wrapper of {ulem}
\renewcommand{\rubysep}{-0.2ex}
diff --git a/Master/texmf-dist/doc/latex/cjk/examples/GB.tex b/Master/texmf-dist/doc/latex/cjk/examples/GB.tex
index 334b786a4d4..b02a095e240 100644
--- a/Master/texmf-dist/doc/latex/cjk/examples/GB.tex
+++ b/Master/texmf-dist/doc/latex/cjk/examples/GB.tex
@@ -3,7 +3,7 @@
%
% written by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
\documentclass[12pt]{article}
diff --git a/Master/texmf-dist/doc/latex/cjk/examples/JIS.tex b/Master/texmf-dist/doc/latex/cjk/examples/JIS.tex
index 1808d52d8df..aadea76cb72 100644
--- a/Master/texmf-dist/doc/latex/cjk/examples/JIS.tex
+++ b/Master/texmf-dist/doc/latex/cjk/examples/JIS.tex
@@ -3,7 +3,7 @@
%
% written by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
\documentclass[12pt]{article}
diff --git a/Master/texmf-dist/doc/latex/cjk/examples/KS.tex b/Master/texmf-dist/doc/latex/cjk/examples/KS.tex
index 474319c0007..8d0ba7f26b2 100644
--- a/Master/texmf-dist/doc/latex/cjk/examples/KS.tex
+++ b/Master/texmf-dist/doc/latex/cjk/examples/KS.tex
@@ -3,7 +3,7 @@
%
% written by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
\documentclass[12pt]{article}
diff --git a/Master/texmf-dist/doc/latex/cjk/examples/SJIS.tex b/Master/texmf-dist/doc/latex/cjk/examples/SJIS.tex
index 80ccf2ee70e..5c7417d90b2 100644
--- a/Master/texmf-dist/doc/latex/cjk/examples/SJIS.tex
+++ b/Master/texmf-dist/doc/latex/cjk/examples/SJIS.tex
@@ -3,7 +3,7 @@
%
% written by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
%
%
% process this file with sjislatex
diff --git a/Master/texmf-dist/doc/latex/cjk/examples/UTF8.tex b/Master/texmf-dist/doc/latex/cjk/examples/UTF8.tex
index bbbc0e0b48e..d2f646f6537 100644
--- a/Master/texmf-dist/doc/latex/cjk/examples/UTF8.tex
+++ b/Master/texmf-dist/doc/latex/cjk/examples/UTF8.tex
@@ -3,7 +3,7 @@
%
% written by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
\documentclass[12pt]{article}
diff --git a/Master/texmf-dist/doc/latex/cjk/examples/cjk/Big5.cjk b/Master/texmf-dist/doc/latex/cjk/examples/cjk/Big5.cjk
index c2cb4a77956..8693ba53c8b 100644
--- a/Master/texmf-dist/doc/latex/cjk/examples/cjk/Big5.cjk
+++ b/Master/texmf-dist/doc/latex/cjk/examples/cjk/Big5.cjk
@@ -1,12 +1,12 @@
-\def\CJKpreproc{bg5conv (CJK ver. 4.8.3)}% This is the file Big5.tex of the CJK package
+\def\CJKpreproc{bg5conv (CJK ver. 4.8.4)}% This is the file Big5.tex of the CJK package
% for testing Chinese (in Big 5 encoding).
%
% written by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
%
%
-% process this file with bg5latex
+% process this file with bg5latex (or cjk-enc.el; see cjk-enc.txt)
\documentclass[12pt]{article}
diff --git a/Master/texmf-dist/doc/latex/cjk/examples/cjk/Big5vert.cjk b/Master/texmf-dist/doc/latex/cjk/examples/cjk/Big5vert.cjk
index 2b4f60b216f..05b57b9ef64 100644
--- a/Master/texmf-dist/doc/latex/cjk/examples/cjk/Big5vert.cjk
+++ b/Master/texmf-dist/doc/latex/cjk/examples/cjk/Big5vert.cjk
@@ -1,11 +1,11 @@
-\def\CJKpreproc{bg5conv (CJK ver. 4.8.3)}% This is the file Big5vert.tex of the CJK package
+\def\CJKpreproc{bg5conv (CJK ver. 4.8.4)}% This is the file Big5vert.tex of the CJK package
% for testing vertical typesetting (in Big 5 encoding).
%
-% process this file with bg5latex
+% process this file with bg5latex (or cjk-enc.el; see cjk-enc.txt)
%
% written by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
\documentclass[12pt]{article}
diff --git a/Master/texmf-dist/doc/latex/cjk/examples/cjk/CEF_test.cjk b/Master/texmf-dist/doc/latex/cjk/examples/cjk/CEF_test.cjk
index fc455f1e5bb..ed6ef540e48 100644
--- a/Master/texmf-dist/doc/latex/cjk/examples/cjk/CEF_test.cjk
+++ b/Master/texmf-dist/doc/latex/cjk/examples/cjk/CEF_test.cjk
@@ -1,10 +1,12 @@
-\def\CNSpreproc{cefconv (CJK ver. 4.8.3)}% This is the file CEF_test.tex of the CJK package
+\def\CNSpreproc{cefconv (CJK ver. 4.8.4)}% This is the file CEF_test.tex of the CJK package
% for testing CEF encoded text with LaTeX2e
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
%
% process this text with ceflatex
+% - requires fonts from the cns package
+
\documentclass[12pt]{article}
\usepackage[global]{CJK}
diff --git a/Master/texmf-dist/doc/latex/cjk/examples/cjk/CJKbabel.cjk b/Master/texmf-dist/doc/latex/cjk/examples/cjk/CJKbabel.cjk
index 0afa78e99c6..116e65fbb02 100644
--- a/Master/texmf-dist/doc/latex/cjk/examples/cjk/CJKbabel.cjk
+++ b/Master/texmf-dist/doc/latex/cjk/examples/cjk/CJKbabel.cjk
@@ -4,7 +4,7 @@
%
% written by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
% You need Emacs 20 to process this file!
@@ -15,7 +15,10 @@
% `cjk-write-file' will be available after loading cjk-enc.el into
% Emacs 20 with the commands load-file or load-library.
%
-% Vietnamese support for Babel comes with the VnTeX package.
+% Vietnamese support comes with the VnTeX package.
+% - T2A encoding for Computer Modern Cyrillic requires LH fonts
+% - uses CB Greek fonts and CM-Super fonts
+% - requires cyrillic, greek-fontenc, vntex
%
% Read cjk-enc.txt for more details.
@@ -31,7 +34,7 @@
russian, % T2A font encoding
thaicjk, % C90 font encoding
greek, % LGR font encoding
- vietnam, % T5 font encoding
+ vietnamese, % T5 font encoding
USenglish]{babel}
\usepackage[overlap, CJK]{ruby}
@@ -91,7 +94,7 @@ and their answers in a convenient form. \uline{The structure of this
66206201223253200189206189164215206224220242\ruby{66178}{66181243}\ruby{66200}{66183231166}66183198188181
164163}
-\begin{otherlanguage}{vietnam}
+\begin{otherlanguage}{vietnamese}
Ph32\acircumflexn ``Nh34\uhornng c0\acircumflexu h73oi v32a gi73ai 0\dj20ap th0\uhorn32\ohornng g71\abrevep'' (vi20\ecircumflext t20\abrevet t32\uhorn ti20\ecircumflexng Anh
l32a FAQ) 0\dj0\uhorn71\ohornc n0\ecircumflexu ra 73\ohorn 0\dj0\acircumflexy nh32\abrevem m71uc 0\dj20ich thu th71\acircumflexp nh34\uhornng c0\acircumflexu h73oi th0\uhorn32\ohornng
g71\abrevep trong th71\uhornc t20\ecircumflex v32a nh34\uhornng l32\ohorni gi73ai 0\dj20ap th20ich h71\ohornp nh20\acircumflext c73ua n20o.
diff --git a/Master/texmf-dist/doc/latex/cjk/examples/cjk/SJIS.cjk b/Master/texmf-dist/doc/latex/cjk/examples/cjk/SJIS.cjk
index 461698598d7..b57a34b787b 100644
--- a/Master/texmf-dist/doc/latex/cjk/examples/cjk/SJIS.cjk
+++ b/Master/texmf-dist/doc/latex/cjk/examples/cjk/SJIS.cjk
@@ -1,9 +1,9 @@
-\def\CJKpreproc{sjisconv (CJK ver. 4.8.3)}% This is the file SJIS.tex of the CJK package
+\def\CJKpreproc{sjisconv (CJK ver. 4.8.4)}% This is the file SJIS.tex of the CJK package
% for testing Japanese (in SJIS encoding).
%
% written by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
%
%
% process this file with sjislatex
diff --git a/Master/texmf-dist/doc/latex/cjk/examples/cjk/muletest.cjk b/Master/texmf-dist/doc/latex/cjk/examples/cjk/muletest.cjk
index e212b1a23ed..9bc76b5436e 100644
--- a/Master/texmf-dist/doc/latex/cjk/examples/cjk/muletest.cjk
+++ b/Master/texmf-dist/doc/latex/cjk/examples/cjk/muletest.cjk
@@ -3,7 +3,7 @@
%
% written by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
% You need Emacs 20 (or Mule 2.3) to process this file!
@@ -22,6 +22,9 @@
% The T5 encoding is part of the VnTeX package (available at CTAN) which
% contains Vietnamese fonts and other support files for both TeX and
% LaTeX.
+% - T2A encoding for Computer Modern Cyrillic requires LH fonts
+% - uses CB Greek fonts, CM-Super fonts
+% - requires cyrillic, german, greek-fontenc, vntex
%
% Read cjk-enc.txt for more details.
diff --git a/Master/texmf-dist/doc/latex/cjk/examples/cjk/rubytest.cjk b/Master/texmf-dist/doc/latex/cjk/examples/cjk/rubytest.cjk
index cfbc295156a..ac9664636bd 100644
--- a/Master/texmf-dist/doc/latex/cjk/examples/cjk/rubytest.cjk
+++ b/Master/texmf-dist/doc/latex/cjk/examples/cjk/rubytest.cjk
@@ -3,7 +3,7 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
% You need Emacs 20 (or Mule 2.3) to process this file!
diff --git a/Master/texmf-dist/doc/latex/cjk/examples/cjk/thai.cjk b/Master/texmf-dist/doc/latex/cjk/examples/cjk/thai.cjk
index ef16754e353..dda8ae02283 100644
--- a/Master/texmf-dist/doc/latex/cjk/examples/cjk/thai.cjk
+++ b/Master/texmf-dist/doc/latex/cjk/examples/cjk/thai.cjk
@@ -3,7 +3,7 @@
%
% written by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
% This file must be processed with cjk-enc.el to get
%
diff --git a/Master/texmf-dist/doc/latex/cjk/examples/muletest.tex b/Master/texmf-dist/doc/latex/cjk/examples/muletest.tex
index 9c7b86c5ba0..572460aae79 100644
--- a/Master/texmf-dist/doc/latex/cjk/examples/muletest.tex
+++ b/Master/texmf-dist/doc/latex/cjk/examples/muletest.tex
@@ -3,7 +3,7 @@
%
% written by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
% You need Emacs 20 (or Mule 2.3) to process this file!
@@ -22,6 +22,9 @@
% The T5 encoding is part of the VnTeX package (available at CTAN) which
% contains Vietnamese fonts and other support files for both TeX and
% LaTeX.
+% - T2A encoding for Computer Modern Cyrillic requires LH fonts
+% - uses CB Greek fonts, CM-Super fonts
+% - requires cyrillic, german, greek-fontenc, vntex
%
% Read cjk-enc.txt for more details.
diff --git a/Master/texmf-dist/doc/latex/cjk/examples/pdf/Big5.pdf b/Master/texmf-dist/doc/latex/cjk/examples/pdf/Big5.pdf
index 673422ed7b2..b298166605e 100644
--- a/Master/texmf-dist/doc/latex/cjk/examples/pdf/Big5.pdf
+++ b/Master/texmf-dist/doc/latex/cjk/examples/pdf/Big5.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/cjk/examples/pdf/Big5vert.pdf b/Master/texmf-dist/doc/latex/cjk/examples/pdf/Big5vert.pdf
index 6b00bd023f2..3067b7a4589 100644
--- a/Master/texmf-dist/doc/latex/cjk/examples/pdf/Big5vert.pdf
+++ b/Master/texmf-dist/doc/latex/cjk/examples/pdf/Big5vert.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/cjk/examples/pdf/CEF_test.pdf b/Master/texmf-dist/doc/latex/cjk/examples/pdf/CEF_test.pdf
index e326af035dd..595bd80de83 100644
--- a/Master/texmf-dist/doc/latex/cjk/examples/pdf/CEF_test.pdf
+++ b/Master/texmf-dist/doc/latex/cjk/examples/pdf/CEF_test.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/cjk/examples/pdf/CJKbabel.pdf b/Master/texmf-dist/doc/latex/cjk/examples/pdf/CJKbabel.pdf
index 7d3dab33bd1..db6790d6f85 100644
--- a/Master/texmf-dist/doc/latex/cjk/examples/pdf/CJKbabel.pdf
+++ b/Master/texmf-dist/doc/latex/cjk/examples/pdf/CJKbabel.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/cjk/examples/pdf/CJKfntef.pdf b/Master/texmf-dist/doc/latex/cjk/examples/pdf/CJKfntef.pdf
index 58e7a7c4184..5d6be56b17f 100644
--- a/Master/texmf-dist/doc/latex/cjk/examples/pdf/CJKfntef.pdf
+++ b/Master/texmf-dist/doc/latex/cjk/examples/pdf/CJKfntef.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/cjk/examples/pdf/CJKmixed.pdf b/Master/texmf-dist/doc/latex/cjk/examples/pdf/CJKmixed.pdf
index 6cd3bc814a6..4c3f054e59d 100644
--- a/Master/texmf-dist/doc/latex/cjk/examples/pdf/CJKmixed.pdf
+++ b/Master/texmf-dist/doc/latex/cjk/examples/pdf/CJKmixed.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/cjk/examples/pdf/CJKspace.pdf b/Master/texmf-dist/doc/latex/cjk/examples/pdf/CJKspace.pdf
index 735b14ff80f..33d2f507be0 100644
--- a/Master/texmf-dist/doc/latex/cjk/examples/pdf/CJKspace.pdf
+++ b/Master/texmf-dist/doc/latex/cjk/examples/pdf/CJKspace.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/cjk/examples/pdf/CJKutf8.pdf b/Master/texmf-dist/doc/latex/cjk/examples/pdf/CJKutf8.pdf
index 28cc7ee9bb6..4072f2dc218 100644
--- a/Master/texmf-dist/doc/latex/cjk/examples/pdf/CJKutf8.pdf
+++ b/Master/texmf-dist/doc/latex/cjk/examples/pdf/CJKutf8.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/cjk/examples/pdf/GB.pdf b/Master/texmf-dist/doc/latex/cjk/examples/pdf/GB.pdf
index 094c34a1fdf..2e534349631 100644
--- a/Master/texmf-dist/doc/latex/cjk/examples/pdf/GB.pdf
+++ b/Master/texmf-dist/doc/latex/cjk/examples/pdf/GB.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/cjk/examples/pdf/JIS.pdf b/Master/texmf-dist/doc/latex/cjk/examples/pdf/JIS.pdf
index 71e0a4335f0..e11eab61d70 100644
--- a/Master/texmf-dist/doc/latex/cjk/examples/pdf/JIS.pdf
+++ b/Master/texmf-dist/doc/latex/cjk/examples/pdf/JIS.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/cjk/examples/pdf/KS.pdf b/Master/texmf-dist/doc/latex/cjk/examples/pdf/KS.pdf
index b64b1c72608..e9c771e24a7 100644
--- a/Master/texmf-dist/doc/latex/cjk/examples/pdf/KS.pdf
+++ b/Master/texmf-dist/doc/latex/cjk/examples/pdf/KS.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/cjk/examples/pdf/SJIS.pdf b/Master/texmf-dist/doc/latex/cjk/examples/pdf/SJIS.pdf
index 9fb248701c1..bc4690fbf67 100644
--- a/Master/texmf-dist/doc/latex/cjk/examples/pdf/SJIS.pdf
+++ b/Master/texmf-dist/doc/latex/cjk/examples/pdf/SJIS.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/cjk/examples/pdf/UTF8.pdf b/Master/texmf-dist/doc/latex/cjk/examples/pdf/UTF8.pdf
index 851d91dfb08..0e701b72c0b 100644
--- a/Master/texmf-dist/doc/latex/cjk/examples/pdf/UTF8.pdf
+++ b/Master/texmf-dist/doc/latex/cjk/examples/pdf/UTF8.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/cjk/examples/pdf/muletest.pdf b/Master/texmf-dist/doc/latex/cjk/examples/pdf/muletest.pdf
index f7711e89c9b..f955612b5d0 100644
--- a/Master/texmf-dist/doc/latex/cjk/examples/pdf/muletest.pdf
+++ b/Master/texmf-dist/doc/latex/cjk/examples/pdf/muletest.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/cjk/examples/pdf/py_test.pdf b/Master/texmf-dist/doc/latex/cjk/examples/pdf/py_test.pdf
index aca573272a7..589c0d126c3 100644
--- a/Master/texmf-dist/doc/latex/cjk/examples/pdf/py_test.pdf
+++ b/Master/texmf-dist/doc/latex/cjk/examples/pdf/py_test.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/cjk/examples/pdf/pytest.pdf b/Master/texmf-dist/doc/latex/cjk/examples/pdf/pytest.pdf
index b4b458da6c6..263f7f7693b 100644
--- a/Master/texmf-dist/doc/latex/cjk/examples/pdf/pytest.pdf
+++ b/Master/texmf-dist/doc/latex/cjk/examples/pdf/pytest.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/cjk/examples/pdf/rubytest.pdf b/Master/texmf-dist/doc/latex/cjk/examples/pdf/rubytest.pdf
index dc6d7b0ff74..2eb1859354a 100644
--- a/Master/texmf-dist/doc/latex/cjk/examples/pdf/rubytest.pdf
+++ b/Master/texmf-dist/doc/latex/cjk/examples/pdf/rubytest.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/cjk/examples/pdf/thai.pdf b/Master/texmf-dist/doc/latex/cjk/examples/pdf/thai.pdf
index 322e0c696ef..70e3dab9333 100644
--- a/Master/texmf-dist/doc/latex/cjk/examples/pdf/thai.pdf
+++ b/Master/texmf-dist/doc/latex/cjk/examples/pdf/thai.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/cjk/examples/pdf/thai_utf8.pdf b/Master/texmf-dist/doc/latex/cjk/examples/pdf/thai_utf8.pdf
index e1682796862..f854eb3a833 100644
--- a/Master/texmf-dist/doc/latex/cjk/examples/pdf/thai_utf8.pdf
+++ b/Master/texmf-dist/doc/latex/cjk/examples/pdf/thai_utf8.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/cjk/examples/py_test.tex b/Master/texmf-dist/doc/latex/cjk/examples/py_test.tex
index 1bb650f4a11..9885d62896b 100644
--- a/Master/texmf-dist/doc/latex/cjk/examples/py_test.tex
+++ b/Master/texmf-dist/doc/latex/cjk/examples/py_test.tex
@@ -3,7 +3,7 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
\documentclass{article}
diff --git a/Master/texmf-dist/doc/latex/cjk/examples/rubytest.tex b/Master/texmf-dist/doc/latex/cjk/examples/rubytest.tex
index 8e8b83e0321..0a03b928b65 100644
--- a/Master/texmf-dist/doc/latex/cjk/examples/rubytest.tex
+++ b/Master/texmf-dist/doc/latex/cjk/examples/rubytest.tex
@@ -3,7 +3,7 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
% You need Emacs 20 (or Mule 2.3) to process this file!
diff --git a/Master/texmf-dist/doc/latex/cjk/examples/thai.tex b/Master/texmf-dist/doc/latex/cjk/examples/thai.tex
index 6466e78e8c0..b7302438ae0 100644
--- a/Master/texmf-dist/doc/latex/cjk/examples/thai.tex
+++ b/Master/texmf-dist/doc/latex/cjk/examples/thai.tex
@@ -3,7 +3,7 @@
%
% written by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
% This file must be processed with cjk-enc.el to get
%
diff --git a/Master/texmf-dist/doc/latex/cjk/examples/thai_utf8.tex b/Master/texmf-dist/doc/latex/cjk/examples/thai_utf8.tex
new file mode 100644
index 00000000000..8933c43e1c8
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/cjk/examples/thai_utf8.tex
@@ -0,0 +1,43 @@
+% This is the file thai_utf8.tex of the CJK package
+% for testing Thai (in utf-8 encoding).
+%
+% written by Werner Lemberg <wl@gnu.org>
+%
+% Version 4.8.5 (16-Oct-2021)
+
+% This file must be processed with cjk-enc.el to get
+%
+% . proper word breaks
+% . font switching between Thai and non-Thai
+% . intercharacter glue
+%
+% Please read cjk-enc.txt for usage instructions.
+%
+% To process without cjk-enc.el, comment out the line containing
+% `\extrasthaicjk'. Note, however, that you get overlong lines, and you
+% must manually insert proper Thai word breaks.
+
+
+\documentclass[12pt]{article}
+
+\usepackage[thaicjk]{babel}
+
+% \addto\extrasthaicjk{\fontencoding{C90}\selectfont}
+
+
+\begin{document}
+
+รายการ FAQ นี้สร้างขึ้นเพื่อสรุปคำถามที่ถามกันบ่อยครั้งและคำตอบคำถามในรูปแบบทีสะดวก.
+โครงสร้างของรายการ FAQ นี้เปลี่ยนไปมากตั้งแต่รุ่นที่แล้ว.
+\textbf{ดูรายละเอียดสำหรับโครงสร้างใหม่ได้จากช่วง ``โครงสร้างและวิธีการอ่าน
+ FAQ.''}
+
+\end{document}
+
+
+%%% Local Variables:
+%%% coding: utf-8
+%%% mode: latex
+%%% TeX-master: t
+%%% TeX-command-default: "CJKLaTeX"
+%%% End:
diff --git a/Master/texmf-dist/doc/latex/cjk/texlive/bin-cjkutils.pl b/Master/texmf-dist/doc/latex/cjk/texlive/bin-cjkutils.pl
index ea1997a8c42..4b40c211e89 100755
--- a/Master/texmf-dist/doc/latex/cjk/texlive/bin-cjkutils.pl
+++ b/Master/texmf-dist/doc/latex/cjk/texlive/bin-cjkutils.pl
@@ -8,7 +8,7 @@
# the ctan2tds perl script. It installs the necessary files from the CJK
# package into the correct destinations.
#
-# It expects that the CJK packages (cjk-4.8.4 and cjk-4.8.4-doc) have been
+# It expects that the CJK packages (cjk-4.8.5 and cjk-4.8.5-doc) have been
# unpacked (unmodified) in the current directory.
@@ -21,7 +21,7 @@ my $H = "hbf2gf";
#
-# cjk-4.8.4
+# cjk-4.8.5
# ---------
#
@@ -56,7 +56,7 @@ my $H = "hbf2gf";
#
-# cjk-4.8.4-doc
+# cjk-4.8.5-doc
# -------------
#
diff --git a/Master/texmf-dist/doc/latex/cjk/texlive/c90.pl b/Master/texmf-dist/doc/latex/cjk/texlive/c90.pl
index 15863e16a11..c7cbbacf6ad 100755
--- a/Master/texmf-dist/doc/latex/cjk/texlive/c90.pl
+++ b/Master/texmf-dist/doc/latex/cjk/texlive/c90.pl
@@ -8,7 +8,7 @@
# the ctan2tds perl script. It installs the necessary files from the CJK
# package into the correct destinations.
#
-# It expects that the CJK packages (cjk-4.8.4 and cjk-4.8.4-doc) have been
+# It expects that the CJK packages (cjk-4.8.5 and cjk-4.8.5-doc) have been
# unpacked (unmodified) in the current directory.
my $D = "doc/fonts/enc/c90";
diff --git a/Master/texmf-dist/doc/latex/cjk/texlive/cjk-build.pl b/Master/texmf-dist/doc/latex/cjk/texlive/cjk-build.pl
index d2ff4ff7432..8837c28ee2c 100755
--- a/Master/texmf-dist/doc/latex/cjk/texlive/cjk-build.pl
+++ b/Master/texmf-dist/doc/latex/cjk/texlive/cjk-build.pl
@@ -8,7 +8,7 @@
# the ctan2tds perl script. It installs the necessary files from the CJK
# package into the correct destinations.
#
-# It expects that the CJK packages (cjk-4.8.4 and cjk-4.8.4-doc) have been
+# It expects that the CJK packages (cjk-4.8.5 and cjk-4.8.5-doc) have been
# unpacked (unmodified) in the current directory. For installation, it
# simply uses `install -d' so that missing subdirectories are created
# automatically.
diff --git a/Master/texmf-dist/doc/latex/cjk/texlive/cjk.pl b/Master/texmf-dist/doc/latex/cjk/texlive/cjk.pl
index 5e487dab7ca..d631dcad052 100755
--- a/Master/texmf-dist/doc/latex/cjk/texlive/cjk.pl
+++ b/Master/texmf-dist/doc/latex/cjk/texlive/cjk.pl
@@ -8,11 +8,11 @@
# the ctan2tds perl script. It installs the necessary files from the CJK
# package into the correct destinations.
#
-# It expects that the CJK packages (cjk-4.8.4 and cjk-4.8.4-doc) have been
+# It expects that the CJK packages (cjk-4.8.5 and cjk-4.8.5-doc) have been
# unpacked (unmodified) in the current directory.
#
-# cjk-4.8.4
+# cjk-4.8.5
# ---------
#
@@ -424,7 +424,7 @@ my $T = "tex/latex/cjk";
#
-# cjk-4.8.4-doc
+# cjk-4.8.5-doc
# -------------
#
diff --git a/Master/texmf-dist/doc/latex/cjk/texlive/dnp.pl b/Master/texmf-dist/doc/latex/cjk/texlive/dnp.pl
index f0ccf46a272..f7e75555ebd 100755
--- a/Master/texmf-dist/doc/latex/cjk/texlive/dnp.pl
+++ b/Master/texmf-dist/doc/latex/cjk/texlive/dnp.pl
@@ -8,7 +8,7 @@
# the ctan2tds perl script. It installs the necessary files from the CJK
# package into the correct destinations.
#
-# It expects that the CJK packages (cjk-4.8.4 and cjk-4.8.4-doc) have been
+# It expects that the CJK packages (cjk-4.8.5 and cjk-4.8.5-doc) have been
# unpacked (unmodified) in the current directory.
diff --git a/Master/texmf-dist/doc/latex/cjk/texlive/garuda-c90.pl b/Master/texmf-dist/doc/latex/cjk/texlive/garuda-c90.pl
index 40e0cda7430..539e7bf63c7 100755
--- a/Master/texmf-dist/doc/latex/cjk/texlive/garuda-c90.pl
+++ b/Master/texmf-dist/doc/latex/cjk/texlive/garuda-c90.pl
@@ -8,7 +8,7 @@
# the ctan2tds perl script. It installs the necessary files from the CJK
# package into the correct destinations.
#
-# It expects that the CJK packages (cjk-4.8.4 and cjk-4.8.4-doc) have been
+# It expects that the CJK packages (cjk-4.8.5 and cjk-4.8.5-doc) have been
# unpacked (unmodified) in the current directory.
my $D = "dvips/garuda-c90";
diff --git a/Master/texmf-dist/doc/latex/cjk/texlive/norasi-c90.pl b/Master/texmf-dist/doc/latex/cjk/texlive/norasi-c90.pl
index 200e31ea2dd..88dd7cbf7ff 100755
--- a/Master/texmf-dist/doc/latex/cjk/texlive/norasi-c90.pl
+++ b/Master/texmf-dist/doc/latex/cjk/texlive/norasi-c90.pl
@@ -8,7 +8,7 @@
# the ctan2tds perl script. It installs the necessary files from the CJK
# package into the correct destinations.
#
-# It expects that the CJK packages (cjk-4.8.4 and cjk-4.8.4-doc) have been
+# It expects that the CJK packages (cjk-4.8.5 and cjk-4.8.5-doc) have been
# unpacked (unmodified) in the current directory.
my $D = "dvips/norasi-c90";
diff --git a/Master/texmf-dist/doc/latex/cjk/utils/pyhyphen/pytest.tex b/Master/texmf-dist/doc/latex/cjk/utils/pyhyphen/pytest.tex
index adf37d3c324..bbef6d4162a 100644
--- a/Master/texmf-dist/doc/latex/cjk/utils/pyhyphen/pytest.tex
+++ b/Master/texmf-dist/doc/latex/cjk/utils/pyhyphen/pytest.tex
@@ -3,15 +3,15 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
%
%%
%% Attention! This will work only if you have created a new format file
-%% with `pyhyph.tex' as additional hyphenation patterns for the language
-%% `pinyin'. Otherwise no hyphenation will be used.
+%% with `hyph-zh-latn-pinyin.tex' as additional hyphenation patterns for the
+%% language `pinyin'. Otherwise no hyphenation will be used.
%%
-% Note that the Babel package searches for `pinyin.ldf', not pinyin.sty --
-% the latter is for typesetting accented pinyin syllables.
+% Note that the Babel package searches for `pinyin.ldf', not `pinyin.sty'
+% -- the latter is for typesetting accented pinyin syllables.
\documentclass[12pt,b5paper]{article}
@@ -31,21 +31,21 @@
\selectlanguage{pinyin}
-Women hen xihuan l"uxing. Zai Beijing women hen xiang kan Tian'anmen.
-Mingtian women xiang yao dao Xi'an qu. Xiage libai zai hui jia.
-Women hen xihuan l"uxing. Zai Beijing women hen xiang kan Tian'anmen.
-Mingtian women xiang yao dao Xi'an qu. Xiage libai zai hui jia.
-Women hen xihuan l"uxing. Zai Beijing women hen xiang kan Tian'anmen.
-Mingtian women xiang yao dao Xi'an qu. Xiage libai zai hui jia.
-Women hen xihuan l"uxing. Zai Beijing women hen xiang kan Tian'anmen.
-Mingtian women xiang yao dao Xi'an qu. Xiage libai zai hui jia.
-Women hen xihuan l"uxing. Zai Beijing women hen xiang kan Tian'anmen.
-Mingtian women xiang yao dao Xi'an qu. Xiage libai zai hui jia.
-Women hen xihuan l"uxing. Zai Beijing women hen xiang kan Tian'anmen.
-Mingtian women xiang yao dao Xi'an qu. Xiage libai zai hui jia.
-Women hen xihuan l"uxing. Zai Beijing women hen xiang kan Tian'anmen.
-Mingtian women xiang yao dao Xi'an qu. Xiage libai zai hui jia.
-Women hen xihuan l"uxing. Zai Beijing women hen xiang kan Tian'anmen.
-Mingtian women xiang yao dao Xi'an qu. Xiage libai zai hui jia.
+Women hen xihuan l"uxing. Zai Beijing women hen xiang kan Tian"'anmen.
+Mingtian women xiang yao dao Xi"'an qu. Xiage libai zai hui jia.
+Women hen xihuan l"uxing. Zai Beijing women hen xiang kan Tian"'anmen.
+Mingtian women xiang yao dao Xi"'an qu. Xiage libai zai hui jia.
+Women hen xihuan l"uxing. Zai Beijing women hen xiang kan Tian"'anmen.
+Mingtian women xiang yao dao Xi"'an qu. Xiage libai zai hui jia.
+Women hen xihuan l"uxing. Zai Beijing women hen xiang kan Tian"'anmen.
+Mingtian women xiang yao dao Xi"'an qu. Xiage libai zai hui jia.
+Women hen xihuan l"uxing. Zai Beijing women hen xiang kan Tian"'anmen.
+Mingtian women xiang yao dao Xi"'an qu. Xiage libai zai hui jia.
+Women hen xihuan l"uxing. Zai Beijing women hen xiang kan Tian"'anmen.
+Mingtian women xiang yao dao Xi"'an qu. Xiage libai zai hui jia.
+Women hen xihuan l"uxing. Zai Beijing women hen xiang kan Tian"'anmen.
+Mingtian women xiang yao dao Xi"'an qu. Xiage libai zai hui jia.
+Women hen xihuan l"uxing. Zai Beijing women hen xiang kan Tian"'anmen.
+Mingtian women xiang yao dao Xi"'an qu. Xiage libai zai hui jia.
\end{document}
diff --git a/Master/texmf-dist/doc/latex/cjk/utils/pyhyphen/pytestutf8.tex b/Master/texmf-dist/doc/latex/cjk/utils/pyhyphen/pytestutf8.tex
new file mode 100644
index 00000000000..725a6a9c0fa
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/cjk/utils/pyhyphen/pytestutf8.tex
@@ -0,0 +1,68 @@
+% This is the file pytestutf8.tex of the CJK package
+% for testing Chinese pinyin hyphenation.
+%
+% created by Werner Lemberg <wl@gnu.org>
+%
+% Version 4.8.5 (16-Oct-2021)
+%
+%%
+%% Attention! This will work only if you have created a new format file
+%% with `hyph-zh-latn-tonepinyin.tex' as additional hyphenation patterns for
+%% the language `pinyin'. Otherwise no hyphenation will be used.
+%%
+% Note that the Babel package searches for `pinyin.ldf', not `pinyin.sty'
+% -- the latter is for typesetting accented pinyin syllables.
+
+\documentclass[12pt,a5paper]{article}
+
+\usepackage{ifxetex}
+\usepackage{ifluatex}
+\usepackage{ifuptex}
+
+\ifxetex
+ \relax
+\else
+ \ifluatex
+ \relax
+ \else
+ \ifuptex
+ \relax
+ \else
+ \errmessage{You need a UTF-8 engine to process this file.}
+ \fi
+ \fi
+\fi
+
+\usepackage{libertine}
+\usepackage[pinyin]{babel}
+
+
+\begin{document}
+
+% Taken from the TeXbook (p. 451) to force frequent insertion of hyphens.
+\hyphenpenalty -1000
+\pretolerance -1
+\tolerance 1000
+\doublehyphendemerits -100000
+\finalhyphendemerits -100000
+
+\selectlanguage{pinyin}
+
+Wǒmen hěn xǐhuān lǚxíng. Zài Běijīng wǒmen hěn xiǎng kàn Tiān"'ānmén.
+Míngtiān wǒmen xiǎng yào dào Xī"'ān qù. Xiàge lǐbài zài huí jiā.
+Wǒmen hěn xǐhuān lǚxíng. Zài Běijīng wǒmen hěn xiǎng kàn Tiān"'ānmén.
+Míngtiān wǒmen xiǎng yào dào Xī"'ān qù. Xiàge lǐbài zài huí jiā.
+Wǒmen hěn xǐhuān lǚxíng. Zài Běijīng wǒmen hěn xiǎng kàn Tiān"'ānmén.
+Míngtiān wǒmen xiǎng yào dào Xī"'ān qù. Xiàge lǐbài zài huí jiā.
+Wǒmen hěn xǐhuān lǚxíng. Zài Běijīng wǒmen hěn xiǎng kàn Tiān"'ānmén.
+Míngtiān wǒmen xiǎng yào dào Xī"'ān qù. Xiàge lǐbài zài huí jiā.
+Wǒmen hěn xǐhuān lǚxíng. Zài Běijīng wǒmen hěn xiǎng kàn Tiān"'ānmén.
+Míngtiān wǒmen xiǎng yào dào Xī"'ān qù. Xiàge lǐbài zài huí jiā.
+Wǒmen hěn xǐhuān lǚxíng. Zài Běijīng wǒmen hěn xiǎng kàn Tiān"'ānmén.
+Míngtiān wǒmen xiǎng yào dào Xī"'ān qù. Xiàge lǐbài zài huí jiā.
+Wǒmen hěn xǐhuān lǚxíng. Zài Běijīng wǒmen hěn xiǎng kàn Tiān"'ānmén.
+Míngtiān wǒmen xiǎng yào dào Xī"'ān qù. Xiàge lǐbài zài huí jiā.
+Wǒmen hěn xǐhuān lǚxíng. Zài Běijīng wǒmen hěn xiǎng kàn Tiān"'ānmén.
+Míngtiān wǒmen xiǎng yào dào Xī"'ān qù. Xiàge lǐbài zài huí jiā.
+
+\end{document}