texlive[43511] trunk: lwarp (15mar17)
commits+karl at tug.org
commits+karl at tug.org
Wed Mar 15 22:18:37 CET 2017
Revision: 43511
http://tug.org/svn/texlive?view=revision&revision=43511
Author: karl
Date: 2017-03-15 22:18:37 +0100 (Wed, 15 Mar 2017)
Log Message:
-----------
lwarp (15mar17)
Modified Paths:
--------------
trunk/Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua
trunk/Build/source/texk/texlive/linked_scripts/texlive/fmtutil.pl
trunk/Master/texmf-dist/doc/latex/lwarp/README.txt
trunk/Master/texmf-dist/doc/latex/lwarp/lwarp.pdf
trunk/Master/texmf-dist/scripts/lwarp/lwarpmk.lua
trunk/Master/texmf-dist/source/latex/lwarp/lwarp.dtx
trunk/Master/texmf-dist/source/latex/lwarp/lwarp.ins
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-abstract.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-afterpage.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-algorithmicx.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-alltt.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-bookmark.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-booktabs.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-changepage.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-dcolumn.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-draftwatermark.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-enumerate.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-epigraph.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-eso-pic.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-everypage.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-extramarks.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyhdr.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-float.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-floatrow.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fontenc.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fontspec.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-ftnright.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-geometry.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-graphicx.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperref.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-indentfirst.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-inputenc.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-keyfloat.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-layout.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-letterspace.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-listings.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-longtable.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-lscape.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-ltcaption.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-mcaption.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-mdframed.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-microtype.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-multicol.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-multirow.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-nameref.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-needspace.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-newclude.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-newproject.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-newunicodechar.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-nextpage.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-nowidow.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pagenote.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-parskip.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-placeins.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-ragged2e.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-rotating.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-setspace.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-showkeys.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-sidecap.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-tabularx.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-textpos.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-threeparttable.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-titleps.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-titlesec.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-titletoc.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-titling.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-tocloft.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-trivfloat.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-verse.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-wallpaper.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-wrapfig.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xfrac.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp.sty
Added Paths:
-----------
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-subfig.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-tikz.sty
Modified: trunk/Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua
===================================================================
--- trunk/Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua 2017-03-15 21:17:57 UTC (rev 43510)
+++ trunk/Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua 2017-03-15 21:18:37 UTC (rev 43511)
@@ -4,7 +4,7 @@
-- Print the usage of the lwarpmk command:
-printversion = "v0.23"
+printversion = "v0.24"
function printhelp ()
print ("lwarpmk: Use lwarpmk -h or lwarpmk --help for help.") ;
Modified: trunk/Build/source/texk/texlive/linked_scripts/texlive/fmtutil.pl
===================================================================
--- trunk/Build/source/texk/texlive/linked_scripts/texlive/fmtutil.pl 2017-03-15 21:17:57 UTC (rev 43510)
+++ trunk/Build/source/texk/texlive/linked_scripts/texlive/fmtutil.pl 2017-03-15 21:18:37 UTC (rev 43511)
@@ -1,5 +1,5 @@
#!/usr/bin/env perl
-# $Id: fmtutil.pl 43485 2017-03-13 00:51:17Z preining $
+# $Id: fmtutil.pl 43495 2017-03-14 02:22:58Z preining $
# fmtutil - utility to maintain format files.
# (Maintained in TeX Live:Master/texmf-dist/scripts/texlive.)
#
@@ -24,11 +24,11 @@
TeX::Update->import();
}
-my $svnid = '$Id: fmtutil.pl 43485 2017-03-13 00:51:17Z preining $';
-my $lastchdate = '$Date: 2017-03-13 01:51:17 +0100 (Mon, 13 Mar 2017) $';
+my $svnid = '$Id: fmtutil.pl 43495 2017-03-14 02:22:58Z preining $';
+my $lastchdate = '$Date: 2017-03-14 03:22:58 +0100 (Tue, 14 Mar 2017) $';
$lastchdate =~ s/^\$Date:\s*//;
$lastchdate =~ s/ \(.*$//;
-my $svnrev = '$Revision: 43485 $';
+my $svnrev = '$Revision: 43495 $';
$svnrev =~ s/^\$Revision:\s*//;
$svnrev =~ s/\s*\$$//;
my $version = "r$svnrev ($lastchdate)";
@@ -568,7 +568,15 @@
# all activated formats are also buildable, thus return failure.
return $FMT_FAILURE;
}
-
+
+ #
+ # If the 4th field in fmtutil.cnf contains
+ # -progname=...
+ # then we do not add our own progname!
+ if ($addargs =~ /-progname=/) {
+ $prgswitch = '';
+ }
+
# NLS support
# Example (for fmtutil.cnf):
# mex-pl tex mexconf.tex nls=tex-pl,il2-pl mex.ini
@@ -1411,10 +1419,12 @@
Other locations may be used if you give them on the command line, or
these trees don't exist, or you are not using the original TeX Live.
-Supporting development engines
+Supporting development binaries
- In case the engine names ends with "-dev", formats are created in
- the respective directory without the -dev ending.
+ If an engine name ends with "-dev", formats are created in
+ the respective directory with the -dev stripped. This allows for
+ easily running development binaries in parallel with the released
+ binaries.
Report bugs to: tex-live\@tug.org
TeX Live home page: <http://tug.org/texlive/>
Modified: trunk/Master/texmf-dist/doc/latex/lwarp/README.txt
===================================================================
--- trunk/Master/texmf-dist/doc/latex/lwarp/README.txt 2017-03-15 21:17:57 UTC (rev 43510)
+++ trunk/Master/texmf-dist/doc/latex/lwarp/README.txt 2017-03-15 21:18:37 UTC (rev 43511)
@@ -1,5 +1,5 @@
-LaTeX lwarp package v0.23 README.txt
+LaTeX lwarp package v0.24 README.txt
Files included are:
Modified: trunk/Master/texmf-dist/doc/latex/lwarp/lwarp.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/scripts/lwarp/lwarpmk.lua
===================================================================
--- trunk/Master/texmf-dist/scripts/lwarp/lwarpmk.lua 2017-03-15 21:17:57 UTC (rev 43510)
+++ trunk/Master/texmf-dist/scripts/lwarp/lwarpmk.lua 2017-03-15 21:18:37 UTC (rev 43511)
@@ -4,7 +4,7 @@
-- Print the usage of the lwarpmk command:
-printversion = "v0.23"
+printversion = "v0.24"
function printhelp ()
print ("lwarpmk: Use lwarpmk -h or lwarpmk --help for help.") ;
Modified: trunk/Master/texmf-dist/source/latex/lwarp/lwarp.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/lwarp/lwarp.dtx 2017-03-15 21:17:57 UTC (rev 43510)
+++ trunk/Master/texmf-dist/source/latex/lwarp/lwarp.dtx 2017-03-15 21:18:37 UTC (rev 43511)
@@ -16,7 +16,7 @@
% \iffalse
%<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
%<package>\ProvidesPackage{lwarp}
-%<package> [2017/03/02 v0.23 Allows LaTeX to directly produce HTML5 output.]
+%<package> [2017/03/15 v0.24 Allows LaTeX to directly produce HTML5 output.]
%
%<*driver>
\documentclass{ltxdoc}
@@ -568,6 +568,14 @@
or parbox will have the minipage or parbox placed onto its own line,
because a paragraph is a block element and cannot be made \texttt{inline-block}.
+Side-by-side minipages may be separated by \cs{quad}, \cs{qquad}, \cs{enskip},
+\margintag{side-by-side}
+\cs{hspace}, \cs{hfill}, or a \cs{rule}.
+When inside a \texttt{center} environment, the result is
+similar in print and \acro{HTML}. Paragraph tags are surpressed between
+side-by-side minipages and these spacing commands, but not at the start or end
+of the paragraph.
+
There is limited support for minipages inside an \acro{HTML} \tag{span}.
\margintag{in a span}
An \acro{HTML} \tag{div} cannot appear inside a \tag{span}.
@@ -578,6 +586,10 @@
\margintag{size}
widths and heights are scaled proportionally to a 6\texttimes{}9 inch text area.
+A minipage of width exactly \cs{linewidth} is automatically
+given no \acro{HTML} width.
+\margintag{no-width minipages}
+
A new macro \cs{minipagefullwidth} requests
\margintag{full-width minipages}
that the next minipage be generated
@@ -642,11 +654,16 @@
}
\newcommand{\limitssubfig}{%
-At present, subfigures before the enclosing figure/table's \cs{caption}
-\margintag{LOF/LOT}
-would appear in the List of Figures/Tables before the enclosing figure/table,
-therefore \pkg{lwarp} does not place subfigures in the LOF/LOT.
+% At present, subfigures before the enclosing figure/table's \cs{caption}
+% \margintag{LOF/LOT}
+% would appear in the List of Figures/Tables before the enclosing figure/table,
+% therefore \pkg{lwarp} does not place subfigures in the LOF/LOT.
+At present, the package options for \texttt{lofdepth} and \texttt{lotdepth}
+\watchout[\texttt{lof/lotdepth}]
+are not working. These counters must be set separately after the
+package has been loaded.
+
In the document source, use \cs{hfill} and \cs{hspace*}
\margintag{horizontal spacing}
between subfigures to spread them
@@ -656,6 +673,11 @@
}
\newcommand{\limitsfloatrow}{%
+When combined with the \pkg{subfig} package,
+\watchout[\pkg{subfig} package]
+while inside a \env{subfloatrow} \cs{ffigbox} and \cs{ttabbox}
+must have the caption in the first of the two of the mandatory arguments.
+
The emulation of \pkg{floatrow} does not support \cs{FBwidth} or \cs{FBheight}.
These values are pre-set to \texttt{.3\cs{linewidth}} and \texttt{2in}.
\watchout[\cs{FBwidth}, \cs{FBheight}]
@@ -678,17 +700,7 @@
\watchout[per-mode]
}
-\newcommand{\limitstikz}{%
-For recent versions of \tikz{} (v3.0.0 --- 2013/12/20 and later), include in the document
-\watchout[preamble]
-preamble: \\
-\hspace*{.25in} \texttt{\cs{usetikzlibrary\{babel\}} \% v3.0.0 and up}
-For older versions of \tikz{} without the \tikz{} \texttt{babel} library,
-\pkg{lwarp} automatically handles the catcode change for the \$ math shift.
-}
-
-
\newcommand{\limitsbabelone}{%
If using \pkg{babel} with French, use \\
\hspace*{.25in}\cs{frenchbsetup\{StandardLists=true\}} \\
@@ -787,7 +799,7 @@
%<*package>
% \fi
%
-% \CheckSum{8584}
+% \CheckSum{9001}
%
% \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
@@ -848,6 +860,7 @@
% \changes{v0.21}{2017/02/23}{\ 2017/02/23}
% \changes{v0.22}{2017/03/02}{\ 2017/03/02}
% \changes{v0.23}{2017/03/02}{\ 2017/03/02}
+% \changes{v0.24}{2017/03/15}{\ 2017/03/15}
@@ -977,6 +990,12 @@
% For a detailed list of changes, see the Change History on page \pageref{sec:changehistory}.
%
% \begin{description}
+% \item[v0.24:] \
+% \begin{itemize}
+% \item \pkg{tikz}'s |babel| library is load automatically as needed.
+% \item \pkg{subfig} has been added, along with |lofdepth| and |lotdepth|.
+% \item \env{picture} and \env{tikzpicture} now may be inline.
+% \end{itemize}
% \item[v0.22:] \
% \begin{itemize}
% \item Support has been added for tabular column types |D|, |!|, and |X|.
@@ -1213,6 +1232,7 @@
% Floats: & Supported, appear where declared.
% \pkg{float} is emulated, \pkg{newfloat} is supported,
% \pkg{caption} and \pkg{subcaption} are supported,
+% \pkg{subfig} is supported,
% \pkg{capt-of} is supported,
% \pkg{placeins} is ignored,
% \pkg{trivfloat} is supported, \pkg{floatrow} is emulated,
@@ -2291,7 +2311,12 @@
% Defaults to the \cs{BaseJobname}. A common setting is: \\
% \hspace*{2em}|\newcommand{HomeHTMLFilename}{index}| \\
% causing the
-% homepage to be the file |index.html|. Underscores are allowed in filenames.
+% homepage to be the file |index.html|. Underscores are allowed in
+% \margintag{filename underscore}
+% \cs{HomeHTMLFilename} and \cs{HTMLFilename}, but usually must be escaped
+% elsewhere, such as |\item [\href{file\_name.pdf}{text}] \|
+% \index{underscore>filename}\index{file>underscore}
+% \changes{v0.24}{2017/03/13}{Docs: Filename underscore.}
%
% \ItemDescribeMacro{\HTMLFileName} A filename prefix for the rest of the \acro{HTML} web pages.
% Useful for numbered web pages with a common prefix. May be empty.
@@ -2329,8 +2354,8 @@
%
% If |SideTOCDepth|\,<\,|FileDepth|, web pages will be inaccessible via the
% side\acro{TOC}. \watchout
-% \index{files>inaccessible}
-% \index{pages>inacessible}
+% \index{file>inaccessible}
+% \index{page>inacessible}
% \index{missing sections}
% \index{section>missing}
%
@@ -2345,8 +2370,8 @@
% \watchout\\
% Place a \cs{tableofcontents} somewhere before the first section
% break (therefore in the ``home page''), and set |tocdepth|\,>=\,|FileDepth|.
-% \index{files>inaccessible}
-% \index{pages>inacessible}
+% \index{file>inaccessible}
+% \index{page>inacessible}
% \index{missing sections}
% \index{section>missing}
% \end{itemize}
@@ -2875,6 +2900,22 @@
% Use a trailing backslash: |\item[label] \|
% \index{item, list, empty}\index{list item, empty}
%
+% \item [Filenames in lists:] \
+%
+% Escape underscores in
+% \margintag{filename underscore}
+% the filenames: \\
+% \hspace*{2em}|\item[\href{file\_name.pdf}{text}]|
+% \index{underscore>filename}\index{file>underscore}
+% \changes{v0.24}{2017/03/13}{Docs: Filename underscore.}
+%
+% \item [Side-by-side minipages:] \
+%
+% Place side-by-side minipages inside a |center| environment,
+% with horizontal space between them, such as \cs{quad}, \cs{qquad},
+% \cs{hspace}, or \cs{hfill}. The result is similar in print and
+% \acro{HTML}. Do not use space commands at the start or end of the line.
+%
% \item [\cs{fbox} around a minipage:] ~
%
% \cs{fbox} can only be used around inline items during
@@ -2933,7 +2974,7 @@
%
% \DescribeEnv{titlepage}
% The \env{titlepage} environment may be used to hold a custom title page.
-% The titlepage will be set in a div class |titlepage|, and \cs{printtitle}, etc.\ may be used
+% The titlepage will be set in a |div| class |titlepage|, and \cs{printtitle}, etc.\ may be used
% inside this environment.
%
% \DescribeEnv{titlingpage}
@@ -2946,31 +2987,31 @@
% file break and \acro{CSS} detection.
% \watchout
% Use the |\subtitle| command instead.
-% In \acro{HTML}, the title will appear in a heading ``h1''.
+% In \acro{HTML}, the title will appear in a heading |h1|.
%
% \DescribeMacro{\author} \marg{author}
%
% In |\author|, use |\protect| before formatting commands such as |\textsc|.
% \watchout
-% In \acro{HTML}, the author will appear in a div class |author|.
+% In \acro{HTML}, the author will appear in a |div| class |author|.
% \cs{affiliation} is a new addition to \pkg{lwarp}.
%
% \DescribeMacro{\date} \marg{date}
%
% |\date| works as expected.
-% In \acro{HTML}, this will appear in a div class ``titledate''.
+% In \acro{HTML}, this will appear in a |div| class |titledate|.
%
% \DescribeMacro{\subtitle} \marg{subtitle}
%
% A new command which sets a subtitle. Newlines are allowed.
% The default is empty.
-% In \acro{HTML}, this will appear in a div class ``subtitle''.
+% In \acro{HTML}, this will appear in a |div| class |subtitle|.
%
% \DescribeMacro{\published} \marg{published}
%
% A new command which sets a publisher.
% The default is empty.
-% In \acro{HTML}, this will appear in a div class ``published''.
+% In \acro{HTML}, this will appear in a |div| class |published|.
%
%
% \DescribeMacro{\thanks} \marg{text}
@@ -3064,13 +3105,6 @@
% \limitsxcolor
%
%
-% \subsubsection{\tikz}
-%
-% \limitstikz
-%
-% See \cref{sec:tikz}.
-%
-%
% \subsubsection{Tabular}
%
% \limitstabular
@@ -3094,9 +3128,9 @@
% \limitscaption
%
%
-% ^^A \subsubsection{\pkg{subfig} package}
+% \subsubsection{\pkg{subfig} package}
%
-% ^^A \limitssubfig
+% \limitssubfig
%
%
% \subsubsection{\pkg{floatrow} package}
@@ -3844,9 +3878,11 @@
\LWR at loadafter{setspace}
\LWR at loadafter{showkeys}
\LWR at loadafter{sidecap}
+\LWR at loadafter{subfig}
\LWR at loadafter{tabularx}
\LWR at loadafter{textpos}
\LWR at loadafter{threeparttable}
+\LWR at loadafter{tikz}
\LWR at loadafter{titleps}
\LWR at loadafter{titlesec}
\LWR at loadafter{titletoc}
@@ -4232,10 +4268,8 @@
\RequirePackage{caption}
% \end{macrocode}
-% \DescribePackage{subcaption}
-% \begin{macrocode}
-\RequirePackage{subcaption}
-% \end{macrocode}
+% \changes{v0.24}{2017/03/06}{No longer preloads \pkg{subcaption};
+% conflicted with \pkg{subfig}.}
% \DescribePackage{enumitem}
@@ -5126,11 +5160,13 @@
% with a leading underscore to avoid colliding with the HTML filename |index.html|:
% \begin{macrocode}
{%
-\LWR at traceinfo{LWR at htmlsectionfilename C}%
+\LWR at traceinfo{LWR at htmlsectionfilename C \LWR at tempone}%
\ifthenelse{%
\equal{\HTMLFileName}{} \AND \equal{\LWR at tempone}{Index} \OR \equal{\LWR at tempone}{index}%
}%
-{\_#1.html}%
+{%
+\LWR at traceinfo{prefixing the index name with an underscore.}%
+\_#1.html}%
% \end{macrocode}
% Otherwise, create a filename with the chosen prefix:
% \begin{macrocode}
@@ -7308,6 +7344,7 @@
% \margintag{Label in \acro{HTML}}
% \changes{v0.20}{2017/01/30}{Fix: math cross references.}
% \begin{macrocode}
+\let\LWR at origltx@label\ltx at label
\let\ltx at label\LWR at htmlmathlabel
% \end{macrocode}
% Logos:
@@ -9413,10 +9450,11 @@
{% not at the left edge:
\LWR at traceinfo{not at the left edge}%
\LWR at setexparray{LWR at colatspec}{\theLWR at tabletotalcols}{\LWR at strresult}%
-\LWR at traceinfo{at \theLWR at tabletotalcols: \LWR at colatspec(\theLWR at tabletotalcols)!}%
-}%
+\LWR at traceinfo{at \theLWR at tabletotalcols: %
+ \LWR at getexparray{LWR at colatspec}{\theLWR at tabletotalcols})!}%
\let\LWR at strresult\relax%
\booltrue{LWR at validtablecol}%
+}%
}
% \end{macrocode}
% \end{macro}
@@ -10591,6 +10629,7 @@
% \changes{v0.14}{2016/03/29}{Docs: Table: Cross-referencing data structures.}
% \changes{v0.19}{2016/05/25}{Docs: Table: Cross-referencing data structures, updated.}
% \begin{table}
+% \small
% \caption{Cross-referencing data structures\label{tab:crossrefdata}}
% \medskip
% \hrule
@@ -10608,17 +10647,27 @@
% \item [\cs{ref}:] Returns the first part of \cs{r@<label>}.
% \item [\cs{pageref}:] Returns the second part of \cs{r@<label>}.
% \end{description}
-% \item [Added by \pkg{amsmath}:] \hfill (print and \acro{HTML})
-% \begin{description}
-% \item [\cs{label}:] Delayed until math is completed.
-% \end{description}
% \item [Added by \pkg{lwarp}:] \hfill (\acro{HTML} only)
% \begin{description}
+% \item [\cs{label}:] Adds \acro{HTML} tags (\cref{sec:labels}),
+% plus \cs{splabel} data (\cref{sec:zrefsetup}):
+% \begin{description}
+% \item [zLWR at name:] The section name for this label.
+% \item [zLWR at htmlfilenumer:] The filenumber or name for this label.
+% \item [zLWR at lateximagedepth:] The |lateximagedepth| for this label.
+% \item [zLWR at lateximagenumber:] The |lateximagenumber| for this label.
+% \end{description}
% \item [\cs{nameref}:] Emualted from \pkg{hyperref} for \pkg{lwarp}.
% See \cref{sec:references}.
% \item [\cs{ref} and \cs{nameref}:] Adds \acro{HTML} tags.
% See \cref{sec:references}.
% \end{description}
+% \item [Added by \pkg{amsmath}:] \hfill (print and \acro{HTML})
+% \begin{description}
+% \item [\cs{label}:] Execution is delayed until the math environment is completed.
+% \item [\cs{ltx at label}:] \LaTeX\ \cs{label},
+% (\acro{HTML:}patched by \pkg{lwarp},) later patched by \pkg{cleveref}.
+% \end{description}
% \item [Added by \pkg{cleverref}:] \hfill (print and \acro{HTML})
% \begin{description}
% \item [\cs{refstepcounter:}] Added: sets \cs{cref at currentlabel}.
@@ -10638,14 +10687,6 @@
% \begin{description}
% \item [\cs{cref}, etc.:] Modified for \pkg{lwarp}.
% See \cref{sec:cleveref}.
-% \item [\cs{label}:] Adds \acro{HTML} tags (\cref{sec:labels}),
-% plus \cs{splabel} data (\cref{sec:zrefsetup}):
-% \begin{description}
-% \item [zLWR at name:] The section name for this label.
-% \item [zLWR at htmlfilenumer:] The filenumber or name for this label.
-% \item [zLWR at lateximagedepth:] The |lateximagedepth| for this label.
-% \item [zLWR at lateximagenumber:] The |lateximagenumber| for this label.
-% \end{description}
% \item [\cs{label} inside math:] See \cref{sec:amsmathsupport}.
% \end{description}
% \item [Footnotes:] See \cs{noteentry} in \cref{sec:footnotesregular}.
@@ -10758,12 +10799,12 @@
% \end{macrocode}
% \end{macro}
% \begin{macro}{\LWR at htmlfileref} \marg{label}
+% \changes{v0.24}{2017/03/13}{Fix: Index links while \cs{tracinglwarp}.}
% Returns the file number for this label:
% \begin{macrocode}
\newcommand*{\LWR at htmlfileref}[1]{%
-\LWR at traceinfo{LWR at htmlfileref A: !#1!}%
+% DO NOT USE \LWR at traceinfo HERE! Will be expanded.
\LWR at spref{#1}{zLWR at htmlfilenumber}%
-\LWR at traceinfo{LWR at htmlfileref B}%
}
% \end{macrocode}
% \end{macro}
@@ -10833,53 +10874,33 @@
}
% \end{macrocode}
% \end{macro}
-
-
-
-% \begin{macro}{\LWR at sublabel} \marg{label}
%
-% \cs{label} during \acro{HTML} output.
-% Creates a traditional \LaTeX\ label,
-% adds a special label with additional information,
-% and creates an \acro{HTML} id tag.
%
-% Used by \cs{LWR at htmllabel} and \cs{LWR at htmlmathlabel}.
+% \begin{macro}{\LWR at newlabel} \marg{label}
+%
+% \cs{label} during \acro{HTML} output when not in math mode,
+% removing extra spaces around the label, as done by regular \LaTeX\ \cs{label}.
+%
+% \pkg{clevereref} later encases this to add its own cross-referencing.
% \begin{macrocode}
-\newcommand*{\LWR at sublabel}[1]{%
+\newcommand*{\LWR at newlabel}[1]{%
+\LWR at traceinfo{LWR at newlabel: !#1!}%
+% \@bsphack%
% \end{macrocode}
% Create a traditional LaTeX label, as modified by \pkg{cleveref}:
% \begin{macrocode}
-\LWR at traceinfo{LWR at sublabel: !#1!}%
\LWR at origlabel{#1}%
% \end{macrocode}
% Create a special label which holds the section number,
% |LWR at htmlfilenumber|, |LWR at lateximagedepth|, and |LWR at lateximagenumber|:
% \begin{macrocode}
-\LWR at traceinfo{about to splabel}%
-\LWR at traceinfo{filesectionnames is \ifbool{FileSectionNames}{true}{false}}%
-\LWR at traceinfo{LWR at thisfilename is !\LWR at thisfilename!}%
-\LWR at traceinfo{LWR at htmlfilenumber is \theLWR at htmlfilenumber}%
+\LWR at traceinfo{LWR at newlabel: filesectionnames is \ifbool{FileSectionNames}{true}{false}}%
+\LWR at traceinfo{LWR at newlabel: LWR at thisfilename is !\LWR at thisfilename!}%
+\LWR at traceinfo{LWR at newlabel: LWR at htmlfilenumber is \theLWR at htmlfilenumber}%
\LWR at splabel{#1}%
\LWR at subsublabel{#1}%
-\LWR at traceinfo{finished with LWR at sublabel}%
-}
-% \end{macrocode}
-% \end{macro}
-%
-%
-%
-%
-% \begin{macro}{\LWR at newlabel} \marg{label}
-%
-% \cs{label} during \acro{HTML} output when not in math mode,
-% removing extra spaces around the label, as done by regular \LaTeX\ \cs{label}.
-% \begin{macrocode}
-\newcommand*{\LWR at newlabel}[1]{%
-\LWR at traceinfo{lwr at newlabel: !#1!}%
-% \@bsphack%
-\LWR at sublabel{#1}%
% \@esphack%
-\LWR at traceinfo{lwr at newlabel: done}%
+\LWR at traceinfo{LWR at newlabel: done}%
}
% \end{macrocode}
% \end{macro}
@@ -10900,53 +10921,74 @@
\newcommand*{\LWR at startref}[1]
{%
\edef\LWR at lidref{\LWR at lateximagedepthref{#1}}
-\LWR at traceinfo{***LWR at startref A: !#1!}%
+\LWR at traceinfo{LWR at startref A: !#1!}%
% \end{macrocode}
-% Create the tag:
+% Create the filename part of the link:
% \begin{macrocode}
\LWR at htmltag{a href="%
-\LWR at traceinfo{***LWR at startref B}%
+\LWR at traceinfo{LWR at startref B}%
\LWR at htmlrefsectionfilename{#1}%
-\LWR at traceinfo{***LWR at startref C}%
+\LWR at traceinfo{LWR at startref C}%
\#%
% \end{macrocode}
+% Create the destination id:
+%
% See if |LWR at lateximagedepth| is unknown:
% \begin{macrocode}
-\LWR at traceinfo{***LWR at startref D: !#1!}%
+\LWR at traceinfo{LWR at startref D: !#1!}%
\ifthenelse{\equal{\LWR at lidref}{??}}%
% \end{macrocode}
-% ``|??|'' if |LWR at lateximagedepth| is unknown:
+% ``|??|'' if |LWR at lateximagedepth| is unknown,
+% so create a link with an unknown destination:
% \begin{macrocode}
-{??}%
+{%
+\LWR at traceinfo{LWR at startref D0: ??}
+??}%
% \end{macrocode}
-% If |LWR at lateximagedepth| is known:
+% If |LWR at lateximagedepth| is known.
+% Use a lateximage if the depth is greater than zero,
+% or a regular link otherwise:
% \begin{macrocode}
{%
-\LWR at traceinfo{***LWR at startref D1}%
-\LWR at traceinfo{***depthref is \LWR at lidref}%
+\LWR at traceinfo{LWR at startref D1: \LWR at lidref}%
\ifthenelse{\cnttest{\LWR at lidref}{>}{0}}%
{%
-\LWR at traceinfo{***LWR at startref D2}%
+\LWR at traceinfo{LWR at startref D2: \LWR at lidref}%
lateximage\LWR at lateximagenumberref{#1}%
}%
{%
-\LWR at traceinfo{***LWR at startref D3}%
+\LWR at traceinfo{LWR at startref D3}%
#1%
}%
}%
-\LWR at traceinfo{***LWR at startref E}%
+\LWR at traceinfo{LWR at startref E}%
% \end{macrocode}
-% closing quote:
+% Closing quote:
% \begin{macrocode}
"{}}%
-\LWR at traceinfo{***LWR at startref F}%
+\LWR at traceinfo{LWR at startref F}%
}
% \end{macrocode}
% \end{macro}
+% \begin{macro}{\LWR at subnewref} \marg{label} \marg{label or sub at label}
+%
+% Factored for the \pkg{subfig} package.
+% Uses the original label for the hyper-reference,
+% but prints its own text, such as ``|1(b)|''.
+% \begin{macrocode}
+\NewDocumentCommand{\LWR at subnewref}{m m}{%
+\LWR at traceinfo{LWR at subnewref #1 #2}%
+\LWR at startref{#1}%
+\LWR at origref{#2}%
+\LWR at htmltag{/a}%
+}
+% \end{macrocode}
+% \end{macro}
-% \begin{macro}{\ref} * \marg{label} \quad
+% \begin{macro}{\ref} * \marg{label} \quad \cs{ref} is \cs{let} to \cs{LWR at newref}
+% \begin{macro}{\LWR at newref} * \marg{label} \quad
% Create an internal document reference link,
% or without a link if starred per \pkg{hyperref}.
% \begin{macrocode}
@@ -10954,15 +10996,11 @@
\LWR at traceinfo{LWR at newref #2}%
\IfBooleanTF{#1}%
{\LWR at origref{#2}}%
-{%
-\LWR at startref{#2}%
-\LWR at origref{#2}%
-\LWR at htmltag{/a}%
-}%
+{\LWR at subnewref{#2}{#2}}%
}
-
% \end{macrocode}
% \end{macro}
+% \end{macro}
% \begin{macro}{\pagerefPageFor} Text for starred page references.
@@ -11374,9 +11412,10 @@
% \begin{macrocode}
\renewcommand{\@@par}{\LWR at closeparagraph\LWR at orig@@par}%
% \end{macrocode}
-% No need for a minipage inside the caption:
+% No need for a |minipage| or \cs{parbox} inside the caption:
% \begin{macrocode}
\RenewDocumentEnvironment{minipage}{O{t} o O{t} m}{}{}%
+\RenewDocumentCommand{\parbox}{O{t} o O{t} m +m}{##5}%
% \end{macrocode}
% Enclose the original caption code inside an \acro{HTML} tag:
% \begin{macrocode}
@@ -11411,8 +11450,10 @@
% \begin{macro}{\caption at end}
% Low-level patches to create \acro{HTML} tags for captions.
% \begin{macrocode}
+\AtBeginDocument{
\let\caption at begin\LWR at caption@begin
\let\caption at end\LWR at caption@end
+}
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -11746,7 +11787,7 @@
% \end{macro}
-% \begin{macro}{\hypertoc} \marg{1: depth} \marg{2: class} \marg{3: name} \marg{4: page}
+% \begin{macro}{\hypertoc} \marg{1: depth} \marg{2: type} \marg{3: name} \marg{4: page}
%
% Called by \cs{l at section}, etc. to create a hyperlink to a section.
%
@@ -11754,7 +11795,7 @@
%
% \begin{description}
% \item[\#1] is depth
-% \item[\#2] \acro{HTML} \acro{CSS} class is tocsection, tocsubsection, etc.
+% \item[\#2] is |section|, |subsection|, etc.
% \item[\#3] the text of the caption
% \item[\#4] page number
% \end{description}
@@ -11770,7 +11811,7 @@
% of the given \acro{HTML} class.
% \begin{macrocode}
\LWR at subhyperrefclass{%
-\LWR at htmlrefsectionfilename{autopage-#4}\#autosec-#4}{#3}{#2}%
+\LWR at htmlrefsectionfilename{autopage-#4}\#autosec-#4}{#3}{toc#2}%
\LWR at stoppars%
}
{}
@@ -11778,20 +11819,50 @@
% \end{macrocode}
% \end{macro}
-% \begin{macro}{\hypertocfloat} \marg{1: depth} \marg{2: class}
+% \DescribeCounter{lofdepth} \acro{TOC} depth for figures.
+% \begin{macrocode}
+\newcounter{lofdepth}
+\setcounter{lofdepth}{1}
+% \end{macrocode}
+
+% \DescribeCounter{lotdepth} \acro{TOC} depth for tables.
+% \begin{macrocode}
+\newcounter{lotdepth}
+\setcounter{lotdepth}{1}
+% \end{macrocode}
+
+
+% \begin{macro}{\hypertocfloat} \marg{1: depth} \marg{2: type}
% \marg{3: caption} \marg{4: page}
%
% \begin{description}
% \item[\#1] is depth
-% \item[\#2] \acro{HTML} \acro{CSS} class is tocfigure, toctable
-% \item[\#3] the text of the caption
-% \item[\#4] page number
+% \item[\#2] is |figure|, |table|, etc.
+% \item[\#3] is |lof|, |lot|, of the parent.
+% \item[\#4] the text of the caption
+% \item[\#5] page number
% \end{description}
-
+%
+% \changes{v0.24}{2017/03/06}{List of floats responds to \texttt{lofdepth}, \texttt{lotdepth}.}
+%
% \begin{macrocode}
-\newcommand{\hypertocfloat}[4]{%
+\newcommand{\hypertocfloat}[5]{%
\LWR at startpars
% \end{macrocode}
+% If some float-creation package has not yet defined
+% the float type's |lofdepth| counter, etc, define it here:
+% \begin{macrocode}
+\@ifundefined{c@#3depth}{%
+\newcounter{#3depth}%
+\setcounter{#3depth}{1}%
+}{}%
+% \end{macrocode}
+% Respond to |lofdepth|, etc.:
+% \begin{macrocode}
+\LWR at traceinfo{hypertocfloat depth is #1 #3depth is \arabic{#3depth}}%
+\ifthenelse{\cnttest{#1}{<=}{\arabic{#3depth}}}{%
+\LWR at startpars%
+% \end{macrocode}
% Create an \acro{HTML} link to
% filename\#autofloat-(float number), with text of the caption,
% of the given \acro{HTML} class.
@@ -11799,8 +11870,9 @@
\LWR at subhyperrefclass{%
\LWR at htmlrefsectionfilename{autopage-\arabic{LWR at nextautopage}}%
\#autofloat-\arabic{LWR at nextautofloat}}%
-{#3}{#2}%
+{#4}{toc#2}%
\LWR at stoppars%
+}{}%
}
% \end{macrocode}
% \end{macro}
@@ -11807,17 +11879,17 @@
% Automatically called by |\contentsline|:
% \begin{macrocode}
-\renewcommand{\l at part}[2]{\hypertoc{-1}{tocpart}{#1}{#2}}
+\renewcommand{\l at part}[2]{\hypertoc{-1}{part}{#1}{#2}}
\DeclareDocumentCommand{\l at chapter}{m m}
- {\hypertoc{0}{tocchapter}{#1}{#2}}
-\renewcommand{\l at section}[2]{\hypertoc{1}{tocsection}{#1}{#2}}
-\renewcommand{\l at subsection}[2]{\hypertoc{2}{tocsubsection}{#1}{#2}}
+ {\hypertoc{0}{chapter}{#1}{#2}}
+\renewcommand{\l at section}[2]{\hypertoc{1}{section}{#1}{#2}}
+\renewcommand{\l at subsection}[2]{\hypertoc{2}{subsection}{#1}{#2}}
\renewcommand{\l at subsubsection}[2]
- {\hypertoc{3}{tocsubsubsection}{#1}{#2}}
-\renewcommand{\l at paragraph}[2]{\hypertoc{4}{tocparagraph}{#1}{#2}}
-\renewcommand{\l at subparagraph}[2]{\hypertoc{5}{tocsubparagraph}{#1}{#2}}
-\renewcommand{\l at figure}[2]{\hypertocfloat{1}{tocfigure}{#1}{#2}}
-\renewcommand{\l at table}[2]{\hypertocfloat{1}{toctable}{#1}{#2}}
+ {\hypertoc{3}{subsubsection}{#1}{#2}}
+\renewcommand{\l at paragraph}[2]{\hypertoc{4}{paragraph}{#1}{#2}}
+\renewcommand{\l at subparagraph}[2]{\hypertoc{5}{subparagraph}{#1}{#2}}
+\renewcommand{\l at figure}[2]{\hypertocfloat{1}{figure}{lof}{#1}{#2}}
+\renewcommand{\l at table}[2]{\hypertocfloat{1}{table}{lot}{#1}{#2}}
% \end{macrocode}
% \begin{macrocode}
@@ -12221,9 +12293,9 @@
% \begin{macrocode}
\LWR at restoremathlatexformatting
% \end{macrocode}
-% When a label is encountered, the HTML comment is closed,
-% the label is generated in an HTML-output context,
-% then the HTML comment is opened again.
+% ^^A When a label is encountered, the HTML comment is closed,
+% ^^A the label is generated in an HTML-output context,
+% ^^A then the HTML comment is opened again.
% See \cs{LWR at htmlmathlabel} in \cref{sec:amsmathsupport}.
%
% Print the contents of the equation:
@@ -12377,11 +12449,14 @@
% \begin{macro}{\LWR at htmlmathlabel} \marg{label}
% \index{label>math environment}
%
-% \cs{label} when called inside a \LaTeX{} AMS math environment's math mode
-% which is encased inside an \acro{HTML} comment
-% while creating a \acro{HTML} document.
+% \pkg{lwarp} points \cs{ltx at label} here.
+% This is used by \cs{label} when inside a
+% \LaTeX{} AMS math environment's math display environment.
+%
+% \cs{LWR at origltx@label} points to the \LaTeX\ original,
+% modified by \pkg{lwarp}, then by \pkg{amsmath},
+% then by \pkg{cleveref}.
% \begin{macrocode}
-
\newcommand*{\LWR at htmlmathlabel}[1]{%
\LWR at traceinfo{LWR at htmlmathlabel #1}%
\ifbool{mathjax}{%
@@ -12401,9 +12476,14 @@
% \cs{@firstofone} is required to remove extra braces
% introduced by the \pkg{amsmath} package.)
% \begin{macrocode}
-\LWR at htmlclosecomment\LWR at sublabel{\@firstofone#1}\LWR at htmlopencomment}%
+\LWR at htmlclosecomment%
+\LWR at origltx@label{#1}%
+\LWR at htmlopencomment%
+}% text
+}% mathjax
+{%
+\LWR at origltx@label{#1}%
}%
-{\LWR at sublabel{\@firstofone#1}}%
}
% \end{macrocode}
% \end{macro}
@@ -13808,9 +13888,13 @@
% \begin{macrocode}
\renewcommand{\@@setcpagerefrange}[3]{%
#1{\cpagerefFor\ \cref{#2}}{\cref{#3}}{}{}{}{}}
+}% AfterEndPreamble
% \end{macrocode}
+
+%
% Remember and patch some label-related defintions.
+% These will be further encased and patched by other packages later.
%
% \begin{macrocode}
\let\LWR at origlabel\label
@@ -13821,7 +13905,6 @@
\let\pageref\LWR at newpageref
-}% AfterEndPreamble
\end{warpHTML}
% \end{macrocode}
@@ -13835,7 +13918,8 @@
% \DescribeEnv{picture} The \env{picture} environment is enclosed
% inside a \cs{lateximage}.
-
+%
+%
% \codehtml
% \begin{macrocode}
\begin{warpHTML}
@@ -13842,14 +13926,11 @@
% \end{macrocode}
% \begin{environment}{picture}
+% \changes{v0.24}{2017/03/13}{Fix for inline images.}
% \begin{macrocode}
-\BeforeBeginEnvironment{picture}{
+\BeforeBeginEnvironment{picture}{\lateximage}
-\lateximage}
-
-\AfterEndEnvironment{picture}{\endlateximage
-
-}
+\AfterEndEnvironment{picture}{\endlateximage}
% \end{macrocode}
% \end{environment}
@@ -13861,81 +13942,6 @@
-% \section{Tikzpicture}
-% \label{sec:tikz}
-
-% \DescribePackage{tikz}
-%
-% \DescribeEnv{tikzpicture} May be used as-is, and its contents will be
-% converted to an image.
-%
-% \limitstikz
-%
-% (\pkg{lwarp} changes the catcode of |$| for its own use.
-% \margintag{catcodes}
-% The \tikz{} |babel| library temporarily changes catcodes
-% back to normal for \tikz's use, restoring them to their
-% \pkg{lwarp} purpose while inside each \tikz{} node.)
-% \index{tikz>dollar redefined}
-% \index{tikz>catcodes}
-%
-
-% \codehtml
-% \begin{macrocode}
-\begin{warpHTML}
-% \end{macrocode}
-
-
-% \DescribeBoolean{LWR at tikzbabel}
-% \pkg{tikz} v3.0.0 introduced the |babel| library which handles catcode changes.
-% For older versions, \pkg{lwarp} must change |$|'s catcode itself.
-% \begin{macrocode}
-\newbool{LWR at tikzbabel}
-\boolfalse{LWR at tikzbabel}
-
-\AtBeginDocument{
-\@ifpackageloaded{tikz}{
-\@ifpackagelater{tikz}{2013/12/20}% Test for Tikz version v3.0.0
-{\booltrue{LWR at tikzbabel}}
-{\boolfalse{LWR at tikzbabel}}
-}{}
-}
-% \end{macrocode}
-
-
-
-% \begin{environment}{tikzpicture}
-% |tikzpicture| environment is enclosed inside a |\lateximage|.
-%
-% \changes{v0.13}{2016/03/23}{Fix dollar-redefined bug for newer package.}
-% \changes{v0.19}{2016/05/29}{Adapts to tikz version.}
-%
-% \begin{macrocode}
-\BeforeBeginEnvironment{tikzpicture}{%
-
-\lateximage
-\ifbool{LWR at tikzbabel}
-{}
-{\catcode`\$=3} % dollar sign is math shift
-}
-
-\AfterEndEnvironment{tikzpicture}{%
-\endlateximage
-
-\ifbool{LWR at tikzbabel}
-{}
-{\catcode`\$=\active}
-}
-% \end{macrocode}
-% \end{environment}
-
-% \begin{macrocode}
-\end{warpHTML}
-% \end{macrocode}
-
-
-
-
% \section{Boxes and Minipages}
%
% A \acro{CSS} flexbox is used for minipages and parboxes,
@@ -14146,7 +14152,7 @@
% \end{macrocode}
% Reset the text area if are starting the outer-most minipage:
% \begin{macrocode}
-\LWR at traceinfo{starting minipage}%
+\LWR at traceinfo{starting minipage of width #4}%
\uselengthunit{in}%
\setlength{\LWR at minipagewidth}{#4}%
\ifthenelse{\cnttest{\value{LWR at minipagedepth}}{=}{0}}{%
@@ -14155,6 +14161,7 @@
\setlength{\textwidth}{6in}%
\setlength{\textheight}{9in}%
}{}%
+\LWR at traceinfo{computed width is \rndprintlength{\LWR at minipagewidth}}
\addtocounter{LWR at minipagedepth}{1}%
\setlength{\LWR at minipageheight}{\textheight}% default unless specified
\IfValueTF{#2}{\setlength{\LWR at minipageheight}{#2}}{}%
@@ -14179,7 +14186,7 @@
% \end{macrocode}
% Print the width and optional height styles:
% \begin{macrocode}
-\LWR at traceinfo{minipage: about to print the width}%
+\LWR at traceinfo{minipage: about to print the width of \rndprintlength{\LWR at minipagewidth}}%
\uselengthunit{PT}%
\ifbool{LWR at minipagefullwidth}%
{\boolfalse{LWR at minipagefullwidth}}%
@@ -14247,8 +14254,9 @@
%
% A parbox uses the minipage code:
% \begin{macrocode}
-\RenewDocumentCommand{\parbox}{O{t} o O{t} m m}
+\RenewDocumentCommand{\parbox}{O{t} o O{t} m +m}
{
+\LWR at traceinfo{parbox of width #4}%
\begin{minipage}[#1][#2][#3]{#4}
#5
\end{minipage}
@@ -14713,18 +14721,24 @@
% \begin{macro}{\LWR at hspace} * \marg{length}
%
% Handles special minipage \& horizontal space interactions.
-% \changes{v0.18}{2016/05/13}{\cs{hspace} supported}
-% \changes{v0.19}{2016/05/29}{Fix: \cs{hspace} length computations}
-% \changes{v0.20}{2016/08/22}{Add: Supports HTML thin breakable space}
+% \changes{v0.18}{2016/05/13}{\cs{hspace} supported.}
+% \changes{v0.19}{2016/05/29}{Fix: \cs{hspace} length computations.}
+% \changes{v0.20}{2016/08/22}{Add: Supports HTML thin breakable space.}
+% \changes{v0.24}{2017/03/14}{Add: \cs{hspace} \cs{fill} converts to 2em}
%
% Prints a span of a given width. Ignores the optional star.
%
-% \cs{fill} is zero-width, so |\hspace{\fill}| is ignored.
+% |\hspace{\fill}| is converted to |\hspace{2em}|, equal to \cs{qquad}.
% \begin{macrocode}
-
\NewDocumentCommand{\LWR at hspace}{s m}{%
\setlength{\LWR at tempwidth}{#2}%
% \end{macrocode}
+% If \cs{fill}, change to \cs{qquad}:
+% \begin{macrocode}
+\ifnum\gluestretchorder\LWR at tempwidth>0%
+\setlength{\LWR at tempwidth}{2em}%
+\fi%
+% \end{macrocode}
% Only if the width is not zero:
% \begin{macrocode}
\ifthenelse{\dimtest{\LWR at tempwidth}{=}{0pt}}{}{%
@@ -15182,6 +15196,7 @@
% \changes{v0.14}{2016/03/29}{Docs: Trademarks section.}
%
% \begin{itemize}
+% \item \TeX\ is a trademark of American Mathematical Society.
% \item Adobe® and Adobe Framemaker® are either registered trademarks or
% trademarks of Adobe Systems Incorporated in the United States and/or other countries.
% \item Linux® is the registered trademark of Linus Torvalds in the U.S.\ and other countries.
@@ -16007,6 +16022,8 @@
display: inline-block ; margin: 3ex 1em 3ex 1em ;
}
+figcaption .minipage { margin:0 ; padding: 0 }
+
div.floatrow { text-align: center; }
div.floatrow figure { display: inline-block ; margin: 1ex 2% ; }
@@ -16586,7 +16603,7 @@
border-radius: 1ex ;
}
-figure.figure .minipage { border: none; }
+figure.figure .minipage, figcaption .minipage { border: none; }
div.marginblock div.minipage { border: none; }
@@ -16841,7 +16858,6 @@
.minipage {
background-color: #fffcf5 ;
border: none ;
- margin: 1em ;
}
div.floatrow figure { border: none ; }
@@ -17068,7 +17084,7 @@
-- Print the usage of the lwarpmk command:
-printversion = "v0.23"
+printversion = "v0.24"
function printhelp ()
print ("lwarpmk: Use lwarpmk -h or lwarpmk --help for help.") ;
@@ -18324,44 +18340,95 @@
\LWR at ProvidesPackageDrop{floatrow}
% \end{macrocode}
-% \changes{v0.14}{2016/03/31}{floatrow: Added package}
+% \changes{v0.14}{2016/03/31}{\pkg{floatrow}: Added.}
+% \changes{v0.24}{2017/03/15}{\pkg{floatrow}: Support for \pkg{subfig}.}
% \limitsfloatrow
+% After everything has loaded, remember whether \pkg{subcaption} was loaded.
+% If not, it is assumed that \pkg{subfig} is used instead:
+% \begin{macrocode}
+\newbool{LWR at subcaptionloaded}
-% ^^A \begin{macro}{\floatbox} \oarg{1 preamble} \marg{2 captype}
-% ^^A \oarg{3 width} \oarg{4 height} \oarg{5 vert pos}
-% ^^A \marg{6 caption} \marg{7 object}
+\AtBeginDocument{
+\@ifpackageloaded{subcaption}
+{\booltrue{LWR at subcaptionloaded}}
+{\boolfalse{LWR at subcaptionloaded}}
+}
+% \end{macrocode}
+
+% ^^A \begin{macro}{\floatbox}
+% \cs{floatbox} \oarg{1 preamble} \marg{2 captype}
+% \oarg{3 width} \oarg{4 height} \oarg{5 vert pos}
+% \marg{6 caption} \marg{7 object}
%
-% Only parameters for caption and object are used.
+% Only parameters for captype, width, caption, and object are used.
%
% |LWR at insubfloatrow| is true if inside a \env{subfloatrow} environment.
+%
+% There are two actions, depending on the use of \pkg{subcaption} or \pkg{subfig}.
% \begin{macrocode}
\NewDocumentCommand{\floatbox}{o m o o o +m +m}{%
-\ifbool{LWR at insubfloatrow}
-{
+\ifbool{LWR at subcaptionloaded}%
+{% subcaption
% \end{macrocode}
-% Inside a \env{subfloatrow}.
-% \env{subfigure} and \env{subtable} take a width argument.
-% Defaults to \cs{linewidth} if none is given.
+% For \pkg{subcaption}:
% \begin{macrocode}
-\IfValueTF{#3}
-{\@nameuse{sub#2}{#3}}
-{\@nameuse{sub#2}{\linewidth}}
-}
-{
+\ifbool{LWR at insubfloatrow}%
+{% subcaption in a subfloatrow
% \end{macrocode}
-% Not inside a \env{subfloatrow}.
-% \env{figure} and \env{table} do not take a width argument.
+% \env{subfigure} and \env{subtable} environments take width as an argument.
% \begin{macrocode}
+\IfValueTF{#3}%
+{\@nameuse{sub#2}{#3}}%
+{\@nameuse{sub#2}{\linewidth}}%
+}% subcaption in a subfloatrow
+{% subcaption not in subfloatrow
+% \end{macrocode}
+% \env{figure} and \env{table} environments do not take a width argument.
+% \begin{macrocode}
+\@nameuse{#2}%
+}% subcaption not in subfloatrow
+#6
+
+#7
+% \end{macrocode}
+% End the environments:
+% \begin{macrocode}
+\ifbool{LWR at insubfloatrow}%
+{\@nameuse{endsub#2}}%
+{\@nameuse{end#2}}%
+}% subcaption
+{% assume subfig
+% \end{macrocode}
+% For \pkg{subfig}:
+% \begin{macrocode}
+\ifbool{LWR at insubfloatrow}%
+{% subfig in a subfloatrow
+% \end{macrocode}
+% \cs{subfloat} is a macro, not an environment.
+%
+% Package \pkg{subfig}'s \cs{subfloat} command takes an optional argument which is the
+% caption, but \cs{floatbox} argument \#6 contains commands to create
+% the caption and label, not the caption itself. Thus, \cs{caption}
+% is temporarily disabled to return its own argument without braces.
+% \begin{macrocode}
+\begingroup
+\let\caption\@firstofone
+\subfloat[#6]{#7}
+\endgroup
+}% subfig in a subfloatrow
+{% subfig package, but not a subfig
+% \end{macrocode}
+% \env{figure} and \env{table} are environments:
+% \begin{macrocode}
\@nameuse{#2}
-}
#6
#7
-\ifbool{LWR at insubfloatrow}
-{\@nameuse{endsub#2}}
-{\@nameuse{end#2}}
+\@nameuse{end#2}
+}% subfig package, but not a subfig
+}% assume subfig
}
% \end{macrocode}
% ^^A \end{macro}
@@ -18502,7 +18569,7 @@
\LWR at frowkeyfileext\ \LWR at frowkeywithin}%
\newfloat{#1}{\LWR at frowkeyplacement}%
{\LWR at frowkeyfileext}[\LWR at frowkeywithin]%
-\LWR at traceinfo{*** finished newfloat #1}
+\LWR at traceinfo{finished newfloat #1}
}%
% \end{macrocode}
% Rename the float if a name was given:
@@ -19358,7 +19425,7 @@
\let\LWR at origlsthkEveryPar\lsthk at EveryPar
-\renewcommand{\l at lstlisting}[2]{\hypertocfloat{1}{toclstlisting}{#1}{#2}}
+\renewcommand{\l at lstlisting}[2]{\hypertocfloat{1}{lstlisting}{lol}{#1}{#2}}
% \end{macrocode}
%
%
@@ -19544,7 +19611,9 @@
\kern\VerbatimHTMLWidth \kern\lst at numbersep
\lst at numberstyle{\thelstnumber}}}%
}{\PackageError{Listings}{Numbers #1 unknown}\@ehc}}
-
+% \end{macrocode}
+%
+% \begin{macrocode}
\end{warpHTML}
% \end{macrocode}
@@ -20907,6 +20976,302 @@
% \clearpage
% \iffalse
+%<*subfig>
+% \fi
+
+% \part{lwarp-subfig.sty}
+%
+% \section{Subfig}
+%
+% \DescribePackage{subfig}
+% \pkg{subfig} is supported and patched by \pkg{lwarp}.
+%
+% \changes{v0.24}{2017/03/06}{\pkg{subfig}: Added.}
+%
+% \limitssubfig
+%
+% \codehtml
+%
+% Accept all options for \pkg{lwarp-subfig}:
+% \begin{macrocode}
+\LWR at ProvidesPackagePass{subfig}
+% \end{macrocode}
+
+% \cs{sf@@@subfloat} \marg{1 type} \oarg{2 lof entry} \oarg{3 caption} \marg{4 contents}
+%
+% The outer minipage allows side-by-side subfloats with \cs{hfill} between.
+% \begin{macrocode}
+\long\def\sf@@@subfloat#1[#2][#3]#4{%
+\begin{minipage}{\linewidth}% new
+\LWR at stoppars% new
+ \@ifundefined{FBsc at max}{}%
+ {\FB at readaux{\let\FBsuboheight\relax}}%
+ \@tempcnta=\@ne
+ \if at minipage
+ \@tempcnta=\z@
+ \else\ifdim \lastskip=\z@ \else
+ \@tempcnta=\tw@
+ \fi\fi
+ \ifmaincaptiontop
+ \sf at top=\sf at nearskip
+ \sf at bottom=\sf at farskip
+ \else
+ \sf at top=\sf at farskip
+ \sf at bottom=\sf at nearskip
+ \fi
+ \leavevmode
+ \setbox\@tempboxa \hbox{#4}%
+ \@tempdima=\wd\@tempboxa
+ \@ifundefined{FBsc at max}{}%
+ {\global\advance\Xhsize-\wd\@tempboxa
+ \dimen@=\ht\@tempboxa
+ \advance\dimen@\dp\@tempboxa
+ \ifdim\dimen@>\FBso at max
+ \global\FBso at max\dimen@
+ \fi}%
+ \vtop\bgroup
+ \vbox\bgroup
+ \ifcase\@tempcnta
+ \@minipagefalse
+ \or
+ \vskip\sf at top
+ \or
+ \ifdim \lastskip=\z@ \else
+ \@tempskipb\sf at top\relax\@xaddvskip
+ \fi
+ \fi
+ \sf at ifpositiontop{%
+ \ifx \@empty#3\relax \else
+ \sf at subcaption{#1}{#2}{#3}%
+ \vskip\sf at capskip
+ \vskip\sf at captopadj
+ \fi\egroup
+ \hrule width0pt height0pt depth0pt
+ \LWR at startpars% new
+% \box\@tempboxa
+ #4
+ \LWR at stoppars% new
+ }{%
+ \LWR at startpars% new
+ \@ifundefined{FBsc at max}%
+ {
+% \box\@tempboxa
+ #4
+ }%
+ {\ifx\FBsuboheight\relax
+% \box\@tempboxa
+ #4
+ \else
+% \vbox to \FBsuboheight{\FBafil\box\@tempboxa\FBbfil}%
+ #4
+ \fi}%
+ \LWR at stoppars% new
+ \egroup
+ \ifx \@empty#3\relax \else
+ \vskip\sf at capskip
+ \hrule width0pt height0pt depth0pt
+ \sf at subcaption{#1}{#2}{#3}%
+ \fi
+ }%
+ \vskip\sf at bottom
+ \egroup
+ \@ifundefined{FBsc at max}{}%
+ {\addtocounter{FRobj}{-1}%
+ \ifnum\c at FRobj=0\else
+ \subfloatrowsep
+ \fi}%
+ \ifmaincaptiontop\else
+ \global\advance\@nameuse{c@\@captype}\m at ne
+ \fi
+\end{minipage}% new
+\LWR at startpars% new
+ \endgroup\ignorespaces%
+}%
+% \end{macrocode}
+
+% \cs{sf at subcaption} \marg{1 type} \marg{2 lof entry} \marg{3 caption}
+% \begin{macrocode}
+\long\def\sf at subcaption#1#2#3{%
+\LWR at stoppars% new
+ \ifx \relax#2\relax \else
+ \bgroup
+ \let\label=\@gobble
+ \let\protect=\string
+ \def\@subcaplabel{%
+ \caption at lstfmt{\@nameuse{p@#1}}{\@nameuse{the#1}}}%
+ \sf at updatecaptionlist{#1}{#2}{\the\value{\@captype}}{\the\value{#1}}%
+ \egroup
+ \fi
+ \bgroup
+ \ifx \relax#3\relax
+ \let\captionlabelsep=\relax
+ \fi
+% \setbox0\vbox{%
+% \hb at xt@\the\@tempdima{%
+%
+% % \hss
+% % \parbox[t]{\the\@tempdima}{%
+% \caption at make
+% {\@nameuse{sub\@captype name}}%
+% {\@nameuse{thesub\@captype}}%
+% {#3}
+% % }%
+% % \hss
+% }
+% }%
+ \@ifundefined{FBsc at max}%
+% {\box0}%
+ {
+% \parbox[t]{\the\@tempdima}{%
+\LWR at traceinfo{sfsubcap B1}% new
+ \LWR at htmlblocktag{figcaption}% new
+ \caption at make
+ {\@nameuse{sub\@captype name}}%
+ {\@nameuse{thesub\@captype}}%
+ {#3}
+ \LWR at htmlblocktag{/figcaption}% new
+\LWR at traceinfo{sfsubcap B2}% new
+% }%
+ }%
+ {\dimen@\ht0%
+ \advance\dimen@\dp0%
+ \ifdim\dimen@>\FBsc at max
+ \global\FBsc at max\dimen@
+ \fi
+ \FB at readaux{\let\FBsubcheight\relax}%
+ \ifx\FBsubcheight\relax
+ \def\next{
+% \parbox[t]{\the\@tempdima}
+ }%
+ \else
+ \def\next{
+% \parbox[t][\FBsubcheight][t]{\the\@tempdima}
+ }%
+ \fi
+ \vbox{%
+% \hb at xt@\the\@tempdima{%
+
+% \hss
+% \next{%
+\LWR at traceinfo{sfsubcap C1}% new
+ \caption at make
+ {\@nameuse{sub\@captype name}}%
+ {\@nameuse{thesub\@captype}}%
+ {#3}
+\LWR at traceinfo{sfsubcap C1}% new
+% }%
+% \hss
+
+% }
+ }
+ }%
+ \egroup
+\LWR at startpars% new
+}
+% \end{macrocode}
+
+% \cs{caption@@@make} \marg{caption label} \marg{caption text}
+% \begin{macrocode}
+\renewcommand\caption@@@make[2]{%
+\LWR at startpars% new
+ \sbox\@tempboxa{#1}%
+ \ifdim\wd\@tempboxa=\z@
+ \let\caption at lsep\relax
+ \fi
+ \caption at ifempty{#2}{%
+ \let\caption at lsep\@empty
+ \let\caption at tfmt\@firstofone
+ }%
+% \@setpar{\@@par\caption@@par}\caption@@par
+\renewcommand{\@@par}{\LWR at closeparagraph\LWR at orig@@par}% new
+ \caption at applyfont
+ \caption at fmt
+ {\ifcaption at star\else
+ \begingroup
+ \captionlabelfont
+ #1%
+ \endgroup
+ \fi}%
+ {\ifcaption at star\else
+ \begingroup
+ \caption at iflf\captionlabelfont
+ \relax\caption at lsep
+ \endgroup
+ \fi}%
+ {{\captiontextfont
+ \caption at ifstrut
+ {\vrule\@height\ht\strutbox\@width\z@}%
+ {}%
+ \nobreak\hskip\z at skip % enable hyphenation
+ \caption at tfmt{#2}
+ \LWR at ensuredoingapar% new
+ \caption at ifstrut
+ {\ifhmode\@finalstrut\strutbox\fi}%
+ {}%
+ \par}}
+\LWR at stoppars% new
+}
+% \end{macrocode}
+
+
+% Patches for \cs{sf at sub@label}:
+% \begin{macrocode}
+\def\subfloat at label{%
+\LWR at ensuredoingapar% new
+ \@ifnextchar(% %) match left parenthesis
+ {\sf at sub@label}
+ {\sf at sub@label(Sub\@captype\space
+ \@ifundefined{thechapter}{}{\@nameuse{thechapter}\space}%
+ \@nameuse{p at sub\@captype}%
+ \@nameuse{thesub\@captype}.)}}
+% \end{macrocode}
+
+
+
+% Patches for \cs{subref}.
+%
+% The unstarred version uses a \cs{ref} link whose printed text
+% comes from the |sub@<label>|:
+% \begin{macrocode}
+\renewcommand{\sf at subref}[1]{%
+\LWR at subnewref{#1}{sub@#1}%
+}
+% \end{macrocode}
+% The starred version uses the printed |sub@<label>| which is stored as
+% if it were a page number:
+% \begin{macrocode}
+\renewcommand{\sf@@subref}[1]{\LWR at origpageref{sub@#1}}
+% \end{macrocode}
+%
+% Defining new subfloats. The |l at sub<type>| for each is redefined.
+% \begin{macrocode}
+\let\LWR at orig@newsubfloat\@newsubfloat
+
+\def\@newsubfloat[#1]#2{%
+\LWR at orig@newsubfloat[#1]{#2}%
+\renewcommand{\l at sub#2}[2]{\hypertocfloat{2}{sub#2}{\ext at sub#2}{##1}{##2}}
+}
+% \end{macrocode}
+%
+% Pre-defined for figures and tables:
+% \begin{macrocode}
+\renewcommand{\l at subfigure}[2]{\hypertocfloat{2}{subfigure}{lof}{#1}{#2}}
+\renewcommand{\l at subtable}[2]{\hypertocfloat{2}{subtable}{lot}{#1}{#2}}
+% \def\subfigure{\subfloat}
+% \def\subtable{\subfloat}
+% \end{macrocode}
+
+
+% \iffalse
+%</subfig>
+% \fi
+
+
+
+
+% \clearpage
+
+% \iffalse
%<*tabularx>
% \fi
@@ -21057,9 +21422,96 @@
+
% \clearpage
% \iffalse
+%<*tikz>
+% \fi
+
+% \part{lwarp-tikz.sty}
+%
+% \section{Tikz}
+%
+% \DescribePackage{tikz}
+% \pkg{tikz} is supported.
+%
+% \changes{v0.24}{2017/03/11}{\pkg{tikz}: For tikz v3.0.0 or later,
+% auto-loads tikz babel library if necessary.}
+%
+% Accept all options for \pkg{lwarp-tikz}:
+% \begin{macrocode}
+\LWR at ProvidesPackagePass{tikz}
+% \end{macrocode}
+
+
+% \pkg{lwarp} changes the catcode of |$| for its own use.
+% \margintag{catcodes}
+% The \tikz{} |babel| library temporarily changes catcodes
+% back to normal for \tikz's use.
+% \index{tikz>dollar redefined}
+% \index{tikz>catcodes}
+% \pkg{tikz} v3.0.0 introduced the |babel| library which handles catcode changes.
+% For older versions, \pkg{lwarp} must change |$|'s catcode itself.
+%
+
+% \codehtml
+% \begin{macrocode}
+\begin{warpHTML}
+% \end{macrocode}
+
+
+
+% \begin{macrocode}
+\newboolean{LWR at tikzbabel}
+
+\@ifpackagelater{tikz}{2013/12/20}% Test for Tikz version v3.0.0
+{
+\usetikzlibrary{babel}
+\booltrue{LWR at tikzbabel}
+}
+{\boolfalse{LWR at tikzbabel}}
+% \end{macrocode}
+
+
+% \begin{environment}{tikzpicture}
+% |tikzpicture| environment is enclosed inside a |\lateximage|.
+% May be used as-is, and its contents will be converted to an image.
+%
+% \changes{v0.13}{2016/03/23}{Fix dollar-redefined bug for newer package.}
+% \changes{v0.19}{2016/05/29}{Adapts to tikz version.}
+% \changes{v0.24}{2017/03/13}{Fix for inline images.}
+%
+% \begin{macrocode}
+\BeforeBeginEnvironment{tikzpicture}{%
+\lateximage%
+\ifbool{LWR at tikzbabel}% Test for Tikz version v3.0.0
+{}%
+{\catcode`\$=3} % dollar sign is math shift
+}
+
+\AfterEndEnvironment{tikzpicture}{%
+\endlateximage%
+\ifbool{LWR at tikzbabel}% Test for Tikz version v3.0.0
+{}%
+{\catcode`\$=\active}%
+}
+% \end{macrocode}
+% \end{environment}
+
+% \begin{macrocode}
+\end{warpHTML}
+% \end{macrocode}
+
+% \iffalse
+%</tikz>
+% \fi
+
+
+
+% \clearpage
+
+% \iffalse
%<*titleps>
% \fi
Modified: trunk/Master/texmf-dist/source/latex/lwarp/lwarp.ins
===================================================================
--- trunk/Master/texmf-dist/source/latex/lwarp/lwarp.ins 2017-03-15 21:17:57 UTC (rev 43510)
+++ trunk/Master/texmf-dist/source/latex/lwarp/lwarp.ins 2017-03-15 21:18:37 UTC (rev 43511)
@@ -31,74 +31,78 @@
version 2005/12/01 or later.
\endpreamble
\askforoverwritefalse
-\generate{\file{lwarp.sty}{\from{lwarp.dtx}{package}}}
-\generate{\file{lwarp-newproject.sty}{\from{lwarp.dtx}{lwarp-newproject}}}
-\generate{\file{lwarp-abstract.sty}{\from{lwarp.dtx}{abstract}}}
-\generate{\file{lwarp-afterpage.sty}{\from{lwarp.dtx}{afterpage}}}
-\generate{\file{lwarp-algorithmicx.sty}{\from{lwarp.dtx}{algorithmicx}}}
-\generate{\file{lwarp-alltt.sty}{\from{lwarp.dtx}{alltt}}}
-\generate{\file{lwarp-bookmark.sty}{\from{lwarp.dtx}{bookmark}}}
-\generate{\file{lwarp-booktabs.sty}{\from{lwarp.dtx}{booktabs}}}
-\generate{\file{lwarp-changepage.sty}{\from{lwarp.dtx}{changepage}}}
-\generate{\file{lwarp-dcolumn.sty}{\from{lwarp.dtx}{dcolumn}}}
-\generate{\file{lwarp-draftwatermark.sty}{\from{lwarp.dtx}{draftwatermark}}}
-\generate{\file{lwarp-enumerate.sty}{\from{lwarp.dtx}{enumerate}}}
-\generate{\file{lwarp-epigraph.sty}{\from{lwarp.dtx}{epigraph}}}
-\generate{\file{lwarp-eso-pic.sty}{\from{lwarp.dtx}{eso-pic}}}
-\generate{\file{lwarp-everypage.sty}{\from{lwarp.dtx}{everypage}}}
-\generate{\file{lwarp-extramarks.sty}{\from{lwarp.dtx}{extramarks}}}
-\generate{\file{lwarp-fancyhdr.sty}{\from{lwarp.dtx}{fancyhdr}}}
-\generate{\file{lwarp-float.sty}{\from{lwarp.dtx}{float}}}
-\generate{\file{lwarp-floatrow.sty}{\from{lwarp.dtx}{floatrow}}}
-\generate{\file{lwarp-fontenc.sty}{\from{lwarp.dtx}{fontenc}}}
-\generate{\file{lwarp-fontspec.sty}{\from{lwarp.dtx}{fontspec}}}
-\generate{\file{lwarp-ftnright.sty}{\from{lwarp.dtx}{ftnright}}}
-\generate{\file{lwarp-geometry.sty}{\from{lwarp.dtx}{geometry}}}
-\generate{\file{lwarp-graphicx.sty}{\from{lwarp.dtx}{graphicx}}}
-\generate{\file{lwarp-graphics.sty}{\from{lwarp.dtx}{graphics}}}
-\generate{\file{lwarp-hyperref.sty}{\from{lwarp.dtx}{hyperref}}}
-\generate{\file{lwarp-indentfirst.sty}{\from{lwarp.dtx}{indentfirst}}}
-\generate{\file{lwarp-inputenc.sty}{\from{lwarp.dtx}{inputenc}}}
-\generate{\file{lwarp-keyfloat.sty}{\from{lwarp.dtx}{keyfloat}}}
-\generate{\file{lwarp-layout.sty}{\from{lwarp.dtx}{layout}}}
-\generate{\file{lwarp-letterspace.sty}{\from{lwarp.dtx}{letterspace}}}
-\generate{\file{lwarp-listings.sty}{\from{lwarp.dtx}{listings}}}
-\generate{\file{lwarp-longtable.sty}{\from{lwarp.dtx}{longtable}}}
-\generate{\file{lwarp-lscape.sty}{\from{lwarp.dtx}{lscape}}}
-\generate{\file{lwarp-ltcaption.sty}{\from{lwarp.dtx}{ltcaption}}}
-\generate{\file{lwarp-mcaption.sty}{\from{lwarp.dtx}{mcaption}}}
-\generate{\file{lwarp-mdframed.sty}{\from{lwarp.dtx}{mdframed}}}
-\generate{\file{lwarp-microtype.sty}{\from{lwarp.dtx}{microtype}}}
-\generate{\file{lwarp-multicol.sty}{\from{lwarp.dtx}{multicol}}}
-\generate{\file{lwarp-multirow.sty}{\from{lwarp.dtx}{multirow}}}
-\generate{\file{lwarp-nameref.sty}{\from{lwarp.dtx}{nameref}}}
-\generate{\file{lwarp-needspace.sty}{\from{lwarp.dtx}{needspace}}}
-\generate{\file{lwarp-newclude.sty}{\from{lwarp.dtx}{newclude}}}
-\generate{\file{lwarp-newunicodechar.sty}{\from{lwarp.dtx}{newunicodechar}}}
-\generate{\file{lwarp-nextpage.sty}{\from{lwarp.dtx}{nextpage}}}
-\generate{\file{lwarp-nowidow.sty}{\from{lwarp.dtx}{nowidow}}}
-\generate{\file{lwarp-pagenote.sty}{\from{lwarp.dtx}{pagenote}}}
-\generate{\file{lwarp-parskip.sty}{\from{lwarp.dtx}{parskip}}}
-\generate{\file{lwarp-placeins.sty}{\from{lwarp.dtx}{placeins}}}
-\generate{\file{lwarp-ragged2e.sty}{\from{lwarp.dtx}{ragged2e}}}
-\generate{\file{lwarp-rotating.sty}{\from{lwarp.dtx}{rotating}}}
-\generate{\file{lwarp-setspace.sty}{\from{lwarp.dtx}{setspace}}}
-\generate{\file{lwarp-sidecap.sty}{\from{lwarp.dtx}{sidecap}}}
-\generate{\file{lwarp-showkeys.sty}{\from{lwarp.dtx}{showkeys}}}
-\generate{\file{lwarp-tabularx.sty}{\from{lwarp.dtx}{tabularx}}}
-\generate{\file{lwarp-textpos.sty}{\from{lwarp.dtx}{textpos}}}
-\generate{\file{lwarp-threeparttable.sty}{\from{lwarp.dtx}{threeparttable}}}
-\generate{\file{lwarp-titleps.sty}{\from{lwarp.dtx}{titleps}}}
-\generate{\file{lwarp-titlesec.sty}{\from{lwarp.dtx}{titlesec}}}
-\generate{\file{lwarp-titletoc.sty}{\from{lwarp.dtx}{titletoc}}}
-\generate{\file{lwarp-titling.sty}{\from{lwarp.dtx}{titling}}}
-\generate{\file{lwarp-tocloft.sty}{\from{lwarp.dtx}{tocloft}}}
-\generate{\file{lwarp-trivfloat.sty}{\from{lwarp.dtx}{trivfloat}}}
-\generate{\file{lwarp-verse.sty}{\from{lwarp.dtx}{verse}}}
-\generate{\file{lwarp-wallpaper.sty}{\from{lwarp.dtx}{wallpaper}}}
-\generate{\file{lwarp-wrapfig.sty}{\from{lwarp.dtx}{wrapfig}}}
-\generate{\file{lwarp-xcolor.sty}{\from{lwarp.dtx}{xcolor}}}
-\generate{\file{lwarp-xfrac.sty}{\from{lwarp.dtx}{xfrac}}}
+\generate{
+\file{lwarp.sty}{\from{lwarp.dtx}{package}}
+\file{lwarp-newproject.sty}{\from{lwarp.dtx}{lwarp-newproject}}
+\file{lwarp-abstract.sty}{\from{lwarp.dtx}{abstract}}
+\file{lwarp-afterpage.sty}{\from{lwarp.dtx}{afterpage}}
+\file{lwarp-algorithmicx.sty}{\from{lwarp.dtx}{algorithmicx}}
+\file{lwarp-alltt.sty}{\from{lwarp.dtx}{alltt}}
+\file{lwarp-bookmark.sty}{\from{lwarp.dtx}{bookmark}}
+\file{lwarp-booktabs.sty}{\from{lwarp.dtx}{booktabs}}
+\file{lwarp-changepage.sty}{\from{lwarp.dtx}{changepage}}
+\file{lwarp-dcolumn.sty}{\from{lwarp.dtx}{dcolumn}}
+\file{lwarp-draftwatermark.sty}{\from{lwarp.dtx}{draftwatermark}}
+\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}}
+\file{lwarp-everypage.sty}{\from{lwarp.dtx}{everypage}}
+\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-floatrow.sty}{\from{lwarp.dtx}{floatrow}}
+\file{lwarp-fontenc.sty}{\from{lwarp.dtx}{fontenc}}
+\file{lwarp-fontspec.sty}{\from{lwarp.dtx}{fontspec}}
+\file{lwarp-ftnright.sty}{\from{lwarp.dtx}{ftnright}}
+\file{lwarp-geometry.sty}{\from{lwarp.dtx}{geometry}}
+\file{lwarp-graphicx.sty}{\from{lwarp.dtx}{graphicx}}
+\file{lwarp-graphics.sty}{\from{lwarp.dtx}{graphics}}
+\file{lwarp-hyperref.sty}{\from{lwarp.dtx}{hyperref}}
+\file{lwarp-indentfirst.sty}{\from{lwarp.dtx}{indentfirst}}
+\file{lwarp-inputenc.sty}{\from{lwarp.dtx}{inputenc}}
+\file{lwarp-keyfloat.sty}{\from{lwarp.dtx}{keyfloat}}
+\file{lwarp-layout.sty}{\from{lwarp.dtx}{layout}}
+\file{lwarp-letterspace.sty}{\from{lwarp.dtx}{letterspace}}
+\file{lwarp-listings.sty}{\from{lwarp.dtx}{listings}}
+\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-mcaption.sty}{\from{lwarp.dtx}{mcaption}}
+\file{lwarp-mdframed.sty}{\from{lwarp.dtx}{mdframed}}
+\file{lwarp-microtype.sty}{\from{lwarp.dtx}{microtype}}
+\file{lwarp-multicol.sty}{\from{lwarp.dtx}{multicol}}
+\file{lwarp-multirow.sty}{\from{lwarp.dtx}{multirow}}
+\file{lwarp-nameref.sty}{\from{lwarp.dtx}{nameref}}
+\file{lwarp-needspace.sty}{\from{lwarp.dtx}{needspace}}
+\file{lwarp-newclude.sty}{\from{lwarp.dtx}{newclude}}
+\file{lwarp-newunicodechar.sty}{\from{lwarp.dtx}{newunicodechar}}
+\file{lwarp-nextpage.sty}{\from{lwarp.dtx}{nextpage}}
+\file{lwarp-nowidow.sty}{\from{lwarp.dtx}{nowidow}}
+\file{lwarp-pagenote.sty}{\from{lwarp.dtx}{pagenote}}
+\file{lwarp-parskip.sty}{\from{lwarp.dtx}{parskip}}
+\file{lwarp-placeins.sty}{\from{lwarp.dtx}{placeins}}
+\file{lwarp-ragged2e.sty}{\from{lwarp.dtx}{ragged2e}}
+\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-showkeys.sty}{\from{lwarp.dtx}{showkeys}}
+\file{lwarp-subfig.sty}{\from{lwarp.dtx}{subfig}}
+\file{lwarp-tabularx.sty}{\from{lwarp.dtx}{tabularx}}
+\file{lwarp-textpos.sty}{\from{lwarp.dtx}{textpos}}
+\file{lwarp-threeparttable.sty}{\from{lwarp.dtx}{threeparttable}}
+\file{lwarp-tikz.sty}{\from{lwarp.dtx}{tikz}}
+\file{lwarp-titleps.sty}{\from{lwarp.dtx}{titleps}}
+\file{lwarp-titlesec.sty}{\from{lwarp.dtx}{titlesec}}
+\file{lwarp-titletoc.sty}{\from{lwarp.dtx}{titletoc}}
+\file{lwarp-titling.sty}{\from{lwarp.dtx}{titling}}
+\file{lwarp-tocloft.sty}{\from{lwarp.dtx}{tocloft}}
+\file{lwarp-trivfloat.sty}{\from{lwarp.dtx}{trivfloat}}
+\file{lwarp-verse.sty}{\from{lwarp.dtx}{verse}}
+\file{lwarp-wallpaper.sty}{\from{lwarp.dtx}{wallpaper}}
+\file{lwarp-wrapfig.sty}{\from{lwarp.dtx}{wrapfig}}
+\file{lwarp-xcolor.sty}{\from{lwarp.dtx}{xcolor}}
+\file{lwarp-xfrac.sty}{\from{lwarp.dtx}{xfrac}}
+}
\Msg{*********************************************************}
\Msg{*}
\Msg{* To finish the installation you have to move the}
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-abstract.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-abstract.sty 2017-03-15 21:17:57 UTC (rev 43510)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-abstract.sty 2017-03-15 21:18:37 UTC (rev 43511)
@@ -184,6 +184,10 @@
+
+
+
+
\endinput
%%
%% End of file `lwarp-abstract.sty'.
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-afterpage.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-afterpage.sty 2017-03-15 21:17:57 UTC (rev 43510)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-afterpage.sty 2017-03-15 21:18:37 UTC (rev 43511)
@@ -126,6 +126,10 @@
+
+
+
+
\endinput
%%
%% End of file `lwarp-afterpage.sty'.
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-algorithmicx.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-algorithmicx.sty 2017-03-15 21:17:57 UTC (rev 43510)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-algorithmicx.sty 2017-03-15 21:18:37 UTC (rev 43511)
@@ -142,6 +142,10 @@
+
+
+
+
\endinput
%%
%% End of file `lwarp-algorithmicx.sty'.
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-alltt.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-alltt.sty 2017-03-15 21:17:57 UTC (rev 43510)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-alltt.sty 2017-03-15 21:18:37 UTC (rev 43511)
@@ -129,6 +129,10 @@
+
+
+
+
\endinput
%%
%% End of file `lwarp-alltt.sty'.
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-bookmark.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-bookmark.sty 2017-03-15 21:17:57 UTC (rev 43510)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-bookmark.sty 2017-03-15 21:18:37 UTC (rev 43511)
@@ -132,6 +132,10 @@
+
+
+
+
\endinput
%%
%% End of file `lwarp-bookmark.sty'.
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-booktabs.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-booktabs.sty 2017-03-15 21:17:57 UTC (rev 43510)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-booktabs.sty 2017-03-15 21:18:37 UTC (rev 43511)
@@ -128,6 +128,10 @@
+
+
+
+
\endinput
%%
%% End of file `lwarp-booktabs.sty'.
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-changepage.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-changepage.sty 2017-03-15 21:17:57 UTC (rev 43510)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-changepage.sty 2017-03-15 21:18:37 UTC (rev 43511)
@@ -131,6 +131,10 @@
+
+
+
+
\endinput
%%
%% End of file `lwarp-changepage.sty'.
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-dcolumn.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-dcolumn.sty 2017-03-15 21:17:57 UTC (rev 43510)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-dcolumn.sty 2017-03-15 21:18:37 UTC (rev 43511)
@@ -125,6 +125,10 @@
+
+
+
+
\endinput
%%
%% End of file `lwarp-dcolumn.sty'.
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-draftwatermark.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-draftwatermark.sty 2017-03-15 21:17:57 UTC (rev 43510)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-draftwatermark.sty 2017-03-15 21:18:37 UTC (rev 43511)
@@ -135,6 +135,10 @@
+
+
+
+
\endinput
%%
%% End of file `lwarp-draftwatermark.sty'.
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-enumerate.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-enumerate.sty 2017-03-15 21:17:57 UTC (rev 43510)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-enumerate.sty 2017-03-15 21:18:37 UTC (rev 43511)
@@ -132,6 +132,10 @@
+
+
+
+
\endinput
%%
%% End of file `lwarp-enumerate.sty'.
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-epigraph.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-epigraph.sty 2017-03-15 21:17:57 UTC (rev 43510)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-epigraph.sty 2017-03-15 21:18:37 UTC (rev 43511)
@@ -161,6 +161,10 @@
+
+
+
+
\endinput
%%
%% End of file `lwarp-epigraph.sty'.
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-eso-pic.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-eso-pic.sty 2017-03-15 21:17:57 UTC (rev 43510)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-eso-pic.sty 2017-03-15 21:18:37 UTC (rev 43511)
@@ -144,6 +144,10 @@
+
+
+
+
\endinput
%%
%% End of file `lwarp-eso-pic.sty'.
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-everypage.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-everypage.sty 2017-03-15 21:17:57 UTC (rev 43510)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-everypage.sty 2017-03-15 21:18:37 UTC (rev 43511)
@@ -128,6 +128,10 @@
+
+
+
+
\endinput
%%
%% End of file `lwarp-everypage.sty'.
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-extramarks.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-extramarks.sty 2017-03-15 21:17:57 UTC (rev 43510)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-extramarks.sty 2017-03-15 21:18:37 UTC (rev 43511)
@@ -136,6 +136,10 @@
+
+
+
+
\endinput
%%
%% End of file `lwarp-extramarks.sty'.
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyhdr.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyhdr.sty 2017-03-15 21:17:57 UTC (rev 43510)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyhdr.sty 2017-03-15 21:18:37 UTC (rev 43511)
@@ -143,6 +143,10 @@
+
+
+
+
\endinput
%%
%% End of file `lwarp-fancyhdr.sty'.
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-float.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-float.sty 2017-03-15 21:17:57 UTC (rev 43510)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-float.sty 2017-03-15 21:18:37 UTC (rev 43511)
@@ -149,6 +149,10 @@
+
+
+
+
\endinput
%%
%% End of file `lwarp-float.sty'.
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-floatrow.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-floatrow.sty 2017-03-15 21:17:57 UTC (rev 43510)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-floatrow.sty 2017-03-15 21:18:37 UTC (rev 43511)
@@ -50,22 +50,49 @@
+\newbool{LWR at subcaptionloaded}
+
+\AtBeginDocument{
+\@ifpackageloaded{subcaption}
+{\booltrue{LWR at subcaptionloaded}}
+{\boolfalse{LWR at subcaptionloaded}}
+}
+
\NewDocumentCommand{\floatbox}{o m o o o +m +m}{%
-\ifbool{LWR at insubfloatrow}
-{
-\IfValueTF{#3}
-{\@nameuse{sub#2}{#3}}
-{\@nameuse{sub#2}{\linewidth}}
-}
-{
+\ifbool{LWR at subcaptionloaded}%
+{% subcaption
+\ifbool{LWR at insubfloatrow}%
+{% subcaption in a subfloatrow
+\IfValueTF{#3}%
+{\@nameuse{sub#2}{#3}}%
+{\@nameuse{sub#2}{\linewidth}}%
+}% subcaption in a subfloatrow
+{% subcaption not in subfloatrow
+\@nameuse{#2}%
+}% subcaption not in subfloatrow
+#6
+
+#7
+\ifbool{LWR at insubfloatrow}%
+{\@nameuse{endsub#2}}%
+{\@nameuse{end#2}}%
+}% subcaption
+{% assume subfig
+\ifbool{LWR at insubfloatrow}%
+{% subfig in a subfloatrow
+\begingroup
+\let\caption\@firstofone
+\subfloat[#6]{#7}
+\endgroup
+}% subfig in a subfloatrow
+{% subfig package, but not a subfig
\@nameuse{#2}
-}
#6
#7
-\ifbool{LWR at insubfloatrow}
-{\@nameuse{endsub#2}}
-{\@nameuse{end#2}}
+\@nameuse{end#2}
+}% subfig package, but not a subfig
+}% assume subfig
}
\newcommand*{\nocapbeside}{}
@@ -139,7 +166,7 @@
\LWR at frowkeyfileext\ \LWR at frowkeywithin}%
\newfloat{#1}{\LWR at frowkeyplacement}%
{\LWR at frowkeyfileext}[\LWR at frowkeywithin]%
-\LWR at traceinfo{*** finished newfloat #1}
+\LWR at traceinfo{finished newfloat #1}
}%
\ifthenelse{\equal{\LWR at frowkeyname}{}}
{}
@@ -228,6 +255,10 @@
+
+
+
+
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fontenc.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fontenc.sty 2017-03-15 21:17:57 UTC (rev 43510)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fontenc.sty 2017-03-15 21:18:37 UTC (rev 43511)
@@ -126,6 +126,10 @@
+
+
+
+
\endinput
%%
%% End of file `lwarp-fontenc.sty'.
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fontspec.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fontspec.sty 2017-03-15 21:17:57 UTC (rev 43510)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fontspec.sty 2017-03-15 21:18:37 UTC (rev 43511)
@@ -125,6 +125,10 @@
+
+
+
+
\endinput
%%
%% End of file `lwarp-fontspec.sty'.
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-ftnright.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-ftnright.sty 2017-03-15 21:17:57 UTC (rev 43510)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-ftnright.sty 2017-03-15 21:18:37 UTC (rev 43511)
@@ -124,6 +124,10 @@
+
+
+
+
\endinput
%%
%% End of file `lwarp-ftnright.sty'.
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-geometry.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-geometry.sty 2017-03-15 21:17:57 UTC (rev 43510)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-geometry.sty 2017-03-15 21:18:37 UTC (rev 43511)
@@ -131,6 +131,10 @@
+
+
+
+
\endinput
%%
%% End of file `lwarp-geometry.sty'.
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty 2017-03-15 21:17:57 UTC (rev 43510)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty 2017-03-15 21:18:37 UTC (rev 43511)
@@ -130,6 +130,10 @@
+
+
+
+
\endinput
%%
%% End of file `lwarp-graphics.sty'.
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-graphicx.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-graphicx.sty 2017-03-15 21:17:57 UTC (rev 43510)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-graphicx.sty 2017-03-15 21:18:37 UTC (rev 43511)
@@ -125,6 +125,10 @@
+
+
+
+
\endinput
%%
%% End of file `lwarp-graphicx.sty'.
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperref.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperref.sty 2017-03-15 21:17:57 UTC (rev 43510)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperref.sty 2017-03-15 21:18:37 UTC (rev 43511)
@@ -230,6 +230,10 @@
+
+
+
+
\endinput
%%
%% End of file `lwarp-hyperref.sty'.
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-indentfirst.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-indentfirst.sty 2017-03-15 21:17:57 UTC (rev 43510)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-indentfirst.sty 2017-03-15 21:18:37 UTC (rev 43511)
@@ -125,6 +125,10 @@
+
+
+
+
\endinput
%%
%% End of file `lwarp-indentfirst.sty'.
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-inputenc.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-inputenc.sty 2017-03-15 21:17:57 UTC (rev 43510)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-inputenc.sty 2017-03-15 21:18:37 UTC (rev 43511)
@@ -126,6 +126,10 @@
+
+
+
+
\endinput
%%
%% End of file `lwarp-inputenc.sty'.
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-keyfloat.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-keyfloat.sty 2017-03-15 21:17:57 UTC (rev 43510)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-keyfloat.sty 2017-03-15 21:18:37 UTC (rev 43511)
@@ -153,6 +153,10 @@
+
+
+
+
\endinput
%%
%% End of file `lwarp-keyfloat.sty'.
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-layout.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-layout.sty 2017-03-15 21:17:57 UTC (rev 43510)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-layout.sty 2017-03-15 21:18:37 UTC (rev 43511)
@@ -126,6 +126,10 @@
+
+
+
+
\endinput
%%
%% End of file `lwarp-layout.sty'.
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-letterspace.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-letterspace.sty 2017-03-15 21:17:57 UTC (rev 43510)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-letterspace.sty 2017-03-15 21:18:37 UTC (rev 43511)
@@ -130,6 +130,10 @@
+
+
+
+
\endinput
%%
%% End of file `lwarp-letterspace.sty'.
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-listings.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-listings.sty 2017-03-15 21:17:57 UTC (rev 43510)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-listings.sty 2017-03-15 21:18:37 UTC (rev 43511)
@@ -70,7 +70,7 @@
\let\LWR at origlsthkEveryPar\lsthk at EveryPar
-\renewcommand{\l at lstlisting}[2]{\hypertocfloat{1}{toclstlisting}{#1}{#2}}
+\renewcommand{\l at lstlisting}[2]{\hypertocfloat{1}{lstlisting}{lol}{#1}{#2}}
\renewcommand{\lst at Init}[1]{%
\LWR at traceinfo{lst at Init}%
\renewcommand*{\@captype}{lstlisting}%
@@ -167,7 +167,6 @@
\kern\VerbatimHTMLWidth \kern\lst at numbersep
\lst at numberstyle{\thelstnumber}}}%
}{\PackageError{Listings}{Numbers #1 unknown}\@ehc}}
-
\end{warpHTML}
@@ -219,6 +218,10 @@
+
+
+
+
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-longtable.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-longtable.sty 2017-03-15 21:17:57 UTC (rev 43510)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-longtable.sty 2017-03-15 21:18:37 UTC (rev 43511)
@@ -166,6 +166,10 @@
+
+
+
+
\endinput
%%
%% End of file `lwarp-longtable.sty'.
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-lscape.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-lscape.sty 2017-03-15 21:17:57 UTC (rev 43510)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-lscape.sty 2017-03-15 21:18:37 UTC (rev 43511)
@@ -126,6 +126,10 @@
+
+
+
+
\endinput
%%
%% End of file `lwarp-lscape.sty'.
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-ltcaption.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-ltcaption.sty 2017-03-15 21:17:57 UTC (rev 43510)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-ltcaption.sty 2017-03-15 21:18:37 UTC (rev 43511)
@@ -131,6 +131,10 @@
+
+
+
+
\endinput
%%
%% End of file `lwarp-ltcaption.sty'.
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-mcaption.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-mcaption.sty 2017-03-15 21:17:57 UTC (rev 43510)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-mcaption.sty 2017-03-15 21:18:37 UTC (rev 43511)
@@ -128,6 +128,10 @@
+
+
+
+
\endinput
%%
%% End of file `lwarp-mcaption.sty'.
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-mdframed.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-mdframed.sty 2017-03-15 21:17:57 UTC (rev 43510)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-mdframed.sty 2017-03-15 21:18:37 UTC (rev 43511)
@@ -283,6 +283,10 @@
+
+
+
+
\endinput
%%
%% End of file `lwarp-mdframed.sty'.
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-microtype.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-microtype.sty 2017-03-15 21:17:57 UTC (rev 43510)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-microtype.sty 2017-03-15 21:18:37 UTC (rev 43511)
@@ -157,6 +157,10 @@
+
+
+
+
\endinput
%%
%% End of file `lwarp-microtype.sty'.
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-multicol.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-multicol.sty 2017-03-15 21:17:57 UTC (rev 43510)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-multicol.sty 2017-03-15 21:18:37 UTC (rev 43511)
@@ -153,6 +153,10 @@
+
+
+
+
\endinput
%%
%% End of file `lwarp-multicol.sty'.
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-multirow.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-multirow.sty 2017-03-15 21:17:57 UTC (rev 43510)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-multirow.sty 2017-03-15 21:18:37 UTC (rev 43511)
@@ -125,6 +125,10 @@
+
+
+
+
\endinput
%%
%% End of file `lwarp-multirow.sty'.
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-nameref.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-nameref.sty 2017-03-15 21:17:57 UTC (rev 43510)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-nameref.sty 2017-03-15 21:18:37 UTC (rev 43511)
@@ -128,6 +128,10 @@
+
+
+
+
\endinput
%%
%% End of file `lwarp-nameref.sty'.
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-needspace.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-needspace.sty 2017-03-15 21:17:57 UTC (rev 43510)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-needspace.sty 2017-03-15 21:18:37 UTC (rev 43511)
@@ -127,6 +127,10 @@
+
+
+
+
\endinput
%%
%% End of file `lwarp-needspace.sty'.
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-newclude.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-newclude.sty 2017-03-15 21:17:57 UTC (rev 43510)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-newclude.sty 2017-03-15 21:18:37 UTC (rev 43511)
@@ -126,6 +126,10 @@
+
+
+
+
\endinput
%%
%% End of file `lwarp-newclude.sty'.
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-newproject.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-newproject.sty 2017-03-15 21:17:57 UTC (rev 43510)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-newproject.sty 2017-03-15 21:18:37 UTC (rev 43511)
@@ -652,6 +652,8 @@
display: inline-block ; margin: 3ex 1em 3ex 1em ;
}
+figcaption .minipage { margin:0 ; padding: 0 }
+
div.floatrow { text-align: center; }
div.floatrow figure { display: inline-block ; margin: 1ex 2% ; }
@@ -1180,7 +1182,7 @@
border-radius: 1ex ;
}
-figure.figure .minipage { border: none; }
+figure.figure .minipage, figcaption .minipage { border: none; }
div.marginblock div.minipage { border: none; }
@@ -1404,7 +1406,6 @@
.minipage {
background-color: #fffcf5 ;
border: none ;
- margin: 1em ;
}
div.floatrow figure { border: none ; }
@@ -1576,7 +1577,7 @@
-- Print the usage of the lwarpmk command:
-printversion = "v0.23"
+printversion = "v0.24"
function printhelp ()
print ("lwarpmk: Use lwarpmk -h or lwarpmk --help for help.") ;
@@ -2051,6 +2052,10 @@
+
+
+
+
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-newunicodechar.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-newunicodechar.sty 2017-03-15 21:17:57 UTC (rev 43510)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-newunicodechar.sty 2017-03-15 21:18:37 UTC (rev 43511)
@@ -126,6 +126,10 @@
+
+
+
+
\endinput
%%
%% End of file `lwarp-newunicodechar.sty'.
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-nextpage.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-nextpage.sty 2017-03-15 21:17:57 UTC (rev 43510)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-nextpage.sty 2017-03-15 21:18:37 UTC (rev 43511)
@@ -129,6 +129,10 @@
+
+
+
+
\endinput
%%
%% End of file `lwarp-nextpage.sty'.
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-nowidow.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-nowidow.sty 2017-03-15 21:17:57 UTC (rev 43510)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-nowidow.sty 2017-03-15 21:18:37 UTC (rev 43511)
@@ -131,6 +131,10 @@
+
+
+
+
\endinput
%%
%% End of file `lwarp-nowidow.sty'.
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pagenote.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pagenote.sty 2017-03-15 21:17:57 UTC (rev 43510)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pagenote.sty 2017-03-15 21:18:37 UTC (rev 43511)
@@ -130,6 +130,10 @@
+
+
+
+
\endinput
%%
%% End of file `lwarp-pagenote.sty'.
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-parskip.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-parskip.sty 2017-03-15 21:17:57 UTC (rev 43510)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-parskip.sty 2017-03-15 21:18:37 UTC (rev 43511)
@@ -124,6 +124,10 @@
+
+
+
+
\endinput
%%
%% End of file `lwarp-parskip.sty'.
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-placeins.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-placeins.sty 2017-03-15 21:17:57 UTC (rev 43510)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-placeins.sty 2017-03-15 21:18:37 UTC (rev 43511)
@@ -126,6 +126,10 @@
+
+
+
+
\endinput
%%
%% End of file `lwarp-placeins.sty'.
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-ragged2e.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-ragged2e.sty 2017-03-15 21:17:57 UTC (rev 43510)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-ragged2e.sty 2017-03-15 21:18:37 UTC (rev 43511)
@@ -147,6 +147,10 @@
+
+
+
+
\endinput
%%
%% End of file `lwarp-ragged2e.sty'.
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-rotating.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-rotating.sty 2017-03-15 21:17:57 UTC (rev 43510)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-rotating.sty 2017-03-15 21:18:37 UTC (rev 43511)
@@ -137,6 +137,10 @@
+
+
+
+
\endinput
%%
%% End of file `lwarp-rotating.sty'.
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-setspace.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-setspace.sty 2017-03-15 21:17:57 UTC (rev 43510)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-setspace.sty 2017-03-15 21:18:37 UTC (rev 43511)
@@ -154,6 +154,10 @@
+
+
+
+
\endinput
%%
%% End of file `lwarp-setspace.sty'.
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-showkeys.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-showkeys.sty 2017-03-15 21:17:57 UTC (rev 43510)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-showkeys.sty 2017-03-15 21:18:37 UTC (rev 43511)
@@ -126,6 +126,10 @@
+
+
+
+
\endinput
%%
%% End of file `lwarp-showkeys.sty'.
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-sidecap.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-sidecap.sty 2017-03-15 21:17:57 UTC (rev 43510)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-sidecap.sty 2017-03-15 21:18:37 UTC (rev 43511)
@@ -144,6 +144,10 @@
+
+
+
+
\endinput
%%
%% End of file `lwarp-sidecap.sty'.
Added: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-subfig.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-subfig.sty (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-subfig.sty 2017-03-15 21:18:37 UTC (rev 43511)
@@ -0,0 +1,330 @@
+%%
+%% This is file `lwarp-subfig.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx (with options: `subfig')
+%% This is a generated file.
+%% Copyright 2016-2017 Brian Dunn
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+\LWR at ProvidesPackagePass{subfig}
+
+\long\def\sf@@@subfloat#1[#2][#3]#4{%
+\begin{minipage}{\linewidth}% new
+\LWR at stoppars% new
+ \@ifundefined{FBsc at max}{}%
+ {\FB at readaux{\let\FBsuboheight\relax}}%
+ \@tempcnta=\@ne
+ \if at minipage
+ \@tempcnta=\z@
+ \else\ifdim \lastskip=\z@ \else
+ \@tempcnta=\tw@
+ \fi\fi
+ \ifmaincaptiontop
+ \sf at top=\sf at nearskip
+ \sf at bottom=\sf at farskip
+ \else
+ \sf at top=\sf at farskip
+ \sf at bottom=\sf at nearskip
+ \fi
+ \leavevmode
+\setbox\@tempboxa \hbox{#4}%
+ \@tempdima=\wd\@tempboxa
+ \@ifundefined{FBsc at max}{}%
+ {\global\advance\Xhsize-\wd\@tempboxa
+ \dimen@=\ht\@tempboxa
+ \advance\dimen@\dp\@tempboxa
+ \ifdim\dimen@>\FBso at max
+ \global\FBso at max\dimen@
+ \fi}%
+ \vtop\bgroup
+ \vbox\bgroup
+ \ifcase\@tempcnta
+ \@minipagefalse
+ \or
+ \vskip\sf at top
+ \or
+ \ifdim \lastskip=\z@ \else
+ \@tempskipb\sf at top\relax\@xaddvskip
+ \fi
+ \fi
+ \sf at ifpositiontop{%
+ \ifx \@empty#3\relax \else
+ \sf at subcaption{#1}{#2}{#3}%
+ \vskip\sf at capskip
+ \vskip\sf at captopadj
+ \fi\egroup
+ \hrule width0pt height0pt depth0pt
+\LWR at startpars% new
+#4
+\LWR at stoppars% new
+ }{%
+\LWR at startpars% new
+ \@ifundefined{FBsc at max}%
+ {
+#4
+}%
+ {\ifx\FBsuboheight\relax
+#4
+ \else
+#4
+ \fi}%
+\LWR at stoppars% new
+ \egroup
+ \ifx \@empty#3\relax \else
+ \vskip\sf at capskip
+ \hrule width0pt height0pt depth0pt
+ \sf at subcaption{#1}{#2}{#3}%
+ \fi
+ }%
+ \vskip\sf at bottom
+ \egroup
+ \@ifundefined{FBsc at max}{}%
+ {\addtocounter{FRobj}{-1}%
+ \ifnum\c at FRobj=0\else
+ \subfloatrowsep
+ \fi}%
+ \ifmaincaptiontop\else
+ \global\advance\@nameuse{c@\@captype}\m at ne
+ \fi
+\end{minipage}% new
+\LWR at startpars% new
+ \endgroup\ignorespaces%
+}%
+
+\long\def\sf at subcaption#1#2#3{%
+\LWR at stoppars% new
+ \ifx \relax#2\relax \else
+ \bgroup
+ \let\label=\@gobble
+ \let\protect=\string
+ \def\@subcaplabel{%
+ \caption at lstfmt{\@nameuse{p@#1}}{\@nameuse{the#1}}}%
+ \sf at updatecaptionlist{#1}{#2}{\the\value{\@captype}}{\the\value{#1}}%
+ \egroup
+ \fi
+ \bgroup
+ \ifx \relax#3\relax
+ \let\captionlabelsep=\relax
+ \fi
+ \@ifundefined{FBsc at max}%
+{
+\LWR at traceinfo{sfsubcap B1}% new
+\LWR at htmlblocktag{figcaption}% new
+\caption at make
+{\@nameuse{sub\@captype name}}%
+{\@nameuse{thesub\@captype}}%
+{#3}
+\LWR at htmlblocktag{/figcaption}% new
+\LWR at traceinfo{sfsubcap B2}% new
+}%
+ {\dimen@\ht0%
+ \advance\dimen@\dp0%
+ \ifdim\dimen@>\FBsc at max
+ \global\FBsc at max\dimen@
+ \fi
+ \FB at readaux{\let\FBsubcheight\relax}%
+ \ifx\FBsubcheight\relax
+ \def\next{
+}%
+ \else
+ \def\next{
+}%
+ \fi
+ \vbox{%
+
+\LWR at traceinfo{sfsubcap C1}% new
+ \caption at make
+ {\@nameuse{sub\@captype name}}%
+ {\@nameuse{thesub\@captype}}%
+ {#3}
+\LWR at traceinfo{sfsubcap C1}% new
+
+ }
+}%
+ \egroup
+\LWR at startpars% new
+}
+
+\renewcommand\caption@@@make[2]{%
+\LWR at startpars% new
+ \sbox\@tempboxa{#1}%
+ \ifdim\wd\@tempboxa=\z@
+ \let\caption at lsep\relax
+ \fi
+ \caption at ifempty{#2}{%
+ \let\caption at lsep\@empty
+ \let\caption at tfmt\@firstofone
+ }%
+\renewcommand{\@@par}{\LWR at closeparagraph\LWR at orig@@par}% new
+ \caption at applyfont
+ \caption at fmt
+ {\ifcaption at star\else
+ \begingroup
+ \captionlabelfont
+ #1%
+ \endgroup
+ \fi}%
+ {\ifcaption at star\else
+ \begingroup
+ \caption at iflf\captionlabelfont
+ \relax\caption at lsep
+ \endgroup
+ \fi}%
+ {{\captiontextfont
+ \caption at ifstrut
+ {\vrule\@height\ht\strutbox\@width\z@}%
+ {}%
+ \nobreak\hskip\z at skip % enable hyphenation
+ \caption at tfmt{#2}
+\LWR at ensuredoingapar% new
+ \caption at ifstrut
+ {\ifhmode\@finalstrut\strutbox\fi}%
+ {}%
+ \par}}
+\LWR at stoppars% new
+}
+
+\def\subfloat at label{%
+\LWR at ensuredoingapar% new
+ \@ifnextchar(% %) match left parenthesis
+ {\sf at sub@label}
+ {\sf at sub@label(Sub\@captype\space
+ \@ifundefined{thechapter}{}{\@nameuse{thechapter}\space}%
+ \@nameuse{p at sub\@captype}%
+ \@nameuse{thesub\@captype}.)}}
+
+\renewcommand{\sf at subref}[1]{%
+\LWR at subnewref{#1}{sub@#1}%
+}
+\renewcommand{\sf@@subref}[1]{\LWR at origpageref{sub@#1}}
+\let\LWR at orig@newsubfloat\@newsubfloat
+
+\def\@newsubfloat[#1]#2{%
+\LWR at orig@newsubfloat[#1]{#2}%
+\renewcommand{\l at sub#2}[2]{\hypertocfloat{2}{sub#2}{\ext at sub#2}{##1}{##2}}
+}
+\renewcommand{\l at subfigure}[2]{\hypertocfloat{2}{subfigure}{lof}{#1}{#2}}
+\renewcommand{\l at subtable}[2]{\hypertocfloat{2}{subtable}{lot}{#1}{#2}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+\endinput
+%%
+%% End of file `lwarp-subfig.sty'.
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-tabularx.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-tabularx.sty 2017-03-15 21:17:57 UTC (rev 43510)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-tabularx.sty 2017-03-15 21:18:37 UTC (rev 43511)
@@ -96,6 +96,8 @@
+
+
\LWR at ProvidesPackageDrop{tabularx}
\newenvironment{tabularx}[2]
@@ -132,6 +134,8 @@
+
+
\endinput
%%
%% End of file `lwarp-tabularx.sty'.
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-textpos.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-textpos.sty 2017-03-15 21:17:57 UTC (rev 43510)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-textpos.sty 2017-03-15 21:18:37 UTC (rev 43511)
@@ -99,6 +99,8 @@
+
+
\LWR at ProvidesPackageDrop{textpos}
\NewDocumentEnvironment{textblock}{m r()}{}{}
@@ -142,6 +144,8 @@
+
+
\endinput
%%
%% End of file `lwarp-textpos.sty'.
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-threeparttable.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-threeparttable.sty 2017-03-15 21:17:57 UTC (rev 43510)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-threeparttable.sty 2017-03-15 21:18:37 UTC (rev 43511)
@@ -101,6 +101,8 @@
+
+
\LWR at ProvidesPackageDrop{threeparttable}
\newcommand{\LWR at printtablenote}[1]{\InlineClass{tnoteitemheader}{#1}}
@@ -141,6 +143,8 @@
+
+
\endinput
%%
%% End of file `lwarp-threeparttable.sty'.
Added: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-tikz.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-tikz.sty (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-tikz.sty 2017-03-15 21:18:37 UTC (rev 43511)
@@ -0,0 +1,160 @@
+%%
+%% This is file `lwarp-tikz.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx (with options: `tikz')
+%% This is a generated file.
+%% Copyright 2016-2017 Brian Dunn
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+\LWR at ProvidesPackagePass{tikz}
+
+
+\begin{warpHTML}
+
+\newboolean{LWR at tikzbabel}
+
+\@ifpackagelater{tikz}{2013/12/20}% Test for Tikz version v3.0.0
+{
+\usetikzlibrary{babel}
+\booltrue{LWR at tikzbabel}
+}
+{\boolfalse{LWR at tikzbabel}}
+
+\BeforeBeginEnvironment{tikzpicture}{%
+\lateximage%
+\ifbool{LWR at tikzbabel}% Test for Tikz version v3.0.0
+{}%
+{\catcode`\$=3} % dollar sign is math shift
+}
+
+\AfterEndEnvironment{tikzpicture}{%
+\endlateximage%
+\ifbool{LWR at tikzbabel}% Test for Tikz version v3.0.0
+{}%
+{\catcode`\$=\active}%
+}
+
+\end{warpHTML}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+\endinput
+%%
+%% End of file `lwarp-tikz.sty'.
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-titleps.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-titleps.sty 2017-03-15 21:17:57 UTC (rev 43510)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-titleps.sty 2017-03-15 21:18:37 UTC (rev 43511)
@@ -104,6 +104,10 @@
+
+
+
+
\LWR at ProvidesPackageDrop{titleps}
\RenewDocumentCommand{\newpagestyle}{m o m}{}
\RenewDocumentCommand{\renewpagestyle}{m o m}{}
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-titlesec.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-titlesec.sty 2017-03-15 21:17:57 UTC (rev 43510)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-titlesec.sty 2017-03-15 21:18:37 UTC (rev 43511)
@@ -106,6 +106,10 @@
+
+
+
+
\LWR at ProvidesPackageDrop{titlesec}
\newcommand*{\titlelabel}[1]{}
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-titletoc.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-titletoc.sty 2017-03-15 21:17:57 UTC (rev 43510)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-titletoc.sty 2017-03-15 21:18:37 UTC (rev 43511)
@@ -108,6 +108,10 @@
+
+
+
+
\LWR at ProvidesPackageDrop{titletoc}
\NewDocumentCommand{\dottedcontents}{m o m m m}{}
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-titling.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-titling.sty 2017-03-15 21:17:57 UTC (rev 43510)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-titling.sty 2017-03-15 21:18:37 UTC (rev 43511)
@@ -109,6 +109,10 @@
+
+
+
+
\LWR at ProvidesPackagePass{titling}
\let\LWR at orig@bsmtitlempty\@bsmtitlempty
\renewcommand*{\@bsmtitlempty}{%
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-tocloft.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-tocloft.sty 2017-03-15 21:17:57 UTC (rev 43510)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-tocloft.sty 2017-03-15 21:18:37 UTC (rev 43511)
@@ -112,6 +112,10 @@
+
+
+
+
\LWR at ProvidesPackageDrop{tocloft}
\newcommand{\tocloftpagestyle}[1]{}
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-trivfloat.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-trivfloat.sty 2017-03-15 21:17:57 UTC (rev 43510)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-trivfloat.sty 2017-03-15 21:18:37 UTC (rev 43511)
@@ -114,6 +114,10 @@
+
+
+
+
\LWR at ProvidesPackageDrop{trivfloat}
\LWR at origRequirePackage{trivfloat}
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-verse.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-verse.sty 2017-03-15 21:17:57 UTC (rev 43510)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-verse.sty 2017-03-15 21:18:37 UTC (rev 43511)
@@ -114,6 +114,10 @@
+
+
+
+
\LWR at ProvidesPackagePass{verse}
\AfterEndPreamble{
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-wallpaper.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-wallpaper.sty 2017-03-15 21:17:57 UTC (rev 43510)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-wallpaper.sty 2017-03-15 21:18:37 UTC (rev 43511)
@@ -116,6 +116,10 @@
+
+
+
+
\LWR at ProvidesPackageDrop{wallpaper}
\newcommand*{\CenterWallPaper}[2]{}
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-wrapfig.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-wrapfig.sty 2017-03-15 21:17:57 UTC (rev 43510)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-wrapfig.sty 2017-03-15 21:18:37 UTC (rev 43511)
@@ -117,6 +117,10 @@
+
+
+
+
\LWR at ProvidesPackageDrop{wrapfig}
\newlength{\LWR at wrapwidth}
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty 2017-03-15 21:17:57 UTC (rev 43510)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty 2017-03-15 21:18:37 UTC (rev 43511)
@@ -119,6 +119,10 @@
+
+
+
+
\LWR at ProvidesPackagePass{xcolor}
\newcommand*{\LWR at tempcolor}{}
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xfrac.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xfrac.sty 2017-03-15 21:17:57 UTC (rev 43510)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xfrac.sty 2017-03-15 21:18:37 UTC (rev 43511)
@@ -120,6 +120,10 @@
+
+
+
+
\LWR at ProvidesPackagePass{xfrac}
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp.sty 2017-03-15 21:17:57 UTC (rev 43510)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp.sty 2017-03-15 21:18:37 UTC (rev 43511)
@@ -17,7 +17,7 @@
%% version 2005/12/01 or later.
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesPackage{lwarp}
- [2017/03/02 v0.23 Allows LaTeX to directly produce HTML5 output.]
+ [2017/03/15 v0.24 Allows LaTeX to directly produce HTML5 output.]
@@ -171,9 +171,11 @@
\LWR at loadafter{setspace}
\LWR at loadafter{showkeys}
\LWR at loadafter{sidecap}
+\LWR at loadafter{subfig}
\LWR at loadafter{tabularx}
\LWR at loadafter{textpos}
\LWR at loadafter{threeparttable}
+\LWR at loadafter{tikz}
\LWR at loadafter{titleps}
\LWR at loadafter{titlesec}
\LWR at loadafter{titletoc}
@@ -271,7 +273,6 @@
\RequirePackage{caption}
-\RequirePackage{subcaption}
\RequirePackage{enumitem}
\setlist[itemize]{leftmargin=0em}
@@ -654,11 +655,13 @@
\HomeHTMLFileName.html%
}%
{%
-\LWR at traceinfo{LWR at htmlsectionfilename C}%
+\LWR at traceinfo{LWR at htmlsectionfilename C \LWR at tempone}%
\ifthenelse{%
\equal{\HTMLFileName}{} \AND \equal{\LWR at tempone}{Index} \OR \equal{\LWR at tempone}{index}%
}%
-{\_#1.html}%
+{%
+\LWR at traceinfo{prefixing the index name with an underscore.}%
+\_#1.html}%
{\HTMLFileName#1.html}%
}%
\LWR at traceinfo{LWR at htmlsectionfilename Z}%
@@ -1597,6 +1600,7 @@
\let\tabular\LWR at tabular
\let\endtabular\endLWR at tabular
\let\LWR at origcaption\caption
+\let\LWR at origltx@label\ltx at label
\let\ltx at label\LWR at htmlmathlabel
\let\TeX\LWR at TeX
\let\LaTeX\LWR at LaTeX
@@ -2517,10 +2521,11 @@
{% not at the left edge:
\LWR at traceinfo{not at the left edge}%
\LWR at setexparray{LWR at colatspec}{\theLWR at tabletotalcols}{\LWR at strresult}%
-\LWR at traceinfo{at \theLWR at tabletotalcols: \LWR at colatspec(\theLWR at tabletotalcols)!}%
-}%
+\LWR at traceinfo{at \theLWR at tabletotalcols: %
+ \LWR at getexparray{LWR at colatspec}{\theLWR at tabletotalcols})!}%
\let\LWR at strresult\relax%
\booltrue{LWR at validtablecol}%
+}%
}
\newcommand*{\LWR at parsebangcolumn}{%
\LWR at traceinfo{bang column}%
@@ -3040,9 +3045,7 @@
\LWR at spref{#1}{zLWR at name}%
}
\newcommand*{\LWR at htmlfileref}[1]{%
-\LWR at traceinfo{LWR at htmlfileref A: !#1!}%
\LWR at spref{#1}{zLWR at htmlfilenumber}%
-\LWR at traceinfo{LWR at htmlfileref B}%
}
\newcommand*{\LWR at lateximagedepthref}[1]{%
\LWR at spref{#1}{zLWR at lateximagedepth}%
@@ -3076,67 +3079,63 @@
}% pars not allowed
}% not lateximage
}
-
-\newcommand*{\LWR at sublabel}[1]{%
-\LWR at traceinfo{LWR at sublabel: !#1!}%
+\newcommand*{\LWR at newlabel}[1]{%
+\LWR at traceinfo{LWR at newlabel: !#1!}%
\LWR at origlabel{#1}%
-\LWR at traceinfo{about to splabel}%
-\LWR at traceinfo{filesectionnames is \ifbool{FileSectionNames}{true}{false}}%
-\LWR at traceinfo{LWR at thisfilename is !\LWR at thisfilename!}%
-\LWR at traceinfo{LWR at htmlfilenumber is \theLWR at htmlfilenumber}%
+\LWR at traceinfo{LWR at newlabel: filesectionnames is \ifbool{FileSectionNames}{true}{false}}%
+\LWR at traceinfo{LWR at newlabel: LWR at thisfilename is !\LWR at thisfilename!}%
+\LWR at traceinfo{LWR at newlabel: LWR at htmlfilenumber is \theLWR at htmlfilenumber}%
\LWR at splabel{#1}%
\LWR at subsublabel{#1}%
-\LWR at traceinfo{finished with LWR at sublabel}%
+\LWR at traceinfo{LWR at newlabel: done}%
}
-\newcommand*{\LWR at newlabel}[1]{%
-\LWR at traceinfo{lwr at newlabel: !#1!}%
-\LWR at sublabel{#1}%
-\LWR at traceinfo{lwr at newlabel: done}%
-}
\newcommand*{\LWR at startref}[1]
{%
\edef\LWR at lidref{\LWR at lateximagedepthref{#1}}
-\LWR at traceinfo{***LWR at startref A: !#1!}%
+\LWR at traceinfo{LWR at startref A: !#1!}%
\LWR at htmltag{a href="%
-\LWR at traceinfo{***LWR at startref B}%
+\LWR at traceinfo{LWR at startref B}%
\LWR at htmlrefsectionfilename{#1}%
-\LWR at traceinfo{***LWR at startref C}%
+\LWR at traceinfo{LWR at startref C}%
\#%
-\LWR at traceinfo{***LWR at startref D: !#1!}%
+\LWR at traceinfo{LWR at startref D: !#1!}%
\ifthenelse{\equal{\LWR at lidref}{??}}%
-{??}%
{%
-\LWR at traceinfo{***LWR at startref D1}%
-\LWR at traceinfo{***depthref is \LWR at lidref}%
+\LWR at traceinfo{LWR at startref D0: ??}
+??}%
+{%
+\LWR at traceinfo{LWR at startref D1: \LWR at lidref}%
\ifthenelse{\cnttest{\LWR at lidref}{>}{0}}%
{%
-\LWR at traceinfo{***LWR at startref D2}%
+\LWR at traceinfo{LWR at startref D2: \LWR at lidref}%
lateximage\LWR at lateximagenumberref{#1}%
}%
{%
-\LWR at traceinfo{***LWR at startref D3}%
+\LWR at traceinfo{LWR at startref D3}%
#1%
}%
}%
-\LWR at traceinfo{***LWR at startref E}%
+\LWR at traceinfo{LWR at startref E}%
"{}}%
-\LWR at traceinfo{***LWR at startref F}%
+\LWR at traceinfo{LWR at startref F}%
}
+\NewDocumentCommand{\LWR at subnewref}{m m}{%
+\LWR at traceinfo{LWR at subnewref #1 #2}%
+\LWR at startref{#1}%
+\LWR at origref{#2}%
+\LWR at htmltag{/a}%
+}
+
\NewDocumentCommand{\LWR at newref}{s m}{%
\LWR at traceinfo{LWR at newref #2}%
\IfBooleanTF{#1}%
{\LWR at origref{#2}}%
-{%
-\LWR at startref{#2}%
-\LWR at origref{#2}%
-\LWR at htmltag{/a}%
-}%
+{\LWR at subnewref{#2}{#2}}%
}
-
\newcommand*{\pagerefPageFor}{see }
\NewDocumentCommand{\LWR at newpageref}{s m}{%
\IfBooleanTF{#1}%
@@ -3279,6 +3278,7 @@
\begingroup%
\renewcommand{\@@par}{\LWR at closeparagraph\LWR at orig@@par}%
\RenewDocumentEnvironment{minipage}{O{t} o O{t} m}{}{}%
+\RenewDocumentCommand{\parbox}{O{t} o O{t} m +m}{##5}%
\LWR at htmlblocktag{figcaption}%
\LWR at origcaption@begin%
}
@@ -3292,8 +3292,10 @@
\LWR at traceinfo{LWR at caption@end: done}%
}
+\AtBeginDocument{
\let\caption at begin\LWR at caption@begin
\let\caption at end\LWR at caption@end
+}
\let\LWR at origcaptionlistentry\captionlistentry
@@ -3434,33 +3436,46 @@
\ifthenelse{\cnttest{#1}{<=}{\value{tocdepth}}}{%
\LWR at startpars%
\LWR at subhyperrefclass{%
-\LWR at htmlrefsectionfilename{autopage-#4}\#autosec-#4}{#3}{#2}%
+\LWR at htmlrefsectionfilename{autopage-#4}\#autosec-#4}{#3}{toc#2}%
\LWR at stoppars%
}
{}
}
+\newcounter{lofdepth}
+\setcounter{lofdepth}{1}
-\newcommand{\hypertocfloat}[4]{%
+\newcounter{lotdepth}
+\setcounter{lotdepth}{1}
+
+\newcommand{\hypertocfloat}[5]{%
\LWR at startpars
+\@ifundefined{c@#3depth}{%
+\newcounter{#3depth}%
+\setcounter{#3depth}{1}%
+}{}%
+\LWR at traceinfo{hypertocfloat depth is #1 #3depth is \arabic{#3depth}}%
+\ifthenelse{\cnttest{#1}{<=}{\arabic{#3depth}}}{%
+\LWR at startpars%
\LWR at subhyperrefclass{%
\LWR at htmlrefsectionfilename{autopage-\arabic{LWR at nextautopage}}%
\#autofloat-\arabic{LWR at nextautofloat}}%
-{#3}{#2}%
+{#4}{toc#2}%
\LWR at stoppars%
+}{}%
}
-\renewcommand{\l at part}[2]{\hypertoc{-1}{tocpart}{#1}{#2}}
+\renewcommand{\l at part}[2]{\hypertoc{-1}{part}{#1}{#2}}
\DeclareDocumentCommand{\l at chapter}{m m}
-{\hypertoc{0}{tocchapter}{#1}{#2}}
-\renewcommand{\l at section}[2]{\hypertoc{1}{tocsection}{#1}{#2}}
-\renewcommand{\l at subsection}[2]{\hypertoc{2}{tocsubsection}{#1}{#2}}
+{\hypertoc{0}{chapter}{#1}{#2}}
+\renewcommand{\l at section}[2]{\hypertoc{1}{section}{#1}{#2}}
+\renewcommand{\l at subsection}[2]{\hypertoc{2}{subsection}{#1}{#2}}
\renewcommand{\l at subsubsection}[2]
-{\hypertoc{3}{tocsubsubsection}{#1}{#2}}
-\renewcommand{\l at paragraph}[2]{\hypertoc{4}{tocparagraph}{#1}{#2}}
-\renewcommand{\l at subparagraph}[2]{\hypertoc{5}{tocsubparagraph}{#1}{#2}}
-\renewcommand{\l at figure}[2]{\hypertocfloat{1}{tocfigure}{#1}{#2}}
-\renewcommand{\l at table}[2]{\hypertocfloat{1}{toctable}{#1}{#2}}
+{\hypertoc{3}{subsubsection}{#1}{#2}}
+\renewcommand{\l at paragraph}[2]{\hypertoc{4}{paragraph}{#1}{#2}}
+\renewcommand{\l at subparagraph}[2]{\hypertoc{5}{subparagraph}{#1}{#2}}
+\renewcommand{\l at figure}[2]{\hypertocfloat{1}{figure}{lof}{#1}{#2}}
+\renewcommand{\l at table}[2]{\hypertocfloat{1}{table}{lot}{#1}{#2}}
\end{warpHTML}
@@ -3670,15 +3685,19 @@
\newbool{LWR at amsmultline}
\boolfalse{LWR at amsmultline}
-
\newcommand*{\LWR at htmlmathlabel}[1]{%
\LWR at traceinfo{LWR at htmlmathlabel #1}%
\ifbool{mathjax}{%
\text{
\ifbool{LWR at amsmultline}{}{\hspace*{\totwidth@}}
-\LWR at htmlclosecomment\LWR at sublabel{\@firstofone#1}\LWR at htmlopencomment}%
+\LWR at htmlclosecomment%
+\LWR at origltx@label{#1}%
+\LWR at htmlopencomment%
+}% text
+}% mathjax
+{%
+\LWR at origltx@label{#1}%
}%
-{\LWR at sublabel{\@firstofone#1}}%
}
\newcommand*{\LWR at beginhideamsmath}{
@@ -4367,6 +4386,7 @@
\renewcommand{\@@setcpagerefrange}[3]{%
#1{\cpagerefFor\ \cref{#2}}{\cref{#3}}{}{}{}{}}
+}% AfterEndPreamble
\let\LWR at origlabel\label
\let\label\LWR at newlabel
@@ -4375,61 +4395,21 @@
\let\LWR at origpageref\pageref
\let\pageref\LWR at newpageref
-}% AfterEndPreamble
-
\end{warpHTML}
-
\begin{warpHTML}
-\BeforeBeginEnvironment{picture}{
+\BeforeBeginEnvironment{picture}{\lateximage}
-\lateximage}
+\AfterEndEnvironment{picture}{\endlateximage}
-\AfterEndEnvironment{picture}{\endlateximage
-
-}
-
\end{warpHTML}
-
\begin{warpHTML}
-\newbool{LWR at tikzbabel}
-\boolfalse{LWR at tikzbabel}
-\AtBeginDocument{
-\@ifpackageloaded{tikz}{
-\@ifpackagelater{tikz}{2013/12/20}% Test for Tikz version v3.0.0
-{\booltrue{LWR at tikzbabel}}
-{\boolfalse{LWR at tikzbabel}}
-}{}
-}
-
-\BeforeBeginEnvironment{tikzpicture}{%
-
-\lateximage
-\ifbool{LWR at tikzbabel}
-{}
-{\catcode`\$=3} % dollar sign is math shift
-}
-
-\AfterEndEnvironment{tikzpicture}{%
-\endlateximage
-
-\ifbool{LWR at tikzbabel}
-{}
-{\catcode`\$=\active}
-}
-
-\end{warpHTML}
-
-
-\begin{warpHTML}
-
-
\newcounter{LWR at minipagedepth}
\setcounter{LWR at minipagedepth}{0}
@@ -4490,7 +4470,7 @@
\boolfalse{LWR at minipagethispar}
\RenewDocumentEnvironment{minipage}{O{t} o O{t} m}
{%
-\LWR at traceinfo{starting minipage}%
+\LWR at traceinfo{starting minipage of width #4}%
\uselengthunit{in}%
\setlength{\LWR at minipagewidth}{#4}%
\ifthenelse{\cnttest{\value{LWR at minipagedepth}}{=}{0}}{%
@@ -4499,6 +4479,7 @@
\setlength{\textwidth}{6in}%
\setlength{\textheight}{9in}%
}{}%
+\LWR at traceinfo{computed width is \rndprintlength{\LWR at minipagewidth}}
\addtocounter{LWR at minipagedepth}{1}%
\setlength{\LWR at minipageheight}{\textheight}% default unless specified
\IfValueTF{#2}{\setlength{\LWR at minipageheight}{#2}}{}%
@@ -4512,7 +4493,7 @@
\ifthenelse{\equal{#3}{c}}{justify-content: center ; }{}%
\ifthenelse{\equal{#3}{b}}{justify-content: flex-end ; }{}%
\ifthenelse{\equal{#3}{s}}{justify-content: space-between ; }{}%
-\LWR at traceinfo{minipage: about to print the width}%
+\LWR at traceinfo{minipage: about to print the width of \rndprintlength{\LWR at minipagewidth}}%
\uselengthunit{PT}%
\ifbool{LWR at minipagefullwidth}%
{\boolfalse{LWR at minipagefullwidth}}%
@@ -4546,8 +4527,9 @@
\LWR at startpars%
\global\booltrue{LWR at minipagethispar}%
}
-\RenewDocumentCommand{\parbox}{O{t} o O{t} m m}
+\RenewDocumentCommand{\parbox}{O{t} o O{t} m +m}
{
+\LWR at traceinfo{parbox of width #4}%
\begin{minipage}[#1][#2][#3]{#4}
#5
\end{minipage}
@@ -4714,9 +4696,11 @@
\newlength{\LWR at tempheight}
\newlength{\LWR at tempraise}
-
\NewDocumentCommand{\LWR at hspace}{s m}{%
\setlength{\LWR at tempwidth}{#2}%
+\ifnum\gluestretchorder\LWR at tempwidth>0%
+\setlength{\LWR at tempwidth}{2em}%
+\fi%
\ifthenelse{\dimtest{\LWR at tempwidth}{=}{0pt}}{}{%
\LWR at minipagestoppars%
\ifthenelse{\dimtest{\LWR at tempwidth}{=}{.16667em}}
@@ -4935,6 +4919,10 @@
+
+
+
+
More information about the tex-live-commits
mailing list