diff options
| author | Karl Berry <karl@freefriends.org> | 2018-02-20 21:58:20 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2018-02-20 21:58:20 +0000 |
| commit | 6e85d755648b6c0966778e6c82dd2fff71c07756 (patch) | |
| tree | b35d043db63f8b087e5ff9a47164da95991e8551 | |
| parent | 4373b1d9ec9aeb43430cc8674422cc201c64ebfe (diff) | |
lwarp (20feb18)
git-svn-id: svn://tug.org/texlive/trunk@46689 c570f23f-e606-0410-a88d-b1316a301751
33 files changed, 1843 insertions, 469 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua b/Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua index ff7d3cb9648..79fe20892c4 100755 --- a/Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua +++ b/Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua @@ -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.") ; diff --git a/Master/texmf-dist/doc/latex/lwarp/README.txt b/Master/texmf-dist/doc/latex/lwarp/README.txt index ce70443319f..d1f027f3abf 100644 --- a/Master/texmf-dist/doc/latex/lwarp/README.txt +++ b/Master/texmf-dist/doc/latex/lwarp/README.txt @@ -1,5 +1,5 @@ -LaTeX lwarp package v0.48 README.txt +LaTeX lwarp package v0.49 README.txt Files included are: diff --git a/Master/texmf-dist/doc/latex/lwarp/lwarp.pdf b/Master/texmf-dist/doc/latex/lwarp/lwarp.pdf Binary files differindex 37b9f01f3bf..ab774442d8b 100644 --- a/Master/texmf-dist/doc/latex/lwarp/lwarp.pdf +++ b/Master/texmf-dist/doc/latex/lwarp/lwarp.pdf diff --git a/Master/texmf-dist/scripts/lwarp/lwarpmk.lua b/Master/texmf-dist/scripts/lwarp/lwarpmk.lua index ff7d3cb9648..79fe20892c4 100755 --- a/Master/texmf-dist/scripts/lwarp/lwarpmk.lua +++ b/Master/texmf-dist/scripts/lwarp/lwarpmk.lua @@ -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.") ; diff --git a/Master/texmf-dist/source/latex/lwarp/lwarp.dtx b/Master/texmf-dist/source/latex/lwarp/lwarp.dtx index cb294b5172b..4c75ba4c6a1 100644 --- a/Master/texmf-dist/source/latex/lwarp/lwarp.dtx +++ b/Master/texmf-dist/source/latex/lwarp/lwarp.dtx @@ -16,7 +16,7 @@ % \iffalse %<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01] %<package>\ProvidesPackage{lwarp} -%<package> [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,7 +276,9 @@ Keywords={LaTeX, HTML, conversion}% \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}} @@ -455,7 +457,7 @@ automatically load \pkg{backref}, so \pkg{backref} must be loaded explicitly. } \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,14 +491,14 @@ It is recommended to use both \texttt{toc} and also \texttt{page} at the same ti 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. } \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 @@ An index may be placed inline with other \HTML\ text, or on its own \HTML\ page: \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 @@ Without this option, the index heading has no number. 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 @@ The default is wide enough for a stanza number. 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 @@ when the option \texttt{thref} is used. \pkg{lwarp} does not share 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 @@ Color definitions, models, and mixing are fully supported \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 @@ If placing a \cs{keyfig}[H] inside a \env{keywrap}, 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 @@ and \brand{MS-Windows} is supported as well. 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 @@ This boolean may be tested by the user for later use. %<*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 @@ This boolean may be tested by the user for later use. % \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 @@ This boolean may be tested by the user for later use. % \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 @@ This boolean may be tested by the user for later use. % \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 @@ This boolean may be tested by the user for later use. % % ^^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 @@ This boolean may be tested by the user for later use. % \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 @@ This boolean may be tested by the user for later use. % % \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 @@ This boolean may be tested by the user for later use. % \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,31 +3043,30 @@ This boolean may be tested by the user for later use. % % \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}, % \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}. \\ % % 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 @@ This boolean may be tested by the user for later use. % % \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,21 +3088,21 @@ This boolean may be tested by the user for later use. % 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. % 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 @@ This boolean may be tested by the user for later use. % % \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 @@ This boolean may be tested by the user for later use. % % \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 @@ This boolean may be tested by the user for later use. % \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 @@ This boolean may be tested by the user for later use. % % \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 @@ This boolean may be tested by the user for later use. % 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 @@ This boolean may be tested by the user for later use. % % 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 @@ This boolean may be tested by the user for later use. % % 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 @@ This boolean may be tested by the user for later use. % 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 @@ This boolean may be tested by the user for later use. % 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 @@ This boolean may be tested by the user for later use. % % \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 @@ This boolean may be tested by the user for later use. % % \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 @@ This boolean may be tested by the user for later use. % \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 @@ This boolean may be tested by the user for later use. % % \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 @@ This boolean may be tested by the user for later use. % \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 @@ This boolean may be tested by the user for later use. % % % -% \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 @@ This boolean may be tested by the user for later use. % 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 @@ This boolean may be tested by the user for later use. % (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 @@ This boolean may be tested by the user for later use. % 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 boolean may be tested by the user for later use. % This option is stored into \cs{LWR@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 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{fancyref} \LWR@loadafter{fancyvrb} \LWR@loadafter{figcaps} +\LWR@loadafter{figsize} \LWR@loadafter{fix2col} \LWR@loadafter{fixme} \LWR@loadafter{fixmetodonotes} @@ -7445,6 +7460,7 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{fltrace} \LWR@loadafter{flushend} \LWR@loadafter{fncychap} +\LWR@loadafter{fnlineno} \LWR@loadafter{fnpos} % fontenc must be loaded before lwarp % fontspec must be loaded before lwarp @@ -7465,9 +7481,11 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{hang} \LWR@loadafter{hanging} \LWR@loadafter{hypcap} +\LWR@loadafter{hypdestopt} \LWR@loadafter{hypernat} \LWR@loadafter{hyperref} \LWR@loadafter{hyperxmp} +\LWR@loadafter{hyphenat} \LWR@loadafter{idxlayout} \LWR@loadafter{ifoddpage} \LWR@loadafter{indentfirst} @@ -7476,12 +7494,14 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{layout} \LWR@loadafter{letterspace} \LWR@loadafter{lettrine} +\LWR@loadafter{lineno} \LWR@loadafter{lips} \LWR@loadafter{listings} \LWR@loadafter{longtable} \LWR@loadafter{lscape} \LWR@loadafter{ltcaption} \LWR@loadafter{ltxtable} +\LWR@loadafter{luacolor} \LWR@loadafter{luatodonotes} \LWR@loadafter{marginfit} \LWR@loadafter{marginfix} @@ -7511,10 +7531,12 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{nowidow} \LWR@loadafter{ntheorem} \LWR@loadafter{overpic} +\LWR@loadafter{pagegrid} \LWR@notmemoirloadafter{pagenote} \LWR@loadafter{pagesel} \LWR@loadafter{paralist} \LWR@notmemoirloadafter{parskip} +\LWR@loadafter{pdfrender} \LWR@loadafter{pdflscape} \LWR@loadafter{pdfsync} \LWR@loadafter{pfnote} @@ -7526,6 +7548,7 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{ragged2e} \LWR@loadafter{realscripts} \LWR@loadafter{relsize} +\LWR@loadafter{resizegather} \LWR@loadafter{romanbar} \LWR@loadafter{romanbarpagenumber} \LWR@loadafter{rotating} @@ -7586,7 +7609,9 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{upref} \LWR@loadafter{varioref}% no lwarp package provided \LWR@notmemoirloadafter{verse} +\LWR@loadafter{vertbars} \LWR@loadafter{vmargin} +\LWR@loadafter{vwcol} \LWR@loadafter{wallpaper} \LWR@loadafter{watermark} \LWR@loadafter{wrapfig} @@ -8029,7 +8054,6 @@ top=1in,bottom=1in,% % \DescribePackage{environ} -% % Used to encapsulate math environments for re-use in \HTML\ \element{alt} text. % % \begin{macrocode} @@ -8048,7 +8072,6 @@ top=1in,bottom=1in,% % \DescribePackage{zref} -% % Used for cross-references. % \begin{macrocode} \RequirePackage{zref} @@ -8056,6 +8079,8 @@ top=1in,bottom=1in,% % \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,24 +8089,53 @@ top=1in,bottom=1in,% % 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} \RequirePackage{printlen} % \end{macrocode} +% \begin{macro}{\LWR@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@printlength}[1]{% +\begingroup% +\uselengthunit{PT}% +\renewcommand*{\unitspace}{}% +\ifdimless{#1}{10pt}{% + \printlength{#1}% +}{% + \rndprintlength{#1}% +}% +\endgroup% +} +% \end{macrocode} +% \end{macro} + % \begin{macrocode} \end{warpHTML} @@ -8094,6 +8148,7 @@ top=1in,bottom=1in,% \begin{warpprint} % \end{macrocode} +% \DescribePackage{varwidth} % Used for print-mode \env{lateximage}: % \begin{macrocode} \RequirePackage{varwidth} @@ -8384,7 +8439,7 @@ top=1in,bottom=1in,% % \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 @@ top=1in,bottom=1in,% % \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 @@ top=1in,bottom=1in,% % \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 @@ top=1in,bottom=1in,% % \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 @@ top=1in,bottom=1in,% % \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 @@ top=1in,bottom=1in,% % \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 @@ top=1in,bottom=1in,% % \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 @@ top=1in,bottom=1in,% % \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 @@ top=1in,bottom=1in,% % \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 @@ top=1in,bottom=1in,% % \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 @@ top=1in,bottom=1in,% % % \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 @@ top=1in,bottom=1in,% % 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 @@ homehtmlfilename = "\HomeHTMLFilename"% % % \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 @@ homehtmlfilename = "\HomeHTMLFilename"% % 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 @@ nav.botnavigation { % 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 @@ nav.botnavigation { % 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 @@ src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.1/MathJax.js?config=TeX- % \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 @@ src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.1/MathJax.js?config=TeX- -- 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 @@ end -- not --version % 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 @@ end -- not --version % % \begin{macro}{\LWR@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@maybeprintpendingfootnotes}[1]{% \ifboolexpr{ @@ -13926,7 +13983,7 @@ end -- not --version % \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 @@ end -- not --version % 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 @@ end -- not --version % \begin{macro}{\LWR@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 @@ end -- not --version % 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@currentautosec}: Added.} +% \changes{v0.43}{2017/11/01}{\progcode{LWR@currentautosec}: Added.} % \begin{macrocode} \newcounter{LWR@currentautosec} % \end{macrocode} @@ -14895,11 +14952,11 @@ end -- not --version -% \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 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% % \begin{macro}{\LWR@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 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% % \begin{macro}{\LWR@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@LwarpEnd} { @@ -15605,6 +15662,28 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% % when \cs{author} is later used inline. % % +% \subsection{\cs{if@titlepage}} +% +% \codeall +% \begin{macrocode} +\begin{warpall} +% \end{macrocode} +% +% \begin{macro}{\if@titlepage} +% Some classes do not provide \cs{if@titlepage}. +% In this case, provide it and force it |false|. +% \begin{macrocode} +\ifcsvoid{@titlepagefalse}{ + \newif\if@titlepage + \@titlepagefalse +}{} +% \end{macrocode} +% \end{macro} +% +% \begin{macrocode} +\end{warpall} +% \end{macrocode} +% % % \subsection{Changes for \cs{affiliation}} % @@ -15616,10 +15695,12 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% % 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 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% % % \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 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% % 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@closetabledatacell}{% @@ -17279,7 +17360,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% % \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 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% % % % -% \subsubsection{Localizing \& catcodes} +% \subsubsection{Localizing \progcode{\&} catcodes} % \label{sec:localizingampersand} % % \codeall @@ -17352,9 +17433,9 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% % \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 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% % \end{macrocode} % % -% \subsubsection{Handling \&} +% \subsubsection{Handling \progcode{\&}} % % % \codehtml @@ -17536,16 +17617,25 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% % \begin{macro}{\LWR@tabularendofline} % \begin{macrocode} \NewDocumentCommand{\LWR@tabularendofline}{s o}{% +% \end{macrocode} +% Finish the row: +% \begin{macrocode} \ifnumcomp{\value{LWR@tablecolindex}}{<}{\value{LWR@tabletotalcols}}% {\LWR@tabularfinishrow}% {\LWR@closetabledatacell}% +\LWR@htmltag{/tr}\LWR@orignewline% +% \end{macrocode} +% \pkg{xcolor} row color support: % \begin{macrocode} -\LWR@htmltag{/tr}\LWR@orignewline -\global\booltrue{LWR@intabularmetadata} +\@rowc@lors% +% \end{macrocode} +% No longer inside a data cell: +% \begin{macrocode} +\global\booltrue{LWR@intabularmetadata}% % \end{macrocode} % Not yet started a table row: % \begin{macrocode} -\global\boolfalse{LWR@startedrow} +\global\boolfalse{LWR@startedrow}% % \end{macrocode} % Additional setup: % \begin{macrocode} @@ -17553,7 +17643,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \global\boolfalse{LWR@doingtbrule}% \global\boolfalse{LWR@doingcmidrule}% \LWR@clearmidrules% -\renewcommand*{\LWR@rowHTMLcolor}{} +\renewcommand*{\LWR@rowHTMLcolor}{}% % \end{macrocode} % Start at first column: % \begin{macrocode} @@ -17584,7 +17674,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% % % 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@parseatcolumn}{% @@ -17627,7 +17717,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% % \begin{macro}{\LWR@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@parsebangcolumn}{% @@ -17790,7 +17880,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% % \begin{macro}{\LWR@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@parseDcolumn}[1]{% @@ -17898,8 +17988,8 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% % one column per entry. The final number of cells in each row is % stored in |LWR@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 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% % \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@lors} Emulated in case \pkg{xcolor} is not used. +% \begin{macrocode} +\newcommand*{\@rowc@lors}{} +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\LWR@xcolorrowHTMLcolor} Emulated \pkg{xcolor} row color. +% \begin{macrocode} +\newcommand*{\LWR@xcolorrowHTMLcolor}{} +% \end{macrocode} +% \end{macro} +% % \begin{macro}{\LWR@columnHTMLcolor} \HTML style code for the column color. % \begin{macrocode} -\newcommand{\LWR@columnHTMLcolor}{} +\newcommand*{\LWR@columnHTMLcolor}{} % \end{macrocode} % \end{macro} % % \begin{macro}{\LWR@rowHTMLcolor} \HTML style code for the row color. % \begin{macrocode} -\newcommand{\LWR@rowHTMLcolor}{} +\newcommand*{\LWR@rowHTMLcolor}{} % \end{macrocode} % \end{macro} % % \begin{macro}{\LWR@cellHTMLcolor} \HTML style code for the cell color. % \begin{macrocode} -\newcommand{\LWR@cellHTMLcolor}{} +\newcommand*{\LWR@cellHTMLcolor}{} % \end{macrocode} % \end{macro} % % \begin{macro}{\LWR@ruleHTMLcolor} \HTML style code for the cell color. % \begin{macrocode} -\newcommand{\LWR@ruleHTMLcolor}{} +\newcommand*{\LWR@ruleHTMLcolor}{} % \end{macrocode} % \end{macro} % @@ -18317,7 +18433,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% % % \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@tabledatasinglecolumntag}% @@ -18361,7 +18477,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% "% % \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@tdstartstyles% \LWR@addcmidrulewidth% @@ -18643,7 +18759,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% % % Must be placed between \cs{LWR@tdstartstyles} and \cs{LWR@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@addrulewidth}[2]{% @@ -18671,8 +18787,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% % \end{macrocode} % The style itself: % \begin{macrocode} - \uselengthunit{PT}% - border-top:\rndprintlength{\LWR@atleastonept} solid % + border-top:\LWR@printlength{\LWR@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 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% % % Must be placed between \cs{LWR@tdstartstyles} and \cs{LWR@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@addformatwpalignment}[1]{% \ifbool{FormatWP}{% @@ -18752,11 +18867,17 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% % \begin{macrocode} \newcommand*{\LWR@addtabularrowcolor}{% \ifbool{LWR@tabularmutemods}{}{% - \ifdefvoid{\LWR@rowHTMLcolor}{}% - {% row color + \ifdefvoid{\LWR@rowHTMLcolor}{% + \ifdefvoid{\LWR@xcolorrowHTMLcolor}{}% + {% xcolor row color + \LWR@tdaddstyle% + background:\#\LWR@xcolorrowHTMLcolor% + }% + }% + {% explicit row color \LWR@tdaddstyle% background:\#\LWR@rowHTMLcolor% - }% row color + }% }% } % \end{macrocode} @@ -18858,15 +18979,20 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% % \begin{macro}{\LWR@addtabularcellcolor} Adds a cell color style, if needed. +% \changes{v0.49}{2018/02/18}{\pkg{xcolor}: Added tabular row colors.} % \begin{macrocode} \newcommand*{\LWR@addtabularcellcolor}{% \ifdefvoid{\LWR@cellHTMLcolor}% {% \ifdefvoid{\LWR@rowHTMLcolor}% {% - \ifdefvoid{\LWR@columnHTMLcolor}% - {}% - {\LWR@subaddtabularcellcolor{\LWR@columnHTMLcolor}}% + \ifdefvoid{\LWR@xcolorrowHTMLcolor}% + {% + \ifdefvoid{\LWR@columnHTMLcolor}% + {}% + {\LWR@subaddtabularcellcolor{\LWR@columnHTMLcolor}}% + }% + {\LWR@subaddtabularcellcolor{\LWR@xcolorrowHTMLcolor}}% }% {\LWR@subaddtabularcellcolor{\LWR@rowHTMLcolor}}% }% @@ -18975,8 +19101,8 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% % \begin{macro}{\LWR@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 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% % \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 @@ rowspan="#2" % % \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@tdstartstyles% +% \end{macrocode} +% \changes{v0.49}{2018/02/18}{\pkg{xcolor}: Added tabular row colors.} +% \begin{macrocode} +\LWR@addtabularrowcolor% +% \end{macrocode} +% \begin{macrocode} \LWR@addcmidrulewidth% \LWR@addtabularhrulecolor% \LWR@addmulticolvertrulecolor% @@ -19703,6 +19835,8 @@ rowspan="#2" % {\let\mynext\LWR@donothing}{}% \ifdefequal{\LWR@mynexttoken}{\multicolumnrow}% {\let\mynext\LWR@donothing}{}% +\ifdefequal{\LWR@mynexttoken}{\noalign}% + {\let\mynext\LWR@donothing}{}% % \end{macrocode} % If an \cs{mrowcell}, this is a cell to be skipped over: % \begin{macrocode} @@ -19790,7 +19924,7 @@ rowspan="#2" % % \end{macrocode} -% \subsection{\textbackslash{}mrowcell} +% \subsection{\cs{mrowcell}} % \codeall % \begin{macrocode} @@ -19811,7 +19945,7 @@ rowspan="#2" % % \end{macro} -% \subsection{\textbackslash{}mcolrowcell} +% \subsection{\cs{mcolrowcell}} % \codeall % \begin{macrocode} @@ -19837,7 +19971,7 @@ rowspan="#2" % -% \subsection{New \textbackslash{}tabular definition} +% \subsection{New \env{tabular} environment} % \codehtml % \begin{macrocode} @@ -19860,12 +19994,30 @@ rowspan="#2" % % \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@orignoalign\noalign + +\newcommand{\LWR@tabularnoalign}[1]{% +\begingroup% +\global\advance\rownum\m@ne% +\renewcommand*{\LWR@xcolorrowHTMLcolor}{}% +\multicolumn{\value{LWR@tabletotalcols}}{l}{#1} \\ +\endgroup% +% \@rowc@lors% +\LWR@getmynexttoken% +} +% \end{macrocode} +% \end{macro} +% % \begin{macro}{\LWR@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 @@ rowspan="#2" % % The following adjust for \pkg{colortbl}: % \changes{v0.48}{2018/02/06}{\pkg{colortbl}: Added.} % \begin{macrocode} -\LetLtxMacro\columncolor\LWR@HTMLcolumncolor -\LetLtxMacro\rowcolor\LWR@HTMLrowcolor -\LetLtxMacro\cellcolor\LWR@HTMLcellcolor -\LetLtxMacro\arrayrulecolor\LWR@HTMLarrayrulecolor -\LetLtxMacro\doublerulesepcolor\LWR@HTMLdoublerulesepcolor -\renewcommand*{\LWR@columnHTMLcolor}{} -\renewcommand*{\LWR@rowHTMLcolor}{} -\renewcommand*{\LWR@cellHTMLcolor}{} +\LetLtxMacro\columncolor\LWR@HTMLcolumncolor% +\LetLtxMacro\rowcolor\LWR@HTMLrowcolor% +\LetLtxMacro\cellcolor\LWR@HTMLcellcolor% +\LetLtxMacro\arrayrulecolor\LWR@HTMLarrayrulecolor% +\LetLtxMacro\doublerulesepcolor\LWR@HTMLdoublerulesepcolor% +\renewcommand*{\LWR@columnHTMLcolor}{}% +\renewcommand*{\LWR@rowHTMLcolor}{}% +\renewcommand*{\LWR@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@vertruleHTMLcolor{\LWR@ruleHTMLcolor} +\edef\LWR@vertruleHTMLcolor{\LWR@ruleHTMLcolor}% % \end{macrocode} % Tracking the depth of cell color \element{div}s: % \begin{macrocode} -\setcounter{LWR@cellcolordepth}{0} +\setcounter{LWR@cellcolordepth}{0}% % \end{macrocode} % % The following may appear before a data cell is created, @@ -20027,13 +20180,14 @@ rowspan="#2" % % The optional parameter for \cs{hline} supports the \pkg{tabls} package. % \begin{macrocode} \LWR@traceinfo{LWR@tabular: redefining macros}% +\LetLtxMacro\noalign\LWR@tabularnoalign% \LetLtxMacro\hline\LWR@HTMLhline% \LetLtxMacro\cline\LWR@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@docmidrule[##1](){1-\arabic{LWR@tabletotalcols}}}% @@ -20058,7 +20212,7 @@ rowspan="#2" % \DeclareDocumentCommand{\cmidrule}{O{\LWR@cmidrulewidth} d() m}% {\LWR@docmidrule[##1](##2){##3}\LWR@getmynexttoken}% % -\DeclareDocumentCommand{\bottomrule}{o d()} +\DeclareDocumentCommand{\bottomrule}{o d()}% {% \IfValueTF{##1}% {\LWR@docmidrule[##1](){1-\arabic{LWR@tabletotalcols}}}% @@ -20142,6 +20296,12 @@ rowspan="#2" % \LWR@closetabledatacell% }% \LWR@htmlblocktag{/tr}% +% \end{macrocode} +% \pkg{xcolor} row color support: +% \begin{macrocode} +\@rowc@lors% +% \end{macrocode} +% \begin{macrocode} \LWR@htmlblocktag{/table}% \global\boolfalse{LWR@intabularmetadata}% % \end{macrocode} @@ -20737,8 +20897,9 @@ autopage-\theLWR@currentautosec% % 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@ensuredoingapar% \LWR@subhyperref{#2}{#3}% } @@ -20769,8 +20930,9 @@ autopage-\theLWR@currentautosec% % % \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@ensuredoingapar% \def\LWR@templink{#1}% \@onelevel@sanitize\LWR@templink% @@ -20818,7 +20980,7 @@ autopage-\theLWR@currentautosec% % % \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@figure} prints ``lof'', etc. % \item [\cs{fps@<type>}:] Placement. @@ -20830,11 +20992,11 @@ autopage-\theLWR@currentautosec% % \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@have<type>}:] A boolean rememebering whether a \cs{listof} was +% \item [\progcode{LWR@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 @@ autopage-\theLWR@currentautosec% \LWR@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@htmltag{figure id="\LWR@origmbox{autoid-\arabic{LWR@thisautoid}}" class="#1"}% @@ -20925,7 +21087,7 @@ autopage-\theLWR@currentautosec% \LWR@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@BlockClassWP}{}% \LWR@htmlelementend{figure}% @@ -21069,7 +21231,7 @@ autopage-\theLWR@currentautosec% % \begin{environment}{LWR@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@figcaption} {% @@ -21388,7 +21550,7 @@ autopage-\theLWR@currentautosec% % \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 @@ autopage-\theLWR@currentautosec% % \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@origlistoffigures\listoffigures @@ -21432,7 +21594,7 @@ autopage-\theLWR@currentautosec% % \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@origlistoftables\listoftables @@ -21645,7 +21807,7 @@ autopage-\theLWR@currentautosec% % \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 @@ autopage-\theLWR@currentautosec% \let\qquad\LWR@origqquad% \LetLtxMacro\tabular\LWR@origtabular% \LetLtxMacro\endtabular\LWR@origendtabular% +\LetLtxMacro\noalign\LWR@orignoalign% \LetLtxMacro\hline\LWR@orighline% \LetLtxMacro\toprule\LWR@origtoprule% \LetLtxMacro\midrule\LWR@origmidrule% @@ -22240,7 +22403,7 @@ autopage-\theLWR@currentautosec% \protected\gdef\LWR@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 @@ autopage-\theLWR@currentautosec% % 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@singledollarwidth} @@ -22284,7 +22447,6 @@ autopage-\theLWR@currentautosec% \protected\gdef\LWR@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 @@ autopage-\theLWR@currentautosec% \LWR@origdollar#1\LWR@origdollar% }*\real{.8}}% % \end{macrocode} +% \changes{v0.49}{2018/02/18}{Fix: Incorrect \PDF\ output size corrupted \HTML.} +% \begin{macrocode} + \LWR@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 @@ autopage-\theLWR@currentautosec% % \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 @@ autopage-\theLWR@currentautosec% \LWR@traceinfo{LWR@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 @@ autopage-\theLWR@currentautosec% % % \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 @@ autopage-\theLWR@currentautosec% % \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 @@ autopage-\theLWR@currentautosec% % \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 @@ autopage-\theLWR@currentautosec% \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 @@ autopage-\theLWR@currentautosec% \setlength{\textwidth}{6in}% \setlength{\textheight}{9in}% }{}% -\LWR@traceinfo{computed width is \rndprintlength{\LWR@minipagewidth}}% +\LWR@traceinfo{computed width is \LWR@printlength{\LWR@minipagewidth}}% % \end{macrocode} % Compute height: % \begin{macrocode} @@ -24490,7 +24654,7 @@ autopage-\theLWR@currentautosec% \LWR@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 @@ autopage-\theLWR@currentautosec% % \end{macrocode} % Print the width and optional height styles: % \begin{macrocode} -\LWR@traceinfo{minipage: about to print the width of \rndprintlength{\LWR@minipagewidth}}% -\uselengthunit{PT}% +\LWR@traceinfo{minipage: about to print the width of \LWR@printlength{\LWR@minipagewidth}}% \ifbool{LWR@minipagefullwidth}% {\boolfalse{LWR@minipagefullwidth}}% {% \ifthenelse{\lengthtest{#4}=\linewidth}% {}% - {width:\rndprintlength{\LWR@minipagewidth} ; }% + {width:\LWR@printlength{\LWR@minipagewidth} ; }% }% \LWR@traceinfo{minipage: about to print the height}% -\IfValueT{#2}{height:\rndprintlength{\LWR@minipageheight} ; }% +\IfValueT{#2}{height:\LWR@printlength{\LWR@minipageheight} ; }% "}% % \end{macrocode} % Finish with an empty line to start the contents on a new line. @@ -24554,7 +24717,7 @@ autopage-\theLWR@currentautosec% \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@startpars% \ifboolexpr{bool{FormatWP} and bool{WPMarkMinipages}}{% @@ -24572,7 +24735,7 @@ autopage-\theLWR@currentautosec% \LWR@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 @@ autopage-\theLWR@currentautosec% % \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@origmbox{display:inline-block} ; % \LWR@origmbox{text-align}:\LWR@align\ ; % - width:\rndprintlength{\LWR@tempwidth}% + width:\LWR@printlength{\LWR@tempwidth}% ]% {makebox}% % \end{macrocode} @@ -24732,9 +24894,8 @@ autopage-\theLWR@currentautosec% % % \begin{macrocode} \newcommand*{\LWR@blackborderpadding}{% -\uselengthunit{PT}% -border:\rndprintlength{\LWR@atleastonept} solid black ; % -padding:\rndprintlength{\fboxsep}% +border:\LWR@printlength{\LWR@atleastonept} solid black ; % +padding:\LWR@printlength{\fboxsep}% } % \end{macrocode} % \end{macro} @@ -24808,9 +24969,8 @@ padding:\rndprintlength{\fboxsep}% \IfValueT{#2}{\setlength{\LWR@tempheight}{#2}}% \begin{BlockClass}[% \LWR@blackborderpadding ; % -\uselengthunit{PT}% -\IfValueT{#2}{height:\rndprintlength{\LWR@tempheight} ; }% -width:\rndprintlength{\LWR@tempwidth}% +\IfValueT{#2}{height:\LWR@printlength{\LWR@tempheight} ; }% +width:\LWR@printlength{\LWR@tempwidth}% ]{fminipage}% } {% @@ -24964,7 +25124,7 @@ width:\rndprintlength{\LWR@tempwidth}% % \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 @@ width:\rndprintlength{\LWR@tempwidth}% % \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,10 +25541,13 @@ width:\rndprintlength{\LWR@tempwidth}% \renewcommand*{\LARGE}{} \renewcommand*{\huge}{} \renewcommand*{\Huge}{} +% \end{macrocode} +% +% \changes{v0.49}{2018/02/18}{Fix: Adapt to classes.} +% \begin{macrocode} +\DeclareDocumentCommand{\onecolumn}{}{} -\renewcommand*{\onecolumn}{} - -\renewcommand{\twocolumn}[1][]{ +\DeclareDocumentCommand{\twocolumn}{O{}}{ #1 @@ -25583,15 +25746,14 @@ width:\rndprintlength{\LWR@tempwidth}% % Print the span with the converted width. Not rounded. % \begin{macrocode} {% - \uselengthunit{PT}% \LWR@htmltagc{% - span style="width:\printlength{\LWR@tempwidth}; % + span style="width:\LWR@printlength{\LWR@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@templengthone}{\LWR@tempwidth}% @@ -25756,7 +25918,6 @@ width:\rndprintlength{\LWR@tempwidth}% % 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@htmltagc{% span style="% @@ -25768,8 +25929,8 @@ width:\rndprintlength{\LWR@tempwidth}% % \end{macrocode} % The width and height are printed, converted to PT: % \begin{macrocode} - width:\printlength{\LWR@tempwidth} ; % - height:\printlength{\LWR@tempheight} ; % + width:\LWR@printlength{\LWR@tempwidth} ; % + height:\LWR@printlength{\LWR@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 @@ width:\rndprintlength{\LWR@tempwidth}% \setlength{\LWR@tempraise}{0pt-#1}% \setlength{\LWR@tempraise}{\LWR@tempraise*2}% \LWR@orignewline% - -ms-transform: translate(0pt,\printlength{\LWR@tempraise}); % + -ms-transform: translate(0pt,\LWR@printlength{\LWR@tempraise}); % \LWR@orignewline% - -webkit-transform: translate(0pt,\printlength{\LWR@tempraise}); % + -webkit-transform: translate(0pt,\LWR@printlength{\LWR@tempraise}); % \LWR@orignewline% - transform: translate(0pt,\printlength{\LWR@tempraise}); % + transform: translate(0pt,\LWR@printlength{\LWR@tempraise}); % \LWR@orignewline% }% % \end{macrocode} @@ -25799,7 +25960,7 @@ width:\rndprintlength{\LWR@tempwidth}% % \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@templengthone}{\LWR@tempwidth}% @@ -25839,7 +26000,7 @@ width:\rndprintlength{\LWR@tempwidth}% -% \section{\textbackslash{}phantomsection} +% \section{\cs{phantomsection}} % \codehtml % \begin{macrocode} @@ -25865,7 +26026,7 @@ width:\rndprintlength{\LWR@tempwidth}% -% \section{\textbackslash{}LaTeX and other logos} +% \section{\cs{LaTeX} and other logos} % Logos for \HTML\ and print modes: % @@ -25894,7 +26055,7 @@ width:\rndprintlength{\LWR@tempwidth}% % % |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@origTeX\TeX @@ -25912,7 +26073,7 @@ width:\rndprintlength{\LWR@tempwidth}% % \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@origLaTeX\LaTeX @@ -26044,7 +26205,7 @@ width:\rndprintlength{\LWR@tempwidth}% % \end{macrocode} -% \section{\textbackslash{}AtBeginDocument, \textbackslash{}AtEndDocument} +% \section{\cs{AtBeginDocument}, \cs{AtEndDocument}} % \codehtml % \begin{macrocode} @@ -26144,7 +26305,7 @@ width:\rndprintlength{\LWR@tempwidth}% % % % -% \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 @@ width:\rndprintlength{\LWR@tempwidth}% % \begin{macrocode} \LWR@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@origmbox{margin-left:\rndprintlength{\LWR@templengthone}} ; % -\LWR@origmbox{margin-right:\rndprintlength{\LWR@templengthtwo}}% +\LWR@origmbox{margin-left:\LWR@printlength{\LWR@templengthone}} ; % +\LWR@origmbox{margin-right:\LWR@printlength{\LWR@templengthtwo}}% ]{\LWR@mcolstype}% } {\endBlockClass} @@ -26751,7 +26908,7 @@ width:\rndprintlength{\LWR@tempwidth}% % % \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 @@ width:\rndprintlength{\LWR@tempwidth}% % \renewcommand*{\ALG@doentity}{% \origALG@doentity% -\uselengthunit{PT}% \LWR@htmltagc{% -span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"% +span style="width:\LWR@printlength{\ALG@thistlm}; display:inline-block;"% }% \ifbool{FormatWP}{% \setlength{\LWR@templengthone}{\the\ALG@thistlm}% @@ -29151,7 +29307,7 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"% % \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 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"% \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 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"% % % % \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 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor % % % \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@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 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor \NewDocumentEnvironment{KFLTfloatflt@marginfloat}{O{-1.2ex} m m} {% \setlength{\LWR@templengthone}{#3}% -\uselengthunit{PT}% \LWR@BlockClassWP{% float:right; % - width:\rndprintlength{\LWR@templengthone}; % + width:\LWR@printlength{\LWR@templengthone}; % margin:10pt% }{% - width:\rndprintlength{\LWR@templengthone}% + width:\LWR@printlength{\LWR@templengthone}% }% {marginblock}% \captionsetup{type=#2}% @@ -30941,6 +31141,32 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor % % % +% +% \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@ProvidesPackageDrop{fnlineno} +% \end{macrocode} +% +% \iffalse +%</fnlineno> +% \fi +% +% +% % \iffalse %<*fnpos> % \fi @@ -31697,12 +31923,6 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor % 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 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor % \end{macrocode} % Default to use the converted fixed length given: % \begin{macrocode} - \uselengthunit{PT}% - \renewcommand*{\LWR@igwidthstyle}{width:\rndprintlength{\LWR@igwidth}}% + \renewcommand*{\LWR@igwidthstyle}{width:\LWR@printlength{\LWR@igwidth}}% % \end{macrocode} % If ex or em dimensions were given, use those instead: % \begin{macrocode} @@ -31760,9 +31979,8 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor % \end{macrocode} % Default to use the converted fixed length given: % \begin{macrocode} - \uselengthunit{PT}% \renewcommand*{\LWR@igheightstyle}{% - height:\rndprintlength{\LWR@igheight} % + height:\LWR@printlength{\LWR@igheight} % }% % \end{macrocode} % If ex or em dimensions were given, use those instead: @@ -31991,7 +32209,7 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor % % 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 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor }% }% not starred \endgroup% - \uselengthunit{PT}% \settowidth{\LWR@igwidth}{\usebox{\LWR@imagesizebox}}% - \global\renewcommand*{\LWR@igwidthstyle}{width:\rndprintlength{\LWR@igwidth}}% + \global\renewcommand*{\LWR@igwidthstyle}{width:\LWR@printlength{\LWR@igwidth}}% \settoheight{\LWR@igheight}{\usebox{\LWR@imagesizebox}}% - \global\renewcommand*{\LWR@igheightstyle}{height:\rndprintlength{\LWR@igheight}}% + \global\renewcommand*{\LWR@igheightstyle}{height:\LWR@printlength{\LWR@igheight}}% }{}% % \end{macrocode} % @@ -32046,11 +32263,9 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor {% start of href \LWR@traceinfo{LWR@includegraphicsb: about to LWR@htmltag}% \LWR@htmltag{% start of image tags -% img src="\LWR@sanitized" \LWR@orignewline% img src="% \begingroup\@sanitize\LWR@parsedfilename\endgroup% " \LWR@orignewline% -% \LWR@origtilde{} alt="[\filename@base]" \LWR@orignewline% % \end{macrocode} % Only include a style tag if a width, height, angle, or scale was given: % \begin{macrocode} @@ -32395,10 +32610,9 @@ img src="% \newenvironment{hangingpar} { \LWR@findhangingleftmargin% - \uselengthunit{PT}% \BlockClass[% - \LWR@origmbox{margin-left:\rndprintlength{\LWR@templengthone}} ; % - \LWR@origmbox{text-indent:-\rndprintlength{\hangingindent}}% + \LWR@origmbox{margin-left:\LWR@printlength{\LWR@templengthone}} ; % + \LWR@origmbox{text-indent:-\LWR@printlength{\hangingindent}}% ]% {hangingpar}% } @@ -32409,10 +32623,9 @@ img src="% \renewcommand*{\LWR@printcloselist}{\LWR@printcloseitemize}% \renewcommand*{\LWR@printopenlist}{% \LWR@findhangingleftmargin% - \uselengthunit{PT}% ul style="\LWR@origmbox{list-style-type:none;} % - \LWR@origmbox{margin-left:\rndprintlength{\LWR@templengthone}} ; % - \LWR@origmbox{text-indent:-\rndprintlength{\hangingindent}}"% + \LWR@origmbox{margin-left:\LWR@printlength{\LWR@templengthone}} ; % + \LWR@origmbox{text-indent:-\LWR@printlength{\hangingindent}}"% }% \let\item\LWR@itemizeitem% \list{}{}% @@ -32430,9 +32643,8 @@ img src="% {% \BlockClass[% \LWR@findhangingleftmargin% - \uselengthunit{PT}% - \LWR@origmbox{margin-left:\rndprintlength{\LWR@templengthone}} ; % - \LWR@origmbox{text-indent:-\rndprintlength{\hangingindent}}% + \LWR@origmbox{margin-left:\LWR@printlength{\LWR@templengthone}} ; % + \LWR@origmbox{text-indent:-\LWR@printlength{\hangingindent}}% ]{labeledpar}#2% } {\endBlockClass} @@ -32496,10 +32708,9 @@ img src="% % \begin{macrocode} \newenvironment*{hangparas}[2] {% - \uselengthunit{PT}% \BlockClass[% - \LWR@origmbox{margin-left:\rndprintlength{#1}} ; % - \LWR@origmbox{text-indent:-\rndprintlength{#1}}% + \LWR@origmbox{margin-left:\LWR@printlength{#1}} ; % + \LWR@origmbox{text-indent:-\LWR@printlength{#1}}% ]% {hangingpar}% } @@ -32563,6 +32774,32 @@ img src="% % % % \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@ProvidesPackageDrop{hypdestopt} +% \end{macrocode} +% +% \iffalse +%</hypdestopt> +% \fi +% +% +% +% +% \iffalse %<*hypernat> % \fi % @@ -32981,6 +33218,64 @@ img src="% % % % +% \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@ProvidesPackagePass{hyphenat} +% \end{macrocode} +% +% \begin{macrocode} +\LetLtxMacro\LWRHYNAT@origtextnhtt\textnhtt +\LetLtxMacro\LWRHYNAT@orignhttfamily\nhttfamily +\LetLtxMacro\LWRHYNAT@orignohyphens\nohyphens +\LetLtxMacro\LWRHYNAT@origbshyp\bshyp +\LetLtxMacro\LWRHYNAT@origfshyp\fshyp +\LetLtxMacro\LWRHYNAT@origdothyp\dothyp +\LetLtxMacro\LWRHYNAT@origcolonhyp\colonhyp +\LetLtxMacro\LWRHYNAT@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@restoreorigformatting{ +\LetLtxMacro\textnhtt\LWRHYNAT@origtextnhtt +\LetLtxMacro\nhttfamily\LWRHYNAT@orignhttfamily +\LetLtxMacro\nohyphens\LWRHYNAT@orignohyphens +\LetLtxMacro\bshyp\LWRHYNAT@origbshyp +\LetLtxMacro\fshyp\LWRHYNAT@origfshyp +\LetLtxMacro\dothyp\LWRHYNAT@origdothyp +\LetLtxMacro\colonhyp\LWRHYNAT@origcolonhyp +\LetLtxMacro\hyp\LWRHYNAT@orighyp +} +% \end{macrocode} +% +% \iffalse +%</hyphenat> +% \fi +% % % \iffalse %<*idxlayout> @@ -33262,7 +33557,7 @@ width=\KFLT@imagewidth,height=\KFLT@h]{\KFLT@i}% % \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@marginfloat}{O{-1.2ex} m} {% @@ -33292,13 +33587,12 @@ width=\KFLT@imagewidth,height=\KFLT@h]{\KFLT@i}% {% \LWR@ensuredoingapar% \setlength{\LWR@templengthone}{#1}% -\uselengthunit{PT}% \begin{LWR@BlockClassWP}{% - float:right; width:\rndprintlength{\LWR@templengthone}; % + float:right; width:\LWR@printlength{\LWR@templengthone}; % margin:10pt% }% {% - width:\rndprintlength{\LWR@templengthone}% + width:\LWR@printlength{\LWR@templengthone}% }% {marginblock}% \setlength{\linewidth}{.95\LWR@templengthone}% @@ -33485,6 +33779,151 @@ width=\KFLT@imagewidth,height=\KFLT@h]{\KFLT@i}% % % % +% \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@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@pagewiselinenumber +\let\c@runninglinenumber\c@linenumber + +\def\runningpagewiselinenumbers{} +\def\realpagewiselinenumbers{} + + +\NewDocumentCommand\modulolinenumbers{s o}{} + +\chardef\c@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@forceminwidth{\bframerule}% + \BlockClass[ + border:\LWR@printlength{\LWR@atleastonept} solid black ; % + padding:\LWR@printlength{\bframesep}% + ]{bframe} +} +{\endBlockClass} +% \end{macrocode} +% +% \iffalse +%</lineno> +% \fi +% +% +% % % % \iffalse @@ -33980,6 +34419,35 @@ width=\KFLT@imagewidth,height=\KFLT@h]{\KFLT@i}% % % % +% \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@ProvidesPackageDrop{luacolor} +% \end{macrocode} +% +% \begin{macrocode} +\newcommand{\luacolorProcessBox}[1]{} +% \end{macrocode} +% +% \iffalse +%</luacolor> +% \fi +% +% +% % % \iffalse %<*luatodonotes> @@ -34382,7 +34850,7 @@ endinnercode={\LWR@stoppars}, % Given the \pkg{mdframed} key, print the length. % \begin{macrocode} \newcommand*{\LWR@mdfprintlength}[1]{% -\rndprintlength{\csuse{mdf@#1@length}} +\LWR@printlength{\csuse{mdf@#1@length}} } % \end{macrocode} % \end{noindmacro} @@ -34403,10 +34871,6 @@ endinnercode={\LWR@stoppars}, % \begin{macrocode} \LWR@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@htmltagc{div class="\LWR@mdthisenv" \LWR@orignewline @@ -34556,10 +35020,6 @@ border-radius: \LWR@mdfprintlength{roundcorner} ; \LWR@orignewline \LWR@traceinfo{LWR@mdframedtitleenv start}% % \LWR@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@htmltagc{span class="mdframedtitle" \LWR@orignewline @@ -34586,8 +35046,8 @@ background: border-radius: \setlength{\LWR@titleroundcorner} {\maxof{\mdf@roundcorner@length-\mdf@linewidth@length}{0pt}} - \rndprintlength{\LWR@titleroundcorner} - \rndprintlength{\LWR@titleroundcorner} + \LWR@printlength{\LWR@titleroundcorner} + \LWR@printlength{\LWR@titleroundcorner} 0pt 0pt \LWR@orignewline % \end{macrocode} @@ -35390,7 +35850,7 @@ background: % \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 @@ class="td% \LWR@printbartag{\arabic{LWR@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@tdstartstyles% \LWR@addcmidrulewidth% @@ -36333,7 +36793,7 @@ class="td% % \end{macrocode} % % -% \subsection{\protect\texttt{amsthm} option} +% \subsection{\pkg{amsthm} option} % % Only if the |amsthm| option was given: % \begin{macrocode} @@ -36601,6 +37061,35 @@ class="td% % % % \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@ProvidesPackageDrop{pagegrid} +% \end{macrocode} +% +% \begin{macrocode} +\newcommand*{\pagegridsetup}[1]{} +% \end{macrocode} +% +% \iffalse +%</pagegrid> +% \fi +% +% +% +% \iffalse %<*pagenote> % \fi @@ -36612,7 +37101,7 @@ class="td% % \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 @@ class="td% % % % \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@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 @@ class="td% % of class \attribute{quotchap}, % of the maximum selected width: % \begin{macrocode} -\uselengthunit{PT}% -\begin{BlockClass}[max-width: \rndprintlength{\LWR@quotchapwidth}]{quotchap} +\begin{BlockClass}[max-width: \LWR@printlength{\LWR@quotchapwidth}]{quotchap} %\begin{minipage}{\LWR@quotchapwidth} \@quotchap %\end{minipage} @@ -37249,6 +37767,35 @@ class="td% % % % +% \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@ProvidesPackageDrop{resizegather} +% \end{macrocode} +% +% \begin{macrocode} +\newcommand*{\resizegathersetup}[1]{} +% \end{macrocode} +% +% \iffalse +%</resizegather> +% \fi +% +% +% % % \iffalse %<*romanbar> @@ -37617,20 +38164,19 @@ class="td% \NewDocumentEnvironment{addmargin}{s O{} m} { -\uselengthunit{PT}% \setlength{\LWR@templengthtwo}{#3} \ifblank{#2} { \begin{BlockClass}[ - \LWR@origmbox{margin-left:\rndprintlength{\LWR@templengthtwo}} ; - \LWR@origmbox{margin-right:\rndprintlength{\LWR@templengthtwo}} + \LWR@origmbox{margin-left:\LWR@printlength{\LWR@templengthtwo}} ; + \LWR@origmbox{margin-right:\LWR@printlength{\LWR@templengthtwo}} ]{addmargin} } { \setlength{\LWR@templengthone}{#2} \begin{BlockClass}[ - \LWR@origmbox{margin-left:\rndprintlength{\LWR@templengthone}} ; - \LWR@origmbox{margin-right:\rndprintlength{\LWR@templengthtwo}} + \LWR@origmbox{margin-left:\LWR@printlength{\LWR@templengthone}} ; + \LWR@origmbox{margin-right:\LWR@printlength{\LWR@templengthtwo}} ]{addmargin} } } @@ -38348,7 +38894,7 @@ class="td% % % % 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@marginfloat}{O{-1.2ex} m} {% start @@ -38649,7 +39195,7 @@ class="td% % \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 @@ class="td% % \begin{macrocode} \newenvironment{stabular}[2][c] { -\renewcommand{\noalign}[1]{} \begin{tabular}[#1]{#2} +\renewcommand{\noalign}[1]{} } {\end{tabular}} % \end{macrocode} @@ -38878,8 +39424,8 @@ class="td% % \begin{macrocode} \NewDocumentEnvironment{stabular*}{m o m} { -\renewcommand{\noalign}[1]{} \begin{tabular}[#2]{#3} +\renewcommand{\noalign}[1]{} } {\end{tabular}} % \end{macrocode} @@ -39806,12 +40352,11 @@ class="td% \newsavebox{\LWR@textfitbox} \newcommand*{\LWR@textfitscale}[2]{% -\uselengthunit{PT}% \setlength{\LWR@templengthone}{#1}% \setlength{\LWR@templengthone}{% 1em*\ratio{\LWR@templengthone}{\LWR@templengthtwo}% }% -\InlineClass[font-size:\rndprintlength{\LWR@templengthone}]{textfit}{#2}% +\InlineClass[font-size:\LWR@printlength{\LWR@templengthone}]{textfit}{#2}% } \newcommand*{\scaletowidth}[2]{% @@ -42407,6 +42952,52 @@ class="td% % % % +% \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@ProvidesPackageDrop{vertbars} +% \end{macrocode} +% +% \begin{macrocode} +\newlength{\barwidth} +\setlength{\barwidth}{0.4pt} +\newlength{\barspace} +\setlength{\barspace}{1em} + +\newenvironment{vertbar}{ + \LWR@forcenewpage + \LWR@forceminwidth{\barwidth} + \begin{BlockClass}[% + border-left: \LWR@printlength{\LWR@atleastonept} solid black ; % + padding-left: \LWR@printlength{\barspace}% + ]{vertbar} +}{ + \end{BlockClass} +} +% \end{macrocode} +% +% \iffalse +%</vertbars> +% \fi +% +% +% +% % % \iffalse %<*vmargin> @@ -42450,6 +43041,158 @@ class="td% % % % +% \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@ProvidesPackagePass{vwcol} +% \end{macrocode} +% +% Factored from \cs{vwcol}. +% Each is given a style tag to append to the final style. +% +% \begin{noindmacro}{\LWR@vwcol@addrule} \marg{style tag} +% \begin{macrocode} +\newcommand*{\LWR@vwcol@addrule}[1]{% + \appto{\LWR@vwcolstyle}{% + #1: % + \LWR@printlength{\vwcol@rule} solid \#\LWR@vwcol@rulecolor ; % + }% +} +% \end{macrocode} +% \end{noindmacro} + +% \begin{noindmacro}{\LWR@vwcol@addrule} \marg{style tag} +% \begin{macrocode} +\newcommand*{\LWR@vwcol@addgap}[1]{% + \appto{\LWR@vwcolstyle}{% + #1: % + \LWR@printlength{\vwcol@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@vwcolstyle}{} +% \end{macrocode} +% |presep| and |postsep| are created with \HTML\ \attribute{margin}s: +% \begin{macrocode} +\if@vwcol@presep + \appto{\LWR@vwcolstyle}{margin-left: 1em ; padding-left: .5em ; } +\fi +\if@vwcol@postsep + \appto{\LWR@vwcolstyle}{margin-right: 1em ; padding-right: .5em ; } +\fi +% \end{macrocode} +% |sep| becomes \attribute{column-gap}: +% \begin{macrocode} +\ifdimgreater{\vwcol@sep}{1sp}{ + \LWR@vwcol@addgap{column-gap} + \LWR@vwcol@addgap{-moz-column-gap} + \LWR@vwcol@addgap{-webkit-column-gap} +}{} +% \end{macrocode} +% |rule| become \attribute{column-rule}, while +% |prerule| and |postrule| become \HTML\ borders: +% \begin{macrocode} +\convertcolorspec{named}{\vwcol@rulecol}{HTML}\LWR@vwcol@rulecolor% +\ifdimgreater{\vwcol@rule}{0pt}{ + \ifdimless{\vwcol@rule}{1pt}{ + \setlength{\vwcol@rule}{1pt} + }{} + \LWR@vwcol@addrule{column-rule} + \LWR@vwcol@addrule{-moz-column-rule} + \LWR@vwcol@addrule{-webkit-column-rule} + \if@vwcol@prerule\LWR@vwcol@addrule{border-left}\fi + \if@vwcol@postrule\LWR@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@justify}{\RaggedRight}{ + \appto{\LWR@vwcolstyle}{text-align: left ; } + \ifdimgreater{\vwcol@parindent}{0pt}{ + \appto{\LWR@vwcolstyle}{% + text-indent: \LWR@printlength{\vwcol@parindent} ; % + } + }{} +}{} +% \end{macrocode} +% \begin{macrocode} +\ifdefequal{\vwcol@justify}{\RaggedLeft}{ + \appto{\LWR@vwcolstyle}{text-align: right ; } +}{} +% \end{macrocode} +% \begin{macrocode} +\ifdefequal{\vwcol@justify}{\Centering}{ + \appto{\LWR@vwcolstyle}{text-align: center ; } +}{} +% \end{macrocode} +% \begin{macrocode} +\ifdefequal{\vwcol@justify}{\justifying}{ + \appto{\LWR@vwcolstyle}{text-align: justify ; } + \ifdimgreater{\vwcol@parindent}{0pt}{ + \appto{\LWR@vwcolstyle}{% + text-indent: \LWR@printlength{\vwcol@parindent} ; % + } + }{} +}{} +% \end{macrocode} +% Create the \element{div} with the assembled style: +% \begin{macrocode} +\BlockClass[\LWR@vwcolstyle]{multicols} +} +% \end{macrocode} +% When the environment ends: +% \begin{macrocode} +{ +\endBlockClass +} +% \end{macrocode} +% \end{noindenvironment} +% +% \iffalse +%</vwcol> +% \fi +% +% +% +% % % \iffalse %<*wallpaper> @@ -42558,7 +43301,7 @@ class="td% % \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 @@ class="td% {\renewcommand*{\LWR@wrapposition}{float:right}}% {\renewcommand*{\LWR@wrapposition}{float:left}}% \setlength{\LWR@templengthone}{#2}% -\uselengthunit{PT}% \LWR@BlockClassWP{% - width:\rndprintlength{\LWR@templengthone}; \LWR@wrapposition; % + width:\LWR@printlength{\LWR@templengthone}; \LWR@wrapposition; % margin:10pt% }% {% - width:\rndprintlength{\LWR@templengthone}; \LWR@wrapposition% + width:\LWR@printlength{\LWR@templengthone}; \LWR@wrapposition% }% {marginblock}% } @@ -42641,7 +43383,7 @@ class="td% % % \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 @@ class="td% % % \begin{macrocode} \newcommand*{\LWR@borderpadding}[2]{% -\uselengthunit{PT}% -border:\rndprintlength{\LWR@atleastonept} solid \LWR@colorstyle{#1}{#2} ; % -padding:\rndprintlength{\fboxsep}% +border:\LWR@printlength{\LWR@atleastonept} solid \LWR@colorstyle{#1}{#2} ; % +padding:\LWR@printlength{\fboxsep}% } % \end{macrocode} % \end{noindmacro} @@ -42984,10 +43725,9 @@ padding:\rndprintlength{\fboxsep}% \RenewDocumentCommand{\colorbox}{O{named} m +m}{% \begingroup% \LWR@FBcancel% -\uselengthunit{PT}% \InlineClass[% background:\LWR@colorstyle{#1}{#2} ; % -padding:\rndprintlength{\fboxsep}% +padding:\LWR@printlength{\fboxsep}% ]{colorbox}{#3}% \endgroup% } @@ -43003,10 +43743,9 @@ padding:\rndprintlength{\fboxsep}% \NewDocumentCommand{\colorboxBlock}{O{named} m +m}{% \begingroup% \LWR@FBcancel% -\uselengthunit{PT}% \begin{BlockClass}[% background:\LWR@colorstyle{#1}{#2} ; % -padding:\rndprintlength{\fboxsep}% +padding:\LWR@printlength{\fboxsep}% ]{colorboxBlock} #3 \end{BlockClass}% @@ -43028,7 +43767,6 @@ padding:\rndprintlength{\fboxsep}% \LWR@traceinfo{HTML fcolorbox #2 #4}% \begingroup% \LWR@FBcancel% -\uselengthunit{PT}% \LWR@forceminwidth{\fboxrule}% \ifthenelse{\equal{#4}{none}}% {% no background color @@ -43060,7 +43798,6 @@ padding:\rndprintlength{\fboxsep}% \LWR@traceinfo{HTML fcolorboxBlock #2 #4}% \begingroup% \LWR@FBcancel% -\uselengthunit{PT}% \LWR@forceminwidth{\fboxrule}% \ifthenelse{\equal{#4}{none}}% {% no background color @@ -43100,8 +43837,8 @@ padding:\rndprintlength{\fboxsep}% \begin{BlockClass}[% #3% \LWR@borderpadding{#1}{#2} ; % -\IfValueT{#4}{height:\rndprintlength{\LWR@tempheight} ; }% -width:\rndprintlength{\LWR@tempwidth}% +\IfValueT{#4}{height:\LWR@printlength{\LWR@tempheight} ; }% +width:\LWR@printlength{\LWR@tempwidth}% ]{fcolorminipage}% } % \end{macrocode} @@ -43118,7 +43855,6 @@ width:\rndprintlength{\LWR@tempwidth}% \LWR@FBcancel% \setlength{\LWR@tempwidth}{#8}% \IfValueT{#6}{\setlength{\LWR@tempheight}{#6}}% -\uselengthunit{PT}% \LWR@forceminwidth{\fboxrule}% \convertcolorspec{#1}{#2}{HTML}\LWR@tempcolor% \ifthenelse{\equal{#4}{none}}% @@ -43145,13 +43881,12 @@ width:\rndprintlength{\LWR@tempwidth}% \setlength{\LWR@tempwidth}{#1}% \setlength{\LWR@tempheight}{#2}% \addtolength{\LWR@tempheight}{#3}% -\uselengthunit{PT}% \LWR@forceminwidth{\fboxrule}% \InlineClass[% display:inline-block ; % -border:\rndprintlength{\LWR@atleastonept} solid \LWR@currenttextcolor{} ; % -width:\rndprintlength{\LWR@tempwidth} ; % -height:\rndprintlength{\LWR@tempheight}% +border:\LWR@printlength{\LWR@atleastonept} solid \LWR@currenttextcolor{} ; % +width:\LWR@printlength{\LWR@tempwidth} ; % +height:\LWR@printlength{\LWR@tempheight}% ]{boxframe}{}% }% } @@ -43159,6 +43894,87 @@ height:\rndprintlength{\LWR@tempheight}% % \end{macro} % % +% \subsection{Row colors} +% \changes{v0.49}{2018/02/17}{\pkg{xcolor}: Added tabular row colors.} +% +% \begin{noindmacro}{\rowc@l@rs} \oarg{cmds} \marg{startrow} \marg{odd color} \marg{even color} +% \begin{macrocode} +\newcommand*{\LWR@xcolortempcolor}{} + +\def\rowc@l@rs[#1]#2#3#4% +{ +\global\rownum=1 + \global\@rowcolorstrue + \@ifxempty{#3}% + {\def\@oddrowcolor{\@norowcolor}}% + {% + \convertcolorspec{named}{#3}{HTML}\LWR@xcolortempcolor% + \edef\@oddrowcolor{% + \csdef{LWR@xcolorrowHTMLcolor}{\LWR@xcolortempcolor}% + }% + }% + \@ifxempty{#4}% + {\def\@evenrowcolor{\@norowcolor}}% + {% + \convertcolorspec{named}{#4}{HTML}\LWR@xcolortempcolor% + \edef\@evenrowcolor{% + \csdef{LWR@xcolorrowHTMLcolor}{\LWR@xcolortempcolor}% + }% + }% + \if@rowcmd + \def\@rowcolors + {% +% #1% + \if@rowcolors +% \noalign{% + \relax\ifnum\rownum<#2\@norowcolor\else + \ifodd\rownum\@oddrowcolor\else\@evenrowcolor\fi\fi% +% }% + \fi% + }% + \else + \def\@rowcolors + {% + \if@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@xcolorrowHTMLcolor}{}% +} +% \end{macrocode} +% \end{noindmacro} +% + +% \begin{noindmacro}{\@rowc@lors} Executed at the end of each row. +% \begin{macrocode} +\def\@rowc@lors{% +% \noalign{% + \global\advance\rownum\@ne% +% }% + \@rowcolors% +} +% \end{macrocode} +% \end{noindmacro} + +% % \begin{macrocode} \end{warpHTML} % \end{macrocode} diff --git a/Master/texmf-dist/source/latex/lwarp/lwarp.ins b/Master/texmf-dist/source/latex/lwarp/lwarp.ins index 65697671abc..75b0eb69d11 100644 --- a/Master/texmf-dist/source/latex/lwarp/lwarp.ins +++ b/Master/texmf-dist/source/latex/lwarp/lwarp.ins @@ -101,6 +101,7 @@ version 2005/12/01 or later. \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 @@ version 2005/12/01 or later. \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 @@ version 2005/12/01 or later. \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,12 +147,14 @@ version 2005/12/01 or later. \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}} \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 @@ version 2005/12/01 or later. \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 @@ version 2005/12/01 or later. \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 @@ version 2005/12/01 or later. \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}} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-adjmulticol.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-adjmulticol.sty index 91348d0455a..81e0b816adf 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-adjmulticol.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-adjmulticol.sty @@ -27,10 +27,9 @@ \newcommand*{\LWR@mcolstype}{multicols}% \ifnumcomp{#2}{=}{1}{\renewcommand*{\LWR@mcolstype}{singlecolumn}}{}% \LWR@forcenewpage% -\uselengthunit{PT}% \BlockClass[% -\LWR@origmbox{margin-left:\rndprintlength{\LWR@templengthone}} ; % -\LWR@origmbox{margin-right:\rndprintlength{\LWR@templengthtwo}}% +\LWR@origmbox{margin-left:\LWR@printlength{\LWR@templengthone}} ; % +\LWR@origmbox{margin-right:\LWR@printlength{\LWR@templengthtwo}}% ]{\LWR@mcolstype}% } {\endBlockClass} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-algorithmicx.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-algorithmicx.sty index 83d44c47f51..711b7497d64 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-algorithmicx.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-algorithmicx.sty @@ -22,9 +22,8 @@ \let\origALG@doentity\ALG@doentity% \renewcommand*{\ALG@doentity}{% \origALG@doentity% -\uselengthunit{PT}% \LWR@htmltagc{% -span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"% +span style="width:\LWR@printlength{\ALG@thistlm}; display:inline-block;"% }% \ifbool{FormatWP}{% \setlength{\LWR@templengthone}{\the\ALG@thistlm}% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-eso-pic.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-eso-pic.sty index fd3172607d1..80592c200fd 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-eso-pic.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-eso-pic.sty @@ -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}{} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-figsize.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-figsize.sty new file mode 100644 index 00000000000..3c0b3a5f459 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-figsize.sty @@ -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@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'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-floatflt.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-floatflt.sty index 20ebdc37a1e..83898a6830c 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-floatflt.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-floatflt.sty @@ -19,13 +19,12 @@ \NewDocumentEnvironment{KFLTfloatflt@marginfloat}{O{-1.2ex} m m} {% \setlength{\LWR@templengthone}{#3}% -\uselengthunit{PT}% \LWR@BlockClassWP{% float:right; % - width:\rndprintlength{\LWR@templengthone}; % + width:\LWR@printlength{\LWR@templengthone}; % margin:10pt% }{% - width:\rndprintlength{\LWR@templengthone}% + width:\LWR@printlength{\LWR@templengthone}% }% {marginblock}% \captionsetup{type=#2}% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-fnlineno.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-fnlineno.sty new file mode 100644 index 00000000000..a7fde5ccf40 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-fnlineno.sty @@ -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@ProvidesPackageDrop{fnlineno} +\endinput +%% +%% End of file `lwarp-fnlineno.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty index 73f96d69baf..48d102c1d0e 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty @@ -30,10 +30,6 @@ } -\AtBeginDocument{ -\renewcommand*{\unitspace}{} -} - \newlength{\LWR@igwidth} \newlength{\LWR@igheight} \newcommand*{\LWR@igwidthstyle}{} @@ -48,8 +44,7 @@ \setlength{\LWR@igwidth}{#1}% \ifthenelse{\lengthtest{\LWR@igwidth > 0pt}}% {% - \uselengthunit{PT}% - \renewcommand*{\LWR@igwidthstyle}{width:\rndprintlength{\LWR@igwidth}}% + \renewcommand*{\LWR@igwidthstyle}{width:\LWR@printlength{\LWR@igwidth}}% \IfEndWith{#1}{ex}% {\renewcommand*{\LWR@igwidthstyle}{width:#1}}% yes ex {}% not ex @@ -68,9 +63,8 @@ \setlength{\LWR@igheight}{#1}% \ifthenelse{\lengthtest{\LWR@igheight > 0pt}}% {% - \uselengthunit{PT}% \renewcommand*{\LWR@igheightstyle}{% - height:\rndprintlength{\LWR@igheight} % + height:\LWR@printlength{\LWR@igheight} % }% \IfEndWith{#1}{ex}% {\renewcommand*{\LWR@igheightstyle}{height:#1}}% yes ex @@ -210,11 +204,10 @@ }% }% not starred \endgroup% - \uselengthunit{PT}% \settowidth{\LWR@igwidth}{\usebox{\LWR@imagesizebox}}% - \global\renewcommand*{\LWR@igwidthstyle}{width:\rndprintlength{\LWR@igwidth}}% + \global\renewcommand*{\LWR@igwidthstyle}{width:\LWR@printlength{\LWR@igwidth}}% \settoheight{\LWR@igheight}{\usebox{\LWR@imagesizebox}}% - \global\renewcommand*{\LWR@igheightstyle}{height:\rndprintlength{\LWR@igheight}}% + \global\renewcommand*{\LWR@igheightstyle}{height:\LWR@printlength{\LWR@igheight}}% }{}% \LWR@traceinfo{LWR@includegraphicsb: about to create href}% \href{\LWR@parsedfilename}% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-hang.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-hang.sty index 72c21192a19..0e3efd3dece 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-hang.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-hang.sty @@ -29,10 +29,9 @@ \newenvironment{hangingpar} { \LWR@findhangingleftmargin% - \uselengthunit{PT}% \BlockClass[% - \LWR@origmbox{margin-left:\rndprintlength{\LWR@templengthone}} ; % - \LWR@origmbox{text-indent:-\rndprintlength{\hangingindent}}% + \LWR@origmbox{margin-left:\LWR@printlength{\LWR@templengthone}} ; % + \LWR@origmbox{text-indent:-\LWR@printlength{\hangingindent}}% ]% {hangingpar}% } @@ -43,10 +42,9 @@ \renewcommand*{\LWR@printcloselist}{\LWR@printcloseitemize}% \renewcommand*{\LWR@printopenlist}{% \LWR@findhangingleftmargin% - \uselengthunit{PT}% ul style="\LWR@origmbox{list-style-type:none;} % - \LWR@origmbox{margin-left:\rndprintlength{\LWR@templengthone}} ; % - \LWR@origmbox{text-indent:-\rndprintlength{\hangingindent}}"% + \LWR@origmbox{margin-left:\LWR@printlength{\LWR@templengthone}} ; % + \LWR@origmbox{text-indent:-\LWR@printlength{\hangingindent}}"% }% \let\item\LWR@itemizeitem% \list{}{}% @@ -64,9 +62,8 @@ {% \BlockClass[% \LWR@findhangingleftmargin% - \uselengthunit{PT}% - \LWR@origmbox{margin-left:\rndprintlength{\LWR@templengthone}} ; % - \LWR@origmbox{text-indent:-\rndprintlength{\hangingindent}}% + \LWR@origmbox{margin-left:\LWR@printlength{\LWR@templengthone}} ; % + \LWR@origmbox{text-indent:-\LWR@printlength{\hangingindent}}% ]{labeledpar}#2% } {\endBlockClass} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-hanging.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-hanging.sty index 9dba6a56aa0..2125c8b5b0b 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-hanging.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-hanging.sty @@ -27,10 +27,9 @@ \newenvironment*{hangparas}[2] {% - \uselengthunit{PT}% \BlockClass[% - \LWR@origmbox{margin-left:\rndprintlength{#1}} ; % - \LWR@origmbox{text-indent:-\rndprintlength{#1}}% + \LWR@origmbox{margin-left:\LWR@printlength{#1}} ; % + \LWR@origmbox{text-indent:-\LWR@printlength{#1}}% ]% {hangingpar}% } diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-hypdestopt.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-hypdestopt.sty new file mode 100644 index 00000000000..a63e2b6c112 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-hypdestopt.sty @@ -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@ProvidesPackageDrop{hypdestopt} +\endinput +%% +%% End of file `lwarp-hypdestopt.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-hyphenat.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-hyphenat.sty new file mode 100644 index 00000000000..3aff6284869 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-hyphenat.sty @@ -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@ProvidesPackagePass{hyphenat} +\LetLtxMacro\LWRHYNAT@origtextnhtt\textnhtt +\LetLtxMacro\LWRHYNAT@orignhttfamily\nhttfamily +\LetLtxMacro\LWRHYNAT@orignohyphens\nohyphens +\LetLtxMacro\LWRHYNAT@origbshyp\bshyp +\LetLtxMacro\LWRHYNAT@origfshyp\fshyp +\LetLtxMacro\LWRHYNAT@origdothyp\dothyp +\LetLtxMacro\LWRHYNAT@origcolonhyp\colonhyp +\LetLtxMacro\LWRHYNAT@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@restoreorigformatting{ +\LetLtxMacro\textnhtt\LWRHYNAT@origtextnhtt +\LetLtxMacro\nhttfamily\LWRHYNAT@orignhttfamily +\LetLtxMacro\nohyphens\LWRHYNAT@orignohyphens +\LetLtxMacro\bshyp\LWRHYNAT@origbshyp +\LetLtxMacro\fshyp\LWRHYNAT@origfshyp +\LetLtxMacro\dothyp\LWRHYNAT@origdothyp +\LetLtxMacro\colonhyp\LWRHYNAT@origcolonhyp +\LetLtxMacro\hyp\LWRHYNAT@orighyp +} +\endinput +%% +%% End of file `lwarp-hyphenat.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-keyfloat.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-keyfloat.sty index 20124144cfa..0e1ff43a768 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-keyfloat.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-keyfloat.sty @@ -81,13 +81,12 @@ width=\KFLT@imagewidth,height=\KFLT@h]{\KFLT@i}% {% \LWR@ensuredoingapar% \setlength{\LWR@templengthone}{#1}% -\uselengthunit{PT}% \begin{LWR@BlockClassWP}{% - float:right; width:\rndprintlength{\LWR@templengthone}; % + float:right; width:\LWR@printlength{\LWR@templengthone}; % margin:10pt% }% {% - width:\rndprintlength{\LWR@templengthone}% + width:\LWR@printlength{\LWR@templengthone}% }% {marginblock}% \setlength{\linewidth}{.95\LWR@templengthone}% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-lineno.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-lineno.sty new file mode 100644 index 00000000000..f9532a910de --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-lineno.sty @@ -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@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@pagewiselinenumber +\let\c@runninglinenumber\c@linenumber + +\def\runningpagewiselinenumbers{} +\def\realpagewiselinenumbers{} + +\NewDocumentCommand\modulolinenumbers{s o}{} + +\chardef\c@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@forceminwidth{\bframerule}% + \BlockClass[ + border:\LWR@printlength{\LWR@atleastonept} solid black ; % + padding:\LWR@printlength{\bframesep}% + ]{bframe} +} +{\endBlockClass} +\endinput +%% +%% End of file `lwarp-lineno.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-luacolor.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-luacolor.sty new file mode 100644 index 00000000000..275aec1809b --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-luacolor.sty @@ -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@ProvidesPackageDrop{luacolor} +\newcommand{\luacolorProcessBox}[1]{} +\endinput +%% +%% End of file `lwarp-luacolor.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-mdframed.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-mdframed.sty index 8260d72e3a1..202b4033e09 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-mdframed.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-mdframed.sty @@ -46,12 +46,11 @@ endinnercode={\LWR@stoppars}, } \newcommand*{\LWR@mdfprintlength}[1]{% -\rndprintlength{\csuse{mdf@#1@length}} +\LWR@printlength{\csuse{mdf@#1@length}} } \newcommand*{\LWR@mdframedstart}{% \LWR@traceinfo{LWR@mdframedstart start}% \LWR@stoppars% -\uselengthunit{PT}% \LWR@htmltagc{div class="\LWR@mdthisenv" \LWR@orignewline style=" \LWR@orignewline background: \LWR@mdfprintcolor{backgroundcolor} ; \LWR@orignewline @@ -122,7 +121,6 @@ border-radius: \LWR@mdfprintlength{roundcorner} ; \LWR@orignewline \renewrobustcmd\mdfframedtitleenv[1]{% \LWR@traceinfo{LWR@mdframedtitleenv start}% -\uselengthunit{PT}% \LWR@htmltagc{span class="mdframedtitle" \LWR@orignewline style=" \LWR@orignewline background: @@ -138,8 +136,8 @@ background: border-radius: \setlength{\LWR@titleroundcorner} {\maxof{\mdf@roundcorner@length-\mdf@linewidth@length}{0pt}} - \rndprintlength{\LWR@titleroundcorner} - \rndprintlength{\LWR@titleroundcorner} + \LWR@printlength{\LWR@titleroundcorner} + \LWR@printlength{\LWR@titleroundcorner} 0pt 0pt \LWR@orignewline " \LWR@orignewline diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-pagegrid.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-pagegrid.sty new file mode 100644 index 00000000000..31f986e3369 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-pagegrid.sty @@ -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@ProvidesPackageDrop{pagegrid} +\newcommand*{\pagegridsetup}[1]{} +\endinput +%% +%% End of file `lwarp-pagegrid.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfrender.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfrender.sty new file mode 100644 index 00000000000..9fc86eb4128 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfrender.sty @@ -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@ProvidesPackageDrop{pdfrender} +\newcommand*{\pdfrender}[1]{} +\newcommand{\textpdfrender}[2]{#2} +\endinput +%% +%% End of file `lwarp-pdfrender.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-quotchap.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-quotchap.sty index 58b4e59aa3a..27ec2dba27a 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-quotchap.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-quotchap.sty @@ -22,8 +22,7 @@ \let\@printcites\relax \newcommand*{\@iprintcites}{% -\uselengthunit{PT}% -\begin{BlockClass}[max-width: \rndprintlength{\LWR@quotchapwidth}]{quotchap} +\begin{BlockClass}[max-width: \LWR@printlength{\LWR@quotchapwidth}]{quotchap} \@quotchap \end{BlockClass} \global\let\@printcites\relax diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-resizegather.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-resizegather.sty new file mode 100644 index 00000000000..80f3c97d1f6 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-resizegather.sty @@ -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@ProvidesPackageDrop{resizegather} +\newcommand*{\resizegathersetup}[1]{} +\endinput +%% +%% End of file `lwarp-resizegather.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-scrextend.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-scrextend.sty index fe03c69cebe..277804e8f0d 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-scrextend.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-scrextend.sty @@ -119,20 +119,19 @@ \NewDocumentEnvironment{addmargin}{s O{} m} { -\uselengthunit{PT}% \setlength{\LWR@templengthtwo}{#3} \ifblank{#2} { \begin{BlockClass}[ - \LWR@origmbox{margin-left:\rndprintlength{\LWR@templengthtwo}} ; - \LWR@origmbox{margin-right:\rndprintlength{\LWR@templengthtwo}} + \LWR@origmbox{margin-left:\LWR@printlength{\LWR@templengthtwo}} ; + \LWR@origmbox{margin-right:\LWR@printlength{\LWR@templengthtwo}} ]{addmargin} } { \setlength{\LWR@templengthone}{#2} \begin{BlockClass}[ - \LWR@origmbox{margin-left:\rndprintlength{\LWR@templengthone}} ; - \LWR@origmbox{margin-right:\rndprintlength{\LWR@templengthtwo}} + \LWR@origmbox{margin-left:\LWR@printlength{\LWR@templengthone}} ; + \LWR@origmbox{margin-right:\LWR@printlength{\LWR@templengthtwo}} ]{addmargin} } } diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-stabular.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-stabular.sty index a05fb970bcc..3b656b2219d 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-stabular.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-stabular.sty @@ -18,14 +18,14 @@ \LWR@ProvidesPackageDrop{stabular} \newenvironment{stabular}[2][c] { -\renewcommand{\noalign}[1]{} \begin{tabular}[#1]{#2} +\renewcommand{\noalign}[1]{} } {\end{tabular}} \NewDocumentEnvironment{stabular*}{m o m} { -\renewcommand{\noalign}[1]{} \begin{tabular}[#2]{#3} +\renewcommand{\noalign}[1]{} } {\end{tabular}} \endinput diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-textfit.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-textfit.sty index 4bf4be4fc9c..41f2231d9b4 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-textfit.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-textfit.sty @@ -19,12 +19,11 @@ \newsavebox{\LWR@textfitbox} \newcommand*{\LWR@textfitscale}[2]{% -\uselengthunit{PT}% \setlength{\LWR@templengthone}{#1}% \setlength{\LWR@templengthone}{% 1em*\ratio{\LWR@templengthone}{\LWR@templengthtwo}% }% -\InlineClass[font-size:\rndprintlength{\LWR@templengthone}]{textfit}{#2}% +\InlineClass[font-size:\LWR@printlength{\LWR@templengthone}]{textfit}{#2}% } \newcommand*{\scaletowidth}[2]{% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-vertbars.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-vertbars.sty new file mode 100644 index 00000000000..be4ab558b18 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-vertbars.sty @@ -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@ProvidesPackageDrop{vertbars} +\newlength{\barwidth} +\setlength{\barwidth}{0.4pt} +\newlength{\barspace} +\setlength{\barspace}{1em} + +\newenvironment{vertbar}{ + \LWR@forcenewpage + \LWR@forceminwidth{\barwidth} + \begin{BlockClass}[% + border-left: \LWR@printlength{\LWR@atleastonept} solid black ; % + padding-left: \LWR@printlength{\barspace}% + ]{vertbar} +}{ + \end{BlockClass} +} +\endinput +%% +%% End of file `lwarp-vertbars.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-vwcol.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-vwcol.sty new file mode 100644 index 00000000000..e5461c13c06 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-vwcol.sty @@ -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@ProvidesPackagePass{vwcol} +\newcommand*{\LWR@vwcol@addrule}[1]{% + \appto{\LWR@vwcolstyle}{% + #1: % + \LWR@printlength{\vwcol@rule} solid \#\LWR@vwcol@rulecolor ; % + }% +} + +\newcommand*{\LWR@vwcol@addgap}[1]{% + \appto{\LWR@vwcolstyle}{% + #1: % + \LWR@printlength{\vwcol@sep} ; % + }% +} +\renewenvironment*{vwcol}[1][]{% +\par\noindent% +\vwcolsetup{#1}% +\newcommand*{\LWR@vwcolstyle}{} +\if@vwcol@presep + \appto{\LWR@vwcolstyle}{margin-left: 1em ; padding-left: .5em ; } +\fi +\if@vwcol@postsep + \appto{\LWR@vwcolstyle}{margin-right: 1em ; padding-right: .5em ; } +\fi +\ifdimgreater{\vwcol@sep}{1sp}{ + \LWR@vwcol@addgap{column-gap} + \LWR@vwcol@addgap{-moz-column-gap} + \LWR@vwcol@addgap{-webkit-column-gap} +}{} +\convertcolorspec{named}{\vwcol@rulecol}{HTML}\LWR@vwcol@rulecolor% +\ifdimgreater{\vwcol@rule}{0pt}{ + \ifdimless{\vwcol@rule}{1pt}{ + \setlength{\vwcol@rule}{1pt} + }{} + \LWR@vwcol@addrule{column-rule} + \LWR@vwcol@addrule{-moz-column-rule} + \LWR@vwcol@addrule{-webkit-column-rule} + \if@vwcol@prerule\LWR@vwcol@addrule{border-left}\fi + \if@vwcol@postrule\LWR@vwcol@addrule{border-right}\fi +}{} +\ifdefequal{\vwcol@justify}{\RaggedRight}{ + \appto{\LWR@vwcolstyle}{text-align: left ; } + \ifdimgreater{\vwcol@parindent}{0pt}{ + \appto{\LWR@vwcolstyle}{% + text-indent: \LWR@printlength{\vwcol@parindent} ; % + } + }{} +}{} +\ifdefequal{\vwcol@justify}{\RaggedLeft}{ + \appto{\LWR@vwcolstyle}{text-align: right ; } +}{} +\ifdefequal{\vwcol@justify}{\Centering}{ + \appto{\LWR@vwcolstyle}{text-align: center ; } +}{} +\ifdefequal{\vwcol@justify}{\justifying}{ + \appto{\LWR@vwcolstyle}{text-align: justify ; } + \ifdimgreater{\vwcol@parindent}{0pt}{ + \appto{\LWR@vwcolstyle}{% + text-indent: \LWR@printlength{\vwcol@parindent} ; % + } + }{} +}{} +\BlockClass[\LWR@vwcolstyle]{multicols} +} +{ +\endBlockClass +} +\endinput +%% +%% End of file `lwarp-vwcol.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-wrapfig.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-wrapfig.sty index 22a508217b4..77ce54b9ce3 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-wrapfig.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-wrapfig.sty @@ -30,13 +30,12 @@ {\renewcommand*{\LWR@wrapposition}{float:right}}% {\renewcommand*{\LWR@wrapposition}{float:left}}% \setlength{\LWR@templengthone}{#2}% -\uselengthunit{PT}% \LWR@BlockClassWP{% - width:\rndprintlength{\LWR@templengthone}; \LWR@wrapposition; % + width:\LWR@printlength{\LWR@templengthone}; \LWR@wrapposition; % margin:10pt% }% {% - width:\rndprintlength{\LWR@templengthone}; \LWR@wrapposition% + width:\LWR@printlength{\LWR@templengthone}; \LWR@wrapposition% }% {marginblock}% } diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty index 3d862a1aa58..eabfabe7f1e 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty @@ -75,9 +75,8 @@ \endgroup% } \newcommand*{\LWR@borderpadding}[2]{% -\uselengthunit{PT}% -border:\rndprintlength{\LWR@atleastonept} solid \LWR@colorstyle{#1}{#2} ; % -padding:\rndprintlength{\fboxsep}% +border:\LWR@printlength{\LWR@atleastonept} solid \LWR@colorstyle{#1}{#2} ; % +padding:\LWR@printlength{\fboxsep}% } \RenewDocumentCommand{\textcolor}{O{named} m m}{% \begingroup% @@ -96,10 +95,9 @@ padding:\rndprintlength{\fboxsep}% \RenewDocumentCommand{\colorbox}{O{named} m +m}{% \begingroup% \LWR@FBcancel% -\uselengthunit{PT}% \InlineClass[% background:\LWR@colorstyle{#1}{#2} ; % -padding:\rndprintlength{\fboxsep}% +padding:\LWR@printlength{\fboxsep}% ]{colorbox}{#3}% \endgroup% } @@ -107,10 +105,9 @@ padding:\rndprintlength{\fboxsep}% \NewDocumentCommand{\colorboxBlock}{O{named} m +m}{% \begingroup% \LWR@FBcancel% -\uselengthunit{PT}% \begin{BlockClass}[% background:\LWR@colorstyle{#1}{#2} ; % -padding:\rndprintlength{\fboxsep}% +padding:\LWR@printlength{\fboxsep}% ]{colorboxBlock} #3 \end{BlockClass}% @@ -121,7 +118,6 @@ padding:\rndprintlength{\fboxsep}% \LWR@traceinfo{HTML fcolorbox #2 #4}% \begingroup% \LWR@FBcancel% -\uselengthunit{PT}% \LWR@forceminwidth{\fboxrule}% \ifthenelse{\equal{#4}{none}}% {% no background color @@ -142,7 +138,6 @@ padding:\rndprintlength{\fboxsep}% \LWR@traceinfo{HTML fcolorboxBlock #2 #4}% \begingroup% \LWR@FBcancel% -\uselengthunit{PT}% \LWR@forceminwidth{\fboxrule}% \ifthenelse{\equal{#4}{none}}% {% no background color @@ -169,8 +164,8 @@ padding:\rndprintlength{\fboxsep}% \begin{BlockClass}[% #3% \LWR@borderpadding{#1}{#2} ; % -\IfValueT{#4}{height:\rndprintlength{\LWR@tempheight} ; }% -width:\rndprintlength{\LWR@tempwidth}% +\IfValueT{#4}{height:\LWR@printlength{\LWR@tempheight} ; }% +width:\LWR@printlength{\LWR@tempwidth}% ]{fcolorminipage}% } \NewDocumentEnvironment{fcolorminipage}{O{named} m O{named} m O{c} o o m} @@ -178,7 +173,6 @@ width:\rndprintlength{\LWR@tempwidth}% \LWR@FBcancel% \setlength{\LWR@tempwidth}{#8}% \IfValueT{#6}{\setlength{\LWR@tempheight}{#6}}% -\uselengthunit{PT}% \LWR@forceminwidth{\fboxrule}% \convertcolorspec{#1}{#2}{HTML}\LWR@tempcolor% \ifthenelse{\equal{#4}{none}}% @@ -194,16 +188,68 @@ width:\rndprintlength{\LWR@tempwidth}% \setlength{\LWR@tempwidth}{#1}% \setlength{\LWR@tempheight}{#2}% \addtolength{\LWR@tempheight}{#3}% -\uselengthunit{PT}% \LWR@forceminwidth{\fboxrule}% \InlineClass[% display:inline-block ; % -border:\rndprintlength{\LWR@atleastonept} solid \LWR@currenttextcolor{} ; % -width:\rndprintlength{\LWR@tempwidth} ; % -height:\rndprintlength{\LWR@tempheight}% +border:\LWR@printlength{\LWR@atleastonept} solid \LWR@currenttextcolor{} ; % +width:\LWR@printlength{\LWR@tempwidth} ; % +height:\LWR@printlength{\LWR@tempheight}% ]{boxframe}{}% }% } +\newcommand*{\LWR@xcolortempcolor}{} + +\def\rowc@l@rs[#1]#2#3#4% +{ +\global\rownum=1 + \global\@rowcolorstrue + \@ifxempty{#3}% + {\def\@oddrowcolor{\@norowcolor}}% + {% + \convertcolorspec{named}{#3}{HTML}\LWR@xcolortempcolor% + \edef\@oddrowcolor{% + \csdef{LWR@xcolorrowHTMLcolor}{\LWR@xcolortempcolor}% + }% + }% + \@ifxempty{#4}% + {\def\@evenrowcolor{\@norowcolor}}% + {% + \convertcolorspec{named}{#4}{HTML}\LWR@xcolortempcolor% + \edef\@evenrowcolor{% + \csdef{LWR@xcolorrowHTMLcolor}{\LWR@xcolortempcolor}% + }% + }% + \if@rowcmd + \def\@rowcolors + {% + \if@rowcolors + \relax\ifnum\rownum<#2\@norowcolor\else + \ifodd\rownum\@oddrowcolor\else\@evenrowcolor\fi\fi% + \fi% + }% + \else + \def\@rowcolors + {% + \if@rowcolors + \ifnum\rownum<#2% + \@norowcolor + \else + \ifodd\rownum\@oddrowcolor\else\@evenrowcolor\fi% + \fi + \fi% + }% + \fi + \ignorespaces% +} +\def\@norowcolor{% +\renewcommand{\LWR@xcolorrowHTMLcolor}{}% +} + +\def\@rowc@lors{% + \global\advance\rownum\@ne% + \@rowcolors% +} + \end{warpHTML} \endinput %% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp.sty index 8691e932519..930690dcd95 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp.sty @@ -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 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{fancyref} \LWR@loadafter{fancyvrb} \LWR@loadafter{figcaps} +\LWR@loadafter{figsize} \LWR@loadafter{fix2col} \LWR@loadafter{fixme} \LWR@loadafter{fixmetodonotes} @@ -283,6 +284,7 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{fltrace} \LWR@loadafter{flushend} \LWR@loadafter{fncychap} +\LWR@loadafter{fnlineno} \LWR@loadafter{fnpos} \LWR@loadafter{footmisc} \LWR@loadafter{footnote} @@ -299,9 +301,11 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{hang} \LWR@loadafter{hanging} \LWR@loadafter{hypcap} +\LWR@loadafter{hypdestopt} \LWR@loadafter{hypernat} \LWR@loadafter{hyperref} \LWR@loadafter{hyperxmp} +\LWR@loadafter{hyphenat} \LWR@loadafter{idxlayout} \LWR@loadafter{ifoddpage} \LWR@loadafter{indentfirst} @@ -309,12 +313,14 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{layout} \LWR@loadafter{letterspace} \LWR@loadafter{lettrine} +\LWR@loadafter{lineno} \LWR@loadafter{lips} \LWR@loadafter{listings} \LWR@loadafter{longtable} \LWR@loadafter{lscape} \LWR@loadafter{ltcaption} \LWR@loadafter{ltxtable} +\LWR@loadafter{luacolor} \LWR@loadafter{luatodonotes} \LWR@loadafter{marginfit} \LWR@loadafter{marginfix} @@ -340,10 +346,12 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{nowidow} \LWR@loadafter{ntheorem} \LWR@loadafter{overpic} +\LWR@loadafter{pagegrid} \LWR@notmemoirloadafter{pagenote} \LWR@loadafter{pagesel} \LWR@loadafter{paralist} \LWR@notmemoirloadafter{parskip} +\LWR@loadafter{pdfrender} \LWR@loadafter{pdflscape} \LWR@loadafter{pdfsync} \LWR@loadafter{pfnote} @@ -355,6 +363,7 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{ragged2e} \LWR@loadafter{realscripts} \LWR@loadafter{relsize} +\LWR@loadafter{resizegather} \LWR@loadafter{romanbar} \LWR@loadafter{romanbarpagenumber} \LWR@loadafter{rotating} @@ -408,7 +417,9 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{upref} \LWR@loadafter{varioref}% no lwarp package provided \LWR@notmemoirloadafter{verse} +\LWR@loadafter{vertbars} \LWR@loadafter{vmargin} +\LWR@loadafter{vwcol} \LWR@loadafter{wallpaper} \LWR@loadafter{watermark} \LWR@loadafter{wrapfig} @@ -537,10 +548,24 @@ top=1in,bottom=1in,% \PassOptionsToPackage{leqno}{amsmath} \RequirePackage{amsmath} +\def\maketag@@@#1{#1} +\def\tagform@#1{\maketag@@@{(\ignorespaces#1\unskip)}} \RequirePackage{printlen} +\newrobustcmd*{\LWR@printlength}[1]{% +\begingroup% +\uselengthunit{PT}% +\renewcommand*{\unitspace}{}% +\ifdimless{#1}{10pt}{% + \printlength{#1}% +}{% + \rndprintlength{#1}% +}% +\endgroup% +} + \end{warpHTML} \begin{warpprint} @@ -2941,7 +2966,7 @@ src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.1/MathJax.js?config=TeX- -- 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,7 +5104,13 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \end{warpHTML} \begin{warpall} -\newrobustcmd{\affiliation}[1]{} +\ifcsvoid{@titlepagefalse}{ + \newif\if@titlepage + \@titlepagefalse +}{} +\end{warpall} +\begin{warpall} +\providerobustcmd{\affiliation}[1]{} \end{warpall} \begin{warpprint} \AtBeginEnvironment{titlepage}{ @@ -5818,14 +5849,15 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \ifnumcomp{\value{LWR@tablecolindex}}{<}{\value{LWR@tabletotalcols}}% {\LWR@tabularfinishrow}% {\LWR@closetabledatacell}% -\LWR@htmltag{/tr}\LWR@orignewline -\global\booltrue{LWR@intabularmetadata} -\global\boolfalse{LWR@startedrow} +\LWR@htmltag{/tr}\LWR@orignewline% +\@rowc@lors% +\global\booltrue{LWR@intabularmetadata}% +\global\boolfalse{LWR@startedrow}% \global\boolfalse{LWR@doinghline}% \global\boolfalse{LWR@doingtbrule}% \global\boolfalse{LWR@doingcmidrule}% \LWR@clearmidrules% -\renewcommand*{\LWR@rowHTMLcolor}{} +\renewcommand*{\LWR@rowHTMLcolor}{}% \setcounter{LWR@tablecolindex}{1}% \boolfalse{LWR@tabularcelladded}% \LWR@getmynexttoken% @@ -6012,11 +6044,14 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \LWR@traceinfo{LWR@parsetablecols: done}% }% - -\newcommand{\LWR@columnHTMLcolor}{} -\newcommand{\LWR@rowHTMLcolor}{} -\newcommand{\LWR@cellHTMLcolor}{} -\newcommand{\LWR@ruleHTMLcolor}{} + \@ifundefined{rownum}{\newcount\rownum}{} +\newcommand*{\@rowcolors}{} +\newcommand*{\@rowc@lors}{} +\newcommand*{\LWR@xcolorrowHTMLcolor}{} +\newcommand*{\LWR@columnHTMLcolor}{} +\newcommand*{\LWR@rowHTMLcolor}{} +\newcommand*{\LWR@cellHTMLcolor}{} +\newcommand*{\LWR@ruleHTMLcolor}{} \NewDocumentCommand{\LWR@HTMLcolumncolor}{O{named} m o o}{} \NewDocumentCommand{\LWR@HTMLrowcolor}{O{named} m o o}{\LWR@getmynexttoken} @@ -6284,8 +6319,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% {% custom width and/or color \LWR@forceminwidth{#1}% \LWR@tdaddstyle% - \uselengthunit{PT}% - border-top:\rndprintlength{\LWR@atleastonept} solid % + border-top:\LWR@printlength{\LWR@atleastonept} solid % \ifdefvoid{\LWR@ruleHTMLcolor}{% \ifdimcomp{#1}{<}{\LWR@lightrulewidth}% {\#A0A0A0}% @@ -6326,11 +6360,17 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \newcommand*{\LWR@addtabularrowcolor}{% \ifbool{LWR@tabularmutemods}{}{% - \ifdefvoid{\LWR@rowHTMLcolor}{}% - {% row color + \ifdefvoid{\LWR@rowHTMLcolor}{% + \ifdefvoid{\LWR@xcolorrowHTMLcolor}{}% + {% xcolor row color + \LWR@tdaddstyle% + background:\#\LWR@xcolorrowHTMLcolor% + }% + }% + {% explicit row color \LWR@tdaddstyle% background:\#\LWR@rowHTMLcolor% - }% row color + }% }% } @@ -6379,9 +6419,13 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% {% \ifdefvoid{\LWR@rowHTMLcolor}% {% - \ifdefvoid{\LWR@columnHTMLcolor}% - {}% - {\LWR@subaddtabularcellcolor{\LWR@columnHTMLcolor}}% + \ifdefvoid{\LWR@xcolorrowHTMLcolor}% + {% + \ifdefvoid{\LWR@columnHTMLcolor}% + {}% + {\LWR@subaddtabularcellcolor{\LWR@columnHTMLcolor}}% + }% + {\LWR@subaddtabularcellcolor{\LWR@xcolorrowHTMLcolor}}% }% {\LWR@subaddtabularcellcolor{\LWR@rowHTMLcolor}}% }% @@ -6525,6 +6569,7 @@ rowspan="#2" % \ifbool{LWR@mcolvertbarr}{ tvertbarr}{}% "% \LWR@tdstartstyles% +\LWR@addtabularrowcolor% \LWR@addcmidrulewidth% \LWR@addtabularhrulecolor% \LWR@addmulticolvertrulecolor% @@ -6726,6 +6771,8 @@ rowspan="#2" % {\let\mynext\LWR@donothing}{}% \ifdefequal{\LWR@mynexttoken}{\multicolumnrow}% {\let\mynext\LWR@donothing}{}% +\ifdefequal{\LWR@mynexttoken}{\noalign}% + {\let\mynext\LWR@donothing}{}% \ifdefequal{\LWR@mynexttoken}{\mrowcell}% {\let\mynext\LWR@donothing}{}% \ifdefequal{\LWR@mynexttoken}{\mcolrowcell}% @@ -6796,6 +6843,16 @@ rowspan="#2" % \newcommand*{\LWR@origaddlinespace}[1][]{} \newcommand*{\LWR@origmorecmidrules}{} \newcommand*{\LWR@origspecialrule}[3]{\hline} +\LetLtxMacro\LWR@orignoalign\noalign + +\newcommand{\LWR@tabularnoalign}[1]{% +\begingroup% +\global\advance\rownum\m@ne% +\renewcommand*{\LWR@xcolorrowHTMLcolor}{}% +\multicolumn{\value{LWR@tabletotalcols}}{l}{#1} \\ +\endgroup% +\LWR@getmynexttoken% +} \AtBeginDocument{ \@ifpackageloaded{lwarp-tabls} { @@ -6853,20 +6910,22 @@ rowspan="#2" % \boolfalse{LWR@tabularcelladded}% \LWR@clearmidrules% \LetLtxMacro{\\}{\LWR@tabularendofline}% -\LetLtxMacro\columncolor\LWR@HTMLcolumncolor -\LetLtxMacro\rowcolor\LWR@HTMLrowcolor -\LetLtxMacro\cellcolor\LWR@HTMLcellcolor -\LetLtxMacro\arrayrulecolor\LWR@HTMLarrayrulecolor -\LetLtxMacro\doublerulesepcolor\LWR@HTMLdoublerulesepcolor -\renewcommand*{\LWR@columnHTMLcolor}{} -\renewcommand*{\LWR@rowHTMLcolor}{} -\renewcommand*{\LWR@cellHTMLcolor}{} -\edef\LWR@vertruleHTMLcolor{\LWR@ruleHTMLcolor} -\setcounter{LWR@cellcolordepth}{0} +\LetLtxMacro\columncolor\LWR@HTMLcolumncolor% +\LetLtxMacro\rowcolor\LWR@HTMLrowcolor% +\LetLtxMacro\cellcolor\LWR@HTMLcellcolor% +\LetLtxMacro\arrayrulecolor\LWR@HTMLarrayrulecolor% +\LetLtxMacro\doublerulesepcolor\LWR@HTMLdoublerulesepcolor% +\renewcommand*{\LWR@columnHTMLcolor}{}% +\renewcommand*{\LWR@rowHTMLcolor}{}% +\renewcommand*{\LWR@cellHTMLcolor}{}% +\@rowcolors% +\edef\LWR@vertruleHTMLcolor{\LWR@ruleHTMLcolor}% +\setcounter{LWR@cellcolordepth}{0}% \LWR@traceinfo{LWR@tabular: redefining macros}% +\LetLtxMacro\noalign\LWR@tabularnoalign% \LetLtxMacro\hline\LWR@HTMLhline% \LetLtxMacro\cline\LWR@HTMLcline% -\DeclareDocumentCommand{\toprule}{o d()} +\DeclareDocumentCommand{\toprule}{o d()}% {% \IfValueTF{##1}% {\LWR@docmidrule[##1](){1-\arabic{LWR@tabletotalcols}}}% @@ -6888,7 +6947,7 @@ rowspan="#2" % \LWR@getmynexttoken}% \DeclareDocumentCommand{\cmidrule}{O{\LWR@cmidrulewidth} d() m}% {\LWR@docmidrule[##1](##2){##3}\LWR@getmynexttoken}% -\DeclareDocumentCommand{\bottomrule}{o d()} +\DeclareDocumentCommand{\bottomrule}{o d()}% {% \IfValueTF{##1}% {\LWR@docmidrule[##1](){1-\arabic{LWR@tabletotalcols}}}% @@ -6946,6 +7005,7 @@ rowspan="#2" % \LWR@closetabledatacell% }% \LWR@htmlblocktag{/tr}% +\@rowc@lors% \LWR@htmlblocktag{/table}% \global\boolfalse{LWR@intabularmetadata}% \addtocounter{LWR@tabulardepth}{-1}% @@ -7143,7 +7203,7 @@ autopage-\theLWR@currentautosec% \LWR@ensuredoingapar% } -\NewDocumentCommand{\href}{O{} m +m}{% +\DeclareDocumentCommand{\href}{O{} m +m}{% \LWR@ensuredoingapar% \LWR@subhyperref{#2}{#3}% } @@ -7155,7 +7215,7 @@ autopage-\theLWR@currentautosec% \LWR@templink% } -\NewDocumentCommand{\url}{m}{% +\DeclareDocumentCommand{\url}{m}{% \LWR@ensuredoingapar% \def\LWR@templink{#1}% \@onelevel@sanitize\LWR@templink% @@ -7714,6 +7774,7 @@ autopage-\theLWR@currentautosec% \let\qquad\LWR@origqquad% \LetLtxMacro\tabular\LWR@origtabular% \LetLtxMacro\endtabular\LWR@origendtabular% +\LetLtxMacro\noalign\LWR@orignoalign% \LetLtxMacro\hline\LWR@orighline% \LetLtxMacro\toprule\LWR@origtoprule% \LetLtxMacro\midrule\LWR@origmidrule% @@ -7799,7 +7860,6 @@ autopage-\theLWR@currentautosec% \protected\gdef\LWR@subsingledollar#1{% \begingroup% -\normalsize% \ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }% {% {\textbackslash(\LWR@HTMLsanitize{#1}\textbackslash)}% @@ -7816,6 +7876,7 @@ autopage-\theLWR@currentautosec% \global\setlength{\LWR@singledollarheight}{\totalheightof{% \LWR@origdollar#1\LWR@origdollar% }*\real{.8}}% + \LWR@origscriptsize% \def\LWR@singledollarstyle{% height:\LWR@convertto{em}{\the\LWR@singledollarheight }em% }% @@ -8780,7 +8841,6 @@ autopage-\theLWR@currentautosec% \boolfalse{LWR@minipagethispar} \RenewDocumentEnvironment{minipage}{O{t} o O{t} m} {% -\uselengthunit{PT}% \begingroup \setlength{\LWR@minipagewidth}{#4}% \ifthenelse{\cnttest{\value{LWR@minipagedepth}}{=}{0}}{% @@ -8790,7 +8850,7 @@ autopage-\theLWR@currentautosec% \setlength{\textwidth}{6in}% \setlength{\textheight}{9in}% }{}% -\LWR@traceinfo{computed width is \rndprintlength{\LWR@minipagewidth}}% +\LWR@traceinfo{computed width is \LWR@printlength{\LWR@minipagewidth}}% \setlength{\LWR@minipageheight}{\textheight}% default unless specified \IfValueT{#2}{\setlength{\LWR@minipageheight}{#2}}% \addtocounter{LWR@minipagedepth}{1}% @@ -8811,17 +8871,16 @@ autopage-\theLWR@currentautosec% \ifthenelse{\equal{#3}{c}}{\LWR@origmbox{justify-content:center} ; }{}% \ifthenelse{\equal{#3}{b}}{\LWR@origmbox{justify-content:flex-end} ; }{}% \ifthenelse{\equal{#3}{s}}{\LWR@origmbox{justify-content:space-between} ; }{}% -\LWR@traceinfo{minipage: about to print the width of \rndprintlength{\LWR@minipagewidth}}% -\uselengthunit{PT}% +\LWR@traceinfo{minipage: about to print the width of \LWR@printlength{\LWR@minipagewidth}}% \ifbool{LWR@minipagefullwidth}% {\boolfalse{LWR@minipagefullwidth}}% {% \ifthenelse{\lengthtest{#4}=\linewidth}% {}% - {width:\rndprintlength{\LWR@minipagewidth} ; }% + {width:\LWR@printlength{\LWR@minipagewidth} ; }% }% \LWR@traceinfo{minipage: about to print the height}% -\IfValueT{#2}{height:\rndprintlength{\LWR@minipageheight} ; }% +\IfValueT{#2}{height:\LWR@printlength{\LWR@minipageheight} ; }% "}% \setlength{\linewidth}{#4}% the original width @@ -8878,11 +8937,10 @@ autopage-\theLWR@currentautosec% \ifstrequal{#3}{r}{\def\LWR@align{right}}{}% \ifstrequal{#3}{s}{\def\LWR@align{justify}}{}% \setlength{\LWR@tempwidth}{#2}% - \uselengthunit{PT}% \InlineClass[% \LWR@origmbox{display:inline-block} ; % \LWR@origmbox{text-align}:\LWR@align\ ; % - width:\rndprintlength{\LWR@tempwidth}% + width:\LWR@printlength{\LWR@tempwidth}% ]% {makebox}% {#4}% @@ -8908,9 +8966,8 @@ autopage-\theLWR@currentautosec% } \newcommand*{\LWR@blackborderpadding}{% -\uselengthunit{PT}% -border:\rndprintlength{\LWR@atleastonept} solid black ; % -padding:\rndprintlength{\fboxsep}% +border:\LWR@printlength{\LWR@atleastonept} solid black ; % +padding:\LWR@printlength{\fboxsep}% } \let\LWRprint@fbox\fbox \newcommand{\LWRhtml@fbox}[1]{% @@ -8939,9 +8996,8 @@ padding:\rndprintlength{\fboxsep}% \IfValueT{#2}{\setlength{\LWR@tempheight}{#2}}% \begin{BlockClass}[% \LWR@blackborderpadding ; % -\uselengthunit{PT}% -\IfValueT{#2}{height:\rndprintlength{\LWR@tempheight} ; }% -width:\rndprintlength{\LWR@tempwidth}% +\IfValueT{#2}{height:\LWR@printlength{\LWR@tempheight} ; }% +width:\LWR@printlength{\LWR@tempwidth}% ]{fminipage}% } {% @@ -9197,10 +9253,9 @@ width:\rndprintlength{\LWR@tempwidth}% \renewcommand*{\LARGE}{} \renewcommand*{\huge}{} \renewcommand*{\Huge}{} +\DeclareDocumentCommand{\onecolumn}{}{} -\renewcommand*{\onecolumn}{} - -\renewcommand{\twocolumn}[1][]{ +\DeclareDocumentCommand{\twocolumn}{O{}}{ #1 @@ -9263,9 +9318,8 @@ width:\rndprintlength{\LWR@tempwidth}% \HTMLunicode{2009}% thin breakable space }% {% - \uselengthunit{PT}% \LWR@htmltagc{% - span style="width:\printlength{\LWR@tempwidth}; % + span style="width:\LWR@printlength{\LWR@tempwidth}; % display:inline-block"% }% \ifbool{FormatWP}{% @@ -9318,23 +9372,22 @@ width:\rndprintlength{\LWR@tempwidth}% }% {\setlength{\LWR@tempheight}{1pt}}{}% \LWR@minipagestoppars% - \uselengthunit{PT}% \LWR@htmltagc{% span style="% \ifbool{FormatWP}{}{background:\LWR@currenttextcolor ; }% - width:\printlength{\LWR@tempwidth} ; % - height:\printlength{\LWR@tempheight} ; % + width:\LWR@printlength{\LWR@tempwidth} ; % + height:\LWR@printlength{\LWR@tempheight} ; % \IfValueT{#1}% {% \setlength{\LWR@tempraise}{0pt-#1}% \setlength{\LWR@tempraise}{\LWR@tempraise*2}% \LWR@orignewline% - -ms-transform: translate(0pt,\printlength{\LWR@tempraise}); % + -ms-transform: translate(0pt,\LWR@printlength{\LWR@tempraise}); % \LWR@orignewline% - -webkit-transform: translate(0pt,\printlength{\LWR@tempraise}); % + -webkit-transform: translate(0pt,\LWR@printlength{\LWR@tempraise}); % \LWR@orignewline% - transform: translate(0pt,\printlength{\LWR@tempraise}); % + transform: translate(0pt,\LWR@printlength{\LWR@tempraise}); % \LWR@orignewline% }% display:inline-block;"% |