summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Kew <jfkthame@googlemail.com>2010-06-22 12:27:58 +0000
committerJonathan Kew <jfkthame@googlemail.com>2010-06-22 12:27:58 +0000
commit9e0916758be53bdbf9a7b99630e2cca35a5389c9 (patch)
treef04822fe6a8e9db76932cef82785894af8d79597
parent148d1706e5e028714c31560a02d6d8f449df7608 (diff)
xetex 0.9997.2 - fix issue with \XeTeXdefaultencoding and zero-length input file
git-svn-id: svn://tug.org/texlive/trunk@19105 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/web2c/xetexdir/XeTeX_ext.c4
-rw-r--r--Build/source/texk/web2c/xetexdir/xetex.ch2
2 files changed, 3 insertions, 3 deletions
diff --git a/Build/source/texk/web2c/xetexdir/XeTeX_ext.c b/Build/source/texk/web2c/xetexdir/XeTeX_ext.c
index dd9934c41b9..b65205c1cb6 100644
--- a/Build/source/texk/web2c/xetexdir/XeTeX_ext.c
+++ b/Build/source/texk/web2c/xetexdir/XeTeX_ext.c
@@ -363,9 +363,10 @@ input_line(UFILE* f)
static char* byteBuffer = NULL;
static UInt32 *utf32Buf = NULL;
int i, tmpLen;
-
int norm = getinputnormalizationstate();
+ last = first;
+
if (f->encodingMode == ICUMAPPING) {
UInt32 bytesRead = 0;
UConverter* cnv;
@@ -457,7 +458,6 @@ static UInt32 *utf32Buf = NULL;
break;
default: // none
- last = first;
if (last < bufsize && i != EOF && i != '\n' && i != '\r')
buffer[last++] = i;
if (i != EOF && i != '\n' && i != '\r')
diff --git a/Build/source/texk/web2c/xetexdir/xetex.ch b/Build/source/texk/web2c/xetexdir/xetex.ch
index a4c7c3ba4bf..367f30bff28 100644
--- a/Build/source/texk/web2c/xetexdir/xetex.ch
+++ b/Build/source/texk/web2c/xetexdir/xetex.ch
@@ -67,7 +67,7 @@ authorization from the copyright holders.
@d XeTeX_version=0
@d XeTeX_revision==".9997"
-@d XeTeX_version_string=='-0.9997.1' {current \XeTeX\ version}
+@d XeTeX_version_string=='-0.9997.2' {current \XeTeX\ version}
@z
@x