[6930] XeTeX input encoding

[Gavin D. Smith]

Revision: 6930
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=6930
Author:   gavin
Date:     2016-01-07 22:51:36 +0000 (Thu, 07 Jan 2016)
Log Message:
-----------
XeTeX input encoding

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/doc/texinfo.tex

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2016-01-06 20:59:58 UTC (rev 6929)
+++ trunk/ChangeLog     2016-01-07 22:51:36 UTC (rev 6930)
@@ -1,3 +1,9 @@
+2016-01-07  Masamichi Hosoda  <address@hidden> (tiny change)
+
+        * doc/texinfo.tex: For XeTeX, fix input by bytes instead of
+        by UTF-8 codepoints. Settings for subsequent files to be read.
+       (\documentencoding): Settings for the document root file.
+
 2016-01-06  Gavin Smith  <address@hidden>
 
        * tp/Texinfo/Convert/XSParagraph/Makefile.am (install-data-hook):

Modified: trunk/doc/texinfo.tex
===================================================================
--- trunk/doc/texinfo.tex       2016-01-06 20:59:58 UTC (rev 6929)
+++ trunk/doc/texinfo.tex       2016-01-07 22:51:36 UTC (rev 6930)
@@ -3,7 +3,7 @@
 % Load plain if necessary, i.e., if running under initex.
 \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
 %
-\def\texinfoversion{2016-01-04.21}
+\def\texinfoversion{2016-01-07.22}
 %
 % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -9432,7 +9432,8 @@
 % otherwise the encoding support is completely broken.
 \ifx\XeTeXrevision\thisisundefined
 \else
-\XeTeXinputencoding "bytes"
+\XeTeXdefaultencoding "bytes"  % For subsequent files to be read
+\XeTeXinputencoding "bytes"  % Effective in texinfo.tex only
 \fi
 
 \ifx\luatexversion\thisisundefined
@@ -9477,6 +9478,14 @@
 %
 \def\documentencoding{\parseargusing\filenamecatcodes\documentencodingzzz}
 \def\documentencodingzzz#1{%
+  % Get input by bytes instead of by UTF-8 codepoints for XeTeX,
+  % otherwise the encoding support is completely broken.
+  % This settings is for the document root file.
+  \ifx\XeTeXrevision\thisisundefined
+  \else
+    \XeTeXinputencoding "bytes"
+  \fi
+  %
   % Encoding being declared for the document.
   \def\declaredencoding{\csname #1.enc\endcsname}%
   %