texinfo doc/texinfo.tex ChangeLog

[Oleg Katsitadze]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Oleg Katsitadze <olegkat>       09/03/23 00:05:22

Modified files:
        doc            : texinfo.tex 
        .              : ChangeLog 

Log message:
        doc/texinfo.tex (\chapterzzz, \appendixzzz, \chapmacro):
        (\sectionheading):  Be careful not to expand \putwordChapter,
        \putwordSection and \putwordAppendix unnecessarily, because some
        of the translations contain complex macros to typeset non-latin
        glyphs.  Report from Arni Magnusson, 18 Mar 2009 22:58:25.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/doc/texinfo.tex?cvsroot=texinfo&r1=1.298&r2=1.299
http://cvs.savannah.gnu.org/viewcvs/texinfo/ChangeLog?cvsroot=texinfo&r1=1.986&r2=1.987

Patches:
Index: doc/texinfo.tex
===================================================================
RCS file: /sources/texinfo/texinfo/doc/texinfo.tex,v
retrieving revision 1.298
retrieving revision 1.299
diff -u -b -r1.298 -r1.299
--- doc/texinfo.tex     22 Mar 2009 00:54:32 -0000      1.298
+++ doc/texinfo.tex     23 Mar 2009 00:05:21 -0000      1.299
@@ -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{2009-03-21.17}
+\def\texinfoversion{2009-03-22.16}
 %
 % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -5138,7 +5138,9 @@
   \gdef\chaplevelprefix{\the\chapno.}%
   \resetallfloatnos
   %
-  \message{\putwordChapter\space \the\chapno}%
+  % \putwordChapter can contain complex things in translations.
+  \toks0=\expandafter{\putwordChapter}%
+  \message{\the\toks0 \space \the\chapno}%
   %
   % Write the actual heading.
   \chapmacro{#1}{Ynumbered}{\the\chapno}%
@@ -5157,8 +5159,9 @@
   \gdef\chaplevelprefix{\appendixletter.}%
   \resetallfloatnos
   %
-  \def\appendixnum{\putwordAppendix\space \appendixletter}%
-  \message{\appendixnum}%
+  % \putwordAppendix can contain complex things in translations.
+  \toks0=\expandafter{\putwordAppendix}%
+  \message{\the\toks0 \space \appendixletter}%
   %
   \chapmacro{#1}{Yappendix}{\appendixletter}%
   %
@@ -5391,7 +5394,10 @@
     \xdef\lastchapterdefs{%
       \gdef\noexpand\thischaptername{\the\toks0}%
       \gdef\noexpand\thischapternum{\appendixletter}%
-      \gdef\noexpand\thischapter{\putwordAppendix{} \noexpand\thischapternum:
+      % \noexpand\putwordAppendix avoids expanding indigestible
+      % commands in some of the translations.
+      \gdef\noexpand\thischapter{\noexpand\putwordAppendix{}
+                                 \noexpand\thischapternum:
                                  \noexpand\thischaptername}%
     }%
   \else
@@ -5399,7 +5405,10 @@
     \xdef\lastchapterdefs{%
       \gdef\noexpand\thischaptername{\the\toks0}%
       \gdef\noexpand\thischapternum{\the\chapno}%
-      \gdef\noexpand\thischapter{\putwordChapter{} \noexpand\thischapternum:
+      % \noexpand\putwordChapter avoids expanding indigestible
+      % commands in some of the translations.
+      \gdef\noexpand\thischapter{\noexpand\putwordChapter{}
+                                 \noexpand\thischapternum:
                                  \noexpand\thischaptername}%
     }%
   \fi\fi\fi
@@ -5542,7 +5551,10 @@
         \xdef\lastsectiondefs{%
           \gdef\noexpand\thissectionname{\the\toks0}%
           \gdef\noexpand\thissectionnum{#4}%
-          \gdef\noexpand\thissection{\putwordSection{} 
\noexpand\thissectionnum:
+          % \noexpand\putwordSection avoids expanding indigestible
+          % commands in some of the translations.
+          \gdef\noexpand\thissection{\noexpand\putwordSection{}
+                                     \noexpand\thissectionnum:
                                      \noexpand\thissectionname}%
         }%
       \fi
@@ -5552,7 +5564,10 @@
         \xdef\lastsectiondefs{%
           \gdef\noexpand\thissectionname{\the\toks0}%
           \gdef\noexpand\thissectionnum{#4}%
-          \gdef\noexpand\thissection{\putwordSection{} 
\noexpand\thissectionnum:
+          % \noexpand\putwordSection avoids expanding indigestible
+          % commands in some of the translations.
+          \gdef\noexpand\thissection{\noexpand\putwordSection{}
+                                     \noexpand\thissectionnum:
                                      \noexpand\thissectionname}%
         }%
       \fi

Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.986
retrieving revision 1.987
diff -u -b -r1.986 -r1.987
--- ChangeLog   22 Mar 2009 00:54:33 -0000      1.986
+++ ChangeLog   23 Mar 2009 00:05:21 -0000      1.987
@@ -1,3 +1,11 @@
+2009-03-22  Oleg Katsitadze <address@hidden>
+
+       * doc/texinfo.tex (\chapterzzz, \appendixzzz, \chapmacro):
+       (\sectionheading):  Be careful not to expand \putwordChapter,
+       \putwordSection and \putwordAppendix unnecessarily, because some
+       of the translations contain complex macros to typeset non-latin
+       glyphs.  Report from Arni Magnusson, 18 Mar 2009 22:58:25.
+
 2009-03-21  Karl Berry  <address@hidden>
 
        * doc/texinfo.tex (\commondummies, \indexnofonts): handle