branch master updated: Fix texinfo.tex for 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 aa7e4b4c90 Fix texinfo.tex for XeTeX
aa7e4b4c90 is described below

commit aa7e4b4c90a278d6b1e26070f1e994a3f1bcfe77
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Sat Aug 20 20:54:09 2022 +0100

    Fix texinfo.tex for XeTeX
    
    * doc/texinfo.tex (\DeclareUnicodeCharacterNative):
    Do not override any active definitions for ASCII characters.
    Broken output for hyphen reported by Werner.
---
 ChangeLog       |  8 ++++++++
 doc/texinfo.tex | 36 +++++++++++++++++++-----------------
 2 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9954ea64b8..2054b752b1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2022-08-20  Gavin Smith  <gavinsmith0123@gmail.com>
+
+       Fix texinfo.tex for XeTeX
+
+       * doc/texinfo.tex (\DeclareUnicodeCharacterNative):
+       Do not override any active definitions for ASCII characters.
+       Broken output for hyphen reported by Werner.
+
 2022-08-20  Patrice Dumas  <pertusus@free.fr>
 
        Document that input and output file names should only be ASCII
diff --git a/doc/texinfo.tex b/doc/texinfo.tex
index 7d00f0973e..4a5c74e6f4 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-20.18}
+\def\texinfoversion{2022-08-20.19}
 %
 % Copyright 1985, 1986, 1988, 1990-2022 Free Software Foundation, Inc.
 %
@@ -11115,24 +11115,26 @@ directory should work if nowhere else does.}
 % provide a definition macro to replace/pass-through a Unicode character
 %
 \def\DeclareUnicodeCharacterNative#1#2{%
-  \ifnum"#1>"7F \catcode"#1=\active \fi % only make non-ASCII chars active
-  \def\dodeclareunicodecharacternative##1##2##3{%
+  \ifnum"#1>"7F % only make non-ASCII chars active
+    \catcode"#1=\active
+    \def\dodeclareunicodecharacternative##1##2##3{%
+      \begingroup
+        \uccode`\~="##2\relax
+        \uppercase{\gdef~}{%
+          \ifpassthroughchars
+            ##1%
+          \else
+            ##3%
+          \fi
+        }
+      \endgroup
+    }
     \begingroup
-      \uccode`\~="##2\relax
-      \uppercase{\gdef~}{%
-        \ifpassthroughchars
-          ##1%
-        \else
-          ##3%
-        \fi
-      }
+      \uccode`\.="#1\relax
+      \uppercase{\def\UTFNativeTmp{.}}%
+      \expandafter\dodeclareunicodecharacternative\UTFNativeTmp{#1}{#2}%
     \endgroup
-  }
-  \begingroup
-    \uccode`\.="#1\relax
-    \uppercase{\def\UTFNativeTmp{.}}%
-    \expandafter\dodeclareunicodecharacternative\UTFNativeTmp{#1}{#2}%
-  \endgroup
+  \fi
 }
 
 % Native Unicode handling (XeTeX and LuaTeX) character replacing definition.