summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-memoir.sty
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/lwarp/lwarp-patch-memoir.sty')
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-patch-memoir.sty59
1 files changed, 32 insertions, 27 deletions
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-memoir.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-memoir.sty
index fc19c62e397..20c2e566fda 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-memoir.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-memoir.sty
@@ -17,16 +17,19 @@
%% version 2005/12/01 or later.
\ProvidesPackage{lwarp-patch-memoir}
\RequirePackage{lwarp-abstract}% req'd
-\RequirePackage{lwarp-array}% req'd
\RequirePackage{lwarp-booktabs}% req'd
\RequirePackage{lwarp-changepage}% req'd
\RequirePackage{lwarp-crop}
-\RequirePackage{lwarp-dcolumn}% req'd
\RequirePackage{lwarp-enumerate}% req'd
\RequirePackage{lwarp-epigraph}% req'd
\RequirePackage{lwarp-fancyvrb}% req'd
\RequirePackage{lwarp-footmisc}% req'd
+\let\framed\relax \let\endframed\relax
+\let\shaded\relax \let\endshaded\relax
+\let\leftbar\relax \let\endleftbar\relax
+\let\snugshade\relax \let\endsnugshade\relax
\RequirePackage{lwarp-framed}% req'd
+
\RequirePackage{lwarp-hanging}% req'd
\RequirePackage{lwarp-makeidx}% req'd
\DisemulatePackage{moreverb}
@@ -38,23 +41,10 @@
\RequirePackage{lwarp-parskip}
\RequirePackage{lwarp-setspace}% req'd
\RequirePackage{lwarp-showidx}
+\RequirePackage{lwarp-subcaption}% req'd for \subfloat
-\AtBeginDocument{%
- \@ifpackageloaded{subcaption}{}{
- \RequirePackage{lwarp-subfigure}
- \let\subfigure\subbottom
- \let\subtable\subtop
- }%
-}%
-\makeindex
-\LetLtxMacro\LWR@memorignewsubfloat\newsubfloat
-\RenewDocumentCommand{\newsubfloat}{O{} m}{%
- \@ifundefined{c@sub#2}{%
- \LWR@memorignewsubfloat[#1]{#2}%
- }{}%
-}
-\RequirePackage{lwarp-tabularx}% req'd
+\makeindex
\RequirePackage{lwarp-titling}% req'd
\RequirePackage{lwarp-tocloft}% req'd
\RequirePackage{lwarp-verse}% req'd
@@ -67,18 +57,22 @@
\renewcommand*{\stockav}{}
\renewcommand*{\stockaiv}{}
\renewcommand*{\stockaiii}{}
+\renewcommand*{\stockavii}{}
\renewcommand*{\stockbvi}{}
\renewcommand*{\stockbv}{}
\renewcommand*{\stockbiv}{}
\renewcommand*{\stockbiii}{}
+\renewcommand*{\stockbvii}{}
\renewcommand*{\stockmlargecrownvo}{}
\renewcommand*{\stockmdemyvo}{}
\renewcommand*{\stockmsmallroyalvo}{}
\renewcommand*{\pageavi}{}
+\renewcommand*{\pageavii}{}
\renewcommand*{\pageav}{}
\renewcommand*{\pageaiv}{}
\renewcommand*{\pageaiii}{}
\renewcommand*{\pagebvi}{}
+\renewcommand*{\pagebvii}{}
\renewcommand*{\pagebv}{}
\renewcommand*{\pagebiv}{}
\renewcommand*{\pagebiii}{}
@@ -191,7 +185,7 @@
\let\DoubleSpacing\doublespacing
\renewcommand*{\setPagenoteSpacing}[1]{}
\renewcommand*{\setFloatSpacing}[1]{}
-\let\SingleSpacing\singlespacing
+\renewcommand{\SingleSpacing}{\@ifstar\singlespacing\singlespacing}
\let\setSingleSpace\SetSinglespace
\let\SingleSpace\singlespace
\let\endSingleSpace\endsinglespace
@@ -225,6 +219,8 @@
\thanksscript{\tamark}%
}
+
+\renewcommand\titlingpageend[2]{}
\renewcommand*{\abstractcol}{}
\renewcommand*{\abstractintoc}{}
\renewcommand*{\abstractnum}{}
@@ -700,7 +696,6 @@
\renewcommand{\flegfigure}{\figurename}
\renewcommand{\flegtoctable}{}
\renewcommand{\flegtocfigure}{}
-
\renewcommand{\subcaption}[2][]{%
\ifblank{#1}{\subfloat[#2]{}}{\subfloat[#1][#2]{}}%
}
@@ -938,21 +933,33 @@
\addtocounter{LWR@autoindex}{1}%
\LWR@new@label{LWRindex-\arabic{LWR@autoindex}}%
\protected@write\@auxout{}%
- {\string\@@wrindexm@m{\@idxfile}{#1}{\arabic{LWR@autoindex}}}%
+ {\string\@@wrindexm@m{\@idxfile}{#1}{\arabic{LWR@autoindex}}}%
\endgroup
\@esphack}%
\def\@@wrspindexhyp#1||\\{%
\addtocounter{LWR@autoindex}{1}%
\LWR@new@label{LWRindex-\arabic{LWR@autoindex}}%
\protected@write\@auxout{}%
- {%
- \string\@@wrindexm@m{\@idxfile}{#1}{\arabic{LWR@autoindex}}%
- }%
+ {\string\@@wrindexm@m{\@idxfile}{#1}{\arabic{LWR@autoindex}}}%
\endgroup
\@esphack}%
}% \AtBeginDocument
+\renewcommand{\@spindex}[2]{%
+ \@ifundefined{#1@idxfile}%
+ {\ifreportnoidxfile
+ \@memwarn{Undefined index file #1}%
+ \fi
+ \begingroup
+ \@sanitize
+ \@nowrindex}%
+ {\def\@idxfile{#1_html}%
+ \def\@sptheidx{#2}%
+ \begingroup
+ \@sanitize
+ \@wrspindex}}
+
\catcode`\_=12%
\renewcommand*{\makeindex}[1][\BaseJobname]{%
\if@filesw
@@ -1087,17 +1094,15 @@
\RenewDocumentCommand{\subbottom}{O{} O{} m}{%
\subfloat[#1][#2]{#3}%
}
-
\renewcommand{\contsubtop}{%
- \ContinuedFloat\addtocounter{\@captype}{1}%
+ \ContinuedFloat
\subtop%
}
\renewcommand{\contsubbottom}{%
- \ContinuedFloat\addtocounter{\@captype}{1}%
+ \ContinuedFloat
\subbottom%
}
-
\renewcommand{\subconcluded}{}
\let\contsubtable\contsubtop