cjk 4.8.5

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

2 files changed, 89 insertions, 21 deletions

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}