added xetex support to web2c conversion tools in texk/web2c/web2c

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

4 files changed, 22 insertions, 3 deletions

diff --git a/Build/source/texk/web2c/web2c/ChangeLog b/Build/source/texk/web2c/web2c/ChangeLog
index b6cdad03723..c1bf656a2c8 100644
--- a/Build/source/texk/web2c/web2c/ChangeLog
+++ b/Build/source/texk/web2c/web2c/ChangeLog
@@ -1,3 +1,11 @@
+2006-05-26  Jonathan Kew <jonathan_kew@sil.org>
+
+	* coerce.h: add support for xetex
+
+	* convert: add support for xetex
+
+	* splitup.c: add support for xetex
+
 2005-07-27  Olaf Weber  <olaf@infovore.xs4all.nl>
 
 	* convert.bat: New file, .bat version of convert script.
diff --git a/Build/source/texk/web2c/web2c/coerce.h b/Build/source/texk/web2c/web2c/coerce.h
index dfe8e38927e..d91fe7d6e9e 100644
--- a/Build/source/texk/web2c/web2c/coerce.h
+++ b/Build/source/texk/web2c/web2c/coerce.h
@@ -30,6 +30,10 @@ extern strnumber getjobname P1H(strnumber);
 /* MP defined poolASCIIcode instead of packedASCIIcode, sigh. */
 typedef poolASCIIcode packedASCIIcode;
 #endif
+#ifdef XeTeX
+/* XeTeX redefines "ASCII" types.... */
+typedef packedUTF16code packedASCIIcode;
+#endif
 extern void calledit P4H(packedASCIIcode *, poolpointer, integer, integer);
 
 #ifdef MF
@@ -52,3 +56,7 @@ extern void remembersourceinfo P2H(strnumber, int);
 #ifdef pdfeTeX
 #include <pdfetexdir/pdfetex.h>
 #endif /* pdfeTeX */
+
+#ifdef XeTeX
+#include <xetexdir/xetex.h>
+#endif /* XeTeX */
diff --git a/Build/source/texk/web2c/web2c/convert b/Build/source/texk/web2c/web2c/convert
index 0adee29cecf..3c5b72f617b 100755
--- a/Build/source/texk/web2c/web2c/convert
+++ b/Build/source/texk/web2c/web2c/convert
@@ -60,7 +60,7 @@ case $basefile in
     output_files="$basefile[0-9].c ${basefile}ini.c ${basefile}d.h \
 ${basefile}coerce.h"
     ;;
-  tex|eomega|etex|pdftex|pdfetex|omega|aleph)
+  tex|eomega|etex|pdftex|pdfetex|omega|aleph|xetex)
     more_defines="$srcdir/web2c/texmf.defines"
     prog_defines="$srcdir/${basefile}dir/$basefile.defines"
     if test -f $prog_defines; then
@@ -105,7 +105,7 @@ case $basefile in
     sed -e 's/(buftype)//g' -e 's/(pdstype)//g' <bibtex.h >xbibtex.h
     mv xbibtex.h bibtex.h
     ;;
-  tex|eomega|etex|pdftex|pdfetex|omega|aleph|mf|mp)
+  tex|eomega|etex|pdftex|pdfetex|omega|aleph|mf|mp|xetex)
     sleep 2 # so timestamps are definitely later, to avoid make weirdness
     cat ${basefile}coerce.h $srcdir/web2c/coerce.h >x${basefile}coerce.h
     mv x${basefile}coerce.h ${basefile}coerce.h
diff --git a/Build/source/texk/web2c/web2c/splitup.c b/Build/source/texk/web2c/web2c/splitup.c
index 7f4a11a7aed..bb3c471efac 100644
--- a/Build/source/texk/web2c/web2c/splitup.c
+++ b/Build/source/texk/web2c/web2c/splitup.c
@@ -113,11 +113,14 @@ main P2C(int, argc, string *, argv)
   } else if (STREQ (output_name, "pdfetex")) {
     fputs ("#define INITEX\n#define TeX\n#define pdfeTeX\n", out);
     coerce = "pdfetexcoerce.h";
+  } else if (STREQ (output_name, "xetex")) {
+    fputs ("#define INITEX\n#define TeX\n#define XeTeX\n", out);
+    coerce = "xetexcoerce.h";
   } else if (STREQ (output_name, "mp")) {
     fputs ("#define INIMP\n#define MP\n", out);
     coerce = "mpcoerce.h";
   } else
-    FATAL1 ("Can only split mf, mp, tex, etex, omega, eomega, aleph, or pdf[ex]tex,\n not %s", output_name);
+    FATAL1 ("Can only split mf, mp, tex, etex, omega, eomega, aleph, pdf[e]tex, or xetex,\n not %s", output_name);
   
   coerce_len = strlen (coerce);