github-repos/make
1
0
Fork 0
mirror of https://github.com/mirror/make.git synced 2025-02-28 21:00:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

* texinfo.tex (\begindoublecolumns): Ship out \partialpage

Browse Source 
immediately if it is nonvoid, instead of saving it.  This avoids a
	bug where the index could end up printing one line per page (see
	the indexspread.tex test).
	From: Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>

	* texinfo.tex (\image): If running pdftex, do \pdfimage{imagefile.pdf}.
 	From: Samuel Tardieu <sam@inf.enst.fr>

 	Also, update copyright year.
This commit is contained in:
Karl Berry 1999-01-15 09:29:00 +00:00
parent c0ec561e37
commit 5b16b3c015
1 changed files with 27 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
texinfo.tex
View File

@ -3,9 +3,9 @@
% Load plain if necessary, i.e., if running under initex. % Load plain if necessary, i.e., if running under initex.
\expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
% %
\def\texinfoversion{1999-01-05}% \def\texinfoversion{1999-01-14}%
% %
% Copyright (C) 1985, 86, 88, 90, 91, 92, 93, 94, 95, 96, 97, 98 % Copyright (C) 1985, 86, 88, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99
% Free Software Foundation, Inc. % Free Software Foundation, Inc.
% %
% This texinfo.tex file is free software; you can redistribute it and/or % This texinfo.tex file is free software; you can redistribute it and/or
@ -2819,23 +2819,25 @@ width0pt\relax} \fi
\def\begindoublecolumns{\begingroup % ended by \enddoublecolumns \def\begindoublecolumns{\begingroup % ended by \enddoublecolumns
% Grab any single-column material above us. % Grab any single-column material above us.
\output = {\global\setbox\partialpage = \vbox{% \output = {%
% %
% Here is a possibility not foreseen in manmac: if we accumulate a % Here is a possibility not foreseen in manmac: if we accumulate a
% whole lot of material, we might end up calling this \output % whole lot of material, we might end up calling this \output
% routine twice in a row (see the doublecol-lose test, which is % routine twice in a row (see the doublecol-lose test, which is
% essentially a couple of indexes with @setchapternewpage off). In % essentially a couple of indexes with @setchapternewpage off). In
% that case, we must prevent the second \partialpage from % that case we just ship out what is in \partialpage with the normal
% simply overwriting the first, causing us to lose the page. % output routine. Generally, \partialpage will be empty when this
% This will preserve it until a real output routine can ship it % runs and this will be a no-op. See the indexspread.tex test case.
% out. Generally, \partialpage will be empty when this runs and \ifvoid\partialpage \else
% this will be a no-op. \onepageout{\pagecontents\partialpage}%
\unvbox\partialpage \fi
% %
% Unvbox the main output page. \global\setbox\partialpage = \vbox{%
\unvbox255 % Unvbox the main output page.
\kern-\topskip \kern\baselineskip \unvbox\PAGE
}}% \kern-\topskip \kern\baselineskip
}%
}%
\eject % run that output routine to set \partialpage \eject % run that output routine to set \partialpage
% %
% Use the double-column output routine for subsequent pages. % Use the double-column output routine for subsequent pages.
@ -2888,7 +2890,6 @@ width0pt\relax} \fi
\def\pagesofar{% \def\pagesofar{%
% Re-output the contents of the output page -- any previous material, % Re-output the contents of the output page -- any previous material,
% followed by the two boxes we just split, in box0 and box2. % followed by the two boxes we just split, in box0 and box2.
\advance\vsize by \ht\partialpage
\unvbox\partialpage \unvbox\partialpage
% %
\hsize = \doublecolumnhsize \hsize = \doublecolumnhsize
@ -5154,18 +5155,22 @@ width0pt\relax} \fi
\newif\ifwarnednoepsf \newif\ifwarnednoepsf
\newhelp\noepsfhelp{epsf.tex must be installed for images to \newhelp\noepsfhelp{epsf.tex must be installed for images to
work. It is also included in the Texinfo distribution, or you can get work. It is also included in the Texinfo distribution, or you can get
it from ftp://ftp.tug.org/tex/epsf.tex.} it from ftp://tug.org/tex/epsf.tex.}
% %
% Only complain once about lack of epsf.tex. % Only complain once about lack of epsf.tex.
\def\image#1{% \def\image#1{%
\ifx\epsfbox\undefined \ifx\pdfoutput\undefined
\ifwarnednoepsf \else \ifx\epsfbox\undefined
\errhelp = \noepsfhelp \ifwarnednoepsf \else
\errmessage{epsf.tex not found, images will be ignored}% \errhelp = \noepsfhelp
\global\warnednoepsftrue \errmessage{epsf.tex not found, images will be ignored}%
\global\warnednoepsftrue
\fi
\else
\imagexxx #1,,,\finish
\fi \fi
\else \else
\imagexxx #1,,,\finish \centerline{\pdfimage #1.pdf}%
\fi \fi
} }
% %
@ -5184,6 +5189,7 @@ width0pt\relax} \fi
\centerline{\epsfbox{#1.eps}}% \centerline{\epsfbox{#1.eps}}%
\bigbreak \bigbreak
\else \else
% In the middle of a paragraph, no extra space.
\epsfbox{#1.eps}% \epsfbox{#1.eps}%
\fi \fi
} }