summaryrefslogtreecommitdiff
path: root/language
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2021-10-19 03:01:14 +0000
committerNorbert Preining <norbert@preining.info>2021-10-19 03:01:14 +0000
commitd045bcbc99b0eda65a444496d60d16ea2d063c65 (patch)
tree86dd463beaafa251038cf6f29adadd6276da1250 /language
parentad3ad18aa939862832c90a74bcf41e8a5570ff65 (diff)
CTAN sync 202110190301
Diffstat (limited to 'language')
l---------language/chinese/CJK/README2
-rw-r--r--language/chinese/CJK/cjk-4.8.4/doc/cjk/README4
-rw-r--r--language/chinese/CJK/cjk-4.8.4/doc/cjk/READMEb5.cjk1150
-rw-r--r--language/chinese/CJK/cjk-4.8.4/doc/man/html/bg5conv.html86
-rw-r--r--language/chinese/CJK/cjk-4.8.4/doc/man/html/cef5conv.html99
-rw-r--r--language/chinese/CJK/cjk-4.8.4/doc/man/html/cefconv.html91
-rw-r--r--language/chinese/CJK/cjk-4.8.4/doc/man/html/cefsconv.html98
-rw-r--r--language/chinese/CJK/cjk-4.8.4/doc/man/html/extconv.html86
-rw-r--r--language/chinese/CJK/cjk-4.8.4/doc/man/html/hbf2gf.html648
-rw-r--r--language/chinese/CJK/cjk-4.8.4/doc/man/html/sjisconv.html87
-rw-r--r--language/chinese/CJK/cjk-4.8.4/doc/man/pdf/bg5conv.pdfbin20529 -> 0 bytes
-rw-r--r--language/chinese/CJK/cjk-4.8.4/doc/man/pdf/cef5conv.pdfbin23462 -> 0 bytes
-rw-r--r--language/chinese/CJK/cjk-4.8.4/doc/man/pdf/cefconv.pdfbin23136 -> 0 bytes
-rw-r--r--language/chinese/CJK/cjk-4.8.4/doc/man/pdf/cefsconv.pdfbin23459 -> 0 bytes
-rw-r--r--language/chinese/CJK/cjk-4.8.4/doc/man/pdf/extconv.pdfbin20685 -> 0 bytes
-rw-r--r--language/chinese/CJK/cjk-4.8.4/doc/man/pdf/hbf2gf.pdfbin57478 -> 0 bytes
-rw-r--r--language/chinese/CJK/cjk-4.8.4/doc/man/pdf/sjisconv.pdfbin20619 -> 0 bytes
-rw-r--r--language/chinese/CJK/cjk-4.8.4/doc/man/txt/bg5conv.txt30
-rw-r--r--language/chinese/CJK/cjk-4.8.4/doc/man/txt/cef5conv.txt37
-rw-r--r--language/chinese/CJK/cjk-4.8.4/doc/man/txt/cefconv.txt34
-rw-r--r--language/chinese/CJK/cjk-4.8.4/doc/man/txt/cefsconv.txt37
-rw-r--r--language/chinese/CJK/cjk-4.8.4/doc/man/txt/extconv.txt30
-rw-r--r--language/chinese/CJK/cjk-4.8.4/doc/man/txt/hbf2gf.txt351
-rw-r--r--language/chinese/CJK/cjk-4.8.4/doc/man/txt/sjisconv.txt30
-rw-r--r--language/chinese/CJK/cjk-4.8.4/doc/pdf/READMEb5.pdfbin395722 -> 0 bytes
-rw-r--r--language/chinese/CJK/cjk-4.8.4/doc/pdf/READMEgb.pdfbin98996 -> 0 bytes
-rw-r--r--language/chinese/CJK/cjk-4.8.4/doc/pdf/bg5conv.pdfbin27101 -> 0 bytes
-rw-r--r--language/chinese/CJK/cjk-4.8.4/doc/pdf/c90.pdfbin89124 -> 0 bytes
-rw-r--r--language/chinese/CJK/cjk-4.8.4/doc/pdf/cef5conv.pdfbin36066 -> 0 bytes
-rw-r--r--language/chinese/CJK/cjk-4.8.4/doc/pdf/cefconv.pdfbin34595 -> 0 bytes
-rw-r--r--language/chinese/CJK/cjk-4.8.4/doc/pdf/cefsconv.pdfbin36148 -> 0 bytes
-rw-r--r--language/chinese/CJK/cjk-4.8.4/doc/pdf/extconv.pdfbin26875 -> 0 bytes
-rw-r--r--language/chinese/CJK/cjk-4.8.4/doc/pdf/hbf2gf.pdfbin187448 -> 0 bytes
-rw-r--r--language/chinese/CJK/cjk-4.8.4/doc/pdf/sjisconv.pdfbin27055 -> 0 bytes
-rw-r--r--language/chinese/CJK/cjk-4.8.4/doc/pyhyphen.txt107
-rw-r--r--language/chinese/CJK/cjk-4.8.4/examples/cjk/Big5.cjk35
-rw-r--r--language/chinese/CJK/cjk-4.8.4/examples/cjk/Big5vert.cjk35
-rw-r--r--language/chinese/CJK/cjk-4.8.4/examples/cjk/CEF_test.cjk41
-rw-r--r--language/chinese/CJK/cjk-4.8.4/examples/cjk/CJKbabel.cjk135
-rw-r--r--language/chinese/CJK/cjk-4.8.4/examples/cjk/SJIS.cjk39
-rw-r--r--language/chinese/CJK/cjk-4.8.4/examples/cjk/muletest.cjk149
-rw-r--r--language/chinese/CJK/cjk-4.8.4/examples/cjk/rubytest.cjk56
-rw-r--r--language/chinese/CJK/cjk-4.8.4/examples/cjk/thai.cjk43
-rw-r--r--language/chinese/CJK/cjk-4.8.4/examples/cjk/thai_utf8.cjk43
-rw-r--r--language/chinese/CJK/cjk-4.8.4/examples/pdf/Big5.pdfbin50309 -> 0 bytes
-rw-r--r--language/chinese/CJK/cjk-4.8.4/examples/pdf/Big5vert.pdfbin51375 -> 0 bytes
-rw-r--r--language/chinese/CJK/cjk-4.8.4/examples/pdf/CEF_test.pdfbin7064 -> 0 bytes
-rw-r--r--language/chinese/CJK/cjk-4.8.4/examples/pdf/CJKbabel.pdfbin192008 -> 0 bytes
-rw-r--r--language/chinese/CJK/cjk-4.8.4/examples/pdf/CJKfntef.pdfbin33090 -> 0 bytes
-rw-r--r--language/chinese/CJK/cjk-4.8.4/examples/pdf/CJKmixed.pdfbin67977 -> 0 bytes
-rw-r--r--language/chinese/CJK/cjk-4.8.4/examples/pdf/CJKspace.pdfbin36920 -> 0 bytes
-rw-r--r--language/chinese/CJK/cjk-4.8.4/examples/pdf/CJKutf8.pdfbin181416 -> 0 bytes
-rw-r--r--language/chinese/CJK/cjk-4.8.4/examples/pdf/GB.pdfbin45543 -> 0 bytes
-rw-r--r--language/chinese/CJK/cjk-4.8.4/examples/pdf/JIS.pdfbin25624 -> 0 bytes
-rw-r--r--language/chinese/CJK/cjk-4.8.4/examples/pdf/KS.pdfbin25196 -> 0 bytes
-rw-r--r--language/chinese/CJK/cjk-4.8.4/examples/pdf/SJIS.pdfbin25630 -> 0 bytes
-rw-r--r--language/chinese/CJK/cjk-4.8.4/examples/pdf/UTF8.pdfbin13764 -> 0 bytes
-rw-r--r--language/chinese/CJK/cjk-4.8.4/examples/pdf/muletest.pdfbin176318 -> 0 bytes
-rw-r--r--language/chinese/CJK/cjk-4.8.4/examples/pdf/py_test.pdfbin17205 -> 0 bytes
-rw-r--r--language/chinese/CJK/cjk-4.8.4/examples/pdf/pytest.pdfbin5802 -> 0 bytes
-rw-r--r--language/chinese/CJK/cjk-4.8.4/examples/pdf/rubytest.pdfbin22182 -> 0 bytes
-rw-r--r--language/chinese/CJK/cjk-4.8.4/examples/pdf/thai.pdfbin12567 -> 0 bytes
-rw-r--r--language/chinese/CJK/cjk-4.8.4/examples/pdf/thai_utf8.pdfbin12563 -> 0 bytes
-rwxr-xr-xlanguage/chinese/CJK/cjk-4.8.4/utils/hbf2gf/config.guess1438
-rwxr-xr-xlanguage/chinese/CJK/cjk-4.8.4/utils/hbf2gf/config.sub1810
-rw-r--r--language/chinese/CJK/cjk-4.8.4/utils/pyhyphen/pyhyph.tex236
-rw-r--r--language/chinese/CJK/cjk-4.8.4/utils/pyhyphen/pytest.tex51
-rw-r--r--language/chinese/CJK/cjk-4.8.5/ChangeLog (renamed from language/chinese/CJK/cjk-4.8.4/ChangeLog)121
-rw-r--r--language/chinese/CJK/cjk-4.8.5/MANIFEST (renamed from language/chinese/CJK/cjk-4.8.4/MANIFEST)10
-rw-r--r--language/chinese/CJK/cjk-4.8.5/Makefile (renamed from language/chinese/CJK/cjk-4.8.4/Makefile)4
-rw-r--r--language/chinese/CJK/cjk-4.8.5/README (renamed from language/chinese/CJK/cjk-4.8.4/README)8
-rw-r--r--language/chinese/CJK/cjk-4.8.5/TODO (renamed from language/chinese/CJK/cjk-4.8.4/TODO)0
-rw-r--r--language/chinese/CJK/cjk-4.8.5/contrib/wadalab/DNP.sfd (renamed from language/chinese/CJK/cjk-4.8.4/contrib/wadalab/DNP.sfd)0
-rw-r--r--language/chinese/CJK/cjk-4.8.5/contrib/wadalab/c42goth.fd (renamed from language/chinese/CJK/cjk-4.8.4/contrib/wadalab/c42goth.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/contrib/wadalab/c42goth.fdx (renamed from language/chinese/CJK/cjk-4.8.4/contrib/wadalab/c42goth.fdx)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/contrib/wadalab/c42maru.fd (renamed from language/chinese/CJK/cjk-4.8.4/contrib/wadalab/c42maru.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/contrib/wadalab/c42maru.fdx (renamed from language/chinese/CJK/cjk-4.8.4/contrib/wadalab/c42maru.fdx)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/contrib/wadalab/c42min.fd (renamed from language/chinese/CJK/cjk-4.8.4/contrib/wadalab/c42min.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/contrib/wadalab/c42min.fdx (renamed from language/chinese/CJK/cjk-4.8.4/contrib/wadalab/c42min.fdx)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/contrib/wadalab/c52maru.fd (renamed from language/chinese/CJK/cjk-4.8.4/contrib/wadalab/c52maru.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/contrib/wadalab/c52maru.fdx (renamed from language/chinese/CJK/cjk-4.8.4/contrib/wadalab/c52maru.fdx)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/contrib/wadalab/c52min.fd (renamed from language/chinese/CJK/cjk-4.8.4/contrib/wadalab/c52min.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/contrib/wadalab/c52min.fdx (renamed from language/chinese/CJK/cjk-4.8.4/contrib/wadalab/c52min.fdx)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/contrib/wadalab/c70goth.fd (renamed from language/chinese/CJK/cjk-4.8.4/contrib/wadalab/c70goth.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/contrib/wadalab/c70goth.fdx (renamed from language/chinese/CJK/cjk-4.8.4/contrib/wadalab/c70goth.fdx)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/contrib/wadalab/c70maru.fd (renamed from language/chinese/CJK/cjk-4.8.4/contrib/wadalab/c70maru.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/contrib/wadalab/c70maru.fdx (renamed from language/chinese/CJK/cjk-4.8.4/contrib/wadalab/c70maru.fdx)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/contrib/wadalab/c70min.fd (renamed from language/chinese/CJK/cjk-4.8.4/contrib/wadalab/c70min.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/contrib/wadalab/c70min.fdx (renamed from language/chinese/CJK/cjk-4.8.4/contrib/wadalab/c70min.fdx)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/contrib/wadalab/fixwada (renamed from language/chinese/CJK/cjk-4.8.4/contrib/wadalab/fixwada)2
-rw-r--r--language/chinese/CJK/cjk-4.8.5/contrib/wadalab/fixwada2.pl (renamed from language/chinese/CJK/cjk-4.8.4/contrib/wadalab/fixwada2.pl)4
-rw-r--r--language/chinese/CJK/cjk-4.8.5/contrib/wadalab/makefont (renamed from language/chinese/CJK/cjk-4.8.4/contrib/wadalab/makefont)2
-rw-r--r--language/chinese/CJK/cjk-4.8.5/contrib/wadalab/makeuniwada.pl (renamed from language/chinese/CJK/cjk-4.8.4/contrib/wadalab/makeuniwada.pl)2
-rw-r--r--language/chinese/CJK/cjk-4.8.5/contrib/wadalab/wadalab.map (renamed from language/chinese/CJK/cjk-4.8.4/contrib/wadalab/wadalab.map)0
-rw-r--r--language/chinese/CJK/cjk-4.8.5/contrib/wadalab/wadalab.txt (renamed from language/chinese/CJK/cjk-4.8.4/contrib/wadalab/wadalab.txt)0
-rw-r--r--language/chinese/CJK/cjk-4.8.5/doc/CEF.txt (renamed from language/chinese/CJK/cjk-4.8.4/doc/CEF.txt)2
-rw-r--r--language/chinese/CJK/cjk-4.8.5/doc/CJK.txt (renamed from language/chinese/CJK/cjk-4.8.4/doc/CJK.txt)2
-rw-r--r--language/chinese/CJK/cjk-4.8.5/doc/CJKnumb.txt (renamed from language/chinese/CJK/cjk-4.8.4/doc/CJKnumb.txt)4
-rw-r--r--language/chinese/CJK/cjk-4.8.5/doc/CJKspace.txt (renamed from language/chinese/CJK/cjk-4.8.4/doc/CJKspace.txt)4
-rw-r--r--language/chinese/CJK/cjk-4.8.5/doc/CJKutf8.txt (renamed from language/chinese/CJK/cjk-4.8.4/doc/CJKutf8.txt)4
-rw-r--r--language/chinese/CJK/cjk-4.8.5/doc/COPYING (renamed from language/chinese/CJK/cjk-4.8.4/doc/COPYING)0
-rw-r--r--language/chinese/CJK/cjk-4.8.5/doc/INSTALL (renamed from language/chinese/CJK/cjk-4.8.4/doc/INSTALL)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/doc/TDS.txt (renamed from language/chinese/CJK/cjk-4.8.4/doc/TDS.txt)2
-rw-r--r--language/chinese/CJK/cjk-4.8.5/doc/chinese/README (renamed from language/chinese/CJK/cjk-4.8.4/doc/chinese/README)0
-rw-r--r--language/chinese/CJK/cjk-4.8.5/doc/chinese/READMEb5.tex (renamed from language/chinese/CJK/cjk-4.8.4/doc/chinese/READMEb5.tex)0
-rw-r--r--language/chinese/CJK/cjk-4.8.5/doc/chinese/READMEgb.tex (renamed from language/chinese/CJK/cjk-4.8.4/doc/chinese/READMEgb.tex)0
-rw-r--r--language/chinese/CJK/cjk-4.8.5/doc/chinese/emTeXb5.txt (renamed from language/chinese/CJK/cjk-4.8.4/doc/chinese/emTeXb5.txt)0
-rw-r--r--language/chinese/CJK/cjk-4.8.5/doc/chinese/teTeXb5.txt (renamed from language/chinese/CJK/cjk-4.8.4/doc/chinese/teTeXb5.txt)0
-rw-r--r--language/chinese/CJK/cjk-4.8.5/doc/cjk-enc.txt (renamed from language/chinese/CJK/cjk-4.8.4/doc/cjk-enc.txt)4
-rw-r--r--language/chinese/CJK/cjk-4.8.5/doc/commands.txt (renamed from language/chinese/CJK/cjk-4.8.4/doc/commands.txt)4
-rw-r--r--language/chinese/CJK/cjk-4.8.5/doc/dvidrv.txt (renamed from language/chinese/CJK/cjk-4.8.4/doc/dvidrv.txt)0
-rw-r--r--language/chinese/CJK/cjk-4.8.5/doc/fdxfiles.txt (renamed from language/chinese/CJK/cjk-4.8.4/doc/fdxfiles.txt)4
-rw-r--r--language/chinese/CJK/cjk-4.8.5/doc/fonts.txt (renamed from language/chinese/CJK/cjk-4.8.4/doc/fonts.txt)4
-rw-r--r--language/chinese/CJK/cjk-4.8.5/doc/hbf2gf.txt (renamed from language/chinese/CJK/cjk-4.8.4/doc/hbf2gf.txt)4
-rw-r--r--language/chinese/CJK/cjk-4.8.5/doc/history.2_5 (renamed from language/chinese/CJK/cjk-4.8.4/doc/history.2_5)2
-rw-r--r--language/chinese/CJK/cjk-4.8.5/doc/history.txt (renamed from language/chinese/CJK/cjk-4.8.4/doc/history.txt)27
-rw-r--r--language/chinese/CJK/cjk-4.8.5/doc/japanese/README (renamed from language/chinese/CJK/cjk-4.8.4/doc/japanese/README)0
-rw-r--r--language/chinese/CJK/cjk-4.8.5/doc/japanese/ascii.txt (renamed from language/chinese/CJK/cjk-4.8.4/doc/japanese/ascii.txt)0
-rw-r--r--language/chinese/CJK/cjk-4.8.5/doc/japanese/japanese.jis (renamed from language/chinese/CJK/cjk-4.8.4/doc/japanese/japanese.jis)0
-rw-r--r--language/chinese/CJK/cjk-4.8.5/doc/japanese/japanese.txt (renamed from language/chinese/CJK/cjk-4.8.4/doc/japanese/japanese.txt)0
-rw-r--r--language/chinese/CJK/cjk-4.8.5/doc/japanese/jp-fonts.txt (renamed from language/chinese/CJK/cjk-4.8.4/doc/japanese/jp-fonts.txt)0
-rw-r--r--language/chinese/CJK/cjk-4.8.5/doc/japanese/jp-tex.txt (renamed from language/chinese/CJK/cjk-4.8.4/doc/japanese/jp-tex.txt)0
-rw-r--r--language/chinese/CJK/cjk-4.8.5/doc/japanese/preview.txt (renamed from language/chinese/CJK/cjk-4.8.4/doc/japanese/preview.txt)0
-rw-r--r--language/chinese/CJK/cjk-4.8.5/doc/japanese/shibuaki.txt (renamed from language/chinese/CJK/cjk-4.8.4/doc/japanese/shibuaki.txt)0
-rw-r--r--language/chinese/CJK/cjk-4.8.5/doc/pdfhowto/HOWTO.txt (renamed from language/chinese/CJK/cjk-4.8.4/doc/pdfhowto/HOWTO.txt)0
-rw-r--r--language/chinese/CJK/cjk-4.8.5/doc/pdfhowto/examples/bkai.map (renamed from language/chinese/CJK/cjk-4.8.4/doc/pdfhowto/examples/bkai.map)0
-rw-r--r--language/chinese/CJK/cjk-4.8.5/doc/pdfhowto/examples/cid-x.map (renamed from language/chinese/CJK/cjk-4.8.4/doc/pdfhowto/examples/cid-x.map)0
-rw-r--r--language/chinese/CJK/cjk-4.8.5/doc/pdfhowto/examples/cwtb.map (renamed from language/chinese/CJK/cjk-4.8.4/doc/pdfhowto/examples/cwtb.map)0
-rw-r--r--language/chinese/CJK/cjk-4.8.5/doc/pdfhowto/examples/dvipdfmx.cfg (renamed from language/chinese/CJK/cjk-4.8.4/doc/pdfhowto/examples/dvipdfmx.cfg)0
-rw-r--r--language/chinese/CJK/cjk-4.8.5/doc/pdfhowto/examples/gen-map.pl (renamed from language/chinese/CJK/cjk-4.8.4/doc/pdfhowto/examples/gen-map.pl)0
-rw-r--r--language/chinese/CJK/cjk-4.8.5/doc/pdfhowto/examples/map.list (renamed from language/chinese/CJK/cjk-4.8.4/doc/pdfhowto/examples/map.list)0
-rw-r--r--language/chinese/CJK/cjk-4.8.5/doc/pdfhowto/examples/texinput/Bg5/c00cwtb.fd (renamed from language/chinese/CJK/cjk-4.8.4/doc/pdfhowto/examples/texinput/Bg5/c00cwtb.fd)4
-rw-r--r--language/chinese/CJK/cjk-4.8.5/doc/pdfhowto/examples/texinput/Bg5/c00tmpl.fd (renamed from language/chinese/CJK/cjk-4.8.4/doc/pdfhowto/examples/texinput/Bg5/c00tmpl.fd)4
-rw-r--r--language/chinese/CJK/cjk-4.8.5/doc/pdfhowto/examples/texinput/GB/c10tmpl.fd (renamed from language/chinese/CJK/cjk-4.8.4/doc/pdfhowto/examples/texinput/GB/c10tmpl.fd)4
-rw-r--r--language/chinese/CJK/cjk-4.8.5/doc/pdfhowto/examples/texinput/JIS/c40tmpl.fd (renamed from language/chinese/CJK/cjk-4.8.4/doc/pdfhowto/examples/texinput/JIS/c40tmpl.fd)4
-rw-r--r--language/chinese/CJK/cjk-4.8.5/doc/pdfhowto/examples/texinput/SJIS/c49tmpl.fd (renamed from language/chinese/CJK/cjk-4.8.4/doc/pdfhowto/examples/texinput/SJIS/c49tmpl.fd)4
-rw-r--r--language/chinese/CJK/cjk-4.8.5/doc/pdfhowto/examples/updmap.my (renamed from language/chinese/CJK/cjk-4.8.4/doc/pdfhowto/examples/updmap.my)0
-rw-r--r--language/chinese/CJK/cjk-4.8.5/doc/pdfhowto/examples/wcl.sfd (renamed from language/chinese/CJK/cjk-4.8.4/doc/pdfhowto/examples/wcl.sfd)0
-rw-r--r--language/chinese/CJK/cjk-4.8.5/doc/pinyin.txt (renamed from language/chinese/CJK/cjk-4.8.4/doc/pinyin.txt)4
-rw-r--r--language/chinese/CJK/cjk-4.8.5/doc/pyhyphen.txt135
-rw-r--r--language/chinese/CJK/cjk-4.8.5/doc/reftex.txt (renamed from language/chinese/CJK/cjk-4.8.4/doc/reftex.txt)4
-rw-r--r--language/chinese/CJK/cjk-4.8.5/doc/ruby.txt (renamed from language/chinese/CJK/cjk-4.8.4/doc/ruby.txt)2
-rw-r--r--language/chinese/CJK/cjk-4.8.5/doc/thaifont.txt (renamed from language/chinese/CJK/cjk-4.8.4/doc/thaifont.txt)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/doc/vertical.txt (renamed from language/chinese/CJK/cjk-4.8.4/doc/vertical.txt)4
-rw-r--r--language/chinese/CJK/cjk-4.8.5/examples/Big5.tex (renamed from language/chinese/CJK/cjk-4.8.4/examples/Big5.tex)4
-rw-r--r--language/chinese/CJK/cjk-4.8.5/examples/Big5vert.tex (renamed from language/chinese/CJK/cjk-4.8.4/examples/Big5vert.tex)4
-rw-r--r--language/chinese/CJK/cjk-4.8.5/examples/CEF_test.tex (renamed from language/chinese/CJK/cjk-4.8.4/examples/CEF_test.tex)4
-rw-r--r--language/chinese/CJK/cjk-4.8.5/examples/CJKbabel.tex (renamed from language/chinese/CJK/cjk-4.8.4/examples/CJKbabel.tex)11
-rw-r--r--language/chinese/CJK/cjk-4.8.5/examples/CJKfntef.tex (renamed from language/chinese/CJK/cjk-4.8.4/examples/CJKfntef.tex)2
-rw-r--r--language/chinese/CJK/cjk-4.8.5/examples/CJKmixed.tex (renamed from language/chinese/CJK/cjk-4.8.4/examples/CJKmixed.tex)8
-rw-r--r--language/chinese/CJK/cjk-4.8.5/examples/CJKspace.tex (renamed from language/chinese/CJK/cjk-4.8.4/examples/CJKspace.tex)2
-rw-r--r--language/chinese/CJK/cjk-4.8.5/examples/CJKutf8.tex (renamed from language/chinese/CJK/cjk-4.8.4/examples/CJKutf8.tex)13
-rw-r--r--language/chinese/CJK/cjk-4.8.5/examples/GB.tex (renamed from language/chinese/CJK/cjk-4.8.4/examples/GB.tex)2
-rw-r--r--language/chinese/CJK/cjk-4.8.5/examples/JIS.tex (renamed from language/chinese/CJK/cjk-4.8.4/examples/JIS.tex)2
-rw-r--r--language/chinese/CJK/cjk-4.8.5/examples/KS.tex (renamed from language/chinese/CJK/cjk-4.8.4/examples/KS.tex)2
-rw-r--r--language/chinese/CJK/cjk-4.8.5/examples/README (renamed from language/chinese/CJK/cjk-4.8.4/examples/README)0
-rw-r--r--language/chinese/CJK/cjk-4.8.5/examples/SJIS.tex (renamed from language/chinese/CJK/cjk-4.8.4/examples/SJIS.tex)2
-rw-r--r--language/chinese/CJK/cjk-4.8.5/examples/UTF8.tex (renamed from language/chinese/CJK/cjk-4.8.4/examples/UTF8.tex)2
-rw-r--r--language/chinese/CJK/cjk-4.8.5/examples/muletest.tex (renamed from language/chinese/CJK/cjk-4.8.4/examples/muletest.tex)5
-rw-r--r--language/chinese/CJK/cjk-4.8.5/examples/py_test.tex (renamed from language/chinese/CJK/cjk-4.8.4/examples/py_test.tex)2
-rw-r--r--language/chinese/CJK/cjk-4.8.5/examples/rubytest.tex (renamed from language/chinese/CJK/cjk-4.8.4/examples/rubytest.tex)2
-rw-r--r--language/chinese/CJK/cjk-4.8.5/examples/thai.tex (renamed from language/chinese/CJK/cjk-4.8.4/examples/thai.tex)2
-rw-r--r--language/chinese/CJK/cjk-4.8.5/examples/thai_utf8.tex (renamed from language/chinese/CJK/cjk-4.8.4/examples/thai_utf8.tex)2
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/Bg5/Bg5.cap (renamed from language/chinese/CJK/cjk-4.8.4/texinput/Bg5/Bg5.cap)8
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/Bg5/Bg5.chr (renamed from language/chinese/CJK/cjk-4.8.4/texinput/Bg5/Bg5.chr)8
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/Bg5/Bg5.cpx (renamed from language/chinese/CJK/cjk-4.8.4/texinput/Bg5/Bg5.cpx)8
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/Bg5/Bg5.enc (renamed from language/chinese/CJK/cjk-4.8.4/texinput/Bg5/Bg5.enc)8
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/Bg5/HK.enc (renamed from language/chinese/CJK/cjk-4.8.4/texinput/Bg5/HK.enc)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/Bg5/c00bkai.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/Bg5/c00bkai.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/Bg5/c00bkai.fdx (renamed from language/chinese/CJK/cjk-4.8.4/texinput/Bg5/c00bkai.fdx)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/Bg5/c00bsmi.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/Bg5/c00bsmi.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/Bg5/c00bsmi.fdx (renamed from language/chinese/CJK/cjk-4.8.4/texinput/Bg5/c00bsmi.fdx)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/Bg5/c00bsmir.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/Bg5/c00bsmir.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/Bg5/c00bsmir.fdx (renamed from language/chinese/CJK/cjk-4.8.4/texinput/Bg5/c00bsmir.fdx)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/Bg5/c00cns.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/Bg5/c00cns.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/Bg5/c00fs.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/Bg5/c00fs.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/Bg5/c00kai.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/Bg5/c00kai.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/Bg5/c00kair.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/Bg5/c00kair.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/Bg5/c00kair.fdx (renamed from language/chinese/CJK/cjk-4.8.4/texinput/Bg5/c00kair.fdx)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/Bg5/c00song.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/Bg5/c00song.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/Bg5/c01song.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/Bg5/c01song.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/Bg5/c05song.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/Bg5/c05song.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/Bg5/c09song.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/Bg5/c09song.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/CEF/c80song.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/CEF/c80song.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/CEF/c81song.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/CEF/c81song.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/CJK.enc (renamed from language/chinese/CJK/cjk-4.8.4/texinput/CJK.enc)8
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/CJK.sty (renamed from language/chinese/CJK/cjk-4.8.4/texinput/CJK.sty)63
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/CJKfntef.sty (renamed from language/chinese/CJK/cjk-4.8.4/texinput/CJKfntef.sty)8
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/CJKnumb.sty (renamed from language/chinese/CJK/cjk-4.8.4/texinput/CJKnumb.sty)10
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/CJKspace.sty (renamed from language/chinese/CJK/cjk-4.8.4/texinput/CJKspace.sty)4
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/CJKulem.sty (renamed from language/chinese/CJK/cjk-4.8.4/texinput/CJKulem.sty)8
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/CJKutf8.sty (renamed from language/chinese/CJK/cjk-4.8.4/texinput/CJKutf8.sty)8
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/CJKvert.sty (renamed from language/chinese/CJK/cjk-4.8.4/texinput/CJKvert.sty)8
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/CNS/EUC-TW.bdg (renamed from language/chinese/CJK/cjk-4.8.4/texinput/CNS/EUC-TW.bdg)8
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/CNS/EUC-TW.chr (renamed from language/chinese/CJK/cjk-4.8.4/texinput/CNS/EUC-TW.chr)8
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/CNS/EUC-TW.enc (renamed from language/chinese/CJK/cjk-4.8.4/texinput/CNS/EUC-TW.enc)8
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/CNS/c31song.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/CNS/c31song.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/CNS/c32song.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/CNS/c32song.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/CNS/c33song.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/CNS/c33song.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/CNS/c34song.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/CNS/c34song.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/CNS/c35song.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/CNS/c35song.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/CNS/c36song.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/CNS/c36song.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/CNS/c37song.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/CNS/c37song.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/GB/GB.cap (renamed from language/chinese/CJK/cjk-4.8.4/texinput/GB/GB.cap)8
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/GB/GB.cpx (renamed from language/chinese/CJK/cjk-4.8.4/texinput/GB/GB.cpx)8
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/GB/c10fs.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/GB/c10fs.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/GB/c10gbsn.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/GB/c10gbsn.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/GB/c10gbsn.fdx (renamed from language/chinese/CJK/cjk-4.8.4/texinput/GB/c10gbsn.fdx)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/GB/c10gkai.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/GB/c10gkai.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/GB/c10gkai.fdx (renamed from language/chinese/CJK/cjk-4.8.4/texinput/GB/c10gkai.fdx)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/GB/c10song.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/GB/c10song.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/GB/c11song.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/GB/c11song.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/GB/c19song.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/GB/c19song.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/GB/c20song.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/GB/c20song.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/GB/c21song.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/GB/c21song.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/JIS/EUC-JP.bdg (renamed from language/chinese/CJK/cjk-4.8.4/texinput/JIS/EUC-JP.bdg)8
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/JIS/EUC-JP.chr (renamed from language/chinese/CJK/cjk-4.8.4/texinput/JIS/EUC-JP.chr)8
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/JIS/EUC-JP.enc (renamed from language/chinese/CJK/cjk-4.8.4/texinput/JIS/EUC-JP.enc)8
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/JIS/EUC-JPdnp.enc (renamed from language/chinese/CJK/cjk-4.8.4/texinput/JIS/EUC-JPdnp.enc)8
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/JIS/JIS.cap (renamed from language/chinese/CJK/cjk-4.8.4/texinput/JIS/JIS.cap)8
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/JIS/JIS.cpx (renamed from language/chinese/CJK/cjk-4.8.4/texinput/JIS/JIS.cpx)8
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/JIS/JISdnp.enc (renamed from language/chinese/CJK/cjk-4.8.4/texinput/JIS/JISdnp.enc)8
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/JIS/c40song.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/JIS/c40song.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/JIS/c41song.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/JIS/c41song.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/JIS/c42song.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/JIS/c42song.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/JIS/c43song.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/JIS/c43song.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/JIS/c50song.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/JIS/c50song.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/HLaTeX.chr (renamed from language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/HLaTeX.chr)8
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/KSHL.enc (renamed from language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/KSHL.enc)8
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/c63bm.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c63bm.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/c63dn.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c63dn.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/c63gr.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c63gr.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/c63gs.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c63gs.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/c63gt.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c63gt.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/c63jgt.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c63jgt.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/c63jmj.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c63jmj.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/c63jnv.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c63jnv.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/c63jsr.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c63jsr.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/c63mj.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c63mj.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/c63pg.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c63pg.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/c63pga.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c63pga.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/c63ph.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c63ph.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/c63pn.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c63pn.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/c63sh.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c63sh.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/c63tz.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c63tz.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/c63vd.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c63vd.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/c63yt.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c63yt.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/c64bm.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c64bm.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/c64dn.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c64dn.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/c64gr.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c64gr.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/c64gs.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c64gs.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/c64gt.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c64gt.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/c64jgt.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c64jgt.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/c64jmj.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c64jmj.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/c64jnv.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c64jnv.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/c64jsr.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c64jsr.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/c64mj.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c64mj.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/c64pg.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c64pg.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/c64pga.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c64pga.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/c64ph.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c64ph.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/c64pn.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c64pn.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/c64sh.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c64sh.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/c64tz.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c64tz.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/c64vd.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c64vd.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/c64yt.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c64yt.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/c65bm.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c65bm.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/c65dn.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c65dn.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/c65gr.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c65gr.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/c65gs.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c65gs.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/c65gt.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c65gt.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/c65jgt.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c65jgt.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/c65jmj.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c65jmj.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/c65jnv.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c65jnv.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/c65jsr.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c65jsr.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/c65mj.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c65mj.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/c65pg.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c65pg.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/c65pga.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c65pga.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/c65ph.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c65ph.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/c65pn.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c65pn.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/c65sh.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c65sh.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/c65tz.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c65tz.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/c65vd.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c65vd.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/c65yt.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c65yt.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/pshan.sty (renamed from language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/pshan.sty)8
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/KS/KS.chr (renamed from language/chinese/CJK/cjk-4.8.4/texinput/KS/KS.chr)8
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/KS/KS.enc (renamed from language/chinese/CJK/cjk-4.8.4/texinput/KS/KS.enc)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/KS/c60dr.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/KS/c60dr.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/KS/c60gr.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/KS/c60gr.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/KS/c60gs.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/KS/c60gs.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/KS/c60gt.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/KS/c60gt.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/KS/c60hgt.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/KS/c60hgt.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/KS/c60hmj.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/KS/c60hmj.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/KS/c60hol.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/KS/c60hol.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/KS/c60hpg.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/KS/c60hpg.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/KS/c60mj.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/KS/c60mj.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/KS/c61dr.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/KS/c61dr.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/KS/c61gr.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/KS/c61gr.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/KS/c61gs.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/KS/c61gs.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/KS/c61gt.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/KS/c61gt.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/KS/c61hgt.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/KS/c61hgt.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/KS/c61hmj.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/KS/c61hmj.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/KS/c61hol.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/KS/c61hol.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/KS/c61hpg.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/KS/c61hpg.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/KS/c61mj.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/KS/c61mj.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/KS/c62song.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/KS/c62song.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/KS/hangul.cap (renamed from language/chinese/CJK/cjk-4.8.4/texinput/KS/hangul.cap)8
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/KS/hangul.cpx (renamed from language/chinese/CJK/cjk-4.8.4/texinput/KS/hangul.cpx)8
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/KS/hangul2.cap (renamed from language/chinese/CJK/cjk-4.8.4/texinput/KS/hangul2.cap)8
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/KS/hangul2.cpx (renamed from language/chinese/CJK/cjk-4.8.4/texinput/KS/hangul2.cpx)8
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/KS/hanja.cap (renamed from language/chinese/CJK/cjk-4.8.4/texinput/KS/hanja.cap)8
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/KS/hanja.cpx (renamed from language/chinese/CJK/cjk-4.8.4/texinput/KS/hanja.cpx)8
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/SJIS/SJIS.bdg (renamed from language/chinese/CJK/cjk-4.8.4/texinput/SJIS/SJIS.bdg)8
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/SJIS/SJIS.cap (renamed from language/chinese/CJK/cjk-4.8.4/texinput/SJIS/SJIS.cap)8
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/SJIS/SJIS.chr (renamed from language/chinese/CJK/cjk-4.8.4/texinput/SJIS/SJIS.chr)8
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/SJIS/SJIS.cpx (renamed from language/chinese/CJK/cjk-4.8.4/texinput/SJIS/SJIS.cpx)8
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/SJIS/SJIS.enc (renamed from language/chinese/CJK/cjk-4.8.4/texinput/SJIS/SJIS.enc)8
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/SJIS/SJISdnp.chr (renamed from language/chinese/CJK/cjk-4.8.4/texinput/SJIS/SJISdnp.chr)8
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/SJIS/SJISdnp.enc (renamed from language/chinese/CJK/cjk-4.8.4/texinput/SJIS/SJISdnp.enc)8
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/SJIS/c49song.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/SJIS/c49song.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/UTF8/UTF8.bdg (renamed from language/chinese/CJK/cjk-4.8.4/texinput/UTF8/UTF8.bdg)8
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/UTF8/UTF8.chr (renamed from language/chinese/CJK/cjk-4.8.4/texinput/UTF8/UTF8.chr)8
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/UTF8/UTF8.enc (renamed from language/chinese/CJK/cjk-4.8.4/texinput/UTF8/UTF8.enc)8
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/UTF8/c70bkai.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/UTF8/c70bkai.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/UTF8/c70bkai.fdx (renamed from language/chinese/CJK/cjk-4.8.4/texinput/UTF8/c70bkai.fdx)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/UTF8/c70bsmi.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/UTF8/c70bsmi.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/UTF8/c70bsmi.fdx (renamed from language/chinese/CJK/cjk-4.8.4/texinput/UTF8/c70bsmi.fdx)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/UTF8/c70gbsn.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/UTF8/c70gbsn.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/UTF8/c70gbsn.fdx (renamed from language/chinese/CJK/cjk-4.8.4/texinput/UTF8/c70gbsn.fdx)4
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/UTF8/c70gkai.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/UTF8/c70gkai.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/UTF8/c70gkai.fdx (renamed from language/chinese/CJK/cjk-4.8.4/texinput/UTF8/c70gkai.fdx)4
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/UTF8/c70mj.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/UTF8/c70mj.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/UTF8/c70mj.fdx (renamed from language/chinese/CJK/cjk-4.8.4/texinput/UTF8/c70mj.fdx)4
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/UTF8/c70song.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/UTF8/c70song.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/UTF8/ja.cpx (renamed from language/chinese/CJK/cjk-4.8.4/texinput/UTF8/ja.cpx)8
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/UTF8/ko-Hang.cpx (renamed from language/chinese/CJK/cjk-4.8.4/texinput/UTF8/ko-Hang.cpx)8
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/UTF8/ko-Hang2.cpx (renamed from language/chinese/CJK/cjk-4.8.4/texinput/UTF8/ko-Hang2.cpx)8
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/UTF8/ko-Hani.cpx (renamed from language/chinese/CJK/cjk-4.8.4/texinput/UTF8/ko-Hani.cpx)8
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/UTF8/zh-Hans.cpx (renamed from language/chinese/CJK/cjk-4.8.4/texinput/UTF8/zh-Hans.cpx)8
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/UTF8/zh-Hant.cpx (renamed from language/chinese/CJK/cjk-4.8.4/texinput/UTF8/zh-Hant.cpx)8
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/extended.chr (renamed from language/chinese/CJK/cjk-4.8.4/texinput/extended.chr)8
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/extended.enc (renamed from language/chinese/CJK/cjk-4.8.4/texinput/extended.enc)8
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/mule/MULEenc.sty (renamed from language/chinese/CJK/cjk-4.8.4/texinput/mule/MULEenc.sty)8
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/pinyin.sty (renamed from language/chinese/CJK/cjk-4.8.4/texinput/pinyin.sty)8
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/pmC.chr (renamed from language/chinese/CJK/cjk-4.8.4/texinput/pmC.chr)8
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/pmCbig.enc (renamed from language/chinese/CJK/cjk-4.8.4/texinput/pmCbig.enc)8
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/pmCsmall.enc (renamed from language/chinese/CJK/cjk-4.8.4/texinput/pmCsmall.enc)8
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/ruby.sty (renamed from language/chinese/CJK/cjk-4.8.4/texinput/ruby.sty)8
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/standard.bdg (renamed from language/chinese/CJK/cjk-4.8.4/texinput/standard.bdg)8
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/standard.chr (renamed from language/chinese/CJK/cjk-4.8.4/texinput/standard.chr)8
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/standard.enc (renamed from language/chinese/CJK/cjk-4.8.4/texinput/standard.enc)8
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/thai/c90cmr.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/thai/c90cmr.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/thai/c90cmss.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/thai/c90cmss.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/thai/c90cmtt.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/thai/c90cmtt.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/thai/c90enc.def (renamed from language/chinese/CJK/cjk-4.8.4/texinput/thai/c90enc.def)0
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/thai/c90gar.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/thai/c90gar.fd)0
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/thai/c90nrsr.fd (renamed from language/chinese/CJK/cjk-4.8.4/texinput/thai/c90nrsr.fd)0
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texinput/thai/thaicjk.ldf (renamed from language/chinese/CJK/cjk-4.8.4/texinput/thai/thaicjk.ldf)4
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texlive/README (renamed from language/chinese/CJK/cjk-4.8.4/texlive/README)0
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texlive/bin-cjkutils.pl (renamed from language/chinese/CJK/cjk-4.8.4/texlive/bin-cjkutils.pl)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texlive/c63mj.fd (renamed from language/chinese/CJK/cjk-4.8.4/texlive/c63mj.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texlive/c64mj.fd (renamed from language/chinese/CJK/cjk-4.8.4/texlive/c64mj.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texlive/c65mj.fd (renamed from language/chinese/CJK/cjk-4.8.4/texlive/c65mj.fd)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texlive/c90.pl (renamed from language/chinese/CJK/cjk-4.8.4/texlive/c90.pl)2
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texlive/cjk-build.pl (renamed from language/chinese/CJK/cjk-4.8.4/texlive/cjk-build.pl)2
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texlive/cjk.pl (renamed from language/chinese/CJK/cjk-4.8.4/texlive/cjk.pl)6
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texlive/dnp.pl (renamed from language/chinese/CJK/cjk-4.8.4/texlive/dnp.pl)2
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texlive/garuda-c90.pl (renamed from language/chinese/CJK/cjk-4.8.4/texlive/garuda-c90.pl)2
-rw-r--r--language/chinese/CJK/cjk-4.8.5/texlive/norasi-c90.pl (renamed from language/chinese/CJK/cjk-4.8.4/texlive/norasi-c90.pl)2
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/Bg5conv/bg5conv.1 (renamed from language/chinese/CJK/cjk-4.8.4/utils/Bg5conv/bg5conv.1)4
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/Bg5conv/bg5conv.c (renamed from language/chinese/CJK/cjk-4.8.4/utils/Bg5conv/bg5conv.c)4
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/Bg5conv/bg5conv.w (renamed from language/chinese/CJK/cjk-4.8.4/utils/Bg5conv/bg5conv.w)10
-rwxr-xr-xlanguage/chinese/CJK/cjk-4.8.5/utils/Bg5conv/bg5latex (renamed from language/chinese/CJK/cjk-4.8.4/utils/Bg5conv/bg5latex)2
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/Bg5conv/bg5latex.bat (renamed from language/chinese/CJK/cjk-4.8.4/utils/Bg5conv/bg5latex.bat)0
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/Bg5conv/bg5latex.cmd (renamed from language/chinese/CJK/cjk-4.8.4/utils/Bg5conv/bg5latex.cmd)4
-rwxr-xr-xlanguage/chinese/CJK/cjk-4.8.5/utils/Bg5conv/bg5pdflatex (renamed from language/chinese/CJK/cjk-4.8.4/utils/Bg5conv/bg5pdflatex)2
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/CEFconv/cef5conv.1 (renamed from language/chinese/CJK/cjk-4.8.4/utils/CEFconv/cef5conv.1)4
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/CEFconv/cef5conv.c (renamed from language/chinese/CJK/cjk-4.8.4/utils/CEFconv/cef5conv.c)4
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/CEFconv/cef5conv.w (renamed from language/chinese/CJK/cjk-4.8.4/utils/CEFconv/cef5conv.w)10
-rwxr-xr-xlanguage/chinese/CJK/cjk-4.8.5/utils/CEFconv/cef5latex (renamed from language/chinese/CJK/cjk-4.8.4/utils/CEFconv/cef5latex)2
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/CEFconv/cef5ltx.bat (renamed from language/chinese/CJK/cjk-4.8.4/utils/CEFconv/cef5ltx.bat)0
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/CEFconv/cef5ltx.cmd (renamed from language/chinese/CJK/cjk-4.8.4/utils/CEFconv/cef5ltx.cmd)6
-rwxr-xr-xlanguage/chinese/CJK/cjk-4.8.5/utils/CEFconv/cef5pdflatex (renamed from language/chinese/CJK/cjk-4.8.4/utils/CEFconv/cef5pdflatex)2
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/CEFconv/cefconv.1 (renamed from language/chinese/CJK/cjk-4.8.4/utils/CEFconv/cefconv.1)4
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/CEFconv/cefconv.c (renamed from language/chinese/CJK/cjk-4.8.4/utils/CEFconv/cefconv.c)4
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/CEFconv/cefconv.w (renamed from language/chinese/CJK/cjk-4.8.4/utils/CEFconv/cefconv.w)10
-rwxr-xr-xlanguage/chinese/CJK/cjk-4.8.5/utils/CEFconv/ceflatex (renamed from language/chinese/CJK/cjk-4.8.4/utils/CEFconv/ceflatex)2
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/CEFconv/ceflatex.bat (renamed from language/chinese/CJK/cjk-4.8.4/utils/CEFconv/ceflatex.bat)0
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/CEFconv/ceflatex.cmd (renamed from language/chinese/CJK/cjk-4.8.4/utils/CEFconv/ceflatex.cmd)6
-rwxr-xr-xlanguage/chinese/CJK/cjk-4.8.5/utils/CEFconv/cefpdflatex (renamed from language/chinese/CJK/cjk-4.8.4/utils/CEFconv/cefpdflatex)2
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/CEFconv/cefsconv.1 (renamed from language/chinese/CJK/cjk-4.8.4/utils/CEFconv/cefsconv.1)4
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/CEFconv/cefsconv.c (renamed from language/chinese/CJK/cjk-4.8.4/utils/CEFconv/cefsconv.c)4
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/CEFconv/cefsconv.w (renamed from language/chinese/CJK/cjk-4.8.4/utils/CEFconv/cefsconv.w)10
-rwxr-xr-xlanguage/chinese/CJK/cjk-4.8.5/utils/CEFconv/cefslatex (renamed from language/chinese/CJK/cjk-4.8.4/utils/CEFconv/cefslatex)2
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/CEFconv/cefsltx.bat (renamed from language/chinese/CJK/cjk-4.8.4/utils/CEFconv/cefsltx.bat)0
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/CEFconv/cefsltx.cmd (renamed from language/chinese/CJK/cjk-4.8.4/utils/CEFconv/cefsltx.cmd)6
-rwxr-xr-xlanguage/chinese/CJK/cjk-4.8.5/utils/CEFconv/cefspdflatex (renamed from language/chinese/CJK/cjk-4.8.4/utils/CEFconv/cefspdflatex)2
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/SJISconv/sjisconv.1 (renamed from language/chinese/CJK/cjk-4.8.4/utils/SJISconv/sjisconv.1)4
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/SJISconv/sjisconv.c (renamed from language/chinese/CJK/cjk-4.8.4/utils/SJISconv/sjisconv.c)4
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/SJISconv/sjisconv.w (renamed from language/chinese/CJK/cjk-4.8.4/utils/SJISconv/sjisconv.w)10
-rwxr-xr-xlanguage/chinese/CJK/cjk-4.8.5/utils/SJISconv/sjislatex (renamed from language/chinese/CJK/cjk-4.8.4/utils/SJISconv/sjislatex)2
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/SJISconv/sjisltx.bat (renamed from language/chinese/CJK/cjk-4.8.4/utils/SJISconv/sjisltx.bat)0
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/SJISconv/sjisltx.cmd (renamed from language/chinese/CJK/cjk-4.8.4/utils/SJISconv/sjisltx.cmd)4
-rwxr-xr-xlanguage/chinese/CJK/cjk-4.8.5/utils/SJISconv/sjispdflatex (renamed from language/chinese/CJK/cjk-4.8.4/utils/SJISconv/sjispdflatex)2
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/cjklatex/cjklatex.c (renamed from language/chinese/CJK/cjk-4.8.4/utils/cjklatex/cjklatex.c)2
-rwxr-xr-xlanguage/chinese/CJK/cjk-4.8.5/utils/extconv/bg5+latex (renamed from language/chinese/CJK/cjk-4.8.4/utils/extconv/bg5+latex)2
-rwxr-xr-xlanguage/chinese/CJK/cjk-4.8.5/utils/extconv/bg5+pdflatex (renamed from language/chinese/CJK/cjk-4.8.4/utils/extconv/bg5+pdflatex)2
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/extconv/bg5pltx.bat (renamed from language/chinese/CJK/cjk-4.8.4/utils/extconv/bg5pltx.bat)0
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/extconv/bg5pltx.cmd (renamed from language/chinese/CJK/cjk-4.8.4/utils/extconv/bg5pltx.cmd)4
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/extconv/extconv.1 (renamed from language/chinese/CJK/cjk-4.8.4/utils/extconv/extconv.1)4
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/extconv/extconv.c (renamed from language/chinese/CJK/cjk-4.8.4/utils/extconv/extconv.c)4
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/extconv/extconv.w (renamed from language/chinese/CJK/cjk-4.8.4/utils/extconv/extconv.w)10
-rwxr-xr-xlanguage/chinese/CJK/cjk-4.8.5/utils/extconv/gbklatex (renamed from language/chinese/CJK/cjk-4.8.4/utils/extconv/gbklatex)2
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/extconv/gbklatex.bat (renamed from language/chinese/CJK/cjk-4.8.4/utils/extconv/gbklatex.bat)0
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/extconv/gbklatex.cmd (renamed from language/chinese/CJK/cjk-4.8.4/utils/extconv/gbklatex.cmd)4
-rwxr-xr-xlanguage/chinese/CJK/cjk-4.8.5/utils/extconv/gbkpdflatex (renamed from language/chinese/CJK/cjk-4.8.4/utils/extconv/gbkpdflatex)2
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/f_name.bat (renamed from language/chinese/CJK/cjk-4.8.4/utils/f_name.bat)0
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/Makefile.gnu (renamed from language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/Makefile.gnu)4
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/Makefile.in (renamed from language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/Makefile.in)2
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/README (renamed from language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/README)0
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/c-auto.h (renamed from language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/c-auto.h)4
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/cfg/README (renamed from language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/cfg/README)0
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/cfg/b5ka12.cfg (renamed from language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/cfg/b5ka12.cfg)0
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/cfg/b5kr12.cfg (renamed from language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/cfg/b5kr12.cfg)0
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/cfg/b5so12.cfg (renamed from language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/cfg/b5so12.cfg)0
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/cfg/c1so12.cfg (renamed from language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/cfg/c1so12.cfg)0
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/cfg/c2so12.cfg (renamed from language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/cfg/c2so12.cfg)0
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/cfg/c3so12.cfg (renamed from language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/cfg/c3so12.cfg)0
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/cfg/c4so12.cfg (renamed from language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/cfg/c4so12.cfg)0
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/cfg/c5so12.cfg (renamed from language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/cfg/c5so12.cfg)0
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/cfg/c6so12.cfg (renamed from language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/cfg/c6so12.cfg)0
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/cfg/c7so12.cfg (renamed from language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/cfg/c7so12.cfg)0
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/cfg/csso12.cfg (renamed from language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/cfg/csso12.cfg)0
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/cfg/gsfs14.cfg (renamed from language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/cfg/gsfs14.cfg)0
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/cfg/j2so12.cfg (renamed from language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/cfg/j2so12.cfg)0
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/cfg/jsso12.cfg (renamed from language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/cfg/jsso12.cfg)0
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/cfg/ksso17.cfg (renamed from language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/cfg/ksso17.cfg)0
-rwxr-xr-xlanguage/chinese/CJK/cjk-4.8.5/utils/hbf2gf/config.guess1748
-rwxr-xr-xlanguage/chinese/CJK/cjk-4.8.5/utils/hbf2gf/config.sub1884
-rwxr-xr-xlanguage/chinese/CJK/cjk-4.8.5/utils/hbf2gf/configure (renamed from language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/configure)2898
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/configure.ac (renamed from language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/configure.ac)7
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/dvidrv.btm (renamed from language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/dvidrv.btm)2
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/emdir.c (renamed from language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/emdir.c)0
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/emdir.h (renamed from language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/emdir.h)0
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/emtexdir.c (renamed from language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/emtexdir.c)0
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/emtexdir.h (renamed from language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/emtexdir.h)0
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/hbf.c (renamed from language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/hbf.c)0
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/hbf.h (renamed from language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/hbf.h)0
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/hbf2gf.1 (renamed from language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/hbf2gf.1)4
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/hbf2gf.c (renamed from language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/hbf2gf.c)210
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/hbf2gf.def (renamed from language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/hbf2gf.def)2
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/hbf2gf.w (renamed from language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/hbf2gf.w)10
-rwxr-xr-xlanguage/chinese/CJK/cjk-4.8.5/utils/hbf2gf/install-sh (renamed from language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/install-sh)174
-rwxr-xr-xlanguage/chinese/CJK/cjk-4.8.5/utils/hbf2gf/mkinstalldirs (renamed from language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/mkinstalldirs)26
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/scripts/teTeX-0.4/MakeTeXPK.diff (renamed from language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/scripts/teTeX-0.4/MakeTeXPK.diff)0
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/scripts/teTeX-0.4/MakeTeXTFM.diff (renamed from language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/scripts/teTeX-0.4/MakeTeXTFM.diff)0
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/scripts/web2c-6.1/MakeTeXPK.diff (renamed from language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/scripts/web2c-6.1/MakeTeXPK.diff)0
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/scripts/web2c-6.1/README (renamed from language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/scripts/web2c-6.1/README)0
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/scripts/web2c-7.0/MakeTeXPK.diff (renamed from language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/scripts/web2c-7.0/MakeTeXPK.diff)0
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/scripts/web2c-7.0/MakeTeXTFM.diff (renamed from language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/scripts/web2c-7.0/MakeTeXTFM.diff)0
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/scripts/web2c-7.1/MakeTeXPK.diff (renamed from language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/scripts/web2c-7.1/MakeTeXPK.diff)0
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/scripts/web2c-7.1/MakeTeXTFM.diff (renamed from language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/scripts/web2c-7.1/MakeTeXTFM.diff)0
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/scripts/web2c-7.2/mktexpk.diff (renamed from language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/scripts/web2c-7.2/mktexpk.diff)0
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/scripts/web2c-7.2/mktextfm.diff (renamed from language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/scripts/web2c-7.2/mktextfm.diff)0
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/lisp/cjkspace.el (renamed from language/chinese/CJK/cjk-4.8.4/utils/lisp/cjkspace.el)4
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/lisp/cjktilde.el (renamed from language/chinese/CJK/cjk-4.8.4/utils/lisp/cjktilde.el)4
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/lisp/emacs/cjk-enc.el (renamed from language/chinese/CJK/cjk-4.8.4/utils/lisp/emacs/cjk-enc.el)37
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/lisp/emacs/thai-word.el (renamed from language/chinese/CJK/cjk-4.8.4/utils/lisp/emacs/thai-word.el)0
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/lisp/mule-2.3/cjk-enc.el (renamed from language/chinese/CJK/cjk-4.8.4/utils/lisp/mule-2.3/cjk-enc.el)2
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/pyhyphen/GNUmakefile75
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/pyhyphen/hyph-zh-latn-pinyin.in66
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/pyhyphen/hyph-zh-latn-pinyin.tex253
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/pyhyphen/hyph-zh-latn-tonepinyin.tex253
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/pyhyphen/make-patterns.sh62
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/pyhyphen/pinyin.c (renamed from language/chinese/CJK/cjk-4.8.4/utils/pyhyphen/pinyin.c)74
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/pyhyphen/pinyin.ldf (renamed from language/chinese/CJK/cjk-4.8.4/utils/pyhyphen/pinyin.ldf)37
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/pyhyphen/pinyin.tr (renamed from language/chinese/CJK/cjk-4.8.4/utils/pyhyphen/pinyin.tr)9
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/pyhyphen/pytest.tex51
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/pyhyphen/pytestutf8.tex68
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/subfonts/clonevf.pl (renamed from language/chinese/CJK/cjk-4.8.4/utils/subfonts/clonevf.pl)2
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/subfonts/hlatex2agl.pl (renamed from language/chinese/CJK/cjk-4.8.4/utils/subfonts/hlatex2agl.pl)2
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/subfonts/makefdx.pl (renamed from language/chinese/CJK/cjk-4.8.4/utils/subfonts/makefdx.pl)8
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/subfonts/sfd2uni.pl (renamed from language/chinese/CJK/cjk-4.8.4/utils/subfonts/sfd2uni.pl)2
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/subfonts/subfonts.pe (renamed from language/chinese/CJK/cjk-4.8.4/utils/subfonts/subfonts.pe)2
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/subfonts/uni2sfd.pl (renamed from language/chinese/CJK/cjk-4.8.4/utils/subfonts/uni2sfd.pl)2
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/subfonts/vertical.pe (renamed from language/chinese/CJK/cjk-4.8.4/utils/subfonts/vertical.pe)0
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/subfonts/vertref.pe (renamed from language/chinese/CJK/cjk-4.8.4/utils/subfonts/vertref.pe)0
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/thaifont/texmf/dvips/garuda-c90/config.garuda-c90 (renamed from language/chinese/CJK/cjk-4.8.4/utils/thaifont/texmf/dvips/garuda-c90/config.garuda-c90)0
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/thaifont/texmf/dvips/norasi-c90/config.norasi-c90 (renamed from language/chinese/CJK/cjk-4.8.4/utils/thaifont/texmf/dvips/norasi-c90/config.norasi-c90)0
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/thaifont/texmf/fonts/enc/dvips/thai/c90.enc (renamed from language/chinese/CJK/cjk-4.8.4/utils/thaifont/texmf/fonts/enc/dvips/thai/c90.enc)2
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/thaifont/texmf/fonts/map/dvips/garuda-c90/garuda-c90.map (renamed from language/chinese/CJK/cjk-4.8.4/utils/thaifont/texmf/fonts/map/dvips/garuda-c90/garuda-c90.map)0
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/thaifont/texmf/fonts/map/dvips/norasi-c90/norasi-c90.map (renamed from language/chinese/CJK/cjk-4.8.4/utils/thaifont/texmf/fonts/map/dvips/norasi-c90/norasi-c90.map)0
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/thaifont/texmf/fonts/tfm/public/garuda-c90/fgdb8z.tfm (renamed from language/chinese/CJK/cjk-4.8.4/utils/thaifont/texmf/fonts/tfm/public/garuda-c90/fgdb8z.tfm)bin3660 -> 3660 bytes
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/thaifont/texmf/fonts/tfm/public/garuda-c90/fgdbo8z.tfm (renamed from language/chinese/CJK/cjk-4.8.4/utils/thaifont/texmf/fonts/tfm/public/garuda-c90/fgdbo8z.tfm)bin3912 -> 3912 bytes
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/thaifont/texmf/fonts/tfm/public/garuda-c90/fgdo8z.tfm (renamed from language/chinese/CJK/cjk-4.8.4/utils/thaifont/texmf/fonts/tfm/public/garuda-c90/fgdo8z.tfm)bin3832 -> 3832 bytes
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/thaifont/texmf/fonts/tfm/public/garuda-c90/fgdr8z.tfm (renamed from language/chinese/CJK/cjk-4.8.4/utils/thaifont/texmf/fonts/tfm/public/garuda-c90/fgdr8z.tfm)bin3580 -> 3580 bytes
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/thaifont/texmf/fonts/tfm/public/norasi-c90/ftnb8z.tfm (renamed from language/chinese/CJK/cjk-4.8.4/utils/thaifont/texmf/fonts/tfm/public/norasi-c90/ftnb8z.tfm)bin6412 -> 6412 bytes
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/thaifont/texmf/fonts/tfm/public/norasi-c90/ftnbi8z.tfm (renamed from language/chinese/CJK/cjk-4.8.4/utils/thaifont/texmf/fonts/tfm/public/norasi-c90/ftnbi8z.tfm)bin6640 -> 6640 bytes
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/thaifont/texmf/fonts/tfm/public/norasi-c90/ftni8z.tfm (renamed from language/chinese/CJK/cjk-4.8.4/utils/thaifont/texmf/fonts/tfm/public/norasi-c90/ftni8z.tfm)bin6664 -> 6664 bytes
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/thaifont/texmf/fonts/tfm/public/norasi-c90/ftnr8z.tfm (renamed from language/chinese/CJK/cjk-4.8.4/utils/thaifont/texmf/fonts/tfm/public/norasi-c90/ftnr8z.tfm)bin6424 -> 6424 bytes
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/thaifont/tools/INSTALL (renamed from language/chinese/CJK/cjk-4.8.4/utils/thaifont/tools/INSTALL)0
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/thaifont/tools/c90.etx (renamed from language/chinese/CJK/cjk-4.8.4/utils/thaifont/tools/c90.etx)2
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/thaifont/tools/c90.mtx (renamed from language/chinese/CJK/cjk-4.8.4/utils/thaifont/tools/c90.mtx)2
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/thaifont/tools/dbtt-old/config.dbtt-old (renamed from language/chinese/CJK/cjk-4.8.4/utils/thaifont/tools/dbtt-old/config.dbtt-old)0
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/thaifont/tools/dbtt-old/dbtt-old-alias.etx (renamed from language/chinese/CJK/cjk-4.8.4/utils/thaifont/tools/dbtt-old/dbtt-old-alias.etx)2
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/thaifont/tools/dbtt-old/dbtt-old-alias.mtx (renamed from language/chinese/CJK/cjk-4.8.4/utils/thaifont/tools/dbtt-old/dbtt-old-alias.mtx)2
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/thaifont/tools/dbtt-old/dbtt-old-alias.tex (renamed from language/chinese/CJK/cjk-4.8.4/utils/thaifont/tools/dbtt-old/dbtt-old-alias.tex)2
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/thaifont/tools/dbtt-old/dbtt-old.fontinst (renamed from language/chinese/CJK/cjk-4.8.4/utils/thaifont/tools/dbtt-old/dbtt-old.fontinst)2
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/thaifont/tools/dbtt-old/dbtt-old.map (renamed from language/chinese/CJK/cjk-4.8.4/utils/thaifont/tools/dbtt-old/dbtt-old.map)0
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/thaifont/tools/garuda-c90.fontinst (renamed from language/chinese/CJK/cjk-4.8.4/utils/thaifont/tools/garuda-c90.fontinst)2
-rw-r--r--language/chinese/CJK/cjk-4.8.5/utils/thaifont/tools/norasi-c90.fontinst (renamed from language/chinese/CJK/cjk-4.8.4/utils/thaifont/tools/norasi-c90.fontinst)2
510 files changed, 7546 insertions, 9671 deletions
diff --git a/language/chinese/CJK/README b/language/chinese/CJK/README
index 707c62d0ef..2f6adafa47 120000
--- a/language/chinese/CJK/README
+++ b/language/chinese/CJK/README
@@ -1 +1 @@
-cjk-4.8.4/README \ No newline at end of file
+cjk-4.8.5/README \ No newline at end of file
diff --git a/language/chinese/CJK/cjk-4.8.4/doc/cjk/README b/language/chinese/CJK/cjk-4.8.4/doc/cjk/README
deleted file mode 100644
index dbb6381647..0000000000
--- a/language/chinese/CJK/cjk-4.8.4/doc/cjk/README
+++ /dev/null
@@ -1,4 +0,0 @@
-This directory contains files which are `preprocessed' with
-cjk-enc.el, bg5conv, etc.
-
-You can feed them directly into LaTeX.
diff --git a/language/chinese/CJK/cjk-4.8.4/doc/cjk/READMEb5.cjk b/language/chinese/CJK/cjk-4.8.4/doc/cjk/READMEb5.cjk
deleted file mode 100644
index 03c4332306..0000000000
--- a/language/chinese/CJK/cjk-4.8.4/doc/cjk/READMEb5.cjk
+++ /dev/null
@@ -1,1150 +0,0 @@
-\def\CJKpreproc{bg5conv (CJK ver. 4.8.3)}%%% 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
-%%% patient and wait for the next new release. I'm sorry for any
-%%% inconveniences. I also deeply expect that everyone who is
-%%% interested in this topic gives me suggestions and corrections in
-%%% any respects. Thanks in advance.
-%%%
-%%% Revision 1.5 1996/11/22 10:49:00 d791013
-%%% * modify some context presentations.
-%%%
-%%% Revision 1.4 1996/10/23 03:59:40 d791013
-%%% Revision control by CVS.
-%%%
-%%% Revision 1.3 1996/07/27 11:19:20 d791013
-%%% 1. In compliance with CJK version 4.0.0
-%%% 2. Fill up some unfinished sections in previous versions of this
-%%% file.
-%%% 3. Add more usages for MULE and AUCTeX.
-%%%
-
-\documentclass[12pt,a4paper]{article}
-\usepackage{array,CJK}
-\RequirePackage{shortvrb}
-\MakeShortVerb{\|}
-
-% enlarge text width and height (for saving number of pages)
-\addtolength{\textwidth}{1in}
-\addtolength{\oddsidemargin}{-.5in}
-\addtolength{\textheight}{1in}
-\addtolength{\topmargin}{-.5in}
-
-\begin{document}
-\begin{CJK*}{Bg5}{bsmi}
-\CJKtilde
-
-% local commands
-\newcommand{\ntutocjk}{~\textsf{ntu2cjk}~}
-\newcommand{\ttftopk}{~\textsf{ttf2pk}~}
-\newcommand{\hookstroke}{\raisebox{2pt}{\scriptsize $\surd$}}
-\newcommand{\crossmark}{$\times$}
-\newcommand{\bigfive}{~\textrm{Big-5}~88}
-\renewcommand{\figurename}{207~}
-\renewcommand{\tablename}{237~}
-
-%% end of header
-
-\title{\bigfive16422911620685186~CJK \LaTeXe~198169116206\\
- (For CJK version 4.1.0)}
-\author{
- 245103116\thanks{The author of the \textsf{ntu2cjk} package.
- \textsf{E-mail:} d791013@ce.ntu.edu.tw}\ (Chun-Yu Lee) \and
- Werner Lemberg\thanks{The author of the \LaTeXe\ CJK package.
- \textsf{E-mail:} wl@gnu.org}}
-\date{20 Nov. 1996}
-\maketitle
-
-\tableofcontents
-
-\section{178182}
-\label{sec:introduction}
-
-1872296811011923918610172\bigfive176681861642292292439323777231105931161262292062072061659465
-253207206~\LaTeXe~206~CJK~1162061052301981696776652282102211862421871106880119203667416565
-181641781101861822086722810024224616322491921101151106410393206641879420722919590186229185210221
-167686865253931722471797364235202186229243\footnote{187229781249823322567679721519180201
- 822192466868657291106228178992061861016780201931932211702042241632099581186781636572176
- 85641848816916720921067}67
-
-1872291861861017211688~CJK 4.x.x~1162061869311917668672152391872291678020165CJK~186169187
-79~4.1.067
-
-\subsection{92170252222}
-\label{sec:reading-guides}
-
-85177791782301869217025222271
-\begin{itemize}
-\item 2538411965253119203186~CJK~1691877995791872292101211221866589163806520825011180187
- 229219101186~CJK~16918765206250111204115186~CJK~16918765195921702282109311618618722924320121567
-\item 8993169187167163806512223110572~CJK~229243164186~INSTALL~176686524572114172119203
- 11620693\textsf{ntu2cjk}~206~\textsf{ttf2pk}941642192461861612502292436565115253
- 1872291861016417620924720223265652379711920322721116422919816911620667
-\item 8912219110311920376~CJK65122105189181209210196~\ref{sec:steps}~96167119203667416867
-\item 899812218611620616465124188119203179164229~TFM66PK66206~PFB~16520121565105209210196~
- \ref{sec:install-fonts}~9616711417211920316867
-\item 8912217711187122186119203667416324722723365208209210196~\ref{sec:my-settings}~
- 9616721818621010816867
-\item 89811906811224325011121924620121565208209210254253~\ref{sec:getting-files}167201
- 21525011116867
-\item 89812391872292102072061671142521792101959865208209210254253~\ref{sec:terms}16787252
- 20919216867
-\end{itemize}
-
-9678711872291861019811417218611920323217765239243\ttftopk186182208251214\footnote{93187229
- 1866811064204117179207206\ntutocjk2111192031141726523964199\ttftopk11518623922011916324412067}
-170204105219~CJK~18622924377243164179246164229186161250201~|NTeXb5.doc|~938018720121510924380
-642162531649411123621221118620916167
-
-11612618722998239243~em\TeX~24421085186119203209161659311779189182219~CJK~229243164186~
-|INSTALL|~1112112016518722964204195188234647667
-
-\subsection{105646618623484211189}
-\label{sec:further-information}
-
-\begin{itemize}
-\item 229109~\cite{latex2nd}~1762421872268567
-\item 229109~\cite{latex-companion:1993}~1051761051652268567
-\item 209210~Newsgroup |comp.text.tex|~186~FAQ67
-\item 179246~\TeX/\LaTeX~962211862216865105209247229109~\cite{tex-faq:1.9c}93169187
- 1211949467
-\end{itemize}
-
-\section{11620622168}
-\label{sec:requirements}
-
-\subsection{119233244210}
-\label{sec:hardware-requirements}
-
-\TeX/\LaTeX~1162062161018871180106161192186641261162062101792281696798~RAM~1862216887104
-24825311519820121518610611265112104198818523618465106104198202852361846724677~\TeX/\LaTeX~
-11620698~286~721011862471857822493938379249186220946525320411021779179~8MB~728718679208
-2336572179731642291141672102216722024311920819716165981642291141721862072062218565204110224179~
-150MB~18619716193\TeX~116206249~30MB658~216~NTU~25411711417220622822417111417265PS~206~
-PK~11417216565249~80MB9467
-
-\subsection{11023322168}
-\label{sec:software-requirement}
-
-\begin{itemize}
-\item 239~\LaTeX~116206179167651861232098023918511620622724218722264186224796720411065179229
- 109~\cite{latex2nd,latex-companion:1993}~1112261872099822622867
-\item \LaTeXe~186245230244210679365~\TeX/\LaTeX~18621924624421067
-\item \LaTeXe\ CJK~11620667
-\item 8981119203~PS~114172\footnotemark\addtocounter{footnote}{-1}65122221110
- \begin{enumerate}
- \item \textsf{ntu2cjk}~11620667
- \item NTU TrueType~11417267
- \item gcc~11518218520621924624421066GNU make67
- \item GhostScript(3.12~7287186169187)67
- \item |afm2tfm|67
- \item 2091638912316171 |arj|66|gzip|66|tar|67
- \item 8981113~PS~114172216223~PK~11417265104221~|ps2pk|~206~|gsftopk|67
- \end{enumerate}
-\item 89253119203~PK~114172\footnote{78164229229243186198169661192532066776210221186114172
- 21116565105722308711711598179~PK~114172206~PS~1141727025378232752028010522620221116565
- 167204216179657220265186232161163205~PK~1141721957917918522793206962062062026594186~PS~
- 11417265792512061862138867}65209210196~\ref{sec:install-pk-fonts}~9616712112267
-\item 2338871|dvips|66|dvi2xx|6620622876~dvi~2301611862241711231618022885229186224171
- 12316167
-\end{itemize}
-
-
-\section{1192036674}
-\label{sec:steps}
-
-1879678681101861192031211236524867112856585181164212211186119203252222657898722251868596164
-19612271
-\begin{enumerate}
-\item 8979~\TeX/\LaTeX~11620611811920311065208245856466679510421821821911820720618664
- 1261162066577119179207206243216~\TeX~116206651952092101162062216893196~
- \ref{sec:requirements}~96946620121525011193254253~\ref{sec:getting-files}94
- 206228762432542531648596167234198652501112192462012156519524621025011123419816418625222011920367
- 8925011118611620683179~\LaTeXe~11620665206791228124311522025124118616918765104105116126219~
- CTAN~2501116598119119203110186~\TeX~2442101649187~\LaTeXe67
-\item 84119~\LaTeXe~118119203180237671057264~\LaTeXe~2301616618610117694229186201215
- 93112~|sample.|\linebreak[1]|tex|9465113245230~|latex|~1151826572~|xdvi|~
- 206~|dviscr|66|dvisvga|~1651659411924866236~|dvips|~206~|dvilj|~22416876237230
- 16193PostScript~206~PCL~1652301619419576886572809579951192031918467
-\item 119203~CJK~164229~\LaTeXe~11620693209210196~\ref{sec:install-CJK}~969467
-\item 239220119203~PK~206~PS~1141722067120421011920393209210196~
- \ref{sec:install-pk-fonts}~96206196~\ref{sec:install-ps-fonts}~969467
-\item 72~CJK~116206164210163209167164229~\LaTeXe~20165|READMEb5.tex|6518125021393209
- 210196~\ref{sec:my-settings}~969467
-\item 891792216865208209210196~\ref{sec:trouble-shooting}~96167221682097716867
-\end{enumerate}
-
-
-\section{119203~CJK~164229~\LaTeXe~116206}
-\label{sec:install-CJK}
-
-2081192391222102072066412611620665209210851772391791861129667
-
-\subsection{98~UNIX~11620685~(web2c)}
-\label{sec:install-under-unix}
-
-\begin{enumerate}
-\item 228211652371862162537825094186~CJK~163892012091256721011212278228209125220~
- |/tmp/CJK|67
-\item 112711222247211620622212220418617324793root941192036510410578209163225186~CJK~216253
- 164~|texinput|~2162538518621017920121593792492362162531789994190220~\TeX~116206224228236
- 18697232931139679~
- |${TEXMF}/|\linebreak[1]|tex/|\linebreak[1]|latex/|\ldots65
- |${TEXMF}|~79~web2c~186~home6564235176~
- |/usr/|\linebreak[1]|local/|\linebreak[1]|lib/|\linebreak[1]|texmf|9465
- 1957818521625387239168~CJK~2066523718687217671127112216379207206251115169186~\TeX~93179~
- web2c65111199~\TeX~11620665163209701881061067710821625320121518622479946510478~
- |texinput|~21625385186210179201215190220~\TeX~116206224228236186972326721011271
- \begin{verbatim}
- $ cd /usr/local/lib/texmf/tex/latex
- $ mv CJK CJK.old
- $ cd /tmp/CJK
- $ cd 4_1.0
- $ mv texinput /usr/local/lib/texmf/tex/latex/CJK
- \end{verbatim}
- 1127112216322472~root~18611817311920365208722542522438517718625279121642152399311271207206~
- |csh|9465195216179781679174~|.login|93206243~|/bin/csh|94206~|.profile|93206
- 243~|/bin/sh|9416465207111~\TeX~22410677236~CJK~21625371
- \begin{verbatim}
- setenv TEXINPUTS: 65186 CJK 21625387//
- \end{verbatim}
- 96786589122210207206186~\TeX~1162061632281691041041082162531067765104788419318621625387217
- 115659174220~|TEXINPUTS|~1862442102201981647020620478~|texinput|~21625385206~
- |Bg5|~216253851862101792012151902208921121625316465195248185216253176~CJK~21625367
-
- 2101129372~|sh|~252791762109471
- \begin{verbatim}
- 93178931228178 CJK 186 texinput 216253190220 ~/CJK/texinput94
- # cd ~/CJK 93220 CJK 10821625394
- # mv texinput texinput.old 9311271122179194186 texinput 2162536525319824794
- # cd /tmp/CJK 93220209125 CJK 1869723294
- # cd 4_1.0 932202161011861691878594
- # mv texinput ~/CJK 9378 texinput 108216253190220 ~/CJK94
- # TEXINPUTS=":~/CJK/texinput//" 9311911324421022019894
- # export TEXINPUTS 939317611320618624421022019894
- \end{verbatim}
-\item 209210196~\ref{sec:install-fonts}~961141721192036578~|.tfm|~20165PK~114172
- 206~PS~114172119203220652371862162538567
-\item 209210196~\ref{sec:install-.fd}~96119203~|.fd|~20165206209210~|fonts.txt|65
- 195218218114172119203186178716593119219246186~|.fd|~2016772187229119239186\bigfive164229211
- 16565178183215239~|c00kai.fd|93112711227816220911421893176~|kai|9466|c00fs.fd|
- 9311271122207206233186114218195119176~|fs|947516521924620121593231105209210\ttftopk206
- \ntutocjk2101632091861002109467
-\item 98209125186~CJK~2162531646510574~\texttt{utils/Bg5conv}~21625316465115182~
- |bg5conv.c|6511271
- \begin{verbatim}
- gcc -O -s -o bg5conv bg5conv.c
- \end{verbatim}
- 78163205186245230201~|bg5conv|~11580~|bg5latex|~11121120165190220~\TeX~116206164241
- 10924523020118621625316493112711181731722479467206109243211721862162531646519584119185216253115
- 98243244210220198~|PATH|~1649320698~|PATH|~1648791642452302441246521617978185244124186
- 9311991236~login~1862101082011649467
-
- 21011271
- \begin{verbatim}
- # cd /tmp/CJK/4_1.0
- # cd utils/Bg5conv
- # gcc -O -s -o bg5conv bg5conv.c
- # mv bg5conv bg5latex ~/bin
- # export PATH=$PATH:~/bin
- \end{verbatim}
- 96786511271122179194186~|bg5conv|~245230201652082001782431156593~4.0~728718616918780
- 251173186169187163809372~``|^^FF|''~17619220111418421116379~``|.|''9467
-
-\item 10574108216253~|doc/chinese|~164652502131221869311971
- \begin{verbatim}
- # cd /tmp/CJK/4_1.0
- # cd doc/chinese
- # bg5latex READMEb5.tex
- \end{verbatim}
- 22179952241828118516811518267
-\end{enumerate}
-
-\subsection{98~DOS~206~OS/2~11620685}
-\label{sec:install-under-dos}
-
-\begin{enumerate}
-\item 228211652371862162537825094186~CJK~1638920120912567
-\item 78~CJK~116206164~|texinput|~2162538518621017920121593792492362162531789994190220~
- \TeX~11620622422823618697232651957818521625387239168~|CJK|~20665237186872176711271122163
- 79207206251115169186~\TeX93179~em\TeX65111199~\TeX~116206651632097018810610677108216253
- 20121518622479946510478~|texinput|~21625385802061221102072061861868821625393Bg59485
- 186210179201215190220~\TeX~2242282361869723267
-
- 72~em\TeX~1162061762106578~CJK~186~|texinput|~164186201215190220~
- |c:\emtex\|\linebreak[1]|texinput\|\linebreak[1]|CJK\|\ldots6519572
- 8517718625279121642152396572207111~\TeX~22410677236~CJK~21625371
- \begin{verbatim}
- set emtexdir=c:\emtex
- set texinput=%emtexdir%\texinput!!
- \end{verbatim}
-\item 98~CJK~116206164186~|utils\|\linebreak[1]|Bg5conv|~2162531646578~
- |bg5conv.|\linebreak[0]|exe|~11580~|bg5latex.|\linebreak[0]|bat|~190220~
- \TeX~186245230244124~(|PATH|)~16418689211216253932068791642452302441249467
-\item 209210~\ref{sec:install-fonts}~11920311417264966578~|.tfm|~20165PK~114172
- 206~PS~114172119203220652371862162538567
-\item 209210~\ref{sec:install-.fd}~119203~|.fd|~2016496652182181141721192031861787165
- 93119219246186~|.fd|~2016793105209210\ttftopk206\ntutocjk2101632091861002109467
-\end{enumerate}
-
-
-\section{114172119203}
-\label{sec:install-fonts}
-
-18722920072209~True Type~114172163205186~PK~114172206~PS~11417217616125067114172167250111209
-210254253~\ref{sec:getting-files}~16716125067
-
-PK~11417293206~PS~114172942041101192039823765110201197~\TeX/\LaTeX~11620620116312411884186
-236109\footnote{19823487652041107818619919196119203~\TeX/\LaTeX~116206722256565178221
- 66126215239206119203186201215206123161651632419811612625111217918621625316465772256572~link~
- 186232161109241243236187179661862361096798~DOS~8565114172201729198244210220198186244124164
- 17668652281661861047219811518623216125078~link67}6593176641851852541141721632052256589105
-24820119318620720670116126651127167184110201197~CJK~116206206~\TeX/\LaTeX~1162062016593105
-2412231061201868522667
-
-\subsection{PK~114172}
-\label{sec:install-pk-fonts}
-
-\subsubsection{219202163205~PK~114172}
-[12418818516865208209210\ttftopk206\ntutocjk186119203161250]
-
-\subsubsection{119253163205~PK~114172}
-[12418818516865208209210\ttftopk186119203161250]
-
-\subsubsection{209~PS~114172163205~PK~114172}
-209210~\ref{sec:install-ps-fonts} PS~114172649667
-
-\subsection{PS~114172}
-\label{sec:install-ps-fonts}
-
-18566210252186~PS~114172176164229~PostScript Type 1~11417265112716591876421120671211
-186~PS~1141729372111199164229~Type 1~114172176242179210991681861141729465105213168~
-PostScript Type 0~18611417267253~\TeX~11620621610118076107250206~Type 0~1861146521072
-1872299316312416320667116126189181250206~TTF~114172981882119310522423412365210112~
-Ghostscript~98115186169187164934.0194119224207206~TTF~11417267
-
-72119203162209~PS~114172176210651781222281211231128593212211208209210\ntutocjk164186~
-|README|~2019471
-\begin{enumerate}
-\item 671841192396421111421893font family6511216220994163205~|.tfm|~206~|.pfb|~201
- 21567
-\item 215239114218219246186~makefile~20165112215239~|kai.mak|~18618610193728572162209
- 1762109467
-\item 89122207206~UNIX~11620665233748517718625279
- \begin{verbatim}
- make unix FONTMAK=kai.mak
- \end{verbatim}
- 8912298~DOS~85652088571
- \begin{verbatim}
- make dos FONTMAK=kai.mak
- \end{verbatim}
- 89641931828165179179~55~211186~|.pfb|~20121577~55~21193206~110~2116511271~
- |EXTENDED_FONT|~7993~|YES|94|.tfm|~2012156566~TFM~2012151861061126567211249176~
- 1.2kB~17010767
-\item 85~|make install-fonts|~1852527965105782101791632051861141721192032201229311998~
- |kai.mak|~201215164210252119186216253164671221052249322111072~|make install-maps|~
- 11121125279119203~|Fontmap|~206~|psfonts.map|~16567
-\item 21821872872101191131141722192461868721765122178183215239~|c00kai.fd|~195190220~
- \TeX~22811123618621625367206204215239~|c00kai.fdx|6511271~|EXTENDED_FONT|~7993
- 176~|YES|6519022065237216253225651781837822887217239176~|c00kai.fd|67
-\end{enumerate}
-
-\subsubsection{209~PS~114172163205~PK~114172}
-
-209~PS~114172163205~PK~1141726511396122221110199~|gsftopk|~206~|ps2pk|~21118516867
-
-1127172~|gsftopk|~163205~PK~11465217221110~|gs|93Ghostscript9418617885659318598
-122215203110~PS~11417222565792371107811417221098186216253876591236~|GS_LIB|~111211244210220
-1981646520620478209\ntutocjk210163205~|.pfb|~2016572~symbolic link~18623216165254161~
-link~236~|gs|~21011911318611417221625316467
-
-11271206~|ps2pk|65122221110~AFM~2019398\ntutocjk115121~|.pfb|~2012151867612316465124
-163205~AFM~201946720411025011120411518616918765727925398170250~PS~11417280~AFM~20120165163
-801632052216867
-
-98122210207206186~\TeX/\LaTeX~11620616465106167163179~|MakeTeXPK|~1112112016516618692206
-89799811620611112389211~PK~11417216311598201652192021632051676721118520125271163221837918666
-1269311965163179219202209~PS~201163205~PK~11417218692224672377710116379111199~PS~114172178183
-8812398~|psfonta.map|~16465|MakeTeXPK|~20618520116418611417280951911101632051147995
-176~PS~114172932282341112211102481222101192031862192461162062111199467
-
-%\section{1638011316317379851679678198181}
-%\label{sec:platforms}
-
-%\subsection{DOS}
-%\label{sec:platform-dos}
-
-%\subsection{UNIX}
-%\label{sec:platform-unix}
-
-\subsection{119203~\texttt{.fd}~201}
-\label{sec:install-.fd}
-
-2376511018611417293TFM~20121566PK~11417266206~PS~11417294246211871228896232161119203180237
-2256512293183110652379793119219246186~|.fd|~20167187967817812216767
-
-\LaTeXe~186~\textsf{NFSS}~87230164651101211226421611417293116179856720919871
-\begin{enumerate}
-\item Encoding711158823216165112~|T1|66|OT1|66|DC|~16567|U|~237220~unknown67
- CJK~1162061861158823216193209210~|fonts.txt|946417622924318217721020665112~|Bg5|66
- |GB|66|Bg5pmC|~1656564176~\textsf{NFSS}~21020720665112~|C00|66~|C10|66
- |C01|~1656718566658911911398~|.fd|~2011641861158823216122120720622520467729472210207
- 206186\bigfive17621065~|C00|~7917822111911318667
-\item Family7111421865112~|cm|66|cmss|66|cmtt|~16565CJK~11620698119203\bigfive186
- 1141722212192301191136525322119788~\textsf{NFSS}~186871196589119113114218186114198163105
- 877617321111419267122105209210931169820912520121516418610021065112~|c00kai.fd|67CJK~116
- 206721622096625023366208209165237220114218679472105206~|kai|66|song|66|ming|66|fs|66
- |black|66|round|~165165237220\bigfive18611421867
-\item Series711141166793238861862161119465112~|m| (medium)66|b| (bold)66|bx|
- (extended bold)~16565CJK~1172061858723067
-\item Shape7111420617265112~|n|66|sl|66|ol|66|it|~16567CJK~11720616767
-\item Size7111410611293731989465112~|10|66|12|~165
-\item |\baselineskip|7121970226230186242199117161906510616119216111220616323618520919867
-\end{enumerate}
-
-218218728718621212265728517823018220821120118617899801211076572~|c00kai.fd|9398~
-\texttt{texinput/Bg5}~21625385942019311684211681101862527971
-\begin{enumerate}
-\item |\ProvidesFile{c00kai.fd}{|{\em release-info}|}|7116125018720187195215
- 751711982527467
-\item |\DeclareFontFamily{C00}{kai}{}|7116125018520172~|C00|~1861158866121122~
- |kai|~11421867228164~|C00|~79~\textsf{NFSS} encoding67
-\item |\DeclareFontShape{C00}{kai}{m}{n}{<-> CJK * b5ka}{}|711858279186
- 19617321120919825119824865105209210~|fonts.txt|~18616125067228164~|*|~1851071862091988979
- 642131141722018718611418665CJK~116206124981922219187712361981146516817611417287217
- 93sub-font name946516321579~|.tfm|~20166|.pfb|~201206~|pk|~201210221801858764
- 8067|CJK|~1047911417210611223119893size function9465CJK~11620611911370198211185254
- 2311986511271
- \begin{verbatim}
- CJK 219237243 `' (empty) 7825220720611418610611280 latex 115182186648067
- sCJK 219237243 `s' 80876525325011417912620116318110593silent9467
- CJKfixed 219237243 `fixed' 8922168186114106112981191131861002421866564223
- 20720625211918611467
- sCJKfixed 219237243 `sfixed' 808765253 keep silent67
- CJKsub 219237243 `sub' 72116642541141721927867
- CJKssub 219237243 `ssub' 808765253 keep silent67
- \end{verbatim}
- 112185105722202327518680201207206731251142068611311467
-\end{enumerate}
-
-204178230186119203232161787965112716579206\ttftopk2111632051141726510478228210163209186~
-|c00?????.fd|~198115236~\texttt{texinput/Bg5}~8570897972\ntutocjk1766865231
-80122176167707218525419267
-
-\subsection{23388164229~\LaTeX~2292438011417218624689}
-\label{sec:portability}
-
-185662102521862338893651131952456620121520620010516567237~\ref{tab:soft-vs-fonts}~79
-187229210163206186641991108811023380228210207206114172161186246899316370837916125012665110233167
-16918710680210176187229182103201204241186169187946720918523710519065PK~1149811924820179163105206
-20218665211~PS~11498677693116179~PostScript~20121593|.eps|66|.ps|~16594186229243201
-23117822120623667
-\begin{table}[htbp]
- \begin{center}
- \leavevmode
-
- \begin{tabular}{|>{\ttfamily}c|c|c|c|} \hline
- 23388110233 & 92224 & CJK PK~114172
- & CJK PS~114172 \\ \hline
- xdvi & 119248 & \hookstroke
- & \crossmark \\
- & &
- & 93224179642111199311494 \\ \hline
- dvisvga & 119248 & \hookstroke
- & \crossmark \\ \hline
- dvips & 2338822020121520676237247 & \hookstroke
- & \hookstroke \\
- 935.60~169187728594 & &
- & 932531762541612527494 \\ \hline
- dvihp & 2338822020121520676237247 & \hookstroke
- & \crossmark \\ \hline
- gs & 11924820623388 & \crossmark
- & \hookstroke \\ \hline
- \end{tabular}
-
- \caption{~\TeX~21924611023380207206~CJK~1141721611672468967}
- \label{tab:soft-vs-fonts}
- \end{center}
-\end{table}
-
-110163115641032072291959018622918565215228791642292291856511421893font family9480228216111
-10611293font size94186220198791631052062021866723923388201178183186~PK~80~PS~11417221116565
-8998185172112852412517120418611679657623718623275202931051617985179100238708998207208197161
-186207206876510522478179210116167679317680641142182531638010611218611465PK~11417217822167216
-207206236186216111210252742202282338820116465211~PS~1141721172216418467
-
-21610165229185164210179207206236186~PFB~1141726589110163205186116161186~PS~201215
-93self-contained Postscript output9465|dvips|~124254161252742202282338816467211
-856418488169186~|dvips|~1231611646578105224119239228233882011641861851812027317921023910570
-7889115186169187117124252749822918516417920720623618611422898~|.pfb|~201164210239179167119113186
-161192679398167204250213~|dvips| 5.60~16920165200201761071689297207206164229~CJK PS~114
-172651637621972214706794
-
-216101200201105206~|fontload|~11121111023365701681112119222467
-
-
-\section{218186210108}
-\label{sec:my-settings}
-
-21610121820720618679~Linux~6412611620665\TeX/\LaTeX~104207206~te\TeX~24421065219246186
-2162531128571
-\begin{itemize}
-\item |/usr/local/lib/texmf| 115241~\TeX/\LaTeX~11620667
-\item |/usr/local/lib/ghostscript| 115241~Ghostscript67
-\item |/usr/local/lib/ntuttf| 115241~NTU TrueType~114172206209\ntutocjk210163
- 20518621924611417267
-\item |~/CJK/4_1.0| 115241209125186~CJK~11620667
-\end{itemize}
-
-21872191961861192031231996578~te\TeX~11920398~|/usr/local/lib/texmf|7016722578~
-CJK~98218186~|$HOME/CJK|~8520912565CJK~1102331642101791862012157516320598~|CJK|~108216
-253164\footnote{1672107278~CJK 119203982191182117218621625385657993176~CJK~9624311565
- 1632327596208116206222122204878723922093119676591871767021911820121512111320218621012365179
- 21911864247~CJK~18693119652117212317665219118186~CJK~22924312612417925117012321518619021120267
- 89658379116206164116100~CJK~110233186726519820679227211~\TeX/\LaTeX~186251642046598
- 2191181127218621625385222122195119193243115~CJK6579211163249186232161}6521011271
-\begin{verbatim}
- % cd
- % gunzip CJK-4.1.0.src.tar.gz | tar xvf -
-\end{verbatim}
-19518172851866612271
-\begin{enumerate}
-\item 98~|~/CJK|~852162236419718516118620121511517893symbolic link946587176~
- |texinput|~66115178220216101~CJK~1691878785186~|texinput| 65
- \begin{verbatim}
- % cd ~/CJK
- % rm -f texinput
- % ln -s 4_1.0/texinput texinput
- \end{verbatim}
-\item 11518264211115186~|bg5conv|~24523020167
- \begin{verbatim}
- % cd ~/CJK/4_1.0/utils/Bg5conv
- % gcc -O -o bg5conv bg5conv.c
- % mv bg5conv bg5latex ~/bin
- \end{verbatim}
- 89163117791192031852191182066510410572~|root|~186173247~|cp|~220~|/usr/local/bin|~
- 2162538567
-\item 98218186~|$HOME|~21625385~|.cshrc|~201164939317621820618679~tcsh9465879164
- 230
- \begin{verbatim}
- setenv TEXINPUTS ":~/CJK/texinput//"
- \end{verbatim}
-\item 163205~|.tfm|~201206~|.pfb|~1141726798185218246211\ntutocjk164656464~
- ``make''~88219239186~|.pfb|~1141726564~8~2136567213~55~211~ |.tfm|~206~|.pfb|~
- 2016721878111199201215190220~
- \texttt{/usr/local/lib/\linebreak[1]ntuttf/\linebreak[1]type1/}~206~
- \texttt{/usr/local/lib/ntuttf/afm/}~219246243228114218186216253856719578
- ~|config.CJK|~206~|CJK.map|~190220~|$TEXMF/dvips|~8567
-\item 93119~|.fd|~20167931762182072061867972~PS~11417217668186~PFB93209\ntutocjk163
- 20594206209228163205186~PK~11417293209~|gsftopk|~163205946521072218189181196206
- \ntutocjk210163209186~|c00|*|.fd|~201658317964244243243239939317621817910024420716680
- 218186117642442106480 :-946721878228190220~|~/CJK/texinput/Bg5/|~2162538567
-\end{enumerate}
-
-\subsection{21622322990}
-\label{sec:creating-tex}
-
-164229~CJK \TeX~229908064235~\TeX~2299018616380681109824371
-\begin{itemize}
-\item 98210215~\LaTeX~229243186~preamble93|\documentclass|~220~
- |\begin{document}|9420723616465178183179~|\usepackage{CJK}|~11121182796589178
- 18325274~|CJK.sty|67
-\item 16422911417818398~|CJK|~206~|CJK*|~186164229244210164678971
- \begin{verbatim}
- \begin{CJK*}{}{}
- 16422911316866185966620720666237230662092102291096675165
- ...
- \newpage
- \end{CJK*}
- \end{verbatim}
-\item 110220171114172105206~|\CJKfamily|~827965112~|\CJKfamily{fs}|~787285186114
- 1722391682331861149323777~|fs|~1112111142068721717818311911398~|c00fs.fd|~1649467
-\end{itemize}
-
-2181862061071637972642111642292442109323721017918622918518610165112207~
-\ref{fig:my-example}~21022067
-
-\newsavebox{\myex}
-\begin{lrbox}{\myex}
- \begin{minipage}{.9\textwidth}
- \footnotesize
- \begin{verbatim}
- \documentclass[12pt]{article}
- \usepackage{CJK}
-
- \begin{document}
- \begin{CJK*}{Bg5}{fs}
- \CJKtilde
-
- \section{1966496}
- \label{sec:section-1}
- 209210207~\ref{fig:apply-pk-and-ps-fonts}67
-
- \begin{figure}[htbp]
- \begin{center}
- \leavevmode
- \includegraphics{pkpsapps.eps}
- \caption{|pk|~11417280~|.pfb|~114172186179206239179207}
- \label{fig:apply-pk-and-ps-fonts}
- \end{center}
- \end{figure}
-
- \bibliographystyle{plain}
- \bibliography{mybib}
-
- \newpage %207179191841861642292338867
- \end{CJK*}
- \end{document}
- \end{verbatim}
- \end{minipage}
-\end{lrbox}
-
-\begin{figure}[htbp]
- \begin{center}
- \leavevmode
- \fbox{\usebox{\myex}}
- \caption{218186~CJK~22924310021067}
- \label{fig:my-example}
- \end{center}
-\end{figure}
-
-\subsection{72~\LaTeXe\ CJK~115198169177}
-\label{sec:clatexing}
-
-788064235186~\LaTeX~201642036525372~|bg5latex|~25078~|latex|6511271
-\begin{verbatim}
- % bg5latex mylatex.tex
- 206204
- % bg5latex mylatex
-\end{verbatim}
-
-\subsection{119253}
-\label{sec:preview}
-
-1061611921611128521872~|xdvi|~119253~|.dvi|~2019398~Emacs~206~Mule~16489207206~
-AUC\TeX~111771102336524322422788228240881869723265215228791171192532291851641866424420723665
-722011052032482112072361861981691612069467
-
-1161266521893124248161112206163801861192481231616724111298~Linux~186~virtual terminal
-mode~21872~|dvisvga|~119248679820270~|pk|~11417220683179~|xdvi|~1862141981612068565
-21893206~|ghostview|~119248103209~|dvips|~163205186~|.ps|~20121567
-
-\subsection{6776}
-\label{sec:printing}
-
-1632052066776~|PostScript|~20121579218204962061862321616593176982181862291851646520720679163
-10521418623419865211166204887116379~|.eps|~18623016193209~|xfig|66AutoCAD66|GnuPlot|66
-|xv|66751652101632059467210163205186~|.ps|~2016520620479209~PostScript~7623724765231206
-20412276~ Ghostscript~1862241716521123388236~Laserjet~206~Deskjet~1982062367312516176
-23724710467
-
-642352111656572~|dvips cjk-doc|~124163205105677618623388656572~|lpr cjk-doc.ps|~
-1867623725279677689105672531228916364163205164229~PK~114172656612216379207206~PostScript~
-762372476583206\ntutocjk119203~PS~1141726593119239~ Ghostscript~18693119119203110111199
-11417265211661221867623720520212316122472~|gs|~1766893Linux1162068710419816372185232161931199465
-104651057218918172~|lpr|~11121182796776~ |.ps|~2019319822079~|.dvi|~201946711271
-\begin{verbatim}
- % dvips -P CJK cjk-doc
- % lpr cjk-doc.ps
-\end{verbatim}
-
-72~|dvihp|~16320567762019379232161167646522823388230161176~PCL6520679~HP~76237247186230
-1616725393761076612222918516493116186~PostScript~20121565210722181951639620667
-
-237110163205105226186677620121523016193self-contained PostScript file946521812472163205~
-Post\-Script~93|.ps|9418623016117668671141722111891676479209119248225219202163205186~PK~
-11417264176~ |dvips|~1862337411417267185232161105728567827918516871
-\begin{verbatim}
- % dvips cjk_doc -o cjk-doc-contains-pk-fonts.ps
-\end{verbatim}
-185201~|psfonts.map|~164221163116\ntutocjk21016320518616422911417293CJK 4.0 7287186169187
-164210116186\ntutocjk65119931761851612069465|dvips|~126124250206164229~PK~1146520611271164
-229~PK~11417216311598186220651242192021632051676798207206~|xdvi|~206219246110233119248201659372~
-PK~114172176686598114172228163236186161112856523112421920216320516767
-
-1161261047979~|dvips|~250206164229~PS~1146598246211\ntutocjk16416125011920322565210179186164
-229~PS~11418623917920112411598243~|CJK.map|~201164678911072185232161163205105226161186~|.ps|~
-2016517818310564669772~|gs|~206~|fontload|~1652542521861102336578~PS~1141722527423623388
-186201215164678972~|fontload|~2111656598~UNIX~11620685651057285177186252797016871
-\begin{verbatim}
- % dvips -P CJK -o cjk-doc-no-ps-fonts-contained.ps cjk_doc.dvi
- % fload cjk-doc-no-ps-fonts-contained.ps > cjk-doc-contains-ps-fonts.ps
- % lpr cjk-doc-contains-ps-fonts.ps
-\end{verbatim}
-185201~|cjk-doc-contains-ps-fonts.ps|~206~|cjk-doc-contains-ps-fonts.ps|~78
-79185227186~PS~20121570659378791616512210572225236244243641202281691796776~PostScript~201
-215186762372472061231617067
-
-7287787921821172239~CJK~164229~\LaTeX~116206186931196517972647816320921911818611920310323122083
-
-
-\section{2216820977}
-\label{sec:trouble-shooting}
-
-9820720611925312316118620121265105224124742361862216880228209771862321611128571
-\begin{itemize}
-\item PK~11417222816323667
-\item 163124219202163205~PK~11417267
-\end{itemize}
-
-[9210422168802282097723216112418822712219974]
-
-
-%\section{22876}
-%\label{sec:misc}
-
-
-\section{80194}
-\label{sec:acknowledgements}
-
-\begin{itemize}
-\item 1791112421047265941099210422379651851689210423275661861012157318612316167
-\item 1792431041862072062046520720611119912316165207762042438710421167
-\item 111216837918621917211884652052051631679796244219651261632017021820418620516110417767
-\end{itemize}
-
-
-%\section{18722964204}
-%\label{sec:the-author}
-
-%245103116 (Chun-Yu Lee)
-%d791013@ce.ntu.edu.tw 206 \\
-%chunylee@ms1.hinet.net
-
-
-%\bibliography{READMEb5}
-%\bibliographystyle{plain}
-
-
-\begin{thebibliography}{1}
-
-\bibitem{latex-companion:1993}
-Michel Goossens, Frank Mittelbach, and Alexander Samarin.
-\newblock {\em The \LaTeX Companion}.
-\newblock Addison Wesley, 1993.
-
-\bibitem{tex-faq:1.9c}
-Bobby Bodenheimer.
-\newblock The new \TeX\ FAQ --- your 100 questions answered:
- Version 1.9c, date 1994/12/06.
-\newblock 1994.
-
-\bibitem{latex2nd}
-Leslie Lamport.
-\newblock {\em \LaTeX\ --- A Document Preparation System --- User's
- Guide and Reference Manual}.
-\newblock Addison Wesley, 2 edition, 1994.
-
-\end{thebibliography}
-
-
-\appendix
-\section{87252209192}
-\label{sec:terms}
-
-8567872521761872291642102072066519518917324385677822871
-
-\begin{description}
-\item[PK~114172:] PK fonts67642161638976186731251141722301616711512020720698~
- TeX/\LaTeX~221110233887312511418697232671121192482066776233886798185190252164229~CJK
- PK~11417267
-\item[PS~114172:] PostScript Type 1 fonts67PostScript~11417919821617216165187229
- 78252~Type 1~1141726722817922621623016171PFA (Printer Font Ascii)~206~PFB
- (Printer Font Binary)6798185190252164229~CJK PS~11417267
-\item[682476611764184:] A host computer, work station, etc671202528979163209
- 2341892066520018611316367112~FTP~18467
-\item[CTAN:] Comprehensive \TeX\ Archive Network671872292521721768871210179179
- 246~TeX/\LaTeX~116206206229243186~FTP~18467216101119190186~CTAN~21267243254253~
- \ref{sec:ctan-mirrors}67
-\item[IFCSS:] The CCIC (Chinese Community Information Center) of IFCSS
- (Independent Federation of Chinese Students and Scholars)67254253~
- \ref{sec:ifcss-mirrors}~164798821117987186~ifcss~18467
-\item[AFM~201215:] Adobe Font Metrics671151791158820611410024216523419867
-\item[TFM~201215:] \TeX\ Font Metrics67
-\item[|.fd|~201215:] 114172121122201~(font description files)67792532192462438964
- 2161868867
-\item[GS~206~GhostScript:] 96206186~PostScript~12116520918218593interpreter94
- 1676467
-\item[|afm2tfm|:] 78~AFM~201215230161224171168~TFM~20121523016118612316167
-\item[64213114172201:] 11271792072061638976186114172658916379207206~pmC~1258918611421865
- 64179~55~2111081141722016721011271|b5ka01.pfb|66|b5ka02.pfb|667566
- |b5ka55.pfb|67
-\item[\textsf{NFSS}:] New Font Selection Scheme67209~Frank Mittelbach~
- 77~Rainer Sch\"opf~2101638818611417223922011620667
-\end{description}
-
-\section{201215250111}
-\label{sec:getting-files}
-
-\begin{description}
-\item[\LaTeXe~24523024421071] 64235210179168771861162062092072062041782301192036511298~DOS~
- 85186~em\TeX7098~Linux~85179~N\TeX66~te\TeX~16570UNIX~87104112~web2c~186169
- 1871656711119916317898~CTAN~1862162538567180112~em\TeX~98~
- |systems/|\linebreak[1]|msdos/|\linebreak[1]|emtex|~16470N\TeX~98838370
- web2c~18616918798838367\LaTeXe~11620618717310498~CTAN71
- |macros/|\linebreak[1]|latex/|\linebreak[1]|base|~8567
-\item[\LaTeXe~CJK~11620671] CTAN: |language/chinese/CJK|~206~IFCSS host:
- |tex/|\linebreak[1]|CJK.X_X.|\linebreak[1]|tar.gz|67
-\item[NTU TrueType~11417271] IFCSS host: |fonts/big5/ms-win|677816220966250
- 233662331862331651611929320625416194186~ARJ~201250942256520921080111199114172988064216253
- 1861612502019320620921025498\ntutocjk164186~|README|~20194657822821723616821179~TTF~
- 11417267
-\item[\textsf{ntu2cjk, ttf2pk}:] 114172163205123161671669311698~167\LaTeXe\ CJK~
- 11620616816467
-\item[GhostScript:] CTAN:
- |support/|\linebreak[1]|ghostscript/|\linebreak[1]|aladdin|~206~
- |support/|\linebreak[1]|ghostscript/|\linebreak[1]|gnu|67
-\item[|dvips|:] CTAN host: UNIX~16998~|dviware/dvips|70DOS~16998~
- |systems/msdos/|\linebreak[1]|dviware/|\linebreak[1]|dvips/|%
- \linebreak[1]|dvips558.pc|67
-\item[|afm2tfm|:] 9311698~dvips~11620616467
-\item[|ps2pk|:] CTAN: |fonts/utilities/ps2pk|6520693116986423577203186~
- \TeX/\LaTeX~11620616467
-\item[|gsftopk|:] CTAN: |fonts/utilities/gsftopk|6520693116986423577203186~
- \TeX/\LaTeX~11620616467
-\item[|dvi2|xx:] 112~|dvilj|66|dvidm|66756798~CTAN: |dviware|~2162538567
-\item[AUC\TeX:] CTAN: |support/auctex|~216253164186~
- |auctex.tar.gz|\linebreak[1]93~unix~94206~|auctex.zip|~93dos9467
-\item[|fontload|:] CTAN: |fonts/utilities/fontload|67
-\item[Mule~1861642292337410771] IFCSS: |mule/lisp/quail-b5|67
-\end{description}
-
-
-\section{2287621924618611023380117227}
-\label{sec:other-stuffs}
-
-\subsection{98~Linux~11620687186\bigfive164229116206206210192215221247123161}
-\label{sec:chinese-systems}
-
-\begin{itemize}
-\item chdrv
-\item yact
-\item CXterm
-\item xcin
-\end{itemize}
-
-\subsection{164229115232\ -- Mule}
-\label{sec:mule}
-
-207206~Mule~176115232164229~\LaTeX~2292431861172271862072062046510578851771869311991220~
-|$HOME/|\linebreak[1]|.emacs|~20116471
-\begin{verbatim}
- ;;; Chinese Big-5 environment
- (set-primary-environment 'chinese)
- (set-default-file-coding-system '*big5*)
- (setq display-coding-system '*big5*)
- (setq keyboard-coding-system '*big5*)
- ;; input methods
- (add-hook 'quail-package-alist '("tsangchi-b5" "quail/tsangchi-b5"))
- (add-hook 'quail-package-alist '("quick-b5" "quail/quick-b5"))
- ; the default input method
- (setq-default quail-current-package
- (assoc "tsangchi-b5" quail-package-alist))
-\end{verbatim}
-
-1931711649422923374105246~|C-]|651102392202287618623374107105246~|M-s|93|Alt-s|9467
-
-9311923374107201105239220219118223681866798~IFCSS Mule~18621625316493209210196~
-\ref{sec:getting-files}~9694179641991642292337410765228164936517971
-\begin{center}
- \begin{tabular}{ll}\hline
- 201215 & 23917916723374107 \\\hline
- cns-b5-input.tar.gz & 186116~|tsangchi-b5.el|9322010194206 \\
- & |quick-b5.el|931782469416523374107 \\
- zozy.el.gz & 11525296181 \\
- cj.el.gz & 220101 \\
- simplex.el.gz & 178246 \\
- punct-b5.el.gz & 20873197185 \\
- qj-b5.el.gz & 254206 \\
- etzy.el.gz & 20220996181 \\
- boshiamy.el.gz & 70188204 \\
- array30.el.gz & 23067~30 \\\hline
- \end{tabular}
-\end{center}
-
-72871762519616318623374107672112162531642319311685672337410771
-\begin{center}
- \begin{tabular}{ll} \hline
- 201215 & 23917916723374107 \\\hline
- 4corner.el.gz & 12416418588 \\
- ctlaub.el.gz & 66252187161102181 \\
- ecdict.el.gz & 94126227229 \\
- hs.el.gz & 21672 \\
- hsu.el.gz & 9224396181 \\
- py-b5.el.gz & 126121247181 \\
- roman.el.gz & 185168247181 \\\hline
- \end{tabular}
-\end{center}
-
-
-228110186~\LaTeX~22924320165105245230~|bg5latex|~1151826723110581206~|cjk-enc.el|~111211~
-Emacs Lisp~2016578229243253230224171168~|.cjk|~201656572~|latex|~105230115182676410779
-98~|~/.emacs|~2012151649174856719823093228164231198~ |write-cjk-file|~208209210~
-|cjk-enc.txt|~9471
-\begin{verbatim}
- (load-library "cjk-enc")
-
- (defun write-cjk-file ()
- "Save current buffer and <buffername>.cjk in *cjk-coding*"
- (interactive)
- (setq coding file-coding-system)
- (setq bufname (buffer-file-name))
- (string-match "\\(.*\\)\\.[^/]*$" bufname)
- (setq body (substring bufname 0 (match-end 1)))
- (setq newbufname (concat body ".cjk"))
- (message "Saving %s and %s" bufname newbufname)
- (write-file newbufname *cjk-coding*)
- (write-file bufname coding))
-\end{verbatim}
-167225751059867184110245230~|latex|~10165206~|M-x write-cjk-file|~827925311520165
-772256572~|latex|~1151826820187801221862292436820187642036525318124920187176~|.cjk|~
-18620121567
-
-\subsection{\TeX/\LaTeX~186110176226\ -- AUC\TeX}
-\label{sec:auctex}
-
-17824625222271
-\begin{enumerate}
-\item 211196~\ref{sec:mule}~9618623216178~Mule~9311918023767
-\item 246211~AUC\TeX~18611920325222011920367206246211~AUC\TeX~186~default~23216111920367
- 856719818110518110516318167
-\item 21622364211~|bg5latex-batch|~20165192791128571
- \begin{verbatim}
- #! /bin/sh
- f=`echo $1 | sed -e 's|\(.*\)\.[^/]*$|\1|'`
- bg5conv < $1 > $f.cjk
- latex \\nonstopmode\\input{$f.cjk}
- \end{verbatim}
-\item \label{CJK-C-cC-c}98~|.emacs|~164917471
- \begin{verbatim}
- (setq TeX-command-list
- (append TeX-command-list
- '(("CLaTeX" "bg5latex-batch %s " TeX-run-LaTeX nil t)
- ("CLaTeX Interactive" "bg5latex %s " TeX-run-interactive nil t)
- ("CPrint" "fload %f | lpr" TeX-run-command t nil)
- )))
- \end{verbatim}
- 10410598245230~|C-c C-c|~206~|C-c C-r|~201659811023374~|LaTeX|~1862012476523374~
- |CLaTeX|67
-\item 98~|.emacs|~164917485671982306572751221862292439819816920193254229104245230
- ~|C-c C-c CLaTeX|~65207236206~|C-c C-r CLaTeX|946589179249126105206~|C-c `|~
- 100231249126210986519510524319116767
- \begin{verbatim}
- (add-hook 'TeX-translate-location-hook
- '(lambda ()
- (if (string-match "\\(.*\\)\.cjk$" file)
- (setq file
- (concat
- (substring file
- (match-beginning 1)
- (match-end 1))
- ".tex")))))
- \end{verbatim}
-\item 206204122210123206~|cjk-enc.el|6510498~|.emacs|~1649174856719823071
- \begin{verbatim}
- (defun TeX-run-CJK-LaTeX (name command file)
- "Create a process for NAME using COMMAND to format
- FILE with CJK/LaTeX."
- (write-cjk-file)
- (TeX-run-LaTeX name command file))
-
- (if (not (assoc "CJKLaTeX" TeX-command-list))
- (setq TeX-command-list
- (append TeX-command-list
- '(("CJKLaTeX" "%l '\\nonstopmode\\input{%s.cjk}'"
- TeX-run-CJK-LaTeX nil t)
- ))))
- \end{verbatim}
- 1171107887122207206~|CLaTeX|~18620124765239168207206~|CJKLaTeX|~891056710024980203206
- ~|C-c `|~67
-
- 253110967865207206~|CJKLaTeX|~20165229243164208163110207206~|\usepackage{CJK}|~206
- 254252186827967
-\end{enumerate}
-
-9678658712266741176520623064~CJK \LaTeXe~22924367
-
-% Not ready yet...
-%1127198122186229243164179206236~|\include|~11121182796521112218081206236~AUC\TeX~1869222465
-%105641128518621625311919871
-
-% ./ ==> 1871042162536523610822924316724110921625367
-% ../ ==> 8710421625365109241209~latex~101209~bg5conv~22417176186~|.cjk|~2019393185
-% 899818587104216253164179236108229243651042218379967865163110207206801871042162531648087186
-% 22924394671161269311664~|Makefile|~93209210207~
-% \ref{fig:makefile-for-multifile-latexing}~1672101089465228186101681101769867
-% 184~latex~10165243115~|.cjk|~20167
-
-% \begin{verbatim}
-% #! /bin/sh
-% make bg5conv
-% cd CJK
-% latex \\nonstopmode\\input{$1}
-% \end{verbatim}
-
-
-% \begin{lrbox}{\myex}
-% \begin{minipage}{.9\textwidth}
-% \footnotesize
-%\begin{verbatim}
-%TEXs = abstract.tex archi.tex codebase.tex conclude.tex details.tex \
-% dsgnbase.tex engtool.tex examples.tex introd.tex kb_lsp.tex \
-% pjfinal.tex prg_gi.tex prg_s2c.tex related.tex represnt.tex \
-% sscdcb.tex sscddb.tex sscdgi.tex sta2con.tex title_pg.tex
-%MISC = Makefile LaTeXsrc
-%RCSs = $(wildcard $(SRCDIR)/*,v)
-
-%SRCDIR = CJK
-
-%.PHONY: check_srcdir bg5conv default
-
-%.DEFAULT: .tex .sty .bib .dvi .ps .lj .toc .lof .lot
-
-%default:
-% @echo "There are the following targets:"
-% @echo " bg5conv : Big5 CJK LaTeX file converted to LaTeX file."
-
-%bg5conv: check_srcdir $(TEXs)
-
-%check_srcdir:
-% @if [ -f LaTeXsrc ]; then \
-% echo "Don't make at the LaTex source directory!"; \
-% echo "Copy the Makefile to upper directory and make there."; \
-% echo "e.g., cp Makefile ..; cd ..; make"; \
-% exit 1; \
-% fi
-% @if [ ! -d $(SRCDIR) ]; then \
-% echo "$(SRCDIR) not found!"; \
-% exit 1; \
-% fi
-
-%$(TEXs): %.tex : $(SRCDIR)/%.tex
-% bg5conv < $< > $@
-%\end{verbatim}
-% \end{minipage}
-% \end{lrbox}
-
-% \begin{figure}[htbp]
-% \begin{center}
-% \leavevmode
-% \framebox[.9\texwidth]{\myex}
-% \caption{17973104171~CJK~229243201186~Makefile~10021067}
-% \label{fig:makefile-for-multifile-latexing}
-% \end{center}
-% \end{figure}
-
-
-
-\section{CTAN988597186201215207}
-\label{sec:ctan-mirrors}
-(1879675219~CTAN host~87186~README.mirrors)
-
-1762382142442448718611625265216179210179207206~CTAN~2341891862442056522420720623797186206204241186~
-CTAN host67
-
-216101119190198115161192~CTAN~201215186~FTP~184:
-\begin{verbatim}
- ftp.fcu.edu.tw (Taiwan) /pub2/tex
- gate.sinica.edu.tw (Taiwan) /TeX
- ftp.adfa.oz.au (Australia) /pub/tex/ctan
- ftp.germany.eu.net (Deutschland) /pub/packages/TeX
- ftp.uu.net (Virginia, USA) /pub/text-processing/TeX
- nic.switch.ch (Switzerland) /mirror/tex
- sunsite.dsi.unimi.it (Italia) /pub/TeX
- sunsite.snu.ac.kr (Korea) /shortcut/CTAN
-\end{verbatim}
-
-216101119190198115254161~CTAN~201215186~FTP~184:
-\begin{verbatim}
- dongpo.math.ncu.edu.tw (Taiwan) /tex-archive
- ftp.ccu.edu.tw (Taiwan) /pub/tex
- cis.utovrm.it (Italia) /TeX
- ctan.unsw.edu.au (NSW, Australia) /tex-archive
- ftp.center.osaka-u.ac.jp (Japan) /CTAN
- ftp.cdrom.com (West coast, USA) /pub/tex/ctan
- ftp.comp.hkbu.edu.hk (Hong Kong) /pub/TeX/CTAN
- ftp.cs.rmit.edu.au (Australia) /tex-archive
- ftp.cs.ruu.nl (The Netherlands) /pub/tex-archive
- ftp.cstug.cz (The Czech Republic) /pub/tex/CTAN
- ftp.duke.edu (North Carolina, USA) /tex-archive
- ftp.ee.up.ac.za (South Africa) /tex-archive
- ftp.funet.fi (Finland) /pub/TeX/CTAN
- ftp.gwdg.de (Deutschland) /pub/dante
- ftp.jussieu.fr (France) /pub4/TeX/CTAN
- ftp.loria.fr (France) /pub/unix/tex/ctan
- ftp.mpi-sb.mpg.de (Deutschland) /pub/tex/mirror/ftp.dante.de
- ftp.nada.kth.se (Sweden) /pub/tex/ctan-mirror
- ftp.rge.com (New York, USA) /pub/tex
- ftp.riken.go.jp (Japan) /pub/tex-archive
- ftp.tu-chemnitz.de (Deutschland) /pub/tex
- ftp.uni-augsburg.de (Deutschland) /tex-archive
- ftp.uni-bielefeld.de (Deutschland) /pub/tex
- ftp.unina.it (Italia) /pub/TeX
- ftp.uni-stuttgart.de (Deutschland) /tex-archive (/pub/tex)
- ftp.univie.ac.at (\"Osterreich) /packages/tex
- ftp.u-aizu.ac.jp (Japan) /pub/tex/CTAN
- ftpserver.nus.sg (Singapore) /pub/zi/TeX
- kadri.ut.ee (Estonia) /pub/tex
- src.doc.ic.ac.uk (England) /packages/tex/uk-tex
- sunsite.icm.edu.pl (Poland) /pub/CTAN
- sunsite.queensu.ca (Canada) /pub/tex-archive
- sunsite.unc.edu (North Carolina, USA) /pub/packages/TeX
- wuarchive.wustl.edu (Missouri, USA) /packages/TeX
-\end{verbatim}
-
-22621168110186~CTAN~68247:
-\begin{verbatim}
- ftp.dante.de (Deutschland)
- -- anonymous ftp
- /tex-archive (/pub/tex /pub/archive)
- -- gopher on node gopher.dante.de
- -- e-mail via ftpmail@dante.de
- -- World Wide Web access on www.dante.de
- -- Administrator: <ftpmaint@dante.de>
-
- ftp.tex.ac.uk (England)
- -- anonymous ftp
- /tex-archive (/pub/tex /pub/archive)
- -- gopher on node gopher.tex.ac.uk
- -- NFS mountable from
- nfs.tex.ac.uk:/public/ctan/tex-archive
- -- World Wide Web access on www.tex.ac.uk
- -- Administrator: <ctan-uk@tex.ac.uk>
-\end{verbatim}
-
-
-\section{IFCSS~988597186~FTP~184}
-\label{sec:ifcss-mirrors}
-
-68110186~IFCSS~18471 \verb|ftp.ifcss.org:/pub/software|
-
-22876186~FTP~184:
-\begin{verbatim}
-Taiwan: ftp.edu.tw:/Chinese/ifcss/software [full]
- ftp.ntu.edu.tw:/Chinese/ifcss/software [full]
- iiiafs.iii.org.tw:/Chinese/ifcss/software [full]
-CHINA,
- Beijing: info.bta.net.cn:/pub/software [partial]
- Guangdong:
- info.gz.gdpta.net.cn:/pub/mirror/chnsoftware [partial]
- Shanghai: info.sta.net.cn:/pub/software [partial]
-HONG KONG,: ftp.cuhk.hk:/pub/chinese/ifcss/software [full]
-SINGAPORE,: ftp.technet.sg:/pub/chinese [full]
-USA,
- California: cnd.org:/pub/software [full]
- New Mexico: phaiakon.nmsu.edu:/pub/software [full]
-\end{verbatim}
-
-%% start of trailer
-\newpage
-\end{CJK*}
-
-\end{document}
-
-%% Local Variables:
-%% TeX-header-end: "%+ *[Ee]nd[ -]*[oO]f[ -]*[hH]eader"
-%% TeX-trailer-start: "%+ *[Ss]tart[ -]*[oO]f[ -]*[tT]railer"
-%% TeX-command-default: "CLaTeX"
-%% TeX-master: t
-%% End:
diff --git a/language/chinese/CJK/cjk-4.8.4/doc/man/html/bg5conv.html b/language/chinese/CJK/cjk-4.8.4/doc/man/html/bg5conv.html
deleted file mode 100644
index 220925812c..0000000000
--- a/language/chinese/CJK/cjk-4.8.4/doc/man/html/bg5conv.html
+++ /dev/null
@@ -1,86 +0,0 @@
-<!-- Creator : groff version 1.22.3 -->
-<!-- CreationDate: Sat Apr 18 08:52:39 2015 -->
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<meta name="Content-Style" content="text/css">
-<style type="text/css">
- p { margin-top: 0; margin-bottom: 0; vertical-align: top }
- pre { margin-top: 0; margin-bottom: 0; vertical-align: top }
- table { margin-top: 0; margin-bottom: 0; vertical-align: top }
- h1 { text-align: center }
-</style>
-<title>BG5CONV</title>
-
-</head>
-<body>
-
-<h1 align="center">BG5CONV</h1>
-
-<a href="#NAME">NAME</a><br>
-<a href="#SYNOPSIS">SYNOPSIS</a><br>
-<a href="#DESCRIPTION">DESCRIPTION</a><br>
-<a href="#SEE ALSO">SEE ALSO</a><br>
-<a href="#AUTHOR">AUTHOR</a><br>
-
-<hr>
-
-
-<h2>NAME
-<a name="NAME"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">bg5conv &minus;
-convert a TeX document in Big&nbsp;5 encoding into
-&lsquo;preprocessed&rsquo; form.</p>
-
-<h2>SYNOPSIS
-<a name="SYNOPSIS"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em"><b>bg5conv</b>
-&lt; <i>infile</i> &gt; <i>outfile</i></p>
-
-<h2>DESCRIPTION
-<a name="DESCRIPTION"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">Big&nbsp;5
-encoding for traditional Chinese uses the characters {, },
-and \ which have special meanings in TeX documents.</p>
-
-<p style="margin-left:11%; margin-top: 1em">After
-processing a LaTeX&nbsp;2e document which contains
-Big&nbsp;5 characters with <b>bg5conv</b> you need not care
-about these special characters.</p>
-
-<p style="margin-left:11%; margin-top: 1em">This filter is
-part of the <b>CJK</b> macro package for LaTeX&nbsp;2e.</p>
-
-<h2>SEE ALSO
-<a name="SEE ALSO"></a>
-</h2>
-
-
-
-<p style="margin-left:11%; margin-top: 1em"><b>sjisconv</b>(1),
-<b>cefconv</b>(1), <b>cef5conv</b>(1), <b>cefsconv</b>(1),
-<b>extconv</b>(1), <br>
-the <b>CJK</b> documentation files.</p>
-
-<h2>AUTHOR
-<a name="AUTHOR"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">Werner Lemberg
-&lt;wl@gnu.org&gt;</p>
-<hr>
-</body>
-</html>
diff --git a/language/chinese/CJK/cjk-4.8.4/doc/man/html/cef5conv.html b/language/chinese/CJK/cjk-4.8.4/doc/man/html/cef5conv.html
deleted file mode 100644
index e65b44cdbf..0000000000
--- a/language/chinese/CJK/cjk-4.8.4/doc/man/html/cef5conv.html
+++ /dev/null
@@ -1,99 +0,0 @@
-<!-- Creator : groff version 1.22.3 -->
-<!-- CreationDate: Sat Apr 18 08:52:45 2015 -->
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<meta name="Content-Style" content="text/css">
-<style type="text/css">
- p { margin-top: 0; margin-bottom: 0; vertical-align: top }
- pre { margin-top: 0; margin-bottom: 0; vertical-align: top }
- table { margin-top: 0; margin-bottom: 0; vertical-align: top }
- h1 { text-align: center }
-</style>
-<title>CEF5CONV</title>
-
-</head>
-<body>
-
-<h1 align="center">CEF5CONV</h1>
-
-<a href="#NAME">NAME</a><br>
-<a href="#SYNOPSIS">SYNOPSIS</a><br>
-<a href="#DESCRIPTION">DESCRIPTION</a><br>
-<a href="#SEE ALSO">SEE ALSO</a><br>
-<a href="#AUTHOR">AUTHOR</a><br>
-
-<hr>
-
-
-<h2>NAME
-<a name="NAME"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">cef5conv
-&minus; convert a TeX document in Big&nbsp;5 encoding
-containing CEF macros into &lsquo;preprocessed&rsquo;
-form.</p>
-
-<h2>SYNOPSIS
-<a name="SYNOPSIS"></a>
-</h2>
-
-
-
-<p style="margin-left:11%; margin-top: 1em"><b>cef5conv</b>
-&lt; <i>infile</i> &gt; <i>outfile</i></p>
-
-<h2>DESCRIPTION
-<a name="DESCRIPTION"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">The <b>Chinese
-Encoding Framework</b> (<b>CEF</b>) developed by Christian
-Wittern &lt;cwittern@conline.central.de&gt; makes it
-possible to include CJK characters in various encodings
-using the SGML macros <b>&amp;CX-aabb;</b> for Big&nbsp;5
-and CNS encoding and <b>&amp;U-aabb;</b> for Unicode
-(<b>X</b> denotes a number between 0 and 7; 0 represents
-Big&nbsp;5 encoding, 1-7 CNS encoding planes 1-7.
-<b>aabb</b> is either a decimal or hexadecimal number).</p>
-
-
-<p style="margin-left:11%; margin-top: 1em"><b>cef5conv</b>
-converts the CEF macros of a Big&nbsp;5 encoded document
-together with the Big5 encoding itself into a form which can
-directly processed with LaTeX&nbsp;2e. It is identical
-to</p>
-
-<p style="margin-left:22%; margin-top: 1em"><b>bg5conv</b>
-&lt; <i>infile</i> | <b>cefconv</b> &gt; <i>outfile</i></p>
-
-<p style="margin-left:11%; margin-top: 1em">This filter is
-part of the <b>CJK</b> macro package for LaTeX&nbsp;2e.</p>
-
-<h2>SEE ALSO
-<a name="SEE ALSO"></a>
-</h2>
-
-
-
-<p style="margin-left:11%; margin-top: 1em"><b>sjisconv</b>(1),
-<b>bg5conv</b>(1), <b>cefconv</b>(1), <b>cefsconv</b>(1),
-<b>extconv</b>(1), <br>
-the <b>CJK</b> documentation files.</p>
-
-<h2>AUTHOR
-<a name="AUTHOR"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">Werner Lemberg
-&lt;wl@gnu.org&gt;</p>
-<hr>
-</body>
-</html>
diff --git a/language/chinese/CJK/cjk-4.8.4/doc/man/html/cefconv.html b/language/chinese/CJK/cjk-4.8.4/doc/man/html/cefconv.html
deleted file mode 100644
index 2d9c9409f4..0000000000
--- a/language/chinese/CJK/cjk-4.8.4/doc/man/html/cefconv.html
+++ /dev/null
@@ -1,91 +0,0 @@
-<!-- Creator : groff version 1.22.3 -->
-<!-- CreationDate: Sat Apr 18 08:52:43 2015 -->
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<meta name="Content-Style" content="text/css">
-<style type="text/css">
- p { margin-top: 0; margin-bottom: 0; vertical-align: top }
- pre { margin-top: 0; margin-bottom: 0; vertical-align: top }
- table { margin-top: 0; margin-bottom: 0; vertical-align: top }
- h1 { text-align: center }
-</style>
-<title>CEFCONV</title>
-
-</head>
-<body>
-
-<h1 align="center">CEFCONV</h1>
-
-<a href="#NAME">NAME</a><br>
-<a href="#SYNOPSIS">SYNOPSIS</a><br>
-<a href="#DESCRIPTION">DESCRIPTION</a><br>
-<a href="#SEE ALSO">SEE ALSO</a><br>
-<a href="#AUTHOR">AUTHOR</a><br>
-
-<hr>
-
-
-<h2>NAME
-<a name="NAME"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">cefconv &minus;
-convert a TeX document containing CEF macros into
-&lsquo;preprocessed&rsquo; form.</p>
-
-<h2>SYNOPSIS
-<a name="SYNOPSIS"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em"><b>cefconv</b>
-&lt; <i>infile</i> &gt; <i>outfile</i></p>
-
-<h2>DESCRIPTION
-<a name="DESCRIPTION"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">The <b>Chinese
-Encoding Framework</b> (<b>CEF</b>) developed by Christian
-Wittern &lt;cwittern@conline.central.de&gt; makes it
-possible to include CJK characters in various encodings
-using the SGML macros <b>&amp;CX-aabb;</b> for Big&nbsp;5
-and CNS encoding and <b>&amp;U-aabb;</b> for Unicode
-(<b>X</b> denotes a number between 0 and 7; 0 represents
-Big&nbsp;5 encoding, 1-7 CNS encoding planes 1-7.
-<b>aabb</b> is either a decimal or hexadecimal number)</p>
-
-<p style="margin-left:11%; margin-top: 1em"><b>cefconv</b>
-converts the CEF macros into a form which can directly
-processed with LaTeX&nbsp;2e.</p>
-
-<p style="margin-left:11%; margin-top: 1em">This filter is
-part of the <b>CJK</b> macro package for LaTeX&nbsp;2e.</p>
-
-<h2>SEE ALSO
-<a name="SEE ALSO"></a>
-</h2>
-
-
-
-<p style="margin-left:11%; margin-top: 1em"><b>sjisconv</b>(1),
-<b>bg5conv</b>(1), <b>cef5conv</b>(1), <b>cefsconv</b>(1),
-<b>extconv</b>(1), <br>
-the <b>CJK</b> documentation files.</p>
-
-<h2>AUTHOR
-<a name="AUTHOR"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">Werner Lemberg
-&lt;wl@gnu.org&gt;</p>
-<hr>
-</body>
-</html>
diff --git a/language/chinese/CJK/cjk-4.8.4/doc/man/html/cefsconv.html b/language/chinese/CJK/cjk-4.8.4/doc/man/html/cefsconv.html
deleted file mode 100644
index 3a474ed4ea..0000000000
--- a/language/chinese/CJK/cjk-4.8.4/doc/man/html/cefsconv.html
+++ /dev/null
@@ -1,98 +0,0 @@
-<!-- Creator : groff version 1.22.3 -->
-<!-- CreationDate: Sat Apr 18 08:52:41 2015 -->
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<meta name="Content-Style" content="text/css">
-<style type="text/css">
- p { margin-top: 0; margin-bottom: 0; vertical-align: top }
- pre { margin-top: 0; margin-bottom: 0; vertical-align: top }
- table { margin-top: 0; margin-bottom: 0; vertical-align: top }
- h1 { text-align: center }
-</style>
-<title>CEFSCONV</title>
-
-</head>
-<body>
-
-<h1 align="center">CEFSCONV</h1>
-
-<a href="#NAME">NAME</a><br>
-<a href="#SYNOPSIS">SYNOPSIS</a><br>
-<a href="#DESCRIPTION">DESCRIPTION</a><br>
-<a href="#SEE ALSO">SEE ALSO</a><br>
-<a href="#AUTHOR">AUTHOR</a><br>
-
-<hr>
-
-
-<h2>NAME
-<a name="NAME"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">cefsconv
-&minus; convert a TeX document in SJIS encoding containing
-CEF macros into &lsquo;preprocessed&rsquo; form.</p>
-
-<h2>SYNOPSIS
-<a name="SYNOPSIS"></a>
-</h2>
-
-
-
-<p style="margin-left:11%; margin-top: 1em"><b>cefsconv</b>
-&lt; <i>infile</i> &gt; <i>outfile</i></p>
-
-<h2>DESCRIPTION
-<a name="DESCRIPTION"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">The <b>Chinese
-Encoding Framework</b> (<b>CEF</b>) developed by Christian
-Wittern &lt;cwittern@conline.central.de&gt; makes it
-possible to include CJK characters in various encodings
-using the SGML macros <b>&amp;CX-aabb;</b> for Big&nbsp;5
-and CNS encoding and <b>&amp;U-aabb;</b> for Unicode
-(<b>X</b> denotes a number between 0 and 7; 0 represents
-Big&nbsp;5 encoding, 1-7 CNS encoding planes 1-7.
-<b>aabb</b> is either a decimal or hexadecimal number).</p>
-
-
-<p style="margin-left:11%; margin-top: 1em"><b>cefsconv</b>
-converts the CEF macros of a SJIS encoded document together
-with the SJIS encoding itself into a form which can directly
-processed with LaTeX&nbsp;2e. It is identical to</p>
-
-
-<p style="margin-left:22%; margin-top: 1em"><b>sjisconv</b>
-&lt; <i>infile</i> | <b>cefconv</b> &gt; <i>outfile</i></p>
-
-<p style="margin-left:11%; margin-top: 1em">This filter is
-part of the <b>CJK</b> macro package for LaTeX&nbsp;2e.</p>
-
-<h2>SEE ALSO
-<a name="SEE ALSO"></a>
-</h2>
-
-
-
-<p style="margin-left:11%; margin-top: 1em"><b>sjisconv</b>(1),
-<b>bg5conv</b>(1), <b>cefconv</b>(1), <b>cef5conv</b>(1),
-<b>extconv</b>(1), <br>
-the <b>CJK</b> documentation files.</p>
-
-<h2>AUTHOR
-<a name="AUTHOR"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">Werner Lemberg
-&lt;wl@gnu.org&gt;</p>
-<hr>
-</body>
-</html>
diff --git a/language/chinese/CJK/cjk-4.8.4/doc/man/html/extconv.html b/language/chinese/CJK/cjk-4.8.4/doc/man/html/extconv.html
deleted file mode 100644
index 7c54dab351..0000000000
--- a/language/chinese/CJK/cjk-4.8.4/doc/man/html/extconv.html
+++ /dev/null
@@ -1,86 +0,0 @@
-<!-- Creator : groff version 1.22.3 -->
-<!-- CreationDate: Sat Apr 18 08:52:33 2015 -->
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<meta name="Content-Style" content="text/css">
-<style type="text/css">
- p { margin-top: 0; margin-bottom: 0; vertical-align: top }
- pre { margin-top: 0; margin-bottom: 0; vertical-align: top }
- table { margin-top: 0; margin-bottom: 0; vertical-align: top }
- h1 { text-align: center }
-</style>
-<title>EXTCONV</title>
-
-</head>
-<body>
-
-<h1 align="center">EXTCONV</h1>
-
-<a href="#NAME">NAME</a><br>
-<a href="#SYNOPSIS">SYNOPSIS</a><br>
-<a href="#DESCRIPTION">DESCRIPTION</a><br>
-<a href="#SEE ALSO">SEE ALSO</a><br>
-<a href="#AUTHOR">AUTHOR</a><br>
-
-<hr>
-
-
-<h2>NAME
-<a name="NAME"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">extconv &minus;
-convert a TeX document in either Big&nbsp;5+ or GBK encoding
-into &lsquo;preprocessed&rsquo; form.</p>
-
-<h2>SYNOPSIS
-<a name="SYNOPSIS"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em"><b>extconv</b>
-&lt; <i>infile</i> &gt; <i>outfile</i></p>
-
-<h2>DESCRIPTION
-<a name="DESCRIPTION"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">Big&nbsp;5+ and
-GBK encodings use the characters {, }, and \ which have
-special meanings in TeX documents.</p>
-
-<p style="margin-left:11%; margin-top: 1em">After
-processing a LaTeX&nbsp;2e document which contains such
-characters with <b>extconv</b> you need not care about these
-special characters.</p>
-
-<p style="margin-left:11%; margin-top: 1em">This filter is
-part of the <b>CJK</b> macro package for LaTeX&nbsp;2e.</p>
-
-<h2>SEE ALSO
-<a name="SEE ALSO"></a>
-</h2>
-
-
-
-<p style="margin-left:11%; margin-top: 1em"><b>bg5conv</b>(1),
-<b>sjisconv</b>(1), <b>cefconv</b>(1), <b>cef5conv</b>(1),
-<b>cefsconv</b>(1), <br>
-the <b>CJK</b> documentation files.</p>
-
-<h2>AUTHOR
-<a name="AUTHOR"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">Werner Lemberg
-&lt;wl@gnu.org&gt;</p>
-<hr>
-</body>
-</html>
diff --git a/language/chinese/CJK/cjk-4.8.4/doc/man/html/hbf2gf.html b/language/chinese/CJK/cjk-4.8.4/doc/man/html/hbf2gf.html
deleted file mode 100644
index 04fefd2d82..0000000000
--- a/language/chinese/CJK/cjk-4.8.4/doc/man/html/hbf2gf.html
+++ /dev/null
@@ -1,648 +0,0 @@
-<!-- Creator : groff version 1.22.3 -->
-<!-- CreationDate: Sat Apr 18 08:52:37 2015 -->
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<meta name="Content-Style" content="text/css">
-<style type="text/css">
- p { margin-top: 0; margin-bottom: 0; vertical-align: top }
- pre { margin-top: 0; margin-bottom: 0; vertical-align: top }
- table { margin-top: 0; margin-bottom: 0; vertical-align: top }
- h1 { text-align: center }
-</style>
-<title>HBF2GF</title>
-
-</head>
-<body>
-
-<h1 align="center">HBF2GF</h1>
-
-<a href="#NAME">NAME</a><br>
-<a href="#SYNOPSIS">SYNOPSIS</a><br>
-<a href="#DESCRIPTION">DESCRIPTION</a><br>
-<a href="#CONFIGURATION FILE">CONFIGURATION FILE</a><br>
-<a href="#FILE SEARCHING">FILE SEARCHING</a><br>
-<a href="#LIMITATIONS">LIMITATIONS</a><br>
-<a href="#SEE ALSO">SEE ALSO</a><br>
-<a href="#FILES">FILES</a><br>
-<a href="#AVAILABILITY">AVAILABILITY</a><br>
-<a href="#AUTHORS">AUTHORS</a><br>
-
-<hr>
-
-
-<h2>NAME
-<a name="NAME"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">hbf2gf &minus;
-convert a CJK bitmap font into subfonts usable by TeX and
-Omega.</p>
-
-<h2>SYNOPSIS
-<a name="SYNOPSIS"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em"><b>hbf2gf</b>
-[<b>&minus;q</b>] <i>configuration-file</i>[<i>.cfg</i>]
-<b><br>
-hbf2gf</b> [<b>&minus;q</b>] [<b>&minus;p</b>]
-[<b>&minus;g</b>] [<b>&minus;n</b>] <i>subfont-name
-x-resolution</i>
-[<i>y-scale&nbsp;</i>|&nbsp;<i>y-resolution</i>] <b><br>
-hbf2gf &minus;t</b> [<b>&minus;q</b>] <i>subfont-name</i>
-<b><br>
-hbf2gf &minus;&minus;version</b> |
-<b>&minus;&minus;help</b></p>
-
-<h2>DESCRIPTION
-<a name="DESCRIPTION"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">CJK bitmap
-fonts can&rsquo;t be directly used with TeX because the
-number of characters in such fonts exceeds&nbsp;256, the
-limit of a TeX font. Thus it is necessary to split these
-fonts into subfonts, and this is exactly what <b>hbf2gf</b>
-does.</p>
-
-<p style="margin-left:11%; margin-top: 1em">As the name
-says, <b>hbf2gf</b> uses CJK fonts in a certain format which
-is called <b>Hanzi Bitmap Font</b> (<b>HBF</b>) format. It
-simply consists of the CJK bitmap file(s) and a text file in
-a format very similar to the BDF format of the X&nbsp;Window
-System which describes the bitmap font files: the encoding,
-the size, etc. The produced GF files can then be converted
-with <b>gftopk</b> into standard PK files.</p>
-
-<p style="margin-left:11%; margin-top: 1em"><b>hbf2gf</b>
-can be called in three modes:</p>
-
-<p style="margin-left:14%; margin-top: 1em"><b>hbf2gf</b>
-[<b>&minus;q</b>] <i>configuration-file</i>[<i>.cfg</i>]</p>
-
-<p style="margin-left:18%; margin-top: 1em">This call
-normally creates a set of GF files, one PL file, and a batch
-file which must be executed after <b>hbf2gf</b> has
-finished. This script will then call <b>gftopk</b> to
-convert all GF files into PK files, and it will call
-<b>pltotf</b> to convert the PL file into a TFM file.
-Finally it will copy the TFM file so that each PK file has
-its TFM file (which are all identical).</p>
-
-<p style="margin-left:18%; margin-top: 1em">If
-<b>ofm_file</b> is set to &lsquo;yes&rsquo; in the
-configuration file, OFM and OVF files will be created
-too.</p>
-
-
-<p style="margin-left:18%; margin-top: 1em"><b>&minus;q</b>
-makes <b>hbf2gf</b> quiet.</p>
-
-<p style="margin-left:14%; margin-top: 1em"><b>hbf2gf</b>
-[<b>&minus;q</b>] [<b>&minus;p</b>] [<b>&minus;g</b>]
-[<b>&minus;n</b>] <i>subfont-name x-resolution</i>
-[<i>y-scale&nbsp;</i>|&nbsp;<i>y-resolution</i>]</p>
-
-<p style="margin-left:18%; margin-top: 1em">This mode is
-intended for use with <b>mktexpk</b> and its derivates. Only
-one GF file together with a PL file for the given subfont
-will be computed, taking the horizontal resolution and a
-vertical scaling factor (if the value is smaller
-than&nbsp;10) resp. the vertical resolution (otherwise) from
-the command line, ignoring the <b>nmb_fonts</b> parameter of
-the configuration file. The last two characters (which are
-interpreted as the subfont number) are stripped to get the
-name for the configuration file (which must end with
-&lsquo;.cfg&rsquo;). No job file will be created. If option
-<b>&minus;p</b> is set, no PL file is created. If
-<b>&minus;g</b> is set, no GF file is created. The extension
-can be controlled with <b>&minus;n</b>; if set, the
-extension is &lsquo;.gf&rsquo;, otherwise
-&lsquo;.&lt;<i>resolution</i>&gt;gf&rsquo;. <b>&minus;q</b>
-makes <b>hbf2gf</b> quiet.</p>
-
-<p style="margin-left:14%; margin-top: 1em"><b>hbf2gf
-&minus;t</b> [<b>&minus;q</b>] <i>subfont-name</i></p>
-
-<p style="margin-left:18%; margin-top: 1em">This mode is
-intended for use with scripts like <b>mktexpk</b>; it tests
-whether the specified subfont name leads to an <b>hbf2gf</b>
-configuration file. It returns 0 on success and prints out
-the name of that configuration file (provided the
-<b>&minus;q</b> switch isn&rsquo;t set). This test
-isn&rsquo;t a thorough one; it only removes the last two
-characters and checks whether a configuration file with that
-name exists.</p>
-
-<p style="margin-left:11%; margin-top: 1em">See the next
-section for more details about configuration files.</p>
-
-<p style="margin-left:11%; margin-top: 1em">Specifying the
-option <b>&minus;&minus;version</b> returns the current
-version of <b>hbf2gf</b> and the used file search library
-(e.g.&nbsp;<b>kpathsea</b>). Usage information is shown with
-the <b>&minus;&minus;help</b> parameter.</p>
-
-<h2>CONFIGURATION FILE
-<a name="CONFIGURATION FILE"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">Here a sample
-configuration file (gsfs14.cfg) for a 56&times;56 Chinese
-font in GB encoding; note that all information about the
-font is in the jfs56.hbf file. See the <b>FILE SEARCHING</b>
-section how HBF fonts and <b>hbf2gf</b> configuration files
-are found. See the <b>AVAILABILITY</b> section where to get
-CJK fonts together with its HBF files:</p>
-
-<p style="margin-left:11%; margin-top: 1em">hbf_header
-jfs56.hbf <br>
-mag_x 1 <br>
-threshold 128 <br>
-comment jianti fansongti 56x56 pixel font</p>
-
-<p style="margin-left:11%; margin-top: 1em">design_size
-14.4</p>
-
-<p style="margin-left:11%; margin-top: 1em">y_offset
-&minus;13</p>
-
-<p style="margin-left:11%; margin-top: 1em">nmb_files
-&minus;1</p>
-
-<p style="margin-left:11%; margin-top: 1em">output_name
-gsfs14</p>
-
-<p style="margin-left:11%; margin-top: 1em">checksum
-123456789</p>
-
-<p style="margin-left:11%; margin-top: 1em">dpi_x 300</p>
-
-<p style="margin-left:11%; margin-top: 1em">pk_files no
-<br>
-tfm_files yes</p>
-
-<p style="margin-left:11%; margin-top: 1em">coding
-codingscheme GuoBiao encoded TeX text</p>
-
-<p style="margin-left:11%; margin-top: 1em">pk_directory
-$HBF_TARGET/pk/modeless/gb2312/gsfs14/ <br>
-tfm_directory $HBF_TARGET/tfm/gb2312/gsfs14/</p>
-
-<p style="margin-left:11%; margin-top: 1em">A configuration
-file is a plain text file consisting of keywords and its
-arguments. A keyword must start a line, otherwise the whole
-line will be ignored. If the word starting a line is not a
-keyword, the line will be ignored too. Empty lines will also
-be skipped. The search for keywords is case insensitive; in
-contrast, the arguments will be taken exactly as given
-(except &lsquo;yes&rsquo; and &lsquo;no&rsquo; which can be
-written with uppercase or lowercase letters). Each keyword
-has one argument which must be separated by whitespace
-(blanks or tabs) from the keyword and must be on the same
-line. Each line must not be longer than 256 characters.</p>
-
-<p style="margin-left:11%; margin-top: 1em">You can use
-environment variables in the configuration file. The escape
-character starting an environment variable in the
-configuration file is always &lsquo;$&rsquo;, even for
-operating systems like DOS which has other conventions.
-<b>hbf2gf</b> recognizes only environment variable names
-which start with a letter or an underscore, followed by
-alphanumeric characters or underscores. You can surround the
-variable with braces to indicate where the variable name
-ends, for example ${FOO}. To get a dollar sign you must
-write &lsquo;$$&rsquo;. The expansion of environment
-variables in hbf2gf itself (without the help of either
-kpathsea, emtexdir, or MiKTeX searching routines) is very
-limited; this feature has been carried over from previous
-versions. It can&rsquo;t expand variables set in texmf.cnf;
-it also can&rsquo;t handle more than one directory as the
-variable&rsquo;s value. <b>Don&rsquo;t use it except for the
-&lsquo;pk_directory&rsquo; and &lsquo;tfm_directory&rsquo;
-parameters!</b></p>
-
-<p style="margin-left:11%; margin-top: 1em">This is the
-list of all necessary keywords: <b><br>
-hbf_header</b></p>
-
-<p style="margin-left:22%;">The HBF header file name of the
-input font(s). <b>hbf2gf</b> uses the given searching
-mechanism (kpathsea, emtexdir, or MiKTeX) to locate this
-file.</p>
-
-<p style="margin-left:11%;"><b>output_name</b></p>
-
-<p style="margin-left:22%;">The name stem of the output
-files. A running two digit decimal number starting with
-&lsquo;01&rsquo; will be appended. For Unicode fonts see the
-keyword <b>unicode</b> below. This value is in almost all
-cases identical to the name of the configuration file.</p>
-
-<p style="margin-left:11%; margin-top: 1em">And now all
-optional keywords: <b><br>
-x_offset</b></p>
-
-<p style="margin-left:22%;">Increases the character width.
-Will be applied on both sides; default for non-rotated
-glyphs is the value given in the HBF header
-(<b>HBF_BITMAP_BOUNDING_BOX</b>) scaled to
-<b>design_size</b> (in pixels).</p>
-
-<p style="margin-left:11%;"><b>y_offset</b></p>
-
-<p style="margin-left:22%;">Shifts all characters up or
-down; default for non-rotated glyphs is the value given in
-the HBF header (<b>HBF_BITMAP_BOUNDING_BOX</b>) scaled to
-<b>design_size</b> (in pixels).</p>
-
-<p style="margin-left:11%;"><b>design_size</b></p>
-
-<p style="margin-left:22%;">The design size (in points) of
-the font. <b>x_offset</b> and <b>y_offset</b> refer to this
-size. Default is&nbsp;10.0.</p>
-
-<table width="100%" border="0" rules="none" frame="void"
- cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="7%">
-
-
-<p><b>slant</b></p></td>
-<td width="4%"></td>
-<td width="78%">
-
-
-<p>The slant of the font (given as
-Delta_x&nbsp;/&nbsp;Delta_y). Only values in the range
-0&nbsp;&le;&nbsp;<b>slant&nbsp;</b>&le;&nbsp;1 are allowed.
-Default is&nbsp;0.0.</p></td></tr>
-</table>
-
-<p style="margin-left:11%;"><b>rotation</b></p>
-
-<p style="margin-left:22%;">If set to &lsquo;yes&rsquo;,
-all glyphs will be rotated 90&nbsp;degrees
-counter-clockwise. The default offsets as given in the HBF
-header will be ignored (and set to&nbsp;0). Default is
-&lsquo;no&rsquo;.</p>
-
-<table width="100%" border="0" rules="none" frame="void"
- cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="7%">
-
-
-<p><b>mag_x</b></p></td>
-<td width="4%"></td>
-<td width="78%">
-</td></tr>
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="7%">
-
-
-<p><b>mag_y</b></p></td>
-<td width="4%"></td>
-<td width="78%">
-
-
-<p>Scaling values of the characters to reach design size.
-If only one magnification is given, x and y values are
-assumed to be equal. Default is
-<b>mag_x&nbsp;</b>=&nbsp;<b>mag_y&nbsp;</b>=&nbsp;1.0.</p> </td></tr>
-</table>
-
-<p style="margin-left:11%;"><b>threshold</b></p>
-
-<p style="margin-left:22%;">A value between 1 and&nbsp;254
-defining a threshold for converting the internal graymap
-into the output bitmap; lower values cut more pixels.
-Default value is&nbsp;128.</p>
-
-<p style="margin-left:11%;"><b>comment</b></p>
-
-<p style="margin-left:22%;">A comment describing the font;
-default is none.</p>
-
-<p style="margin-left:11%;"><b>nmb_fonts</b></p>
-
-<p style="margin-left:22%;">The number of subfonts to
-create. Default value is &minus;1 for creating all
-fonts.</p>
-
-<p style="margin-left:11%;"><b>unicode</b></p>
-
-<p style="margin-left:22%;">If &lsquo;yes&rsquo;, a two
-digit hexadecimal number will be used as a running number,
-starting with the value of the first byte of the first code
-range. Default is &lsquo;no&rsquo;.</p>
-
-<p style="margin-left:11%;"><b>min_char</b></p>
-
-<p style="margin-left:22%;">The minimum value of the
-encoding. You should set this value to get correct subfile
-offsets if it is not identical to the lowest character code
-in the HBF file.</p>
-
-<table width="100%" border="0" rules="none" frame="void"
- cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="7%">
-
-
-<p><b>dpi_x</b></p></td>
-<td width="4%"></td>
-<td width="78%">
-</td></tr>
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="7%">
-
-
-<p><b>dpi_y</b></p></td>
-<td width="4%"></td>
-<td width="78%">
-
-
-<p>The horizontal and vertical resolution (in dpi) of the
-printer. If only one resolution is given, x and y values are
-assumed to be equal. Default is&nbsp;300.</p></td></tr>
-</table>
-
-<p style="margin-left:11%;"><b>checksum</b></p>
-
-<p style="margin-left:22%;">A checksum to identify the GF
-files with the appropriate TFM files. The default value of
-this unsigned 32bit integer is&nbsp;0.</p>
-
-<table width="100%" border="0" rules="none" frame="void"
- cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="9%">
-
-
-<p><b>coding</b></p></td>
-<td width="2%"></td>
-<td width="78%">
-
-
-<p>A comment describing the coding scheme; default is
-none.</p> </td></tr>
-</table>
-
-<p style="margin-left:11%;"><b>pk_directory</b></p>
-
-<p style="margin-left:22%;">The destination directory of
-the PK files; default: none. Attention! The batch file will
-not check whether this directory exists.</p>
-
-<p style="margin-left:11%;"><b>tfm_directory</b></p>
-
-<p style="margin-left:22%;">The destination directory of
-the TFM files; default: none. Attention! The batch file will
-not check whether this directory exists.</p>
-
-<p style="margin-left:11%;"><b>pk_files</b></p>
-
-<p style="margin-left:22%;">Whether to create PK files or
-not; default is &lsquo;yes&rsquo;.</p>
-
-<p style="margin-left:11%;"><b>tfm_files</b></p>
-
-<p style="margin-left:22%;">Whether to create TFM files or
-not; default is &lsquo;yes&rsquo;.</p>
-
-<p style="margin-left:11%;"><b>ofm_file</b></p>
-
-<p style="margin-left:22%;">Whether to create an OPL file
-or not; default is &lsquo;no&rsquo;. The batch file will
-then use <b>ovp2ovf</b> of the Omega distribution to convert
-it into an OFM and an OVF file. The OPL file simply maps all
-subfonts back to a single Omega font.</p>
-
-<p style="margin-left:11%;"><b>long_extension</b></p>
-
-<p style="margin-left:22%;">If &lsquo;yes&rsquo;, PK files
-will include the resolution in the extension (e.g.
-gsso1201.300pk). This affects the batch file only (default
-is &lsquo;yes&rsquo;).</p>
-
-<p style="margin-left:11%;"><b>rm_command</b></p>
-
-<p style="margin-left:22%;">The shell command to remove
-files; default: &lsquo;rm&rsquo;.</p>
-
-<p style="margin-left:11%;"><b>cp_command</b></p>
-
-<p style="margin-left:22%;">The shell command to copy
-files; default: &lsquo;cp&rsquo;.</p>
-
-<p style="margin-left:11%;"><b>job_extension</b></p>
-
-<p style="margin-left:22%;">The extension of the batch file
-which calls <b>gftopk</b> and <b>pltotf</b> to convert the
-GF and the PL files into PK and TFM files respectively;
-default is none.</p>
-
-<h2>FILE SEARCHING
-<a name="FILE SEARCHING"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em"><b>hbf2gf</b>
-uses either the <b>kpathsea</b>, <b>emtexdir</b>, or
-<b>MiKTeX</b> library for searching files (<b>emtexdir</b>
-will work only on operating systems which have an MS-DOSish
-background, i.e., MS-DOS, OS/2, Windows; <b>MiKTeX</b> is
-for Win32 systems).</p>
-
-
-<p style="margin-left:11%; margin-top: 1em"><b>kpathsea</b>
-<br>
-The actual version of kpathsea is displayed on screen if you
-call <b>hbf2gf &minus;&minus;version</b>.</p>
-
-<p style="margin-left:11%; margin-top: 1em">Here is a table
-of the file type and the corresponding <b>kpathsea</b>
-variables.</p>
-
-<p style="margin-left:17%; margin-top: 1em">.hbf MISCFONTS
-<br>
-.cfg HBF2GFINPUTS</p>
-
-<p style="margin-left:11%; margin-top: 1em">Please consult
-the info files of <b>kpathsea</b> for details on these
-variables. The decision which naming scheme to use for
-variables will be done during compilation.</p>
-
-<p style="margin-left:11%; margin-top: 1em">You should set
-the TEXMFCNF variable to the directory where your texmf.cnf
-configuration file resides.</p>
-
-<p style="margin-left:11%; margin-top: 1em">Here is the
-proper command to find out to which value a <b>kpathsea</b>
-variable is set (we use MISCFONTS as an example). This is
-especially useful if a variable isn&rsquo;t set in texmf.cnf
-or in the environment, thus pointing to the default value
-which is hard-coded into the <b>kpathsea</b> library.</p>
-
-<p style="margin-left:14%; margin-top: 1em">kpsewhich
-&minus;progname=hbf2gf
-&minus;expand&minus;var=&rsquo;$MISCFONTS&rsquo;</p>
-
-<p style="margin-left:11%; margin-top: 1em">We select the
-program name also since it is possible to specify variables
-which are searched only for a certain program &ndash; in our
-example it would be MISCFONTS.hbf2gf.</p>
-
-<p style="margin-left:11%; margin-top: 1em">A similar but
-not identical method is to say</p>
-
-<p style="margin-left:14%; margin-top: 1em">kpsewhich
-&minus;progname=hbf2gf &minus;show&minus;path=&rsquo;misc
-fonts&rsquo;</p>
-
-<p style="margin-left:11%; margin-top: 1em">[A full list of
-format types can be obtained by saying &lsquo;kpsewhich
-&minus;&minus;help&rsquo; on the command line prompt.] This
-is exactly how <b>hbf2gf</b> searches for files; the
-disadvantage is that all variables are expanded which can
-cause very long strings.</p>
-
-
-<p style="margin-left:11%; margin-top: 1em"><b>emtexdir</b>
-<br>
-Here the list of suffixes and its related environment
-variables to be set in autoexec.bat (resp. in config.sys for
-OS/2):</p>
-
-<p style="margin-left:17%; margin-top: 1em">.hbf HBFONTS
-<br>
-.cfg HBFCFG</p>
-
-<p style="margin-left:11%; margin-top: 1em">If one of the
-variables isn&rsquo;t set, a warning message is emitted. The
-current directory will always be searched. As usual, one
-exclamation mark appended to a directory path causes
-subdirectories one level deep to be searched, two
-exclamation marks causes all subdirectories to be searched.
-Example:</p>
-
-
-<p style="margin-left:14%; margin-top: 1em">HBFONTS=c:\fonts\hbf!!;d:\myfonts\hbf!</p>
-
-<p style="margin-left:11%; margin-top: 1em">Constructions
-like &lsquo;c:\fonts!!\hbf&rsquo; aren&rsquo;t possible.</p>
-
-<p style="margin-left:11%; margin-top: 1em"><b>MikTeX</b>
-<br>
-Please consult the documentation files of <b>MiKTeX</b> for
-more details.</p>
-
-<h2>LIMITATIONS
-<a name="LIMITATIONS"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">The x and y
-output size must not exceed <b>MAX_CHAR_SIZE</b>, which is
-defined at compile time; its default value is
-1023&nbsp;(pixel).</p>
-
-<h2>SEE ALSO
-<a name="SEE ALSO"></a>
-</h2>
-
-
-
-<p style="margin-left:11%; margin-top: 1em"><b>ttf2pk</b>(1)</p>
-
-<p style="margin-left:11%; margin-top: 1em">hbf2gf.w: this
-is the source code written in <b>CWEB</b> which can be
-converted into a pretty-printed TeX document using
-<b>cweave</b>. The CJK package also contains a preformatted
-hbf2gf.pdf file.</p>
-
-<p style="margin-left:11%; margin-top: 1em">the <b>CJK</b>
-documentation files (hbf2gf.txt).</p>
-
-<p style="margin-left:11%; margin-top: 1em">the <b>Hanzi
-Bitmap File</b> (<b>HBF</b>) standard version&nbsp;1.3;
-available at ftp.ifcss.org.</p>
-
-<p style="margin-left:11%; margin-top: 1em">the Omega
-documentation available at ftp.ens.fr and the CTAN hosts and
-mirrors.</p>
-
-<h2>FILES
-<a name="FILES"></a>
-</h2>
-
-
-<table width="100%" border="0" rules="none" frame="void"
- cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="7%">
-
-
-<p style="margin-top: 1em">*.cfg</p></td>
-<td width="4%"></td>
-<td width="78%">
-
-
-<p style="margin-top: 1em">The <b>hbf2gf</b> configuration
-scripts.</p> </td></tr>
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="7%">
-
-
-<p>*.hbf</p></td>
-<td width="4%"></td>
-<td width="78%">
-
-
-<p>HBF header files which describe fixed-width bitmap
-fonts. Note that the bitmap font name(s) themselves as
-specified in the header files are irrelevant for
-<b>hbf2gf</b>.</p> </td></tr>
-</table>
-
-<h2>AVAILABILITY
-<a name="AVAILABILITY"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em"><b>hbf2gf</b>
-is part of the CJK macro package for LaTeX&nbsp;2e available
-at the CTAN hosts and its mirrors.</p>
-
-<p style="margin-left:11%; margin-top: 1em">CJK fonts
-together with HBF header files can be found at ftp.ifcss.org
-and its mirrors.</p>
-
-<h2>AUTHORS
-<a name="AUTHORS"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">Werner Lemberg
-&lt;wl@gnu.org&gt; <br>
-Ross Paterson (the HBF API) &lt;ross@soi.city.ac.uk&gt;</p>
-<hr>
-</body>
-</html>
diff --git a/language/chinese/CJK/cjk-4.8.4/doc/man/html/sjisconv.html b/language/chinese/CJK/cjk-4.8.4/doc/man/html/sjisconv.html
deleted file mode 100644
index 67fa1ac2e1..0000000000
--- a/language/chinese/CJK/cjk-4.8.4/doc/man/html/sjisconv.html
+++ /dev/null
@@ -1,87 +0,0 @@
-<!-- Creator : groff version 1.22.3 -->
-<!-- CreationDate: Sat Apr 18 08:52:35 2015 -->
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta name="generator" content="groff -Thtml, see www.gnu.org">
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<meta name="Content-Style" content="text/css">
-<style type="text/css">
- p { margin-top: 0; margin-bottom: 0; vertical-align: top }
- pre { margin-top: 0; margin-bottom: 0; vertical-align: top }
- table { margin-top: 0; margin-bottom: 0; vertical-align: top }
- h1 { text-align: center }
-</style>
-<title>SJISCONV</title>
-
-</head>
-<body>
-
-<h1 align="center">SJISCONV</h1>
-
-<a href="#NAME">NAME</a><br>
-<a href="#SYNOPSIS">SYNOPSIS</a><br>
-<a href="#DESCRIPTION">DESCRIPTION</a><br>
-<a href="#SEE ALSO">SEE ALSO</a><br>
-<a href="#AUTHOR">AUTHOR</a><br>
-
-<hr>
-
-
-<h2>NAME
-<a name="NAME"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">sjisconv
-&minus; convert a TeX document in SJIS encoding into
-&lsquo;preprocessed&rsquo; form.</p>
-
-<h2>SYNOPSIS
-<a name="SYNOPSIS"></a>
-</h2>
-
-
-
-<p style="margin-left:11%; margin-top: 1em"><b>sjisconv</b>
-&lt; <i>infile</i> &gt; <i>outfile</i></p>
-
-<h2>DESCRIPTION
-<a name="DESCRIPTION"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">SJIS encoding
-for Japanese uses the characters {, }, and \ which have
-special meanings in TeX documents.</p>
-
-<p style="margin-left:11%; margin-top: 1em">After
-processing a LaTeX&nbsp;2e document which contains SJIS
-characters with <b>sjisconv</b> you need not care about
-these special characters.</p>
-
-<p style="margin-left:11%; margin-top: 1em">This filter is
-part of the <b>CJK</b> macro package for LaTeX&nbsp;2e.</p>
-
-<h2>SEE ALSO
-<a name="SEE ALSO"></a>
-</h2>
-
-
-
-<p style="margin-left:11%; margin-top: 1em"><b>bg5conv</b>(1),
-<b>cefconv</b>(1), <b>cef5conv</b>(1), <b>cefsconv</b>(1),
-<b>extconv</b>(1), <br>
-the <b>CJK</b> documentation files.</p>
-
-<h2>AUTHOR
-<a name="AUTHOR"></a>
-</h2>
-
-
-<p style="margin-left:11%; margin-top: 1em">Werner Lemberg
-&lt;wl@gnu.org&gt;</p>
-<hr>
-</body>
-</html>
diff --git a/language/chinese/CJK/cjk-4.8.4/doc/man/pdf/bg5conv.pdf b/language/chinese/CJK/cjk-4.8.4/doc/man/pdf/bg5conv.pdf
deleted file mode 100644
index 4f49986916..0000000000
--- a/language/chinese/CJK/cjk-4.8.4/doc/man/pdf/bg5conv.pdf
+++ /dev/null
Binary files differ
diff --git a/language/chinese/CJK/cjk-4.8.4/doc/man/pdf/cef5conv.pdf b/language/chinese/CJK/cjk-4.8.4/doc/man/pdf/cef5conv.pdf
deleted file mode 100644
index bbfa683627..0000000000
--- a/language/chinese/CJK/cjk-4.8.4/doc/man/pdf/cef5conv.pdf
+++ /dev/null
Binary files differ
diff --git a/language/chinese/CJK/cjk-4.8.4/doc/man/pdf/cefconv.pdf b/language/chinese/CJK/cjk-4.8.4/doc/man/pdf/cefconv.pdf
deleted file mode 100644
index c62a32ea00..0000000000
--- a/language/chinese/CJK/cjk-4.8.4/doc/man/pdf/cefconv.pdf
+++ /dev/null
Binary files differ
diff --git a/language/chinese/CJK/cjk-4.8.4/doc/man/pdf/cefsconv.pdf b/language/chinese/CJK/cjk-4.8.4/doc/man/pdf/cefsconv.pdf
deleted file mode 100644
index f4dfcd5bd0..0000000000
--- a/language/chinese/CJK/cjk-4.8.4/doc/man/pdf/cefsconv.pdf
+++ /dev/null
Binary files differ
diff --git a/language/chinese/CJK/cjk-4.8.4/doc/man/pdf/extconv.pdf b/language/chinese/CJK/cjk-4.8.4/doc/man/pdf/extconv.pdf
deleted file mode 100644
index a644014bec..0000000000
--- a/language/chinese/CJK/cjk-4.8.4/doc/man/pdf/extconv.pdf
+++ /dev/null
Binary files differ
diff --git a/language/chinese/CJK/cjk-4.8.4/doc/man/pdf/hbf2gf.pdf b/language/chinese/CJK/cjk-4.8.4/doc/man/pdf/hbf2gf.pdf
deleted file mode 100644
index 7e5b7d3800..0000000000
--- a/language/chinese/CJK/cjk-4.8.4/doc/man/pdf/hbf2gf.pdf
+++ /dev/null
Binary files differ
diff --git a/language/chinese/CJK/cjk-4.8.4/doc/man/pdf/sjisconv.pdf b/language/chinese/CJK/cjk-4.8.4/doc/man/pdf/sjisconv.pdf
deleted file mode 100644
index f4f77c6052..0000000000
--- a/language/chinese/CJK/cjk-4.8.4/doc/man/pdf/sjisconv.pdf
+++ /dev/null
Binary files differ
diff --git a/language/chinese/CJK/cjk-4.8.4/doc/man/txt/bg5conv.txt b/language/chinese/CJK/cjk-4.8.4/doc/man/txt/bg5conv.txt
deleted file mode 100644
index 2efd5ab1e2..0000000000
--- a/language/chinese/CJK/cjk-4.8.4/doc/man/txt/bg5conv.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-BG5CONV(1) General Commands Manual BG5CONV(1)
-
-
-
-NAME
- bg5conv - convert a TeX document in Big 5 encoding into `preprocessed'
- form.
-
-SYNOPSIS
- bg5conv < infile > outfile
-
-DESCRIPTION
- Big 5 encoding for traditional Chinese uses the characters {, }, and \
- which have special meanings in TeX documents.
-
- After processing a LaTeX 2e document which contains Big 5 characters
- with bg5conv you need not care about these special characters.
-
- This filter is part of the CJK macro package for LaTeX 2e.
-
-SEE ALSO
- sjisconv(1), cefconv(1), cef5conv(1), cefsconv(1), extconv(1),
- the CJK documentation files.
-
-AUTHOR
- Werner Lemberg <wl@gnu.org>
-
-
-
-CJK Version 4.8.4 18-Apr-2015 BG5CONV(1)
diff --git a/language/chinese/CJK/cjk-4.8.4/doc/man/txt/cef5conv.txt b/language/chinese/CJK/cjk-4.8.4/doc/man/txt/cef5conv.txt
deleted file mode 100644
index d749edeeb1..0000000000
--- a/language/chinese/CJK/cjk-4.8.4/doc/man/txt/cef5conv.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-CEF5CONV(1) General Commands Manual CEF5CONV(1)
-
-
-
-NAME
- cef5conv - convert a TeX document in Big 5 encoding containing CEF
- macros into `preprocessed' form.
-
-SYNOPSIS
- cef5conv < infile > outfile
-
-DESCRIPTION
- The Chinese Encoding Framework (CEF) developed by Christian Wittern
- <cwittern@conline.central.de> makes it possible to include CJK charac-
- ters in various encodings using the SGML macros &CX-aabb; for Big 5 and
- CNS encoding and &U-aabb; for Unicode (X denotes a number between 0 and
- 7; 0 represents Big 5 encoding, 1-7 CNS encoding planes 1-7. aabb is
- either a decimal or hexadecimal number).
-
- cef5conv converts the CEF macros of a Big 5 encoded document together
- with the Big5 encoding itself into a form which can directly processed
- with LaTeX 2e. It is identical to
-
- bg5conv < infile | cefconv > outfile
-
- This filter is part of the CJK macro package for LaTeX 2e.
-
-SEE ALSO
- sjisconv(1), bg5conv(1), cefconv(1), cefsconv(1), extconv(1),
- the CJK documentation files.
-
-AUTHOR
- Werner Lemberg <wl@gnu.org>
-
-
-
-CJK Version 4.8.4 18-Apr-2015 CEF5CONV(1)
diff --git a/language/chinese/CJK/cjk-4.8.4/doc/man/txt/cefconv.txt b/language/chinese/CJK/cjk-4.8.4/doc/man/txt/cefconv.txt
deleted file mode 100644
index 87e942e451..0000000000
--- a/language/chinese/CJK/cjk-4.8.4/doc/man/txt/cefconv.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-CEFCONV(1) General Commands Manual CEFCONV(1)
-
-
-
-NAME
- cefconv - convert a TeX document containing CEF macros into `prepro-
- cessed' form.
-
-SYNOPSIS
- cefconv < infile > outfile
-
-DESCRIPTION
- The Chinese Encoding Framework (CEF) developed by Christian Wittern
- <cwittern@conline.central.de> makes it possible to include CJK charac-
- ters in various encodings using the SGML macros &CX-aabb; for Big 5 and
- CNS encoding and &U-aabb; for Unicode (X denotes a number between 0 and
- 7; 0 represents Big 5 encoding, 1-7 CNS encoding planes 1-7. aabb is
- either a decimal or hexadecimal number)
-
- cefconv converts the CEF macros into a form which can directly pro-
- cessed with LaTeX 2e.
-
- This filter is part of the CJK macro package for LaTeX 2e.
-
-SEE ALSO
- sjisconv(1), bg5conv(1), cef5conv(1), cefsconv(1), extconv(1),
- the CJK documentation files.
-
-AUTHOR
- Werner Lemberg <wl@gnu.org>
-
-
-
-CJK Version 4.8.4 18-Apr-2015 CEFCONV(1)
diff --git a/language/chinese/CJK/cjk-4.8.4/doc/man/txt/cefsconv.txt b/language/chinese/CJK/cjk-4.8.4/doc/man/txt/cefsconv.txt
deleted file mode 100644
index 5484c61f60..0000000000
--- a/language/chinese/CJK/cjk-4.8.4/doc/man/txt/cefsconv.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-CEFSCONV(1) General Commands Manual CEFSCONV(1)
-
-
-
-NAME
- cefsconv - convert a TeX document in SJIS encoding containing CEF
- macros into `preprocessed' form.
-
-SYNOPSIS
- cefsconv < infile > outfile
-
-DESCRIPTION
- The Chinese Encoding Framework (CEF) developed by Christian Wittern
- <cwittern@conline.central.de> makes it possible to include CJK charac-
- ters in various encodings using the SGML macros &CX-aabb; for Big 5 and
- CNS encoding and &U-aabb; for Unicode (X denotes a number between 0 and
- 7; 0 represents Big 5 encoding, 1-7 CNS encoding planes 1-7. aabb is
- either a decimal or hexadecimal number).
-
- cefsconv converts the CEF macros of a SJIS encoded document together
- with the SJIS encoding itself into a form which can directly processed
- with LaTeX 2e. It is identical to
-
- sjisconv < infile | cefconv > outfile
-
- This filter is part of the CJK macro package for LaTeX 2e.
-
-SEE ALSO
- sjisconv(1), bg5conv(1), cefconv(1), cef5conv(1), extconv(1),
- the CJK documentation files.
-
-AUTHOR
- Werner Lemberg <wl@gnu.org>
-
-
-
-CJK Version 4.8.4 18-Apr-2015 CEFSCONV(1)
diff --git a/language/chinese/CJK/cjk-4.8.4/doc/man/txt/extconv.txt b/language/chinese/CJK/cjk-4.8.4/doc/man/txt/extconv.txt
deleted file mode 100644
index 60eb1ebad7..0000000000
--- a/language/chinese/CJK/cjk-4.8.4/doc/man/txt/extconv.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-EXTCONV(1) General Commands Manual EXTCONV(1)
-
-
-
-NAME
- extconv - convert a TeX document in either Big 5+ or GBK encoding into
- `preprocessed' form.
-
-SYNOPSIS
- extconv < infile > outfile
-
-DESCRIPTION
- Big 5+ and GBK encodings use the characters {, }, and \ which have spe-
- cial meanings in TeX documents.
-
- After processing a LaTeX 2e document which contains such characters
- with extconv you need not care about these special characters.
-
- This filter is part of the CJK macro package for LaTeX 2e.
-
-SEE ALSO
- bg5conv(1), sjisconv(1), cefconv(1), cef5conv(1), cefsconv(1),
- the CJK documentation files.
-
-AUTHOR
- Werner Lemberg <wl@gnu.org>
-
-
-
-CJK Version 4.8.4 18-Apr-2015 EXTCONV(1)
diff --git a/language/chinese/CJK/cjk-4.8.4/doc/man/txt/hbf2gf.txt b/language/chinese/CJK/cjk-4.8.4/doc/man/txt/hbf2gf.txt
deleted file mode 100644
index 3f77fc6eaf..0000000000
--- a/language/chinese/CJK/cjk-4.8.4/doc/man/txt/hbf2gf.txt
+++ /dev/null
@@ -1,351 +0,0 @@
-HBF2GF(1) General Commands Manual HBF2GF(1)
-
-
-
-NAME
- hbf2gf - convert a CJK bitmap font into subfonts usable by TeX and
- Omega.
-
-SYNOPSIS
- hbf2gf [-q] configuration-file[.cfg]
- hbf2gf [-q] [-p] [-g] [-n] subfont-name x-resolution
- [y-scale | y-resolution]
- hbf2gf -t [-q] subfont-name
- hbf2gf --version | --help
-
-DESCRIPTION
- CJK bitmap fonts can't be directly used with TeX because the number of
- characters in such fonts exceeds 256, the limit of a TeX font. Thus it
- is necessary to split these fonts into subfonts, and this is exactly
- what hbf2gf does.
-
- As the name says, hbf2gf uses CJK fonts in a certain format which is
- called Hanzi Bitmap Font (HBF) format. It simply consists of the CJK
- bitmap file(s) and a text file in a format very similar to the BDF for-
- mat of the X Window System which describes the bitmap font files: the
- encoding, the size, etc. The produced GF files can then be converted
- with gftopk into standard PK files.
-
- hbf2gf can be called in three modes:
-
- hbf2gf [-q] configuration-file[.cfg]
-
- This call normally creates a set of GF files, one PL file, and a
- batch file which must be executed after hbf2gf has finished. This
- script will then call gftopk to convert all GF files into PK
- files, and it will call pltotf to convert the PL file into a TFM
- file. Finally it will copy the TFM file so that each PK file has
- its TFM file (which are all identical).
-
- If ofm_file is set to `yes' in the configuration file, OFM and OVF
- files will be created too.
-
- -q makes hbf2gf quiet.
-
- hbf2gf [-q] [-p] [-g] [-n] subfont-name x-resolution
- [y-scale | y-resolution]
-
- This mode is intended for use with mktexpk and its derivates. On-
- ly one GF file together with a PL file for the given subfont will
- be computed, taking the horizontal resolution and a vertical scal-
- ing factor (if the value is smaller than 10) resp. the vertical
- resolution (otherwise) from the command line, ignoring the
- nmb_fonts parameter of the configuration file. The last two char-
- acters (which are interpreted as the subfont number) are stripped
- to get the name for the configuration file (which must end with
- `.cfg'). No job file will be created. If option -p is set, no PL
- file is created. If -g is set, no GF file is created. The exten-
- sion can be controlled with -n; if set, the extension is `.gf',
- otherwise `.<resolution>gf'. -q makes hbf2gf quiet.
-
- hbf2gf -t [-q] subfont-name
-
- This mode is intended for use with scripts like mktexpk; it tests
- whether the specified subfont name leads to an hbf2gf configura-
- tion file. It returns 0 on success and prints out the name of
- that configuration file (provided the -q switch isn't set). This
- test isn't a thorough one; it only removes the last two characters
- and checks whether a configuration file with that name exists.
-
- See the next section for more details about configuration files.
-
- Specifying the option --version returns the current version of hbf2gf
- and the used file search library (e.g. kpathsea). Usage information is
- shown with the --help parameter.
-
-CONFIGURATION FILE
- Here a sample configuration file (gsfs14.cfg) for a 5656 Chinese font
- in GB encoding; note that all information about the font is in the
- jfs56.hbf file. See the FILE SEARCHING section how HBF fonts and
- hbf2gf configuration files are found. See the AVAILABILITY section
- where to get CJK fonts together with its HBF files:
-
- hbf_header jfs56.hbf
- mag_x 1
- threshold 128
- comment jianti fansongti 56x56 pixel font
-
- design_size 14.4
-
- y_offset -13
-
- nmb_files -1
-
- output_name gsfs14
-
- checksum 123456789
-
- dpi_x 300
-
- pk_files no
- tfm_files yes
-
- coding codingscheme GuoBiao encoded TeX text
-
- pk_directory $HBF_TARGET/pk/modeless/gb2312/gsfs14/
- tfm_directory $HBF_TARGET/tfm/gb2312/gsfs14/
-
- A configuration file is a plain text file consisting of keywords and
- its arguments. A keyword must start a line, otherwise the whole line
- will be ignored. If the word starting a line is not a keyword, the
- line will be ignored too. Empty lines will also be skipped. The
- search for keywords is case insensitive; in contrast, the arguments
- will be taken exactly as given (except `yes' and `no' which can be
- written with uppercase or lowercase letters). Each keyword has one ar-
- gument which must be separated by whitespace (blanks or tabs) from the
- keyword and must be on the same line. Each line must not be longer
- than 256 characters.
-
- You can use environment variables in the configuration file. The es-
- cape character starting an environment variable in the configuration
- file is always `$', even for operating systems like DOS which has other
- conventions. hbf2gf recognizes only environment variable names which
- start with a letter or an underscore, followed by alphanumeric charac-
- ters or underscores. You can surround the variable with braces to in-
- dicate where the variable name ends, for example ${FOO}. To get a dol-
- lar sign you must write `$$'. The expansion of environment variables
- in hbf2gf itself (without the help of either kpathsea, emtexdir, or
- MiKTeX searching routines) is very limited; this feature has been car-
- ried over from previous versions. It can't expand variables set in
- texmf.cnf; it also can't handle more than one directory as the vari-
- able's value. Don't use it except for the `pk_directory' and `tfm_di-
- rectory' parameters!
-
- This is the list of all necessary keywords:
-
- hbf_header
- The HBF header file name of the input font(s). hbf2gf uses the
- given searching mechanism (kpathsea, emtexdir, or MiKTeX) to lo-
- cate this file.
-
- output_name
- The name stem of the output files. A running two digit decimal
- number starting with `01' will be appended. For Unicode fonts
- see the keyword unicode below. This value is in almost all cas-
- es identical to the name of the configuration file.
-
- And now all optional keywords:
-
- x_offset
- Increases the character width. Will be applied on both sides;
- default for non-rotated glyphs is the value given in the HBF
- header (HBF_BITMAP_BOUNDING_BOX) scaled to design_size (in pix-
- els).
-
- y_offset
- Shifts all characters up or down; default for non-rotated glyphs
- is the value given in the HBF header (HBF_BITMAP_BOUNDING_BOX)
- scaled to design_size (in pixels).
-
- design_size
- The design size (in points) of the font. x_offset and y_offset
- refer to this size. Default is 10.0.
-
- slant The slant of the font (given as Delta_x / Delta_y). Only values
- in the range 0 <= slant <= 1 are allowed. Default is 0.0.
-
- rotation
- If set to `yes', all glyphs will be rotated 90 degrees counter-
- clockwise. The default offsets as given in the HBF header will
- be ignored (and set to 0). Default is `no'.
-
- mag_x
- mag_y Scaling values of the characters to reach design size. If only
- one magnification is given, x and y values are assumed to be
- equal. Default is mag_x = mag_y = 1.0.
-
- threshold
- A value between 1 and 254 defining a threshold for converting
- the internal graymap into the output bitmap; lower values cut
- more pixels. Default value is 128.
-
- comment
- A comment describing the font; default is none.
-
- nmb_fonts
- The number of subfonts to create. Default value is -1 for cre-
- ating all fonts.
-
- unicode
- If `yes', a two digit hexadecimal number will be used as a run-
- ning number, starting with the value of the first byte of the
- first code range. Default is `no'.
-
- min_char
- The minimum value of the encoding. You should set this value to
- get correct subfile offsets if it is not identical to the lowest
- character code in the HBF file.
-
- dpi_x
- dpi_y The horizontal and vertical resolution (in dpi) of the printer.
- If only one resolution is given, x and y values are assumed to
- be equal. Default is 300.
-
- checksum
- A checksum to identify the GF files with the appropriate TFM
- files. The default value of this unsigned 32bit integer is 0.
-
- coding A comment describing the coding scheme; default is none.
-
- pk_directory
- The destination directory of the PK files; default: none. At-
- tention! The batch file will not check whether this directory
- exists.
-
- tfm_directory
- The destination directory of the TFM files; default: none. At-
- tention! The batch file will not check whether this directory
- exists.
-
- pk_files
- Whether to create PK files or not; default is `yes'.
-
- tfm_files
- Whether to create TFM files or not; default is `yes'.
-
- ofm_file
- Whether to create an OPL file or not; default is `no'. The
- batch file will then use ovp2ovf of the Omega distribution to
- convert it into an OFM and an OVF file. The OPL file simply
- maps all subfonts back to a single Omega font.
-
- long_extension
- If `yes', PK files will include the resolution in the extension
- (e.g. gsso1201.300pk). This affects the batch file only (de-
- fault is `yes').
-
- rm_command
- The shell command to remove files; default: `rm'.
-
- cp_command
- The shell command to copy files; default: `cp'.
-
- job_extension
- The extension of the batch file which calls gftopk and pltotf to
- convert the GF and the PL files into PK and TFM files respec-
- tively; default is none.
-
-FILE SEARCHING
- hbf2gf uses either the kpathsea, emtexdir, or MiKTeX library for
- searching files (emtexdir will work only on operating systems which
- have an MS-DOSish background, i.e., MS-DOS, OS/2, Windows; MiKTeX is
- for Win32 systems).
-
- kpathsea
- The actual version of kpathsea is displayed on screen if you call
- hbf2gf --version.
-
- Here is a table of the file type and the corresponding kpathsea vari-
- ables.
-
- .hbf MISCFONTS
- .cfg HBF2GFINPUTS
-
- Please consult the info files of kpathsea for details on these vari-
- ables. The decision which naming scheme to use for variables will be
- done during compilation.
-
- You should set the TEXMFCNF variable to the directory where your
- texmf.cnf configuration file resides.
-
- Here is the proper command to find out to which value a kpathsea vari-
- able is set (we use MISCFONTS as an example). This is especially use-
- ful if a variable isn't set in texmf.cnf or in the environment, thus
- pointing to the default value which is hard-coded into the kpathsea li-
- brary.
-
- kpsewhich -progname=hbf2gf -expand-var='$MISCFONTS'
-
- We select the program name also since it is possible to specify vari-
- ables which are searched only for a certain program - in our example it
- would be MISCFONTS.hbf2gf.
-
- A similar but not identical method is to say
-
- kpsewhich -progname=hbf2gf -show-path='misc fonts'
-
- [A full list of format types can be obtained by saying `kpsewhich
- --help' on the command line prompt.] This is exactly how hbf2gf
- searches for files; the disadvantage is that all variables are expanded
- which can cause very long strings.
-
- emtexdir
- Here the list of suffixes and its related environment variables to be
- set in autoexec.bat (resp. in config.sys for OS/2):
-
- .hbf HBFONTS
- .cfg HBFCFG
-
- If one of the variables isn't set, a warning message is emitted. The
- current directory will always be searched. As usual, one exclamation
- mark appended to a directory path causes subdirectories one level deep
- to be searched, two exclamation marks causes all subdirectories to be
- searched. Example:
-
- HBFONTS=c:\fonts\hbf!!;d:\myfonts\hbf!
-
- Constructions like `c:\fonts!!\hbf' aren't possible.
-
- MikTeX
- Please consult the documentation files of MiKTeX for more details.
-
-LIMITATIONS
- The x and y output size must not exceed MAX_CHAR_SIZE, which is defined
- at compile time; its default value is 1023 (pixel).
-
-SEE ALSO
- ttf2pk(1)
-
- hbf2gf.w: this is the source code written in CWEB which can be convert-
- ed into a pretty-printed TeX document using cweave. The CJK
- package also contains a preformatted hbf2gf.pdf file.
-
- the CJK documentation files (hbf2gf.txt).
-
- the Hanzi Bitmap File (HBF) standard version 1.3; available at
- ftp.ifcss.org.
-
- the Omega documentation available at ftp.ens.fr and the CTAN hosts and
- mirrors.
-
-FILES
- *.cfg The hbf2gf configuration scripts.
-
- *.hbf HBF header files which describe fixed-width bitmap fonts. Note
- that the bitmap font name(s) themselves as specified in the
- header files are irrelevant for hbf2gf.
-
-AVAILABILITY
- hbf2gf is part of the CJK macro package for LaTeX 2e available at the
- CTAN hosts and its mirrors.
-
- CJK fonts together with HBF header files can be found at ftp.ifcss.org
- and its mirrors.
-
-AUTHORS
- Werner Lemberg <wl@gnu.org>
- Ross Paterson (the HBF API) <ross@soi.city.ac.uk>
-
-
-
-CJK Version 4.8.4 18-Apr-2015 HBF2GF(1)
diff --git a/language/chinese/CJK/cjk-4.8.4/doc/man/txt/sjisconv.txt b/language/chinese/CJK/cjk-4.8.4/doc/man/txt/sjisconv.txt
deleted file mode 100644
index c288e153f4..0000000000
--- a/language/chinese/CJK/cjk-4.8.4/doc/man/txt/sjisconv.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-SJISCONV(1) General Commands Manual SJISCONV(1)
-
-
-
-NAME
- sjisconv - convert a TeX document in SJIS encoding into `preprocessed'
- form.
-
-SYNOPSIS
- sjisconv < infile > outfile
-
-DESCRIPTION
- SJIS encoding for Japanese uses the characters {, }, and \ which have
- special meanings in TeX documents.
-
- After processing a LaTeX 2e document which contains SJIS characters
- with sjisconv you need not care about these special characters.
-
- This filter is part of the CJK macro package for LaTeX 2e.
-
-SEE ALSO
- bg5conv(1), cefconv(1), cef5conv(1), cefsconv(1), extconv(1),
- the CJK documentation files.
-
-AUTHOR
- Werner Lemberg <wl@gnu.org>
-
-
-
-CJK Version 4.8.4 18-Apr-2015 SJISCONV(1)
diff --git a/language/chinese/CJK/cjk-4.8.4/doc/pdf/READMEb5.pdf b/language/chinese/CJK/cjk-4.8.4/doc/pdf/READMEb5.pdf
deleted file mode 100644
index ee69240563..0000000000
--- a/language/chinese/CJK/cjk-4.8.4/doc/pdf/READMEb5.pdf
+++ /dev/null
Binary files differ
diff --git a/language/chinese/CJK/cjk-4.8.4/doc/pdf/READMEgb.pdf b/language/chinese/CJK/cjk-4.8.4/doc/pdf/READMEgb.pdf
deleted file mode 100644
index 109dd90c95..0000000000
--- a/language/chinese/CJK/cjk-4.8.4/doc/pdf/READMEgb.pdf
+++ /dev/null
Binary files differ
diff --git a/language/chinese/CJK/cjk-4.8.4/doc/pdf/bg5conv.pdf b/language/chinese/CJK/cjk-4.8.4/doc/pdf/bg5conv.pdf
deleted file mode 100644
index cdd4ab5240..0000000000
--- a/language/chinese/CJK/cjk-4.8.4/doc/pdf/bg5conv.pdf
+++ /dev/null
Binary files differ
diff --git a/language/chinese/CJK/cjk-4.8.4/doc/pdf/c90.pdf b/language/chinese/CJK/cjk-4.8.4/doc/pdf/c90.pdf
deleted file mode 100644
index 7763b391d4..0000000000
--- a/language/chinese/CJK/cjk-4.8.4/doc/pdf/c90.pdf
+++ /dev/null
Binary files differ
diff --git a/language/chinese/CJK/cjk-4.8.4/doc/pdf/cef5conv.pdf b/language/chinese/CJK/cjk-4.8.4/doc/pdf/cef5conv.pdf
deleted file mode 100644
index 2cfae55e9d..0000000000
--- a/language/chinese/CJK/cjk-4.8.4/doc/pdf/cef5conv.pdf
+++ /dev/null
Binary files differ
diff --git a/language/chinese/CJK/cjk-4.8.4/doc/pdf/cefconv.pdf b/language/chinese/CJK/cjk-4.8.4/doc/pdf/cefconv.pdf
deleted file mode 100644
index f93ba43d6f..0000000000
--- a/language/chinese/CJK/cjk-4.8.4/doc/pdf/cefconv.pdf
+++ /dev/null
Binary files differ
diff --git a/language/chinese/CJK/cjk-4.8.4/doc/pdf/cefsconv.pdf b/language/chinese/CJK/cjk-4.8.4/doc/pdf/cefsconv.pdf
deleted file mode 100644
index f6f67114ab..0000000000
--- a/language/chinese/CJK/cjk-4.8.4/doc/pdf/cefsconv.pdf
+++ /dev/null
Binary files differ
diff --git a/language/chinese/CJK/cjk-4.8.4/doc/pdf/extconv.pdf b/language/chinese/CJK/cjk-4.8.4/doc/pdf/extconv.pdf
deleted file mode 100644
index 864527841f..0000000000
--- a/language/chinese/CJK/cjk-4.8.4/doc/pdf/extconv.pdf
+++ /dev/null
Binary files differ
diff --git a/language/chinese/CJK/cjk-4.8.4/doc/pdf/hbf2gf.pdf b/language/chinese/CJK/cjk-4.8.4/doc/pdf/hbf2gf.pdf
deleted file mode 100644
index 613eb2630e..0000000000
--- a/language/chinese/CJK/cjk-4.8.4/doc/pdf/hbf2gf.pdf
+++ /dev/null
Binary files differ
diff --git a/language/chinese/CJK/cjk-4.8.4/doc/pdf/sjisconv.pdf b/language/chinese/CJK/cjk-4.8.4/doc/pdf/sjisconv.pdf
deleted file mode 100644
index 947884afd9..0000000000
--- a/language/chinese/CJK/cjk-4.8.4/doc/pdf/sjisconv.pdf
+++ /dev/null
Binary files differ
diff --git a/language/chinese/CJK/cjk-4.8.4/doc/pyhyphen.txt b/language/chinese/CJK/cjk-4.8.4/doc/pyhyphen.txt
deleted file mode 100644
index b742c8758c..0000000000
--- a/language/chinese/CJK/cjk-4.8.4/doc/pyhyphen.txt
+++ /dev/null
@@ -1,107 +0,0 @@
-This is the file pyhyphen.txt of the CJK macro package ver. 4.8.4
-(18-Apr-2015).
-
-Hyphenation patterns for unaccented pinyin syllables
-----------------------------------------------------
-
-Sometimes it makes sense to use unaccented pinyin syllables for common names
-and phrases which are repeated frequently; sometimes you are in an
-environment which doesn't allow accented pinyin syllables at all. For such
-cases it is desirable to have correct hyphenation, avoiding manually added
-hints using e.g., `\-' between the syllables.
-
-Fortunately, due to the limited numbers of Chinese pinyin syllables (407 for
-Mandarin), it is easy to create hyphenation patterns. The logical
-consequence is to add a new `language' to the Babel package, and exactly
-this can be found in the directory utils/pyhyphen.
-
-
-Installation
-------------
-
-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.
-
-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
-
- pinyin pyhyph.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.
-
-Using Babel ensures that it works both with LaTeX and Plain TeX.
-
-
-Usage
------
-
-Do something like this:
-
- \documentclass[...]{...}
-
- \usepackage[T1]{fontenc}
- \usepackage[pinyin,german,english]{babel}
- ...
-
- \begin{document}
- ...
- \foreignlanguage{pinyin}{some pinyin syllables}
- ...
- \end{document}
-
-
-Note 1: pinyin.ldf is intentionally very minimal. Don't expect that e.g.,
- \chapter yields a pinyin version of the Chinese word for `chapter'.
- It might be useful to define a shorthand macro like the following:
-
- \newcommand{\py}[1]{\foreignlanguage{pinyin}{#1}}
-
- Now you can simply say
-
- \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:
-
- Xi'an <-> Xian
-
- 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:
-
- Tian'anmen
-
- The hyphenation patterns correctly treat it as Tian'-an-men.
-
- The shorthand `"u' (as used in German) is available to input
- `umlaut u'.
-
-Note 3: Most Babel language support files define a `<language>.sty' file
- also. This is not true for pinyin! pinyin.sty is used for accented
- pinyin syllables which don't need a special hyphenation support.
- (pinyin.sty works with Plain TeX also.)
-
-
-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.
-
-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.
-
----End of pyhyphen.txt---
diff --git a/language/chinese/CJK/cjk-4.8.4/examples/cjk/Big5.cjk b/language/chinese/CJK/cjk-4.8.4/examples/cjk/Big5.cjk
deleted file mode 100644
index c2cb4a7795..0000000000
--- a/language/chinese/CJK/cjk-4.8.4/examples/cjk/Big5.cjk
+++ /dev/null
@@ -1,35 +0,0 @@
-\def\CJKpreproc{bg5conv (CJK ver. 4.8.3)}% 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)
-%
-%
-% process this file with bg5latex
-
-\documentclass[12pt]{article}
-
-\usepackage{CJK}
-
-
-\begin{document}
-
-\begin{CJK*}{Bg5}{bsmi}
-\CJKtilde
-
-\noindent 18796221221170176~(FAQ list)~791136419910396812212361862216820622865237186209
-17016465722327518620616175110211881866724287641691638018679652281151981789911925317923922067
-\textbf{179246115178991862119665105209210117112243921701872211701762067020922811519817899118211
-18116418616125067}
-
-\end{CJK*}
-
-\end{document}
-
-%%% Local Variables:
-%%% coding: big5
-%%% mode: latex
-%%% TeX-master: t
-%%% TeX-command-default: "CJKLaTeX"
-%%% End:
diff --git a/language/chinese/CJK/cjk-4.8.4/examples/cjk/Big5vert.cjk b/language/chinese/CJK/cjk-4.8.4/examples/cjk/Big5vert.cjk
deleted file mode 100644
index 2b4f60b216..0000000000
--- a/language/chinese/CJK/cjk-4.8.4/examples/cjk/Big5vert.cjk
+++ /dev/null
@@ -1,35 +0,0 @@
-\def\CJKpreproc{bg5conv (CJK ver. 4.8.3)}% This is the file Big5vert.tex of the CJK package
-% for testing vertical typesetting (in Big 5 encoding).
-%
-% process this file with bg5latex
-%
-% written by Werner Lemberg <wl@gnu.org>
-%
-% Version 4.8.4 (18-Apr-2015)
-
-\documentclass[12pt]{article}
-
-\usepackage{CJK}
-\usepackage{CJKvert}
-
-
-\begin{document}
-
-\begin{CJK*}{Bg5}{bsmi}
-\CJKtilde
-
-\noindent 18796221221170176~(FAQ list)~791136419910396812212361862216820622865237186209
-17016465722327518620616175110211881866724287641691638018679652281151981789911925317923922067
-\textbf{179246115178991862119665105209210117112243921701872211701762067020922811519817899118211
-18116418616125067}
-
-\end{CJK*}
-
-\end{document}
-
-%%% Local Variables:
-%%% coding: big5
-%%% mode: latex
-%%% TeX-master: t
-%%% TeX-command-default: "CJKLaTeX"
-%%% End:
diff --git a/language/chinese/CJK/cjk-4.8.4/examples/cjk/CEF_test.cjk b/language/chinese/CJK/cjk-4.8.4/examples/cjk/CEF_test.cjk
deleted file mode 100644
index fc455f1e5b..0000000000
--- a/language/chinese/CJK/cjk-4.8.4/examples/cjk/CEF_test.cjk
+++ /dev/null
@@ -1,41 +0,0 @@
-\def\CNSpreproc{cefconv (CJK ver. 4.8.3)}% 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)
-%
-% process this text with ceflatex
-
-\documentclass[12pt]{article}
-
-\usepackage[global]{CJK}
-\usepackage{MULEenc}
-
-
-\begin{document}
-
-\begin{CJK}{}{}
-
-\verb|\CJKchar[CNS1]{"5A}{"5A}| \CJKchar[CNS1]{"5A}{"5A}
-\quad \verb|&C1-|\verb|5A5A;| 72CNS1"05A"05A
-
-\verb|\CJKchar[CNS2]{"5A}{"5A}| \CJKchar[CNS2]{"5A}{"5A}
-\quad \verb|&C2-|\verb|5A5A;| 72CNS2"05A"05A
-
-\verb|\CJKchar[CNS3]{"5A}{"5A}| \CJKchar[CNS3]{"5A}{"5A}
-\quad \verb|&C3-|\verb|5A5A;| 72CNS3"05A"05A
-
-\verb|\CJKchar[CNS4]{"5A}{"5A}| \CJKchar[CNS4]{"5A}{"5A}
-\quad \verb|&C4-|\verb|5A5A;| 72CNS4"05A"05A
-
-\verb|\CJKchar[CNS5]{"5A}{"5A}| \CJKchar[CNS5]{"5A}{"5A}
-\quad \verb|&C5-|\verb|5A5A;| 72CNS5"05A"05A
-
-\verb|\CJKchar[CNS6]{"5A}{"5A}| \CJKchar[CNS6]{"5A}{"5A}
-\quad \verb|&C6-|\verb|5A5A;| 72CNS6"05A"05A
-
-\verb|\CJKchar[CNS7]{"5A}{"5A}| \CJKchar[CNS7]{"5A}{"5A}
-\quad \verb|&C7-|\verb|5A5A;| 72CNS7"05A"05A
-
-\end{CJK}
-
-\end{document}
diff --git a/language/chinese/CJK/cjk-4.8.4/examples/cjk/CJKbabel.cjk b/language/chinese/CJK/cjk-4.8.4/examples/cjk/CJKbabel.cjk
deleted file mode 100644
index 0afa78e99c..0000000000
--- a/language/chinese/CJK/cjk-4.8.4/examples/cjk/CJKbabel.cjk
+++ /dev/null
@@ -1,135 +0,0 @@
-\def\CJKhook{\CJKenc{JIS}\CJKenc{Bg5}\CJKenc{GB}\CJKenc{KS}}\ifx\CJKpreproc\undefined\def\CJKpreproc{cjk-enc}\RequirePackage[global]{CJK}\AtBeginDocument{\begin{CJK}{}{}\CJKspace}\AtEndDocument{\end{CJK}}\else\CJKhook\fi % This is the file CJKbabel.tex of the CJK package
-% for testing text written with Emacs 20 and Babel (starting
-% with version 3.6).
-%
-% written by Werner Lemberg <wl@gnu.org>
-%
-% Version 4.8.4 (18-Apr-2015)
-
-% You need Emacs 20 to process this file!
-
-% You should load this file into Emacs (C-x C-f) and call
-% `cjk-write-file' (M-x cjk-write-file). Then run LaTeX on the file
-% `CJKbabel.cjk'.
-%
-% `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.
-%
-% Read cjk-enc.txt for more details.
-
-\documentclass[12pt]{article}
-
-\usepackage{inputenc} % load it without argument
- % to avoid Babel warnings
-
-\usepackage[10pt]{type1ec} % use only 10pt fonts
-\usepackage[T1]{fontenc}
-
-\usepackage[german,
- russian, % T2A font encoding
- thaicjk, % C90 font encoding
- greek, % LGR font encoding
- vietnam, % T5 font encoding
- USenglish]{babel}
-
-\usepackage[overlap, CJK]{ruby}
-\usepackage{CJKulem}
-
-\usepackage{pshan} % Korean Wansong PS fonts
-
-\CJKencfamily{Bg5}{bsmi}
-\CJKencfamily{GB}{gbsn}
-\CJKencfamily[dnp]{JIS}{min}
-
-\CJKfontenc{KS}{HL}
-\CJKfontenc{JIS}{dnp}
-
-\renewcommand{\rubysep}{-0.2ex}
-
-
-\begin{document}
-
-\parskip 3ex
-\parindent 0pt
-
-6469204 FAQ 69186 218214 221185199194 250174250 215161 235209 235228187 163220237225209 231196184206
-240198 171238179192207217. \uline{69204 FAQ 69199 184182194 246173 199161 241207169 185226251184206
- 175230199250192207217.} \textbf{69243188209 205186 ``69204 FAQ 69187 238187212 208187
- 205206161'' 69243194 235241187 252182207195226 217248207217.}
-
-\begin{otherlanguage}{german}
- Dieses FAQ wurde erstellt, um h8aufig gestellte Fragen und ihre
- Antworten in einer gef8alligen Form zusammenzufassen. \uline{Die
- Struktur dieses FAQ wurde drastisch ge8andert seit der letzten
- Version.} \textbf{F8ur Details siehe den Abschnitt "`Wie lese ich
- dieses FAQ"'.}
-\end{otherlanguage}
-
-\CJKtilde
-
-6567190163202202240175~(FAQ list)~67199211187169173163187202189196202226176228202177196226240208172212189
-227196206189170170248246196163\uline{67250207187230187172196199172228224197225185209185215196228163}
-\textbf{67208216194225185196184218172201206188184231206196193190202240175176203226228224197225185185195
- 238208196181247163}
-
-6818796221221170176~(FAQ list)~687911364199103968122123618622168206228652371862091701646572232
-75186206161751102118818667\uline{6824287641691638018679652281151981789911925317923922067}
-\textbf{68179246115178991862119665105209210117112243921701872211701762067020922811519817899118211
- 18116418616125067}
-
-This FAQ list was made to summarize some frequently asked questions
-and their answers in a convenient form. \uline{The structure of this
- FAQ list has drastically changed since the last version.}
-\textbf{For details of the new structure, see the entry of `How to
- read this FAQ and its structure'.}
-
-66179206~FAQ~66234185200207162232175162235193228200189206250242184225162242203169196232166203183191226206
-199185163\uline{66179206~FAQ~66234185200206189164207162202176206226206200230217198231253203209185181236
- 198164222185163}\textbf{\ruby{66183}{66162191233}66183164189164203216183198207162214179206~FAQ~
- 66206201223253200189206189164215206224220242\ruby{66178}{66181243}\ruby{66200}{66183231166}66183198188181
- 164163}
-
-\begin{otherlanguage}{vietnam}
-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.
-\uline{T32\uhorn l32\acircumflexn 20\acircumflexn b73an cu20\ocircumflexi c32ung 0\dj20\ecircumflexn nay, 0\dj34a c20o nh34\uhornng s71\uhorn thay 0\dj73\ocircumflexi kh20a
- l20\ohornn trong c20\acircumflexu tr20uc c73ua FAQ.} \textbf{0\DJ73\ecircumflex hi73\ecircumflexu r34o h0\ohornn b71an n0\ecircumflexn xem l71ai
- ch0\uhorn0\ohornng ``L32am sao t0\ocircumflexi c20o th73\ecircumflex 0\dj71oc 0\dju71\ohornc FAQ''.}
-\end{otherlanguage}
-
-\begin{otherlanguage}{russian}
- 0\CYREREV0\cyrt0\cyro0\cyrt 0\cyrs0\cyrp0\cyri0\cyrs0\cyro0\cyrk 0\cyrb0\cyrery0\cyrl 0\cyrs0\cyro0\cyrs0\cyrt0\cyra0\cyrv0\cyrl0\cyre0\cyrn 0\cyrd0\cyrl0\cyrya 0\cyrs0\cyru0\cyrm0\cyrm0\cyri0\cyrr0\cyro0\cyrv0\cyra0\cyrn0\cyri0\cyrya 0\cyrn0\cyre0\cyrk0\cyro0\cyrt0\cyro0\cyrr0\cyrery0\cyrh 0\cyrch0\cyra0\cyrs0\cyrt0\cyro
- 0\cyrz0\cyra0\cyrd0\cyra0\cyrv0\cyra0\cyre0\cyrm0\cyrery0\cyrh 0\cyrv0\cyro0\cyrp0\cyrr0\cyro0\cyrs0\cyro0\cyrv (FAQ), 0\cyrv0\cyrm0\cyre0\cyrs0\cyrt0\cyre 0\cyrs 0\cyro0\cyrt0\cyrv0\cyre0\cyrt0\cyra0\cyrm0\cyri 0\cyrn0\cyra 0\cyrn0\cyri0\cyrh, 0\cyrv 0\cyru0\cyrd0\cyro0\cyrb0\cyrn0\cyro0\cyrishrt
- 0\cyrf0\cyro0\cyrr0\cyrm0\cyre. \uline{0\CYRS0\cyrt0\cyrr0\cyru0\cyrk0\cyrt0\cyru0\cyrr0\cyra 0\cyrerev0\cyrt0\cyro0\cyrg0\cyro FAQ 0\cyrk0\cyra0\cyrr0\cyrd0\cyri0\cyrn0\cyra0\cyrl0\cyrsftsn0\cyrn0\cyro 0\cyri0\cyrz0\cyrm0\cyre0\cyrn0\cyri0\cyrl0\cyra0\cyrs0\cyrsftsn 0\cyrp0\cyro
- 0\cyrs0\cyrr0\cyra0\cyrv0\cyrn0\cyre0\cyrn0\cyri0\cyryu 0\cyrs 0\cyrp0\cyro0\cyrs0\cyrl0\cyre0\cyrd\-0\cyrn0\cyre0\cyrishrt 0\cyrv0\cyre0\cyrr0\cyrs0\cyri0\cyre0\cyrishrt.} \textbf{0\CYRV 0\cyrr0\cyra0\cyrz0\cyrd0\cyre0\cyrl0\cyre `0\CYRK0\cyra0\cyrk 0\cyrch0\cyri0\cyrt0\cyra0\cyrt0\cyrsftsn
- 0\cyrerev0\cyrt0\cyro0\cyrt FAQ 0\cyri 0\cyre0\cyrg0\cyro 0\cyrs0\cyrt0\cyrr0\cyru0\cyrk0\cyrt0\cyru0\cyrr0\cyra' 0\cyro0\cyrb0\cyrhrdsn0\cyrya0\cyrs0\cyrn0\cyre0\cyrn0\cyrery 0\cyrd0\cyre0\cyrt0\cyra0\cyrl0\cyri 0\cyrerev0\cyrt0\cyro0\cyrishrt 0\cyrn0\cyro0\cyrv0\cyro0\cyrishrt 0\cyrs0\cyrt0\cyrr0\cyru0\cyrk0\cyrt0\cyru0\cyrr0\cyrery.}
-\end{otherlanguage}
-
-\begin{otherlanguage}{thaicjk}
- 5762195622106219462161622106219558 FAQ 5762185602136023361622026219560233622106216761621626021460233621856162224621906021560232622056162202621956021662187616216462211616218262210621936162183602136023261621826221062193616216160209621856162186602326220562194616216462195602096023362167616222562197622086162164622116162181622056218661621646221161621826221062193616222762185616219560217621876162225621866218661621836021361622026220862180621996216158.
- \uline{5762226621646219562167616220262195602336221062167616216262205621676162195622106219462161622106219558 FAQ 576218560213602336162224621876219760213602326219462185616222862187616219362210621616162181602096023362167622256218160232616219560216602326218561621836021360232616222562197602336219958.}
- \textbf{57621806021761621956221062194616219762208622246220560213621946218061622026221162203621956020962186616222662164621956216761622026219560233622106216761622276220362193602326162228621806023361621686221062161616217060232621996216758 ``576222662164621956216761622026219560233622106216761622256219762208616219960212621846021361621616221062195616220560232622106218558
- FAQ.''}
-\end{otherlanguage}
-
-\begin{otherlanguage}{greek}
- 0H 0l0'i0s0t0a 0a0u0t0'h 0S0T0E (0s0u0q0n0'a 0t0i0j0e0m0'e0n0w0n 0e0r0w0t0'h0s0e0w0n) 0'e0q0e0i 0s0a0n 0s0k0o0p0'o 0n0a
- 0s0u0m0p0e0r0i0l0'a0b0e0i 0s0e 0e0'u0q0r0h0s0t0h 0m0o0r0f0'h 0k0'a0p0o0i0e0c 0s0h0m0a0n0t0i0k0'e0c 0e0r0w0t0'h0s0e0i0c 0k0a0i 0t0i0c
- 0a0p0a0n0t0'h0s0e0i0c 0t0o0u0c. \uline{0H 0o0r0g0'a0n0w0s0h 0a0u0t0'h0c 0t0h0c 0l0'i0s0t0a0c 0'a0l0l0a0x0e
- 0s0h0m0a0n0t0i0k0'a 0a0p0'o 0t0h0n 0t0e0l0e0u0t0a0'i0a 0'e0k0d0o0s0'h 0t0h0c 0k0a0i 0m0e0t0'a.} \textbf{0G0i0a
- 0l0e0p0t0o0m0'e0r0e0i0e0c 0p0'a0n0w 0s0t0h 0n0'e0a 0o0r0g0'a0n0w0s0h, 0b0l0'e0p0e 0t0o 0l0'h0m0m0a <<0P0'w0c 0n0a
- 0d0i0a0b0'a0s0e0t0e 0a0u0t0'h 0t0h0n 0S0T0E 0k0a0i 0p0'w0c 0e0'i0n0a0i 0o0r0g0a0n0w0m0'e0n0h>>.}
-\end{otherlanguage}
-
-\end{document}
-
-
-%%% Local Variables:
-%%% coding: emacs-mule
-%%% mode: latex
-%%% TeX-master: t
-%%% TeX-command-default: "CJKLaTeX"
-%%% End:
diff --git a/language/chinese/CJK/cjk-4.8.4/examples/cjk/SJIS.cjk b/language/chinese/CJK/cjk-4.8.4/examples/cjk/SJIS.cjk
deleted file mode 100644
index 461698598d..0000000000
--- a/language/chinese/CJK/cjk-4.8.4/examples/cjk/SJIS.cjk
+++ /dev/null
@@ -1,39 +0,0 @@
-\def\CJKpreproc{sjisconv (CJK ver. 4.8.3)}% 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)
-%
-%
-% process this file with sjislatex
-
-\documentclass[12pt]{article}
-
-\usepackage{CJK}
-\usepackage[CJK, overlap]{ruby}
-
-\renewcommand{\rubysep}{-0.3ex}
-
-
-\begin{document}
-
-\begin{CJK*}[dnp]{SJIS}{min}
-\CJKtilde
-
-\noindent 177204~FAQ~13888103205652301731602331912261981872041542408722365240201167194230164
-20118118922420419718366177204~FAQ~1388810320492162205652007920422420419822821519622915720120788
-17923419616222018366\textbf{\ruby{86}{160189231}1811629216220121418119620565117177204~FAQ~
-20419922125119818720492162118204128218240\ruby{81}{179241}\ruby{198}{181229164}181196186179
-16266}
-
-\end{CJK*}
-
-\end{document}
-
-%%% Local Variables:
-%%% coding: sjis
-%%% mode: latex
-%%% TeX-master: t
-%%% TeX-command-default: "CJKLaTeX"
-%%% End:
diff --git a/language/chinese/CJK/cjk-4.8.4/examples/cjk/muletest.cjk b/language/chinese/CJK/cjk-4.8.4/examples/cjk/muletest.cjk
deleted file mode 100644
index e212b1a23e..0000000000
--- a/language/chinese/CJK/cjk-4.8.4/examples/cjk/muletest.cjk
+++ /dev/null
@@ -1,149 +0,0 @@
-\def\CJKhook{\CJKenc{JIS}\CJKenc{Bg5}\CJKenc{GB}\CJKenc{KS}}\ifx\CJKpreproc\undefined\def\CJKpreproc{cjk-enc}\RequirePackage[global]{CJK}\AtBeginDocument{\begin{CJK}{}{}\CJKspace}\AtEndDocument{\end{CJK}}\else\CJKhook\fi % This is the file muletest.tex of the CJK package
-% for testing text written with Mule and Emacs 20.
-%
-% written by Werner Lemberg <wl@gnu.org>
-%
-% Version 4.8.4 (18-Apr-2015)
-
-% You need Emacs 20 (or Mule 2.3) to process this file!
-
-% You should load this file into Mule with `*internal*' encoding scheme
-% (C-u C-x C-f) and call `cjk-write-file' (M-x cjk-write-file).
-% Then run LaTeX on the file `muletest.cjk'.
-%
-% Under Emacs 20 type `C-x C-f muletest.tex' to load this file.
-%
-% `cjk-write-file' will be available after loading cjk-enc.el into Mule
-% (Emacs 20) with the commands load-file or load-library.
-%
-% If you don't have german.sty, comment out the `\usepackage{german}'
-% line.
-%
-% 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.
-%
-% Read cjk-enc.txt for more details.
-
-\documentclass[12pt]{article}
-
-\usepackage{inputenc} % load it without argument
- % to avoid Babel warnings
-
-\usepackage[10pt]{type1ec} % use only 10pt fonts
-
-\usepackage{german}
-\usepackage[T5,T2A,LGR,OT1]{fontenc} % T2A is Cyrillic,
- % LGR is Greek
- % T5 is Vietnamese
-
-\usepackage[overlap, CJK]{ruby}
-\usepackage{pshan} % Korean Wansong PS fonts
-
-\CJKencfamily{Bg5}{bsmi}
-\CJKencfamily{GB}{gbsn}
-\CJKencfamily[dnp]{JIS}{min}
-
-\CJKfontenc{KS}{HL}
-\CJKfontenc{JIS}{dnp}
-
-\renewcommand{\rubysep}{-0.2ex}
-
-\begin{document}
-
-% suppress hyphenation completely since we don't use Babel and thus
-% don't know which \language corresponds to which hyphenation pattern
-\lefthyphenmin 65
-\raggedright
-
-\noindent 6469204 FAQ 69186 218214 221185199194 250174250 215161 235209 235228187 163220237225209
-231196184206 240198 171238179192207217. 69204 FAQ 69199 184182194 246173 199161 241207169
-185226251184206 175230199250192207217. \textbf{69243188209 205186 ``69204 FAQ 69187 238187212
- 208187 205206161'' 69243194 235241187 252182207195226 217248207217.}
-
-\vspace{0.5cm}
-
-\noindent Dieses FAQ wurde erstellt, um h8aufig gestellte Fragen und
-ihre Antworten in einer gef8alligen Form zusammenzufassen. Die
-Struktur dieses FAQ wurde drastisch ge8andert seit der letzten Version.
-\textbf{F8ur Details siehe den Abschnitt "`Wie lese ich dieses FAQ"'.}
-
-\vspace{0.5cm}
-
-\CJKtilde
-
-\noindent 6567190163202202240175~(FAQ list)~67199211187169173163187202189196202226176228202177196226
-240208172212189227196206189170170248246196163250207187230187172196199172228224197225185209185215196228163
-\textbf{67208216194225185196184218172201206188184231206196193190202240175176203226228224197225185185195
- 238208196181247163}
-
-\vspace{0.5cm}
-
-\noindent 6818796221221170176~(FAQ list)~68791136419910396812212361862216820622865237186209
-17016465722327518620616175110211881866724287641691638018679652281151981789911925317923922067
-\textbf{68179246115178991862119665105209210117112243921701872211701762067020922811519817899118211
- 18116418616125067}
-
-\vspace{0.5cm}
-
-\noindent This FAQ list was made to summarize some frequently asked
-questions and their answers in a convenient form. The structure of
-this FAQ list has drastically changed since the last version.
-\textbf{For details of the new structure, see the entry of `How to
- read this FAQ and its structure'.}
-
-\vspace{0.5cm}
-
-\noindent 66179206~FAQ~66234185200207162232175162235193228200189206250242184225162242203169196232166
-203183191226206199185163179206~FAQ~66234185200206189164207162202176206226206200230217198231253203209185
-181236198164222185163\textbf{\ruby{66183}{66162191233}66183164189164203216183198207162214179206~FAQ~
- 66206201223253200189206189164215206224220242\ruby{66178}{66181243}\ruby{66200}{66183231166}66183198188181
- 164163}
-
-\vspace{0.5cm}
-
-\bgroup
-\fontencoding{T5}\selectfont
-
-\noindent 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. T32\uhorn l32\acircumflexn 20\acircumflexn b73an cu20\ocircumflexi c32ung 0\dj20\ecircumflexn nay, 0\dj34a c20o nh34\uhornng s71\uhorn thay 0\dj73\ocircumflexi kh20a l20\ohornn
-trong c20\acircumflexu tr20uc c73ua FAQ. \textbf{0\DJ73\ecircumflex hi73\ecircumflexu r34o h0\ohornn b71an n0\ecircumflexn xem l71ai ch0\uhorn0\ohornng
- ``L32am sao t0\ocircumflexi c20o th73\ecircumflex 0\dj71oc 0\dju71\ohornc FAQ''.}
-\egroup
-
-\vspace{0.5cm}
-
-\bgroup
-\fontencoding{T2A}\selectfont
-
-\noindent 0\CYREREV0\cyrt0\cyro0\cyrt 0\cyrs0\cyrp0\cyri0\cyrs0\cyro0\cyrk 0\cyrb0\cyrery0\cyrl 0\cyrs0\cyro0\cyrs0\cyrt0\cyra0\cyrv0\cyrl0\cyre0\cyrn 0\cyrd0\cyrl0\cyrya 0\cyrs0\cyru0\cyrm0\cyrm0\cyri0\cyrr0\cyro0\cyrv0\cyra0\cyrn0\cyri0\cyrya 0\cyrn0\cyre0\cyrk0\cyro0\cyrt0\cyro0\cyrr0\cyrery0\cyrh 0\cyrch0\cyra0\cyrs0\cyrt0\cyro
-0\cyrz0\cyra0\cyrd0\cyra0\cyrv0\cyra0\cyre0\cyrm0\cyrery0\cyrh 0\cyrv0\cyro0\cyrp0\cyrr0\cyro0\cyrs0\cyro0\cyrv (FAQ), 0\cyrv0\cyrm0\cyre0\cyrs0\cyrt0\cyre 0\cyrs 0\cyro0\cyrt0\cyrv0\cyre0\cyrt0\cyra0\cyrm0\cyri 0\cyrn0\cyra 0\cyrn0\cyri0\cyrh, 0\cyrv 0\cyru0\cyrd0\cyro0\cyrb0\cyrn0\cyro0\cyrishrt 0\cyrf0\cyro0\cyrr0\cyrm0\cyre.
-0\CYRS0\cyrt0\cyrr0\cyru0\cyrk0\cyrt0\cyru0\cyrr0\cyra 0\cyrerev0\cyrt0\cyro0\cyrg0\cyro FAQ 0\cyrk0\cyra0\cyrr0\cyrd0\cyri0\cyrn0\cyra0\cyrl0\cyrsftsn0\cyrn0\cyro 0\cyri0\cyrz0\cyrm0\cyre0\cyrn0\cyri0\cyrl0\cyra0\cyrs0\cyrsftsn 0\cyrp0\cyro 0\cyrs0\cyrr0\cyra0\cyrv0\cyrn0\cyre0\cyrn0\cyri0\cyryu 0\cyrs 0\cyrp0\cyro0\cyrs0\cyrl0\cyre0\cyrd0\cyrn0\cyre0\cyrishrt
-0\cyrv0\cyre0\cyrr0\cyrs0\cyri0\cyre0\cyrishrt. \textbf{0\CYRV 0\cyrr0\cyra0\cyrz0\cyrd0\cyre0\cyrl0\cyre `0\CYRK0\cyra0\cyrk 0\cyrch0\cyri0\cyrt0\cyra0\cyrt0\cyrsftsn 0\cyrerev0\cyrt0\cyro0\cyrt FAQ 0\cyri 0\cyre0\cyrg0\cyro 0\cyrs0\cyrt0\cyrr0\cyru0\cyrk0\cyrt0\cyru0\cyrr0\cyra'
- 0\cyro0\cyrb0\cyrhrdsn0\cyrya0\cyrs0\cyrn0\cyre0\cyrn0\cyrery 0\cyrd0\cyre0\cyrt0\cyra0\cyrl0\cyri 0\cyrerev0\cyrt0\cyro0\cyrishrt 0\cyrn0\cyro0\cyrv0\cyro0\cyrishrt 0\cyrs0\cyrt0\cyrr0\cyru0\cyrk0\cyrt0\cyru0\cyrr0\cyrery.}
-\egroup
-
-\vspace{0.5cm}
-
-\bgroup
-\fontencoding{LGR}\selectfont
-
-\noindent 0H 0l0'i0s0t0a 0a0u0t0'h 0S0T0E (0s0u0q0n0'a 0t0i0j0e0m0'e0n0w0n 0e0r0w0t0'h0s0e0w0n) 0'e0q0e0i 0s0a0n 0s0k0o0p0'o
-0n0a 0s0u0m0p0e0r0i0l0'a0b0e0i 0s0e 0e0'u0q0r0h0s0t0h 0m0o0r0f0'h 0k0'a0p0o0i0e0c 0s0h0m0a0n0t0i0k0'e0c 0e0r0w0t0'h0s0e0i0c 0k0a0i 0t0i0c
-0a0p0a0n0t0'h0s0e0i0c 0t0o0u0c. 0H 0o0r0g0'a0n0w0s0h 0a0u0t0'h0c 0t0h0c 0l0'i0s0t0a0c 0'a0l0l0a0x0e 0s0h0m0a0n0t0i0k0'a 0a0p0'o 0t0h0n
-0t0e0l0e0u0t0a0'i0a 0'e0k0d0o0s0'h 0t0h0c 0k0a0i 0m0e0t0'a. \textbf{0G0i0a 0l0e0p0t0o0m0'e0r0e0i0e0c 0p0'a0n0w 0s0t0h 0n0'e0a
- 0o0r0g0'a0n0w0s0h, 0b0l0'e0p0e 0t0o 0l0'h0m0m0a <<0P0'w0c 0n0a 0d0i0a0b0'a0s0e0t0e 0a0u0t0'h 0t0h0n 0S0T0E 0k0a0i 0p0'w0c
- 0e0'i0n0a0i 0o0r0g0a0n0w0m0'e0n0h>>.}
-\egroup
-
-\end{document}
-
-
-%%% Local Variables:
-%%% coding: emacs-mule
-%%% mode: latex
-%%% TeX-master: t
-%%% TeX-command-default: "CJKLaTeX"
-%%% End:
diff --git a/language/chinese/CJK/cjk-4.8.4/examples/cjk/rubytest.cjk b/language/chinese/CJK/cjk-4.8.4/examples/cjk/rubytest.cjk
deleted file mode 100644
index cfbc295156..0000000000
--- a/language/chinese/CJK/cjk-4.8.4/examples/cjk/rubytest.cjk
+++ /dev/null
@@ -1,56 +0,0 @@
-\def\CJKhook{\CJKenc{JIS}\CJKenc{Bg5}}\ifx\CJKpreproc\undefined\def\CJKpreproc{cjk-enc}\RequirePackage[global]{CJK}\AtBeginDocument{\begin{CJK}{}{}\CJKspace}\AtEndDocument{\end{CJK}}\else\CJKhook\fi % This is the file rubytest.tex of the CJK package
-% for testing ruby with LaTeX2e
-%
-% created by Werner Lemberg <wl@gnu.org>
-%
-% Version 4.8.4 (18-Apr-2015)
-
-% You need Emacs 20 (or Mule 2.3) to process this file!
-
-% You should load this file into Mule with `*internal*' encoding scheme
-% (C-u C-x C-f) and call `cjk-write-file' (M-x cjk-write-file).
-% Then run LaTeX on the created file `rubytest.cjk'.
-%
-% Under Emacs 20 type `C-x C-f rubytest.tex' to load this file.
-%
-% `cjk-write-file' will be available after loading cjk-enc.el into Mule
-% (Emacs 20) with the commands load-file or load-library.
-
-\documentclass[12pt]{article}
-
-\usepackage[overlap, CJK]{ruby}
-\usepackage{pinyin}
-
-\CJKencfamily{Bg5}{bsmi}
-\CJKencfamily[dnp]{JIS}{min}
-
-\CJKfontenc{JIS}{dnp}
-
-\renewcommand{\rubysep}{-0.3ex}
-
-
-\begin{document}
-
-{
-\rubylatin
-\renewcommand{\rubysize}{1}
-
-\ruby{\wo3}{6568218} \ruby{\hen3}{68220} \ruby{\xi3}{68223}\ruby{\huan1}{68119}
-\ruby{\chi1}{6889} \ruby{\Zhong1}{68164}\ruby{\guo2}{68234}
-\ruby{\cai4}{68230}\ruby{.}{6867}
-}
-
-\Large
-
-\ruby{66214}{66207202}\ruby{66224}{66190206}\ruby{66231}{66192164}\ruby{66216}{66172175}
-
-\ruby{66164}{66166223}66200\ruby{66208}{66223186166223}66216212175163
-
-\end{document}
-
-%%% Local Variables:
-%%% coding: emacs-mule
-%%% mode: latex
-%%% TeX-master: t
-%%% TeX-command-default: "CJKLaTeX"
-%%% End:
diff --git a/language/chinese/CJK/cjk-4.8.4/examples/cjk/thai.cjk b/language/chinese/CJK/cjk-4.8.4/examples/cjk/thai.cjk
deleted file mode 100644
index ef16754e35..0000000000
--- a/language/chinese/CJK/cjk-4.8.4/examples/cjk/thai.cjk
+++ /dev/null
@@ -1,43 +0,0 @@
-\ifx\CJKpreproc\undefined\def\CJKpreproc{cjk-enc}\RequirePackage{MULEenc}\fi % This is the file thai.tex of the CJK package
-% for testing Thai (in TIS-620 encoding).
-%
-% written by Werner Lemberg <wl@gnu.org>
-%
-% Version 4.8.4 (18-Apr-2015)
-
-% 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}
-
-5762195622106219462161622106219558 FAQ 5762185602136023361622026219560233622106216761621626021460233621856162224621906021560232622056162202621956021662187616216462211616218262210621936162183602136023261621826221062193616216160209621856162186602326220562194616216462195602096023362167616222562197622086162164622116162181622056218661621646221161621826221062193616222762185616219560217621876162225621866218661621836021361622026220862180621996216158.
-5762226621646219562167616220262195602336221062167616216262205621676162195622106219462161622106219558 FAQ 576218560213602336162224621876219760213602326219462185616222862187616219362210621616162181602096023362167622256218160232616219560216602326218561621836021360232616222562197602336219958.
-\textbf{57621806021761621956221062194616219762208622246220560213621946218061622026221162203621956020962186616222662164621956216761622026219560233622106216761622276220362193602326162228621806023361621686221062161616217060232621996216758 ``576222662164621956216761622026219560233622106216761622256219762208616219960212621846021361621616221062195616220560232622106218558
- FAQ.''}
-
-\end{document}
-
-
-%%% Local Variables:
-%%% coding: thai-tis620
-%%% mode: latex
-%%% TeX-master: t
-%%% TeX-command-default: "CJKLaTeX"
-%%% End:
diff --git a/language/chinese/CJK/cjk-4.8.4/examples/cjk/thai_utf8.cjk b/language/chinese/CJK/cjk-4.8.4/examples/cjk/thai_utf8.cjk
deleted file mode 100644
index 1ffa284b83..0000000000
--- a/language/chinese/CJK/cjk-4.8.4/examples/cjk/thai_utf8.cjk
+++ /dev/null
@@ -1,43 +0,0 @@
-\ifx\CJKpreproc\undefined\def\CJKpreproc{cjk-enc}\RequirePackage{MULEenc}\fi % 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.4 (18-Apr-2015)
-
-% 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}
-
-5762195622106219462161622106219558 FAQ 5762185602136023361622026219560233622106216761621626021460233621856162224621906021560232622056162202621956021662187616216462211616218262210621936162183602136023261621826221062193616216160209621856162186602326220562194616216462195602096023362167616222562197622086162164622116162181622056218661621646221161621826221062193616222762185616219560217621876162225621866218661621836021361622026220862180621996216158.
-5762226621646219562167616220262195602336221062167616216262205621676162195622106219462161622106219558 FAQ 576218560213602336162224621876219760213602326219462185616222862187616219362210621616162181602096023362167622256218160232616219560216602326218561621836021360232616222562197602336219958.
-\textbf{57621806021761621956221062194616219762208622246220560213621946218061622026221162203621956020962186616222662164621956216761622026219560233622106216761622276220362193602326162228621806023361621686221062161616217060232621996216758 ``576222662164621956216761622026219560233622106216761622256219762208616219960212621846021361621616221062195616220560232622106218558
- FAQ.''}
-
-\end{document}
-
-
-%%% Local Variables:
-%%% coding: utf-8
-%%% mode: latex
-%%% TeX-master: t
-%%% TeX-command-default: "CJKLaTeX"
-%%% End:
diff --git a/language/chinese/CJK/cjk-4.8.4/examples/pdf/Big5.pdf b/language/chinese/CJK/cjk-4.8.4/examples/pdf/Big5.pdf
deleted file mode 100644
index 673422ed7b..0000000000
--- a/language/chinese/CJK/cjk-4.8.4/examples/pdf/Big5.pdf
+++ /dev/null
Binary files differ
diff --git a/language/chinese/CJK/cjk-4.8.4/examples/pdf/Big5vert.pdf b/language/chinese/CJK/cjk-4.8.4/examples/pdf/Big5vert.pdf
deleted file mode 100644
index 6b00bd023f..0000000000
--- a/language/chinese/CJK/cjk-4.8.4/examples/pdf/Big5vert.pdf
+++ /dev/null
Binary files differ
diff --git a/language/chinese/CJK/cjk-4.8.4/examples/pdf/CEF_test.pdf b/language/chinese/CJK/cjk-4.8.4/examples/pdf/CEF_test.pdf
deleted file mode 100644
index e326af035d..0000000000
--- a/language/chinese/CJK/cjk-4.8.4/examples/pdf/CEF_test.pdf
+++ /dev/null
Binary files differ
diff --git a/language/chinese/CJK/cjk-4.8.4/examples/pdf/CJKbabel.pdf b/language/chinese/CJK/cjk-4.8.4/examples/pdf/CJKbabel.pdf
deleted file mode 100644
index 7d3dab33bd..0000000000
--- a/language/chinese/CJK/cjk-4.8.4/examples/pdf/CJKbabel.pdf
+++ /dev/null
Binary files differ
diff --git a/language/chinese/CJK/cjk-4.8.4/examples/pdf/CJKfntef.pdf b/language/chinese/CJK/cjk-4.8.4/examples/pdf/CJKfntef.pdf
deleted file mode 100644
index 58e7a7c418..0000000000
--- a/language/chinese/CJK/cjk-4.8.4/examples/pdf/CJKfntef.pdf
+++ /dev/null
Binary files differ
diff --git a/language/chinese/CJK/cjk-4.8.4/examples/pdf/CJKmixed.pdf b/language/chinese/CJK/cjk-4.8.4/examples/pdf/CJKmixed.pdf
deleted file mode 100644
index 6cd3bc814a..0000000000
--- a/language/chinese/CJK/cjk-4.8.4/examples/pdf/CJKmixed.pdf
+++ /dev/null
Binary files differ
diff --git a/language/chinese/CJK/cjk-4.8.4/examples/pdf/CJKspace.pdf b/language/chinese/CJK/cjk-4.8.4/examples/pdf/CJKspace.pdf
deleted file mode 100644
index 735b14ff80..0000000000
--- a/language/chinese/CJK/cjk-4.8.4/examples/pdf/CJKspace.pdf
+++ /dev/null
Binary files differ
diff --git a/language/chinese/CJK/cjk-4.8.4/examples/pdf/CJKutf8.pdf b/language/chinese/CJK/cjk-4.8.4/examples/pdf/CJKutf8.pdf
deleted file mode 100644
index 28cc7ee9bb..0000000000
--- a/language/chinese/CJK/cjk-4.8.4/examples/pdf/CJKutf8.pdf
+++ /dev/null
Binary files differ
diff --git a/language/chinese/CJK/cjk-4.8.4/examples/pdf/GB.pdf b/language/chinese/CJK/cjk-4.8.4/examples/pdf/GB.pdf
deleted file mode 100644
index 094c34a1fd..0000000000
--- a/language/chinese/CJK/cjk-4.8.4/examples/pdf/GB.pdf
+++ /dev/null
Binary files differ
diff --git a/language/chinese/CJK/cjk-4.8.4/examples/pdf/JIS.pdf b/language/chinese/CJK/cjk-4.8.4/examples/pdf/JIS.pdf
deleted file mode 100644
index 71e0a4335f..0000000000
--- a/language/chinese/CJK/cjk-4.8.4/examples/pdf/JIS.pdf
+++ /dev/null
Binary files differ
diff --git a/language/chinese/CJK/cjk-4.8.4/examples/pdf/KS.pdf b/language/chinese/CJK/cjk-4.8.4/examples/pdf/KS.pdf
deleted file mode 100644
index b64b1c7260..0000000000
--- a/language/chinese/CJK/cjk-4.8.4/examples/pdf/KS.pdf
+++ /dev/null
Binary files differ
diff --git a/language/chinese/CJK/cjk-4.8.4/examples/pdf/SJIS.pdf b/language/chinese/CJK/cjk-4.8.4/examples/pdf/SJIS.pdf
deleted file mode 100644
index 9fb248701c..0000000000
--- a/language/chinese/CJK/cjk-4.8.4/examples/pdf/SJIS.pdf
+++ /dev/null
Binary files differ
diff --git a/language/chinese/CJK/cjk-4.8.4/examples/pdf/UTF8.pdf b/language/chinese/CJK/cjk-4.8.4/examples/pdf/UTF8.pdf
deleted file mode 100644
index 851d91dfb0..0000000000
--- a/language/chinese/CJK/cjk-4.8.4/examples/pdf/UTF8.pdf
+++ /dev/null
Binary files differ
diff --git a/language/chinese/CJK/cjk-4.8.4/examples/pdf/muletest.pdf b/language/chinese/CJK/cjk-4.8.4/examples/pdf/muletest.pdf
deleted file mode 100644
index f7711e89c9..0000000000
--- a/language/chinese/CJK/cjk-4.8.4/examples/pdf/muletest.pdf
+++ /dev/null
Binary files differ
diff --git a/language/chinese/CJK/cjk-4.8.4/examples/pdf/py_test.pdf b/language/chinese/CJK/cjk-4.8.4/examples/pdf/py_test.pdf
deleted file mode 100644
index aca573272a..0000000000
--- a/language/chinese/CJK/cjk-4.8.4/examples/pdf/py_test.pdf
+++ /dev/null
Binary files differ
diff --git a/language/chinese/CJK/cjk-4.8.4/examples/pdf/pytest.pdf b/language/chinese/CJK/cjk-4.8.4/examples/pdf/pytest.pdf
deleted file mode 100644
index b4b458da6c..0000000000
--- a/language/chinese/CJK/cjk-4.8.4/examples/pdf/pytest.pdf
+++ /dev/null
Binary files differ
diff --git a/language/chinese/CJK/cjk-4.8.4/examples/pdf/rubytest.pdf b/language/chinese/CJK/cjk-4.8.4/examples/pdf/rubytest.pdf
deleted file mode 100644
index dc6d7b0ff7..0000000000
--- a/language/chinese/CJK/cjk-4.8.4/examples/pdf/rubytest.pdf
+++ /dev/null
Binary files differ
diff --git a/language/chinese/CJK/cjk-4.8.4/examples/pdf/thai.pdf b/language/chinese/CJK/cjk-4.8.4/examples/pdf/thai.pdf
deleted file mode 100644
index 322e0c696e..0000000000
--- a/language/chinese/CJK/cjk-4.8.4/examples/pdf/thai.pdf
+++ /dev/null
Binary files differ
diff --git a/language/chinese/CJK/cjk-4.8.4/examples/pdf/thai_utf8.pdf b/language/chinese/CJK/cjk-4.8.4/examples/pdf/thai_utf8.pdf
deleted file mode 100644
index e168279686..0000000000
--- a/language/chinese/CJK/cjk-4.8.4/examples/pdf/thai_utf8.pdf
+++ /dev/null
Binary files differ
diff --git a/language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/config.guess b/language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/config.guess
deleted file mode 100755
index f7eb141e75..0000000000
--- a/language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/config.guess
+++ /dev/null
@@ -1,1438 +0,0 @@
-#! /bin/sh
-# Attempt to guess a canonical system name.
-# Copyright 1992-2015 Free Software Foundation, Inc.
-
-timestamp='2015-03-04'
-
-# This file 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 3 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; if not, see <http://www.gnu.org/licenses/>.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that
-# program. This Exception is an additional permission under section 7
-# of the GNU General Public License, version 3 ("GPLv3").
-#
-# Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
-#
-# You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
-#
-# Please send patches to <config-patches@gnu.org>.
-
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION]
-
-Output the configuration name of the system \`$me' is run on.
-
-Operation modes:
- -h, --help print this help, then exit
- -t, --time-stamp print date of last modification, then exit
- -v, --version print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-version="\
-GNU config.guess ($timestamp)
-
-Originally written by Per Bothner.
-Copyright 1992-2015 Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions. There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
- case $1 in
- --time-stamp | --time* | -t )
- echo "$timestamp" ; exit ;;
- --version | -v )
- echo "$version" ; exit ;;
- --help | --h* | -h )
- echo "$usage"; exit ;;
- -- ) # Stop option processing
- shift; break ;;
- - ) # Use stdin as input.
- break ;;
- -* )
- echo "$me: invalid option $1$help" >&2
- exit 1 ;;
- * )
- break ;;
- esac
-done
-
-if test $# != 0; then
- echo "$me: too many arguments$help" >&2
- exit 1
-fi
-
-trap 'exit 1' 1 2 15
-
-# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
-# compiler to aid in system detection is discouraged as it requires
-# temporary files to be created and, as you can see below, it is a
-# headache to deal with in a portable fashion.
-
-# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
-# use `HOST_CC' if defined, but it is deprecated.
-
-# Portable tmp directory creation inspired by the Autoconf team.
-
-set_cc_for_build='
-trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
-trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
-: ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
- { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
- { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
- { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
-dummy=$tmp/dummy ;
-tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
-case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,) echo "int x;" > $dummy.c ;
- for c in cc gcc c89 c99 ; do
- if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
- CC_FOR_BUILD="$c"; break ;
- fi ;
- done ;
- if test x"$CC_FOR_BUILD" = x ; then
- CC_FOR_BUILD=no_compiler_found ;
- fi
- ;;
- ,,*) CC_FOR_BUILD=$CC ;;
- ,*,*) CC_FOR_BUILD=$HOST_CC ;;
-esac ; set_cc_for_build= ;'
-
-# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
-# (ghazi@noc.rutgers.edu 1994-08-24)
-if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
- PATH=$PATH:/.attbin ; export PATH
-fi
-
-UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
-UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
-UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
-UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
-
-case "${UNAME_SYSTEM}" in
-Linux|GNU|GNU/*)
- # If the system lacks a compiler, then just pick glibc.
- # We could probably try harder.
- LIBC=gnu
-
- eval $set_cc_for_build
- cat <<-EOF > $dummy.c
- #include <features.h>
- #if defined(__UCLIBC__)
- LIBC=uclibc
- #elif defined(__dietlibc__)
- LIBC=dietlibc
- #else
- LIBC=gnu
- #endif
- EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
- ;;
-esac
-
-# Note: order is significant - the case branches are not exclusive.
-
-case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
- *:NetBSD:*:*)
- # NetBSD (nbsd) targets should (where applicable) match one or
- # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
- # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently
- # switched to ELF, *-*-netbsd* would select the old
- # object file format. This provides both forward
- # compatibility and a consistent mechanism for selecting the
- # object file format.
- #
- # Note: NetBSD doesn't particularly care about the vendor
- # portion of the name. We always set it to "unknown".
- sysctl="sysctl -n hw.machine_arch"
- UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \
- /sbin/$sysctl 2>/dev/null || \
- /usr/sbin/$sysctl 2>/dev/null || \
- echo unknown)`
- case "${UNAME_MACHINE_ARCH}" in
- armeb) machine=armeb-unknown ;;
- arm*) machine=arm-unknown ;;
- sh3el) machine=shl-unknown ;;
- sh3eb) machine=sh-unknown ;;
- sh5el) machine=sh5le-unknown ;;
- earmv*)
- arch=`echo ${UNAME_MACHINE_ARCH} | sed -e 's,^e\(armv[0-9]\).*$,\1,'`
- endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne 's,^.*\(eb\)$,\1,p'`
- machine=${arch}${endian}-unknown
- ;;
- *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
- esac
- # The Operating System including object format, if it has switched
- # to ELF recently, or will in the future.
- case "${UNAME_MACHINE_ARCH}" in
- arm*|earm*|i386|m68k|ns32k|sh3*|sparc|vax)
- eval $set_cc_for_build
- if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
- | grep -q __ELF__
- then
- # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
- # Return netbsd for either. FIX?
- os=netbsd
- else
- os=netbsdelf
- fi
- ;;
- *)
- os=netbsd
- ;;
- esac
- # Determine ABI tags.
- case "${UNAME_MACHINE_ARCH}" in
- earm*)
- expr='s/^earmv[0-9]/-eabi/;s/eb$//'
- abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"`
- ;;
- esac
- # The OS release
- # Debian GNU/NetBSD machines have a different userland, and
- # thus, need a distinct triplet. However, they do not need
- # kernel version information, so it can be replaced with a
- # suitable tag, in the style of linux-gnu.
- case "${UNAME_VERSION}" in
- Debian*)
- release='-gnu'
- ;;
- *)
- release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
- ;;
- esac
- # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
- # contains redundant information, the shorter form:
- # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
- echo "${machine}-${os}${release}${abi}"
- exit ;;
- *:Bitrig:*:*)
- UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
- echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
- exit ;;
- *:OpenBSD:*:*)
- UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
- echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
- exit ;;
- *:ekkoBSD:*:*)
- echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
- exit ;;
- *:SolidBSD:*:*)
- echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
- exit ;;
- macppc:MirBSD:*:*)
- echo powerpc-unknown-mirbsd${UNAME_RELEASE}
- exit ;;
- *:MirBSD:*:*)
- echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
- exit ;;
- alpha:OSF1:*:*)
- case $UNAME_RELEASE in
- *4.0)
- UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
- ;;
- *5.*)
- UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
- ;;
- esac
- # According to Compaq, /usr/sbin/psrinfo has been available on
- # OSF/1 and Tru64 systems produced since 1995. I hope that
- # covers most systems running today. This code pipes the CPU
- # types through head -n 1, so we only detect the type of CPU 0.
- ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1`
- case "$ALPHA_CPU_TYPE" in
- "EV4 (21064)")
- UNAME_MACHINE="alpha" ;;
- "EV4.5 (21064)")
- UNAME_MACHINE="alpha" ;;
- "LCA4 (21066/21068)")
- UNAME_MACHINE="alpha" ;;
- "EV5 (21164)")
- UNAME_MACHINE="alphaev5" ;;
- "EV5.6 (21164A)")
- UNAME_MACHINE="alphaev56" ;;
- "EV5.6 (21164PC)")
- UNAME_MACHINE="alphapca56" ;;
- "EV5.7 (21164PC)")
- UNAME_MACHINE="alphapca57" ;;
- "EV6 (21264)")
- UNAME_MACHINE="alphaev6" ;;
- "EV6.7 (21264A)")
- UNAME_MACHINE="alphaev67" ;;
- "EV6.8CB (21264C)")
- UNAME_MACHINE="alphaev68" ;;
- "EV6.8AL (21264B)")
- UNAME_MACHINE="alphaev68" ;;
- "EV6.8CX (21264D)")
- UNAME_MACHINE="alphaev68" ;;
- "EV6.9A (21264/EV69A)")
- UNAME_MACHINE="alphaev69" ;;
- "EV7 (21364)")
- UNAME_MACHINE="alphaev7" ;;
- "EV7.9 (21364A)")
- UNAME_MACHINE="alphaev79" ;;
- esac
- # A Pn.n version is a patched version.
- # A Vn.n version is a released version.
- # A Tn.n version is a released field test version.
- # A Xn.n version is an unreleased experimental baselevel.
- # 1.2 uses "1.2" for uname -r.
- echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
- # Reset EXIT trap before exiting to avoid spurious non-zero exit code.
- exitcode=$?
- trap '' 0
- exit $exitcode ;;
- Alpha\ *:Windows_NT*:*)
- # How do we know it's Interix rather than the generic POSIX subsystem?
- # Should we change UNAME_MACHINE based on the output of uname instead
- # of the specific Alpha model?
- echo alpha-pc-interix
- exit ;;
- 21064:Windows_NT:50:3)
- echo alpha-dec-winnt3.5
- exit ;;
- Amiga*:UNIX_System_V:4.0:*)
- echo m68k-unknown-sysv4
- exit ;;
- *:[Aa]miga[Oo][Ss]:*:*)
- echo ${UNAME_MACHINE}-unknown-amigaos
- exit ;;
- *:[Mm]orph[Oo][Ss]:*:*)
- echo ${UNAME_MACHINE}-unknown-morphos
- exit ;;
- *:OS/390:*:*)
- echo i370-ibm-openedition
- exit ;;
- *:z/VM:*:*)
- echo s390-ibm-zvmoe
- exit ;;
- *:OS400:*:*)
- echo powerpc-ibm-os400
- exit ;;
- arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
- echo arm-acorn-riscix${UNAME_RELEASE}
- exit ;;
- arm*:riscos:*:*|arm*:RISCOS:*:*)
- echo arm-unknown-riscos
- exit ;;
- SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
- echo hppa1.1-hitachi-hiuxmpp
- exit ;;
- Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
- # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
- if test "`(/bin/universe) 2>/dev/null`" = att ; then
- echo pyramid-pyramid-sysv3
- else
- echo pyramid-pyramid-bsd
- fi
- exit ;;
- NILE*:*:*:dcosx)
- echo pyramid-pyramid-svr4
- exit ;;
- DRS?6000:unix:4.0:6*)
- echo sparc-icl-nx6
- exit ;;
- DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
- case `/usr/bin/uname -p` in
- sparc) echo sparc-icl-nx7; exit ;;
- esac ;;
- s390x:SunOS:*:*)
- echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit ;;
- sun4H:SunOS:5.*:*)
- echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit ;;
- sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
- echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit ;;
- i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
- echo i386-pc-auroraux${UNAME_RELEASE}
- exit ;;
- i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
- eval $set_cc_for_build
- SUN_ARCH="i386"
- # If there is a compiler, see if it is configured for 64-bit objects.
- # Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
- # This test works for both compilers.
- if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
- if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
- (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
- grep IS_64BIT_ARCH >/dev/null
- then
- SUN_ARCH="x86_64"
- fi
- fi
- echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit ;;
- sun4*:SunOS:6*:*)
- # According to config.sub, this is the proper way to canonicalize
- # SunOS6. Hard to guess exactly what SunOS6 will be like, but
- # it's likely to be more like Solaris than SunOS4.
- echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit ;;
- sun4*:SunOS:*:*)
- case "`/usr/bin/arch -k`" in
- Series*|S4*)
- UNAME_RELEASE=`uname -v`
- ;;
- esac
- # Japanese Language versions have a version number like `4.1.3-JL'.
- echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
- exit ;;
- sun3*:SunOS:*:*)
- echo m68k-sun-sunos${UNAME_RELEASE}
- exit ;;
- sun*:*:4.2BSD:*)
- UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
- test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
- case "`/bin/arch`" in
- sun3)
- echo m68k-sun-sunos${UNAME_RELEASE}
- ;;
- sun4)
- echo sparc-sun-sunos${UNAME_RELEASE}
- ;;
- esac
- exit ;;
- aushp:SunOS:*:*)
- echo sparc-auspex-sunos${UNAME_RELEASE}
- exit ;;
- # The situation for MiNT is a little confusing. The machine name
- # can be virtually everything (everything which is not
- # "atarist" or "atariste" at least should have a processor
- # > m68000). The system name ranges from "MiNT" over "FreeMiNT"
- # to the lowercase version "mint" (or "freemint"). Finally
- # the system name "TOS" denotes a system which is actually not
- # MiNT. But MiNT is downward compatible to TOS, so this should
- # be no problem.
- atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
- echo m68k-atari-mint${UNAME_RELEASE}
- exit ;;
- atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
- echo m68k-atari-mint${UNAME_RELEASE}
- exit ;;
- *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
- echo m68k-atari-mint${UNAME_RELEASE}
- exit ;;
- milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
- echo m68k-milan-mint${UNAME_RELEASE}
- exit ;;
- hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
- echo m68k-hades-mint${UNAME_RELEASE}
- exit ;;
- *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
- echo m68k-unknown-mint${UNAME_RELEASE}
- exit ;;
- m68k:machten:*:*)
- echo m68k-apple-machten${UNAME_RELEASE}
- exit ;;
- powerpc:machten:*:*)
- echo powerpc-apple-machten${UNAME_RELEASE}
- exit ;;
- RISC*:Mach:*:*)
- echo mips-dec-mach_bsd4.3
- exit ;;
- RISC*:ULTRIX:*:*)
- echo mips-dec-ultrix${UNAME_RELEASE}
- exit ;;
- VAX*:ULTRIX*:*:*)
- echo vax-dec-ultrix${UNAME_RELEASE}
- exit ;;
- 2020:CLIX:*:* | 2430:CLIX:*:*)
- echo clipper-intergraph-clix${UNAME_RELEASE}
- exit ;;
- mips:*:*:UMIPS | mips:*:*:RISCos)
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
-#ifdef __cplusplus
-#include <stdio.h> /* for printf() prototype */
- int main (int argc, char *argv[]) {
-#else
- int main (argc, argv) int argc; char *argv[]; {
-#endif
- #if defined (host_mips) && defined (MIPSEB)
- #if defined (SYSTYPE_SYSV)
- printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
- #endif
- #if defined (SYSTYPE_SVR4)
- printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
- #endif
- #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
- printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
- #endif
- #endif
- exit (-1);
- }
-EOF
- $CC_FOR_BUILD -o $dummy $dummy.c &&
- dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
- SYSTEM_NAME=`$dummy $dummyarg` &&
- { echo "$SYSTEM_NAME"; exit; }
- echo mips-mips-riscos${UNAME_RELEASE}
- exit ;;
- Motorola:PowerMAX_OS:*:*)
- echo powerpc-motorola-powermax
- exit ;;
- Motorola:*:4.3:PL8-*)
- echo powerpc-harris-powermax
- exit ;;
- Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
- echo powerpc-harris-powermax
- exit ;;
- Night_Hawk:Power_UNIX:*:*)
- echo powerpc-harris-powerunix
- exit ;;
- m88k:CX/UX:7*:*)
- echo m88k-harris-cxux7
- exit ;;
- m88k:*:4*:R4*)
- echo m88k-motorola-sysv4
- exit ;;
- m88k:*:3*:R3*)
- echo m88k-motorola-sysv3
- exit ;;
- AViiON:dgux:*:*)
- # DG/UX returns AViiON for all architectures
- UNAME_PROCESSOR=`/usr/bin/uname -p`
- if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
- then
- if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
- [ ${TARGET_BINARY_INTERFACE}x = x ]
- then
- echo m88k-dg-dgux${UNAME_RELEASE}
- else
- echo m88k-dg-dguxbcs${UNAME_RELEASE}
- fi
- else
- echo i586-dg-dgux${UNAME_RELEASE}
- fi
- exit ;;
- M88*:DolphinOS:*:*) # DolphinOS (SVR3)
- echo m88k-dolphin-sysv3
- exit ;;
- M88*:*:R3*:*)
- # Delta 88k system running SVR3
- echo m88k-motorola-sysv3
- exit ;;
- XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
- echo m88k-tektronix-sysv3
- exit ;;
- Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
- echo m68k-tektronix-bsd
- exit ;;
- *:IRIX*:*:*)
- echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
- exit ;;
- ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
- echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id
- exit ;; # Note that: echo "'`uname -s`'" gives 'AIX '
- i*86:AIX:*:*)
- echo i386-ibm-aix
- exit ;;
- ia64:AIX:*:*)
- if [ -x /usr/bin/oslevel ] ; then
- IBM_REV=`/usr/bin/oslevel`
- else
- IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
- fi
- echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
- exit ;;
- *:AIX:2:3)
- if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
- #include <sys/systemcfg.h>
-
- main()
- {
- if (!__power_pc())
- exit(1);
- puts("powerpc-ibm-aix3.2.5");
- exit(0);
- }
-EOF
- if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
- then
- echo "$SYSTEM_NAME"
- else
- echo rs6000-ibm-aix3.2.5
- fi
- elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
- echo rs6000-ibm-aix3.2.4
- else
- echo rs6000-ibm-aix3.2
- fi
- exit ;;
- *:AIX:*:[4567])
- IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
- if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
- IBM_ARCH=rs6000
- else
- IBM_ARCH=powerpc
- fi
- if [ -x /usr/bin/lslpp ] ; then
- IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc |
- awk -F: '{ print $3 }' | sed s/[0-9]*$/0/`
- else
- IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
- fi
- echo ${IBM_ARCH}-ibm-aix${IBM_REV}
- exit ;;
- *:AIX:*:*)
- echo rs6000-ibm-aix
- exit ;;
- ibmrt:4.4BSD:*|romp-ibm:BSD:*)
- echo romp-ibm-bsd4.4
- exit ;;
- ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and
- echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to
- exit ;; # report: romp-ibm BSD 4.3
- *:BOSX:*:*)
- echo rs6000-bull-bosx
- exit ;;
- DPX/2?00:B.O.S.:*:*)
- echo m68k-bull-sysv3
- exit ;;
- 9000/[34]??:4.3bsd:1.*:*)
- echo m68k-hp-bsd
- exit ;;
- hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
- echo m68k-hp-bsd4.4
- exit ;;
- 9000/[34678]??:HP-UX:*:*)
- HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
- case "${UNAME_MACHINE}" in
- 9000/31? ) HP_ARCH=m68000 ;;
- 9000/[34]?? ) HP_ARCH=m68k ;;
- 9000/[678][0-9][0-9])
- if [ -x /usr/bin/getconf ]; then
- sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
- sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
- case "${sc_cpu_version}" in
- 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
- 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
- 532) # CPU_PA_RISC2_0
- case "${sc_kernel_bits}" in
- 32) HP_ARCH="hppa2.0n" ;;
- 64) HP_ARCH="hppa2.0w" ;;
- '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20
- esac ;;
- esac
- fi
- if [ "${HP_ARCH}" = "" ]; then
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
-
- #define _HPUX_SOURCE
- #include <stdlib.h>
- #include <unistd.h>
-
- int main ()
- {
- #if defined(_SC_KERNEL_BITS)
- long bits = sysconf(_SC_KERNEL_BITS);
- #endif
- long cpu = sysconf (_SC_CPU_VERSION);
-
- switch (cpu)
- {
- case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
- case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
- case CPU_PA_RISC2_0:
- #if defined(_SC_KERNEL_BITS)
- switch (bits)
- {
- case 64: puts ("hppa2.0w"); break;
- case 32: puts ("hppa2.0n"); break;
- default: puts ("hppa2.0"); break;
- } break;
- #else /* !defined(_SC_KERNEL_BITS) */
- puts ("hppa2.0"); break;
- #endif
- default: puts ("hppa1.0"); break;
- }
- exit (0);
- }
-EOF
- (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
- test -z "$HP_ARCH" && HP_ARCH=hppa
- fi ;;
- esac
- if [ ${HP_ARCH} = "hppa2.0w" ]
- then
- eval $set_cc_for_build
-
- # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
- # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler
- # generating 64-bit code. GNU and HP use different nomenclature:
- #
- # $ CC_FOR_BUILD=cc ./config.guess
- # => hppa2.0w-hp-hpux11.23
- # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
- # => hppa64-hp-hpux11.23
-
- if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
- grep -q __LP64__
- then
- HP_ARCH="hppa2.0w"
- else
- HP_ARCH="hppa64"
- fi
- fi
- echo ${HP_ARCH}-hp-hpux${HPUX_REV}
- exit ;;
- ia64:HP-UX:*:*)
- HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
- echo ia64-hp-hpux${HPUX_REV}
- exit ;;
- 3050*:HI-UX:*:*)
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
- #include <unistd.h>
- int
- main ()
- {
- long cpu = sysconf (_SC_CPU_VERSION);
- /* The order matters, because CPU_IS_HP_MC68K erroneously returns
- true for CPU_PA_RISC1_0. CPU_IS_PA_RISC returns correct
- results, however. */
- if (CPU_IS_PA_RISC (cpu))
- {
- switch (cpu)
- {
- case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
- case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
- case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
- default: puts ("hppa-hitachi-hiuxwe2"); break;
- }
- }
- else if (CPU_IS_HP_MC68K (cpu))
- puts ("m68k-hitachi-hiuxwe2");
- else puts ("unknown-hitachi-hiuxwe2");
- exit (0);
- }
-EOF
- $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
- { echo "$SYSTEM_NAME"; exit; }
- echo unknown-hitachi-hiuxwe2
- exit ;;
- 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
- echo hppa1.1-hp-bsd
- exit ;;
- 9000/8??:4.3bsd:*:*)
- echo hppa1.0-hp-bsd
- exit ;;
- *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
- echo hppa1.0-hp-mpeix
- exit ;;
- hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
- echo hppa1.1-hp-osf
- exit ;;
- hp8??:OSF1:*:*)
- echo hppa1.0-hp-osf
- exit ;;
- i*86:OSF1:*:*)
- if [ -x /usr/sbin/sysversion ] ; then
- echo ${UNAME_MACHINE}-unknown-osf1mk
- else
- echo ${UNAME_MACHINE}-unknown-osf1
- fi
- exit ;;
- parisc*:Lites*:*:*)
- echo hppa1.1-hp-lites
- exit ;;
- C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
- echo c1-convex-bsd
- exit ;;
- C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
- if getsysinfo -f scalar_acc
- then echo c32-convex-bsd
- else echo c2-convex-bsd
- fi
- exit ;;
- C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
- echo c34-convex-bsd
- exit ;;
- C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
- echo c38-convex-bsd
- exit ;;
- C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
- echo c4-convex-bsd
- exit ;;
- CRAY*Y-MP:*:*:*)
- echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- exit ;;
- CRAY*[A-Z]90:*:*:*)
- echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
- | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
- -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
- -e 's/\.[^.]*$/.X/'
- exit ;;
- CRAY*TS:*:*:*)
- echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- exit ;;
- CRAY*T3E:*:*:*)
- echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- exit ;;
- CRAY*SV1:*:*:*)
- echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- exit ;;
- *:UNICOS/mp:*:*)
- echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- exit ;;
- F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
- FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
- FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
- echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
- exit ;;
- 5000:UNIX_System_V:4.*:*)
- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
- FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
- echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
- exit ;;
- i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
- echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
- exit ;;
- sparc*:BSD/OS:*:*)
- echo sparc-unknown-bsdi${UNAME_RELEASE}
- exit ;;
- *:BSD/OS:*:*)
- echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
- exit ;;
- *:FreeBSD:*:*)
- UNAME_PROCESSOR=`/usr/bin/uname -p`
- case ${UNAME_PROCESSOR} in
- amd64)
- echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
- *)
- echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
- esac
- exit ;;
- i*:CYGWIN*:*)
- echo ${UNAME_MACHINE}-pc-cygwin
- exit ;;
- *:MINGW64*:*)
- echo ${UNAME_MACHINE}-pc-mingw64
- exit ;;
- *:MINGW*:*)
- echo ${UNAME_MACHINE}-pc-mingw32
- exit ;;
- *:MSYS*:*)
- echo ${UNAME_MACHINE}-pc-msys
- exit ;;
- i*:windows32*:*)
- # uname -m includes "-pc" on this system.
- echo ${UNAME_MACHINE}-mingw32
- exit ;;
- i*:PW*:*)
- echo ${UNAME_MACHINE}-pc-pw32
- exit ;;
- *:Interix*:*)
- case ${UNAME_MACHINE} in
- x86)
- echo i586-pc-interix${UNAME_RELEASE}
- exit ;;
- authenticamd | genuineintel | EM64T)
- echo x86_64-unknown-interix${UNAME_RELEASE}
- exit ;;
- IA64)
- echo ia64-unknown-interix${UNAME_RELEASE}
- exit ;;
- esac ;;
- [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
- echo i${UNAME_MACHINE}-pc-mks
- exit ;;
- 8664:Windows_NT:*)
- echo x86_64-pc-mks
- exit ;;
- i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
- # How do we know it's Interix rather than the generic POSIX subsystem?
- # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
- # UNAME_MACHINE based on the output of uname instead of i386?
- echo i586-pc-interix
- exit ;;
- i*:UWIN*:*)
- echo ${UNAME_MACHINE}-pc-uwin
- exit ;;
- amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
- echo x86_64-unknown-cygwin
- exit ;;
- p*:CYGWIN*:*)
- echo powerpcle-unknown-cygwin
- exit ;;
- prep*:SunOS:5.*:*)
- echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit ;;
- *:GNU:*:*)
- # the GNU system
- echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
- exit ;;
- *:GNU/*:*:*)
- # other systems with GNU libc and userland
- echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
- exit ;;
- i*86:Minix:*:*)
- echo ${UNAME_MACHINE}-pc-minix
- exit ;;
- aarch64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- exit ;;
- aarch64_be:Linux:*:*)
- UNAME_MACHINE=aarch64_be
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- exit ;;
- alpha:Linux:*:*)
- case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
- EV5) UNAME_MACHINE=alphaev5 ;;
- EV56) UNAME_MACHINE=alphaev56 ;;
- PCA56) UNAME_MACHINE=alphapca56 ;;
- PCA57) UNAME_MACHINE=alphapca56 ;;
- EV6) UNAME_MACHINE=alphaev6 ;;
- EV67) UNAME_MACHINE=alphaev67 ;;
- EV68*) UNAME_MACHINE=alphaev68 ;;
- esac
- objdump --private-headers /bin/sh | grep -q ld.so.1
- if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- exit ;;
- arc:Linux:*:* | arceb:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- exit ;;
- arm*:Linux:*:*)
- eval $set_cc_for_build
- if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
- | grep -q __ARM_EABI__
- then
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- else
- if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
- | grep -q __ARM_PCS_VFP
- then
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
- else
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
- fi
- fi
- exit ;;
- avr32*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- exit ;;
- cris:Linux:*:*)
- echo ${UNAME_MACHINE}-axis-linux-${LIBC}
- exit ;;
- crisv32:Linux:*:*)
- echo ${UNAME_MACHINE}-axis-linux-${LIBC}
- exit ;;
- e2k:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- exit ;;
- frv:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- exit ;;
- hexagon:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- exit ;;
- i*86:Linux:*:*)
- echo ${UNAME_MACHINE}-pc-linux-${LIBC}
- exit ;;
- ia64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- exit ;;
- m32r*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- exit ;;
- m68*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- exit ;;
- mips:Linux:*:* | mips64:Linux:*:*)
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
- #undef CPU
- #undef ${UNAME_MACHINE}
- #undef ${UNAME_MACHINE}el
- #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
- CPU=${UNAME_MACHINE}el
- #else
- #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
- CPU=${UNAME_MACHINE}
- #else
- CPU=
- #endif
- #endif
-EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
- ;;
- openrisc*:Linux:*:*)
- echo or1k-unknown-linux-${LIBC}
- exit ;;
- or32:Linux:*:* | or1k*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- exit ;;
- padre:Linux:*:*)
- echo sparc-unknown-linux-${LIBC}
- exit ;;
- parisc64:Linux:*:* | hppa64:Linux:*:*)
- echo hppa64-unknown-linux-${LIBC}
- exit ;;
- parisc:Linux:*:* | hppa:Linux:*:*)
- # Look for CPU level
- case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
- PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
- PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
- *) echo hppa-unknown-linux-${LIBC} ;;
- esac
- exit ;;
- ppc64:Linux:*:*)
- echo powerpc64-unknown-linux-${LIBC}
- exit ;;
- ppc:Linux:*:*)
- echo powerpc-unknown-linux-${LIBC}
- exit ;;
- ppc64le:Linux:*:*)
- echo powerpc64le-unknown-linux-${LIBC}
- exit ;;
- ppcle:Linux:*:*)
- echo powerpcle-unknown-linux-${LIBC}
- exit ;;
- s390:Linux:*:* | s390x:Linux:*:*)
- echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
- exit ;;
- sh64*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- exit ;;
- sh*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- exit ;;
- sparc:Linux:*:* | sparc64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- exit ;;
- tile*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- exit ;;
- vax:Linux:*:*)
- echo ${UNAME_MACHINE}-dec-linux-${LIBC}
- exit ;;
- x86_64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- exit ;;
- xtensa*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- exit ;;
- i*86:DYNIX/ptx:4*:*)
- # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
- # earlier versions are messed up and put the nodename in both
- # sysname and nodename.
- echo i386-sequent-sysv4
- exit ;;
- i*86:UNIX_SV:4.2MP:2.*)
- # Unixware is an offshoot of SVR4, but it has its own version
- # number series starting with 2...
- # I am not positive that other SVR4 systems won't match this,
- # I just have to hope. -- rms.
- # Use sysv4.2uw... so that sysv4* matches it.
- echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
- exit ;;
- i*86:OS/2:*:*)
- # If we were able to find `uname', then EMX Unix compatibility
- # is probably installed.
- echo ${UNAME_MACHINE}-pc-os2-emx
- exit ;;
- i*86:XTS-300:*:STOP)
- echo ${UNAME_MACHINE}-unknown-stop
- exit ;;
- i*86:atheos:*:*)
- echo ${UNAME_MACHINE}-unknown-atheos
- exit ;;
- i*86:syllable:*:*)
- echo ${UNAME_MACHINE}-pc-syllable
- exit ;;
- i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
- echo i386-unknown-lynxos${UNAME_RELEASE}
- exit ;;
- i*86:*DOS:*:*)
- echo ${UNAME_MACHINE}-pc-msdosdjgpp
- exit ;;
- i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
- UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
- if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
- echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
- else
- echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
- fi
- exit ;;
- i*86:*:5:[678]*)
- # UnixWare 7.x, OpenUNIX and OpenServer 6.
- case `/bin/uname -X | grep "^Machine"` in
- *486*) UNAME_MACHINE=i486 ;;
- *Pentium) UNAME_MACHINE=i586 ;;
- *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
- esac
- echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
- exit ;;
- i*86:*:3.2:*)
- if test -f /usr/options/cb.name; then
- UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
- echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
- elif /bin/uname -X 2>/dev/null >/dev/null ; then
- UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
- (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
- (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
- && UNAME_MACHINE=i586
- (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
- && UNAME_MACHINE=i686
- (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
- && UNAME_MACHINE=i686
- echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
- else
- echo ${UNAME_MACHINE}-pc-sysv32
- fi
- exit ;;
- pc:*:*:*)
- # Left here for compatibility:
- # uname -m prints for DJGPP always 'pc', but it prints nothing about
- # the processor, so we play safe by assuming i586.
- # Note: whatever this is, it MUST be the same as what config.sub
- # prints for the "djgpp" host, or else GDB configury will decide that
- # this is a cross-build.
- echo i586-pc-msdosdjgpp
- exit ;;
- Intel:Mach:3*:*)
- echo i386-pc-mach3
- exit ;;
- paragon:*:*:*)
- echo i860-intel-osf1
- exit ;;
- i860:*:4.*:*) # i860-SVR4
- if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
- echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
- else # Add other i860-SVR4 vendors below as they are discovered.
- echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4
- fi
- exit ;;
- mini*:CTIX:SYS*5:*)
- # "miniframe"
- echo m68010-convergent-sysv
- exit ;;
- mc68k:UNIX:SYSTEM5:3.51m)
- echo m68k-convergent-sysv
- exit ;;
- M680?0:D-NIX:5.3:*)
- echo m68k-diab-dnix
- exit ;;
- M68*:*:R3V[5678]*:*)
- test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
- 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
- OS_REL=''
- test -r /etc/.relid \
- && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
- && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
- /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
- && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
- 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
- && { echo i486-ncr-sysv4; exit; } ;;
- NCR*:*:4.2:* | MPRAS*:*:4.2:*)
- OS_REL='.3'
- test -r /etc/.relid \
- && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
- && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
- /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
- && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
- /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
- && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
- m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
- echo m68k-unknown-lynxos${UNAME_RELEASE}
- exit ;;
- mc68030:UNIX_System_V:4.*:*)
- echo m68k-atari-sysv4
- exit ;;
- TSUNAMI:LynxOS:2.*:*)
- echo sparc-unknown-lynxos${UNAME_RELEASE}
- exit ;;
- rs6000:LynxOS:2.*:*)
- echo rs6000-unknown-lynxos${UNAME_RELEASE}
- exit ;;
- PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
- echo powerpc-unknown-lynxos${UNAME_RELEASE}
- exit ;;
- SM[BE]S:UNIX_SV:*:*)
- echo mips-dde-sysv${UNAME_RELEASE}
- exit ;;
- RM*:ReliantUNIX-*:*:*)
- echo mips-sni-sysv4
- exit ;;
- RM*:SINIX-*:*:*)
- echo mips-sni-sysv4
- exit ;;
- *:SINIX-*:*:*)
- if uname -p 2>/dev/null >/dev/null ; then
- UNAME_MACHINE=`(uname -p) 2>/dev/null`
- echo ${UNAME_MACHINE}-sni-sysv4
- else
- echo ns32k-sni-sysv
- fi
- exit ;;
- PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
- # says <Richard.M.Bartel@ccMail.Census.GOV>
- echo i586-unisys-sysv4
- exit ;;
- *:UNIX_System_V:4*:FTX*)
- # From Gerald Hewes <hewes@openmarket.com>.
- # How about differentiating between stratus architectures? -djm
- echo hppa1.1-stratus-sysv4
- exit ;;
- *:*:*:FTX*)
- # From seanf@swdc.stratus.com.
- echo i860-stratus-sysv4
- exit ;;
- i*86:VOS:*:*)
- # From Paul.Green@stratus.com.
- echo ${UNAME_MACHINE}-stratus-vos
- exit ;;
- *:VOS:*:*)
- # From Paul.Green@stratus.com.
- echo hppa1.1-stratus-vos
- exit ;;
- mc68*:A/UX:*:*)
- echo m68k-apple-aux${UNAME_RELEASE}
- exit ;;
- news*:NEWS-OS:6*:*)
- echo mips-sony-newsos6
- exit ;;
- R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
- if [ -d /usr/nec ]; then
- echo mips-nec-sysv${UNAME_RELEASE}
- else
- echo mips-unknown-sysv${UNAME_RELEASE}
- fi
- exit ;;
- BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
- echo powerpc-be-beos
- exit ;;
- BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only.
- echo powerpc-apple-beos
- exit ;;
- BePC:BeOS:*:*) # BeOS running on Intel PC compatible.
- echo i586-pc-beos
- exit ;;
- BePC:Haiku:*:*) # Haiku running on Intel PC compatible.
- echo i586-pc-haiku
- exit ;;
- x86_64:Haiku:*:*)
- echo x86_64-unknown-haiku
- exit ;;
- SX-4:SUPER-UX:*:*)
- echo sx4-nec-superux${UNAME_RELEASE}
- exit ;;
- SX-5:SUPER-UX:*:*)
- echo sx5-nec-superux${UNAME_RELEASE}
- exit ;;
- SX-6:SUPER-UX:*:*)
- echo sx6-nec-superux${UNAME_RELEASE}
- exit ;;
- SX-7:SUPER-UX:*:*)
- echo sx7-nec-superux${UNAME_RELEASE}
- exit ;;
- SX-8:SUPER-UX:*:*)
- echo sx8-nec-superux${UNAME_RELEASE}
- exit ;;
- SX-8R:SUPER-UX:*:*)
- echo sx8r-nec-superux${UNAME_RELEASE}
- exit ;;
- Power*:Rhapsody:*:*)
- echo powerpc-apple-rhapsody${UNAME_RELEASE}
- exit ;;
- *:Rhapsody:*:*)
- echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
- exit ;;
- *:Darwin:*:*)
- UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
- eval $set_cc_for_build
- if test "$UNAME_PROCESSOR" = unknown ; then
- UNAME_PROCESSOR=powerpc
- fi
- if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
- if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
- if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
- (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
- grep IS_64BIT_ARCH >/dev/null
- then
- case $UNAME_PROCESSOR in
- i386) UNAME_PROCESSOR=x86_64 ;;
- powerpc) UNAME_PROCESSOR=powerpc64 ;;
- esac
- fi
- fi
- elif test "$UNAME_PROCESSOR" = i386 ; then
- # Avoid executing cc on OS X 10.9, as it ships with a stub
- # that puts up a graphical alert prompting to install
- # developer tools. Any system running Mac OS X 10.7 or
- # later (Darwin 11 and later) is required to have a 64-bit
- # processor. This is not true of the ARM version of Darwin
- # that Apple uses in portable devices.
- UNAME_PROCESSOR=x86_64
- fi
- echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
- exit ;;
- *:procnto*:*:* | *:QNX:[0123456789]*:*)
- UNAME_PROCESSOR=`uname -p`
- if test "$UNAME_PROCESSOR" = "x86"; then
- UNAME_PROCESSOR=i386
- UNAME_MACHINE=pc
- fi
- echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
- exit ;;
- *:QNX:*:4*)
- echo i386-pc-qnx
- exit ;;
- NEO-?:NONSTOP_KERNEL:*:*)
- echo neo-tandem-nsk${UNAME_RELEASE}
- exit ;;
- NSE-*:NONSTOP_KERNEL:*:*)
- echo nse-tandem-nsk${UNAME_RELEASE}
- exit ;;
- NSR-?:NONSTOP_KERNEL:*:*)
- echo nsr-tandem-nsk${UNAME_RELEASE}
- exit ;;
- *:NonStop-UX:*:*)
- echo mips-compaq-nonstopux
- exit ;;
- BS2000:POSIX*:*:*)
- echo bs2000-siemens-sysv
- exit ;;
- DS/*:UNIX_System_V:*:*)
- echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
- exit ;;
- *:Plan9:*:*)
- # "uname -m" is not consistent, so use $cputype instead. 386
- # is converted to i386 for consistency with other x86
- # operating systems.
- if test "$cputype" = "386"; then
- UNAME_MACHINE=i386
- else
- UNAME_MACHINE="$cputype"
- fi
- echo ${UNAME_MACHINE}-unknown-plan9
- exit ;;
- *:TOPS-10:*:*)
- echo pdp10-unknown-tops10
- exit ;;
- *:TENEX:*:*)
- echo pdp10-unknown-tenex
- exit ;;
- KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
- echo pdp10-dec-tops20
- exit ;;
- XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
- echo pdp10-xkl-tops20
- exit ;;
- *:TOPS-20:*:*)
- echo pdp10-unknown-tops20
- exit ;;
- *:ITS:*:*)
- echo pdp10-unknown-its
- exit ;;
- SEI:*:*:SEIUX)
- echo mips-sei-seiux${UNAME_RELEASE}
- exit ;;
- *:DragonFly:*:*)
- echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
- exit ;;
- *:*VMS:*:*)
- UNAME_MACHINE=`(uname -p) 2>/dev/null`
- case "${UNAME_MACHINE}" in
- A*) echo alpha-dec-vms ; exit ;;
- I*) echo ia64-dec-vms ; exit ;;
- V*) echo vax-dec-vms ; exit ;;
- esac ;;
- *:XENIX:*:SysV)
- echo i386-pc-xenix
- exit ;;
- i*86:skyos:*:*)
- echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
- exit ;;
- i*86:rdos:*:*)
- echo ${UNAME_MACHINE}-pc-rdos
- exit ;;
- i*86:AROS:*:*)
- echo ${UNAME_MACHINE}-pc-aros
- exit ;;
- x86_64:VMkernel:*:*)
- echo ${UNAME_MACHINE}-unknown-esx
- exit ;;
-esac
-
-cat >&2 <<EOF
-$0: unable to guess system type
-
-This script, last modified $timestamp, has failed to recognize
-the operating system you are using. It is advised that you
-download the most up to date version of the config scripts from
-
- http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
-and
- http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
-
-If the version you run ($0) is already up to date, please
-send the following data and any information you think might be
-pertinent to <config-patches@gnu.org> in order to provide the needed
-information to handle your system.
-
-config.guess timestamp = $timestamp
-
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
-/bin/uname -X = `(/bin/uname -X) 2>/dev/null`
-
-hostinfo = `(hostinfo) 2>/dev/null`
-/bin/universe = `(/bin/universe) 2>/dev/null`
-/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null`
-/bin/arch = `(/bin/arch) 2>/dev/null`
-/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
-
-UNAME_MACHINE = ${UNAME_MACHINE}
-UNAME_RELEASE = ${UNAME_RELEASE}
-UNAME_SYSTEM = ${UNAME_SYSTEM}
-UNAME_VERSION = ${UNAME_VERSION}
-EOF
-
-exit 1
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:
diff --git a/language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/config.sub b/language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/config.sub
deleted file mode 100755
index 8f1229c6f7..0000000000
--- a/language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/config.sub
+++ /dev/null
@@ -1,1810 +0,0 @@
-#! /bin/sh
-# Configuration validation subroutine script.
-# Copyright 1992-2015 Free Software Foundation, Inc.
-
-timestamp='2015-03-08'
-
-# This file 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 3 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; if not, see <http://www.gnu.org/licenses/>.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that
-# program. This Exception is an additional permission under section 7
-# of the GNU General Public License, version 3 ("GPLv3").
-
-
-# Please send patches to <config-patches@gnu.org>.
-#
-# Configuration subroutine to validate and canonicalize a configuration type.
-# Supply the specified configuration type as an argument.
-# If it is invalid, we print an error message on stderr and exit with code 1.
-# Otherwise, we print the canonical config type on stdout and succeed.
-
-# You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
-
-# This file is supposed to be the same for all GNU packages
-# and recognize all the CPU types, system types and aliases
-# that are meaningful with *any* GNU software.
-# Each package is responsible for reporting which valid configurations
-# it does not support. The user should be able to distinguish
-# a failure to support a valid configuration from a meaningless
-# configuration.
-
-# The goal of this file is to map all the various variations of a given
-# machine specification into a single specification in the form:
-# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
-# or in some cases, the newer four-part form:
-# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
-# It is wrong to echo any other type of specification.
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION] CPU-MFR-OPSYS
- $0 [OPTION] ALIAS
-
-Canonicalize a configuration name.
-
-Operation modes:
- -h, --help print this help, then exit
- -t, --time-stamp print date of last modification, then exit
- -v, --version print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-version="\
-GNU config.sub ($timestamp)
-
-Copyright 1992-2015 Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions. There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
- case $1 in
- --time-stamp | --time* | -t )
- echo "$timestamp" ; exit ;;
- --version | -v )
- echo "$version" ; exit ;;
- --help | --h* | -h )
- echo "$usage"; exit ;;
- -- ) # Stop option processing
- shift; break ;;
- - ) # Use stdin as input.
- break ;;
- -* )
- echo "$me: invalid option $1$help"
- exit 1 ;;
-
- *local*)
- # First pass through any local machine types.
- echo $1
- exit ;;
-
- * )
- break ;;
- esac
-done
-
-case $# in
- 0) echo "$me: missing argument$help" >&2
- exit 1;;
- 1) ;;
- *) echo "$me: too many arguments$help" >&2
- exit 1;;
-esac
-
-# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
-# Here we must recognize all the valid KERNEL-OS combinations.
-maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
-case $maybe_os in
- nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
- linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
- knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \
- kopensolaris*-gnu* | \
- storm-chaos* | os2-emx* | rtmk-nova*)
- os=-$maybe_os
- basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
- ;;
- android-linux)
- os=-linux-android
- basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
- ;;
- *)
- basic_machine=`echo $1 | sed 's/-[^-]*$//'`
- if [ $basic_machine != $1 ]
- then os=`echo $1 | sed 's/.*-/-/'`
- else os=; fi
- ;;
-esac
-
-### Let's recognize common machines as not being operating systems so
-### that things like config.sub decstation-3100 work. We also
-### recognize some manufacturers as not being operating systems, so we
-### can provide default operating systems below.
-case $os in
- -sun*os*)
- # Prevent following clause from handling this invalid input.
- ;;
- -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
- -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
- -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
- -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
- -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
- -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
- -apple | -axis | -knuth | -cray | -microblaze*)
- os=
- basic_machine=$1
- ;;
- -bluegene*)
- os=-cnk
- ;;
- -sim | -cisco | -oki | -wec | -winbond)
- os=
- basic_machine=$1
- ;;
- -scout)
- ;;
- -wrs)
- os=-vxworks
- basic_machine=$1
- ;;
- -chorusos*)
- os=-chorusos
- basic_machine=$1
- ;;
- -chorusrdb)
- os=-chorusrdb
- basic_machine=$1
- ;;
- -hiux*)
- os=-hiuxwe2
- ;;
- -sco6)
- os=-sco5v6
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
- ;;
- -sco5)
- os=-sco3.2v5
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
- ;;
- -sco4)
- os=-sco3.2v4
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
- ;;
- -sco3.2.[4-9]*)
- os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
- ;;
- -sco3.2v[4-9]*)
- # Don't forget version if it is 3.2v4 or newer.
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
- ;;
- -sco5v6*)
- # Don't forget version if it is 3.2v4 or newer.
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
- ;;
- -sco*)
- os=-sco3.2v2
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
- ;;
- -udk*)
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
- ;;
- -isc)
- os=-isc2.2
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
- ;;
- -clix*)
- basic_machine=clipper-intergraph
- ;;
- -isc*)
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
- ;;
- -lynx*178)
- os=-lynxos178
- ;;
- -lynx*5)
- os=-lynxos5
- ;;
- -lynx*)
- os=-lynxos
- ;;
- -ptx*)
- basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
- ;;
- -windowsnt*)
- os=`echo $os | sed -e 's/windowsnt/winnt/'`
- ;;
- -psos*)
- os=-psos
- ;;
- -mint | -mint[0-9]*)
- basic_machine=m68k-atari
- os=-mint
- ;;
-esac
-
-# Decode aliases for certain CPU-COMPANY combinations.
-case $basic_machine in
- # Recognize the basic CPU types without company name.
- # Some are omitted here because they have special meanings below.
- 1750a | 580 \
- | a29k \
- | aarch64 | aarch64_be \
- | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
- | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
- | am33_2.0 \
- | arc | arceb \
- | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
- | avr | avr32 \
- | be32 | be64 \
- | bfin \
- | c4x | c8051 | clipper \
- | d10v | d30v | dlx | dsp16xx \
- | e2k | epiphany \
- | fido | fr30 | frv | ft32 \
- | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
- | hexagon \
- | i370 | i860 | i960 | ia64 \
- | ip2k | iq2000 \
- | k1om \
- | le32 | le64 \
- | lm32 \
- | m32c | m32r | m32rle | m68000 | m68k | m88k \
- | maxq | mb | microblaze | microblazeel | mcore | mep | metag \
- | mips | mipsbe | mipseb | mipsel | mipsle \
- | mips16 \
- | mips64 | mips64el \
- | mips64octeon | mips64octeonel \
- | mips64orion | mips64orionel \
- | mips64r5900 | mips64r5900el \
- | mips64vr | mips64vrel \
- | mips64vr4100 | mips64vr4100el \
- | mips64vr4300 | mips64vr4300el \
- | mips64vr5000 | mips64vr5000el \
- | mips64vr5900 | mips64vr5900el \
- | mipsisa32 | mipsisa32el \
- | mipsisa32r2 | mipsisa32r2el \
- | mipsisa32r6 | mipsisa32r6el \
- | mipsisa64 | mipsisa64el \
- | mipsisa64r2 | mipsisa64r2el \
- | mipsisa64r6 | mipsisa64r6el \
- | mipsisa64sb1 | mipsisa64sb1el \
- | mipsisa64sr71k | mipsisa64sr71kel \
- | mipsr5900 | mipsr5900el \
- | mipstx39 | mipstx39el \
- | mn10200 | mn10300 \
- | moxie \
- | mt \
- | msp430 \
- | nds32 | nds32le | nds32be \
- | nios | nios2 | nios2eb | nios2el \
- | ns16k | ns32k \
- | open8 | or1k | or1knd | or32 \
- | pdp10 | pdp11 | pj | pjl \
- | powerpc | powerpc64 | powerpc64le | powerpcle \
- | pyramid \
- | riscv32 | riscv64 \
- | rl78 | rx \
- | score \
- | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
- | sh64 | sh64le \
- | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
- | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
- | spu \
- | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
- | ubicom32 \
- | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
- | visium \
- | we32k \
- | x86 | xc16x | xstormy16 | xtensa \
- | z8k | z80)
- basic_machine=$basic_machine-unknown
- ;;
- c54x)
- basic_machine=tic54x-unknown
- ;;
- c55x)
- basic_machine=tic55x-unknown
- ;;
- c6x)
- basic_machine=tic6x-unknown
- ;;
- leon|leon[3-9])
- basic_machine=sparc-$basic_machine
- ;;
- m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
- basic_machine=$basic_machine-unknown
- os=-none
- ;;
- m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
- ;;
- ms1)
- basic_machine=mt-unknown
- ;;
-
- strongarm | thumb | xscale)
- basic_machine=arm-unknown
- ;;
- xgate)
- basic_machine=$basic_machine-unknown
- os=-none
- ;;
- xscaleeb)
- basic_machine=armeb-unknown
- ;;
-
- xscaleel)
- basic_machine=armel-unknown
- ;;
-
- # We use `pc' rather than `unknown'
- # because (1) that's what they normally are, and
- # (2) the word "unknown" tends to confuse beginning users.
- i*86 | x86_64)
- basic_machine=$basic_machine-pc
- ;;
- # Object if more than one company name word.
- *-*-*)
- echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
- exit 1
- ;;
- # Recognize the basic CPU types with company name.
- 580-* \
- | a29k-* \
- | aarch64-* | aarch64_be-* \
- | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
- | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
- | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
- | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
- | avr-* | avr32-* \
- | be32-* | be64-* \
- | bfin-* | bs2000-* \
- | c[123]* | c30-* | [cjt]90-* | c4x-* \
- | c8051-* | clipper-* | craynv-* | cydra-* \
- | d10v-* | d30v-* | dlx-* \
- | e2k-* | elxsi-* \
- | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
- | h8300-* | h8500-* \
- | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
- | hexagon-* \
- | i*86-* | i860-* | i960-* | ia64-* \
- | ip2k-* | iq2000-* \
- | k1om-* \
- | le32-* | le64-* \
- | lm32-* \
- | m32c-* | m32r-* | m32rle-* \
- | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
- | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
- | microblaze-* | microblazeel-* \
- | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
- | mips16-* \
- | mips64-* | mips64el-* \
- | mips64octeon-* | mips64octeonel-* \
- | mips64orion-* | mips64orionel-* \
- | mips64r5900-* | mips64r5900el-* \
- | mips64vr-* | mips64vrel-* \
- | mips64vr4100-* | mips64vr4100el-* \
- | mips64vr4300-* | mips64vr4300el-* \
- | mips64vr5000-* | mips64vr5000el-* \
- | mips64vr5900-* | mips64vr5900el-* \
- | mipsisa32-* | mipsisa32el-* \
- | mipsisa32r2-* | mipsisa32r2el-* \
- | mipsisa32r6-* | mipsisa32r6el-* \
- | mipsisa64-* | mipsisa64el-* \
- | mipsisa64r2-* | mipsisa64r2el-* \
- | mipsisa64r6-* | mipsisa64r6el-* \
- | mipsisa64sb1-* | mipsisa64sb1el-* \
- | mipsisa64sr71k-* | mipsisa64sr71kel-* \
- | mipsr5900-* | mipsr5900el-* \
- | mipstx39-* | mipstx39el-* \
- | mmix-* \
- | mt-* \
- | msp430-* \
- | nds32-* | nds32le-* | nds32be-* \
- | nios-* | nios2-* | nios2eb-* | nios2el-* \
- | none-* | np1-* | ns16k-* | ns32k-* \
- | open8-* \
- | or1k*-* \
- | orion-* \
- | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
- | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
- | pyramid-* \
- | rl78-* | romp-* | rs6000-* | rx-* \
- | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
- | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
- | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
- | sparclite-* \
- | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
- | tahoe-* \
- | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
- | tile*-* \
- | tron-* \
- | ubicom32-* \
- | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
- | vax-* \
- | visium-* \
- | we32k-* \
- | x86-* | x86_64-* | xc16x-* | xps100-* \
- | xstormy16-* | xtensa*-* \
- | ymp-* \
- | z8k-* | z80-*)
- ;;
- # Recognize the basic CPU types without company name, with glob match.
- xtensa*)
- basic_machine=$basic_machine-unknown
- ;;
- # Recognize the various machine names and aliases which stand
- # for a CPU type and a company and sometimes even an OS.
- 386bsd)
- basic_machine=i386-unknown
- os=-bsd
- ;;
- 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
- basic_machine=m68000-att
- ;;
- 3b*)
- basic_machine=we32k-att
- ;;
- a29khif)
- basic_machine=a29k-amd
- os=-udi
- ;;
- abacus)
- basic_machine=abacus-unknown
- ;;
- adobe68k)
- basic_machine=m68010-adobe
- os=-scout
- ;;
- alliant | fx80)
- basic_machine=fx80-alliant
- ;;
- altos | altos3068)
- basic_machine=m68k-altos
- ;;
- am29k)
- basic_machine=a29k-none
- os=-bsd
- ;;
- amd64)
- basic_machine=x86_64-pc
- ;;
- amd64-*)
- basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
- amdahl)
- basic_machine=580-amdahl
- os=-sysv
- ;;
- amiga | amiga-*)
- basic_machine=m68k-unknown
- ;;
- amigaos | amigados)
- basic_machine=m68k-unknown
- os=-amigaos
- ;;
- amigaunix | amix)
- basic_machine=m68k-unknown
- os=-sysv4
- ;;
- apollo68)
- basic_machine=m68k-apollo
- os=-sysv
- ;;
- apollo68bsd)
- basic_machine=m68k-apollo
- os=-bsd
- ;;
- aros)
- basic_machine=i386-pc
- os=-aros
- ;;
- asmjs)
- basic_machine=asmjs-unknown
- ;;
- aux)
- basic_machine=m68k-apple
- os=-aux
- ;;
- balance)
- basic_machine=ns32k-sequent
- os=-dynix
- ;;
- blackfin)
- basic_machine=bfin-unknown
- os=-linux
- ;;
- blackfin-*)
- basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
- os=-linux
- ;;
- bluegene*)
- basic_machine=powerpc-ibm
- os=-cnk
- ;;
- c54x-*)
- basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
- c55x-*)
- basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
- c6x-*)
- basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
- c90)
- basic_machine=c90-cray
- os=-unicos
- ;;
- cegcc)
- basic_machine=arm-unknown
- os=-cegcc
- ;;
- convex-c1)
- basic_machine=c1-convex
- os=-bsd
- ;;
- convex-c2)
- basic_machine=c2-convex
- os=-bsd
- ;;
- convex-c32)
- basic_machine=c32-convex
- os=-bsd
- ;;
- convex-c34)
- basic_machine=c34-convex
- os=-bsd
- ;;
- convex-c38)
- basic_machine=c38-convex
- os=-bsd
- ;;
- cray | j90)
- basic_machine=j90-cray
- os=-unicos
- ;;
- craynv)
- basic_machine=craynv-cray
- os=-unicosmp
- ;;
- cr16 | cr16-*)
- basic_machine=cr16-unknown
- os=-elf
- ;;
- crds | unos)
- basic_machine=m68k-crds
- ;;
- crisv32 | crisv32-* | etraxfs*)
- basic_machine=crisv32-axis
- ;;
- cris | cris-* | etrax*)
- basic_machine=cris-axis
- ;;
- crx)
- basic_machine=crx-unknown
- os=-elf
- ;;
- da30 | da30-*)
- basic_machine=m68k-da30
- ;;
- decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
- basic_machine=mips-dec
- ;;
- decsystem10* | dec10*)
- basic_machine=pdp10-dec
- os=-tops10
- ;;
- decsystem20* | dec20*)
- basic_machine=pdp10-dec
- os=-tops20
- ;;
- delta | 3300 | motorola-3300 | motorola-delta \
- | 3300-motorola | delta-motorola)
- basic_machine=m68k-motorola
- ;;
- delta88)
- basic_machine=m88k-motorola
- os=-sysv3
- ;;
- dicos)
- basic_machine=i686-pc
- os=-dicos
- ;;
- djgpp)
- basic_machine=i586-pc
- os=-msdosdjgpp
- ;;
- dpx20 | dpx20-*)
- basic_machine=rs6000-bull
- os=-bosx
- ;;
- dpx2* | dpx2*-bull)
- basic_machine=m68k-bull
- os=-sysv3
- ;;
- ebmon29k)
- basic_machine=a29k-amd
- os=-ebmon
- ;;
- elxsi)
- basic_machine=elxsi-elxsi
- os=-bsd
- ;;
- encore | umax | mmax)
- basic_machine=ns32k-encore
- ;;
- es1800 | OSE68k | ose68k | ose | OSE)
- basic_machine=m68k-ericsson
- os=-ose
- ;;
- fx2800)
- basic_machine=i860-alliant
- ;;
- genix)
- basic_machine=ns32k-ns
- ;;
- gmicro)
- basic_machine=tron-gmicro
- os=-sysv
- ;;
- go32)
- basic_machine=i386-pc
- os=-go32
- ;;
- h3050r* | hiux*)
- basic_machine=hppa1.1-hitachi
- os=-hiuxwe2
- ;;
- h8300hms)
- basic_machine=h8300-hitachi
- os=-hms
- ;;
- h8300xray)
- basic_machine=h8300-hitachi
- os=-xray
- ;;
- h8500hms)
- basic_machine=h8500-hitachi
- os=-hms
- ;;
- harris)
- basic_machine=m88k-harris
- os=-sysv3
- ;;
- hp300-*)
- basic_machine=m68k-hp
- ;;
- hp300bsd)
- basic_machine=m68k-hp
- os=-bsd
- ;;
- hp300hpux)
- basic_machine=m68k-hp
- os=-hpux
- ;;
- hp3k9[0-9][0-9] | hp9[0-9][0-9])
- basic_machine=hppa1.0-hp
- ;;
- hp9k2[0-9][0-9] | hp9k31[0-9])
- basic_machine=m68000-hp
- ;;
- hp9k3[2-9][0-9])
- basic_machine=m68k-hp
- ;;
- hp9k6[0-9][0-9] | hp6[0-9][0-9])
- basic_machine=hppa1.0-hp
- ;;
- hp9k7[0-79][0-9] | hp7[0-79][0-9])
- basic_machine=hppa1.1-hp
- ;;
- hp9k78[0-9] | hp78[0-9])
- # FIXME: really hppa2.0-hp
- basic_machine=hppa1.1-hp
- ;;
- hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
- # FIXME: really hppa2.0-hp
- basic_machine=hppa1.1-hp
- ;;
- hp9k8[0-9][13679] | hp8[0-9][13679])
- basic_machine=hppa1.1-hp
- ;;
- hp9k8[0-9][0-9] | hp8[0-9][0-9])
- basic_machine=hppa1.0-hp
- ;;
- hppa-next)
- os=-nextstep3
- ;;
- hppaosf)
- basic_machine=hppa1.1-hp
- os=-osf
- ;;
- hppro)
- basic_machine=hppa1.1-hp
- os=-proelf
- ;;
- i370-ibm* | ibm*)
- basic_machine=i370-ibm
- ;;
- i*86v32)
- basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
- os=-sysv32
- ;;
- i*86v4*)
- basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
- os=-sysv4
- ;;
- i*86v)
- basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
- os=-sysv
- ;;
- i*86sol2)
- basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
- os=-solaris2
- ;;
- i386mach)
- basic_machine=i386-mach
- os=-mach
- ;;
- i386-vsta | vsta)
- basic_machine=i386-unknown
- os=-vsta
- ;;
- iris | iris4d)
- basic_machine=mips-sgi
- case $os in
- -irix*)
- ;;
- *)
- os=-irix4
- ;;
- esac
- ;;
- isi68 | isi)
- basic_machine=m68k-isi
- os=-sysv
- ;;
- leon-*|leon[3-9]-*)
- basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'`
- ;;
- m68knommu)
- basic_machine=m68k-unknown
- os=-linux
- ;;
- m68knommu-*)
- basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
- os=-linux
- ;;
- m88k-omron*)
- basic_machine=m88k-omron
- ;;
- magnum | m3230)
- basic_machine=mips-mips
- os=-sysv
- ;;
- merlin)
- basic_machine=ns32k-utek
- os=-sysv
- ;;
- microblaze*)
- basic_machine=microblaze-xilinx
- ;;
- mingw64)
- basic_machine=x86_64-pc
- os=-mingw64
- ;;
- mingw32)
- basic_machine=i686-pc
- os=-mingw32
- ;;
- mingw32ce)
- basic_machine=arm-unknown
- os=-mingw32ce
- ;;
- miniframe)
- basic_machine=m68000-convergent
- ;;
- *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
- basic_machine=m68k-atari
- os=-mint
- ;;
- mips3*-*)
- basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
- ;;
- mips3*)
- basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
- ;;
- monitor)
- basic_machine=m68k-rom68k
- os=-coff
- ;;
- morphos)
- basic_machine=powerpc-unknown
- os=-morphos
- ;;
- moxiebox)
- basic_machine=moxie-unknown
- os=-moxiebox
- ;;
- msdos)
- basic_machine=i386-pc
- os=-msdos
- ;;
- ms1-*)
- basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
- ;;
- msys)
- basic_machine=i686-pc
- os=-msys
- ;;
- mvs)
- basic_machine=i370-ibm
- os=-mvs
- ;;
- nacl)
- basic_machine=le32-unknown
- os=-nacl
- ;;
- ncr3000)
- basic_machine=i486-ncr
- os=-sysv4
- ;;
- netbsd386)
- basic_machine=i386-unknown
- os=-netbsd
- ;;
- netwinder)
- basic_machine=armv4l-rebel
- os=-linux
- ;;
- news | news700 | news800 | news900)
- basic_machine=m68k-sony
- os=-newsos
- ;;
- news1000)
- basic_machine=m68030-sony
- os=-newsos
- ;;
- news-3600 | risc-news)
- basic_machine=mips-sony
- os=-newsos
- ;;
- necv70)
- basic_machine=v70-nec
- os=-sysv
- ;;
- next | m*-next )
- basic_machine=m68k-next
- case $os in
- -nextstep* )
- ;;
- -ns2*)
- os=-nextstep2
- ;;
- *)
- os=-nextstep3
- ;;
- esac
- ;;
- nh3000)
- basic_machine=m68k-harris
- os=-cxux
- ;;
- nh[45]000)
- basic_machine=m88k-harris
- os=-cxux
- ;;
- nindy960)
- basic_machine=i960-intel
- os=-nindy
- ;;
- mon960)
- basic_machine=i960-intel
- os=-mon960
- ;;
- nonstopux)
- basic_machine=mips-compaq
- os=-nonstopux
- ;;
- np1)
- basic_machine=np1-gould
- ;;
- neo-tandem)
- basic_machine=neo-tandem
- ;;
- nse-tandem)
- basic_machine=nse-tandem
- ;;
- nsr-tandem)
- basic_machine=nsr-tandem
- ;;
- op50n-* | op60c-*)
- basic_machine=hppa1.1-oki
- os=-proelf
- ;;
- openrisc | openrisc-*)
- basic_machine=or32-unknown
- ;;
- os400)
- basic_machine=powerpc-ibm
- os=-os400
- ;;
- OSE68000 | ose68000)
- basic_machine=m68000-ericsson
- os=-ose
- ;;
- os68k)
- basic_machine=m68k-none
- os=-os68k
- ;;
- pa-hitachi)
- basic_machine=hppa1.1-hitachi
- os=-hiuxwe2
- ;;
- paragon)
- basic_machine=i860-intel
- os=-osf
- ;;
- parisc)
- basic_machine=hppa-unknown
- os=-linux
- ;;
- parisc-*)
- basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
- os=-linux
- ;;
- pbd)
- basic_machine=sparc-tti
- ;;
- pbb)
- basic_machine=m68k-tti
- ;;
- pc532 | pc532-*)
- basic_machine=ns32k-pc532
- ;;
- pc98)
- basic_machine=i386-pc
- ;;
- pc98-*)
- basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
- pentium | p5 | k5 | k6 | nexgen | viac3)
- basic_machine=i586-pc
- ;;
- pentiumpro | p6 | 6x86 | athlon | athlon_*)
- basic_machine=i686-pc
- ;;
- pentiumii | pentium2 | pentiumiii | pentium3)
- basic_machine=i686-pc
- ;;
- pentium4)
- basic_machine=i786-pc
- ;;
- pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
- basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
- pentiumpro-* | p6-* | 6x86-* | athlon-*)
- basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
- pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
- basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
- pentium4-*)
- basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
- pn)
- basic_machine=pn-gould
- ;;
- power) basic_machine=power-ibm
- ;;
- ppc | ppcbe) basic_machine=powerpc-unknown
- ;;
- ppc-* | ppcbe-*)
- basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
- ppcle | powerpclittle | ppc-le | powerpc-little)
- basic_machine=powerpcle-unknown
- ;;
- ppcle-* | powerpclittle-*)
- basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
- ppc64) basic_machine=powerpc64-unknown
- ;;
- ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
- ppc64le | powerpc64little | ppc64-le | powerpc64-little)
- basic_machine=powerpc64le-unknown
- ;;
- ppc64le-* | powerpc64little-*)
- basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
- ps2)
- basic_machine=i386-ibm
- ;;
- pw32)
- basic_machine=i586-unknown
- os=-pw32
- ;;
- rdos | rdos64)
- basic_machine=x86_64-pc
- os=-rdos
- ;;
- rdos32)
- basic_machine=i386-pc
- os=-rdos
- ;;
- rom68k)
- basic_machine=m68k-rom68k
- os=-coff
- ;;
- rm[46]00)
- basic_machine=mips-siemens
- ;;
- rtpc | rtpc-*)
- basic_machine=romp-ibm
- ;;
- s390 | s390-*)
- basic_machine=s390-ibm
- ;;
- s390x | s390x-*)
- basic_machine=s390x-ibm
- ;;
- sa29200)
- basic_machine=a29k-amd
- os=-udi
- ;;
- sb1)
- basic_machine=mipsisa64sb1-unknown
- ;;
- sb1el)
- basic_machine=mipsisa64sb1el-unknown
- ;;
- sde)
- basic_machine=mipsisa32-sde
- os=-elf
- ;;
- sei)
- basic_machine=mips-sei
- os=-seiux
- ;;
- sequent)
- basic_machine=i386-sequent
- ;;
- sh)
- basic_machine=sh-hitachi
- os=-hms
- ;;
- sh5el)
- basic_machine=sh5le-unknown
- ;;
- sh64)
- basic_machine=sh64-unknown
- ;;
- sparclite-wrs | simso-wrs)
- basic_machine=sparclite-wrs
- os=-vxworks
- ;;
- sps7)
- basic_machine=m68k-bull
- os=-sysv2
- ;;
- spur)
- basic_machine=spur-unknown
- ;;
- st2000)
- basic_machine=m68k-tandem
- ;;
- stratus)
- basic_machine=i860-stratus
- os=-sysv4
- ;;
- strongarm-* | thumb-*)
- basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
- sun2)
- basic_machine=m68000-sun
- ;;
- sun2os3)
- basic_machine=m68000-sun
- os=-sunos3
- ;;
- sun2os4)
- basic_machine=m68000-sun
- os=-sunos4
- ;;
- sun3os3)
- basic_machine=m68k-sun
- os=-sunos3
- ;;
- sun3os4)
- basic_machine=m68k-sun
- os=-sunos4
- ;;
- sun4os3)
- basic_machine=sparc-sun
- os=-sunos3
- ;;
- sun4os4)
- basic_machine=sparc-sun
- os=-sunos4
- ;;
- sun4sol2)
- basic_machine=sparc-sun
- os=-solaris2
- ;;
- sun3 | sun3-*)
- basic_machine=m68k-sun
- ;;
- sun4)
- basic_machine=sparc-sun
- ;;
- sun386 | sun386i | roadrunner)
- basic_machine=i386-sun
- ;;
- sv1)
- basic_machine=sv1-cray
- os=-unicos
- ;;
- symmetry)
- basic_machine=i386-sequent
- os=-dynix
- ;;
- t3e)
- basic_machine=alphaev5-cray
- os=-unicos
- ;;
- t90)
- basic_machine=t90-cray
- os=-unicos
- ;;
- tile*)
- basic_machine=$basic_machine-unknown
- os=-linux-gnu
- ;;
- tx39)
- basic_machine=mipstx39-unknown
- ;;
- tx39el)
- basic_machine=mipstx39el-unknown
- ;;
- toad1)
- basic_machine=pdp10-xkl
- os=-tops20
- ;;
- tower | tower-32)
- basic_machine=m68k-ncr
- ;;
- tpf)
- basic_machine=s390x-ibm
- os=-tpf
- ;;
- udi29k)
- basic_machine=a29k-amd
- os=-udi
- ;;
- ultra3)
- basic_machine=a29k-nyu
- os=-sym1
- ;;
- v810 | necv810)
- basic_machine=v810-nec
- os=-none
- ;;
- vaxv)
- basic_machine=vax-dec
- os=-sysv
- ;;
- vms)
- basic_machine=vax-dec
- os=-vms
- ;;
- vpp*|vx|vx-*)
- basic_machine=f301-fujitsu
- ;;
- vxworks960)
- basic_machine=i960-wrs
- os=-vxworks
- ;;
- vxworks68)
- basic_machine=m68k-wrs
- os=-vxworks
- ;;
- vxworks29k)
- basic_machine=a29k-wrs
- os=-vxworks
- ;;
- w65*)
- basic_machine=w65-wdc
- os=-none
- ;;
- w89k-*)
- basic_machine=hppa1.1-winbond
- os=-proelf
- ;;
- xbox)
- basic_machine=i686-pc
- os=-mingw32
- ;;
- xps | xps100)
- basic_machine=xps100-honeywell
- ;;
- xscale-* | xscalee[bl]-*)
- basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
- ;;
- ymp)
- basic_machine=ymp-cray
- os=-unicos
- ;;
- z8k-*-coff)
- basic_machine=z8k-unknown
- os=-sim
- ;;
- z80-*-coff)
- basic_machine=z80-unknown
- os=-sim
- ;;
- none)
- basic_machine=none-none
- os=-none
- ;;
-
-# Here we handle the default manufacturer of certain CPU types. It is in
-# some cases the only manufacturer, in others, it is the most popular.
- w89k)
- basic_machine=hppa1.1-winbond
- ;;
- op50n)
- basic_machine=hppa1.1-oki
- ;;
- op60c)
- basic_machine=hppa1.1-oki
- ;;
- romp)
- basic_machine=romp-ibm
- ;;
- mmix)
- basic_machine=mmix-knuth
- ;;
- rs6000)
- basic_machine=rs6000-ibm
- ;;
- vax)
- basic_machine=vax-dec
- ;;
- pdp10)
- # there are many clones, so DEC is not a safe bet
- basic_machine=pdp10-unknown
- ;;
- pdp11)
- basic_machine=pdp11-dec
- ;;
- we32k)
- basic_machine=we32k-att
- ;;
- sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
- basic_machine=sh-unknown
- ;;
- sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
- basic_machine=sparc-sun
- ;;
- cydra)
- basic_machine=cydra-cydrome
- ;;
- orion)
- basic_machine=orion-highlevel
- ;;
- orion105)
- basic_machine=clipper-highlevel
- ;;
- mac | mpw | mac-mpw)
- basic_machine=m68k-apple
- ;;
- pmac | pmac-mpw)
- basic_machine=powerpc-apple
- ;;
- *-unknown)
- # Make sure to match an already-canonicalized machine name.
- ;;
- *)
- echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
- exit 1
- ;;
-esac
-
-# Here we canonicalize certain aliases for manufacturers.
-case $basic_machine in
- *-digital*)
- basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
- ;;
- *-commodore*)
- basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
- ;;
- *)
- ;;
-esac
-
-# Decode manufacturer-specific aliases for certain operating systems.
-
-if [ x"$os" != x"" ]
-then
-case $os in
- # First match some system type aliases
- # that might get confused with valid system types.
- # -solaris* is a basic system type, with this one exception.
- -auroraux)
- os=-auroraux
- ;;
- -solaris1 | -solaris1.*)
- os=`echo $os | sed -e 's|solaris1|sunos4|'`
- ;;
- -solaris)
- os=-solaris2
- ;;
- -svr4*)
- os=-sysv4
- ;;
- -unixware*)
- os=-sysv4.2uw
- ;;
- -gnu/linux*)
- os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
- ;;
- # First accept the basic system types.
- # The portable systems comes first.
- # Each alternative MUST END IN A *, to match a version number.
- # -sysv* is not here because it comes later, after sysvr4.
- -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
- | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
- | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
- | -sym* | -kopensolaris* | -plan9* \
- | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
- | -aos* | -aros* | -cloudabi* \
- | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
- | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
- | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
- | -bitrig* | -openbsd* | -solidbsd* \
- | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
- | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
- | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
- | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
- | -chorusos* | -chorusrdb* | -cegcc* \
- | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
- | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
- | -linux-newlib* | -linux-musl* | -linux-uclibc* \
- | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
- | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
- | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
- | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
- | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
- | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
- | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
- | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*)
- # Remember, each alternative MUST END IN *, to match a version number.
- ;;
- -qnx*)
- case $basic_machine in
- x86-* | i*86-*)
- ;;
- *)
- os=-nto$os
- ;;
- esac
- ;;
- -nto-qnx*)
- ;;
- -nto*)
- os=`echo $os | sed -e 's|nto|nto-qnx|'`
- ;;
- -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
- | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
- | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
- ;;
- -mac*)
- os=`echo $os | sed -e 's|mac|macos|'`
- ;;
- -linux-dietlibc)
- os=-linux-dietlibc
- ;;
- -linux*)
- os=`echo $os | sed -e 's|linux|linux-gnu|'`
- ;;
- -sunos5*)
- os=`echo $os | sed -e 's|sunos5|solaris2|'`
- ;;
- -sunos6*)
- os=`echo $os | sed -e 's|sunos6|solaris3|'`
- ;;
- -opened*)
- os=-openedition
- ;;
- -os400*)
- os=-os400
- ;;
- -wince*)
- os=-wince
- ;;
- -osfrose*)
- os=-osfrose
- ;;
- -osf*)
- os=-osf
- ;;
- -utek*)
- os=-bsd
- ;;
- -dynix*)
- os=-bsd
- ;;
- -acis*)
- os=-aos
- ;;
- -atheos*)
- os=-atheos
- ;;
- -syllable*)
- os=-syllable
- ;;
- -386bsd)
- os=-bsd
- ;;
- -ctix* | -uts*)
- os=-sysv
- ;;
- -nova*)
- os=-rtmk-nova
- ;;
- -ns2 )
- os=-nextstep2
- ;;
- -nsk*)
- os=-nsk
- ;;
- # Preserve the version number of sinix5.
- -sinix5.*)
- os=`echo $os | sed -e 's|sinix|sysv|'`
- ;;
- -sinix*)
- os=-sysv4
- ;;
- -tpf*)
- os=-tpf
- ;;
- -triton*)
- os=-sysv3
- ;;
- -oss*)
- os=-sysv3
- ;;
- -svr4)
- os=-sysv4
- ;;
- -svr3)
- os=-sysv3
- ;;
- -sysvr4)
- os=-sysv4
- ;;
- # This must come after -sysvr4.
- -sysv*)
- ;;
- -ose*)
- os=-ose
- ;;
- -es1800*)
- os=-ose
- ;;
- -xenix)
- os=-xenix
- ;;
- -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
- os=-mint
- ;;
- -aros*)
- os=-aros
- ;;
- -zvmoe)
- os=-zvmoe
- ;;
- -dicos*)
- os=-dicos
- ;;
- -nacl*)
- ;;
- -none)
- ;;
- *)
- # Get rid of the `-' at the beginning of $os.
- os=`echo $os | sed 's/[^-]*-//'`
- echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
- exit 1
- ;;
-esac
-else
-
-# Here we handle the default operating systems that come with various machines.
-# The value should be what the vendor currently ships out the door with their
-# machine or put another way, the most popular os provided with the machine.
-
-# Note that if you're going to try to match "-MANUFACTURER" here (say,
-# "-sun"), then you have to tell the case statement up towards the top
-# that MANUFACTURER isn't an operating system. Otherwise, code above
-# will signal an error saying that MANUFACTURER isn't an operating
-# system, and we'll never get to this point.
-
-case $basic_machine in
- score-*)
- os=-elf
- ;;
- spu-*)
- os=-elf
- ;;
- *-acorn)
- os=-riscix1.2
- ;;
- arm*-rebel)
- os=-linux
- ;;
- arm*-semi)
- os=-aout
- ;;
- c4x-* | tic4x-*)
- os=-coff
- ;;
- c8051-*)
- os=-elf
- ;;
- hexagon-*)
- os=-elf
- ;;
- tic54x-*)
- os=-coff
- ;;
- tic55x-*)
- os=-coff
- ;;
- tic6x-*)
- os=-coff
- ;;
- # This must come before the *-dec entry.
- pdp10-*)
- os=-tops20
- ;;
- pdp11-*)
- os=-none
- ;;
- *-dec | vax-*)
- os=-ultrix4.2
- ;;
- m68*-apollo)
- os=-domain
- ;;
- i386-sun)
- os=-sunos4.0.2
- ;;
- m68000-sun)
- os=-sunos3
- ;;
- m68*-cisco)
- os=-aout
- ;;
- mep-*)
- os=-elf
- ;;
- mips*-cisco)
- os=-elf
- ;;
- mips*-*)
- os=-elf
- ;;
- or32-*)
- os=-coff
- ;;
- *-tti) # must be before sparc entry or we get the wrong os.
- os=-sysv3
- ;;
- sparc-* | *-sun)
- os=-sunos4.1.1
- ;;
- *-be)
- os=-beos
- ;;
- *-haiku)
- os=-haiku
- ;;
- *-ibm)
- os=-aix
- ;;
- *-knuth)
- os=-mmixware
- ;;
- *-wec)
- os=-proelf
- ;;
- *-winbond)
- os=-proelf
- ;;
- *-oki)
- os=-proelf
- ;;
- *-hp)
- os=-hpux
- ;;
- *-hitachi)
- os=-hiux
- ;;
- i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
- os=-sysv
- ;;
- *-cbm)
- os=-amigaos
- ;;
- *-dg)
- os=-dgux
- ;;
- *-dolphin)
- os=-sysv3
- ;;
- m68k-ccur)
- os=-rtu
- ;;
- m88k-omron*)
- os=-luna
- ;;
- *-next )
- os=-nextstep
- ;;
- *-sequent)
- os=-ptx
- ;;
- *-crds)
- os=-unos
- ;;
- *-ns)
- os=-genix
- ;;
- i370-*)
- os=-mvs
- ;;
- *-next)
- os=-nextstep3
- ;;
- *-gould)
- os=-sysv
- ;;
- *-highlevel)
- os=-bsd
- ;;
- *-encore)
- os=-bsd
- ;;
- *-sgi)
- os=-irix
- ;;
- *-siemens)
- os=-sysv4
- ;;
- *-masscomp)
- os=-rtu
- ;;
- f30[01]-fujitsu | f700-fujitsu)
- os=-uxpv
- ;;
- *-rom68k)
- os=-coff
- ;;
- *-*bug)
- os=-coff
- ;;
- *-apple)
- os=-macos
- ;;
- *-atari*)
- os=-mint
- ;;
- *)
- os=-none
- ;;
-esac
-fi
-
-# Here we handle the case where we know the os, and the CPU type, but not the
-# manufacturer. We pick the logical manufacturer.
-vendor=unknown
-case $basic_machine in
- *-unknown)
- case $os in
- -riscix*)
- vendor=acorn
- ;;
- -sunos*)
- vendor=sun
- ;;
- -cnk*|-aix*)
- vendor=ibm
- ;;
- -beos*)
- vendor=be
- ;;
- -hpux*)
- vendor=hp
- ;;
- -mpeix*)
- vendor=hp
- ;;
- -hiux*)
- vendor=hitachi
- ;;
- -unos*)
- vendor=crds
- ;;
- -dgux*)
- vendor=dg
- ;;
- -luna*)
- vendor=omron
- ;;
- -genix*)
- vendor=ns
- ;;
- -mvs* | -opened*)
- vendor=ibm
- ;;
- -os400*)
- vendor=ibm
- ;;
- -ptx*)
- vendor=sequent
- ;;
- -tpf*)
- vendor=ibm
- ;;
- -vxsim* | -vxworks* | -windiss*)
- vendor=wrs
- ;;
- -aux*)
- vendor=apple
- ;;
- -hms*)
- vendor=hitachi
- ;;
- -mpw* | -macos*)
- vendor=apple
- ;;
- -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
- vendor=atari
- ;;
- -vos*)
- vendor=stratus
- ;;
- esac
- basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
- ;;
-esac
-
-echo $basic_machine$os
-exit
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:
diff --git a/language/chinese/CJK/cjk-4.8.4/utils/pyhyphen/pyhyph.tex b/language/chinese/CJK/cjk-4.8.4/utils/pyhyphen/pyhyph.tex
deleted file mode 100644
index f118f42001..0000000000
--- a/language/chinese/CJK/cjk-4.8.4/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/language/chinese/CJK/cjk-4.8.4/utils/pyhyphen/pytest.tex b/language/chinese/CJK/cjk-4.8.4/utils/pyhyphen/pytest.tex
deleted file mode 100644
index adf37d3c32..0000000000
--- a/language/chinese/CJK/cjk-4.8.4/utils/pyhyphen/pytest.tex
+++ /dev/null
@@ -1,51 +0,0 @@
-% This is the file pytest.tex of the CJK package
-% for testing Chinese pinyin hyphenation.
-%
-% created by Werner Lemberg <wl@gnu.org>
-%
-% Version 4.8.4 (18-Apr-2015)
-%
-%%
-%% 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.
-%%
-% Note that the Babel package searches for `pinyin.ldf', not pinyin.sty --
-% the latter is for typesetting accented pinyin syllables.
-
-\documentclass[12pt,b5paper]{article}
-
-\usepackage[10pt]{type1ec} % use only 10pt fonts
-\usepackage[T1]{fontenc}
-\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}
-
-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/language/chinese/CJK/cjk-4.8.4/ChangeLog b/language/chinese/CJK/cjk-4.8.5/ChangeLog
index f943ead7ea..d5563c1f7b 100644
--- a/language/chinese/CJK/cjk-4.8.4/ChangeLog
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/MANIFEST b/language/chinese/CJK/cjk-4.8.5/MANIFEST
index 14d9e3d501..bea2d544c7 100644
--- a/language/chinese/CJK/cjk-4.8.4/MANIFEST
+++ b/language/chinese/CJK/cjk-4.8.5/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,14 @@ 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/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/language/chinese/CJK/cjk-4.8.4/Makefile b/language/chinese/CJK/cjk-4.8.5/Makefile
index d80bb6fb3a..bb2d1e0753 100644
--- a/language/chinese/CJK/cjk-4.8.4/Makefile
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/README b/language/chinese/CJK/cjk-4.8.5/README
index cf33f17eb7..17f44a66d9 100644
--- a/language/chinese/CJK/cjk-4.8.4/README
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/TODO b/language/chinese/CJK/cjk-4.8.5/TODO
index 208aaf855f..208aaf855f 100644
--- a/language/chinese/CJK/cjk-4.8.4/TODO
+++ b/language/chinese/CJK/cjk-4.8.5/TODO
diff --git a/language/chinese/CJK/cjk-4.8.4/contrib/wadalab/DNP.sfd b/language/chinese/CJK/cjk-4.8.5/contrib/wadalab/DNP.sfd
index cd27942265..cd27942265 100644
--- a/language/chinese/CJK/cjk-4.8.4/contrib/wadalab/DNP.sfd
+++ b/language/chinese/CJK/cjk-4.8.5/contrib/wadalab/DNP.sfd
diff --git a/language/chinese/CJK/cjk-4.8.4/contrib/wadalab/c42goth.fd b/language/chinese/CJK/cjk-4.8.5/contrib/wadalab/c42goth.fd
index 6494af4617..cc73302057 100644
--- a/language/chinese/CJK/cjk-4.8.4/contrib/wadalab/c42goth.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/contrib/wadalab/c42goth.fdx b/language/chinese/CJK/cjk-4.8.5/contrib/wadalab/c42goth.fdx
index 0e8da25614..0d90d5d318 100644
--- a/language/chinese/CJK/cjk-4.8.4/contrib/wadalab/c42goth.fdx
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/contrib/wadalab/c42maru.fd b/language/chinese/CJK/cjk-4.8.5/contrib/wadalab/c42maru.fd
index 941ca20a1a..ba987c1f67 100644
--- a/language/chinese/CJK/cjk-4.8.4/contrib/wadalab/c42maru.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/contrib/wadalab/c42maru.fdx b/language/chinese/CJK/cjk-4.8.5/contrib/wadalab/c42maru.fdx
index c8998d2e67..b5ce14177b 100644
--- a/language/chinese/CJK/cjk-4.8.4/contrib/wadalab/c42maru.fdx
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/contrib/wadalab/c42min.fd b/language/chinese/CJK/cjk-4.8.5/contrib/wadalab/c42min.fd
index ddff436436..3ef9cdee49 100644
--- a/language/chinese/CJK/cjk-4.8.4/contrib/wadalab/c42min.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/contrib/wadalab/c42min.fdx b/language/chinese/CJK/cjk-4.8.5/contrib/wadalab/c42min.fdx
index ba334c6317..1c519596de 100644
--- a/language/chinese/CJK/cjk-4.8.4/contrib/wadalab/c42min.fdx
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/contrib/wadalab/c52maru.fd b/language/chinese/CJK/cjk-4.8.5/contrib/wadalab/c52maru.fd
index 75bda2cc31..d9bbfe5fc2 100644
--- a/language/chinese/CJK/cjk-4.8.4/contrib/wadalab/c52maru.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/contrib/wadalab/c52maru.fdx b/language/chinese/CJK/cjk-4.8.5/contrib/wadalab/c52maru.fdx
index 3f80581f22..10a6796aa3 100644
--- a/language/chinese/CJK/cjk-4.8.4/contrib/wadalab/c52maru.fdx
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/contrib/wadalab/c52min.fd b/language/chinese/CJK/cjk-4.8.5/contrib/wadalab/c52min.fd
index 27a7472ac4..eaa908f4f5 100644
--- a/language/chinese/CJK/cjk-4.8.4/contrib/wadalab/c52min.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/contrib/wadalab/c52min.fdx b/language/chinese/CJK/cjk-4.8.5/contrib/wadalab/c52min.fdx
index 815a20758f..8a92df0175 100644
--- a/language/chinese/CJK/cjk-4.8.4/contrib/wadalab/c52min.fdx
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/contrib/wadalab/c70goth.fd b/language/chinese/CJK/cjk-4.8.5/contrib/wadalab/c70goth.fd
index be87fd67ea..91b307381d 100644
--- a/language/chinese/CJK/cjk-4.8.4/contrib/wadalab/c70goth.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/contrib/wadalab/c70goth.fdx b/language/chinese/CJK/cjk-4.8.5/contrib/wadalab/c70goth.fdx
index f94d737010..5ba61060d5 100644
--- a/language/chinese/CJK/cjk-4.8.4/contrib/wadalab/c70goth.fdx
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/contrib/wadalab/c70maru.fd b/language/chinese/CJK/cjk-4.8.5/contrib/wadalab/c70maru.fd
index b1ce584eed..9419907643 100644
--- a/language/chinese/CJK/cjk-4.8.4/contrib/wadalab/c70maru.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/contrib/wadalab/c70maru.fdx b/language/chinese/CJK/cjk-4.8.5/contrib/wadalab/c70maru.fdx
index aa613e9ea4..b2840a42a0 100644
--- a/language/chinese/CJK/cjk-4.8.4/contrib/wadalab/c70maru.fdx
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/contrib/wadalab/c70min.fd b/language/chinese/CJK/cjk-4.8.5/contrib/wadalab/c70min.fd
index b8f47feb70..19b11619dc 100644
--- a/language/chinese/CJK/cjk-4.8.4/contrib/wadalab/c70min.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/contrib/wadalab/c70min.fdx b/language/chinese/CJK/cjk-4.8.5/contrib/wadalab/c70min.fdx
index 9ddb6650dd..8305091587 100644
--- a/language/chinese/CJK/cjk-4.8.4/contrib/wadalab/c70min.fdx
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/contrib/wadalab/fixwada b/language/chinese/CJK/cjk-4.8.5/contrib/wadalab/fixwada
index 378fea8775..8f37b5bc9e 100644
--- a/language/chinese/CJK/cjk-4.8.4/contrib/wadalab/fixwada
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/contrib/wadalab/fixwada2.pl b/language/chinese/CJK/cjk-4.8.5/contrib/wadalab/fixwada2.pl
index 620bd7196d..af2477c306 100644
--- a/language/chinese/CJK/cjk-4.8.4/contrib/wadalab/fixwada2.pl
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/contrib/wadalab/makefont b/language/chinese/CJK/cjk-4.8.5/contrib/wadalab/makefont
index bb1880939b..98b20cd541 100644
--- a/language/chinese/CJK/cjk-4.8.4/contrib/wadalab/makefont
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/contrib/wadalab/makeuniwada.pl b/language/chinese/CJK/cjk-4.8.5/contrib/wadalab/makeuniwada.pl
index 95be460e22..826ea3d3cb 100644
--- a/language/chinese/CJK/cjk-4.8.4/contrib/wadalab/makeuniwada.pl
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/contrib/wadalab/wadalab.map b/language/chinese/CJK/cjk-4.8.5/contrib/wadalab/wadalab.map
index dd008d525f..dd008d525f 100644
--- a/language/chinese/CJK/cjk-4.8.4/contrib/wadalab/wadalab.map
+++ b/language/chinese/CJK/cjk-4.8.5/contrib/wadalab/wadalab.map
diff --git a/language/chinese/CJK/cjk-4.8.4/contrib/wadalab/wadalab.txt b/language/chinese/CJK/cjk-4.8.5/contrib/wadalab/wadalab.txt
index 0a99fa084b..0a99fa084b 100644
--- a/language/chinese/CJK/cjk-4.8.4/contrib/wadalab/wadalab.txt
+++ b/language/chinese/CJK/cjk-4.8.5/contrib/wadalab/wadalab.txt
diff --git a/language/chinese/CJK/cjk-4.8.4/doc/CEF.txt b/language/chinese/CJK/cjk-4.8.5/doc/CEF.txt
index 48571c64ac..0cc2bccfd5 100644
--- a/language/chinese/CJK/cjk-4.8.4/doc/CEF.txt
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/doc/CJK.txt b/language/chinese/CJK/cjk-4.8.5/doc/CJK.txt
index 1432ae81be..fe1660bbc8 100644
--- a/language/chinese/CJK/cjk-4.8.4/doc/CJK.txt
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/doc/CJKnumb.txt b/language/chinese/CJK/cjk-4.8.5/doc/CJKnumb.txt
index 5f0ca179f2..16723f8bc0 100644
--- a/language/chinese/CJK/cjk-4.8.4/doc/CJKnumb.txt
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/doc/CJKspace.txt b/language/chinese/CJK/cjk-4.8.5/doc/CJKspace.txt
index 6743c3b049..87d2a7e621 100644
--- a/language/chinese/CJK/cjk-4.8.4/doc/CJKspace.txt
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/doc/CJKutf8.txt b/language/chinese/CJK/cjk-4.8.5/doc/CJKutf8.txt
index f244d233bb..c0c6f2c8f4 100644
--- a/language/chinese/CJK/cjk-4.8.4/doc/CJKutf8.txt
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/doc/COPYING b/language/chinese/CJK/cjk-4.8.5/doc/COPYING
index b2fe7b6af3..b2fe7b6af3 100644
--- a/language/chinese/CJK/cjk-4.8.4/doc/COPYING
+++ b/language/chinese/CJK/cjk-4.8.5/doc/COPYING
diff --git a/language/chinese/CJK/cjk-4.8.4/doc/INSTALL b/language/chinese/CJK/cjk-4.8.5/doc/INSTALL
index 6707649932..396187f01e 100644
--- a/language/chinese/CJK/cjk-4.8.4/doc/INSTALL
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/doc/TDS.txt b/language/chinese/CJK/cjk-4.8.5/doc/TDS.txt
index 81bba5d650..2473659bc8 100644
--- a/language/chinese/CJK/cjk-4.8.4/doc/TDS.txt
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/doc/chinese/README b/language/chinese/CJK/cjk-4.8.5/doc/chinese/README
index 90f621fd40..90f621fd40 100644
--- a/language/chinese/CJK/cjk-4.8.4/doc/chinese/README
+++ b/language/chinese/CJK/cjk-4.8.5/doc/chinese/README
diff --git a/language/chinese/CJK/cjk-4.8.4/doc/chinese/READMEb5.tex b/language/chinese/CJK/cjk-4.8.5/doc/chinese/READMEb5.tex
index ac1fff7b50..ac1fff7b50 100644
--- a/language/chinese/CJK/cjk-4.8.4/doc/chinese/READMEb5.tex
+++ b/language/chinese/CJK/cjk-4.8.5/doc/chinese/READMEb5.tex
diff --git a/language/chinese/CJK/cjk-4.8.4/doc/chinese/READMEgb.tex b/language/chinese/CJK/cjk-4.8.5/doc/chinese/READMEgb.tex
index 3081e2896b..3081e2896b 100644
--- a/language/chinese/CJK/cjk-4.8.4/doc/chinese/READMEgb.tex
+++ b/language/chinese/CJK/cjk-4.8.5/doc/chinese/READMEgb.tex
diff --git a/language/chinese/CJK/cjk-4.8.4/doc/chinese/emTeXb5.txt b/language/chinese/CJK/cjk-4.8.5/doc/chinese/emTeXb5.txt
index b37c80aff3..b37c80aff3 100644
--- a/language/chinese/CJK/cjk-4.8.4/doc/chinese/emTeXb5.txt
+++ b/language/chinese/CJK/cjk-4.8.5/doc/chinese/emTeXb5.txt
diff --git a/language/chinese/CJK/cjk-4.8.4/doc/chinese/teTeXb5.txt b/language/chinese/CJK/cjk-4.8.5/doc/chinese/teTeXb5.txt
index ee28bc3564..ee28bc3564 100644
--- a/language/chinese/CJK/cjk-4.8.4/doc/chinese/teTeXb5.txt
+++ b/language/chinese/CJK/cjk-4.8.5/doc/chinese/teTeXb5.txt
diff --git a/language/chinese/CJK/cjk-4.8.4/doc/cjk-enc.txt b/language/chinese/CJK/cjk-4.8.5/doc/cjk-enc.txt
index 5297236e35..67ad57fc4f 100644
--- a/language/chinese/CJK/cjk-4.8.4/doc/cjk-enc.txt
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/doc/commands.txt b/language/chinese/CJK/cjk-4.8.5/doc/commands.txt
index 1ece44b5ee..0cfba3263e 100644
--- a/language/chinese/CJK/cjk-4.8.4/doc/commands.txt
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/doc/dvidrv.txt b/language/chinese/CJK/cjk-4.8.5/doc/dvidrv.txt
index 6f520d6c2d..6f520d6c2d 100644
--- a/language/chinese/CJK/cjk-4.8.4/doc/dvidrv.txt
+++ b/language/chinese/CJK/cjk-4.8.5/doc/dvidrv.txt
diff --git a/language/chinese/CJK/cjk-4.8.4/doc/fdxfiles.txt b/language/chinese/CJK/cjk-4.8.5/doc/fdxfiles.txt
index c4bdffa803..cc60d08948 100644
--- a/language/chinese/CJK/cjk-4.8.4/doc/fdxfiles.txt
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/doc/fonts.txt b/language/chinese/CJK/cjk-4.8.5/doc/fonts.txt
index b68a82838f..0e07dcd46b 100644
--- a/language/chinese/CJK/cjk-4.8.4/doc/fonts.txt
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/doc/hbf2gf.txt b/language/chinese/CJK/cjk-4.8.5/doc/hbf2gf.txt
index 1ebc4e2ccc..6484a8c236 100644
--- a/language/chinese/CJK/cjk-4.8.4/doc/hbf2gf.txt
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/doc/history.2_5 b/language/chinese/CJK/cjk-4.8.5/doc/history.2_5
index a9d29ef4c4..b09d60ea46 100644
--- a/language/chinese/CJK/cjk-4.8.4/doc/history.2_5
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/doc/history.txt b/language/chinese/CJK/cjk-4.8.5/doc/history.txt
index ca35f64de5..d29a180783 100644
--- a/language/chinese/CJK/cjk-4.8.4/doc/history.txt
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/doc/japanese/README b/language/chinese/CJK/cjk-4.8.5/doc/japanese/README
index ab5101887a..ab5101887a 100644
--- a/language/chinese/CJK/cjk-4.8.4/doc/japanese/README
+++ b/language/chinese/CJK/cjk-4.8.5/doc/japanese/README
diff --git a/language/chinese/CJK/cjk-4.8.4/doc/japanese/ascii.txt b/language/chinese/CJK/cjk-4.8.5/doc/japanese/ascii.txt
index 41815cca5a..41815cca5a 100644
--- a/language/chinese/CJK/cjk-4.8.4/doc/japanese/ascii.txt
+++ b/language/chinese/CJK/cjk-4.8.5/doc/japanese/ascii.txt
diff --git a/language/chinese/CJK/cjk-4.8.4/doc/japanese/japanese.jis b/language/chinese/CJK/cjk-4.8.5/doc/japanese/japanese.jis
index 69e034c6d1..69e034c6d1 100644
--- a/language/chinese/CJK/cjk-4.8.4/doc/japanese/japanese.jis
+++ b/language/chinese/CJK/cjk-4.8.5/doc/japanese/japanese.jis
diff --git a/language/chinese/CJK/cjk-4.8.4/doc/japanese/japanese.txt b/language/chinese/CJK/cjk-4.8.5/doc/japanese/japanese.txt
index e637fdb0d7..e637fdb0d7 100644
--- a/language/chinese/CJK/cjk-4.8.4/doc/japanese/japanese.txt
+++ b/language/chinese/CJK/cjk-4.8.5/doc/japanese/japanese.txt
diff --git a/language/chinese/CJK/cjk-4.8.4/doc/japanese/jp-fonts.txt b/language/chinese/CJK/cjk-4.8.5/doc/japanese/jp-fonts.txt
index 49d2bae519..49d2bae519 100644
--- a/language/chinese/CJK/cjk-4.8.4/doc/japanese/jp-fonts.txt
+++ b/language/chinese/CJK/cjk-4.8.5/doc/japanese/jp-fonts.txt
diff --git a/language/chinese/CJK/cjk-4.8.4/doc/japanese/jp-tex.txt b/language/chinese/CJK/cjk-4.8.5/doc/japanese/jp-tex.txt
index 8effc41832..8effc41832 100644
--- a/language/chinese/CJK/cjk-4.8.4/doc/japanese/jp-tex.txt
+++ b/language/chinese/CJK/cjk-4.8.5/doc/japanese/jp-tex.txt
diff --git a/language/chinese/CJK/cjk-4.8.4/doc/japanese/preview.txt b/language/chinese/CJK/cjk-4.8.5/doc/japanese/preview.txt
index 574eb29925..574eb29925 100644
--- a/language/chinese/CJK/cjk-4.8.4/doc/japanese/preview.txt
+++ b/language/chinese/CJK/cjk-4.8.5/doc/japanese/preview.txt
diff --git a/language/chinese/CJK/cjk-4.8.4/doc/japanese/shibuaki.txt b/language/chinese/CJK/cjk-4.8.5/doc/japanese/shibuaki.txt
index ca317a82fd..ca317a82fd 100644
--- a/language/chinese/CJK/cjk-4.8.4/doc/japanese/shibuaki.txt
+++ b/language/chinese/CJK/cjk-4.8.5/doc/japanese/shibuaki.txt
diff --git a/language/chinese/CJK/cjk-4.8.4/doc/pdfhowto/HOWTO.txt b/language/chinese/CJK/cjk-4.8.5/doc/pdfhowto/HOWTO.txt
index 432fbda51b..432fbda51b 100644
--- a/language/chinese/CJK/cjk-4.8.4/doc/pdfhowto/HOWTO.txt
+++ b/language/chinese/CJK/cjk-4.8.5/doc/pdfhowto/HOWTO.txt
diff --git a/language/chinese/CJK/cjk-4.8.4/doc/pdfhowto/examples/bkai.map b/language/chinese/CJK/cjk-4.8.5/doc/pdfhowto/examples/bkai.map
index 71d205d501..71d205d501 100644
--- a/language/chinese/CJK/cjk-4.8.4/doc/pdfhowto/examples/bkai.map
+++ b/language/chinese/CJK/cjk-4.8.5/doc/pdfhowto/examples/bkai.map
diff --git a/language/chinese/CJK/cjk-4.8.4/doc/pdfhowto/examples/cid-x.map b/language/chinese/CJK/cjk-4.8.5/doc/pdfhowto/examples/cid-x.map
index 595d421b81..595d421b81 100644
--- a/language/chinese/CJK/cjk-4.8.4/doc/pdfhowto/examples/cid-x.map
+++ b/language/chinese/CJK/cjk-4.8.5/doc/pdfhowto/examples/cid-x.map
diff --git a/language/chinese/CJK/cjk-4.8.4/doc/pdfhowto/examples/cwtb.map b/language/chinese/CJK/cjk-4.8.5/doc/pdfhowto/examples/cwtb.map
index 964c65c84a..964c65c84a 100644
--- a/language/chinese/CJK/cjk-4.8.4/doc/pdfhowto/examples/cwtb.map
+++ b/language/chinese/CJK/cjk-4.8.5/doc/pdfhowto/examples/cwtb.map
diff --git a/language/chinese/CJK/cjk-4.8.4/doc/pdfhowto/examples/dvipdfmx.cfg b/language/chinese/CJK/cjk-4.8.5/doc/pdfhowto/examples/dvipdfmx.cfg
index e1fd450a21..e1fd450a21 100644
--- a/language/chinese/CJK/cjk-4.8.4/doc/pdfhowto/examples/dvipdfmx.cfg
+++ b/language/chinese/CJK/cjk-4.8.5/doc/pdfhowto/examples/dvipdfmx.cfg
diff --git a/language/chinese/CJK/cjk-4.8.4/doc/pdfhowto/examples/gen-map.pl b/language/chinese/CJK/cjk-4.8.5/doc/pdfhowto/examples/gen-map.pl
index 737304da36..737304da36 100644
--- a/language/chinese/CJK/cjk-4.8.4/doc/pdfhowto/examples/gen-map.pl
+++ b/language/chinese/CJK/cjk-4.8.5/doc/pdfhowto/examples/gen-map.pl
diff --git a/language/chinese/CJK/cjk-4.8.4/doc/pdfhowto/examples/map.list b/language/chinese/CJK/cjk-4.8.5/doc/pdfhowto/examples/map.list
index ae1fcd4ad1..ae1fcd4ad1 100644
--- a/language/chinese/CJK/cjk-4.8.4/doc/pdfhowto/examples/map.list
+++ b/language/chinese/CJK/cjk-4.8.5/doc/pdfhowto/examples/map.list
diff --git a/language/chinese/CJK/cjk-4.8.4/doc/pdfhowto/examples/texinput/Bg5/c00cwtb.fd b/language/chinese/CJK/cjk-4.8.5/doc/pdfhowto/examples/texinput/Bg5/c00cwtb.fd
index 8cc9004f21..d7ff990e8b 100644
--- a/language/chinese/CJK/cjk-4.8.4/doc/pdfhowto/examples/texinput/Bg5/c00cwtb.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/doc/pdfhowto/examples/texinput/Bg5/c00tmpl.fd b/language/chinese/CJK/cjk-4.8.5/doc/pdfhowto/examples/texinput/Bg5/c00tmpl.fd
index e61183c443..8881d69974 100644
--- a/language/chinese/CJK/cjk-4.8.4/doc/pdfhowto/examples/texinput/Bg5/c00tmpl.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/doc/pdfhowto/examples/texinput/GB/c10tmpl.fd b/language/chinese/CJK/cjk-4.8.5/doc/pdfhowto/examples/texinput/GB/c10tmpl.fd
index aa2ad66193..3f1aea21d7 100644
--- a/language/chinese/CJK/cjk-4.8.4/doc/pdfhowto/examples/texinput/GB/c10tmpl.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/doc/pdfhowto/examples/texinput/JIS/c40tmpl.fd b/language/chinese/CJK/cjk-4.8.5/doc/pdfhowto/examples/texinput/JIS/c40tmpl.fd
index 5b6efbd6f5..d1d15459fc 100644
--- a/language/chinese/CJK/cjk-4.8.4/doc/pdfhowto/examples/texinput/JIS/c40tmpl.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/doc/pdfhowto/examples/texinput/SJIS/c49tmpl.fd b/language/chinese/CJK/cjk-4.8.5/doc/pdfhowto/examples/texinput/SJIS/c49tmpl.fd
index 2e844d102f..498f136f4d 100644
--- a/language/chinese/CJK/cjk-4.8.4/doc/pdfhowto/examples/texinput/SJIS/c49tmpl.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/doc/pdfhowto/examples/updmap.my b/language/chinese/CJK/cjk-4.8.5/doc/pdfhowto/examples/updmap.my
index a020e035ee..a020e035ee 100644
--- a/language/chinese/CJK/cjk-4.8.4/doc/pdfhowto/examples/updmap.my
+++ b/language/chinese/CJK/cjk-4.8.5/doc/pdfhowto/examples/updmap.my
diff --git a/language/chinese/CJK/cjk-4.8.4/doc/pdfhowto/examples/wcl.sfd b/language/chinese/CJK/cjk-4.8.5/doc/pdfhowto/examples/wcl.sfd
index 594a36acba..594a36acba 100644
--- a/language/chinese/CJK/cjk-4.8.4/doc/pdfhowto/examples/wcl.sfd
+++ b/language/chinese/CJK/cjk-4.8.5/doc/pdfhowto/examples/wcl.sfd
diff --git a/language/chinese/CJK/cjk-4.8.4/doc/pinyin.txt b/language/chinese/CJK/cjk-4.8.5/doc/pinyin.txt
index 3cd92184d4..326202899e 100644
--- a/language/chinese/CJK/cjk-4.8.4/doc/pinyin.txt
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.5/doc/pyhyphen.txt b/language/chinese/CJK/cjk-4.8.5/doc/pyhyphen.txt
new file mode 100644
index 0000000000..63e68dce32
--- /dev/null
+++ b/language/chinese/CJK/cjk-4.8.5/doc/pyhyphen.txt
@@ -0,0 +1,135 @@
+This is the file pyhyphen.txt of the CJK macro package ver. 4.8.5
+(16-Oct-2021).
+
+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
+environment which doesn't allow accented pinyin syllables at all. For such
+cases it is desirable to have correct hyphenation, avoiding manually added
+hints using e.g., `\-' between the syllables.
+
+Fortunately, due to the limited numbers of Chinese pinyin syllables (407 for
+Mandarin), it is easy to create hyphenation patterns. The logical
+consequence is to add a new `language' to the Babel package, and exactly
+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 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
+
+for Unicode-aware TeX engines (XeTeX, luatex, upTeX) or
+
+ pinyin hyph-zh-latn-pinyin.tex
+
+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.
+
+
+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[...]{...}
+
+ \usepackage[T1]{fontenc}
+ \usepackage[pinyin,german,english]{babel}
+ ...
+
+ \begin{document}
+ ...
+ \foreignlanguage{pinyin}{pinyin without tone markers like Beijing}
+ ...
+ \end{document}
+
+
+Note 1: pinyin.ldf is intentionally very minimal. Don't expect that e.g.,
+ \chapter yields a pinyin version of the Chinese word for `chapter'.
+ It might be useful to define a shorthand macro like the following:
+
+ \newcommand{\py}[1]{\foreignlanguage{pinyin}{#1}}
+
+ Now you can simply say
+
+ \py{Beijing}
+
+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 -> Xi-an (two syllables)
+ Xian -> Xian (one syllable)
+
+ If a line break occurs, the apostrophe should vanish, e.g.,
+
+ Tian'anmen -> Tian-
+ anmen
+
+ Use the Babel shorthand "' to enter '; this internally resolves to
+ \discretionary.
+
+ The shorthand `"u' (as used in German) is available to input
+ `umlaut u'.
+
+Note 3: Most Babel language support files define a `<language>.sty' file
+ also. This is not true for pinyin! pinyin.sty is used for accented
+ pinyin syllables which don't need a special hyphenation support.
+ (pinyin.sty works with Plain TeX also.)
+
+
+Technical details
+-----------------
+
+The dictionary used to construct the hyphenation patterns has been created
+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 and second level are needed to find all possible breaks without a
+single error or omission.
+
+---End of pyhyphen.txt---
diff --git a/language/chinese/CJK/cjk-4.8.4/doc/reftex.txt b/language/chinese/CJK/cjk-4.8.5/doc/reftex.txt
index eb7f37cd00..3dc7935243 100644
--- a/language/chinese/CJK/cjk-4.8.4/doc/reftex.txt
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/doc/ruby.txt b/language/chinese/CJK/cjk-4.8.5/doc/ruby.txt
index 788ebdcdee..68f82abc9d 100644
--- a/language/chinese/CJK/cjk-4.8.4/doc/ruby.txt
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/doc/thaifont.txt b/language/chinese/CJK/cjk-4.8.5/doc/thaifont.txt
index d183396805..1a98eba882 100644
--- a/language/chinese/CJK/cjk-4.8.4/doc/thaifont.txt
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/doc/vertical.txt b/language/chinese/CJK/cjk-4.8.5/doc/vertical.txt
index 6e16a9a21f..e9d7c784fd 100644
--- a/language/chinese/CJK/cjk-4.8.4/doc/vertical.txt
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/examples/Big5.tex b/language/chinese/CJK/cjk-4.8.5/examples/Big5.tex
index 9f6ce11d30..91938c9099 100644
--- a/language/chinese/CJK/cjk-4.8.4/examples/Big5.tex
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/examples/Big5vert.tex b/language/chinese/CJK/cjk-4.8.5/examples/Big5vert.tex
index a2523a3e29..57537f3f50 100644
--- a/language/chinese/CJK/cjk-4.8.4/examples/Big5vert.tex
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/examples/CEF_test.tex b/language/chinese/CJK/cjk-4.8.5/examples/CEF_test.tex
index 9cd0427749..f0712449a2 100644
--- a/language/chinese/CJK/cjk-4.8.4/examples/CEF_test.tex
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/examples/CJKbabel.tex b/language/chinese/CJK/cjk-4.8.5/examples/CJKbabel.tex
index 468557398e..045465ee6e 100644
--- a/language/chinese/CJK/cjk-4.8.4/examples/CJKbabel.tex
+++ b/language/chinese/CJK/cjk-4.8.5/examples/CJKbabel.tex
@@ -4,7 +4,7 @@
%
% written by Werner Lemberg <wl@gnu.org>
%
-% Version 4.8.4 (18-Apr-2015)
+% Version 4.8.5 (16-Oct-2021)
% You need Emacs 20 to process this file!
@@ -15,7 +15,10 @@
% `cjk-write-file' will be available after loading cjk-enc.el into
% Emacs 20 with the commands load-file or load-library.
%
-% Vietnamese support for Babel comes with the VnTeX package.
+% Vietnamese support comes with the VnTeX package.
+% - T2A encoding for Computer Modern Cyrillic requires LH fonts
+% - uses CB Greek fonts and CM-Super fonts
+% - requires cyrillic, greek-fontenc, vntex
%
% Read cjk-enc.txt for more details.
@@ -31,7 +34,7 @@
russian, % T2A font encoding
thaicjk, % C90 font encoding
greek, % LGR font encoding
- vietnam, % T5 font encoding
+ vietnamese, % T5 font encoding
USenglish]{babel}
\usepackage[overlap, CJK]{ruby}
@@ -91,7 +94,7 @@ and their answers in a convenient form. \uline{The structure of this
ΒɒߒȒΒ¤גΒܒ\ruby{}{}\ruby{}{璤}ƒ
}
-\begin{otherlanguage}{vietnam}
+\begin{otherlanguage}{vietnamese}
Phn ``Nhng cu hi v gii p thߚng gp'' (vit tt t ting Anh
l FAQ) ߚc nu ra y nhm mc ch thu thp nhng cu hi thߚng
gp trong thc t v nhng li gii p thch hp nht ca n.
diff --git a/language/chinese/CJK/cjk-4.8.4/examples/CJKfntef.tex b/language/chinese/CJK/cjk-4.8.5/examples/CJKfntef.tex
index 38417887f9..242b0d9ee4 100644
--- a/language/chinese/CJK/cjk-4.8.4/examples/CJKfntef.tex
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/examples/CJKmixed.tex b/language/chinese/CJK/cjk-4.8.5/examples/CJKmixed.tex
index 98d2e5f725..cbcb8796fc 100644
--- a/language/chinese/CJK/cjk-4.8.4/examples/CJKmixed.tex
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/examples/CJKspace.tex b/language/chinese/CJK/cjk-4.8.5/examples/CJKspace.tex
index cb96c2ec3b..4acfb0230a 100644
--- a/language/chinese/CJK/cjk-4.8.4/examples/CJKspace.tex
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/examples/CJKutf8.tex b/language/chinese/CJK/cjk-4.8.5/examples/CJKutf8.tex
index 18cfa92e81..f7a6b23ec9 100644
--- a/language/chinese/CJK/cjk-4.8.4/examples/CJKutf8.tex
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/examples/GB.tex b/language/chinese/CJK/cjk-4.8.5/examples/GB.tex
index 334b786a4d..b02a095e24 100644
--- a/language/chinese/CJK/cjk-4.8.4/examples/GB.tex
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/examples/JIS.tex b/language/chinese/CJK/cjk-4.8.5/examples/JIS.tex
index 1808d52d8d..aadea76cb7 100644
--- a/language/chinese/CJK/cjk-4.8.4/examples/JIS.tex
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/examples/KS.tex b/language/chinese/CJK/cjk-4.8.5/examples/KS.tex
index 474319c000..8d0ba7f26b 100644
--- a/language/chinese/CJK/cjk-4.8.4/examples/KS.tex
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/examples/README b/language/chinese/CJK/cjk-4.8.5/examples/README
index 38e932a325..38e932a325 100644
--- a/language/chinese/CJK/cjk-4.8.4/examples/README
+++ b/language/chinese/CJK/cjk-4.8.5/examples/README
diff --git a/language/chinese/CJK/cjk-4.8.4/examples/SJIS.tex b/language/chinese/CJK/cjk-4.8.5/examples/SJIS.tex
index 80ccf2ee70..5c7417d90b 100644
--- a/language/chinese/CJK/cjk-4.8.4/examples/SJIS.tex
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/examples/UTF8.tex b/language/chinese/CJK/cjk-4.8.5/examples/UTF8.tex
index bbbc0e0b48..d2f646f653 100644
--- a/language/chinese/CJK/cjk-4.8.4/examples/UTF8.tex
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/examples/muletest.tex b/language/chinese/CJK/cjk-4.8.5/examples/muletest.tex
index 9c7b86c5ba..572460aae7 100644
--- a/language/chinese/CJK/cjk-4.8.4/examples/muletest.tex
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/examples/py_test.tex b/language/chinese/CJK/cjk-4.8.5/examples/py_test.tex
index 1bb650f4a1..9885d62896 100644
--- a/language/chinese/CJK/cjk-4.8.4/examples/py_test.tex
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/examples/rubytest.tex b/language/chinese/CJK/cjk-4.8.5/examples/rubytest.tex
index 8e8b83e032..0a03b928b6 100644
--- a/language/chinese/CJK/cjk-4.8.4/examples/rubytest.tex
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/examples/thai.tex b/language/chinese/CJK/cjk-4.8.5/examples/thai.tex
index 6466e78e8c..b7302438ae 100644
--- a/language/chinese/CJK/cjk-4.8.4/examples/thai.tex
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/examples/thai_utf8.tex b/language/chinese/CJK/cjk-4.8.5/examples/thai_utf8.tex
index 64c6c99c0f..8933c43e1c 100644
--- a/language/chinese/CJK/cjk-4.8.4/examples/thai_utf8.tex
+++ b/language/chinese/CJK/cjk-4.8.5/examples/thai_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)
% This file must be processed with cjk-enc.el to get
%
diff --git a/language/chinese/CJK/cjk-4.8.4/texinput/Bg5/Bg5.cap b/language/chinese/CJK/cjk-4.8.5/texinput/Bg5/Bg5.cap
index ee5ec02ad7..258cc26d57 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/Bg5/Bg5.cap
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/Bg5/Bg5.chr b/language/chinese/CJK/cjk-4.8.5/texinput/Bg5/Bg5.chr
index 1501c016ee..5f6f737f62 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/Bg5/Bg5.chr
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/Bg5/Bg5.cpx b/language/chinese/CJK/cjk-4.8.5/texinput/Bg5/Bg5.cpx
index 6be514b029..a92c7310f0 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/Bg5/Bg5.cpx
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/Bg5/Bg5.enc b/language/chinese/CJK/cjk-4.8.5/texinput/Bg5/Bg5.enc
index 818f55e3b9..624e7ae3b1 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/Bg5/Bg5.enc
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/Bg5/HK.enc b/language/chinese/CJK/cjk-4.8.5/texinput/Bg5/HK.enc
index aa70372a2f..9f760bf3fe 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/Bg5/HK.enc
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/Bg5/c00bkai.fd b/language/chinese/CJK/cjk-4.8.5/texinput/Bg5/c00bkai.fd
index a775ab8a10..3a09aef000 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/Bg5/c00bkai.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/Bg5/c00bkai.fdx b/language/chinese/CJK/cjk-4.8.5/texinput/Bg5/c00bkai.fdx
index ac5c870304..18a113872b 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/Bg5/c00bkai.fdx
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/Bg5/c00bsmi.fd b/language/chinese/CJK/cjk-4.8.5/texinput/Bg5/c00bsmi.fd
index 2d7c66ae3a..7f7d6fee79 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/Bg5/c00bsmi.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/Bg5/c00bsmi.fdx b/language/chinese/CJK/cjk-4.8.5/texinput/Bg5/c00bsmi.fdx
index 15275d558b..bf861ea8cd 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/Bg5/c00bsmi.fdx
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/Bg5/c00bsmir.fd b/language/chinese/CJK/cjk-4.8.5/texinput/Bg5/c00bsmir.fd
index 71fde2e2e6..fa10ef0545 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/Bg5/c00bsmir.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/Bg5/c00bsmir.fdx b/language/chinese/CJK/cjk-4.8.5/texinput/Bg5/c00bsmir.fdx
index b398d7fbed..cc25893d80 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/Bg5/c00bsmir.fdx
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/Bg5/c00cns.fd b/language/chinese/CJK/cjk-4.8.5/texinput/Bg5/c00cns.fd
index b5fe83a3a7..96415d3f20 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/Bg5/c00cns.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/Bg5/c00fs.fd b/language/chinese/CJK/cjk-4.8.5/texinput/Bg5/c00fs.fd
index 6cded2be8b..f0ba805e36 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/Bg5/c00fs.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/Bg5/c00kai.fd b/language/chinese/CJK/cjk-4.8.5/texinput/Bg5/c00kai.fd
index 1899bb3849..4e2a853e0b 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/Bg5/c00kai.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/Bg5/c00kair.fd b/language/chinese/CJK/cjk-4.8.5/texinput/Bg5/c00kair.fd
index 6df67b5680..a449cc6aa9 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/Bg5/c00kair.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/Bg5/c00kair.fdx b/language/chinese/CJK/cjk-4.8.5/texinput/Bg5/c00kair.fdx
index 311c2f61d7..bbcdc9ecbc 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/Bg5/c00kair.fdx
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/Bg5/c00song.fd b/language/chinese/CJK/cjk-4.8.5/texinput/Bg5/c00song.fd
index 9aa3e231f4..b72cf6b811 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/Bg5/c00song.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/Bg5/c01song.fd b/language/chinese/CJK/cjk-4.8.5/texinput/Bg5/c01song.fd
index 7b5ca9addd..51ed5c16c3 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/Bg5/c01song.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/Bg5/c05song.fd b/language/chinese/CJK/cjk-4.8.5/texinput/Bg5/c05song.fd
index bbcdb9506d..bc3d18ee85 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/Bg5/c05song.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/Bg5/c09song.fd b/language/chinese/CJK/cjk-4.8.5/texinput/Bg5/c09song.fd
index 49f8a64040..33f6fde8df 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/Bg5/c09song.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/CEF/c80song.fd b/language/chinese/CJK/cjk-4.8.5/texinput/CEF/c80song.fd
index 522930d91c..ef1319aaf8 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/CEF/c80song.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/CEF/c81song.fd b/language/chinese/CJK/cjk-4.8.5/texinput/CEF/c81song.fd
index c9a46527ff..78985b2ced 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/CEF/c81song.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/CJK.enc b/language/chinese/CJK/cjk-4.8.5/texinput/CJK.enc
index be9cd4ad6c..af8c8ffd06 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/CJK.enc
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/CJK.sty b/language/chinese/CJK/cjk-4.8.5/texinput/CJK.sty
index 1564efdb24..b7e3fcaea5 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/CJK.sty
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/CJKfntef.sty b/language/chinese/CJK/cjk-4.8.5/texinput/CJKfntef.sty
index 5a1d44df26..045380abdf 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/CJKfntef.sty
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/CJKnumb.sty b/language/chinese/CJK/cjk-4.8.5/texinput/CJKnumb.sty
index 68494d0ffc..61c928cf14 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/CJKnumb.sty
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/CJKspace.sty b/language/chinese/CJK/cjk-4.8.5/texinput/CJKspace.sty
index 148ce1479d..606e6ba2c9 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/CJKspace.sty
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/CJKulem.sty b/language/chinese/CJK/cjk-4.8.5/texinput/CJKulem.sty
index 5baef63f17..202f845df0 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/CJKulem.sty
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/CJKutf8.sty b/language/chinese/CJK/cjk-4.8.5/texinput/CJKutf8.sty
index 28f3f8b0ad..d1eab65c7e 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/CJKutf8.sty
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/CJKvert.sty b/language/chinese/CJK/cjk-4.8.5/texinput/CJKvert.sty
index 76985b5c28..d01a689f73 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/CJKvert.sty
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/CNS/EUC-TW.bdg b/language/chinese/CJK/cjk-4.8.5/texinput/CNS/EUC-TW.bdg
index 95036c135f..0ef5c3b5c7 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/CNS/EUC-TW.bdg
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/CNS/EUC-TW.chr b/language/chinese/CJK/cjk-4.8.5/texinput/CNS/EUC-TW.chr
index c7b90cab7a..2bf303aba0 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/CNS/EUC-TW.chr
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/CNS/EUC-TW.enc b/language/chinese/CJK/cjk-4.8.5/texinput/CNS/EUC-TW.enc
index 13a595d90f..71b1063cb9 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/CNS/EUC-TW.enc
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/CNS/c31song.fd b/language/chinese/CJK/cjk-4.8.5/texinput/CNS/c31song.fd
index 15f25f0602..b607ff7487 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/CNS/c31song.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/CNS/c32song.fd b/language/chinese/CJK/cjk-4.8.5/texinput/CNS/c32song.fd
index 9f866d1787..fc215fe051 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/CNS/c32song.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/CNS/c33song.fd b/language/chinese/CJK/cjk-4.8.5/texinput/CNS/c33song.fd
index 06f0b84c31..445f370bbb 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/CNS/c33song.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/CNS/c34song.fd b/language/chinese/CJK/cjk-4.8.5/texinput/CNS/c34song.fd
index d052f1f622..40eb3c1ee6 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/CNS/c34song.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/CNS/c35song.fd b/language/chinese/CJK/cjk-4.8.5/texinput/CNS/c35song.fd
index 46bb373498..9f3a3e65d7 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/CNS/c35song.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/CNS/c36song.fd b/language/chinese/CJK/cjk-4.8.5/texinput/CNS/c36song.fd
index 4ff74f88bb..a576981f5a 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/CNS/c36song.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/CNS/c37song.fd b/language/chinese/CJK/cjk-4.8.5/texinput/CNS/c37song.fd
index c8e738ad1b..d8a21bf344 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/CNS/c37song.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/GB/GB.cap b/language/chinese/CJK/cjk-4.8.5/texinput/GB/GB.cap
index a6526a296d..f77bfc0da6 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/GB/GB.cap
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/GB/GB.cpx b/language/chinese/CJK/cjk-4.8.5/texinput/GB/GB.cpx
index 40fd77551d..d24994ce2b 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/GB/GB.cpx
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/GB/c10fs.fd b/language/chinese/CJK/cjk-4.8.5/texinput/GB/c10fs.fd
index e8efb4e8a1..1ecdbb103d 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/GB/c10fs.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/GB/c10gbsn.fd b/language/chinese/CJK/cjk-4.8.5/texinput/GB/c10gbsn.fd
index 8b266472a5..839cd72e23 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/GB/c10gbsn.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/GB/c10gbsn.fdx b/language/chinese/CJK/cjk-4.8.5/texinput/GB/c10gbsn.fdx
index 19cbf19d04..d65645ce6c 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/GB/c10gbsn.fdx
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/GB/c10gkai.fd b/language/chinese/CJK/cjk-4.8.5/texinput/GB/c10gkai.fd
index 0fdbcb3330..9c5750852a 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/GB/c10gkai.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/GB/c10gkai.fdx b/language/chinese/CJK/cjk-4.8.5/texinput/GB/c10gkai.fdx
index 3a34dfb6f3..aab66e85c1 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/GB/c10gkai.fdx
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/GB/c10song.fd b/language/chinese/CJK/cjk-4.8.5/texinput/GB/c10song.fd
index 4e361cf963..df5f591476 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/GB/c10song.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/GB/c11song.fd b/language/chinese/CJK/cjk-4.8.5/texinput/GB/c11song.fd
index 4223455f1c..b0b2939e02 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/GB/c11song.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/GB/c19song.fd b/language/chinese/CJK/cjk-4.8.5/texinput/GB/c19song.fd
index bbcb377c2c..d543001cd7 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/GB/c19song.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/GB/c20song.fd b/language/chinese/CJK/cjk-4.8.5/texinput/GB/c20song.fd
index 909728a41a..617b1be7da 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/GB/c20song.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/GB/c21song.fd b/language/chinese/CJK/cjk-4.8.5/texinput/GB/c21song.fd
index 624e9e3c28..f5eed9d80b 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/GB/c21song.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/JIS/EUC-JP.bdg b/language/chinese/CJK/cjk-4.8.5/texinput/JIS/EUC-JP.bdg
index 711e8b9f16..7d5a0b2f0d 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/JIS/EUC-JP.bdg
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/JIS/EUC-JP.chr b/language/chinese/CJK/cjk-4.8.5/texinput/JIS/EUC-JP.chr
index 18802ad256..c317dfae3c 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/JIS/EUC-JP.chr
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/JIS/EUC-JP.enc b/language/chinese/CJK/cjk-4.8.5/texinput/JIS/EUC-JP.enc
index 38f4b026e6..00fe23c82a 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/JIS/EUC-JP.enc
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/JIS/EUC-JPdnp.enc b/language/chinese/CJK/cjk-4.8.5/texinput/JIS/EUC-JPdnp.enc
index 647eabd89c..6d82836884 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/JIS/EUC-JPdnp.enc
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/JIS/JIS.cap b/language/chinese/CJK/cjk-4.8.5/texinput/JIS/JIS.cap
index 3a9550a5c2..2343a53afa 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/JIS/JIS.cap
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/JIS/JIS.cpx b/language/chinese/CJK/cjk-4.8.5/texinput/JIS/JIS.cpx
index 82f0a25c93..a0cf83415e 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/JIS/JIS.cpx
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/JIS/JISdnp.enc b/language/chinese/CJK/cjk-4.8.5/texinput/JIS/JISdnp.enc
index 44b19896b7..b888ac61bf 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/JIS/JISdnp.enc
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/JIS/c40song.fd b/language/chinese/CJK/cjk-4.8.5/texinput/JIS/c40song.fd
index 39a8b4036a..d02c88a18c 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/JIS/c40song.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/JIS/c41song.fd b/language/chinese/CJK/cjk-4.8.5/texinput/JIS/c41song.fd
index 4d05cbaeab..3ccf078edc 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/JIS/c41song.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/JIS/c42song.fd b/language/chinese/CJK/cjk-4.8.5/texinput/JIS/c42song.fd
index 7f0d984fef..04efcc35df 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/JIS/c42song.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/JIS/c43song.fd b/language/chinese/CJK/cjk-4.8.5/texinput/JIS/c43song.fd
index 1251d844c2..42479c424e 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/JIS/c43song.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/JIS/c50song.fd b/language/chinese/CJK/cjk-4.8.5/texinput/JIS/c50song.fd
index f16744e25a..279a838e40 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/JIS/c50song.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/HLaTeX.chr b/language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/HLaTeX.chr
index cb4ad051ec..40a6c602be 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/HLaTeX.chr
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/KSHL.enc b/language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/KSHL.enc
index f7c26a7e0e..5ce501024b 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/KSHL.enc
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c63bm.fd b/language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/c63bm.fd
index 30f66370a4..53a54b72c7 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c63bm.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c63dn.fd b/language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/c63dn.fd
index 2f17d711f9..1bf465aa6e 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c63dn.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c63gr.fd b/language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/c63gr.fd
index c3507a2b32..4bd21a106a 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c63gr.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c63gs.fd b/language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/c63gs.fd
index b895651e97..1dbb1fd71c 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c63gs.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c63gt.fd b/language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/c63gt.fd
index c27ebdf90e..a31e213745 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c63gt.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c63jgt.fd b/language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/c63jgt.fd
index 3d32e0f325..ef1fa5cea3 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c63jgt.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c63jmj.fd b/language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/c63jmj.fd
index 8c964bb6a0..2e1a2bfb0f 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c63jmj.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c63jnv.fd b/language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/c63jnv.fd
index 169c4dda5e..4bc3278c91 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c63jnv.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c63jsr.fd b/language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/c63jsr.fd
index 445d22c4db..80d4631a65 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c63jsr.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c63mj.fd b/language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/c63mj.fd
index ac1ba4bbf3..cd99102f69 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c63mj.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c63pg.fd b/language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/c63pg.fd
index 9d9bb41e26..24a2c021d0 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c63pg.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c63pga.fd b/language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/c63pga.fd
index a51fabed81..7f795391f8 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c63pga.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c63ph.fd b/language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/c63ph.fd
index 3ead419232..7cd0996fda 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c63ph.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c63pn.fd b/language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/c63pn.fd
index f6f2249f53..e4a979077f 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c63pn.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c63sh.fd b/language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/c63sh.fd
index 07931f05e4..62b984d6d1 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c63sh.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c63tz.fd b/language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/c63tz.fd
index aa113a74df..a0f8c67af9 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c63tz.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c63vd.fd b/language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/c63vd.fd
index b07ea60f8b..66cc912c0f 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c63vd.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c63yt.fd b/language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/c63yt.fd
index f782d94183..11b979a2d8 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c63yt.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c64bm.fd b/language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/c64bm.fd
index e9b2fcd63f..35dbc4e552 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c64bm.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c64dn.fd b/language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/c64dn.fd
index 4ad2e82ff1..e699a8fcdf 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c64dn.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c64gr.fd b/language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/c64gr.fd
index ce45b0ce2a..e8da5452bf 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c64gr.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c64gs.fd b/language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/c64gs.fd
index 9311a5e4f0..fc0d18f5fa 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c64gs.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c64gt.fd b/language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/c64gt.fd
index 042cd30494..b95b54b5ec 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c64gt.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c64jgt.fd b/language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/c64jgt.fd
index b76aa551a6..2804b4082b 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c64jgt.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c64jmj.fd b/language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/c64jmj.fd
index e7d3c54527..fc5c42355d 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c64jmj.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c64jnv.fd b/language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/c64jnv.fd
index 05008ca036..9fec493b1b 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c64jnv.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c64jsr.fd b/language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/c64jsr.fd
index 151e9bc009..d6f34f8e7b 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c64jsr.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c64mj.fd b/language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/c64mj.fd
index 6d2abe0dcd..1673eaa14b 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c64mj.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c64pg.fd b/language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/c64pg.fd
index b208a5f875..96e6c1264b 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c64pg.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c64pga.fd b/language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/c64pga.fd
index 26ad47a7a3..56058915cc 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c64pga.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c64ph.fd b/language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/c64ph.fd
index e81d2a479f..7f5cb9fc6c 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c64ph.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c64pn.fd b/language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/c64pn.fd
index b4b1864db3..a5348103df 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c64pn.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c64sh.fd b/language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/c64sh.fd
index 1903bdd16d..348f2f34d4 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c64sh.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c64tz.fd b/language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/c64tz.fd
index 1980a8f306..ce174378c2 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c64tz.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c64vd.fd b/language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/c64vd.fd
index 92087c75f9..c7fb764ba3 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c64vd.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c64yt.fd b/language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/c64yt.fd
index 09f70c738d..e122637fbd 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c64yt.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c65bm.fd b/language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/c65bm.fd
index 13cfbc8750..c526f709c1 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c65bm.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c65dn.fd b/language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/c65dn.fd
index 8873d59c89..4b6d776b70 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c65dn.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c65gr.fd b/language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/c65gr.fd
index 0a8d4990f1..df5308f99f 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c65gr.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c65gs.fd b/language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/c65gs.fd
index 673fa549e0..f6fcb6fa8d 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c65gs.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c65gt.fd b/language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/c65gt.fd
index a9d96baded..98a7055472 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c65gt.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c65jgt.fd b/language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/c65jgt.fd
index 40d511e1a2..0267e5b19c 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c65jgt.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c65jmj.fd b/language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/c65jmj.fd
index 94105895e4..38250f043d 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c65jmj.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c65jnv.fd b/language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/c65jnv.fd
index 0c80ce03e9..973211bc7b 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c65jnv.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c65jsr.fd b/language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/c65jsr.fd
index a0d8d08710..df55d6f9e2 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c65jsr.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c65mj.fd b/language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/c65mj.fd
index e0214d2167..6e998adf3f 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c65mj.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c65pg.fd b/language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/c65pg.fd
index f5b43208f9..fc5fe9004b 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c65pg.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c65pga.fd b/language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/c65pga.fd
index f18acdedab..2234820a6b 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c65pga.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c65ph.fd b/language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/c65ph.fd
index fb4f2aa53c..2b3a8d93a1 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c65ph.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c65pn.fd b/language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/c65pn.fd
index 836524e00e..8d77ed1c1a 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c65pn.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c65sh.fd b/language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/c65sh.fd
index 1f6ebafe91..0cb3a621e8 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c65sh.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c65tz.fd b/language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/c65tz.fd
index 0c80ae060a..d353019683 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c65tz.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c65vd.fd b/language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/c65vd.fd
index 1ffaefd5b9..efe297ef8b 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c65vd.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c65yt.fd b/language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/c65yt.fd
index 90d021a102..0aa4975cab 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/c65yt.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/pshan.sty b/language/chinese/CJK/cjk-4.8.5/texinput/KS/HLaTeX/pshan.sty
index d35018bdd3..67c4c5fb4d 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/KS/HLaTeX/pshan.sty
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/KS/KS.chr b/language/chinese/CJK/cjk-4.8.5/texinput/KS/KS.chr
index d739a2ce90..924b9792e5 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/KS/KS.chr
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/KS/KS.enc b/language/chinese/CJK/cjk-4.8.5/texinput/KS/KS.enc
index 831451ca67..bd3246e246 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/KS/KS.enc
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/KS/c60dr.fd b/language/chinese/CJK/cjk-4.8.5/texinput/KS/c60dr.fd
index 15124ebce8..83d0bd611d 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/KS/c60dr.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/KS/c60gr.fd b/language/chinese/CJK/cjk-4.8.5/texinput/KS/c60gr.fd
index bfda728dbc..b2e908ac5d 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/KS/c60gr.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/KS/c60gs.fd b/language/chinese/CJK/cjk-4.8.5/texinput/KS/c60gs.fd
index a462f4249f..cb8e012255 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/KS/c60gs.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/KS/c60gt.fd b/language/chinese/CJK/cjk-4.8.5/texinput/KS/c60gt.fd
index d5136edce4..fc54bfded7 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/KS/c60gt.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/KS/c60hgt.fd b/language/chinese/CJK/cjk-4.8.5/texinput/KS/c60hgt.fd
index 1a53923e1c..4291ae4361 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/KS/c60hgt.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/KS/c60hmj.fd b/language/chinese/CJK/cjk-4.8.5/texinput/KS/c60hmj.fd
index 9c6aed9d1a..a2bea6c9a1 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/KS/c60hmj.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/KS/c60hol.fd b/language/chinese/CJK/cjk-4.8.5/texinput/KS/c60hol.fd
index d1a049365a..1c1e16b12b 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/KS/c60hol.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/KS/c60hpg.fd b/language/chinese/CJK/cjk-4.8.5/texinput/KS/c60hpg.fd
index 754d3d067d..d581cebaf8 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/KS/c60hpg.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/KS/c60mj.fd b/language/chinese/CJK/cjk-4.8.5/texinput/KS/c60mj.fd
index 6cd20203b0..1c86c18335 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/KS/c60mj.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/KS/c61dr.fd b/language/chinese/CJK/cjk-4.8.5/texinput/KS/c61dr.fd
index a7ae4c0459..09e246a7e8 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/KS/c61dr.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/KS/c61gr.fd b/language/chinese/CJK/cjk-4.8.5/texinput/KS/c61gr.fd
index 112f131286..32acdfb66c 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/KS/c61gr.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/KS/c61gs.fd b/language/chinese/CJK/cjk-4.8.5/texinput/KS/c61gs.fd
index d82d2db892..0eae709b0a 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/KS/c61gs.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/KS/c61gt.fd b/language/chinese/CJK/cjk-4.8.5/texinput/KS/c61gt.fd
index 64ac747dba..53b4084ebb 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/KS/c61gt.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/KS/c61hgt.fd b/language/chinese/CJK/cjk-4.8.5/texinput/KS/c61hgt.fd
index 0eedfc9f9a..7a1af915c1 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/KS/c61hgt.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/KS/c61hmj.fd b/language/chinese/CJK/cjk-4.8.5/texinput/KS/c61hmj.fd
index ac2e6661e7..a38b4ebde6 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/KS/c61hmj.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/KS/c61hol.fd b/language/chinese/CJK/cjk-4.8.5/texinput/KS/c61hol.fd
index 847be5a285..9221a5257c 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/KS/c61hol.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/KS/c61hpg.fd b/language/chinese/CJK/cjk-4.8.5/texinput/KS/c61hpg.fd
index 46cf14ded5..3f5b9ea9d6 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/KS/c61hpg.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/KS/c61mj.fd b/language/chinese/CJK/cjk-4.8.5/texinput/KS/c61mj.fd
index 46157440b6..3ce385d014 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/KS/c61mj.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/KS/c62song.fd b/language/chinese/CJK/cjk-4.8.5/texinput/KS/c62song.fd
index 197758069b..d25d0d2e0d 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/KS/c62song.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/KS/hangul.cap b/language/chinese/CJK/cjk-4.8.5/texinput/KS/hangul.cap
index 6bd740870c..f1ccedf8f7 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/KS/hangul.cap
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/KS/hangul.cpx b/language/chinese/CJK/cjk-4.8.5/texinput/KS/hangul.cpx
index 35f4f13e2a..1050f74589 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/KS/hangul.cpx
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/KS/hangul2.cap b/language/chinese/CJK/cjk-4.8.5/texinput/KS/hangul2.cap
index 2c9e398ff7..98dbb26600 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/KS/hangul2.cap
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/KS/hangul2.cpx b/language/chinese/CJK/cjk-4.8.5/texinput/KS/hangul2.cpx
index 37d43dc39c..ce3250733c 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/KS/hangul2.cpx
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/KS/hanja.cap b/language/chinese/CJK/cjk-4.8.5/texinput/KS/hanja.cap
index 2b000073ee..7eb1832cde 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/KS/hanja.cap
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/KS/hanja.cpx b/language/chinese/CJK/cjk-4.8.5/texinput/KS/hanja.cpx
index b2e48ea932..39e2a02cf4 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/KS/hanja.cpx
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/SJIS/SJIS.bdg b/language/chinese/CJK/cjk-4.8.5/texinput/SJIS/SJIS.bdg
index 7dd2a6a0f1..3d5b0299af 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/SJIS/SJIS.bdg
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/SJIS/SJIS.cap b/language/chinese/CJK/cjk-4.8.5/texinput/SJIS/SJIS.cap
index 4390494383..3b62a9802b 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/SJIS/SJIS.cap
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/SJIS/SJIS.chr b/language/chinese/CJK/cjk-4.8.5/texinput/SJIS/SJIS.chr
index d5243145c3..cb17c2ff0c 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/SJIS/SJIS.chr
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/SJIS/SJIS.cpx b/language/chinese/CJK/cjk-4.8.5/texinput/SJIS/SJIS.cpx
index d29ad72762..e68f47b273 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/SJIS/SJIS.cpx
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/SJIS/SJIS.enc b/language/chinese/CJK/cjk-4.8.5/texinput/SJIS/SJIS.enc
index ba61a6a1cf..e20ffa821b 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/SJIS/SJIS.enc
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/SJIS/SJISdnp.chr b/language/chinese/CJK/cjk-4.8.5/texinput/SJIS/SJISdnp.chr
index 05e880f6cd..9fb710420f 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/SJIS/SJISdnp.chr
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/SJIS/SJISdnp.enc b/language/chinese/CJK/cjk-4.8.5/texinput/SJIS/SJISdnp.enc
index eb8381fa1b..0aeaf13f71 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/SJIS/SJISdnp.enc
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/SJIS/c49song.fd b/language/chinese/CJK/cjk-4.8.5/texinput/SJIS/c49song.fd
index 334ebf6812..c24aa0dc81 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/SJIS/c49song.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/UTF8/UTF8.bdg b/language/chinese/CJK/cjk-4.8.5/texinput/UTF8/UTF8.bdg
index 9c37a0afdb..7e1f4988f5 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/UTF8/UTF8.bdg
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/UTF8/UTF8.chr b/language/chinese/CJK/cjk-4.8.5/texinput/UTF8/UTF8.chr
index f255e32f31..cdb438141e 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/UTF8/UTF8.chr
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/UTF8/UTF8.enc b/language/chinese/CJK/cjk-4.8.5/texinput/UTF8/UTF8.enc
index 20b1cde2e9..ff401e7049 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/UTF8/UTF8.enc
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/UTF8/c70bkai.fd b/language/chinese/CJK/cjk-4.8.5/texinput/UTF8/c70bkai.fd
index b70366a9be..a4f0d9a849 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/UTF8/c70bkai.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/UTF8/c70bkai.fdx b/language/chinese/CJK/cjk-4.8.5/texinput/UTF8/c70bkai.fdx
index f8b815ae44..8f3919f492 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/UTF8/c70bkai.fdx
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/UTF8/c70bsmi.fd b/language/chinese/CJK/cjk-4.8.5/texinput/UTF8/c70bsmi.fd
index d65e63a7ea..89ebad58e9 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/UTF8/c70bsmi.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/UTF8/c70bsmi.fdx b/language/chinese/CJK/cjk-4.8.5/texinput/UTF8/c70bsmi.fdx
index 777dfe6c44..08a298253c 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/UTF8/c70bsmi.fdx
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/UTF8/c70gbsn.fd b/language/chinese/CJK/cjk-4.8.5/texinput/UTF8/c70gbsn.fd
index d3f68d1edf..f13902d0ed 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/UTF8/c70gbsn.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/UTF8/c70gbsn.fdx b/language/chinese/CJK/cjk-4.8.5/texinput/UTF8/c70gbsn.fdx
index 2a171dcc03..57ab05fda2 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/UTF8/c70gbsn.fdx
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/UTF8/c70gkai.fd b/language/chinese/CJK/cjk-4.8.5/texinput/UTF8/c70gkai.fd
index 1c17567194..532faa1d75 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/UTF8/c70gkai.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/UTF8/c70gkai.fdx b/language/chinese/CJK/cjk-4.8.5/texinput/UTF8/c70gkai.fdx
index 5fa017a258..d0735a97e5 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/UTF8/c70gkai.fdx
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/UTF8/c70mj.fd b/language/chinese/CJK/cjk-4.8.5/texinput/UTF8/c70mj.fd
index e803afcea3..d2f03e670e 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/UTF8/c70mj.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/UTF8/c70mj.fdx b/language/chinese/CJK/cjk-4.8.5/texinput/UTF8/c70mj.fdx
index d5c0f741d7..07c7235bec 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/UTF8/c70mj.fdx
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/UTF8/c70song.fd b/language/chinese/CJK/cjk-4.8.5/texinput/UTF8/c70song.fd
index 4e41f9aef9..db45e169f0 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/UTF8/c70song.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/UTF8/ja.cpx b/language/chinese/CJK/cjk-4.8.5/texinput/UTF8/ja.cpx
index c6a16371d3..0ffd3fb2da 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/UTF8/ja.cpx
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/UTF8/ko-Hang.cpx b/language/chinese/CJK/cjk-4.8.5/texinput/UTF8/ko-Hang.cpx
index 44b7dc614c..f83c47a68b 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/UTF8/ko-Hang.cpx
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/UTF8/ko-Hang2.cpx b/language/chinese/CJK/cjk-4.8.5/texinput/UTF8/ko-Hang2.cpx
index 9635d4f587..e6f40fdd2b 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/UTF8/ko-Hang2.cpx
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/UTF8/ko-Hani.cpx b/language/chinese/CJK/cjk-4.8.5/texinput/UTF8/ko-Hani.cpx
index 68d68f9f57..f98d156212 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/UTF8/ko-Hani.cpx
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/UTF8/zh-Hans.cpx b/language/chinese/CJK/cjk-4.8.5/texinput/UTF8/zh-Hans.cpx
index f526089d33..9ec7bf06c8 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/UTF8/zh-Hans.cpx
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/UTF8/zh-Hant.cpx b/language/chinese/CJK/cjk-4.8.5/texinput/UTF8/zh-Hant.cpx
index 388f600aa8..84b6f4df8c 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/UTF8/zh-Hant.cpx
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/extended.chr b/language/chinese/CJK/cjk-4.8.5/texinput/extended.chr
index 49e09b5f8e..38cd923aa9 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/extended.chr
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/extended.enc b/language/chinese/CJK/cjk-4.8.5/texinput/extended.enc
index 73d2ecee86..10d0ce146d 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/extended.enc
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/mule/MULEenc.sty b/language/chinese/CJK/cjk-4.8.5/texinput/mule/MULEenc.sty
index cc356b4b6c..d9e608ae02 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/mule/MULEenc.sty
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/pinyin.sty b/language/chinese/CJK/cjk-4.8.5/texinput/pinyin.sty
index c5a76b6bd8..b9b1553ee2 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/pinyin.sty
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/pmC.chr b/language/chinese/CJK/cjk-4.8.5/texinput/pmC.chr
index 0a4b44d412..83a75e7e7f 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/pmC.chr
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/pmCbig.enc b/language/chinese/CJK/cjk-4.8.5/texinput/pmCbig.enc
index c86d9b30e1..57ecd41ddb 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/pmCbig.enc
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/pmCsmall.enc b/language/chinese/CJK/cjk-4.8.5/texinput/pmCsmall.enc
index e1a0245e0a..2e64b23b90 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/pmCsmall.enc
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/ruby.sty b/language/chinese/CJK/cjk-4.8.5/texinput/ruby.sty
index a42df601df..708a62522c 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/ruby.sty
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/standard.bdg b/language/chinese/CJK/cjk-4.8.5/texinput/standard.bdg
index c793d94044..dc0a5f18a2 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/standard.bdg
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/standard.chr b/language/chinese/CJK/cjk-4.8.5/texinput/standard.chr
index bf367663a1..e1669a627f 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/standard.chr
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/standard.enc b/language/chinese/CJK/cjk-4.8.5/texinput/standard.enc
index 5f107344b0..d54df3a37b 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/standard.enc
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/thai/c90cmr.fd b/language/chinese/CJK/cjk-4.8.5/texinput/thai/c90cmr.fd
index ab41dcb2f9..d65fbf8eff 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/thai/c90cmr.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/thai/c90cmss.fd b/language/chinese/CJK/cjk-4.8.5/texinput/thai/c90cmss.fd
index 3dd77a71e7..240713a34b 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/thai/c90cmss.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/thai/c90cmtt.fd b/language/chinese/CJK/cjk-4.8.5/texinput/thai/c90cmtt.fd
index aa6ba2d662..bf50798389 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/thai/c90cmtt.fd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texinput/thai/c90enc.def b/language/chinese/CJK/cjk-4.8.5/texinput/thai/c90enc.def
index 428e8e3801..428e8e3801 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/thai/c90enc.def
+++ b/language/chinese/CJK/cjk-4.8.5/texinput/thai/c90enc.def
diff --git a/language/chinese/CJK/cjk-4.8.4/texinput/thai/c90gar.fd b/language/chinese/CJK/cjk-4.8.5/texinput/thai/c90gar.fd
index 69998e058b..69998e058b 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/thai/c90gar.fd
+++ b/language/chinese/CJK/cjk-4.8.5/texinput/thai/c90gar.fd
diff --git a/language/chinese/CJK/cjk-4.8.4/texinput/thai/c90nrsr.fd b/language/chinese/CJK/cjk-4.8.5/texinput/thai/c90nrsr.fd
index 5da41a39b7..5da41a39b7 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/thai/c90nrsr.fd
+++ b/language/chinese/CJK/cjk-4.8.5/texinput/thai/c90nrsr.fd
diff --git a/language/chinese/CJK/cjk-4.8.4/texinput/thai/thaicjk.ldf b/language/chinese/CJK/cjk-4.8.5/texinput/thai/thaicjk.ldf
index b11c63edf3..78166632e9 100644
--- a/language/chinese/CJK/cjk-4.8.4/texinput/thai/thaicjk.ldf
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texlive/README b/language/chinese/CJK/cjk-4.8.5/texlive/README
index a07701fe54..a07701fe54 100644
--- a/language/chinese/CJK/cjk-4.8.4/texlive/README
+++ b/language/chinese/CJK/cjk-4.8.5/texlive/README
diff --git a/language/chinese/CJK/cjk-4.8.4/texlive/bin-cjkutils.pl b/language/chinese/CJK/cjk-4.8.5/texlive/bin-cjkutils.pl
index ea1997a8c4..4b40c211e8 100644
--- a/language/chinese/CJK/cjk-4.8.4/texlive/bin-cjkutils.pl
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texlive/c63mj.fd b/language/chinese/CJK/cjk-4.8.5/texlive/c63mj.fd
index 9939c393c6..f4625c9df9 100644
--- a/language/chinese/CJK/cjk-4.8.4/texlive/c63mj.fd
+++ b/language/chinese/CJK/cjk-4.8.5/texlive/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/language/chinese/CJK/cjk-4.8.4/texlive/c64mj.fd b/language/chinese/CJK/cjk-4.8.5/texlive/c64mj.fd
index 250541c50a..42b321861c 100644
--- a/language/chinese/CJK/cjk-4.8.4/texlive/c64mj.fd
+++ b/language/chinese/CJK/cjk-4.8.5/texlive/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/language/chinese/CJK/cjk-4.8.4/texlive/c65mj.fd b/language/chinese/CJK/cjk-4.8.5/texlive/c65mj.fd
index 83c4db961a..3307685af0 100644
--- a/language/chinese/CJK/cjk-4.8.4/texlive/c65mj.fd
+++ b/language/chinese/CJK/cjk-4.8.5/texlive/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/language/chinese/CJK/cjk-4.8.4/texlive/c90.pl b/language/chinese/CJK/cjk-4.8.5/texlive/c90.pl
index 15863e16a1..c7cbbacf6a 100644
--- a/language/chinese/CJK/cjk-4.8.4/texlive/c90.pl
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texlive/cjk-build.pl b/language/chinese/CJK/cjk-4.8.5/texlive/cjk-build.pl
index d2ff4ff743..8837c28ee2 100644
--- a/language/chinese/CJK/cjk-4.8.4/texlive/cjk-build.pl
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texlive/cjk.pl b/language/chinese/CJK/cjk-4.8.5/texlive/cjk.pl
index 5e487dab7c..d631dcad05 100644
--- a/language/chinese/CJK/cjk-4.8.4/texlive/cjk.pl
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texlive/dnp.pl b/language/chinese/CJK/cjk-4.8.5/texlive/dnp.pl
index f0ccf46a27..f7e75555eb 100644
--- a/language/chinese/CJK/cjk-4.8.4/texlive/dnp.pl
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texlive/garuda-c90.pl b/language/chinese/CJK/cjk-4.8.5/texlive/garuda-c90.pl
index 40e0cda743..539e7bf63c 100644
--- a/language/chinese/CJK/cjk-4.8.4/texlive/garuda-c90.pl
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/texlive/norasi-c90.pl b/language/chinese/CJK/cjk-4.8.5/texlive/norasi-c90.pl
index 200e31ea2d..88dd7cbf7f 100644
--- a/language/chinese/CJK/cjk-4.8.4/texlive/norasi-c90.pl
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/utils/Bg5conv/bg5conv.1 b/language/chinese/CJK/cjk-4.8.5/utils/Bg5conv/bg5conv.1
index a9e83901cf..c18087e1c3 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/Bg5conv/bg5conv.1
+++ b/language/chinese/CJK/cjk-4.8.5/utils/Bg5conv/bg5conv.1
@@ -1,5 +1,5 @@
.\" man page for bg5conv
-.\" 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
@@ -16,7 +16,7 @@
.\" Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
.\" MA 02110-1301 USA
.
-.TH BG5CONV 1 18-Apr-2015 "CJK Version 4.8.4"
+.TH BG5CONV 1 16-Oct-2021 "CJK Version 4.8.5"
.
.\" ====
.\" ==== macro definitions
diff --git a/language/chinese/CJK/cjk-4.8.4/utils/Bg5conv/bg5conv.c b/language/chinese/CJK/cjk-4.8.5/utils/Bg5conv/bg5conv.c
index b745e6a97f..e5c7ecf2a4 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/Bg5conv/bg5conv.c
+++ b/language/chinese/CJK/cjk-4.8.5/utils/Bg5conv/bg5conv.c
@@ -1,8 +1,8 @@
#define banner \
-"bg5conv (CJK ver. 4.8.4)" \
+"bg5conv (CJK ver. 4.8.5)" \
/*2:*/
-#line 94 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/Bg5conv/bg5conv.w"
+#line 94 "/home/wl/git/cjk/cjk-4.8.5/utils/Bg5conv/bg5conv.w"
#include <stdio.h>
#include <stdlib.h>
diff --git a/language/chinese/CJK/cjk-4.8.4/utils/Bg5conv/bg5conv.w b/language/chinese/CJK/cjk-4.8.5/utils/Bg5conv/bg5conv.w
index 13165032d6..fdce159e14 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/Bg5conv/bg5conv.w
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/utils/Bg5conv/bg5latex b/language/chinese/CJK/cjk-4.8.5/utils/Bg5conv/bg5latex
index 2540f9524d..91eca16d77 100755
--- a/language/chinese/CJK/cjk-4.8.4/utils/Bg5conv/bg5latex
+++ b/language/chinese/CJK/cjk-4.8.5/utils/Bg5conv/bg5latex
@@ -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/language/chinese/CJK/cjk-4.8.4/utils/Bg5conv/bg5latex.bat b/language/chinese/CJK/cjk-4.8.5/utils/Bg5conv/bg5latex.bat
index 91e7dfd857..91e7dfd857 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/Bg5conv/bg5latex.bat
+++ b/language/chinese/CJK/cjk-4.8.5/utils/Bg5conv/bg5latex.bat
diff --git a/language/chinese/CJK/cjk-4.8.4/utils/Bg5conv/bg5latex.cmd b/language/chinese/CJK/cjk-4.8.5/utils/Bg5conv/bg5latex.cmd
index facf871970..401a426ec0 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/Bg5conv/bg5latex.cmd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/utils/Bg5conv/bg5pdflatex b/language/chinese/CJK/cjk-4.8.5/utils/Bg5conv/bg5pdflatex
index 9adacad3a6..a89ab4ea8f 100755
--- a/language/chinese/CJK/cjk-4.8.4/utils/Bg5conv/bg5pdflatex
+++ b/language/chinese/CJK/cjk-4.8.5/utils/Bg5conv/bg5pdflatex
@@ -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/language/chinese/CJK/cjk-4.8.4/utils/CEFconv/cef5conv.1 b/language/chinese/CJK/cjk-4.8.5/utils/CEFconv/cef5conv.1
index d04c527102..5c5c3cd1c3 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/CEFconv/cef5conv.1
+++ b/language/chinese/CJK/cjk-4.8.5/utils/CEFconv/cef5conv.1
@@ -1,5 +1,5 @@
.\" man page for cef5conv
-.\" 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
@@ -16,7 +16,7 @@
.\" Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
.\" MA 02110-1301 USA
.
-.TH CEF5CONV 1 18-Apr-2015 "CJK Version 4.8.4"
+.TH CEF5CONV 1 16-Oct-2021 "CJK Version 4.8.5"
.
.\" ====
.\" ==== macro definitions
diff --git a/language/chinese/CJK/cjk-4.8.4/utils/CEFconv/cef5conv.c b/language/chinese/CJK/cjk-4.8.5/utils/CEFconv/cef5conv.c
index 46228a1f5d..b5b479b6e6 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/CEFconv/cef5conv.c
+++ b/language/chinese/CJK/cjk-4.8.5/utils/CEFconv/cef5conv.c
@@ -1,8 +1,8 @@
#define banner \
-"cef5conv (CJK ver. 4.8.4)" \
+"cef5conv (CJK ver. 4.8.5)" \
/*2:*/
-#line 108 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/CEFconv/cef5conv.w"
+#line 108 "/home/wl/git/cjk/cjk-4.8.5/utils/CEFconv/cef5conv.w"
#include <ctype.h>
#include <stdio.h>
diff --git a/language/chinese/CJK/cjk-4.8.4/utils/CEFconv/cef5conv.w b/language/chinese/CJK/cjk-4.8.5/utils/CEFconv/cef5conv.w
index 575ba253ae..59942012ab 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/CEFconv/cef5conv.w
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/utils/CEFconv/cef5latex b/language/chinese/CJK/cjk-4.8.5/utils/CEFconv/cef5latex
index 1b51a711d1..3a0f5a300c 100755
--- a/language/chinese/CJK/cjk-4.8.4/utils/CEFconv/cef5latex
+++ b/language/chinese/CJK/cjk-4.8.5/utils/CEFconv/cef5latex
@@ -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/language/chinese/CJK/cjk-4.8.4/utils/CEFconv/cef5ltx.bat b/language/chinese/CJK/cjk-4.8.5/utils/CEFconv/cef5ltx.bat
index 187485301f..187485301f 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/CEFconv/cef5ltx.bat
+++ b/language/chinese/CJK/cjk-4.8.5/utils/CEFconv/cef5ltx.bat
diff --git a/language/chinese/CJK/cjk-4.8.4/utils/CEFconv/cef5ltx.cmd b/language/chinese/CJK/cjk-4.8.5/utils/CEFconv/cef5ltx.cmd
index f089e831c6..29496f8967 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/CEFconv/cef5ltx.cmd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/utils/CEFconv/cef5pdflatex b/language/chinese/CJK/cjk-4.8.5/utils/CEFconv/cef5pdflatex
index 1ae7b5953e..cdd4384ec7 100755
--- a/language/chinese/CJK/cjk-4.8.4/utils/CEFconv/cef5pdflatex
+++ b/language/chinese/CJK/cjk-4.8.5/utils/CEFconv/cef5pdflatex
@@ -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/language/chinese/CJK/cjk-4.8.4/utils/CEFconv/cefconv.1 b/language/chinese/CJK/cjk-4.8.5/utils/CEFconv/cefconv.1
index 7be7fae6ba..50a8bbf6f6 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/CEFconv/cefconv.1
+++ b/language/chinese/CJK/cjk-4.8.5/utils/CEFconv/cefconv.1
@@ -1,5 +1,5 @@
.\" man page for cefconv
-.\" 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
@@ -16,7 +16,7 @@
.\" Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
.\" MA 02110-1301 USA
.
-.TH CEFCONV 1 18-Apr-2015 "CJK Version 4.8.4"
+.TH CEFCONV 1 16-Oct-2021 "CJK Version 4.8.5"
.
.\" ====
.\" ==== macro definitions
diff --git a/language/chinese/CJK/cjk-4.8.4/utils/CEFconv/cefconv.c b/language/chinese/CJK/cjk-4.8.5/utils/CEFconv/cefconv.c
index 967672e793..354bf073cc 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/CEFconv/cefconv.c
+++ b/language/chinese/CJK/cjk-4.8.5/utils/CEFconv/cefconv.c
@@ -1,8 +1,8 @@
#define banner \
-"cefconv (CJK ver. 4.8.4)" \
+"cefconv (CJK ver. 4.8.5)" \
/*2:*/
-#line 100 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/CEFconv/cefconv.w"
+#line 100 "/home/wl/git/cjk/cjk-4.8.5/utils/CEFconv/cefconv.w"
#include <ctype.h>
#include <stdio.h>
diff --git a/language/chinese/CJK/cjk-4.8.4/utils/CEFconv/cefconv.w b/language/chinese/CJK/cjk-4.8.5/utils/CEFconv/cefconv.w
index 142a5d862b..93fe237f24 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/CEFconv/cefconv.w
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/utils/CEFconv/ceflatex b/language/chinese/CJK/cjk-4.8.5/utils/CEFconv/ceflatex
index 79bcd8abe3..8102e177fa 100755
--- a/language/chinese/CJK/cjk-4.8.4/utils/CEFconv/ceflatex
+++ b/language/chinese/CJK/cjk-4.8.5/utils/CEFconv/ceflatex
@@ -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/language/chinese/CJK/cjk-4.8.4/utils/CEFconv/ceflatex.bat b/language/chinese/CJK/cjk-4.8.5/utils/CEFconv/ceflatex.bat
index ba5925a6df..ba5925a6df 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/CEFconv/ceflatex.bat
+++ b/language/chinese/CJK/cjk-4.8.5/utils/CEFconv/ceflatex.bat
diff --git a/language/chinese/CJK/cjk-4.8.4/utils/CEFconv/ceflatex.cmd b/language/chinese/CJK/cjk-4.8.5/utils/CEFconv/ceflatex.cmd
index dcc3183431..43666071bc 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/CEFconv/ceflatex.cmd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/utils/CEFconv/cefpdflatex b/language/chinese/CJK/cjk-4.8.5/utils/CEFconv/cefpdflatex
index c1b776cffd..16847a515c 100755
--- a/language/chinese/CJK/cjk-4.8.4/utils/CEFconv/cefpdflatex
+++ b/language/chinese/CJK/cjk-4.8.5/utils/CEFconv/cefpdflatex
@@ -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/language/chinese/CJK/cjk-4.8.4/utils/CEFconv/cefsconv.1 b/language/chinese/CJK/cjk-4.8.5/utils/CEFconv/cefsconv.1
index 4c38133298..58f0ad8e81 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/CEFconv/cefsconv.1
+++ b/language/chinese/CJK/cjk-4.8.5/utils/CEFconv/cefsconv.1
@@ -1,5 +1,5 @@
.\" man page for cefsconv
-.\" 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
@@ -16,7 +16,7 @@
.\" Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
.\" MA 02110-1301 USA
.
-.TH CEFSCONV 1 18-Apr-2015 "CJK Version 4.8.4"
+.TH CEFSCONV 1 16-Oct-2021 "CJK Version 4.8.5"
.
.\" ====
.\" ==== macro definitions
diff --git a/language/chinese/CJK/cjk-4.8.4/utils/CEFconv/cefsconv.c b/language/chinese/CJK/cjk-4.8.5/utils/CEFconv/cefsconv.c
index bd4a701ffc..76629c6568 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/CEFconv/cefsconv.c
+++ b/language/chinese/CJK/cjk-4.8.5/utils/CEFconv/cefsconv.c
@@ -1,8 +1,8 @@
#define banner \
-"cefsconv (CJK ver. 4.8.4)" \
+"cefsconv (CJK ver. 4.8.5)" \
/*2:*/
-#line 111 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/CEFconv/cefsconv.w"
+#line 111 "/home/wl/git/cjk/cjk-4.8.5/utils/CEFconv/cefsconv.w"
#include <ctype.h>
#include <stdio.h>
diff --git a/language/chinese/CJK/cjk-4.8.4/utils/CEFconv/cefsconv.w b/language/chinese/CJK/cjk-4.8.5/utils/CEFconv/cefsconv.w
index 7e033f34ea..5f8d7870ca 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/CEFconv/cefsconv.w
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/utils/CEFconv/cefslatex b/language/chinese/CJK/cjk-4.8.5/utils/CEFconv/cefslatex
index 3d3daa175b..fd78a24468 100755
--- a/language/chinese/CJK/cjk-4.8.4/utils/CEFconv/cefslatex
+++ b/language/chinese/CJK/cjk-4.8.5/utils/CEFconv/cefslatex
@@ -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/language/chinese/CJK/cjk-4.8.4/utils/CEFconv/cefsltx.bat b/language/chinese/CJK/cjk-4.8.5/utils/CEFconv/cefsltx.bat
index 662ef9e3af..662ef9e3af 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/CEFconv/cefsltx.bat
+++ b/language/chinese/CJK/cjk-4.8.5/utils/CEFconv/cefsltx.bat
diff --git a/language/chinese/CJK/cjk-4.8.4/utils/CEFconv/cefsltx.cmd b/language/chinese/CJK/cjk-4.8.5/utils/CEFconv/cefsltx.cmd
index 7150e8aad1..dc7663d274 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/CEFconv/cefsltx.cmd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/utils/CEFconv/cefspdflatex b/language/chinese/CJK/cjk-4.8.5/utils/CEFconv/cefspdflatex
index ed981d4dfb..ee78cd3bd5 100755
--- a/language/chinese/CJK/cjk-4.8.4/utils/CEFconv/cefspdflatex
+++ b/language/chinese/CJK/cjk-4.8.5/utils/CEFconv/cefspdflatex
@@ -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/language/chinese/CJK/cjk-4.8.4/utils/SJISconv/sjisconv.1 b/language/chinese/CJK/cjk-4.8.5/utils/SJISconv/sjisconv.1
index c385eb616d..2ad865721c 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/SJISconv/sjisconv.1
+++ b/language/chinese/CJK/cjk-4.8.5/utils/SJISconv/sjisconv.1
@@ -1,5 +1,5 @@
.\" man page for sjisconv
-.\" 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
@@ -16,7 +16,7 @@
.\" Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
.\" MA 02110-1301 USA
.
-.TH SJISCONV 1 18-Apr-2015 "CJK Version 4.8.4"
+.TH SJISCONV 1 16-Oct-2021 "CJK Version 4.8.5"
.
.\" ====
.\" ==== macro definitions
diff --git a/language/chinese/CJK/cjk-4.8.4/utils/SJISconv/sjisconv.c b/language/chinese/CJK/cjk-4.8.5/utils/SJISconv/sjisconv.c
index af121e555d..0b42ecfdcb 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/SJISconv/sjisconv.c
+++ b/language/chinese/CJK/cjk-4.8.5/utils/SJISconv/sjisconv.c
@@ -1,8 +1,8 @@
#define banner \
-"sjisconv (CJK ver. 4.8.4)" \
+"sjisconv (CJK ver. 4.8.5)" \
/*2:*/
-#line 96 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/SJISconv/sjisconv.w"
+#line 96 "/home/wl/git/cjk/cjk-4.8.5/utils/SJISconv/sjisconv.w"
#include <stdio.h>
#include <stdlib.h>
diff --git a/language/chinese/CJK/cjk-4.8.4/utils/SJISconv/sjisconv.w b/language/chinese/CJK/cjk-4.8.5/utils/SJISconv/sjisconv.w
index c1044cf36d..c3e72454e4 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/SJISconv/sjisconv.w
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/utils/SJISconv/sjislatex b/language/chinese/CJK/cjk-4.8.5/utils/SJISconv/sjislatex
index b1086cba76..9cc170468b 100755
--- a/language/chinese/CJK/cjk-4.8.4/utils/SJISconv/sjislatex
+++ b/language/chinese/CJK/cjk-4.8.5/utils/SJISconv/sjislatex
@@ -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/language/chinese/CJK/cjk-4.8.4/utils/SJISconv/sjisltx.bat b/language/chinese/CJK/cjk-4.8.5/utils/SJISconv/sjisltx.bat
index 5702c113bd..5702c113bd 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/SJISconv/sjisltx.bat
+++ b/language/chinese/CJK/cjk-4.8.5/utils/SJISconv/sjisltx.bat
diff --git a/language/chinese/CJK/cjk-4.8.4/utils/SJISconv/sjisltx.cmd b/language/chinese/CJK/cjk-4.8.5/utils/SJISconv/sjisltx.cmd
index 2ff4e03e54..12c8a394c8 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/SJISconv/sjisltx.cmd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/utils/SJISconv/sjispdflatex b/language/chinese/CJK/cjk-4.8.5/utils/SJISconv/sjispdflatex
index 651570da7f..4a5d4817ee 100755
--- a/language/chinese/CJK/cjk-4.8.4/utils/SJISconv/sjispdflatex
+++ b/language/chinese/CJK/cjk-4.8.5/utils/SJISconv/sjispdflatex
@@ -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/language/chinese/CJK/cjk-4.8.4/utils/cjklatex/cjklatex.c b/language/chinese/CJK/cjk-4.8.5/utils/cjklatex/cjklatex.c
index 678c1dd3a8..ebea1fc3c5 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/cjklatex/cjklatex.c
+++ b/language/chinese/CJK/cjk-4.8.5/utils/cjklatex/cjklatex.c
@@ -11,7 +11,7 @@
#endif
/*
- Copyright (C) 2001-2015 F. Popineau <Fabrice.Popineau@supelec.fr>
+ Copyright (C) 2001-2021 F. Popineau <Fabrice.Popineau@supelec.fr>
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/language/chinese/CJK/cjk-4.8.4/utils/extconv/bg5+latex b/language/chinese/CJK/cjk-4.8.5/utils/extconv/bg5+latex
index 82e706a44f..257d8c43ad 100755
--- a/language/chinese/CJK/cjk-4.8.4/utils/extconv/bg5+latex
+++ b/language/chinese/CJK/cjk-4.8.5/utils/extconv/bg5+latex
@@ -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/language/chinese/CJK/cjk-4.8.4/utils/extconv/bg5+pdflatex b/language/chinese/CJK/cjk-4.8.5/utils/extconv/bg5+pdflatex
index 16377e9dc1..c3ab62a343 100755
--- a/language/chinese/CJK/cjk-4.8.4/utils/extconv/bg5+pdflatex
+++ b/language/chinese/CJK/cjk-4.8.5/utils/extconv/bg5+pdflatex
@@ -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/language/chinese/CJK/cjk-4.8.4/utils/extconv/bg5pltx.bat b/language/chinese/CJK/cjk-4.8.5/utils/extconv/bg5pltx.bat
index ccc6c76acd..ccc6c76acd 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/extconv/bg5pltx.bat
+++ b/language/chinese/CJK/cjk-4.8.5/utils/extconv/bg5pltx.bat
diff --git a/language/chinese/CJK/cjk-4.8.4/utils/extconv/bg5pltx.cmd b/language/chinese/CJK/cjk-4.8.5/utils/extconv/bg5pltx.cmd
index 69a9495208..ee93548a0d 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/extconv/bg5pltx.cmd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/utils/extconv/extconv.1 b/language/chinese/CJK/cjk-4.8.5/utils/extconv/extconv.1
index 1ef4b011d8..9d275b7345 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/extconv/extconv.1
+++ b/language/chinese/CJK/cjk-4.8.5/utils/extconv/extconv.1
@@ -1,6 +1,6 @@
.\" man page for bg5conv
.\"
-.\" 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
.
-.TH EXTCONV 1 18-Apr-2015 "CJK Version 4.8.4"
+.TH EXTCONV 1 16-Oct-2021 "CJK Version 4.8.5"
.
.\" ====
.\" ==== macro definitions
diff --git a/language/chinese/CJK/cjk-4.8.4/utils/extconv/extconv.c b/language/chinese/CJK/cjk-4.8.5/utils/extconv/extconv.c
index fdba62551c..fdfa9dc924 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/extconv/extconv.c
+++ b/language/chinese/CJK/cjk-4.8.5/utils/extconv/extconv.c
@@ -1,8 +1,8 @@
#define banner \
-"extconv (CJK ver. 4.8.4)" \
+"extconv (CJK ver. 4.8.5)" \
/*2:*/
-#line 94 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/extconv/extconv.w"
+#line 94 "/home/wl/git/cjk/cjk-4.8.5/utils/extconv/extconv.w"
#include <stdio.h>
#include <stdlib.h>
diff --git a/language/chinese/CJK/cjk-4.8.4/utils/extconv/extconv.w b/language/chinese/CJK/cjk-4.8.5/utils/extconv/extconv.w
index 019976889b..fe1b1ff006 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/extconv/extconv.w
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/utils/extconv/gbklatex b/language/chinese/CJK/cjk-4.8.5/utils/extconv/gbklatex
index 82e706a44f..257d8c43ad 100755
--- a/language/chinese/CJK/cjk-4.8.4/utils/extconv/gbklatex
+++ b/language/chinese/CJK/cjk-4.8.5/utils/extconv/gbklatex
@@ -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/language/chinese/CJK/cjk-4.8.4/utils/extconv/gbklatex.bat b/language/chinese/CJK/cjk-4.8.5/utils/extconv/gbklatex.bat
index ccc6c76acd..ccc6c76acd 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/extconv/gbklatex.bat
+++ b/language/chinese/CJK/cjk-4.8.5/utils/extconv/gbklatex.bat
diff --git a/language/chinese/CJK/cjk-4.8.4/utils/extconv/gbklatex.cmd b/language/chinese/CJK/cjk-4.8.5/utils/extconv/gbklatex.cmd
index 9bd1237934..c53de7b5e1 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/extconv/gbklatex.cmd
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/utils/extconv/gbkpdflatex b/language/chinese/CJK/cjk-4.8.5/utils/extconv/gbkpdflatex
index 16377e9dc1..c3ab62a343 100755
--- a/language/chinese/CJK/cjk-4.8.4/utils/extconv/gbkpdflatex
+++ b/language/chinese/CJK/cjk-4.8.5/utils/extconv/gbkpdflatex
@@ -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/language/chinese/CJK/cjk-4.8.4/utils/f_name.bat b/language/chinese/CJK/cjk-4.8.5/utils/f_name.bat
index 70e6e69ce9..70e6e69ce9 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/f_name.bat
+++ b/language/chinese/CJK/cjk-4.8.5/utils/f_name.bat
diff --git a/language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/Makefile.gnu b/language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/Makefile.gnu
index 1248c4f508..7dd88f3b22 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/Makefile.gnu
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/Makefile.in b/language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/Makefile.in
index 937d5d6f81..bf6022f818 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/Makefile.in
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/README b/language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/README
index a7de0ec140..a7de0ec140 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/README
+++ b/language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/README
diff --git a/language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/c-auto.h b/language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/c-auto.h
index 0bdbc5f782..96e9b06279 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/c-auto.h
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/cfg/README b/language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/cfg/README
index 689d59e739..689d59e739 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/cfg/README
+++ b/language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/cfg/README
diff --git a/language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/cfg/b5ka12.cfg b/language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/cfg/b5ka12.cfg
index f5c142f023..f5c142f023 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/cfg/b5ka12.cfg
+++ b/language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/cfg/b5ka12.cfg
diff --git a/language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/cfg/b5kr12.cfg b/language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/cfg/b5kr12.cfg
index 9d9da2c1a2..9d9da2c1a2 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/cfg/b5kr12.cfg
+++ b/language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/cfg/b5kr12.cfg
diff --git a/language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/cfg/b5so12.cfg b/language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/cfg/b5so12.cfg
index dc0bcd9fbf..dc0bcd9fbf 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/cfg/b5so12.cfg
+++ b/language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/cfg/b5so12.cfg
diff --git a/language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/cfg/c1so12.cfg b/language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/cfg/c1so12.cfg
index de5b32b3ef..de5b32b3ef 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/cfg/c1so12.cfg
+++ b/language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/cfg/c1so12.cfg
diff --git a/language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/cfg/c2so12.cfg b/language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/cfg/c2so12.cfg
index 969af8fae1..969af8fae1 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/cfg/c2so12.cfg
+++ b/language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/cfg/c2so12.cfg
diff --git a/language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/cfg/c3so12.cfg b/language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/cfg/c3so12.cfg
index 0e65768ee5..0e65768ee5 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/cfg/c3so12.cfg
+++ b/language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/cfg/c3so12.cfg
diff --git a/language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/cfg/c4so12.cfg b/language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/cfg/c4so12.cfg
index 8ea3a8b270..8ea3a8b270 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/cfg/c4so12.cfg
+++ b/language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/cfg/c4so12.cfg
diff --git a/language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/cfg/c5so12.cfg b/language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/cfg/c5so12.cfg
index 1b81c90a0d..1b81c90a0d 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/cfg/c5so12.cfg
+++ b/language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/cfg/c5so12.cfg
diff --git a/language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/cfg/c6so12.cfg b/language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/cfg/c6so12.cfg
index 5b9c912ce5..5b9c912ce5 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/cfg/c6so12.cfg
+++ b/language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/cfg/c6so12.cfg
diff --git a/language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/cfg/c7so12.cfg b/language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/cfg/c7so12.cfg
index 051b260142..051b260142 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/cfg/c7so12.cfg
+++ b/language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/cfg/c7so12.cfg
diff --git a/language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/cfg/csso12.cfg b/language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/cfg/csso12.cfg
index 9ad91b0c57..9ad91b0c57 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/cfg/csso12.cfg
+++ b/language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/cfg/csso12.cfg
diff --git a/language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/cfg/gsfs14.cfg b/language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/cfg/gsfs14.cfg
index 4b397aca46..4b397aca46 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/cfg/gsfs14.cfg
+++ b/language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/cfg/gsfs14.cfg
diff --git a/language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/cfg/j2so12.cfg b/language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/cfg/j2so12.cfg
index 7e0d70b5c0..7e0d70b5c0 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/cfg/j2so12.cfg
+++ b/language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/cfg/j2so12.cfg
diff --git a/language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/cfg/jsso12.cfg b/language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/cfg/jsso12.cfg
index 9bdfc7b1e8..9bdfc7b1e8 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/cfg/jsso12.cfg
+++ b/language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/cfg/jsso12.cfg
diff --git a/language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/cfg/ksso17.cfg b/language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/cfg/ksso17.cfg
index c82f7e7eee..c82f7e7eee 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/cfg/ksso17.cfg
+++ b/language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/cfg/ksso17.cfg
diff --git a/language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/config.guess b/language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/config.guess
new file mode 100755
index 0000000000..e81d3ae7c2
--- /dev/null
+++ b/language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/config.guess
@@ -0,0 +1,1748 @@
+#! /bin/sh
+# Attempt to guess a canonical system name.
+# Copyright 1992-2021 Free Software Foundation, Inc.
+
+# shellcheck disable=SC2006,SC2268 # see below for rationale
+
+timestamp='2021-06-03'
+
+# This file 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 3 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; if not, see <https://www.gnu.org/licenses/>.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that
+# program. This Exception is an additional permission under section 7
+# of the GNU General Public License, version 3 ("GPLv3").
+#
+# Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
+#
+# You can get the latest version of this script from:
+# https://git.savannah.gnu.org/cgit/config.git/plain/config.guess
+#
+# Please send patches to <config-patches@gnu.org>.
+
+
+# The "shellcheck disable" line above the timestamp inhibits complaints
+# about features and limitations of the classic Bourne shell that were
+# superseded or lifted in POSIX. However, this script identifies a wide
+# variety of pre-POSIX systems that do not have POSIX shells at all, and
+# even some reasonably current systems (Solaris 10 as case-in-point) still
+# have a pre-POSIX /bin/sh.
+
+
+me=`echo "$0" | sed -e 's,.*/,,'`
+
+usage="\
+Usage: $0 [OPTION]
+
+Output the configuration name of the system \`$me' is run on.
+
+Options:
+ -h, --help print this help, then exit
+ -t, --time-stamp print date of last modification, then exit
+ -v, --version print version number, then exit
+
+Report bugs and patches to <config-patches@gnu.org>."
+
+version="\
+GNU config.guess ($timestamp)
+
+Originally written by Per Bothner.
+Copyright 1992-2021 Free Software Foundation, Inc.
+
+This is free software; see the source for copying conditions. There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+
+help="
+Try \`$me --help' for more information."
+
+# Parse command line
+while test $# -gt 0 ; do
+ case $1 in
+ --time-stamp | --time* | -t )
+ echo "$timestamp" ; exit ;;
+ --version | -v )
+ echo "$version" ; exit ;;
+ --help | --h* | -h )
+ echo "$usage"; exit ;;
+ -- ) # Stop option processing
+ shift; break ;;
+ - ) # Use stdin as input.
+ break ;;
+ -* )
+ echo "$me: invalid option $1$help" >&2
+ exit 1 ;;
+ * )
+ break ;;
+ esac
+done
+
+if test $# != 0; then
+ echo "$me: too many arguments$help" >&2
+ exit 1
+fi
+
+# Just in case it came from the environment.
+GUESS=
+
+# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
+# compiler to aid in system detection is discouraged as it requires
+# temporary files to be created and, as you can see below, it is a
+# headache to deal with in a portable fashion.
+
+# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
+# use `HOST_CC' if defined, but it is deprecated.
+
+# Portable tmp directory creation inspired by the Autoconf team.
+
+tmp=
+# shellcheck disable=SC2172
+trap 'test -z "$tmp" || rm -fr "$tmp"' 0 1 2 13 15
+
+set_cc_for_build() {
+ # prevent multiple calls if $tmp is already set
+ test "$tmp" && return 0
+ : "${TMPDIR=/tmp}"
+ # shellcheck disable=SC2039,SC3028
+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir "$tmp" 2>/dev/null) ; } ||
+ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir "$tmp" 2>/dev/null) && echo "Warning: creating insecure temp directory" >&2 ; } ||
+ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; }
+ dummy=$tmp/dummy
+ case ${CC_FOR_BUILD-},${HOST_CC-},${CC-} in
+ ,,) echo "int x;" > "$dummy.c"
+ for driver in cc gcc c89 c99 ; do
+ if ($driver -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then
+ CC_FOR_BUILD=$driver
+ break
+ fi
+ done
+ if test x"$CC_FOR_BUILD" = x ; then
+ CC_FOR_BUILD=no_compiler_found
+ fi
+ ;;
+ ,,*) CC_FOR_BUILD=$CC ;;
+ ,*,*) CC_FOR_BUILD=$HOST_CC ;;
+ esac
+}
+
+# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
+# (ghazi@noc.rutgers.edu 1994-08-24)
+if test -f /.attbin/uname ; then
+ PATH=$PATH:/.attbin ; export PATH
+fi
+
+UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
+UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
+UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
+UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+
+case $UNAME_SYSTEM in
+Linux|GNU|GNU/*)
+ LIBC=unknown
+
+ set_cc_for_build
+ cat <<-EOF > "$dummy.c"
+ #include <features.h>
+ #if defined(__UCLIBC__)
+ LIBC=uclibc
+ #elif defined(__dietlibc__)
+ LIBC=dietlibc
+ #elif defined(__GLIBC__)
+ LIBC=gnu
+ #else
+ #include <stdarg.h>
+ /* First heuristic to detect musl libc. */
+ #ifdef __DEFINED_va_list
+ LIBC=musl
+ #endif
+ #endif
+ EOF
+ cc_set_libc=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
+ eval "$cc_set_libc"
+
+ # Second heuristic to detect musl libc.
+ if [ "$LIBC" = unknown ] &&
+ command -v ldd >/dev/null &&
+ ldd --version 2>&1 | grep -q ^musl; then
+ LIBC=musl
+ fi
+
+ # If the system lacks a compiler, then just pick glibc.
+ # We could probably try harder.
+ if [ "$LIBC" = unknown ]; then
+ LIBC=gnu
+ fi
+ ;;
+esac
+
+# Note: order is significant - the case branches are not exclusive.
+
+case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in
+ *:NetBSD:*:*)
+ # NetBSD (nbsd) targets should (where applicable) match one or
+ # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
+ # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently
+ # switched to ELF, *-*-netbsd* would select the old
+ # object file format. This provides both forward
+ # compatibility and a consistent mechanism for selecting the
+ # object file format.
+ #
+ # Note: NetBSD doesn't particularly care about the vendor
+ # portion of the name. We always set it to "unknown".
+ UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \
+ /sbin/sysctl -n hw.machine_arch 2>/dev/null || \
+ /usr/sbin/sysctl -n hw.machine_arch 2>/dev/null || \
+ echo unknown)`
+ case $UNAME_MACHINE_ARCH in
+ aarch64eb) machine=aarch64_be-unknown ;;
+ armeb) machine=armeb-unknown ;;
+ arm*) machine=arm-unknown ;;
+ sh3el) machine=shl-unknown ;;
+ sh3eb) machine=sh-unknown ;;
+ sh5el) machine=sh5le-unknown ;;
+ earmv*)
+ arch=`echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e\(armv[0-9]\).*$,\1,'`
+ endian=`echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*\(eb\)$,\1,p'`
+ machine=${arch}${endian}-unknown
+ ;;
+ *) machine=$UNAME_MACHINE_ARCH-unknown ;;
+ esac
+ # The Operating System including object format, if it has switched
+ # to ELF recently (or will in the future) and ABI.
+ case $UNAME_MACHINE_ARCH in
+ earm*)
+ os=netbsdelf
+ ;;
+ arm*|i386|m68k|ns32k|sh3*|sparc|vax)
+ set_cc_for_build
+ if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
+ | grep -q __ELF__
+ then
+ # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
+ # Return netbsd for either. FIX?
+ os=netbsd
+ else
+ os=netbsdelf
+ fi
+ ;;
+ *)
+ os=netbsd
+ ;;
+ esac
+ # Determine ABI tags.
+ case $UNAME_MACHINE_ARCH in
+ earm*)
+ expr='s/^earmv[0-9]/-eabi/;s/eb$//'
+ abi=`echo "$UNAME_MACHINE_ARCH" | sed -e "$expr"`
+ ;;
+ esac
+ # The OS release
+ # Debian GNU/NetBSD machines have a different userland, and
+ # thus, need a distinct triplet. However, they do not need
+ # kernel version information, so it can be replaced with a
+ # suitable tag, in the style of linux-gnu.
+ case $UNAME_VERSION in
+ Debian*)
+ release='-gnu'
+ ;;
+ *)
+ release=`echo "$UNAME_RELEASE" | sed -e 's/[-_].*//' | cut -d. -f1,2`
+ ;;
+ esac
+ # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
+ # contains redundant information, the shorter form:
+ # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
+ GUESS=$machine-${os}${release}${abi-}
+ ;;
+ *:Bitrig:*:*)
+ UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
+ GUESS=$UNAME_MACHINE_ARCH-unknown-bitrig$UNAME_RELEASE
+ ;;
+ *:OpenBSD:*:*)
+ UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
+ GUESS=$UNAME_MACHINE_ARCH-unknown-openbsd$UNAME_RELEASE
+ ;;
+ *:SecBSD:*:*)
+ UNAME_MACHINE_ARCH=`arch | sed 's/SecBSD.//'`
+ GUESS=$UNAME_MACHINE_ARCH-unknown-secbsd$UNAME_RELEASE
+ ;;
+ *:LibertyBSD:*:*)
+ UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'`
+ GUESS=$UNAME_MACHINE_ARCH-unknown-libertybsd$UNAME_RELEASE
+ ;;
+ *:MidnightBSD:*:*)
+ GUESS=$UNAME_MACHINE-unknown-midnightbsd$UNAME_RELEASE
+ ;;
+ *:ekkoBSD:*:*)
+ GUESS=$UNAME_MACHINE-unknown-ekkobsd$UNAME_RELEASE
+ ;;
+ *:SolidBSD:*:*)
+ GUESS=$UNAME_MACHINE-unknown-solidbsd$UNAME_RELEASE
+ ;;
+ *:OS108:*:*)
+ GUESS=$UNAME_MACHINE-unknown-os108_$UNAME_RELEASE
+ ;;
+ macppc:MirBSD:*:*)
+ GUESS=powerpc-unknown-mirbsd$UNAME_RELEASE
+ ;;
+ *:MirBSD:*:*)
+ GUESS=$UNAME_MACHINE-unknown-mirbsd$UNAME_RELEASE
+ ;;
+ *:Sortix:*:*)
+ GUESS=$UNAME_MACHINE-unknown-sortix
+ ;;
+ *:Twizzler:*:*)
+ GUESS=$UNAME_MACHINE-unknown-twizzler
+ ;;
+ *:Redox:*:*)
+ GUESS=$UNAME_MACHINE-unknown-redox
+ ;;
+ mips:OSF1:*.*)
+ GUESS=mips-dec-osf1
+ ;;
+ alpha:OSF1:*:*)
+ # Reset EXIT trap before exiting to avoid spurious non-zero exit code.
+ trap '' 0
+ case $UNAME_RELEASE in
+ *4.0)
+ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
+ ;;
+ *5.*)
+ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+ ;;
+ esac
+ # According to Compaq, /usr/sbin/psrinfo has been available on
+ # OSF/1 and Tru64 systems produced since 1995. I hope that
+ # covers most systems running today. This code pipes the CPU
+ # types through head -n 1, so we only detect the type of CPU 0.
+ ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1`
+ case $ALPHA_CPU_TYPE in
+ "EV4 (21064)")
+ UNAME_MACHINE=alpha ;;
+ "EV4.5 (21064)")
+ UNAME_MACHINE=alpha ;;
+ "LCA4 (21066/21068)")
+ UNAME_MACHINE=alpha ;;
+ "EV5 (21164)")
+ UNAME_MACHINE=alphaev5 ;;
+ "EV5.6 (21164A)")
+ UNAME_MACHINE=alphaev56 ;;
+ "EV5.6 (21164PC)")
+ UNAME_MACHINE=alphapca56 ;;
+ "EV5.7 (21164PC)")
+ UNAME_MACHINE=alphapca57 ;;
+ "EV6 (21264)")
+ UNAME_MACHINE=alphaev6 ;;
+ "EV6.7 (21264A)")
+ UNAME_MACHINE=alphaev67 ;;
+ "EV6.8CB (21264C)")
+ UNAME_MACHINE=alphaev68 ;;
+ "EV6.8AL (21264B)")
+ UNAME_MACHINE=alphaev68 ;;
+ "EV6.8CX (21264D)")
+ UNAME_MACHINE=alphaev68 ;;
+ "EV6.9A (21264/EV69A)")
+ UNAME_MACHINE=alphaev69 ;;
+ "EV7 (21364)")
+ UNAME_MACHINE=alphaev7 ;;
+ "EV7.9 (21364A)")
+ UNAME_MACHINE=alphaev79 ;;
+ esac
+ # A Pn.n version is a patched version.
+ # A Vn.n version is a released version.
+ # A Tn.n version is a released field test version.
+ # A Xn.n version is an unreleased experimental baselevel.
+ # 1.2 uses "1.2" for uname -r.
+ OSF_REL=`echo "$UNAME_RELEASE" | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
+ GUESS=$UNAME_MACHINE-dec-osf$OSF_REL
+ ;;
+ Amiga*:UNIX_System_V:4.0:*)
+ GUESS=m68k-unknown-sysv4
+ ;;
+ *:[Aa]miga[Oo][Ss]:*:*)
+ GUESS=$UNAME_MACHINE-unknown-amigaos
+ ;;
+ *:[Mm]orph[Oo][Ss]:*:*)
+ GUESS=$UNAME_MACHINE-unknown-morphos
+ ;;
+ *:OS/390:*:*)
+ GUESS=i370-ibm-openedition
+ ;;
+ *:z/VM:*:*)
+ GUESS=s390-ibm-zvmoe
+ ;;
+ *:OS400:*:*)
+ GUESS=powerpc-ibm-os400
+ ;;
+ arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
+ GUESS=arm-acorn-riscix$UNAME_RELEASE
+ ;;
+ arm*:riscos:*:*|arm*:RISCOS:*:*)
+ GUESS=arm-unknown-riscos
+ ;;
+ SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
+ GUESS=hppa1.1-hitachi-hiuxmpp
+ ;;
+ Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
+ # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
+ case `(/bin/universe) 2>/dev/null` in
+ att) GUESS=pyramid-pyramid-sysv3 ;;
+ *) GUESS=pyramid-pyramid-bsd ;;
+ esac
+ ;;
+ NILE*:*:*:dcosx)
+ GUESS=pyramid-pyramid-svr4
+ ;;
+ DRS?6000:unix:4.0:6*)
+ GUESS=sparc-icl-nx6
+ ;;
+ DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
+ case `/usr/bin/uname -p` in
+ sparc) GUESS=sparc-icl-nx7 ;;
+ esac
+ ;;
+ s390x:SunOS:*:*)
+ SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`
+ GUESS=$UNAME_MACHINE-ibm-solaris2$SUN_REL
+ ;;
+ sun4H:SunOS:5.*:*)
+ SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`
+ GUESS=sparc-hal-solaris2$SUN_REL
+ ;;
+ sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
+ SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`
+ GUESS=sparc-sun-solaris2$SUN_REL
+ ;;
+ i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
+ GUESS=i386-pc-auroraux$UNAME_RELEASE
+ ;;
+ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
+ set_cc_for_build
+ SUN_ARCH=i386
+ # If there is a compiler, see if it is configured for 64-bit objects.
+ # Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
+ # This test works for both compilers.
+ if test "$CC_FOR_BUILD" != no_compiler_found; then
+ if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
+ (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
+ grep IS_64BIT_ARCH >/dev/null
+ then
+ SUN_ARCH=x86_64
+ fi
+ fi
+ SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`
+ GUESS=$SUN_ARCH-pc-solaris2$SUN_REL
+ ;;
+ sun4*:SunOS:6*:*)
+ # According to config.sub, this is the proper way to canonicalize
+ # SunOS6. Hard to guess exactly what SunOS6 will be like, but
+ # it's likely to be more like Solaris than SunOS4.
+ SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`
+ GUESS=sparc-sun-solaris3$SUN_REL
+ ;;
+ sun4*:SunOS:*:*)
+ case `/usr/bin/arch -k` in
+ Series*|S4*)
+ UNAME_RELEASE=`uname -v`
+ ;;
+ esac
+ # Japanese Language versions have a version number like `4.1.3-JL'.
+ SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/-/_/'`
+ GUESS=sparc-sun-sunos$SUN_REL
+ ;;
+ sun3*:SunOS:*:*)
+ GUESS=m68k-sun-sunos$UNAME_RELEASE
+ ;;
+ sun*:*:4.2BSD:*)
+ UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
+ test "x$UNAME_RELEASE" = x && UNAME_RELEASE=3
+ case `/bin/arch` in
+ sun3)
+ GUESS=m68k-sun-sunos$UNAME_RELEASE
+ ;;
+ sun4)
+ GUESS=sparc-sun-sunos$UNAME_RELEASE
+ ;;
+ esac
+ ;;
+ aushp:SunOS:*:*)
+ GUESS=sparc-auspex-sunos$UNAME_RELEASE
+ ;;
+ # The situation for MiNT is a little confusing. The machine name
+ # can be virtually everything (everything which is not
+ # "atarist" or "atariste" at least should have a processor
+ # > m68000). The system name ranges from "MiNT" over "FreeMiNT"
+ # to the lowercase version "mint" (or "freemint"). Finally
+ # the system name "TOS" denotes a system which is actually not
+ # MiNT. But MiNT is downward compatible to TOS, so this should
+ # be no problem.
+ atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
+ GUESS=m68k-atari-mint$UNAME_RELEASE
+ ;;
+ atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
+ GUESS=m68k-atari-mint$UNAME_RELEASE
+ ;;
+ *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
+ GUESS=m68k-atari-mint$UNAME_RELEASE
+ ;;
+ milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
+ GUESS=m68k-milan-mint$UNAME_RELEASE
+ ;;
+ hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
+ GUESS=m68k-hades-mint$UNAME_RELEASE
+ ;;
+ *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
+ GUESS=m68k-unknown-mint$UNAME_RELEASE
+ ;;
+ m68k:machten:*:*)
+ GUESS=m68k-apple-machten$UNAME_RELEASE
+ ;;
+ powerpc:machten:*:*)
+ GUESS=powerpc-apple-machten$UNAME_RELEASE
+ ;;
+ RISC*:Mach:*:*)
+ GUESS=mips-dec-mach_bsd4.3
+ ;;
+ RISC*:ULTRIX:*:*)
+ GUESS=mips-dec-ultrix$UNAME_RELEASE
+ ;;
+ VAX*:ULTRIX*:*:*)
+ GUESS=vax-dec-ultrix$UNAME_RELEASE
+ ;;
+ 2020:CLIX:*:* | 2430:CLIX:*:*)
+ GUESS=clipper-intergraph-clix$UNAME_RELEASE
+ ;;
+ mips:*:*:UMIPS | mips:*:*:RISCos)
+ set_cc_for_build
+ sed 's/^ //' << EOF > "$dummy.c"
+#ifdef __cplusplus
+#include <stdio.h> /* for printf() prototype */
+ int main (int argc, char *argv[]) {
+#else
+ int main (argc, argv) int argc; char *argv[]; {
+#endif
+ #if defined (host_mips) && defined (MIPSEB)
+ #if defined (SYSTYPE_SYSV)
+ printf ("mips-mips-riscos%ssysv\\n", argv[1]); exit (0);
+ #endif
+ #if defined (SYSTYPE_SVR4)
+ printf ("mips-mips-riscos%ssvr4\\n", argv[1]); exit (0);
+ #endif
+ #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
+ printf ("mips-mips-riscos%sbsd\\n", argv[1]); exit (0);
+ #endif
+ #endif
+ exit (-1);
+ }
+EOF
+ $CC_FOR_BUILD -o "$dummy" "$dummy.c" &&
+ dummyarg=`echo "$UNAME_RELEASE" | sed -n 's/\([0-9]*\).*/\1/p'` &&
+ SYSTEM_NAME=`"$dummy" "$dummyarg"` &&
+ { echo "$SYSTEM_NAME"; exit; }
+ GUESS=mips-mips-riscos$UNAME_RELEASE
+ ;;
+ Motorola:PowerMAX_OS:*:*)
+ GUESS=powerpc-motorola-powermax
+ ;;
+ Motorola:*:4.3:PL8-*)
+ GUESS=powerpc-harris-powermax
+ ;;
+ Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
+ GUESS=powerpc-harris-powermax
+ ;;
+ Night_Hawk:Power_UNIX:*:*)
+ GUESS=powerpc-harris-powerunix
+ ;;
+ m88k:CX/UX:7*:*)
+ GUESS=m88k-harris-cxux7
+ ;;
+ m88k:*:4*:R4*)
+ GUESS=m88k-motorola-sysv4
+ ;;
+ m88k:*:3*:R3*)
+ GUESS=m88k-motorola-sysv3
+ ;;
+ AViiON:dgux:*:*)
+ # DG/UX returns AViiON for all architectures
+ UNAME_PROCESSOR=`/usr/bin/uname -p`
+ if test "$UNAME_PROCESSOR" = mc88100 || test "$UNAME_PROCESSOR" = mc88110
+ then
+ if test "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx || \
+ test "$TARGET_BINARY_INTERFACE"x = x
+ then
+ GUESS=m88k-dg-dgux$UNAME_RELEASE
+ else
+ GUESS=m88k-dg-dguxbcs$UNAME_RELEASE
+ fi
+ else
+ GUESS=i586-dg-dgux$UNAME_RELEASE
+ fi
+ ;;
+ M88*:DolphinOS:*:*) # DolphinOS (SVR3)
+ GUESS=m88k-dolphin-sysv3
+ ;;
+ M88*:*:R3*:*)
+ # Delta 88k system running SVR3
+ GUESS=m88k-motorola-sysv3
+ ;;
+ XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
+ GUESS=m88k-tektronix-sysv3
+ ;;
+ Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
+ GUESS=m68k-tektronix-bsd
+ ;;
+ *:IRIX*:*:*)
+ IRIX_REL=`echo "$UNAME_RELEASE" | sed -e 's/-/_/g'`
+ GUESS=mips-sgi-irix$IRIX_REL
+ ;;
+ ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
+ GUESS=romp-ibm-aix # uname -m gives an 8 hex-code CPU id
+ ;; # Note that: echo "'`uname -s`'" gives 'AIX '
+ i*86:AIX:*:*)
+ GUESS=i386-ibm-aix
+ ;;
+ ia64:AIX:*:*)
+ if test -x /usr/bin/oslevel ; then
+ IBM_REV=`/usr/bin/oslevel`
+ else
+ IBM_REV=$UNAME_VERSION.$UNAME_RELEASE
+ fi
+ GUESS=$UNAME_MACHINE-ibm-aix$IBM_REV
+ ;;
+ *:AIX:2:3)
+ if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
+ set_cc_for_build
+ sed 's/^ //' << EOF > "$dummy.c"
+ #include <sys/systemcfg.h>
+
+ main()
+ {
+ if (!__power_pc())
+ exit(1);
+ puts("powerpc-ibm-aix3.2.5");
+ exit(0);
+ }
+EOF
+ if $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"`
+ then
+ GUESS=$SYSTEM_NAME
+ else
+ GUESS=rs6000-ibm-aix3.2.5
+ fi
+ elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
+ GUESS=rs6000-ibm-aix3.2.4
+ else
+ GUESS=rs6000-ibm-aix3.2
+ fi
+ ;;
+ *:AIX:*:[4567])
+ IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
+ if /usr/sbin/lsattr -El "$IBM_CPU_ID" | grep ' POWER' >/dev/null 2>&1; then
+ IBM_ARCH=rs6000
+ else
+ IBM_ARCH=powerpc
+ fi
+ if test -x /usr/bin/lslpp ; then
+ IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | \
+ awk -F: '{ print $3 }' | sed s/[0-9]*$/0/`
+ else
+ IBM_REV=$UNAME_VERSION.$UNAME_RELEASE
+ fi
+ GUESS=$IBM_ARCH-ibm-aix$IBM_REV
+ ;;
+ *:AIX:*:*)
+ GUESS=rs6000-ibm-aix
+ ;;
+ ibmrt:4.4BSD:*|romp-ibm:4.4BSD:*)
+ GUESS=romp-ibm-bsd4.4
+ ;;
+ ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and
+ GUESS=romp-ibm-bsd$UNAME_RELEASE # 4.3 with uname added to
+ ;; # report: romp-ibm BSD 4.3
+ *:BOSX:*:*)
+ GUESS=rs6000-bull-bosx
+ ;;
+ DPX/2?00:B.O.S.:*:*)
+ GUESS=m68k-bull-sysv3
+ ;;
+ 9000/[34]??:4.3bsd:1.*:*)
+ GUESS=m68k-hp-bsd
+ ;;
+ hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
+ GUESS=m68k-hp-bsd4.4
+ ;;
+ 9000/[34678]??:HP-UX:*:*)
+ HPUX_REV=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*.[0B]*//'`
+ case $UNAME_MACHINE in
+ 9000/31?) HP_ARCH=m68000 ;;
+ 9000/[34]??) HP_ARCH=m68k ;;
+ 9000/[678][0-9][0-9])
+ if test -x /usr/bin/getconf; then
+ sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
+ sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+ case $sc_cpu_version in
+ 523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0
+ 528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1
+ 532) # CPU_PA_RISC2_0
+ case $sc_kernel_bits in
+ 32) HP_ARCH=hppa2.0n ;;
+ 64) HP_ARCH=hppa2.0w ;;
+ '') HP_ARCH=hppa2.0 ;; # HP-UX 10.20
+ esac ;;
+ esac
+ fi
+ if test "$HP_ARCH" = ""; then
+ set_cc_for_build
+ sed 's/^ //' << EOF > "$dummy.c"
+
+ #define _HPUX_SOURCE
+ #include <stdlib.h>
+ #include <unistd.h>
+
+ int main ()
+ {
+ #if defined(_SC_KERNEL_BITS)
+ long bits = sysconf(_SC_KERNEL_BITS);
+ #endif
+ long cpu = sysconf (_SC_CPU_VERSION);
+
+ switch (cpu)
+ {
+ case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+ case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+ case CPU_PA_RISC2_0:
+ #if defined(_SC_KERNEL_BITS)
+ switch (bits)
+ {
+ case 64: puts ("hppa2.0w"); break;
+ case 32: puts ("hppa2.0n"); break;
+ default: puts ("hppa2.0"); break;
+ } break;
+ #else /* !defined(_SC_KERNEL_BITS) */
+ puts ("hppa2.0"); break;
+ #endif
+ default: puts ("hppa1.0"); break;
+ }
+ exit (0);
+ }
+EOF
+ (CCOPTS="" $CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null) && HP_ARCH=`"$dummy"`
+ test -z "$HP_ARCH" && HP_ARCH=hppa
+ fi ;;
+ esac
+ if test "$HP_ARCH" = hppa2.0w
+ then
+ set_cc_for_build
+
+ # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
+ # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler
+ # generating 64-bit code. GNU and HP use different nomenclature:
+ #
+ # $ CC_FOR_BUILD=cc ./config.guess
+ # => hppa2.0w-hp-hpux11.23
+ # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
+ # => hppa64-hp-hpux11.23
+
+ if echo __LP64__ | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) |
+ grep -q __LP64__
+ then
+ HP_ARCH=hppa2.0w
+ else
+ HP_ARCH=hppa64
+ fi
+ fi
+ GUESS=$HP_ARCH-hp-hpux$HPUX_REV
+ ;;
+ ia64:HP-UX:*:*)
+ HPUX_REV=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*.[0B]*//'`
+ GUESS=ia64-hp-hpux$HPUX_REV
+ ;;
+ 3050*:HI-UX:*:*)
+ set_cc_for_build
+ sed 's/^ //' << EOF > "$dummy.c"
+ #include <unistd.h>
+ int
+ main ()
+ {
+ long cpu = sysconf (_SC_CPU_VERSION);
+ /* The order matters, because CPU_IS_HP_MC68K erroneously returns
+ true for CPU_PA_RISC1_0. CPU_IS_PA_RISC returns correct
+ results, however. */
+ if (CPU_IS_PA_RISC (cpu))
+ {
+ switch (cpu)
+ {
+ case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
+ case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
+ case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
+ default: puts ("hppa-hitachi-hiuxwe2"); break;
+ }
+ }
+ else if (CPU_IS_HP_MC68K (cpu))
+ puts ("m68k-hitachi-hiuxwe2");
+ else puts ("unknown-hitachi-hiuxwe2");
+ exit (0);
+ }
+EOF
+ $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` &&
+ { echo "$SYSTEM_NAME"; exit; }
+ GUESS=unknown-hitachi-hiuxwe2
+ ;;
+ 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:*)
+ GUESS=hppa1.1-hp-bsd
+ ;;
+ 9000/8??:4.3bsd:*:*)
+ GUESS=hppa1.0-hp-bsd
+ ;;
+ *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
+ GUESS=hppa1.0-hp-mpeix
+ ;;
+ hp7??:OSF1:*:* | hp8?[79]:OSF1:*:*)
+ GUESS=hppa1.1-hp-osf
+ ;;
+ hp8??:OSF1:*:*)
+ GUESS=hppa1.0-hp-osf
+ ;;
+ i*86:OSF1:*:*)
+ if test -x /usr/sbin/sysversion ; then
+ GUESS=$UNAME_MACHINE-unknown-osf1mk
+ else
+ GUESS=$UNAME_MACHINE-unknown-osf1
+ fi
+ ;;
+ parisc*:Lites*:*:*)
+ GUESS=hppa1.1-hp-lites
+ ;;
+ C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
+ GUESS=c1-convex-bsd
+ ;;
+ C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
+ if getsysinfo -f scalar_acc
+ then echo c32-convex-bsd
+ else echo c2-convex-bsd
+ fi
+ exit ;;
+ C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
+ GUESS=c34-convex-bsd
+ ;;
+ C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
+ GUESS=c38-convex-bsd
+ ;;
+ C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
+ GUESS=c4-convex-bsd
+ ;;
+ CRAY*Y-MP:*:*:*)
+ CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'`
+ GUESS=ymp-cray-unicos$CRAY_REL
+ ;;
+ CRAY*[A-Z]90:*:*:*)
+ echo "$UNAME_MACHINE"-cray-unicos"$UNAME_RELEASE" \
+ | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
+ -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
+ -e 's/\.[^.]*$/.X/'
+ exit ;;
+ CRAY*TS:*:*:*)
+ CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'`
+ GUESS=t90-cray-unicos$CRAY_REL
+ ;;
+ CRAY*T3E:*:*:*)
+ CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'`
+ GUESS=alphaev5-cray-unicosmk$CRAY_REL
+ ;;
+ CRAY*SV1:*:*:*)
+ CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'`
+ GUESS=sv1-cray-unicos$CRAY_REL
+ ;;
+ *:UNICOS/mp:*:*)
+ CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'`
+ GUESS=craynv-cray-unicosmp$CRAY_REL
+ ;;
+ F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
+ FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
+ FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
+ FUJITSU_REL=`echo "$UNAME_RELEASE" | sed -e 's/ /_/'`
+ GUESS=${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}
+ ;;
+ 5000:UNIX_System_V:4.*:*)
+ FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
+ FUJITSU_REL=`echo "$UNAME_RELEASE" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'`
+ GUESS=sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}
+ ;;
+ i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
+ GUESS=$UNAME_MACHINE-pc-bsdi$UNAME_RELEASE
+ ;;
+ sparc*:BSD/OS:*:*)
+ GUESS=sparc-unknown-bsdi$UNAME_RELEASE
+ ;;
+ *:BSD/OS:*:*)
+ GUESS=$UNAME_MACHINE-unknown-bsdi$UNAME_RELEASE
+ ;;
+ arm:FreeBSD:*:*)
+ UNAME_PROCESSOR=`uname -p`
+ set_cc_for_build
+ if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
+ | grep -q __ARM_PCS_VFP
+ then
+ FREEBSD_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'`
+ GUESS=$UNAME_PROCESSOR-unknown-freebsd$FREEBSD_REL-gnueabi
+ else
+ FREEBSD_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'`
+ GUESS=$UNAME_PROCESSOR-unknown-freebsd$FREEBSD_REL-gnueabihf
+ fi
+ ;;
+ *:FreeBSD:*:*)
+ UNAME_PROCESSOR=`/usr/bin/uname -p`
+ case $UNAME_PROCESSOR in
+ amd64)
+ UNAME_PROCESSOR=x86_64 ;;
+ i386)
+ UNAME_PROCESSOR=i586 ;;
+ esac
+ FREEBSD_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'`
+ GUESS=$UNAME_PROCESSOR-unknown-freebsd$FREEBSD_REL
+ ;;
+ i*:CYGWIN*:*)
+ GUESS=$UNAME_MACHINE-pc-cygwin
+ ;;
+ *:MINGW64*:*)
+ GUESS=$UNAME_MACHINE-pc-mingw64
+ ;;
+ *:MINGW*:*)
+ GUESS=$UNAME_MACHINE-pc-mingw32
+ ;;
+ *:MSYS*:*)
+ GUESS=$UNAME_MACHINE-pc-msys
+ ;;
+ i*:PW*:*)
+ GUESS=$UNAME_MACHINE-pc-pw32
+ ;;
+ *:Interix*:*)
+ case $UNAME_MACHINE in
+ x86)
+ GUESS=i586-pc-interix$UNAME_RELEASE
+ ;;
+ authenticamd | genuineintel | EM64T)
+ GUESS=x86_64-unknown-interix$UNAME_RELEASE
+ ;;
+ IA64)
+ GUESS=ia64-unknown-interix$UNAME_RELEASE
+ ;;
+ esac ;;
+ i*:UWIN*:*)
+ GUESS=$UNAME_MACHINE-pc-uwin
+ ;;
+ amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
+ GUESS=x86_64-pc-cygwin
+ ;;
+ prep*:SunOS:5.*:*)
+ SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`
+ GUESS=powerpcle-unknown-solaris2$SUN_REL
+ ;;
+ *:GNU:*:*)
+ # the GNU system
+ GNU_ARCH=`echo "$UNAME_MACHINE" | sed -e 's,[-/].*$,,'`
+ GNU_REL=`echo "$UNAME_RELEASE" | sed -e 's,/.*$,,'`
+ GUESS=$GNU_ARCH-unknown-$LIBC$GNU_REL
+ ;;
+ *:GNU/*:*:*)
+ # other systems with GNU libc and userland
+ GNU_SYS=`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"`
+ GNU_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'`
+ GUESS=$UNAME_MACHINE-unknown-$GNU_SYS$GNU_REL-$LIBC
+ ;;
+ *:Minix:*:*)
+ GUESS=$UNAME_MACHINE-unknown-minix
+ ;;
+ aarch64:Linux:*:*)
+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+ ;;
+ aarch64_be:Linux:*:*)
+ UNAME_MACHINE=aarch64_be
+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+ ;;
+ alpha:Linux:*:*)
+ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' /proc/cpuinfo 2>/dev/null` in
+ EV5) UNAME_MACHINE=alphaev5 ;;
+ EV56) UNAME_MACHINE=alphaev56 ;;
+ PCA56) UNAME_MACHINE=alphapca56 ;;
+ PCA57) UNAME_MACHINE=alphapca56 ;;
+ EV6) UNAME_MACHINE=alphaev6 ;;
+ EV67) UNAME_MACHINE=alphaev67 ;;
+ EV68*) UNAME_MACHINE=alphaev68 ;;
+ esac
+ objdump --private-headers /bin/sh | grep -q ld.so.1
+ if test "$?" = 0 ; then LIBC=gnulibc1 ; fi
+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+ ;;
+ arc:Linux:*:* | arceb:Linux:*:* | arc32:Linux:*:* | arc64:Linux:*:*)
+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+ ;;
+ arm*:Linux:*:*)
+ set_cc_for_build
+ if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+ | grep -q __ARM_EABI__
+ then
+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+ else
+ if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
+ | grep -q __ARM_PCS_VFP
+ then
+ GUESS=$UNAME_MACHINE-unknown-linux-${LIBC}eabi
+ else
+ GUESS=$UNAME_MACHINE-unknown-linux-${LIBC}eabihf
+ fi
+ fi
+ ;;
+ avr32*:Linux:*:*)
+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+ ;;
+ cris:Linux:*:*)
+ GUESS=$UNAME_MACHINE-axis-linux-$LIBC
+ ;;
+ crisv32:Linux:*:*)
+ GUESS=$UNAME_MACHINE-axis-linux-$LIBC
+ ;;
+ e2k:Linux:*:*)
+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+ ;;
+ frv:Linux:*:*)
+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+ ;;
+ hexagon:Linux:*:*)
+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+ ;;
+ i*86:Linux:*:*)
+ GUESS=$UNAME_MACHINE-pc-linux-$LIBC
+ ;;
+ ia64:Linux:*:*)
+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+ ;;
+ k1om:Linux:*:*)
+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+ ;;
+ loongarch32:Linux:*:* | loongarch64:Linux:*:* | loongarchx32:Linux:*:*)
+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+ ;;
+ m32r*:Linux:*:*)
+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+ ;;
+ m68*:Linux:*:*)
+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+ ;;
+ mips:Linux:*:* | mips64:Linux:*:*)
+ set_cc_for_build
+ IS_GLIBC=0
+ test x"${LIBC}" = xgnu && IS_GLIBC=1
+ sed 's/^ //' << EOF > "$dummy.c"
+ #undef CPU
+ #undef mips
+ #undef mipsel
+ #undef mips64
+ #undef mips64el
+ #if ${IS_GLIBC} && defined(_ABI64)
+ LIBCABI=gnuabi64
+ #else
+ #if ${IS_GLIBC} && defined(_ABIN32)
+ LIBCABI=gnuabin32
+ #else
+ LIBCABI=${LIBC}
+ #endif
+ #endif
+
+ #if ${IS_GLIBC} && defined(__mips64) && defined(__mips_isa_rev) && __mips_isa_rev>=6
+ CPU=mipsisa64r6
+ #else
+ #if ${IS_GLIBC} && !defined(__mips64) && defined(__mips_isa_rev) && __mips_isa_rev>=6
+ CPU=mipsisa32r6
+ #else
+ #if defined(__mips64)
+ CPU=mips64
+ #else
+ CPU=mips
+ #endif
+ #endif
+ #endif
+
+ #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+ MIPS_ENDIAN=el
+ #else
+ #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+ MIPS_ENDIAN=
+ #else
+ MIPS_ENDIAN=
+ #endif
+ #endif
+EOF
+ cc_set_vars=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU\|^MIPS_ENDIAN\|^LIBCABI'`
+ eval "$cc_set_vars"
+ test "x$CPU" != x && { echo "$CPU${MIPS_ENDIAN}-unknown-linux-$LIBCABI"; exit; }
+ ;;
+ mips64el:Linux:*:*)
+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+ ;;
+ openrisc*:Linux:*:*)
+ GUESS=or1k-unknown-linux-$LIBC
+ ;;
+ or32:Linux:*:* | or1k*:Linux:*:*)
+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+ ;;
+ padre:Linux:*:*)
+ GUESS=sparc-unknown-linux-$LIBC
+ ;;
+ parisc64:Linux:*:* | hppa64:Linux:*:*)
+ GUESS=hppa64-unknown-linux-$LIBC
+ ;;
+ parisc:Linux:*:* | hppa:Linux:*:*)
+ # Look for CPU level
+ case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
+ PA7*) GUESS=hppa1.1-unknown-linux-$LIBC ;;
+ PA8*) GUESS=hppa2.0-unknown-linux-$LIBC ;;
+ *) GUESS=hppa-unknown-linux-$LIBC ;;
+ esac
+ ;;
+ ppc64:Linux:*:*)
+ GUESS=powerpc64-unknown-linux-$LIBC
+ ;;
+ ppc:Linux:*:*)
+ GUESS=powerpc-unknown-linux-$LIBC
+ ;;
+ ppc64le:Linux:*:*)
+ GUESS=powerpc64le-unknown-linux-$LIBC
+ ;;
+ ppcle:Linux:*:*)
+ GUESS=powerpcle-unknown-linux-$LIBC
+ ;;
+ riscv32:Linux:*:* | riscv32be:Linux:*:* | riscv64:Linux:*:* | riscv64be:Linux:*:*)
+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+ ;;
+ s390:Linux:*:* | s390x:Linux:*:*)
+ GUESS=$UNAME_MACHINE-ibm-linux-$LIBC
+ ;;
+ sh64*:Linux:*:*)
+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+ ;;
+ sh*:Linux:*:*)
+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+ ;;
+ sparc:Linux:*:* | sparc64:Linux:*:*)
+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+ ;;
+ tile*:Linux:*:*)
+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+ ;;
+ vax:Linux:*:*)
+ GUESS=$UNAME_MACHINE-dec-linux-$LIBC
+ ;;
+ x86_64:Linux:*:*)
+ set_cc_for_build
+ LIBCABI=$LIBC
+ if test "$CC_FOR_BUILD" != no_compiler_found; then
+ if (echo '#ifdef __ILP32__'; echo IS_X32; echo '#endif') | \
+ (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
+ grep IS_X32 >/dev/null
+ then
+ LIBCABI=${LIBC}x32
+ fi
+ fi
+ GUESS=$UNAME_MACHINE-pc-linux-$LIBCABI
+ ;;
+ xtensa*:Linux:*:*)
+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+ ;;
+ i*86:DYNIX/ptx:4*:*)
+ # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
+ # earlier versions are messed up and put the nodename in both
+ # sysname and nodename.
+ GUESS=i386-sequent-sysv4
+ ;;
+ i*86:UNIX_SV:4.2MP:2.*)
+ # Unixware is an offshoot of SVR4, but it has its own version
+ # number series starting with 2...
+ # I am not positive that other SVR4 systems won't match this,
+ # I just have to hope. -- rms.
+ # Use sysv4.2uw... so that sysv4* matches it.
+ GUESS=$UNAME_MACHINE-pc-sysv4.2uw$UNAME_VERSION
+ ;;
+ i*86:OS/2:*:*)
+ # If we were able to find `uname', then EMX Unix compatibility
+ # is probably installed.
+ GUESS=$UNAME_MACHINE-pc-os2-emx
+ ;;
+ i*86:XTS-300:*:STOP)
+ GUESS=$UNAME_MACHINE-unknown-stop
+ ;;
+ i*86:atheos:*:*)
+ GUESS=$UNAME_MACHINE-unknown-atheos
+ ;;
+ i*86:syllable:*:*)
+ GUESS=$UNAME_MACHINE-pc-syllable
+ ;;
+ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
+ GUESS=i386-unknown-lynxos$UNAME_RELEASE
+ ;;
+ i*86:*DOS:*:*)
+ GUESS=$UNAME_MACHINE-pc-msdosdjgpp
+ ;;
+ i*86:*:4.*:*)
+ UNAME_REL=`echo "$UNAME_RELEASE" | sed 's/\/MP$//'`
+ if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
+ GUESS=$UNAME_MACHINE-univel-sysv$UNAME_REL
+ else
+ GUESS=$UNAME_MACHINE-pc-sysv$UNAME_REL
+ fi
+ ;;
+ i*86:*:5:[678]*)
+ # UnixWare 7.x, OpenUNIX and OpenServer 6.
+ case `/bin/uname -X | grep "^Machine"` in
+ *486*) UNAME_MACHINE=i486 ;;
+ *Pentium) UNAME_MACHINE=i586 ;;
+ *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
+ esac
+ GUESS=$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
+ ;;
+ i*86:*:3.2:*)
+ if test -f /usr/options/cb.name; then
+ UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
+ GUESS=$UNAME_MACHINE-pc-isc$UNAME_REL
+ elif /bin/uname -X 2>/dev/null >/dev/null ; then
+ UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
+ (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
+ (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
+ && UNAME_MACHINE=i586
+ (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
+ && UNAME_MACHINE=i686
+ (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
+ && UNAME_MACHINE=i686
+ GUESS=$UNAME_MACHINE-pc-sco$UNAME_REL
+ else
+ GUESS=$UNAME_MACHINE-pc-sysv32
+ fi
+ ;;
+ pc:*:*:*)
+ # Left here for compatibility:
+ # uname -m prints for DJGPP always 'pc', but it prints nothing about
+ # the processor, so we play safe by assuming i586.
+ # Note: whatever this is, it MUST be the same as what config.sub
+ # prints for the "djgpp" host, or else GDB configure will decide that
+ # this is a cross-build.
+ GUESS=i586-pc-msdosdjgpp
+ ;;
+ Intel:Mach:3*:*)
+ GUESS=i386-pc-mach3
+ ;;
+ paragon:*:*:*)
+ GUESS=i860-intel-osf1
+ ;;
+ i860:*:4.*:*) # i860-SVR4
+ if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
+ GUESS=i860-stardent-sysv$UNAME_RELEASE # Stardent Vistra i860-SVR4
+ else # Add other i860-SVR4 vendors below as they are discovered.
+ GUESS=i860-unknown-sysv$UNAME_RELEASE # Unknown i860-SVR4
+ fi
+ ;;
+ mini*:CTIX:SYS*5:*)
+ # "miniframe"
+ GUESS=m68010-convergent-sysv
+ ;;
+ mc68k:UNIX:SYSTEM5:3.51m)
+ GUESS=m68k-convergent-sysv
+ ;;
+ M680?0:D-NIX:5.3:*)
+ GUESS=m68k-diab-dnix
+ ;;
+ M68*:*:R3V[5678]*:*)
+ test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
+ 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
+ OS_REL=''
+ test -r /etc/.relid \
+ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+ && { echo i486-ncr-sysv4.3"$OS_REL"; exit; }
+ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+ && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;;
+ 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+ && { echo i486-ncr-sysv4; exit; } ;;
+ NCR*:*:4.2:* | MPRAS*:*:4.2:*)
+ OS_REL='.3'
+ test -r /etc/.relid \
+ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+ && { echo i486-ncr-sysv4.3"$OS_REL"; exit; }
+ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+ && { echo i586-ncr-sysv4.3"$OS_REL"; exit; }
+ /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
+ && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;;
+ m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
+ GUESS=m68k-unknown-lynxos$UNAME_RELEASE
+ ;;
+ mc68030:UNIX_System_V:4.*:*)
+ GUESS=m68k-atari-sysv4
+ ;;
+ TSUNAMI:LynxOS:2.*:*)
+ GUESS=sparc-unknown-lynxos$UNAME_RELEASE
+ ;;
+ rs6000:LynxOS:2.*:*)
+ GUESS=rs6000-unknown-lynxos$UNAME_RELEASE
+ ;;
+ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
+ GUESS=powerpc-unknown-lynxos$UNAME_RELEASE
+ ;;
+ SM[BE]S:UNIX_SV:*:*)
+ GUESS=mips-dde-sysv$UNAME_RELEASE
+ ;;
+ RM*:ReliantUNIX-*:*:*)
+ GUESS=mips-sni-sysv4
+ ;;
+ RM*:SINIX-*:*:*)
+ GUESS=mips-sni-sysv4
+ ;;
+ *:SINIX-*:*:*)
+ if uname -p 2>/dev/null >/dev/null ; then
+ UNAME_MACHINE=`(uname -p) 2>/dev/null`
+ GUESS=$UNAME_MACHINE-sni-sysv4
+ else
+ GUESS=ns32k-sni-sysv
+ fi
+ ;;
+ PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+ # says <Richard.M.Bartel@ccMail.Census.GOV>
+ GUESS=i586-unisys-sysv4
+ ;;
+ *:UNIX_System_V:4*:FTX*)
+ # From Gerald Hewes <hewes@openmarket.com>.
+ # How about differentiating between stratus architectures? -djm
+ GUESS=hppa1.1-stratus-sysv4
+ ;;
+ *:*:*:FTX*)
+ # From seanf@swdc.stratus.com.
+ GUESS=i860-stratus-sysv4
+ ;;
+ i*86:VOS:*:*)
+ # From Paul.Green@stratus.com.
+ GUESS=$UNAME_MACHINE-stratus-vos
+ ;;
+ *:VOS:*:*)
+ # From Paul.Green@stratus.com.
+ GUESS=hppa1.1-stratus-vos
+ ;;
+ mc68*:A/UX:*:*)
+ GUESS=m68k-apple-aux$UNAME_RELEASE
+ ;;
+ news*:NEWS-OS:6*:*)
+ GUESS=mips-sony-newsos6
+ ;;
+ R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
+ if test -d /usr/nec; then
+ GUESS=mips-nec-sysv$UNAME_RELEASE
+ else
+ GUESS=mips-unknown-sysv$UNAME_RELEASE
+ fi
+ ;;
+ BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
+ GUESS=powerpc-be-beos
+ ;;
+ BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only.
+ GUESS=powerpc-apple-beos
+ ;;
+ BePC:BeOS:*:*) # BeOS running on Intel PC compatible.
+ GUESS=i586-pc-beos
+ ;;
+ BePC:Haiku:*:*) # Haiku running on Intel PC compatible.
+ GUESS=i586-pc-haiku
+ ;;
+ x86_64:Haiku:*:*)
+ GUESS=x86_64-unknown-haiku
+ ;;
+ SX-4:SUPER-UX:*:*)
+ GUESS=sx4-nec-superux$UNAME_RELEASE
+ ;;
+ SX-5:SUPER-UX:*:*)
+ GUESS=sx5-nec-superux$UNAME_RELEASE
+ ;;
+ SX-6:SUPER-UX:*:*)
+ GUESS=sx6-nec-superux$UNAME_RELEASE
+ ;;
+ SX-7:SUPER-UX:*:*)
+ GUESS=sx7-nec-superux$UNAME_RELEASE
+ ;;
+ SX-8:SUPER-UX:*:*)
+ GUESS=sx8-nec-superux$UNAME_RELEASE
+ ;;
+ SX-8R:SUPER-UX:*:*)
+ GUESS=sx8r-nec-superux$UNAME_RELEASE
+ ;;
+ SX-ACE:SUPER-UX:*:*)
+ GUESS=sxace-nec-superux$UNAME_RELEASE
+ ;;
+ Power*:Rhapsody:*:*)
+ GUESS=powerpc-apple-rhapsody$UNAME_RELEASE
+ ;;
+ *:Rhapsody:*:*)
+ GUESS=$UNAME_MACHINE-apple-rhapsody$UNAME_RELEASE
+ ;;
+ arm64:Darwin:*:*)
+ GUESS=aarch64-apple-darwin$UNAME_RELEASE
+ ;;
+ *:Darwin:*:*)
+ UNAME_PROCESSOR=`uname -p`
+ case $UNAME_PROCESSOR in
+ unknown) UNAME_PROCESSOR=powerpc ;;
+ esac
+ if command -v xcode-select > /dev/null 2> /dev/null && \
+ ! xcode-select --print-path > /dev/null 2> /dev/null ; then
+ # Avoid executing cc if there is no toolchain installed as
+ # cc will be a stub that puts up a graphical alert
+ # prompting the user to install developer tools.
+ CC_FOR_BUILD=no_compiler_found
+ else
+ set_cc_for_build
+ fi
+ if test "$CC_FOR_BUILD" != no_compiler_found; then
+ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+ (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
+ grep IS_64BIT_ARCH >/dev/null
+ then
+ case $UNAME_PROCESSOR in
+ i386) UNAME_PROCESSOR=x86_64 ;;
+ powerpc) UNAME_PROCESSOR=powerpc64 ;;
+ esac
+ fi
+ # On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc
+ if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \
+ (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
+ grep IS_PPC >/dev/null
+ then
+ UNAME_PROCESSOR=powerpc
+ fi
+ elif test "$UNAME_PROCESSOR" = i386 ; then
+ # uname -m returns i386 or x86_64
+ UNAME_PROCESSOR=$UNAME_MACHINE
+ fi
+ GUESS=$UNAME_PROCESSOR-apple-darwin$UNAME_RELEASE
+ ;;
+ *:procnto*:*:* | *:QNX:[0123456789]*:*)
+ UNAME_PROCESSOR=`uname -p`
+ if test "$UNAME_PROCESSOR" = x86; then
+ UNAME_PROCESSOR=i386
+ UNAME_MACHINE=pc
+ fi
+ GUESS=$UNAME_PROCESSOR-$UNAME_MACHINE-nto-qnx$UNAME_RELEASE
+ ;;
+ *:QNX:*:4*)
+ GUESS=i386-pc-qnx
+ ;;
+ NEO-*:NONSTOP_KERNEL:*:*)
+ GUESS=neo-tandem-nsk$UNAME_RELEASE
+ ;;
+ NSE-*:NONSTOP_KERNEL:*:*)
+ GUESS=nse-tandem-nsk$UNAME_RELEASE
+ ;;
+ NSR-*:NONSTOP_KERNEL:*:*)
+ GUESS=nsr-tandem-nsk$UNAME_RELEASE
+ ;;
+ NSV-*:NONSTOP_KERNEL:*:*)
+ GUESS=nsv-tandem-nsk$UNAME_RELEASE
+ ;;
+ NSX-*:NONSTOP_KERNEL:*:*)
+ GUESS=nsx-tandem-nsk$UNAME_RELEASE
+ ;;
+ *:NonStop-UX:*:*)
+ GUESS=mips-compaq-nonstopux
+ ;;
+ BS2000:POSIX*:*:*)
+ GUESS=bs2000-siemens-sysv
+ ;;
+ DS/*:UNIX_System_V:*:*)
+ GUESS=$UNAME_MACHINE-$UNAME_SYSTEM-$UNAME_RELEASE
+ ;;
+ *:Plan9:*:*)
+ # "uname -m" is not consistent, so use $cputype instead. 386
+ # is converted to i386 for consistency with other x86
+ # operating systems.
+ if test "${cputype-}" = 386; then
+ UNAME_MACHINE=i386
+ elif test "x${cputype-}" != x; then
+ UNAME_MACHINE=$cputype
+ fi
+ GUESS=$UNAME_MACHINE-unknown-plan9
+ ;;
+ *:TOPS-10:*:*)
+ GUESS=pdp10-unknown-tops10
+ ;;
+ *:TENEX:*:*)
+ GUESS=pdp10-unknown-tenex
+ ;;
+ KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
+ GUESS=pdp10-dec-tops20
+ ;;
+ XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
+ GUESS=pdp10-xkl-tops20
+ ;;
+ *:TOPS-20:*:*)
+ GUESS=pdp10-unknown-tops20
+ ;;
+ *:ITS:*:*)
+ GUESS=pdp10-unknown-its
+ ;;
+ SEI:*:*:SEIUX)
+ GUESS=mips-sei-seiux$UNAME_RELEASE
+ ;;
+ *:DragonFly:*:*)
+ DRAGONFLY_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'`
+ GUESS=$UNAME_MACHINE-unknown-dragonfly$DRAGONFLY_REL
+ ;;
+ *:*VMS:*:*)
+ UNAME_MACHINE=`(uname -p) 2>/dev/null`
+ case $UNAME_MACHINE in
+ A*) GUESS=alpha-dec-vms ;;
+ I*) GUESS=ia64-dec-vms ;;
+ V*) GUESS=vax-dec-vms ;;
+ esac ;;
+ *:XENIX:*:SysV)
+ GUESS=i386-pc-xenix
+ ;;
+ i*86:skyos:*:*)
+ SKYOS_REL=`echo "$UNAME_RELEASE" | sed -e 's/ .*$//'`
+ GUESS=$UNAME_MACHINE-pc-skyos$SKYOS_REL
+ ;;
+ i*86:rdos:*:*)
+ GUESS=$UNAME_MACHINE-pc-rdos
+ ;;
+ *:AROS:*:*)
+ GUESS=$UNAME_MACHINE-unknown-aros
+ ;;
+ x86_64:VMkernel:*:*)
+ GUESS=$UNAME_MACHINE-unknown-esx
+ ;;
+ amd64:Isilon\ OneFS:*:*)
+ GUESS=x86_64-unknown-onefs
+ ;;
+ *:Unleashed:*:*)
+ GUESS=$UNAME_MACHINE-unknown-unleashed$UNAME_RELEASE
+ ;;
+esac
+
+# Do we have a guess based on uname results?
+if test "x$GUESS" != x; then
+ echo "$GUESS"
+ exit
+fi
+
+# No uname command or uname output not recognized.
+set_cc_for_build
+cat > "$dummy.c" <<EOF
+#ifdef _SEQUENT_
+#include <sys/types.h>
+#include <sys/utsname.h>
+#endif
+#if defined(ultrix) || defined(_ultrix) || defined(__ultrix) || defined(__ultrix__)
+#if defined (vax) || defined (__vax) || defined (__vax__) || defined(mips) || defined(__mips) || defined(__mips__) || defined(MIPS) || defined(__MIPS__)
+#include <signal.h>
+#if defined(_SIZE_T_) || defined(SIGLOST)
+#include <sys/utsname.h>
+#endif
+#endif
+#endif
+main ()
+{
+#if defined (sony)
+#if defined (MIPSEB)
+ /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed,
+ I don't know.... */
+ printf ("mips-sony-bsd\n"); exit (0);
+#else
+#include <sys/param.h>
+ printf ("m68k-sony-newsos%s\n",
+#ifdef NEWSOS4
+ "4"
+#else
+ ""
+#endif
+ ); exit (0);
+#endif
+#endif
+
+#if defined (NeXT)
+#if !defined (__ARCHITECTURE__)
+#define __ARCHITECTURE__ "m68k"
+#endif
+ int version;
+ version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
+ if (version < 4)
+ printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
+ else
+ printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
+ exit (0);
+#endif
+
+#if defined (MULTIMAX) || defined (n16)
+#if defined (UMAXV)
+ printf ("ns32k-encore-sysv\n"); exit (0);
+#else
+#if defined (CMU)
+ printf ("ns32k-encore-mach\n"); exit (0);
+#else
+ printf ("ns32k-encore-bsd\n"); exit (0);
+#endif
+#endif
+#endif
+
+#if defined (__386BSD__)
+ printf ("i386-pc-bsd\n"); exit (0);
+#endif
+
+#if defined (sequent)
+#if defined (i386)
+ printf ("i386-sequent-dynix\n"); exit (0);
+#endif
+#if defined (ns32000)
+ printf ("ns32k-sequent-dynix\n"); exit (0);
+#endif
+#endif
+
+#if defined (_SEQUENT_)
+ struct utsname un;
+
+ uname(&un);
+ if (strncmp(un.version, "V2", 2) == 0) {
+ printf ("i386-sequent-ptx2\n"); exit (0);
+ }
+ if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
+ printf ("i386-sequent-ptx1\n"); exit (0);
+ }
+ printf ("i386-sequent-ptx\n"); exit (0);
+#endif
+
+#if defined (vax)
+#if !defined (ultrix)
+#include <sys/param.h>
+#if defined (BSD)
+#if BSD == 43
+ printf ("vax-dec-bsd4.3\n"); exit (0);
+#else
+#if BSD == 199006
+ printf ("vax-dec-bsd4.3reno\n"); exit (0);
+#else
+ printf ("vax-dec-bsd\n"); exit (0);
+#endif
+#endif
+#else
+ printf ("vax-dec-bsd\n"); exit (0);
+#endif
+#else
+#if defined(_SIZE_T_) || defined(SIGLOST)
+ struct utsname un;
+ uname (&un);
+ printf ("vax-dec-ultrix%s\n", un.release); exit (0);
+#else
+ printf ("vax-dec-ultrix\n"); exit (0);
+#endif
+#endif
+#endif
+#if defined(ultrix) || defined(_ultrix) || defined(__ultrix) || defined(__ultrix__)
+#if defined(mips) || defined(__mips) || defined(__mips__) || defined(MIPS) || defined(__MIPS__)
+#if defined(_SIZE_T_) || defined(SIGLOST)
+ struct utsname *un;
+ uname (&un);
+ printf ("mips-dec-ultrix%s\n", un.release); exit (0);
+#else
+ printf ("mips-dec-ultrix\n"); exit (0);
+#endif
+#endif
+#endif
+
+#if defined (alliant) && defined (i860)
+ printf ("i860-alliant-bsd\n"); exit (0);
+#endif
+
+ exit (1);
+}
+EOF
+
+$CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null && SYSTEM_NAME=`"$dummy"` &&
+ { echo "$SYSTEM_NAME"; exit; }
+
+# Apollos put the system type in the environment.
+test -d /usr/apollo && { echo "$ISP-apollo-$SYSTYPE"; exit; }
+
+echo "$0: unable to guess system type" >&2
+
+case $UNAME_MACHINE:$UNAME_SYSTEM in
+ mips:Linux | mips64:Linux)
+ # If we got here on MIPS GNU/Linux, output extra information.
+ cat >&2 <<EOF
+
+NOTE: MIPS GNU/Linux systems require a C compiler to fully recognize
+the system type. Please install a C compiler and try again.
+EOF
+ ;;
+esac
+
+cat >&2 <<EOF
+
+This script (version $timestamp), has failed to recognize the
+operating system you are using. If your script is old, overwrite *all*
+copies of config.guess and config.sub with the latest versions from:
+
+ https://git.savannah.gnu.org/cgit/config.git/plain/config.guess
+and
+ https://git.savannah.gnu.org/cgit/config.git/plain/config.sub
+EOF
+
+our_year=`echo $timestamp | sed 's,-.*,,'`
+thisyear=`date +%Y`
+# shellcheck disable=SC2003
+script_age=`expr "$thisyear" - "$our_year"`
+if test "$script_age" -lt 3 ; then
+ cat >&2 <<EOF
+
+If $0 has already been updated, send the following data and any
+information you think might be pertinent to config-patches@gnu.org to
+provide the necessary information to handle your system.
+
+config.guess timestamp = $timestamp
+
+uname -m = `(uname -m) 2>/dev/null || echo unknown`
+uname -r = `(uname -r) 2>/dev/null || echo unknown`
+uname -s = `(uname -s) 2>/dev/null || echo unknown`
+uname -v = `(uname -v) 2>/dev/null || echo unknown`
+
+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
+/bin/uname -X = `(/bin/uname -X) 2>/dev/null`
+
+hostinfo = `(hostinfo) 2>/dev/null`
+/bin/universe = `(/bin/universe) 2>/dev/null`
+/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null`
+/bin/arch = `(/bin/arch) 2>/dev/null`
+/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null`
+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
+
+UNAME_MACHINE = "$UNAME_MACHINE"
+UNAME_RELEASE = "$UNAME_RELEASE"
+UNAME_SYSTEM = "$UNAME_SYSTEM"
+UNAME_VERSION = "$UNAME_VERSION"
+EOF
+fi
+
+exit 1
+
+# Local variables:
+# eval: (add-hook 'before-save-hook 'time-stamp)
+# time-stamp-start: "timestamp='"
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:
diff --git a/language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/config.sub b/language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/config.sub
new file mode 100755
index 0000000000..d74fb6deac
--- /dev/null
+++ b/language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/config.sub
@@ -0,0 +1,1884 @@
+#! /bin/sh
+# Configuration validation subroutine script.
+# Copyright 1992-2021 Free Software Foundation, Inc.
+
+# shellcheck disable=SC2006,SC2268 # see below for rationale
+
+timestamp='2021-08-14'
+
+# This file 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 3 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; if not, see <https://www.gnu.org/licenses/>.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that
+# program. This Exception is an additional permission under section 7
+# of the GNU General Public License, version 3 ("GPLv3").
+
+
+# Please send patches to <config-patches@gnu.org>.
+#
+# Configuration subroutine to validate and canonicalize a configuration type.
+# Supply the specified configuration type as an argument.
+# If it is invalid, we print an error message on stderr and exit with code 1.
+# Otherwise, we print the canonical config type on stdout and succeed.
+
+# You can get the latest version of this script from:
+# https://git.savannah.gnu.org/cgit/config.git/plain/config.sub
+
+# This file is supposed to be the same for all GNU packages
+# and recognize all the CPU types, system types and aliases
+# that are meaningful with *any* GNU software.
+# Each package is responsible for reporting which valid configurations
+# it does not support. The user should be able to distinguish
+# a failure to support a valid configuration from a meaningless
+# configuration.
+
+# The goal of this file is to map all the various variations of a given
+# machine specification into a single specification in the form:
+# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
+# or in some cases, the newer four-part form:
+# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
+# It is wrong to echo any other type of specification.
+
+# The "shellcheck disable" line above the timestamp inhibits complaints
+# about features and limitations of the classic Bourne shell that were
+# superseded or lifted in POSIX. However, this script identifies a wide
+# variety of pre-POSIX systems that do not have POSIX shells at all, and
+# even some reasonably current systems (Solaris 10 as case-in-point) still
+# have a pre-POSIX /bin/sh.
+
+me=`echo "$0" | sed -e 's,.*/,,'`
+
+usage="\
+Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS
+
+Canonicalize a configuration name.
+
+Options:
+ -h, --help print this help, then exit
+ -t, --time-stamp print date of last modification, then exit
+ -v, --version print version number, then exit
+
+Report bugs and patches to <config-patches@gnu.org>."
+
+version="\
+GNU config.sub ($timestamp)
+
+Copyright 1992-2021 Free Software Foundation, Inc.
+
+This is free software; see the source for copying conditions. There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+
+help="
+Try \`$me --help' for more information."
+
+# Parse command line
+while test $# -gt 0 ; do
+ case $1 in
+ --time-stamp | --time* | -t )
+ echo "$timestamp" ; exit ;;
+ --version | -v )
+ echo "$version" ; exit ;;
+ --help | --h* | -h )
+ echo "$usage"; exit ;;
+ -- ) # Stop option processing
+ shift; break ;;
+ - ) # Use stdin as input.
+ break ;;
+ -* )
+ echo "$me: invalid option $1$help" >&2
+ exit 1 ;;
+
+ *local*)
+ # First pass through any local machine types.
+ echo "$1"
+ exit ;;
+
+ * )
+ break ;;
+ esac
+done
+
+case $# in
+ 0) echo "$me: missing argument$help" >&2
+ exit 1;;
+ 1) ;;
+ *) echo "$me: too many arguments$help" >&2
+ exit 1;;
+esac
+
+# Split fields of configuration type
+# shellcheck disable=SC2162
+saved_IFS=$IFS
+IFS="-" read field1 field2 field3 field4 <<EOF
+$1
+EOF
+IFS=$saved_IFS
+
+# Separate into logical components for further validation
+case $1 in
+ *-*-*-*-*)
+ echo Invalid configuration \`"$1"\': more than four components >&2
+ exit 1
+ ;;
+ *-*-*-*)
+ basic_machine=$field1-$field2
+ basic_os=$field3-$field4
+ ;;
+ *-*-*)
+ # Ambiguous whether COMPANY is present, or skipped and KERNEL-OS is two
+ # parts
+ maybe_os=$field2-$field3
+ case $maybe_os in
+ nto-qnx* | linux-* | uclinux-uclibc* \
+ | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* \
+ | netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \
+ | storm-chaos* | os2-emx* | rtmk-nova*)
+ basic_machine=$field1
+ basic_os=$maybe_os
+ ;;
+ android-linux)
+ basic_machine=$field1-unknown
+ basic_os=linux-android
+ ;;
+ *)
+ basic_machine=$field1-$field2
+ basic_os=$field3
+ ;;
+ esac
+ ;;
+ *-*)
+ # A lone config we happen to match not fitting any pattern
+ case $field1-$field2 in
+ decstation-3100)
+ basic_machine=mips-dec
+ basic_os=
+ ;;
+ *-*)
+ # Second component is usually, but not always the OS
+ case $field2 in
+ # Prevent following clause from handling this valid os
+ sun*os*)
+ basic_machine=$field1
+ basic_os=$field2
+ ;;
+ zephyr*)
+ basic_machine=$field1-unknown
+ basic_os=$field2
+ ;;
+ # Manufacturers
+ dec* | mips* | sequent* | encore* | pc533* | sgi* | sony* \
+ | att* | 7300* | 3300* | delta* | motorola* | sun[234]* \
+ | unicom* | ibm* | next | hp | isi* | apollo | altos* \
+ | convergent* | ncr* | news | 32* | 3600* | 3100* \
+ | hitachi* | c[123]* | convex* | sun | crds | omron* | dg \
+ | ultra | tti* | harris | dolphin | highlevel | gould \
+ | cbm | ns | masscomp | apple | axis | knuth | cray \
+ | microblaze* | sim | cisco \
+ | oki | wec | wrs | winbond)
+ basic_machine=$field1-$field2
+ basic_os=
+ ;;
+ *)
+ basic_machine=$field1
+ basic_os=$field2
+ ;;
+ esac
+ ;;
+ esac
+ ;;
+ *)
+ # Convert single-component short-hands not valid as part of
+ # multi-component configurations.
+ case $field1 in
+ 386bsd)
+ basic_machine=i386-pc
+ basic_os=bsd
+ ;;
+ a29khif)
+ basic_machine=a29k-amd
+ basic_os=udi
+ ;;
+ adobe68k)
+ basic_machine=m68010-adobe
+ basic_os=scout
+ ;;
+ alliant)
+ basic_machine=fx80-alliant
+ basic_os=
+ ;;
+ altos | altos3068)
+ basic_machine=m68k-altos
+ basic_os=
+ ;;
+ am29k)
+ basic_machine=a29k-none
+ basic_os=bsd
+ ;;
+ amdahl)
+ basic_machine=580-amdahl
+ basic_os=sysv
+ ;;
+ amiga)
+ basic_machine=m68k-unknown
+ basic_os=
+ ;;
+ amigaos | amigados)
+ basic_machine=m68k-unknown
+ basic_os=amigaos
+ ;;
+ amigaunix | amix)
+ basic_machine=m68k-unknown
+ basic_os=sysv4
+ ;;
+ apollo68)
+ basic_machine=m68k-apollo
+ basic_os=sysv
+ ;;
+ apollo68bsd)
+ basic_machine=m68k-apollo
+ basic_os=bsd
+ ;;
+ aros)
+ basic_machine=i386-pc
+ basic_os=aros
+ ;;
+ aux)
+ basic_machine=m68k-apple
+ basic_os=aux
+ ;;
+ balance)
+ basic_machine=ns32k-sequent
+ basic_os=dynix
+ ;;
+ blackfin)
+ basic_machine=bfin-unknown
+ basic_os=linux
+ ;;
+ cegcc)
+ basic_machine=arm-unknown
+ basic_os=cegcc
+ ;;
+ convex-c1)
+ basic_machine=c1-convex
+ basic_os=bsd
+ ;;
+ convex-c2)
+ basic_machine=c2-convex
+ basic_os=bsd
+ ;;
+ convex-c32)
+ basic_machine=c32-convex
+ basic_os=bsd
+ ;;
+ convex-c34)
+ basic_machine=c34-convex
+ basic_os=bsd
+ ;;
+ convex-c38)
+ basic_machine=c38-convex
+ basic_os=bsd
+ ;;
+ cray)
+ basic_machine=j90-cray
+ basic_os=unicos
+ ;;
+ crds | unos)
+ basic_machine=m68k-crds
+ basic_os=
+ ;;
+ da30)
+ basic_machine=m68k-da30
+ basic_os=
+ ;;
+ decstation | pmax | pmin | dec3100 | decstatn)
+ basic_machine=mips-dec
+ basic_os=
+ ;;
+ delta88)
+ basic_machine=m88k-motorola
+ basic_os=sysv3
+ ;;
+ dicos)
+ basic_machine=i686-pc
+ basic_os=dicos
+ ;;
+ djgpp)
+ basic_machine=i586-pc
+ basic_os=msdosdjgpp
+ ;;
+ ebmon29k)
+ basic_machine=a29k-amd
+ basic_os=ebmon
+ ;;
+ es1800 | OSE68k | ose68k | ose | OSE)
+ basic_machine=m68k-ericsson
+ basic_os=ose
+ ;;
+ gmicro)
+ basic_machine=tron-gmicro
+ basic_os=sysv
+ ;;
+ go32)
+ basic_machine=i386-pc
+ basic_os=go32
+ ;;
+ h8300hms)
+ basic_machine=h8300-hitachi
+ basic_os=hms
+ ;;
+ h8300xray)
+ basic_machine=h8300-hitachi
+ basic_os=xray
+ ;;
+ h8500hms)
+ basic_machine=h8500-hitachi
+ basic_os=hms
+ ;;
+ harris)
+ basic_machine=m88k-harris
+ basic_os=sysv3
+ ;;
+ hp300 | hp300hpux)
+ basic_machine=m68k-hp
+ basic_os=hpux
+ ;;
+ hp300bsd)
+ basic_machine=m68k-hp
+ basic_os=bsd
+ ;;
+ hppaosf)
+ basic_machine=hppa1.1-hp
+ basic_os=osf
+ ;;
+ hppro)
+ basic_machine=hppa1.1-hp
+ basic_os=proelf
+ ;;
+ i386mach)
+ basic_machine=i386-mach
+ basic_os=mach
+ ;;
+ isi68 | isi)
+ basic_machine=m68k-isi
+ basic_os=sysv
+ ;;
+ m68knommu)
+ basic_machine=m68k-unknown
+ basic_os=linux
+ ;;
+ magnum | m3230)
+ basic_machine=mips-mips
+ basic_os=sysv
+ ;;
+ merlin)
+ basic_machine=ns32k-utek
+ basic_os=sysv
+ ;;
+ mingw64)
+ basic_machine=x86_64-pc
+ basic_os=mingw64
+ ;;
+ mingw32)
+ basic_machine=i686-pc
+ basic_os=mingw32
+ ;;
+ mingw32ce)
+ basic_machine=arm-unknown
+ basic_os=mingw32ce
+ ;;
+ monitor)
+ basic_machine=m68k-rom68k
+ basic_os=coff
+ ;;
+ morphos)
+ basic_machine=powerpc-unknown
+ basic_os=morphos
+ ;;
+ moxiebox)
+ basic_machine=moxie-unknown
+ basic_os=moxiebox
+ ;;
+ msdos)
+ basic_machine=i386-pc
+ basic_os=msdos
+ ;;
+ msys)
+ basic_machine=i686-pc
+ basic_os=msys
+ ;;
+ mvs)
+ basic_machine=i370-ibm
+ basic_os=mvs
+ ;;
+ nacl)
+ basic_machine=le32-unknown
+ basic_os=nacl
+ ;;
+ ncr3000)
+ basic_machine=i486-ncr
+ basic_os=sysv4
+ ;;
+ netbsd386)
+ basic_machine=i386-pc
+ basic_os=netbsd
+ ;;
+ netwinder)
+ basic_machine=armv4l-rebel
+ basic_os=linux
+ ;;
+ news | news700 | news800 | news900)
+ basic_machine=m68k-sony
+ basic_os=newsos
+ ;;
+ news1000)
+ basic_machine=m68030-sony
+ basic_os=newsos
+ ;;
+ necv70)
+ basic_machine=v70-nec
+ basic_os=sysv
+ ;;
+ nh3000)
+ basic_machine=m68k-harris
+ basic_os=cxux
+ ;;
+ nh[45]000)
+ basic_machine=m88k-harris
+ basic_os=cxux
+ ;;
+ nindy960)
+ basic_machine=i960-intel
+ basic_os=nindy
+ ;;
+ mon960)
+ basic_machine=i960-intel
+ basic_os=mon960
+ ;;
+ nonstopux)
+ basic_machine=mips-compaq
+ basic_os=nonstopux
+ ;;
+ os400)
+ basic_machine=powerpc-ibm
+ basic_os=os400
+ ;;
+ OSE68000 | ose68000)
+ basic_machine=m68000-ericsson
+ basic_os=ose
+ ;;
+ os68k)
+ basic_machine=m68k-none
+ basic_os=os68k
+ ;;
+ paragon)
+ basic_machine=i860-intel
+ basic_os=osf
+ ;;
+ parisc)
+ basic_machine=hppa-unknown
+ basic_os=linux
+ ;;
+ psp)
+ basic_machine=mipsallegrexel-sony
+ basic_os=psp
+ ;;
+ pw32)
+ basic_machine=i586-unknown
+ basic_os=pw32
+ ;;
+ rdos | rdos64)
+ basic_machine=x86_64-pc
+ basic_os=rdos
+ ;;
+ rdos32)
+ basic_machine=i386-pc
+ basic_os=rdos
+ ;;
+ rom68k)
+ basic_machine=m68k-rom68k
+ basic_os=coff
+ ;;
+ sa29200)
+ basic_machine=a29k-amd
+ basic_os=udi
+ ;;
+ sei)
+ basic_machine=mips-sei
+ basic_os=seiux
+ ;;
+ sequent)
+ basic_machine=i386-sequent
+ basic_os=
+ ;;
+ sps7)
+ basic_machine=m68k-bull
+ basic_os=sysv2
+ ;;
+ st2000)
+ basic_machine=m68k-tandem
+ basic_os=
+ ;;
+ stratus)
+ basic_machine=i860-stratus
+ basic_os=sysv4
+ ;;
+ sun2)
+ basic_machine=m68000-sun
+ basic_os=
+ ;;
+ sun2os3)
+ basic_machine=m68000-sun
+ basic_os=sunos3
+ ;;
+ sun2os4)
+ basic_machine=m68000-sun
+ basic_os=sunos4
+ ;;
+ sun3)
+ basic_machine=m68k-sun
+ basic_os=
+ ;;
+ sun3os3)
+ basic_machine=m68k-sun
+ basic_os=sunos3
+ ;;
+ sun3os4)
+ basic_machine=m68k-sun
+ basic_os=sunos4
+ ;;
+ sun4)
+ basic_machine=sparc-sun
+ basic_os=
+ ;;
+ sun4os3)
+ basic_machine=sparc-sun
+ basic_os=sunos3
+ ;;
+ sun4os4)
+ basic_machine=sparc-sun
+ basic_os=sunos4
+ ;;
+ sun4sol2)
+ basic_machine=sparc-sun
+ basic_os=solaris2
+ ;;
+ sun386 | sun386i | roadrunner)
+ basic_machine=i386-sun
+ basic_os=
+ ;;
+ sv1)
+ basic_machine=sv1-cray
+ basic_os=unicos
+ ;;
+ symmetry)
+ basic_machine=i386-sequent
+ basic_os=dynix
+ ;;
+ t3e)
+ basic_machine=alphaev5-cray
+ basic_os=unicos
+ ;;
+ t90)
+ basic_machine=t90-cray
+ basic_os=unicos
+ ;;
+ toad1)
+ basic_machine=pdp10-xkl
+ basic_os=tops20
+ ;;
+ tpf)
+ basic_machine=s390x-ibm
+ basic_os=tpf
+ ;;
+ udi29k)
+ basic_machine=a29k-amd
+ basic_os=udi
+ ;;
+ ultra3)
+ basic_machine=a29k-nyu
+ basic_os=sym1
+ ;;
+ v810 | necv810)
+ basic_machine=v810-nec
+ basic_os=none
+ ;;
+ vaxv)
+ basic_machine=vax-dec
+ basic_os=sysv
+ ;;
+ vms)
+ basic_machine=vax-dec
+ basic_os=vms
+ ;;
+ vsta)
+ basic_machine=i386-pc
+ basic_os=vsta
+ ;;
+ vxworks960)
+ basic_machine=i960-wrs
+ basic_os=vxworks
+ ;;
+ vxworks68)
+ basic_machine=m68k-wrs
+ basic_os=vxworks
+ ;;
+ vxworks29k)
+ basic_machine=a29k-wrs
+ basic_os=vxworks
+ ;;
+ xbox)
+ basic_machine=i686-pc
+ basic_os=mingw32
+ ;;
+ ymp)
+ basic_machine=ymp-cray
+ basic_os=unicos
+ ;;
+ *)
+ basic_machine=$1
+ basic_os=
+ ;;
+ esac
+ ;;
+esac
+
+# Decode 1-component or ad-hoc basic machines
+case $basic_machine in
+ # Here we handle the default manufacturer of certain CPU types. It is in
+ # some cases the only manufacturer, in others, it is the most popular.
+ w89k)
+ cpu=hppa1.1
+ vendor=winbond
+ ;;
+ op50n)
+ cpu=hppa1.1
+ vendor=oki
+ ;;
+ op60c)
+ cpu=hppa1.1
+ vendor=oki
+ ;;
+ ibm*)
+ cpu=i370
+ vendor=ibm
+ ;;
+ orion105)
+ cpu=clipper
+ vendor=highlevel
+ ;;
+ mac | mpw | mac-mpw)
+ cpu=m68k
+ vendor=apple
+ ;;
+ pmac | pmac-mpw)
+ cpu=powerpc
+ vendor=apple
+ ;;
+
+ # Recognize the various machine names and aliases which stand
+ # for a CPU type and a company and sometimes even an OS.
+ 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
+ cpu=m68000
+ vendor=att
+ ;;
+ 3b*)
+ cpu=we32k
+ vendor=att
+ ;;
+ bluegene*)
+ cpu=powerpc
+ vendor=ibm
+ basic_os=cnk
+ ;;
+ decsystem10* | dec10*)
+ cpu=pdp10
+ vendor=dec
+ basic_os=tops10
+ ;;
+ decsystem20* | dec20*)
+ cpu=pdp10
+ vendor=dec
+ basic_os=tops20
+ ;;
+ delta | 3300 | motorola-3300 | motorola-delta \
+ | 3300-motorola | delta-motorola)
+ cpu=m68k
+ vendor=motorola
+ ;;
+ dpx2*)
+ cpu=m68k
+ vendor=bull
+ basic_os=sysv3
+ ;;
+ encore | umax | mmax)
+ cpu=ns32k
+ vendor=encore
+ ;;
+ elxsi)
+ cpu=elxsi
+ vendor=elxsi
+ basic_os=${basic_os:-bsd}
+ ;;
+ fx2800)
+ cpu=i860
+ vendor=alliant
+ ;;
+ genix)
+ cpu=ns32k
+ vendor=ns
+ ;;
+ h3050r* | hiux*)
+ cpu=hppa1.1
+ vendor=hitachi
+ basic_os=hiuxwe2
+ ;;
+ hp3k9[0-9][0-9] | hp9[0-9][0-9])
+ cpu=hppa1.0
+ vendor=hp
+ ;;
+ hp9k2[0-9][0-9] | hp9k31[0-9])
+ cpu=m68000
+ vendor=hp
+ ;;
+ hp9k3[2-9][0-9])
+ cpu=m68k
+ vendor=hp
+ ;;
+ hp9k6[0-9][0-9] | hp6[0-9][0-9])
+ cpu=hppa1.0
+ vendor=hp
+ ;;
+ hp9k7[0-79][0-9] | hp7[0-79][0-9])
+ cpu=hppa1.1
+ vendor=hp
+ ;;
+ hp9k78[0-9] | hp78[0-9])
+ # FIXME: really hppa2.0-hp
+ cpu=hppa1.1
+ vendor=hp
+ ;;
+ hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
+ # FIXME: really hppa2.0-hp
+ cpu=hppa1.1
+ vendor=hp
+ ;;
+ hp9k8[0-9][13679] | hp8[0-9][13679])
+ cpu=hppa1.1
+ vendor=hp
+ ;;
+ hp9k8[0-9][0-9] | hp8[0-9][0-9])
+ cpu=hppa1.0
+ vendor=hp
+ ;;
+ i*86v32)
+ cpu=`echo "$1" | sed -e 's/86.*/86/'`
+ vendor=pc
+ basic_os=sysv32
+ ;;
+ i*86v4*)
+ cpu=`echo "$1" | sed -e 's/86.*/86/'`
+ vendor=pc
+ basic_os=sysv4
+ ;;
+ i*86v)
+ cpu=`echo "$1" | sed -e 's/86.*/86/'`
+ vendor=pc
+ basic_os=sysv
+ ;;
+ i*86sol2)
+ cpu=`echo "$1" | sed -e 's/86.*/86/'`
+ vendor=pc
+ basic_os=solaris2
+ ;;
+ j90 | j90-cray)
+ cpu=j90
+ vendor=cray
+ basic_os=${basic_os:-unicos}
+ ;;
+ iris | iris4d)
+ cpu=mips
+ vendor=sgi
+ case $basic_os in
+ irix*)
+ ;;
+ *)
+ basic_os=irix4
+ ;;
+ esac
+ ;;
+ miniframe)
+ cpu=m68000
+ vendor=convergent
+ ;;
+ *mint | mint[0-9]* | *MiNT | *MiNT[0-9]*)
+ cpu=m68k
+ vendor=atari
+ basic_os=mint
+ ;;
+ news-3600 | risc-news)
+ cpu=mips
+ vendor=sony
+ basic_os=newsos
+ ;;
+ next | m*-next)
+ cpu=m68k
+ vendor=next
+ case $basic_os in
+ openstep*)
+ ;;
+ nextstep*)
+ ;;
+ ns2*)
+ basic_os=nextstep2
+ ;;
+ *)
+ basic_os=nextstep3
+ ;;
+ esac
+ ;;
+ np1)
+ cpu=np1
+ vendor=gould
+ ;;
+ op50n-* | op60c-*)
+ cpu=hppa1.1
+ vendor=oki
+ basic_os=proelf
+ ;;
+ pa-hitachi)
+ cpu=hppa1.1
+ vendor=hitachi
+ basic_os=hiuxwe2
+ ;;
+ pbd)
+ cpu=sparc
+ vendor=tti
+ ;;
+ pbb)
+ cpu=m68k
+ vendor=tti
+ ;;
+ pc532)
+ cpu=ns32k
+ vendor=pc532
+ ;;
+ pn)
+ cpu=pn
+ vendor=gould
+ ;;
+ power)
+ cpu=power
+ vendor=ibm
+ ;;
+ ps2)
+ cpu=i386
+ vendor=ibm
+ ;;
+ rm[46]00)
+ cpu=mips
+ vendor=siemens
+ ;;
+ rtpc | rtpc-*)
+ cpu=romp
+ vendor=ibm
+ ;;
+ sde)
+ cpu=mipsisa32
+ vendor=sde
+ basic_os=${basic_os:-elf}
+ ;;
+ simso-wrs)
+ cpu=sparclite
+ vendor=wrs
+ basic_os=vxworks
+ ;;
+ tower | tower-32)
+ cpu=m68k
+ vendor=ncr
+ ;;
+ vpp*|vx|vx-*)
+ cpu=f301
+ vendor=fujitsu
+ ;;
+ w65)
+ cpu=w65
+ vendor=wdc
+ ;;
+ w89k-*)
+ cpu=hppa1.1
+ vendor=winbond
+ basic_os=proelf
+ ;;
+ none)
+ cpu=none
+ vendor=none
+ ;;
+ leon|leon[3-9])
+ cpu=sparc
+ vendor=$basic_machine
+ ;;
+ leon-*|leon[3-9]-*)
+ cpu=sparc
+ vendor=`echo "$basic_machine" | sed 's/-.*//'`
+ ;;
+
+ *-*)
+ # shellcheck disable=SC2162
+ saved_IFS=$IFS
+ IFS="-" read cpu vendor <<EOF
+$basic_machine
+EOF
+ IFS=$saved_IFS
+ ;;
+ # We use `pc' rather than `unknown'
+ # because (1) that's what they normally are, and
+ # (2) the word "unknown" tends to confuse beginning users.
+ i*86 | x86_64)
+ cpu=$basic_machine
+ vendor=pc
+ ;;
+ # These rules are duplicated from below for sake of the special case above;
+ # i.e. things that normalized to x86 arches should also default to "pc"
+ pc98)
+ cpu=i386
+ vendor=pc
+ ;;
+ x64 | amd64)
+ cpu=x86_64
+ vendor=pc
+ ;;
+ # Recognize the basic CPU types without company name.
+ *)
+ cpu=$basic_machine
+ vendor=unknown
+ ;;
+esac
+
+unset -v basic_machine
+
+# Decode basic machines in the full and proper CPU-Company form.
+case $cpu-$vendor in
+ # Here we handle the default manufacturer of certain CPU types in canonical form. It is in
+ # some cases the only manufacturer, in others, it is the most popular.
+ craynv-unknown)
+ vendor=cray
+ basic_os=${basic_os:-unicosmp}
+ ;;
+ c90-unknown | c90-cray)
+ vendor=cray
+ basic_os=${Basic_os:-unicos}
+ ;;
+ fx80-unknown)
+ vendor=alliant
+ ;;
+ romp-unknown)
+ vendor=ibm
+ ;;
+ mmix-unknown)
+ vendor=knuth
+ ;;
+ microblaze-unknown | microblazeel-unknown)
+ vendor=xilinx
+ ;;
+ rs6000-unknown)
+ vendor=ibm
+ ;;
+ vax-unknown)
+ vendor=dec
+ ;;
+ pdp11-unknown)
+ vendor=dec
+ ;;
+ we32k-unknown)
+ vendor=att
+ ;;
+ cydra-unknown)
+ vendor=cydrome
+ ;;
+ i370-ibm*)
+ vendor=ibm
+ ;;
+ orion-unknown)
+ vendor=highlevel
+ ;;
+ xps-unknown | xps100-unknown)
+ cpu=xps100
+ vendor=honeywell
+ ;;
+
+ # Here we normalize CPU types with a missing or matching vendor
+ dpx20-unknown | dpx20-bull)
+ cpu=rs6000
+ vendor=bull
+ basic_os=${basic_os:-bosx}
+ ;;
+
+ # Here we normalize CPU types irrespective of the vendor
+ amd64-*)
+ cpu=x86_64
+ ;;
+ blackfin-*)
+ cpu=bfin
+ basic_os=linux
+ ;;
+ c54x-*)
+ cpu=tic54x
+ ;;
+ c55x-*)
+ cpu=tic55x
+ ;;
+ c6x-*)
+ cpu=tic6x
+ ;;
+ e500v[12]-*)
+ cpu=powerpc
+ basic_os=${basic_os}"spe"
+ ;;
+ mips3*-*)
+ cpu=mips64
+ ;;
+ ms1-*)
+ cpu=mt
+ ;;
+ m68knommu-*)
+ cpu=m68k
+ basic_os=linux
+ ;;
+ m9s12z-* | m68hcs12z-* | hcs12z-* | s12z-*)
+ cpu=s12z
+ ;;
+ openrisc-*)
+ cpu=or32
+ ;;
+ parisc-*)
+ cpu=hppa
+ basic_os=linux
+ ;;
+ pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
+ cpu=i586
+ ;;
+ pentiumpro-* | p6-* | 6x86-* | athlon-* | athalon_*-*)
+ cpu=i686
+ ;;
+ pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
+ cpu=i686
+ ;;
+ pentium4-*)
+ cpu=i786
+ ;;
+ pc98-*)
+ cpu=i386
+ ;;
+ ppc-* | ppcbe-*)
+ cpu=powerpc
+ ;;
+ ppcle-* | powerpclittle-*)
+ cpu=powerpcle
+ ;;
+ ppc64-*)
+ cpu=powerpc64
+ ;;
+ ppc64le-* | powerpc64little-*)
+ cpu=powerpc64le
+ ;;
+ sb1-*)
+ cpu=mipsisa64sb1
+ ;;
+ sb1el-*)
+ cpu=mipsisa64sb1el
+ ;;
+ sh5e[lb]-*)
+ cpu=`echo "$cpu" | sed 's/^\(sh.\)e\(.\)$/\1\2e/'`
+ ;;
+ spur-*)
+ cpu=spur
+ ;;
+ strongarm-* | thumb-*)
+ cpu=arm
+ ;;
+ tx39-*)
+ cpu=mipstx39
+ ;;
+ tx39el-*)
+ cpu=mipstx39el
+ ;;
+ x64-*)
+ cpu=x86_64
+ ;;
+ xscale-* | xscalee[bl]-*)
+ cpu=`echo "$cpu" | sed 's/^xscale/arm/'`
+ ;;
+ arm64-*)
+ cpu=aarch64
+ ;;
+
+ # Recognize the canonical CPU Types that limit and/or modify the
+ # company names they are paired with.
+ cr16-*)
+ basic_os=${basic_os:-elf}
+ ;;
+ crisv32-* | etraxfs*-*)
+ cpu=crisv32
+ vendor=axis
+ ;;
+ cris-* | etrax*-*)
+ cpu=cris
+ vendor=axis
+ ;;
+ crx-*)
+ basic_os=${basic_os:-elf}
+ ;;
+ neo-tandem)
+ cpu=neo
+ vendor=tandem
+ ;;
+ nse-tandem)
+ cpu=nse
+ vendor=tandem
+ ;;
+ nsr-tandem)
+ cpu=nsr
+ vendor=tandem
+ ;;
+ nsv-tandem)
+ cpu=nsv
+ vendor=tandem
+ ;;
+ nsx-tandem)
+ cpu=nsx
+ vendor=tandem
+ ;;
+ mipsallegrexel-sony)
+ cpu=mipsallegrexel
+ vendor=sony
+ ;;
+ tile*-*)
+ basic_os=${basic_os:-linux-gnu}
+ ;;
+
+ *)
+ # Recognize the canonical CPU types that are allowed with any
+ # company name.
+ case $cpu in
+ 1750a | 580 \
+ | a29k \
+ | aarch64 | aarch64_be \
+ | abacus \
+ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] \
+ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] \
+ | alphapca5[67] | alpha64pca5[67] \
+ | am33_2.0 \
+ | amdgcn \
+ | arc | arceb | arc32 | arc64 \
+ | arm | arm[lb]e | arme[lb] | armv* \
+ | avr | avr32 \
+ | asmjs \
+ | ba \
+ | be32 | be64 \
+ | bfin | bpf | bs2000 \
+ | c[123]* | c30 | [cjt]90 | c4x \
+ | c8051 | clipper | craynv | csky | cydra \
+ | d10v | d30v | dlx | dsp16xx \
+ | e2k | elxsi | epiphany \
+ | f30[01] | f700 | fido | fr30 | frv | ft32 | fx80 \
+ | h8300 | h8500 \
+ | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+ | hexagon \
+ | i370 | i*86 | i860 | i960 | ia16 | ia64 \
+ | ip2k | iq2000 \
+ | k1om \
+ | le32 | le64 \
+ | lm32 \
+ | loongarch32 | loongarch64 | loongarchx32 \
+ | m32c | m32r | m32rle \
+ | m5200 | m68000 | m680[012346]0 | m68360 | m683?2 | m68k \
+ | m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x \
+ | m88110 | m88k | maxq | mb | mcore | mep | metag \
+ | microblaze | microblazeel \
+ | mips | mipsbe | mipseb | mipsel | mipsle \
+ | mips16 \
+ | mips64 | mips64eb | mips64el \
+ | mips64octeon | mips64octeonel \
+ | mips64orion | mips64orionel \
+ | mips64r5900 | mips64r5900el \
+ | mips64vr | mips64vrel \
+ | mips64vr4100 | mips64vr4100el \
+ | mips64vr4300 | mips64vr4300el \
+ | mips64vr5000 | mips64vr5000el \
+ | mips64vr5900 | mips64vr5900el \
+ | mipsisa32 | mipsisa32el \
+ | mipsisa32r2 | mipsisa32r2el \
+ | mipsisa32r3 | mipsisa32r3el \
+ | mipsisa32r5 | mipsisa32r5el \
+ | mipsisa32r6 | mipsisa32r6el \
+ | mipsisa64 | mipsisa64el \
+ | mipsisa64r2 | mipsisa64r2el \
+ | mipsisa64r3 | mipsisa64r3el \
+ | mipsisa64r5 | mipsisa64r5el \
+ | mipsisa64r6 | mipsisa64r6el \
+ | mipsisa64sb1 | mipsisa64sb1el \
+ | mipsisa64sr71k | mipsisa64sr71kel \
+ | mipsr5900 | mipsr5900el \
+ | mipstx39 | mipstx39el \
+ | mmix \
+ | mn10200 | mn10300 \
+ | moxie \
+ | mt \
+ | msp430 \
+ | nds32 | nds32le | nds32be \
+ | nfp \
+ | nios | nios2 | nios2eb | nios2el \
+ | none | np1 | ns16k | ns32k | nvptx \
+ | open8 \
+ | or1k* \
+ | or32 \
+ | orion \
+ | picochip \
+ | pdp10 | pdp11 | pj | pjl | pn | power \
+ | powerpc | powerpc64 | powerpc64le | powerpcle | powerpcspe \
+ | pru \
+ | pyramid \
+ | riscv | riscv32 | riscv32be | riscv64 | riscv64be \
+ | rl78 | romp | rs6000 | rx \
+ | s390 | s390x \
+ | score \
+ | sh | shl \
+ | sh[1234] | sh[24]a | sh[24]ae[lb] | sh[23]e | she[lb] | sh[lb]e \
+ | sh[1234]e[lb] | sh[12345][lb]e | sh[23]ele | sh64 | sh64le \
+ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet \
+ | sparclite \
+ | sparcv8 | sparcv9 | sparcv9b | sparcv9v | sv1 | sx* \
+ | spu \
+ | tahoe \
+ | thumbv7* \
+ | tic30 | tic4x | tic54x | tic55x | tic6x | tic80 \
+ | tron \
+ | ubicom32 \
+ | v70 | v850 | v850e | v850e1 | v850es | v850e2 | v850e2v3 \
+ | vax \
+ | visium \
+ | w65 \
+ | wasm32 | wasm64 \
+ | we32k \
+ | x86 | x86_64 | xc16x | xgate | xps100 \
+ | xstormy16 | xtensa* \
+ | ymp \
+ | z8k | z80)
+ ;;
+
+ *)
+ echo Invalid configuration \`"$1"\': machine \`"$cpu-$vendor"\' not recognized 1>&2
+ exit 1
+ ;;
+ esac
+ ;;
+esac
+
+# Here we canonicalize certain aliases for manufacturers.
+case $vendor in
+ digital*)
+ vendor=dec
+ ;;
+ commodore*)
+ vendor=cbm
+ ;;
+ *)
+ ;;
+esac
+
+# Decode manufacturer-specific aliases for certain operating systems.
+
+if test x$basic_os != x
+then
+
+# First recognize some ad-hoc caes, or perhaps split kernel-os, or else just
+# set os.
+case $basic_os in
+ gnu/linux*)
+ kernel=linux
+ os=`echo "$basic_os" | sed -e 's|gnu/linux|gnu|'`
+ ;;
+ os2-emx)
+ kernel=os2
+ os=`echo "$basic_os" | sed -e 's|os2-emx|emx|'`
+ ;;
+ nto-qnx*)
+ kernel=nto
+ os=`echo "$basic_os" | sed -e 's|nto-qnx|qnx|'`
+ ;;
+ *-*)
+ # shellcheck disable=SC2162
+ saved_IFS=$IFS
+ IFS="-" read kernel os <<EOF
+$basic_os
+EOF
+ IFS=$saved_IFS
+ ;;
+ # Default OS when just kernel was specified
+ nto*)
+ kernel=nto
+ os=`echo "$basic_os" | sed -e 's|nto|qnx|'`
+ ;;
+ linux*)
+ kernel=linux
+ os=`echo "$basic_os" | sed -e 's|linux|gnu|'`
+ ;;
+ *)
+ kernel=
+ os=$basic_os
+ ;;
+esac
+
+# Now, normalize the OS (knowing we just have one component, it's not a kernel,
+# etc.)
+case $os in
+ # First match some system type aliases that might get confused
+ # with valid system types.
+ # solaris* is a basic system type, with this one exception.
+ auroraux)
+ os=auroraux
+ ;;
+ bluegene*)
+ os=cnk
+ ;;
+ solaris1 | solaris1.*)
+ os=`echo "$os" | sed -e 's|solaris1|sunos4|'`
+ ;;
+ solaris)
+ os=solaris2
+ ;;
+ unixware*)
+ os=sysv4.2uw
+ ;;
+ # es1800 is here to avoid being matched by es* (a different OS)
+ es1800*)
+ os=ose
+ ;;
+ # Some version numbers need modification
+ chorusos*)
+ os=chorusos
+ ;;
+ isc)
+ os=isc2.2
+ ;;
+ sco6)
+ os=sco5v6
+ ;;
+ sco5)
+ os=sco3.2v5
+ ;;
+ sco4)
+ os=sco3.2v4
+ ;;
+ sco3.2.[4-9]*)
+ os=`echo "$os" | sed -e 's/sco3.2./sco3.2v/'`
+ ;;
+ sco*v* | scout)
+ # Don't match below
+ ;;
+ sco*)
+ os=sco3.2v2
+ ;;
+ psos*)
+ os=psos
+ ;;
+ qnx*)
+ os=qnx
+ ;;
+ hiux*)
+ os=hiuxwe2
+ ;;
+ lynx*178)
+ os=lynxos178
+ ;;
+ lynx*5)
+ os=lynxos5
+ ;;
+ lynxos*)
+ # don't get caught up in next wildcard
+ ;;
+ lynx*)
+ os=lynxos
+ ;;
+ mac[0-9]*)
+ os=`echo "$os" | sed -e 's|mac|macos|'`
+ ;;
+ opened*)
+ os=openedition
+ ;;
+ os400*)
+ os=os400
+ ;;
+ sunos5*)
+ os=`echo "$os" | sed -e 's|sunos5|solaris2|'`
+ ;;
+ sunos6*)
+ os=`echo "$os" | sed -e 's|sunos6|solaris3|'`
+ ;;
+ wince*)
+ os=wince
+ ;;
+ utek*)
+ os=bsd
+ ;;
+ dynix*)
+ os=bsd
+ ;;
+ acis*)
+ os=aos
+ ;;
+ atheos*)
+ os=atheos
+ ;;
+ syllable*)
+ os=syllable
+ ;;
+ 386bsd)
+ os=bsd
+ ;;
+ ctix* | uts*)
+ os=sysv
+ ;;
+ nova*)
+ os=rtmk-nova
+ ;;
+ ns2)
+ os=nextstep2
+ ;;
+ # Preserve the version number of sinix5.
+ sinix5.*)
+ os=`echo "$os" | sed -e 's|sinix|sysv|'`
+ ;;
+ sinix*)
+ os=sysv4
+ ;;
+ tpf*)
+ os=tpf
+ ;;
+ triton*)
+ os=sysv3
+ ;;
+ oss*)
+ os=sysv3
+ ;;
+ svr4*)
+ os=sysv4
+ ;;
+ svr3)
+ os=sysv3
+ ;;
+ sysvr4)
+ os=sysv4
+ ;;
+ ose*)
+ os=ose
+ ;;
+ *mint | mint[0-9]* | *MiNT | MiNT[0-9]*)
+ os=mint
+ ;;
+ dicos*)
+ os=dicos
+ ;;
+ pikeos*)
+ # Until real need of OS specific support for
+ # particular features comes up, bare metal
+ # configurations are quite functional.
+ case $cpu in
+ arm*)
+ os=eabi
+ ;;
+ *)
+ os=elf
+ ;;
+ esac
+ ;;
+ *)
+ # No normalization, but not necessarily accepted, that comes below.
+ ;;
+esac
+
+else
+
+# Here we handle the default operating systems that come with various machines.
+# The value should be what the vendor currently ships out the door with their
+# machine or put another way, the most popular os provided with the machine.
+
+# Note that if you're going to try to match "-MANUFACTURER" here (say,
+# "-sun"), then you have to tell the case statement up towards the top
+# that MANUFACTURER isn't an operating system. Otherwise, code above
+# will signal an error saying that MANUFACTURER isn't an operating
+# system, and we'll never get to this point.
+
+kernel=
+case $cpu-$vendor in
+ score-*)
+ os=elf
+ ;;
+ spu-*)
+ os=elf
+ ;;
+ *-acorn)
+ os=riscix1.2
+ ;;
+ arm*-rebel)
+ kernel=linux
+ os=gnu
+ ;;
+ arm*-semi)
+ os=aout
+ ;;
+ c4x-* | tic4x-*)
+ os=coff
+ ;;
+ c8051-*)
+ os=elf
+ ;;
+ clipper-intergraph)
+ os=clix
+ ;;
+ hexagon-*)
+ os=elf
+ ;;
+ tic54x-*)
+ os=coff
+ ;;
+ tic55x-*)
+ os=coff
+ ;;
+ tic6x-*)
+ os=coff
+ ;;
+ # This must come before the *-dec entry.
+ pdp10-*)
+ os=tops20
+ ;;
+ pdp11-*)
+ os=none
+ ;;
+ *-dec | vax-*)
+ os=ultrix4.2
+ ;;
+ m68*-apollo)
+ os=domain
+ ;;
+ i386-sun)
+ os=sunos4.0.2
+ ;;
+ m68000-sun)
+ os=sunos3
+ ;;
+ m68*-cisco)
+ os=aout
+ ;;
+ mep-*)
+ os=elf
+ ;;
+ mips*-cisco)
+ os=elf
+ ;;
+ mips*-*)
+ os=elf
+ ;;
+ or32-*)
+ os=coff
+ ;;
+ *-tti) # must be before sparc entry or we get the wrong os.
+ os=sysv3
+ ;;
+ sparc-* | *-sun)
+ os=sunos4.1.1
+ ;;
+ pru-*)
+ os=elf
+ ;;
+ *-be)
+ os=beos
+ ;;
+ *-ibm)
+ os=aix
+ ;;
+ *-knuth)
+ os=mmixware
+ ;;
+ *-wec)
+ os=proelf
+ ;;
+ *-winbond)
+ os=proelf
+ ;;
+ *-oki)
+ os=proelf
+ ;;
+ *-hp)
+ os=hpux
+ ;;
+ *-hitachi)
+ os=hiux
+ ;;
+ i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
+ os=sysv
+ ;;
+ *-cbm)
+ os=amigaos
+ ;;
+ *-dg)
+ os=dgux
+ ;;
+ *-dolphin)
+ os=sysv3
+ ;;
+ m68k-ccur)
+ os=rtu
+ ;;
+ m88k-omron*)
+ os=luna
+ ;;
+ *-next)
+ os=nextstep
+ ;;
+ *-sequent)
+ os=ptx
+ ;;
+ *-crds)
+ os=unos
+ ;;
+ *-ns)
+ os=genix
+ ;;
+ i370-*)
+ os=mvs
+ ;;
+ *-gould)
+ os=sysv
+ ;;
+ *-highlevel)
+ os=bsd
+ ;;
+ *-encore)
+ os=bsd
+ ;;
+ *-sgi)
+ os=irix
+ ;;
+ *-siemens)
+ os=sysv4
+ ;;
+ *-masscomp)
+ os=rtu
+ ;;
+ f30[01]-fujitsu | f700-fujitsu)
+ os=uxpv
+ ;;
+ *-rom68k)
+ os=coff
+ ;;
+ *-*bug)
+ os=coff
+ ;;
+ *-apple)
+ os=macos
+ ;;
+ *-atari*)
+ os=mint
+ ;;
+ *-wrs)
+ os=vxworks
+ ;;
+ *)
+ os=none
+ ;;
+esac
+
+fi
+
+# Now, validate our (potentially fixed-up) OS.
+case $os in
+ # Sometimes we do "kernel-libc", so those need to count as OSes.
+ musl* | newlib* | relibc* | uclibc*)
+ ;;
+ # Likewise for "kernel-abi"
+ eabi* | gnueabi*)
+ ;;
+ # VxWorks passes extra cpu info in the 4th filed.
+ simlinux | simwindows | spe)
+ ;;
+ # Now accept the basic system types.
+ # The portable systems comes first.
+ # Each alternative MUST end in a * to match a version number.
+ gnu* | android* | bsd* | mach* | minix* | genix* | ultrix* | irix* \
+ | *vms* | esix* | aix* | cnk* | sunos | sunos[34]* \
+ | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \
+ | sym* | plan9* | psp* | sim* | xray* | os68k* | v88r* \
+ | hiux* | abug | nacl* | netware* | windows* \
+ | os9* | macos* | osx* | ios* \
+ | mpw* | magic* | mmixware* | mon960* | lnews* \
+ | amigaos* | amigados* | msdos* | newsos* | unicos* | aof* \
+ | aos* | aros* | cloudabi* | sortix* | twizzler* \
+ | nindy* | vxsim* | vxworks* | ebmon* | hms* | mvs* \
+ | clix* | riscos* | uniplus* | iris* | isc* | rtu* | xenix* \
+ | mirbsd* | netbsd* | dicos* | openedition* | ose* \
+ | bitrig* | openbsd* | secbsd* | solidbsd* | libertybsd* | os108* \
+ | ekkobsd* | freebsd* | riscix* | lynxos* | os400* \
+ | bosx* | nextstep* | cxux* | aout* | elf* | oabi* \
+ | ptx* | coff* | ecoff* | winnt* | domain* | vsta* \
+ | udi* | lites* | ieee* | go32* | aux* | hcos* \
+ | chorusrdb* | cegcc* | glidix* | serenity* \
+ | cygwin* | msys* | pe* | moss* | proelf* | rtems* \
+ | midipix* | mingw32* | mingw64* | mint* \
+ | uxpv* | beos* | mpeix* | udk* | moxiebox* \
+ | interix* | uwin* | mks* | rhapsody* | darwin* \
+ | openstep* | oskit* | conix* | pw32* | nonstopux* \
+ | storm-chaos* | tops10* | tenex* | tops20* | its* \
+ | os2* | vos* | palmos* | uclinux* | nucleus* | morphos* \
+ | scout* | superux* | sysv* | rtmk* | tpf* | windiss* \
+ | powermax* | dnix* | nx6 | nx7 | sei* | dragonfly* \
+ | skyos* | haiku* | rdos* | toppers* | drops* | es* \
+ | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \
+ | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \
+ | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx* | zephyr*)
+ ;;
+ # This one is extra strict with allowed versions
+ sco3.2v2 | sco3.2v[4-9]* | sco5v6*)
+ # Don't forget version if it is 3.2v4 or newer.
+ ;;
+ none)
+ ;;
+ *)
+ echo Invalid configuration \`"$1"\': OS \`"$os"\' not recognized 1>&2
+ exit 1
+ ;;
+esac
+
+# As a final step for OS-related things, validate the OS-kernel combination
+# (given a valid OS), if there is a kernel.
+case $kernel-$os in
+ linux-gnu* | linux-dietlibc* | linux-android* | linux-newlib* \
+ | linux-musl* | linux-relibc* | linux-uclibc* )
+ ;;
+ uclinux-uclibc* )
+ ;;
+ -dietlibc* | -newlib* | -musl* | -relibc* | -uclibc* )
+ # These are just libc implementations, not actual OSes, and thus
+ # require a kernel.
+ echo "Invalid configuration \`$1': libc \`$os' needs explicit kernel." 1>&2
+ exit 1
+ ;;
+ kfreebsd*-gnu* | kopensolaris*-gnu*)
+ ;;
+ vxworks-simlinux | vxworks-simwindows | vxworks-spe)
+ ;;
+ nto-qnx*)
+ ;;
+ os2-emx)
+ ;;
+ *-eabi* | *-gnueabi*)
+ ;;
+ -*)
+ # Blank kernel with real OS is always fine.
+ ;;
+ *-*)
+ echo "Invalid configuration \`$1': Kernel \`$kernel' not known to work with OS \`$os'." 1>&2
+ exit 1
+ ;;
+esac
+
+# Here we handle the case where we know the os, and the CPU type, but not the
+# manufacturer. We pick the logical manufacturer.
+case $vendor in
+ unknown)
+ case $cpu-$os in
+ *-riscix*)
+ vendor=acorn
+ ;;
+ *-sunos*)
+ vendor=sun
+ ;;
+ *-cnk* | *-aix*)
+ vendor=ibm
+ ;;
+ *-beos*)
+ vendor=be
+ ;;
+ *-hpux*)
+ vendor=hp
+ ;;
+ *-mpeix*)
+ vendor=hp
+ ;;
+ *-hiux*)
+ vendor=hitachi
+ ;;
+ *-unos*)
+ vendor=crds
+ ;;
+ *-dgux*)
+ vendor=dg
+ ;;
+ *-luna*)
+ vendor=omron
+ ;;
+ *-genix*)
+ vendor=ns
+ ;;
+ *-clix*)
+ vendor=intergraph
+ ;;
+ *-mvs* | *-opened*)
+ vendor=ibm
+ ;;
+ *-os400*)
+ vendor=ibm
+ ;;
+ s390-* | s390x-*)
+ vendor=ibm
+ ;;
+ *-ptx*)
+ vendor=sequent
+ ;;
+ *-tpf*)
+ vendor=ibm
+ ;;
+ *-vxsim* | *-vxworks* | *-windiss*)
+ vendor=wrs
+ ;;
+ *-aux*)
+ vendor=apple
+ ;;
+ *-hms*)
+ vendor=hitachi
+ ;;
+ *-mpw* | *-macos*)
+ vendor=apple
+ ;;
+ *-*mint | *-mint[0-9]* | *-*MiNT | *-MiNT[0-9]*)
+ vendor=atari
+ ;;
+ *-vos*)
+ vendor=stratus
+ ;;
+ esac
+ ;;
+esac
+
+echo "$cpu-$vendor-${kernel:+$kernel-}$os"
+exit
+
+# Local variables:
+# eval: (add-hook 'before-save-hook 'time-stamp)
+# time-stamp-start: "timestamp='"
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:
diff --git a/language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/configure b/language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/configure
index 3efefcaa2e..4fb6d6b7ce 100755
--- a/language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/configure
+++ b/language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/configure
@@ -1,9 +1,10 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69.
+# Generated by GNU Autoconf 2.71.
#
#
-# Copyright (C) 1992-1996, 1998-2015 Free Software Foundation, Inc.
+# Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation,
+# Inc.
#
#
# This configure script is free software; the Free Software Foundation
@@ -14,14 +15,16 @@
# Be more Bourne compatible
DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+as_nop=:
+if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1
+then :
emulate sh
NULLCMD=:
# Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
-else
+else $as_nop
case `(set -o) 2>/dev/null` in #(
*posix*) :
set -o posix ;; #(
@@ -31,46 +34,46 @@ esac
fi
+
+# Reset variables that may have inherited troublesome values from
+# the environment.
+
+# IFS needs to be set, to space, tab, and newline, in precisely that order.
+# (If _AS_PATH_WALK were called with IFS unset, it would have the
+# side effect of setting IFS to empty, thus disabling word splitting.)
+# Quoting is to prevent editors from complaining about space-tab.
as_nl='
'
export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-# Prefer a ksh shell builtin over an external printf program on Solaris,
-# but without wasting forks for bash or zsh.
-if test -z "$BASH_VERSION$ZSH_VERSION" \
- && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
- as_echo='print -r --'
- as_echo_n='print -rn --'
-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
- as_echo='printf %s\n'
- as_echo_n='printf %s'
-else
- if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
- as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
- as_echo_n='/usr/ucb/echo -n'
- else
- as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
- as_echo_n_body='eval
- arg=$1;
- case $arg in #(
- *"$as_nl"*)
- expr "X$arg" : "X\\(.*\\)$as_nl";
- arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
- esac;
- expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
- '
- export as_echo_n_body
- as_echo_n='sh -c $as_echo_n_body as_echo'
- fi
- export as_echo_body
- as_echo='sh -c $as_echo_body as_echo'
-fi
+IFS=" "" $as_nl"
+
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# Ensure predictable behavior from utilities with locale-dependent output.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# We cannot yet rely on "unset" to work, but we need these variables
+# to be unset--not just set to an empty or harmless value--now, to
+# avoid bugs in old shells (e.g. pre-3.0 UWIN ksh). This construct
+# also avoids known problems related to "unset" and subshell syntax
+# in other old shells (e.g. bash 2.01 and pdksh 5.2.14).
+for as_var in BASH_ENV ENV MAIL MAILPATH CDPATH
+do eval test \${$as_var+y} \
+ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+done
+
+# Ensure that fds 0, 1, and 2 are open.
+if (exec 3>&0) 2>/dev/null; then :; else exec 0</dev/null; fi
+if (exec 3>&1) 2>/dev/null; then :; else exec 1>/dev/null; fi
+if (exec 3>&2) ; then :; else exec 2>/dev/null; fi
# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
+if ${PATH_SEPARATOR+false} :; then
PATH_SEPARATOR=:
(PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
(PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
@@ -79,13 +82,6 @@ if test "${PATH_SEPARATOR+set}" != set; then
fi
-# IFS
-# We need space, tab and new line, in precisely that order. Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-IFS=" "" $as_nl"
-
# Find who we are. Look in the path if we contain no directory separator.
as_myself=
case $0 in #((
@@ -94,8 +90,12 @@ case $0 in #((
for as_dir in $PATH
do
IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+ case $as_dir in #(((
+ '') as_dir=./ ;;
+ */) ;;
+ *) as_dir=$as_dir/ ;;
+ esac
+ test -r "$as_dir$0" && as_myself=$as_dir$0 && break
done
IFS=$as_save_IFS
@@ -107,30 +107,10 @@ if test "x$as_myself" = x; then
as_myself=$0
fi
if test ! -f "$as_myself"; then
- $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+ printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
exit 1
fi
-# Unset variables that we do not need and which cause bugs (e.g. in
-# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1"
-# suppresses any "Segmentation fault" message there. '((' could
-# trigger a bug in pdksh 5.2.14.
-for as_var in BASH_ENV ENV MAIL MAILPATH
-do eval test x\${$as_var+set} = xset \
- && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# CDPATH.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
# Use a proper internal environment variable to ensure we don't fall
# into an infinite loop, continuously re-executing ourselves.
@@ -152,20 +132,22 @@ esac
exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
# Admittedly, this is quite paranoid, since all the known shells bail
# out after a failed `exec'.
-$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
-as_fn_exit 255
+printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
fi
# We don't want this to propagate to other subprocesses.
{ _as_can_reexec=; unset _as_can_reexec;}
if test "x$CONFIG_SHELL" = x; then
- as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
+ as_bourne_compatible="as_nop=:
+if test \${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1
+then :
emulate sh
NULLCMD=:
# Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
# is contrary to our usage. Disable this feature.
alias -g '\${1+\"\$@\"}'='\"\$@\"'
setopt NO_GLOB_SUBST
-else
+else \$as_nop
case \`(set -o) 2>/dev/null\` in #(
*posix*) :
set -o posix ;; #(
@@ -185,42 +167,52 @@ as_fn_success || { exitcode=1; echo as_fn_success failed.; }
as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
-if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
+if ( set x; as_fn_ret_success y && test x = \"\$1\" )
+then :
-else
+else \$as_nop
exitcode=1; echo positional parameters were not saved.
fi
test x\$exitcode = x0 || exit 1
+blah=\$(echo \$(echo blah))
+test x\"\$blah\" = xblah || exit 1
test -x / || exit 1"
as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
- test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
-test \$(( 1 + 1 )) = 2 || exit 1"
- if (eval "$as_required") 2>/dev/null; then :
+ test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1"
+ if (eval "$as_required") 2>/dev/null
+then :
as_have_required=yes
-else
+else $as_nop
as_have_required=no
fi
- if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
+ if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null
+then :
-else
+else $as_nop
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
as_found=false
for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
do
IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
+ case $as_dir in #(((
+ '') as_dir=./ ;;
+ */) ;;
+ *) as_dir=$as_dir/ ;;
+ esac
as_found=:
case $as_dir in #(
/*)
for as_base in sh bash ksh sh5; do
# Try only shells that exist, to save several forks.
- as_shell=$as_dir/$as_base
+ as_shell=$as_dir$as_base
if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
- { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
+ as_run=a "$as_shell" -c "$as_bourne_compatible""$as_required" 2>/dev/null
+then :
CONFIG_SHELL=$as_shell as_have_required=yes
- if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
+ if as_run=a "$as_shell" -c "$as_bourne_compatible""$as_suggested" 2>/dev/null
+then :
break 2
fi
fi
@@ -228,14 +220,21 @@ fi
esac
as_found=false
done
-$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
- { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
- CONFIG_SHELL=$SHELL as_have_required=yes
-fi; }
IFS=$as_save_IFS
+if $as_found
+then :
+
+else $as_nop
+ if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
+ as_run=a "$SHELL" -c "$as_bourne_compatible""$as_required" 2>/dev/null
+then :
+ CONFIG_SHELL=$SHELL as_have_required=yes
+fi
+fi
- if test "x$CONFIG_SHELL" != x; then :
+ if test "x$CONFIG_SHELL" != x
+then :
export CONFIG_SHELL
# We cannot yet assume a decent shell, so we have to provide a
# neutralization value for shells without unset; and this also
@@ -253,18 +252,19 @@ esac
exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
# Admittedly, this is quite paranoid, since all the known shells bail
# out after a failed `exec'.
-$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2
exit 255
fi
- if test x$as_have_required = xno; then :
- $as_echo "$0: This script requires a shell more modern than all"
- $as_echo "$0: the shells that I found on your system."
- if test x${ZSH_VERSION+set} = xset ; then
- $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
- $as_echo "$0: be upgraded to zsh 4.3.4 or later."
+ if test x$as_have_required = xno
+then :
+ printf "%s\n" "$0: This script requires a shell more modern than all"
+ printf "%s\n" "$0: the shells that I found on your system."
+ if test ${ZSH_VERSION+y} ; then
+ printf "%s\n" "$0: In particular, zsh $ZSH_VERSION has bugs and should"
+ printf "%s\n" "$0: be upgraded to zsh 4.3.4 or later."
else
- $as_echo "$0: Please tell bug-autoconf@gnu.org about your system,
+ printf "%s\n" "$0: Please tell bug-autoconf@gnu.org about your system,
$0: including any error possibly output before this
$0: message. Then install a modern shell, or manually run
$0: the script under such a shell if you do have one."
@@ -291,6 +291,7 @@ as_fn_unset ()
}
as_unset=as_fn_unset
+
# as_fn_set_status STATUS
# -----------------------
# Set $? to STATUS, without forking.
@@ -308,6 +309,14 @@ as_fn_exit ()
as_fn_set_status $1
exit $1
} # as_fn_exit
+# as_fn_nop
+# ---------
+# Do nothing but, unlike ":", preserve the value of $?.
+as_fn_nop ()
+{
+ return $?
+}
+as_nop=as_fn_nop
# as_fn_mkdir_p
# -------------
@@ -322,7 +331,7 @@ as_fn_mkdir_p ()
as_dirs=
while :; do
case $as_dir in #(
- *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+ *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
*) as_qdir=$as_dir;;
esac
as_dirs="'$as_qdir' $as_dirs"
@@ -331,7 +340,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$as_dir" : 'X\(//\)[^/]' \| \
X"$as_dir" : 'X\(//\)$' \| \
X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
+printf "%s\n" X"$as_dir" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
@@ -370,12 +379,13 @@ as_fn_executable_p ()
# advantage of any shell optimizations that allow amortized linear growth over
# repeated appends, instead of the typical quadratic growth present in naive
# implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null
+then :
eval 'as_fn_append ()
{
eval $1+=\$2
}'
-else
+else $as_nop
as_fn_append ()
{
eval $1=\$$1\$2
@@ -387,18 +397,27 @@ fi # as_fn_append
# Perform arithmetic evaluation on the ARGs, and store the result in the
# global $as_val. Take advantage of shells that can avoid forks. The arguments
# must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null
+then :
eval 'as_fn_arith ()
{
as_val=$(( $* ))
}'
-else
+else $as_nop
as_fn_arith ()
{
as_val=`expr "$@" || test $? -eq 1`
}
fi # as_fn_arith
+# as_fn_nop
+# ---------
+# Do nothing but, unlike ":", preserve the value of $?.
+as_fn_nop ()
+{
+ return $?
+}
+as_nop=as_fn_nop
# as_fn_error STATUS ERROR [LINENO LOG_FD]
# ----------------------------------------
@@ -410,9 +429,9 @@ as_fn_error ()
as_status=$1; test $as_status -eq 0 && as_status=1
if test "$4"; then
as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
fi
- $as_echo "$as_me: error: $2" >&2
+ printf "%s\n" "$as_me: error: $2" >&2
as_fn_exit $as_status
} # as_fn_error
@@ -439,7 +458,7 @@ as_me=`$as_basename -- "$0" ||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
+printf "%s\n" X/"$0" |
sed '/^.*\/\([^/][^/]*\)\/*$/{
s//\1/
q
@@ -483,7 +502,7 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
s/-\n.*//
' >$as_me.lineno &&
chmod +x "$as_me.lineno" ||
- { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+ { printf "%s\n" "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
# If we had to re-execute with $CONFIG_SHELL, we're ensured to have
# already done that, so ensure we don't try to do so again and fall
@@ -497,6 +516,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
exit
}
+
+# Determine whether it's possible to make 'echo' print without a newline.
+# These variables are no longer used directly by Autoconf, but are AC_SUBSTed
+# for compatibility with existing Makefiles.
ECHO_C= ECHO_N= ECHO_T=
case `echo -n x` in #(((((
-n*)
@@ -510,6 +533,13 @@ case `echo -n x` in #(((((
ECHO_N='-n';;
esac
+# For backward compatibility with old third-party macros, we provide
+# the shell variables $as_echo and $as_echo_n. New code should use
+# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively.
+as_echo='printf %s\n'
+as_echo_n='printf %s'
+
+
rm -f conf$$ conf$$.exe conf$$.file
if test -d conf$$.dir; then
rm -f conf$$.dir/conf$$.file
@@ -575,50 +605,47 @@ MFLAGS=
MAKEFLAGS=
# Identity of this package.
-PACKAGE_NAME=
-PACKAGE_TARNAME=
-PACKAGE_VERSION=
-PACKAGE_STRING=
-PACKAGE_BUGREPORT=
-PACKAGE_URL=
+PACKAGE_NAME=''
+PACKAGE_TARNAME=''
+PACKAGE_VERSION=''
+PACKAGE_STRING=''
+PACKAGE_BUGREPORT=''
+PACKAGE_URL=''
ac_unique_file="hbf.h"
# Factoring default headers for most tests.
ac_includes_default="\
-#include <stdio.h>
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
+#include <stddef.h>
+#ifdef HAVE_STDIO_H
+# include <stdio.h>
#endif
-#ifdef STDC_HEADERS
+#ifdef HAVE_STDLIB_H
# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-# include <stdlib.h>
-# endif
#endif
#ifdef HAVE_STRING_H
-# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
-# include <memory.h>
-# endif
# include <string.h>
#endif
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
#ifdef HAVE_INTTYPES_H
# include <inttypes.h>
#endif
#ifdef HAVE_STDINT_H
# include <stdint.h>
#endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_STAT_H
+# include <sys/stat.h>
+#endif
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif"
+ac_header_c_list=
+ac_func_c_list=
ac_subst_vars='LTLIBOBJS
LIBOBJS
INSTALL_DATA
@@ -627,9 +654,6 @@ INSTALL_PROGRAM
RM
no_strdup
XX_CFLAGS
-EGREP
-GREP
-CPP
OBJEXT
EXEEXT
ac_ct_CC
@@ -668,6 +692,7 @@ infodir
docdir
oldincludedir
includedir
+runstatedir
localstatedir
sharedstatedir
sysconfdir
@@ -700,8 +725,7 @@ CC
CFLAGS
LDFLAGS
LIBS
-CPPFLAGS
-CPP'
+CPPFLAGS'
# Initialize some variables set by options.
@@ -740,6 +764,7 @@ datadir='${datarootdir}'
sysconfdir='${prefix}/etc'
sharedstatedir='${prefix}/com'
localstatedir='${prefix}/var'
+runstatedir='${localstatedir}/run'
includedir='${prefix}/include'
oldincludedir='/usr/include'
docdir='${datarootdir}/doc/${PACKAGE}'
@@ -769,8 +794,6 @@ do
*) ac_optarg=yes ;;
esac
- # Accept the important Cygnus configure options, so we can diagnose typos.
-
case $ac_dashdash$ac_option in
--)
ac_dashdash=yes ;;
@@ -811,9 +834,9 @@ do
ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- as_fn_error $? "invalid feature name: $ac_useropt"
+ as_fn_error $? "invalid feature name: \`$ac_useropt'"
ac_useropt_orig=$ac_useropt
- ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+ ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
*"
"enable_$ac_useropt"
@@ -837,9 +860,9 @@ do
ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- as_fn_error $? "invalid feature name: $ac_useropt"
+ as_fn_error $? "invalid feature name: \`$ac_useropt'"
ac_useropt_orig=$ac_useropt
- ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+ ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
*"
"enable_$ac_useropt"
@@ -992,6 +1015,15 @@ do
| -silent | --silent | --silen | --sile | --sil)
silent=yes ;;
+ -runstatedir | --runstatedir | --runstatedi | --runstated \
+ | --runstate | --runstat | --runsta | --runst | --runs \
+ | --run | --ru | --r)
+ ac_prev=runstatedir ;;
+ -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
+ | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
+ | --run=* | --ru=* | --r=*)
+ runstatedir=$ac_optarg ;;
+
-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
ac_prev=sbindir ;;
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1041,9 +1073,9 @@ do
ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- as_fn_error $? "invalid package name: $ac_useropt"
+ as_fn_error $? "invalid package name: \`$ac_useropt'"
ac_useropt_orig=$ac_useropt
- ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+ ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
*"
"with_$ac_useropt"
@@ -1057,9 +1089,9 @@ do
ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- as_fn_error $? "invalid package name: $ac_useropt"
+ as_fn_error $? "invalid package name: \`$ac_useropt'"
ac_useropt_orig=$ac_useropt
- ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+ ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
*"
"with_$ac_useropt"
@@ -1103,9 +1135,9 @@ Try \`$0 --help' for more information"
*)
# FIXME: should be removed in autoconf 3.0.
- $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+ printf "%s\n" "$as_me: WARNING: you should use --build, --host, --target" >&2
expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
- $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+ printf "%s\n" "$as_me: WARNING: invalid host type: $ac_option" >&2
: "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
;;
@@ -1121,7 +1153,7 @@ if test -n "$ac_unrecognized_opts"; then
case $enable_option_checking in
no) ;;
fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
- *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+ *) printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
esac
fi
@@ -1129,7 +1161,7 @@ fi
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
datadir sysconfdir sharedstatedir localstatedir includedir \
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
- libdir localedir mandir
+ libdir localedir mandir runstatedir
do
eval ac_val=\$$ac_var
# Remove trailing slashes.
@@ -1185,7 +1217,7 @@ $as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$as_myself" : 'X\(//\)[^/]' \| \
X"$as_myself" : 'X\(//\)$' \| \
X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_myself" |
+printf "%s\n" X"$as_myself" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
@@ -1282,6 +1314,7 @@ Fine tuning of the installation directories:
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
+ --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
--libdir=DIR object code libraries [EPREFIX/lib]
--includedir=DIR C header files [PREFIX/include]
--oldincludedir=DIR C header files for non-gcc [/usr/include]
@@ -1326,7 +1359,6 @@ Some influential environment variables:
LIBS libraries to pass to the linker, e.g. -l<library>
CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
you have headers in a nonstandard directory <include dir>
- CPP C preprocessor
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
@@ -1347,9 +1379,9 @@ if test "$ac_init_help" = "recursive"; then
case "$ac_dir" in
.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
*)
- ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+ ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'`
# A ".." for each directory in $ac_dir_suffix.
- ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+ ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
case $ac_top_builddir_sub in
"") ac_top_builddir_sub=. ac_top_build_prefix= ;;
*) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -1377,7 +1409,8 @@ esac
ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
cd "$ac_dir" || { ac_status=$?; continue; }
- # Check for guested configure.
+ # Check for configure.gnu first; this name is used for a wrapper for
+ # Metaconfig's "Configure" on case-insensitive file systems.
if test -f "$ac_srcdir/configure.gnu"; then
echo &&
$SHELL "$ac_srcdir/configure.gnu" --help=recursive
@@ -1385,7 +1418,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
echo &&
$SHELL "$ac_srcdir/configure" --help=recursive
else
- $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+ printf "%s\n" "$as_me: WARNING: no configuration information is in $ac_dir" >&2
fi || ac_status=$?
cd "$ac_pwd" || { ac_status=$?; break; }
done
@@ -1395,9 +1428,9 @@ test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
configure
-generated by GNU Autoconf 2.69
+generated by GNU Autoconf 2.71
-Copyright (C) 2012 Free Software Foundation, Inc.
+Copyright (C) 2021 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it.
_ACEOF
@@ -1414,14 +1447,14 @@ fi
ac_fn_c_try_compile ()
{
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- rm -f conftest.$ac_objext
+ rm -f conftest.$ac_objext conftest.beam
if { { ac_try="$ac_compile"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
(eval "$ac_compile") 2>conftest.err
ac_status=$?
if test -s conftest.err; then
@@ -1429,14 +1462,15 @@ $as_echo "$ac_try_echo"; } >&5
cat conftest.er1 >&5
mv -f conftest.er1 conftest.err
fi
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest.$ac_objext; then :
+ } && test -s conftest.$ac_objext
+then :
ac_retval=0
-else
- $as_echo "$as_me: failed program was:" >&5
+else $as_nop
+ printf "%s\n" "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_retval=1
@@ -1446,99 +1480,20 @@ fi
} # ac_fn_c_try_compile
-# ac_fn_c_try_cpp LINENO
-# ----------------------
-# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_cpp ()
-{
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- if { { ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
- ac_status=$?
- if test -s conftest.err; then
- grep -v '^ *+' conftest.err >conftest.er1
- cat conftest.er1 >&5
- mv -f conftest.er1 conftest.err
- fi
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; } > conftest.i && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then :
- ac_retval=0
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_retval=1
-fi
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
- as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_cpp
-
-# ac_fn_c_try_run LINENO
-# ----------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
-# that executables *can* be run.
-ac_fn_c_try_run ()
-{
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- if { { ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
- { { case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; }; then :
- ac_retval=0
-else
- $as_echo "$as_me: program exited with status $ac_status" >&5
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_retval=$ac_status
-fi
- rm -rf conftest.dSYM conftest_ipa8_conftest.oo
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
- as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_run
-
# ac_fn_c_try_link LINENO
# -----------------------
# Try to link conftest.$ac_ext, and return whether this succeeded.
ac_fn_c_try_link ()
{
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- rm -f conftest.$ac_objext conftest$ac_exeext
+ rm -f conftest.$ac_objext conftest.beam conftest$ac_exeext
if { { ac_try="$ac_link"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
(eval "$ac_link") 2>conftest.err
ac_status=$?
if test -s conftest.err; then
@@ -1546,17 +1501,18 @@ $as_echo "$ac_try_echo"; } >&5
cat conftest.er1 >&5
mv -f conftest.er1 conftest.err
fi
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest$ac_exeext && {
test "$cross_compiling" = yes ||
test -x conftest$ac_exeext
- }; then :
+ }
+then :
ac_retval=0
-else
- $as_echo "$as_me: failed program was:" >&5
+else $as_nop
+ printf "%s\n" "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_retval=1
@@ -1571,93 +1527,6 @@ fi
} # ac_fn_c_try_link
-# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
-# -------------------------------------------------------
-# Tests whether HEADER exists, giving a warning if it cannot be compiled using
-# the include files in INCLUDES and setting the cache variable VAR
-# accordingly.
-ac_fn_c_check_header_mongrel ()
-{
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- if eval \${$3+:} false; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
- $as_echo_n "(cached) " >&6
-fi
-eval ac_res=\$$3
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
- # Is the header compilable?
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
-$as_echo_n "checking $2 usability... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-$4
-#include <$2>
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_header_compiler=yes
-else
- ac_header_compiler=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
-$as_echo_n "checking $2 presence... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <$2>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
- ac_header_preproc=yes
-else
- ac_header_preproc=no
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
- yes:no: )
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
- ;;
- no:yes:* )
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;}
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
- ;;
-esac
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- eval "$3=\$ac_header_compiler"
-fi
-eval ac_res=\$$3
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-fi
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_c_check_header_mongrel
-
# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
# -------------------------------------------------------
# Tests whether HEADER exists and can be compiled using the include files in
@@ -1665,26 +1534,28 @@ fi
ac_fn_c_check_header_compile ()
{
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
- $as_echo_n "(cached) " >&6
-else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+printf %s "checking for $2... " >&6; }
+if eval test \${$3+y}
+then :
+ printf %s "(cached) " >&6
+else $as_nop
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
$4
#include <$2>
_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
eval "$3=yes"
-else
+else $as_nop
eval "$3=no"
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
eval ac_res=\$$3
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
} # ac_fn_c_check_header_compile
@@ -1695,11 +1566,12 @@ $as_echo "$ac_res" >&6; }
ac_fn_c_check_func ()
{
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
- $as_echo_n "(cached) " >&6
-else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+printf %s "checking for $2... " >&6; }
+if eval test \${$3+y}
+then :
+ printf %s "(cached) " >&6
+else $as_nop
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
@@ -1707,16 +1579,9 @@ else
#define $2 innocuous_$2
/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $2 (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
+ which can conflict with char $2 (); below. */
+#include <limits.h>
#undef $2
/* Override any GCC internal prototype to avoid an error.
@@ -1734,35 +1599,56 @@ choke me
#endif
int
-main ()
+main (void)
{
return $2 ();
;
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
eval "$3=yes"
-else
+else $as_nop
eval "$3=no"
fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
conftest$ac_exeext conftest.$ac_ext
fi
eval ac_res=\$$3
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
} # ac_fn_c_check_func
+ac_configure_args_raw=
+for ac_arg
+do
+ case $ac_arg in
+ *\'*)
+ ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+ esac
+ as_fn_append ac_configure_args_raw " '$ac_arg'"
+done
+
+case $ac_configure_args_raw in
+ *$as_nl*)
+ ac_safe_unquote= ;;
+ *)
+ ac_unsafe_z='|&;<>()$`\\"*?[ '' ' # This string ends in space, tab.
+ ac_unsafe_a="$ac_unsafe_z#~"
+ ac_safe_unquote="s/ '\\([^$ac_unsafe_a][^$ac_unsafe_z]*\\)'/ \\1/g"
+ ac_configure_args_raw=` printf "%s\n" "$ac_configure_args_raw" | sed "$ac_safe_unquote"`;;
+esac
+
cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by $as_me, which was
-generated by GNU Autoconf 2.69. Invocation command line was
+generated by GNU Autoconf 2.71. Invocation command line was
- $ $0 $@
+ $ $0$ac_configure_args_raw
_ACEOF
exec 5>>config.log
@@ -1795,8 +1681,12 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- $as_echo "PATH: $as_dir"
+ case $as_dir in #(((
+ '') as_dir=./ ;;
+ */) ;;
+ *) as_dir=$as_dir/ ;;
+ esac
+ printf "%s\n" "PATH: $as_dir"
done
IFS=$as_save_IFS
@@ -1831,7 +1721,7 @@ do
| -silent | --silent | --silen | --sile | --sil)
continue ;;
*\'*)
- ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+ ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
case $ac_pass in
1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
@@ -1866,11 +1756,13 @@ done
# WARNING: Use '\'' to represent an apostrophe within the trap.
# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
trap 'exit_status=$?
+ # Sanitize IFS.
+ IFS=" "" $as_nl"
# Save into config.log some information that might help in debugging.
{
echo
- $as_echo "## ---------------- ##
+ printf "%s\n" "## ---------------- ##
## Cache variables. ##
## ---------------- ##"
echo
@@ -1881,8 +1773,8 @@ trap 'exit_status=$?
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
- *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+ *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
esac
case $ac_var in #(
_ | IFS | as_nl) ;; #(
@@ -1906,7 +1798,7 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
)
echo
- $as_echo "## ----------------- ##
+ printf "%s\n" "## ----------------- ##
## Output variables. ##
## ----------------- ##"
echo
@@ -1914,14 +1806,14 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
do
eval ac_val=\$$ac_var
case $ac_val in
- *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+ *\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
esac
- $as_echo "$ac_var='\''$ac_val'\''"
+ printf "%s\n" "$ac_var='\''$ac_val'\''"
done | sort
echo
if test -n "$ac_subst_files"; then
- $as_echo "## ------------------- ##
+ printf "%s\n" "## ------------------- ##
## File substitutions. ##
## ------------------- ##"
echo
@@ -1929,15 +1821,15 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
do
eval ac_val=\$$ac_var
case $ac_val in
- *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+ *\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
esac
- $as_echo "$ac_var='\''$ac_val'\''"
+ printf "%s\n" "$ac_var='\''$ac_val'\''"
done | sort
echo
fi
if test -s confdefs.h; then
- $as_echo "## ----------- ##
+ printf "%s\n" "## ----------- ##
## confdefs.h. ##
## ----------- ##"
echo
@@ -1945,8 +1837,8 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
echo
fi
test "$ac_signal" != 0 &&
- $as_echo "$as_me: caught signal $ac_signal"
- $as_echo "$as_me: exit $exit_status"
+ printf "%s\n" "$as_me: caught signal $ac_signal"
+ printf "%s\n" "$as_me: exit $exit_status"
} >&5
rm -f core *.core core.conftest.* &&
rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
@@ -1960,63 +1852,48 @@ ac_signal=0
# confdefs.h avoids OS command line length limits that DEFS can exceed.
rm -f -r conftest* confdefs.h
-$as_echo "/* confdefs.h */" > confdefs.h
+printf "%s\n" "/* confdefs.h */" > confdefs.h
# Predefined preprocessor variables.
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_NAME "$PACKAGE_NAME"
-_ACEOF
+printf "%s\n" "#define PACKAGE_NAME \"$PACKAGE_NAME\"" >>confdefs.h
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
-_ACEOF
+printf "%s\n" "#define PACKAGE_TARNAME \"$PACKAGE_TARNAME\"" >>confdefs.h
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_VERSION "$PACKAGE_VERSION"
-_ACEOF
+printf "%s\n" "#define PACKAGE_VERSION \"$PACKAGE_VERSION\"" >>confdefs.h
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_STRING "$PACKAGE_STRING"
-_ACEOF
+printf "%s\n" "#define PACKAGE_STRING \"$PACKAGE_STRING\"" >>confdefs.h
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
-_ACEOF
+printf "%s\n" "#define PACKAGE_BUGREPORT \"$PACKAGE_BUGREPORT\"" >>confdefs.h
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_URL "$PACKAGE_URL"
-_ACEOF
+printf "%s\n" "#define PACKAGE_URL \"$PACKAGE_URL\"" >>confdefs.h
# Let the site file select an alternate cache file if it wants to.
# Prefer an explicitly selected file to automatically selected ones.
-ac_site_file1=NONE
-ac_site_file2=NONE
if test -n "$CONFIG_SITE"; then
- # We do not want a PATH search for config.site.
- case $CONFIG_SITE in #((
- -*) ac_site_file1=./$CONFIG_SITE;;
- */*) ac_site_file1=$CONFIG_SITE;;
- *) ac_site_file1=./$CONFIG_SITE;;
- esac
+ ac_site_files="$CONFIG_SITE"
elif test "x$prefix" != xNONE; then
- ac_site_file1=$prefix/share/config.site
- ac_site_file2=$prefix/etc/config.site
+ ac_site_files="$prefix/share/config.site $prefix/etc/config.site"
else
- ac_site_file1=$ac_default_prefix/share/config.site
- ac_site_file2=$ac_default_prefix/etc/config.site
+ ac_site_files="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
fi
-for ac_site_file in "$ac_site_file1" "$ac_site_file2"
+
+for ac_site_file in $ac_site_files
do
- test "x$ac_site_file" = xNONE && continue
- if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
-$as_echo "$as_me: loading site script $ac_site_file" >&6;}
+ case $ac_site_file in #(
+ */*) :
+ ;; #(
+ *) :
+ ac_site_file=./$ac_site_file ;;
+esac
+ if test -f "$ac_site_file" && test -r "$ac_site_file"; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
+printf "%s\n" "$as_me: loading site script $ac_site_file" >&6;}
sed 's/^/| /' "$ac_site_file" >&5
. "$ac_site_file" \
- || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ || { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "failed to load site script $ac_site_file
See \`config.log' for more details" "$LINENO" 5; }
fi
@@ -2026,19 +1903,435 @@ if test -r "$cache_file"; then
# Some versions of bash will fail to source /dev/null (special files
# actually), so we avoid doing that. DJGPP emulates it as a regular file.
if test /dev/null != "$cache_file" && test -f "$cache_file"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
-$as_echo "$as_me: loading cache $cache_file" >&6;}
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
+printf "%s\n" "$as_me: loading cache $cache_file" >&6;}
case $cache_file in
[\\/]* | ?:[\\/]* ) . "$cache_file";;
*) . "./$cache_file";;
esac
fi
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
-$as_echo "$as_me: creating cache $cache_file" >&6;}
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
+printf "%s\n" "$as_me: creating cache $cache_file" >&6;}
>$cache_file
fi
+# Test code for whether the C compiler supports C89 (global declarations)
+ac_c_conftest_c89_globals='
+/* Does the compiler advertise C89 conformance?
+ Do not test the value of __STDC__, because some compilers set it to 0
+ while being otherwise adequately conformant. */
+#if !defined __STDC__
+# error "Compiler does not advertise C89 conformance"
+#endif
+
+#include <stddef.h>
+#include <stdarg.h>
+struct stat;
+/* Most of the following tests are stolen from RCS 5.7 src/conf.sh. */
+struct buf { int x; };
+struct buf * (*rcsopen) (struct buf *, struct stat *, int);
+static char *e (p, i)
+ char **p;
+ int i;
+{
+ return p[i];
+}
+static char *f (char * (*g) (char **, int), char **p, ...)
+{
+ char *s;
+ va_list v;
+ va_start (v,p);
+ s = g (p, va_arg (v,int));
+ va_end (v);
+ return s;
+}
+
+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
+ function prototypes and stuff, but not \xHH hex character constants.
+ These do not provoke an error unfortunately, instead are silently treated
+ as an "x". The following induces an error, until -std is added to get
+ proper ANSI mode. Curiously \x00 != x always comes out true, for an
+ array size at least. It is necessary to write \x00 == 0 to get something
+ that is true only with -std. */
+int osf4_cc_array ['\''\x00'\'' == 0 ? 1 : -1];
+
+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
+ inside strings and character constants. */
+#define FOO(x) '\''x'\''
+int xlc6_cc_array[FOO(a) == '\''x'\'' ? 1 : -1];
+
+int test (int i, double x);
+struct s1 {int (*f) (int a);};
+struct s2 {int (*f) (double a);};
+int pairnames (int, char **, int *(*)(struct buf *, struct stat *, int),
+ int, int);'
+
+# Test code for whether the C compiler supports C89 (body of main).
+ac_c_conftest_c89_main='
+ok |= (argc == 0 || f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]);
+'
+
+# Test code for whether the C compiler supports C99 (global declarations)
+ac_c_conftest_c99_globals='
+// Does the compiler advertise C99 conformance?
+#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 199901L
+# error "Compiler does not advertise C99 conformance"
+#endif
+
+#include <stdbool.h>
+extern int puts (const char *);
+extern int printf (const char *, ...);
+extern int dprintf (int, const char *, ...);
+extern void *malloc (size_t);
+
+// Check varargs macros. These examples are taken from C99 6.10.3.5.
+// dprintf is used instead of fprintf to avoid needing to declare
+// FILE and stderr.
+#define debug(...) dprintf (2, __VA_ARGS__)
+#define showlist(...) puts (#__VA_ARGS__)
+#define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__))
+static void
+test_varargs_macros (void)
+{
+ int x = 1234;
+ int y = 5678;
+ debug ("Flag");
+ debug ("X = %d\n", x);
+ showlist (The first, second, and third items.);
+ report (x>y, "x is %d but y is %d", x, y);
+}
+
+// Check long long types.
+#define BIG64 18446744073709551615ull
+#define BIG32 4294967295ul
+#define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0)
+#if !BIG_OK
+ #error "your preprocessor is broken"
+#endif
+#if BIG_OK
+#else
+ #error "your preprocessor is broken"
+#endif
+static long long int bignum = -9223372036854775807LL;
+static unsigned long long int ubignum = BIG64;
+
+struct incomplete_array
+{
+ int datasize;
+ double data[];
+};
+
+struct named_init {
+ int number;
+ const wchar_t *name;
+ double average;
+};
+
+typedef const char *ccp;
+
+static inline int
+test_restrict (ccp restrict text)
+{
+ // See if C++-style comments work.
+ // Iterate through items via the restricted pointer.
+ // Also check for declarations in for loops.
+ for (unsigned int i = 0; *(text+i) != '\''\0'\''; ++i)
+ continue;
+ return 0;
+}
+
+// Check varargs and va_copy.
+static bool
+test_varargs (const char *format, ...)
+{
+ va_list args;
+ va_start (args, format);
+ va_list args_copy;
+ va_copy (args_copy, args);
+
+ const char *str = "";
+ int number = 0;
+ float fnumber = 0;
+
+ while (*format)
+ {
+ switch (*format++)
+ {
+ case '\''s'\'': // string
+ str = va_arg (args_copy, const char *);
+ break;
+ case '\''d'\'': // int
+ number = va_arg (args_copy, int);
+ break;
+ case '\''f'\'': // float
+ fnumber = va_arg (args_copy, double);
+ break;
+ default:
+ break;
+ }
+ }
+ va_end (args_copy);
+ va_end (args);
+
+ return *str && number && fnumber;
+}
+'
+
+# Test code for whether the C compiler supports C99 (body of main).
+ac_c_conftest_c99_main='
+ // Check bool.
+ _Bool success = false;
+ success |= (argc != 0);
+
+ // Check restrict.
+ if (test_restrict ("String literal") == 0)
+ success = true;
+ char *restrict newvar = "Another string";
+
+ // Check varargs.
+ success &= test_varargs ("s, d'\'' f .", "string", 65, 34.234);
+ test_varargs_macros ();
+
+ // Check flexible array members.
+ struct incomplete_array *ia =
+ malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10));
+ ia->datasize = 10;
+ for (int i = 0; i < ia->datasize; ++i)
+ ia->data[i] = i * 1.234;
+
+ // Check named initializers.
+ struct named_init ni = {
+ .number = 34,
+ .name = L"Test wide string",
+ .average = 543.34343,
+ };
+
+ ni.number = 58;
+
+ int dynamic_array[ni.number];
+ dynamic_array[0] = argv[0][0];
+ dynamic_array[ni.number - 1] = 543;
+
+ // work around unused variable warnings
+ ok |= (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == '\''x'\''
+ || dynamic_array[ni.number - 1] != 543);
+'
+
+# Test code for whether the C compiler supports C11 (global declarations)
+ac_c_conftest_c11_globals='
+// Does the compiler advertise C11 conformance?
+#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112L
+# error "Compiler does not advertise C11 conformance"
+#endif
+
+// Check _Alignas.
+char _Alignas (double) aligned_as_double;
+char _Alignas (0) no_special_alignment;
+extern char aligned_as_int;
+char _Alignas (0) _Alignas (int) aligned_as_int;
+
+// Check _Alignof.
+enum
+{
+ int_alignment = _Alignof (int),
+ int_array_alignment = _Alignof (int[100]),
+ char_alignment = _Alignof (char)
+};
+_Static_assert (0 < -_Alignof (int), "_Alignof is signed");
+
+// Check _Noreturn.
+int _Noreturn does_not_return (void) { for (;;) continue; }
+
+// Check _Static_assert.
+struct test_static_assert
+{
+ int x;
+ _Static_assert (sizeof (int) <= sizeof (long int),
+ "_Static_assert does not work in struct");
+ long int y;
+};
+
+// Check UTF-8 literals.
+#define u8 syntax error!
+char const utf8_literal[] = u8"happens to be ASCII" "another string";
+
+// Check duplicate typedefs.
+typedef long *long_ptr;
+typedef long int *long_ptr;
+typedef long_ptr long_ptr;
+
+// Anonymous structures and unions -- taken from C11 6.7.2.1 Example 1.
+struct anonymous
+{
+ union {
+ struct { int i; int j; };
+ struct { int k; long int l; } w;
+ };
+ int m;
+} v1;
+'
+
+# Test code for whether the C compiler supports C11 (body of main).
+ac_c_conftest_c11_main='
+ _Static_assert ((offsetof (struct anonymous, i)
+ == offsetof (struct anonymous, w.k)),
+ "Anonymous union alignment botch");
+ v1.i = 2;
+ v1.w.k = 5;
+ ok |= v1.i != 5;
+'
+
+# Test code for whether the C compiler supports C11 (complete).
+ac_c_conftest_c11_program="${ac_c_conftest_c89_globals}
+${ac_c_conftest_c99_globals}
+${ac_c_conftest_c11_globals}
+
+int
+main (int argc, char **argv)
+{
+ int ok = 0;
+ ${ac_c_conftest_c89_main}
+ ${ac_c_conftest_c99_main}
+ ${ac_c_conftest_c11_main}
+ return ok;
+}
+"
+
+# Test code for whether the C compiler supports C99 (complete).
+ac_c_conftest_c99_program="${ac_c_conftest_c89_globals}
+${ac_c_conftest_c99_globals}
+
+int
+main (int argc, char **argv)
+{
+ int ok = 0;
+ ${ac_c_conftest_c89_main}
+ ${ac_c_conftest_c99_main}
+ return ok;
+}
+"
+
+# Test code for whether the C compiler supports C89 (complete).
+ac_c_conftest_c89_program="${ac_c_conftest_c89_globals}
+
+int
+main (int argc, char **argv)
+{
+ int ok = 0;
+ ${ac_c_conftest_c89_main}
+ return ok;
+}
+"
+
+as_fn_append ac_header_c_list " stdio.h stdio_h HAVE_STDIO_H"
+as_fn_append ac_header_c_list " stdlib.h stdlib_h HAVE_STDLIB_H"
+as_fn_append ac_header_c_list " string.h string_h HAVE_STRING_H"
+as_fn_append ac_header_c_list " inttypes.h inttypes_h HAVE_INTTYPES_H"
+as_fn_append ac_header_c_list " stdint.h stdint_h HAVE_STDINT_H"
+as_fn_append ac_header_c_list " strings.h strings_h HAVE_STRINGS_H"
+as_fn_append ac_header_c_list " sys/stat.h sys_stat_h HAVE_SYS_STAT_H"
+as_fn_append ac_header_c_list " sys/types.h sys_types_h HAVE_SYS_TYPES_H"
+as_fn_append ac_header_c_list " unistd.h unistd_h HAVE_UNISTD_H"
+as_fn_append ac_func_c_list " vprintf HAVE_VPRINTF"
+
+# Auxiliary files required by this configure script.
+ac_aux_files="install-sh config.guess config.sub"
+
+# Locations in which to look for auxiliary files.
+ac_aux_dir_candidates="${srcdir}${PATH_SEPARATOR}${srcdir}/..${PATH_SEPARATOR}${srcdir}/../.."
+
+# Search for a directory containing all of the required auxiliary files,
+# $ac_aux_files, from the $PATH-style list $ac_aux_dir_candidates.
+# If we don't find one directory that contains all the files we need,
+# we report the set of missing files from the *first* directory in
+# $ac_aux_dir_candidates and give up.
+ac_missing_aux_files=""
+ac_first_candidate=:
+printf "%s\n" "$as_me:${as_lineno-$LINENO}: looking for aux files: $ac_aux_files" >&5
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_found=false
+for as_dir in $ac_aux_dir_candidates
+do
+ IFS=$as_save_IFS
+ case $as_dir in #(((
+ '') as_dir=./ ;;
+ */) ;;
+ *) as_dir=$as_dir/ ;;
+ esac
+ as_found=:
+
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: trying $as_dir" >&5
+ ac_aux_dir_found=yes
+ ac_install_sh=
+ for ac_aux in $ac_aux_files
+ do
+ # As a special case, if "install-sh" is required, that requirement
+ # can be satisfied by any of "install-sh", "install.sh", or "shtool",
+ # and $ac_install_sh is set appropriately for whichever one is found.
+ if test x"$ac_aux" = x"install-sh"
+ then
+ if test -f "${as_dir}install-sh"; then
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}install-sh found" >&5
+ ac_install_sh="${as_dir}install-sh -c"
+ elif test -f "${as_dir}install.sh"; then
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}install.sh found" >&5
+ ac_install_sh="${as_dir}install.sh -c"
+ elif test -f "${as_dir}shtool"; then
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}shtool found" >&5
+ ac_install_sh="${as_dir}shtool install -c"
+ else
+ ac_aux_dir_found=no
+ if $ac_first_candidate; then
+ ac_missing_aux_files="${ac_missing_aux_files} install-sh"
+ else
+ break
+ fi
+ fi
+ else
+ if test -f "${as_dir}${ac_aux}"; then
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}${ac_aux} found" >&5
+ else
+ ac_aux_dir_found=no
+ if $ac_first_candidate; then
+ ac_missing_aux_files="${ac_missing_aux_files} ${ac_aux}"
+ else
+ break
+ fi
+ fi
+ fi
+ done
+ if test "$ac_aux_dir_found" = yes; then
+ ac_aux_dir="$as_dir"
+ break
+ fi
+ ac_first_candidate=false
+
+ as_found=false
+done
+IFS=$as_save_IFS
+if $as_found
+then :
+
+else $as_nop
+ as_fn_error $? "cannot find required auxiliary files:$ac_missing_aux_files" "$LINENO" 5
+fi
+
+
+# These three variables are undocumented and unsupported,
+# and are intended to be withdrawn in a future Autoconf release.
+# They can cause serious problems if a builder's source tree is in a directory
+# whose full name contains unusual characters.
+if test -f "${ac_aux_dir}config.guess"; then
+ ac_config_guess="$SHELL ${ac_aux_dir}config.guess"
+fi
+if test -f "${ac_aux_dir}config.sub"; then
+ ac_config_sub="$SHELL ${ac_aux_dir}config.sub"
+fi
+if test -f "$ac_aux_dir/configure"; then
+ ac_configure="$SHELL ${ac_aux_dir}configure"
+fi
+
# Check that the precious variables saved in the cache have kept the same
# value.
ac_cache_corrupted=false
@@ -2049,12 +2342,12 @@ for ac_var in $ac_precious_vars; do
eval ac_new_val=\$ac_env_${ac_var}_value
case $ac_old_set,$ac_new_set in
set,)
- { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+printf "%s\n" "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
ac_cache_corrupted=: ;;
,set)
- { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
-$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
+printf "%s\n" "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
ac_cache_corrupted=: ;;
,);;
*)
@@ -2063,24 +2356,24 @@ $as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
ac_old_val_w=`echo x $ac_old_val`
ac_new_val_w=`echo x $ac_new_val`
if test "$ac_old_val_w" != "$ac_new_val_w"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
-$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
+printf "%s\n" "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
ac_cache_corrupted=:
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
-$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+printf "%s\n" "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
eval $ac_var=\$ac_old_val
fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5
-$as_echo "$as_me: former value: \`$ac_old_val'" >&2;}
- { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5
-$as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5
+printf "%s\n" "$as_me: former value: \`$ac_old_val'" >&2;}
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5
+printf "%s\n" "$as_me: current value: \`$ac_new_val'" >&2;}
fi;;
esac
# Pass precious variables to config.status.
if test "$ac_new_set" = set; then
case $ac_new_val in
- *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+ *\'*) ac_arg=$ac_var=`printf "%s\n" "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
*) ac_arg=$ac_var=$ac_new_val ;;
esac
case " $ac_configure_args " in
@@ -2090,11 +2383,12 @@ $as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
fi
done
if $ac_cache_corrupted; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
-$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
- as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
+printf "%s\n" "$as_me: error: changes in the environment can compromise the build" >&2;}
+ as_fn_error $? "run \`${MAKE-make} distclean' and/or \`rm $cache_file'
+ and start over" "$LINENO" 5
fi
## -------------------- ##
## Main body of script. ##
@@ -2110,55 +2404,30 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
-ac_aux_dir=
-for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
- if test -f "$ac_dir/install-sh"; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/install-sh -c"
- break
- elif test -f "$ac_dir/install.sh"; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/install.sh -c"
- break
- elif test -f "$ac_dir/shtool"; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/shtool install -c"
- break
- fi
-done
-if test -z "$ac_aux_dir"; then
- as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
-fi
-# These three variables are undocumented and unsupported,
-# and are intended to be withdrawn in a future Autoconf release.
-# They can cause serious problems if a builder's source tree is in a directory
-# whose full name contains unusual characters.
-ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var.
-ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var.
-ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
-# Make sure we can run config.sub.
-$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
- as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
+ # Make sure we can run config.sub.
+$SHELL "${ac_aux_dir}config.sub" sun4 >/dev/null 2>&1 ||
+ as_fn_error $? "cannot run $SHELL ${ac_aux_dir}config.sub" "$LINENO" 5
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
-$as_echo_n "checking build system type... " >&6; }
-if ${ac_cv_build+:} false; then :
- $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
+printf %s "checking build system type... " >&6; }
+if test ${ac_cv_build+y}
+then :
+ printf %s "(cached) " >&6
+else $as_nop
ac_build_alias=$build_alias
test "x$ac_build_alias" = x &&
- ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
+ ac_build_alias=`$SHELL "${ac_aux_dir}config.guess"`
test "x$ac_build_alias" = x &&
as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
-ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
- as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
+ac_cv_build=`$SHELL "${ac_aux_dir}config.sub" $ac_build_alias` ||
+ as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $ac_build_alias failed" "$LINENO" 5
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
-$as_echo "$ac_cv_build" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
+printf "%s\n" "$ac_cv_build" >&6; }
case $ac_cv_build in
*-*-*) ;;
*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
@@ -2177,21 +2446,22 @@ IFS=$ac_save_IFS
case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
-$as_echo_n "checking host system type... " >&6; }
-if ${ac_cv_host+:} false; then :
- $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
+printf %s "checking host system type... " >&6; }
+if test ${ac_cv_host+y}
+then :
+ printf %s "(cached) " >&6
+else $as_nop
if test "x$host_alias" = x; then
ac_cv_host=$ac_cv_build
else
- ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
- as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
+ ac_cv_host=`$SHELL "${ac_aux_dir}config.sub" $host_alias` ||
+ as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $host_alias failed" "$LINENO" 5
fi
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
-$as_echo "$ac_cv_host" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
+printf "%s\n" "$ac_cv_host" >&6; }
case $ac_cv_host in
*-*-*) ;;
*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
@@ -2210,21 +2480,22 @@ IFS=$ac_save_IFS
case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5
-$as_echo_n "checking target system type... " >&6; }
-if ${ac_cv_target+:} false; then :
- $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking target system type" >&5
+printf %s "checking target system type... " >&6; }
+if test ${ac_cv_target+y}
+then :
+ printf %s "(cached) " >&6
+else $as_nop
if test "x$target_alias" = x; then
ac_cv_target=$ac_cv_host
else
- ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` ||
- as_fn_error $? "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5
+ ac_cv_target=`$SHELL "${ac_aux_dir}config.sub" $target_alias` ||
+ as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $target_alias failed" "$LINENO" 5
fi
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_target" >&5
-$as_echo "$ac_cv_target" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_target" >&5
+printf "%s\n" "$ac_cv_target" >&6; }
case $ac_cv_target in
*-*-*) ;;
*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5;;
@@ -2251,6 +2522,15 @@ test -n "$target_alias" &&
program_prefix=${target_alias}-
+
+
+
+
+
+
+
+
+
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -2259,11 +2539,12 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
- $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_CC+y}
+then :
+ printf %s "(cached) " >&6
+else $as_nop
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
else
@@ -2271,11 +2552,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
+ case $as_dir in #(((
+ '') as_dir=./ ;;
+ */) ;;
+ *) as_dir=$as_dir/ ;;
+ esac
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
ac_cv_prog_CC="${ac_tool_prefix}gcc"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -2286,11 +2571,11 @@ fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf "%s\n" "$CC" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
fi
@@ -2299,11 +2584,12 @@ if test -z "$ac_cv_prog_CC"; then
ac_ct_CC=$CC
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
- $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_CC+y}
+then :
+ printf %s "(cached) " >&6
+else $as_nop
if test -n "$ac_ct_CC"; then
ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
else
@@ -2311,11 +2597,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
+ case $as_dir in #(((
+ '') as_dir=./ ;;
+ */) ;;
+ *) as_dir=$as_dir/ ;;
+ esac
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_CC="gcc"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -2326,11 +2616,11 @@ fi
fi
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+printf "%s\n" "$ac_ct_CC" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
fi
if test "x$ac_ct_CC" = x; then
@@ -2338,8 +2628,8 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
CC=$ac_ct_CC
@@ -2352,11 +2642,12 @@ if test -z "$CC"; then
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
- $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_CC+y}
+then :
+ printf %s "(cached) " >&6
+else $as_nop
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
else
@@ -2364,11 +2655,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
+ case $as_dir in #(((
+ '') as_dir=./ ;;
+ */) ;;
+ *) as_dir=$as_dir/ ;;
+ esac
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
ac_cv_prog_CC="${ac_tool_prefix}cc"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -2379,11 +2674,11 @@ fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf "%s\n" "$CC" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
fi
@@ -2392,11 +2687,12 @@ fi
if test -z "$CC"; then
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
- $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_CC+y}
+then :
+ printf %s "(cached) " >&6
+else $as_nop
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
else
@@ -2405,15 +2701,19 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
+ case $as_dir in #(((
+ '') as_dir=./ ;;
+ */) ;;
+ *) as_dir=$as_dir/ ;;
+ esac
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+ if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+ if test "$as_dir$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
ac_prog_rejected=yes
continue
fi
ac_cv_prog_CC="cc"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -2429,18 +2729,18 @@ if test $ac_prog_rejected = yes; then
# However, it has the same basename, so the bogon will be chosen
# first if we set CC to just the basename; use the full file name.
shift
- ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
+ ac_cv_prog_CC="$as_dir$ac_word${1+' '}$@"
fi
fi
fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf "%s\n" "$CC" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
fi
@@ -2451,11 +2751,12 @@ if test -z "$CC"; then
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
- $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_CC+y}
+then :
+ printf %s "(cached) " >&6
+else $as_nop
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
else
@@ -2463,11 +2764,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
+ case $as_dir in #(((
+ '') as_dir=./ ;;
+ */) ;;
+ *) as_dir=$as_dir/ ;;
+ esac
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -2478,11 +2783,11 @@ fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf "%s\n" "$CC" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
fi
@@ -2495,11 +2800,12 @@ if test -z "$CC"; then
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
- $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_CC+y}
+then :
+ printf %s "(cached) " >&6
+else $as_nop
if test -n "$ac_ct_CC"; then
ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
else
@@ -2507,11 +2813,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
+ case $as_dir in #(((
+ '') as_dir=./ ;;
+ */) ;;
+ *) as_dir=$as_dir/ ;;
+ esac
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_CC="$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -2522,11 +2832,11 @@ fi
fi
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+printf "%s\n" "$ac_ct_CC" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
fi
@@ -2538,34 +2848,138 @@ done
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ CC=$ac_ct_CC
+ fi
+fi
+
+fi
+if test -z "$CC"; then
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}clang", so it can be a program name with args.
+set dummy ${ac_tool_prefix}clang; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_CC+y}
+then :
+ printf %s "(cached) " >&6
+else $as_nop
+ if test -n "$CC"; then
+ ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ case $as_dir in #(((
+ '') as_dir=./ ;;
+ */) ;;
+ *) as_dir=$as_dir/ ;;
+ esac
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+ ac_cv_prog_CC="${ac_tool_prefix}clang"
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf "%s\n" "$CC" >&6; }
+else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_CC"; then
+ ac_ct_CC=$CC
+ # Extract the first word of "clang", so it can be a program name with args.
+set dummy clang; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_CC+y}
+then :
+ printf %s "(cached) " >&6
+else $as_nop
+ if test -n "$ac_ct_CC"; then
+ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ case $as_dir in #(((
+ '') as_dir=./ ;;
+ */) ;;
+ *) as_dir=$as_dir/ ;;
+ esac
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+ ac_cv_prog_ac_ct_CC="clang"
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+printf "%s\n" "$ac_ct_CC" >&6; }
+else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+ if test "x$ac_ct_CC" = x; then
+ CC=""
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
CC=$ac_ct_CC
fi
+else
+ CC="$ac_cv_prog_CC"
fi
fi
-test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+test -z "$CC" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "no acceptable C compiler found in \$PATH
See \`config.log' for more details" "$LINENO" 5; }
# Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
set X $ac_compile
ac_compiler=$2
-for ac_option in --version -v -V -qversion; do
+for ac_option in --version -v -V -qversion -version; do
{ { ac_try="$ac_compiler $ac_option >&5"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
(eval "$ac_compiler $ac_option >&5") 2>conftest.err
ac_status=$?
if test -s conftest.err; then
@@ -2575,7 +2989,7 @@ $as_echo "$ac_try_echo"; } >&5
cat conftest.er1 >&5
fi
rm -f conftest.er1 conftest.err
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }
done
@@ -2583,7 +2997,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
-main ()
+main (void)
{
;
@@ -2595,9 +3009,9 @@ ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
# Try to create an executable without -o first, disregard a.out.
# It will help us diagnose broken compilers, and finding out an intuition
# of exeext.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
-$as_echo_n "checking whether the C compiler works... " >&6; }
-ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
+printf %s "checking whether the C compiler works... " >&6; }
+ac_link_default=`printf "%s\n" "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
# The possible output files:
ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
@@ -2618,11 +3032,12 @@ case "(($ac_try" in
*) ac_try_echo=$ac_try;;
esac
eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
(eval "$ac_link_default") 2>&5
ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then :
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
+then :
# Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
# in a Makefile. We should not override ac_cv_exeext if it was cached,
@@ -2639,7 +3054,7 @@ do
# certainly right.
break;;
*.* )
- if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
+ if test ${ac_cv_exeext+y} && test "$ac_cv_exeext" != no;
then :; else
ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
fi
@@ -2655,44 +3070,46 @@ do
done
test "$ac_cv_exeext" = no && ac_cv_exeext=
-else
+else $as_nop
ac_file=''
fi
-if test -z "$ac_file"; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-$as_echo "$as_me: failed program was:" >&5
+if test -z "$ac_file"
+then :
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+printf "%s\n" "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error 77 "C compiler cannot create executables
See \`config.log' for more details" "$LINENO" 5; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
-$as_echo_n "checking for C compiler default output file name... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
-$as_echo "$ac_file" >&6; }
+else $as_nop
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
+printf %s "checking for C compiler default output file name... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
+printf "%s\n" "$ac_file" >&6; }
ac_exeext=$ac_cv_exeext
rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
ac_clean_files=$ac_clean_files_save
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
-$as_echo_n "checking for suffix of executables... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
+printf %s "checking for suffix of executables... " >&6; }
if { { ac_try="$ac_link"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
(eval "$ac_link") 2>&5
ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then :
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
+then :
# If both `conftest.exe' and `conftest' are `present' (well, observable)
# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
# work properly (i.e., refer to `conftest.exe'), while it won't with
@@ -2706,15 +3123,15 @@ for ac_file in conftest.exe conftest conftest.*; do
* ) break;;
esac
done
-else
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+else $as_nop
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "cannot compute suffix of executables: cannot compile and link
See \`config.log' for more details" "$LINENO" 5; }
fi
rm -f conftest conftest$ac_cv_exeext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
-$as_echo "$ac_cv_exeext" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
+printf "%s\n" "$ac_cv_exeext" >&6; }
rm -f conftest.$ac_ext
EXEEXT=$ac_cv_exeext
@@ -2723,7 +3140,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdio.h>
int
-main ()
+main (void)
{
FILE *f = fopen ("conftest.out", "w");
return ferror (f) || fclose (f) != 0;
@@ -2735,8 +3152,8 @@ _ACEOF
ac_clean_files="$ac_clean_files conftest.out"
# Check that the compiler produces executables we can run. If not, either
# the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
-$as_echo_n "checking whether we are cross compiling... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
+printf %s "checking whether we are cross compiling... " >&6; }
if test "$cross_compiling" != yes; then
{ { ac_try="$ac_link"
case "(($ac_try" in
@@ -2744,10 +3161,10 @@ case "(($ac_try" in
*) ac_try_echo=$ac_try;;
esac
eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
(eval "$ac_link") 2>&5
ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }
if { ac_try='./conftest$ac_cv_exeext'
{ { case "(($ac_try" in
@@ -2755,39 +3172,40 @@ $as_echo "$ac_try_echo"; } >&5
*) ac_try_echo=$ac_try;;
esac
eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
(eval "$ac_try") 2>&5
ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; }; then
cross_compiling=no
else
if test "$cross_compiling" = maybe; then
cross_compiling=yes
else
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run C compiled programs.
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error 77 "cannot run C compiled programs.
If you meant to cross compile, use \`--host'.
See \`config.log' for more details" "$LINENO" 5; }
fi
fi
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
-$as_echo "$cross_compiling" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+printf "%s\n" "$cross_compiling" >&6; }
rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
ac_clean_files=$ac_clean_files_save
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
-$as_echo_n "checking for suffix of object files... " >&6; }
-if ${ac_cv_objext+:} false; then :
- $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
+printf %s "checking for suffix of object files... " >&6; }
+if test ${ac_cv_objext+y}
+then :
+ printf %s "(cached) " >&6
+else $as_nop
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
-main ()
+main (void)
{
;
@@ -2801,11 +3219,12 @@ case "(($ac_try" in
*) ac_try_echo=$ac_try;;
esac
eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
(eval "$ac_compile") 2>&5
ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then :
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
+then :
for ac_file in conftest.o conftest.obj conftest.*; do
test -f "$ac_file" || continue;
case $ac_file in
@@ -2814,31 +3233,32 @@ $as_echo "$ac_try_echo"; } >&5
break;;
esac
done
-else
- $as_echo "$as_me: failed program was:" >&5
+else $as_nop
+ printf "%s\n" "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "cannot compute suffix of object files: cannot compile
See \`config.log' for more details" "$LINENO" 5; }
fi
rm -f conftest.$ac_cv_objext conftest.$ac_ext
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
-$as_echo "$ac_cv_objext" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
+printf "%s\n" "$ac_cv_objext" >&6; }
OBJEXT=$ac_cv_objext
ac_objext=$OBJEXT
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
-$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if ${ac_cv_c_compiler_gnu+:} false; then :
- $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C" >&5
+printf %s "checking whether the compiler supports GNU C... " >&6; }
+if test ${ac_cv_c_compiler_gnu+y}
+then :
+ printf %s "(cached) " >&6
+else $as_nop
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
-main ()
+main (void)
{
#ifndef __GNUC__
choke me
@@ -2848,29 +3268,33 @@ main ()
return 0;
}
_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
ac_compiler_gnu=yes
-else
+else $as_nop
ac_compiler_gnu=no
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
ac_cv_c_compiler_gnu=$ac_compiler_gnu
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
-$as_echo "$ac_cv_c_compiler_gnu" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
+printf "%s\n" "$ac_cv_c_compiler_gnu" >&6; }
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
if test $ac_compiler_gnu = yes; then
GCC=yes
else
GCC=
fi
-ac_test_CFLAGS=${CFLAGS+set}
+ac_test_CFLAGS=${CFLAGS+y}
ac_save_CFLAGS=$CFLAGS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
-$as_echo_n "checking whether $CC accepts -g... " >&6; }
-if ${ac_cv_prog_cc_g+:} false; then :
- $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+printf %s "checking whether $CC accepts -g... " >&6; }
+if test ${ac_cv_prog_cc_g+y}
+then :
+ printf %s "(cached) " >&6
+else $as_nop
ac_save_c_werror_flag=$ac_c_werror_flag
ac_c_werror_flag=yes
ac_cv_prog_cc_g=no
@@ -2879,57 +3303,60 @@ else
/* end confdefs.h. */
int
-main ()
+main (void)
{
;
return 0;
}
_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
ac_cv_prog_cc_g=yes
-else
+else $as_nop
CFLAGS=""
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
-main ()
+main (void)
{
;
return 0;
}
_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
-else
+else $as_nop
ac_c_werror_flag=$ac_save_c_werror_flag
CFLAGS="-g"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
-main ()
+main (void)
{
;
return 0;
}
_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
ac_cv_prog_cc_g=yes
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
ac_c_werror_flag=$ac_save_c_werror_flag
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
-$as_echo "$ac_cv_prog_cc_g" >&6; }
-if test "$ac_test_CFLAGS" = set; then
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
+printf "%s\n" "$ac_cv_prog_cc_g" >&6; }
+if test $ac_test_CFLAGS; then
CFLAGS=$ac_save_CFLAGS
elif test $ac_cv_prog_cc_g = yes; then
if test "$GCC" = yes; then
@@ -2944,234 +3371,144 @@ else
CFLAGS=
fi
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
-$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if ${ac_cv_prog_cc_c89+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_cv_prog_cc_c89=no
+ac_prog_cc_stdc=no
+if test x$ac_prog_cc_stdc = xno
+then :
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C11 features" >&5
+printf %s "checking for $CC option to enable C11 features... " >&6; }
+if test ${ac_cv_prog_cc_c11+y}
+then :
+ printf %s "(cached) " >&6
+else $as_nop
+ ac_cv_prog_cc_c11=no
ac_save_CC=$CC
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-#include <stdarg.h>
-#include <stdio.h>
-struct stat;
-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
-struct buf { int x; };
-FILE * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
- char **p;
- int i;
-{
- return p[i];
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-{
- char *s;
- va_list v;
- va_start (v,p);
- s = g (p, va_arg (v,int));
- va_end (v);
- return s;
-}
-
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
- function prototypes and stuff, but not '\xHH' hex character constants.
- These don't provoke an error unfortunately, instead are silently treated
- as 'x'. The following induces an error, until -std is added to get
- proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
- array size at least. It's necessary to write '\x00'==0 to get something
- that's true only with -std. */
-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-
-/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
- inside strings and character constants. */
-#define FOO(x) 'x'
-int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
-
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-int argc;
-char **argv;
-int
-main ()
-{
-return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
- ;
- return 0;
-}
+$ac_c_conftest_c11_program
_ACEOF
-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
- -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+for ac_arg in '' -std=gnu11
do
CC="$ac_save_CC $ac_arg"
- if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_prog_cc_c89=$ac_arg
+ if ac_fn_c_try_compile "$LINENO"
+then :
+ ac_cv_prog_cc_c11=$ac_arg
fi
-rm -f core conftest.err conftest.$ac_objext
- test "x$ac_cv_prog_cc_c89" != "xno" && break
+rm -f core conftest.err conftest.$ac_objext conftest.beam
+ test "x$ac_cv_prog_cc_c11" != "xno" && break
done
rm -f conftest.$ac_ext
CC=$ac_save_CC
-
-fi
-# AC_CACHE_VAL
-case "x$ac_cv_prog_cc_c89" in
- x)
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-$as_echo "none needed" >&6; } ;;
- xno)
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-$as_echo "unsupported" >&6; } ;;
- *)
- CC="$CC $ac_cv_prog_cc_c89"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
-$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
-esac
-if test "x$ac_cv_prog_cc_c89" != xno; then :
-
fi
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
-$as_echo_n "checking how to run the C preprocessor... " >&6; }
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
- CPP=
-fi
-if test -z "$CPP"; then
- if ${ac_cv_prog_CPP+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- # Double quotes because CPP needs to be expanded
- for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
- do
- ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
- # Use a header file that comes with gcc, so configuring glibc
- # with a fresh cross-compiler works.
- # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- # <limits.h> exists even on freestanding compilers.
- # On the NeXT, cc -E runs the code through the compiler's parser,
- # not just through cpp. "Syntax error" is here to catch this case.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+if test "x$ac_cv_prog_cc_c11" = xno
+then :
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf "%s\n" "unsupported" >&6; }
+else $as_nop
+ if test "x$ac_cv_prog_cc_c11" = x
+then :
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf "%s\n" "none needed" >&6; }
+else $as_nop
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5
+printf "%s\n" "$ac_cv_prog_cc_c11" >&6; }
+ CC="$CC $ac_cv_prog_cc_c11"
+fi
+ ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c11
+ ac_prog_cc_stdc=c11
+fi
+fi
+if test x$ac_prog_cc_stdc = xno
+then :
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C99 features" >&5
+printf %s "checking for $CC option to enable C99 features... " >&6; }
+if test ${ac_cv_prog_cc_c99+y}
+then :
+ printf %s "(cached) " >&6
+else $as_nop
+ ac_cv_prog_cc_c99=no
+ac_save_CC=$CC
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
- Syntax error
+$ac_c_conftest_c99_program
_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-
-else
- # Broken: fails on valid input.
-continue
+for ac_arg in '' -std=gnu99 -std=c99 -c99 -qlanglvl=extc1x -qlanglvl=extc99 -AC99 -D_STDC_C99=
+do
+ CC="$ac_save_CC $ac_arg"
+ if ac_fn_c_try_compile "$LINENO"
+then :
+ ac_cv_prog_cc_c99=$ac_arg
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam
+ test "x$ac_cv_prog_cc_c99" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC
fi
-rm -f conftest.err conftest.i conftest.$ac_ext
- # OK, works on sane cases. Now check whether nonexistent headers
- # can be detected and how.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+if test "x$ac_cv_prog_cc_c99" = xno
+then :
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf "%s\n" "unsupported" >&6; }
+else $as_nop
+ if test "x$ac_cv_prog_cc_c99" = x
+then :
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf "%s\n" "none needed" >&6; }
+else $as_nop
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5
+printf "%s\n" "$ac_cv_prog_cc_c99" >&6; }
+ CC="$CC $ac_cv_prog_cc_c99"
+fi
+ ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99
+ ac_prog_cc_stdc=c99
+fi
+fi
+if test x$ac_prog_cc_stdc = xno
+then :
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C89 features" >&5
+printf %s "checking for $CC option to enable C89 features... " >&6; }
+if test ${ac_cv_prog_cc_c89+y}
+then :
+ printf %s "(cached) " >&6
+else $as_nop
+ ac_cv_prog_cc_c89=no
+ac_save_CC=$CC
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-#include <ac_nonexistent.h>
+$ac_c_conftest_c89_program
_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
- # Broken: success on invalid input.
-continue
-else
- # Passes both tests.
-ac_preproc_ok=:
-break
+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+do
+ CC="$ac_save_CC $ac_arg"
+ if ac_fn_c_try_compile "$LINENO"
+then :
+ ac_cv_prog_cc_c89=$ac_arg
fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
+rm -f core conftest.err conftest.$ac_objext conftest.beam
+ test "x$ac_cv_prog_cc_c89" != "xno" && break
done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
- break
+rm -f conftest.$ac_ext
+CC=$ac_save_CC
fi
- done
- ac_cv_prog_CPP=$CPP
-
+if test "x$ac_cv_prog_cc_c89" = xno
+then :
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf "%s\n" "unsupported" >&6; }
+else $as_nop
+ if test "x$ac_cv_prog_cc_c89" = x
+then :
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf "%s\n" "none needed" >&6; }
+else $as_nop
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+printf "%s\n" "$ac_cv_prog_cc_c89" >&6; }
+ CC="$CC $ac_cv_prog_cc_c89"
fi
- CPP=$ac_cv_prog_CPP
-else
- ac_cv_prog_CPP=$CPP
+ ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89
+ ac_prog_cc_stdc=c89
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
-$as_echo "$CPP" >&6; }
-ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
- # Use a header file that comes with gcc, so configuring glibc
- # with a fresh cross-compiler works.
- # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- # <limits.h> exists even on freestanding compilers.
- # On the NeXT, cc -E runs the code through the compiler's parser,
- # not just through cpp. "Syntax error" is here to catch this case.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
- Syntax error
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-
-else
- # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
- # OK, works on sane cases. Now check whether nonexistent headers
- # can be detected and how.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <ac_nonexistent.h>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
- # Broken: success on invalid input.
-continue
-else
- # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
-
-else
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5; }
fi
ac_ext=c
@@ -3181,260 +3518,19 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
-$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-if ${ac_cv_path_GREP+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -z "$GREP"; then
- ac_path_GREP_found=false
- # Loop through the user's path and test for each of PROGNAME-LIST
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_prog in grep ggrep; do
- for ac_exec_ext in '' $ac_executable_extensions; do
- ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
- as_fn_executable_p "$ac_path_GREP" || continue
-# Check for GNU ac_path_GREP and select it if it is found.
- # Check for GNU $ac_path_GREP
-case `"$ac_path_GREP" --version 2>&1` in
-*GNU*)
- ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
-*)
- ac_count=0
- $as_echo_n 0123456789 >"conftest.in"
- while :
- do
- cat "conftest.in" "conftest.in" >"conftest.tmp"
- mv "conftest.tmp" "conftest.in"
- cp "conftest.in" "conftest.nl"
- $as_echo 'GREP' >> "conftest.nl"
- "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
- diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
- as_fn_arith $ac_count + 1 && ac_count=$as_val
- if test $ac_count -gt ${ac_path_GREP_max-0}; then
- # Best one so far, save it but keep looking for a better one
- ac_cv_path_GREP="$ac_path_GREP"
- ac_path_GREP_max=$ac_count
- fi
- # 10*(2^10) chars as input seems more than enough
- test $ac_count -gt 10 && break
- done
- rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
- $ac_path_GREP_found && break 3
- done
- done
- done
-IFS=$as_save_IFS
- if test -z "$ac_cv_path_GREP"; then
- as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
- fi
-else
- ac_cv_path_GREP=$GREP
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
-$as_echo "$ac_cv_path_GREP" >&6; }
- GREP="$ac_cv_path_GREP"
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
-$as_echo_n "checking for egrep... " >&6; }
-if ${ac_cv_path_EGREP+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
- then ac_cv_path_EGREP="$GREP -E"
- else
- if test -z "$EGREP"; then
- ac_path_EGREP_found=false
- # Loop through the user's path and test for each of PROGNAME-LIST
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_prog in egrep; do
- for ac_exec_ext in '' $ac_executable_extensions; do
- ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
- as_fn_executable_p "$ac_path_EGREP" || continue
-# Check for GNU ac_path_EGREP and select it if it is found.
- # Check for GNU $ac_path_EGREP
-case `"$ac_path_EGREP" --version 2>&1` in
-*GNU*)
- ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
-*)
- ac_count=0
- $as_echo_n 0123456789 >"conftest.in"
- while :
- do
- cat "conftest.in" "conftest.in" >"conftest.tmp"
- mv "conftest.tmp" "conftest.in"
- cp "conftest.in" "conftest.nl"
- $as_echo 'EGREP' >> "conftest.nl"
- "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
- diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
- as_fn_arith $ac_count + 1 && ac_count=$as_val
- if test $ac_count -gt ${ac_path_EGREP_max-0}; then
- # Best one so far, save it but keep looking for a better one
- ac_cv_path_EGREP="$ac_path_EGREP"
- ac_path_EGREP_max=$ac_count
- fi
- # 10*(2^10) chars as input seems more than enough
- test $ac_count -gt 10 && break
- done
- rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
- $ac_path_EGREP_found && break 3
- done
- done
- done
-IFS=$as_save_IFS
- if test -z "$ac_cv_path_EGREP"; then
- as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
- fi
-else
- ac_cv_path_EGREP=$EGREP
-fi
-
- fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
-$as_echo "$ac_cv_path_EGREP" >&6; }
- EGREP="$ac_cv_path_EGREP"
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
-$as_echo_n "checking for ANSI C header files... " >&6; }
-if ${ac_cv_header_stdc+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_header_stdc=yes
-else
- ac_cv_header_stdc=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-if test $ac_cv_header_stdc = yes; then
- # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <string.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "memchr" >/dev/null 2>&1; then :
-
-else
- ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
- # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <stdlib.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "free" >/dev/null 2>&1; then :
-
-else
- ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
- # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
- if test "$cross_compiling" = yes; then :
- :
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <ctype.h>
-#include <stdlib.h>
-#if ((' ' & 0x0FF) == 0x020)
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#else
-# define ISLOWER(c) \
- (('a' <= (c) && (c) <= 'i') \
- || ('j' <= (c) && (c) <= 'r') \
- || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-#endif
-
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int
-main ()
-{
- int i;
- for (i = 0; i < 256; i++)
- if (XOR (islower (i), ISLOWER (i))
- || toupper (i) != TOUPPER (i))
- return 2;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-
-else
- ac_cv_header_stdc=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
-$as_echo "$ac_cv_header_stdc" >&6; }
-if test $ac_cv_header_stdc = yes; then
-
-$as_echo "#define STDC_HEADERS 1" >>confdefs.h
-
-fi
-
# Check whether --with-kpathsea-include was given.
-if test "${with_kpathsea_include+set}" = set; then :
+if test ${with_kpathsea_include+y}
+then :
withval=$with_kpathsea_include;
if test x$withval = xyes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Usage is: --with-kpathsea-include=includedir" >&5
-$as_echo "$as_me: WARNING: Usage is: --with-kpathsea-include=includedir" >&2;}
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Usage is: --with-kpathsea-include=includedir" >&5
+printf "%s\n" "$as_me: WARNING: Usage is: --with-kpathsea-include=includedir" >&2;}
else
if test x$withval = xno; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Usage is: --with-kpathsea-include=includedir" >&5
-$as_echo "$as_me: WARNING: Usage is: --with-kpathsea-include=includedir" >&2;}
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Usage is: --with-kpathsea-include=includedir" >&5
+printf "%s\n" "$as_me: WARNING: Usage is: --with-kpathsea-include=includedir" >&2;}
else
kpathsea_include=$withval
fi
@@ -3446,15 +3542,16 @@ fi
# Check whether --with-kpathsea-lib was given.
-if test "${with_kpathsea_lib+set}" = set; then :
+if test ${with_kpathsea_lib+y}
+then :
withval=$with_kpathsea_lib;
if test x$withval = xyes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Usage is: --with-kpathsea-lib=libdir" >&5
-$as_echo "$as_me: WARNING: Usage is: --with-kpathsea-lib=libdir" >&2;}
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Usage is: --with-kpathsea-lib=libdir" >&5
+printf "%s\n" "$as_me: WARNING: Usage is: --with-kpathsea-lib=libdir" >&2;}
else
if test x$withval = xno; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Usage is: --with-kpathsea-lib=libdir" >&5
-$as_echo "$as_me: WARNING: Usage is: --with-kpathsea-lib=libdir" >&2;}
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Usage is: --with-kpathsea-lib=libdir" >&5
+printf "%s\n" "$as_me: WARNING: Usage is: --with-kpathsea-lib=libdir" >&2;}
else
kpathsea_lib=$withval
fi
@@ -3468,11 +3565,13 @@ if test -n "$kpathsea_include" -o -n "$kpathsea_lib"; then
LIBS="$LIBS -L$kpathsea_lib"
CPPFLAGS="$CPPFLAGS -I$kpathsea_include -I$srcdir"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for kpse_set_program_name in -lkpathsea" >&5
-$as_echo_n "checking for kpse_set_program_name in -lkpathsea... " >&6; }
-if ${ac_cv_lib_kpathsea_kpse_set_program_name+:} false; then :
- $as_echo_n "(cached) " >&6
-else
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for kpse_set_program_name in -lkpathsea" >&5
+printf %s "checking for kpse_set_program_name in -lkpathsea... " >&6; }
+if test ${ac_cv_lib_kpathsea_kpse_set_program_name+y}
+then :
+ printf %s "(cached) " >&6
+else $as_nop
ac_check_lib_save_LIBS=$LIBS
LIBS="-lkpathsea $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -3481,47 +3580,45 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
char kpse_set_program_name ();
int
-main ()
+main (void)
{
return kpse_set_program_name ();
;
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
ac_cv_lib_kpathsea_kpse_set_program_name=yes
-else
+else $as_nop
ac_cv_lib_kpathsea_kpse_set_program_name=no
fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_kpathsea_kpse_set_program_name" >&5
-$as_echo "$ac_cv_lib_kpathsea_kpse_set_program_name" >&6; }
-if test "x$ac_cv_lib_kpathsea_kpse_set_program_name" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBKPATHSEA 1
-_ACEOF
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_kpathsea_kpse_set_program_name" >&5
+printf "%s\n" "$ac_cv_lib_kpathsea_kpse_set_program_name" >&6; }
+if test "x$ac_cv_lib_kpathsea_kpse_set_program_name" = xyes
+then :
+ printf "%s\n" "#define HAVE_LIBKPATHSEA 1" >>confdefs.h
LIBS="-lkpathsea $LIBS"
-else
- $as_echo "#define OLD_KPATHSEA 1" >>confdefs.h
+else $as_nop
+ printf "%s\n" "#define OLD_KPATHSEA 1" >>confdefs.h
fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for kpse_init_prog in -lkpathsea" >&5
-$as_echo_n "checking for kpse_init_prog in -lkpathsea... " >&6; }
-if ${ac_cv_lib_kpathsea_kpse_init_prog+:} false; then :
- $as_echo_n "(cached) " >&6
-else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for kpse_init_prog in -lkpathsea" >&5
+printf %s "checking for kpse_init_prog in -lkpathsea... " >&6; }
+if test ${ac_cv_lib_kpathsea_kpse_init_prog+y}
+then :
+ printf %s "(cached) " >&6
+else $as_nop
ac_check_lib_save_LIBS=$LIBS
LIBS="-lkpathsea $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -3530,78 +3627,87 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
char kpse_init_prog ();
int
-main ()
+main (void)
{
return kpse_init_prog ();
;
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
ac_cv_lib_kpathsea_kpse_init_prog=yes
-else
+else $as_nop
ac_cv_lib_kpathsea_kpse_init_prog=no
fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_kpathsea_kpse_init_prog" >&5
-$as_echo "$ac_cv_lib_kpathsea_kpse_init_prog" >&6; }
-if test "x$ac_cv_lib_kpathsea_kpse_init_prog" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBKPATHSEA 1
-_ACEOF
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_kpathsea_kpse_init_prog" >&5
+printf "%s\n" "$ac_cv_lib_kpathsea_kpse_init_prog" >&6; }
+if test "x$ac_cv_lib_kpathsea_kpse_init_prog" = xyes
+then :
+ printf "%s\n" "#define HAVE_LIBKPATHSEA 1" >>confdefs.h
LIBS="-lkpathsea $LIBS"
-else
+else $as_nop
as_fn_error $? "Can't find kpathsea library! Use --with-kpathsea-lib option." "$LINENO" 5
fi
- # On IRIX 5.3, sys/types and inttypes.h are conflicting.
-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
- inttypes.h stdint.h unistd.h
-do :
- as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
-"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
+ ac_header= ac_cache=
+for ac_item in $ac_header_c_list
+do
+ if test $ac_cache; then
+ ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default"
+ if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then
+ printf "%s\n" "#define $ac_item 1" >> confdefs.h
+ fi
+ ac_header= ac_cache=
+ elif test $ac_header; then
+ ac_cache=$ac_item
+ else
+ ac_header=$ac_item
+ fi
+done
-fi
-done
-ac_fn_c_check_header_mongrel "$LINENO" "kpathsea/kpathsea.h" "ac_cv_header_kpathsea_kpathsea_h" "$ac_includes_default"
-if test "x$ac_cv_header_kpathsea_kpathsea_h" = xyes; then :
-else
- $as_echo "#define VERY_OLD_KPATHSEA 1" >>confdefs.h
+
+
+
+if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes
+then :
+
+printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h
fi
+ac_fn_c_check_header_compile "$LINENO" "kpathsea/kpathsea.h" "ac_cv_header_kpathsea_kpathsea_h" "$ac_includes_default"
+if test "x$ac_cv_header_kpathsea_kpathsea_h" = xyes
+then :
+else $as_nop
+ printf "%s\n" "#define VERY_OLD_KPATHSEA 1" >>confdefs.h
+fi
- ac_fn_c_check_header_mongrel "$LINENO" "kpathsea/c-auto.h" "ac_cv_header_kpathsea_c_auto_h" "$ac_includes_default"
-if test "x$ac_cv_header_kpathsea_c_auto_h" = xyes; then :
-else
+ ac_fn_c_check_header_compile "$LINENO" "kpathsea/c-auto.h" "ac_cv_header_kpathsea_c_auto_h" "$ac_includes_default"
+if test "x$ac_cv_header_kpathsea_c_auto_h" = xyes
+then :
+
+else $as_nop
as_fn_error $? "Can't find kpathsea include files! Use --with-kpathsea-include option." "$LINENO" 5
fi
-
else
CPPFLAGS="$CPPFLAGS -I$srcdir"
fi
@@ -3622,16 +3728,17 @@ fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
-$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
-if ${ac_cv_c_const+:} false; then :
- $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
+printf %s "checking for an ANSI C-conforming const... " >&6; }
+if test ${ac_cv_c_const+y}
+then :
+ printf %s "(cached) " >&6
+else $as_nop
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
-main ()
+main (void)
{
#ifndef __cplusplus
@@ -3644,7 +3751,7 @@ main ()
/* NEC SVR4.0.2 mips cc rejects this. */
struct point {int x, y;};
static struct point const zero = {0,0};
- /* AIX XL C 1.02.0.0 rejects this.
+ /* IBM XL C 1.02.0.0 rejects this.
It does not let you subtract one const X* pointer from another in
an arm of an if-expression whose if-part is not a constant
expression */
@@ -3672,7 +3779,7 @@ main ()
iptr p = 0;
++p;
}
- { /* AIX XL C 1.02.0.0 rejects this sort of thing, saying
+ { /* IBM XL C 1.02.0.0 rejects this sort of thing, saying
"k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
struct s { int j; const int *ap[3]; } bx;
struct s *b = &bx; b->j = 5;
@@ -3688,33 +3795,35 @@ main ()
return 0;
}
_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
ac_cv_c_const=yes
-else
+else $as_nop
ac_cv_c_const=no
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5
-$as_echo "$ac_cv_c_const" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5
+printf "%s\n" "$ac_cv_c_const" >&6; }
if test $ac_cv_c_const = no; then
-$as_echo "#define const /**/" >>confdefs.h
+printf "%s\n" "#define const /**/" >>confdefs.h
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether struct tm is in sys/time.h or time.h" >&5
-$as_echo_n "checking whether struct tm is in sys/time.h or time.h... " >&6; }
-if ${ac_cv_struct_tm+:} false; then :
- $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether struct tm is in sys/time.h or time.h" >&5
+printf %s "checking whether struct tm is in sys/time.h or time.h... " >&6; }
+if test ${ac_cv_struct_tm+y}
+then :
+ printf %s "(cached) " >&6
+else $as_nop
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <sys/types.h>
#include <time.h>
int
-main ()
+main (void)
{
struct tm tm;
int *p = &tm.tm_sec;
@@ -3723,53 +3832,73 @@ struct tm tm;
return 0;
}
_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
ac_cv_struct_tm=time.h
-else
+else $as_nop
ac_cv_struct_tm=sys/time.h
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_tm" >&5
-$as_echo "$ac_cv_struct_tm" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_tm" >&5
+printf "%s\n" "$ac_cv_struct_tm" >&6; }
if test $ac_cv_struct_tm = sys/time.h; then
-$as_echo "#define TM_IN_SYS_TIME 1" >>confdefs.h
+printf "%s\n" "#define TM_IN_SYS_TIME 1" >>confdefs.h
fi
-for ac_func in vprintf
-do :
- ac_fn_c_check_func "$LINENO" "vprintf" "ac_cv_func_vprintf"
-if test "x$ac_cv_func_vprintf" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-#define HAVE_VPRINTF 1
-_ACEOF
+ac_func=
+for ac_item in $ac_func_c_list
+do
+ if test $ac_func; then
+ ac_fn_c_check_func "$LINENO" $ac_func ac_cv_func_$ac_func
+ if eval test \"x\$ac_cv_func_$ac_func\" = xyes; then
+ echo "#define $ac_item 1" >> confdefs.h
+ fi
+ ac_func=
+ else
+ ac_func=$ac_item
+ fi
+done
-ac_fn_c_check_func "$LINENO" "_doprnt" "ac_cv_func__doprnt"
-if test "x$ac_cv_func__doprnt" = xyes; then :
+if test "x$ac_cv_func_vprintf" = xno
+then :
+ ac_fn_c_check_func "$LINENO" "_doprnt" "ac_cv_func__doprnt"
+if test "x$ac_cv_func__doprnt" = xyes
+then :
-$as_echo "#define HAVE_DOPRNT 1" >>confdefs.h
+printf "%s\n" "#define HAVE_DOPRNT 1" >>confdefs.h
fi
fi
-done
+ac_fn_c_check_func "$LINENO" "strdup" "ac_cv_func_strdup"
+if test "x$ac_cv_func_strdup" = xyes
+then :
+ printf "%s\n" "#define HAVE_STRDUP 1" >>confdefs.h
+fi
+ac_fn_c_check_func "$LINENO" "strstr" "ac_cv_func_strstr"
+if test "x$ac_cv_func_strstr" = xyes
+then :
+ printf "%s\n" "#define HAVE_STRSTR 1" >>confdefs.h
-for ac_func in strdup strstr strtol strtoul
-do :
- as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
+fi
+ac_fn_c_check_func "$LINENO" "strtol" "ac_cv_func_strtol"
+if test "x$ac_cv_func_strtol" = xyes
+then :
+ printf "%s\n" "#define HAVE_STRTOL 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "strtoul" "ac_cv_func_strtoul"
+if test "x$ac_cv_func_strtoul" = xyes
+then :
+ printf "%s\n" "#define HAVE_STRTOUL 1" >>confdefs.h
fi
-done
if test "x$ac_cv_func_strdup" = xno; then
@@ -3779,11 +3908,12 @@ fi
# Extract the first word of "rm", so it can be a program name with args.
set dummy rm; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_RM+:} false; then :
- $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_RM+y}
+then :
+ printf %s "(cached) " >&6
+else $as_nop
if test -n "$RM"; then
ac_cv_prog_RM="$RM" # Let the user override the test.
else
@@ -3791,11 +3921,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
+ case $as_dir in #(((
+ '') as_dir=./ ;;
+ */) ;;
+ *) as_dir=$as_dir/ ;;
+ esac
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
ac_cv_prog_RM="rm"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -3806,15 +3940,16 @@ fi
fi
RM=$ac_cv_prog_RM
if test -n "$RM"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RM" >&5
-$as_echo "$RM" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $RM" >&5
+printf "%s\n" "$RM" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
fi
-# Find a good install program. We prefer a C program (faster),
+
+ # Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or
# incompatible versions:
# SysV /etc/install, /usr/sbin/install
@@ -3828,20 +3963,25 @@ fi
# OS/2's system install, which has a completely different semantic
# ./install, which can be erroneously created by make from ./install.sh.
# Reject install programs that cannot install multiple files.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
-$as_echo_n "checking for a BSD-compatible install... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
+printf %s "checking for a BSD-compatible install... " >&6; }
if test -z "$INSTALL"; then
-if ${ac_cv_path_install+:} false; then :
- $as_echo_n "(cached) " >&6
-else
+if test ${ac_cv_path_install+y}
+then :
+ printf %s "(cached) " >&6
+else $as_nop
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in #((
- ./ | .// | /[cC]/* | \
+ case $as_dir in #(((
+ '') as_dir=./ ;;
+ */) ;;
+ *) as_dir=$as_dir/ ;;
+ esac
+ # Account for fact that we put trailing slashes in our PATH walk.
+case $as_dir in #((
+ ./ | /[cC]/* | \
/etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
/usr/ucb/* ) ;;
@@ -3851,13 +3991,13 @@ case $as_dir/ in #((
# by default.
for ac_prog in ginstall scoinst install; do
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
+ if as_fn_executable_p "$as_dir$ac_prog$ac_exec_ext"; then
if test $ac_prog = install &&
- grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+ grep dspmsg "$as_dir$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
# AIX install. It has an incompatible calling convention.
:
elif test $ac_prog = install &&
- grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+ grep pwplus "$as_dir$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
# program-specific install script used by HP pwplus--don't use.
:
else
@@ -3865,12 +4005,12 @@ case $as_dir/ in #((
echo one > conftest.one
echo two > conftest.two
mkdir conftest.dir
- if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
+ if "$as_dir$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir/" &&
test -s conftest.one && test -s conftest.two &&
test -s conftest.dir/conftest.one &&
test -s conftest.dir/conftest.two
then
- ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+ ac_cv_path_install="$as_dir$ac_prog$ac_exec_ext -c"
break 3
fi
fi
@@ -3886,7 +4026,7 @@ IFS=$as_save_IFS
rm -rf conftest.one conftest.two conftest.dir
fi
- if test "${ac_cv_path_install+set}" = set; then
+ if test ${ac_cv_path_install+y}; then
INSTALL=$ac_cv_path_install
else
# As a last resort, use the slow shell script. Don't cache a
@@ -3896,8 +4036,8 @@ fi
INSTALL=$ac_install_sh
fi
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
-$as_echo "$INSTALL" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
+printf "%s\n" "$INSTALL" >&6; }
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
# It thinks the first close brace ends the variable substitution.
@@ -3909,13 +4049,13 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
if test -z "$kpathsea_include" -a -z "$kpathsea_lib"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING:
hbf2gf will be compiled without file search library support!
For kpathsea support use the --with-kpathsea-lib and
--with-kpathsea-include options.
" >&5
-$as_echo "$as_me: WARNING:
+printf "%s\n" "$as_me: WARNING:
hbf2gf will be compiled without file search library support!
For kpathsea support use the --with-kpathsea-lib and
@@ -3952,8 +4092,8 @@ _ACEOF
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
- *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+ *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
esac
case $ac_var in #(
_ | IFS | as_nl) ;; #(
@@ -3983,15 +4123,15 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
/^ac_cv_env_/b end
t clear
:clear
- s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+ s/^\([^=]*\)=\(.*[{}].*\)$/test ${\1+y} || &/
t end
s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
:end' >>confcache
if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
if test -w "$cache_file"; then
if test "x$cache_file" != "x/dev/null"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
-$as_echo "$as_me: updating cache $cache_file" >&6;}
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
+printf "%s\n" "$as_me: updating cache $cache_file" >&6;}
if test ! -f "$cache_file" || test -h "$cache_file"; then
cat confcache >"$cache_file"
else
@@ -4005,8 +4145,8 @@ $as_echo "$as_me: updating cache $cache_file" >&6;}
fi
fi
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
-$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
+printf "%s\n" "$as_me: not updating unwritable cache $cache_file" >&6;}
fi
fi
rm -f confcache
@@ -4059,7 +4199,7 @@ U=
for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
# 1. Remove the extension, and $U if already installed.
ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
- ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
+ ac_i=`printf "%s\n" "$ac_i" | sed "$ac_script"`
# 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
# will be set to the directory where LIBOBJS objects are built.
as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
@@ -4075,8 +4215,8 @@ LTLIBOBJS=$ac_ltlibobjs
ac_write_fail=0
ac_clean_files_save=$ac_clean_files
ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
-$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
+printf "%s\n" "$as_me: creating $CONFIG_STATUS" >&6;}
as_write_fail=0
cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
#! $SHELL
@@ -4099,14 +4239,16 @@ cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
# Be more Bourne compatible
DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+as_nop=:
+if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1
+then :
emulate sh
NULLCMD=:
# Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
-else
+else $as_nop
case `(set -o) 2>/dev/null` in #(
*posix*) :
set -o posix ;; #(
@@ -4116,46 +4258,46 @@ esac
fi
+
+# Reset variables that may have inherited troublesome values from
+# the environment.
+
+# IFS needs to be set, to space, tab, and newline, in precisely that order.
+# (If _AS_PATH_WALK were called with IFS unset, it would have the
+# side effect of setting IFS to empty, thus disabling word splitting.)
+# Quoting is to prevent editors from complaining about space-tab.
as_nl='
'
export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-# Prefer a ksh shell builtin over an external printf program on Solaris,
-# but without wasting forks for bash or zsh.
-if test -z "$BASH_VERSION$ZSH_VERSION" \
- && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
- as_echo='print -r --'
- as_echo_n='print -rn --'
-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
- as_echo='printf %s\n'
- as_echo_n='printf %s'
-else
- if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
- as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
- as_echo_n='/usr/ucb/echo -n'
- else
- as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
- as_echo_n_body='eval
- arg=$1;
- case $arg in #(
- *"$as_nl"*)
- expr "X$arg" : "X\\(.*\\)$as_nl";
- arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
- esac;
- expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
- '
- export as_echo_n_body
- as_echo_n='sh -c $as_echo_n_body as_echo'
- fi
- export as_echo_body
- as_echo='sh -c $as_echo_body as_echo'
-fi
+IFS=" "" $as_nl"
+
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# Ensure predictable behavior from utilities with locale-dependent output.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# We cannot yet rely on "unset" to work, but we need these variables
+# to be unset--not just set to an empty or harmless value--now, to
+# avoid bugs in old shells (e.g. pre-3.0 UWIN ksh). This construct
+# also avoids known problems related to "unset" and subshell syntax
+# in other old shells (e.g. bash 2.01 and pdksh 5.2.14).
+for as_var in BASH_ENV ENV MAIL MAILPATH CDPATH
+do eval test \${$as_var+y} \
+ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+done
+
+# Ensure that fds 0, 1, and 2 are open.
+if (exec 3>&0) 2>/dev/null; then :; else exec 0</dev/null; fi
+if (exec 3>&1) 2>/dev/null; then :; else exec 1>/dev/null; fi
+if (exec 3>&2) ; then :; else exec 2>/dev/null; fi
# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
+if ${PATH_SEPARATOR+false} :; then
PATH_SEPARATOR=:
(PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
(PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
@@ -4164,13 +4306,6 @@ if test "${PATH_SEPARATOR+set}" != set; then
fi
-# IFS
-# We need space, tab and new line, in precisely that order. Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-IFS=" "" $as_nl"
-
# Find who we are. Look in the path if we contain no directory separator.
as_myself=
case $0 in #((
@@ -4179,8 +4314,12 @@ case $0 in #((
for as_dir in $PATH
do
IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+ case $as_dir in #(((
+ '') as_dir=./ ;;
+ */) ;;
+ *) as_dir=$as_dir/ ;;
+ esac
+ test -r "$as_dir$0" && as_myself=$as_dir$0 && break
done
IFS=$as_save_IFS
@@ -4192,30 +4331,10 @@ if test "x$as_myself" = x; then
as_myself=$0
fi
if test ! -f "$as_myself"; then
- $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+ printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
exit 1
fi
-# Unset variables that we do not need and which cause bugs (e.g. in
-# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1"
-# suppresses any "Segmentation fault" message there. '((' could
-# trigger a bug in pdksh 5.2.14.
-for as_var in BASH_ENV ENV MAIL MAILPATH
-do eval test x\${$as_var+set} = xset \
- && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# CDPATH.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
# as_fn_error STATUS ERROR [LINENO LOG_FD]
@@ -4228,13 +4347,14 @@ as_fn_error ()
as_status=$1; test $as_status -eq 0 && as_status=1
if test "$4"; then
as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
fi
- $as_echo "$as_me: error: $2" >&2
+ printf "%s\n" "$as_me: error: $2" >&2
as_fn_exit $as_status
} # as_fn_error
+
# as_fn_set_status STATUS
# -----------------------
# Set $? to STATUS, without forking.
@@ -4261,18 +4381,20 @@ as_fn_unset ()
{ eval $1=; unset $1;}
}
as_unset=as_fn_unset
+
# as_fn_append VAR VALUE
# ----------------------
# Append the text in VALUE to the end of the definition contained in VAR. Take
# advantage of any shell optimizations that allow amortized linear growth over
# repeated appends, instead of the typical quadratic growth present in naive
# implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null
+then :
eval 'as_fn_append ()
{
eval $1+=\$2
}'
-else
+else $as_nop
as_fn_append ()
{
eval $1=\$$1\$2
@@ -4284,12 +4406,13 @@ fi # as_fn_append
# Perform arithmetic evaluation on the ARGs, and store the result in the
# global $as_val. Take advantage of shells that can avoid forks. The arguments
# must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null
+then :
eval 'as_fn_arith ()
{
as_val=$(( $* ))
}'
-else
+else $as_nop
as_fn_arith ()
{
as_val=`expr "$@" || test $? -eq 1`
@@ -4320,7 +4443,7 @@ as_me=`$as_basename -- "$0" ||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
+printf "%s\n" X/"$0" |
sed '/^.*\/\([^/][^/]*\)\/*$/{
s//\1/
q
@@ -4342,6 +4465,10 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS
as_cr_digits='0123456789'
as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+# Determine whether it's possible to make 'echo' print without a newline.
+# These variables are no longer used directly by Autoconf, but are AC_SUBSTed
+# for compatibility with existing Makefiles.
ECHO_C= ECHO_N= ECHO_T=
case `echo -n x` in #(((((
-n*)
@@ -4355,6 +4482,12 @@ case `echo -n x` in #(((((
ECHO_N='-n';;
esac
+# For backward compatibility with old third-party macros, we provide
+# the shell variables $as_echo and $as_echo_n. New code should use
+# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively.
+as_echo='printf %s\n'
+as_echo_n='printf %s'
+
rm -f conf$$ conf$$.exe conf$$.file
if test -d conf$$.dir; then
rm -f conf$$.dir/conf$$.file
@@ -4396,7 +4529,7 @@ as_fn_mkdir_p ()
as_dirs=
while :; do
case $as_dir in #(
- *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+ *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
*) as_qdir=$as_dir;;
esac
as_dirs="'$as_qdir' $as_dirs"
@@ -4405,7 +4538,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$as_dir" : 'X\(//\)[^/]' \| \
X"$as_dir" : 'X\(//\)$' \| \
X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
+printf "%s\n" X"$as_dir" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
@@ -4468,7 +4601,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# values after options handling.
ac_log="
This file was extended by $as_me, which was
-generated by GNU Autoconf 2.69. Invocation command line was
+generated by GNU Autoconf 2.71. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
@@ -4517,14 +4650,16 @@ $config_files
Report bugs to the package provider."
_ACEOF
+ac_cs_config=`printf "%s\n" "$ac_configure_args" | sed "$ac_safe_unquote"`
+ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\''/g"`
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
+ac_cs_config='$ac_cs_config_escaped'
ac_cs_version="\\
config.status
-configured by $0, generated by GNU Autoconf 2.69,
+configured by $0, generated by GNU Autoconf 2.71,
with options \\"\$ac_cs_config\\"
-Copyright (C) 2012 Free Software Foundation, Inc.
+Copyright (C) 2021 Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
@@ -4562,21 +4697,21 @@ do
-recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
ac_cs_recheck=: ;;
--version | --versio | --versi | --vers | --ver | --ve | --v | -V )
- $as_echo "$ac_cs_version"; exit ;;
+ printf "%s\n" "$ac_cs_version"; exit ;;
--config | --confi | --conf | --con | --co | --c )
- $as_echo "$ac_cs_config"; exit ;;
+ printf "%s\n" "$ac_cs_config"; exit ;;
--debug | --debu | --deb | --de | --d | -d )
debug=: ;;
--file | --fil | --fi | --f )
$ac_shift
case $ac_optarg in
- *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+ *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
'') as_fn_error $? "missing file argument" ;;
esac
as_fn_append CONFIG_FILES " '$ac_optarg'"
ac_need_defaults=false;;
--he | --h | --help | --hel | -h )
- $as_echo "$ac_cs_usage"; exit ;;
+ printf "%s\n" "$ac_cs_usage"; exit ;;
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
| -silent | --silent | --silen | --sile | --sil | --si | --s)
ac_cs_silent=: ;;
@@ -4604,7 +4739,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
if \$ac_cs_recheck; then
set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
shift
- \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
+ \printf "%s\n" "running CONFIG_SHELL=$SHELL \$*" >&6
CONFIG_SHELL='$SHELL'
export CONFIG_SHELL
exec "\$@"
@@ -4618,7 +4753,7 @@ exec 5>>config.log
sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
## Running $as_me. ##
_ASBOX
- $as_echo "$ac_log"
+ printf "%s\n" "$ac_log"
} >&5
_ACEOF
@@ -4643,7 +4778,7 @@ done
# We use the long form for the default assignment because of an extremely
# bizarre bug on SunOS 4.1.3.
if $ac_need_defaults; then
- test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
+ test ${CONFIG_FILES+y} || CONFIG_FILES=$config_files
fi
# Have a temporary directory for convenience. Make it in the build tree
@@ -4871,7 +5006,7 @@ do
esac ||
as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
esac
- case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+ case $ac_f in *\'*) ac_f=`printf "%s\n" "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
as_fn_append ac_file_inputs " '$ac_f'"
done
@@ -4879,17 +5014,17 @@ do
# use $as_me), people would be surprised to read:
# /* config.h. Generated by config.status. */
configure_input='Generated from '`
- $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+ printf "%s\n" "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
`' by configure.'
if test x"$ac_file" != x-; then
configure_input="$ac_file. $configure_input"
- { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
-$as_echo "$as_me: creating $ac_file" >&6;}
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
+printf "%s\n" "$as_me: creating $ac_file" >&6;}
fi
# Neutralize special characters interpreted by sed in replacement strings.
case $configure_input in #(
*\&* | *\|* | *\\* )
- ac_sed_conf_input=`$as_echo "$configure_input" |
+ ac_sed_conf_input=`printf "%s\n" "$configure_input" |
sed 's/[\\\\&|]/\\\\&/g'`;; #(
*) ac_sed_conf_input=$configure_input;;
esac
@@ -4906,7 +5041,7 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$ac_file" : 'X\(//\)[^/]' \| \
X"$ac_file" : 'X\(//\)$' \| \
X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$ac_file" |
+printf "%s\n" X"$ac_file" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
@@ -4930,9 +5065,9 @@ $as_echo X"$ac_file" |
case "$ac_dir" in
.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
*)
- ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+ ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'`
# A ".." for each directory in $ac_dir_suffix.
- ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+ ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
case $ac_top_builddir_sub in
"") ac_top_builddir_sub=. ac_top_build_prefix= ;;
*) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -4989,8 +5124,8 @@ ac_sed_dataroot='
case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
*datarootdir*) ac_datarootdir_seen=yes;;
*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+printf "%s\n" "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_datarootdir_hack='
@@ -5033,9 +5168,9 @@ test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
{ ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
{ ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \
"$ac_tmp/out"`; test -z "$ac_out"; } &&
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
which seems to be undefined. Please make sure it is defined" >&5
-$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+printf "%s\n" "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
which seems to be undefined. Please make sure it is defined" >&2;}
rm -f "$ac_tmp/stdin"
@@ -5082,7 +5217,8 @@ if test "$no_create" != yes; then
$ac_cs_success || as_fn_exit 1
fi
if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
-$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
fi
+
diff --git a/language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/configure.ac b/language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/configure.ac
index 4c28719516..2fb3878516 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/configure.ac
+++ b/language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/configure.ac
@@ -1,6 +1,6 @@
-dnl This file is part of the CJK package ver. 4.8.4
+dnl This file is part of the CJK package ver. 4.8.5
-dnl Copyright (C) 1994-2015 Werner Lemberg <wl@gnu.org>
+dnl Copyright (C) 1994-2021 Werner Lemberg <wl@gnu.org>
dnl This program is free software; you can redistribute it and/or modify
dnl it under the terms of the GNU General Public License as published by
@@ -30,9 +30,6 @@ dnl Checks for programs.
AC_PROG_CC
-dnl Checks for header files.
-AC_HEADER_STDC
-
AC_ARG_WITH(kpathsea-include,
[ --with-kpathsea-include=DIR
location of the kpathsea include dir],[
diff --git a/language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/dvidrv.btm b/language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/dvidrv.btm
index 4ec03d0bf2..9b43c09100 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/dvidrv.btm
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/emdir.c b/language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/emdir.c
index 4e759c83eb..4e759c83eb 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/emdir.c
+++ b/language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/emdir.c
diff --git a/language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/emdir.h b/language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/emdir.h
index 0606d476ab..0606d476ab 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/emdir.h
+++ b/language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/emdir.h
diff --git a/language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/emtexdir.c b/language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/emtexdir.c
index 9a35570adb..9a35570adb 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/emtexdir.c
+++ b/language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/emtexdir.c
diff --git a/language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/emtexdir.h b/language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/emtexdir.h
index a9a986db05..a9a986db05 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/emtexdir.h
+++ b/language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/emtexdir.h
diff --git a/language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/hbf.c b/language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/hbf.c
index dedb9650b2..dedb9650b2 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/hbf.c
+++ b/language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/hbf.c
diff --git a/language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/hbf.h b/language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/hbf.h
index 34f5940a71..34f5940a71 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/hbf.h
+++ b/language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/hbf.h
diff --git a/language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/hbf2gf.1 b/language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/hbf2gf.1
index 144e7e6893..c856eff1c9 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/hbf2gf.1
+++ b/language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/hbf2gf.1
@@ -1,6 +1,6 @@
.\" man page for hbf2gf
.\"
-.\" 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
.\"
.
-.TH HBF2GF 1 18-Apr-2015 "CJK Version 4.8.4"
+.TH HBF2GF 1 16-Oct-2021 "CJK Version 4.8.5"
.SH NAME
hbf2gf \- convert a CJK bitmap font into subfonts usable by TeX and Omega.
.
diff --git a/language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/hbf2gf.c b/language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/hbf2gf.c
index 1e250496a6..c6f666581d 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/hbf2gf.c
+++ b/language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/hbf2gf.c
@@ -1,5 +1,5 @@
#define banner \
-"hbf2gf (CJK ver. 4.8.4)" \
+"hbf2gf (CJK ver. 4.8.5)" \
\
#define TRUE 1
@@ -100,10 +100,10 @@
#define VALID_SUBCODE 1 \
/*4:*/
-#line 191 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
+#line 191 "/home/wl/git/cjk/cjk-4.8.5/utils/hbf2gf/hbf2gf.w"
/*10:*/
-#line 408 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
+#line 408 "/home/wl/git/cjk/cjk-4.8.5/utils/hbf2gf/hbf2gf.w"
#ifdef HAVE_CONFIG_H
#include <c-auto.h>
@@ -121,7 +121,7 @@
/*:10*//*69:*/
-#line 2473 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
+#line 2473 "/home/wl/git/cjk/cjk-4.8.5/utils/hbf2gf/hbf2gf.w"
#if defined(HAVE_LIBKPATHSEA)
#include "kpathsea/kpathsea.h"
@@ -134,46 +134,46 @@
#endif
/*:69*/
-#line 192 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
+#line 192 "/home/wl/git/cjk/cjk-4.8.5/utils/hbf2gf/hbf2gf.w"
/*11:*/
-#line 429 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
+#line 429 "/home/wl/git/cjk/cjk-4.8.5/utils/hbf2gf/hbf2gf.w"
static void write_file(void);
/*:11*//*13:*/
-#line 491 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
+#line 491 "/home/wl/git/cjk/cjk-4.8.5/utils/hbf2gf/hbf2gf.w"
static void write_pre(void);
/*:13*//*16:*/
-#line 579 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
+#line 579 "/home/wl/git/cjk/cjk-4.8.5/utils/hbf2gf/hbf2gf.w"
static void write_data(void);
/*:16*//*20:*/
-#line 690 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
+#line 690 "/home/wl/git/cjk/cjk-4.8.5/utils/hbf2gf/hbf2gf.w"
static void write_post(void);
/*:20*//*25:*/
-#line 834 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
+#line 834 "/home/wl/git/cjk/cjk-4.8.5/utils/hbf2gf/hbf2gf.w"
static void fputl(long,FILE*);
/*:25*//*29:*/
-#line 994 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
+#line 994 "/home/wl/git/cjk/cjk-4.8.5/utils/hbf2gf/hbf2gf.w"
static void make_pixel_array(void);
/*:29*//*36:*/
-#line 1222 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
+#line 1222 "/home/wl/git/cjk/cjk-4.8.5/utils/hbf2gf/hbf2gf.w"
static
#ifdef __GNUC__
@@ -183,7 +183,7 @@ void read_row(unsigned char*);
/*:36*//*39:*/
-#line 1274 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
+#line 1274 "/home/wl/git/cjk/cjk-4.8.5/utils/hbf2gf/hbf2gf.w"
static
#ifdef __GNUC__
@@ -193,55 +193,55 @@ void write_row(unsigned char*);
/*:39*//*41:*/
-#line 1329 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
+#line 1329 "/home/wl/git/cjk/cjk-4.8.5/utils/hbf2gf/hbf2gf.w"
static void write_coding(void);
/*:41*//*45:*/
-#line 1490 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
+#line 1490 "/home/wl/git/cjk/cjk-4.8.5/utils/hbf2gf/hbf2gf.w"
static void write_pl(void);
/*:45*//*47:*/
-#line 1587 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
+#line 1587 "/home/wl/git/cjk/cjk-4.8.5/utils/hbf2gf/hbf2gf.w"
static void write_ovp(void);
/*:47*//*50:*/
-#line 1732 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
+#line 1732 "/home/wl/git/cjk/cjk-4.8.5/utils/hbf2gf/hbf2gf.w"
static void write_job(void);
/*:50*//*54:*/
-#line 1981 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
+#line 1981 "/home/wl/git/cjk/cjk-4.8.5/utils/hbf2gf/hbf2gf.w"
static void read_config(void);
/*:54*//*64:*/
-#line 2312 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
+#line 2312 "/home/wl/git/cjk/cjk-4.8.5/utils/hbf2gf/hbf2gf.w"
static int fsearch(const char*);
/*:64*//*67:*/
-#line 2451 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
+#line 2451 "/home/wl/git/cjk/cjk-4.8.5/utils/hbf2gf/hbf2gf.w"
static void config_error(const char*);
/*:67*//*71:*/
-#line 2494 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
+#line 2494 "/home/wl/git/cjk/cjk-4.8.5/utils/hbf2gf/hbf2gf.w"
static const char*TeX_search_version(void);
/*:71*//*74:*/
-#line 2529 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
+#line 2529 "/home/wl/git/cjk/cjk-4.8.5/utils/hbf2gf/hbf2gf.w"
#ifdef HAVE_EMTEXDIR
extern int setup_list(struct emtex_dir*,char*,const char*,unsigned);
@@ -251,17 +251,17 @@ static char*file_find(char*,struct emtex_dir*);
/*:74*//*79:*/
-#line 2621 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
+#line 2621 "/home/wl/git/cjk/cjk-4.8.5/utils/hbf2gf/hbf2gf.w"
static char*TeX_search_cfg_file(char*);
static char*TeX_search_hbf_file(char*);
/*:79*/
-#line 193 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
+#line 193 "/home/wl/git/cjk/cjk-4.8.5/utils/hbf2gf/hbf2gf.w"
/*2:*/
-#line 127 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
+#line 127 "/home/wl/git/cjk/cjk-4.8.5/utils/hbf2gf/hbf2gf.w"
int nmb_files= -1;
int unicode= FALSE;
@@ -302,7 +302,7 @@ int end_of_file= FALSE;
/*:2*//*15:*/
-#line 538 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
+#line 538 "/home/wl/git/cjk/cjk-4.8.5/utils/hbf2gf/hbf2gf.w"
long char_adr[256];
long*char_adr_p;
@@ -344,7 +344,7 @@ int dot_count;
/*:15*//*19:*/
-#line 667 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
+#line 667 "/home/wl/git/cjk/cjk-4.8.5/utils/hbf2gf/hbf2gf.w"
char coding[STRING_LENGTH+1];
char comment[STRING_LENGTH+1];
@@ -363,7 +363,7 @@ double ppp_y;
/*:19*//*27:*/
-#line 871 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
+#line 871 "/home/wl/git/cjk/cjk-4.8.5/utils/hbf2gf/hbf2gf.w"
HBF_CHAR code;
const unsigned char*bitmap;
@@ -386,13 +386,13 @@ long s_mag_x,s_mag_y,s_slant;
/*:27*//*38:*/
-#line 1269 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
+#line 1269 "/home/wl/git/cjk/cjk-4.8.5/utils/hbf2gf/hbf2gf.w"
int threshold= 128;
/*:38*//*49:*/
-#line 1721 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
+#line 1721 "/home/wl/git/cjk/cjk-4.8.5/utils/hbf2gf/hbf2gf.w"
char job_extension[EXTENSION_LENGTH+1];
char rm_command[STRING_LENGTH+1];
@@ -404,13 +404,13 @@ int ofm_file= FALSE;
/*:49*//*53:*/
-#line 1976 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
+#line 1976 "/home/wl/git/cjk/cjk-4.8.5/utils/hbf2gf/hbf2gf.w"
char Buffer[STRING_LENGTH+1];
/*:53*//*58:*/
-#line 2094 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
+#line 2094 "/home/wl/git/cjk/cjk-4.8.5/utils/hbf2gf/hbf2gf.w"
int offset_x;
int offset_y;
@@ -419,13 +419,13 @@ HBF_CHAR user_min_char;
int have_min_char= FALSE;
/*:58*//*60:*/
-#line 2251 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
+#line 2251 "/home/wl/git/cjk/cjk-4.8.5/utils/hbf2gf/hbf2gf.w"
HBF_CHAR min_char,max_char;
/*:60*//*62:*/
-#line 2278 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
+#line 2278 "/home/wl/git/cjk/cjk-4.8.5/utils/hbf2gf/hbf2gf.w"
char b2_codes[256];
unsigned char min_2_byte,max_2_byte;
@@ -433,7 +433,7 @@ int nmb_2_bytes= 0;
/*:62*//*70:*/
-#line 2485 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
+#line 2485 "/home/wl/git/cjk/cjk-4.8.5/utils/hbf2gf/hbf2gf.w"
#if defined(HAVE_EMTEXDIR)
char emtex_version_string[]= "emTeXdir";
@@ -443,7 +443,7 @@ char no_version_string[]= "no search library";
/*:70*//*73:*/
-#line 2522 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
+#line 2522 "/home/wl/git/cjk/cjk-4.8.5/utils/hbf2gf/hbf2gf.w"
#ifdef HAVE_EMTEXDIR
struct emtex_dir cfg_path,hbf_path;
@@ -451,7 +451,7 @@ struct emtex_dir cfg_path,hbf_path;
/*:73*//*76:*/
-#line 2569 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
+#line 2569 "/home/wl/git/cjk/cjk-4.8.5/utils/hbf2gf/hbf2gf.w"
#ifdef HAVE_EMTEXDIR
char name_buffer[FILE_NAME_LENGTH+1];
@@ -459,7 +459,7 @@ char name_buffer[FILE_NAME_LENGTH+1];
/*:76*/
-#line 194 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
+#line 194 "/home/wl/git/cjk/cjk-4.8.5/utils/hbf2gf/hbf2gf.w"
@@ -467,7 +467,7 @@ int main(int argc,char*argv[])
{char*p;
/*78:*/
-#line 2594 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
+#line 2594 "/home/wl/git/cjk/cjk-4.8.5/utils/hbf2gf/hbf2gf.w"
#if defined(HAVE_LIBKPATHSEA)
kpse_set_program_name(argv[0],"hbf2gf");
@@ -488,16 +488,16 @@ exit(1);
/*:78*/
-#line 200 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
+#line 200 "/home/wl/git/cjk/cjk-4.8.5/utils/hbf2gf/hbf2gf.w"
/*7:*/
-#line 307 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
+#line 307 "/home/wl/git/cjk/cjk-4.8.5/utils/hbf2gf/hbf2gf.w"
if(argc==2)
{if(strcmp(argv[1],"--help")==0)
/*6:*/
-#line 288 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
+#line 288 "/home/wl/git/cjk/cjk-4.8.5/utils/hbf2gf/hbf2gf.w"
{printf(USAGE);
exit(0);
@@ -505,11 +505,11 @@ exit(0);
/*:6*/
-#line 310 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
+#line 310 "/home/wl/git/cjk/cjk-4.8.5/utils/hbf2gf/hbf2gf.w"
else if(strcmp(argv[1],"--version")==0)
/*5:*/
-#line 261 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
+#line 261 "/home/wl/git/cjk/cjk-4.8.5/utils/hbf2gf/hbf2gf.w"
{printf("\n");
printf(banner);
@@ -520,7 +520,7 @@ exit(0);
/*:5*/
-#line 312 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
+#line 312 "/home/wl/git/cjk/cjk-4.8.5/utils/hbf2gf/hbf2gf.w"
}
@@ -558,7 +558,7 @@ exit(1);
/*:7*/
-#line 202 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
+#line 202 "/home/wl/git/cjk/cjk-4.8.5/utils/hbf2gf/hbf2gf.w"
if(!quiet)
@@ -587,7 +587,7 @@ read_config();
if(mf_like)
/*8:*/
-#line 352 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
+#line 352 "/home/wl/git/cjk/cjk-4.8.5/utils/hbf2gf/hbf2gf.w"
{if(unicode)
file_number= (int)strtol(&argv[1][strlen(argv[1])-2],
@@ -615,11 +615,11 @@ y_scale= (double)x_resolution/y_scale;
/*:8*/
-#line 229 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
+#line 229 "/home/wl/git/cjk/cjk-4.8.5/utils/hbf2gf/hbf2gf.w"
/*28:*/
-#line 903 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
+#line 903 "/home/wl/git/cjk/cjk-4.8.5/utils/hbf2gf/hbf2gf.w"
{int col,offset;
@@ -702,11 +702,11 @@ s_slant= slant*SCALE;
/*:28*/
-#line 231 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
+#line 231 "/home/wl/git/cjk/cjk-4.8.5/utils/hbf2gf/hbf2gf.w"
/*9:*/
-#line 387 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
+#line 387 "/home/wl/git/cjk/cjk-4.8.5/utils/hbf2gf/hbf2gf.w"
{int j,max_numb;
@@ -728,7 +728,7 @@ nmb_files= j;
/*:9*/
-#line 233 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
+#line 233 "/home/wl/git/cjk/cjk-4.8.5/utils/hbf2gf/hbf2gf.w"
if(tfm_files)
@@ -746,7 +746,7 @@ return 0;
/*:4*//*12:*/
-#line 437 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
+#line 437 "/home/wl/git/cjk/cjk-4.8.5/utils/hbf2gf/hbf2gf.w"
static void write_file(void)
{char output_file[FILE_NAME_LENGTH+1];
@@ -790,7 +790,7 @@ write_data();
/*:12*//*14:*/
-#line 498 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
+#line 498 "/home/wl/git/cjk/cjk-4.8.5/utils/hbf2gf/hbf2gf.w"
static void write_pre(void)
{char out_s[40],s[20];
@@ -813,7 +813,7 @@ fputs(out_s,out);
/*:14*//*17:*/
-#line 584 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
+#line 584 "/home/wl/git/cjk/cjk-4.8.5/utils/hbf2gf/hbf2gf.w"
static void write_data(void)
{dot_count= 0;
@@ -821,7 +821,7 @@ char_adr_p= char_adr;
for(last_char= 0;(last_char<256)&&!end_of_file;last_char++)
/*18:*/
-#line 609 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
+#line 609 "/home/wl/git/cjk/cjk-4.8.5/utils/hbf2gf/hbf2gf.w"
{if(dot_count++%10==0)
if(pk_files&&!quiet)
@@ -865,13 +865,13 @@ fputc(EOC,out);
/*:18*/
-#line 590 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
+#line 590 "/home/wl/git/cjk/cjk-4.8.5/utils/hbf2gf/hbf2gf.w"
}
/*:17*//*21:*/
-#line 695 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
+#line 695 "/home/wl/git/cjk/cjk-4.8.5/utils/hbf2gf/hbf2gf.w"
static void write_post(void)
{long special_adr;
@@ -899,7 +899,7 @@ tfm_width= (tfm_output_size_x+2*tfm_offset_x)*_2_20;
/*22:*/
-#line 741 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
+#line 741 "/home/wl/git/cjk/cjk-4.8.5/utils/hbf2gf/hbf2gf.w"
special_adr= ftell(out);
@@ -917,10 +917,10 @@ fputs(comment,out);
/*:22*/
-#line 721 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
+#line 721 "/home/wl/git/cjk/cjk-4.8.5/utils/hbf2gf/hbf2gf.w"
/*23:*/
-#line 770 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
+#line 770 "/home/wl/git/cjk/cjk-4.8.5/utils/hbf2gf/hbf2gf.w"
post_adr= ftell(out);
fputc(POST,out);
@@ -959,10 +959,10 @@ fputl(*char_adr_p++,out);
/*:23*/
-#line 722 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
+#line 722 "/home/wl/git/cjk/cjk-4.8.5/utils/hbf2gf/hbf2gf.w"
/*24:*/
-#line 821 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
+#line 821 "/home/wl/git/cjk/cjk-4.8.5/utils/hbf2gf/hbf2gf.w"
fputc(POSTPOST,out);
fputl(post_adr,out);
@@ -974,13 +974,13 @@ fputc(POSTPOST_ID,out);
/*:24*/
-#line 723 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
+#line 723 "/home/wl/git/cjk/cjk-4.8.5/utils/hbf2gf/hbf2gf.w"
}
/*:21*//*26:*/
-#line 839 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
+#line 839 "/home/wl/git/cjk/cjk-4.8.5/utils/hbf2gf/hbf2gf.w"
static void fputl(long num,FILE*f)
{fputc(num>>24,f);
@@ -991,7 +991,7 @@ fputc(num,f);
/*:26*//*30:*/
-#line 999 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
+#line 999 "/home/wl/git/cjk/cjk-4.8.5/utils/hbf2gf/hbf2gf.w"
static void make_pixel_array(void)
{unsigned char*prP;
@@ -1029,7 +1029,7 @@ if(!bitmap)
empty_char= TRUE;
else
/*31:*/
-#line 1058 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
+#line 1058 "/home/wl/git/cjk/cjk-4.8.5/utils/hbf2gf/hbf2gf.w"
{if(pk_output_size_y==input_size_y)
temp_prP= prP;
@@ -1037,7 +1037,7 @@ temp_prP= prP;
curr_row= input_size_y-1;
for(row= 0;row<pk_output_size_y;++row)
{/*32:*/
-#line 1072 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
+#line 1072 "/home/wl/git/cjk/cjk-4.8.5/utils/hbf2gf/hbf2gf.w"
if(pk_output_size_y==input_size_y)
@@ -1059,7 +1059,7 @@ need_to_read_row= 1;
}
/*33:*/
-#line 1099 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
+#line 1099 "/home/wl/git/cjk/cjk-4.8.5/utils/hbf2gf/hbf2gf.w"
if(need_to_read_row)
if(rows_read<input_size_y)
@@ -1091,16 +1091,16 @@ frac_row_to_fill= SCALE;
/*:33*/
-#line 1092 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
+#line 1092 "/home/wl/git/cjk/cjk-4.8.5/utils/hbf2gf/hbf2gf.w"
}
/*:32*/
-#line 1064 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
+#line 1064 "/home/wl/git/cjk/cjk-4.8.5/utils/hbf2gf/hbf2gf.w"
/*34:*/
-#line 1140 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
+#line 1140 "/home/wl/git/cjk/cjk-4.8.5/utils/hbf2gf/hbf2gf.w"
if(pk_width==input_size_x&&s_slant==0)
@@ -1155,7 +1155,7 @@ frac_col_to_fill-= frac_col_left;
}
/*35:*/
-#line 1198 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
+#line 1198 "/home/wl/git/cjk/cjk-4.8.5/utils/hbf2gf/hbf2gf.w"
if(frac_col_to_fill> 0)
{--xP;
@@ -1175,20 +1175,20 @@ write_row(new_prP);
/*:35*/
-#line 1193 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
+#line 1193 "/home/wl/git/cjk/cjk-4.8.5/utils/hbf2gf/hbf2gf.w"
}
/*:34*/
-#line 1066 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
+#line 1066 "/home/wl/git/cjk/cjk-4.8.5/utils/hbf2gf/hbf2gf.w"
}
}
/*:31*/
-#line 1035 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
+#line 1035 "/home/wl/git/cjk/cjk-4.8.5/utils/hbf2gf/hbf2gf.w"
}
}
@@ -1212,7 +1212,7 @@ goto again;
/*:30*//*37:*/
-#line 1231 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
+#line 1231 "/home/wl/git/cjk/cjk-4.8.5/utils/hbf2gf/hbf2gf.w"
static
#ifdef __GNUC__
@@ -1248,7 +1248,7 @@ bitshift= 7;
/*:37*//*40:*/
-#line 1283 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
+#line 1283 "/home/wl/git/cjk/cjk-4.8.5/utils/hbf2gf/hbf2gf.w"
static
#ifdef __GNUC__
@@ -1265,7 +1265,7 @@ for(col= 0,xP= pixelrow;col<pk_output_size_x;++col,++xP)
/*:40*//*42:*/
-#line 1337 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
+#line 1337 "/home/wl/git/cjk/cjk-4.8.5/utils/hbf2gf/hbf2gf.w"
static void write_coding(void)
{register int count,skip;
@@ -1282,7 +1282,7 @@ goto start;
while(y<pk_output_size_y)
{/*43:*/
-#line 1361 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
+#line 1361 "/home/wl/git/cjk/cjk-4.8.5/utils/hbf2gf/hbf2gf.w"
count= 0;
x= 0;
@@ -1351,11 +1351,11 @@ continue;
/*:43*/
-#line 1352 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
+#line 1352 "/home/wl/git/cjk/cjk-4.8.5/utils/hbf2gf/hbf2gf.w"
start:
/*44:*/
-#line 1429 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
+#line 1429 "/home/wl/git/cjk/cjk-4.8.5/utils/hbf2gf/hbf2gf.w"
while(x<pk_output_size_x)
{if(*cp==paint)
@@ -1396,7 +1396,7 @@ paint= WHITE;
/*:44*/
-#line 1354 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
+#line 1354 "/home/wl/git/cjk/cjk-4.8.5/utils/hbf2gf/hbf2gf.w"
y++;
}
@@ -1404,7 +1404,7 @@ y++;
/*:42*//*46:*/
-#line 1495 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
+#line 1495 "/home/wl/git/cjk/cjk-4.8.5/utils/hbf2gf/hbf2gf.w"
static void write_pl(void)
{int i,pos;
@@ -1494,7 +1494,7 @@ fclose(out);
/*:46*//*48:*/
-#line 1592 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
+#line 1592 "/home/wl/git/cjk/cjk-4.8.5/utils/hbf2gf/hbf2gf.w"
static void write_ovp(void)
{int c,i,nmb_subfonts,remainder,count,pos;
@@ -1609,7 +1609,7 @@ fclose(out);
/*:48*//*51:*/
-#line 1737 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
+#line 1737 "/home/wl/git/cjk/cjk-4.8.5/utils/hbf2gf/hbf2gf.w"
static void write_job(void)
{FILE*out;
@@ -1695,7 +1695,7 @@ fclose(out);
/*:51*//*55:*/
-#line 1989 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
+#line 1989 "/home/wl/git/cjk/cjk-4.8.5/utils/hbf2gf/hbf2gf.w"
static void read_config(void)
{HBF_BBOX*boxp;
@@ -1703,7 +1703,7 @@ char*real_config_file;
/*56:*/
-#line 2041 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
+#line 2041 "/home/wl/git/cjk/cjk-4.8.5/utils/hbf2gf/hbf2gf.w"
{int i,lastext= -1;
@@ -1721,7 +1721,7 @@ strcat(config_file,".cfg");
/*:56*/
-#line 1995 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
+#line 1995 "/home/wl/git/cjk/cjk-4.8.5/utils/hbf2gf/hbf2gf.w"
real_config_file= TeX_search_cfg_file(config_file);
@@ -1756,7 +1756,7 @@ exit(0);
}
/*57:*/
-#line 2058 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
+#line 2058 "/home/wl/git/cjk/cjk-4.8.5/utils/hbf2gf/hbf2gf.w"
{char hbf_header[STRING_LENGTH+1];
char*real_hbf_header;
@@ -1793,10 +1793,10 @@ strcpy(output_name,Buffer);
/*:57*/
-#line 2028 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
+#line 2028 "/home/wl/git/cjk/cjk-4.8.5/utils/hbf2gf/hbf2gf.w"
/*59:*/
-#line 2102 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
+#line 2102 "/home/wl/git/cjk/cjk-4.8.5/utils/hbf2gf/hbf2gf.w"
{if(fsearch("nmb_files"))
nmb_files= atoi(Buffer);
@@ -1938,11 +1938,11 @@ job_extension[EXTENSION_LENGTH]= '\0';
/*:59*/
-#line 2029 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
+#line 2029 "/home/wl/git/cjk/cjk-4.8.5/utils/hbf2gf/hbf2gf.w"
/*61:*/
-#line 2256 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
+#line 2256 "/home/wl/git/cjk/cjk-4.8.5/utils/hbf2gf/hbf2gf.w"
{const void*cp;
HBF_CHAR dummy;
@@ -1957,10 +1957,10 @@ min_char= user_min_char;
/*:61*/
-#line 2031 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
+#line 2031 "/home/wl/git/cjk/cjk-4.8.5/utils/hbf2gf/hbf2gf.w"
/*63:*/
-#line 2285 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
+#line 2285 "/home/wl/git/cjk/cjk-4.8.5/utils/hbf2gf/hbf2gf.w"
{const void*b2r;
unsigned char dummy;
@@ -1983,7 +1983,7 @@ nmb_2_bytes++;
/*:63*/
-#line 2032 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
+#line 2032 "/home/wl/git/cjk/cjk-4.8.5/utils/hbf2gf/hbf2gf.w"
fclose(config);
@@ -1991,7 +1991,7 @@ fclose(config);
/*:55*//*65:*/
-#line 2317 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
+#line 2317 "/home/wl/git/cjk/cjk-4.8.5/utils/hbf2gf/hbf2gf.w"
static int fsearch(const char*search_string)
{char*P,p;
@@ -2047,7 +2047,7 @@ Ch= fgetc(config);
if(*temp_buffer)
/*66:*/
-#line 2396 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
+#line 2396 "/home/wl/git/cjk/cjk-4.8.5/utils/hbf2gf/hbf2gf.w"
{P= temp_buffer;
Buf_p= Buffer;
@@ -2100,7 +2100,7 @@ count--;
/*:66*/
-#line 2371 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
+#line 2371 "/home/wl/git/cjk/cjk-4.8.5/utils/hbf2gf/hbf2gf.w"
else
*Buffer= '\0';
@@ -2110,7 +2110,7 @@ return(*Buffer)?1:0;
/*:65*//*68:*/
-#line 2456 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
+#line 2456 "/home/wl/git/cjk/cjk-4.8.5/utils/hbf2gf/hbf2gf.w"
static void config_error(const char*message)
{fprintf(stderr,"Couldn't find `%s' entry in configuration file\n",
@@ -2121,7 +2121,7 @@ exit(1);
/*:68*//*72:*/
-#line 2499 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
+#line 2499 "/home/wl/git/cjk/cjk-4.8.5/utils/hbf2gf/hbf2gf.w"
static const char*TeX_search_version(void)
{
@@ -2143,7 +2143,7 @@ return no_version_string;
/*:72*//*75:*/
-#line 2541 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
+#line 2541 "/home/wl/git/cjk/cjk-4.8.5/utils/hbf2gf/hbf2gf.w"
#ifdef HAVE_EMTEXDIR
static int dir_setup(ed,env,dir,flags)
@@ -2172,7 +2172,7 @@ return TRUE;
/*:75*//*77:*/
-#line 2576 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
+#line 2576 "/home/wl/git/cjk/cjk-4.8.5/utils/hbf2gf/hbf2gf.w"
#ifdef HAVE_EMTEXDIR
static char*file_find(name,list)
@@ -2188,7 +2188,7 @@ return NULL;
/*:77*//*80:*/
-#line 2627 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
+#line 2627 "/home/wl/git/cjk/cjk-4.8.5/utils/hbf2gf/hbf2gf.w"
#if defined(HAVE_LIBKPATHSEA)
static char*TeX_search_cfg_file(char*name)
diff --git a/language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/hbf2gf.def b/language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/hbf2gf.def
index 583767e897..6f4d22ee8c 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/hbf2gf.def
+++ b/language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/hbf2gf.def
@@ -1,3 +1,3 @@
NAME HBF2GF WINDOWCOMPAT
-DESCRIPTION 'hbf2gf (CJK Ver. 4.8.4)'
+DESCRIPTION 'hbf2gf (CJK Ver. 4.8.5)'
STACKSIZE 0x80000
diff --git a/language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/hbf2gf.w b/language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/hbf2gf.w
index 434dd7f414..b248ecc694 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/hbf2gf.w
+++ b/language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/hbf2gf.w
@@ -1,6 +1,6 @@
-% This is the cweb file hbf2gf.w of the CJK package ver. 4.8.4 18-Apr-2015
+% This is the cweb file hbf2gf.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
@@ -30,13 +30,13 @@
\def\mf{{\meta META}\-{\meta FONT}}
\def\Om{\char "0A} % Omega symbol
-\def\title{hbf2gf (CJK Version 4.8.4)}
+\def\title{hbf2gf (CJK Version 4.8.5)}
\def\topofcontents{
\null\vfill
\centerline{\titlefont The {\ttitlefont hbf2gf} program}
\vskip 20pt
- \centerline{(CJK Version 4.8.4)}
+ \centerline{(CJK Version 4.8.5)}
\vfill}
\def\botofcontents{
@@ -81,7 +81,7 @@ The ``banner line'' defined here should be changed whenever \.{hbf2gf} is
modified.
@d banner
-"hbf2gf (CJK ver. 4.8.4)"
+"hbf2gf (CJK ver. 4.8.5)"
@
diff --git a/language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/install-sh b/language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/install-sh
index 0b0fdcbba6..ec298b5374 100755
--- a/language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/install-sh
+++ b/language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/install-sh
@@ -1,7 +1,7 @@
#!/bin/sh
# install - install a program, script, or datafile
-scriptversion=2013-12-25.23; # UTC
+scriptversion=2020-11-14.01; # UTC
# This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the
@@ -69,6 +69,11 @@ posix_mkdir=
# Desired mode of installed file.
mode=0755
+# Create dirs (including intermediate dirs) using mode 755.
+# This is like GNU 'install' as of coreutils 8.32 (2020).
+mkdir_umask=22
+
+backupsuffix=
chgrpcmd=
chmodcmd=$chmodprog
chowncmd=
@@ -99,18 +104,28 @@ Options:
--version display version info and exit.
-c (ignored)
- -C install only if different (preserve the last data modification time)
+ -C install only if different (preserve data modification time)
-d create directories instead of installing files.
-g GROUP $chgrpprog installed files to GROUP.
-m MODE $chmodprog installed files to MODE.
-o USER $chownprog installed files to USER.
+ -p pass -p to $cpprog.
-s $stripprog installed files.
+ -S SUFFIX attempt to back up existing files, with suffix SUFFIX.
-t DIRECTORY install into DIRECTORY.
-T report an error if DSTFILE is a directory.
Environment variables override the default commands:
CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
RMPROG STRIPPROG
+
+By default, rm is invoked with -f; when overridden with RMPROG,
+it's up to you to specify -f if you want it.
+
+If -S is not specified, no backups are attempted.
+
+Email bug reports to bug-automake@gnu.org.
+Automake home page: https://www.gnu.org/software/automake/
"
while test $# -ne 0; do
@@ -137,8 +152,13 @@ while test $# -ne 0; do
-o) chowncmd="$chownprog $2"
shift;;
+ -p) cpprog="$cpprog -p";;
+
-s) stripcmd=$stripprog;;
+ -S) backupsuffix="$2"
+ shift;;
+
-t)
is_target_a_directory=always
dst_arg=$2
@@ -255,6 +275,10 @@ do
dstdir=$dst
test -d "$dstdir"
dstdir_status=$?
+ # Don't chown directories that already exist.
+ if test $dstdir_status = 0; then
+ chowncmd=""
+ fi
else
# Waiting for this to be detected by the "$cpprog $src $dsttmp" command
@@ -271,15 +295,18 @@ do
fi
dst=$dst_arg
- # If destination is a directory, append the input filename; won't work
- # if double slashes aren't ignored.
+ # If destination is a directory, append the input filename.
if test -d "$dst"; then
if test "$is_target_a_directory" = never; then
echo "$0: $dst_arg: Is a directory" >&2
exit 1
fi
dstdir=$dst
- dst=$dstdir/`basename "$src"`
+ dstbase=`basename "$src"`
+ case $dst in
+ */) dst=$dst$dstbase;;
+ *) dst=$dst/$dstbase;;
+ esac
dstdir_status=0
else
dstdir=`dirname "$dst"`
@@ -288,27 +315,16 @@ do
fi
fi
+ case $dstdir in
+ */) dstdirslash=$dstdir;;
+ *) dstdirslash=$dstdir/;;
+ esac
+
obsolete_mkdir_used=false
if test $dstdir_status != 0; then
case $posix_mkdir in
'')
- # Create intermediate dirs using mode 755 as modified by the umask.
- # This is like FreeBSD 'install' as of 1997-10-28.
- umask=`umask`
- case $stripcmd.$umask in
- # Optimize common cases.
- *[2367][2367]) mkdir_umask=$umask;;
- .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
-
- *[0-7])
- mkdir_umask=`expr $umask + 22 \
- - $umask % 100 % 40 + $umask % 20 \
- - $umask % 10 % 4 + $umask % 2
- `;;
- *) mkdir_umask=$umask,go-w;;
- esac
-
# With -d, create the new directory with the user-specified mode.
# Otherwise, rely on $mkdir_umask.
if test -n "$dir_arg"; then
@@ -318,43 +334,49 @@ do
fi
posix_mkdir=false
- case $umask in
- *[123567][0-7][0-7])
- # POSIX mkdir -p sets u+wx bits regardless of umask, which
- # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
- ;;
- *)
- tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
- trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
-
- if (umask $mkdir_umask &&
- exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
- then
- if test -z "$dir_arg" || {
- # Check for POSIX incompatibilities with -m.
- # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
- # other-writable bit of parent directory when it shouldn't.
- # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
- ls_ld_tmpdir=`ls -ld "$tmpdir"`
- case $ls_ld_tmpdir in
- d????-?r-*) different_mode=700;;
- d????-?--*) different_mode=755;;
- *) false;;
- esac &&
- $mkdirprog -m$different_mode -p -- "$tmpdir" && {
- ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
- test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
- }
- }
- then posix_mkdir=:
- fi
- rmdir "$tmpdir/d" "$tmpdir"
- else
- # Remove any dirs left behind by ancient mkdir implementations.
- rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
- fi
- trap '' 0;;
- esac;;
+ # The $RANDOM variable is not portable (e.g., dash). Use it
+ # here however when possible just to lower collision chance.
+ tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
+
+ trap '
+ ret=$?
+ rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null
+ exit $ret
+ ' 0
+
+ # Because "mkdir -p" follows existing symlinks and we likely work
+ # directly in world-writeable /tmp, make sure that the '$tmpdir'
+ # directory is successfully created first before we actually test
+ # 'mkdir -p'.
+ if (umask $mkdir_umask &&
+ $mkdirprog $mkdir_mode "$tmpdir" &&
+ exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1
+ then
+ if test -z "$dir_arg" || {
+ # Check for POSIX incompatibilities with -m.
+ # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
+ # other-writable bit of parent directory when it shouldn't.
+ # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
+ test_tmpdir="$tmpdir/a"
+ ls_ld_tmpdir=`ls -ld "$test_tmpdir"`
+ case $ls_ld_tmpdir in
+ d????-?r-*) different_mode=700;;
+ d????-?--*) different_mode=755;;
+ *) false;;
+ esac &&
+ $mkdirprog -m$different_mode -p -- "$test_tmpdir" && {
+ ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"`
+ test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
+ }
+ }
+ then posix_mkdir=:
+ fi
+ rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir"
+ else
+ # Remove any dirs left behind by ancient mkdir implementations.
+ rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null
+ fi
+ trap '' 0;;
esac
if
@@ -365,7 +387,7 @@ do
then :
else
- # The umask is ridiculous, or mkdir does not conform to POSIX,
+ # mkdir does not conform to POSIX,
# or it failed possibly due to a race condition. Create the
# directory the slow way, step by step, checking for races as we go.
@@ -394,7 +416,7 @@ do
prefixes=
else
if $posix_mkdir; then
- (umask=$mkdir_umask &&
+ (umask $mkdir_umask &&
$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
# Don't fail if two instances are running concurrently.
test -d "$prefix" || exit 1
@@ -427,14 +449,25 @@ do
else
# Make a couple of temp file names in the proper directory.
- dsttmp=$dstdir/_inst.$$_
- rmtmp=$dstdir/_rm.$$_
+ dsttmp=${dstdirslash}_inst.$$_
+ rmtmp=${dstdirslash}_rm.$$_
# Trap to clean up those temp files at exit.
trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
# Copy the file name to the temp name.
- (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
+ (umask $cp_umask &&
+ { test -z "$stripcmd" || {
+ # Create $dsttmp read-write so that cp doesn't create it read-only,
+ # which would cause strip to fail.
+ if test -z "$doit"; then
+ : >"$dsttmp" # No need to fork-exec 'touch'.
+ else
+ $doit touch "$dsttmp"
+ fi
+ }
+ } &&
+ $doit_exec $cpprog "$src" "$dsttmp") &&
# and set any options; do chmod last to preserve setuid bits.
#
@@ -460,6 +493,13 @@ do
then
rm -f "$dsttmp"
else
+ # If $backupsuffix is set, and the file being installed
+ # already exists, attempt a backup. Don't worry if it fails,
+ # e.g., if mv doesn't support -f.
+ if test -n "$backupsuffix" && test -f "$dst"; then
+ $doit $mvcmd -f "$dst" "$dst$backupsuffix" 2>/dev/null
+ fi
+
# Rename the file to the real destination.
$doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
@@ -474,9 +514,9 @@ do
# file should still install successfully.
{
test ! -f "$dst" ||
- $doit $rmcmd -f "$dst" 2>/dev/null ||
+ $doit $rmcmd "$dst" 2>/dev/null ||
{ $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
- { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
+ { $doit $rmcmd "$rmtmp" 2>/dev/null; :; }
} ||
{ echo "$0: cannot unlink or rename $dst" >&2
(exit 1); exit 1
@@ -493,9 +533,9 @@ do
done
# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
# time-stamp-end: "; # UTC"
# End:
diff --git a/language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/mkinstalldirs b/language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/mkinstalldirs
index 55d537f872..c364f3d5e1 100755
--- a/language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/mkinstalldirs
+++ b/language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/mkinstalldirs
@@ -1,7 +1,7 @@
#! /bin/sh
# mkinstalldirs --- make directory hierarchy
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2020-07-26.22; # UTC
# Original author: Noah Friedman <friedman@prep.ai.mit.edu>
# Created: 1993-05-16
@@ -92,6 +92,8 @@ case $dirmode in
*)
if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 &&
test ! -d ./--version; then
+ echo "umask 22"
+ umask 22
echo "mkdir -m $dirmode -p -- $*"
exec mkdir -m "$dirmode" -p -- "$@"
else
@@ -104,6 +106,9 @@ case $dirmode in
;;
esac
+echo "umask 22"
+umask 22
+
for file
do
case $file in
@@ -132,21 +137,16 @@ do
if test ! -d "$pathcomp"; then
errstatus=$lasterr
- else
- if test ! -z "$dirmode"; then
- echo "chmod $dirmode $pathcomp"
- lasterr=
- chmod "$dirmode" "$pathcomp" || lasterr=$?
-
- if test ! -z "$lasterr"; then
- errstatus=$lasterr
- fi
- fi
fi
fi
pathcomp=$pathcomp/
done
+
+ if test ! -z "$dirmode"; then
+ echo "chmod $dirmode $file"
+ chmod "$dirmode" "$file" || errstatus=$?
+ fi
done
exit $errstatus
@@ -154,9 +154,9 @@ exit $errstatus
# Local Variables:
# mode: shell-script
# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
# time-stamp-end: "; # UTC"
# End:
diff --git a/language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/scripts/teTeX-0.4/MakeTeXPK.diff b/language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/scripts/teTeX-0.4/MakeTeXPK.diff
index 02f6250898..02f6250898 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/scripts/teTeX-0.4/MakeTeXPK.diff
+++ b/language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/scripts/teTeX-0.4/MakeTeXPK.diff
diff --git a/language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/scripts/teTeX-0.4/MakeTeXTFM.diff b/language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/scripts/teTeX-0.4/MakeTeXTFM.diff
index 52cd52e1c1..52cd52e1c1 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/scripts/teTeX-0.4/MakeTeXTFM.diff
+++ b/language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/scripts/teTeX-0.4/MakeTeXTFM.diff
diff --git a/language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/scripts/web2c-6.1/MakeTeXPK.diff b/language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/scripts/web2c-6.1/MakeTeXPK.diff
index 0536dbc7a4..0536dbc7a4 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/scripts/web2c-6.1/MakeTeXPK.diff
+++ b/language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/scripts/web2c-6.1/MakeTeXPK.diff
diff --git a/language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/scripts/web2c-6.1/README b/language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/scripts/web2c-6.1/README
index eb12bec7a3..eb12bec7a3 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/scripts/web2c-6.1/README
+++ b/language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/scripts/web2c-6.1/README
diff --git a/language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/scripts/web2c-7.0/MakeTeXPK.diff b/language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/scripts/web2c-7.0/MakeTeXPK.diff
index 23f7cb58fe..23f7cb58fe 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/scripts/web2c-7.0/MakeTeXPK.diff
+++ b/language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/scripts/web2c-7.0/MakeTeXPK.diff
diff --git a/language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/scripts/web2c-7.0/MakeTeXTFM.diff b/language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/scripts/web2c-7.0/MakeTeXTFM.diff
index a67df4e14b..a67df4e14b 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/scripts/web2c-7.0/MakeTeXTFM.diff
+++ b/language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/scripts/web2c-7.0/MakeTeXTFM.diff
diff --git a/language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/scripts/web2c-7.1/MakeTeXPK.diff b/language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/scripts/web2c-7.1/MakeTeXPK.diff
index 1faf078adb..1faf078adb 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/scripts/web2c-7.1/MakeTeXPK.diff
+++ b/language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/scripts/web2c-7.1/MakeTeXPK.diff
diff --git a/language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/scripts/web2c-7.1/MakeTeXTFM.diff b/language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/scripts/web2c-7.1/MakeTeXTFM.diff
index 3fd17f9453..3fd17f9453 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/scripts/web2c-7.1/MakeTeXTFM.diff
+++ b/language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/scripts/web2c-7.1/MakeTeXTFM.diff
diff --git a/language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/scripts/web2c-7.2/mktexpk.diff b/language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/scripts/web2c-7.2/mktexpk.diff
index ac703fd7d3..ac703fd7d3 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/scripts/web2c-7.2/mktexpk.diff
+++ b/language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/scripts/web2c-7.2/mktexpk.diff
diff --git a/language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/scripts/web2c-7.2/mktextfm.diff b/language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/scripts/web2c-7.2/mktextfm.diff
index b7bf872e8c..b7bf872e8c 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/hbf2gf/scripts/web2c-7.2/mktextfm.diff
+++ b/language/chinese/CJK/cjk-4.8.5/utils/hbf2gf/scripts/web2c-7.2/mktextfm.diff
diff --git a/language/chinese/CJK/cjk-4.8.4/utils/lisp/cjkspace.el b/language/chinese/CJK/cjk-4.8.5/utils/lisp/cjkspace.el
index 89b072111f..4903f300de 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/lisp/cjkspace.el
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/utils/lisp/cjktilde.el b/language/chinese/CJK/cjk-4.8.5/utils/lisp/cjktilde.el
index 1d075fc688..2d961ddd12 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/lisp/cjktilde.el
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/utils/lisp/emacs/cjk-enc.el b/language/chinese/CJK/cjk-4.8.5/utils/lisp/emacs/cjk-enc.el
index da2052eb56..93add2d75b 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/lisp/emacs/cjk-enc.el
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/utils/lisp/emacs/thai-word.el b/language/chinese/CJK/cjk-4.8.5/utils/lisp/emacs/thai-word.el
index 956cf27b06..956cf27b06 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/lisp/emacs/thai-word.el
+++ b/language/chinese/CJK/cjk-4.8.5/utils/lisp/emacs/thai-word.el
diff --git a/language/chinese/CJK/cjk-4.8.4/utils/lisp/mule-2.3/cjk-enc.el b/language/chinese/CJK/cjk-4.8.5/utils/lisp/mule-2.3/cjk-enc.el
index d93d53e5ca..9f2371bba5 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/lisp/mule-2.3/cjk-enc.el
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.5/utils/pyhyphen/GNUmakefile b/language/chinese/CJK/cjk-4.8.5/utils/pyhyphen/GNUmakefile
new file mode 100644
index 0000000000..de8c7c41de
--- /dev/null
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.5/utils/pyhyphen/hyph-zh-latn-pinyin.in b/language/chinese/CJK/cjk-4.8.5/utils/pyhyphen/hyph-zh-latn-pinyin.in
new file mode 100644
index 0000000000..f905d3000c
--- /dev/null
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.5/utils/pyhyphen/hyph-zh-latn-pinyin.tex b/language/chinese/CJK/cjk-4.8.5/utils/pyhyphen/hyph-zh-latn-pinyin.tex
new file mode 100644
index 0000000000..7180859886
--- /dev/null
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.5/utils/pyhyphen/hyph-zh-latn-tonepinyin.tex b/language/chinese/CJK/cjk-4.8.5/utils/pyhyphen/hyph-zh-latn-tonepinyin.tex
new file mode 100644
index 0000000000..2e927ca70f
--- /dev/null
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.5/utils/pyhyphen/make-patterns.sh b/language/chinese/CJK/cjk-4.8.5/utils/pyhyphen/make-patterns.sh
new file mode 100644
index 0000000000..d4b6591732
--- /dev/null
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/utils/pyhyphen/pinyin.c b/language/chinese/CJK/cjk-4.8.5/utils/pyhyphen/pinyin.c
index a728991c73..f7648db699 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/pyhyphen/pinyin.c
+++ b/language/chinese/CJK/cjk-4.8.5/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",
"ne",
- "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/language/chinese/CJK/cjk-4.8.4/utils/pyhyphen/pinyin.ldf b/language/chinese/CJK/cjk-4.8.5/utils/pyhyphen/pinyin.ldf
index 9fbe8e4fa9..a92b42253f 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/pyhyphen/pinyin.ldf
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/utils/pyhyphen/pinyin.tr b/language/chinese/CJK/cjk-4.8.5/utils/pyhyphen/pinyin.tr
index 8002b91033..b6007eb3f2 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/pyhyphen/pinyin.tr
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.5/utils/pyhyphen/pytest.tex b/language/chinese/CJK/cjk-4.8.5/utils/pyhyphen/pytest.tex
new file mode 100644
index 0000000000..bbef6d4162
--- /dev/null
+++ b/language/chinese/CJK/cjk-4.8.5/utils/pyhyphen/pytest.tex
@@ -0,0 +1,51 @@
+% This is the file pytest.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-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.
+
+\documentclass[12pt,b5paper]{article}
+
+\usepackage[10pt]{type1ec} % use only 10pt fonts
+\usepackage[T1]{fontenc}
+\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}
+
+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/language/chinese/CJK/cjk-4.8.5/utils/pyhyphen/pytestutf8.tex b/language/chinese/CJK/cjk-4.8.5/utils/pyhyphen/pytestutf8.tex
new file mode 100644
index 0000000000..725a6a9c0f
--- /dev/null
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/utils/subfonts/clonevf.pl b/language/chinese/CJK/cjk-4.8.5/utils/subfonts/clonevf.pl
index ab345b00cb..74a7964a42 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/subfonts/clonevf.pl
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/utils/subfonts/hlatex2agl.pl b/language/chinese/CJK/cjk-4.8.5/utils/subfonts/hlatex2agl.pl
index 22ca69446a..d0b0ffea02 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/subfonts/hlatex2agl.pl
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/utils/subfonts/makefdx.pl b/language/chinese/CJK/cjk-4.8.5/utils/subfonts/makefdx.pl
index bed1c4b857..5363e5b63d 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/subfonts/makefdx.pl
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/utils/subfonts/sfd2uni.pl b/language/chinese/CJK/cjk-4.8.5/utils/subfonts/sfd2uni.pl
index a82a3cb10f..5aa1946d32 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/subfonts/sfd2uni.pl
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/utils/subfonts/subfonts.pe b/language/chinese/CJK/cjk-4.8.5/utils/subfonts/subfonts.pe
index feb9d3a56c..347e53b6df 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/subfonts/subfonts.pe
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/utils/subfonts/uni2sfd.pl b/language/chinese/CJK/cjk-4.8.5/utils/subfonts/uni2sfd.pl
index d28796c874..fc89bf7017 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/subfonts/uni2sfd.pl
+++ b/language/chinese/CJK/cjk-4.8.5/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/language/chinese/CJK/cjk-4.8.4/utils/subfonts/vertical.pe b/language/chinese/CJK/cjk-4.8.5/utils/subfonts/vertical.pe
index a10faef088..a10faef088 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/subfonts/vertical.pe
+++ b/language/chinese/CJK/cjk-4.8.5/utils/subfonts/vertical.pe
diff --git a/language/chinese/CJK/cjk-4.8.4/utils/subfonts/vertref.pe b/language/chinese/CJK/cjk-4.8.5/utils/subfonts/vertref.pe
index 63533f9473..63533f9473 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/subfonts/vertref.pe
+++ b/language/chinese/CJK/cjk-4.8.5/utils/subfonts/vertref.pe
diff --git a/language/chinese/CJK/cjk-4.8.4/utils/thaifont/texmf/dvips/garuda-c90/config.garuda-c90 b/language/chinese/CJK/cjk-4.8.5/utils/thaifont/texmf/dvips/garuda-c90/config.garuda-c90
index 69e0d59326..69e0d59326 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/thaifont/texmf/dvips/garuda-c90/config.garuda-c90
+++ b/language/chinese/CJK/cjk-4.8.5/utils/thaifont/texmf/dvips/garuda-c90/config.garuda-c90
diff --git a/language/chinese/CJK/cjk-4.8.4/utils/thaifont/texmf/dvips/norasi-c90/config.norasi-c90 b/language/chinese/CJK/cjk-4.8.5/utils/thaifont/texmf/dvips/norasi-c90/config.norasi-c90
index 655dace2ba..655dace2ba 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/thaifont/texmf/dvips/norasi-c90/config.norasi-c90
+++ b/language/chinese/CJK/cjk-4.8.5/utils/thaifont/texmf/dvips/norasi-c90/config.norasi-c90
diff --git a/language/chinese/CJK/cjk-4.8.4/utils/thaifont/texmf/fonts/enc/dvips/thai/c90.enc b/language/chinese/CJK/cjk-4.8.5/utils/thaifont/texmf/fonts/enc/dvips/thai/c90.enc
index 03fc48b9fa..a929987831 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/thaifont/texmf/fonts/enc/dvips/thai/c90.enc
+++ b/language/chinese/CJK/cjk-4.8.5/utils/thaifont/texmf/fonts/enc/dvips/thai/c90.enc
@@ -10,7 +10,7 @@
% abstract = "This is a postscript encoding file, automatically generated by fontinst from c90.etx."
% }
-% 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/language/chinese/CJK/cjk-4.8.4/utils/thaifont/texmf/fonts/map/dvips/garuda-c90/garuda-c90.map b/language/chinese/CJK/cjk-4.8.5/utils/thaifont/texmf/fonts/map/dvips/garuda-c90/garuda-c90.map
index 0c1af91bfe..0c1af91bfe 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/thaifont/texmf/fonts/map/dvips/garuda-c90/garuda-c90.map
+++ b/language/chinese/CJK/cjk-4.8.5/utils/thaifont/texmf/fonts/map/dvips/garuda-c90/garuda-c90.map
diff --git a/language/chinese/CJK/cjk-4.8.4/utils/thaifont/texmf/fonts/map/dvips/norasi-c90/norasi-c90.map b/language/chinese/CJK/cjk-4.8.5/utils/thaifont/texmf/fonts/map/dvips/norasi-c90/norasi-c90.map
index 6d6a7790fd..6d6a7790fd 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/thaifont/texmf/fonts/map/dvips/norasi-c90/norasi-c90.map
+++ b/language/chinese/CJK/cjk-4.8.5/utils/thaifont/texmf/fonts/map/dvips/norasi-c90/norasi-c90.map
diff --git a/language/chinese/CJK/cjk-4.8.4/utils/thaifont/texmf/fonts/tfm/public/garuda-c90/fgdb8z.tfm b/language/chinese/CJK/cjk-4.8.5/utils/thaifont/texmf/fonts/tfm/public/garuda-c90/fgdb8z.tfm
index 65f79a03d9..65f79a03d9 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/thaifont/texmf/fonts/tfm/public/garuda-c90/fgdb8z.tfm
+++ b/language/chinese/CJK/cjk-4.8.5/utils/thaifont/texmf/fonts/tfm/public/garuda-c90/fgdb8z.tfm
Binary files differ
diff --git a/language/chinese/CJK/cjk-4.8.4/utils/thaifont/texmf/fonts/tfm/public/garuda-c90/fgdbo8z.tfm b/language/chinese/CJK/cjk-4.8.5/utils/thaifont/texmf/fonts/tfm/public/garuda-c90/fgdbo8z.tfm
index 10f04c2013..10f04c2013 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/thaifont/texmf/fonts/tfm/public/garuda-c90/fgdbo8z.tfm
+++ b/language/chinese/CJK/cjk-4.8.5/utils/thaifont/texmf/fonts/tfm/public/garuda-c90/fgdbo8z.tfm
Binary files differ
diff --git a/language/chinese/CJK/cjk-4.8.4/utils/thaifont/texmf/fonts/tfm/public/garuda-c90/fgdo8z.tfm b/language/chinese/CJK/cjk-4.8.5/utils/thaifont/texmf/fonts/tfm/public/garuda-c90/fgdo8z.tfm
index 729bb4f89e..729bb4f89e 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/thaifont/texmf/fonts/tfm/public/garuda-c90/fgdo8z.tfm
+++ b/language/chinese/CJK/cjk-4.8.5/utils/thaifont/texmf/fonts/tfm/public/garuda-c90/fgdo8z.tfm
Binary files differ
diff --git a/language/chinese/CJK/cjk-4.8.4/utils/thaifont/texmf/fonts/tfm/public/garuda-c90/fgdr8z.tfm b/language/chinese/CJK/cjk-4.8.5/utils/thaifont/texmf/fonts/tfm/public/garuda-c90/fgdr8z.tfm
index 7e7ab8eb41..7e7ab8eb41 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/thaifont/texmf/fonts/tfm/public/garuda-c90/fgdr8z.tfm
+++ b/language/chinese/CJK/cjk-4.8.5/utils/thaifont/texmf/fonts/tfm/public/garuda-c90/fgdr8z.tfm
Binary files differ
diff --git a/language/chinese/CJK/cjk-4.8.4/utils/thaifont/texmf/fonts/tfm/public/norasi-c90/ftnb8z.tfm b/language/chinese/CJK/cjk-4.8.5/utils/thaifont/texmf/fonts/tfm/public/norasi-c90/ftnb8z.tfm
index 29f8047108..29f8047108 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/thaifont/texmf/fonts/tfm/public/norasi-c90/ftnb8z.tfm
+++ b/language/chinese/CJK/cjk-4.8.5/utils/thaifont/texmf/fonts/tfm/public/norasi-c90/ftnb8z.tfm
Binary files differ
diff --git a/language/chinese/CJK/cjk-4.8.4/utils/thaifont/texmf/fonts/tfm/public/norasi-c90/ftnbi8z.tfm b/language/chinese/CJK/cjk-4.8.5/utils/thaifont/texmf/fonts/tfm/public/norasi-c90/ftnbi8z.tfm
index be784971fc..be784971fc 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/thaifont/texmf/fonts/tfm/public/norasi-c90/ftnbi8z.tfm
+++ b/language/chinese/CJK/cjk-4.8.5/utils/thaifont/texmf/fonts/tfm/public/norasi-c90/ftnbi8z.tfm
Binary files differ
diff --git a/language/chinese/CJK/cjk-4.8.4/utils/thaifont/texmf/fonts/tfm/public/norasi-c90/ftni8z.tfm b/language/chinese/CJK/cjk-4.8.5/utils/thaifont/texmf/fonts/tfm/public/norasi-c90/ftni8z.tfm
index 202a7c5bbe..202a7c5bbe 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/thaifont/texmf/fonts/tfm/public/norasi-c90/ftni8z.tfm
+++ b/language/chinese/CJK/cjk-4.8.5/utils/thaifont/texmf/fonts/tfm/public/norasi-c90/ftni8z.tfm
Binary files differ
diff --git a/language/chinese/CJK/cjk-4.8.4/utils/thaifont/texmf/fonts/tfm/public/norasi-c90/ftnr8z.tfm b/language/chinese/CJK/cjk-4.8.5/utils/thaifont/texmf/fonts/tfm/public/norasi-c90/ftnr8z.tfm
index 866eac16ba..866eac16ba 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/thaifont/texmf/fonts/tfm/public/norasi-c90/ftnr8z.tfm
+++ b/language/chinese/CJK/cjk-4.8.5/utils/thaifont/texmf/fonts/tfm/public/norasi-c90/ftnr8z.tfm
Binary files differ
diff --git a/language/chinese/CJK/cjk-4.8.4/utils/thaifont/tools/INSTALL b/language/chinese/CJK/cjk-4.8.5/utils/thaifont/tools/INSTALL
index 21e0236826..21e0236826 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/thaifont/tools/INSTALL
+++ b/language/chinese/CJK/cjk-4.8.5/utils/thaifont/tools/INSTALL
diff --git a/language/chinese/CJK/cjk-4.8.4/utils/thaifont/tools/c90.etx b/language/chinese/CJK/cjk-4.8.5/utils/thaifont/tools/c90.etx
index 56cb88c757..db68bd43d7 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/thaifont/tools/c90.etx
+++ b/language/chinese/CJK/cjk-4.8.5/utils/thaifont/tools/c90.etx
@@ -1,6 +1,6 @@
% c90.etx
-% 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/language/chinese/CJK/cjk-4.8.4/utils/thaifont/tools/c90.mtx b/language/chinese/CJK/cjk-4.8.5/utils/thaifont/tools/c90.mtx
index baccdefa08..b14d502a2d 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/thaifont/tools/c90.mtx
+++ b/language/chinese/CJK/cjk-4.8.5/utils/thaifont/tools/c90.mtx
@@ -1,6 +1,6 @@
% c90.mtx
-% 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/language/chinese/CJK/cjk-4.8.4/utils/thaifont/tools/dbtt-old/config.dbtt-old b/language/chinese/CJK/cjk-4.8.5/utils/thaifont/tools/dbtt-old/config.dbtt-old
index 5ce1be96b2..5ce1be96b2 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/thaifont/tools/dbtt-old/config.dbtt-old
+++ b/language/chinese/CJK/cjk-4.8.5/utils/thaifont/tools/dbtt-old/config.dbtt-old
diff --git a/language/chinese/CJK/cjk-4.8.4/utils/thaifont/tools/dbtt-old/dbtt-old-alias.etx b/language/chinese/CJK/cjk-4.8.5/utils/thaifont/tools/dbtt-old/dbtt-old-alias.etx
index c89777a2fb..fceec94a97 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/thaifont/tools/dbtt-old/dbtt-old-alias.etx
+++ b/language/chinese/CJK/cjk-4.8.5/utils/thaifont/tools/dbtt-old/dbtt-old-alias.etx
@@ -1,6 +1,6 @@
% dbtt-old-alias.etx
-% 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/language/chinese/CJK/cjk-4.8.4/utils/thaifont/tools/dbtt-old/dbtt-old-alias.mtx b/language/chinese/CJK/cjk-4.8.5/utils/thaifont/tools/dbtt-old/dbtt-old-alias.mtx
index 4dbb7382e2..3ee09b8cf2 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/thaifont/tools/dbtt-old/dbtt-old-alias.mtx
+++ b/language/chinese/CJK/cjk-4.8.5/utils/thaifont/tools/dbtt-old/dbtt-old-alias.mtx
@@ -1,6 +1,6 @@
% dbtt-old-alias.mtx
-% 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/language/chinese/CJK/cjk-4.8.4/utils/thaifont/tools/dbtt-old/dbtt-old-alias.tex b/language/chinese/CJK/cjk-4.8.5/utils/thaifont/tools/dbtt-old/dbtt-old-alias.tex
index 558a1306cd..0d6c25b1e3 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/thaifont/tools/dbtt-old/dbtt-old-alias.tex
+++ b/language/chinese/CJK/cjk-4.8.5/utils/thaifont/tools/dbtt-old/dbtt-old-alias.tex
@@ -1,6 +1,6 @@
% dbtt-old-alias.tex
-% 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/language/chinese/CJK/cjk-4.8.4/utils/thaifont/tools/dbtt-old/dbtt-old.fontinst b/language/chinese/CJK/cjk-4.8.5/utils/thaifont/tools/dbtt-old/dbtt-old.fontinst
index 794284d1e0..4e50a8ac0a 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/thaifont/tools/dbtt-old/dbtt-old.fontinst
+++ b/language/chinese/CJK/cjk-4.8.5/utils/thaifont/tools/dbtt-old/dbtt-old.fontinst
@@ -1,6 +1,6 @@
% dbtt-old.fontinst
-% 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/language/chinese/CJK/cjk-4.8.4/utils/thaifont/tools/dbtt-old/dbtt-old.map b/language/chinese/CJK/cjk-4.8.5/utils/thaifont/tools/dbtt-old/dbtt-old.map
index c48f73fe71..c48f73fe71 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/thaifont/tools/dbtt-old/dbtt-old.map
+++ b/language/chinese/CJK/cjk-4.8.5/utils/thaifont/tools/dbtt-old/dbtt-old.map
diff --git a/language/chinese/CJK/cjk-4.8.4/utils/thaifont/tools/garuda-c90.fontinst b/language/chinese/CJK/cjk-4.8.5/utils/thaifont/tools/garuda-c90.fontinst
index a48185c4cb..81a1584d37 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/thaifont/tools/garuda-c90.fontinst
+++ b/language/chinese/CJK/cjk-4.8.5/utils/thaifont/tools/garuda-c90.fontinst
@@ -1,6 +1,6 @@
% garuda-c90.fontinst
-% 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/language/chinese/CJK/cjk-4.8.4/utils/thaifont/tools/norasi-c90.fontinst b/language/chinese/CJK/cjk-4.8.5/utils/thaifont/tools/norasi-c90.fontinst
index 433c89a9ab..417f697194 100644
--- a/language/chinese/CJK/cjk-4.8.4/utils/thaifont/tools/norasi-c90.fontinst
+++ b/language/chinese/CJK/cjk-4.8.5/utils/thaifont/tools/norasi-c90.fontinst
@@ -1,6 +1,6 @@
% norasi-c90.fontinst
-% 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