105 files changed, 517 insertions, 902 deletions

diff --git a/Build/source/texk/README b/Build/source/texk/README
index f788b1a5ce5..f8c38e76635 100644
--- a/Build/source/texk/README
+++ b/Build/source/texk/README
@@ -31,8 +31,8 @@ chktex 1.7.4 - checked 12apr15
   http://mirror.ctan.org/support/chktex/
   http://download.savannah.gnu.org/releases/chktex/
 
-cjkutils 4.8.3 - checked 11may12
-  http://cjk.ffii.org/cjk-4.8.3.tar.gz
+cjkutils 4.8.4 - checked 18apr15
+  http://cjk.ffii.org/cjk-4.8.4.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 8129f4ba1ae..b1538194ebb 100644
--- a/Build/source/texk/cjkutils/ChangeLog
+++ b/Build/source/texk/cjkutils/ChangeLog
@@ -1,3 +1,8 @@
+2015-04-18  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	Import cjk-4.8.4/utils as cjkutils-4.8.4.
+	* version.ac, tests/*.cjk: Adapted.
+
 2015-03-10  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* configure.ac: Drop checks for strdup, strstr, strtol, strtoul.
diff --git a/Build/source/texk/cjkutils/bg5conv.c b/Build/source/texk/cjkutils/bg5conv.c
index 6a2e9fe5a0f..7acc54321ef 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.3)" \
+"bg5conv (CJK ver. 4.8.4)" \
 
 /*2:*/
-#line 94 "./cjkutils-4.8.3/Bg5conv/bg5conv.w"
+#line 94 "./cjkutils-4.8.4/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 8349f3a7955..e8524a023ed 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.3)" \
+"cef5conv (CJK ver. 4.8.4)" \
 
 /*2:*/
-#line 108 "./cjkutils-4.8.3/CEFconv/cef5conv.w"
+#line 108 "./cjkutils-4.8.4/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 f8b3fd4a15f..6773e45bdd5 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.3)" \
+"cefconv (CJK ver. 4.8.4)" \
 
 /*2:*/
-#line 100 "./cjkutils-4.8.3/CEFconv/cefconv.w"
+#line 100 "./cjkutils-4.8.4/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 431f06b5aa4..528e880063d 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.3)" \
+"cefsconv (CJK ver. 4.8.4)" \
 
 /*2:*/
-#line 111 "./cjkutils-4.8.3/CEFconv/cefsconv.w"
+#line 111 "./cjkutils-4.8.4/CEFconv/cefsconv.w"
 
 #include <ctype.h> 
 #include <stdio.h> 
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.3-PATCHES/patch-01-static b/Build/source/texk/cjkutils/cjkutils-4.8.3-PATCHES/patch-01-static
deleted file mode 100644
index f0bfeba60ba..00000000000
--- a/Build/source/texk/cjkutils/cjkutils-4.8.3-PATCHES/patch-01-static
+++ /dev/null
@@ -1,373 +0,0 @@
-	Clang does not like non-static inline functions as used here.
-	While at it, all local functions are declared static.
-
-	Do not extend #ifdef HAVE_EMTEXDIR...#endif over several sections.
-
-diff -ur cjkutils-4.8.3.orig/hbf2gf/hbf2gf.w cjkutils-4.8.3/hbf2gf/hbf2gf.w
---- cjkutils-4.8.3.orig/hbf2gf/hbf2gf.w	2012-05-07 00:00:00.000000000 +0200
-+++ cjkutils-4.8.3/hbf2gf/hbf2gf.w	2012-05-20 14:09:25.143819152 +0200
-@@ -427,7 +427,7 @@
- functions |write_pre()|, |write_data()|, and |write_post()| handle this.
- 
- @<Prototypes@>=
--void write_file(void);
-+static void write_file(void);
- 
- 
- @
-@@ -435,7 +435,7 @@
- the \.{-n} option isn't specified; otherwise only `\.{.gf}' will be appended.
- 
- @c
--void write_file(void)
-+static void write_file(void)
-    {char output_file[FILE_NAME_LENGTH + 1];
- 
- 
-@@ -489,14 +489,14 @@
- @d header " hbf2gf output "
- 
- @<Prototypes@>=
--void write_pre(void);
-+static void write_pre(void);
- 
- 
- @
- @s tm int
- 
- @c
--void write_pre(void)
-+static void write_pre(void)
-    {char out_s[40], s[20];
-     time_t secs_now;
-     struct tm *time_now;
-@@ -577,12 +577,12 @@
- 
- @
- @<Prototypes@>=
--void write_data(void);
-+static void write_data(void);
- 
- 
- @
- @c
--void write_data(void)
-+static void write_data(void)
-    {dot_count = 0;
-     char_adr_p = char_adr;@#
- 
-@@ -688,12 +688,12 @@
- \TeX\ defines that 72.27~points are exactly 1~inch.
- 
- @<Prototypes@>=
--void write_post(void);
-+static void write_post(void);
- 
- 
- @
- @c
--void write_post(void)
-+static void write_post(void)
-    {long special_adr;
-     long post_adr;@#
- 
-@@ -832,12 +832,12 @@
- \TeX\ wants the most significant byte first.
- 
- @<Prototypes@>=
--void fputl(long, FILE *);
-+static void fputl(long, FILE *);
- 
- 
- @
- @c
--void fputl(long num, FILE *f)
-+static void fputl(long num, FILE *f)
-    {fputc(num >> 24, f);
-     fputc(num >> 16, f);
-     fputc(num >> 8, f);
-@@ -992,12 +992,12 @@
- 
- 
- @<Prototypes@>=
--void make_pixel_array(void);
-+static void make_pixel_array(void);
- 
- 
- @
- @c
--void make_pixel_array(void)
-+static void make_pixel_array(void)
-    {unsigned char *prP;
-     unsigned char *temp_prP;
-     unsigned char *new_prP;
-@@ -1220,6 +1220,7 @@
- glyph).
- 
- @<Prototypes@>=
-+static
- #ifdef __GNUC__
- __inline__
- #endif
-@@ -1228,6 +1229,7 @@
- 
- @
- @c
-+static
- #ifdef __GNUC__
- __inline__
- #endif
-@@ -1270,6 +1272,7 @@
- 
- @
- @<Prototypes@>=
-+static
- #ifdef __GNUC__
- __inline__
- #endif
-@@ -1278,6 +1281,7 @@
- 
- @
- @c
-+static
- #ifdef __GNUC__
- __inline__
- #endif
-@@ -1323,7 +1327,7 @@
- @d NOOP        244         /* not used */
- 
- @<Prototypes@>=
--void write_coding(void);
-+static void write_coding(void);
- 
- 
- @
-@@ -1331,7 +1335,7 @@
- ``Unreachable code $\ldots$'' or something similar.
- 
- @c
--void write_coding(void)
-+static void write_coding(void)
-    {register int count, skip;
-     register unsigned char paint;
-     register int x, y;
-@@ -1484,12 +1488,12 @@
- single bytes and use the \.{HEADER} command repeatedly.
- 
- @<Prototypes@>=
--void write_pl(void);
-+static void write_pl(void);
- 
- 
- @
- @c
--void write_pl(void)
-+static void write_pl(void)
-    {int i, pos;
-     char output_file[FILE_NAME_LENGTH + 1];
-     long t, sc;
-@@ -1581,12 +1585,12 @@
- of the subfonts back to the original encoding positions.
- 
- @<Prototypes@>=
--void write_ovp(void);
-+static void write_ovp(void);
- 
- 
- @
- @c
--void write_ovp(void)
-+static void write_ovp(void)
-    {int c, i, nmb_subfonts, remainder, count, pos;
-     char output_file[FILE_NAME_LENGTH + 1];
-     long t, sc;
-@@ -1726,12 +1730,12 @@
- 
- @
- @<Prototypes@>=
--void write_job(void);
-+static void write_job(void);
- 
- 
- @
- @c
--void write_job(void)
-+static void write_job(void)
-    {FILE *out;
-     int i, j;
-     char buffer[FILE_NAME_LENGTH + 1];
-@@ -1975,7 +1979,7 @@
- 
- @
- @<Prototypes@>=
--void read_config(void);
-+static void read_config(void);
- 
- 
- @
-@@ -1983,7 +1987,7 @@
- isn't a HBF font at all.
- 
- @c
--void read_config(void)
-+static void read_config(void)
-    {HBF_BBOX *boxp;
-     char *real_config_file;
- 
-@@ -2306,12 +2310,12 @@
- |Buffer| if existent. |fsearch()| returns~1 on success.
- 
- @<Prototypes@>=
--int fsearch(const char *);
-+static int fsearch(const char *);
- 
- 
- @
- @c
--int fsearch(const char *search_string)
-+static int fsearch(const char *search_string)
-    {char *P, p;
-     const char *Q;
-     char temp_buffer[STRING_LENGTH + 1];
-@@ -2445,12 +2449,12 @@
- message.
- 
- @<Prototypes@>=
--void config_error(const char *);
-+static void config_error(const char *);
- 
- 
- @
- @c
--void config_error(const char *message)
-+static void config_error(const char *message)
-    {fprintf(stderr, "Couldn't find `%s' entry in configuration file\n",
-             message);
-     exit(1);
-@@ -2488,12 +2492,12 @@
- 
- @
- @<Prototypes@>=
--const char *TeX_search_version(void);
-+static const char *TeX_search_version(void);
- 
- 
- @
- @c
--const char *TeX_search_version(void)
-+static const char *TeX_search_version(void)
-    {
- #if defined(HAVE_LIBKPATHSEA)
-     return kpathsea_version_string;
-@@ -2525,8 +2529,8 @@
- @<Prototypes@>=
- #ifdef HAVE_EMTEXDIR
- extern int setup_list(struct emtex_dir *, char *, const char *, unsigned);
--int dir_setup(struct emtex_dir *, const char *, const char *, unsigned);
--char *file_find(char *, struct emtex_dir *);
-+static int dir_setup(struct emtex_dir *, const char *, const char *, unsigned);
-+static char *file_find(char *, struct emtex_dir *);
- #endif
- 
- 
-@@ -2536,7 +2540,7 @@
- 
- @c
- #ifdef HAVE_EMTEXDIR
--int dir_setup(ed, env, dir, flags)
-+static int dir_setup(ed, env, dir, flags)
-   struct emtex_dir *ed;
-   const char *env;
-   const char *dir;
-@@ -2558,16 +2562,20 @@
- 
-     return TRUE;
-    }
-+#endif
- 
- 
- @
- @<Global variables@>=
-+#ifdef HAVE_EMTEXDIR
- char name_buffer[FILE_NAME_LENGTH + 1];
-+#endif
- 
- 
- @
- @c
--char *file_find(name, list)
-+#ifdef HAVE_EMTEXDIR
-+static char *file_find(name, list)
-   char *name;
-   struct emtex_dir *list;
- 
-@@ -2611,38 +2619,38 @@
- versions, and within \.{HBF2GFINPUTS} for new versions.
- 
- @<Prototypes@>=
--char *TeX_search_cfg_file(char *);
--char *TeX_search_hbf_file(char *);
-+static char *TeX_search_cfg_file(char *);
-+static char *TeX_search_hbf_file(char *);
- 
- 
- @
- @c
- #if defined(HAVE_LIBKPATHSEA)
--char *TeX_search_cfg_file(char *name)
-+static char *TeX_search_cfg_file(char *name)
-    {
-     return kpse_find_file(name, kpse_program_text_format, TRUE);
-    }@#
- 
- 
--char *TeX_search_hbf_file(char *name)
-+static char *TeX_search_hbf_file(char *name)
-    {
-     return kpse_find_file(name, kpse_miscfonts_format, TRUE);
-    }@#
- 
- 
- #elif defined(HAVE_EMTEXDIR)
--char *TeX_search_cfg_file(char *name)
-+static char *TeX_search_cfg_file(char *name)
-    {return file_find(name, &cfg_path);
-    }@#
- 
- 
--char *TeX_search_hbf_file(char *name)
-+static char *TeX_search_hbf_file(char *name)
-    {return file_find(name, &hbf_path);
-    }@#
- 
- 
- #elif defined(HAVE_MIKTEX)
--char *TeX_search_cfg_file(char *name)
-+static char *TeX_search_cfg_file(char *name)
-    {char result[_MAX_PATH];
- 
-     if (!miktex_find_input_file("hbf2gf", *name, result))
-@@ -2651,7 +2659,7 @@
-    }@#
- 
- 
--char *TeX_search_hbf_file(char *name)
-+static char *TeX_search_hbf_file(char *name)
-    {char result[_MAX_PATH];
- 
- 
-@@ -2662,12 +2670,12 @@
- 
- 
- #else
--char *TeX_search_cfg_file(char *name)
-+static char *TeX_search_cfg_file(char *name)
-    {return name;
-    }@#
- 
- 
--char *TeX_search_hbf_file(char *name)
-+static char *TeX_search_hbf_file(char *name)
-    {return name;
-    }
- #endif
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.3-PATCHES/patch-02-unused b/Build/source/texk/cjkutils/cjkutils-4.8.3-PATCHES/patch-02-unused
deleted file mode 100644
index cf4838d5781..00000000000
--- a/Build/source/texk/cjkutils/cjkutils-4.8.3-PATCHES/patch-02-unused
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -ur cjkutils-4.8.3.orig/hbf2gf/hbf.c cjkutils-4.8.3/hbf2gf/hbf.c
---- cjkutils-4.8.3.orig/hbf2gf/hbf.c	2012-05-07 00:00:00.000000000 +0200
-+++ cjkutils-4.8.3/hbf2gf/hbf.c	2012-12-07 10:57:31.000000000 +0100
-@@ -1041,12 +1041,10 @@
- {
- 	if (LocalFileName(filename) && path != NULL) {
- #ifdef PATH_DELIMITER
--		int	len;
- 		char	*fullname;
- 		FILE	*f;
- 		const	char	*p_next;
- 
--		len = strlen(filename);
- 		for (;;) {
- 			p_next = strchr(path, PATH_DELIMITER);
- 			if (p_next == NULL)
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.3-PATCHES/patch-03-unsigned b/Build/source/texk/cjkutils/cjkutils-4.8.3-PATCHES/patch-03-unsigned
deleted file mode 100644
index 301bb0f6b42..00000000000
--- a/Build/source/texk/cjkutils/cjkutils-4.8.3-PATCHES/patch-03-unsigned
+++ /dev/null
@@ -1,100 +0,0 @@
-	Avoid undefined behaviour when char is signed.
-
-diff -ur cjkutils-4.8.3.orig/hbf2gf/hbf.c cjkutils-4.8.3/hbf2gf/hbf.c
---- cjkutils-4.8.3.orig/hbf2gf/hbf.c	2012-12-07 10:57:31.000000000 +0100
-+++ cjkutils-4.8.3/hbf2gf/hbf.c	2014-06-19 12:44:16.000000000 +0200
-@@ -378,7 +378,7 @@
- 		lp++;
- 		sp++;
- 	}
--	return (*lp == '\0' || isspace(*lp)) && *sp == '\0';
-+	return (*lp == '\0' || isspace((unsigned char)*lp)) && *sp == '\0';
- }
- 
- #ifdef NO_STRDUP
-@@ -407,12 +407,12 @@
- 	prop = NEW(PROPERTY);
- 
- 	tp = tmp;
--	while (*lp != '\0' && ! isspace(*lp))
-+	while (*lp != '\0' && ! isspace((unsigned char)*lp))
- 		*tp++ = *lp++;
- 	*tp = '\0';
- 	prop->prop_name = strdup(tmp);
- 
--	while (*lp != '\0' && isspace(*lp))
-+	while (*lp != '\0' && isspace((unsigned char)*lp))
- 		lp++;
- 
- 	tp = tmp;
-@@ -423,9 +423,9 @@
- 	}
- 	else
- 		for (;;) {
--			while (*lp != '\0' && ! isspace(*lp))
-+			while (*lp != '\0' && ! isspace((unsigned char)*lp))
- 				*tp++ = *lp++;
--			while (*lp != '\0' && isspace(*lp))
-+			while (*lp != '\0' && isspace((unsigned char)*lp))
- 				lp++;
- 			if (*lp == '\0')
- 				break;
-@@ -765,9 +765,9 @@
- skip_word(int n, const char *s)
- {
- 	for ( ; n > 0; n--) {
--		while (*s != '\0' && ! isspace(*s))
-+		while (*s != '\0' && ! isspace((unsigned char)*s))
- 			s++;
--		while (*s != '\0' && isspace(*s))
-+		while (*s != '\0' && isspace((unsigned char)*s))
- 			s++;
- 	}
- 	return s;
-@@ -869,7 +869,7 @@
- 		}
- 		if (c == '\n' || c == '\r') {
- 			/* trim trailing space */
--			while (bp > buf && isspace(*(bp-1)))
-+			while (bp > buf && isspace((unsigned char)*(bp-1)))
- 				bp--;
- 			*bp = '\0';
- 			return TRUE;
-diff -ur cjkutils-4.8.3.orig/hbf2gf/hbf2gf.w cjkutils-4.8.3/hbf2gf/hbf2gf.w
---- cjkutils-4.8.3.orig/hbf2gf/hbf2gf.w	2012-05-20 14:09:25.000000000 +0200
-+++ cjkutils-4.8.3/hbf2gf/hbf2gf.w	2014-06-19 12:44:16.000000000 +0200
-@@ -2330,7 +2330,7 @@
- 
-     do
-        {Q = search_string;
--        p = tolower(*Q);
-+        p = tolower((unsigned char)*Q);
-         Ch = fgetc(config);
-         ch = tolower(Ch);
-         while(!(ch == p && old_ch == '\n') && Ch != EOF)
-@@ -2347,7 +2347,7 @@
-                    /* there must be a space or a tab stop after the keyword */
-                     goto success;
-             Ch = fgetc(config);
--            if(tolower(Ch) != tolower(*Q))
-+            if(tolower(Ch) != tolower((unsigned char)*Q))
-                 break;
-            }
-        }
-@@ -2410,14 +2410,14 @@
-                    }
-                 while(*P == '{') @q } @>
-                     P++;
--                if(!(isalpha(*P) || *P == '_'))
-+                if(!(isalpha((unsigned char)*P) || *P == '_'))
-                    {fprintf(stderr,@/
-                 "Invalid environment variable name in configuration file\n");
-                     exit(1);
-                    }
-                 *(env_p++) = *(P++);
-                 while(*P)
--                   {if(isalnum(*P) || *P == '_')
-+                   {if(isalnum((unsigned char)*P) || *P == '_')
-                         *(env_p++) = *(P++);
-                     else
-                        {@q { @> while(*P == '}')
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.3-PATCHES/ChangeLog b/Build/source/texk/cjkutils/cjkutils-4.8.4-PATCHES/ChangeLog
index 1d1f37acc82..d05c74e94fd 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.3-PATCHES/ChangeLog
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.4-PATCHES/ChangeLog
@@ -1,3 +1,11 @@
+2015-04-18  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	Imported cjk-4.8.4/utils source tree from:
+	  http://cjk.ffii.org/cjk-4.8.4.tar.gz
+	* patch-01-static, patch-02-unused, patch-03-unsigned (removed):
+	Now included upstream.
+	* patch-04-mingw64: Adapted.
+
 2014-11-05  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* patch-04-mingw64 (new): Required for MinGW64, but why?
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.3-PATCHES/TL-Changes b/Build/source/texk/cjkutils/cjkutils-4.8.4-PATCHES/TL-Changes
index a93c0322860..e3e36c9fef6 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.3-PATCHES/TL-Changes
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.4-PATCHES/TL-Changes
@@ -1,5 +1,5 @@
-Changes applied to the cjk-4.8.3/utils tree as obtained from:
-	http://cjk.ffii.org/cjk-4.8.3.tar.gz
+Changes applied to the cjk-4.8.4/utils tree as obtained from:
+	http://cjk.ffii.org/cjk-4.8.4.tar.gz
 
 Moved from top level to here:
 	ChangeLog
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.3-PATCHES/patch-04-mingw64 b/Build/source/texk/cjkutils/cjkutils-4.8.4-PATCHES/patch-04-mingw64
index 9232116055d..d429f5cb873 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.3-PATCHES/patch-04-mingw64
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.4-PATCHES/patch-04-mingw64
@@ -1,12 +1,12 @@
-diff -ur cjkutils-4.8.3.orig/hbf2gf/hbf2gf.w cjkutils-4.8.3/hbf2gf/hbf2gf.w
---- cjkutils-4.8.3.orig/hbf2gf/hbf2gf.w	2014-06-19 12:44:16.000000000 +0200
-+++ cjkutils-4.8.3/hbf2gf/hbf2gf.w	2014-11-05 12:56:50.000000000 +0100
+diff -ur cjkutils-4.8.4.orig/hbf2gf/hbf2gf.w cjkutils-4.8.4/hbf2gf/hbf2gf.w
+--- cjkutils-4.8.4.orig/hbf2gf/hbf2gf.w	2015-04-18 08:51:28.000000000 +0200
++++ cjkutils-4.8.4/hbf2gf/hbf2gf.w	2015-04-18 12:44:01.000000000 +0200
 @@ -486,7 +486,7 @@
  @d GF_ID 131
  @d PRE   247@#
  
 -@d header " hbf2gf output "
-+@d headertstring " hbf2gf output "
++@d headerstring " hbf2gf output "
  
  @<Prototypes@>=
  static void write_pre(void);
@@ -15,7 +15,7 @@ diff -ur cjkutils-4.8.3.orig/hbf2gf/hbf2gf.w cjkutils-4.8.3/hbf2gf/hbf2gf.w
  
  
 -    strcpy(out_s, header);@#
-+    strcpy(out_s, headertstring);@#
++    strcpy(out_s, headerstring);@#
  
      secs_now = time(NULL); /* system date and time */
      time_now = localtime(&secs_now);
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.3/Bg5conv/bg5conv.1 b/Build/source/texk/cjkutils/cjkutils-4.8.4/Bg5conv/bg5conv.1
index 4ee4815cfef..a9e83901cf0 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.3/Bg5conv/bg5conv.1
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.4/Bg5conv/bg5conv.1
@@ -1,5 +1,5 @@
 .\" man page for bg5conv
-.\" Copyright (C) 1994-2012  Werner Lemberg <wl@gnu.org>
+.\" Copyright (C) 1994-2015  Werner Lemberg <wl@gnu.org>
 .\"
 .\" This program is free software; you can redistribute it and/or modify
 .\" it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
 .\" Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
 .\" MA 02110-1301 USA
 .
-.TH BG5CONV 1 07-May-2012 "CJK Version 4.8.3"
+.TH BG5CONV 1 18-Apr-2015 "CJK Version 4.8.4"
 .
 .\" ====
 .\" ==== macro definitions
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.3/Bg5conv/bg5conv.c b/Build/source/texk/cjkutils/cjkutils-4.8.4/Bg5conv/bg5conv.c
index e3a366fd1d3..b745e6a97f5 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.3/Bg5conv/bg5conv.c
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.4/Bg5conv/bg5conv.c
@@ -1,8 +1,8 @@
 #define banner  \
-"bg5conv (CJK ver. 4.8.3)" \
+"bg5conv (CJK ver. 4.8.4)" \
 
 /*2:*/
-#line 94 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/Bg5conv/bg5conv.w"
+#line 94 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/Bg5conv/bg5conv.w"
 
 #include <stdio.h> 
 #include <stdlib.h> 
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.3/Bg5conv/bg5conv.w b/Build/source/texk/cjkutils/cjkutils-4.8.4/Bg5conv/bg5conv.w
index 23f520f181f..13165032d66 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.3/Bg5conv/bg5conv.w
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.4/Bg5conv/bg5conv.w
@@ -1,6 +1,6 @@
-% This is the cweb file bg5conv.w of the CJK Package Ver. 4.8.3  07-May-2012
+% This is the cweb file bg5conv.w of the CJK Package Ver. 4.8.4  18-Apr-2015
 
-% Copyright (C) 1994-2012  Werner Lemberg <wl@@gnu.org>
+% Copyright (C) 1994-2015  Werner Lemberg <wl@@gnu.org>
 %
 % This program is free software; you can redistribute it and/or modify
 % it under the terms of the GNU General Public License as published by
@@ -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.3)}
+\def\title{bg5conv (CJK Version 4.8.4)}
 
 \def\topofcontents{
   \null\vfill
   \centerline{\titlefont The {\ttitlefont bg5conv} program}
   \vskip 20pt
-  \centerline{(CJK Version 4.8.3)}
+  \centerline{(CJK Version 4.8.4)}
   \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.3)"
+"bg5conv (CJK ver. 4.8.4)"
 
 @c
 #include <stdio.h>
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.3/Bg5conv/bg5latex b/Build/source/texk/cjkutils/cjkutils-4.8.4/Bg5conv/bg5latex
index 1839e354680..2540f9524d8 100755
--- a/Build/source/texk/cjkutils/cjkutils-4.8.3/Bg5conv/bg5latex
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.4/Bg5conv/bg5latex
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# Copyright (C) 1994-2012  Werner Lemberg <wl@gnu.org>
+# Copyright (C) 1994-2015  Werner Lemberg <wl@gnu.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.3/Bg5conv/bg5latex.bat b/Build/source/texk/cjkutils/cjkutils-4.8.4/Bg5conv/bg5latex.bat
index 91e7dfd8575..91e7dfd8575 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.3/Bg5conv/bg5latex.bat
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.4/Bg5conv/bg5latex.bat
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.3/Bg5conv/bg5latex.cmd b/Build/source/texk/cjkutils/cjkutils-4.8.4/Bg5conv/bg5latex.cmd
index 24c8a2fbdf0..facf871970c 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.3/Bg5conv/bg5latex.cmd
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.4/Bg5conv/bg5latex.cmd
@@ -1,9 +1,9 @@
 /*----------------------------------------------------------------------*\

     bg5latex.cmd

 

-    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.4

 

-    Copyright (C) 1994-2012  Wonkoo Kim <wkim+@pitt.edu>

+    Copyright (C) 1994-2015  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.3/Bg5conv/bg5pdflatex b/Build/source/texk/cjkutils/cjkutils-4.8.4/Bg5conv/bg5pdflatex
index 685c3c2228b..9adacad3a68 100755
--- a/Build/source/texk/cjkutils/cjkutils-4.8.3/Bg5conv/bg5pdflatex
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.4/Bg5conv/bg5pdflatex
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# Copyright (C) 1994-2012  Werner Lemberg <wl@gnu.org>
+# Copyright (C) 1994-2015  Werner Lemberg <wl@gnu.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.3/CEFconv/cef5conv.1 b/Build/source/texk/cjkutils/cjkutils-4.8.4/CEFconv/cef5conv.1
index e1d2c6a7ad8..d04c5271029 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.3/CEFconv/cef5conv.1
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.4/CEFconv/cef5conv.1
@@ -1,5 +1,5 @@
 .\" man page for cef5conv
-.\" Copyright (C) 1994-2012  Werner Lemberg <wl@gnu.org>
+.\" Copyright (C) 1994-2015  Werner Lemberg <wl@gnu.org>
 .\"
 .\" This program is free software; you can redistribute it and/or modify
 .\" it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
 .\" Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
 .\" MA 02110-1301 USA
 .
-.TH CEF5CONV 1 07-May-2012 "CJK Version 4.8.3"
+.TH CEF5CONV 1 18-Apr-2015 "CJK Version 4.8.4"
 .
 .\" ====
 .\" ==== macro definitions
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.3/CEFconv/cef5conv.c b/Build/source/texk/cjkutils/cjkutils-4.8.4/CEFconv/cef5conv.c
index 05355b13085..46228a1f5de 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.3/CEFconv/cef5conv.c
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.4/CEFconv/cef5conv.c
@@ -1,8 +1,8 @@
 #define banner  \
-"cef5conv (CJK ver. 4.8.3)" \
+"cef5conv (CJK ver. 4.8.4)" \
 
 /*2:*/
-#line 108 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/CEFconv/cef5conv.w"
+#line 108 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/CEFconv/cef5conv.w"
 
 #include <ctype.h> 
 #include <stdio.h> 
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.3/CEFconv/cef5conv.w b/Build/source/texk/cjkutils/cjkutils-4.8.4/CEFconv/cef5conv.w
index c8630fdc8b9..575ba253aea 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.3/CEFconv/cef5conv.w
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.4/CEFconv/cef5conv.w
@@ -1,6 +1,6 @@
-% This is the cweb file cef5conv.w of the CJK Package Ver. 4.8.3  07-May-2012
+% This is the cweb file cef5conv.w of the CJK Package Ver. 4.8.4  18-Apr-2015
 
-% Copyright (C) 1994-2012  Werner Lemberg <wl@@gnu.org>
+% Copyright (C) 1994-2015  Werner Lemberg <wl@@gnu.org>
 %
 % This program is free software; you can redistribute it and/or modify
 % it under the terms of the GNU General Public License as published by
@@ -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.3)}
+\def\title{cef5conv (CJK Version 4.8.4)}
 
 \def\topofcontents{
   \null\vfill
   \centerline{\titlefont The {\ttitlefont cef5conv} program}
   \vskip 20pt
-  \centerline{(CJK Version 4.8.3)}
+  \centerline{(CJK Version 4.8.4)}
   \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.3)"
+"cef5conv (CJK ver. 4.8.4)"
 
 @c
 #include <ctype.h>
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.3/CEFconv/cef5latex b/Build/source/texk/cjkutils/cjkutils-4.8.4/CEFconv/cef5latex
index e729c27d4c7..1b51a711d1b 100755
--- a/Build/source/texk/cjkutils/cjkutils-4.8.3/CEFconv/cef5latex
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.4/CEFconv/cef5latex
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# Copyright (C) 1994-2012  Werner Lemberg <wl@gnu.org>
+# Copyright (C) 1994-2015  Werner Lemberg <wl@gnu.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.3/CEFconv/cef5ltx.bat b/Build/source/texk/cjkutils/cjkutils-4.8.4/CEFconv/cef5ltx.bat
index 187485301f9..187485301f9 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.3/CEFconv/cef5ltx.bat
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.4/CEFconv/cef5ltx.bat
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.3/CEFconv/cef5ltx.cmd b/Build/source/texk/cjkutils/cjkutils-4.8.4/CEFconv/cef5ltx.cmd
index cd3ebb5650b..f089e831c62 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.3/CEFconv/cef5ltx.cmd
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.4/CEFconv/cef5ltx.cmd
@@ -1,11 +1,11 @@
 /*----------------------------------------------------------------------*\

     cef5ltx.cmd

 

-    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.4

 

-    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.4

 

-    Copyright (C) 1994-2012  Wonkoo Kim <wkim+@pitt.edu>

+    Copyright (C) 1994-2015  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.3/CEFconv/cef5pdflatex b/Build/source/texk/cjkutils/cjkutils-4.8.4/CEFconv/cef5pdflatex
index 7ff040cbfaa..1ae7b5953ef 100755
--- a/Build/source/texk/cjkutils/cjkutils-4.8.3/CEFconv/cef5pdflatex
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.4/CEFconv/cef5pdflatex
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# Copyright (C) 1994-2012  Werner Lemberg <wl@gnu.org>
+# Copyright (C) 1994-2015  Werner Lemberg <wl@gnu.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.3/CEFconv/cefconv.1 b/Build/source/texk/cjkutils/cjkutils-4.8.4/CEFconv/cefconv.1
index 312740d7d1c..7be7fae6ba8 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.3/CEFconv/cefconv.1
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.4/CEFconv/cefconv.1
@@ -1,5 +1,5 @@
 .\" man page for cefconv
-.\" Copyright (C) 1994-2012  Werner Lemberg <wl@gnu.org>
+.\" Copyright (C) 1994-2015  Werner Lemberg <wl@gnu.org>
 .\"
 .\" This program is free software; you can redistribute it and/or modify
 .\" it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
 .\" Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
 .\" MA 02110-1301 USA
 .
-.TH CEFCONV 1 07-May-2012 "CJK Version 4.8.3"
+.TH CEFCONV 1 18-Apr-2015 "CJK Version 4.8.4"
 .
 .\" ====
 .\" ==== macro definitions
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.3/CEFconv/cefconv.c b/Build/source/texk/cjkutils/cjkutils-4.8.4/CEFconv/cefconv.c
index b60b8682580..967672e7938 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.3/CEFconv/cefconv.c
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.4/CEFconv/cefconv.c
@@ -1,8 +1,8 @@
 #define banner  \
-"cefconv (CJK ver. 4.8.3)" \
+"cefconv (CJK ver. 4.8.4)" \
 
 /*2:*/
-#line 100 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/CEFconv/cefconv.w"
+#line 100 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/CEFconv/cefconv.w"
 
 #include <ctype.h> 
 #include <stdio.h> 
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.3/CEFconv/cefconv.w b/Build/source/texk/cjkutils/cjkutils-4.8.4/CEFconv/cefconv.w
index 909f93ec2d3..142a5d862be 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.3/CEFconv/cefconv.w
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.4/CEFconv/cefconv.w
@@ -1,6 +1,6 @@
-% This is the cweb file cefconv.w of the CJK Package Ver. 4.8.3  07-May-2012
+% This is the cweb file cefconv.w of the CJK Package Ver. 4.8.4  18-Apr-2015
 
-% Copyright (C) 1994-2012  Werner Lemberg <wl@@gnu.org>
+% Copyright (C) 1994-2015  Werner Lemberg <wl@@gnu.org>
 %
 % This program is free software; you can redistribute it and/or modify
 % it under the terms of the GNU General Public License as published by
@@ -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.3)}
+\def\title{cefconv (CJK Version 4.8.4)}
 
 \def\topofcontents{
   \null\vfill
   \centerline{\titlefont The {\ttitlefont cefconv} program}
   \vskip 20pt
-  \centerline{(CJK Version 4.8.3)}
+  \centerline{(CJK Version 4.8.4)}
   \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.3)"
+"cefconv (CJK ver. 4.8.4)"
 
 @c
 #include <ctype.h>
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.3/CEFconv/ceflatex b/Build/source/texk/cjkutils/cjkutils-4.8.4/CEFconv/ceflatex
index 4c1d5eb3936..79bcd8abe36 100755
--- a/Build/source/texk/cjkutils/cjkutils-4.8.3/CEFconv/ceflatex
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.4/CEFconv/ceflatex
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# Copyright (C) 1994-2012  Werner Lemberg <wl@gnu.org>
+# Copyright (C) 1994-2015  Werner Lemberg <wl@gnu.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.3/CEFconv/ceflatex.bat b/Build/source/texk/cjkutils/cjkutils-4.8.4/CEFconv/ceflatex.bat
index ba5925a6df3..ba5925a6df3 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.3/CEFconv/ceflatex.bat
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.4/CEFconv/ceflatex.bat
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.3/CEFconv/ceflatex.cmd b/Build/source/texk/cjkutils/cjkutils-4.8.4/CEFconv/ceflatex.cmd
index 8209d0aeea7..dcc3183431e 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.3/CEFconv/ceflatex.cmd
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.4/CEFconv/ceflatex.cmd
@@ -1,11 +1,11 @@
 /*----------------------------------------------------------------------*\

     ceflatex.cmd

 

-    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.4

 

-    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.4

 

-    Copyright (C) 1994-2012  Wonkoo Kim <wkim+@pitt.edu>

+    Copyright (C) 1994-2015  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.3/CEFconv/cefpdflatex b/Build/source/texk/cjkutils/cjkutils-4.8.4/CEFconv/cefpdflatex
index db653b6f65a..c1b776cffdf 100755
--- a/Build/source/texk/cjkutils/cjkutils-4.8.3/CEFconv/cefpdflatex
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.4/CEFconv/cefpdflatex
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# Copyright (C) 1994-2012  Werner Lemberg <wl@gnu.org>
+# Copyright (C) 1994-2015  Werner Lemberg <wl@gnu.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.3/CEFconv/cefsconv.1 b/Build/source/texk/cjkutils/cjkutils-4.8.4/CEFconv/cefsconv.1
index d9c2d578acd..4c38133298e 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.3/CEFconv/cefsconv.1
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.4/CEFconv/cefsconv.1
@@ -1,5 +1,5 @@
 .\" man page for cefsconv
-.\" Copyright (C) 1994-2012  Werner Lemberg <wl@gnu.org>
+.\" Copyright (C) 1994-2015  Werner Lemberg <wl@gnu.org>
 .\"
 .\" This program is free software; you can redistribute it and/or modify
 .\" it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
 .\" Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
 .\" MA 02110-1301 USA
 .
-.TH CEFSCONV 1 07-May-2012 "CJK Version 4.8.3"
+.TH CEFSCONV 1 18-Apr-2015 "CJK Version 4.8.4"
 .
 .\" ====
 .\" ==== macro definitions
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.3/CEFconv/cefsconv.c b/Build/source/texk/cjkutils/cjkutils-4.8.4/CEFconv/cefsconv.c
index a4b7eb9f7c3..bd4a701ffc5 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.3/CEFconv/cefsconv.c
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.4/CEFconv/cefsconv.c
@@ -1,8 +1,8 @@
 #define banner  \
-"cefsconv (CJK ver. 4.8.3)" \
+"cefsconv (CJK ver. 4.8.4)" \
 
 /*2:*/
-#line 111 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/CEFconv/cefsconv.w"
+#line 111 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/CEFconv/cefsconv.w"
 
 #include <ctype.h> 
 #include <stdio.h> 
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.3/CEFconv/cefsconv.w b/Build/source/texk/cjkutils/cjkutils-4.8.4/CEFconv/cefsconv.w
index bcb7118a84e..7e033f34ea4 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.3/CEFconv/cefsconv.w
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.4/CEFconv/cefsconv.w
@@ -1,6 +1,6 @@
-% This is the cweb file cefsconv.w of the CJK Package Ver. 4.8.3  07-May-2012
+% This is the cweb file cefsconv.w of the CJK Package Ver. 4.8.4  18-Apr-2015
 
-% Copyright (C) 1994-2012  Werner Lemberg <wl@@gnu.org>
+% Copyright (C) 1994-2015  Werner Lemberg <wl@@gnu.org>
 %
 % This program is free software; you can redistribute it and/or modify
 % it under the terms of the GNU General Public License as published by
@@ -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.3)}
+\def\title{cefsconv (CJK Version 4.8.4)}
 
 \def\topofcontents{
   \null\vfill
   \centerline{\titlefont The {\ttitlefont cefsconv} program}
   \vskip 20pt
-  \centerline{(CJK Version 4.8.3)}
+  \centerline{(CJK Version 4.8.4)}
   \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.3)"
+"cefsconv (CJK ver. 4.8.4)"
 
 @c
 #include <ctype.h>
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.3/CEFconv/cefslatex b/Build/source/texk/cjkutils/cjkutils-4.8.4/CEFconv/cefslatex
index a7054b3c207..3d3daa175b1 100755
--- a/Build/source/texk/cjkutils/cjkutils-4.8.3/CEFconv/cefslatex
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.4/CEFconv/cefslatex
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# Copyright (C) 1994-2012  Werner Lemberg <wl@gnu.org>
+# Copyright (C) 1994-2015  Werner Lemberg <wl@gnu.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.3/CEFconv/cefsltx.bat b/Build/source/texk/cjkutils/cjkutils-4.8.4/CEFconv/cefsltx.bat
index 662ef9e3af4..662ef9e3af4 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.3/CEFconv/cefsltx.bat
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.4/CEFconv/cefsltx.bat
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.3/CEFconv/cefsltx.cmd b/Build/source/texk/cjkutils/cjkutils-4.8.4/CEFconv/cefsltx.cmd
index df42357b094..7150e8aad1b 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.3/CEFconv/cefsltx.cmd
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.4/CEFconv/cefsltx.cmd
@@ -1,11 +1,11 @@
 /*----------------------------------------------------------------------*\

     cefsltx.cmd

 

-    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.4

 

-    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.4

 

-    Copyright (C) 1994-2012  Wonkoo Kim <wkim+@pitt.edu>

+    Copyright (C) 1994-2015  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.3/CEFconv/cefspdflatex b/Build/source/texk/cjkutils/cjkutils-4.8.4/CEFconv/cefspdflatex
index d4cc95bff89..ed981d4dfb2 100755
--- a/Build/source/texk/cjkutils/cjkutils-4.8.3/CEFconv/cefspdflatex
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.4/CEFconv/cefspdflatex
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# Copyright (C) 1994-2012  Werner Lemberg <wl@gnu.org>
+# Copyright (C) 1994-2015  Werner Lemberg <wl@gnu.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.3/ChangeLog b/Build/source/texk/cjkutils/cjkutils-4.8.4/ChangeLog
index e7c27efe761..f943ead7ea7 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.3/ChangeLog
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.4/ChangeLog
@@ -1,3 +1,85 @@
+2015-04-18  Werner LEMBERG  <wl@gnu.org>
+
+	Version 4.8.4 released
+	======================
+
+	Set version to 4.8.4.
+
+	* doc/history.txt: Updated.
+
+	* Makefile (distsrc, distdoc): Use tar's `ustar' format.
+	Compress better.
+
+	Update headers in all text files.
+
+2015-04-18  Werner LEMBERG  <wl@gnu.org>
+
+	[hbf2gf] Update aux scripts.
+
+	* utils/hbf2gf/config.guess, utils/hbf2gf/config.sub,
+	utils/hbf2gf/install-sh: Updated to current versions.
+
+2014-08-31  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	[hbf2gf]: Avoid undefined behaviour when `char' is signed.
+
+	* utils/hbf2gf/hbf.c (match, add_property, skip_word, get_line): Use
+	proper cast.
+	* utils/hbf2gf/hbf2gf.w (fsearch, <Check for environment
+	variables>): Ditto.
+
+2014-08-31  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* utils/hbf2gf/hbf2hf.w (path_open): Drop unused variable.
+
+2014-06-28  Leo Liu  <leoliu.pku@gmail.com>
+
+	[CJKutf8] Fix space handing of non-CJK characters.
+
+	* texinput/CJKutf8.sty (\CJK@XX, \CJK@XXp, \CJK@XXX, \CJK@XXXp):
+	Only apply \CJK@ignorespaces for CJK characters (or rather, only for
+	multibyte sequences that don't map to a `\u8:...' macro).
+
+2012-09-13  Werner LEMBERG  <wl@gnu.org>
+
+	* examples/CJKutf8.tex: Add Greek.
+
+	This finally works due to the recent lgrx package which delivers
+	good Babel UTF8 support for LGR encoding.
+
+	An unsolved problem yet, however, is proper cut-and-paste support. 
+	While dvipdfmx properly generates CMaps for CJK encodings (even
+	for virtual fonts which pdftex doesn't handle at all), it doesn't
+	handle encodings like LGR correctly, something the `cmap' package
+	provides for pdflatex.
+
+2012-08-26  Werner LEMBERG  <wl@gnu.org>
+
+	* texinput/CJK.sty (\Unicode): Fix conditional to allow line breaks.
+
+	Problem reported by Jinsong Zhao <jszhao@yeah.net>; it seems that
+	this bug has been there since from the beginning.
+
+2012-06-21  Werner LEMBERG  <wl@gnu.org>
+
+	Make some commands robust.
+
+	* texinput/CJK.sty (\CJKtilde, \standardtilde, \CJKspace,
+	\CJKnospace): Use \DeclareRobustCommand.
+
+2012-05-20  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	[hbf2gf] Build fix for 64-bit Mac OS X 10.7.3.
+
+	* utils/hbf2gf/hbf2gf.w: Clang does not like non-static inline
+	functions as used here.  While at it, all local functions are
+	declared static.
+	Do not extend #ifdef HAVE_EMTEXDIR...#endif over several sections.
+
+2012-05-08  Werner LEMBERG  <wl@gnu.org>
+
+	* texlive/cjk.pl: Add missing file.
+
 2012-05-07  Werner LEMBERG  <wl@gnu.org>
 
 	Version 4.8.3 released
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.3/README b/Build/source/texk/cjkutils/cjkutils-4.8.4/README
index 6ff91c164e3..cf33f17eb75 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.3/README
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.4/README
@@ -1,11 +1,12 @@
-Welcome to CJK version 4.8.3 (07-May-2012), a LaTeX2e macro package which
+Welcome to CJK version 4.8.4 (18-Apr-2015), a LaTeX2e macro package which
 enables the use of CJK scripts (Chinese/Japanese/Korean) in various
 encodings, written by Werner Lemberg <wl@gnu.org>.
 
-A mailing list exists at cjk@ffii.org; bugs should be sent to
-cjk-bug@ffii.org.  To subscribe one of the lists, send a mail with the
-subject `subscribe' (without the quotes) to <list>-request@ffii.org, e.g.,
-cjk-request@ffii.org.
+A mailing list exists at cjk-list@nongnu.org; to subscribe, send a mail
+with the subject `subscribe' (without the quotes) to
+cjk-list-request@nongnu.org.  A web interface can be found at
+
+  https://lists.nongnu.org/mailman/listinfo/cjk-list
 
 If you are interested in the process of development you may observe
 
@@ -24,8 +25,8 @@ hosts and its mirrors in the directory <CTAN>/language/chinese.
 
 The package comes in two parts:
 
-    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,
+    cjk-4.8.4.tar.gz:       The source files. Needed for all platforms.
+    cjk-4.8.4-doc.tar.gz:   Preformatted documentation files: DVI, PS,
                             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.3/SJISconv/sjisconv.1 b/Build/source/texk/cjkutils/cjkutils-4.8.4/SJISconv/sjisconv.1
index 87eb59e4859..c385eb616d4 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.3/SJISconv/sjisconv.1
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.4/SJISconv/sjisconv.1
@@ -1,5 +1,5 @@
 .\" man page for sjisconv
-.\" Copyright (C) 1994-2012  Werner Lemberg <wl@gnu.org>
+.\" Copyright (C) 1994-2015  Werner Lemberg <wl@gnu.org>
 .\"
 .\" This program is free software; you can redistribute it and/or modify
 .\" it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
 .\" Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
 .\" MA 02110-1301 USA
 .
-.TH SJISCONV 1 07-May-2012 "CJK Version 4.8.3"
+.TH SJISCONV 1 18-Apr-2015 "CJK Version 4.8.4"
 .
 .\" ====
 .\" ==== macro definitions
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.3/SJISconv/sjisconv.c b/Build/source/texk/cjkutils/cjkutils-4.8.4/SJISconv/sjisconv.c
index 5fd6ac1e214..af121e555d3 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.3/SJISconv/sjisconv.c
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.4/SJISconv/sjisconv.c
@@ -1,8 +1,8 @@
 #define banner  \
-"sjisconv (CJK ver. 4.8.3)" \
+"sjisconv (CJK ver. 4.8.4)" \
 
 /*2:*/
-#line 96 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/SJISconv/sjisconv.w"
+#line 96 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/SJISconv/sjisconv.w"
 
 #include <stdio.h> 
 #include <stdlib.h> 
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.3/SJISconv/sjisconv.w b/Build/source/texk/cjkutils/cjkutils-4.8.4/SJISconv/sjisconv.w
index 8d81c07081f..c1044cf36d9 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.3/SJISconv/sjisconv.w
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.4/SJISconv/sjisconv.w
@@ -1,6 +1,6 @@
-% This is the cweb file sjisconv.w of the CJK Package Ver. 4.8.3  07-May-2012
+% This is the cweb file sjisconv.w of the CJK Package Ver. 4.8.4  18-Apr-2015
 
-% Copyright (C) 1994-2012  Werner Lemberg <wl@@gnu.org>
+% Copyright (C) 1994-2015  Werner Lemberg <wl@@gnu.org>
 %
 % This program is free software; you can redistribute it and/or modify
 % it under the terms of the GNU General Public License as published by
@@ -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.3)}
+\def\title{sjisconv (CJK Version 4.8.4)}
 
 \def\topofcontents{
   \null\vfill
   \centerline{\titlefont The {\ttitlefont sjisconv} program}
   \vskip 20pt
-  \centerline{(CJK Version 4.8.3)}
+  \centerline{(CJK Version 4.8.4)}
   \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.3)"
+"sjisconv (CJK ver. 4.8.4)"
 
 @c
 #include <stdio.h>
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.3/SJISconv/sjislatex b/Build/source/texk/cjkutils/cjkutils-4.8.4/SJISconv/sjislatex
index 077eec710e0..b1086cba768 100755
--- a/Build/source/texk/cjkutils/cjkutils-4.8.3/SJISconv/sjislatex
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.4/SJISconv/sjislatex
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# Copyright (C) 1994-2012  Werner Lemberg <wl@gnu.org>
+# Copyright (C) 1994-2015  Werner Lemberg <wl@gnu.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.3/SJISconv/sjisltx.bat b/Build/source/texk/cjkutils/cjkutils-4.8.4/SJISconv/sjisltx.bat
index 5702c113bdf..5702c113bdf 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.3/SJISconv/sjisltx.bat
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.4/SJISconv/sjisltx.bat
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.3/SJISconv/sjisltx.cmd b/Build/source/texk/cjkutils/cjkutils-4.8.4/SJISconv/sjisltx.cmd
index e6c72f9ff92..2ff4e03e54d 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.3/SJISconv/sjisltx.cmd
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.4/SJISconv/sjisltx.cmd
@@ -1,9 +1,9 @@
 /*----------------------------------------------------------------------*\

     sjisltx.cmd

 

-    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.4

 

-    Copyright (C) 1994-2012  Wonkoo Kim <wkim+@pitt.edu>

+    Copyright (C) 1994-2015  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.3/SJISconv/sjispdflatex b/Build/source/texk/cjkutils/cjkutils-4.8.4/SJISconv/sjispdflatex
index a1395cee780..651570da7f2 100755
--- a/Build/source/texk/cjkutils/cjkutils-4.8.3/SJISconv/sjispdflatex
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.4/SJISconv/sjispdflatex
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# Copyright (C) 1994-2012  Werner Lemberg <wl@gnu.org>
+# Copyright (C) 1994-2015  Werner Lemberg <wl@gnu.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.3/cjklatex/cjklatex.c b/Build/source/texk/cjkutils/cjkutils-4.8.4/cjklatex/cjklatex.c
index 822c6c1a449..678c1dd3a89 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.3/cjklatex/cjklatex.c
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.4/cjklatex/cjklatex.c
@@ -11,7 +11,7 @@
 #endif
 
 /*
-  Copyright (C) 2001-2012  F. Popineau <Fabrice.Popineau@supelec.fr>
+  Copyright (C) 2001-2015  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.3/extconv/bg5+latex b/Build/source/texk/cjkutils/cjkutils-4.8.4/extconv/bg5+latex
index 9fa75a712e3..82e706a44f7 100755
--- a/Build/source/texk/cjkutils/cjkutils-4.8.3/extconv/bg5+latex
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.4/extconv/bg5+latex
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# Copyright (C) 1994-2012  Werner Lemberg <wl@gnu.org>
+# Copyright (C) 1994-2015  Werner Lemberg <wl@gnu.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.3/extconv/bg5+pdflatex b/Build/source/texk/cjkutils/cjkutils-4.8.4/extconv/bg5+pdflatex
index 88bd7232116..16377e9dc17 100755
--- a/Build/source/texk/cjkutils/cjkutils-4.8.3/extconv/bg5+pdflatex
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.4/extconv/bg5+pdflatex
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# Copyright (C) 1994-2012  Werner Lemberg <wl@gnu.org>
+# Copyright (C) 1994-2015  Werner Lemberg <wl@gnu.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.3/extconv/bg5pltx.bat b/Build/source/texk/cjkutils/cjkutils-4.8.4/extconv/bg5pltx.bat
index ccc6c76acd5..ccc6c76acd5 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.3/extconv/bg5pltx.bat
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.4/extconv/bg5pltx.bat
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.3/extconv/bg5pltx.cmd b/Build/source/texk/cjkutils/cjkutils-4.8.4/extconv/bg5pltx.cmd
index cf65f69393b..69a94952089 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.3/extconv/bg5pltx.cmd
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.4/extconv/bg5pltx.cmd
@@ -1,9 +1,9 @@
 /*----------------------------------------------------------------------*\

     bg5pltx.cmd

 

-    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.4

 

-    Copyright (C) 1994-2012 Wonkoo Kim <wkim+@pitt.edu>

+    Copyright (C) 1994-2015 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.3/extconv/extconv.1 b/Build/source/texk/cjkutils/cjkutils-4.8.4/extconv/extconv.1
index e09bfefb544..1ef4b011d84 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.3/extconv/extconv.1
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.4/extconv/extconv.1
@@ -1,6 +1,6 @@
 .\" man page for bg5conv
 .\"
-.\" Copyright (C) 1994-2012  Werner Lemberg <wl@gnu.org>
+.\" Copyright (C) 1994-2015  Werner Lemberg <wl@gnu.org>
 .\"
 .\" This program is free software; you can redistribute it and/or modify
 .\" it under the terms of the GNU General Public License as published by
@@ -17,7 +17,7 @@
 .\" Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
 .\" MA 02110-1301 USA
 .
-.TH EXTCONV 1 07-May-2012 "CJK Version 4.8.3"
+.TH EXTCONV 1 18-Apr-2015 "CJK Version 4.8.4"
 .
 .\" ====
 .\" ==== macro definitions
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.3/extconv/extconv.c b/Build/source/texk/cjkutils/cjkutils-4.8.4/extconv/extconv.c
index b57130f4ee3..fdba62551c4 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.3/extconv/extconv.c
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.4/extconv/extconv.c
@@ -1,8 +1,8 @@
 #define banner  \
-"extconv (CJK ver. 4.8.3)" \
+"extconv (CJK ver. 4.8.4)" \
 
 /*2:*/
-#line 94 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/extconv/extconv.w"
+#line 94 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/extconv/extconv.w"
 
 #include <stdio.h> 
 #include <stdlib.h> 
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.3/extconv/extconv.w b/Build/source/texk/cjkutils/cjkutils-4.8.4/extconv/extconv.w
index f415466a4fb..019976889b9 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.3/extconv/extconv.w
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.4/extconv/extconv.w
@@ -1,6 +1,6 @@
-% This is the cweb file extconv.w of the CJK Package Ver. 4.8.3  07-May-2012
+% This is the cweb file extconv.w of the CJK Package Ver. 4.8.4  18-Apr-2015
 
-% Copyright (C) 1994-2012  Werner Lemberg <wl@@gnu.org>
+% Copyright (C) 1994-2015  Werner Lemberg <wl@@gnu.org>
 %
 % This program is free software; you can redistribute it and/or modify
 % it under the terms of the GNU General Public License as published by
@@ -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.3)}
+\def\title{extconv (CJK Version 4.8.4)}
 
 \def\topofcontents{
   \null\vfill
   \centerline{\titlefont The {\ttitlefont extconv} program}
   \vskip 20pt
-  \centerline{(CJK Version 4.8.3)}
+  \centerline{(CJK Version 4.8.4)}
   \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.3)"
+"extconv (CJK ver. 4.8.4)"
 
 @c
 #include <stdio.h>
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.3/extconv/gbklatex b/Build/source/texk/cjkutils/cjkutils-4.8.4/extconv/gbklatex
index 9fa75a712e3..82e706a44f7 100755
--- a/Build/source/texk/cjkutils/cjkutils-4.8.3/extconv/gbklatex
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.4/extconv/gbklatex
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# Copyright (C) 1994-2012  Werner Lemberg <wl@gnu.org>
+# Copyright (C) 1994-2015  Werner Lemberg <wl@gnu.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.3/extconv/gbklatex.bat b/Build/source/texk/cjkutils/cjkutils-4.8.4/extconv/gbklatex.bat
index ccc6c76acd5..ccc6c76acd5 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.3/extconv/gbklatex.bat
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.4/extconv/gbklatex.bat
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.3/extconv/gbklatex.cmd b/Build/source/texk/cjkutils/cjkutils-4.8.4/extconv/gbklatex.cmd
index e831e7424a3..9bd1237934a 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.3/extconv/gbklatex.cmd
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.4/extconv/gbklatex.cmd
@@ -1,9 +1,9 @@
 /*----------------------------------------------------------------------*\

     gbklatex.cmd

 

-    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.4

 

-    Copyright (C) 1994-2012 Wonkoo Kim <wkim+@pitt.edu>

+    Copyright (C) 1994-2015 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.3/extconv/gbkpdflatex b/Build/source/texk/cjkutils/cjkutils-4.8.4/extconv/gbkpdflatex
index 88bd7232116..16377e9dc17 100755
--- a/Build/source/texk/cjkutils/cjkutils-4.8.3/extconv/gbkpdflatex
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.4/extconv/gbkpdflatex
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# Copyright (C) 1994-2012  Werner Lemberg <wl@gnu.org>
+# Copyright (C) 1994-2015  Werner Lemberg <wl@gnu.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/Makefile.gnu b/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/Makefile.gnu
index f33001dac15..1248c4f508a 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/Makefile.gnu
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/Makefile.gnu
@@ -1,6 +1,6 @@
-# This file is part of the CJK package Version 4.8.3 (07-May-2012)
+# This file is part of the CJK package Version 4.8.4 (18-Apr-2015)
 
-# Copyright (C) 1994-2012  Werner Lemberg <wl@gnu.org>
+# Copyright (C) 1994-2015  Werner Lemberg <wl@gnu.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/Makefile.in b/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/Makefile.in
index 7f40c2c6080..937d5d6f818 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/Makefile.in
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/Makefile.in
@@ -1,6 +1,6 @@
 # Makefile for hbf2gf -- wl@gnu.org
 
-# Copyright (C) 1994-2012  Werner Lemberg <wl@gnu.org>
+# Copyright (C) 1994-2015  Werner Lemberg <wl@gnu.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/README b/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/README
index a7de0ec1402..a7de0ec1402 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/README
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/README
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/cfg/README b/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/cfg/README
index 689d59e7397..689d59e7397 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/cfg/README
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/cfg/README
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/cfg/b5ka12.cfg b/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/cfg/b5ka12.cfg
index f5c142f0235..f5c142f0235 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/cfg/b5ka12.cfg
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/cfg/b5ka12.cfg
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/cfg/b5kr12.cfg b/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/cfg/b5kr12.cfg
index 9d9da2c1a2f..9d9da2c1a2f 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/cfg/b5kr12.cfg
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/cfg/b5kr12.cfg
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/cfg/b5so12.cfg b/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/cfg/b5so12.cfg
index dc0bcd9fbf0..dc0bcd9fbf0 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/cfg/b5so12.cfg
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/cfg/b5so12.cfg
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/cfg/c1so12.cfg b/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/cfg/c1so12.cfg
index de5b32b3efc..de5b32b3efc 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/cfg/c1so12.cfg
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/cfg/c1so12.cfg
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/cfg/c2so12.cfg b/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/cfg/c2so12.cfg
index 969af8fae14..969af8fae14 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/cfg/c2so12.cfg
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/cfg/c2so12.cfg
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/cfg/c3so12.cfg b/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/cfg/c3so12.cfg
index 0e65768ee5e..0e65768ee5e 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/cfg/c3so12.cfg
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/cfg/c3so12.cfg
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/cfg/c4so12.cfg b/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/cfg/c4so12.cfg
index 8ea3a8b270c..8ea3a8b270c 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/cfg/c4so12.cfg
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/cfg/c4so12.cfg
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/cfg/c5so12.cfg b/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/cfg/c5so12.cfg
index 1b81c90a0d3..1b81c90a0d3 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/cfg/c5so12.cfg
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/cfg/c5so12.cfg
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/cfg/c6so12.cfg b/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/cfg/c6so12.cfg
index 5b9c912ce53..5b9c912ce53 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/cfg/c6so12.cfg
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/cfg/c6so12.cfg
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/cfg/c7so12.cfg b/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/cfg/c7so12.cfg
index 051b2601426..051b2601426 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/cfg/c7so12.cfg
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/cfg/c7so12.cfg
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/cfg/csso12.cfg b/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/cfg/csso12.cfg
index 9ad91b0c574..9ad91b0c574 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/cfg/csso12.cfg
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/cfg/csso12.cfg
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/cfg/gsfs14.cfg b/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/cfg/gsfs14.cfg
index 4b397aca464..4b397aca464 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/cfg/gsfs14.cfg
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/cfg/gsfs14.cfg
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/cfg/j2so12.cfg b/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/cfg/j2so12.cfg
index 7e0d70b5c0f..7e0d70b5c0f 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/cfg/j2so12.cfg
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/cfg/j2so12.cfg
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/cfg/jsso12.cfg b/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/cfg/jsso12.cfg
index 9bdfc7b1e8a..9bdfc7b1e8a 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/cfg/jsso12.cfg
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/cfg/jsso12.cfg
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/cfg/ksso17.cfg b/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/cfg/ksso17.cfg
index c82f7e7eee4..c82f7e7eee4 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/cfg/ksso17.cfg
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/cfg/ksso17.cfg
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/configure.ac b/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/configure.ac
index 14bbfb7c447..4c28719516c 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/configure.ac
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/configure.ac
@@ -1,6 +1,6 @@
-dnl This file is part of the CJK package ver. 4.8.3
+dnl This file is part of the CJK package ver. 4.8.4
 
-dnl Copyright (C) 1994-2012  Werner Lemberg <wl@gnu.org>
+dnl Copyright (C) 1994-2015  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.3/hbf2gf/dvidrv.btm b/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/dvidrv.btm
index dba59adb309..4ec03d0bf20 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/dvidrv.btm
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/dvidrv.btm
@@ -1,6 +1,6 @@
 setdos /y1
 ::
-:: Copyright (C) 1994-2012  Werner Lemberg <wl@gnu.org>
+:: Copyright (C) 1994-2015  Werner Lemberg <wl@gnu.org>
 ::
 :: This program is free software; you can redistribute it and/or modify
 :: it under the terms of the GNU General Public License as published by
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/emdir.c b/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/emdir.c
index 4e759c83eb2..4e759c83eb2 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/emdir.c
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/emdir.c
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/emdir.h b/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/emdir.h
index 0606d476ab1..0606d476ab1 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/emdir.h
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/emdir.h
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/emtexdir.c b/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/emtexdir.c
index 9a35570adb3..9a35570adb3 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/emtexdir.c
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/emtexdir.c
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/emtexdir.h b/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/emtexdir.h
index a9a986db05b..a9a986db05b 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/emtexdir.h
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/emtexdir.h
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/hbf.c b/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/hbf.c
index dedb9650b21..dedb9650b21 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/hbf.c
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/hbf.c
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/hbf.h b/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/hbf.h
index 34f5940a71b..34f5940a71b 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/hbf.h
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/hbf.h
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/hbf2gf.1 b/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/hbf2gf.1
index 55bfddf57fa..144e7e68930 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/hbf2gf.1
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/hbf2gf.1
@@ -1,6 +1,6 @@
 .\" man page for hbf2gf
 .\"
-.\" Copyright (C) 1994-2012  Werner Lemberg <wl@gnu.org>
+.\" Copyright (C) 1994-2015  Werner Lemberg <wl@gnu.org>
 .\"
 .\" This program is free software; you can redistribute it and/or modify
 .\" it under the terms of the GNU General Public License as published by
@@ -18,7 +18,7 @@
 .\" MA 02110-1301 USA
 .\"
 .
-.TH HBF2GF 1 07-May-2012 "CJK Version 4.8.3"
+.TH HBF2GF 1 18-Apr-2015 "CJK Version 4.8.4"
 .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.3/hbf2gf/hbf2gf.c b/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/hbf2gf.c
index 1c1d0358a39..1e250496a64 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/hbf2gf.c
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/hbf2gf.c
@@ -1,5 +1,5 @@
 #define banner  \
-"hbf2gf (CJK ver. 4.8.3)" \
+"hbf2gf (CJK ver. 4.8.4)" \
  \
 
 #define TRUE 1
@@ -100,10 +100,10 @@
 #define VALID_SUBCODE 1 \
 
 /*4:*/
-#line 191 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
+#line 191 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
 
 /*10:*/
-#line 408 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
+#line 408 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
 
 #ifdef HAVE_CONFIG_H
 #include <c-auto.h> 
@@ -121,7 +121,7 @@
 
 
 /*:10*//*69:*/
-#line 2469 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
+#line 2473 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
 
 #if defined(HAVE_LIBKPATHSEA)
 #include "kpathsea/kpathsea.h"
@@ -134,47 +134,48 @@
 #endif
 
 /*:69*/
-#line 192 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
+#line 192 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
 
 /*11:*/
-#line 429 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
+#line 429 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
 
-void write_file(void);
+static void write_file(void);
 
 
 /*:11*//*13:*/
-#line 491 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
+#line 491 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
 
-void write_pre(void);
+static void write_pre(void);
 
 
 /*:13*//*16:*/
-#line 579 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
+#line 579 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
 
-void write_data(void);
+static void write_data(void);
 
 
 /*:16*//*20:*/
-#line 690 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
+#line 690 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
 
-void write_post(void);
+static void write_post(void);
 
 
 /*:20*//*25:*/
-#line 834 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
+#line 834 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
 
-void fputl(long,FILE*);
+static void fputl(long,FILE*);
 
 
 /*:25*//*29:*/
-#line 994 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
+#line 994 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
 
-void make_pixel_array(void);
+static void make_pixel_array(void);
 
 
 /*:29*//*36:*/
-#line 1222 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
+#line 1222 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
 
+static
 #ifdef __GNUC__
 __inline__
 #endif
@@ -182,8 +183,9 @@ void read_row(unsigned char*);
 
 
 /*:36*//*39:*/
-#line 1272 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
+#line 1274 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
 
+static
 #ifdef __GNUC__
 __inline__
 #endif
@@ -191,75 +193,75 @@ void write_row(unsigned char*);
 
 
 /*:39*//*41:*/
-#line 1325 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
+#line 1329 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
 
-void write_coding(void);
+static void write_coding(void);
 
 
 /*:41*//*45:*/
-#line 1486 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
+#line 1490 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
 
-void write_pl(void);
+static void write_pl(void);
 
 
 /*:45*//*47:*/
-#line 1583 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
+#line 1587 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
 
-void write_ovp(void);
+static void write_ovp(void);
 
 
 /*:47*//*50:*/
-#line 1728 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
+#line 1732 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
 
-void write_job(void);
+static void write_job(void);
 
 
 /*:50*//*54:*/
-#line 1977 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
+#line 1981 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
 
-void read_config(void);
+static void read_config(void);
 
 
 /*:54*//*64:*/
-#line 2308 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
+#line 2312 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
 
-int fsearch(const char*);
+static int fsearch(const char*);
 
 
 /*:64*//*67:*/
-#line 2447 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
+#line 2451 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
 
-void config_error(const char*);
+static void config_error(const char*);
 
 
 /*:67*//*71:*/
-#line 2490 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
+#line 2494 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
 
-const char*TeX_search_version(void);
+static const char*TeX_search_version(void);
 
 
 /*:71*//*74:*/
-#line 2525 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
+#line 2529 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
 
 #ifdef HAVE_EMTEXDIR
 extern int setup_list(struct emtex_dir*,char*,const char*,unsigned);
-int dir_setup(struct emtex_dir*,const char*,const char*,unsigned);
-char*file_find(char*,struct emtex_dir*);
+static int dir_setup(struct emtex_dir*,const char*,const char*,unsigned);
+static char*file_find(char*,struct emtex_dir*);
 #endif
 
 
 /*:74*//*79:*/
-#line 2613 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
+#line 2621 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
 
-char*TeX_search_cfg_file(char*);
-char*TeX_search_hbf_file(char*);
+static char*TeX_search_cfg_file(char*);
+static char*TeX_search_hbf_file(char*);
 
 
 /*:79*/
-#line 193 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
+#line 193 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
 
 /*2:*/
-#line 127 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
+#line 127 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
 
 int nmb_files= -1;
 int unicode= FALSE;
@@ -300,7 +302,7 @@ int end_of_file= FALSE;
 
 
 /*:2*//*15:*/
-#line 538 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
+#line 538 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
 
 long char_adr[256];
 long*char_adr_p;
@@ -342,7 +344,7 @@ int dot_count;
 
 
 /*:15*//*19:*/
-#line 667 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
+#line 667 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
 
 char coding[STRING_LENGTH+1];
 char comment[STRING_LENGTH+1];
@@ -361,7 +363,7 @@ double ppp_y;
 
 
 /*:19*//*27:*/
-#line 871 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
+#line 871 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
 
 HBF_CHAR code;
 const unsigned char*bitmap;
@@ -384,13 +386,13 @@ long s_mag_x,s_mag_y,s_slant;
 
 
 /*:27*//*38:*/
-#line 1267 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
+#line 1269 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
 
 int threshold= 128;
 
 
 /*:38*//*49:*/
-#line 1717 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
+#line 1721 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
 
 char job_extension[EXTENSION_LENGTH+1];
 char rm_command[STRING_LENGTH+1];
@@ -402,13 +404,13 @@ int ofm_file= FALSE;
 
 
 /*:49*//*53:*/
-#line 1972 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
+#line 1976 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
 
 char Buffer[STRING_LENGTH+1];
 
 
 /*:53*//*58:*/
-#line 2090 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
+#line 2094 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
 
 int offset_x;
 int offset_y;
@@ -417,13 +419,13 @@ HBF_CHAR user_min_char;
 int have_min_char= FALSE;
 
 /*:58*//*60:*/
-#line 2247 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
+#line 2251 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
 
 HBF_CHAR min_char,max_char;
 
 
 /*:60*//*62:*/
-#line 2274 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
+#line 2278 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
 
 char b2_codes[256];
 unsigned char min_2_byte,max_2_byte;
@@ -431,7 +433,7 @@ int nmb_2_bytes= 0;
 
 
 /*:62*//*70:*/
-#line 2481 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
+#line 2485 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
 
 #if defined(HAVE_EMTEXDIR)
 char emtex_version_string[]= "emTeXdir";
@@ -441,7 +443,7 @@ char no_version_string[]= "no search library";
 
 
 /*:70*//*73:*/
-#line 2518 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
+#line 2522 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
 
 #ifdef HAVE_EMTEXDIR
 struct emtex_dir cfg_path,hbf_path;
@@ -449,13 +451,15 @@ struct emtex_dir cfg_path,hbf_path;
 
 
 /*:73*//*76:*/
-#line 2564 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
+#line 2569 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
 
+#ifdef HAVE_EMTEXDIR
 char name_buffer[FILE_NAME_LENGTH+1];
+#endif
 
 
 /*:76*/
-#line 194 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
+#line 194 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
 
 
 
@@ -463,7 +467,7 @@ int main(int argc,char*argv[])
 {char*p;
 
 /*78:*/
-#line 2586 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
+#line 2594 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
 
 #if defined(HAVE_LIBKPATHSEA)
 kpse_set_program_name(argv[0],"hbf2gf");
@@ -484,16 +488,16 @@ exit(1);
 
 
 /*:78*/
-#line 200 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
+#line 200 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
 
 
 /*7:*/
-#line 307 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
+#line 307 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
 
 if(argc==2)
 {if(strcmp(argv[1],"--help")==0)
 /*6:*/
-#line 288 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
+#line 288 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
 
 {printf(USAGE);
 exit(0);
@@ -501,11 +505,11 @@ exit(0);
 
 
 /*:6*/
-#line 310 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
+#line 310 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
 
 else if(strcmp(argv[1],"--version")==0)
 /*5:*/
-#line 261 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
+#line 261 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
 
 {printf("\n");
 printf(banner);
@@ -516,7 +520,7 @@ exit(0);
 
 
 /*:5*/
-#line 312 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
+#line 312 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
 
 }
 
@@ -554,7 +558,7 @@ exit(1);
 
 
 /*:7*/
-#line 202 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
+#line 202 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
 
 
 if(!quiet)
@@ -583,7 +587,7 @@ read_config();
 
 if(mf_like)
 /*8:*/
-#line 352 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
+#line 352 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
 
 {if(unicode)
 file_number= (int)strtol(&argv[1][strlen(argv[1])-2],
@@ -611,11 +615,11 @@ y_scale= (double)x_resolution/y_scale;
 
 
 /*:8*/
-#line 229 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
+#line 229 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
 
 
 /*28:*/
-#line 903 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
+#line 903 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
 
 {int col,offset;
 
@@ -698,11 +702,11 @@ s_slant= slant*SCALE;
 
 
 /*:28*/
-#line 231 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
+#line 231 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
 
 
 /*9:*/
-#line 387 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
+#line 387 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
 
 {int j,max_numb;
 
@@ -724,7 +728,7 @@ nmb_files= j;
 
 
 /*:9*/
-#line 233 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
+#line 233 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
 
 
 if(tfm_files)
@@ -742,9 +746,9 @@ return 0;
 
 
 /*:4*//*12:*/
-#line 437 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
+#line 437 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
 
-void write_file(void)
+static void write_file(void)
 {char output_file[FILE_NAME_LENGTH+1];
 
 
@@ -786,9 +790,9 @@ write_data();
 
 
 /*:12*//*14:*/
-#line 498 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
+#line 498 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
 
-void write_pre(void)
+static void write_pre(void)
 {char out_s[40],s[20];
 time_t secs_now;
 struct tm*time_now;
@@ -809,15 +813,15 @@ fputs(out_s,out);
 
 
 /*:14*//*17:*/
-#line 584 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
+#line 584 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
 
-void write_data(void)
+static void write_data(void)
 {dot_count= 0;
 char_adr_p= char_adr;
 
 for(last_char= 0;(last_char<256)&&!end_of_file;last_char++)
 /*18:*/
-#line 609 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
+#line 609 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
 
 {if(dot_count++%10==0)
 if(pk_files&&!quiet)
@@ -861,15 +865,15 @@ fputc(EOC,out);
 
 
 /*:18*/
-#line 590 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
+#line 590 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
 
 }
 
 
 /*:17*//*21:*/
-#line 695 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
+#line 695 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
 
-void write_post(void)
+static void write_post(void)
 {long special_adr;
 long post_adr;
 
@@ -895,7 +899,7 @@ tfm_width= (tfm_output_size_x+2*tfm_offset_x)*_2_20;
 
 
 /*22:*/
-#line 741 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
+#line 741 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
 
 special_adr= ftell(out);
 
@@ -913,10 +917,10 @@ fputs(comment,out);
 
 
 /*:22*/
-#line 721 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
+#line 721 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
 
 /*23:*/
-#line 770 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
+#line 770 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
 
 post_adr= ftell(out);
 fputc(POST,out);
@@ -955,10 +959,10 @@ fputl(*char_adr_p++,out);
 
 
 /*:23*/
-#line 722 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
+#line 722 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
 
 /*24:*/
-#line 821 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
+#line 821 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
 
 fputc(POSTPOST,out);
 fputl(post_adr,out);
@@ -970,15 +974,15 @@ fputc(POSTPOST_ID,out);
 
 
 /*:24*/
-#line 723 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
+#line 723 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
 
 }
 
 
 /*:21*//*26:*/
-#line 839 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
+#line 839 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
 
-void fputl(long num,FILE*f)
+static void fputl(long num,FILE*f)
 {fputc(num>>24,f);
 fputc(num>>16,f);
 fputc(num>>8,f);
@@ -987,9 +991,9 @@ fputc(num,f);
 
 
 /*:26*//*30:*/
-#line 999 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
+#line 999 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
 
-void make_pixel_array(void)
+static void make_pixel_array(void)
 {unsigned char*prP;
 unsigned char*temp_prP;
 unsigned char*new_prP;
@@ -1025,7 +1029,7 @@ if(!bitmap)
 empty_char= TRUE;
 else
 /*31:*/
-#line 1058 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
+#line 1058 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
 
 {if(pk_output_size_y==input_size_y)
 temp_prP= prP;
@@ -1033,7 +1037,7 @@ temp_prP= prP;
 curr_row= input_size_y-1;
 for(row= 0;row<pk_output_size_y;++row)
 {/*32:*/
-#line 1072 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
+#line 1072 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
 
 if(pk_output_size_y==input_size_y)
 
@@ -1055,7 +1059,7 @@ need_to_read_row= 1;
 }
 
 /*33:*/
-#line 1099 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
+#line 1099 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
 
 if(need_to_read_row)
 if(rows_read<input_size_y)
@@ -1087,16 +1091,16 @@ frac_row_to_fill= SCALE;
 
 
 /*:33*/
-#line 1092 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
+#line 1092 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
 
 }
 
 
 /*:32*/
-#line 1064 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
+#line 1064 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
 
 /*34:*/
-#line 1140 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
+#line 1140 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
 
 if(pk_width==input_size_x&&s_slant==0)
 
@@ -1151,7 +1155,7 @@ frac_col_to_fill-= frac_col_left;
 }
 
 /*35:*/
-#line 1198 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
+#line 1198 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
 
 if(frac_col_to_fill> 0)
 {--xP;
@@ -1171,20 +1175,20 @@ write_row(new_prP);
 
 
 /*:35*/
-#line 1193 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
+#line 1193 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
 
 }
 
 
 /*:34*/
-#line 1066 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
+#line 1066 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
 
 }
 }
 
 
 /*:31*/
-#line 1035 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
+#line 1035 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
 
 }
 }
@@ -1208,8 +1212,9 @@ goto again;
 
 
 /*:30*//*37:*/
-#line 1230 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
+#line 1231 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
 
+static
 #ifdef __GNUC__
 __inline__
 #endif
@@ -1243,8 +1248,9 @@ bitshift= 7;
 
 
 /*:37*//*40:*/
-#line 1280 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
+#line 1283 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
 
+static
 #ifdef __GNUC__
 __inline__
 #endif
@@ -1259,9 +1265,9 @@ for(col= 0,xP= pixelrow;col<pk_output_size_x;++col,++xP)
 
 
 /*:40*//*42:*/
-#line 1333 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
+#line 1337 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
 
-void write_coding(void)
+static void write_coding(void)
 {register int count,skip;
 register unsigned char paint;
 register int x,y;
@@ -1276,7 +1282,7 @@ goto start;
 
 while(y<pk_output_size_y)
 {/*43:*/
-#line 1357 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
+#line 1361 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
 
 count= 0;
 x= 0;
@@ -1345,11 +1351,11 @@ continue;
 
 
 /*:43*/
-#line 1348 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
+#line 1352 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
 
 start:
 /*44:*/
-#line 1425 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
+#line 1429 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
 
 while(x<pk_output_size_x)
 {if(*cp==paint)
@@ -1390,7 +1396,7 @@ paint= WHITE;
 
 
 /*:44*/
-#line 1350 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
+#line 1354 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
 
 y++;
 }
@@ -1398,9 +1404,9 @@ y++;
 
 
 /*:42*//*46:*/
-#line 1491 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
+#line 1495 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
 
-void write_pl(void)
+static void write_pl(void)
 {int i,pos;
 char output_file[FILE_NAME_LENGTH+1];
 long t,sc;
@@ -1488,9 +1494,9 @@ fclose(out);
 
 
 /*:46*//*48:*/
-#line 1588 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
+#line 1592 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
 
-void write_ovp(void)
+static void write_ovp(void)
 {int c,i,nmb_subfonts,remainder,count,pos;
 char output_file[FILE_NAME_LENGTH+1];
 long t,sc;
@@ -1603,9 +1609,9 @@ fclose(out);
 
 
 /*:48*//*51:*/
-#line 1733 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
+#line 1737 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
 
-void write_job(void)
+static void write_job(void)
 {FILE*out;
 int i,j;
 char buffer[FILE_NAME_LENGTH+1];
@@ -1689,15 +1695,15 @@ fclose(out);
 
 
 /*:51*//*55:*/
-#line 1985 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
+#line 1989 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
 
-void read_config(void)
+static void read_config(void)
 {HBF_BBOX*boxp;
 char*real_config_file;
 
 
 /*56:*/
-#line 2037 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
+#line 2041 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
 
 {int i,lastext= -1;
 
@@ -1715,7 +1721,7 @@ strcat(config_file,".cfg");
 
 
 /*:56*/
-#line 1991 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
+#line 1995 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
 
 
 real_config_file= TeX_search_cfg_file(config_file);
@@ -1750,7 +1756,7 @@ exit(0);
 }
 
 /*57:*/
-#line 2054 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
+#line 2058 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
 
 {char hbf_header[STRING_LENGTH+1];
 char*real_hbf_header;
@@ -1787,10 +1793,10 @@ strcpy(output_name,Buffer);
 
 
 /*:57*/
-#line 2024 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
+#line 2028 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
 
 /*59:*/
-#line 2098 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
+#line 2102 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
 
 {if(fsearch("nmb_files"))
 nmb_files= atoi(Buffer);
@@ -1932,11 +1938,11 @@ job_extension[EXTENSION_LENGTH]= '\0';
 
 
 /*:59*/
-#line 2025 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
+#line 2029 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
 
 
 /*61:*/
-#line 2252 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
+#line 2256 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
 
 {const void*cp;
 HBF_CHAR dummy;
@@ -1951,10 +1957,10 @@ min_char= user_min_char;
 
 
 /*:61*/
-#line 2027 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
+#line 2031 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
 
 /*63:*/
-#line 2281 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
+#line 2285 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
 
 {const void*b2r;
 unsigned char dummy;
@@ -1977,7 +1983,7 @@ nmb_2_bytes++;
 
 
 /*:63*/
-#line 2028 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
+#line 2032 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
 
 
 fclose(config);
@@ -1985,9 +1991,9 @@ fclose(config);
 
 
 /*:55*//*65:*/
-#line 2313 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
+#line 2317 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
 
-int fsearch(const char*search_string)
+static int fsearch(const char*search_string)
 {char*P,p;
 const char*Q;
 char temp_buffer[STRING_LENGTH+1];
@@ -2002,7 +2008,7 @@ rewind(config);
 
 do
 {Q= search_string;
-p= tolower(*Q);
+p= tolower((unsigned char)*Q);
 Ch= fgetc(config);
 ch= tolower(Ch);
 while(!(ch==p&&old_ch=='\n')&&Ch!=EOF)
@@ -2019,7 +2025,7 @@ if((Ch= fgetc(config))==' '||Ch=='\t')
 
 goto success;
 Ch= fgetc(config);
-if(tolower(Ch)!=tolower(*Q))
+if(tolower(Ch)!=tolower((unsigned char)*Q))
 break;
 }
 }
@@ -2041,7 +2047,7 @@ Ch= fgetc(config);
 
 if(*temp_buffer)
 /*66:*/
-#line 2392 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
+#line 2396 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
 
 {P= temp_buffer;
 Buf_p= Buffer;
@@ -2059,14 +2065,14 @@ continue;
 }
 while(*P=='{')
 P++;
-if(!(isalpha(*P)||*P=='_'))
+if(!(isalpha((unsigned char)*P)||*P=='_'))
 {fprintf(stderr,
 "Invalid environment variable name in configuration file\n");
 exit(1);
 }
 *(env_p++)= *(P++);
 while(*P)
-{if(isalnum(*P)||*P=='_')
+{if(isalnum((unsigned char)*P)||*P=='_')
 *(env_p++)= *(P++);
 else
 {while(*P=='}')
@@ -2094,7 +2100,7 @@ count--;
 
 
 /*:66*/
-#line 2367 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
+#line 2371 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
 
 else
 *Buffer= '\0';
@@ -2104,9 +2110,9 @@ return(*Buffer)?1:0;
 
 
 /*:65*//*68:*/
-#line 2452 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
+#line 2456 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
 
-void config_error(const char*message)
+static void config_error(const char*message)
 {fprintf(stderr,"Couldn't find `%s' entry in configuration file\n",
 message);
 exit(1);
@@ -2115,9 +2121,9 @@ exit(1);
 
 
 /*:68*//*72:*/
-#line 2495 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
+#line 2499 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
 
-const char*TeX_search_version(void)
+static const char*TeX_search_version(void)
 {
 #if defined(HAVE_LIBKPATHSEA)
 return kpathsea_version_string;
@@ -2137,10 +2143,10 @@ return no_version_string;
 
 
 /*:72*//*75:*/
-#line 2537 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
+#line 2541 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
 
 #ifdef HAVE_EMTEXDIR
-int dir_setup(ed,env,dir,flags)
+static int dir_setup(ed,env,dir,flags)
 struct emtex_dir*ed;
 const char*env;
 const char*dir;
@@ -2162,12 +2168,14 @@ env);
 
 return TRUE;
 }
+#endif
 
 
 /*:75*//*77:*/
-#line 2569 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
+#line 2576 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
 
-char*file_find(name,list)
+#ifdef HAVE_EMTEXDIR
+static char*file_find(name,list)
 char*name;
 struct emtex_dir*list;
 
@@ -2180,34 +2188,34 @@ return NULL;
 
 
 /*:77*//*80:*/
-#line 2619 "/usr/local/home/wl/git/cjk/cjk-4.8.3/utils/hbf2gf/hbf2gf.w"
+#line 2627 "/usr/local/home/wl/git/cjk/cjk-4.8.4/utils/hbf2gf/hbf2gf.w"
 
 #if defined(HAVE_LIBKPATHSEA)
-char*TeX_search_cfg_file(char*name)
+static char*TeX_search_cfg_file(char*name)
 {
 return kpse_find_file(name,kpse_program_text_format,TRUE);
 }
 
 
-char*TeX_search_hbf_file(char*name)
+static char*TeX_search_hbf_file(char*name)
 {
 return kpse_find_file(name,kpse_miscfonts_format,TRUE);
 }
 
 
 #elif defined(HAVE_EMTEXDIR)
-char*TeX_search_cfg_file(char*name)
+static char*TeX_search_cfg_file(char*name)
 {return file_find(name,&cfg_path);
 }
 
 
-char*TeX_search_hbf_file(char*name)
+static char*TeX_search_hbf_file(char*name)
 {return file_find(name,&hbf_path);
 }
 
 
 #elif defined(HAVE_MIKTEX)
-char*TeX_search_cfg_file(char*name)
+static char*TeX_search_cfg_file(char*name)
 {char result[_MAX_PATH];
 
 if(!miktex_find_input_file("hbf2gf",*name,result))
@@ -2216,7 +2224,7 @@ return strdup(result);
 }
 
 
-char*TeX_search_hbf_file(char*name)
+static char*TeX_search_hbf_file(char*name)
 {char result[_MAX_PATH];
 
 
@@ -2227,12 +2235,12 @@ return strdup(result);
 
 
 #else
-char*TeX_search_cfg_file(char*name)
+static char*TeX_search_cfg_file(char*name)
 {return name;
 }
 
 
-char*TeX_search_hbf_file(char*name)
+static char*TeX_search_hbf_file(char*name)
 {return name;
 }
 #endif
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/hbf2gf.def b/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/hbf2gf.def
index 784dc01da50..583767e897d 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/hbf2gf.def
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/hbf2gf.def
@@ -1,3 +1,3 @@
 NAME HBF2GF WINDOWCOMPAT
-DESCRIPTION 'hbf2gf (CJK Ver. 4.8.3)'
+DESCRIPTION 'hbf2gf (CJK Ver. 4.8.4)'
 STACKSIZE 0x80000
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/hbf2gf.w b/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/hbf2gf.w
index 21fd1df2e53..2a6c5b552d1 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/hbf2gf.w
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.4/hbf2gf/hbf2gf.w
@@ -1,6 +1,6 @@
-% This is the cweb file hbf2gf.w of the CJK package ver. 4.8.3  07-May-2012
+% This is the cweb file hbf2gf.w of the CJK package ver. 4.8.4  18-Apr-2015
 
-% Copyright (C) 1994-2012  Werner Lemberg <wl@@gnu.org>
+% Copyright (C) 1994-2015  Werner Lemberg <wl@@gnu.org>
 %
 % This program is free software; you can redistribute it and/or modify
 % it under the terms of the GNU General Public License as published by
@@ -30,13 +30,13 @@
 \def\mf{{\meta META}\-{\meta FONT}}
 \def\Om{\char "0A}                      % Omega symbol
 
-\def\title{hbf2gf (CJK Version 4.8.3)}
+\def\title{hbf2gf (CJK Version 4.8.4)}
 
 \def\topofcontents{
   \null\vfill
   \centerline{\titlefont The {\ttitlefont hbf2gf} program}
   \vskip 20pt
-  \centerline{(CJK Version 4.8.3)}
+  \centerline{(CJK Version 4.8.4)}
   \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.3)"
+"hbf2gf (CJK ver. 4.8.4)"
 
 
 @
@@ -486,7 +486,7 @@ no terminating NULL byte.
 @d GF_ID 131
 @d PRE   247@#
 
-@d headertstring " hbf2gf output "
+@d headerstring " hbf2gf output "
 
 @<Prototypes@>=
 static void write_pre(void);
@@ -502,7 +502,7 @@ static void write_pre(void)
     struct tm *time_now;
 
 
-    strcpy(out_s, headertstring);@#
+    strcpy(out_s, headerstring);@#
 
     secs_now = time(NULL); /* system date and time */
     time_now = localtime(&secs_now);
diff --git a/Build/source/texk/cjkutils/configure b/Build/source/texk/cjkutils/configure
index 8abcb21351f..8f707db2cbf 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 (TeX Live) 4.8.3.
+# Generated by GNU Autoconf 2.69 for CJK utils (TeX Live) 4.8.4.
 #
 # Report bugs to <tex-k@tug.org>.
 #
@@ -590,12 +590,12 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='CJK utils (TeX Live)'
 PACKAGE_TARNAME='cjk-utils--tex-live-'
-PACKAGE_VERSION='4.8.3'
-PACKAGE_STRING='CJK utils (TeX Live) 4.8.3'
+PACKAGE_VERSION='4.8.4'
+PACKAGE_STRING='CJK utils (TeX Live) 4.8.4'
 PACKAGE_BUGREPORT='tex-k@tug.org'
 PACKAGE_URL=''
 
-ac_unique_file="cjkutils-4.8.3/hbf2gf/hbf.h"
+ac_unique_file="cjkutils-4.8.4/hbf2gf/hbf.h"
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stdio.h>
@@ -1337,7 +1337,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 (TeX Live) 4.8.3 to adapt to many kinds of systems.
+\`configure' configures CJK utils (TeX Live) 4.8.4 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1408,7 +1408,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of CJK utils (TeX Live) 4.8.3:";;
+     short | recursive ) echo "Configuration of CJK utils (TeX Live) 4.8.4:";;
    esac
   cat <<\_ACEOF
 
@@ -1527,7 +1527,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-CJK utils (TeX Live) configure 4.8.3
+CJK utils (TeX Live) configure 4.8.4
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2137,7 +2137,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 (TeX Live) $as_me 4.8.3, which was
+It was created by CJK utils (TeX Live) $as_me 4.8.4, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -7822,7 +7822,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='cjk-utils--tex-live-'
- VERSION='4.8.3'
+ VERSION='4.8.4'
 
 
 # Some tools Automake needs.
@@ -13886,7 +13886,7 @@ Usage: $0 [OPTIONS]
 Report bugs to <bug-libtool@gnu.org>."
 
 lt_cl_version="\
-CJK utils (TeX Live) config.lt 4.8.3
+CJK utils (TeX Live) config.lt 4.8.4
 configured by $0, generated by GNU Autoconf 2.69.
 
 Copyright (C) 2011 Free Software Foundation, Inc.
@@ -15156,7 +15156,7 @@ fi
 
 
 
-CJKUTILS_TREE=cjkutils-4.8.3
+CJKUTILS_TREE=cjkutils-4.8.4
 
 
 ac_config_files="$ac_config_files Makefile"
@@ -15704,7 +15704,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 (TeX Live) $as_me 4.8.3, which was
+This file was extended by CJK utils (TeX Live) $as_me 4.8.4, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -15770,7 +15770,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 (TeX Live) config.status 4.8.3
+CJK utils (TeX Live) config.status 4.8.4
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/Build/source/texk/cjkutils/extconv.c b/Build/source/texk/cjkutils/extconv.c
index 035678586bc..78f13d14c02 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.3)" \
+"extconv (CJK ver. 4.8.4)" \
 
 /*2:*/
-#line 94 "./cjkutils-4.8.3/extconv/extconv.w"
+#line 94 "./cjkutils-4.8.4/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 14d296f6767..90620308edd 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.3)" \
+"hbf2gf (CJK ver. 4.8.4)" \
  \
 
 #define TRUE 1
@@ -100,10 +100,10 @@
 #define VALID_SUBCODE 1 \
 
 /*4:*/
-#line 191 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
+#line 191 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w"
 
 /*10:*/
-#line 408 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
+#line 408 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w"
 
 #ifdef HAVE_CONFIG_H
 #include <c-auto.h> 
@@ -121,7 +121,7 @@
 
 
 /*:10*//*69:*/
-#line 2473 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
+#line 2473 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w"
 
 #if defined(HAVE_LIBKPATHSEA)
 #include "kpathsea/kpathsea.h"
@@ -134,46 +134,46 @@
 #endif
 
 /*:69*/
-#line 192 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
+#line 192 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w"
 
 /*11:*/
-#line 429 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
+#line 429 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w"
 
 static void write_file(void);
 
 
 /*:11*//*13:*/
-#line 491 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
+#line 491 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w"
 
 static void write_pre(void);
 
 
 /*:13*//*16:*/
-#line 579 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
+#line 579 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w"
 
 static void write_data(void);
 
 
 /*:16*//*20:*/
-#line 690 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
+#line 690 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w"
 
 static void write_post(void);
 
 
 /*:20*//*25:*/
-#line 834 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
+#line 834 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w"
 
 static void fputl(long,FILE*);
 
 
 /*:25*//*29:*/
-#line 994 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
+#line 994 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w"
 
 static void make_pixel_array(void);
 
 
 /*:29*//*36:*/
-#line 1222 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
+#line 1222 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w"
 
 static
 #ifdef __GNUC__
@@ -183,7 +183,7 @@ void read_row(unsigned char*);
 
 
 /*:36*//*39:*/
-#line 1274 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
+#line 1274 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w"
 
 static
 #ifdef __GNUC__
@@ -193,55 +193,55 @@ void write_row(unsigned char*);
 
 
 /*:39*//*41:*/
-#line 1329 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
+#line 1329 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w"
 
 static void write_coding(void);
 
 
 /*:41*//*45:*/
-#line 1490 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
+#line 1490 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w"
 
 static void write_pl(void);
 
 
 /*:45*//*47:*/
-#line 1587 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
+#line 1587 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w"
 
 static void write_ovp(void);
 
 
 /*:47*//*50:*/
-#line 1732 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
+#line 1732 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w"
 
 static void write_job(void);
 
 
 /*:50*//*54:*/
-#line 1981 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
+#line 1981 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w"
 
 static void read_config(void);
 
 
 /*:54*//*64:*/
-#line 2312 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
+#line 2312 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w"
 
 static int fsearch(const char*);
 
 
 /*:64*//*67:*/
-#line 2451 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
+#line 2451 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w"
 
 static void config_error(const char*);
 
 
 /*:67*//*71:*/
-#line 2494 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
+#line 2494 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w"
 
 static const char*TeX_search_version(void);
 
 
 /*:71*//*74:*/
-#line 2529 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
+#line 2529 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w"
 
 #ifdef HAVE_EMTEXDIR
 extern int setup_list(struct emtex_dir*,char*,const char*,unsigned);
@@ -251,17 +251,17 @@ static char*file_find(char*,struct emtex_dir*);
 
 
 /*:74*//*79:*/
-#line 2621 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
+#line 2621 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w"
 
 static char*TeX_search_cfg_file(char*);
 static char*TeX_search_hbf_file(char*);
 
 
 /*:79*/
-#line 193 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
+#line 193 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w"
 
 /*2:*/
-#line 127 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
+#line 127 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w"
 
 int nmb_files= -1;
 int unicode= FALSE;
@@ -302,7 +302,7 @@ int end_of_file= FALSE;
 
 
 /*:2*//*15:*/
-#line 538 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
+#line 538 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w"
 
 long char_adr[256];
 long*char_adr_p;
@@ -344,7 +344,7 @@ int dot_count;
 
 
 /*:15*//*19:*/
-#line 667 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
+#line 667 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w"
 
 char coding[STRING_LENGTH+1];
 char comment[STRING_LENGTH+1];
@@ -363,7 +363,7 @@ double ppp_y;
 
 
 /*:19*//*27:*/
-#line 871 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
+#line 871 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w"
 
 HBF_CHAR code;
 const unsigned char*bitmap;
@@ -386,13 +386,13 @@ long s_mag_x,s_mag_y,s_slant;
 
 
 /*:27*//*38:*/
-#line 1269 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
+#line 1269 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w"
 
 int threshold= 128;
 
 
 /*:38*//*49:*/
-#line 1721 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
+#line 1721 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w"
 
 char job_extension[EXTENSION_LENGTH+1];
 char rm_command[STRING_LENGTH+1];
@@ -404,13 +404,13 @@ int ofm_file= FALSE;
 
 
 /*:49*//*53:*/
-#line 1976 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
+#line 1976 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w"
 
 char Buffer[STRING_LENGTH+1];
 
 
 /*:53*//*58:*/
-#line 2094 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
+#line 2094 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w"
 
 int offset_x;
 int offset_y;
@@ -419,13 +419,13 @@ HBF_CHAR user_min_char;
 int have_min_char= FALSE;
 
 /*:58*//*60:*/
-#line 2251 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
+#line 2251 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w"
 
 HBF_CHAR min_char,max_char;
 
 
 /*:60*//*62:*/
-#line 2278 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
+#line 2278 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w"
 
 char b2_codes[256];
 unsigned char min_2_byte,max_2_byte;
@@ -433,7 +433,7 @@ int nmb_2_bytes= 0;
 
 
 /*:62*//*70:*/
-#line 2485 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
+#line 2485 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w"
 
 #if defined(HAVE_EMTEXDIR)
 char emtex_version_string[]= "emTeXdir";
@@ -443,7 +443,7 @@ char no_version_string[]= "no search library";
 
 
 /*:70*//*73:*/
-#line 2522 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
+#line 2522 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w"
 
 #ifdef HAVE_EMTEXDIR
 struct emtex_dir cfg_path,hbf_path;
@@ -451,7 +451,7 @@ struct emtex_dir cfg_path,hbf_path;
 
 
 /*:73*//*76:*/
-#line 2569 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
+#line 2569 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w"
 
 #ifdef HAVE_EMTEXDIR
 char name_buffer[FILE_NAME_LENGTH+1];
@@ -459,7 +459,7 @@ char name_buffer[FILE_NAME_LENGTH+1];
 
 
 /*:76*/
-#line 194 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
+#line 194 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w"
 
 
 
@@ -467,7 +467,7 @@ int main(int argc,char*argv[])
 {char*p;
 
 /*78:*/
-#line 2594 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
+#line 2594 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w"
 
 #if defined(HAVE_LIBKPATHSEA)
 kpse_set_program_name(argv[0],"hbf2gf");
@@ -488,16 +488,16 @@ exit(1);
 
 
 /*:78*/
-#line 200 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
+#line 200 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w"
 
 
 /*7:*/
-#line 307 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
+#line 307 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w"
 
 if(argc==2)
 {if(strcmp(argv[1],"--help")==0)
 /*6:*/
-#line 288 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
+#line 288 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w"
 
 {printf(USAGE);
 exit(0);
@@ -505,11 +505,11 @@ exit(0);
 
 
 /*:6*/
-#line 310 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
+#line 310 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w"
 
 else if(strcmp(argv[1],"--version")==0)
 /*5:*/
-#line 261 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
+#line 261 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w"
 
 {printf("\n");
 printf(banner);
@@ -520,7 +520,7 @@ exit(0);
 
 
 /*:5*/
-#line 312 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
+#line 312 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w"
 
 }
 
@@ -558,7 +558,7 @@ exit(1);
 
 
 /*:7*/
-#line 202 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
+#line 202 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w"
 
 
 if(!quiet)
@@ -587,7 +587,7 @@ read_config();
 
 if(mf_like)
 /*8:*/
-#line 352 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
+#line 352 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w"
 
 {if(unicode)
 file_number= (int)strtol(&argv[1][strlen(argv[1])-2],
@@ -615,11 +615,11 @@ y_scale= (double)x_resolution/y_scale;
 
 
 /*:8*/
-#line 229 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
+#line 229 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w"
 
 
 /*28:*/
-#line 903 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
+#line 903 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w"
 
 {int col,offset;
 
@@ -702,11 +702,11 @@ s_slant= slant*SCALE;
 
 
 /*:28*/
-#line 231 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
+#line 231 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w"
 
 
 /*9:*/
-#line 387 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
+#line 387 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w"
 
 {int j,max_numb;
 
@@ -728,7 +728,7 @@ nmb_files= j;
 
 
 /*:9*/
-#line 233 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
+#line 233 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w"
 
 
 if(tfm_files)
@@ -746,7 +746,7 @@ return 0;
 
 
 /*:4*//*12:*/
-#line 437 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
+#line 437 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w"
 
 static void write_file(void)
 {char output_file[FILE_NAME_LENGTH+1];
@@ -790,7 +790,7 @@ write_data();
 
 
 /*:12*//*14:*/
-#line 498 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
+#line 498 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w"
 
 static void write_pre(void)
 {char out_s[40],s[20];
@@ -813,7 +813,7 @@ fputs(out_s,out);
 
 
 /*:14*//*17:*/
-#line 584 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
+#line 584 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w"
 
 static void write_data(void)
 {dot_count= 0;
@@ -821,7 +821,7 @@ char_adr_p= char_adr;
 
 for(last_char= 0;(last_char<256)&&!end_of_file;last_char++)
 /*18:*/
-#line 609 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
+#line 609 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w"
 
 {if(dot_count++%10==0)
 if(pk_files&&!quiet)
@@ -865,13 +865,13 @@ fputc(EOC,out);
 
 
 /*:18*/
-#line 590 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
+#line 590 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w"
 
 }
 
 
 /*:17*//*21:*/
-#line 695 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
+#line 695 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w"
 
 static void write_post(void)
 {long special_adr;
@@ -899,7 +899,7 @@ tfm_width= (tfm_output_size_x+2*tfm_offset_x)*_2_20;
 
 
 /*22:*/
-#line 741 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
+#line 741 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w"
 
 special_adr= ftell(out);
 
@@ -917,10 +917,10 @@ fputs(comment,out);
 
 
 /*:22*/
-#line 721 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
+#line 721 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w"
 
 /*23:*/
-#line 770 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
+#line 770 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w"
 
 post_adr= ftell(out);
 fputc(POST,out);
@@ -959,10 +959,10 @@ fputl(*char_adr_p++,out);
 
 
 /*:23*/
-#line 722 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
+#line 722 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w"
 
 /*24:*/
-#line 821 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
+#line 821 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w"
 
 fputc(POSTPOST,out);
 fputl(post_adr,out);
@@ -974,13 +974,13 @@ fputc(POSTPOST_ID,out);
 
 
 /*:24*/
-#line 723 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
+#line 723 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w"
 
 }
 
 
 /*:21*//*26:*/
-#line 839 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
+#line 839 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w"
 
 static void fputl(long num,FILE*f)
 {fputc(num>>24,f);
@@ -991,7 +991,7 @@ fputc(num,f);
 
 
 /*:26*//*30:*/
-#line 999 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
+#line 999 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w"
 
 static void make_pixel_array(void)
 {unsigned char*prP;
@@ -1029,7 +1029,7 @@ if(!bitmap)
 empty_char= TRUE;
 else
 /*31:*/
-#line 1058 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
+#line 1058 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w"
 
 {if(pk_output_size_y==input_size_y)
 temp_prP= prP;
@@ -1037,7 +1037,7 @@ temp_prP= prP;
 curr_row= input_size_y-1;
 for(row= 0;row<pk_output_size_y;++row)
 {/*32:*/
-#line 1072 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
+#line 1072 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w"
 
 if(pk_output_size_y==input_size_y)
 
@@ -1059,7 +1059,7 @@ need_to_read_row= 1;
 }
 
 /*33:*/
-#line 1099 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
+#line 1099 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w"
 
 if(need_to_read_row)
 if(rows_read<input_size_y)
@@ -1091,16 +1091,16 @@ frac_row_to_fill= SCALE;
 
 
 /*:33*/
-#line 1092 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
+#line 1092 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w"
 
 }
 
 
 /*:32*/
-#line 1064 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
+#line 1064 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w"
 
 /*34:*/
-#line 1140 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
+#line 1140 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w"
 
 if(pk_width==input_size_x&&s_slant==0)
 
@@ -1155,7 +1155,7 @@ frac_col_to_fill-= frac_col_left;
 }
 
 /*35:*/
-#line 1198 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
+#line 1198 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w"
 
 if(frac_col_to_fill> 0)
 {--xP;
@@ -1175,20 +1175,20 @@ write_row(new_prP);
 
 
 /*:35*/
-#line 1193 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
+#line 1193 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w"
 
 }
 
 
 /*:34*/
-#line 1066 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
+#line 1066 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w"
 
 }
 }
 
 
 /*:31*/
-#line 1035 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
+#line 1035 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w"
 
 }
 }
@@ -1212,7 +1212,7 @@ goto again;
 
 
 /*:30*//*37:*/
-#line 1231 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
+#line 1231 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w"
 
 static
 #ifdef __GNUC__
@@ -1248,7 +1248,7 @@ bitshift= 7;
 
 
 /*:37*//*40:*/
-#line 1283 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
+#line 1283 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w"
 
 static
 #ifdef __GNUC__
@@ -1265,7 +1265,7 @@ for(col= 0,xP= pixelrow;col<pk_output_size_x;++col,++xP)
 
 
 /*:40*//*42:*/
-#line 1337 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
+#line 1337 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w"
 
 static void write_coding(void)
 {register int count,skip;
@@ -1282,7 +1282,7 @@ goto start;
 
 while(y<pk_output_size_y)
 {/*43:*/
-#line 1361 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
+#line 1361 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w"
 
 count= 0;
 x= 0;
@@ -1351,11 +1351,11 @@ continue;
 
 
 /*:43*/
-#line 1352 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
+#line 1352 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w"
 
 start:
 /*44:*/
-#line 1429 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
+#line 1429 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w"
 
 while(x<pk_output_size_x)
 {if(*cp==paint)
@@ -1396,7 +1396,7 @@ paint= WHITE;
 
 
 /*:44*/
-#line 1354 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
+#line 1354 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w"
 
 y++;
 }
@@ -1404,7 +1404,7 @@ y++;
 
 
 /*:42*//*46:*/
-#line 1495 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
+#line 1495 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w"
 
 static void write_pl(void)
 {int i,pos;
@@ -1494,7 +1494,7 @@ fclose(out);
 
 
 /*:46*//*48:*/
-#line 1592 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
+#line 1592 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w"
 
 static void write_ovp(void)
 {int c,i,nmb_subfonts,remainder,count,pos;
@@ -1609,7 +1609,7 @@ fclose(out);
 
 
 /*:48*//*51:*/
-#line 1737 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
+#line 1737 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w"
 
 static void write_job(void)
 {FILE*out;
@@ -1695,7 +1695,7 @@ fclose(out);
 
 
 /*:51*//*55:*/
-#line 1989 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
+#line 1989 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w"
 
 static void read_config(void)
 {HBF_BBOX*boxp;
@@ -1703,7 +1703,7 @@ char*real_config_file;
 
 
 /*56:*/
-#line 2041 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
+#line 2041 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w"
 
 {int i,lastext= -1;
 
@@ -1721,7 +1721,7 @@ strcat(config_file,".cfg");
 
 
 /*:56*/
-#line 1995 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
+#line 1995 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w"
 
 
 real_config_file= TeX_search_cfg_file(config_file);
@@ -1756,7 +1756,7 @@ exit(0);
 }
 
 /*57:*/
-#line 2058 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
+#line 2058 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w"
 
 {char hbf_header[STRING_LENGTH+1];
 char*real_hbf_header;
@@ -1793,10 +1793,10 @@ strcpy(output_name,Buffer);
 
 
 /*:57*/
-#line 2028 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
+#line 2028 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w"
 
 /*59:*/
-#line 2102 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
+#line 2102 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w"
 
 {if(fsearch("nmb_files"))
 nmb_files= atoi(Buffer);
@@ -1938,11 +1938,11 @@ job_extension[EXTENSION_LENGTH]= '\0';
 
 
 /*:59*/
-#line 2029 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
+#line 2029 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w"
 
 
 /*61:*/
-#line 2256 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
+#line 2256 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w"
 
 {const void*cp;
 HBF_CHAR dummy;
@@ -1957,10 +1957,10 @@ min_char= user_min_char;
 
 
 /*:61*/
-#line 2031 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
+#line 2031 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w"
 
 /*63:*/
-#line 2285 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
+#line 2285 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w"
 
 {const void*b2r;
 unsigned char dummy;
@@ -1983,7 +1983,7 @@ nmb_2_bytes++;
 
 
 /*:63*/
-#line 2032 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
+#line 2032 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w"
 
 
 fclose(config);
@@ -1991,7 +1991,7 @@ fclose(config);
 
 
 /*:55*//*65:*/
-#line 2317 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
+#line 2317 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w"
 
 static int fsearch(const char*search_string)
 {char*P,p;
@@ -2047,7 +2047,7 @@ Ch= fgetc(config);
 
 if(*temp_buffer)
 /*66:*/
-#line 2396 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
+#line 2396 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w"
 
 {P= temp_buffer;
 Buf_p= Buffer;
@@ -2100,7 +2100,7 @@ count--;
 
 
 /*:66*/
-#line 2371 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
+#line 2371 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w"
 
 else
 *Buffer= '\0';
@@ -2110,7 +2110,7 @@ return(*Buffer)?1:0;
 
 
 /*:65*//*68:*/
-#line 2456 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
+#line 2456 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w"
 
 static void config_error(const char*message)
 {fprintf(stderr,"Couldn't find `%s' entry in configuration file\n",
@@ -2121,7 +2121,7 @@ exit(1);
 
 
 /*:68*//*72:*/
-#line 2499 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
+#line 2499 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w"
 
 static const char*TeX_search_version(void)
 {
@@ -2143,7 +2143,7 @@ return no_version_string;
 
 
 /*:72*//*75:*/
-#line 2541 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
+#line 2541 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w"
 
 #ifdef HAVE_EMTEXDIR
 static int dir_setup(ed,env,dir,flags)
@@ -2172,7 +2172,7 @@ return TRUE;
 
 
 /*:75*//*77:*/
-#line 2576 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
+#line 2576 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w"
 
 #ifdef HAVE_EMTEXDIR
 static char*file_find(name,list)
@@ -2188,7 +2188,7 @@ return NULL;
 
 
 /*:77*//*80:*/
-#line 2627 "./cjkutils-4.8.3/hbf2gf/hbf2gf.w"
+#line 2627 "./cjkutils-4.8.4/hbf2gf/hbf2gf.w"
 
 #if defined(HAVE_LIBKPATHSEA)
 static char*TeX_search_cfg_file(char*name)
diff --git a/Build/source/texk/cjkutils/hbf2gf.dvi b/Build/source/texk/cjkutils/hbf2gf.dvi
index 226019364ec..85aa9b28d36 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 d912b2b3cba..8cdb1320b30 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.3  07-May-2012
+% This is the cweb file hbf2gf.w of the CJK package ver. 4.8.4  18-Apr-2015
 
-% Copyright (C) 1994-2012  Werner Lemberg <wl@gnu.org>
+% Copyright (C) 1994-2015  Werner Lemberg <wl@gnu.org>
 %
 % This program is free software; you can redistribute it and/or modify
 % it under the terms of the GNU General Public License as published by
@@ -31,13 +31,13 @@
 \def\mf{{\meta META}\-{\meta FONT}}
 \def\Om{\char "0A}                      % Omega symbol
 
-\def\title{hbf2gf (CJK Version 4.8.3)}
+\def\title{hbf2gf (CJK Version 4.8.4)}
 
 \def\topofcontents{
   \null\vfill
   \centerline{\titlefont The {\ttitlefont hbf2gf} program}
   \vskip 20pt
-  \centerline{(CJK Version 4.8.3)}
+  \centerline{(CJK Version 4.8.4)}
   \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.3)"}\par
+\.{"hbf2gf\ (CJK\ ver.\ 4.}\)\.{8.4)"}\par
 \fi
 
 \M{2}
diff --git a/Build/source/texk/cjkutils/sjisconv.c b/Build/source/texk/cjkutils/sjisconv.c
index 3678fc706be..b49fabc257d 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.3)" \
+"sjisconv (CJK ver. 4.8.4)" \
 
 /*2:*/
-#line 96 "./cjkutils-4.8.3/SJISconv/sjisconv.w"
+#line 96 "./cjkutils-4.8.4/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 b064105095a..c500740ebae 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.3)}
+\def\CJKpreproc{bg5conv (CJK ver. 4.8.4)}
 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 b0639ca2142..797276c94c6 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.3)}
+\def\CNSpreproc{cef5conv (CJK ver. 4.8.4)}
 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 97817fedfc7..16ebebc11bf 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.3)}
+\def\CNSpreproc{cefconv (CJK ver. 4.8.4)}
 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 00842b5e9e8..f6b2deb8c9c 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.3)}
+\def\CNSpreproc{cefsconv (CJK ver. 4.8.4)}
 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 3ff038156d6..4b5c92a6b2d 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.3)}
+\def\CJKpreproc{extconv (CJK ver. 4.8.4)}
 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 d9a22a3a34d..4fad18fa2d5 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.3)}
+\def\CJKpreproc{sjisconv (CJK ver. 4.8.4)}
 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
index 79961e184d8..e698a5d180a 100644
--- a/Build/source/texk/cjkutils/version.ac
+++ b/Build/source/texk/cjkutils/version.ac
@@ -1,5 +1,5 @@
 dnl
-dnl   Copyright (C) 2012 Peter Breitenlohner <tex-live@tug.org>
+dnl   Copyright (C) 2012-2015 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,
@@ -7,5 +7,5 @@ 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])
+dnl  m4-include this file to define the current cjk version
+m4_define([cjk_version], [4.8.4])