branch master updated: Fix texinfo.tex with XeTeX

[Gavin D. Smith]

This is an automated email from the git hooks/post-receive script.

gavin pushed a commit to branch master
in repository texinfo.

The following commit(s) were added to refs/heads/master by this push:
     new 4c440ec911 Fix texinfo.tex with XeTeX
4c440ec911 is described below

commit 4c440ec9111b5cf7a8ce75664d106be2762d506a
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Sat Aug 20 14:11:34 2022 +0100

    Fix texinfo.tex with XeTeX
    
    * doc/texinfo.tex (\unicodechardefs): Comment out declarations of
    ASCII characters with \DeclareUnicodeCharacter.  Supply a space after
    \char argument to terminate numbers in case code is ever used again.
    
    Werner Lemberg reported texinfo.tex would break with XeTeX.
---
 ChangeLog       |  10 +++
 doc/texinfo.tex | 194 ++++++++++++++++++++++++++++----------------------------
 2 files changed, 108 insertions(+), 96 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 58b3dc3185..55b4ab2676 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2022-08-20  Gavin Smith  <gavinsmith0123@gmail.com>
+
+       Fix texinfo.tex with XeTeX
+
+       * doc/texinfo.tex (\unicodechardefs): Comment out declarations of
+       ASCII characters with \DeclareUnicodeCharacter.  Supply a space after
+       \char argument to terminate numbers in case code is ever used again.
+
+       Werner Lemberg reported texinfo.tex would break with XeTeX.
+
 2022-08-20  Gavin Smith  <gavinsmith0123@gmail.com>
 
        * info/util.c (text_buffer_iconv): Handle E2BIG error here.
diff --git a/doc/texinfo.tex b/doc/texinfo.tex
index f11181274c..da348d5d43 100644
--- a/doc/texinfo.tex
+++ b/doc/texinfo.tex
@@ -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{2022-08-21.14}
+\def\texinfoversion{2022-08-20.13}
 %
 % Copyright 1985, 1986, 1988, 1990-2022 Free Software Foundation, Inc.
 %
@@ -10333,101 +10333,103 @@ directory should work if nowhere else does.}
 % least make most of the characters not bomb out.
 %
 \def\unicodechardefs{%
-  \DeclareUnicodeCharacter{0020}{ } % space
-  \DeclareUnicodeCharacter{0021}{\char"21}
-  \DeclareUnicodeCharacter{0022}{\char"22}
-  \DeclareUnicodeCharacter{0023}{\char"23}
-  \DeclareUnicodeCharacter{0024}{\char"24}
-  \DeclareUnicodeCharacter{0025}{\char"25}
-  \DeclareUnicodeCharacter{0026}{\char"26}
-  \DeclareUnicodeCharacter{0027}{\char"27}
-  \DeclareUnicodeCharacter{0028}{\char"28}
-  \DeclareUnicodeCharacter{0029}{\char"29}
-  \DeclareUnicodeCharacter{002A}{\char"2A}
-  \DeclareUnicodeCharacter{002B}{\char"2B}
-  \DeclareUnicodeCharacter{002C}{\char"2C}
-  \DeclareUnicodeCharacter{002D}{\char"2D}
-  \DeclareUnicodeCharacter{002E}{\char"2E}
-  \DeclareUnicodeCharacter{002F}{\char"2F}
-  \DeclareUnicodeCharacter{0030}{0}%
-  \DeclareUnicodeCharacter{0031}{1}%
-  \DeclareUnicodeCharacter{0032}{2}%
-  \DeclareUnicodeCharacter{0033}{3}%
-  \DeclareUnicodeCharacter{0034}{4}%
-  \DeclareUnicodeCharacter{0035}{5}%
-  \DeclareUnicodeCharacter{0036}{6}%
-  \DeclareUnicodeCharacter{0037}{7}%
-  \DeclareUnicodeCharacter{0038}{8}%
-  \DeclareUnicodeCharacter{0039}{9}%
-  \DeclareUnicodeCharacter{003A}{\char"3A}
-  \DeclareUnicodeCharacter{003B}{\char"3B}
-  \DeclareUnicodeCharacter{003C}{\char"3C}
-  \DeclareUnicodeCharacter{003D}{\char"3D}
-  \DeclareUnicodeCharacter{003E}{\char"3E}
-  \DeclareUnicodeCharacter{003F}{\char"3F}
-  \DeclareUnicodeCharacter{0040}{\char"40}
-  \DeclareUnicodeCharacter{0041}{A}%
-  \DeclareUnicodeCharacter{0042}{B}%
-  \DeclareUnicodeCharacter{0043}{C}%
-  \DeclareUnicodeCharacter{0044}{D}%
-  \DeclareUnicodeCharacter{0045}{E}%
-  \DeclareUnicodeCharacter{0046}{F}%
-  \DeclareUnicodeCharacter{0047}{G}%
-  \DeclareUnicodeCharacter{0048}{H}%
-  \DeclareUnicodeCharacter{0049}{I}%
-  \DeclareUnicodeCharacter{004A}{J}%
-  \DeclareUnicodeCharacter{004B}{K}%
-  \DeclareUnicodeCharacter{004C}{L}%
-  \DeclareUnicodeCharacter{004D}{M}%
-  \DeclareUnicodeCharacter{004E}{N}%
-  \DeclareUnicodeCharacter{004F}{O}%
-  \DeclareUnicodeCharacter{0050}{P}%
-  \DeclareUnicodeCharacter{0051}{Q}%
-  \DeclareUnicodeCharacter{0052}{R}%
-  \DeclareUnicodeCharacter{0053}{S}%
-  \DeclareUnicodeCharacter{0054}{T}%
-  \DeclareUnicodeCharacter{0055}{U}%
-  \DeclareUnicodeCharacter{0056}{V}%
-  \DeclareUnicodeCharacter{0057}{W}%
-  \DeclareUnicodeCharacter{0058}{X}%
-  \DeclareUnicodeCharacter{0059}{Y}%
-  \DeclareUnicodeCharacter{005A}{Z}%
-  \DeclareUnicodeCharacter{005B}{\char"5B}
-  \DeclareUnicodeCharacter{005C}{\char"5C}
-  \DeclareUnicodeCharacter{005D}{\char"5D}
-  \DeclareUnicodeCharacter{005E}{\char"5E}
-  \DeclareUnicodeCharacter{005F}{\char"5F}
-  \DeclareUnicodeCharacter{0060}{\char"60}
-  \DeclareUnicodeCharacter{0061}{a}%
-  \DeclareUnicodeCharacter{0062}{b}%
-  \DeclareUnicodeCharacter{0063}{c}%
-  \DeclareUnicodeCharacter{0064}{d}%
-  \DeclareUnicodeCharacter{0065}{e}%
-  \DeclareUnicodeCharacter{0066}{f}%
-  \DeclareUnicodeCharacter{0067}{g}%
-  \DeclareUnicodeCharacter{0068}{h}%
-  \DeclareUnicodeCharacter{0069}{i}%
-  \DeclareUnicodeCharacter{006A}{j}%
-  \DeclareUnicodeCharacter{006B}{k}%
-  \DeclareUnicodeCharacter{006C}{l}%
-  \DeclareUnicodeCharacter{006D}{m}%
-  \DeclareUnicodeCharacter{006E}{n}%
-  \DeclareUnicodeCharacter{006F}{o}%
-  \DeclareUnicodeCharacter{0070}{p}%
-  \DeclareUnicodeCharacter{0071}{q}%
-  \DeclareUnicodeCharacter{0072}{r}%
-  \DeclareUnicodeCharacter{0073}{s}%
-  \DeclareUnicodeCharacter{0074}{t}%
-  \DeclareUnicodeCharacter{0075}{u}%
-  \DeclareUnicodeCharacter{0076}{v}%
-  \DeclareUnicodeCharacter{0077}{w}%
-  \DeclareUnicodeCharacter{0078}{x}%
-  \DeclareUnicodeCharacter{0079}{y}%
-  \DeclareUnicodeCharacter{007A}{z}%
-  \DeclareUnicodeCharacter{007B}{\char"7B}
-  \DeclareUnicodeCharacter{007C}{\char"7C}
-  \DeclareUnicodeCharacter{007D}{\char"7D}
-  \DeclareUnicodeCharacter{007E}{\char"7E}
+  % Disable ASCII definitions, as with the current implementation, this
+  % makes all characters output literally with XeTeX, including @.
+  % \DeclareUnicodeCharacter{0020}{ } % space
+  % \DeclareUnicodeCharacter{0021}{\char"21 } % space to terminate number
+  % \DeclareUnicodeCharacter{0022}{\char"22 }
+  % \DeclareUnicodeCharacter{0023}{\char"23 }
+  % \DeclareUnicodeCharacter{0024}{\char"24 }
+  % \DeclareUnicodeCharacter{0025}{\char"25 }
+  % \DeclareUnicodeCharacter{0026}{\char"26 }
+  % \DeclareUnicodeCharacter{0027}{\char"27 }
+  % \DeclareUnicodeCharacter{0028}{\char"28 }
+  % \DeclareUnicodeCharacter{0029}{\char"29 }
+  % \DeclareUnicodeCharacter{002A}{\char"2A }
+  % \DeclareUnicodeCharacter{002B}{\char"2B }
+  % \DeclareUnicodeCharacter{002C}{\char"2C }
+  % \DeclareUnicodeCharacter{002D}{\char"2D }
+  % \DeclareUnicodeCharacter{002E}{\char"2E }
+  % \DeclareUnicodeCharacter{002F}{\char"2F }
+  % \DeclareUnicodeCharacter{0030}{0}%
+  % \DeclareUnicodeCharacter{0031}{1}%
+  % \DeclareUnicodeCharacter{0032}{2}%
+  % \DeclareUnicodeCharacter{0033}{3}%
+  % \DeclareUnicodeCharacter{0034}{4}%
+  % \DeclareUnicodeCharacter{0035}{5}%
+  % \DeclareUnicodeCharacter{0036}{6}%
+  % \DeclareUnicodeCharacter{0037}{7}%
+  % \DeclareUnicodeCharacter{0038}{8}%
+  % \DeclareUnicodeCharacter{0039}{9}%
+  % \DeclareUnicodeCharacter{003A}{\char"3A }
+  % \DeclareUnicodeCharacter{003B}{\char"3B }
+  % \DeclareUnicodeCharacter{003C}{\char"3C }
+  % \DeclareUnicodeCharacter{003D}{\char"3D }
+  % \DeclareUnicodeCharacter{003E}{\char"3E }
+  % \DeclareUnicodeCharacter{003F}{\char"3F }
+  % \DeclareUnicodeCharacter{0040}{\char"40 }
+  % \DeclareUnicodeCharacter{0041}{A}%
+  % \DeclareUnicodeCharacter{0042}{B}%
+  % \DeclareUnicodeCharacter{0043}{C}%
+  % \DeclareUnicodeCharacter{0044}{D}%
+  % \DeclareUnicodeCharacter{0045}{E}%
+  % \DeclareUnicodeCharacter{0046}{F}%
+  % \DeclareUnicodeCharacter{0047}{G}%
+  % \DeclareUnicodeCharacter{0048}{H}%
+  % \DeclareUnicodeCharacter{0049}{I}%
+  % \DeclareUnicodeCharacter{004A}{J}%
+  % \DeclareUnicodeCharacter{004B}{K}%
+  % \DeclareUnicodeCharacter{004C}{L}%
+  % \DeclareUnicodeCharacter{004D}{M}%
+  % \DeclareUnicodeCharacter{004E}{N}%
+  % \DeclareUnicodeCharacter{004F}{O}%
+  % \DeclareUnicodeCharacter{0050}{P}%
+  % \DeclareUnicodeCharacter{0051}{Q}%
+  % \DeclareUnicodeCharacter{0052}{R}%
+  % \DeclareUnicodeCharacter{0053}{S}%
+  % \DeclareUnicodeCharacter{0054}{T}%
+  % \DeclareUnicodeCharacter{0055}{U}%
+  % \DeclareUnicodeCharacter{0056}{V}%
+  % \DeclareUnicodeCharacter{0057}{W}%
+  % \DeclareUnicodeCharacter{0058}{X}%
+  % \DeclareUnicodeCharacter{0059}{Y}%
+  % \DeclareUnicodeCharacter{005A}{Z}%
+  % \DeclareUnicodeCharacter{005B}{\char"5B }
+  % \DeclareUnicodeCharacter{005C}{\char"5C }
+  % \DeclareUnicodeCharacter{005D}{\char"5D }
+  % \DeclareUnicodeCharacter{005E}{\char"5E }
+  % \DeclareUnicodeCharacter{005F}{\char"5F }
+  % \DeclareUnicodeCharacter{0060}{\char"60 }
+  % \DeclareUnicodeCharacter{0061}{a}%
+  % \DeclareUnicodeCharacter{0062}{b}%
+  % \DeclareUnicodeCharacter{0063}{c}%
+  % \DeclareUnicodeCharacter{0064}{d}%
+  % \DeclareUnicodeCharacter{0065}{e}%
+  % \DeclareUnicodeCharacter{0066}{f}%
+  % \DeclareUnicodeCharacter{0067}{g}%
+  % \DeclareUnicodeCharacter{0068}{h}%
+  % \DeclareUnicodeCharacter{0069}{i}%
+  % \DeclareUnicodeCharacter{006A}{j}%
+  % \DeclareUnicodeCharacter{006B}{k}%
+  % \DeclareUnicodeCharacter{006C}{l}%
+  % \DeclareUnicodeCharacter{006D}{m}%
+  % \DeclareUnicodeCharacter{006E}{n}%
+  % \DeclareUnicodeCharacter{006F}{o}%
+  % \DeclareUnicodeCharacter{0070}{p}%
+  % \DeclareUnicodeCharacter{0071}{q}%
+  % \DeclareUnicodeCharacter{0072}{r}%
+  % \DeclareUnicodeCharacter{0073}{s}%
+  % \DeclareUnicodeCharacter{0074}{t}%
+  % \DeclareUnicodeCharacter{0075}{u}%
+  % \DeclareUnicodeCharacter{0076}{v}%
+  % \DeclareUnicodeCharacter{0077}{w}%
+  % \DeclareUnicodeCharacter{0078}{x}%
+  % \DeclareUnicodeCharacter{0079}{y}%
+  % \DeclareUnicodeCharacter{007A}{z}%
+  % \DeclareUnicodeCharacter{007B}{\char"7B }
+  % \DeclareUnicodeCharacter{007C}{\char"7C }
+  % \DeclareUnicodeCharacter{007D}{\char"7D }
+  % \DeclareUnicodeCharacter{007E}{\char"7E }
   % \DeclareUnicodeCharacter{007F}{} % DEL
   %
   \DeclareUnicodeCharacter{00A0}{\tie}%