texlive[59968] Build/source/texk/cjkutils: cjkutils: apply patch of

commits+takuji at tug.org commits+takuji at tug.org
Sun Jul 18 04:50:36 CEST 2021


Revision: 59968
          http://tug.org/svn/texlive?view=revision&revision=59968
Author:   takuji
Date:     2021-07-18 04:50:36 +0200 (Sun, 18 Jul 2021)
Log Message:
-----------
cjkutils: apply patch of W32TeX (Windows only)

Modified Paths:
--------------
    trunk/Build/source/texk/cjkutils/ChangeLog
    trunk/Build/source/texk/cjkutils/TLpatches/ChangeLog
    trunk/Build/source/texk/cjkutils/cjkutils-src/Bg5conv/bg5conv.c
    trunk/Build/source/texk/cjkutils/cjkutils-src/CEFconv/cef5conv.c
    trunk/Build/source/texk/cjkutils/cjkutils-src/CEFconv/cefconv.c
    trunk/Build/source/texk/cjkutils/cjkutils-src/CEFconv/cefsconv.c
    trunk/Build/source/texk/cjkutils/cjkutils-src/SJISconv/sjisconv.c
    trunk/Build/source/texk/cjkutils/cjkutils-src/extconv/extconv.c
    trunk/Build/source/texk/cjkutils/cjkutils-src/hbf2gf/hbf2gf.c

Added Paths:
-----------
    trunk/Build/source/texk/cjkutils/TLpatches/patch-05-win32

Modified: trunk/Build/source/texk/cjkutils/ChangeLog
===================================================================
--- trunk/Build/source/texk/cjkutils/ChangeLog	2021-07-18 02:11:07 UTC (rev 59967)
+++ trunk/Build/source/texk/cjkutils/ChangeLog	2021-07-18 02:50:36 UTC (rev 59968)
@@ -1,3 +1,8 @@
+2021-07-18  TANAKA Takuji  <ttk at t-lab.opal.ne.jp>
+
+	* */*conv.c, hbf2gf/hbfgf.c:
+	Apply patch of W32TeX by Kakuto-san.
+
 2018-09-09  Karl Berry  <karl at tug.org>
 
 	* cef5conv.test,

Modified: trunk/Build/source/texk/cjkutils/TLpatches/ChangeLog
===================================================================
--- trunk/Build/source/texk/cjkutils/TLpatches/ChangeLog	2021-07-18 02:11:07 UTC (rev 59967)
+++ trunk/Build/source/texk/cjkutils/TLpatches/ChangeLog	2021-07-18 02:50:36 UTC (rev 59968)
@@ -1,3 +1,7 @@
+2021-07-18  TANAKA Takuji  <ttk at t-lab.opal.ne.jp>
+
+	* patch-05-win32 (new): patch for W32TeX by Kakuto-san.
+
 2015-04-18  Peter Breitenlohner  <peb at mppmu.mpg.de>
 
 	Imported cjk-4.8.4/utils source tree from:

Added: trunk/Build/source/texk/cjkutils/TLpatches/patch-05-win32
===================================================================
--- trunk/Build/source/texk/cjkutils/TLpatches/patch-05-win32	                        (rev 0)
+++ trunk/Build/source/texk/cjkutils/TLpatches/patch-05-win32	2021-07-18 02:50:36 UTC (rev 59968)
@@ -0,0 +1,153 @@
+diff -urN cjkutils-src.orig/Bg5conv/bg5conv.c cjkutils-src/Bg5conv/bg5conv.c
+--- cjkutils-src.orig/Bg5conv/bg5conv.c	2018-06-04 21:21:53.198895618 +0900
++++ cjkutils-src/Bg5conv/bg5conv.c	2021-07-18 11:20:33.821975945 +0900
+@@ -6,11 +6,18 @@
+ 
+ #include <stdio.h> 
+ #include <stdlib.h> 
++#ifdef WIN32
++#include <fcntl.h>
++#include <io.h>
++#endif
+ 
+ 
+ int main(int argc,char*argv[])
+ {int ch;
+ 
++#ifdef WIN32
++setmode(fileno(stdout), _O_BINARY);
++#endif
+ fprintf(stdout,"\\def\\CJKpreproc{%s}",banner);
+ 
+ ch= fgetc(stdin);
+diff -urN cjkutils-src.orig/CEFconv/cef5conv.c cjkutils-src/CEFconv/cef5conv.c
+--- cjkutils-src.orig/CEFconv/cef5conv.c	2018-06-04 21:21:53.198895618 +0900
++++ cjkutils-src/CEFconv/cef5conv.c	2021-07-18 11:20:33.821975945 +0900
+@@ -7,6 +7,10 @@
+ #include <ctype.h> 
+ #include <stdio.h> 
+ #include <stdlib.h> 
++#ifdef WIN32
++#include <fcntl.h>
++#include <io.h>
++#endif
+ 
+ 
+ int main(int argc,char*argv[])
+@@ -15,6 +19,9 @@
+ unsigned char out[32];
+ unsigned char*inp,*outp;
+ 
++#ifdef WIN32
++setmode(fileno(stdout), _O_BINARY);
++#endif
+ fprintf(stdout,"\\def\\CNSpreproc{%s}",banner);
+ 
+ ch= fgetc(stdin);
+diff -urN cjkutils-src.orig/CEFconv/cefconv.c cjkutils-src/CEFconv/cefconv.c
+--- cjkutils-src.orig/CEFconv/cefconv.c	2018-06-04 21:21:53.198895618 +0900
++++ cjkutils-src/CEFconv/cefconv.c	2021-07-18 11:20:33.821975945 +0900
+@@ -7,6 +7,10 @@
+ #include <ctype.h> 
+ #include <stdio.h> 
+ #include <stdlib.h> 
++#ifdef WIN32
++#include <fcntl.h>
++#include <io.h>
++#endif
+ 
+ 
+ int main(int argc,char*argv[])
+@@ -15,6 +19,9 @@
+ unsigned char out[32];
+ unsigned char*inp,*outp;
+ 
++#ifdef WIN32
++setmode(fileno(stdout), _O_BINARY);
++#endif
+ fprintf(stdout,"\\def\\CNSpreproc{%s}",banner);
+ 
+ ch= fgetc(stdin);
+diff -urN cjkutils-src.orig/CEFconv/cefsconv.c cjkutils-src/CEFconv/cefsconv.c
+--- cjkutils-src.orig/CEFconv/cefsconv.c	2018-06-04 21:21:53.199895618 +0900
++++ cjkutils-src/CEFconv/cefsconv.c	2021-07-18 11:20:33.821975945 +0900
+@@ -7,6 +7,10 @@
+ #include <ctype.h> 
+ #include <stdio.h> 
+ #include <stdlib.h> 
++#ifdef WIN32
++#include <fcntl.h>
++#include <io.h>
++#endif
+ 
+ 
+ int main(int argc,char*argv[])
+@@ -14,6 +18,9 @@
+ unsigned char in[16];
+ unsigned char out[32];
+ unsigned char*inp,*outp;
++#ifdef WIN32
++setmode(fileno(stdout), _O_BINARY);
++#endif
+ 
+ fprintf(stdout,"\\def\\CNSpreproc{%s}",banner);
+ 
+diff -urN cjkutils-src.orig/SJISconv/sjisconv.c cjkutils-src/SJISconv/sjisconv.c
+--- cjkutils-src.orig/SJISconv/sjisconv.c	2018-06-04 21:21:53.199895618 +0900
++++ cjkutils-src/SJISconv/sjisconv.c	2021-07-18 11:20:33.821975945 +0900
+@@ -6,11 +6,18 @@
+ 
+ #include <stdio.h> 
+ #include <stdlib.h> 
++#ifdef WIN32
++#include <fcntl.h>
++#include <io.h>
++#endif
+ 
+ 
+ int main(int argc,char*argv[])
+ {int ch;
+ 
++#ifdef WIN32
++setmode(fileno(stdout), _O_BINARY);
++#endif
+ fprintf(stdout,"\\def\\CJKpreproc{%s}",banner);
+ 
+ ch= fgetc(stdin);
+diff -urN cjkutils-src.orig/extconv/extconv.c cjkutils-src/extconv/extconv.c
+--- cjkutils-src.orig/extconv/extconv.c	2018-06-04 21:21:53.200895618 +0900
++++ cjkutils-src/extconv/extconv.c	2021-07-18 11:20:33.821975945 +0900
+@@ -6,11 +6,18 @@
+ 
+ #include <stdio.h> 
+ #include <stdlib.h> 
++#ifdef WIN32
++#include <fcntl.h>
++#include <io.h>
++#endif
+ 
+ 
+ int main(int argc,char*argv[])
+ {int ch;
+ 
++#ifdef WIN32
++setmode(fileno(stdout), _O_BINARY);
++#endif
+ 
+ fprintf(stdout,"\\def\\CJKpreproc{%s}",banner);
+ 
+diff -urN cjkutils-src.orig/hbf2gf/hbf2gf.c cjkutils-src/hbf2gf/hbf2gf.c
+--- cjkutils-src.orig/hbf2gf/hbf2gf.c	2018-06-04 21:21:53.202895618 +0900
++++ cjkutils-src/hbf2gf/hbf2gf.c	2021-07-18 11:23:03.151348296 +0900
+@@ -286,9 +286,9 @@
+ FILE*config,*out;
+ HBF*hbf;
+ 
+-#ifdef msdos 
++#ifdef WIN32
+ #define WRITE_BIN   "wb"
+-#define WRITE_TXT   "wt"
++#define WRITE_TXT   "wb"
+ #define READ_BIN    "rb"
+ #define READ_TXT    "rt"
+ #else

Modified: trunk/Build/source/texk/cjkutils/cjkutils-src/Bg5conv/bg5conv.c
===================================================================
--- trunk/Build/source/texk/cjkutils/cjkutils-src/Bg5conv/bg5conv.c	2021-07-18 02:11:07 UTC (rev 59967)
+++ trunk/Build/source/texk/cjkutils/cjkutils-src/Bg5conv/bg5conv.c	2021-07-18 02:50:36 UTC (rev 59968)
@@ -6,11 +6,18 @@
 
 #include <stdio.h> 
 #include <stdlib.h> 
+#ifdef WIN32
+#include <fcntl.h>
+#include <io.h>
+#endif
 
 
 int main(int argc,char*argv[])
 {int ch;
 
+#ifdef WIN32
+setmode(fileno(stdout), _O_BINARY);
+#endif
 fprintf(stdout,"\\def\\CJKpreproc{%s}",banner);
 
 ch= fgetc(stdin);

Modified: trunk/Build/source/texk/cjkutils/cjkutils-src/CEFconv/cef5conv.c
===================================================================
--- trunk/Build/source/texk/cjkutils/cjkutils-src/CEFconv/cef5conv.c	2021-07-18 02:11:07 UTC (rev 59967)
+++ trunk/Build/source/texk/cjkutils/cjkutils-src/CEFconv/cef5conv.c	2021-07-18 02:50:36 UTC (rev 59968)
@@ -7,6 +7,10 @@
 #include <ctype.h> 
 #include <stdio.h> 
 #include <stdlib.h> 
+#ifdef WIN32
+#include <fcntl.h>
+#include <io.h>
+#endif
 
 
 int main(int argc,char*argv[])
@@ -15,6 +19,9 @@
 unsigned char out[32];
 unsigned char*inp,*outp;
 
+#ifdef WIN32
+setmode(fileno(stdout), _O_BINARY);
+#endif
 fprintf(stdout,"\\def\\CNSpreproc{%s}",banner);
 
 ch= fgetc(stdin);

Modified: trunk/Build/source/texk/cjkutils/cjkutils-src/CEFconv/cefconv.c
===================================================================
--- trunk/Build/source/texk/cjkutils/cjkutils-src/CEFconv/cefconv.c	2021-07-18 02:11:07 UTC (rev 59967)
+++ trunk/Build/source/texk/cjkutils/cjkutils-src/CEFconv/cefconv.c	2021-07-18 02:50:36 UTC (rev 59968)
@@ -7,6 +7,10 @@
 #include <ctype.h> 
 #include <stdio.h> 
 #include <stdlib.h> 
+#ifdef WIN32
+#include <fcntl.h>
+#include <io.h>
+#endif
 
 
 int main(int argc,char*argv[])
@@ -15,6 +19,9 @@
 unsigned char out[32];
 unsigned char*inp,*outp;
 
+#ifdef WIN32
+setmode(fileno(stdout), _O_BINARY);
+#endif
 fprintf(stdout,"\\def\\CNSpreproc{%s}",banner);
 
 ch= fgetc(stdin);

Modified: trunk/Build/source/texk/cjkutils/cjkutils-src/CEFconv/cefsconv.c
===================================================================
--- trunk/Build/source/texk/cjkutils/cjkutils-src/CEFconv/cefsconv.c	2021-07-18 02:11:07 UTC (rev 59967)
+++ trunk/Build/source/texk/cjkutils/cjkutils-src/CEFconv/cefsconv.c	2021-07-18 02:50:36 UTC (rev 59968)
@@ -7,6 +7,10 @@
 #include <ctype.h> 
 #include <stdio.h> 
 #include <stdlib.h> 
+#ifdef WIN32
+#include <fcntl.h>
+#include <io.h>
+#endif
 
 
 int main(int argc,char*argv[])
@@ -14,6 +18,9 @@
 unsigned char in[16];
 unsigned char out[32];
 unsigned char*inp,*outp;
+#ifdef WIN32
+setmode(fileno(stdout), _O_BINARY);
+#endif
 
 fprintf(stdout,"\\def\\CNSpreproc{%s}",banner);
 

Modified: trunk/Build/source/texk/cjkutils/cjkutils-src/SJISconv/sjisconv.c
===================================================================
--- trunk/Build/source/texk/cjkutils/cjkutils-src/SJISconv/sjisconv.c	2021-07-18 02:11:07 UTC (rev 59967)
+++ trunk/Build/source/texk/cjkutils/cjkutils-src/SJISconv/sjisconv.c	2021-07-18 02:50:36 UTC (rev 59968)
@@ -6,11 +6,18 @@
 
 #include <stdio.h> 
 #include <stdlib.h> 
+#ifdef WIN32
+#include <fcntl.h>
+#include <io.h>
+#endif
 
 
 int main(int argc,char*argv[])
 {int ch;
 
+#ifdef WIN32
+setmode(fileno(stdout), _O_BINARY);
+#endif
 fprintf(stdout,"\\def\\CJKpreproc{%s}",banner);
 
 ch= fgetc(stdin);

Modified: trunk/Build/source/texk/cjkutils/cjkutils-src/extconv/extconv.c
===================================================================
--- trunk/Build/source/texk/cjkutils/cjkutils-src/extconv/extconv.c	2021-07-18 02:11:07 UTC (rev 59967)
+++ trunk/Build/source/texk/cjkutils/cjkutils-src/extconv/extconv.c	2021-07-18 02:50:36 UTC (rev 59968)
@@ -6,11 +6,18 @@
 
 #include <stdio.h> 
 #include <stdlib.h> 
+#ifdef WIN32
+#include <fcntl.h>
+#include <io.h>
+#endif
 
 
 int main(int argc,char*argv[])
 {int ch;
 
+#ifdef WIN32
+setmode(fileno(stdout), _O_BINARY);
+#endif
 
 fprintf(stdout,"\\def\\CJKpreproc{%s}",banner);
 

Modified: trunk/Build/source/texk/cjkutils/cjkutils-src/hbf2gf/hbf2gf.c
===================================================================
--- trunk/Build/source/texk/cjkutils/cjkutils-src/hbf2gf/hbf2gf.c	2021-07-18 02:11:07 UTC (rev 59967)
+++ trunk/Build/source/texk/cjkutils/cjkutils-src/hbf2gf/hbf2gf.c	2021-07-18 02:50:36 UTC (rev 59968)
@@ -286,9 +286,9 @@
 FILE*config,*out;
 HBF*hbf;
 
-#ifdef msdos 
+#ifdef WIN32
 #define WRITE_BIN   "wb"
-#define WRITE_TXT   "wt"
+#define WRITE_TXT   "wb"
 #define READ_BIN    "rb"
 #define READ_TXT    "rt"
 #else



More information about the tex-live-commits mailing list.