[5405] complain about nested footnotes

[karl]

Revision: 5405
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=5405
Author:   karl
Date:     2014-01-16 19:00:21 +0000 (Thu, 16 Jan 2014)
Log Message:
-----------
complain about nested footnotes

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/doc/texinfo.tex

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2014-01-16 08:49:43 UTC (rev 5404)
+++ trunk/ChangeLog     2014-01-16 19:00:21 UTC (rev 5405)
@@ -1,3 +1,8 @@
+2014-01-16  Karl Berry  <address@hidden>
+
+       * doc/texinfo.tex (\errfootnote): nested footnotes not supported.
+       (\dofootnote): check for this.  Report from Arnold.
+
 2014-01-16  Sergey Poznyakoff  <address@hidden>
 
        * info/info.c (show_error_node): Avoid coredumping when

Modified: trunk/doc/texinfo.tex
===================================================================
--- trunk/doc/texinfo.tex       2014-01-16 08:49:43 UTC (rev 5404)
+++ trunk/doc/texinfo.tex       2014-01-16 19:00:21 UTC (rev 5405)
@@ -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{2013-12-26.17}
+\def\texinfoversion{2014-01-16.10}
 %
 % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -8336,6 +8336,7 @@
 \gdef\footnote{%
   \let\indent=\ptexindent
   \let\noindent=\ptexnoindent
+  %
   \global\advance\footnoteno by address@hidden
   \edef\thisfootno{$^{\the\footnoteno}$}%
   %
@@ -8359,6 +8360,11 @@
 %
 \gdef\dofootnote{%
   \insert\footins\bgroup
+  %
+  % Nested footnotes are not supported in TeX, that would take a lot
+  % more work.  (\startsavinginserts does not suffice.)
+  \let\footnote=\errfootnote
+  %
   % We want to typeset this text as a normal paragraph, even if the
   % footnote reference occurs in (for example) a display environment.
   % So reset some parameters.
@@ -8396,13 +8402,19 @@
 }
 }%end \catcode address@hidden
 
+\def\errfootnote{%
+  \errhelp=\EMsimple
+  \errmessage{Nested footnotes not supported in texinfo.tex,
+    even though they work in makeinfo; sorry}
+}
+
 % In case a @footnote appears in a vbox, save the footnote text and create
 % the real \insert just after the vbox finished.  Otherwise, the insertion
 % would be lost.
 % Similarly, if a @footnote appears inside an alignment, save the footnote
 % text to a box and make the \insert when a row of the table is finished.
 % And the same can be done for other insert classes.  --kasal, 16nov03.
-
+%
 % Replace the \insert primitive by a cheating macro.
 % Deeper inside, just make sure that the saved insertions are not spilled
 % out prematurely.