summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/lwarp
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-03-31 23:23:15 +0000
committerKarl Berry <karl@freefriends.org>2017-03-31 23:23:15 +0000
commit071026baab3643897ae28725b0cd7120214920dd (patch)
treeebcc020de4dcff316e4cb24c31f09e6a23609797 /Master/texmf-dist/source/latex/lwarp
parent3e7a5bba844bbc4aca70a24ec2f32ee902592c98 (diff)
lwarp (31mar17)
git-svn-id: svn://tug.org/texlive/trunk@43662 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/lwarp')
-rw-r--r--Master/texmf-dist/source/latex/lwarp/lwarp.dtx1743
-rw-r--r--Master/texmf-dist/source/latex/lwarp/lwarp.ins10
2 files changed, 1147 insertions, 606 deletions
diff --git a/Master/texmf-dist/source/latex/lwarp/lwarp.dtx b/Master/texmf-dist/source/latex/lwarp/lwarp.dtx
index 25aeed06563..82ef9997c87 100644
--- a/Master/texmf-dist/source/latex/lwarp/lwarp.dtx
+++ b/Master/texmf-dist/source/latex/lwarp/lwarp.dtx
@@ -16,7 +16,7 @@
% \iffalse
%<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
%<package>\ProvidesPackage{lwarp}
-%<package> [2017/03/22 v0.25 Allows LaTeX to directly produce HTML5 output.]
+%<package> [2017/03/31 v0.26 Allows LaTeX to directly produce HTML5 output.]
%
%<*driver>
\documentclass{ltxdoc}
@@ -135,7 +135,7 @@
\usepackage[pdftex,bookmarks=true,hidelinks,%
colorlinks,linkcolor=mylinkcolor,urlcolor=myurlcolor,%
-pageanchor=true,hyperindex=true,
+pageanchor=true,hyperindex=true,hyperfootnotes=false%
]{hyperref}
\hypersetup{%
@@ -262,6 +262,11 @@ of the home page if it is after the abstract.
\newcommand{\limitstext}{\cs{textbf}, etc.\ are supported,
but \cs{bfseries}, etc.\ are not yet supported.}
+\newcommand{\limitsfootnotes}{
+\pkg{lwarp} uses native \LaTeX\ footnote code, although with its own
+\cs{box} to avoid the \LaTeX\ output routine. The usual functions work as-is.
+}
+
\newcommand{\limitsverse}{%
\DescribeMacro{\attrib}
The documentation for the \pkg{verse} and \pkg{memoir} packages suggest
@@ -809,15 +814,15 @@ operating-system path separator used by \pkg{lwarp}.
\DocInput{lwarp.dtx}
\end{document}
%</driver>
-
+%
% \fi
-
-
+%
+%
% \iffalse
%<*package>
% \fi
%
-% \CheckSum{10279}
+% \CheckSum{0}
%
% \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
@@ -881,6 +886,7 @@ operating-system path separator used by \pkg{lwarp}.
% \changes{v0.24}{2017/03/15}{\ 2017/03/15}
% \changes{v0.25}{2017/03/22}{\ 2016/03/22}
% \changes{v0.25}{2017/03/16}{Docs: Adds credits for patched code.}
+% \changes{v0.26}{2017/03/31}{\ 2017/03/31}
@@ -1014,6 +1020,18 @@ operating-system path separator used by \pkg{lwarp}.
% For a detailed list of changes, see the Change History on page \pageref{sec:changehistory}.
%
% \begin{description}
+% \item[v0.26:] \
+% \begin{itemize}
+% \item Improved installation instructions for MiK\TeX\ regarding generating
+% the |lwarpmk| executable.
+% \item Footnotes are now supported by \LaTeX\ boxes instead of pagenotes.
+% \pkg{pagenote} now works as per the print version.
+% \pkg{footnote}, \pkg{footnotehyper}, \pkg{footmisc}, \pkg{endnotes},
+% \pkg{marginnote}, and \pkg{sidenotes} are also supported.
+% \item \LaTeX\ labels now are used to track the page numbers of |latexiamge|s.
+% This allows the correct inclusion of |lateximage|s in footnotes, pagenotes, and endnotes.
+% \item \pkg{cutwin} and \pkg{floatflt} are also supported.
+% \end{itemize}
% \item[v0.25:] \
% \begin{itemize}
% \item Fix: Allows \pkg{graphicx} and \pkg{graphicsx} before \pkg{lwarp} because
@@ -1026,6 +1044,7 @@ operating-system path separator used by \pkg{lwarp}.
% \item \pkg{subfig} has been added, along with |lofdepth| and |lotdepth|.
% \item \env{picture} and \env{tikzpicture} now may be inline.
% \end{itemize}
+% \needspace{2\baselineskip}
% \item[v0.22:] \
% \begin{itemize}
% \item Support has been added for tabular column types |D|, |!|, and |X|.
@@ -1248,7 +1267,8 @@ operating-system path separator used by \pkg{lwarp}.
% \cs{nameref}, \cs{ref},
% the \pkg{cleveref} commands, and index entries.\\
% \midrule
-% Footnotes: & Supported, emulated as pagenotes per \acro{HTML} page. \\
+% Footnotes, pkg{footnote}, \pkg{footmisc}, \pkg{pagenote}, \pkg{endnotes}: &
+% Supported. \\
% Indexing: & \cmds{texindy} is used, with hyperlinks. \\
% Bibliography: & Supported, without hyperlinks so far. \\
% \midrule
@@ -1640,7 +1660,11 @@ operating-system path separator used by \pkg{lwarp}.
% try installing via |tlmgr|:
% \userentry{tlmgr install lwarp}
%
-% \item [MiK\TeX:] If using MiK\TeX, try using the package installer.
+% \item [MiK\TeX:] If using MiK\TeX, try using the package installer to
+% install the package |lwarp|.
+% Also update the package |miktex-misc|, which will install the
+% |lwarpmk| executable.
+% \changes{v0.26}{2017/03/23}{Docs: Improved MiK\TeX\ install instructions.}
%
% \item [Operating-system package:] The operating-system package manager may
% already have |lwarp|, perhaps as part of a set of \TeX-related packages.
@@ -1654,7 +1678,7 @@ operating-system path separator used by \pkg{lwarp}.
% \item[\TeX\ Live:] \
%
% \userentry{kpsewhich -var-value TEXMFLOCAL}
-% \item[MiKTeX:] \
+% \item[MiK\TeX:] \
%
% In the ``Settings'' window, ``Roots'' tab, look for a local TDS root.
% \end{description}
@@ -1726,6 +1750,10 @@ operating-system path separator used by \pkg{lwarp}.
% If not, it is easiest to generate and use a local copy.
% See \cref{sec:locallwarpmk}.
%
+% \item For MiK\TeX, try updating the |miktex-misc| package. This may install
+% the |lwarpmk| executable for you.
+% \changes{v0.26}{2017/03/23}{Docs: Improved MiK\TeX\ install instructions.}
+%
% Otherwise, continue with the following:
%
% \item Locate the file |lwarpmk.lua|, which should be in the |scripts| directory
@@ -1769,8 +1797,8 @@ operating-system path separator used by \pkg{lwarp}.
% In this directory you will find programs
% such as |pdflatex.exe| and |makeindex.exe|.
% \item Create a new file named |lwarpmk.bat| containing: \\
-% \hspace*{1em}
-% |texlua "C:\Program Files\MiKTeX 2.9\scripts\lwarp\lwarp.texlua" %*| \\
+% \hspace*{1em}{\small
+% |texlua "C:\Program Files\MiKTeX 2.9\scripts\lwarp\lwarp.texlua" %*|} \\
% This will call the copy of |lwarpmk.lua|
% which is in the |scripts| directory of the distribution.
% \end{enumerate}
@@ -3114,6 +3142,11 @@ operating-system path separator used by \pkg{lwarp}.
%
% \limitstext
%
+% \subsubsection{Footnotes and page notes}
+%
+% \limitsfootnotes
+%
+%
% \subsubsection{Math}
% \label{sec:limitsmath}
%
@@ -3916,7 +3949,9 @@ Please use the #2 package instead}
\LWR@loadafter{amsthm}
\LWR@loadafter{bookmark}
\LWR@loadafter{booktabs}
+\LWR@loadafter{ccaption}
\LWR@loadafter{changepage}
+\LWR@loadafter{cutwin}
\LWR@loadafter{dcolumn}
\LWR@loadafter{draftwatermark}
\LWR@loadafter{ellipsis}
@@ -3929,6 +3964,7 @@ Please use the #2 package instead}
\LWR@loadafter{fancyhdr}
\LWR@loadafter{floatrow}
\LWR@loadafter{float}
+\LWR@loadafter{floatflt}
\LWR@loadafter{ftnright}
\LWR@loadafter{geometry}
% \LWR@loadafter{graphics}% pre-loaded by xunicode
@@ -3943,9 +3979,12 @@ Please use the #2 package instead}
\LWR@loadafter{longtable}
\LWR@loadafter{lscape}
\LWR@loadafter{ltcaption}
+\LWR@loadafter{marginfix}
+\LWR@loadafter{marginnote}
\LWR@loadafter{mcaption}
\LWR@loadafter{mdframed}
\LWR@loadafter{microtype}
+\LWR@loadafter{mparhack}
%\LWR@loadafter{multicol}% loaded by ltxdoc
\LWR@loadafter{multirow}
\LWR@loadafter{nameref}
@@ -3963,6 +4002,7 @@ Please use the #2 package instead}
\LWR@loadafter{showidx}
\LWR@loadafter{showkeys}
\LWR@loadafter{sidecap}
+\LWR@loadafter{sidenotes}
\LWR@loadafter{subfig}
\LWR@loadafter{tabularx}
\LWR@loadafter{textpos}
@@ -4344,6 +4384,12 @@ top=1in,bottom=1in,%
% \end{macrocode}
+% \DescribePackage{refcount}
+% \begin{macrocode}
+\RequirePackage{refcount}
+% \end{macrocode}
+
+
% \DescribePackage{newfloat}
% \begin{macrocode}
\RequirePackage{newfloat}
@@ -4368,16 +4414,7 @@ top=1in,bottom=1in,%
\setlist[description]{leftmargin=0em}
% \end{macrocode}
-
-% \DescribePackage{pagenote}
-%
-% Used to convert footnotes into pagenotes.
% \begin{macrocode}
-\RequirePackage[continuous]{pagenote}
-\makepagenote
-\let\LWR@origmakepagenote\makepagenote
-\let\LWR@origprintnotes\printnotes
-\let\LWR@origpagenote\pagenote
\end{warpHTML}
% \end{macrocode}
@@ -4618,10 +4655,10 @@ top=1in,bottom=1in,%
% \begin{macro}{\LWR@ProvidesPackagePass} \marg{pkgname} \oarg{version}
%
-% Provides a new package which passes its options to the original.
+% Uses the original package, including options.
% \begin{macrocode}
\NewDocumentCommand{\LWR@ProvidesPackagePass}{m o}{
-\PackageInfo{lwarp}{Using the lwarp version of package `#1', including options,}%
+\PackageInfo{lwarp}{Using package `#1' and adding lwarp modifications, including options,}%
\IfValueTF{#2}
{\ProvidesPackage{lwarp-#1}[#2]}
{\ProvidesPackage{lwarp-#1}}
@@ -4636,13 +4673,13 @@ top=1in,bottom=1in,%
% \end{macro}
-
% \begin{macro}{\LWR@ProvidesPackageDrop} \marg{pkgname} \oarg{version}
%
-% Provides a new package which drops/discards its options.
+% Ignores the original package and uses lwarp's version instead.
+% Drops/discards all options.
% \begin{macrocode}
\NewDocumentCommand{\LWR@ProvidesPackageDrop}{m o}{
-\PackageInfo{lwarp}{Using the lwarp version of package `#1', discarding options,}%
+\PackageInfo{lwarp}{Replacing package `#1' with the lwarp version, discarding options,}%
\IfValueTF{#2}
{\ProvidesPackage{lwarp-#1}[#2]}
{\ProvidesPackage{lwarp-#1}}
@@ -4713,7 +4750,10 @@ top=1in,bottom=1in,%
% \begin{macrocode}
\newcommand{\LWR@traceinfo}[1]{%
\ifbool{LWR@tracinglwarp}%
-{\PackageInfo{lwarp}{#1 : }}%
+{%
+\typeout{*** lwarp: #1}%
+% \PackageInfo{lwarp}{#1 : }%
+}%
{}%
}
% \end{macrocode}
@@ -6313,15 +6353,20 @@ top=1in,bottom=1in,%
%
% \index{footnotes}
%
+% \limitsfootnotes
+%
+% \changes{v0.26}{2017/03/28}{Footnotes now are \LaTeX\ boxes instead of pagenotes.}
%
% Several kinds of footnotes are used: in a regular page, in a minipage, or
% as thanks in the titlepage. Each of these is handle differently.
%
% \subsection{Regular page footnotes}
-% In \LaTeXe{} printed documents, footnotes are placed at the bottom of the printed page.
-% For \acro{HTML}, footnotes will be replaced by page notes
-% using the \pkg{pagenote} package.
-% Footnotes will then appear at the bottom of the \acro{HTML} page.
+% In \acro{HTML} documents, footnotes are placed at the
+% bottom of the web page using the \LaTeX\ box \cs{LWR@footnotes}.
+% Using this instead of the original \cs{footins} box
+% avoids having footnotes be printed by the output routine,
+% since footnotes should be printed per \acro{HTML} page
+% instead of per \acro{PDF} page.
%
% See \cref{sec:footnotesregular} for the implementation.
%
@@ -6331,7 +6376,6 @@ top=1in,bottom=1in,%
% \subsection{Titlepage thanks}
% See \cref{sec:titlehtml} for titlepage footnotes.
%
-%
% \subsection{Regular page footnote implementation}
% \label{sec:footnotesregular}
%
@@ -6341,109 +6385,70 @@ top=1in,bottom=1in,%
% \end{macrocode}
-% Delayed in case the user's preamble loaded and adjusted \pkg{pagenote}:
+% Patch \LaTeX\ footnotes to use a new \cs{box} for \pkg{lwarp} footnotes.
% \begin{macrocode}
-\AtEndPreamble{
+\newbox\LWR@footnotes
+\setbox\LWR@footnotes=\vbox{}
% \end{macrocode}
-
-
-% \begin{macro}{\notedivision}
%
-% Prints the footnote heading at the end of the page.
+% Much of the following has unneeded print-mode formatting removed.
% \begin{macrocode}
-\renewcommand*{\notedivision}
- {\BlockClassSingle{footnoteheader}{}}
-% \end{macrocode}
-% \end{macro}
+\long\def\@makefntext#1{\textsuperscript{\@thefnmark} #1}
-% \begin{docsidebar}[To print the word ``Notes:'' at the top of the footnotes:]
-% \begin{Verbatim}[gobble=2,obeytabs,tabsize=4]
-% \renewcommand*{\notedivision}| \\
-% {\BlockClassSingle{footnoteheader}{Notes:}}
-% \end{Verbatim}
-% \end{docsidebar}
+\def\@makefnmark{\hbox{\textsuperscript{\@thefnmark}}}
-% \begin{macro}{\pagenotesubhead} \marg{num} \marg{title}
-%
-% Don't print page note headings in \acro{HTML} page notes.
-% \begin{macrocode}
-\renewcommand{\pagenotesubhead}[2]{}
+\long\def\@footnotetext#1{%
+\global\setbox\LWR@footnotes=\vbox{\unvbox\LWR@footnotes%
+\protected@edef\@currentlabel{%
+\csname p@footnote\endcsname\@thefnmark%
+}% @currentlabel
+\color@begingroup%
+\@makefntext{#1}%
% \end{macrocode}
-% \end{macro}
%
-% \begin{macro}{\footnote} \oarg{id} \marg{text}
-% Footnotes now become page notes.
+% A closing paragraph tag is required here:
% \begin{macrocode}
-\let\footnote\LWR@origpagenote
+\LWR@htmltagc{/\LWR@tagregularparagraph}%
+\color@endgroup%
+}% vbox
+}%
+
+\long\def\@mpfootnotetext#1{%
+\global\setbox\@mpfootins\vbox{%
+\unvbox\@mpfootins
+\reset@font\footnotesize
+\hsize\columnwidth
+\@parboxrestore
+\protected@edef\@currentlabel
+{\csname p@mpfootnote\endcsname\@thefnmark}%
+\color@begingroup
+\@makefntext{%
+\ignorespaces#1%
+}%
% \end{macrocode}
-% \end{macro}
%
-%
-% \begin{macro}{\notenuminnotes} \marg{number}
-%
-% Sets the page notes to use superscripts to match standard classes.
+% Don't add the closing paragraph tag if are inside a \env{lateximage}:
% \begin{macrocode}
-\renewcommand{\notenuminnotes}[1]{%
- \textsuperscript{#1} }
+\ifthenelse{\cnttest{\value{LWR@lateximagedepth}}{>}{0}}%
+{}%
+{\LWR@htmltagc{/\LWR@tagregularparagraph}}%
% \end{macrocode}
-% \end{macro}
-
-
-%\begin{macro}{\noteentry} \marg{1: note number} \marg{2: id} \marg{3: text} \marg{4: pagenum}
-%
-% \changes{v0.14}{2016/03/28}{Fix for label inside a footnote.}
%
% \begin{macrocode}
-\let\LWR@orignoteentry\noteentry
-\renewcommand{\noteentry}[4]{%
-% \end{macrocode}
-% \DescribeMacro{\@currentlabel}
-% \DescribeMacro{\cref@currentlabel}
-% A label may be used inside a note, so the proper \cs{@currentlabel} must be set
-% inside a group. Likewise for \pkg{cleveref}'s \cs{cref@currentlabel}.
-% \begin{macrocode}
-\begingroup%
-\renewcommand*{\@currentlabel}{#1}%
-\renewcommand*{\cref@currentlabel}{[pagenote][#1][]{#1}}%
-% \end{macrocode}
-% Re-use \pkg{pageref}'s code, with an extra endgroup:
-% \begin{macrocode}
-\LWR@orignoteentry{#1}{#2}{#3}{#4}%
-\endgroup%
+\color@endgroup}%
}
% \end{macrocode}
-% \end{macro}
-
-
-% \begin{macro}{\LWR@printpendingnotes}
-% Prints the page notes at the end of the section.
-% \begin{macrocode}
-\newcommand*{\LWR@printpendingnotes}{
-% \end{macrocode}
-% If there are footnotes to print, open a new |div| and print the notes.
+%
+% Enclose the footnotes in a class, print, then clear:
% \begin{macrocode}
-\ifthenelse{\cnttest{\value{pagenote}}{>}{0}}%
-{
+\newcommand*{\LWR@printpendingfootnotes}{%
\begin{BlockClass}{footnotes}
-% \end{macrocode}
-% Print any pending endnotes, allowing new endnotes to accumulate.
-% \begin{macrocode}
-\LWR@origprintnotes*
-% \end{macrocode}
-% Start over with new page notes.
-% \begin{macrocode}
-\setcounter{pagenote}{0}
+\LWR@origmedskip
+\unvbox\LWR@footnotes
+\setbox\LWR@footnotes=\vbox{}
\end{BlockClass}
}
-{}
-}
% \end{macrocode}
-% \end{macro}
-
-% \begin{macrocode}
-}% \AtEndPreamble
-% \end{macrocode}
-
% \begin{macrocode}
\end{warpHTML}
@@ -6671,7 +6676,7 @@ top=1in,bottom=1in,%
% \begin{macrocode}
\LWR@htmlelementclassend{section}{textbody}
-\LWR@printpendingnotes
+\LWR@printpendingfootnotes
\LWR@htmlelement{footer}
@@ -7541,7 +7546,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
% \end{macrocode}
% Print any pending footnotes:
% \begin{macrocode}
-\LWR@printpendingnotes
+\LWR@printpendingfootnotes
% \end{macrocode}
% Create the footer:
% \begin{macrocode}
@@ -8262,7 +8267,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
% Redefine the footnote mark:
%
% \begin{macrocode}
-\def\@makefnmark{\textsuperscript{\thefootnote}}%
+\def\@makefnmark{\textsuperscript{\thefootnote}}
% \end{macrocode}
% \begin{center}
% \begin{minipage}{.7\linewidth}
@@ -8289,9 +8294,9 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
% \end{minipage}
% \end{center}
%
-% Print the text and a closing paragraph tag:
+% Print the text:
% \begin{macrocode}
-##1\LWR@htmltagc{/\LWR@tagregularparagraph}%
+##1%
}%
}
% \end{macrocode}
@@ -8395,11 +8400,10 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
% where type is `arabic', `roman', `fnsymbol', etc. Modified to
% use the \LaTeX{} \acro{PDF} minipage which is included with the title page.
% \begin{macrocode}
-\let\LWR@origthanksmarkseries\thanksmarkseries
\renewcommand{\thanksmarkseries}[1]{%
\def\@mpbsmarkseries{%
-\renewcommand*{\thempfootnote}{\@nameuse{#1}{mpfootnote}}}
-\LWR@origthanksmarkseries{#1}
+\renewcommand*{\thempfootnote}{\@nameuse{#1}{mpfootnote}}}%
+\def\@bsmarkseries{\renewcommand{\thefootnote}{\@nameuse{#1}{footnote}}}%
}
% \end{macrocode}
% \end{macro}
@@ -8627,7 +8631,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
\renewcommand{\VerbatimFootnotes}{
\PackageError{lwarp}
{Verbatim footnotes are not yet supported by lwarp.}
-{This may be improved when lwarp uses LaTeX footnotes instead of pagenotes.}
+{This may be improved some day.}
}
% \end{macrocode}
@@ -10965,6 +10969,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
% The optional \meta{type} is per the \pkg{ntheorem} package, and is ignored.
% \begin{macrocode}
\NewDocumentCommand{\LWR@newlabel}{m o}{%
+\LWR@traceinfo{LWR@newlabel: starting}%
\LWR@traceinfo{LWR@newlabel: !#1!}%
% \@bsphack%
% \end{macrocode}
@@ -11699,7 +11704,7 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}%
% Prints any pending footnotes so that they appear above the potentially
% large TOC:
% \begin{macrocode}
-\LWR@printpendingnotes
+\LWR@printpendingfootnotes
% \end{macrocode}
% Place the list into its own chapter (if defined) or section:
% \begin{macrocode}
@@ -11744,11 +11749,18 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}%
% The original |.toc| file is renewed when \cs{tableofcontents} is finished.
% \begin{macrocode}
\LWR@copyfile{\jobname.toc}{\jobname.sidetoc}%
-\LWR@printpendingnotes%
+\LWR@printpendingfootnotes
\LWR@origtableofcontents%
}
-\renewcommand*{\listoffigures}{\LWR@printpendingnotes\LWR@origlistoffigures}
-\renewcommand*{\listoftables}{\LWR@printpendingnotes\LWR@origlistoftables}
+\renewcommand*{\listoffigures}{
+\LWR@printpendingfootnotes
+\LWR@origlistoffigures
+}
+
+\renewcommand*{\listoftables}{
+\LWR@printpendingfootnotes
+\LWR@origlistoftables
+}
% \end{macrocode}
@@ -12137,15 +12149,17 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}%
% Plain dollar signs appearing in the \acro{HTML} output may be interpreted
% by MathJax to be math shifts.
% For a plain text dollar |\$|, print it inside a span to avoid
-% it being interpreted by MathJax.
+% it being interpreted by MathJax, unless are inside a lateximage,
+% in which case it will not be seen by MathJax.
% \changes{v0.19}{2016/06/08}{Avoids MathJax.}
+% \changes{v0.26}{2017/03/30}{Dollar span avoided in a lateximage.}
% \begin{macrocode}
\let\LWR@origtextdollar\$
\renewcommand*{\$}{%
-\LWR@htmltagc{span}%
-\LWR@origtextdollar%
-\LWR@htmltagc{/span}%
+\ifthenelse{\cnttest{\value{LWR@lateximagedepth}}{>}{0}}%
+{\LWR@origtextdollar}%
+{\LWR@htmltagc{span}\LWR@origtextdollar\LWR@htmltagc{/span}}%
}
% \end{macrocode}
@@ -12858,20 +12872,21 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}%
% \section{Lateximages}
-% A |\lateximage| is typeset on its own \acro{PDF} page inside an \acro{HTML} comment starting on the preceeding page
-% and ending on following page, and instructions are written to
+% A |\lateximage| is typeset on its own \acro{PDF} page inside an \acro{HTML} comment
+% which starts on the preceeding page and ends on following page, and instructions are written to
% |lateximage.txt| for |lwarpmk| to extract the |\lateximage| from the page of the \acro{PDF} file
% then generate an accompanying |.svg| file image file. Meanwhile, instructions to
% show this image are placed into the \acro{HTML} file after the comment.
%
-% Since the |\lateximage| is placed onto its own \acro{PDF} page, which |pdftotext| will read
-% and try to convert to text, an \acro{HTML} open comment is placed onto the bottom of the current
-% page, but it must appear below any footnotes on the current page, so
-% a special page style (|LWR@commentfooterstyle|) is used.
-%
-% An \acro{HTML} span is created to hold both the \acro{HTML} comment which will have the |pdftotext| conversion,
+% An \acro{HTML} span is created to hold both the \acro{HTML} comment,
+% which will have the |pdftotext| conversion,
% and also the link to the final |.svg| image.
%
+% A \LaTeX\ label is used to remember which \acro{PDF} page has the image.
+% A label is used because footnotes, endnotes, and pagenotes may cause the image to appear
+% at a later time. The label is declared along with the image, and so it correctly remembers
+% where the image finally ended up.
+%
% \limitslateximagefontsize
%
%
@@ -12881,14 +12896,7 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}%
\begin{warpHTML}
% \end{macrocode}
%
-% \DescribeObject{LWR@commentfooterstyle}
-% \begin{macrocode}
-\newpagestyle{LWR@commentfooterstyle}{
- \sethead{}{}{}
- \setfoot{\LWR@htmlopencomment}{}{}
-}
-% \end{macrocode}
-
+%
% \DescribeCounter{LWR@lateximagenumber}
% Sequence the images.
% \begin{macrocode}
@@ -12912,13 +12920,15 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}%
\edef\LWR@hashmark{\string#} % for use in \write
\edef\LWR@percent{\@percentchar} % for use in \write
% \end{macrocode}
-
-% \DescribeCounter{LWR@nextpage}
-% Used to count ahead to the next page:
+%
+%
+% \DescribeCounter{LWR@LIpage}
+% Used to reference the \acro{PDF} page number of a lateximage
+% to be written into |lateximages.txt|.
% \begin{macrocode}
-\newcounter{LWR@nextpage}
+\newcounter{LWR@LIpage}
% \end{macrocode}
-
+%
% \begin{macrocode}
\end{warpHTML}
% \end{macrocode}
@@ -13010,8 +13020,11 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}%
% \changes{v0.18}{2016/05/18}{Surpress extra space.}
% \changes{v0.18}{2016/05/18}{pdfcrop: -{}-hires added.}
% \changes{v0.18}{2016/05/19}{Reorganize \cs{HomeHTMLFilename} logic.}
+% \changes{v0.26}{2017/03/22}{Print mode now uses a \env{minipage} of \cs{linewidth}.}
+% \changes{v0.26}{2017/03/29}{Labels track page numbers of lateximages.}
% \begin{macrocode}
\NewDocumentEnvironment{lateximage}{O{image}}{%
+\LWR@traceinfo{lateximage: starting on page \arabic{page}}%
\ifthenelse{\cnttest{\value{LWR@lateximagedepth}}{>}{0}}%
% \end{macrocode}
% If nesting inside an already-existing lateximage, simply record one more level:
@@ -13027,6 +13040,7 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}%
% Starting a new lateximage:
% \begin{macrocode}
\addtocounter{LWR@lateximagenumber}{1}%
+\LWR@traceinfo{lateximage: LWR@lateximagenumber is \arabic{LWR@lateximagenumber}}%
% \end{macrocode}
% While inside a lateximage, do not use mathjax:
% \begin{macrocode}
@@ -13039,11 +13053,12 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}%
% Next file:
% \begin{macrocode}
\addtocounter{LWR@externalfilecnt}{1}%
+\LWR@traceinfo{lateximage: LWR@externalfilecnt is \arabic{LWR@externalfilecnt}}%
% \end{macrocode}
% Figure out what the next page number will be:
% \begin{macrocode}
-\setcounter{LWR@nextpage}{\thepage}%
-\addtocounter{LWR@nextpage}{1}%
+\setcounterpageref{LWR@LIpage}{LWRlateximage\theLWR@lateximagenumber}%
+\LWR@traceinfo{lateximage: LWR@LIpage is \arabic{LWR@LIpage}}%
% \end{macrocode}
% Create an \acro{HTML} span which will hold the comment which contains the |pdftotext| translation
% of the image's page, and also will hold the link to the |.svg| file:
@@ -13053,13 +13068,13 @@ class="lateximagesource"{}} \LWR@orignewline
% \end{macrocode}
% Write instructions to the |lateximages.txt| file:
% \begin{macrocode}
-\immediate\write\LWR@file{|\theLWR@nextpage|\theLWR@externalfilecnt|}%
+\immediate\write\LWR@file{|\theLWR@LIpage|\theLWR@externalfilecnt|}%
% \end{macrocode}
% Place an open comment tag at the bottom of page; footnotes will be above this tag.
% This will hide any traces of the lateximage \acro{PDF} page which were picked up by
% |pdftotext|.
% \begin{macrocode}
-\LWR@origthispagestyle{LWR@commentfooterstyle}%
+\LWR@htmlopencomment%
\addtocounter{LWR@lateximagedepth}{1}%
% \end{macrocode}
% Start the new \acro{PDF} page:
@@ -13093,6 +13108,7 @@ class="lateximagesource"{}} \LWR@orignewline
\let\tabular\LWR@origtabular%
\let\endtabular\LWR@origendtabular%
\let\newline\LWR@orignewline%
+\LWR@origlabel{LWRlateximage\arabic{LWR@lateximagenumber}}% *8*
}% end of outer-most lateximage
}% end of \begin{lateximage}
{% start of \end{lateximage}
@@ -13117,6 +13133,7 @@ class="lateximagesource"{}} \LWR@orignewline
% Close the \acro{HTML} comment which encapsulated any traces of the lateximage picked up by |pdftotext|:
% \begin{macrocode}
\LWR@htmlclosecomment{}\LWR@orignewline%
+\LWR@traceinfo{lateximage: The page after the image is \arabic{page}}%
% \end{macrocode}
% Create a link to the lateximage, allowing its natural height:
%
@@ -13153,13 +13170,14 @@ class="lateximagesource"{}} \LWR@orignewline
% \begin{macrocode}
\addtocounter{LWR@lateximagedepth}{-1}%
}% end of outer-most lateximage
+\LWR@traceinfo{lateximage: done}
}%
\end{warpHTML}
% \end{macrocode}
% \codeprint
% \begin{macrocode}
\begin{warpprint}
-\newenvironment{lateximage}[1][]{\begingroup}{\endgroup}
+\newenvironment{lateximage}[1][]{\minipage{\linewidth}}{\endminipage}
\end{warpprint}
% \end{macrocode}
% \end{environment}
@@ -13896,15 +13914,8 @@ img src="\thisgraphicspath\LWR@strresult\LWR@imageextension" \LWR@orignewline
%
% \cs{AtEndPreable} forces \pkg{cleveref} to be loaded last:
%
-% \changes{v0.14}{2016/03/29}{Pagenote: Assigned cleveref name.}
% \changes{v0.19}{2016/06/06}{cleveref: Loaded \cs{AtEndPreamble}.}
%
-% \begin{macrocode}
-\AtEndPreamble{
-\RequirePackage{cleveref}
-\crefname{pagenote}{note}{notes}
-}
-% \end{macrocode}
%
%
% \changes{v0.20}{2017/01/05}{\pkg{cleveref} and referencing patches: Applied \cs{AfterEndPreamble}.}
@@ -14015,8 +14026,12 @@ img src="\thisgraphicspath\LWR@strresult\LWR@imageextension" \LWR@orignewline
% \begin{environment}{picture}
% \changes{v0.24}{2017/03/13}{Fix for inline images.}
+% \changes{v0.26}{2017/03/30}{Fix for \cs{makebox} in \env{picture}.}
% \begin{macrocode}
-\BeforeBeginEnvironment{picture}{\lateximage}
+\BeforeBeginEnvironment{picture}{%
+\lateximage%
+\let\makebox\LWR@origmakebox%
+}
\AfterEndEnvironment{picture}{\endlateximage}
% \end{macrocode}
@@ -14079,43 +14094,6 @@ img src="\thisgraphicspath\LWR@strresult\LWR@imageextension" \LWR@orignewline
% Also see \cref{sec:footnotes} for other forms of footnotes.
%
%
-%
-% \begin{macro}{\LWR@nullrule} \oarg{raise} \marg{width} \marg{height}
-%
-% Used to cancel the footnotesep rule during \acro{HTML} output.
-% This rule was causing occasional end paragraph tags to be inserted
-% for some (so far) undetermined reason, as well
-% as adding purposeless code to the \acro{HTML} output.
-% \begin{macrocode}
-\NewDocumentCommand{\LWR@nullrule}{o m m}{}
-% \end{macrocode}
-% \end{macro}
-%
-%
-% \begin{macro}{\LWR@makefntext} \marg{text}
-%
-% Adds a paragraph closing tag to the end of each footnote.
-% \begin{macrocode}
-\newcommand{\LWR@makefntext}[1]{%
-\begingroup%
-\let\rule\LWR@nullrule%
-\textsuperscript{\@thefnmark} #1%
-\endgroup%
-\LWR@htmltagc{/\LWR@tagregularparagraph}%
-}
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\LWR@makefnmark}
-% Creates an \acro{HTML} superscript footnote mark:
-% \begin{macrocode}
-\newcommand*{\LWR@makefnmark}{\textsuperscript{\@thefnmark}}
-% \end{macrocode}
-% \end{macro}
-%
-%
-
-%
% \subsection{Minipage handling}
%
% \begin{macro}{\LWR@endminipage}
@@ -14130,6 +14108,7 @@ img src="\thisgraphicspath\LWR@strresult\LWR@imageextension" \LWR@orignewline
\vskip\skip\@mpfootins
\normalcolor
\LWR@htmldivclass{mpfootnotes}
+ \LWR@origmedskip
\unvbox\@mpfootins
\LWR@htmldivclassend{mpfootnotes}
\fi
@@ -14153,12 +14132,6 @@ img src="\thisgraphicspath\LWR@strresult\LWR@imageextension" \LWR@orignewline
% \begin{macrocode}
\LWR@origraggedright%
% \end{macrocode}
-% Minipage footnotes appear the bottom of the minipage.
-% \begin{macrocode}
-\let\footnote\LWR@origfootnote%
-\let\@makefntext\LWR@makefntext%
-\let\@makefnmark\LWR@makefnmark%
-% \end{macrocode}
% Resume paragraph tag handling for the contents of the minipage:
% \begin{macrocode}
\LWR@startpars%
@@ -14305,9 +14278,6 @@ img src="\thisgraphicspath\LWR@strresult\LWR@imageextension" \LWR@orignewline
% |\raggedright| cancels hyphenation, which will be done by \acro{HTML} instead.
% \begin{macrocode}
\LWR@origraggedright%
-\let\footnote\LWR@origfootnote%
-\let\@makefntext\LWR@makefntext%
-\let\@makefnmark\LWR@makefnmark%
% \end{macrocode}
% Resume paragraph tag handling for the contents of the minipage:
% \begin{macrocode}
@@ -14357,6 +14327,8 @@ img src="\thisgraphicspath\LWR@strresult\LWR@imageextension" \LWR@orignewline
%
% Width and position are ignored.
% \begin{macrocode}
+\let\LWR@origmakebox\makebox
+
\RenewDocumentCommand{\makebox}{o o m}{%
\mbox{#3}
}
@@ -14637,6 +14609,7 @@ img src="\thisgraphicspath\LWR@strresult\LWR@imageextension" \LWR@orignewline
\let\LWR@origqquad\qquad
\let\LWR@orighspace\hspace
\let\LWR@origrule\rule
+\let\LWR@origmedskip\medskip
% \end{macrocode}
% Direct-formatting space commands become \acro{HTML} entities:
@@ -15301,12 +15274,12 @@ homehtmlfilename = "\HomeHTMLFileName"%
% \iffalse
%</package>
% \fi
-
-
-
+%
+%
+%
% \clearpage
-
-
+%
+%
% \iffalse
%<*lwarp-newproject>
% \fi
@@ -15517,6 +15490,9 @@ homehtmlfilename = "\HomeHTMLFileName"%
% This must be present both when compiling the project
% and also when distributing the \acro{HTML} files.
%
+% \changes{v0.26}{2017/03/30}{\texttt{lwarp.css}: Improved responsive
+% \texttt{marginpar} and \texttt{marginblock}.}
+%
% \begin{macrocode}
\begin{VerbatimOut}{lwarp.css}
/*
@@ -15760,24 +15736,31 @@ div.titlepage {
}
.marginpar {
-width:20%; float:right;
-text-align:left;
-margin: 1ex 0.5em 1ex 1em ;
-padding: 1ex 0.5em 1ex 0.5em ;
-font-size: 85% ;
-border-top: 1px solid silver ;
-border-bottom: 1px solid silver ;
-overflow-x: auto;
+ max-width:50%;
+ float:right;
+ text-align:left;
+ margin: 1ex 0.5em 1ex 1em ;
+ padding: 1ex 0.5em 1ex 0.5em ;
+ font-size: 85% ;
+ border-top: 1px solid silver ;
+ border-bottom: 1px solid silver ;
+ overflow-x: auto;
}
.marginpar br { margin-bottom: 2ex ; }
div.marginblock {
-width:50%; float:right;
-text-align:left;
-margin: 1ex 0.5em 1ex 1em ;
-padding: 1ex 0.5em 1ex 0.5em ;
-overflow-x: auto;
+ max-width:50%;
+ float:right;
+ text-align:left;
+ margin: 1ex 0.5em 1ex 1em ;
+ padding: 1ex 0.5em 1ex 0.5em ;
+ overflow-x: auto;
+}
+
+div.marginblock div.minipage {
+ display: block ;
+ margin: 0pt auto 0pt auto ;
}
div.marginblock div.minipage p { font-size: 85%}
@@ -15800,10 +15783,8 @@ section.textbody div.footnotes{
.mpfootnotes {
text-align: left ;
font-size: .85em ;
- margin: 3ex 0em 3ex 0em ;
+ margin-left: 1em ;
border-top: 1px solid silver ;
- border-bottom: 1px solid silver ;
-/* padding-top: 1ex ; */
}
/* Remove footnote top border in the title page. */
@@ -16608,6 +16589,12 @@ nav.botnavigation { display:none; }
}
/* nav.topnavigation { display:block } */
nav.botnavigation { display:block }
+ .marginpar {
+ max-width: 100%;
+ float: none;
+ display:block ;
+ margin: 1ex 1em 1ex 1em ;
+ }
}
@media print {
@@ -17283,7 +17270,7 @@ MathJax.Hub.Config({
-- Print the usage of the lwarpmk command:
-printversion = "v0.25"
+printversion = "v0.26"
function printhelp ()
print ("lwarpmk: Use lwarpmk -h or lwarpmk --help for help.") ;
@@ -17725,22 +17712,22 @@ end -- not --version
% \iffalse
%</lwarp-newproject>
% \fi
-
-
-
-
-
+%
+%
+%
+%
+%
% \changes{v0.20}{2016/12/12}{Code factored into independent \texttt{lwarp\_html} files.}
-
-
-
-
+%
+%
+%
+%
% \clearpage
-
+%
% \iffalse
%<*abstract>
% \fi
-
+%
% \part{lwarp-abstract.sty}
%
% \section{Abstract}
@@ -17830,17 +17817,17 @@ end -- not --version
% \iffalse
%</abstract>
% \fi
-
-
-
+%
+%
+%
% \clearpage
%
% \iffalse
%<*afterpage>
% \fi
-
+%
% \part{lwarp-afterpage.sty}
-
+%
% \section{Afterpage}
%
% \DescribePackage{afterpage} Not used.
@@ -17853,25 +17840,25 @@ end -- not --version
% \begin{macrocode}
\LWR@ProvidesPackageDrop{afterpage}
% \end{macrocode}
-
+%
% \begin{macrocode}
\newcommand{\afterpage}[1]{#1}
% \end{macrocode}
-
+%
% \iffalse
%</afterpage>
% \fi
-
-
-
+%
+%
+%
% \clearpage
-
+%
% \iffalse
%<*algorithmicx>
% \fi
-
+%
% \part{lwarp-algorithmicx.sty}
-
+%
% \section{Algorithmicx}
% \label{sec:algorithmicx}
%
@@ -17923,13 +17910,13 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
% \iffalse
%</algorithmicx>
% \fi
-
-
-
+%
+%
+%
% \iffalse
%<*alltt>
% \fi
-
+%
% \part{lwarp-alltt.sty}
% \section{Alltt}
@@ -17955,11 +17942,11 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
% \iffalse
%</alltt>
% \fi
-
-
-
+%
+%
+%
% \clearpage
-
+%
% \iffalse
%<*amsthm>
% \fi
@@ -18106,9 +18093,9 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
% \iffalse
%</amsthm>
% \fi
-
-
-
+%
+%
+%
% \iffalse
%<*bookmark>
% \fi
@@ -18142,12 +18129,12 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
% \iffalse
%</bookmark>
% \fi
-
-
-
-
+%
+%
+%
+%
% \clearpage
-
+%
% \iffalse
%<*booktabs>
% \fi
@@ -18180,9 +18167,9 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
% \iffalse
%</booktabs>
% \fi
-
-
-
+%
+%
+%
% \iffalse
%<*ccaption>
% \fi
@@ -18206,11 +18193,11 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
% \iffalse
%</ccaption>
% \fi
-
-
-
+%
+%
+%
% \clearpage
-
+%
% \iffalse
%<*changepage>
% \fi
@@ -18243,16 +18230,76 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
% \iffalse
%</changepage>
% \fi
+%
+%
+%
+%
+%
+%
+% \clearpage
+%
+% \iffalse
+%<*cutwin>
+% \fi
+%
+% \part{lwarp-cutwin.sty}
+%
+% \section{Cutwin}
+%
+% \DescribePackage{cutwin} Emulated.
+%
+% \changes{v0.26}{2017/03/30}{\pkg{cutwin}: Added.}
+%
+% \codehtml
+%
+% Discard all options for \pkg{lwarp-cutwin}:
+% \begin{macrocode}
+\LWR@ProvidesPackageDrop{cutwin}
+% \end{macrocode}
+%
+% \begin{macrocode}
+\newcommand*{\opencutleft}{}
+\newcommand*{\opencutright}{}
+\newcommand*{\opencutcenter}{}
+\newcommand*{\cutfuzz}{}
+
+\newenvironment{cutout}[4]
+{\marginpar{\windowpagestuff}}
+{}
+\newcommand*{\windowpagestuff}{}
+
+\newcommand*{\pageinwindow}{%
+% \begin{minipage}{.3\linewidth}
+\windowpagestuff
+% \end{minipage}
+}
+\newenvironment{shapedcutout}[3]
+{\marginpar{\picinwindow}}
+{}
+\newcommand*{\putstuffinpic}{}
+\newcommand*{\picinwindow}{%
+\begin{picture}(0,0)
+\putstuffinpic
+\end{picture}}
+% \end{macrocode}
+%
+% \iffalse
+%</cutwin>
+% \fi
+%
+%
+%
+%
% \iffalse
%<*dcolumn>
% \fi
-
+%
% \part{lwarp-dcolumn.sty}
-
+%
% \section{Dcolumn}
% \label{sec:dcolumn}
%
@@ -18261,22 +18308,21 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
% \DescribePackage{dcolumn}
% \pkg{dcolumn} is emulated during \acro{HTML} output, and
% the \pkg{dcolumn} package is ignored.
-
+%
% \begin{macrocode}
\LWR@ProvidesPackageDrop{dcolumn}
% \end{macrocode}
-
-
+%
% \iffalse
%</dcolumn>
% \fi
-
-
-
-
-
+%
+%
+%
+%
+%
% \clearpage
-
+%
% \iffalse
%<*draftwatermark>
% \fi
@@ -18312,9 +18358,9 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
% \iffalse
%</draftwatermark>
% \fi
-
-
-
+%
+%
+%
% \iffalse
%<*ellipsis>
% \fi
@@ -18339,10 +18385,12 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
% \iffalse
%</ellipsis>
% \fi
-
-
+%
+%
+%
+%
% \clearpage
-
+%
% \iffalse
%<*emptypage>
% \fi
@@ -18366,10 +18414,58 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
% \iffalse
%</emptypage>
% \fi
+%
+%
+%
+%
+% \clearpage
+%
+% \iffalse
+%<*endnotes>
+% \fi
+% \part{lwarp-endnotes.sty}
+%
+% \section{Endnotes}
+%
+% \credits{John Lavagnino}
+%
+% \DescribePackage{endnotes}
+%
+%
+% \changes{v0.26}{2017/03/27}{\pkg{endnotes}: Added.}
+%
+%
+% Discard all options for \pkg{lwarp-endnotes}:
+%
+% \codehtml
+% \begin{macrocode}
+\LWR@ProvidesPackagePass{endnotes}
+% \end{macrocode}
+%
+% \begin{macrocode}
+\def\enoteformat{%
+% \rightskip\z@ \leftskip\z@ \parindent=1.8em
+\leavevmode
+% \llap{
+\makeenmark
+% }
+}
+\def\@makeenmark{\hbox{\textsuperscript{\normalfont\theenmark}}}
+\def\makeenmark{\@makeenmark}
+% \end{macrocode}
+%
+% \iffalse
+%</endnotes>
+% \fi
+%
+%
+%
+%
+%
% \clearpage
-
+%
% \iffalse
%<*enumerate>
% \fi
@@ -18411,9 +18507,9 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
% \iffalse
%</enumerate>
% \fi
-
-
-
+%
+%
+%
% \clearpage
%
% \iffalse
@@ -18484,10 +18580,10 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
% \iffalse
%</epigraph>
% \fi
-
-
-
-
+%
+%
+%
+%
% \iffalse
%<*eso-pic>
% \fi
@@ -18532,9 +18628,9 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
% \iffalse
%</eso-pic>
% \fi
-
-
-
+%
+%
+%
% \clearpage
%
% \iffalse
@@ -18565,8 +18661,8 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
% \iffalse
%</everypage>
% \fi
-
-
+%
+%
% \iffalse
%<*extramarks>
% \fi
@@ -18604,11 +18700,11 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
% \iffalse
%</extramarks>
% \fi
-
-
-
+%
+%
+%
% \clearpage
-
+%
% \iffalse
%<*fancyhdr>
% \fi
@@ -18653,12 +18749,12 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
% \iffalse
%</fancyhdr>
% \fi
-
-
-
-
+%
+%
+%
+%
% \clearpage
-
+%
% \iffalse
%<*float>
% \fi
@@ -18751,12 +18847,69 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
% \iffalse
%</float>
% \fi
+%
+%
+%
+%
+%
+%
+% \clearpage
+%
+% \iffalse
+%<*floatflt>
+% \fi
+%
+% \part{lwarp-floatflt.sty}
+%
+% \section{Floatflt}
+%
+% \DescribePackage{floatflt} Emulated.
+%
+% \changes{v0.26}{2017/03/30}{\pkg{floatflt}: Added.}
+%
+% \codehtml
+%
+% Discard all options for \pkg{lwarp-floatflt}:
+% \begin{macrocode}
+\LWR@ProvidesPackageDrop{floatflt}
+% \end{macrocode}
+%
+%
+%
+% Borrowed from the \pkg{lwarp} version of \pkg{keyfloat}:
+% \begin{macrocode}
+\DeclareDocumentEnvironment{KFLT@marginfloat}{O{-1.2ex} m}
+{% start
+\LWR@maybeincthisfloat%
+% \BlockClass{marginblock}
+\LWR@stoppars%
+\LWR@htmltag{div class="marginblock" id="autofloat-\arabic{LWR@thisfloat}"}
+\LWR@startpars%
+\captionsetup{type=#2}%
+}
+{
+% \endBlockClass
+\LWR@htmldivclassend{div}
+}
+\DeclareDocumentEnvironment{floatingfigure}{o m}
+ {\begin{KFLT@marginfloat}{figure}}
+ {\end{KFLT@marginfloat}}
-
-
+\DeclareDocumentEnvironment{floatingtable}{o +m}
+ {\begin{KFLT@marginfloat}{table}#2}
+ {\end{KFLT@marginfloat}}
+% \end{macrocode}
+%
+% \iffalse
+%</floatflt>
+% \fi
+%
+%
+%
+%
% \clearpage
-
+%
% \iffalse
%<*floatrow>
% \fi
@@ -19088,9 +19241,9 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
% \iffalse
%</floatrow>
% \fi
-
-
-
+%
+%
+%
% \clearpage
%
% \iffalse
@@ -19121,10 +19274,10 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
% \iffalse
%</fontenc>
% \fi
-
-
-
-
+%
+%
+%
+%
% \iffalse
%<*fontspec>
% \fi
@@ -19153,12 +19306,187 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
% \iffalse
%</fontspec>
% \fi
+%
+%
+%
+%
+% \iffalse
+%<*footmisc>
+% \fi
+%
+% \part{lwarp-footmisc.sty}
+%
+% \section{Footmisc}
+% \label{sec:footmisc}
+%
+% \credits{Robin Fairbairns}
+%
+% \changes{v0.26}{2017/03/27}{\pkg{footmisc}: Added.}
+%
+% \DescribePackage{footmisc}
+% \pkg{footmisc} is emulated during \acro{HTML} output, and
+% the \pkg{footmisc} package is ignored.
+%
+% \begin{macrocode}
+\LWR@ProvidesPackageDrop{footmisc}
+% \end{macrocode}
+%
+% Some nullified commands:
+% \begin{macrocode}
+\newcommand{\footnotelayout}{}
+\newcommand{\setfnsymbol}[1]{}
+\NewDocumentCommand{\DefineFNsymbols}{s m o m}{}
+\newdimen\footnotemargin
+\footnotemargin1.8em\relax
+\newcommand*\hangfootparskip{0.5\baselineskip}
+\newcommand*\hangfootparindent{0em}%
+\let\pagefootnoterule\footnoterule
+\let\mpfootnoterule\footnoterule
+\def\splitfootnoterule{\kern-3\p@ \hrule \kern2.6\p@}
+\providecommand*{\multiplefootnotemarker}{3sp}
+\providecommand*{\multfootsep}{,}
+% \end{macrocode}
+%
+% Using \pkg{cleveref}:
+% \begin{macrocode}
+\providecommand*{\footref}[1]{\labelcref{#1}}
+% \end{macrocode}
+%
+% The following work as-is:
+% \begin{macrocode}
+\newcommand\mpfootnotemark{%
+ \@ifnextchar[%
+ \@xmpfootnotemark
+ {%
+ \stepcounter\@mpfn
+ \protected@xdef\@thefnmark{\thempfn}%
+ \@footnotemark
+ }%
+}
+\def\@xmpfootnotemark[#1]{%
+ \begingroup
+ \csname c@\@mpfn\endcsname #1\relax
+ \unrestored@protected@xdef\@thefnmark{\thempfn}%
+ \endgroup
+ \@footnotemark
+}
+% \end{macrocode}
+%
+% \iffalse
+%</footmisc>
+% \fi
+%
+%
+%
% \clearpage
+%
+% \iffalse
+%<*footnote>
+% \fi
+%
+% \part{lwarp-footnote.sty}
+%
+% \section{Footnote}
+%
+% \DescribePackage{footnote}
+% \pkg{footnote} is used with minor patches.
+%
+% \changes{v0.26}{2017/03/26}{\pkg{footnote}: Added.}
+%
+% \codehtml
+% \begin{macrocode}
+\LWR@ProvidesPackagePass{footnote}
+% \end{macrocode}
+%
+% Removed print-version formatting:
+% \begin{macrocode}
+\def\fn@startnote{%
+% \@parboxrestore%
+ \protected@edef\@currentlabel{\csname p@\@mpfn\endcsname\@thefnmark}%
+% \color@begingroup% *** conflicts with lwarp
+}
+% \let\fn@endnote\color@endgroup% *** conflicts with lwarp
+\newcommand*{\fn@endnote}{\LWR@htmltagc{/\LWR@tagregularparagraph}}
+% \end{macrocode}
+%
+% Removed print-version formatting:
+% \begin{macrocode}
+\def\fn@startfntext{%
+ \setbox\z@\vbox\bgroup%
+ \fn@startnote%
+ \fn@prefntext%
+ \ignorespaces%
+}
+% \end{macrocode}
+%
+% Removed print-version formatting, added closing paragraph tag:
+% \begin{macrocode}
+\def\fn@endfntext{%
+ \LWR@htmltagc{/\LWR@tagregularparagraph}%
+ \fn@postfntext%
+ \egroup%
+ \begingroup%
+ \let\@makefntext\@empty%
+ \let\@finalstrut\@gobble%
+ \let\rule\@gobbletwo%
+ \@footnotetext{\unvbox\z@}%
+ \endgroup%
+}
+% \end{macrocode}
+%
+% These have been redefined, so re-\cs{let} them again:
+% \begin{macrocode}
+\let\endfootnote\fn@endfntext
+\let\endfootnotetext\endfootnote
+% \end{macrocode}
+%
+%
+% \iffalse
+%</footnote>
+% \fi
+%
+%
+%
+%
+%
+% \iffalse
+%<*footnotehyper>
+% \fi
+
+% \part{lwarp-footnotehyper.sty}
+
+% \section{Footnotehyper}
+%
+% \DescribePackage{footnotehyper}
+% \pkg{footnotehyper} is a \pkg{hyperref}-safe version of \pkg{footnote}.
+% For \pkg{lwarp}, \pkg{footnotehyper} is emulated.
+%
+% \changes{v0.26}{2017/03/23}{\pkg{footnotehyper}: Added.}
+%
+% \codehtml
+%
+% Discard all options for \pkg{lwarp-footnotehyper}:
+% \begin{macrocode}
+\RequirePackage{footnote}
+\LWR@ProvidesPackageDrop{footnotehyper}
+% \end{macrocode}
+%
+%
+% \iffalse
+%</footnotehyper>
+% \fi
+%
+%
+%
+%
+%
+% \clearpage
+%
% \iffalse
%<*framed>
% \fi
@@ -19302,12 +19630,12 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
% \iffalse
%</framed>
% \fi
-
-
-
-
+%
+%
+%
+%
% \clearpage
-
+%
% \iffalse
%<*ftnright>
% \fi
@@ -19331,9 +19659,9 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
% \iffalse
%</ftnright>
% \fi
-
-
-
+%
+%
+%
%
% \iffalse
%<*geometry>
@@ -19367,8 +19695,8 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
% \iffalse
%</geometry>
% \fi
-
-
+%
+%
% \clearpage
%
% \iffalse
@@ -19392,9 +19720,9 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
% \iffalse
%</graphics>
% \fi
-
-
-
+%
+%
+%
% \iffalse
%<*graphicx>
% \fi
@@ -19416,11 +19744,11 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
% \iffalse
%</graphicx>
% \fi
-
-
-
+%
+%
+%
% \clearpage
-
+%
% \iffalse
%<*hyperref>
% \fi
@@ -19759,9 +20087,9 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
% \iffalse
%</hyperref>
% \fi
-
-
-
+%
+%
+%
% \iffalse
%<*indentfirst>
% \fi
@@ -19786,10 +20114,10 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
% \iffalse
%</indentfirst>
% \fi
-
-
-
-
+%
+%
+%
+%
% \iffalse
%<*inputenc>
% \fi
@@ -19819,11 +20147,11 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
% \iffalse
%</inputenc>
% \fi
-
-
-
+%
+%
+%
% \clearpage
-
+%
% \iffalse
%<*keyfloat>
% \fi
@@ -19850,8 +20178,6 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
% \begin{macrocode}
-% \newsavebox{\KFLT@envbox}
-
\let\KFLT@boxinner\relax
\let\endKFLT@boxinner\relax
@@ -19867,7 +20193,7 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
% \begin{macrocode}
-\RenewDocumentEnvironment{KFLT@marginfloat}{O{-1.2ex} m}
+\DeclareDocumentEnvironment{KFLT@marginfloat}{O{-1.2ex} m}
{% start
\LWR@maybeincthisfloat%
% \BlockClass{marginblock}
@@ -19891,10 +20217,10 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
% \iffalse
%</keyfloat>
% \fi
-
-
-
-
+%
+%
+%
+%
% \iffalse
%<*layout>
% \fi
@@ -19922,10 +20248,10 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
% \iffalse
%</layout>
% \fi
-
-
-
-
+%
+%
+%
+%
% \iffalse
%<*letterspace>
% \fi
@@ -19957,10 +20283,12 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
% \iffalse
%</letterspace>
% \fi
-
-
+%
+%
+%
+%
% \clearpage
-
+%
% \iffalse
%<*lips>
% \fi
@@ -20000,11 +20328,11 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
% \iffalse
%</lips>
% \fi
-
-
-
+%
+%
+%
% \clearpage
-
+%
% \iffalse
%<*listings>
% \fi
@@ -20015,7 +20343,7 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
% \label{sec:listings}
%
% \credits{Carsten Heinz, Brooks Moses, Jobst Hoffmann}
-
+%
%
% \DescribePackage{listings}
% \pkg{listings} is supported with some limitations.
@@ -20245,12 +20573,12 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
% \iffalse
%</listings>
% \fi
-
-
-
-
+%
+%
+%
+%
% \clearpage
-
+%
% \iffalse
%<*longtable>
% \fi
@@ -20349,11 +20677,11 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
% \iffalse
%</longtable>
% \fi
-
-
-
+%
+%
+%
% \clearpage
-
+%
% \iffalse
%<*lscape>
% \fi
@@ -20381,9 +20709,9 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
% \iffalse
%</lscape>
% \fi
-
-
-
+%
+%
+%
% \iffalse
%<*ltcaption>
% \fi
@@ -20421,11 +20749,93 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
% \iffalse
%</ltcaption>
% \fi
-
-
-
+%
+%
+%
+%
+%
% \clearpage
-
+%
+% \iffalse
+%<*marginfix>
+% \fi
+%
+% \part{lwarp-marginfix.sty}
+%
+% \section{Marginfix}
+%
+% \DescribePackage{marginfix} Not used.
+%
+% \changes{v0.26}{2017/03/29}{\pkg{marginfix}: Added.}
+%
+% \codehtml
+%
+% Discard all options for \pkg{lwarp-marginfix}:
+% \begin{macrocode}
+\LWR@ProvidesPackageDrop{marginfix}
+% \end{macrocode}
+%
+% \begin{macrocode}
+\newcommand*{\marginskip}[1]{}
+\newcommand*{\clearmargin}{}
+\newcommand*{\softclearmargin}{}
+\newcommand*{\extendmargin}[1]{}
+\newcommand*{\mparshift}[1]{}
+\newdimen\marginheightadjustment
+\newdimen\marginposadjustment
+\newcommand*{\blockmargin}[1][]{}
+\newcommand*{\unblockmargin}[1][]{}
+\newcommand*{\marginphantom}[2][]{}
+% \end{macrocode}
+%
+% \iffalse
+%</marginfix>
+% \fi
+%
+%
+%
+%
+%
+% \clearpage
+%
+% \iffalse
+%<*marginnote>
+% \fi
+%
+% \part{lwarp-marginnote.sty}
+%
+% \section{Marginnote}
+%
+% \DescribePackage{marginnote} Emulated.
+%
+% \changes{v0.26}{2017/03/30}{\pkg{marginnote}: Added.}
+%
+% \codehtml
+%
+% Discard all options for \pkg{lwarp-marginnote}:
+% \begin{macrocode}
+\LWR@ProvidesPackageDrop{marginnote}
+% \end{macrocode}
+%
+% \begin{macrocode}
+\NewDocumentCommand{\marginnote}{o +m o}{\marginpar{#2}}
+\newcommand*{\marginnoteleftadjust}{}
+\newcommand*{\marginnoterightadjust}{}
+\newcommand*{\marginnotetextwidth}{}
+\let\marginnotetextwidth\textwidth
+\newcommand*{\marginnotevadjust}{}
+\newcommand*{\marginfont}{}
+\newcommand*{\raggedleftmarginnote}{}
+\newcommand*{\raggedrightmarginnote}{}
+% \end{macrocode}
+%
+% \iffalse
+%</marginnote>
+% \fi
+%
+%
+%
+%
% \iffalse
%<*mcaption>
% \fi
@@ -20455,12 +20865,12 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
% \iffalse
%</mcaption>
% \fi
-
-
-
-
+%
+%
+%
+%
% \clearpage
-
+%
% \iffalse
%<*mdframed>
% \fi
@@ -20870,12 +21280,12 @@ solid
% \iffalse
%</mdframed>
% \fi
-
-
-
-
+%
+%
+%
+%
% \clearpage
-
+%
% \iffalse
%<*microtype>
% \fi
@@ -20934,11 +21344,40 @@ solid
% \iffalse
%</microtype>
% \fi
-
-
-
+%
+%
+%
+%
% \clearpage
-
+%
+% \iffalse
+%<*mparhack>
+% \fi
+%
+% \part{lwarp-mparhack.sty}
+%
+% \section{Mparhack}
+%
+% \DescribePackage{mparhack} Not used.
+%
+% \changes{v0.26}{2017/03/29}{\pkg{mparhack}: Added.}
+%
+% \codehtml
+%
+% Discard all options for \pkg{lwarp-mparhack}:
+% \begin{macrocode}
+\LWR@ProvidesPackageDrop{mparhack}
+% \end{macrocode}
+%
+% \iffalse
+%</mparhack>
+% \fi
+%
+%
+%
+%
+% \clearpage
+%
% \iffalse
%<*multicol>
% \fi
@@ -21014,13 +21453,13 @@ solid
% \iffalse
%</multicol>
% \fi
-
-
-
-
-
+%
+%
+%
+%
+%
% \clearpage
-
+%
% \iffalse
%<*multirow>
% \fi
@@ -21042,9 +21481,9 @@ solid
% \iffalse
%</multirow>
% \fi
-
-
-
+%
+%
+%
% \iffalse
%<*nameref>
% \fi
@@ -21072,8 +21511,10 @@ solid
% \iffalse
%</nameref>
% \fi
-
-
+%
+%
+%
+%
% \clearpage
%
% \iffalse
@@ -21102,10 +21543,10 @@ solid
% \iffalse
%</needspace>
% \fi
-
-
-
-
+%
+%
+%
+%
% \iffalse
%<*newclude>
% \fi
@@ -21134,8 +21575,11 @@ solid
% \iffalse
%</newclude>
% \fi
-
-
+%
+%
+%
+%
+%
% \clearpage
%
% \iffalse
@@ -21166,10 +21610,10 @@ solid
% \iffalse
%</newunicodechar>
% \fi
-
-
-
-
+%
+%
+%
+%
% \iffalse
%<*nextpage>
% \fi
@@ -21200,9 +21644,9 @@ solid
% \iffalse
%</nextpage>
% \fi
-
-
-
+%
+%
+%
% \iffalse
%<*nowidow>
% \fi
@@ -21245,12 +21689,12 @@ solid
% \iffalse
%</nowidow>
% \fi
-
-
-
-
+%
+%
+%
+%
% \clearpage
-
+%
% \iffalse
%<*ntheorem>
% \fi
@@ -21799,16 +22243,16 @@ solid
% \begin{macrocode}
\newcommand*{\thref}[1]{\cref{#1}}
% \end{macrocode}
-
-
%
% \iffalse
%</ntheorem>
% \fi
-
-
+%
+%
+%
+%
% \clearpage
-
+%
% \iffalse
%<*pagenote>
% \fi
@@ -21818,44 +22262,30 @@ solid
% \section{Pagenote}
%
% \DescribePackage{pagenote}
-% \pkg{pagenote} is used by \pkg{lwarp},
-% and its user-interface macros have been nullified.
-%
-% Both footnotes and pagenotes appear as footnotes in the \acro{HTML} output.
+% \pkg{pagenote} works as-is.
%
-% Any manipulation of \pkg{pagenote} in the user's document after
-% the preamble should be encased within a \env{warpprint} environment.
+% It is only included as an |lwarp-pagenote.sty| file because
+% past versions of \pkg{lwarp} used \pkg{pagenote} to emulate
+% footnotes, and so the file may exist on current installations,
+% and should be over-written by this newer version.
%
-% \changes{v0.20}{2017/01/11}{\pkg{pagenote}: Added.}
+% \changes{v0.26}{2017/03/29}{\pkg{pagenote}: Supported as-is.}
%
-
-% Discard all options for \pkg{lwarp-pagenote}:
-
% \codehtml
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{pagenote}
+\LWR@ProvidesPackagePass{pagenote}
% \end{macrocode}
%
-% \cs{pagenote} is already modified to work with \pkg{lwarp}.
-%
-% \begin{macrocode}
-\renewcommand*{\makepagenote}{}
-\RenewDocumentCommand{\printnotes}{s}{}
-\renewcommand{\printnotes}[2][]{}
-\renewcommand{\addtonotes}[1]{}
-% \end{macrocode}
-
-
% \iffalse
%</pagenote>
% \fi
-
-
-
-
-
+%
+%
+%
+%
+%
% \clearpage
-
+%
% \iffalse
%<*parskip>
% \fi
@@ -21879,9 +22309,9 @@ solid
% \iffalse
%</parskip>
% \fi
-
-
-
+%
+%
+%
%
% \iffalse
%<*placeins>
@@ -21911,10 +22341,10 @@ solid
% \iffalse
%</placeins>
% \fi
-
-
-
-
+%
+%
+%
+%
% \clearpage
%
% \iffalse
@@ -21967,12 +22397,12 @@ solid
% \iffalse
%</ragged2e>
% \fi
-
-
-
-
+%
+%
+%
+%
% \clearpage
-
+%
% \iffalse
%<*rotating>
% \fi
@@ -22011,11 +22441,13 @@ solid
% \iffalse
%</rotating>
% \fi
-
-
-
+%
+%
+%
+%
+%
% \clearpage
-
+%
% \iffalse
%<*setspace>
% \fi
@@ -22068,11 +22500,13 @@ solid
% \iffalse
%</setspace>
% \fi
-
-
-
+%
+%
+%
+%
+%
% clearpage
-
+%
% \iffalse
%<*showidx>
% \fi
@@ -22096,9 +22530,11 @@ solid
% \iffalse
%</showidx>
% \fi
-
-
-
+%
+%
+%
+%
+%
% \iffalse
%<*showkeys>
% \fi
@@ -22126,13 +22562,13 @@ solid
% \iffalse
%</showkeys>
% \fi
-
-
-
-
-
+%
+%
+%
+%
+%
% \clearpage
-
+%
% \iffalse
%<*sidecap>
% \fi
@@ -22186,12 +22622,114 @@ solid
% \iffalse
%</sidecap>
% \fi
+%
+%
+%
+%
+%
+% \clearpage
+%
+% \iffalse
+%<*sidenotes>
+% \fi
+%
+% \part{lwarp-sidenotes.sty}
+%
+% \section{Sidenotes}
+%
+% \credits{Andy Thomas, Oliver Schebaum}
+%
+% \DescribePackage{sidenotes} Patched for \pkg{lwarp}.
+%
+% \changes{v0.26}{2017/03/30}{\pkg{sidenotes}: Added.}
+%
+% \codehtml
+%
+%
+% Load the original package:
+% \begin{macrocode}
+\LWR@ProvidesPackagePass{sidenotes}
+% \end{macrocode}
+%
+%
+% The following patch \pkg{sidenotes} for use with \pkg{lwarp}:
+%
+% Stop paragraph handling while creating the caption:
+% \begin{macrocode}
+\RenewDocumentCommand \sidecaption {s o o m}
+{
+ \LWR@stoppars
+ \captionsetup{style=sidecaption}
+ \IfBooleanTF{#1}
+ { % starred
+ \IfNoValueOrEmptyTF{#2}
+ {\marginnote{\caption*{#4}}}
+ {\marginnote{\caption*{#4}}[#2]}
+ }
+ { % unstarred
+ \IfNoValueOrEmptyTF{#2}
+ {\def\@sidenotes@sidecaption@tof{#4}}
+ {\def\@sidenotes@sidecaption@tof{#2}}
+ \IfNoValueOrEmptyTF{#3}
+ {\marginnote{\caption[\@sidenotes@sidecaption@tof]{#4}}}
+ {\marginnote{\caption[\@sidenotes@sidecaption@tof]{#4}}[#3]}
+ }
+ \LWR@startpars
+}
+% \end{macrocode}
+%
+%
+%
+% Borrowed from the \pkg{lwarp} version of \pkg{keyfloat}:
+% \begin{macrocode}
+\DeclareDocumentEnvironment{KFLT@marginfloat}{O{-1.2ex} m}
+{% start
+\LWR@maybeincthisfloat%
+% \BlockClass{marginblock}
+\LWR@stoppars%
+\LWR@htmltag{div class="marginblock" id="autofloat-\arabic{LWR@thisfloat}"}
+\LWR@startpars%
+\captionsetup{type=#2}%
+}
+{
+% \endBlockClass
+\LWR@htmldivclassend{div}
+}
+\RenewDocumentEnvironment{marginfigure}{o}
+ {\begin{KFLT@marginfloat}{figure}}
+ {\end{KFLT@marginfloat}}
+\RenewDocumentEnvironment{margintable}{o}
+ {\begin{KFLT@marginfloat}{table}}
+ {\end{KFLT@marginfloat}}
+% \end{macrocode}
+%
+% The following were changed by \pkg{sidenotes}, and now are
+% reset back to their \pkg{lwarp}-supported originals:
+%
+% Restoring the definition from the \LaTeXe\ |article.cls| source:
+% \begin{macrocode}
+\renewenvironment{figure*}
+ {\@dblfloat{figure}}
+ {\end@dblfloat}
-
+\renewenvironment{table*}
+ {\@dblfloat{table}}
+ {\end@dblfloat}
+% \end{macrocode}
+%
+% \iffalse
+%</sidenotes>
+% \fi
+%
+%
+%
+%
+%
+%
% \clearpage
-
+%
% \iffalse
%<*subfig>
% \fi
@@ -22484,12 +23022,12 @@ solid
% \iffalse
%</subfig>
% \fi
-
-
-
-
+%
+%
+%
+%
% \clearpage
-
+%
% \iffalse
%<*tabularx>
% \fi
@@ -22523,10 +23061,12 @@ solid
% \iffalse
%</tabularx>
% \fi
-
-
+%
+%
+%
+%
% \clearpage
-
+%
% \iffalse
%<*textpos>
% \fi
@@ -22569,12 +23109,12 @@ solid
% \iffalse
%</textpos>
% \fi
-
-
-
-
+%
+%
+%
+%
% \clearpage
-
+%
% \iffalse
%<*theorem>
% \fi
@@ -22780,11 +23320,11 @@ solid
% \iffalse
%</theorem>
% \fi
-
-
-
+%
+%
+%
% \clearpage
-
+%
% \iffalse
%<*threeparttable>
% \fi
@@ -22847,13 +23387,13 @@ solid
% \iffalse
%</threeparttable>
% \fi
-
-
-
-
-
+%
+%
+%
+%
+%
% \clearpage
-
+%
% \iffalse
%<*tikz>
% \fi
@@ -22930,11 +23470,13 @@ solid
% \iffalse
%</tikz>
% \fi
-
-
-
+%
+%
+%
+%
+%
% \clearpage
-
+%
% \iffalse
%<*titleps>
% \fi
@@ -23115,12 +23657,12 @@ solid
% \iffalse
%</titleps>
% \fi
-
-
-
-
+%
+%
+%
+%
% \clearpage
-
+%
% \iffalse
%<*titlesec>
% \fi
@@ -23241,13 +23783,13 @@ solid
% \iffalse
%</titlesec>
% \fi
-
-
-
-
-
+%
+%
+%
+%
+%
% \clearpage
-
+%
% \iffalse
%<*titletoc>
% \fi
@@ -23363,12 +23905,12 @@ solid
% \iffalse
%</titletoc>
% \fi
-
-
-
-
+%
+%
+%
+%
% \clearpage
-
+%
% \iffalse
%<*titling>
% \fi
@@ -23432,13 +23974,13 @@ solid
% \iffalse
%</titling>
% \fi
-
-
-
-
-
+%
+%
+%
+%
+%
% \clearpage
-
+%
% \iffalse
%<*tocloft>
% \fi
@@ -23768,14 +24310,14 @@ solid
% \iffalse
%</tocloft>
% \fi
-
-
-
-
-
-
+%
+%
+%
+%
+%
+%
% \clearpage
-
+%
% \iffalse
%<*trivfloat>
% \fi
@@ -23880,18 +24422,18 @@ solid
% \iffalse
%</trivfloat>
% \fi
-
-
-
-
+%
+%
+%
+%
% \clearpage
-
+%
% \iffalse
%<*verse>
% \fi
-
+%
% \part{lwarp-verse.sty}
-
+%
% \section{Verse}
%
% \credits{Peter Wilson}
@@ -23964,10 +24506,10 @@ solid
% \iffalse
%</verse>
% \fi
-
-
-
-
+%
+%
+%
+%
% \clearpage
%
% \iffalse
@@ -24013,10 +24555,10 @@ solid
% \iffalse
%</wallpaper>
% \fi
-
-
-
-
+%
+%
+%
+%
% \clearpage
%
% \iffalse
@@ -24110,13 +24652,11 @@ style="width:\rndprintlength{\LWR@wrapwidth} ; %
% \iffalse
%</wrapfig>
% \fi
-
-
-
-
-
+%
+%
+%
% \clearpage
-
+%
% \iffalse
%<*xcolor>
% \fi
@@ -24269,25 +24809,16 @@ style="width:\rndprintlength{\LWR@wrapwidth} ; %
\let\colorbox\LWR@colorbox
\let\fcolorbox\LWR@fcolorbox
% \end{macrocode}
-
-
+%
+%
% \iffalse
%</xcolor>
% \fi
-
-
-
-
-
-
-
-
-
-
-
-
+%
+%
+%
% \clearpage
-
+%
% \iffalse
%<*xfrac>
% \fi
@@ -24435,25 +24966,25 @@ denominator-format = {%
scaling = false
}
% \end{macrocode}
-
+%
% \begin{macrocode}
\end{warpHTML}
% \end{macrocode}
-
+%
% \iffalse
%</xfrac>
% \fi
-
-
-
-
-
-
-
-
-
-
-
+%
+%
+%
+%
+%
+%
+%
+%
+%
+%
+%
% \clearpage
% \renewcommand*{\partname}{}
% \renewcommand*{\thepart}{}
@@ -24463,11 +24994,11 @@ scaling = false
% \pagestyle{plain}
%
% \Finale
-
-
-
-
-
+%
+%
+%
+%
+%
\endinput
diff --git a/Master/texmf-dist/source/latex/lwarp/lwarp.ins b/Master/texmf-dist/source/latex/lwarp/lwarp.ins
index 02b95e085fc..276f61ba2d7 100644
--- a/Master/texmf-dist/source/latex/lwarp/lwarp.ins
+++ b/Master/texmf-dist/source/latex/lwarp/lwarp.ins
@@ -43,10 +43,12 @@ version 2005/12/01 or later.
\file{lwarp-booktabs.sty}{\from{lwarp.dtx}{booktabs}}
\file{lwarp-ccaption.sty}{\from{lwarp.dtx}{ccaption}}
\file{lwarp-changepage.sty}{\from{lwarp.dtx}{changepage}}
+\file{lwarp-cutwin.sty}{\from{lwarp.dtx}{cutwin}}
\file{lwarp-dcolumn.sty}{\from{lwarp.dtx}{dcolumn}}
\file{lwarp-draftwatermark.sty}{\from{lwarp.dtx}{draftwatermark}}
\file{lwarp-ellipsis.sty}{\from{lwarp.dtx}{ellipsis}}
\file{lwarp-emptypage.sty}{\from{lwarp.dtx}{emptypage}}
+\file{lwarp-endnotes.sty}{\from{lwarp.dtx}{endnotes}}
\file{lwarp-enumerate.sty}{\from{lwarp.dtx}{enumerate}}
\file{lwarp-epigraph.sty}{\from{lwarp.dtx}{epigraph}}
\file{lwarp-eso-pic.sty}{\from{lwarp.dtx}{eso-pic}}
@@ -54,7 +56,11 @@ version 2005/12/01 or later.
\file{lwarp-extramarks.sty}{\from{lwarp.dtx}{extramarks}}
\file{lwarp-fancyhdr.sty}{\from{lwarp.dtx}{fancyhdr}}
\file{lwarp-float.sty}{\from{lwarp.dtx}{float}}
+\file{lwarp-floatflt.sty}{\from{lwarp.dtx}{floatflt}}
\file{lwarp-floatrow.sty}{\from{lwarp.dtx}{floatrow}}
+\file{lwarp-footmisc.sty}{\from{lwarp.dtx}{footmisc}}
+\file{lwarp-footnote.sty}{\from{lwarp.dtx}{footnote}}
+\file{lwarp-footnotehyper.sty}{\from{lwarp.dtx}{footnotehyper}}
\file{lwarp-fontenc.sty}{\from{lwarp.dtx}{fontenc}}
\file{lwarp-fontspec.sty}{\from{lwarp.dtx}{fontspec}}
\file{lwarp-framed.sty}{\from{lwarp.dtx}{framed}}
@@ -73,9 +79,12 @@ version 2005/12/01 or later.
\file{lwarp-longtable.sty}{\from{lwarp.dtx}{longtable}}
\file{lwarp-lscape.sty}{\from{lwarp.dtx}{lscape}}
\file{lwarp-ltcaption.sty}{\from{lwarp.dtx}{ltcaption}}
+\file{lwarp-marginfix.sty}{\from{lwarp.dtx}{marginfix}}
+\file{lwarp-marginnote.sty}{\from{lwarp.dtx}{marginnote}}
\file{lwarp-mcaption.sty}{\from{lwarp.dtx}{mcaption}}
\file{lwarp-mdframed.sty}{\from{lwarp.dtx}{mdframed}}
\file{lwarp-microtype.sty}{\from{lwarp.dtx}{microtype}}
+\file{lwarp-mparhack.sty}{\from{lwarp.dtx}{mparhack}}
\file{lwarp-multicol.sty}{\from{lwarp.dtx}{multicol}}
\file{lwarp-multirow.sty}{\from{lwarp.dtx}{multirow}}
\file{lwarp-nameref.sty}{\from{lwarp.dtx}{nameref}}
@@ -92,6 +101,7 @@ version 2005/12/01 or later.
\file{lwarp-rotating.sty}{\from{lwarp.dtx}{rotating}}
\file{lwarp-setspace.sty}{\from{lwarp.dtx}{setspace}}
\file{lwarp-sidecap.sty}{\from{lwarp.dtx}{sidecap}}
+\file{lwarp-sidenotes.sty}{\from{lwarp.dtx}{sidenotes}}
\file{lwarp-showidx.sty}{\from{lwarp.dtx}{idx}}
\file{lwarp-showkeys.sty}{\from{lwarp.dtx}{showkeys}}
\file{lwarp-subfig.sty}{\from{lwarp.dtx}{subfig}}