[5928] \footnote: do not globally change \indent and \noindent to their \ptex...

[karl]

Revision: 5928
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=5928
Author:   karl
Date:     2014-11-14 15:55:53 +0000 (Fri, 14 Nov 2014)
Log Message:
-----------
\footnote: do not globally change \indent and \noindent to their \ptex... 
counterparts; explicit error for footnotes in headings

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2014-11-14 13:32:00 UTC (rev 5927)
+++ trunk/ChangeLog     2014-11-14 15:55:53 UTC (rev 5928)
@@ -1,3 +1,16 @@
+2014-11-14  Karl Berry  <address@hidden>
+
+       * doc/texinfo.tex (\footnote): do not set \indent and \noindent
+       to their \ptex... versions; these become global settings, and seem
+       unnecessary since the only time we redefine \indent and \noindent
+       is with @firstparagraphindent for section headings, and footnotes
+       cannot work in headings anyway.  What am I missing?  Could not
+       construct an example where it mattered.
+       (\errfootnoteheading): new macro, for \chapmacro and \sectionheading.
+       (\errfootnotenest): rename from \errfootnote.
+       * doc/texinfo.texi (Footnotes): mention that they cannot be nested
+       and cannot appear in section headings.
+
 2014-11-14  Gavin Smith  <address@hidden>
 
        * info/infomap.h (KEYMAP_ENTRY) <function>: Replace with a union 

Modified: trunk/doc/texinfo.tex
===================================================================
--- trunk/doc/texinfo.tex       2014-11-14 13:32:00 UTC (rev 5927)
+++ trunk/doc/texinfo.tex       2014-11-14 15:55:53 UTC (rev 5928)
@@ -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{2014-10-29.10}
+\def\texinfoversion{2014-11-14.07}
 %
 % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -1010,24 +1010,15 @@
 % paragraph.
 %
 \gdef\dosuppressfirstparagraphindent{%
-  \gdef\indent{%
-    \restorefirstparagraphindent
-    \indent
-  }%
-  \gdef\noindent{%
-    \restorefirstparagraphindent
-    \noindent
-  }%
-  \global\everypar = {%
-    \kern -\parindent
-    \restorefirstparagraphindent
-  }%
+  \gdef\indent  {\restorefirstparagraphindent \indent}%
+  \gdef\noindent{\restorefirstparagraphindent \noindent}%
+  \global\everypar = {\kern -\parindent \restorefirstparagraphindent}%
 }
-
+%
 \gdef\restorefirstparagraphindent{%
-  \global \let \indent = \ptexindent
-  \global \let \noindent = \ptexnoindent
-  \global \everypar = {}%
+  \global\let\indent = \ptexindent
+  \global\let\noindent = \ptexnoindent
+  \global\everypar = {}%
 }
 
 
@@ -5801,6 +5792,7 @@
   %
   {%
     \chapfonts \rmisbold
+    \let\footnote=\errfootnoteheading % give better error message
     %
     % Have to define \lastsection before calling \donoderef, because the
     % xref code eventually uses it.  On the other hand, it has to be called
@@ -5912,6 +5904,7 @@
     \ifx\temptype\Yomitfromtockeyword\else
       \checkenv{}% address@hidden should not be in an environment.
     \fi
+    \let\footnote=\errfootnoteheading
     %
     % Switch to the right set of fonts.
     \csname #2fonts\endcsname \rmisbold
@@ -8368,9 +8361,6 @@
 %
 % Auto-number footnotes.  Otherwise like plain.
 \gdef\footnote{%
-  \let\indent=\ptexindent
-  \let\noindent=\ptexnoindent
-  %
   \global\advance\footnoteno by address@hidden
   \edef\thisfootno{$^{\the\footnoteno}$}%
   %
@@ -8397,7 +8387,7 @@
   %
   % Nested footnotes are not supported in TeX, that would take a lot
   % more work.  (\startsavinginserts does not suffice.)
-  \let\footnote=\errfootnote
+  \let\footnote=\errfootnotenest
   %
   % We want to typeset this text as a normal paragraph, even if the
   % footnote reference occurs in (for example) a display environment.
@@ -8436,12 +8426,17 @@
 }
 }%end \catcode address@hidden
 
-\def\errfootnote{%
+\def\errfootnotenest{%
   \errhelp=\EMsimple
   \errmessage{Nested footnotes not supported in texinfo.tex,
     even though they work in makeinfo; sorry}
 }
 
+\def\errfootnoteheading{%
+  \errhelp=\EMsimple
+  \errmessage{Footnotes in chapters, sections, etc., are not supported}
+}
+
 % 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.

Modified: trunk/doc/texinfo.texi
===================================================================
--- trunk/doc/texinfo.texi      2014-11-14 13:32:00 UTC (rev 5927)
+++ trunk/doc/texinfo.texi      2014-11-14 15:55:53 UTC (rev 5928)
@@ -10198,11 +10198,13 @@
 primary text, but a reader should not need to read a footnote to
 understand the primary text.  For a thorough discussion of footnotes,
 see @cite{The Chicago Manual of Style}, which is published by the
-University of Chicago Press.}  Footnotes are distracting; use them
-sparingly at most, and it is best to avoid them completely.  Standard
-bibliographical references are better placed in a bibliography at the
-end of a document instead of in footnotes throughout.
+University of Chicago Press.}
 
+Footnotes are distracting; use them sparingly at most, and it is best
+to avoid them completely.  Standard bibliographical references are
+usually better placed in a bibliography at the end of a document
+instead of in footnotes throughout.
+
 @menu
 * Footnote Commands::           How to write a footnote in Texinfo.
 * Footnote Styles::             Controlling how footnotes appear in Info.
@@ -10235,10 +10237,12 @@
 address@hidden; in the Texinfo address@hidden
 @end example
 
-As you can see, the source includes two punctuation marks next to each
-other; in this case, @address@hidden;} is the sequence.  This is normal (the
-first ends the footnote and the second belongs to the sentence being
-footnoted), so don't worry that it looks odd.
+As you can see, this source includes two punctuation marks next to
+each other; in this case, @address@hidden;} is the sequence.  This is normal
+(the first ends the footnote and the second belongs to the sentence
+being footnoted), so don't worry that it looks odd.  (Another style,
+perfectly acceptable, is to put the footnote after punctuation
+belonging to the sentence, as in @samp{;@@address@hidden)
 
 In a printed manual or book, the reference mark for a footnote is a
 small, superscripted number; the text of the footnote appears at the
@@ -10253,11 +10257,16 @@
 small, superscripted number which is rendered as a hypertext link to
 the footnote text.
 
-By the way, footnotes in the argument of an @code{@@item} command for
-an @code{@@table} must be on the same line as the @code{@@item} (as
-usual).  @xref{Two-column Tables}.
address@hidden Critical editions
address@hidden Nested footnotes
+Footnotes cannot be nested, and cannot appear in section headings of
+any kind or other ``unusual'' places.
 
+A final tip: footnotes in the argument of an @code{@@item} command for
+an @code{@@table} must be entirely on the same line as the
address@hidden@@item} (as usual).  @xref{Two-column Tables}.
 
+
 @node Footnote Styles
 @subsection Footnote Styles