texlive[46689] trunk: lwarp (20feb18)
commits+karl at tug.org
commits+karl at tug.org
Tue Feb 20 22:58:20 CET 2018
Revision: 46689
http://tug.org/svn/texlive?view=revision&revision=46689
Author: karl
Date: 2018-02-20 22:58:20 +0100 (Tue, 20 Feb 2018)
Log Message:
-----------
lwarp (20feb18)
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-adjmulticol.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-algorithmicx.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-eso-pic.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-floatflt.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-hang.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-hanging.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-keyfloat.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-mdframed.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-quotchap.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-scrextend.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-stabular.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-textfit.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-wrapfig.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp.sty
Added Paths:
-----------
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-figsize.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fnlineno.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-hypdestopt.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-hyphenat.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-lineno.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-luacolor.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pagegrid.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfrender.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-resizegather.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-vertbars.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-vwcol.sty
Modified: trunk/Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua
===================================================================
--- trunk/Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua 2018-02-20 21:57:43 UTC (rev 46688)
+++ trunk/Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua 2018-02-20 21:58:20 UTC (rev 46689)
@@ -4,7 +4,7 @@
-- Print the usage of the lwarpmk command:
-printversion = "v0.48"
+printversion = "v0.49"
function printhelp ()
print ("lwarpmk: Use lwarpmk -h or lwarpmk --help for help.") ;
Modified: trunk/Master/texmf-dist/doc/latex/lwarp/README.txt
===================================================================
--- trunk/Master/texmf-dist/doc/latex/lwarp/README.txt 2018-02-20 21:57:43 UTC (rev 46688)
+++ trunk/Master/texmf-dist/doc/latex/lwarp/README.txt 2018-02-20 21:58:20 UTC (rev 46689)
@@ -1,5 +1,5 @@
-LaTeX lwarp package v0.48 README.txt
+LaTeX lwarp package v0.49 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 2018-02-20 21:57:43 UTC (rev 46688)
+++ trunk/Master/texmf-dist/scripts/lwarp/lwarpmk.lua 2018-02-20 21:58:20 UTC (rev 46689)
@@ -4,7 +4,7 @@
-- Print the usage of the lwarpmk command:
-printversion = "v0.48"
+printversion = "v0.49"
function printhelp ()
print ("lwarpmk: Use lwarpmk -h or lwarpmk --help for help.") ;
Modified: trunk/Master/texmf-dist/source/latex/lwarp/lwarp.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/lwarp/lwarp.dtx 2018-02-20 21:57:43 UTC (rev 46688)
+++ trunk/Master/texmf-dist/source/latex/lwarp/lwarp.dtx 2018-02-20 21:58:20 UTC (rev 46689)
@@ -16,7 +16,7 @@
% \iffalse
%<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
%<package>\ProvidesPackage{lwarp}
-%<package> [2018/02/14 v0.48 Allows LaTeX to directly produce HTML5 output.]
+%<package> [2018/02/19 v0.49 Allows LaTeX to directly produce HTML5 output.]
%
%<*driver>
\documentclass{ltxdoc}
@@ -276,8 +276,10 @@
\providerobustcmd*{\ctr}[1]{\texttt{#1}}
\providerobustcmd*{\pkg}[1]{\textsf{#1}}
\providerobustcmd*{\prog}[1]{\textsf{#1}}
+\providerobustcmd*{\progcode}[1]{\texttt{#1}}
+\providerobustcmd*{\optn}[1]{\texttt{#1}}
+\providerobustcmd*{\filenm}[1]{\texttt{#1}}
-
\providerobustcmd*{\brand}[1]{\textsc{#1}}
\newrobustcmd{\acro}[1]{\textsc{\lowercase{#1}}}
@@ -455,7 +457,7 @@
}
\newcommand{\limitsabstract}{%
-If using the \texttt{number} option with file splits,
+If using the \optn{number} option with file splits,
\watchout[missing \acro{TOC}]
be sure to place the table of contents before the abstract.
The number option causes a section break which
@@ -489,7 +491,7 @@
The \pkg{lwarp} package takes an option
\DescribeOption{IndexLanguage}
\texttt{IndexLanguage=english} to set the language used by \prog{xindy}.
-This is passed to \prog{xindy} using its \texttt{-L} option, and is
+This is passed to \prog{xindy} using its \optn{-L} option, and is
used for both index and glossary generation.
}
@@ -496,7 +498,7 @@
\newcommand{\limitsglossaries}{%
\prog{xindy} is required for \pkg{glossaries}.
-The default \texttt{style=item} option for \pkg{glossaries} conflicts
+The default \optn{style=item} option for \pkg{glossaries} conflicts
with \pkg{lwarp}, so the style is forced to \texttt{index} instead.
The page number list in the printed form would become \cs{nameref}s in \HTML,
@@ -599,7 +601,7 @@
\end{sourcedisplay}
\end{description}
-Use the \pkg{tocbibind} \texttt{numindex} option to generate a numbered index.
+Use the \pkg{tocbibind} \optn{numindex} option to generate a numbered index.
\DescribeOption[tocbibind]{numindex}
Without this option, the index heading has no number.
\margintag{numbered index section}
@@ -609,13 +611,13 @@
If using \pkg{tocloft} with \pkg{tocbibind}, \pkg{anonchap},
\watchout[\pkg{tocloft} \& other packages]
\pkg{fncychap}, or other packages which change chapter title formatting,
-load \pkg{tocloft} with its \texttt{titles} option, which
+load \pkg{tocloft} with its \optn{titles} option, which
tells \pkg{tocloft} to use standard \LaTeX\ commands to create the titles,
allowing other packages to work with it.
}
\newcommand*{\limitspagenote}{%
-\pkg{pagenote} works as-is, but the \texttt{page} option is disabled.
+\pkg{pagenote} works as-is, but the \optn{page} option is disabled.
}
\newcommand*{\limitsendnotes}{%
@@ -811,7 +813,7 @@
Horizontal spacing relies on \prog{pdftotext}'s ability to discern the layout
\watchout[spacing]
-(\texttt{-layout} option) of the
+(\optn{-layout} option) of the
text in the \HTML-tagged \PDF\ output. For some settings of
\cs{HTMLleftmargini} or \cs{HTMLleftskip} the horizontal alignment may not work out
exactly, in which case a label may be shifted by one space.
@@ -1009,7 +1011,7 @@
this bug, so equations with \cs{split}, etc, are numbered correctly
with \pkg{lwarp}'s \HTML\ output, but not with the print output.
It is recommended to use \pkg{cleveref} instead of \pkg{ntheorem}'s
-\texttt{thref} option.
+\optn{thref} option.
}
@@ -1159,7 +1161,7 @@
\margintag{color support}
without any changes required.
-Colored tables are ignored so far. Use \CSS\ to style tables.
+\cs{rowcolors} is supported, except that the optional argument is ignored so far.
\margintag{tables}
\cs{textcolor}, \cs{colorbox}, and \cs{fcolorbox} are supported.
@@ -1760,7 +1762,7 @@
use an absolute width for
\cs{keyfig}, instead of \texttt{lw}-proportional widths.
(The [H] option forces the use of a minipage, which internally adjusts for
-a virtual 6-inch wide minipage, which then corrupts the \texttt{lw} option.)
+a virtual 6-inch wide minipage, which then corrupts the \optn{lw} option.)
}
\newcommand{\limitssiunitx}{%
@@ -1882,7 +1884,7 @@
If \brand{MS-Windows} is not correctly detected,
\DescribeProgram{MS-Windows} \DescribeProgram{Windows}
-use the \pkg{lwarp} option \texttt{OSWindows}.
+use the \pkg{lwarp} option \optn{OSWindows}.
\DescribeOption{OSWindows}
When detected or specified, the operating-system path separator used by \pkg{lwarp}
@@ -1913,7 +1915,7 @@
%<*package>
% \fi
%
-% \CheckSum{20535}
+% \CheckSum{21061}
%
% \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
@@ -1960,8 +1962,8 @@
% \changes{v0.18}{2016/04/23}{File: lwarp.css: Improved TOC outline display.}
% \changes{v0.18}{2016/05/13}{Test Suite: Verse package}
% \changes{v0.19}{2016/06/08}{\ 2016/06/08}
-% \changes{v0.19}{2016/05/25}{File: \texttt{lwarp\_mathjax.txt} added.}
-% \changes{v0.19}{2016/06/01}{File: lwarp.css: \texttt{tnoteitemheader} added}
+% \changes{v0.19}{2016/05/25}{File: \filenm{lwarp\_mathjax.txt} added.}
+% \changes{v0.19}{2016/06/01}{File: \filenm{lwarp.css}: \attribute{tnoteitemheader} added.}
% \changes{v0.20}{2017/02/09}{\ 2017/02/09}
% \changes{v0.20}{2016/06/27}{Test Suite: \HTML\ meta descriptions.}
% \changes{v0.20}{2016/09/19}{File: lwarp.css: Minor fixes for validation.}
@@ -1986,7 +1988,7 @@
% \changes{v0.32}{2017/06/09}{\ 2016/06/09}
% \changes{v0.33}{2017/07/10}{\ 2017/07/10}
% \changes{v0.34}{2017/08/08}{\ 2017/08/08}
-% \changes{v0.34}{2017/07/25}{File: \texttt{README.txt}: updated.}
+% \changes{v0.34}{2017/07/25}{File: \filenm{README.txt}: updated.}
% \changes{v0.34}{2017/07/25}{Docs: Horizontal space limitations.}
% \changes{v0.35}{2017/08/08}{\ 2017/08/08}
% \changes{v0.36}{2017/08/15}{Source: Improved formatting.}
@@ -2003,6 +2005,7 @@
% \changes{v0.46}{2018/01/23}{\ 2018/01/23}
% \changes{v0.47}{2018/01/30}{\ 2018/01/30}
% \changes{v0.48}{2018/02/14}{\ 2018/02/14}
+% \changes{v0.49}{2018/02/19}{\ 2018/02/19}
@@ -2189,13 +2192,25 @@
%
% ^^A *updates
%
-% The following is intended for those updating existing projects which use
-% \pkg{lwarp}, highlighting any special changes which must be made due
+% The following is a summary of updates to \pkg{lwarp},
+% highlighting new features and any special changes which must be made due
% to improvements or modifications in \pkg{lwarp} itself.
%
% For a detailed list of changes, see the Change History on page \pageref{sec:changehistory}.
%
% \begin{description}
+% \item[v0.49:] \
+% \begin{itemize}
+% \item Added \pkg{xcolor} \cs{rowcolors}.\margintag{tabular}
+% \item Fix: \cs{noalign} inside a \env{tabular}.
+% \item Fix: \cs{eqref} in a caption.\margintag{math}
+% \item Fix: Incorrect \PDF\ font size changes
+% caused occasional \HTML\ corruption.\margintag{misc fixes}
+% \item Fix: \pkg{printlen} changes are now grouped for \HTML\ output.
+% \item Added \pkg{vwcol}, \pkg{vertbars}, \pkg{hyphenat}, \margintag{packages}
+% \pkg{lineno}, \pkg{fnlineno}, \pkg{figsize}, \pkg{hypdestopt}, \pkg{pagegrid},
+% \pkg{pdfrender}, \pkg{luacolor}, \pkg{resizegather}.
+% \end{itemize}
% \item[v0.48:] \
% \begin{itemize}
% \item Added some documentation
@@ -2228,6 +2243,7 @@
% \pkg{vmargin}, \pkg{fancyheadings}.
% \item \pkg{fancyref}: Now directly supported.
% \end{itemize}
+% \needspace{2\baselineskip}
% \item[v0.47:] \
% \begin{itemize}
% \item Improved \SVG\ math baseline and sizing.\margintag{math}
@@ -2985,8 +3001,8 @@
%
% \subsection{Supported packages and features}
%
-% \changes{v0.15}{2016/04/05}{Docs: Moved the supported functions table to the introduction.}
-% \changes{v0.38}{2017/08/22}{Docs: Enhanced \protect\textit{Supported Functions} table.}
+% \changes{v0.15}{2016/04/05}{Docs: Moved the supported features table to the introduction.}
+% \changes{v0.38}{2017/08/22}{Docs: Enhanced \protect\textit{Supported Features} table.}
%
% \Cref{tab:supported} lists some of the various \LaTeX{} features which may be used.
%
@@ -2998,18 +3014,18 @@
% \setlength{\parindent}{0em}
% \setlength{\parskip}{2ex}
%
-% ^^A *supported functions
+% ^^A *supported features
%
% \begin{longtable}{>{\raggedright}m{.3\linewidth}m{.6\linewidth}}
% \caption{\protect\LaTeX--HTML generation ---
% \pkg{lwarp} package ---
-% Supported functions\label{tab:supported}} \endfirsthead
+% Supported features\label{tab:supported}} \endfirsthead
% \warpprintonly{\multicolumn{2}{c}{\pkg{lwarp} Supported Functions --- continued} \\
% Category & Status \\ \toprule \endhead}
%
% \toprule
%
-% Category & Status \\
+% Category & Status and supported features. \\
%
% \midrule
%
@@ -3027,7 +3043,7 @@
%
% \midrule
%
-% Page layout: & Emulates \pkg{geometry}, \pkg{fancyhdr}, \pkg{titleps},
+% Page layout: & \pkg{geometry}, \pkg{fancyhdr}, \pkg{titleps},
% \pkg{scrlayer-scrpage}, \pkg{typearea}, \pkg{vmargin},
% \pkg{addlines}, \pkg{anysize}, \pkg{a4}, \pkg{a4wide}, \pkg{a5comb},
% \pkg{textarea}, \pkg{zwpagelayout}, \pkg{ebook},
@@ -3034,17 +3050,16 @@
% \pkg{preview},
% \pkg{draftwatermark}, \pkg{watermark},
% \pkg{everyshi}, \pkg{atbegshi}, \pkg{continue}, \pkg{fwlw}, \pkg{turnthepage},
-% \pkg{pagesel}, \pkg{blowup}. \\
+% \pkg{pagesel}, \pkg{blowup}, \pkg{pagegrid}. \\
%
-% Sectioning: & Supported, with hyperlinks.
-% Adds \cmds{FileDepth} for splitting the \HTML\ output.
+% Sectioning: & Adds \cmds{FileDepth} for splitting the \HTML\ output.
% Files may be numbered sequentially or named according to section name.
-% Common short words and punctuation is removed from the filenames.
-% Emulates \pkg{titlesec}, \pkg{fncychap}, \pkg{sectsty}, \pkg{section},
+% Common short words and punctuation are removed from the filenames.
+% \pkg{titlesec}, \pkg{fncychap}, \pkg{sectsty}, \pkg{section},
% \pkg{anonchap}, \pkg{quotchap}, \pkg{sectionbreak}. \\
%
% Table of contents, figures, tables: & Supported, with hyperlinks.
-% Supports \pkg{tocbibind}. Emulates \pkg{titletoc}, \pkg{tocloft},
+% \pkg{tocbibind}, \pkg{titletoc}, \pkg{tocloft},
% \pkg{tocbasic}, and \pkg{tocstyle}, \pkg{multitoc}. \\
%
% Title page: & \cs{maketitle}, \env{titlepage}, \pkg{titling}, \pkg{authblk}. \\
@@ -3051,7 +3066,7 @@
%
% Front \&\ back matter: & \pkg{abstract}, \pkg{appendix}. \\
%
-% Indexing: & \prog{texindy} is used, with hyperlinks. \pkg{idxlayout} is emulated. \\
+% Indexing: & \prog{texindy} is used, with hyperlinks. \pkg{idxlayout}. \\
%
% Glossary: & \pkg{glossaries} and \prog{xindy} are used. \\
%
@@ -3060,9 +3075,9 @@
%
% \midrule
%
-% Cross-references: & Emulated, with hyperlinks.
+% Cross-references: &
% \pkg{hyperref}, \pkg{cleveref}, \pkg{varioref}, \pkg{fancyref}, \pkg{prettyref},
-% \pkg{titleref}, \pkg{url}, \pkg{breakurl}, \pkg{xurl}. \\
+% \pkg{titleref}, \pkg{url}, \pkg{breakurl}, \pkg{xurl}, \pkg{bookmark}, \pkg{hypdestopt}. \\
%
% Languages: & \pkg{babel}. (\pkg{polyglossia} is untested.) \\
%
@@ -3073,11 +3088,11 @@
% Footnotes: & Adds \cmds{FootnoteDepth} to print footnotes at section breaks.
% \pkg{footnote}, \pkg{footmisc},
% \pkg{marginnote}, \pkg{sidenote}, \pkg{pagenote},
-% \pkg{endnotes}, \pkg{endheads}, \pkg{footnpag}. \\
+% \pkg{endnotes}, \pkg{endheads}, \pkg{footnpag}, \pkg{nccfoots}. \\
%
% \midrule
%
-% Math: & Supported. Converted to \SVG\ images with \HTML\ \element{alt} tags containing the
+% Math: & Converted to \SVG\ images with \HTML\ \element{alt} tags containing the
% \LaTeX\ source for the math expression.
% \brand{MathJax} supported as an alternative.
% \AmS\ environments are supported.
@@ -3084,10 +3099,10 @@
% User-defined macros are available during converson,
% due to native \LaTeX\ processing.\\
%
-% Theorems: & Support for native \LaTeX\ theorems, plus
+% Theorems: & Native \LaTeX\ theorems,
% \pkg{theorem}, \pkg{amsthm}, \pkg{ntheorem}. \\
%
-% Add'l math: & \pkg{delarray}, \pkg{bm}, math fonts via \SVG\ images. \\
+% Additional math: & \pkg{delarray}, \pkg{bm}, math fonts via \SVG\ images, \pkg{resizegather}. \\
%
% Units and fractions: & \pkg{siunitx}, \pkg{xfrac}, \pkg{nicefrac}, \pkg{units} \\
%
@@ -3101,7 +3116,7 @@
%
% \midrule
%
-% Tabular &
+% Tabular: &
% \env{tabular} environment, \pkg{array}, \pkg{tabularx}, \pkg{tabulary},
% \pkg{threeparttable}, \pkg{multirow},
% \pkg{longtable}, \pkg{supertabular}, \pkg{xtab}, \pkg{ltxtable},
@@ -3109,7 +3124,7 @@
%
% \midrule
%
-% Graphics & \pkg{graphics} and \pkg{graphicx} are emulated.
+% Graphics: & \pkg{graphics} and \pkg{graphicx}.
% \cs{includegraphics} supports \cmds{width}, \cmds{height},
% \cmds{origin}, \cmds{angle}, and \cmds{scale} tags, and adds \cmds{class}.
% References to \PDF\ files are changed to \SVG, other image types
@@ -3117,13 +3132,12 @@
% \cs{rotatebox} and \cs{scalebox} are supported as well as \HTML\ can handle.
% \pkg{rotating} is emulated but all objects are unrotated.
% \pkg{picture} and \pkg{tikz} are converted to an \SVG\ image.
-% \pkg{grffile} and \pkg{overpic} are supported. \\
+% \pkg{grffile}, \pkg{overpic}, \pkg{figsize}. \\
%
%
% \midrule
%
-% \pkg{xcolor}: & \textcolor{DarkGreen}{Supported}.
-% Full package color names, any color models,
+% \pkg{xcolor}: & \textcolor{DarkGreen}{Full package color names}, any color models,
% and \textcolor{Goldenrod}{mixing}.
% \textcolor{Maroon}{\cs{textcolor}},
% \colorbox{LightSteelBlue}{\cs{colorbox}},
@@ -3132,14 +3146,14 @@
%
% \midrule
%
-% Lists: & Standard \LaTeX\ environments are supported, along with
+% Lists: & Standard \LaTeX\ environments,
% \pkg{enumitem}, \pkg{enumerate}, \pkg{paralist}, \pkg{hang}.\\
%
% \midrule
%
-% Environments: & Standard \LaTeX{} environments are supported. \\
+% Environments: & Standard \LaTeX{} environments. \\
%
-% \env{minipage}: & Supported with some \HTMLfive-imposed limitations.
+% \env{minipage}: & Some \HTMLfive-imposed limitations.
% Nested minipages are supported. \\
%
% Quotations: & \pkg{verse}, \pkg{csquotes}, \pkg{epigraph} \\
@@ -3147,14 +3161,15 @@
% Verbatim: & \pkg{verbatim}, \pkg{moreverb}, \pkg{fancyvrb} (except for verbatim footnotes),
% \pkg{shortvrb}. \\
%
-% Frames: & \pkg{framed}, \pkg{fancybox}, \pkg{mdframed}, \pkg{boxedminipage2e}, \pkg{shadow}. \\
+% Frames: & \pkg{framed}, \pkg{fancybox}, \pkg{mdframed}, \pkg{boxedminipage2e},
+% \pkg{shadow}, \pkg{vertbars}. \\
%
-% \pkg{multicol}: & Emulated, with \CSSthree.
-% Converted to up to three columns with an optional heading,
-% per browser support. Single-column if unsupported.\\
+% Multi-columns: & \pkg{multicol}, \pkg{adjmulticol}, \pkg{vwcol}. \\
%
% Margins: & \pkg{midpage}, \pkg{hanging}, \pkg{fullwidth}. \\
%
+% Line numbering: & \pkg{lineno}, \pkg{fnlineno}. \\
+%
% \midrule
%
% Acronyms: & \pkg{acro}, \pkg{acronym}. \\
@@ -3166,12 +3181,12 @@
%
% Direct formatting: & \cs{emph}, \cs{textsuperscript},
% \cs{textbf}, etc are supported.
-% \cs{bfseries}, etc.\ are not yet supported.
+% \cs{bfseries}, etc.\ are only supported in a few cases.
% \pkg{lettrine}, \pkg{ulem}, \pkg{soul}, \pkg{soulutf8}, \pkg{soulpos}, \pkg{cancel},
-% \pkg{relsize}, \pkg{scalefnt}, \pkg{textfit},
-% and \pkg{realscripts} are supported. \\
+% \pkg{relsize}, \pkg{scalefnt}, \pkg{textfit}, \pkg{realscripts}, \pkg{hyphenat},
+% \pkg{pdfrender}, \pkg{luacolor}. \\
%
-% Ordinals: & \pkg{nth}, \pkg{fmtcount}, and \pkg{engord} are supported. \\
+% Ordinals: & \pkg{nth}, \pkg{fmtcount}, \pkg{engord}. \\
%
% Text ligatures: & Ligatures for symbols are supported.
% Ligatures for f, q, t are intentionally turned off
@@ -3191,7 +3206,7 @@
%
% Fonts: & Used as-is. Appear in \SVG\ math expressions or embedded image environments. \\
%
-% Symbols: & Native \LaTeX\ diacriticals, \pkg{textcomp}. \\
+% Symbols: & Native \LaTeX\ diacriticals, \pkg{textcomp}, \pkg{textgreek}. \\
%
% \midrule
%
@@ -3351,7 +3366,7 @@
% files are usually used. For \HTML\ output, a \CSS\ file will be available, but additional
% configuration may require editing some form of control file with a different syntax, such as XML.
% In the case of \pkg{lwarp}, CSS is used, and much \HTML\ output is adjusted
-% through the usual \LaTeX{} optional macro parameters,
+% through the usual \LaTeX\ optional macro parameters,
% but further customization may require patching \LaTeX{} code.
%
% The popular word processors and professional document systems each has a large
@@ -3653,7 +3668,7 @@
% It is also possible to use a local version of \prog{lwarpmk}:
% \begin{enumerate}
% \item When compiling the tutorial in \cref{sec:tutorial},
-% use the \prog{lwarpmk} option for the \pkg{lwarp} package:
+% use the \optn{lwarpmk} option for the \pkg{lwarp} package:
% \begin{sourcedisplay}
% |\usepackage[lwarpmk]{lwarp}|
% \end{sourcedisplay}
@@ -3791,7 +3806,7 @@
%
% \subsection{Starting a new project}
%
-% \changes{v0.21}{2017/02/23}{File \texttt{lwarp\_tutorial.txt} added.}
+% \changes{v0.21}{2017/02/23}{File: \filenm{lwarp\_tutorial.txt} added.}
%
% \begin{enumerate}
%
@@ -3922,7 +3937,7 @@
%
% \hrule \medskip
% \label{sec:genlatexmk}
-% When the \prog{lwarpmk} option is given to the \pkg{lwarp} package:
+% When the \optn{lwarpmk} option is given to the \pkg{lwarp} package:
% \begin{description}
% \item [|lwarpmk.lua|:] A local copy of the \prog{lwarpmk} utility.
%
@@ -4280,7 +4295,7 @@
% \userentry{lwarpmk html project\_b}
%
%
-% \subsection{Using the \texttt{make} utility}
+% \subsection{Using the \prog{make} utility}
%
% \prog{lwarpmk} has an action which may be useful for integration with the
% common \prog{make} utility:
@@ -4545,7 +4560,7 @@
%
% \DescribeOption{lwarpmk} If you wish to have \pkg{lwarp} generate a local
% copy of |lwarpmk.lua| for archival or local-installation purposes,
-% compile the print version with the \prog{lwarpmk} option set.
+% compile the print version with the \optn{lwarpmk} option set.
% See \cref{sec:handlingpackageoptions}.
%
% \DescribeOption{xdyFilename} The default \prog{xindy} filename is |lwarp.xdy|.
@@ -6400,7 +6415,7 @@
% \index{troubleshooting}\index{problems}\index{error messages}
% \index{debugging}
%
-% \subsection{Using the \protect\texttt{lwarp.sty} package}
+% \subsection{Using the \pkg{lwarp.sty} package}
%
% Also see: \\
% \Cref{sec:printcommands}: \nameref{sec:printcommands} \\
@@ -6573,7 +6588,7 @@
%
%
%
-% \subsection{Compiling the \protect\texttt{lwarp.dtx} file}
+% \subsection{Compiling the \filenm{lwarp.dtx} file}
%
% \begin{description}
% \item [\texttt{lwarp\_tutorial.tex}:] Copy or link |lwarp_tutorial.txt|
@@ -7035,9 +7050,8 @@
% in \prog{lwarpmk}'s configuration files. This is then used by \prog{lwarpmk} while
% processing the index and glossary.
%
-% \changes{v0.29}{2017/04/15}{Add: \protect\texttt{lwarpmklang} option for \pkg{lwarp}.}
-% \changes{v0.30}{2017/04/28}{Option \protect\texttt{lwarpmklang} changed
-% to \protect\texttt{IndexLanguage}.}
+% \changes{v0.29}{2017/04/15}{Add: \optn{lwarpmklang} option for \pkg{lwarp}.}
+% \changes{v0.30}{2017/04/28}{Option \optn{lwarpmklang} changed to \optn{IndexLanguage}.}
%
% \begin{macrocode}
\DeclareStringOption[english]{IndexLanguage}
@@ -7053,7 +7067,7 @@
% (markup-locref :open "\hyperindexref{" :close "}")
% \end{Verbatim}
%
-% \changes{v0.30}{2017/04/28}{Option \protect\texttt{xdyFilename} added.}
+% \changes{v0.30}{2017/04/28}{Option \optn{xdyFilename} added.}
%
% \begin{macrocode}
\DeclareStringOption[lwarp.xdy]{xdyFilename}
@@ -7084,7 +7098,7 @@
% See the automatically-generated |lwarpmk.conf| file to find out
% whether the operating system was detected correctly.
%
-% \changes{v0.30}{2017/04/27}{Option \texttt{OSWindows} replaces macro \cs{warpOSwindows}.}
+% \changes{v0.30}{2017/04/27}{Option \optn{OSWindows} replaces macro \cs{warpOSwindows}.}
%
% \begin{macrocode}
\DeclareVoidOption{OSWindows}{
@@ -7101,7 +7115,7 @@
% This option is stored into \cs{LWR at HomeHTMLFilename},
% and later transferred into \cs{HomeHTMLFilename} for internal use.
%
-% \changes{v0.30}{2017/04/27}{Options \texttt{HomeHTMLFilename} and \texttt{HTMLFilename}
+% \changes{v0.30}{2017/04/27}{Options \optn{HomeHTMLFilename} and \optn{HTMLFilename}
% replace macros \cs{HomeHTMLFilename} and \cs{HTMLFilename}.}
%
% \begin{macrocode}
@@ -7434,6 +7448,7 @@
\LWR at loadafter{fancyref}
\LWR at loadafter{fancyvrb}
\LWR at loadafter{figcaps}
+\LWR at loadafter{figsize}
\LWR at loadafter{fix2col}
\LWR at loadafter{fixme}
\LWR at loadafter{fixmetodonotes}
@@ -7445,6 +7460,7 @@
\LWR at loadafter{fltrace}
\LWR at loadafter{flushend}
\LWR at loadafter{fncychap}
+\LWR at loadafter{fnlineno}
\LWR at loadafter{fnpos}
% fontenc must be loaded before lwarp
% fontspec must be loaded before lwarp
@@ -7465,9 +7481,11 @@
\LWR at loadafter{hang}
\LWR at loadafter{hanging}
\LWR at loadafter{hypcap}
+\LWR at loadafter{hypdestopt}
\LWR at loadafter{hypernat}
\LWR at loadafter{hyperref}
\LWR at loadafter{hyperxmp}
+\LWR at loadafter{hyphenat}
\LWR at loadafter{idxlayout}
\LWR at loadafter{ifoddpage}
\LWR at loadafter{indentfirst}
@@ -7476,6 +7494,7 @@
\LWR at loadafter{layout}
\LWR at loadafter{letterspace}
\LWR at loadafter{lettrine}
+\LWR at loadafter{lineno}
\LWR at loadafter{lips}
\LWR at loadafter{listings}
\LWR at loadafter{longtable}
@@ -7482,6 +7501,7 @@
\LWR at loadafter{lscape}
\LWR at loadafter{ltcaption}
\LWR at loadafter{ltxtable}
+\LWR at loadafter{luacolor}
\LWR at loadafter{luatodonotes}
\LWR at loadafter{marginfit}
\LWR at loadafter{marginfix}
@@ -7511,10 +7531,12 @@
\LWR at loadafter{nowidow}
\LWR at loadafter{ntheorem}
\LWR at loadafter{overpic}
+\LWR at loadafter{pagegrid}
\LWR at notmemoirloadafter{pagenote}
\LWR at loadafter{pagesel}
\LWR at loadafter{paralist}
\LWR at notmemoirloadafter{parskip}
+\LWR at loadafter{pdfrender}
\LWR at loadafter{pdflscape}
\LWR at loadafter{pdfsync}
\LWR at loadafter{pfnote}
@@ -7526,6 +7548,7 @@
\LWR at loadafter{ragged2e}
\LWR at loadafter{realscripts}
\LWR at loadafter{relsize}
+\LWR at loadafter{resizegather}
\LWR at loadafter{romanbar}
\LWR at loadafter{romanbarpagenumber}
\LWR at loadafter{rotating}
@@ -7586,7 +7609,9 @@
\LWR at loadafter{upref}
\LWR at loadafter{varioref}% no lwarp package provided
\LWR at notmemoirloadafter{verse}
+\LWR at loadafter{vertbars}
\LWR at loadafter{vmargin}
+\LWR at loadafter{vwcol}
\LWR at loadafter{wallpaper}
\LWR at loadafter{watermark}
\LWR at loadafter{wrapfig}
@@ -8029,7 +8054,6 @@
% \DescribePackage{environ}
-%
% Used to encapsulate math environments for re-use in \HTML\ \element{alt} text.
%
% \begin{macrocode}
@@ -8048,7 +8072,6 @@
% \DescribePackage{zref}
-%
% Used for cross-references.
% \begin{macrocode}
\RequirePackage{zref}
@@ -8056,6 +8079,8 @@
% \DescribePackage{amsmath}
+% Preloaded to avoid options clash and to add patches.
+%
% \changes{v0.16}{2016/04/09}{Fix: amsmath options clash}
%
% Equation numbers are placed to the left for \HTML.
@@ -8064,18 +8089,26 @@
% so the options |leqno| and |fleqn| are passed beforehand to be
% picked up both here and by \pkg{newtxmath} if it is used.
% \changes{v0.16}{2016/04/11}{Fix: newtxmath compatibility.}
-% \changes{v0.33}{2016/06/21}{\pkg{amsmath}: Removed \protect\texttt{fleqn} option.}
+% \changes{v0.33}{2016/06/21}{\pkg{amsmath}: Removed \optn{fleqn} option.}
%
% \begin{macrocode}
\PassOptionsToPackage{leqno}{amsmath}
\RequirePackage{amsmath}
% \end{macrocode}
+%
+% Patches to allow \cs{eqref} inside a caption:
+% \changes{v0.49}{2018/02/18}{\pkg{amsmath}: Fix: Patches for \cs{eqref}.}
+% \begin{macrocode}
+\def\maketag@@@#1{#1}
+\def\tagform@#1{\maketag@@@{(\ignorespaces#1\unskip)}}
+% \end{macrocode}
% \changes{v0.40}{2017/09/07}{No longer preloads \pkg{xfrac}.}
-%
+
+% \DescribePackage{printlen}
% Used to convert lengths for image width/height options.
%
% \begin{macrocode}
@@ -8082,7 +8115,28 @@
\RequirePackage{printlen}
% \end{macrocode}
+% \begin{macro}{\LWR at printlength} \marg{length}
+%
+% Prints a length using a locally-controlled unit and space.
+% Rounding is used unless the length is small.
+%
+% \changes{v0.49}{2018/02/19}{Fix: Group \pkg{printlen} changes.}
+% \begin{macrocode}
+\newrobustcmd*{\LWR at printlength}[1]{%
+\begingroup%
+\uselengthunit{PT}%
+\renewcommand*{\unitspace}{}%
+\ifdimless{#1}{10pt}{%
+ \printlength{#1}%
+}{%
+ \rndprintlength{#1}%
+}%
+\endgroup%
+}
+% \end{macrocode}
+% \end{macro}
+
% \begin{macrocode}
\end{warpHTML}
% \end{macrocode}
@@ -8094,6 +8148,7 @@
\begin{warpprint}
% \end{macrocode}
+% \DescribePackage{varwidth}
% Used for print-mode \env{lateximage}:
% \begin{macrocode}
\RequirePackage{varwidth}
@@ -8384,7 +8439,7 @@
% \begin{macro}{\include} \marg{filename}
%
-% \changes{v0.37}{2017/08/19}{Maintains independent \protect\texttt{.aux} files for \protect\HTML.}
+% \changes{v0.37}{2017/08/19}{Maintains independent \filenm{aux} files for \protect\HTML.}
%
% \begin{macro}{\@include} \marg{filename} Modified to load |_html_inc| files.
% \begin{macrocode}
@@ -8516,7 +8571,7 @@
% \index{debugging>HTML debug comments}
% \index{troubleshooting>HTML debug comments}
%
-% \changes{v0.28}{2017/04/09}{Added boolean \texttt{HTMLDebugComments.}}
+% \changes{v0.28}{2017/04/09}{Added boolean \progcode{HTMLDebugComments}.}
%
% \begin{macrocode}
\newbool{HTMLDebugComments}
@@ -8561,7 +8616,7 @@
% \index{EPUB>HTML conversion settings}
% \index{HTML>conversion settings>EPUB}
%
-% \changes{v0.28}{2017/04/09}{Added boolean \texttt{FormatEPUB}.}
+% \changes{v0.28}{2017/04/09}{Added boolean \progcode{FormatEPUB}.}
%
% \begin{macrocode}
\newbool{FormatEPUB}
@@ -8578,7 +8633,7 @@
% \index{word processor>HTML conversion settings}
% \index{HTML>conversion settings>word processor}
%
-% \changes{v0.28}{2017/04/09}{Added boolean \texttt{FormatWP}.}
+% \changes{v0.28}{2017/04/09}{Added boolean \progcode{FormatWP}.}
%
% \begin{macrocode}
\newbool{FormatWP}
@@ -8594,8 +8649,8 @@
% \index{word processor>HTML conversion settings}
% \index{HTML>conversion settings>word processor}
%
-% \changes{v0.28}{2017/04/09}{Added boolean \protect\texttt{HTMLMarkFloats}, changed
-% to \protect\texttt{WPMarkFloats} as of v0.42.}
+% \changes{v0.28}{2017/04/09}{Added boolean \progcode{HTMLMarkFloats}, changed
+% to \progcode{WPMarkFloats} as of v0.42.}
%
% \begin{macrocode}
\newbool{WPMarkFloats}
@@ -8603,7 +8658,7 @@
% \end{macrocode}
% \DescribeBoolean{WPMarkMinipages} \DescribeDefault{false}
-% \changes{v0.42}{2017/10/18}{Added boolean \protect\texttt{WPMarkMinipages}.}
+% \changes{v0.42}{2017/10/18}{Added boolean \progcode{WPMarkMinipages}.}
% \describeWPMarkMinipages
% \begin{macrocode}
\newbool{WPMarkMinipages}
@@ -8611,7 +8666,7 @@
% \end{macrocode}
% \DescribeBoolean{WPMarkTOC} \DescribeDefault{true}
-% \changes{v0.42}{2017/10/18}{Added boolean \protect\texttt{WPMarkTOC}.}
+% \changes{v0.42}{2017/10/18}{Added boolean \progcode{WPMarkTOC}.}
% \describeWPMarkTOC
% \begin{macrocode}
\newbool{WPMarkTOC}
@@ -8620,7 +8675,7 @@
% \DescribeBoolean{WPMarkLOFT} \DescribeDefault{false}
-% \changes{v0.42}{2017/10/19}{Added boolean \protect\texttt{WPMarkLOFT}.}
+% \changes{v0.42}{2017/10/19}{Added boolean \progcode{WPMarkLOFT}.}
% \describeWPMarkLOFT
% \begin{macrocode}
\newbool{WPMarkLOFT}
@@ -8629,7 +8684,7 @@
% \DescribeBoolean{WPMarkMath} \DescribeDefault{false}
-% \changes{v0.42}{2017/10/19}{Added boolean \protect\texttt{WPMarkMath}.}
+% \changes{v0.42}{2017/10/19}{Added boolean \progcode{WPMarkMath}.}
% \describeWPMarkMath
% \begin{macrocode}
\newbool{WPMarkMath}
@@ -8638,7 +8693,7 @@
% \DescribeBoolean{WPTitleHeading} \DescribeDefault{false}
-% \changes{v0.42}{2017/10/19}{Added boolean \protect\texttt{WPTitleHeading}.}
+% \changes{v0.42}{2017/10/19}{Added boolean \progcode{WPTitleHeading}.}
% \describeWPTitleHeading
% \begin{macrocode}
\newbool{WPTitleHeading}
@@ -8652,7 +8707,7 @@
%
% \subsection{Heading adjustments}
%
-% \changes{v0.42}{2017/10/19}{If \protect\texttt{FormatWP},
+% \changes{v0.42}{2017/10/19}{If \progcode{FormatWP},
% shift section headings.}
% If formatting the \HTML\ for a word processor, adjust heading levels.
%
@@ -9019,7 +9074,8 @@
% htmlfilename = "" -- or "projectname" if numbered HTML files
% \end{Verbatim}
%
-% \changes{v0.29}{2017/04/15}{File \protect\texttt{lwarpmk.conf}: Add: \protect\texttt{language} option for config files.}
+% \changes{v0.29}{2017/04/15}{File: \filenm{lwarpmk.conf}: Add: \optn{language}
+% option for config files.}
%
% \codeprint
% \begin{macrocode}
@@ -9058,7 +9114,8 @@
%
% \DescribeFile{project.lwarpmkconf} A project-specific configuration file for \prog{lwarpmk}.
%
-% \changes{v0.29}{2017/04/15}{File \protect\texttt{*.lwarpmkconf}: Add: \protect\texttt{language} option for config files.}
+% \changes{v0.29}{2017/04/15}{File: \filenm{*.lwarpmkconf}: Add: \optn{language}
+% option for config files.}
%
% \begin{macrocode}
\begin{warpprint}
@@ -9103,9 +9160,9 @@
% This must be present both when compiling the project
% and also when distributing the \HTML\ files.
%
-% \changes{v0.26}{2017/03/30}{\texttt{lwarp.css}: Improved responsive
-% \texttt{marginpar} and \texttt{marginblock}.}
-% \changes{v0.30}{2017/04/26}{Fix: \protect\texttt{*.css} files only written in print mode.}
+% \changes{v0.26}{2017/03/30}{\filenm{lwarp.css}: Improved responsive
+% \attribute{marginpar} and \attribute{marginblock}.}
+% \changes{v0.30}{2017/04/26}{Fix: \filenm{*.css} files only written in print mode.}
%
% ^^A *lwarp.css
% \begin{macrocode}
@@ -10988,8 +11045,8 @@
% but does not need to be present when distributing
% the resulting \HTML\ files.
%
-% \changes{v0.30}{2017/04/28}{File: \protect\texttt{lwarp\_html.xdy} renamed to \protect\texttt{lwarp.xdy}.}
-% \changes{v0.30}{2017/04/26}{Fix: \protect\texttt{lwarp.xdy} only written in print mode.}
+% \changes{v0.30}{2017/04/28}{File: \filenm{lwarp\_html.xdy} renamed to \filenm{lwarp.xdy}.}
+% \changes{v0.30}{2017/04/26}{Fix: \filenm{lwarp.xdy} only written in print mode.}
%
% ^^A *lwarp.xdy
% \begin{macrocode}
@@ -11027,12 +11084,12 @@
% but does not need to be present when distributing
% the resulting \HTML\ files.
%
-% \changes{v0.28}{2017/04/11}{File \protect\texttt{lwarp\_mathjax.txt}: Updated \protect\acro{CDN} repository.}
-% \changes{v0.30}{2017/04/26}{Fix: \protect\texttt{lwarp\_mathjax.txt}: Only written in print mode.}
-% \changes{v0.34}{2017/07/27}{File: \protect\texttt{lwarp\_mathjax.txt}: Version change.}
-% \changes{v0.42}{2017/10/16}{File: \protect\texttt{lwarp\_mathjax.txt}: Updated \pkg{siunitx} script.}
-% \changes{v0.45}{2017/12/21}{File: \protect\texttt{lwarp\_mathjax.txt}: Allow \brand{MathJax} inside \env{tabbing}.}
-% \changes{v0.45}{2018/01/23}{File: \protect\texttt{lwarp\_mathjax.txt}: Allow \brand{MathJax} inside \env{verse}.}
+% \changes{v0.28}{2017/04/11}{File: \filenm{lwarp\_mathjax.txt}: Updated \protect\acro{CDN} repository.}
+% \changes{v0.30}{2017/04/26}{Fix: \filenm{lwarp\_mathjax.txt}: Only written in print mode.}
+% \changes{v0.34}{2017/07/27}{File: \filenm{lwarp\_mathjax.txt}: Version change.}
+% \changes{v0.42}{2017/10/16}{File: \filenm{lwarp\_mathjax.txt}: Updated \pkg{siunitx} script.}
+% \changes{v0.45}{2017/12/21}{File: \filenm{lwarp\_mathjax.txt}: Allow \brand{MathJax} inside \env{tabbing}.}
+% \changes{v0.45}{2018/01/23}{File: \filenm{lwarp\_mathjax.txt}: Allow \brand{MathJax} inside \env{verse}.}
%
%
% ^^A *lwarp_mathjax.txt
@@ -11154,21 +11211,21 @@
% \DescribeProgram{lwarpmk} Creates a local copy of \prog{lwarpmk}:
%
-% \changes{v0.21}{2017/02/11}{\prog{lwarpmk}: Fix: \protect\texttt{lwarpmk again} for \brand{Windows}.}
-% \changes{v0.21}{2017/02/22}{\prog{lwarpmk}: Fix: \protect\texttt{lwarpmk limages} for \brand{Windows}.}
-% \changes{v0.21}{2017/02/22}{\prog{lwarpmk}: Fix: \prog{lwarpmk} uses \texttt{lateximages} text file instead of shell script.}
-% \changes{v0.28}{2017/04/14}{\prog{lwarpmk}: Add: \protect\texttt{printglossary} and \protect\texttt{htmlglossary} commands.}
-% \changes{v0.29}{2017/04/15}{\prog{lwarpmk}: Add: \protect\texttt{language} option for config files.}
-% \changes{v0.30}{2017/04/22}{\prog{lwarpmk}: \protect\texttt{language} now used for both index and glossary generation.}
+% \changes{v0.21}{2017/02/11}{\prog{lwarpmk}: Fix: \cmds{lwarpmk again} for \brand{Windows}.}
+% \changes{v0.21}{2017/02/22}{\prog{lwarpmk}: Fix: \cmds{lwarpmk limages} for \brand{Windows}.}
+% \changes{v0.21}{2017/02/22}{\prog{lwarpmk}: Fix: \prog{lwarpmk} uses \filenm{lateximages} text file instead of shell script.}
+% \changes{v0.28}{2017/04/14}{\prog{lwarpmk}: Add: \cmds{printglossary} and \cmds{htmlglossary} commands.}
+% \changes{v0.29}{2017/04/15}{\prog{lwarpmk}: Add: \optn{language} option for config files.}
+% \changes{v0.30}{2017/04/22}{\prog{lwarpmk}: \optn{language} now used for both index and glossary generation.}
% \changes{v0.30}{2017/04/22}{\prog{lwarpmk}: Fix: \prog{xindy} now used for print index generation with \prog{latexmk}.}
% \changes{v0.30}{2017/04/28}{\prog{lwarpmk}: Fix: \prog{xindy} and \prog{texindy}
% adjusted for \prog{pdflatex}, \prog{xelatex} and \prog{lualatex}.}
-% \changes{v0.30}{2017/04/28}{\prog{lwarpmk}: Add: \protect\texttt{xdyfile} configuration option.}
-% \changes{v0.32}{2017/06/08}{\prog{lwarpmk}: Fix: \protect\texttt{io.lines()} changed to \protect\texttt{file:lines()}
+% \changes{v0.30}{2017/04/28}{\prog{lwarpmk}: Add: \optn{xdyfile} configuration option.}
+% \changes{v0.32}{2017/06/08}{\prog{lwarpmk}: Fix: \cmds{io.lines()} changed to \cmds{file:lines()}
% due to \prog{luatex} changes.}
-% \changes{v0.37}{2017/08/19}{\prog{lwarpmk}: Removes additional \HTML\ \protect\texttt{aux} files.}
-% \changes{v0.38}{2017/08/24}{\prog{lwarpmk}: Added print1 and html1 actions.}
-% \changes{v0.47}{2018/01/24}{\prog{lwarpmk}: pdfcrop: Removed hires option for improved crop accuracy.}
+% \changes{v0.37}{2017/08/19}{\prog{lwarpmk}: Removes additional \HTML\ \filenm{aux} files.}
+% \changes{v0.38}{2017/08/24}{\prog{lwarpmk}: Added \cmds{print1} and \cmds{html1} actions.}
+% \changes{v0.47}{2018/01/24}{\prog{lwarpmk}: \prog{pdfcrop}: Removed \optn{hires} option for improved crop accuracy.}
%
% ^^A *lwarpmk.lua
% \begin{macrocode}
@@ -11179,7 +11236,7 @@
-- Print the usage of the lwarpmk command:
-printversion = "v0.48"
+printversion = "v0.49"
function printhelp ()
print ("lwarpmk: Use lwarpmk -h or lwarpmk --help for help.") ;
@@ -13662,7 +13719,7 @@
% to place footnotes in the \HTML\ files, similar to |tocdepth|.
% The default of |5| places footnotes before each \cs{subparagraph} or higher.
% See \cref{tab:depthsheadings} for a table of \LaTeX\ section headings.
-% \changes{v0.43}{2017/11/08}{Added \protect\texttt{FootnoteDepth}.}
+% \changes{v0.43}{2017/11/08}{Added \progcode{FootnoteDepth}.}
% \begin{macrocode}
\newcounter{FootnoteDepth}
\setcounter{FootnoteDepth}{5}
@@ -13873,7 +13930,7 @@
%
% \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 \protect\texttt{FootnoteDepth}.}
+% \changes{v0.43}{2017/11/08}{Added \progcode{FootnoteDepth}.}
% \begin{macrocode}
\newcommand*{\LWR at maybeprintpendingfootnotes}[1]{%
\ifboolexpr{
@@ -13926,7 +13983,7 @@
% \begin{macro}{\marginpar} \oarg{left} \marg{right}
%
% \changes{v0.21}{2017/02/11}{Fixed source listing.}
-% \changes{v0.42}{2017/10/26}{If \protect\texttt{FormatWP} emulate a wrapfig.}
+% \changes{v0.42}{2017/10/26}{If \progcode{FormatWP} emulate a wrapfig.}
%
% \begin{macrocode}
\renewcommand{\marginpar}[2][]{%
@@ -13951,7 +14008,7 @@
% HTML version.
%
% \changes{v0.21}{2017/02/11}{Fixed source listing.}
-% \changes{v0.42}{2017/10/26}{If \protect\texttt{FormatWP} emulate a wrapfig.}
+% \changes{v0.42}{2017/10/26}{If \progcode{FormatWP} emulate a wrapfig.}
% \changes{v0.44}{2017/11/10}{Added.}
%
% \begin{macrocode}
@@ -14214,7 +14271,7 @@
% \begin{macro}{\LWR at newhtmlfile} \marg{section name}
% \changes{v0.18}{2016/04/23}{side\TOC\ after title, improving responsive design.}
% \changes{v0.21}{2017/02/22}{Skip title if not given.}
-% \changes{v0.28}{2017/04/06}{If \texttt{FormatEPUB} or \texttt{FormatWordProcessor}: skips headers, footers, nav.}
+% \changes{v0.28}{2017/04/06}{If \progcode{FormatEPUB} or \progcode{FormatWP}: skips headers, footers, nav.}
%
% Finishes the current \HTML\ page with footnotes, footer, navigation,
% then starts a new \HTML\ page with an \HTML\ comment telling where to
@@ -14620,7 +14677,7 @@
% was created. If a math expression is included in the section name,
% and SVG math is used, the corresponding \env{lateximage} will cause the
% page number to change by the time the following autosec label is created.
-% \changes{v0.43}{2017/11/01}{\protect\texttt{LWR at currentautosec}: Added.}
+% \changes{v0.43}{2017/11/01}{\progcode{LWR at currentautosec}: Added.}
% \begin{macrocode}
\newcounter{LWR at currentautosec}
% \end{macrocode}
@@ -14895,11 +14952,11 @@
-% \subsection{\textbackslash{}section and friends}
+% \subsection{\cs{section} and friends}
% \begin{macro}{\part} * \oarg{TOC name} \marg{name}
%
-% \changes{v0.38}{2017/08/21}{Fix with \texttt{article} class.}
+% \changes{v0.38}{2017/08/21}{Fix with \pkg{article} class.}
% \changes{v0.44}{2017/11/21}{Add preamble for \pkg{koma-script}.}
%
% \begin{macrocode}
@@ -15219,8 +15276,8 @@
% \begin{macro}{\LWR at LwarpStart}
% \changes{v0.19}{2016/06/01}{Enabled \textbackslash\textbackslash{} equal to \cs{newline}.}
-% \changes{v0.21}{2017/02/22}{Changed \texttt{lateximages} to a \texttt{.txt} file.}
-% \changes{v0.28}{2017/04/09}{\texttt{FormatWordProcessor} forces single-file output.}
+% \changes{v0.21}{2017/02/22}{Changed \filenm{lateximages} to a \filenm{.txt} file.}
+% \changes{v0.28}{2017/04/09}{\progcode{FormatWordProcessor} forces single-file output.}
% Executed at the beginning of the entire document.
% \begin{macrocode}
\catcode`\$=\active
@@ -15420,7 +15477,7 @@
% \begin{macro}{\LWR at LwarpEnd}
% Final stop of all \HTML\ output:
%
-% \changes{v0.28}{2017/04/06}{If \texttt{FormatEPUB} or \texttt{FormatWordProcessor}, no bottom nav.}
+% \changes{v0.28}{2017/04/06}{If \progcode{FormatEPUB} or \progcode{FormatWP}, no bottom nav.}
% \begin{macrocode}
\newcommand*{\LWR at LwarpEnd}
{
@@ -15605,7 +15662,29 @@
% when \cs{author} is later used inline.
%
%
+% \subsection{\cs{if at titlepage}}
%
+% \codeall
+% \begin{macrocode}
+\begin{warpall}
+% \end{macrocode}
+%
+% \begin{macro}{\if at titlepage}
+% Some classes do not provide \cs{if at titlepage}.
+% In this case, provide it and force it |false|.
+% \begin{macrocode}
+\ifcsvoid{@titlepagefalse}{
+ \newif\if at titlepage
+ \@titlepagefalse
+}{}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macrocode}
+\end{warpall}
+% \end{macrocode}
+%
+%
% \subsection{Changes for \cs{affiliation}}
%
%
@@ -15616,10 +15695,12 @@
% Inside \env{titlepage}, this macro prints its argument.
% Outside, it is null.
%
+% \changes{v0.49}{2018/02/18}{Fix: Adapts to classes which already provide.}
+%
% \codeall
% \begin{macrocode}
\begin{warpall}
-\newrobustcmd{\affiliation}[1]{}
+\providerobustcmd{\affiliation}[1]{}
\end{warpall}
% \end{macrocode}
% \end{macro}
@@ -16975,7 +17056,7 @@
%
% \changes{v0.20}{2017/01/07}{Added @, \protect\textless, \protect\textgreater\ columns.}
% \changes{v0.20}{2017/01/17}{Tabular: \cs{unskip} extra spaces.}
-% \changes{v0.33}{2017/06/20}{New handling of \protect\texttt{\&} to localize catcode changes.}
+% \changes{v0.33}{2017/06/20}{New handling of \progcode{\&} to localize catcode changes.}
% \changes{v0.33}{2017/07/10}{Add: Tabular at and bang columns now have their
% own HTML columns.}
%
@@ -17257,7 +17338,7 @@
% there is no data tag to close.
% Otherwise, close any paragraphs, then close the data tag.
%
-% \changes{v0.41}{2017/10/02}{Add: Mute \protect\texttt{\protect\textgreater} for \cs{bottomrule}.}
+% \changes{v0.41}{2017/10/02}{Add: Mute \progcode{\protect\textgreater} for \cs{bottomrule}.}
%
% \begin{macrocode}
\newcommand*{\LWR at closetabledatacell}{%
@@ -17279,7 +17360,7 @@
% \end{macrocode}
% Insert any |<| then any |@| and |!| column contents, unless muted
% for the \cs{bottomrule} or a \cs{multicolumn}:
-% \changes{v0.41}{2017/10/02}{Fix: Cancel \protect\texttt{\protect\textless} for \cs{multicolumn}.}
+% \changes{v0.41}{2017/10/02}{Fix: Cancel \progcode{\protect\textless} for \cs{multicolumn}.}
% \begin{macrocode}
\unskip%
\ifboolexpr{%
@@ -17339,7 +17420,7 @@
%
%
%
-% \subsubsection{Localizing \& catcodes}
+% \subsubsection{Localizing \progcode{\&} catcodes}
% \label{sec:localizingampersand}
%
% \codeall
@@ -17352,9 +17433,9 @@
% \index{alignment tab character \&, misplaced}
% \index{misplaced alignment tab character \&}
% before and after defining macros or environments which include
-% the tabular \texttt{\&} character in their definitions.
+% the tabular |&| character in their definitions.
%
-% The catcode of \texttt{\&} must be changed before the definitions begin,
+% The catcode of |&| must be changed before the definitions begin,
% and must be restored afterwards. Doing so avoids the error\\
% \hspace*{.5in}\texttt{misplaced alignment tab character \&}
%
@@ -17382,7 +17463,7 @@
% \end{macrocode}
%
%
-% \subsubsection{Handling \&}
+% \subsubsection{Handling \progcode{\&}}
%
%
% \codehtml
@@ -17536,16 +17617,25 @@
% \begin{macro}{\LWR at tabularendofline}
% \begin{macrocode}
\NewDocumentCommand{\LWR at tabularendofline}{s o}{%
+% \end{macrocode}
+% Finish the row:
+% \begin{macrocode}
\ifnumcomp{\value{LWR at tablecolindex}}{<}{\value{LWR at tabletotalcols}}%
{\LWR at tabularfinishrow}%
{\LWR at closetabledatacell}%
+\LWR at htmltag{/tr}\LWR at orignewline%
+% \end{macrocode}
+% \pkg{xcolor} row color support:
% \begin{macrocode}
-\LWR at htmltag{/tr}\LWR at orignewline
-\global\booltrue{LWR at intabularmetadata}
+\@rowc at lors%
% \end{macrocode}
+% No longer inside a data cell:
+% \begin{macrocode}
+\global\booltrue{LWR at intabularmetadata}%
+% \end{macrocode}
% Not yet started a table row:
% \begin{macrocode}
-\global\boolfalse{LWR at startedrow}
+\global\boolfalse{LWR at startedrow}%
% \end{macrocode}
% Additional setup:
% \begin{macrocode}
@@ -17553,7 +17643,7 @@
\global\boolfalse{LWR at doingtbrule}%
\global\boolfalse{LWR at doingcmidrule}%
\LWR at clearmidrules%
-\renewcommand*{\LWR at rowHTMLcolor}{}
+\renewcommand*{\LWR at rowHTMLcolor}{}%
% \end{macrocode}
% Start at first column:
% \begin{macrocode}
@@ -17584,7 +17674,7 @@
%
% Handles |@{text}| columns.
%
-% \changes{v0.33}{2017/07/07}{Fix: Column alignment with leftmost \protect\texttt{@}.}
+% \changes{v0.33}{2017/07/07}{Fix: Column alignment with leftmost \progcode{@}.}
%
% \begin{macrocode}
\newcommand*{\LWR at parseatcolumn}{%
@@ -17627,7 +17717,7 @@
% \begin{macro}{\LWR at parsebangcolumn}
% Handles |!{text}| columns.
%
-% \changes{v0.22}{2017/02/28}{Added tabular \texttt{!!} column.}
+% \changes{v0.22}{2017/02/28}{Added tabular \progcode{!!} column.}
%
% \begin{macrocode}
\newcommand*{\LWR at parsebangcolumn}{%
@@ -17790,7 +17880,7 @@
% \begin{macro}{\LWR at parseDcolumn} \marg{thiscolumn}
% The three parameters will be ignored.
%
-% \changes{v0.22}{2017/02/24}{Added tabular \texttt{D} column.}
+% \changes{v0.22}{2017/02/24}{Added tabular \progcode{D} column.}
%
% \begin{macrocode}
\newcommand*{\LWR at parseDcolumn}[1]{%
@@ -17898,8 +17988,8 @@
% one column per entry. The final number of cells in each row is
% stored in |LWR at tabletotalcols|.
%
-% \changes{v0.22}{2017/02/28}{Unknown table column types become \texttt{l}.
-% Added tabular \texttt{D}, \texttt{!!}, \texttt{X} columns.}
+% \changes{v0.22}{2017/02/28}{Unknown table column types become \progcode{l}.
+% Added tabular \progcode{D}, \progcode{!!}, \progcode{X} columns.}
%
% \changes{v0.23}{2017/03/02}{Fix for vert bar column type.}
% \changes{v0.28}{2017/04/11}{Added L, C, R, J column types.}
@@ -18056,39 +18146,65 @@
% \end{macro}
-% \subsection{\pkg{colortbl} support}
+% \subsection{\pkg{colortbl} and \pkg{xparse} tabular color support}
%
% \changes{v0.48}{2018/02/06}{\pkg{colortbl}: Added.}
+% \changes{v0.49}{2018/02/17}{\pkg{xcolor}: Added tabular row colors.}
%
% These macros provide a minimal emulation of some \pkg{colortbl} macros
% which might appear between table cells.
% If \pkg{colortbl} is loaded, these macros will be replaced with
% functional versions.
-
+%
% For each of the HTML colors below, the text for the \HTML\ color is
% set if requested, but the macro is empty if none has been set.
%
+% \begin{macro}{\rownum}
+% Reserve a counter register.
+% \begin{macrocode}
+ \@ifundefined{rownum}{\newcount\rownum}{}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@rowcolors} Emulated in case \pkg{xcolor} is not used.
+% \begin{macrocode}
+\newcommand*{\@rowcolors}{}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@rowc at lors} Emulated in case \pkg{xcolor} is not used.
+% \begin{macrocode}
+\newcommand*{\@rowc at lors}{}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\LWR at xcolorrowHTMLcolor} Emulated \pkg{xcolor} row color.
+% \begin{macrocode}
+\newcommand*{\LWR at xcolorrowHTMLcolor}{}
+% \end{macrocode}
+% \end{macro}
+%
% \begin{macro}{\LWR at columnHTMLcolor} \HTML style code for the column color.
% \begin{macrocode}
-\newcommand{\LWR at columnHTMLcolor}{}
+\newcommand*{\LWR at columnHTMLcolor}{}
% \end{macrocode}
% \end{macro}
%
% \begin{macro}{\LWR at rowHTMLcolor} \HTML style code for the row color.
% \begin{macrocode}
-\newcommand{\LWR at rowHTMLcolor}{}
+\newcommand*{\LWR at rowHTMLcolor}{}
% \end{macrocode}
% \end{macro}
%
% \begin{macro}{\LWR at cellHTMLcolor} \HTML style code for the cell color.
% \begin{macrocode}
-\newcommand{\LWR at cellHTMLcolor}{}
+\newcommand*{\LWR at cellHTMLcolor}{}
% \end{macrocode}
% \end{macro}
%
% \begin{macro}{\LWR at ruleHTMLcolor} \HTML style code for the cell color.
% \begin{macrocode}
-\newcommand{\LWR at ruleHTMLcolor}{}
+\newcommand*{\LWR at ruleHTMLcolor}{}
% \end{macrocode}
% \end{macro}
%
@@ -18317,7 +18433,7 @@
%
% \changes{v0.33}{2017/06/22}{Fix: Macros in tabular could cause extra data cell.}
% \changes{v0.41}{2017/09/28}{Add: \cs{cmidrule} trims.}
-% \changes{v0.41}{2017/10/02}{Add: Mute \protect\texttt{\protect\textless} for \cs{bottomrule}.}
+% \changes{v0.41}{2017/10/02}{Add: Mute \progcode{\protect\textless} for \cs{bottomrule}.}
%
% \begin{macrocode}
\newcommand*{\LWR at tabledatasinglecolumntag}%
@@ -18361,7 +18477,7 @@
"%
% \end{macrocode}
% Add styles for rules, alignment:
-% \changes{v0.42}{2017/10/26}{If \protect\texttt{FormatWP} add cell alignment.}
+% \changes{v0.42}{2017/10/26}{If \progcode{FormatWP} add cell alignment.}
% \begin{macrocode}
\LWR at tdstartstyles%
\LWR at addcmidrulewidth%
@@ -18643,7 +18759,7 @@
%
% Must be placed between \cs{LWR at tdstartstyles} and \cs{LWR at tdendstyles}.
%
-% \changes{v0.42}{2017/10/10}{If \protect\texttt{FormatWP} force explicit border.}
+% \changes{v0.42}{2017/10/10}{If \progcode{FormatWP} force explicit border.}
%
% \begin{macrocode}
\newcommand{\LWR at addrulewidth}[2]{%
@@ -18671,8 +18787,7 @@
% \end{macrocode}
% The style itself:
% \begin{macrocode}
- \uselengthunit{PT}%
- border-top:\rndprintlength{\LWR at atleastonept} solid %
+ border-top:\LWR at printlength{\LWR at atleastonept} solid %
% \end{macrocode}
% If default gray, the darkness of the color depends on the thickness of the rule:
% \begin{macrocode}
@@ -18720,9 +18835,9 @@
%
% Must be placed between \cs{LWR at tdstartstyles} and \cs{LWR at tdendstyles}.
%
-% \changes{v0.42}{2017/10/26}{If \protect\texttt{FormatWP} add explicit style
+% \changes{v0.42}{2017/10/26}{If \progcode{FormatWP} add explicit style
% for cell alignment.}
-% \changes{v0.44}{2017/11/08}{Fix for multicolumn alignment if \protect\texttt{FormatWP}.}
+% \changes{v0.44}{2017/11/08}{Fix for multicolumn alignment if \progcode{FormatWP}.}
% \begin{macrocode}
\newcommand*{\LWR at addformatwpalignment}[1]{%
\ifbool{FormatWP}{%
@@ -18752,11 +18867,17 @@
% \begin{macrocode}
\newcommand*{\LWR at addtabularrowcolor}{%
\ifbool{LWR at tabularmutemods}{}{%
- \ifdefvoid{\LWR at rowHTMLcolor}{}%
- {% row color
+ \ifdefvoid{\LWR at rowHTMLcolor}{%
+ \ifdefvoid{\LWR at xcolorrowHTMLcolor}{}%
+ {% xcolor row color
+ \LWR at tdaddstyle%
+ background:\#\LWR at xcolorrowHTMLcolor%
+ }%
+ }%
+ {% explicit row color
\LWR at tdaddstyle%
background:\#\LWR at rowHTMLcolor%
- }% row color
+ }%
}%
}
% \end{macrocode}
@@ -18858,6 +18979,7 @@
% \begin{macro}{\LWR at addtabularcellcolor} Adds a cell color style, if needed.
+% \changes{v0.49}{2018/02/18}{\pkg{xcolor}: Added tabular row colors.}
% \begin{macrocode}
\newcommand*{\LWR at addtabularcellcolor}{%
\ifdefvoid{\LWR at cellHTMLcolor}%
@@ -18864,9 +18986,13 @@
{%
\ifdefvoid{\LWR at rowHTMLcolor}%
{%
- \ifdefvoid{\LWR at columnHTMLcolor}%
- {}%
- {\LWR at subaddtabularcellcolor{\LWR at columnHTMLcolor}}%
+ \ifdefvoid{\LWR at xcolorrowHTMLcolor}%
+ {%
+ \ifdefvoid{\LWR at columnHTMLcolor}%
+ {}%
+ {\LWR at subaddtabularcellcolor{\LWR at columnHTMLcolor}}%
+ }%
+ {\LWR at subaddtabularcellcolor{\LWR at xcolorrowHTMLcolor}}%
}%
{\LWR at subaddtabularcellcolor{\LWR at rowHTMLcolor}}%
}%
@@ -18975,8 +19101,8 @@
% \begin{macro}{\LWR at printmccoldata} \marg{colspec}
% Print the data for any valid column type found.
%
-% \changes{v0.22}{2017/02/28}{Added tabular \texttt{D}, \texttt{!!},
-% and \texttt{X} columns.}
+% \changes{v0.22}{2017/02/28}{Added tabular \progcode{D}, \progcode{!!},
+% and \progcode{X} columns.}
%
% \changes{v0.23}{2017/03/02}{Fix for vert bar column type.}
%
@@ -19111,7 +19237,7 @@
% \marg{3: numLaTeXcols} \marg{4: numHTMLcols}
% \marg{5: colspec} \marg{6: text}
%
-% \changes{v0.39}{2017/08/30}{Add: Optional \protect\texttt{vpos} and \# rows.}
+% \changes{v0.39}{2017/08/30}{Add: Optional \optn{vpos} and \# rows.}
% \changes{v0.41}{2017/09/28}{Add: \cs{cmidrule} trims.}
%
% \begin{macrocode}
@@ -19186,9 +19312,15 @@
% \begin{macrocode}
"%
% \end{macrocode}
-% \changes{v0.42}{2017/10/26}{If \protect\texttt{FormatWP} add cell alignment.}
+% \changes{v0.42}{2017/10/26}{If \progcode{FormatWP} add cell alignment.}
% \begin{macrocode}
\LWR at tdstartstyles%
+% \end{macrocode}
+% \changes{v0.49}{2018/02/18}{\pkg{xcolor}: Added tabular row colors.}
+% \begin{macrocode}
+\LWR at addtabularrowcolor%
+% \end{macrocode}
+% \begin{macrocode}
\LWR at addcmidrulewidth%
\LWR at addtabularhrulecolor%
\LWR at addmulticolvertrulecolor%
@@ -19703,6 +19835,8 @@
{\let\mynext\LWR at donothing}{}%
\ifdefequal{\LWR at mynexttoken}{\multicolumnrow}%
{\let\mynext\LWR at donothing}{}%
+\ifdefequal{\LWR at mynexttoken}{\noalign}%
+ {\let\mynext\LWR at donothing}{}%
% \end{macrocode}
% If an \cs{mrowcell}, this is a cell to be skipped over:
% \begin{macrocode}
@@ -19790,7 +19924,7 @@
% \end{macrocode}
-% \subsection{\textbackslash{}mrowcell}
+% \subsection{\cs{mrowcell}}
% \codeall
% \begin{macrocode}
@@ -19811,7 +19945,7 @@
% \end{macro}
-% \subsection{\textbackslash{}mcolrowcell}
+% \subsection{\cs{mcolrowcell}}
% \codeall
% \begin{macrocode}
@@ -19837,7 +19971,7 @@
-% \subsection{New \textbackslash{}tabular definition}
+% \subsection{New \env{tabular} environment}
% \codehtml
% \begin{macrocode}
@@ -19860,12 +19994,30 @@
% \end{macrocode}
%
%
+% \begin{macro}{\noalign} \marg{text}
+% Redefined for use inside \env{tabular}.
+% \changes{v0.49}{2018/02/18}{Fix: \cs{noalign} inside \env{tabular}.}
+% \begin{macrocode}
+\LetLtxMacro\LWR at orignoalign\noalign
+
+\newcommand{\LWR at tabularnoalign}[1]{%
+\begingroup%
+\global\advance\rownum\m at ne%
+\renewcommand*{\LWR at xcolorrowHTMLcolor}{}%
+\multicolumn{\value{LWR at tabletotalcols}}{l}{#1} \\
+\endgroup%
+% \@rowc at lors%
+\LWR at getmynexttoken%
+}
+% \end{macrocode}
+% \end{macro}
+%
% \begin{macro}{\LWR at HTMLhline}
% The definition of \cs{hline} depends on whether \pkg{tabls} has been loaded.
% If so, optional space below the line may be specified, but will be ignored.
%
% \changes{v0.40}{2017/09/06}{Added.}
-% \changes{v0.42}{2017/10/19}{If \protect\texttt{FormatWP} force explicit border.}
+% \changes{v0.42}{2017/10/19}{If \progcode{FormatWP} force explicit border.}
%
% \begin{macrocode}
\AtBeginDocument{
@@ -20000,24 +20152,25 @@
% The following adjust for \pkg{colortbl}:
% \changes{v0.48}{2018/02/06}{\pkg{colortbl}: Added.}
% \begin{macrocode}
-\LetLtxMacro\columncolor\LWR at HTMLcolumncolor
-\LetLtxMacro\rowcolor\LWR at HTMLrowcolor
-\LetLtxMacro\cellcolor\LWR at HTMLcellcolor
-\LetLtxMacro\arrayrulecolor\LWR at HTMLarrayrulecolor
-\LetLtxMacro\doublerulesepcolor\LWR at HTMLdoublerulesepcolor
-\renewcommand*{\LWR at columnHTMLcolor}{}
-\renewcommand*{\LWR at rowHTMLcolor}{}
-\renewcommand*{\LWR at cellHTMLcolor}{}
+\LetLtxMacro\columncolor\LWR at HTMLcolumncolor%
+\LetLtxMacro\rowcolor\LWR at HTMLrowcolor%
+\LetLtxMacro\cellcolor\LWR at HTMLcellcolor%
+\LetLtxMacro\arrayrulecolor\LWR at HTMLarrayrulecolor%
+\LetLtxMacro\doublerulesepcolor\LWR at HTMLdoublerulesepcolor%
+\renewcommand*{\LWR at columnHTMLcolor}{}%
+\renewcommand*{\LWR at rowHTMLcolor}{}%
+\renewcommand*{\LWR at cellHTMLcolor}{}%
+\@rowcolors%
% \end{macrocode}
% The vertical rules are set to the color active at the start of the tabular.
% \cs{arrayrulecolor} will then affect horizontal rules inside the tabular,
% but not the vertical rules.
% \begin{macrocode}
-\edef\LWR at vertruleHTMLcolor{\LWR at ruleHTMLcolor}
+\edef\LWR at vertruleHTMLcolor{\LWR at ruleHTMLcolor}%
% \end{macrocode}
% Tracking the depth of cell color \element{div}s:
% \begin{macrocode}
-\setcounter{LWR at cellcolordepth}{0}
+\setcounter{LWR at cellcolordepth}{0}%
% \end{macrocode}
%
% The following may appear before a data cell is created,
@@ -20027,13 +20180,14 @@
% The optional parameter for \cs{hline} supports the \pkg{tabls} package.
% \begin{macrocode}
\LWR at traceinfo{LWR at tabular: redefining macros}%
+\LetLtxMacro\noalign\LWR at tabularnoalign%
\LetLtxMacro\hline\LWR at HTMLhline%
\LetLtxMacro\cline\LWR at HTMLcline%
% \end{macrocode}
% \changes{v0.41}{2017/10/03}{Improved rules.}
-% \changes{v0.42}{2017/10/19}{If \protect\texttt{FormatWP} force explicit border.}
+% \changes{v0.42}{2017/10/19}{If \progcode{FormatWP} force explicit border.}
% \begin{macrocode}
-\DeclareDocumentCommand{\toprule}{o d()}
+\DeclareDocumentCommand{\toprule}{o d()}%
{%
\IfValueTF{##1}%
{\LWR at docmidrule[##1](){1-\arabic{LWR at tabletotalcols}}}%
@@ -20058,7 +20212,7 @@
\DeclareDocumentCommand{\cmidrule}{O{\LWR at cmidrulewidth} d() m}%
{\LWR at docmidrule[##1](##2){##3}\LWR at getmynexttoken}%
%
-\DeclareDocumentCommand{\bottomrule}{o d()}
+\DeclareDocumentCommand{\bottomrule}{o d()}%
{%
\IfValueTF{##1}%
{\LWR at docmidrule[##1](){1-\arabic{LWR at tabletotalcols}}}%
@@ -20142,6 +20296,12 @@
\LWR at closetabledatacell%
}%
\LWR at htmlblocktag{/tr}%
+% \end{macrocode}
+% \pkg{xcolor} row color support:
+% \begin{macrocode}
+\@rowc at lors%
+% \end{macrocode}
+% \begin{macrocode}
\LWR at htmlblocktag{/table}%
\global\boolfalse{LWR at intabularmetadata}%
% \end{macrocode}
@@ -20737,8 +20897,9 @@
% Create a link with accompanying text:
%
% \changes{v0.43}{2017/10/31}{Made robust.}
+% \changes{v0.49}{2018/02/18}{Fix: Adapt to classes.}
% \begin{macrocode}
-\NewDocumentCommand{\href}{O{} m +m}{%
+\DeclareDocumentCommand{\href}{O{} m +m}{%
\LWR at ensuredoingapar%
\LWR at subhyperref{#2}{#3}%
}
@@ -20769,8 +20930,9 @@
%
% \changes{v0.43}{2017/10/31}{Made robust.}
% \changes{v0.45}{2017/12/29}{Improved URLs with underscores.}
+% \changes{v0.49}{2018/02/18}{Fix: Adapt to classes.}
% \begin{macrocode}
-\NewDocumentCommand{\url}{m}{%
+\DeclareDocumentCommand{\url}{m}{%
\LWR at ensuredoingapar%
\def\LWR at templink{#1}%
\@onelevel at sanitize\LWR at templink%
@@ -20818,7 +20980,7 @@
%
% \hrule
% \begin{description}
-% \item [counter <type>:] A counter called |<type>|, such as |figure|, |table|.
+% \item [counter \progcode{<type>}:] A counter called |<type>|, such as |figure|, |table|.
% \item [\cs{<type>name}:] Name. \cs{figurename} prints ``Figure'', etc.%
% \item [\cs{ext@<type>}:] File extension. \cs{ext at figure} prints ``lof'', etc.
% \item [\cs{fps@<type>}:] Placement.
@@ -20830,11 +20992,11 @@
% \item [\cs{<type>}:] Starts the float environment. |\figure| or |\begin{figure}|
% \item [\cs{end<type>}:] Ends the float environment. |\endfigure| or |\end{figure}|
% \item [\cs{tf@<ext>}:] The \LaTeX{} file identifier for the output file.
-% \item [\texttt{LWR at have<type>}:] A boolean rememebering whether a \cs{listof} was
+% \item [\progcode{LWR at have<type>}:] A boolean rememebering whether a \cs{listof} was
% requested for a float of this type.
-% \item [File with extension lo<f,t,a-z>:] An output file containing
+% \item [File with extension \filenm{lo<f,t,a-z>}:] An output file containing
% the commands to build the
-% \cs{listof}{<type>}{<name>} ``table-of-contents'' structure.
+% \cs{listof<type>} ``table-of-contents'' structure.
% \item [Cross-referencing names:] For \pkg{cleveref}'s \cs{cref} and related,
% \cs{crefname} and \cs{Crefname} assign human-readable names for references to this float type.
% \end{description}
@@ -20879,7 +21041,7 @@
\LWR at origraggedright%
% \end{macrocode}
% Open an \HTML\ |figure| tag:
-% \changes{v0.42}{2017/10/26}{If \protect\texttt{FormatWP} add a text frame.}
+% \changes{v0.42}{2017/10/26}{If \progcode{FormatWP} add a text frame.}
% \changes{v0.47}{2018/01/26}{Fix: Line wrap at \HTML\ hyphen.}
% \begin{macrocode}
\LWR at htmltag{figure id="\LWR at origmbox{autoid-\arabic{LWR at thisautoid}}" class="#1"}%
@@ -20925,7 +21087,7 @@
\LWR at stoppars%
% \end{macrocode}
% Close an \HTML\ |figure| tag:
-% \changes{v0.42}{2017/10/26}{If \protect\texttt{FormatWP} add a text frame.}
+% \changes{v0.42}{2017/10/26}{If \progcode{FormatWP} add a text frame.}
% \begin{macrocode}
\ifbool{FormatWP}{\endLWR at BlockClassWP}{}%
\LWR at htmlelementend{figure}%
@@ -21069,7 +21231,7 @@
% \begin{environment}{LWR at figcaption}
% \qquad Encapsulates a caption inside \element{figcaption},
% and if |FormatWP| then also a \element{div} with an italic style.
-% \changes{v0.42}{2017/10/20}{If \protect\texttt{FormatWP} forces italic captions.}
+% \changes{v0.42}{2017/10/20}{If \progcode{FormatWP} forces italic captions.}
% \begin{macrocode}
\newenvironment*{LWR at figcaption}
{%
@@ -21388,7 +21550,7 @@
% \end{macrocode}
% Do not print the table of contents if formatting for a word processor,
% which will presumably auto-generate its own updated table of contents:
-% \changes{v0.42}{2017/10/18}{Added boolean \protect\texttt{WPMarkTOC}.}
+% \changes{v0.42}{2017/10/18}{Added boolean \progcode{WPMarkTOC}.}
% \begin{macrocode}
\ifboolexpr{bool{FormatWP} and bool{WPMarkTOC}}{
@@ -21413,7 +21575,7 @@
% \end{macro}
% \begin{macro}{\listoffigures}
-% \changes{v0.42}{2017/10/18}{Added boolean \protect\texttt{WPMarkLOFT}.}
+% \changes{v0.42}{2017/10/18}{Added boolean \progcode{WPMarkLOFT}.}
% \begin{macrocode}
\let\LWR at origlistoffigures\listoffigures
@@ -21432,7 +21594,7 @@
% \end{macro}
% \begin{macro}{\listoftables}
-% \changes{v0.42}{2017/10/18}{Added boolean \protect\texttt{WPMarkLOFT}.}
+% \changes{v0.42}{2017/10/18}{Added boolean \progcode{WPMarkLOFT}.}
% \begin{macrocode}
\let\LWR at origlistoftables\listoftables
@@ -21645,7 +21807,7 @@
% \item[\#5] page number
% \end{description}
%
-% \changes{v0.24}{2017/03/06}{List of floats responds to \texttt{lofdepth}, \texttt{lotdepth}.}
+% \changes{v0.24}{2017/03/06}{List of floats responds to \progcode{lofdepth}, \progcode{lotdepth}.}
%
% \begin{macrocode}
\newcommand{\hypertocfloat}[5]{%
@@ -22100,6 +22262,7 @@
\let\qquad\LWR at origqquad%
\LetLtxMacro\tabular\LWR at origtabular%
\LetLtxMacro\endtabular\LWR at origendtabular%
+\LetLtxMacro\noalign\LWR at orignoalign%
\LetLtxMacro\hline\LWR at orighline%
\LetLtxMacro\toprule\LWR at origtoprule%
\LetLtxMacro\midrule\LWR at origmidrule%
@@ -22240,7 +22403,7 @@
\protected\gdef\LWR at doubledollar$#1$${
% \end{macrocode}
% If \brand{MathJax} or formatting for a word processor, print the \LaTeX\ expression:
-% \changes{v0.42}{2017/10/26}{If \protect\texttt{FormatWP} print LaTeX expression.}
+% \changes{v0.42}{2017/10/26}{If \progcode{FormatWP} print LaTeX expression.}
% \begin{macrocode}
\ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }%
% \end{macrocode}
@@ -22275,7 +22438,7 @@
% Redefine the single dollar sign to place math inside a \env{lateximage}, or use \brand{MathJax}:
%
% \changes{v0.19}{2016/05/25}{\brand{MathJax} support.}
-% \changes{v0.42}{2017/10/26}{If \protect\texttt{FormatWP} print LaTeX expression.}
+% \changes{v0.42}{2017/10/26}{If \progcode{FormatWP} print LaTeX expression.}
% \changes{v0.47}{2018/01/24}{Added \SVG\ math image baseline adjust and em sizing.}
% \begin{macrocode}
\newlength{\LWR at singledollarwidth}
@@ -22284,7 +22447,6 @@
\protected\gdef\LWR at subsingledollar#1{%
\begingroup%
-\normalsize%
\ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }%
% \end{macrocode}
% For \brand{MathJax}, print the math between |\(| and |\)|:
@@ -22313,6 +22475,11 @@
\LWR at origdollar#1\LWR at origdollar%
}*\real{.8}}%
% \end{macrocode}
+% \changes{v0.49}{2018/02/18}{Fix: Incorrect \PDF\ output size corrupted \HTML.}
+% \begin{macrocode}
+ \LWR at origscriptsize%
+% \end{macrocode}
+%
% Set a style for the the height or width.
% The |em| unit is used so that the math scales according to the
% user's selected font size.
@@ -22604,7 +22771,7 @@
% \end{macrocode}
% If |mathjax| or |FormatWP|, print the \LaTeX\ expression:
-% \changes{v0.42}{2017/10/26}{If \protect\texttt{FormatWP} print LaTeX expression.}
+% \changes{v0.42}{2017/10/26}{If \progcode{FormatWP} print LaTeX expression.}
% \begin{macrocode}
\ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }%
% \end{macrocode}
@@ -22705,7 +22872,7 @@
\LWR at traceinfo{LWR at htmlmathlabelb #1}%
% \end{macrocode}
% If |mathjax| or |FormatWP|, print the \LaTeX\ expression:
-% \changes{v0.42}{2017/10/26}{If \protect\texttt{FormatWP} print LaTeX expression.}
+% \changes{v0.42}{2017/10/26}{If \progcode{FormatWP} print LaTeX expression.}
% \begin{macrocode}
\ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }%
{%
@@ -22773,7 +22940,7 @@
%
% \changes{v0.19}{2016/05/25}{\brand{MathJax} support added.}
% \changes{v0.33}{2017/06/20}{Fix: Incorrectly-inline math environments.}
-% \changes{v0.34}{2017/07/29}{Fix: Added the \protect\texttt{eqnarray} environments.}
+% \changes{v0.34}{2017/07/29}{Fix: Added the \env{eqnarray} environments.}
%
% The following \pkg{amsmath} environments already collect their contents
% in \cs{@envbody} for further processing. \env{eqnarray} is not an \AmS\ package,
@@ -22815,7 +22982,7 @@
% \end{macrocode}
%
% If |mathjax| or |FormatWP|, print the \LaTeX\ expression:
-% \changes{v0.42}{2017/10/26}{If \protect\texttt{FormatWP} print LaTeX expression.}
+% \changes{v0.42}{2017/10/26}{If \progcode{FormatWP} print LaTeX expression.}
% \begin{macrocode}
\ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }%
{%
@@ -23690,7 +23857,7 @@
% \begin{environment}{center}
% Replace \env{center} functionality with \CSS\ tags:
-% \changes{v0.42}{2017/10/26}{If \protect\texttt{FormatWP} use explicit \attribute{text-align}.}
+% \changes{v0.42}{2017/10/26}{If \progcode{FormatWP} use explicit \attribute{text-align}.}
% \changes{v0.47}{2018/01/26}{Fix: Line wrap at \HTML\ hyphen.}
% \begin{macrocode}
\renewenvironment*{center}
@@ -24442,10 +24609,7 @@
\RenewDocumentEnvironment{minipage}{O{t} o O{t} m}
{%
% \end{macrocode}
-% Units for printing dimensions to \HTML:
-% \begin{macrocode}
-\uselengthunit{PT}%
-% \end{macrocode}
+%
% Temporarily open a group, in which width and height is
% computed based on a virtual page size instead of
% the extra-large \PDF\ page used during \HTML\ tag generation.
@@ -24471,7 +24635,7 @@
\setlength{\textwidth}{6in}%
\setlength{\textheight}{9in}%
}{}%
-\LWR at traceinfo{computed width is \rndprintlength{\LWR at minipagewidth}}%
+\LWR at traceinfo{computed width is \LWR at printlength{\LWR at minipagewidth}}%
% \end{macrocode}
% Compute height:
% \begin{macrocode}
@@ -24490,7 +24654,7 @@
\LWR at stoppars%
% \end{macrocode}
% If |FormatWP|, add a text frame:
-% \changes{v0.42}{2017/10/26}{If \protect\texttt{FormatWP} add a text frame.}
+% \changes{v0.42}{2017/10/26}{If \progcode{FormatWP} add a text frame.}
% \changes{v0.47}{2018/01/26}{Fix: Line wrap at \HTML\ hyphen.}
% \begin{macrocode}
\ifbool{FormatWP}{%
@@ -24515,17 +24679,16 @@
% \end{macrocode}
% Print the width and optional height styles:
% \begin{macrocode}
-\LWR at traceinfo{minipage: about to print the width of \rndprintlength{\LWR at minipagewidth}}%
-\uselengthunit{PT}%
+\LWR at traceinfo{minipage: about to print the width of \LWR at printlength{\LWR at minipagewidth}}%
\ifbool{LWR at minipagefullwidth}%
{\boolfalse{LWR at minipagefullwidth}}%
{%
\ifthenelse{\lengthtest{#4}=\linewidth}%
{}%
- {width:\rndprintlength{\LWR at minipagewidth} ; }%
+ {width:\LWR at printlength{\LWR at minipagewidth} ; }%
}%
\LWR at traceinfo{minipage: about to print the height}%
-\IfValueT{#2}{height:\rndprintlength{\LWR at minipageheight} ; }%
+\IfValueT{#2}{height:\LWR at printlength{\LWR at minipageheight} ; }%
"}%
% \end{macrocode}
% Finish with an empty line to start the contents on a new line.
@@ -24554,7 +24717,7 @@
\let\@footnotetext\@mpfootnotetext%
% \end{macrocode}
% Resume paragraph tag handling for the contents of the minipage:
-% \changes{v0.42}{2017/10/18}{Added boolean \protect\texttt{WPMarkMinipages}.}
+% \changes{v0.42}{2017/10/18}{Added boolean \progcode{WPMarkMinipages}.}
% \begin{macrocode}
\LWR at startpars%
\ifboolexpr{bool{FormatWP} and bool{WPMarkMinipages}}{%
@@ -24572,7 +24735,7 @@
\LWR at printpendingmpfootnotes%
% \end{macrocode}
% End the environment with closing tag:
-% \changes{v0.42}{2017/10/18}{Added boolean \protect\texttt{WPMarkMinipages}.}
+% \changes{v0.42}{2017/10/18}{Added boolean \progcode{WPMarkMinipages}.}
% \begin{macrocode}
\ifboolexpr{bool{FormatWP} and bool{WPMarkMinipages}}{%
@@ -24665,11 +24828,10 @@
% \attribute{text-alignment} to be used in a \element{span}.
% \changes{v0.47}{2018/01/26}{Fix: Line wrap at \HTML\ hyphen.}
% \begin{macrocode}
- \uselengthunit{PT}%
\InlineClass[%
\LWR at origmbox{display:inline-block} ; %
\LWR at origmbox{text-align}:\LWR at align\ ; %
- width:\rndprintlength{\LWR at tempwidth}%
+ width:\LWR at printlength{\LWR at tempwidth}%
]%
{makebox}%
% \end{macrocode}
@@ -24732,9 +24894,8 @@
%
% \begin{macrocode}
\newcommand*{\LWR at blackborderpadding}{%
-\uselengthunit{PT}%
-border:\rndprintlength{\LWR at atleastonept} solid black ; %
-padding:\rndprintlength{\fboxsep}%
+border:\LWR at printlength{\LWR at atleastonept} solid black ; %
+padding:\LWR at printlength{\fboxsep}%
}
% \end{macrocode}
% \end{macro}
@@ -24808,9 +24969,8 @@
\IfValueT{#2}{\setlength{\LWR at tempheight}{#2}}%
\begin{BlockClass}[%
\LWR at blackborderpadding ; %
-\uselengthunit{PT}%
-\IfValueT{#2}{height:\rndprintlength{\LWR at tempheight} ; }%
-width:\rndprintlength{\LWR at tempwidth}%
+\IfValueT{#2}{height:\LWR at printlength{\LWR at tempheight} ; }%
+width:\LWR at printlength{\LWR at tempwidth}%
]{fminipage}%
}
{%
@@ -24964,7 +25124,7 @@
% \changes{v0.34}{2017/08/05}{Improved font control.}
% \changes{v0.35}{2017/08/08}{Fix: \cs{textbf} and related.}
-% \changes{v0.42}{2017/10/20}{\cs{textbf} and related: If \protect\texttt{FormatWP}, use explicit styles for
+% \changes{v0.42}{2017/10/20}{\cs{textbf} and related: If \progcode{FormatWP}, use explicit styles for
% \cs{textsc}, etc.}
@@ -25327,7 +25487,7 @@
% \begin{macro}{\underline} \marg{text}
% \changes{v0.40}{2017/09/12}{Added.}
-% \changes{v0.42}{2017/10/20}{If \protect\texttt{FormatWP}, use explicit styles for
+% \changes{v0.42}{2017/10/20}{If \progcode{FormatWP}, use explicit styles for
% \cs{underline}, etc.}
% \begin{macrocode}
\renewcommand{\underline}[1]{%
@@ -25381,11 +25541,14 @@
\renewcommand*{\LARGE}{}
\renewcommand*{\huge}{}
\renewcommand*{\Huge}{}
+% \end{macrocode}
+%
+% \changes{v0.49}{2018/02/18}{Fix: Adapt to classes.}
+% \begin{macrocode}
+\DeclareDocumentCommand{\onecolumn}{}{}
-\renewcommand*{\onecolumn}{}
+\DeclareDocumentCommand{\twocolumn}{O{}}{
-\renewcommand{\twocolumn}[1][]{
-
#1
}
@@ -25583,15 +25746,14 @@
% Print the span with the converted width. Not rounded.
% \begin{macrocode}
{%
- \uselengthunit{PT}%
\LWR at htmltagc{%
- span style="width:\printlength{\LWR at tempwidth}; %
+ span style="width:\LWR at printlength{\LWR at tempwidth}; %
display:inline-block"%
}%
% \end{macrocode}
% If formatting for a word processor, approximate with a number of \cs{quad}s,
% in case a span of a given width is not supported:
-% \changes{v0.42}{2017/10/27}{If \protect\texttt{FormatWP} add \cs{quad}s.}
+% \changes{v0.42}{2017/10/27}{If \progcode{FormatWP} add \cs{quad}s.}
% \begin{macrocode}
\ifbool{FormatWP}{%
\setlength{\LWR at templengthone}{\LWR at tempwidth}%
@@ -25756,7 +25918,6 @@
% The width and height are NOT rounded, since a height of
% less than 1pt is quite common in \LaTeX\ code.
% \begin{macrocode}
- \uselengthunit{PT}%
\LWR at htmltagc{%
span
style="%
@@ -25768,8 +25929,8 @@
% \end{macrocode}
% The width and height are printed, converted to PT:
% \begin{macrocode}
- width:\printlength{\LWR at tempwidth} ; %
- height:\printlength{\LWR at tempheight} ; %
+ width:\LWR at printlength{\LWR at tempwidth} ; %
+ height:\LWR at printlength{\LWR at tempheight} ; %
% \end{macrocode}
% The raise height is converted to a \CSS\ transform.
% The |*2| raise multiplier is to approximately match \HTML\ output's X height.
@@ -25784,11 +25945,11 @@
\setlength{\LWR at tempraise}{0pt-#1}%
\setlength{\LWR at tempraise}{\LWR at tempraise*2}%
\LWR at orignewline%
- -ms-transform: translate(0pt,\printlength{\LWR at tempraise}); %
+ -ms-transform: translate(0pt,\LWR at printlength{\LWR at tempraise}); %
\LWR at orignewline%
- -webkit-transform: translate(0pt,\printlength{\LWR at tempraise}); %
+ -webkit-transform: translate(0pt,\LWR at printlength{\LWR at tempraise}); %
\LWR at orignewline%
- transform: translate(0pt,\printlength{\LWR at tempraise}); %
+ transform: translate(0pt,\LWR at printlength{\LWR at tempraise}); %
\LWR at orignewline%
}%
% \end{macrocode}
@@ -25799,7 +25960,7 @@
% \end{macrocode}
% If formatting for a word processor, approximate with a number of underscores,
% in case a span of a given width is not supported:
-% \changes{v0.42}{2017/10/27}{If \protect\texttt{FormatWP} add \cs{quad}s.}
+% \changes{v0.42}{2017/10/27}{If \progcode{FormatWP} add \cs{quad}s.}
% \begin{macrocode}
\ifbool{FormatWP}{%
\setlength{\LWR at templengthone}{\LWR at tempwidth}%
@@ -25839,7 +26000,7 @@
-% \section{\textbackslash{}phantomsection}
+% \section{\cs{phantomsection}}
% \codehtml
% \begin{macrocode}
@@ -25865,7 +26026,7 @@
-% \section{\textbackslash{}LaTeX and other logos}
+% \section{\cs{LaTeX} and other logos}
% Logos for \HTML\ and print modes:
%
@@ -25894,7 +26055,7 @@
%
% |latexlogofont| is a \CSS\ class used to select the font for the rest of the logo in
% \LaTeX, \LuaTeX, \ConTeXt, etc.
-% \changes{v0.42}{2017/10/20}{If \protect\texttt{FormatWP} use explicit style.}
+% \changes{v0.42}{2017/10/20}{If \progcode{FormatWP} use explicit style.}
% \begin{macrocode}
\let\LWR at origTeX\TeX
@@ -25912,7 +26073,7 @@
% \end{macro}
%
% \begin{macro}{\LaTeX}
-% \changes{v0.42}{2017/10/20}{If \protect\texttt{FormatWP} use explicit style.}
+% \changes{v0.42}{2017/10/20}{If \progcode{FormatWP} use explicit style.}
% \begin{macro}{\LaTeXe} \LaTeX, \LaTeXe
% \begin{macrocode}
\let\LWR at origLaTeX\LaTeX
@@ -26044,7 +26205,7 @@
% \end{macrocode}
-% \section{\textbackslash{}AtBeginDocument, \textbackslash{}AtEndDocument}
+% \section{\cs{AtBeginDocument}, \cs{AtEndDocument}}
% \codehtml
% \begin{macrocode}
@@ -26144,7 +26305,7 @@
%
%
%
-% \changes{v0.20}{2016/12/12}{Code factored into independent \texttt{lwarp\_html} files.}
+% \changes{v0.20}{2016/12/12}{Code factored into independent \filenm{lwarp\_html} files.}
%
% The following adjustments apply to the lwarp-* package listings:
%
@@ -26636,16 +26797,12 @@
% \begin{macrocode}
\LWR at forcenewpage%
% \end{macrocode}
-% Print margins in points:
-% \begin{macrocode}
-\uselengthunit{PT}%
-% \end{macrocode}
% Create the \element{div} with the given margin and class:
% \changes{v0.47}{2018/01/26}{\pkg{adjmulticol}: Fix: Line wrap at \HTML\ hyphen.}
% \begin{macrocode}
\BlockClass[%
-\LWR at origmbox{margin-left:\rndprintlength{\LWR at templengthone}} ; %
-\LWR at origmbox{margin-right:\rndprintlength{\LWR at templengthtwo}}%
+\LWR at origmbox{margin-left:\LWR at printlength{\LWR at templengthone}} ; %
+\LWR at origmbox{margin-right:\LWR at printlength{\LWR at templengthtwo}}%
]{\LWR at mcolstype}%
}
{\endBlockClass}
@@ -26751,7 +26908,7 @@
%
% \limitscombiningfloats
%
-% \changes{v0.42}{2017/10/27}{\pkg{algorithmicx}: If \protect\texttt{FormatWP} add \cs{quad}s.}
+% \changes{v0.42}{2017/10/27}{\pkg{algorithmicx}: If \progcode{FormatWP} add \cs{quad}s.}
% \changes{v0.44}{2017/11/16}{\pkg{algorithmicx}: Improved comment symbol.}
%
% \codehtml
@@ -26766,9 +26923,8 @@
%
\renewcommand*{\ALG at doentity}{%
\origALG at doentity%
-\uselengthunit{PT}%
\LWR at htmltagc{%
-span style="width:\rndprintlength{\ALG at thistlm}; display:inline-block;"%
+span style="width:\LWR at printlength{\ALG at thistlm}; display:inline-block;"%
}%
\ifbool{FormatWP}{%
\setlength{\LWR at templengthone}{\the\ALG at thistlm}%
@@ -29151,7 +29307,7 @@
% \DescribePackage{epigraph}
% \pkg{epigraph} is emulated.
%
-% \changes{v0.42}{2017/10/27}{\pkg{epigraph}: If \protect\texttt{FormatWP} add HTML styles.}
+% \changes{v0.42}{2017/10/27}{\pkg{epigraph}: If \progcode{FormatWP} add HTML styles.}
%
% \codehtml
@@ -29264,7 +29420,10 @@
\newcommand{\AtTextLowerLeft}[1]{}
\newcommand{\AtTextCenter}[1]{}
\NewDocumentCommand{\AddToShipoutPictureBG}{s +m}{}
-\renewcommand{\AddToShipoutPicture}{\AddToShipoutPictureBG}
+% \end{macrocode}
+% \changes{v0.49}{2018/02/18}{\pkg{eso-pic}: Fix for \cs{AddToShipoutPicture}.}
+% \begin{macrocode}
+\newcommand{\AddToShipoutPicture}{\AddToShipoutPictureBG}
\NewDocumentCommand{\AddToShipoutPictureFG}{s +m}{}
\newcommand*{\ClearShipoutPictureBG}{}
\newcommand*{\ClearShipoutPicture}{}
@@ -29412,7 +29571,7 @@
%
%
% \changes{v0.34}{2017/07/27}{\pkg{fancybox}: Added.}
-% \changes{v0.42}{2017/10/27}{\pkg{fancybox}: If \protect\texttt{FormatWP} add HTML styles.}
+% \changes{v0.42}{2017/10/27}{\pkg{fancybox}: If \progcode{FormatWP} add HTML styles.}
%
% \codehtml
% \begin{macrocode}
@@ -30080,6 +30239,48 @@
%
%
% \iffalse
+%<*figsize>
+% \fi
+%
+% \part{lwarp-figsize.sty}
+%
+% \section{figsize}
+%
+% \credits{Anthony A. Tanbakuchi}
+%
+% \DescribePackage{figsize}
+% \pkg{figsize} is emulated.
+%
+% \changes{v0.49}{2018/02/15}{\pkg{figsize}: Added.}
+%
+% \codehtml
+%
+% \begin{macrocode}
+\LWR at ProvidesPackageDrop{figsize}
+% \end{macrocode}
+%
+% Emulates a virtual 6\texttimes9 inch textsize.
+% \begin{macrocode}
+\newlength{\figwidth}
+\newlength{\figheight}
+
+\newcommand{\SetFigLayout}[3][0]{%
+\setlength{\figheight}{8in}%
+\setlength{\figheight}{\figheight / #2}%
+%
+\setlength{\figwidth}{5.5in}%
+\setlength{\figwidth}{\figwidth / #3}%
+}
+% \end{macrocode}
+%
+% \iffalse
+%</figsize>
+% \fi
+%
+%
+%
+%
+% \iffalse
%<*fix2col>
% \fi
%
@@ -30395,13 +30596,12 @@
\NewDocumentEnvironment{KFLTfloatflt at marginfloat}{O{-1.2ex} m m}
{%
\setlength{\LWR at templengthone}{#3}%
-\uselengthunit{PT}%
\LWR at BlockClassWP{%
float:right; %
- width:\rndprintlength{\LWR at templengthone}; %
+ width:\LWR at printlength{\LWR at templengthone}; %
margin:10pt%
}{%
- width:\rndprintlength{\LWR at templengthone}%
+ width:\LWR at printlength{\LWR at templengthone}%
}%
{marginblock}%
\captionsetup{type=#2}%
@@ -30941,7 +31141,33 @@
%
%
%
+%
% \iffalse
+%<*fnlineno>
+% \fi
+%
+% \part{lwarp-fnlineno.sty}
+%
+% \section{fnlineno}
+%
+% \DescribePackage{fnlineno}
+% \pkg{fnlineno} is ignored.
+%
+% \changes{v0.49}{2018/02/19}{\pkg{fnlineno}: Added.}
+%
+% \codehtml
+%
+% \begin{macrocode}
+\LWR at ProvidesPackageDrop{fnlineno}
+% \end{macrocode}
+%
+% \iffalse
+%</fnlineno>
+% \fi
+%
+%
+%
+% \iffalse
%<*fnpos>
% \fi
%
@@ -31697,12 +31923,6 @@
% original unscaled image would have taken,
% with the scaled image over- or under-flowing the area.
-% \begin{macrocode}
-\AtBeginDocument{
-\renewcommand*{\unitspace}{}
-}
-% \end{macrocode}
-
% Used to store the user's selected dimensions and \HTML\ class.
%
% The class defaults to ``inlineimage'' unless changed by a |class=xyx| option.
@@ -31730,8 +31950,7 @@
% \end{macrocode}
% Default to use the converted fixed length given:
% \begin{macrocode}
- \uselengthunit{PT}%
- \renewcommand*{\LWR at igwidthstyle}{width:\rndprintlength{\LWR at igwidth}}%
+ \renewcommand*{\LWR at igwidthstyle}{width:\LWR at printlength{\LWR at igwidth}}%
% \end{macrocode}
% If ex or em dimensions were given, use those instead:
% \begin{macrocode}
@@ -31760,9 +31979,8 @@
% \end{macrocode}
% Default to use the converted fixed length given:
% \begin{macrocode}
- \uselengthunit{PT}%
\renewcommand*{\LWR at igheightstyle}{%
- height:\rndprintlength{\LWR at igheight} %
+ height:\LWR at printlength{\LWR at igheight} %
}%
% \end{macrocode}
% If ex or em dimensions were given, use those instead:
@@ -31991,7 +32209,7 @@
%
% If formatting for a word processor, find and set the actual image size,
% without rotation, using \PDF\ instead of \SVG\ to find the original bounding box:
-% \changes{v0.42}{2017/10/24}{If \protect\texttt{FormatWP}, use explicit size.}
+% \changes{v0.42}{2017/10/24}{If \progcode{FormatWP}, use explicit size.}
% \begin{macrocode}
\ifbool{FormatWP}{%
\begingroup%
@@ -32027,11 +32245,10 @@
}%
}% not starred
\endgroup%
- \uselengthunit{PT}%
\settowidth{\LWR at igwidth}{\usebox{\LWR at imagesizebox}}%
- \global\renewcommand*{\LWR at igwidthstyle}{width:\rndprintlength{\LWR at igwidth}}%
+ \global\renewcommand*{\LWR at igwidthstyle}{width:\LWR at printlength{\LWR at igwidth}}%
\settoheight{\LWR at igheight}{\usebox{\LWR at imagesizebox}}%
- \global\renewcommand*{\LWR at igheightstyle}{height:\rndprintlength{\LWR at igheight}}%
+ \global\renewcommand*{\LWR at igheightstyle}{height:\LWR at printlength{\LWR at igheight}}%
}{}%
% \end{macrocode}
%
@@ -32046,11 +32263,9 @@
{% start of href
\LWR at traceinfo{LWR at includegraphicsb: about to LWR at htmltag}%
\LWR at htmltag{% start of image tags
-% img src="\LWR at sanitized" \LWR at orignewline%
img src="%
\begingroup\@sanitize\LWR at parsedfilename\endgroup%
" \LWR at orignewline%
-% \LWR at origtilde{} alt="[\filename at base]" \LWR at orignewline%
% \end{macrocode}
% Only include a style tag if a width, height, angle, or scale was given:
% \begin{macrocode}
@@ -32395,10 +32610,9 @@
\newenvironment{hangingpar}
{
\LWR at findhangingleftmargin%
- \uselengthunit{PT}%
\BlockClass[%
- \LWR at origmbox{margin-left:\rndprintlength{\LWR at templengthone}} ; %
- \LWR at origmbox{text-indent:-\rndprintlength{\hangingindent}}%
+ \LWR at origmbox{margin-left:\LWR at printlength{\LWR at templengthone}} ; %
+ \LWR at origmbox{text-indent:-\LWR at printlength{\hangingindent}}%
]%
{hangingpar}%
}
@@ -32409,10 +32623,9 @@
\renewcommand*{\LWR at printcloselist}{\LWR at printcloseitemize}%
\renewcommand*{\LWR at printopenlist}{%
\LWR at findhangingleftmargin%
- \uselengthunit{PT}%
ul style="\LWR at origmbox{list-style-type:none;} %
- \LWR at origmbox{margin-left:\rndprintlength{\LWR at templengthone}} ; %
- \LWR at origmbox{text-indent:-\rndprintlength{\hangingindent}}"%
+ \LWR at origmbox{margin-left:\LWR at printlength{\LWR at templengthone}} ; %
+ \LWR at origmbox{text-indent:-\LWR at printlength{\hangingindent}}"%
}%
\let\item\LWR at itemizeitem%
\list{}{}%
@@ -32430,9 +32643,8 @@
{%
\BlockClass[%
\LWR at findhangingleftmargin%
- \uselengthunit{PT}%
- \LWR at origmbox{margin-left:\rndprintlength{\LWR at templengthone}} ; %
- \LWR at origmbox{text-indent:-\rndprintlength{\hangingindent}}%
+ \LWR at origmbox{margin-left:\LWR at printlength{\LWR at templengthone}} ; %
+ \LWR at origmbox{text-indent:-\LWR at printlength{\hangingindent}}%
]{labeledpar}#2%
}
{\endBlockClass}
@@ -32496,10 +32708,9 @@
% \begin{macrocode}
\newenvironment*{hangparas}[2]
{%
- \uselengthunit{PT}%
\BlockClass[%
- \LWR at origmbox{margin-left:\rndprintlength{#1}} ; %
- \LWR at origmbox{text-indent:-\rndprintlength{#1}}%
+ \LWR at origmbox{margin-left:\LWR at printlength{#1}} ; %
+ \LWR at origmbox{text-indent:-\LWR at printlength{#1}}%
]%
{hangingpar}%
}
@@ -32563,6 +32774,32 @@
%
%
% \iffalse
+%<*hypdestopt>
+% \fi
+%
+% \part{lwarp-hypdestopt.sty}
+%
+% \section{hypdestopt}
+%
+% \DescribePackage{hypdestopt}
+% \pkg{hypdestopt} is ignored.
+%
+% \changes{v0.49}{2018/02/15}{\pkg{hypdestopt}: Added.}
+%
+% \codehtml
+%
+% \begin{macrocode}
+\LWR at ProvidesPackageDrop{hypdestopt}
+% \end{macrocode}
+%
+% \iffalse
+%</hypdestopt>
+% \fi
+%
+%
+%
+%
+% \iffalse
%<*hypernat>
% \fi
%
@@ -32981,8 +33218,66 @@
%
%
%
+% \iffalse
+%<*hyphenat>
+% \fi
%
+% \part{lwarp-hyphenat.sty}
+%
+% \section{hyphenat}
+%
+% \DescribePackage{hyphenat}
+% \pkg{hyphenat} is emulated during \HTML\ output, while
+% the print-mode version is used inside a \env{lateximage}.
+%
+% \changes{v0.49}{2018/02/15}{\pkg{hyphenat}: Added.}
+%
+% \codehtml
+%
+% \begin{macrocode}
+\LWR at ProvidesPackagePass{hyphenat}
+% \end{macrocode}
+%
+% \begin{macrocode}
+\LetLtxMacro\LWRHYNAT at origtextnhtt\textnhtt
+\LetLtxMacro\LWRHYNAT at orignhttfamily\nhttfamily
+\LetLtxMacro\LWRHYNAT at orignohyphens\nohyphens
+\LetLtxMacro\LWRHYNAT at origbshyp\bshyp
+\LetLtxMacro\LWRHYNAT at origfshyp\fshyp
+\LetLtxMacro\LWRHYNAT at origdothyp\dothyp
+\LetLtxMacro\LWRHYNAT at origcolonhyp\colonhyp
+\LetLtxMacro\LWRHYNAT at orighyp\hyp
+
+\LetLtxMacro\textnhtt\texttt
+\LetLtxMacro\nhttfamily\ttfamily
+
+\renewcommand{\nohyphens}[1]{#1}
+\renewrobustcmd{\bshyp}{%
+ \ifmmode\backslash\else\textbackslash\fi%
+}
+\renewrobustcmd{\fshyp}{/}
+\renewrobustcmd{\dothyp}{.}
+\renewrobustcmd{\colonhyp}{:}
+\renewrobustcmd{\hyp}{-}
+
+\appto\LWR at restoreorigformatting{
+\LetLtxMacro\textnhtt\LWRHYNAT at origtextnhtt
+\LetLtxMacro\nhttfamily\LWRHYNAT at orignhttfamily
+\LetLtxMacro\nohyphens\LWRHYNAT at orignohyphens
+\LetLtxMacro\bshyp\LWRHYNAT at origbshyp
+\LetLtxMacro\fshyp\LWRHYNAT at origfshyp
+\LetLtxMacro\dothyp\LWRHYNAT at origdothyp
+\LetLtxMacro\colonhyp\LWRHYNAT at origcolonhyp
+\LetLtxMacro\hyp\LWRHYNAT at orighyp
+}
+% \end{macrocode}
+%
% \iffalse
+%</hyphenat>
+% \fi
+%
+%
+% \iffalse
%<*idxlayout>
% \fi
%
@@ -33262,7 +33557,7 @@
% \end{macrocode}
-% \changes{v0.42}{2017/10/26}{\pkg{keyfloat}: If \texttt{FormatWP} add explicit HTML style.}
+% \changes{v0.42}{2017/10/26}{\pkg{keyfloat}: If \progcode{FormatWP} add explicit HTML style.}
% \begin{macrocode}
\DeclareDocumentEnvironment{KFLT at marginfloat}{O{-1.2ex} m}
{%
@@ -33292,13 +33587,12 @@
{%
\LWR at ensuredoingapar%
\setlength{\LWR at templengthone}{#1}%
-\uselengthunit{PT}%
\begin{LWR at BlockClassWP}{%
- float:right; width:\rndprintlength{\LWR at templengthone}; %
+ float:right; width:\LWR at printlength{\LWR at templengthone}; %
margin:10pt%
}%
{%
- width:\rndprintlength{\LWR at templengthone}%
+ width:\LWR at printlength{\LWR at templengthone}%
}%
{marginblock}%
\setlength{\linewidth}{.95\LWR at templengthone}%
@@ -33485,9 +33779,154 @@
%
%
%
+% \iffalse
+%<*lineno>
+% \fi
%
+% \part{lwarp-lineno.sty}
%
+% \section{lineno}
+%
+% \credits{Stephan I. Böttcher}
+%
+% \DescribePackage{lineno}
+% \pkg{lineno} is ignored.
+%
+% \changes{v0.49}{2018/02/19}{\pkg{lineno}: Added.}
+%
+% \codehtml
+%
+% \begin{macrocode}
+\LWR at ProvidesPackageDrop{lineno}
+% \end{macrocode}
+%
+% \begin{macrocode}
+\newcommand*\resetlinenumber[1][\@ne]{}
+
+\def\linenumbers{%
+ \@ifnextchar[{\resetlinenumber}%]
+ {\@ifstar{\resetlinenumber}{}}%
+ }
+
+\newcommand*{\nolinenumbers}{}
+
+\@namedef{linenumbers*}{\par\linenumbers*}
+\@namedef{runninglinenumbers*}{\par\runninglinenumbers*}
+
+\def\endlinenumbers{\par}
+\let\endrunninglinenumbers\endlinenumbers
+\let\endpagewiselinenumbers\endlinenumbers
+\expandafter\let\csname endlinenumbers*\endcsname\endlinenumbers
+\expandafter\let\csname endrunninglinenumbers*\endcsname\endlinenumbers
+\let\endnolinenumbers\endlinenumbers
+
+\def\pagewiselinenumbers{\linenumbers\setpagewiselinenumbers}
+
+\def\runninglinenumbers{\setrunninglinenumbers\linenumbers}
+
+\def\setpagewiselinenumbers{}
+
+\def\setrunninglinenumbers{}
+
+\def\linenomath{}%
+\@namedef{linenomath*}{}%
+\def\endlinenomath{}
+\expandafter\let\csname endlinenomath*\endcsname\endlinenomath
+
+\let\linelabel\label
+
+\def\switchlinenumbers{\@ifstar{}{}}
+\def\setmakelinenumbers#1{\@ifstar{}{}}
+
+\def\leftlinenumbers{\@ifstar{}{}}
+\def\rightlinenumbers{\@ifstar{}{}}
+
+\newcounter{linenumber}
+\newcount\c at pagewiselinenumber
+\let\c at runninglinenumber\c at linenumber
+
+\def\runningpagewiselinenumbers{}
+\def\realpagewiselinenumbers{}
+
+
+\NewDocumentCommand\modulolinenumbers{s o}{}
+
+\chardef\c at linenumbermodulo=5
+\modulolinenumbers[1]
+
+\newcommand*\firstlinenumber[1]{}
+
+\newcommand\internallinenumbers{}
+\let\endinternallinenumbers\endlinenumbers
+\@namedef{internallinenumbers*}{\internallinenumbers*}
+\expandafter\let\csname endinternallinenumbers*\endcsname\endlinenumbers
+
+\newcommand*{\linenoplaceholder}[1]{% redefine per language
+ (line number reference for \detokenize\expandafter{#1})
+}
+
+\newcommand*{\lineref}[2][]{\linenoplaceholder{#2}}
+\newcommand*{\linerefp}[2][]{\linenoplaceholder{#2}}
+\newcommand*{\linerefr}[2][]{\linenoplaceholder{#2}}
+
+\newcommand\quotelinenumbers
+ {\@ifstar\linenumbers{\@ifnextchar[\linenumbers{\linenumbers*}}}
+
+\newdimen\linenumbersep
+\newdimen\linenumberwidth
+\newdimen\quotelinenumbersep
+
+\quotelinenumbersep=\linenumbersep
+\let\quotelinenumberfont\linenumberfont
+
+\def\linenumberfont{\normalfont\tiny\sffamily}
+
+
+\linenumberwidth=10pt
+\linenumbersep=10pt
+
+\def\thelinenumber{}
+
+\def\LineNumber{}
+\def\makeLineNumber{}
+\def\makeLineNumberLeft{}
+\def\makeLineNumberRight{}
+\def\makeLineNumberOdd{}
+\def\makeLineNumberEven{}
+\def\makeLineNumberRunning{}
+
+
+\newenvironment{numquote} {\quote}{\endquote}
+\newenvironment{numquotation} {\quotation}{\endquotation}
+\newenvironment{numquote*} {\quote}{\endquote}
+\newenvironment{numquotation*}{\quotation}{\endquotation}
+
+\newdimen\bframerule
+\bframerule=\fboxrule
+
+\newdimen\bframesep
+\bframesep=\fboxsep
+
+\newenvironment{bframe}
+{%
+ \LWR at forceminwidth{\bframerule}%
+ \BlockClass[
+ border:\LWR at printlength{\LWR at atleastonept} solid black ; %
+ padding:\LWR at printlength{\bframesep}%
+ ]{bframe}
+}
+{\endBlockClass}
+% \end{macrocode}
+%
% \iffalse
+%</lineno>
+% \fi
+%
+%
+%
+%
+%
+% \iffalse
%<*lips>
% \fi
@@ -33980,8 +34419,37 @@
%
%
%
+% \iffalse
+%<*luacolor>
+% \fi
%
+% \part{lwarp-luacolor.sty}
+%
+% \section{luacolor}
+%
+% \DescribePackage{luacolor}
+% \pkg{luacolor} is ignored.
+%
+% \changes{v0.49}{2018/02/15}{\pkg{luacolor}: Added.}
+%
+% \codehtml
+%
+% \begin{macrocode}
+\LWR at ProvidesPackageDrop{luacolor}
+% \end{macrocode}
+%
+% \begin{macrocode}
+\newcommand{\luacolorProcessBox}[1]{}
+% \end{macrocode}
+%
% \iffalse
+%</luacolor>
+% \fi
+%
+%
+%
+%
+% \iffalse
%<*luatodonotes>
% \fi
%
@@ -34382,7 +34850,7 @@
% Given the \pkg{mdframed} key, print the length.
% \begin{macrocode}
\newcommand*{\LWR at mdfprintlength}[1]{%
-\rndprintlength{\csuse{mdf@#1 at length}}
+\LWR at printlength{\csuse{mdf@#1 at length}}
}
% \end{macrocode}
% \end{noindmacro}
@@ -34403,10 +34871,6 @@
% \begin{macrocode}
\LWR at stoppars%
% \end{macrocode}
-% Below, print \HTML\ pt units:
-% \begin{macrocode}
-\uselengthunit{PT}%
-% \end{macrocode}
% Open a \element{div} and with custom |class| and custom |style|:
% \begin{macrocode}
\LWR at htmltagc{div class="\LWR at mdthisenv" \LWR at orignewline
@@ -34556,10 +35020,6 @@
\LWR at traceinfo{LWR at mdframedtitleenv start}%
% \LWR at origmdfframedtitleenv{%
% \end{macrocode}
-% Below, print \HTML\ pt lengths:
-% \begin{macrocode}
-\uselengthunit{PT}%
-% \end{macrocode}
% Open a \element{span} with a custom |class| and custom |style|:
% \begin{macrocode}
\LWR at htmltagc{span class="mdframedtitle" \LWR at orignewline
@@ -34586,8 +35046,8 @@
border-radius:
\setlength{\LWR at titleroundcorner}
{\maxof{\mdf at roundcorner@length-\mdf at linewidth@length}{0pt}}
- \rndprintlength{\LWR at titleroundcorner}
- \rndprintlength{\LWR at titleroundcorner}
+ \LWR at printlength{\LWR at titleroundcorner}
+ \LWR at printlength{\LWR at titleroundcorner}
0pt 0pt
\LWR at orignewline
% \end{macrocode}
@@ -35390,7 +35850,7 @@
% \DescribeMacro{\multirow}
% \oarg{vpos} \marg{numrows} \oarg{bigstruts} \marg{width} \oarg{fixup} \marg{text}
% \changes{v0.19}{2015/05/28}{\pkg{multirow}: Added optional args.}
-% \changes{v0.39}{2017/08/30}{\pkg{multirow}: Add: New optional \protect\texttt{vpos} argument.}
+% \changes{v0.39}{2017/08/30}{\pkg{multirow}: Add: New optional \optn{vpos} argument.}
% \changes{v0.39}{2017/08/30}{\pkg{multirow}: Add: Supports left/right border for \pkg{bigdelim}.}
% \changes{v0.39}{2017/08/30}{\pkg{multirow}: Fix: Long text argument.}
% \changes{v0.40}{2017/09/22}{\pkg{multirow}: Improved \pkg{bigdelim} borders.}
@@ -35438,7 +35898,7 @@
\LWR at printbartag{\arabic{LWR at tablecolindex}}%
"%
% \end{macrocode}
-% \changes{v0.42}{2017/10/26}{\pkg{multirow}: If \protect\texttt{FormatWP} add cell alignment.}
+% \changes{v0.42}{2017/10/26}{\pkg{multirow}: If \progcode{FormatWP} add cell alignment.}
% \begin{macrocode}
\LWR at tdstartstyles%
\LWR at addcmidrulewidth%
@@ -36333,7 +36793,7 @@
% \end{macrocode}
%
%
-% \subsection{\protect\texttt{amsthm} option}
+% \subsection{\pkg{amsthm} option}
%
% Only if the |amsthm| option was given:
% \begin{macrocode}
@@ -36601,6 +37061,35 @@
%
%
% \iffalse
+%<*pagegrid>
+% \fi
+%
+% \part{lwarp-pagegrid.sty}
+%
+% \section{pagegrid}
+%
+% \DescribePackage{pagegrid}
+% \pkg{pagegrid} is ignored.
+%
+% \changes{v0.49}{2018/02/15}{\pkg{pagegrid}: Added.}
+%
+% \codehtml
+%
+% \begin{macrocode}
+\LWR at ProvidesPackageDrop{pagegrid}
+% \end{macrocode}
+%
+% \begin{macrocode}
+\newcommand*{\pagegridsetup}[1]{}
+% \end{macrocode}
+%
+% \iffalse
+%</pagegrid>
+% \fi
+%
+%
+%
+% \iffalse
%<*pagenote>
% \fi
@@ -36612,7 +37101,7 @@
% \limitspagenote
%
% \changes{v0.26}{2017/03/29}{\pkg{pagenote}: Supported as-is.}
-% \changes{v0.38}{2017/08/24}{\pkg{pagenote}: Option \protect\texttt{page} disabled.}
+% \changes{v0.38}{2017/08/24}{\pkg{pagenote}: Option \optn{page} disabled.}
%
% \codehtml
% \begin{macrocode}
@@ -36768,6 +37257,36 @@
%
%
% \iffalse
+%<*pdfrender>
+% \fi
+%
+% \part{lwarp-pdfrender.sty}
+%
+% \section{pdfrender}
+%
+% \DescribePackage{pdfrender}
+% \pkg{pdfrender} is ignored.
+%
+% \changes{v0.49}{2018/02/15}{\pkg{pdfrender}: Added.}
+%
+% \codehtml
+%
+% \begin{macrocode}
+\LWR at ProvidesPackageDrop{pdfrender}
+% \end{macrocode}
+%
+% \begin{macrocode}
+\newcommand*{\pdfrender}[1]{}
+\newcommand{\textpdfrender}[2]{#2}
+% \end{macrocode}
+%
+% \iffalse
+%</pdfrender>
+% \fi
+%
+%
+%
+% \iffalse
%<*pdfsync>
% \fi
%
@@ -37007,8 +37526,7 @@
% of class \attribute{quotchap},
% of the maximum selected width:
% \begin{macrocode}
-\uselengthunit{PT}%
-\begin{BlockClass}[max-width: \rndprintlength{\LWR at quotchapwidth}]{quotchap}
+\begin{BlockClass}[max-width: \LWR at printlength{\LWR at quotchapwidth}]{quotchap}
%\begin{minipage}{\LWR at quotchapwidth}
\@quotchap
%\end{minipage}
@@ -37249,8 +37767,37 @@
%
%
%
+% \iffalse
+%<*resizegather>
+% \fi
%
+% \part{lwarp-resizegather.sty}
+%
+% \section{resizegather}
+%
+% \DescribePackage{resizegather}
+% \pkg{resizegather} is ignored.
+%
+% \changes{v0.49}{2018/02/15}{\pkg{resizegather}: Added.}
+%
+% \codehtml
+%
+% \begin{macrocode}
+\LWR at ProvidesPackageDrop{resizegather}
+% \end{macrocode}
+%
+% \begin{macrocode}
+\newcommand*{\resizegathersetup}[1]{}
+% \end{macrocode}
+%
% \iffalse
+%</resizegather>
+% \fi
+%
+%
+%
+%
+% \iffalse
%<*romanbar>
% \fi
%
@@ -37617,20 +38164,19 @@
\NewDocumentEnvironment{addmargin}{s O{} m}
{
-\uselengthunit{PT}%
\setlength{\LWR at templengthtwo}{#3}
\ifblank{#2}
{
\begin{BlockClass}[
- \LWR at origmbox{margin-left:\rndprintlength{\LWR at templengthtwo}} ;
- \LWR at origmbox{margin-right:\rndprintlength{\LWR at templengthtwo}}
+ \LWR at origmbox{margin-left:\LWR at printlength{\LWR at templengthtwo}} ;
+ \LWR at origmbox{margin-right:\LWR at printlength{\LWR at templengthtwo}}
]{addmargin}
}
{
\setlength{\LWR at templengthone}{#2}
\begin{BlockClass}[
- \LWR at origmbox{margin-left:\rndprintlength{\LWR at templengthone}} ;
- \LWR at origmbox{margin-right:\rndprintlength{\LWR at templengthtwo}}
+ \LWR at origmbox{margin-left:\LWR at printlength{\LWR at templengthone}} ;
+ \LWR at origmbox{margin-right:\LWR at printlength{\LWR at templengthtwo}}
]{addmargin}
}
}
@@ -38348,7 +38894,7 @@
%
%
% Borrowed from the \pkg{lwarp} version of \pkg{keyfloat}:
-% \changes{v0.42}{2017/10/26}{\pkg{sidenotes}: If \texttt{FormatWP} add explicit HTML style.}
+% \changes{v0.42}{2017/10/26}{\pkg{sidenotes}: If \progcode{FormatWP} add explicit HTML style.}
% \begin{macrocode}
\NewDocumentEnvironment{KFLTsidenotes at marginfloat}{O{-1.2ex} m}
{% start
@@ -38649,7 +39195,7 @@
% \DescribePackage{soul} Emulated.
%
% \changes{v0.27}{2017/04/02}{\pkg{soul}: Added.}
-% \changes{v0.42}{2017/10/20}{\pkg{soul}: If \protect\texttt{FormatWP}, add explicit styles.}
+% \changes{v0.42}{2017/10/20}{\pkg{soul}: If \progcode{FormatWP}, add explicit styles.}
%
% \codehtml
%
@@ -38867,8 +39413,8 @@
% \begin{macrocode}
\newenvironment{stabular}[2][c]
{
+\begin{tabular}[#1]{#2}
\renewcommand{\noalign}[1]{}
-\begin{tabular}[#1]{#2}
}
{\end{tabular}}
% \end{macrocode}
@@ -38878,8 +39424,8 @@
% \begin{macrocode}
\NewDocumentEnvironment{stabular*}{m o m}
{
+\begin{tabular}[#2]{#3}
\renewcommand{\noalign}[1]{}
-\begin{tabular}[#2]{#3}
}
{\end{tabular}}
% \end{macrocode}
@@ -39806,12 +40352,11 @@
\newsavebox{\LWR at textfitbox}
\newcommand*{\LWR at textfitscale}[2]{%
-\uselengthunit{PT}%
\setlength{\LWR at templengthone}{#1}%
\setlength{\LWR at templengthone}{%
1em*\ratio{\LWR at templengthone}{\LWR at templengthtwo}%
}%
-\InlineClass[font-size:\rndprintlength{\LWR at templengthone}]{textfit}{#2}%
+\InlineClass[font-size:\LWR at printlength{\LWR at templengthone}]{textfit}{#2}%
}
\newcommand*{\scaletowidth}[2]{%
@@ -42407,8 +42952,54 @@
%
%
%
+% \iffalse
+%<*vertbars>
+% \fi
%
+% \part{lwarp-vertbars.sty}
+%
+% \section{vertbars}
+%
+% \credits{Peter Wilson}
+%
+% \DescribePackage{vertbars}
+% \pkg{vertbars} is emulated.
+%
+% \changes{v0.49}{2018/02/16}{\pkg{vertbars}: Added.}
+%
+% \codehtml
+%
+% \begin{macrocode}
+\LWR at ProvidesPackageDrop{vertbars}
+% \end{macrocode}
+%
+% \begin{macrocode}
+\newlength{\barwidth}
+\setlength{\barwidth}{0.4pt}
+\newlength{\barspace}
+\setlength{\barspace}{1em}
+
+\newenvironment{vertbar}{
+ \LWR at forcenewpage
+ \LWR at forceminwidth{\barwidth}
+ \begin{BlockClass}[%
+ border-left: \LWR at printlength{\LWR at atleastonept} solid black ; %
+ padding-left: \LWR at printlength{\barspace}%
+ ]{vertbar}
+}{
+ \end{BlockClass}
+}
+% \end{macrocode}
+%
% \iffalse
+%</vertbars>
+% \fi
+%
+%
+%
+%
+%
+% \iffalse
%<*vmargin>
% \fi
%
@@ -42450,8 +43041,160 @@
%
%
%
+% \iffalse
+%<*vwcol>
+% \fi
%
+% \part{lwarp-vwcol.sty}
+%
+% \section{vwcol}
+%
+% \credits{Will Robertson}
+%
+% \DescribePackage{vwcol}
+% \pkg{vwcol} is patched for use with \pkg{lwarp}.
+%
+% \changes{v0.49}{2018/02/16}{\pkg{vwcol}: Added.}
+%
+% The |width| option is ignored.
+% All \env{vwcol} environments adjust to 1--3 equal-width columns, depening on the
+% width of the browser window.
+%
+% The remaining options are supported, except for |lines| and |maxrecursion|.
+%
+% \codehtml
+% \begin{macrocode}
+\LWR at ProvidesPackagePass{vwcol}
+% \end{macrocode}
+%
+% Factored from \cs{vwcol}.
+% Each is given a style tag to append to the final style.
+%
+% \begin{noindmacro}{\LWR at vwcol@addrule} \marg{style tag}
+% \begin{macrocode}
+\newcommand*{\LWR at vwcol@addrule}[1]{%
+ \appto{\LWR at vwcolstyle}{%
+ #1: %
+ \LWR at printlength{\vwcol at rule} solid \#\LWR at vwcol@rulecolor ; %
+ }%
+}
+% \end{macrocode}
+% \end{noindmacro}
+
+% \begin{noindmacro}{\LWR at vwcol@addrule} \marg{style tag}
+% \begin{macrocode}
+\newcommand*{\LWR at vwcol@addgap}[1]{%
+ \appto{\LWR at vwcolstyle}{%
+ #1: %
+ \LWR at printlength{\vwcol at sep} ; %
+ }%
+}
+% \end{macrocode}
+% \end{noindmacro}
+%
+%
+% \begin{noindenvironment}{vwcol} \marg{key/values}
+%
+% Redefine the environment to add a \HTML\ style.
+% The style is built depending on the required options.
+% \begin{macrocode}
+\renewenvironment*{vwcol}[1][]{%
+% \end{macrocode}
+% New paragraph, and process the options:
+% \begin{macrocode}
+\par\noindent%
+\vwcolsetup{#1}%
+% \end{macrocode}
+% Begin with no style:
+% \begin{macrocode}
+\newcommand*{\LWR at vwcolstyle}{}
+% \end{macrocode}
+% |presep| and |postsep| are created with \HTML\ \attribute{margin}s:
+% \begin{macrocode}
+\if at vwcol@presep
+ \appto{\LWR at vwcolstyle}{margin-left: 1em ; padding-left: .5em ; }
+\fi
+\if at vwcol@postsep
+ \appto{\LWR at vwcolstyle}{margin-right: 1em ; padding-right: .5em ; }
+\fi
+% \end{macrocode}
+% |sep| becomes \attribute{column-gap}:
+% \begin{macrocode}
+\ifdimgreater{\vwcol at sep}{1sp}{
+ \LWR at vwcol@addgap{column-gap}
+ \LWR at vwcol@addgap{-moz-column-gap}
+ \LWR at vwcol@addgap{-webkit-column-gap}
+}{}
+% \end{macrocode}
+% |rule| become \attribute{column-rule}, while
+% |prerule| and |postrule| become \HTML\ borders:
+% \begin{macrocode}
+\convertcolorspec{named}{\vwcol at rulecol}{HTML}\LWR at vwcol@rulecolor%
+\ifdimgreater{\vwcol at rule}{0pt}{
+ \ifdimless{\vwcol at rule}{1pt}{
+ \setlength{\vwcol at rule}{1pt}
+ }{}
+ \LWR at vwcol@addrule{column-rule}
+ \LWR at vwcol@addrule{-moz-column-rule}
+ \LWR at vwcol@addrule{-webkit-column-rule}
+ \if at vwcol@prerule\LWR at vwcol@addrule{border-left}\fi
+ \if at vwcol@postrule\LWR at vwcol@addrule{border-right}\fi
+}{}
+% \end{macrocode}
+% Each of the justify options becomes a \attribute{text-align}.
+% Indentation is added where appropriate.
+% \begin{macrocode}
+\ifdefequal{\vwcol at justify}{\RaggedRight}{
+ \appto{\LWR at vwcolstyle}{text-align: left ; }
+ \ifdimgreater{\vwcol at parindent}{0pt}{
+ \appto{\LWR at vwcolstyle}{%
+ text-indent: \LWR at printlength{\vwcol at parindent} ; %
+ }
+ }{}
+}{}
+% \end{macrocode}
+% \begin{macrocode}
+\ifdefequal{\vwcol at justify}{\RaggedLeft}{
+ \appto{\LWR at vwcolstyle}{text-align: right ; }
+}{}
+% \end{macrocode}
+% \begin{macrocode}
+\ifdefequal{\vwcol at justify}{\Centering}{
+ \appto{\LWR at vwcolstyle}{text-align: center ; }
+}{}
+% \end{macrocode}
+% \begin{macrocode}
+\ifdefequal{\vwcol at justify}{\justifying}{
+ \appto{\LWR at vwcolstyle}{text-align: justify ; }
+ \ifdimgreater{\vwcol at parindent}{0pt}{
+ \appto{\LWR at vwcolstyle}{%
+ text-indent: \LWR at printlength{\vwcol at parindent} ; %
+ }
+ }{}
+}{}
+% \end{macrocode}
+% Create the \element{div} with the assembled style:
+% \begin{macrocode}
+\BlockClass[\LWR at vwcolstyle]{multicols}
+}
+% \end{macrocode}
+% When the environment ends:
+% \begin{macrocode}
+{
+\endBlockClass
+}
+% \end{macrocode}
+% \end{noindenvironment}
+%
% \iffalse
+%</vwcol>
+% \fi
+%
+%
+%
+%
+%
+% \iffalse
%<*wallpaper>
% \fi
@@ -42558,7 +43301,7 @@
% \end{macrocode}
%
%
-% \changes{v0.42}{2017/10/26}{\pkg{wrapfig}: If \texttt{FormatWP}
+% \changes{v0.42}{2017/10/26}{\pkg{wrapfig}: If \progcode{FormatWP}
% add explicit HTML style.}
%
% \begin{macrocode}
@@ -42573,13 +43316,12 @@
{\renewcommand*{\LWR at wrapposition}{float:right}}%
{\renewcommand*{\LWR at wrapposition}{float:left}}%
\setlength{\LWR at templengthone}{#2}%
-\uselengthunit{PT}%
\LWR at BlockClassWP{%
- width:\rndprintlength{\LWR at templengthone}; \LWR at wrapposition; %
+ width:\LWR at printlength{\LWR at templengthone}; \LWR at wrapposition; %
margin:10pt%
}%
{%
- width:\rndprintlength{\LWR at templengthone}; \LWR at wrapposition%
+ width:\LWR at printlength{\LWR at templengthone}; \LWR at wrapposition%
}%
{marginblock}%
}
@@ -42641,7 +43383,7 @@
%
% \changes{v0.36}{2017/08/10}{\pkg{xcolor}: Uses \cs{fboxrule} and \cs{fboxsep}.}
% \changes{v0.36}{2017/08/10}{\pkg{xcolor}: Added \cs{fcolorboxBlock}, \cs{colorboxBlock}.}
-% \changes{v0.36}{2017/08/10}{\pkg{xcolor}: Fix: Background \protect\texttt{none} in print mode.}
+% \changes{v0.36}{2017/08/10}{\pkg{xcolor}: Fix: Background \progcode{none} in print mode.}
% \changes{v0.36}{2017/08/12}{\pkg{xcolor}: \cs{fcolorbox} etc. now work inside \env{lateximage}.}
%
%
@@ -42917,9 +43659,8 @@
%
% \begin{macrocode}
\newcommand*{\LWR at borderpadding}[2]{%
-\uselengthunit{PT}%
-border:\rndprintlength{\LWR at atleastonept} solid \LWR at colorstyle{#1}{#2} ; %
-padding:\rndprintlength{\fboxsep}%
+border:\LWR at printlength{\LWR at atleastonept} solid \LWR at colorstyle{#1}{#2} ; %
+padding:\LWR at printlength{\fboxsep}%
}
% \end{macrocode}
% \end{noindmacro}
@@ -42984,10 +43725,9 @@
\RenewDocumentCommand{\colorbox}{O{named} m +m}{%
\begingroup%
\LWR at FBcancel%
-\uselengthunit{PT}%
\InlineClass[%
background:\LWR at colorstyle{#1}{#2} ; %
-padding:\rndprintlength{\fboxsep}%
+padding:\LWR at printlength{\fboxsep}%
]{colorbox}{#3}%
\endgroup%
}
@@ -43003,10 +43743,9 @@
\NewDocumentCommand{\colorboxBlock}{O{named} m +m}{%
\begingroup%
\LWR at FBcancel%
-\uselengthunit{PT}%
\begin{BlockClass}[%
background:\LWR at colorstyle{#1}{#2} ; %
-padding:\rndprintlength{\fboxsep}%
+padding:\LWR at printlength{\fboxsep}%
]{colorboxBlock}
#3
\end{BlockClass}%
@@ -43028,7 +43767,6 @@
\LWR at traceinfo{HTML fcolorbox #2 #4}%
\begingroup%
\LWR at FBcancel%
-\uselengthunit{PT}%
\LWR at forceminwidth{\fboxrule}%
\ifthenelse{\equal{#4}{none}}%
{% no background color
@@ -43060,7 +43798,6 @@
\LWR at traceinfo{HTML fcolorboxBlock #2 #4}%
\begingroup%
\LWR at FBcancel%
-\uselengthunit{PT}%
\LWR at forceminwidth{\fboxrule}%
\ifthenelse{\equal{#4}{none}}%
{% no background color
@@ -43100,8 +43837,8 @@
\begin{BlockClass}[%
#3%
\LWR at borderpadding{#1}{#2} ; %
-\IfValueT{#4}{height:\rndprintlength{\LWR at tempheight} ; }%
-width:\rndprintlength{\LWR at tempwidth}%
+\IfValueT{#4}{height:\LWR at printlength{\LWR at tempheight} ; }%
+width:\LWR at printlength{\LWR at tempwidth}%
]{fcolorminipage}%
}
% \end{macrocode}
@@ -43118,7 +43855,6 @@
\LWR at FBcancel%
\setlength{\LWR at tempwidth}{#8}%
\IfValueT{#6}{\setlength{\LWR at tempheight}{#6}}%
-\uselengthunit{PT}%
\LWR at forceminwidth{\fboxrule}%
\convertcolorspec{#1}{#2}{HTML}\LWR at tempcolor%
\ifthenelse{\equal{#4}{none}}%
@@ -43145,13 +43881,12 @@
\setlength{\LWR at tempwidth}{#1}%
\setlength{\LWR at tempheight}{#2}%
\addtolength{\LWR at tempheight}{#3}%
-\uselengthunit{PT}%
\LWR at forceminwidth{\fboxrule}%
\InlineClass[%
display:inline-block ; %
-border:\rndprintlength{\LWR at atleastonept} solid \LWR at currenttextcolor{} ; %
-width:\rndprintlength{\LWR at tempwidth} ; %
-height:\rndprintlength{\LWR at tempheight}%
+border:\LWR at printlength{\LWR at atleastonept} solid \LWR at currenttextcolor{} ; %
+width:\LWR at printlength{\LWR at tempwidth} ; %
+height:\LWR at printlength{\LWR at tempheight}%
]{boxframe}{}%
}%
}
@@ -43159,7 +43894,88 @@
% \end{macro}
%
%
+% \subsection{Row colors}
+% \changes{v0.49}{2018/02/17}{\pkg{xcolor}: Added tabular row colors.}
+%
+% \begin{noindmacro}{\rowc at l@rs} \oarg{cmds} \marg{startrow} \marg{odd color} \marg{even color}
% \begin{macrocode}
+\newcommand*{\LWR at xcolortempcolor}{}
+
+\def\rowc at l@rs[#1]#2#3#4%
+{
+\global\rownum=1
+ \global\@rowcolorstrue
+ \@ifxempty{#3}%
+ {\def\@oddrowcolor{\@norowcolor}}%
+ {%
+ \convertcolorspec{named}{#3}{HTML}\LWR at xcolortempcolor%
+ \edef\@oddrowcolor{%
+ \csdef{LWR at xcolorrowHTMLcolor}{\LWR at xcolortempcolor}%
+ }%
+ }%
+ \@ifxempty{#4}%
+ {\def\@evenrowcolor{\@norowcolor}}%
+ {%
+ \convertcolorspec{named}{#4}{HTML}\LWR at xcolortempcolor%
+ \edef\@evenrowcolor{%
+ \csdef{LWR at xcolorrowHTMLcolor}{\LWR at xcolortempcolor}%
+ }%
+ }%
+ \if at rowcmd
+ \def\@rowcolors
+ {%
+% #1%
+ \if at rowcolors
+% \noalign{%
+ \relax\ifnum\rownum<#2\@norowcolor\else
+ \ifodd\rownum\@oddrowcolor\else\@evenrowcolor\fi\fi%
+% }%
+ \fi%
+ }%
+ \else
+ \def\@rowcolors
+ {%
+ \if at rowcolors
+ \ifnum\rownum<#2%
+% \noalign{%
+ \@norowcolor
+% }
+ \else
+% #1%
+% \noalign{%
+ \ifodd\rownum\@oddrowcolor\else\@evenrowcolor\fi%
+% }%
+ \fi
+ \fi%
+ }%
+ \fi
+ \ignorespaces%
+}
+% \end{macrocode}
+% \end{noindmacro}
+%
+% \begin{noindmacro}{\@norowcolor} Turns off color for this row.
+% \begin{macrocode}
+\def\@norowcolor{%
+\renewcommand{\LWR at xcolorrowHTMLcolor}{}%
+}
+% \end{macrocode}
+% \end{noindmacro}
+%
+
+% \begin{noindmacro}{\@rowc at lors} Executed at the end of each row.
+% \begin{macrocode}
+\def\@rowc at lors{%
+% \noalign{%
+ \global\advance\rownum\@ne%
+% }%
+ \@rowcolors%
+}
+% \end{macrocode}
+% \end{noindmacro}
+
+%
+% \begin{macrocode}
\end{warpHTML}
% \end{macrocode}
%
Modified: trunk/Master/texmf-dist/source/latex/lwarp/lwarp.ins
===================================================================
--- trunk/Master/texmf-dist/source/latex/lwarp/lwarp.ins 2018-02-20 21:57:43 UTC (rev 46688)
+++ trunk/Master/texmf-dist/source/latex/lwarp/lwarp.ins 2018-02-20 21:58:20 UTC (rev 46689)
@@ -101,6 +101,7 @@
\file{lwarp-fancyref.sty}{\from{lwarp.dtx}{fancyref}}
\file{lwarp-fancyvrb.sty}{\from{lwarp.dtx}{fancyvrb}}
\file{lwarp-figcaps.sty}{\from{lwarp.dtx}{figcaps}}
+\file{lwarp-figsize.sty}{\from{lwarp.dtx}{figsize}}
\file{lwarp-fix2col.sty}{\from{lwarp.dtx}{fix2col}}
\file{lwarp-fixme.sty}{\from{lwarp.dtx}{fixme}}
\file{lwarp-fixmetodonotes.sty}{\from{lwarp.dtx}{fixmetodonotes}}
@@ -112,6 +113,7 @@
\file{lwarp-fltrace.sty}{\from{lwarp.dtx}{fltrace}}
\file{lwarp-flushend.sty}{\from{lwarp.dtx}{flushend}}
\file{lwarp-fncychap.sty}{\from{lwarp.dtx}{fncychap}}
+\file{lwarp-fnlineno.sty}{\from{lwarp.dtx}{fnlineno}}
\file{lwarp-fnpos.sty}{\from{lwarp.dtx}{fnpos}}
\file{lwarp-footmisc.sty}{\from{lwarp.dtx}{footmisc}}
\file{lwarp-footnote.sty}{\from{lwarp.dtx}{footnote}}
@@ -132,9 +134,11 @@
\file{lwarp-hang.sty}{\from{lwarp.dtx}{hang}}
\file{lwarp-hanging.sty}{\from{lwarp.dtx}{hanging}}
\file{lwarp-hypcap.sty}{\from{lwarp.dtx}{hypcap}}
+\file{lwarp-hypdestopt.sty}{\from{lwarp.dtx}{hypdestopt}}
\file{lwarp-hypernat.sty}{\from{lwarp.dtx}{hypernat}}
\file{lwarp-hyperref.sty}{\from{lwarp.dtx}{hyperref}}
\file{lwarp-hyperxmp.sty}{\from{lwarp.dtx}{hyperxmp}}
+\file{lwarp-hyphenat.sty}{\from{lwarp.dtx}{hyphenat}}
\file{lwarp-idxlayout.sty}{\from{lwarp.dtx}{idxlayout}}
\file{lwarp-ifoddpage.sty}{\from{lwarp.dtx}{ifoddpage}}
\file{lwarp-indentfirst.sty}{\from{lwarp.dtx}{indentfirst}}
@@ -143,6 +147,7 @@
\file{lwarp-layout.sty}{\from{lwarp.dtx}{layout}}
\file{lwarp-letterspace.sty}{\from{lwarp.dtx}{letterspace}}
\file{lwarp-lettrine.sty}{\from{lwarp.dtx}{lettrine}}
+\file{lwarp-lineno.sty}{\from{lwarp.dtx}{lineno}}
\file{lwarp-lips.sty}{\from{lwarp.dtx}{lips}}
\file{lwarp-listings.sty}{\from{lwarp.dtx}{listings}}
\file{lwarp-longtable.sty}{\from{lwarp.dtx}{longtable}}
@@ -149,6 +154,7 @@
\file{lwarp-lscape.sty}{\from{lwarp.dtx}{lscape}}
\file{lwarp-ltcaption.sty}{\from{lwarp.dtx}{ltcaption}}
\file{lwarp-ltxtable.sty}{\from{lwarp.dtx}{ltxtable}}
+\file{lwarp-luacolor.sty}{\from{lwarp.dtx}{luacolor}}
\file{lwarp-luatodonotes.sty}{\from{lwarp.dtx}{luatodonotes}}
\file{lwarp-marginfit.sty}{\from{lwarp.dtx}{marginfit}}
\file{lwarp-marginfix.sty}{\from{lwarp.dtx}{marginfix}}
@@ -177,10 +183,12 @@
\file{lwarp-nowidow.sty}{\from{lwarp.dtx}{nowidow}}
\file{lwarp-ntheorem.sty}{\from{lwarp.dtx}{ntheorem}}
\file{lwarp-overpic.sty}{\from{lwarp.dtx}{overpic}}
+\file{lwarp-pagegrid.sty}{\from{lwarp.dtx}{pagegrid}}
\file{lwarp-pagenote.sty}{\from{lwarp.dtx}{pagenote}}
\file{lwarp-pagesel.sty}{\from{lwarp.dtx}{pagesel}}
\file{lwarp-paralist.sty}{\from{lwarp.dtx}{paralist}}
\file{lwarp-parskip.sty}{\from{lwarp.dtx}{parskip}}
+\file{lwarp-pdfrender.sty}{\from{lwarp.dtx}{pdfrender}}
\file{lwarp-pdflscape.sty}{\from{lwarp.dtx}{pdflscape}}
\file{lwarp-pdfsync.sty}{\from{lwarp.dtx}{pdfsync}}
\file{lwarp-pfnote.sty}{\from{lwarp.dtx}{pfnote}}
@@ -192,6 +200,7 @@
\file{lwarp-ragged2e.sty}{\from{lwarp.dtx}{ragged2e}}
\file{lwarp-realscripts.sty}{\from{lwarp.dtx}{realscripts}}
\file{lwarp-relsize.sty}{\from{lwarp.dtx}{relsize}}
+\file{lwarp-resizegather.sty}{\from{lwarp.dtx}{resizegather}}
\file{lwarp-romanbar.sty}{\from{lwarp.dtx}{romanbar}}
\file{lwarp-romanbarpagenumber.sty}{\from{lwarp.dtx}{romanbarpagenumber}}
\file{lwarp-rotating.sty}{\from{lwarp.dtx}{rotating}}
@@ -250,7 +259,9 @@
\file{lwarp-ulem.sty}{\from{lwarp.dtx}{ulem}}
\file{lwarp-upref.sty}{\from{lwarp.dtx}{upref}}
\file{lwarp-verse.sty}{\from{lwarp.dtx}{verse}}
+\file{lwarp-vertbars.sty}{\from{lwarp.dtx}{vertbars}}
\file{lwarp-vmargin.sty}{\from{lwarp.dtx}{vmargin}}
+\file{lwarp-vwcol.sty}{\from{lwarp.dtx}{vwcol}}
\file{lwarp-wallpaper.sty}{\from{lwarp.dtx}{wallpaper}}
\file{lwarp-watermark.sty}{\from{lwarp.dtx}{watermark}}
\file{lwarp-wrapfig.sty}{\from{lwarp.dtx}{wrapfig}}
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-adjmulticol.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-adjmulticol.sty 2018-02-20 21:57:43 UTC (rev 46688)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-adjmulticol.sty 2018-02-20 21:58:20 UTC (rev 46689)
@@ -27,10 +27,9 @@
\newcommand*{\LWR at mcolstype}{multicols}%
\ifnumcomp{#2}{=}{1}{\renewcommand*{\LWR at mcolstype}{singlecolumn}}{}%
\LWR at forcenewpage%
-\uselengthunit{PT}%
\BlockClass[%
-\LWR at origmbox{margin-left:\rndprintlength{\LWR at templengthone}} ; %
-\LWR at origmbox{margin-right:\rndprintlength{\LWR at templengthtwo}}%
+\LWR at origmbox{margin-left:\LWR at printlength{\LWR at templengthone}} ; %
+\LWR at origmbox{margin-right:\LWR at printlength{\LWR at templengthtwo}}%
]{\LWR at mcolstype}%
}
{\endBlockClass}
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-algorithmicx.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-algorithmicx.sty 2018-02-20 21:57:43 UTC (rev 46688)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-algorithmicx.sty 2018-02-20 21:58:20 UTC (rev 46689)
@@ -22,9 +22,8 @@
\let\origALG at doentity\ALG at doentity%
\renewcommand*{\ALG at doentity}{%
\origALG at doentity%
-\uselengthunit{PT}%
\LWR at htmltagc{%
-span style="width:\rndprintlength{\ALG at thistlm}; display:inline-block;"%
+span style="width:\LWR at printlength{\ALG at thistlm}; display:inline-block;"%
}%
\ifbool{FormatWP}{%
\setlength{\LWR at templengthone}{\the\ALG at thistlm}%
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-eso-pic.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-eso-pic.sty 2018-02-20 21:57:43 UTC (rev 46688)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-eso-pic.sty 2018-02-20 21:58:20 UTC (rev 46689)
@@ -31,7 +31,7 @@
\newcommand{\AtTextLowerLeft}[1]{}
\newcommand{\AtTextCenter}[1]{}
\NewDocumentCommand{\AddToShipoutPictureBG}{s +m}{}
-\renewcommand{\AddToShipoutPicture}{\AddToShipoutPictureBG}
+\newcommand{\AddToShipoutPicture}{\AddToShipoutPictureBG}
\NewDocumentCommand{\AddToShipoutPictureFG}{s +m}{}
\newcommand*{\ClearShipoutPictureBG}{}
\newcommand*{\ClearShipoutPicture}{}
Added: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-figsize.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-figsize.sty (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-figsize.sty 2018-02-20 21:58:20 UTC (rev 46689)
@@ -0,0 +1,30 @@
+%%
+%% This is file `lwarp-figsize.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx (with options: `figsize')
+%% 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{figsize}
+\newlength{\figwidth}
+\newlength{\figheight}
+
+\newcommand{\SetFigLayout}[3][0]{%
+\setlength{\figheight}{8in}%
+\setlength{\figheight}{\figheight / #2}%
+\setlength{\figwidth}{5.5in}%
+\setlength{\figwidth}{\figwidth / #3}%
+}
+\endinput
+%%
+%% End of file `lwarp-figsize.sty'.
Property changes on: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-figsize.sty
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-floatflt.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-floatflt.sty 2018-02-20 21:57:43 UTC (rev 46688)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-floatflt.sty 2018-02-20 21:58:20 UTC (rev 46689)
@@ -19,13 +19,12 @@
\NewDocumentEnvironment{KFLTfloatflt at marginfloat}{O{-1.2ex} m m}
{%
\setlength{\LWR at templengthone}{#3}%
-\uselengthunit{PT}%
\LWR at BlockClassWP{%
float:right; %
- width:\rndprintlength{\LWR at templengthone}; %
+ width:\LWR at printlength{\LWR at templengthone}; %
margin:10pt%
}{%
- width:\rndprintlength{\LWR at templengthone}%
+ width:\LWR at printlength{\LWR at templengthone}%
}%
{marginblock}%
\captionsetup{type=#2}%
Added: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fnlineno.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fnlineno.sty (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fnlineno.sty 2018-02-20 21:58:20 UTC (rev 46689)
@@ -0,0 +1,21 @@
+%%
+%% This is file `lwarp-fnlineno.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx (with options: `fnlineno')
+%% 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{fnlineno}
+\endinput
+%%
+%% End of file `lwarp-fnlineno.sty'.
Property changes on: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fnlineno.sty
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty 2018-02-20 21:57:43 UTC (rev 46688)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty 2018-02-20 21:58:20 UTC (rev 46689)
@@ -30,10 +30,6 @@
}
-\AtBeginDocument{
-\renewcommand*{\unitspace}{}
-}
-
\newlength{\LWR at igwidth}
\newlength{\LWR at igheight}
\newcommand*{\LWR at igwidthstyle}{}
@@ -48,8 +44,7 @@
\setlength{\LWR at igwidth}{#1}%
\ifthenelse{\lengthtest{\LWR at igwidth > 0pt}}%
{%
- \uselengthunit{PT}%
- \renewcommand*{\LWR at igwidthstyle}{width:\rndprintlength{\LWR at igwidth}}%
+ \renewcommand*{\LWR at igwidthstyle}{width:\LWR at printlength{\LWR at igwidth}}%
\IfEndWith{#1}{ex}%
{\renewcommand*{\LWR at igwidthstyle}{width:#1}}% yes ex
{}% not ex
@@ -68,9 +63,8 @@
\setlength{\LWR at igheight}{#1}%
\ifthenelse{\lengthtest{\LWR at igheight > 0pt}}%
{%
- \uselengthunit{PT}%
\renewcommand*{\LWR at igheightstyle}{%
- height:\rndprintlength{\LWR at igheight} %
+ height:\LWR at printlength{\LWR at igheight} %
}%
\IfEndWith{#1}{ex}%
{\renewcommand*{\LWR at igheightstyle}{height:#1}}% yes ex
@@ -210,11 +204,10 @@
}%
}% not starred
\endgroup%
- \uselengthunit{PT}%
\settowidth{\LWR at igwidth}{\usebox{\LWR at imagesizebox}}%
- \global\renewcommand*{\LWR at igwidthstyle}{width:\rndprintlength{\LWR at igwidth}}%
+ \global\renewcommand*{\LWR at igwidthstyle}{width:\LWR at printlength{\LWR at igwidth}}%
\settoheight{\LWR at igheight}{\usebox{\LWR at imagesizebox}}%
- \global\renewcommand*{\LWR at igheightstyle}{height:\rndprintlength{\LWR at igheight}}%
+ \global\renewcommand*{\LWR at igheightstyle}{height:\LWR at printlength{\LWR at igheight}}%
}{}%
\LWR at traceinfo{LWR at includegraphicsb: about to create href}%
\href{\LWR at parsedfilename}%
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-hang.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-hang.sty 2018-02-20 21:57:43 UTC (rev 46688)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-hang.sty 2018-02-20 21:58:20 UTC (rev 46689)
@@ -29,10 +29,9 @@
\newenvironment{hangingpar}
{
\LWR at findhangingleftmargin%
- \uselengthunit{PT}%
\BlockClass[%
- \LWR at origmbox{margin-left:\rndprintlength{\LWR at templengthone}} ; %
- \LWR at origmbox{text-indent:-\rndprintlength{\hangingindent}}%
+ \LWR at origmbox{margin-left:\LWR at printlength{\LWR at templengthone}} ; %
+ \LWR at origmbox{text-indent:-\LWR at printlength{\hangingindent}}%
]%
{hangingpar}%
}
@@ -43,10 +42,9 @@
\renewcommand*{\LWR at printcloselist}{\LWR at printcloseitemize}%
\renewcommand*{\LWR at printopenlist}{%
\LWR at findhangingleftmargin%
- \uselengthunit{PT}%
ul style="\LWR at origmbox{list-style-type:none;} %
- \LWR at origmbox{margin-left:\rndprintlength{\LWR at templengthone}} ; %
- \LWR at origmbox{text-indent:-\rndprintlength{\hangingindent}}"%
+ \LWR at origmbox{margin-left:\LWR at printlength{\LWR at templengthone}} ; %
+ \LWR at origmbox{text-indent:-\LWR at printlength{\hangingindent}}"%
}%
\let\item\LWR at itemizeitem%
\list{}{}%
@@ -64,9 +62,8 @@
{%
\BlockClass[%
\LWR at findhangingleftmargin%
- \uselengthunit{PT}%
- \LWR at origmbox{margin-left:\rndprintlength{\LWR at templengthone}} ; %
- \LWR at origmbox{text-indent:-\rndprintlength{\hangingindent}}%
+ \LWR at origmbox{margin-left:\LWR at printlength{\LWR at templengthone}} ; %
+ \LWR at origmbox{text-indent:-\LWR at printlength{\hangingindent}}%
]{labeledpar}#2%
}
{\endBlockClass}
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-hanging.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-hanging.sty 2018-02-20 21:57:43 UTC (rev 46688)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-hanging.sty 2018-02-20 21:58:20 UTC (rev 46689)
@@ -27,10 +27,9 @@
\newenvironment*{hangparas}[2]
{%
- \uselengthunit{PT}%
\BlockClass[%
- \LWR at origmbox{margin-left:\rndprintlength{#1}} ; %
- \LWR at origmbox{text-indent:-\rndprintlength{#1}}%
+ \LWR at origmbox{margin-left:\LWR at printlength{#1}} ; %
+ \LWR at origmbox{text-indent:-\LWR at printlength{#1}}%
]%
{hangingpar}%
}
Added: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-hypdestopt.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-hypdestopt.sty (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-hypdestopt.sty 2018-02-20 21:58:20 UTC (rev 46689)
@@ -0,0 +1,21 @@
+%%
+%% This is file `lwarp-hypdestopt.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx (with options: `hypdestopt')
+%% 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{hypdestopt}
+\endinput
+%%
+%% End of file `lwarp-hypdestopt.sty'.
Property changes on: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-hypdestopt.sty
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-hyphenat.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-hyphenat.sty (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-hyphenat.sty 2018-02-20 21:58:20 UTC (rev 46689)
@@ -0,0 +1,52 @@
+%%
+%% This is file `lwarp-hyphenat.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx (with options: `hyphenat')
+%% 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{hyphenat}
+\LetLtxMacro\LWRHYNAT at origtextnhtt\textnhtt
+\LetLtxMacro\LWRHYNAT at orignhttfamily\nhttfamily
+\LetLtxMacro\LWRHYNAT at orignohyphens\nohyphens
+\LetLtxMacro\LWRHYNAT at origbshyp\bshyp
+\LetLtxMacro\LWRHYNAT at origfshyp\fshyp
+\LetLtxMacro\LWRHYNAT at origdothyp\dothyp
+\LetLtxMacro\LWRHYNAT at origcolonhyp\colonhyp
+\LetLtxMacro\LWRHYNAT at orighyp\hyp
+
+\LetLtxMacro\textnhtt\texttt
+\LetLtxMacro\nhttfamily\ttfamily
+
+\renewcommand{\nohyphens}[1]{#1}
+\renewrobustcmd{\bshyp}{%
+ \ifmmode\backslash\else\textbackslash\fi%
+}
+\renewrobustcmd{\fshyp}{/}
+\renewrobustcmd{\dothyp}{.}
+\renewrobustcmd{\colonhyp}{:}
+\renewrobustcmd{\hyp}{-}
+
+\appto\LWR at restoreorigformatting{
+\LetLtxMacro\textnhtt\LWRHYNAT at origtextnhtt
+\LetLtxMacro\nhttfamily\LWRHYNAT at orignhttfamily
+\LetLtxMacro\nohyphens\LWRHYNAT at orignohyphens
+\LetLtxMacro\bshyp\LWRHYNAT at origbshyp
+\LetLtxMacro\fshyp\LWRHYNAT at origfshyp
+\LetLtxMacro\dothyp\LWRHYNAT at origdothyp
+\LetLtxMacro\colonhyp\LWRHYNAT at origcolonhyp
+\LetLtxMacro\hyp\LWRHYNAT at orighyp
+}
+\endinput
+%%
+%% End of file `lwarp-hyphenat.sty'.
Property changes on: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-hyphenat.sty
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-keyfloat.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-keyfloat.sty 2018-02-20 21:57:43 UTC (rev 46688)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-keyfloat.sty 2018-02-20 21:58:20 UTC (rev 46689)
@@ -81,13 +81,12 @@
{%
\LWR at ensuredoingapar%
\setlength{\LWR at templengthone}{#1}%
-\uselengthunit{PT}%
\begin{LWR at BlockClassWP}{%
- float:right; width:\rndprintlength{\LWR at templengthone}; %
+ float:right; width:\LWR at printlength{\LWR at templengthone}; %
margin:10pt%
}%
{%
- width:\rndprintlength{\LWR at templengthone}%
+ width:\LWR at printlength{\LWR at templengthone}%
}%
{marginblock}%
\setlength{\linewidth}{.95\LWR at templengthone}%
Added: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-lineno.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-lineno.sty (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-lineno.sty 2018-02-20 21:58:20 UTC (rev 46689)
@@ -0,0 +1,133 @@
+%%
+%% This is file `lwarp-lineno.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx (with options: `lineno')
+%% 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{lineno}
+\newcommand*\resetlinenumber[1][\@ne]{}
+
+\def\linenumbers{%
+ \@ifnextchar[{\resetlinenumber}%]
+ {\@ifstar{\resetlinenumber}{}}%
+ }
+
+\newcommand*{\nolinenumbers}{}
+
+\@namedef{linenumbers*}{\par\linenumbers*}
+\@namedef{runninglinenumbers*}{\par\runninglinenumbers*}
+
+\def\endlinenumbers{\par}
+\let\endrunninglinenumbers\endlinenumbers
+\let\endpagewiselinenumbers\endlinenumbers
+\expandafter\let\csname endlinenumbers*\endcsname\endlinenumbers
+\expandafter\let\csname endrunninglinenumbers*\endcsname\endlinenumbers
+\let\endnolinenumbers\endlinenumbers
+
+\def\pagewiselinenumbers{\linenumbers\setpagewiselinenumbers}
+
+\def\runninglinenumbers{\setrunninglinenumbers\linenumbers}
+
+\def\setpagewiselinenumbers{}
+
+\def\setrunninglinenumbers{}
+
+\def\linenomath{}%
+\@namedef{linenomath*}{}%
+\def\endlinenomath{}
+\expandafter\let\csname endlinenomath*\endcsname\endlinenomath
+
+\let\linelabel\label
+
+\def\switchlinenumbers{\@ifstar{}{}}
+\def\setmakelinenumbers#1{\@ifstar{}{}}
+
+\def\leftlinenumbers{\@ifstar{}{}}
+\def\rightlinenumbers{\@ifstar{}{}}
+
+\newcounter{linenumber}
+\newcount\c at pagewiselinenumber
+\let\c at runninglinenumber\c at linenumber
+
+\def\runningpagewiselinenumbers{}
+\def\realpagewiselinenumbers{}
+
+\NewDocumentCommand\modulolinenumbers{s o}{}
+
+\chardef\c at linenumbermodulo=5
+\modulolinenumbers[1]
+
+\newcommand*\firstlinenumber[1]{}
+
+\newcommand\internallinenumbers{}
+\let\endinternallinenumbers\endlinenumbers
+\@namedef{internallinenumbers*}{\internallinenumbers*}
+\expandafter\let\csname endinternallinenumbers*\endcsname\endlinenumbers
+
+\newcommand*{\linenoplaceholder}[1]{% redefine per language
+ (line number reference for \detokenize\expandafter{#1})
+}
+
+\newcommand*{\lineref}[2][]{\linenoplaceholder{#2}}
+\newcommand*{\linerefp}[2][]{\linenoplaceholder{#2}}
+\newcommand*{\linerefr}[2][]{\linenoplaceholder{#2}}
+
+\newcommand\quotelinenumbers
+ {\@ifstar\linenumbers{\@ifnextchar[\linenumbers{\linenumbers*}}}
+
+\newdimen\linenumbersep
+\newdimen\linenumberwidth
+\newdimen\quotelinenumbersep
+
+\quotelinenumbersep=\linenumbersep
+\let\quotelinenumberfont\linenumberfont
+
+\def\linenumberfont{\normalfont\tiny\sffamily}
+
+\linenumberwidth=10pt
+\linenumbersep=10pt
+
+\def\thelinenumber{}
+
+\def\LineNumber{}
+\def\makeLineNumber{}
+\def\makeLineNumberLeft{}
+\def\makeLineNumberRight{}
+\def\makeLineNumberOdd{}
+\def\makeLineNumberEven{}
+\def\makeLineNumberRunning{}
+
+\newenvironment{numquote} {\quote}{\endquote}
+\newenvironment{numquotation} {\quotation}{\endquotation}
+\newenvironment{numquote*} {\quote}{\endquote}
+\newenvironment{numquotation*}{\quotation}{\endquotation}
+
+\newdimen\bframerule
+\bframerule=\fboxrule
+
+\newdimen\bframesep
+\bframesep=\fboxsep
+
+\newenvironment{bframe}
+{%
+ \LWR at forceminwidth{\bframerule}%
+ \BlockClass[
+ border:\LWR at printlength{\LWR at atleastonept} solid black ; %
+ padding:\LWR at printlength{\bframesep}%
+ ]{bframe}
+}
+{\endBlockClass}
+\endinput
+%%
+%% End of file `lwarp-lineno.sty'.
Property changes on: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-lineno.sty
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-luacolor.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-luacolor.sty (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-luacolor.sty 2018-02-20 21:58:20 UTC (rev 46689)
@@ -0,0 +1,22 @@
+%%
+%% This is file `lwarp-luacolor.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx (with options: `luacolor')
+%% 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{luacolor}
+\newcommand{\luacolorProcessBox}[1]{}
+\endinput
+%%
+%% End of file `lwarp-luacolor.sty'.
Property changes on: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-luacolor.sty
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-mdframed.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-mdframed.sty 2018-02-20 21:57:43 UTC (rev 46688)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-mdframed.sty 2018-02-20 21:58:20 UTC (rev 46689)
@@ -46,12 +46,11 @@
}
\newcommand*{\LWR at mdfprintlength}[1]{%
-\rndprintlength{\csuse{mdf@#1 at length}}
+\LWR at printlength{\csuse{mdf@#1 at length}}
}
\newcommand*{\LWR at mdframedstart}{%
\LWR at traceinfo{LWR at mdframedstart start}%
\LWR at stoppars%
-\uselengthunit{PT}%
\LWR at htmltagc{div class="\LWR at mdthisenv" \LWR at orignewline
style=" \LWR at orignewline
background: \LWR at mdfprintcolor{backgroundcolor} ; \LWR at orignewline
@@ -122,7 +121,6 @@
\renewrobustcmd\mdfframedtitleenv[1]{%
\LWR at traceinfo{LWR at mdframedtitleenv start}%
-\uselengthunit{PT}%
\LWR at htmltagc{span class="mdframedtitle" \LWR at orignewline
style=" \LWR at orignewline
background:
@@ -138,8 +136,8 @@
border-radius:
\setlength{\LWR at titleroundcorner}
{\maxof{\mdf at roundcorner@length-\mdf at linewidth@length}{0pt}}
- \rndprintlength{\LWR at titleroundcorner}
- \rndprintlength{\LWR at titleroundcorner}
+ \LWR at printlength{\LWR at titleroundcorner}
+ \LWR at printlength{\LWR at titleroundcorner}
0pt 0pt
\LWR at orignewline
" \LWR at orignewline
Added: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pagegrid.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pagegrid.sty (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pagegrid.sty 2018-02-20 21:58:20 UTC (rev 46689)
@@ -0,0 +1,22 @@
+%%
+%% This is file `lwarp-pagegrid.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx (with options: `pagegrid')
+%% 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{pagegrid}
+\newcommand*{\pagegridsetup}[1]{}
+\endinput
+%%
+%% End of file `lwarp-pagegrid.sty'.
Property changes on: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pagegrid.sty
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfrender.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfrender.sty (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfrender.sty 2018-02-20 21:58:20 UTC (rev 46689)
@@ -0,0 +1,23 @@
+%%
+%% This is file `lwarp-pdfrender.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx (with options: `pdfrender')
+%% 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{pdfrender}
+\newcommand*{\pdfrender}[1]{}
+\newcommand{\textpdfrender}[2]{#2}
+\endinput
+%%
+%% End of file `lwarp-pdfrender.sty'.
Property changes on: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfrender.sty
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-quotchap.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-quotchap.sty 2018-02-20 21:57:43 UTC (rev 46688)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-quotchap.sty 2018-02-20 21:58:20 UTC (rev 46689)
@@ -22,8 +22,7 @@
\let\@printcites\relax
\newcommand*{\@iprintcites}{%
-\uselengthunit{PT}%
-\begin{BlockClass}[max-width: \rndprintlength{\LWR at quotchapwidth}]{quotchap}
+\begin{BlockClass}[max-width: \LWR at printlength{\LWR at quotchapwidth}]{quotchap}
\@quotchap
\end{BlockClass}
\global\let\@printcites\relax
Added: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-resizegather.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-resizegather.sty (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-resizegather.sty 2018-02-20 21:58:20 UTC (rev 46689)
@@ -0,0 +1,22 @@
+%%
+%% This is file `lwarp-resizegather.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx (with options: `resizegather')
+%% 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{resizegather}
+\newcommand*{\resizegathersetup}[1]{}
+\endinput
+%%
+%% End of file `lwarp-resizegather.sty'.
Property changes on: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-resizegather.sty
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-scrextend.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-scrextend.sty 2018-02-20 21:57:43 UTC (rev 46688)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-scrextend.sty 2018-02-20 21:58:20 UTC (rev 46689)
@@ -119,20 +119,19 @@
\NewDocumentEnvironment{addmargin}{s O{} m}
{
-\uselengthunit{PT}%
\setlength{\LWR at templengthtwo}{#3}
\ifblank{#2}
{
\begin{BlockClass}[
- \LWR at origmbox{margin-left:\rndprintlength{\LWR at templengthtwo}} ;
- \LWR at origmbox{margin-right:\rndprintlength{\LWR at templengthtwo}}
+ \LWR at origmbox{margin-left:\LWR at printlength{\LWR at templengthtwo}} ;
+ \LWR at origmbox{margin-right:\LWR at printlength{\LWR at templengthtwo}}
]{addmargin}
}
{
\setlength{\LWR at templengthone}{#2}
\begin{BlockClass}[
- \LWR at origmbox{margin-left:\rndprintlength{\LWR at templengthone}} ;
- \LWR at origmbox{margin-right:\rndprintlength{\LWR at templengthtwo}}
+ \LWR at origmbox{margin-left:\LWR at printlength{\LWR at templengthone}} ;
+ \LWR at origmbox{margin-right:\LWR at printlength{\LWR at templengthtwo}}
]{addmargin}
}
}
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-stabular.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-stabular.sty 2018-02-20 21:57:43 UTC (rev 46688)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-stabular.sty 2018-02-20 21:58:20 UTC (rev 46689)
@@ -18,14 +18,14 @@
\LWR at ProvidesPackageDrop{stabular}
\newenvironment{stabular}[2][c]
{
+\begin{tabular}[#1]{#2}
\renewcommand{\noalign}[1]{}
-\begin{tabular}[#1]{#2}
}
{\end{tabular}}
\NewDocumentEnvironment{stabular*}{m o m}
{
+\begin{tabular}[#2]{#3}
\renewcommand{\noalign}[1]{}
-\begin{tabular}[#2]{#3}
}
{\end{tabular}}
\endinput
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-textfit.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-textfit.sty 2018-02-20 21:57:43 UTC (rev 46688)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-textfit.sty 2018-02-20 21:58:20 UTC (rev 46689)
@@ -19,12 +19,11 @@
\newsavebox{\LWR at textfitbox}
\newcommand*{\LWR at textfitscale}[2]{%
-\uselengthunit{PT}%
\setlength{\LWR at templengthone}{#1}%
\setlength{\LWR at templengthone}{%
1em*\ratio{\LWR at templengthone}{\LWR at templengthtwo}%
}%
-\InlineClass[font-size:\rndprintlength{\LWR at templengthone}]{textfit}{#2}%
+\InlineClass[font-size:\LWR at printlength{\LWR at templengthone}]{textfit}{#2}%
}
\newcommand*{\scaletowidth}[2]{%
Added: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-vertbars.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-vertbars.sty (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-vertbars.sty 2018-02-20 21:58:20 UTC (rev 46689)
@@ -0,0 +1,36 @@
+%%
+%% This is file `lwarp-vertbars.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx (with options: `vertbars')
+%% 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{vertbars}
+\newlength{\barwidth}
+\setlength{\barwidth}{0.4pt}
+\newlength{\barspace}
+\setlength{\barspace}{1em}
+
+\newenvironment{vertbar}{
+ \LWR at forcenewpage
+ \LWR at forceminwidth{\barwidth}
+ \begin{BlockClass}[%
+ border-left: \LWR at printlength{\LWR at atleastonept} solid black ; %
+ padding-left: \LWR at printlength{\barspace}%
+ ]{vertbar}
+}{
+ \end{BlockClass}
+}
+\endinput
+%%
+%% End of file `lwarp-vertbars.sty'.
Property changes on: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-vertbars.sty
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-vwcol.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-vwcol.sty (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-vwcol.sty 2018-02-20 21:58:20 UTC (rev 46689)
@@ -0,0 +1,87 @@
+%%
+%% This is file `lwarp-vwcol.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx (with options: `vwcol')
+%% 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{vwcol}
+\newcommand*{\LWR at vwcol@addrule}[1]{%
+ \appto{\LWR at vwcolstyle}{%
+ #1: %
+ \LWR at printlength{\vwcol at rule} solid \#\LWR at vwcol@rulecolor ; %
+ }%
+}
+
+\newcommand*{\LWR at vwcol@addgap}[1]{%
+ \appto{\LWR at vwcolstyle}{%
+ #1: %
+ \LWR at printlength{\vwcol at sep} ; %
+ }%
+}
+\renewenvironment*{vwcol}[1][]{%
+\par\noindent%
+\vwcolsetup{#1}%
+\newcommand*{\LWR at vwcolstyle}{}
+\if at vwcol@presep
+ \appto{\LWR at vwcolstyle}{margin-left: 1em ; padding-left: .5em ; }
+\fi
+\if at vwcol@postsep
+ \appto{\LWR at vwcolstyle}{margin-right: 1em ; padding-right: .5em ; }
+\fi
+\ifdimgreater{\vwcol at sep}{1sp}{
+ \LWR at vwcol@addgap{column-gap}
+ \LWR at vwcol@addgap{-moz-column-gap}
+ \LWR at vwcol@addgap{-webkit-column-gap}
+}{}
+\convertcolorspec{named}{\vwcol at rulecol}{HTML}\LWR at vwcol@rulecolor%
+\ifdimgreater{\vwcol at rule}{0pt}{
+ \ifdimless{\vwcol at rule}{1pt}{
+ \setlength{\vwcol at rule}{1pt}
+ }{}
+ \LWR at vwcol@addrule{column-rule}
+ \LWR at vwcol@addrule{-moz-column-rule}
+ \LWR at vwcol@addrule{-webkit-column-rule}
+ \if at vwcol@prerule\LWR at vwcol@addrule{border-left}\fi
+ \if at vwcol@postrule\LWR at vwcol@addrule{border-right}\fi
+}{}
+\ifdefequal{\vwcol at justify}{\RaggedRight}{
+ \appto{\LWR at vwcolstyle}{text-align: left ; }
+ \ifdimgreater{\vwcol at parindent}{0pt}{
+ \appto{\LWR at vwcolstyle}{%
+ text-indent: \LWR at printlength{\vwcol at parindent} ; %
+ }
+ }{}
+}{}
+\ifdefequal{\vwcol at justify}{\RaggedLeft}{
+ \appto{\LWR at vwcolstyle}{text-align: right ; }
+}{}
+\ifdefequal{\vwcol at justify}{\Centering}{
+ \appto{\LWR at vwcolstyle}{text-align: center ; }
+}{}
+\ifdefequal{\vwcol at justify}{\justifying}{
+ \appto{\LWR at vwcolstyle}{text-align: justify ; }
+ \ifdimgreater{\vwcol at parindent}{0pt}{
+ \appto{\LWR at vwcolstyle}{%
+ text-indent: \LWR at printlength{\vwcol at parindent} ; %
+ }
+ }{}
+}{}
+\BlockClass[\LWR at vwcolstyle]{multicols}
+}
+{
+\endBlockClass
+}
+\endinput
+%%
+%% End of file `lwarp-vwcol.sty'.
Property changes on: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-vwcol.sty
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-wrapfig.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-wrapfig.sty 2018-02-20 21:57:43 UTC (rev 46688)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-wrapfig.sty 2018-02-20 21:58:20 UTC (rev 46689)
@@ -30,13 +30,12 @@
{\renewcommand*{\LWR at wrapposition}{float:right}}%
{\renewcommand*{\LWR at wrapposition}{float:left}}%
\setlength{\LWR at templengthone}{#2}%
-\uselengthunit{PT}%
\LWR at BlockClassWP{%
- width:\rndprintlength{\LWR at templengthone}; \LWR at wrapposition; %
+ width:\LWR at printlength{\LWR at templengthone}; \LWR at wrapposition; %
margin:10pt%
}%
{%
- width:\rndprintlength{\LWR at templengthone}; \LWR at wrapposition%
+ width:\LWR at printlength{\LWR at templengthone}; \LWR at wrapposition%
}%
{marginblock}%
}
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty 2018-02-20 21:57:43 UTC (rev 46688)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty 2018-02-20 21:58:20 UTC (rev 46689)
@@ -75,9 +75,8 @@
\endgroup%
}
\newcommand*{\LWR at borderpadding}[2]{%
-\uselengthunit{PT}%
-border:\rndprintlength{\LWR at atleastonept} solid \LWR at colorstyle{#1}{#2} ; %
-padding:\rndprintlength{\fboxsep}%
+border:\LWR at printlength{\LWR at atleastonept} solid \LWR at colorstyle{#1}{#2} ; %
+padding:\LWR at printlength{\fboxsep}%
}
\RenewDocumentCommand{\textcolor}{O{named} m m}{%
\begingroup%
@@ -96,10 +95,9 @@
\RenewDocumentCommand{\colorbox}{O{named} m +m}{%
\begingroup%
\LWR at FBcancel%
-\uselengthunit{PT}%
\InlineClass[%
background:\LWR at colorstyle{#1}{#2} ; %
-padding:\rndprintlength{\fboxsep}%
+padding:\LWR at printlength{\fboxsep}%
]{colorbox}{#3}%
\endgroup%
}
@@ -107,10 +105,9 @@
\NewDocumentCommand{\colorboxBlock}{O{named} m +m}{%
\begingroup%
\LWR at FBcancel%
-\uselengthunit{PT}%
\begin{BlockClass}[%
background:\LWR at colorstyle{#1}{#2} ; %
-padding:\rndprintlength{\fboxsep}%
+padding:\LWR at printlength{\fboxsep}%
]{colorboxBlock}
#3
\end{BlockClass}%
@@ -121,7 +118,6 @@
\LWR at traceinfo{HTML fcolorbox #2 #4}%
\begingroup%
\LWR at FBcancel%
-\uselengthunit{PT}%
\LWR at forceminwidth{\fboxrule}%
\ifthenelse{\equal{#4}{none}}%
{% no background color
@@ -142,7 +138,6 @@
\LWR at traceinfo{HTML fcolorboxBlock #2 #4}%
\begingroup%
\LWR at FBcancel%
-\uselengthunit{PT}%
\LWR at forceminwidth{\fboxrule}%
\ifthenelse{\equal{#4}{none}}%
{% no background color
@@ -169,8 +164,8 @@
\begin{BlockClass}[%
#3%
\LWR at borderpadding{#1}{#2} ; %
-\IfValueT{#4}{height:\rndprintlength{\LWR at tempheight} ; }%
-width:\rndprintlength{\LWR at tempwidth}%
+\IfValueT{#4}{height:\LWR at printlength{\LWR at tempheight} ; }%
+width:\LWR at printlength{\LWR at tempwidth}%
]{fcolorminipage}%
}
\NewDocumentEnvironment{fcolorminipage}{O{named} m O{named} m O{c} o o m}
@@ -178,7 +173,6 @@
\LWR at FBcancel%
\setlength{\LWR at tempwidth}{#8}%
\IfValueT{#6}{\setlength{\LWR at tempheight}{#6}}%
-\uselengthunit{PT}%
\LWR at forceminwidth{\fboxrule}%
\convertcolorspec{#1}{#2}{HTML}\LWR at tempcolor%
\ifthenelse{\equal{#4}{none}}%
@@ -194,16 +188,68 @@
\setlength{\LWR at tempwidth}{#1}%
\setlength{\LWR at tempheight}{#2}%
\addtolength{\LWR at tempheight}{#3}%
-\uselengthunit{PT}%
\LWR at forceminwidth{\fboxrule}%
\InlineClass[%
display:inline-block ; %
-border:\rndprintlength{\LWR at atleastonept} solid \LWR at currenttextcolor{} ; %
-width:\rndprintlength{\LWR at tempwidth} ; %
-height:\rndprintlength{\LWR at tempheight}%
+border:\LWR at printlength{\LWR at atleastonept} solid \LWR at currenttextcolor{} ; %
+width:\LWR at printlength{\LWR at tempwidth} ; %
+height:\LWR at printlength{\LWR at tempheight}%
]{boxframe}{}%
}%
}
+\newcommand*{\LWR at xcolortempcolor}{}
+
+\def\rowc at l@rs[#1]#2#3#4%
+{
+\global\rownum=1
+ \global\@rowcolorstrue
+ \@ifxempty{#3}%
+ {\def\@oddrowcolor{\@norowcolor}}%
+ {%
+ \convertcolorspec{named}{#3}{HTML}\LWR at xcolortempcolor%
+ \edef\@oddrowcolor{%
+ \csdef{LWR at xcolorrowHTMLcolor}{\LWR at xcolortempcolor}%
+ }%
+ }%
+ \@ifxempty{#4}%
+ {\def\@evenrowcolor{\@norowcolor}}%
+ {%
+ \convertcolorspec{named}{#4}{HTML}\LWR at xcolortempcolor%
+ \edef\@evenrowcolor{%
+ \csdef{LWR at xcolorrowHTMLcolor}{\LWR at xcolortempcolor}%
+ }%
+ }%
+ \if at rowcmd
+ \def\@rowcolors
+ {%
+ \if at rowcolors
+ \relax\ifnum\rownum<#2\@norowcolor\else
+ \ifodd\rownum\@oddrowcolor\else\@evenrowcolor\fi\fi%
+ \fi%
+ }%
+ \else
+ \def\@rowcolors
+ {%
+ \if at rowcolors
+ \ifnum\rownum<#2%
+ \@norowcolor
+ \else
+ \ifodd\rownum\@oddrowcolor\else\@evenrowcolor\fi%
+ \fi
+ \fi%
+ }%
+ \fi
+ \ignorespaces%
+}
+\def\@norowcolor{%
+\renewcommand{\LWR at xcolorrowHTMLcolor}{}%
+}
+
+\def\@rowc at lors{%
+ \global\advance\rownum\@ne%
+ \@rowcolors%
+}
+
\end{warpHTML}
\endinput
%%
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp.sty 2018-02-20 21:57:43 UTC (rev 46688)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp.sty 2018-02-20 21:58:20 UTC (rev 46689)
@@ -17,7 +17,7 @@
%% version 2005/12/01 or later.
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesPackage{lwarp}
- [2018/02/14 v0.48 Allows LaTeX to directly produce HTML5 output.]
+ [2018/02/19 v0.49 Allows LaTeX to directly produce HTML5 output.]
@@ -272,6 +272,7 @@
\LWR at loadafter{fancyref}
\LWR at loadafter{fancyvrb}
\LWR at loadafter{figcaps}
+\LWR at loadafter{figsize}
\LWR at loadafter{fix2col}
\LWR at loadafter{fixme}
\LWR at loadafter{fixmetodonotes}
@@ -283,6 +284,7 @@
\LWR at loadafter{fltrace}
\LWR at loadafter{flushend}
\LWR at loadafter{fncychap}
+\LWR at loadafter{fnlineno}
\LWR at loadafter{fnpos}
\LWR at loadafter{footmisc}
\LWR at loadafter{footnote}
@@ -299,9 +301,11 @@
\LWR at loadafter{hang}
\LWR at loadafter{hanging}
\LWR at loadafter{hypcap}
+\LWR at loadafter{hypdestopt}
\LWR at loadafter{hypernat}
\LWR at loadafter{hyperref}
\LWR at loadafter{hyperxmp}
+\LWR at loadafter{hyphenat}
\LWR at loadafter{idxlayout}
\LWR at loadafter{ifoddpage}
\LWR at loadafter{indentfirst}
@@ -309,6 +313,7 @@
\LWR at loadafter{layout}
\LWR at loadafter{letterspace}
\LWR at loadafter{lettrine}
+\LWR at loadafter{lineno}
\LWR at loadafter{lips}
\LWR at loadafter{listings}
\LWR at loadafter{longtable}
@@ -315,6 +320,7 @@
\LWR at loadafter{lscape}
\LWR at loadafter{ltcaption}
\LWR at loadafter{ltxtable}
+\LWR at loadafter{luacolor}
\LWR at loadafter{luatodonotes}
\LWR at loadafter{marginfit}
\LWR at loadafter{marginfix}
@@ -340,10 +346,12 @@
\LWR at loadafter{nowidow}
\LWR at loadafter{ntheorem}
\LWR at loadafter{overpic}
+\LWR at loadafter{pagegrid}
\LWR at notmemoirloadafter{pagenote}
\LWR at loadafter{pagesel}
\LWR at loadafter{paralist}
\LWR at notmemoirloadafter{parskip}
+\LWR at loadafter{pdfrender}
\LWR at loadafter{pdflscape}
\LWR at loadafter{pdfsync}
\LWR at loadafter{pfnote}
@@ -355,6 +363,7 @@
\LWR at loadafter{ragged2e}
\LWR at loadafter{realscripts}
\LWR at loadafter{relsize}
+\LWR at loadafter{resizegather}
\LWR at loadafter{romanbar}
\LWR at loadafter{romanbarpagenumber}
\LWR at loadafter{rotating}
@@ -408,7 +417,9 @@
\LWR at loadafter{upref}
\LWR at loadafter{varioref}% no lwarp package provided
\LWR at notmemoirloadafter{verse}
+\LWR at loadafter{vertbars}
\LWR at loadafter{vmargin}
+\LWR at loadafter{vwcol}
\LWR at loadafter{wallpaper}
\LWR at loadafter{watermark}
\LWR at loadafter{wrapfig}
@@ -537,10 +548,24 @@
\PassOptionsToPackage{leqno}{amsmath}
\RequirePackage{amsmath}
+\def\maketag@@@#1{#1}
+\def\tagform@#1{\maketag@@@{(\ignorespaces#1\unskip)}}
\RequirePackage{printlen}
+\newrobustcmd*{\LWR at printlength}[1]{%
+\begingroup%
+\uselengthunit{PT}%
+\renewcommand*{\unitspace}{}%
+\ifdimless{#1}{10pt}{%
+ \printlength{#1}%
+}{%
+ \rndprintlength{#1}%
+}%
+\endgroup%
+}
+
\end{warpHTML}
\begin{warpprint}
@@ -2941,7 +2966,7 @@
-- Print the usage of the lwarpmk command:
-printversion = "v0.48"
+printversion = "v0.49"
function printhelp ()
print ("lwarpmk: Use lwarpmk -h or lwarpmk --help for help.") ;
@@ -5079,8 +5104,14 @@
\end{warpHTML}
\begin{warpall}
-\newrobustcmd{\affiliation}[1]{}
+\ifcsvoid{@titlepagefalse}{
+ \newif\if at titlepage
+ \@titlepagefalse
+}{}
\end{warpall}
+\begin{warpall}
+\providerobustcmd{\affiliation}[1]{}
+\end{warpall}
\begin{warpprint}
\AtBeginEnvironment{titlepage}{
\renewrobustcmd{\affiliation}[1]{\\ \textsc{\small#1}}
@@ -5818,14 +5849,15 @@
\ifnumcomp{\value{LWR at tablecolindex}}{<}{\value{LWR at tabletotalcols}}%
{\LWR at tabularfinishrow}%
{\LWR at closetabledatacell}%
-\LWR at htmltag{/tr}\LWR at orignewline
-\global\booltrue{LWR at intabularmetadata}
-\global\boolfalse{LWR at startedrow}
+\LWR at htmltag{/tr}\LWR at orignewline%
+\@rowc at lors%
+\global\booltrue{LWR at intabularmetadata}%
+\global\boolfalse{LWR at startedrow}%
\global\boolfalse{LWR at doinghline}%
\global\boolfalse{LWR at doingtbrule}%
\global\boolfalse{LWR at doingcmidrule}%
\LWR at clearmidrules%
-\renewcommand*{\LWR at rowHTMLcolor}{}
+\renewcommand*{\LWR at rowHTMLcolor}{}%
\setcounter{LWR at tablecolindex}{1}%
\boolfalse{LWR at tabularcelladded}%
\LWR at getmynexttoken%
@@ -6012,11 +6044,14 @@
\LWR at traceinfo{LWR at parsetablecols: done}%
}%
-
-\newcommand{\LWR at columnHTMLcolor}{}
-\newcommand{\LWR at rowHTMLcolor}{}
-\newcommand{\LWR at cellHTMLcolor}{}
-\newcommand{\LWR at ruleHTMLcolor}{}
+ \@ifundefined{rownum}{\newcount\rownum}{}
+\newcommand*{\@rowcolors}{}
+\newcommand*{\@rowc at lors}{}
+\newcommand*{\LWR at xcolorrowHTMLcolor}{}
+\newcommand*{\LWR at columnHTMLcolor}{}
+\newcommand*{\LWR at rowHTMLcolor}{}
+\newcommand*{\LWR at cellHTMLcolor}{}
+\newcommand*{\LWR at ruleHTMLcolor}{}
\NewDocumentCommand{\LWR at HTMLcolumncolor}{O{named} m o o}{}
\NewDocumentCommand{\LWR at HTMLrowcolor}{O{named} m o o}{\LWR at getmynexttoken}
@@ -6284,8 +6319,7 @@
{% custom width and/or color
\LWR at forceminwidth{#1}%
\LWR at tdaddstyle%
- \uselengthunit{PT}%
- border-top:\rndprintlength{\LWR at atleastonept} solid %
+ border-top:\LWR at printlength{\LWR at atleastonept} solid %
\ifdefvoid{\LWR at ruleHTMLcolor}{%
\ifdimcomp{#1}{<}{\LWR at lightrulewidth}%
{\#A0A0A0}%
@@ -6326,11 +6360,17 @@
\newcommand*{\LWR at addtabularrowcolor}{%
\ifbool{LWR at tabularmutemods}{}{%
- \ifdefvoid{\LWR at rowHTMLcolor}{}%
- {% row color
+ \ifdefvoid{\LWR at rowHTMLcolor}{%
+ \ifdefvoid{\LWR at xcolorrowHTMLcolor}{}%
+ {% xcolor row color
+ \LWR at tdaddstyle%
+ background:\#\LWR at xcolorrowHTMLcolor%
+ }%
+ }%
+ {% explicit row color
\LWR at tdaddstyle%
background:\#\LWR at rowHTMLcolor%
- }% row color
+ }%
}%
}
@@ -6379,9 +6419,13 @@
{%
\ifdefvoid{\LWR at rowHTMLcolor}%
{%
- \ifdefvoid{\LWR at columnHTMLcolor}%
- {}%
- {\LWR at subaddtabularcellcolor{\LWR at columnHTMLcolor}}%
+ \ifdefvoid{\LWR at xcolorrowHTMLcolor}%
+ {%
+ \ifdefvoid{\LWR at columnHTMLcolor}%
+ {}%
+ {\LWR at subaddtabularcellcolor{\LWR at columnHTMLcolor}}%
+ }%
+ {\LWR at subaddtabularcellcolor{\LWR at xcolorrowHTMLcolor}}%
}%
{\LWR at subaddtabularcellcolor{\LWR at rowHTMLcolor}}%
}%
@@ -6525,6 +6569,7 @@
\ifbool{LWR at mcolvertbarr}{ tvertbarr}{}%
"%
\LWR at tdstartstyles%
+\LWR at addtabularrowcolor%
\LWR at addcmidrulewidth%
\LWR at addtabularhrulecolor%
\LWR at addmulticolvertrulecolor%
@@ -6726,6 +6771,8 @@
{\let\mynext\LWR at donothing}{}%
\ifdefequal{\LWR at mynexttoken}{\multicolumnrow}%
{\let\mynext\LWR at donothing}{}%
+\ifdefequal{\LWR at mynexttoken}{\noalign}%
+ {\let\mynext\LWR at donothing}{}%
\ifdefequal{\LWR at mynexttoken}{\mrowcell}%
{\let\mynext\LWR at donothing}{}%
\ifdefequal{\LWR at mynexttoken}{\mcolrowcell}%
@@ -6796,6 +6843,16 @@
\newcommand*{\LWR at origaddlinespace}[1][]{}
\newcommand*{\LWR at origmorecmidrules}{}
\newcommand*{\LWR at origspecialrule}[3]{\hline}
+\LetLtxMacro\LWR at orignoalign\noalign
+
+\newcommand{\LWR at tabularnoalign}[1]{%
+\begingroup%
+\global\advance\rownum\m at ne%
+\renewcommand*{\LWR at xcolorrowHTMLcolor}{}%
+\multicolumn{\value{LWR at tabletotalcols}}{l}{#1} \\
+\endgroup%
+\LWR at getmynexttoken%
+}
\AtBeginDocument{
\@ifpackageloaded{lwarp-tabls}
{
@@ -6853,20 +6910,22 @@
\boolfalse{LWR at tabularcelladded}%
\LWR at clearmidrules%
\LetLtxMacro{\\}{\LWR at tabularendofline}%
-\LetLtxMacro\columncolor\LWR at HTMLcolumncolor
-\LetLtxMacro\rowcolor\LWR at HTMLrowcolor
-\LetLtxMacro\cellcolor\LWR at HTMLcellcolor
-\LetLtxMacro\arrayrulecolor\LWR at HTMLarrayrulecolor
-\LetLtxMacro\doublerulesepcolor\LWR at HTMLdoublerulesepcolor
-\renewcommand*{\LWR at columnHTMLcolor}{}
-\renewcommand*{\LWR at rowHTMLcolor}{}
-\renewcommand*{\LWR at cellHTMLcolor}{}
-\edef\LWR at vertruleHTMLcolor{\LWR at ruleHTMLcolor}
-\setcounter{LWR at cellcolordepth}{0}
+\LetLtxMacro\columncolor\LWR at HTMLcolumncolor%
+\LetLtxMacro\rowcolor\LWR at HTMLrowcolor%
+\LetLtxMacro\cellcolor\LWR at HTMLcellcolor%
+\LetLtxMacro\arrayrulecolor\LWR at HTMLarrayrulecolor%
+\LetLtxMacro\doublerulesepcolor\LWR at HTMLdoublerulesepcolor%
+\renewcommand*{\LWR at columnHTMLcolor}{}%
+\renewcommand*{\LWR at rowHTMLcolor}{}%
+\renewcommand*{\LWR at cellHTMLcolor}{}%
+\@rowcolors%
+\edef\LWR at vertruleHTMLcolor{\LWR at ruleHTMLcolor}%
+\setcounter{LWR at cellcolordepth}{0}%
\LWR at traceinfo{LWR at tabular: redefining macros}%
+\LetLtxMacro\noalign\LWR at tabularnoalign%
\LetLtxMacro\hline\LWR at HTMLhline%
\LetLtxMacro\cline\LWR at HTMLcline%
-\DeclareDocumentCommand{\toprule}{o d()}
+\DeclareDocumentCommand{\toprule}{o d()}%
{%
\IfValueTF{##1}%
{\LWR at docmidrule[##1](){1-\arabic{LWR at tabletotalcols}}}%
@@ -6888,7 +6947,7 @@
\LWR at getmynexttoken}%
\DeclareDocumentCommand{\cmidrule}{O{\LWR at cmidrulewidth} d() m}%
{\LWR at docmidrule[##1](##2){##3}\LWR at getmynexttoken}%
-\DeclareDocumentCommand{\bottomrule}{o d()}
+\DeclareDocumentCommand{\bottomrule}{o d()}%
{%
\IfValueTF{##1}%
{\LWR at docmidrule[##1](){1-\arabic{LWR at tabletotalcols}}}%
@@ -6946,6 +7005,7 @@
\LWR at closetabledatacell%
}%
\LWR at htmlblocktag{/tr}%
+\@rowc at lors%
\LWR at htmlblocktag{/table}%
\global\boolfalse{LWR at intabularmetadata}%
\addtocounter{LWR at tabulardepth}{-1}%
@@ -7143,7 +7203,7 @@
\LWR at ensuredoingapar%
}
-\NewDocumentCommand{\href}{O{} m +m}{%
+\DeclareDocumentCommand{\href}{O{} m +m}{%
\LWR at ensuredoingapar%
\LWR at subhyperref{#2}{#3}%
}
@@ -7155,7 +7215,7 @@
\LWR at templink%
}
-\NewDocumentCommand{\url}{m}{%
+\DeclareDocumentCommand{\url}{m}{%
\LWR at ensuredoingapar%
\def\LWR at templink{#1}%
\@onelevel at sanitize\LWR at templink%
@@ -7714,6 +7774,7 @@
\let\qquad\LWR at origqquad%
\LetLtxMacro\tabular\LWR at origtabular%
\LetLtxMacro\endtabular\LWR at origendtabular%
+\LetLtxMacro\noalign\LWR at orignoalign%
\LetLtxMacro\hline\LWR at orighline%
\LetLtxMacro\toprule\LWR at origtoprule%
\LetLtxMacro\midrule\LWR at origmidrule%
@@ -7799,7 +7860,6 @@
\protected\gdef\LWR at subsingledollar#1{%
\begingroup%
-\normalsize%
\ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }%
{%
{\textbackslash(\LWR at HTMLsanitize{#1}\textbackslash)}%
@@ -7816,6 +7876,7 @@
\global\setlength{\LWR at singledollarheight}{\totalheightof{%
\LWR at origdollar#1\LWR at origdollar%
}*\real{.8}}%
+ \LWR at origscriptsize%
\def\LWR at singledollarstyle{%
height:\LWR at convertto{em}{\the\LWR at singledollarheight }em%
}%
@@ -8780,7 +8841,6 @@
\boolfalse{LWR at minipagethispar}
\RenewDocumentEnvironment{minipage}{O{t} o O{t} m}
{%
-\uselengthunit{PT}%
\begingroup
\setlength{\LWR at minipagewidth}{#4}%
\ifthenelse{\cnttest{\value{LWR at minipagedepth}}{=}{0}}{%
@@ -8790,7 +8850,7 @@
\setlength{\textwidth}{6in}%
\setlength{\textheight}{9in}%
}{}%
-\LWR at traceinfo{computed width is \rndprintlength{\LWR at minipagewidth}}%
+\LWR at traceinfo{computed width is \LWR at printlength{\LWR at minipagewidth}}%
\setlength{\LWR at minipageheight}{\textheight}% default unless specified
\IfValueT{#2}{\setlength{\LWR at minipageheight}{#2}}%
\addtocounter{LWR at minipagedepth}{1}%
@@ -8811,17 +8871,16 @@
\ifthenelse{\equal{#3}{c}}{\LWR at origmbox{justify-content:center} ; }{}%
\ifthenelse{\equal{#3}{b}}{\LWR at origmbox{justify-content:flex-end} ; }{}%
\ifthenelse{\equal{#3}{s}}{\LWR at origmbox{justify-content:space-between} ; }{}%
-\LWR at traceinfo{minipage: about to print the width of \rndprintlength{\LWR at minipagewidth}}%
-\uselengthunit{PT}%
+\LWR at traceinfo{minipage: about to print the width of \LWR at printlength{\LWR at minipagewidth}}%
\ifbool{LWR at minipagefullwidth}%
{\boolfalse{LWR at minipagefullwidth}}%
{%
\ifthenelse{\lengthtest{#4}=\linewidth}%
{}%
- {width:\rndprintlength{\LWR at minipagewidth} ; }%
+ {width:\LWR at printlength{\LWR at minipagewidth} ; }%
}%
\LWR at traceinfo{minipage: about to print the height}%
-\IfValueT{#2}{height:\rndprintlength{\LWR at minipageheight} ; }%
+\IfValueT{#2}{height:\LWR at printlength{\LWR at minipageheight} ; }%
"}%
\setlength{\linewidth}{#4}% the original width
@@ -8878,11 +8937,10 @@
\ifstrequal{#3}{r}{\def\LWR at align{right}}{}%
\ifstrequal{#3}{s}{\def\LWR at align{justify}}{}%
\setlength{\LWR at tempwidth}{#2}%
- \uselengthunit{PT}%
\InlineClass[%
\LWR at origmbox{display:inline-block} ; %
\LWR at origmbox{text-align}:\LWR at align\ ; %
- width:\rndprintlength{\LWR at tempwidth}%
+ width:\LWR at printlength{\LWR at tempwidth}%
]%
{makebox}%
{#4}%
@@ -8908,9 +8966,8 @@
}
\newcommand*{\LWR at blackborderpadding}{%
-\uselengthunit{PT}%
-border:\rndprintlength{\LWR at atleastonept} solid black ; %
-padding:\rndprintlength{\fboxsep}%
+border:\LWR at printlength{\LWR at atleastonept} solid black ; %
+padding:\LWR at printlength{\fboxsep}%
}
\let\LWRprint at fbox\fbox
\newcommand{\LWRhtml at fbox}[1]{%
@@ -8939,9 +8996,8 @@
\IfValueT{#2}{\setlength{\LWR at tempheight}{#2}}%
\begin{BlockClass}[%
\LWR at blackborderpadding ; %
-\uselengthunit{PT}%
-\IfValueT{#2}{height:\rndprintlength{\LWR at tempheight} ; }%
-width:\rndprintlength{\LWR at tempwidth}%
+\IfValueT{#2}{height:\LWR at printlength{\LWR at tempheight} ; }%
+width:\LWR at printlength{\LWR at tempwidth}%
]{fminipage}%
}
{%
@@ -9197,11 +9253,10 @@
\renewcommand*{\LARGE}{}
\renewcommand*{\huge}{}
\renewcommand*{\Huge}{}
+\DeclareDocumentCommand{\onecolumn}{}{}
-\renewcommand*{\onecolumn}{}
+\DeclareDocumentCommand{\twocolumn}{O{}}{
-\renewcommand{\twocolumn}[1][]{
-
#1
}
@@ -9263,9 +9318,8 @@
\HTMLunicode{2009}% thin breakable space
}%
{%
- \uselengthunit{PT}%
\LWR at htmltagc{%
- span style="width:\printlength{\LWR at tempwidth}; %
+ span style="width:\LWR at printlength{\LWR at tempwidth}; %
display:inline-block"%
}%
\ifbool{FormatWP}{%
@@ -9318,23 +9372,22 @@
}%
{\setlength{\LWR at tempheight}{1pt}}{}%
\LWR at minipagestoppars%
- \uselengthunit{PT}%
\LWR at htmltagc{%
span
style="%
\ifbool{FormatWP}{}{background:\LWR at currenttextcolor ; }%
- width:\printlength{\LWR at tempwidth} ; %
- height:\printlength{\LWR at tempheight} ; %
+ width:\LWR at printlength{\LWR at tempwidth} ; %
+ height:\LWR at printlength{\LWR at tempheight} ; %
\IfValueT{#1}%
{%
\setlength{\LWR at tempraise}{0pt-#1}%
\setlength{\LWR at tempraise}{\LWR at tempraise*2}%
\LWR at orignewline%
- -ms-transform: translate(0pt,\printlength{\LWR at tempraise}); %
+ -ms-transform: translate(0pt,\LWR at printlength{\LWR at tempraise}); %
\LWR at orignewline%
- -webkit-transform: translate(0pt,\printlength{\LWR at tempraise}); %
+ -webkit-transform: translate(0pt,\LWR at printlength{\LWR at tempraise}); %
\LWR at orignewline%
- transform: translate(0pt,\printlength{\LWR at tempraise}); %
+ transform: translate(0pt,\LWR at printlength{\LWR at tempraise}); %
\LWR at orignewline%
}%
display:inline-block;"%
More information about the tex-live-commits
mailing list