diff options
| author | Paul Eggert | 2018-12-31 18:19:36 -0800 |
|---|---|---|
| committer | Paul Eggert | 2018-12-31 18:20:07 -0800 |
| commit | 115498702da91dc75d05bd0dea64f98cc6157327 (patch) | |
| tree | 1503ef74eb373344fd698a048b8aa57b8028a305 /doc/misc | |
| parent | ba809612c06bcabd05dcbaae79da39dcb0925992 (diff) | |
| download | emacs-115498702da91dc75d05bd0dea64f98cc6157327.tar.gz emacs-115498702da91dc75d05bd0dea64f98cc6157327.zip | |
Update from Gnulib
This incorporates mostly just copyright-year changes, plus
recent minor updates from glibc for the non-Emacs regular
expression code.
Diffstat (limited to 'doc/misc')
| -rw-r--r-- | doc/misc/texinfo.tex | 71 |
1 files changed, 6 insertions, 65 deletions
diff --git a/doc/misc/texinfo.tex b/doc/misc/texinfo.tex index 5840aff4d7c..66a832e0b4f 100644 --- a/doc/misc/texinfo.tex +++ b/doc/misc/texinfo.tex | |||
| @@ -3,12 +3,9 @@ | |||
| 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{2018-09-21.20} | 6 | \def\texinfoversion{2018-12-28.17} |
| 7 | % | 7 | % |
| 8 | % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995, | 8 | % Copyright 1985, 1986, 1988, 1990-2018 Free Software Foundation, Inc. |
| 9 | % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, | ||
| 10 | % 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 | ||
| 11 | % Free Software Foundation, Inc. | ||
| 12 | % | 9 | % |
| 13 | % This texinfo.tex file is free software: you can redistribute it and/or | 10 | % This texinfo.tex file is free software: you can redistribute it and/or |
| 14 | % modify it under the terms of the GNU General Public License as | 11 | % modify it under the terms of the GNU General Public License as |
| @@ -244,17 +241,7 @@ | |||
| 244 | % | 241 | % |
| 245 | \def\finalout{\overfullrule=0pt } | 242 | \def\finalout{\overfullrule=0pt } |
| 246 | 243 | ||
| 247 | % Do @cropmarks to get crop marks. | ||
| 248 | % | ||
| 249 | \newif\ifcropmarks | ||
| 250 | \let\cropmarks = \cropmarkstrue | ||
| 251 | % | ||
| 252 | % Dimensions to add cropmarks at corners. | ||
| 253 | % Added by P. A. MacKay, 12 Nov. 1986 | ||
| 254 | % | ||
| 255 | \newdimen\outerhsize \newdimen\outervsize % set by the paper size routines | 244 | \newdimen\outerhsize \newdimen\outervsize % set by the paper size routines |
| 256 | \newdimen\cornerlong \cornerlong=1pc | ||
| 257 | \newdimen\cornerthick \cornerthick=.3pt | ||
| 258 | \newdimen\topandbottommargin \topandbottommargin=.75in | 245 | \newdimen\topandbottommargin \topandbottommargin=.75in |
| 259 | 246 | ||
| 260 | % Output a mark which sets \thischapter, \thissection and \thiscolor. | 247 | % Output a mark which sets \thischapter, \thissection and \thiscolor. |
| @@ -328,12 +315,12 @@ | |||
| 328 | \newbox\footlinebox | 315 | \newbox\footlinebox |
| 329 | 316 | ||
| 330 | % \onepageout takes a vbox as an argument. | 317 | % \onepageout takes a vbox as an argument. |
| 331 | % \shipout a vbox for a single page, adding an optional header, footer, | 318 | % \shipout a vbox for a single page, adding an optional header, footer |
| 332 | % cropmarks, and footnote. This also causes index entries for this page | 319 | % and footnote. This also causes index entries for this page to be written |
| 333 | % to be written to the auxiliary files. | 320 | % to the auxiliary files. |
| 334 | % | 321 | % |
| 335 | \def\onepageout#1{% | 322 | \def\onepageout#1{% |
| 336 | \ifcropmarks \hoffset=0pt \else \hoffset=\normaloffset \fi | 323 | \hoffset=\normaloffset |
| 337 | % | 324 | % |
| 338 | \ifodd\pageno \advance\hoffset by \bindingoffset | 325 | \ifodd\pageno \advance\hoffset by \bindingoffset |
| 339 | \else \advance\hoffset by -\bindingoffset\fi | 326 | \else \advance\hoffset by -\bindingoffset\fi |
| @@ -386,25 +373,6 @@ | |||
| 386 | % Do this early so pdf references go to the beginning of the page. | 373 | % Do this early so pdf references go to the beginning of the page. |
| 387 | \ifpdfmakepagedest \pdfdest name{\the\pageno} xyz\fi | 374 | \ifpdfmakepagedest \pdfdest name{\the\pageno} xyz\fi |
| 388 | % | 375 | % |
| 389 | \ifcropmarks \vbox to \outervsize\bgroup | ||
| 390 | \hsize = \outerhsize | ||
| 391 | \vskip-\topandbottommargin | ||
| 392 | \vtop to0pt{% | ||
| 393 | \line{\ewtop\hfil\ewtop}% | ||
| 394 | \nointerlineskip | ||
| 395 | \line{% | ||
| 396 | \vbox{\moveleft\cornerthick\nstop}% | ||
| 397 | \hfill | ||
| 398 | \vbox{\moveright\cornerthick\nstop}% | ||
| 399 | }% | ||
| 400 | \vss}% | ||
| 401 | \vskip\topandbottommargin | ||
| 402 | \line\bgroup | ||
| 403 | \hfil % center the page within the outer (page) hsize. | ||
| 404 | \ifodd\pageno\hskip\bindingoffset\fi | ||
| 405 | \vbox\bgroup | ||
| 406 | \fi | ||
| 407 | % | ||
| 408 | \unvbox\headlinebox | 376 | \unvbox\headlinebox |
| 409 | \pagebody{#1}% | 377 | \pagebody{#1}% |
| 410 | \ifdim\ht\footlinebox > 0pt | 378 | \ifdim\ht\footlinebox > 0pt |
| @@ -415,22 +383,6 @@ | |||
| 415 | \unvbox\footlinebox | 383 | \unvbox\footlinebox |
| 416 | \fi | 384 | \fi |
| 417 | % | 385 | % |
| 418 | \ifcropmarks | ||
| 419 | \egroup % end of \vbox\bgroup | ||
| 420 | \hfil\egroup % end of (centering) \line\bgroup | ||
| 421 | \vskip\topandbottommargin plus1fill minus1fill | ||
| 422 | \boxmaxdepth = \cornerthick | ||
| 423 | \vbox to0pt{\vss | ||
| 424 | \line{% | ||
| 425 | \vbox{\moveleft\cornerthick\nsbot}% | ||
| 426 | \hfill | ||
| 427 | \vbox{\moveright\cornerthick\nsbot}% | ||
| 428 | }% | ||
| 429 | \nointerlineskip | ||
| 430 | \line{\ewbot\hfil\ewbot}% | ||
| 431 | }% | ||
| 432 | \egroup % \vbox from first cropmarks clause | ||
| 433 | \fi | ||
| 434 | }% end of \shipout\vbox | 386 | }% end of \shipout\vbox |
| 435 | }% end of group with \indexdummies | 387 | }% end of group with \indexdummies |
| 436 | \advancepageno | 388 | \advancepageno |
| @@ -451,17 +403,6 @@ | |||
| 451 | \ifr@ggedbottom \kern-\dimen@ \vfil \fi} | 403 | \ifr@ggedbottom \kern-\dimen@ \vfil \fi} |
| 452 | } | 404 | } |
| 453 | 405 | ||
| 454 | % Here are the rules for the cropmarks. Note that they are | ||
| 455 | % offset so that the space between them is truly \outerhsize or \outervsize | ||
| 456 | % (P. A. MacKay, 12 November, 1986) | ||
| 457 | % | ||
| 458 | \def\ewtop{\vrule height\cornerthick depth0pt width\cornerlong} | ||
| 459 | \def\nstop{\vbox | ||
| 460 | {\hrule height\cornerthick depth\cornerlong width\cornerthick}} | ||
| 461 | \def\ewbot{\vrule height0pt depth\cornerthick width\cornerlong} | ||
| 462 | \def\nsbot{\vbox | ||
| 463 | {\hrule height\cornerlong depth\cornerthick width\cornerthick}} | ||
| 464 | |||
| 465 | 406 | ||
| 466 | % Argument parsing | 407 | % Argument parsing |
| 467 | 408 | ||