diff options
| author | Paul Eggert | 2025-08-02 10:47:03 -0700 |
|---|---|---|
| committer | Paul Eggert | 2025-08-02 11:19:24 -0700 |
| commit | 687d3cb03bddd7eebf6384001fc54ca2c7e80037 (patch) | |
| tree | 664dbb5dbf966c72df4cd8dcc0567b501183f773 /doc/misc | |
| parent | 84f1080f67c0960cca2d456c68e2d7866c19462c (diff) | |
| download | emacs-687d3cb03bddd7eebf6384001fc54ca2c7e80037.tar.gz emacs-687d3cb03bddd7eebf6384001fc54ca2c7e80037.zip | |
Update from Gnulib by running admin/merge-gnulib
* lib/sys-limits.h: New file.
Diffstat (limited to 'doc/misc')
| -rw-r--r-- | doc/misc/texinfo.tex | 31 |
1 files changed, 20 insertions, 11 deletions
diff --git a/doc/misc/texinfo.tex b/doc/misc/texinfo.tex index 42e686ce705..64dddad8290 100644 --- a/doc/misc/texinfo.tex +++ b/doc/misc/texinfo.tex | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | % Load plain if necessary, i.e., if running under initex. | 3 | % Load plain if necessary, i.e., if running under initex. |
| 4 | \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi | 4 | \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi |
| 5 | % | 5 | % |
| 6 | \def\texinfoversion{2025-07-15.21} | 6 | \def\texinfoversion{2025-07-31.19} |
| 7 | % | 7 | % |
| 8 | % Copyright 1985, 1986, 1988, 1990-2025 Free Software Foundation, Inc. | 8 | % Copyright 1985, 1986, 1988, 1990-2025 Free Software Foundation, Inc. |
| 9 | % | 9 | % |
| @@ -9634,7 +9634,10 @@ might help (with 'rm \jobname.?? \jobname.??s')% | |||
| 9634 | % Auto-number footnotes. Otherwise like plain. | 9634 | % Auto-number footnotes. Otherwise like plain. |
| 9635 | \gdef\footnote{% | 9635 | \gdef\footnote{% |
| 9636 | \global\advance\footnoteno by \@ne | 9636 | \global\advance\footnoteno by \@ne |
| 9637 | \edef\thisfootno{$^{\the\footnoteno}$}% | 9637 | % |
| 9638 | % Output for the footnote marker. If we are immediately after another | ||
| 9639 | % footnote, output a comma and small space first. | ||
| 9640 | \edef\thisfootno{$^{\ifnum\lastpenalty=3 ,\mskip 1mu \fi\the\footnoteno}$}% | ||
| 9638 | % | 9641 | % |
| 9639 | % In case the footnote comes at the end of a sentence, preserve the | 9642 | % In case the footnote comes at the end of a sentence, preserve the |
| 9640 | % extra spacing after we do the footnote number. | 9643 | % extra spacing after we do the footnote number. |
| @@ -9643,19 +9646,25 @@ might help (with 'rm \jobname.?? \jobname.??s')% | |||
| 9643 | % | 9646 | % |
| 9644 | % Remove inadvertent blank space before typesetting the footnote number. | 9647 | % Remove inadvertent blank space before typesetting the footnote number. |
| 9645 | \unskip | 9648 | \unskip |
| 9646 | \thisfootno\@sf | 9649 | % |
| 9650 | % \scriptspace is 0.5pt by default and gives excessive space before the | ||
| 9651 | % comma if we have multiple footnote markers in a row. | ||
| 9652 | \bgroup\scriptspace=0pt | ||
| 9653 | \thisfootno\@sf | ||
| 9654 | \egroup | ||
| 9647 | \dofootnote | 9655 | \dofootnote |
| 9648 | }% | 9656 | }% |
| 9649 | 9657 | ||
| 9650 | % Don't bother with the trickery in plain.tex to not require the | 9658 | % marker for immediately after a footnote marker |
| 9651 | % footnote text as a parameter. Our footnotes don't need to be so general. | 9659 | \gdef\footnoteendmarker{\penalty3 } |
| 9652 | % | 9660 | |
| 9653 | % Oh yes, they do; otherwise, @ifset (and anything else that uses | 9661 | % Do not require the footnote text as a parameter; otherwise, @ifset |
| 9654 | % \parseargline) fails inside footnotes because the tokens are fixed when | 9662 | % (and anything else that uses \parseargline) fails inside footnotes |
| 9655 | % the footnote is read. --karl, 16nov96. | 9663 | % because the tokens are fixed when the footnote is read. |
| 9656 | % | 9664 | % |
| 9657 | \gdef\dofootnote{% | 9665 | \gdef\dofootnote{% |
| 9658 | \insert\footins\bgroup | 9666 | \insert\footins\bgroup |
| 9667 | \aftergroup\footnoteendmarker | ||
| 9659 | % | 9668 | % |
| 9660 | % Nested footnotes are not supported in TeX, that would take a lot | 9669 | % Nested footnotes are not supported in TeX, that would take a lot |
| 9661 | % more work. (\startsavinginserts does not suffice.) | 9670 | % more work. (\startsavinginserts does not suffice.) |
| @@ -9686,14 +9695,14 @@ might help (with 'rm \jobname.?? \jobname.??s')% | |||
| 9686 | % Hang the footnote text off the number. Use \everypar in case the | 9695 | % Hang the footnote text off the number. Use \everypar in case the |
| 9687 | % footnote extends for more than one paragraph. | 9696 | % footnote extends for more than one paragraph. |
| 9688 | \everypar = {\hang}% | 9697 | \everypar = {\hang}% |
| 9689 | \textindent{\thisfootno}% | 9698 | \textindent{$^{\the\footnoteno}$}% |
| 9690 | % | 9699 | % |
| 9691 | % Don't crash into the line above the footnote text. Since this | 9700 | % Don't crash into the line above the footnote text. Since this |
| 9692 | % expands into a box, it must come within the paragraph, lest it | 9701 | % expands into a box, it must come within the paragraph, lest it |
| 9693 | % provide a place where TeX can split the footnote. | 9702 | % provide a place where TeX can split the footnote. |
| 9694 | \footstrut | 9703 | \footstrut |
| 9695 | % | 9704 | % |
| 9696 | % Invoke rest of plain TeX footnote routine. | 9705 | % Eat opening brace and invoke rest of plain TeX footnote routine. |
| 9697 | \futurelet\next\fo@t | 9706 | \futurelet\next\fo@t |
| 9698 | } | 9707 | } |
| 9699 | }%end \catcode `\@=11 | 9708 | }%end \catcode `\@=11 |