summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/memoir/mempatch.dtx
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/source/latex/memoir/mempatch.dtx')
-rw-r--r--Master/texmf-dist/source/latex/memoir/mempatch.dtx99
1 files changed, 60 insertions, 39 deletions
diff --git a/Master/texmf-dist/source/latex/memoir/mempatch.dtx b/Master/texmf-dist/source/latex/memoir/mempatch.dtx
index f47f1f0195d..618528c0972 100644
--- a/Master/texmf-dist/source/latex/memoir/mempatch.dtx
+++ b/Master/texmf-dist/source/latex/memoir/mempatch.dtx
@@ -20,7 +20,7 @@
%
%
% \fi
-% \CheckSum{562}
+% \CheckSum{549}
%
% \def\dtxfile{\texttt{mempatch.dtx}}
% \def\fileversion{v1.0} \def\filedate{2003/10/04}
@@ -312,6 +312,8 @@
%% With the new hooking system from 2020+ memhfixc is automatically
%% added after loading hyperref with the memoir class
%%
+%% Version 1.22 2023/09/10
+%% Version 1.21 2023/07/28
%% Version 1.21 2023/07/28
%% Version 1.20 2022/11/17
%% Version 1.19 2021/06/16
@@ -339,7 +341,7 @@
%
%
% \begin{macrocode}
-\ProvidesPackage{memhfixc}[2023/07/28 v1.21 hyperref package fixes for memoir class]
+\ProvidesPackage{memhfixc}[2023/09/10 v1.22 hyperref package fixes for memoir class]
% \end{macrocode}
%
% \begin{macro}{\M@hfixcfinish}
@@ -647,56 +649,75 @@
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\endsidecaption}
-% Tweak the \texttt{sidecaption} environment. I don't know why it
-% works but it took a lot of time trying all sorts of combinations
-% of commands to get it to do so (if it really does).
-% \begin{macrocode}
-\def\endsidecaption{%
- \m@mscapend@fbox
- \H@refstepcounter{\@captype}%
- \hyper@makecurrent{\@captype}%
- \m@mscaplabel
-% \end{macrocode}
-% \changes{v1.17}{2013/05/30}{Forgot to add \cs{m@mscapcheckside}}
-% \begin{macrocode}
- \m@mscapcheckside %<--- added 2013/05/30
- \begin{lrbox}{\m@mscap@capbox}%
- \begin{minipage}[c]{\sidecapwidth}%
- \sidecapstyle
- \@caption\@captype[\m@mscap@fortoc]{\m@mscap@forcap}%
- \end{minipage}%
- \end{lrbox}%
- \m@mscapopboxes}
+% \begin{macro}{\sidecaption@refstepcounter}
+% Under \Lpack{hyperref} we redefine what
+% \cs{sidecaption@refstepcounter} does. Here we use that it is
+% called with two args.
+% \changes{v1.22}{2023/09/10}{Redef of new macro from memoir 3.8.2,
+% that makes sidecaption handling easier.}
+% \begin{macrocode}
+\renewcommand*\sidecaption@refstepcounter[2]{%
+ \H@refstepcounter{#1}%
+ \hyper@makecurrent{#2}%
+}
% \end{macrocode}
% \end{macro}
%
+% \changes{v1.22}{2023/09/10}{Because of the redef in memoir 3.8.2 we
+% no longer need this}
+% ^^A \begin{macro}{\endsidecaption}
+% ^^A % Tweak the \texttt{sidecaption} environment. I don't know why it
+% ^^A works but it took a lot of time trying all sorts of combinations
+% ^^A of commands to get it to do so (if it really does).
+% ^^A \begin{macrocode}
+ % \def\endsidecaption{%
+ % \m@mscapend@fbox
+ % \H@refstepcounter{\@captype}%
+ % \hyper@makecurrent{\@captype}%
+ % \m@mscaplabel
+% ^^A \end{macrocode}
+% ^^A\changes{v1.17}{2013/05/30}{Forgot to add \cs{m@mscapcheckside}}
+% ^^A \begin{macrocode}
+ % \m@mscapcheckside %<--- added 2013/05/30
+ % \begin{lrbox}{\m@mscap@capbox}%
+ % \begin{minipage}[c]{\sidecapwidth}%
+ % \sidecapstyle
+ % \@caption\@captype[\m@mscap@fortoc]{\m@mscap@forcap}%
+ % \end{minipage}%
+ % \end{lrbox}%
+ % \m@mscapopboxes}
+
+% ^^A \end{macrocode}
+% ^^A \end{macro}
+%
% \begin{macro}{\sidecontcaption}
% \begin{macro}{\endsidecontcaption}
% Tweaks for the \texttt{sidecontcaption} environment. Again it was
% a miss, miss, \ldots hit method to get something that appears
% to work.
+% \changes{v1.22}{2023/09/10}{Because of the redef in memoir 3.8.2 we
+% no longer need the redef of \cs{endsidecontcaption}}
% \begin{macrocode}
\renewcommand*{\sidecontcaption}{%
\refstepcounter{memhycontfloat}%
\@sidecontcaption}
-\def\endsidecontcaption{%
- \m@mscapend@fbox
- \addtocounter{\@captype}{\m@ne}\H@refstepcounter{\@captype}%
- \hyper@makecurrent{memhycontfloat}%
- \m@mscaplabel
-% \end{macrocode}
-% \changes{v1.17}{2013/05/30}{Forgot to add \cs{m@mscapcheckside}}
-% \begin{macrocode}
- \m@mscapcheckside %<--- added 2013/05/30
- \begin{lrbox}{\m@mscap@capbox}%
- \begin{minipage}[c]{\sidecapwidth}%
- \sidecapstyle
- \@contcaption\@captype{\m@mscap@forcap}%
- \end{minipage}%
- \end{lrbox}%
- \m@mscapopboxes}
+ % \def\endsidecontcaption{%
+ % \m@mscapend@fbox
+ % \addtocounter{\@captype}{\m@ne}\H@refstepcounter{\@captype}%
+ % \hyper@makecurrent{memhycontfloat}%
+ % \m@mscaplabel
+% ^^A \end{macrocode}
+% ^^A \changes{v1.17}{2013/05/30}{Forgot to add \cs{m@mscapcheckside}}
+% ^^A \begin{macrocode}
+ % \m@mscapcheckside %<--- added 2013/05/30
+ % \begin{lrbox}{\m@mscap@capbox}%
+ % \begin{minipage}[c]{\sidecapwidth}%
+ % \sidecapstyle
+ % \@contcaption\@captype{\m@mscap@forcap}%
+ % \end{minipage}%
+ % \end{lrbox}%
+ % \m@mscapopboxes}
% \end{macrocode}
% \end{macro}