texlive[45054] trunk: lwarp (17aug17)
commits+karl at tug.org
commits+karl at tug.org
Thu Aug 17 23:15:44 CEST 2017
Revision: 45054
http://tug.org/svn/texlive?view=revision&revision=45054
Author: karl
Date: 2017-08-17 23:15:43 +0200 (Thu, 17 Aug 2017)
Log Message:
-----------
lwarp (17aug17)
Modified Paths:
--------------
trunk/Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua
trunk/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.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-amsthm.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-endnotes.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fancybox.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyvrb.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-floatrow.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-footnote.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-framed.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-mdframed.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-ntheorem.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-rotfloat.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-sidenotes.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-subfig.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-theorem.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-threeparttable.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.sty
Added Paths:
-----------
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-transparent.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-upref.sty
Modified: trunk/Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua
===================================================================
--- trunk/Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua 2017-08-17 00:17:55 UTC (rev 45053)
+++ trunk/Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua 2017-08-17 21:15:43 UTC (rev 45054)
@@ -4,7 +4,7 @@
-- Print the usage of the lwarpmk command:
-printversion = "v0.35"
+printversion = "v0.36"
function printhelp ()
print ("lwarpmk: Use lwarpmk -h or lwarpmk --help for help.") ;
@@ -190,8 +190,8 @@
local fsource = io.open(filesource)
for line in fsource:lines() do
if ( string.find(line,"Rerun to get") ~= nil ) then
-io.close(fsource)
-return true
+ io.close(fsource)
+ return true
end
end
io.close(fsource)
Modified: trunk/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
===================================================================
--- trunk/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl 2017-08-17 00:17:55 UTC (rev 45053)
+++ trunk/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl 2017-08-17 21:15:43 UTC (rev 45054)
@@ -1,5 +1,5 @@
#!/usr/bin/env perl
-# $Id: tlmgr.pl 44958 2017-08-05 09:14:35Z hironobu $
+# $Id: tlmgr.pl 45046 2017-08-15 06:29:03Z preining $
#
# Copyright 2008-2017 Norbert Preining
# This file is licensed under the GNU General Public License version 2
@@ -6,8 +6,8 @@
# or any later version.
#
-my $svnrev = '$Revision: 44958 $';
-my $datrev = '$Date: 2017-08-05 11:14:35 +0200 (Sat, 05 Aug 2017) $';
+my $svnrev = '$Revision: 45046 $';
+my $datrev = '$Date: 2017-08-15 08:29:03 +0200 (Tue, 15 Aug 2017) $';
my $tlmgrrevision;
my $prg;
if ($svnrev =~ m/: ([0-9]+) /) {
@@ -531,7 +531,7 @@
# --machine-readable is only supported by update.
if ($::machinereadable &&
- $action ne "update" && $action ne "install" && $action ne "option") {
+ $action ne "update" && $action ne "install" && $action ne "option" && $action ne "shell") {
tlwarn("$prg: --machine-readable output not supported for $action\n");
}
@@ -3473,7 +3473,7 @@
# warn if nothing is updated. Unless they said --self, in which case
# we've already reported it.
if (!(@new || @updated) && ! $opts{"self"}) {
- info("$prg: no updates available\n");
+ info("$prg: no updates available\n") if (!$::machinereadable);
if ($remotetlpdb->media ne "NET"
&& $remotetlpdb->media ne "virtual"
&& !$opts{"dry-run"}
@@ -5872,6 +5872,8 @@
sub action_shell {
my $protocol = 1;
my $default_prompt = "tlmgr>";
+ # set auto flush unconditionally in action shell
+ $| = 1;
# we need to do an anonymous sub here otherwise the $default_prompt will get
# only fixed once and remain forever. With anonymous subs it is rebound
# on every call!
@@ -5884,8 +5886,11 @@
my $did_prompt = 0;
while (defined(my $arg = shift @_)) {
if ($arg =~ m/^-prompt$/) {
- print shift @_, " ";
- $did_prompt = 1;
+ # only do allow for prompt rewriting in case of ! machine readable!
+ if (!$::machinereadable) {
+ print shift @_, " ";
+ $did_prompt = 1;
+ }
} elsif ($arg =~ m/^-menu$/) {
my $options = shift @_;
@options = @$options;
@@ -5901,11 +5906,17 @@
} elsif ($arg =~ m/^-/) {
print "ERROR unsupported prompt command, please report: $arg!\n";
} else {
- print $arg, " ";
- $did_prompt = 1;
+ # only do allow for prompt rewriting in case of ! machine readable!
+ if (!$::machinereadable) {
+ print $arg, " ";
+ $did_prompt = 1;
+ }
}
}
print "$default_prompt " if (!$did_prompt);
+ # to make sure that flushing is done properly, we ship out
+ # a new line in buffer mode:
+ print "\n" if $::machinereadable;
my $ans = <STDIN>;
if (!defined($ans)) {
# we got Ctrl-D, just break out
@@ -5931,6 +5942,7 @@
}
if (!$isok) {
print("Please answer one of: @guarantee\n");
+ print "\n" if $::machinereadable;
return(&$do_prompt(@savedargs));
}
}
@@ -6308,7 +6320,11 @@
$remotetlpdb->virtual_pinning($pinfile);
# this "location-url" line should not be changed since GUI programs
# depend on it:
- print "location-url\t$locstr\n" if $::machinereadable;
+ if ($::machinereadable) {
+ print "location-url\t$locstr\n";
+ return 1;
+ }
+ # from here on only in non-machine-readable mode!
info("$prg: package repositories\n");
my $verstat = "";
if (!$remotetlpdb->virtual_get_tlpdb('main')->is_verified) {
@@ -8917,7 +8933,7 @@
distribution (L<http://tug.org/texlive>) and both are licensed under the
GNU General Public License Version 2 or later.
-$Id: tlmgr.pl 44958 2017-08-05 09:14:35Z hironobu $
+$Id: tlmgr.pl 45046 2017-08-15 06:29:03Z preining $
=cut
# to remake HTML version: pod2html --cachedir=/tmp tlmgr.pl >/tmp/tlmgr.html
Modified: trunk/Master/texmf-dist/doc/latex/lwarp/README.txt
===================================================================
--- trunk/Master/texmf-dist/doc/latex/lwarp/README.txt 2017-08-17 00:17:55 UTC (rev 45053)
+++ trunk/Master/texmf-dist/doc/latex/lwarp/README.txt 2017-08-17 21:15:43 UTC (rev 45054)
@@ -1,5 +1,5 @@
-LaTeX lwarp package v0.35 README.txt
+LaTeX lwarp package v0.36 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-08-17 00:17:55 UTC (rev 45053)
+++ trunk/Master/texmf-dist/scripts/lwarp/lwarpmk.lua 2017-08-17 21:15:43 UTC (rev 45054)
@@ -4,7 +4,7 @@
-- Print the usage of the lwarpmk command:
-printversion = "v0.35"
+printversion = "v0.36"
function printhelp ()
print ("lwarpmk: Use lwarpmk -h or lwarpmk --help for help.") ;
@@ -190,8 +190,8 @@
local fsource = io.open(filesource)
for line in fsource:lines() do
if ( string.find(line,"Rerun to get") ~= nil ) then
-io.close(fsource)
-return true
+ io.close(fsource)
+ return true
end
end
io.close(fsource)
Modified: trunk/Master/texmf-dist/source/latex/lwarp/lwarp.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/lwarp/lwarp.dtx 2017-08-17 00:17:55 UTC (rev 45053)
+++ trunk/Master/texmf-dist/source/latex/lwarp/lwarp.dtx 2017-08-17 21:15:43 UTC (rev 45054)
@@ -16,7 +16,7 @@
% \iffalse
%<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
%<package>\ProvidesPackage{lwarp}
-%<package> [2017/08/08 v0.35 Allows LaTeX to directly produce HTML5 output.]
+%<package> [2017/08/17 v0.36 Allows LaTeX to directly produce HTML5 output.]
%
%<*driver>
\documentclass{ltxdoc}
@@ -55,6 +55,8 @@
\newunicodechar{ô}{\^{o}}
\newunicodechar{Ô}{\^{O}}
\newunicodechar{ê}{\^{e}}
+\newunicodechar{Ω}{\textohm}
+\newunicodechar{μ}{\textmu}
\usepackage[log-declarations=false]{xparse}
@@ -104,10 +106,10 @@
\usepackage{titleps}
\newpagestyle{pageheadfoot}{
- \headrule
- \sethead{\pkg{lwarp}}{}{\thepage}
+ \headrule
+ \sethead{\pkg{lwarp}}{}{\thepage}
% \renewcommand{\makefootrule}{\rule[2.5ex]{\linewidth}{.4pt}}
- \setfoot{}{}{}
+ \setfoot{}{}{}
}
\pagestyle{pageheadfoot}
@@ -494,43 +496,43 @@
\DescribeProgram{MathJax}
\begin{itemize}
\item In document classes which have chapters,
- \margintag{chapter numbers}%
- \index{MathJax>tagged equations}%
- \index{tagged equations>Mathjax}%
- \cs{tag}ged equations have the chapter number prepended in \HTML\ output, unlike \LaTeX.
- \cs{tag*} equations (correctly) do not.
- This may be improved with future versions of the MathJax support script.
+ \margintag{chapter numbers}%
+ \index{MathJax>tagged equations}%
+ \index{tagged equations>Mathjax}%
+ \cs{tag}ged equations have the chapter number prepended in \HTML\ output, unlike \LaTeX.
+ \cs{tag*} equations (correctly) do not.
+ This may be improved with future versions of the MathJax support script.
- \href{https://groups.google.com/forum/\#!topic/mathjax-users/jUtewUcE2bY}
- {\texttt{https://groups.google.com/forum/\#!topic/\\
- \hspace*{2em}mathjax-users/jUtewUcE2bY}}
+ \href{https://groups.google.com/forum/\#!topic/mathjax-users/jUtewUcE2bY}
+ {\texttt{https://groups.google.com/forum/\#!topic/\\
+ \hspace*{2em}mathjax-users/jUtewUcE2bY}}
\item MathJax itself does not support subequations.
- \margintag{subequations}
+ \margintag{subequations}
\index{MathJax>subequations}%
\index{subequations>MathJax}%
- This may be improved by parsing the \LaTeX{}
- math expression to manually insert tags, but this has not yet been done.
+ This may be improved by parsing the \LaTeX{}
+ math expression to manually insert tags, but this has not yet been done.
\item Footnotes inside equations are not yet supported while using MathJax.
- \margintag{footnotes in math}
+ \margintag{footnotes in math}
\item Math appearing inside a lateximage,
- \margintag{lateximage}
- and therefore also inside a \tikz{} or \env{picture}
- environment, is rendered as SVG math even if MathJax is used in the rest of the document.
+ \margintag{lateximage}
+ and therefore also inside a \tikz{} or \env{picture}
+ environment, is rendered as SVG math even if MathJax is used in the rest of the document.
\item Usage of \pkg{siunitx} inside a math equation
- \margintag{siunitx}
- is supported via a third-party MathJax extension.
- While inside a math expression, do not use \cs{SI} or \cs{si} inside \cs{text},
- where it will be rendered as normal text.
- \watchout[siunitx inside an equation]
+ \margintag{siunitx}
+ is supported via a third-party MathJax extension.
+ While inside a math expression, do not use \cs{SI} or \cs{si} inside \cs{text},
+ where it will be rendered as normal text.
+ \watchout[siunitx inside an equation]
- \href{https://github.com/mathjax/MathJax-third-party-extensions/tree/master/siunitx}
- {\texttt{https://github.com/mathjax/MathJax-third-party-extensions/\\
- \hspace*{2em}tree/master/siunitx}}
+ \href{https://github.com/mathjax/MathJax-third-party-extensions/tree/master/siunitx}
+ {\texttt{https://github.com/mathjax/MathJax-third-party-extensions/\\
+ \hspace*{2em}tree/master/siunitx}}
\item MathJax does not automatically support custom \LaTeX{} macros,
- \margintag{\LaTeX{} macros}
- but they may be set up by the user.
+ \margintag{\LaTeX{} macros}
+ but they may be set up by the user.
\end{itemize}
}
@@ -637,8 +639,24 @@
}
\newcommand{\limitsxcolor}{%
+\cs{colorboxBlock} and \cs{fcolorboxBlock} are provided for
+\margintag{\cs{colorboxBlock} and \cs{fcolorboxBlock}}
+increased \HTML\ compatibility, and they are identical to
+\cs{colorbox} and \cs{fcolorbox} in print mode. In \HTML\ mode
+they place their contents into a \element{div} instead of a \element{span}.
+These \element{div}s are set to \attribute{display:~inline-block} so
+adjacent \cs{colorboxBlock}s appear side-by-side in \HTML, although
+text is placed before or after each.
+
+Print-mode definitions for \cs{colorboxBlock} and \cs{fcolorboxBlock}
+are created by \pkg{lwarp}'s core if \pkg{xcolor} is loaded.
+
+\cs{fcolorbox} and \cs{fcolorboxBlock} allow a background color of \texttt{none},
+\margintag{background: \texttt{none}}
+in which case only the frame is drawn, which can be useful for \HTML.
+
Color definitions, models, and mixing are fully supported
-\margintag{support}
+\margintag{color support}
without any changes required.
Colored tables are ignored so far. Use \CSS\ to style tables.
@@ -655,93 +673,93 @@
\newcommand{\limitstabular}{%
\begin{itemize}
\item When defining environments or macros which include \env{tabular}
- plus\watchout[misplaced alignment alignment tab character \&]
- \index{alignment tab character \&, misplaced}
- \index{misplaced alignment tab character \&}
- instances of the \texttt{\&} character, it may be
- necessary to make \texttt{\&} active before the environment or macro is defined,
- then restore \texttt{\&} to its default catcode after, using the following commands:
- \begin{sourcedisplay}
- \cs{StartDefiningTabulars} \\
- <define macros or environments using \env{tabular} and \texttt{\&} here> \\
- \cs{EndDefiningTabulars}
- \end{sourcedisplay}
+ plus\watchout[misplaced alignment alignment tab character \&]
+ \index{alignment tab character \&, misplaced}
+ \index{misplaced alignment tab character \&}
+ instances of the \texttt{\&} character, it may be
+ necessary to make \texttt{\&} active before the environment or macro is defined,
+ then restore \texttt{\&} to its default catcode after, using the following commands:
+ \begin{sourcedisplay}
+ \cs{StartDefiningTabulars} \\
+ <define macros or environments using \env{tabular} and \texttt{\&} here> \\
+ \cs{EndDefiningTabulars}
+ \end{sourcedisplay}
\item Vertical rules are not yet supported.
- \margintag{column types}
+ \margintag{column types}
\item \texttt{*} in a column specification is not used (so far).
- Repeat the column type the correct number of times.
+ Repeat the column type the correct number of times.
\item Only one each of \texttt{@}, \texttt{!}, \texttt{>}, and \texttt{<}
- may be used at each column, and they are used in that order.
+ may be used at each column, and they are used in that order.
\item \cs{newcolumntype} is ignored; unknown column types are set to \texttt{l}.
\item \pkg{tabularx} ignores the width, but \texttt{X} columns do produce paragraph
- columns or multicolumns.
+ columns or multicolumns.
\item Multirow and multicolumn cannot be used at the same time.
- \watchout[\cs{multirow} \& \cs{multicolumn}]
- (No rectangular holes wider than one column or taller than one row.)
+ \watchout[\cs{multirow} \& \cs{multicolumn}]
+ (No rectangular holes wider than one column or taller than one row.)
\item For multirow, insert \cs{mrowcell} into any empty multi-row cells.
- This will be a null function for the print output, and is a placeholder for
- \watchout[\cs{multirow}]
- parsing the table for \HTML\ output.
+ This will be a null function for the print output, and is a placeholder for
+ \watchout[\cs{multirow}]
+ parsing the table for \HTML\ output.
\item If a multirow reaches to the bottom of a table,
- and \cs{bottomrule} does not go over to that edge,
- \margintag{\cs{multirow} with rules}
- try adding a line of empty cells below the \cs{bottomrule}.
- This may be a browser bug.
- \changes{v0.19}{2016/05/28}{Docs: \env{multirow} browser bug workaround.}
+ and \cs{bottomrule} does not go over to that edge,
+ \margintag{\cs{multirow} with rules}
+ try adding a line of empty cells below the \cs{bottomrule}.
+ This may be a browser bug.
+ \changes{v0.19}{2016/05/28}{Docs: \env{multirow} browser bug workaround.}
\item If a \cs{midrule} is desired after the last row,
- \margintag{rule at last row}
- an additional row of blank cells must be used.
+ \margintag{rule at last row}
+ an additional row of blank cells must be used.
\item Multiple paragraphs in one cell of a p, b, m column
- must have \cs{newline} between paragraphs.
- \watchout[paragraphs]
+ must have \cs{newline} between paragraphs.
+ \watchout[paragraphs]
\item \cs{cmidrule} does not support width or trim options
- due to \CSS\ limitations.
- \margintag{\cs{cmidrule} width, trim}
+ due to \CSS\ limitations.
+ \margintag{\cs{cmidrule} width, trim}
\item \cs{cmidrule} borders are generated by the individual cells
- \margintag{\cs{cmidrule} and \cs{multicolumn}}
- on the following row,
- and so do not necessarily work correctly when the following row
- has \cs{multicolumn} cells below \cs{cmidrule} borders.
+ \margintag{\cs{cmidrule} and \cs{multicolumn}}
+ on the following row,
+ and so do not necessarily work correctly when the following row
+ has \cs{multicolumn} cells below \cs{cmidrule} borders.
\item For \pkg{longtable}, place headings and footings which
- \margintag{\env{longtable} headings}
- do not apply to \HTML\ inside \cs{warpprintonly\{\}}.
+ \margintag{\env{longtable} headings}
+ do not apply to \HTML\ inside \cs{warpprintonly\{\}}.
\item For \cs{toprule} and \cs{bottomrule},
- when combined with a \env{warpprint} or \env{warpHTML} environment,
- \watchout[\cs{warpprintonly}]
- if a ``misplaced \cs{noalign}'' error occurs,
- change \\
- \hspace*{.375in}\cmds{This \& That \cs{endhead}} \\
- to \\
- \hspace*{.375in}\cmds{\cs{warpprintonly}\{This \& That \cs{endhead}\}} \\
- and likewise with the other \cs{end} headings.
- Keep the \cs{endfirsthead} row unchanged, as it is still relevent to \HTML\ output.
+ when combined with a \env{warpprint} or \env{warpHTML} environment,
+ \watchout[\cs{warpprintonly}]
+ if a ``misplaced \cs{noalign}'' error occurs,
+ change \\
+ \hspace*{.375in}\cmds{This \& That \cs{endhead}} \\
+ to \\
+ \hspace*{.375in}\cmds{\cs{warpprintonly}\{This \& That \cs{endhead}\}} \\
+ and likewise with the other \cs{end} headings.
+ Keep the \cs{endfirsthead} row unchanged, as it is still relevent to \HTML\ output.
\item For S columns (from the \pkg{siunitx} package),
- \watchout[S columns]
- while producing print output,
- anything non-numeric must be placed
- inside \{ \} braces, including commands such as \cs{multirow}.
- While producing \HTML\ output, though, anything placed inside
- braces is not seen by \pkg{lwarp}'s tabular handling algorithm.
- To resolve this problem, make a copy of the row, with one version
- for print output, containing the extra braces, and another version
- for \HTML\ output, without the extra braces, such as: \\
- \hspace*{.375in} \cs{warpprintonly}\{\texttt{1 \& 2 \& \textcolor{red}{\{}\cs{multirow}\{2\}\{2cm\}\{Text\}\textcolor{red}{\}} \& 3 \textbackslash\textbackslash\}} \\
- \hspace*{.375in} \cs{warpHTMLonly}\{\texttt{1 \& 2 \& \cs{multirow}\{2\}\{2cm\}\{Text\} \& 3 \textbackslash\textbackslash\}}
+ \watchout[S columns]
+ while producing print output,
+ anything non-numeric must be placed
+ inside \{ \} braces, including commands such as \cs{multirow}.
+ While producing \HTML\ output, though, anything placed inside
+ braces is not seen by \pkg{lwarp}'s tabular handling algorithm.
+ To resolve this problem, make a copy of the row, with one version
+ for print output, containing the extra braces, and another version
+ for \HTML\ output, without the extra braces, such as: \\
+ \hspace*{.375in} \cs{warpprintonly}\{\texttt{1 \& 2 \& \textcolor{red}{\{}\cs{multirow}\{2\}\{2cm\}\{Text\}\textcolor{red}{\}} \& 3 \textbackslash\textbackslash\}} \\
+ \hspace*{.375in} \cs{warpHTMLonly}\{\texttt{1 \& 2 \& \cs{multirow}\{2\}\{2cm\}\{Text\} \& 3 \textbackslash\textbackslash\}}
\end{itemize}
}
@@ -751,13 +769,13 @@
not used for \HTML, and these rows should be disabled.
\watchout
Use
- \begin{sourcedisplay}
- \cs{warpprintonly}\{row contents\}
- \end{sourcedisplay}
+ \begin{sourcedisplay}
+ \cs{warpprintonly}\{row contents\}
+ \end{sourcedisplay}
instead of
- \begin{sourcedisplay}
- \cs{begin}\{warpprint\} \ldots\ \cs{end}\{warpprint\}
- \end{sourcedisplay}
+ \begin{sourcedisplay}
+ \cs{begin}\{warpprint\} \ldots\ \cs{end}\{warpprint\}
+ \end{sourcedisplay}
Doing so helps avoid ``Misplaced \cs{noalign}.'' when using \cs{begin}\{warpprint\}.
Keep the \cs{endfirsthead} row, which is still relevent to \HTML\ output.
@@ -764,9 +782,9 @@
\cs{kill} is ignored, place a \cs{kill} line inside
\watchout
- \begin{sourcedisplay}
- \cs{begin}\{warpprint\} \ldots\ \cs{end}\{warpprint\}
- \end{sourcedisplay}
+ \begin{sourcedisplay}
+ \cs{begin}\{warpprint\} \ldots\ \cs{end}\{warpprint\}
+ \end{sourcedisplay}
or place it inside \cs{warpingprintonly}.
}
@@ -978,13 +996,13 @@
\begin{itemize}
\item Use fixed lengths. \pkg{lwarp} will scale the \HTML\ lengths appropriately.
\item Use \env{warpprint} and \env{warpHTML} environments to select appropriate
- values for each case.
+ values for each case.
\item Inside a \env{warpHTML} environment, manually change
- \cs{FBwidth} or \cs{FBheight} before the \cs{ffigbox} or \cs{ttabbox}.
- Use \cs{FBwidth} or \cs{FBheight} normally afterwards; it will be used as
- expected in print output, and will use your custom-selected value in \HTML\
- output. This custom value will be used repeatedly,
- until it is manually changed to a new value.
+ \cs{FBwidth} or \cs{FBheight} before the \cs{ffigbox} or \cs{ttabbox}.
+ Use \cs{FBwidth} or \cs{FBheight} normally afterwards; it will be used as
+ expected in print output, and will use your custom-selected value in \HTML\
+ output. This custom value will be used repeatedly,
+ until it is manually changed to a new value.
\end{itemize}
}
@@ -991,6 +1009,8 @@
\newcommand{\limitssiunitx}{%
Do not use \cmds{per-mode=fraction}, which cannot be seen by the final \cmds{pdftotext} conversion.
\watchout[per-mode]
+
+Place the \cs{SI} expression inside math mode for anything which requires math mode units.
}
\newcommand{\limitsnicefrac}{%
@@ -1124,7 +1144,7 @@
%<*package>
% \fi
%
-% \CheckSum{12319}
+% \CheckSum{12815}
%
% \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
@@ -1200,6 +1220,8 @@
% \changes{v0.34}{2017/07/25}{File: \texttt{README.txt}: updated.}
% \changes{v0.34}{2017/07/25}{Docs: Horizontal space limitations.}
% \changes{v0.35}{2017/08/08}{\ 2017/08/08}
+% \changes{v0.36}{2017/08/17}{\ 2017/08/17}
+% \changes{v0.36}{2017/08/15}{Source: Improved formatting.}
@@ -1279,7 +1301,7 @@
%
% \noindent
% \textcolor{red!30!black}{\bfseries
-% Note that this is still a ``beta'' version of \pkg{lwarp},
+% Note that this is still an ``alpha'' version of \pkg{lwarp},
% and some things may change in response to user feedback and
% further project development.
% }
@@ -1334,6 +1356,29 @@
% For a detailed list of changes, see the Change History on page \pageref{sec:changehistory}.
%
% \begin{description}
+% \item[v0.36:] \
+% \begin{itemize}
+% \item Recorganized the documentation section regarding special cases and limitations.
+% (\Cref{sec:limitations})
+% \item Improved source formatting.
+% \item \cs{fbox} and related now use \cs{fboxsep} and \cs{fboxrule}.
+% \margintag{boxes and frames}
+% \item \cs{makebox} and \cs{framebox} now use width and position.
+% \item \cs{fcolorbox} and related now work inside a \env{lateximage}.
+% \item \pkg{babel-french}: Improvements for French variants, load order,
+% \margintag{babel-french}
+% footnotes, ellipses.
+% \item Improved footnote numbering.
+% \margintag{footnotes}
+% \env{lateximage} footnotes now appear as regular footnotes to match
+% the numbering of the print version.
+% Also fixed a regression with MathJax.
+% \item Improved \pkg{siunitx} units.
+% \margintag{siunitx}
+% \item Fix for filenames while using MathJax.
+% \item Fix for \cs{rule} when \pkg{xcolor} is not loaded.
+% \item Added \pkg{transparent}, \pkg{upref}.
+% \end{itemize}
% \item[v0.35:] Fix: \cs{textbf} and related.
% \item[v0.34:] \
% \begin{itemize}
@@ -1394,6 +1439,7 @@
% \item Adds fixed-width \HTML\ spaces around punctuation
% \margintag{babel-french}
% when using \pkg{babel-french}.
+% \LuaTeX\ does not yet use the extra punctuation spacing.
% \end{itemize}
% \needspace{2\baselineskip}
% \item[v0.33:] \
@@ -1867,7 +1913,7 @@
% Converted to up to three columns with an optional heading,
% per browser support. Single-column if unsupported.\\
% \midrule
-% \pkg{siunitx}: & Supported except for \cmds{per-mode=fraction}. \\
+% \pkg{siunitx}: & Mostly supported except for \cmds{per-mode=fraction}. \\
% \pkg{xfrac}: & Supported \\
% \midrule
% Direct formatting: & \cs{emph}, \cs{textsuperscript},
@@ -3746,14 +3792,14 @@
%
%
%
-% \subsection{Special cases and limitations}
+% \section{Special cases and limitations}
% \label{sec:limitations}
%
-%
% \label{sec:successfulcommands}
% \index{HTML>commands for a successful conversion}
%
% \changes{v0.14}{2016/03/26}{Docs: Commands for a successful \HTML\ conversion.}
+% \changes{v0.36}{2017/08/11}{Docs: Reorganized: Special cases and limitations.}
%
% Also see \cref{sec:troubleshooting}: \nameref{sec:troubleshooting}.
%
@@ -3761,13 +3807,7 @@
% for a smooth conversion to both \HTML\ and print-formatted outputs:
%
%
-% \subsubsection{Page references} The printed page does not translate to the \HTML\
-% page, so references to page numbers are converted to parentheses containing
-% \cs{pagerefPageFor}, which defaults to ``see '',
-% followed by a hyperlink to the appropriate
-% object. Ex: ``Sec.~\textcolor{red}{1.23}
-% on page (see sec.~\textcolor{red}{1.23})''.
-% \cs{pagerefPageFor} may be redefined to ``page for '', empty, etc.
+% \subsection{Formatting}
%
%
% \subsubsection{Text formatting}
@@ -3794,6 +3834,7 @@
% Use a trailing backslash: |\item[label] \|
% \index{item>empty}\index{list item, empty}
%
+%
% \subsubsection{Filenames in lists}
%
% \index{underscore>filename}\index{file>underscore}
@@ -3807,60 +3848,9 @@
%
%
%
-% \subsubsection{Cross-references}
+% \subsection{Boxes and minipages}
%
-% \limitsreferences
%
-% \subsubsection{\pkg{cleveref} and \pkg{varioref} packages}
-%
-% \changes{v0.22}{2017/03/01}{\pkg{varioref}: Supported.}
-%
-% \limitspageref
-%
-% \subsubsection{Hyperlinks, \pkg{hyperref}, and \pkg{url}}
-%
-% \limitshyperlinks
-%
-%
-% \subsubsection{Footnotes and page notes}
-%
-% \limitsfootnotes
-%
-%
-% \subsubsection{Math}
-% \label{sec:limitsmath}
-%
-% \limitsmath
-%
-% For an example of using custom \LaTeX\ macros with MathJax,
-% \margintag{custom MathJax macros}
-% see page \pageref{ex:mathjaxmacros}.
-%
-% \subsubsection{\pkg{ntheorem} package}
-%
-% \limitsntheorem
-%
-%
-% \subsubsection{Graphics}
-%
-% \limitsgraphics
-%
-%
-% \subsubsection{\pkg{xcolor} package}
-%
-% \limitsxcolor
-%
-%
-% \subsubsection{Tabular}
-% \label{sec:limitstabular}
-% \limitstabular
-%
-%
-% \subsubsection{\pkg{longtable} package}
-%
-% \limitslongtable
-%
-%
% \subsubsection{Save Boxes}
%
% \changes{v0.27}{2017/04/04}{Docs: Limitations of saveboxes.}
@@ -3933,6 +3923,10 @@
% For \HTML\ output, this forms a \element{div} of class |framed|, the contents
% preserve their \HTML\ formatting, and valid \HTML\ is created for a \env{tabular}.
% Also see below regarding the ``Misplaced alignment tab character \&'' error.
+% \item [To create colored frames and boxes:] See \cref{sec:xcolor} for \pkg{xcolor}'s
+% \margintag{colored boxes and frames:}
+% \cs{colorbox} and \cs{fcolorbox},
+% and \pkg{lwarp}'s additional \cs{colorboxBlock} and \cs{fcolorboxBlock}.
% \item [To frame tables or verbatim environments:] Place the contents
% inside a \env{fminipage}, or perhaps a \cs{fboxBlock} for a \env{tabular}.
% Also, if using \cs{fboxblock} with \env{tabular},
@@ -3941,7 +3935,7 @@
% before the start of the macro which uses \cs{fboxBlock} and the \env{tabular},
% and \cs{EndDefiningTabulars} afterwards.
% Also see the \pkg{lwarp} documentation for the \pkg{fancybox} package.
-% \item [To frame equations:] See the \pkg{lwarp} documentation for the \pkg{fancybox} package.
+% \item [To frame equations:] See \cref{sec:fancybox} for the \pkg{fancybox} package.
% \item [For fancy framed minipages:] See packages \pkg{boxedminipage},
% \pkg{shadow}, \pkg{fancybox}, \pkg{framed}, \pkg{mdframed}.
% \item [Custom environments:] Use a custom environment to create a sidebar,
@@ -3959,7 +3953,6 @@
% \end{description}
%
%
-%
% \subsubsection{\pkg{fancybox} package}
%
% \limitsfancybox
@@ -3969,7 +3962,94 @@
%
% \limitsmdframed
%
+%
+%
+%
+% \subsection{Cross-references}
+%
+% \limitsreferences
+%
+% \subsubsection{Page references} The printed page does not translate to the \HTML\
+% page, so references to page numbers are converted to parentheses containing
+% \cs{pagerefPageFor}, which defaults to ``see '',
+% followed by a hyperlink to the appropriate
+% object. Ex: ``Sec.~\textcolor{red}{1.23}
+% on page (see sec.~\textcolor{red}{1.23})''.
+% \cs{pagerefPageFor} may be redefined to ``page for '', empty, etc.
+%
+%
+% \subsubsection{\pkg{cleveref} and \pkg{varioref} packages}
+%
+% \changes{v0.22}{2017/03/01}{\pkg{varioref}: Supported.}
+%
+% \limitspageref
+%
+% \subsubsection{Hyperlinks, \pkg{hyperref}, and \pkg{url}}
+%
+% \limitshyperlinks
+%
+%
+% \subsubsection{Footnotes and page notes}
+%
+% \limitsfootnotes
+%
+%
+% \subsection{Math}
+% \label{sec:limitsmath}
+%
+% \limitsmath
+%
+% For an example of using custom \LaTeX\ macros with MathJax,
+% \margintag{custom MathJax macros}
+% see page \pageref{ex:mathjaxmacros}.
+%
+%
+% \subsubsection{\pkg{ntheorem} package}
+%
+% \limitsntheorem
+%
+%
+% \subsubsection{\pkg{siunitx} package}
+%
+% \DescribePackage{siunitx}
+% \limitssiunitx
%
+%
+% \subsubsection{\pkg{units} and \pkg{nicefrac} packages}
+%
+% \DescribePackage{units}
+% \DescribePackage{nicefrac}
+% \limitsnicefrac
+%
+%
+% \subsubsection{\pkg{newtxmath} package}
+%
+% \DescribePackage{newtxmath}
+% \limitsnewtxmath
+%
+%
+% \subsection{Graphics}
+%
+% \limitsgraphics
+%
+%
+% \subsubsection{\pkg{xcolor} package}
+%
+% \limitsxcolor
+%
+%
+% \subsection{Tabular}
+% \label{sec:limitstabular}
+% \limitstabular
+%
+%
+% \subsubsection{\pkg{longtable} package}
+%
+% \limitslongtable
+%
+%
+%
+%
% \subsubsection{\pkg{float}, \pkg{trivfloat}, and/or \pkg{algorithmicx} together}
%
% \limitscombiningfloats
@@ -3980,6 +4060,10 @@
% \limitscaption
%
%
+%
+% \subsection{Floats}
+%
+%
% \subsubsection{\pkg{subfig} package}
%
% \limitssubfig
@@ -3990,6 +4074,8 @@
% \limitsfloatrow
%
%
+% \subsection{Miscellaneous}
+%
% \subsubsection{\pkg{abstract} package}
%
% \limitsabstract
@@ -4000,19 +4086,6 @@
% \limitsverse
%
%
-% \subsubsection{\pkg{siunitx} package}
-%
-% \DescribePackage{siunitx}
-% \limitssiunitx
-%
-%
-% \subsubsection{\pkg{units} and \pkg{nicefrac} packages}
-%
-% \DescribePackage{units}
-% \DescribePackage{nicefrac}
-% \limitsnicefrac
-%
-%
% \subsubsection{\pkg{newclude} package}
%
% \changes{v0.14}{2016/03/29}{Docs: Newclude limitations.}
@@ -4021,12 +4094,7 @@
% \limitsnewclude
%
%
-% \subsubsection{\pkg{newtxmath} package}
%
-% \DescribePackage{newtxmath}
-% \limitsnewtxmath
-%
-%
% \subsubsection{\pkg{babel} package}
%
% \DescribePackage{babel}
@@ -5270,8 +5338,10 @@
\LWR at loadafter{titlesec}
\LWR at loadafter{titletoc}
\LWR at loadafter{tocloft}
+\LWR at loadafter{transparent}
\LWR at loadafter{trivfloat}
\LWR at loadafter{ulem}
+\LWR at loadafter{upref}
\LWR at loadafter{varioref}
\LWR at loadafter{verse}
\LWR at loadafter{wallpaper}
@@ -5427,11 +5497,11 @@
\RequirePackage {microtype}
\microtypesetup{
- protrusion=false,
- expansion=false,
- tracking=false,
- kerning=false,
- spacing=false}
+ protrusion=false,
+ expansion=false,
+ tracking=false,
+ kerning=false,
+ spacing=false}
\DisableLigatures[f,q,t,T,Q]{encoding = *,family = *}
% \end{macrocode}
@@ -5840,10 +5910,10 @@
% \begin{macrocode}
\IfFileExists{lwarp-\LWR at strresulttwo.sty}%
{% lwarp-* file found
- \StrSubstitute%
- {\LWR at requirepackagenames}%
- {\LWR at strresult}%
- {lwarp-\LWR at strresulttwo}[\LWR at requirepackagenames]%
+ \StrSubstitute%
+ {\LWR at requirepackagenames}%
+ {\LWR at strresult}%
+ {lwarp-\LWR at strresulttwo}[\LWR at requirepackagenames]%
}%
{}% no lwarp-* file
}% yes filename
@@ -5880,14 +5950,14 @@
% \begin{macrocode}
\IfValueTF{#1}
{% options given
- \IfValueTF{#3}% version given?
- {\LWR at origRequirePackage[#1]{\LWR at requirepackagenames}[#3]}
- {\LWR at origRequirePackage[#1]{\LWR at requirepackagenames}}
+ \IfValueTF{#3}% version given?
+ {\LWR at origRequirePackage[#1]{\LWR at requirepackagenames}[#3]}
+ {\LWR at origRequirePackage[#1]{\LWR at requirepackagenames}}
}
{% no options given
- \IfValueTF{#3}% version given?
- {\LWR at origRequirePackage{\LWR at requirepackagenames}[#3]}
- {\LWR at origRequirePackage{\LWR at requirepackagenames}}
+ \IfValueTF{#3}% version given?
+ {\LWR at origRequirePackage{\LWR at requirepackagenames}[#3]}
+ {\LWR at origRequirePackage{\LWR at requirepackagenames}}
}
}
\LetLtxMacro{\usepackage}{\RequirePackage}
@@ -5999,8 +6069,8 @@
\newcommand{\LWR at traceinfo}[1]{%
\ifbool{LWR at tracinglwarp}%
{%
-\typeout{*** lwarp: #1}%
-% \PackageInfo{lwarp}{#1 : }%
+ \typeout{*** lwarp: #1}%
+ % \PackageInfo{lwarp}{#1 : }%
}%
{}%
}
@@ -6138,6 +6208,8 @@
\let\LWR at origraggedright\raggedright
\let\LWR at origonecolumn\onecolumn
+\let\LWR at origsp\sp
+\let\LWR at origsb\sb
\let\LWR at origtextsuperscript\textsuperscript
\let\LWR at origtextsubscript\textsubscript
@@ -6183,10 +6255,64 @@
+% \section{Textcomp and SIunitx}
+% Mimic the \pkg{textcomp} package if it not loaded,
+% then create \HTML\ versions.
+% \changes{v0.36}{2017/08/17}{\pkg{siunitx}: Improved symbol support.}
+% \codehtml
+% \begin{macrocode}
+\begin{warpHTML}
+% \end{macrocode}
+% \begin{macrocode}
+\AtBeginDocument{% in case textcomp was not loaded
+
+\providecommand*{\textdegree}{DEG}
+\providecommand*{\textcelsius}{DEGC}
+\providecommand*{\textohm}{OHM}
+\providecommand*{\textmu}{MU}
+
+\let\LWR at origtextdegree\textdegree
+\let\LWR at origtextcelsius\textcelsius
+\let\LWR at origtextohm\textohm
+\let\LWR at origtextmu\textmu
+
+\ifPDFTeX
+\renewcommand*{\textdegree}{\HTMLentity{deg}}
+\renewcommand*{\textcelsius}{\HTMLentity{deg}\,C}
+\renewcommand*{\textohm}{\HTMLunicode{2126}}
+\renewcommand*{\textmu}{\HTMLunicode{00B5}}
+\else
+\renewcommand*{\textdegree}{°}
+\renewcommand*{\textcelsius}{°C}
+\renewcommand*{\textohm}{Ω}
+\renewcommand*{\textmu}{μ}
+\fi
+
+\@ifpackageloaded{siunitx}
+{
+\DeclareSIUnit\bohr{\textit{a}\textsubscript{0}}
+\DeclareSIUnit\clight{\textit{c}\textsubscript{0}}
+\DeclareSIUnit\elementarycharge{\textit{e}}
+\DeclareSIUnit\electronmass{\textit{m}\textsubscript{e}}
+\DeclareSIUnit\hartree{\textit{E}\textsubscript{h}}
+\DeclareSIUnit\planckbar{\HTMLunicode{210F}}
+}% siunitx loaded
+{}
+
+}% AtBeginDocument
+
+% \begin{macrocode}
+\end{warpHTML}
+% \end{macrocode}
+
+
+
+
+
% \section{Configuration Files}
@@ -6441,8 +6567,8 @@
}
blockquote {
- margin-left: 0px ;
- margin-right: 0px ;
+ margin-left: 0px ;
+ margin-right: 0px ;
}
blockquote p {
@@ -6450,12 +6576,12 @@
text-align: left ;
font-size: .85em ;
margin-left: 3em ;
- margin-right: 3em ;
+ margin-right: 3em ;
}
blockquotation {
- margin-left: 0px ;
- margin-right: 0px ;
+ margin-left: 0px ;
+ margin-right: 0px ;
}
blockquotation p {
@@ -6463,7 +6589,7 @@
text-align: left ;
font-size: .85em ;
margin-left: 3em ;
- margin-right: 3em ;
+ margin-right: 3em ;
}
div.epigraph {
@@ -6632,7 +6758,7 @@
font-size: .85em ;
margin: 3ex 1em 0ex 1em ;
padding-bottom: 1ex ;
- border-top: 1px solid silver ;
+ border-top: 1px solid silver ;
}
.marginpar {
@@ -6818,7 +6944,7 @@
/* Minipage environments, vertically aligned to top, center, bottom: */
-.minipage {
+.minipage, .fminipage, .fcolorminipage {
/* display: inline-block ; */
/* Mini pages which follow each other will be tiled. */
margin: .25em .25em .25em .25em;
@@ -6832,6 +6958,16 @@
/* Have not yet researched this. */
.minipage p {margin: .75ex 0em .75ex 0em ;}
+.fboxBlock .minipage, .colorbox .minipage, .colorboxBlock .minipage,
+.fcolorbox .minipage, .fcolorboxBlock .minipage
+ {border: none ; background: none;}
+
+.fbox, .fboxBlock { border: 1px solid black ; }
+
+.fbox, .fboxBlock, .fcolorbox, .fcolorboxBlock, .colorbox, .colorboxBlock,
+.fminipage, .fcolorminipage
+ {display: inline-block}
+
.shadowbox, .shabox {
border: 1px solid black;
box-shadow: 3px 3px 3px #808080 ;
@@ -6859,8 +6995,6 @@
.Ovalbox { border-width: 2px ; }
-
-
.framebox {
border: 1px solid black;
border-radius: 0px ;
@@ -6908,7 +7042,7 @@
/* framed package */
-.framed, pre.boxedverbatim {
+.framed, pre.boxedverbatim, fcolorbox {
margin: 3ex 0em 3ex 0em ;
border: 1px solid black;
border-radius: 0px ;
@@ -6932,8 +7066,8 @@
}
.framedtitle {
- margin: 0em ;
- padding: 0em ;
+ margin: 0em ;
+ padding: 0em ;
font-size: 130%
}
@@ -6947,8 +7081,8 @@
}
dl dt {
- margin-top: 1ex;
- margin-left: 1em ;
+ margin-top: 1ex;
+ margin-left: 1em ;
font-weight: bold;
}
@@ -7060,8 +7194,8 @@
font-size: .85em ;
text-align: center ;
font-weight: bold ;
- margin-top: 1ex ;
- margin-bottom: 1ex ;
+ margin-top: 1ex ;
+ margin-bottom: 1ex ;
}
figure.subfigure figcaption, figure.subtable figcaption {
@@ -7077,8 +7211,8 @@
/* For a \RawCaption inside a minipage inside a figure's floatrow: */
figure div.floatrow div.minipage figcaption {
- border: none ;
- background: none ;
+ border: none ;
+ background: none ;
}
@@ -7182,13 +7316,13 @@
background-color:black;
color:white;
padding:0px .25em 0px .25em;
- margin: 0 ;
+ margin: 0 ;
font-weight: bold;
font-size:.72em ;
}
div.programlisting pre.verbatim span.callout{
- font-size: .85em ;
+ font-size: .85em ;
}
@@ -7369,7 +7503,7 @@
span.theoremheaderchange,
span.theoremheadermargin
{
- font-style:normal ; font-weight: bold ; margin-right: 1em ;
+ font-style:normal ; font-weight: bold ; margin-right: 1em ;
}
span.amsthmnameplain,
@@ -7377,7 +7511,7 @@
span.amsthmnumberplain,
span.amsthmnumberdefinition
{
- font-style:normal ; font-weight: bold ;
+ font-style:normal ; font-weight: bold ;
}
@@ -7398,10 +7532,10 @@
span.theoremheadersc
{
- font-style:normal ;
- font-variant: small-caps ;
- font-weight: normal ;
- margin-right: 1em ;
+ font-style:normal ;
+ font-variant: small-caps ;
+ font-weight: normal ;
+ margin-right: 1em ;
}
.theoremendmark {float:right}
@@ -7413,8 +7547,8 @@
div.theorembodychange,
div.theorembodymargin
{
- font-style:italic;
- margin-top: 3ex ; margin-bottom: 3ex ;
+ font-style:italic;
+ margin-top: 3ex ; margin-bottom: 3ex ;
}
div.theorembodydefinition, div.theorembodyremark, div.theorembodyproof,
@@ -7422,8 +7556,8 @@
div.amsthmbodydefinition, div.amsthmbodyremark,
div.amsthmproof
{
- font-style: normal ;
- margin-top: 3ex ; margin-bottom: 3ex ;
+ font-style: normal ;
+ margin-top: 3ex ; margin-bottom: 3ex ;
}
span.amsthmnoteremark {}
@@ -7505,7 +7639,7 @@
.lyxlogo {
font-family: "URW Classico", Optima, "Linux Biolinum O",
"DejaVu Sans", "Bitstream Vera Sans", Geneva,
- Verdana, sans-serif ;
+ Verdana, sans-serif ;
}
@@ -7598,7 +7732,7 @@
"Nimbus Roman No 9 L", "FreeSerif",
"Hoefler Text", Times, "Times New Roman", serif;
font-variant: small-caps ;
- font-weight: normal ;
+ font-weight: normal ;
color: #304070 ;
text-shadow: 2px 2px 3px #808080;
}
@@ -7711,7 +7845,7 @@
"FreeSerif", "Hoefler Text", Times, "Times New Roman", serif;
font-weight:bold;
font-variant: small-caps ;
- font-size: 1.5em ;
+ font-size: 1.5em ;
color: #304070 ;
text-align: center ;
text-shadow: 1px 1px 2px #808080;
@@ -7722,14 +7856,14 @@
.minipage {
background-color: #eeeee7 ;
border: 1px solid silver ;
- border-radius: 1ex ;
+ border-radius: 1ex ;
}
.framed .minipage , .framedleftbar .minipage {
- border: none ;
- background: none ;
- padding: 0ex ;
- margin: 0ex ;
+ border: none ;
+ background: none ;
+ padding: 0ex ;
+ margin: 0ex ;
}
figure.figure .minipage, figcaption .minipage { border: none; }
@@ -7746,7 +7880,7 @@
figure figure {
border: 1px solid silver ;
margin: 0em ;
- box-shadow: none ;
+ box-shadow: none ;
}
/*
@@ -8252,7 +8386,7 @@
-- Print the usage of the lwarpmk command:
-printversion = "v0.35"
+printversion = "v0.36"
function printhelp ()
print ("lwarpmk: Use lwarpmk -h or lwarpmk --help for help.") ;
@@ -8441,8 +8575,8 @@
local fsource = io.open(filesource)
for line in fsource:lines() do
if ( string.find(line,"Rerun to get") ~= nil ) then
- io.close(fsource)
- return true
+ io.close(fsource)
+ return true
end
end
io.close(fsource)
@@ -9171,20 +9305,17 @@
\edef\LWR at tempone{#1}%
\LWR at traceinfo{about to compare with ??}%
\ifthenelse{\equal{\LWR at tempone}{??}}%
-{%
-\LWR at traceinfo{found ??}%
-}{%
-\LWR at traceinfo{not found ??}%
-}%
+{\LWR at traceinfo{found ??}}%
+{\LWR at traceinfo{not found ??}}%
\LWR at traceinfo{about to compare with zero or empty}%
\ifthenelse{%
-\equal{\LWR at tempone}{0}%
-\OR \equal{\LWR at tempone}{}%
-\OR \equal{\LWR at tempone}{??}%
+ \equal{\LWR at tempone}{0}%
+ \OR \equal{\LWR at tempone}{}%
+ \OR \equal{\LWR at tempone}{??}%
}%
{%
-\LWR at traceinfo{LWR at htmlsectionfilename B \HomeHTMLFilename.html}%
-\HomeHTMLFilename.html%
+ \LWR at traceinfo{LWR at htmlsectionfilename B \HomeHTMLFilename.html}%
+ \HomeHTMLFilename.html%
}%
% \end{macrocode}
% For a \LaTeX\ section named ``Index'' or ``index'' without a prefix, create a filename
@@ -9191,17 +9322,20 @@
% with a leading underscore to avoid colliding with the \HTML\ filename |index.html|:
% \begin{macrocode}
{%
-\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}%
-}%
-{%
-\LWR at traceinfo{prefixing the index name with an underscore.}%
-\_#1.html}%
+ \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}%
+ }%
+ {%
+ \LWR at traceinfo{prefixing the index name with an underscore.}%
+ \_#1.html%
+ }%
% \end{macrocode}
% Otherwise, create a filename with the chosen prefix:
% \begin{macrocode}
-{\HTMLFilename#1.html}%
+ {\HTMLFilename#1.html}%
}%
\LWR at traceinfo{LWR at htmlsectionfilename Z}%
}
@@ -9426,31 +9560,72 @@
% \end{macrocode}
-% \subsection{HTML tags}
+% \subsection{Babel-French}
+
+
% \changes{v0.34}{2017/08/03}{\pkg{babel-french}: Adds fixed-width HTML spaces to punctuation.}
-% Adjust \pkg{babel-french} for \HTML\ spaces:
+% \changes{v0.36}{2017/08/15}{\pkg{babel-french}: Adjustements for French variants,
+% load order, footnotes, ellipses.}
+%
+% Adjust \pkg{babel-french} for \HTML\ spaces.
+% So far, this only works for |pdflatex| and |xelatex|.
+%
+% \credits{Daniel Flipo}
+%
% \begin{macrocode}
-\@ifpackagewith{babel}{french}{
-\renewcommand*{\FBcolonspace}{~}
-\renewcommand*{\FBthinspace}{\,}
-}{}
-% \end{macrocode}
+\providecommand*{\LWR at FBcancel}{}
-% \begin{macro}{\LWR at FBcancel} Cancels \HTML\ spacing for \pkg{babel-french}
-% \begin{macrocode}
-\@ifpackagewith{babel}{french}{%
-\newcommand{\LWR at FBcancel}{%
-\csdef{FBcolonspace}{}%
-\csdef{FBthinspace}{}%
+\AtBeginDocument{
+\@ifundefined{frenchbsetup}
+{}
+{
+ \frenchbsetup{FrenchFootnotes=false}
+ % OR: redefine \insertfootnotemarkFB?
+ \LetLtxMacro\LWR at FBcancel\NoAutoSpacing
+ \renewcommand*{\FBcolonspace}{%
+ \begingroup%
+ \LWR at FBcancel%
+ \LWR at origampersand{}nbsp;%
+ \endgroup%
+ }
+ \renewcommand*{\FBthinspace}{%
+ \begingroup%
+ \LWR at FBcancel%
+ \LWR at origampersand\#x202f;% \,
+ \endgroup%
+ }
+ \renewcommand*{\FBguillspace}{%
+ \begingroup%
+ \LWR at FBcancel%
+ \LWR at origampersand{}nbsp;% ~, for \og xyz \fg{}
+ \endgroup%
+ }
+ \DeclareDocumentCommand{\FBmedkern}{}{%
+ \begingroup%
+ \LWR at FBcancel%
+ \LWR at origampersand\#x202f;% \,
+ \endgroup%
+ }
+ \DeclareDocumentCommand{\FBthickkern}{}{%
+ \begingroup%
+ \LWR at FBcancel%
+ \LWR at origampersand{}nbsp;% ~
+ \endgroup%
+ }
+ \ifFBunicode
+ \else
+ \DeclareTextSymbol{\FBtextellipsis}{LY1}{133}
+ \DeclareTextCommandDefault{\FBtextellipsis}{\textellipsis\xspace}
+ \fi
}
}
-{% not french:
-\newcommand{\LWR at FBcancel}{}
-}%
% \end{macrocode}
-% \end{macro}
+
+% \subsection{HTML tags}
+
+
% \begin{macro}{\LWR at htmltagc} \marg{tag}
% Break ligatures and use upright apostrophes in \HTML\ tags.
%
@@ -9496,30 +9671,27 @@
\LWR at traceinfo{LWR at nestspan}%
\ifthenelse{\cnttest{\value{LWR at lateximagedepth}}{>}{0}}%
{%
-\LWR at traceinfo{LWR at nestspan: inside a lateximage}%
+ \LWR at traceinfo{LWR at nestspan: inside a lateximage}%
}%
{% not in a lateximage
-\LWR at traceinfo{LWR at nestspan: NOT inside a lateximage}%
-\addtocounter{LWR at spandepth}{1}%
-\RenewDocumentEnvironment{minipage}{O{t} o O{t} m}{}{}%
-\RenewDocumentEnvironment{BlockClass}{o m}{}{}%
-\renewcommand{\BlockClassSingle}[2]{##2}%
-\renewcommand{\LWR at forcenewpage}{}%
-\renewcommand{\LWR at itemizestart}{%
-\let\item\LWR at nestspanitem%
-% \global\boolfalse{LWR at allownestspanitembreak}%
-}%
-\renewcommand{\LWR at itemizeend}{}%
-\renewcommand{\LWR at enumeratestart}{%
-\let\item\LWR at nestspanitem%
-% \global\boolfalse{LWR at allownestspanitembreak}%
-}%
-\renewcommand{\LWR at enumerateend}{}%
-\renewcommand{\LWR at descriptionstart}{%
-\let\item\LWR at nestspanitem%
-% \global\boolfalse{LWR at allownestspanitembreak}%
-}%
-\renewcommand{\LWR at descriptionend}{}%
+ \LWR at traceinfo{LWR at nestspan: NOT inside a lateximage}%
+ \addtocounter{LWR at spandepth}{1}%
+ \RenewDocumentEnvironment{minipage}{O{t} o O{t} m}{}{}%
+ \RenewDocumentEnvironment{BlockClass}{o m}{}{}%
+ \renewcommand{\BlockClassSingle}[2]{##2}%
+ \renewcommand{\LWR at forcenewpage}{}%
+ \renewcommand{\LWR at itemizestart}{%
+ \let\item\LWR at nestspanitem%
+ }%
+ \renewcommand{\LWR at itemizeend}{}%
+ \renewcommand{\LWR at enumeratestart}{%
+ \let\item\LWR at nestspanitem%
+ }%
+ \renewcommand{\LWR at enumerateend}{}%
+ \renewcommand{\LWR at descriptionstart}{%
+ \let\item\LWR at nestspanitem%
+ }%
+ \renewcommand{\LWR at descriptionend}{}%
}% not in a lateximage
}%
{%
@@ -9665,6 +9837,8 @@
%
% Factored and reused in several places.
%
+% The trailing spaces allow more places for a line break.
+%
% \changes{v0.20}{2017/01/17}{Factored code.}
% \changes{v0.34}{2017/08/02}{Moved optional argument in front of mandatory.}
%
@@ -9672,11 +9846,11 @@
\NewDocumentCommand{\LWR at subhtmlelementclass}{m o m}{%
\IfValueTF{#2}%
{% option
-\ifthenelse{\equal{#2}{}}%
-{\LWR at htmltag{#1 class="#3"}}% empty option
-{\LWR at htmltag{#1 class="#3" style="#2"}}% non-empty option
+ \ifthenelse{\equal{#2}{}}%
+ {\LWR at htmltag{#1 class="#3" }}% empty option
+ {\LWR at htmltag{#1 class="#3" style="#2" }}% non-empty option
}% option
-{\LWR at htmltag{#1 class="#3"}}% no option
+{\LWR at htmltag{#1 class="#3" }}% no option
}
% \end{macrocode}
% \end{macro}
@@ -9703,7 +9877,7 @@
\LWR at stoppars%
\LWR at htmltag{/#1}%
\ifbool{HTMLDebugComments}{%
-\LWR at htmlcomment{End of #1 ``#2''}%
+ \LWR at htmlcomment{End of #1 ``#2''}%
}{}%
\LWR at startpars%
}
@@ -9987,38 +10161,39 @@
% See if have already started a \env{lateximage} or a \element{span}.
% If so, do not generate nested paragraph tags.
% \begin{macrocode}
-\ifthenelse{%
-\cnttest{\value{LWR at lateximagedepth}}{>}{0} \OR%
-\cnttest{\value{LWR at spandepth}}{>}{0}%
-}% nested par tags?
+ \ifthenelse{%
+ \cnttest{\value{LWR at lateximagedepth}}{>}{0} \OR%
+ \cnttest{\value{LWR at spandepth}}{>}{0}%
+ }% nested par tags?
% \end{macrocode}
% If so: Do nothing if already started a \env{lateximage} page. Cannot nest a \env{lateximage}.
% Also do nothing if already inside a \element{span}. Do not nest paragraph tags
% inside a \element{span}.
% \begin{macrocode}
-{}% no nested par tags
+ {}% no nested par tags
% \end{macrocode}
% Else: No \env{lateximage} or \element{span} has been started yet,
% so it's OK to generate paragraph tags.
% \begin{macrocode}
-{% yes nest par tags
-\LWR at htmltagc{\LWR at tagregularparagraph}%
+ {% yes nest par tags
+ \LWR at htmltagc{\LWR at tagregularparagraph}%
% \end{macrocode}
% Manually indent item list labels to avoid left margin intrustion:
%
% See if are nested inside an item list:
% \begin{macrocode}
-\ifnumcomp{\@listdepth}{>}{0}%
-{%
+ \ifnumcomp{\@listdepth}{>}{0}%
+ {%
% \end{macrocode}
% If so, leave some horizontal room in the \LaTeX{} \PDF\ output for list labels:
% \begin{macrocode}
-\LWR at orighspace{1in}%
-}{}%
+ \LWR at orighspace{1in}%
+ }%
+ {}%
% \end{macrocode}
% Now have started a paragraph.
% \begin{macrocode}
-\global\booltrue{LWR at doingapar}%
+ \global\booltrue{LWR at doingapar}%
% \end{macrocode}
% At the endof each paragraph,
% generate closing tag and do regular |/par| stuff.
@@ -10025,8 +10200,8 @@
% (Attempting to use the \pkg{everyhook} |cr| hook
% for \cs{LWR at closeparagraph} does not work well.)
% \begin{macrocode}
-\let\par\LWR at closeparagraph%
-}% end of yes nest par tags
+ \let\par\LWR at closeparagraph%
+ }% end of yes nest par tags
}% end of handling pars
{}% not handling pars
}
@@ -10038,6 +10213,7 @@
% \begin{macro}{\LWR at closeparagraph}
% \changes{v0.20}{2017/01/17}{No break tags in the start/end of a tabular.}
% \changes{v0.20}{2017/01/17}{\cs{unskip} extra spaces.}
+% \changes{v0.36}{2017/08/15}{Extra \protect\HTML\ source space after paragraphs.}
% \begin{macrocode}
\newcommand*{\LWR at closeparagraph}
{%
@@ -10052,43 +10228,42 @@
% \end{macrocode}
% See if already started a \env{lateximage} or a \element{span}:
% \begin{macrocode}
-\ifthenelse{%
-\cnttest{\value{LWR at lateximagedepth}}{>}{0} \OR%
-\cnttest{\value{LWR at spandepth}}{>}{0}%
-}%
+ \ifthenelse{%
+ \cnttest{\value{LWR at lateximagedepth}}{>}{0} \OR%
+ \cnttest{\value{LWR at spandepth}}{>}{0}%
+ }%
% \end{macrocode}
% Do nothing if already started a \env{lateximage} or a \element{span},
% but add a parbreak if in a span but not a \env{lateximage}.
% \begin{macrocode}
-{% no nested par tags
-\ifthenelse{%
-\cnttest{\value{LWR at spandepth}}{>}{0}%
-\AND%
-\cnttest{\value{LWR at lateximagedepth}}{=}{0}%
-}%
-{%
-\ifbool{LWR at intabularmetadata}{}{\unskip\LWR at htmltagc{br /}}%
-}%
-{}%
-}% no nested par tags
+ {% no nested par tags
+ \ifthenelse{%
+ \cnttest{\value{LWR at spandepth}}{>}{0}%
+ \AND%
+ \cnttest{\value{LWR at lateximagedepth}}{=}{0}%
+ }%
+ {\ifbool{LWR at intabularmetadata}{}{\unskip\LWR at htmltagc{br /}}}%
+ {}%
+ }% no nested par tags
% \end{macrocode}
% If have not already started a \env{lateximage} or a \element{span}:
% \begin{macrocode}
-{% yes nest par tags
+ {% yes nest par tags
% \end{macrocode}
-% Print a closing tag:
+% Print a closing tag and some extra vertical space:
% \begin{macrocode}
-\unskip%
-\LWR at htmltagc{/\LWR at tagregularparagraph}%
+ \unskip%
+ \LWR at htmltagc{/\LWR at tagregularparagraph}%
+ \LWR at orignewline%
% \end{macrocode}
% No longer doing a paragraph:
% \begin{macrocode}
-\global\boolfalse{LWR at doingapar}%
+ \global\boolfalse{LWR at doingapar}%
% Disable the special \env{minipage} \& \cs{hspace} interaction
% until a new minipage is found:
% \begin{macrocode}
-\global\boolfalse{LWR at minipagethispar}%
-}% end of yes nest par tags
+ \global\boolfalse{LWR at minipagethispar}%
+ }% end of yes nest par tags
}% end of handling pars
% \end{macrocode}
% Add a parbreak if in a span,
@@ -10095,9 +10270,9 @@
% but not in a table outside a row:
% \begin{macrocode}
{% not handling pars
-\ifthenelse{\cnttest{\value{LWR at spandepth}}{>}{0}}%
-{\ifbool{LWR at intabularmetadata}{}{\unskip\LWR at htmltagc{br /}}}%
-{}%
+ \ifthenelse{\cnttest{\value{LWR at spandepth}}{>}{0}}%
+ {\ifbool{LWR at intabularmetadata}{}{\unskip\LWR at htmltagc{br /}}}%
+ {}%
}% not handling pars
% \end{macrocode}
% Finish with regular paragraph processing
@@ -10144,33 +10319,33 @@
% \end{macrocode}
% See if currently handling \HTML\ paragraphs:
% \begin{macrocode}
-\ifbool{LWR at doingstartpars}%
+ \ifbool{LWR at doingstartpars}%
% \end{macrocode}
% If already in paragraph mode, do nothing.
% \begin{macrocode}
-{}%
+ {}%
% \end{macrocode}
% If not currently in paragraph mode:
% \begin{macrocode}
-{%
+ {%
% \end{macrocode}
% At the start of each paragraph, generate an opening tag:
% \begin{macrocode}
-\PushPreHook{par}{\LWR at openparagraph}%
+ \PushPreHook{par}{\LWR at openparagraph}%
% \end{macrocode}
% At the end of each paragraph, generate closing tag and do regular |/par| actions:
% \begin{macrocode}
-\let\par\LWR at closeparagraph
+ \let\par\LWR at closeparagraph
-}% an intentionally blank line
+ }% an intentionally blank line
% \end{macrocode}
% Are now handling paragraphs, but have not yet actually started one:
% \begin{macrocode}
-\global\setbool{LWR at doingstartpars}{true}%
+ \global\setbool{LWR at doingstartpars}{true}%
% \end{macrocode}
% No <par> tag yet to undo:
% \begin{macrocode}
-\global\boolfalse{LWR at doingapar}%
+ \global\boolfalse{LWR at doingapar}%
}% nestspan
}
% \end{macrocode}
@@ -10180,6 +10355,8 @@
% \begin{macro}{\LWR at stoppars}
% Stop handling \HTML\ paragraphs.
% Any currently open \HTML\ paragraph is closed, and no more will be opened.
+%
+% \changes{v0.36}{2017/08/15}{Extra \protect\HTML\ source space after paragraphs.}
% \begin{macrocode}
\newcommand*{\LWR at stoppars}%
{%
@@ -10192,53 +10369,52 @@
% \end{macrocode}
% See if currently handling \HTML\ paragraphs:
% \begin{macrocode}
-\ifbool{LWR at doingapar}%
+ \ifbool{LWR at doingapar}%
% \end{macrocode}
% if currently in an \HTML\ paragraph:
% \begin{macrocode}
-{%
+ {%
% \end{macrocode}
% Print a closing tag:
% \begin{macrocode}
-\unskip%
-\LWR at htmltagc{/\LWR at tagregularparagraph}%
+ \unskip%
+ \LWR at htmltagc{/\LWR at tagregularparagraph}%
+ \LWR at orignewline%
% \end{macrocode}
% No longer have an open \HTML\ paragraph:
% \begin{macrocode}
-\global\boolfalse{LWR at doingapar}%
+ \global\boolfalse{LWR at doingapar}%
% \end{macrocode}
% Disable the special \env{minipage} \& \cs{hspace} interaction
% until a new minipage is found:
% \begin{macrocode}
-\global\boolfalse{LWR at minipagethispar}
+ \global\boolfalse{LWR at minipagethispar}
-}% an intentionally blank line
+ }% an intentionally blank line
% \end{macrocode}
% If was not in an \HTML\ paragraph:
% \begin{macrocode}
-{}%
+ {}%
% \end{macrocode}
% See if currently allowing \HTML\ paragraphs:
% \begin{macrocode}
-\ifbool{LWR at doingstartpars}%
+ \ifbool{LWR at doingstartpars}%
% \end{macrocode}
% If so: clear the |par| hook to no longer catch paragraphs:
% \begin{macrocode}
-{%
-\ClearPreHook{par}%
-}%
+ {\ClearPreHook{par}}%
% \end{macrocode}
% Else: do nothing
% \begin{macrocode}
-{}%
+ {}%
% \end{macrocode}
% no longer in paragraph mode
% \begin{macrocode}
-\global\setbool{LWR at doingstartpars}{false}%
+ \global\setbool{LWR at doingstartpars}{false}%
% \end{macrocode}
% no \element{p} tag to undo:
% \begin{macrocode}
-\global\boolfalse{LWR at doingapar}%
+ \global\boolfalse{LWR at doingapar}%
}% nestspan
}
% \end{macrocode}
@@ -10465,7 +10641,9 @@
% See \cref{sec:footnotesregular} for the implementation.
%
% \subsection{Minipage footnotes}
-% See \cref{sec:footnotesminipage} for minipage footnotes.
+% See \cref{sec:footnotesminipage} for how minipage footnotes are gathered.
+% See \cref{sec:footnotesminipageplaced} for how minipage footnotes are placed into
+% the document.
%
% \subsection{Titlepage thanks}
% See \cref{sec:titlehtml} for titlepage footnotes.
@@ -10485,71 +10663,151 @@
% \end{macrocode}
%
% Much of the following has unneeded print-mode formatting removed.
+%
+% \begin{macro}{\@makefntext} \marg{text}
% \begin{macrocode}
\long\def\@makefntext#1{\textsuperscript{\@thefnmark} #1}
-
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@makefnmark}
+% \begin{macrocode}
\def\@makefnmark{\hbox{\textsuperscript{\@thefnmark}}}
% \end{macrocode}
+% \end{macro}
%
+%
% Footnotes may be in regular text, in which case paragraphs are tagged,
-% or in a table data cell, in which case paragraph tags must be added manually.
+% or in a table data cell or \env{lateximage},
+% in which case paragraph tags must be added manually.
%
+% In a \env{lateximage} during \HTML\ output, the \env{lateximage} is placed
+% inside a print-mode \env{minipage}, but the footnotes are broken out by:
+% \begin{sourcedisplay}
+% \cs{def}\cs{@mpfn}\{footnote\} \\
+% \cs{def}\cs{thempfn}\{\cs{thefootnote}\} \\
+% \cs{let}\cs{@footnotetext}\cs{LWR at footnotetext}
+% \end{sourcedisplay}
+%
+% \begin{macro}{\LWR at footnotetext} \marg{text}
+%
% \changes{v0.27}{2017/04/04}{Fix for table footnote par tags.}
+% \changes{v0.36}{2017/08/15}{Extra \protect\HTML\ source space after paragraphs.}
+% \changes{v0.36}{2017/08/16}{Force \protect\HTML\ superscripts.}
%
% \begin{macrocode}
-\long\def\@footnotetext#1{%
-\global\setbox\LWR at footnotes=\vbox{\unvbox\LWR at footnotes%
-\protected at edef\@currentlabel{%
-\csname p at footnote\endcsname\@thefnmark%
-}% @currentlabel
-\color at begingroup%
-\ifbool{LWR at doingstartpars}{}{\LWR at htmltagc{\LWR at tagregularparagraph}}%
-\@makefntext{#1}%
-\ifbool{LWR at doingstartpars}{\par}{\LWR at htmltagc{/\LWR at tagregularparagraph}}%
-\color at endgroup%
+\long\def\LWR at footnotetext#1{%
+\global\setbox\LWR at footnotes=\vbox{%
+% \end{macrocode}
+% Add to any current footnotes:
+% \begin{macrocode}
+ \unvbox\LWR at footnotes%
+% \end{macrocode}
+% Remember the footnote number for \cs{ref}:
+% \begin{macrocode}
+ \protected at edef\@currentlabel{%
+ \csname p at footnote\endcsname\@thefnmark%
+ }% @currentlabel
+% \end{macrocode}
+% Open a group:
+% \begin{macrocode}
+ \color at begingroup%
+% \end{macrocode}
+% Use \HTML\ superscripts even inside a \env{lateximage}:
+% \begin{macrocode}
+ \renewcommand{\textsuperscript}[1]{\LWR at htmlspan{sup}{##1}}%
+% \end{macrocode}
+% Use paragraph tags if in a tabular data cell or a \env{lateximage}:
+% \begin{macrocode}
+ \ifthenelse{%
+ \boolean{LWR at doingstartpars} \AND%
+ \cnttest{\value{LWR at lateximagedepth}}{=}{0}%
+ }%
+ {}%
+ {\LWR at htmltagc{\LWR at tagregularparagraph}}%
+% \end{macrocode}
+% Append the footnote to the list:
+% \begin{macrocode}
+ \@makefntext{#1}%
+% \end{macrocode}
+% Closing paragraph tag:
+% \begin{macrocode}
+ \ifthenelse{%
+ \boolean{LWR at doingstartpars} \AND%
+ \cnttest{\value{LWR at lateximagedepth}}{=}{0}%
+ }%
+ {\par}%
+ {%
+ \LWR at htmltagc{/\LWR at tagregularparagraph}%
+ \LWR at orignewline%
+ }%
+% \end{macrocode}
+% Close the group:
+% \begin{macrocode}
+ \color at endgroup%
}% vbox
}%
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\@footnotetext} \marg{text}
+% \begin{macrocode}
+\let\@footnotetext\LWR at footnotetext
+% \end{macrocode}
+% \end{macro}
+%
+%
+%
+% \subsection{Minipage footnote implementation}
+% \label{sec:footnotesminipage}
+%
+% \begin{macro}{\@mpfootnotetext} \marg{text}
+% \begin{macrocode}
\long\def\@mpfootnotetext#1{%
\global\setbox\@mpfootins\vbox{%
-\unvbox\@mpfootins
-\reset at font\footnotesize
-\hsize\columnwidth
-\@parboxrestore
-\protected at edef\@currentlabel
-{\csname p at mpfootnote\endcsname\@thefnmark}%
-\color at begingroup
-\@makefntext{%
-\ignorespaces#1%
-}%
+ \unvbox\@mpfootins
+ \reset at font\footnotesize
+ \hsize\columnwidth
+ \@parboxrestore
+ \protected at edef\@currentlabel
+ {\csname p at mpfootnote\endcsname\@thefnmark}%
+ \color at begingroup
+ \@makefntext{%
+ \ignorespaces#1%
+ }%
% \end{macrocode}
-%
% Don't add the closing paragraph tag if are inside a \env{lateximage}:
% \begin{macrocode}
-\ifthenelse{\cnttest{\value{LWR at lateximagedepth}}{>}{0}}%
-{}%
-{\LWR at htmltagc{/\LWR at tagregularparagraph}}%
-% \end{macrocode}
-%
-% \begin{macrocode}
-\color at endgroup}%
+ \ifthenelse{\cnttest{\value{LWR at lateximagedepth}}{>}{0}}%
+ {}%
+ {%
+ \LWR at htmltagc{/\LWR at tagregularparagraph}%
+ \LWR at orignewline%
+ }%
+ \color at endgroup%
+}% vbox
}
% \end{macrocode}
+% \end{macro}
%
-% Enclose the footnotes in a class, print, then clear:
+%
+% \begin{macro}{\LWR at printpendingfootnotes}
+% Enclose the footnotes in a class, print, then clear.
% \begin{macrocode}
\newcommand*{\LWR at printpendingfootnotes}{%
\ifvoid\LWR at footnotes\else
-\LWR at forcenewpage
-\begin{BlockClass}{footnotes}
-\LWR at origmedskip
-\unvbox\LWR at footnotes
-\setbox\LWR at footnotes=\vbox{}
-\end{BlockClass}
+ \LWR at forcenewpage
+ \begin{BlockClass}{footnotes}
+ \LWR at origmedskip
+ \unvbox\LWR at footnotes
+ \setbox\LWR at footnotes=\vbox{}
+ \end{BlockClass}
\fi
}
% \end{macrocode}
+% \end{macro}
%
+% \begin{macro}{\LWR at epubprintpendingfootnotes}
% Used to print footnotes before sections only if formatting for an \EPUB\ or word processor:
% \begin{macrocode}
\newcommand*{\LWR at epubprintpendingfootnotes}{%
@@ -10558,6 +10816,7 @@
{}%
}
% \end{macrocode}
+% \end{macro}
% \begin{macrocode}
\end{warpHTML}
@@ -10781,11 +11040,11 @@
\ifbool{FormatEPUB}
{}
{
-\LWR at htmlelement{footer}
+ \LWR at htmlelement{footer}
-\LWR at pagebottom
+ \LWR at pagebottom
-\LWR at htmlelementend{footer}
+ \LWR at htmlelementend{footer}
}
% \end{macrocode}
%
@@ -10853,11 +11112,11 @@
\ifthenelse{\boolean{FormatEPUB}\OR\boolean{FormatWordProcessor}}
{}
{
-\LWR at htmlelement{header}
+ \LWR at htmlelement{header}
-\LWR at pagetop
+ \LWR at pagetop
-\LWR at htmlelementend{header}
+ \LWR at htmlelementend{header}
}
% \end{macrocode}
@@ -10979,7 +11238,7 @@
% Typeset a section number and its trailing space with CSS formatting:
% \begin{macrocode}
\newcommand*{\LWR at sectionnumber}[1]{%
-\InlineClass{sectionnumber}{#1} %
+\InlineClass{sectionnumber}{#1}%
}
% \end{macrocode}
% \end{macro}
@@ -11050,6 +11309,7 @@
% \begin{macro}{\LWR at section} * \oarg{TOC name} \marg{name} \marg{sectiontype}
%
% \changes{v0.20}{2017/01/09}{Combined higher-level sections together into files.}
+% \changes{v0.36}{2017/08/15}{Improved spacing.}
%
% The common actions for the high-level sectioning commands.
% \begin{macrocode}
@@ -11068,45 +11328,45 @@
% \end{macrocode}
% Generate a new LaTeX page so that \TOC\ and index page number points to the section:
% \begin{macrocode}
-\LWR at orignewpage%
+ \LWR at orignewpage%
}{% not starred
-\ifthenelse{%
-\cnttest{\csuse{LWR at depth#4}}{<=}{\value{FileDepth}}%
-\AND%
-\(%
-\NOT\boolean{CombineHigherDepths}\OR%
-\cnttest{\csuse{LWR at depth#4}}{<=}{\value{LWR at prevFileDepth}}%
-\)%
-}%
+ \ifthenelse{%
+ \cnttest{\csuse{LWR at depth#4}}{<=}{\value{FileDepth}}%
+ \AND%
+ \(%
+ \NOT\boolean{CombineHigherDepths}\OR%
+ \cnttest{\csuse{LWR at depth#4}}{<=}{\value{LWR at prevFileDepth}}%
+ \)%
+ }%
% \end{macrocode}
% If so: start a new \HTML\ file:
% \begin{macrocode}
-{% new file
-\LWR at traceinfo{LWR at section: new HTML file}%
+ {% new file
+ \LWR at traceinfo{LWR at section: new HTML file}%
% \end{macrocode}
% See if there was an optional TOC name entry:
% \begin{macrocode}
-\IfNoValueTF{#2}%
+ \IfNoValueTF{#2}%
% \end{macrocode}
% If no optional entry
% \begin{macrocode}
-{\LWR at newhtmlfile{#3}}%
+ {\LWR at newhtmlfile{#3}}%
% \end{macrocode}
% If yes an optional entry
% \begin{macrocode}
-{\LWR at newhtmlfile{#2}}%
-}% new file
+ {\LWR at newhtmlfile{#2}}%
+ }% new file
% \end{macrocode}
% Else: No new \HTML\ file:
% \begin{macrocode}
-{% not new file
+ {% not new file
% \end{macrocode}
% Generate a new LaTeX page so that \TOC\ and index page number points to the section:
% \begin{macrocode}
-\LWR at orignewpage%
+ \LWR at orignewpage%
-}% not new file
+ }% not new file
}% not starred
% \end{macrocode}
% Remember this section's name for \cs{nameref}:
@@ -11119,17 +11379,17 @@
% \begin{macrocode}
\ifbool{HTMLDebugComments}{%
-\LWR at htmlcomment{Opening #4 ``#3''{}}
-}{}
+ \LWR at htmlcomment{Opening #4 ``#3''{}}%
+}{}%
% \end{macrocode}
% For inline sections paragraph and subparagraph, start a new paragraph now:
% \begin{macrocode}
\ifthenelse{%
-\cnttest{\csuse{LWR at depth#4}}{>=}{\LWR at depthparagraph}%
+ \cnttest{\csuse{LWR at depth#4}}{>=}{\LWR at depthparagraph}%
}%
-{\LWR at startpars}
-{}
+{\LWR at startpars}%
+{}%
% \end{macrocode}
% Create the opening tag with an autosec:
% \begin{macrocode}
@@ -11143,72 +11403,72 @@
% \end{macrocode}
% Only add a numbered TOC entry if section number is not too deep:
% \begin{macrocode}
-\ifthenelse{%
-\cnttest{\csuse{LWR at depth#4}}{<=}{\value{secnumdepth}}%
-}%
-{% if secnumdepth
+ \ifthenelse{%
+ \cnttest{\csuse{LWR at depth#4}}{<=}{\value{secnumdepth}}%
+ }%
+ {% if secnumdepth
% \end{macrocode}
% If in the main matter, step the counter and add the TOC entry.
% For |article| class, \pkg{lwarp} assumes that all is mainmatter.
% \begin{macrocode}
-\LWR at traceinfo{LWR at section: about to test main matter}%
-\ifbool{LWR at mainmatter}%
-{%
-\LWR at traceinfo{LWR at section: yes mainmatter}%
-\refstepcounter{#4}%
+ \LWR at traceinfo{LWR at section: about to test main matter}%
+ \ifbool{LWR at mainmatter}%
+ {%
+ \LWR at traceinfo{LWR at section: yes mainmatter}%
+ \refstepcounter{#4}%
% \end{macrocode}
% Add main matter numbered TOC entry with the TOC name or the regular name:
% \begin{macrocode}
-\LWR at traceinfo{LWR at section: about to addcontentsline}%
-\addcontentsline{toc}{#4}%
-{\protect\LWR at sectionnumber{\csuse{the#4}}%
-\IfValueTF{#2}{#2}{#3}}%
-\LWR at traceinfo{LWR at section: finished addcontentsline}%
-}% end of if main matter
+ \LWR at traceinfo{LWR at section: about to addcontentsline}%
+ \addcontentsline{toc}{#4}%
+ {\protect\LWR at sectionnumber{\csuse{the#4}}%
+ \IfValueTF{#2}{ #2}{ #3}}%
+ \LWR at traceinfo{LWR at section: finished addcontentsline}%
+ }% end of if main matter
% \end{macrocode}
% If not main matter, add unnumbered TOC name or regular name:
% \begin{macrocode}
-{% not main matter
-\LWR at traceinfo{LWR at section: no main matter}%
-\addcontentsline{toc}{#4}{\IfValueTF{#2}{#2}{#3}}%
-}% end of not main matter
-}% end of secnumdepth
+ {% not main matter
+ \LWR at traceinfo{LWR at section: no main matter}%
+ \addcontentsline{toc}{#4}{\IfValueTF{#2}{ #2}{ #3}}%
+ }% end of not main matter
+ }% end of secnumdepth
% \end{macrocode}
% Deeper than secnumdepth, so add an unnumbered TOC entry:
% \begin{macrocode}
-{%
-\addcontentsline{toc}{#4}{\IfValueTF{#2}{#2}{#3}}%
-}%
+ {%
+ \addcontentsline{toc}{#4}{\IfValueTF{#2}{ #2}{ #3}}%
+ }%
% \end{macrocode}
% For part, print the section type:
% \begin{macrocode}
-\ifbool{LWR at mainmatter}%
-{%
-\ifthenelse{%
-\(\cnttest{\csuse{LWR at depth#4}}{<=}%
-{\value{secnumdepth}}\) \AND
-\(\cnttest{\csuse{LWR at depth#4}}{<=}{\LWR at depthpart}\)
-}%
-{\csuse{#4name}~{}}%
-{}%
+ \ifbool{LWR at mainmatter}%
+ {%
+ \ifthenelse{%
+ \(\cnttest{\csuse{LWR at depth#4}}{<=}%
+ {\value{secnumdepth}}\) \AND%
+ \(\cnttest{\csuse{LWR at depth#4}}{<=}{\LWR at depthpart}\)%
+ }%
+ {\csuse{#4name}~{}}%
+ {}%
% \end{macrocode}
% Print the section number:
% \begin{macrocode}
-\LWR at traceinfo{LWR at section: about to print section number}%
-\ifthenelse{%
-\cnttest{\csuse{LWR at depth#4}}{<=}{\value{secnumdepth}}%
-}%
-{\protect\LWR at sectionnumber{\csuse{the#4}}}%
-{}%
-\LWR at traceinfo{LWR at section: finished print section number}%
-}{}%
+ \LWR at traceinfo{LWR at section: about to print section number}%
+ \ifthenelse{%
+ \cnttest{\csuse{LWR at depth#4}}{<=}{\value{secnumdepth}}%
+ }%
+ {\protect\LWR at sectionnumber{\csuse{the#4}}~}%
+ {}%
+ \LWR at traceinfo{LWR at section: finished print section number}%
+ }{}%
}% end of not starred
% \end{macrocode}
% Print the section name:
% \begin{macrocode}
-#3
+#3%
% \end{macrocode}
-% close the heading tag, such as /H2
+% Close the heading tag, such as /H2:
% \begin{macrocode}
\LWR at htmltag{\csuse{LWR at tag#4end}}%
% \end{macrocode}
@@ -11219,7 +11479,8 @@
% Start paragraph handing unless is an inline paragraph or subparagraph:
% \begin{macrocode}
\ifthenelse{%
-\cnttest{\csuse{LWR at depth#4}}{<}{\LWR at depthparagraph}}%
+ \cnttest{\csuse{LWR at depth#4}}{<}{\LWR at depthparagraph}%
+}%
{\LWR at startpars}%
{}%
% \end{macrocode}
@@ -11233,8 +11494,10 @@
% a new \HTML\ page for the section following it
% while |CombineHigherDepths| was true.
% \begin{macrocode}
-\IfBooleanTF{#1}{}{% not starred
-\setcounter{LWR at prevFileDepth}{\csuse{LWR at depth#4}}%
+\IfBooleanTF{#1}%
+{}%
+{% not starred
+ \setcounter{LWR at prevFileDepth}{\csuse{LWR at depth#4}}%
}% not starred
\LWR at traceinfo{LWR at section: done}%
}
@@ -11498,10 +11761,10 @@
% \begin{macrocode}
\ifbool{mathjax}%
{%
-\boolfalse{LWR at verbtags}
-\verbatiminput{lwarp_mathjax.txt}%
-\booltrue{LWR at verbtags}
-\LWR at stoppars
+ \boolfalse{LWR at verbtags}
+ \verbatiminput{lwarp_mathjax.txt}%
+ \booltrue{LWR at verbtags}
+ \LWR at stoppars
}% end of mathjax
{}%
% \end{macrocode}
@@ -11552,8 +11815,8 @@
% force \HTML\ debug comments off.
% \begin{macrocode}
\ifbool{FormatWordProcessor}{%
-\setcounter{FileDepth}{-5}%
-\boolfalse{HTMLDebugComments}%
+ \setcounter{FileDepth}{-5}%
+ \boolfalse{HTMLDebugComments}%
}{}
% \end{macrocode}
%
@@ -11738,8 +12001,8 @@
\newcommand*{\LWR at requesttoc}[2]{%
\ifbool{#1}
{
-\expandafter\newwrite\csuse{tf@#2}
-\immediate\openout \csuse{tf@#2} \jobname.#2\relax
+ \expandafter\newwrite\csuse{tf@#2}
+ \immediate\openout \csuse{tf@#2} \jobname.#2\relax
}{}
}
% \end{macrocode}
@@ -11783,7 +12046,7 @@
\ifthenelse{\boolean{FormatEPUB}\OR\boolean{FormatWordProcessor}}
{}
{
-\ifnumcomp{\value{LWR at htmlfilenumber}}{>}{0}{\LWR at botnavigation}{}
+ \ifnumcomp{\value{LWR at htmlfilenumber}}{>}{0}{\LWR at botnavigation}{}
}
% \end{macrocode}
% \begin{macrocode}
@@ -12202,9 +12465,9 @@
\ifthenelse{\equal{\thepublished}{}}
{}
{
-\begin{BlockClass}{published}
-\@published
-\end{BlockClass}
+ \begin{BlockClass}{published}
+ \@published
+ \end{BlockClass}
}
}
% \end{macrocode}
@@ -12245,9 +12508,9 @@
\ifthenelse{\equal{\thesubtitle}{}}
{}
{
-\begin{BlockClass}{subtitle}
-\@subtitle
-\end{BlockClass}
+ \begin{BlockClass}{subtitle}
+ \@subtitle
+ \end{BlockClass}
}
}
% \end{macrocode}
@@ -12347,12 +12610,12 @@
\vspace*{\droptitle}
\maketitlehooka
\ifcsempty{@published}
- {}
- {{\@bsprepublished \@published \@bspostpublished}\maketitlehookaa}
+ {}
+ {{\@bsprepublished \@published \@bspostpublished}\maketitlehookaa}
{\@bspretitle \@title \@bsposttitle}
\ifcsempty{@subtitle}
- {}
- {\maketitlehookaaa{\@bspresubtitle \@subtitle \@bspostsubtitle}}
+ {}
+ {\maketitlehookaaa{\@bspresubtitle \@subtitle \@bspostsubtitle}}
\maketitlehookb
{\@bspreauthor \@author \@bspostauthor}
\maketitlehookc
@@ -12396,12 +12659,12 @@
\vspace*{\droptitle}
\maketitlehooka
\ifcsempty{@published}
- {}
- {{\@bsprepublished \@published \@bspostpublished}\maketitlehookaa}
+ {}
+ {{\@bsprepublished \@published \@bspostpublished}\maketitlehookaa}
{\@bspretitle \@title \@bsposttitle}
\ifcsempty{@subtitle}
- {}
- {\maketitlehookaaa{\@bspresubtitle \@subtitle \@bspostsubtitle}}
+ {}
+ {\maketitlehookaaa{\@bspresubtitle \@subtitle \@bspostsubtitle}}
\maketitlehookb
{\@bspreauthor \@author \@bspostauthor}
\maketitlehookc
@@ -12496,6 +12759,7 @@
% \begin{macrocode}
\def\@makefnmark{\textsuperscript{\thefootnote}}
% \end{macrocode}
+%
% \begin{center}
% \begin{minipage}{.7\linewidth}
% \cs{thefootnote} \goesto\ \cs{nameuse}\{arabic\}\{footnote\}, or
@@ -12583,19 +12847,19 @@
% \begin{macro}{\@maketitle} Typesets the title, etc. for \HTML:
% \begin{macrocode}
\DeclareDocumentCommand{\@maketitle}{}{%
- \maketitlehooka
- \ifcsempty{@published}
- {}
- {{\@bsprepublished \@published \@bspostpublished}\maketitlehookaa}
- {\@bspretitle \@title \@bsposttitle}
- \ifcsempty{@subtitle}
- {}
- {\maketitlehookaaa{\@bspresubtitle \@subtitle \@bspostsubtitle}}
- \maketitlehookb
- {\@bspreauthor \@author \@bspostauthor}
- \maketitlehookc
- {\@bspredate \@date \@bspostdate}
- \maketitlehookd
+ \maketitlehooka
+ \ifcsempty{@published}
+ {}
+ {{\@bsprepublished \@published \@bspostpublished}\maketitlehookaa}
+ {\@bspretitle \@title \@bsposttitle}
+ \ifcsempty{@subtitle}
+ {}
+ {\maketitlehookaaa{\@bspresubtitle \@subtitle \@bspostsubtitle}}
+ \maketitlehookb
+ {\@bspreauthor \@author \@bspostauthor}
+ \maketitlehookc
+ {\@bspredate \@date \@bspostdate}
+ \maketitlehookd
}
% \end{macrocode}
% \end{macro}
@@ -12862,8 +13126,8 @@
% as loading the MathJax script.
% \begin{macrocode}
\ifbool{LWR at verbtags}{%
-\LWR at htmltag{pre class="#2"
-\ifthenelse{\equal{#1}{}}{}{style="#1"}%
+ \LWR at htmltag{pre class="#2"
+ \ifthenelse{\equal{#1}{}}{}{style="#1"}%
}% pre
}{}%
% \end{macrocode}
@@ -12870,9 +13134,12 @@
% Use a mono-spaced font to preserve horizontal positioning.
% If horizontal alignment is important for the user, use a mono-spaced font
% in the \CSS\ for the |verse| class.
+%
+% Also turn off \pkg{babel-french} extra space before punctuation:
% \begin{macrocode}
\begingroup%
\LWR at origttfamily%
+\LWR at FBcancel%
% \end{macrocode}
% Do not produce \HTML\ tags for \cs{hspace} inside a verse |par|.
% Restore plain \LaTeX{} \cs{hspace} functionality:
@@ -13322,13 +13589,13 @@
\global\booltrue{LWR at intabularmetadata}%
\ifbool{LWR at exitingtabular}{}%
{% not exiting tabular
-\ifbool{LWR at skippingmrowcell}{}%
-{% not skippingmrowcell
+ \ifbool{LWR at skippingmrowcell}{}%
+ {% not skippingmrowcell
% \end{macrocode}
% Insert any |<| then any |@| and |!| column contents:
% \begin{macrocode}
-\unskip%
-\LWR at getexparray{LWR at colafterspec}{\theLWR at tablecolspos}%
+ \unskip%
+ \LWR at getexparray{LWR at colafterspec}{\theLWR at tablecolspos}%
% % \LWR at getexparray{LWR at colatspec}{\theLWR at tablecolspos}%
% \LWR at printatbang{at}{\theLWR at tablecolspos}%
% % \LWR at getexparray{LWR at colbangspec}{\theLWR at tablecolspos}%
@@ -13336,22 +13603,20 @@
% \end{macrocode}
% Close paragraphs:
% \begin{macrocode}
-\ifbool{LWR at tableparcell}{\LWR at stoppars}{}%
-\global\boolfalse{LWR at tableparcell}%
+ \ifbool{LWR at tableparcell}{\LWR at stoppars}{}%
+ \global\boolfalse{LWR at tableparcell}%
% \end{macrocode}
% Close the table data cell.
% Skip the |@| and |!| cells if are closing a multicolumn cell.
% \begin{macrocode}
-\leavevmode\unskip\LWR at htmltag{/td}\LWR at orignewline%
-\ifbool{LWR at skipatbang}%
-{\boolfalse{LWR at skipatbang}}%
-{%
-% \LWR at getexparray{LWR at colatspec}{\theLWR at tablecolspos}%
-\LWR at printatbang{at}{\theLWR at tablecolspos}%
-% \LWR at getexparray{LWR at colbangspec}{\theLWR at tablecolspos}%
-\LWR at printatbang{bang}{\theLWR at tablecolspos}%
-}% not skipping at or bang
-}% not skipping mrowcell
+ \leavevmode\unskip\LWR at htmltag{/td}\LWR at orignewline%
+ \ifbool{LWR at skipatbang}%
+ {\boolfalse{LWR at skipatbang}}%
+ {%
+ \LWR at printatbang{at}{\theLWR at tablecolspos}%
+ \LWR at printatbang{bang}{\theLWR at tablecolspos}%
+ }% not skipping at or bang
+ }% not skipping mrowcell
}% not exiting tabular
\global\boolfalse{LWR at skippingmrowcell}%
}
@@ -13445,16 +13710,16 @@
% \end{macrocode}
% If not skipping a multirow cell, close the current data cell.
% \begin{macrocode}
-\unskip%
-\LWR at closetabledatacell%
+ \unskip%
+ \LWR at closetabledatacell%
% \end{macrocode}
% Move to the next column.
% \begin{macrocode}
-\addtocounter{LWR at tablecolspos}{1}%
+ \addtocounter{LWR at tablecolspos}{1}%
% \end{macrocode}
% Look at the next token to decide multi or single column data tag.
% \begin{macrocode}
-\LWR at getmynexttoken%
+ \LWR at getmynexttoken%
}%
% \end{macrocode}
% If not inside a tabular, performs the original action:
@@ -13629,16 +13894,16 @@
\LWR at traceinfo{have now read the next token}%
\ifthenelse{\cnttest{\value{LWR at tabletotalcols}}=0}
{% left edge of the table:
-\LWR at traceinfo{at the left edge}%
-\LWR at setexparray{LWR at colatspec}{leftedge}{\LWR at colparameter}%
-\LWR at traceinfo{at the left edge: %
- \LWR at getexparray{LWR at colatspec}{leftedge}}%
+ \LWR at traceinfo{at the left edge}%
+ \LWR at setexparray{LWR at colatspec}{leftedge}{\LWR at colparameter}%
+ \LWR at traceinfo{at the left edge: %
+ \LWR at getexparray{LWR at colatspec}{leftedge}}%
}%
{% not at the left edge:
-\LWR at traceinfo{not at the left edge}%
-\LWR at setexparray{LWR at colatspec}{\theLWR at tabletotalcols}{\LWR at colparameter}%
-\LWR at traceinfo{at \theLWR at tabletotalcols: %
- \LWR at getexparray{LWR at colatspec}{\theLWR at tabletotalcols}}%
+ \LWR at traceinfo{not at the left edge}%
+ \LWR at setexparray{LWR at colatspec}{\theLWR at tabletotalcols}{\LWR at colparameter}%
+ \LWR at traceinfo{at \theLWR at tabletotalcols: %
+ \LWR at getexparray{LWR at colatspec}{\theLWR at tabletotalcols}}%
}%
\let\LWR at colparameter\relax%
\booltrue{LWR at validtablecol}%
@@ -13672,13 +13937,13 @@
\LWR at traceinfo{have now read the next token}%
\ifthenelse{\cnttest{\value{LWR at tabletotalcols}}=0}
{% left edge of the table:
-\LWR at traceinfo{at the left edge}%
-\LWR at setexparray{LWR at colbangspec}{leftedge}{\LWR at colparameter}%
+ \LWR at traceinfo{at the left edge}%
+ \LWR at setexparray{LWR at colbangspec}{leftedge}{\LWR at colparameter}%
}%
{% not at the left edge:
-\LWR at traceinfo{not at the left edge}%
-\LWR at setexparray{LWR at colbangspec}{\theLWR at tabletotalcols}{\LWR at colparameter}%
-\LWR at traceinfo{bang \theLWR at tabletotalcols: \LWR at colparameter!}%
+ \LWR at traceinfo{not at the left edge}%
+ \LWR at setexparray{LWR at colbangspec}{\theLWR at tabletotalcols}{\LWR at colparameter}%
+ \LWR at traceinfo{bang \theLWR at tabletotalcols: \LWR at colparameter!}%
}%
\let\LWR at colparameter\relax%
\booltrue{LWR at validtablecol}%
@@ -14011,8 +14276,8 @@
% If this column was an invalid column type, convert it to an |l| column:
% \begin{macrocode}
\ifbool{LWR at validtablecol}{}{%
-\LWR at traceinfo{invalid column type: \LWR at strresult}%
-\LWR at parsenormalcolumn{l}%
+ \LWR at traceinfo{invalid column type: \LWR at strresult}%
+ \LWR at parsenormalcolumn{l}%
}%
\addtocounter{LWR at tablecolspos}{1}%
}%
@@ -14037,18 +14302,18 @@
% \end{macrocode}
% Remember that now have started the row:
% \begin{macrocode}
-\global\booltrue{LWR at startedrow}%
+ \global\booltrue{LWR at startedrow}%
% \end{macrocode}
% Create the row tag, with a class if necessary.
% \begin{macrocode}
-\global\booltrue{LWR at intabularmetadata}%
-\ifbool{LWR at doinghline}%
-{\LWR at htmltag{tr class="hline"{}}\LWR at orignewline}%
-{% not doing hline
-\ifbool{LWR at doingtbrule}%
-{\LWR at htmltag{tr class="tbrule"{}}\LWR at orignewline}%
-{\LWR at htmltag{tr}\LWR at orignewline}%
-}% end of not doing hline
+ \global\booltrue{LWR at intabularmetadata}%
+ \ifbool{LWR at doinghline}%
+ {\LWR at htmltag{tr class="hline"{}}\LWR at orignewline}%
+ {% not doing hline
+ \ifbool{LWR at doingtbrule}%
+ {\LWR at htmltag{tr class="tbrule"{}}\LWR at orignewline}%
+ {\LWR at htmltag{tr}\LWR at orignewline}%
+ }% end of not doing hline
}% end of not started the row
}
% \end{macrocode}
@@ -14066,11 +14331,11 @@
% \ifthenelse{\isempty{\LWR at atbangspec}}%
{}%
{%
-\LWR at htmltag{td class="td#1%
-\ifthenelse{\equal{\LWR at getexparray{LWR at midrules}{\theLWR at tablecolspos}}{Y}}{rule}{}%
-"}%
-\LWR at atbangspec%
-\LWR at htmltag{/td}\LWR at orignewline%
+ \LWR at htmltag{td class="td#1%
+ \ifthenelse{\equal{\LWR at getexparray{LWR at midrules}{\theLWR at tablecolspos}}{Y}}{rule}{}%
+ "}%
+ \LWR at atbangspec%
+ \LWR at htmltag{/td}\LWR at orignewline%
}%
}%
% \end{macrocode}
@@ -14091,61 +14356,64 @@
% \end{macrocode}
% Don't start a new paragraph tag if have already started one:
% \begin{macrocode}
-\ifbool{LWR at intabularmetadata}{%
+\ifbool{LWR at intabularmetadata}%
+{%
% \end{macrocode}
% If have found the end of tabular command, do not create the next data cell:
% \begin{macrocode}
-\ifbool{LWR at exitingtabular}{}%
-{% not exiting tabular
+ \ifbool{LWR at exitingtabular}{}%
+ {% not exiting tabular
% \end{macrocode}
% Print the |@| and |!| contents before first column:
% \begin{macrocode}
-\ifthenelse{\cnttest{\value{LWR at tablecolspos}}=1}%
-{%
-\LWR at printatbang{at}{leftedge}%
-\LWR at printatbang{bang}{leftedge}%
-}% left edge
-{}% not left edge
+ \ifthenelse{\cnttest{\value{LWR at tablecolspos}}=1}%
+ {%
+ \LWR at printatbang{at}{leftedge}%
+ \LWR at printatbang{bang}{leftedge}%
+ }% left edge
+ {}% not left edge
% \end{macrocode}
% Fetch the current column's alignment character into |\LWR at strresult|:
% \begin{macrocode}
-\StrChar{\LWR at tablecolspec}{\theLWR at tablecolspos}[\LWR at strresult]%
+ \StrChar{\LWR at tablecolspec}{\theLWR at tablecolspos}[\LWR at strresult]%
% \end{macrocode}
% print the start of a new table data cell:
% \begin{macrocode}
-\LWR at htmltag{td class="td%
+ \LWR at htmltag{td class="td%
% \end{macrocode}
% append this column's spec:
% \begin{macrocode}
-\LWR at strresult%
+ \LWR at strresult%
% \end{macrocode}
% If this column has a cmidrule, add ``rule'' to the end of the \HTML\ class tag:
% \begin{macrocode}
-\ifthenelse{\equal{\LWR at getexparray{LWR at midrules}{\theLWR at tablecolspos}}{Y}}{rule}{}%
-"{}}%
+ \ifthenelse{\equal{\LWR at getexparray{LWR at midrules}{\theLWR at tablecolspos}}{Y}}%
+ {rule}%
+ {}%
+ "{}}%
% \end{macrocode}
% If this is a p, m, b, or X column, allow paragraphs:
% \begin{macrocode}
-\ifthenelse{%
-\equal{\LWR at strresult}{p}\OR%
-\equal{\LWR at strresult}{m}\OR%
-\equal{\LWR at strresult}{b}\OR%
-\equal{\LWR at strresult}{P}\OR%
-\equal{\LWR at strresult}{M}\OR%
-\equal{\LWR at strresult}{B}\OR%
-\equal{\LWR at strresult}{X}%
-}%
-{% allow pars
-\LWR at startpars%
-\global\booltrue{LWR at tableparcell}%
-}% allow pars
-{}% no pars
+ \ifthenelse{%
+ \equal{\LWR at strresult}{p}\OR%
+ \equal{\LWR at strresult}{m}\OR%
+ \equal{\LWR at strresult}{b}\OR%
+ \equal{\LWR at strresult}{P}\OR%
+ \equal{\LWR at strresult}{M}\OR%
+ \equal{\LWR at strresult}{B}\OR%
+ \equal{\LWR at strresult}{X}%
+ }%
+ {% allow pars
+ \LWR at startpars%
+ \global\booltrue{LWR at tableparcell}%
+ }% allow pars
+ {}% no pars
% \end{macrocode}
% Print the |>| contents:
% \begin{macrocode}
-\LWR at getexparray{LWR at colbeforespec}{\theLWR at tablecolspos}%
-\global\boolfalse{LWR at intabularmetadata}%
-}% not exiting tabular
+ \LWR at getexparray{LWR at colbeforespec}{\theLWR at tablecolspos}%
+ \global\boolfalse{LWR at intabularmetadata}%
+ }% not exiting tabular
}{}% in tabular metadata
}%
% \end{macrocode}
@@ -14472,9 +14740,9 @@
% Remember the latest name for \cs{nameref}:
% \begin{macrocode}
\IfValueTF{#2}{% optional given?
-\ifthenelse{\equal{#2}{}}% optional empty?
-{\LWR at setlatestname{#3}}% empty
-{\LWR at setlatestname{#2}}% given and non-empty
+ \ifthenelse{\equal{#2}{}}% optional empty?
+ {\LWR at setlatestname{#3}}% empty
+ {\LWR at setlatestname{#2}}% given and non-empty
}% optional given
{\LWR at setlatestname{#3}}% no optional
% \end{macrocode}
@@ -14493,9 +14761,9 @@
% Star version, show a caption but do not make a LOT entry:
% \begin{macrocode}
{% yes star
-\LWR at htmlblocktag{figcaption}%
-#3%
-\LWR at htmlblocktag{/figcaption}%
+ \LWR at htmlblocktag{figcaption}%
+ #3%
+ \LWR at htmlblocktag{/figcaption}%
}%
{% No star:
% \end{macrocode}
@@ -14503,62 +14771,62 @@
%
% Don't step the counter if |\caption[]{A caption.}|
% \begin{macrocode}
-\ifbool{LWR at starredlongtable}%
-{%
-\ifthenelse{\equal{#2}{}}% TOC entry
-{}%
-{%
-\refstepcounter{\LTcaptype}%
-\protected at edef\@currentlabel{%
-\csuse{p@\LTcaptype}\csuse{the\LTcaptype}}%
-}%
-}{}%
+ \ifbool{LWR at starredlongtable}%
+ {%
+ \ifthenelse{\equal{#2}{}}% TOC entry
+ {}%
+ {%
+ \refstepcounter{\LTcaptype}%
+ \protected at edef\@currentlabel{%
+ \csuse{p@\LTcaptype}\csuse{the\LTcaptype}}%
+ }%
+ }{}%
% \end{macrocode}
% Create an \HTML\ caption. Afterwards, maybe make a LOT entry.
% \begin{macrocode}
-\LWR at htmlblocktag{figcaption}%
-\csuse{fnum@\LTcaptype}\CaptionSeparator#3%
-\LWR at htmlblocktag{/figcaption}%
+ \LWR at htmlblocktag{figcaption}%
+ \csuse{fnum@\LTcaptype}\CaptionSeparator#3%
+ \LWR at htmlblocktag{/figcaption}%
% \end{macrocode}
% See if an optional caption was given:
% \begin{macrocode}
-\ifthenelse{\equal{#2}{}}% TOC entry empty
+ \ifthenelse{\equal{#2}{}}% TOC entry empty
% \end{macrocode}
% if the optional caption was given, but empty, do not form a TOC entry
% \begin{macrocode}
-{}%
+ {}%
% \end{macrocode}
% If the optional caption was given, but might only be |[]|:
% \begin{macrocode}
-{% TOC entry not empty
-\IfNoValueTF{#2}% No TOC entry?
+ {% TOC entry not empty
+ \IfNoValueTF{#2}% No TOC entry?
% \end{macrocode}
% The optional caption is |[]|:
% \begin{macrocode}
-{% No TOC entry
-\addcontentsline%
-{\csuse{ext@\LTcaptype}}%
-{\LTcaptype}%
-{%
-\protect\numberline%
-{\csuse{p@\LTcaptype}\csuse{the\LTcaptype}}%
-{\ignorespaces #3\protect\relax}%
-}%
-}% end of No TOC entry
+ {% No TOC entry
+ \addcontentsline%
+ {\csuse{ext@\LTcaptype}}%
+ {\LTcaptype}%
+ {%
+ \protect\numberline%
+ {\csuse{p@\LTcaptype}\csuse{the\LTcaptype}}%
+ {\ignorespaces #3\protect\relax}%
+ }%
+ }% end of No TOC entry
% \end{macrocode}
% The optional caption has text enclosed:
% \begin{macrocode}
-{% yes TOC entry
-\addcontentsline%
-{\csuse{ext@\LTcaptype}}%
-{\LTcaptype}%
-{%
-\protect\numberline%
-{\csuse{p@\LTcaptype}\csuse{the\LTcaptype}}%
-{\ignorespaces #2\protect\relax}%
-}%
-}% end of yes TOC entry
-}% end of TOC entry not empty
+ {% yes TOC entry
+ \addcontentsline%
+ {\csuse{ext@\LTcaptype}}%
+ {\LTcaptype}%
+ {%
+ \protect\numberline%
+ {\csuse{p@\LTcaptype}\csuse{the\LTcaptype}}%
+ {\ignorespaces #2\protect\relax}%
+ }%
+ }% end of yes TOC entry
+ }% end of TOC entry not empty
}% end of no star
% \end{macrocode}
% Skip any trailing |@| or |!| columns for this cell:
@@ -14638,10 +14906,10 @@
% If at the left-most column, also skip the leftmost |@| and |!| cells:
% \begin{macrocode}
\ifthenelse{\value{LWR at tablecolspos}=1}{%
-\edef\LWR at atbangspec{\LWR at getexparray{LWR at colatspec}{leftedge}}%
-\ifdefempty{\LWR at atbangspec}{}{\addtocounter{LWR at tabhtmlcoltotal}{1}}%
-\edef\LWR at atbangspec{\LWR at getexparray{LWR at colbangspec}{leftedge}}%
-\ifdefempty{\LWR at atbangspec}{}{\addtocounter{LWR at tabhtmlcoltotal}{1}}%
+ \edef\LWR at atbangspec{\LWR at getexparray{LWR at colatspec}{leftedge}}%
+ \ifdefempty{\LWR at atbangspec}{}{\addtocounter{LWR at tabhtmlcoltotal}{1}}%
+ \edef\LWR at atbangspec{\LWR at getexparray{LWR at colbangspec}{leftedge}}%
+ \ifdefempty{\LWR at atbangspec}{}{\addtocounter{LWR at tabhtmlcoltotal}{1}}%
}{}%
}
% \end{macrocode}
@@ -14857,6 +15125,7 @@
% since \pkg{siunitx} might redefine tabular in the user's document.
%
% \changes{v0.34}{2017/08/08}{\pkg{booktabs}: Works inside \env{lateximage}.}
+% \changes{v0.36}{2017/08/16}{Fix for \protect\pkg{babel-french}.}
%
% \begin{macrocode}
\StartDefiningTabulars
@@ -14878,6 +15147,10 @@
% \begin{macrocode}
\global\boolfalse{LWR at doingtbrule}%
% \end{macrocode}
+% For \pkg{babel-french}:
+% \begin{macrocode}
+\LWR at FBcancel%
+% \end{macrocode}
% Have not yet found the end of tabular command:
% \begin{macrocode}
\boolfalse{LWR at exitingtabular}%
@@ -15055,7 +15328,7 @@
% \item [\cs{ltx at label}:] \LaTeX\ \cs{label},
% (\HTML: patched by \pkg{lwarp},) later patched by \pkg{cleveref}.
% \end{description}
-% \item [Added by \pkg{cleverref}:] \hfill (print and \HTML)
+% \item [Added by \pkg{cleveref}:] \hfill (print and \HTML)
% \begin{description}
% \item [\cs{refstepcounter:}] Added: sets \cs{cref at currentlabel}.
% \item [\cs{cref at currentlabel}:] (|<type>|=|<ctr>| unless an alias is used):
@@ -15242,21 +15515,21 @@
% If not doing a lateximage, create an \HTML\ ID tag:
% (To be factored\dots)
% \begin{macrocode}
-\ifbool{LWR at doingstartpars}%
-{% pars allowed
-\ifbool{LWR at doingapar}
-{% par started
-\LWR at htmltag{a id="#1"{}}\LWR at htmltag{/a}%
-}% par started
-{% par not started
-\LWR at stoppars%
-\LWR at htmltag{a id="#1"{}}\LWR at htmltag{/a}%
-\LWR at startpars%
-}% par not started
-}% pars allowed
-{% pars not allowed
-\LWR at htmltag{a id="#1"{}}\LWR at htmltag{/a}%
-}% pars not allowed
+ \ifbool{LWR at doingstartpars}%
+ {% pars allowed
+ \ifbool{LWR at doingapar}
+ {% par started
+ \LWR at htmltag{a id="#1"{}}\LWR at htmltag{/a}%
+ }% par started
+ {% par not started
+ \LWR at stoppars%
+ \LWR at htmltag{a id="#1"{}}\LWR at htmltag{/a}%
+ \LWR at startpars%
+ }% par not started
+ }% pars allowed
+ {% pars not allowed
+ \LWR at htmltag{a id="#1"{}}\LWR at htmltag{/a}%
+ }% pars not allowed
}% not lateximage
}
% \end{macrocode}
@@ -15334,8 +15607,9 @@
% so create a link with an unknown destination:
% \begin{macrocode}
{%
-\LWR at traceinfo{LWR at startref D0: ??}%
-??}%
+ \LWR at traceinfo{LWR at startref D0: ??}%
+ ??%
+}%
% \end{macrocode}
% If |LWR at lateximagedepth| is known.
% Use a lateximage if the depth is greater than zero,
@@ -15342,17 +15616,17 @@
% or a regular link otherwise:
% \begin{macrocode}
{%
-\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 lidref}%
-lateximage\LWR at lateximagenumberref{#1}%
+ \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 lidref}%
+ lateximage\LWR at lateximagenumberref{#1}%
+ }%
+ {%
+ \LWR at traceinfo{LWR at startref D3}%
+ #1%
+ }%
}%
-{%
-\LWR at traceinfo{LWR at startref D3}%
-#1%
-}%
-}%
\LWR at traceinfo{LWR at startref E}%
% \end{macrocode}
% Closing quote:
@@ -15903,12 +16177,12 @@
\renewcommand*{\addcontentsline}[3]{%
\ifthenelse{\equal{#1}{toc}}{}{%
-\ifthenelse{\equal{#1}{thm}}{\csdef{ext@#2}{thm}}{}
-\addtocontents{\@nameuse{ext@#2}}{%
-\protect\LWRsetnextfloat%
-{\arabic{LWR at latestautopage}}%
-{\arabic{LWR at thisfloat}}%
-}% addtocontents
+ \ifthenelse{\equal{#1}{thm}}{\csdef{ext@#2}{thm}}{}
+ \addtocontents{\@nameuse{ext@#2}}{%
+ \protect\LWRsetnextfloat%
+ {\arabic{LWR at latestautopage}}%
+ {\arabic{LWR at thisfloat}}%
+ }% addtocontents
}% not toc
\LWR at origaddcontentsline{#1}{#2}{#3}%
}
@@ -16074,22 +16348,22 @@
% Copy the |.toc| file to |.sidetoc| for printing the side\TOC.
% The original |.toc| file is renewed when \cs{tableofcontents} is finished.
% \begin{macrocode}
-\LWR at copyfile{\jobname.toc}{\jobname.sidetoc}%
-\LWR at printpendingfootnotes
-\LWR at origtableofcontents
+ \LWR at copyfile{\jobname.toc}{\jobname.sidetoc}%
+ \LWR at printpendingfootnotes
+ \LWR at origtableofcontents
}
}
\renewcommand*{\listoffigures}{
\ifbool{FormatWordProcessor}{}{
-\LWR at printpendingfootnotes
-\LWR at origlistoffigures
+ \LWR at printpendingfootnotes
+ \LWR at origlistoffigures
}
}
\renewcommand*{\listoftables}{
\ifbool{FormatWordProcessor}{}{
-\LWR at printpendingfootnotes
-\LWR at origlistoftables
+ \LWR at printpendingfootnotes
+ \LWR at origlistoftables
}
}
% \end{macrocode}
@@ -16238,14 +16512,14 @@
% Respond to tocdepth:
% \begin{macrocode}
\ifthenelse{\cnttest{#1}{<=}{\value{tocdepth}}}{%
-\LWR at startpars%
+ \LWR at startpars%
% \end{macrocode}
% Create an \HTML\ link to filename\#autosec-(page), with text of the caption,
% of the given \HTML\ class.
% \begin{macrocode}
-\LWR at subhyperrefclass{%
-\LWR at htmlrefsectionfilename{autopage-#4}\#autosec-#4}{#3}{toc#2}%
-\LWR at stoppars%
+ \LWR at subhyperrefclass{%
+ \LWR at htmlrefsectionfilename{autopage-#4}\#autosec-#4}{#3}{toc#2}%
+ \LWR at stoppars%
}
{}
}
@@ -16294,17 +16568,17 @@
% \begin{macrocode}
\LWR at traceinfo{hypertocfloat depth is #1 #3depth is \arabic{#3depth}}%
\ifthenelse{\cnttest{#1}{<=}{\arabic{#3depth}}}{%
-\LWR at startpars%
+ \LWR at startpars%
% \end{macrocode}
% Create an \HTML\ link to
% filename\#autofloat-(float number), with text of the caption,
% of the given \HTML\ class.
% \begin{macrocode}
-\LWR at subhyperrefclass{%
-\LWR at htmlrefsectionfilename{autopage-\arabic{LWR at nextautopage}}%
-\#autofloat-\arabic{LWR at nextautofloat}}%
-{#4}{toc#2}%
-\LWR at stoppars%
+ \LWR at subhyperrefclass{%
+ \LWR at htmlrefsectionfilename{autopage-\arabic{LWR at nextautopage}}%
+ \#autofloat-\arabic{LWR at nextautofloat}}%
+ {#4}{toc#2}%
+ \LWR at stoppars%
}{}%
}
% \end{macrocode}
@@ -16314,11 +16588,11 @@
% \begin{macrocode}
\renewcommand{\l at part}[2]{\hypertoc{-1}{part}{#1}{#2}}
\DeclareDocumentCommand{\l at chapter}{m m}
- {\hypertoc{0}{chapter}{#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}{subsubsection}{#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}}
@@ -16364,8 +16638,8 @@
% the documentclass.
% \begin{macrocode}
\@ifundefined{chapter}
- {\newcommand*{\LWR at indexsection}{\section{\indexname}}}
- {\newcommand*{\LWR at indexsection}{\chapter{\indexname}}}
+ {\newcommand*{\LWR at indexsection}{\section{\indexname}}}
+ {\newcommand*{\LWR at indexsection}{\chapter{\indexname}}}
% \end{macrocode}
% \end{macro}
@@ -16617,10 +16891,10 @@
% For SVG, print the math inside a \env{lateximage}, with an ALT tag of the \LaTeX\ code:
% \begin{macrocode}
{% not mathjax
-\begin{lateximage}%
-[\textbackslash( \LWR at HTMLsanitize{#1} \textbackslash)]%
-\LWR at origdollar#1\LWR at origdollar%
-\end{lateximage}%
+ \begin{lateximage}%
+ [\textbackslash( \LWR at HTMLsanitize{#1} \textbackslash)]%
+ \LWR at origdollar#1\LWR at origdollar%
+ \end{lateximage}%
}%
}
@@ -16725,19 +16999,19 @@
% Tell MathJax that the next set of equations begins with the current \LaTeX{} equation
% number, plus one.
% \begin{macrocode}
-\setcounter{LWR at nextequation}{\value{equation}}
-\addtocounter{LWR at nextequation}{1}
+ \setcounter{LWR at nextequation}{\value{equation}}
+ \addtocounter{LWR at nextequation}{1}
% \end{macrocode}
% Place the MathJax command inside ``\cs{(}'' and ``\cs{)}'' characters,
% to be printed to \HTML, not interpreted by \LaTeX.
% \begin{macrocode}
-\InlineClass{hidden}{
-\textbackslash(
-\textbackslash{}seteqnumber \{\arabic{LWR at nextequation}\}
-\textbackslash)
+ \InlineClass{hidden}{
+ \textbackslash(
+ \textbackslash{}seteqnumber \{\arabic{LWR at nextequation}\}
+ \textbackslash)
+ }
+}{}% not eq > 0
}
-}{}% not eq > 1
-}
% \end{macrocode}
% \end{macro}
%
@@ -16747,10 +17021,13 @@
% \begin{macro}{\LWR at restoreorigformatting}
% While producing \SVG\ math or a \env{lateximage},
% use regular \LaTeX\ formatting instead of \HTML\ tags.
+% \label{sec:restoreorigformatting}
% \changes{v0.34}{2017/08/05}{Improved font control.}
% \changes{v0.34}{2017/08/08}{\pkg{booktabs}: Works inside \env{lateximage}.}
+% \changes{v0.36}{2017/08/16}{\pkg{siunitx}: Improved super/subscripts in a \env{lateximage}.}
% \begin{macrocode}
\newcommand*{\LWR at restoreorigformatting}{%
+\LWR at traceinfo{LWR at restoreorigformatting}%
\LetLtxMacro{\hspace}{\LWR at orighspace}%
\LetLtxMacro\rule\LWR at origrule%
\let\,\LWR at origcomma% disable HTML short unbreakable space
@@ -16776,9 +17053,14 @@
\LetLtxMacro{\itshape}{\LWR at origitshape}%
\LetLtxMacro{\em}{\LWR at origem}%
\LetLtxMacro{\normalfont}{\LWR at orignormalfont}%
-\renewcommand*{\thefootnote}{\fnsymbol{footnote}}%
+\let\sp\LWR at origsp%
+\let\sb\LWR at origsb%
\let\textsuperscript\LWR at origtextsuperscript%
\let\textsubscript\LWR at origtextsubscript%
+\let\textdegree\LWR at origtextdegree%
+\let\textcelsius\LWR at origtextcelsius%
+\let\textohm\LWR at origtextohm%
+\let\textmu\LWR at origtextmu%
\let~\LWR at origtilde%
\let\enskip\LWR at origenskip%
\let\quad\LWR at origquad%
@@ -16799,13 +17081,16 @@
\let\reflectbox\LWR at origreflectbox%
\let\framebox\LWR at origframebox%
\let\makebox\LWR at origmakebox%
-\let\fbox\LWR at origfbox%
-\let\fboxBlock\LWR at origfbox%
-\LetLtxMacro{\fminipage}{\LWR at fminipageprint}%
-\LetLtxMacro{\endfminipage}{\endLWR at fminipageprint}%
+\let\fbox\LWRprint at fbox%
+\let\fboxBlock\LWRprint at fbox%
+\LetLtxMacro{\fminipage}{\LWRprint at fminipage}%
+\LetLtxMacro{\endfminipage}{\endLWRprint at fminipage}%
\LetLtxMacro{\minipage}{\LWR at origminipage}%
\let\endminipage\LWR at endminipage%
\LetLtxMacro{\parbox}{\LWR at origparbox}%
+\LWR at restoreorigxcolor%
+\LWR at restoremoreorigxcolor%
+\LWR at FBcancel%
}
% \end{macrocode}
% \end{macro}
@@ -16930,11 +17215,11 @@
% Print commands to syncronize MathJax's equation number and format
% to the current \LaTeX\ chapter/section and equation number:
% \begin{macrocode}
-\LWR at syncmathjax
+ \LWR at syncmathjax
% \end{macrocode}
% Print the \LaTeX\ math inside an \HTML\ comment:
% \begin{macrocode}
-\LWR at hidelatexequation{equation}{\BODY}
+ \LWR at hidelatexequation{equation}{\BODY}
}
% \end{macrocode}
% SVG output:
@@ -16946,17 +17231,17 @@
% \end{macrocode}
% Begin the \env{lateximage} with an ALT tag containing the math source:
% \begin{macrocode}
-\begin{lateximage}[(\theequation) \textbackslash{begin\{equation\}}%
- \LWR at HTMLsanitizeexpand{\detokenize\expandafter{\BODY}}%
- \textbackslash{end\{equation\}}]% alt tag
+ \begin{lateximage}[(\theequation) \textbackslash{begin\{equation\}}%
+ \LWR at HTMLsanitizeexpand{\detokenize\expandafter{\BODY}}%
+ \textbackslash{end\{equation\}}]% alt tag
% \end{macrocode}
% Create the actual \LaTeX-formatted equation inside
% the |lateximage| using the contents of the environment.
% \begin{macrocode}
-\LWR at origequation
-\BODY% contents collected by NewEnviron
-\LWR at origendequation
-\end{lateximage}%
+ \LWR at origequation
+ \BODY% contents collected by NewEnviron
+ \LWR at origendequation
+ \end{lateximage}%
}
% \end{macrocode}
@@ -17004,12 +17289,12 @@
% \end{macrocode}
% The combined \LaTeX\ \& \HTML\ label is printed in a \cs{text} field:
% \begin{macrocode}
-\text{
+ \text{
% \end{macrocode}
% Shift the label over to the right side of the environment to avoid
% over-printing the math:
% \begin{macrocode}
-\ifbool{LWR at amsmultline}{}{\hspace*{\totwidth@}}
+ \ifbool{LWR at amsmultline}{}{\hspace*{\totwidth@}}
% \end{macrocode}
% Temporarily end the \HTML\ comment,
% insert the \LaTeX{} \& \HTML\ label, then
@@ -17017,13 +17302,13 @@
% \cs{@firstofone} is required to remove extra braces
% introduced by the \pkg{amsmath} package.)
% \begin{macrocode}
-\LWR at htmlclosecomment%
-\LWR at origltx@label{#1}%
-\LWR at htmlopencomment%
-}% text
+ \LWR at htmlclosecomment%
+ \LWR at origltx@label{#1}%
+ \LWR at htmlopencomment%
+ }% text
}% mathjax
{%
-\LWR at origltx@label{#1}%
+ \LWR at origltx@label{#1}%
}%
}
% \end{macrocode}
@@ -17113,59 +17398,61 @@
% \HTML\ comment to trigger the correct equation number increment (if not starred),
% then are included verbatim in the output for MathJax to interpret:
% \begin{macrocode}
-\LWR at syncmathjax
-\boolfalse{LWR at amsmultline}
-\ifbool{LWR at numbereqnarray}
-{
+ \LWR at syncmathjax
+ \boolfalse{LWR at amsmultline}
+ \ifbool{LWR at numbereqnarray}
+ {
% \end{macrocode}
%
% If numbering the equations, execute a copy inside an \HTML\ comment block:
% \begin{macrocode}
-\LWR at beginhideamsmath
-\LWR at origeqnarray
-\BODY
-\LWR at origendeqnarray
-\LWR at endhideamsmath
+ \LWR at beginhideamsmath
+ \LWR at origeqnarray
+ \BODY
+ \LWR at origendeqnarray
+ \LWR at endhideamsmath
% \end{macrocode}
%
% Then print the (sanitized) contents to the output for MathJax to interpret:
% \begin{macrocode}
-\LWR at addmathjax{eqnarray}{\BODY}
-}{% not LWR at numbereqnarray
+ \LWR at addmathjax{eqnarray}{\BODY}
+ }%
+ {% not LWR at numbereqnarray
% \end{macrocode}
%
% If not numbering equations, just create the contents for MathJax:
% \begin{macrocode}
-\LWR at addmathjax{eqnarray*}{\BODY}
-}% LWR at numbereqnarray
+ \LWR at addmathjax{eqnarray*}{\BODY}
+ }% LWR at numbereqnarray
}% mathjax
{% not mathjax
-\ifbool{LWR at numbereqnarray}
-{
+ \ifbool{LWR at numbereqnarray}
+ {
% \end{macrocode}
%
% For numbered \SVG\ equations, first create a \env{lateximage} with
% an \attribute{alt} attribute containing sanitized copy of the source code:
% \begin{macrocode}
-\begin{lateximage}[\LWR at addmathjax{eqnarray}{\BODY}]
+ \begin{lateximage}[\LWR at addmathjax{eqnarray}{\BODY}]
% \end{macrocode}
% Then create the image contents using an actual \env{eqnarray}:
% \begin{macrocode}
-\LWR at origeqnarray
-\BODY
-\LWR at origendeqnarray
-\end{lateximage}
-}{% not LWR at numbereqnarray
+ \LWR at origeqnarray
+ \BODY
+ \LWR at origendeqnarray
+ \end{lateximage}
+ }%
+ {% not LWR at numbereqnarray
% \end{macrocode}
% If not numbered, do the same, but an extra \cs{nonumber} seems to be required:
% \begin{macrocode}
-\begin{lateximage}[\LWR at addmathjax{eqnarray*}{\BODY}]
-\LWR at origeqnarray
-\BODY
-\nonumber
-\LWR at origendeqnarray
-\end{lateximage}
-}% LWR at numbereqnarray
+ \begin{lateximage}[\LWR at addmathjax{eqnarray*}{\BODY}]
+ \LWR at origeqnarray
+ \BODY
+ \nonumber
+ \LWR at origendeqnarray
+ \end{lateximage}
+ }% LWR at numbereqnarray
}% not mathjax
% \end{macrocode}
%
@@ -17201,12 +17488,12 @@
\ifbool{mathjax}
{
-\LWR at syncmathjax
-\booltrue{LWR at amsmultline}
-\LWR at beginhideamsmath
+ \LWR at syncmathjax
+ \booltrue{LWR at amsmultline}
+ \LWR at beginhideamsmath
}
{
-\lateximage[LWRAMSMATHBODY]
+ \lateximage[LWRAMSMATHBODY]
}
}
@@ -17214,9 +17501,9 @@
\ifbool{mathjax}
{
-\LWR at endhideamsmath
-\boolfalse{LWR at amsmultline}
-\LWR at addmathjax{multline}{\the\@envbody}
+ \LWR at endhideamsmath
+ \boolfalse{LWR at amsmultline}
+ \LWR at addmathjax{multline}{\the\@envbody}
}
{\endlateximage}
@@ -17231,12 +17518,12 @@
\ifbool{mathjax}
{
-\LWR at syncmathjax
-\booltrue{LWR at amsmultline}
-\LWR at beginhideamsmath
+ \LWR at syncmathjax
+ \booltrue{LWR at amsmultline}
+ \LWR at beginhideamsmath
}
{
-\lateximage[LWRAMSMATHBODY]
+ \lateximage[LWRAMSMATHBODY]
}
}
@@ -17244,9 +17531,9 @@
\ifbool{mathjax}
{
-\LWR at endhideamsmath
-\boolfalse{LWR at amsmultline}
-\LWR at addmathjax{multline*}{\the\@envbody}
+ \LWR at endhideamsmath
+ \boolfalse{LWR at amsmultline}
+ \LWR at addmathjax{multline*}{\the\@envbody}
}
{\endlateximage}
@@ -17262,12 +17549,12 @@
\ifbool{mathjax}
{
-\LWR at syncmathjax
-\boolfalse{LWR at amsmultline}
-\LWR at beginhideamsmath
+ \LWR at syncmathjax
+ \boolfalse{LWR at amsmultline}
+ \LWR at beginhideamsmath
}
{
-\lateximage[LWRAMSMATHBODY]
+ \lateximage[LWRAMSMATHBODY]
}
}
@@ -17275,8 +17562,8 @@
\ifbool{mathjax}
{
-\LWR at endhideamsmath
-\LWR at addmathjax{gather}{\the\@envbody}
+ \LWR at endhideamsmath
+ \LWR at addmathjax{gather}{\the\@envbody}
}
{\endlateximage}
@@ -17290,12 +17577,12 @@
\ifbool{mathjax}
{
-\LWR at syncmathjax
-\boolfalse{LWR at amsmultline}
-\LWR at beginhideamsmath
+ \LWR at syncmathjax
+ \boolfalse{LWR at amsmultline}
+ \LWR at beginhideamsmath
}
{
-\lateximage[LWRAMSMATHBODY]
+ \lateximage[LWRAMSMATHBODY]
}
}
@@ -17303,8 +17590,8 @@
\ifbool{mathjax}
{
-\LWR at endhideamsmath
-\LWR at addmathjax{gather*}{\the\@envbody}
+ \LWR at endhideamsmath
+ \LWR at addmathjax{gather*}{\the\@envbody}
}
{\endlateximage}
@@ -17319,12 +17606,12 @@
\ifbool{mathjax}
{
-\LWR at syncmathjax
-\boolfalse{LWR at amsmultline}
-\LWR at beginhideamsmath
+ \LWR at syncmathjax
+ \boolfalse{LWR at amsmultline}
+ \LWR at beginhideamsmath
}
{
-\lateximage[LWRAMSMATHBODY]
+ \lateximage[LWRAMSMATHBODY]
}
}
@@ -17332,8 +17619,8 @@
\ifbool{mathjax}
{
-\LWR at endhideamsmath
-\LWR at addmathjax{align}{\the\@envbody}
+ \LWR at endhideamsmath
+ \LWR at addmathjax{align}{\the\@envbody}
}
{\endlateximage}
@@ -17348,12 +17635,12 @@
\ifbool{mathjax}
{
-\LWR at syncmathjax
-\boolfalse{LWR at amsmultline}
-\LWR at beginhideamsmath
+ \LWR at syncmathjax
+ \boolfalse{LWR at amsmultline}
+ \LWR at beginhideamsmath
}
{
-\lateximage[LWRAMSMATHBODY]
+ \lateximage[LWRAMSMATHBODY]
}
}
@@ -17361,8 +17648,8 @@
\ifbool{mathjax}
{
-\LWR at endhideamsmath
-\LWR at addmathjax{align*}{\the\@envbody}
+ \LWR at endhideamsmath
+ \LWR at addmathjax{align*}{\the\@envbody}
}
{\endlateximage}
@@ -17377,12 +17664,12 @@
\ifbool{mathjax}
{
-\LWR at syncmathjax
-\boolfalse{LWR at amsmultline}
-\LWR at beginhideamsmath
+ \LWR at syncmathjax
+ \boolfalse{LWR at amsmultline}
+ \LWR at beginhideamsmath
}
{
-\lateximage[LWRAMSMATHBODY]
+ \lateximage[LWRAMSMATHBODY]
}
}
@@ -17390,8 +17677,8 @@
\ifbool{mathjax}
{
-\LWR at endhideamsmath
-\LWR at addmathjax{flalign}{\the\@envbody}
+ \LWR at endhideamsmath
+ \LWR at addmathjax{flalign}{\the\@envbody}
}
{\endlateximage}
@@ -17406,12 +17693,12 @@
\ifbool{mathjax}
{
-\LWR at syncmathjax
-\boolfalse{LWR at amsmultline}
-\LWR at beginhideamsmath
+ \LWR at syncmathjax
+ \boolfalse{LWR at amsmultline}
+ \LWR at beginhideamsmath
}
{
-\lateximage[LWRAMSMATHBODY]
+ \lateximage[LWRAMSMATHBODY]
}
}
@@ -17419,8 +17706,8 @@
\ifbool{mathjax}
{
-\LWR at endhideamsmath
-\LWR at addmathjax{flalign*}{\the\@envbody}
+ \LWR at endhideamsmath
+ \LWR at addmathjax{flalign*}{\the\@envbody}
}
{\endlateximage}
@@ -17536,8 +17823,13 @@
%
% Two versions follow, depending on expansion needs.
% There may be a better way\dots
+%
+% \changes{v0.36}{2017/08/16}{Fix for \protect\pkg{babel-french}.}
+%
% \begin{macrocode}
\newcommand{\LWR at HTMLsanitize}[1]{%
+\begingroup%
+\LWR at FBcancel%
\protect\StrSubstitute{\detokenize{#1}}%
{\detokenize{&}}%
{\detokenize{&}}[\LWR at strresult]%
@@ -17554,6 +17846,7 @@
{\#}%
[\LWR at strresult]%
\LWR at strresult%
+\endgroup%
}
% \end{macrocode}
% \end{macro}
@@ -17561,8 +17854,13 @@
% \begin{macro}{\LWR at HTMLsanitizeexpand} \marg{text}
%
% This version expands the argument before sanitizing it.
+%
+% \changes{v0.36}{2017/08/16}{Fix for \protect\pkg{babel-french}.}
+%
% \begin{macrocode}
\newcommand{\LWR at HTMLsanitizeexpand}[1]{%
+\begingroup%
+\LWR at FBcancel%
\protect\StrSubstitute{\detokenize\expandafter{#1}}%
{\detokenize{&}}%
{\detokenize{&}}%
@@ -17576,6 +17874,7 @@
{\detokenize{>}}%
[\LWR at strresult]%
\LWR at strresult%
+\endgroup%
}
% \end{macrocode}
% \end{macro}
@@ -17592,11 +17891,14 @@
% \changes{v0.34}{2017/07/29}{Fix: \env{lateximage} with
% \env{minipage}, \cs{parbox}, \cs{makebox}, \cs{fbox}, \cs{framebox},
% \cs{raisebox}, \cs{scalebox}, \cs{reflectbox}.}
+% \changes{v0.36}{2017/08/16}{Footnotes appear in regular text instead of
+% the \protect\env{lateximage} \protect\env{minipage}.}
%
% \begin{macrocode}
\catcode`\$=\active%
-\NewDocumentEnvironment{lateximage}{O{image}}{%
+\NewDocumentEnvironment{lateximage}{O{image}}
+{%
\LWR at traceinfo{lateximage: starting on page \arabic{page}}%
\ifthenelse{\cnttest{\value{LWR at lateximagedepth}}{>}{0}}%
% \end{macrocode}
@@ -17603,7 +17905,7 @@
% If nesting inside an already-existing lateximage, simply record one more level:
% \begin{macrocode}
{%
-\addtocounter{LWR at lateximagedepth}{1}%
+ \addtocounter{LWR at lateximagedepth}{1}%
}%
% \end{macrocode}
% Otherwise, this is the outer-most lateximage:
@@ -17612,102 +17914,121 @@
% \end{macrocode}
% Starting a new lateximage:
% \begin{macrocode}
-\addtocounter{LWR at lateximagenumber}{1}%
-\LWR at traceinfo{lateximage: LWR at lateximagenumber is \arabic{LWR at lateximagenumber}}%
+ \addtocounter{LWR at lateximagenumber}{1}%
+ \LWR at traceinfo{lateximage: LWR at lateximagenumber is \arabic{LWR at lateximagenumber}}%
% \end{macrocode}
% While inside a lateximage, locally do not use mathjax:
% \begin{macrocode}
-\boolfalse{mathjax}
+ \boolfalse{mathjax}
% \end{macrocode}
% Be sure that are doing a paragraph:
% \begin{macrocode}
-\LWR at ensuredoingapar%
+ \LWR at ensuredoingapar%
% \end{macrocode}
% Next file:
% \begin{macrocode}
-\addtocounter{LWR at externalfilecnt}{1}%
-\LWR at traceinfo{lateximage: LWR at externalfilecnt is \arabic{LWR at externalfilecnt}}%
+ \addtocounter{LWR at externalfilecnt}{1}%
+ \LWR at traceinfo{lateximage: LWR at externalfilecnt is \arabic{LWR at externalfilecnt}}%
% \end{macrocode}
% Figure out what the next page number will be:
% \begin{macrocode}
-\setcounterpageref{LWR at LIpage}{LWRlateximage\theLWR at lateximagenumber}%
-\LWR at traceinfo{lateximage: LWR at LIpage is \arabic{LWR at LIpage}}%
+ \setcounterpageref{LWR at LIpage}{LWRlateximage\theLWR at lateximagenumber}%
+ \LWR at traceinfo{lateximage: LWR at LIpage is \arabic{LWR at LIpage}}%
% \end{macrocode}
% Create an \HTML\ span which will hold the comment which contains the |pdftotext| translation
% of the image's page, and also will hold the link to the |.svg| file:
% \begin{macrocode}
-\LWR at htmltag{span id="lateximage\arabic{LWR at lateximagenumber}" %
-class="lateximagesource"{}} \LWR at orignewline
+ \LWR at htmltag{span id="lateximage\arabic{LWR at lateximagenumber}" %
+ class="lateximagesource"{}} \LWR at orignewline
% \end{macrocode}
% Write instructions to the |lateximages.txt| file:
% \begin{macrocode}
-\LWR at traceinfo{lateximage: about to write to lateximages.txt}%
-\immediate\write\LWR at file{|\theLWR at LIpage|\theLWR at externalfilecnt|}%
+ \LWR at traceinfo{lateximage: about to write to lateximages.txt}%
+ \immediate\write\LWR at file{|\theLWR at LIpage|\theLWR at externalfilecnt|}%
% \end{macrocode}
% Place an open comment tag at the bottom of page; footnotes will be above this tag.
% This will hide any traces of the lateximage \PDF\ page which were picked up by
% |pdftotext|.
% \begin{macrocode}
-\LWR at traceinfo{lateximage: about to create open comment}%
-\LWR at htmlopencomment%
+ \LWR at traceinfo{lateximage: about to create open comment}%
+ \LWR at htmlopencomment%
% \end{macrocode}
% One level deeper:
% \begin{macrocode}
-\addtocounter{LWR at lateximagedepth}{1}%
+ \addtocounter{LWR at lateximagedepth}{1}%
% \end{macrocode}
% Start the new \PDF\ page:
% \begin{macrocode}
-\LWR at traceinfo{lateximage: about to create new page}%
-\LWR at orignewpage%
+ \LWR at traceinfo{lateximage: about to create new page}%
+ \LWR at orignewpage%
% \end{macrocode}
% Typeset the image in a ``standard'' width page and font size:
% \begin{macrocode}
-\LWR at traceinfo{lateximage: about to create minipage}%
-\LWR at origminipage{6in}%
-\csuse{LWR at orig\LateximageFontSizeName}%
+ \LWR at traceinfo{lateximage: about to create minipage}%
+ \LWR at origminipage{6in}%
+ \csuse{LWR at orig\LateximageFontSizeName}%
% \end{macrocode}
% Temporarily restore formatting to its \PDF\ definitions:
% Do not produce \HTML\ tags for \cs{hspace}, etc. inside a lateximage.
% \begin{macrocode}
-\LWR at traceinfo{lateximage: about to temporarily restore formatting}%
-\LWR at restoreorigformatting%
-\LWR at traceinfo{lateximage: about to create label}%
-\LWR at origlabel{LWRlateximage\arabic{LWR at lateximagenumber}}%
-\LWR at traceinfo{lateximage: finished creating the label}%
-\LetLtxMacro$\LWR at origdollar%
-\catcode`\$=3% math shift
-\LetLtxMacro\(\LWR at origopenparen%
-\LetLtxMacro\)\LWR at origcloseparen%
-\LetLtxMacro\[\LWR at origopenbracket%
-\LetLtxMacro\]\LWR at origclosebracket%
-\let\@ensuredmath\LWR at orig@ensuredmath%
+ \LWR at traceinfo{lateximage: about to temporarily restore formatting}%
+ \LWR at restoreorigformatting%
+% \end{macrocode}
+% Use full-page footnotes instead of minipage footnotes.
+% These become \HTML\ footnotes.
+% \begin{macrocode}
+ \def\@mpfn{footnote}%
+ \def\thempfn{\thefootnote}%
+ \let\@footnotetext\LWR at footnotetext%
+% \end{macrocode}
+% Create the |LWRlateximage<number>| label:
+% \begin{macrocode}
+ \LWR at traceinfo{lateximage: about to create label}%
+ \LWR at origlabel{LWRlateximage\arabic{LWR at lateximagenumber}}%
+ \LWR at traceinfo{lateximage: finished creating the label}%
+% \end{macrocode}
+% Enable print-mode math functions:
+% \begin{macrocode}
+ \LetLtxMacro$\LWR at origdollar%
+ \catcode`\$=3% math shift
+ \LetLtxMacro\(\LWR at origopenparen%
+ \LetLtxMacro\)\LWR at origcloseparen%
+ \LetLtxMacro\[\LWR at origopenbracket%
+ \LetLtxMacro\]\LWR at origclosebracket%
+ \let\@ensuredmath\LWR at orig@ensuredmath%
}% end of outer-most lateximage
\LWR at traceinfo{lateximage: finished start of environment}%
}% end of \begin{lateximage}
+% \end{macrocode}
+%
+% When the environment closes:
+%
+% \begin{macrocode}
{% start of \end{lateximage}
\LWR at traceinfo{lateximage: starting end of environment}%
+% \end{macrocode}
+% Nested more than one deep?
+% \begin{macrocode}
\ifthenelse{\cnttest{\value{LWR at lateximagedepth}}{>}{1}}%
% \end{macrocode}
% If nesting inside an already-existing lateximage, simply record one more level:
% \begin{macrocode}
-{%
-\addtocounter{LWR at lateximagedepth}{-1}%
-}%
+{\addtocounter{LWR at lateximagedepth}{-1}}%
% \end{macrocode}
-% if this is the outer-most lateximage:
+% If this is the outer-most lateximage:
% \begin{macrocode}
{% end of outer-most lateximage
% \end{macrocode}
% Finish the lateximage minipage and start a new \PDF\ page:
% \begin{macrocode}
-\LWR at origendminipage%
-\LWR at orignewpage%
-\LWR at origscriptsize%
+ \LWR at origendminipage%
+ \LWR at orignewpage%
+ \LWR at origscriptsize%
% \end{macrocode}
% Close the \HTML\ comment which encapsulated any traces of the lateximage picked up by |pdftotext|:
% \begin{macrocode}
-\LWR at htmlclosecomment{}\LWR at orignewline%
-\LWR at traceinfo{lateximage: The page after the image is \arabic{page}}%
+ \LWR at htmlclosecomment{}\LWR at orignewline%
+ \LWR at traceinfo{lateximage: The page after the image is \arabic{page}}%
% \end{macrocode}
% Create a link to the lateximage, allowing its natural height:
%
@@ -17714,37 +18035,37 @@
% If the alt tag is given as ``LWRAMSMATHBODY'', then use the text collected by the
% amsmath multline, gather, or align environments.
% \begin{macrocode}
-\ifthenelse{\equal{#1}{LWRAMSMATHBODY}}%
-{%
-\LWR at subinlineimage[%
-\LWR at HTMLsanitizeexpand{\detokenize\expandafter{\the\@envbody}}%
-]%
-{lateximage}%
-{lateximages\OSPathSymbol{}lateximage-\theLWR at externalfilecnt}%
-{svg}%
-{}%
-}%
-{%
-\LWR at subinlineimage[#1]{lateximage}%
-{lateximages\OSPathSymbol{}lateximage-\theLWR at externalfilecnt}{svg}{}%
-}%
+ \ifthenelse{\equal{#1}{LWRAMSMATHBODY}}%
+ {%
+ \LWR at subinlineimage[%
+ \LWR at HTMLsanitizeexpand{\detokenize\expandafter{\the\@envbody}}%
+ ]%
+ {lateximage}%
+ {lateximages\OSPathSymbol{}lateximage-\theLWR at externalfilecnt}%
+ {svg}%
+ {}%
+ }%
+ {%
+ \LWR at subinlineimage[#1]{lateximage}%
+ {lateximages\OSPathSymbol{}lateximage-\theLWR at externalfilecnt}{svg}{}%
+ }%
% \LWR at orignewline% Removed to prevent extra space.
% \end{macrocode}
% Be sure that are doing a paragraph:
% \begin{macrocode}
-\LWR at ensuredoingapar%
+ \LWR at ensuredoingapar%
% \end{macrocode}
% Close the \HTML\ span which has the |pdftotext| comment and also the link to the |.svg| image:
% \begin{macrocode}
-\LWR at htmltag{/span}%
-\ifbool{HTMLDebugComments}{%
-\LWR at htmlcomment{End of lateximage}%
-}{}%
+ \LWR at htmltag{/span}%
+ \ifbool{HTMLDebugComments}{%
+ \LWR at htmlcomment{End of lateximage}%
+ }{}%
% \LWR at orignewline% Removed to prevent extra space.
% \end{macrocode}
% Undo one lateximage level:
% \begin{macrocode}
-\addtocounter{LWR at lateximagedepth}{-1}%
+ \addtocounter{LWR at lateximagedepth}{-1}%
}% end of outer-most lateximage
\LWR at traceinfo{lateximage: done}%
}%
@@ -17828,6 +18149,7 @@
%
% \limitssiunitx
%
+% \changes{v0.36}{2017/08/16}{\pkg{siunitx}: Fix for \pkg{babel-french}.}
% \codehtml
% \begin{macrocode}
@@ -17838,11 +18160,12 @@
% Options for siunitx:
% \begin{macrocode}
\PassOptionsToPackage{
- detect-mode=true,
- per-mode=symbol, % fraction is not seen by pdftotext
- text-celsius = {\HTMLentity{deg}C},
- text-degree = {\HTMLentity{deg}},
+ detect-mode=true,
+ per-mode=symbol, % fraction is not seen by pdftotext
+% text-celsius = {\protect\LWRsiunitx at degree{}C},
+% text-degree = {\protect\LWRsiunitx at degree},
}{siunitx}
+
% \end{macrocode}
% \begin{macrocode}
@@ -17935,23 +18258,23 @@
% \end{macrocode}
% Default to use the converted fixed length given:
% \begin{macrocode}
-\uselengthunit{PT}%
-\renewcommand*{\LWR at igwidthstyle}{width:\rndprintlength{\LWR at igwidth}}%
+ \uselengthunit{PT}%
+ \renewcommand*{\LWR at igwidthstyle}{width:\rndprintlength{\LWR at igwidth}}%
% \end{macrocode}
% If ex or em dimensions were given, use those instead:
% \begin{macrocode}
-\IfEndWith{#1}{ex}%
-{\renewcommand*{\LWR at igwidthstyle}{width:#1}}% yes ex
-{}% not ex
-\IfEndWith{#1}{em}%
-{\renewcommand*{\LWR at igwidthstyle}{width:#1}}% yes em
-{}% not em
-\IfEndWith{#1}{\%}%
-{\renewcommand*{\LWR at igwidthstyle}{width:#1}}% yes percent
-{}% not percent
-\IfEndWith{#1}{px}%
-{\renewcommand*{\LWR at igwidthstyle}{width:#1}}% yes px
-{}% not px
+ \IfEndWith{#1}{ex}%
+ {\renewcommand*{\LWR at igwidthstyle}{width:#1}}% yes ex
+ {}% not ex
+ \IfEndWith{#1}{em}%
+ {\renewcommand*{\LWR at igwidthstyle}{width:#1}}% yes em
+ {}% not em
+ \IfEndWith{#1}{\%}%
+ {\renewcommand*{\LWR at igwidthstyle}{width:#1}}% yes percent
+ {}% not percent
+ \IfEndWith{#1}{px}%
+ {\renewcommand*{\LWR at igwidthstyle}{width:#1}}% yes px
+ {}% not px
}{}% end of length > 0pt
}
% \end{macrocode}
@@ -17965,25 +18288,25 @@
% \end{macrocode}
% Default to use the converted fixed length given:
% \begin{macrocode}
-\uselengthunit{PT}%
-\renewcommand*{\LWR at igheightstyle}{%
-height:\rndprintlength{\LWR at igheight} %
-}%
+ \uselengthunit{PT}%
+ \renewcommand*{\LWR at igheightstyle}{%
+ height:\rndprintlength{\LWR at igheight} %
+ }%
% \end{macrocode}
% If ex or em dimensions were given, use those instead:
% \begin{macrocode}
-\IfEndWith{#1}{ex}%
-{\renewcommand*{\LWR at igheightstyle}{height:#1}}% yes ex
-{}% not ex
-\IfEndWith{#1}{em}%
-{\renewcommand*{\LWR at igheightstyle}{height:#1}}% yes em
-{}% not em
-\IfEndWith{#1}{\%}%
-{\renewcommand*{\LWR at igheightstyle}{height:#1}}% yes percent
-{}% not percent
-\IfEndWith{#1}{px}%
-{\renewcommand*{\LWR at igheightstyle}{height:#1}}% yes px
-{}% not px
+ \IfEndWith{#1}{ex}%
+ {\renewcommand*{\LWR at igheightstyle}{height:#1}}% yes ex
+ {}% not ex
+ \IfEndWith{#1}{em}%
+ {\renewcommand*{\LWR at igheightstyle}{height:#1}}% yes em
+ {}% not em
+ \IfEndWith{#1}{\%}%
+ {\renewcommand*{\LWR at igheightstyle}{height:#1}}% yes percent
+ {}% not percent
+ \IfEndWith{#1}{px}%
+ {\renewcommand*{\LWR at igheightstyle}{height:#1}}% yes px
+ {}% not px
}{}% end of length > 0pt
}
% \end{macrocode}
@@ -18080,6 +18403,11 @@
\boolfalse{LWR at infloatrow}
% \end{macrocode}
+% \cs{LWR at opacity} may be set by the \pkg{transparent} package.
+% For \HTML\ it is only used for \cs{includegraphics}.
+% \begin{macrocode}
+\def\LWR at opacity{1}
+% \end{macrocode}
% \begin{macrocode}
@@ -18115,14 +18443,15 @@
% Temporarily compute |\linewidth|, |\textwidth|, |\textheight| arguments with a 6x9 inch size
% until the next |\endgroup|.
% \begin{macrocode}
-\ifthenelse{\cnttest{\value{LWR at minipagedepth}}{=}{0}}{%
-\ifbool{LWR at infloatrow}%
-{}
-{% not in a minipage or a floatrow:
-\setlength{\linewidth}{6in}%
-\setlength{\textwidth}{6in}%
-\setlength{\textheight}{9in}%
-}%
+\ifthenelse{\cnttest{\value{LWR at minipagedepth}}{=}{0}}%
+{%
+ \ifbool{LWR at infloatrow}%
+ {}
+ {% not in a minipage or a floatrow:
+ \setlength{\linewidth}{6in}%
+ \setlength{\textwidth}{6in}%
+ \setlength{\textheight}{9in}%
+ }%
}{}%
% \end{macrocode}
% See if can find the image by adding an extension:
@@ -18206,12 +18535,12 @@
% Only include a style tag if a width, height, angle, or scale was given:
% \begin{macrocode}
\ifthenelse{
- \NOT\equal{\LWR at igwidthstyle}{} \OR
- \NOT\equal{\LWR at igheightstyle}{} \OR
- \NOT\equal{\LWR at igorigin}{} \OR
- \NOT\equal{\LWR at igangle}{} \OR
- \NOT\equal{\LWR at igxscale}{1} \OR
- \NOT\equal{\LWR at igyscale}{1}
+ \NOT\equal{\LWR at igwidthstyle}{} \OR
+ \NOT\equal{\LWR at igheightstyle}{} \OR
+ \NOT\equal{\LWR at igorigin}{} \OR
+ \NOT\equal{\LWR at igangle}{} \OR
+ \NOT\equal{\LWR at igxscale}{1} \OR
+ \NOT\equal{\LWR at igyscale}{1}
}%
{\LWR at origtilde{} style="%
\ifthenelse{\NOT\equal{\LWR at igwidthstyle}{}}%
@@ -18231,6 +18560,11 @@
{\LWR at scalestyle{-ms-}{\LWR at igxscale}{\LWR at igyscale}%
\LWR at scalestyle{-webkit-}{\LWR at igxscale}{\LWR at igyscale}%
\LWR at scalestyle{}{\LWR at igxscale}{\LWR at igyscale}}{}%
+%
+\ifthenelse{\NOT\equal{\LWR at opacity}{1}}%
+{opacity:\LWR at opacity;}%
+{}%
+%
" \LWR at orignewline}{}%
% \end{macrocode}
% Set the class:
@@ -18461,7 +18795,237 @@
% \end{macrocode}
+% \section{Xcolor defaults}
+%
+% The following are used when \pkg{xcolor} is not loaded:
+% \subsection{Defaults without \protect\pkg{xcolor}}
+% \label{sec:xcolordefaults}
+%
+% \codeall
+%
+% \begin{macrocode}
+\begin{warpall}
+% \end{macrocode}
+
+% The following is used if \pkg{xcolor} is not loaded, and is
+% replaced when \pkg{lwarp-xcolor} is loaded.
+%
+% If \pkg{xcolor} is not loaded, there is no \pkg{xcolor} formatting to restore:
+% \begin{macrocode}
+\newcommand*{\LWR at restoreorigxcolor}{}
+\newcommand*{\LWR at restoremoreorigxcolor}{}
+% \end{macrocode}
+
+% \begin{macrocode}
+\end{warpall}
+% \end{macrocode}
+
+
+% \subsection{\protect\pkg{xcolor} print-mode additions}
+% \label{sec:xcolorpatches}
+%
+% Print-mode versions of new \pkg{xcolor} defintions.
+% These are defined inside \env{warpall} because they are also used
+% for \HTML\ while inside a \env{lateximage}.
+% They are defined \cs{AtBeginDocument} so that the \pkg{xcolor} originals
+% may first be saved for reuse.
+%
+% The framed versions are modified to allow a background color of |none|, in which
+% case only the frame is drawn, allowing the background page color to show.
+%
+% \codeall
+% \begin{macrocode}
+\begin{warpall}
+% \end{macrocode}
+%
+%
+% \textcolor{red}{After \pkg{xparse} may have been loaded \dots}
+% \begin{macrocode}
+\AtBeginDocument{
+% \end{macrocode}
+% \textcolor{red}{\dots\ and \emph{only} if \pkg{xcolor} was loaded:}
+% \begin{macrocode}
+\@ifpackageloaded{xcolor}{
+\LWR at traceinfo{patching xcolor}
+% \end{macrocode}
+%
+% \begin{macro}{\colorboxBlock}
+% \cs{colorboxBlock} is the same as \cs{colorbox}:
+% \begin{macrocode}
+\LetLtxMacro\colorboxBlock\colorbox
+% \end{macrocode}
+% \end{macro}
+%
+%
+%
+% In \HTML\ mode, the following is done when \pkg{xcolor} is loaded.
+% Following is the print-mode action:
+% \begin{macrocode}
+\warpprintonly{
+\LetLtxMacro\LWRprint at colorboxBlock\colorbox
+\LetLtxMacro\LWRorigprint at fcolorbox\fcolorbox
+\LetLtxMacro\LWRorigprint at fcolorboxBlock\fcolorbox
+}
+% \end{macrocode}
+
+% \begin{macro}{\fcolorbox}
+% \oarg{framemodel} \marg{framecolor} \oarg{boxmodel} \marg{boxcolor} \marg{text}
+%
+% In print mode, \cs{fcolorbox} is modified to accept a background color of |none|.
+%
+% (\cs{fcolorbox} is particular about its optional arguments, thus the
+% elaborate combinations of \cs{ifthenelse}.)
+% \begin{macrocode}
+\newsavebox{\LWR at colorminipagebox}
+
+\DeclareDocumentCommand{\LWRprint at fcolorbox}{o m o m +m}{%
+\LWR at traceinfo{LWRprint at fcolorbox #2 #4}%
+% \end{macrocode}
+% Pre-load the contents into an LR box so that they can
+% be used inside a \cs{fcolorbox}:
+% \begin{macrocode}
+\begin{lrbox}{\LWR at colorminipagebox}%
+#5%
+\end{lrbox}%
+% \end{macrocode}
+% Sort out the various optional arguments and the background color of |none|.
+% In each case, the LRbox is placed inside a \cs{fcolorbox}.
+% \begin{macrocode}
+\ifthenelse{\equal{#4}{none}}%
+{% #4 none
+ \LWR at traceinfo{background is none}%
+ {% scope the \colorlet
+ \colorlet{LWR at currentcolor}{.}%
+ \color{#2}%
+ \fbox{%
+ \color{LWR at currentcolor}%
+ \usebox{\LWR at colorminipagebox}%
+ }% fbox
+ }% colorlet
+}% #4 none
+{% #4 not none
+\LWR at traceinfo{background not none}%
+\IfValueTF{#1}%
+{%
+ \IfValueTF{#3}%
+ {\LWRorigprint at fcolorbox[#1]{#2}[#3]{#4}{\usebox{\LWR at colorminipagebox}}}%
+ {\LWRorigprint at fcolorbox[#1]{#2}{#4}{\usebox{\LWR at colorminipagebox}}}%
+}%
+{% no value #1
+ \IfValueTF{#3}%
+ {\LWRorigprint at fcolorbox{#2}[#3]{#4}{\usebox{\LWR at colorminipagebox}}}%
+ {\LWRorigprint at fcolorbox{#2}{#4}{\usebox{\LWR at colorminipagebox}}}%
+}% no value #1
+}% #4 not none
+\LWR at traceinfo{LWRprint at fcolorbox done}%
+}
+% \end{macrocode}
+% \end{macro}
+%
+%
+% \begin{macro}{\fcolorboxBlock}
+% \oarg{framemodel} \marg{framecolor} \oarg{boxmodel} \marg{boxcolor} \marg{text}
+%
+% In print mode, \cs{fcolorboxBlock} is the same as \cs{fcolorbox}.
+% \begin{macrocode}
+\LetLtxMacro\LWRprint at fcolorboxBlock\LWRprint at fcolorbox
+% \end{macrocode}
+% \end{macro}
+
+% \begin{environment}{fcolorminipage}
+% \oarg{1:framemodel} \marg{2:framecolor} \oarg{3:boxmodel} \marg{4:boxcolor}
+% \oarg{5:align} \oarg{6:height} \oarg{7:inner-align} \marg{8:width}
+%
+% In print mode, becomes a \cs{fcolorbox} containing a \env{minipage}:
+% \begin{macrocode}
+\NewDocumentEnvironment{LWRprint at fcolorminipage}{o m o m O{c} O{} o m}
+{%
+\LWR at traceinfo{*** fcolorminipage: #2 #4 #8}%
+% \end{macrocode}
+% Pre-load the contents into an LR box so that they can
+% be used inside a \cs{fcolorbox}:
+% \begin{macrocode}
+\begin{lrbox}{\LWR at colorminipagebox}%
+% \end{macrocode}
+% If inner alignment is not given, use the outer alignment instead:
+% \begin{macrocode}
+\IfValueTF{#7}%
+{\begin{minipage}[#5][#6][#7]{#8}}%
+{\begin{minipage}[#5][#6][#5]{#8}}%
+}%
+{%
+\end{minipage}%
+\end{lrbox}%
+\LWR at traceinfo{*** starting end fcolorminipage #1 #2 #3 #4 #8}%
+% \end{macrocode}
+% Sort out the various optional arguments and the background color of |none|.
+% In each case, the LRbox is placed inside a \cs{fcolorbox}.
+% \begin{macrocode}
+\ifthenelse{\equal{#4}{none}}%
+{% #4 none
+ {% scope the \colorlet
+ \colorlet{LWR at currentcolor}{.}%
+ \color{#2}%
+ \fbox{%
+ \color{LWR at currentcolor}%
+ \usebox{\LWR at colorminipagebox}%
+ }% fbox
+ }% colorlet
+}% #4 none
+{% #4 not none
+ \IfValueTF{#1}%
+ {%
+ \IfValueTF{#3}%
+ {\LWRorigprint at fcolorbox[#1]{#2}[#3]{#4}{\usebox{\LWR at colorminipagebox}}}%
+ {\LWRorigprint at fcolorbox[#1]{#2}{#4}{\usebox{\LWR at colorminipagebox}}}%
+ }%
+ {% no value #1
+ \IfValueTF{#3}%
+ {\LWRorigprint at fcolorbox{#2}[#3]{#4}{\usebox{\LWR at colorminipagebox}}}%
+ {\LWRorigprint at fcolorbox{#2}{#4}{\usebox{\LWR at colorminipagebox}}}%
+ }% no value #1
+}% #4 not none
+\LWR at traceinfo{*** finished end fcolorminipage}%
+}
+% \end{macrocode}
+% \end{environment}
+
+% \begin{macro}{\LWR at restoremoreorigxcolor}
+% Used to activate print-mode additions for \pkg{xcolor}.
+% In print mode, this is used immediately following.
+% In \HTML\ mode, this is used inside a \env{lateximage}.
+% \begin{macrocode}
+\renewcommand*{\LWR at restoremoreorigxcolor}{%
+\LWR at traceinfo{LWR at restoremoreorigxcolorformatting}%
+\LetLtxMacro\colorboxBlock\LWRprint at colorboxBlock%
+\LetLtxMacro\fcolorbox\LWRprint at fcolorbox%
+\LetLtxMacro\fcolorboxBlock\LWRprint at fcolorboxBlock%
+\LetLtxMacro\fcolorminipage\LWRprint at fcolorminipage%
+\LetLtxMacro\endfcolorminipage\endLWRprint at fcolorminipage%
+}
+% \end{macrocode}
+% \end{macro}
+%
+% If print mode, immediately activate the print-mode enhancements for \pkg{xcolor}:
+% \begin{macrocode}
+\warpprintonly{\LWR at restoremoreorigxcolor}
+
+\LWR at traceinfo{xcolor patches done}
+}{}% xcolor
+}% AtBeginDocument
+% \end{macrocode}
+%
+% \begin{macrocode}
+\end{warpall}
+% \end{macrocode}
+
+
+
+
+
+
+
% \section{Cleveref}
% \label{sec:cleveref}
@@ -18667,12 +19231,13 @@
%
%
% \subsection{Footnote handling}
-% \label{sec:footnotesminipage}
%
% Also see \cref{sec:footnotes} for other forms of footnotes.
+% Minipage footnotes are gathered in \cref{sec:footnotesminipage},
+% and then placed into the document in \cref{sec:footnotesminipageplaced}.
%
-%
% \subsection{Minipage handling}
+% \label{sec:footnotesminipageplaced}
%
% \begin{macro}{\LWR at endminipage}
% Used to close a minipage.
@@ -18685,10 +19250,10 @@
\ifvoid\@mpfootins\else
\vskip\skip\@mpfootins
\normalcolor
- \LWR at htmldivclass{mpfootnotes}
- \LWR at origmedskip
+ \LWR at htmldivclass{mpfootnotes}
+ \LWR at origmedskip
\unvbox\@mpfootins
- \LWR at htmldivclassend{mpfootnotes}
+ \LWR at htmldivclassend{mpfootnotes}
\fi
\@minipagefalse
\color at endgroup
@@ -18788,10 +19353,10 @@
\uselengthunit{in}%
\setlength{\LWR at minipagewidth}{#4}%
\ifthenelse{\cnttest{\value{LWR at minipagedepth}}{=}{0}}{%
-\addtolength{\LWR at minipagewidth}{3em}% room for frames
-\setlength{\linewidth}{6in}%
-\setlength{\textwidth}{6in}%
-\setlength{\textheight}{9in}%
+ \addtolength{\LWR at minipagewidth}{3em}% room for frames
+ \setlength{\linewidth}{6in}%
+ \setlength{\textwidth}{6in}%
+ \setlength{\textheight}{9in}%
}{}%
\LWR at traceinfo{computed width is \rndprintlength{\LWR at minipagewidth}}
\addtocounter{LWR at minipagedepth}{1}%
@@ -18809,13 +19374,13 @@
\LWR at traceinfo{minipage: creating div class}%
\LWR at orignewpage%
\LWR at htmltag{div class="minipage" style="%
-\ifthenelse{\equal{#1}{t}}{vertical-align: bottom ; }{}%
-\ifthenelse{\equal{#1}{c}}{vertical-align: middle ; }{}%
-\ifthenelse{\equal{#1}{b}}{vertical-align: top ; }{}%
-\ifthenelse{\equal{#3}{t}}{justify-content: flex-start ; }{}%
-\ifthenelse{\equal{#3}{c}}{justify-content: center ; }{}%
-\ifthenelse{\equal{#3}{b}}{justify-content: flex-end ; }{}%
-\ifthenelse{\equal{#3}{s}}{justify-content: space-between ; }{}%
+\ifthenelse{\equal{#1}{t}}{vertical-align:bottom ; }{}%
+\ifthenelse{\equal{#1}{c}}{vertical-align:middle ; }{}%
+\ifthenelse{\equal{#1}{b}}{vertical-align:top ; }{}%
+\ifthenelse{\equal{#3}{t}}{justify-content:flex-start ; }{}%
+\ifthenelse{\equal{#3}{c}}{justify-content:center ; }{}%
+\ifthenelse{\equal{#3}{b}}{justify-content:flex-end ; }{}%
+\ifthenelse{\equal{#3}{s}}{justify-content:space-between ; }{}%
% \end{macrocode}
% Print the width and optional height styles:
% \begin{macrocode}
@@ -18824,9 +19389,9 @@
\ifbool{LWR at minipagefullwidth}%
{\boolfalse{LWR at minipagefullwidth}}%
{%
-\ifthenelse{\lengthtest{#4}=\linewidth}%
-{}%
-{width:\rndprintlength{\LWR at minipagewidth} ; }%
+ \ifthenelse{\lengthtest{#4}=\linewidth}%
+ {}%
+ {width:\rndprintlength{\LWR at minipagewidth} ; }%
}%
\LWR at traceinfo{minipage: about to print the height}%
\IfValueTF{#2}{height:\rndprintlength{\LWR at minipageheight} ; }{}%
@@ -18879,6 +19444,7 @@
%
% \subsection{Parbox, makebox, framebox, fbox, raisebox}
%
+% \codehtml
%
% \begin{macro}{\parbox} \oarg{pos} \oarg{height} \oarg{inner-pos} \marg{width} \marg{text}
%
@@ -18897,14 +19463,48 @@
%
% \begin{macro}{\makebox} \parg(posn) \oarg{width} \oarg{pos} \marg{text}
%
-% Width and positions are ignored.
-%
% \changes{v0.34}{2017/07/31}{Fix: Handles paren arg.}
+% \changes{v0.36}{2017/08/15}{Fix: Handles width and horiz position.}
% \begin{macrocode}
\LetLtxMacro\LWR at origmakebox\makebox
\RenewDocumentCommand{\makebox}{d() o o m}{%
-\mbox{#4}
+% \end{macrocode}
+% Check for the optional width:
+% \begin{macrocode}
+\IfValueTF{#2}%
+{%
+% \end{macrocode}
+% Check for the horizontal text alignment.
+% For |s|tretched, the best \HTML\ can do is \attribute{justified} alignment.
+% \begin{macrocode}
+ {% scope
+ \def\LWR at align{center}%
+ \ifstrequal{#3}{l}{\def\LWR at align{left}}{}%
+ \ifstrequal{#3}{r}{\def\LWR at align{right}}{}%
+ \ifstrequal{#3}{s}{\def\LWR at align{justify}}{}%
+% \end{macrocode}
+% To print the \attribute{width} argument:
+% \begin{macrocode}
+ \setlength{\LWR at tempwidth}{#2}%
+% \end{macrocode}
+% \attribute{inline-block} allows \attribute{width} and
+% \attribute{text-alignment} to be used in a \element{span}.
+% \begin{macrocode}
+ \uselengthunit{PT}%
+ \InlineClass[%
+ display:inline-block ; %
+ text-align:\LWR at align\ ; %
+ width:\rndprintlength{\LWR at tempwidth}%
+ ]%
+ {makebox}%
+% \end{macrocode}
+% Without a width argument, the text is simply used inline:
+% \begin{macrocode}
+ {\mbox{#4}}%
+ }% scope
+}%
+{\mbox{#4}}%
}
% \end{macrocode}
% \end{macro}
@@ -18911,32 +19511,84 @@
%
%
% \begin{macro}{\framebox} \oarg{width} \oarg{pos} \marg{text}
+% \changes{v0.36}{2017/08/15}{Fix: Handles width and horiz position.}
%
-% Width and position are ignored.
% \begin{macrocode}
\LetLtxMacro\LWR at origframebox\framebox
\RenewDocumentCommand{\framebox}{o o m}{%
-\fbox{#3}
+\fbox{\makebox[#1][#2]{#3}}%
}
% \end{macrocode}
% \end{macro}
%
%
+%
+%
+% \begin{macro}{\LWR at forceminwidth} \marg{legth}
+%
+% Sets \cs{LWR at tempwidth} to be at least 1pt.
+% \begin{macrocode}
+\newlength{\LWR at atleastonept}
+
+\newcommand*{\LWR at forceminwidth}[1]{%
+\setlength{\LWR at atleastonept}{#1}%
+\ifthenelse{%
+ \lengthtest{\LWR at atleastonept>0pt}\AND%
+ \lengthtest{\LWR at atleastonept<1pt}%
+}%
+{\setlength{\LWR at atleastonept}{1pt}}%
+{}%
+}
+% \end{macrocode}
+% \end{macro}
+%
+%
+
+% \begin{macro}{\LWR at blackborderpadding}
+% Prints the \HTML attributes for a black border and padding.
+%
+% \cs{LWR at forceminwidth} must be used first in order to set the border width.
+%
+% \begin{macrocode}
+\newcommand*{\LWR at blackborderpadding}{%
+\uselengthunit{PT}%
+border:\rndprintlength{\LWR at atleastonept} solid black ; %
+padding:\rndprintlength{\fboxsep}%
+}
+% \end{macrocode}
+% \end{macro}
+%
+%
+%
% \begin{macro}{\fbox} \marg{text}
%
% Creates a framed inline span enclosing the text.
+%
+% \changes{v0.36}{2017/08/10}{Fix: Uses \cs{fboxrule} and \cs{fboxsep}.}
+%
+% Remember the print-mode version:
% \begin{macrocode}
-\let\LWR at origfbox\fbox
-
-\renewcommand{\fbox}[1]{%
-\LWR at htmltagc{span class="framebox"}%
-\begin{LWR at nestspan}%
-#1
-\LWR at htmltagc{/span}%
-\end{LWR at nestspan}%
+\let\LWRprint at fbox\fbox
+% \end{macrocode}
+%
+% Create a new \HTML\ version, but don't use it until after \pkg{xcolor}
+% may have loaded:
+% \begin{macrocode}
+\newcommand{\LWRhtml at fbox}[1]{%
+\LWR at traceinfo{HTML fbox}
+\LWR at forceminwidth{\fboxrule}%
+\InlineClass[%
+\LWR at blackborderpadding%
+]{fbox}{#1}
}
% \end{macrocode}
+% \pkg{xcolor} \cs{let}s things to \cs{fbox} when it is loaded,
+% and this must remain even for \HTML\ output while in a \env{lateximage},
+% so \cs{fbox} is not modified until \cs{AtBeginDocument}:
+% \begin{macrocode}
+\AtBeginDocument{\let\fbox\LWRhtml at fbox}
+% \end{macrocode}
% \end{macro}
%
@@ -18949,7 +19601,10 @@
%
% \begin{macrocode}
\newcommand{\fboxBlock}[1]{%
-\begin{BlockClass}{framed}
+\LWR at forceminwidth{\fboxrule}%
+\begin{BlockClass}[%
+\LWR at blackborderpadding%
+]{fboxBlock}
#1
\end{BlockClass}
}
@@ -18967,10 +19622,21 @@
% \begin{macrocode}
\NewDocumentEnvironment{fminipage}{O{t} o O{t} m}
{%
-\setlength{\LWR at tempwidth}{#4}
-\begin{BlockClass}[width:\rndprintlength{\LWR at tempwidth};]{framed}%
+\LWR at traceinfo{fminipage #1 #2 #3 #4}%
+\LWR at forceminwidth{\fboxrule}%
+\setlength{\LWR at tempwidth}{#4}%
+\IfValueTF{#2}{\setlength{\LWR at tempheight}{#2}}{}%
+\begin{BlockClass}[%
+\LWR at blackborderpadding ; %
+\uselengthunit{PT}%
+\IfValueTF{#2}{height:\rndprintlength{\LWR at tempheight} ; }{}%
+width:\rndprintlength{\LWR at tempwidth}%
+]{fminipage}%
}
-{\end{BlockClass}}
+{%
+\end{BlockClass}%
+\LWR at traceinfo{fminipage done}%
+}
% \end{macrocode}
% \end{environment}
%
@@ -18995,27 +19661,64 @@
% \begin{macrocode}
\begin{warpall}
% \end{macrocode}
-
-% \begin{environment}{LWR at fminipageprint} \oarg{align} \oarg{height} \oarg{align} \marg{width}
%
+%
+%
+% \env{LWRprint at fminipage} is defined inside \env{warpall}.
+% For print output, it is \cs{let} to \env{fminipage}.
+% For \HTML\ output, the \HTML\ version of \env{fminipage} is used instead,
+% but the print version is still available for use inside a \env{lateximage}.
+%
+%
+% \begin{environment}{LWRprint at fminipage}
+% \oarg{1:align} \oarg{2:height} \oarg{3:inner-align} \marg{4:width}
+%
% Creates a frame around its contents.
% \begin{macrocode}
\newsavebox{\LWR at fminipagebox}
-\NewDocumentEnvironment{LWR at fminipageprint}{O{t} o O{t} m}
+\NewDocumentEnvironment{LWRprint at fminipage}{O{t} o O{t} m}
{%
+% \end{macrocode}
+% An outer minipage will be used for vertical alignment.
+% An inner minipage will be framed with \cs{fbox}.
+%
+% If the optional inner alignment is not given, use the outer instead:
+% \begin{macrocode}
+\IfValueTF{#3}%
+{\def\LWR at thisalign{#3}}
+{\def\LWR at thisalign{#1}}%
+% \end{macrocode}
+% Form the outer minipage depending on whether a height was given.
+% Make the outer minipage larger to compensate for the frame.
+% \begin{macrocode}
\IfValueTF{#2}%
-{\minipage[#1][#2][#3]{#4}}%
-{\minipage[#3]{#4}}%
+{\minipage[#1][#2+2\fboxsep+2\fboxrule][\LWR at thisalign]{#4+2\fboxsep+2\fboxrule}}%
+{\minipage[#1]{#4+2\fboxsep+2\fboxrule}}%
+% \end{macrocode}
+% Capture the contents of the environment:
+% \begin{macrocode}
\begin{lrbox}{\LWR at fminipagebox}%
+% \end{macrocode}
+% Nest the contents inside an inner minipage of the desired size:
+% \begin{macrocode}
\IfValueTF{#2}%
-{\minipage[#1][#2][#3]{\linewidth-2\fboxsep-2\fboxrule}}%
-{\minipage[#3]{\linewidth-2\fboxsep-2\fboxrule}}%
+{\minipage[#1][#2][\LWR at thisalign]{#4}}%
+{\minipage[#1]{#4}}%
}
{%
+% \end{macrocode}
+% Close the inner minipage and the LR box with the contents:
+% \begin{macrocode}
\endminipage%
\end{lrbox}%
+% \end{macrocode}
+% Create a frame around the contents of the environment:
+% \begin{macrocode}
\fbox{\usebox{\LWR at fminipagebox}}%
+% \end{macrocode}
+% The entire thing is placed inside the outer minipage:
+% \begin{macrocode}
\endminipage%
}
% \end{macrocode}
@@ -19032,7 +19735,11 @@
% \begin{macrocode}
\begin{warpprint}
% \end{macrocode}
-
+%
+%
+% For print output, the following are \cs{let} to become active.
+%
+%
% \begin{macro}{\fboxBlock} \marg{text}
%
% Creates a framed \HTML\ \element{div} around the text.
@@ -19046,8 +19753,8 @@
%
% Creates a frame around its contents.
% \begin{macrocode}
-\LetLtxMacro{\fminipage}{\LWR at fminipageprint}
-\LetLtxMacro{\endfminipage}{\endLWR at fminipageprint}
+\LetLtxMacro{\fminipage}{\LWRprint at fminipage}
+\LetLtxMacro{\endfminipage}{\endLWRprint at fminipage}
% \end{macrocode}
% \end{environment}
@@ -19169,26 +19876,17 @@
% \begin{macrocode}
-\DeclareRobustCommand{\LWR at HTMLrmfamily}[1]{}
-\DeclareRobustCommand{\LWR at HTMLsffamily}[1]{}
-\DeclareRobustCommand{\LWR at HTMLttfamily}[1]{}
-\DeclareRobustCommand{\LWR at HTMLbfseries}[1]{}
-\DeclareRobustCommand{\LWR at HTMLmdseries}[1]{}
-\DeclareRobustCommand{\LWR at HTMLupshape}[1]{}
-\DeclareRobustCommand{\LWR at HTMLslshape}[1]{}
-\DeclareRobustCommand{\LWR at HTMLscshape}[1]{}
-\DeclareRobustCommand{\LWR at HTMLitshape}[1]{}
-\DeclareRobustCommand{\LWR at HTMLem}[1]{}
-\DeclareRobustCommand{\LWR at nullrmfamily}[1]{}
-\DeclareRobustCommand{\LWR at nullsffamily}[1]{}
-\DeclareRobustCommand{\LWR at nullttfamily}[1]{}
-\DeclareRobustCommand{\LWR at nullbfseries}[1]{}
-\DeclareRobustCommand{\LWR at nullmdseries}[1]{}
-\DeclareRobustCommand{\LWR at nullupshape}[1]{}
-\DeclareRobustCommand{\LWR at nullslshape}[1]{}
-\DeclareRobustCommand{\LWR at nullscshape}[1]{}
-\DeclareRobustCommand{\LWR at nullitshape}[1]{}
+\DeclareRobustCommand{\LWR at nullrmfamily}{}
+\DeclareRobustCommand{\LWR at nullsffamily}{}
+\DeclareRobustCommand{\LWR at nullttfamily}{}
+\DeclareRobustCommand{\LWR at nullbfseries}{}
+\DeclareRobustCommand{\LWR at nullmdseries}{}
+\DeclareRobustCommand{\LWR at nullupshape}{}
+\DeclareRobustCommand{\LWR at nullslshape}{}
+\DeclareRobustCommand{\LWR at nullscshape}{}
+\DeclareRobustCommand{\LWR at nullitshape}{}
\DeclareRobustCommand{\LWR at nullem}[1]{}
+\DeclareRobustCommand{\LWR at nullnormalfont}{}
% \end{macrocode}
@@ -19195,6 +19893,7 @@
% \begin{macro}{\LWR at nullfonts} Removes formatting during filename operations.
% \changes{v0.34}{2017/08/05}{Improved font control.}
+% \changes{v0.36}{2017/08/15}{Fix: Filenames while using MathJax.}
% \begin{macrocode}
\newcommand*{\LWR at nullfonts}{%
\LetLtxMacro{\emph}{\LWR at nullemph}%
@@ -19228,12 +19927,9 @@
% \begin{macrocode}
\renewcommand*{\&}{and}%
\renewcommand{\textsuperscript}[1]{##1}%
-% \renewcommand{\textsuperscript}[1]{##1}
\renewcommand{\textsubscript}[1]{##1}%
-% \renewcommand{\textsubscript}[1]{##1}
\RenewDocumentCommand{\LWR at htmlspanclass}{o m +m}{##3}%
\DeclareExpandableDocumentCommand{\InlineClass}{o m +m}{##3}%
-% \DeclareExpandableDocumentCommand{\InlineClass}{o m +m}{##3}%
}
% \end{macrocode}
% \end{macro}
@@ -19287,7 +19983,7 @@
% \end{macrocode}
% \end{macro}
-% \begin{macro}{\scshape}
+% \begin{macro}{\normalfont}
% \begin{macrocode}
\renewcommand*{\normalfont}{}
% \end{macrocode}
@@ -19404,7 +20100,9 @@
% ^^A \renewcommand*{\,}{\HTMLunicode{2009}} % HTML thin wrappable space
% ^^A \renewcommand*{\,}{\HTMLentity{nbsp}} % regular-width non-breakable space
% \begin{macrocode}
+
\renewcommand*{~}{\HTMLentity{nbsp}}
+
\renewcommand*{\textellipsis}{\HTMLunicode{2026}}
% \end{macrocode}
% Direct-formatting font sizes are ignored:
@@ -19503,10 +20201,7 @@
% Placed just before \cs{hspace}, \cs{quad}, or \cs{qquad}'s \HTML\ output.
% \begin{macrocode}
\newcommand*{\LWR at minipagestartpars}{%
-\ifbool{LWR at minipagethispar}%
-{%
-\LWR at startpars%
-}{}%
+\ifbool{LWR at minipagethispar}{\LWR at startpars}{}%
}
% \end{macrocode}
% \end{macro}
@@ -19515,10 +20210,7 @@
% Placed just after \cs{hspace}, \cs{quad}, or \cs{qquad}'s \HTML\ output.
% \begin{macrocode}
\newcommand*{\LWR at minipagestoppars}{%
-\ifbool{LWR at minipagethispar}%
-{%
-\LWR at stoppars%
-}{}%
+\ifbool{LWR at minipagethispar}{\LWR at stoppars}{}%
}
% \end{macrocode}
% \end{macro}
@@ -19593,30 +20285,30 @@
% If had a minipage this paragraph, try to inline the
% white space without generating paragraph tags:
% \begin{macrocode}
-\LWR at minipagestoppars%
+ \LWR at minipagestoppars%
% \end{macrocode}
% Support the \HTML\ thin wrappable space:
% \begin{macrocode}
-\ifthenelse{\dimtest{\LWR at tempwidth}{=}{.16667em}}
-{%
-\HTMLunicode{2009}% thin breakable space
-}%
+ \ifthenelse{\dimtest{\LWR at tempwidth}{=}{.16667em}}
+ {%
+ \HTMLunicode{2009}% thin breakable space
+ }%
% \end{macrocode}
% Print the span with the converted width. Not rounded.
% \begin{macrocode}
-{%
-\uselengthunit{PT}%
-\LWR at htmltagc{%
-span style="width:\printlength{\LWR at tempwidth}; display:inline-block;"%
-}%
-\LWR at htmltagc{/span}%
-}%
+ {%
+ \uselengthunit{PT}%
+ \LWR at htmltagc{%
+ span style="width:\printlength{\LWR at tempwidth}; display:inline-block;"%
+ }%
+ \LWR at htmltagc{/span}%
+ }%
% \end{macrocode}
% If had a minipage this paragraph, try to inline the
% white space without generating paragraph tags:
% \begin{macrocode}
-\LWR at minipagestartpars%
-}%
+ \LWR at minipagestartpars%
+}% width not 0
}
% \end{macrocode}
% \end{macro}
@@ -19690,11 +20382,22 @@
\RenewDocumentCommand{\enlargethispage}{s m}{}
% \end{macrocode}
% \end{macro}
-
-
-
-
-
+%
+%
+%
+% \begin{macro}{\LWR at currenttextcolor}
+% The color to use for text and \cs{rule}, defaulting to black:
+%
+% \changes{v0.36}{2017/08/16}{Fix for \cs{rule} when \pkg{xcolor} not loaded.}
+%
+% \begin{macrocode}
+\newcommand*{\LWR at currenttextcolor}{black}
+% \end{macrocode}
+% \end{macro}
+%
+%
+%
+%
% \begin{macro}{\LWR at rule} \oarg{raise} \marg{width} \marg{height}
%
% Handles special minipage \& horizontal space interactions.
@@ -19719,40 +20422,44 @@
% If it's non-zero width, set a minimal thickness so that it
% more reliably shows in the browser:
% \begin{macrocode}
-\ifthenelse{\lengthtest{\LWR at tempwidth>0pt}\AND%
-\lengthtest{\LWR at tempwidth<1pt}}%
-{\setlength{\LWR at tempwidth}{1pt}}{}%
+ \ifthenelse{%
+ \lengthtest{\LWR at tempwidth>0pt}\AND%
+ \lengthtest{\LWR at tempwidth<1pt}%
+ }%
+ {\setlength{\LWR at tempwidth}{1pt}}{}%
% \end{macrocode}
% Likewise with height:
% \begin{macrocode}
-\setlength{\LWR at tempheight}{#3}%
-\ifthenelse{\lengthtest{\LWR at tempheight>0pt}\AND%
-\lengthtest{\LWR at tempheight<1pt}}%
-{\setlength{\LWR at tempheight}{1pt}}{}%
+ \setlength{\LWR at tempheight}{#3}%
+ \ifthenelse{%
+ \lengthtest{\LWR at tempheight>0pt}\AND%
+ \lengthtest{\LWR at tempheight<1pt}%
+ }%
+ {\setlength{\LWR at tempheight}{1pt}}{}%
% \end{macrocode}
% If had a minipage this paragraph, try to inline the
% rule without generating paragraph tags:
% \begin{macrocode}
-\LWR at minipagestoppars%
+ \LWR at minipagestoppars%
% \end{macrocode}
% Print the span with the converted width and height.
% The width and height are NOT rounded, since a height of
% less than 1pt is quite common in \LaTeX\ code.
% \begin{macrocode}
-\uselengthunit{PT}%
-\LWR at htmltagc{%
-span
-style=" %
+ \uselengthunit{PT}%
+ \LWR at htmltagc{%
+ span
+ style="%
% \end{macrocode}
% The background color is used to draw the filled rule.
% The color may be changed by \cs{textcolor}.
% \begin{macrocode}
-background:\LWR at currenttextcolor; %
+ background:\LWR at currenttextcolor; %
% \end{macrocode}
% The width and height are printed, converted to PT:
% \begin{macrocode}
-width:\printlength{\LWR at tempwidth}; %
-height:\printlength{\LWR at tempheight}; %
+ width:\printlength{\LWR at tempwidth}; %
+ height:\printlength{\LWR at tempheight}; %
% \end{macrocode}
% The raise height is converted to a \CSS\ transform.
% The |*2| raise multiplier is to approximately match \HTML\ output's X height.
@@ -19762,29 +20469,29 @@
% limits the allowable syntax. To do:\ A superior method would compute a
% ratio of \LaTeX\ ex height, then print that to \HTML\ with an ex unit.
% \begin{macrocode}
-\IfValueTF{#1}%
-{%
-\setlength{\LWR at tempraise}{0pt-#1}%
-\setlength{\LWR at tempraise}{\LWR at tempraise*2}%
-\LWR at orignewline%
--ms-transform: translate(0pt,\printlength{\LWR at tempraise}); %
-\LWR at orignewline%
--webkit-transform: translate(0pt,\printlength{\LWR at tempraise}); %
-\LWR at orignewline%
-transform: translate(0pt,\printlength{\LWR at tempraise}); %
-\LWR at orignewline%
-}{}%
+ \IfValueTF{#1}%
+ {%
+ \setlength{\LWR at tempraise}{0pt-#1}%
+ \setlength{\LWR at tempraise}{\LWR at tempraise*2}%
+ \LWR at orignewline%
+ -ms-transform: translate(0pt,\printlength{\LWR at tempraise}); %
+ \LWR at orignewline%
+ -webkit-transform: translate(0pt,\printlength{\LWR at tempraise}); %
+ \LWR at orignewline%
+ transform: translate(0pt,\printlength{\LWR at tempraise}); %
+ \LWR at orignewline%
+ }{}%
% \end{macrocode}
% Display inline-block to place the span inline with the text:
% \begin{macrocode}
-display:inline-block;"%
-}%
-\LWR at htmltagc{/span}%
+ display:inline-block;"%
+ }%
+ \LWR at htmltagc{/span}%
% \end{macrocode}
% If had a minipage this paragraph, try to inline the
% white space without generating paragraph tags:
% \begin{macrocode}
-\LWR at minipagestartpars%
+ \LWR at minipagestartpars%
}% non-zero width
}
% \end{macrocode}
@@ -20111,7 +20818,7 @@
\put at bsintoc%
\begin{@bstr at ctlist}\if at bsrunin\@bsrunintitle\fi\abstracttextfont}%
{\par\end{@bstr at ctlist}\vfil\null%\endtitlepage
- }
+ }
\else
\renewenvironment{abstract}{%
\if at bsrunin
@@ -20319,10 +21026,10 @@
\@ifundefined{th@#1}{%
\PackageWarning{amsthm}{Unknown theoremstyle `#1'}%
\thm at style{plain}%
- \renewcommand{\LWR at newtheoremstyle}{plain}% new
+ \renewcommand{\LWR at newtheoremstyle}{plain}% new
}{%
\thm at style{#1}%
- \renewcommand{\LWR at newtheoremstyle}{#1}% new
+ \renewcommand{\LWR at newtheoremstyle}{#1}% new
}%
}
% \end{macrocode}
@@ -20342,7 +21049,7 @@
\else % numbered theorem, need to check for optional arg
\def\@tempa{\@oparg{\@ynthm{#2}}[]}%
\fi
- \AtBeginEnvironment{#2}{\edef\LWR at thisthmstyle{\csuse{LWR at thmstyle#2}}}% new
+ \AtBeginEnvironment{#2}{\edef\LWR at thisthmstyle{\csuse{LWR at thmstyle#2}}}% new
}%
\@tempa
}
@@ -20373,7 +21080,7 @@
\LWR at forcenewpage% new
\BlockClass{amsthmbody\LWR at thisthmstyle}% new
\deferred at thm@head{
- \the\thm at headfont \thm at indent
+ \the\thm at headfont \thm at indent
\@ifempty{#1}{\let\thmname\@gobble}{\LWR at haveamsthmname}% new
\@ifempty{#2}{\let\thmnumber\@gobble}{\LWR at haveamsthmnumber}% new
\@ifempty{#3}{\let\thmnote\@gobble}{\LWR at haveamsthmnote}% new
@@ -20404,7 +21111,7 @@
% \begin{macrocode}
\renewenvironment{proof}[1][\proofname]{\par
\LWR at forcenewpage% new
- \BlockClass{amsthmproof}% new
+ \BlockClass{amsthmproof}% new
\pushQED{\qed}%
\normalfont \topsep6\p@\@plus6\p@\relax
\trivlist
@@ -20925,7 +21632,7 @@
% }
}
-\def\@makeenmark{\hbox{\textsuperscript{\normalfont\theenmark}}}
+\def\@makeenmark{\hbox{\LWR at htmlspan{sup}{\normalfont\theenmark}}}
\def\makeenmark{\@makeenmark}
% \end{macrocode}
%
@@ -21405,7 +22112,7 @@
% \begin{macrocode}
\let\LWRFB at UseVerbatim\UseVerbatim
\renewcommand*{\UseVerbatim}[1]{%
-\LWR at atbeginverbatim{Verbatim}\unskip\LWR at origvspace*{-\baselineskip}%%
+\LWR at atbeginverbatim{Verbatim}\unskip\LWR at origvspace*{-.5\baselineskip}%%
\LWRFB at UseVerbatim{#1}%
\LWR at afterendverbatim%
}
@@ -21413,13 +22120,13 @@
\let\LWRFB at LUseVerbatim\LUseVerbatim
\renewcommand*{\LUseVerbatim}[1]{%
-\LWR at atbeginverbatim{LVerbatim}\unskip\LWR at origvspace*{-\baselineskip}%%
+\LWR at atbeginverbatim{LVerbatim}%\unskip\LWR at origvspace*{-\baselineskip}%%
\LWRFB at LUseVerbatim{#1}%
\LWR at afterendverbatim%
}
\def\@BUseVerbatim[#1]#2{%
-\LWR at atbeginverbatim{BVerbatim}\unskip\LWR at origvspace*{-\baselineskip}%%
+\LWR at atbeginverbatim{BVerbatim}\unskip\LWR at origvspace*{-.5\baselineskip}%%
\LWRFB at UseVerbatim{#2}%
\LWR at afterendverbatim%
}
@@ -21714,26 +22421,26 @@
\ifnum#1=\z@
% \setbox\z@\hbox{\strut\enspace\FV at LabelBegin\enspace\strut}%
\ifx\FV at LabelPositionTopLine\relax
- \else
- \LWR at FVfindbordercolor
+ \else
+ \LWR at FVfindbordercolor
\LWR at htmltagc{div class="fancyvrblabel" style="color: \#\LWR at tempcolor"}
- \LWR at origtextrm{\FV at LabelBegin}% \textrm preserves emdash
- \LWR at htmltagc{/div}
- \fi
+ \LWR at origtextrm{\FV at LabelBegin}% \textrm preserves emdash
+ \LWR at htmltagc{/div}
+ \fi
\else
% \setbox\z@\hbox{\strut\enspace\FV at LabelEnd\enspace\strut}%
\ifx\FV at LabelPositionBottomLine\relax
- \else
- \LWR at FVfindbordercolor
+ \else
+ \LWR at FVfindbordercolor
\LWR at htmltagc{div class="fancyvrblabel" style="color: \#\LWR at tempcolor"}
- \LWR at origtextrm{\FV at LabelEnd}
- \LWR at htmltagc{/div}
- \fi
+ \LWR at origtextrm{\FV at LabelEnd}
+ \LWR at htmltagc{/div}
+ \fi
\fi
\fi
\hss
- }
+ }
}
% \end{macrocode}
%
@@ -21745,13 +22452,13 @@
% \kern\leftmargin
\hbox to \VerbatimHTMLWidth {%
\ifcsvoid{FV at LeftListNumber}{}{\kern 2.5em}%
- \FV at LeftListNumber%
+ \FV at LeftListNumber%
% \FV at LeftListFrame
\FancyVerbFormatLine{#1}%
\hss%
% \FV at RightListFrame
\FV at RightListNumber%
- }%
+ }%
\hss% required to avoid underfull hboxes
}
}
@@ -22068,30 +22775,30 @@
% \end{macrocode}
% For \pkg{subcaption}:
% \begin{macrocode}
-\ifbool{LWR at insubfloatrow}%
-{% subcaption in a subfloatrow
+ \ifbool{LWR at insubfloatrow}%
+ {% subcaption in a subfloatrow
% \end{macrocode}
% \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
+ \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
+ \@nameuse{#2}%
+ }% subcaption not in subfloatrow
+ #6
-#7
+ #7
% \end{macrocode}
% End the environments:
% \begin{macrocode}
-\ifbool{LWR at insubfloatrow}%
-{\@nameuse{endsub#2}}%
-{\@nameuse{end#2}}%
+ \ifbool{LWR at insubfloatrow}%
+ {\@nameuse{endsub#2}}%
+ {\@nameuse{end#2}}%
}% subcaption
{% assume subfig
% \end{macrocode}
@@ -22107,10 +22814,10 @@
% 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
+ \begingroup
+ \let\caption\@firstofone
+ \subfloat[#6]{#7}
+ \endgroup
}% subfig in a subfloatrow
{% subfig package, but not a subfig
% \end{macrocode}
@@ -22255,16 +22962,16 @@
% \begin{macrocode}
\ifthenelse{\equal{\LWR at frowkeywithin}{}}
{
-\LWR at traceinfo{about to newfloat #1 \LWR at frowkeyplacement\
- \LWR at frowkeyfileext}%
-\newfloat{#1}{\LWR at frowkeyplacement}{\LWR at frowkeyfileext}
+ \LWR at traceinfo{about to newfloat #1 \LWR at frowkeyplacement\
+ \LWR at frowkeyfileext}%
+ \newfloat{#1}{\LWR at frowkeyplacement}{\LWR at frowkeyfileext}
}%
{%
-\LWR at traceinfo{about to newfloat #1\ \LWR at frowkeyplacement\
- \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{about to newfloat #1\ \LWR at frowkeyplacement\
+ \LWR at frowkeyfileext\ \LWR at frowkeywithin}%
+ \newfloat{#1}{\LWR at frowkeyplacement}%
+ {\LWR at frowkeyfileext}[\LWR at frowkeywithin]%
+ \LWR at traceinfo{finished newfloat #1}
}%
% \end{macrocode}
% Rename the float if a name was given:
@@ -22548,6 +23255,7 @@
% \pkg{footnote} is used with minor patches.
%
% \changes{v0.26}{2017/03/26}{\pkg{footnote}: Added.}
+% \changes{v0.36}{2017/08/15}{\pkg{footnote}: Extra \protect\HTML\ source space after paragraphs.}
%
% \codehtml
% \begin{macrocode}
@@ -22563,7 +23271,10 @@
}
% \let\fn at endnote\color at endgroup% *** conflicts with lwarp
-\newcommand*{\fn at endnote}{\LWR at htmltagc{/\LWR at tagregularparagraph}}
+\newcommand*{\fn at endnote}{%
+\LWR at htmltagc{/\LWR at tagregularparagraph}%
+\LWR at orignewline%
+}
% \end{macrocode}
%
% Removed print-version formatting:
@@ -22579,7 +23290,8 @@
% Removed print-version formatting, added closing paragraph tag:
% \begin{macrocode}
\def\fn at endfntext{%
- \LWR at htmltagc{/\LWR at tagregularparagraph}%
+ \LWR at htmltagc{/\LWR at tagregularparagraph}%
+ \LWR at orignewline%
\fn at postfntext%
\egroup%
\begingroup%
@@ -22695,7 +23407,7 @@
\renewenvironment{leftbar}{%
\LWR at forcenewpage
- \BlockClass{framedleftbar}
+ \BlockClass{framedleftbar}
\def\FrameCommand{}%
\MakeFramed {}
}%
@@ -22736,18 +23448,18 @@
\LWR at forcenewpage
\begin{BlockClass}[border: 3px solid \#\LWR at tempcolor]{framed}%
\ifthenelse{\isempty{#1}}{}{% not empty
-\begin{BlockClass}[background: \#\LWR at tempcolor]{framedtitle}%
-\textcolor{TFTitleColor}{\textbf{#1}}%
-\end{BlockClass}
+ \begin{BlockClass}[background: \#\LWR at tempcolor]{framedtitle}%
+ \textcolor{TFTitleColor}{\textbf{#1}}%
+ \end{BlockClass}
}% not empty
#7
\ifthenelse{\isempty{#2}}{}{% not empty
-\convertcolorspec{named}{TFFrameColor}{HTML}\LWR at tempcolor%
-\begin{BlockClass}[background: \#\LWR at tempcolor]{framedtitle}%
-\textcolor{TFTitleColor}{\textbf{#2}}%
-\end{BlockClass}
+ \convertcolorspec{named}{TFFrameColor}{HTML}\LWR at tempcolor%
+ \begin{BlockClass}[background: \#\LWR at tempcolor]{framedtitle}%
+ \textcolor{TFTitleColor}{\textbf{#2}}%
+ \end{BlockClass}
}% not empty
\end{BlockClass}
}
@@ -23109,7 +23821,7 @@
% ^^A \begin{macro}{\autoref} * \marg{label}
%
-% For \HTML, \cs{cleverref} is used instead.
+% For \HTML, \cs{cleveref} is used instead.
%
% \begin{macrocode}
\NewDocumentCommand{\autoref}{s m}{%
@@ -23121,7 +23833,7 @@
%
% ^^A \begin{macro}{\autopageref} \marg{label}
%
-% For \HTML, \cs{cleverref} is used instead.
+% For \HTML, \cs{cleveref} is used instead.
%
% \begin{macrocode}
\NewDocumentCommand{\autopageref}{s m}{%
@@ -24470,11 +25182,11 @@
% Convert and print the shadow:
% \begin{macrocode}
\ifbool{mdf at shadow}{%
-box-shadow:
-\LWR at mdfprintlength{shadowsize}
-\LWR at mdfprintlength{shadowsize}
-\LWR at mdfprintlength{shadowsize}
-\LWR at mdfprintcolor{shadowcolor} ;
+ box-shadow:
+ \LWR at mdfprintlength{shadowsize}
+ \LWR at mdfprintlength{shadowsize}
+ \LWR at mdfprintlength{shadowsize}
+ \LWR at mdfprintcolor{shadowcolor} ;
}
{box-shadow: none ;}
\LWR at orignewline
@@ -24483,11 +25195,12 @@
"}
% \LWR at htmldivclass{\LWR at mdthisenv}
% \end{macrocode}
-% \env{mdframed} environment may not work with the modified \cs{hspace} and \cs{rule},
+% \env{mdframed} environment may not work with the \HTML\ versions of the following,
% so restore them to their originals while inside \env{mdframed}:
% \begin{macrocode}
\LetLtxMacro{\hspace}{\LWR at orighspace}%
\LetLtxMacro\rule\LWR at origrule%
+\LetLtxMacro\makebox\LWR at origmakebox%
}
% \end{macrocode}
% ^^A \end{macro}
@@ -24545,11 +25258,11 @@
% Convert and print the title rule:
% \begin{macrocode}
\ifbool{mdf at frametitlerule}{%
-border-bottom:
-\LWR at mdfprintlength{frametitlerulewidth}
-solid
-\LWR at mdfprintcolor{frametitlerulecolor}
-; \LWR at orignewline
+ border-bottom:
+ \LWR at mdfprintlength{frametitlerulewidth}
+ solid
+ \LWR at mdfprintcolor{frametitlerulecolor}
+ ; \LWR at orignewline
}{}%
% \end{macrocode}
% The title's top border radius is adjusted for the line width:
@@ -24556,11 +25269,11 @@
% \begin{macrocode}
border-radius:
\setlength{\LWR at titleroundcorner}
- {\maxof{\mdf at roundcorner@length-\mdf at linewidth@length}{0pt}}
- \rndprintlength{\LWR at titleroundcorner}
- \rndprintlength{\LWR at titleroundcorner}
- 0pt 0pt
- \LWR at orignewline
+ {\maxof{\mdf at roundcorner@length-\mdf at linewidth@length}{0pt}}
+ \rndprintlength{\LWR at titleroundcorner}
+ \rndprintlength{\LWR at titleroundcorner}
+ 0pt 0pt
+ \LWR at orignewline
% \end{macrocode}
% Finish the custom style and the opening span tag:
% \begin{macrocode}
@@ -24615,21 +25328,21 @@
% Convert and print the above line:
% \begin{macrocode}
\ifbool{mdf@#1titleaboveline}{%
-border-top:
-\LWR at mdfprintlength{#1titleabovelinewidth}
-solid
-\LWR at mdfprintcolor{#1titleabovelinecolor}
-; \LWR at orignewline
+ border-top:
+ \LWR at mdfprintlength{#1titleabovelinewidth}
+ solid
+ \LWR at mdfprintcolor{#1titleabovelinecolor}
+ ; \LWR at orignewline
}{}%
% \end{macrocode}
% Convert and print the below line:
% \begin{macrocode}
\ifbool{mdf@#1titlebelowline}{%
-border-bottom:
-\LWR at mdfprintlength{#1titlebelowlinewidth}
-solid
-\LWR at mdfprintcolor{#1titlebelowlinecolor}
-; \LWR at orignewline
+ border-bottom:
+ \LWR at mdfprintlength{#1titlebelowlinewidth}
+ solid
+ \LWR at mdfprintcolor{#1titlebelowlinecolor}
+ ; \LWR at orignewline
}{}%
% \end{macrocode}
% Finish the custom style and the opening span tag:
@@ -24810,8 +25523,8 @@
\begin{mdframed}[#1,frametitle={\strut#4\@temptitle}]}%
{\end{mdframed}}%
}%
- \BeforeBeginEnvironment{#2}{\renewcommand*{\LWR at mdthisenv}{md#2}}% new
- \BeforeBeginEnvironment{#2*}{\renewcommand*{\LWR at mdthisenv}{md#2}}% new
+ \BeforeBeginEnvironment{#2}{\renewcommand*{\LWR at mdthisenv}{md#2}}% new
+ \BeforeBeginEnvironment{#2*}{\renewcommand*{\LWR at mdthisenv}{md#2}}% new
}%
}
% \end{macrocode}
@@ -25464,11 +26177,11 @@
{Unknown theoremstyle `#1'. Using `plain'}%
\theorem at style{plain}
\renewcommand{\LWR at newtheoremstyle}{plain}% new
- }%
+ }%
{
- \theorem at style{#1}
+ \theorem at style{#1}
\renewcommand{\LWR at newtheoremstyle}{#1}% new
- }
+ }
}
% \end{macrocode}
@@ -25488,7 +26201,7 @@
\expandafter\gdef\csname mkheader@#1\endcsname
{\csname setparms@#1\endcsname
\@thm{#1}{#1}{#2}
- }%
+ }%
\global\@namedef{end#1}{\@endtheorem}
\AtBeginEnvironment{#1}{\edef\LWR at thisthmstyle{\csuse{LWR at thmstyle#1}}}% new
\fi
@@ -25504,7 +26217,7 @@
\expandafter\gdef\csname mkheader@#1\endcsname
{\csname setparms@#1\endcsname
\@thm{#1}{#1}{#2}
- }%
+ }%
\global\@namedef{end#1}{\@endtheorem}
\AtBeginEnvironment{#1}{\edef\LWR at thisthmstyle{\csuse{LWR at thmstyle#1}}}% new
\fi
@@ -25525,7 +26238,7 @@
\expandafter\gdef\csname mkheader@#1\endcsname
{\csname setparms@#1\endcsname
\@thm{#1}{#2}{#3}
- }%
+ }%
\global\@namedef{end#1}{\@endtheorem}
\AtBeginEnvironment{#1}{\edef\LWR at thisthmstyle{\csuse{LWR at thmstyle#1}}}% new
\fi}
@@ -25576,139 +26289,139 @@
\renewtheoremstyle{plain}%
{\item[\hskip\labelsep \theorem at headerfont
- \InlineClass{theoremheaderplain}{##1\ ##2\theorem at separator}]}%
+ \InlineClass{theoremheaderplain}{##1\ ##2\theorem at separator}]}%
{\item[\hskip\labelsep \theorem at headerfont
- \InlineClass{theoremheaderplain}{##1\ ##2\ (##3)\theorem at separator}]}
+ \InlineClass{theoremheaderplain}{##1\ ##2\ (##3)\theorem at separator}]}
\renewtheoremstyle{break}%
{\item[
% \rlap{\vbox{\hbox{
- \hskip\labelsep \theorem at headerfont
- \InlineClass{theoremheaderbreak}{##1\ ##2\theorem at separator}\newline
+ \hskip\labelsep \theorem at headerfont
+ \InlineClass{theoremheaderbreak}{##1\ ##2\theorem at separator}\newline
% }\hbox{\strut}}}
- ]}%
+ ]}%
{\item[
% \rlap{\vbox{\hbox{
- \hskip\labelsep \theorem at headerfont
- \InlineClass{theoremheaderbreak}{##1\ ##2\ (##3)\theorem at separator}\newline
+ \hskip\labelsep \theorem at headerfont
+ \InlineClass{theoremheaderbreak}{##1\ ##2\ (##3)\theorem at separator}\newline
% }\hbox{\strut}}}
- ]}
+ ]}
\renewtheoremstyle{change}%
{\item[\hskip\labelsep
- \theorem at headerfont
- \InlineClass{theoremheaderchange}{##2\ ##1\theorem at separator}]}%
+ \theorem at headerfont
+ \InlineClass{theoremheaderchange}{##2\ ##1\theorem at separator}]}%
{\item[\hskip\labelsep
- \theorem at headerfont
- \InlineClass{theoremheaderchange}{##2\ ##1\ (##3)\theorem at separator}]}
+ \theorem at headerfont
+ \InlineClass{theoremheaderchange}{##2\ ##1\ (##3)\theorem at separator}]}
\renewtheoremstyle{changebreak}%
{\item[
% \rlap{\vbox{\hbox{
- \hskip\labelsep \theorem at headerfont
- \InlineClass{theoremheaderchangebreak}{##2\ ##1\theorem at separator}\newline
+ \hskip\labelsep \theorem at headerfont
+ \InlineClass{theoremheaderchangebreak}{##2\ ##1\theorem at separator}\newline
% }\hbox{\strut}}}
- ]}%
+ ]}%
{\item[
% \rlap{\vbox{\hbox{
- \hskip\labelsep \theorem at headerfont
- \InlineClass{theoremheaderchangebreak}{##2\ ##1\ (##3)\theorem at separator}\newline
+ \hskip\labelsep \theorem at headerfont
+ \InlineClass{theoremheaderchangebreak}{##2\ ##1\ (##3)\theorem at separator}\newline
% }\hbox{\strut}}}
- ]}
+ ]}
\renewtheoremstyle{margin}%
{\item[\hskip\labelsep\theorem at headerfont
- \InlineClass{theoremheadermargin}{##2 \qquad ##1\theorem at separator}
- ]}%
+ \InlineClass{theoremheadermargin}{##2 \qquad ##1\theorem at separator}
+ ]}%
{\item[\hskip\labelsep\theorem at headerfont
- \InlineClass{theoremheadermargin}{##2 \qquad ##1\ (##3)\theorem at separator}
- ]}
+ \InlineClass{theoremheadermargin}{##2 \qquad ##1\ (##3)\theorem at separator}
+ ]}
\renewtheoremstyle{marginbreak}%
{\item[\hskip\labelsep\theorem at headerfont
- \InlineClass{theoremheadermarginbreak}{##2 \qquad ##1\theorem at separator}\newline
- ]}%
+ \InlineClass{theoremheadermarginbreak}{##2 \qquad ##1\theorem at separator}\newline
+ ]}%
{\item[\hskip\labelsep\theorem at headerfont
- \InlineClass{theoremheadermarginbreak}{##2 \qquad ##1\ (##3)\theorem at separator}\newline
- ]}
+ \InlineClass{theoremheadermarginbreak}{##2 \qquad ##1\ (##3)\theorem at separator}\newline
+ ]}
\renewtheoremstyle{nonumberplain}%
{\item[\theorem at headerfont\hskip\labelsep
- \InlineClass{theoremheaderplain}{##1\theorem at separator}]}%
+ \InlineClass{theoremheaderplain}{##1\theorem at separator}]}%
{\item[\theorem at headerfont\hskip \labelsep
- \InlineClass{theoremheaderplain}{##1\ (##3)\theorem at separator}]}
+ \InlineClass{theoremheaderplain}{##1\ (##3)\theorem at separator}]}
\renewtheoremstyle{nonumberbreak}%
{\item[
% \rlap{\vbox{\hbox{
- \hskip\labelsep \theorem at headerfont
- \InlineClass{theoremheaderbreak}{##1\theorem at separator}\newline
+ \hskip\labelsep \theorem at headerfont
+ \InlineClass{theoremheaderbreak}{##1\theorem at separator}\newline
% }\hbox{\strut}}}
- ]}%
+ ]}%
{\item[
% \rlap{\vbox{\hbox{
- \hskip\labelsep \theorem at headerfont
- \InlineClass{theoremheaderbreak}{##1\ (##3)\theorem at separator}\newline
+ \hskip\labelsep \theorem at headerfont
+ \InlineClass{theoremheaderbreak}{##1\ (##3)\theorem at separator}\newline
% }\hbox{\strut}}}
- ]}
+ ]}
\renewtheoremstyle{empty}%
{\item[]}%
{\item[\theorem at headerfont \hskip\labelsep\relax
- \InlineClass{theoremheaderplain}{##3}]}
+ \InlineClass{theoremheaderplain}{##3}]}
\renewtheoremstyle{emptybreak}%
{\item[]}%
{\item[\theorem at headerfont \hskip\labelsep\relax
- \InlineClass{theoremheaderplain}{##3}] \ \newline}
+ \InlineClass{theoremheaderplain}{##3}] \ \newline}
% \end{macrocode}
%
% The following manually adjust the \CSS\ for the standard configuration
% objects which are not a purely plain style:
% \begin{macrocode}
-\ifbool{LWR at ntheoremamsthm}{}{
+\ifbool{LWR at ntheoremamsthm}{}{%
% upright text via CSS
-\newtheoremstyle{plainupright}%
- {\item[\hskip\labelsep \theorem at headerfont
- \InlineClass{theoremheaderplain}{##1\ ##2\theorem at separator}]}%
- {\item[\hskip\labelsep \theorem at headerfont
- \InlineClass{theoremheaderplain}{##1\ ##2\ (##3)\theorem at separator}]}
+ \newtheoremstyle{plainupright}%
+ {\item[\hskip\labelsep \theorem at headerfont
+ \InlineClass{theoremheaderplain}{##1\ ##2\theorem at separator}]}%
+ {\item[\hskip\labelsep \theorem at headerfont
+ \InlineClass{theoremheaderplain}{##1\ ##2\ (##3)\theorem at separator}]}
% upright text and small caps header via CSS
-\newtheoremstyle{nonumberplainuprightsc}%
- {\item[\theorem at headerfont\hskip\labelsep
- \InlineClass{theoremheadersc}{##1\theorem at separator}]}%
- {\item[\theorem at headerfont\hskip \labelsep
- \InlineClass{theoremheadersc}{##1\ (##3)\theorem at separator}]}
+ \newtheoremstyle{nonumberplainuprightsc}%
+ {\item[\theorem at headerfont\hskip\labelsep
+ \InlineClass{theoremheadersc}{##1\theorem at separator}]}%
+ {\item[\theorem at headerfont\hskip \labelsep
+ \InlineClass{theoremheadersc}{##1\ (##3)\theorem at separator}]}
% \end{macrocode}
%
% The following standard configuration is renewed using the new \CSS:
% \begin{macrocode}
-\theoremstyle{plainupright}
-\theorembodyfont{\upshape}
-\theoremsymbol{\HTMLunicode{25A1}}% UTF-8 white box
-\renewtheorem{Example}{Example}
-\renewtheorem{example}{Example}
-\renewtheorem{Beispiel}{Beispiel}
-\renewtheorem{beispiel}{Beispiel}
-\renewtheorem{Bemerkung}{Bemerkung}
-\renewtheorem{bemerkung}{Bemerkung}
-\renewtheorem{Anmerkung}{Anmerkung}
-\renewtheorem{anmerkung}{Anmerkung}
-\renewtheorem{Remark}{Remark}
-\renewtheorem{remark}{Remark}
-\renewtheorem{Definition}{Definition}
-\renewtheorem{definition}{Definition}
+ \theoremstyle{plainupright}
+ \theorembodyfont{\upshape}
+ \theoremsymbol{\HTMLunicode{25A1}}% UTF-8 white box
+ \renewtheorem{Example}{Example}
+ \renewtheorem{example}{Example}
+ \renewtheorem{Beispiel}{Beispiel}
+ \renewtheorem{beispiel}{Beispiel}
+ \renewtheorem{Bemerkung}{Bemerkung}
+ \renewtheorem{bemerkung}{Bemerkung}
+ \renewtheorem{Anmerkung}{Anmerkung}
+ \renewtheorem{anmerkung}{Anmerkung}
+ \renewtheorem{Remark}{Remark}
+ \renewtheorem{remark}{Remark}
+ \renewtheorem{Definition}{Definition}
+ \renewtheorem{definition}{Definition}
-\theoremstyle{nonumberplainuprightsc}
-\theoremsymbol{\HTMLunicode{220E}}% UTF-8 end-of-proof
-\renewtheorem{Proof}{Proof}
-\renewtheorem{proof}{Proof}
-\renewtheorem{Beweis}{Beweis}
-\renewtheorem{beweis}{Beweis}
-\qedsymbol{\HTMLunicode{220E}}% UTF-8 end-of-proof
+ \theoremstyle{nonumberplainuprightsc}
+ \theoremsymbol{\HTMLunicode{220E}}% UTF-8 end-of-proof
+ \renewtheorem{Proof}{Proof}
+ \renewtheorem{proof}{Proof}
+ \renewtheorem{Beweis}{Beweis}
+ \renewtheorem{beweis}{Beweis}
+ \qedsymbol{\HTMLunicode{220E}}% UTF-8 end-of-proof
-\theoremsymbol{}
+ \theoremsymbol{}
}% not amsthm
% \end{macrocode}
%
@@ -25721,141 +26434,141 @@
\def\theorem at headerfont{\normalfont\bfseries}\itshape%
\def\@begintheorem##1##2{%
\LWR at forcenewpage% new
- \BlockClass{theorembodyplain}% new
- \LWR at inctheorem% new
+ \BlockClass{theorembodyplain}% new
+ \LWR at inctheorem% new
\item[\hskip\labelsep
% \theorem at headerfont
\InlineClass{theoremheaderplain}{##1\ ##2.}
- ]}%
+ ]}%
\def\@opargbegintheorem##1##2##3{%
\LWR at forcenewpage% new
- \BlockClass{theorembodyplain}% new
- \LWR at inctheorem% new
+ \BlockClass{theorembodyplain}% new
+ \LWR at inctheorem% new
\item[\hskip\labelsep
% \theorem at headerfont
\InlineClass{theoremheaderplain}{##1\ ##2\ (##3).}
- ]}}
+ ]}}
\gdef\th at nonumberplain{%
\def\theorem at headerfont{\normalfont\bfseries}\itshape%
\def\@begintheorem##1##2{%
\LWR at forcenewpage% new
- \BlockClass{theorembodyplain}% new
- \LWR at inctheorem% new
+ \BlockClass{theorembodyplain}% new
+ \LWR at inctheorem% new
\item[\hskip\labelsep
% \theorem at headerfont
\InlineClass{theoremheaderplain}{##1.}
- ]}%
+ ]}%
\def\@opargbegintheorem##1##2##3{%
\LWR at forcenewpage% new
- \BlockClass{theorembodyplain}% new
- \LWR at inctheorem% new
+ \BlockClass{theorembodyplain}% new
+ \LWR at inctheorem% new
\item[\hskip\labelsep
% \theorem at headerfont
\InlineClass{theoremheaderplain}{##1\ (##3).}
- ]}}
+ ]}}
\gdef\th at definition{%
\def\theorem at headerfont{\normalfont\bfseries}\normalfont%
\def\@begintheorem##1##2{%
\LWR at forcenewpage% new
- \BlockClass{theorembodydefinition}% new
- \LWR at inctheorem% new
+ \BlockClass{theorembodydefinition}% new
+ \LWR at inctheorem% new
\item[\hskip\labelsep
% \theorem at headerfont
\InlineClass{theoremheaderdefinition}{##1\ ##2.}
- ]}%
+ ]}%
\def\@opargbegintheorem##1##2##3{%
\LWR at forcenewpage% new
- \BlockClass{theorembodydefinition}% new
- \LWR at inctheorem% new
+ \BlockClass{theorembodydefinition}% new
+ \LWR at inctheorem% new
\item[\hskip\labelsep
% \theorem at headerfont
\InlineClass{theoremheaderdefinition}{##1\ ##2\ (##3).}
- ]}}
+ ]}}
\gdef\th at nonumberdefinition{%
\def\theorem at headerfont{\normalfont\bfseries}\normalfont%
\def\@begintheorem##1##2{%
\LWR at forcenewpage% new
- \BlockClass{theorembodydefinition}% new
- \LWR at inctheorem% new
+ \BlockClass{theorembodydefinition}% new
+ \LWR at inctheorem% new
\item[\hskip\labelsep
% \theorem at headerfont
\InlineClass{theoremheaderdefinition}{##1.}
- ]}%
+ ]}%
\def\@opargbegintheorem##1##2##3{%
\LWR at forcenewpage% new
- \BlockClass{theorembodydefinition}% new
- \LWR at inctheorem% new
+ \BlockClass{theorembodydefinition}% new
+ \LWR at inctheorem% new
\item[\hskip\labelsep
% \theorem at headerfont
\InlineClass{theoremheaderdefinition}{##1\ (##3).}
- ]}}
+ ]}}
\gdef\th at remark{%
\def\theorem at headerfont{\itshape}\normalfont%
\def\@begintheorem##1##2{%
\LWR at forcenewpage% new
- \BlockClass{theorembodyremark}% new
- \LWR at inctheorem% new
+ \BlockClass{theorembodyremark}% new
+ \LWR at inctheorem% new
\item[\hskip\labelsep
% \theorem at headerfont
\InlineClass{theoremheaderremark}{##1\ ##2.}
- ]}%
+ ]}%
\def\@opargbegintheorem##1##2##3{%
\LWR at forcenewpage% new
- \BlockClass{theorembodyremark}% new
- \LWR at inctheorem% new
+ \BlockClass{theorembodyremark}% new
+ \LWR at inctheorem% new
\item[\hskip\labelsep
% \theorem at headerfont
\InlineClass{theoremheaderremark}{##1\ ##2\ (##3).}
- ]}}
+ ]}}
\gdef\th at nonumberremark{%
\def\theorem at headerfont{\itshape}\normalfont%
\def\@begintheorem##1##2{%
\LWR at forcenewpage% new
- \BlockClass{theorembodyremark}% new
- \LWR at inctheorem% new
+ \BlockClass{theorembodyremark}% new
+ \LWR at inctheorem% new
\item[\hskip\labelsep
% \theorem at headerfont
\InlineClass{theoremheaderremark}{##1.}
- ]}%
+ ]}%
\def\@opargbegintheorem##1##2##3{%
\LWR at forcenewpage% new
- \BlockClass{theorembodyremark}% new
- \LWR at inctheorem% new
+ \BlockClass{theorembodyremark}% new
+ \LWR at inctheorem% new
\item[\hskip\labelsep
% \theorem at headerfont
\InlineClass{theoremheaderremark}{##1\ (##3).}
- ]}}
+ ]}}
\gdef\th at proof{%
\def\theorem at headerfont{\normalfont\bfseries}\itshape%
\def\@begintheorem##1##2{%
\LWR at forcenewpage% new
- \BlockClass{theorembodyproof}% new
- \LWR at inctheorem% new
+ \BlockClass{theorembodyproof}% new
+ \LWR at inctheorem% new
\item[\hskip\labelsep
% \theorem at headerfont
\InlineClass{theoremheaderproof}{##1.}
- ]}%
+ ]}%
\def\@opargbegintheorem##1##2##3{%
\LWR at forcenewpage% new
- \BlockClass{theorembodyroof}% new
- \LWR at inctheorem% new
+ \BlockClass{theorembodyroof}% new
+ \LWR at inctheorem% new
\item[\hskip\labelsep
% \theorem at headerfont
\InlineClass{theoremheaderproof}{##1\ (##3).}
- ]}}
+ ]}}
\newcounter{proof}%
\if at thmmarks
- \newcounter{currproofctr}%
- \newcounter{endproofctr}%
+ \newcounter{currproofctr}%
+ \newcounter{endproofctr}%
\fi
\gdef\proofSymbol{\openbox}
@@ -25863,11 +26576,11 @@
\newcommand{\proofname}{Proof}
\newenvironment{proof}[1][\proofname]{
- \th at proof
- \def\theorem at headerfont{\itshape}%
- \normalfont
- \theoremsymbol{\HTMLunicode{220E}}% UTF-8 end-of-proof
- \@thm{proof}{proof}{#1}
+ \th at proof
+ \def\theorem at headerfont{\itshape}%
+ \normalfont
+ \theoremsymbol{\HTMLunicode{220E}}% UTF-8 end-of-proof
+ \@thm{proof}{proof}{#1}
}%
{\@endtheorem}
@@ -25879,10 +26592,10 @@
\let\LWR at origendtheorem\@endtheorem
\renewcommand{\@endtheorem}{%
\ifbool{LWR at ntheoremmarks}{%
-\ifsetendmark%
-\InlineClass{theoremendmark}{\csname\InTheoType Symbol\endcsname}%
-\setendmarkfalse%
-\fi%
+ \ifsetendmark%
+ \InlineClass{theoremendmark}{\csname\InTheoType Symbol\endcsname}%
+ \setendmarkfalse%
+ \fi%
}{}%
\LWR at origendtheorem%
\ifbool{LWR at ntheoremmarks}{\global\setendmarktrue}{}%
@@ -26321,11 +27034,11 @@
\RenewDocumentCommand{\newfloat}{m m m o}{%
\IfValueTF{#4}
{
-\DeclareFloatingEnvironment[fileext=#3,within=#4]{#1}
+ \DeclareFloatingEnvironment[fileext=#3,within=#4]{#1}
}
{
-\DeclareFloatingEnvironment[fileext=#3]{#1}
-\DeclareFloatingEnvironment[fileext=#3]{sideways#1}
+ \DeclareFloatingEnvironment[fileext=#3]{#1}
+ \DeclareFloatingEnvironment[fileext=#3]{sideways#1}
}
\csletcs{sideways#1}{#1}
\csletcs{endsideways#1}{end#1}
@@ -26640,7 +27353,7 @@
% \begin{macrocode}
\RenewDocumentCommand \sidecaption {s o o m}
{
- \LWR at stoppars
+ \LWR at stoppars
\captionsetup{style=sidecaption}
\IfBooleanTF{#1}
{ % starred
@@ -26656,7 +27369,7 @@
{\marginnote{\caption[\@sidenotes at sidecaption@tof]{#4}}}
{\marginnote{\caption[\@sidenotes at sidecaption@tof]{#4}}[#3]}
}
- \LWR at startpars
+ \LWR at startpars
}
% \end{macrocode}
%
@@ -26863,7 +27576,7 @@
\sf at bottom=\sf at nearskip
\fi
\leavevmode
- \setbox\@tempboxa \hbox{#4}%
+ \setbox\@tempboxa \hbox{#4}%
\@tempdima=\wd\@tempboxa
\@ifundefined{FBsc at max}{}%
{\global\advance\Xhsize-\wd\@tempboxa
@@ -26890,25 +27603,25 @@
\vskip\sf at captopadj
\fi\egroup
\hrule width0pt height0pt depth0pt
- \LWR at startpars% new
+ \LWR at startpars% new
% \box\@tempboxa
- #4
- \LWR at stoppars% new
+ #4
+ \LWR at stoppars% new
}{%
- \LWR at startpars% new
+ \LWR at startpars% new
\@ifundefined{FBsc at max}%
{
% \box\@tempboxa
- #4
- }%
+ #4
+ }%
{\ifx\FBsuboheight\relax
% \box\@tempboxa
- #4
+ #4
\else
% \vbox to \FBsuboheight{\FBafil\box\@tempboxa\FBbfil}%
- #4
+ #4
\fi}%
- \LWR at stoppars% new
+ \LWR at stoppars% new
\egroup
\ifx \@empty#3\relax \else
\vskip\sf at capskip
@@ -26964,18 +27677,18 @@
% }%
\@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 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
@@ -26985,11 +27698,11 @@
\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{%
@@ -27006,8 +27719,8 @@
% \hss
% }
- }
- }%
+ }
+ }%
\egroup
\LWR at startpars% new
}
@@ -27047,7 +27760,7 @@
{}%
\nobreak\hskip\z at skip % enable hyphenation
\caption at tfmt{#2}
- \LWR at ensuredoingapar% new
+ \LWR at ensuredoingapar% new
\caption at ifstrut
{\ifhmode\@finalstrut\strutbox\fi}%
{}%
@@ -27362,10 +28075,10 @@
}}
\gdef\@ynthm#1#2{%
- \expandafter\@ifdefinable\csname #1\endcsname
+ \expandafter\@ifdefinable\csname #1\endcsname
{
- \csedef{LWR at thmstyle#1}{\LWR at newtheoremstyle}% new
- \@definecounter{#1}%
+ \csedef{LWR at thmstyle#1}{\LWR at newtheoremstyle}% new
+ \@definecounter{#1}%
\expandafter\xdef\csname the#1\endcsname{\@thmcounter{#1}}%
\def\@tempa{\global\@namedef{#1}}\expandafter \@tempa
\expandafter{\csname th@\the \theorem at style \expandafter
@@ -27380,8 +28093,8 @@
\else
\expandafter\@ifdefinable\csname #1\endcsname
{
- \csedef{LWR at thmstyle#1}{\LWR at newtheoremstyle}% new
- \expandafter \xdef \csname the#1\endcsname
+ \csedef{LWR at thmstyle#1}{\LWR at newtheoremstyle}% new
+ \expandafter \xdef \csname the#1\endcsname
{\expandafter \noexpand \csname the#2\endcsname}%
\def\@tempa{\global\@namedef{#1}}\expandafter \@tempa
\expandafter{\csname th@\the \theorem at style \expandafter
@@ -27388,7 +28101,7 @@
\endcsname \the\theorem at bodyfont \@thm{#2}{#3}}%
\global \expandafter \let \csname end#1\endcsname \@endtheorem
\AtBeginEnvironment{#1}{\edef\LWR at thisthmstyle{\csuse{LWR at thmstyle#1}}}% new
- }%
+ }%
\fi}
% \end{macrocode}
%
@@ -27407,93 +28120,93 @@
\gdef\th at plain{%\normalfont\itshape
\def\@begintheorem##1##2{%
\LWR at forcenewpage% new
- \BlockClass{theorembody\LWR at thisthmstyle}% new
+ \BlockClass{theorembody\LWR at thisthmstyle}% new
\item[\hskip\labelsep
- \InlineClass{theoremheader}{##1\ ##2}
- ]}%
+ \InlineClass{theoremheader}{##1\ ##2}
+ ]}%
\def\@opargbegintheorem##1##2##3{%
\LWR at forcenewpage% new
- \BlockClass{theorembody\LWR at thisthmstyle}% new
+ \BlockClass{theorembody\LWR at thisthmstyle}% new
\item[\hskip\labelsep
- \InlineClass{theoremheader}{##1\ ##2\ (##3)}
- ]}
+ \InlineClass{theoremheader}{##1\ ##2\ (##3)}
+ ]}
}
\gdef\th at break{%\normalfont\slshape
\def\@begintheorem##1##2{%
\LWR at forcenewpage% new
- \BlockClass{theorembody\LWR at thisthmstyle}% new
- \item[\hskip \labelsep
- \InlineClass{theoremheader}{##1\ ##2}\newline%
- ]}%
+ \BlockClass{theorembody\LWR at thisthmstyle}% new
+ \item[\hskip \labelsep
+ \InlineClass{theoremheader}{##1\ ##2}\newline%
+ ]}%
\def\@opargbegintheorem##1##2##3{%
\LWR at forcenewpage% new
- \BlockClass{theorembody\LWR at thisthmstyle}% new
+ \BlockClass{theorembody\LWR at thisthmstyle}% new
\item[\hskip \labelsep
- \InlineClass{theoremheader}{##1\ ##2\ (##3)}\newline
- ]}
+ \InlineClass{theoremheader}{##1\ ##2\ (##3)}\newline
+ ]}
}
\gdef\th at marginbreak{%\normalfont\slshape
\def\@begintheorem##1##2{
\LWR at forcenewpage% new
- \BlockClass{theorembody\LWR at thisthmstyle}% new
- \item[\hskip\labelsep %
- \InlineClass{theoremheader}{##2 \qquad ##1}\newline
- ]}%
+ \BlockClass{theorembody\LWR at thisthmstyle}% new
+ \item[\hskip\labelsep %
+ \InlineClass{theoremheader}{##2 \qquad ##1}\newline
+ ]}%
\def\@opargbegintheorem##1##2##3{%
\LWR at forcenewpage% new
- \BlockClass{theorembody\LWR at thisthmstyle}% new
- \item[\hskip\labelsep %
- \InlineClass{theoremheader}{##2 \qquad ##1\ %
- (##3)}\newline
- ]}
+ \BlockClass{theorembody\LWR at thisthmstyle}% new
+ \item[\hskip\labelsep %
+ \InlineClass{theoremheader}{##2 \qquad ##1\ %
+ (##3)}\newline
+ ]}
}
\gdef\th at changebreak{%\normalfont\slshape
\def\@begintheorem##1##2{
\LWR at forcenewpage% new
- \BlockClass{theorembody\LWR at thisthmstyle}% new
- \item[\hskip\labelsep
- \InlineClass{theoremheader}{##2\ ##1}\newline
- ]}%
+ \BlockClass{theorembody\LWR at thisthmstyle}% new
+ \item[\hskip\labelsep
+ \InlineClass{theoremheader}{##2\ ##1}\newline
+ ]}%
\def\@opargbegintheorem##1##2##3{%
\LWR at forcenewpage% new
- \BlockClass{theorembody\LWR at thisthmstyle}% new
- \item[\hskip\labelsep
- \InlineClass{theoremheader}{ ##2\ ##1\ %
- (##3)}\newline
- ]}
+ \BlockClass{theorembody\LWR at thisthmstyle}% new
+ \item[\hskip\labelsep
+ \InlineClass{theoremheader}{ ##2\ ##1\ %
+ (##3)}\newline
+ ]}
}
\gdef\th at change{%\normalfont\slshape
\def\@begintheorem##1##2{
\LWR at forcenewpage% new
- \BlockClass{theorembody\LWR at thisthmstyle}% new
- \item[\hskip\labelsep
- \InlineClass{theoremheader}{##2\ ##1}
- ]}%
+ \BlockClass{theorembody\LWR at thisthmstyle}% new
+ \item[\hskip\labelsep
+ \InlineClass{theoremheader}{##2\ ##1}
+ ]}%
\def\@opargbegintheorem##1##2##3{%
\LWR at forcenewpage% new
- \BlockClass{theorembody\LWR at thisthmstyle}% new
- \item[\hskip\labelsep
- \InlineClass{theoremheader}{##2\ ##1\ (##3)}
- ]}
+ \BlockClass{theorembody\LWR at thisthmstyle}% new
+ \item[\hskip\labelsep
+ \InlineClass{theoremheader}{##2\ ##1\ (##3)}
+ ]}
}
\gdef\th at margin{%\normalfont\slshape
\def\@begintheorem##1##2{
\LWR at forcenewpage% new
- \BlockClass{theorembody\LWR at thisthmstyle}% new
- \item[\hskip\labelsep
- \InlineClass{theoremheader}{##2 \qquad ##1}
- ]}%
+ \BlockClass{theorembody\LWR at thisthmstyle}% new
+ \item[\hskip\labelsep
+ \InlineClass{theoremheader}{##2 \qquad ##1}
+ ]}%
\def\@opargbegintheorem##1##2##3{%
\LWR at forcenewpage% new
- \BlockClass{theorembody\LWR at thisthmstyle}% new
- \item[\hskip\labelsep
- \InlineClass{theoremheader}{##2 \qquad ##1\ (##3)}
- ]}
+ \BlockClass{theorembody\LWR at thisthmstyle}% new
+ \item[\hskip\labelsep
+ \InlineClass{theoremheader}{##2 \qquad ##1\ (##3)}
+ ]}
}
% \end{macrocode}
%
@@ -27574,7 +28287,7 @@
% ^^A \end{environment}
% ^^A \begin{macro}{\tnote}
% \begin{macrocode}
-\newcommand{\tnote}[1]{\textsuperscript{#1}}
+\newcommand{\tnote}[1]{\LWR at htmlspan{sup}{#1}}
% \end{macrocode}
% ^^A \end{macro}
@@ -28553,6 +29266,52 @@
% \clearpage
%
% \iffalse
+%<*transparent>
+% \fi
+%
+% \part{lwarp-transparent.sty}
+%
+% \section{Transparent}
+%
+% \credits{Heiko Oberdiek}
+%
+% \DescribePackage{transparent} Emulated.
+% \cs{texttransparent} works for inline objects.
+% \cs{transparent} only works for \cs{includegraphics}.
+%
+% Note that \pkg{transparent} does not work with \XeLaTeX.\watchout[Not \XeLaTeX!]
+%
+% \changes{v0.36}{2017/08/09}{\pkg{transparent}: Added.}
+%
+% \codehtml
+%
+% Discard all options for \pkg{lwarp-transparent}:
+% \begin{macrocode}
+\LWR at ProvidesPackageDrop{transparent}
+% \end{macrocode}
+%
+% \begin{macrocode}
+\newcommand*{\transparent}[1]{\edef\LWR at opacity{#1}}
+
+\newcommand*{\texttransparent}[2]{%
+\begingroup%
+\transparent{#1}%
+\InlineClass[opacity: #1]{transparent}{#2}%
+\endgroup%
+}
+% \end{macrocode}
+%
+% \iffalse
+%</transparent>
+% \fi
+%
+%
+%
+%
+%
+% \clearpage
+%
+% \iffalse
%<*trivfloat>
% \fi
@@ -28767,7 +29526,35 @@
%
%
%
+% \clearpage
%
+% \iffalse
+%<*upref>
+% \fi
+%
+% \part{lwarp-upref.sty}
+%
+% \section{Upref}
+%
+% \DescribePackage{upref} Ignored.
+%
+% \changes{v0.36}{2017/08/09}{\pkg{upref}: Added.}
+%
+% \codehtml
+%
+% Discard all options for \pkg{lwarp-upref}:
+% \begin{macrocode}
+\LWR at ProvidesPackageDrop{upref}
+% \end{macrocode}
+%
+%
+% \iffalse
+%</upref>
+% \fi
+%
+%
+%
+%
% \clearpage
%
% \iffalse
@@ -28933,7 +29720,6 @@
% \begin{macrocode}
-
\newcommand*{\LWR at wrapposition}{}
\newcommand*{\LWR at subwrapfigure}[2]{%
@@ -28940,8 +29726,8 @@
\LWR at maybeincthisfloat%
\renewcommand*{\LWR at wrapposition}{}%
\ifthenelse{%
-\equal{#1}{r}\OR\equal{#1}{R}\OR%
-\equal{#1}{o}\OR\equal{#1}{O}%
+ \equal{#1}{r}\OR\equal{#1}{R}\OR%
+ \equal{#1}{o}\OR\equal{#1}{O}%
}%
{\renewcommand*{\LWR at wrapposition}{float:right}}%
{\renewcommand*{\LWR at wrapposition}{float:left}}%
@@ -28953,7 +29739,7 @@
\LWR at htmltag{div class="marginblock" id="autofloat-\arabic{LWR at thisfloat}"
style="width:\rndprintlength{\LWR at wrapwidth} ; %
\LWR at wrapposition"%
-}
+}%
\LWR at startpars
}
@@ -28963,7 +29749,7 @@
\LWR at subwrapfigure{#2}{#4}%
\captionsetup{type=figure}%
}
-{
+{%
\LWR at htmldivclassend{div}
}
@@ -28973,7 +29759,7 @@
\LWR at subwrapfigure{#2}{#4}%
\captionsetup{type=table}%
}
-{
+{%
\LWR at htmldivclassend{div}
}
@@ -28983,7 +29769,7 @@
\LWR at subwrapfigure{#3}{#5}%
\captionsetup{type=#1}%
}
-{
+{%
\LWR at htmldivclassend{div}
}
@@ -29005,154 +29791,469 @@
% \part{lwarp-xcolor.sty}
% \section{Xcolor}
+% \label{sec:xcolor}
%
% \DescribePackage{xcolor}
% \pkg{xcolor} is supported by lwarp.
%
% \limitsxcolor
-
+%
+% \changes{v0.36}{2017/08/10}{\pkg{xcolor}: Uses \cs{fboxrule} and \cs{fboxsep}.}
+% \changes{v0.36}{2017/08/10}{\pkg{xcolor}: Added \cs{fcolorboxBlock}, \cs{colorboxBlock}.}
+% \changes{v0.36}{2017/08/10}{\pkg{xcolor}: Fix: Background \protect\texttt{none} in print mode.}
+% \changes{v0.36}{2017/08/12}{\pkg{xcolor}: \cs{fcolorbox} etc. now work inside \env{lateximage}.}
+%
+%
+%
+% \subsection{Xcolor definitions: location and timing}
+%
+% The \pkg{lwarp} core and its \pkg{lwarp-xcolor} package are tightly integrated
+% to allow comparable results for print, \HTML\,
+% and print inside an \HTML\ \env{lateximage}.
+% This requires a number of definitions and redefintions depending on whether
+% each of \pkg{xcolor} and \env{lateximage} is being used, and whether print
+% or \HTML\ is being generated.
+% Some of these actions are one-time when \pkg{xcolor} is loaded, and others
+% are temporary as \env{lateximage} is used.
+%
+% \begin{description}
+% \item [When \pkg{lwarp} is loaded in print or HTML mode:]
+% \cs{LWR at restoreorigxcolor} and \cs{LWR at restoremoreorigxcolor} are defined as null.
+% \Cref{sec:xcolordefaults}
+% \item [When \pkg{xcolor} is loaded in print mode:] \
+% No special actions are taken at the time that \pkg{xcolor} is loaded in
+% print mode, but see \cs{AtBeginDocument} below.
+% \item [When \pkg{lwarp-xcolor} is loaded in HTML mode:] \
+% \pkg{xcolor}'s original definitions are saved for later restoration.
+% \cs{LWR at restoreorigxcolor} is defined to restore these definitions
+% for use inside a \env{lateximage}.
+% New \HTML-mode definitions are created for \cs{textcolor}, \cs{pagecolor},
+% \cs{nopagecolor}, \cs{colorbox}, \cs{colorboxBlock}, \cs{fcolorbox},
+% \cs{fcolorboxBlock}, and \env{fcolorminipage}.
+% \item [\cs{AtBeginDocument} in print or HTML mode:]
+% See \Cref{sec:xcolorpatches}.
+% If \pkg{xcolor} has been loaded, the print-mode \cs{fcolorbox} is modified
+% to accept a background color of |none|, and additional definitions are created
+% for \pkg{lwarp}'s new macros print-mode macros \cs{colorboxBlock},
+% \cs{fcolorboxBlock}, and \env{fcolorminipage}. The \HTML\ versions of these
+% macros will already have been created by \pkg{lwarp-xcolor} if it has been loaded.
+% For use inside an \HTML\ \env{lateximage}, \cs{LWR at restoremoreorigxcolor}
+% is defined to temporarily set these functions to their print-mode versions.
+% \item [In a \env{lateximage} in HTML mode:] \
+% \cs{LWR at restoreorigxcolor} and \\ \cs{LWR at restoremoreorigxcolor} are used to
+% temporarily restore the print-mode definitions of \pkg{xcolor}'s functions.
+% See \cs{LWR at restoreorigformatting} on page \pageref{sec:restoreorigformatting}.
+% \end{description}
+%
+% \begin{description}
+%
+% \item [\cs{color}:] \
+% \begin{description}
+% \item [Print:] Used as-is.
+% \item [HTML:] Ignored by |pdftotext|, and will not appear.
+% \item [HTML \env{lateximage}:] Colors will appear in a \env{lateximage}.
+% \end{description}
+%
+% \item [\cs{textcolor}:] \
+% \begin{description}
+% \item [Print:] Used as-is.
+% \item [HTML:] Redefined by \pkg{lwarp-xcolor}, page \pageref{sec:textcolor}.
+% \item [HTML \env{lateximage}:] Remembers and reuses the print version.
+% \end{description}
+%
+% \item [\cs{pagecolor}:] \
+% \begin{description}
+% \item [Print:] Used as-is.
+% \item [HTML:] Ignored.
+% \item [HTML \env{lateximage}:] Colors will be picked up in a \env{lateximage}.
+% \end{description}
+%
+% \item [\cs{nopagecolor}:] \
+% \begin{description}
+% \item [Print:] Used as-is.
+% \item [HTML:] Ignored.
+% \item [HTML \env{lateximage}:] Colors will be picked up in a \env{lateximage}.
+% \end{description}
+%
+% \item [\cs{colorbox}:] \
+% \begin{description}
+% \item [Print:] Used as-is.
+% \item [HTML:] Redefined by \pkg{lwarp-xcolor}, page \pageref{sec:colorbox}.
+% \item [HTML \env{lateximage}:] Remembers and reuses the print version.
+% \end{description}
+%
+% \item [\cs{colorboxBlock}:] \
+% \begin{description}
+% \item [Print:] Becomes \cs{colorbox}.
+% \item [HTML:] Newly defined by \pkg{lwarp-xcolor} to use a \element{div},
+% page \pageref{sec:colorboxBlock}.
+% \item [HTML \env{lateximage}:] Remembers and reuses the print version \cs{colorbox}.
+% \end{description}
+%
+% \item [\cs{fcolorbox}:] \
+% \begin{description}
+% \item [Print:] Modified to allow a background of |none|. \newline
+% \cs{LWRprint at fcolorbox} at \cref{sec:xcolorpatches}
+% \item [HTML:] Redefined by \pkg{lwarp-xcolor}, page \pageref{sec:fcolorbox}.
+% \item [HTML \env{lateximage}:] Remembers and reuses the print version.
+% \end{description}
+%
+% \item [\cs{fcolorboxBlock}:] \
+% \begin{description}
+% \item [Print:] Becomes \cs{fcolorbox}. \Cref{sec:xcolorpatches}
+% \item [HTML:] Newly defined by \pkg{lwarp-xcolor} to use a \element{div},
+% page \pageref{sec:fcolorboxBlock}.
+% \item [HTML \env{lateximage}:] Remembers and reuses the print version \cs{fcolorbox}.
+% \end{description}
+%
+% \item [\env{fcolorminipage}:] \
+% \begin{description}
+% \item [Print:] Newly defined in the \pkg{lwarp} core. \newline
+% \env{LWRprint at fcolorminipage} at \cref{sec:xcolorpatches}
+% \item [HTML:] Newly defined by \pkg{lwarp-xcolor}, page \pageref{sec:fcolorminipage}.
+% \item [HTML \env{lateximage}:] Uses the print version.
+% \end{description}
+%
+% \item [\cs{boxframe}:] \
+% \begin{description}
+% \item [Print:] Used as-is.
+% \item [HTML:] Redefined by \pkg{lwarp-xcolor}, page \pageref{sec:boxframe}.
+% \item [HTML \env{lateximage}:] Remembers and reuses the print version.
+% \end{description}
+%
+% \end{description}
+%
+%
+% \subsection{Code}
+%
% \codehtml
-%
% \begin{macrocode}
\LWR at ProvidesPackagePass{xcolor}
% \end{macrocode}
-
-% ^^A \begin{macro}{\LWR at tempcolor} The color converted to \HTML\ colorspace.
% \begin{macrocode}
-\newcommand*{\LWR at tempcolor}{}
+\begin{warpHTML}
% \end{macrocode}
-% ^^A \end{macro}
-% ^^A \begin{macro}{\LWR at currenttextcolor} The color to use for text and \cs{rule},
-% defaulting to black.
+% Remember the following print-mode actions to be restored
+% when inside a \env{lateximage} environment:
% \begin{macrocode}
-\newcommand*{\LWR at currenttextcolor}{black}
+\LetLtxMacro\LWRprint at textcolor\textcolor
+\LetLtxMacro\LWRprint at pagecolor\pagecolor
+\LetLtxMacro\LWRprint at nopagecolor\nopagecolor
+\LetLtxMacro\LWRprint at colorbox\colorbox
+\LetLtxMacro\LWRprint at colorboxBlock\colorbox
+\LetLtxMacro\LWRorigprint at fcolorbox\fcolorbox
+\LetLtxMacro\LWRorigprint at fcolorboxBlock\fcolorbox
+\LetLtxMacro\LWRorigprint at boxframe\boxframe
% \end{macrocode}
-% ^^A \end{macro}
-
-
-
-% ^^A \begin{macro}{\LWR at colorstyle}
-% \cs{LWR at colorstyle} \marg{1: styletext} \marg{2: model}
-% \marg{3: color} \marg{4: spancontents}
%
-% \changes{v0.19}{2016/06/01}{Supports colored \cs{rule}.}
%
-% Creates a styled span with a color converted to \HTML\ hex colorspace.
-% Uses |LWR at spandepth| to prevent paragraph tags inside the span.
-% If used for \cs{textcolor}, with a styletext of |color:|, then the new color is
-% copied into \\ \cs{LWR at currenttextcolor} for possible re-use in \cs{rule}.
+% Inside a \env{lateximage} the following gets restored to their print-mode actions:
+% \margintag{\cs{LWR at restoreorigxcolor}}
% \begin{macrocode}
-\NewDocumentCommand{\LWR at colorstyle}{m m m m}{%
+\renewcommand*{\LWR at restoreorigxcolor}{%
+\LWR at traceinfo{LWR at restoreorigxcolorformatting}%
+\LetLtxMacro\textcolor\LWRprint at textcolor%
+\LetLtxMacro\pagecolor\LWRprint at pagecolor%
+\LetLtxMacro\nopagecolor\LWRprint at nopagecolor%
+\LetLtxMacro\colorbox\LWRprint at colorbox%
+\LetLtxMacro\fcolorbox\LWRprint at fcolorbox%
+\LetLtxMacro\boxframe\LWRorigprint at boxframe%
+}
% \end{macrocode}
-% Use the \pkg{xcolor} package to convert to an \HTML\ color space:
+%
+%
+% The color converted to \HTML\ colorspace.
+% \margintag{\cs{LWR at tempcolor}}
% \begin{macrocode}
-\convertcolorspec{#2}{#3}{HTML}\LWR at tempcolor%
+\newcommand*{\LWR at tempcolor}{}
+\newcommand*{\LWR at tempcolortwo}{}
% \end{macrocode}
-% If is a \cs{textcolor}, save a copy of this color for use by \cs{rule}:
+% ^^A \end{macro}
+%
+%
+%
+%
+% \marg{1: styletext} \marg{2: model} \marg{3: color}
+% \margintag{\cs{LWR at colorstyle}}
+%
+% \changes{v0.19}{2016/06/01}{Supports colored \cs{rule}.}
+% \changes{v0.36}{2017/08/11}{\pkg{xcolor}: Refactored \cs{LWR at colorstyle}.}
+%
+% For a color style, prints the color converted to \HTML\ colors.
+%
% \begin{macrocode}
-\ifthenelse{\equal{#1}{color:}}%
-{\renewcommand*{\LWR at currenttextcolor}{\#\LWR at tempcolor}}{}%
+\NewDocumentCommand{\LWR at colorstyle}{m m}{%
+\begingroup%
+\LWR at FBcancel%
% \end{macrocode}
-% Create the \HTML\ \element{span} with the styled color:
+% Use the \pkg{xcolor} package to convert to an \HTML\ color space:
% \begin{macrocode}
-\LWR at htmltagc{span style="#1\#\LWR at tempcolor"{}}%
-\begin{LWR at nestspan}%
+\convertcolorspec{#1}{#2}{HTML}\LWR at tempcolor%
% \end{macrocode}
-% Prevent additional paragraph tags inside this span:
+% Print the converted color:
% \begin{macrocode}
+\#\LWR at tempcolor%
+\endgroup%
+}
% \end{macrocode}
-% Print the contents then close the span:
+%
+%
+% \begin{macro}{\LWR at borderpadding} \marg{colorstyle} \marg{color}
+% Prints the \HTML attributes for a black border and padding.
+%
+% \cs{LWR at forceminwidth} must be used first in order to set the border width.
+%
% \begin{macrocode}
-#4%
-\LWR at htmltagc{/span}%
-\end{LWR at nestspan}%
-% \end{macrocode}
-% For paragraph-tag handling:
-% \begin{macrocode}
-\LWR at ensuredoingapar%
+\newcommand*{\LWR at borderpadding}[2]{%
+\uselengthunit{PT}%
+border:\rndprintlength{\LWR at atleastonept} solid \LWR at colorstyle{#1}{#2} ; %
+padding:\rndprintlength{\fboxsep}%
}
% \end{macrocode}
-% ^^A \end{macro}
-
-
-% ^^A \DescribeMacro{\color}
+% \end{macro}
+%
+%
+%
+%
+% \DescribeMacro{\color}
% \cs{color} appears in the \LaTeX{} \PDF\ output,
% but is ignored by |pdftotext| and thus is ignored in the \HTML\ file.
% Text styling by local group is not yet supported.
-
+%
+%
+%
% Each of the following macros is given a temporary name, and is |\let| to the final
% name once the \HTML\ conversion starts.
-
-% ^^A \begin{macro}{\textcolor}
-% \cs{textcolor}
+%
+% \label{sec:textcolor}
+% \begin{macro}{\textcolor}
% \oarg{model} \marg{color} \marg{text}
-% is converted into an \HTML\ hex color span.
+%
+% Converted into an \HTML\ hex color span.
% \begin{macrocode}
-\NewDocumentCommand{\LWR at textcolor}{O{named} m m}{%
+\RenewDocumentCommand{\textcolor}{O{named} m m}{%
\begingroup%
-\LWR at colorstyle{color:}{#1}{#2}{#3}%
+\LWR at FBcancel%
+\convertcolorspec{#1}{#2}{HTML}\LWR at tempcolor%
+\InlineClass[color:\LWR at colorstyle{#1}{#2}]{textcolor}{%
+\renewcommand*{\LWR at currenttextcolor}{\#\LWR at tempcolor}%
+#3%
+}%
\endgroup%
}
% \end{macrocode}
-% ^^A \end{macro}
+% \end{macro}
-% ^^A \begin{macro}{\pagecolor}
-% \cs{pagecolor}
+% \begin{macro}{\pagecolor}
% \oarg{model} \marg{color}
-% is ignored. Use |\CSSFilename| instead.
+%
+% Ignored. Use |\CSSFilename| instead.
% \begin{macrocode}
-\newcommand*{\LWR at pagecolor}[2][named]{}
+\renewcommand*{\pagecolor}[2][named]{}
% \end{macrocode}
-% ^^A \end{macro}
+% \end{macro}
-% ^^A \begin{macro}{\colorbox}
-% \cs{colorbox}
+% \begin{macro}{\nopagecolor}
+% Ignored.
+% \begin{macrocode}
+\let\nopagecolor\relax
+% \end{macrocode}
+% \end{macro}
+
+
+% \label{sec:colorbox}
+% \begin{macro}{\colorbox}
% \oarg{model} \marg{color} \marg{text}
-% is converted into an \HTML\ hex background color span.
%
+% Converted into an \HTML\ hex background color \element{span}.
+%
% \begin{macrocode}
-\NewDocumentCommand{\LWR at colorbox}{O{named} m m}{%
+\RenewDocumentCommand{\colorbox}{O{named} m +m}{%
\begingroup%
-\LWR at colorstyle{background:}{#1}{#2}{#3}%
+\LWR at FBcancel%
+\uselengthunit{PT}%
+\InlineClass[%
+background:\LWR at colorstyle{#1}{#2} ; %
+padding:\rndprintlength{\fboxsep}%
+]{colorbox}{#3}%
\endgroup%
}
% \end{macrocode}
-% ^^A \end{macro}
+% \end{macro}
-% ^^A \begin{macro}{\fcolorbox}
-% \cs{fcolorbox}
-% \oarg{framemodel} \marg{framecolor} \oarg{boxmodel} \marg{boxcolor} \marg{text}
-% is converted into a framed \HTML\ hex background color span.
+% \label{sec:colorboxBlock}
+% \begin{macro}{\colorboxBlock} \oarg{model} \marg{color} \marg{text}
%
-% A background color of "none" creates a colored frame without a background color.
+% Converted into an \HTML\ hex background color \element{div}.
%
% \begin{macrocode}
-\NewDocumentCommand{\LWR at fcolorbox}{O{named} m O{named} m m}{%
+\NewDocumentCommand{\colorboxBlock}{O{named} m +m}{%
\begingroup%
-\ifthenelse{\equal{#4}{none}}{% no background color
-\LWR at colorstyle{border:1px solid }{#1}{#2}{#5}%
-}{% yes background color
-\LWR at colorstyle{border:1px solid }{#1}{#2}%
-{\LWR at colorstyle{background:}{#3}{#4}{#5}}%
+\LWR at FBcancel%
+\uselengthunit{PT}%
+\begin{BlockClass}[%
+background:\LWR at colorstyle{#1}{#2} ; %
+padding:\rndprintlength{\fboxsep}%
+]{colorboxBlock}
+#3
+\end{BlockClass}%
+\endgroup%
+}
+% \end{macrocode}
+% \end{macro}
+
+% \label{sec:fcolorbox}
+% \begin{macro}{\fcolorbox}
+% \oarg{framemodel} \marg{framecolor} \oarg{boxmodel} \marg{boxcolor} \marg{text}
+%
+% Converted into a framed \HTML\ hex background color span.
+%
+% A background color of |none| creates a colored frame without a background color.
+%
+% \begin{macrocode}
+\RenewDocumentCommand{\fcolorbox}{O{named} m O{named} m +m}{%
+\LWR at traceinfo{HTML fcolorbox #2 #4}%
+\begingroup%
+\LWR at FBcancel%
+\uselengthunit{PT}%
+\LWR at forceminwidth{\fboxrule}%
+\ifthenelse{\equal{#4}{none}}%
+{% no background color
+ \InlineClass[%
+ \LWR at borderpadding{#1}{#2}%
+ ]{fcolorbox}{#5}%
}%
+{% yes background color
+ \InlineClass[%
+ \LWR at borderpadding{#1}{#2} ; %
+ background:\LWR at colorstyle{#3}{#4}%
+ ]{fcolorbox}{#5}%
+}%
\endgroup%
}
% \end{macrocode}
-% ^^A \end{macro}
+% \end{macro}
+% \label{sec:fcolorboxBlock}
+% \begin{macro}{\fcolorboxBlock}
+% \oarg{framemodel} \marg{framecolor} \oarg{boxmodel} \marg{boxcolor} \marg{text}
+%
+% Converted into a framed \HTML\ hex background color span.
+%
+% A background color of |none| creates a colored frame without a background color.
+%
+% \begin{macrocode}
+\NewDocumentCommand{\fcolorboxBlock}{O{named} m O{named} m +m}{%
+\LWR at traceinfo{HTML fcolorboxBlock #2 #4}%
+\begingroup%
+\LWR at FBcancel%
+\uselengthunit{PT}%
+\LWR at forceminwidth{\fboxrule}%
+\ifthenelse{\equal{#4}{none}}%
+{% no background color
+ \begin{BlockClass}[%
+ \LWR at borderpadding{#1}{#2}%
+ ]{fcolorboxBlock}
+ #5
+ \end{BlockClass}%
+}%
+{% yes background color
+ \convertcolorspec{#3}{#4}{HTML}\LWR at tempcolortwo%
+ \begin{BlockClass}[%
+ background:\#\LWR at tempcolortwo; %
+ \LWR at borderpadding{#1}{#2}%
+ ]{fcolorboxBlock}
+ #5
+ \end{BlockClass}%
+}%
+\endgroup%
+\LWR at traceinfo{HTML fcolorboxBlock done}%
+}
+% \end{macrocode}
+% \end{macro}
-% Redirect to new definitions:
+
+% \label{sec:fcolorminipage}
+% \begin{environment}{fcolorminipage}
+% \oarg{1:framemodel} \marg{2:framecolor} \oarg{3:boxmodel} \marg{4:boxcolor}
+% \oarg{5:align} \oarg{6:height} \oarg{7:inner-align} \marg{8:width}
+%
+% Creates a framed \HTML\ \element{div} around its contents.
+%
+% A print-output version is defined in the \pkg{lwarp} core: \cref{sec:xcolorpatches}
+%
+% \changes{v0.34}{2017/07/31}{Added.}
+%
+% \marg{framemodel} \marg{framecolor} \marg{background tag} \marg{height}
+% \margintag{\cs{LWR at subfcolorminipage}}
% \begin{macrocode}
-\let\textcolor\LWR at textcolor
-\let\pagecolor\LWR at pagecolor
-\LetLtxMacro\colorbox\LWR at colorbox
-\LetLtxMacro\fcolorbox\LWR at fcolorbox
+\NewDocumentCommand{\LWR at subfcolorminipage}{m m m m}{%
+\begin{BlockClass}[%
+#3%
+\LWR at borderpadding{#1}{#2} ; %
+\IfValueTF{#4}{height:\rndprintlength{\LWR at tempheight} ; }{}%
+width:\rndprintlength{\LWR at tempwidth}%
+]{fcolorminipage}%
+}
% \end{macrocode}
%
+% \oarg{1:framestyle} \marg{2:framecolor} \oarg{3:bkgcolorstyle} \marg{4:bkgcolor}
+% \margintag{\env{fcolorminipage}}
+% \oarg{5:align} \oarg{6:height} \oarg{7:inneralign} \marg{8:width}
+% \begin{macrocode}
+\NewDocumentEnvironment{fcolorminipage}{O{named} m O{named} m O{c} o o m}
+{%
+\LWR at FBcancel%
+\setlength{\LWR at tempwidth}{#8}%
+\IfValueTF{#6}{\setlength{\LWR at tempheight}{#6}}{}%
+\uselengthunit{PT}%
+\LWR at forceminwidth{\fboxrule}%
+\convertcolorspec{#1}{#2}{HTML}\LWR at tempcolor%
+\ifthenelse{\equal{#4}{none}}%
+{\LWR at subfcolorminipage{#1}{#2}{}{#6}}%
+{%
+ \convertcolorspec{#3}{#4}{HTML}\LWR at tempcolortwo%
+ \LWR at subfcolorminipage{#1}{#2}{background:\#\LWR at tempcolortwo\ ; }{#6}%
+}%
+}
+{\end{BlockClass}}
+% \end{macrocode}
+% \end{environment}
%
+%
+%
+% \label{sec:boxframe}
+% \begin{macro}{\boxframe} \marg{width} \marg{height} \marg{depth}
+%
+% The depth is added to the height, but the box is not decended below
+% by the depth. \cs{textcolor} is honored.
+% \begin{macrocode}
+\renewcommand*{\boxframe}[3]{%
+{%
+\setlength{\LWR at tempwidth}{#1}%
+\setlength{\LWR at tempheight}{#2}%
+\addtolength{\LWR at tempheight}{#3}%
+\uselengthunit{PT}%
+\LWR at forceminwidth{\fboxrule}%
+\InlineClass[%
+display:inline-block ; %
+border:\rndprintlength{\LWR at atleastonept} solid \LWR at currenttextcolor{} ; %
+width:\rndprintlength{\LWR at tempwidth} ; %
+height:\rndprintlength{\LWR at tempheight}%
+]{boxframe}{}%
+}%
+}
+% \end{macrocode}
+% \end{macro}
+%
+%
+% \begin{macrocode}
+\end{warpHTML}
+% \end{macrocode}
+%
% \iffalse
%</xcolor>
% \fi
@@ -29159,6 +30260,8 @@
%
%
%
+%
+%
% \clearpage
%
% \iffalse
@@ -29209,7 +30312,7 @@
% \end{macrocode}
-% ^^A \begin{macro}{\xfracHTMLfontsize}
+% \begin{macro}{\xfracHTMLfontsize}
% \changes{v0.19}{2016/06/06}{Added.}
% \index{font>size --- xfrac}
% User-redefinable macro which controls the font size of the fraction.
@@ -29216,7 +30319,7 @@
% \begin{macrocode}
\newcommand*{\xfracHTMLfontsize}{.6em}
% \end{macrocode}
-% ^^A \end{macro}
+% \end{macro}
% \begin{macrocode}
\end{warpall}
Modified: trunk/Master/texmf-dist/source/latex/lwarp/lwarp.ins
===================================================================
--- trunk/Master/texmf-dist/source/latex/lwarp/lwarp.ins 2017-08-17 00:17:55 UTC (rev 45053)
+++ trunk/Master/texmf-dist/source/latex/lwarp/lwarp.ins 2017-08-17 21:15:43 UTC (rev 45054)
@@ -143,8 +143,10 @@
\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-transparent.sty}{\from{lwarp.dtx}{transparent}}
\file{lwarp-trivfloat.sty}{\from{lwarp.dtx}{trivfloat}}
\file{lwarp-ulem.sty}{\from{lwarp.dtx}{ulem}}
+\file{lwarp-upref.sty}{\from{lwarp.dtx}{upref}}
\file{lwarp-verse.sty}{\from{lwarp.dtx}{verse}}
\file{lwarp-wallpaper.sty}{\from{lwarp.dtx}{wallpaper}}
\file{lwarp-wrapfig.sty}{\from{lwarp.dtx}{wrapfig}}
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-abstract.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-abstract.sty 2017-08-17 00:17:55 UTC (rev 45053)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-abstract.sty 2017-08-17 21:15:43 UTC (rev 45054)
@@ -56,7 +56,7 @@
\put at bsintoc%
\begin{@bstr at ctlist}\if at bsrunin\@bsrunintitle\fi\abstracttextfont}%
{\par\end{@bstr at ctlist}\vfil\null%\endtitlepage
-}
+ }
\else
\renewenvironment{abstract}{%
\if at bsrunin
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-amsthm.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-amsthm.sty 2017-08-17 00:17:55 UTC (rev 45053)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-amsthm.sty 2017-08-17 21:15:43 UTC (rev 45054)
@@ -25,10 +25,10 @@
\@ifundefined{th@#1}{%
\PackageWarning{amsthm}{Unknown theoremstyle `#1'}%
\thm at style{plain}%
-\renewcommand{\LWR at newtheoremstyle}{plain}% new
+ \renewcommand{\LWR at newtheoremstyle}{plain}% new
}{%
\thm at style{#1}%
-\renewcommand{\LWR at newtheoremstyle}{#1}% new
+ \renewcommand{\LWR at newtheoremstyle}{#1}% new
}%
}
@@ -45,7 +45,7 @@
\else % numbered theorem, need to check for optional arg
\def\@tempa{\@oparg{\@ynthm{#2}}[]}%
\fi
-\AtBeginEnvironment{#2}{\edef\LWR at thisthmstyle{\csuse{LWR at thmstyle#2}}}% new
+ \AtBeginEnvironment{#2}{\edef\LWR at thisthmstyle{\csuse{LWR at thmstyle#2}}}% new
}%
\@tempa
}
@@ -69,7 +69,7 @@
\LWR at forcenewpage% new
\BlockClass{amsthmbody\LWR at thisthmstyle}% new
\deferred at thm@head{
-\the\thm at headfont \thm at indent
+ \the\thm at headfont \thm at indent
\@ifempty{#1}{\let\thmname\@gobble}{\LWR at haveamsthmname}% new
\@ifempty{#2}{\let\thmnumber\@gobble}{\LWR at haveamsthmnumber}% new
\@ifempty{#3}{\let\thmnote\@gobble}{\LWR at haveamsthmnote}% new
@@ -87,7 +87,7 @@
}
\renewenvironment{proof}[1][\proofname]{\par
\LWR at forcenewpage% new
-\BlockClass{amsthmproof}% new
+ \BlockClass{amsthmproof}% new
\pushQED{\qed}%
\normalfont \topsep6\p@\@plus6\p@\relax
\trivlist
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-endnotes.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-endnotes.sty 2017-08-17 00:17:55 UTC (rev 45053)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-endnotes.sty 2017-08-17 21:15:43 UTC (rev 45054)
@@ -22,7 +22,7 @@
\makeenmark
}
-\def\@makeenmark{\hbox{\textsuperscript{\normalfont\theenmark}}}
+\def\@makeenmark{\hbox{\LWR at htmlspan{sup}{\normalfont\theenmark}}}
\def\makeenmark{\@makeenmark}
\endinput
%%
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fancybox.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fancybox.sty 2017-08-17 00:17:55 UTC (rev 45053)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fancybox.sty 2017-08-17 21:15:43 UTC (rev 45054)
@@ -73,7 +73,7 @@
\def\endLandscape{}
\let\LWRFB at UseVerbatim\UseVerbatim
\renewcommand*{\UseVerbatim}[1]{%
-\LWR at atbeginverbatim{Verbatim}\unskip\LWR at origvspace*{-\baselineskip}%%
+\LWR at atbeginverbatim{Verbatim}\unskip\LWR at origvspace*{-.5\baselineskip}%%
\LWRFB at UseVerbatim{#1}%
\LWR at afterendverbatim%
}
@@ -81,13 +81,13 @@
\let\LWRFB at LUseVerbatim\LUseVerbatim
\renewcommand*{\LUseVerbatim}[1]{%
-\LWR at atbeginverbatim{LVerbatim}\unskip\LWR at origvspace*{-\baselineskip}%%
+\LWR at atbeginverbatim{LVerbatim}%\unskip\LWR at origvspace*{-\baselineskip}%%
\LWRFB at LUseVerbatim{#1}%
\LWR at afterendverbatim%
}
\def\@BUseVerbatim[#1]#2{%
-\LWR at atbeginverbatim{BVerbatim}\unskip\LWR at origvspace*{-\baselineskip}%%
+\LWR at atbeginverbatim{BVerbatim}\unskip\LWR at origvspace*{-.5\baselineskip}%%
\LWRFB at UseVerbatim{#2}%
\LWR at afterendverbatim%
}
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyvrb.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyvrb.sty 2017-08-17 00:17:55 UTC (rev 45053)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyvrb.sty 2017-08-17 21:15:43 UTC (rev 45054)
@@ -157,35 +157,35 @@
\else
\ifnum#1=\z@
\ifx\FV at LabelPositionTopLine\relax
-\else
-\LWR at FVfindbordercolor
+ \else
+ \LWR at FVfindbordercolor
\LWR at htmltagc{div class="fancyvrblabel" style="color: \#\LWR at tempcolor"}
-\LWR at origtextrm{\FV at LabelBegin}% \textrm preserves emdash
-\LWR at htmltagc{/div}
-\fi
+ \LWR at origtextrm{\FV at LabelBegin}% \textrm preserves emdash
+ \LWR at htmltagc{/div}
+ \fi
\else
\ifx\FV at LabelPositionBottomLine\relax
-\else
-\LWR at FVfindbordercolor
+ \else
+ \LWR at FVfindbordercolor
\LWR at htmltagc{div class="fancyvrblabel" style="color: \#\LWR at tempcolor"}
-\LWR at origtextrm{\FV at LabelEnd}
-\LWR at htmltagc{/div}
-\fi
+ \LWR at origtextrm{\FV at LabelEnd}
+ \LWR at htmltagc{/div}
+ \fi
\fi
\fi
\hss
+ }
}
-}
\def\FV at ListProcessLine#1{%
\hbox to \hsize{%
\hbox to \VerbatimHTMLWidth {%
\ifcsvoid{FV at LeftListNumber}{}{\kern 2.5em}%
-\FV at LeftListNumber%
+ \FV at LeftListNumber%
\FancyVerbFormatLine{#1}%
\hss%
\FV at RightListNumber%
-}%
+ }%
\hss% required to avoid underfull hboxes
}
}
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-floatrow.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-floatrow.sty 2017-08-17 00:17:55 UTC (rev 45053)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-floatrow.sty 2017-08-17 21:15:43 UTC (rev 45054)
@@ -33,29 +33,29 @@
\NewDocumentCommand{\floatbox}{o m o o o +m +m}{%
\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
+ \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}}%
+ #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
+ \begingroup
+ \let\caption\@firstofone
+ \subfloat[#6]{#7}
+ \endgroup
}% subfig in a subfloatrow
{% subfig package, but not a subfig
\@nameuse{#2}
@@ -130,16 +130,16 @@
\LWR at traceinfo{finished setkeys frowkeys}%
\ifthenelse{\equal{\LWR at frowkeywithin}{}}
{
-\LWR at traceinfo{about to newfloat #1 \LWR at frowkeyplacement\
-\LWR at frowkeyfileext}%
-\newfloat{#1}{\LWR at frowkeyplacement}{\LWR at frowkeyfileext}
+ \LWR at traceinfo{about to newfloat #1 \LWR at frowkeyplacement\
+ \LWR at frowkeyfileext}%
+ \newfloat{#1}{\LWR at frowkeyplacement}{\LWR at frowkeyfileext}
}%
{%
-\LWR at traceinfo{about to newfloat #1\ \LWR at frowkeyplacement\
-\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{about to newfloat #1\ \LWR at frowkeyplacement\
+ \LWR at frowkeyfileext\ \LWR at frowkeywithin}%
+ \newfloat{#1}{\LWR at frowkeyplacement}%
+ {\LWR at frowkeyfileext}[\LWR at frowkeywithin]%
+ \LWR at traceinfo{finished newfloat #1}
}%
\ifthenelse{\equal{\LWR at frowkeyname}{}}
{}
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-footnote.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-footnote.sty 2017-08-17 00:17:55 UTC (rev 45053)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-footnote.sty 2017-08-17 21:15:43 UTC (rev 45054)
@@ -20,7 +20,10 @@
\protected at edef\@currentlabel{\csname p@\@mpfn\endcsname\@thefnmark}%
}
-\newcommand*{\fn at endnote}{\LWR at htmltagc{/\LWR at tagregularparagraph}}
+\newcommand*{\fn at endnote}{%
+\LWR at htmltagc{/\LWR at tagregularparagraph}%
+\LWR at orignewline%
+}
\def\fn at startfntext{%
\setbox\z@\vbox\bgroup%
\fn at startnote%
@@ -28,7 +31,8 @@
\ignorespaces%
}
\def\fn at endfntext{%
-\LWR at htmltagc{/\LWR at tagregularparagraph}%
+ \LWR at htmltagc{/\LWR at tagregularparagraph}%
+ \LWR at orignewline%
\fn at postfntext%
\egroup%
\begingroup%
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-framed.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-framed.sty 2017-08-17 00:17:55 UTC (rev 45053)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-framed.sty 2017-08-17 21:15:43 UTC (rev 45054)
@@ -48,7 +48,7 @@
\renewenvironment{leftbar}{%
\LWR at forcenewpage
-\BlockClass{framedleftbar}
+ \BlockClass{framedleftbar}
\def\FrameCommand{}%
\MakeFramed {}
}%
@@ -80,18 +80,18 @@
\LWR at forcenewpage
\begin{BlockClass}[border: 3px solid \#\LWR at tempcolor]{framed}%
\ifthenelse{\isempty{#1}}{}{% not empty
-\begin{BlockClass}[background: \#\LWR at tempcolor]{framedtitle}%
-\textcolor{TFTitleColor}{\textbf{#1}}%
-\end{BlockClass}
+ \begin{BlockClass}[background: \#\LWR at tempcolor]{framedtitle}%
+ \textcolor{TFTitleColor}{\textbf{#1}}%
+ \end{BlockClass}
}% not empty
#7
\ifthenelse{\isempty{#2}}{}{% not empty
-\convertcolorspec{named}{TFFrameColor}{HTML}\LWR at tempcolor%
-\begin{BlockClass}[background: \#\LWR at tempcolor]{framedtitle}%
-\textcolor{TFTitleColor}{\textbf{#2}}%
-\end{BlockClass}
+ \convertcolorspec{named}{TFFrameColor}{HTML}\LWR at tempcolor%
+ \begin{BlockClass}[background: \#\LWR at tempcolor]{framedtitle}%
+ \textcolor{TFTitleColor}{\textbf{#2}}%
+ \end{BlockClass}
}% not empty
\end{BlockClass}
}
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-mdframed.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-mdframed.sty 2017-08-17 00:17:55 UTC (rev 45053)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-mdframed.sty 2017-08-17 21:15:43 UTC (rev 45054)
@@ -47,11 +47,11 @@
\LWR at mdfprintcolor{linecolor} ; \LWR at orignewline
border-radius: \LWR at mdfprintlength{roundcorner} ; \LWR at orignewline
\ifbool{mdf at shadow}{%
-box-shadow:
-\LWR at mdfprintlength{shadowsize}
-\LWR at mdfprintlength{shadowsize}
-\LWR at mdfprintlength{shadowsize}
-\LWR at mdfprintcolor{shadowcolor} ;
+ box-shadow:
+ \LWR at mdfprintlength{shadowsize}
+ \LWR at mdfprintlength{shadowsize}
+ \LWR at mdfprintlength{shadowsize}
+ \LWR at mdfprintcolor{shadowcolor} ;
}
{box-shadow: none ;}
\LWR at orignewline
@@ -58,6 +58,7 @@
"}
\LetLtxMacro{\hspace}{\LWR at orighspace}%
\LetLtxMacro\rule\LWR at origrule%
+\LetLtxMacro\makebox\LWR at origmakebox%
}
\newcommand*{\LWR at mdframedend}{
\LWR at htmldivclassend{\LWR at mdthisenv}
@@ -77,19 +78,19 @@
\LWR at mdfprintcolor{frametitlebackgroundcolor}
; \LWR at orignewline
\ifbool{mdf at frametitlerule}{%
-border-bottom:
-\LWR at mdfprintlength{frametitlerulewidth}
-solid
-\LWR at mdfprintcolor{frametitlerulecolor}
-; \LWR at orignewline
+ border-bottom:
+ \LWR at mdfprintlength{frametitlerulewidth}
+ solid
+ \LWR at mdfprintcolor{frametitlerulecolor}
+ ; \LWR at orignewline
}{}%
border-radius:
\setlength{\LWR at titleroundcorner}
-{\maxof{\mdf at roundcorner@length-\mdf at linewidth@length}{0pt}}
-\rndprintlength{\LWR at titleroundcorner}
-\rndprintlength{\LWR at titleroundcorner}
-0pt 0pt
-\LWR at orignewline
+ {\maxof{\mdf at roundcorner@length-\mdf at linewidth@length}{0pt}}
+ \rndprintlength{\LWR at titleroundcorner}
+ \rndprintlength{\LWR at titleroundcorner}
+ 0pt 0pt
+ \LWR at orignewline
" \LWR at orignewline
}% span
\begin{LWR at nestspan}%
@@ -108,18 +109,18 @@
\LWR at mdfprintcolor{#1titlebackgroundcolor}
; \LWR at orignewline
\ifbool{mdf@#1titleaboveline}{%
-border-top:
-\LWR at mdfprintlength{#1titleabovelinewidth}
-solid
-\LWR at mdfprintcolor{#1titleabovelinecolor}
-; \LWR at orignewline
+ border-top:
+ \LWR at mdfprintlength{#1titleabovelinewidth}
+ solid
+ \LWR at mdfprintcolor{#1titleabovelinecolor}
+ ; \LWR at orignewline
}{}%
\ifbool{mdf@#1titlebelowline}{%
-border-bottom:
-\LWR at mdfprintlength{#1titlebelowlinewidth}
-solid
-\LWR at mdfprintcolor{#1titlebelowlinecolor}
-; \LWR at orignewline
+ border-bottom:
+ \LWR at mdfprintlength{#1titlebelowlinewidth}
+ solid
+ \LWR at mdfprintcolor{#1titlebelowlinecolor}
+ ; \LWR at orignewline
}{}%
"}% span
\begin{LWR at nestspan}%
@@ -242,8 +243,8 @@
\begin{mdframed}[#1,frametitle={\strut#4\@temptitle}]}%
{\end{mdframed}}%
}%
-\BeforeBeginEnvironment{#2}{\renewcommand*{\LWR at mdthisenv}{md#2}}% new
-\BeforeBeginEnvironment{#2*}{\renewcommand*{\LWR at mdthisenv}{md#2}}% new
+ \BeforeBeginEnvironment{#2}{\renewcommand*{\LWR at mdthisenv}{md#2}}% new
+ \BeforeBeginEnvironment{#2*}{\renewcommand*{\LWR at mdthisenv}{md#2}}% new
}%
}
\DeclareDocumentCommand\newmdtheoremenv{O{} m o m o }{%
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-ntheorem.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-ntheorem.sty 2017-08-17 00:17:55 UTC (rev 45053)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-ntheorem.sty 2017-08-17 21:15:43 UTC (rev 45054)
@@ -41,12 +41,12 @@
{Unknown theoremstyle `#1'. Using `plain'}%
\theorem at style{plain}
\renewcommand{\LWR at newtheoremstyle}{plain}% new
-}%
+ }%
{
-\theorem at style{#1}
+ \theorem at style{#1}
\renewcommand{\LWR at newtheoremstyle}{#1}% new
+ }
}
-}
\gdef\@xnthm#1#2[#3]{%
@@ -61,7 +61,7 @@
\expandafter\gdef\csname mkheader@#1\endcsname
{\csname setparms@#1\endcsname
\@thm{#1}{#1}{#2}
-}%
+ }%
\global\@namedef{end#1}{\@endtheorem}
\AtBeginEnvironment{#1}{\edef\LWR at thisthmstyle{\csuse{LWR at thmstyle#1}}}% new
\fi
@@ -77,7 +77,7 @@
\expandafter\gdef\csname mkheader@#1\endcsname
{\csname setparms@#1\endcsname
\@thm{#1}{#1}{#2}
-}%
+ }%
\global\@namedef{end#1}{\@endtheorem}
\AtBeginEnvironment{#1}{\edef\LWR at thisthmstyle{\csuse{LWR at thmstyle#1}}}% new
\fi
@@ -98,7 +98,7 @@
\expandafter\gdef\csname mkheader@#1\endcsname
{\csname setparms@#1\endcsname
\@thm{#1}{#2}{#3}
-}%
+ }%
\global\@namedef{end#1}{\@endtheorem}
\AtBeginEnvironment{#1}{\edef\LWR at thisthmstyle{\csuse{LWR at thmstyle#1}}}% new
\fi}
@@ -129,116 +129,116 @@
\renewtheoremstyle{plain}%
{\item[\hskip\labelsep \theorem at headerfont
-\InlineClass{theoremheaderplain}{##1\ ##2\theorem at separator}]}%
+ \InlineClass{theoremheaderplain}{##1\ ##2\theorem at separator}]}%
{\item[\hskip\labelsep \theorem at headerfont
-\InlineClass{theoremheaderplain}{##1\ ##2\ (##3)\theorem at separator}]}
+ \InlineClass{theoremheaderplain}{##1\ ##2\ (##3)\theorem at separator}]}
\renewtheoremstyle{break}%
{\item[
-\hskip\labelsep \theorem at headerfont
-\InlineClass{theoremheaderbreak}{##1\ ##2\theorem at separator}\newline
-]}%
+ \hskip\labelsep \theorem at headerfont
+ \InlineClass{theoremheaderbreak}{##1\ ##2\theorem at separator}\newline
+ ]}%
{\item[
-\hskip\labelsep \theorem at headerfont
-\InlineClass{theoremheaderbreak}{##1\ ##2\ (##3)\theorem at separator}\newline
-]}
+ \hskip\labelsep \theorem at headerfont
+ \InlineClass{theoremheaderbreak}{##1\ ##2\ (##3)\theorem at separator}\newline
+ ]}
\renewtheoremstyle{change}%
{\item[\hskip\labelsep
-\theorem at headerfont
-\InlineClass{theoremheaderchange}{##2\ ##1\theorem at separator}]}%
+ \theorem at headerfont
+ \InlineClass{theoremheaderchange}{##2\ ##1\theorem at separator}]}%
{\item[\hskip\labelsep
-\theorem at headerfont
-\InlineClass{theoremheaderchange}{##2\ ##1\ (##3)\theorem at separator}]}
+ \theorem at headerfont
+ \InlineClass{theoremheaderchange}{##2\ ##1\ (##3)\theorem at separator}]}
\renewtheoremstyle{changebreak}%
{\item[
-\hskip\labelsep \theorem at headerfont
-\InlineClass{theoremheaderchangebreak}{##2\ ##1\theorem at separator}\newline
-]}%
+ \hskip\labelsep \theorem at headerfont
+ \InlineClass{theoremheaderchangebreak}{##2\ ##1\theorem at separator}\newline
+ ]}%
{\item[
-\hskip\labelsep \theorem at headerfont
-\InlineClass{theoremheaderchangebreak}{##2\ ##1\ (##3)\theorem at separator}\newline
-]}
+ \hskip\labelsep \theorem at headerfont
+ \InlineClass{theoremheaderchangebreak}{##2\ ##1\ (##3)\theorem at separator}\newline
+ ]}
\renewtheoremstyle{margin}%
{\item[\hskip\labelsep\theorem at headerfont
-\InlineClass{theoremheadermargin}{##2 \qquad ##1\theorem at separator}
-]}%
+ \InlineClass{theoremheadermargin}{##2 \qquad ##1\theorem at separator}
+ ]}%
{\item[\hskip\labelsep\theorem at headerfont
-\InlineClass{theoremheadermargin}{##2 \qquad ##1\ (##3)\theorem at separator}
-]}
+ \InlineClass{theoremheadermargin}{##2 \qquad ##1\ (##3)\theorem at separator}
+ ]}
\renewtheoremstyle{marginbreak}%
{\item[\hskip\labelsep\theorem at headerfont
-\InlineClass{theoremheadermarginbreak}{##2 \qquad ##1\theorem at separator}\newline
-]}%
+ \InlineClass{theoremheadermarginbreak}{##2 \qquad ##1\theorem at separator}\newline
+ ]}%
{\item[\hskip\labelsep\theorem at headerfont
-\InlineClass{theoremheadermarginbreak}{##2 \qquad ##1\ (##3)\theorem at separator}\newline
-]}
+ \InlineClass{theoremheadermarginbreak}{##2 \qquad ##1\ (##3)\theorem at separator}\newline
+ ]}
\renewtheoremstyle{nonumberplain}%
{\item[\theorem at headerfont\hskip\labelsep
-\InlineClass{theoremheaderplain}{##1\theorem at separator}]}%
+ \InlineClass{theoremheaderplain}{##1\theorem at separator}]}%
{\item[\theorem at headerfont\hskip \labelsep
-\InlineClass{theoremheaderplain}{##1\ (##3)\theorem at separator}]}
+ \InlineClass{theoremheaderplain}{##1\ (##3)\theorem at separator}]}
\renewtheoremstyle{nonumberbreak}%
{\item[
-\hskip\labelsep \theorem at headerfont
-\InlineClass{theoremheaderbreak}{##1\theorem at separator}\newline
-]}%
+ \hskip\labelsep \theorem at headerfont
+ \InlineClass{theoremheaderbreak}{##1\theorem at separator}\newline
+ ]}%
{\item[
-\hskip\labelsep \theorem at headerfont
-\InlineClass{theoremheaderbreak}{##1\ (##3)\theorem at separator}\newline
-]}
+ \hskip\labelsep \theorem at headerfont
+ \InlineClass{theoremheaderbreak}{##1\ (##3)\theorem at separator}\newline
+ ]}
\renewtheoremstyle{empty}%
{\item[]}%
{\item[\theorem at headerfont \hskip\labelsep\relax
-\InlineClass{theoremheaderplain}{##3}]}
+ \InlineClass{theoremheaderplain}{##3}]}
\renewtheoremstyle{emptybreak}%
{\item[]}%
{\item[\theorem at headerfont \hskip\labelsep\relax
-\InlineClass{theoremheaderplain}{##3}] \ \newline}
-\ifbool{LWR at ntheoremamsthm}{}{
-\newtheoremstyle{plainupright}%
- {\item[\hskip\labelsep \theorem at headerfont
-\InlineClass{theoremheaderplain}{##1\ ##2\theorem at separator}]}%
- {\item[\hskip\labelsep \theorem at headerfont
-\InlineClass{theoremheaderplain}{##1\ ##2\ (##3)\theorem at separator}]}
+ \InlineClass{theoremheaderplain}{##3}] \ \newline}
+\ifbool{LWR at ntheoremamsthm}{}{%
+ \newtheoremstyle{plainupright}%
+ {\item[\hskip\labelsep \theorem at headerfont
+ \InlineClass{theoremheaderplain}{##1\ ##2\theorem at separator}]}%
+ {\item[\hskip\labelsep \theorem at headerfont
+ \InlineClass{theoremheaderplain}{##1\ ##2\ (##3)\theorem at separator}]}
-\newtheoremstyle{nonumberplainuprightsc}%
- {\item[\theorem at headerfont\hskip\labelsep
-\InlineClass{theoremheadersc}{##1\theorem at separator}]}%
- {\item[\theorem at headerfont\hskip \labelsep
-\InlineClass{theoremheadersc}{##1\ (##3)\theorem at separator}]}
-\theoremstyle{plainupright}
-\theorembodyfont{\upshape}
-\theoremsymbol{\HTMLunicode{25A1}}% UTF-8 white box
-\renewtheorem{Example}{Example}
-\renewtheorem{example}{Example}
-\renewtheorem{Beispiel}{Beispiel}
-\renewtheorem{beispiel}{Beispiel}
-\renewtheorem{Bemerkung}{Bemerkung}
-\renewtheorem{bemerkung}{Bemerkung}
-\renewtheorem{Anmerkung}{Anmerkung}
-\renewtheorem{anmerkung}{Anmerkung}
-\renewtheorem{Remark}{Remark}
-\renewtheorem{remark}{Remark}
-\renewtheorem{Definition}{Definition}
-\renewtheorem{definition}{Definition}
+ \newtheoremstyle{nonumberplainuprightsc}%
+ {\item[\theorem at headerfont\hskip\labelsep
+ \InlineClass{theoremheadersc}{##1\theorem at separator}]}%
+ {\item[\theorem at headerfont\hskip \labelsep
+ \InlineClass{theoremheadersc}{##1\ (##3)\theorem at separator}]}
+ \theoremstyle{plainupright}
+ \theorembodyfont{\upshape}
+ \theoremsymbol{\HTMLunicode{25A1}}% UTF-8 white box
+ \renewtheorem{Example}{Example}
+ \renewtheorem{example}{Example}
+ \renewtheorem{Beispiel}{Beispiel}
+ \renewtheorem{beispiel}{Beispiel}
+ \renewtheorem{Bemerkung}{Bemerkung}
+ \renewtheorem{bemerkung}{Bemerkung}
+ \renewtheorem{Anmerkung}{Anmerkung}
+ \renewtheorem{anmerkung}{Anmerkung}
+ \renewtheorem{Remark}{Remark}
+ \renewtheorem{remark}{Remark}
+ \renewtheorem{Definition}{Definition}
+ \renewtheorem{definition}{Definition}
-\theoremstyle{nonumberplainuprightsc}
-\theoremsymbol{\HTMLunicode{220E}}% UTF-8 end-of-proof
-\renewtheorem{Proof}{Proof}
-\renewtheorem{proof}{Proof}
-\renewtheorem{Beweis}{Beweis}
-\renewtheorem{beweis}{Beweis}
-\qedsymbol{\HTMLunicode{220E}}% UTF-8 end-of-proof
+ \theoremstyle{nonumberplainuprightsc}
+ \theoremsymbol{\HTMLunicode{220E}}% UTF-8 end-of-proof
+ \renewtheorem{Proof}{Proof}
+ \renewtheorem{proof}{Proof}
+ \renewtheorem{Beweis}{Beweis}
+ \renewtheorem{beweis}{Beweis}
+ \qedsymbol{\HTMLunicode{220E}}% UTF-8 end-of-proof
-\theoremsymbol{}
+ \theoremsymbol{}
}% not amsthm
\ifbool{LWR at ntheoremamsthm}{
@@ -246,125 +246,125 @@
\def\theorem at headerfont{\normalfont\bfseries}\itshape%
\def\@begintheorem##1##2{%
\LWR at forcenewpage% new
-\BlockClass{theorembodyplain}% new
-\LWR at inctheorem% new
+ \BlockClass{theorembodyplain}% new
+ \LWR at inctheorem% new
\item[\hskip\labelsep
\InlineClass{theoremheaderplain}{##1\ ##2.}
-]}%
+ ]}%
\def\@opargbegintheorem##1##2##3{%
\LWR at forcenewpage% new
-\BlockClass{theorembodyplain}% new
-\LWR at inctheorem% new
+ \BlockClass{theorembodyplain}% new
+ \LWR at inctheorem% new
\item[\hskip\labelsep
\InlineClass{theoremheaderplain}{##1\ ##2\ (##3).}
-]}}
+ ]}}
\gdef\th at nonumberplain{%
\def\theorem at headerfont{\normalfont\bfseries}\itshape%
\def\@begintheorem##1##2{%
\LWR at forcenewpage% new
-\BlockClass{theorembodyplain}% new
-\LWR at inctheorem% new
+ \BlockClass{theorembodyplain}% new
+ \LWR at inctheorem% new
\item[\hskip\labelsep
\InlineClass{theoremheaderplain}{##1.}
-]}%
+ ]}%
\def\@opargbegintheorem##1##2##3{%
\LWR at forcenewpage% new
-\BlockClass{theorembodyplain}% new
-\LWR at inctheorem% new
+ \BlockClass{theorembodyplain}% new
+ \LWR at inctheorem% new
\item[\hskip\labelsep
\InlineClass{theoremheaderplain}{##1\ (##3).}
-]}}
+ ]}}
\gdef\th at definition{%
\def\theorem at headerfont{\normalfont\bfseries}\normalfont%
\def\@begintheorem##1##2{%
\LWR at forcenewpage% new
-\BlockClass{theorembodydefinition}% new
-\LWR at inctheorem% new
+ \BlockClass{theorembodydefinition}% new
+ \LWR at inctheorem% new
\item[\hskip\labelsep
\InlineClass{theoremheaderdefinition}{##1\ ##2.}
-]}%
+ ]}%
\def\@opargbegintheorem##1##2##3{%
\LWR at forcenewpage% new
-\BlockClass{theorembodydefinition}% new
-\LWR at inctheorem% new
+ \BlockClass{theorembodydefinition}% new
+ \LWR at inctheorem% new
\item[\hskip\labelsep
\InlineClass{theoremheaderdefinition}{##1\ ##2\ (##3).}
-]}}
+ ]}}
\gdef\th at nonumberdefinition{%
\def\theorem at headerfont{\normalfont\bfseries}\normalfont%
\def\@begintheorem##1##2{%
\LWR at forcenewpage% new
-\BlockClass{theorembodydefinition}% new
-\LWR at inctheorem% new
+ \BlockClass{theorembodydefinition}% new
+ \LWR at inctheorem% new
\item[\hskip\labelsep
\InlineClass{theoremheaderdefinition}{##1.}
-]}%
+ ]}%
\def\@opargbegintheorem##1##2##3{%
\LWR at forcenewpage% new
-\BlockClass{theorembodydefinition}% new
-\LWR at inctheorem% new
+ \BlockClass{theorembodydefinition}% new
+ \LWR at inctheorem% new
\item[\hskip\labelsep
\InlineClass{theoremheaderdefinition}{##1\ (##3).}
-]}}
+ ]}}
\gdef\th at remark{%
\def\theorem at headerfont{\itshape}\normalfont%
\def\@begintheorem##1##2{%
\LWR at forcenewpage% new
-\BlockClass{theorembodyremark}% new
-\LWR at inctheorem% new
+ \BlockClass{theorembodyremark}% new
+ \LWR at inctheorem% new
\item[\hskip\labelsep
\InlineClass{theoremheaderremark}{##1\ ##2.}
-]}%
+ ]}%
\def\@opargbegintheorem##1##2##3{%
\LWR at forcenewpage% new
-\BlockClass{theorembodyremark}% new
-\LWR at inctheorem% new
+ \BlockClass{theorembodyremark}% new
+ \LWR at inctheorem% new
\item[\hskip\labelsep
\InlineClass{theoremheaderremark}{##1\ ##2\ (##3).}
-]}}
+ ]}}
\gdef\th at nonumberremark{%
\def\theorem at headerfont{\itshape}\normalfont%
\def\@begintheorem##1##2{%
\LWR at forcenewpage% new
-\BlockClass{theorembodyremark}% new
-\LWR at inctheorem% new
+ \BlockClass{theorembodyremark}% new
+ \LWR at inctheorem% new
\item[\hskip\labelsep
\InlineClass{theoremheaderremark}{##1.}
-]}%
+ ]}%
\def\@opargbegintheorem##1##2##3{%
\LWR at forcenewpage% new
-\BlockClass{theorembodyremark}% new
-\LWR at inctheorem% new
+ \BlockClass{theorembodyremark}% new
+ \LWR at inctheorem% new
\item[\hskip\labelsep
\InlineClass{theoremheaderremark}{##1\ (##3).}
-]}}
+ ]}}
\gdef\th at proof{%
\def\theorem at headerfont{\normalfont\bfseries}\itshape%
\def\@begintheorem##1##2{%
\LWR at forcenewpage% new
-\BlockClass{theorembodyproof}% new
-\LWR at inctheorem% new
+ \BlockClass{theorembodyproof}% new
+ \LWR at inctheorem% new
\item[\hskip\labelsep
\InlineClass{theoremheaderproof}{##1.}
-]}%
+ ]}%
\def\@opargbegintheorem##1##2##3{%
\LWR at forcenewpage% new
-\BlockClass{theorembodyroof}% new
-\LWR at inctheorem% new
+ \BlockClass{theorembodyroof}% new
+ \LWR at inctheorem% new
\item[\hskip\labelsep
\InlineClass{theoremheaderproof}{##1\ (##3).}
-]}}
+ ]}}
\newcounter{proof}%
\if at thmmarks
-\newcounter{currproofctr}%
-\newcounter{endproofctr}%
+ \newcounter{currproofctr}%
+ \newcounter{endproofctr}%
\fi
\gdef\proofSymbol{\openbox}
@@ -372,11 +372,11 @@
\newcommand{\proofname}{Proof}
\newenvironment{proof}[1][\proofname]{
-\th at proof
-\def\theorem at headerfont{\itshape}%
-\normalfont
-\theoremsymbol{\HTMLunicode{220E}}% UTF-8 end-of-proof
-\@thm{proof}{proof}{#1}
+ \th at proof
+ \def\theorem at headerfont{\itshape}%
+ \normalfont
+ \theoremsymbol{\HTMLunicode{220E}}% UTF-8 end-of-proof
+ \@thm{proof}{proof}{#1}
}%
{\@endtheorem}
@@ -384,10 +384,10 @@
\let\LWR at origendtheorem\@endtheorem
\renewcommand{\@endtheorem}{%
\ifbool{LWR at ntheoremmarks}{%
-\ifsetendmark%
-\InlineClass{theoremendmark}{\csname\InTheoType Symbol\endcsname}%
-\setendmarkfalse%
-\fi%
+ \ifsetendmark%
+ \InlineClass{theoremendmark}{\csname\InTheoType Symbol\endcsname}%
+ \setendmarkfalse%
+ \fi%
}{}%
\LWR at origendtheorem%
\ifbool{LWR at ntheoremmarks}{\global\setendmarktrue}{}%
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-rotfloat.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-rotfloat.sty 2017-08-17 00:17:55 UTC (rev 45053)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-rotfloat.sty 2017-08-17 21:15:43 UTC (rev 45054)
@@ -23,11 +23,11 @@
\RenewDocumentCommand{\newfloat}{m m m o}{%
\IfValueTF{#4}
{
-\DeclareFloatingEnvironment[fileext=#3,within=#4]{#1}
+ \DeclareFloatingEnvironment[fileext=#3,within=#4]{#1}
}
{
-\DeclareFloatingEnvironment[fileext=#3]{#1}
-\DeclareFloatingEnvironment[fileext=#3]{sideways#1}
+ \DeclareFloatingEnvironment[fileext=#3]{#1}
+ \DeclareFloatingEnvironment[fileext=#3]{sideways#1}
}
\csletcs{sideways#1}{#1}
\csletcs{endsideways#1}{end#1}
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-sidenotes.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-sidenotes.sty 2017-08-17 00:17:55 UTC (rev 45053)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-sidenotes.sty 2017-08-17 21:15:43 UTC (rev 45054)
@@ -18,7 +18,7 @@
\LWR at ProvidesPackagePass{sidenotes}
\RenewDocumentCommand \sidecaption {s o o m}
{
-\LWR at stoppars
+ \LWR at stoppars
\captionsetup{style=sidecaption}
\IfBooleanTF{#1}
{ % starred
@@ -34,7 +34,7 @@
{\marginnote{\caption[\@sidenotes at sidecaption@tof]{#4}}}
{\marginnote{\caption[\@sidenotes at sidecaption@tof]{#4}}[#3]}
}
-\LWR at startpars
+ \LWR at startpars
}
\NewDocumentEnvironment{KFLTsidenotes at marginfloat}{O{-1.2ex} m}
{% start
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-subfig.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-subfig.sty 2017-08-17 00:17:55 UTC (rev 45053)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-subfig.sty 2017-08-17 21:15:43 UTC (rev 45054)
@@ -37,7 +37,7 @@
\sf at bottom=\sf at nearskip
\fi
\leavevmode
-\setbox\@tempboxa \hbox{#4}%
+ \setbox\@tempboxa \hbox{#4}%
\@tempdima=\wd\@tempboxa
\@ifundefined{FBsc at max}{}%
{\global\advance\Xhsize-\wd\@tempboxa
@@ -64,21 +64,21 @@
\vskip\sf at captopadj
\fi\egroup
\hrule width0pt height0pt depth0pt
-\LWR at startpars% new
-#4
-\LWR at stoppars% new
+ \LWR at startpars% new
+ #4
+ \LWR at stoppars% new
}{%
-\LWR at startpars% new
+ \LWR at startpars% new
\@ifundefined{FBsc at max}%
{
-#4
-}%
+ #4
+ }%
{\ifx\FBsuboheight\relax
-#4
+ #4
\else
-#4
+ #4
\fi}%
-\LWR at stoppars% new
+ \LWR at stoppars% new
\egroup
\ifx \@empty#3\relax \else
\vskip\sf at capskip
@@ -117,16 +117,16 @@
\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 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
@@ -135,10 +135,10 @@
\FB at readaux{\let\FBsubcheight\relax}%
\ifx\FBsubcheight\relax
\def\next{
-}%
+ }%
\else
\def\next{
-}%
+ }%
\fi
\vbox{%
@@ -149,8 +149,8 @@
{#3}
\LWR at traceinfo{sfsubcap C1}% new
- }
-}%
+ }
+ }%
\egroup
\LWR at startpars% new
}
@@ -186,7 +186,7 @@
{}%
\nobreak\hskip\z at skip % enable hyphenation
\caption at tfmt{#2}
-\LWR at ensuredoingapar% new
+ \LWR at ensuredoingapar% new
\caption at ifstrut
{\ifhmode\@finalstrut\strutbox\fi}%
{}%
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-theorem.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-theorem.sty 2017-08-17 00:17:55 UTC (rev 45053)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-theorem.sty 2017-08-17 21:15:43 UTC (rev 45054)
@@ -52,10 +52,10 @@
}}
\gdef\@ynthm#1#2{%
-\expandafter\@ifdefinable\csname #1\endcsname
+ \expandafter\@ifdefinable\csname #1\endcsname
{
-\csedef{LWR at thmstyle#1}{\LWR at newtheoremstyle}% new
-\@definecounter{#1}%
+ \csedef{LWR at thmstyle#1}{\LWR at newtheoremstyle}% new
+ \@definecounter{#1}%
\expandafter\xdef\csname the#1\endcsname{\@thmcounter{#1}}%
\def\@tempa{\global\@namedef{#1}}\expandafter \@tempa
\expandafter{\csname th@\the \theorem at style \expandafter
@@ -70,8 +70,8 @@
\else
\expandafter\@ifdefinable\csname #1\endcsname
{
-\csedef{LWR at thmstyle#1}{\LWR at newtheoremstyle}% new
-\expandafter \xdef \csname the#1\endcsname
+ \csedef{LWR at thmstyle#1}{\LWR at newtheoremstyle}% new
+ \expandafter \xdef \csname the#1\endcsname
{\expandafter \noexpand \csname the#2\endcsname}%
\def\@tempa{\global\@namedef{#1}}\expandafter \@tempa
\expandafter{\csname th@\the \theorem at style \expandafter
@@ -78,98 +78,98 @@
\endcsname \the\theorem at bodyfont \@thm{#2}{#3}}%
\global \expandafter \let \csname end#1\endcsname \@endtheorem
\AtBeginEnvironment{#1}{\edef\LWR at thisthmstyle{\csuse{LWR at thmstyle#1}}}% new
-}%
+ }%
\fi}
\gdef\th at plain{%\normalfont\itshape
\def\@begintheorem##1##2{%
\LWR at forcenewpage% new
-\BlockClass{theorembody\LWR at thisthmstyle}% new
+ \BlockClass{theorembody\LWR at thisthmstyle}% new
\item[\hskip\labelsep
-\InlineClass{theoremheader}{##1\ ##2}
-]}%
+ \InlineClass{theoremheader}{##1\ ##2}
+ ]}%
\def\@opargbegintheorem##1##2##3{%
\LWR at forcenewpage% new
-\BlockClass{theorembody\LWR at thisthmstyle}% new
+ \BlockClass{theorembody\LWR at thisthmstyle}% new
\item[\hskip\labelsep
-\InlineClass{theoremheader}{##1\ ##2\ (##3)}
-]}
+ \InlineClass{theoremheader}{##1\ ##2\ (##3)}
+ ]}
}
\gdef\th at break{%\normalfont\slshape
\def\@begintheorem##1##2{%
\LWR at forcenewpage% new
-\BlockClass{theorembody\LWR at thisthmstyle}% new
-\item[\hskip \labelsep
-\InlineClass{theoremheader}{##1\ ##2}\newline%
-]}%
+ \BlockClass{theorembody\LWR at thisthmstyle}% new
+ \item[\hskip \labelsep
+ \InlineClass{theoremheader}{##1\ ##2}\newline%
+ ]}%
\def\@opargbegintheorem##1##2##3{%
\LWR at forcenewpage% new
-\BlockClass{theorembody\LWR at thisthmstyle}% new
+ \BlockClass{theorembody\LWR at thisthmstyle}% new
\item[\hskip \labelsep
-\InlineClass{theoremheader}{##1\ ##2\ (##3)}\newline
-]}
+ \InlineClass{theoremheader}{##1\ ##2\ (##3)}\newline
+ ]}
}
\gdef\th at marginbreak{%\normalfont\slshape
\def\@begintheorem##1##2{
\LWR at forcenewpage% new
-\BlockClass{theorembody\LWR at thisthmstyle}% new
-\item[\hskip\labelsep %
-\InlineClass{theoremheader}{##2 \qquad ##1}\newline
-]}%
+ \BlockClass{theorembody\LWR at thisthmstyle}% new
+ \item[\hskip\labelsep %
+ \InlineClass{theoremheader}{##2 \qquad ##1}\newline
+ ]}%
\def\@opargbegintheorem##1##2##3{%
\LWR at forcenewpage% new
-\BlockClass{theorembody\LWR at thisthmstyle}% new
-\item[\hskip\labelsep %
-\InlineClass{theoremheader}{##2 \qquad ##1\ %
-(##3)}\newline
-]}
+ \BlockClass{theorembody\LWR at thisthmstyle}% new
+ \item[\hskip\labelsep %
+ \InlineClass{theoremheader}{##2 \qquad ##1\ %
+ (##3)}\newline
+ ]}
}
\gdef\th at changebreak{%\normalfont\slshape
\def\@begintheorem##1##2{
\LWR at forcenewpage% new
-\BlockClass{theorembody\LWR at thisthmstyle}% new
-\item[\hskip\labelsep
-\InlineClass{theoremheader}{##2\ ##1}\newline
-]}%
+ \BlockClass{theorembody\LWR at thisthmstyle}% new
+ \item[\hskip\labelsep
+ \InlineClass{theoremheader}{##2\ ##1}\newline
+ ]}%
\def\@opargbegintheorem##1##2##3{%
\LWR at forcenewpage% new
-\BlockClass{theorembody\LWR at thisthmstyle}% new
-\item[\hskip\labelsep
-\InlineClass{theoremheader}{ ##2\ ##1\ %
-(##3)}\newline
-]}
+ \BlockClass{theorembody\LWR at thisthmstyle}% new
+ \item[\hskip\labelsep
+ \InlineClass{theoremheader}{ ##2\ ##1\ %
+ (##3)}\newline
+ ]}
}
\gdef\th at change{%\normalfont\slshape
\def\@begintheorem##1##2{
\LWR at forcenewpage% new
-\BlockClass{theorembody\LWR at thisthmstyle}% new
-\item[\hskip\labelsep
-\InlineClass{theoremheader}{##2\ ##1}
-]}%
+ \BlockClass{theorembody\LWR at thisthmstyle}% new
+ \item[\hskip\labelsep
+ \InlineClass{theoremheader}{##2\ ##1}
+ ]}%
\def\@opargbegintheorem##1##2##3{%
\LWR at forcenewpage% new
-\BlockClass{theorembody\LWR at thisthmstyle}% new
-\item[\hskip\labelsep
-\InlineClass{theoremheader}{##2\ ##1\ (##3)}
-]}
+ \BlockClass{theorembody\LWR at thisthmstyle}% new
+ \item[\hskip\labelsep
+ \InlineClass{theoremheader}{##2\ ##1\ (##3)}
+ ]}
}
\gdef\th at margin{%\normalfont\slshape
\def\@begintheorem##1##2{
\LWR at forcenewpage% new
-\BlockClass{theorembody\LWR at thisthmstyle}% new
-\item[\hskip\labelsep
-\InlineClass{theoremheader}{##2 \qquad ##1}
-]}%
+ \BlockClass{theorembody\LWR at thisthmstyle}% new
+ \item[\hskip\labelsep
+ \InlineClass{theoremheader}{##2 \qquad ##1}
+ ]}%
\def\@opargbegintheorem##1##2##3{%
\LWR at forcenewpage% new
-\BlockClass{theorembody\LWR at thisthmstyle}% new
-\item[\hskip\labelsep
-\InlineClass{theoremheader}{##2 \qquad ##1\ (##3)}
-]}
+ \BlockClass{theorembody\LWR at thisthmstyle}% new
+ \item[\hskip\labelsep
+ \InlineClass{theoremheader}{##2 \qquad ##1\ (##3)}
+ ]}
}
\gdef\@endtheorem{\endBlockClass\endtrivlist}
\endinput
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-threeparttable.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-threeparttable.sty 2017-08-17 00:17:55 UTC (rev 45053)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-threeparttable.sty 2017-08-17 21:15:43 UTC (rev 45054)
@@ -37,7 +37,7 @@
\enddescription%
\endBlockClass%
}
-\newcommand{\tnote}[1]{\textsuperscript{#1}}
+\newcommand{\tnote}[1]{\LWR at htmlspan{sup}{#1}}
\endinput
%%
Added: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-transparent.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-transparent.sty (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-transparent.sty 2017-08-17 21:15:43 UTC (rev 45054)
@@ -0,0 +1,29 @@
+%%
+%% This is file `lwarp-transparent.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx (with options: `transparent')
+%% 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 ProvidesPackageDrop{transparent}
+\newcommand*{\transparent}[1]{\edef\LWR at opacity{#1}}
+
+\newcommand*{\texttransparent}[2]{%
+\begingroup%
+\transparent{#1}%
+\InlineClass[opacity: #1]{transparent}{#2}%
+\endgroup%
+}
+\endinput
+%%
+%% End of file `lwarp-transparent.sty'.
Property changes on: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-transparent.sty
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-upref.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-upref.sty (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-upref.sty 2017-08-17 21:15:43 UTC (rev 45054)
@@ -0,0 +1,21 @@
+%%
+%% This is file `lwarp-upref.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx (with options: `upref')
+%% 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 ProvidesPackageDrop{upref}
+\endinput
+%%
+%% End of file `lwarp-upref.sty'.
Property changes on: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-upref.sty
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-wrapfig.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-wrapfig.sty 2017-08-17 00:17:55 UTC (rev 45053)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-wrapfig.sty 2017-08-17 21:15:43 UTC (rev 45054)
@@ -22,7 +22,6 @@
\newlength{\LWR at wrapwidth}
-
\newcommand*{\LWR at wrapposition}{}
\newcommand*{\LWR at subwrapfigure}[2]{%
@@ -29,8 +28,8 @@
\LWR at maybeincthisfloat%
\renewcommand*{\LWR at wrapposition}{}%
\ifthenelse{%
-\equal{#1}{r}\OR\equal{#1}{R}\OR%
-\equal{#1}{o}\OR\equal{#1}{O}%
+ \equal{#1}{r}\OR\equal{#1}{R}\OR%
+ \equal{#1}{o}\OR\equal{#1}{O}%
}%
{\renewcommand*{\LWR at wrapposition}{float:right}}%
{\renewcommand*{\LWR at wrapposition}{float:left}}%
@@ -42,7 +41,7 @@
\LWR at htmltag{div class="marginblock" id="autofloat-\arabic{LWR at thisfloat}"
style="width:\rndprintlength{\LWR at wrapwidth} ; %
\LWR at wrapposition"%
-}
+}%
\LWR at startpars
}
@@ -51,7 +50,7 @@
\LWR at subwrapfigure{#2}{#4}%
\captionsetup{type=figure}%
}
-{
+{%
\LWR at htmldivclassend{div}
}
@@ -60,7 +59,7 @@
\LWR at subwrapfigure{#2}{#4}%
\captionsetup{type=table}%
}
-{
+{%
\LWR at htmldivclassend{div}
}
@@ -69,7 +68,7 @@
\LWR at subwrapfigure{#3}{#5}%
\captionsetup{type=#1}%
}
-{
+{%
\LWR at htmldivclassend{div}
}
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty 2017-08-17 00:17:55 UTC (rev 45053)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty 2017-08-17 21:15:43 UTC (rev 45054)
@@ -17,56 +17,168 @@
%% version 2005/12/01 or later.
-
\LWR at ProvidesPackagePass{xcolor}
-\newcommand*{\LWR at tempcolor}{}
+\begin{warpHTML}
-\newcommand*{\LWR at currenttextcolor}{black}
-
-\NewDocumentCommand{\LWR at colorstyle}{m m m m}{%
-\convertcolorspec{#2}{#3}{HTML}\LWR at tempcolor%
-\ifthenelse{\equal{#1}{color:}}%
-{\renewcommand*{\LWR at currenttextcolor}{\#\LWR at tempcolor}}{}%
-\LWR at htmltagc{span style="#1\#\LWR at tempcolor"{}}%
-\begin{LWR at nestspan}%
-#4%
-\LWR at htmltagc{/span}%
-\end{LWR at nestspan}%
-\LWR at ensuredoingapar%
+\LetLtxMacro\LWRprint at textcolor\textcolor
+\LetLtxMacro\LWRprint at pagecolor\pagecolor
+\LetLtxMacro\LWRprint at nopagecolor\nopagecolor
+\LetLtxMacro\LWRprint at colorbox\colorbox
+\LetLtxMacro\LWRprint at colorboxBlock\colorbox
+\LetLtxMacro\LWRorigprint at fcolorbox\fcolorbox
+\LetLtxMacro\LWRorigprint at fcolorboxBlock\fcolorbox
+\LetLtxMacro\LWRorigprint at boxframe\boxframe
+\renewcommand*{\LWR at restoreorigxcolor}{%
+\LWR at traceinfo{LWR at restoreorigxcolorformatting}%
+\LetLtxMacro\textcolor\LWRprint at textcolor%
+\LetLtxMacro\pagecolor\LWRprint at pagecolor%
+\LetLtxMacro\nopagecolor\LWRprint at nopagecolor%
+\LetLtxMacro\colorbox\LWRprint at colorbox%
+\LetLtxMacro\fcolorbox\LWRprint at fcolorbox%
+\LetLtxMacro\boxframe\LWRorigprint at boxframe%
}
+\newcommand*{\LWR at tempcolor}{}
+\newcommand*{\LWR at tempcolortwo}{}
+\NewDocumentCommand{\LWR at colorstyle}{m m}{%
+\begingroup%
+\LWR at FBcancel%
+\convertcolorspec{#1}{#2}{HTML}\LWR at tempcolor%
+\#\LWR at tempcolor%
+\endgroup%
+}
+\newcommand*{\LWR at borderpadding}[2]{%
+\uselengthunit{PT}%
+border:\rndprintlength{\LWR at atleastonept} solid \LWR at colorstyle{#1}{#2} ; %
+padding:\rndprintlength{\fboxsep}%
+}
+\RenewDocumentCommand{\textcolor}{O{named} m m}{%
+\begingroup%
+\LWR at FBcancel%
+\convertcolorspec{#1}{#2}{HTML}\LWR at tempcolor%
+\InlineClass[color:\LWR at colorstyle{#1}{#2}]{textcolor}{%
+\renewcommand*{\LWR at currenttextcolor}{\#\LWR at tempcolor}%
+#3%
+}%
+\endgroup%
+}
+\renewcommand*{\pagecolor}[2][named]{}
+\let\nopagecolor\relax
-\NewDocumentCommand{\LWR at textcolor}{O{named} m m}{%
+\RenewDocumentCommand{\colorbox}{O{named} m +m}{%
\begingroup%
-\LWR at colorstyle{color:}{#1}{#2}{#3}%
+\LWR at FBcancel%
+\uselengthunit{PT}%
+\InlineClass[%
+background:\LWR at colorstyle{#1}{#2} ; %
+padding:\rndprintlength{\fboxsep}%
+]{colorbox}{#3}%
\endgroup%
}
-\newcommand*{\LWR at pagecolor}[2][named]{}
+\NewDocumentCommand{\colorboxBlock}{O{named} m +m}{%
+\begingroup%
+\LWR at FBcancel%
+\uselengthunit{PT}%
+\begin{BlockClass}[%
+background:\LWR at colorstyle{#1}{#2} ; %
+padding:\rndprintlength{\fboxsep}%
+]{colorboxBlock}
+#3
+\end{BlockClass}%
+\endgroup%
+}
-\NewDocumentCommand{\LWR at colorbox}{O{named} m m}{%
+\RenewDocumentCommand{\fcolorbox}{O{named} m O{named} m +m}{%
+\LWR at traceinfo{HTML fcolorbox #2 #4}%
\begingroup%
-\LWR at colorstyle{background:}{#1}{#2}{#3}%
+\LWR at FBcancel%
+\uselengthunit{PT}%
+\LWR at forceminwidth{\fboxrule}%
+\ifthenelse{\equal{#4}{none}}%
+{% no background color
+ \InlineClass[%
+ \LWR at borderpadding{#1}{#2}%
+ ]{fcolorbox}{#5}%
+}%
+{% yes background color
+ \InlineClass[%
+ \LWR at borderpadding{#1}{#2} ; %
+ background:\LWR at colorstyle{#3}{#4}%
+ ]{fcolorbox}{#5}%
+}%
\endgroup%
}
-\NewDocumentCommand{\LWR at fcolorbox}{O{named} m O{named} m m}{%
+\NewDocumentCommand{\fcolorboxBlock}{O{named} m O{named} m +m}{%
+\LWR at traceinfo{HTML fcolorboxBlock #2 #4}%
\begingroup%
-\ifthenelse{\equal{#4}{none}}{% no background color
-\LWR at colorstyle{border:1px solid }{#1}{#2}{#5}%
-}{% yes background color
-\LWR at colorstyle{border:1px solid }{#1}{#2}%
-{\LWR at colorstyle{background:}{#3}{#4}{#5}}%
+\LWR at FBcancel%
+\uselengthunit{PT}%
+\LWR at forceminwidth{\fboxrule}%
+\ifthenelse{\equal{#4}{none}}%
+{% no background color
+ \begin{BlockClass}[%
+ \LWR at borderpadding{#1}{#2}%
+ ]{fcolorboxBlock}
+ #5
+ \end{BlockClass}%
}%
+{% yes background color
+ \convertcolorspec{#3}{#4}{HTML}\LWR at tempcolortwo%
+ \begin{BlockClass}[%
+ background:\#\LWR at tempcolortwo; %
+ \LWR at borderpadding{#1}{#2}%
+ ]{fcolorboxBlock}
+ #5
+ \end{BlockClass}%
+}%
\endgroup%
+\LWR at traceinfo{HTML fcolorboxBlock done}%
}
-\let\textcolor\LWR at textcolor
-\let\pagecolor\LWR at pagecolor
-\LetLtxMacro\colorbox\LWR at colorbox
-\LetLtxMacro\fcolorbox\LWR at fcolorbox
+\NewDocumentCommand{\LWR at subfcolorminipage}{m m m m}{%
+\begin{BlockClass}[%
+#3%
+\LWR at borderpadding{#1}{#2} ; %
+\IfValueTF{#4}{height:\rndprintlength{\LWR at tempheight} ; }{}%
+width:\rndprintlength{\LWR at tempwidth}%
+]{fcolorminipage}%
+}
+\NewDocumentEnvironment{fcolorminipage}{O{named} m O{named} m O{c} o o m}
+{%
+\LWR at FBcancel%
+\setlength{\LWR at tempwidth}{#8}%
+\IfValueTF{#6}{\setlength{\LWR at tempheight}{#6}}{}%
+\uselengthunit{PT}%
+\LWR at forceminwidth{\fboxrule}%
+\convertcolorspec{#1}{#2}{HTML}\LWR at tempcolor%
+\ifthenelse{\equal{#4}{none}}%
+{\LWR at subfcolorminipage{#1}{#2}{}{#6}}%
+{%
+ \convertcolorspec{#3}{#4}{HTML}\LWR at tempcolortwo%
+ \LWR at subfcolorminipage{#1}{#2}{background:\#\LWR at tempcolortwo\ ; }{#6}%
+}%
+}
+{\end{BlockClass}}
+\renewcommand*{\boxframe}[3]{%
+{%
+\setlength{\LWR at tempwidth}{#1}%
+\setlength{\LWR at tempheight}{#2}%
+\addtolength{\LWR at tempheight}{#3}%
+\uselengthunit{PT}%
+\LWR at forceminwidth{\fboxrule}%
+\InlineClass[%
+display:inline-block ; %
+border:\rndprintlength{\LWR at atleastonept} solid \LWR at currenttextcolor{} ; %
+width:\rndprintlength{\LWR at tempwidth} ; %
+height:\rndprintlength{\LWR at tempheight}%
+]{boxframe}{}%
+}%
+}
+\end{warpHTML}
\endinput
%%
%% End of file `lwarp-xcolor.sty'.
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp.sty 2017-08-17 00:17:55 UTC (rev 45053)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp.sty 2017-08-17 21:15:43 UTC (rev 45054)
@@ -17,7 +17,7 @@
%% version 2005/12/01 or later.
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesPackage{lwarp}
- [2017/08/08 v0.35 Allows LaTeX to directly produce HTML5 output.]
+ [2017/08/17 v0.36 Allows LaTeX to directly produce HTML5 output.]
@@ -277,8 +277,10 @@
\LWR at loadafter{titlesec}
\LWR at loadafter{titletoc}
\LWR at loadafter{tocloft}
+\LWR at loadafter{transparent}
\LWR at loadafter{trivfloat}
\LWR at loadafter{ulem}
+\LWR at loadafter{upref}
\LWR at loadafter{varioref}
\LWR at loadafter{verse}
\LWR at loadafter{wallpaper}
@@ -317,11 +319,11 @@
\RequirePackage {microtype}
\microtypesetup{
-protrusion=false,
-expansion=false,
-tracking=false,
-kerning=false,
-spacing=false}
+ protrusion=false,
+ expansion=false,
+ tracking=false,
+ kerning=false,
+ spacing=false}
\DisableLigatures[f,q,t,T,Q]{encoding = *,family = *}
\fi
@@ -428,10 +430,10 @@
{% yes filename
\IfFileExists{lwarp-\LWR at strresulttwo.sty}%
{% lwarp-* file found
-\StrSubstitute%
-{\LWR at requirepackagenames}%
-{\LWR at strresult}%
-{lwarp-\LWR at strresulttwo}[\LWR at requirepackagenames]%
+ \StrSubstitute%
+ {\LWR at requirepackagenames}%
+ {\LWR at strresult}%
+ {lwarp-\LWR at strresulttwo}[\LWR at requirepackagenames]%
}%
{}% no lwarp-* file
}% yes filename
@@ -449,14 +451,14 @@
\LWR at lookforpackagename{9}
\IfValueTF{#1}
{% options given
-\IfValueTF{#3}% version given?
-{\LWR at origRequirePackage[#1]{\LWR at requirepackagenames}[#3]}
-{\LWR at origRequirePackage[#1]{\LWR at requirepackagenames}}
+ \IfValueTF{#3}% version given?
+ {\LWR at origRequirePackage[#1]{\LWR at requirepackagenames}[#3]}
+ {\LWR at origRequirePackage[#1]{\LWR at requirepackagenames}}
}
{% no options given
-\IfValueTF{#3}% version given?
-{\LWR at origRequirePackage{\LWR at requirepackagenames}[#3]}
-{\LWR at origRequirePackage{\LWR at requirepackagenames}}
+ \IfValueTF{#3}% version given?
+ {\LWR at origRequirePackage{\LWR at requirepackagenames}[#3]}
+ {\LWR at origRequirePackage{\LWR at requirepackagenames}}
}
}
\LetLtxMacro{\usepackage}{\RequirePackage}
@@ -513,7 +515,8 @@
\newcommand{\LWR at traceinfo}[1]{%
\ifbool{LWR at tracinglwarp}%
{%
-\typeout{*** lwarp: #1}%
+ \typeout{*** lwarp: #1}%
+ % \PackageInfo{lwarp}{#1 : }%
}%
{}%
}
@@ -568,6 +571,8 @@
\let\LWR at origraggedright\raggedright
\let\LWR at origonecolumn\onecolumn
+\let\LWR at origsp\sp
+\let\LWR at origsb\sb
\let\LWR at origtextsuperscript\textsuperscript
\let\LWR at origtextsubscript\textsubscript
@@ -607,6 +612,50 @@
+
+\begin{warpHTML}
+
+\AtBeginDocument{% in case textcomp was not loaded
+
+\providecommand*{\textdegree}{DEG}
+\providecommand*{\textcelsius}{DEGC}
+\providecommand*{\textohm}{OHM}
+\providecommand*{\textmu}{MU}
+
+\let\LWR at origtextdegree\textdegree
+\let\LWR at origtextcelsius\textcelsius
+\let\LWR at origtextohm\textohm
+\let\LWR at origtextmu\textmu
+
+\ifPDFTeX
+\renewcommand*{\textdegree}{\HTMLentity{deg}}
+\renewcommand*{\textcelsius}{\HTMLentity{deg}\,C}
+\renewcommand*{\textohm}{\HTMLunicode{2126}}
+\renewcommand*{\textmu}{\HTMLunicode{00B5}}
+\else
+\renewcommand*{\textdegree}{°}
+\renewcommand*{\textcelsius}{°C}
+\renewcommand*{\textohm}{Ω}
+\renewcommand*{\textmu}{μ}
+\fi
+
+\@ifpackageloaded{siunitx}
+{
+\DeclareSIUnit\bohr{\textit{a}\textsubscript{0}}
+\DeclareSIUnit\clight{\textit{c}\textsubscript{0}}
+\DeclareSIUnit\elementarycharge{\textit{e}}
+\DeclareSIUnit\electronmass{\textit{m}\textsubscript{e}}
+\DeclareSIUnit\hartree{\textit{E}\textsubscript{h}}
+\DeclareSIUnit\planckbar{\HTMLunicode{210F}}
+}% siunitx loaded
+{}
+
+}% AtBeginDocument
+
+\end{warpHTML}
+
+
+
\begin{warpprint}
\typeout{lwarp: generating configuration files}
\end{warpprint}
@@ -783,8 +832,8 @@
}
blockquote {
-margin-left: 0px ;
-margin-right: 0px ;
+ margin-left: 0px ;
+ margin-right: 0px ;
}
blockquote p {
@@ -792,12 +841,12 @@
text-align: left ;
font-size: .85em ;
margin-left: 3em ;
-margin-right: 3em ;
+ margin-right: 3em ;
}
blockquotation {
-margin-left: 0px ;
-margin-right: 0px ;
+ margin-left: 0px ;
+ margin-right: 0px ;
}
blockquotation p {
@@ -805,7 +854,7 @@
text-align: left ;
font-size: .85em ;
margin-left: 3em ;
-margin-right: 3em ;
+ margin-right: 3em ;
}
div.epigraph {
@@ -963,7 +1012,7 @@
font-size: .85em ;
margin: 3ex 1em 0ex 1em ;
padding-bottom: 1ex ;
-border-top: 1px solid silver ;
+ border-top: 1px solid silver ;
}
.marginpar {
@@ -1137,7 +1186,7 @@
div.doublespace { line-height: 2 ; }
/* Minipage environments, vertically aligned to top, center, bottom: */
-.minipage {
+.minipage, .fminipage, .fcolorminipage {
/* display: inline-block ; */
/* Mini pages which follow each other will be tiled. */
margin: .25em .25em .25em .25em;
@@ -1151,6 +1200,16 @@
/* Have not yet researched this. */
.minipage p {margin: .75ex 0em .75ex 0em ;}
+.fboxBlock .minipage, .colorbox .minipage, .colorboxBlock .minipage,
+.fcolorbox .minipage, .fcolorboxBlock .minipage
+ {border: none ; background: none;}
+
+.fbox, .fboxBlock { border: 1px solid black ; }
+
+.fbox, .fboxBlock, .fcolorbox, .fcolorboxBlock, .colorbox, .colorboxBlock,
+.fminipage, .fcolorminipage
+ {display: inline-block}
+
.shadowbox, .shabox {
border: 1px solid black;
box-shadow: 3px 3px 3px #808080 ;
@@ -1223,7 +1282,7 @@
}
/* framed package */
-.framed, pre.boxedverbatim {
+.framed, pre.boxedverbatim, fcolorbox {
margin: 3ex 0em 3ex 0em ;
border: 1px solid black;
border-radius: 0px ;
@@ -1247,8 +1306,8 @@
}
.framedtitle {
-margin: 0em ;
-padding: 0em ;
+ margin: 0em ;
+ padding: 0em ;
font-size: 130%
}
@@ -1260,8 +1319,8 @@
}
dl dt {
-margin-top: 1ex;
-margin-left: 1em ;
+ margin-top: 1ex;
+ margin-left: 1em ;
font-weight: bold;
}
@@ -1367,8 +1426,8 @@
font-size: .85em ;
text-align: center ;
font-weight: bold ;
-margin-top: 1ex ;
-margin-bottom: 1ex ;
+ margin-top: 1ex ;
+ margin-bottom: 1ex ;
}
figure.subfigure figcaption, figure.subtable figcaption {
@@ -1384,8 +1443,8 @@
/* For a \RawCaption inside a minipage inside a figure's floatrow: */
figure div.floatrow div.minipage figcaption {
-border: none ;
-background: none ;
+ border: none ;
+ background: none ;
}
table {
@@ -1483,13 +1542,13 @@
background-color:black;
color:white;
padding:0px .25em 0px .25em;
-margin: 0 ;
+ margin: 0 ;
font-weight: bold;
font-size:.72em ;
}
div.programlisting pre.verbatim span.callout{
-font-size: .85em ;
+ font-size: .85em ;
}
div.published
@@ -1650,7 +1709,7 @@
span.theoremheaderchange,
span.theoremheadermargin
{
-font-style:normal ; font-weight: bold ; margin-right: 1em ;
+ font-style:normal ; font-weight: bold ; margin-right: 1em ;
}
span.amsthmnameplain,
@@ -1658,7 +1717,7 @@
span.amsthmnumberplain,
span.amsthmnumberdefinition
{
-font-style:normal ; font-weight: bold ;
+ font-style:normal ; font-weight: bold ;
}
span.amsthmnameremark,
@@ -1676,10 +1735,10 @@
span.theoremheadersc
{
-font-style:normal ;
-font-variant: small-caps ;
-font-weight: normal ;
-margin-right: 1em ;
+ font-style:normal ;
+ font-variant: small-caps ;
+ font-weight: normal ;
+ margin-right: 1em ;
}
.theoremendmark {float:right}
@@ -1691,8 +1750,8 @@
div.theorembodychange,
div.theorembodymargin
{
-font-style:italic;
-margin-top: 3ex ; margin-bottom: 3ex ;
+ font-style:italic;
+ margin-top: 3ex ; margin-bottom: 3ex ;
}
div.theorembodydefinition, div.theorembodyremark, div.theorembodyproof,
@@ -1700,8 +1759,8 @@
div.amsthmbodydefinition, div.amsthmbodyremark,
div.amsthmproof
{
-font-style: normal ;
-margin-top: 3ex ; margin-bottom: 3ex ;
+ font-style: normal ;
+ margin-top: 3ex ; margin-bottom: 3ex ;
}
span.amsthmnoteremark {}
@@ -1781,7 +1840,7 @@
.lyxlogo {
font-family: "URW Classico", Optima, "Linux Biolinum O",
"DejaVu Sans", "Bitstream Vera Sans", Geneva,
-Verdana, sans-serif ;
+ Verdana, sans-serif ;
}
/* Only display top and bottom navigation if a small screen: */
@@ -1854,7 +1913,7 @@
"Nimbus Roman No 9 L", "FreeSerif",
"Hoefler Text", Times, "Times New Roman", serif;
font-variant: small-caps ;
-font-weight: normal ;
+ font-weight: normal ;
color: #304070 ;
text-shadow: 2px 2px 3px #808080;
}
@@ -1961,7 +2020,7 @@
"FreeSerif", "Hoefler Text", Times, "Times New Roman", serif;
font-weight:bold;
font-variant: small-caps ;
-font-size: 1.5em ;
+ font-size: 1.5em ;
color: #304070 ;
text-align: center ;
text-shadow: 1px 1px 2px #808080;
@@ -1970,14 +2029,14 @@
.minipage {
background-color: #eeeee7 ;
border: 1px solid silver ;
-border-radius: 1ex ;
+ border-radius: 1ex ;
}
.framed .minipage , .framedleftbar .minipage {
-border: none ;
-background: none ;
-padding: 0ex ;
-margin: 0ex ;
+ border: none ;
+ background: none ;
+ padding: 0ex ;
+ margin: 0ex ;
}
figure.figure .minipage, figcaption .minipage { border: none; }
@@ -1994,7 +2053,7 @@
figure figure {
border: 1px solid silver ;
margin: 0em ;
-box-shadow: none ;
+ box-shadow: none ;
}
/*
@@ -2397,7 +2456,7 @@
-- Print the usage of the lwarpmk command:
-printversion = "v0.35"
+printversion = "v0.36"
function printhelp ()
print ("lwarpmk: Use lwarpmk -h or lwarpmk --help for help.") ;
@@ -2583,8 +2642,8 @@
local fsource = io.open(filesource)
for line in fsource:lines() do
if ( string.find(line,"Rerun to get") ~= nil ) then
-io.close(fsource)
-return true
+ io.close(fsource)
+ return true
end
end
io.close(fsource)
@@ -3072,31 +3131,31 @@
\edef\LWR at tempone{#1}%
\LWR at traceinfo{about to compare with ??}%
\ifthenelse{\equal{\LWR at tempone}{??}}%
-{%
-\LWR at traceinfo{found ??}%
-}{%
-\LWR at traceinfo{not found ??}%
-}%
+{\LWR at traceinfo{found ??}}%
+{\LWR at traceinfo{not found ??}}%
\LWR at traceinfo{about to compare with zero or empty}%
\ifthenelse{%
-\equal{\LWR at tempone}{0}%
-\OR \equal{\LWR at tempone}{}%
-\OR \equal{\LWR at tempone}{??}%
+ \equal{\LWR at tempone}{0}%
+ \OR \equal{\LWR at tempone}{}%
+ \OR \equal{\LWR at tempone}{??}%
}%
{%
-\LWR at traceinfo{LWR at htmlsectionfilename B \HomeHTMLFilename.html}%
-\HomeHTMLFilename.html%
+ \LWR at traceinfo{LWR at htmlsectionfilename B \HomeHTMLFilename.html}%
+ \HomeHTMLFilename.html%
}%
{%
-\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}%
+ \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}%
+ }%
+ {%
+ \LWR at traceinfo{prefixing the index name with an underscore.}%
+ \_#1.html%
+ }%
+ {\HTMLFilename#1.html}%
}%
-{%
-\LWR at traceinfo{prefixing the index name with an underscore.}%
-\_#1.html}%
-{\HTMLFilename#1.html}%
-}%
\LWR at traceinfo{LWR at htmlsectionfilename Z}%
}
@@ -3193,21 +3252,54 @@
\newcommand*{\LWR at tagregularparagraph}{p}
-\@ifpackagewith{babel}{french}{
-\renewcommand*{\FBcolonspace}{~}
-\renewcommand*{\FBthinspace}{\,}
-}{}
+\providecommand*{\LWR at FBcancel}{}
-\@ifpackagewith{babel}{french}{%
-\newcommand{\LWR at FBcancel}{%
-\csdef{FBcolonspace}{}%
-\csdef{FBthinspace}{}%
+\AtBeginDocument{
+\@ifundefined{frenchbsetup}
+{}
+{
+ \frenchbsetup{FrenchFootnotes=false}
+ % OR: redefine \insertfootnotemarkFB?
+ \LetLtxMacro\LWR at FBcancel\NoAutoSpacing
+ \renewcommand*{\FBcolonspace}{%
+ \begingroup%
+ \LWR at FBcancel%
+ \LWR at origampersand{}nbsp;%
+ \endgroup%
+ }
+ \renewcommand*{\FBthinspace}{%
+ \begingroup%
+ \LWR at FBcancel%
+ \LWR at origampersand\#x202f;% \,
+ \endgroup%
+ }
+ \renewcommand*{\FBguillspace}{%
+ \begingroup%
+ \LWR at FBcancel%
+ \LWR at origampersand{}nbsp;% ~, for \og xyz \fg{}
+ \endgroup%
+ }
+ \DeclareDocumentCommand{\FBmedkern}{}{%
+ \begingroup%
+ \LWR at FBcancel%
+ \LWR at origampersand\#x202f;% \,
+ \endgroup%
+ }
+ \DeclareDocumentCommand{\FBthickkern}{}{%
+ \begingroup%
+ \LWR at FBcancel%
+ \LWR at origampersand{}nbsp;% ~
+ \endgroup%
+ }
+ \ifFBunicode
+ \else
+ \DeclareTextSymbol{\FBtextellipsis}{LY1}{133}
+ \DeclareTextCommandDefault{\FBtextellipsis}{\textellipsis\xspace}
+ \fi
}
}
-{% not french:
-\newcommand{\LWR at FBcancel}{}
-}%
+
\newcommand*{\LWR at htmltagc}[1]{%
{%
\begingroup%
@@ -3228,27 +3320,27 @@
\LWR at traceinfo{LWR at nestspan}%
\ifthenelse{\cnttest{\value{LWR at lateximagedepth}}{>}{0}}%
{%
-\LWR at traceinfo{LWR at nestspan: inside a lateximage}%
+ \LWR at traceinfo{LWR at nestspan: inside a lateximage}%
}%
{% not in a lateximage
-\LWR at traceinfo{LWR at nestspan: NOT inside a lateximage}%
-\addtocounter{LWR at spandepth}{1}%
-\RenewDocumentEnvironment{minipage}{O{t} o O{t} m}{}{}%
-\RenewDocumentEnvironment{BlockClass}{o m}{}{}%
-\renewcommand{\BlockClassSingle}[2]{##2}%
-\renewcommand{\LWR at forcenewpage}{}%
-\renewcommand{\LWR at itemizestart}{%
-\let\item\LWR at nestspanitem%
-}%
-\renewcommand{\LWR at itemizeend}{}%
-\renewcommand{\LWR at enumeratestart}{%
-\let\item\LWR at nestspanitem%
-}%
-\renewcommand{\LWR at enumerateend}{}%
-\renewcommand{\LWR at descriptionstart}{%
-\let\item\LWR at nestspanitem%
-}%
-\renewcommand{\LWR at descriptionend}{}%
+ \LWR at traceinfo{LWR at nestspan: NOT inside a lateximage}%
+ \addtocounter{LWR at spandepth}{1}%
+ \RenewDocumentEnvironment{minipage}{O{t} o O{t} m}{}{}%
+ \RenewDocumentEnvironment{BlockClass}{o m}{}{}%
+ \renewcommand{\BlockClassSingle}[2]{##2}%
+ \renewcommand{\LWR at forcenewpage}{}%
+ \renewcommand{\LWR at itemizestart}{%
+ \let\item\LWR at nestspanitem%
+ }%
+ \renewcommand{\LWR at itemizeend}{}%
+ \renewcommand{\LWR at enumeratestart}{%
+ \let\item\LWR at nestspanitem%
+ }%
+ \renewcommand{\LWR at enumerateend}{}%
+ \renewcommand{\LWR at descriptionstart}{%
+ \let\item\LWR at nestspanitem%
+ }%
+ \renewcommand{\LWR at descriptionend}{}%
}% not in a lateximage
}%
{%
@@ -3336,11 +3428,11 @@
\NewDocumentCommand{\LWR at subhtmlelementclass}{m o m}{%
\IfValueTF{#2}%
{% option
-\ifthenelse{\equal{#2}{}}%
-{\LWR at htmltag{#1 class="#3"}}% empty option
-{\LWR at htmltag{#1 class="#3" style="#2"}}% non-empty option
+ \ifthenelse{\equal{#2}{}}%
+ {\LWR at htmltag{#1 class="#3" }}% empty option
+ {\LWR at htmltag{#1 class="#3" style="#2" }}% non-empty option
}% option
-{\LWR at htmltag{#1 class="#3"}}% no option
+{\LWR at htmltag{#1 class="#3" }}% no option
}
\NewDocumentCommand{\LWR at htmlelementclass}{m o m}{%
@@ -3353,7 +3445,7 @@
\LWR at stoppars%
\LWR at htmltag{/#1}%
\ifbool{HTMLDebugComments}{%
-\LWR at htmlcomment{End of #1 ``#2''}%
+ \LWR at htmlcomment{End of #1 ``#2''}%
}{}%
\LWR at startpars%
}
@@ -3475,20 +3567,21 @@
{%
\ifbool{LWR at doingstartpars}%
{% handling pars
-\ifthenelse{%
-\cnttest{\value{LWR at lateximagedepth}}{>}{0} \OR%
-\cnttest{\value{LWR at spandepth}}{>}{0}%
-}% nested par tags?
-{}% no nested par tags
-{% yes nest par tags
-\LWR at htmltagc{\LWR at tagregularparagraph}%
-\ifnumcomp{\@listdepth}{>}{0}%
-{%
-\LWR at orighspace{1in}%
-}{}%
-\global\booltrue{LWR at doingapar}%
-\let\par\LWR at closeparagraph%
-}% end of yes nest par tags
+ \ifthenelse{%
+ \cnttest{\value{LWR at lateximagedepth}}{>}{0} \OR%
+ \cnttest{\value{LWR at spandepth}}{>}{0}%
+ }% nested par tags?
+ {}% no nested par tags
+ {% yes nest par tags
+ \LWR at htmltagc{\LWR at tagregularparagraph}%
+ \ifnumcomp{\@listdepth}{>}{0}%
+ {%
+ \LWR at orighspace{1in}%
+ }%
+ {}%
+ \global\booltrue{LWR at doingapar}%
+ \let\par\LWR at closeparagraph%
+ }% end of yes nest par tags
}% end of handling pars
{}% not handling pars
}
@@ -3497,32 +3590,31 @@
{%
\ifbool{LWR at doingapar}%
{% handling pars
-\ifthenelse{%
-\cnttest{\value{LWR at lateximagedepth}}{>}{0} \OR%
-\cnttest{\value{LWR at spandepth}}{>}{0}%
-}%
-{% no nested par tags
-\ifthenelse{%
-\cnttest{\value{LWR at spandepth}}{>}{0}%
-\AND%
-\cnttest{\value{LWR at lateximagedepth}}{=}{0}%
-}%
-{%
-\ifbool{LWR at intabularmetadata}{}{\unskip\LWR at htmltagc{br /}}%
-}%
-{}%
-}% no nested par tags
-{% yes nest par tags
-\unskip%
-\LWR at htmltagc{/\LWR at tagregularparagraph}%
-\global\boolfalse{LWR at doingapar}%
-\global\boolfalse{LWR at minipagethispar}%
-}% end of yes nest par tags
+ \ifthenelse{%
+ \cnttest{\value{LWR at lateximagedepth}}{>}{0} \OR%
+ \cnttest{\value{LWR at spandepth}}{>}{0}%
+ }%
+ {% no nested par tags
+ \ifthenelse{%
+ \cnttest{\value{LWR at spandepth}}{>}{0}%
+ \AND%
+ \cnttest{\value{LWR at lateximagedepth}}{=}{0}%
+ }%
+ {\ifbool{LWR at intabularmetadata}{}{\unskip\LWR at htmltagc{br /}}}%
+ {}%
+ }% no nested par tags
+ {% yes nest par tags
+ \unskip%
+ \LWR at htmltagc{/\LWR at tagregularparagraph}%
+ \LWR at orignewline%
+ \global\boolfalse{LWR at doingapar}%
+ \global\boolfalse{LWR at minipagethispar}%
+ }% end of yes nest par tags
}% end of handling pars
{% not handling pars
-\ifthenelse{\cnttest{\value{LWR at spandepth}}{>}{0}}%
-{\ifbool{LWR at intabularmetadata}{}{\unskip\LWR at htmltagc{br /}}}%
-{}%
+ \ifthenelse{\cnttest{\value{LWR at spandepth}}{>}{0}}%
+ {\ifbool{LWR at intabularmetadata}{}{\unskip\LWR at htmltagc{br /}}}%
+ {}%
}% not handling pars
\LWR at origpar%
}
@@ -3537,15 +3629,15 @@
\ifthenelse{\cnttest{\value{LWR at spandepth}}{>}{0}}%
{}%
{%
-\ifbool{LWR at doingstartpars}%
-{}%
-{%
-\PushPreHook{par}{\LWR at openparagraph}%
-\let\par\LWR at closeparagraph
+ \ifbool{LWR at doingstartpars}%
+ {}%
+ {%
+ \PushPreHook{par}{\LWR at openparagraph}%
+ \let\par\LWR at closeparagraph
-}% an intentionally blank line
-\global\setbool{LWR at doingstartpars}{true}%
-\global\boolfalse{LWR at doingapar}%
+ }% an intentionally blank line
+ \global\setbool{LWR at doingstartpars}{true}%
+ \global\boolfalse{LWR at doingapar}%
}% nestspan
}
@@ -3554,22 +3646,21 @@
\ifthenelse{\cnttest{\value{LWR at spandepth}}{>}{0}}%
{}%
{%
-\ifbool{LWR at doingapar}%
-{%
-\unskip%
-\LWR at htmltagc{/\LWR at tagregularparagraph}%
-\global\boolfalse{LWR at doingapar}%
-\global\boolfalse{LWR at minipagethispar}
+ \ifbool{LWR at doingapar}%
+ {%
+ \unskip%
+ \LWR at htmltagc{/\LWR at tagregularparagraph}%
+ \LWR at orignewline%
+ \global\boolfalse{LWR at doingapar}%
+ \global\boolfalse{LWR at minipagethispar}
-}% an intentionally blank line
-{}%
-\ifbool{LWR at doingstartpars}%
-{%
-\ClearPreHook{par}%
-}%
-{}%
-\global\setbool{LWR at doingstartpars}{false}%
-\global\boolfalse{LWR at doingapar}%
+ }% an intentionally blank line
+ {}%
+ \ifbool{LWR at doingstartpars}%
+ {\ClearPreHook{par}}%
+ {}%
+ \global\setbool{LWR at doingstartpars}{false}%
+ \global\boolfalse{LWR at doingapar}%
}% nestspan
}
@@ -3654,46 +3745,65 @@
\newbox\LWR at footnotes
\long\def\@makefntext#1{\textsuperscript{\@thefnmark} #1}
-
\def\@makefnmark{\hbox{\textsuperscript{\@thefnmark}}}
-\long\def\@footnotetext#1{%
-\global\setbox\LWR at footnotes=\vbox{\unvbox\LWR at footnotes%
-\protected at edef\@currentlabel{%
-\csname p at footnote\endcsname\@thefnmark%
-}% @currentlabel
-\color at begingroup%
-\ifbool{LWR at doingstartpars}{}{\LWR at htmltagc{\LWR at tagregularparagraph}}%
-\@makefntext{#1}%
-\ifbool{LWR at doingstartpars}{\par}{\LWR at htmltagc{/\LWR at tagregularparagraph}}%
-\color at endgroup%
+\long\def\LWR at footnotetext#1{%
+\global\setbox\LWR at footnotes=\vbox{%
+ \unvbox\LWR at footnotes%
+ \protected at edef\@currentlabel{%
+ \csname p at footnote\endcsname\@thefnmark%
+ }% @currentlabel
+ \color at begingroup%
+ \renewcommand{\textsuperscript}[1]{\LWR at htmlspan{sup}{##1}}%
+ \ifthenelse{%
+ \boolean{LWR at doingstartpars} \AND%
+ \cnttest{\value{LWR at lateximagedepth}}{=}{0}%
+ }%
+ {}%
+ {\LWR at htmltagc{\LWR at tagregularparagraph}}%
+ \@makefntext{#1}%
+ \ifthenelse{%
+ \boolean{LWR at doingstartpars} \AND%
+ \cnttest{\value{LWR at lateximagedepth}}{=}{0}%
+ }%
+ {\par}%
+ {%
+ \LWR at htmltagc{/\LWR at tagregularparagraph}%
+ \LWR at orignewline%
+ }%
+ \color at endgroup%
}% vbox
}%
+\let\@footnotetext\LWR at footnotetext
\long\def\@mpfootnotetext#1{%
\global\setbox\@mpfootins\vbox{%
-\unvbox\@mpfootins
-\reset at font\footnotesize
-\hsize\columnwidth
-\@parboxrestore
-\protected at edef\@currentlabel
-{\csname p at mpfootnote\endcsname\@thefnmark}%
-\color at begingroup
-\@makefntext{%
-\ignorespaces#1%
-}%
-\ifthenelse{\cnttest{\value{LWR at lateximagedepth}}{>}{0}}%
-{}%
-{\LWR at htmltagc{/\LWR at tagregularparagraph}}%
-\color at endgroup}%
+ \unvbox\@mpfootins
+ \reset at font\footnotesize
+ \hsize\columnwidth
+ \@parboxrestore
+ \protected at edef\@currentlabel
+ {\csname p at mpfootnote\endcsname\@thefnmark}%
+ \color at begingroup
+ \@makefntext{%
+ \ignorespaces#1%
+ }%
+ \ifthenelse{\cnttest{\value{LWR at lateximagedepth}}{>}{0}}%
+ {}%
+ {%
+ \LWR at htmltagc{/\LWR at tagregularparagraph}%
+ \LWR at orignewline%
+ }%
+ \color at endgroup%
+}% vbox
}
\newcommand*{\LWR at printpendingfootnotes}{%
\ifvoid\LWR at footnotes\else
-\LWR at forcenewpage
-\begin{BlockClass}{footnotes}
-\LWR at origmedskip
-\unvbox\LWR at footnotes
-\setbox\LWR at footnotes=\vbox{}
-\end{BlockClass}
+ \LWR at forcenewpage
+ \begin{BlockClass}{footnotes}
+ \LWR at origmedskip
+ \unvbox\LWR at footnotes
+ \setbox\LWR at footnotes=\vbox{}
+ \end{BlockClass}
\fi
}
\newcommand*{\LWR at epubprintpendingfootnotes}{%
@@ -3804,11 +3914,11 @@
\ifbool{FormatEPUB}
{}
{
-\LWR at htmlelement{footer}
+ \LWR at htmlelement{footer}
-\LWR at pagebottom
+ \LWR at pagebottom
-\LWR at htmlelementend{footer}
+ \LWR at htmlelementend{footer}
}
\ifthenelse{\boolean{FormatEPUB}\OR\boolean{FormatWordProcessor}}
{}
@@ -3841,11 +3951,11 @@
\ifthenelse{\boolean{FormatEPUB}\OR\boolean{FormatWordProcessor}}
{}
{
-\LWR at htmlelement{header}
+ \LWR at htmlelement{header}
-\LWR at pagetop
+ \LWR at pagetop
-\LWR at htmlelementend{header}
+ \LWR at htmlelementend{header}
}
\ifthenelse{\boolean{FormatEPUB}\OR\boolean{FormatWordProcessor}}
@@ -3880,7 +3990,7 @@
\boolfalse{LWR at mainmatter}
}
\newcommand*{\LWR at sectionnumber}[1]{%
-\InlineClass{sectionnumber}{#1} %
+\InlineClass{sectionnumber}{#1}%
}
\newcommand*{\LWR at createautosec}[1]{%
@@ -3901,94 +4011,97 @@
\global\boolfalse{LWR at minipagethispar}%
\LWR at traceinfo{LWR at section: testing whether to start a new HTML file}%
\IfBooleanTF{#1}{% starred
-\LWR at orignewpage%
+ \LWR at orignewpage%
}{% not starred
-\ifthenelse{%
-\cnttest{\csuse{LWR at depth#4}}{<=}{\value{FileDepth}}%
-\AND%
-\(%
-\NOT\boolean{CombineHigherDepths}\OR%
-\cnttest{\csuse{LWR at depth#4}}{<=}{\value{LWR at prevFileDepth}}%
-\)%
-}%
-{% new file
-\LWR at traceinfo{LWR at section: new HTML file}%
-\IfNoValueTF{#2}%
-{\LWR at newhtmlfile{#3}}%
-{\LWR at newhtmlfile{#2}}%
-}% new file
-{% not new file
-\LWR at orignewpage%
+ \ifthenelse{%
+ \cnttest{\csuse{LWR at depth#4}}{<=}{\value{FileDepth}}%
+ \AND%
+ \(%
+ \NOT\boolean{CombineHigherDepths}\OR%
+ \cnttest{\csuse{LWR at depth#4}}{<=}{\value{LWR at prevFileDepth}}%
+ \)%
+ }%
+ {% new file
+ \LWR at traceinfo{LWR at section: new HTML file}%
+ \IfNoValueTF{#2}%
+ {\LWR at newhtmlfile{#3}}%
+ {\LWR at newhtmlfile{#2}}%
+ }% new file
+ {% not new file
+ \LWR at orignewpage%
-}% not new file
+ }% not new file
}% not starred
\LWR at traceinfo{LWR at section: about to LWR at setlatestname}%
\IfValueTF{#2}{\LWR at setlatestname{#2}}{\LWR at setlatestname{#3}}%
\ifbool{HTMLDebugComments}{%
-\LWR at htmlcomment{Opening #4 ``#3''{}}
-}{}
+ \LWR at htmlcomment{Opening #4 ``#3''{}}%
+}{}%
\ifthenelse{%
-\cnttest{\csuse{LWR at depth#4}}{>=}{\LWR at depthparagraph}%
+ \cnttest{\csuse{LWR at depth#4}}{>=}{\LWR at depthparagraph}%
}%
-{\LWR at startpars}
-{}
+{\LWR at startpars}%
+{}%
\LWR at createautosec{\csuse{LWR at tag#4}}%
\IfBooleanTF{#1}%
{}% starred
{% not starred
-\ifthenelse{%
-\cnttest{\csuse{LWR at depth#4}}{<=}{\value{secnumdepth}}%
-}%
-{% if secnumdepth
-\LWR at traceinfo{LWR at section: about to test main matter}%
-\ifbool{LWR at mainmatter}%
-{%
-\LWR at traceinfo{LWR at section: yes mainmatter}%
-\refstepcounter{#4}%
-\LWR at traceinfo{LWR at section: about to addcontentsline}%
-\addcontentsline{toc}{#4}%
-{\protect\LWR at sectionnumber{\csuse{the#4}}%
-\IfValueTF{#2}{#2}{#3}}%
-\LWR at traceinfo{LWR at section: finished addcontentsline}%
-}% end of if main matter
-{% not main matter
-\LWR at traceinfo{LWR at section: no main matter}%
-\addcontentsline{toc}{#4}{\IfValueTF{#2}{#2}{#3}}%
-}% end of not main matter
-}% end of secnumdepth
-{%
-\addcontentsline{toc}{#4}{\IfValueTF{#2}{#2}{#3}}%
-}%
-\ifbool{LWR at mainmatter}%
-{%
-\ifthenelse{%
-\(\cnttest{\csuse{LWR at depth#4}}{<=}%
-{\value{secnumdepth}}\) \AND
-\(\cnttest{\csuse{LWR at depth#4}}{<=}{\LWR at depthpart}\)
-}%
-{\csuse{#4name}~{}}%
-{}%
-\LWR at traceinfo{LWR at section: about to print section number}%
-\ifthenelse{%
-\cnttest{\csuse{LWR at depth#4}}{<=}{\value{secnumdepth}}%
-}%
-{\protect\LWR at sectionnumber{\csuse{the#4}}}%
-{}%
-\LWR at traceinfo{LWR at section: finished print section number}%
-}{}%
+ \ifthenelse{%
+ \cnttest{\csuse{LWR at depth#4}}{<=}{\value{secnumdepth}}%
+ }%
+ {% if secnumdepth
+ \LWR at traceinfo{LWR at section: about to test main matter}%
+ \ifbool{LWR at mainmatter}%
+ {%
+ \LWR at traceinfo{LWR at section: yes mainmatter}%
+ \refstepcounter{#4}%
+ \LWR at traceinfo{LWR at section: about to addcontentsline}%
+ \addcontentsline{toc}{#4}%
+ {\protect\LWR at sectionnumber{\csuse{the#4}}%
+ \IfValueTF{#2}{ #2}{ #3}}%
+ \LWR at traceinfo{LWR at section: finished addcontentsline}%
+ }% end of if main matter
+ {% not main matter
+ \LWR at traceinfo{LWR at section: no main matter}%
+ \addcontentsline{toc}{#4}{\IfValueTF{#2}{ #2}{ #3}}%
+ }% end of not main matter
+ }% end of secnumdepth
+ {%
+ \addcontentsline{toc}{#4}{\IfValueTF{#2}{ #2}{ #3}}%
+ }%
+ \ifbool{LWR at mainmatter}%
+ {%
+ \ifthenelse{%
+ \(\cnttest{\csuse{LWR at depth#4}}{<=}%
+ {\value{secnumdepth}}\) \AND%
+ \(\cnttest{\csuse{LWR at depth#4}}{<=}{\LWR at depthpart}\)%
+ }%
+ {\csuse{#4name}~{}}%
+ {}%
+ \LWR at traceinfo{LWR at section: about to print section number}%
+ \ifthenelse{%
+ \cnttest{\csuse{LWR at depth#4}}{<=}{\value{secnumdepth}}%
+ }%
+ {\protect\LWR at sectionnumber{\csuse{the#4}}~}%
+ {}%
+ \LWR at traceinfo{LWR at section: finished print section number}%
+ }{}%
}% end of not starred
-#3
+#3%
\LWR at htmltag{\csuse{LWR at tag#4end}}%
\label{autopage-\thepage}%
\ifthenelse{%
-\cnttest{\csuse{LWR at depth#4}}{<}{\LWR at depthparagraph}}%
+ \cnttest{\csuse{LWR at depth#4}}{<}{\LWR at depthparagraph}%
+}%
{\LWR at startpars}%
{}%
-\IfBooleanTF{#1}{}{% not starred
-\setcounter{LWR at prevFileDepth}{\csuse{LWR at depth#4}}%
+\IfBooleanTF{#1}%
+{}%
+{% not starred
+ \setcounter{LWR at prevFileDepth}{\csuse{LWR at depth#4}}%
}% not starred
\LWR at traceinfo{LWR at section: done}%
}
@@ -4122,10 +4235,10 @@
\LWR at orignewline
\ifbool{mathjax}%
{%
-\boolfalse{LWR at verbtags}
-\verbatiminput{lwarp_mathjax.txt}%
-\booltrue{LWR at verbtags}
-\LWR at stoppars
+ \boolfalse{LWR at verbtags}
+ \verbatiminput{lwarp_mathjax.txt}%
+ \booltrue{LWR at verbtags}
+ \LWR at stoppars
}% end of mathjax
{}%
\LWR at htmltag{/head}\LWR at orignewline
@@ -4144,8 +4257,8 @@
{%
\LWR at traceinfo{LWR at lwarpStart}
\ifbool{FormatWordProcessor}{%
-\setcounter{FileDepth}{-5}%
-\boolfalse{HTMLDebugComments}%
+ \setcounter{FileDepth}{-5}%
+ \boolfalse{HTMLDebugComments}%
}{}
\edef\LWR at strresult{\HomeHTMLFilename}
\edef\HomeHTMLFilename{\detokenize\expandafter{\LWR at strresult}}
@@ -4218,8 +4331,8 @@
\newcommand*{\LWR at requesttoc}[2]{%
\ifbool{#1}
{
-\expandafter\newwrite\csuse{tf@#2}
-\immediate\openout \csuse{tf@#2} \jobname.#2\relax
+ \expandafter\newwrite\csuse{tf@#2}
+ \immediate\openout \csuse{tf@#2} \jobname.#2\relax
}{}
}
@@ -4239,7 +4352,7 @@
\ifthenelse{\boolean{FormatEPUB}\OR\boolean{FormatWordProcessor}}
{}
{
-\ifnumcomp{\value{LWR at htmlfilenumber}}{>}{0}{\LWR at botnavigation}{}
+ \ifnumcomp{\value{LWR at htmlfilenumber}}{>}{0}{\LWR at botnavigation}{}
}
\LWR at stoppars% final stop of all paragraphs
\LWR at htmltag{/body}\LWR at orignewline
@@ -4376,9 +4489,9 @@
\ifthenelse{\equal{\thepublished}{}}
{}
{
-\begin{BlockClass}{published}
-\@published
-\end{BlockClass}
+ \begin{BlockClass}{published}
+ \@published
+ \end{BlockClass}
}
}
@@ -4403,9 +4516,9 @@
\ifthenelse{\equal{\thesubtitle}{}}
{}
{
-\begin{BlockClass}{subtitle}
-\@subtitle
-\end{BlockClass}
+ \begin{BlockClass}{subtitle}
+ \@subtitle
+ \end{BlockClass}
}
}
@@ -4450,12 +4563,12 @@
\vspace*{\droptitle}
\maketitlehooka
\ifcsempty{@published}
-{}
-{{\@bsprepublished \@published \@bspostpublished}\maketitlehookaa}
+ {}
+ {{\@bsprepublished \@published \@bspostpublished}\maketitlehookaa}
{\@bspretitle \@title \@bsposttitle}
\ifcsempty{@subtitle}
-{}
-{\maketitlehookaaa{\@bspresubtitle \@subtitle \@bspostsubtitle}}
+ {}
+ {\maketitlehookaaa{\@bspresubtitle \@subtitle \@bspostsubtitle}}
\maketitlehookb
{\@bspreauthor \@author \@bspostauthor}
\maketitlehookc
@@ -4499,12 +4612,12 @@
\vspace*{\droptitle}
\maketitlehooka
\ifcsempty{@published}
-{}
-{{\@bsprepublished \@published \@bspostpublished}\maketitlehookaa}
+ {}
+ {{\@bsprepublished \@published \@bspostpublished}\maketitlehookaa}
{\@bspretitle \@title \@bsposttitle}
\ifcsempty{@subtitle}
-{}
-{\maketitlehookaaa{\@bspresubtitle \@subtitle \@bspostsubtitle}}
+ {}
+ {\maketitlehookaaa{\@bspresubtitle \@subtitle \@bspostsubtitle}}
\maketitlehookb
{\@bspreauthor \@author \@bspostauthor}
\maketitlehookc
@@ -4573,19 +4686,19 @@
}
\DeclareDocumentCommand{\@maketitle}{}{%
-\maketitlehooka
-\ifcsempty{@published}
-{}
-{{\@bsprepublished \@published \@bspostpublished}\maketitlehookaa}
-{\@bspretitle \@title \@bsposttitle}
-\ifcsempty{@subtitle}
-{}
-{\maketitlehookaaa{\@bspresubtitle \@subtitle \@bspostsubtitle}}
-\maketitlehookb
-{\@bspreauthor \@author \@bspostauthor}
-\maketitlehookc
-{\@bspredate \@date \@bspostdate}
-\maketitlehookd
+ \maketitlehooka
+ \ifcsempty{@published}
+ {}
+ {{\@bsprepublished \@published \@bspostpublished}\maketitlehookaa}
+ {\@bspretitle \@title \@bsposttitle}
+ \ifcsempty{@subtitle}
+ {}
+ {\maketitlehookaaa{\@bspresubtitle \@subtitle \@bspostsubtitle}}
+ \maketitlehookb
+ {\@bspreauthor \@author \@bspostauthor}
+ \maketitlehookc
+ {\@bspredate \@date \@bspostdate}
+ \maketitlehookd
}
\providecommand{\maketitlehookaa}{}
@@ -4683,12 +4796,13 @@
\setlength{\parskip}{0ex}%
\LWR at stoppars%
\ifbool{LWR at verbtags}{%
-\LWR at htmltag{pre class="#2"
-\ifthenelse{\equal{#1}{}}{}{style="#1"}%
+ \LWR at htmltag{pre class="#2"
+ \ifthenelse{\equal{#1}{}}{}{style="#1"}%
}% pre
}{}%
\begingroup%
\LWR at origttfamily%
+\LWR at FBcancel%
\LetLtxMacro{\hspace}{\LWR at orighspace}%
}
@@ -4872,20 +4986,20 @@
\global\booltrue{LWR at intabularmetadata}%
\ifbool{LWR at exitingtabular}{}%
{% not exiting tabular
-\ifbool{LWR at skippingmrowcell}{}%
-{% not skippingmrowcell
-\unskip%
-\LWR at getexparray{LWR at colafterspec}{\theLWR at tablecolspos}%
-\ifbool{LWR at tableparcell}{\LWR at stoppars}{}%
-\global\boolfalse{LWR at tableparcell}%
-\leavevmode\unskip\LWR at htmltag{/td}\LWR at orignewline%
-\ifbool{LWR at skipatbang}%
-{\boolfalse{LWR at skipatbang}}%
-{%
-\LWR at printatbang{at}{\theLWR at tablecolspos}%
-\LWR at printatbang{bang}{\theLWR at tablecolspos}%
-}% not skipping at or bang
-}% not skipping mrowcell
+ \ifbool{LWR at skippingmrowcell}{}%
+ {% not skippingmrowcell
+ \unskip%
+ \LWR at getexparray{LWR at colafterspec}{\theLWR at tablecolspos}%
+ \ifbool{LWR at tableparcell}{\LWR at stoppars}{}%
+ \global\boolfalse{LWR at tableparcell}%
+ \leavevmode\unskip\LWR at htmltag{/td}\LWR at orignewline%
+ \ifbool{LWR at skipatbang}%
+ {\boolfalse{LWR at skipatbang}}%
+ {%
+ \LWR at printatbang{at}{\theLWR at tablecolspos}%
+ \LWR at printatbang{bang}{\theLWR at tablecolspos}%
+ }% not skipping at or bang
+ }% not skipping mrowcell
}% not exiting tabular
\global\boolfalse{LWR at skippingmrowcell}%
}
@@ -4911,10 +5025,10 @@
\LWR at traceinfo{LWR at tabularampersand}%
\ifthenelse{\cnttest{\value{LWR at tabulardepth}}{>}{0}}%
{%
-\unskip%
-\LWR at closetabledatacell%
-\addtocounter{LWR at tablecolspos}{1}%
-\LWR at getmynexttoken%
+ \unskip%
+ \LWR at closetabledatacell%
+ \addtocounter{LWR at tablecolspos}{1}%
+ \LWR at getmynexttoken%
}%
{\LWR at origampmacro}%
}
@@ -4966,16 +5080,16 @@
\LWR at traceinfo{have now read the next token}%
\ifthenelse{\cnttest{\value{LWR at tabletotalcols}}=0}
{% left edge of the table:
-\LWR at traceinfo{at the left edge}%
-\LWR at setexparray{LWR at colatspec}{leftedge}{\LWR at colparameter}%
-\LWR at traceinfo{at the left edge: %
- \LWR at getexparray{LWR at colatspec}{leftedge}}%
+ \LWR at traceinfo{at the left edge}%
+ \LWR at setexparray{LWR at colatspec}{leftedge}{\LWR at colparameter}%
+ \LWR at traceinfo{at the left edge: %
+ \LWR at getexparray{LWR at colatspec}{leftedge}}%
}%
{% not at the left edge:
-\LWR at traceinfo{not at the left edge}%
-\LWR at setexparray{LWR at colatspec}{\theLWR at tabletotalcols}{\LWR at colparameter}%
-\LWR at traceinfo{at \theLWR at tabletotalcols: %
- \LWR at getexparray{LWR at colatspec}{\theLWR at tabletotalcols}}%
+ \LWR at traceinfo{not at the left edge}%
+ \LWR at setexparray{LWR at colatspec}{\theLWR at tabletotalcols}{\LWR at colparameter}%
+ \LWR at traceinfo{at \theLWR at tabletotalcols: %
+ \LWR at getexparray{LWR at colatspec}{\theLWR at tabletotalcols}}%
}%
\let\LWR at colparameter\relax%
\booltrue{LWR at validtablecol}%
@@ -4990,13 +5104,13 @@
\LWR at traceinfo{have now read the next token}%
\ifthenelse{\cnttest{\value{LWR at tabletotalcols}}=0}
{% left edge of the table:
-\LWR at traceinfo{at the left edge}%
-\LWR at setexparray{LWR at colbangspec}{leftedge}{\LWR at colparameter}%
+ \LWR at traceinfo{at the left edge}%
+ \LWR at setexparray{LWR at colbangspec}{leftedge}{\LWR at colparameter}%
}%
{% not at the left edge:
-\LWR at traceinfo{not at the left edge}%
-\LWR at setexparray{LWR at colbangspec}{\theLWR at tabletotalcols}{\LWR at colparameter}%
-\LWR at traceinfo{bang \theLWR at tabletotalcols: \LWR at colparameter!}%
+ \LWR at traceinfo{not at the left edge}%
+ \LWR at setexparray{LWR at colbangspec}{\theLWR at tabletotalcols}{\LWR at colparameter}%
+ \LWR at traceinfo{bang \theLWR at tabletotalcols: \LWR at colparameter!}%
}%
\let\LWR at colparameter\relax%
\booltrue{LWR at validtablecol}%
@@ -5101,8 +5215,8 @@
\IfStrEq{\LWR at strresult}{M}{\LWR at parsepcolumn{M}}{}%
\IfStrEq{\LWR at strresult}{B}{\LWR at parsepcolumn{B}}{}%
\ifbool{LWR at validtablecol}{}{%
-\LWR at traceinfo{invalid column type: \LWR at strresult}%
-\LWR at parsenormalcolumn{l}%
+ \LWR at traceinfo{invalid column type: \LWR at strresult}%
+ \LWR at parsenormalcolumn{l}%
}%
\addtocounter{LWR at tablecolspos}{1}%
}%
@@ -5114,15 +5228,15 @@
\ifbool{LWR at startedrow}%
{}% started the row
{% not started the row
-\global\booltrue{LWR at startedrow}%
-\global\booltrue{LWR at intabularmetadata}%
-\ifbool{LWR at doinghline}%
-{\LWR at htmltag{tr class="hline"{}}\LWR at orignewline}%
-{% not doing hline
-\ifbool{LWR at doingtbrule}%
-{\LWR at htmltag{tr class="tbrule"{}}\LWR at orignewline}%
-{\LWR at htmltag{tr}\LWR at orignewline}%
-}% end of not doing hline
+ \global\booltrue{LWR at startedrow}%
+ \global\booltrue{LWR at intabularmetadata}%
+ \ifbool{LWR at doinghline}%
+ {\LWR at htmltag{tr class="hline"{}}\LWR at orignewline}%
+ {% not doing hline
+ \ifbool{LWR at doingtbrule}%
+ {\LWR at htmltag{tr class="tbrule"{}}\LWR at orignewline}%
+ {\LWR at htmltag{tr}\LWR at orignewline}%
+ }% end of not doing hline
}% end of not started the row
}
@@ -5133,11 +5247,11 @@
\ifdefempty{\LWR at atbangspec}%
{}%
{%
-\LWR at htmltag{td class="td#1%
-\ifthenelse{\equal{\LWR at getexparray{LWR at midrules}{\theLWR at tablecolspos}}{Y}}{rule}{}%
-"}%
-\LWR at atbangspec%
-\LWR at htmltag{/td}\LWR at orignewline%
+ \LWR at htmltag{td class="td#1%
+ \ifthenelse{\equal{\LWR at getexparray{LWR at midrules}{\theLWR at tablecolspos}}{Y}}{rule}{}%
+ "}%
+ \LWR at atbangspec%
+ \LWR at htmltag{/td}\LWR at orignewline%
}%
}%
@@ -5145,37 +5259,40 @@
\newcommand*{\LWR at tabledatasinglecolumntag}%
{%
\LWR at maybenewtablerow%
-\ifbool{LWR at intabularmetadata}{%
-\ifbool{LWR at exitingtabular}{}%
-{% not exiting tabular
-\ifthenelse{\cnttest{\value{LWR at tablecolspos}}=1}%
+\ifbool{LWR at intabularmetadata}%
{%
-\LWR at printatbang{at}{leftedge}%
-\LWR at printatbang{bang}{leftedge}%
-}% left edge
-{}% not left edge
-\StrChar{\LWR at tablecolspec}{\theLWR at tablecolspos}[\LWR at strresult]%
-\LWR at htmltag{td class="td%
-\LWR at strresult%
-\ifthenelse{\equal{\LWR at getexparray{LWR at midrules}{\theLWR at tablecolspos}}{Y}}{rule}{}%
-"{}}%
-\ifthenelse{%
-\equal{\LWR at strresult}{p}\OR%
-\equal{\LWR at strresult}{m}\OR%
-\equal{\LWR at strresult}{b}\OR%
-\equal{\LWR at strresult}{P}\OR%
-\equal{\LWR at strresult}{M}\OR%
-\equal{\LWR at strresult}{B}\OR%
-\equal{\LWR at strresult}{X}%
-}%
-{% allow pars
-\LWR at startpars%
-\global\booltrue{LWR at tableparcell}%
-}% allow pars
-{}% no pars
-\LWR at getexparray{LWR at colbeforespec}{\theLWR at tablecolspos}%
-\global\boolfalse{LWR at intabularmetadata}%
-}% not exiting tabular
+ \ifbool{LWR at exitingtabular}{}%
+ {% not exiting tabular
+ \ifthenelse{\cnttest{\value{LWR at tablecolspos}}=1}%
+ {%
+ \LWR at printatbang{at}{leftedge}%
+ \LWR at printatbang{bang}{leftedge}%
+ }% left edge
+ {}% not left edge
+ \StrChar{\LWR at tablecolspec}{\theLWR at tablecolspos}[\LWR at strresult]%
+ \LWR at htmltag{td class="td%
+ \LWR at strresult%
+ \ifthenelse{\equal{\LWR at getexparray{LWR at midrules}{\theLWR at tablecolspos}}{Y}}%
+ {rule}%
+ {}%
+ "{}}%
+ \ifthenelse{%
+ \equal{\LWR at strresult}{p}\OR%
+ \equal{\LWR at strresult}{m}\OR%
+ \equal{\LWR at strresult}{b}\OR%
+ \equal{\LWR at strresult}{P}\OR%
+ \equal{\LWR at strresult}{M}\OR%
+ \equal{\LWR at strresult}{B}\OR%
+ \equal{\LWR at strresult}{X}%
+ }%
+ {% allow pars
+ \LWR at startpars%
+ \global\booltrue{LWR at tableparcell}%
+ }% allow pars
+ {}% no pars
+ \LWR at getexparray{LWR at colbeforespec}{\theLWR at tablecolspos}%
+ \global\boolfalse{LWR at intabularmetadata}%
+ }% not exiting tabular
}{}% in tabular metadata
}%
@@ -5313,9 +5430,9 @@
\NewDocumentCommand{\LWR at longtabledatacaptiontag}{s o +m}
{%
\IfValueTF{#2}{% optional given?
-\ifthenelse{\equal{#2}{}}% optional empty?
-{\LWR at setlatestname{#3}}% empty
-{\LWR at setlatestname{#2}}% given and non-empty
+ \ifthenelse{\equal{#2}{}}% optional empty?
+ {\LWR at setlatestname{#3}}% empty
+ {\LWR at setlatestname{#2}}% given and non-empty
}% optional given
{\LWR at setlatestname{#3}}% no optional
\LWR at tabularhtmlcolumns{1}{\theLWR at tabletotalcols}
@@ -5322,49 +5439,49 @@
\LWR at domulticolumn{\theLWR at tabhtmlcoltotal}{P}{% \LWR at domulticolumn
\IfBooleanTF{#1}% star?
{% yes star
-\LWR at htmlblocktag{figcaption}%
-#3%
-\LWR at htmlblocktag{/figcaption}%
+ \LWR at htmlblocktag{figcaption}%
+ #3%
+ \LWR at htmlblocktag{/figcaption}%
}%
{% No star:
-\ifbool{LWR at starredlongtable}%
-{%
-\ifthenelse{\equal{#2}{}}% TOC entry
-{}%
-{%
-\refstepcounter{\LTcaptype}%
-\protected at edef\@currentlabel{%
-\csuse{p@\LTcaptype}\csuse{the\LTcaptype}}%
-}%
-}{}%
-\LWR at htmlblocktag{figcaption}%
-\csuse{fnum@\LTcaptype}\CaptionSeparator#3%
-\LWR at htmlblocktag{/figcaption}%
-\ifthenelse{\equal{#2}{}}% TOC entry empty
-{}%
-{% TOC entry not empty
-\IfNoValueTF{#2}% No TOC entry?
-{% No TOC entry
-\addcontentsline%
-{\csuse{ext@\LTcaptype}}%
-{\LTcaptype}%
-{%
-\protect\numberline%
-{\csuse{p@\LTcaptype}\csuse{the\LTcaptype}}%
-{\ignorespaces #3\protect\relax}%
-}%
-}% end of No TOC entry
-{% yes TOC entry
-\addcontentsline%
-{\csuse{ext@\LTcaptype}}%
-{\LTcaptype}%
-{%
-\protect\numberline%
-{\csuse{p@\LTcaptype}\csuse{the\LTcaptype}}%
-{\ignorespaces #2\protect\relax}%
-}%
-}% end of yes TOC entry
-}% end of TOC entry not empty
+ \ifbool{LWR at starredlongtable}%
+ {%
+ \ifthenelse{\equal{#2}{}}% TOC entry
+ {}%
+ {%
+ \refstepcounter{\LTcaptype}%
+ \protected at edef\@currentlabel{%
+ \csuse{p@\LTcaptype}\csuse{the\LTcaptype}}%
+ }%
+ }{}%
+ \LWR at htmlblocktag{figcaption}%
+ \csuse{fnum@\LTcaptype}\CaptionSeparator#3%
+ \LWR at htmlblocktag{/figcaption}%
+ \ifthenelse{\equal{#2}{}}% TOC entry empty
+ {}%
+ {% TOC entry not empty
+ \IfNoValueTF{#2}% No TOC entry?
+ {% No TOC entry
+ \addcontentsline%
+ {\csuse{ext@\LTcaptype}}%
+ {\LTcaptype}%
+ {%
+ \protect\numberline%
+ {\csuse{p@\LTcaptype}\csuse{the\LTcaptype}}%
+ {\ignorespaces #3\protect\relax}%
+ }%
+ }% end of No TOC entry
+ {% yes TOC entry
+ \addcontentsline%
+ {\csuse{ext@\LTcaptype}}%
+ {\LTcaptype}%
+ {%
+ \protect\numberline%
+ {\csuse{p@\LTcaptype}\csuse{the\LTcaptype}}%
+ {\ignorespaces #2\protect\relax}%
+ }%
+ }% end of yes TOC entry
+ }% end of TOC entry not empty
}% end of no star
\booltrue{LWR at skipatbang}%
}% end of \LWR at domulticolumn
@@ -5393,10 +5510,10 @@
\addtocounter{LWR at tabhtmlcolindex}{1}%
}%
\ifthenelse{\value{LWR at tablecolspos}=1}{%
-\edef\LWR at atbangspec{\LWR at getexparray{LWR at colatspec}{leftedge}}%
-\ifdefempty{\LWR at atbangspec}{}{\addtocounter{LWR at tabhtmlcoltotal}{1}}%
-\edef\LWR at atbangspec{\LWR at getexparray{LWR at colbangspec}{leftedge}}%
-\ifdefempty{\LWR at atbangspec}{}{\addtocounter{LWR at tabhtmlcoltotal}{1}}%
+ \edef\LWR at atbangspec{\LWR at getexparray{LWR at colatspec}{leftedge}}%
+ \ifdefempty{\LWR at atbangspec}{}{\addtocounter{LWR at tabhtmlcoltotal}{1}}%
+ \edef\LWR at atbangspec{\LWR at getexparray{LWR at colbangspec}{leftedge}}%
+ \ifdefempty{\LWR at atbangspec}{}{\addtocounter{LWR at tabhtmlcoltotal}{1}}%
}{}%
}
@@ -5492,6 +5609,7 @@
\global\boolfalse{LWR at startedrow}%
\global\boolfalse{LWR at doinghline}%
\global\boolfalse{LWR at doingtbrule}%
+\LWR at FBcancel%
\boolfalse{LWR at exitingtabular}%
\global\booltrue{LWR at intabularmetadata}%
\LWR at forcenewpage
@@ -5598,21 +5716,21 @@
\ifthenelse{\cnttest{\value{LWR at lateximagedepth}}{>}{0}}%
{}%
{% not lateximage
-\ifbool{LWR at doingstartpars}%
-{% pars allowed
-\ifbool{LWR at doingapar}
-{% par started
-\LWR at htmltag{a id="#1"{}}\LWR at htmltag{/a}%
-}% par started
-{% par not started
-\LWR at stoppars%
-\LWR at htmltag{a id="#1"{}}\LWR at htmltag{/a}%
-\LWR at startpars%
-}% par not started
-}% pars allowed
-{% pars not allowed
-\LWR at htmltag{a id="#1"{}}\LWR at htmltag{/a}%
-}% pars not allowed
+ \ifbool{LWR at doingstartpars}%
+ {% pars allowed
+ \ifbool{LWR at doingapar}
+ {% par started
+ \LWR at htmltag{a id="#1"{}}\LWR at htmltag{/a}%
+ }% par started
+ {% par not started
+ \LWR at stoppars%
+ \LWR at htmltag{a id="#1"{}}\LWR at htmltag{/a}%
+ \LWR at startpars%
+ }% par not started
+ }% pars allowed
+ {% pars not allowed
+ \LWR at htmltag{a id="#1"{}}\LWR at htmltag{/a}%
+ }% pars not allowed
}% not lateximage
}
\NewDocumentCommand{\LWR at newlabel}{m o}{%
@@ -5640,20 +5758,21 @@
\LWR at traceinfo{LWR at startref D: !#1!}%
\ifthenelse{\equal{\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 lidref}%
-lateximage\LWR at lateximagenumberref{#1}%
+ \LWR at traceinfo{LWR at startref D0: ??}%
+ ??%
}%
{%
-\LWR at traceinfo{LWR at startref D3}%
-#1%
+ \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 lidref}%
+ lateximage\LWR at lateximagenumberref{#1}%
+ }%
+ {%
+ \LWR at traceinfo{LWR at startref D3}%
+ #1%
+ }%
}%
-}%
\LWR at traceinfo{LWR at startref E}%
"{}}%
\LWR at traceinfo{LWR at startref F}%
@@ -5868,12 +5987,12 @@
\renewcommand*{\addcontentsline}[3]{%
\ifthenelse{\equal{#1}{toc}}{}{%
-\ifthenelse{\equal{#1}{thm}}{\csdef{ext@#2}{thm}}{}
-\addtocontents{\@nameuse{ext@#2}}{%
-\protect\LWRsetnextfloat%
-{\arabic{LWR at latestautopage}}%
-{\arabic{LWR at thisfloat}}%
-}% addtocontents
+ \ifthenelse{\equal{#1}{thm}}{\csdef{ext@#2}{thm}}{}
+ \addtocontents{\@nameuse{ext@#2}}{%
+ \protect\LWRsetnextfloat%
+ {\arabic{LWR at latestautopage}}%
+ {\arabic{LWR at thisfloat}}%
+ }% addtocontents
}% not toc
\LWR at origaddcontentsline{#1}{#2}{#3}%
}
@@ -5931,22 +6050,22 @@
\renewcommand*{\tableofcontents}{%
\ifbool{FormatWordProcessor}{}{
-\LWR at copyfile{\jobname.toc}{\jobname.sidetoc}%
-\LWR at printpendingfootnotes
-\LWR at origtableofcontents
+ \LWR at copyfile{\jobname.toc}{\jobname.sidetoc}%
+ \LWR at printpendingfootnotes
+ \LWR at origtableofcontents
}
}
\renewcommand*{\listoffigures}{
\ifbool{FormatWordProcessor}{}{
-\LWR at printpendingfootnotes
-\LWR at origlistoffigures
+ \LWR at printpendingfootnotes
+ \LWR at origlistoffigures
}
}
\renewcommand*{\listoftables}{
\ifbool{FormatWordProcessor}{}{
-\LWR at printpendingfootnotes
-\LWR at origlistoftables
+ \LWR at printpendingfootnotes
+ \LWR at origlistoftables
}
}
@@ -5999,10 +6118,10 @@
\NewDocumentCommand{\hypertoc}{m m +m m}{%
\ifthenelse{\cnttest{#1}{<=}{\value{tocdepth}}}{%
-\LWR at startpars%
-\LWR at subhyperrefclass{%
-\LWR at htmlrefsectionfilename{autopage-#4}\#autosec-#4}{#3}{toc#2}%
-\LWR at stoppars%
+ \LWR at startpars%
+ \LWR at subhyperrefclass{%
+ \LWR at htmlrefsectionfilename{autopage-#4}\#autosec-#4}{#3}{toc#2}%
+ \LWR at stoppars%
}
{}
}
@@ -6021,22 +6140,22 @@
}{}%
\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}}%
-{#4}{toc#2}%
-\LWR at stoppars%
+ \LWR at startpars%
+ \LWR at subhyperrefclass{%
+ \LWR at htmlrefsectionfilename{autopage-\arabic{LWR at nextautopage}}%
+ \#autofloat-\arabic{LWR at nextautofloat}}%
+ {#4}{toc#2}%
+ \LWR at stoppars%
}{}%
}
\renewcommand{\l at part}[2]{\hypertoc{-1}{part}{#1}{#2}}
\DeclareDocumentCommand{\l at chapter}{m m}
-{\hypertoc{0}{chapter}{#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}{subsubsection}{#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}}
@@ -6056,8 +6175,8 @@
\setcounter{LWR at autoglossary}{0}
\@ifundefined{chapter}
-{\newcommand*{\LWR at indexsection}{\section{\indexname}}}
-{\newcommand*{\LWR at indexsection}{\chapter{\indexname}}}
+ {\newcommand*{\LWR at indexsection}{\section{\indexname}}}
+ {\newcommand*{\LWR at indexsection}{\chapter{\indexname}}}
\let\LWR at origprintindex\printindex
@@ -6160,10 +6279,10 @@
\ifbool{mathjax}%
{\textbackslash(\LWR at HTMLsanitize{#1}\textbackslash)}
{% not mathjax
-\begin{lateximage}%
-[\textbackslash( \LWR at HTMLsanitize{#1} \textbackslash)]%
-\LWR at origdollar#1\LWR at origdollar%
-\end{lateximage}%
+ \begin{lateximage}%
+ [\textbackslash( \LWR at HTMLsanitize{#1} \textbackslash)]%
+ \LWR at origdollar#1\LWR at origdollar%
+ \end{lateximage}%
}%
}
@@ -6204,17 +6323,18 @@
{}% not using chapters
\ifthenelse{\cnttest{\value{equation}}>0}
{
-\setcounter{LWR at nextequation}{\value{equation}}
-\addtocounter{LWR at nextequation}{1}
-\InlineClass{hidden}{
-\textbackslash(
-\textbackslash{}seteqnumber \{\arabic{LWR at nextequation}\}
-\textbackslash)
+ \setcounter{LWR at nextequation}{\value{equation}}
+ \addtocounter{LWR at nextequation}{1}
+ \InlineClass{hidden}{
+ \textbackslash(
+ \textbackslash{}seteqnumber \{\arabic{LWR at nextequation}\}
+ \textbackslash)
+ }
+}{}% not eq > 0
}
-}{}% not eq > 1
-}
\newcommand*{\LWR at restoreorigformatting}{%
+\LWR at traceinfo{LWR at restoreorigformatting}%
\LetLtxMacro{\hspace}{\LWR at orighspace}%
\LetLtxMacro\rule\LWR at origrule%
\let\,\LWR at origcomma% disable HTML short unbreakable space
@@ -6240,9 +6360,14 @@
\LetLtxMacro{\itshape}{\LWR at origitshape}%
\LetLtxMacro{\em}{\LWR at origem}%
\LetLtxMacro{\normalfont}{\LWR at orignormalfont}%
-\renewcommand*{\thefootnote}{\fnsymbol{footnote}}%
+\let\sp\LWR at origsp%
+\let\sb\LWR at origsb%
\let\textsuperscript\LWR at origtextsuperscript%
\let\textsubscript\LWR at origtextsubscript%
+\let\textdegree\LWR at origtextdegree%
+\let\textcelsius\LWR at origtextcelsius%
+\let\textohm\LWR at origtextohm%
+\let\textmu\LWR at origtextmu%
\let~\LWR at origtilde%
\let\enskip\LWR at origenskip%
\let\quad\LWR at origquad%
@@ -6263,13 +6388,16 @@
\let\reflectbox\LWR at origreflectbox%
\let\framebox\LWR at origframebox%
\let\makebox\LWR at origmakebox%
-\let\fbox\LWR at origfbox%
-\let\fboxBlock\LWR at origfbox%
-\LetLtxMacro{\fminipage}{\LWR at fminipageprint}%
-\LetLtxMacro{\endfminipage}{\endLWR at fminipageprint}%
+\let\fbox\LWRprint at fbox%
+\let\fboxBlock\LWRprint at fbox%
+\LetLtxMacro{\fminipage}{\LWRprint at fminipage}%
+\LetLtxMacro{\endfminipage}{\endLWRprint at fminipage}%
\LetLtxMacro{\minipage}{\LWR at origminipage}%
\let\endminipage\LWR at endminipage%
\LetLtxMacro{\parbox}{\LWR at origparbox}%
+\LWR at restoreorigxcolor%
+\LWR at restoremoreorigxcolor%
+\LWR at FBcancel%
}
\NewDocumentCommand{\LWR at hidelatexequation}{m +m}{%
@@ -6304,17 +6432,17 @@
\ifbool{mathjax}
{
-\LWR at syncmathjax
-\LWR at hidelatexequation{equation}{\BODY}
+ \LWR at syncmathjax
+ \LWR at hidelatexequation{equation}{\BODY}
}
{% not mathjax
-\begin{lateximage}[(\theequation) \textbackslash{begin\{equation\}}%
- \LWR at HTMLsanitizeexpand{\detokenize\expandafter{\BODY}}%
- \textbackslash{end\{equation\}}]% alt tag
-\LWR at origequation
-\BODY% contents collected by NewEnviron
-\LWR at origendequation
-\end{lateximage}%
+ \begin{lateximage}[(\theequation) \textbackslash{begin\{equation\}}%
+ \LWR at HTMLsanitizeexpand{\detokenize\expandafter{\BODY}}%
+ \textbackslash{end\{equation\}}]% alt tag
+ \LWR at origequation
+ \BODY% contents collected by NewEnviron
+ \LWR at origendequation
+ \end{lateximage}%
}
}[\ifbool{mathjax}{\LWR at addmathjax{equation}{\BODY}}{}]
@@ -6325,15 +6453,15 @@
\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 origltx@label{#1}%
-\LWR at htmlopencomment%
-}% text
+ \text{
+ \ifbool{LWR at amsmultline}{}{\hspace*{\totwidth@}}
+ \LWR at htmlclosecomment%
+ \LWR at origltx@label{#1}%
+ \LWR at htmlopencomment%
+ }% text
}% mathjax
{%
-\LWR at origltx@label{#1}%
+ \LWR at origltx@label{#1}%
}%
}
@@ -6362,36 +6490,38 @@
\newcommand{\LWR at eqnarrayfactor}{%
\ifbool{mathjax}
{
-\LWR at syncmathjax
-\boolfalse{LWR at amsmultline}
-\ifbool{LWR at numbereqnarray}
-{
-\LWR at beginhideamsmath
-\LWR at origeqnarray
-\BODY
-\LWR at origendeqnarray
-\LWR at endhideamsmath
-\LWR at addmathjax{eqnarray}{\BODY}
-}{% not LWR at numbereqnarray
-\LWR at addmathjax{eqnarray*}{\BODY}
-}% LWR at numbereqnarray
+ \LWR at syncmathjax
+ \boolfalse{LWR at amsmultline}
+ \ifbool{LWR at numbereqnarray}
+ {
+ \LWR at beginhideamsmath
+ \LWR at origeqnarray
+ \BODY
+ \LWR at origendeqnarray
+ \LWR at endhideamsmath
+ \LWR at addmathjax{eqnarray}{\BODY}
+ }%
+ {% not LWR at numbereqnarray
+ \LWR at addmathjax{eqnarray*}{\BODY}
+ }% LWR at numbereqnarray
}% mathjax
{% not mathjax
-\ifbool{LWR at numbereqnarray}
-{
-\begin{lateximage}[\LWR at addmathjax{eqnarray}{\BODY}]
-\LWR at origeqnarray
-\BODY
-\LWR at origendeqnarray
-\end{lateximage}
-}{% not LWR at numbereqnarray
-\begin{lateximage}[\LWR at addmathjax{eqnarray*}{\BODY}]
-\LWR at origeqnarray
-\BODY
-\nonumber
-\LWR at origendeqnarray
-\end{lateximage}
-}% LWR at numbereqnarray
+ \ifbool{LWR at numbereqnarray}
+ {
+ \begin{lateximage}[\LWR at addmathjax{eqnarray}{\BODY}]
+ \LWR at origeqnarray
+ \BODY
+ \LWR at origendeqnarray
+ \end{lateximage}
+ }%
+ {% not LWR at numbereqnarray
+ \begin{lateximage}[\LWR at addmathjax{eqnarray*}{\BODY}]
+ \LWR at origeqnarray
+ \BODY
+ \nonumber
+ \LWR at origendeqnarray
+ \end{lateximage}
+ }% LWR at numbereqnarray
}% not mathjax
\booltrue{LWR at numbereqnarray}
}
@@ -6406,12 +6536,12 @@
\ifbool{mathjax}
{
-\LWR at syncmathjax
-\booltrue{LWR at amsmultline}
-\LWR at beginhideamsmath
+ \LWR at syncmathjax
+ \booltrue{LWR at amsmultline}
+ \LWR at beginhideamsmath
}
{
-\lateximage[LWRAMSMATHBODY]
+ \lateximage[LWRAMSMATHBODY]
}
}
@@ -6419,9 +6549,9 @@
\ifbool{mathjax}
{
-\LWR at endhideamsmath
-\boolfalse{LWR at amsmultline}
-\LWR at addmathjax{multline}{\the\@envbody}
+ \LWR at endhideamsmath
+ \boolfalse{LWR at amsmultline}
+ \LWR at addmathjax{multline}{\the\@envbody}
}
{\endlateximage}
@@ -6431,12 +6561,12 @@
\ifbool{mathjax}
{
-\LWR at syncmathjax
-\booltrue{LWR at amsmultline}
-\LWR at beginhideamsmath
+ \LWR at syncmathjax
+ \booltrue{LWR at amsmultline}
+ \LWR at beginhideamsmath
}
{
-\lateximage[LWRAMSMATHBODY]
+ \lateximage[LWRAMSMATHBODY]
}
}
@@ -6444,9 +6574,9 @@
\ifbool{mathjax}
{
-\LWR at endhideamsmath
-\boolfalse{LWR at amsmultline}
-\LWR at addmathjax{multline*}{\the\@envbody}
+ \LWR at endhideamsmath
+ \boolfalse{LWR at amsmultline}
+ \LWR at addmathjax{multline*}{\the\@envbody}
}
{\endlateximage}
@@ -6457,12 +6587,12 @@
\ifbool{mathjax}
{
-\LWR at syncmathjax
-\boolfalse{LWR at amsmultline}
-\LWR at beginhideamsmath
+ \LWR at syncmathjax
+ \boolfalse{LWR at amsmultline}
+ \LWR at beginhideamsmath
}
{
-\lateximage[LWRAMSMATHBODY]
+ \lateximage[LWRAMSMATHBODY]
}
}
@@ -6470,8 +6600,8 @@
\ifbool{mathjax}
{
-\LWR at endhideamsmath
-\LWR at addmathjax{gather}{\the\@envbody}
+ \LWR at endhideamsmath
+ \LWR at addmathjax{gather}{\the\@envbody}
}
{\endlateximage}
@@ -6481,12 +6611,12 @@
\ifbool{mathjax}
{
-\LWR at syncmathjax
-\boolfalse{LWR at amsmultline}
-\LWR at beginhideamsmath
+ \LWR at syncmathjax
+ \boolfalse{LWR at amsmultline}
+ \LWR at beginhideamsmath
}
{
-\lateximage[LWRAMSMATHBODY]
+ \lateximage[LWRAMSMATHBODY]
}
}
@@ -6494,8 +6624,8 @@
\ifbool{mathjax}
{
-\LWR at endhideamsmath
-\LWR at addmathjax{gather*}{\the\@envbody}
+ \LWR at endhideamsmath
+ \LWR at addmathjax{gather*}{\the\@envbody}
}
{\endlateximage}
@@ -6505,12 +6635,12 @@
\ifbool{mathjax}
{
-\LWR at syncmathjax
-\boolfalse{LWR at amsmultline}
-\LWR at beginhideamsmath
+ \LWR at syncmathjax
+ \boolfalse{LWR at amsmultline}
+ \LWR at beginhideamsmath
}
{
-\lateximage[LWRAMSMATHBODY]
+ \lateximage[LWRAMSMATHBODY]
}
}
@@ -6518,8 +6648,8 @@
\ifbool{mathjax}
{
-\LWR at endhideamsmath
-\LWR at addmathjax{align}{\the\@envbody}
+ \LWR at endhideamsmath
+ \LWR at addmathjax{align}{\the\@envbody}
}
{\endlateximage}
@@ -6529,12 +6659,12 @@
\ifbool{mathjax}
{
-\LWR at syncmathjax
-\boolfalse{LWR at amsmultline}
-\LWR at beginhideamsmath
+ \LWR at syncmathjax
+ \boolfalse{LWR at amsmultline}
+ \LWR at beginhideamsmath
}
{
-\lateximage[LWRAMSMATHBODY]
+ \lateximage[LWRAMSMATHBODY]
}
}
@@ -6542,8 +6672,8 @@
\ifbool{mathjax}
{
-\LWR at endhideamsmath
-\LWR at addmathjax{align*}{\the\@envbody}
+ \LWR at endhideamsmath
+ \LWR at addmathjax{align*}{\the\@envbody}
}
{\endlateximage}
@@ -6553,12 +6683,12 @@
\ifbool{mathjax}
{
-\LWR at syncmathjax
-\boolfalse{LWR at amsmultline}
-\LWR at beginhideamsmath
+ \LWR at syncmathjax
+ \boolfalse{LWR at amsmultline}
+ \LWR at beginhideamsmath
}
{
-\lateximage[LWRAMSMATHBODY]
+ \lateximage[LWRAMSMATHBODY]
}
}
@@ -6566,8 +6696,8 @@
\ifbool{mathjax}
{
-\LWR at endhideamsmath
-\LWR at addmathjax{flalign}{\the\@envbody}
+ \LWR at endhideamsmath
+ \LWR at addmathjax{flalign}{\the\@envbody}
}
{\endlateximage}
@@ -6577,12 +6707,12 @@
\ifbool{mathjax}
{
-\LWR at syncmathjax
-\boolfalse{LWR at amsmultline}
-\LWR at beginhideamsmath
+ \LWR at syncmathjax
+ \boolfalse{LWR at amsmultline}
+ \LWR at beginhideamsmath
}
{
-\lateximage[LWRAMSMATHBODY]
+ \lateximage[LWRAMSMATHBODY]
}
}
@@ -6590,8 +6720,8 @@
\ifbool{mathjax}
{
-\LWR at endhideamsmath
-\LWR at addmathjax{flalign*}{\the\@envbody}
+ \LWR at endhideamsmath
+ \LWR at addmathjax{flalign*}{\the\@envbody}
}
{\endlateximage}
@@ -6621,6 +6751,8 @@
\begin{warpHTML}
\newcommand{\LWR at HTMLsanitize}[1]{%
+\begingroup%
+\LWR at FBcancel%
\protect\StrSubstitute{\detokenize{#1}}%
{\detokenize{&}}%
{\detokenize{&}}[\LWR at strresult]%
@@ -6637,9 +6769,12 @@
{\#}%
[\LWR at strresult]%
\LWR at strresult%
+\endgroup%
}
\newcommand{\LWR at HTMLsanitizeexpand}[1]{%
+\begingroup%
+\LWR at FBcancel%
\protect\StrSubstitute{\detokenize\expandafter{#1}}%
{\detokenize{&}}%
{\detokenize{&}}%
@@ -6653,49 +6788,54 @@
{\detokenize{>}}%
[\LWR at strresult]%
\LWR at strresult%
+\endgroup%
}
\catcode`\$=\active%
-\NewDocumentEnvironment{lateximage}{O{image}}{%
+\NewDocumentEnvironment{lateximage}{O{image}}
+{%
\LWR at traceinfo{lateximage: starting on page \arabic{page}}%
\ifthenelse{\cnttest{\value{LWR at lateximagedepth}}{>}{0}}%
{%
-\addtocounter{LWR at lateximagedepth}{1}%
+ \addtocounter{LWR at lateximagedepth}{1}%
}%
{% start of outer-most lateximage
-\addtocounter{LWR at lateximagenumber}{1}%
-\LWR at traceinfo{lateximage: LWR at lateximagenumber is \arabic{LWR at lateximagenumber}}%
-\boolfalse{mathjax}
-\LWR at ensuredoingapar%
-\addtocounter{LWR at externalfilecnt}{1}%
-\LWR at traceinfo{lateximage: LWR at externalfilecnt is \arabic{LWR at externalfilecnt}}%
-\setcounterpageref{LWR at LIpage}{LWRlateximage\theLWR at lateximagenumber}%
-\LWR at traceinfo{lateximage: LWR at LIpage is \arabic{LWR at LIpage}}%
-\LWR at htmltag{span id="lateximage\arabic{LWR at lateximagenumber}" %
-class="lateximagesource"{}} \LWR at orignewline
-\LWR at traceinfo{lateximage: about to write to lateximages.txt}%
-\immediate\write\LWR at file{|\theLWR at LIpage|\theLWR at externalfilecnt|}%
-\LWR at traceinfo{lateximage: about to create open comment}%
-\LWR at htmlopencomment%
-\addtocounter{LWR at lateximagedepth}{1}%
-\LWR at traceinfo{lateximage: about to create new page}%
-\LWR at orignewpage%
-\LWR at traceinfo{lateximage: about to create minipage}%
-\LWR at origminipage{6in}%
-\csuse{LWR at orig\LateximageFontSizeName}%
-\LWR at traceinfo{lateximage: about to temporarily restore formatting}%
-\LWR at restoreorigformatting%
-\LWR at traceinfo{lateximage: about to create label}%
-\LWR at origlabel{LWRlateximage\arabic{LWR at lateximagenumber}}%
-\LWR at traceinfo{lateximage: finished creating the label}%
-\LetLtxMacro$\LWR at origdollar%
-\catcode`\$=3% math shift
-\LetLtxMacro\(\LWR at origopenparen%
-\LetLtxMacro\)\LWR at origcloseparen%
-\LetLtxMacro\[\LWR at origopenbracket%
-\LetLtxMacro\]\LWR at origclosebracket%
-\let\@ensuredmath\LWR at orig@ensuredmath%
+ \addtocounter{LWR at lateximagenumber}{1}%
+ \LWR at traceinfo{lateximage: LWR at lateximagenumber is \arabic{LWR at lateximagenumber}}%
+ \boolfalse{mathjax}
+ \LWR at ensuredoingapar%
+ \addtocounter{LWR at externalfilecnt}{1}%
+ \LWR at traceinfo{lateximage: LWR at externalfilecnt is \arabic{LWR at externalfilecnt}}%
+ \setcounterpageref{LWR at LIpage}{LWRlateximage\theLWR at lateximagenumber}%
+ \LWR at traceinfo{lateximage: LWR at LIpage is \arabic{LWR at LIpage}}%
+ \LWR at htmltag{span id="lateximage\arabic{LWR at lateximagenumber}" %
+ class="lateximagesource"{}} \LWR at orignewline
+ \LWR at traceinfo{lateximage: about to write to lateximages.txt}%
+ \immediate\write\LWR at file{|\theLWR at LIpage|\theLWR at externalfilecnt|}%
+ \LWR at traceinfo{lateximage: about to create open comment}%
+ \LWR at htmlopencomment%
+ \addtocounter{LWR at lateximagedepth}{1}%
+ \LWR at traceinfo{lateximage: about to create new page}%
+ \LWR at orignewpage%
+ \LWR at traceinfo{lateximage: about to create minipage}%
+ \LWR at origminipage{6in}%
+ \csuse{LWR at orig\LateximageFontSizeName}%
+ \LWR at traceinfo{lateximage: about to temporarily restore formatting}%
+ \LWR at restoreorigformatting%
+ \def\@mpfn{footnote}%
+ \def\thempfn{\thefootnote}%
+ \let\@footnotetext\LWR at footnotetext%
+ \LWR at traceinfo{lateximage: about to create label}%
+ \LWR at origlabel{LWRlateximage\arabic{LWR at lateximagenumber}}%
+ \LWR at traceinfo{lateximage: finished creating the label}%
+ \LetLtxMacro$\LWR at origdollar%
+ \catcode`\$=3% math shift
+ \LetLtxMacro\(\LWR at origopenparen%
+ \LetLtxMacro\)\LWR at origcloseparen%
+ \LetLtxMacro\[\LWR at origopenbracket%
+ \LetLtxMacro\]\LWR at origclosebracket%
+ \let\@ensuredmath\LWR at orig@ensuredmath%
}% end of outer-most lateximage
\LWR at traceinfo{lateximage: finished start of environment}%
}% end of \begin{lateximage}
@@ -6702,35 +6842,33 @@
{% start of \end{lateximage}
\LWR at traceinfo{lateximage: starting end of environment}%
\ifthenelse{\cnttest{\value{LWR at lateximagedepth}}{>}{1}}%
-{%
-\addtocounter{LWR at lateximagedepth}{-1}%
-}%
+{\addtocounter{LWR at lateximagedepth}{-1}}%
{% end of outer-most lateximage
-\LWR at origendminipage%
-\LWR at orignewpage%
-\LWR at origscriptsize%
-\LWR at htmlclosecomment{}\LWR at orignewline%
-\LWR at traceinfo{lateximage: The page after the image is \arabic{page}}%
-\ifthenelse{\equal{#1}{LWRAMSMATHBODY}}%
-{%
-\LWR at subinlineimage[%
-\LWR at HTMLsanitizeexpand{\detokenize\expandafter{\the\@envbody}}%
-]%
-{lateximage}%
-{lateximages\OSPathSymbol{}lateximage-\theLWR at externalfilecnt}%
-{svg}%
-{}%
-}%
-{%
-\LWR at subinlineimage[#1]{lateximage}%
-{lateximages\OSPathSymbol{}lateximage-\theLWR at externalfilecnt}{svg}{}%
-}%
-\LWR at ensuredoingapar%
-\LWR at htmltag{/span}%
-\ifbool{HTMLDebugComments}{%
-\LWR at htmlcomment{End of lateximage}%
-}{}%
-\addtocounter{LWR at lateximagedepth}{-1}%
+ \LWR at origendminipage%
+ \LWR at orignewpage%
+ \LWR at origscriptsize%
+ \LWR at htmlclosecomment{}\LWR at orignewline%
+ \LWR at traceinfo{lateximage: The page after the image is \arabic{page}}%
+ \ifthenelse{\equal{#1}{LWRAMSMATHBODY}}%
+ {%
+ \LWR at subinlineimage[%
+ \LWR at HTMLsanitizeexpand{\detokenize\expandafter{\the\@envbody}}%
+ ]%
+ {lateximage}%
+ {lateximages\OSPathSymbol{}lateximage-\theLWR at externalfilecnt}%
+ {svg}%
+ {}%
+ }%
+ {%
+ \LWR at subinlineimage[#1]{lateximage}%
+ {lateximages\OSPathSymbol{}lateximage-\theLWR at externalfilecnt}{svg}{}%
+ }%
+ \LWR at ensuredoingapar%
+ \LWR at htmltag{/span}%
+ \ifbool{HTMLDebugComments}{%
+ \LWR at htmlcomment{End of lateximage}%
+ }{}%
+ \addtocounter{LWR at lateximagedepth}{-1}%
}% end of outer-most lateximage
\LWR at traceinfo{lateximage: done}%
}%
@@ -6772,12 +6910,11 @@
\begin{warpHTML}
\PassOptionsToPackage{
-detect-mode=true,
-per-mode=symbol, % fraction is not seen by pdftotext
-text-celsius = {\HTMLentity{deg}C},
-text-degree = {\HTMLentity{deg}},
+ detect-mode=true,
+ per-mode=symbol, % fraction is not seen by pdftotext
}{siunitx}
+
\end{warpHTML}
@@ -6808,20 +6945,20 @@
\setlength{\LWR at igwidth}{#1}%
\ifthenelse{\lengthtest{\LWR at igwidth > 0pt}}%
{%
-\uselengthunit{PT}%
-\renewcommand*{\LWR at igwidthstyle}{width:\rndprintlength{\LWR at igwidth}}%
-\IfEndWith{#1}{ex}%
-{\renewcommand*{\LWR at igwidthstyle}{width:#1}}% yes ex
-{}% not ex
-\IfEndWith{#1}{em}%
-{\renewcommand*{\LWR at igwidthstyle}{width:#1}}% yes em
-{}% not em
-\IfEndWith{#1}{\%}%
-{\renewcommand*{\LWR at igwidthstyle}{width:#1}}% yes percent
-{}% not percent
-\IfEndWith{#1}{px}%
-{\renewcommand*{\LWR at igwidthstyle}{width:#1}}% yes px
-{}% not px
+ \uselengthunit{PT}%
+ \renewcommand*{\LWR at igwidthstyle}{width:\rndprintlength{\LWR at igwidth}}%
+ \IfEndWith{#1}{ex}%
+ {\renewcommand*{\LWR at igwidthstyle}{width:#1}}% yes ex
+ {}% not ex
+ \IfEndWith{#1}{em}%
+ {\renewcommand*{\LWR at igwidthstyle}{width:#1}}% yes em
+ {}% not em
+ \IfEndWith{#1}{\%}%
+ {\renewcommand*{\LWR at igwidthstyle}{width:#1}}% yes percent
+ {}% not percent
+ \IfEndWith{#1}{px}%
+ {\renewcommand*{\LWR at igwidthstyle}{width:#1}}% yes px
+ {}% not px
}{}% end of length > 0pt
}
\define at key{igraph}{height}{%
@@ -6828,22 +6965,22 @@
\setlength{\LWR at igheight}{#1}%
\ifthenelse{\lengthtest{\LWR at igheight > 0pt}}%
{%
-\uselengthunit{PT}%
-\renewcommand*{\LWR at igheightstyle}{%
-height:\rndprintlength{\LWR at igheight} %
-}%
-\IfEndWith{#1}{ex}%
-{\renewcommand*{\LWR at igheightstyle}{height:#1}}% yes ex
-{}% not ex
-\IfEndWith{#1}{em}%
-{\renewcommand*{\LWR at igheightstyle}{height:#1}}% yes em
-{}% not em
-\IfEndWith{#1}{\%}%
-{\renewcommand*{\LWR at igheightstyle}{height:#1}}% yes percent
-{}% not percent
-\IfEndWith{#1}{px}%
-{\renewcommand*{\LWR at igheightstyle}{height:#1}}% yes px
-{}% not px
+ \uselengthunit{PT}%
+ \renewcommand*{\LWR at igheightstyle}{%
+ height:\rndprintlength{\LWR at igheight} %
+ }%
+ \IfEndWith{#1}{ex}%
+ {\renewcommand*{\LWR at igheightstyle}{height:#1}}% yes ex
+ {}% not ex
+ \IfEndWith{#1}{em}%
+ {\renewcommand*{\LWR at igheightstyle}{height:#1}}% yes em
+ {}% not em
+ \IfEndWith{#1}{\%}%
+ {\renewcommand*{\LWR at igheightstyle}{height:#1}}% yes percent
+ {}% not percent
+ \IfEndWith{#1}{px}%
+ {\renewcommand*{\LWR at igheightstyle}{height:#1}}% yes px
+ {}% not px
}{}% end of length > 0pt
}
\define at key{igraph}{origin}{%
@@ -6886,6 +7023,8 @@
\newbool{LWR at infloatrow}
\boolfalse{LWR at infloatrow}
+\def\LWR at opacity{1}
+
\newcommand*{\LWR at imageextension}{}
\newcommand*{\LWR at expgraphicsfilename}{}
@@ -6892,14 +7031,15 @@
\NewDocumentCommand{\LWR at includegraphicsb}{s o o m}
{%
\LWR at origtilde \LWR at orignewline%
-\ifthenelse{\cnttest{\value{LWR at minipagedepth}}{=}{0}}{%
-\ifbool{LWR at infloatrow}%
-{}
-{% not in a minipage or a floatrow:
-\setlength{\linewidth}{6in}%
-\setlength{\textwidth}{6in}%
-\setlength{\textheight}{9in}%
-}%
+\ifthenelse{\cnttest{\value{LWR at minipagedepth}}{=}{0}}%
+{%
+ \ifbool{LWR at infloatrow}%
+ {}
+ {% not in a minipage or a floatrow:
+ \setlength{\linewidth}{6in}%
+ \setlength{\textwidth}{6in}%
+ \setlength{\textheight}{9in}%
+ }%
}{}%
\edef\LWR at expgraphicsfilename{#4}
\renewcommand*{\LWR at imageextension}{}%
@@ -6948,12 +7088,12 @@
img src="\thisgraphicspath\LWR at strresult\LWR at imageextension" \LWR at orignewline
\LWR at origtilde{} alt="\LWR at strresult" \LWR at orignewline
\ifthenelse{
-\NOT\equal{\LWR at igwidthstyle}{} \OR
-\NOT\equal{\LWR at igheightstyle}{} \OR
-\NOT\equal{\LWR at igorigin}{} \OR
-\NOT\equal{\LWR at igangle}{} \OR
-\NOT\equal{\LWR at igxscale}{1} \OR
-\NOT\equal{\LWR at igyscale}{1}
+ \NOT\equal{\LWR at igwidthstyle}{} \OR
+ \NOT\equal{\LWR at igheightstyle}{} \OR
+ \NOT\equal{\LWR at igorigin}{} \OR
+ \NOT\equal{\LWR at igangle}{} \OR
+ \NOT\equal{\LWR at igxscale}{1} \OR
+ \NOT\equal{\LWR at igyscale}{1}
}%
{\LWR at origtilde{} style="%
\ifthenelse{\NOT\equal{\LWR at igwidthstyle}{}}%
@@ -6973,6 +7113,9 @@
{\LWR at scalestyle{-ms-}{\LWR at igxscale}{\LWR at igyscale}%
\LWR at scalestyle{-webkit-}{\LWR at igxscale}{\LWR at igyscale}%
\LWR at scalestyle{}{\LWR at igxscale}{\LWR at igyscale}}{}%
+\ifthenelse{\NOT\equal{\LWR at opacity}{1}}%
+{opacity:\LWR at opacity;}%
+{}%
" \LWR at orignewline}{}%
\LWR at origtilde{} class="\LWR at igclass" \LWR at orignewline%
}% end of image tags
@@ -7067,8 +7210,118 @@
\end{warpHTML}
+\begin{warpall}
+\newcommand*{\LWR at restoreorigxcolor}{}
+\newcommand*{\LWR at restoremoreorigxcolor}{}
+\end{warpall}
+
+\begin{warpall}
+\AtBeginDocument{
+\@ifpackageloaded{xcolor}{
+\LWR at traceinfo{patching xcolor}
+\LetLtxMacro\colorboxBlock\colorbox
+\warpprintonly{
+\LetLtxMacro\LWRprint at colorboxBlock\colorbox
+\LetLtxMacro\LWRorigprint at fcolorbox\fcolorbox
+\LetLtxMacro\LWRorigprint at fcolorboxBlock\fcolorbox
+}
+
+\newsavebox{\LWR at colorminipagebox}
+
+\DeclareDocumentCommand{\LWRprint at fcolorbox}{o m o m +m}{%
+\LWR at traceinfo{LWRprint at fcolorbox #2 #4}%
+\begin{lrbox}{\LWR at colorminipagebox}%
+#5%
+\end{lrbox}%
+\ifthenelse{\equal{#4}{none}}%
+{% #4 none
+ \LWR at traceinfo{background is none}%
+ {% scope the \colorlet
+ \colorlet{LWR at currentcolor}{.}%
+ \color{#2}%
+ \fbox{%
+ \color{LWR at currentcolor}%
+ \usebox{\LWR at colorminipagebox}%
+ }% fbox
+ }% colorlet
+}% #4 none
+{% #4 not none
+\LWR at traceinfo{background not none}%
+\IfValueTF{#1}%
+{%
+ \IfValueTF{#3}%
+ {\LWRorigprint at fcolorbox[#1]{#2}[#3]{#4}{\usebox{\LWR at colorminipagebox}}}%
+ {\LWRorigprint at fcolorbox[#1]{#2}{#4}{\usebox{\LWR at colorminipagebox}}}%
+}%
+{% no value #1
+ \IfValueTF{#3}%
+ {\LWRorigprint at fcolorbox{#2}[#3]{#4}{\usebox{\LWR at colorminipagebox}}}%
+ {\LWRorigprint at fcolorbox{#2}{#4}{\usebox{\LWR at colorminipagebox}}}%
+}% no value #1
+}% #4 not none
+\LWR at traceinfo{LWRprint at fcolorbox done}%
+}
+\LetLtxMacro\LWRprint at fcolorboxBlock\LWRprint at fcolorbox
+
+\NewDocumentEnvironment{LWRprint at fcolorminipage}{o m o m O{c} O{} o m}
+{%
+\LWR at traceinfo{*** fcolorminipage: #2 #4 #8}%
+\begin{lrbox}{\LWR at colorminipagebox}%
+\IfValueTF{#7}%
+{\begin{minipage}[#5][#6][#7]{#8}}%
+{\begin{minipage}[#5][#6][#5]{#8}}%
+}%
+{%
+\end{minipage}%
+\end{lrbox}%
+\LWR at traceinfo{*** starting end fcolorminipage #1 #2 #3 #4 #8}%
+\ifthenelse{\equal{#4}{none}}%
+{% #4 none
+ {% scope the \colorlet
+ \colorlet{LWR at currentcolor}{.}%
+ \color{#2}%
+ \fbox{%
+ \color{LWR at currentcolor}%
+ \usebox{\LWR at colorminipagebox}%
+ }% fbox
+ }% colorlet
+}% #4 none
+{% #4 not none
+ \IfValueTF{#1}%
+ {%
+ \IfValueTF{#3}%
+ {\LWRorigprint at fcolorbox[#1]{#2}[#3]{#4}{\usebox{\LWR at colorminipagebox}}}%
+ {\LWRorigprint at fcolorbox[#1]{#2}{#4}{\usebox{\LWR at colorminipagebox}}}%
+ }%
+ {% no value #1
+ \IfValueTF{#3}%
+ {\LWRorigprint at fcolorbox{#2}[#3]{#4}{\usebox{\LWR at colorminipagebox}}}%
+ {\LWRorigprint at fcolorbox{#2}{#4}{\usebox{\LWR at colorminipagebox}}}%
+ }% no value #1
+}% #4 not none
+\LWR at traceinfo{*** finished end fcolorminipage}%
+}
+
+\renewcommand*{\LWR at restoremoreorigxcolor}{%
+\LWR at traceinfo{LWR at restoremoreorigxcolorformatting}%
+\LetLtxMacro\colorboxBlock\LWRprint at colorboxBlock%
+\LetLtxMacro\fcolorbox\LWRprint at fcolorbox%
+\LetLtxMacro\fcolorboxBlock\LWRprint at fcolorboxBlock%
+\LetLtxMacro\fcolorminipage\LWRprint at fcolorminipage%
+\LetLtxMacro\endfcolorminipage\endLWRprint at fcolorminipage%
+}
+\warpprintonly{\LWR at restoremoreorigxcolor}
+
+\LWR at traceinfo{xcolor patches done}
+}{}% xcolor
+}% AtBeginDocument
+\end{warpall}
+
+
+
+
\begin{warpHTML}
\AtEndPreamble{
\RequirePackage{cleveref}
@@ -7130,10 +7383,10 @@
\ifvoid\@mpfootins\else
\vskip\skip\@mpfootins
\normalcolor
-\LWR at htmldivclass{mpfootnotes}
-\LWR at origmedskip
+ \LWR at htmldivclass{mpfootnotes}
+ \LWR at origmedskip
\unvbox\@mpfootins
-\LWR at htmldivclassend{mpfootnotes}
+ \LWR at htmldivclassend{mpfootnotes}
\fi
\@minipagefalse
\color at endgroup
@@ -7168,10 +7421,10 @@
\uselengthunit{in}%
\setlength{\LWR at minipagewidth}{#4}%
\ifthenelse{\cnttest{\value{LWR at minipagedepth}}{=}{0}}{%
-\addtolength{\LWR at minipagewidth}{3em}% room for frames
-\setlength{\linewidth}{6in}%
-\setlength{\textwidth}{6in}%
-\setlength{\textheight}{9in}%
+ \addtolength{\LWR at minipagewidth}{3em}% room for frames
+ \setlength{\linewidth}{6in}%
+ \setlength{\textwidth}{6in}%
+ \setlength{\textheight}{9in}%
}{}%
\LWR at traceinfo{computed width is \rndprintlength{\LWR at minipagewidth}}
\addtocounter{LWR at minipagedepth}{1}%
@@ -7181,21 +7434,21 @@
\LWR at traceinfo{minipage: creating div class}%
\LWR at orignewpage%
\LWR at htmltag{div class="minipage" style="%
-\ifthenelse{\equal{#1}{t}}{vertical-align: bottom ; }{}%
-\ifthenelse{\equal{#1}{c}}{vertical-align: middle ; }{}%
-\ifthenelse{\equal{#1}{b}}{vertical-align: top ; }{}%
-\ifthenelse{\equal{#3}{t}}{justify-content: flex-start ; }{}%
-\ifthenelse{\equal{#3}{c}}{justify-content: center ; }{}%
-\ifthenelse{\equal{#3}{b}}{justify-content: flex-end ; }{}%
-\ifthenelse{\equal{#3}{s}}{justify-content: space-between ; }{}%
+\ifthenelse{\equal{#1}{t}}{vertical-align:bottom ; }{}%
+\ifthenelse{\equal{#1}{c}}{vertical-align:middle ; }{}%
+\ifthenelse{\equal{#1}{b}}{vertical-align:top ; }{}%
+\ifthenelse{\equal{#3}{t}}{justify-content:flex-start ; }{}%
+\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 of \rndprintlength{\LWR at minipagewidth}}%
\uselengthunit{PT}%
\ifbool{LWR at minipagefullwidth}%
{\boolfalse{LWR at minipagefullwidth}}%
{%
-\ifthenelse{\lengthtest{#4}=\linewidth}%
-{}%
-{width:\rndprintlength{\LWR at minipagewidth} ; }%
+ \ifthenelse{\lengthtest{#4}=\linewidth}%
+ {}%
+ {width:\rndprintlength{\LWR at minipagewidth} ; }%
}%
\LWR at traceinfo{minipage: about to print the height}%
\IfValueTF{#2}{height:\rndprintlength{\LWR at minipageheight} ; }{}%
@@ -7229,25 +7482,63 @@
\LetLtxMacro\LWR at origmakebox\makebox
\RenewDocumentCommand{\makebox}{d() o o m}{%
-\mbox{#4}
+\IfValueTF{#2}%
+{%
+ {% scope
+ \def\LWR at align{center}%
+ \ifstrequal{#3}{l}{\def\LWR at align{left}}{}%
+ \ifstrequal{#3}{r}{\def\LWR at align{right}}{}%
+ \ifstrequal{#3}{s}{\def\LWR at align{justify}}{}%
+ \setlength{\LWR at tempwidth}{#2}%
+ \uselengthunit{PT}%
+ \InlineClass[%
+ display:inline-block ; %
+ text-align:\LWR at align\ ; %
+ width:\rndprintlength{\LWR at tempwidth}%
+ ]%
+ {makebox}%
+ {\mbox{#4}}%
+ }% scope
+}%
+{\mbox{#4}}%
}
\LetLtxMacro\LWR at origframebox\framebox
\RenewDocumentCommand{\framebox}{o o m}{%
-\fbox{#3}
+\fbox{\makebox[#1][#2]{#3}}%
}
-\let\LWR at origfbox\fbox
+\newlength{\LWR at atleastonept}
-\renewcommand{\fbox}[1]{%
-\LWR at htmltagc{span class="framebox"}%
-\begin{LWR at nestspan}%
-#1
-\LWR at htmltagc{/span}%
-\end{LWR at nestspan}%
+\newcommand*{\LWR at forceminwidth}[1]{%
+\setlength{\LWR at atleastonept}{#1}%
+\ifthenelse{%
+ \lengthtest{\LWR at atleastonept>0pt}\AND%
+ \lengthtest{\LWR at atleastonept<1pt}%
+}%
+{\setlength{\LWR at atleastonept}{1pt}}%
+{}%
}
+\newcommand*{\LWR at blackborderpadding}{%
+\uselengthunit{PT}%
+border:\rndprintlength{\LWR at atleastonept} solid black ; %
+padding:\rndprintlength{\fboxsep}%
+}
+\let\LWRprint at fbox\fbox
+\newcommand{\LWRhtml at fbox}[1]{%
+\LWR at traceinfo{HTML fbox}
+\LWR at forceminwidth{\fboxrule}%
+\InlineClass[%
+\LWR at blackborderpadding%
+]{fbox}{#1}
+}
+\AtBeginDocument{\let\fbox\LWRhtml at fbox}
+
\newcommand{\fboxBlock}[1]{%
-\begin{BlockClass}{framed}
+\LWR at forceminwidth{\fboxrule}%
+\begin{BlockClass}[%
+\LWR at blackborderpadding%
+]{fboxBlock}
#1
\end{BlockClass}
}
@@ -7254,10 +7545,21 @@
\NewDocumentEnvironment{fminipage}{O{t} o O{t} m}
{%
-\setlength{\LWR at tempwidth}{#4}
-\begin{BlockClass}[width:\rndprintlength{\LWR at tempwidth};]{framed}%
+\LWR at traceinfo{fminipage #1 #2 #3 #4}%
+\LWR at forceminwidth{\fboxrule}%
+\setlength{\LWR at tempwidth}{#4}%
+\IfValueTF{#2}{\setlength{\LWR at tempheight}{#2}}{}%
+\begin{BlockClass}[%
+\LWR at blackborderpadding ; %
+\uselengthunit{PT}%
+\IfValueTF{#2}{height:\rndprintlength{\LWR at tempheight} ; }{}%
+width:\rndprintlength{\LWR at tempwidth}%
+]{fminipage}%
}
-{\end{BlockClass}}
+{%
+\end{BlockClass}%
+\LWR at traceinfo{fminipage done}%
+}
\LetLtxMacro{\LWR at origraisebox}{\raisebox}
\RenewDocumentCommand{\raisebox}{m o o m}{%
@@ -7267,18 +7569,20 @@
\end{warpHTML}
\begin{warpall}
-
\newsavebox{\LWR at fminipagebox}
-\NewDocumentEnvironment{LWR at fminipageprint}{O{t} o O{t} m}
+\NewDocumentEnvironment{LWRprint at fminipage}{O{t} o O{t} m}
{%
+\IfValueTF{#3}%
+{\def\LWR at thisalign{#3}}
+{\def\LWR at thisalign{#1}}%
\IfValueTF{#2}%
-{\minipage[#1][#2][#3]{#4}}%
-{\minipage[#3]{#4}}%
+{\minipage[#1][#2+2\fboxsep+2\fboxrule][\LWR at thisalign]{#4+2\fboxsep+2\fboxrule}}%
+{\minipage[#1]{#4+2\fboxsep+2\fboxrule}}%
\begin{lrbox}{\LWR at fminipagebox}%
\IfValueTF{#2}%
-{\minipage[#1][#2][#3]{\linewidth-2\fboxsep-2\fboxrule}}%
-{\minipage[#3]{\linewidth-2\fboxsep-2\fboxrule}}%
+{\minipage[#1][#2][\LWR at thisalign]{#4}}%
+{\minipage[#1]{#4}}%
}
{%
\endminipage%
@@ -7290,11 +7594,10 @@
\end{warpall}
\begin{warpprint}
-
\let\fboxBlock\fbox
-\LetLtxMacro{\fminipage}{\LWR at fminipageprint}
-\LetLtxMacro{\endfminipage}{\endLWR at fminipageprint}
+\LetLtxMacro{\fminipage}{\LWRprint at fminipage}
+\LetLtxMacro{\endfminipage}{\endLWRprint at fminipage}
\end{warpprint}
@@ -7346,26 +7649,17 @@
\DeclareRobustCommand{\LWR at nulltextnormal}[1]{#1}
\LetLtxMacro{\textnormal}{\LWR at HTMLtextnormal}
-\DeclareRobustCommand{\LWR at HTMLrmfamily}[1]{}
-\DeclareRobustCommand{\LWR at HTMLsffamily}[1]{}
-\DeclareRobustCommand{\LWR at HTMLttfamily}[1]{}
-\DeclareRobustCommand{\LWR at HTMLbfseries}[1]{}
-\DeclareRobustCommand{\LWR at HTMLmdseries}[1]{}
-\DeclareRobustCommand{\LWR at HTMLupshape}[1]{}
-\DeclareRobustCommand{\LWR at HTMLslshape}[1]{}
-\DeclareRobustCommand{\LWR at HTMLscshape}[1]{}
-\DeclareRobustCommand{\LWR at HTMLitshape}[1]{}
-\DeclareRobustCommand{\LWR at HTMLem}[1]{}
-\DeclareRobustCommand{\LWR at nullrmfamily}[1]{}
-\DeclareRobustCommand{\LWR at nullsffamily}[1]{}
-\DeclareRobustCommand{\LWR at nullttfamily}[1]{}
-\DeclareRobustCommand{\LWR at nullbfseries}[1]{}
-\DeclareRobustCommand{\LWR at nullmdseries}[1]{}
-\DeclareRobustCommand{\LWR at nullupshape}[1]{}
-\DeclareRobustCommand{\LWR at nullslshape}[1]{}
-\DeclareRobustCommand{\LWR at nullscshape}[1]{}
-\DeclareRobustCommand{\LWR at nullitshape}[1]{}
+\DeclareRobustCommand{\LWR at nullrmfamily}{}
+\DeclareRobustCommand{\LWR at nullsffamily}{}
+\DeclareRobustCommand{\LWR at nullttfamily}{}
+\DeclareRobustCommand{\LWR at nullbfseries}{}
+\DeclareRobustCommand{\LWR at nullmdseries}{}
+\DeclareRobustCommand{\LWR at nullupshape}{}
+\DeclareRobustCommand{\LWR at nullslshape}{}
+\DeclareRobustCommand{\LWR at nullscshape}{}
+\DeclareRobustCommand{\LWR at nullitshape}{}
\DeclareRobustCommand{\LWR at nullem}[1]{}
+\DeclareRobustCommand{\LWR at nullnormalfont}{}
\newcommand*{\LWR at nullfonts}{%
\LetLtxMacro{\emph}{\LWR at nullemph}%
@@ -7453,7 +7747,9 @@
\let\LWR at origmedskip\medskip
\renewcommand*{\,}{\HTMLunicode{202f}} % HTML thin non-breakable space
+
\renewcommand*{~}{\HTMLentity{nbsp}}
+
\renewcommand*{\textellipsis}{\HTMLunicode{2026}}
\let\LWR at orignormalsize\normalsize
\let\LWR at origsmall\small
@@ -7494,17 +7790,11 @@
}
\newcommand*{\LWR at minipagestartpars}{%
-\ifbool{LWR at minipagethispar}%
-{%
-\LWR at startpars%
-}{}%
+\ifbool{LWR at minipagethispar}{\LWR at startpars}{}%
}
\newcommand*{\LWR at minipagestoppars}{%
-\ifbool{LWR at minipagethispar}%
-{%
-\LWR at stoppars%
-}{}%
+\ifbool{LWR at minipagethispar}{\LWR at stoppars}{}%
}
\renewcommand*{\quad}{%
@@ -7531,20 +7821,20 @@
\setlength{\LWR at tempwidth}{2em}%
\fi%
\ifthenelse{\dimtest{\LWR at tempwidth}{=}{0pt}}{}{%
-\LWR at minipagestoppars%
-\ifthenelse{\dimtest{\LWR at tempwidth}{=}{.16667em}}
-{%
-\HTMLunicode{2009}% thin breakable space
-}%
-{%
-\uselengthunit{PT}%
-\LWR at htmltagc{%
-span style="width:\printlength{\LWR at tempwidth}; display:inline-block;"%
-}%
-\LWR at htmltagc{/span}%
-}%
-\LWR at minipagestartpars%
-}%
+ \LWR at minipagestoppars%
+ \ifthenelse{\dimtest{\LWR at tempwidth}{=}{.16667em}}
+ {%
+ \HTMLunicode{2009}% thin breakable space
+ }%
+ {%
+ \uselengthunit{PT}%
+ \LWR at htmltagc{%
+ span style="width:\printlength{\LWR at tempwidth}; display:inline-block;"%
+ }%
+ \LWR at htmltagc{/span}%
+ }%
+ \LWR at minipagestartpars%
+}% width not 0
}
\NewDocumentCommand{\LWR at nohspace}{s m}{}
@@ -7564,43 +7854,47 @@
\renewcommand*{\nopagebreak}[1][]{}
\RenewDocumentCommand{\enlargethispage}{s m}{}
-
+\newcommand*{\LWR at currenttextcolor}{black}
\NewDocumentCommand{\LWR at rule}{o m m}{%
\setlength{\LWR at tempwidth}{#2}%
\ifthenelse{\lengthtest{\LWR at tempwidth=0pt}}
{}% zero- width
{% non-zero width
-\ifthenelse{\lengthtest{\LWR at tempwidth>0pt}\AND%
-\lengthtest{\LWR at tempwidth<1pt}}%
-{\setlength{\LWR at tempwidth}{1pt}}{}%
-\setlength{\LWR at tempheight}{#3}%
-\ifthenelse{\lengthtest{\LWR at tempheight>0pt}\AND%
-\lengthtest{\LWR at tempheight<1pt}}%
-{\setlength{\LWR at tempheight}{1pt}}{}%
-\LWR at minipagestoppars%
-\uselengthunit{PT}%
-\LWR at htmltagc{%
-span
-style=" %
-background:\LWR at currenttextcolor; %
-width:\printlength{\LWR at tempwidth}; %
-height:\printlength{\LWR at tempheight}; %
-\IfValueTF{#1}%
-{%
-\setlength{\LWR at tempraise}{0pt-#1}%
-\setlength{\LWR at tempraise}{\LWR at tempraise*2}%
-\LWR at orignewline%
--ms-transform: translate(0pt,\printlength{\LWR at tempraise}); %
-\LWR at orignewline%
--webkit-transform: translate(0pt,\printlength{\LWR at tempraise}); %
-\LWR at orignewline%
-transform: translate(0pt,\printlength{\LWR at tempraise}); %
-\LWR at orignewline%
-}{}%
-display:inline-block;"%
-}%
-\LWR at htmltagc{/span}%
-\LWR at minipagestartpars%
+ \ifthenelse{%
+ \lengthtest{\LWR at tempwidth>0pt}\AND%
+ \lengthtest{\LWR at tempwidth<1pt}%
+ }%
+ {\setlength{\LWR at tempwidth}{1pt}}{}%
+ \setlength{\LWR at tempheight}{#3}%
+ \ifthenelse{%
+ \lengthtest{\LWR at tempheight>0pt}\AND%
+ \lengthtest{\LWR at tempheight<1pt}%
+ }%
+ {\setlength{\LWR at tempheight}{1pt}}{}%
+ \LWR at minipagestoppars%
+ \uselengthunit{PT}%
+ \LWR at htmltagc{%
+ span
+ style="%
+ background:\LWR at currenttextcolor; %
+ width:\printlength{\LWR at tempwidth}; %
+ height:\printlength{\LWR at tempheight}; %
+ \IfValueTF{#1}%
+ {%
+ \setlength{\LWR at tempraise}{0pt-#1}%
+ \setlength{\LWR at tempraise}{\LWR at tempraise*2}%
+ \LWR at orignewline%
+ -ms-transform: translate(0pt,\printlength{\LWR at tempraise}); %
+ \LWR at orignewline%
+ -webkit-transform: translate(0pt,\printlength{\LWR at tempraise}); %
+ \LWR at orignewline%
+ transform: translate(0pt,\printlength{\LWR at tempraise}); %
+ \LWR at orignewline%
+ }{}%
+ display:inline-block;"%
+ }%
+ \LWR at htmltagc{/span}%
+ \LWR at minipagestartpars%
}% non-zero width
}
\renewcommand{\rule}{\LWR at rule}
More information about the tex-live-commits
mailing list