113 files changed, 10237 insertions, 2470 deletions
diff --git a/Build/source/texk/README b/Build/source/texk/README
index a05d4491424..5b335a8db72 100644
--- a/Build/source/texk/README
+++ b/Build/source/texk/README
@@ -27,8 +27,8 @@ bibtex8 - ?
 bibtexu - ?
   http://omega.enstb.org/yannis/bibtexu/
 
-cjkutils - Werner Lemberg
-  ctan
+cjkutils 4.8.2 - checked 18dec10
+  http://cjk.ffii.org/cjk-4.8.2.tar.gz
 
 detex 2.8 - checked 21may10
   http://www.cs.purdue.edu/homes/trinkle/detex/
diff --git a/Build/source/texk/cjkutils/ChangeLog b/Build/source/texk/cjkutils/ChangeLog
index 12e25e247f8..20d7cb5723e 100644
--- a/Build/source/texk/cjkutils/ChangeLog
+++ b/Build/source/texk/cjkutils/ChangeLog
@@ -1,3 +1,10 @@
+2010-12-18  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* Import cjk-4.8.2/utils as cjkutils-4.8.2,
+	patches in cjkutils-4.8.2-PATCHES.
+	* Makefile.am, configure.ac: Adapted to modified layout.
+	[WIN32]: compile gbk{,pdf}latex.exe from Fabrice's cjklatex.c.
+
 2009-11-07  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* configure.ac, hbf2gf/hbf2gf.w: Require recent kpathsea version.
diff --git a/Build/source/texk/cjkutils/Makefile.am b/Build/source/texk/cjkutils/Makefile.am
index 0f00c645ebe..03b7b89052a 100644
--- a/Build/source/texk/cjkutils/Makefile.am
+++ b/Build/source/texk/cjkutils/Makefile.am
@@ -1,17 +1,24 @@
 ## Makefile.am for the TeX Live subdirectory texk/cjkutils/
 ##
-## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org>
 ## You may freely use, modify and/or distribute this file.
 ##
 ACLOCAL_AMFLAGS = -I ../../m4
 
+## We want to re-distribute the whole original cjk/utils source tree.
+EXTRA_DIST = $(CJKUTILS_TREE)
+## Patches applied to the original source tree
+EXTRA_DIST += $(CJKUTILS_TREE)-PATCHES
+
 # in case of an SVN repository
 dist-hook:
 	rm -rf `find $(distdir) -name .svn`
 
-SUBDIRS = . conv hbf2gf scripts
-
+if do_cweb
+all-local: config.force hbf2gf.dvi
+else !do_cweb
 all-local: config.force
+endif !do_cweb
 
 config.force: $(KPATHSEA_DEPEND)
 	echo timestamp >config.force
@@ -19,7 +26,158 @@ config.force: $(KPATHSEA_DEPEND)
 
 DISTCLEANFILES = config.force
 
-## Not used
+INCLUDES = $(KPATHSEA_INCLUDES)
+AM_CPPFLAGS = $(XX_CPPFLAGS)
+AM_CFLAGS = $(XX_CFLAGS)
+
+bin_PROGRAMS = \
+	bg5conv \
+	cefconv \
+	cef5conv \
+	cefsconv \
+	extconv \
+	sjisconv \
+	hbf2gf
+
+hbf2gf_SOURCES = \
+	$(CJKUTILS_TREE)/hbf2gf/hbf.c \
+	$(CJKUTILS_TREE)/hbf2gf/hbf.h \
+	hbf2gf.c
+hbf2gf_CPPFLAGS = -I$(srcdir)/$(CJKUTILS_TREE)/hbf2gf -Dunix -DHAVE_LIBKPATHSEA $(AM_CPPFLAGS)
+hbf2gf_DEPENDENCIES = $(KPATHSEA_DEPEND)
+hbf2gf_LDADD = $(KPATHSEA_LIBS)
+
+if WIN32
+bin_PROGRAMS += \
+	gbklatex \
+	gbkpdflatex
+endif WIN32
+
+## For WIN32 we compile gbk{,pdf}latex.exe from Fabrice's cjklatex.c
+## and copy them to{bg5,cef5,cef,cefs,sjis}{,pdf}latex.exe.
 ##
-EXTRA_DIST = bat
+## For Unix systems we install the {bg5,cef5,cef,cefs,gbk,sjis}{,pdf}latex
+## shell scripts and create symlinks gbk{,pdf}latex -> bg5{,pdf}latex.
+##
+if WIN32
+HOOK_DST = bg5 cef5 cef cefs sjis
+HOOK_CMD = cp
+else !WIN32
+HOOK_DST = bg5+
+HOOK_CMD = $(LN_S)
+endif !WIN32
+
+gbklatex_SOURCES = \
+	$(CJKUTILS_TREE)/cjklatex/cjklatex.c
+gbklatex_DEPENDENCIES = $(KPATHSEA_DEPEND)
+gbklatex_LDADD = $(KPATHSEA_LIBS)
+
+gbkpdflatex_SOURCES = $(gbklatex_SOURCES)
+gbkpdflatex_CPPFLAGS = -DLATEX=\"pdflatex\" $(AM_CPPFLAGS)
+gbkpdflatex_DEPENDENCIES = $(gbklatex_DEPENDENCIES)
+gbkpdflatex_LDADD = $(gbklatex_LDADD)
+
+## Rebuild libkpathsea
+@KPATHSEA_RULE@
+
+if WIN32
+bin_SCRIPTS =
+else !WIN32
+bin_SCRIPTS = \
+	$(CJKUTILS_TREE)/Bg5conv/bg5latex \
+	$(CJKUTILS_TREE)/Bg5conv/bg5pdflatex \
+	$(CJKUTILS_TREE)/CEFconv/cef5latex \
+	$(CJKUTILS_TREE)/CEFconv/cef5pdflatex \
+	$(CJKUTILS_TREE)/CEFconv/ceflatex \
+	$(CJKUTILS_TREE)/CEFconv/cefpdflatex \
+	$(CJKUTILS_TREE)/CEFconv/cefslatex \
+	$(CJKUTILS_TREE)/CEFconv/cefspdflatex \
+	$(CJKUTILS_TREE)/SJISconv/sjislatex \
+	$(CJKUTILS_TREE)/SJISconv/sjispdflatex \
+	$(CJKUTILS_TREE)/extconv/gbklatex \
+	$(CJKUTILS_TREE)/extconv/gbkpdflatex
+endif !WIN32
+
+install-exec-hook:
+	@cd $(DESTDIR)$(bindir) && \
+	  for p in latex pdflatex; do \
+	    for c in $(HOOK_DST); do \
+	      echo "$(HOOK_CMD) gbk$$p$(EXEEXT) $$c$$p$(EXEEXT)"; \
+	      rm -f $$c$$p$(EXEEXT); $(HOOK_CMD) gbk$$p$(EXEEXT) $$c$$p$(EXEEXT); \
+	    done; \
+	  done
+
+uninstall-hook:
+	@for p in latex pdflatex; do \
+	  for c in $(HOOK_DST); do \
+	    echo "rm -f $(DESTDIR)$(bindir)/$$c$$p$(EXEEXT)"; \
+	    rm -f $(DESTDIR)$(bindir)/$$c$$p$(EXEEXT); \
+	  done; \
+	done
+
+man1_MANS = \
+	$(CJKUTILS_TREE)/Bg5conv/bg5conv.1 \
+	$(CJKUTILS_TREE)/CEFconv/cef5conv.1 \
+	$(CJKUTILS_TREE)/CEFconv/cefconv.1 \
+	$(CJKUTILS_TREE)/CEFconv/cefsconv.1 \
+	$(CJKUTILS_TREE)/SJISconv/sjisconv.1 \
+	$(CJKUTILS_TREE)/extconv/extconv.1 \
+	$(CJKUTILS_TREE)/hbf2gf/hbf2gf.1
+
+hbf2gf_cfgdir = ${prefix}/texmf/hbf2gf
+CFG = $(CJKUTILS_TREE)/hbf2gf/cfg
+hbf2gf_cfg_DATA = \
+	$(CFG)/b5ka12.cfg \
+	$(CFG)/b5kr12.cfg \
+	$(CFG)/b5so12.cfg \
+	$(CFG)/c1so12.cfg \
+	$(CFG)/c2so12.cfg \
+	$(CFG)/c3so12.cfg \
+	$(CFG)/c4so12.cfg \
+	$(CFG)/c5so12.cfg \
+	$(CFG)/c6so12.cfg \
+	$(CFG)/c7so12.cfg \
+	$(CFG)/csso12.cfg \
+	$(CFG)/gsfs14.cfg \
+	$(CFG)/j2so12.cfg \
+	$(CFG)/jsso12.cfg \
+	$(CFG)/ksso17.cfg
+
+CWEB_SRC = $(CJKUTILS_TREE)/hbf2gf/hbf2gf.w
+CWEB_TEX = hbf2gf.tex hbf2gf.idx hbf2gf.scn
+CWEB_DVI = hbf2gf.dvi
+
+EXTRA_DIST += $(CWEB_TEX) $(CWEB_DVI)
+
+CLEANFILES = hbf2gf.log hbf2gf.toc
+
+hbf2gf.dvi: $(CWEB_TEX)
+	TEXINPUTS=.:$(srcdir):$$TEXINPUTS $(TEX) hbf2gf.tex
+
+# Running cweave in order to create hbf2gf.tex generates in addition
+# hbf2gf.idx and hbf2gf.scn; we must rerun cweave when they are not
+# up to date (even if hbf2gf.tex is up to date). Thus the sub-make.
+#
+hbf2gf.tex hbf2gf.idx hbf2gf.scn: $(CWEB_SRC)
+	$(MAKE) $(AM_MAKEFLAGS) do-cweave
+do-cweave: $(CWEB_SRC) .FORCE
+	$(CWEAVE) +ai $<
+.PHONY: do-cweave .FORCE
+
+if do_cweb
+bg5conv.c: $(CJKUTILS_TREE)/Bg5conv/bg5conv.w
+	$(CTANGLE) $<
+cef5conv.c: $(CJKUTILS_TREE)/CEFconv/cef5conv.w
+	$(CTANGLE) $<
+cefconv.c: $(CJKUTILS_TREE)/CEFconv/cefconv.w
+	$(CTANGLE) $<
+cefsconv.c: $(CJKUTILS_TREE)/CEFconv/cefsconv.w
+	$(CTANGLE) $<
+sjisconv.c: $(CJKUTILS_TREE)/SJISconv/sjisconv.w
+	$(CTANGLE) $<
+extconv.c: $(CJKUTILS_TREE)/extconv/extconv.w
+	$(CTANGLE) $<
+hbf2gf.c: $(CWEB_SRC)
+	$(CTANGLE) $<
+endif do_cweb
 
diff --git a/Build/source/texk/cjkutils/Makefile.in b/Build/source/texk/cjkutils/Makefile.in
index 16d941218d9..5b69f5b17a9 100644
--- a/Build/source/texk/cjkutils/Makefile.in
+++ b/Build/source/texk/cjkutils/Makefile.in
@@ -14,6 +14,9 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
+
+
+
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
@@ -33,22 +36,32 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
+bin_PROGRAMS = bg5conv$(EXEEXT) cefconv$(EXEEXT) cef5conv$(EXEEXT) \
+	cefsconv$(EXEEXT) extconv$(EXEEXT) sjisconv$(EXEEXT) \
+	hbf2gf$(EXEEXT) $(am__EXEEXT_1)
+@WIN32_TRUE@am__append_1 = \
+@WIN32_TRUE@	gbklatex \
+@WIN32_TRUE@	gbkpdflatex
+
 subdir = .
 DIST_COMMON = $(am__configure_deps) \
 	$(srcdir)/../../build-aux/config.guess \
 	$(srcdir)/../../build-aux/config.sub \
+	$(srcdir)/../../build-aux/depcomp \
 	$(srcdir)/../../build-aux/install-sh \
 	$(srcdir)/../../build-aux/ltmain.sh \
 	$(srcdir)/../../build-aux/missing $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in $(top_srcdir)/configure \
-	../../build-aux/config.guess ../../build-aux/config.sub \
-	../../build-aux/depcomp ../../build-aux/install-sh \
-	../../build-aux/ltmain.sh ../../build-aux/missing \
-	../../build-aux/texinfo.tex ../../build-aux/ylwrap ChangeLog
+	$(srcdir)/Makefile.in $(srcdir)/c-auto.in \
+	$(top_srcdir)/configure ../../build-aux/config.guess \
+	../../build-aux/config.sub ../../build-aux/depcomp \
+	../../build-aux/install-sh ../../build-aux/ltmain.sh \
+	../../build-aux/missing ../../build-aux/texinfo.tex \
+	../../build-aux/ylwrap ChangeLog
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
 	$(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
+	$(top_srcdir)/../../m4/kpse-win32.m4 \
 	$(top_srcdir)/../../m4/libtool.m4 \
 	$(top_srcdir)/../../m4/ltoptions.m4 \
 	$(top_srcdir)/../../m4/ltsugar.m4 \
@@ -60,26 +73,87 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno config.status.lineno
 mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/hbf2gf/c-auto.h
+CONFIG_HEADER = c-auto.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-SOURCES =
-DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
-  distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
-	distdir dist dist-all distcheck
+@WIN32_TRUE@am__EXEEXT_1 = gbklatex$(EXEEXT) gbkpdflatex$(EXEEXT)
+am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" \
+	"$(DESTDIR)$(man1dir)" "$(DESTDIR)$(hbf2gf_cfgdir)"
+PROGRAMS = $(bin_PROGRAMS)
+bg5conv_SOURCES = bg5conv.c
+bg5conv_OBJECTS = bg5conv.$(OBJEXT)
+bg5conv_LDADD = $(LDADD)
+cef5conv_SOURCES = cef5conv.c
+cef5conv_OBJECTS = cef5conv.$(OBJEXT)
+cef5conv_LDADD = $(LDADD)
+cefconv_SOURCES = cefconv.c
+cefconv_OBJECTS = cefconv.$(OBJEXT)
+cefconv_LDADD = $(LDADD)
+cefsconv_SOURCES = cefsconv.c
+cefsconv_OBJECTS = cefsconv.$(OBJEXT)
+cefsconv_LDADD = $(LDADD)
+extconv_SOURCES = extconv.c
+extconv_OBJECTS = extconv.$(OBJEXT)
+extconv_LDADD = $(LDADD)
+am_gbklatex_OBJECTS = cjklatex.$(OBJEXT)
+gbklatex_OBJECTS = $(am_gbklatex_OBJECTS)
+am__DEPENDENCIES_1 =
+am__objects_1 = gbkpdflatex-cjklatex.$(OBJEXT)
+am_gbkpdflatex_OBJECTS = $(am__objects_1)
+gbkpdflatex_OBJECTS = $(am_gbkpdflatex_OBJECTS)
+am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
+am_hbf2gf_OBJECTS = hbf2gf-hbf.$(OBJEXT) hbf2gf-hbf2gf.$(OBJEXT)
+hbf2gf_OBJECTS = $(am_hbf2gf_OBJECTS)
+sjisconv_SOURCES = sjisconv.c
+sjisconv_OBJECTS = sjisconv.$(OBJEXT)
+sjisconv_LDADD = $(LDADD)
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+SCRIPTS = $(bin_SCRIPTS)
+DEFAULT_INCLUDES = -I.@am__isrc@
+depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+SOURCES = bg5conv.c cef5conv.c cefconv.c cefsconv.c extconv.c \
+	$(gbklatex_SOURCES) $(gbkpdflatex_SOURCES) $(hbf2gf_SOURCES) \
+	sjisconv.c
+DIST_SOURCES = bg5conv.c cef5conv.c cefconv.c cefsconv.c extconv.c \
+	$(gbklatex_SOURCES) $(gbkpdflatex_SOURCES) $(hbf2gf_SOURCES) \
+	sjisconv.c
+man1dir = $(mandir)/man1
+NROFF = nroff
+MANS = $(man1_MANS)
+DATA = $(hbf2gf_cfg_DATA)
 ETAGS = etags
 CTAGS = ctags
-DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
@@ -87,31 +161,6 @@ am__remove_distdir = \
   { test ! -d "$(distdir)" \
     || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
          && rm -fr "$(distdir)"; }; }
-am__relativize = \
-  dir0=`pwd`; \
-  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
-  sed_rest='s,^[^/]*/*,,'; \
-  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
-  sed_butlast='s,/*[^/]*$$,,'; \
-  while test -n "$$dir1"; do \
-    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
-    if test "$$first" != "."; then \
-      if test "$$first" = ".."; then \
-        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
-        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
-      else \
-        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
-        if test "$$first2" = "$$first"; then \
-          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
-        else \
-          dir2="../$$dir2"; \
-        fi; \
-        dir0="$$dir0"/"$$first"; \
-      fi; \
-    fi; \
-    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
-  done; \
-  reldir="$$dir2"
 DIST_ARCHIVES = $(distdir).tar.gz
 GZIP_ENV = --best
 distuninstallcheck_listfiles = find . -type f -print
@@ -127,6 +176,7 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CJKUTILS_TREE = @CJKUTILS_TREE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CTANGLE = @CTANGLE@
@@ -241,12 +291,85 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 ACLOCAL_AMFLAGS = -I ../../m4
-SUBDIRS = . conv hbf2gf scripts
+EXTRA_DIST = $(CJKUTILS_TREE) $(CJKUTILS_TREE)-PATCHES $(CWEB_TEX) \
+	$(CWEB_DVI)
 DISTCLEANFILES = config.force
-EXTRA_DIST = bat
-all: all-recursive
+INCLUDES = $(KPATHSEA_INCLUDES)
+AM_CPPFLAGS = $(XX_CPPFLAGS)
+AM_CFLAGS = $(XX_CFLAGS)
+hbf2gf_SOURCES = \
+	$(CJKUTILS_TREE)/hbf2gf/hbf.c \
+	$(CJKUTILS_TREE)/hbf2gf/hbf.h \
+	hbf2gf.c
+
+hbf2gf_CPPFLAGS = -I$(srcdir)/$(CJKUTILS_TREE)/hbf2gf -Dunix -DHAVE_LIBKPATHSEA $(AM_CPPFLAGS)
+hbf2gf_DEPENDENCIES = $(KPATHSEA_DEPEND)
+hbf2gf_LDADD = $(KPATHSEA_LIBS)
+@WIN32_FALSE@HOOK_DST = bg5+
+@WIN32_TRUE@HOOK_DST = bg5 cef5 cef cefs sjis
+@WIN32_FALSE@HOOK_CMD = $(LN_S)
+@WIN32_TRUE@HOOK_CMD = cp
+gbklatex_SOURCES = \
+	$(CJKUTILS_TREE)/cjklatex/cjklatex.c
+
+gbklatex_DEPENDENCIES = $(KPATHSEA_DEPEND)
+gbklatex_LDADD = $(KPATHSEA_LIBS)
+gbkpdflatex_SOURCES = $(gbklatex_SOURCES)
+gbkpdflatex_CPPFLAGS = -DLATEX=\"pdflatex\" $(AM_CPPFLAGS)
+gbkpdflatex_DEPENDENCIES = $(gbklatex_DEPENDENCIES)
+gbkpdflatex_LDADD = $(gbklatex_LDADD)
+@WIN32_FALSE@bin_SCRIPTS = \
+@WIN32_FALSE@	$(CJKUTILS_TREE)/Bg5conv/bg5latex \
+@WIN32_FALSE@	$(CJKUTILS_TREE)/Bg5conv/bg5pdflatex \
+@WIN32_FALSE@	$(CJKUTILS_TREE)/CEFconv/cef5latex \
+@WIN32_FALSE@	$(CJKUTILS_TREE)/CEFconv/cef5pdflatex \
+@WIN32_FALSE@	$(CJKUTILS_TREE)/CEFconv/ceflatex \
+@WIN32_FALSE@	$(CJKUTILS_TREE)/CEFconv/cefpdflatex \
+@WIN32_FALSE@	$(CJKUTILS_TREE)/CEFconv/cefslatex \
+@WIN32_FALSE@	$(CJKUTILS_TREE)/CEFconv/cefspdflatex \
+@WIN32_FALSE@	$(CJKUTILS_TREE)/SJISconv/sjislatex \
+@WIN32_FALSE@	$(CJKUTILS_TREE)/SJISconv/sjispdflatex \
+@WIN32_FALSE@	$(CJKUTILS_TREE)/extconv/gbklatex \
+@WIN32_FALSE@	$(CJKUTILS_TREE)/extconv/gbkpdflatex
+
+@WIN32_TRUE@bin_SCRIPTS = 
+man1_MANS = \
+	$(CJKUTILS_TREE)/Bg5conv/bg5conv.1 \
+	$(CJKUTILS_TREE)/CEFconv/cef5conv.1 \
+	$(CJKUTILS_TREE)/CEFconv/cefconv.1 \
+	$(CJKUTILS_TREE)/CEFconv/cefsconv.1 \
+	$(CJKUTILS_TREE)/SJISconv/sjisconv.1 \
+	$(CJKUTILS_TREE)/extconv/extconv.1 \
+	$(CJKUTILS_TREE)/hbf2gf/hbf2gf.1
+
+hbf2gf_cfgdir = ${prefix}/texmf/hbf2gf
+CFG = $(CJKUTILS_TREE)/hbf2gf/cfg
+hbf2gf_cfg_DATA = \
+	$(CFG)/b5ka12.cfg \
+	$(CFG)/b5kr12.cfg \
+	$(CFG)/b5so12.cfg \
+	$(CFG)/c1so12.cfg \
+	$(CFG)/c2so12.cfg \
+	$(CFG)/c3so12.cfg \
+	$(CFG)/c4so12.cfg \
+	$(CFG)/c5so12.cfg \
+	$(CFG)/c6so12.cfg \
+	$(CFG)/c7so12.cfg \
+	$(CFG)/csso12.cfg \
+	$(CFG)/gsfs14.cfg \
+	$(CFG)/j2so12.cfg \
+	$(CFG)/jsso12.cfg \
+	$(CFG)/ksso17.cfg
+
+CWEB_SRC = $(CJKUTILS_TREE)/hbf2gf/hbf2gf.w
+CWEB_TEX = hbf2gf.tex hbf2gf.idx hbf2gf.scn
+CWEB_DVI = hbf2gf.dvi
+CLEANFILES = hbf2gf.log hbf2gf.toc
+all: c-auto.h
+	$(MAKE) $(AM_MAKEFLAGS) all-am
 
 .SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
 am--refresh:
 	@:
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
@@ -282,6 +405,221 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 $(am__aclocal_m4_deps):
 
+c-auto.h: stamp-h1
+	@if test ! -f $@; then \
+	  rm -f stamp-h1; \
+	  $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
+	else :; fi
+
+stamp-h1: $(srcdir)/c-auto.in $(top_builddir)/config.status
+	@rm -f stamp-h1
+	cd $(top_builddir) && $(SHELL) ./config.status c-auto.h
+$(srcdir)/c-auto.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) 
+	($(am__cd) $(top_srcdir) && $(AUTOHEADER))
+	rm -f stamp-h1
+	touch $@
+
+distclean-hdr:
+	-rm -f c-auto.h stamp-h1
+install-binPROGRAMS: $(bin_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
+	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	for p in $$list; do echo "$$p $$p"; done | \
+	sed 's/$(EXEEXT)$$//' | \
+	while read p p1; do if test -f $$p || test -f $$p1; \
+	  then echo "$$p"; echo "$$p"; else :; fi; \
+	done | \
+	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+	sed 'N;N;N;s,\n, ,g' | \
+	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
+	    else { print "f", $$3 "/" $$4, $$1; } } \
+	  END { for (d in files) print "f", d, files[d] }' | \
+	while read type dir files; do \
+	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+	    test -z "$$files" || { \
+	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
+	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
+	    } \
+	; done
+
+uninstall-binPROGRAMS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	files=`for p in $$list; do echo "$$p"; done | \
+	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+	      -e 's/$$/$(EXEEXT)/' `; \
+	test -n "$$list" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(bindir)" && rm -f $$files
+
+clean-binPROGRAMS:
+	@list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
+bg5conv$(EXEEXT): $(bg5conv_OBJECTS) $(bg5conv_DEPENDENCIES) 
+	@rm -f bg5conv$(EXEEXT)
+	$(LINK) $(bg5conv_OBJECTS) $(bg5conv_LDADD) $(LIBS)
+cef5conv$(EXEEXT): $(cef5conv_OBJECTS) $(cef5conv_DEPENDENCIES) 
+	@rm -f cef5conv$(EXEEXT)
+	$(LINK) $(cef5conv_OBJECTS) $(cef5conv_LDADD) $(LIBS)
+cefconv$(EXEEXT): $(cefconv_OBJECTS) $(cefconv_DEPENDENCIES) 
+	@rm -f cefconv$(EXEEXT)
+	$(LINK) $(cefconv_OBJECTS) $(cefconv_LDADD) $(LIBS)
+cefsconv$(EXEEXT): $(cefsconv_OBJECTS) $(cefsconv_DEPENDENCIES) 
+	@rm -f cefsconv$(EXEEXT)
+	$(LINK) $(cefsconv_OBJECTS) $(cefsconv_LDADD) $(LIBS)
+extconv$(EXEEXT): $(extconv_OBJECTS) $(extconv_DEPENDENCIES) 
+	@rm -f extconv$(EXEEXT)
+	$(LINK) $(extconv_OBJECTS) $(extconv_LDADD) $(LIBS)
+gbklatex$(EXEEXT): $(gbklatex_OBJECTS) $(gbklatex_DEPENDENCIES) 
+	@rm -f gbklatex$(EXEEXT)
+	$(LINK) $(gbklatex_OBJECTS) $(gbklatex_LDADD) $(LIBS)
+gbkpdflatex$(EXEEXT): $(gbkpdflatex_OBJECTS) $(gbkpdflatex_DEPENDENCIES) 
+	@rm -f gbkpdflatex$(EXEEXT)
+	$(LINK) $(gbkpdflatex_OBJECTS) $(gbkpdflatex_LDADD) $(LIBS)
+hbf2gf$(EXEEXT): $(hbf2gf_OBJECTS) $(hbf2gf_DEPENDENCIES) 
+	@rm -f hbf2gf$(EXEEXT)
+	$(LINK) $(hbf2gf_OBJECTS) $(hbf2gf_LDADD) $(LIBS)
+sjisconv$(EXEEXT): $(sjisconv_OBJECTS) $(sjisconv_DEPENDENCIES) 
+	@rm -f sjisconv$(EXEEXT)
+	$(LINK) $(sjisconv_OBJECTS) $(sjisconv_LDADD) $(LIBS)
+install-binSCRIPTS: $(bin_SCRIPTS)
+	@$(NORMAL_INSTALL)
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
+	@list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
+	done | \
+	sed -e 'p;s,.*/,,;n' \
+	    -e 'h;s|.*|.|' \
+	    -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \
+	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \
+	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+	    if ($$2 == $$4) { files[d] = files[d] " " $$1; \
+	      if (++n[d] == $(am__install_max)) { \
+		print "f", d, files[d]; n[d] = 0; files[d] = "" } } \
+	    else { print "f", d "/" $$4, $$1 } } \
+	  END { for (d in files) print "f", d, files[d] }' | \
+	while read type dir files; do \
+	     if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+	     test -z "$$files" || { \
+	       echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(bindir)$$dir'"; \
+	       $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
+	     } \
+	; done
+
+uninstall-binSCRIPTS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \
+	files=`for p in $$list; do echo "$$p"; done | \
+	       sed -e 's,.*/,,;$(transform)'`; \
+	test -n "$$list" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(bindir)" && rm -f $$files
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bg5conv.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cef5conv.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cefconv.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cefsconv.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cjklatex.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/extconv.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gbkpdflatex-cjklatex.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hbf2gf-hbf.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hbf2gf-hbf2gf.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sjisconv.Po@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+
+cjklatex.o: $(CJKUTILS_TREE)/cjklatex/cjklatex.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cjklatex.o -MD -MP -MF $(DEPDIR)/cjklatex.Tpo -c -o cjklatex.o `test -f '$(CJKUTILS_TREE)/cjklatex/cjklatex.c' || echo '$(srcdir)/'`$(CJKUTILS_TREE)/cjklatex/cjklatex.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/cjklatex.Tpo $(DEPDIR)/cjklatex.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(CJKUTILS_TREE)/cjklatex/cjklatex.c' object='cjklatex.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cjklatex.o `test -f '$(CJKUTILS_TREE)/cjklatex/cjklatex.c' || echo '$(srcdir)/'`$(CJKUTILS_TREE)/cjklatex/cjklatex.c
+
+cjklatex.obj: $(CJKUTILS_TREE)/cjklatex/cjklatex.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cjklatex.obj -MD -MP -MF $(DEPDIR)/cjklatex.Tpo -c -o cjklatex.obj `if test -f '$(CJKUTILS_TREE)/cjklatex/cjklatex.c'; then $(CYGPATH_W) '$(CJKUTILS_TREE)/cjklatex/cjklatex.c'; else $(CYGPATH_W) '$(srcdir)/$(CJKUTILS_TREE)/cjklatex/cjklatex.c'; fi`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/cjklatex.Tpo $(DEPDIR)/cjklatex.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(CJKUTILS_TREE)/cjklatex/cjklatex.c' object='cjklatex.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cjklatex.obj `if test -f '$(CJKUTILS_TREE)/cjklatex/cjklatex.c'; then $(CYGPATH_W) '$(CJKUTILS_TREE)/cjklatex/cjklatex.c'; else $(CYGPATH_W) '$(srcdir)/$(CJKUTILS_TREE)/cjklatex/cjklatex.c'; fi`
+
+gbkpdflatex-cjklatex.o: $(CJKUTILS_TREE)/cjklatex/cjklatex.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gbkpdflatex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gbkpdflatex-cjklatex.o -MD -MP -MF $(DEPDIR)/gbkpdflatex-cjklatex.Tpo -c -o gbkpdflatex-cjklatex.o `test -f '$(CJKUTILS_TREE)/cjklatex/cjklatex.c' || echo '$(srcdir)/'`$(CJKUTILS_TREE)/cjklatex/cjklatex.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/gbkpdflatex-cjklatex.Tpo $(DEPDIR)/gbkpdflatex-cjklatex.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(CJKUTILS_TREE)/cjklatex/cjklatex.c' object='gbkpdflatex-cjklatex.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gbkpdflatex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gbkpdflatex-cjklatex.o `test -f '$(CJKUTILS_TREE)/cjklatex/cjklatex.c' || echo '$(srcdir)/'`$(CJKUTILS_TREE)/cjklatex/cjklatex.c
+
+gbkpdflatex-cjklatex.obj: $(CJKUTILS_TREE)/cjklatex/cjklatex.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gbkpdflatex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gbkpdflatex-cjklatex.obj -MD -MP -MF $(DEPDIR)/gbkpdflatex-cjklatex.Tpo -c -o gbkpdflatex-cjklatex.obj `if test -f '$(CJKUTILS_TREE)/cjklatex/cjklatex.c'; then $(CYGPATH_W) '$(CJKUTILS_TREE)/cjklatex/cjklatex.c'; else $(CYGPATH_W) '$(srcdir)/$(CJKUTILS_TREE)/cjklatex/cjklatex.c'; fi`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/gbkpdflatex-cjklatex.Tpo $(DEPDIR)/gbkpdflatex-cjklatex.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(CJKUTILS_TREE)/cjklatex/cjklatex.c' object='gbkpdflatex-cjklatex.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gbkpdflatex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gbkpdflatex-cjklatex.obj `if test -f '$(CJKUTILS_TREE)/cjklatex/cjklatex.c'; then $(CYGPATH_W) '$(CJKUTILS_TREE)/cjklatex/cjklatex.c'; else $(CYGPATH_W) '$(srcdir)/$(CJKUTILS_TREE)/cjklatex/cjklatex.c'; fi`
+
+hbf2gf-hbf.o: $(CJKUTILS_TREE)/hbf2gf/hbf.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hbf2gf_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hbf2gf-hbf.o -MD -MP -MF $(DEPDIR)/hbf2gf-hbf.Tpo -c -o hbf2gf-hbf.o `test -f '$(CJKUTILS_TREE)/hbf2gf/hbf.c' || echo '$(srcdir)/'`$(CJKUTILS_TREE)/hbf2gf/hbf.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/hbf2gf-hbf.Tpo $(DEPDIR)/hbf2gf-hbf.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(CJKUTILS_TREE)/hbf2gf/hbf.c' object='hbf2gf-hbf.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hbf2gf_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o hbf2gf-hbf.o `test -f '$(CJKUTILS_TREE)/hbf2gf/hbf.c' || echo '$(srcdir)/'`$(CJKUTILS_TREE)/hbf2gf/hbf.c
+
+hbf2gf-hbf.obj: $(CJKUTILS_TREE)/hbf2gf/hbf.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hbf2gf_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hbf2gf-hbf.obj -MD -MP -MF $(DEPDIR)/hbf2gf-hbf.Tpo -c -o hbf2gf-hbf.obj `if test -f '$(CJKUTILS_TREE)/hbf2gf/hbf.c'; then $(CYGPATH_W) '$(CJKUTILS_TREE)/hbf2gf/hbf.c'; else $(CYGPATH_W) '$(srcdir)/$(CJKUTILS_TREE)/hbf2gf/hbf.c'; fi`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/hbf2gf-hbf.Tpo $(DEPDIR)/hbf2gf-hbf.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(CJKUTILS_TREE)/hbf2gf/hbf.c' object='hbf2gf-hbf.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hbf2gf_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o hbf2gf-hbf.obj `if test -f '$(CJKUTILS_TREE)/hbf2gf/hbf.c'; then $(CYGPATH_W) '$(CJKUTILS_TREE)/hbf2gf/hbf.c'; else $(CYGPATH_W) '$(srcdir)/$(CJKUTILS_TREE)/hbf2gf/hbf.c'; fi`
+
+hbf2gf-hbf2gf.o: hbf2gf.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hbf2gf_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hbf2gf-hbf2gf.o -MD -MP -MF $(DEPDIR)/hbf2gf-hbf2gf.Tpo -c -o hbf2gf-hbf2gf.o `test -f 'hbf2gf.c' || echo '$(srcdir)/'`hbf2gf.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/hbf2gf-hbf2gf.Tpo $(DEPDIR)/hbf2gf-hbf2gf.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='hbf2gf.c' object='hbf2gf-hbf2gf.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hbf2gf_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o hbf2gf-hbf2gf.o `test -f 'hbf2gf.c' || echo '$(srcdir)/'`hbf2gf.c
+
+hbf2gf-hbf2gf.obj: hbf2gf.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hbf2gf_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hbf2gf-hbf2gf.obj -MD -MP -MF $(DEPDIR)/hbf2gf-hbf2gf.Tpo -c -o hbf2gf-hbf2gf.obj `if test -f 'hbf2gf.c'; then $(CYGPATH_W) 'hbf2gf.c'; else $(CYGPATH_W) '$(srcdir)/hbf2gf.c'; fi`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/hbf2gf-hbf2gf.Tpo $(DEPDIR)/hbf2gf-hbf2gf.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='hbf2gf.c' object='hbf2gf-hbf2gf.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hbf2gf_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o hbf2gf-hbf2gf.obj `if test -f 'hbf2gf.c'; then $(CYGPATH_W) 'hbf2gf.c'; else $(CYGPATH_W) '$(srcdir)/hbf2gf.c'; fi`
+
 mostlyclean-libtool:
 	-rm -f *.lo
 
@@ -290,77 +628,61 @@ clean-libtool:
 
 distclean-libtool:
 	-rm -f libtool config.lt
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    dot_seen=yes; \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
+install-man1: $(man1_MANS)
+	@$(NORMAL_INSTALL)
+	test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
+	@list='$(man1_MANS)'; test -n "$(man1dir)" || exit 0; \
+	{ for i in $$list; do echo "$$i"; done; \
+	} | while read p; do \
+	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; echo "$$p"; \
+	done | \
+	sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
+	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
+	sed 'N;N;s,\n, ,g' | { \
+	list=; while read file base inst; do \
+	  if test "$$base" = "$$inst"; then list="$$list $$file"; else \
+	    echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
+	    $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst" || exit $$?; \
 	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done; \
-	if test "$$dot_seen" = "no"; then \
-	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-	fi; test -z "$$fail"
-
-$(RECURSIVE_CLEAN_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
 	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	for i in $$list; do echo "$$i"; done | $(am__base_list) | \
+	while read files; do \
+	  test -z "$$files" || { \
+	    echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man1dir)'"; \
+	    $(INSTALL_DATA) $$files "$(DESTDIR)$(man1dir)" || exit $$?; }; \
+	done; }
+
+uninstall-man1:
+	@$(NORMAL_UNINSTALL)
+	@list='$(man1_MANS)'; test -n "$(man1dir)" || exit 0; \
+	files=`{ for i in $$list; do echo "$$i"; done; \
+	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
+	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
+	test -z "$$files" || { \
+	  echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \
+	  cd "$(DESTDIR)$(man1dir)" && rm -f $$files; }
+install-hbf2gf_cfgDATA: $(hbf2gf_cfg_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(hbf2gf_cfgdir)" || $(MKDIR_P) "$(DESTDIR)$(hbf2gf_cfgdir)"
+	@list='$(hbf2gf_cfg_DATA)'; test -n "$(hbf2gf_cfgdir)" || list=; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(hbf2gf_cfgdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(hbf2gf_cfgdir)" || exit $$?; \
 	done
 
+uninstall-hbf2gf_cfgDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(hbf2gf_cfg_DATA)'; test -n "$(hbf2gf_cfgdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(hbf2gf_cfgdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(hbf2gf_cfgdir)" && rm -f $$files
+
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -371,24 +693,11 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	mkid -fID $$unique
 tags: TAGS
 
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+TAGS:  $(HEADERS) $(SOURCES) c-auto.in $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	set x; \
 	here=`pwd`; \
-	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
-	  include_option=--etags-include; \
-	  empty_fix=.; \
-	else \
-	  include_option=--include; \
-	  empty_fix=; \
-	fi; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test ! -f $$subdir/TAGS || \
-	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
-	  fi; \
-	done; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	list='$(SOURCES) $(HEADERS) c-auto.in $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
@@ -406,9 +715,9 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	  fi; \
 	fi
 ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+CTAGS:  $(HEADERS) $(SOURCES) c-auto.in $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	list='$(SOURCES) $(HEADERS) c-auto.in $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
@@ -427,6 +736,19 @@ distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
+	@list='$(MANS)'; if test -n "$$list"; then \
+	  list=`for p in $$list; do \
+	    if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+	    if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
+	  if test -n "$$list" && \
+	    grep 'ab help2man is required to generate this page' $$list >/dev/null; then \
+	    echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \
+	    grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/         /' >&2; \
+	    echo "       to fix them, install help2man, remove and regenerate the man pages;" >&2; \
+	    echo "       typically \`make maintainer-clean' will remove them" >&2; \
+	    exit 1; \
+	  else :; fi; \
+	else :; fi
 	$(am__remove_distdir)
 	test -d "$(distdir)" || mkdir "$(distdir)"
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
@@ -458,34 +780,6 @@ distdir: $(DISTFILES)
 	    || exit 1; \
 	  fi; \
 	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
-	    $(am__relativize); \
-	    new_distdir=$$reldir; \
-	    dir1=$$subdir; dir2="$(top_distdir)"; \
-	    $(am__relativize); \
-	    new_top_distdir=$$reldir; \
-	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
-	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
-	    ($(am__cd) $$subdir && \
-	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$new_top_distdir" \
-	        distdir="$$new_distdir" \
-		am__remove_distdir=: \
-		am__skip_length_check=: \
-		am__skip_mode_fix=: \
-	        distdir) \
-	      || exit 1; \
-	  fi; \
-	done
 	$(MAKE) $(AM_MAKEFLAGS) \
 	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
 	  dist-hook
@@ -605,19 +899,22 @@ distcleancheck: distclean
 	       $(distcleancheck_listfiles) ; \
 	       exit 1; } >&2
 check-am: all-am
-check: check-recursive
-all-am: Makefile all-local
-installdirs: installdirs-recursive
-installdirs-am:
-install: install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
+check: check-am
+all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(MANS) $(DATA) c-auto.h \
+		all-local
+installdirs:
+	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(hbf2gf_cfgdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
 
 install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 
-installcheck: installcheck-recursive
+installcheck: installcheck-am
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
 	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
@@ -626,6 +923,7 @@ install-strip:
 mostlyclean-generic:
 
 clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -635,107 +933,166 @@ distclean-generic:
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-recursive
+clean: clean-am
 
-clean-am: clean-generic clean-libtool mostlyclean-am
+clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
 
-distclean: distclean-recursive
+distclean: distclean-am
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
+	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool \
-	distclean-tags
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-hdr distclean-libtool distclean-tags
 
-dvi: dvi-recursive
+dvi: dvi-am
 
 dvi-am:
 
-html: html-recursive
+html: html-am
 
 html-am:
 
-info: info-recursive
+info: info-am
 
 info-am:
 
-install-data-am:
+install-data-am: install-hbf2gf_cfgDATA install-man
 
-install-dvi: install-dvi-recursive
+install-dvi: install-dvi-am
 
 install-dvi-am:
 
-install-exec-am:
-
-install-html: install-html-recursive
+install-exec-am: install-binPROGRAMS install-binSCRIPTS
+	@$(NORMAL_INSTALL)
+	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
+install-html: install-html-am
 
 install-html-am:
 
-install-info: install-info-recursive
+install-info: install-info-am
 
 install-info-am:
 
-install-man:
+install-man: install-man1
 
-install-pdf: install-pdf-recursive
+install-pdf: install-pdf-am
 
 install-pdf-am:
 
-install-ps: install-ps-recursive
+install-ps: install-ps-am
 
 install-ps-am:
 
 installcheck-am:
 
-maintainer-clean: maintainer-clean-recursive
+maintainer-clean: maintainer-clean-am
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
 	-rm -rf $(top_srcdir)/autom4te.cache
+	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
-mostlyclean: mostlyclean-recursive
+mostlyclean: mostlyclean-am
 
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
 
-pdf: pdf-recursive
+pdf: pdf-am
 
 pdf-am:
 
-ps: ps-recursive
+ps: ps-am
 
 ps-am:
 
-uninstall-am:
+uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \
+	uninstall-hbf2gf_cfgDATA uninstall-man
+	@$(NORMAL_INSTALL)
+	$(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+uninstall-man: uninstall-man1
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
-	install-am install-strip tags-recursive
+.MAKE: all install-am install-exec-am install-strip uninstall-am
 
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am all-local am--refresh check check-am clean \
-	clean-generic clean-libtool ctags ctags-recursive dist \
+.PHONY: CTAGS GTAGS all all-am all-local am--refresh check check-am \
+	clean clean-binPROGRAMS clean-generic clean-libtool ctags dist \
 	dist-all dist-bzip2 dist-gzip dist-hook dist-lzma dist-shar \
 	dist-tarZ dist-xz dist-zip distcheck distclean \
-	distclean-generic distclean-libtool distclean-tags \
-	distcleancheck distdir distuninstallcheck dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
-	uninstall uninstall-am
+	distclean-compile distclean-generic distclean-hdr \
+	distclean-libtool distclean-tags distcleancheck distdir \
+	distuninstallcheck dvi dvi-am html html-am info info-am \
+	install install-am install-binPROGRAMS install-binSCRIPTS \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-exec-hook \
+	install-hbf2gf_cfgDATA install-html install-html-am \
+	install-info install-info-am install-man install-man1 \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags uninstall uninstall-am \
+	uninstall-binPROGRAMS uninstall-binSCRIPTS \
+	uninstall-hbf2gf_cfgDATA uninstall-hook uninstall-man \
+	uninstall-man1
 
 
 # in case of an SVN repository
 dist-hook:
 	rm -rf `find $(distdir) -name .svn`
 
-all-local: config.force
+@do_cweb_TRUE@all-local: config.force hbf2gf.dvi
+@do_cweb_FALSE@all-local: config.force
 
 config.force: $(KPATHSEA_DEPEND)
 	echo timestamp >config.force
 	$(SHELL) ./config.status --recheck
 
+@KPATHSEA_RULE@
+
+install-exec-hook:
+	@cd $(DESTDIR)$(bindir) && \
+	  for p in latex pdflatex; do \
+	    for c in $(HOOK_DST); do \
+	      echo "$(HOOK_CMD) gbk$$p$(EXEEXT) $$c$$p$(EXEEXT)"; \
+	      rm -f $$c$$p$(EXEEXT); $(HOOK_CMD) gbk$$p$(EXEEXT) $$c$$p$(EXEEXT); \
+	    done; \
+	  done
+
+uninstall-hook:
+	@for p in latex pdflatex; do \
+	  for c in $(HOOK_DST); do \
+	    echo "rm -f $(DESTDIR)$(bindir)/$$c$$p$(EXEEXT)"; \
+	    rm -f $(DESTDIR)$(bindir)/$$c$$p$(EXEEXT); \
+	  done; \
+	done
+
+hbf2gf.dvi: $(CWEB_TEX)
+	TEXINPUTS=.:$(srcdir):$$TEXINPUTS $(TEX) hbf2gf.tex
+
+# Running cweave in order to create hbf2gf.tex generates in addition
+# hbf2gf.idx and hbf2gf.scn; we must rerun cweave when they are not
+# up to date (even if hbf2gf.tex is up to date). Thus the sub-make.
+#
+hbf2gf.tex hbf2gf.idx hbf2gf.scn: $(CWEB_SRC)
+	$(MAKE) $(AM_MAKEFLAGS) do-cweave
+do-cweave: $(CWEB_SRC) .FORCE
+	$(CWEAVE) +ai $<
+.PHONY: do-cweave .FORCE
+
+@do_cweb_TRUE@bg5conv.c: $(CJKUTILS_TREE)/Bg5conv/bg5conv.w
+@do_cweb_TRUE@	$(CTANGLE) $<
+@do_cweb_TRUE@cef5conv.c: $(CJKUTILS_TREE)/CEFconv/cef5conv.w
+@do_cweb_TRUE@	$(CTANGLE) $<
+@do_cweb_TRUE@cefconv.c: $(CJKUTILS_TREE)/CEFconv/cefconv.w
+@do_cweb_TRUE@	$(CTANGLE) $<
+@do_cweb_TRUE@cefsconv.c: $(CJKUTILS_TREE)/CEFconv/cefsconv.w
+@do_cweb_TRUE@	$(CTANGLE) $<
+@do_cweb_TRUE@sjisconv.c: $(CJKUTILS_TREE)/SJISconv/sjisconv.w
+@do_cweb_TRUE@	$(CTANGLE) $<
+@do_cweb_TRUE@extconv.c: $(CJKUTILS_TREE)/extconv/extconv.w
+@do_cweb_TRUE@	$(CTANGLE) $<
+@do_cweb_TRUE@hbf2gf.c: $(CWEB_SRC)
+@do_cweb_TRUE@	$(CTANGLE) $<
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/Build/source/texk/cjkutils/aclocal.m4 b/Build/source/texk/cjkutils/aclocal.m4
index d77f3a9c0b1..2e8f28004fa 100644
--- a/Build/source/texk/cjkutils/aclocal.m4
+++ b/Build/source/texk/cjkutils/aclocal.m4
@@ -992,6 +992,7 @@ AC_SUBST([am__untar])
 m4_include([../../m4/kpse-common.m4])
 m4_include([../../m4/kpse-kpathsea-flags.m4])
 m4_include([../../m4/kpse-warnings.m4])
+m4_include([../../m4/kpse-win32.m4])
 m4_include([../../m4/libtool.m4])
 m4_include([../../m4/ltoptions.m4])
 m4_include([../../m4/ltsugar.m4])
diff --git a/Build/source/texk/cjkutils/bat/f_name.bat b/Build/source/texk/cjkutils/bat/f_name.bat
deleted file mode 100644
index 70e6e69ce9a..00000000000
--- a/Build/source/texk/cjkutils/bat/f_name.bat
+++ /dev/null
@@ -1,205 +0,0 @@
-@echo off
-:4dosCheck
-    if "%@eval[2+2]"=="4" loadbtm on
-:Start
-    if [%1]==[] goto Usage
-    if [%1]==[/?] goto Help
-    if [%2]==[] goto InputCheck
-REM
-REM This file is called F_NAME.BAT per default. Call it whatever you like.
-REM
-REM You need enough free environment space for this batch file.
-REM If there's not enough free space, f_name.bat will give you a warning.
-REM
-REM While f_name.bat tries to test your free environment space, you'll
-REM probably need to check your config.sys for the following line:
-REM
-REM     SHELL=C:\DOS\COMMAND.COM C:\DOS\ /E:1024 /p
-REM
-REM The '/E:1024' sets your environment space - it will probably need to
-REM be 1024 or higher (unless you're really economical with env-space).
-REM
-REM If you are not sure about free space, set fp and fn with long dummy
-REM strings in autoexec.bat to get enough free space, eg.:
-REM
-REM set fp=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-REM set fu=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-REM set fn=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-REM set fd=xx
-REM set fe=xxxx
-REM
-REM Using dummy strings is necessary if you're going to execute
-REM f_name.bat from a second command shell, eg. from Norton Commander.
-REM In this case the total length reserved for f_name.bat should be up
-REM to 192 bytes. My suggestion is, let the strings for fp, fu, and fn count
-REM up to 186 bytes (eg. 62 each).
-REM
-REM Some releases of DOS (eg. some beta-releases/pre-releases of DOS 6.0
-REM and some older DOS releases) does not support the batchcommand 'NOT'.
-REM If you're still using such a release you cannot use this batchfile
-REM since it uses this batchcommand.
-REM
-REM Please also note that f_name.bat cannot work properly if filespec is
-REM longer than around 38 (? I don't know the exact length) characters. If
-REM filespec is long, f_name.bat will fail at 'for %%x in ... do if ...'
-REM lines.  The result of error is fairly unpredictable as DOS will try to
-REM execute with a truncated batch command line.  So, please use the
-REM batch file for short filespecs (< 38??). (On my DOS 6.22 using
-REM strings above 38 chars gives me an endless loop, Claus Futtrup).
-REM
-REM For large batchfiles it is usually an advantage to use a
-REM 'batch-compiler', which will convert the .bat file into a .com or
-REM .exe file. With f_name.bat this could probably speed it up many
-REM times, but it has not been possible to find a batch-compiler, which
-REM will compile this batchfile. The compilers PWR14G.ZIP and
-REM BAT2EX15.ZIP have been tested without success.
-REM
-REM This modified release is more solid when it comes to garbage input, it
-REM is provided with help option, additional documentation and additional
-REM checking for sufficient environment space and now remove the temporary
-REM environment settings (P, Q, R, S, T) at the bottom of the batchfile. The
-REM structure is changed a bit, but the basic still is made by Wonkoo Kim.
-REM
-REM Please do not distribute this file without the above documentation
-REM included in the batch-file. If you change the file please add your
-REM name as a "modifier" as done below + document your changes. We do
-REM not intend to hold a copyright, though. You may use, misuse or abuse
-REM this batchfile as you see fit.
-REM
-REM This file is provided to you on a free basis. The author/modifiers
-REM do not want to be hold responsible to whatever this batchfile is
-REM doing. Use of this batchfile is entirely at your own risk.
-REM
-REM Wonkoo Kim (wkim+@pitt.edu), August 11, 1995
-REM Modified by Claus Futtrup (odie@csek.iprod.auc.dk), August 23. 1995
-REM Modified by Werner Lemberg (wl@gnu.org), Jan. 10. 1996
-REM   to run this batch file under 4DOS too (replacing all %%f with %%x
-REM   and doubling the speed with the LOADBTM ON command)
-REM Modified by Werner Lemberg (wl@gnu.org), Aug. 31. 1996
-REM   to return unix-like paths additionally in the variable %fu%;
-REM   the batch file will now parse e.g. \a.b\ correctly as a directory.
-REM
-:Usage
-    echo.
-    echo Usage: %0 filespec
-    echo.
-    echo Returns: fd (drive), fp (path), fu (unix path), fn (name), fe (extension)
-    echo.
-    echo Type %0 /? for additional help
-    echo %0 is made by Wonkoo Kim, modified by C. Futtrup and W. Lemberg.
-    echo.
-    goto END
-:Help
-    cls
-    echo %0 -- extracts the drive, path, name, and ext from file-path-name.
-    echo.
-    echo Return envs: FD (drive), FP (path), FU (unix path), FN (name), FE (ext)
-    echo Temp envs:   P, Q, R, S, T
-    echo.
-    echo     INPUT FILE         fd        fp        fn        fe
-    echo     ------------------ --------- --------- --------- ---------
-    echo     abc                                    abc      
-    echo     abc.tex                                abc       .tex
-    echo     c:\abc.tex         c:        \         abc       .tex
-    echo     c:tmp\abc.tex      c:        tmp\      abc       .tex
-    echo     c:\tmp\abc.tex     c:        \tmp\     abc       .tex
-    echo     c:tmp\tex\abc.tex  c:        tmp\tex\  abc       .tex
-    echo     c:\tmp\tex\abc.tex c:        \tmp\tex\ abc       .tex
-    echo.
-    echo Please note this file isn't blazing fast + it needs a lot
-    echo of environment space. See comments in %0 for more info.
-    echo.
-    echo Wonkoo Kim (wkim+@pitt.edu), August 11, 1995
-    echo Modified by Claus Futtrup (odie@csek.iprod.auc.dk), August 23. 1995
-    echo Modified by Werner Lemberg (wl@gnu.org), Aug 31. 1996
-    goto END
-:InputCheck
-    for %%x in (%1) do if "%%x"=="%1" goto Okay
-    echo *** ERROR: Please do not use wildcards in input file name.
-    goto END
-:Okay
-    set p=
-    set r=
-    set fp=
-    set fu=
-    set fe=
-    set fn=%1
-    set s=XXXXXXXX%fn%
-    set t=%fn%
-    set s=
-    if [%t%]==[%1] goto GetDrive
-:EnvErr
-    echo *** ERROR: Not enough environment space!
-    echo *** See documentation at top of file '%0'
-    goto END
-:GetDrive
-    for %%x in (/%t%) do set fn=%%x
-    for %%x in (/%t%) do if not [%%x]==[%fn%] set fd=%%x
-    if [%fn%]==[:] goto DriveOnly
-    set t=%fn%
-    for %%x in (/%t%) do set fn=%%x
-    if [:%fn%]==[%t%] goto DriveFound
-    set fd=
-    set fn=%1
-    goto GetPath
-:DriveOnly
-    set fn=
-:DriveFound
-    set fd=%fd%:
-:GetPath
-    set s=%fn%
-:PathLoop
-    set t=%s%
-    for %%x in (/%t%) do set s=%%x
-    set q=
-    for %%x in (/%t%) do if not [%%x]==[%s%] set q=%%x
-    if "\%s%"=="%t%" goto Separator
-    set p=%p%%q%
-    set r=%r%%q%
-    if [%s%]==[%t%] goto PathCheck
-    goto PathLoop
-:Separator
-    set fn=%s%
-    set p=%p%\
-    set r=%r%/
-    set fp=%p%
-    set fu=%r%
-    goto PathLoop
-:PathCheck
-    if [%s%]==[\] goto NoFilename
-    if not [%fn%]==[\] goto GetExt
-    set fp=\
-    set fu=/
-    set fn=
-    goto Done
-:NoFilename
-    set fp=%p%\
-    set fu=%r%/
-    set fn=
-    goto Done
-:GetExt
-    set s=%fn%
-    set fe=%fn%
-    set fn=
-:ExtLoop
-    set t=%fe%
-    for %%x in (/%t%) do set fe=%%x
-    if ".%fe%"=="%t%" goto ExtFound
-    if [%fe%]==[%t%] goto NoExt
-    for %%x in (/%t%) do if not [%%x]==[%fe%] set fn=%fn%%%x
-    goto ExtLoop
-:ExtFound
-    set fe=.%fe%
-    goto Done
-:NoExt
-    if not [%fe%]==[.]  set fn=%s%
-    set fe=
-:Done
-    echo DRIVE=%fd%  PATH=%fp%  UNIX_PATH=%fu%  NAME=%fn%  EXT=%fe%
-:END
-    set p=
-    set q=
-    set r=
-    set s=
-    set t=
-
diff --git a/Build/source/texk/cjkutils/conv/bg5conv.c b/Build/source/texk/cjkutils/bg5conv.c
index d8170b0be14..14837a1c843 100644
--- a/Build/source/texk/cjkutils/conv/bg5conv.c
+++ b/Build/source/texk/cjkutils/bg5conv.c
@@ -1,15 +1,14 @@
 #define banner  \
-"bg5conv (CJK ver. 4.7.0)" \
+"bg5conv (CJK ver. 4.8.2)" \
 
 /*2:*/
-#line 94 "/home/wl/cvs/cjk/cjk-4.7.0/utils/Bg5conv/bg5conv.w"
+#line 94 "./cjkutils-4.8.2/Bg5conv/bg5conv.w"
 
 #include <stdio.h> 
 #include <stdlib.h> 
 
 
-int main(int argc, char *argv[])
-
+int main(int argc,char*argv[])
 {int ch;
 
 fprintf(stdout,"\\def\\CJKpreproc{%s}",banner);
diff --git a/Build/source/texk/cjkutils/hbf2gf/c-auto.in b/Build/source/texk/cjkutils/c-auto.in
index 4505a71684d..546f1edcbb3 100644
--- a/Build/source/texk/cjkutils/hbf2gf/c-auto.in
+++ b/Build/source/texk/cjkutils/c-auto.in
@@ -1,4 +1,4 @@
-/* hbf2gf/c-auto.in.  Generated from configure.ac by autoheader.  */
+/* c-auto.in.  Generated from configure.ac by autoheader.  */
 
 /* Define to 1 if the `closedir' function returns void instead of `int'. */
 #undef CLOSEDIR_VOID
@@ -140,9 +140,6 @@
    */
 #undef LT_OBJDIR
 
-/* Name of package */
-#undef PACKAGE
-
 /* Define to the address where bug reports for this package should be sent. */
 #undef PACKAGE_BUGREPORT
 
@@ -167,9 +164,6 @@
 /* Define to 1 if your <sys/time.h> declares `struct tm'. */
 #undef TM_IN_SYS_TIME
 
-/* Version number of package */
-#undef VERSION
-
 /* Number of bits in a file offset, on hosts where this is settable. */
 #undef _FILE_OFFSET_BITS
 
diff --git a/Build/source/texk/cjkutils/conv/cef5conv.c b/Build/source/texk/cjkutils/cef5conv.c
index 8d7447c9593..1d648ef49a1 100644
--- a/Build/source/texk/cjkutils/conv/cef5conv.c
+++ b/Build/source/texk/cjkutils/cef5conv.c
@@ -1,16 +1,15 @@
 #define banner  \
-"cef5conv (CJK ver. 4.7.0)" \
+"cef5conv (CJK ver. 4.8.2)" \
 
 /*2:*/
-#line 108 "/home/wl/cvs/cjk/cjk-4.7.0/utils/CEFconv/cef5conv.w"
+#line 108 "./cjkutils-4.8.2/CEFconv/cef5conv.w"
 
 #include <ctype.h> 
 #include <stdio.h> 
 #include <stdlib.h> 
 
 
-int main(int argc, char *argv[])
-
+int main(int argc,char*argv[])
 {int ch,i;
 unsigned char in[16];
 unsigned char out[32];
diff --git a/Build/source/texk/cjkutils/conv/cefconv.c b/Build/source/texk/cjkutils/cefconv.c
index b501c175937..f5932bbf7a4 100644
--- a/Build/source/texk/cjkutils/conv/cefconv.c
+++ b/Build/source/texk/cjkutils/cefconv.c
@@ -1,16 +1,15 @@
 #define banner  \
-"cefconv (CJK ver. 4.7.0)" \
+"cefconv (CJK ver. 4.8.2)" \
 
 /*2:*/
-#line 100 "/home/wl/cvs/cjk/cjk-4.7.0/utils/CEFconv/cefconv.w"
+#line 100 "./cjkutils-4.8.2/CEFconv/cefconv.w"
 
 #include <ctype.h> 
 #include <stdio.h> 
 #include <stdlib.h> 
 
 
-int main(int argc, char *argv[])
-
+int main(int argc,char*argv[])
 {int ch,i;
 unsigned char in[16];
 unsigned char out[32];
diff --git a/Build/source/texk/cjkutils/conv/cefsconv.c b/Build/source/texk/cjkutils/cefsconv.c
index ddf608a38b2..b359e12533e 100644
--- a/Build/source/texk/cjkutils/conv/cefsconv.c
+++ b/Build/source/texk/cjkutils/cefsconv.c
@@ -1,16 +1,15 @@
 #define banner  \
-"cefsconv (CJK ver. 4.7.0)" \
+"cefsconv (CJK ver. 4.8.2)" \
 
 /*2:*/
-#line 108 "/home/wl/cvs/cjk/cjk-4.7.0/utils/CEFconv/cefsconv.w"
+#line 108 "./cjkutils-4.8.2/CEFconv/cefsconv.w"
 
 #include <ctype.h> 
 #include <stdio.h> 
 #include <stdlib.h> 
 
 
-int main(int argc, char *argv[])
-
+int main(int argc,char*argv[])
 {int ch,i;
 unsigned char in[16];
 unsigned char out[32];
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.2-PATCHES/ChangeLog b/Build/source/texk/cjkutils/cjkutils-4.8.2-PATCHES/ChangeLog
new file mode 100644
index 00000000000..257f4f6c06f
--- /dev/null
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.2-PATCHES/ChangeLog
@@ -0,0 +1,15 @@
+2010-12-19  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	Adapt to cjk-4.8.2/utils.
+	* patch-01-ANSI-C (new): ANSI C function declarations.
+	* patch-02-const (new): Declare numerous strings as const.
+	* patch-03-kpathsea (new): Require recent kpathsea version.
+
+	* patch-04-cjklatexn (new): Merge upstream versions with changes
+	  from Akira (mail 18 Dec 2010 09:12:01).
+	  Return type of main is int. ANSI C function declarations.
+	  Declare functions as static. Declare various strings as const.
+
+	* patch-05-cjkpdflatex (new) [LATEX]: Allow to build both
+	  gbklatex.exe and gbkpdflatex.exe from cjklatex.c.
+
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.2-PATCHES/TL-Changes b/Build/source/texk/cjkutils/cjkutils-4.8.2-PATCHES/TL-Changes
new file mode 100644
index 00000000000..f28033b841b
--- /dev/null
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.2-PATCHES/TL-Changes
@@ -0,0 +1,21 @@
+Changes applied to the cjk-4.8.2/utils tree as obtained from:
+	http://cjk.ffii.org/cjk-4.8.2.tar.gz
+
+Moved from top level to here:
+	ChangeLog
+	README
+
+Removed:
+	f_name.bat
+	hbf2gf/c-auto.h
+	hbf2gf/config.guess
+	hbf2gf/config.sub
+	hbf2gf/configure
+	hbf2gf/install-sh
+	hbf2gf/mkinstalldirs
+	hbf2gf/scripts/
+	lisp/
+	pyhyphen/
+	subfonts/
+	thaifont/
+
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.2-PATCHES/patch-01-ANSI-C b/Build/source/texk/cjkutils/cjkutils-4.8.2-PATCHES/patch-01-ANSI-C
new file mode 100644
index 00000000000..2227fd3fef9
--- /dev/null
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.2-PATCHES/patch-01-ANSI-C
@@ -0,0 +1,758 @@
+diff -ur cjkutils-4.8.2.orig/Bg5conv/bg5conv.w cjkutils-4.8.2/Bg5conv/bg5conv.w
+--- cjkutils-4.8.2.orig/Bg5conv/bg5conv.w	2008-12-29 00:00:00.000000000 +0100
++++ cjkutils-4.8.2/Bg5conv/bg5conv.w	2010-12-17 20:41:32.000000000 +0100
+@@ -96,10 +96,7 @@
+ #include <stdlib.h>@#
+ 
+ 
+-int main(argc, argv)
+-  int argc;
+-  char *argv[];
+-
++int main(int argc, char *argv[])
+    {int ch;
+ 
+     fprintf(stdout, "\\def\\CJKpreproc{%s}", banner);@#
+diff -ur cjkutils-4.8.2.orig/CEFconv/cef5conv.w cjkutils-4.8.2/CEFconv/cef5conv.w
+--- cjkutils-4.8.2.orig/CEFconv/cef5conv.w	2008-12-29 00:00:00.000000000 +0100
++++ cjkutils-4.8.2/CEFconv/cef5conv.w	2010-12-17 20:41:33.000000000 +0100
+@@ -111,10 +111,7 @@
+ #include <stdlib.h>@#
+ 
+ 
+-int main(argc, argv)
+-  int argc;
+-  char *argv[];
+-
++int main(int argc, char *argv[])
+    {int ch, i;
+     unsigned char in[16];
+     unsigned char out[32];
+diff -ur cjkutils-4.8.2.orig/CEFconv/cefconv.w cjkutils-4.8.2/CEFconv/cefconv.w
+--- cjkutils-4.8.2.orig/CEFconv/cefconv.w	2008-12-29 00:00:00.000000000 +0100
++++ cjkutils-4.8.2/CEFconv/cefconv.w	2010-12-17 20:41:34.000000000 +0100
+@@ -103,10 +103,7 @@
+ #include <stdlib.h>@#
+ 
+ 
+-int main(argc, argv)
+-  int argc;
+-  char *argv[];
+-
++int main(int argc, char *argv[])
+    {int ch, i;
+     unsigned char in[16];
+     unsigned char out[32];
+diff -ur cjkutils-4.8.2.orig/CEFconv/cefsconv.w cjkutils-4.8.2/CEFconv/cefsconv.w
+--- cjkutils-4.8.2.orig/CEFconv/cefsconv.w	2008-12-29 00:00:00.000000000 +0100
++++ cjkutils-4.8.2/CEFconv/cefsconv.w	2010-12-17 20:41:35.000000000 +0100
+@@ -111,10 +111,7 @@
+ #include <stdlib.h>@#
+ 
+ 
+-int main(argc, argv)
+-  int argc;
+-  char *argv[];
+-
++int main(int argc, char *argv[])
+    {int ch, i;
+     unsigned char in[16];
+     unsigned char out[32];
+diff -ur cjkutils-4.8.2.orig/SJISconv/sjisconv.w cjkutils-4.8.2/SJISconv/sjisconv.w
+--- cjkutils-4.8.2.orig/SJISconv/sjisconv.w	2008-12-29 00:00:00.000000000 +0100
++++ cjkutils-4.8.2/SJISconv/sjisconv.w	2010-12-17 20:41:37.000000000 +0100
+@@ -95,10 +95,7 @@
+ #include <stdlib.h>@#
+ 
+ 
+-int main(argc, argv)
+-  int argc;
+-  char *argv[];
+-
++int main(int argc, char *argv[])
+    {int ch;
+ 
+     fprintf(stdout, "\\def\\CJKpreproc{%s}", banner);@#
+diff -ur cjkutils-4.8.2.orig/extconv/extconv.w cjkutils-4.8.2/extconv/extconv.w
+--- cjkutils-4.8.2.orig/extconv/extconv.w	2008-12-29 00:00:00.000000000 +0100
++++ cjkutils-4.8.2/extconv/extconv.w	2010-12-17 20:41:39.000000000 +0100
+@@ -96,10 +96,7 @@
+ #include <stdlib.h>@#
+ 
+ 
+-int main(argc, argv)
+-  int argc;
+-  char *argv[];
+-
++int main(int argc, char *argv[])
+    {int ch;
+ 
+ 
+diff -ur cjkutils-4.8.2.orig/hbf2gf/hbf.c cjkutils-4.8.2/hbf2gf/hbf.c
+--- cjkutils-4.8.2.orig/hbf2gf/hbf.c	2008-12-29 00:00:00.000000000 +0100
++++ cjkutils-4.8.2/hbf2gf/hbf.c	2009-10-01 00:00:00.000000000 +0200
+@@ -283,16 +283,14 @@
+ #endif /* __STDC__ */
+ 
+ static void
+-clear_bbox(bbox)
+-	HBF_BBOX *bbox;
++clear_bbox(HBF_BBOX *bbox)
+ {
+ 	bbox->hbf_width = bbox->hbf_height = 0;
+ 	bbox->hbf_xDisplacement = bbox->hbf_yDisplacement = 0;
+ }
+ 
+ static void
+-clear_record(hbf)
+-	HBF_STRUCT *hbf;
++clear_record(HBF_STRUCT *hbf)
+ {
+ 	clear_bbox(&(hbf->public.hbf_bitmap_bbox));
+ 	clear_bbox(&(hbf->public.hbf_font_bbox));
+@@ -309,10 +307,7 @@
+  */
+ 
+ static void
+-add_b2r(last_b2r, start, finish)
+-reg	B2_RANGE **last_b2r;
+-	int	start;
+-	int	finish;
++add_b2r(reg B2_RANGE **last_b2r, int start, int finish)
+ {
+ reg	B2_RANGE *b2r;
+ 
+@@ -326,9 +321,7 @@
+ }
+ 
+ static CHAR_INDEX
+-b2_pos(hbf, code)
+-	HBF_STRUCT	*hbf;
+-	HBF_CHAR	code;
++b2_pos(HBF_STRUCT *hbf, HBF_CHAR code)
+ {
+ reg	B2_RANGE *b2r;
+ reg	unsigned c;
+@@ -345,8 +338,7 @@
+ }
+ 
+ static int
+-b2_size(b2r)
+-reg	B2_RANGE *b2r;
++b2_size(reg B2_RANGE *b2r)
+ {
+ reg	int	size;
+ 
+@@ -358,9 +350,7 @@
+ 
+ /* map a position to a character code */
+ static long
+-code_of(hbf, pos)
+-	HBF_STRUCT	*hbf;
+-	long		pos;
++code_of(HBF_STRUCT *hbf, long pos)
+ {
+ 	long	code;
+ 	int	residue;
+@@ -382,9 +372,7 @@
+  */
+ 
+ static bool
+-match(lp, sp)
+-reg	const	char	*lp;
+-reg	const	char	*sp;
++match(reg const char *lp, reg const char *sp)
+ {
+ 	while (*lp == *sp && *sp != '\0') {
+ 		lp++;
+@@ -395,8 +383,7 @@
+ 
+ #ifdef NO_STRDUP
+ char *
+-strdup(s)
+-	const	char	*s;
++strdup(const char *s)
+ {
+ 	char	*new_s;
+ 
+@@ -411,9 +398,7 @@
+  */
+ 
+ static void
+-add_property(hbf, lp)
+-reg	HBF_STRUCT	*hbf;
+-reg	const char	*lp;
++add_property(reg HBF_STRUCT *hbf, const char *lp)
+ {
+ reg	PROPERTY	*prop;
+ 	char	tmp[MAXLINE];
+@@ -454,9 +439,7 @@
+ }
+ 
+ const char *
+-hbfProperty(hbfFile, propName)
+-	HBF		*hbfFile;
+-	const	char	*propName;
++hbfProperty(HBF *hbfFile, const char *propName)
+ {
+ reg	HBF_STRUCT	*hbf;
+ reg	PROPERTY	*prop;
+@@ -473,20 +456,15 @@
+  */
+ 
+ const char *
+-HBF_GetProperty(handle, propertyName)
+-	HBF		*handle;
+-	const	char	*propertyName;
++HBF_GetProperty(HBF *handle, const char *propertyName)
+ {
+ 	return hbfProperty(handle, propertyName);
+ }
+ 
+ int
+-HBF_GetFontBoundingBox(handle, width, height, xDisplacement, yDisplacement)
+-	HBF_Handle	handle;
+-	unsigned int	*width;
+-	unsigned int	*height;
+-	int		*xDisplacement;
+-	int		*yDisplacement;
++HBF_GetFontBoundingBox(HBF_Handle handle,
++		       unsigned int *width, unsigned int *height,
++		       int *xDisplacement, int *yDisplacement)
+ {
+ 	if (width != NULL)
+ 		*width = hbfFontBBox(handle)->hbf_width;
+@@ -500,12 +478,9 @@
+ }
+ 
+ int
+-HBF_GetBitmapBoundingBox(handle, width, height, xDisplacement, yDisplacement)
+-	HBF_Handle	handle;
+-	unsigned int	*width;
+-	unsigned int	*height;
+-	int		*xDisplacement;
+-	int		*yDisplacement;
++HBF_GetBitmapBoundingBox(HBF_Handle handle,
++			 unsigned int *width, unsigned int *height,
++			 int *xDisplacement, int *yDisplacement)
+ {
+ 	if (width != NULL)
+ 		*width = hbfBitmapBBox(handle)->hbf_width;
+@@ -522,10 +497,9 @@
+  * Prepend a directory to a relative filename.
+  */
+ static char *
+-concat(dir, dirlen, stem)
+-	const	char	*dir;	/* not necessarily null-terminated */
+-	int	dirlen;		/* number of significant chars in dir */
+-	const	char	*stem;	/* relative filename */
++concat(const char *dir,		/* not necessarily null-terminated */
++       int dirlen,		/* number of significant chars in dir */
++       const char *stem)	/* relative filename */
+ {
+ 	char	*fullname;
+ 
+@@ -570,9 +544,7 @@
+  *	containing the HBF file.
+  */
+ static char *
+-expand_filename(name, hbf_name)
+-	const	char	*name;
+-	const	char	*hbf_name;
++expand_filename(const char *name, const char *hbf_name)
+ {
+ #ifdef unix
+ reg	char	*s;
+@@ -639,9 +611,7 @@
+ }
+ 
+ static BM_FILE *
+-find_file(hbf, filename)
+-	HBF_STRUCT *hbf;
+-	const char *filename;
++find_file(HBF_STRUCT *hbf, const char *filename)
+ {
+ 	BM_FILE	**fp;
+ reg	BM_FILE	*file;
+@@ -721,9 +691,7 @@
+ #define	GRAIN_SIZE	512
+ 
+ static bool
+-read_bitmap_file(bmf, f)
+-	BM_FILE	*bmf;
+-	FILE	*f;
++read_bitmap_file(BM_FILE *bmf, FILE *f)
+ {
+ 	byte	*contents, *cp;
+ 	long	size;
+@@ -760,9 +728,7 @@
+ 
+ /* check that a code range fits within its bitmap file */
+ static bool
+-too_short(hbf, cp)
+-	HBF_STRUCT	*hbf;
+-	CODE_RANGE	*cp;
++too_short(HBF_STRUCT *hbf, CODE_RANGE *cp)
+ {
+ 	int	bm_size;
+ 	long	offset, end_offset;
+@@ -796,9 +762,7 @@
+ }
+ 
+ static const char *
+-skip_word(n, s)
+-	int	n;
+-	const	char	*s;
++skip_word(int n, const char *s)
+ {
+ 	for ( ; n > 0; n--) {
+ 		while (*s != '\0' && ! isspace(*s))
+@@ -811,9 +775,7 @@
+ 
+ /* optional keywords at the end of a CODE_RANGE line */
+ static void
+-parse_keywords(cp, s)
+-	CODE_RANGE *cp;
+-	const	char	*s;
++parse_keywords(CODE_RANGE *cp, const char *s)
+ {
+ 	for (s = skip_word(4, s) ; *s != '\0'; s = skip_word(1, s)) {
+ 		switch (*s) {
+@@ -829,9 +791,7 @@
+ }
+ 
+ static bool
+-add_code_range(hbf, line)
+-	HBF_STRUCT	*hbf;
+-	const char	*line;
++add_code_range(HBF_STRUCT *hbf, const char *line)
+ {
+ 	CODE_RANGE *cp;
+ 	CODE_RANGE **cpp;
+@@ -896,10 +856,7 @@
+ 
+ /* get line, truncating to len, and trimming trailing spaces */
+ static bool
+-get_line(buf, len, f)
+-	char	*buf;
+-	int	len;
+-	FILE	*f;
++get_line(char *buf, int len, FILE *f)
+ {
+ 	int	c;
+ 	char	*bp;
+@@ -926,10 +883,7 @@
+ 
+ /* get next non-COMMENT line */
+ static bool
+-get_text_line(buf, len, f)
+-	char	*buf;
+-	int	len;
+-	FILE	*f;
++get_text_line(char *buf, int len, FILE *f)
+ {
+ 	while (get_line(buf, len, f))
+ 		if (*buf != '\0' && ! match(buf, "COMMENT"))
+@@ -938,10 +892,7 @@
+ }
+ 
+ static bool
+-get_property(line, keyword, hbf)
+-	const	char	*line;
+-	const	char	*keyword;
+-	HBF_STRUCT	*hbf;
++get_property(const char *line, const char *keyword, HBF_STRUCT *hbf)
+ {
+ 	if (! match(line, keyword)) {
+ 		eprintf("%s expected", keyword);
+@@ -952,10 +903,7 @@
+ }
+ 
+ static bool
+-get_bbox(line, keyword, bbox)
+-	const	char	*line;
+-	const	char	*keyword;
+-	HBF_BBOX	*bbox;
++get_bbox(const char *line, const char *keyword, HBF_BBOX *bbox)
+ {
+ 	int	w, h, xd, yd;
+ 
+@@ -995,9 +943,7 @@
+  */
+ 
+ static bool
+-parse_file(f, hbf)
+-	FILE	*f;
+-reg	HBF_STRUCT *hbf;
++parse_file(FILE *f, reg HBF_STRUCT *hbf)
+ {
+ 	char	line[MAXLINE];
+ 	int	start, finish;
+@@ -1091,10 +1037,7 @@
+ }
+ 
+ static FILE *
+-path_open(path, filename, fullp)
+-	const	char	*path;
+-	const	char	*filename;
+-	char	**fullp;
++path_open(const char *path, const char *filename, char **fullp)
+ {
+ 	if (LocalFileName(filename) && path != NULL) {
+ #ifdef PATH_DELIMITER
+@@ -1128,9 +1071,7 @@
+ }
+ 
+ static bool
+-real_open(filename, hbf)
+-	const	char	*filename;
+-reg	HBF_STRUCT *hbf;
++real_open(const char *filename, reg HBF_STRUCT *hbf)
+ {
+ 	FILE	*f;
+ 
+@@ -1148,8 +1089,7 @@
+ }
+ 
+ HBF *
+-hbfOpen(filename)
+-	const	char	*filename;
++hbfOpen(const char *filename)
+ {
+ reg	HBF_STRUCT *hbf;
+ 
+@@ -1165,9 +1105,7 @@
+ }
+ 
+ int
+-HBF_OpenFont(filename, ptrHandleStorage)
+-	const	char	*filename;
+-	HBF	**ptrHandleStorage;
++HBF_OpenFont(const char *filename, HBF **ptrHandleStorage)
+ {
+ 	return (*ptrHandleStorage = hbfOpen(filename)) == NULL ? -1 : 0;
+ }
+@@ -1177,8 +1115,7 @@
+  */
+ 
+ int
+-HBF_CloseFont(hbfFile)
+-	HBF	*hbfFile;
++HBF_CloseFont(HBF *hbfFile)
+ {
+ reg	HBF_STRUCT	*hbf;
+ 	PROPERTY	*prop_ptr, *prop_next;
+@@ -1239,8 +1176,7 @@
+ }
+ 
+ void
+-hbfClose(hbfFile)
+-	HBF	*hbfFile;
++hbfClose(HBF *hbfFile)
+ {
+ 	(void)HBF_CloseFont(hbfFile);
+ }
+@@ -1250,18 +1186,13 @@
+  */
+ 
+ const byte *
+-hbfGetBitmap(hbf, code)
+-	HBF		*hbf;
+-	HBF_CHAR	code;
++hbfGetBitmap(HBF *hbf, HBF_CHAR code)
+ {
+ 	return get_bitmap((HBF_STRUCT *)hbf, code, (byte *)NULL);
+ }
+ 
+ int
+-HBF_GetBitmap(hbf, code, buffer)
+-	HBF		*hbf;
+-	HBF_CHAR	code;
+-	byte		*buffer;
++HBF_GetBitmap(HBF *hbf, HBF_CHAR code, byte *buffer)
+ {
+ 	return get_bitmap((HBF_STRUCT *)hbf, code, buffer) == NULL ? -1 : 0;
+ }
+@@ -1271,10 +1202,7 @@
+  * If buffer is non-null, it must be used.
+  */
+ static const byte *
+-get_bitmap(hbf, code, buffer)
+-reg	HBF_STRUCT	*hbf;
+-	HBF_CHAR	code;
+-	byte		*buffer;
++get_bitmap(reg HBF_STRUCT *hbf, HBF_CHAR code, byte *buffer)
+ {
+ 	CHAR_INDEX	pos, b2pos;
+ reg	CODE_RANGE	*cp;
+@@ -1331,8 +1259,7 @@
+ }
+ 
+ static byte *
+-local_buffer(hbf)
+-	HBF_STRUCT	*hbf;
++local_buffer(HBF_STRUCT *hbf)
+ {
+ 	if (hbf->bitmap_buffer == NULL &&
+ 	    (hbf->bitmap_buffer = (byte *)malloc(HBF_BitmapSize(&(hbf->public)))) == NULL) {
+@@ -1343,9 +1270,7 @@
+ }
+ 
+ static void
+-invert(buffer, length)
+-	byte	*buffer;
+-	unsigned int	length;
++invert(byte *buffer, unsigned int length)
+ {
+ 	for ( ; length > 0; length--)
+ 		*buffer++ ^= 0xff;
+@@ -1353,10 +1278,7 @@
+ 
+ #ifdef IN_MEMORY
+ static bool
+-copy_transposed(hbf, bitmap, source)
+-	HBF	*hbf;
+-reg	byte	*bitmap;
+-reg	const	byte	*source;
++copy_transposed(HBF *hbf, reg byte *bitmap, reg const byte *source)
+ {
+ reg	byte	*pos;
+ reg	byte	*bm_end;
+@@ -1402,10 +1324,7 @@
+ }
+ #else /* ! IN_MEMORY */
+ static bool
+-get_transposed(hbf, f, bitmap)
+-	HBF	*hbf;
+-	FILE	*f;
+-reg	byte	*bitmap;
++get_transposed(HBF *hbf, FILE *f, reg byte *bitmap)
+ {
+ reg	byte	*pos;
+ reg	byte	*bm_end;
+@@ -1456,9 +1375,7 @@
+  * Call function on each valid code in ascending order.
+  */
+ void
+-hbfForEach(hbfFile, func)
+-reg	HBF	*hbfFile;
+-reg	void	(*func)_((HBF *sameHbfFile, HBF_CHAR code));
++hbfForEach(reg HBF *hbfFile, void (*func)(HBF *, HBF_CHAR))
+ {
+ 	HBF_STRUCT	*hbf;
+ 	CODE_RANGE	*cp;
+@@ -1493,15 +1410,13 @@
+ }
+ 
+ const char *
+-hbfFileName(hbf)
+-	HBF	*hbf;
++hbfFileName(HBF *hbf)
+ {
+ 	return ((HBF_STRUCT *)hbf)->filename;
+ }
+ 
+ long
+-hbfChars(hbfFile)
+-	HBF	*hbfFile;
++hbfChars(HBF *hbfFile)
+ {
+ 	HBF_STRUCT	*hbf;
+ 	CODE_RANGE	*cp;
+@@ -1527,8 +1442,7 @@
+ #endif
+ 
+ HBF_BBOX *
+-hbfBitmapBBox(hbf)
+-	HBF	*hbf;
++hbfBitmapBBox(HBF *hbf)
+ {
+ 	return &(hbf->hbf_bitmap_bbox);
+ }
+@@ -1538,18 +1452,14 @@
+ #endif
+ 
+ HBF_BBOX *
+-hbfFontBBox(hbf)
+-	HBF	*hbf;
++hbfFontBBox(HBF *hbf)
+ {
+ 	return &(hbf->hbf_font_bbox);
+ }
+ 
+ const void *
+-hbfGetByte2Range(hbfFile, b2r_pointer, startp, finishp)
+-	HBF		*hbfFile;
+-	const void	*b2r_pointer;
+-	byte		*startp;
+-	byte		*finishp;
++hbfGetByte2Range(HBF *hbfFile, const void *b2r_pointer,
++		 byte *startp, byte *finishp)
+ {
+ 	HBF_STRUCT	*hbf;
+ 	B2_RANGE	*b2r;
+@@ -1567,11 +1477,8 @@
+ }
+ 
+ const void *
+-hbfGetCodeRange(hbfFile, code_pointer, startp, finishp)
+-	HBF		*hbfFile;
+-	const void	*code_pointer;
+-	HBF_CHAR	*startp;
+-	HBF_CHAR	*finishp;
++hbfGetCodeRange(HBF *hbfFile, const void *code_pointer,
++		HBF_CHAR *startp, HBF_CHAR *finishp)
+ {
+ 	HBF_STRUCT	*hbf;
+ 	CODE_RANGE	*cp;
+diff -ur cjkutils-4.8.2.orig/hbf2gf/hbf2gf.w cjkutils-4.8.2/hbf2gf/hbf2gf.w
+--- cjkutils-4.8.2.orig/hbf2gf/hbf2gf.w	2008-12-29 00:00:00.000000000 +0100
++++ cjkutils-4.8.2/hbf2gf/hbf2gf.w	2009-10-01 00:00:00.000000000 +0200
+@@ -196,10 +196,7 @@
+ @<Global variables@>@;@#
+ 
+ 
+-int main(argc, argv)
+-  int argc; /* argument count */
+-  char *argv[]; /* argument values */
+-
++int main(int argc, char *argv[])
+    {char *p;
+ 
+     @<Initialize \TeX\ file searching@>@;@#
+@@ -839,10 +836,7 @@
+ 
+ @
+ @c
+-void fputl(num, f)
+-  long num;
+-  FILE *f;
+-
++void fputl(long num, FILE *f)
+    {fputc(num >> 24, f);
+     fputc(num >> 16, f);
+     fputc(num >> 8, f);
+@@ -1236,9 +1230,7 @@
+ #ifdef __GNUC__
+ __inline__
+ #endif
+-void read_row(pixelrow)
+-  unsigned char *pixelrow;
+-
++void read_row(unsigned char *pixelrow)
+    {register int col, bitshift, offset;
+     register unsigned char *xP;
+     register unsigned char item = 0;
+@@ -1288,9 +1280,7 @@
+ #ifdef __GNUC__
+ __inline__
+ #endif
+-void write_row(pixelrow)
+-  unsigned char *pixelrow;
+-
++void write_row(unsigned char *pixelrow)
+    {register int col;
+     register unsigned char *xP;
+ 
+@@ -2320,9 +2310,7 @@
+ 
+ @
+ @c
+-int fsearch(search_string)
+-  char *search_string;
+-
++int fsearch(char *search_string)
+    {char *P, p;
+     char temp_buffer[STRING_LENGTH + 1];
+     char env_name[STRING_LENGTH + 1];
+@@ -2460,9 +2448,7 @@
+ 
+ @
+ @c
+-void config_error(message)
+-  char *message;
+-
++void config_error(char *message)
+    {fprintf(stderr, "Couldn't find `%s' entry in configuration file\n",
+             message);
+     exit(1);
+@@ -2654,9 +2640,7 @@
+ @
+ @c
+ #if defined(HAVE_LIBKPATHSEA)
+-char *TeX_search_cfg_file(name)
+-  char *name;
+-
++char *TeX_search_cfg_file(char *name)
+    {
+ #ifdef OLD_KPATHSEA
+     return kpse_find_file(name, kpse_dvips_config_format, TRUE);
+@@ -2666,9 +2650,7 @@
+    }@#
+ 
+ 
+-char *TeX_search_hbf_file(name)
+-  char *name;
+-
++char *TeX_search_hbf_file(char *name)
+    {
+ #ifdef VERY_OLD_KPATHSEA
+     return kpse_find_file(name, kpse_dvips_header_format, TRUE);
+@@ -2683,24 +2665,18 @@
+ 
+ 
+ #elif defined(HAVE_EMTEXDIR)
+-char *TeX_search_cfg_file(name)
+-  char *name;
+-
++char *TeX_search_cfg_file(char *name)
+    {return file_find(name, &cfg_path);
+    }@#
+ 
+ 
+-char *TeX_search_hbf_file(name)
+-  char *name;
+-
++char *TeX_search_hbf_file(char *name)
+    {return file_find(name, &hbf_path);
+    }@#
+ 
+ 
+ #elif defined(HAVE_MIKTEX)
+-char *TeX_search_cfg_file(name)
+-  char *name;
+-
++char *TeX_search_cfg_file(char *name)
+    {char result[_MAX_PATH];
+ 
+     if (!miktex_find_input_file("hbf2gf", *name, result))
+@@ -2709,9 +2685,7 @@
+    }@#
+ 
+ 
+-char *TeX_search_hbf_file(name)
+-  char *name;
+-
++char *TeX_search_hbf_file(char *name)
+    {char result[_MAX_PATH];
+ 
+ 
+@@ -2722,16 +2696,12 @@
+ 
+ 
+ #else
+-char *TeX_search_cfg_file(name)
+-  char *name;
+-
++char *TeX_search_cfg_file(char *name)
+    {return name;
+    }@#
+ 
+ 
+-char *TeX_search_hbf_file(name)
+-  char *name;
+-
++char *TeX_search_hbf_file(char *name)
+    {return name;
+    }
+ #endif
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.2-PATCHES/patch-02-const b/Build/source/texk/cjkutils/cjkutils-4.8.2-PATCHES/patch-02-const
new file mode 100644
index 00000000000..33649837b8c
--- /dev/null
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.2-PATCHES/patch-02-const
@@ -0,0 +1,148 @@
+diff -ur cjkutils-4.8.2.orig/hbf2gf/hbf.c cjkutils-4.8.2/hbf2gf/hbf.c
+--- cjkutils-4.8.2.orig/hbf2gf/hbf.c	2009-10-01 00:00:00.000000000 +0200
++++ cjkutils-4.8.2/hbf2gf/hbf.c	2009-10-01 00:04:37.000000000 +0200
+@@ -1462,18 +1462,18 @@
+ 		 byte *startp, byte *finishp)
+ {
+ 	HBF_STRUCT	*hbf;
+-	B2_RANGE	*b2r;
++	const B2_RANGE	*b2r;
+ 
+ 	hbf = (HBF_STRUCT *)hbfFile;
+ 	if (b2r_pointer == NULL)
+ 		b2r = hbf->byte_2_range;
+ 	else
+-		b2r = ((B2_RANGE *)b2r_pointer)->b2r_next;
++		b2r = ((const B2_RANGE *)b2r_pointer)->b2r_next;
+ 	if(b2r == NULL)
+ 		return NULL;
+ 	*startp = b2r->b2r_start;
+ 	*finishp = b2r->b2r_finish;
+-	return (void *)b2r;
++	return (const void *)b2r;
+ }
+ 
+ const void *
+@@ -1481,16 +1481,16 @@
+ 		HBF_CHAR *startp, HBF_CHAR *finishp)
+ {
+ 	HBF_STRUCT	*hbf;
+-	CODE_RANGE	*cp;
++	const CODE_RANGE	*cp;
+ 
+ 	hbf = (HBF_STRUCT *)hbfFile;
+ 	if (code_pointer == NULL)
+ 		cp = hbf->code_range;
+ 	else
+-		cp = ((CODE_RANGE *)code_pointer)->code_next;
++		cp = ((const CODE_RANGE *)code_pointer)->code_next;
+ 	if(cp == NULL)
+ 		return NULL;
+ 	*startp = cp->code_start;
+ 	*finishp = cp->code_finish;
+-	return (void *)cp;
++	return (const void *)cp;
+ }
+diff -ur cjkutils-4.8.2.orig/hbf2gf/hbf2gf.w cjkutils-4.8.2/hbf2gf/hbf2gf.w
+--- cjkutils-4.8.2.orig/hbf2gf/hbf2gf.w	2009-10-01 00:00:00.000000000 +0200
++++ cjkutils-4.8.2/hbf2gf/hbf2gf.w	2009-10-01 00:04:37.000000000 +0200
+@@ -871,7 +871,7 @@
+ HBF_CHAR code;
+ const unsigned char *bitmap;
+             /* a proper input bitmap array will be allocated by the HBF API */
+-unsigned char *bP;@#
++const unsigned char *bP;@#
+ 
+ unsigned char out_char[MAX_CHAR_SIZE * MAX_CHAR_SIZE + 1];
+                                                  /* the output bitmap array */
+@@ -1025,7 +1025,7 @@
+     if(b2_codes[code & 0xFF]) /* a valid second byte? */
+        {if(pk_files)
+            {bitmap = hbfGetBitmap(hbf, code);
+-            bP = (unsigned char *)bitmap;
++            bP = bitmap;
+                                      /* will be increased by |read_row()| */@#
+ 
+             if(!bitmap)
+@@ -1238,7 +1238,7 @@
+     if(rotation)
+        {bitshift = 7 - (curr_row % 8);
+         offset = (input_size_y + 7) / 8;
+-        bP = (unsigned char *)bitmap + curr_row / 8;
++        bP = bitmap + curr_row / 8;
+         for(col = 0, xP = pixelrow; col < input_size_x; ++col, ++xP)
+            {*xP = ((*bP >> bitshift) & 1) == 1 ? PIXEL_MAXVAL : 0;
+             bP += offset;
+@@ -2305,13 +2305,14 @@
+ |Buffer| if existent. |fsearch()| returns~1 on success.
+ 
+ @<Prototypes@>=
+-int fsearch(char *);
++int fsearch(const char *);
+ 
+ 
+ @
+ @c
+-int fsearch(char *search_string)
++int fsearch(const char *search_string)
+    {char *P, p;
++    const char *Q;
+     char temp_buffer[STRING_LENGTH + 1];
+     char env_name[STRING_LENGTH + 1];
+     char *env_p;
+@@ -2323,8 +2324,8 @@
+     rewind(config); /* we start at offset~0 */@#
+ 
+     do
+-       {P = search_string;
+-        p = tolower(*P);
++       {Q = search_string;
++        p = tolower(*Q);
+         Ch = fgetc(config);
+         ch = tolower(Ch);
+         while(!(ch == p && old_ch == '\n') && Ch != EOF)
+@@ -2336,12 +2337,12 @@
+            }@#
+ 
+         for(;;)
+-           {if(*(++P) == '\0')
++           {if(*(++Q) == '\0')
+                 if((Ch = fgetc(config)) == ' ' || Ch == '\t')
+                    /* there must be a space or a tab stop after the keyword */
+                     goto success;
+             Ch = fgetc(config);
+-            if(tolower(Ch) != tolower(*P))
++            if(tolower(Ch) != tolower(*Q))
+                 break;
+            }
+        }
+@@ -2443,12 +2444,12 @@
+ message.
+ 
+ @<Prototypes@>=
+-void config_error(char *);
++void config_error(const char *);
+ 
+ 
+ @
+ @c
+-void config_error(char *message)
++void config_error(const char *message)
+    {fprintf(stderr, "Couldn't find `%s' entry in configuration file\n",
+             message);
+     exit(1);
+@@ -2501,12 +2502,12 @@
+ 
+ @
+ @<Prototypes@>=
+-char *TeX_search_version(void);
++const char *TeX_search_version(void);
+ 
+ 
+ @
+ @c
+-char *TeX_search_version(void)
++const char *TeX_search_version(void)
+    {
+ #if defined(HAVE_LIBKPATHSEA)
+     return kpathsea_version_string;
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.2-PATCHES/patch-03-kpathsea b/Build/source/texk/cjkutils/cjkutils-4.8.2-PATCHES/patch-03-kpathsea
new file mode 100644
index 00000000000..23a25bd8696
--- /dev/null
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.2-PATCHES/patch-03-kpathsea
@@ -0,0 +1,105 @@
+diff -ur cjkutils-4.8.2.orig/hbf2gf/hbf2gf.w cjkutils-4.8.2/hbf2gf/hbf2gf.w
+--- cjkutils-4.8.2.orig/hbf2gf/hbf2gf.w	2009-10-01 00:04:37.000000000 +0200
++++ cjkutils-4.8.2/hbf2gf/hbf2gf.w	2010-12-17 21:38:32.783541781 +0100
+@@ -71,8 +71,6 @@
+ @s HBF_BBOX int
+ 
+ @s __inline__ int
+-@s DllImport int
+-@s KPSEDLL int
+ 
+ 
+ @* Introduction.
+@@ -408,6 +406,9 @@
+ 
+ @
+ @<Include files@>=
++#ifdef HAVE_CONFIG_H
++#include <c-auto.h>
++#endif
+ #include <ctype.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+@@ -2461,21 +2462,13 @@
+ 
+ We support three searching engines: emtexdir, kpathsea, and MiKTeX (which is
+ a Win32 port of kpathsea). For emtexdir, define |HAVE_EMTEXDIR| while
+-compiling. For kpathsea, define |HAVE_LIBKPATHSEA|. If you have a version of
+-kpathsea older than~3.2, define |OLD_KPATHSEA| additionally. For kpathsea
+-older than~3.0, |VERY_OLD_KPATHSEA| must be also set. For MikTeX, define
++compiling. For kpathsea, define |HAVE_LIBKPATHSEA|. For MikTeX, define
+ |HAVE_MIKTEX|. If none of these macros is defined, a simple |fopen()| will
+ be used instead.
+ 
+ @<Include files@>=
+ #if defined(HAVE_LIBKPATHSEA)
+-#ifdef VERY_OLD_KPATHSEA
+-#include "kpathsea/proginit.h"
+-#include "kpathsea/progname.h"
+-#include "kpathsea/tex-glyph.h"
+-#else
+ #include "kpathsea/kpathsea.h"
+-#endif@#
+ 
+ #elif defined(HAVE_EMTEXDIR)
+ #include "emtexdir.h"
+@@ -2486,14 +2479,7 @@
+ 
+ @
+ @<Global variables@>=
+-#if defined(HAVE_LIBKPATHSEA)
+-#ifdef KPSEDLL
+-/* this is kpathsea 3.3 and newer */
+-extern KPSEDLL char *kpathsea_version_string;
+-#else
+-extern DllImport char *kpathsea_version_string;
+-#endif
+-#elif defined(HAVE_EMTEXDIR)
++#if defined(HAVE_EMTEXDIR)
+ char emtex_version_string[] = "emTeXdir";
+ #elif !defined(HAVE_MIKTEX)
+ char no_version_string[] = "no search library";
+@@ -2599,17 +2585,8 @@
+ 
+ @<Initialize \TeX\ file searching@>=
+ #if defined(HAVE_LIBKPATHSEA)
+-#ifdef OLD_KPATHSEA
+-    kpse_set_progname(argv[0]);
+-#else
+     kpse_set_program_name(argv[0], "hbf2gf");
+-#endif@#
+-
+-#ifdef VERY_OLD_KPATHSEA
+-    kpse_init_prog("HBF2GF", 300, "cx", true, "cmr10");
+-#else
+     kpse_init_prog("HBF2GF", 300, "cx", "cmr10");@#
+-#endif@#
+ 
+ #elif defined(HAVE_EMTEXDIR)
+     if(!dir_setup(&cfg_path, "HBFCFG", NULL, EDS_BANG))
+@@ -2643,25 +2620,13 @@
+ #if defined(HAVE_LIBKPATHSEA)
+ char *TeX_search_cfg_file(char *name)
+    {
+-#ifdef OLD_KPATHSEA
+-    return kpse_find_file(name, kpse_dvips_config_format, TRUE);
+-#else
+     return kpse_find_file(name, kpse_program_text_format, TRUE);
+-#endif
+    }@#
+ 
+ 
+ char *TeX_search_hbf_file(char *name)
+    {
+-#ifdef VERY_OLD_KPATHSEA
+-    return kpse_find_file(name, kpse_dvips_header_format, TRUE);
+-#else
+-#ifndef KPSEDLL
+-    return kpse_find_file(name, kpse_type1_format, TRUE);
+-#else
+     return kpse_find_file(name, kpse_miscfonts_format, TRUE);
+-#endif
+-#endif
+    }@#
+ 
+ 
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.2-PATCHES/patch-04-cjklatex b/Build/source/texk/cjkutils/cjkutils-4.8.2-PATCHES/patch-04-cjklatex
new file mode 100644
index 00000000000..7f527c9e281
--- /dev/null
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.2-PATCHES/patch-04-cjklatex
@@ -0,0 +1,108 @@
+diff -ur cjkutils-4.8.2.orig/cjklatex/cjklatex.c cjkutils-4.8.2/cjklatex/cjklatex.c
+--- cjkutils-4.8.2.orig/cjklatex/cjklatex.c	2008-12-29 00:00:00.000000000 +0100
++++ cjkutils-4.8.2/cjklatex/cjklatex.c	2010-12-19 16:17:26.000000000 +0100
+@@ -27,29 +27,31 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
+-#include <win32lib.h>
+ 
+ #include <kpathsea/config.h>
+ #include <kpathsea/lib.h>
+ #include <kpathsea/getopt.h>
+ 
+-static char *cjklatex_version_string = "1.0";
++#if defined(WIN32) && !defined(__MINGW32__)
++#include <kpathsea/win32lib.h>
++#endif
++
++static const char *cjklatex_version_string = "1.0";
+ 
+ static const char *usage_str[] = {
+   "Usage: %s OPTIONS FILE\n",
+   "Calls `latex' on FILE after conversion by the filter\n",
+   "specified by OPTIONS.\n",
+   "--conv=bg5\tfor traditional Chinese, encoding Big 5,\n",
+-  "--conv=bg5p\tfor Chinese, encoding Big 5+,\n",
+   "--conv=cef\tfor Chinese Encoding Framework, encoding CEF,\n",
+   "--conv=cef5\tidem CEF, also converts Big5 characters,\n",
+   "--conv=cefs\tidem CEF, also converts SJIS characters,\n",
+-  "--conv=sjis\tfor Japanese, SJIS encoding,\n",
+-  "--conv=gbk\tfor Chinese, encoding GBK.",
++  "--conv=gbk\tfor Chinese, encoding GBK,\n",
++  "--conv=sjis\tfor Japanese, SJIS encoding.",
+   "\nAlternatively, for compatibility with the previous DOS batch files,\n",
+   "you can also copy this program to any of the following names:\n",
+-  "bg5latex.exe,bg5pltx.exe,cef5ltx.exe,ceflatex.exe,cefsltx.exe,\n",
+-  "gbklatex.exe and sjisltx.exe .\n",
++  "bg5latex.exe, cef5latex.exe, ceflatex.exe, cefslatex.exe,\n",
++  "gbklatex.exe and sjislatex.exe .\n",
+   "Then running one of these programs will be identical to specify\n",
+   "the corresponding option.\n",
+   "\nAdditional options:\n",
+@@ -62,17 +64,16 @@
+ static char *progname = NULL;
+ 
+ static struct _conv_table {
+-  char *progname;
+-  char *processor;
++  const char *progname;
++  const char *processor;
+ } CJKtable[] = {
+   { "cjklatex", "" },
+   { "bg5latex", "bg5conv" },
+-  { "bg5pltx", "extconv" },
+-  { "cef5ltx", "cef5conv" },
+   { "ceflatex", "cefconv" },
+-  { "cefsltx", "cefsconv" },
++  { "cef5latex", "cef5conv" },
++  { "cefslatex", "cefsconv" },
+   { "gbklatex", "extconv" },
+-  { "sjisltx", "sjisconv" }
++  { "sjislatex", "sjisconv" }
+ };
+ 
+ #define PROGRAM_IS(p) FILESTRCASEEQ (p, progname)
+@@ -94,7 +95,7 @@
+     {0, 0, 0, 0}
+ };
+ 
+-BOOL sigint_handler(DWORD dwCtrlType)
++static BOOL sigint_handler(DWORD dwCtrlType)
+ {
+   /* Fix me : there is a problem if a system() command is running.
+      We should wait for the son process to be interrupted.
+@@ -118,7 +119,7 @@
+   return FALSE;			/* return value obligatory */
+ }
+    
+-void usage()
++static void usage(void)
+ {
+   int i;
+   fprintf(stderr, "CJKlatex version %s\n", cjklatex_version_string);
+@@ -128,7 +129,7 @@
+     fputs(usage_str[i], stderr);
+ }
+ 
+-int do_process(char *processor, char *filename)
++static int do_process(const char *processor, const char *filename)
+ {
+   char *ext, *p;
+   char cmd[_MAX_PATH*3];
+@@ -176,7 +177,7 @@
+   return ret;
+ }
+ 
+-void main(int argc, char *argv[])
++int main(int argc, char *argv[])
+ {
+   int g; /* getopt return code */
+   int i;
+@@ -287,4 +288,6 @@
+ 
+   free(filename);
+   free(texengine);
++
++  return 0;
+ }
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.2-PATCHES/patch-05-cjkpdflatex b/Build/source/texk/cjkutils/cjkutils-4.8.2-PATCHES/patch-05-cjkpdflatex
new file mode 100644
index 00000000000..ccfa7871d8f
--- /dev/null
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.2-PATCHES/patch-05-cjkpdflatex
@@ -0,0 +1,95 @@
+diff -ur cjkutils-4.8.2.orig/cjklatex/cjklatex.c cjkutils-4.8.2/cjklatex/cjklatex.c
+--- cjkutils-4.8.2.orig/cjklatex/cjklatex.c	2010-12-19 16:17:26.000000000 +0100
++++ cjkutils-4.8.2/cjklatex/cjklatex.c	2010-12-19 16:25:43.000000000 +0100
+@@ -1,11 +1,15 @@
+ /*
+-  Purpose: call latex after preprocessing of the .tex file by
++  Purpose: call LATEX after preprocessing of the .tex file by
+            the cjk conversion tool. The old f_name.bat script
+ 	   is not working anymore.
+   Author : F. Popineau <Fabrice.Popineau@supelec.fr>
+   Date   : <29/06/2001>
+ */
+ 
++#ifndef LATEX
++#define LATEX "latex"
++#endif
++
+ /*
+   Copyright (C) 2001-2008  F. Popineau <Fabrice.Popineau@supelec.fr>
+   
+@@ -40,7 +44,7 @@
+ 
+ static const char *usage_str[] = {
+   "Usage: %s OPTIONS FILE\n",
+-  "Calls `latex' on FILE after conversion by the filter\n",
++  "Calls `" LATEX "' on FILE after conversion by the filter\n",
+   "specified by OPTIONS.\n",
+   "--conv=bg5\tfor traditional Chinese, encoding Big 5,\n",
+   "--conv=cef\tfor Chinese Encoding Framework, encoding CEF,\n",
+@@ -50,14 +54,14 @@
+   "--conv=sjis\tfor Japanese, SJIS encoding.",
+   "\nAlternatively, for compatibility with the previous DOS batch files,\n",
+   "you can also copy this program to any of the following names:\n",
+-  "bg5latex.exe, cef5latex.exe, ceflatex.exe, cefslatex.exe,\n",
+-  "gbklatex.exe and sjislatex.exe .\n",
++  "bg5" LATEX ".exe, cef5" LATEX ".exe, cef" LATEX ".exe, cefs" LATEX ".exe,\n",
++  "gbk" LATEX ".exe and sjis" LATEX ".exe .\n",
+   "Then running one of these programs will be identical to specify\n",
+   "the corresponding option.\n",
+   "\nAdditional options:\n",
+   "--verbose\tbe a bit more verbose about what is happening,\n",
+   "--nocleanup\tdo not remove intermediate files,\n",
+-  "--latex=engine\tuse `engine' instead of `latex' to process the file.\n",
++  "--latex=engine\tuse `engine' instead of `" LATEX "' to process the file.\n",
+   NULL
+ };
+ 
+@@ -67,13 +71,13 @@
+   const char *progname;
+   const char *processor;
+ } CJKtable[] = {
+-  { "cjklatex", "" },
+-  { "bg5latex", "bg5conv" },
+-  { "ceflatex", "cefconv" },
+-  { "cef5latex", "cef5conv" },
+-  { "cefslatex", "cefsconv" },
+-  { "gbklatex", "extconv" },
+-  { "sjislatex", "sjisconv" }
++  { "cjk" LATEX, "" },
++  { "bg5" LATEX, "bg5conv" },
++  { "cef" LATEX, "cefconv" },
++  { "cef5" LATEX, "cef5conv" },
++  { "cefs" LATEX, "cefsconv" },
++  { "gbk" LATEX, "extconv" },
++  { "sjis" LATEX, "sjisconv" }
+ };
+ 
+ #define PROGRAM_IS(p) FILESTRCASEEQ (p, progname)
+@@ -122,7 +126,7 @@
+ static void usage(void)
+ {
+   int i;
+-  fprintf(stderr, "CJKlatex version %s\n", cjklatex_version_string);
++  fprintf(stderr, "CJK" LATEX " version %s\n", cjklatex_version_string);
+   fprintf(stderr,usage_str[0], progname );
+   fputs("\n", stderr);
+   for(i = 1; usage_str[i]; ++i)
+@@ -242,7 +246,7 @@
+       fprintf(stderr, "%s of %s.\n", progname, cjklatex_version_string);
+       exit(0);
+     }
+-    else if (PROGRAM_IS("cjklatex")) {
++    else if (PROGRAM_IS("cjk" LATEX)) {
+       if (ARGUMENT_IS("conv")) {
+ 	for (i = 1; i < sizeof(CJKtable)/sizeof(CJKtable[0]) && program_number <= 0; i++) {
+ 	  if (STRNEQ(optarg, CJKtable[i].progname, strlen(optarg))) {
+@@ -281,7 +285,7 @@
+   assert(program_number > 0);
+ 
+   if (! texengine) {
+-    texengine = xstrdup("latex");
++    texengine = xstrdup(LATEX);
+   }
+ 
+   do_process(CJKtable[program_number].processor, filename);
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.2/Bg5conv/bg5conv.1 b/Build/source/texk/cjkutils/cjkutils-4.8.2/Bg5conv/bg5conv.1
new file mode 100644
index 00000000000..6ec9aeaa9b6
--- /dev/null
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.2/Bg5conv/bg5conv.1
@@ -0,0 +1,110 @@
+.\" man page for bg5conv
+.\" Copyright (C) 1994-2008  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
+.
+.TH BG5CONV 1 29-Dec-2008 "CJK Version 4.8.2"
+.
+.\" ====
+.\" ==== macro definitions
+.\" ====
+.
+.\" here we define \TeX for troff and nroff
+.if t .ds TX \fRT\\h'-0.1667m'\\v'0.20v'E\\v'-0.20v'\\h'-0.125m'X\fP
+.if n .ds TX TeX
+.
+.\" and here the same for \LaTeX
+.if t \{\
+.ie '\*(.T'dvi' \
+.ds LX \fRL\h'-0.36m'\v'-0.15v'\s-3A\s0\h'-0.15m'\v'0.15v'\fP\*(TX
+.el .ds LX \fRL\h'-0.36m'\v'-0.22v'\s-2A\s0\h'-0.15m'\v'0.22v'\fP\*(TX
+.\}
+.if n .ds LX LaTeX
+.
+.\" \LaTeXe
+.\" note that we need \vareps for TeX instead of \eps which can only be
+.\" accessed with the \N escape sequence (in the Math Italic font)
+.if t \{\
+.ie '\*(.T'dvi' .ds LE \*(LX\h'0.15m'2\v'0.20v'\f(MI\N'34'\fP\v'-0.20v'
+.el .ds LE \*(LX\h'0.15m'2\v'0.20v'\(*e\v'-0.20v'
+.\}
+.if n .ds LE LaTeX\ 2e
+.
+.\" a typewriter font
+.if t \{\
+.de C
+\fC\\$1\fP\\$2
+..
+.\}
+.if n \{\
+.de C
+\\$1\\$2
+..
+.\}
+.
+.\" ====
+.\" ==== end of macro definitions
+.\" ====
+.
+.
+.
+.SH NAME
+bg5conv \- convert a TeX document in Big\ 5 encoding into `preprocessed'
+form.
+.
+.
+.SH SYNOPSIS
+.B bg5conv
+<
+.I infile
+>
+.I outfile
+.
+.
+.SH DESCRIPTION
+Big\ 5 encoding for traditional Chinese uses the characters
+.C { ,
+.C } ,
+and
+.C \e
+which have special meanings in \*(TX
+documents.
+.PP
+After processing a \*(LE
+document which contains Big\ 5 characters with
+.B bg5conv
+you need not care about these special characters.
+.PP
+This filter is part of the
+.B CJK
+macro package for \*(LE.
+.
+.
+.SH "SEE ALSO"
+.BR \%sjisconv (1),
+.BR \%cefconv (1),
+.BR cef5conv (1),
+.BR \%cefsconv (1),
+.BR \%extconv (1),
+.br
+the
+.B CJK
+documentation files.
+.
+.
+.SH AUTHOR
+Werner Lemberg
+.C <wl@gnu.org>
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.2/Bg5conv/bg5conv.c b/Build/source/texk/cjkutils/cjkutils-4.8.2/Bg5conv/bg5conv.c
new file mode 100644
index 00000000000..435492827e3
--- /dev/null
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.2/Bg5conv/bg5conv.c
@@ -0,0 +1,36 @@
+#define banner  \
+"bg5conv (CJK ver. 4.8.2)" \
+
+/*2:*/
+#line 94 "/home/wl/git/cjk/cjk-4.8.2/utils/Bg5conv/bg5conv.w"
+
+#include <stdio.h> 
+#include <stdlib.h> 
+
+
+int main(argc,argv)
+int argc;
+char*argv[];
+
+{int ch;
+
+fprintf(stdout,"\\def\\CJKpreproc{%s}",banner);
+
+ch= fgetc(stdin);
+
+while(!feof(stdin))
+{if(ch>=0xA1&&ch<=0xFE)
+{fprintf(stdout,"\177%c\177",ch);
+
+ch= fgetc(stdin);
+if(!feof(stdin))
+fprintf(stdout,"%d\177",ch);
+}
+else
+fputc(ch,stdout);
+
+ch= fgetc(stdin);
+}
+exit(EXIT_SUCCESS);
+return 0;
+}/*:2*/
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.2/Bg5conv/bg5conv.w b/Build/source/texk/cjkutils/cjkutils-4.8.2/Bg5conv/bg5conv.w
new file mode 100644
index 00000000000..2a25f5b91bf
--- /dev/null
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.2/Bg5conv/bg5conv.w
@@ -0,0 +1,121 @@
+% This is the cweb file bg5conv.w of the CJK Package Ver. 4.8.2  29-Dec-2008
+
+% Copyright (C) 1994-2008  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
+
+% To print this CWEB file you should (but not must) use the CWEAVE of the
+% c2cweb-package (found at the CTAN archives, e.g. ftp.dante.de) and then say
+%
+%           cweave +a bg5conv.w
+%
+% This (fully compatible) CWEAVE can transform CWEB-files with alternative
+% 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.2)}
+
+\def\topofcontents{
+  \null\vfill
+  \centerline{\titlefont The {\ttitlefont bg5conv} program}
+  \vskip 20pt
+  \centerline{(CJK Version 4.8.2)}
+  \vfill}
+
+\def\botofcontents{
+  \vfill
+  \noindent
+  Copyright \copyright\ 1996, 1998 by Werner Lemberg
+  \bigskip\noindent
+  Permission is granted to make and distribute verbatim copies of this
+  document provided that the copyright notice and this permission notice
+  are preserved on all copies.
+
+  \smallskip\noindent
+  Permission is granted to copy and distribute modified versions of this
+  document under the conditions for verbatim copying, provided that the
+  entire resulting derived work is distributed under the terms of a
+  permission notice identical to this one.}
+
+\pageno=\contentspagenumber \advance\pageno by 1
+\let\maybe=\iftrue
+\fullpageheight=240mm
+\pageheight=223mm
+\pagewidth=158mm
+\setpage
+\frenchspacing
+
+\noinx
+\nosecs
+\nocon
+
+@* Function and Use.
+This small program will convert Big~5 encoded Chinese characters into a
+`preprocessed' form. The need of this program arises from the fact that this
+encoding uses the characters `\.{\\}', `\.{\{}', and `\.{\}}' which have
+special meanings in \TeX.
+
+Use this program as a filter:
+
+\hskip 2em \.{bg5conv < input\_file > output\_file}
+
+
+@* The program.
+The only function of this program is to replace all occurrences of Big 5
+encoded characters \.{XY} (\.{X} and \.{Y} are the first and the second byte
+of the character) with
+\.{\char94 \char94 7fX\char94 \char94 7fZZZ\char94 \char94 7f}, where
+\.{ZZZ} represents the second byte as a decimal number. \.{0x7F} is used as
+an active character and delimiter.
+
+Additionally we define a \TeX\ macro at the very beginning to signal a
+preprocessed file.
+
+The following code is very simple. No error detection is done because \TeX\
+which will see the output of \.{bg5conv} complains loudly if something is
+wrong.
+
+@d banner
+"bg5conv (CJK ver. 4.8.2)"
+
+@c
+#include <stdio.h>
+#include <stdlib.h>@#
+
+
+int main(int argc, char *argv[])
+   {int ch;
+
+    fprintf(stdout, "\\def\\CJKpreproc{%s}", banner);@#
+
+    ch = fgetc(stdin);@#
+
+    while(!feof(stdin))
+       {if(ch >= 0xA1 && ch <= 0xFE)
+           {fprintf(stdout, "\177%c\177", ch);@#
+
+            ch = fgetc(stdin);
+            if(!feof(stdin))
+                fprintf(stdout, "%d\177", ch);
+           }
+        else
+            fputc(ch, stdout);@#
+
+        ch = fgetc(stdin);
+       }
+    exit(EXIT_SUCCESS);
+    return 0;           /* never reached */
+   }
diff --git a/Build/source/texk/cjkutils/scripts/bg5latex b/Build/source/texk/cjkutils/cjkutils-4.8.2/Bg5conv/bg5latex
index 257a8446e21..30195776a87 100755
--- a/Build/source/texk/cjkutils/scripts/bg5latex
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.2/Bg5conv/bg5latex
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# Copyright (C) 1994-2006  Werner Lemberg <wl@gnu.org>
+# Copyright (C) 1994-2008  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/Build/source/texk/cjkutils/bat/bg5latex.bat b/Build/source/texk/cjkutils/cjkutils-4.8.2/Bg5conv/bg5latex.bat
index 91e7dfd8575..91e7dfd8575 100644
--- a/Build/source/texk/cjkutils/bat/bg5latex.bat
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.2/Bg5conv/bg5latex.bat
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.2/Bg5conv/bg5latex.cmd b/Build/source/texk/cjkutils/cjkutils-4.8.2/Bg5conv/bg5latex.cmd
new file mode 100644
index 00000000000..a4800ee4821
--- /dev/null
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.2/Bg5conv/bg5latex.cmd
@@ -0,0 +1,44 @@
+/*----------------------------------------------------------------------*\
+    bg5latex.cmd
+
+    This file is part of the CJK macro package for LaTeX2e ver. 4.8.2
+
+    Copyright (C) 1994-2008  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
+    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
+
+    Wonkoo Kim (wkim+@pitt.edu), September 2, 1996
+\*----------------------------------------------------------------------*/
+
+Call RxFuncAdd 'SysLoadFuncs', 'RexxUtil', 'SysLoadFuncs'
+Call SysLoadFuncs
+
+parse arg file
+
+drive = filespec('drive', file)
+path  = filespec('path', file)
+fname = filespec('name', file)
+m = lastpos('.', fname)
+if (m = 0) then m = length(fname) + 1
+cjkfile = drive||path||delstr(fname, m)||'.cjk'
+
+'bg5conv <' file '>' cjkfile
+
+ucjkfile = translate(cjkfile,'/','\')
+if stream(cjkfile, 'C', 'QUERY EXISTS') \= '' then
+    'call latex.cmd' ucjkfile
+
+/* End of bg5latex.cmd */
diff --git a/Build/source/texk/cjkutils/scripts/bg5pdflatex b/Build/source/texk/cjkutils/cjkutils-4.8.2/Bg5conv/bg5pdflatex
index 80adc376a93..ae165527569 100755
--- a/Build/source/texk/cjkutils/scripts/bg5pdflatex
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.2/Bg5conv/bg5pdflatex
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# Copyright (C) 1994-2006  Werner Lemberg <wl@gnu.org>
+# Copyright (C) 1994-2008  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/Build/source/texk/cjkutils/cjkutils-4.8.2/CEFconv/cef5conv.1 b/Build/source/texk/cjkutils/cjkutils-4.8.2/CEFconv/cef5conv.1
new file mode 100644
index 00000000000..aa56b138c6d
--- /dev/null
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.2/CEFconv/cef5conv.1
@@ -0,0 +1,127 @@
+.\" man page for cef5conv
+.\" Copyright (C) 1994-2008  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
+.
+.TH CEF5CONV 1 29-Dec-2008 "CJK Version 4.8.2"
+.
+.\" ====
+.\" ==== macro definitions
+.\" ====
+.
+.\" here we define \TeX for troff and nroff
+.if t .ds TX \fRT\\h'-0.1667m'\\v'0.20v'E\\v'-0.20v'\\h'-0.125m'X\fP
+.if n .ds TX TeX
+.
+.\" and here the same for \LaTeX
+.if t \{\
+.ie '\*(.T'dvi' \
+.ds LX \fRL\h'-0.36m'\v'-0.15v'\s-3A\s0\h'-0.15m'\v'0.15v'\fP\*(TX
+.el .ds LX \fRL\h'-0.36m'\v'-0.22v'\s-2A\s0\h'-0.15m'\v'0.22v'\fP\*(TX
+.\}
+.if n .ds LX LaTeX
+.
+.\" \LaTeXe
+.\" note that we need \vareps for TeX instead of \eps which can only be
+.\" accessed with the \N escape sequence (in the Math Italic font)
+.if t \{\
+.ie '\*(.T'dvi' .ds LE \*(LX\h'0.15m'2\v'0.20v'\f(MI\N'34'\fP\v'-0.20v'
+.el .ds LE \*(LX\h'0.15m'2\v'0.20v'\(*e\v'-0.20v'
+.\}
+.if n .ds LE LaTeX\ 2e
+.
+.\" a typewriter font
+.if t \{\
+.de C
+\fC\\$1\fP
+..
+.\}
+.if n \{\
+.de C
+\\$1
+..
+.\}
+.
+.\" ====
+.\" ==== end of macro definitions
+.\" ====
+.
+.
+.
+.SH NAME
+cef5conv \- convert a TeX document in Big\ 5 encoding containing CEF macros
+into `preprocessed' form.
+.
+.
+.SH SYNOPSIS
+.B cef5conv
+<
+.I infile
+>
+.I outfile
+.
+.
+.SH DESCRIPTION
+The
+.B Chinese Encoding Framework
+.RB ( CEF )
+developed by Christian Wittern
+.C <cwittern@conline.central.de>
+makes it possible to include CJK characters in various encodings using the
+SGML macros
+.B &CX-aabb;
+for Big\ 5 and CNS encoding and
+.B &U-aabb;
+for Unicode
+.RB ( X
+denotes a number between 0 and 7; 0 represents Big\ 5 encoding, 1-7 CNS
+encoding planes 1-7.
+.B aabb
+is either a decimal or hexadecimal number).
+.PP
+.B cef5conv
+converts the CEF macros of a Big\ 5 encoded document together with the Big\
+5 encoding itself into a form which can directly processed with \*(LE.
+It is identical to
+.IP
+.B bg5conv
+<
+.I infile
+|
+.B cefconv
+>
+.I outfile
+.PP
+This filter is part of the
+.B CJK
+macro package for \*(LE.
+.
+.
+.SH "SEE ALSO"
+.BR \%sjisconv (1),
+.BR bg5conv (1),
+.BR \%cefconv (1),
+.BR \%cefsconv (1),
+.BR \%extconv (1),
+.br
+the
+.B CJK
+documentation files.
+.
+.
+.SH AUTHOR
+Werner Lemberg
+.C <wl@gnu.org>
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.2/CEFconv/cef5conv.c b/Build/source/texk/cjkutils/cjkutils-4.8.2/CEFconv/cef5conv.c
new file mode 100644
index 00000000000..e2d00c7de22
--- /dev/null
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.2/CEFconv/cef5conv.c
@@ -0,0 +1,138 @@
+#define banner  \
+"cef5conv (CJK ver. 4.8.2)" \
+
+/*2:*/
+#line 108 "/home/wl/git/cjk/cjk-4.8.2/utils/CEFconv/cef5conv.w"
+
+#include <ctype.h> 
+#include <stdio.h> 
+#include <stdlib.h> 
+
+
+int main(argc,argv)
+int argc;
+char*argv[];
+
+{int ch,i;
+unsigned char in[16];
+unsigned char out[32];
+unsigned char*inp,*outp;
+
+fprintf(stdout,"\\def\\CNSpreproc{%s}",banner);
+
+ch= fgetc(stdin);
+
+while(!feof(stdin))
+{if(ch>=0xA1&&ch<=0xFE)
+{fprintf(stdout,"\177%c\177",ch);
+
+ch= fgetc(stdin);
+if(!feof(stdin))
+fprintf(stdout,"%d\177",ch);
+}
+else if(ch=='&')
+
+{inp= in;
+outp= out;
+*inp= ch;
+*(++inp)= fgetc(stdin);
+
+if(*inp=='C'&&!feof(stdin))
+{*(++inp)= fgetc(stdin);
+if(*inp=='0'&&!feof(stdin))
+{*(outp++)= 'B';
+*(outp++)= 'g';
+*(outp++)= '5';
+}
+else if(*inp>='1'&&*inp<='7'&&!feof(stdin))
+{*(outp++)= 'C';
+*(outp++)= 'N';
+*(outp++)= 'S';
+*(outp++)= *inp;
+}
+else if((*inp=='X'||*inp=='Y')&&!feof(stdin))
+{*(outp++)= 'C';
+*(outp++)= 'E';
+*(outp++)= 'F';
+*(outp++)= *inp;
+}
+else
+goto no_macro;
+}
+else if(*inp=='U'&&!feof(stdin))
+{*(outp++)= 'U';
+*(outp++)= 'T';
+*(outp++)= 'F';
+*(outp++)= '8';
+}
+else
+goto no_macro;
+
+*(++inp)= fgetc(stdin);
+if(*inp!='-'||feof(stdin))
+goto no_macro;
+
+*(outp++)= '\177';
+*(outp++)= '\"';
+*(outp++)= '0';
+
+*(++inp)= fgetc(stdin);
+if(isxdigit(*inp)&&*inp<0x80&&!feof(stdin))
+*(outp++)= toupper(*inp);
+else
+goto no_macro;
+
+*(++inp)= fgetc(stdin);
+if(isxdigit(*inp)&&*inp<0x80&&!feof(stdin))
+*(outp++)= toupper(*inp);
+else
+goto no_macro;
+
+*(outp++)= '\177';
+*(outp++)= '\177';
+*(outp++)= '\"';
+*(outp++)= '0';
+
+*(++inp)= fgetc(stdin);
+if(isxdigit(*inp)&&*inp<0x80&&!feof(stdin))
+*(outp++)= toupper(*inp);
+else
+goto no_macro;
+
+*(++inp)= fgetc(stdin);
+if(isxdigit(*inp)&&*inp<0x80&&!feof(stdin))
+*(outp++)= toupper(*inp);
+else
+goto no_macro;
+
+*(outp++)= '\177';
+*outp= '\0';
+
+*(++inp)= fgetc(stdin);
+if(*inp!=';'||feof(stdin))
+goto no_macro;
+
+outp= out;
+fprintf(stdout,"\17772\177");
+while(*outp)
+fputc(*(outp++),stdout);
+
+ch= fgetc(stdin);
+continue;
+
+no_macro:
+ch= *inp;
+i= inp-in;
+inp= in;
+while(i--)
+fputc(*(inp++),stdout);
+continue;
+}
+else
+fputc(ch,stdout);
+
+ch= fgetc(stdin);
+}
+exit(EXIT_SUCCESS);
+return 0;
+}/*:2*/
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.2/CEFconv/cef5conv.w b/Build/source/texk/cjkutils/cjkutils-4.8.2/CEFconv/cef5conv.w
new file mode 100644
index 00000000000..6c7618eeb74
--- /dev/null
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.2/CEFconv/cef5conv.w
@@ -0,0 +1,237 @@
+% This is the cweb file cef5conv.w of the CJK Package Ver. 4.8.2  29-Dec-2008
+
+% Copyright (C) 1994-2008  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
+
+% To print this CWEB file you should (but not must) use the CWEAVE of the
+% c2cweb-package (found at the CTAN archives, e.g. ftp.dante.de) and then say
+%
+%           cweave +a cef5conv.w
+%
+% This (fully compatible) CWEAVE can transform CWEB-files with alternative
+% 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.2)}
+
+\def\topofcontents{
+  \null\vfill
+  \centerline{\titlefont The {\ttitlefont cef5conv} program}
+  \vskip 20pt
+  \centerline{(CJK Version 4.8.2)}
+  \vfill}
+
+\def\botofcontents{
+  \vfill
+  \noindent
+  Copyright \copyright\ 1996, 1998, 2002 by Werner Lemberg
+  \bigskip\noindent
+  Permission is granted to make and distribute verbatim copies of this
+  document provided that the copyright notice and this permission notice
+  are preserved on all copies.
+
+  \smallskip\noindent
+  Permission is granted to copy and distribute modified versions of this
+  document under the conditions for verbatim copying, provided that the
+  entire resulting derived work is distributed under the terms of a
+  permission notice identical to this one.}
+
+\pageno=\contentspagenumber \advance\pageno by 1
+\let\maybe=\iftrue
+\fullpageheight=240mm
+\pageheight=223mm
+\pagewidth=158mm
+\setpage
+\frenchspacing
+
+\noinx
+\nosecs
+\nocon
+
+@* Function and Use.
+This small program will convert Big~5 encoding with CNS encoded Chinese
+characters using the {\it Chinese Encoding Framework (CEF)} into a
+`preprocessed' form. The need of this program arises from the fact that
+Big~5 encoding uses the characters `\.{\\}', `\.{\{}', and `\.{\}}' which
+have special meanings in \TeX.
+
+Use this program as a filter:
+
+\hskip 2em \.{cef5conv < input\_file > output\_file}
+
+
+@* The program.
+In contrast to \.{cefconv} two tasks will be executed:
+
+Replacing all occurrences of Big~5 encoded characters \.{XY} (\.{X} and
+\.{Y} are the first and the second byte of the character) with
+\.{\char94 \char94 7fX\char94 \char94 7fZZZ\char94 \char94 7f}, where
+\.{ZZZ} represents the second byte as a decimal number. \.{0x7F} is used as
+a control character and a delimiter.
+
+Replacing CEF macros of the form \.{\&xx-yyzz;} (\.{xx} can be C1--C7 for
+the CNS planes 1--7, C0 for Big~5 encoding, an encoding CX reserved for
+IRIZ, a private encoding CY, and U for Unicode encoding; \.{yyzz} is a
+hexadecimal representation of the code point in this plane) with
+\medskip
+\quad\.{\char94 \char94 7f72\char94 \char94 7fXX\char94 \char94 7f%
+\char94 \char94 7f"0yy\char94 \char94 7f"0zz\char94 \char94 7f}\quad.
+\medskip
+\.{XX} is the corresponding CJK encoding of \.{xx}; the number `72'
+specifies a macro in the file \.{MULEenc.sty} which further processes this
+representation -- it is automatically loaded by the \.{CJK} package.
+
+Additionally we define a \TeX\ macro at the very beginning to signal a
+preprocessed file.
+
+The following code is very simple. No error detection is done because \TeX\
+which will see the output of \.{cef5conv} complains loudly if something is
+wrong.
+
+@d banner
+"cef5conv (CJK ver. 4.8.2)"
+
+@c
+#include <ctype.h>
+#include <stdio.h>
+#include <stdlib.h>@#
+
+
+int main(int argc, char *argv[])
+   {int ch, i;
+    unsigned char in[16];
+    unsigned char out[32];
+    unsigned char *inp, *outp;
+
+    fprintf(stdout, "\\def\\CNSpreproc{%s}", banner);@#
+
+    ch = fgetc(stdin);@#
+
+    while(!feof(stdin))
+       {if(ch >= 0xA1 && ch <= 0xFE)
+           {fprintf(stdout, "\177%c\177", ch);@#
+
+            ch = fgetc(stdin);
+            if(!feof(stdin))
+                fprintf(stdout, "%d\177", ch);
+           }
+        else if(ch == '&')
+                       /* the macro test is hardcoded to make things simple */
+           {inp = in;
+            outp = out;
+            *inp = ch;
+            *(++inp) = fgetc(stdin);@#
+
+            if(*inp == 'C' && !feof(stdin))
+               {*(++inp) = fgetc(stdin);
+                if(*inp == '0' && !feof(stdin))
+                   {*(outp++) = 'B';
+                    *(outp++) = 'g';
+                    *(outp++) = '5';
+                   }
+                else if(*inp >= '1' && *inp <= '7' && !feof(stdin))
+                   {*(outp++) = 'C';
+                    *(outp++) = 'N';
+                    *(outp++) = 'S';
+                    *(outp++) = *inp;
+                   }
+                else if((*inp == 'X' || *inp == 'Y') && !feof(stdin))
+                   {*(outp++) = 'C';
+                    *(outp++) = 'E';
+                    *(outp++) = 'F';
+                    *(outp++) = *inp;
+                   }
+                else
+                    goto no_macro;
+               }
+            else if(*inp == 'U' && !feof(stdin))
+               {*(outp++) = 'U';
+                *(outp++) = 'T';
+                *(outp++) = 'F';
+                *(outp++) = '8';
+               }
+            else
+                goto no_macro;@#
+
+            *(++inp) = fgetc(stdin);
+            if(*inp != '-' || feof(stdin))
+                goto no_macro;@#
+
+            *(outp++) = '\177';
+            *(outp++) = '\"';
+            *(outp++) = '0';@#
+
+            *(++inp) = fgetc(stdin);
+            if(isxdigit(*inp) && *inp < 0x80 && !feof(stdin))
+                *(outp++) = toupper(*inp);
+            else
+                goto no_macro;@#
+
+            *(++inp) = fgetc(stdin);
+            if(isxdigit(*inp) && *inp < 0x80 && !feof(stdin))
+                *(outp++) = toupper(*inp);
+            else
+                goto no_macro;@#
+
+            *(outp++) = '\177';
+            *(outp++) = '\177';
+            *(outp++) = '\"';
+            *(outp++) = '0';@#
+
+            *(++inp) = fgetc(stdin);
+            if(isxdigit(*inp) && *inp < 0x80 && !feof(stdin))
+                *(outp++) = toupper(*inp);
+            else
+                goto no_macro;@#
+
+            *(++inp) = fgetc(stdin);
+            if(isxdigit(*inp) && *inp < 0x80 && !feof(stdin))
+                *(outp++) = toupper(*inp);
+            else
+                goto no_macro;@#
+
+            *(outp++) = '\177';
+            *outp = '\0';@#
+
+            *(++inp) = fgetc(stdin);
+            if(*inp != ';' || feof(stdin))
+                goto no_macro;@#
+
+            outp = out;
+            fprintf(stdout, "\17772\177");
+            while(*outp)
+                fputc(*(outp++), stdout);@#
+
+            ch = fgetc(stdin);
+            continue;@#
+
+no_macro:
+            ch = *inp;
+            i = inp - in;
+            inp = in;
+            while(i--)
+                fputc(*(inp++), stdout);
+            continue;
+           }
+        else
+            fputc(ch, stdout);@#
+
+        ch = fgetc(stdin);
+       }
+    exit(EXIT_SUCCESS);
+    return 0;           /* never reached */
+   }
diff --git a/Build/source/texk/cjkutils/scripts/cef5latex b/Build/source/texk/cjkutils/cjkutils-4.8.2/CEFconv/cef5latex
index 7eda1633766..5e609181030 100755
--- a/Build/source/texk/cjkutils/scripts/cef5latex
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.2/CEFconv/cef5latex
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# Copyright (C) 1994-2006  Werner Lemberg <wl@gnu.org>
+# Copyright (C) 1994-2008  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/Build/source/texk/cjkutils/bat/cef5ltx.bat b/Build/source/texk/cjkutils/cjkutils-4.8.2/CEFconv/cef5ltx.bat
index 187485301f9..187485301f9 100644
--- a/Build/source/texk/cjkutils/bat/cef5ltx.bat
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.2/CEFconv/cef5ltx.bat
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.2/CEFconv/cef5ltx.cmd b/Build/source/texk/cjkutils/cjkutils-4.8.2/CEFconv/cef5ltx.cmd
new file mode 100644
index 00000000000..6edd12690ed
--- /dev/null
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.2/CEFconv/cef5ltx.cmd
@@ -0,0 +1,46 @@
+/*----------------------------------------------------------------------*\
+    cef5ltx.cmd
+
+    This file is part of the CJK macro package for LaTeX2e ver. 4.8.2
+
+    This file is part of the CJK macro package for LaTeX2e ver. 4.8.2
+
+    Copyright (C) 1994-2008  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
+    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
+
+    Wonkoo Kim (wkim+@pitt.edu), September 2, 1996
+\*----------------------------------------------------------------------*/
+
+Call RxFuncAdd 'SysLoadFuncs', 'RexxUtil', 'SysLoadFuncs'
+Call SysLoadFuncs
+
+parse arg file
+
+drive = filespec('drive', file)
+path  = filespec('path', file)
+fname = filespec('name', file)
+m = lastpos('.', fname)
+if (m = 0) then m = length(fname) + 1
+cjkfile = drive||path||delstr(fname, m)||'.cjk'
+
+'cef5conv <' file '>' cjkfile
+
+ucjkfile = translate(cjkfile,'/','\')
+if stream(cjkfile, 'C', 'QUERY EXISTS') \= '' then
+    'call latex.cmd' ucjkfile
+
+/* End of cef5ltx.cmd */
diff --git a/Build/source/texk/cjkutils/scripts/cef5pdflatex b/Build/source/texk/cjkutils/cjkutils-4.8.2/CEFconv/cef5pdflatex
index 25fe066a53f..cd1118cd7c3 100755
--- a/Build/source/texk/cjkutils/scripts/cef5pdflatex
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.2/CEFconv/cef5pdflatex
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# Copyright (C) 1994-2006  Werner Lemberg <wl@gnu.org>
+# Copyright (C) 1994-2008  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/Build/source/texk/cjkutils/cjkutils-4.8.2/CEFconv/cefconv.1 b/Build/source/texk/cjkutils/cjkutils-4.8.2/CEFconv/cefconv.1
new file mode 100644
index 00000000000..f2bdca8bf2a
--- /dev/null
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.2/CEFconv/cefconv.1
@@ -0,0 +1,117 @@
+.\" man page for cefconv
+.\" Copyright (C) 1994-2008  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
+.
+.TH CEFCONV 1 29-Dec-2008 "CJK Version 4.8.2"
+.
+.\" ====
+.\" ==== macro definitions
+.\" ====
+.
+.\" here we define \TeX for troff and nroff
+.if t .ds TX \fRT\\h'-0.1667m'\\v'0.20v'E\\v'-0.20v'\\h'-0.125m'X\fP
+.if n .ds TX TeX
+.
+.\" and here the same for \LaTeX
+.if t \{\
+.ie '\*(.T'dvi' \
+.ds LX \fRL\h'-0.36m'\v'-0.15v'\s-3A\s0\h'-0.15m'\v'0.15v'\fP\*(TX
+.el .ds LX \fRL\h'-0.36m'\v'-0.22v'\s-2A\s0\h'-0.15m'\v'0.22v'\fP\*(TX
+.\}
+.if n .ds LX LaTeX
+.
+.\" \LaTeXe
+.\" note that we need \vareps for TeX instead of \eps which can only be
+.\" accessed with the \N escape sequence (in the Math Italic font)
+.if t \{\
+.ie '\*(.T'dvi' .ds LE \*(LX\h'0.15m'2\v'0.20v'\f(MI\N'34'\fP\v'-0.20v'
+.el .ds LE \*(LX\h'0.15m'2\v'0.20v'\(*e\v'-0.20v'
+.\}
+.if n .ds LE LaTeX\ 2e
+.
+.\" a typewriter font
+.if t \{\
+.de C
+\fC\\$1\fP
+..
+.\}
+.if n \{\
+.de C
+\\$1
+..
+.\}
+.
+.\" ====
+.\" ==== end of macro definitions
+.\" ====
+.
+.
+.
+.SH NAME
+cefconv \- convert a TeX document containing CEF macros into `preprocessed'
+form.
+.
+.
+.SH SYNOPSIS
+.B cefconv
+<
+.I infile
+>
+.I outfile
+.
+.
+.SH DESCRIPTION
+The
+.B Chinese Encoding Framework
+.RB ( CEF )
+developed by Christian Wittern
+.C <cwittern@conline.central.de>
+makes it possible to include CJK characters in various encodings using the
+SGML macros
+.B &CX-aabb;
+for Big\ 5 and CNS encoding and
+.B &U-aabb;
+for Unicode
+.RB ( X
+denotes a number between 0 and 7; 0 represents Big\ 5 encoding, 1-7 CNS
+encoding planes 1-7.
+.B aabb
+is either a decimal or hexadecimal number)
+.PP
+.B \%cefconv
+converts the CEF macros into a form which can directly processed with \*(LE.
+.PP
+This filter is part of the
+.B CJK
+macro package for \*(LE.
+.
+.
+.SH "SEE ALSO"
+.BR \%sjisconv (1),
+.BR bg5conv (1),
+.BR cef5conv (1),
+.BR \%cefsconv (1),
+.BR \%extconv (1),
+.br
+the
+.B CJK
+documentation files.
+.
+.
+.SH AUTHOR
+Werner Lemberg
+.C <wl@gnu.org>
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.2/CEFconv/cefconv.c b/Build/source/texk/cjkutils/cjkutils-4.8.2/CEFconv/cefconv.c
new file mode 100644
index 00000000000..8c3e624108e
--- /dev/null
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.2/CEFconv/cefconv.c
@@ -0,0 +1,130 @@
+#define banner  \
+"cefconv (CJK ver. 4.8.2)" \
+
+/*2:*/
+#line 100 "/home/wl/git/cjk/cjk-4.8.2/utils/CEFconv/cefconv.w"
+
+#include <ctype.h> 
+#include <stdio.h> 
+#include <stdlib.h> 
+
+
+int main(argc,argv)
+int argc;
+char*argv[];
+
+{int ch,i;
+unsigned char in[16];
+unsigned char out[32];
+unsigned char*inp,*outp;
+
+fprintf(stdout,"\\def\\CNSpreproc{%s}",banner);
+
+ch= fgetc(stdin);
+
+while(!feof(stdin))
+{if(ch=='&')
+{inp= in;
+outp= out;
+*inp= ch;
+*(++inp)= fgetc(stdin);
+
+if(*inp=='C'&&!feof(stdin))
+{*(++inp)= fgetc(stdin);
+if(*inp=='0'&&!feof(stdin))
+{*(outp++)= 'B';
+*(outp++)= 'g';
+*(outp++)= '5';
+}
+else if(*inp>='1'&&*inp<='7'&&!feof(stdin))
+{*(outp++)= 'C';
+*(outp++)= 'N';
+*(outp++)= 'S';
+*(outp++)= *inp;
+}
+else if((*inp=='X'||*inp=='Y')&&!feof(stdin))
+{*(outp++)= 'C';
+*(outp++)= 'E';
+*(outp++)= 'F';
+*(outp++)= *inp;
+}
+else
+goto no_macro;
+}
+else if(*inp=='U'&&!feof(stdin))
+{*(outp++)= 'U';
+*(outp++)= 'T';
+*(outp++)= 'F';
+*(outp++)= '8';
+}
+else
+goto no_macro;
+
+*(++inp)= fgetc(stdin);
+if(*inp!='-'||feof(stdin))
+goto no_macro;
+
+*(outp++)= '\177';
+*(outp++)= '\177';
+*(outp++)= '\"';
+*(outp++)= '0';
+
+*(++inp)= fgetc(stdin);
+if(isxdigit(*inp)&&*inp<0x80&&!feof(stdin))
+*(outp++)= toupper(*inp);
+else
+goto no_macro;
+
+*(++inp)= fgetc(stdin);
+if(isxdigit(*inp)&&*inp<0x80&&!feof(stdin))
+*(outp++)= toupper(*inp);
+else
+goto no_macro;
+
+*(outp++)= '\177';
+*(outp++)= '\"';
+*(outp++)= '0';
+
+*(++inp)= fgetc(stdin);
+if(isxdigit(*inp)&&*inp<0x80&&!feof(stdin))
+*(outp++)= toupper(*inp);
+else
+goto no_macro;
+
+*(++inp)= fgetc(stdin);
+if(isxdigit(*inp)&&*inp<0x80&&!feof(stdin))
+*(outp++)= toupper(*inp);
+else
+goto no_macro;
+
+*(outp++)= '\177';
+*outp= '\0';
+
+*(++inp)= fgetc(stdin);
+if(*inp!=';'||feof(stdin))
+goto no_macro;
+
+outp= out;
+fprintf(stdout,"\17772\177");
+while(*outp)
+fputc(*(outp++),stdout);
+
+ch= fgetc(stdin);
+continue;
+
+no_macro:
+ch= *inp;
+i= inp-in;
+inp= in;
+while(i--)
+fputc(*(inp++),stdout);
+continue;
+}
+else
+fputc(ch,stdout);
+
+ch= fgetc(stdin);
+}
+exit(EXIT_SUCCESS);
+return 0;
+}/*:2*/
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.2/CEFconv/cefconv.w b/Build/source/texk/cjkutils/cjkutils-4.8.2/CEFconv/cefconv.w
new file mode 100644
index 00000000000..00f6a2b5917
--- /dev/null
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.2/CEFconv/cefconv.w
@@ -0,0 +1,221 @@
+% This is the cweb file cefconv.w of the CJK Package Ver. 4.8.2  29-Dec-2008
+
+% Copyright (C) 1994-2008  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
+
+% To print this CWEB file you should (but not must) use the CWEAVE of the
+% c2cweb-package (found at the CTAN archives, e.g. ftp.dante.de) and then say
+%
+%           cweave +a cefconv.w
+%
+% This (fully compatible) CWEAVE can transform CWEB-files with alternative
+% 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.2)}
+
+\def\topofcontents{
+  \null\vfill
+  \centerline{\titlefont The {\ttitlefont cefconv} program}
+  \vskip 20pt
+  \centerline{(CJK Version 4.8.2)}
+  \vfill}
+
+\def\botofcontents{
+  \vfill
+  \noindent
+  Copyright \copyright\ 1996, 1998, 2002 by Werner Lemberg
+  \bigskip\noindent
+  Permission is granted to make and distribute verbatim copies of this
+  document provided that the copyright notice and this permission notice
+  are preserved on all copies.
+
+  \smallskip\noindent
+  Permission is granted to copy and distribute modified versions of this
+  document under the conditions for verbatim copying, provided that the
+  entire resulting derived work is distributed under the terms of a
+  permission notice identical to this one.}
+
+\pageno=\contentspagenumber \advance\pageno by 1
+\let\maybe=\iftrue
+\fullpageheight=240mm
+\pageheight=223mm
+\pagewidth=158mm
+\setpage
+\frenchspacing
+
+\noinx
+\nosecs
+\nocon
+
+@* Function and Use.
+This small program will convert EUC encoding with CNS encoded Chinese
+characters using the {\it Chinese Encoding Framework (CEF)} into a
+`preprocessed' form, expanding the CEF macros.
+
+Use this program as a filter:
+
+\hskip 2em \.{cefconv < input\_file > output\_file}
+
+
+@* The program.
+In contrast to \.{cef5conv} or \.{cefsconv}, only one task will be executed:
+
+Replacing CEF macros of the form \.{\&xx-yyzz;} (\.{xx} can be C1--C7 for
+the CNS planes 1--7, C0 for Big~5 encoding, an encoding CX reserved for
+IRIZ, a private encoding CY, and U for Unicode encoding; \.{yyzz} is a
+hexadecimal representation of the code point in this plane) with
+\medskip
+\quad\.{\char94 \char94 7f72\char94 \char94 ffXX\char94 \char94 7f%
+\char94 \char94 7f"0yy\char94 \char94 7f"0zz\char94 \char94 7f}\quad.
+\medskip
+\.{XX} is the corresponding CJK encoding of \.{xx}; the number `72'
+specifies a macro in the file \.{MULEenc.sty} which further processes this
+representation -- it is automatically loaded by the \.{CJK} package.
+
+Additionally we define an empty \TeX\ macro at the very beginning to signal
+a preprocessed file.
+
+The following code is very simple. No error detection is done because \TeX\
+which will see the output of \.{cefconv} complains loudly if something is
+wrong.
+
+@d banner
+"cefconv (CJK ver. 4.8.2)"
+
+@c
+#include <ctype.h>
+#include <stdio.h>
+#include <stdlib.h>@#
+
+
+int main(int argc, char *argv[])
+   {int ch, i;
+    unsigned char in[16];
+    unsigned char out[32];
+    unsigned char *inp, *outp;
+
+    fprintf(stdout, "\\def\\CNSpreproc{%s}", banner);@#
+
+    ch = fgetc(stdin);@#
+
+    while(!feof(stdin))
+       {if(ch == '&')  /* the macro test is hardcoded to make things simple */
+           {inp = in;
+            outp = out;
+            *inp = ch;
+            *(++inp) = fgetc(stdin);@#
+
+            if(*inp == 'C' && !feof(stdin))
+               {*(++inp) = fgetc(stdin);
+                if(*inp == '0' && !feof(stdin))
+                   {*(outp++) = 'B';
+                    *(outp++) = 'g';
+                    *(outp++) = '5';
+                   }
+                else if(*inp >= '1' && *inp <= '7' && !feof(stdin))
+                   {*(outp++) = 'C';
+                    *(outp++) = 'N';
+                    *(outp++) = 'S';
+                    *(outp++) = *inp;
+                   }
+                else if((*inp == 'X' || *inp == 'Y') && !feof(stdin))
+                   {*(outp++) = 'C';
+                    *(outp++) = 'E';
+                    *(outp++) = 'F';
+                    *(outp++) = *inp;
+                   }
+                else
+                    goto no_macro;
+               }
+            else if(*inp == 'U' && !feof(stdin))
+               {*(outp++) = 'U';
+                *(outp++) = 'T';
+                *(outp++) = 'F';
+                *(outp++) = '8';
+               }
+            else
+                goto no_macro;@#
+
+            *(++inp) = fgetc(stdin);
+            if(*inp != '-' || feof(stdin))
+                goto no_macro;@#
+
+            *(outp++) = '\177';
+            *(outp++) = '\177';
+            *(outp++) = '\"';
+            *(outp++) = '0';@#
+
+            *(++inp) = fgetc(stdin);
+            if(isxdigit(*inp) && *inp < 0x80 && !feof(stdin))
+                *(outp++) = toupper(*inp);
+            else
+                goto no_macro;@#
+
+            *(++inp) = fgetc(stdin);
+            if(isxdigit(*inp) && *inp < 0x80 && !feof(stdin))
+                *(outp++) = toupper(*inp);
+            else
+                goto no_macro;@#
+
+            *(outp++) = '\177';
+            *(outp++) = '\"';
+            *(outp++) = '0';@#
+
+            *(++inp) = fgetc(stdin);
+            if(isxdigit(*inp) && *inp < 0x80 && !feof(stdin))
+                *(outp++) = toupper(*inp);
+            else
+                goto no_macro;@#
+
+            *(++inp) = fgetc(stdin);
+            if(isxdigit(*inp) && *inp < 0x80 && !feof(stdin))
+                *(outp++) = toupper(*inp);
+            else
+                goto no_macro;@#
+
+            *(outp++) = '\177';
+            *outp = '\0';@#
+
+            *(++inp) = fgetc(stdin);
+            if(*inp != ';' || feof(stdin))
+                goto no_macro;@#
+
+            outp = out;
+            fprintf(stdout, "\17772\177");
+            while(*outp)
+                fputc(*(outp++), stdout);@#
+
+            ch = fgetc(stdin);
+            continue;@#
+
+no_macro:
+            ch = *inp;
+            i = inp - in;
+            inp = in;
+            while(i--)
+                fputc(*(inp++), stdout);
+            continue;
+           }
+        else
+            fputc(ch, stdout);@#
+
+        ch = fgetc(stdin);
+       }
+    exit(EXIT_SUCCESS);
+    return 0;           /* never reached */
+   }
diff --git a/Build/source/texk/cjkutils/scripts/ceflatex b/Build/source/texk/cjkutils/cjkutils-4.8.2/CEFconv/ceflatex
index d34244d9a5b..1b110c613c6 100755
--- a/Build/source/texk/cjkutils/scripts/ceflatex
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.2/CEFconv/ceflatex
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# Copyright (C) 1994-2006  Werner Lemberg <wl@gnu.org>
+# Copyright (C) 1994-2008  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/Build/source/texk/cjkutils/bat/ceflatex.bat b/Build/source/texk/cjkutils/cjkutils-4.8.2/CEFconv/ceflatex.bat
index ba5925a6df3..ba5925a6df3 100644
--- a/Build/source/texk/cjkutils/bat/ceflatex.bat
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.2/CEFconv/ceflatex.bat
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.2/CEFconv/ceflatex.cmd b/Build/source/texk/cjkutils/cjkutils-4.8.2/CEFconv/ceflatex.cmd
new file mode 100644
index 00000000000..d1f6eed43fc
--- /dev/null
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.2/CEFconv/ceflatex.cmd
@@ -0,0 +1,46 @@
+/*----------------------------------------------------------------------*\
+    ceflatex.cmd
+
+    This file is part of the CJK macro package for LaTeX2e ver. 4.8.2
+
+    This file is part of the CJK macro package for LaTeX2e ver. 4.8.2
+
+    Copyright (C) 1994-2008  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
+    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
+
+    Wonkoo Kim (wkim+@pitt.edu), September 2, 1996
+\*----------------------------------------------------------------------*/
+
+Call RxFuncAdd 'SysLoadFuncs', 'RexxUtil', 'SysLoadFuncs'
+Call SysLoadFuncs
+
+parse arg file
+
+drive = filespec('drive', file)
+path  = filespec('path', file)
+fname = filespec('name', file)
+m = lastpos('.', fname)
+if (m = 0) then m = length(fname) + 1
+cjkfile = drive||path||delstr(fname, m)||'.cjk'
+
+'cefconv <' file '>' cjkfile
+
+ucjkfile = translate(cjkfile,'/','\')
+if stream(cjkfile, 'C', 'QUERY EXISTS') \= '' then
+    'call latex.cmd' ucjkfile
+
+/* End of ceflatex.cmd */
diff --git a/Build/source/texk/cjkutils/scripts/cefpdflatex b/Build/source/texk/cjkutils/cjkutils-4.8.2/CEFconv/cefpdflatex
index 4c7309f2bf2..706114a8c77 100755
--- a/Build/source/texk/cjkutils/scripts/cefpdflatex
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.2/CEFconv/cefpdflatex
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# Copyright (C) 1994-2006  Werner Lemberg <wl@gnu.org>
+# Copyright (C) 1994-2008  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/Build/source/texk/cjkutils/cjkutils-4.8.2/CEFconv/cefsconv.1 b/Build/source/texk/cjkutils/cjkutils-4.8.2/CEFconv/cefsconv.1
new file mode 100644
index 00000000000..4cd962d3d2f
--- /dev/null
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.2/CEFconv/cefsconv.1
@@ -0,0 +1,127 @@
+.\" man page for cefsconv
+.\" Copyright (C) 1994-2008  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
+.
+.TH CEFSCONV 1 29-Dec-2008 "CJK Version 4.8.2"
+.
+.\" ====
+.\" ==== macro definitions
+.\" ====
+.
+.\" here we define \TeX for troff and nroff
+.if t .ds TX \fRT\\h'-0.1667m'\\v'0.20v'E\\v'-0.20v'\\h'-0.125m'X\fP
+.if n .ds TX TeX
+.
+.\" and here the same for \LaTeX
+.if t \{\
+.ie '\*(.T'dvi' \
+.ds LX \fRL\h'-0.36m'\v'-0.15v'\s-3A\s0\h'-0.15m'\v'0.15v'\fP\*(TX
+.el .ds LX \fRL\h'-0.36m'\v'-0.22v'\s-2A\s0\h'-0.15m'\v'0.22v'\fP\*(TX
+.\}
+.if n .ds LX LaTeX
+.
+.\" \LaTeXe
+.\" note that we need \vareps for TeX instead of \eps which can only be
+.\" accessed with the \N escape sequence (in the Math Italic font)
+.if t \{\
+.ie '\*(.T'dvi' .ds LE \*(LX\h'0.15m'2\v'0.20v'\f(MI\N'34'\fP\v'-0.20v'
+.el .ds LE \*(LX\h'0.15m'2\v'0.20v'\(*e\v'-0.20v'
+.\}
+.if n .ds LE LaTeX\ 2e
+.
+.\" a typewriter font
+.if t \{\
+.de C
+\fC\\$1\fP
+..
+.\}
+.if n \{\
+.de C
+\\$1
+..
+.\}
+.
+.\" ====
+.\" ==== end of macro definitions
+.\" ====
+.
+.
+.
+.SH NAME
+cefsconv \- convert a TeX document in SJIS encoding containing CEF macros
+into `preprocessed' form.
+.
+.
+.SH SYNOPSIS
+.B cefsconv
+<
+.I infile
+>
+.I outfile
+.
+.
+.SH DESCRIPTION
+The
+.B Chinese Encoding Framework
+.RB ( CEF )
+developed by Christian Wittern
+.C <cwittern@conline.central.de>
+makes it possible to include CJK characters in various encodings using the
+SGML macros
+.B &CX-aabb;
+for Big\ 5 and CNS encoding and
+.B &U-aabb;
+for Unicode
+.RB ( X
+denotes a number between 0 and 7; 0 represents Big\ 5 encoding, 1-7 CNS
+encoding planes 1-7.
+.B aabb
+is either a decimal or hexadecimal number).
+.PP
+.B \%cefsconv
+converts the CEF macros of a SJIS encoded document together with the SJIS
+encoding itself into a form which can directly processed with \*(LE.
+It is identical to
+.IP
+.B sjisconv
+<
+.I infile
+|
+.B cefconv
+>
+.I outfile
+.PP
+This filter is part of the
+.B CJK
+macro package for \*(LE.
+.
+.
+.SH "SEE ALSO"
+.BR \%sjisconv (1),
+.BR bg5conv (1),
+.BR \%cefconv (1),
+.BR cef5conv (1),
+.BR \%extconv (1),
+.br
+the
+.B CJK
+documentation files.
+.
+.
+.SH AUTHOR
+Werner Lemberg
+.C <wl@gnu.org>
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.2/CEFconv/cefsconv.c b/Build/source/texk/cjkutils/cjkutils-4.8.2/CEFconv/cefsconv.c
new file mode 100644
index 00000000000..cfb9a77b11b
--- /dev/null
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.2/CEFconv/cefsconv.c
@@ -0,0 +1,138 @@
+#define banner  \
+"cefsconv (CJK ver. 4.8.2)" \
+
+/*2:*/
+#line 108 "/home/wl/git/cjk/cjk-4.8.2/utils/CEFconv/cefsconv.w"
+
+#include <ctype.h> 
+#include <stdio.h> 
+#include <stdlib.h> 
+
+
+int main(argc,argv)
+int argc;
+char*argv[];
+
+{int ch,i;
+unsigned char in[16];
+unsigned char out[32];
+unsigned char*inp,*outp;
+
+fprintf(stdout,"\\def\\CNSpreproc{%s}",banner);
+
+ch= fgetc(stdin);
+
+while(!feof(stdin))
+{if((ch>=0x81&&ch<=0x9F)||(ch>=0xE0&&ch<=0xEF))
+{fprintf(stdout,"\177%c\177",ch);
+
+ch= fgetc(stdin);
+if(!feof(stdin))
+fprintf(stdout,"%d\177",ch);
+}
+else if(ch=='&')
+
+{inp= in;
+outp= out;
+*inp= ch;
+*(++inp)= fgetc(stdin);
+
+if(*inp=='C'&&!feof(stdin))
+{*(++inp)= fgetc(stdin);
+if(*inp=='0'&&!feof(stdin))
+{*(outp++)= 'B';
+*(outp++)= 'g';
+*(outp++)= '5';
+}
+else if(*inp>='1'&&*inp<='7'&&!feof(stdin))
+{*(outp++)= 'C';
+*(outp++)= 'N';
+*(outp++)= 'S';
+*(outp++)= *inp;
+}
+else if((*inp=='X'||*inp=='Y')&&!feof(stdin))
+{*(outp++)= 'C';
+*(outp++)= 'E';
+*(outp++)= 'F';
+*(outp++)= *inp;
+}
+else
+goto no_macro;
+}
+else if(*inp=='U'&&!feof(stdin))
+{*(outp++)= 'U';
+*(outp++)= 'T';
+*(outp++)= 'F';
+*(outp++)= '8';
+}
+else
+goto no_macro;
+
+*(++inp)= fgetc(stdin);
+if(*inp!='-'||feof(stdin))
+goto no_macro;
+
+*(outp++)= '\177';
+*(outp++)= '\"';
+*(outp++)= '0';
+
+*(++inp)= fgetc(stdin);
+if(isxdigit(*inp)&&*inp<0x80&&!feof(stdin))
+*(outp++)= toupper(*inp);
+else
+goto no_macro;
+
+*(++inp)= fgetc(stdin);
+if(isxdigit(*inp)&&*inp<0x80&&!feof(stdin))
+*(outp++)= toupper(*inp);
+else
+goto no_macro;
+
+*(outp++)= '\177';
+*(outp++)= '\177';
+*(outp++)= '\"';
+*(outp++)= '0';
+
+*(++inp)= fgetc(stdin);
+if(isxdigit(*inp)&&*inp<0x80&&!feof(stdin))
+*(outp++)= toupper(*inp);
+else
+goto no_macro;
+
+*(++inp)= fgetc(stdin);
+if(isxdigit(*inp)&&*inp<0x80&&!feof(stdin))
+*(outp++)= toupper(*inp);
+else
+goto no_macro;
+
+*(outp++)= '\177';
+*outp= '\0';
+
+*(++inp)= fgetc(stdin);
+if(*inp!=';'||feof(stdin))
+goto no_macro;
+
+outp= out;
+fprintf(stdout,"\17772\177");
+while(*outp)
+fputc(*(outp++),stdout);
+
+ch= fgetc(stdin);
+continue;
+
+no_macro:
+ch= *inp;
+i= inp-in;
+inp= in;
+while(i--)
+fputc(*(inp++),stdout);
+continue;
+}
+else
+fputc(ch,stdout);
+
+ch= fgetc(stdin);
+}
+exit(EXIT_SUCCESS);
+return 0;
+}/*:2*/
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.2/CEFconv/cefsconv.w b/Build/source/texk/cjkutils/cjkutils-4.8.2/CEFconv/cefsconv.w
new file mode 100644
index 00000000000..06cd823f2de
--- /dev/null
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.2/CEFconv/cefsconv.w
@@ -0,0 +1,237 @@
+% This is the cweb file cefsconv.w of the CJK Package Ver. 4.8.2  29-Dec-2008
+
+% Copyright (C) 1994-2008  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
+
+% To print this CWEB file you should (but not must) use the CWEAVE of the
+% c2cweb-package (found at the CTAN archives, e.g. ftp.dante.de) and then say
+%
+%           cweave +a cefsconv.w
+%
+% This (fully compatible) CWEAVE can transform CWEB-files with alternative
+% 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.2)}
+
+\def\topofcontents{
+  \null\vfill
+  \centerline{\titlefont The {\ttitlefont cefsconv} program}
+  \vskip 20pt
+  \centerline{(CJK Version 4.8.2)}
+  \vfill}
+
+\def\botofcontents{
+  \vfill
+  \noindent
+  Copyright \copyright\ 1996, 1998 by Werner Lemberg
+  \bigskip\noindent
+  Permission is granted to make and distribute verbatim copies of this
+  document provided that the copyright notice and this permission notice
+  are preserved on all copies.
+
+  \smallskip\noindent
+  Permission is granted to copy and distribute modified versions of this
+  document under the conditions for verbatim copying, provided that the
+  entire resulting derived work is distributed under the terms of a
+  permission notice identical to this one.}
+
+\pageno=\contentspagenumber \advance\pageno by 1
+\let\maybe=\iftrue
+\fullpageheight=240mm
+\pageheight=223mm
+\pagewidth=158mm
+\setpage
+\frenchspacing
+
+\noinx
+\nosecs
+\nocon
+
+@* Function and Use.
+This small program will convert SJIS encoding with CNS encoded Chinese
+characters using the {\it Chinese Encoding Framework (CEF)} into a
+`preprocessed' form. The need of this program arises from the fact that
+SJIS encoding uses the characters `\.{\\}', `\.{\{}', and `\.{\}}' which
+have special meanings in \TeX.
+
+Use this program as a filter:
+
+\hskip 2em \.{cefsconv < input\_file > output\_file}
+
+
+@* The program.
+In contrast to \.{cefconv} two tasks will be executed:
+
+Replacing all occurrences of two byte SJIS encoded characters \.{XY} with
+\.{\char94 \char94 7fX\char94 \char94 7fZZZ\char94 \char94 7f} (\.{X} and
+\.{Y} are the first and the second byte of the character; \.{ZZZ} represents
+the second byte as a decimal number).
+
+Replacing CEF macros of the form \.{\&xx-yyzz;} (\.{xx} can be C1--C7 for
+the CNS planes 1--7, C0 for Big~5 encoding, an encoding CX reserved for
+IRIZ, a private encoding CY, and U for Unicode encoding; \.{yyzz} is a
+hexadecimal representation of the code point in this plane) with
+\medskip
+\quad\.{\char94 \char94 7f72\char94 \char94 7fXX\char94 \char94 7f%
+\char94 \char94 7f"0yy\char94 \char94 7f"0zz\char94 \char94 7f}\quad.
+\medskip
+\.{XX} is the corresponding CJK encoding of \.{xx}; the number `72'
+specifies a macro in the file \.{MULEenc.sty} which further processes this
+representation -- it is necessary to explicitly load this file with
+\.{\\usepackage}.
+
+Additionally we define a \TeX\ macro at the very beginning to signal a
+preprocessed file.
+
+The following code is very simple. No error detection is done because \TeX\
+which will see the output of \.{cefsconv} complains loudly if something is
+wrong.
+
+@d banner
+"cefsconv (CJK ver. 4.8.2)"
+
+@c
+#include <ctype.h>
+#include <stdio.h>
+#include <stdlib.h>@#
+
+
+int main(int argc, char *argv[])
+   {int ch, i;
+    unsigned char in[16];
+    unsigned char out[32];
+    unsigned char *inp, *outp;
+
+    fprintf(stdout, "\\def\\CNSpreproc{%s}", banner);@#
+
+    ch = fgetc(stdin);@#
+
+    while(!feof(stdin))
+       {if((ch >= 0x81 && ch <= 0x9F) || (ch >= 0xE0 && ch <= 0xEF))
+           {fprintf(stdout, "\177%c\177", ch);@#
+
+            ch = fgetc(stdin);
+            if(!feof(stdin))
+                fprintf(stdout, "%d\177", ch);
+           }
+        else if(ch == '&')
+                       /* the macro test is hardcoded to make things simple */
+           {inp = in;
+            outp = out;
+            *inp = ch;
+            *(++inp) = fgetc(stdin);@#
+
+            if(*inp == 'C' && !feof(stdin))
+               {*(++inp) = fgetc(stdin);
+                if(*inp == '0' && !feof(stdin))
+                   {*(outp++) = 'B';
+                    *(outp++) = 'g';
+                    *(outp++) = '5';
+                   }
+                else if(*inp >= '1' && *inp <= '7' && !feof(stdin))
+                   {*(outp++) = 'C';
+                    *(outp++) = 'N';
+                    *(outp++) = 'S';
+                    *(outp++) = *inp;
+                   }
+                else if((*inp == 'X' || *inp == 'Y') && !feof(stdin))
+                   {*(outp++) = 'C';
+                    *(outp++) = 'E';
+                    *(outp++) = 'F';
+                    *(outp++) = *inp;
+                   }
+                else
+                    goto no_macro;
+               }
+            else if(*inp == 'U' && !feof(stdin))
+               {*(outp++) = 'U';
+                *(outp++) = 'T';
+                *(outp++) = 'F';
+                *(outp++) = '8';
+               }
+            else
+                goto no_macro;@#
+
+            *(++inp) = fgetc(stdin);
+            if(*inp != '-' || feof(stdin))
+                goto no_macro;@#
+
+            *(outp++) = '\177';
+            *(outp++) = '\"';
+            *(outp++) = '0';@#
+
+            *(++inp) = fgetc(stdin);
+            if(isxdigit(*inp) && *inp < 0x80 && !feof(stdin))
+                *(outp++) = toupper(*inp);
+            else
+                goto no_macro;@#
+
+            *(++inp) = fgetc(stdin);
+            if(isxdigit(*inp) && *inp < 0x80 && !feof(stdin))
+                *(outp++) = toupper(*inp);
+            else
+                goto no_macro;@#
+
+            *(outp++) = '\177';
+            *(outp++) = '\177';
+            *(outp++) = '\"';
+            *(outp++) = '0';@#
+
+            *(++inp) = fgetc(stdin);
+            if(isxdigit(*inp) && *inp < 0x80 && !feof(stdin))
+                *(outp++) = toupper(*inp);
+            else
+                goto no_macro;@#
+
+            *(++inp) = fgetc(stdin);
+            if(isxdigit(*inp) && *inp < 0x80 && !feof(stdin))
+                *(outp++) = toupper(*inp);
+            else
+                goto no_macro;@#
+
+            *(outp++) = '\177';
+            *outp = '\0';@#
+
+            *(++inp) = fgetc(stdin);
+            if(*inp != ';' || feof(stdin))
+                goto no_macro;@#
+
+            outp = out;
+            fprintf(stdout, "\17772\177");
+            while(*outp)
+                fputc(*(outp++), stdout);@#
+
+            ch = fgetc(stdin);
+            continue;@#
+
+no_macro:
+            ch = *inp;
+            i = inp - in;
+            inp = in;
+            while(i--)
+                fputc(*(inp++), stdout);
+            continue;
+           }
+        else
+            fputc(ch, stdout);@#
+
+        ch = fgetc(stdin);
+       }
+    exit(EXIT_SUCCESS);
+    return 0;           /* never reached */
+   }
diff --git a/Build/source/texk/cjkutils/scripts/cefslatex b/Build/source/texk/cjkutils/cjkutils-4.8.2/CEFconv/cefslatex
index 619d08c7577..db2232d98c6 100755
--- a/Build/source/texk/cjkutils/scripts/cefslatex
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.2/CEFconv/cefslatex
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# Copyright (C) 1994-2006  Werner Lemberg <wl@gnu.org>
+# Copyright (C) 1994-2008  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/Build/source/texk/cjkutils/bat/cefsltx.bat b/Build/source/texk/cjkutils/cjkutils-4.8.2/CEFconv/cefsltx.bat
index 662ef9e3af4..662ef9e3af4 100644
--- a/Build/source/texk/cjkutils/bat/cefsltx.bat
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.2/CEFconv/cefsltx.bat
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.2/CEFconv/cefsltx.cmd b/Build/source/texk/cjkutils/cjkutils-4.8.2/CEFconv/cefsltx.cmd
new file mode 100644
index 00000000000..011732c6ee4
--- /dev/null
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.2/CEFconv/cefsltx.cmd
@@ -0,0 +1,46 @@
+/*----------------------------------------------------------------------*\
+    cefsltx.cmd
+
+    This file is part of the CJK macro package for LaTeX2e ver. 4.8.2
+
+    This file is part of the CJK macro package for LaTeX2e ver. 4.8.2
+
+    Copyright (C) 1994-2008  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
+    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
+
+    Wonkoo Kim (wkim+@pitt.edu), September 2, 1996
+\*----------------------------------------------------------------------*/
+
+Call RxFuncAdd 'SysLoadFuncs', 'RexxUtil', 'SysLoadFuncs'
+Call SysLoadFuncs
+
+parse arg file
+
+drive = filespec('drive', file)
+path  = filespec('path', file)
+fname = filespec('name', file)
+m = lastpos('.', fname)
+if (m = 0) then m = length(fname) + 1
+cjkfile = drive||path||delstr(fname, m)||'.cjk'
+
+'cefsconv <' file '>' cjkfile
+
+ucjkfile = translate(cjkfile,'/','\')
+if stream(cjkfile, 'C', 'QUERY EXISTS') \= '' then
+    'call latex.cmd' ucjkfile
+
+/* End of cefsltx.cmd */
diff --git a/Build/source/texk/cjkutils/scripts/cefspdflatex b/Build/source/texk/cjkutils/cjkutils-4.8.2/CEFconv/cefspdflatex
index 02bf6598f71..bc99498f4af 100755
--- a/Build/source/texk/cjkutils/scripts/cefspdflatex
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.2/CEFconv/cefspdflatex
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# Copyright (C) 1994-2006  Werner Lemberg <wl@gnu.org>
+# Copyright (C) 1994-2008  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/Build/source/texk/cjkutils/cjkutils-4.8.2/ChangeLog b/Build/source/texk/cjkutils/cjkutils-4.8.2/ChangeLog
new file mode 100644
index 00000000000..51d9185d21f
--- /dev/null
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.2/ChangeLog
@@ -0,0 +1,2164 @@
+2008-12-29  Werner LEMBERG  <wl@gnu.org>
+
+	Version 4.8.2 released
+	======================
+
+	Set version to 4.8.2.
+
+	* doc/history.txt: Updated.
+
+	Update headers in all text files.
+
+2008-12-29  Werner LEMBERG  <wl@gnu.org>
+
+	* 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.63.
+
+2008-12-29  Werner LEMBERG  <wl@gnu.org>
+
+	* doc/TeXLive.txt: Replaced with...
+	* texlive/*.pl: These new files which define the various TeXLive
+	packages derived from the CJK bundle.
+
+	* MANIFEST: Updated.
+
+2008-12-28  Werner LEMBERG  <wl@gnu.org>
+
+	* doc/history.txt: Updated.
+
+	* doc/CJKnumb.txt: New file.
+
+	* MANIFEST: Updated.
+
+2008-12-28  Werner LEMBERG  <wl@gnu.org>
+
+	Rename garuda & norasi stuff to garuda-c90 & norasi-c90.
+
+	* MANIFEST, doc/thaifont.txt, utils/thaifont/tools/INSTALL: Updated.
+
+	* utils/thaifont/texmf/dvips/garuda/config.garuda: Moved to...
+	* utils/thaifont/texmf/dvips/garuda-c90/config.garuda-c90: This
+	file.  Updated.
+	* utils/thaifont/texmf/dvips/norasi/config.norasi: Moved to...
+	* utils/thaifont/texmf/dvips/norasi-c90/config.norasi-c90: This
+	file.  Updated.
+	* utils/thaifont/texmf/fonts/map/dvips/garuda/garuda.map: Moved
+	to...
+	* utils/thaifont/texmf/fonts/map/dvips/garuda-c90/garuda-c90.map:
+	This file.
+	* utils/thaifont/texmf/fonts/map/dvips/norasi/norasi.map: Moved
+	to...
+	* utils/thaifont/texmf/fonts/map/dvips/norasi-c90/norasi-c90.map:
+	This file.
+	* utils/thaifont/texmf/fonts/tfm/public/garuda/*: Moved to...
+	* utils/thaifont/texmf/fonts/tfm/public/garuda-c90/*: This
+	directory.
+	* utils/thaifont/texmf/fonts/tfm/public/norasi/*: Moved to...
+	* utils/thaifont/texmf/fonts/tfm/public/norasi-c90/*: This
+	directory.
+	* utils/thaifont/tools/garuda.fontinst: Moved to...
+	* utils/thaifont/tools/garuda-c90.fontinst: This file.
+	* utils/thaifont/tools/norasi.fontinst: Moved to...
+	* utils/thaifont/tools/norasi-c90.fontinst: This file.
+
+2008-12-28  Werner LEMBERG  <wl@gnu.org>
+
+	* contrib/wadalab/DNP.txt: Renamed to...
+	* contrib/wadalab/wadalab.txt: This.
+	* MANIFEST: Updated.
+
+2008-12-28  Werner LEMBERG  <wl@gnu.org>
+
+	Use same font names as in thailatex.
+
+	* doc/thaifont.txt,
+	utils/thaifont/texmf/fonts/map/dvips/garuda/garuda.map,
+	utils/thaifont/texmf/fonts/map/dvips/norasi/norasi.map: Updated.
+
+
+	Update to thailatex 0.4.2.
+
+	* doc/thaifont.txt,
+	utils/thaifont/texmf/fonts/tfm/public/norasi/ftnr8z.tfm,
+	utils/thaifont/texmf/fonts/tfm/public/norasi/ftnb8z.tfm,
+	utils/thaifont/texmf/fonts/tfm/public/norasi/ftnbo8z.tfm,
+	utils/thaifont/texmf/fonts/tfm/public/norasi/ftno8z.tfm,
+	utils/thaifont/texmf/fonts/tfm/public/garuda/fgdr8z.tfm,
+	utils/thaifont/texmf/fonts/tfm/public/garuda/fgdb8z.tfm,
+	utils/thaifont/texmf/fonts/tfm/public/garuda/fgdbo8z.tfm,
+	utils/thaifont/texmf/fonts/tfm/public/garuda/fgdo8z.tfm: Regenerated
+	with fontinst.
+
+2008-11-25  Werner LEMBERG  <wl@gnu.org>
+
+	* texinput/CJKnumb.sty: Use U+3007 (IDEOGRAPHIC NUMBER ZERO),
+	not U+25CB (WHITE CIRCLE).
+
+	* texinput/UTF8/c70bkai.fdx, texinput/UTF8/c70bsmi.fdx: Map U+25CB
+	to U+3007.
+	* texinput/UTF8/c70gbsn.fdx, texinput/UTF8/c70gkai.fdx,
+	texinput/UTF8/c70mj.fdx: New files which do the same.
+
+	* MANIFEST: Updated.
+
+2008-11-25  Werner LEMBERG  <wl@gnu.org>
+
+	* texinput/CJK.sty (\Unicode): Use vertical glyph representation
+	forms.
+
+2008-11-25  Werner LEMBERG  <wl@gnu.org>
+
+	* texinput/CJKnumb.sty (\CJKdigits*): New command to use traditional
+	form of glyph zero.
+
+	* doc/history.txt: Updated.
+
+2008-10-01  Werner LEMBERG  <wl@gnu.org>
+
+	* *.fd: Add \CJKnormal to all font families which use \CJKbold.  This
+	is necessary because NFSS doesn't call \selectfont if a font gets
+	substituted by another one (and \selectfont resets the \CJK@bold@
+	flag).  Here an example (where `gbsn' uses \CJKbold for boldface
+	emulation):
+
+	  \begin{CJK*}{GB}{gbsn}
+	  {\bf\CJKchar{"D6}{"D0}}
+	  {\em\CJKchar{"D6}{"D0}}
+	  \end{CJK*}
+
+2008-09-23  Werner LEMBERG  <wl@gnu.org>
+
+	* utils/subfonts/subfonts.pe: Fix error message for too-old
+	FontForge versions.
+
+2008-08-21  Werner LEMBERG  <wl@gnu.org>
+
+	* utils/subfonts/subfonts.pe: Handle CID-keyed fonts.
+
+2008-08-10  Werner LEMBERG  <wl@gnu.org>
+
+	Version 4.8.1 released
+	======================
+
+	Set version to 4.8.1.
+
+	* doc/history.txt, README: Updated.
+
+	* doc/TeXLive.txt: Updated.
+	PDF man pages are now autogenerated in TeXLive.
+
+	Update headers in all text files.
+
+	* utils/hbf2gf/config.sub: Updated to current version.
+
+2008-08-03  Werner LEMBERG  <wl@gnu.org>
+
+	Add some missing files.  Found by Daniel Flipo.
+
+	* texinput/Bg5/c00bkai.fd, texinput/GB/c10gkai.fd,
+	texinput/GB/c10gkai.fdx: New files.
+
+	* MANIFEST: Updated.
+
+2008-07-11  Werner LEMBERG  <wl@gnu.org>
+
+	Make macros in pinyin.sty robust.
+
+	Problem reported by Denis Roegel <roegel@loria.fr>.
+
+	* texinput/pinyin.sty (\py@macron): Make it work again with Plain
+	TeX.
+	(\py@@@): No longer needed.
+	(\py@): Do what \py@@@ did formerly.
+	(py@DRC): New macro to make the pinyin syllables robust.
+	Update all pinyin syllable macro definitions to use it.
+
+	* doc/history.txt: Updated.
+
+2008-07-11  Werner LEMBERG  <wl@gnu.org>
+
+	Incorporate Wen-Chang's CJKspace package.
+
+	* texinput/CJKspace.sty, examples/CJKspace.tex, doc/CJKspace.txt:
+	New files.
+	* texinput/CJK.sty (\CJK@@@): New signature macro for CJKspace.sty.
+	(\CJK@namedef, \CJK@namepdef, \CJK@nameppdef, \CJK@namepppdef,
+	\CJK@nameppppdef): Use it.
+
+	* Makefile, doc/history.txt, MANIFEST: Updated.
+
+2008-05-22  Werner LEMBERG  <wl@gnu.org>
+
+	Version 4.8.0 released
+	======================
+
+	Set version to 4.8.0.
+
+	* doc/history.txt, doc/INSTALL, doc/TeXLive.txt, README: Updated.
+
+	Update headers in all text files.
+
+	* utils/hbf2gf/config.guess, utils/hbf2gf/config.sub: Updated to
+	current versions.
+
+	* utils/hbf2gf/configure: Regenerated with autoconf 2.62.
+
+2008-05-18  Werner LEMBERG  <wl@gnu.org>
+
+	* Makefile (DISTDIRS): We are now using git, not CVS.
+
+2008-05-18  Werner LEMBERG  <wl@gnu.org>
+
+	* doc/history.txt: Mention xCJK.sty.
+
+2008-05-17  Werner LEMBERG  <wl@gnu.org>
+
+	* texinput/CJK.sty (\CJK@UnicodeEnc): New macro (so that xCJK.sty
+	can overwrite it).
+	* texinput/CJKnumb.sty: Use it.
+
+	* texinput/xCJK.sty: Simplify -- unicode mappings to other encodings
+	are no longer supported (since it hasn't worked for Big5 or GBK
+	anyway).
+
+	(\xCJK@xUTF): Removed.
+	(\CJKsymbol): Simplified.
+	(\toutf@XXX): Removed.
+	(\xCJK@CJKenc, \CJKenc): Removed.
+	(\CJK@envStart): Produce error if encoding is not `UTF8'.
+	Simplified.
+	(\xCJK@setenc, \CJK@xpmC, \xCJK@enc@UTF8, \xCJK@xUTF8@hook):
+	Removed.
+	(\CJK@xUTF8@hook, \CJK@UnicodeEnc): New macros.
+	(\xCJK@@char): Removed.
+	(\CJK@XXpdf): Simplified.
+	(\CJK@@XXpdf): Removed.
+
+	Add support for non-BMP Unicode.
+
+	(\CJK@nameppppdef): New macro.
+	(\xCJK@char): Redefined.
+	(\xCJK@@char, \xCJK@@@char): New macros.
+	(\CJK@XXp, \CJK@XXXp): Redefined.
+	(\CJK@XXXXp): New macro.
+
+	xdvipdfmx automatically handles UTF-8 encoded bookmarks.
+
+	(\xCJK@four, \xCJK@@@char, <\if@filesw>): Removed.
+
+	(\special): Use \utfout.
+
+2008-05-12  Danai SAE-HAN  <danai.sae-han@edpnet.be>
+
+	* utils/hbf2gf/hbf2gf.1: Replace some `-' with `\-'.
+
+2008-03-10  Werner LEMBERG  <wl@gnu.org>
+
+	* utils/hbf2gf/hbf2gf.1: s|-|\-| where appropriate.
+
+2008-03-09  Werner LEMBERG  <wl@gnu.org>
+
+	* Makefile (XELATEX): Call xelatex twice.
+	(manpages): Increase font size to 11pt for DVI and PDF output.
+
+2008-03-09  Werner LEMBERG  <wl@gnu.org>
+
+	Add support for EUC-JP with DNP font encoding.
+
+	* texinput/CJK.enc (\CJK@@@EUC-JPdnp@hook, \CJK@EUC-JPdnp@enc): New
+	macros.
+
+	* texinput/JIS/EUC-JPdnp.enc: New file.
+
+	* texinput/JIS/EUC-JP.chr (\CJK@shiftchar): Define \CJK@plane as
+	empty.
+
+	* doc/history.txt, MANIFEST: Updated.
+
+2008-03-09  Werner LEMBERG  <wl@gnu.org>
+
+	Make \CJK@bold work with C49 encoding too.  The idea is to handle
+	the font as a CJK font but with \CJK@plane set to empty.
+
+	* texinput/SJIS/SJIS.chr, texinput/SJIS/SJIdnp.chr (\CJK@sjischar):
+	Define \CJK@plane as empty.
+
+	* texinput/SJIS/c49song.fd: Use `CJK' size function.
+
+	* doc/history.txt: Updated.
+
+2008-03-03  Werner LEMBERG  <wl@gnu.org>
+
+	* texinput/CJKutf8.sty, texinput/xCJK.sty,
+	texinput/mule/MULEenc.sty: Use \ProvidesPackage, not \ProvidesFile.
+
+2008-03-03  Werner LEMBERG  <wl@gnu.org>
+
+	Better control for \baselinestretch with CJKvert.sty.
+
+	* texinput/CJKvert.sty (usebaselinestretch): New option.
+	(\CJKbaselinestretch): New macro.
+
+	* doc/history.txt, doc/vertical.txt: Document it.
+
+2008-02-11  Werner LEMBERG  <wl@gnu.org>
+
+	* doc/xCJK.txt: New file.
+	* MANIFEST: Updated.
+
+2008-02-11  Werner LEMBERG  <wl@gnu.org>
+
+	* doc/fonts.txt: Document installation of cyberbit.ttf.
+
+2008-02-05  Werner LEMBERG  <wl@gnu.org>
+
+	Add SUN Wen-Chang's xCJK bundle.
+
+	* examples/xCJK.tex, texinput/UTF8/xUTF8.chr,
+	texinput/UTF8/xUTF8.enc, texinput/xCJK.sty, texinput/xpmC.chr,
+	texinput/xpmC.enc: New files.
+
+	* MANIFEST: Updated.
+
+	* Makefile (XELATEX): New macro.
+	(xCJK): New target.
+	(CJK2DVI, LATE2DVI): Simplify.
+
+2008-01-15  Gernot Hassenpflug  <aikishugyo@gmail.com>
+
+	* contrib/wadalab/c70goth.fdx, contrib/wadalab/c70min.fdx,
+	contrib/wadalab/c70maru.fdx: Rotate more glyphs for vertical
+	typesetting.
+	Shift small kana for vertical typesetting.
+	Other minor improvements.
+
+2007-12-27  Werner LEMBERG  <wl@gnu.org>
+
+	* utils/subfonts/vertical.pe, utils/subfonts/vertref.pe: Abort if no
+	vertical glyph representation forms are available.
+
+2006-12-05  Werner LEMBERG  <wl@gnu.org>
+
+	Make pinyin syllables work with \MakeUppercase and \MakeLowercase.
+
+	* pinyin.sty: Almost completely rewrite macro logic to replace e.g.
+	`\py@@@a' with `\py@ a' so that the argument gets handled by
+	\MakeUppercase.
+
+2006-12-04  Werner LEMBERG  <wl@gnu.org>
+
+	Make pinyin syllables work with hyperref bookmarks.
+
+	* pinyin.sty: Use \AtBeginDocument hook to add missing characters to
+	PU encoding needed for pinyin syllables.
+	Use \AtBeginDocument hook to set up some replacement macros for
+	bookmarks.
+	(\py@hr@macron, \py@hr@v): New replacement macros for
+	bookmarks.
+
+2007-11-23  Werner LEMBERG  <wl@gnu.org>
+
+	* texinput/CJK.enc: Add punctuation tables for GBK encoding.
+
+2007-11-06  Werner LEMBERG  <wl@gnu.org>
+
+	* utils/subfonts/subfonts.pe, utils/subfonts/vertical.pe,
+	utils/subfonts/vertref.pe: Put current time stamp into copyright
+	string.
+	Need FontForge 20071105 or newer.
+
+2007-11-02  SUN Wenchang  <sunwch@hotmail.com>
+
+	* texinput/CJKfntef.sty (\CJK@preUnderdot): Use \cdot (in math mode).
+	(\CJKxout): Use `/' in math mode.
+	(\CJKunderdotbasesep, \CJKunderdotsep): Adjusted.
+
+2007-10-26  Werner LEMBERG  <wl@gnu.org>
+
+	* utils/subfonts/vertical.pe: Use glyph names of the horizontal
+	representation glyphs with an appended `.vert'.  This makes dvipdfmx
+	automatically create a correct /ToUnicode CMap.
+
+2007-10-25  Werner LEMBERG  <wl@gnu.org>
+
+	Provide final fix for patch 2007-10-04.
+
+	* utils/subfonts/makefdx.pl: Provide flag `-u' to produce a CMap
+	macro in the FDX file.
+	Don't specify FDX file directly on the command line but give family
+	name and encoding separately which are then concatenated to give the
+	FDX name (we need the family name separately).
+	Add code to produce a macro which provides a /ToUnicode CMap entry
+	as needed by pdfTeX.
+	Fix loop to not omit last glyph.
+
+	* texinput/UTF8/c70bsmi.fdx, texinput/UTF8/c70bkai.fdx: Regenerated.
+	These now provide the macros \CJK@cmap@bsmiv and \CJK@cmap@bkaiv,
+	respectively.
+
+	* texinput/CJKutf8.sty (\pickup@font): Call `\CJK@cmap@...' if it
+	exists.
+
+2007-10-04  Werner LEMBERG  <wl@gnu.org>
+
+	* texinput/CJKutf8.sty (\pickup@font): Disable generation of
+	ToUnicode cmap for `v' subfont (which holds vertical representation
+	glyphs).  This is a temporary hack; the right solution is to modify
+	makefdx.pl so that it creates a ToUnicode macro for the specific
+	font; \CJK@addcmap should be then modified to use this macro instead
+	of autogenerating a cmap.
+
+	Problem reported by Edward G.J. Lee.
+
+2007-09-10  Werner LEMBERG  <wl@gnu.org>
+
+	* utils/subfonts/vertical.pe, utils.subfonts/vertref.pe: Adapt to
+	FontForge version 2007-Sep-10 and newer.
+
+2007-07-26  Gernot Hassenpflug  <gernot@nict.go.jp>
+
+	* contrib/wadalab/c70goth.fdx, contrib/wadalab/c70min.fdx,
+	contrib/wadalab/c70maru.fdx: New files to support vertical writing
+	with Unicode encoded Wadalab fonts.
+
+2007-07-07  Werner LEMBERG  <wl@gnu.org>
+
+	* texinput/pinyin.sty (\ding): Rename to...
+	(\py@ding): This to make \ding work actually.
+
+2007-05-04  Werner LEMBERG  <wl@gnu.org>
+
+	* texinput/CJKvert.sty (\CJKsymbol): Honour \CJKhdef{offset}{...}.
+	* doc/fdxfiles.txt, doc/history.txt: Document it.
+
+2007-04-08  Werner LEMBERG  <wl@gnu.org>
+
+	* utils/pyhyphen/pyhyph.tex: Replace latin-1 characters with
+	^^xx sequences.  Suggested by David Kastrup.
+
+	* doc/cjk-enc.txt: Document special space handling for Emacs quail
+	input methods.
+
+2006-11-06  Werner LEMBERG  <wl@gnu.org>
+
+	* texinput/pinyin.sty (\py@macron, \py@@@v): Support T5 encoding.
+	* doc/history.txt: Document it.
+
+2006-10-31  Werner LEMBERG  <wl@gnu.org>
+
+	* doc/CJK.txt, doc/CJKutf8.txt: Mention Byte Order Mark in UTF-8.
+
+2006-10-19  Werner LEMBERG  <wl@gnu.org>
+
+	* doc/TeXLive.txt, MANIFEST: Minor fixes.
+
+	* Makefile (DVI2PDF): Add argument for paper format.
+	(CONVERT, MULE, LATEX): Add optional argument for paper format;
+	default to `letter'.
+	(manpages, cweb): Use letter paper format.
+	(READMEb5): Use A4 paper.
+
+	* examples/README: Minor fix.
+
+2006-10-17  Werner LEMBERG  <wl@gnu.org>
+
+	Version 4.7.0 released
+	======================
+
+	Set version to 4.7.0.
+
+	* doc/history.txt, doc/INSTALL, doc/TeXLive.txt, README: Updated.
+
+	Update headers in all text files.
+
+2006-10-09  Werner LEMBERG  <wl@gnu.org>
+
+	* Makefile (abs-distdir): Fix assignment.
+	(distdoc): Remove generated C files.
+
+	* utils/hbf2gf/hbf2gf.1: s/`/\(oq/ and s/'/\(cq/ where appropriate.
+
+2006-10-06  Werner LEMBERG  <wl@gnu.org>
+
+	* doc/CJKutf8.txt, doc/history.txt: Minor additions.
+	* MANIFEST: Sorted and updated.
+
+2006-10-05  Werner LEMBERG  <wl@gnu.org>
+
+	* texinput/CJKutf8.sty (\CJK@surr): Use \expandafter to make
+	\uppercase work actually.
+
+	* texinput/CJK.sty (\CJK@makeActive, \CJK@makeInactive): Handle 0x80
+	also (which is needed for UTF8).
+
+2006-10-05  Werner LEMBERG  <wl@gnu.org>
+
+	* texinput/CJKutf8.sty (\CJK@surr): New function.
+	(\CJK@addcmap): Use \CJK@surr so that values > U+FFFF are correctly
+	represented as surrogates.
+
+2006-09-30  Werner LEMBERG  <wl@gnu.org>
+
+	In CJKutf8.sty, add ToUnicode cmaps for pdfTeX.  Note, however, that
+	it currently fails with virtual fonts: pdftex 3.141592-1.30.4-2.2
+	can't resolve them to the used base fonts.
+
+	* texinput/CJKutf8.sty: Require ifpdf package.
+	(\pickup@font) [\ifpdf]: Redefine, adding a call to CJK@addcmap.
+	(\CJK@addcmap) [\ifpdf]: New function.
+
+	* doc/history.txt: Updated.
+
+2006-09-16  Werner LEMBERG  <wl@gnu.org>
+
+	* texinput/CJK.sty (\CJK@ifundefined): New macro.
+	Update all affected files where possible to use it instead of
+	\@ifundefined.  This fixes a bug reported by Danai which made
+	\chapter work in the `scrartcl' article class (instead of
+	reporting an error) after using a CJK caption file.
+
+	* *.cap, *.cpx: Don't redefine \thepart but use its previous
+	definition for \partformat.  This fixes a bug reported by Danai
+	which produced bad TOC entries.
+
+	* doc/history.txt: Updated.
+
+2006-09-12  Werner LEMBERG  <wl@gnu.org>
+
+	* texinput/UTF8/ko-Hanj.cpx: Renamed to...
+	* texinput/UTF8/ko-Hani.cpx: This to use the correct ISO 15924
+	script tag.
+
+	* doc/history.txt, doc/CJK.txt: Updated.
+
+2006-09-08  Werner LEMBERG  <wl@gnu.org>
+
+	Add caption files for UTF8 encoding.
+
+	* texinput/UTF8/{ja,ko-Hang,ko-Hang2,ko-Hanj,zh-Hans,zh-Hant}.cap:
+	New files.
+
+	* doc/history.txt, doc/CJK.txt: Mention them.
+
+2006-08-31  Werner LEMBERG  <wl@gnu.org>
+
+	Reimplement the \CJKbold mechanism to call the last argument of
+	\DeclareFontShape each time the font is selected only if a CJK size
+	function has been used.  This fixes shape declarations like the ones
+	in the fourier package which rely on being called only once.
+
+	* texinput/CJK.sty (\CJK@curr@fontshape): New macro.
+	(\CJK@empty, \CJK@fixed, \CJK@sub, \CJK@DNPgen, \CJK@DNP): Define a
+	macro where the name is the argument of \CJK@curr@fontshape.
+	(\selectfont): Execute macro where the name is the argument of
+	\CJK@curr@fontshape only if it exists.
+
+	* doc/history.txt, doc/CJK.txt: Mention it.
+
+2006-08-29  Danai SAE-HAN  <danai.sae-han@skynet.be>
+
+	* utils/subfonts/hlatex2agl.pl: Make it accept a third parameter
+	which specifies the used SFD file.
+	(process_afmfile, process_pfbfile): Add minor tweaks to handle fonts
+	generated with other tools than FontForge.
+
+2006-08-29  Werner LEMBERG  <wl@gnu.org>
+
+	* utils/Bg5conv/bg5conv.w, utils/extconv/extconv.w,
+	utils/hbf2gf/hbf2gf.w, utils/CEFconv/cefconv.w,
+	utils/CEFconv/cef5conv.w, utils/CEFconv/cefsconv.w,
+	utils/SJISconv/sjisconv.w: s/@/@@/ in email address.
+
+	* utils/Bg5conv/bg5conv.c, utils/extconv/extconv.c,
+	utils/hbf2gf/hbf2gf.c, utils/CEFconv/cefconv.c,
+	utils/CEFconv/cef5conv.c, utils/CEFconv/cefsconv.c,
+	utils/SJISconv/sjisconv.c: Removed.  These files are now generated
+	by the Makefile.
+
+	* Makefile (version): Set to 4.7.0.
+	(CJK2DVI, LATEX2DVI): Add `texlive' subdirectory
+	(distsrc): Build .c from .w files.
+
+2006-08-28  Werner LEMBERG  <wl@gnu.org>
+
+	* texinput/*: Add various replacement files for TeXLive.
+
+2006-08-17  Werner LEMBERG  <wl@gnu.org>
+
+	* doc/CJK.txt: Mention problem with fourier.sty.
+
+2006-08-01  Werner LEMBERG  <wl@gnu.org>
+
+	* doc/cjk-enc.txt: Mention problems with UTF-8.
+
+2006-07-30  Werner LEMBERG  <wl@gnu.org>
+
+	* contrib/wadalab/DNP.txt: Fix patch for wftodm.c.
+
+2006-04-25  Danai SAE-HAN  <danai.sae-han@skynet.be>
+
+	* <many files>: Add GPL.
+	* MANIFEST: New file.
+
+2006-03-25  Werner LEMBERG  <wl@gnu.org>
+
+	* texinput/CJKutf8.sty (\pdfstringdefPreHook): Don't overwrite but
+	prepend to this macro.
+
+2006-03-23  Werner LEMBERG  <wl@gnu.org>
+
+	* utils/subfonts/hlatex2agl.pl: New script (which has been used
+	to create the Korean fonts in TeXLive 2005).
+
+
+	* texinput/CJKutf8.sty: Add support for Unicode bookmarks.
+	(\CJK@UnicodeFourBytesFirst, \CJK@UnicodeFourBytesSecond,
+	\CJK@UnicodeFourBytesThird, \CJK@UnicodeThreeBytesFirst,
+	\CJK@UnicodeThreeBytesSecond, \CJK@UnicodeTwoBytesFirst,
+	\CJK@UnicodeLast): New macros to convert UTF-8 into UTF-16BE.
+	(\CJK@XXpdf, \CJK@XXXpdf, \CJK@XXXXpdf): Replacements for the
+	\CJK@XX, \CJK@XXX, and \CJK@XXXX macros, respectively.
+	(\pdfstringdefPreHook): Activate them.
+
+2006-03-22  Werner LEMBERG  <wl@gnu.org>
+
+	* texinput/KS/HLaTeX/c63sh.fd, texinput/KS/HLaTeX/c64sh.fd,
+	texinput/KS/HLaTeX/c65sh.fd: Fix font declaration.  Bug reported by
+	Danai SAE-HAN <danai.sae-han@skynet.be>.
+
+2006-02-20  Werner LEMBERG  <wl@gnu.org>
+
+	* texinput/UTF8/UTF8.bdg: Bugfix: Handle 0x80 also.
+
+	* doc/history.txt: Mention it.
+
+2006-02-09  Werner LEMBERG  <wl@gnu.org>
+
+	Support complete Unicode range (up to U+10FFFF).
+
+	* texinput/UTF8/UTF8.bdg: Handle leading characters 0xF0-0xF4.
+
+	* texinput/UTF8/UTF8.enc: Ditto.
+
+	* texinput/UTF8/UTF8.chr (\CJK@altxchar): New macro for four-byte
+	Unicode values.
+
+	* texinput/CJK.enc (\CJK@unicodexError): New error macro.
+
+	* texinput/CJK.sty (\CJK@numbxToHex): New auxiliary macro to convert
+	a number to a four-digit hex number string.
+	(\Unicode): Accept values greater than U+FFFF.
+
+	* doc/command.txt, doc/CJK.txt: Document extended \Unicode (and
+	\CJKchar) command.
+	* doc/history.txt: Updated.
+
+2006-01-23  Werner LEMBERG  <wl@gnu.org>
+
+	* texinput/CJK.enc (\CJK@HK@enc): Load `HK' encoding, not `Bg5'.
+	Use \def, not \@namedef.
+
+	* doc/CJK.txt: Mention `HKtext' environment.
+
+2006-01-22  Werner LEMBERG  <wl@gnu.org>
+
+	Add new encoding `HK' (C05) for Hong Kong's HKSCS-2004.
+
+	* texinput/Bg5/HK.enc, texinput/Bg5/c05song.fd: New files.
+	* texinput/CJK.enc: Add support for `HK' (C05).
+	* texinput/CJKnumb.sty: Handle `HK'.
+
+	* doc/CJK.txt: Bg5+ *cannot* be used for HKSCS.  Fix this.
+	* doc/history.txt: Document `HK' encoding.
+
+2006-01-19  Werner LEMBERG  <wl@gnu.org>
+
+	* doc/CJK.txt: Mention usage of Bg5+ for HKSCS-2001/HKSCS-2004.
+
+2006-01-04  Werner LEMBERG  <wl@gnu.org>
+
+	* texinput/pinyin.sty (\PYding): New \let.
+	(\PYactivate, \PYdeacticate): Handle \ding (from pifont.sty).
+
+	* doc/pinyin.tex: Document possible problems with pifont.sty.
+
+	* doc/history.txt: Updated.
+
+2005-12-27  Werner LEMBERG  <wl@gnu.org>
+
+	* utils/hbf2gf/cfg/csso12.cfg: Fix typo.
+
+2005-10-31  Danai SAE-HAN  <danai.sae-han@skynet.be>
+
+	* utils/subfonts/makefdx.pl: Provide header for output.
+	Add \CJKvlet lines.
+
+2005-08-19  Werner LEMBERG  <wl@gnu.org>
+
+	* doc/TeXLive.txt: New file, describing the relationship between
+	CJK files and TeXLive packages.
+
+2005-08-18  Werner LEMBERG  <wl@gnu.org>
+
+	* texinput/mule/MULEenc.sty: Define \CJK@verbatim correctly if not
+	already defined.  Reported by Andre Dierker.
+
+	* doc/pdf/*: Move to...
+	* doc/pdfhowto/*: This.
+
+2005-08-11  Werner LEMBERG  <wl@gnu.org>
+
+	Version 4.6.0 released
+	======================
+
+	Set version to 4.6.0.
+
+	* doc/history.txt, doc/INSTALL, Makefile (version): Updated.
+
+	Update headers in all text files.
+
+2005-08-10  Werner LEMBERG  <wl@gnu.org>
+
+	* doc/CEF.txt, doc/CJK.txt, doc/CJKutf8.txt, doc/INSTALL,
+	doc/TDS.txt, doc/cjk-enc.txt, doc/commands.txt, doc/dvidrv.txt,
+	doc/fonts.txt, doc/hbf2gf.txt, doc/history.2_5, doc/history.txt,
+	doc/pinyin.txt, doc/pyhyphen.txt, doc/ruby.txt, doc/thaifont.txt,
+	doc/vertical.txt: Updated and revised.
+
+2005-08-05  Werner LEMBERG  <wl@gnu.org>
+
+	* COPYING: Updated to new FSF address.
+
+2005-08-05  Werner LEMBERG  <wl@gnu.org>
+
+	After email exchange with Ross Paterson, the old (too restrictive)
+	license of the hbf module has been changed to the three-clause BSD
+	license -- Ross no longer maintains and distributes this code.
+
+	* utils/hbf2gf/hbf.c: Change license to BSD.
+	(strdup) [WIN32]: Define.  Change taken from teTeX distribution.
+
+	* utils/hbf2gf/hbf.h: Change license to BSD.
+
+	* utils/hbf2gf/config.guess, utils/hbf2gf/config.sub: Updated to
+	current versions.
+
+	* utils/hbf2gf/configure: Regenerated with autoconf 2.59b.
+
+2005-08-04  Werner LEMBERG  <wl@gnu.org>
+
+	Update files to compile with the forthcoming TeXLive 2005.
+
+	* doc/README: Updated, extended.
+
+	* examples/muletest.tex: Updated to new VnTeX (for Vietnamese).
+	Use type1ec.sty.
+	Suppress hyphenation.
+
+	* examples/CJKbabel.tex: Don't use t5.sty but `vietnam' option of
+	babel.
+	Use type1ec.sty.
+
+	* examples/CJKmixed.tex: Define and use `TChinese' environment.
+	Call \CJKhorz at the beginning of document.
+
+	* examples/CJKutf8.tex: Don't use cyberbit but the new Unicode
+	(virtual) fonts of gbsn, bsmi, and mj.
+
+	* texinput/Bg5/c00bsmi.fdx: Updated to new bsmi vertical glyph font.
+
+	* texinput/Bg5/c00bkai.fdx: New file.
+
+	* texinput/UTF8/c70bkai.fd, texinput/UTF8/c70bkai.fdx,
+	texinput/UTF8/c70bsmi.fd, texinput/UTF8/c70bsmi.fdx,
+	texinput/UTF8/c60gbsn.fd, texinput/UTF8/c70gkai.fd,
+	texinput/UTF8/c70mj.fd: New files.
+
+	* utils/pyhyphen/pytest.tex: Usae type1ec.sty.
+
+	* Makefile: Add rules for new example and documentation files.
+	(version): Set top 4.5.3.
+	(CJK2DVI, LATEX2DVI): Add `utils/pyhyphen' to TEXINPUTS variable.
+	(DVI2PS): Replace it with...
+	(DVI2PDF): New variable.
+	Update all callers.
+	(MULE): Add path to `cjk-enc.el' while calling emacs.
+	(DISTTARGETS): Add new example and documentation files.
+	(predistdoc): Don't create `ps' but `pdf' subdirectories.
+	(manpages): Add `-ww' option to groff.
+	Don't create `ps' but `pdf' files.
+	(cweb): Don't create `ps' but `pdf' file.
+
+2005-08-04  Werner LEMBERG  <wl@gnu.org>
+
+	* doc/*.doc, doc/japanese/*.doc, doc/chinese/*.doc,
+	contrib/wadalab/DNP.doc: Renamed to ...
+	* doc/*.txt, doc/japanese/*.txt, doc/chinese/*.txt,
+	contrib/wadalab/DNP.txt: This.
+
+	Update all references.
+
+2005-08-03  Werner LEMBERG  <wl@gnu.org>
+
+	* texinput/CJKvert.sty (\CJKvert, \CJKhorz): Make commands act
+	completely local.
+	* doc/history.txt: Mention it.
+
+	* doc/pdf/HOWTO.txt: Mention new $SFDFONTS variable from TDS 1.1.
+
+2005-08-02  Werner LEMBERG  <wl@gnu.org>
+
+	Update of HLaTeX support to version 1.0.1.
+
+	* texinput/KS/HLaTeX/c63mg.fd, texinput/KS/HLaTeX/c63mgt.fd,
+	texinput/KS/HLaTeX/c63mmj.fd, texinput/KS/HLaTeX/c63mnv.fd,
+	texinput/KS/HLaTeX/c63msr.fd, texinput/KS/HLaTeX/c63ol.fd,
+	texinput/KS/HLaTeX/c63pbm.fd, texinput/KS/HLaTeX/c63pgr.fd,
+	texinput/KS/HLaTeX/c63pgs.fd, texinput/KS/HLaTeX/c63pgt.fd,
+	texinput/KS/HLaTeX/c63pmg.fd, texinput/KS/HLaTeX/c63pmgt.fd,
+	texinput/KS/HLaTeX/c63pmj.fd, texinput/KS/HLaTeX/c63pmmj.fd,
+	texinput/KS/HLaTeX/c63pmnv.fd, texinput/KS/HLaTeX/c63pmsr.fd,
+	texinput/KS/HLaTeX/c63pol.fd, texinput/KS/HLaTeX/c63ppg.fd,
+	texinput/KS/HLaTeX/c63ppn.fd, texinput/KS/HLaTeX/c63psm.fd,
+	texinput/KS/HLaTeX/c63ptt.fd, texinput/KS/HLaTeX/c63pyt.fd,
+	texinput/KS/HLaTeX/c63sm.fd, texinput/KS/HLaTeX/c63tt.fd,
+	texinput/KS/HLaTeX/c64mg.fd, texinput/KS/HLaTeX/c64mgt.fd,
+	texinput/KS/HLaTeX/c64mmj.fd, texinput/KS/HLaTeX/c64mnv.fd,
+	texinput/KS/HLaTeX/c64msr.fd, texinput/KS/HLaTeX/c64ol.fd,
+	texinput/KS/HLaTeX/c64pbm.fd, texinput/KS/HLaTeX/c64pgr.fd,
+	texinput/KS/HLaTeX/c64pgs.fd, texinput/KS/HLaTeX/c64pgt.fd,
+	texinput/KS/HLaTeX/c64pmg.fd, texinput/KS/HLaTeX/c64pmgt.fd,
+	texinput/KS/HLaTeX/c64pmj.fd, texinput/KS/HLaTeX/c64pmmj.fd,
+	texinput/KS/HLaTeX/c64pmnv.fd, texinput/KS/HLaTeX/c64pmsr.fd,
+	texinput/KS/HLaTeX/c64pol.fd, texinput/KS/HLaTeX/c64ppg.fd,
+	texinput/KS/HLaTeX/c64ppn.fd, texinput/KS/HLaTeX/c64psm.fd,
+	texinput/KS/HLaTeX/c64ptt.fd, texinput/KS/HLaTeX/c64pyt.fd,
+	texinput/KS/HLaTeX/c64sm.fd, texinput/KS/HLaTeX/c64tt.fd,
+	texinput/KS/HLaTeX/c65mg.fd, texinput/KS/HLaTeX/c65mgt.fd,
+	texinput/KS/HLaTeX/c65mmj.fd, texinput/KS/HLaTeX/c65mnv.fd,
+	texinput/KS/HLaTeX/c65msr.fd, texinput/KS/HLaTeX/c65ol.fd,
+	texinput/KS/HLaTeX/c65pbm.fd, texinput/KS/HLaTeX/c65pgr.fd,
+	texinput/KS/HLaTeX/c65pgs.fd, texinput/KS/HLaTeX/c65pgt.fd,
+	texinput/KS/HLaTeX/c65pmg.fd, texinput/KS/HLaTeX/c65pmgt.fd,
+	texinput/KS/HLaTeX/c65pmj.fd, texinput/KS/HLaTeX/c65pmmj.fd,
+	texinput/KS/HLaTeX/c65pmnv.fd, texinput/KS/HLaTeX/c65pmsr.fd,
+	texinput/KS/HLaTeX/c65pol.fd, texinput/KS/HLaTeX/c65ppg.fd,
+	texinput/KS/HLaTeX/c65ppn.fd, texinput/KS/HLaTeX/c65psm.fd,
+	texinput/KS/HLaTeX/c65ptt.fd, texinput/KS/HLaTeX/c65pyt.fd,
+	texinput/KS/HLaTeX/c65sm.fd, texinput/KS/HLaTeX/c65tt.fd: Removed.
+
+	* texinput/KS/HLaTeX/c63dn.fd, texinput/KS/HLaTeX/c63jgt.fd,
+	texinput/KS/HLaTeX/c63jmj.fd, texinput/KS/HLaTeX/c63jnv.fd,
+	texinput/KS/HLaTeX/c63jsr.fd, texinput/KS/HLaTeX/c63pga.fd,
+	texinput/KS/HLaTeX/c63ph.fd, texinput/KS/HLaTeX/c63sh.fd,
+	texinput/KS/HLaTeX/c63tz.fd, texinput/KS/HLaTeX/c63vd.fd,
+	texinput/KS/HLaTeX/c64dn.fd, texinput/KS/HLaTeX/c64jgt.fd,
+	texinput/KS/HLaTeX/c64jmj.fd, texinput/KS/HLaTeX/c64jnv.fd,
+	texinput/KS/HLaTeX/c64jsr.fd, texinput/KS/HLaTeX/c64pga.fd,
+	texinput/KS/HLaTeX/c64ph.fd, texinput/KS/HLaTeX/c64sh.fd,
+	texinput/KS/HLaTeX/c64tz.fd, texinput/KS/HLaTeX/c64vd.fd,
+	texinput/KS/HLaTeX/c65dn.fd, texinput/KS/HLaTeX/c65jgt.fd,
+	texinput/KS/HLaTeX/c65jmj.fd, texinput/KS/HLaTeX/c65jnv.fd,
+	texinput/KS/HLaTeX/c65jsr.fd, texinput/KS/HLaTeX/c65pga.fd,
+	texinput/KS/HLaTeX/c65ph.fd, texinput/KS/HLaTeX/c65sh.fd,
+	texinput/KS/HLaTeX/c65tz.fd, texinput/KS/HLaTeX/c65vd.fd: New files.
+
+	* texinput/KS/HLaTeX/c63bm.fd, texinput/KS/HLaTeX/c63gr.fd,
+	texinput/KS/HLaTeX/c63gs.fd, texinput/KS/HLaTeX/c63gt.fd,
+	texinput/KS/HLaTeX/c63mj.fd, texinput/KS/HLaTeX/c63pg.fd,
+	texinput/KS/HLaTeX/c63pn.fd, texinput/KS/HLaTeX/c63yt.fd,
+	texinput/KS/HLaTeX/c64bm.fd, texinput/KS/HLaTeX/c64gr.fd,
+	texinput/KS/HLaTeX/c64gs.fd, texinput/KS/HLaTeX/c64gt.fd,
+	texinput/KS/HLaTeX/c64mj.fd, texinput/KS/HLaTeX/c64pg.fd,
+	texinput/KS/HLaTeX/c64pn.fd, texinput/KS/HLaTeX/c64yt.fd,
+	texinput/KS/HLaTeX/c65bm.fd, texinput/KS/HLaTeX/c65gr.fd,
+	texinput/KS/HLaTeX/c65gs.fd, texinput/KS/HLaTeX/c65gt.fd,
+	texinput/KS/HLaTeX/c65mj.fd, texinput/KS/HLaTeX/c65pg.fd,
+	texinput/KS/HLaTeX/c65pn.fd, texinput/KS/HLaTeX/c65yt.fd: Updated.
+
+	* texinput/KS/HLaTeX/pshan.sty: No longer needed.  Make it empty for
+	backwards compatibility.
+
+	* texinput/CJK.enc (\CJK@KSHL@enc): Updated.
+
+	* doc/history.txt, doc/CJK.doc: Updated.
+
+2005-08-01  Werner LEMBERG  <wl@gnu.org>
+
+	* utils/subfont/uni2sfd.pl (read_tfmfile): Fix reading CHARWD,
+	CHARHT, and CHARDP.
+
+2005-07-31  Werner LEMBERG  <wl@gnu.org>
+
+	* utils/subfont/sfd2uni.pl: New script to produce Unicode virtual
+	subfonts from encoding specific subfonts.
+
+2005-07-29  Werner LEMBERG  <wl@gnu.org>
+
+	* contrib/wadalab/DNP.sfd: Fix typo.  Found by Shunsaku Hirata.
+	* contrib/wadalab/fixwada2.pl: Since Wadalab fonts have already
+	been uploaded to CTAN, and the bug in DNP.sfd makes it necessary to
+	regenerate the fonts, and to update the version number and creation
+	date.
+
+2005-07-18  Werner LEMBERG  <wl@gnu.org>
+
+	* utils/subfonts/makefdx.pl, utils/subfonts/uni2sfd.pl: Fix typos.
+
+	* utils/subfonts/clonevf.pl: New script to produce a VF clone of
+	a TFM file.
+
+2005-07-18  Werner LEMBERG  <wl@gnu.org>
+
+	* utils/subfonts/makefdx.pl: New script to create FDX entries.
+
+2005-07-17  Werner LEMBERG  <wl@gnu.org>
+
+	* utils/subfonts/subfonts.pe, utils/subfonts/uni2sfd.pl,
+	utils/subfonts/vertical.pe, utils/vertref.pe: New perl and FontForge
+	scripts for creating and handling subfonts.
+
+2005-07-12  Werner LEMBERG  <wl@gnu.org>
+
+	* contrib/wadalab/fixwada2.pl, contrib/wadalab/makeuniwada.pl: New
+	scripts which fix glyph names and create virtual Unicode fonts for
+	the Wadalab font families.
+
+	* contrib/wadalab/DNP.sfd: A subfont definition file used by
+	`fixwada2.pl' and `makeuniwada.pl'.
+
+	* contrib/wadalab/c70goth.fd, contrib/wadalab/c70maru.fd,
+	contrib/wadalab/c70min.fd: New font definition files for Wadalab
+	fonts in Unicode encoding.
+
+	* contrib/wadalab/DNP.doc: Completely revised and updated.
+
+2005-07-07  Werner LEMBERG  <wl@gnu.org>
+
+	* doc/history.txt: Updated.
+
+2005-07-05  Werner LEMBERG  <wl@gnu.org>
+
+	* utils/thaifont/tools/c90.etx: Fix some typos.
+
+2005-07-04  Werner LEMBERG  <wl@gnu.org>
+
+	Update Thai support:
+
+	. Use fontinst.  We no longer need virtual fonts.
+	. Replace support for dbtt (which has an uncertain license) with
+	  garuda.
+	. Update to TDS 1.1.
+
+	* utils/thaifont/texmf/dvips/base/dbtt.enc: Removed.
+	* utils/thaifont/texmf/dvips/config/config.dbtt: Removed.
+	* utils/thaifont/texmf/dvips/config/dbtt.map: Removed.
+	* utils/thaifont/texmf/fonts/tfm/public/dbtt/*: Removed.
+	* utils/thaifont/texmf/fonts/vf/public/dbtt/*: Removed.
+
+	* utils/thaifont/texmf/dvips/base/norasi.enc: Removed.
+	* utils/thaifont/texmf/dvips/config/config.norasi: Move to...
+	* utils/thaifont/texmf/dvips/norasi/config.norasi: Here.
+	* utils/thaifont/texmf/dvips/config/norasi.map: Moved to...
+	* utils/thai/font/texmf/fonts/map/dvips/norasi/norasi.map: Here.
+	Updated.
+	* utils/thaifont/texmf/fonts/tfm/public/norasi/ftnr9z.tfm,
+	utils/thaifont/texmf/fonts/tfm/public/norasi/ftnb9z.tfm,
+	utils/thaifont/texmf/fonts/tfm/public/norasi/ftnbo9z.tfm,
+	utils/thaifont/texmf/fonts/tfm/public/norasi/ftno9z.tfm: Removed.
+	* utils/thaifont/texmf/fonts/tfm/public/norasi/ftnr8z.tfm,
+	utils/thaifont/texmf/fonts/tfm/public/norasi/ftnb8z.tfm,
+	utils/thaifont/texmf/fonts/tfm/public/norasi/ftnbo8z.tfm,
+	utils/thaifont/texmf/fonts/tfm/public/norasi/ftno8z.tfm: Updated.
+	* utils/thaifont/texmf/fonts/vf/public/norasi/*: Removed.
+
+	* utils/thaifont/texmf/dvips/garuda/config.garuda: New file.
+	* utils/thaifont/texmf/fonts/map/dvips/garuda/garuda.map: New file.
+	* utils/thaifont/texmf/fonts/tfm/public/garuda/fgdr8z.tfm,
+	utils/thaifont/texmf/fonts/tfm/public/garuda/fgdb8z.tfm,
+	utils/thaifont/texmf/fonts/tfm/public/garuda/fgdbo8z.tfm,
+	utils/thaifont/texmf/fonts/tfm/public/garuda/fgdo8z.tfm: New files.
+
+	* utils/thaifont/texmf/fonts/enc/dvips/thai/c90.enc: New file,
+	generated by fontinst.
+
+	* utils/thaifont/tools/c90.etx: New file.
+	* utils/thaifont/tools/c90.mtx: New file.
+	* utils/thaifont/tools/garuda.fontinst: New file.
+	* utils/thaifont/tools/norasi.fontinst: New file.
+	* utils/thaifont/tools/INSTALL: New file.
+	* utils/thaifont/tools/dbtt-old/*: New files.
+	* utils/thaifont/tools/README: Removed.
+	* utils/thaifont/tools/thai-dummy.afm: Removed.
+	* utils/thaifont/tools/thai.enc: Removed.
+	* utils/thaifont/tools/thailigs.vpl: Removed.
+
+	* texinput/thai/c90cmss.fd, texinput/thai/c90cmtt.fd,
+	texinput/thai/c90nrsr.fd: Updated.
+	* texinput/thai/c90dbss.fd: Removed.
+	* texinput/thai/c90gar.fd: New file.
+
+2005-06-27  Werner LEMBERG  <wl@gnu.org>
+
+	Remove the `rotate' keyword for vertical typesetting and introduce
+	the opposite, `norotate'.
+
+	* texinput/Bg5/c00bsmir.fdx, texinput/Bg5/c00kair.fdx: New files.
+
+	* doc/fdxfiles.doc, doc/vertical.doc, texinput/Bg5/c00bsmi.fdx,
+	texinput/GB/c10gbsn.fdx, texinput/CJKvert.sty: Updated.
+
+2005-06-25  Werner LEMBERG  <wl@gnu.org>
+
+	* examples/CJKmixed.tex: New example file to demonstrate how to
+	use CJK scripts vertically and horizontally at the same time.
+
+2005-06-24  Werner LEMBERG  <wl@gnu.org>
+
+	* doc/vertical.doc: Mention that you need an `.fdx' file if you
+	want to use rotated glyphs for vertical typesetting.
+
+2005-05-23  Werner LEMBERG  <wl@gnu.org>
+
+	* doc/CJK.doc: Improve documentation of `encapsulated' option.
+	Suggested by Brian Murphy.
+
+2005-04-26  Werner LEMBERG  <wl@gnu.org>
+
+	* texinput/UTF8/UTF8.chr (\CJK@punctchar): Wrap code after \usefont
+	into three groups to make it work with CJKulem.sty.
+
+	* texinput/CJKutf8.sty, examples/CJKutf8.tex, doc/CJKutf8.doc: New
+	files.
+
+	* doc/history.txt: Updated.
+
+2005-04-22  Werner LEMBERG  <wl@gnu.org>
+
+	* utils/lisp/emacs/cjk-enc.el (cjk-viscii-lower, cjk-viscii-upper),
+	utils/lisp/mule-2.3/cjk-enc.el (cjk-viscii-lower, cjk-viscii-upper):
+	Update to next vntex version which no longer uses dblaccnt.sty.
+
+2005-03-27  Werner LEMBERG  <wl@gnu.org>
+
+	* texinput/CJK.sty (\CJKspace): Don't use \relax but \@empty.
+
+2005-03-02  Werner LEMBERG  <wl@gnu.org>
+
+	* doc/CJK.doc: Mention `CJKbookmarks' option of hyperref package.
+
+2005-02-23  Werner LEMBERG  <wl@gnu.org>
+
+	* README: Updated.  No public CVS access possible currently.
+
+2004-07-26  Werner LEMBERG  <wl@gnu.org>
+
+	* utils/lisp/emacs/thai-word.el (thai-word-table): Use Thai word
+	list from IBM's ICU4J project; it is slightly larger and uses an
+	X license.
+
+2004-07-25  Werner LEMBERG  <wl@gnu.org>
+
+	* utils/lisp/emacs-20.3/*: Moved to...
+	* utils/lisp/emacs/*: This.
+
+	* utils/thaifont/tools/thai.enc: Minor updates.  Will be replaced
+	with a fontinst solution soon.
+
+2004-06-08  Werner LEMBERG  <wl@gnu.org>
+
+	* doc/reftex.doc: New file.
+	* doc/history.txt: Updated.
+
+2004-06-07  Werner LEMBERG  <wl@gnu.org>
+
+	* utils/lisp/emacs-20.3/cjk-enc.el (cjk-write-all-files): Handle
+	case where files are in other directories.  Bug reported by Hartwig
+	Crailsheim.
+
+	* doc/cjk-enc.doc, doc/history.txt: Updated.
+
+2004-06-04  Werner LEMBERG  <wl@gnu.org>
+
+	* contrib/wadalab/c42goth.fdx, contrib/wadalab/c42maru.fdx,
+	contrib/wadalab/c42min.fdx: Don't rotate the Hiragana-Katagana
+	prolongation mark.
+
+	* doc/vertical.doc: Updated.
+	Move text describing .fdx files to...
+	* doc/fdxfiles.doc: New file.
+
+	* texinput/CJK.sty: Minor spelling improvements.
+
+2004-06-03  Werner LEMBERG  <wl@gnu.org>
+
+	* contrib/wadalab/DNP.doc: Improve patch for wftodm.c.
+
+2004-04-29  Werner LEMBERG  <wl@gnu.org
+	    Wenchang Sun  <sunwch@hotmail.com>
+
+	Add a style file for various CJK font effects.
+
+	* texinput/CJKfntef.sty, examples/CJKfntef.tex: New files.
+	* doc/CJK.doc, doc/history.txt: Document it.
+
+2004-03-13  Werner LEMBERG  <wl@gnu.org>
+
+	* texinput/*.enc: Replace \relax with \@empty in the \CJK@namegdef
+	assignments to assure that we only have expansion at this macro
+	level.
+
+	* doc/history.txt: Updated.
+
+2004-02-08  Werner LEMBERG  <wl@gnu.org>
+
+	Bug fix: Umlaut u with diacritic appears bold.
+
+	* texinput/pinyin.sty (\py@@@v): Apply kerning at correct place.
+
+2004-02-07  Werner LEMBERG  <wl@gnu.org>
+
+	Bug fix: Umlaut u with macron above was broken.
+
+	* texinput/pinyin.sty (\py@macron): Add second argument to
+	initialize \dimen@.  Update all callers.
+
+2004-02-06  Werner LEMBERG  <wl@gnu.org>
+
+	Bug fix: Use user-defined \CJKglue value.
+
+	* texinput/CJKulem.sty (\CJK@skip): New skip register.
+	(\UL@CJKglue): Use it.
+	(\UL@hook): Initialize \CJK@skip.
+	Move assignments of \LA@CJKglue, \LA@Thaiglue, and \LA@Thaibreak
+	to here.
+
+2004-02-05  Wenchang Sun  <sunwch@hotmail.com>
+
+	Bug fix: Disable line breaks before a post-punctuation CJK glyph
+	when \uline, \uwave, etc., are used.
+
+	* texinput/CJK.sty (\CJKnobreakglue): New macro.
+	(\Unicode): Use it.
+
+	* texinput/CJKulem.sty (\UL@CJKnobreakglue): New macro.
+
+	* texinput/standard.chr, texinput/extended.chr, texinput/pmC.chr,
+	texinput/Bg5/bg5.chr, texinput/JIS/EUC-JP.chr,
+	texinput/SJIS/SJIS.chr, texinput/SJIS/SJISdnp.chr,
+	texinput/UTF8/UTF8.chr, texinput/CNS/EUC-TW.chr (\CJK@char,
+	\CJK@charx, \CJK@punctchar, \CJK@punctcharx): Use \CJKnobreakglue.
+
+2004-02-02  Hin-Tak Leung  <htl10@users.sourceforge.net>
+
+	* doc/pdf/*: New directory tree documenting usage of CJK for
+	improved PDF output.
+	* doc/history.txt: Document it.
+
+2004-01-29  Wenchang Sun  <sunwch@hotmail.com>
+
+	* texinput/CJK.sty (\CJKpunctsymbol): New \let to \CJKsymbol.
+
+	* texinput/standard.chr, texinput/extended.chr, texinput/pmC.chr,
+	texinput/Bg5/bg5.chr, texinput/JIS/EUC-JP.chr, texinput/KS/KS.chr,
+	texinput/SJIS/SJIS.chr, texinput/SJIS/SJISdnp.chr,
+	texinput/UTF8/UTF8.chr, texinput/CNS/EUC-TW.chr (\CJK@punctchar,
+	\CJK@punctcharx): Replace \CJKsymbol with \CJKpunctsymbol.
+
+2003-10-12  Werner LEMBERG  <wl@gnu.org>
+
+	A first step to allow modification of horizontal character widths
+	which is needed for CJK fonts which don't have punctuation glyphs
+	centered within the CJK square.  The same mechanism will work with
+	vertical glyphs also; since a common interface will differ from the
+	current implementation, *.fdv files are renamed to *.fdx.  Note that
+	special character width handling of punctuation characters is still
+	missing.
+
+	* texinput/CJK.sty (\CJK@load@fdx): New function, used as a hook
+	for \try@load@fontshape.  It defines the macros \CJKhdef, \CJKhlet,
+	\CJKvdef, and \CJKvlet.  The writing direction is appended to the
+	character macros -- this also fixes a bug for vertical writing
+	support with Big5 encoding (some characters disappeared in the
+	output without any warning due to character macro name clashes with
+	the subfont macro names).
+	(\CJK@direction): New macro to select the writing direction.
+	(\ifCJK@vertical@): Moved to CJKvert.sty.
+
+	* texinput/CJKvert.sty (\ifCJK@vertical@): Moved from CJK.sty.
+	(\CJKvert, \CJKhorz): Set \CJK@direction.
+	(\CJKsymbol): Updated to use writing direction.
+	(\CJK@load@fdv): Removed.
+
+	* texinput/*.chr: Simplified since \ifCJK@vertical@ is no longer
+	needed.
+
+	* texinput/*.fdv, contrib/wadalab/*.fdv: Renamed to...
+	* texinput/*.fdx, contrib/wadalab/*.fdx: This.
+
+2003-10-25  Werner LEMBERG  <wl@gnu.org>
+
+	* texinput/mule/MULEenc.sty: Fix positions of \texordfeminine and
+	\textordmasculine.
+
+2003-09-20  Werner LEMBERG  <wl@gnu.org>
+
+	With the help of Paul Eggert <eggert@twinsum.com> and Edward G.J.
+	Lee <edt1023@ms17.hinet.net>, the conversion scripts now accept
+	parameters.
+
+	* utils/Bg5conv/bg5{pdf,}latex,
+	utils/CEFconv/{cef5{pdf,}latex,cef{pdf,}latex,cefs{pdf,}latex},
+	utils/SJISconv/sjis{pdf,}latex,
+	utils/extconv/{bg5+{pdf,}latex,gbk{pdf,}latex}: Rewritten to accept
+	arguments.
+	* doc/history.txt: Updated.
+
+2003-09-16  Werner LEMBERG  <wl@gnu.org>
+
+	* utils/Bg5conv/bg5pdflatex,
+	utils/CEFconv/{cef5pdflatex,cefpdflatex,cefspdflatex},
+	utils/SJISconv/sjispdflatex,
+	utils/extconv/{bg5+pdflatex,gbkpdflatex}: New scripts to call
+	pdflatex.
+	* doc/history.txt: Updated.
+
+2003-07-06  Werner LEMBERG  <wl@gnu.org>
+
+	* texinput/mule/MULEenc.sty: Add some \@gobble macros in commands
+	defined with \mule@def.
+	Change definition of Thai EOL macro to make it really work.
+	(\mule@ignorespaces, \Thaispace, \Thainospace): New macros.
+
+	* doc/cjk-enc.doc, doc/history.txt: Document \Thaispace and
+	\Thainospace.
+
+2003-03-30  Werner LEMBERG  <wl@gnu.org>
+
+	* doc/CJK.doc: Add item how to handle \bibliography which has
+	author names containing CJK characters.
+
+	* utils/hbf2gf/hbf2gf.1: Minor workarounds for current grohtml bugs.
+
+2003-03-28  Werner LEMBERG  <wl@gnu.org>
+
+	Version 4.5.2 released
+	======================
+
+	Update version numbers and time stamps in all non-binary files.
+
+2003-03-19  Werner LEMBERG  <wl@gnu.org>
+
+	Add improved support for pseudo-vertical typesetting.  Based on
+	ideas by Robert Fendt <robert.fendt@epost.de>.
+
+	* texinput/CJK.sty (\ifCJK@vertical@): New if.
+
+	* texinput/CJKvert.sty: Require `graphicx' package.
+	(\CJKvert, \CJKhorz, \CJKvdef, \CJKvlet, \CJKsymbolsimple): New
+	commands.
+	(\CJKsymbol): Add support for vertical parameters (`rotate',
+	`offset', `fullheight, `height') in the new *.fdv files.
+	(\CJK@load@fdv): New command to be appended to LaTeX's
+	\try@load@fontshape.
+
+	* texinput/*/*.chr: Replace calls to \CJKsymbol with an extended
+	version which, if \CJKvert is active, checks the existence of a
+	macro
+
+	  \<encoding>/<family>/<series>/<shape>/<plane>/<code>
+
+	This macro is then called if it exists, instead of calling
+	\CJKsymbol.  For halfwidth katakana, the macro is called
+
+	  \<encoding>/<family>/<series>/<shape>/<code>
+
+	For HLaTeX, the macro is called
+
+	  \<encoding>/<family>/<series>/<shape>/<first byte>/<second byte>
+
+	For UTF8, only characters in the range 0x800-0xFFFF get the new
+	code.
+
+	<code>, <first byte>, and <second byte> are decimal numbers.
+
+	* contrib/wadalab/c42{goth,maru,min}.fdv,
+	contrib/wadalab/c52{maru,min}.fdv, texinput/Bg5/c00bsmi.fdv,
+	texinput/GB/c10gbsn.fdv: New files containing information for
+	vertical typesetting.
+
+	* examples/Big5vert.tex: Use font shape `bsmi'.
+
+	* doc/history.txt, doc/chinese/README, contrib/wadalab/DNP.doc,
+	doc/vertical.doc, examples/README, README: Updated.
+
+	* Makefile (DVI2PS): Load bsmilp.map and gbsnlp.map.
+	(cweb): Fix typo (cms->cmz).
+
+	* utils/hbf2gf/config.guess, utils/hbf2gf/config.sub: Updated to
+	current versions.
+
+	* utils/extconv/extconv.w: Remove duplicated lines.
+	Fix incorrect use of \@.
+	* utils/extconv/extconv.c: Regenerated.
+
+2003-03-18  Werner LEMBERG  <wl@gnu.org>
+
+	* texinput/pinyin.sty (\rua): New syllable.  While only dialect, it
+	actually is used...
+
+2003-03-12  Werner LEMBERG  <wl@gnu.org>
+
+	* texinput/pinyin.sty (\den, \chua): Add missing syllables (found by
+	Jean-Luc Koning <Jean-Luc.Koning@esisar.inpg.fr>).
+
+2003-03-07  Werner LEMBERG  <wl@gnu.org>
+
+	* texinput/pinyin.sty (\py@hy): Assure horizontal mode.
+
+2003-02-10  Werner LEMBERG  <wl@gnu.org>
+
+	* texinput/CJK.sty (\CJKchar): Make \CJKchar accept 7bit input for
+	character definitions other than standard.chr.
+	* doc/history.txt: Updated.
+
+2003-02-06  Werner LEMBERG  <wl@gnu.org>
+
+	Horizontal hints in Wadalab fonts weren't shifted vertically,
+	causing inferior results at small sizes.
+
+	* contrib/wadalab/makefont: Rewritten using awk.
+	* contrib/wadalab/fixwada: New.
+	* contrib/wadalab/DNP.doc, doc/history.txt: Updated.
+	* doc/INSTALL: Minor fixes.  Mention wadalab.doc and pfaedit.
+
+2003-01-31  Werner LEMBERG  <wl@gnu.org>
+
+	Add two commands \CJKhwkatakana and \CJKnohwkatakana to control
+	whether C49 encoding is used or whether SJIS half-width katakana are
+	mapped to full-width glyphs instead.
+
+	* texinput/CJK.sty (\CJKhwkatakana, \CJK@nohwkatakana): New commands.
+	(\ifCJK@hwkatakana@): New if-macro.
+
+	* texinput/SJIS/SJIS.chr, texinput/SJIS/SJISdnp.chr (\CJK@sjischar):
+	Add second and third parameter to call \CJK@XXX conditionally.
+	* texinput/SJIS/SJIS.enc (\CJK@SJISEncoding): Fill second and
+	third parameters for half-width katakana.
+	* texinput/SJIS/SJISdnp.enc (\CJK@SJISdnpEncoding): Ditto.
+	* doc/commands.doc, doc/CJK.doc, doc/history.txt: Updated.
+
+	* examples/README: New file.
+
+2002-07-29  Werner LEMBERG  <wl@gnu.org>
+
+	* texinput/CNS/EUC-TW.chr (\CJK@shiftchar): Pass correct parameters
+	to \CJKchar.
+
+2002-06-19  Werner LEMBERG  <wl@gnu.org>
+
+	Version 4.5.1 released
+	======================
+
+	Update version numbers and time stamps in all non-binary files.
+
+2002-06-17  Werner LEMBERG  <wl@gnu.org>
+
+	Preparation of release 4.5.1.
+
+	* README: Updated.
+	* texinput/CJK.sty, doc/CJK.doc: Require LaTeX 2001/06/01 to have
+	support for \textkra, \texttstroke, and \textTstroke.
+	Other minor documentation updates.
+	* doc/*: Updated.
+
+2002-06-16  Werner LEMBERG  <wl@gnu.org>
+
+	* doc/chinese/READMEgb.tex: Use `gbsn' font.
+	* Makefile (CJK2DVI): Remove *.toc also.
+	(LATEX2DVI): Take two arguments.
+	(LATEX): Ditto.
+	(DISTTARGETS): Add READMEb5 and pytest.
+	(READMEgb, pytest): New rules
+	(GB...): Updated.
+	(predistdoc): Create README file.
+	(distdoc): Depend also on `cweb'.
+	(cweb): New target.
+
+2002-06-14  Edward Lee  <edt1023@ms17.hinet.net>
+
+	* texinput/Bg5/c00bsmi.fd, texinput/Bg5/c00bsmir.fd: Fix typo.
+
+2002-06-13  Werner LEMBERG  <wl@gnu.org>
+
+	* Makefile: New file, used for creating the tarballs.
+	* README: Updated.
+	* texinput/GB/c10gbsn.fd, texinput/Bg5/c00bsmi.fd,
+	texinput/Bg5/c00bsmir.fd: New files for fonts from the TeXLive CD.
+	* doc/chinese/READMEb5.tex, examples/*: Changed to use the fonts
+	provided by the TeXLive CD.
+
+2002-06-12  Werner LEMBERG  <wl@gnu.org>
+
+	* texinput/JISdnp.enc (\CJK@JISdnpEncoding): Fix position of closing
+	brace.
+
+2002-06-07  Werner LEMBERG  <wl@gnu.org>
+
+	* texinput/thai/c90enc.def: New file, contributed by Dominique
+	Unruh <dominique@unruh.de>.
+	* texinput/thai/thaicjk.ldf: Use it.
+	* doc/history.txt: Updated.
+
+2002-05-16  Werner LEMBERG  <wl@gnu.org>
+
+	* doc/cjk-enc.doc: Document behaviour for master files without CJK
+	characters.
+	* doc/CJK.doc: Explain usage of `~' for BibTeX.
+
+2002-05-10  Werner LEMBERG  <wl@gnu.org>
+
+	* texinput/CJKnumb.sty (\CJKnullspace): New macro to control the
+	additional space inserted before and after a circle used as a
+	CJK zero digit.
+	* doc/history.txt: Updated.
+
+2002-05-09  Werner LEMBERG  <wl@gnu.org>
+
+	* texinput/CJKnumb.sty (\CJK@traditionalNumbers,
+	\CJK@simplifiedNumbers): New macros.
+	Use them for GB, GBK, Bg5, Bg5+ hooks.
+
+2002-05-01  Werner LEMBERG  <wl@gnu.org>
+
+	* doc/commands.doc: Minor fix.
+
+	* utils/hbf2gf/config.guess, utils/hbf2gf/config.sub: Updated to
+	current versions.
+	* utils/hbf2gf/configure.in: Renamed to...
+	* utils/hbf2gf/configure.ac: This.
+	Updated to autoconf 2.53.
+	* utils/hbf2gf/configure: Regenerated with autoconf 2.53.
+	* utils/hbf2gf/README: Text improved.
+	* utils/hbf2gf/hbf2gf.1: Minor typographical fixes.
+
+2002-04-30  Werner LEMBERG  <wl@gnu.org>
+
+	* texinput/CJK.sty (\CJK@errxx, \CJKindent): New macros.
+	* texinput/CJK.enc (\CJK@spaceChar): Define it for all encodings.
+	It is used by \CJKindent.
+	(\CJK@KSHL@enc): Add \CJK@min and \CJK@max.
+	* texinput/SJIS/SJISdnp.enc (\CJK@SJISdnpEncoding),
+	texinput/JIS/JISdnp.enc (\CJK@JISdnpEncoding),
+	texinput/KS/HLaTeX/KSHL.enc (\CJK@KSHLEncoding): Use \CJK@errxx
+	for unused slots.
+
+	* doc/history.txt, doc/commands.doc: Document \CJKindent.
+
+	* utils/CEFconv/cef5conv.w, utils/CEFconv/cefconv.w: Fix
+	documentation errors.
+	* utils/CEFconv/cef5conv.c, utils/CEFconv/cefconv.c: Regenerated.
+
+2002-04-29  Werner LEMBERG  <wl@gnu.org>
+
+	* texinput/CJK.sty (\pickup@font): Add comment character.
+
+2002-04-28  Werner LEMBERG  <wl@gnu.org>
+
+	Preparation of release 4.5.0.
+
+	* README: Updated.
+
+2002-04-27  Werner LEMBERG  <wl@gnu.org>
+
+	* texinput/CJK.sty (\CJKsymbol, \CJKsymbols): Simplified.
+	(\Unicode, \CJKenc): Fix error text.
+
+2001-10-08  Mike Fabian <mfabian@suse.de>
+
+	* contrib/wadalab/c42goth.fd: Use `dgj' for normal series and add
+	`\CJKbold' for bold series.
+
+2001-07-31  Werner LEMBERG  <wl@gnu.org>
+
+	* doc/CJK.doc: Note use of \cleardoublepage if problems occur with
+	two-column printing.
+
+2001-07-27  Fabrice Popineau  <Fabrice.Popineau@supelec.fr>
+
+	* utils/cjklatex/cjklatex.c: New file.
+
+2001-06-27  Werner LEMBERG  <wl@gnu.org>
+
+	* doc/CJK.doc: Add info how to use a CJK environment in the
+	preamble.
+	* doc/cjk-enc.doc: Simplify usage of AUC TeX.
+	Modify definition of `TeX-run-CJK-LaTeX' to handle directories
+	properly.
+
+2001-06-15  Werner LEMBERG  <wl@gnu.org>
+
+	* texinput/CJK.enc (\CJK@disableMakeUppercase): Define it as \relax
+	if in preprocessed mode.
+
+2001-06-14  HANDA Ken'ichi  <handa@etl.go.jp>
+
+	* utils/lisp/emacs-20.3/cjk-enc.el (cjk-set-buffer-multibyte):
+	Use backquote operator to make cjk-enc.elc work correctly.
+
+2001-06-08  Werner LEMBERG  <wl@gnu.org>
+
+	The next LaTeX release will use \textkra, \texttstroke, and
+	\textTstroke for the missing latin-4 characters.
+
+	* texinput/mule/MULEenc.sty: Use \textkra.  Add \TEXTTSTROKE.
+	* utils/lisp/emacs-20.3/cjk-enc.el, utils/lisp/mule-2.3/cjk-enc.el:
+	Use \texttstroke and \TEXTTSTROKE.
+
+2001-05-26  Werner LEMBERG  <wl@gnu.org>
+
+	* texinputs/CJK.sty: Restore EOL character before loading `CJK.cfg'.
+
+2001-05-18  Werner LEMBERG  <wl@gnu.org>
+
+	* contrib/wadalab/DNP.doc: Document installation for pdfTeX.
+	* contrib/wadalab/makefont: Updated to normalize font matrix of
+	PS fonts.
+
+2001-04-24  Werner LEMBERG  <wl@gnu.org>
+
+	* utils/hbf2gf/config.guess, utils/hbf2gf/config.sub: Updated to
+	latest version from gnu.org.
+
+2001-04-21  Werner LEMBERG  <wl@gnu.org>
+
+	* examples/muletest.tex: Remove Thai support so that this file can
+	really be run with Mule 2.3.
+	Update comment.
+	* example/CJKbabel.tex, example/rubytest.tex: Update comment.
+
+	* utils/lisp/emacs-20.3/cjk-enc.el (cjk-format-spec-table): Fix
+	Thai.
+	* texinput/mule/MULEenc.sty (\mule@char): Don't use delimiter.
+	* texinput/SJIS/sjisdnp.enc: Update this file also to the changes
+	introduced 2001-03-15.
+
+2001-04-17  Werner LEMBERG  <wl@gnu.org>
+
+	* examples/*.tex: Added local variables for Emacs to specify
+	encoding.
+	* doc/history.txt: Emphasize the need of local variables for the
+	encoding if `cjk-enc.el' is used.
+
+2001-04-02  Werner LEMBERG  <wl@gnu.org>
+
+	* utils/lisp/emacs-20.3/cjk-enc.el: Fix documentation to follow
+	Elisp documentation conventions.
+
+2001-04-01  Werner LEMBERG  <wl@gnu.org>
+
+	Make UTF8 encoding work in TOC.
+
+	* texinput/CJK.sty (\CJK@namedef): New macro.
+	* texinput/UTF8/UTF8.bdg: Use it.
+
+2001-03-28  Werner LEMBERG  <wl@gnu.org>
+
+	* texinput/mule/MULEenc.sty: Use \textnumero instead of \CYRNo
+	(found by Vladimir Volovich).
+
+2001-03-18  Werner LEMBERG  <wl@gnu.org>
+
+	* utils/lisp/cjkspace.el, INSTALL: Fix documentation.
+
+2001-03-15  Werner LEMBERG  <wl@gnu.org>
+
+	A major change: Preprocessed and non-preprocessed mode can be used
+	simultaneously!  For example, you can now use include a file encoded
+	in UTF-8 in another file encoded in Big5.
+
+	To achieve this, ^^7f will always start a command in preprocessed
+	mode, even for CJK macros.
+
+	* texinput/CJK.sty: Require MULEenc.sty.
+	Remove ^^7f handling.
+	Remove preprocessed versions of \CJK@XX, \CJK@XXX, and \CJK@XXXX.
+	(\CJKcaption): Always include .cpx files.
+
+	* texinput/CJK.enc (\CJK@disableMakeUppercase): New macro.
+	(\CJK@shiftError): New macro.
+	(\CJK@unicodeError): New macro.
+	(\CJK@makeEnvironment): Don't handle \MakeUppercase.
+	(\CJK@*@enc): Always use `true' branch in \CJKpreproc conditionals.
+
+	* texinput/mule/MULEenc.sty (\mule@@@arg, \mule@def): Use \string.
+	(\mule@@def): New function to set up macros for leading bytes in the
+	range ^^81-^^fe.
+	* texinput/extended.enc (\CJK@extendedEncoding),
+	texinput/Bg5/Bg5.enc (\CJK@Bg5Encoding), texinput/SJIS/SJIS.enc
+	(\CJK@SJISEncoding): Use \CJK@disableMakeUppercase.
+	* texinput/pmCbig.enc (\CJK@pmCbigEncoding), texinput/pmCsmall.enc
+	(\CJK@pmCsmallEncoding), texinput/standard.enc
+	(\CJK@standardEncoding): Add \relax.
+	* texinput/CNS/EUC-TW.enc (\CJK@EUC-TWEncoding),
+	texinput/JIS/EUC-JP.enc (\CJK@EUC-JPEncoding): Use \CJK@shiftError
+	for single shifts.  Add	\relax for all other macros.
+	* texinput/UTF8/UTF8.enc (\CJK@UTF8Encoding): Use \CJK@unicodeError
+	for three-byte sequences.  Add \relax for all other macros.
+
+	* texinput/*/*.cpx: Updated to new preprocessing scheme.
+
+	* utils/*conv/*conv.w: Updated to new preprocessing scheme.
+	* utils/*conv/*conv.c: Regenerated.
+
+	* utils/lisp/emacs-20.3/cjk-enc.el (cjk-format-spec-table): Updated
+	to new preprocessing scheme.
+	(cjk-encode): Fix file header insertion strings.
+	* utils/lisp/mule-2.3/cjk-enc.el (cjk-enc-table): Updated to new
+	preprocessing scheme.
+	(cjk-encode): Fix file header insertion strings.
+
+	* doc/*: Updated and revised.
+
+2001-03-13  Werner LEMBERG  <wl@gnu.org>
+
+	Implement \CJKinput.
+
+	* mule/MULEenc.sty (\CJKinput): New macro.
+	(\CJKinclude): Fix error message.
+
+	* utils/lisp/emacs-20.3/cjk-enc.el (cjk-write-all-files): Update
+	docstring.
+	(tex-input-regexp): New test for \CJKinput.
+	(do-batch-cjk-write-file): Fix typo.
+
+	* texinput/thai/thaicjk.ldf: Fix typo.
+
+2001-02-21  Werner LEMBERG  <wl@gnu.org>
+
+	* doc/INSTALL: Minor improvements.
+
+2001-02-13  Werner LEMBERG  <wl@gnu.org>
+
+	* utils/hbf2gf/config.{guess,sub}: Updated (from ftp.gnu.org).
+
+2000-12-17  Werner LEMBERG  <wl@gnu.org>
+
+	* utils/SJISconv/sjisconv.w: Fix typo ff -> 7f.
+	* utils/CEFconv/cef5conv.w, utils/CEFconv/cefconv.w: Ditto.
+
+	* utils/*conv/*conv.w: \XXXpreproc will now contain the version of
+	the conversion program.
+	* utils/*conv/*conv.c: Updated.
+
+	* doc/history.txt: Updated.
+
+	* all files: Version number changed to 4.4.0.
+
+2000-12-03  Werner LEMBERG  <wl@gnu.org>
+
+	* utils/hbf2gf/configure.in: Fix kpathsea checking message.
+	* utils/hbf2gf/configure: Updated.
+
+2000-12-02  Werner LEMBERG  <wl@gnu.org>
+
+	* doc/cjk-enc.doc: Clarify usage of cjk-coding.
+	* doc/INSTALL: Add hints how to use kpsewhich to check
+	configuration.
+
+2000-12-01  Werner LEMBERG  <wl@gnu.org>
+
+	* doc/INSTALL: Fix documentation of --with-kpathsea-include.
+	* doc/cjk-enc.doc: Fix typo.
+
+2000-09-21  Werner LEMBERG  <wl@gnu.org>
+
+	* texinput/{CJK.sty, CJKulem.sty, pinyin.sty, ruby.sty}: Replacing
+	some \ifdim with \ifnum.
+
+2000-09-20  Werner LEMBERG  <wl@gnu.org>
+
+	* texinput/CJKulem.sty: Fixed two nasty bugs (spotted by Sim Ing
+	<sim@ubs-aptsocap.org>): No underlining for \CJKglue and no \CJKglue
+	before and after \uline.
+
+2000-08-28  Werner LEMBERG  <wl@gnu.org>
+
+	* utils/thaifont/texmf/dvips/config/config.{norasi,dbtt}: New files.
+	* doc/thaifont.doc: Added info about PS font configuration.
+
+2000-08-24  Werner LEMBERG  <wl@gnu.org>
+
+	* utils/lisp/emacs-20.3/thai-word.el (thai-update-word-table): Add
+	documentation string.
+
+2000-08-24  HANDA Ken'ichi  <handa@etl.go.jp>
+
+	* utils/lisp/emacs-20.3/thai-word.el (thai-update-word-table): New
+	function.
+	(thai-find-word-ends): Fix loop.
+
+2000-08-23  Werner LEMBERG  <wl@gnu.org>
+
+	* texinput/thai/thaicjk.ldf: Remove warning about nonexistent
+	hyphenation patterns.
+
+2000-08-20  Werner LEMBERG  <wl@gnu.org>
+
+	Another big sigh.  Wrong glyph names for Norasi's Thai digits.
+	Additionally, all ligature rules no longer use `>' to make kerning
+	possible.
+
+	* utils/thaifont/texmf/dvips/base/norasi.enc: Fixed.
+	* utils/thaifont/tools/{thai.enc,thailigs.vpl}: Updated.
+	* utils/thaifont/texmf/fonts/{tfm,vf}/public/{dbtt,norasi}/*:
+	Regenerated.
+
+2000-08-19  Werner LEMBERG  <wl@gnu.org>
+
+	* examples/thai.tex: New file.
+	* doc/history.txt: Updated.
+
+	* examples/CJKbabel.tex: Doc fixes.
+
+2000-08-17  Werner LEMBERG  <wl@gnu.org>
+
+	* doc/cjk-enc.el, doc/thaifont.doc: Give better URL for thailatex
+	package.
+
+2000-08-15  Werner LEMBERG  <wl@gnu.org>
+
+	Sigh, another forgotten Thai ligature rule.
+
+	* utils/thaifont/tools/{thai.enc,thailigs.vpl}: Updated.
+	* utils/thaifont/texmf/fonts/{tfm,vf}/public/{dbtt,norasi}/*:
+	Regenerated.
+
+2000-08-15  Werner LEMBERG  <wl@gnu.org>
+
+	* texinput/thai/c90{cmr,cmss.cmtt}.fd: Make font substitution
+	silent.
+
+	* utils/thaifont/texmf/dvips/base/norasi.enc: Fixing typo.
+	* utils/thaifont/texmf/fonts/{tfm,vf}/public/norasi/*: Updated.
+
+2000-08-13  Werner LEMBERG  <wl@gnu.org>
+
+	Improved support for Thai.
+
+	* doc/thaifont.doc: New file.
+
+	* utils/thaifont/*: Metrics and support files for Thai fonts.
+
+	* texinput/thai/c90{nrsr,dbss}.fd: New font definition files for
+	dbtt and norasi font families.
+	* texinput/thai/c90{cmr,cmss,cmtt}.fd: Font alias files.
+	* texinput/thai/thaicjk.ldf: New file for thai support in Babel.
+	* texinput/thai/thai.sty: Removed.
+
+	* utils/lisp/emacs20.3/cjk-enc.el: Redesigned Thai support by
+	HANDA Ken'ichi <handa@etl.go.jp>.
+	Will now run under XEmacs also (with help of Martin Buchholz
+	<martin@xemacs.org>).  No Thai support yet due to limitations in
+	current XEmacs version (21.2).
+	(cjk-write-all-files): New optional argument to force the processing
+	of all files.
+	(do-batch-cjk-write-file): New function.
+	(batch-cjk-write-file): Use do-batch-cjk-write-file.
+	(batch-force-cjk-write-file): New function.  Uses
+	do-batch-cjk-write-file also.
+	* utils/lisp/mule-2.3/cjk-enc.el: Rename write-cjk-file to
+	cjk-write-file for consistency.
+	* utils/lisp/emacs20.3/thai-word.el: New file written by HANDA
+	Ken'ichi for Thai word breaking support.  Replaces thaiconv.
+	* utils/thaiconv: Removed.
+
+	* utils/lisp/emacs20/cjk-enc.el: Removed.  No longer supported.
+
+	* texinput/mule/MULEenc.sty: Adapted to new cjk-enc.el version.
+	Make it robust for CJKulem.sty.
+
+	* examples/CJKbabel.tex: Use CJKulem.sty and thaicjk module for
+	Babel.
+	* examples/muletest.tex: Remove \if... \fi clause for Thai.
+
+	* doc/history.txt, doc/INSTALL: Updated.
+
+2000-08-12  Werner LEMBERG  <wl@gnu.org>
+
+	* texinput/CJKulem.sty: New file which provides CJK support for
+	ulem.sty.
+	* doc/history.txt, doc/CJK.doc: Updated.
+
+2000-08-09  Werner LEMBERG  <wl@gnu.org>
+
+	* utils/hbf2gf/configure.in: Replaced --with-kpathsea-dir with
+	--with-kpathsea-lib and --with-kpathsea-include.
+	* utils/hbf2gf/configure, doc/history.txt, doc/INSTALL,
+	doc/hbf2gf.doc: Updated.
+
+	* texinput/CJK.sty, texinput/mule/MULEenc.sty: New command
+	\CJKverbatim which disables \Thaiglue and \CJKglue in verbatim
+	environments if the `verbatim' package is loaded.
+	* doc/history.txt, doc/CJK.doc, doc/commands.doc: Updated.
+
+2000-07-30  Werner LEMBERG  <wl@gnu.org>
+
+	* utils/hbf2gf/config.guess, utils/hbf2gf/config.sub: Updated to
+	latest version from ftp.gnu.org.
+
+2000-07-27  Werner LEMBERG  <wl@gnu.org>
+
+	* utils/thaiconv/thaiconv.c: Improve comment.
+
+	* *.fd: Set \hyphenchar to -1 for all CJK fonts.
+
+2000-06-23  Werner LEMBERG  <wl@gnu.org>
+
+	* utils/hbf2gf/config.guess, utils/hbf2gf/config.sub: Updated to
+	latest version from ftp.gnu.org.
+
+	* texinput/CJK.enc: Removed redefinition of C42 and C49.
+
+2000-05-03  Werner LEMBERG  <wl@gnu.org>
+
+	* texinput/CJK.sty: Specifying an optional argument to the `CJK'
+	size function will no longer produce a warning message for each
+	subfont.
+
+	* contrib/wadalab/*.fd, doc/CJK.doc, doc/fonts.doc: Wadalab PS fonts
+	now use `CJK' size functions instead of `DNP' ones.
+
+	* doc/history.txt: Updated.
+
+2000-05-02  Werner LEMBERG  <wl@gnu.org>
+
+	* texinput/*/*.cpx: Replace incorrect 0xFF with 0x7F.
+
+2000-04-18  Werner LEMBERG  <wl@gnu.org>
+
+	* texinput/CJK.sty, texinput/pinyin.sty, texinput/ruby.sty:
+	Balancing the small kern control values, e.g. using
+	`\kern -1sp\kern 1sp' instead of `\kern 1sp' only.
+
+	Replacing kern value of 3sp with 5sp to avoid clash with ulem.sty.
+
+2000-04-01  Werner LEMBERG  <wl@gnu.org>
+
+	Version 4.3.0 released
+	======================
+
+	This version exists on the Tex Live CD 5 only; a lot of files have
+	been adapted to the special needs of the CD's texmf tree -- these
+	changes are not in the CVS tree.
+
+2000-03-15  Werner LEMBERG  <wl@gnu.org>
+
+	* contrib/wadalab/wadalab.map: Renamed from Wadalab.map
+	* contrib/wadalab/DNP.doc: Updated accordingly.
+
+	* utils/hbf2gf/cfg/*: Updated -- if possible, the foundry is used
+	as the target directory instead of the encoding, e.g.
+	`tfm/ntu/b5ka12'.
+
+2000-03-14  Werner LEMBERG  <wl@gnu.org>
+
+	* texinput/SJIS/SJISdnp.{chr,enc}: New files to support SJIS
+	encoding with DNP fontencoding.
+	* texinput/CJK.enc: Add SJISdnp.
+	Add forgotten punctuation pattern macro to KSHL encoding.
+	* doc/history.txt, doc/CJK.doc, doc/command.doc: Update.
+
+2000-03-13  Werner LEMBERG  <wl@gnu.org>
+
+	* texinput/CJK.sty: Fixing definition of ^^7f to do nothing if
+	written to the TOC file.
+
+2000-03-12  Werner LEMBERG  <wl@gnu.org>
+
+	* texinput/KS/HLaTeX/pshan.sty: Fix typo.
+
+	Call \mj to activate default family correctly.
+
+	* contrib/wadalab/makefont: Add echo commands.
+	* contrib/wadalab/DNP.doc: Updated. Add info about gsftopk.
+
+2000-03-03  Werner LEMBERG  <wl@gnu.org>
+
+	* utils/hbf2gf/README: New file.
+	* utils/hbf2gf/hbf2gf.1, doc/hbf2gf.doc: Small improvements.
+
+	* README: Removed `romaji environment' from TODO section.  According
+	to HANDA Ken'ichi <handa@etl.go.jp> it is impossible to provide
+	hyphenation patterns for transcribed Japanese without semantic
+	analysis.
+
+2000-03-02  Werner LEMBERG  <wl@gnu.org>
+
+	* README, doc/INSTALL: Slight improvements.
+
+	* utils/hbf2gf/Makefile.in, utils/hbf2gf/configure.in: Fix incorrect
+	test for NO_STRDUP.  Thanks to <Andries.Brouwer@cwi.nl>.
+
+2000-02-06  Werner LEMBERG  <wl@gnu.org>
+
+	* texinput/CJK.sty, texinput/mule/MULEenc.sty,
+	utils/lisp/*/cjk-enc.el, utils/*conv/*conv.[cw], history.txt,
+	CJK.doc, cjk-enc.doc: Use 0x7F both as the multiplex character and
+	as a delimiter -- apparently no package uses this character...
+	This solves all problems with \uppercase and \lowercase.
+
+	* utils/hbf2gf/cfg/j2so12.cfg: Added `min_char' parameter to get
+	correct offsets (thanks to Martin Minich
+	<minich5@kepler.fmph.uniba.sk> for finding this bug).
+
+2000-01-26  Werner LEMBERG  <wl@gnu.org>
+
+	* doc/cjk-enc.doc, doc/history.txt, examples/CJKbabel.tex,
+	examples/muletest.tex, texinput/mule/MULEenc.sty,
+	utils/lisp/*/cjk-enc.el: Change X5 to T5.
+
+2000-01-20  Werner LEMBERG  <wl@gnu.org>
+
+	* examples/muletest.tex: Greek added; updated to X5 encoding.
+	* examples/CJKbabel.tex: Greek added; updated to X5 encoding.
+
+	* texinput/mule/MULEenc.sty: Use \AtBeginDocument for \mule@<accent>
+	definitions.
+
+2000-01-14  Werner LEMBERG  <wl@gnu.org>
+
+	* doc/cjk-enc.doc: Added info about file variables to specify
+	document encoding.
+
+2000-01-03  Ching-Mo CHANG  <chingmo@mail.onweb.com.tw>
+
+	* utils/lisp/emacs-20.3/cjk-enc.el (cjk-write-all-files): Always
+	returned nul for include and bib file names due to incorrect
+	pattern matching.
+
+1999-12-18  Werner LEMBERG  <wl@gnu.org>
+
+	* utils/hbf2gf/configure.in: Removed `-pedantic' flag which causes
+	problems with newer gcc versions.
+
+1999-11-19  Werner LEMBERG  <wl@gnu.org>
+
+	* examples/muletest.tex, examples/CJKbabel.tex: Fixing a typo.
+
+1999-11-07  Werner LEMBERG  <wl@gnu.org>
+
+	* doc/CEF.doc: Minor fixes.
+
+	* doc/CJK.doc: Updated; minor fixes.
+
+1999-11-06  Werner LEMBERG  <wl@gnu.org>
+
+	* doc/cjk-enc.doc, doc/commands.doc, doc/fonts.doc: Minor fixes.
+
+	* doc/vertical.doc, doc/history.txt: Updated.
+
+1999-11-05  Werner LEMBERG  <wl@gnu.org>
+
+	* texinput/mule/MULEenc.sty: Added \CJKinclude{<file>} and
+	\CJKbibliography{<file>}.  These functions act identically to
+	\include resp. \bibliography but load <file>.cjk
+	resp. <file>-cjk.bib.
+
+	* utils/lisp/emacs-20.3/cjk-enc.el: Using `cjk' throughout as the
+	prefix to variable and function names.  This causes a renaming of
+	virtually all functions.  Some other local variables were renamed
+	also for consistency.
+
+	Changing ET5 to X5 encoding for Vietnamese.
+
+	(decompose-char): Removed.  Not needed at all.
+
+	(cjk-tex-in-comment): New function.  Similar to AUC TeX's
+	TeX-in-comment function; has been added to be independent from AUC
+	TeX.
+
+	(cjk-write-all-files): New function.  It checks for \CJKinclude
+	and \CJKbibliography commands in the master file and converts the
+	referenced files accordingly if necessary.  Intended as a hook to
+	AUC TeX to make multiple files work as expected.
+
+1999-11-02  Werner LEMBERG  <wl@gnu.org>
+
+	* doc/cjk-enc.doc: Small improvement in explanation of usage with
+	AUC TeX.
+
+1999-10-24  Werner LEMBERG  <wl@gnu.org>
+
+	* utils/lisp/emacs-20.3/cjk-enc.el (get-cjk-name): New function.
+
+	(file-write-cjk-file, batch-write-cjk-file): New functions which
+	do the same as write-cjk-file but operate on a given file (resp. a
+	suite of files and directories given on the command line).
+
+	(write-cjk-file): Will now properly ask for a file name if the
+	current buffer is not visiting a file.
+
+	* doc/cjk-enc.doc: Expanded TeX-translate-location-hook to cover
+	CJK BibTeX input files also.
+
+	TeX-run-CJK-LaTeX now checks whether it must call write-cjk-file
+	at all (emacs > 20.3 only).
+
+1999-10-07  Werner LEMBERG  <wl@gnu.org>
+
+	* texinput/mule/MULEenc.sty: Removed \textendash wrapper macro.
+
+	* utils/lisp/{emacs-20.3,emacs-20,mule-2.3}/cjk-enc.el: Added
+	iso-8859-9 (Greek) support (mapped to LGR encoding as used in the
+	Babel package).
+
+	Fixed character `SOFT-HYPHEN' in iso-8859-x encodings (using `\-'
+	instead of \textendash).
+
+	* README, doc/cjk-enc.doc, doc/history.txt: Updated.
+
+	* doc/CJK.doc: Fixed a typo.
+
+	* texinput/CJK.enc, texinput/CJK.sty, texinput/*/{*.cap,*.cpx}:
+	Replaced `\ifx\foo \undefined' with `\@ifundefined{}{}' to fix the
+	case that a not-defined macro has been tested with \@ifundefined
+	before.  In this case, it is no longer undefined but identical to
+	\relax.
+
+	* texinput/pmC.chr: Fixed punctuation macros for pmC.
+
+1999-10-02  Werner LEMBERG  <wl@gnu.org>
+
+	* texinput/pinyin.sty: The method with appending `\-' to all
+	syllables fails (stupid I am :-), so here a solution which really
+	works.  It uses a small kern (4sp, similar to the ruby and CJK
+	packages) to tell the following pinyin syllable that a
+	discretionary has to be inserted.
+
+1999-10-01  Werner LEMBERG  <wl@gnu.org>
+
+	* texinput/mule/MULEenc.sty: \lccode and \uccode of ^^ff must not
+	be modified, otherwise hyphenation patterns containing \ss will
+	fail (which happens e.g. in German).
+
+1999-09-28  Werner LEMBERG  <wl@gnu.org>
+
+	* doc/history.txt: Updated.
+
+	* utils/pyhyphen/pyhyph.tex, utils/pyhyphen/pytest.tex,
+	utils/pyhyphen/pinyin.ldf, doc/pyhpyhen.doc: Hyphenation patterns
+	for unaccented pinyin syllables to be used with the Babel package.
+
+	* utils/pyhyphen/pinyin.c, utils/pyhpyhen/pinyin.tr: Utility files
+	for creating pinyin hyphenation patterns.
+
+1999-09-27  Werner LEMBERG  <wl@gnu.org>
+
+	* doc/history.txt: Updated.
+
+1999-09-21  Werner LEMBERG  <wl@gnu.org>
+
+	* texinput/pinyin.sty: Adding hyphenation points at the end of all
+	syllables.
+
+1999-09-18  Werner LEMBERG  <wl@gnu.org>
+
+	* texinput/pinyin.sty: Making accent commands like \py@a robust.
+
+	Added option `useCMmacron' (for LaTeX only) to use a macron accent
+	from the CM fonts in case the used font doesn't have it
+	(e.g. some versions of virtual files for Palatino).
+
+1999-08-26  Werner LEMBERG  <wl@gnu.org>
+
+	* utils/hbf2gf/hbf2gf.1: Added some documentation how to find out
+	the expanded value of a kpathsea variable (like $MISCFONT).
+
+1999-08-07  Werner LEMBERG  <wl@gnu.org>
+
+	* utils/thaiconv/thaiconv.c (adj): Fixed invalid array index in
+	case of marks without base characters.
+
+1999-07-07  Werner LEMBERG  <wl@gnu.org>
+
+	* texinput/Bg5/Bg5.chr,
+	  texinput/extended.chr: Fixed a typo \CJK@temp->\CJK@gtemp
+
+1999-06-30  Werner LEMBERG  <wl@gnu.org>
+
+	* utils/lisp/emacs-20/cjk-enc.el,
+	  utils/lisp/emacs-20.3/cjk-enc.el,
+	  utils/lisp/mule-2.3: Fixed code for 0x80 multiplex character.
+
+1999-06-22  Werner LEMBERG  <wl@gnu.org>
+
+	* doc/TDS.doc: Completely revised.
+
+1999-06-10  Werner LEMBERG  <wl@gnu.org>
+
+	* utils/hbf2gf/configure.in: Removed `-ansi' flag which can cause
+	problems with the kpathsea library (which is not compiled with
+	-ansi).
+
+1999-06-07  Werner LEMBERG  <wl@gnu.org>
+
+	* utils/hbf2gf/hbf2gf.1: Added documentation about MiKTeX.
+
+	* utils/hbf2gf/hbf2gf.w: Added support for MiKTeX file search
+	library.
+
+	* texinput/CEF/*.fd: Removed -- these files were erroneously
+	included into the CVS repository.
+
+1999-06-04  Werner LEMBERG  <wl@gnu.org>
+
+	* *.fd files: minor documentation addition regarding font
+	encoding.
+
+	* all files: Changed date/version to 4.3.0.
+
+1999-06-02  Werner LEMBERG  <wl@gnu.org>
+
+	* README: Added info about http and ftp home sites and how to
+	access the CVS repository.
+
+1999-06-01  Werner LEMBERG  <wl@gnu.org>
+
+	* README: Added info about CVS mailing list.
+
+1999-05-29  Werner LEMBERG  <wl@gnu.org>
+
+	* README: Added mailing list.
+
+	* doc/INSTALL: Small correction.
+
+	* README: Small additions.
+
+;; Local Variables:
+;; coding: utf-8
+;; End:
+
+    Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+      Werner Lemberg <wl@gnu.org>
+
+  This file is part of the CJK package for using Asian logographs
+  (Chinese/Japanese/Korean) with LaTeX2e.
+
+  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, 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 GNU Emacs; see the file COPYING.  If not, write to the
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.2/README b/Build/source/texk/cjkutils/cjkutils-4.8.2/README
new file mode 100644
index 00000000000..f66b64c24ec
--- /dev/null
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.2/README
@@ -0,0 +1,35 @@
+Welcome to CJK version 4.8.2 (29-Dec-2008), a LaTeX2e macro package which
+enables the use of CJK scripts (Chinese/Japanese/Korean) in various
+encodings, written by Werner Lemberg <wl@gnu.org>.
+
+A mailing list exists at cjk@ffii.org; bugs should be sent to
+cjk-bug@ffii.org.  To subscribe one of the lists, send a mail with the
+subject `subscribe' (without the quotes) to <list>-request@ffii.org, e.g.,
+cjk-request@ffii.org.
+
+If you are interested in the process of development you may observe
+
+  http://git.savannah.gnu.org/gitweb/?p=cjk.git;a=summary
+
+to see the commitments to the git repository of the CJK package, and which
+also provides snapshots.
+
+The home site of the CJK package is
+
+  http://cjk.ffii.org
+
+Additionally, the latest non-development version can be found on all CTAN
+hosts and its mirrors in the directory <CTAN>/language/chinese.
+
+
+The package comes in two parts:
+
+    cjk-4.8.2.tar.gz:       The source files. Needed for all platforms.
+    cjk-4.8.2-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
+thus get all files and subdirectories from language/chinese/CJK/.
+
+
+---End of README---
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.2/SJISconv/sjisconv.1 b/Build/source/texk/cjkutils/cjkutils-4.8.2/SJISconv/sjisconv.1
new file mode 100644
index 00000000000..0ffd2460885
--- /dev/null
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.2/SJISconv/sjisconv.1
@@ -0,0 +1,110 @@
+.\" man page for sjisconv
+.\" Copyright (C) 1994-2008  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
+.
+.TH SJISCONV 1 29-Dec-2008 "CJK Version 4.8.2"
+.
+.\" ====
+.\" ==== macro definitions
+.\" ====
+.
+.\" here we define \TeX for troff and nroff
+.if t .ds TX \fRT\\h'-0.1667m'\\v'0.20v'E\\v'-0.20v'\\h'-0.125m'X\fP
+.if n .ds TX TeX
+.
+.\" and here the same for \LaTeX
+.if t \{\
+.ie '\*(.T'dvi' \
+.ds LX \fRL\h'-0.36m'\v'-0.15v'\s-3A\s0\h'-0.15m'\v'0.15v'\fP\*(TX
+.el .ds LX \fRL\h'-0.36m'\v'-0.22v'\s-2A\s0\h'-0.15m'\v'0.22v'\fP\*(TX
+.\}
+.if n .ds LX LaTeX
+.
+.\" \LaTeXe
+.\" note that we need \vareps for TeX instead of \eps which can only be
+.\" accessed with the \N escape sequence (in the Math Italic font)
+.if t \{\
+.ie '\*(.T'dvi' .ds LE \*(LX\h'0.15m'2\v'0.20v'\f(MI\N'34'\fP\v'-0.20v'
+.el .ds LE \*(LX\h'0.15m'2\v'0.20v'\(*e\v'-0.20v'
+.\}
+.if n .ds LE LaTeX\ 2e
+.
+.\" a typewriter font
+.if t \{\
+.de C
+\fC\\$1\fP\\$2
+..
+.\}
+.if n \{\
+.de C
+\\$1\\$2
+..
+.\}
+.
+.\" ====
+.\" ==== end of macro definitions
+.\" ====
+.
+.
+.
+.SH NAME
+sjisconv \- convert a TeX document in SJIS encoding into `preprocessed'
+form.
+.
+.
+.SH SYNOPSIS
+.B sjisconv
+<
+.I infile
+>
+.I outfile
+.
+.
+.SH DESCRIPTION
+SJIS encoding for Japanese uses the characters
+.C { ,
+.C } ,
+and
+.C \e
+which have special meanings in \*(TX
+documents.
+.PP
+After processing a \*(LE
+document which contains SJIS characters with
+.B \%sjisconv
+you need not care about these special characters.
+.PP
+This filter is part of the
+.B CJK
+macro package for \*(LE.
+.
+.
+.SH "SEE ALSO"
+.BR bg5conv (1),
+.BR \%cefconv (1),
+.BR cef5conv (1),
+.BR \%cefsconv (1),
+.BR \%extconv (1),
+.br
+the
+.B CJK
+documentation files.
+.
+.
+.SH AUTHOR
+Werner Lemberg
+.C <wl@gnu.org>
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.2/SJISconv/sjisconv.c b/Build/source/texk/cjkutils/cjkutils-4.8.2/SJISconv/sjisconv.c
new file mode 100644
index 00000000000..6b1b5409bf3
--- /dev/null
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.2/SJISconv/sjisconv.c
@@ -0,0 +1,36 @@
+#define banner  \
+"sjisconv (CJK ver. 4.8.2)" \
+
+/*2:*/
+#line 93 "/home/wl/git/cjk/cjk-4.8.2/utils/SJISconv/sjisconv.w"
+
+#include <stdio.h> 
+#include <stdlib.h> 
+
+
+int main(argc,argv)
+int argc;
+char*argv[];
+
+{int ch;
+
+fprintf(stdout,"\\def\\CJKpreproc{%s}",banner);
+
+ch= fgetc(stdin);
+
+while(!feof(stdin))
+{if((ch>=0x81&&ch<=0x9F)||(ch>=0xE0&&ch<=0xEF))
+{fprintf(stdout,"\177%c\177",ch);
+
+ch= fgetc(stdin);
+if(!feof(stdin))
+fprintf(stdout,"%d\177",ch);
+}
+else
+fputc(ch,stdout);
+
+ch= fgetc(stdin);
+}
+exit(EXIT_SUCCESS);
+return 0;
+}/*:2*/
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.2/SJISconv/sjisconv.w b/Build/source/texk/cjkutils/cjkutils-4.8.2/SJISconv/sjisconv.w
new file mode 100644
index 00000000000..26469af5c57
--- /dev/null
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.2/SJISconv/sjisconv.w
@@ -0,0 +1,120 @@
+% This is the cweb file sjisconv.w of the CJK Package Ver. 4.8.2  29-Dec-2008
+
+% Copyright (C) 1994-2008  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
+
+% To print this CWEB file you should (but not must) use the CWEAVE of the
+% c2cweb-package (found at the CTAN archives, e.g. ftp.dante.de) and then say
+%
+%           cweave +a sjisconv.w
+%
+% This (fully compatible) CWEAVE can transform CWEB-files with alternative
+% 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.2)}
+
+\def\topofcontents{
+  \null\vfill
+  \centerline{\titlefont The {\ttitlefont sjisconv} program}
+  \vskip 20pt
+  \centerline{(CJK Version 4.8.2)}
+  \vfill}
+
+\def\botofcontents{
+  \vfill
+  \noindent
+  Copyright \copyright\ 1996, 1998 by Werner Lemberg
+  \bigskip\noindent
+  Permission is granted to make and distribute verbatim copies of this
+  document provided that the copyright notice and this permission notice
+  are preserved on all copies.
+
+  \smallskip\noindent
+  Permission is granted to copy and distribute modified versions of this
+  document under the conditions for verbatim copying, provided that the
+  entire resulting derived work is distributed under the terms of a
+  permission notice identical to this one.}
+
+\pageno=\contentspagenumber \advance\pageno by 1
+\let\maybe=\iftrue
+\fullpageheight=240mm
+\pageheight=223mm
+\pagewidth=158mm
+\setpage
+\frenchspacing
+
+\noinx
+\nosecs
+\nocon
+
+@* Function and Use.
+This small program will convert SJIS encoded Japanese characters into a
+`preprocessed' form. The need of this program arises from the fact that this
+encoding uses the characters `\.{\\}', `\.{\{}', and `\.{\}}' which have
+special meanings in \TeX.
+
+Use this program as a filter:
+
+\hskip 2em \.{sjisconv < input\_file > output\_file}
+
+
+@* The program.
+The only function of this program is to replace all occurrences of SJIS
+encoded two byte characters \.{XY} with
+\.{\char94 \char94 7fX\char94 \char94 7fZZZ\char94 \char94 7f} (\.{X}
+and \.{Y} are the first and the second byte of the character; \.{ZZZ}
+represents the second byte as a decimal number).
+
+Additionally we define a \TeX\ macro at the very beginning to signal a
+preprocessed file.
+
+The following code is very simple. No error detection is done because \TeX\
+which will see the output of \.{sjisconv} complains loudly if something is
+wrong.
+
+@d banner
+"sjisconv (CJK ver. 4.8.2)"
+
+@c
+#include <stdio.h>
+#include <stdlib.h>@#
+
+
+int main(int argc, char *argv[])
+   {int ch;
+
+    fprintf(stdout, "\\def\\CJKpreproc{%s}", banner);@#
+
+    ch = fgetc(stdin);@#
+
+    while(!feof(stdin))
+       {if((ch >= 0x81 && ch <= 0x9F) || (ch >= 0xE0 && ch <= 0xEF))
+           {fprintf(stdout, "\177%c\177", ch);@#
+
+            ch = fgetc(stdin);
+            if(!feof(stdin))
+                fprintf(stdout, "%d\177", ch);
+           }
+        else
+            fputc(ch, stdout);@#
+
+        ch = fgetc(stdin);
+       }
+    exit(EXIT_SUCCESS);
+    return 0;           /* never reached */
+   }
diff --git a/Build/source/texk/cjkutils/scripts/sjislatex b/Build/source/texk/cjkutils/cjkutils-4.8.2/SJISconv/sjislatex
index 68c554e6d71..d794a7c7f5e 100755
--- a/Build/source/texk/cjkutils/scripts/sjislatex
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.2/SJISconv/sjislatex
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# Copyright (C) 1994-2006  Werner Lemberg <wl@gnu.org>
+# Copyright (C) 1994-2008  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/Build/source/texk/cjkutils/bat/sjisltx.bat b/Build/source/texk/cjkutils/cjkutils-4.8.2/SJISconv/sjisltx.bat
index 5702c113bdf..5702c113bdf 100644
--- a/Build/source/texk/cjkutils/bat/sjisltx.bat
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.2/SJISconv/sjisltx.bat
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.2/SJISconv/sjisltx.cmd b/Build/source/texk/cjkutils/cjkutils-4.8.2/SJISconv/sjisltx.cmd
new file mode 100644
index 00000000000..ff8955dfba2
--- /dev/null
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.2/SJISconv/sjisltx.cmd
@@ -0,0 +1,44 @@
+/*----------------------------------------------------------------------*\
+    sjisltx.cmd
+
+    This file is part of the CJK macro package for LaTeX2e ver. 4.8.2
+
+    Copyright (C) 1994-2008  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
+    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
+
+    Wonkoo Kim (wkim+@pitt.edu), September 2, 1996
+\*----------------------------------------------------------------------*/
+
+Call RxFuncAdd 'SysLoadFuncs', 'RexxUtil', 'SysLoadFuncs'
+Call SysLoadFuncs
+
+parse arg file
+
+drive = filespec('drive', file)
+path  = filespec('path', file)
+fname = filespec('name', file)
+m = lastpos('.', fname)
+if (m = 0) then m = length(fname) + 1
+cjkfile = drive||path||delstr(fname, m)||'.cjk'
+
+'sjisconv <' file '>' cjkfile
+
+ucjkfile = translate(cjkfile,'/','\')
+if stream(cjkfile, 'C', 'QUERY EXISTS') \= '' then
+    'call latex.cmd' ucjkfile
+
+/* End of sjisltx.cmd */
diff --git a/Build/source/texk/cjkutils/scripts/sjispdflatex b/Build/source/texk/cjkutils/cjkutils-4.8.2/SJISconv/sjispdflatex
index e8d070e9dc6..50daf343502 100755
--- a/Build/source/texk/cjkutils/scripts/sjispdflatex
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.2/SJISconv/sjispdflatex
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# Copyright (C) 1994-2006  Werner Lemberg <wl@gnu.org>
+# Copyright (C) 1994-2008  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/Build/source/texk/cjkutils/bat/cjklatex.c b/Build/source/texk/cjkutils/cjkutils-4.8.2/cjklatex/cjklatex.c
index c1749ab6a25..6518cc63491 100644
--- a/Build/source/texk/cjkutils/bat/cjklatex.c
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.2/cjklatex/cjklatex.c
@@ -1,13 +1,17 @@
 /*
-  Purpose: call latex after preprocessing of the .tex file by
+  Purpose: call LATEX after preprocessing of the .tex file by
            the cjk conversion tool. The old f_name.bat script
 	   is not working anymore.
   Author : F. Popineau <Fabrice.Popineau@supelec.fr>
   Date   : <29/06/2001>
 */
 
+#ifndef LATEX
+#define LATEX "latex"
+#endif
+
 /*
-  Copyright (C) 2001-2006  F. Popineau <Fabrice.Popineau@supelec.fr>
+  Copyright (C) 2001-2008  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
@@ -27,52 +31,53 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <win32lib.h>
 
 #include <kpathsea/config.h>
 #include <kpathsea/lib.h>
 #include <kpathsea/getopt.h>
 
-static char *cjklatex_version_string = "1.0";
+#if defined(WIN32) && !defined(__MINGW32__)
+#include <kpathsea/win32lib.h>
+#endif
+
+static const char *cjklatex_version_string = "1.0";
 
 static const char *usage_str[] = {
   "Usage: %s OPTIONS FILE\n",
-  "Calls `latex' on FILE after conversion by the filter\n",
+  "Calls `" LATEX "' on FILE after conversion by the filter\n",
   "specified by OPTIONS.\n",
   "--conv=bg5\tfor traditional Chinese, encoding Big 5,\n",
-  "--conv=bg5p\tfor Chinese, encoding Big 5+,\n",
   "--conv=cef\tfor Chinese Encoding Framework, encoding CEF,\n",
   "--conv=cef5\tidem CEF, also converts Big5 characters,\n",
   "--conv=cefs\tidem CEF, also converts SJIS characters,\n",
-  "--conv=sjis\tfor Japanese, SJIS encoding,\n",
-  "--conv=gbk\tfor Chinese, encoding GBK.",
+  "--conv=gbk\tfor Chinese, encoding GBK,\n",
+  "--conv=sjis\tfor Japanese, SJIS encoding.",
   "\nAlternatively, for compatibility with the previous DOS batch files,\n",
   "you can also copy this program to any of the following names:\n",
-  "bg5latex.exe,bg5pltx.exe,cef5ltx.exe,ceflatex.exe,cefsltx.exe,\n",
-  "gbklatex.exe and sjisltx.exe .\n",
+  "bg5" LATEX ".exe, cef5" LATEX ".exe, cef" LATEX ".exe, cefs" LATEX ".exe,\n",
+  "gbk" LATEX ".exe and sjis" LATEX ".exe .\n",
   "Then running one of these programs will be identical to specify\n",
   "the corresponding option.\n",
   "\nAdditional options:\n",
   "--verbose\tbe a bit more verbose about what is happening,\n",
   "--nocleanup\tdo not remove intermediate files,\n",
-  "--latex=engine\tuse `engine' instead of `latex' to process the file.\n",
+  "--latex=engine\tuse `engine' instead of `" LATEX "' to process the file.\n",
   NULL
 };
 
 static char *progname = NULL;
 
 static struct _conv_table {
-  char *progname;
-  char *processor;
+  const char *progname;
+  const char *processor;
 } CJKtable[] = {
-  { "cjklatex", "" },
-  { "bg5latex", "bg5conv" },
-  { "bg5pltx", "extconv" },
-  { "cef5ltx", "cef5conv" },
-  { "ceflatex", "cefconv" },
-  { "cefsltx", "cefsconv" },
-  { "gbklatex", "extconv" },
-  { "sjisltx", "sjisconv" }
+  { "cjk" LATEX, "" },
+  { "bg5" LATEX, "bg5conv" },
+  { "cef" LATEX, "cefconv" },
+  { "cef5" LATEX, "cef5conv" },
+  { "cefs" LATEX, "cefsconv" },
+  { "gbk" LATEX, "extconv" },
+  { "sjis" LATEX, "sjisconv" }
 };
 
 #define PROGRAM_IS(p) FILESTRCASEEQ (p, progname)
@@ -94,7 +99,7 @@ static struct option long_options [] = {
     {0, 0, 0, 0}
 };
 
-BOOL sigint_handler(DWORD dwCtrlType)
+static BOOL sigint_handler(DWORD dwCtrlType)
 {
   /* Fix me : there is a problem if a system() command is running.
      We should wait for the son process to be interrupted.
@@ -118,17 +123,17 @@ BOOL sigint_handler(DWORD dwCtrlType)
   return FALSE;			/* return value obligatory */
 }
    
-void usage()
+static void usage(void)
 {
   int i;
-  fprintf(stderr, "CJKlatex version %s\n", cjklatex_version_string);
+  fprintf(stderr, "CJK" LATEX " version %s\n", cjklatex_version_string);
   fprintf(stderr,usage_str[0], progname );
   fputs("\n", stderr);
   for(i = 1; usage_str[i]; ++i)
     fputs(usage_str[i], stderr);
 }
 
-int do_process(char *processor, char *filename)
+static int do_process(const char *processor, const char *filename)
 {
   char *ext, *p;
   char cmd[_MAX_PATH*3];
@@ -176,7 +181,7 @@ int do_process(char *processor, char *filename)
   return ret;
 }
 
-void main(int argc, char *argv[])
+int main(int argc, char *argv[])
 {
   int g; /* getopt return code */
   int i;
@@ -241,7 +246,7 @@ void main(int argc, char *argv[])
       fprintf(stderr, "%s of %s.\n", progname, cjklatex_version_string);
       exit(0);
     }
-    else if (PROGRAM_IS("cjklatex")) {
+    else if (PROGRAM_IS("cjk" LATEX)) {
       if (ARGUMENT_IS("conv")) {
 	for (i = 1; i < sizeof(CJKtable)/sizeof(CJKtable[0]) && program_number <= 0; i++) {
 	  if (STRNEQ(optarg, CJKtable[i].progname, strlen(optarg))) {
@@ -280,11 +285,13 @@ void main(int argc, char *argv[])
   assert(program_number > 0);
 
   if (! texengine) {
-    texengine = xstrdup("latex");
+    texengine = xstrdup(LATEX);
   }
 
   do_process(CJKtable[program_number].processor, filename);
 
   free(filename);
   free(texengine);
+
+  return 0;
 }
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.2/extconv/bg5+latex b/Build/source/texk/cjkutils/cjkutils-4.8.2/extconv/bg5+latex
new file mode 100755
index 00000000000..4136537872e
--- /dev/null
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.2/extconv/bg5+latex
@@ -0,0 +1,43 @@
+#! /bin/sh
+
+# Copyright (C) 1994-2008  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
+
+n=1
+argv=
+
+# get last argument
+while test 1 -lt $#; do
+  eval argv$n=\$1
+  argv="$argv \"\$argv$n\""
+  n=`expr $n + 1`
+  shift
+done
+
+# replace extension with .cjk or append .cjk if there is no extension
+tex=$1
+case $tex in
+""|*.cjk)
+  echo >&2 "Usage: $0 [options] latex-file"
+  exit 1;;
+*)
+  aux=`expr "X$tex" : 'X\(.*\)\.[^/]*$' \| "X$tex" : 'X\(.*\)'`.cjk;;
+esac
+
+extconv < "$tex" > "$aux" && eval latex "$argv" "\$aux"
+
+# EOF
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.2/extconv/bg5+pdflatex b/Build/source/texk/cjkutils/cjkutils-4.8.2/extconv/bg5+pdflatex
new file mode 100755
index 00000000000..e28761ef423
--- /dev/null
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.2/extconv/bg5+pdflatex
@@ -0,0 +1,43 @@
+#! /bin/sh
+
+# Copyright (C) 1994-2008  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
+
+n=1
+argv=
+
+# get last argument
+while test 1 -lt $#; do
+  eval argv$n=\$1
+  argv="$argv \"\$argv$n\""
+  n=`expr $n + 1`
+  shift
+done
+
+# replace extension with .cjk or append .cjk if there is no extension
+tex=$1
+case $tex in
+""|*.cjk)
+  echo >&2 "Usage: $0 [options] pdflatex-file"
+  exit 1;;
+*)
+  aux=`expr "X$tex" : 'X\(.*\)\.[^/]*$' \| "X$tex" : 'X\(.*\)'`.cjk;;
+esac
+
+extconv < "$tex" > "$aux" && eval pdflatex "$argv" "\$aux"
+
+# EOF
diff --git a/Build/source/texk/cjkutils/bat/bg5pltx.bat b/Build/source/texk/cjkutils/cjkutils-4.8.2/extconv/bg5pltx.bat
index ccc6c76acd5..ccc6c76acd5 100644
--- a/Build/source/texk/cjkutils/bat/bg5pltx.bat
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.2/extconv/bg5pltx.bat
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.2/extconv/bg5pltx.cmd b/Build/source/texk/cjkutils/cjkutils-4.8.2/extconv/bg5pltx.cmd
new file mode 100644
index 00000000000..64b768ee178
--- /dev/null
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.2/extconv/bg5pltx.cmd
@@ -0,0 +1,44 @@
+/*----------------------------------------------------------------------*\
+    bg5pltx.cmd
+
+    This file is part of the CJK macro package for LaTeX2e ver. 4.8.2
+
+    Copyright (C) 1994-2008 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
+    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
+
+    Wonkoo Kim (wkim+@pitt.edu), September 2, 1996
+\*----------------------------------------------------------------------*/
+
+Call RxFuncAdd 'SysLoadFuncs', 'RexxUtil', 'SysLoadFuncs'
+Call SysLoadFuncs
+
+parse arg file
+
+drive = filespec('drive', file)
+path  = filespec('path', file)
+fname = filespec('name', file)
+m = lastpos('.', fname)
+if (m = 0) then m = length(fname) + 1
+cjkfile = drive||path||delstr(fname, m)||'.cjk'
+
+'extconv <' file '>' cjkfile
+
+ucjkfile = translate(cjkfile,'/','\')
+if stream(cjkfile, 'C', 'QUERY EXISTS') \= '' then
+    'call latex.cmd' ucjkfile
+
+/* End of bg5pltx.cmd */
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.2/extconv/extconv.1 b/Build/source/texk/cjkutils/cjkutils-4.8.2/extconv/extconv.1
new file mode 100644
index 00000000000..d8494edc1e1
--- /dev/null
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.2/extconv/extconv.1
@@ -0,0 +1,111 @@
+.\" man page for bg5conv
+.\"
+.\" Copyright (C) 1994-2008  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
+.
+.TH EXTCONV 1 29-Dec-2008 "CJK Version 4.8.2"
+.
+.\" ====
+.\" ==== macro definitions
+.\" ====
+.
+.\" here we define \TeX for troff and nroff
+.if t .ds TX \fRT\\h'-0.1667m'\\v'0.20v'E\\v'-0.20v'\\h'-0.125m'X\fP
+.if n .ds TX TeX
+.
+.\" and here the same for \LaTeX
+.if t \{\
+.ie '\*(.T'dvi' \
+.ds LX \fRL\h'-0.36m'\v'-0.15v'\s-3A\s0\h'-0.15m'\v'0.15v'\fP\*(TX
+.el .ds LX \fRL\h'-0.36m'\v'-0.22v'\s-2A\s0\h'-0.15m'\v'0.22v'\fP\*(TX
+.\}
+.if n .ds LX LaTeX
+.
+.\" \LaTeXe
+.\" note that we need \vareps for TeX instead of \eps which can only be
+.\" accessed with the \N escape sequence (in the Math Italic font)
+.if t \{\
+.ie '\*(.T'dvi' .ds LE \*(LX\h'0.15m'2\v'0.20v'\f(MI\N'34'\fP\v'-0.20v'
+.el .ds LE \*(LX\h'0.15m'2\v'0.20v'\(*e\v'-0.20v'
+.\}
+.if n .ds LE LaTeX\ 2e
+.
+.\" a typewriter font
+.if t \{\
+.de C
+\fC\\$1\fP\\$2
+..
+.\}
+.if n \{\
+.de C
+\\$1\\$2
+..
+.\}
+.
+.\" ====
+.\" ==== end of macro definitions
+.\" ====
+.
+.
+.
+.SH NAME
+extconv \- convert a TeX document in either Big\ 5+ or GBK encoding into
+`preprocessed' form.
+.
+.
+.SH SYNOPSIS
+.B extconv
+<
+.I infile
+>
+.I outfile
+.
+.
+.SH DESCRIPTION
+Big\ 5+ and GBK encodings use the characters
+.C { ,
+.C } ,
+and
+.C \e
+which have special meanings in \*(TX
+documents.
+.PP
+After processing a \*(LE
+document which contains such characters with
+.B \%extconv
+you need not care about these special characters.
+.PP
+This filter is part of the
+.B CJK
+macro package for \*(LE.
+.
+.
+.SH "SEE ALSO"
+.BR bg5conv (1),
+.BR \%sjisconv (1),
+.BR \%cefconv (1),
+.BR cef5conv (1),
+.BR \%cefsconv (1),
+.br
+the
+.B CJK
+documentation files.
+.
+.
+.SH AUTHOR
+Werner Lemberg
+.C <wl@gnu.org>
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.2/extconv/extconv.c b/Build/source/texk/cjkutils/cjkutils-4.8.2/extconv/extconv.c
new file mode 100644
index 00000000000..1b1753fd08b
--- /dev/null
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.2/extconv/extconv.c
@@ -0,0 +1,37 @@
+#define banner  \
+"extconv (CJK ver. 4.8.2)" \
+
+/*2:*/
+#line 94 "/home/wl/git/cjk/cjk-4.8.2/utils/extconv/extconv.w"
+
+#include <stdio.h> 
+#include <stdlib.h> 
+
+
+int main(argc,argv)
+int argc;
+char*argv[];
+
+{int ch;
+
+
+fprintf(stdout,"\\def\\CJKpreproc{%s}",banner);
+
+ch= fgetc(stdin);
+
+while(!feof(stdin))
+{if(ch>=0x81&&ch<=0xFE)
+{fprintf(stdout,"\177%c\177",ch);
+
+ch= fgetc(stdin);
+if(!feof(stdin))
+fprintf(stdout,"%d\177",ch);
+}
+else
+fputc(ch,stdout);
+
+ch= fgetc(stdin);
+}
+exit(EXIT_SUCCESS);
+return 0;
+}/*:2*/
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.2/extconv/extconv.w b/Build/source/texk/cjkutils/cjkutils-4.8.2/extconv/extconv.w
new file mode 100644
index 00000000000..554106fe78e
--- /dev/null
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.2/extconv/extconv.w
@@ -0,0 +1,122 @@
+% This is the cweb file extconv.w of the CJK Package Ver. 4.8.2  29-Dec-2008
+
+% Copyright (C) 1994-2008  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
+
+% To print this CWEB file you should (but not must) use the CWEAVE of the
+% c2cweb-package (found at the CTAN archives, e.g. ftp.dante.de) and then say
+%
+%           cweave +a extconv.w
+%
+% This (fully compatible) CWEAVE can transform CWEB-files with alternative
+% 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.2)}
+
+\def\topofcontents{
+  \null\vfill
+  \centerline{\titlefont The {\ttitlefont extconv} program}
+  \vskip 20pt
+  \centerline{(CJK Version 4.8.2)}
+  \vfill}
+
+\def\botofcontents{
+  \vfill
+  \noindent
+  Copyright \copyright\ 1996, 1998 by Werner Lemberg
+  \bigskip\noindent
+  Permission is granted to make and distribute verbatim copies of this
+  document provided that the copyright notice and this permission notice
+  are preserved on all copies.
+
+  \smallskip\noindent
+  Permission is granted to copy and distribute modified versions of this
+  document under the conditions for verbatim copying, provided that the
+  entire resulting derived work is distributed under the terms of a
+  permission notice identical to this one.}
+
+\pageno=\contentspagenumber \advance\pageno by 1
+\let\maybe=\iftrue
+\fullpageheight=240mm
+\pageheight=223mm
+\pagewidth=158mm
+\setpage
+\frenchspacing
+
+\noinx
+\nosecs
+\nocon
+
+@* Function and Use.
+This small program will convert Big~5+ or GBK encoded Chinese characters
+into a `preprocessed' form. The need of this program arises from the fact
+that these two encodings use the characters `\.{\\}', `\.{\{}', and `\.{\}}'
+which have special meanings in \TeX.
+
+Use this program as a filter:
+
+\hskip 2em \.{extconv < input\_file > output\_file}
+
+
+@* The program.
+The only function of this program is to replace all occurrences of Big~5+
+and GBK encoded characters \.{XY} (\.{X} and \.{Y} are the first and the
+second byte of the character) with
+\.{\char94 \char94 7fX\char94 \char94 7fZZZ\char94 \char94 7f}, where \.{ZZZ}
+represents the second byte as a decimal number. \.{0x7F} is used as an active
+character and delimiter.
+
+Additionally we define a \TeX\ macro at the very beginning to signal a
+preprocessed file.
+
+The following code is very simple. No error detection is done because \TeX\
+which will see the output of \.{extconv} complains loudly if something is
+wrong.
+
+@d banner
+"extconv (CJK ver. 4.8.2)"
+
+@c
+#include <stdio.h>
+#include <stdlib.h>@#
+
+
+int main(int argc, char *argv[])
+   {int ch;
+
+
+    fprintf(stdout, "\\def\\CJKpreproc{%s}", banner);@#
+
+    ch = fgetc(stdin);@#
+
+    while(!feof(stdin))
+       {if(ch >= 0x81 && ch <= 0xFE)
+           {fprintf(stdout, "\177%c\177", ch);@#
+
+            ch = fgetc(stdin);
+            if(!feof(stdin))
+                fprintf(stdout, "%d\177", ch);
+           }
+        else
+            fputc(ch, stdout);@#
+
+        ch = fgetc(stdin);
+       }
+    exit(EXIT_SUCCESS);
+    return 0;       /* never reached */
+   }
diff --git a/Build/source/texk/cjkutils/scripts/gbklatex b/Build/source/texk/cjkutils/cjkutils-4.8.2/extconv/gbklatex
index f799f7b6e63..4136537872e 100755
--- a/Build/source/texk/cjkutils/scripts/gbklatex
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.2/extconv/gbklatex
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# Copyright (C) 1994-2006  Werner Lemberg <wl@gnu.org>
+# Copyright (C) 1994-2008  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/Build/source/texk/cjkutils/bat/gbklatex.bat b/Build/source/texk/cjkutils/cjkutils-4.8.2/extconv/gbklatex.bat
index ccc6c76acd5..ccc6c76acd5 100644
--- a/Build/source/texk/cjkutils/bat/gbklatex.bat
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.2/extconv/gbklatex.bat
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.2/extconv/gbklatex.cmd b/Build/source/texk/cjkutils/cjkutils-4.8.2/extconv/gbklatex.cmd
new file mode 100644
index 00000000000..7f19637ade8
--- /dev/null
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.2/extconv/gbklatex.cmd
@@ -0,0 +1,44 @@
+/*----------------------------------------------------------------------*\
+    gbklatex.cmd
+
+    This file is part of the CJK macro package for LaTeX2e ver. 4.8.2
+
+    Copyright (C) 1994-2008 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
+    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
+
+    Wonkoo Kim (wkim+@pitt.edu), September 2, 1996
+\*----------------------------------------------------------------------*/
+
+Call RxFuncAdd 'SysLoadFuncs', 'RexxUtil', 'SysLoadFuncs'
+Call SysLoadFuncs
+
+parse arg file
+
+drive = filespec('drive', file)
+path  = filespec('path', file)
+fname = filespec('name', file)
+m = lastpos('.', fname)
+if (m = 0) then m = length(fname) + 1
+cjkfile = drive||path||delstr(fname, m)||'.cjk'
+
+'extconv <' file '>' cjkfile
+
+ucjkfile = translate(cjkfile,'/','\')
+if stream(cjkfile, 'C', 'QUERY EXISTS') \= '' then
+    'call latex.cmd' ucjkfile
+
+/* End of gbklatex.cmd */
diff --git a/Build/source/texk/cjkutils/scripts/gbkpdflatex b/Build/source/texk/cjkutils/cjkutils-4.8.2/extconv/gbkpdflatex
index 6dd3ee3de9e..e28761ef423 100755
--- a/Build/source/texk/cjkutils/scripts/gbkpdflatex
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.2/extconv/gbkpdflatex
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# Copyright (C) 1994-2006  Werner Lemberg <wl@gnu.org>
+# Copyright (C) 1994-2008  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/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/Makefile.gnu b/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/Makefile.gnu
new file mode 100644
index 00000000000..6ecf115b5dd
--- /dev/null
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/Makefile.gnu
@@ -0,0 +1,127 @@
+# This file is part of the CJK package Version 4.8.2 (29-Dec-2008)
+
+# Copyright (C) 1994-2008  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
+
+# GNU Makefile for hbf2gf
+
+.PHONY: default all debug documentation clean \
+        do_all
+
+.CAUTIOUS: hbf2gf.c
+
+default:
+	@echo " say                                     "
+	@echo ".                                        "
+	@echo "     make TARGET OS=SYSTEM               "
+	@echo ".                                        "
+	@echo " SYSTEM can be one of the following:     "
+	@echo ".                                        "
+	@echo "     os2 bound (emx)                     "
+	@echo "     dos (djgpp)                         "
+	@echo ".                                        "
+	@echo " TARGET can be one of the following:     "
+	@echo ".                                        "
+	@echo "     all debug                           "
+	@echo "     documentation (needs cweave package)"
+	@echo "     clean                               "
+
+ifdef OS
+
+  # default values (bound executables built with emx)
+  FS = msdos
+  CC = gcc -Wall -O -DHAVE_EMTEXDIR
+  LIB =
+  O = .o
+  EXE = .exe
+  RM = del
+
+  ifeq ($(OS),os2)
+    FS = msdos
+    CC = gcc -Wall -Zomf -Zmtd -O -DHAVE_EMTEXDIR
+    LIB = hbf2gf.def
+    O = .obj
+    EXE = .exe
+    RM = del
+  endif
+
+  ifeq ($(OS),dos)
+    FS = msdos
+    CC = gcc -Wall -O -DHAVE_EMTEXDIR
+    LIB =
+    O = .o
+    EXE = .exe
+    RM = del
+  endif
+
+
+  %$O: %.c
+	$(CC) $(CFLAGS) -c -D$(FS) -o $@ $<
+
+  %.c: %.w %.ch
+	$(CTANGLE) $^ $@
+  %.c: %.w
+	$(CTANGLE) $<
+
+  %.tex: %.w %.ch
+	$(CWEAVE) +ai $^ $@
+  %.tex: %.w
+	$(CWEAVE) +ai $<
+
+  %.dvi: %.tex
+	$(TEX) $*
+
+
+  all:
+	$(MAKE) -f Makefile.gnu do_all CFLAGS=-s
+
+  debug:
+	$(MAKE) -f Makefile.gnu do_all CFLAGS=-g
+
+  # this builds the .dvi-file
+  documentation: hbf2gf.dvi
+
+  # remove the unnecessary files;
+  clean:
+	-$(RM) *.scn
+	-$(RM) *.toc
+	-$(RM) *.idx
+	-$(RM) *.log
+	-$(RM) *.o
+
+
+  do_all: hbf2gf$(EXE)
+
+  hbf2gf$(EXE): hbf2gf$O hbf$O emdir$O emtexdir$O
+    ifeq ($(OS),dos)
+	$(CC) $(CFLAGS) -o $(basename $@) $^
+	strip $(basename $@)
+	coff2exe $(basename $@)
+	-del $(basename $@)
+    else
+	$(CC) $(CFLAGS) -o $@ $^ $(LIB)
+    endif
+
+  hbf$O: hbf.c hbf.h
+  emdir$O: emdir.c emdir.h
+  emtexdir$O: emtexdir.c emtexdir.h emdir.h
+
+else # ifdef OS
+
+  all debug documentation clean: default
+
+endif
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/Makefile.in b/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/Makefile.in
new file mode 100644
index 00000000000..ece2f79c89a
--- /dev/null
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/Makefile.in
@@ -0,0 +1,127 @@
+# Makefile for hbf2gf -- wl@gnu.org
+
+# Copyright (C) 1994-2008  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
+
+VPATH = @srcdir@
+srcdir = @srcdir@
+
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+libdir = @libdir@
+bindir = @bindir@
+mandir = @mandir@
+
+RM = @RM@
+RMF = @RM@ -f
+
+TEX = tex
+CTANGLE = ctangle
+CWEAVE = cweave
+
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+
+CC = @CC@
+CPP = @CPP@
+
+MKINSTALLDIRS = $(srcdir)/mkinstalldirs
+
+CFLAGS = @CFLAGS@
+CPPFLAGS = @CPPFLAGS@ @DEFS@ @no_strdup@ -Dunix
+MY_CFLAGS = $(CFLAGS) $(CPPFLAGS) @XX_CFLAGS@
+LDFLAGS = @LDFLAGS@ @LIBS@
+
+SRC = hbf2gf.c $(srcdir)/hbf.c
+OBJ = hbf2gf.o hbf.o
+
+
+.SUFFIXES: .dvi .tex .w
+
+
+.w.c:
+	$(CTANGLE) $<
+.c.o:
+	$(CC) -c $(MY_CFLAGS) $<
+
+.w.tex:
+	$(CWEAVE) +ai $<
+
+.tex.dvi:
+	$(TEX) $<
+
+
+
+PROGRAMS = hbf2gf
+
+default all: $(PROGRAMS)
+
+hbf2gf.c: $(srcdir)/hbf2gf.w
+
+hbf2gf: $(OBJ)
+	$(CC) $(MY_CFLAGS) -o hbf2gf $(OBJ) $(LDFLAGS)
+
+documentation: hbf2gf.dvi
+
+install: $(PROGRAMS)
+	$(MKINSTALLDIRS) $(bindir) $(mandir)/man1
+	for P in $(PROGRAMS) ; do \
+          $(INSTALL_PROGRAM) $$P $(bindir)/$$P ; \
+          $(INSTALL_DATA) $(srcdir)/$$P.1 $(mandir)/man1 ; \
+        done
+
+uninstall:
+	-for P in $(PROGRAMS) ; do \
+          $(RMF) $(bindir)/$$P ; \
+          $(RMF) $(mandir)/man1/$$P.1 ; \
+        done
+
+clean: do_clean
+
+distclean: do_clean
+	-$(RMF) dep.end $(PROGRAMS) *.dvi
+	-$(RMF) *~ *.orig core *.core
+	-$(RMF) config.cache config.log config.status Makefile
+
+do_clean:
+	-$(RMF) *.o
+	-$(RMF) *.scn *.toc *.idx *.log
+
+maintainer-clean: distclean
+	-$(RMF) hbf2gf.c
+
+depend: $(SRC)
+	(echo '/^#.* PUT NO STUFF BELOW/,$$d'; echo w; echo q) | \
+         ed - Makefile
+	echo '# Dependencies generated by make depend: PUT NO STUFF BELOW' \
+          >> Makefile
+	for file in $(SRC) ; do \
+          $(CPP) $(CPPFLAGS) $$file | \
+           sed -n -e 's|^# [1-9][0-9]* "\([^/].*\.h\)".*|\1|p' \
+                  -e 's|^# [1-9][0-9]* "\($(srcdir)/.*\.h\)".*|\1|p' | \
+           sed -e 's|/\./|.|g' -e "s/^/`basename $$file .c`.o: /" ; \
+        done | \
+         sort -u | \
+         awk '{ if (LINE == 1) \
+                  { line = last = $$1 } \
+                else if ($$1 != last) \
+                  { print line ; line = last = $$1 } \
+                line = line " " $$2 } \
+              END { print line }' >> Makefile
+
+# Dependencies generated by make depend: PUT NO STUFF BELOW
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/README b/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/README
new file mode 100644
index 00000000000..a7de0ec1402
--- /dev/null
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/README
@@ -0,0 +1,2 @@
+Additional installation documentation can be found in the files `INSTALL'
+(in the top directory) and `doc/hbf2gf.txt'.
diff --git a/Build/source/texk/cjkutils/hbf2gf/cfg/README b/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/cfg/README
index 689d59e7397..689d59e7397 100644
--- a/Build/source/texk/cjkutils/hbf2gf/cfg/README
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/cfg/README
diff --git a/Build/source/texk/cjkutils/hbf2gf/cfg/b5ka12.cfg b/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/cfg/b5ka12.cfg
index f5c142f0235..f5c142f0235 100644
--- a/Build/source/texk/cjkutils/hbf2gf/cfg/b5ka12.cfg
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/cfg/b5ka12.cfg
diff --git a/Build/source/texk/cjkutils/hbf2gf/cfg/b5kr12.cfg b/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/cfg/b5kr12.cfg
index 9d9da2c1a2f..9d9da2c1a2f 100644
--- a/Build/source/texk/cjkutils/hbf2gf/cfg/b5kr12.cfg
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/cfg/b5kr12.cfg
diff --git a/Build/source/texk/cjkutils/hbf2gf/cfg/b5so12.cfg b/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/cfg/b5so12.cfg
index dc0bcd9fbf0..dc0bcd9fbf0 100644
--- a/Build/source/texk/cjkutils/hbf2gf/cfg/b5so12.cfg
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/cfg/b5so12.cfg
diff --git a/Build/source/texk/cjkutils/hbf2gf/cfg/c1so12.cfg b/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/cfg/c1so12.cfg
index de5b32b3efc..de5b32b3efc 100644
--- a/Build/source/texk/cjkutils/hbf2gf/cfg/c1so12.cfg
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/cfg/c1so12.cfg
diff --git a/Build/source/texk/cjkutils/hbf2gf/cfg/c2so12.cfg b/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/cfg/c2so12.cfg
index 969af8fae14..969af8fae14 100644
--- a/Build/source/texk/cjkutils/hbf2gf/cfg/c2so12.cfg
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/cfg/c2so12.cfg
diff --git a/Build/source/texk/cjkutils/hbf2gf/cfg/c3so12.cfg b/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/cfg/c3so12.cfg
index 0e65768ee5e..0e65768ee5e 100644
--- a/Build/source/texk/cjkutils/hbf2gf/cfg/c3so12.cfg
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/cfg/c3so12.cfg
diff --git a/Build/source/texk/cjkutils/hbf2gf/cfg/c4so12.cfg b/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/cfg/c4so12.cfg
index 8ea3a8b270c..8ea3a8b270c 100644
--- a/Build/source/texk/cjkutils/hbf2gf/cfg/c4so12.cfg
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/cfg/c4so12.cfg
diff --git a/Build/source/texk/cjkutils/hbf2gf/cfg/c5so12.cfg b/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/cfg/c5so12.cfg
index 1b81c90a0d3..1b81c90a0d3 100644
--- a/Build/source/texk/cjkutils/hbf2gf/cfg/c5so12.cfg
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/cfg/c5so12.cfg
diff --git a/Build/source/texk/cjkutils/hbf2gf/cfg/c6so12.cfg b/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/cfg/c6so12.cfg
index 5b9c912ce53..5b9c912ce53 100644
--- a/Build/source/texk/cjkutils/hbf2gf/cfg/c6so12.cfg
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/cfg/c6so12.cfg
diff --git a/Build/source/texk/cjkutils/hbf2gf/cfg/c7so12.cfg b/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/cfg/c7so12.cfg
index 051b2601426..051b2601426 100644
--- a/Build/source/texk/cjkutils/hbf2gf/cfg/c7so12.cfg
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/cfg/c7so12.cfg
diff --git a/Build/source/texk/cjkutils/hbf2gf/cfg/csso12.cfg b/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/cfg/csso12.cfg
index 9ad91b0c574..9ad91b0c574 100644
--- a/Build/source/texk/cjkutils/hbf2gf/cfg/csso12.cfg
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/cfg/csso12.cfg
diff --git a/Build/source/texk/cjkutils/hbf2gf/cfg/gsfs14.cfg b/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/cfg/gsfs14.cfg
index 4b397aca464..4b397aca464 100644
--- a/Build/source/texk/cjkutils/hbf2gf/cfg/gsfs14.cfg
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/cfg/gsfs14.cfg
diff --git a/Build/source/texk/cjkutils/hbf2gf/cfg/j2so12.cfg b/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/cfg/j2so12.cfg
index 7e0d70b5c0f..7e0d70b5c0f 100644
--- a/Build/source/texk/cjkutils/hbf2gf/cfg/j2so12.cfg
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/cfg/j2so12.cfg
diff --git a/Build/source/texk/cjkutils/hbf2gf/cfg/jsso12.cfg b/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/cfg/jsso12.cfg
index 9bdfc7b1e8a..9bdfc7b1e8a 100644
--- a/Build/source/texk/cjkutils/hbf2gf/cfg/jsso12.cfg
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/cfg/jsso12.cfg
diff --git a/Build/source/texk/cjkutils/hbf2gf/cfg/ksso17.cfg b/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/cfg/ksso17.cfg
index c82f7e7eee4..c82f7e7eee4 100644
--- a/Build/source/texk/cjkutils/hbf2gf/cfg/ksso17.cfg
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/cfg/ksso17.cfg
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/configure.ac b/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/configure.ac
new file mode 100644
index 00000000000..2cd5796a51a
--- /dev/null
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/configure.ac
@@ -0,0 +1,131 @@
+dnl This file is part of the CJK package ver. 4.8.2
+
+dnl Copyright (C) 1994-2008  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
+dnl the Free Software Foundation; either version 2 of the License, or
+dnl (at your option) any later version.
+
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+dnl GNU General Public License for more details.
+
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program in doc/COPYING; if not, write to the Free
+dnl Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+dnl MA 02110-1301 USA
+
+dnl Process this file with autoconf to produce a configure script.
+AC_INIT
+AC_CONFIG_SRCDIR([hbf.h])
+
+
+dnl check host
+AC_CANONICAL_TARGET([])
+
+
+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],[
+  if test x$withval = xyes; then
+    AC_MSG_WARN(Usage is: --with-kpathsea-include=includedir)
+  else
+    if test x$withval = xno; then
+      AC_MSG_WARN(Usage is: --with-kpathsea-include=includedir)
+    else
+      kpathsea_include=$withval
+    fi
+  fi
+])
+
+
+dnl Checks for libraries.
+AC_ARG_WITH(kpathsea-lib,
+            [  --with-kpathsea-lib=DIR
+                          location of the kpathsea lib dir],[
+  if test x$withval = xyes; then
+    AC_MSG_WARN(Usage is: --with-kpathsea-lib=libdir)
+  else
+    if test x$withval = xno; then
+      AC_MSG_WARN(Usage is: --with-kpathsea-lib=libdir)
+    else
+      kpathsea_lib=$withval
+    fi
+  fi
+])
+
+
+if test -n "$kpathsea_include" -o -n "$kpathsea_lib"; then
+  LIBS="$LIBS -L$kpathsea_lib"
+  CPPFLAGS="$CPPFLAGS -I$kpathsea_include -I$srcdir"
+
+  dnl the function kpse_set_program_name() is available since kpathsea 3.2
+  AC_CHECK_LIB(kpathsea, kpse_set_program_name, , AC_DEFINE(OLD_KPATHSEA))
+
+  AC_CHECK_LIB(kpathsea, kpse_init_prog, ,[
+               AC_MSG_ERROR([Can't find kpathsea library! Use --with-kpathsea-lib option.])])
+
+  dnl the header file kpathsea.h doesn't exist in kpathsea 2.6 and before
+  AC_CHECK_HEADER(kpathsea/kpathsea.h, , AC_DEFINE(VERY_OLD_KPATHSEA))
+
+  AC_CHECK_HEADER(kpathsea/c-auto.h, ,[
+                  AC_MSG_ERROR([Can't find kpathsea include files! Use --with-kpathsea-include option.])])
+else
+  CPPFLAGS="$CPPFLAGS -I$srcdir"
+fi
+
+
+dnl Get compiler flags right.
+if test "x$CC" = xgcc; then
+	XX_CFLAGS="-Wall"
+else
+	case "$host" in
+  		alpha-dec-osf*)
+        	XX_CFLAGS="-std1 -O2 -g3"
+       		;;
+  		*)
+          	XX_CFLAGS=
+       		;;
+	esac
+fi
+AC_SUBST(XX_CFLAGS)
+
+
+dnl Checks for typedefs, structures, and compiler characteristics.
+AC_C_CONST
+AC_STRUCT_TM
+
+
+dnl Checks for library functions.
+AC_FUNC_VPRINTF
+AC_CHECK_FUNCS(strdup strstr strtol strtoul)
+
+dnl we need this for hbf.c
+if test "x$ac_cv_func_strdup" = xno; then
+  no_strdup=-DNO_STRDUP
+fi
+AC_SUBST(no_strdup)
+
+AC_CHECK_PROG(RM, rm, rm)
+AC_PROG_INSTALL
+
+if test -z "$kpathsea_include" -a -z "$kpathsea_lib"; then
+  AC_MSG_WARN([
+
+    hbf2gf will be compiled without file search library support!
+    For kpathsea support use the --with-kpathsea-lib and
+    --with-kpathsea-include options.
+              ])
+fi
+
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/dvidrv.btm b/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/dvidrv.btm
new file mode 100644
index 00000000000..daeba96f01c
--- /dev/null
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/dvidrv.btm
@@ -0,0 +1,352 @@
+setdos /y1
+::
+:: Copyright (C) 1994-2008  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
+::
+::
+::  This is dvidrv.btm, a batch file for 4DOS/4OS2 written by
+::  Werner Lemberg <wl@gnu.org> partially based on the
+::  dvidrv.btm file of the 4allTeX package written by Phons Bloemen.
+::
+::  It is a replacement for dvidrv.exe of the emTeX package.
+::
+::  Additional features: support of ps2pk
+::                       support of ttf2pk
+::                       support of hbf2gf for HBFs (Hanzi bitmap fonts)
+::
+::      Only quadratic printer modes are supported for ttf2pk!
+::
+::  All needed binaries will be searched in the path.
+
+iff %# lt 2 then
+  echo ``
+  echo Usage: %0 dvi-driver dvi-file [parameters]
+  quit
+endiff
+
+setlocal
+  :: we set a default value only if the corresponding environment variable
+  :: is empty. The `=' must follow the variable name immediately.
+  alias set_def `iff "%[%@word["=",0,%1]]" eq "" then %+ set %& %+ endiff`
+
+  :: =========================================
+  :: ======== User defined variables. ========
+  :: =========================================
+  ::
+  :: Can be overridden in the environment (except %ps2pk, %ttf2pk, %hbf2gf,
+  :: %pre_dpi, and %post_dpi).
+
+  :: Comment out the programs you don't want to use.
+  set ps2pk=yes
+  set ttf2pk=yes
+  set hbf2gf=yes
+
+  :: where the PK files will be installed created by ps2pk, ttf2pk, and
+  :: hbf2gf.
+  :: dvidrv.btm adds `\modeless\XXXdpi' to this string (see below for the
+  :: exact string).
+  set_def pkdir=%emtexdir\pixel\tmp\pk
+
+  :: where the TrueType fonts reside.
+  set_def ttfonts=%emtexdir\fonts\truetype
+  :: where auxiliary files of ttf2pk are located.
+  set_def ttfcfg=%emtexdir\ttf2pk
+
+  :: where the HBF files reside.
+  set_def hbfonts=%emtexdir\fonts\hbf
+  :: where the hbf2gf config files are.
+  set_def hbfcfg=%emtexdir\hbf2gf
+
+  :: the dpi-subdirectory has various forms; the most common are XXXdpi and
+  :: dpiXXX, e.g. 300dpi and dpi300. Here we define two variables which
+  :: control this behaviour.
+  :: [dpiXXX is used for TDS compatible TeX trees.]
+  set pre_dpi=dpi
+  set post_dpi=
+
+  :: ================================================
+  :: ======== End of user defined variables. ========
+  :: ================================================
+
+  :: the base name for log files etc.
+  set basename=%@name[%1]
+
+  :: do we run dvips?
+  iff "%basename" ne "dvips" then
+    goto nodvips1
+  endiff
+
+  :: we delete dvips.mfj if it exists.
+  del dvips.mfj >& nul
+
+  :: now we run dvips with all supplied parameters.
+  %&
+
+  :: do we have to generate fonts?
+  iff exist dvips.mfj then
+    goto generate_fonts
+  endiff
+
+  :: else all is done.
+  goto end
+
+
+:nodvips1
+  :: here we call the dvi driver with all supplied parameters.
+  %& -pj:%basename.mfj
+
+  :: do we have to generate fonts?
+  iff errorlevel 8 then
+    goto generate_fonts
+  endiff
+
+  :: else all is done.
+  goto end
+
+
+:generate_fonts
+  gosub call_mfjob
+
+  :: do we run dvips?
+  iff "%basename" ne "dvips" then
+    goto nodvips2
+  endiff
+
+  :: we now call dvips a second time
+  %&
+
+  :: since no fonts will be generated in the second run we remove dvips.mfj
+  del dvips.mfj >& nul
+
+  goto end
+
+
+:nodvips2
+  :: we call the dvi driver a second time (without font generation).
+  %& -pj -fm
+
+  del %basename.mfj >& nul
+
+  goto end
+
+
+:: this is the main subroutine which calls mfjob and then parses the mfjob
+:: file for fonts which can be handled by ps2pk, ttf2pk, or hbf2gf.
+:call_mfjob
+  :: this alias prints a message on the screen and writes it into the logfile.
+  alias echolog=`echo %& | tee /a %basename.mlg`
+
+  echo ======== DVIDRV.BTM logfile ========  > %basename.mlg
+  echo Commandline: dvidrv.btm %&           >> %basename.mlg
+  echo ``                                   >> %basename.mlg
+  echo basename=%basename                   >> %basename.mlg
+  echo emtexdir=%emtexdir                   >> %basename.mlg
+  echo dvidrvfonts=%dvidrvfonts             >> %basename.mlg
+  echo mfinput=%mfinput                     >> %basename.mlg
+  echo mfjobopt=%mfjobopt                   >> %basename.mlg
+  echo textfm=%textfm                       >> %basename.mlg
+  echo psfonts=%psfonts                     >> %basename.mlg
+  echo ttfonts=%ttfonts                     >> %basename.mlg
+  echo ttfcfg=%ttfcfg                       >> %basename.mlg
+  echo hbfonts=%hbfonts                     >> %basename.mlg
+  echo hbfcfg=%hbfcfg                       >> %basename.mlg
+  echo ``                                   >> %basename.mlg
+
+  iff "%@search[mfjob]" eq "" then
+    echolog MFJOB not found in the path.
+    echolog Can't generate PK fonts from METAFONT automatically.
+    echo ``
+    quit
+  endiff
+
+  :: now we call mfjob.
+  echolog mfjob %mfjobopt -g%basename.mfl %basename.mfj
+  mfjob %mfjobopt -g%basename.mfl %basename.mfj
+  iff %? gt 0 then
+    echolog ``
+    echolog Something went wrong while running METAFONT.
+    echolog Look into the log files...
+    echolog ``
+  endiff
+
+  :: after running mfjob we scan the mfjob input file for fonts which can
+  :: be handled by ps2pk, ttf2pk or hbf2gf.
+  set lnnr=0
+  set totlines=%@lines[%basename.mfj]
+
+  do while %lnnr le %totlines
+    :: input a line.
+    set scratch=%@line[%basename.mfj,%lnnr]
+    set lnnr=%@inc[%lnnr]
+
+    :: get resolutions (METAFONT mode will be ignored).
+    :: example:
+    ::   mode=lqlores[180 180];
+    iff %@index[%scratch,mode] ge 0 then
+      set temp=%@word["[]",1,%scratch]
+      set xdpi=%@word[0,%temp]
+      set ydpi=%@word[1,%temp]
+    endiff
+
+    :: get fontname and magnification; we then compute the font resolutions
+    :: (rounded to the nearest integer---there is no necessity to adjust
+    :: these values further because of possible rounding errors since both
+    :: emTeX's dvi drivers and dvips check neighbored values too).
+    :: example:
+    ::   {font=cmr10; mag=0.5;}
+    iff %@index[%scratch,{font] ge 0 then
+      set testfont=%@word["=;",1,%scratch]
+      set temp=%@word["=;",3,%scratch]
+      :: we use highest arithmetic precision for these calculations.
+      :: Additionally we write 1/2 instead of 0.5 to avoid problems with
+      :: countries which use a comma instead of a colon as the decimal
+      :: separator.
+      set fontresx=%@int[%@eval[%xdpi*%temp+1/2=8]]
+      set fontresy=%@int[%@eval[%ydpi*%temp+1/2=8]]
+      set pksubdir=modeless\%[pre_dpi]%[fontresx]%post_dpi
+
+      set success=0
+
+      :: check whether %testfont leads to a PS font (we call ps2pkmfj).
+      iff %success == 0 .and. "%ps2pk" ne "" then
+        gosub call_ps2pk
+      endiff
+
+      :: check whether %testfont leads to a TrueType font.
+      iff %success == 0 .and. "%ttf2pk" ne "" then
+        gosub call_ttf2pk
+      endiff
+
+      :: check whether %testfont leads to a HBF file.
+      iff %success == 0 .and. "%hbf2gf" ne "" then
+        gosub call_hbf2gf
+      endiff
+    endiff
+  enddo
+
+  iff exist %basename.mfp then
+    echo ``                              >> %basename.mlg
+    echo ``                              >> %basename.mlg
+    echo ======== PS2PK logfile ======== >> %basename.mlg
+    echo ``                              >> %basename.mlg
+    type %basename.mfp                   >> %basename.mlg
+    echo ``                              >> %basename.mlg
+    del %basename.mfp >& nul
+  endiff
+
+  iff exist %basename.mfl then
+    echo ``                              >> %basename.mlg
+    type %basename.mfl                   >> %basename.mlg
+    echo ``                              >> %basename.mlg
+    del %basename.mfl >& nul
+  endiff
+
+  return
+
+
+:call_ttf2pk
+  iff "%@search[ttf2pk]" eq "" then
+    echolog TTF2PK not found in the path.
+    echolog Can't generate PK fonts from TrueType fonts automatically.
+    echo ``
+    quit
+  endiff
+
+  echolog ttf2pk -q -n %testfont %fontresx
+  ttf2pk -q -n %testfont %fontresx
+
+  iff %? == 0 then
+    echolog Font %pkdir\%pksubdir\%testfont.pk generated.
+    mkdir /s %pkdir\%pksubdir >& nul
+    move %testfont.pk %pkdir\%pksubdir >& nul
+    set success=1
+  elseiff %? == 2 then
+    echolog (%lnnr/%totlines): Font %testfont is no TrueType font.
+    set success=0
+  else
+    echolog Error running TTF2PK for font %testfont!
+  endiff
+
+  return
+
+
+:call_hbf2gf
+  iff "%@search[hbf2gf]" eq "" then
+    echolog HBF2GF not found in the path.
+    echolog Can't generate PK fonts from HBF files automatically.
+    echo ``
+    quit
+  endiff
+
+  echolog hbf2gf -q -p -n %testfont %fontresx %fontresy
+  hbf2gf -q -p -n %testfont %fontresx %fontresy
+
+  iff %? == 0 then
+    echolog Font %pkdir\%pksubdir\%testfont.pk generated.
+    mkdir /s %pkdir\%pksubdir >& nul
+    gftopk %testfont.gf %testfont.pk
+    move %testfont.pk %pkdir\%pksubdir >& nul
+    del %testfont.gf >& nul
+    set success=1
+  elseiff %? == 2 then
+    echolog (%lnnr/%totlines): Font %testfont is no HBF.
+    set success=0
+  else
+    echolog Error running HBF2GF for font %testfont!
+  endiff
+
+  return
+
+
+:call_ps2pk
+  iff not exist %pkdir\%pksubdir\%testfont.pk then
+    iff "%@search[ps2pkmfj]" eq "" .or. "%@search[ps2pk]" eq "" then
+      echolog PS2PKMFJ and/or PS2PK not found in the path.
+      echolog Can't generate PK fonts from PostScript fonts automatically.
+      echo ``
+      quit
+    endiff
+
+    echolog ps2pkmfj -X%fontresx -Y%fontresy %testfont %testfont.pk
+    ps2pkmfj -X%fontresx -Y%fontresy %testfont %testfont.pk | input %%pspkline
+
+    iff errorlevel != 1 then
+      %pspkline >> %basename.mfp
+      iff %? == 0 then
+        echolog Font %pkdir\%pksubdir\%testfont.pk generated.
+        mkdir /s %pkdir\%pksubdir >& nul
+        move %testfont.pk %pkdir\%pksubdir >& nul
+        success=1
+      else
+        echolog Error running PS2PK for font %testfont!
+      endiff
+    else
+      echolog (%lnnr/%totlines): Font %testfont is no PS font.
+      success=0
+    endiff
+  else
+    echolog Font %pkdir\%pksubdir\%testfont.pk already exists.
+  endiff
+
+  return
+
+
+:end
+
+endlocal
+
+:: ==== end of dvidrv.btm ====
diff --git a/Build/source/texk/cjkutils/hbf2gf/emdir.c b/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/emdir.c
index 4e759c83eb2..4e759c83eb2 100644
--- a/Build/source/texk/cjkutils/hbf2gf/emdir.c
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/emdir.c
diff --git a/Build/source/texk/cjkutils/hbf2gf/emdir.h b/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/emdir.h
index 0606d476ab1..0606d476ab1 100644
--- a/Build/source/texk/cjkutils/hbf2gf/emdir.h
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/emdir.h
diff --git a/Build/source/texk/cjkutils/hbf2gf/emtexdir.c b/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/emtexdir.c
index 9a35570adb3..9a35570adb3 100644
--- a/Build/source/texk/cjkutils/hbf2gf/emtexdir.c
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/emtexdir.c
diff --git a/Build/source/texk/cjkutils/hbf2gf/emtexdir.h b/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/emtexdir.h
index a9a986db05b..a9a986db05b 100644
--- a/Build/source/texk/cjkutils/hbf2gf/emtexdir.h
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/emtexdir.h
diff --git a/Build/source/texk/cjkutils/hbf2gf/hbf.c b/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/hbf.c
index 6056555d704..6056555d704 100644
--- a/Build/source/texk/cjkutils/hbf2gf/hbf.c
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/hbf.c
diff --git a/Build/source/texk/cjkutils/hbf2gf/hbf.h b/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/hbf.h
index 34f5940a71b..34f5940a71b 100644
--- a/Build/source/texk/cjkutils/hbf2gf/hbf.h
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/hbf.h
diff --git a/Build/source/texk/cjkutils/hbf2gf/hbf2gf.1 b/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/hbf2gf.1
index 1fdff00cee1..0ccb6648f56 100644
--- a/Build/source/texk/cjkutils/hbf2gf/hbf2gf.1
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/hbf2gf.1
@@ -1,6 +1,6 @@
 .\" man page for hbf2gf
 .\"
-.\" Copyright (C) 1994-2006  Werner Lemberg <wl@gnu.org>
+.\" Copyright (C) 1994-2008  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 17-Oct-2006 "CJK Version 4.7.0"
+.TH HBF2GF 1 29-Dec-2008 "CJK Version 4.8.2"
 .SH NAME
 hbf2gf \- convert a CJK bitmap font into subfonts usable by TeX and Omega.
 .
@@ -27,27 +27,27 @@ hbf2gf \- convert a CJK bitmap font into subfonts usable by TeX and Omega.
 .na
 .nh
 .B hbf2gf
-.RB [ -q ]
+.RB [ \-q ]
 .IR \%configuration-file [ .cfg ]
 .br
 .B hbf2gf
 'in +\n(.ku
-.RB [ -q ]
-.RB [ -p ]
-.RB [ -g ]
-.RB [ -n ]
+.RB [ \-q ]
+.RB [ \-p ]
+.RB [ \-g ]
+.RB [ \-n ]
 .I \%subfont-name \%x-resolution
 .RI [ \%y-scale \ | \ \%y-resolution ]
 .br
 .in
 .B hbf2gf
-.B -t
-.RB [ -q ]
+.B \-t
+.RB [ \-q ]
 .I \%subfont-name
 .br
-.B "hbf2gf --version"
+.B "hbf2gf \-\-version"
 |
-.B --help
+.B \-\-help
 .ad
 .hy
 .
@@ -140,7 +140,7 @@ can be called in three modes:
 .PP
 .in +2m
 .B hbf2gf
-.RB [ -q ]
+.RB [ \-q ]
 .IR configuration-file [ .cfg ]
 .PP
 .in +5m
@@ -183,7 +183,7 @@ files will be created too.
 .
 .PP
 .in +5m
-.B -q
+.B \-q
 makes
 .B hbf2gf
 quiet.
@@ -193,10 +193,10 @@ quiet.
 .nh
 .B hbf2gf
 'in +\n(.ku
-.RB [ -q ]
-.RB [ -p ]
-.RB [ -g ]
-.RB [ -n ]
+.RB [ \-q ]
+.RB [ \-p ]
+.RB [ \-g ]
+.RB [ \-n ]
 .I \%subfont-name \%x-resolution
 .RI [ \%y-scale \ | \ \%y-resolution ]
 .ad
@@ -222,24 +222,24 @@ stripped to get the name for the configuration file (which must end with
 .C \&.cfg \(cq).
 No job file will be created.
 If option
-.B -p
+.B \-p
 is set, no
 .C PL
 file is created.
 If
-.B -g
+.B \-g
 is set, no
 .C GF
 file is created.
 The extension can be controlled with
-.BR -n ;
+.BR \-n ;
 if set, the extension is \(oq\c
 .C \&.gf \(cq,
 otherwise \(oq\c
 .C \&. <\c
 .IR resolution >\c
 .C gf \(cq.
-.B -q
+.B \-q
 makes
 .B hbf2gf
 quiet.
@@ -250,8 +250,8 @@ quiet.
 .nh
 .B hbf2gf
 'in +\n(.ku
-.B -t
-.RB [ -q ]
+.B \-t
+.RB [ \-q ]
 .I \%subfont-name
 .ad
 .hy
@@ -264,7 +264,7 @@ it tests whether the specified subfont name leads to an
 configuration file.
 It returns 0 on success and prints out the name of that configuration file
 (provided the
-.B -q
+.B \-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.
@@ -272,13 +272,13 @@ and checks whether a configuration file with that name exists.
 See the next section for more details about configuration files.
 .PP
 Specifying the option
-.B --version
+.B \-\-version
 returns the current version of
 .B hbf2gf
 and the used file search library (e.g.\ \c
 .BR kpathsea ).
 Usage information is shown with the
-.B --help
+.B \-\-help
 parameter.
 .
 .
@@ -309,9 +309,9 @@ files:
 
   design_size    14.4
 
-  y_offset       -13
+  y_offset       \-13
 
-  nmb_files      -1
+  nmb_files      \-1
 
   output_name    gsfs14
 
@@ -439,7 +439,7 @@ A comment describing the font; default is none.
 .TP
 .B nmb_fonts
 The number of subfonts to create.
-Default value is -1 for creating all fonts.
+Default value is \-1 for creating all fonts.
 .TP
 .B unicode
 If \(oqyes\(cq, a two digit hexadecimal number will be used as a running number,
@@ -562,7 +562,7 @@ fonts, thus we use the paths for PostScript related stuff if necessary for
 fonts resp. configuration files.
 The actual version of kpathsea is displayed on screen if you call
 .B hbf2gf
-.BR --version .
+.BR \-\-version .
 .PP
 Here is a table of the file type and the corresponding
 .B kpathsea
@@ -630,22 +630,22 @@ hard-coded into the
 library.
 .PP
 .in +2m
-.C "kpsewhich -progname=hbf2gf -expand-var='$MISCFONTS'"
+.C "kpsewhich \-progname=hbf2gf \-expand\-var='$MISCFONTS'"
 .PP
 We select the program name also since it is possible to specify
-variables which are searched only for a certain program -- in our
+variables which are searched only for a certain program \(en in our
 example it would be
 .C MISCFONTS.hbf2gf .
 .PP
 A similar but not identical method is to say
 .PP
 .in +2m
-.C "kpsewhich -progname=hbf2gf -show-path='misc fonts'"
+.C "kpsewhich \-progname=hbf2gf \-show\-path='misc fonts'"
 .PP
 [A full list of format types can be obtained by saying \(oq\c
-.C "kpsewhich --help" \(cq
+.C "kpsewhich \-\-help" \(cq
 on the command line prompt.]
-This is exactly the how
+This is exactly how
 .B hbf2gf
 searches for files; the disadvantage is that all variables are expanded
 which can cause very long strings.
@@ -703,7 +703,7 @@ which can be converted into a pretty-printed \*(TX
 document using
 .BR cweave .
 The CJK package also contains a preformatted
-.C hbf2gf.dvi
+.C hbf2gf.pdf
 file.
 .PP
 the
@@ -715,7 +715,7 @@ the
 .B Hanzi Bitmap File
 .RB ( HBF )
 standard version\ 1.3; available at
-.C ftp.ifcss.org
+.C \%ftp.ifcss.org .
 .PP
 the Omega documentation available at
 .C ftp.ens.fr
@@ -727,7 +727,7 @@ and the CTAN hosts and mirrors.
 .C *.cfg
 The
 .B hbf2gf
-configuration scripts
+configuration scripts.
 .TP
 .C *.hbf
 HBF header files which describe fixed-width bitmap fonts.
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/hbf2gf.c b/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/hbf2gf.c
new file mode 100644
index 00000000000..061e4191221
--- /dev/null
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/hbf2gf.c
@@ -0,0 +1,2302 @@
+#define banner  \
+"hbf2gf (CJK ver. 4.8.2)" \
+ \
+
+#define TRUE 1
+#define FALSE 0 \
+
+#define STRING_LENGTH 255 \
+
+#define FILE_NAME_LENGTH 1024 \
+ \
+
+#define VERSION  \
+"\n" \
+"Copyright (C) 1996-1999 Werner Lemberg.\n" \
+"There is NO warranty.  You may redistribute this software\n" \
+"under the terms of the GNU General Public License\n" \
+"and the HBF library copyright.\n" \
+"\n" \
+"For more information about these matters, see the files\n" \
+"named COPYING and hbf.c.\n" \
+"\n" \
+
+#define USAGE  \
+"\n" \
+"Usage: hbf2gf [-q] configuration_file[.cfg]\n" \
+"       hbf2gf [options] font_name x_resolution [y_scale | y_resolution]\n" \
+"       hbf2gf -t [-q] font_name\n" \
+"\n" \
+"  Convert a font in HBF format to TeX's GF resp. PK format.\n" \
+"\n" \
+"         -q             be silent\n" \
+"         -p             don't produce a PL file\n" \
+"         -g             don't produce a GF file\n" \
+"         -n             use no resolution in extension (only `.gf')\n" \
+"         -t             test for font_name (returns 0 on success)\n" \
+"         --help         print this message and exit\n" \
+"         --version      print version number and exit\n" \
+"\n" \
+
+#define GF_ID 131
+#define PRE 247 \
+
+#define header " hbf2gf output " \
+
+#define BOC 67
+#define BOC1 68
+#define EOC 69 \
+
+#define _2_16 65536.0
+#define _2_20 1048576.0 \
+
+#define XXX1 239
+#define XXX2 240
+#define XXX3 241
+#define XXX4 242 \
+
+#define YYY 243 \
+
+#define POST 248 \
+
+#define CHAR_LOC 245
+#define CHAR_LOC0 246 \
+
+#define POSTPOST 249
+#define POSTPOST_ID 223 \
+
+#define BLACK 1
+#define WHITE 0 \
+
+#define PIXEL_MAXVAL 255
+#define SCALE 4096
+#define HALFSCALE 2048 \
+
+#define MAX_CHAR_SIZE 1023 \
+
+#define PAINT_(x) (x) 
+#define PAINT1 64
+#define PAINT2 65
+#define PAINT3 66 \
+
+#define SKIP0 70
+#define SKIP1 71
+#define SKIP2 72
+#define SKIP3 73 \
+
+#define NEW_ROW_(x) ((x) +74)  \
+
+#define NOOP 244 \
+
+#define EXTENSION_LENGTH 8 \
+
+#define GFTOPK_NAME "gftopk"
+#define PLTOTF_NAME "pltotf"
+#define OVP2OVF_NAME "ovp2ovf" \
+
+#define PRINTER_MIN_RES_X 50
+#define PRINTER_MIN_RES_Y 50 \
+
+#define VALID_SUBCODE 1 \
+
+/*4:*/
+#line 193 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+
+/*10:*/
+#line 413 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+
+#include <ctype.h> 
+#include <stdio.h> 
+#include <stdlib.h> 
+#include <string.h> 
+#include <time.h> 
+#ifdef TM_IN_SYS_TIME
+#include <sys/time.h> 
+#endif
+#include "hbf.h"
+
+
+
+/*:10*//*69:*/
+#line 2483 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+
+#if defined(HAVE_LIBKPATHSEA)
+#ifdef VERY_OLD_KPATHSEA
+#include "kpathsea/proginit.h"
+#include "kpathsea/progname.h"
+#include "kpathsea/tex-glyph.h"
+#else
+#include "kpathsea/kpathsea.h"
+#endif
+
+#elif defined(HAVE_EMTEXDIR)
+#include "emtexdir.h"
+
+#elif defined(HAVE_MIKTEX)
+#include "miktex.h"
+#endif
+
+/*:69*/
+#line 194 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+
+/*11:*/
+#line 431 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+
+void write_file(void);
+
+
+/*:11*//*13:*/
+#line 493 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+
+void write_pre(void);
+
+
+/*:13*//*16:*/
+#line 581 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+
+void write_data(void);
+
+
+/*:16*//*20:*/
+#line 692 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+
+void write_post(void);
+
+
+/*:20*//*25:*/
+#line 836 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+
+void fputl(long,FILE*);
+
+
+/*:25*//*29:*/
+#line 999 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+
+void make_pixel_array(void);
+
+
+/*:29*//*36:*/
+#line 1227 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+
+#ifdef __GNUC__
+__inline__
+#endif
+void read_row(unsigned char*);
+
+
+/*:36*//*39:*/
+#line 1279 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+
+#ifdef __GNUC__
+__inline__
+#endif
+void write_row(unsigned char*);
+
+
+/*:39*//*41:*/
+#line 1334 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+
+void write_coding(void);
+
+
+/*:41*//*45:*/
+#line 1495 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+
+void write_pl(void);
+
+
+/*:45*//*47:*/
+#line 1592 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+
+void write_ovp(void);
+
+
+/*:47*//*50:*/
+#line 1737 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+
+void write_job(void);
+
+
+/*:50*//*54:*/
+#line 1986 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+
+void read_config(void);
+
+
+/*:54*//*64:*/
+#line 2317 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+
+int fsearch(char*);
+
+
+/*:64*//*67:*/
+#line 2457 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+
+void config_error(char*);
+
+
+/*:67*//*71:*/
+#line 2517 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+
+char*TeX_search_version(void);
+
+
+/*:71*//*74:*/
+#line 2552 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+
+#ifdef HAVE_EMTEXDIR
+extern int setup_list(struct emtex_dir*,char*,const char*,unsigned);
+int dir_setup(struct emtex_dir*,const char*,const char*,unsigned);
+char*file_find(char*,struct emtex_dir*);
+#endif
+
+
+/*:74*//*79:*/
+#line 2649 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+
+char*TeX_search_cfg_file(char*);
+char*TeX_search_hbf_file(char*);
+
+
+/*:79*/
+#line 195 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+
+/*2:*/
+#line 129 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+
+int nmb_files= -1;
+int unicode= FALSE;
+
+int testing= FALSE;
+
+int mf_like= FALSE;
+int file_number= 0;
+
+double x_resolution= 0.0;
+double y_scale= 1.0;
+
+int pk_files= TRUE;
+int tfm_files= TRUE;
+int long_extension= TRUE;
+int quiet= FALSE;
+
+char config_file[FILE_NAME_LENGTH+4+1];
+
+char output_name[STRING_LENGTH+1];
+
+FILE*config,*out;
+HBF*hbf;
+
+#ifdef msdos 
+#define WRITE_BIN   "wb"
+#define WRITE_TXT   "wt"
+#define READ_BIN    "rb"
+#define READ_TXT    "rt"
+#else
+#define WRITE_BIN   "w"
+#define WRITE_TXT   "w"
+#define READ_BIN    "r"
+#define READ_TXT    "r"
+#endif
+
+int end_of_file= FALSE;
+
+
+/*:2*//*15:*/
+#line 540 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+
+long char_adr[256];
+long*char_adr_p;
+
+int pk_offset_x;
+
+
+double tfm_offset_x;
+int pk_offset_y;
+
+double tfm_offset_y;
+
+int input_size_x;
+int input_size_y;
+const char*font_encoding;
+int pk_width;
+int pk_output_size_x;
+
+double tfm_output_size_x;
+int pk_output_size_y;
+double tfm_output_size_y;
+
+double design_size= 10.0;
+double target_size_x;
+double target_size_y;
+double magstep_x;
+double magstep_y;
+double slant;
+int rotation;
+
+double mag_x;
+double mag_y;
+
+int empty_char;
+int last_char;
+
+int dot_count;
+
+
+
+/*:15*//*19:*/
+#line 669 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+
+char coding[STRING_LENGTH+1];
+char comment[STRING_LENGTH+1];
+
+unsigned long checksum;
+
+long pk_total_min_x;
+long pk_total_max_x;
+long pk_total_min_y;
+long pk_total_max_y;
+
+int dpi_x;
+int dpi_y;
+double ppp_x;
+double ppp_y;
+
+
+/*:19*//*27:*/
+#line 876 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+
+HBF_CHAR code;
+const unsigned char*bitmap;
+
+unsigned char*bP;
+
+unsigned char out_char[MAX_CHAR_SIZE*MAX_CHAR_SIZE+1];
+
+unsigned char*out_char_p;
+
+unsigned char pixelrow[MAX_CHAR_SIZE];
+unsigned char temp_pixelrow[MAX_CHAR_SIZE];
+unsigned char new_pixelrow[MAX_CHAR_SIZE+1];
+
+int curr_row;
+
+long grayrow[MAX_CHAR_SIZE];
+
+long s_mag_x,s_mag_y,s_slant;
+
+
+/*:27*//*38:*/
+#line 1274 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+
+int threshold= 128;
+
+
+/*:38*//*49:*/
+#line 1726 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+
+char job_extension[EXTENSION_LENGTH+1];
+char rm_command[STRING_LENGTH+1];
+char cp_command[STRING_LENGTH+1];
+char pk_directory[STRING_LENGTH+1];
+char tfm_directory[STRING_LENGTH+1];
+
+int ofm_file= FALSE;
+
+
+/*:49*//*53:*/
+#line 1981 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+
+char Buffer[STRING_LENGTH+1];
+
+
+/*:53*//*58:*/
+#line 2099 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+
+int offset_x;
+int offset_y;
+
+HBF_CHAR user_min_char;
+int have_min_char= FALSE;
+
+/*:58*//*60:*/
+#line 2256 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+
+HBF_CHAR min_char,max_char;
+
+
+/*:60*//*62:*/
+#line 2283 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+
+char b2_codes[256];
+unsigned char min_2_byte,max_2_byte;
+int nmb_2_bytes= 0;
+
+
+/*:62*//*70:*/
+#line 2501 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+
+#if defined(HAVE_LIBKPATHSEA)
+#ifdef KPSEDLL
+
+extern KPSEDLL char*kpathsea_version_string;
+#else
+extern DllImport char*kpathsea_version_string;
+#endif
+#elif defined(HAVE_EMTEXDIR)
+char emtex_version_string[]= "emTeXdir";
+#elif !defined(HAVE_MIKTEX)
+char no_version_string[]= "no search library";
+#endif
+
+
+/*:70*//*73:*/
+#line 2545 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+
+#ifdef HAVE_EMTEXDIR
+struct emtex_dir cfg_path,hbf_path;
+#endif
+
+
+/*:73*//*76:*/
+#line 2591 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+
+char name_buffer[FILE_NAME_LENGTH+1];
+
+
+/*:76*/
+#line 196 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+
+
+
+int main(argc,argv)
+int argc;
+char*argv[];
+
+{char*p;
+
+/*78:*/
+#line 2613 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+
+#if defined(HAVE_LIBKPATHSEA)
+#ifdef OLD_KPATHSEA
+kpse_set_progname(argv[0]);
+#else
+kpse_set_program_name(argv[0],"hbf2gf");
+#endif
+
+#ifdef VERY_OLD_KPATHSEA
+kpse_init_prog("HBF2GF",300,"cx",true,"cmr10");
+#else
+kpse_init_prog("HBF2GF",300,"cx","cmr10");
+#endif
+
+#elif defined(HAVE_EMTEXDIR)
+if(!dir_setup(&cfg_path,"HBFCFG",NULL,EDS_BANG))
+{fprintf(stderr,
+"Couldn't setup search path for configuration files\n");
+exit(1);
+}
+if(!dir_setup(&hbf_path,"HBFONTS",NULL,EDS_BANG))
+{fprintf(stderr,
+"Couldn't setup search path for HBF header files\n");
+exit(1);
+}
+#endif
+
+
+/*:78*/
+#line 205 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+
+
+/*7:*/
+#line 312 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+
+if(argc==2)
+{if(strcmp(argv[1],"--help")==0)
+/*6:*/
+#line 293 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+
+{printf(USAGE);
+exit(0);
+}
+
+
+/*:6*/
+#line 315 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+
+else if(strcmp(argv[1],"--version")==0)
+/*5:*/
+#line 266 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+
+{printf("\n");
+printf(banner);
+printf(" (%s)\n",TeX_search_version());
+printf(VERSION);
+exit(0);
+}
+
+
+/*:5*/
+#line 317 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+
+}
+
+while(argc> 1)
+{p= argv[1];
+if(p[0]!='-')
+break;
+if(p[1]=='p')
+tfm_files= FALSE;
+else if(p[1]=='g')
+pk_files= FALSE;
+else if(p[1]=='n')
+long_extension= FALSE;
+else if(p[1]=='q')
+quiet= TRUE;
+else if(p[1]=='t')
+testing= TRUE;
+
+argv++;
+argc--;
+}
+
+if(testing)
+{if(argc!=2)
+{fprintf(stderr,"Need exactly one parameter for `-t' option.\n");
+fprintf(stderr,"Try `hbf2gf --help' for more information.\n");
+exit(1);
+}
+}
+else if(argc<2||argc> 4)
+{fprintf(stderr,"Invalid number of parameters.\n");
+fprintf(stderr,"Try `hbf2gf --help' for more information.\n");
+exit(1);
+}
+
+
+/*:7*/
+#line 207 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+
+
+if(!quiet)
+printf("\n%s\n\n",banner);
+
+strncpy(config_file,argv[1],FILE_NAME_LENGTH);
+config_file[FILE_NAME_LENGTH]= '\0';
+
+if(argc> 2||testing)
+{int l= strlen(config_file);
+
+if(l> 2)
+config_file[l-2]= '\0';
+
+else
+{if(!quiet)
+printf("`%s' can't be a subfont created by hbf2gf\n",
+config_file);
+exit(2);
+}
+
+mf_like= TRUE;
+}
+
+read_config();
+
+if(mf_like)
+/*8:*/
+#line 357 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+
+{if(unicode)
+file_number= (int)strtol(&argv[1][strlen(argv[1])-2],
+(char**)NULL,16);
+else
+file_number= atoi(&argv[1][strlen(argv[1])-2]);
+
+x_resolution= atof(argv[2]);
+if(x_resolution<PRINTER_MIN_RES_X)
+{fprintf(stderr,"Invalid horizontal resolution\n");
+exit(1);
+}
+
+if(argc> 3)
+{y_scale= atof(argv[3]);
+if(y_scale<0.01)
+{fprintf(stderr,
+"Invalid vertical scaling factor or resolution\n");
+exit(1);
+}
+if(y_scale> 10.0)
+y_scale= (double)x_resolution/y_scale;
+}
+}
+
+
+/*:8*/
+#line 234 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+
+
+/*28:*/
+#line 908 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+
+{int col,offset;
+
+if(rotation)
+{int tmp;
+
+
+tmp= input_size_x;
+input_size_x= input_size_y;
+input_size_y= tmp;
+}
+
+if(mf_like)
+{target_size_x= design_size*(x_resolution/dpi_x);
+target_size_y= design_size*(x_resolution*y_scale/dpi_y);
+}
+else
+target_size_x= target_size_y= design_size;
+magstep_x= target_size_x/design_size;
+magstep_y= target_size_y/design_size;
+
+pk_offset_x= offset_x*magstep_x+0.5;
+pk_offset_y= offset_y*magstep_y+0.5;
+tfm_offset_x= offset_x/(dpi_x/72.27)/design_size;
+tfm_offset_y= offset_y/(dpi_y/72.27)/design_size;
+
+pk_width= input_size_x*mag_x*magstep_x+0.5;
+pk_output_size_x= input_size_x*mag_x*magstep_x+
+input_size_y*mag_y*magstep_y*slant+0.5;
+pk_output_size_y= input_size_y*mag_y*magstep_y+0.5;
+tfm_output_size_x= input_size_x*mag_x/
+(dpi_x/72.27)/design_size;
+tfm_output_size_y= input_size_y*mag_y/
+(dpi_y/72.27)/design_size;
+if(pk_output_size_x> MAX_CHAR_SIZE)
+{fprintf(stderr,"Output character box width too big\n");
+exit(1);
+}
+if(pk_output_size_y> MAX_CHAR_SIZE)
+{fprintf(stderr,"Output character box height too big\n");
+exit(1);
+}
+
+for(col= 0;col<input_size_x;++col)
+grayrow[col]= HALFSCALE;
+
+if(!mf_like)
+code= (min_char&0xFF00)+min_2_byte;
+else
+{if((file_number<(unicode?0:1))||(file_number>=0x100))
+{fprintf(stderr,"Invalid subfile number\n");
+exit(1);
+}
+
+if(unicode)
+{offset= 0;
+code= file_number*0x100;
+}
+else
+{offset= (file_number-1)*256%nmb_2_bytes;
+code= (min_char&0xFF00)+min_2_byte+
+(file_number-1)*256/nmb_2_bytes*0x100;
+}
+
+while(offset--)
+while(!b2_codes[code++&0xFF])
+
+;
+
+if(code> max_char)
+{fprintf(stderr,"Invalid subfile number\n");
+exit(1);
+}
+}
+
+s_mag_x= mag_x*magstep_x*SCALE;
+s_mag_y= mag_y*magstep_y*SCALE;
+s_slant= slant*SCALE;
+}
+
+
+/*:28*/
+#line 236 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+
+
+/*9:*/
+#line 392 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+
+{int j,max_numb;
+
+if(!mf_like)
+{file_number= (unicode==TRUE?(min_char>>8):1);
+if(nmb_files==-1)
+max_numb= (unicode==TRUE?0x100:100);
+else
+max_numb= nmb_files;
+}
+else
+max_numb= 1;
+
+for(j= 0;(j<max_numb)&&!end_of_file;file_number++,j++)
+write_file();
+
+nmb_files= j;
+}
+
+
+/*:9*/
+#line 238 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+
+
+if(tfm_files)
+write_pl();
+if(ofm_file)
+write_ovp();
+if(!mf_like)
+write_job();
+
+hbfClose(hbf);
+
+exit(0);
+return 0;
+}
+
+
+/*:4*//*12:*/
+#line 439 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+
+void write_file(void)
+{char output_file[FILE_NAME_LENGTH+1];
+
+
+if(pk_files)
+{if(mf_like)
+{if(unicode)
+sprintf(output_file,"%s%02x.%.0igf",
+output_name,file_number,
+long_extension?(int)(x_resolution+0.5):0);
+else
+sprintf(output_file,"%s%02i.%.0igf",
+output_name,file_number,
+long_extension?(int)(x_resolution+0.5):0);
+}
+else
+{if(unicode)
+sprintf(output_file,"%s%02x.gf",output_name,file_number);
+else
+sprintf(output_file,"%s%02i.gf",output_name,file_number);
+}
+if(!(out= fopen(output_file,WRITE_BIN)))
+{fprintf(stderr,"Couldn't open `%s'\n",output_file);
+exit(1);
+}
+if(!quiet)
+printf("Writing `%s' ",output_file);
+
+write_pre();
+write_data();
+write_post();
+fclose(out);
+
+if(!quiet)
+printf("\n");
+}
+else
+write_data();
+}
+
+
+/*:12*//*14:*/
+#line 500 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+
+void write_pre(void)
+{char out_s[40],s[20];
+time_t secs_now;
+struct tm*time_now;
+
+
+strcpy(out_s,header);
+
+secs_now= time(NULL);
+time_now= localtime(&secs_now);
+strftime(s,20,"%Y.%m.%d:%H.%M",time_now);
+strcat(out_s,s);
+
+fputc(PRE,out);
+fputc(GF_ID,out);
+fputc(strlen(out_s),out);
+fputs(out_s,out);
+}
+
+
+/*:14*//*17:*/
+#line 586 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+
+void write_data(void)
+{dot_count= 0;
+char_adr_p= char_adr;
+
+for(last_char= 0;(last_char<256)&&!end_of_file;last_char++)
+/*18:*/
+#line 611 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+
+{if(dot_count++%10==0)
+if(pk_files&&!quiet)
+{printf(".");
+fflush(stdout);
+}
+
+empty_char= FALSE;
+make_pixel_array();
+if(end_of_file)
+return;
+
+if(pk_files)
+{*char_adr_p= ftell(out);
+char_adr_p++;
+
+if(empty_char)
+{fputc(BOC1,out);
+fputc((unsigned char)last_char,out);
+fputc(0,out);
+fputc(0,out);
+fputc(0,out);
+fputc(0,out);
+fputc(EOC,out);
+}
+else
+{fputc(BOC,out);
+fputl(last_char,out);
+fputl(-1L,out);
+fputl(pk_offset_x,out);
+fputl(pk_output_size_x+pk_offset_x,out);
+fputl(pk_offset_y,out);
+fputl(pk_output_size_y+pk_offset_y,out);
+
+write_coding();
+
+fputc(EOC,out);
+}
+}
+}
+
+
+/*:18*/
+#line 592 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+
+}
+
+
+/*:17*//*21:*/
+#line 697 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+
+void write_post(void)
+{long special_adr;
+long post_adr;
+
+long designsize= design_size*_2_20;
+
+int pk_dx;
+long tfm_width;
+
+int i;
+long temp;
+
+
+ppp_x= dpi_x/72.27*magstep_x;
+ppp_y= dpi_y/72.27*magstep_y;
+
+pk_total_min_x= pk_offset_x;
+pk_total_max_x= pk_output_size_x+2*pk_offset_x;
+pk_total_min_y= pk_offset_y;
+pk_total_max_y= pk_output_size_y+pk_offset_y;
+
+pk_dx= pk_width+2*pk_offset_x;
+tfm_width= (tfm_output_size_x+2*tfm_offset_x)*_2_20;
+
+
+/*22:*/
+#line 743 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+
+special_adr= ftell(out);
+
+if(*coding)
+{fputc(XXX1,out);
+fputc(strlen(coding),out);
+fputs(coding,out);
+}
+
+if(*comment)
+{fputc(XXX1,out);
+fputc(strlen(comment),out);
+fputs(comment,out);
+}
+
+
+/*:22*/
+#line 723 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+
+/*23:*/
+#line 772 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+
+post_adr= ftell(out);
+fputc(POST,out);
+fputl(special_adr,out);
+
+fputl(designsize,out);
+fputl(checksum,out);
+fputl(ppp_x*_2_16,out);
+fputl(ppp_y*_2_16,out);
+fputl(pk_total_min_x,out);
+fputl(pk_total_max_x,out);
+fputl(pk_total_min_y,out);
+fputl(pk_total_max_y,out);
+
+char_adr_p= char_adr;
+
+if(pk_dx<256)
+{for(i= 0;i<last_char;i++)
+{fputc(CHAR_LOC0,out);
+fputc(i,out);
+fputc(pk_dx,out);
+fputl(tfm_width,out);
+fputl(*char_adr_p++,out);
+}
+}
+else
+{for(i= 0;i<last_char;i++)
+{fputc(CHAR_LOC,out);
+fputc(i,out);
+fputl(pk_dx*_2_16,out);
+fputl(0,out);
+fputl(tfm_width,out);
+fputl(*char_adr_p++,out);
+}
+}
+
+
+/*:23*/
+#line 724 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+
+/*24:*/
+#line 823 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+
+fputc(POSTPOST,out);
+fputl(post_adr,out);
+fputc(GF_ID,out);
+temp= ftell(out);
+i= (int)(temp%4)+4;
+while(i--)
+fputc(POSTPOST_ID,out);
+
+
+/*:24*/
+#line 725 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+
+}
+
+
+/*:21*//*26:*/
+#line 841 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+
+void fputl(num,f)
+long num;
+FILE*f;
+
+{fputc(num>>24,f);
+fputc(num>>16,f);
+fputc(num>>8,f);
+fputc(num,f);
+}
+
+
+/*:26*//*30:*/
+#line 1004 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+
+void make_pixel_array(void)
+{unsigned char*prP;
+unsigned char*temp_prP;
+unsigned char*new_prP;
+long*grP;
+
+register unsigned char*xP;
+register unsigned char*nxP;
+
+register int row,col;
+int rows_read= 0;
+register int need_to_read_row= 1;
+
+long frac_row_to_fill= SCALE;
+long frac_row_left= s_mag_y;
+
+int no_code= FALSE;
+
+
+prP= pixelrow;
+temp_prP= temp_pixelrow;
+new_prP= new_pixelrow;
+grP= grayrow;
+out_char_p= out_char;
+
+again:
+if(b2_codes[code&0xFF])
+{if(pk_files)
+{bitmap= hbfGetBitmap(hbf,code);
+bP= (unsigned char*)bitmap;
+
+
+if(!bitmap)
+empty_char= TRUE;
+else
+/*31:*/
+#line 1063 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+
+{if(pk_output_size_y==input_size_y)
+temp_prP= prP;
+
+curr_row= input_size_y-1;
+for(row= 0;row<pk_output_size_y;++row)
+{/*32:*/
+#line 1077 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+
+if(pk_output_size_y==input_size_y)
+
+read_row(prP);
+else
+{while(frac_row_left<frac_row_to_fill)
+{if(need_to_read_row)
+if(rows_read<input_size_y)
+{read_row(prP);
+++rows_read;
+}
+
+for(col= 0,xP= prP;col<input_size_x;++col,++xP)
+grP[col]+= frac_row_left*(*xP);
+
+frac_row_to_fill-= frac_row_left;
+frac_row_left= s_mag_y;
+need_to_read_row= 1;
+}
+
+/*33:*/
+#line 1104 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+
+if(need_to_read_row)
+if(rows_read<input_size_y)
+{read_row(prP);
+++rows_read;
+need_to_read_row= 0;
+}
+
+for(col= 0,xP= prP,nxP= temp_prP;
+col<input_size_x;++col,++xP,++nxP)
+{register long g;
+
+
+g= grP[col]+frac_row_to_fill*(*xP);
+g/= SCALE;
+if(g> PIXEL_MAXVAL)
+g= PIXEL_MAXVAL;
+
+*nxP= g;
+grP[col]= HALFSCALE;
+}
+
+frac_row_left-= frac_row_to_fill;
+if(frac_row_left==0)
+{frac_row_left= s_mag_y;
+need_to_read_row= 1;
+}
+frac_row_to_fill= SCALE;
+
+
+/*:33*/
+#line 1097 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+
+}
+
+
+/*:32*/
+#line 1069 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+
+/*34:*/
+#line 1145 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+
+if(pk_width==input_size_x&&s_slant==0)
+
+write_row(temp_prP);
+else
+{register long g= HALFSCALE;
+register long frac_col_to_fill= SCALE;
+register long frac_col_left;
+register int need_col= 0;
+
+
+nxP= new_prP;
+
+frac_col_left= (pk_output_size_y-row)*s_slant;
+while(frac_col_left>=frac_col_to_fill)
+{*(nxP++)= 0;
+frac_col_left-= frac_col_to_fill;
+}
+
+if(frac_col_left> 0)
+frac_col_to_fill-= frac_col_left;
+
+for(col= 0,xP= temp_prP;col<input_size_x;++col,++xP)
+{frac_col_left= s_mag_x;
+while(frac_col_left>=frac_col_to_fill)
+{if(need_col)
+{++nxP;
+g= HALFSCALE;
+}
+
+g+= frac_col_to_fill*(*xP);
+g/= SCALE;
+if(g> PIXEL_MAXVAL)
+g= PIXEL_MAXVAL;
+
+*nxP= g;
+frac_col_left-= frac_col_to_fill;
+frac_col_to_fill= SCALE;
+need_col= 1;
+}
+
+if(frac_col_left> 0)
+{if(need_col)
+{++nxP;
+g= HALFSCALE;
+need_col= 0;
+}
+
+g+= frac_col_left*(*xP);
+frac_col_to_fill-= frac_col_left;
+}
+}
+
+/*35:*/
+#line 1203 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+
+if(frac_col_to_fill> 0)
+{--xP;
+g+= frac_col_to_fill*(*xP);
+}
+
+if(!need_col)
+{g/= SCALE;
+if(g> PIXEL_MAXVAL)
+g= PIXEL_MAXVAL;
+*nxP= g;
+}
+
+*(++nxP)= 0;
+
+write_row(new_prP);
+
+
+/*:35*/
+#line 1198 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+
+}
+
+
+/*:34*/
+#line 1071 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+
+}
+}
+
+
+/*:31*/
+#line 1040 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+
+}
+}
+else
+no_code= TRUE;
+
+if((code&0xFF)==max_2_byte)
+code+= 0xFF-(max_2_byte-min_2_byte);
+if(code>=max_char)
+{end_of_file= TRUE;
+return;
+}
+
+code++;
+
+if(no_code)
+{no_code= FALSE;
+goto again;
+}
+}
+
+
+/*:30*//*37:*/
+#line 1235 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+
+#ifdef __GNUC__
+__inline__
+#endif
+void read_row(pixelrow)
+unsigned char*pixelrow;
+
+{register int col,bitshift,offset;
+register unsigned char*xP;
+register unsigned char item= 0;
+
+if(rotation)
+{bitshift= 7-(curr_row%8);
+offset= (input_size_y+7)/8;
+bP= (unsigned char*)bitmap+curr_row/8;
+for(col= 0,xP= pixelrow;col<input_size_x;++col,++xP)
+{*xP= ((*bP>>bitshift)&1)==1?PIXEL_MAXVAL:0;
+bP+= offset;
+}
+curr_row--;
+}
+else
+{bitshift= -1;
+for(col= 0,xP= pixelrow;col<input_size_x;++col,++xP)
+{if(bitshift==-1)
+{item= *(bP++);
+bitshift= 7;
+}
+*xP= ((item>>bitshift)&1)==1?PIXEL_MAXVAL:0;
+--bitshift;
+}
+}
+}
+
+
+/*:37*//*40:*/
+#line 1287 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+
+#ifdef __GNUC__
+__inline__
+#endif
+void write_row(pixelrow)
+unsigned char*pixelrow;
+
+{register int col;
+register unsigned char*xP;
+
+for(col= 0,xP= pixelrow;col<pk_output_size_x;++col,++xP)
+*(out_char_p++)= (*xP>=threshold)?1:0;
+
+}
+
+
+/*:40*//*42:*/
+#line 1342 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+
+void write_coding(void)
+{register int count,skip;
+register unsigned char paint;
+register int x,y;
+register unsigned char*cp;
+
+x= 0;
+y= 0;
+cp= out_char+y*pk_output_size_x+x;
+count= skip= 0;
+paint= WHITE;
+goto start;
+
+while(y<pk_output_size_y)
+{/*43:*/
+#line 1366 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+
+count= 0;
+x= 0;
+cp= out_char+y*pk_output_size_x+x;
+
+while(x<pk_output_size_x)
+{if(*cp==paint)
+count++;
+else
+{if(skip==0)
+{if(count<=164)
+fputc(NEW_ROW_(count),out);
+else
+{fputc(SKIP0,out);
+
+if(count<256)
+{fputc(PAINT1,out);
+fputc(count,out);
+}
+else
+{fputc(PAINT2,out);
+fputc(count>>8,out);
+fputc(count&0xFF,out);
+}
+}
+}
+else
+{if(skip==1)
+fputc(SKIP0,out);
+else
+{if(skip<256)
+{fputc(SKIP1,out);
+fputc(skip,out);
+}
+else
+{fputc(SKIP2,out);
+fputc(skip>>8,out);
+fputc(skip&0xFF,out);
+}
+}
+skip= 0;
+if(count<64)
+fputc(PAINT_(count),out);
+else if(count<256)
+{fputc(PAINT1,out);
+fputc(count,out);
+}
+else
+{fputc(PAINT2,out);
+fputc(count>>8,out);
+fputc(count&0xFF,out);
+}
+}
+count= 0;
+paint= BLACK;
+break;
+}
+x++;
+cp++;
+}
+if(x>=pk_output_size_x)
+{skip++;
+y++;
+continue;
+}
+
+
+/*:43*/
+#line 1357 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+
+start:
+/*44:*/
+#line 1434 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+
+while(x<pk_output_size_x)
+{if(*cp==paint)
+count++;
+else
+{if(count<64)
+fputc(PAINT_(count),out);
+else if(count<256)
+{fputc(PAINT1,out);
+fputc(count,out);
+}
+else
+{fputc(PAINT2,out);
+fputc(count>>8,out);
+fputc(count&0xFF,out);
+}
+count= 1;
+paint= BLACK-paint;
+}
+x++;
+cp++;
+}
+if(paint==BLACK)
+{if(count<64)
+fputc(PAINT_(count),out);
+else if(count<256)
+{fputc(PAINT1,out);
+fputc(count,out);
+}
+else
+{fputc(PAINT2,out);
+fputc(count>>8,out);
+fputc(count&0xFF,out);
+}
+paint= WHITE;
+}
+
+
+
+/*:44*/
+#line 1359 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+
+y++;
+}
+}
+
+
+/*:42*//*46:*/
+#line 1500 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+
+void write_pl(void)
+{int i,pos;
+char output_file[FILE_NAME_LENGTH+1];
+long t,sc;
+char*s;
+char tfm_header[]= "Created by hbf2gf";
+
+file_number--;
+
+if(mf_like)
+{if(unicode)
+sprintf(output_file,"%s%02x.pl",output_name,file_number);
+else
+sprintf(output_file,"%s%02i.pl",output_name,file_number);
+}
+else
+sprintf(output_file,"%s.pl",output_name);
+
+if(!(out= fopen(output_file,WRITE_TXT)))
+{fprintf(stderr,"Couldn't open `%s'\n",output_file);
+exit(1);
+}
+if(!quiet)
+printf("\nWriting `%s'\n",output_file);
+
+fprintf(out,
+"\n(FAMILY %s%d)"
+"\n(CODINGSCHEME CJK-%s)",
+output_name,file_number,font_encoding);
+
+fprintf(out,
+"\n(DESIGNSIZE R %.6f)"
+"\n(COMMENT DESIGNSIZE IS IN POINTS)"
+"\n(COMMENT OTHER SIZES ARE MULTIPLES OF DESIGNSIZE)"
+"\n(CHECKSUM O %lo)"
+"\n(FONTDIMEN"
+"\n   (SLANT R %.6f)"
+"\n   (SPACE R 0.0)"
+"\n   (STRETCH R 0.0)"
+"\n   (SHRINK R 0.0)"
+"\n   (XHEIGHT R 1.0)"
+"\n   (QUAD R 1.0)"
+"\n   (EXTRASPACE R 0.0)"
+"\n   )",design_size,checksum,slant);
+
+s= tfm_header;
+i= strlen(s);
+t= ((long)i)<<24;
+sc= 16;
+pos= 18;
+
+fprintf(out,"\n");
+while(i> 0)
+{t|= ((long)(*(unsigned char*)s++))<<sc;
+sc-= 8;
+if(sc<0)
+{fprintf(out,"\n(HEADER D %d O %lo)",pos,t);
+t= 0;
+sc= 24;
+pos++;
+}
+i--;
+}
+if(t)
+fprintf(out,"\n(HEADER D %d O %lo)",pos,t);
+fprintf(out,"\n");
+
+for(i= 0;i<256;i++)
+{fprintf(out,
+"\n(CHARACTER O %o"
+"\n   (CHARWD R %.6f)"
+"\n   (CHARHT R %.6f)"
+"\n   (CHARDP R %.6f)"
+"\n   (CHARIC R %.6f)"
+"\n   )",
+i,
+tfm_output_size_x+2*tfm_offset_x,
+tfm_output_size_y+tfm_offset_y,
+-tfm_offset_y,
+slant*(tfm_output_size_y+tfm_offset_y));
+}
+
+fclose(out);
+}
+
+
+
+/*:46*//*48:*/
+#line 1597 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+
+void write_ovp(void)
+{int c,i,nmb_subfonts,remainder,count,pos;
+char output_file[FILE_NAME_LENGTH+1];
+long t,sc;
+char*s;
+char ofm_header[]= "Created by hbf2gf";
+
+nmb_subfonts= ((max_char-(min_char&0xFF00))/256*nmb_2_bytes)
+/256+1;
+remainder= ((max_char-(min_char&0xFF00))/256*nmb_2_bytes)
+%256;
+
+
+for(count= 0;count<(max_char&0xFF);count++)
+if(b2_codes[count])
+remainder++;
+if(remainder>=256)
+nmb_subfonts++;
+
+sprintf(output_file,"%s.ovp",output_name);
+
+if(!(out= fopen(output_file,WRITE_TXT)))
+{fprintf(stderr,"Couldn't open `%s'\n",output_file);
+exit(1);
+}
+if(!quiet)
+printf("\nWriting `%s'\n",output_file);
+
+fprintf(out,
+"\n(VTITLE Omega virtual font created by hbf2gf)"
+"\n(DESIGNSIZE R %.6f)"
+"\n(COMMENT DESIGNSIZE IS IN POINTS)"
+"\n(COMMENT OTHER SIZES ARE MULTIPLES OF DESIGNSIZE)"
+"\n(CHECKSUM O %lo)"
+"\n(FONTDIMEN"
+"\n   (SLANT R %.6f)"
+"\n   (SPACE R 0.0)"
+"\n   (STRETCH R 0.0)"
+"\n   (SHRINK R 0.0)"
+"\n   (XHEIGHT R 1.0)"
+"\n   (QUAD R 1.0)"
+"\n   (EXTRASPACE R 0.0)"
+"\n   )",design_size,checksum,slant);
+
+s= ofm_header;
+i= strlen(s);
+t= ((long)i)<<24;
+sc= 16;
+pos= 18;
+
+fprintf(out,"\n");
+while(i> 0)
+{t|= ((long)(*(unsigned char*)s++))<<sc;
+sc-= 8;
+if(sc<0)
+{fprintf(out,"\n(HEADER D %d O %lo)",pos,t);
+t= 0;
+sc= 24;
+pos++;
+}
+i--;
+}
+if(t)
+fprintf(out,"\n(HEADER D %d O %lo)",pos,t);
+fprintf(out,"\n");
+
+for(i= 0;i<nmb_subfonts;i++)
+{fprintf(out,
+"\n(MAPFONT D %i"
+"\n   (FONTNAME %s%02i)"
+"\n   (FONTCHECKSUM O %lo)"
+"\n   (FONTAT R 1.0)"
+"\n   (FONTDSIZE R %.6f)"
+"\n   )",i,output_name,i+1,checksum,design_size);
+}
+
+for(c= min_char,i= 0,count= 0;c<=max_char;c++)
+{if(b2_codes[c&0xFF]==VALID_SUBCODE)
+{fprintf(out,
+"\n(CHARACTER O %o"
+"\n   (CHARWD R %.6f)"
+"\n   (CHARHT R %.6f)"
+"\n   (CHARDP R %.6f)"
+"\n   (CHARIC R %.6f)"
+"\n   (MAP"
+"\n      (SELECTFONT D %i)"
+"\n      (SETCHAR O %o)"
+"\n      )"
+"\n   )",
+c,
+tfm_output_size_x+2*tfm_offset_x,
+tfm_output_size_y+tfm_offset_y,
+-tfm_offset_y,
+slant*(tfm_output_size_y+tfm_offset_y),
+i,
+count);
+
+count++;
+if(count==256)
+{count= 0;
+i++;
+}
+}
+else
+continue;
+}
+
+fclose(out);
+}
+
+
+
+/*:48*//*51:*/
+#line 1742 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+
+void write_job(void)
+{FILE*out;
+int i,j;
+char buffer[FILE_NAME_LENGTH+1];
+
+
+strcpy(buffer,output_name);
+strcat(buffer,job_extension);
+if(!(out= fopen(buffer,WRITE_TXT)))
+{fprintf(stderr,"Couldn't open `%s'\n",buffer);
+exit(1);
+}
+if(!quiet)
+printf("\nWriting `%s'\n",buffer);
+
+if(pk_files)
+{if(unicode)
+{for(i= (min_char>>8),j= 0;j<nmb_files;i++,j++)
+fprintf(out,
+"%s %s%02x.gf %s%s%02x.%.0ipk\n"
+"%s %s%02x.gf\n",
+GFTOPK_NAME,output_name,i,
+pk_directory,output_name,i,
+long_extension?(int)(dpi_x*magstep_x+0.5):0,
+rm_command,output_name,i);
+}
+else
+{for(i= 1;i<=nmb_files;i++)
+fprintf(out,
+"%s %s%02i.gf %s%s%02i.%.0ipk\n"
+"%s %s%02i.gf\n",
+GFTOPK_NAME,output_name,i,
+pk_directory,output_name,i,
+long_extension?(int)(dpi_x*magstep_x+0.5):0,
+rm_command,output_name,i);
+}
+}
+
+if(tfm_files)
+{fprintf(out,
+"\n"
+"%s %s.pl %s.tfm\n"
+"%s %s.pl\n"
+"\n",
+PLTOTF_NAME,output_name,output_name,
+rm_command,output_name);
+
+if(unicode)
+{for(i= (min_char>>8),j= 0;j<nmb_files;i++,j++)
+fprintf(out,
+"%s %s.tfm %s%s%02x.tfm\n",
+cp_command,output_name,
+tfm_directory,output_name,i);
+}
+else
+{for(i= 1;i<=nmb_files;i++)
+fprintf(out,
+"%s %s.tfm %s%s%02i.tfm\n",
+cp_command,output_name,
+tfm_directory,output_name,i);
+}
+
+fprintf(out,
+"\n"
+"%s %s.tfm",
+rm_command,output_name);
+}
+
+if(ofm_file)
+{fprintf(out,
+"\n"
+"%s %s.ovp %s.ovf %s.ofm\n"
+"%s %s.ovp\n"
+"\n",
+OVP2OVF_NAME,output_name,output_name,output_name,
+rm_command,output_name);
+}
+
+fclose(out);
+}
+
+
+
+/*:51*//*55:*/
+#line 1994 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+
+void read_config(void)
+{HBF_BBOX*boxp;
+char*real_config_file;
+
+
+/*56:*/
+#line 2046 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+
+{int i,lastext= -1;
+
+for(i= 0;config_file[i];i++)
+if(config_file[i]=='.')
+lastext= i;
+else if(config_file[i]=='/'||
+config_file[i]==':'||
+config_file[i]=='\\')
+lastext= -1;
+
+if(lastext==-1)
+strcat(config_file,".cfg");
+}
+
+
+/*:56*/
+#line 2000 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+
+
+real_config_file= TeX_search_cfg_file(config_file);
+if(!real_config_file)
+{if(mf_like)
+{if(!quiet)
+printf("Couldn't find `%s'\n",config_file);
+exit(2);
+}
+else
+{fprintf(stderr,"Couldn't find `%s'\n",config_file);
+exit(1);
+}
+}
+
+if(!(config= fopen(real_config_file,READ_TXT)))
+{if(!testing)
+{fprintf(stderr,"Couldn't open `%s'\n",config_file);
+exit(1);
+}
+else
+{if(!quiet)
+fprintf(stderr,"Couldn't find or open `%s'\n",config_file);
+exit(2);
+}
+}
+
+if(testing)
+{if(!quiet)
+printf("%s\n",real_config_file);
+exit(0);
+}
+
+/*57:*/
+#line 2063 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+
+{char hbf_header[STRING_LENGTH+1];
+char*real_hbf_header;
+
+if(!fsearch("hbf_header"))
+config_error("hbf_header");
+else
+strcpy(hbf_header,Buffer);
+
+real_hbf_header= TeX_search_hbf_file(hbf_header);
+if(!real_hbf_header)
+{fprintf(stderr,"Couldn't find `%s'\n",hbf_header);
+exit(1);
+}
+
+hbfDebug= 1;
+
+
+if(!(hbf= hbfOpen(real_hbf_header)))
+exit(1);
+
+hbfDebug= 0;
+
+boxp= hbfBitmapBBox(hbf);
+input_size_x= boxp->hbf_height;
+input_size_y= boxp->hbf_width;
+font_encoding= hbfProperty(hbf,"HBF_CODE_SCHEME");
+
+if(!fsearch("output_name"))
+config_error("output_name");
+else
+strcpy(output_name,Buffer);
+}
+
+
+/*:57*/
+#line 2033 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+
+/*59:*/
+#line 2107 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+
+{if(fsearch("nmb_files"))
+nmb_files= atoi(Buffer);
+if(fsearch("unicode"))
+if(Buffer[0]=='y'||Buffer[0]=='Y')
+unicode= TRUE;
+if(fsearch("min_char"))
+{user_min_char= strtoul(Buffer,(char**)NULL,0);
+have_min_char= TRUE;
+}
+
+if(!mf_like)
+{if(fsearch("pk_files"))
+if(Buffer[0]=='n'||Buffer[0]=='N')
+pk_files= FALSE;
+if(fsearch("tfm_files"))
+if(Buffer[0]=='n'||Buffer[0]=='N')
+tfm_files= FALSE;
+if(fsearch("ofm_file"))
+if(Buffer[0]=='y'||Buffer[0]=='Y')
+ofm_file= TRUE;
+if(fsearch("long_extension"))
+if(Buffer[0]=='n'||Buffer[0]=='N')
+long_extension= FALSE;
+}
+
+if(fsearch("slant"))
+slant= atof(Buffer);
+if(slant<0.0||slant> 1.0)
+{fprintf(stderr,"Invalid slant\n");
+exit(1);
+}
+if(fsearch("rotation"))
+if(Buffer[0]=='y'||Buffer[0]=='Y')
+rotation= TRUE;
+
+if(fsearch("mag_x"))
+mag_x= atof(Buffer);
+if(fsearch("mag_y"))
+mag_y= atof(Buffer);
+if(!mag_x&&!mag_y)
+{mag_x= 1.0;
+mag_y= 1.0;
+}
+if(mag_x&&!mag_y)
+mag_y= mag_x;
+if(mag_y&&!mag_x)
+mag_x= mag_y;
+if(mag_x<=0.0)
+{fprintf(stderr,"Invalid horizontal magnification\n");
+exit(1);
+}
+if(mag_y<=0.0)
+{fprintf(stderr,"Invalid vertical magnification\n");
+exit(1);
+}
+
+if(fsearch("dpi_x"))
+dpi_x= atoi(Buffer);
+if(fsearch("dpi_y"))
+dpi_y= atoi(Buffer);
+if(!dpi_x&&!dpi_y)
+{dpi_x= 300;
+dpi_y= 300;
+}
+if(dpi_x&&!dpi_y)
+dpi_y= dpi_x;
+if(dpi_y&&!dpi_x)
+dpi_x= dpi_y;
+if(dpi_x<=PRINTER_MIN_RES_X)
+{fprintf(stderr,"Invalid horizontal printer resolution\n");
+exit(1);
+}
+if(dpi_y<=PRINTER_MIN_RES_Y)
+{fprintf(stderr,"Invalid vertical printer resolution\n");
+exit(1);
+}
+
+if(fsearch("design_size"))
+design_size= atof(Buffer);
+
+if(fsearch("x_offset"))
+offset_x= atoi(Buffer);
+else
+offset_x= rotation?0:(boxp->hbf_xDisplacement*mag_x+0.5);
+if(fsearch("y_offset"))
+offset_y= atoi(Buffer);
+else
+offset_y= rotation?0:(boxp->hbf_yDisplacement*mag_y+0.5);
+if(!fsearch("comment"))
+comment[0]= '\0';
+else
+strcpy(comment,Buffer);
+
+if(fsearch("threshold"))
+threshold= atoi(Buffer);
+if(threshold<=0||threshold>=255)
+{fprintf(stderr,"Invalid threshold\n");
+exit(1);
+}
+
+if(!fsearch("checksum"))
+checksum= 0;
+else
+checksum= strtoul(Buffer,(char**)NULL,0);
+
+if(!fsearch("coding"))
+coding[0]= '\0';
+else
+strcpy(coding,Buffer);
+
+if(!fsearch("pk_directory"))
+pk_directory[0]= '\0';
+else
+strcpy(pk_directory,Buffer);
+
+if(!fsearch("tfm_directory"))
+tfm_directory[0]= '\0';
+else
+strcpy(tfm_directory,Buffer);
+
+if(fsearch("rm_command"))
+strcpy(rm_command,Buffer);
+else
+strcpy(rm_command,"rm");
+
+if(fsearch("cp_command"))
+strcpy(cp_command,Buffer);
+else
+strcpy(cp_command,"cp");
+
+if(!fsearch("job_extension"))
+job_extension[0]= '\0';
+else
+{strncpy(job_extension,Buffer,EXTENSION_LENGTH);
+job_extension[EXTENSION_LENGTH]= '\0';
+}
+}
+
+
+/*:59*/
+#line 2034 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+
+
+/*61:*/
+#line 2261 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+
+{const void*cp;
+HBF_CHAR dummy;
+
+cp= hbfGetCodeRange(hbf,NULL,&min_char,&max_char);
+for(;cp!=NULL;cp= hbfGetCodeRange(hbf,cp,&dummy,&max_char))
+;
+
+if(have_min_char)
+min_char= user_min_char;
+}
+
+
+/*:61*/
+#line 2036 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+
+/*63:*/
+#line 2290 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+
+{const void*b2r;
+unsigned char dummy;
+int i;
+
+for(i= 0;i<256;i++)
+b2_codes[i]= 0;
+
+b2r= hbfGetByte2Range(hbf,NULL,&min_2_byte,&max_2_byte);
+dummy= min_2_byte;
+for(;b2r!=NULL;b2r= hbfGetByte2Range(hbf,b2r,&dummy,&max_2_byte))
+{for(i= dummy;i<=max_2_byte;i++)
+b2_codes[i]= VALID_SUBCODE;
+}
+
+for(i= 0;i<256;i++)
+if(b2_codes[i]==VALID_SUBCODE)
+nmb_2_bytes++;
+}
+
+
+/*:63*/
+#line 2037 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+
+
+fclose(config);
+}
+
+
+/*:55*//*65:*/
+#line 2322 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+
+int fsearch(search_string)
+char*search_string;
+
+{char*P,p;
+char temp_buffer[STRING_LENGTH+1];
+char env_name[STRING_LENGTH+1];
+char*env_p;
+char*env_value;
+char*Buf_p;
+int Ch,ch,old_ch= '\n';
+int count= STRING_LENGTH;
+
+rewind(config);
+
+do
+{P= search_string;
+p= tolower(*P);
+Ch= fgetc(config);
+ch= tolower(Ch);
+while(!(ch==p&&old_ch=='\n')&&Ch!=EOF)
+
+
+{old_ch= ch;
+Ch= fgetc(config);
+ch= tolower(Ch);
+}
+
+for(;;)
+{if(*(++P)=='\0')
+if((Ch= fgetc(config))==' '||Ch=='\t')
+
+goto success;
+Ch= fgetc(config);
+if(tolower(Ch)!=tolower(*P))
+break;
+}
+}
+while(Ch!=EOF);
+
+return 0;
+
+success:
+P= temp_buffer;
+
+while((Ch= fgetc(config))==' '||Ch=='\t')
+
+;
+while(Ch!='\n'&&--count> 0&&Ch!=EOF)
+{*P++= Ch;
+Ch= fgetc(config);
+}
+*P= '\0';
+
+if(*temp_buffer)
+/*66:*/
+#line 2402 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+
+{P= temp_buffer;
+Buf_p= Buffer;
+count= STRING_LENGTH-1;
+
+while(*P&&count> 0)
+{env_p= env_name;
+
+if(*P=='$')
+{P++;
+if(*P=='$')
+{*(Buf_p++)= *(P++);
+count--;
+continue;
+}
+while(*P=='{')
+P++;
+if(!(isalpha(*P)||*P=='_'))
+{fprintf(stderr,
+"Invalid environment variable name in configuration file\n");
+exit(1);
+}
+*(env_p++)= *(P++);
+while(*P)
+{if(isalnum(*P)||*P=='_')
+*(env_p++)= *(P++);
+else
+{while(*P=='}')
+P++;
+*env_p= '\0';
+break;
+}
+}
+
+env_value= getenv(env_name);
+if(env_value)
+{while(*env_value&&count> 0)
+{*(Buf_p++)= *(env_value++);
+count--;
+}
+}
+}
+else
+{*(Buf_p++)= *(P++);
+count--;
+}
+}
+*Buf_p= '\0';
+}
+
+
+/*:66*/
+#line 2377 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+
+else
+*Buffer= '\0';
+
+return(*Buffer)?1:0;
+}
+
+
+/*:65*//*68:*/
+#line 2462 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+
+void config_error(message)
+char*message;
+
+{fprintf(stderr,"Couldn't find `%s' entry in configuration file\n",
+message);
+exit(1);
+}
+
+
+
+/*:68*//*72:*/
+#line 2522 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+
+char*TeX_search_version(void)
+{
+#if defined(HAVE_LIBKPATHSEA)
+return kpathsea_version_string;
+#elif defined(HAVE_EMTEXDIR)
+return emtex_version_string;
+#elif defined(HAVE_MIKTEX)
+char buf[200];
+
+strcpy(buf,"MiKTeX ");
+miktex_get_miktex_version_string_ex(buf+7,sizeof(buf)-7);
+
+return buf;
+#else
+return no_version_string;
+#endif
+}
+
+
+/*:72*//*75:*/
+#line 2564 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+
+#ifdef HAVE_EMTEXDIR
+int dir_setup(ed,env,dir,flags)
+struct emtex_dir*ed;
+const char*env;
+const char*dir;
+unsigned flags;
+
+{const char*val;
+char path[260];
+
+ed->alloc= 0;
+ed->used= 0;
+ed->list= NULL;
+
+if(env!=NULL&&(val= getenv(env))!=NULL)
+return setup_list(ed,path,val,flags);
+else
+fprintf(stderr,
+"Environment variable `%s' not set; use current directory\n",
+env);
+
+return TRUE;
+}
+
+
+/*:75*//*77:*/
+#line 2596 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+
+char*file_find(name,list)
+char*name;
+struct emtex_dir*list;
+
+{if(emtex_dir_find(name_buffer,sizeof(name_buffer),list,name,EDF_CWD))
+return name_buffer;
+
+return NULL;
+}
+#endif
+
+
+/*:77*//*80:*/
+#line 2655 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+
+#if defined(HAVE_LIBKPATHSEA)
+char*TeX_search_cfg_file(name)
+char*name;
+
+{
+#ifdef OLD_KPATHSEA
+return kpse_find_file(name,kpse_dvips_config_format,TRUE);
+#else
+return kpse_find_file(name,kpse_program_text_format,TRUE);
+#endif
+}
+
+
+char*TeX_search_hbf_file(name)
+char*name;
+
+{
+#ifdef VERY_OLD_KPATHSEA
+return kpse_find_file(name,kpse_dvips_header_format,TRUE);
+#else
+#ifndef KPSEDLL
+return kpse_find_file(name,kpse_type1_format,TRUE);
+#else
+return kpse_find_file(name,kpse_miscfonts_format,TRUE);
+#endif
+#endif
+}
+
+
+#elif defined(HAVE_EMTEXDIR)
+char*TeX_search_cfg_file(name)
+char*name;
+
+{return file_find(name,&cfg_path);
+}
+
+
+char*TeX_search_hbf_file(name)
+char*name;
+
+{return file_find(name,&hbf_path);
+}
+
+
+#elif defined(HAVE_MIKTEX)
+char*TeX_search_cfg_file(name)
+char*name;
+
+{char result[_MAX_PATH];
+
+if(!miktex_find_input_file("hbf2gf",*name,result))
+return 0;
+return strdup(result);
+}
+
+
+char*TeX_search_hbf_file(name)
+char*name;
+
+{char result[_MAX_PATH];
+
+
+if(!miktex_find_miscfont_file(*name,result))
+return 0;
+return strdup(result);
+}
+
+
+#else
+char*TeX_search_cfg_file(name)
+char*name;
+
+{return name;
+}
+
+
+char*TeX_search_hbf_file(name)
+char*name;
+
+{return name;
+}
+#endif
+
+
+
+/*:80*/
diff --git a/Build/source/texk/cjkutils/hbf2gf/hbf2gf.def b/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/hbf2gf.def
index 25eeb107b7e..0137e4ac9e3 100644
--- a/Build/source/texk/cjkutils/hbf2gf/hbf2gf.def
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/hbf2gf.def
@@ -1,3 +1,3 @@
 NAME HBF2GF WINDOWCOMPAT
-DESCRIPTION 'hbf2gf (CJK Ver. 4.7.0)'
+DESCRIPTION 'hbf2gf (CJK Ver. 4.8.2)'
 STACKSIZE 0x80000
diff --git a/Build/source/texk/cjkutils/hbf2gf/hbf2gf.w b/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/hbf2gf.w
index 19a6cb6425b..f96282776f1 100644
--- a/Build/source/texk/cjkutils/hbf2gf/hbf2gf.w
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/hbf2gf.w
@@ -1,6 +1,6 @@
-% This is the cweb file hbf2gf.w of the CJK package ver. 4.7.0  17-Oct-2006
+% This is the cweb file hbf2gf.w of the CJK package ver. 4.8.2  29-Dec-2008
 
-% Copyright (C) 1994-2006  Werner Lemberg <wl@@gnu.org>
+% Copyright (C) 1994-2008  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.7.0)}
+\def\title{hbf2gf (CJK Version 4.8.2)}
 
 \def\topofcontents{
   \null\vfill
   \centerline{\titlefont The {\ttitlefont hbf2gf} program}
   \vskip 20pt
-  \centerline{(CJK Version 4.7.0)}
+  \centerline{(CJK Version 4.8.2)}
   \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.7.0)"
+"hbf2gf (CJK ver. 4.8.2)"
 
 
 @
@@ -247,7 +247,7 @@ int main(int argc, char *argv[])
 
 
 @
-@d HBF2GF_VERSION @/
+@d VERSION @/
 "\n"@/
 "Copyright (C) 1996-1999 Werner Lemberg.\n"@/
 "There is NO warranty.  You may redistribute this software\n"@/
@@ -262,7 +262,7 @@ int main(int argc, char *argv[])
            {printf("\n");
             printf(banner);
             printf(" (%s)\n", TeX_search_version());
-            printf(HBF2GF_VERSION);
+            printf(VERSION);
             exit(0);
            }
 
@@ -407,7 +407,7 @@ and |max_numb| will be set to~|1|.
 @
 @<Include files@>=
 #ifdef HAVE_CONFIG_H
-#include "c-auto.h"
+#include <c-auto.h>
 #endif
 #include <ctype.h>
 #include <stdio.h>
@@ -2750,7 +2750,7 @@ automatically. The HBF header file already has the entry
 (in pixels), but these values are not in all cases optimal. If you omit
 \.{x\_offset} and \.{y\_offset} in the configuration file, the third and
 fourth parameter of \.{HBF\_BITMAP\_BOUNDING\_BOX} is used, scaled to design
-size (to say it with other words: \.{x\_offset} and \.{y\_offset} will always
+size (to say it in other words: \.{x\_offset} and \.{y\_offset} will always
 apply to the design size to be synchronous with the \.{TFM} files).
 
 Don't confuse scaling and magnification: Scaling here means that you choose
diff --git a/Build/source/texk/cjkutils/configure b/Build/source/texk/cjkutils/configure
index b7cea8bbfc2..d0fb25cb6a4 100755
--- a/Build/source/texk/cjkutils/configure
+++ b/Build/source/texk/cjkutils/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for CJK utils for TeX Live 4.7.0.
+# Generated by GNU Autoconf 2.68 for CJK utils for TeX Live 4.8.2.
 #
 # Report bugs to <tex-k@tug.org>.
 #
@@ -570,12 +570,12 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='CJK utils for TeX Live'
 PACKAGE_TARNAME='cjk-utils-for-tex-live'
-PACKAGE_VERSION='4.7.0'
-PACKAGE_STRING='CJK utils for TeX Live 4.7.0'
+PACKAGE_VERSION='4.8.2'
+PACKAGE_STRING='CJK utils for TeX Live 4.8.2'
 PACKAGE_BUGREPORT='tex-k@tug.org'
 PACKAGE_URL=''
 
-ac_unique_file="hbf2gf/hbf.h"
+ac_unique_file="cjkutils-4.8.2/hbf2gf/hbf.h"
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stdio.h>
@@ -616,6 +616,9 @@ ac_subst_vars='am__EXEEXT_FALSE
 am__EXEEXT_TRUE
 LTLIBOBJS
 LIBOBJS
+CJKUTILS_TREE
+WIN32_FALSE
+WIN32_TRUE
 do_cweb_FALSE
 do_cweb_TRUE
 TEX
@@ -1309,7 +1312,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures CJK utils for TeX Live 4.7.0 to adapt to many kinds of systems.
+\`configure' configures CJK utils for TeX Live 4.8.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1380,7 +1383,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of CJK utils for TeX Live 4.7.0:";;
+     short | recursive ) echo "Configuration of CJK utils for TeX Live 4.8.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1492,7 +1495,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-CJK utils for TeX Live configure 4.7.0
+CJK utils for TeX Live configure 4.8.2
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1972,7 +1975,7 @@ 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 CJK utils for TeX Live $as_me 4.7.0, which was
+It was created by CJK utils for TeX Live $as_me 4.8.2, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -7325,18 +7328,9 @@ fi
 
 # Define the identity of the package.
  PACKAGE='cjk-utils-for-tex-live'
- VERSION='4.7.0'
+ VERSION='4.8.2'
 
 
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE "$PACKAGE"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define VERSION "$VERSION"
-_ACEOF
-
 # Some tools Automake needs.
 
 ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
@@ -12543,7 +12537,7 @@ WARNING_CFLAGS=$kpse_cv_warning_cflags
 
 
 
-ac_config_headers="$ac_config_headers hbf2gf/c-auto.h:hbf2gf/c-auto.in"
+ac_config_headers="$ac_config_headers c-auto.h:c-auto.in"
 
 
 XX_CFLAGS=$WARNING_CFLAGS
@@ -13048,7 +13042,7 @@ Usage: $0 [OPTIONS]
 Report bugs to <bug-libtool@gnu.org>."
 
 lt_cl_version="\
-CJK utils for TeX Live config.lt 4.7.0
+CJK utils for TeX Live config.lt 4.8.2
 configured by $0, generated by GNU Autoconf 2.68.
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -14268,7 +14262,71 @@ else
 fi
 
 
-ac_config_files="$ac_config_files Makefile conv/Makefile hbf2gf/Makefile scripts/Makefile"
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for native WIN32 or MINGW32" >&5
+$as_echo_n "checking for native WIN32 or MINGW32... " >&6; }
+if ${kpse_cv_have_win32+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifndef WIN32
+  choke me
+#endif
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifndef __MINGW32__
+  choke me
+#endif
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  kpse_cv_have_win32=mingw32
+else
+  kpse_cv_have_win32=native
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+else
+  kpse_cv_have_win32=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_cv_have_win32" >&5
+$as_echo "$kpse_cv_have_win32" >&6; }
+
+ if test "x$kpse_cv_have_win32" != xno; then
+  WIN32_TRUE=
+  WIN32_FALSE='#'
+else
+  WIN32_TRUE='#'
+  WIN32_FALSE=
+fi
+
+
+CJKUTILS_TREE=cjkutils-4.8.2
+
+
+ac_config_files="$ac_config_files Makefile"
 
 
 cat >confcache <<\_ACEOF
@@ -14404,6 +14462,10 @@ if test -z "${do_cweb_TRUE}" && test -z "${do_cweb_FALSE}"; then
   as_fn_error $? "conditional \"do_cweb\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${WIN32_TRUE}" && test -z "${WIN32_FALSE}"; then
+  as_fn_error $? "conditional \"WIN32\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 
 : "${CONFIG_STATUS=./config.status}"
 ac_write_fail=0
@@ -14813,7 +14875,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by CJK utils for TeX Live $as_me 4.7.0, which was
+This file was extended by CJK utils for TeX Live $as_me 4.8.2, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -14879,7 +14941,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-CJK utils for TeX Live config.status 4.7.0
+CJK utils for TeX Live config.status 4.8.2
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 
@@ -15290,11 +15352,8 @@ do
   case $ac_config_target in
     "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
     "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
-    "hbf2gf/c-auto.h") CONFIG_HEADERS="$CONFIG_HEADERS hbf2gf/c-auto.h:hbf2gf/c-auto.in" ;;
+    "c-auto.h") CONFIG_HEADERS="$CONFIG_HEADERS c-auto.h:c-auto.in" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-    "conv/Makefile") CONFIG_FILES="$CONFIG_FILES conv/Makefile" ;;
-    "hbf2gf/Makefile") CONFIG_FILES="$CONFIG_FILES hbf2gf/Makefile" ;;
-    "scripts/Makefile") CONFIG_FILES="$CONFIG_FILES scripts/Makefile" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
diff --git a/Build/source/texk/cjkutils/configure.ac b/Build/source/texk/cjkutils/configure.ac
index 0459639b20e..7e754fdf6b1 100644
--- a/Build/source/texk/cjkutils/configure.ac
+++ b/Build/source/texk/cjkutils/configure.ac
@@ -1,21 +1,22 @@
 dnl Process this file with autoconf to produce a configure script.
 dnl
-dnl   Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+dnl   Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org>
 dnl
 dnl   This file is free software; the copyright holder
 dnl   gives unlimited permission to copy and/or distribute it,
 dnl   with or without modifications, as long as this notice is preserved.
 dnl
-AC_INIT([CJK utils for TeX Live], [4.7.0], [tex-k@tug.org])
+m4_define([cjk_version], [4.8.2])[]dnl using unmodified cjk/utils source tree
+AC_INIT([CJK utils for TeX Live], cjk_version, [tex-k@tug.org])
 AC_PREREQ([2.65])
-AC_CONFIG_SRCDIR([hbf2gf/hbf.h])
+AC_CONFIG_SRCDIR([cjkutils-]cjk_version[/hbf2gf/hbf.h])
 AC_CONFIG_AUX_DIR([../../build-aux])
 AC_CONFIG_MACRO_DIR([../../m4])
 
 dnl Common code for all programs using libkpathsea.
-KPSE_COMMON([cjkutils])
+KPSE_COMMON([cjkutils], [no-define])
 
-AC_CONFIG_HEADERS([hbf2gf/c-auto.h:hbf2gf/c-auto.in])
+AC_CONFIG_HEADERS([c-auto.h:c-auto.in])
 
 dnl get Compiler flags right.
 XX_CFLAGS=$WARNING_CFLAGS
@@ -61,6 +62,13 @@ if test x"$do_cweb" = xyes; then
 fi
 AM_CONDITIONAL([do_cweb], [test "x$do_cweb" = xyes])
 
-AC_CONFIG_FILES([Makefile conv/Makefile hbf2gf/Makefile scripts/Makefile])
+KPSE_COMPILER_WARNINGS
+
+KPSE_CHECK_WIN32
+AM_CONDITIONAL([WIN32], [test "x$kpse_cv_have_win32" != xno])
+
+AC_SUBST([CJKUTILS_TREE], [cjkutils-]cjk_version)
+
+AC_CONFIG_FILES([Makefile])
 
 AC_OUTPUT
diff --git a/Build/source/texk/cjkutils/conv/Makefile.am b/Build/source/texk/cjkutils/conv/Makefile.am
deleted file mode 100644
index eafeaad23d4..00000000000
--- a/Build/source/texk/cjkutils/conv/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-## Makefile.am for the TeX Live subdirectory texk/cjkutils/conv/
-##
-## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
-## You may freely use, modify and/or distribute this file.
-##
-bin_PROGRAMS = bg5conv cefconv cef5conv cefsconv extconv sjisconv
-
-AM_CFLAGS = $(XX_CFLAGS)
-
diff --git a/Build/source/texk/cjkutils/conv/Makefile.in b/Build/source/texk/cjkutils/conv/Makefile.in
deleted file mode 100644
index 61e2f21e821..00000000000
--- a/Build/source/texk/cjkutils/conv/Makefile.in
+++ /dev/null
@@ -1,561 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-bin_PROGRAMS = bg5conv$(EXEEXT) cefconv$(EXEEXT) cef5conv$(EXEEXT) \
-	cefsconv$(EXEEXT) extconv$(EXEEXT) sjisconv$(EXEEXT)
-subdir = conv
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
-	$(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \
-	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/../../m4/libtool.m4 \
-	$(top_srcdir)/../../m4/ltoptions.m4 \
-	$(top_srcdir)/../../m4/ltsugar.m4 \
-	$(top_srcdir)/../../m4/ltversion.m4 \
-	$(top_srcdir)/../../m4/lt~obsolete.m4 \
-	$(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/hbf2gf/c-auto.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__installdirs = "$(DESTDIR)$(bindir)"
-PROGRAMS = $(bin_PROGRAMS)
-bg5conv_SOURCES = bg5conv.c
-bg5conv_OBJECTS = bg5conv.$(OBJEXT)
-bg5conv_LDADD = $(LDADD)
-cef5conv_SOURCES = cef5conv.c
-cef5conv_OBJECTS = cef5conv.$(OBJEXT)
-cef5conv_LDADD = $(LDADD)
-cefconv_SOURCES = cefconv.c
-cefconv_OBJECTS = cefconv.$(OBJEXT)
-cefconv_LDADD = $(LDADD)
-cefsconv_SOURCES = cefsconv.c
-cefsconv_OBJECTS = cefsconv.$(OBJEXT)
-cefsconv_LDADD = $(LDADD)
-extconv_SOURCES = extconv.c
-extconv_OBJECTS = extconv.$(OBJEXT)
-extconv_LDADD = $(LDADD)
-sjisconv_SOURCES = sjisconv.c
-sjisconv_OBJECTS = sjisconv.$(OBJEXT)
-sjisconv_LDADD = $(LDADD)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/hbf2gf
-depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
-SOURCES = bg5conv.c cef5conv.c cefconv.c cefsconv.c extconv.c \
-	sjisconv.c
-DIST_SOURCES = bg5conv.c cef5conv.c cefconv.c cefsconv.c extconv.c \
-	sjisconv.c
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AR = @AR@
-AS = @AS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CTANGLE = @CTANGLE@
-CWEAVE = @CWEAVE@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GREP = @GREP@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KPATHSEA_DEPEND = @KPATHSEA_DEPEND@
-KPATHSEA_INCLUDES = @KPATHSEA_INCLUDES@
-KPATHSEA_LIBS = @KPATHSEA_LIBS@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-TEX = @TEX@
-VERSION = @VERSION@
-WARNING_CFLAGS = @WARNING_CFLAGS@
-XX_CFLAGS = @XX_CFLAGS@
-XX_CPPFLAGS = @XX_CPPFLAGS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-AM_CFLAGS = $(XX_CFLAGS)
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign conv/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign conv/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-install-binPROGRAMS: $(bin_PROGRAMS)
-	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
-	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
-	for p in $$list; do echo "$$p $$p"; done | \
-	sed 's/$(EXEEXT)$$//' | \
-	while read p p1; do if test -f $$p || test -f $$p1; \
-	  then echo "$$p"; echo "$$p"; else :; fi; \
-	done | \
-	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
-	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
-	sed 'N;N;N;s,\n, ,g' | \
-	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
-	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
-	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
-	    else { print "f", $$3 "/" $$4, $$1; } } \
-	  END { for (d in files) print "f", d, files[d] }' | \
-	while read type dir files; do \
-	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
-	    test -z "$$files" || { \
-	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
-	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
-	    } \
-	; done
-
-uninstall-binPROGRAMS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
-	files=`for p in $$list; do echo "$$p"; done | \
-	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-	      -e 's/$$/$(EXEEXT)/' `; \
-	test -n "$$list" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(bindir)" && rm -f $$files
-
-clean-binPROGRAMS:
-	@list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
-	echo " rm -f" $$list; \
-	rm -f $$list || exit $$?; \
-	test -n "$(EXEEXT)" || exit 0; \
-	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
-	echo " rm -f" $$list; \
-	rm -f $$list
-bg5conv$(EXEEXT): $(bg5conv_OBJECTS) $(bg5conv_DEPENDENCIES) 
-	@rm -f bg5conv$(EXEEXT)
-	$(LINK) $(bg5conv_OBJECTS) $(bg5conv_LDADD) $(LIBS)
-cef5conv$(EXEEXT): $(cef5conv_OBJECTS) $(cef5conv_DEPENDENCIES) 
-	@rm -f cef5conv$(EXEEXT)
-	$(LINK) $(cef5conv_OBJECTS) $(cef5conv_LDADD) $(LIBS)
-cefconv$(EXEEXT): $(cefconv_OBJECTS) $(cefconv_DEPENDENCIES) 
-	@rm -f cefconv$(EXEEXT)
-	$(LINK) $(cefconv_OBJECTS) $(cefconv_LDADD) $(LIBS)
-cefsconv$(EXEEXT): $(cefsconv_OBJECTS) $(cefsconv_DEPENDENCIES) 
-	@rm -f cefsconv$(EXEEXT)
-	$(LINK) $(cefsconv_OBJECTS) $(cefsconv_LDADD) $(LIBS)
-extconv$(EXEEXT): $(extconv_OBJECTS) $(extconv_DEPENDENCIES) 
-	@rm -f extconv$(EXEEXT)
-	$(LINK) $(extconv_OBJECTS) $(extconv_LDADD) $(LIBS)
-sjisconv$(EXEEXT): $(sjisconv_OBJECTS) $(sjisconv_DEPENDENCIES) 
-	@rm -f sjisconv$(EXEEXT)
-	$(LINK) $(sjisconv_OBJECTS) $(sjisconv_LDADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bg5conv.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cef5conv.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cefconv.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cefsconv.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/extconv.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sjisconv.Po@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	set x; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(PROGRAMS)
-installdirs:
-	for dir in "$(DESTDIR)$(bindir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am: install-binPROGRAMS
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-binPROGRAMS
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
-	clean-generic clean-libtool ctags distclean distclean-compile \
-	distclean-generic distclean-libtool distclean-tags distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-binPROGRAMS install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-binPROGRAMS
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/Build/source/texk/cjkutils/conv/extconv.c b/Build/source/texk/cjkutils/extconv.c
index 2d8f3f88f7f..98aa7cb764b 100644
--- a/Build/source/texk/cjkutils/conv/extconv.c
+++ b/Build/source/texk/cjkutils/extconv.c
@@ -1,15 +1,14 @@
 #define banner  \
-"extconv (CJK ver. 4.7.0)" \
+"extconv (CJK ver. 4.8.2)" \
 
 /*2:*/
-#line 94 "/home/wl/cvs/cjk/cjk-4.7.0/utils/extconv/extconv.w"
+#line 94 "./cjkutils-4.8.2/extconv/extconv.w"
 
 #include <stdio.h> 
 #include <stdlib.h> 
 
 
-int main(int argc, char *argv[])
-
+int main(int argc,char*argv[])
 {int ch;
 
 
diff --git a/Build/source/texk/cjkutils/hbf2gf/hbf2gf.c b/Build/source/texk/cjkutils/hbf2gf.c
index 5ff4bf891a8..ef5fc2e6112 100644
--- a/Build/source/texk/cjkutils/hbf2gf/hbf2gf.c
+++ b/Build/source/texk/cjkutils/hbf2gf.c
@@ -1,5 +1,5 @@
 #define banner  \
-"hbf2gf (CJK ver. 4.7.0)" \
+"hbf2gf (CJK ver. 4.8.2)" \
  \
 
 #define TRUE 1
@@ -10,7 +10,7 @@
 #define FILE_NAME_LENGTH 1024 \
  \
 
-#define HBF2GF_VERSION  \
+#define VERSION  \
 "\n" \
 "Copyright (C) 1996-1999 Werner Lemberg.\n" \
 "There is NO warranty.  You may redistribute this software\n" \
@@ -100,13 +100,13 @@
 #define VALID_SUBCODE 1 \
 
 /*4:*/
-#line 191 "hbf2gf.w"
+#line 191 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
 
 /*10:*/
-#line 408 "hbf2gf.w"
+#line 408 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
 
 #ifdef HAVE_CONFIG_H
-#include "c-auto.h"
+#include <c-auto.h> 
 #endif
 #include <ctype.h> 
 #include <stdio.h> 
@@ -121,7 +121,7 @@
 
 
 /*:10*//*69:*/
-#line 2469 "hbf2gf.w"
+#line 2469 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
 
 #if defined(HAVE_LIBKPATHSEA)
 #include "kpathsea/kpathsea.h"
@@ -134,46 +134,46 @@
 #endif
 
 /*:69*/
-#line 192 "hbf2gf.w"
+#line 192 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
 
 /*11:*/
-#line 429 "hbf2gf.w"
+#line 429 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
 
 void write_file(void);
 
 
 /*:11*//*13:*/
-#line 491 "hbf2gf.w"
+#line 491 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
 
 void write_pre(void);
 
 
 /*:13*//*16:*/
-#line 579 "hbf2gf.w"
+#line 579 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
 
 void write_data(void);
 
 
 /*:16*//*20:*/
-#line 690 "hbf2gf.w"
+#line 690 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
 
 void write_post(void);
 
 
 /*:20*//*25:*/
-#line 834 "hbf2gf.w"
+#line 834 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
 
 void fputl(long,FILE*);
 
 
 /*:25*//*29:*/
-#line 994 "hbf2gf.w"
+#line 994 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
 
 void make_pixel_array(void);
 
 
 /*:29*//*36:*/
-#line 1222 "hbf2gf.w"
+#line 1222 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
 
 #ifdef __GNUC__
 __inline__
@@ -182,7 +182,7 @@ void read_row(unsigned char*);
 
 
 /*:36*//*39:*/
-#line 1272 "hbf2gf.w"
+#line 1272 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
 
 #ifdef __GNUC__
 __inline__
@@ -191,55 +191,55 @@ void write_row(unsigned char*);
 
 
 /*:39*//*41:*/
-#line 1325 "hbf2gf.w"
+#line 1325 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
 
 void write_coding(void);
 
 
 /*:41*//*45:*/
-#line 1486 "hbf2gf.w"
+#line 1486 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
 
 void write_pl(void);
 
 
 /*:45*//*47:*/
-#line 1583 "hbf2gf.w"
+#line 1583 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
 
 void write_ovp(void);
 
 
 /*:47*//*50:*/
-#line 1728 "hbf2gf.w"
+#line 1728 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
 
 void write_job(void);
 
 
 /*:50*//*54:*/
-#line 1977 "hbf2gf.w"
+#line 1977 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
 
 void read_config(void);
 
 
 /*:54*//*64:*/
-#line 2308 "hbf2gf.w"
+#line 2308 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
 
 int fsearch(const char*);
 
 
 /*:64*//*67:*/
-#line 2447 "hbf2gf.w"
+#line 2447 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
 
 void config_error(const char*);
 
 
 /*:67*//*71:*/
-#line 2490 "hbf2gf.w"
+#line 2490 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
 
 const char*TeX_search_version(void);
 
 
 /*:71*//*74:*/
-#line 2525 "hbf2gf.w"
+#line 2525 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
 
 #ifdef HAVE_EMTEXDIR
 extern int setup_list(struct emtex_dir*,char*,const char*,unsigned);
@@ -249,17 +249,17 @@ char*file_find(char*,struct emtex_dir*);
 
 
 /*:74*//*79:*/
-#line 2613 "hbf2gf.w"
+#line 2613 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
 
 char*TeX_search_cfg_file(char*);
 char*TeX_search_hbf_file(char*);
 
 
 /*:79*/
-#line 193 "hbf2gf.w"
+#line 193 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
 
 /*2:*/
-#line 127 "hbf2gf.w"
+#line 127 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
 
 int nmb_files= -1;
 int unicode= FALSE;
@@ -300,7 +300,7 @@ int end_of_file= FALSE;
 
 
 /*:2*//*15:*/
-#line 538 "hbf2gf.w"
+#line 538 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
 
 long char_adr[256];
 long*char_adr_p;
@@ -342,7 +342,7 @@ int dot_count;
 
 
 /*:15*//*19:*/
-#line 667 "hbf2gf.w"
+#line 667 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
 
 char coding[STRING_LENGTH+1];
 char comment[STRING_LENGTH+1];
@@ -361,7 +361,7 @@ double ppp_y;
 
 
 /*:19*//*27:*/
-#line 871 "hbf2gf.w"
+#line 871 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
 
 HBF_CHAR code;
 const unsigned char*bitmap;
@@ -384,13 +384,13 @@ long s_mag_x,s_mag_y,s_slant;
 
 
 /*:27*//*38:*/
-#line 1267 "hbf2gf.w"
+#line 1267 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
 
 int threshold= 128;
 
 
 /*:38*//*49:*/
-#line 1717 "hbf2gf.w"
+#line 1717 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
 
 char job_extension[EXTENSION_LENGTH+1];
 char rm_command[STRING_LENGTH+1];
@@ -402,13 +402,13 @@ int ofm_file= FALSE;
 
 
 /*:49*//*53:*/
-#line 1972 "hbf2gf.w"
+#line 1972 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
 
 char Buffer[STRING_LENGTH+1];
 
 
 /*:53*//*58:*/
-#line 2090 "hbf2gf.w"
+#line 2090 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
 
 int offset_x;
 int offset_y;
@@ -417,13 +417,13 @@ HBF_CHAR user_min_char;
 int have_min_char= FALSE;
 
 /*:58*//*60:*/
-#line 2247 "hbf2gf.w"
+#line 2247 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
 
 HBF_CHAR min_char,max_char;
 
 
 /*:60*//*62:*/
-#line 2274 "hbf2gf.w"
+#line 2274 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
 
 char b2_codes[256];
 unsigned char min_2_byte,max_2_byte;
@@ -431,7 +431,7 @@ int nmb_2_bytes= 0;
 
 
 /*:62*//*70:*/
-#line 2481 "hbf2gf.w"
+#line 2481 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
 
 #if defined(HAVE_EMTEXDIR)
 char emtex_version_string[]= "emTeXdir";
@@ -441,7 +441,7 @@ char no_version_string[]= "no search library";
 
 
 /*:70*//*73:*/
-#line 2518 "hbf2gf.w"
+#line 2518 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
 
 #ifdef HAVE_EMTEXDIR
 struct emtex_dir cfg_path,hbf_path;
@@ -449,13 +449,13 @@ struct emtex_dir cfg_path,hbf_path;
 
 
 /*:73*//*76:*/
-#line 2564 "hbf2gf.w"
+#line 2564 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
 
 char name_buffer[FILE_NAME_LENGTH+1];
 
 
 /*:76*/
-#line 194 "hbf2gf.w"
+#line 194 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
 
 
 
@@ -463,7 +463,7 @@ int main(int argc,char*argv[])
 {char*p;
 
 /*78:*/
-#line 2586 "hbf2gf.w"
+#line 2586 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
 
 #if defined(HAVE_LIBKPATHSEA)
 kpse_set_program_name(argv[0],"hbf2gf");
@@ -484,16 +484,16 @@ exit(1);
 
 
 /*:78*/
-#line 200 "hbf2gf.w"
+#line 200 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
 
 
 /*7:*/
-#line 307 "hbf2gf.w"
+#line 307 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
 
 if(argc==2)
 {if(strcmp(argv[1],"--help")==0)
 /*6:*/
-#line 288 "hbf2gf.w"
+#line 288 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
 
 {printf(USAGE);
 exit(0);
@@ -501,22 +501,22 @@ exit(0);
 
 
 /*:6*/
-#line 310 "hbf2gf.w"
+#line 310 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
 
 else if(strcmp(argv[1],"--version")==0)
 /*5:*/
-#line 261 "hbf2gf.w"
+#line 261 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
 
 {printf("\n");
 printf(banner);
 printf(" (%s)\n",TeX_search_version());
-printf(HBF2GF_VERSION);
+printf(VERSION);
 exit(0);
 }
 
 
 /*:5*/
-#line 312 "hbf2gf.w"
+#line 312 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
 
 }
 
@@ -554,7 +554,7 @@ exit(1);
 
 
 /*:7*/
-#line 202 "hbf2gf.w"
+#line 202 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
 
 
 if(!quiet)
@@ -583,7 +583,7 @@ read_config();
 
 if(mf_like)
 /*8:*/
-#line 352 "hbf2gf.w"
+#line 352 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
 
 {if(unicode)
 file_number= (int)strtol(&argv[1][strlen(argv[1])-2],
@@ -611,11 +611,11 @@ y_scale= (double)x_resolution/y_scale;
 
 
 /*:8*/
-#line 229 "hbf2gf.w"
+#line 229 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
 
 
 /*28:*/
-#line 903 "hbf2gf.w"
+#line 903 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
 
 {int col,offset;
 
@@ -698,11 +698,11 @@ s_slant= slant*SCALE;
 
 
 /*:28*/
-#line 231 "hbf2gf.w"
+#line 231 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
 
 
 /*9:*/
-#line 387 "hbf2gf.w"
+#line 387 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
 
 {int j,max_numb;
 
@@ -724,7 +724,7 @@ nmb_files= j;
 
 
 /*:9*/
-#line 233 "hbf2gf.w"
+#line 233 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
 
 
 if(tfm_files)
@@ -742,7 +742,7 @@ return 0;
 
 
 /*:4*//*12:*/
-#line 437 "hbf2gf.w"
+#line 437 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
 
 void write_file(void)
 {char output_file[FILE_NAME_LENGTH+1];
@@ -786,7 +786,7 @@ write_data();
 
 
 /*:12*//*14:*/
-#line 498 "hbf2gf.w"
+#line 498 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
 
 void write_pre(void)
 {char out_s[40],s[20];
@@ -809,7 +809,7 @@ fputs(out_s,out);
 
 
 /*:14*//*17:*/
-#line 584 "hbf2gf.w"
+#line 584 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
 
 void write_data(void)
 {dot_count= 0;
@@ -817,7 +817,7 @@ char_adr_p= char_adr;
 
 for(last_char= 0;(last_char<256)&&!end_of_file;last_char++)
 /*18:*/
-#line 609 "hbf2gf.w"
+#line 609 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
 
 {if(dot_count++%10==0)
 if(pk_files&&!quiet)
@@ -861,13 +861,13 @@ fputc(EOC,out);
 
 
 /*:18*/
-#line 590 "hbf2gf.w"
+#line 590 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
 
 }
 
 
 /*:17*//*21:*/
-#line 695 "hbf2gf.w"
+#line 695 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
 
 void write_post(void)
 {long special_adr;
@@ -895,7 +895,7 @@ tfm_width= (tfm_output_size_x+2*tfm_offset_x)*_2_20;
 
 
 /*22:*/
-#line 741 "hbf2gf.w"
+#line 741 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
 
 special_adr= ftell(out);
 
@@ -913,10 +913,10 @@ fputs(comment,out);
 
 
 /*:22*/
-#line 721 "hbf2gf.w"
+#line 721 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
 
 /*23:*/
-#line 770 "hbf2gf.w"
+#line 770 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
 
 post_adr= ftell(out);
 fputc(POST,out);
@@ -955,10 +955,10 @@ fputl(*char_adr_p++,out);
 
 
 /*:23*/
-#line 722 "hbf2gf.w"
+#line 722 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
 
 /*24:*/
-#line 821 "hbf2gf.w"
+#line 821 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
 
 fputc(POSTPOST,out);
 fputl(post_adr,out);
@@ -970,13 +970,13 @@ fputc(POSTPOST_ID,out);
 
 
 /*:24*/
-#line 723 "hbf2gf.w"
+#line 723 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
 
 }
 
 
 /*:21*//*26:*/
-#line 839 "hbf2gf.w"
+#line 839 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
 
 void fputl(long num,FILE*f)
 {fputc(num>>24,f);
@@ -987,7 +987,7 @@ fputc(num,f);
 
 
 /*:26*//*30:*/
-#line 999 "hbf2gf.w"
+#line 999 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
 
 void make_pixel_array(void)
 {unsigned char*prP;
@@ -1025,7 +1025,7 @@ if(!bitmap)
 empty_char= TRUE;
 else
 /*31:*/
-#line 1058 "hbf2gf.w"
+#line 1058 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
 
 {if(pk_output_size_y==input_size_y)
 temp_prP= prP;
@@ -1033,7 +1033,7 @@ temp_prP= prP;
 curr_row= input_size_y-1;
 for(row= 0;row<pk_output_size_y;++row)
 {/*32:*/
-#line 1072 "hbf2gf.w"
+#line 1072 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
 
 if(pk_output_size_y==input_size_y)
 
@@ -1055,7 +1055,7 @@ need_to_read_row= 1;
 }
 
 /*33:*/
-#line 1099 "hbf2gf.w"
+#line 1099 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
 
 if(need_to_read_row)
 if(rows_read<input_size_y)
@@ -1087,16 +1087,16 @@ frac_row_to_fill= SCALE;
 
 
 /*:33*/
-#line 1092 "hbf2gf.w"
+#line 1092 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
 
 }
 
 
 /*:32*/
-#line 1064 "hbf2gf.w"
+#line 1064 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
 
 /*34:*/
-#line 1140 "hbf2gf.w"
+#line 1140 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
 
 if(pk_width==input_size_x&&s_slant==0)
 
@@ -1151,7 +1151,7 @@ frac_col_to_fill-= frac_col_left;
 }
 
 /*35:*/
-#line 1198 "hbf2gf.w"
+#line 1198 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
 
 if(frac_col_to_fill> 0)
 {--xP;
@@ -1171,20 +1171,20 @@ write_row(new_prP);
 
 
 /*:35*/
-#line 1193 "hbf2gf.w"
+#line 1193 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
 
 }
 
 
 /*:34*/
-#line 1066 "hbf2gf.w"
+#line 1066 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
 
 }
 }
 
 
 /*:31*/
-#line 1035 "hbf2gf.w"
+#line 1035 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
 
 }
 }
@@ -1208,7 +1208,7 @@ goto again;
 
 
 /*:30*//*37:*/
-#line 1230 "hbf2gf.w"
+#line 1230 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
 
 #ifdef __GNUC__
 __inline__
@@ -1243,7 +1243,7 @@ bitshift= 7;
 
 
 /*:37*//*40:*/
-#line 1280 "hbf2gf.w"
+#line 1280 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
 
 #ifdef __GNUC__
 __inline__
@@ -1259,7 +1259,7 @@ for(col= 0,xP= pixelrow;col<pk_output_size_x;++col,++xP)
 
 
 /*:40*//*42:*/
-#line 1333 "hbf2gf.w"
+#line 1333 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
 
 void write_coding(void)
 {register int count,skip;
@@ -1276,7 +1276,7 @@ goto start;
 
 while(y<pk_output_size_y)
 {/*43:*/
-#line 1357 "hbf2gf.w"
+#line 1357 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
 
 count= 0;
 x= 0;
@@ -1345,11 +1345,11 @@ continue;
 
 
 /*:43*/
-#line 1348 "hbf2gf.w"
+#line 1348 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
 
 start:
 /*44:*/
-#line 1425 "hbf2gf.w"
+#line 1425 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
 
 while(x<pk_output_size_x)
 {if(*cp==paint)
@@ -1390,7 +1390,7 @@ paint= WHITE;
 
 
 /*:44*/
-#line 1350 "hbf2gf.w"
+#line 1350 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
 
 y++;
 }
@@ -1398,7 +1398,7 @@ y++;
 
 
 /*:42*//*46:*/
-#line 1491 "hbf2gf.w"
+#line 1491 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
 
 void write_pl(void)
 {int i,pos;
@@ -1488,7 +1488,7 @@ fclose(out);
 
 
 /*:46*//*48:*/
-#line 1588 "hbf2gf.w"
+#line 1588 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
 
 void write_ovp(void)
 {int c,i,nmb_subfonts,remainder,count,pos;
@@ -1603,7 +1603,7 @@ fclose(out);
 
 
 /*:48*//*51:*/
-#line 1733 "hbf2gf.w"
+#line 1733 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
 
 void write_job(void)
 {FILE*out;
@@ -1689,7 +1689,7 @@ fclose(out);
 
 
 /*:51*//*55:*/
-#line 1985 "hbf2gf.w"
+#line 1985 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
 
 void read_config(void)
 {HBF_BBOX*boxp;
@@ -1697,7 +1697,7 @@ char*real_config_file;
 
 
 /*56:*/
-#line 2037 "hbf2gf.w"
+#line 2037 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
 
 {int i,lastext= -1;
 
@@ -1715,7 +1715,7 @@ strcat(config_file,".cfg");
 
 
 /*:56*/
-#line 1991 "hbf2gf.w"
+#line 1991 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
 
 
 real_config_file= TeX_search_cfg_file(config_file);
@@ -1750,7 +1750,7 @@ exit(0);
 }
 
 /*57:*/
-#line 2054 "hbf2gf.w"
+#line 2054 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
 
 {char hbf_header[STRING_LENGTH+1];
 char*real_hbf_header;
@@ -1787,10 +1787,10 @@ strcpy(output_name,Buffer);
 
 
 /*:57*/
-#line 2024 "hbf2gf.w"
+#line 2024 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
 
 /*59:*/
-#line 2098 "hbf2gf.w"
+#line 2098 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
 
 {if(fsearch("nmb_files"))
 nmb_files= atoi(Buffer);
@@ -1932,11 +1932,11 @@ job_extension[EXTENSION_LENGTH]= '\0';
 
 
 /*:59*/
-#line 2025 "hbf2gf.w"
+#line 2025 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
 
 
 /*61:*/
-#line 2252 "hbf2gf.w"
+#line 2252 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
 
 {const void*cp;
 HBF_CHAR dummy;
@@ -1951,10 +1951,10 @@ min_char= user_min_char;
 
 
 /*:61*/
-#line 2027 "hbf2gf.w"
+#line 2027 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
 
 /*63:*/
-#line 2281 "hbf2gf.w"
+#line 2281 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
 
 {const void*b2r;
 unsigned char dummy;
@@ -1977,7 +1977,7 @@ nmb_2_bytes++;
 
 
 /*:63*/
-#line 2028 "hbf2gf.w"
+#line 2028 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
 
 
 fclose(config);
@@ -1985,7 +1985,7 @@ fclose(config);
 
 
 /*:55*//*65:*/
-#line 2313 "hbf2gf.w"
+#line 2313 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
 
 int fsearch(const char*search_string)
 {char*P,p;
@@ -2041,7 +2041,7 @@ Ch= fgetc(config);
 
 if(*temp_buffer)
 /*66:*/
-#line 2392 "hbf2gf.w"
+#line 2392 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
 
 {P= temp_buffer;
 Buf_p= Buffer;
@@ -2094,7 +2094,7 @@ count--;
 
 
 /*:66*/
-#line 2367 "hbf2gf.w"
+#line 2367 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
 
 else
 *Buffer= '\0';
@@ -2104,7 +2104,7 @@ return(*Buffer)?1:0;
 
 
 /*:65*//*68:*/
-#line 2452 "hbf2gf.w"
+#line 2452 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
 
 void config_error(const char*message)
 {fprintf(stderr,"Couldn't find `%s' entry in configuration file\n",
@@ -2115,7 +2115,7 @@ exit(1);
 
 
 /*:68*//*72:*/
-#line 2495 "hbf2gf.w"
+#line 2495 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
 
 const char*TeX_search_version(void)
 {
@@ -2137,7 +2137,7 @@ return no_version_string;
 
 
 /*:72*//*75:*/
-#line 2537 "hbf2gf.w"
+#line 2537 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
 
 #ifdef HAVE_EMTEXDIR
 int dir_setup(ed,env,dir,flags)
@@ -2165,7 +2165,7 @@ return TRUE;
 
 
 /*:75*//*77:*/
-#line 2569 "hbf2gf.w"
+#line 2569 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
 
 char*file_find(name,list)
 char*name;
@@ -2180,7 +2180,7 @@ return NULL;
 
 
 /*:77*//*80:*/
-#line 2619 "hbf2gf.w"
+#line 2619 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
 
 #if defined(HAVE_LIBKPATHSEA)
 char*TeX_search_cfg_file(char*name)
diff --git a/Build/source/texk/cjkutils/hbf2gf/hbf2gf.dvi b/Build/source/texk/cjkutils/hbf2gf.dvi
index 8eb81e334d7..d93ae552196 100644
--- a/Build/source/texk/cjkutils/hbf2gf/hbf2gf.dvi
+++ b/Build/source/texk/cjkutils/hbf2gf.dvi
diff --git a/Build/source/texk/cjkutils/hbf2gf/hbf2gf.idx b/Build/source/texk/cjkutils/hbf2gf.idx
index fdf1ac2a8d1..7a9f86cc1cc 100644
--- a/Build/source/texk/cjkutils/hbf2gf/hbf2gf.idx
+++ b/Build/source/texk/cjkutils/hbf2gf.idx
@@ -120,7 +120,6 @@
 \I\\{hbfGetCodeRange}, 60, 61.
 \I\\{hbfOpen}, 57.
 \I\\{hbfProperty}, 57.
-\I\.{HBF2GF\_VERSION}, \[5].
 \I\\{header}, \[13], 14.
 \I\|{i}, \[21], \[46], \[48], \[51], \[56], \[63].
 \I\\{input\_size\_x}, \[15], 28, 32, 33, 34, 36, 37, 57.
@@ -302,6 +301,7 @@
 \I\\{user\_min\_char}, \[58], 59, 61.
 \I\\{val}, \[75].
 \I\.{VALID\_SUBCODE}, 48, \[62], 63.
+\I\.{VERSION}, \[5].
 \I\.{WHITE}, \[27], 42, 44.
 \I\.{WRITE\_BIN}, \[2], 12.
 \I\\{write\_coding}, 18, \[41], \[42].
diff --git a/Build/source/texk/cjkutils/hbf2gf/hbf2gf.scn b/Build/source/texk/cjkutils/hbf2gf.scn
index 0d39715d758..0d39715d758 100644
--- a/Build/source/texk/cjkutils/hbf2gf/hbf2gf.scn
+++ b/Build/source/texk/cjkutils/hbf2gf.scn
diff --git a/Build/source/texk/cjkutils/hbf2gf/hbf2gf.tex b/Build/source/texk/cjkutils/hbf2gf.tex
index c637786b20e..95b6024f3b2 100644
--- a/Build/source/texk/cjkutils/hbf2gf/hbf2gf.tex
+++ b/Build/source/texk/cjkutils/hbf2gf.tex
@@ -1,7 +1,7 @@
 \input cwebmac
-% This is the cweb file hbf2gf.w of the CJK package ver. 4.7.0  17-Oct-2006
+% This is the cweb file hbf2gf.w of the CJK package ver. 4.8.2  29-Dec-2008
 
-% Copyright (C) 1994-2006  Werner Lemberg <wl@gnu.org>
+% Copyright (C) 1994-2008  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
@@ -31,13 +31,13 @@
 \def\mf{{\meta META}\-{\meta FONT}}
 \def\Om{\char "0A}                      % Omega symbol
 
-\def\title{hbf2gf (CJK Version 4.7.0)}
+\def\title{hbf2gf (CJK Version 4.8.2)}
 
 \def\topofcontents{
   \null\vfill
   \centerline{\titlefont The {\ttitlefont hbf2gf} program}
   \vskip 20pt
-  \centerline{(CJK Version 4.7.0)}
+  \centerline{(CJK Version 4.8.2)}
   \vfill}
 
 \def\botofcontents{
@@ -78,7 +78,7 @@ The ``banner line'' defined here should be changed whenever \.{hbf2gf} is
 modified.
 
 \Y\B\4\D$\\{banner}$ \5
-\.{"hbf2gf\ (CJK\ ver.\ 4.}\)\.{7.0)"}\par
+\.{"hbf2gf\ (CJK\ ver.\ 4.}\)\.{8.2)"}\par
 \fi
 
 \M{2}
@@ -237,7 +237,7 @@ ${}\\{mf\_like}\K\.{TRUE};{}$\6
 \fi
 
 \M{5}
-\Y\B\4\D$\.{HBF2GF\_VERSION}$ \6
+\Y\B\4\D$\.{VERSION}$ \6
 \.{"\\n"}\6
 \.{"Copyright\ (C)\ 1996-}\)\.{1999\ Werner\ Lemberg.}\)\.{\\n"}\6
 \.{"There\ is\ NO\ warrant}\)\.{y.\ \ You\ may\ redistri}\)\.{bute\ this\
@@ -254,7 +254,7 @@ ${}\{{}$\1\6
 \\{printf}(\.{"\\n"});\6
 \\{printf}(\\{banner});\6
 ${}\\{printf}(\.{"\ (\%s)\\n"},\39\\{TeX\_search\_version}(\,));{}$\6
-\\{printf}(\.{HBF2GF\_VERSION});\6
+\\{printf}(\.{VERSION});\6
 \\{exit}(\T{0});\6
 \4${}\}{}$\2\par
 \U7.\fi
@@ -424,7 +424,7 @@ ${}\\{nmb\_files}\K\|j{}$;\C{ the real number of output font files }\6
 \M{10}
 \Y\B\4\X10:Include files\X${}\E{}$\6
 \8\#\&{ifdef} \.{HAVE\_CONFIG\_H}\6
-\8\#\&{include} \.{"c-auto.h"}\6
+\8\#\&{include} \.{<c-auto.h>}\6
 \8\#\&{endif}\6
 \8\#\&{include} \.{<ctype.h>}\6
 \8\#\&{include} \.{<stdio.h>}\6
@@ -2863,7 +2863,7 @@ automatically. The HBF header file already has the entry
 (in pixels), but these values are not in all cases optimal. If you omit
 \.{x\_offset} and \.{y\_offset} in the configuration file, the third and
 fourth parameter of \.{HBF\_BITMAP\_BOUNDING\_BOX} is used, scaled to design
-size (to say it with other words: \.{x\_offset} and \.{y\_offset} will always
+size (to say it in other words: \.{x\_offset} and \.{y\_offset} will always
 apply to the design size to be synchronous with the \.{TFM} files).
 
 Don't confuse scaling and magnification: Scaling here means that you choose
diff --git a/Build/source/texk/cjkutils/hbf2gf/Makefile.am b/Build/source/texk/cjkutils/hbf2gf/Makefile.am
deleted file mode 100644
index 4137e3977d1..00000000000
--- a/Build/source/texk/cjkutils/hbf2gf/Makefile.am
+++ /dev/null
@@ -1,63 +0,0 @@
-## Makefile.am for the TeX Live subdirectory texk/cjkutils/hbf2gf/
-##
-## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
-## You may freely use, modify and/or distribute this file.
-##
-INCLUDES = $(KPATHSEA_INCLUDES)
-AM_CPPFLAGS = -Dunix -DHAVE_LIBKPATHSEA $(XX_CPPFLAGS)
-AM_CFLAGS = $(XX_CFLAGS)
-
-bin_PROGRAMS = hbf2gf
-
-hbf2gf_SOURCES = \
-	hbf.c \
-	hbf.h \
-	hbf2gf.c
-
-CWEB_SRC = hbf2gf.w
-CWEB_TEX = hbf2gf.tex hbf2gf.idx hbf2gf.scn
-CWEB_DVI = hbf2gf.dvi
-
-hbf2gf_DEPENDENCIES = $(KPATHSEA_DEPEND)
-
-LDADD = $(KPATHSEA_LIBS)
-
-## Rebuild libkpathsea
-@KPATHSEA_RULE@
-
-dist_man1_MANS = hbf2gf.1
-
-EXTRA_DIST = $(CWEB_SRC) $(CWEB_TEX) $(CWEB_DVI) cfg
-
-CLEANFILES = hbf2gf.log hbf2gf.toc
-
-hbf2gf.dvi: $(CWEB_TEX)
-	TEXINPUTS=.:$(srcdir):$$TEXINPUTS $(TEX) hbf2gf.tex
-
-# Running cweave in order to create hbf2gf.tex generates in addition
-# hbf2gf.idx and hbf2gf.scn; we must rerun cweave when they are not
-# up to date (even if hbf2gf.tex is up to date). Thus the sub-make.
-#
-hbf2gf.tex hbf2gf.idx hbf2gf.scn: hbf2gf.w
-	$(MAKE) $(AM_MAKEFLAGS) do-cweave
-do-cweave: hbf2gf.w .FORCE
-	$(CWEAVE) +ai $<
-.PHONY: do-cweave .FORCE
-
-if do_cweb
-all-local: hbf2gf.dvi
-hbf2gf.c: hbf2gf.w
-	$(CTANGLE) $<
-else
-all-local:
-endif
-
-## Not used
-##
-EXTRA_DIST += \
-	emdir.c \
-	emdir.h \
-	emtexdir.c \
-	emtexdir.h \
-	hbf2gf.def
-
diff --git a/Build/source/texk/cjkutils/hbf2gf/Makefile.in b/Build/source/texk/cjkutils/hbf2gf/Makefile.in
deleted file mode 100644
index 77b5ea82aae..00000000000
--- a/Build/source/texk/cjkutils/hbf2gf/Makefile.in
+++ /dev/null
@@ -1,655 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-bin_PROGRAMS = hbf2gf$(EXEEXT)
-subdir = hbf2gf
-DIST_COMMON = $(dist_man1_MANS) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in $(srcdir)/c-auto.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
-	$(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \
-	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/../../m4/libtool.m4 \
-	$(top_srcdir)/../../m4/ltoptions.m4 \
-	$(top_srcdir)/../../m4/ltsugar.m4 \
-	$(top_srcdir)/../../m4/ltversion.m4 \
-	$(top_srcdir)/../../m4/lt~obsolete.m4 \
-	$(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = c-auto.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"
-PROGRAMS = $(bin_PROGRAMS)
-am_hbf2gf_OBJECTS = hbf.$(OBJEXT) hbf2gf.$(OBJEXT)
-hbf2gf_OBJECTS = $(am_hbf2gf_OBJECTS)
-hbf2gf_LDADD = $(LDADD)
-am__DEPENDENCIES_1 =
-DEFAULT_INCLUDES = -I.@am__isrc@
-depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
-SOURCES = $(hbf2gf_SOURCES)
-DIST_SOURCES = $(hbf2gf_SOURCES)
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-man1dir = $(mandir)/man1
-NROFF = nroff
-MANS = $(dist_man1_MANS)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AR = @AR@
-AS = @AS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CTANGLE = @CTANGLE@
-CWEAVE = @CWEAVE@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GREP = @GREP@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KPATHSEA_DEPEND = @KPATHSEA_DEPEND@
-KPATHSEA_INCLUDES = @KPATHSEA_INCLUDES@
-KPATHSEA_LIBS = @KPATHSEA_LIBS@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-TEX = @TEX@
-VERSION = @VERSION@
-WARNING_CFLAGS = @WARNING_CFLAGS@
-XX_CFLAGS = @XX_CFLAGS@
-XX_CPPFLAGS = @XX_CPPFLAGS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-INCLUDES = $(KPATHSEA_INCLUDES)
-AM_CPPFLAGS = -Dunix -DHAVE_LIBKPATHSEA $(XX_CPPFLAGS)
-AM_CFLAGS = $(XX_CFLAGS)
-hbf2gf_SOURCES = \
-	hbf.c \
-	hbf.h \
-	hbf2gf.c
-
-CWEB_SRC = hbf2gf.w
-CWEB_TEX = hbf2gf.tex hbf2gf.idx hbf2gf.scn
-CWEB_DVI = hbf2gf.dvi
-hbf2gf_DEPENDENCIES = $(KPATHSEA_DEPEND)
-LDADD = $(KPATHSEA_LIBS)
-dist_man1_MANS = hbf2gf.1
-EXTRA_DIST = $(CWEB_SRC) $(CWEB_TEX) $(CWEB_DVI) cfg emdir.c emdir.h \
-	emtexdir.c emtexdir.h hbf2gf.def
-CLEANFILES = hbf2gf.log hbf2gf.toc
-all: c-auto.h
-	$(MAKE) $(AM_MAKEFLAGS) all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign hbf2gf/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign hbf2gf/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-c-auto.h: stamp-h1
-	@if test ! -f $@; then \
-	  rm -f stamp-h1; \
-	  $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
-	else :; fi
-
-stamp-h1: $(srcdir)/c-auto.in $(top_builddir)/config.status
-	@rm -f stamp-h1
-	cd $(top_builddir) && $(SHELL) ./config.status hbf2gf/c-auto.h
-$(srcdir)/c-auto.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) 
-	($(am__cd) $(top_srcdir) && $(AUTOHEADER))
-	rm -f stamp-h1
-	touch $@
-
-distclean-hdr:
-	-rm -f c-auto.h stamp-h1
-install-binPROGRAMS: $(bin_PROGRAMS)
-	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
-	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
-	for p in $$list; do echo "$$p $$p"; done | \
-	sed 's/$(EXEEXT)$$//' | \
-	while read p p1; do if test -f $$p || test -f $$p1; \
-	  then echo "$$p"; echo "$$p"; else :; fi; \
-	done | \
-	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
-	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
-	sed 'N;N;N;s,\n, ,g' | \
-	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
-	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
-	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
-	    else { print "f", $$3 "/" $$4, $$1; } } \
-	  END { for (d in files) print "f", d, files[d] }' | \
-	while read type dir files; do \
-	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
-	    test -z "$$files" || { \
-	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
-	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
-	    } \
-	; done
-
-uninstall-binPROGRAMS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
-	files=`for p in $$list; do echo "$$p"; done | \
-	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-	      -e 's/$$/$(EXEEXT)/' `; \
-	test -n "$$list" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(bindir)" && rm -f $$files
-
-clean-binPROGRAMS:
-	@list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
-	echo " rm -f" $$list; \
-	rm -f $$list || exit $$?; \
-	test -n "$(EXEEXT)" || exit 0; \
-	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
-	echo " rm -f" $$list; \
-	rm -f $$list
-hbf2gf$(EXEEXT): $(hbf2gf_OBJECTS) $(hbf2gf_DEPENDENCIES) 
-	@rm -f hbf2gf$(EXEEXT)
-	$(LINK) $(hbf2gf_OBJECTS) $(hbf2gf_LDADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hbf.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hbf2gf.Po@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-install-man1: $(dist_man1_MANS)
-	@$(NORMAL_INSTALL)
-	test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
-	@list='$(dist_man1_MANS)'; test -n "$(man1dir)" || exit 0; \
-	{ for i in $$list; do echo "$$i"; done; \
-	} | while read p; do \
-	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; echo "$$p"; \
-	done | \
-	sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
-	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
-	sed 'N;N;s,\n, ,g' | { \
-	list=; while read file base inst; do \
-	  if test "$$base" = "$$inst"; then list="$$list $$file"; else \
-	    echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
-	    $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst" || exit $$?; \
-	  fi; \
-	done; \
-	for i in $$list; do echo "$$i"; done | $(am__base_list) | \
-	while read files; do \
-	  test -z "$$files" || { \
-	    echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man1dir)'"; \
-	    $(INSTALL_DATA) $$files "$(DESTDIR)$(man1dir)" || exit $$?; }; \
-	done; }
-
-uninstall-man1:
-	@$(NORMAL_UNINSTALL)
-	@list='$(dist_man1_MANS)'; test -n "$(man1dir)" || exit 0; \
-	files=`{ for i in $$list; do echo "$$i"; done; \
-	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
-	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-	test -z "$$files" || { \
-	  echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \
-	  cd "$(DESTDIR)$(man1dir)" && rm -f $$files; }
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES) c-auto.in $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	set x; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS) c-auto.in $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES) c-auto.in $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS) c-auto.in $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@list='$(MANS)'; if test -n "$$list"; then \
-	  list=`for p in $$list; do \
-	    if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-	    if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
-	  if test -n "$$list" && \
-	    grep 'ab help2man is required to generate this page' $$list >/dev/null; then \
-	    echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \
-	    grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/         /' >&2; \
-	    echo "       to fix them, install help2man, remove and regenerate the man pages;" >&2; \
-	    echo "       typically \`make maintainer-clean' will remove them" >&2; \
-	    exit 1; \
-	  else :; fi; \
-	else :; fi
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(PROGRAMS) $(MANS) c-auto.h all-local
-installdirs:
-	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-hdr distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-man
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am: install-binPROGRAMS
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man: install-man1
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-binPROGRAMS uninstall-man
-
-uninstall-man: uninstall-man1
-
-.MAKE: all install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am all-local check check-am clean \
-	clean-binPROGRAMS clean-generic clean-libtool ctags distclean \
-	distclean-compile distclean-generic distclean-hdr \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-binPROGRAMS \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-man1 \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-binPROGRAMS uninstall-man uninstall-man1
-
-
-@KPATHSEA_RULE@
-
-hbf2gf.dvi: $(CWEB_TEX)
-	TEXINPUTS=.:$(srcdir):$$TEXINPUTS $(TEX) hbf2gf.tex
-
-# Running cweave in order to create hbf2gf.tex generates in addition
-# hbf2gf.idx and hbf2gf.scn; we must rerun cweave when they are not
-# up to date (even if hbf2gf.tex is up to date). Thus the sub-make.
-#
-hbf2gf.tex hbf2gf.idx hbf2gf.scn: hbf2gf.w
-	$(MAKE) $(AM_MAKEFLAGS) do-cweave
-do-cweave: hbf2gf.w .FORCE
-	$(CWEAVE) +ai $<
-.PHONY: do-cweave .FORCE
-
-@do_cweb_TRUE@all-local: hbf2gf.dvi
-@do_cweb_TRUE@hbf2gf.c: hbf2gf.w
-@do_cweb_TRUE@	$(CTANGLE) $<
-@do_cweb_FALSE@all-local:
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/Build/source/texk/cjkutils/scripts/Makefile.am b/Build/source/texk/cjkutils/scripts/Makefile.am
deleted file mode 100644
index 74c8e1d1065..00000000000
--- a/Build/source/texk/cjkutils/scripts/Makefile.am
+++ /dev/null
@@ -1,30 +0,0 @@
-## Makefile.am for the TeX Live subdirectory texk/cjkutils/scripts/
-##
-## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
-## You may freely use, modify and/or distribute this file.
-#
-
-dist_bin_SCRIPTS = \
-	bg5latex \
-	bg5pdflatex \
-	cef5latex \
-	cef5pdflatex \
-	ceflatex \
-	cefpdflatex \
-	cefslatex \
-	cefspdflatex \
-	gbklatex \
-	gbkpdflatex \
-	sjislatex \
-	sjispdflatex
-
-install-exec-hook:
-	@cd $(DESTDIR)$(bindir) && \
-	  for p in latex pdflatex; do \
-	    echo "$(LN_S) gbk$$p bg5+$$p"; \
-	    rm -f bg5+$$p; $(LN_S) gbk$$p bg5+$$p; \
-	  done
-
-uninstall-hook:
-	rm -f $(DESTDIR)$(bindir)/bg5+latex $(DESTDIR)$(bindir)/bg5+pdflatex
-
diff --git a/Build/source/texk/cjkutils/scripts/Makefile.in b/Build/source/texk/cjkutils/scripts/Makefile.in
deleted file mode 100644
index 624b21eeb9f..00000000000
--- a/Build/source/texk/cjkutils/scripts/Makefile.in
+++ /dev/null
@@ -1,460 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-#
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = scripts
-DIST_COMMON = $(dist_bin_SCRIPTS) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
-	$(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \
-	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/../../m4/libtool.m4 \
-	$(top_srcdir)/../../m4/ltoptions.m4 \
-	$(top_srcdir)/../../m4/ltsugar.m4 \
-	$(top_srcdir)/../../m4/ltversion.m4 \
-	$(top_srcdir)/../../m4/lt~obsolete.m4 \
-	$(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/hbf2gf/c-auto.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(bindir)"
-SCRIPTS = $(dist_bin_SCRIPTS)
-SOURCES =
-DIST_SOURCES =
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AR = @AR@
-AS = @AS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CTANGLE = @CTANGLE@
-CWEAVE = @CWEAVE@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GREP = @GREP@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KPATHSEA_DEPEND = @KPATHSEA_DEPEND@
-KPATHSEA_INCLUDES = @KPATHSEA_INCLUDES@
-KPATHSEA_LIBS = @KPATHSEA_LIBS@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-TEX = @TEX@
-VERSION = @VERSION@
-WARNING_CFLAGS = @WARNING_CFLAGS@
-XX_CFLAGS = @XX_CFLAGS@
-XX_CPPFLAGS = @XX_CPPFLAGS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-dist_bin_SCRIPTS = \
-	bg5latex \
-	bg5pdflatex \
-	cef5latex \
-	cef5pdflatex \
-	ceflatex \
-	cefpdflatex \
-	cefslatex \
-	cefspdflatex \
-	gbklatex \
-	gbkpdflatex \
-	sjislatex \
-	sjispdflatex
-
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign scripts/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign scripts/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-install-dist_binSCRIPTS: $(dist_bin_SCRIPTS)
-	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
-	@list='$(dist_bin_SCRIPTS)'; test -n "$(bindir)" || list=; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
-	done | \
-	sed -e 'p;s,.*/,,;n' \
-	    -e 'h;s|.*|.|' \
-	    -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \
-	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \
-	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
-	    if ($$2 == $$4) { files[d] = files[d] " " $$1; \
-	      if (++n[d] == $(am__install_max)) { \
-		print "f", d, files[d]; n[d] = 0; files[d] = "" } } \
-	    else { print "f", d "/" $$4, $$1 } } \
-	  END { for (d in files) print "f", d, files[d] }' | \
-	while read type dir files; do \
-	     if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
-	     test -z "$$files" || { \
-	       echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(bindir)$$dir'"; \
-	       $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
-	     } \
-	; done
-
-uninstall-dist_binSCRIPTS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(dist_bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \
-	files=`for p in $$list; do echo "$$p"; done | \
-	       sed -e 's,.*/,,;$(transform)'`; \
-	test -n "$$list" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(bindir)" && rm -f $$files
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-tags: TAGS
-TAGS:
-
-ctags: CTAGS
-CTAGS:
-
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(SCRIPTS)
-installdirs:
-	for dir in "$(DESTDIR)$(bindir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am: install-dist_binSCRIPTS
-	@$(NORMAL_INSTALL)
-	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-dist_binSCRIPTS
-	@$(NORMAL_INSTALL)
-	$(MAKE) $(AM_MAKEFLAGS) uninstall-hook
-.MAKE: install-am install-exec-am install-strip uninstall-am
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dist_binSCRIPTS \
-	install-dvi install-dvi-am install-exec install-exec-am \
-	install-exec-hook install-html install-html-am install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-dist_binSCRIPTS uninstall-hook
-
-
-install-exec-hook:
-	@cd $(DESTDIR)$(bindir) && \
-	  for p in latex pdflatex; do \
-	    echo "$(LN_S) gbk$$p bg5+$$p"; \
-	    rm -f bg5+$$p; $(LN_S) gbk$$p bg5+$$p; \
-	  done
-
-uninstall-hook:
-	rm -f $(DESTDIR)$(bindir)/bg5+latex $(DESTDIR)$(bindir)/bg5+pdflatex
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/Build/source/texk/cjkutils/conv/sjisconv.c b/Build/source/texk/cjkutils/sjisconv.c
index f655fa36637..3fcfbe1ae33 100644
--- a/Build/source/texk/cjkutils/conv/sjisconv.c
+++ b/Build/source/texk/cjkutils/sjisconv.c
@@ -1,15 +1,14 @@
 #define banner  \
-"sjisconv (CJK ver. 4.7.0)" \
+"sjisconv (CJK ver. 4.8.2)" \
 
 /*2:*/
-#line 93 "/home/wl/cvs/cjk/cjk-4.7.0/utils/SJISconv/sjisconv.w"
+#line 93 "./cjkutils-4.8.2/SJISconv/sjisconv.w"
 
 #include <stdio.h> 
 #include <stdlib.h> 
 
 
-int main(int argc, char *argv[])
-
+int main(int argc,char*argv[])
 {int ch;
 
 fprintf(stdout,"\\def\\CJKpreproc{%s}",banner);