From ec0d811f8907a93ccc956cc61e3e87e7b4b8cf3c Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 21 Feb 2022 20:58:16 +0000 Subject: preview (21feb22) git-svn-id: svn://tug.org/texlive/trunk@62130 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/preview/preview.pdf | Bin 312501 -> 332076 bytes Master/texmf-dist/source/latex/preview/preview.dtx | 39 +++++++++++++++++---- Master/texmf-dist/tex/latex/preview/preview.sty | 23 ++++++++++-- 3 files changed, 53 insertions(+), 9 deletions(-) diff --git a/Master/texmf-dist/doc/latex/preview/preview.pdf b/Master/texmf-dist/doc/latex/preview/preview.pdf index 0857912d7d9..6c8c2d1446d 100644 Binary files a/Master/texmf-dist/doc/latex/preview/preview.pdf and b/Master/texmf-dist/doc/latex/preview/preview.pdf differ diff --git a/Master/texmf-dist/source/latex/preview/preview.dtx b/Master/texmf-dist/source/latex/preview/preview.dtx index 080996b2840..6b21ace38ed 100644 --- a/Master/texmf-dist/source/latex/preview/preview.dtx +++ b/Master/texmf-dist/source/latex/preview/preview.dtx @@ -3,7 +3,7 @@ %% Developed as part of AUCTeX . % % Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, -% 2010, 2017-2020 Free Software Foundation +% 2010, 2017-2022 Free Software Foundation % % This program is free software; you can redistribute it and/or modify % it under the terms of the GNU General Public License as published by @@ -20,7 +20,7 @@ % Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, % Boston, MA 02110-1301 USA % \fi -% \CheckSum{1760} +% \CheckSum{1794} % \GetFileInfo{preview.sty} % \date{\filedate} % \author{David Kastrup\thanks{\texttt{bug-auctex@gnu.org}}} @@ -439,7 +439,7 @@ \NeedsTeXFormat{LaTeX2e} \def\reserved@a #1#2$#3: #4${\xdef#1{\reserved@c #2#4 $}} \def\reserved@c #1 #2${#1} \begingroup \catcode`\_=12 -\reserved@a\pr@version $Name: release_12_3 $ \ifx\pr@version\@empty +\reserved@a\pr@version $Name: release_13_1 $ \ifx\pr@version\@empty \reserved@a\pr@version CVS-$Revision: 1.126 $ \endgroup \else \def\next release_{} \lccode`\_=`. \edef\next{\lowercase{\endgroup @@ -781,14 +781,41 @@ % pretty much the same as in |everyshi.sty|. One of its implications % is that if someone does a \cmd{\shipout} of a \emph{void} box, % things will go horribly wrong. -% \begin{macro}{\shipout} +% \begin{macro}{\pr@@shipout} % \begin{macrocode} -\let\pr@shipout=\shipout -\def\shipout{\deadcycles\z@\bgroup\setbox\z@\box\voidb@x +\def\pr@@shipout{\deadcycles\z@\bgroup\setbox\z@\box\voidb@x \afterassignment\pr@shipoutegroup\setbox\z@} \def\pr@shipoutegroup{\ifvoid\z@ \expandafter\aftergroup\fi \egroup} % \end{macrocode} % \end{macro} +% \begin{macro}{\pr@shipout} +% We now need to check which command we are replacing. Before +% things got sophisticated in 2020 or 2021, this had been +% \cmd{\shipout} but now it could be \cmd{\tex\_shipout:D}. \LaTeX\ +% got a hook mechanism for managing output routines, but it doesn't +% really work well for wholesale replacement of the \cmd{\shipout} +% command like |preview| does. +% \begin{macrocode} +\ifx\shipout\@undefined + \begingroup + \catcode`\:=10 + \catcode`\_=10 + \ifx\tex_shipout:D\@undefined + \PackageError{preview}{Cannot find \protect\shipout\space primitive}% + {preview needs to replace the \protect\shipout\space primitive with + its own routine to do its work. Due to packages or formats + interfering, it cannot be identified. Please report this.} + \else + \global\let\pr@shipout=\tex_shipout:D + \global\let\tex_shipout:D=\pr@@shipout + \fi + \endgroup +\else + \let\pr@shipout=\shipout + \let\shipout=\pr@@shipout +\fi +% \end{macrocode} +% \end{macro} % \subsection{Parsing commands} % \begin{macro}{\pr@parseit} % \begin{macro}{\pr@endparse} diff --git a/Master/texmf-dist/tex/latex/preview/preview.sty b/Master/texmf-dist/tex/latex/preview/preview.sty index 13c026fd40c..11f59909845 100644 --- a/Master/texmf-dist/tex/latex/preview/preview.sty +++ b/Master/texmf-dist/tex/latex/preview/preview.sty @@ -26,7 +26,7 @@ \NeedsTeXFormat{LaTeX2e} \def\reserved@a #1#2$#3: #4${\xdef#1{\reserved@c #2#4 $}} \def\reserved@c #1 #2${#1} \begingroup \catcode`\_=12 -\reserved@a\pr@version $Name: release_12_3 $ \ifx\pr@version\@empty +\reserved@a\pr@version $Name: release_13_1 $ \ifx\pr@version\@empty \reserved@a\pr@version CVS-$Revision: 1.126 $ \endgroup \else \def\next release_{} \lccode`\_=`. \edef\next{\lowercase{\endgroup @@ -291,10 +291,27 @@ Please complain to your document class author}% \global\advance\pr@snippet\@ne \pr@cleanup } -\let\pr@shipout=\shipout -\def\shipout{\deadcycles\z@\bgroup\setbox\z@\box\voidb@x +\def\pr@@shipout{\deadcycles\z@\bgroup\setbox\z@\box\voidb@x \afterassignment\pr@shipoutegroup\setbox\z@} \def\pr@shipoutegroup{\ifvoid\z@ \expandafter\aftergroup\fi \egroup} +\ifx\shipout\@undefined + \begingroup + \catcode`\:=10 + \catcode`\_=10 + \ifx\tex_shipout:D\@undefined + \PackageError{preview}{Cannot find \protect\shipout\space primitive}% + {preview needs to replace the \protect\shipout\space primitive with + its own routine to do its work. Due to packages or formats + interfering, it cannot be identified. Please report this.} + \else + \global\let\pr@shipout=\tex_shipout:D + \global\let\tex_shipout:D=\pr@@shipout + \fi + \endgroup +\else + \let\pr@shipout=\shipout + \let\shipout=\pr@@shipout +\fi \def\pr@parseit#1{\csname pr@parse#1\endcsname} \let\pr@endparse=\@percentchar \def\next#1{% -- cgit v1.2.3