Fri Jan 10 06:37:16 CET 2003  Stepan Kasal  <address@hidden>

	* texinfo.tex (\preventexpand): New macro, prevents expansion of
	  some macros by letting them to \relax.
	  (\dosetq, \onepageout): Call also \preventexpand, not only
	  \normalturnoffactive.  Perhaps \preventexpand could become
	  part of \normalturnoffactive.
	  

--- texinfo.tex.orig	Thu Jan  9 15:21:51 2003
+++ texinfo.tex	Fri Jan 10 06:36:40 2003
@@ -240,6 +240,8 @@
     \indexdummies         % don't expand commands in the output.
     \normalturnoffactive  % \ in index entries must not stay \, e.g., if
                    % the page break happens to be in the middle of an example.
+    \preventexpand        % Do not expand some macros while writing them
+                          % to a file.
     \shipout\vbox{%
       % Do this early so pdf references go to the beginning of the page.
       \ifpdfmakepagedest \pdfmkdest{\the\pageno} \fi
@@ -5802,11 +5804,20 @@
 \def\dosetq#1#2{%
   {\let\folio=0%
    \normalturnoffactive
+   \preventexpand
    \edef\next{\write\auxfile{\internalsetq{#1}{#2}}}%
    \iflinks
      \next
    \fi
   }%
+}
+
+% Secure the macros which shouldn't be expanded before they are written
+% to a file.
+\def\preventexpand{%
+  \let\tieaccent = \relax
+  \let\ubaraccent = \relax
+  \let\udotaccent = \relax
 }
 
 % \internalsetq {foo}{page} expands into