cjkutils 4.8.3

git-svn-id: svn://tug.org/texlive/trunk@26310 c570f23f-e606-0410-a88d-b1316a301751
author: Peter Breitenlohner <peb@mppmu.mpg.de> 2012-05-12 11:03:50 +0000
committer: Peter Breitenlohner <peb@mppmu.mpg.de> 2012-05-12 11:03:50 +0000
commit: 4316da8a1a925fe8a60061f34dac1b15932cb3ed (patch)
tree: 746ca79340eef6922f64901f643d0b84fc1086e9 /Build/source/texk
parent: 3572a03583d40cb0ae0df2c77bb6600fffafa4b4 (diff)
111 files changed, 661 insertions, 1845 deletions
diff --git a/Build/source/texk/README b/Build/source/texk/README
index 222dfb35bfc..850fb5d74aa 100644
--- a/Build/source/texk/README
+++ b/Build/source/texk/README
@@ -27,8 +27,8 @@ bibtex8 - ?
 bibtexu - ?
   http://omega.enstb.org/yannis/bibtexu/
 
-cjkutils 4.8.2 - checked 18dec10
-  http://cjk.ffii.org/cjk-4.8.2.tar.gz
+cjkutils 4.8.3 - checked 11may12
+  http://cjk.ffii.org/cjk-4.8.3.tar.gz
 
 detex 2.8 - checked 10may12
   http://www.cs.purdue.edu/homes/trinkle/detex/
diff --git a/Build/source/texk/cjkutils/ChangeLog b/Build/source/texk/cjkutils/ChangeLog
index 45be7ae7a9a..bcce3438a2c 100644
--- a/Build/source/texk/cjkutils/ChangeLog
+++ b/Build/source/texk/cjkutils/ChangeLog
@@ -1,3 +1,10 @@
+2012-05-11  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	Import cjk-4.8.3/utils as cjkutils-4.8.3.
+	* version.ac: New file defining the cjk version.
+	* configure.ac: Adapt.
+	* tests/{bg5,cef,cef5,cefs,ext,sjis}conv.cjk: Version 4.8.3.
+
 2011-12-06  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* Makefile.am: Replace ${prefix}/texmf => $(datarootdir)/texmf.
diff --git a/Build/source/texk/cjkutils/Makefile.in b/Build/source/texk/cjkutils/Makefile.in
index 245760e49f9..b5daf127391 100644
--- a/Build/source/texk/cjkutils/Makefile.in
+++ b/Build/source/texk/cjkutils/Makefile.in
@@ -82,7 +82,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
 	$(top_srcdir)/../../m4/ltoptions.m4 \
 	$(top_srcdir)/../../m4/ltsugar.m4 \
 	$(top_srcdir)/../../m4/ltversion.m4 \
-	$(top_srcdir)/../../m4/lt~obsolete.m4 \
+	$(top_srcdir)/../../m4/lt~obsolete.m4 $(top_srcdir)/version.ac \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
diff --git a/Build/source/texk/cjkutils/bg5conv.c b/Build/source/texk/cjkutils/bg5conv.c
index 14837a1c843..6a2e9fe5a0f 100644
--- a/Build/source/texk/cjkutils/bg5conv.c
+++ b/Build/source/texk/cjkutils/bg5conv.c
@@ -1,8 +1,8 @@
 #define banner  \
-"bg5conv (CJK ver. 4.8.2)" \
+"bg5conv (CJK ver. 4.8.3)" \
 
 /*2:*/
-#line 94 "./cjkutils-4.8.2/Bg5conv/bg5conv.w"
+#line 94 "./cjkutils-4.8.3/Bg5conv/bg5conv.w"
 
 #include <stdio.h> 
 #include <stdlib.h> 
diff --git a/Build/source/texk/cjkutils/cef5conv.c b/Build/source/texk/cjkutils/cef5conv.c
index a521ad3fc20..8349f3a7955 100644
--- a/Build/source/texk/cjkutils/cef5conv.c
+++ b/Build/source/texk/cjkutils/cef5conv.c
@@ -1,8 +1,8 @@
 #define banner  \
-"cef5conv (CJK ver. 4.8.2)" \
+"cef5conv (CJK ver. 4.8.3)" \
 
 /*2:*/
-#line 108 "./cjkutils-4.8.2/CEFconv/cef5conv.w"
+#line 108 "./cjkutils-4.8.3/CEFconv/cef5conv.w"
 
 #include <ctype.h> 
 #include <stdio.h> 
diff --git a/Build/source/texk/cjkutils/cefconv.c b/Build/source/texk/cjkutils/cefconv.c
index f5932bbf7a4..f8b3fd4a15f 100644
--- a/Build/source/texk/cjkutils/cefconv.c
+++ b/Build/source/texk/cjkutils/cefconv.c
@@ -1,8 +1,8 @@
 #define banner  \
-"cefconv (CJK ver. 4.8.2)" \
+"cefconv (CJK ver. 4.8.3)" \
 
 /*2:*/
-#line 100 "./cjkutils-4.8.2/CEFconv/cefconv.w"
+#line 100 "./cjkutils-4.8.3/CEFconv/cefconv.w"
 
 #include <ctype.h> 
 #include <stdio.h> 
diff --git a/Build/source/texk/cjkutils/cefsconv.c b/Build/source/texk/cjkutils/cefsconv.c
index 38b091b3d13..431f06b5aa4 100644
--- a/Build/source/texk/cjkutils/cefsconv.c
+++ b/Build/source/texk/cjkutils/cefsconv.c
@@ -1,8 +1,8 @@
 #define banner  \
-"cefsconv (CJK ver. 4.8.2)" \
+"cefsconv (CJK ver. 4.8.3)" \
 
 /*2:*/
-#line 111 "./cjkutils-4.8.2/CEFconv/cefsconv.w"
+#line 111 "./cjkutils-4.8.3/CEFconv/cefsconv.w"
 
 #include <ctype.h> 
 #include <stdio.h> 
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
deleted file mode 100644
index 2227fd3fef9..00000000000
--- a/Build/source/texk/cjkutils/cjkutils-4.8.2-PATCHES/patch-01-ANSI-C
+++ /dev/null
@@ -1,758 +0,0 @@
-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
deleted file mode 100644
index 33649837b8c..00000000000
--- a/Build/source/texk/cjkutils/cjkutils-4.8.2-PATCHES/patch-02-const
+++ /dev/null
@@ -1,148 +0,0 @@
-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
deleted file mode 100644
index 23a25bd8696..00000000000
--- a/Build/source/texk/cjkutils/cjkutils-4.8.2-PATCHES/patch-03-kpathsea
+++ /dev/null
@@ -1,105 +0,0 @@
-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
deleted file mode 100644
index 7f527c9e281..00000000000
--- a/Build/source/texk/cjkutils/cjkutils-4.8.2-PATCHES/patch-04-cjklatex
+++ /dev/null
@@ -1,108 +0,0 @@
-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
deleted file mode 100644
index ccfa7871d8f..00000000000
--- a/Build/source/texk/cjkutils/cjkutils-4.8.2-PATCHES/patch-05-cjkpdflatex
+++ /dev/null
@@ -1,95 +0,0 @@
-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-PATCHES/patch-06-cjklatex b/Build/source/texk/cjkutils/cjkutils-4.8.2-PATCHES/patch-06-cjklatex
deleted file mode 100644
index 74e4930d4f7..00000000000
--- a/Build/source/texk/cjkutils/cjkutils-4.8.2-PATCHES/patch-06-cjklatex
+++ /dev/null
@@ -1,17 +0,0 @@
-	No need to directly #include <kpathsea/win32lib.h> (already done
-	from <kpathsea/config.h>).
-
-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:25:43.000000000 +0100
-+++ cjkutils-4.8.2/cjklatex/cjklatex.c	2011-09-12 13:44:29.000000000 +0200
-@@ -36,10 +36,6 @@
- #include <kpathsea/lib.h>
- #include <kpathsea/getopt.h>
- 
--#if defined(WIN32) && !defined(__MINGW32__)
--#include <kpathsea/win32lib.h>
--#endif
--
- static const char *cjklatex_version_string = "1.0";
- 
- static const char *usage_str[] = {
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.2-PATCHES/patch-07-CEFconv b/Build/source/texk/cjkutils/cjkutils-4.8.2-PATCHES/patch-07-CEFconv
deleted file mode 100644
index 12f9d60eb5a..00000000000
--- a/Build/source/texk/cjkutils/cjkutils-4.8.2-PATCHES/patch-07-CEFconv
+++ /dev/null
@@ -1,55 +0,0 @@
-	Make sure that, as advertised, cef5conv acts as bg5conv + cefconv
-	and cefsconv as sjisconv + cefconv.
-
-	Make the TeX description of cefconv agree with the actual code.
-
-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	2010-12-17 20:41:33.000000000 +0100
-+++ cjkutils-4.8.2/CEFconv/cef5conv.w	2011-09-16 21:49:49.000000000 +0200
-@@ -172,6 +172,7 @@
-                 goto no_macro;@#
- 
-             *(outp++) = '\177';
-+            *(outp++) = '\177';
-             *(outp++) = '\"';
-             *(outp++) = '0';@#
- 
-@@ -188,7 +189,6 @@
-                 goto no_macro;@#
- 
-             *(outp++) = '\177';
--            *(outp++) = '\177';
-             *(outp++) = '\"';
-             *(outp++) = '0';@#
- 
-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	2010-12-17 20:41:34.000000000 +0100
-+++ cjkutils-4.8.2/CEFconv/cefconv.w	2011-09-17 14:19:53.000000000 +0200
-@@ -80,7 +80,7 @@
- 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%
-+\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'
-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	2010-12-17 20:41:35.000000000 +0100
-+++ cjkutils-4.8.2/CEFconv/cefsconv.w	2011-09-16 21:49:46.000000000 +0200
-@@ -172,6 +172,7 @@
-                 goto no_macro;@#
- 
-             *(outp++) = '\177';
-+            *(outp++) = '\177';
-             *(outp++) = '\"';
-             *(outp++) = '0';@#
- 
-@@ -188,7 +189,6 @@
-                 goto no_macro;@#
- 
-             *(outp++) = '\177';
--            *(outp++) = '\177';
-             *(outp++) = '\"';
-             *(outp++) = '0';@#
- 
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.2-PATCHES/patch-09-from-git b/Build/source/texk/cjkutils/cjkutils-4.8.2-PATCHES/patch-09-from-git
deleted file mode 100644
index f8577d4f7f4..00000000000
--- a/Build/source/texk/cjkutils/cjkutils-4.8.2-PATCHES/patch-09-from-git
+++ /dev/null
@@ -1,86 +0,0 @@
-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	2011-09-16 21:49:46.000000000 +0200
-+++ cjkutils-4.8.2/CEFconv/cefsconv.w	2011-10-04 11:13:43.000000000 +0200
-@@ -102,6 +102,9 @@
- which will see the output of \.{cefsconv} complains loudly if something is
- wrong.
- 
-+Note that the user-defined character area of SJIS (with the first bytes in
-+the range 0xF0--0xFC) is not supported because it is not portable.
-+
- @d banner
- "cefsconv (CJK ver. 4.8.2)"
- 
-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	2010-12-17 20:41:37.000000000 +0100
-+++ cjkutils-4.8.2/SJISconv/sjisconv.w	2011-10-04 11:13:43.000000000 +0200
-@@ -87,6 +87,9 @@
- which will see the output of \.{sjisconv} complains loudly if something is
- wrong.
- 
-+Note that the user-defined character area of SJIS (with the first bytes in
-+the range 0xF0--0xFC) is not supported because it is not portable.
-+
- @d banner
- "sjisconv (CJK ver. 4.8.2)"
- 
-diff -ur cjkutils-4.8.2.orig/hbf2gf/hbf2gf.1 cjkutils-4.8.2/hbf2gf/hbf2gf.1
---- cjkutils-4.8.2.orig/hbf2gf/hbf2gf.1	2008-12-29 00:00:00.000000000 +0100
-+++ cjkutils-4.8.2/hbf2gf/hbf2gf.1	2011-10-04 11:13:43.000000000 +0200
-@@ -554,12 +554,6 @@
- is for Win32 systems).
- .
- .SS kpathsea
--Please note that older versions of
--.B kpathsea
--(<3.2) have no special means to seach for program related files.
--Additionally, versions older than 3.3 have no default path for miscellaneous
--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 .
-@@ -568,8 +562,6 @@
- .B kpathsea
- variables.
- .PP
--Version\ 3.3 and newer (this won't change again in the future!):
--.PP
- .in +4m
- .ta 2i
- .br
-@@ -577,34 +569,6 @@
- .br
- .C "\&.cfg	HBF2GFINPUTS"
- .PP
--Version\ 3.2:
--.PP
--.in +4m
--.ta 2i
--.br
--.C "\&.hbf	T1FONTS"
--.br
--.C "\&.cfg	HBF2GFINPUTS"
--.PP
--And here the same for pre-3.2-versions of
--.B kpathsea:
--.PP
--.in +4m
--.ta 2i
--.br
--.C "\&.hbf	T1FONTS"
--.br
--.C "\&.cfg	TEXCONFIG"
--.PP
--Finally, the same for versions\ \(<=2.6:
--.PP
--.in +4m
--.ta 2i
--.br
--.C "\&.hbf	DVIPSHEADERS"
--.br
--.C "\&.cfg	TEXCONFIG"
--.PP
- Please consult the info files of
- .B kpathsea
- for details on these variables.
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.2-PATCHES/ChangeLog b/Build/source/texk/cjkutils/cjkutils-4.8.3-PATCHES/ChangeLog
index 6a7a7ded1f6..be7e61a186e 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.2-PATCHES/ChangeLog
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.3-PATCHES/ChangeLog
@@ -1,3 +1,11 @@
+2012-05-11  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	Imported cjk-4.8.3/utils source tree from:
+	  http://cjk.ffii.org/cjk-4.8.3.tar.gz
+	* patch-01-ANSI-C, patch-02-const, patch-03-kpathsea,
+	patch-04-cjklatex, patch-05-cjkpdflatex, patch-06-cjklatex,
+	patch-07-CEFconv, patch-09-from-git (removed): All included. 
+
 2011-10-04  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* patch-08-SJISconv (removed): The user-defined character area of
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.2-PATCHES/TL-Changes b/Build/source/texk/cjkutils/cjkutils-4.8.3-PATCHES/TL-Changes
index f28033b841b..a93c0322860 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.2-PATCHES/TL-Changes
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.3-PATCHES/TL-Changes
@@ -1,5 +1,5 @@
-Changes applied to the cjk-4.8.2/utils tree as obtained from:
-	http://cjk.ffii.org/cjk-4.8.2.tar.gz
+Changes applied to the cjk-4.8.3/utils tree as obtained from:
+	http://cjk.ffii.org/cjk-4.8.3.tar.gz
 
 Moved from top level to here:
 	ChangeLog
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.2/Bg5conv/bg5conv.1 b/Build/source/texk/cjkutils/cjkutils-4.8.3/Bg5conv/bg5conv.1
index 6ec9aeaa9b6..4ee4815cfef 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.2/Bg5conv/bg5conv.1
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.3/Bg5conv/bg5conv.1
@@ -1,5 +1,5 @@
 .\" man page for bg5conv
-.\" Copyright (C) 1994-2008  Werner Lemberg <wl@gnu.org>
+.\" Copyright (C) 1994-2012  Werner Lemberg <wl@gnu.org>
 .\"
 .\" This program is free software; you can redistribute it and/or modify
 .\" it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
 .\" Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
 .\" MA 02110-1301 USA
 .
-.TH BG5CONV 1 29-Dec-2008 "CJK Version 4.8.2"
+.TH BG5CONV 1 07-May-2012 "CJK Version 4.8.3"
 .
 .\" ====
 .\" ==== macro definitions
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.2/Bg5conv/bg5conv.c b/Build/source/texk/cjkutils/cjkutils-4.8.3/Bg5conv/bg5conv.c
index 435492827e3..e3a366fd1d3 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.2/Bg5conv/bg5conv.c
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.3/Bg5conv/bg5conv.c
@@ -1,17 +1,14 @@
 #define banner  \
-"bg5conv (CJK ver. 4.8.2)" \
+"bg5conv (CJK ver. 4.8.3)" \
 
 /*2:*/
-#line 94 "/home/wl/git/cjk/cjk-4.8.2/utils/Bg5conv/bg5conv.w"
+#line 94 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/Bg5conv/bg5conv.w"
 
 #include <stdio.h> 
 #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 --git a/Build/source/texk/cjkutils/cjkutils-4.8.2/Bg5conv/bg5conv.w b/Build/source/texk/cjkutils/cjkutils-4.8.3/Bg5conv/bg5conv.w
index 2a25f5b91bf..23f520f181f 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.2/Bg5conv/bg5conv.w
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.3/Bg5conv/bg5conv.w
@@ -1,6 +1,6 @@
-% This is the cweb file bg5conv.w of the CJK Package Ver. 4.8.2  29-Dec-2008
+% This is the cweb file bg5conv.w of the CJK Package Ver. 4.8.3  07-May-2012
 
-% Copyright (C) 1994-2008  Werner Lemberg <wl@@gnu.org>
+% Copyright (C) 1994-2012  Werner Lemberg <wl@@gnu.org>
 %
 % This program is free software; you can redistribute it and/or modify
 % it under the terms of the GNU General Public License as published by
@@ -26,13 +26,13 @@
 % output rules (look at the position of braces below!) the author (it's me
 % too :-) prefer. Otherwise this file will be formatted traditionally.
 
-\def\title{bg5conv (CJK Version 4.8.2)}
+\def\title{bg5conv (CJK Version 4.8.3)}
 
 \def\topofcontents{
   \null\vfill
   \centerline{\titlefont The {\ttitlefont bg5conv} program}
   \vskip 20pt
-  \centerline{(CJK Version 4.8.2)}
+  \centerline{(CJK Version 4.8.3)}
   \vfill}
 
 \def\botofcontents{
@@ -89,7 +89,7 @@ which will see the output of \.{bg5conv} complains loudly if something is
 wrong.
 
 @d banner
-"bg5conv (CJK ver. 4.8.2)"
+"bg5conv (CJK ver. 4.8.3)"
 
 @c
 #include <stdio.h>
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.2/Bg5conv/bg5latex b/Build/source/texk/cjkutils/cjkutils-4.8.3/Bg5conv/bg5latex
index 30195776a87..1839e354680 100755
--- a/Build/source/texk/cjkutils/cjkutils-4.8.2/Bg5conv/bg5latex
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.3/Bg5conv/bg5latex
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# Copyright (C) 1994-2008  Werner Lemberg <wl@gnu.org>
+# Copyright (C) 1994-2012  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/Bg5conv/bg5latex.bat b/Build/source/texk/cjkutils/cjkutils-4.8.3/Bg5conv/bg5latex.bat
index 91e7dfd8575..91e7dfd8575 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.2/Bg5conv/bg5latex.bat
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.3/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.3/Bg5conv/bg5latex.cmd
index 04d0d0903dc..24c8a2fbdf0 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.2/Bg5conv/bg5latex.cmd
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.3/Bg5conv/bg5latex.cmd
@@ -1,9 +1,9 @@
 /*----------------------------------------------------------------------*\
     bg5latex.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.3
 
-    Copyright (C) 1994-2008  Wonkoo Kim <wkim+@pitt.edu>
+    Copyright (C) 1994-2012  Wonkoo Kim <wkim+@pitt.edu>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.2/Bg5conv/bg5pdflatex b/Build/source/texk/cjkutils/cjkutils-4.8.3/Bg5conv/bg5pdflatex
index ae165527569..685c3c2228b 100755
--- a/Build/source/texk/cjkutils/cjkutils-4.8.2/Bg5conv/bg5pdflatex
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.3/Bg5conv/bg5pdflatex
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# Copyright (C) 1994-2008  Werner Lemberg <wl@gnu.org>
+# Copyright (C) 1994-2012  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.3/CEFconv/cef5conv.1
index aa56b138c6d..e1d2c6a7ad8 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.2/CEFconv/cef5conv.1
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.3/CEFconv/cef5conv.1
@@ -1,5 +1,5 @@
 .\" man page for cef5conv
-.\" Copyright (C) 1994-2008  Werner Lemberg <wl@gnu.org>
+.\" Copyright (C) 1994-2012  Werner Lemberg <wl@gnu.org>
 .\"
 .\" This program is free software; you can redistribute it and/or modify
 .\" it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
 .\" Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
 .\" MA 02110-1301 USA
 .
-.TH CEF5CONV 1 29-Dec-2008 "CJK Version 4.8.2"
+.TH CEF5CONV 1 07-May-2012 "CJK Version 4.8.3"
 .
 .\" ====
 .\" ==== macro definitions
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.2/CEFconv/cef5conv.c b/Build/source/texk/cjkutils/cjkutils-4.8.3/CEFconv/cef5conv.c
index e2d00c7de22..05355b13085 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.2/CEFconv/cef5conv.c
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.3/CEFconv/cef5conv.c
@@ -1,18 +1,15 @@
 #define banner  \
-"cef5conv (CJK ver. 4.8.2)" \
+"cef5conv (CJK ver. 4.8.3)" \
 
 /*2:*/
-#line 108 "/home/wl/git/cjk/cjk-4.8.2/utils/CEFconv/cef5conv.w"
+#line 108 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/CEFconv/cef5conv.w"
 
 #include <ctype.h> 
 #include <stdio.h> 
 #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];
@@ -73,6 +70,7 @@ if(*inp!='-'||feof(stdin))
 goto no_macro;
 
 *(outp++)= '\177';
+*(outp++)= '\177';
 *(outp++)= '\"';
 *(outp++)= '0';
 
@@ -89,7 +87,6 @@ else
 goto no_macro;
 
 *(outp++)= '\177';
-*(outp++)= '\177';
 *(outp++)= '\"';
 *(outp++)= '0';
 
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.2/CEFconv/cef5conv.w b/Build/source/texk/cjkutils/cjkutils-4.8.3/CEFconv/cef5conv.w
index 5b81ea33c63..c8630fdc8b9 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.2/CEFconv/cef5conv.w
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.3/CEFconv/cef5conv.w
@@ -1,6 +1,6 @@
-% This is the cweb file cef5conv.w of the CJK Package Ver. 4.8.2  29-Dec-2008
+% This is the cweb file cef5conv.w of the CJK Package Ver. 4.8.3  07-May-2012
 
-% Copyright (C) 1994-2008  Werner Lemberg <wl@@gnu.org>
+% Copyright (C) 1994-2012  Werner Lemberg <wl@@gnu.org>
 %
 % This program is free software; you can redistribute it and/or modify
 % it under the terms of the GNU General Public License as published by
@@ -26,13 +26,13 @@
 % output rules (look at the position of braces below!) the author (it's me
 % too :-) prefer. Otherwise this file will be formatted traditionally.
 
-\def\title{cef5conv (CJK Version 4.8.2)}
+\def\title{cef5conv (CJK Version 4.8.3)}
 
 \def\topofcontents{
   \null\vfill
   \centerline{\titlefont The {\ttitlefont cef5conv} program}
   \vskip 20pt
-  \centerline{(CJK Version 4.8.2)}
+  \centerline{(CJK Version 4.8.3)}
   \vfill}
 
 \def\botofcontents{
@@ -103,7 +103,7 @@ which will see the output of \.{cef5conv} complains loudly if something is
 wrong.
 
 @d banner
-"cef5conv (CJK ver. 4.8.2)"
+"cef5conv (CJK ver. 4.8.3)"
 
 @c
 #include <ctype.h>
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.2/CEFconv/cef5latex b/Build/source/texk/cjkutils/cjkutils-4.8.3/CEFconv/cef5latex
index 5e609181030..e729c27d4c7 100755
--- a/Build/source/texk/cjkutils/cjkutils-4.8.2/CEFconv/cef5latex
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.3/CEFconv/cef5latex
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# Copyright (C) 1994-2008  Werner Lemberg <wl@gnu.org>
+# Copyright (C) 1994-2012  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/cef5ltx.bat b/Build/source/texk/cjkutils/cjkutils-4.8.3/CEFconv/cef5ltx.bat
index 187485301f9..187485301f9 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.2/CEFconv/cef5ltx.bat
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.3/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.3/CEFconv/cef5ltx.cmd
index 463a1153503..cd3ebb5650b 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.2/CEFconv/cef5ltx.cmd
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.3/CEFconv/cef5ltx.cmd
@@ -1,11 +1,11 @@
 /*----------------------------------------------------------------------*\
     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.3
 
-    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.3
 
-    Copyright (C) 1994-2008  Wonkoo Kim <wkim+@pitt.edu>
+    Copyright (C) 1994-2012  Wonkoo Kim <wkim+@pitt.edu>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.2/CEFconv/cef5pdflatex b/Build/source/texk/cjkutils/cjkutils-4.8.3/CEFconv/cef5pdflatex
index cd1118cd7c3..7ff040cbfaa 100755
--- a/Build/source/texk/cjkutils/cjkutils-4.8.2/CEFconv/cef5pdflatex
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.3/CEFconv/cef5pdflatex
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# Copyright (C) 1994-2008  Werner Lemberg <wl@gnu.org>
+# Copyright (C) 1994-2012  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.3/CEFconv/cefconv.1
index f2bdca8bf2a..312740d7d1c 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.2/CEFconv/cefconv.1
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.3/CEFconv/cefconv.1
@@ -1,5 +1,5 @@
 .\" man page for cefconv
-.\" Copyright (C) 1994-2008  Werner Lemberg <wl@gnu.org>
+.\" Copyright (C) 1994-2012  Werner Lemberg <wl@gnu.org>
 .\"
 .\" This program is free software; you can redistribute it and/or modify
 .\" it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
 .\" Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
 .\" MA 02110-1301 USA
 .
-.TH CEFCONV 1 29-Dec-2008 "CJK Version 4.8.2"
+.TH CEFCONV 1 07-May-2012 "CJK Version 4.8.3"
 .
 .\" ====
 .\" ==== macro definitions
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.2/CEFconv/cefconv.c b/Build/source/texk/cjkutils/cjkutils-4.8.3/CEFconv/cefconv.c
index 8c3e624108e..b60b8682580 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.2/CEFconv/cefconv.c
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.3/CEFconv/cefconv.c
@@ -1,18 +1,15 @@
 #define banner  \
-"cefconv (CJK ver. 4.8.2)" \
+"cefconv (CJK ver. 4.8.3)" \
 
 /*2:*/
-#line 100 "/home/wl/git/cjk/cjk-4.8.2/utils/CEFconv/cefconv.w"
+#line 100 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/CEFconv/cefconv.w"
 
 #include <ctype.h> 
 #include <stdio.h> 
 #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 --git a/Build/source/texk/cjkutils/cjkutils-4.8.2/CEFconv/cefconv.w b/Build/source/texk/cjkutils/cjkutils-4.8.3/CEFconv/cefconv.w
index 4027dc5f368..909f93ec2d3 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.2/CEFconv/cefconv.w
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.3/CEFconv/cefconv.w
@@ -1,6 +1,6 @@
-% This is the cweb file cefconv.w of the CJK Package Ver. 4.8.2  29-Dec-2008
+% This is the cweb file cefconv.w of the CJK Package Ver. 4.8.3  07-May-2012
 
-% Copyright (C) 1994-2008  Werner Lemberg <wl@@gnu.org>
+% Copyright (C) 1994-2012  Werner Lemberg <wl@@gnu.org>
 %
 % This program is free software; you can redistribute it and/or modify
 % it under the terms of the GNU General Public License as published by
@@ -26,13 +26,13 @@
 % output rules (look at the position of braces below!) the author (it's me
 % too :-) prefer. Otherwise this file will be formatted traditionally.
 
-\def\title{cefconv (CJK Version 4.8.2)}
+\def\title{cefconv (CJK Version 4.8.3)}
 
 \def\topofcontents{
   \null\vfill
   \centerline{\titlefont The {\ttitlefont cefconv} program}
   \vskip 20pt
-  \centerline{(CJK Version 4.8.2)}
+  \centerline{(CJK Version 4.8.3)}
   \vfill}
 
 \def\botofcontents{
@@ -95,7 +95,7 @@ which will see the output of \.{cefconv} complains loudly if something is
 wrong.
 
 @d banner
-"cefconv (CJK ver. 4.8.2)"
+"cefconv (CJK ver. 4.8.3)"
 
 @c
 #include <ctype.h>
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.2/CEFconv/ceflatex b/Build/source/texk/cjkutils/cjkutils-4.8.3/CEFconv/ceflatex
index 1b110c613c6..4c1d5eb3936 100755
--- a/Build/source/texk/cjkutils/cjkutils-4.8.2/CEFconv/ceflatex
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.3/CEFconv/ceflatex
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# Copyright (C) 1994-2008  Werner Lemberg <wl@gnu.org>
+# Copyright (C) 1994-2012  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/ceflatex.bat b/Build/source/texk/cjkutils/cjkutils-4.8.3/CEFconv/ceflatex.bat
index ba5925a6df3..ba5925a6df3 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.2/CEFconv/ceflatex.bat
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.3/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.3/CEFconv/ceflatex.cmd
index 69ad0b0ce21..8209d0aeea7 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.2/CEFconv/ceflatex.cmd
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.3/CEFconv/ceflatex.cmd
@@ -1,11 +1,11 @@
 /*----------------------------------------------------------------------*\
     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.3
 
-    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.3
 
-    Copyright (C) 1994-2008  Wonkoo Kim <wkim+@pitt.edu>
+    Copyright (C) 1994-2012  Wonkoo Kim <wkim+@pitt.edu>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.2/CEFconv/cefpdflatex b/Build/source/texk/cjkutils/cjkutils-4.8.3/CEFconv/cefpdflatex
index 706114a8c77..db653b6f65a 100755
--- a/Build/source/texk/cjkutils/cjkutils-4.8.2/CEFconv/cefpdflatex
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.3/CEFconv/cefpdflatex
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# Copyright (C) 1994-2008  Werner Lemberg <wl@gnu.org>
+# Copyright (C) 1994-2012  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.3/CEFconv/cefsconv.1
index 4cd962d3d2f..d9c2d578acd 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.2/CEFconv/cefsconv.1
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.3/CEFconv/cefsconv.1
@@ -1,5 +1,5 @@
 .\" man page for cefsconv
-.\" Copyright (C) 1994-2008  Werner Lemberg <wl@gnu.org>
+.\" Copyright (C) 1994-2012  Werner Lemberg <wl@gnu.org>
 .\"
 .\" This program is free software; you can redistribute it and/or modify
 .\" it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
 .\" Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
 .\" MA 02110-1301 USA
 .
-.TH CEFSCONV 1 29-Dec-2008 "CJK Version 4.8.2"
+.TH CEFSCONV 1 07-May-2012 "CJK Version 4.8.3"
 .
 .\" ====
 .\" ==== macro definitions
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.2/CEFconv/cefsconv.c b/Build/source/texk/cjkutils/cjkutils-4.8.3/CEFconv/cefsconv.c
index cfb9a77b11b..a4b7eb9f7c3 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.2/CEFconv/cefsconv.c
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.3/CEFconv/cefsconv.c
@@ -1,18 +1,15 @@
 #define banner  \
-"cefsconv (CJK ver. 4.8.2)" \
+"cefsconv (CJK ver. 4.8.3)" \
 
 /*2:*/
-#line 108 "/home/wl/git/cjk/cjk-4.8.2/utils/CEFconv/cefsconv.w"
+#line 111 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/CEFconv/cefsconv.w"
 
 #include <ctype.h> 
 #include <stdio.h> 
 #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];
@@ -73,6 +70,7 @@ if(*inp!='-'||feof(stdin))
 goto no_macro;
 
 *(outp++)= '\177';
+*(outp++)= '\177';
 *(outp++)= '\"';
 *(outp++)= '0';
 
@@ -89,7 +87,6 @@ else
 goto no_macro;
 
 *(outp++)= '\177';
-*(outp++)= '\177';
 *(outp++)= '\"';
 *(outp++)= '0';
 
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.2/CEFconv/cefsconv.w b/Build/source/texk/cjkutils/cjkutils-4.8.3/CEFconv/cefsconv.w
index 196dba4347f..bcb7118a84e 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.2/CEFconv/cefsconv.w
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.3/CEFconv/cefsconv.w
@@ -1,6 +1,6 @@
-% This is the cweb file cefsconv.w of the CJK Package Ver. 4.8.2  29-Dec-2008
+% This is the cweb file cefsconv.w of the CJK Package Ver. 4.8.3  07-May-2012
 
-% Copyright (C) 1994-2008  Werner Lemberg <wl@@gnu.org>
+% Copyright (C) 1994-2012  Werner Lemberg <wl@@gnu.org>
 %
 % This program is free software; you can redistribute it and/or modify
 % it under the terms of the GNU General Public License as published by
@@ -26,13 +26,13 @@
 % output rules (look at the position of braces below!) the author (it's me
 % too :-) prefer. Otherwise this file will be formatted traditionally.
 
-\def\title{cefsconv (CJK Version 4.8.2)}
+\def\title{cefsconv (CJK Version 4.8.3)}
 
 \def\topofcontents{
   \null\vfill
   \centerline{\titlefont The {\ttitlefont cefsconv} program}
   \vskip 20pt
-  \centerline{(CJK Version 4.8.2)}
+  \centerline{(CJK Version 4.8.3)}
   \vfill}
 
 \def\botofcontents{
@@ -106,7 +106,7 @@ Note that the user-defined character area of SJIS (with the first bytes in
 the range 0xF0--0xFC) is not supported because it is not portable.
 
 @d banner
-"cefsconv (CJK ver. 4.8.2)"
+"cefsconv (CJK ver. 4.8.3)"
 
 @c
 #include <ctype.h>
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.2/CEFconv/cefslatex b/Build/source/texk/cjkutils/cjkutils-4.8.3/CEFconv/cefslatex
index db2232d98c6..a7054b3c207 100755
--- a/Build/source/texk/cjkutils/cjkutils-4.8.2/CEFconv/cefslatex
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.3/CEFconv/cefslatex
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# Copyright (C) 1994-2008  Werner Lemberg <wl@gnu.org>
+# Copyright (C) 1994-2012  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/cefsltx.bat b/Build/source/texk/cjkutils/cjkutils-4.8.3/CEFconv/cefsltx.bat
index 662ef9e3af4..662ef9e3af4 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.2/CEFconv/cefsltx.bat
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.3/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.3/CEFconv/cefsltx.cmd
index 73a4de3cf17..df42357b094 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.2/CEFconv/cefsltx.cmd
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.3/CEFconv/cefsltx.cmd
@@ -1,11 +1,11 @@
 /*----------------------------------------------------------------------*\
     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.3
 
-    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.3
 
-    Copyright (C) 1994-2008  Wonkoo Kim <wkim+@pitt.edu>
+    Copyright (C) 1994-2012  Wonkoo Kim <wkim+@pitt.edu>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.2/CEFconv/cefspdflatex b/Build/source/texk/cjkutils/cjkutils-4.8.3/CEFconv/cefspdflatex
index bc99498f4af..d4cc95bff89 100755
--- a/Build/source/texk/cjkutils/cjkutils-4.8.2/CEFconv/cefspdflatex
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.3/CEFconv/cefspdflatex
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# Copyright (C) 1994-2008  Werner Lemberg <wl@gnu.org>
+# Copyright (C) 1994-2012  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.3/ChangeLog
index 51d9185d21f..e7c27efe761 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.2/ChangeLog
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.3/ChangeLog
@@ -1,3 +1,243 @@
+2012-05-07  Werner LEMBERG  <wl@gnu.org>
+
+	Version 4.8.3 released
+	======================
+
+	Set version to 4.8.3.
+
+	* doc/history.txt: Updated.
+
+	* Makefile (CJK2DVI, LATEX2DVI): Set TFMFONTS.
+
+	Update headers in all text files.
+
+2012-05-07  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.69.
+
+2012-05-07  Werner LEMBERG  <wl@gnu.org>
+
+	[thai] Update to font-tlwg 0.5.
+
+	* doc/thaifont.txt, utils/thaifont/tools/INSTALL: Updated.
+
+	* 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.
+
+2012-05-05  Hin-Tak Leung  <htl10@users.sourceforge.net>
+
+	[cjk-enc.el] Accept Thai input in utf-8 encoding.
+
+	* utils/lisp/emacs/cjk-enc.el: Treat Unicode 0x0EXX inputs as Thai.
+
+	* examples/thai_utf8.tex: New sample file.
+
+	* Makefile (DISTTARGETS): Add `thai_utf8.tex'.
+	(thai_utf8): New target.
+
+	* MANIFEST, texlive/cjk.pl: Updated.
+
+2012-05-05  Werner LEMBERG  <wl@gnu.org>
+
+	Remove xCJK files.
+
+	The stuff is obsolete and no longer works out of the box.  Given
+	that there exists the `xeCJK' package, those files are really
+	useless today.
+
+	* examples/xCJK.tex, texinput/UTF8/xUTF8.chr,
+	texinput/UTF8/xUTF8.enc, texinput/xCJK.sty, texinput/xpmC.chr,
+	texinput/xpmC.enc, doc/xCJK.txt: Removed.
+
+	* MANIFEST, texlive/cjk.pl: Updated.
+
+	* Makefile (XELATEX, xCJK): Removed.
+	(DISTTARGETS): Updated.
+
+2012-05-05  Qing Lee  <sobenlee@gmail.com>
+
+	[CJKfntef] Fix incompatibility with `ulem.sty'.
+
+	* texinput/CJKfntef.tex (\CJKunderdot): Version 2010-01-21 of
+	`ulem.sty' silently adds a line which redefines \par (its author
+	says this was an oversight).  This exhibits a bug in \CJKunderdot
+	which implicitly emits \par by inserting an \hskip command in
+	vertical mode.  Simply omitting this \hskip fixes the issue.
+
+2012-04-20  Werner LEMBERG  <wl@gnu.org>
+
+	* texinput/Bg5/Bg5.cpx, texinput/JIS/JIS.cpx: Fix typos.
+
+2012-04-20  Werner LEMBERG  <wl@gnu.org>
+
+	* texinput/UTF8/zh-Hans.cpx: Synchronize.
+
+2012-04-20  Jiangsheng Yu  <yujs@ittc.ku.edu>
+
+	* texinput/GB/GB.cap, texinput/GB/GB.cpx: Improve.
+
+2011-12-16 Hin-Tak Leung <htl10@users.sourceforge.net>
+
+	[cjk-enc.el] Make it work with emacs 23 and newer.
+
+	Emacs 23+ introduces native Unicode support and uses a new charset
+	priority system: `char-charset' and `split-char' preferably now
+	return the Unicode charset and code points, respectively;
+	non-Unicode charsets and code points are only used if they have a
+	higher charset priority.  On the other hand, information on the
+	original charset is preserved in the text property `charset'.
+
+	Another change is the new charset/text-property called `tis620-2533'
+	(a superset of `ascii' and `thai-tis620'), introduced in emacs 23. 
+	This has the tendency of swallowing up every ASCII character and
+	goes into an infinite loop with `examples/thai.tex', so we have to
+	handle this also.
+
+	Tested with emacs 22.3 and 23.3, and
+	EMACS_PRETEST_24_0_92-142-g559675b on examples/{CJKbabel.tex,
+	muletest.tex, rubytest.tex, thai.tex}.
+
+	* utils/lisp/emacs/cjk-enc.el [emacs version >= 23]:
+	`make-coding-system' is deprecated -- use `define-coding-system'
+	instead.
+
+	Use the `charset' text property instead of the outcome of
+	`char-charset' to explicitly set the charset priority; this makes
+	`split-char' work as with emacs 22 and earlier.
+
+	Set new optional `restriction' argument of `char-charset' to avoid
+	problems with `tis620-2533'.
+
+2011-12-03  Werner LEMBERG  <wl@gnu.org>
+
+	* examples/thai.tex: Improve prologue comments.
+
+2011-10-04  Werner LEMBERG  <wl@gnu.org>
+
+	[CEFconv, SJISconv] Document missing range 0xF0-0xFC.
+
+	* utils/CEFconv/cefsconv.w, utils/SJISconv/sjisconv.w: Do it.
+
+2011-10-04  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	[cjklatex] Don't include `kpathsea/win32lib.h'.
+	This is already done from `kpathsea/config.h'.
+
+	* utils/cjklatex/cjklatex.c: Implement it.
+
+2011-10-04  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	[cefconv] Various fixes.
+
+	* utils/CEFconv/cef5conv.w: Fix output so that it really works as
+	bg5conv + cefconv.
+	* utils/CEFconv/cefsconv.w: Fix output so that it really works as
+	sjisconv + cefconv.
+	* utils/CEFconv/cefconv.w: Typo.
+
+2011-09-03  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	[cjklatex] Introduce `LATEX' preprocessor macro.
+
+	* utils/cjklatex/cjklatex.c (LATEX): New macro.  Use it where
+	appropriate to remove the hardcoded usage of `latex'.  For example,
+	LATEX can be defined as `pdflatex' (as done in TeXLive).
+
+2011-09-03  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	[cjklatex] Various updates to stay in sync with TeXLive.
+
+	* utils/cjklatex/cjklatex.c: Include kpathsea/win32lib.h instead of
+	win32lib.h directly.
+	Decorate with `const'.
+	(usage_str, CJKtable): Updated.
+
+2011-09-03  Werner LEMBERG  <wl@gnu.org>
+
+	[hbf2gf] Update manpage.
+
+	* utils/hbf2gf/hbf2gf.1, doc/hbf2gf.txt: Remove information on
+	ancient kpathsea versions.
+
+2011-09-03  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	[hbf2gf] Update kpathsea support.
+
+	* utils/hbf2gf/hbf2gf.w (OLD_KPATHSEA, VERY_OLD_KPATHSEA): Removed.
+	(DllImport, KPSEDLL): Removed.
+	[HAVE_CONFIG_H]: Include `c-auto.h'.
+
+2011-09-03  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	[hbf2gf] Decorate with `const'.
+
+	* utils/hbf2gf/hbf2gf.w, utils/hbf2gf/hbf.c: Do it.
+
+2011-09-03  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	Adapt utility programs to ANSI C.
+
+	* utils/Bg5conv/bg5conv.w, utils/CEFconv/cefconv.w,
+	utils/CEFconv/cef5conv.w, utils/CEFconv/cefsconv.w,
+	utils/SJISconv/sjisconv.w, utils/extconv/extconv.w,
+	utils/hbf2gf/hbf.c, utils/hbf2gf/hbf2gf.w: Do it.
+
+2011-02-07  Werner LEMBERG  <wl@gnu.org>
+
+	* doc/CJK.txt: Document possible problems in `tabular' environment.
+	Problem reported by LI Ruo-Meng <15003990378@163.com>.
+
+2010-01-04  Werner LEMBERG  <wl@gnu.org>
+
+	* doc/CJK.txt: Document Babel bug related to ^^xx notation.
+	Problem reported by Peter Grzybek <peter.grzybek@uni-graz.at>.
+
+2009-11-07  Werner LEMBERG  <wl@gnu.org>
+
+	Fix line breaks with furigana.
+
+	* texinput/ruby.txt (\ruby): If the furigana is smaller than
+	the base glyph, really behave as documented, this is, behave like an
+	ordinary CJK character.
+
+2009-08-25  Werner LEMBERG  <wl@gnu.org>
+
+	* examples/CJKfntef.tex: Updated.
+
+2009-08-25  Wenchang Sun  <sunwch@hotmail.com>
+
+	New macros for CJKfntef.sty.
+
+	* texinput/CJKfntef.sty (\varCJKunderline, \CJKunderanyline,
+	\CJKunderanysymbol): New macros.
+	(\CJKunderdot): Fix interaction with XeTeX.
+
+	* doc/history.txt: Document it.
+
+2009-08-25  Wenchang Sun  <sunwch@hotmail.com>
+
+	* texinput/CJKfntef.sty: Replace \global with \CJKf@global.
+
+2009-01-19  Werner LEMBERG  <wl@gnu.org>
+
+	* texlive/cjk-build.pl: Remove unused stuff.
+	From Karl Berry.
+
+2009-01-05  Werner LEMBERG  <wl@gnu.org>
+
+	* doc/CJK.txt: Document usage of CJKutf8.sty with beamer class.
+
 2008-12-29  Werner LEMBERG  <wl@gnu.org>
 
 	Version 4.8.2 released
@@ -2142,7 +2382,7 @@
 ;; coding: utf-8
 ;; End:
 
-    Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+    Copyright (C) 1999, 2001-2012
       Werner Lemberg <wl@gnu.org>
 
   This file is part of the CJK package for using Asian logographs
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.2/README b/Build/source/texk/cjkutils/cjkutils-4.8.3/README
index f66b64c24ec..6ff91c164e3 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.2/README
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.3/README
@@ -1,4 +1,4 @@
-Welcome to CJK version 4.8.2 (29-Dec-2008), a LaTeX2e macro package which
+Welcome to CJK version 4.8.3 (07-May-2012), a LaTeX2e macro package which
 enables the use of CJK scripts (Chinese/Japanese/Korean) in various
 encodings, written by Werner Lemberg <wl@gnu.org>.
 
@@ -24,8 +24,8 @@ 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,
+    cjk-4.8.3.tar.gz:       The source files. Needed for all platforms.
+    cjk-4.8.3-doc.tar.gz:   Preformatted documentation files: DVI, PS,
                             output from cjk-enc.el, etc.
 
 Note that on CTAN and its mirrors, the `src' archive is unpacked; you must
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.2/SJISconv/sjisconv.1 b/Build/source/texk/cjkutils/cjkutils-4.8.3/SJISconv/sjisconv.1
index 0ffd2460885..87eb59e4859 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.2/SJISconv/sjisconv.1
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.3/SJISconv/sjisconv.1
@@ -1,5 +1,5 @@
 .\" man page for sjisconv
-.\" Copyright (C) 1994-2008  Werner Lemberg <wl@gnu.org>
+.\" Copyright (C) 1994-2012  Werner Lemberg <wl@gnu.org>
 .\"
 .\" This program is free software; you can redistribute it and/or modify
 .\" it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
 .\" Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
 .\" MA 02110-1301 USA
 .
-.TH SJISCONV 1 29-Dec-2008 "CJK Version 4.8.2"
+.TH SJISCONV 1 07-May-2012 "CJK Version 4.8.3"
 .
 .\" ====
 .\" ==== macro definitions
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.2/SJISconv/sjisconv.c b/Build/source/texk/cjkutils/cjkutils-4.8.3/SJISconv/sjisconv.c
index 6b1b5409bf3..5fd6ac1e214 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.2/SJISconv/sjisconv.c
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.3/SJISconv/sjisconv.c
@@ -1,17 +1,14 @@
 #define banner  \
-"sjisconv (CJK ver. 4.8.2)" \
+"sjisconv (CJK ver. 4.8.3)" \
 
 /*2:*/
-#line 93 "/home/wl/git/cjk/cjk-4.8.2/utils/SJISconv/sjisconv.w"
+#line 96 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/SJISconv/sjisconv.w"
 
 #include <stdio.h> 
 #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 --git a/Build/source/texk/cjkutils/cjkutils-4.8.2/SJISconv/sjisconv.w b/Build/source/texk/cjkutils/cjkutils-4.8.3/SJISconv/sjisconv.w
index 4b7feeb961c..8d81c07081f 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.2/SJISconv/sjisconv.w
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.3/SJISconv/sjisconv.w
@@ -1,6 +1,6 @@
-% This is the cweb file sjisconv.w of the CJK Package Ver. 4.8.2  29-Dec-2008
+% This is the cweb file sjisconv.w of the CJK Package Ver. 4.8.3  07-May-2012
 
-% Copyright (C) 1994-2008  Werner Lemberg <wl@@gnu.org>
+% Copyright (C) 1994-2012  Werner Lemberg <wl@@gnu.org>
 %
 % This program is free software; you can redistribute it and/or modify
 % it under the terms of the GNU General Public License as published by
@@ -26,13 +26,13 @@
 % output rules (look at the position of braces below!) the author (it's me
 % too :-) prefer. Otherwise this file will be formatted traditionally.
 
-\def\title{sjisconv (CJK Version 4.8.2)}
+\def\title{sjisconv (CJK Version 4.8.3)}
 
 \def\topofcontents{
   \null\vfill
   \centerline{\titlefont The {\ttitlefont sjisconv} program}
   \vskip 20pt
-  \centerline{(CJK Version 4.8.2)}
+  \centerline{(CJK Version 4.8.3)}
   \vfill}
 
 \def\botofcontents{
@@ -91,7 +91,7 @@ Note that the user-defined character area of SJIS (with the first bytes in
 the range 0xF0--0xFC) is not supported because it is not portable.
 
 @d banner
-"sjisconv (CJK ver. 4.8.2)"
+"sjisconv (CJK ver. 4.8.3)"
 
 @c
 #include <stdio.h>
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.2/SJISconv/sjislatex b/Build/source/texk/cjkutils/cjkutils-4.8.3/SJISconv/sjislatex
index d794a7c7f5e..077eec710e0 100755
--- a/Build/source/texk/cjkutils/cjkutils-4.8.2/SJISconv/sjislatex
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.3/SJISconv/sjislatex
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# Copyright (C) 1994-2008  Werner Lemberg <wl@gnu.org>
+# Copyright (C) 1994-2012  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/SJISconv/sjisltx.bat b/Build/source/texk/cjkutils/cjkutils-4.8.3/SJISconv/sjisltx.bat
index 5702c113bdf..5702c113bdf 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.2/SJISconv/sjisltx.bat
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.3/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.3/SJISconv/sjisltx.cmd
index 8abcaddde85..e6c72f9ff92 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.2/SJISconv/sjisltx.cmd
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.3/SJISconv/sjisltx.cmd
@@ -1,9 +1,9 @@
 /*----------------------------------------------------------------------*\
     sjisltx.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.3
 
-    Copyright (C) 1994-2008  Wonkoo Kim <wkim+@pitt.edu>
+    Copyright (C) 1994-2012  Wonkoo Kim <wkim+@pitt.edu>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.2/SJISconv/sjispdflatex b/Build/source/texk/cjkutils/cjkutils-4.8.3/SJISconv/sjispdflatex
index 50daf343502..a1395cee780 100755
--- a/Build/source/texk/cjkutils/cjkutils-4.8.2/SJISconv/sjispdflatex
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.3/SJISconv/sjispdflatex
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# Copyright (C) 1994-2008  Werner Lemberg <wl@gnu.org>
+# Copyright (C) 1994-2012  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/cjklatex/cjklatex.c b/Build/source/texk/cjkutils/cjkutils-4.8.3/cjklatex/cjklatex.c
index 342258968f2..822c6c1a449 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.2/cjklatex/cjklatex.c
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.3/cjklatex/cjklatex.c
@@ -11,7 +11,7 @@
 #endif
 
 /*
-  Copyright (C) 2001-2008  F. Popineau <Fabrice.Popineau@supelec.fr>
+  Copyright (C) 2001-2012  F. Popineau <Fabrice.Popineau@supelec.fr>
   
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.2/extconv/bg5+latex b/Build/source/texk/cjkutils/cjkutils-4.8.3/extconv/bg5+latex
index 4136537872e..9fa75a712e3 100755
--- a/Build/source/texk/cjkutils/cjkutils-4.8.2/extconv/bg5+latex
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.3/extconv/bg5+latex
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# Copyright (C) 1994-2008  Werner Lemberg <wl@gnu.org>
+# Copyright (C) 1994-2012  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/extconv/bg5+pdflatex b/Build/source/texk/cjkutils/cjkutils-4.8.3/extconv/bg5+pdflatex
index e28761ef423..88bd7232116 100755
--- a/Build/source/texk/cjkutils/cjkutils-4.8.2/extconv/bg5+pdflatex
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.3/extconv/bg5+pdflatex
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# Copyright (C) 1994-2008  Werner Lemberg <wl@gnu.org>
+# Copyright (C) 1994-2012  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/extconv/bg5pltx.bat b/Build/source/texk/cjkutils/cjkutils-4.8.3/extconv/bg5pltx.bat
index ccc6c76acd5..ccc6c76acd5 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.2/extconv/bg5pltx.bat
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.3/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.3/extconv/bg5pltx.cmd
index 36a04b4afd8..cf65f69393b 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.2/extconv/bg5pltx.cmd
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.3/extconv/bg5pltx.cmd
@@ -1,9 +1,9 @@
 /*----------------------------------------------------------------------*\
     bg5pltx.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.3
 
-    Copyright (C) 1994-2008 Wonkoo Kim <wkim+@pitt.edu>
+    Copyright (C) 1994-2012 Wonkoo Kim <wkim+@pitt.edu>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.2/extconv/extconv.1 b/Build/source/texk/cjkutils/cjkutils-4.8.3/extconv/extconv.1
index d8494edc1e1..e09bfefb544 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.2/extconv/extconv.1
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.3/extconv/extconv.1
@@ -1,6 +1,6 @@
 .\" man page for bg5conv
 .\"
-.\" Copyright (C) 1994-2008  Werner Lemberg <wl@gnu.org>
+.\" Copyright (C) 1994-2012  Werner Lemberg <wl@gnu.org>
 .\"
 .\" This program is free software; you can redistribute it and/or modify
 .\" it under the terms of the GNU General Public License as published by
@@ -17,7 +17,7 @@
 .\" Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
 .\" MA 02110-1301 USA
 .
-.TH EXTCONV 1 29-Dec-2008 "CJK Version 4.8.2"
+.TH EXTCONV 1 07-May-2012 "CJK Version 4.8.3"
 .
 .\" ====
 .\" ==== macro definitions
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.2/extconv/extconv.c b/Build/source/texk/cjkutils/cjkutils-4.8.3/extconv/extconv.c
index 1b1753fd08b..b57130f4ee3 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.2/extconv/extconv.c
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.3/extconv/extconv.c
@@ -1,17 +1,14 @@
 #define banner  \
-"extconv (CJK ver. 4.8.2)" \
+"extconv (CJK ver. 4.8.3)" \
 
 /*2:*/
-#line 94 "/home/wl/git/cjk/cjk-4.8.2/utils/extconv/extconv.w"
+#line 94 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/extconv/extconv.w"
 
 #include <stdio.h> 
 #include <stdlib.h> 
 
 
-int main(argc,argv)
-int argc;
-char*argv[];
-
+int main(int argc,char*argv[])
 {int ch;
 
 
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.2/extconv/extconv.w b/Build/source/texk/cjkutils/cjkutils-4.8.3/extconv/extconv.w
index 554106fe78e..f415466a4fb 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.2/extconv/extconv.w
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.3/extconv/extconv.w
@@ -1,6 +1,6 @@
-% This is the cweb file extconv.w of the CJK Package Ver. 4.8.2  29-Dec-2008
+% This is the cweb file extconv.w of the CJK Package Ver. 4.8.3  07-May-2012
 
-% Copyright (C) 1994-2008  Werner Lemberg <wl@@gnu.org>
+% Copyright (C) 1994-2012  Werner Lemberg <wl@@gnu.org>
 %
 % This program is free software; you can redistribute it and/or modify
 % it under the terms of the GNU General Public License as published by
@@ -26,13 +26,13 @@
 % output rules (look at the position of braces below!) the author (it's me
 % too :-) prefer. Otherwise this file will be formatted traditionally.
 
-\def\title{extconv (CJK Version 4.8.2)}
+\def\title{extconv (CJK Version 4.8.3)}
 
 \def\topofcontents{
   \null\vfill
   \centerline{\titlefont The {\ttitlefont extconv} program}
   \vskip 20pt
-  \centerline{(CJK Version 4.8.2)}
+  \centerline{(CJK Version 4.8.3)}
   \vfill}
 
 \def\botofcontents{
@@ -89,7 +89,7 @@ which will see the output of \.{extconv} complains loudly if something is
 wrong.
 
 @d banner
-"extconv (CJK ver. 4.8.2)"
+"extconv (CJK ver. 4.8.3)"
 
 @c
 #include <stdio.h>
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.2/extconv/gbklatex b/Build/source/texk/cjkutils/cjkutils-4.8.3/extconv/gbklatex
index 4136537872e..9fa75a712e3 100755
--- a/Build/source/texk/cjkutils/cjkutils-4.8.2/extconv/gbklatex
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.3/extconv/gbklatex
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# Copyright (C) 1994-2008  Werner Lemberg <wl@gnu.org>
+# Copyright (C) 1994-2012  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/extconv/gbklatex.bat b/Build/source/texk/cjkutils/cjkutils-4.8.3/extconv/gbklatex.bat
index ccc6c76acd5..ccc6c76acd5 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.2/extconv/gbklatex.bat
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.3/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.3/extconv/gbklatex.cmd
index de29b90b3f7..e831e7424a3 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.2/extconv/gbklatex.cmd
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.3/extconv/gbklatex.cmd
@@ -1,9 +1,9 @@
 /*----------------------------------------------------------------------*\
     gbklatex.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.3
 
-    Copyright (C) 1994-2008 Wonkoo Kim <wkim+@pitt.edu>
+    Copyright (C) 1994-2012 Wonkoo Kim <wkim+@pitt.edu>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.2/extconv/gbkpdflatex b/Build/source/texk/cjkutils/cjkutils-4.8.3/extconv/gbkpdflatex
index e28761ef423..88bd7232116 100755
--- a/Build/source/texk/cjkutils/cjkutils-4.8.2/extconv/gbkpdflatex
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.3/extconv/gbkpdflatex
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# Copyright (C) 1994-2008  Werner Lemberg <wl@gnu.org>
+# Copyright (C) 1994-2012  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.3/hbf2gf/Makefile.gnu
index 6ecf115b5dd..f33001dac15 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/Makefile.gnu
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/Makefile.gnu
@@ -1,6 +1,6 @@
-# This file is part of the CJK package Version 4.8.2 (29-Dec-2008)
+# This file is part of the CJK package Version 4.8.3 (07-May-2012)
 
-# Copyright (C) 1994-2008  Werner Lemberg <wl@gnu.org>
+# Copyright (C) 1994-2012  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.in b/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/Makefile.in
index ece2f79c89a..7f40c2c6080 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/Makefile.in
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/Makefile.in
@@ -1,6 +1,6 @@
 # Makefile for hbf2gf -- wl@gnu.org
 
-# Copyright (C) 1994-2008  Werner Lemberg <wl@gnu.org>
+# Copyright (C) 1994-2012  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/README b/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/README
index a7de0ec1402..a7de0ec1402 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/README
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/README
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/cfg/README b/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/cfg/README
index 689d59e7397..689d59e7397 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/cfg/README
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/cfg/README
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/cfg/b5ka12.cfg b/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/cfg/b5ka12.cfg
index f5c142f0235..f5c142f0235 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/cfg/b5ka12.cfg
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/cfg/b5ka12.cfg
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/cfg/b5kr12.cfg b/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/cfg/b5kr12.cfg
index 9d9da2c1a2f..9d9da2c1a2f 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/cfg/b5kr12.cfg
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/cfg/b5kr12.cfg
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/cfg/b5so12.cfg b/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/cfg/b5so12.cfg
index dc0bcd9fbf0..dc0bcd9fbf0 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/cfg/b5so12.cfg
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/cfg/b5so12.cfg
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/cfg/c1so12.cfg b/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/cfg/c1so12.cfg
index de5b32b3efc..de5b32b3efc 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/cfg/c1so12.cfg
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/cfg/c1so12.cfg
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/cfg/c2so12.cfg b/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/cfg/c2so12.cfg
index 969af8fae14..969af8fae14 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/cfg/c2so12.cfg
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/cfg/c2so12.cfg
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/cfg/c3so12.cfg b/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/cfg/c3so12.cfg
index 0e65768ee5e..0e65768ee5e 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/cfg/c3so12.cfg
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/cfg/c3so12.cfg
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/cfg/c4so12.cfg b/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/cfg/c4so12.cfg
index 8ea3a8b270c..8ea3a8b270c 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/cfg/c4so12.cfg
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/cfg/c4so12.cfg
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/cfg/c5so12.cfg b/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/cfg/c5so12.cfg
index 1b81c90a0d3..1b81c90a0d3 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/cfg/c5so12.cfg
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/cfg/c5so12.cfg
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/cfg/c6so12.cfg b/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/cfg/c6so12.cfg
index 5b9c912ce53..5b9c912ce53 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/cfg/c6so12.cfg
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/cfg/c6so12.cfg
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/cfg/c7so12.cfg b/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/cfg/c7so12.cfg
index 051b2601426..051b2601426 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/cfg/c7so12.cfg
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/cfg/c7so12.cfg
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/cfg/csso12.cfg b/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/cfg/csso12.cfg
index 9ad91b0c574..9ad91b0c574 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/cfg/csso12.cfg
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/cfg/csso12.cfg
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/cfg/gsfs14.cfg b/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/cfg/gsfs14.cfg
index 4b397aca464..4b397aca464 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/cfg/gsfs14.cfg
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/cfg/gsfs14.cfg
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/cfg/j2so12.cfg b/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/cfg/j2so12.cfg
index 7e0d70b5c0f..7e0d70b5c0f 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/cfg/j2so12.cfg
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/cfg/j2so12.cfg
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/cfg/jsso12.cfg b/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/cfg/jsso12.cfg
index 9bdfc7b1e8a..9bdfc7b1e8a 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/cfg/jsso12.cfg
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/cfg/jsso12.cfg
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/cfg/ksso17.cfg b/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/cfg/ksso17.cfg
index c82f7e7eee4..c82f7e7eee4 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/cfg/ksso17.cfg
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.3/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.3/hbf2gf/configure.ac
index 2cd5796a51a..14bbfb7c447 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/configure.ac
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/configure.ac
@@ -1,6 +1,6 @@
-dnl This file is part of the CJK package ver. 4.8.2
+dnl This file is part of the CJK package ver. 4.8.3
 
-dnl Copyright (C) 1994-2008  Werner Lemberg <wl@gnu.org>
+dnl Copyright (C) 1994-2012  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
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/dvidrv.btm b/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/dvidrv.btm
index daeba96f01c..dba59adb309 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/dvidrv.btm
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/dvidrv.btm
@@ -1,6 +1,6 @@
 setdos /y1
 ::
-:: Copyright (C) 1994-2008  Werner Lemberg <wl@gnu.org>
+:: Copyright (C) 1994-2012  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/emdir.c b/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/emdir.c
index 4e759c83eb2..4e759c83eb2 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/emdir.c
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/emdir.c
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/emdir.h b/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/emdir.h
index 0606d476ab1..0606d476ab1 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/emdir.h
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/emdir.h
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/emtexdir.c b/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/emtexdir.c
index 9a35570adb3..9a35570adb3 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/emtexdir.c
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/emtexdir.c
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/emtexdir.h b/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/emtexdir.h
index a9a986db05b..a9a986db05b 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/emtexdir.h
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/emtexdir.h
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/hbf.c b/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/hbf.c
index 6056555d704..6056555d704 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/hbf.c
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/hbf.c
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/hbf.h b/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/hbf.h
index 34f5940a71b..34f5940a71b 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/hbf.h
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/hbf.h
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/hbf2gf.1 b/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/hbf2gf.1
index bfae8a41d99..55bfddf57fa 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/hbf2gf.1
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/hbf2gf.1
@@ -1,6 +1,6 @@
 .\" man page for hbf2gf
 .\"
-.\" Copyright (C) 1994-2008  Werner Lemberg <wl@gnu.org>
+.\" Copyright (C) 1994-2012  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 29-Dec-2008 "CJK Version 4.8.2"
+.TH HBF2GF 1 07-May-2012 "CJK Version 4.8.3"
 .SH NAME
 hbf2gf \- convert a CJK bitmap font into subfonts usable by TeX and Omega.
 .
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/hbf2gf.c b/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/hbf2gf.c
index 061e4191221..1c1d0358a39 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/hbf2gf.c
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/hbf2gf.c
@@ -1,5 +1,5 @@
 #define banner  \
-"hbf2gf (CJK ver. 4.8.2)" \
+"hbf2gf (CJK ver. 4.8.3)" \
  \
 
 #define TRUE 1
@@ -100,11 +100,14 @@
 #define VALID_SUBCODE 1 \
 
 /*4:*/
-#line 193 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+#line 191 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
 
 /*10:*/
-#line 413 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+#line 408 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
 
+#ifdef HAVE_CONFIG_H
+#include <c-auto.h> 
+#endif
 #include <ctype.h> 
 #include <stdio.h> 
 #include <stdlib.h> 
@@ -118,16 +121,10 @@
 
 
 /*:10*//*69:*/
-#line 2483 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+#line 2469 "/usr/local/home/wl/git/cjk/cjk-4.8.3/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"
@@ -137,46 +134,46 @@
 #endif
 
 /*:69*/
-#line 194 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+#line 192 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
 
 /*11:*/
-#line 431 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+#line 429 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
 
 void write_file(void);
 
 
 /*:11*//*13:*/
-#line 493 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+#line 491 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
 
 void write_pre(void);
 
 
 /*:13*//*16:*/
-#line 581 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+#line 579 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
 
 void write_data(void);
 
 
 /*:16*//*20:*/
-#line 692 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+#line 690 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
 
 void write_post(void);
 
 
 /*:20*//*25:*/
-#line 836 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+#line 834 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
 
 void fputl(long,FILE*);
 
 
 /*:25*//*29:*/
-#line 999 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+#line 994 "/usr/local/home/wl/git/cjk/cjk-4.8.3/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"
+#line 1222 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
 
 #ifdef __GNUC__
 __inline__
@@ -185,7 +182,7 @@ void read_row(unsigned char*);
 
 
 /*:36*//*39:*/
-#line 1279 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+#line 1272 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
 
 #ifdef __GNUC__
 __inline__
@@ -194,55 +191,55 @@ void write_row(unsigned char*);
 
 
 /*:39*//*41:*/
-#line 1334 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+#line 1325 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
 
 void write_coding(void);
 
 
 /*:41*//*45:*/
-#line 1495 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+#line 1486 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
 
 void write_pl(void);
 
 
 /*:45*//*47:*/
-#line 1592 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+#line 1583 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
 
 void write_ovp(void);
 
 
 /*:47*//*50:*/
-#line 1737 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+#line 1728 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
 
 void write_job(void);
 
 
 /*:50*//*54:*/
-#line 1986 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+#line 1977 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
 
 void read_config(void);
 
 
 /*:54*//*64:*/
-#line 2317 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+#line 2308 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
 
-int fsearch(char*);
+int fsearch(const char*);
 
 
 /*:64*//*67:*/
-#line 2457 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+#line 2447 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
 
-void config_error(char*);
+void config_error(const char*);
 
 
 /*:67*//*71:*/
-#line 2517 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+#line 2490 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
 
-char*TeX_search_version(void);
+const char*TeX_search_version(void);
 
 
 /*:71*//*74:*/
-#line 2552 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+#line 2525 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
 
 #ifdef HAVE_EMTEXDIR
 extern int setup_list(struct emtex_dir*,char*,const char*,unsigned);
@@ -252,17 +249,17 @@ char*file_find(char*,struct emtex_dir*);
 
 
 /*:74*//*79:*/
-#line 2649 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+#line 2613 "/usr/local/home/wl/git/cjk/cjk-4.8.3/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"
+#line 193 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
 
 /*2:*/
-#line 129 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+#line 127 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
 
 int nmb_files= -1;
 int unicode= FALSE;
@@ -303,7 +300,7 @@ int end_of_file= FALSE;
 
 
 /*:2*//*15:*/
-#line 540 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+#line 538 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
 
 long char_adr[256];
 long*char_adr_p;
@@ -345,7 +342,7 @@ int dot_count;
 
 
 /*:15*//*19:*/
-#line 669 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+#line 667 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
 
 char coding[STRING_LENGTH+1];
 char comment[STRING_LENGTH+1];
@@ -364,12 +361,12 @@ double ppp_y;
 
 
 /*:19*//*27:*/
-#line 876 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+#line 871 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
 
 HBF_CHAR code;
 const unsigned char*bitmap;
 
-unsigned char*bP;
+const unsigned char*bP;
 
 unsigned char out_char[MAX_CHAR_SIZE*MAX_CHAR_SIZE+1];
 
@@ -387,13 +384,13 @@ 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"
+#line 1267 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
 
 int threshold= 128;
 
 
 /*:38*//*49:*/
-#line 1726 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+#line 1717 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
 
 char job_extension[EXTENSION_LENGTH+1];
 char rm_command[STRING_LENGTH+1];
@@ -405,13 +402,13 @@ int ofm_file= FALSE;
 
 
 /*:49*//*53:*/
-#line 1981 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+#line 1972 "/usr/local/home/wl/git/cjk/cjk-4.8.3/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"
+#line 2090 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
 
 int offset_x;
 int offset_y;
@@ -420,13 +417,13 @@ 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"
+#line 2247 "/usr/local/home/wl/git/cjk/cjk-4.8.3/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"
+#line 2274 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
 
 char b2_codes[256];
 unsigned char min_2_byte,max_2_byte;
@@ -434,16 +431,9 @@ int nmb_2_bytes= 0;
 
 
 /*:62*//*70:*/
-#line 2501 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+#line 2481 "/usr/local/home/wl/git/cjk/cjk-4.8.3/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)
+#if defined(HAVE_EMTEXDIR)
 char emtex_version_string[]= "emTeXdir";
 #elif !defined(HAVE_MIKTEX)
 char no_version_string[]= "no search library";
@@ -451,7 +441,7 @@ char no_version_string[]= "no search library";
 
 
 /*:70*//*73:*/
-#line 2545 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+#line 2518 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
 
 #ifdef HAVE_EMTEXDIR
 struct emtex_dir cfg_path,hbf_path;
@@ -459,37 +449,25 @@ struct emtex_dir cfg_path,hbf_path;
 
 
 /*:73*//*76:*/
-#line 2591 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+#line 2564 "/usr/local/home/wl/git/cjk/cjk-4.8.3/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"
-
+#line 194 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
 
 
-int main(argc,argv)
-int argc;
-char*argv[];
 
+int main(int argc,char*argv[])
 {char*p;
 
 /*78:*/
-#line 2613 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+#line 2586 "/usr/local/home/wl/git/cjk/cjk-4.8.3/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))
@@ -506,16 +484,16 @@ exit(1);
 
 
 /*:78*/
-#line 205 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+#line 200 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
 
 
 /*7:*/
-#line 312 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+#line 307 "/usr/local/home/wl/git/cjk/cjk-4.8.3/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"
+#line 288 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
 
 {printf(USAGE);
 exit(0);
@@ -523,11 +501,11 @@ exit(0);
 
 
 /*:6*/
-#line 315 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+#line 310 "/usr/local/home/wl/git/cjk/cjk-4.8.3/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"
+#line 261 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
 
 {printf("\n");
 printf(banner);
@@ -538,7 +516,7 @@ exit(0);
 
 
 /*:5*/
-#line 317 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+#line 312 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
 
 }
 
@@ -576,7 +554,7 @@ exit(1);
 
 
 /*:7*/
-#line 207 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+#line 202 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
 
 
 if(!quiet)
@@ -605,7 +583,7 @@ read_config();
 
 if(mf_like)
 /*8:*/
-#line 357 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+#line 352 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
 
 {if(unicode)
 file_number= (int)strtol(&argv[1][strlen(argv[1])-2],
@@ -633,11 +611,11 @@ y_scale= (double)x_resolution/y_scale;
 
 
 /*:8*/
-#line 234 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+#line 229 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
 
 
 /*28:*/
-#line 908 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+#line 903 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
 
 {int col,offset;
 
@@ -720,11 +698,11 @@ s_slant= slant*SCALE;
 
 
 /*:28*/
-#line 236 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+#line 231 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
 
 
 /*9:*/
-#line 392 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+#line 387 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
 
 {int j,max_numb;
 
@@ -746,7 +724,7 @@ nmb_files= j;
 
 
 /*:9*/
-#line 238 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+#line 233 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
 
 
 if(tfm_files)
@@ -764,7 +742,7 @@ return 0;
 
 
 /*:4*//*12:*/
-#line 439 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+#line 437 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
 
 void write_file(void)
 {char output_file[FILE_NAME_LENGTH+1];
@@ -808,7 +786,7 @@ write_data();
 
 
 /*:12*//*14:*/
-#line 500 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+#line 498 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
 
 void write_pre(void)
 {char out_s[40],s[20];
@@ -831,7 +809,7 @@ fputs(out_s,out);
 
 
 /*:14*//*17:*/
-#line 586 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+#line 584 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
 
 void write_data(void)
 {dot_count= 0;
@@ -839,7 +817,7 @@ 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"
+#line 609 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
 
 {if(dot_count++%10==0)
 if(pk_files&&!quiet)
@@ -883,13 +861,13 @@ fputc(EOC,out);
 
 
 /*:18*/
-#line 592 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+#line 590 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
 
 }
 
 
 /*:17*//*21:*/
-#line 697 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+#line 695 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
 
 void write_post(void)
 {long special_adr;
@@ -917,7 +895,7 @@ 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"
+#line 741 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
 
 special_adr= ftell(out);
 
@@ -935,10 +913,10 @@ fputs(comment,out);
 
 
 /*:22*/
-#line 723 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+#line 721 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
 
 /*23:*/
-#line 772 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+#line 770 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
 
 post_adr= ftell(out);
 fputc(POST,out);
@@ -977,10 +955,10 @@ fputl(*char_adr_p++,out);
 
 
 /*:23*/
-#line 724 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+#line 722 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
 
 /*24:*/
-#line 823 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+#line 821 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
 
 fputc(POSTPOST,out);
 fputl(post_adr,out);
@@ -992,18 +970,15 @@ fputc(POSTPOST_ID,out);
 
 
 /*:24*/
-#line 725 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+#line 723 "/usr/local/home/wl/git/cjk/cjk-4.8.3/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;
+#line 839 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
 
+void fputl(long num,FILE*f)
 {fputc(num>>24,f);
 fputc(num>>16,f);
 fputc(num>>8,f);
@@ -1012,7 +987,7 @@ fputc(num,f);
 
 
 /*:26*//*30:*/
-#line 1004 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+#line 999 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
 
 void make_pixel_array(void)
 {unsigned char*prP;
@@ -1043,14 +1018,14 @@ again:
 if(b2_codes[code&0xFF])
 {if(pk_files)
 {bitmap= hbfGetBitmap(hbf,code);
-bP= (unsigned char*)bitmap;
+bP= bitmap;
 
 
 if(!bitmap)
 empty_char= TRUE;
 else
 /*31:*/
-#line 1063 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+#line 1058 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
 
 {if(pk_output_size_y==input_size_y)
 temp_prP= prP;
@@ -1058,7 +1033,7 @@ 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"
+#line 1072 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
 
 if(pk_output_size_y==input_size_y)
 
@@ -1080,7 +1055,7 @@ need_to_read_row= 1;
 }
 
 /*33:*/
-#line 1104 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+#line 1099 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
 
 if(need_to_read_row)
 if(rows_read<input_size_y)
@@ -1112,16 +1087,16 @@ frac_row_to_fill= SCALE;
 
 
 /*:33*/
-#line 1097 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+#line 1092 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
 
 }
 
 
 /*:32*/
-#line 1069 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+#line 1064 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
 
 /*34:*/
-#line 1145 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+#line 1140 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
 
 if(pk_width==input_size_x&&s_slant==0)
 
@@ -1176,7 +1151,7 @@ frac_col_to_fill-= frac_col_left;
 }
 
 /*35:*/
-#line 1203 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+#line 1198 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
 
 if(frac_col_to_fill> 0)
 {--xP;
@@ -1196,20 +1171,20 @@ write_row(new_prP);
 
 
 /*:35*/
-#line 1198 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+#line 1193 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
 
 }
 
 
 /*:34*/
-#line 1071 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+#line 1066 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
 
 }
 }
 
 
 /*:31*/
-#line 1040 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+#line 1035 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
 
 }
 }
@@ -1233,14 +1208,12 @@ goto again;
 
 
 /*:30*//*37:*/
-#line 1235 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+#line 1230 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
 
 #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;
@@ -1248,7 +1221,7 @@ 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;
+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;
@@ -1270,14 +1243,12 @@ bitshift= 7;
 
 
 /*:37*//*40:*/
-#line 1287 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+#line 1280 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
 
 #ifdef __GNUC__
 __inline__
 #endif
-void write_row(pixelrow)
-unsigned char*pixelrow;
-
+void write_row(unsigned char*pixelrow)
 {register int col;
 register unsigned char*xP;
 
@@ -1288,7 +1259,7 @@ for(col= 0,xP= pixelrow;col<pk_output_size_x;++col,++xP)
 
 
 /*:40*//*42:*/
-#line 1342 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+#line 1333 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
 
 void write_coding(void)
 {register int count,skip;
@@ -1305,7 +1276,7 @@ goto start;
 
 while(y<pk_output_size_y)
 {/*43:*/
-#line 1366 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+#line 1357 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
 
 count= 0;
 x= 0;
@@ -1374,11 +1345,11 @@ continue;
 
 
 /*:43*/
-#line 1357 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+#line 1348 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
 
 start:
 /*44:*/
-#line 1434 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+#line 1425 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
 
 while(x<pk_output_size_x)
 {if(*cp==paint)
@@ -1419,7 +1390,7 @@ paint= WHITE;
 
 
 /*:44*/
-#line 1359 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+#line 1350 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
 
 y++;
 }
@@ -1427,7 +1398,7 @@ y++;
 
 
 /*:42*//*46:*/
-#line 1500 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+#line 1491 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
 
 void write_pl(void)
 {int i,pos;
@@ -1517,7 +1488,7 @@ fclose(out);
 
 
 /*:46*//*48:*/
-#line 1597 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+#line 1588 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
 
 void write_ovp(void)
 {int c,i,nmb_subfonts,remainder,count,pos;
@@ -1632,7 +1603,7 @@ fclose(out);
 
 
 /*:48*//*51:*/
-#line 1742 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+#line 1733 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
 
 void write_job(void)
 {FILE*out;
@@ -1718,7 +1689,7 @@ fclose(out);
 
 
 /*:51*//*55:*/
-#line 1994 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+#line 1985 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
 
 void read_config(void)
 {HBF_BBOX*boxp;
@@ -1726,7 +1697,7 @@ char*real_config_file;
 
 
 /*56:*/
-#line 2046 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+#line 2037 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
 
 {int i,lastext= -1;
 
@@ -1744,7 +1715,7 @@ strcat(config_file,".cfg");
 
 
 /*:56*/
-#line 2000 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+#line 1991 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
 
 
 real_config_file= TeX_search_cfg_file(config_file);
@@ -1779,7 +1750,7 @@ exit(0);
 }
 
 /*57:*/
-#line 2063 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+#line 2054 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
 
 {char hbf_header[STRING_LENGTH+1];
 char*real_hbf_header;
@@ -1816,10 +1787,10 @@ strcpy(output_name,Buffer);
 
 
 /*:57*/
-#line 2033 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+#line 2024 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
 
 /*59:*/
-#line 2107 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+#line 2098 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
 
 {if(fsearch("nmb_files"))
 nmb_files= atoi(Buffer);
@@ -1961,11 +1932,11 @@ job_extension[EXTENSION_LENGTH]= '\0';
 
 
 /*:59*/
-#line 2034 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+#line 2025 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
 
 
 /*61:*/
-#line 2261 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+#line 2252 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
 
 {const void*cp;
 HBF_CHAR dummy;
@@ -1980,10 +1951,10 @@ min_char= user_min_char;
 
 
 /*:61*/
-#line 2036 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+#line 2027 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
 
 /*63:*/
-#line 2290 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+#line 2281 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
 
 {const void*b2r;
 unsigned char dummy;
@@ -2006,7 +1977,7 @@ nmb_2_bytes++;
 
 
 /*:63*/
-#line 2037 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+#line 2028 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
 
 
 fclose(config);
@@ -2014,12 +1985,11 @@ 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;
+#line 2313 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
 
+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;
@@ -2031,8 +2001,8 @@ int count= STRING_LENGTH;
 rewind(config);
 
 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)
@@ -2044,12 +2014,12 @@ ch= tolower(Ch);
 }
 
 for(;;)
-{if(*(++P)=='\0')
+{if(*(++Q)=='\0')
 if((Ch= fgetc(config))==' '||Ch=='\t')
 
 goto success;
 Ch= fgetc(config);
-if(tolower(Ch)!=tolower(*P))
+if(tolower(Ch)!=tolower(*Q))
 break;
 }
 }
@@ -2071,7 +2041,7 @@ Ch= fgetc(config);
 
 if(*temp_buffer)
 /*66:*/
-#line 2402 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+#line 2392 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
 
 {P= temp_buffer;
 Buf_p= Buffer;
@@ -2124,7 +2094,7 @@ count--;
 
 
 /*:66*/
-#line 2377 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+#line 2367 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
 
 else
 *Buffer= '\0';
@@ -2134,11 +2104,9 @@ 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;
+#line 2452 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
 
+void config_error(const char*message)
 {fprintf(stderr,"Couldn't find `%s' entry in configuration file\n",
 message);
 exit(1);
@@ -2147,9 +2115,9 @@ exit(1);
 
 
 /*:68*//*72:*/
-#line 2522 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+#line 2495 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
 
-char*TeX_search_version(void)
+const char*TeX_search_version(void)
 {
 #if defined(HAVE_LIBKPATHSEA)
 return kpathsea_version_string;
@@ -2169,7 +2137,7 @@ return no_version_string;
 
 
 /*:72*//*75:*/
-#line 2564 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+#line 2537 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
 
 #ifdef HAVE_EMTEXDIR
 int dir_setup(ed,env,dir,flags)
@@ -2197,7 +2165,7 @@ return TRUE;
 
 
 /*:75*//*77:*/
-#line 2596 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+#line 2569 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
 
 char*file_find(name,list)
 char*name;
@@ -2212,56 +2180,34 @@ return NULL;
 
 
 /*:77*//*80:*/
-#line 2655 "/home/wl/git/cjk/cjk-4.8.2/utils/hbf2gf/hbf2gf.w"
+#line 2619 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
 
 #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);
-#else
 return kpse_find_file(name,kpse_program_text_format,TRUE);
-#endif
 }
 
 
-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);
-#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;
-
+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))
@@ -2270,9 +2216,7 @@ return strdup(result);
 }
 
 
-char*TeX_search_hbf_file(name)
-char*name;
-
+char*TeX_search_hbf_file(char*name)
 {char result[_MAX_PATH];
 
 
@@ -2283,16 +2227,12 @@ return strdup(result);
 
 
 #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/hbf2gf/hbf2gf.def b/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/hbf2gf.def
index 0137e4ac9e3..784dc01da50 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/hbf2gf.def
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/hbf2gf.def
@@ -1,3 +1,3 @@
 NAME HBF2GF WINDOWCOMPAT
-DESCRIPTION 'hbf2gf (CJK Ver. 4.8.2)'
+DESCRIPTION 'hbf2gf (CJK Ver. 4.8.3)'
 STACKSIZE 0x80000
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/hbf2gf.w b/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/hbf2gf.w
index f96282776f1..c8155fa2ad0 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/hbf2gf.w
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/hbf2gf.w
@@ -1,6 +1,6 @@
-% This is the cweb file hbf2gf.w of the CJK package ver. 4.8.2  29-Dec-2008
+% This is the cweb file hbf2gf.w of the CJK package ver. 4.8.3  07-May-2012
 
-% Copyright (C) 1994-2008  Werner Lemberg <wl@@gnu.org>
+% Copyright (C) 1994-2012  Werner Lemberg <wl@@gnu.org>
 %
 % This program is free software; you can redistribute it and/or modify
 % it under the terms of the GNU General Public License as published by
@@ -30,13 +30,13 @@
 \def\mf{{\meta META}\-{\meta FONT}}
 \def\Om{\char "0A}                      % Omega symbol
 
-\def\title{hbf2gf (CJK Version 4.8.2)}
+\def\title{hbf2gf (CJK Version 4.8.3)}
 
 \def\topofcontents{
   \null\vfill
   \centerline{\titlefont The {\ttitlefont hbf2gf} program}
   \vskip 20pt
-  \centerline{(CJK Version 4.8.2)}
+  \centerline{(CJK Version 4.8.3)}
   \vfill}
 
 \def\botofcontents{
@@ -81,7 +81,7 @@ The ``banner line'' defined here should be changed whenever \.{hbf2gf} is
 modified.
 
 @d banner
-"hbf2gf (CJK ver. 4.8.2)"
+"hbf2gf (CJK ver. 4.8.3)"
 
 
 @
diff --git a/Build/source/texk/cjkutils/configure b/Build/source/texk/cjkutils/configure
index aa488e3ec73..fa353a0d405 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.69 for CJK utils for TeX Live 4.8.2.
+# Generated by GNU Autoconf 2.69 for CJK utils for TeX Live 4.8.3.
 #
 # Report bugs to <tex-k@tug.org>.
 #
@@ -590,12 +590,12 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='CJK utils for TeX Live'
 PACKAGE_TARNAME='cjk-utils-for-tex-live'
-PACKAGE_VERSION='4.8.2'
-PACKAGE_STRING='CJK utils for TeX Live 4.8.2'
+PACKAGE_VERSION='4.8.3'
+PACKAGE_STRING='CJK utils for TeX Live 4.8.3'
 PACKAGE_BUGREPORT='tex-k@tug.org'
 PACKAGE_URL=''
 
-ac_unique_file="cjkutils-4.8.2/hbf2gf/hbf.h"
+ac_unique_file="cjkutils-4.8.3/hbf2gf/hbf.h"
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stdio.h>
@@ -1330,7 +1330,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.8.2 to adapt to many kinds of systems.
+\`configure' configures CJK utils for TeX Live 4.8.3 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1401,7 +1401,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.8.2:";;
+     short | recursive ) echo "Configuration of CJK utils for TeX Live 4.8.3:";;
    esac
   cat <<\_ACEOF
 
@@ -1516,7 +1516,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-CJK utils for TeX Live configure 4.8.2
+CJK utils for TeX Live configure 4.8.3
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1996,7 +1996,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.8.2, which was
+It was created by CJK utils for TeX Live $as_me 4.8.3, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -7394,7 +7394,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='cjk-utils-for-tex-live'
- VERSION='4.8.2'
+ VERSION='4.8.3'
 
 
 # Some tools Automake needs.
@@ -13095,7 +13095,7 @@ Usage: $0 [OPTIONS]
 Report bugs to <bug-libtool@gnu.org>."
 
 lt_cl_version="\
-CJK utils for TeX Live config.lt 4.8.2
+CJK utils for TeX Live config.lt 4.8.3
 configured by $0, generated by GNU Autoconf 2.69.
 
 Copyright (C) 2011 Free Software Foundation, Inc.
@@ -14370,7 +14370,7 @@ else
 fi
 
 
-CJKUTILS_TREE=cjkutils-4.8.2
+CJKUTILS_TREE=cjkutils-4.8.3
 
 
 ac_config_files="$ac_config_files Makefile"
@@ -14918,7 +14918,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.8.2, which was
+This file was extended by CJK utils for TeX Live $as_me 4.8.3, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -14984,7 +14984,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.8.2
+CJK utils for TeX Live config.status 4.8.3
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/Build/source/texk/cjkutils/configure.ac b/Build/source/texk/cjkutils/configure.ac
index 7e754fdf6b1..e520285d753 100644
--- a/Build/source/texk/cjkutils/configure.ac
+++ b/Build/source/texk/cjkutils/configure.ac
@@ -1,12 +1,12 @@
 dnl Process this file with autoconf to produce a configure script.
 dnl
-dnl   Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org>
+dnl   Copyright (C) 2009-2012 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
-m4_define([cjk_version], [4.8.2])[]dnl using unmodified cjk/utils source tree
+m4_include([version.ac])[] dnl define cjk_version
 AC_INIT([CJK utils for TeX Live], cjk_version, [tex-k@tug.org])
 AC_PREREQ([2.65])
 AC_CONFIG_SRCDIR([cjkutils-]cjk_version[/hbf2gf/hbf.h])
diff --git a/Build/source/texk/cjkutils/extconv.c b/Build/source/texk/cjkutils/extconv.c
index 98aa7cb764b..035678586bc 100644
--- a/Build/source/texk/cjkutils/extconv.c
+++ b/Build/source/texk/cjkutils/extconv.c
@@ -1,8 +1,8 @@
 #define banner  \
-"extconv (CJK ver. 4.8.2)" \
+"extconv (CJK ver. 4.8.3)" \
 
 /*2:*/
-#line 94 "./cjkutils-4.8.2/extconv/extconv.w"
+#line 94 "./cjkutils-4.8.3/extconv/extconv.w"
 
 #include <stdio.h> 
 #include <stdlib.h> 
diff --git a/Build/source/texk/cjkutils/hbf2gf.c b/Build/source/texk/cjkutils/hbf2gf.c
index ef5fc2e6112..02973893f5e 100644
--- a/Build/source/texk/cjkutils/hbf2gf.c
+++ b/Build/source/texk/cjkutils/hbf2gf.c
@@ -1,5 +1,5 @@
 #define banner  \
-"hbf2gf (CJK ver. 4.8.2)" \
+"hbf2gf (CJK ver. 4.8.3)" \
  \
 
 #define TRUE 1
@@ -100,10 +100,10 @@
 #define VALID_SUBCODE 1 \
 
 /*4:*/
-#line 191 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
+#line 191 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
 
 /*10:*/
-#line 408 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
+#line 408 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
 
 #ifdef HAVE_CONFIG_H
 #include <c-auto.h> 
@@ -121,7 +121,7 @@
 
 
 /*:10*//*69:*/
-#line 2469 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
+#line 2469 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
 
 #if defined(HAVE_LIBKPATHSEA)
 #include "kpathsea/kpathsea.h"
@@ -134,46 +134,46 @@
 #endif
 
 /*:69*/
-#line 192 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
+#line 192 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
 
 /*11:*/
-#line 429 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
+#line 429 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
 
 void write_file(void);
 
 
 /*:11*//*13:*/
-#line 491 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
+#line 491 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
 
 void write_pre(void);
 
 
 /*:13*//*16:*/
-#line 579 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
+#line 579 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
 
 void write_data(void);
 
 
 /*:16*//*20:*/
-#line 690 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
+#line 690 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
 
 void write_post(void);
 
 
 /*:20*//*25:*/
-#line 834 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
+#line 834 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
 
 void fputl(long,FILE*);
 
 
 /*:25*//*29:*/
-#line 994 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
+#line 994 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
 
 void make_pixel_array(void);
 
 
 /*:29*//*36:*/
-#line 1222 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
+#line 1222 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
 
 #ifdef __GNUC__
 __inline__
@@ -182,7 +182,7 @@ void read_row(unsigned char*);
 
 
 /*:36*//*39:*/
-#line 1272 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
+#line 1272 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
 
 #ifdef __GNUC__
 __inline__
@@ -191,55 +191,55 @@ void write_row(unsigned char*);
 
 
 /*:39*//*41:*/
-#line 1325 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
+#line 1325 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
 
 void write_coding(void);
 
 
 /*:41*//*45:*/
-#line 1486 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
+#line 1486 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
 
 void write_pl(void);
 
 
 /*:45*//*47:*/
-#line 1583 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
+#line 1583 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
 
 void write_ovp(void);
 
 
 /*:47*//*50:*/
-#line 1728 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
+#line 1728 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
 
 void write_job(void);
 
 
 /*:50*//*54:*/
-#line 1977 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
+#line 1977 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
 
 void read_config(void);
 
 
 /*:54*//*64:*/
-#line 2308 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
+#line 2308 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
 
 int fsearch(const char*);
 
 
 /*:64*//*67:*/
-#line 2447 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
+#line 2447 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
 
 void config_error(const char*);
 
 
 /*:67*//*71:*/
-#line 2490 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
+#line 2490 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
 
 const char*TeX_search_version(void);
 
 
 /*:71*//*74:*/
-#line 2525 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
+#line 2525 "./cjkutils-4.8.3/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 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
+#line 2613 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
 
 char*TeX_search_cfg_file(char*);
 char*TeX_search_hbf_file(char*);
 
 
 /*:79*/
-#line 193 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
+#line 193 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
 
 /*2:*/
-#line 127 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
+#line 127 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
 
 int nmb_files= -1;
 int unicode= FALSE;
@@ -300,7 +300,7 @@ int end_of_file= FALSE;
 
 
 /*:2*//*15:*/
-#line 538 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
+#line 538 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
 
 long char_adr[256];
 long*char_adr_p;
@@ -342,7 +342,7 @@ int dot_count;
 
 
 /*:15*//*19:*/
-#line 667 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
+#line 667 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
 
 char coding[STRING_LENGTH+1];
 char comment[STRING_LENGTH+1];
@@ -361,7 +361,7 @@ double ppp_y;
 
 
 /*:19*//*27:*/
-#line 871 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
+#line 871 "./cjkutils-4.8.3/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 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
+#line 1267 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
 
 int threshold= 128;
 
 
 /*:38*//*49:*/
-#line 1717 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
+#line 1717 "./cjkutils-4.8.3/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 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
+#line 1972 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
 
 char Buffer[STRING_LENGTH+1];
 
 
 /*:53*//*58:*/
-#line 2090 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
+#line 2090 "./cjkutils-4.8.3/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 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
+#line 2247 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
 
 HBF_CHAR min_char,max_char;
 
 
 /*:60*//*62:*/
-#line 2274 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
+#line 2274 "./cjkutils-4.8.3/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 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
+#line 2481 "./cjkutils-4.8.3/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 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
+#line 2518 "./cjkutils-4.8.3/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 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
+#line 2564 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
 
 char name_buffer[FILE_NAME_LENGTH+1];
 
 
 /*:76*/
-#line 194 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
+#line 194 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
 
 
 
@@ -463,7 +463,7 @@ int main(int argc,char*argv[])
 {char*p;
 
 /*78:*/
-#line 2586 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
+#line 2586 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
 
 #if defined(HAVE_LIBKPATHSEA)
 kpse_set_program_name(argv[0],"hbf2gf");
@@ -484,16 +484,16 @@ exit(1);
 
 
 /*:78*/
-#line 200 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
+#line 200 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
 
 
 /*7:*/
-#line 307 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
+#line 307 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
 
 if(argc==2)
 {if(strcmp(argv[1],"--help")==0)
 /*6:*/
-#line 288 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
+#line 288 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
 
 {printf(USAGE);
 exit(0);
@@ -501,11 +501,11 @@ exit(0);
 
 
 /*:6*/
-#line 310 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
+#line 310 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
 
 else if(strcmp(argv[1],"--version")==0)
 /*5:*/
-#line 261 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
+#line 261 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
 
 {printf("\n");
 printf(banner);
@@ -516,7 +516,7 @@ exit(0);
 
 
 /*:5*/
-#line 312 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
+#line 312 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
 
 }
 
@@ -554,7 +554,7 @@ exit(1);
 
 
 /*:7*/
-#line 202 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
+#line 202 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
 
 
 if(!quiet)
@@ -583,7 +583,7 @@ read_config();
 
 if(mf_like)
 /*8:*/
-#line 352 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
+#line 352 "./cjkutils-4.8.3/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 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
+#line 229 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
 
 
 /*28:*/
-#line 903 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
+#line 903 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
 
 {int col,offset;
 
@@ -698,11 +698,11 @@ s_slant= slant*SCALE;
 
 
 /*:28*/
-#line 231 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
+#line 231 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
 
 
 /*9:*/
-#line 387 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
+#line 387 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
 
 {int j,max_numb;
 
@@ -724,7 +724,7 @@ nmb_files= j;
 
 
 /*:9*/
-#line 233 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
+#line 233 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
 
 
 if(tfm_files)
@@ -742,7 +742,7 @@ return 0;
 
 
 /*:4*//*12:*/
-#line 437 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
+#line 437 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
 
 void write_file(void)
 {char output_file[FILE_NAME_LENGTH+1];
@@ -786,7 +786,7 @@ write_data();
 
 
 /*:12*//*14:*/
-#line 498 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
+#line 498 "./cjkutils-4.8.3/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 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
+#line 584 "./cjkutils-4.8.3/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 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
+#line 609 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
 
 {if(dot_count++%10==0)
 if(pk_files&&!quiet)
@@ -861,13 +861,13 @@ fputc(EOC,out);
 
 
 /*:18*/
-#line 590 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
+#line 590 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
 
 }
 
 
 /*:17*//*21:*/
-#line 695 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
+#line 695 "./cjkutils-4.8.3/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 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
+#line 741 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
 
 special_adr= ftell(out);
 
@@ -913,10 +913,10 @@ fputs(comment,out);
 
 
 /*:22*/
-#line 721 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
+#line 721 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
 
 /*23:*/
-#line 770 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
+#line 770 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
 
 post_adr= ftell(out);
 fputc(POST,out);
@@ -955,10 +955,10 @@ fputl(*char_adr_p++,out);
 
 
 /*:23*/
-#line 722 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
+#line 722 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
 
 /*24:*/
-#line 821 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
+#line 821 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
 
 fputc(POSTPOST,out);
 fputl(post_adr,out);
@@ -970,13 +970,13 @@ fputc(POSTPOST_ID,out);
 
 
 /*:24*/
-#line 723 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
+#line 723 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
 
 }
 
 
 /*:21*//*26:*/
-#line 839 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
+#line 839 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
 
 void fputl(long num,FILE*f)
 {fputc(num>>24,f);
@@ -987,7 +987,7 @@ fputc(num,f);
 
 
 /*:26*//*30:*/
-#line 999 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
+#line 999 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
 
 void make_pixel_array(void)
 {unsigned char*prP;
@@ -1025,7 +1025,7 @@ if(!bitmap)
 empty_char= TRUE;
 else
 /*31:*/
-#line 1058 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
+#line 1058 "./cjkutils-4.8.3/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 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
+#line 1072 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
 
 if(pk_output_size_y==input_size_y)
 
@@ -1055,7 +1055,7 @@ need_to_read_row= 1;
 }
 
 /*33:*/
-#line 1099 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
+#line 1099 "./cjkutils-4.8.3/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 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
+#line 1092 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
 
 }
 
 
 /*:32*/
-#line 1064 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
+#line 1064 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
 
 /*34:*/
-#line 1140 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
+#line 1140 "./cjkutils-4.8.3/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 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
+#line 1198 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
 
 if(frac_col_to_fill> 0)
 {--xP;
@@ -1171,20 +1171,20 @@ write_row(new_prP);
 
 
 /*:35*/
-#line 1193 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
+#line 1193 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
 
 }
 
 
 /*:34*/
-#line 1066 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
+#line 1066 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
 
 }
 }
 
 
 /*:31*/
-#line 1035 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
+#line 1035 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
 
 }
 }
@@ -1208,7 +1208,7 @@ goto again;
 
 
 /*:30*//*37:*/
-#line 1230 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
+#line 1230 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
 
 #ifdef __GNUC__
 __inline__
@@ -1243,7 +1243,7 @@ bitshift= 7;
 
 
 /*:37*//*40:*/
-#line 1280 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
+#line 1280 "./cjkutils-4.8.3/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 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
+#line 1333 "./cjkutils-4.8.3/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 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
+#line 1357 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
 
 count= 0;
 x= 0;
@@ -1345,11 +1345,11 @@ continue;
 
 
 /*:43*/
-#line 1348 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
+#line 1348 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
 
 start:
 /*44:*/
-#line 1425 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
+#line 1425 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
 
 while(x<pk_output_size_x)
 {if(*cp==paint)
@@ -1390,7 +1390,7 @@ paint= WHITE;
 
 
 /*:44*/
-#line 1350 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
+#line 1350 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
 
 y++;
 }
@@ -1398,7 +1398,7 @@ y++;
 
 
 /*:42*//*46:*/
-#line 1491 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
+#line 1491 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
 
 void write_pl(void)
 {int i,pos;
@@ -1488,7 +1488,7 @@ fclose(out);
 
 
 /*:46*//*48:*/
-#line 1588 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
+#line 1588 "./cjkutils-4.8.3/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 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
+#line 1733 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
 
 void write_job(void)
 {FILE*out;
@@ -1689,7 +1689,7 @@ fclose(out);
 
 
 /*:51*//*55:*/
-#line 1985 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
+#line 1985 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
 
 void read_config(void)
 {HBF_BBOX*boxp;
@@ -1697,7 +1697,7 @@ char*real_config_file;
 
 
 /*56:*/
-#line 2037 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
+#line 2037 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
 
 {int i,lastext= -1;
 
@@ -1715,7 +1715,7 @@ strcat(config_file,".cfg");
 
 
 /*:56*/
-#line 1991 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
+#line 1991 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
 
 
 real_config_file= TeX_search_cfg_file(config_file);
@@ -1750,7 +1750,7 @@ exit(0);
 }
 
 /*57:*/
-#line 2054 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
+#line 2054 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
 
 {char hbf_header[STRING_LENGTH+1];
 char*real_hbf_header;
@@ -1787,10 +1787,10 @@ strcpy(output_name,Buffer);
 
 
 /*:57*/
-#line 2024 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
+#line 2024 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
 
 /*59:*/
-#line 2098 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
+#line 2098 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
 
 {if(fsearch("nmb_files"))
 nmb_files= atoi(Buffer);
@@ -1932,11 +1932,11 @@ job_extension[EXTENSION_LENGTH]= '\0';
 
 
 /*:59*/
-#line 2025 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
+#line 2025 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
 
 
 /*61:*/
-#line 2252 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
+#line 2252 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
 
 {const void*cp;
 HBF_CHAR dummy;
@@ -1951,10 +1951,10 @@ min_char= user_min_char;
 
 
 /*:61*/
-#line 2027 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
+#line 2027 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
 
 /*63:*/
-#line 2281 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
+#line 2281 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
 
 {const void*b2r;
 unsigned char dummy;
@@ -1977,7 +1977,7 @@ nmb_2_bytes++;
 
 
 /*:63*/
-#line 2028 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
+#line 2028 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
 
 
 fclose(config);
@@ -1985,7 +1985,7 @@ fclose(config);
 
 
 /*:55*//*65:*/
-#line 2313 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
+#line 2313 "./cjkutils-4.8.3/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 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
+#line 2392 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
 
 {P= temp_buffer;
 Buf_p= Buffer;
@@ -2094,7 +2094,7 @@ count--;
 
 
 /*:66*/
-#line 2367 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
+#line 2367 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
 
 else
 *Buffer= '\0';
@@ -2104,7 +2104,7 @@ return(*Buffer)?1:0;
 
 
 /*:65*//*68:*/
-#line 2452 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
+#line 2452 "./cjkutils-4.8.3/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 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
+#line 2495 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
 
 const char*TeX_search_version(void)
 {
@@ -2137,7 +2137,7 @@ return no_version_string;
 
 
 /*:72*//*75:*/
-#line 2537 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
+#line 2537 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
 
 #ifdef HAVE_EMTEXDIR
 int dir_setup(ed,env,dir,flags)
@@ -2165,7 +2165,7 @@ return TRUE;
 
 
 /*:75*//*77:*/
-#line 2569 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
+#line 2569 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
 
 char*file_find(name,list)
 char*name;
@@ -2180,7 +2180,7 @@ return NULL;
 
 
 /*:77*//*80:*/
-#line 2619 "./cjkutils-4.8.2/hbf2gf/hbf2gf.w"
+#line 2619 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
 
 #if defined(HAVE_LIBKPATHSEA)
 char*TeX_search_cfg_file(char*name)
diff --git a/Build/source/texk/cjkutils/hbf2gf.dvi b/Build/source/texk/cjkutils/hbf2gf.dvi
index d93ae552196..9e50cedf2cc 100644
--- a/Build/source/texk/cjkutils/hbf2gf.dvi
+++ b/Build/source/texk/cjkutils/hbf2gf.dvi
diff --git a/Build/source/texk/cjkutils/hbf2gf.tex b/Build/source/texk/cjkutils/hbf2gf.tex
index 95b6024f3b2..5ea7cca08e1 100644
--- a/Build/source/texk/cjkutils/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.8.2  29-Dec-2008
+% This is the cweb file hbf2gf.w of the CJK package ver. 4.8.3  07-May-2012
 
-% Copyright (C) 1994-2008  Werner Lemberg <wl@gnu.org>
+% Copyright (C) 1994-2012  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.8.2)}
+\def\title{hbf2gf (CJK Version 4.8.3)}
 
 \def\topofcontents{
   \null\vfill
   \centerline{\titlefont The {\ttitlefont hbf2gf} program}
   \vskip 20pt
-  \centerline{(CJK Version 4.8.2)}
+  \centerline{(CJK Version 4.8.3)}
   \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.}\)\.{8.2)"}\par
+\.{"hbf2gf\ (CJK\ ver.\ 4.}\)\.{8.3)"}\par
 \fi
 
 \M{2}
diff --git a/Build/source/texk/cjkutils/sjisconv.c b/Build/source/texk/cjkutils/sjisconv.c
index b92195129da..3678fc706be 100644
--- a/Build/source/texk/cjkutils/sjisconv.c
+++ b/Build/source/texk/cjkutils/sjisconv.c
@@ -1,8 +1,8 @@
 #define banner  \
-"sjisconv (CJK ver. 4.8.2)" \
+"sjisconv (CJK ver. 4.8.3)" \
 
 /*2:*/
-#line 96 "./cjkutils-4.8.2/SJISconv/sjisconv.w"
+#line 96 "./cjkutils-4.8.3/SJISconv/sjisconv.w"
 
 #include <stdio.h> 
 #include <stdlib.h> 
diff --git a/Build/source/texk/cjkutils/tests/bg5conv.cjk b/Build/source/texk/cjkutils/tests/bg5conv.cjk
index 90f9acef8e3..b064105095a 100644
--- a/Build/source/texk/cjkutils/tests/bg5conv.cjk
+++ b/Build/source/texk/cjkutils/tests/bg5conv.cjk
@@ -1,4 +1,4 @@
-\def\CJKpreproc{bg5conv (CJK ver. 4.8.2)}
+\def\CJKpreproc{bg5conv (CJK ver. 4.8.3)}
 0x81 0x41:�A
 0xa0 0x5a:�Z
 0xa1 0x7b:�123
diff --git a/Build/source/texk/cjkutils/tests/cef5conv.cjk b/Build/source/texk/cjkutils/tests/cef5conv.cjk
index a9d6a780711..b0639ca2142 100644
--- a/Build/source/texk/cjkutils/tests/cef5conv.cjk
+++ b/Build/source/texk/cjkutils/tests/cef5conv.cjk
@@ -1,4 +1,4 @@
-\def\CNSpreproc{cef5conv (CJK ver. 4.8.2)}
+\def\CNSpreproc{cef5conv (CJK ver. 4.8.3)}
 0x81 0x41:�A
 0xa0 0x5a:�Z
 0xa1 0x7b:�123
diff --git a/Build/source/texk/cjkutils/tests/cefconv.cjk b/Build/source/texk/cjkutils/tests/cefconv.cjk
index b7ff0f69ed6..97817fedfc7 100644
--- a/Build/source/texk/cjkutils/tests/cefconv.cjk
+++ b/Build/source/texk/cjkutils/tests/cefconv.cjk
@@ -1,4 +1,4 @@
-\def\CNSpreproc{cefconv (CJK ver. 4.8.2)}
+\def\CNSpreproc{cefconv (CJK ver. 4.8.3)}
 AC0-0f0f; 72Bg5"00F"00F
 AC1-0F0F; 72CNS1"00F"00F
 AC7-f0f0; 72CNS7"0F0"0F0
diff --git a/Build/source/texk/cjkutils/tests/cefsconv.cjk b/Build/source/texk/cjkutils/tests/cefsconv.cjk
index 74d2b948a3f..00842b5e9e8 100644
--- a/Build/source/texk/cjkutils/tests/cefsconv.cjk
+++ b/Build/source/texk/cjkutils/tests/cefsconv.cjk
@@ -1,4 +1,4 @@
-\def\CNSpreproc{cefsconv (CJK ver. 4.8.2)}
+\def\CNSpreproc{cefsconv (CJK ver. 4.8.3)}
 0x81 0x7b:�123
 0x9f 0x5c:�92
 0xe0 0x7d:�125
diff --git a/Build/source/texk/cjkutils/tests/extconv.cjk b/Build/source/texk/cjkutils/tests/extconv.cjk
index f64b086b61a..3ff038156d6 100644
--- a/Build/source/texk/cjkutils/tests/extconv.cjk
+++ b/Build/source/texk/cjkutils/tests/extconv.cjk
@@ -1,4 +1,4 @@
-\def\CJKpreproc{extconv (CJK ver. 4.8.2)}
+\def\CJKpreproc{extconv (CJK ver. 4.8.3)}
 0x81 0x7b:�123
 0xfe 0x5c:�92
 0xc3 0x7d:�125
diff --git a/Build/source/texk/cjkutils/tests/sjisconv.cjk b/Build/source/texk/cjkutils/tests/sjisconv.cjk
index c299710dc0a..d9a22a3a34d 100644
--- a/Build/source/texk/cjkutils/tests/sjisconv.cjk
+++ b/Build/source/texk/cjkutils/tests/sjisconv.cjk
@@ -1,4 +1,4 @@
-\def\CJKpreproc{sjisconv (CJK ver. 4.8.2)}
+\def\CJKpreproc{sjisconv (CJK ver. 4.8.3)}
 0x81 0x7b:�123
 0x9f 0x5c:�92
 0xe0 0x7d:�125
diff --git a/Build/source/texk/cjkutils/version.ac b/Build/source/texk/cjkutils/version.ac
new file mode 100644
index 00000000000..79961e184d8
--- /dev/null
+++ b/Build/source/texk/cjkutils/version.ac
@@ -0,0 +1,11 @@
+dnl
+dnl   Copyright (C) 2012 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
+dnl --------------------------------------------------------
+dnl
+dnl  m4-include this file to define the current xpdf version
+m4_define([cjk_version], [4.8.3])
author	Peter Breitenlohner <peb@mppmu.mpg.de>	2012-05-12 11:03:50 +0000
committer	Peter Breitenlohner <peb@mppmu.mpg.de>	2012-05-12 11:03:50 +0000
commit	4316da8a1a925fe8a60061f34dac1b15932cb3ed (patch)
tree	746ca79340eef6922f64901f643d0b84fc1086e9 /Build/source/texk
parent	3572a03583d40cb0ae0df2c77bb6600fffafa4b4 (diff)