fputs2 (ptex and friends 5 of 5)

git-svn-id: svn://tug.org/texlive/trunk@49959 c570f23f-e606-0410-a88d-b1316a301751

9 files changed, 25 insertions, 1 deletions

diff --git a/Build/source/texk/web2c/eptexdir/eptex.defines b/Build/source/texk/web2c/eptexdir/eptex.defines
index 8e99be92023..4ec82524536 100644
--- a/Build/source/texk/web2c/eptexdir/eptex.defines
+++ b/Build/source/texk/web2c/eptexdir/eptex.defines
@@ -17,6 +17,7 @@
 @define function fromDVI ();
 @define function toDVI ();
 @define function putc2 ();
+@define function fputs2 ();
 @define function inputline2 ();
 
 @define function setinfileenc ();
diff --git a/Build/source/texk/web2c/eptexdir/eptex.ech b/Build/source/texk/web2c/eptexdir/eptex.ech
index 5cc86a0093d..2bf76aff627 100644
--- a/Build/source/texk/web2c/eptexdir/eptex.ech
+++ b/Build/source/texk/web2c/eptexdir/eptex.ech
@@ -454,7 +454,7 @@ begin
       print_nl("Unknown encoding `");
       case selector of
       term_and_log: begin wterm(stringcast(name_of_file + 1));
-	wlog(stringcast(name_of_file + 1)); end;
+        wlog(stringcast(name_of_file + 1)); end;
       log_only:  wlog(stringcast(name_of_file + 1));
       term_only: wterm(stringcast(name_of_file + 1));
       endcases;
diff --git a/Build/source/texk/web2c/euptexdir/euptex.defines b/Build/source/texk/web2c/euptexdir/euptex.defines
index b2035a4af2e..613c70e7f14 100644
--- a/Build/source/texk/web2c/euptexdir/euptex.defines
+++ b/Build/source/texk/web2c/euptexdir/euptex.defines
@@ -22,6 +22,7 @@
 @define function fromDVI ();
 @define function toDVI ();
 @define function putc2 ();
+@define function fputs2 ();
 @define function inputline2 ();
 
 @define function setinfileenc ();
diff --git a/Build/source/texk/web2c/ptexdir/ChangeLog b/Build/source/texk/web2c/ptexdir/ChangeLog
index cee66f8f9ed..2b7ac6d0f55 100644
--- a/Build/source/texk/web2c/ptexdir/ChangeLog
+++ b/Build/source/texk/web2c/ptexdir/ChangeLog
@@ -19,6 +19,11 @@
 	    flag explicitly.
 	* tests/inhibitglue.tex: Added.
 
+2019-02-03  Hironobu Yamashita  <h.y.acetaminophen@gmail.com>
+
+	* kanji.h: Use fputs2() to benefit from kanji encoding conversion.
+	https://github.com/texjporg/tex-jp-build/issues/34
+
 2019-01-23  Hironobu Yamashita  <h.y.acetaminophen@gmail.com>
 
 	* ptex-base.ch: Add dump_kanji and undump_kanji.
diff --git a/Build/source/texk/web2c/ptexdir/kanji.h b/Build/source/texk/web2c/ptexdir/kanji.h
index 97a458a1087..c3b180c7238 100644
--- a/Build/source/texk/web2c/ptexdir/kanji.h
+++ b/Build/source/texk/web2c/ptexdir/kanji.h
@@ -58,6 +58,11 @@ extern void init_default_kanji (const_string file_str, const_string internal_str
 #define putc(c,fp) putc2(c,fp)
 #endif /* !PRESERVE_PUTC */
 
+#ifndef PRESERVE_FPUTS
+#undef fputs
+#define fputs(c,fp) fputs2(c,fp)
+#endif /* !PRESERVE_FPUTS */
+
 #ifdef PBIBTEX
 #define inputline2(fp,buff,pos,size,ptr) input_line2(fp,buff,pos,size,ptr)
 #else
diff --git a/Build/source/texk/web2c/ptexdir/ptex.defines b/Build/source/texk/web2c/ptexdir/ptex.defines
index b64e1b950e2..8dd0d77429e 100644
--- a/Build/source/texk/web2c/ptexdir/ptex.defines
+++ b/Build/source/texk/web2c/ptexdir/ptex.defines
@@ -13,6 +13,7 @@
 @define function fromDVI ();
 @define function toDVI ();
 @define function putc2 ();
+@define function fputs2 ();
 @define function inputline2 ();
 
 @define function fromJIS ();
diff --git a/Build/source/texk/web2c/uptexdir/ChangeLog b/Build/source/texk/web2c/uptexdir/ChangeLog
index dda72bb8cf2..fb06907fd9c 100644
--- a/Build/source/texk/web2c/uptexdir/ChangeLog
+++ b/Build/source/texk/web2c/uptexdir/ChangeLog
@@ -1,3 +1,8 @@
+2019-02-03  Hironobu Yamashita  <h.y.acetaminophen@gmail.com>
+
+	* kanji.h: Use fputs2() to benefit from kanji encoding conversion.
+	https://github.com/texjporg/tex-jp-build/issues/34
+
 2019-01-23  Hironobu Yamashita  <h.y.acetaminophen@gmail.com>
 
 	* kanji_dump.c: Throw a warning when kanji internal encoding
diff --git a/Build/source/texk/web2c/uptexdir/kanji.h b/Build/source/texk/web2c/uptexdir/kanji.h
index 2de3bd16682..8206f72f83e 100644
--- a/Build/source/texk/web2c/uptexdir/kanji.h
+++ b/Build/source/texk/web2c/uptexdir/kanji.h
@@ -51,6 +51,11 @@ extern void init_default_kanji (const_string file_str, const_string internal_str
 #define putc(c,fp) putc2(c,fp)
 #endif /* !PRESERVE_PUTC */
 
+#ifndef PRESERVE_FPUTS
+#undef fputs
+#define fputs(c,fp) fputs2(c,fp)
+#endif /* !PRESERVE_FPUTS */
+
 #ifdef UPBIBTEX
 #define inputline2(fp,buff,pos,size,ptr) input_line2(fp,buff,pos,size,ptr)
 #else
diff --git a/Build/source/texk/web2c/uptexdir/uptex.defines b/Build/source/texk/web2c/uptexdir/uptex.defines
index 9223042f5a5..52243e57185 100644
--- a/Build/source/texk/web2c/uptexdir/uptex.defines
+++ b/Build/source/texk/web2c/uptexdir/uptex.defines
@@ -24,6 +24,7 @@
 @define function fromDVI ();
 @define function toDVI ();
 @define function putc2 ();
+@define function fputs2 ();
 @define function inputline2 ();
 
 @define function fromJIS ();