diff options
| author | Paul Eggert | 2020-02-18 17:50:52 -0800 |
|---|---|---|
| committer | Paul Eggert | 2020-02-18 17:51:28 -0800 |
| commit | 52dbd70f0ed6896c3524d14834b489cef8584ada (patch) | |
| tree | a338754b2e814821012e3129ff6e9096bdd64d35 | |
| parent | 2b04ca05ad9f3679a047ffc06b35d2d61d74b12e (diff) | |
| download | emacs-52dbd70f0ed6896c3524d14834b489cef8584ada.tar.gz emacs-52dbd70f0ed6896c3524d14834b489cef8584ada.zip | |
* doc/misc/texinfo.tex: Update from Gnulib.
| -rw-r--r-- | doc/misc/texinfo.tex | 32 |
1 files changed, 13 insertions, 19 deletions
diff --git a/doc/misc/texinfo.tex b/doc/misc/texinfo.tex index 1ea515b2ae4..deca5991870 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{2019-09-24.13} | 6 | \def\texinfoversion{2020-02-11.09} |
| 7 | % | 7 | % |
| 8 | % Copyright 1985, 1986, 1988, 1990-2019 Free Software Foundation, Inc. | 8 | % Copyright 1985, 1986, 1988, 1990-2019 Free Software Foundation, Inc. |
| 9 | % | 9 | % |
| @@ -373,12 +373,12 @@ | |||
| 373 | % Common context changes for both heading and footing. | 373 | % Common context changes for both heading and footing. |
| 374 | % Do this outside of the \shipout so @code etc. will be expanded in | 374 | % Do this outside of the \shipout so @code etc. will be expanded in |
| 375 | % the headline as they should be, not taken literally (outputting ''code). | 375 | % the headline as they should be, not taken literally (outputting ''code). |
| 376 | \def\commmonheadfootline{\let\hsize=\txipagewidth \texinfochars} | 376 | \def\commonheadfootline{\let\hsize=\txipagewidth \texinfochars} |
| 377 | % | 377 | % |
| 378 | \global\setbox\headlinebox = \vbox{\commmonheadfootline \makeheadline}% | 378 | \global\setbox\headlinebox = \vbox{\commonheadfootline \makeheadline}% |
| 379 | % | 379 | % |
| 380 | \ifodd\pageno \getoddfootingmarks \else \getevenfootingmarks \fi | 380 | \ifodd\pageno \getoddfootingmarks \else \getevenfootingmarks \fi |
| 381 | \global\setbox\footlinebox = \vbox{\commmonheadfootline \makefootline}% | 381 | \global\setbox\footlinebox = \vbox{\commonheadfootline \makefootline}% |
| 382 | % | 382 | % |
| 383 | {% | 383 | {% |
| 384 | % Set context for writing to auxiliary files like index files. | 384 | % Set context for writing to auxiliary files like index files. |
| @@ -3107,9 +3107,9 @@ end | |||
| 3107 | % preferrable one choice is over the other. | 3107 | % preferrable one choice is over the other. |
| 3108 | \def\urefallowbreak{% | 3108 | \def\urefallowbreak{% |
| 3109 | \allowbreak | 3109 | \allowbreak |
| 3110 | \hskip 0pt plus 4 em\relax | 3110 | \hskip 0pt plus 2 em\relax |
| 3111 | \penalty100 | 3111 | \penalty300 |
| 3112 | \hskip 0pt plus -4 em\relax | 3112 | \hskip 0pt plus -2 em\relax |
| 3113 | } | 3113 | } |
| 3114 | 3114 | ||
| 3115 | \urefbreakstyle after | 3115 | \urefbreakstyle after |
| @@ -8955,17 +8955,11 @@ might help (with 'rm \jobname.?? \jobname.??s')% | |||
| 8955 | \else | 8955 | \else |
| 8956 | % Reference within this manual. | 8956 | % Reference within this manual. |
| 8957 | % | 8957 | % |
| 8958 | % _ (for example) has to be the character _ for the purposes of the | 8958 | % Only output a following space if the -snt ref is nonempty; for |
| 8959 | % control sequence corresponding to the node, but it has to expand | 8959 | % @unnumbered and @anchor, it won't be. |
| 8960 | % into the usual \leavevmode...\vrule stuff for purposes of | 8960 | \setbox2 = \hbox{\ignorespaces \refx{#1-snt}{}}% |
| 8961 | % printing. So we \turnoffactive for the \refx-snt, back on for the | 8961 | \ifdim \wd2 > 0pt \refx{#1-snt}\space\fi |
| 8962 | % printing, back off for the \refx-pg. | 8962 | % |
| 8963 | {\turnoffactive | ||
| 8964 | % Only output a following space if the -snt ref is nonempty; for | ||
| 8965 | % @unnumbered and @anchor, it won't be. | ||
| 8966 | \setbox2 = \hbox{\ignorespaces \refx{#1-snt}{}}% | ||
| 8967 | \ifdim \wd2 > 0pt \refx{#1-snt}\space\fi | ||
| 8968 | }% | ||
| 8969 | % output the `[mynode]' via the macro below so it can be overridden. | 8963 | % output the `[mynode]' via the macro below so it can be overridden. |
| 8970 | \xrefprintnodename\printedrefname | 8964 | \xrefprintnodename\printedrefname |
| 8971 | % | 8965 | % |
| @@ -9055,7 +9049,7 @@ might help (with 'rm \jobname.?? \jobname.??s')% | |||
| 9055 | \requireauxfile | 9049 | \requireauxfile |
| 9056 | {% | 9050 | {% |
| 9057 | \indexnofonts | 9051 | \indexnofonts |
| 9058 | \otherbackslash | 9052 | \turnoffactive |
| 9059 | \def\value##1{##1}% | 9053 | \def\value##1{##1}% |
| 9060 | \expandafter\global\expandafter\let\expandafter\thisrefX | 9054 | \expandafter\global\expandafter\let\expandafter\thisrefX |
| 9061 | \csname XR#1\endcsname | 9055 | \csname XR#1\endcsname |