summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/base/ltoutput.dtx
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-12-11 22:32:49 +0000
committerKarl Berry <karl@freefriends.org>2018-12-11 22:32:49 +0000
commitb8f67cb908880c8fdf6b03eb9c4d5219d7409171 (patch)
tree87574d214a3f39e7293bc54e2b40076ae052bed3 /Master/texmf-dist/source/latex/base/ltoutput.dtx
parent6ffd766f7627989e12bfb89d63f908de8c052c81 (diff)
latex(2e) (11dec18)
git-svn-id: svn://tug.org/texlive/trunk@49390 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/base/ltoutput.dtx')
-rw-r--r--Master/texmf-dist/source/latex/base/ltoutput.dtx21
1 files changed, 16 insertions, 5 deletions
diff --git a/Master/texmf-dist/source/latex/base/ltoutput.dtx b/Master/texmf-dist/source/latex/base/ltoutput.dtx
index 8cfeb3fc7f7..d1fe26b90a0 100644
--- a/Master/texmf-dist/source/latex/base/ltoutput.dtx
+++ b/Master/texmf-dist/source/latex/base/ltoutput.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright 1993-2017
+% Copyright 1993-2018
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
%
@@ -30,14 +30,14 @@
%%% From File: ltoutput.dtx
%<flafter>\ProvidesPackage{flafter}
%<fltrace>\ProvidesPackage{fltrace}
-%<flafter,fltrace> [2018/01/08 v1.4c
+%<flafter,fltrace> [2018/11/28 v1.4d
%<flafter> Standard LaTeX floats after reference (FMi)]
%<fltrace> Tracing LaTeX floats algorithm (FMi)]
%
%<*driver>
% \fi
\ProvidesFile{ltoutput.dtx}
- [2018/01/08 v1.4c LaTeX Kernel (Output Routine)]
+ [2018/11/28 v1.4d LaTeX Kernel (Output Routine)]
% \iffalse
\documentclass{ltxdoc}
\GetFileInfo{ltoutput.dtx}
@@ -2413,7 +2413,18 @@
\dblfigrule
\fi
\vskip \dbltextfloatsep
- \box\@outputbox
+% \end{macrocode}
+% If pdf links are present in the galley and those links get broken
+% across pages they have to end up being on the same level of boxing
+% (even if not actually in the same structure) due to some engine
+% restrictions in pdf\TeX\ and Lua\TeX. We therefore unbox
+% |\@outputbox| here (which only contains a single |\hbox|) so that
+% this case has the same boxing level as a normal twocolumn page
+% without top floats.
+% \changes{v1.4d}{2018/11/28}{Unbox \cs{@outputbox} to preserve boxing
+% level (github/94)}
+% \begin{macrocode}
+ \unvbox\@outputbox
}%
\fi
}
@@ -4679,7 +4690,7 @@
% In case of |\enlargethispage| we will have infinite negative glue
% at the bottom of the page (coming from |\vss|) and that will earn
% us an error message if we |\vsplit| to get at the marks. So we
-% need to remove thek last glue (if any) at the end of |\@outputbox|
+% need to remove the last glue (if any) at the end of |\@outputbox|
% as we are only interested in marks that change doesn't matter.
% \changes{v1.1o}{2014/04/18}{Handle infinite glue from
% \cs{enlargethispage} (pr/4023)}