branch master updated: Page ref hook

[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 a05798d273 Page ref hook
a05798d273 is described below

commit a05798d27397e2594b119ba14c0ad5a798e66b21
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Tue Oct 18 19:07:18 2022 +0100

    Page ref hook
    
    * doc/texinfo.tex (\xrefX, \putpageref): Split out
    macro to print "page NUMBER".
    * doc/txi-zh.tex: Use to reverse the word order.
    From Wu XiangCheng.
---
 ChangeLog       |  9 +++++++++
 doc/texinfo.tex | 13 ++++++++-----
 doc/txi-zh.tex  |  6 ++++--
 3 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index cdb591671f..e3251cbd50 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2022-10-18  Gavin Smith  <gavinsmith0123@gmail.com>
+
+       Page ref hook
+
+       * doc/texinfo.tex (\xrefX, \putpageref): Split out
+       macro to print "page NUMBER".
+       * doc/txi-zh.tex: Use to reverse the word order.
+       From Wu XiangCheng.
+
 2022-10-18  Gavin Smith  <gavinsmith0123@gmail.com>
 
        * doc/txi-zh.tex: Override \thischapterAppendix,
diff --git a/doc/texinfo.tex b/doc/texinfo.tex
index 39afa20dcd..596cab3289 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-10-18.17}
+\def\texinfoversion{2022-10-18.18}
 %
 % Copyright 1985, 1986, 1988, 1990-2022 Free Software Foundation, Inc.
 %
@@ -8907,11 +8907,10 @@ might help (with 'rm \jobname.?? \jobname.??s')%
       \xrefprintnodename\printedrefname
       %
       \ifflagclear{txiomitxrefpg}{%
-        % But we always want a comma and a space:
-        ,\space
-        %
+        % We always want a comma
+        ,%
         % output the `page 3'.
-        \turnoffactive \putwordpage\tie\refx{#1-pg}%
+        \turnoffactive \putpageref{#1}%
         % Add a , if xref followed by a space
         \if\space\noexpand\tokenafterxref ,%
         \else\ifx\     \tokenafterxref ,% @TAB
@@ -8927,6 +8926,10 @@ might help (with 'rm \jobname.?? \jobname.??s')%
   \endlink
 \endgroup}
 
+% can be overridden in translation files
+\def\putpageref#1{%
+  \space\putwordpage\tie\refx{#1-pg}}
+
 % Output a cross-manual xref to #1.  Used just above (twice).
 % 
 % Only include the text "Section ``foo'' in" if the foo is neither
diff --git a/doc/txi-zh.tex b/doc/txi-zh.tex
index 90601aa4e0..ca64316115 100644
--- a/doc/txi-zh.tex
+++ b/doc/txi-zh.tex
@@ -76,8 +76,8 @@
   \number\day 日}
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% fix Chinese chapter/section dispaly
-% modify \chapmacro, \sectionheading
+% fix Chinese chapter/section display
+% modify \chapmacro, \sectionheading, \xrefX
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \def\thischapterAppendix{%
@@ -89,6 +89,8 @@
 \def\thissectionDef{%
   \putwordAppendix{} \thissectionnum\putwordSection{}\space\thissectionname}
 
+\def\putpageref#1{ \refx{#1-pg}\tie\putwordpage}
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % Chinese font definitions
 % font choice: 1. Noto Serif CJK 思源宋体 NotoSerifCJK-Regular.ttc