From c1f9540dac287386d2a61a40656a9c7413909dd8 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 13 Jan 2021 22:14:21 +0000 Subject: showexpl (13jan21) git-svn-id: svn://tug.org/texlive/trunk@57414 c570f23f-e606-0410-a88d-b1316a301751 --- .../doc/latex/showexpl/showexpl-test.pdf | Bin 350869 -> 350534 bytes Master/texmf-dist/doc/latex/showexpl/showexpl.pdf | Bin 250715 -> 250883 bytes .../texmf-dist/source/latex/showexpl/showexpl.dtx | 22 +++++++++++++-------- Master/texmf-dist/tex/latex/showexpl/showexpl.sty | 12 ++++++++--- 4 files changed, 23 insertions(+), 11 deletions(-) (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/latex/showexpl/showexpl-test.pdf b/Master/texmf-dist/doc/latex/showexpl/showexpl-test.pdf index 027f9bc9b6c..1ad2247286e 100644 Binary files a/Master/texmf-dist/doc/latex/showexpl/showexpl-test.pdf and b/Master/texmf-dist/doc/latex/showexpl/showexpl-test.pdf differ diff --git a/Master/texmf-dist/doc/latex/showexpl/showexpl.pdf b/Master/texmf-dist/doc/latex/showexpl/showexpl.pdf index 9a3bfd6b57b..821d29b8544 100644 Binary files a/Master/texmf-dist/doc/latex/showexpl/showexpl.pdf and b/Master/texmf-dist/doc/latex/showexpl/showexpl.pdf differ diff --git a/Master/texmf-dist/source/latex/showexpl/showexpl.dtx b/Master/texmf-dist/source/latex/showexpl/showexpl.dtx index c2e2a99df23..e154a1ae902 100644 --- a/Master/texmf-dist/source/latex/showexpl/showexpl.dtx +++ b/Master/texmf-dist/source/latex/showexpl/showexpl.dtx @@ -22,7 +22,7 @@ %\NeedsTeXFormat{LaTeX2e}[1999/12/01] %\ProvidesPackage{showexpl} %<*package> - [2020/10/08 v0.3r Typesetting example code (RN)] + [2021/01/06 v0.3s Typesetting example code (RN)] % % %<*driver> @@ -39,7 +39,7 @@ % % \fi % -% \CheckSum{889} +% \CheckSum{902} % % \CharacterTable % {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -318,7 +318,10 @@ % the user key ``|preset=...|''. % \changes{v0.3e}{2006/04/05}{More redefinitions added (RN).} % \changes{v0.3p}{2020/05/04}{Remove extra treatment of `figure'/`table' (RN).} -% \changes{v0.3r}{2020/10/08}{letting \cmd{\refstepcounter} be \cmd{\stepcounter} (RN).} +% \changes{v0.3r}{2020/10/08}{letting \cmd{\refstepcounter} be +% \cmd{\stepcounter} (RN).} +% \changes{v0.3s}{2021/01/06}{Special handling of cleveref's +% \cmd{\refstepcounter} (RN).} % \begin{macrocode} \newcommand*\SX@@preset{% \renewcommand\documentclass[2][]{\SX@eat@version}% @@ -328,8 +331,14 @@ \let\tableofcontens\relax \let\listoffigures\relax \let\listoftables\relax \let\printindex\relax \let\listfiles\relax \let\nofiles\relax - \let\index\@gobble \let\label\@gobble - \let\refstepcounter=\stepcounter + \let\index\@gobble + \expandafter\ifx\csname ver@cleveref.sty\endcsname\relax + \let\refstepcounter=\stepcounter + \let\label\@gobble + \else + \let\cref@old@refstepcounter=\stepcounter + \let\cref@old@label=\@gobble + \fi \let\bibliography\@gobble \let\pagestyle\@gobble \let\thispagestyle\@gobble %%\let\immediate\relax \let\write\@gobbletwo @@ -720,9 +729,6 @@ % Typeset the Code. % \begin{macrocode} \SX@tempb{\SX@tempa{\SX@codefile}}\par -% \end{macrocode} -% Restore the regular numbering of floats outside of `LTXexample'. -% \begin{macrocode} \endgroup \else \expandafter\includegraphics\expandafter[\SX@graphicparam]% diff --git a/Master/texmf-dist/tex/latex/showexpl/showexpl.sty b/Master/texmf-dist/tex/latex/showexpl/showexpl.sty index ece526c8876..f01e9d4b4fb 100644 --- a/Master/texmf-dist/tex/latex/showexpl/showexpl.sty +++ b/Master/texmf-dist/tex/latex/showexpl/showexpl.sty @@ -22,7 +22,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesPackage{showexpl} - [2020/10/08 v0.3r Typesetting example code (RN)] + [2021/01/06 v0.3s Typesetting example code (RN)] \DeclareOption{final}{% \PassOptionsToPackage{\CurrentOption}{graphicx}% \PassOptionsToPackage{\CurrentOption}{listings}% @@ -93,8 +93,14 @@ \let\tableofcontens\relax \let\listoffigures\relax \let\listoftables\relax \let\printindex\relax \let\listfiles\relax \let\nofiles\relax - \let\index\@gobble \let\label\@gobble - \let\refstepcounter=\stepcounter + \let\index\@gobble + \expandafter\ifx\csname ver@cleveref.sty\endcsname\relax + \let\refstepcounter=\stepcounter + \let\label\@gobble + \else + \let\cref@old@refstepcounter=\stepcounter + \let\cref@old@label=\@gobble + \fi \let\bibliography\@gobble \let\pagestyle\@gobble \let\thispagestyle\@gobble %%\let\immediate\relax \let\write\@gobbletwo -- cgit v1.2.3