1 files changed, 40 insertions, 141 deletions

diff --git a/print/latex-cjk/pkg-plist b/print/latex-cjk/pkg-plist
index 0176989b47fa..60934fbe5251 100644
--- a/print/latex-cjk/pkg-plist
+++ b/print/latex-cjk/pkg-plist
@@ -1,4 +1,5 @@
 bin/bg5conv
+bin/bg5+latex
 bin/bg5latex
 bin/cef5conv
 bin/cef5latex
@@ -6,6 +7,8 @@ bin/cefconv
 bin/ceflatex
 bin/cefsconv
 bin/cefslatex
+bin/extconv
+bin/gbklatex
 bin/hbf2gf
 bin/sjisconv
 bin/sjislatex
@@ -48,6 +51,7 @@ share/emacs/site-lisp/CJK/mule-2.3/cjk-enc.el
 share/examples/CJK/Big5.tex
 share/examples/CJK/Big5vert.tex
 share/examples/CJK/CEF_test.tex
+share/examples/CJK/CJKbabel.tex
 share/examples/CJK/GB.tex
 share/examples/CJK/JIS.tex
 share/examples/CJK/KS.tex
@@ -56,138 +60,25 @@ share/examples/CJK/UTF8.tex
 share/examples/CJK/muletest.tex
 share/examples/CJK/py_test.tex
 share/examples/CJK/rubytest.tex
-share/texmf/fonts/tfm/moe/moekai/moekai01.tfm
-share/texmf/fonts/tfm/moe/moekai/moekai02.tfm
-share/texmf/fonts/tfm/moe/moekai/moekai03.tfm
-share/texmf/fonts/tfm/moe/moekai/moekai04.tfm
-share/texmf/fonts/tfm/moe/moekai/moekai05.tfm
-share/texmf/fonts/tfm/moe/moekai/moekai06.tfm
-share/texmf/fonts/tfm/moe/moekai/moekai07.tfm
-share/texmf/fonts/tfm/moe/moekai/moekai08.tfm
-share/texmf/fonts/tfm/moe/moekai/moekai09.tfm
-share/texmf/fonts/tfm/moe/moekai/moekai10.tfm
-share/texmf/fonts/tfm/moe/moekai/moekai11.tfm
-share/texmf/fonts/tfm/moe/moekai/moekai12.tfm
-share/texmf/fonts/tfm/moe/moekai/moekai13.tfm
-share/texmf/fonts/tfm/moe/moekai/moekai14.tfm
-share/texmf/fonts/tfm/moe/moekai/moekai15.tfm
-share/texmf/fonts/tfm/moe/moekai/moekai16.tfm
-share/texmf/fonts/tfm/moe/moekai/moekai17.tfm
-share/texmf/fonts/tfm/moe/moekai/moekai18.tfm
-share/texmf/fonts/tfm/moe/moekai/moekai19.tfm
-share/texmf/fonts/tfm/moe/moekai/moekai20.tfm
-share/texmf/fonts/tfm/moe/moekai/moekai21.tfm
-share/texmf/fonts/tfm/moe/moekai/moekai22.tfm
-share/texmf/fonts/tfm/moe/moekai/moekai23.tfm
-share/texmf/fonts/tfm/moe/moekai/moekai25.tfm
-share/texmf/fonts/tfm/moe/moekai/moekai26.tfm
-share/texmf/fonts/tfm/moe/moekai/moekai27.tfm
-share/texmf/fonts/tfm/moe/moekai/moekai28.tfm
-share/texmf/fonts/tfm/moe/moekai/moekai29.tfm
-share/texmf/fonts/tfm/moe/moekai/moekai30.tfm
-share/texmf/fonts/tfm/moe/moekai/moekai31.tfm
-share/texmf/fonts/tfm/moe/moekai/moekai32.tfm
-share/texmf/fonts/tfm/moe/moekai/moekai33.tfm
-share/texmf/fonts/tfm/moe/moekai/moekai34.tfm
-share/texmf/fonts/tfm/moe/moekai/moekai35.tfm
-share/texmf/fonts/tfm/moe/moekai/moekai36.tfm
-share/texmf/fonts/tfm/moe/moekai/moekai37.tfm
-share/texmf/fonts/tfm/moe/moekai/moekai38.tfm
-share/texmf/fonts/tfm/moe/moekai/moekai39.tfm
-share/texmf/fonts/tfm/moe/moekai/moekai40.tfm
-share/texmf/fonts/tfm/moe/moekai/moekai41.tfm
-share/texmf/fonts/tfm/moe/moekai/moekai42.tfm
-share/texmf/fonts/tfm/moe/moekai/moekai43.tfm
-share/texmf/fonts/tfm/moe/moekai/moekai44.tfm
-share/texmf/fonts/tfm/moe/moekai/moekai45.tfm
-share/texmf/fonts/tfm/moe/moekai/moekai46.tfm
-share/texmf/fonts/tfm/moe/moekai/moekai47.tfm
-share/texmf/fonts/tfm/moe/moekai/moekai48.tfm
-share/texmf/fonts/tfm/moe/moekai/moekai49.tfm
-share/texmf/fonts/tfm/moe/moekai/moekai50.tfm
-share/texmf/fonts/tfm/moe/moekai/moekai51.tfm
-share/texmf/fonts/tfm/moe/moekai/moekai52.tfm
-share/texmf/fonts/tfm/moe/moekai/moekai53.tfm
-share/texmf/fonts/tfm/moe/moekai/moekai54.tfm
-share/texmf/fonts/tfm/moe/moekai/moekai55.tfm
-share/texmf/fonts/tfm/moe/moekai/moekai56.tfm
-share/texmf/fonts/tfm/moe/moekai/moekai57.tfm
-share/texmf/fonts/tfm/moe/moekai/moekai58.tfm
-share/texmf/fonts/tfm/moe/moesung/moesung01.tfm
-share/texmf/fonts/tfm/moe/moesung/moesung02.tfm
-share/texmf/fonts/tfm/moe/moesung/moesung03.tfm
-share/texmf/fonts/tfm/moe/moesung/moesung04.tfm
-share/texmf/fonts/tfm/moe/moesung/moesung05.tfm
-share/texmf/fonts/tfm/moe/moesung/moesung06.tfm
-share/texmf/fonts/tfm/moe/moesung/moesung07.tfm
-share/texmf/fonts/tfm/moe/moesung/moesung08.tfm
-share/texmf/fonts/tfm/moe/moesung/moesung09.tfm
-share/texmf/fonts/tfm/moe/moesung/moesung10.tfm
-share/texmf/fonts/tfm/moe/moesung/moesung11.tfm
-share/texmf/fonts/tfm/moe/moesung/moesung12.tfm
-share/texmf/fonts/tfm/moe/moesung/moesung13.tfm
-share/texmf/fonts/tfm/moe/moesung/moesung14.tfm
-share/texmf/fonts/tfm/moe/moesung/moesung15.tfm
-share/texmf/fonts/tfm/moe/moesung/moesung16.tfm
-share/texmf/fonts/tfm/moe/moesung/moesung17.tfm
-share/texmf/fonts/tfm/moe/moesung/moesung18.tfm
-share/texmf/fonts/tfm/moe/moesung/moesung19.tfm
-share/texmf/fonts/tfm/moe/moesung/moesung20.tfm
-share/texmf/fonts/tfm/moe/moesung/moesung21.tfm
-share/texmf/fonts/tfm/moe/moesung/moesung22.tfm
-share/texmf/fonts/tfm/moe/moesung/moesung23.tfm
-share/texmf/fonts/tfm/moe/moesung/moesung25.tfm
-share/texmf/fonts/tfm/moe/moesung/moesung26.tfm
-share/texmf/fonts/tfm/moe/moesung/moesung27.tfm
-share/texmf/fonts/tfm/moe/moesung/moesung28.tfm
-share/texmf/fonts/tfm/moe/moesung/moesung29.tfm
-share/texmf/fonts/tfm/moe/moesung/moesung30.tfm
-share/texmf/fonts/tfm/moe/moesung/moesung31.tfm
-share/texmf/fonts/tfm/moe/moesung/moesung32.tfm
-share/texmf/fonts/tfm/moe/moesung/moesung33.tfm
-share/texmf/fonts/tfm/moe/moesung/moesung34.tfm
-share/texmf/fonts/tfm/moe/moesung/moesung35.tfm
-share/texmf/fonts/tfm/moe/moesung/moesung36.tfm
-share/texmf/fonts/tfm/moe/moesung/moesung37.tfm
-share/texmf/fonts/tfm/moe/moesung/moesung38.tfm
-share/texmf/fonts/tfm/moe/moesung/moesung39.tfm
-share/texmf/fonts/tfm/moe/moesung/moesung40.tfm
-share/texmf/fonts/tfm/moe/moesung/moesung41.tfm
-share/texmf/fonts/tfm/moe/moesung/moesung42.tfm
-share/texmf/fonts/tfm/moe/moesung/moesung43.tfm
-share/texmf/fonts/tfm/moe/moesung/moesung44.tfm
-share/texmf/fonts/tfm/moe/moesung/moesung45.tfm
-share/texmf/fonts/tfm/moe/moesung/moesung46.tfm
-share/texmf/fonts/tfm/moe/moesung/moesung47.tfm
-share/texmf/fonts/tfm/moe/moesung/moesung48.tfm
-share/texmf/fonts/tfm/moe/moesung/moesung49.tfm
-share/texmf/fonts/tfm/moe/moesung/moesung50.tfm
-share/texmf/fonts/tfm/moe/moesung/moesung51.tfm
-share/texmf/fonts/tfm/moe/moesung/moesung52.tfm
-share/texmf/fonts/tfm/moe/moesung/moesung53.tfm
-share/texmf/fonts/tfm/moe/moesung/moesung54.tfm
-share/texmf/fonts/tfm/moe/moesung/moesung55.tfm
-share/texmf/fonts/tfm/moe/moesung/moesung56.tfm
-share/texmf/fonts/tfm/moe/moesung/moesung57.tfm
-share/texmf/fonts/tfm/moe/moesung/moesung58.tfm
 share/texmf/fonts/truetype/moe/moe_kai.ttf
 share/texmf/fonts/truetype/moe/moe_sung.ttf
-share/texmf/hbf2gf/cfg/README
-share/texmf/hbf2gf/cfg/b5ka12.cfg
-share/texmf/hbf2gf/cfg/b5kr12.cfg
-share/texmf/hbf2gf/cfg/b5so12.cfg
-share/texmf/hbf2gf/cfg/c1so12.cfg
-share/texmf/hbf2gf/cfg/c2so12.cfg
-share/texmf/hbf2gf/cfg/c3so12.cfg
-share/texmf/hbf2gf/cfg/c4so12.cfg
-share/texmf/hbf2gf/cfg/c5so12.cfg
-share/texmf/hbf2gf/cfg/c6so12.cfg
-share/texmf/hbf2gf/cfg/c7so12.cfg
-share/texmf/hbf2gf/cfg/csso12.cfg
-share/texmf/hbf2gf/cfg/gsfs14.cfg
-share/texmf/hbf2gf/cfg/j2so12.cfg
-share/texmf/hbf2gf/cfg/jsso12.cfg
-share/texmf/hbf2gf/cfg/ksso17.cfg
+share/texmf/fonts/truetype/moe/moe_lishu.ttf
+share/texmf/hbf2gf/README
+share/texmf/hbf2gf/b5ka12.cfg
+share/texmf/hbf2gf/b5kr12.cfg
+share/texmf/hbf2gf/b5so12.cfg
+share/texmf/hbf2gf/c1so12.cfg
+share/texmf/hbf2gf/c2so12.cfg
+share/texmf/hbf2gf/c3so12.cfg
+share/texmf/hbf2gf/c4so12.cfg
+share/texmf/hbf2gf/c5so12.cfg
+share/texmf/hbf2gf/c6so12.cfg
+share/texmf/hbf2gf/c7so12.cfg
+share/texmf/hbf2gf/csso12.cfg
+share/texmf/hbf2gf/gsfs14.cfg
+share/texmf/hbf2gf/j2so12.cfg
+share/texmf/hbf2gf/jsso12.cfg
+share/texmf/hbf2gf/ksso17.cfg
 share/texmf/tex/latex/CJK/Bg5/Bg5.cap
 share/texmf/tex/latex/CJK/Bg5/Bg5.chr
 share/texmf/tex/latex/CJK/Bg5/Bg5.cpx
@@ -197,29 +88,38 @@ share/texmf/tex/latex/CJK/Bg5/c00fs.fd
 share/texmf/tex/latex/CJK/Bg5/c00kai.fd
 share/texmf/tex/latex/CJK/Bg5/c00kai.fd.orig
 share/texmf/tex/latex/CJK/Bg5/c00kair.fd
+share/texmf/tex/latex/CJK/Bg5/c00lishu.fd
 share/texmf/tex/latex/CJK/Bg5/c00song.fd
 share/texmf/tex/latex/CJK/Bg5/c00song.fd.orig
 share/texmf/tex/latex/CJK/Bg5/c01song.fd
-share/texmf/tex/latex/CJK/CEF/c31song.fd
-share/texmf/tex/latex/CJK/CEF/c32song.fd
-share/texmf/tex/latex/CJK/CEF/c33song.fd
-share/texmf/tex/latex/CJK/CEF/c34song.fd
-share/texmf/tex/latex/CJK/CEF/c35song.fd
-share/texmf/tex/latex/CJK/CEF/c36song.fd
-share/texmf/tex/latex/CJK/CEF/c37song.fd
+share/texmf/tex/latex/CJK/Bg5/c09song.fd
 share/texmf/tex/latex/CJK/CEF/c80song.fd
 share/texmf/tex/latex/CJK/CEF/c81song.fd
 share/texmf/tex/latex/CJK/CJK.enc
 share/texmf/tex/latex/CJK/CJK.sty
 share/texmf/tex/latex/CJK/CJKnumb.sty
 share/texmf/tex/latex/CJK/CJKvert.sty
+share/texmf/tex/latex/CJK/CNS/EUC-TW.bdg
+share/texmf/tex/latex/CJK/CNS/EUC-TW.chr
+share/texmf/tex/latex/CJK/CNS/EUC-TW.enc
+share/texmf/tex/latex/CJK/CNS/c31song.fd
+share/texmf/tex/latex/CJK/CNS/c32song.fd
+share/texmf/tex/latex/CJK/CNS/c33song.fd
+share/texmf/tex/latex/CJK/CNS/c34song.fd
+share/texmf/tex/latex/CJK/CNS/c35song.fd
+share/texmf/tex/latex/CJK/CNS/c36song.fd
+share/texmf/tex/latex/CJK/CNS/c37song.fd
 share/texmf/tex/latex/CJK/GB/GB.cap
 share/texmf/tex/latex/CJK/GB/GB.cpx
 share/texmf/tex/latex/CJK/GB/c10fs.fd
 share/texmf/tex/latex/CJK/GB/c10song.fd
 share/texmf/tex/latex/CJK/GB/c11song.fd
+share/texmf/tex/latex/CJK/GB/c19song.fd
 share/texmf/tex/latex/CJK/GB/c20song.fd
 share/texmf/tex/latex/CJK/GB/c21song.fd
+share/texmf/tex/latex/CJK/JIS/EUC-JP.bdg
+share/texmf/tex/latex/CJK/JIS/EUC-JP.chr
+share/texmf/tex/latex/CJK/JIS/EUC-JP.enc
 share/texmf/tex/latex/CJK/JIS/JIS.cap
 share/texmf/tex/latex/CJK/JIS/JIS.cpx
 share/texmf/tex/latex/CJK/JIS/JISdnp.enc
@@ -364,6 +264,8 @@ share/texmf/tex/latex/CJK/UTF8/UTF8.bdg
 share/texmf/tex/latex/CJK/UTF8/UTF8.chr
 share/texmf/tex/latex/CJK/UTF8/UTF8.enc
 share/texmf/tex/latex/CJK/UTF8/c70song.fd
+share/texmf/tex/latex/CJK/extended.chr
+share/texmf/tex/latex/CJK/extended.enc
 share/texmf/tex/latex/CJK/mule/MULEenc.sty
 share/texmf/tex/latex/CJK/pinyin.sty
 share/texmf/tex/latex/CJK/pmC.chr
@@ -387,15 +289,12 @@ share/texmf/ttf2pk/ttfonts.map
 @dirrm share/doc/CJK/japanese
 @dirrm share/doc/CJK
 @dirrm share/examples/CJK
-@dirrm share/texmf/fonts/tfm/moe/moekai
-@dirrm share/texmf/fonts/tfm/moe/moesung
-@dirrm share/texmf/fonts/tfm/moe
 @dirrm share/texmf/fonts/truetype/moe
 @dirrm share/texmf/fonts/truetype
-@dirrm share/texmf/hbf2gf/cfg
 @dirrm share/texmf/hbf2gf
 @dirrm share/texmf/tex/latex/CJK/Bg5
 @dirrm share/texmf/tex/latex/CJK/CEF
+@dirrm share/texmf/tex/latex/CJK/CNS
 @dirrm share/texmf/tex/latex/CJK/GB
 @dirrm share/texmf/tex/latex/CJK/JIS
 @dirrm share/texmf/tex/latex/CJK/KS/HLaTeX