6 files changed, 26 insertions, 10 deletions
diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in
index 825a8dfc28d..77733e8aaf3 100644
--- a/Build/source/texk/web2c/Makefile.in
+++ b/Build/source/texk/web2c/Makefile.in
@@ -1889,7 +1889,7 @@ pbibtex_LDADD = $(ptex_ldadd)
 pbibtex_DEPENDENCIES = $(ptex_dependencies)
 nodist_pdvitype_SOURCES = pdvitype.c pdvitype.h
 pdvitype_SOURCES = ptexdir/kanji.h
-pdvitype_CPPFLAGS = $(ptex_cppflags) -DDHEX_CHAR_CODE
+pdvitype_CPPFLAGS = $(ptex_cppflags) -DHEX_CHAR_CODE
 pdvitype_LDADD = $(ptex_ldadd)
 pdvitype_DEPENDENCIES = $(ptex_dependencies)
 nodist_ppltotf_SOURCES = ppltotf.c ppltotf.h
@@ -1985,22 +1985,22 @@ uptex_ch_srcs = \
 
 nodist_upbibtex_SOURCES = upbibtex.c upbibtex.h
 upbibtex_SOURCES = uptexdir/kanji.h
-upbibtex_CPPFLAGS = $(uptex_cppflags) -DDHEX_CHAR_CODE
+upbibtex_CPPFLAGS = $(uptex_cppflags)
 upbibtex_LDADD = $(uptex_ldadd)
 upbibtex_DEPENDENCIES = $(uptex_dependencies)
 nodist_updvitype_SOURCES = updvitype.c updvitype.h
 updvitype_SOURCES = uptexdir/kanji.h
-updvitype_CPPFLAGS = $(uptex_cppflags) -DDHEX_CHAR_CODE
+updvitype_CPPFLAGS = $(uptex_cppflags) -DHEX_CHAR_CODE
 updvitype_LDADD = $(uptex_ldadd)
 updvitype_DEPENDENCIES = $(uptex_dependencies)
 nodist_uppltotf_SOURCES = uppltotf.c uppltotf.h
 uppltotf_SOURCES = uptexdir/kanji.h
-uppltotf_CPPFLAGS = $(uptex_cppflags) -DDHEX_CHAR_CODE
+uppltotf_CPPFLAGS = $(uptex_cppflags) -DPRESERVE_PUTC
 uppltotf_LDADD = $(uptex_ldadd)
 uppltotf_DEPENDENCIES = $(uptex_dependencies)
 nodist_uptftopl_SOURCES = uptftopl.c uptftopl.h
 uptftopl_SOURCES = uptexdir/kanji.h
-uptftopl_CPPFLAGS = $(uptex_cppflags) -DDHEX_CHAR_CODE
+uptftopl_CPPFLAGS = $(uptex_cppflags)
 uptftopl_LDADD = $(uptex_ldadd)
 uptftopl_DEPENDENCIES = $(uptex_dependencies)
 
diff --git a/Build/source/texk/web2c/ptexdir/ChangeLog b/Build/source/texk/web2c/ptexdir/ChangeLog
index 0e88f576f3a..19346044ab9 100644
--- a/Build/source/texk/web2c/ptexdir/ChangeLog
+++ b/Build/source/texk/web2c/ptexdir/ChangeLog
@@ -1,3 +1,8 @@
+2011-11-25  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* am/ptex.am (pdvitype_CPPFLAGS): Replace '-DDHEX_CHAR_CODE' by
+	'-DHEX_CHAR_CODE'.
+
 2011-10-04  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* am/ptex.am (DISTCLEANFILES): Preserve distributed files.
diff --git a/Build/source/texk/web2c/ptexdir/am/ptex.am b/Build/source/texk/web2c/ptexdir/am/ptex.am
index c3879e2f5a9..b9490f414f9 100644
--- a/Build/source/texk/web2c/ptexdir/am/ptex.am
+++ b/Build/source/texk/web2c/ptexdir/am/ptex.am
@@ -127,7 +127,7 @@ pweb_tests += ptexdir/pbibtex-mem.test ptexdir/nissya.test
 ## 
 nodist_pdvitype_SOURCES = pdvitype.c pdvitype.h
 pdvitype_SOURCES = ptexdir/kanji.h
-pdvitype_CPPFLAGS = $(ptex_cppflags) -DDHEX_CHAR_CODE
+pdvitype_CPPFLAGS = $(ptex_cppflags) -DHEX_CHAR_CODE
 pdvitype_LDADD = $(ptex_ldadd)
 pdvitype_DEPENDENCIES = $(ptex_dependencies)
 pdvitype.c pdvitype.h: pdvitype-web2c
diff --git a/Build/source/texk/web2c/uptexdir/ChangeLog b/Build/source/texk/web2c/uptexdir/ChangeLog
index d7e332014a7..518bf24190a 100644
--- a/Build/source/texk/web2c/uptexdir/ChangeLog
+++ b/Build/source/texk/web2c/uptexdir/ChangeLog
@@ -1,3 +1,13 @@
+2011-11-25  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* am/uptex.am (uppltotf_CPPFLAGS): Replace '-DDHEX_CHAR_CODE'
+	by '-DPRESERVE_PUTC'.  Mail [ptex:00311] from TANAKA Takuji.
+
+	* am/uptex.am (upbibtex_CPPFLAGS, uptftopl_CPPFLAGS): Drop the
+	useless '-DDHEX_CHAR_CODE'.
+	(updvitype_CPPFLAGS): Replace '-DDHEX_CHAR_CODE' by
+	'-DHEX_CHAR_CODE'.
+
 2011-09-30  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* updvitype.ch: Use const stringcast for get_enc_string().
diff --git a/Build/source/texk/web2c/uptexdir/am/uptex.am b/Build/source/texk/web2c/uptexdir/am/uptex.am
index 545b6bad4b2..af5f328991f 100644
--- a/Build/source/texk/web2c/uptexdir/am/uptex.am
+++ b/Build/source/texk/web2c/uptexdir/am/uptex.am
@@ -104,7 +104,7 @@ DISTCLEANFILES += $(nodist_uptex_SOURCES) uptex.web uptex.ch uptex-web2c \
 ##
 nodist_upbibtex_SOURCES = upbibtex.c upbibtex.h
 upbibtex_SOURCES = uptexdir/kanji.h
-upbibtex_CPPFLAGS = $(uptex_cppflags) -DDHEX_CHAR_CODE
+upbibtex_CPPFLAGS = $(uptex_cppflags)
 upbibtex_LDADD = $(uptex_ldadd)
 upbibtex_DEPENDENCIES = $(uptex_dependencies)
 upbibtex.c upbibtex.h: upbibtex-web2c
@@ -121,7 +121,7 @@ EXTRA_DIST += ptexdir/pbibtex.ch uptexdir/upbibtex.ch
 ##
 nodist_updvitype_SOURCES = updvitype.c updvitype.h
 updvitype_SOURCES = uptexdir/kanji.h
-updvitype_CPPFLAGS = $(uptex_cppflags) -DDHEX_CHAR_CODE
+updvitype_CPPFLAGS = $(uptex_cppflags) -DHEX_CHAR_CODE
 updvitype_LDADD = $(uptex_ldadd)
 updvitype_DEPENDENCIES = $(uptex_dependencies)
 updvitype.c updvitype.h: updvitype-web2c
@@ -138,7 +138,7 @@ EXTRA_DIST += ptexdir/pdvitype.ch uptexdir/updvitype.ch
 ##
 nodist_uppltotf_SOURCES = uppltotf.c uppltotf.h
 uppltotf_SOURCES = uptexdir/kanji.h
-uppltotf_CPPFLAGS = $(uptex_cppflags) -DDHEX_CHAR_CODE
+uppltotf_CPPFLAGS = $(uptex_cppflags) -DPRESERVE_PUTC
 uppltotf_LDADD = $(uptex_ldadd)
 uppltotf_DEPENDENCIES = $(uptex_dependencies)
 uppltotf.c uppltotf.h: uppltotf-web2c
@@ -155,7 +155,7 @@ EXTRA_DIST += ptexdir/ppltotf.ch uptexdir/uppltotf.ch
 ##
 nodist_uptftopl_SOURCES = uptftopl.c uptftopl.h
 uptftopl_SOURCES = uptexdir/kanji.h
-uptftopl_CPPFLAGS = $(uptex_cppflags) -DDHEX_CHAR_CODE
+uptftopl_CPPFLAGS = $(uptex_cppflags)
 uptftopl_LDADD = $(uptex_ldadd)
 uptftopl_DEPENDENCIES = $(uptex_dependencies)
 uptftopl.c uptftopl.h: uptftopl-web2c
diff --git a/Build/source/texk/web2c/uptexdir/uptftopl.ch b/Build/source/texk/web2c/uptexdir/uptftopl.ch
index a3b6b23ba6e..00ad96fe5f5 100644
--- a/Build/source/texk/web2c/uptexdir/uptftopl.ch
+++ b/Build/source/texk/web2c/uptexdir/uptftopl.ch
@@ -37,6 +37,7 @@
   if (isinternalUPTEX) then out(' U ')
   else out(' J '); {specify jiscode format}
 @z
+
 @x
   out(xchr[Hi(cx)]); out(xchr[Lo(cx)]);
 @y