texlive[50266] trunk: lwarp (6mar19)
commits+karl at tug.org
commits+karl at tug.org
Wed Mar 6 23:24:57 CET 2019
Revision: 50266
http://tug.org/svn/texlive?view=revision&revision=50266
Author: karl
Date: 2019-03-06 23:24:57 +0100 (Wed, 06 Mar 2019)
Log Message:
-----------
lwarp (6mar19)
Modified Paths:
--------------
trunk/Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua
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-fancybox.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyvrb.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperref.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-listings.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-longtable.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-threeparttable.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp.sty
Added Paths:
-----------
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-bigfoot.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-footnotebackref.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-layouts.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-manyfoot.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-niceframe.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-perpage.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-showtags.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-tablefootnote.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-threeparttablex.sty
Modified: trunk/Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua
===================================================================
--- trunk/Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua 2019-03-06 22:24:12 UTC (rev 50265)
+++ trunk/Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua 2019-03-06 22:24:57 UTC (rev 50266)
@@ -2,7 +2,7 @@
-- Copyright 2016-2018 Brian Dunn
-printversion = "v0.67"
+printversion = "v0.68"
requiredconfversion = "2" -- also at *lwarpmk.conf
function printhelp ()
@@ -396,6 +396,15 @@
print ("lwarpmk: ===")
end -- warnlimages
+function warnlimagesrecompile ()
+-- Warning if must recompile before creating limages:
+ print ("")
+ print ("lwarpmk: ===")
+ print ("lwarpmk: The document must be recompiled before creating the lateximages.")
+ print ("lwarpmk: Enter \"lwarpmk html\" again, then try \"lwarpmk limages\" again.")
+ print ("lwarpmk: ===")
+end --warnlimagesrecompile
+
function checklimages ()
--
-- Check <sourcename>.txt to see if need to recompile first.
@@ -424,12 +433,14 @@
end
end -- if i~=nil
end -- do
+-- The last line should be |end|end|end|.
+-- If not, the compile must have aborted, and the images are incomplete.
+if ( lwimgpage ~= "end" ) then
+ warnlimagesrecompile()
+ os.exit(1) ;
+end
if ( pagezerowarning ) then
- print ("")
- print ("lwarpmk: ===")
- print ("lwarpmk: The document must be recompiled before creating the lateximages.")
- print ("lwarpmk: Enter \"lwarpmk html\" again, then try \"lwarpmk limages\" again.")
- print ("lwarpmk: ===")
+ warnlimagesrecompile()
os.exit(1) ;
end -- pagezerowarning
end -- checklimages
@@ -509,6 +520,8 @@
-- Skip if the page number is 0:
if ( lwimgpage == "0" ) then
pagezerowarning = true
+ -- Skip if the page number is "end":
+ else if ( lwimgpage == "end" ) then
else
-- Skip is this image is hashed and already exists:
local lwimgfullname = imagesdirectory .. dirslash .. lwimgname .. ".svg"
@@ -531,6 +544,7 @@
createwindowsimage (lwimgfullname)
end
end -- not hashed or not exists
+ end -- not page "end"
end -- not page 0
end -- not nil
end -- createonelateximage
Modified: trunk/Master/texmf-dist/doc/latex/lwarp/README.txt
===================================================================
--- trunk/Master/texmf-dist/doc/latex/lwarp/README.txt 2019-03-06 22:24:12 UTC (rev 50265)
+++ trunk/Master/texmf-dist/doc/latex/lwarp/README.txt 2019-03-06 22:24:57 UTC (rev 50266)
@@ -1,5 +1,5 @@
-LaTeX lwarp package v0.67 README.txt
+LaTeX lwarp package v0.68 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 2019-03-06 22:24:12 UTC (rev 50265)
+++ trunk/Master/texmf-dist/scripts/lwarp/lwarpmk.lua 2019-03-06 22:24:57 UTC (rev 50266)
@@ -2,7 +2,7 @@
-- Copyright 2016-2018 Brian Dunn
-printversion = "v0.67"
+printversion = "v0.68"
requiredconfversion = "2" -- also at *lwarpmk.conf
function printhelp ()
@@ -396,6 +396,15 @@
print ("lwarpmk: ===")
end -- warnlimages
+function warnlimagesrecompile ()
+-- Warning if must recompile before creating limages:
+ print ("")
+ print ("lwarpmk: ===")
+ print ("lwarpmk: The document must be recompiled before creating the lateximages.")
+ print ("lwarpmk: Enter \"lwarpmk html\" again, then try \"lwarpmk limages\" again.")
+ print ("lwarpmk: ===")
+end --warnlimagesrecompile
+
function checklimages ()
--
-- Check <sourcename>.txt to see if need to recompile first.
@@ -424,12 +433,14 @@
end
end -- if i~=nil
end -- do
+-- The last line should be |end|end|end|.
+-- If not, the compile must have aborted, and the images are incomplete.
+if ( lwimgpage ~= "end" ) then
+ warnlimagesrecompile()
+ os.exit(1) ;
+end
if ( pagezerowarning ) then
- print ("")
- print ("lwarpmk: ===")
- print ("lwarpmk: The document must be recompiled before creating the lateximages.")
- print ("lwarpmk: Enter \"lwarpmk html\" again, then try \"lwarpmk limages\" again.")
- print ("lwarpmk: ===")
+ warnlimagesrecompile()
os.exit(1) ;
end -- pagezerowarning
end -- checklimages
@@ -509,6 +520,8 @@
-- Skip if the page number is 0:
if ( lwimgpage == "0" ) then
pagezerowarning = true
+ -- Skip if the page number is "end":
+ else if ( lwimgpage == "end" ) then
else
-- Skip is this image is hashed and already exists:
local lwimgfullname = imagesdirectory .. dirslash .. lwimgname .. ".svg"
@@ -531,6 +544,7 @@
createwindowsimage (lwimgfullname)
end
end -- not hashed or not exists
+ end -- not page "end"
end -- not page 0
end -- not nil
end -- createonelateximage
Modified: trunk/Master/texmf-dist/source/latex/lwarp/lwarp.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/lwarp/lwarp.dtx 2019-03-06 22:24:12 UTC (rev 50265)
+++ trunk/Master/texmf-dist/source/latex/lwarp/lwarp.dtx 2019-03-06 22:24:57 UTC (rev 50266)
@@ -16,7 +16,7 @@
% \iffalse
%<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
%<package>\ProvidesPackage{lwarp}
-%<package> [2019/02/23 v0.67 Allows LaTeX to directly produce HTML5 output.]
+%<package> [2019/03/05 v0.68 Allows LaTeX to directly produce HTML5 output.]
%
%<*driver>
\documentclass{ltxdoc}
@@ -800,7 +800,9 @@
}
\newcommand{\limitspfnote}{
-While emulating \pkg{pfnote}, \pkg{lwarp} is not able to reset \HTML\ footnote
+While emulating \pkg{pfnote},
+\margintag{\pkg{pfnote}}
+\pkg{lwarp} is not able to reset \HTML\ footnote
\trouble[\pkg{pfnote} numbers]{pfnote=\pkg{pfnote}>numbering}
numbers per page number to match the printed version,
as \HTML\ has no concept of page numbers.
@@ -807,14 +809,37 @@
\pkg{lwarp} therefore uses continuous footnote numbering even for \pkg{pfnote}.
}
+\newcommand{\limitsperpage}{
+To have footnote numbers reset each time footnotes are printed:
+\margintag{footnote numbering}
+\begin{sourcedisplay}
+\cs{setcounter}\{footnoteReset\}\{1\}
+\end{sourcedisplay}
+
+For \pkg{bigfoot}, \pkg{manyfoot}, or \pkg{perpage}:
+\begin{sourcedisplay}
+\cs{MakePerPage}\{footnoteX\} \\
+\textrm{--- or ---} \\
+\cs{MakeSortedPerPage}\{footnoteX\}
+\end{sourcedisplay}
+The footnotes are reset when they are printed, according to section level
+as set by \ctr{FootnoteDepth}, which is not necessarily by \HTML\ page.
+This is recommended for \cs{alph}, \cs{Alph}, or \cs{fnsymbol} footnotes,
+due to the limited number of symbols which are available.
+}
+
\newcommand{\limitsfootnotes}{
\pkg{lwarp} uses native \LaTeX\ footnote code, although with its own
\cs{box} to avoid the \LaTeX\ output routine. The usual functions mostly work as-is.
+\limitsperpage
+
The \pkg{footmisc} \optn{stable} option is emulated by \pkg{lwarp}.
+\margintag{\pkg{footmisc}}
When using footnotes in sectioning commands,
\trouble[sectioning commands]{footnote>sectioning, \pkg{footmisc}}
+\trouble{footmisc=\pkg{footmisc}}
to generate consistent results between print and \HTML, use
the \pkg{footmisc} package with the \optn{stable} option,
provide a short \TOC\ entry, and \cs{protect} the \cs{footnote}:
@@ -824,9 +849,13 @@
\cs{subsection}\textred{[Subsection Name]}\\
\fqquad\{Subsection Name\textred{\cs{protect}}\cs{footnote}\{A footnote.\}\}
\end{sourcedisplay}
-If using \pkg{memoir} class, with which \pkg{lwarp} preloads \pkg{footmisc}, the
+
+If using \pkg{memoir} class,
+\margintag{\pkg{memoir} with \pkg{footmisc}}
+with which \pkg{lwarp} preloads \pkg{footmisc}, the
\optn{stable} option must be declared before \pkg{lwarp} is loaded:
\trouble[\pkg{memoir}]{footnote>memoir=\pkg{memoir}}
+\trouble{memoir=\pkg{memoir}>footmisc=\pkg{footmisc}}
\begin{sourcedisplay}
\cs{PassOptionsToPackage}\{\textred{stable}\}\{footmisc\} \\
\cs{usepackage}\{lwarp\} \\
@@ -841,6 +870,7 @@
\newcommand{\limitsverbatimfootnotes}{%
If using \pkg{fancybox} or \pkg{fancyvrb} with \cs{VerbatimFootnotes},
+\margintag{\pkg{fancybox}, \pkg{fancyvrb}}
\trouble[\cs{VerbatimFootnotes}]{footnote>VerbatimFootnotes=\cs{VerbatimFootnotes}}
and using footnotes in a sectioning command or display math,
\trouble[sectioning or displaymath]{footnote>sectioning, verbatim}
@@ -861,6 +891,25 @@
footnotes when \cs{VerbatimFootnotes} are selected. The browser usually compensates.
}
+\newcommand{\limitsmanyfootbigfoot}{%
+If using the \pkg{bigfoot} package, and possibly also \pkg{manyfoot},
+\margintag{\pkg{bigfoot}, \pkg{manyfoot}}
+\trouble{bigfoot=\pkg{bigfoot}}
+\trouble{manyfoot=\pkg{manyfoot}}
+problems may occur with counter allocation because \pkg{lwarp} uses many counters,
+and there is a difference in how counters numbered 256 and up are handled in pdf\LaTeX.
+With \pkg{bigfoot} this has been known to show up as an error
+related to one footnote insert being forbidden inside another. Another problem
+showed up as a input stack error, and which of these problems occurred depended on how
+many counters were allocated.
+
+As a possible solution, try creating several new counters before defining
+\pkg{bigfoot} or \pkg{manyfoot} footnotes,
+hoping to shift the problematic counter above the 256 threshold.
+It may instead be necessary to use \XeLaTeX\ or \LuaLaTeX\
+instead of pdf\LaTeX.
+}
+
\newcommand{\limitskomascript}{
Many features are ignored during the \HTML\ conversion.
The goal is source-level compatibility.
@@ -1427,11 +1476,14 @@
the document is changed.
Before attempting to create the \SVG\ image files,
+\margintag{recompile first}
\prog{lwarpmk} verifies that the \HTML\ version of the document exists and
has correct internal image references.\footnote{This becomes important
when dealing with a document containing thousands of images.}
If it is necessary to recompile the document's \HTML\ version one more time,
-\prog{lwarpmk} will inform the user with an error message.%
+\prog{lwarpmk} usually will inform the user with an error message,
+but there are some conditions which cannot be detected, so the user
+should watch for the \LaTeX\ recompile warnings.
If \HTML\ appears where an \SVG\ image should be, %
\trouble[\HTML\ instead of images]{image>appears as \HTML\ code}%
@@ -1441,7 +1493,6 @@
\trouble{HTML>image appear as \HTML\ code}
recompile the document one more
time to get the page numbers back in sync, then remake the images one more time.
-\prog{lwarpmk} attempts to detect this situation and print a warning.
Incorrect \SVG\ images will also occur if the document
changes the \progcode{page} counter:
@@ -1832,22 +1883,31 @@
}
\newcommand{\limitslongtable}{%
-Longtable \cs{endhead}, \cs{endfoot}, and \cs{endlastfoot} rows are
-not used for \HTML, and these rows should be disabled.
+Use one of either \cs{endhead} or \cs{endfirsthead} for both print and \HTML,
+and use a \cs{warpprintonly} macro to disable the other head phrase,
+and also the \cs{endfoot} and \cs{endfirstfoot} phrases.
+(See \cref{sec:limitsthreeparttablex} if using \pkg{threeparttablex}.)
+\trouble{tabular>endhead=\cs{endhead}, \cs{endfoot}, \cs{endlastfoot}}
+\begin{sourcedisplay}
+\cs{begin}\{longtable\}\{ [column specifiers] \} \\
+{[} \dots ] \cs{endfirsthead} \quad \textgreen{\% or \cs{endhead}, for print and HTML} \\
+\textred{\cs{warpprintonly}\{} \qquad\qquad \textgreen{\% not used in HTML} \\
+\fquad [ \dots ] \cs{endhead} \qquad \textgreen{\% or \cs{endfirsthead}} \\
+\fquad [ \dots ] \cs{endfoot} \\
+\fquad [ <lastfoot macros> ] \cs{endlastfoot} \\
+\textred{\}} \\
+\dots\ \textblue{table contents} \dots \\
+\textred{\cs{warpHTMLonly}\{} \\
+\fquad {[} <lastfoot macros> ] \quad \textgreen{\% HTML last footer, without \cs{endfoot} \\
+\hspace*{\fill} \% or \cs{endlastfoot}.} \\
+\textred{\}} \\
+\cs{end}\{longtable\}
+\end{sourcedisplay}
+
+Use the \cs{warpprintonly} macro instead of the \env{warpprint} environment.
\trouble[Misplaced \cs{noalign}]{Misplaced \cs{noalign}}
-\trouble{tabular>endhead=\cs{endhead}, \cs{endfoot}, \cs{endlastfoot}}
-Use
- \begin{sourcedisplay}
- \cs{warpprintonly}\{row contents\}
- \end{sourcedisplay}
-instead of
- \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.
-
\cs{kill} is ignored, place a \cs{kill} line inside
\trouble[\cs{kill}]{tabular>kill=\cs{kill}}
\begin{sourcedisplay}
@@ -1859,6 +1919,37 @@
\watchout[lateximage]
}
+\newcommand{\limitsthreeparttablex}{%
+\pkg{threeparttablex} is used with \pkg{longtable} and \pkg{booktabs} as follows:
+\begin{sourcedisplay}
+\cs{begin}\{longtable\}\{ [column specifiers] \} \\
+{[} \dots ] \cs{endfirsthead} \quad \textgreen{\% or \cs{endhead}, for print and HTML} \\
+\textred{\cs{warpprintonly}\{} \qquad\qquad \textgreen{\% not used in HTML} \\
+\fquad [ \dots ] \cs{endhead} \qquad \textgreen{\% or \cs{endfirsthead}} \\
+\fquad [ \dots ] \cs{endfoot} \\
+\fquad \textblue{\cs{bottomrule} \cs{insertTableNotes} \cs{endlastfoot}} \\
+\textred{\}} \\
+\dots\ \textblue{table contents} \dots \\
+\textred{\cs{warpHTMLonly}\{} \quad \textgreen{\% HTML last footer} \\
+\fquad \textblue{\cs{bottomrule}} \\
+\fquad \textblue{\cs{UseMinipageWidths}} \qquad \textgreen{\% optional} \\
+\fquad \textblue{\cs{insertTableNotes}} \\
+\fquad \textblue{\cs{endlastfoot}} \\
+\textred{\}} \\
+\cs{end}\{longtable\}
+\end{sourcedisplay}
+
+The table notes are created using a \cs{multicolumn}.
+\margintag{table width}
+By default the width is not specified to the browser, so long table notes
+can cause the table to be spread out horizontally.
+For \HTML\ output, \pkg{lwarp} guesses the width of the table depending on
+the number of columns, then restricts its guess to a min/max range.
+To use this guess for the width of the table notes, use \cs{UseMinipageWidths} before
+\cs{insertTableNotes}. The width is then specified, and in many cases the result is
+an improvement in overall table layout.
+}
+
\newcommand{\limitssupertabular}{%
For \cs{tablefirsthead}, etc., enclose them as follows:
\trouble[Misplaced alignment tab character \&]%
@@ -2455,7 +2546,7 @@
%<*package>
% \fi
%
-% \CheckSum{29792}
+% \CheckSum{30413}
%
% \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
@@ -2565,6 +2656,7 @@
% \changes{v0.65}{2018/12/22}{\ 2018/12/22}
% \changes{v0.66}{2019/02/08}{\ 2019/02/08}
% \changes{v0.67}{2019/02/23}{\ 2019/02/23}
+% \changes{v0.68}{2019/03/05}{\ 2019/03/05}
@@ -2779,6 +2871,26 @@
%
% \begin{description}
% \needspace{2\baselineskip}
+% \item[v0.68:] Error handling, tabulars, footnotes.
+% \begin{itemize}
+% \item \prog{lwarpmk}: Improved error handling for image generation if
+% \margintag{\prog{lwarpmk}}
+% compile was incomplete.
+% \item \env{tabular}: Fix for \cs{warpprintonly}.
+% \item \pkg{longtable}: Improved flexibility for \cs{endhead}, etc.
+% \margintag{packages}
+% Improved error reporting if \cs{endhead}, etc. incorrect for \pkg{lwarp}.
+% \item \pkg{threeparttable}: Fix for caption type.
+% \item \pkg{hyperref}: Fix for options with braces.
+% \item \pkg{morefloats}: Fix to be loaded early for print output.
+% \item \pkg{listings}: Updated for v1.7.
+% \item Added \pkg{bigfoot}, \pkg{fnpara}, \pkg{footnotebackref}, \pkg{manyfoot},
+% \pkg{tablefootnote}, \pkg{threeparttablex}.
+% \item Added \pkg{layouts}, \pkg{niceframe},
+% \pkg{perpage}, \pkg{showtags}.
+% \item Prevented \pkg{alg}, \pkg{algorithmic}, \pkg{pdfcprot}, \pkg{fncylab}.
+% \end{itemize}
+% \needspace{2\baselineskip}
% \item[v0.67:] Filename generation, symbol fonts.
% \begin{itemize}
% \item Documentation fix for \filenm{<project>-images}, \filenm{<project>-images.txt}.
@@ -4321,13 +4433,14 @@
% \pkg{fullminipage}, \pkg{fullpage},
% \pkg{fwlw}, \pkg{geometry}, \pkg{gmeometric},
% \pkg{grid}, \pkg{grid-system}, \pkg{gridset},
-% \pkg{layaureo}, \pkg{leading},
-% \pkg{ltxgrid}, \pkg{nccfancyhdr}, \pkg{notespages}, \pkg{pagegrid},
-% \pkg{pdfprivacy}, \pkg{pagesel}, \pkg{preview}, \pkg{rmpage},
+% \pkg{layaureo}, \pkg{layout}, \pkg{layouts}, \pkg{leading},
+% \pkg{ltxgrid}, \pkg{nccfancyhdr}, \pkg{notespages}, \pkg{nowidow},
+% \pkg{pagegrid}, \pkg{pdfprivacy}, \pkg{pagesel},
+% \pkg{preview}, \pkg{rmpage},
% \pkg{scrlayer-scrpage}, \pkg{scrpage2}, \pkg{textarea}, \pkg{threadcol},
% \pkg{thumb}, \pkg{thumbs}, \pkg{titleps}, \pkg{tocenter},
% \pkg{turnthepage}, \pkg{twoup}, \pkg{typearea}, \pkg{vmargin},
-% \pkg{watermark}, \pkg{zwpagelayout}.
+% \pkg{watermark}, \pkg{widows-and-orphans}, \pkg{zwpagelayout}.
%
% Tested to work as-is: \pkg{underlin}.\\
%
@@ -4353,12 +4466,12 @@
%
% \pkg{idxlayout}, \pkg{imakeidx}, \pkg{index}, \pkg{makeidx}, \pkg{repeatindex}, \pkg{splitidx}.
%
-% Tested to work as-is: \pkg{hvindex}, \pkg{sepfootnotes}.\\
+% Tested to work as-is: \pkg{hvindex}. \\
%
% Glossary: & \pkg{gloss}, \pkg{glossaries} and \prog{xindy}, \pkg{nomencl}.\\
%
% Bibliography: & \pkg{babelbib}, \pkg{backref}, \pkg{biblatex}, \pkg{bibunits},
-% \pkg{chapterbib}, \pkg{cite}, \pkg{hypernat}, \pkg{natbib}.
+% \pkg{chapterbib}, \pkg{cite}, \pkg{hypernat}, \pkg{natbib}, \pkg{showtags}.
%
% Tested to work as-is: \pkg{notes2bib}. \\
%
@@ -4365,8 +4478,8 @@
% \midrule
%
% Cross-references: &
-% \pkg{bookmark}, \pkg{breakurl}, \pkg{cleveref}, \pkg{fancyref},
-% \pkg{hypdestopt}, \pkg{hyperref}, \pkg{prettyref},
+% \pkg{bookmark}, \pkg{breakurl}, \pkg{cleveref}, \pkg{fancyref},
+% \pkg{hypdestopt}, \pkg{hyperref}, \pkg{perpage}, \pkg{prettyref},
% \pkg{titleref}, \pkg{url}, \pkg{varioref}, \pkg{xr}, \pkg{xr-hyper}, \pkg{xurl}. \\
%
% \midrule
@@ -4375,13 +4488,14 @@
% \pkg{scrlayer-notecolumn}, \pkg{versonotes}. \\
%
% Footnotes: & Adds \progcode{FootnoteDepth} to print footnotes at section breaks.
-% \pkg{dblfnote},
-% \pkg{endheads}, \pkg{endnotes}, \pkg{fnbreak}, \pkg{fnpos},
-% \pkg{footmisc}, \pkg{footnote}, \pkg{footnoterange}, \pkg{footnpag},
-% \pkg{marginnote}, \pkg{nccfoots}, \pkg{pagenote},
-% \pkg{parnotes}, \pkg{pfnote}, \pkg{sidenote}.
+% \pkg{bigfoot}, \pkg{dblfnote},
+% \pkg{endheads}, \pkg{endnotes}, \pkg{fnbreak}, \pkg{fnpara}, \pkg{fnpos},
+% \pkg{footmisc}, \pkg{footnote}, \pkg{footnotebackref},
+% \pkg{footnoterange}, \pkg{footnpag}, \pkg{manyfoot},
+% \pkg{marginnote}, \pkg{pagenote},
+% \pkg{parnotes}, \pkg{pfnote}, \pkg{sidenote}, \pkg{tablefootnote}.
%
-% Tested to work as-is: \pkg{fixfoot}. \\
+% Tested to work as-is: \pkg{fixfoot}, \pkg{nccfoots}, \pkg{sepfootnotes}. \\
%
% \midrule
%
@@ -4430,7 +4544,7 @@
% \env{tabular} environment, \pkg{array}, \pkg{arydshln}, \pkg{bigdelim}, \pkg{booktabs},
% \pkg{colortbl}, \pkg{diagbox}, \pkg{longtable}, \pkg{ltablex}, \pkg{ltxtable},
% \pkg{multirow}, \pkg{supertabular}, \pkg{tabularx}, \pkg{tabulary},
-% \pkg{threeparttable}, \pkg{xltabular}, \pkg{xtab}. \\
+% \pkg{threeparttable}, \pkg{threeparttablex}, \pkg{xltabular}, \pkg{xtab}. \\
%
% \midrule
%
@@ -4479,7 +4593,7 @@
% \pkg{fancyvrb}, \pkg{moreverb}, \pkg{shortvrb}, \pkg{verbatim}. \\
%
% Frames: & \pkg{boxedminipage2e}, \pkg{fancybox}, \pkg{framed}, \pkg{mdframed},
-% \pkg{shadow}, \pkg{vertbars}. \\
+% \pkg{niceframe}, \pkg{shadow}, \pkg{vertbars}. \\
%
% Multi-columns: & \pkg{adjmulticol}, \pkg{multicol}, \pkg{multicolrule}, \pkg{vwcol}. \\
%
@@ -4495,11 +4609,11 @@
% \pkg{cancel}, \pkg{ellipsis}, \pkg{embrac}, \pkg{enparen},
% \pkg{hyphenat}, \pkg{lettrine}, \pkg{lips},
% \pkg{lua-check-hyphen}, \pkg{luacolor},
-% \pkg{magaz}, \pkg{nowidow}, \pkg{pdfrender}, \pkg{realscripts}, \pkg{relsize},
+% \pkg{magaz}, \pkg{pdfrender}, \pkg{realscripts}, \pkg{relsize},
% \pkg{scalefnt}, \pkg{soul}, \pkg{soulpos}, \pkg{soulutf8},
% \pkg{textfit}, \pkg{thinsp}, \pkg{trimclip}, \pkg{truncate},
% \pkg{ulem}, \pkg{umoline}, \pkg{underscore}, \pkg{uspace},
-% \pkg{widows-and-orphans}, \pkg{xellipsis}. \\
+% \pkg{xellipsis}. \\
%
% Acronyms: & \pkg{acro}, \pkg{acronym}. \\
%
@@ -5485,7 +5599,7 @@
% \subsection{Generating the \SVG\ images}
% \label{sec:tutorialsvgmath}
%
-% By default \pkg{lwarp} represents math as \SVG\ images with
+% By default \pkg{lwarp} represents math as \SVG\ images, with
% \margintag{math as \SVG\ images}
% the \LaTeX\ source included in \attribute{alt} attributes. In this way,
% the math is displayed as it was drawn by \LaTeX, and the \LaTeX\ source
@@ -7461,7 +7575,8 @@
% \subsubsection{Footnotes and page notes}
% \label{sec:limitsfootnotes}
%
-% \trouble{footnote>misnumbered}
+% \trouble{footnote>numbering}
+% \gindex{footnotes>numbering}
% \trouble{footnote>in sectioning command}
%
% \limitsfootnotes
@@ -7474,6 +7589,7 @@
%
% \limitspfnote
%
+% \limitsmanyfootbigfoot
%
%
% \subsection{Front and back matter}
@@ -8439,9 +8555,18 @@
% \subsubsection{\pkg{longtable} package}
%
% \DescribePackage{longtable}
+% \trouble{longtable=\pkg{longtable}>endhead=\cs{endhead}, etc.}
+% \trouble{endhead=\cs{endhead}, etc.}
% \limitslongtable
%
%
+% \subsubsection{\pkg{threeparttablex} package}
+% \label{sec:limitsthreeparttablex}
+% \DescribePackage{threeparttablex}
+% \trouble{threeparttablex=\pkg{threeparttablex}}
+% \limitsthreeparttablex
+%
+%
% \subsubsection{\pkg{supertabular} and \pkg{xtab} packages}
%
% \DescribePackage{supertabular}
@@ -8465,7 +8590,7 @@
%
% \DescribePackage{float}
% \DescribePackage{trivfloat}
-% \DescribePackage{algorithmx}
+% \DescribePackage{algorithmicx}
% \limitscombiningfloats
%
%
@@ -10403,6 +10528,7 @@
% \changes{v0.65}{2018/12/15}{Added early checks for \pkg{jarticle}, \pkg{tarticle}, and related.}
% \changes{v0.66}{2019/01/04}{Added early checks for \pkg{colortab}, \pkg{epsf}, \pkg{hyper},
% \pkg{picinpar}, \pkg{picins}, \pkg{sistyle}, \pkg{ucs}.}
+% \changes{v0.68}{2019/02/26}{Prevented \pkg{alg}, \pkg{algorithmic}, \pkg{fncylab}, \pkg{pdfcprot}.}
%
% \begin{macrocode}
\LWR at earlyclassloadnever{jarticle}{ujarticle}
@@ -10414,6 +10540,8 @@
\LWR at earlyloadnever{ae}{cm-super, lmodern}
\LWR at earlyloadnever{aecompl}{cm-super, lmodern}
\LWR at earlyloadnever{aecc}{cm-super, lmodern}
+\LWR at earlyloadnever{alg}{algorithm2e, algorithmicx}
+\LWR at earlyloadnever{algorithmic}{algorithm2e, algorithmicx}
\LWR at earlyloadnever{boxedminipage}{boxedminipage2e}
\LWR at earlyloadnever{caption2}{caption}
% \LWR at earlyloadnever{ccaption}{caption}% might be preloaded by memoir
@@ -10438,8 +10566,10 @@
\LWR at earlyloadnever{colortab}{colortbl}
\LWR at earlyloadnever{epsf}{graphicx}
\LWR at earlyloadnever{fancyheadings}{fancyhdr}
+\LWR at earlyloadnever{fncylab}{cleveref}
\LWR at earlyloadnever{glossary}{glossaries}
\LWR at earlyloadnever{hyper}{hyperref}
+\LWR at earlyloadnever{pdfcprot}{microtype}
\LWR at earlyloadnever{picinpar}{floatflt, wrapfig}
\LWR at earlyloadnever{picins}{floatflt, wrapfig}
\LWR at earlyloadnever{sistyle}{siunitx}
@@ -10500,6 +10630,7 @@
\LWR at loadafter{balance}
\LWR at loadafter{bbding}
\LWR at loadafter{bigdelim}
+\LWR at loadafter{bigfoot}
\LWR at loadafter{bigstrut}
\LWR at loadafter{bitpattern}
\LWR at loadafter{blowup}
@@ -10596,6 +10727,7 @@
\LWR at loadafter{fnbreak}
\LWR at loadafter{fncychap}
\LWR at loadafter{fnlineno}
+\LWR at loadafter{fnpara}
\LWR at loadafter{fnpos}
\LWR at loadafter{fontawesome}
\LWR at loadafter{fontawesome5}
@@ -10603,6 +10735,7 @@
% fontspec must be loaded before lwarp
\LWR at loadafter{footmisc}
\LWR at loadafter{footnote}
+\LWR at loadafter{footnotebackref}
\LWR at loadafter{footnotehyper}
\LWR at loadafter{footnoterange}
\LWR at loadafter{footnpag}
@@ -10645,6 +10778,7 @@
\LWR at loadafter{keyfloat}
\LWR at loadafter{layaureo}
\LWR at loadafter{layout}
+\LWR at loadafter{layouts}
\LWR at loadafter{leading}
\LWR at loadafter{letterspace}
\LWR at loadafter{lettrine}
@@ -10663,6 +10797,7 @@
\LWR at loadafter{luatodonotes}
\LWR at loadafter{magaz}
\LWR at notmemoirloadafter{makeidx}
+\LWR at loadafter{manyfoot}
\LWR at loadafter{marginfit}
\LWR at loadafter{marginfix}
\LWR at loadafter{marginnote}
@@ -10675,7 +10810,7 @@
\LWR at loadafter{microtype}
\LWR at loadafter{midfloat}
\LWR at loadafter{midpage}
-\LWR at loadafter{morefloats}
+% morefloats must be allowed early for print mode
\LWR at notmemoirloadafter{moreverb}
% morewrites must be loaded before lwarp
\LWR at notmemoirloadafter{mparhack}
@@ -10695,6 +10830,7 @@
% newunicodechar must be loaded before lwarp
\LWR at notmemoirloadafter{nextpage}
\LWR at loadafter{nicefrac}
+\LWR at loadafter{niceframe}
\LWR at loadafter{nomencl}
\LWR at loadafter{nonfloat}
\LWR at loadafter{nonumonpart}
@@ -10721,6 +10857,7 @@
\LWR at loadafter{pdfsync}
\LWR at loadafter{pdftricks}
\LWR at loadafter{pdfx}
+\LWR at loadafter{perpage}
\LWR at loadafter{pfnote}
\LWR at loadafter{phfqit}
\LWR at loadafter{pifont}
@@ -10775,6 +10912,7 @@
\LWR at loadafter{shadow}
\LWR at notmemoirloadafter{showidx}
\LWR at loadafter{showkeys}
+\LWR at loadafter{showtags}
\LWR at loadafter{sidecap}
\LWR at loadafter{sidenotes}
\LWR at loadafter{SIunits}
@@ -10794,6 +10932,7 @@
\LWR at loadafter{supertabular}
\LWR at loadafter{t1inc}
\LWR at loadafter{tabls}
+\LWR at loadafter{tablefootnote}
\LWR at notmemoirloadafter{tabularx}
\LWR at loadafter{tabulary}
\LWR at loadafter{tascmac}
@@ -10805,6 +10944,7 @@
\LWR at loadafter{thinsp}
\LWR at loadafter{threadcol}
\LWR at loadafter{threeparttable}
+\LWR at loadafter{threeparttablex}
\LWR at loadafter{thumb}
\LWR at loadafter{thumbs}
\LWR at loadafter{tikz}
@@ -10881,7 +11021,7 @@
% \begin{macrocode}
\newcommand{\LWR at mdfive}[1]{%
\PackageError{lwarp}
-{No MD5 macro was found.}
+{No MD5 macro was found}
{Lwarp must find the macros pdfmdfivesum or mdfivesum.}
}
% \end{macrocode}
@@ -12354,7 +12494,7 @@
% \end{macrocode}
% \DescribePackage{varwidth}
-% Used for print-mode \env{lateximage}:
+% Used for print-mode \env{lateximage}.
% \begin{macrocode}
\RequirePackage{varwidth}
% \end{macrocode}
@@ -12433,6 +12573,7 @@
% \pkg{newthm}, \pkg{rplain}, \pkg{si}.}
% \changes{v0.66}{2019/01/04}{Prevented \pkg{colortab}, \pkg{epsf}, \pkg{hyper}, \pkg{picinpar},
% \pkg{picins}, \pkg{sistyle}, \pkg{ucs}.}
+% \changes{v0.68}{2019/02/26}{Prevented \pkg{alg}, \pkg{algorithmic}, \pkg{fncylab}, \pkg{pdfcprot}.}
%
% The following should never be loaded:
% \begin{macrocode}
@@ -12439,6 +12580,8 @@
\newcommand*{\LWR at checkloadfilename}[1]{%
\LWR at checkloadnever{#1}{ae}{latinmodern}
\LWR at checkloadnever{#1}{aecc}{latinmodern}
+\LWR at checkloadnever{#1}{alg}{algorithm2e, algorithmicx}
+\LWR at checkloadnever{#1}{algorithmic}{algorithm2e, algorithmicx}
\LWR at checkloadnever{#1}{bitfield}{bytefield}
\LWR at checkloadnever{#1}{boxedminipage}{boxedminipage2e}
\LWR at checkloadnever{#1}{caption2}{caption}
@@ -12447,9 +12590,11 @@
\LWR at checkloadnever{#1}{doublespace}{setspace}
\LWR at checkloadnever{#1}{epsf}{graphicx}
\LWR at checkloadnever{#1}{fancyheadings}{fancyhdr}
+\LWR at checkloadnever{#1}{fncylab}{cleveref}
\LWR at checkloadnever{#1}{glossary}{glossaries}
\LWR at checkloadnever{#1}{hyper}{hyperref}
\LWR at checkloadnever{#1}{newthm}{ntheorem}
+\LWR at checkloadnever{#1}{pdfcprot}{microtype}
\LWR at checkloadnever{#1}{picinpar}{floatflt, wrapfig}
\LWR at checkloadnever{#1}{picins}{floatflt, wrapfig}
\LWR at checkloadnever{#1}{rplain}{fancyhdr}
@@ -14150,6 +14295,7 @@
% \changes{v0.65}{2018/12/09}{\filenm{lwarp.css}: Added \cs{sishape}, \cs{textsi}.}
% \changes{v0.65}{2018/12/18}{\filenm{lwarp.css}: Improved \CSS\ for page layout.}
% \changes{v0.66}{2019/01/02}{\filenm{lwarp.css}: Improved \CSS\ for definition lists.}
+% \changes{v0.66}{2019/02/28}{\filenm{lwarp.css}: Added \pkg{niceframe}.}
%
% ^^A *lwarp.css
%
@@ -14918,7 +15064,36 @@
.framedtitle p { padding: .3em }
+/* For the niceframe package: */
+div.niceframe, div.curlyframe, div.artdecoframe, div.generalframe {
+ padding: 1ex ;
+ margin: 2ex auto ;
+ border-radius: 2ex ;
+}
+
+div.niceframe {
+ border: 6px groove black ;
+}
+
+div.curlyframe {
+ border-left: 3px dotted black ;
+ border-right: 3px dotted black ;
+ border-radius: 6ex ;
+}
+
+div.artdecoframe {
+ border-left: 10px double black ;
+ border-right: 10px double black ;
+ border-radius: 6ex ;
+}
+
+div.generalframe {
+ border: 6px groove black ;
+}
+
+
+
dl {
margin: 1ex 2em 1ex 0em;
line-height: 1.3;
@@ -15179,6 +15354,11 @@
text-align: left ;
}
+.minipage .tnotes {
+ margin: 0pt ;
+ padding: 0pt ;
+}
+
.tnotes dl dt p {margin-bottom:0px;}
.tnoteitemheader {margin-right: 1em;}
@@ -16582,6 +16762,7 @@
% \changes{v0.59}{2018/09/06}{\prog{lwarpmk}: Added \cmds{lwarpmk epstopdf}.}
% \changes{v0.66}{2019/01/27}{\prog{lwarpmk}: Added \optn{ImagesDirectory} and \optn{ImagesName}.}
% \changes{v0.66}{2019/01/30}{\prog{lwarpmk}: Fix for \cmds{cleanlimages}.}%
+% \changes{v0.68}{2019/03/02}{\prog{lwarpmk}: Improved error handling if incomplete compile.}%
%
% The following is only generated if the \optn{lwarpmk} option
% was given to \pkg{lwarp}.
@@ -16597,7 +16778,7 @@
-- Copyright 2016-2018 Brian Dunn
-printversion = "v0.67"
+printversion = "v0.68"
requiredconfversion = "2" -- also at *lwarpmk.conf
function printhelp ()
@@ -17008,6 +17189,16 @@
end -- warnlimages
+function warnlimagesrecompile ()
+-- Warning if must recompile before creating limages:
+ print ("")
+ print ("lwarpmk: ===")
+ print ("lwarpmk: The document must be recompiled before creating the lateximages.")
+ print ("lwarpmk: Enter \"lwarpmk html\" again, then try \"lwarpmk limages\" again.")
+ print ("lwarpmk: ===")
+end --warnlimagesrecompile
+
+
function checklimages ()
--
-- Check <sourcename>.txt to see if need to recompile first.
@@ -17036,12 +17227,14 @@
end
end -- if i~=nil
end -- do
+-- The last line should be |end|end|end|.
+-- If not, the compile must have aborted, and the images are incomplete.
+if ( lwimgpage ~= "end" ) then
+ warnlimagesrecompile()
+ os.exit(1) ;
+end
if ( pagezerowarning ) then
- print ("")
- print ("lwarpmk: ===")
- print ("lwarpmk: The document must be recompiled before creating the lateximages.")
- print ("lwarpmk: Enter \"lwarpmk html\" again, then try \"lwarpmk limages\" again.")
- print ("lwarpmk: ===")
+ warnlimagesrecompile()
os.exit(1) ;
end -- pagezerowarning
end -- checklimages
@@ -17124,6 +17317,8 @@
-- Skip if the page number is 0:
if ( lwimgpage == "0" ) then
pagezerowarning = true
+ -- Skip if the page number is "end":
+ else if ( lwimgpage == "end" ) then
else
-- Skip is this image is hashed and already exists:
local lwimgfullname = imagesdirectory .. dirslash .. lwimgname .. ".svg"
@@ -17146,6 +17341,7 @@
createwindowsimage (lwimgfullname)
end
end -- not hashed or not exists
+ end -- not page "end"
end -- not page 0
end -- not nil
end -- createonelateximage
@@ -19741,7 +19937,7 @@
% \subsection{Regular page footnotes}
% In \HTML\ documents, footnotes are placed at the
% bottom of the web page or the section, depending on \progcode{FootnoteDepth},
-% using the \LaTeX\ box \cs{LWR at footnotes}.
+% using the \LaTeX\ box \cs{LWR at footnotebox}.
% Using this instead of the original \cs{footins} box
% avoids having footnotes be printed by the output routine,
% since footnotes should be printed per \HTML\ page
@@ -19777,8 +19973,30 @@
\newcounter{FootnoteDepth}
\setcounter{FootnoteDepth}{3}
% \end{macrocode}
-
+%
+%
+% \DescribeCounter{footnoteReset}
+% \DescribeDefault{0}
+% If non-zero, the \ctr{footnote} counter
+% is reset to this value each time the footnotes are printed,
+% as controlled by \ctr{FootnoteDepth}.
+% For the \pkg{manyfoot} and \pkg{bigfoot} packages,
+% additional counters such as |footnote<suffix>Reset| will be defined as well.
+% These counters may be set non-zero by the user, and
+% are also set if the \pkg{perpage}'s
+% \cs{MakePerPage} or \cs{MakeSortedPerPage} macros are used for the
+% |footnote| or |footnote<suffix>| counters.
+%
+% (The name is not capitalized because it is made from the counter's name with
+% ``Reset'' appended.)
+%
% \begin{macrocode}
+\newcounter{footnoteReset}
+\setcounter{footnoteReset}{0}
+% \end{macrocode}
+%
+%
+% \begin{macrocode}
\end{warpall}
% \end{macrocode}
@@ -19790,14 +20008,17 @@
% \end{macrocode}
+% \begin{macro}{\LWR at footnotebox}
% Patch \LaTeX\ footnotes to use a new \cs{box} instead of an insert
% for \pkg{lwarp} footnotes.
% This avoids having the original \cs{footins} appear
% at the bottom of a \env{lateximage}, which is on its own new page.
% \begin{macrocode}
-\newbox\LWR at footnotes
+\newbox\LWR at footnotebox
% \end{macrocode}
+% \end{macro}
%
+%
% Much of the following has unneeded print-mode formatting removed.
%
% \begin{macro}{\@makefntext} \marg{text}
@@ -19827,20 +20048,23 @@
% \cs{let}\cs{@footnotetext}\cs{LWR at footnotetext}
% \end{sourcedisplay}
%
-% \begin{macro}{\LWR at footnotetext} \marg{text}
+% \begin{macro}{\LWR@@footnotetext} \marg{text} \marg{footnote box name}
%
+% Factored to allow multiple footnote boxes for \pkg{manyfoot}.
+%
% \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.}
+% \changes{v0.68}{2019/03/04}{Factored for multiple foot boxes.}
%
% \begin{macrocode}
-\long\def\LWR at footnotetext#1{%
+\long\def\LWR@@footnotetext#1#2{%
\LWR at traceinfo{LWR at footnotetext}%
-\global\setbox\LWR at footnotes=\vbox{%
+\global\setbox\csname #2\endcsname=\vbox{%
% \end{macrocode}
% Add to any current footnotes:
% \begin{macrocode}
- \unvbox\LWR at footnotes%
+ \unvbox\csname #2\endcsname%
% \end{macrocode}
% Remember the footnote number for \cs{ref}:
% \begin{macrocode}
@@ -19896,6 +20120,13 @@
% \end{macrocode}
% \end{macro}
+% \begin{macro}{\LWR at footnotetext} \marg{text}
+% \begin{macrocode}
+\long\def\LWR at footnotetext#1{\LWR@@footnotetext{#1}{LWR at footnotebox}}
+% \end{macrocode}
+% \end{macro}
+%
+%
% \begin{macro}{\@footnotetext} \marg{text}
% \begin{macrocode}
\LetLtxMacro\@footnotetext\LWR at footnotetext
@@ -19980,22 +20211,40 @@
%
% \subsection{Printing pending footnotes}
%
-% \begin{macro}{\LWR at printpendingfootnotes}
-% Enclose the footnotes in a class, print, then clear.
+%
+% \begin{macro}{\LWR@@printpendingfootnotes} \marg{footnote counter name}
% \begin{macrocode}
-\newcommand*{\LWR at printpendingfootnotes}{%
-\ifvoid\LWR at footnotes\else
+\newcommand*{\LWR@@printpendingfootnotes}[1]{%
+\expandafter\ifvoid\csname LWR@#1box\endcsname\else
\LWR at forcenewpage
\begin{BlockClass}{footnotes}
\LWR at origmedskip
- \unvbox\LWR at footnotes
- \setbox\LWR at footnotes=\vbox{}
+ \unvbox\csuse{LWR@#1box}
+ \setbox\csuse{LWR@#1box}=\vbox{}
\end{BlockClass}
+ \ifltxcounter{#1Reset}{%
+ \ifnumgreater{\value{#1Reset}}{0}{%
+ \setcounter{#1}{\value{#1Reset}}%
+ \addtocounter{#1}{-1}%
+ }{}%
+ }{}%
\fi
}
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}{\LWR at printpendingfootnotes}
+% Enclose the footnotes in a class, print, then clear.
+% For \pkg{manynotes}, new footnotes may be added via \cs{appto}.
+%
+% \changes{v0.68}{2019/03/04}{Factored for multiple footnote boxes.}
+% \begin{macrocode}
+\newcommand*{\LWR at printpendingfootnotes}{%
+ \LWR@@printpendingfootnotes{footnote}%
+}
+% \end{macrocode}
+% \end{macro}
+%
% \begin{macro}{\LWR at maybeprintpendingfootnotes} \marg{depth}
% Used to print footnotes before sections only if formatting for an \EPUB\ or word processor:
% \changes{v0.43}{2017/11/08}{Added \progcode{FootnoteDepth}.}
@@ -22219,6 +22468,9 @@
% \end{macrocode}
% For \env{lateximage} commands:
% \begin{macrocode}
+\immediate\write\LWR at lateximagesfile{%
+ |end|end|end|%
+}%
\immediate\closeout\LWR at lateximagesfile
}
% \end{macrocode}
@@ -27224,6 +27476,22 @@
% \end{macro}
+% \begin{macro}{\LWR at tabular@warpprintonly} \marg{contents}
+%
+% Only process the contents if producing printed output.
+% Modified inside a \env{tabular} to grab the next token.
+% \changes{v0.68}{2019/03/01}{Added.}
+% \begin{macrocode}
+\newcommand{\LWR at tabular@warpprintonly}[1]{%
+ \ifbool{warpingprint}{#1}{}%
+ \LWR at getmynexttoken%
+}
+% \end{macrocode}
+% \end{macro}
+%
+%
+
+
% \begin{macro}{\LWR at nullifyNoAutoSpacing}
% For \pkg{babel-french}, turn off auto spacing at the start of the tabular,
% then nullify the autospacing commands inside the tabular,
@@ -27327,6 +27595,12 @@
\LetLtxMacro{\\}{\LWR at tabularendofline}%
% \end{macrocode}
%
+% \cs{warpprintonly} inside a \env{tabular} must grab the next token.
+% \changes{v0.68}{2019/03/01}{Fix: \cs{warpprintonly} inside \env{tabular}.}
+% \begin{macrocode}
+\LetLtxMacro\warpprintonly\LWR at tabular@warpprintonly%
+% \end{macrocode}
+%
% The following adjust for \pkg{colortbl}.
% \changes{v0.48}{2018/02/06}{\pkg{colortbl}: Added.}
% \begin{macrocode}
@@ -31532,6 +31806,8 @@
% containing the \PDF\ page number from \filenm{<jobname>_html.pdf}, where the image
% is located, a boolean indicating whether the image is hashed, and
% the filename of the image.
+% The last line has ``end'' in each field, and is used to detect
+% an incomplete compile.
%
%
% \changes{v0.18}{2016/05/18}{Suppress extra space.}
@@ -32629,7 +32905,7 @@
-% \section{Boxes and Minipages}
+% \section{Minipages and Boxes}
%
% A \CSS\ flexbox is used for minipages and parboxes,
% allowing external and internal vertical positioning.
@@ -32743,9 +33019,6 @@
\begin{warpHTML}
% \end{macrocode}
%
-%
-%
-%
% \DescribeBoolean{LWR at minipagethispar}
% Has a minipage been seen this paragraph?
% If true, prevents paragraph tags around horizontal space
@@ -33138,6 +33411,7 @@
\begin{warpall}
\let\fboxBlock\fbox
\end{warpall}
+
\begin{warpHTML}
% \end{macrocode}
% \codehtml
@@ -38201,8 +38475,51 @@
%
%
%
+% \iffalse
+%<*bigfoot>
+% \fi
%
+% \part{lwarp-bigfoot.sty}
+%
+% \section{bigfoot}
+%
+% \DescribePackage{bigfoot}
+% \pkg{bigfoot} is emulated.
+%
+% \changes{v0.68}{2019/03/05}{\pkg{bigfoot}: Added.}
+%
+% \codehtml
+%
+% \begin{macrocode}
+\LWR at ProvidesPackageDrop{bigfoot}[2015/08/30]
+% \end{macrocode}
+%
+% \begin{macrocode}
+\RequirePackage{manyfoot}
+\RequirePackage{perpage}
+
+\def\RestyleFootnote#1#2{}
+\def\FootnoteSpecific#1{}
+\def\DefineFootnoteStack#1{}
+\def\PushFootnoteMark#1{}
+\def\PopFootnoteMark#1{}
+\def\hfootfraction{0.9}
+\def\vtypefraction{0.7}
+\def\FootnoteMinimum{1sp}
+\def\FootnoteMainMinimum{0pt}
+\newcount\bigfoottolerance
+\bigfoottolerance=100
+\providecommand\footnotecarryratio{2}
+% \end{macrocode}
+%
% \iffalse
+%</bigfoot>
+% \fi
+%
+%
+%
+%
+% \iffalse
%<*bigstrut>
% \fi
%
@@ -43143,11 +43460,11 @@
% \begin{macrocode}
\def\V@@footnotetext{%
\LWR at traceinfo{V at footnotetext}%
-\global\setbox\LWR at footnotes=\vbox\bgroup%
+\global\setbox\LWR at footnotebox=\vbox\bgroup%
% \end{macrocode}
% Add to any current footnotes:
% \begin{macrocode}
- \unvbox\LWR at footnotes%
+ \unvbox\LWR at footnotebox%
% \end{macrocode}
% Remember the footnote number for \cs{ref}:
% \begin{macrocode}
@@ -43595,11 +43912,11 @@
% \begin{macrocode}
\def\V@@footnotetext{%
\LWR at traceinfo{V at footnotetext}%
-\global\setbox\LWR at footnotes=\vbox\bgroup%
+\global\setbox\LWR at footnotebox=\vbox\bgroup%
% \end{macrocode}
% Add to any current footnotes:
% \begin{macrocode}
- \unvbox\LWR at footnotes%
+ \unvbox\LWR at footnotebox%
% \end{macrocode}
% Remember the footnote number for \cs{ref}:
% \begin{macrocode}
@@ -44968,7 +45285,6 @@
%
%
%
-%
% \iffalse
%<*fnlineno>
% \fi
@@ -44994,7 +45310,34 @@
%
%
%
+%
% \iffalse
+%<*fnpara>
+% \fi
+%
+% \part{lwarp-fnpara.sty}
+%
+% \section{fnpara}
+%
+% \DescribePackage{fnpara}
+% \pkg{fnpara} is ignored.
+%
+% \changes{v0.68}{2019/02/28}{\pkg{fnpara}: Added.}
+%
+% \codehtml
+%
+% \begin{macrocode}
+\LWR at ProvidesPackageDrop{fnpara}
+% \end{macrocode}
+%
+% \iffalse
+%</fnpara>
+% \fi
+%
+%
+%
+%
+% \iffalse
%<*fnpos>
% \fi
%
@@ -45369,8 +45712,34 @@
%
%
%
+% \iffalse
+%<*footnotebackref>
+% \fi
%
+% \part{lwarp-footnotebackref.sty}
+%
+% \section{footnotebackref}
+%
+% \DescribePackage{footnotebackref}
+% \pkg{footnotebackref} is ignored.
+%
+% \changes{v0.68}{2019/03/01}{\pkg{footnotebackref}: Added.}
+%
+% \codehtml
+%
+% \begin{macrocode}
+\LWR at ProvidesPackageDrop{footnotebackref}[2012/07/01]
+% \end{macrocode}
+%
% \iffalse
+%</footnotebackref>
+% \fi
+%
+%
+%
+%
+%
+% \iffalse
%<*footnotehyper>
% \fi
@@ -47359,8 +47728,14 @@
\typeout{ do not attempt to patch lwarp's version of `hyperref'.}
% \ProvidesPackage{lwarp-#1-#2}
\DeclareOption*{}
-\ProcessOptions\relax
% \end{macrocode}
+% \changes{v0.68}{2019/02/28}{\pkg{hyperref}: Fix for options with braces.}
+% \begin{macrocode}
+% \ProcessOptions\relax
+\let\ds@\@empty% from the original \ProcessOptions
+\edef\@curroptions{}% lwarp modification to \ProcessOptions
+\@process at ptions\relax% from the original \ProcessOptions
+% \end{macrocode}
% \begin{macrocode}
\newcommand*{\hypersetup}[1]{}
@@ -48798,10 +49173,8 @@
% \section{layout}
%
-% \credits{Kent McPherson, Johannes Braams, Hideo Umeki}
-%
% \DescribePackage{layout}
-% \pkg{layout} is emulated.
+% \pkg{layout} is ignored.
%
% \changes{v0.22}{2017/03/01}{\pkg{layout}: Added.}
%
@@ -48823,7 +49196,176 @@
%
%
%
+%
% \iffalse
+%<*layouts>
+% \fi
+%
+% \part{lwarp-layouts.sty}
+%
+% \section{layouts}
+%
+% \DescribePackage{layouts}
+% \pkg{layouts} is ignored.
+%
+% \changes{v0.68}{2019/02/26}{\pkg{layouts}: Added.}
+%
+% \codehtml
+%
+% \begin{macrocode}
+\LWR at ProvidesPackageDrop{layouts}[2009/09/02]
+% \end{macrocode}
+%
+% \begin{macrocode}
+\newif\ifoddpagelayout
+ \oddpagelayouttrue
+\newif\iftwocolumnlayout
+ \twocolumnlayoutfalse
+\newif\ifdrawmarginpars
+ \drawmarginparstrue
+\newif\ifdrawparameters
+ \drawparameterstrue
+\newif\iflistaspara
+ \listasparatrue
+\newif\ifruninhead
+ \runinheadfalse
+\newif\ifprintparameters
+ \printparameterstrue
+\newif\ifdrawdimensions
+ \drawdimensionsfalse
+\newif\ifprintheadings
+ \printheadingstrue
+\newcommand{\testdrawdimensions}{}
+\newcommand{\testprintparameters}{}
+\newcommand{\setlabelfont}[1]{}
+\newcommand{\setparametertextfont}[1]{}
+\newcommand{\setvaluestextsize}[1]{}
+\newcommand{\setlayoutscale}[1]{}
+\newcommand{\setuplayouts}{}
+\newcommand{\printinunitsof}[1]{}
+\newcommand{\prntlen}[1]{}
+\newcommand{\trypaperwidth}[1]{}
+\newcommand{\trypaperheight}[1]{}
+\newcommand{\tryhoffset}[1]{}
+\newcommand{\tryvoffset}[1]{}
+\newcommand{\trytopmargin}[1]{}
+\newcommand{\tryheadheight}[1]{}
+\newcommand{\tryheadsep}[1]{}
+\newcommand{\trytextheight}[1]{}
+\newcommand{\tryfootskip}[1]{}
+\newcommand{\tryoddsidemargin}[1]{}
+\newcommand{\tryevensidemargin}[1]{}
+\newcommand{\trytextwidth}[1]{}
+\newcommand{\trymarginparsep}[1]{}
+\newcommand{\trymarginparwidth}[1]{}
+\newcommand{\trymarginparpush}[1]{}
+\newcommand{\trycolumnsep}[1]{}
+\newcommand{\trycolumnseprule}[1]{}
+\newcommand{\setfootbox}[2]{}
+\newcommand{\currentpage}{}
+\newcommand{\drawpage}{(draw page)}
+\newcommand{\pagediagram}{(page diagram)}
+\newcommand{\pagedesign}{(page design)}
+\newcommand{\pagevalues}{(page values)}
+\newcommand{\trystockwidth}[1]{}
+\newcommand{\trystockheight}[1]{}
+\newcommand{\trytrimedge}[1]{}
+\newcommand{\trytrimtop}[1]{}
+\newcommand{\tryuppermargin}[1]{}
+\newcommand{\tryspinemargin}[1]{}
+\newcommand{\currentstock}{}
+\newcommand{\drawstock}{(draw stock)}
+\newcommand{\stockdiagram}{(stock diagram)}
+\newcommand{\stockdesign}{(stock design)}
+\newcommand{\stockvalues}{(stock values)}
+\newcommand{\tryitemindent}[1]{}
+\newcommand{\trylabelwidth}[1]{}
+\newcommand{\trylabelsep}[1]{}
+\newcommand{\tryleftmargin}[1]{}
+\newcommand{\tryrightmargin}[1]{}
+\newcommand{\trylistparindent}[1]{}
+\newcommand{\trytopsep}[1]{}
+\newcommand{\tryparskip}[1]{}
+\newcommand{\trypartopsep}[1]{}
+\newcommand{\tryparsep}[1]{}
+\newcommand{\tryitemsep}[1]{}
+\newcommand{\currentlist}{}
+\newcommand{\drawlist}{(draw list)}
+\newcommand{\listdiagram}{(list diagram)}
+\newcommand{\listdesign}{(list design)}
+\newcommand{\listvalues}{(list values)}
+\newcommand{\tryfootins}[1]{}
+\newcommand{\tryfootnotesep}[1]{}
+\newcommand{\tryfootnotebaseline}[1]{}
+\newcommand{\tryfootruleheight}[1]{}
+\newcommand{\tryfootrulefrac}[1]{}
+\newcommand{\currentfootnote}{}
+\newcommand{\drawfootnote}{(draw footnote)}
+\newcommand{\footnotediagram}{(footnote diagram)}
+\newcommand{\footnotedesign}{(footnote design)}
+\newcommand{\footnotevalues}{(footnote values)}
+\newcommand{\tryparindent}[1]{}
+\newcommand{\tryparlinewidth}[1]{}
+\newcommand{\tryparbaselineskip}[1]{}
+\newcommand{\currentparagraph}{}
+\newcommand{\drawparagraph}{(draw paragraph)}
+\newcommand{\paragraphdiagram}{(paragraph diagram)}
+\newcommand{\paragraphdesign}{(paragraph design)}
+\newcommand{\paragraphvalues}{(paragraph values)}
+\newcommand{\trybeforeskip}[1]{}
+\newcommand{\tryafterskip}[1]{}
+\newcommand{\tryindent}[1]{}
+\newcommand{\currentheading}{}
+\newcommand{\drawheading}[1]{(draw heading)}
+\newcommand{\headingdiagram}[1]{(heading diagram)}
+\newcommand{\headingdesign}[1]{(heading design)}
+\newcommand{\headingvalues}{(heading values)}
+\newcommand{\trytextfloatsep}[1]{}
+\newcommand{\tryfloatsep}[1]{}
+\newcommand{\tryintextsep}[1]{}
+\newcommand{\trytopfigrule}[1]{}
+\newcommand{\trybotfigrule}[1]{}
+\newcommand{\currentfloat}{}
+\newcommand{\drawfloat}{(draw float)}
+\newcommand{\floatdiagram}{(float diagram)}
+\newcommand{\floatdesign}{(float design)}
+\newcommand{\floatvalues}{(float values)}
+\newcommand{\trytotalnumber}[1]{}
+\newcommand{\trytopnumber}[1]{}
+\newcommand{\trybottomnumber}[1]{}
+\newcommand{\trytopfraction}[1]{}
+\newcommand{\trytextfraction}[1]{}
+\newcommand{\trybottomfraction}[1]{}
+\newcommand{\currentfloatpage}{}
+\newcommand{\drawfloatpage}{(draw floatpage)}
+\newcommand{\floatpagediagram}{(floatpage diagram)}
+\newcommand{\floatpagedesign}{(floatpage design)}
+\newcommand{\floatpagevalues}{(floatpage values)}
+\newcommand{\trytocindent}[1]{}
+\newcommand{\trytocnumwidth}[1]{}
+\newcommand{\trytoclinewidth}[1]{}
+\newcommand{\trytocrmarg}[1]{}
+\newcommand{\trytocpnumwidth}[1]{}
+\newcommand{\trytocdotsep}[1]{}
+\newcommand{\currenttoc}{}
+\newcommand{\drawtoc}{(draw toc)}
+\newcommand{\tocdiagram}{(toc diagram)}
+\newcommand{\tocdesign}{(toc design)}
+\newcommand{\tocvalues}{(toc values)}
+\newcommand{\drawaspread}[8][0]{(a spread)}
+\newcommand{\drawfontframe}[1]{(font frame)}
+\newcommand{\drawfontframelabel}[1]{}
+% \end{macrocode}
+%
+% \iffalse
+%</layouts>
+% \fi
+%
+%
+%
+%
+%
+% \iffalse
%<*leading>
% \fi
%
@@ -49170,7 +49712,7 @@
%
%
% \begin{macrocode}
-\LWR at ProvidesPackagePass{listings}[2015/06/04]
+\LWR at ProvidesPackagePass{listings}[2018/09/02]
% \end{macrocode}
% ^^A For passing optional arguments to an environment, see:
@@ -49408,6 +49950,7 @@
% place right line numbers in a field \cs{VerbatimHTMLWidth} wide.
%
% \changes{v0.60}{2018/09/12}{\pkg{listings}: Fix if inside a list.}
+% \changes{v0.68}{2019/03/05}{\pkg{listings}: Fix for \pkg{listings} v1.7.}
%
% ^^A \DescribeKey[listings]{numbers} Activates line numbers.
% \begin{macrocode}
@@ -49414,8 +49957,8 @@
\lst at Key{numbers}{none}{%
\let\lst at PlaceNumber\@empty
\lstKV at SwitchCases{#1}%
- {none&\\%
- left&\def\lst at PlaceNumber{%
+ {none:\\%
+ left:\def\lst at PlaceNumber{%
% \end{macrocode}
% For now, \pkg{lwarp} places left line numbers inline.
% Ideally the entire line would be moved to the right, but
@@ -49426,7 +49969,7 @@
\lst at numberstyle{\thelstnumber}\kern\lst at numbersep%
% }
}\\%
- right&\def\lst at PlaceNumber{\LWR at origrlap{\LWR at orignormalfont
+ right:\def\lst at PlaceNumber{\LWR at origrlap{\LWR at orignormalfont
\kern 6in \kern\lst at numbersep
\lst at numberstyle{\thelstnumber}}}%
}{\PackageError{Listings}{Numbers #1 unknown}\@ehc}}
@@ -49540,6 +50083,14 @@
% {\texttt{http://tex.stackexchange.com/questions/43006/\\why-is-input-not-expandable}}
%
%
+% Used to detect more than one of \cs{endhead} and \cs{endfirsthead} in use
+% for \HTML\ at the same time.
+% \begin{macrocode}
+\newbool{LWR at longtable@havehead}
+\boolfalse{LWR at longtable@havehead}
+% \end{macrocode}
+%
+%
% \begin{environment}{longtable} * \oarg{horizalignment} \marg{colspec}
% Emulates the \env{longtable} environment.
%
@@ -49547,7 +50098,7 @@
% The unstarred version steps the counter once at the beginning, but
% not at each caption.
%
-% Options [c], [l], and [r] are thrown away.
+% Options [c], [l], and [r] are ignored.
% \begin{macrocode}
\newenvironment{longtable*}[2][]{%
\LWR at floatbegin{table}%
@@ -49556,6 +50107,7 @@
\caption at setoptions{@longtable}%
\caption at LT@setup%
\booltrue{LWR at starredlongtable}%
+\boolfalse{LWR at longtable@havehead}%
\let\captionlistentry\LWR at LTcaptionlistentry%
\tabular{#2}
}
@@ -49568,6 +50120,7 @@
\caption at setoptions{@longtable}%
\caption at LT@setup%
\refstepcounter{\LTcaptype}%
+\boolfalse{LWR at longtable@havehead}%
\let\captionlistentry\LWR at LTcaptionlistentry%
\tabular{#2}
}
@@ -49578,10 +50131,63 @@
% Provided for compatibility, but ignored:
% \begin{macrocode}
\newcounter{LTchunksize}
-\def\endhead{\LWR at tabularendofline}% throws away options //[dim] and //*
-\def\endfirsthead{\LWR at tabularendofline}
-\def\endfoot{\LWR at tabularendofline}
-\def\endlastfoot{\LWR at tabularendofline}
+% \end{macrocode}
+%
+% Error for heads which should have been in \cs{warpprintonly}:
+% \begin{macrocode}
+\newcommand*{\LWR at longtable@headerror}{%
+ \PackageError{lwarp}
+ {For longtable:\MessageBreak
+ 1: Keep either one of an \protect\endhead\space or
+ \protect\endfirsthead\space\MessageBreak
+ \space phrase as-is, to be used by both print and HTML.\MessageBreak
+ 2: Place any other \protect\end... phrases inside a\MessageBreak
+ \space\protect\warpprintonly\space macro,
+ to be ignored by HTML.\MessageBreak
+ 3: Add a final footer for HTML at the end of the table\MessageBreak
+ \space inside a \protect\warpHTMLonly\space macro.
+ This can be\MessageBreak
+ \space a copy of an \protect\endfoot\space or
+ \protect\endfirstfoot\space phrase,\MessageBreak
+ \space but without the actual \protect\endfoot\space
+ or \protect\endfirstfoot\MessageBreak
+ \space macros. If using threeparttablex, add\MessageBreak
+ \space \protect\insertTableNotes\space here,
+ optionally with\MessageBreak
+ \space \protect\UseMinipageWidths\space in front.\MessageBreak
+ See the lwarp documentation regarding longtables\MessageBreak
+ and threeparttablex}
+ {See the lwarp documentation regading longtables and threeparttablex.}
+}
+% \end{macrocode}
+%
+% Error if more than one of \cs{endhead} or \cs{endfirsthead} is
+% outside of \env{warpprintonly}.
+% \changes{v0.68}{2019/03/01}{\pkg{longtable}: Improved error handling.}
+% \begin{macrocode}
+\newcommand*{\LWR at longtable@maybeheaderror}{%
+\ifbool{LWR at longtable@havehead}%
+ {\LWR at longtable@headerror}%
+ {%
+ \booltrue{LWR at longtable@havehead}
+ \LWR at tabularendofline% throws away options //[dim] and //*
+ }%
+}
+% \end{macrocode}
+%
+% Error if more than one of these is outside of \env{warpprint}.
+% \begin{macrocode}
+\def\endhead{\LWR at longtable@maybeheaderror}
+\def\endfirsthead{\LWR at longtable@maybeheaderror}
+% \end{macrocode}
+%
+% Error if ANY of these is outside of \env{warpprint}.
+% \begin{macrocode}
+\def\endfoot{\LWR at longtable@headerror}
+\def\endlastfoot{\LWR at longtable@headerror}
+% \end{macrocode}
+%
+% \begin{macrocode}
\newcommand\tabularnewline{\LWR at tabularendofline}
\newcommand{\setlongtables}{}% Obsolete command, does nothing.
\newlength{\LTleft}
@@ -50106,9 +50712,125 @@
%
%
%
+% \iffalse
+%<*manyfoot>
+% \fi
%
+% \part{lwarp-manyfoot.sty}
%
+% \section{manyfoot}
+%
+% \DescribePackage{manyfoot}
+% \pkg{manyfoot} is emulated.
+%
+% \limitsmanyfootbigfoot
+%
+% \pkg{lwarp}'s emulation of \pkg{bigfoot} uses \pkg{manyfoot}, so
+% some of the \pkg{bigfoot} enhancements are included here.
+%
+% The \pkg{bigfoot} ``default'' footnote is ignored, using the \pkg{lwarp}
+% version instead.
+%
+% \changes{v0.68}{2019/03/03}{\pkg{manyfoot}: Added.}
+%
+% \codehtml
+%
+% \begin{macrocode}
+\LWR at ProvidesPackageDrop{manyfoot}[2005/09/11]
+% \end{macrocode}
+%
+% \begin{macrocode}
+\RequirePackage{nccfoots}
+
+\newcommand{\extrafootnoterule}{}
+
+\let\defaultfootnoterule\footnoterule
+
+\newcommand*{\SelectFootnoteRule}[2][0]{}
+
+\newcommand{\footnoterulepriority}{1}
+
+\newcommand{\SetFootnoteHook}[1]{}
+\@onlypreamble\SetFootnoteHook
+
+\newcommand{\SplitNote}{}
+
+\newcommand*\ExtraParaSkip[1]{}
+
+\newcommand*{\newfootnote}[2][plain]{%
+ \ifstrequal{#2}{default}{}{% not "default"
+ \expandafter\newbox\csname LWR at footnote#2box\endcsname%
+ \appto{\LWR at printpendingfootnotes}{%
+ \LWR@@printpendingfootnotes{footnote#2}%
+ }
+ \long\csdef{Footnotetext#2}##1##2{%
+ \NCC at makefnmark{##1}%
+ \LWR@@footnotetext{##2}{LWR at footnote#2box}%
+ }%
+ \long\csdef{Footnotetext#2+}##1##2{%
+ \NCC at makefnmark{##1}%
+ \LWR@@footnotetext{##2}{LWR at footnote#2box}%
+ }%
+ }% not "default"
+}
+\@onlypreamble\newfootnote
+
+\newcommand*{\DeclareNewFootnote}[2][plain]{%
+ \@ifnextchar[%
+ {\LWR at manyfoot@declare{#1}{#2}}%
+ {\LWR at manyfoot@declare{#1}{#2}[arabic]}%
+}
+
+\def\LWR at manyfoot@declare#1#2[#3]{%
+\ifstrequal{#2}{default}{}{% not "default"
+ \newfootnote[#1]{#2}%
+ \newcounter{footnote#2}%
+ \newcounter{footnote#2Reset}%
+ \setcounter{footnote#2Reset}{0}%
+ \csdef{thefootnote#2}{%
+ \expandafter\noexpand\csname @#3\endcsname%
+ \expandafter\noexpand\csname c at footnote#2\endcsname%
+ }%
+% \end{macrocode}
+% For \pkg{bigfoot}, the footnote commands may be appended with one or two
+% plusses or one or two minuses, which are ignored in \HTML.
+% \begin{macrocode}
+ \expandafter\NewDocumentCommand\csname footnote#2\endcsname{t{+}t{+}t{-}t{-}}{%
+ \stepcounter{footnote#2}%
+ \protected at xdef\@thefnmark{\csname thefootnote#2\endcsname}%
+ \@footnotemark%
+ \csuse{Footnotetext#2}{\@thefnmark}% absorbs the footnote contents
+ }%
+ \csdef{footnotemark#2}{%
+ \stepcounter{footnote#2}%
+ \protected at xdef\@thefnmark{\csname thefootnote#2\endcsname}%
+ \@footnotemark%
+ }%
+ \expandafter\NewDocumentCommand\csname footnotetext#2\endcsname{t{+}t{+}t{-}t{-}}{%
+ \protected at xdef\@thefnmark{\csname thefootnote#2\endcsname}%
+ \csuse{Footnotetext#2}{\@thefnmark}% absorbs the footnote contents
+ }%
+ \csdef{Footnotemark#2}{%
+ \Footnotemark%
+ }%
+ \csdef{Footnote#2}##1{%
+ \Footnotemark{##1}%
+ \csuse{Footnotetext#2}{##1}%
+ }%
+}% not "default"
+}
+\@onlypreamble\DeclareNewFootnote
+% \end{macrocode}
+%
% \iffalse
+%</manyfoot>
+% \fi
+%
+%
+%
+%
+%
+% \iffalse
%<*marginal>
% \fi
%
@@ -52330,7 +53052,49 @@
%
%
%
+%
% \iffalse
+%<*niceframe>
+% \fi
+%
+% \part{lwarp-niceframe.sty}
+%
+% \section{niceframe}
+%
+% \DescribePackage{niceframe}
+% \pkg{niceframe} is emulated.
+%
+% \changes{v0.68}{2019/02/28}{\pkg{niceframe}: Added.}
+%
+% \codehtml
+%
+% \begin{macrocode}
+\LWR at ProvidesPackageDrop{niceframe}% the original date is in yyyy/dd/mm format
+% \end{macrocode}
+%
+% \begin{macrocode}
+\newcommand{\LWR at niceframe}[3]{
+ \setlength{\LWR at templengthone}{#1}
+ \begin{BlockClass}[max-width:\LWR at printlength{\LWR at templengthone}]{#3}
+ #2
+ \end{BlockClass}
+}
+
+\newcommand{\niceframe}[2][\textwidth]{\LWR at niceframe{#1}{#2}{niceframe}}
+\newcommand{\curlyframe}[2][\textwidth]{\LWR at niceframe{#1}{#2}{curlyframe}}
+\newcommand{\artdecoframe}[2][\textwidth]{\LWR at niceframe{#1}{#2}{artdecoframe}}
+
+\newcommand{\generalframe}[9]{\LWR at niceframe{\textwidth}{#9}{generalframe}}
+% \end{macrocode}
+%
+% \iffalse
+%</niceframe>
+% \fi
+%
+%
+%
+%
+% \iffalse
%<*nomencl>
% \fi
%
@@ -53754,6 +54518,7 @@
%
%
%
+%
% \iffalse
%<*pdflscape>
% \fi
@@ -54154,7 +54919,90 @@
%
%
%
+%
+%
% \iffalse
+%<*perpage>
+% \fi
+%
+% \part{lwarp-perpage.sty}
+%
+% \section{perpage}
+%
+% \credits{David Kastrup}
+%
+% \DescribePackage{perpage}
+% \pkg{perpage} is mostly ignored, but support is added for footnote counters.
+%
+% There is no page number in \HTML, so most counters are not reset.
+% If the document redefines \cs{the<countername>} to include \cs{theperpage},
+% it is necessary to place that redefininition inside a \env{warpprint}
+% environment to avoid modifying the \HTML\ defintions.
+%
+% \cs{AddAbsoluteCounter} must not be inside \env{warpprint}, as the
+% counter must be added for \HTML\ also, although it is not incremented.
+%
+% \limitsperpage
+%
+% \changes{v0.68}{2019/02/26}{\pkg{perpage}: Added.}
+%
+% \codehtml
+%
+% \begin{macrocode}
+\LWR at ProvidesPackageDrop{perpage}[2014/10/25]
+% \end{macrocode}
+%
+% \begin{macrocode}
+\newcommand\AddAbsoluteCounter[1]
+{
+ \@ifundefined{c at abs#1}{%
+ \expandafter\newcount\csname c at abs#1\endcsname
+ \global\value{abs#1}\@ne
+% \global\expandafter\let\csname cl at abs#1\endcsname\@empty
+ \expandafter\xdef\csname theabs#1\endcsname{%
+% \noexpand\number \csname c at abs#1\endcsname
+ }%
+% \global\@namedef{c at pabs@#1}{\pp at cl@begin
+% \stepcounter{abs#1}%
+% \pp at cl@end}%
+% \@addtoreset{pabs@#1}{#1}
+ }
+ {}
+}
+
+\AddAbsoluteCounter{page}
+\def\theabspage{1}
+
+\newcommand*\MakePerPage[2][1]{%
+ \ifltxcounter{#2Reset}{%
+ \setcounter{#2Reset}{#1}%
+ }{
+
+}%
+}
+
+\newcommand*\MakeSorted[1]{}
+
+\newcommand*\MakeSortedPerPage[2][1]{%
+ \ifltxcounter{#2Reset}{%
+ \setcounter{#2Reset}{#1}%
+ }{
+}%
+}
+
+\newcommand*{\theperpage}{1}
+% \end{macrocode}
+%
+% \iffalse
+%</perpage>
+% \fi
+%
+%
+%
+%
+%
+%
+% \iffalse
%<*pfnote>
% \fi
%
@@ -56661,8 +57509,37 @@
%
%
%
+% \iffalse
+%<*showtags>
+% \fi
%
+% \part{lwarp-showtags.sty}
+%
+% \section{showtags}
+%
+% \DescribePackage{showtags}
+% \pkg{showtags} is ignored.
+%
+% \changes{v0.68}{2019/02/26}{\pkg{showtags}: Added.}
+%
+% \codehtml
+%
+% \begin{macrocode}
+\LWR at ProvidesPackageDrop{showtags}% no version is given
+% \end{macrocode}
+%
+% \begin{macrocode}
+\newcommand{\thecitetag}[1]{}
+% \end{macrocode}
+%
% \iffalse
+%</showtags>
+% \fi
+%
+%
+%
+%
+% \iffalse
%<*sidecap>
% \fi
@@ -58219,7 +59096,39 @@
%
%
%
+%
% \iffalse
+%<*tablefootnote>
+% \fi
+%
+% \part{lwarp-tablefootnote.sty}
+%
+% \section{tablefootnote}
+%
+% \DescribePackage{tablefootnote}
+% \pkg{tablefootnote} is ignored.
+%
+% \changes{v0.68}{2018/03/01}{\pkg{tablefootnote}: Added.}
+%
+% \codehtml
+%
+% \begin{macrocode}
+\LWR at ProvidesPackageDrop{tablefootnote}[2014/01/26]
+% \end{macrocode}
+%
+% This works because in \HTML\ tables are no longer floats.
+% \begin{macrocode}
+\LetLtxMacro\tablefootnote\footnote
+% \end{macrocode}
+%
+% \iffalse
+%</tablefootnote>
+% \fi
+%
+%
+%
+%
+% \iffalse
%<*tabls>
% \fi
%
@@ -59140,8 +60049,11 @@
% \begin{noindenvironment}{threeparttable} \oarg{alignment}
% To emulate threeparttable:
+% \changes{v0.68}{2019/03/01}{\pkg{threeparttable}: Fix for caption type.}
% \begin{macrocode}
-\newenvironment*{threeparttable}[1][b]{}{}
+\newenvironment*{threeparttable}[1][b]
+ {\def\@captype{table}}
+ {}
% \end{macrocode}
% \end{noindenvironment}
@@ -59180,7 +60092,57 @@
%
%
%
+%
% \iffalse
+%<*threeparttablex>
+% \fi
+%
+% \part{lwarp-threeparttablex.sty}
+%
+% \section{threeparttablex}
+%
+% \DescribePackage{threeparttablex}
+% \pkg{threeparttablex} is patched for use by \pkg{lwarp}.
+%
+% \limitsthreeparttablex
+%
+% \changes{v0.68}{2019/03/01}{\pkg{threeparttablex}: Added.}
+%
+% \codehtml
+%
+% \begin{macrocode}
+\LWR at ProvidesPackagePass{threeparttablex}[2013/07/23]
+% \end{macrocode}
+%
+% The width is guessed depending on the number of columns, then
+% limited to a min/max.
+% \begin{macrocode}
+\renewcommand\insertTableNotes{%
+ \setlength{\LWR at templengthone}{.375in*\value{LWR at tabletotalLaTeXcols}}%
+ \setlength{\LWR at templengthone}{\minof{\textwidth}{\LWR at templengthone}}%
+ \setlength{\LWR at templengthone}{\maxof{2.5in}{\LWR at templengthone}}%
+ \multicolumn{\value{LWR at tabletotalLaTeXcols}}{c}{%
+ \parbox{\LWR at templengthone}{%
+ \begin{tablenotes}[\TPTL at optarg]%
+ \TPTL at font%
+ \TPTL at body%
+ \end{tablenotes}%
+ }%
+ }%
+}
+
+\renewcommand\TPTL at tnotex[2]{\tnote{\nameref{#2}}}
+% \end{macrocode}
+%
+% \iffalse
+%</threeparttablex>
+% \fi
+%
+%
+%
+%
+%
+% \iffalse
%<*thumb>
% \fi
%
@@ -61236,9 +62198,9 @@
% \subsection{Combining \cs{newfloat}, \cs{trivfloat}, and \pkg{algorithmicx}}
% \label{sec:combiningfloats}
-% \gindex{newfloat=\pkg{newfloat}>with \pkg{trivfloat}, \pkg{algorithmic}}
-% \gindex{trivfloat=\pkg{trivfloat}>with \pkg{newfloat}, \pkg{algorithmic}}
-% \gindex{algorithmic=\pkg{algorithmic}>with \pkg{newfloat}, \pkg{trivfloat}}
+% \gindex{newfloat=\pkg{newfloat}>with \pkg{trivfloat}, \pkg{algorithmicx}}
+% \gindex{trivfloat=\pkg{trivfloat}>with \pkg{newfloat}, \pkg{algorithmicx}}
+% \gindex{algorithmicx=\pkg{algorithmicx}>with \pkg{newfloat}, \pkg{trivfloat}}
%
% \codeall
% \begin{macrocode}
Modified: trunk/Master/texmf-dist/source/latex/lwarp/lwarp.ins
===================================================================
--- trunk/Master/texmf-dist/source/latex/lwarp/lwarp.ins 2019-03-06 22:24:12 UTC (rev 50265)
+++ trunk/Master/texmf-dist/source/latex/lwarp/lwarp.ins 2019-03-06 22:24:57 UTC (rev 50266)
@@ -71,6 +71,7 @@
\file{lwarp-biblatex.sty}{\from{lwarp.dtx}{biblatex}}
\file{lwarp-bibunits.sty}{\from{lwarp.dtx}{bibunits}}
\file{lwarp-bigdelim.sty}{\from{lwarp.dtx}{bigdelim}}
+\file{lwarp-bigfoot.sty}{\from{lwarp.dtx}{bigfoot}}
\file{lwarp-bigstrut.sty}{\from{lwarp.dtx}{bigstrut}}
\file{lwarp-bitpattern.sty}{\from{lwarp.dtx}{bitpattern}}
\file{lwarp-blowup.sty}{\from{lwarp.dtx}{blowup}}
@@ -170,6 +171,7 @@
\file{lwarp-fontawesome5.sty}{\from{lwarp.dtx}{fontawesome5}}
\file{lwarp-footmisc.sty}{\from{lwarp.dtx}{footmisc}}
\file{lwarp-footnote.sty}{\from{lwarp.dtx}{footnote}}
+\file{lwarp-footnotebackref.sty}{\from{lwarp.dtx}{footnotebackref}}
\file{lwarp-footnotehyper.sty}{\from{lwarp.dtx}{footnotehyper}}
\file{lwarp-footnoterange.sty}{\from{lwarp.dtx}{footnoterange}}
\file{lwarp-fontenc.sty}{\from{lwarp.dtx}{fontenc}}
@@ -210,6 +212,7 @@
\file{lwarp-keyfloat.sty}{\from{lwarp.dtx}{keyfloat}}
\file{lwarp-layaureo.sty}{\from{lwarp.dtx}{layaureo}}
\file{lwarp-layout.sty}{\from{lwarp.dtx}{layout}}
+\file{lwarp-layouts.sty}{\from{lwarp.dtx}{layouts}}
\file{lwarp-leading.sty}{\from{lwarp.dtx}{leading}}
\file{lwarp-letterspace.sty}{\from{lwarp.dtx}{letterspace}}
\file{lwarp-lettrine.sty}{\from{lwarp.dtx}{lettrine}}
@@ -229,6 +232,7 @@
\file{lwarp-luatodonotes.sty}{\from{lwarp.dtx}{luatodonotes}}
\file{lwarp-magaz.sty}{\from{lwarp.dtx}{magaz}}
\file{lwarp-makeidx.sty}{\from{lwarp.dtx}{makeidx}}
+\file{lwarp-manyfoot.sty}{\from{lwarp.dtx}{manyfoot}}
\file{lwarp-marginal.sty}{\from{lwarp.dtx}{marginal}}
\file{lwarp-marginfit.sty}{\from{lwarp.dtx}{marginfit}}
\file{lwarp-marginfix.sty}{\from{lwarp.dtx}{marginfix}}
@@ -258,6 +262,7 @@
\file{lwarp-needspace.sty}{\from{lwarp.dtx}{needspace}}
\file{lwarp-nextpage.sty}{\from{lwarp.dtx}{nextpage}}
\file{lwarp-nicefrac.sty}{\from{lwarp.dtx}{nicefrac}}
+\file{lwarp-niceframe.sty}{\from{lwarp.dtx}{niceframe}}
\file{lwarp-nomencl.sty}{\from{lwarp.dtx}{nomencl}}
\file{lwarp-nonfloat.sty}{\from{lwarp.dtx}{nonfloat}}
\file{lwarp-nonumonpart.sty}{\from{lwarp.dtx}{nonumonpart}}
@@ -284,6 +289,7 @@
\file{lwarp-pdfsync.sty}{\from{lwarp.dtx}{pdfsync}}
\file{lwarp-pdftricks.sty}{\from{lwarp.dtx}{pdftricks}}
\file{lwarp-pdfx.sty}{\from{lwarp.dtx}{pdfx}}
+\file{lwarp-perpage.sty}{\from{lwarp.dtx}{perpage}}
\file{lwarp-pfnote.sty}{\from{lwarp.dtx}{pfnote}}
\file{lwarp-phfqit.sty}{\from{lwarp.dtx}{phfqit}}
\file{lwarp-pifont.sty}{\from{lwarp.dtx}{pifont}}
@@ -336,6 +342,7 @@
\file{lwarp-shadow.sty}{\from{lwarp.dtx}{shadow}}
\file{lwarp-showidx.sty}{\from{lwarp.dtx}{idx}}
\file{lwarp-showkeys.sty}{\from{lwarp.dtx}{showkeys}}
+\file{lwarp-showtags.sty}{\from{lwarp.dtx}{showtags}}
\file{lwarp-sidecap.sty}{\from{lwarp.dtx}{sidecap}}
\file{lwarp-sidenotes.sty}{\from{lwarp.dtx}{sidenotes}}
\file{lwarp-SIunits.sty}{\from{lwarp.dtx}{SIunits}}
@@ -355,6 +362,7 @@
\file{lwarp-supertabular.sty}{\from{lwarp.dtx}{supertabular}}
\file{lwarp-syntonly.sty}{\from{lwarp.dtx}{syntonly}}
\file{lwarp-tabls.sty}{\from{lwarp.dtx}{tabls}}
+\file{lwarp-tablefootnote.sty}{\from{lwarp.dtx}{tablefootnote}}
\file{lwarp-tabularx.sty}{\from{lwarp.dtx}{tabularx}}
\file{lwarp-tabulary.sty}{\from{lwarp.dtx}{tabulary}}
\file{lwarp-tascmac.sty}{\from{lwarp.dtx}{tascmac}}
@@ -366,6 +374,7 @@
\file{lwarp-thinsp.sty}{\from{lwarp.dtx}{thinsp}}
\file{lwarp-threadcol.sty}{\from{lwarp.dtx}{threadcol}}
\file{lwarp-threeparttable.sty}{\from{lwarp.dtx}{threeparttable}}
+\file{lwarp-threeparttablex.sty}{\from{lwarp.dtx}{threeparttablex}}
\file{lwarp-thumb.sty}{\from{lwarp.dtx}{thumb}}
\file{lwarp-thumbs.sty}{\from{lwarp.dtx}{thumbs}}
\file{lwarp-tikz.sty}{\from{lwarp.dtx}{tikz}}
Added: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-bigfoot.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-bigfoot.sty (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-bigfoot.sty 2019-03-06 22:24:57 UTC (rev 50266)
@@ -0,0 +1,36 @@
+%%
+%% This is file `lwarp-bigfoot.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx (with options: `bigfoot')
+%% This is a generated file.
+%% Copyright 2016-2018 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{bigfoot}[2015/08/30]
+\RequirePackage{manyfoot}
+\RequirePackage{perpage}
+
+\def\RestyleFootnote#1#2{}
+\def\FootnoteSpecific#1{}
+\def\DefineFootnoteStack#1{}
+\def\PushFootnoteMark#1{}
+\def\PopFootnoteMark#1{}
+\def\hfootfraction{0.9}
+\def\vtypefraction{0.7}
+\def\FootnoteMinimum{1sp}
+\def\FootnoteMainMinimum{0pt}
+\newcount\bigfoottolerance
+\bigfoottolerance=100
+\providecommand\footnotecarryratio{2}
+\endinput
+%%
+%% End of file `lwarp-bigfoot.sty'.
Property changes on: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-bigfoot.sty
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fancybox.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fancybox.sty 2019-03-06 22:24:12 UTC (rev 50265)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fancybox.sty 2019-03-06 22:24:57 UTC (rev 50266)
@@ -24,8 +24,8 @@
}
\def\V@@footnotetext{%
\LWR at traceinfo{V at footnotetext}%
-\global\setbox\LWR at footnotes=\vbox\bgroup%
- \unvbox\LWR at footnotes%
+\global\setbox\LWR at footnotebox=\vbox\bgroup%
+ \unvbox\LWR at footnotebox%
\protected at edef\@currentlabel{%
\csname p at footnote\endcsname\@thefnmark%
}% @currentlabel
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyvrb.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyvrb.sty 2019-03-06 22:24:12 UTC (rev 50265)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyvrb.sty 2019-03-06 22:24:57 UTC (rev 50266)
@@ -28,8 +28,8 @@
}
\def\V@@footnotetext{%
\LWR at traceinfo{V at footnotetext}%
-\global\setbox\LWR at footnotes=\vbox\bgroup%
- \unvbox\LWR at footnotes%
+\global\setbox\LWR at footnotebox=\vbox\bgroup%
+ \unvbox\LWR at footnotebox%
\protected at edef\@currentlabel{%
\csname p at footnote\endcsname\@thefnmark%
}% @currentlabel
Added: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-footnotebackref.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-footnotebackref.sty (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-footnotebackref.sty 2019-03-06 22:24:57 UTC (rev 50266)
@@ -0,0 +1,21 @@
+%%
+%% This is file `lwarp-footnotebackref.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx (with options: `footnotebackref')
+%% This is a generated file.
+%% Copyright 2016-2018 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{footnotebackref}[2012/07/01]
+\endinput
+%%
+%% End of file `lwarp-footnotebackref.sty'.
Property changes on: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-footnotebackref.sty
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperref.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperref.sty 2019-03-06 22:24:12 UTC (rev 50265)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperref.sty 2019-03-06 22:24:57 UTC (rev 50266)
@@ -22,7 +22,9 @@
\typeout{ Are not using ProvidesPackage, so that other packages}
\typeout{ do not attempt to patch lwarp's version of `hyperref'.}
\DeclareOption*{}
-\ProcessOptions\relax
+\let\ds@\@empty% from the original \ProcessOptions
+\edef\@curroptions{}% lwarp modification to \ProcessOptions
+\@process at ptions\relax% from the original \ProcessOptions
\newcommand*{\hypersetup}[1]{}
\newcommand*{\hyperbaseurl}[1]{}
Added: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-layouts.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-layouts.sty (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-layouts.sty 2019-03-06 22:24:57 UTC (rev 50266)
@@ -0,0 +1,159 @@
+%%
+%% This is file `lwarp-layouts.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx (with options: `layouts')
+%% This is a generated file.
+%% Copyright 2016-2018 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{layouts}[2009/09/02]
+\newif\ifoddpagelayout
+ \oddpagelayouttrue
+\newif\iftwocolumnlayout
+ \twocolumnlayoutfalse
+\newif\ifdrawmarginpars
+ \drawmarginparstrue
+\newif\ifdrawparameters
+ \drawparameterstrue
+\newif\iflistaspara
+ \listasparatrue
+\newif\ifruninhead
+ \runinheadfalse
+\newif\ifprintparameters
+ \printparameterstrue
+\newif\ifdrawdimensions
+ \drawdimensionsfalse
+\newif\ifprintheadings
+ \printheadingstrue
+\newcommand{\testdrawdimensions}{}
+\newcommand{\testprintparameters}{}
+\newcommand{\setlabelfont}[1]{}
+\newcommand{\setparametertextfont}[1]{}
+\newcommand{\setvaluestextsize}[1]{}
+\newcommand{\setlayoutscale}[1]{}
+\newcommand{\setuplayouts}{}
+\newcommand{\printinunitsof}[1]{}
+\newcommand{\prntlen}[1]{}
+\newcommand{\trypaperwidth}[1]{}
+\newcommand{\trypaperheight}[1]{}
+\newcommand{\tryhoffset}[1]{}
+\newcommand{\tryvoffset}[1]{}
+\newcommand{\trytopmargin}[1]{}
+\newcommand{\tryheadheight}[1]{}
+\newcommand{\tryheadsep}[1]{}
+\newcommand{\trytextheight}[1]{}
+\newcommand{\tryfootskip}[1]{}
+\newcommand{\tryoddsidemargin}[1]{}
+\newcommand{\tryevensidemargin}[1]{}
+\newcommand{\trytextwidth}[1]{}
+\newcommand{\trymarginparsep}[1]{}
+\newcommand{\trymarginparwidth}[1]{}
+\newcommand{\trymarginparpush}[1]{}
+\newcommand{\trycolumnsep}[1]{}
+\newcommand{\trycolumnseprule}[1]{}
+\newcommand{\setfootbox}[2]{}
+\newcommand{\currentpage}{}
+\newcommand{\drawpage}{(draw page)}
+\newcommand{\pagediagram}{(page diagram)}
+\newcommand{\pagedesign}{(page design)}
+\newcommand{\pagevalues}{(page values)}
+\newcommand{\trystockwidth}[1]{}
+\newcommand{\trystockheight}[1]{}
+\newcommand{\trytrimedge}[1]{}
+\newcommand{\trytrimtop}[1]{}
+\newcommand{\tryuppermargin}[1]{}
+\newcommand{\tryspinemargin}[1]{}
+\newcommand{\currentstock}{}
+\newcommand{\drawstock}{(draw stock)}
+\newcommand{\stockdiagram}{(stock diagram)}
+\newcommand{\stockdesign}{(stock design)}
+\newcommand{\stockvalues}{(stock values)}
+\newcommand{\tryitemindent}[1]{}
+\newcommand{\trylabelwidth}[1]{}
+\newcommand{\trylabelsep}[1]{}
+\newcommand{\tryleftmargin}[1]{}
+\newcommand{\tryrightmargin}[1]{}
+\newcommand{\trylistparindent}[1]{}
+\newcommand{\trytopsep}[1]{}
+\newcommand{\tryparskip}[1]{}
+\newcommand{\trypartopsep}[1]{}
+\newcommand{\tryparsep}[1]{}
+\newcommand{\tryitemsep}[1]{}
+\newcommand{\currentlist}{}
+\newcommand{\drawlist}{(draw list)}
+\newcommand{\listdiagram}{(list diagram)}
+\newcommand{\listdesign}{(list design)}
+\newcommand{\listvalues}{(list values)}
+\newcommand{\tryfootins}[1]{}
+\newcommand{\tryfootnotesep}[1]{}
+\newcommand{\tryfootnotebaseline}[1]{}
+\newcommand{\tryfootruleheight}[1]{}
+\newcommand{\tryfootrulefrac}[1]{}
+\newcommand{\currentfootnote}{}
+\newcommand{\drawfootnote}{(draw footnote)}
+\newcommand{\footnotediagram}{(footnote diagram)}
+\newcommand{\footnotedesign}{(footnote design)}
+\newcommand{\footnotevalues}{(footnote values)}
+\newcommand{\tryparindent}[1]{}
+\newcommand{\tryparlinewidth}[1]{}
+\newcommand{\tryparbaselineskip}[1]{}
+\newcommand{\currentparagraph}{}
+\newcommand{\drawparagraph}{(draw paragraph)}
+\newcommand{\paragraphdiagram}{(paragraph diagram)}
+\newcommand{\paragraphdesign}{(paragraph design)}
+\newcommand{\paragraphvalues}{(paragraph values)}
+\newcommand{\trybeforeskip}[1]{}
+\newcommand{\tryafterskip}[1]{}
+\newcommand{\tryindent}[1]{}
+\newcommand{\currentheading}{}
+\newcommand{\drawheading}[1]{(draw heading)}
+\newcommand{\headingdiagram}[1]{(heading diagram)}
+\newcommand{\headingdesign}[1]{(heading design)}
+\newcommand{\headingvalues}{(heading values)}
+\newcommand{\trytextfloatsep}[1]{}
+\newcommand{\tryfloatsep}[1]{}
+\newcommand{\tryintextsep}[1]{}
+\newcommand{\trytopfigrule}[1]{}
+\newcommand{\trybotfigrule}[1]{}
+\newcommand{\currentfloat}{}
+\newcommand{\drawfloat}{(draw float)}
+\newcommand{\floatdiagram}{(float diagram)}
+\newcommand{\floatdesign}{(float design)}
+\newcommand{\floatvalues}{(float values)}
+\newcommand{\trytotalnumber}[1]{}
+\newcommand{\trytopnumber}[1]{}
+\newcommand{\trybottomnumber}[1]{}
+\newcommand{\trytopfraction}[1]{}
+\newcommand{\trytextfraction}[1]{}
+\newcommand{\trybottomfraction}[1]{}
+\newcommand{\currentfloatpage}{}
+\newcommand{\drawfloatpage}{(draw floatpage)}
+\newcommand{\floatpagediagram}{(floatpage diagram)}
+\newcommand{\floatpagedesign}{(floatpage design)}
+\newcommand{\floatpagevalues}{(floatpage values)}
+\newcommand{\trytocindent}[1]{}
+\newcommand{\trytocnumwidth}[1]{}
+\newcommand{\trytoclinewidth}[1]{}
+\newcommand{\trytocrmarg}[1]{}
+\newcommand{\trytocpnumwidth}[1]{}
+\newcommand{\trytocdotsep}[1]{}
+\newcommand{\currenttoc}{}
+\newcommand{\drawtoc}{(draw toc)}
+\newcommand{\tocdiagram}{(toc diagram)}
+\newcommand{\tocdesign}{(toc design)}
+\newcommand{\tocvalues}{(toc values)}
+\newcommand{\drawaspread}[8][0]{(a spread)}
+\newcommand{\drawfontframe}[1]{(font frame)}
+\newcommand{\drawfontframelabel}[1]{}
+\endinput
+%%
+%% End of file `lwarp-layouts.sty'.
Property changes on: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-layouts.sty
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-listings.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-listings.sty 2019-03-06 22:24:12 UTC (rev 50265)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-listings.sty 2019-03-06 22:24:57 UTC (rev 50266)
@@ -18,7 +18,7 @@
\begin{warpHTML}
-\LWR at ProvidesPackagePass{listings}[2015/06/04]
+\LWR at ProvidesPackagePass{listings}[2018/09/02]
\lst at column@flexible
\let\LWR at origlst@Init\lst at Init
@@ -133,12 +133,12 @@
\lst at Key{numbers}{none}{%
\let\lst at PlaceNumber\@empty
\lstKV at SwitchCases{#1}%
- {none&\\%
- left&\def\lst at PlaceNumber{%
+ {none:\\%
+ left:\def\lst at PlaceNumber{%
\LWR at orignormalfont%
\lst at numberstyle{\thelstnumber}\kern\lst at numbersep%
}\\%
- right&\def\lst at PlaceNumber{\LWR at origrlap{\LWR at orignormalfont
+ right:\def\lst at PlaceNumber{\LWR at origrlap{\LWR at orignormalfont
\kern 6in \kern\lst at numbersep
\lst at numberstyle{\thelstnumber}}}%
}{\PackageError{Listings}{Numbers #1 unknown}\@ehc}}
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-longtable.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-longtable.sty 2019-03-06 22:24:12 UTC (rev 50265)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-longtable.sty 2019-03-06 22:24:57 UTC (rev 50266)
@@ -19,6 +19,8 @@
\LWR at ProvidesPackageDrop{longtable}[2014/10/28]
+\newbool{LWR at longtable@havehead}
+\boolfalse{LWR at longtable@havehead}
\newenvironment{longtable*}[2][]{%
\LWR at floatbegin{table}%
\setcaptiontype{\LTcaptype}%
@@ -26,6 +28,7 @@
\caption at setoptions{@longtable}%
\caption at LT@setup%
\booltrue{LWR at starredlongtable}%
+\boolfalse{LWR at longtable@havehead}%
\let\captionlistentry\LWR at LTcaptionlistentry%
\tabular{#2}
}
@@ -38,6 +41,7 @@
\caption at setoptions{@longtable}%
\caption at LT@setup%
\refstepcounter{\LTcaptype}%
+\boolfalse{LWR at longtable@havehead}%
\let\captionlistentry\LWR at LTcaptionlistentry%
\tabular{#2}
}
@@ -44,10 +48,42 @@
{\endtabular\LWR at floatend}
\newcounter{LTchunksize}
-\def\endhead{\LWR at tabularendofline}% throws away options //[dim] and //*
-\def\endfirsthead{\LWR at tabularendofline}
-\def\endfoot{\LWR at tabularendofline}
-\def\endlastfoot{\LWR at tabularendofline}
+\newcommand*{\LWR at longtable@headerror}{%
+ \PackageError{lwarp}
+ {For longtable:\MessageBreak
+ 1: Keep either one of an \protect\endhead\space or
+ \protect\endfirsthead\space\MessageBreak
+ \space phrase as-is, to be used by both print and HTML.\MessageBreak
+ 2: Place any other \protect\end... phrases inside a\MessageBreak
+ \space\protect\warpprintonly\space macro,
+ to be ignored by HTML.\MessageBreak
+ 3: Add a final footer for HTML at the end of the table\MessageBreak
+ \space inside a \protect\warpHTMLonly\space macro.
+ This can be\MessageBreak
+ \space a copy of an \protect\endfoot\space or
+ \protect\endfirstfoot\space phrase,\MessageBreak
+ \space but without the actual \protect\endfoot\space
+ or \protect\endfirstfoot\MessageBreak
+ \space macros. If using threeparttablex, add\MessageBreak
+ \space \protect\insertTableNotes\space here,
+ optionally with\MessageBreak
+ \space \protect\UseMinipageWidths\space in front.\MessageBreak
+ See the lwarp documentation regarding longtables\MessageBreak
+ and threeparttablex}
+ {See the lwarp documentation regading longtables and threeparttablex.}
+}
+\newcommand*{\LWR at longtable@maybeheaderror}{%
+\ifbool{LWR at longtable@havehead}%
+ {\LWR at longtable@headerror}%
+ {%
+ \booltrue{LWR at longtable@havehead}
+ \LWR at tabularendofline% throws away options //[dim] and //*
+ }%
+}
+\def\endhead{\LWR at longtable@maybeheaderror}
+\def\endfirsthead{\LWR at longtable@maybeheaderror}
+\def\endfoot{\LWR at longtable@headerror}
+\def\endlastfoot{\LWR at longtable@headerror}
\newcommand\tabularnewline{\LWR at tabularendofline}
\newcommand{\setlongtables}{}% Obsolete command, does nothing.
\newlength{\LTleft}
Added: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-manyfoot.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-manyfoot.sty (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-manyfoot.sty 2019-03-06 22:24:57 UTC (rev 50266)
@@ -0,0 +1,97 @@
+%%
+%% This is file `lwarp-manyfoot.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx (with options: `manyfoot')
+%% This is a generated file.
+%% Copyright 2016-2018 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{manyfoot}[2005/09/11]
+\RequirePackage{nccfoots}
+
+\newcommand{\extrafootnoterule}{}
+
+\let\defaultfootnoterule\footnoterule
+
+\newcommand*{\SelectFootnoteRule}[2][0]{}
+
+\newcommand{\footnoterulepriority}{1}
+
+\newcommand{\SetFootnoteHook}[1]{}
+\@onlypreamble\SetFootnoteHook
+
+\newcommand{\SplitNote}{}
+
+\newcommand*\ExtraParaSkip[1]{}
+
+\newcommand*{\newfootnote}[2][plain]{%
+ \ifstrequal{#2}{default}{}{% not "default"
+ \expandafter\newbox\csname LWR at footnote#2box\endcsname%
+ \appto{\LWR at printpendingfootnotes}{%
+ \LWR@@printpendingfootnotes{footnote#2}%
+ }
+ \long\csdef{Footnotetext#2}##1##2{%
+ \NCC at makefnmark{##1}%
+ \LWR@@footnotetext{##2}{LWR at footnote#2box}%
+ }%
+ \long\csdef{Footnotetext#2+}##1##2{%
+ \NCC at makefnmark{##1}%
+ \LWR@@footnotetext{##2}{LWR at footnote#2box}%
+ }%
+ }% not "default"
+}
+\@onlypreamble\newfootnote
+
+\newcommand*{\DeclareNewFootnote}[2][plain]{%
+ \@ifnextchar[%
+ {\LWR at manyfoot@declare{#1}{#2}}%
+ {\LWR at manyfoot@declare{#1}{#2}[arabic]}%
+}
+
+\def\LWR at manyfoot@declare#1#2[#3]{%
+\ifstrequal{#2}{default}{}{% not "default"
+ \newfootnote[#1]{#2}%
+ \newcounter{footnote#2}%
+ \newcounter{footnote#2Reset}%
+ \setcounter{footnote#2Reset}{0}%
+ \csdef{thefootnote#2}{%
+ \expandafter\noexpand\csname @#3\endcsname%
+ \expandafter\noexpand\csname c at footnote#2\endcsname%
+ }%
+ \expandafter\NewDocumentCommand\csname footnote#2\endcsname{t{+}t{+}t{-}t{-}}{%
+ \stepcounter{footnote#2}%
+ \protected at xdef\@thefnmark{\csname thefootnote#2\endcsname}%
+ \@footnotemark%
+ \csuse{Footnotetext#2}{\@thefnmark}% absorbs the footnote contents
+ }%
+ \csdef{footnotemark#2}{%
+ \stepcounter{footnote#2}%
+ \protected at xdef\@thefnmark{\csname thefootnote#2\endcsname}%
+ \@footnotemark%
+ }%
+ \expandafter\NewDocumentCommand\csname footnotetext#2\endcsname{t{+}t{+}t{-}t{-}}{%
+ \protected at xdef\@thefnmark{\csname thefootnote#2\endcsname}%
+ \csuse{Footnotetext#2}{\@thefnmark}% absorbs the footnote contents
+ }%
+ \csdef{Footnotemark#2}{%
+ \Footnotemark%
+ }%
+ \csdef{Footnote#2}##1{%
+ \Footnotemark{##1}%
+ \csuse{Footnotetext#2}{##1}%
+ }%
+}% not "default"
+}
+\@onlypreamble\DeclareNewFootnote
+\endinput
+%%
+%% End of file `lwarp-manyfoot.sty'.
Property changes on: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-manyfoot.sty
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-niceframe.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-niceframe.sty (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-niceframe.sty 2019-03-06 22:24:57 UTC (rev 50266)
@@ -0,0 +1,33 @@
+%%
+%% This is file `lwarp-niceframe.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx (with options: `niceframe')
+%% This is a generated file.
+%% Copyright 2016-2018 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{niceframe}% the original date is in yyyy/dd/mm format
+\newcommand{\LWR at niceframe}[3]{
+ \setlength{\LWR at templengthone}{#1}
+ \begin{BlockClass}[max-width:\LWR at printlength{\LWR at templengthone}]{#3}
+ #2
+ \end{BlockClass}
+}
+
+\newcommand{\niceframe}[2][\textwidth]{\LWR at niceframe{#1}{#2}{niceframe}}
+\newcommand{\curlyframe}[2][\textwidth]{\LWR at niceframe{#1}{#2}{curlyframe}}
+\newcommand{\artdecoframe}[2][\textwidth]{\LWR at niceframe{#1}{#2}{artdecoframe}}
+
+\newcommand{\generalframe}[9]{\LWR at niceframe{\textwidth}{#9}{generalframe}}
+\endinput
+%%
+%% End of file `lwarp-niceframe.sty'.
Property changes on: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-niceframe.sty
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-perpage.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-perpage.sty (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-perpage.sty 2019-03-06 22:24:57 UTC (rev 50266)
@@ -0,0 +1,53 @@
+%%
+%% This is file `lwarp-perpage.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx (with options: `perpage')
+%% This is a generated file.
+%% Copyright 2016-2018 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{perpage}[2014/10/25]
+\newcommand\AddAbsoluteCounter[1]
+{
+ \@ifundefined{c at abs#1}{%
+ \expandafter\newcount\csname c at abs#1\endcsname
+ \global\value{abs#1}\@ne
+ \expandafter\xdef\csname theabs#1\endcsname{%
+ }%
+ }
+ {}
+}
+
+\AddAbsoluteCounter{page}
+\def\theabspage{1}
+
+\newcommand*\MakePerPage[2][1]{%
+ \ifltxcounter{#2Reset}{%
+ \setcounter{#2Reset}{#1}%
+ }{
+
+}%
+}
+
+\newcommand*\MakeSorted[1]{}
+
+\newcommand*\MakeSortedPerPage[2][1]{%
+ \ifltxcounter{#2Reset}{%
+ \setcounter{#2Reset}{#1}%
+ }{
+}%
+}
+
+\newcommand*{\theperpage}{1}
+\endinput
+%%
+%% End of file `lwarp-perpage.sty'.
Property changes on: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-perpage.sty
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-showtags.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-showtags.sty (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-showtags.sty 2019-03-06 22:24:57 UTC (rev 50266)
@@ -0,0 +1,22 @@
+%%
+%% This is file `lwarp-showtags.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx (with options: `showtags')
+%% This is a generated file.
+%% Copyright 2016-2018 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{showtags}% no version is given
+\newcommand{\thecitetag}[1]{}
+\endinput
+%%
+%% End of file `lwarp-showtags.sty'.
Property changes on: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-showtags.sty
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-tablefootnote.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-tablefootnote.sty (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-tablefootnote.sty 2019-03-06 22:24:57 UTC (rev 50266)
@@ -0,0 +1,22 @@
+%%
+%% This is file `lwarp-tablefootnote.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx (with options: `tablefootnote')
+%% This is a generated file.
+%% Copyright 2016-2018 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{tablefootnote}[2014/01/26]
+\LetLtxMacro\tablefootnote\footnote
+\endinput
+%%
+%% End of file `lwarp-tablefootnote.sty'.
Property changes on: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-tablefootnote.sty
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-threeparttable.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-threeparttable.sty 2019-03-06 22:24:12 UTC (rev 50265)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-threeparttable.sty 2019-03-06 22:24:57 UTC (rev 50266)
@@ -21,7 +21,9 @@
\LWR at ProvidesPackageDrop{threeparttable}[2003/06/13]
-\newenvironment*{threeparttable}[1][b]{}{}
+\newenvironment*{threeparttable}[1][b]
+ {\def\@captype{table}}
+ {}
\newenvironment*{tablenotes}[1][]
{%
Added: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-threeparttablex.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-threeparttablex.sty (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-threeparttablex.sty 2019-03-06 22:24:57 UTC (rev 50266)
@@ -0,0 +1,36 @@
+%%
+%% This is file `lwarp-threeparttablex.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx (with options: `threeparttablex')
+%% This is a generated file.
+%% Copyright 2016-2018 Brian Dunn
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+\LWR at ProvidesPackagePass{threeparttablex}[2013/07/23]
+\renewcommand\insertTableNotes{%
+ \setlength{\LWR at templengthone}{.375in*\value{LWR at tabletotalLaTeXcols}}%
+ \setlength{\LWR at templengthone}{\minof{\textwidth}{\LWR at templengthone}}%
+ \setlength{\LWR at templengthone}{\maxof{2.5in}{\LWR at templengthone}}%
+ \multicolumn{\value{LWR at tabletotalLaTeXcols}}{c}{%
+ \parbox{\LWR at templengthone}{%
+ \begin{tablenotes}[\TPTL at optarg]%
+ \TPTL at font%
+ \TPTL at body%
+ \end{tablenotes}%
+ }%
+ }%
+}
+
+\renewcommand\TPTL at tnotex[2]{\tnote{\nameref{#2}}}
+\endinput
+%%
+%% End of file `lwarp-threeparttablex.sty'.
Property changes on: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-threeparttablex.sty
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp.sty 2019-03-06 22:24:12 UTC (rev 50265)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp.sty 2019-03-06 22:24:57 UTC (rev 50266)
@@ -17,7 +17,7 @@
%% version 2005/12/01 or later.
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesPackage{lwarp}
- [2019/02/23 v0.67 Allows LaTeX to directly produce HTML5 output.]
+ [2019/03/05 v0.68 Allows LaTeX to directly produce HTML5 output.]
@@ -137,6 +137,8 @@
\LWR at earlyloadnever{ae}{cm-super, lmodern}
\LWR at earlyloadnever{aecompl}{cm-super, lmodern}
\LWR at earlyloadnever{aecc}{cm-super, lmodern}
+\LWR at earlyloadnever{alg}{algorithm2e, algorithmicx}
+\LWR at earlyloadnever{algorithmic}{algorithm2e, algorithmicx}
\LWR at earlyloadnever{boxedminipage}{boxedminipage2e}
\LWR at earlyloadnever{caption2}{caption}
\@ifpackageloaded{xeCJK}{}{
@@ -148,8 +150,10 @@
\LWR at earlyloadnever{colortab}{colortbl}
\LWR at earlyloadnever{epsf}{graphicx}
\LWR at earlyloadnever{fancyheadings}{fancyhdr}
+\LWR at earlyloadnever{fncylab}{cleveref}
\LWR at earlyloadnever{glossary}{glossaries}
\LWR at earlyloadnever{hyper}{hyperref}
+\LWR at earlyloadnever{pdfcprot}{microtype}
\LWR at earlyloadnever{picinpar}{floatflt, wrapfig}
\LWR at earlyloadnever{picins}{floatflt, wrapfig}
\LWR at earlyloadnever{sistyle}{siunitx}
@@ -193,6 +197,7 @@
\LWR at loadafter{balance}
\LWR at loadafter{bbding}
\LWR at loadafter{bigdelim}
+\LWR at loadafter{bigfoot}
\LWR at loadafter{bigstrut}
\LWR at loadafter{bitpattern}
\LWR at loadafter{blowup}
@@ -287,11 +292,13 @@
\LWR at loadafter{fnbreak}
\LWR at loadafter{fncychap}
\LWR at loadafter{fnlineno}
+\LWR at loadafter{fnpara}
\LWR at loadafter{fnpos}
\LWR at loadafter{fontawesome}
\LWR at loadafter{fontawesome5}
\LWR at loadafter{footmisc}
\LWR at loadafter{footnote}
+\LWR at loadafter{footnotebackref}
\LWR at loadafter{footnotehyper}
\LWR at loadafter{footnoterange}
\LWR at loadafter{footnpag}
@@ -329,6 +336,7 @@
\LWR at loadafter{keyfloat}
\LWR at loadafter{layaureo}
\LWR at loadafter{layout}
+\LWR at loadafter{layouts}
\LWR at loadafter{leading}
\LWR at loadafter{letterspace}
\LWR at loadafter{lettrine}
@@ -347,6 +355,7 @@
\LWR at loadafter{luatodonotes}
\LWR at loadafter{magaz}
\LWR at notmemoirloadafter{makeidx}
+\LWR at loadafter{manyfoot}
\LWR at loadafter{marginfit}
\LWR at loadafter{marginfix}
\LWR at loadafter{marginnote}
@@ -359,7 +368,6 @@
\LWR at loadafter{microtype}
\LWR at loadafter{midfloat}
\LWR at loadafter{midpage}
-\LWR at loadafter{morefloats}
\LWR at notmemoirloadafter{moreverb}
\LWR at notmemoirloadafter{mparhack}
\LWR at loadafter{multicap}
@@ -375,6 +383,7 @@
\LWR at loadafter{newtxmath}
\LWR at notmemoirloadafter{nextpage}
\LWR at loadafter{nicefrac}
+\LWR at loadafter{niceframe}
\LWR at loadafter{nomencl}
\LWR at loadafter{nonfloat}
\LWR at loadafter{nonumonpart}
@@ -401,6 +410,7 @@
\LWR at loadafter{pdfsync}
\LWR at loadafter{pdftricks}
\LWR at loadafter{pdfx}
+\LWR at loadafter{perpage}
\LWR at loadafter{pfnote}
\LWR at loadafter{phfqit}
\LWR at loadafter{pifont}
@@ -453,6 +463,7 @@
\LWR at loadafter{shadow}
\LWR at notmemoirloadafter{showidx}
\LWR at loadafter{showkeys}
+\LWR at loadafter{showtags}
\LWR at loadafter{sidecap}
\LWR at loadafter{sidenotes}
\LWR at loadafter{SIunits}
@@ -472,6 +483,7 @@
\LWR at loadafter{supertabular}
\LWR at loadafter{t1inc}
\LWR at loadafter{tabls}
+\LWR at loadafter{tablefootnote}
\LWR at notmemoirloadafter{tabularx}
\LWR at loadafter{tabulary}
\LWR at loadafter{tascmac}
@@ -482,6 +494,7 @@
\LWR at loadafter{thinsp}
\LWR at loadafter{threadcol}
\LWR at loadafter{threeparttable}
+\LWR at loadafter{threeparttablex}
\LWR at loadafter{thumb}
\LWR at loadafter{thumbs}
\LWR at loadafter{tikz}
@@ -539,7 +552,7 @@
\LWR at loadafter{zwpagelayout}
\newcommand{\LWR at mdfive}[1]{%
\PackageError{lwarp}
-{No MD5 macro was found.}
+{No MD5 macro was found}
{Lwarp must find the macros pdfmdfivesum or mdfivesum.}
}
\let\LWR at mdfive\pdfmdfivesum
@@ -997,6 +1010,8 @@
\newcommand*{\LWR at checkloadfilename}[1]{%
\LWR at checkloadnever{#1}{ae}{latinmodern}
\LWR at checkloadnever{#1}{aecc}{latinmodern}
+\LWR at checkloadnever{#1}{alg}{algorithm2e, algorithmicx}
+\LWR at checkloadnever{#1}{algorithmic}{algorithm2e, algorithmicx}
\LWR at checkloadnever{#1}{bitfield}{bytefield}
\LWR at checkloadnever{#1}{boxedminipage}{boxedminipage2e}
\LWR at checkloadnever{#1}{caption2}{caption}
@@ -1005,9 +1020,11 @@
\LWR at checkloadnever{#1}{doublespace}{setspace}
\LWR at checkloadnever{#1}{epsf}{graphicx}
\LWR at checkloadnever{#1}{fancyheadings}{fancyhdr}
+\LWR at checkloadnever{#1}{fncylab}{cleveref}
\LWR at checkloadnever{#1}{glossary}{glossaries}
\LWR at checkloadnever{#1}{hyper}{hyperref}
\LWR at checkloadnever{#1}{newthm}{ntheorem}
+\LWR at checkloadnever{#1}{pdfcprot}{microtype}
\LWR at checkloadnever{#1}{picinpar}{floatflt, wrapfig}
\LWR at checkloadnever{#1}{picins}{floatflt, wrapfig}
\LWR at checkloadnever{#1}{rplain}{fancyhdr}
@@ -2486,6 +2503,34 @@
.framedtitle p { padding: .3em }
+/* For the niceframe package: */
+
+div.niceframe, div.curlyframe, div.artdecoframe, div.generalframe {
+ padding: 1ex ;
+ margin: 2ex auto ;
+ border-radius: 2ex ;
+}
+
+div.niceframe {
+ border: 6px groove black ;
+}
+
+div.curlyframe {
+ border-left: 3px dotted black ;
+ border-right: 3px dotted black ;
+ border-radius: 6ex ;
+}
+
+div.artdecoframe {
+ border-left: 10px double black ;
+ border-right: 10px double black ;
+ border-radius: 6ex ;
+}
+
+div.generalframe {
+ border: 6px groove black ;
+}
+
dl {
margin: 1ex 2em 1ex 0em;
line-height: 1.3;
@@ -2735,6 +2780,11 @@
text-align: left ;
}
+.minipage .tnotes {
+ margin: 0pt ;
+ padding: 0pt ;
+}
+
.tnotes dl dt p {margin-bottom:0px;}
.tnoteitemheader {margin-right: 1em;}
@@ -3817,7 +3867,7 @@
-- Copyright 2016-2018 Brian Dunn
-printversion = "v0.67"
+printversion = "v0.68"
requiredconfversion = "2" -- also at *lwarpmk.conf
function printhelp ()
@@ -4211,6 +4261,15 @@
print ("lwarpmk: ===")
end -- warnlimages
+function warnlimagesrecompile ()
+-- Warning if must recompile before creating limages:
+ print ("")
+ print ("lwarpmk: ===")
+ print ("lwarpmk: The document must be recompiled before creating the lateximages.")
+ print ("lwarpmk: Enter \"lwarpmk html\" again, then try \"lwarpmk limages\" again.")
+ print ("lwarpmk: ===")
+end --warnlimagesrecompile
+
function checklimages ()
--
-- Check <sourcename>.txt to see if need to recompile first.
@@ -4239,12 +4298,14 @@
end
end -- if i~=nil
end -- do
+-- The last line should be |end|end|end|.
+-- If not, the compile must have aborted, and the images are incomplete.
+if ( lwimgpage ~= "end" ) then
+ warnlimagesrecompile()
+ os.exit(1) ;
+end
if ( pagezerowarning ) then
- print ("")
- print ("lwarpmk: ===")
- print ("lwarpmk: The document must be recompiled before creating the lateximages.")
- print ("lwarpmk: Enter \"lwarpmk html\" again, then try \"lwarpmk limages\" again.")
- print ("lwarpmk: ===")
+ warnlimagesrecompile()
os.exit(1) ;
end -- pagezerowarning
end -- checklimages
@@ -4324,6 +4385,8 @@
-- Skip if the page number is 0:
if ( lwimgpage == "0" ) then
pagezerowarning = true
+ -- Skip if the page number is "end":
+ else if ( lwimgpage == "end" ) then
else
-- Skip is this image is hashed and already exists:
local lwimgfullname = imagesdirectory .. dirslash .. lwimgname .. ".svg"
@@ -4346,6 +4409,7 @@
createwindowsimage (lwimgfullname)
end
end -- not hashed or not exists
+ end -- not page "end"
end -- not page 0
end -- not nil
end -- createonelateximage
@@ -5596,20 +5660,21 @@
\newcounter{FootnoteDepth}
\setcounter{FootnoteDepth}{3}
-
+\newcounter{footnoteReset}
+\setcounter{footnoteReset}{0}
\end{warpall}
\begin{warpHTML}
-\newbox\LWR at footnotes
+\newbox\LWR at footnotebox
\long\def\@makefntext#1{\textsuperscript{\@thefnmark}~#1}
\def\@makefnmark{%
\textsuperscript{\@thefnmark}%
}
-\long\def\LWR at footnotetext#1{%
+\long\def\LWR@@footnotetext#1#2{%
\LWR at traceinfo{LWR at footnotetext}%
-\global\setbox\LWR at footnotes=\vbox{%
- \unvbox\LWR at footnotes%
+\global\setbox\csname #2\endcsname=\vbox{%
+ \unvbox\csname #2\endcsname%
\protected at edef\@currentlabel{%
\csname p at footnote\endcsname\@thefnmark%
}% @currentlabel
@@ -5636,6 +5701,7 @@
\LWR at ensuredoingapar%
}%
+\long\def\LWR at footnotetext#1{\LWR@@footnotetext{#1}{LWR at footnotebox}}
\LetLtxMacro\@footnotetext\LWR at footnotetext
\newbox\LWR at mpfootnotes
\long\def\@mpfootnotetext#1{%
@@ -5671,16 +5737,25 @@
\AtBeginDocument{
\def\thempfootnote{\@alph\c at mpfootnote}
}
-\newcommand*{\LWR at printpendingfootnotes}{%
-\ifvoid\LWR at footnotes\else
+\newcommand*{\LWR@@printpendingfootnotes}[1]{%
+\expandafter\ifvoid\csname LWR@#1box\endcsname\else
\LWR at forcenewpage
\begin{BlockClass}{footnotes}
\LWR at origmedskip
- \unvbox\LWR at footnotes
- \setbox\LWR at footnotes=\vbox{}
+ \unvbox\csuse{LWR@#1box}
+ \setbox\csuse{LWR@#1box}=\vbox{}
\end{BlockClass}
+ \ifltxcounter{#1Reset}{%
+ \ifnumgreater{\value{#1Reset}}{0}{%
+ \setcounter{#1}{\value{#1Reset}}%
+ \addtocounter{#1}{-1}%
+ }{}%
+ }{}%
\fi
}
+\newcommand*{\LWR at printpendingfootnotes}{%
+ \LWR@@printpendingfootnotes{footnote}%
+}
\newcommand*{\LWR at maybeprintpendingfootnotes}[1]{%
\ifboolexpr{
not test{\ifnumcomp{#1}{>}{\value{FootnoteDepth}}} or
@@ -6602,6 +6677,9 @@
\LWR at htmltag{/body}\LWR at orignewline
\LWR at htmltag{/html}\LWR at orignewline
\LWR at orignewpage
+\immediate\write\LWR at lateximagesfile{%
+ |end|end|end|%
+}%
\immediate\closeout\LWR at lateximagesfile
}
@@ -8664,6 +8742,11 @@
\NewDocumentCommand{\LWR at HTMLcline}{m}%
{\LWR at docmidrule{#1}\LWR at getmynexttoken}%
+\newcommand{\LWR at tabular@warpprintonly}[1]{%
+ \ifbool{warpingprint}{#1}{}%
+ \LWR at getmynexttoken%
+}
+
\AtBeginDocument{
\@ifundefined{frenchbsetup}%
{% no babel-french
@@ -8702,6 +8785,7 @@
\global\boolfalse{LWR at tabularcelladded}%
\LWR at clearmidrules%
\LetLtxMacro{\\}{\LWR at tabularendofline}%
+\LetLtxMacro\warpprintonly\LWR at tabular@warpprintonly%
\LetLtxMacro\arrayrulecolor\arrayrulecolornexttoken%
\LetLtxMacro\doublerulesepcolor\doublerulesepcolornexttoken%
\gdef\LWR at columnHTMLcolor{}%
@@ -11093,6 +11177,7 @@
\begin{warpall}
\let\fboxBlock\fbox
\end{warpall}
+
\begin{warpHTML}
\newcommand{\LWR at HTML@fboxBlock}[1]{%
\LWR at forceminwidth{\fboxrule}%
More information about the tex-live-commits
mailing list