lwarp (7jul18)

git-svn-id: svn://tug.org/texlive/trunk@48159 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 44 insertions, 16 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 ab62119c547..ab523f89d1c 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-memoir.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-memoir.sty
@@ -28,6 +28,7 @@
 \RequirePackage{lwarp-footmisc}% req'd
 \RequirePackage{lwarp-framed}% req'd
 \RequirePackage{lwarp-hanging}% req'd
+\RequirePackage{lwarp-makeidx}% req'd
 \DisemulatePackage{moreverb}
 \RequirePackage{lwarp-moreverb}
 \RequirePackage{lwarp-mparhack}
@@ -38,6 +39,7 @@
 \RequirePackage{lwarp-setspace}% req'd
 \RequirePackage{lwarp-showidx}
 \RequirePackage{lwarp-subfigure}% red'q
+\makeindex
 \LetLtxMacro\LWR@memorignewsubfloat\newsubfloat
 \RenewDocumentCommand{\newsubfloat}{O{} m}{%
     \@ifundefined{c@sub#2}{%
@@ -49,18 +51,7 @@
 \RequirePackage{lwarp-titling}% req'd
 \RequirePackage{lwarp-tocloft}% req'd
 \RequirePackage{lwarp-verse}% req'd
-\LetLtxMacro\LWR@origlabel\@mem@old@label
-
-\AtBeginDocument{
-    \def\@@wrindexhyp#1||\\{%
-        \addtocounter{LWR@autoindex}{1}%
-        \LWR@newlabel{LWRindex-\arabic{LWR@autoindex}}%
-      \ifshowindexmark\@showidx{#1}\fi
-      \protected@write\@auxout{}%
-        {\string\@@wrindexm@m{\@idxfile}{#1}{\arabic{LWR@autoindex}}}%
-      \endgroup
-      \@esphack}%
-}
+\LetLtxMacro\LWR@orig@label\@mem@old@label
 
 \setstocksize{190in}{20in}
 \setlrmarginsandblock{2in}{2in}{*}
@@ -739,7 +730,7 @@
 }
 \renewenvironment{sidenamedlegend}[2][]{
 \begin{center}
-\csuse{\@captype name}\CaptionSeparator#2
+\@nameuse{\@captype name}\CaptionSeparator#2
 \end{center}
 }
 {}
@@ -929,6 +920,43 @@
 \renewcommand*{\theTitleReference}[2]{}
 \renewcommand*{\namerefon}{}
 \renewcommand*{\namerefoff}{}
+\AtBeginDocument{
+
+\def\@@wrindexhyp#1||\\{%
+    \addtocounter{LWR@autoindex}{1}%
+    \LWR@new@label{LWRindex-\arabic{LWR@autoindex}}%
+    \protected@write\@auxout{}%
+    {\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}}%
+    }%
+    \endgroup
+    \@esphack}%
+
+}% \AtBeginDocument
+
+\catcode`\_=12%
+\renewcommand*{\makeindex}[1][\BaseJobname]{%
+  \if@filesw
+    \def\index{\@bsphack%
+      \@ifnextchar [{\@index}{\@index[\BaseJobname]}}
+    \def\specialindex{\@bsphack\@spindex}%
+    \makememindexhook
+    \expandafter\newwrite\csname #1@idxfile\endcsname
+    \expandafter\immediate\openout \csname #1@idxfile\endcsname #1_html.idx\relax
+    \typeout{Writing index file #1_html.idx }%
+  \fi}
+\catcode`\_=8%
+
+\catcode`\_=12%
+\renewcommand{\printindex}[1][\BaseJobname]{\@input@{#1_html.ind}}
+\catcode`\_=8%
 \DeclareDocumentCommand{\newblock}{}{}
 \renewcommand*{\showindexmarks}{}
 \renewcommand*{\hideindexmarks}{}
@@ -985,7 +1013,7 @@
 \renewcommand{\midbicaption}[1]{}
 \renewcommand{\contcaption}[1]{%
 \begin{LWR@figcaption}% later becomes \caption*
-\csuse{\@captype name} \thechapter.\the\value{\@captype}\CaptionSeparator #1
+\@nameuse{\@captype name} \thechapter.\the\value{\@captype}\CaptionSeparator #1
 \end{LWR@figcaption}
 }
 
@@ -998,9 +1026,9 @@
 
 \renewcommand{\namedlegend}[2][]{
 \begin{center}
-\csuse{fleg\@captype}\CaptionSeparator#2\\
+\@nameuse{fleg\@captype}\CaptionSeparator#2\\
 \end{center}
-\csuse{flegtoc\@captype}{#1}
+\@nameuse{flegtoc\@captype}{#1}
 }
 
 \renewcommand{\newfixedcaption}[3][\caption]{%