summaryrefslogtreecommitdiff
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
parent112eb735b477217c2d39ccb9b81191bbdc28f026 (diff)
cjk 4.8.5
git-svn-id: svn://tug.org/texlive/trunk@60829 c570f23f-e606-0410-a88d-b1316a301751
-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
-rw-r--r--Master/texmf-dist/source/latex/cjk/contrib/wadalab/fixwada2
-rw-r--r--Master/texmf-dist/source/latex/cjk/contrib/wadalab/fixwada2.pl4
-rw-r--r--Master/texmf-dist/source/latex/cjk/contrib/wadalab/makefont2
-rw-r--r--Master/texmf-dist/source/latex/cjk/contrib/wadalab/makeuniwada.pl2
-rw-r--r--Master/texmf-dist/source/latex/cjk/texinput/KS/HLaTeX/c63mj.fd6
-rw-r--r--Master/texmf-dist/source/latex/cjk/texinput/KS/HLaTeX/c64mj.fd6
-rw-r--r--Master/texmf-dist/source/latex/cjk/texinput/KS/HLaTeX/c65mj.fd6
-rw-r--r--Master/texmf-dist/source/latex/cjk/utils/Bg5conv/bg5conv.w10
-rw-r--r--Master/texmf-dist/source/latex/cjk/utils/Bg5conv/bg5latex.cmd4
-rw-r--r--Master/texmf-dist/source/latex/cjk/utils/CEFconv/cef5conv.w10
-rw-r--r--Master/texmf-dist/source/latex/cjk/utils/CEFconv/cef5ltx.cmd6
-rw-r--r--Master/texmf-dist/source/latex/cjk/utils/CEFconv/cefconv.w10
-rw-r--r--Master/texmf-dist/source/latex/cjk/utils/CEFconv/ceflatex.cmd6
-rw-r--r--Master/texmf-dist/source/latex/cjk/utils/CEFconv/cefsconv.w10
-rw-r--r--Master/texmf-dist/source/latex/cjk/utils/CEFconv/cefsltx.cmd6
-rw-r--r--Master/texmf-dist/source/latex/cjk/utils/SJISconv/sjisconv.w10
-rw-r--r--Master/texmf-dist/source/latex/cjk/utils/SJISconv/sjisltx.cmd4
-rw-r--r--Master/texmf-dist/source/latex/cjk/utils/extconv/bg5pltx.cmd4
-rw-r--r--Master/texmf-dist/source/latex/cjk/utils/extconv/extconv.w10
-rw-r--r--Master/texmf-dist/source/latex/cjk/utils/extconv/gbklatex.cmd4
-rw-r--r--Master/texmf-dist/source/latex/cjk/utils/hbf2gf/Makefile.gnu4
-rw-r--r--Master/texmf-dist/source/latex/cjk/utils/hbf2gf/Makefile.in2
-rw-r--r--Master/texmf-dist/source/latex/cjk/utils/hbf2gf/c-auto.h4
-rw-r--r--Master/texmf-dist/source/latex/cjk/utils/hbf2gf/dvidrv.btm2
-rw-r--r--Master/texmf-dist/source/latex/cjk/utils/lisp/cjkspace.el4
-rw-r--r--Master/texmf-dist/source/latex/cjk/utils/lisp/cjktilde.el4
-rw-r--r--Master/texmf-dist/source/latex/cjk/utils/lisp/emacs/cjk-enc.el37
-rw-r--r--Master/texmf-dist/source/latex/cjk/utils/lisp/mule-2.3/cjk-enc.el2
-rw-r--r--Master/texmf-dist/source/latex/cjk/utils/pyhyphen/GNUmakefile75
-rw-r--r--Master/texmf-dist/source/latex/cjk/utils/pyhyphen/hyph-zh-latn-pinyin.in66
-rw-r--r--Master/texmf-dist/source/latex/cjk/utils/pyhyphen/hyph-zh-latn-pinyin.tex253
-rw-r--r--Master/texmf-dist/source/latex/cjk/utils/pyhyphen/hyph-zh-latn-tonepinyin.tex253
-rw-r--r--Master/texmf-dist/source/latex/cjk/utils/pyhyphen/make-patterns.sh62
-rw-r--r--Master/texmf-dist/source/latex/cjk/utils/pyhyphen/pinyin.c74
-rw-r--r--Master/texmf-dist/source/latex/cjk/utils/pyhyphen/pinyin.tr9
-rw-r--r--Master/texmf-dist/source/latex/cjk/utils/pyhyphen/pyhyph.tex236
-rw-r--r--Master/texmf-dist/source/latex/cjk/utils/subfonts/clonevf.pl2
-rw-r--r--Master/texmf-dist/source/latex/cjk/utils/subfonts/hlatex2agl.pl2
-rw-r--r--Master/texmf-dist/source/latex/cjk/utils/subfonts/makefdx.pl8
-rw-r--r--Master/texmf-dist/source/latex/cjk/utils/subfonts/sfd2uni.pl2
-rw-r--r--Master/texmf-dist/source/latex/cjk/utils/subfonts/subfonts.pe2
-rw-r--r--Master/texmf-dist/source/latex/cjk/utils/subfonts/uni2sfd.pl2
-rw-r--r--Master/texmf-dist/tex/latex/cjk/contrib/wadalab/c42goth.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/contrib/wadalab/c42goth.fdx6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/contrib/wadalab/c42maru.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/contrib/wadalab/c42maru.fdx6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/contrib/wadalab/c42min.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/contrib/wadalab/c42min.fdx6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/contrib/wadalab/c52maru.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/contrib/wadalab/c52maru.fdx6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/contrib/wadalab/c52min.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/contrib/wadalab/c52min.fdx6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/contrib/wadalab/c70goth.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/contrib/wadalab/c70goth.fdx6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/contrib/wadalab/c70maru.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/contrib/wadalab/c70maru.fdx6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/contrib/wadalab/c70min.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/contrib/wadalab/c70min.fdx6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/Bg5/Bg5.cap8
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/Bg5/Bg5.chr8
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/Bg5/Bg5.cpx8
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/Bg5/Bg5.enc8
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/Bg5/HK.enc6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/Bg5/c00bkai.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/Bg5/c00bkai.fdx6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/Bg5/c00bsmi.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/Bg5/c00bsmi.fdx6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/Bg5/c00bsmir.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/Bg5/c00bsmir.fdx6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/Bg5/c00cns.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/Bg5/c00fs.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/Bg5/c00kai.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/Bg5/c00kair.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/Bg5/c00kair.fdx6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/Bg5/c00song.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/Bg5/c01song.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/Bg5/c05song.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/Bg5/c09song.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/CEF/c80song.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/CEF/c81song.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/CJK.enc8
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/CJK.sty63
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/CJKfntef.sty8
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/CJKnumb.sty10
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/CJKspace.sty4
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/CJKulem.sty8
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/CJKutf8.sty8
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/CJKvert.sty8
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/CNS/EUC-TW.bdg8
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/CNS/EUC-TW.chr8
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/CNS/EUC-TW.enc8
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/CNS/c31song.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/CNS/c32song.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/CNS/c33song.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/CNS/c34song.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/CNS/c35song.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/CNS/c36song.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/CNS/c37song.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/GB/GB.cap8
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/GB/GB.cpx8
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/GB/c10fs.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/GB/c10gbsn.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/GB/c10gbsn.fdx6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/GB/c10gkai.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/GB/c10gkai.fdx6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/GB/c10song.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/GB/c11song.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/GB/c19song.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/GB/c20song.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/GB/c21song.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/JIS/EUC-JP.bdg8
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/JIS/EUC-JP.chr8
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/JIS/EUC-JP.enc8
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/JIS/EUC-JPdnp.enc8
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/JIS/JIS.cap8
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/JIS/JIS.cpx8
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/JIS/JISdnp.enc8
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/JIS/c40song.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/JIS/c41song.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/JIS/c42song.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/JIS/c43song.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/JIS/c50song.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/HLaTeX.chr8
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/KSHL.enc8
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c63bm.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c63dn.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c63gr.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c63gs.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c63gt.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c63jgt.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c63jmj.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c63jnv.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c63jsr.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c63mj.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c63pg.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c63pga.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c63ph.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c63pn.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c63sh.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c63tz.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c63vd.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c63yt.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c64bm.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c64dn.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c64gr.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c64gs.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c64gt.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c64jgt.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c64jmj.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c64jnv.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c64jsr.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c64mj.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c64pg.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c64pga.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c64ph.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c64pn.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c64sh.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c64tz.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c64vd.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c64yt.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c65bm.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c65dn.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c65gr.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c65gs.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c65gt.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c65jgt.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c65jmj.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c65jnv.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c65jsr.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c65mj.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c65pg.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c65pga.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c65ph.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c65pn.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c65sh.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c65tz.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c65vd.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c65yt.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/pshan.sty8
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/KS/KS.chr8
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/KS/KS.enc6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/KS/c60dr.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/KS/c60gr.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/KS/c60gs.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/KS/c60gt.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/KS/c60hgt.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/KS/c60hmj.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/KS/c60hol.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/KS/c60hpg.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/KS/c60mj.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/KS/c61dr.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/KS/c61gr.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/KS/c61gs.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/KS/c61gt.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/KS/c61hgt.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/KS/c61hmj.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/KS/c61hol.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/KS/c61hpg.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/KS/c61mj.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/KS/c62song.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/KS/hangul.cap8
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/KS/hangul.cpx8
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/KS/hangul2.cap8
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/KS/hangul2.cpx8
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/KS/hanja.cap8
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/KS/hanja.cpx8
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/SJIS/SJIS.bdg8
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/SJIS/SJIS.cap8
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/SJIS/SJIS.chr8
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/SJIS/SJIS.cpx8
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/SJIS/SJIS.enc8
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/SJIS/SJISdnp.chr8
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/SJIS/SJISdnp.enc8
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/SJIS/c49song.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/UTF8/UTF8.bdg8
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/UTF8/UTF8.chr8
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/UTF8/UTF8.enc8
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/UTF8/c70bkai.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/UTF8/c70bkai.fdx6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/UTF8/c70bsmi.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/UTF8/c70bsmi.fdx6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/UTF8/c70gbsn.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/UTF8/c70gbsn.fdx4
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/UTF8/c70gkai.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/UTF8/c70gkai.fdx4
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/UTF8/c70mj.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/UTF8/c70mj.fdx4
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/UTF8/c70song.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/UTF8/ja.cpx8
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/UTF8/ko-Hang.cpx8
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/UTF8/ko-Hang2.cpx8
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/UTF8/ko-Hani.cpx8
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/UTF8/zh-Hans.cpx8
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/UTF8/zh-Hant.cpx8
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/extended.chr8
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/extended.enc8
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/mule/MULEenc.sty8
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/pinyin.sty8
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/pmC.chr8
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/pmCbig.enc8
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/pmCsmall.enc8
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/ruby.sty8
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/standard.bdg8
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/standard.chr8
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/standard.enc8
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/thai/c90cmr.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/thai/c90cmss.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/thai/c90cmtt.fd6
-rw-r--r--Master/texmf-dist/tex/latex/cjk/texinput/thai/thaicjk.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/cjk/utils/pyhyphen/pinyin.ldf37
-rwxr-xr-xMaster/tlpkg/bin/tlpkginfo2
-rw-r--r--Master/tlpkg/libexec/c90.pl2
-rw-r--r--Master/tlpkg/libexec/cjk-build.pl5
-rw-r--r--Master/tlpkg/libexec/cjk.pl22
-rw-r--r--Master/tlpkg/libexec/cjkutils.pl (renamed from Master/tlpkg/libexec/bin-cjkutils.pl)22
-rwxr-xr-xMaster/tlpkg/libexec/ctan2tds8
-rw-r--r--Master/tlpkg/libexec/dnp.pl2
-rw-r--r--Master/tlpkg/libexec/garuda-c90.pl2
-rw-r--r--Master/tlpkg/libexec/norasi-c90.pl2
345 files changed, 2117 insertions, 1263 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}
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 nhš¢¤t cš¢üa 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
66¤206Æ201¤223Ê253¤200¤189¤206¹189Â164¡215¤206¹224Ì220¤242\ruby{66»178}{66¤181¤243}\ruby{66¾200}{66¤183¤231¤166}66¤183¤198²188¤181
¤164¡163}
-\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}
diff --git a/Master/texmf-dist/source/latex/cjk/contrib/wadalab/fixwada b/Master/texmf-dist/source/latex/cjk/contrib/wadalab/fixwada
index 378fea87756..8f37b5bc9e7 100644
--- a/Master/texmf-dist/source/latex/cjk/contrib/wadalab/fixwada
+++ b/Master/texmf-dist/source/latex/cjk/contrib/wadalab/fixwada
@@ -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
diff --git a/Master/texmf-dist/source/latex/cjk/contrib/wadalab/fixwada2.pl b/Master/texmf-dist/source/latex/cjk/contrib/wadalab/fixwada2.pl
index 620bd7196db..af2477c306f 100644
--- a/Master/texmf-dist/source/latex/cjk/contrib/wadalab/fixwada2.pl
+++ b/Master/texmf-dist/source/latex/cjk/contrib/wadalab/fixwada2.pl
@@ -1,6 +1,6 @@
#! /usr/bin/perl -w
#
-# 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
@@ -18,7 +18,7 @@
# MA 02110-1301 USA
# This script fixes the Wadalab fonts which have been created with the
-# `makefont' script version 1.0 (from CJK 4.8.4), or which have been updated
+# `makefont' script version 1.0 (from CJK 4.8.5), or which have been updated
# with the `fixwada' script.
#
# . Make all glyph names compliant to the Adobe Glyph List (AGL) to
diff --git a/Master/texmf-dist/source/latex/cjk/contrib/wadalab/makefont b/Master/texmf-dist/source/latex/cjk/contrib/wadalab/makefont
index bb1880939bc..98b20cd541a 100644
--- a/Master/texmf-dist/source/latex/cjk/contrib/wadalab/makefont
+++ b/Master/texmf-dist/source/latex/cjk/contrib/wadalab/makefont
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# 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
diff --git a/Master/texmf-dist/source/latex/cjk/contrib/wadalab/makeuniwada.pl b/Master/texmf-dist/source/latex/cjk/contrib/wadalab/makeuniwada.pl
index 95be460e229..826ea3d3cba 100644
--- a/Master/texmf-dist/source/latex/cjk/contrib/wadalab/makeuniwada.pl
+++ b/Master/texmf-dist/source/latex/cjk/contrib/wadalab/makeuniwada.pl
@@ -1,6 +1,6 @@
#! /usr/bin/perl -w
#
-# 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
diff --git a/Master/texmf-dist/source/latex/cjk/texinput/KS/HLaTeX/c63mj.fd b/Master/texmf-dist/source/latex/cjk/texinput/KS/HLaTeX/c63mj.fd
index ac1ba4bbf3b..cd99102f694 100644
--- a/Master/texmf-dist/source/latex/cjk/texinput/KS/HLaTeX/c63mj.fd
+++ b/Master/texmf-dist/source/latex/cjk/texinput/KS/HLaTeX/c63mj.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c63mj.fd}[\filedate\space\fileversion]
% Korean characters (Hangul)
diff --git a/Master/texmf-dist/source/latex/cjk/texinput/KS/HLaTeX/c64mj.fd b/Master/texmf-dist/source/latex/cjk/texinput/KS/HLaTeX/c64mj.fd
index 6d2abe0dcdc..1673eaa14b8 100644
--- a/Master/texmf-dist/source/latex/cjk/texinput/KS/HLaTeX/c64mj.fd
+++ b/Master/texmf-dist/source/latex/cjk/texinput/KS/HLaTeX/c64mj.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c64mj.fd}[\filedate\space\fileversion]
% Korean characters (Symbols)
diff --git a/Master/texmf-dist/source/latex/cjk/texinput/KS/HLaTeX/c65mj.fd b/Master/texmf-dist/source/latex/cjk/texinput/KS/HLaTeX/c65mj.fd
index e0214d2167b..6e998adf3f5 100644
--- a/Master/texmf-dist/source/latex/cjk/texinput/KS/HLaTeX/c65mj.fd
+++ b/Master/texmf-dist/source/latex/cjk/texinput/KS/HLaTeX/c65mj.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c65mj.fd}[\filedate\space\fileversion]
% Korean characters (Hanja)
diff --git a/Master/texmf-dist/source/latex/cjk/utils/Bg5conv/bg5conv.w b/Master/texmf-dist/source/latex/cjk/utils/Bg5conv/bg5conv.w
index 13165032d66..fdce159e14c 100644
--- a/Master/texmf-dist/source/latex/cjk/utils/Bg5conv/bg5conv.w
+++ b/Master/texmf-dist/source/latex/cjk/utils/Bg5conv/bg5conv.w
@@ -1,6 +1,6 @@
-% This is the cweb file bg5conv.w of the CJK Package Ver. 4.8.4 18-Apr-2015
+% This is the cweb file bg5conv.w of the CJK Package Ver. 4.8.5 16-Oct-2021
-% 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
@@ -26,13 +26,13 @@
% output rules (look at the position of braces below!) the author (it's me
% too :-) prefer. Otherwise this file will be formatted traditionally.
-\def\title{bg5conv (CJK Version 4.8.4)}
+\def\title{bg5conv (CJK Version 4.8.5)}
\def\topofcontents{
\null\vfill
\centerline{\titlefont The {\ttitlefont bg5conv} program}
\vskip 20pt
- \centerline{(CJK Version 4.8.4)}
+ \centerline{(CJK Version 4.8.5)}
\vfill}
\def\botofcontents{
@@ -89,7 +89,7 @@ which will see the output of \.{bg5conv} complains loudly if something is
wrong.
@d banner
-"bg5conv (CJK ver. 4.8.4)"
+"bg5conv (CJK ver. 4.8.5)"
@c
#include <stdio.h>
diff --git a/Master/texmf-dist/source/latex/cjk/utils/Bg5conv/bg5latex.cmd b/Master/texmf-dist/source/latex/cjk/utils/Bg5conv/bg5latex.cmd
index fb34abe3eaa..141a05d3be5 100644
--- a/Master/texmf-dist/source/latex/cjk/utils/Bg5conv/bg5latex.cmd
+++ b/Master/texmf-dist/source/latex/cjk/utils/Bg5conv/bg5latex.cmd
@@ -1,9 +1,9 @@
/*----------------------------------------------------------------------*\
bg5latex.cmd
- This file is part of the CJK macro package for LaTeX2e ver. 4.8.4
+ This file is part of the CJK macro package for LaTeX2e ver. 4.8.5
- Copyright (C) 1994-2015 Wonkoo Kim <wkim+@pitt.edu>
+ Copyright (C) 1994-2021 Wonkoo Kim <wkim+@pitt.edu>
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
diff --git a/Master/texmf-dist/source/latex/cjk/utils/CEFconv/cef5conv.w b/Master/texmf-dist/source/latex/cjk/utils/CEFconv/cef5conv.w
index 575ba253aea..59942012ab4 100644
--- a/Master/texmf-dist/source/latex/cjk/utils/CEFconv/cef5conv.w
+++ b/Master/texmf-dist/source/latex/cjk/utils/CEFconv/cef5conv.w
@@ -1,6 +1,6 @@
-% This is the cweb file cef5conv.w of the CJK Package Ver. 4.8.4 18-Apr-2015
+% This is the cweb file cef5conv.w of the CJK Package Ver. 4.8.5 16-Oct-2021
-% 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
@@ -26,13 +26,13 @@
% output rules (look at the position of braces below!) the author (it's me
% too :-) prefer. Otherwise this file will be formatted traditionally.
-\def\title{cef5conv (CJK Version 4.8.4)}
+\def\title{cef5conv (CJK Version 4.8.5)}
\def\topofcontents{
\null\vfill
\centerline{\titlefont The {\ttitlefont cef5conv} program}
\vskip 20pt
- \centerline{(CJK Version 4.8.4)}
+ \centerline{(CJK Version 4.8.5)}
\vfill}
\def\botofcontents{
@@ -103,7 +103,7 @@ which will see the output of \.{cef5conv} complains loudly if something is
wrong.
@d banner
-"cef5conv (CJK ver. 4.8.4)"
+"cef5conv (CJK ver. 4.8.5)"
@c
#include <ctype.h>
diff --git a/Master/texmf-dist/source/latex/cjk/utils/CEFconv/cef5ltx.cmd b/Master/texmf-dist/source/latex/cjk/utils/CEFconv/cef5ltx.cmd
index b48c39d4f7c..92f9dca6c68 100644
--- a/Master/texmf-dist/source/latex/cjk/utils/CEFconv/cef5ltx.cmd
+++ b/Master/texmf-dist/source/latex/cjk/utils/CEFconv/cef5ltx.cmd
@@ -1,11 +1,11 @@
/*----------------------------------------------------------------------*\
cef5ltx.cmd
- This file is part of the CJK macro package for LaTeX2e ver. 4.8.4
+ This file is part of the CJK macro package for LaTeX2e ver. 4.8.5
- This file is part of the CJK macro package for LaTeX2e ver. 4.8.4
+ This file is part of the CJK macro package for LaTeX2e ver. 4.8.5
- Copyright (C) 1994-2015 Wonkoo Kim <wkim+@pitt.edu>
+ Copyright (C) 1994-2021 Wonkoo Kim <wkim+@pitt.edu>
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
diff --git a/Master/texmf-dist/source/latex/cjk/utils/CEFconv/cefconv.w b/Master/texmf-dist/source/latex/cjk/utils/CEFconv/cefconv.w
index 142a5d862be..93fe237f242 100644
--- a/Master/texmf-dist/source/latex/cjk/utils/CEFconv/cefconv.w
+++ b/Master/texmf-dist/source/latex/cjk/utils/CEFconv/cefconv.w
@@ -1,6 +1,6 @@
-% This is the cweb file cefconv.w of the CJK Package Ver. 4.8.4 18-Apr-2015
+% This is the cweb file cefconv.w of the CJK Package Ver. 4.8.5 16-Oct-2021
-% 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
@@ -26,13 +26,13 @@
% output rules (look at the position of braces below!) the author (it's me
% too :-) prefer. Otherwise this file will be formatted traditionally.
-\def\title{cefconv (CJK Version 4.8.4)}
+\def\title{cefconv (CJK Version 4.8.5)}
\def\topofcontents{
\null\vfill
\centerline{\titlefont The {\ttitlefont cefconv} program}
\vskip 20pt
- \centerline{(CJK Version 4.8.4)}
+ \centerline{(CJK Version 4.8.5)}
\vfill}
\def\botofcontents{
@@ -95,7 +95,7 @@ which will see the output of \.{cefconv} complains loudly if something is
wrong.
@d banner
-"cefconv (CJK ver. 4.8.4)"
+"cefconv (CJK ver. 4.8.5)"
@c
#include <ctype.h>
diff --git a/Master/texmf-dist/source/latex/cjk/utils/CEFconv/ceflatex.cmd b/Master/texmf-dist/source/latex/cjk/utils/CEFconv/ceflatex.cmd
index cb66c840cba..3e2b884c311 100644
--- a/Master/texmf-dist/source/latex/cjk/utils/CEFconv/ceflatex.cmd
+++ b/Master/texmf-dist/source/latex/cjk/utils/CEFconv/ceflatex.cmd
@@ -1,11 +1,11 @@
/*----------------------------------------------------------------------*\
ceflatex.cmd
- This file is part of the CJK macro package for LaTeX2e ver. 4.8.4
+ This file is part of the CJK macro package for LaTeX2e ver. 4.8.5
- This file is part of the CJK macro package for LaTeX2e ver. 4.8.4
+ This file is part of the CJK macro package for LaTeX2e ver. 4.8.5
- Copyright (C) 1994-2015 Wonkoo Kim <wkim+@pitt.edu>
+ Copyright (C) 1994-2021 Wonkoo Kim <wkim+@pitt.edu>
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
diff --git a/Master/texmf-dist/source/latex/cjk/utils/CEFconv/cefsconv.w b/Master/texmf-dist/source/latex/cjk/utils/CEFconv/cefsconv.w
index 7e033f34ea4..5f8d7870caa 100644
--- a/Master/texmf-dist/source/latex/cjk/utils/CEFconv/cefsconv.w
+++ b/Master/texmf-dist/source/latex/cjk/utils/CEFconv/cefsconv.w
@@ -1,6 +1,6 @@
-% This is the cweb file cefsconv.w of the CJK Package Ver. 4.8.4 18-Apr-2015
+% This is the cweb file cefsconv.w of the CJK Package Ver. 4.8.5 16-Oct-2021
-% 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
@@ -26,13 +26,13 @@
% output rules (look at the position of braces below!) the author (it's me
% too :-) prefer. Otherwise this file will be formatted traditionally.
-\def\title{cefsconv (CJK Version 4.8.4)}
+\def\title{cefsconv (CJK Version 4.8.5)}
\def\topofcontents{
\null\vfill
\centerline{\titlefont The {\ttitlefont cefsconv} program}
\vskip 20pt
- \centerline{(CJK Version 4.8.4)}
+ \centerline{(CJK Version 4.8.5)}
\vfill}
\def\botofcontents{
@@ -106,7 +106,7 @@ Note that the user-defined character area of SJIS (with the first bytes in
the range 0xF0--0xFC) is not supported because it is not portable.
@d banner
-"cefsconv (CJK ver. 4.8.4)"
+"cefsconv (CJK ver. 4.8.5)"
@c
#include <ctype.h>
diff --git a/Master/texmf-dist/source/latex/cjk/utils/CEFconv/cefsltx.cmd b/Master/texmf-dist/source/latex/cjk/utils/CEFconv/cefsltx.cmd
index 96dfbfd0bab..e22a8073c73 100644
--- a/Master/texmf-dist/source/latex/cjk/utils/CEFconv/cefsltx.cmd
+++ b/Master/texmf-dist/source/latex/cjk/utils/CEFconv/cefsltx.cmd
@@ -1,11 +1,11 @@
/*----------------------------------------------------------------------*\
cefsltx.cmd
- This file is part of the CJK macro package for LaTeX2e ver. 4.8.4
+ This file is part of the CJK macro package for LaTeX2e ver. 4.8.5
- This file is part of the CJK macro package for LaTeX2e ver. 4.8.4
+ This file is part of the CJK macro package for LaTeX2e ver. 4.8.5
- Copyright (C) 1994-2015 Wonkoo Kim <wkim+@pitt.edu>
+ Copyright (C) 1994-2021 Wonkoo Kim <wkim+@pitt.edu>
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
diff --git a/Master/texmf-dist/source/latex/cjk/utils/SJISconv/sjisconv.w b/Master/texmf-dist/source/latex/cjk/utils/SJISconv/sjisconv.w
index c1044cf36d9..c3e72454e46 100644
--- a/Master/texmf-dist/source/latex/cjk/utils/SJISconv/sjisconv.w
+++ b/Master/texmf-dist/source/latex/cjk/utils/SJISconv/sjisconv.w
@@ -1,6 +1,6 @@
-% This is the cweb file sjisconv.w of the CJK Package Ver. 4.8.4 18-Apr-2015
+% This is the cweb file sjisconv.w of the CJK Package Ver. 4.8.5 16-Oct-2021
-% 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
@@ -26,13 +26,13 @@
% output rules (look at the position of braces below!) the author (it's me
% too :-) prefer. Otherwise this file will be formatted traditionally.
-\def\title{sjisconv (CJK Version 4.8.4)}
+\def\title{sjisconv (CJK Version 4.8.5)}
\def\topofcontents{
\null\vfill
\centerline{\titlefont The {\ttitlefont sjisconv} program}
\vskip 20pt
- \centerline{(CJK Version 4.8.4)}
+ \centerline{(CJK Version 4.8.5)}
\vfill}
\def\botofcontents{
@@ -91,7 +91,7 @@ Note that the user-defined character area of SJIS (with the first bytes in
the range 0xF0--0xFC) is not supported because it is not portable.
@d banner
-"sjisconv (CJK ver. 4.8.4)"
+"sjisconv (CJK ver. 4.8.5)"
@c
#include <stdio.h>
diff --git a/Master/texmf-dist/source/latex/cjk/utils/SJISconv/sjisltx.cmd b/Master/texmf-dist/source/latex/cjk/utils/SJISconv/sjisltx.cmd
index 26857cb52a8..1126d44347a 100644
--- a/Master/texmf-dist/source/latex/cjk/utils/SJISconv/sjisltx.cmd
+++ b/Master/texmf-dist/source/latex/cjk/utils/SJISconv/sjisltx.cmd
@@ -1,9 +1,9 @@
/*----------------------------------------------------------------------*\
sjisltx.cmd
- This file is part of the CJK macro package for LaTeX2e ver. 4.8.4
+ This file is part of the CJK macro package for LaTeX2e ver. 4.8.5
- Copyright (C) 1994-2015 Wonkoo Kim <wkim+@pitt.edu>
+ Copyright (C) 1994-2021 Wonkoo Kim <wkim+@pitt.edu>
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
diff --git a/Master/texmf-dist/source/latex/cjk/utils/extconv/bg5pltx.cmd b/Master/texmf-dist/source/latex/cjk/utils/extconv/bg5pltx.cmd
index ff493a5ab32..89b77d1f101 100644
--- a/Master/texmf-dist/source/latex/cjk/utils/extconv/bg5pltx.cmd
+++ b/Master/texmf-dist/source/latex/cjk/utils/extconv/bg5pltx.cmd
@@ -1,9 +1,9 @@
/*----------------------------------------------------------------------*\
bg5pltx.cmd
- This file is part of the CJK macro package for LaTeX2e ver. 4.8.4
+ This file is part of the CJK macro package for LaTeX2e ver. 4.8.5
- Copyright (C) 1994-2015 Wonkoo Kim <wkim+@pitt.edu>
+ Copyright (C) 1994-2021 Wonkoo Kim <wkim+@pitt.edu>
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
diff --git a/Master/texmf-dist/source/latex/cjk/utils/extconv/extconv.w b/Master/texmf-dist/source/latex/cjk/utils/extconv/extconv.w
index 019976889b9..fe1b1ff0064 100644
--- a/Master/texmf-dist/source/latex/cjk/utils/extconv/extconv.w
+++ b/Master/texmf-dist/source/latex/cjk/utils/extconv/extconv.w
@@ -1,6 +1,6 @@
-% This is the cweb file extconv.w of the CJK Package Ver. 4.8.4 18-Apr-2015
+% This is the cweb file extconv.w of the CJK Package Ver. 4.8.5 16-Oct-2021
-% 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
@@ -26,13 +26,13 @@
% output rules (look at the position of braces below!) the author (it's me
% too :-) prefer. Otherwise this file will be formatted traditionally.
-\def\title{extconv (CJK Version 4.8.4)}
+\def\title{extconv (CJK Version 4.8.5)}
\def\topofcontents{
\null\vfill
\centerline{\titlefont The {\ttitlefont extconv} program}
\vskip 20pt
- \centerline{(CJK Version 4.8.4)}
+ \centerline{(CJK Version 4.8.5)}
\vfill}
\def\botofcontents{
@@ -89,7 +89,7 @@ which will see the output of \.{extconv} complains loudly if something is
wrong.
@d banner
-"extconv (CJK ver. 4.8.4)"
+"extconv (CJK ver. 4.8.5)"
@c
#include <stdio.h>
diff --git a/Master/texmf-dist/source/latex/cjk/utils/extconv/gbklatex.cmd b/Master/texmf-dist/source/latex/cjk/utils/extconv/gbklatex.cmd
index 397a889d78a..9e95a9ada89 100644
--- a/Master/texmf-dist/source/latex/cjk/utils/extconv/gbklatex.cmd
+++ b/Master/texmf-dist/source/latex/cjk/utils/extconv/gbklatex.cmd
@@ -1,9 +1,9 @@
/*----------------------------------------------------------------------*\
gbklatex.cmd
- This file is part of the CJK macro package for LaTeX2e ver. 4.8.4
+ This file is part of the CJK macro package for LaTeX2e ver. 4.8.5
- Copyright (C) 1994-2015 Wonkoo Kim <wkim+@pitt.edu>
+ Copyright (C) 1994-2021 Wonkoo Kim <wkim+@pitt.edu>
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
diff --git a/Master/texmf-dist/source/latex/cjk/utils/hbf2gf/Makefile.gnu b/Master/texmf-dist/source/latex/cjk/utils/hbf2gf/Makefile.gnu
index 1248c4f508a..7dd88f3b228 100644
--- a/Master/texmf-dist/source/latex/cjk/utils/hbf2gf/Makefile.gnu
+++ b/Master/texmf-dist/source/latex/cjk/utils/hbf2gf/Makefile.gnu
@@ -1,6 +1,6 @@
-# This file is part of the CJK package Version 4.8.4 (18-Apr-2015)
+# This file is part of the CJK package Version 4.8.5 (16-Oct-2021)
-# 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
diff --git a/Master/texmf-dist/source/latex/cjk/utils/hbf2gf/Makefile.in b/Master/texmf-dist/source/latex/cjk/utils/hbf2gf/Makefile.in
index 937d5d6f818..bf6022f818b 100644
--- a/Master/texmf-dist/source/latex/cjk/utils/hbf2gf/Makefile.in
+++ b/Master/texmf-dist/source/latex/cjk/utils/hbf2gf/Makefile.in
@@ -1,6 +1,6 @@
# Makefile for hbf2gf -- wl@gnu.org
-# 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
diff --git a/Master/texmf-dist/source/latex/cjk/utils/hbf2gf/c-auto.h b/Master/texmf-dist/source/latex/cjk/utils/hbf2gf/c-auto.h
index 0bdbc5f782e..96e9b06279a 100644
--- a/Master/texmf-dist/source/latex/cjk/utils/hbf2gf/c-auto.h
+++ b/Master/texmf-dist/source/latex/cjk/utils/hbf2gf/c-auto.h
@@ -1,12 +1,12 @@
/*
* c-auto.h
*
- * 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
*
*/
/*
- 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
diff --git a/Master/texmf-dist/source/latex/cjk/utils/hbf2gf/dvidrv.btm b/Master/texmf-dist/source/latex/cjk/utils/hbf2gf/dvidrv.btm
index 4ec03d0bf20..9b43c091001 100644
--- a/Master/texmf-dist/source/latex/cjk/utils/hbf2gf/dvidrv.btm
+++ b/Master/texmf-dist/source/latex/cjk/utils/hbf2gf/dvidrv.btm
@@ -1,6 +1,6 @@
setdos /y1
::
-:: 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
diff --git a/Master/texmf-dist/source/latex/cjk/utils/lisp/cjkspace.el b/Master/texmf-dist/source/latex/cjk/utils/lisp/cjkspace.el
index 89b072111f7..4903f300de1 100644
--- a/Master/texmf-dist/source/latex/cjk/utils/lisp/cjkspace.el
+++ b/Master/texmf-dist/source/latex/cjk/utils/lisp/cjkspace.el
@@ -1,7 +1,7 @@
;;; cjkspace.el --- provide a tilde character if you type a space.
;;; use this file with AUCTeX.
-;; 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
@@ -18,7 +18,7 @@
;; Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
;; MA 02110-1301 USA
-;; This file is part of the CJK package Version 4.8.4 (18-Apr-2015)
+;; This file is part of the CJK package Version 4.8.5 (16-Oct-2021)
;; Insert tilde characters instead of spaces for LaTeX CJK documents.
;; If `CJK-space-after-space' is non-nil, typing a space yields a space.
diff --git a/Master/texmf-dist/source/latex/cjk/utils/lisp/cjktilde.el b/Master/texmf-dist/source/latex/cjk/utils/lisp/cjktilde.el
index 1d075fc688c..2d961ddd12f 100644
--- a/Master/texmf-dist/source/latex/cjk/utils/lisp/cjktilde.el
+++ b/Master/texmf-dist/source/latex/cjk/utils/lisp/cjktilde.el
@@ -1,6 +1,6 @@
;;; cjktilde.el -- minor mode exchanging `~' and ` ' keys.
-;; 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
@@ -17,7 +17,7 @@
;; Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
;; MA 02110-1301 USA
-;; This file is part of the CJK package Version 4.8.4 (18-Apr-2015)
+;; This file is part of the CJK package Version 4.8.5 (16-Oct-2021)
;; Function `cjk-tilde-mode' activates a minor mode (`cjk-tilde-minor-mode')
;; which exchanges the tilde key with the space key. This is useful for
diff --git a/Master/texmf-dist/source/latex/cjk/utils/lisp/emacs/cjk-enc.el b/Master/texmf-dist/source/latex/cjk/utils/lisp/emacs/cjk-enc.el
index da2052eb56a..93add2d75bf 100644
--- a/Master/texmf-dist/source/latex/cjk/utils/lisp/emacs/cjk-enc.el
+++ b/Master/texmf-dist/source/latex/cjk/utils/lisp/emacs/cjk-enc.el
@@ -23,7 +23,7 @@
;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
;;
-;; CJK Version 4.8.4 (18-Apr-2015)
+;; CJK Version 4.8.5 (16-Oct-2021)
;;
;;; Code
@@ -444,6 +444,7 @@
(korean-ksc5601 . KS)
(chinese-big5-1 . Bg5)
(chinese-big5-2 . Bg5)
+ (big5 . Bg5)
(chinese-cns11643-1 . CNS1)
(chinese-cns11643-2 . CNS2)
(chinese-cns11643-3 . CNS3)
@@ -505,6 +506,7 @@
(chinese-gb2312 . ("\17767\177\177" . "\177%c\177%d\177"))
(chinese-big5-1 . ("\17768\177\177" . "\177%c\177%d\177"))
(chinese-big5-2 . ("\17768\177\177" . "\177%c\177%d\177"))
+ (big5 . ("\17768\177\177" . "\177%c\177%d\177"))
(korean-ksc5601 . ("\17769\177\177" . "\177%c\177%d\177"))
;; Cdr part is a formatter string FORMAT. Each character is
@@ -629,7 +631,8 @@
ch ch1 ch2
format-spec
(skipped-whitespace nil)
- (last-pos 0))
+ (last-pos 0)
+ (unsupported-charset-warned nil))
;; Now we go to beginning of TEMP-BUF and start the loop.
(goto-char (point-min))
(setq prev-charset 'ascii)
@@ -653,6 +656,13 @@
(if (eq charset 'tis620-2533)
(setq charset (char-charset ch '(thai-tis620 ascii))))
+ ;; emacs 25+: Language-detection heuristics changed.
+ ;; `big5' is preferred over `chinese-big5-1' and `chinese-big5-1'.
+ ;; If not overridden, can also swallow LaTeX (ascii) instructions
+ ;; afterwards.
+ (if (eq charset 'big5)
+ (setq charset (char-charset ch '(ascii big5))))
+
;; Check whether we have Unicode based input.
(if (eq charset 'unicode)
(let ((l (split-char ch)))
@@ -685,8 +695,9 @@
;; CH1 -- first character code
;; CH2 -- second character code (of two-byte characters)
;; if any
- (if (or (eq charset 'chinese-big5-1)
- (eq charset 'chinese-big5-2))
+ (if (or (eq charset 'big5)
+ (or (eq charset 'chinese-big5-1)
+ (eq charset 'chinese-big5-2)))
;; Emacs uses two special character sets for Big5
;; characters. We must decode the current character to
;; get the real Big5 character code.
@@ -712,8 +723,14 @@
;; FORMAT-SPEC tells how to encode this character.
(setq format-spec (cdr (assq charset cjk-format-spec-table)))
(if (null format-spec)
- ;; Unsupported character set. Do nothing.
- nil
+ ;; Unsupported character set.
+ (when (not unsupported-charset-warned)
+ (let ((coding-system-for-write (terminal-coding-system)))
+ (message "WARNING: Detected unsupported character set %s"
+ charset)
+ (message "Consider using \`coding:\' or setting LANG."))
+ ;; Suppress further warning in the same lang block.
+ (setq unsupported-charset-warned t))
;; Ok, it is supported. If this character set is a CJK
;; character set (i.e., it is in CJK-ENC-TABLE), we need a
;; special header at the beginning of the output file.
@@ -765,6 +782,9 @@
(re-search-forward "\\ct+" nil t)
(setq end (point-marker))
(goto-char start)
+ ;; THAI-BREAK-WORDS is in `thai-word.el',
+ ;; shipped with emacs 22+ onwards.
+ ;; loads from cjk for emacs 21 or below.
(thai-break-words "|" end)
;; Extract this run.
(setq str (buffer-substring start end)
@@ -879,8 +899,9 @@
(if (> (- (point) last-pos) 1000)
(progn
(setq last-pos (point))
- (message "Converting: %2d%%"
- (/ (* 100 (point)) (point-max)))))
+ (let ((coding-system-for-write (terminal-coding-system)))
+ (message "Converting: %2d%%"
+ (/ (* 100 (point)) (point-max))))))
;; Advance to the next character and loop.
(forward-char 1))
diff --git a/Master/texmf-dist/source/latex/cjk/utils/lisp/mule-2.3/cjk-enc.el b/Master/texmf-dist/source/latex/cjk/utils/lisp/mule-2.3/cjk-enc.el
index d93d53e5ca4..9f2371bba5a 100644
--- a/Master/texmf-dist/source/latex/cjk/utils/lisp/mule-2.3/cjk-enc.el
+++ b/Master/texmf-dist/source/latex/cjk/utils/lisp/mule-2.3/cjk-enc.el
@@ -22,7 +22,7 @@
;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
;;
-;; CJK Version 4.8.4 (18-Apr-2015)
+;; CJK Version 4.8.5 (16-Oct-2021)
;;
;;; Code
diff --git a/Master/texmf-dist/source/latex/cjk/utils/pyhyphen/GNUmakefile b/Master/texmf-dist/source/latex/cjk/utils/pyhyphen/GNUmakefile
new file mode 100644
index 00000000000..de8c7c41de0
--- /dev/null
+++ b/Master/texmf-dist/source/latex/cjk/utils/pyhyphen/GNUmakefile
@@ -0,0 +1,75 @@
+# Makefile to create hyphenation patterns for pinyin with tone marks and
+# pinyin without tone marks.
+
+BASH = bash
+CC = cc
+DATE = date
+GIT = git
+ICONV = iconv -f latin1 -t utf8
+RM = rm -f
+SED = sed # should be GNU sed
+
+GIT_VERSION = $(shell $(GIT) log --format=%H -1 HEAD --)
+LEFTHYPHENMIN = $(strip $(shell $(SED) 's/^\(..\).*/\1/;q' < pinyin.tr))
+RIGHTHYPHENMIN = $(strip $(shell $(SED) 's/^..\(..\).*/\1/;q' < pinyin.tr))
+TODAY = $(shell $(DATE) '+%Y-%m-%d')
+
+
+all: hyph-zh-latn-pinyin.tex \
+ hyph-zh-latn-tonepinyin.tex
+
+pinyin: pinyin.c
+ $(CC) -o $@ $<
+
+pinyin.dic: pinyin
+ ./$< > $@
+
+pattern.rules pinyin.pat: make-patterns.sh \
+ pinyin.dic \
+ pinyin.tr
+ $(BASH) make-patterns.sh pinyin.dic pinyin.tr \
+ && $(ICONV) < pattern.2 > pinyin.pat
+
+tonepinyin.pat: pinyin.pat
+ LANG=en_US.UTF-8 \
+ $(SED) -e 's/\(.*\)a\(.*\)/\1a\2 \1Ä\2 \1á\2 \1ÇŽ\2 \1à\2/' \
+ -e 's/\(.*\)e\(.*\)/\1e\2 \1ē\2 \1é\2 \1ě\2 \1è\2/' \
+ -e 's/\(.*\)i\(.*\)/\1i\2 \1Ä«\2 \1í\2 \1Ç\2 \1ì\2/' \
+ -e 's/\(.*\)o\(.*\)/\1o\2 \1Å\2 \1ó\2 \1Ç’\2 \1ò\2/' \
+ -e 's/\(.*\)u\(.*\)/\1u\2 \1ū\2 \1ú\2 \1ǔ\2 \1ù\2/' \
+ -e 's/\(.*\)ü\(.*\)/\1ü\2 \1ǖ\2 \1ǘ\2 \1ǚ\2 \1ǜ\2/' \
+ < $< > $@
+
+hyph-zh-latn-pinyin.tex: hyph-zh-latn-pinyin.in \
+ pattern.rules \
+ pinyin.pat
+ $(SED) -e 's/@WITH@/without/' \
+ -e 's/@DATE@/$(TODAY)/' \
+ -e 's/@GIT_VERSION@/$(GIT_VERSION)/' \
+ -e 's/@LEFTHYPHENMIN@/$(LEFTHYPHENMIN)/' \
+ -e 's/@RIGHTHYPHENMIN@/$(RIGHTHYPHENMIN)/' \
+ -e '/used patgen parameters/ r pattern.rules' \
+ -e '/\\patterns/ r pinyin.pat' \
+ < $< > $@
+
+hyph-zh-latn-tonepinyin.tex: hyph-zh-latn-pinyin.in \
+ pattern.rules \
+ tonepinyin.pat
+ $(SED) -e 's/@WITH@/with/' \
+ -e 's/@DATE@/$(TODAY)/' \
+ -e 's/@GIT_VERSION@/$(GIT_VERSION)/' \
+ -e 's/@LEFTHYPHENMIN@/$(LEFTHYPHENMIN)/' \
+ -e 's/@RIGHTHYPHENMIN@/$(RIGHTHYPHENMIN)/' \
+ -e '/used patgen parameters/ r pattern.rules' \
+ -e '/\\patterns/ r tonepinyin.pat' \
+ < $< > $@
+
+clean:
+ $(RM) pinyin pinyin.dic pinyin.pat tonepinyin.pat
+ $(RM) pattern.*
+ $(RM) pattmp.*
+
+# Local Variables:
+# mode: makefile
+# coding: utf-8
+# End:
diff --git a/Master/texmf-dist/source/latex/cjk/utils/pyhyphen/hyph-zh-latn-pinyin.in b/Master/texmf-dist/source/latex/cjk/utils/pyhyphen/hyph-zh-latn-pinyin.in
new file mode 100644
index 00000000000..f905d3000c3
--- /dev/null
+++ b/Master/texmf-dist/source/latex/cjk/utils/pyhyphen/hyph-zh-latn-pinyin.in
@@ -0,0 +1,66 @@
+% title: Hyphenation patterns for Chinese pinyin (Mandarin), @WITH@ tone
+% markers
+%
+% version: @DATE@
+%
+% authors:
+% -
+% name: Werner Lemberg
+% contact: wl (at) gnu.org
+%
+% copyright: Copyright (C) 1994-2018 Werner Lemberg
+%
+% licence:
+% name: MIT
+% url: http://opensource.org/licenses/mit-license.php
+% text: >
+% Permission is hereby granted, free of charge, to any person
+% obtaining a copy of this software and associated documentation
+% files (the “Softwareâ€), to deal in the Software without
+% restriction, including without limitation the rights to use,
+% copy, modify, merge, publish, distribute, sublicense, and/or
+% sell copies of the Software, and to permit persons to whom the
+% Software is furnished to do so, subject to the following
+% conditions:
+%
+% The above copyright notice and this permission notice shall be
+% included in all copies or substantial portions of the Software.
+%
+% THE SOFTWARE IS PROVIDED “AS ISâ€, WITHOUT WARRANTY OF ANY KIND,
+% EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+% OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+% NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+% HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+% WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+% FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+% OTHER DEALINGS IN THE SOFTWARE.
+%
+% source: http://git.savannah.gnu.org/gitweb/?p=cjk.git;a=commit;h=@GIT_VERSION@
+%
+% language:
+% name: Mandarin Chinese, pinyin transliteration (@WITH@ tone markers)
+% tag: zh-latn-pinyin
+%
+% hyphenmins:
+% generation:
+% left: @LEFTHYPHENMIN@
+% right: @RIGHTHYPHENMIN@
+% typesetting:
+% left: @LEFTHYPHENMIN@
+% right: @RIGHTHYPHENMIN@
+
+\message{Pinyin Hyphenation Patterns (@WITH@ tone markers) @DATE@ (WL)}
+
+%
+% The used patgen parameters are
+%
+
+\patterns{
+}
+
+\endinput
+
+%%% Local Variables:
+%%% mode: tex
+%%% coding: utf-8
+%%% End:
diff --git a/Master/texmf-dist/source/latex/cjk/utils/pyhyphen/hyph-zh-latn-pinyin.tex b/Master/texmf-dist/source/latex/cjk/utils/pyhyphen/hyph-zh-latn-pinyin.tex
new file mode 100644
index 00000000000..71808598862
--- /dev/null
+++ b/Master/texmf-dist/source/latex/cjk/utils/pyhyphen/hyph-zh-latn-pinyin.tex
@@ -0,0 +1,253 @@
+% title: Hyphenation patterns for Chinese pinyin (Mandarin), without tone
+% markers
+%
+% version: 2018-11-25
+%
+% authors:
+% -
+% name: Werner Lemberg
+% contact: wl (at) gnu.org
+%
+% copyright: Copyright (C) 1994-2018 Werner Lemberg
+%
+% licence:
+% name: MIT
+% url: http://opensource.org/licenses/mit-license.php
+% text: >
+% Permission is hereby granted, free of charge, to any person
+% obtaining a copy of this software and associated documentation
+% files (the “Softwareâ€), to deal in the Software without
+% restriction, including without limitation the rights to use,
+% copy, modify, merge, publish, distribute, sublicense, and/or
+% sell copies of the Software, and to permit persons to whom the
+% Software is furnished to do so, subject to the following
+% conditions:
+%
+% The above copyright notice and this permission notice shall be
+% included in all copies or substantial portions of the Software.
+%
+% THE SOFTWARE IS PROVIDED “AS ISâ€, WITHOUT WARRANTY OF ANY KIND,
+% EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+% OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+% NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+% HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+% WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+% FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+% OTHER DEALINGS IN THE SOFTWARE.
+%
+% source: http://git.savannah.gnu.org/gitweb/?p=cjk.git;a=commit;h=e058ceae5561a89e33828f593b094c8b57f6a72e
+%
+% language:
+% name: Mandarin Chinese, pinyin transliteration (without tone markers)
+% tag: zh-latn-pinyin
+%
+% hyphenmins:
+% generation:
+% left: 1
+% right: 2
+% typesetting:
+% left: 1
+% right: 2
+
+\message{Pinyin Hyphenation Patterns (without tone markers) 2018-11-25 (WL)}
+
+%
+% The used patgen parameters are
+%
+% 1 1 | 2 5 | 1 1 1
+% 2 2 | 2 5 | 1 2 1
+%
+
+\patterns{
+a1b
+a1c
+a1d
+a1f
+a1g
+a1h
+a1j
+a1k
+a1l
+a1m
+a1p
+a1q
+a1r
+a1s
+a1t
+a1w
+a1x
+a1y
+a1z
+e1b
+e1c
+e1d
+e1f
+e1g
+e1h
+e1j
+e1k
+e1l
+e1m
+e1p
+e1q
+e1r
+e1s
+e1t
+e1w
+e1x
+e1y
+e1z
+1ga
+g1b
+g1c
+g1d
+1ge
+g1f
+g1g
+g1h
+g1j
+g1k
+g1l
+g1m
+g1n
+1go
+g1p
+g1q
+g1r
+g1s
+g1t
+1gu
+g1w
+g1x
+g1y
+g1z
+i1b
+i1c
+i1d
+i1f
+i1g
+i1h
+i1j
+i1k
+i1l
+i1m
+i1p
+i1q
+i1r
+i1s
+i1t
+i1w
+i1x
+i1y
+i1z
+1na
+n1b
+n1c
+n1d
+1ne
+n1f
+n1h
+1ni
+n1j
+n1k
+n1l
+n1m
+n1n
+1no
+n1p
+n1q
+n1r
+n1s
+n1t
+1nu
+1nü
+n1w
+n1x
+n1y
+n1z
+o1b
+o1c
+o1d
+o1f
+o1g
+o1h
+o1j
+o1k
+o1l
+o1m
+o1p
+o1q
+o1r
+o1s
+o1t
+o1w
+o1x
+o1y
+o1z
+2r1b
+2r1c
+2r1d
+2r1f
+2r1g
+2r1h
+2r1j
+2r1k
+2r1l
+2r1m
+2r1n
+2r1p
+2r1q
+2r1r
+2r1s
+2r1t
+2r1w
+2r1x
+2r1y
+2r1z
+u1b
+u1c
+u1d
+u1f
+u1g
+u1h
+u1j
+u1k
+u1l
+u1m
+u1p
+u1q
+u1r
+u1s
+u1t
+u1w
+u1x
+u1y
+u1z
+ü1b
+ü1c
+ü1d
+ü1f
+ü1g
+ü1h
+ü1j
+ü1k
+ü1l
+ü1m
+ü1n
+ü1p
+ü1q
+ü1r
+ü1s
+ü1t
+ü1w
+ü1x
+ü1y
+ü1z
+}
+
+\endinput
+
+%%% Local Variables:
+%%% mode: tex
+%%% coding: utf-8
+%%% End:
diff --git a/Master/texmf-dist/source/latex/cjk/utils/pyhyphen/hyph-zh-latn-tonepinyin.tex b/Master/texmf-dist/source/latex/cjk/utils/pyhyphen/hyph-zh-latn-tonepinyin.tex
new file mode 100644
index 00000000000..2e927ca70f2
--- /dev/null
+++ b/Master/texmf-dist/source/latex/cjk/utils/pyhyphen/hyph-zh-latn-tonepinyin.tex
@@ -0,0 +1,253 @@
+% title: Hyphenation patterns for Chinese pinyin (Mandarin), with tone
+% markers
+%
+% version: 2018-11-25
+%
+% authors:
+% -
+% name: Werner Lemberg
+% contact: wl (at) gnu.org
+%
+% copyright: Copyright (C) 1994-2018 Werner Lemberg
+%
+% licence:
+% name: MIT
+% url: http://opensource.org/licenses/mit-license.php
+% text: >
+% Permission is hereby granted, free of charge, to any person
+% obtaining a copy of this software and associated documentation
+% files (the “Softwareâ€), to deal in the Software without
+% restriction, including without limitation the rights to use,
+% copy, modify, merge, publish, distribute, sublicense, and/or
+% sell copies of the Software, and to permit persons to whom the
+% Software is furnished to do so, subject to the following
+% conditions:
+%
+% The above copyright notice and this permission notice shall be
+% included in all copies or substantial portions of the Software.
+%
+% THE SOFTWARE IS PROVIDED “AS ISâ€, WITHOUT WARRANTY OF ANY KIND,
+% EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+% OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+% NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+% HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+% WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+% FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+% OTHER DEALINGS IN THE SOFTWARE.
+%
+% source: http://git.savannah.gnu.org/gitweb/?p=cjk.git;a=commit;h=e058ceae5561a89e33828f593b094c8b57f6a72e
+%
+% language:
+% name: Mandarin Chinese, pinyin transliteration (with tone markers)
+% tag: zh-latn-pinyin
+%
+% hyphenmins:
+% generation:
+% left: 1
+% right: 2
+% typesetting:
+% left: 1
+% right: 2
+
+\message{Pinyin Hyphenation Patterns (with tone markers) 2018-11-25 (WL)}
+
+%
+% The used patgen parameters are
+%
+% 1 1 | 2 5 | 1 1 1
+% 2 2 | 2 5 | 1 2 1
+%
+
+\patterns{
+a1b Ä1b á1b ÇŽ1b à1b
+a1c Ä1c á1c ÇŽ1c à1c
+a1d Ä1d á1d ÇŽ1d à1d
+a1f Ä1f á1f ÇŽ1f à1f
+a1g Ä1g á1g ÇŽ1g à1g
+a1h Ä1h á1h ÇŽ1h à1h
+a1j Ä1j á1j ÇŽ1j à1j
+a1k Ä1k á1k ÇŽ1k à1k
+a1l Ä1l á1l ÇŽ1l à1l
+a1m Ä1m á1m ÇŽ1m à1m
+a1p Ä1p á1p ÇŽ1p à1p
+a1q Ä1q á1q ÇŽ1q à1q
+a1r Ä1r á1r ÇŽ1r à1r
+a1s Ä1s á1s ÇŽ1s à1s
+a1t Ä1t á1t ÇŽ1t à1t
+a1w Ä1w á1w ÇŽ1w à1w
+a1x Ä1x á1x ÇŽ1x à1x
+a1y Ä1y á1y ÇŽ1y à1y
+a1z Ä1z á1z ÇŽ1z à1z
+e1b ē1b é1b ě1b è1b
+e1c ē1c é1c ě1c è1c
+e1d ē1d é1d ě1d è1d
+e1f ē1f é1f ě1f è1f
+e1g ē1g é1g ě1g è1g
+e1h ē1h é1h ě1h è1h
+e1j ē1j é1j ě1j è1j
+e1k ē1k é1k ě1k è1k
+e1l ē1l é1l ě1l è1l
+e1m ē1m é1m ě1m è1m
+e1p ē1p é1p ě1p è1p
+e1q ē1q é1q ě1q è1q
+e1r ē1r é1r ě1r è1r
+e1s ē1s é1s ě1s è1s
+e1t ē1t é1t ě1t è1t
+e1w ē1w é1w ě1w è1w
+e1x ē1x é1x ě1x è1x
+e1y ē1y é1y ě1y è1y
+e1z ē1z é1z ě1z è1z
+1ga 1gÄ 1gá 1gÇŽ 1gà
+g1b
+g1c
+g1d
+1ge 1gē 1gé 1gě 1gè
+g1f
+g1g
+g1h
+g1j
+g1k
+g1l
+g1m
+g1n
+1go 1gŠ1gó 1gǒ 1gò
+g1p
+g1q
+g1r
+g1s
+g1t
+1gu 1gū 1gú 1gǔ 1gù
+g1w
+g1x
+g1y
+g1z
+i1b Ä«1b í1b Ç1b ì1b
+i1c Ä«1c í1c Ç1c ì1c
+i1d Ä«1d í1d Ç1d ì1d
+i1f Ä«1f í1f Ç1f ì1f
+i1g Ä«1g í1g Ç1g ì1g
+i1h Ä«1h í1h Ç1h ì1h
+i1j Ä«1j í1j Ç1j ì1j
+i1k Ä«1k í1k Ç1k ì1k
+i1l Ä«1l í1l Ç1l ì1l
+i1m Ä«1m í1m Ç1m ì1m
+i1p Ä«1p í1p Ç1p ì1p
+i1q Ä«1q í1q Ç1q ì1q
+i1r Ä«1r í1r Ç1r ì1r
+i1s Ä«1s í1s Ç1s ì1s
+i1t Ä«1t í1t Ç1t ì1t
+i1w Ä«1w í1w Ç1w ì1w
+i1x Ä«1x í1x Ç1x ì1x
+i1y Ä«1y í1y Ç1y ì1y
+i1z Ä«1z í1z Ç1z ì1z
+1na 1nÄ 1ná 1nÇŽ 1nà
+n1b
+n1c
+n1d
+1ne 1nē 1né 1ně 1nè
+n1f
+n1h
+1ni 1nÄ« 1ní 1nÇ 1nì
+n1j
+n1k
+n1l
+n1m
+n1n
+1no 1nŠ1nó 1nǒ 1nò
+n1p
+n1q
+n1r
+n1s
+n1t
+1nu 1nū 1nú 1nǔ 1nù
+1nü 1nǖ 1nǘ 1nǚ 1nǜ
+n1w
+n1x
+n1y
+n1z
+o1b Å1b ó1b Ç’1b ò1b
+o1c Å1c ó1c Ç’1c ò1c
+o1d Å1d ó1d Ç’1d ò1d
+o1f Å1f ó1f Ç’1f ò1f
+o1g Å1g ó1g Ç’1g ò1g
+o1h Å1h ó1h Ç’1h ò1h
+o1j Å1j ó1j Ç’1j ò1j
+o1k Å1k ó1k Ç’1k ò1k
+o1l Å1l ó1l Ç’1l ò1l
+o1m Å1m ó1m Ç’1m ò1m
+o1p Å1p ó1p Ç’1p ò1p
+o1q Å1q ó1q Ç’1q ò1q
+o1r Å1r ó1r Ç’1r ò1r
+o1s Å1s ó1s Ç’1s ò1s
+o1t Å1t ó1t Ç’1t ò1t
+o1w Å1w ó1w Ç’1w ò1w
+o1x Å1x ó1x Ç’1x ò1x
+o1y Å1y ó1y Ç’1y ò1y
+o1z Å1z ó1z Ç’1z ò1z
+2r1b
+2r1c
+2r1d
+2r1f
+2r1g
+2r1h
+2r1j
+2r1k
+2r1l
+2r1m
+2r1n
+2r1p
+2r1q
+2r1r
+2r1s
+2r1t
+2r1w
+2r1x
+2r1y
+2r1z
+u1b ū1b ú1b ǔ1b ù1b
+u1c ū1c ú1c ǔ1c ù1c
+u1d ū1d ú1d ǔ1d ù1d
+u1f ū1f ú1f ǔ1f ù1f
+u1g ū1g ú1g ǔ1g ù1g
+u1h ū1h ú1h ǔ1h ù1h
+u1j ū1j ú1j ǔ1j ù1j
+u1k ū1k ú1k ǔ1k ù1k
+u1l ū1l ú1l ǔ1l ù1l
+u1m ū1m ú1m ǔ1m ù1m
+u1p ū1p ú1p ǔ1p ù1p
+u1q ū1q ú1q ǔ1q ù1q
+u1r ū1r ú1r ǔ1r ù1r
+u1s ū1s ú1s ǔ1s ù1s
+u1t ū1t ú1t ǔ1t ù1t
+u1w ū1w ú1w ǔ1w ù1w
+u1x ū1x ú1x ǔ1x ù1x
+u1y ū1y ú1y ǔ1y ù1y
+u1z ū1z ú1z ǔ1z ù1z
+ü1b ǖ1b ǘ1b ǚ1b ǜ1b
+ü1c ǖ1c ǘ1c ǚ1c ǜ1c
+ü1d ǖ1d ǘ1d ǚ1d ǜ1d
+ü1f ǖ1f ǘ1f ǚ1f ǜ1f
+ü1g ǖ1g ǘ1g ǚ1g ǜ1g
+ü1h ǖ1h ǘ1h ǚ1h ǜ1h
+ü1j ǖ1j ǘ1j ǚ1j ǜ1j
+ü1k ǖ1k ǘ1k ǚ1k ǜ1k
+ü1l ǖ1l ǘ1l ǚ1l ǜ1l
+ü1m ǖ1m ǘ1m ǚ1m ǜ1m
+ü1n ǖ1n ǘ1n ǚ1n ǜ1n
+ü1p ǖ1p ǘ1p ǚ1p ǜ1p
+ü1q ǖ1q ǘ1q ǚ1q ǜ1q
+ü1r ǖ1r ǘ1r ǚ1r ǜ1r
+ü1s ǖ1s ǘ1s ǚ1s ǜ1s
+ü1t ǖ1t ǘ1t ǚ1t ǜ1t
+ü1w ǖ1w ǘ1w ǚ1w ǜ1w
+ü1x ǖ1x ǘ1x ǚ1x ǜ1x
+ü1y ǖ1y ǘ1y ǚ1y ǜ1y
+ü1z ǖ1z ǘ1z ǚ1z ǜ1z
+}
+
+\endinput
+
+%%% Local Variables:
+%%% mode: tex
+%%% coding: utf-8
+%%% End:
diff --git a/Master/texmf-dist/source/latex/cjk/utils/pyhyphen/make-patterns.sh b/Master/texmf-dist/source/latex/cjk/utils/pyhyphen/make-patterns.sh
new file mode 100644
index 00000000000..d4b6591732e
--- /dev/null
+++ b/Master/texmf-dist/source/latex/cjk/utils/pyhyphen/make-patterns.sh
@@ -0,0 +1,62 @@
+#!/bin/bash
+# -*- coding: utf-8 -*-
+
+#
+# This script generates patterns for pinyin.
+#
+# Usage:
+#
+# sh make-patterns.sh pinyin.dic pinyin.tr
+#
+#
+# Input: pinyin.dic List of all two-syllable combinations of pinyin
+# syllables (which don't need an apostrophe), with
+# hyphens inbetween.
+# pinyin.tr Translation file for patgen.
+#
+# Output: pattmp.[1-2] patgen results.
+# pattern.[0-2] patterns -- pattern.2 is the final pattern file.
+# pattern.[0-2].log Log files.
+# pattern.rules A compact description of the used patgen
+# parameters.
+#
+
+
+# patgen parameters for levels one and two.
+
+hyph_start_finish[1]='1 1'
+hyph_start_finish[2]='2 2'
+
+pat_start_finish[1]='2 5'
+pat_start_finish[2]='2 5'
+
+good_bad_thres[1]='1 1 1'
+good_bad_thres[2]='1 2 1'
+
+
+# Create empty start patterns.
+rm -f pattern.0
+touch pattern.0
+
+printf "%%\n" > pattern.rules
+
+for i in 1 2; do
+
+ # Create patterns for current level. Control instructions for patgen are
+ # sent using a pipe.
+ printf "%s\n%s\n%s\n%s" "${hyph_start_finish[$i]}" \
+ "${pat_start_finish[$i]}" \
+ "${good_bad_thres[$i]}" \
+ "y" \
+ | patgen $1 pattern.$(($i-1)) pattern.$i $2 \
+ | tee pattern.$i.log
+
+ # Collect the used patgen parameters.
+ printf "%% %s | %s | %s\n" "${hyph_start_finish[$i]}" \
+ "${pat_start_finish[$i]}" \
+ "${good_bad_thres[$i]}" \
+ >> pattern.rules
+
+done
+
+# eof
diff --git a/Master/texmf-dist/source/latex/cjk/utils/pyhyphen/pinyin.c b/Master/texmf-dist/source/latex/cjk/utils/pyhyphen/pinyin.c
index a728991c73c..f7648db6997 100644
--- a/Master/texmf-dist/source/latex/cjk/utils/pyhyphen/pinyin.c
+++ b/Master/texmf-dist/source/latex/cjk/utils/pyhyphen/pinyin.c
@@ -1,7 +1,7 @@
/*
- This is the file pinyin.c of the CJK macro package ver. 4.8.4
- (18-Apr-2015).
+ This is the file pinyin.c of the CJK macro package ver. 4.8.5
+ (16-Oct-2021).
Use this file to generate a hyphenation input file for patgen.
@@ -12,7 +12,7 @@
*/
/*
- 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
@@ -34,15 +34,36 @@
/* A list of all Chinese syllables. We use latin-1 encoding for the
- `umlaut u' character. */
+ `umlaut u' character.
+
+ In the array below, syllables starting with `a', `e', or `u' are marked
+ with a leading exclamation mark, which we filter out later on to ensure
+ that those syllables are omitted on the right side. If written without a
+ line break, an apostrophe must be inserted before such syllables, e.g.,
+
+ Tien'anmen
+
+ However, if there is a line break, the apostrophe disappears:
+
+ Tien-
+ anmen
+
+ This situation can't be handled by patgen; instead, a solution to this
+ problem can be provided by TeX with
+
+ \discretionary{-}{}{'}
+
+ The babel support file (`pinyin.ldf') provides "' as a shorthand for this
+ situation.
+ */
char *py[] =
{
- "a",
- "ai",
- "an",
- "ang",
- "ao",
+ "!a",
+ "!ai",
+ "!an",
+ "!ang",
+ "!ao",
"ba",
"bai",
"ban",
@@ -114,11 +135,11 @@ char *py[] =
"dui",
"dun",
"duo",
- "e",
- "ei",
- "en",
- "eng",
- "er",
+ "!e",
+ "!ei",
+ "!en",
+ "!eng",
+ "!er",
"fa",
"fan",
"fang",
@@ -268,8 +289,8 @@ char *py[] =
"nuo",
"nü",
"nüe",
- "o",
- "ou",
+ "!o",
+ "!ou",
"pa",
"pai",
"pan",
@@ -450,31 +471,24 @@ char *py[] =
int main(void)
{
- int i, j, off;
+ size_t i, j;
size_t size = sizeof (py) / sizeof (char*);
- char s[20];
/* Now we loop through all possible syllable combinations. */
for (i = 0; i < size; i++)
+ {
for (j = 0; j < size; j++)
{
- /* The seldom used `%n' construct yields the number of processed
- characters so far. */
-
- sprintf(s, "%s%n%s", py[i], &off, py[j]);
-
- /* We check the first character of the second syllable. If it is
- a vowel, a quote will be inserted. Example: Tian'anmen. */
-
- if (s[off] == 'a' || s[off] == 'e' || s[off] == 'o')
- printf("%s'-%s\n", py[i], py[j]);
-
- /* No special case. */
+ if (py[j][0] == '!')
+ continue;
+ if (py[i][0] == '!')
+ printf("%s-%s\n", py[i] + 1, py[j]);
else
printf("%s-%s\n", py[i], py[j]);
}
+ }
return 0;
}
diff --git a/Master/texmf-dist/source/latex/cjk/utils/pyhyphen/pinyin.tr b/Master/texmf-dist/source/latex/cjk/utils/pyhyphen/pinyin.tr
index 8002b91033a..b6007eb3f29 100644
--- a/Master/texmf-dist/source/latex/cjk/utils/pyhyphen/pinyin.tr
+++ b/Master/texmf-dist/source/latex/cjk/utils/pyhyphen/pinyin.tr
@@ -1,13 +1,13 @@
- 1 1
+ 1 2
%% This is the file pinyin.tr of the CJK package
%% defining the letters used for generating pinyin hyphenation patterns
%% with patgen.
-%
+%%
%% created by Werner Lemberg <wl@gnu.org>
%%
-%% Version 4.8.4 (18-Apr-2015)
+%% Version 4.8.5 (16-Oct-2021)
%%
-%% 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
@@ -49,4 +49,3 @@
x X
y Y
z Z
- '
diff --git a/Master/texmf-dist/source/latex/cjk/utils/pyhyphen/pyhyph.tex b/Master/texmf-dist/source/latex/cjk/utils/pyhyphen/pyhyph.tex
deleted file mode 100644
index f118f420012..00000000000
--- a/Master/texmf-dist/source/latex/cjk/utils/pyhyphen/pyhyph.tex
+++ /dev/null
@@ -1,236 +0,0 @@
-% This is the file pyhyph.tex of the CJK package
-% for hyphenating Chinese pinyin syllables.
-%
-% We use the latin-1 character code for `umlaut u' (0xfc). Additionally,
-% the quote character "'" is used in its standard sense (resolving syllabic
-% ambiguities).
-%
-% created by Werner Lemberg <wl@gnu.org>
-%
-% Version 4.8.4 (18-Apr-2015)
-
-% Copyright (C) 1994-2015 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
-% the Free Software Foundation; either version 2 of the License, or
-% (at your option) any later version.
-%
-% This program is distributed in the hope that it will be useful,
-% but WITHOUT ANY WARRANTY; without even the implied warranty of
-% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-% GNU General Public License for more details.
-%
-% You should have received a copy of the GNU General Public License
-% along with this program in doc/COPYING; if not, write to the Free
-% Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-% MA 02110-1301 USA
-
-\message{Hyphenation patterns for unaccented pinyin syllables (CJK 4.8.4)}
-
-\begingroup
-
-\catcode"0FC = 11 % umlaut u
-\catcode"027 = 11 % quote (')
-\lccode"0FC = "0FC
-\lccode"027 = "027
-
-\patterns{
-a1b
-a1c
-a1d
-a1f
-a1g
-a1h
-a1j
-a1k
-a1l
-a1m
-a1p
-a1q
-a1r
-a1s
-a1t
-a1w
-a1x
-a1y
-a1z
-e1b
-e1c
-e1d
-e1f
-e1g
-e1h
-e1j
-e1k
-e1l
-e1m
-e1p
-e1q
-e1s
-e1t
-e1w
-e1x
-e1y
-e1z
-1ga
-g1b
-g1c
-g1d
-1ge
-g1f
-g1g
-g1h
-g1j
-g1k
-g1l
-g1m
-g1n
-1go
-g1p
-g1q
-g1r
-g1s
-g1t
-1gu
-g1w
-g1x
-g1y
-g1z
-i1b
-i1c
-i1d
-i1f
-i1g
-i1h
-i1j
-i1k
-i1l
-i1m
-i1p
-i1q
-i1r
-i1s
-i1t
-i1w
-i1x
-i1y
-i1z
-1na
-n1b
-n1c
-n1d
-1ne
-n1f
-n1h
-1ni
-n1j
-n1k
-n1l
-n1m
-n1n
-1no
-n1p
-n1q
-n1r
-n1s
-n1t
-1nu
-1n^^fc
-n1w
-n1x
-n1y
-n1z
-o1b
-o1c
-o1d
-o1f
-o1g
-o1h
-o1j
-o1k
-o1l
-o1m
-o1p
-o1q
-o1r
-o1s
-o1t
-o1w
-o1x
-o1y
-o1z
-1ra
-r1b
-r1c
-r1d
-1re
-r1f
-r1g
-r1h
-1ri
-r1j
-r1k
-r1l
-r1m
-r1n
-1ro
-r1p
-r1q
-r1r
-r1s
-r1t
-1ru
-r1w
-r1x
-r1y
-r1z
-u1b
-u1c
-u1d
-u1f
-u1g
-u1h
-u1j
-u1k
-u1l
-u1m
-u1p
-u1q
-u1r
-u1s
-u1t
-u1w
-u1x
-u1y
-u1z
-^^fc1b
-^^fc1c
-^^fc1d
-^^fc1f
-^^fc1g
-^^fc1h
-^^fc1j
-^^fc1k
-^^fc1l
-^^fc1m
-^^fc1n
-^^fc1p
-^^fc1q
-^^fc1r
-^^fc1s
-^^fc1t
-^^fc1w
-^^fc1x
-^^fc1y
-^^fc1z
-'1a
-'1e
-'1o
-}
-\endgroup
-
-\lefthyphenmin 1
-\righthyphenmin 1
-
-\endinput
diff --git a/Master/texmf-dist/source/latex/cjk/utils/subfonts/clonevf.pl b/Master/texmf-dist/source/latex/cjk/utils/subfonts/clonevf.pl
index ab345b00cbe..74a7964a426 100644
--- a/Master/texmf-dist/source/latex/cjk/utils/subfonts/clonevf.pl
+++ b/Master/texmf-dist/source/latex/cjk/utils/subfonts/clonevf.pl
@@ -13,7 +13,7 @@
#
# perl clonevf.pl bsmiuv bsmilpv
-# 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
diff --git a/Master/texmf-dist/source/latex/cjk/utils/subfonts/hlatex2agl.pl b/Master/texmf-dist/source/latex/cjk/utils/subfonts/hlatex2agl.pl
index 22ca69446a5..d0b0ffea026 100644
--- a/Master/texmf-dist/source/latex/cjk/utils/subfonts/hlatex2agl.pl
+++ b/Master/texmf-dist/source/latex/cjk/utils/subfonts/hlatex2agl.pl
@@ -28,7 +28,7 @@
#
# perl hlatex2agl.pl wmj umj UKS-HLaTeX.sfd
-# 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
diff --git a/Master/texmf-dist/source/latex/cjk/utils/subfonts/makefdx.pl b/Master/texmf-dist/source/latex/cjk/utils/subfonts/makefdx.pl
index bed1c4b8574..5363e5b63d5 100644
--- a/Master/texmf-dist/source/latex/cjk/utils/subfonts/makefdx.pl
+++ b/Master/texmf-dist/source/latex/cjk/utils/subfonts/makefdx.pl
@@ -39,7 +39,7 @@
# A collection of useful subfont definition files for CJK fonts can be found
# in the ttf2pk package.
-# 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
@@ -110,10 +110,10 @@ my $oldfh = select(FDX);
print("% This is the file $fdxfile of the CJK package
% for using Asian logographs (Chinese/Japanese/Korean) with LaTeX2e
%
-% created by the script makefdx.pl for CJK Version 4.8.4 (18-Apr-2015).
+% created by the script makefdx.pl for CJK Version 4.8.5 (16-Oct-2021).
-\\def\\fileversion{4.8.4}
-\\def\\filedate{2015/04/18}
+\\def\\fileversion{4.8.5}
+\\def\\filedate{2021/10/16}
\\ProvidesFile{$fdxfile}[\\filedate\\space\\fileversion]
\\CJKvdef{fullheight}{1em}
diff --git a/Master/texmf-dist/source/latex/cjk/utils/subfonts/sfd2uni.pl b/Master/texmf-dist/source/latex/cjk/utils/subfonts/sfd2uni.pl
index a82a3cb10f3..5aa1946d329 100644
--- a/Master/texmf-dist/source/latex/cjk/utils/subfonts/sfd2uni.pl
+++ b/Master/texmf-dist/source/latex/cjk/utils/subfonts/sfd2uni.pl
@@ -26,7 +26,7 @@
# A collection of useful subfont definition files for CJK fonts can be found
# in the ttf2pk package.
-# 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
diff --git a/Master/texmf-dist/source/latex/cjk/utils/subfonts/subfonts.pe b/Master/texmf-dist/source/latex/cjk/utils/subfonts/subfonts.pe
index feb9d3a56c8..347e53b6df4 100644
--- a/Master/texmf-dist/source/latex/cjk/utils/subfonts/subfonts.pe
+++ b/Master/texmf-dist/source/latex/cjk/utils/subfonts/subfonts.pe
@@ -9,7 +9,7 @@
# A collection of useful subfont definition files for CJK fonts can be found
# in the ttf2pk package.
-# 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
diff --git a/Master/texmf-dist/source/latex/cjk/utils/subfonts/uni2sfd.pl b/Master/texmf-dist/source/latex/cjk/utils/subfonts/uni2sfd.pl
index d28796c8747..fc89bf7017d 100644
--- a/Master/texmf-dist/source/latex/cjk/utils/subfonts/uni2sfd.pl
+++ b/Master/texmf-dist/source/latex/cjk/utils/subfonts/uni2sfd.pl
@@ -24,7 +24,7 @@
# A collection of useful subfont definition files for CJK fonts can be found
# in the ttf2pk package.
-# 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
diff --git a/Master/texmf-dist/tex/latex/cjk/contrib/wadalab/c42goth.fd b/Master/texmf-dist/tex/latex/cjk/contrib/wadalab/c42goth.fd
index 6494af4617c..cc73302057c 100644
--- a/Master/texmf-dist/tex/latex/cjk/contrib/wadalab/c42goth.fd
+++ b/Master/texmf-dist/tex/latex/cjk/contrib/wadalab/c42goth.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c42goth.fd}[\filedate\space\fileversion]
% Japanese characters in JIS encoding scheme using Wadalab fonts:
diff --git a/Master/texmf-dist/tex/latex/cjk/contrib/wadalab/c42goth.fdx b/Master/texmf-dist/tex/latex/cjk/contrib/wadalab/c42goth.fdx
index 0e8da256149..0d90d5d318c 100644
--- a/Master/texmf-dist/tex/latex/cjk/contrib/wadalab/c42goth.fdx
+++ b/Master/texmf-dist/tex/latex/cjk/contrib/wadalab/c42goth.fdx
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c42goth.fdx}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/contrib/wadalab/c42maru.fd b/Master/texmf-dist/tex/latex/cjk/contrib/wadalab/c42maru.fd
index 941ca20a1af..ba987c1f675 100644
--- a/Master/texmf-dist/tex/latex/cjk/contrib/wadalab/c42maru.fd
+++ b/Master/texmf-dist/tex/latex/cjk/contrib/wadalab/c42maru.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c42maru.fd}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/contrib/wadalab/c42maru.fdx b/Master/texmf-dist/tex/latex/cjk/contrib/wadalab/c42maru.fdx
index c8998d2e67a..b5ce14177b9 100644
--- a/Master/texmf-dist/tex/latex/cjk/contrib/wadalab/c42maru.fdx
+++ b/Master/texmf-dist/tex/latex/cjk/contrib/wadalab/c42maru.fdx
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c42maru.fdx}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/contrib/wadalab/c42min.fd b/Master/texmf-dist/tex/latex/cjk/contrib/wadalab/c42min.fd
index ddff4364361..3ef9cdee497 100644
--- a/Master/texmf-dist/tex/latex/cjk/contrib/wadalab/c42min.fd
+++ b/Master/texmf-dist/tex/latex/cjk/contrib/wadalab/c42min.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c42min.fd}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/contrib/wadalab/c42min.fdx b/Master/texmf-dist/tex/latex/cjk/contrib/wadalab/c42min.fdx
index ba334c63173..1c519596de8 100644
--- a/Master/texmf-dist/tex/latex/cjk/contrib/wadalab/c42min.fdx
+++ b/Master/texmf-dist/tex/latex/cjk/contrib/wadalab/c42min.fdx
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c42min.fdx}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/contrib/wadalab/c52maru.fd b/Master/texmf-dist/tex/latex/cjk/contrib/wadalab/c52maru.fd
index 75bda2cc319..d9bbfe5fc26 100644
--- a/Master/texmf-dist/tex/latex/cjk/contrib/wadalab/c52maru.fd
+++ b/Master/texmf-dist/tex/latex/cjk/contrib/wadalab/c52maru.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c52maru.fd}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/contrib/wadalab/c52maru.fdx b/Master/texmf-dist/tex/latex/cjk/contrib/wadalab/c52maru.fdx
index 3f80581f224..10a6796aa30 100644
--- a/Master/texmf-dist/tex/latex/cjk/contrib/wadalab/c52maru.fdx
+++ b/Master/texmf-dist/tex/latex/cjk/contrib/wadalab/c52maru.fdx
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c52maru.fdx}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/contrib/wadalab/c52min.fd b/Master/texmf-dist/tex/latex/cjk/contrib/wadalab/c52min.fd
index 27a7472ac4c..eaa908f4f58 100644
--- a/Master/texmf-dist/tex/latex/cjk/contrib/wadalab/c52min.fd
+++ b/Master/texmf-dist/tex/latex/cjk/contrib/wadalab/c52min.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c52min.fd}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/contrib/wadalab/c52min.fdx b/Master/texmf-dist/tex/latex/cjk/contrib/wadalab/c52min.fdx
index 815a20758f8..8a92df01754 100644
--- a/Master/texmf-dist/tex/latex/cjk/contrib/wadalab/c52min.fdx
+++ b/Master/texmf-dist/tex/latex/cjk/contrib/wadalab/c52min.fdx
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c52min.fdx}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/contrib/wadalab/c70goth.fd b/Master/texmf-dist/tex/latex/cjk/contrib/wadalab/c70goth.fd
index be87fd67ead..91b307381d4 100644
--- a/Master/texmf-dist/tex/latex/cjk/contrib/wadalab/c70goth.fd
+++ b/Master/texmf-dist/tex/latex/cjk/contrib/wadalab/c70goth.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c70goth.fd}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/contrib/wadalab/c70goth.fdx b/Master/texmf-dist/tex/latex/cjk/contrib/wadalab/c70goth.fdx
index f94d7370100..5ba61060d5e 100644
--- a/Master/texmf-dist/tex/latex/cjk/contrib/wadalab/c70goth.fdx
+++ b/Master/texmf-dist/tex/latex/cjk/contrib/wadalab/c70goth.fdx
@@ -3,10 +3,10 @@
%
% created by Gernot Hassenpflug <gernot@nict.go.jp>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c70goth.fdx}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/contrib/wadalab/c70maru.fd b/Master/texmf-dist/tex/latex/cjk/contrib/wadalab/c70maru.fd
index b1ce584eedc..9419907643b 100644
--- a/Master/texmf-dist/tex/latex/cjk/contrib/wadalab/c70maru.fd
+++ b/Master/texmf-dist/tex/latex/cjk/contrib/wadalab/c70maru.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c70maru.fd}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/contrib/wadalab/c70maru.fdx b/Master/texmf-dist/tex/latex/cjk/contrib/wadalab/c70maru.fdx
index aa613e9ea40..b2840a42a0b 100644
--- a/Master/texmf-dist/tex/latex/cjk/contrib/wadalab/c70maru.fdx
+++ b/Master/texmf-dist/tex/latex/cjk/contrib/wadalab/c70maru.fdx
@@ -3,10 +3,10 @@
%
% created by Gernot Hassenpflug <gernot@nict.go.jp>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c70maru.fdx}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/contrib/wadalab/c70min.fd b/Master/texmf-dist/tex/latex/cjk/contrib/wadalab/c70min.fd
index b8f47feb705..19b11619dcb 100644
--- a/Master/texmf-dist/tex/latex/cjk/contrib/wadalab/c70min.fd
+++ b/Master/texmf-dist/tex/latex/cjk/contrib/wadalab/c70min.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c70min.fd}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/contrib/wadalab/c70min.fdx b/Master/texmf-dist/tex/latex/cjk/contrib/wadalab/c70min.fdx
index 9ddb6650dd8..83050915872 100644
--- a/Master/texmf-dist/tex/latex/cjk/contrib/wadalab/c70min.fdx
+++ b/Master/texmf-dist/tex/latex/cjk/contrib/wadalab/c70min.fdx
@@ -3,10 +3,10 @@
%
% created by Gernot Hassenpflug <gernot@nict.go.jp>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c70min.fdx}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/Bg5/Bg5.cap b/Master/texmf-dist/tex/latex/cjk/texinput/Bg5/Bg5.cap
index ee5ec02ad7b..258cc26d57a 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/Bg5/Bg5.cap
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/Bg5/Bg5.cap
@@ -3,9 +3,9 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-% 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
@@ -22,8 +22,8 @@
% Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
% MA 02110-1301 USA
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{Bg5.cap}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/Bg5/Bg5.chr b/Master/texmf-dist/tex/latex/cjk/texinput/Bg5/Bg5.chr
index 1501c016ee3..5f6f737f62b 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/Bg5/Bg5.chr
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/Bg5/Bg5.chr
@@ -3,9 +3,9 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-% 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
@@ -22,8 +22,8 @@
% Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
% MA 02110-1301 USA
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{Bg5.chr}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/Bg5/Bg5.cpx b/Master/texmf-dist/tex/latex/cjk/texinput/Bg5/Bg5.cpx
index 6be514b0296..a92c7310f02 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/Bg5/Bg5.cpx
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/Bg5/Bg5.cpx
@@ -3,9 +3,9 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-% 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
@@ -22,8 +22,8 @@
% Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
% MA 02110-1301 USA
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{Bg5.cpx}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/Bg5/Bg5.enc b/Master/texmf-dist/tex/latex/cjk/texinput/Bg5/Bg5.enc
index 818f55e3b9e..624e7ae3b12 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/Bg5/Bg5.enc
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/Bg5/Bg5.enc
@@ -3,9 +3,9 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-% 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
@@ -22,8 +22,8 @@
% Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
% MA 02110-1301 USA
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{Bg5.enc}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/Bg5/HK.enc b/Master/texmf-dist/tex/latex/cjk/texinput/Bg5/HK.enc
index aa70372a2ff..9f760bf3fe8 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/Bg5/HK.enc
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/Bg5/HK.enc
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{HK.enc}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/Bg5/c00bkai.fd b/Master/texmf-dist/tex/latex/cjk/texinput/Bg5/c00bkai.fd
index a775ab8a104..3a09aef000d 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/Bg5/c00bkai.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/Bg5/c00bkai.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c00bkai.fd}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/Bg5/c00bkai.fdx b/Master/texmf-dist/tex/latex/cjk/texinput/Bg5/c00bkai.fdx
index ac5c870304f..18a113872be 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/Bg5/c00bkai.fdx
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/Bg5/c00bkai.fdx
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c00bkai.fdx}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/Bg5/c00bsmi.fd b/Master/texmf-dist/tex/latex/cjk/texinput/Bg5/c00bsmi.fd
index 2d7c66ae3af..7f7d6fee79e 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/Bg5/c00bsmi.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/Bg5/c00bsmi.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c00bsmi.fd}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/Bg5/c00bsmi.fdx b/Master/texmf-dist/tex/latex/cjk/texinput/Bg5/c00bsmi.fdx
index 15275d558bf..bf861ea8cd9 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/Bg5/c00bsmi.fdx
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/Bg5/c00bsmi.fdx
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c00bsmi.fdx}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/Bg5/c00bsmir.fd b/Master/texmf-dist/tex/latex/cjk/texinput/Bg5/c00bsmir.fd
index 71fde2e2e68..fa10ef0545d 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/Bg5/c00bsmir.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/Bg5/c00bsmir.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c00bsmir.fd}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/Bg5/c00bsmir.fdx b/Master/texmf-dist/tex/latex/cjk/texinput/Bg5/c00bsmir.fdx
index b398d7fbed7..cc25893d808 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/Bg5/c00bsmir.fdx
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/Bg5/c00bsmir.fdx
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c00bsmir.fdx}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/Bg5/c00cns.fd b/Master/texmf-dist/tex/latex/cjk/texinput/Bg5/c00cns.fd
index b5fe83a3a73..96415d3f206 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/Bg5/c00cns.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/Bg5/c00cns.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c00cns.fd}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/Bg5/c00fs.fd b/Master/texmf-dist/tex/latex/cjk/texinput/Bg5/c00fs.fd
index 6cded2be8b4..f0ba805e366 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/Bg5/c00fs.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/Bg5/c00fs.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c00fs.fd}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/Bg5/c00kai.fd b/Master/texmf-dist/tex/latex/cjk/texinput/Bg5/c00kai.fd
index 1899bb38490..4e2a853e0be 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/Bg5/c00kai.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/Bg5/c00kai.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c00kai.fd}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/Bg5/c00kair.fd b/Master/texmf-dist/tex/latex/cjk/texinput/Bg5/c00kair.fd
index 6df67b5680c..a449cc6aa92 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/Bg5/c00kair.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/Bg5/c00kair.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c00kair.fd}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/Bg5/c00kair.fdx b/Master/texmf-dist/tex/latex/cjk/texinput/Bg5/c00kair.fdx
index 311c2f61d79..bbcdc9ecbcf 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/Bg5/c00kair.fdx
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/Bg5/c00kair.fdx
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c00kair.fdx}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/Bg5/c00song.fd b/Master/texmf-dist/tex/latex/cjk/texinput/Bg5/c00song.fd
index 9aa3e231f46..b72cf6b811f 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/Bg5/c00song.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/Bg5/c00song.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c00song.fd}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/Bg5/c01song.fd b/Master/texmf-dist/tex/latex/cjk/texinput/Bg5/c01song.fd
index 7b5ca9addd1..51ed5c16c3f 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/Bg5/c01song.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/Bg5/c01song.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c01song.fd}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/Bg5/c05song.fd b/Master/texmf-dist/tex/latex/cjk/texinput/Bg5/c05song.fd
index bbcdb9506d9..bc3d18ee85c 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/Bg5/c05song.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/Bg5/c05song.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c05song.fd}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/Bg5/c09song.fd b/Master/texmf-dist/tex/latex/cjk/texinput/Bg5/c09song.fd
index 49f8a640409..33f6fde8df2 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/Bg5/c09song.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/Bg5/c09song.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c09song.fd}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/CEF/c80song.fd b/Master/texmf-dist/tex/latex/cjk/texinput/CEF/c80song.fd
index 522930d91cc..ef1319aaf85 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/CEF/c80song.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/CEF/c80song.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c80song.fd}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/CEF/c81song.fd b/Master/texmf-dist/tex/latex/cjk/texinput/CEF/c81song.fd
index c9a46527ffd..78985b2ced9 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/CEF/c81song.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/CEF/c81song.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c81song.fd}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/CJK.enc b/Master/texmf-dist/tex/latex/cjk/texinput/CJK.enc
index be9cd4ad6c3..af8c8ffd065 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/CJK.enc
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/CJK.enc
@@ -3,9 +3,9 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-% 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
@@ -22,8 +22,8 @@
% Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
% MA 02110-1301 USA
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{CJK.enc}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/CJK.sty b/Master/texmf-dist/tex/latex/cjk/texinput/CJK.sty
index 1564efdb24a..b7e3fcaea56 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/CJK.sty
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/CJK.sty
@@ -3,9 +3,9 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-% 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
@@ -23,8 +23,8 @@
% MA 02110-1301 USA
\NeedsTeXFormat{LaTeX2e}[2001/06/01]
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesPackage{CJK}[\filedate\space\fileversion]
\RequirePackage{MULEenc}
@@ -746,28 +746,43 @@
\csname \curr@fontshape/\f@size/\CJK@plane\endcsname}
\fi}}
-% the other LaTeX2e command we must redefine is \selectfont. It will
-% now reset \ifCJK@bold@ and calls \CJK@curr@fontshape additionally
-% (if it exists) to execute the loading-setting parameter of
-% \DeclareFontShape each time we switch to this font.
+% for older versions of LaTeX2e command we must redefine \selectfont.
+% It will now reset \ifCJK@bold@ and calls \CJK@curr@fontshape
+% additionally (if it exists) to execute the loading-setting
+% parameter of \DeclareFontShape each time we switch to this font.
% \CJK@curr@fontshape has been defined by the above size functions.
+% For newer versions of LaTeX2e it is sufficient to set a hook for
+% \selectfont.
+%
+% for compatibility with older versions of LaTeX2e we provide a
+% definition of \IfFormatAtLeastTF.
-\DeclareRobustCommand{\selectfont}{
- \ifx\f@linespread \baselinestretch
- \else
- \set@fontsize\baselinestretch\f@size\f@baselineskip
- \fi
- \xdef\font@name{\csname\curr@fontshape/\f@size\endcsname}
- \pickup@font
- \font@name
- \expandafter% % CJK extension
- \ifx\csname CJK@\curr@fontshape\endcsname \relax
- \else
- \CJK@bold@false
- \csname CJK@\curr@fontshape\endcsname
- \fi
- \size@update
- \enc@update}
+\def\IfFormatAtLeastTF{\@ifl@t@r\fmtversion}
+
+\IfFormatAtLeastTF{2020-10-01}
+ {\AddToHook{selectfont}{
+ \expandafter
+ \ifx\csname CJK@\curr@fontshape\endcsname \relax
+ \else
+ \CJK@bold@false
+ \csname CJK@\curr@fontshape\endcsname
+ \fi}}
+ {\DeclareRobustCommand{\selectfont}{
+ \ifx\f@linespread \baselinestretch
+ \else
+ \set@fontsize\baselinestretch\f@size\f@baselineskip
+ \fi
+ \xdef\font@name{\csname\curr@fontshape/\f@size\endcsname}
+ \pickup@font
+ \font@name
+ \expandafter% % CJK extension
+ \ifx\csname CJK@\curr@fontshape\endcsname \relax
+ \else
+ \CJK@bold@false
+ \csname CJK@\curr@fontshape\endcsname
+ \fi
+ \size@update
+ \enc@update}}
% additional vertical and horizontal information for a font is stored in
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/CJKfntef.sty b/Master/texmf-dist/tex/latex/cjk/texinput/CJKfntef.sty
index 5a1d44df265..045380abdf7 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/CJKfntef.sty
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/CJKfntef.sty
@@ -4,7 +4,7 @@
% created by Wenchang Sun <sunwch@hotmail.com>
% Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
%
% Macros:
% \CJKunderdot{...}
@@ -42,7 +42,7 @@
% }
%
-% 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
@@ -60,8 +60,8 @@
% MA 02110-1301 USA
\NeedsTeXFormat{LaTeX2e}[1998/06/01]
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesPackage{CJKfntef}[\filedate\space\fileversion]
\RequirePackage{CJK}
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/CJKnumb.sty b/Master/texmf-dist/tex/latex/cjk/texinput/CJKnumb.sty
index 68494d0ffcd..61c928cf14b 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/CJKnumb.sty
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/CJKnumb.sty
@@ -3,9 +3,9 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-% 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
@@ -22,11 +22,11 @@
% Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
% MA 02110-1301 USA
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesPackage{CJKnumb}[\filedate\space\fileversion]
-\RequirePackage{CJK}[2015/04/18]
+\RequirePackage{CJK}[2021/10/16]
% we suppress any unwanted spaces produced by linefeeds.
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/CJKspace.sty b/Master/texmf-dist/tex/latex/cjk/texinput/CJKspace.sty
index 148ce1479df..606e6ba2c95 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/CJKspace.sty
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/CJKspace.sty
@@ -4,7 +4,7 @@
% created by Wenchang Sun <sunwch@hotmail.com>
% Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
%
% 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
@@ -24,7 +24,7 @@
\NeedsTeXFormat{LaTeX2e}[2001/06/01]
\def\fileversion{3.8.0}
-\def\filedate{2015/04/18}
+\def\filedate{2021/10/16}
\ProvidesPackage{CJKspace}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/CJKulem.sty b/Master/texmf-dist/tex/latex/cjk/texinput/CJKulem.sty
index 5baef63f174..202f845df02 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/CJKulem.sty
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/CJKulem.sty
@@ -3,9 +3,9 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-% 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
@@ -23,8 +23,8 @@
% MA 02110-1301 USA
\NeedsTeXFormat{LaTeX2e}[1996/12/01]
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesPackage{CJKulem}[\filedate\space\fileversion]
\RequirePackage{ulem}[2000/05/26]
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/CJKutf8.sty b/Master/texmf-dist/tex/latex/cjk/texinput/CJKutf8.sty
index 28f3f8b0ad8..d1eab65c7e1 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/CJKutf8.sty
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/CJKutf8.sty
@@ -4,9 +4,9 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-% 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,8 +25,8 @@
\NeedsTeXFormat{LaTeX2e}[2003/12/01]
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesPackage{CJKutf8}[\filedate\space\fileversion]
\RequirePackage{ifpdf}
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/CJKvert.sty b/Master/texmf-dist/tex/latex/cjk/texinput/CJKvert.sty
index 76985b5c28c..d01a689f73d 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/CJKvert.sty
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/CJKvert.sty
@@ -3,9 +3,9 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-% 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
@@ -22,8 +22,8 @@
% Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
% MA 02110-1301 USA
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesPackage{CJKvert}[\filedate\space\fileversion]
\RequirePackage{graphicx}
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/CNS/EUC-TW.bdg b/Master/texmf-dist/tex/latex/cjk/texinput/CNS/EUC-TW.bdg
index 95036c135f4..0ef5c3b5c78 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/CNS/EUC-TW.bdg
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/CNS/EUC-TW.bdg
@@ -3,9 +3,9 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-% 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
@@ -22,8 +22,8 @@
% Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
% MA 02110-1301 USA
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{EUC-TW.bdg}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/CNS/EUC-TW.chr b/Master/texmf-dist/tex/latex/cjk/texinput/CNS/EUC-TW.chr
index c7b90cab7a9..2bf303aba08 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/CNS/EUC-TW.chr
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/CNS/EUC-TW.chr
@@ -3,9 +3,9 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-% 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
@@ -22,8 +22,8 @@
% Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
% MA 02110-1301 USA
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{EUC-TW.chr}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/CNS/EUC-TW.enc b/Master/texmf-dist/tex/latex/cjk/texinput/CNS/EUC-TW.enc
index 13a595d90f3..71b1063cb9c 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/CNS/EUC-TW.enc
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/CNS/EUC-TW.enc
@@ -3,9 +3,9 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-% 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
@@ -22,8 +22,8 @@
% Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
% MA 02110-1301 USA
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{EUC-TW.enc}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/CNS/c31song.fd b/Master/texmf-dist/tex/latex/cjk/texinput/CNS/c31song.fd
index 15f25f06023..b607ff7487f 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/CNS/c31song.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/CNS/c31song.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c31song.fd}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/CNS/c32song.fd b/Master/texmf-dist/tex/latex/cjk/texinput/CNS/c32song.fd
index 9f866d1787f..fc215fe0519 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/CNS/c32song.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/CNS/c32song.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c32song.fd}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/CNS/c33song.fd b/Master/texmf-dist/tex/latex/cjk/texinput/CNS/c33song.fd
index 06f0b84c315..445f370bbb1 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/CNS/c33song.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/CNS/c33song.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c33song.fd}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/CNS/c34song.fd b/Master/texmf-dist/tex/latex/cjk/texinput/CNS/c34song.fd
index d052f1f622b..40eb3c1ee68 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/CNS/c34song.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/CNS/c34song.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c34song.fd}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/CNS/c35song.fd b/Master/texmf-dist/tex/latex/cjk/texinput/CNS/c35song.fd
index 46bb3734982..9f3a3e65d7c 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/CNS/c35song.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/CNS/c35song.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c35song.fd}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/CNS/c36song.fd b/Master/texmf-dist/tex/latex/cjk/texinput/CNS/c36song.fd
index 4ff74f88bbf..a576981f5a3 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/CNS/c36song.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/CNS/c36song.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c36song.fd}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/CNS/c37song.fd b/Master/texmf-dist/tex/latex/cjk/texinput/CNS/c37song.fd
index c8e738ad1b3..d8a21bf3441 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/CNS/c37song.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/CNS/c37song.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c37song.fd}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/GB/GB.cap b/Master/texmf-dist/tex/latex/cjk/texinput/GB/GB.cap
index a6526a296d5..f77bfc0da69 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/GB/GB.cap
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/GB/GB.cap
@@ -3,9 +3,9 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-% 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
@@ -22,8 +22,8 @@
% Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
% MA 02110-1301 USA
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{GB.cap}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/GB/GB.cpx b/Master/texmf-dist/tex/latex/cjk/texinput/GB/GB.cpx
index 40fd77551dd..d24994ce2b1 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/GB/GB.cpx
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/GB/GB.cpx
@@ -3,9 +3,9 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-% 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
@@ -22,8 +22,8 @@
% Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
% MA 02110-1301 USA
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{GB.cpx}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/GB/c10fs.fd b/Master/texmf-dist/tex/latex/cjk/texinput/GB/c10fs.fd
index e8efb4e8a1c..1ecdbb103d1 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/GB/c10fs.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/GB/c10fs.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c10fs.fd}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/GB/c10gbsn.fd b/Master/texmf-dist/tex/latex/cjk/texinput/GB/c10gbsn.fd
index 8b266472a57..839cd72e23e 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/GB/c10gbsn.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/GB/c10gbsn.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c10gbsn.fd}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/GB/c10gbsn.fdx b/Master/texmf-dist/tex/latex/cjk/texinput/GB/c10gbsn.fdx
index 19cbf19d04e..d65645ce6cc 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/GB/c10gbsn.fdx
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/GB/c10gbsn.fdx
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c10gbsn.fdx}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/GB/c10gkai.fd b/Master/texmf-dist/tex/latex/cjk/texinput/GB/c10gkai.fd
index 0fdbcb33302..9c5750852ae 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/GB/c10gkai.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/GB/c10gkai.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c10gkai.fd}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/GB/c10gkai.fdx b/Master/texmf-dist/tex/latex/cjk/texinput/GB/c10gkai.fdx
index 3a34dfb6f33..aab66e85c15 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/GB/c10gkai.fdx
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/GB/c10gkai.fdx
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c10gkai.fdx}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/GB/c10song.fd b/Master/texmf-dist/tex/latex/cjk/texinput/GB/c10song.fd
index 4e361cf963d..df5f5914765 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/GB/c10song.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/GB/c10song.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c10song.fd}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/GB/c11song.fd b/Master/texmf-dist/tex/latex/cjk/texinput/GB/c11song.fd
index 4223455f1c6..b0b2939e02f 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/GB/c11song.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/GB/c11song.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c11song.fd}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/GB/c19song.fd b/Master/texmf-dist/tex/latex/cjk/texinput/GB/c19song.fd
index bbcb377c2c4..d543001cd70 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/GB/c19song.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/GB/c19song.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c19song.fd}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/GB/c20song.fd b/Master/texmf-dist/tex/latex/cjk/texinput/GB/c20song.fd
index 909728a41a8..617b1be7da2 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/GB/c20song.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/GB/c20song.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c20song.fd}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/GB/c21song.fd b/Master/texmf-dist/tex/latex/cjk/texinput/GB/c21song.fd
index 624e9e3c284..f5eed9d80b4 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/GB/c21song.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/GB/c21song.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c21song.fd}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/JIS/EUC-JP.bdg b/Master/texmf-dist/tex/latex/cjk/texinput/JIS/EUC-JP.bdg
index 711e8b9f16e..7d5a0b2f0d9 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/JIS/EUC-JP.bdg
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/JIS/EUC-JP.bdg
@@ -3,9 +3,9 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-% 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
@@ -22,8 +22,8 @@
% Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
% MA 02110-1301 USA
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{EUC-JP.bdg}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/JIS/EUC-JP.chr b/Master/texmf-dist/tex/latex/cjk/texinput/JIS/EUC-JP.chr
index 18802ad2563..c317dfae3cc 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/JIS/EUC-JP.chr
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/JIS/EUC-JP.chr
@@ -3,9 +3,9 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-% 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
@@ -22,8 +22,8 @@
% Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
% MA 02110-1301 USA
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{EUC-JP.chr}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/JIS/EUC-JP.enc b/Master/texmf-dist/tex/latex/cjk/texinput/JIS/EUC-JP.enc
index 38f4b026e61..00fe23c82ae 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/JIS/EUC-JP.enc
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/JIS/EUC-JP.enc
@@ -3,9 +3,9 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-% 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
@@ -22,8 +22,8 @@
% Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
% MA 02110-1301 USA
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{EUC-JP.enc}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/JIS/EUC-JPdnp.enc b/Master/texmf-dist/tex/latex/cjk/texinput/JIS/EUC-JPdnp.enc
index 647eabd89c4..6d82836884c 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/JIS/EUC-JPdnp.enc
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/JIS/EUC-JPdnp.enc
@@ -3,9 +3,9 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-% 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
@@ -22,8 +22,8 @@
% Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
% MA 02110-1301 USA
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{EUC-JPdnp.enc}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/JIS/JIS.cap b/Master/texmf-dist/tex/latex/cjk/texinput/JIS/JIS.cap
index 3a9550a5c25..2343a53afaa 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/JIS/JIS.cap
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/JIS/JIS.cap
@@ -3,9 +3,9 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-% 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
@@ -22,8 +22,8 @@
% Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
% MA 02110-1301 USA
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{JIS.cap}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/JIS/JIS.cpx b/Master/texmf-dist/tex/latex/cjk/texinput/JIS/JIS.cpx
index 82f0a25c93e..a0cf83415e7 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/JIS/JIS.cpx
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/JIS/JIS.cpx
@@ -3,9 +3,9 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-% 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
@@ -22,8 +22,8 @@
% Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
% MA 02110-1301 USA
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{JIS.cpx}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/JIS/JISdnp.enc b/Master/texmf-dist/tex/latex/cjk/texinput/JIS/JISdnp.enc
index 44b19896b71..b888ac61bf2 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/JIS/JISdnp.enc
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/JIS/JISdnp.enc
@@ -3,9 +3,9 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-% 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
@@ -22,8 +22,8 @@
% Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
% MA 02110-1301 USA
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{JISdnp.enc}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/JIS/c40song.fd b/Master/texmf-dist/tex/latex/cjk/texinput/JIS/c40song.fd
index 39a8b4036aa..d02c88a18c2 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/JIS/c40song.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/JIS/c40song.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c40song.fd}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/JIS/c41song.fd b/Master/texmf-dist/tex/latex/cjk/texinput/JIS/c41song.fd
index 4d05cbaeab0..3ccf078edc0 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/JIS/c41song.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/JIS/c41song.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c41song.fd}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/JIS/c42song.fd b/Master/texmf-dist/tex/latex/cjk/texinput/JIS/c42song.fd
index 7f0d984fefe..04efcc35df4 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/JIS/c42song.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/JIS/c42song.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c42song.fd}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/JIS/c43song.fd b/Master/texmf-dist/tex/latex/cjk/texinput/JIS/c43song.fd
index 1251d844c22..42479c424e0 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/JIS/c43song.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/JIS/c43song.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c43song.fd}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/JIS/c50song.fd b/Master/texmf-dist/tex/latex/cjk/texinput/JIS/c50song.fd
index f16744e25a4..279a838e40c 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/JIS/c50song.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/JIS/c50song.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c50song.fd}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/HLaTeX.chr b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/HLaTeX.chr
index cb4ad051ec4..40a6c602bed 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/HLaTeX.chr
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/HLaTeX.chr
@@ -3,9 +3,9 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-% 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
@@ -22,8 +22,8 @@
% Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
% MA 02110-1301 USA
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{HLaTeX.chr}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/KSHL.enc b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/KSHL.enc
index f7c26a7e0e5..5ce501024b8 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/KSHL.enc
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/KSHL.enc
@@ -3,9 +3,9 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-% 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
@@ -22,8 +22,8 @@
% Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
% MA 02110-1301 USA
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{KSHL.enc}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c63bm.fd b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c63bm.fd
index 30f66370a4c..53a54b72c77 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c63bm.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c63bm.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c63bm.fd}[\filedate\space\fileversion]
% Korean characters (Hangul)
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c63dn.fd b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c63dn.fd
index 2f17d711f90..1bf465aa6ec 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c63dn.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c63dn.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c63dn.fd}[\filedate\space\fileversion]
% Korean characters (Hangul)
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c63gr.fd b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c63gr.fd
index c3507a2b322..4bd21a106a3 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c63gr.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c63gr.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c63gr.fd}[\filedate\space\fileversion]
% Korean characters (Hangul)
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c63gs.fd b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c63gs.fd
index b895651e974..1dbb1fd71cc 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c63gs.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c63gs.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c63gs.fd}[\filedate\space\fileversion]
% Korean characters (Hangul)
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c63gt.fd b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c63gt.fd
index c27ebdf90ec..a31e213745f 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c63gt.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c63gt.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c63gt.fd}[\filedate\space\fileversion]
% Korean characters (Hangul)
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c63jgt.fd b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c63jgt.fd
index 3d32e0f325c..ef1fa5cea39 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c63jgt.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c63jgt.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c63jgt.fd}[\filedate\space\fileversion]
% Korean characters (Hangul)
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c63jmj.fd b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c63jmj.fd
index 8c964bb6a0a..2e1a2bfb0fa 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c63jmj.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c63jmj.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c63jmj.fd}[\filedate\space\fileversion]
% Korean characters (Hangul)
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c63jnv.fd b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c63jnv.fd
index 169c4dda5e1..4bc3278c910 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c63jnv.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c63jnv.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c63jnv.fd}[\filedate\space\fileversion]
% Korean characters (Hangul)
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c63jsr.fd b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c63jsr.fd
index 445d22c4db0..80d4631a65a 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c63jsr.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c63jsr.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c63jsr.fd}[\filedate\space\fileversion]
% Korean characters (Hangul)
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c63mj.fd b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c63mj.fd
index 9939c393c64..f4625c9df93 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c63mj.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c63mj.fd
@@ -3,13 +3,13 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
% This font definition file is a modified version of the standard c63mj.fd
% file; it is for the TeXLive distribution, using smaller font sets.
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c63mj.fd}[\filedate\space\fileversion]
% Korean characters (Hangul)
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c63pg.fd b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c63pg.fd
index 9d9bb41e261..24a2c021d05 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c63pg.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c63pg.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c63pg.fd}[\filedate\space\fileversion]
% Korean characters (Hangul)
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c63pga.fd b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c63pga.fd
index a51fabed817..7f795391f81 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c63pga.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c63pga.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c63pga.fd}[\filedate\space\fileversion]
% Korean characters (Hangul)
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c63ph.fd b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c63ph.fd
index 3ead4192327..7cd0996fda6 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c63ph.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c63ph.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c63ph.fd}[\filedate\space\fileversion]
% Korean characters (Hangul)
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c63pn.fd b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c63pn.fd
index f6f2249f53f..e4a979077f2 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c63pn.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c63pn.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c63pn.fd}[\filedate\space\fileversion]
% Korean characters (Hangul)
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c63sh.fd b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c63sh.fd
index 07931f05e4f..62b984d6d11 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c63sh.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c63sh.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c63sh.fd}[\filedate\space\fileversion]
% Korean characters (Hangul)
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c63tz.fd b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c63tz.fd
index aa113a74df7..a0f8c67af90 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c63tz.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c63tz.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c63tz.fd}[\filedate\space\fileversion]
% Korean characters (Hangul)
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c63vd.fd b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c63vd.fd
index b07ea60f8b1..66cc912c0ff 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c63vd.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c63vd.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c63vd.fd}[\filedate\space\fileversion]
% Korean characters (Hangul)
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c63yt.fd b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c63yt.fd
index f782d94183e..11b979a2d81 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c63yt.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c63yt.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c63yt.fd}[\filedate\space\fileversion]
% Korean characters (Hangul)
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c64bm.fd b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c64bm.fd
index e9b2fcd63f9..35dbc4e5521 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c64bm.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c64bm.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c64bm.fd}[\filedate\space\fileversion]
% Korean characters (Symbols)
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c64dn.fd b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c64dn.fd
index 4ad2e82ff1a..e699a8fcdf1 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c64dn.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c64dn.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c64dn.fd}[\filedate\space\fileversion]
% Korean characters (Symbols)
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c64gr.fd b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c64gr.fd
index ce45b0ce2a4..e8da5452bfa 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c64gr.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c64gr.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c64gr.fd}[\filedate\space\fileversion]
% Korean characters (Symbols)
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c64gs.fd b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c64gs.fd
index 9311a5e4f0f..fc0d18f5fa8 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c64gs.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c64gs.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c64gs.fd}[\filedate\space\fileversion]
% Korean characters (Symbols)
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c64gt.fd b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c64gt.fd
index 042cd30494b..b95b54b5ec0 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c64gt.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c64gt.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c64gt.fd}[\filedate\space\fileversion]
% Korean characters (Symbols)
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c64jgt.fd b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c64jgt.fd
index b76aa551a6e..2804b4082bb 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c64jgt.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c64jgt.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c64jgt.fd}[\filedate\space\fileversion]
% Korean characters (Symbols)
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c64jmj.fd b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c64jmj.fd
index e7d3c545270..fc5c42355d3 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c64jmj.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c64jmj.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c64jmj.fd}[\filedate\space\fileversion]
% Korean characters (Symbols)
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c64jnv.fd b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c64jnv.fd
index 05008ca036e..9fec493b1b0 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c64jnv.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c64jnv.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c64jnv.fd}[\filedate\space\fileversion]
% Korean characters (Symbols)
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c64jsr.fd b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c64jsr.fd
index 151e9bc0099..d6f34f8e7bd 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c64jsr.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c64jsr.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c64jsr.fd}[\filedate\space\fileversion]
% Korean characters (Symbols)
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c64mj.fd b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c64mj.fd
index 250541c50a8..42b321861c1 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c64mj.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c64mj.fd
@@ -3,13 +3,13 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
% This font definition file is a modified version of the standard c64mj.fd
% file; it is for the TeXLive distribution, using smaller font sets.
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c64mj.fd}[\filedate\space\fileversion]
% Korean characters (Symbols)
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c64pg.fd b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c64pg.fd
index b208a5f8759..96e6c1264bd 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c64pg.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c64pg.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c64pg.fd}[\filedate\space\fileversion]
% Korean characters (Symbols)
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c64pga.fd b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c64pga.fd
index 26ad47a7a35..56058915cc8 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c64pga.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c64pga.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c64pga.fd}[\filedate\space\fileversion]
% Korean characters (Symbols)
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c64ph.fd b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c64ph.fd
index e81d2a479f7..7f5cb9fc6c9 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c64ph.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c64ph.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c64ph.fd}[\filedate\space\fileversion]
% Korean characters (Symbols)
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c64pn.fd b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c64pn.fd
index b4b1864db31..a5348103df9 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c64pn.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c64pn.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c64pn.fd}[\filedate\space\fileversion]
% Korean characters (Symbols)
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c64sh.fd b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c64sh.fd
index 1903bdd16d9..348f2f34d4c 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c64sh.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c64sh.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c64sh.fd}[\filedate\space\fileversion]
% Korean characters (Symbols)
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c64tz.fd b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c64tz.fd
index 1980a8f3065..ce174378c28 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c64tz.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c64tz.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c64tz.fd}[\filedate\space\fileversion]
% Korean characters (Hangul)
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c64vd.fd b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c64vd.fd
index 92087c75f91..c7fb764ba3d 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c64vd.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c64vd.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c64vd.fd}[\filedate\space\fileversion]
% Korean characters (Symbols)
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c64yt.fd b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c64yt.fd
index 09f70c738dd..e122637fbd0 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c64yt.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c64yt.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c64yt.fd}[\filedate\space\fileversion]
% Korean characters (Symbols)
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c65bm.fd b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c65bm.fd
index 13cfbc87509..c526f709c1d 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c65bm.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c65bm.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c65bm.fd}[\filedate\space\fileversion]
% Korean characters (Hanja)
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c65dn.fd b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c65dn.fd
index 8873d59c899..4b6d776b70c 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c65dn.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c65dn.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c65dn.fd}[\filedate\space\fileversion]
% Korean characters (Hanja)
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c65gr.fd b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c65gr.fd
index 0a8d4990f19..df5308f99ff 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c65gr.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c65gr.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c65gr.fd}[\filedate\space\fileversion]
% Korean characters (Hanja)
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c65gs.fd b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c65gs.fd
index 673fa549e0b..f6fcb6fa8df 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c65gs.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c65gs.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c65gs.fd}[\filedate\space\fileversion]
% Korean characters (Hanja)
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c65gt.fd b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c65gt.fd
index a9d96baded8..98a7055472a 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c65gt.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c65gt.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c65gt.fd}[\filedate\space\fileversion]
% Korean characters (Hanja)
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c65jgt.fd b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c65jgt.fd
index 40d511e1a2a..0267e5b19ce 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c65jgt.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c65jgt.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c65jgt.fd}[\filedate\space\fileversion]
% Korean characters (Hanja)
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c65jmj.fd b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c65jmj.fd
index 94105895e49..38250f043de 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c65jmj.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c65jmj.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c65jmj.fd}[\filedate\space\fileversion]
% Korean characters (Hanja)
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c65jnv.fd b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c65jnv.fd
index 0c80ce03e91..973211bc7b4 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c65jnv.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c65jnv.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c65jnv.fd}[\filedate\space\fileversion]
% Korean characters (Hanja)
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c65jsr.fd b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c65jsr.fd
index a0d8d087104..df55d6f9e22 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c65jsr.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c65jsr.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c65jsr.fd}[\filedate\space\fileversion]
% Korean characters (Hanja)
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c65mj.fd b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c65mj.fd
index 83c4db961ab..3307685af0a 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c65mj.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c65mj.fd
@@ -3,13 +3,13 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
% This font definition file is a modified version of the standard c65mj.fd
% file; it is for the TeXLive distribution, using smaller font sets.
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c65mj.fd}[\filedate\space\fileversion]
% Korean characters (Hanja)
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c65pg.fd b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c65pg.fd
index f5b43208f98..fc5fe9004b2 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c65pg.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c65pg.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c65pg.fd}[\filedate\space\fileversion]
% Korean characters (Hanja)
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c65pga.fd b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c65pga.fd
index f18acdedabf..2234820a6b3 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c65pga.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c65pga.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c65pga.fd}[\filedate\space\fileversion]
% Korean characters (Hanja)
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c65ph.fd b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c65ph.fd
index fb4f2aa53c9..2b3a8d93a16 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c65ph.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c65ph.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c65ph.fd}[\filedate\space\fileversion]
% Korean characters (Hanja)
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c65pn.fd b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c65pn.fd
index 836524e00e4..8d77ed1c1ac 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c65pn.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c65pn.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c65pn.fd}[\filedate\space\fileversion]
% Korean characters (Hanja)
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c65sh.fd b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c65sh.fd
index 1f6ebafe918..0cb3a621e8e 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c65sh.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c65sh.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c65sh.fd}[\filedate\space\fileversion]
% Korean characters (Hanja)
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c65tz.fd b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c65tz.fd
index 0c80ae060a9..d3530196837 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c65tz.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c65tz.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c65tz.fd}[\filedate\space\fileversion]
% Korean characters (Hangul)
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c65vd.fd b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c65vd.fd
index 1ffaefd5b9a..efe297ef8bf 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c65vd.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c65vd.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c65vd.fd}[\filedate\space\fileversion]
% Korean characters (Symbols)
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c65yt.fd b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c65yt.fd
index 90d021a102b..0aa4975cab9 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c65yt.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/c65yt.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c65yt.fd}[\filedate\space\fileversion]
% Korean characters (Hanja)
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/pshan.sty b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/pshan.sty
index d35018bdd35..67c4c5fb4dc 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/pshan.sty
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/KS/HLaTeX/pshan.sty
@@ -3,9 +3,9 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-% 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
@@ -22,8 +22,8 @@
% Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
% MA 02110-1301 USA
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesPackage{pshan}[\filedate\space\fileversion]
\endinput
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/KS/KS.chr b/Master/texmf-dist/tex/latex/cjk/texinput/KS/KS.chr
index d739a2ce90b..924b9792e5e 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/KS/KS.chr
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/KS/KS.chr
@@ -3,9 +3,9 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-% 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
@@ -22,8 +22,8 @@
% Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
% MA 02110-1301 USA
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{KS.chr}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/KS/KS.enc b/Master/texmf-dist/tex/latex/cjk/texinput/KS/KS.enc
index 831451ca674..bd3246e246c 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/KS/KS.enc
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/KS/KS.enc
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{KS.enc}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/KS/c60dr.fd b/Master/texmf-dist/tex/latex/cjk/texinput/KS/c60dr.fd
index 15124ebce8c..83d0bd611d5 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/KS/c60dr.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/KS/c60dr.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c60dr.fd}[\filedate\space\fileversion]
% Korean characters (Hanja)
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/KS/c60gr.fd b/Master/texmf-dist/tex/latex/cjk/texinput/KS/c60gr.fd
index bfda728dbc2..b2e908ac5d1 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/KS/c60gr.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/KS/c60gr.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c60gr.fd}[\filedate\space\fileversion]
% Korean characters (Hanja)
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/KS/c60gs.fd b/Master/texmf-dist/tex/latex/cjk/texinput/KS/c60gs.fd
index a462f4249f7..cb8e0122556 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/KS/c60gs.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/KS/c60gs.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c60gs.fd}[\filedate\space\fileversion]
% Korean characters (Hanja)
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/KS/c60gt.fd b/Master/texmf-dist/tex/latex/cjk/texinput/KS/c60gt.fd
index d5136edce49..fc54bfded76 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/KS/c60gt.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/KS/c60gt.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c60gt.fd}[\filedate\space\fileversion]
% Korean characters (Hanja)
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/KS/c60hgt.fd b/Master/texmf-dist/tex/latex/cjk/texinput/KS/c60hgt.fd
index 1a53923e1c0..4291ae4361f 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/KS/c60hgt.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/KS/c60hgt.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c60hgt.fd}[\filedate\space\fileversion]
% Korean characters (Hanja)
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/KS/c60hmj.fd b/Master/texmf-dist/tex/latex/cjk/texinput/KS/c60hmj.fd
index 9c6aed9d1aa..a2bea6c9a19 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/KS/c60hmj.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/KS/c60hmj.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c60hmj.fd}[\filedate\space\fileversion]
% Korean characters (Hanja)
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/KS/c60hol.fd b/Master/texmf-dist/tex/latex/cjk/texinput/KS/c60hol.fd
index d1a049365ae..1c1e16b12b2 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/KS/c60hol.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/KS/c60hol.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c60hol.fd}[\filedate\space\fileversion]
% Korean characters (Hanja)
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/KS/c60hpg.fd b/Master/texmf-dist/tex/latex/cjk/texinput/KS/c60hpg.fd
index 754d3d067d5..d581cebaf8e 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/KS/c60hpg.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/KS/c60hpg.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c60hpg.fd}[\filedate\space\fileversion]
% Korean characters (Hanja)
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/KS/c60mj.fd b/Master/texmf-dist/tex/latex/cjk/texinput/KS/c60mj.fd
index 6cd20203b04..1c86c183359 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/KS/c60mj.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/KS/c60mj.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c60mj.fd}[\filedate\space\fileversion]
% Korean characters (Hanja)
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/KS/c61dr.fd b/Master/texmf-dist/tex/latex/cjk/texinput/KS/c61dr.fd
index a7ae4c0459a..09e246a7e81 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/KS/c61dr.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/KS/c61dr.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c61dr.fd}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/KS/c61gr.fd b/Master/texmf-dist/tex/latex/cjk/texinput/KS/c61gr.fd
index 112f131286c..32acdfb66c4 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/KS/c61gr.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/KS/c61gr.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c61gr.fd}[\filedate\space\fileversion]
% Korean syllables (Hangul) and elements (Jaso)
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/KS/c61gs.fd b/Master/texmf-dist/tex/latex/cjk/texinput/KS/c61gs.fd
index d82d2db8928..0eae709b0ac 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/KS/c61gs.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/KS/c61gs.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c61gs.fd}[\filedate\space\fileversion]
% Korean syllables (Hangul) and elements (Jaso)
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/KS/c61gt.fd b/Master/texmf-dist/tex/latex/cjk/texinput/KS/c61gt.fd
index 64ac747dba9..53b4084ebbf 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/KS/c61gt.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/KS/c61gt.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c61gt.fd}[\filedate\space\fileversion]
% Korean syllables (Hangul) and elements (Jaso)
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/KS/c61hgt.fd b/Master/texmf-dist/tex/latex/cjk/texinput/KS/c61hgt.fd
index 0eedfc9f9ac..7a1af915c1f 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/KS/c61hgt.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/KS/c61hgt.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c61hgt.fd}[\filedate\space\fileversion]
% Korean syllables (Hangul) and elements (Jaso)
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/KS/c61hmj.fd b/Master/texmf-dist/tex/latex/cjk/texinput/KS/c61hmj.fd
index ac2e6661e7e..a38b4ebde67 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/KS/c61hmj.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/KS/c61hmj.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c61hmj.fd}[\filedate\space\fileversion]
% Korean syllables (Hangul) and elements (Jaso)
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/KS/c61hol.fd b/Master/texmf-dist/tex/latex/cjk/texinput/KS/c61hol.fd
index 847be5a285d..9221a5257cd 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/KS/c61hol.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/KS/c61hol.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c61hol.fd}[\filedate\space\fileversion]
% Korean syllables (Hangul) and elements (Jaso)
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/KS/c61hpg.fd b/Master/texmf-dist/tex/latex/cjk/texinput/KS/c61hpg.fd
index 46cf14ded59..3f5b9ea9d6e 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/KS/c61hpg.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/KS/c61hpg.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c61hpg.fd}[\filedate\space\fileversion]
% Korean syllables (Hangul) and elements (Jaso)
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/KS/c61mj.fd b/Master/texmf-dist/tex/latex/cjk/texinput/KS/c61mj.fd
index 46157440b65..3ce385d0144 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/KS/c61mj.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/KS/c61mj.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c61mj.fd}[\filedate\space\fileversion]
% Korean syllables (Hangul) and elements (Jaso)
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/KS/c62song.fd b/Master/texmf-dist/tex/latex/cjk/texinput/KS/c62song.fd
index 197758069b7..d25d0d2e0d4 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/KS/c62song.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/KS/c62song.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c62song.fd}[\filedate\space\fileversion]
% Korean characters (Hanja)
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/KS/hangul.cap b/Master/texmf-dist/tex/latex/cjk/texinput/KS/hangul.cap
index 6bd740870cb..f1ccedf8f70 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/KS/hangul.cap
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/KS/hangul.cap
@@ -3,9 +3,9 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-% 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
@@ -22,8 +22,8 @@
% Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
% MA 02110-1301 USA
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{hangul.cap}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/KS/hangul.cpx b/Master/texmf-dist/tex/latex/cjk/texinput/KS/hangul.cpx
index 35f4f13e2a0..1050f74589e 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/KS/hangul.cpx
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/KS/hangul.cpx
@@ -3,9 +3,9 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-% 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
@@ -22,8 +22,8 @@
% Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
% MA 02110-1301 USA
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{hangul.cpx}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/KS/hangul2.cap b/Master/texmf-dist/tex/latex/cjk/texinput/KS/hangul2.cap
index 2c9e398ff7a..98dbb266000 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/KS/hangul2.cap
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/KS/hangul2.cap
@@ -3,9 +3,9 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-% 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
@@ -22,8 +22,8 @@
% Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
% MA 02110-1301 USA
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{hangul2.cap}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/KS/hangul2.cpx b/Master/texmf-dist/tex/latex/cjk/texinput/KS/hangul2.cpx
index 37d43dc39c7..ce3250733c7 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/KS/hangul2.cpx
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/KS/hangul2.cpx
@@ -3,9 +3,9 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-% 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
@@ -22,8 +22,8 @@
% Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
% MA 02110-1301 USA
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{hangul2.cpx}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/KS/hanja.cap b/Master/texmf-dist/tex/latex/cjk/texinput/KS/hanja.cap
index 2b000073eed..7eb1832cdea 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/KS/hanja.cap
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/KS/hanja.cap
@@ -3,9 +3,9 @@
%
% created by Werner Lemberg <a7971428@unet.univie.ac.at>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-% 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
@@ -22,8 +22,8 @@
% Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
% MA 02110-1301 USA
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{hanja.cap}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/KS/hanja.cpx b/Master/texmf-dist/tex/latex/cjk/texinput/KS/hanja.cpx
index b2e48ea9328..39e2a02cf41 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/KS/hanja.cpx
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/KS/hanja.cpx
@@ -3,9 +3,9 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-% 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
@@ -22,8 +22,8 @@
% Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
% MA 02110-1301 USA
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{hanja.cpx}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/SJIS/SJIS.bdg b/Master/texmf-dist/tex/latex/cjk/texinput/SJIS/SJIS.bdg
index 7dd2a6a0f1f..3d5b0299afd 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/SJIS/SJIS.bdg
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/SJIS/SJIS.bdg
@@ -3,9 +3,9 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-% 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
@@ -22,8 +22,8 @@
% Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
% MA 02110-1301 USA
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{SJIS.bdg}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/SJIS/SJIS.cap b/Master/texmf-dist/tex/latex/cjk/texinput/SJIS/SJIS.cap
index 4390494383a..3b62a9802b3 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/SJIS/SJIS.cap
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/SJIS/SJIS.cap
@@ -3,9 +3,9 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-% 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
@@ -22,8 +22,8 @@
% Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
% MA 02110-1301 USA
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{SJIS.cap}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/SJIS/SJIS.chr b/Master/texmf-dist/tex/latex/cjk/texinput/SJIS/SJIS.chr
index d5243145c32..cb17c2ff0c6 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/SJIS/SJIS.chr
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/SJIS/SJIS.chr
@@ -3,9 +3,9 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-% 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
@@ -22,8 +22,8 @@
% Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
% MA 02110-1301 USA
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{SJIS.chr}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/SJIS/SJIS.cpx b/Master/texmf-dist/tex/latex/cjk/texinput/SJIS/SJIS.cpx
index d29ad727620..e68f47b2735 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/SJIS/SJIS.cpx
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/SJIS/SJIS.cpx
@@ -3,9 +3,9 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-% 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
@@ -22,8 +22,8 @@
% Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
% MA 02110-1301 USA
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{SJIS.cpx}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/SJIS/SJIS.enc b/Master/texmf-dist/tex/latex/cjk/texinput/SJIS/SJIS.enc
index ba61a6a1cf4..e20ffa821ba 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/SJIS/SJIS.enc
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/SJIS/SJIS.enc
@@ -3,9 +3,9 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-% 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
@@ -22,8 +22,8 @@
% Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
% MA 02110-1301 USA
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{SJIS.enc}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/SJIS/SJISdnp.chr b/Master/texmf-dist/tex/latex/cjk/texinput/SJIS/SJISdnp.chr
index 05e880f6cda..9fb710420f1 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/SJIS/SJISdnp.chr
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/SJIS/SJISdnp.chr
@@ -3,9 +3,9 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-% 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
@@ -22,8 +22,8 @@
% Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
% MA 02110-1301 USA
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{SJISdnp.chr}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/SJIS/SJISdnp.enc b/Master/texmf-dist/tex/latex/cjk/texinput/SJIS/SJISdnp.enc
index eb8381fa1bc..0aeaf13f71e 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/SJIS/SJISdnp.enc
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/SJIS/SJISdnp.enc
@@ -3,9 +3,9 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-% 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
@@ -22,8 +22,8 @@
% Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
% MA 02110-1301 USA
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{SJISdnp.enc}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/SJIS/c49song.fd b/Master/texmf-dist/tex/latex/cjk/texinput/SJIS/c49song.fd
index 334ebf68120..c24aa0dc819 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/SJIS/c49song.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/SJIS/c49song.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\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]
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/UTF8/UTF8.bdg b/Master/texmf-dist/tex/latex/cjk/texinput/UTF8/UTF8.bdg
index 9c37a0afdbe..7e1f4988f56 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/UTF8/UTF8.bdg
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/UTF8/UTF8.bdg
@@ -3,9 +3,9 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-% 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
@@ -22,8 +22,8 @@
% Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
% MA 02110-1301 USA
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{UTF8.bdg}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/UTF8/UTF8.chr b/Master/texmf-dist/tex/latex/cjk/texinput/UTF8/UTF8.chr
index f255e32f311..cdb438141ed 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/UTF8/UTF8.chr
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/UTF8/UTF8.chr
@@ -3,9 +3,9 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-% 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
@@ -22,8 +22,8 @@
% Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
% MA 02110-1301 USA
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{UTF8.chr}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/UTF8/UTF8.enc b/Master/texmf-dist/tex/latex/cjk/texinput/UTF8/UTF8.enc
index 20b1cde2e98..ff401e70499 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/UTF8/UTF8.enc
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/UTF8/UTF8.enc
@@ -3,9 +3,9 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-% 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
@@ -22,8 +22,8 @@
% Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
% MA 02110-1301 USA
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{UTF8.enc}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/UTF8/c70bkai.fd b/Master/texmf-dist/tex/latex/cjk/texinput/UTF8/c70bkai.fd
index b70366a9bea..a4f0d9a8499 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/UTF8/c70bkai.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/UTF8/c70bkai.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c70bkai.fd}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/UTF8/c70bkai.fdx b/Master/texmf-dist/tex/latex/cjk/texinput/UTF8/c70bkai.fdx
index f8b815ae442..8f3919f4924 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/UTF8/c70bkai.fdx
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/UTF8/c70bkai.fdx
@@ -1,10 +1,10 @@
% This is the file c70bkai.fdx of the CJK package
% for using Asian logographs (Chinese/Japanese/Korean) with LaTeX2e
%
-% created by the script makefdx.pl for CJK Version 4.8.4 (18-Apr-2015).
+% created by the script makefdx.pl for CJK Version 4.8.5 (16-Oct-2021).
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c70bkai.fdx}[\filedate\space\fileversion]
\CJKvdef{fullheight}{1em}
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/UTF8/c70bsmi.fd b/Master/texmf-dist/tex/latex/cjk/texinput/UTF8/c70bsmi.fd
index d65e63a7ea4..89ebad58e96 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/UTF8/c70bsmi.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/UTF8/c70bsmi.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c70bsmi.fd}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/UTF8/c70bsmi.fdx b/Master/texmf-dist/tex/latex/cjk/texinput/UTF8/c70bsmi.fdx
index 777dfe6c448..08a298253c0 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/UTF8/c70bsmi.fdx
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/UTF8/c70bsmi.fdx
@@ -1,10 +1,10 @@
% This is the file c70bsmi.fdx of the CJK package
% for using Asian logographs (Chinese/Japanese/Korean) with LaTeX2e
%
-% created by the script makefdx.pl for CJK Version 4.8.4 (18-Apr-2015).
+% created by the script makefdx.pl for CJK Version 4.8.5 (16-Oct-2021).
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c70bsmi.fdx}[\filedate\space\fileversion]
\CJKvdef{fullheight}{1em}
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/UTF8/c70gbsn.fd b/Master/texmf-dist/tex/latex/cjk/texinput/UTF8/c70gbsn.fd
index d3f68d1edf7..f13902d0ed9 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/UTF8/c70gbsn.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/UTF8/c70gbsn.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c70gbsn.fd}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/UTF8/c70gbsn.fdx b/Master/texmf-dist/tex/latex/cjk/texinput/UTF8/c70gbsn.fdx
index 2a171dcc035..57ab05fda29 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/UTF8/c70gbsn.fdx
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/UTF8/c70gbsn.fdx
@@ -1,8 +1,8 @@
% This is the file c70gbsn.fdx of the CJK package
% for using Asian logographs (Chinese/Japanese/Korean) with LaTeX2e
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c70gbsn.fdx}[\filedate\space\fileversion]
% This font doesn't contain a glyph for U+3007, but it has U+25CB.
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/UTF8/c70gkai.fd b/Master/texmf-dist/tex/latex/cjk/texinput/UTF8/c70gkai.fd
index 1c175671942..532faa1d756 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/UTF8/c70gkai.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/UTF8/c70gkai.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c70gkai.fd}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/UTF8/c70gkai.fdx b/Master/texmf-dist/tex/latex/cjk/texinput/UTF8/c70gkai.fdx
index 5fa017a258a..d0735a97e54 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/UTF8/c70gkai.fdx
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/UTF8/c70gkai.fdx
@@ -1,8 +1,8 @@
% This is the file c70gkai.fdx of the CJK package
% for using Asian logographs (Chinese/Japanese/Korean) with LaTeX2e
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c70gkai.fdx}[\filedate\space\fileversion]
% This font doesn't contain a glyph for U+3007, but it has U+25CB.
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/UTF8/c70mj.fd b/Master/texmf-dist/tex/latex/cjk/texinput/UTF8/c70mj.fd
index e803afcea3b..d2f03e670e3 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/UTF8/c70mj.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/UTF8/c70mj.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c70mj.fd}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/UTF8/c70mj.fdx b/Master/texmf-dist/tex/latex/cjk/texinput/UTF8/c70mj.fdx
index d5c0f741d7d..07c7235bec2 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/UTF8/c70mj.fdx
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/UTF8/c70mj.fdx
@@ -1,8 +1,8 @@
% This is the file c70mj.fdx of the CJK package
% for using Asian logographs (Chinese/Japanese/Korean) with LaTeX2e
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c70mj.fdx}[\filedate\space\fileversion]
% This font doesn't contain a glyph for U+3007, but it has U+25CB.
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/UTF8/c70song.fd b/Master/texmf-dist/tex/latex/cjk/texinput/UTF8/c70song.fd
index 4e41f9aef96..db45e169f00 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/UTF8/c70song.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/UTF8/c70song.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c70song.fd}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/UTF8/ja.cpx b/Master/texmf-dist/tex/latex/cjk/texinput/UTF8/ja.cpx
index c6a16371d3a..0ffd3fb2da5 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/UTF8/ja.cpx
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/UTF8/ja.cpx
@@ -3,9 +3,9 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-% 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
@@ -22,8 +22,8 @@
% Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
% MA 02110-1301 USA
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{ja.cpx}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/UTF8/ko-Hang.cpx b/Master/texmf-dist/tex/latex/cjk/texinput/UTF8/ko-Hang.cpx
index 44b7dc614c6..f83c47a68b3 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/UTF8/ko-Hang.cpx
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/UTF8/ko-Hang.cpx
@@ -3,9 +3,9 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-% 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
@@ -22,8 +22,8 @@
% Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
% MA 02110-1301 USA
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{ko-Hang.cpx}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/UTF8/ko-Hang2.cpx b/Master/texmf-dist/tex/latex/cjk/texinput/UTF8/ko-Hang2.cpx
index 9635d4f587a..e6f40fdd2ba 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/UTF8/ko-Hang2.cpx
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/UTF8/ko-Hang2.cpx
@@ -3,9 +3,9 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-% 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
@@ -22,8 +22,8 @@
% Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
% MA 02110-1301 USA
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{ko-Hang2.cpx}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/UTF8/ko-Hani.cpx b/Master/texmf-dist/tex/latex/cjk/texinput/UTF8/ko-Hani.cpx
index 68d68f9f575..f98d1562123 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/UTF8/ko-Hani.cpx
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/UTF8/ko-Hani.cpx
@@ -3,9 +3,9 @@
%
% created by Werner Lemberg <a7971428@unet.univie.ac.at>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-% 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
@@ -22,8 +22,8 @@
% Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
% MA 02110-1301 USA
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{ko-Hani.cpx}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/UTF8/zh-Hans.cpx b/Master/texmf-dist/tex/latex/cjk/texinput/UTF8/zh-Hans.cpx
index f526089d330..9ec7bf06c88 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/UTF8/zh-Hans.cpx
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/UTF8/zh-Hans.cpx
@@ -3,9 +3,9 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-% 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
@@ -22,8 +22,8 @@
% Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
% MA 02110-1301 USA
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{zh-Hans.cpx}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/UTF8/zh-Hant.cpx b/Master/texmf-dist/tex/latex/cjk/texinput/UTF8/zh-Hant.cpx
index 388f600aa8f..84b6f4df8c7 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/UTF8/zh-Hant.cpx
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/UTF8/zh-Hant.cpx
@@ -3,9 +3,9 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-% 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
@@ -22,8 +22,8 @@
% Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
% MA 02110-1301 USA
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{zh-Hant.cpx}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/extended.chr b/Master/texmf-dist/tex/latex/cjk/texinput/extended.chr
index 49e09b5f8ea..38cd923aa99 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/extended.chr
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/extended.chr
@@ -3,9 +3,9 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-% 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
@@ -22,8 +22,8 @@
% Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
% MA 02110-1301 USA
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{extended.chr}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/extended.enc b/Master/texmf-dist/tex/latex/cjk/texinput/extended.enc
index 73d2ecee86a..10d0ce146dc 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/extended.enc
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/extended.enc
@@ -3,9 +3,9 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-% 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
@@ -22,8 +22,8 @@
% Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
% MA 02110-1301 USA
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{extended.enc}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/mule/MULEenc.sty b/Master/texmf-dist/tex/latex/cjk/texinput/mule/MULEenc.sty
index cc356b4b6cb..d9e608ae029 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/mule/MULEenc.sty
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/mule/MULEenc.sty
@@ -3,9 +3,9 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-% 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,8 +25,8 @@
\makeatletter
\endlinechar \m@ne
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesPackage{MULEenc}[\filedate\space\fileversion]
\NeedsTeXFormat{LaTeX2e}[1998/06/01]
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/pinyin.sty b/Master/texmf-dist/tex/latex/cjk/texinput/pinyin.sty
index c5a76b6bd8b..b9b1553ee24 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/pinyin.sty
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/pinyin.sty
@@ -3,11 +3,11 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
%
% This style file works with plain TeX also.
-% 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
@@ -24,8 +24,8 @@
% Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
% MA 02110-1301 USA
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\catcode`@=11
\endlinechar \m@ne
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/pmC.chr b/Master/texmf-dist/tex/latex/cjk/texinput/pmC.chr
index 0a4b44d412a..83a75e7e7fb 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/pmC.chr
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/pmC.chr
@@ -3,9 +3,9 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-% 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
@@ -22,8 +22,8 @@
% Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
% MA 02110-1301 USA
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{pmC.chr}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/pmCbig.enc b/Master/texmf-dist/tex/latex/cjk/texinput/pmCbig.enc
index c86d9b30e15..57ecd41ddbe 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/pmCbig.enc
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/pmCbig.enc
@@ -3,9 +3,9 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-% 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
@@ -22,8 +22,8 @@
% Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
% MA 02110-1301 USA
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{pmCbig.enc}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/pmCsmall.enc b/Master/texmf-dist/tex/latex/cjk/texinput/pmCsmall.enc
index e1a0245e0a5..2e64b23b90b 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/pmCsmall.enc
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/pmCsmall.enc
@@ -3,9 +3,9 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-% 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
@@ -22,8 +22,8 @@
% Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
% MA 02110-1301 USA
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{pmCsmall.enc}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/ruby.sty b/Master/texmf-dist/tex/latex/cjk/texinput/ruby.sty
index a42df601dfb..708a62522cf 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/ruby.sty
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/ruby.sty
@@ -3,9 +3,9 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-% 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
@@ -23,8 +23,8 @@
% MA 02110-1301 USA
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesPackage{ruby}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/standard.bdg b/Master/texmf-dist/tex/latex/cjk/texinput/standard.bdg
index c793d940440..dc0a5f18a27 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/standard.bdg
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/standard.bdg
@@ -3,9 +3,9 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-% 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
@@ -22,8 +22,8 @@
% Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
% MA 02110-1301 USA
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{standard.bdg}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/standard.chr b/Master/texmf-dist/tex/latex/cjk/texinput/standard.chr
index bf367663a11..e1669a627fd 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/standard.chr
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/standard.chr
@@ -3,9 +3,9 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-% 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
@@ -22,8 +22,8 @@
% Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
% MA 02110-1301 USA
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{standard.chr}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/standard.enc b/Master/texmf-dist/tex/latex/cjk/texinput/standard.enc
index 5f107344b05..d54df3a37b5 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/standard.enc
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/standard.enc
@@ -3,9 +3,9 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-% 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
@@ -22,8 +22,8 @@
% Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
% MA 02110-1301 USA
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{standard.enc}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/thai/c90cmr.fd b/Master/texmf-dist/tex/latex/cjk/texinput/thai/c90cmr.fd
index ab41dcb2f93..d65fbf8eff5 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/thai/c90cmr.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/thai/c90cmr.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c90cmr.fd}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/thai/c90cmss.fd b/Master/texmf-dist/tex/latex/cjk/texinput/thai/c90cmss.fd
index 3dd77a71e7f..240713a34b8 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/thai/c90cmss.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/thai/c90cmss.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c90cmss.fd}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/thai/c90cmtt.fd b/Master/texmf-dist/tex/latex/cjk/texinput/thai/c90cmtt.fd
index aa6ba2d662f..bf50798389e 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/thai/c90cmtt.fd
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/thai/c90cmtt.fd
@@ -3,10 +3,10 @@
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-\def\fileversion{4.8.4}
-\def\filedate{2015/04/18}
+\def\fileversion{4.8.5}
+\def\filedate{2021/10/16}
\ProvidesFile{c90cmtt.fd}[\filedate\space\fileversion]
diff --git a/Master/texmf-dist/tex/latex/cjk/texinput/thai/thaicjk.ldf b/Master/texmf-dist/tex/latex/cjk/texinput/thai/thaicjk.ldf
index b11c63edf39..78166632e93 100644
--- a/Master/texmf-dist/tex/latex/cjk/texinput/thai/thaicjk.ldf
+++ b/Master/texmf-dist/tex/latex/cjk/texinput/thai/thaicjk.ldf
@@ -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)
%
%
% It is based on a similar file of the thailatex package, written
@@ -11,7 +11,7 @@
% Theppitak Karoonboonyanan <thep@links.nectec.or.th>.
\ProvidesLanguage{thaicjk}
- [CJK 4.8.4 Thai support for the babel system]
+ [CJK 4.8.5 Thai support for the babel system]
\LdfInit{thaicjk}{captionsthaicjk}
diff --git a/Master/texmf-dist/tex/latex/cjk/utils/pyhyphen/pinyin.ldf b/Master/texmf-dist/tex/latex/cjk/utils/pyhyphen/pinyin.ldf
index 9fbe8e4fa92..a92b42253fe 100644
--- a/Master/texmf-dist/tex/latex/cjk/utils/pyhyphen/pinyin.ldf
+++ b/Master/texmf-dist/tex/latex/cjk/utils/pyhyphen/pinyin.ldf
@@ -1,15 +1,12 @@
% This is the file pinyin.ldf of the CJK package
% for hyphenating Chinese pinyin syllables.
%
-% We use the latin-1 character code for `umlaut u' (0xfc). Additionally,
-% the quote character "'" is used in its standard sense (resolving syllabic
-% ambiguities).
%
% created by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
-% 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
@@ -26,8 +23,26 @@
% Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
% MA 02110-1301 USA
+
+% Two shorthands are defined for pinyin.
+%
+% "u This represents `u umlaut'.
+%
+% "' This represents the apostrophe used to resolve syllabic
+% ambiguities as in
+%
+% Tien'anmen ,
+%
+% which should be thus typed in as
+%
+% Tien"'anmen .
+%
+% Internally, this converts to a discretionary hyphen, since the
+% apostrophe should vanish after a line break.
+
+
\ProvidesLanguage{pinyin}
- [CJK 4.8.4 pinyin support for the babel system]
+ [CJK 4.8.5 pinyin support for the babel system]
\LdfInit{pinyin}{captionspinyin}
@@ -36,7 +51,7 @@
\adddialect\l@pinyin0
\fi
-\def\pinyinhyphenmins{11}
+\providehyphenmins{pinyin}{\@ne\tw@}
\def\captionspinyin{}
\def\datepinyin{}
@@ -45,14 +60,12 @@
\addto\extraspinyin{\languageshorthands{pinyin}}
\addto\extraspinyin{\bbl@activate{"}}
\addto\extraspinyin{\babel@save\"\umlautlow}
-\addto\extraspinyin{%
- \babel@savevariable{\lccode"27}%
- \lccode"27 "27}
\addto\noextraspinyin{\umlauthigh}
-\declare@shorthand{pinyin}{"u}{\textormath{\"{u}}{\ddot u}}
-\declare@shorthand{pinyin}{"U}{\textormath{\"{U}}{\ddot U}}
+\declare@shorthand{pinyin}{"u}{\textormath{\"{u}\allowhyphens}{\ddot u}}
+\declare@shorthand{pinyin}{"U}{\textormath{\"{U}\allowhyphens}{\ddot U}}
+\declare@shorthand{pinyin}{"'}{\textormath{\discretionary{-}{}{'}}{'}}
\def\mdqon{\shorthandon{"}}
\def\mdqoff{\shorthandoff{"}}
diff --git a/Master/tlpkg/bin/tlpkginfo b/Master/tlpkg/bin/tlpkginfo
index 8f22989b8d6..438c69033da 100755
--- a/Master/tlpkg/bin/tlpkginfo
+++ b/Master/tlpkg/bin/tlpkginfo
@@ -81,7 +81,7 @@ sub ctaninfo {
);
# the CJK material is split into several packages.
- $cjk_pkgs = "(cjk|ttf)utils|dnp|(|garuda-|norasi-)c90";
+ $cjk_pkgs = "cjkutils|dnp|(|garuda-|norasi-)c90";
if ($ARGV[0] eq "--ctan-dir") {
my $output = &find_ctan_dir ($ARGV[1], 0);
diff --git a/Master/tlpkg/libexec/c90.pl b/Master/tlpkg/libexec/c90.pl
index 637ba8b71bc..c7cbbacf6ad 100644
--- a/Master/tlpkg/libexec/c90.pl
+++ b/Master/tlpkg/libexec/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.2 and cjk-4.8.2-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/tlpkg/libexec/cjk-build.pl b/Master/tlpkg/libexec/cjk-build.pl
index 444cba09dfa..8837c28ee2c 100644
--- a/Master/tlpkg/libexec/cjk-build.pl
+++ b/Master/tlpkg/libexec/cjk-build.pl
@@ -8,18 +8,21 @@
# 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.2 and cjk-4.8.2-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.
+
# XXX: This installs files in the Build hierarchy!
+
my $B = "cjkutils/bat";
my $C = "cjkutils/conv";
my $H = "cjkutils/hbf2gf";
my $S = "cjkutils/scripts";
+
&I("utils/Bg5conv/bg5conv.c", "$C/bg5conv.c");
&I("utils/Bg5conv/bg5latex", "$S/bg5latex");
&I("utils/Bg5conv/bg5pdflatex", "$S/bg5pdflatex");
diff --git a/Master/tlpkg/libexec/cjk.pl b/Master/tlpkg/libexec/cjk.pl
index f92e5295345..a2ee65be55e 100644
--- a/Master/tlpkg/libexec/cjk.pl
+++ b/Master/tlpkg/libexec/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.2 and cjk-4.8.2-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.2
+# cjk-4.8.5
# ---------
#
@@ -121,6 +121,7 @@ my $T = "tex/latex/cjk";
&I("examples/rubytest.tex", "$D/examples/rubytest.tex");
&I("examples/SJIS.tex", "$D/examples/SJIS.tex");
&I("examples/thai.tex", "$D/examples/thai.tex");
+&I("examples/thai_utf8.tex","$D/examples/thai_utf8.tex");
&I("examples/UTF8.tex", "$D/examples/UTF8.tex");
&I("texinput/CJK.enc", "$T/texinput/CJK.enc");
@@ -394,11 +395,16 @@ my $T = "tex/latex/cjk";
&I("utils/lisp/mule-2.3/cjk-enc.el", "$S/utils/lisp/mule-2.3/cjk-enc.el");
-&I("utils/pyhyphen/pinyin.c", "$S/utils/pyhyphen/pinyin.c");
-&I("utils/pyhyphen/pinyin.ldf", "$T/utils/pyhyphen/pinyin.ldf"); # $T
-&I("utils/pyhyphen/pinyin.tr", "$S/utils/pyhyphen/pinyin.tr");
-&I("utils/pyhyphen/pyhyph.tex", "$S/utils/pyhyphen/pyhyph.tex");
-&I("utils/pyhyphen/pytest.tex", "$D/utils/pyhyphen/pytest.tex"); # $D
+&I("utils/pyhyphen/GNUmakefile", "$S/utils/pyhyphen/GNUmakefile");
+&I("utils/pyhyphen/hyph-zh-latn-pinyin.in", "$S/utils/pyhyphen/hyph-zh-latn-pinyin.in");
+&I("utils/pyhyphen/hyph-zh-latn-pinyin.tex", "$S/utils/pyhyphen/hyph-zh-latn-pinyin.tex");
+&I("utils/pyhyphen/hyph-zh-latn-tonepinyin.tex", "$S/utils/pyhyphen/hyph-zh-latn-tonepinyin.tex");
+&I("utils/pyhyphen/make-patterns.sh", "$S/utils/pyhyphen/make-patterns.sh");
+&I("utils/pyhyphen/pinyin.c", "$S/utils/pyhyphen/pinyin.c");
+&I("utils/pyhyphen/pinyin.ldf", "$T/utils/pyhyphen/pinyin.ldf"); # $T
+&I("utils/pyhyphen/pinyin.tr", "$S/utils/pyhyphen/pinyin.tr");
+&I("utils/pyhyphen/pytest.tex", "$D/utils/pyhyphen/pytest.tex"); # $D
+&I("utils/pyhyphen/pytestutf8.tex", "$D/utils/pyhyphen/pytestutf8.tex"); # $D
&I("utils/SJISconv/sjisconv.w", "$S/utils/SJISconv/sjisconv.w");
&I("utils/SJISconv/sjisltx.bat", "$S/utils/SJISconv/sjisltx.bat");
@@ -423,7 +429,7 @@ my $T = "tex/latex/cjk";
#
-# cjk-4.8.2-doc
+# cjk-4.8.5-doc
# -------------
#
diff --git a/Master/tlpkg/libexec/bin-cjkutils.pl b/Master/tlpkg/libexec/cjkutils.pl
index 8373988cf90..f56c66b1eac 100644
--- a/Master/tlpkg/libexec/bin-cjkutils.pl
+++ b/Master/tlpkg/libexec/cjkutils.pl
@@ -1,4 +1,4 @@
-# bin-cjkutils.pl
+# cjkutils.pl
#
# Public domain.
#
@@ -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.2 and cjk-4.8.2-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.2
+# cjk-4.8.5
# ---------
#
@@ -56,7 +56,7 @@ my $H = "hbf2gf";
#
-# cjk-4.8.2-doc
+# cjk-4.8.5-doc
# -------------
#
@@ -100,13 +100,13 @@ my $H = "hbf2gf";
# doc/man/txt/hbf2gf.txt ---
# doc/man/txt/sjisconv.txt ---
-&I("doc/pdf/bg5conv.pdf", "$D/bg5conv/bg5conv.pdf");
-&I("doc/pdf/cef5conv.pdf", "$D/cef5conv/cef5conv.pdf");
-&I("doc/pdf/cefconv.pdf", "$D/cefconv/cefconv.pdf");
-&I("doc/pdf/cefsconv.pdf", "$D/cefsconv/cefsconv.pdf");
-&I("doc/pdf/extconv.pdf", "$D/extconv/extconv.pdf");
-&I("doc/pdf/hbf2gf.pdf", "$D/hbf2gf/hbf2gf.pdf");
-&I("doc/pdf/sjisconv.pdf", "$D/sjisconv/sjisconv.pdf");
+&I("doc/pdf/bg5conv.pdf", "$M/bg5conv.man1.pdf");
+&I("doc/pdf/cef5conv.pdf", "$M/cef5conv.man1.pdf");
+&I("doc/pdf/cefconv.pdf", "$M/cefconv.man1.pdf");
+&I("doc/pdf/cefsconv.pdf", "$M/cefsconv.man1.pdf");
+&I("doc/pdf/extconv.pdf", "$M/extconv.man1.pdf");
+&I("doc/pdf/hbf2gf.pdf", "$M/hbf2gf.man1.pdf");
+&I("doc/pdf/sjisconv.pdf", "$M/sjisconv.man1.pdf");
1;
# EOF
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index c221df6d624..21b68a17d20 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -216,7 +216,6 @@ chomp (my $ctan_root = `tlpkginfo --ctan-root`);
'bibutils', "die 'skipping, requires compilation'",
'bickham', "die 'skipping, support for nonfree font'",
'bigints', "&MAKEflatten",
- 'bin-cjkutils',"&MAKEbin_cjkutils",
'biolinum-type1', "die 'skipping, replaced by libertine'",
'bitfield', "die 'skipping, obsolete on CTAN'",
'blanks', "die 'skipping, unknown license (and c.1992)'",
@@ -285,6 +284,7 @@ chomp (my $ctan_root = `tlpkginfo --ctan-root`);
'circuitikz', "&MAKEcopy",
'cirth', "die 'skipping, nosell license'",
'cjk', "&MAKEcjk",
+ 'cjkutils', "&MAKEcjkutils",
'cjw', "die 'skipping, nosell license'",
'clara', "&MAKEflatten",
'clarendo', "die 'skipping, nonfree font'",
@@ -5754,7 +5754,7 @@ sub MAKEcjk_common {
print "\t SPECIAL $package wholesale rearranging for cjk\n";
&xchdir ($packagedir);
- # also need cjk doc tarball. should move in next release.
+ # also need cjk doc tarball. would be nice if they were combined.
my $cjkdoc = "cjk-?.?.?-doc.tar.gz";
&SYSTEM ("tar -C cjk-?.?.? -xf $cjkdoc --strip-components=1");
@@ -5767,9 +5767,9 @@ sub MAKEcjk {
require "cjk.pl"; # in tlpkg/libexec
}
-sub MAKEbin_cjkutils {
+sub MAKEcjkutils {
&MAKEcjk_common ();
- require "bin-cjkutils.pl";
+ require "cjkutils.pl";
}
sub MAKEc90 {
diff --git a/Master/tlpkg/libexec/dnp.pl b/Master/tlpkg/libexec/dnp.pl
index 2d9923c20d4..f7e75555ebd 100644
--- a/Master/tlpkg/libexec/dnp.pl
+++ b/Master/tlpkg/libexec/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.2 and cjk-4.8.2-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/tlpkg/libexec/garuda-c90.pl b/Master/tlpkg/libexec/garuda-c90.pl
index a5f6714ad70..539e7bf63c7 100644
--- a/Master/tlpkg/libexec/garuda-c90.pl
+++ b/Master/tlpkg/libexec/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.2 and cjk-4.8.2-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/tlpkg/libexec/norasi-c90.pl b/Master/tlpkg/libexec/norasi-c90.pl
index e85acabe2c5..88dd7cbf7ff 100644
--- a/Master/tlpkg/libexec/norasi-c90.pl
+++ b/Master/tlpkg/libexec/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.2 and cjk-4.8.2-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";