diff options
| author | Karl Berry <karl@freefriends.org> | 2017-11-23 21:06:47 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2017-11-23 21:06:47 +0000 |
| commit | a966a76688af35e8f788ba4cd9a98743c496ae73 (patch) | |
| tree | b3095755a2db4ce5e44615e51546a37e76d9f1a4 /Master/texmf-dist | |
| parent | 03faaffd813fcdcc0465e974b5120de2690f0f46 (diff) | |
lwarp (23nov17)
git-svn-id: svn://tug.org/texlive/trunk@45895 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
55 files changed, 4711 insertions, 871 deletions
diff --git a/Master/texmf-dist/doc/latex/lwarp/README.txt b/Master/texmf-dist/doc/latex/lwarp/README.txt index f7e3c7f2bf3..306b0696cd9 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.43 README.txt +LaTeX lwarp package v0.44 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 c408ff9b98b..151a46223c9 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/doc/latex/lwarp/lwarp_tutorial.txt b/Master/texmf-dist/doc/latex/lwarp/lwarp_tutorial.txt index 51d216224df..3fb1091b44a 100644 --- a/Master/texmf-dist/doc/latex/lwarp/lwarp_tutorial.txt +++ b/Master/texmf-dist/doc/latex/lwarp/lwarp_tutorial.txt @@ -39,6 +39,7 @@ \setcounter{FileDepth}{1} % Split \HTML\ files at sections \booltrue{CombineHigherDepths} % Combine parts/chapters/sections \setcounter{SideTOCDepth}{1} % Include subsections in the side\TOC +\HTMLTitle{Webpage Title} % Overrides \title for the web page. \HTMLAuthor{Some Author} % Sets the HTML meta author tag. \HTMLLanguage{en-US} % Sets the HTML meta language. \HTMLDescription{A description.}% Sets the HTML meta description. diff --git a/Master/texmf-dist/scripts/lwarp/lwarpmk.lua b/Master/texmf-dist/scripts/lwarp/lwarpmk.lua index c813ebfe66a..2521fa2524b 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.43" +printversion = "v0.44" 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 d95b653aa2e..1c3a06be7f0 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> [2017/11/08 v0.43 Allows LaTeX to directly produce HTML5 output.] +%<package> [2017/11/22 v0.44 Allows LaTeX to directly produce HTML5 output.] % %<*driver> \documentclass{ltxdoc} @@ -270,12 +270,13 @@ Keywords={LaTeX, HTML, conversion}% \newcommand{\goesto}{$\Rightarrow$} -\newcommand{\credits}[1]{{\footnotesize(\textit{Based on original code by} \textsc{#1}.)}} +\newcommand{\credits}[1]{{\footnotesize(\textit{Emulates or patches code by} \textsc{#1}.)}} \newcommand{\codehtml}{\leavevmode\marginpar{\footnotesize\raggedleft\textcolor{codecolor}{\textbf{for HTML output:~}}}\vspace{-5.25ex}} \newcommand{\codeprint}{\leavevmode\marginpar{\footnotesize\raggedleft\textcolor{codecolor}{\textbf{for PRINT output:~}}}\vspace{-5.25ex}} \newcommand{\codeall}{\leavevmode\marginpar{\footnotesize\raggedleft\textcolor{codecolor}{\textbf{for HTML \& PRINT:~}}}\vspace{-5.25ex}} +\newcommand*{\testthis}{\textcolor{blue}{Please send bug reports!}\watchout[Not yet tested!]} \newcommand{\userentry}[1]{% \par @@ -311,10 +312,10 @@ Keywords={LaTeX, HTML, conversion}% \newenvironment{docsidebar}[1][] {% -\ifthenelse{\isempty{#1}}{}{\medskip}% +\ifblank{#1}{}{\medskip}% \hfill\minipage{.9\linewidth}% \setlength{\parskip}{1.5ex}% -\ifthenelse{\isempty{#1}}{}{\textit{#1}}% +\ifblank{#1}{}{\textit{#1}}% \leavevmode\smallskip\hrule% } {\smallskip\hrule\endminipage\hspace*{\fill}\bigskip} @@ -339,6 +340,12 @@ Keywords={LaTeX, HTML, conversion}% % The following text is used in multiple places in the documentation: +\newcommand{\usedbykomascript}{ +This package may be loaded standalone, but +is also loaded automatically if \pkg{koma-script} classes are in use. +\cs{DeclareDocumentCommand} is used to overwrite the \pkg{koma-script} definitions. +} + \newcommand{\documentationnotes}{ The following sections document the actual implementation of the \pkg{lwarp} package. @@ -674,6 +681,19 @@ as \HTML\ has no concept of page numbers. \limitspfnote } +\newcommand{\limitskomascript}{ +Many features are ignored during the \HTML\ conversion. +The goal is source-level compatibility. + +\cs{titlehead}, \cs{subject}, +\cs{captionformat}, \cs{figureformat}, and \cs{tableformat} are not yet emulated. + +\testthis + +Some features have not yet been tested. +Please contact the author with any bug reports. +} + \newcommand{\limitsverse}{% \DescribeMacro{\attrib} The documentation for the \pkg{verse} and \pkg{memoir} packages suggest @@ -1328,6 +1348,20 @@ are above or below the delimiter: \end{sourcedisplay} } +\newcommand{\limitsmarginpars}{% +\DescribeMacro{\marginpar} \oarg{left} \marg{right} +\qquad +\cs{marginpar} may contains paragraphs, but in order to remain inline with +the surrounding text \pkg{lwarp} nullifies block-related macros inside the +\cs{marginpar}. Paragraph breaks are converted to \element{br /} tags. + +\DescribeMacro{\marginparBlock} \oarg{left} \marg{right} +\qquad +To include block-related macros, use \cs{marginparBlock}, which takes the +same arguments but creates a \element{div} instead of a \element{span}. +A line break will occur in the text where the \cs{marginBlock} occurs. +} + \newcommand{\limitssaveboxes}{% \LaTeX\ boxes are placed inline and do not allow line breaks, so boxes with long contents may overflow the line during \HTML\ conversion. @@ -1611,10 +1645,10 @@ changes do not affect the \HTML\ output. \newcommand{\limitsnewclude}{% \pkg{newclude} modifies \cs{label} in a non-adaptive way, so -\pkg{newclude} must be loaded before \pkg{lwarp} is loaded. +\pkg{newclude} must be loaded before \pkg{lwarp} is loaded: \watchout[loading] -\begin{docsidebar}[Ex:] +\begin{docsidebar} \raggedright \cs{documentclass\{article\}} \\ \ldots <font setup> \\ @@ -1625,15 +1659,24 @@ changes do not affect the \HTML\ output. } \newcommand{\limitstodonotes}{% -\pkg{todonotes} and \pkg{luatodonotes} are only emulated as if they were loaded -with the \texttt{disable} option. -All functions are disabled, but source compatibility is provided -with the print version. +The documentation for \pkg{todonotes} and \pkg{luatodonotes} have an +example with a todo inside a caption. If this example does not work +it will be necessary to move the todo outside of the caption. +} + +\newcommand{\limitsfixme}{% +External layouts (\cs{fxloadlayouts}) are not supported.\watchout[external layouts] -\pkg{todonotes} and \pkg{luatodonotes} use \pkg{xkeyval}, so if the user's -\watchout[\pkg{xkeyvalue}] -document uses \cs{presetkeys} then \pkg{xkeyval} will have -to be loaded explictly by the user's document. +User control is provided for setting the \HTML\ styling of the ``faces''. +The defaults are as follows, and may be changed in the preamble after +\pkg{fixme} is loaded: +\begin{sourcedisplay} +\cs{def}\cs{FXFaceInlineHTMLStyle}\{font-weight:bold\} \\ +\cs{def}\cs{FXFaceEnvHTMLStyle}\{font-weight:bold\} \\ +\cs{def}\cs{FXFaceSignatureHTMLStyle}\{font-style:italic\} \\ +\cs{def}\cs{FXFaceTargetHTMLStyle}\{font-style:italic\} +\end{sourcedisplay} +\bigskip } \newcommand{\limitsnewtxmath}{% @@ -1693,7 +1736,7 @@ This boolean may be tested by the user for later use. %<*package> % \fi % -% \CheckSum{14970} +% \CheckSum{16359} % % \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 @@ -1778,6 +1821,7 @@ This boolean may be tested by the user for later use. % \changes{v0.41}{2017/10/07}{\ 2017/10/07} % \changes{v0.42}{2017/10/30}{\ 2017/10/30} % \changes{v0.43}{2017/11/08}{\ 2017/11/08} +% \changes{v0.44}{2017/11/22}{\ 2017/11/22} @@ -1839,7 +1883,7 @@ This boolean may be tested by the user for later use. % % A modular package-loading system uses the \pkg{lwarp} version of a package for % \HTML\ when available. -% More than a hundred \LaTeX\ packages are supported with these high-level source +% Almost two hundred \LaTeX\ packages are supported with these high-level source % compatibility replacements, and many others work as-is. % % A tutorial is provided to quickly introduce the user to the major components @@ -1857,7 +1901,7 @@ This boolean may be tested by the user for later use. % % \noindent % \textcolor{red!30!black}{\bfseries -% Note that this is still an ``alpha'' version of \pkg{lwarp}, +% Note that this is still a ``beta'' version of \pkg{lwarp}, % and some things may change in response to user feedback and % further project development. % } @@ -1962,6 +2006,35 @@ This boolean may be tested by the user for later use. % For a detailed list of changes, see the Change History on page \pageref{sec:changehistory}. % % \begin{description} +% \item[v0.44:] \ +% \begin{itemize} +% \item Added \pkg{koma-script} classes (except \pkg{scrlttr2}, \pkg{scrjura}). +% \margintag{\pkg{koma-script}} +% \item Added \pkg{scrextend}, +% \pkg{scrlayer}, \pkg{scrlayer-notecolumn}, \pkg{scrlayer-scrpage}, +% \pkg{scrhack}, \pkg{tocstyle}, \pkg{tocbasic}. +% \item Added \cs{HTMLTitle}. +% \margintag{HTML title and author} +% Fixed web page title if \cs{HTMLTitle} empty and no \cs{title} given and +% not using \pkg{titling} package. +% \item Fixed web page author if \cs{HTMLauthor} is empty and \cs{author} is not given. +% \item If using |pdflatex|, automatically loads T1 and UTF8 encodings. +% \margintag{encodings} +% (Additional \pkg{fontenc} encodings may be loaded after \pkg{lwarp}.) +% \item Added \env{list} and \env{trivlist} environments, \pkg{hang}.\margintag{lists} +% \item Fix: \cs{multicolumn} alignment if formatting for a word processor. +% \margintag{tabular} +% \item Added \pkg{ltxtable}. +% \item Fix: MathJax combined with \env{lateximage}s.\margintag{math} +% \item \pkg{algorithmicx}: Improved comment symbol and floating. +% \item Completed \pkg{todonotes} and \pkg{luatodonotes}. +% \margintag{\pkg{packages}} +% \item Added \pkg{todo}, \pkg{easy-todo}, \pkg{fixmetodonotes}, \pkg{fixme}. +% \item Added \pkg{soulutf8}, \pkg{soulpos}, \pkg{cancel}. +% \item Added \pkg{section}, \pkg{fancyref}, \pkg{ifoddpage}. +% \item Added \pkg{preview}, \pkg{atbegshi}, \pkg{watermark}. +% \item Improved \pkg{tocloft} \cs{newlistof} and \cs{newlistentry}. +% \end{itemize} % \item[v0.43:] \ % \begin{itemize} % \item Docs: Reorganized \HTML\ customization, added an \HTML\ settings table. @@ -2598,8 +2671,7 @@ This boolean may be tested by the user for later use. % % Enough functionality is provided to convert a typical article containing technical content. % Not every package has been tested, but many of the most useful ones are known to work, -% either as-is or through emulation with replacement code. (See \cref{tab:supported} on -% page \pageref{tab:supported}.) +% either as-is or through emulation with replacement code. (See \cref{tab:supported}.) % % Assistance is provide for modifying the \HTML\ output to suite the creation % of \EPUB\ documents, and for modifying the \HTML\ output to ease import into @@ -2611,7 +2683,8 @@ This boolean may be tested by the user for later use. % \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.} % -% Supported classes include \pkg{book}, \pkg{report}, and \pkg{article}. +% Supported classes include \pkg{book}, \pkg{report}, and \pkg{article}, +% and the Koma-script classes \pkg{scrbook}, \pkg{scrreprt}, and \pkg{scrartcl}. % \pkg{memoir} is planned, but in the meantime many of the packages % used by \pkg{memoir} are already supported. % @@ -2642,24 +2715,32 @@ This boolean may be tested by the user for later use. % % \midrule % -% Classes: & \pkg{book}, \pkg{report}, or \pkg{article}. \pkg{memoir} is planned. \\ +% Classes: & \pkg{book}, \pkg{report}, \pkg{article}, +% \pkg{scrbook}, \pkg{scrreprt}, \pkg{scrartcl}. \pkg{memoir} is planned. \\ +% +% Koma-script: & \pkg{scrextend}, \pkg{scrlayer}, \pkg{scrhack}. +% Others as listed below. \\ % % \midrule % % Page layout: & Emulates \pkg{geometry}, \pkg{fancyhdr}, \pkg{titleps}, +% \pkg{scrlayer-scrpage}, \pkg{typearea}, % \pkg{addlines}, \pkg{anysize}, \pkg{a4}, \pkg{a4wide}, \pkg{a5comb}, -% \pkg{textarea}, \pkg{zwpagelayout}, \pkg{typearea}, \pkg{ebook}. \\ +% \pkg{textarea}, \pkg{zwpagelayout}, \pkg{ebook}, +% \pkg{preview}, +% \pkg{draftwatermark}, \pkg{watermark}, +% \pkg{everyshi}, \pkg{atbegshi}. \\ % % Sectioning: & Supported, with hyperlinks. -% Honors \cmds{tocdepth} and \cmds{secnumdepth}. % 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}, +% Emulates \pkg{titlesec}, \pkg{fncychap}, \pkg{sectsty}, \pkg{section}, % \pkg{anonchap}, \pkg{quotchap}. \\ % % Table of contents, figures, tables: & Supported, with hyperlinks. -% Supports \pkg{tocbibind}. Emulates \pkg{titletoc} and \pkg{tocloft}. \\ +% Supports \pkg{tocbibind}. Emulates \pkg{titletoc}, \pkg{tocloft}, +% \pkg{tocbasic}, and \pkg{tocstyle}. \\ % % Title page: & \cs{maketitle}, \env{titlepage}, \pkg{titling}, \pkg{authblk}. \\ % @@ -2674,13 +2755,14 @@ This boolean may be tested by the user for later use. % \midrule % % Cross-references: & Emulated, with hyperlinks. -% \pkg{hyperref}, \pkg{cleveref}, \pkg{varioref}, \pkg{url}, \pkg{breakurl}. \\ +% \pkg{hyperref}, \pkg{cleveref}, \pkg{varioref}, \pkg{fancyref}, +% \pkg{url}, \pkg{breakurl}. \\ % % Languages: & \pkg{babel}. (\pkg{polyglossia} is untested.) \\ % % \midrule % -% Margin notes: & \pkg{marginfit}, \pkg{marginfix}. \\ +% Margin notes: & \pkg{marginfit}, \pkg{marginfix}, \pkg{scrlayer-notecolumn}. \\ % % Footnotes: & Adds \cmds{FootnoteDepth} to print footnotes at section breaks. % \pkg{footnote}, \pkg{footmisc}, @@ -2714,7 +2796,7 @@ This boolean may be tested by the user for later use. % Tabular & % \env{tabular} environment, \pkg{array}, \pkg{tabularx}, \pkg{tabulary}, % \pkg{threeparttable}, \pkg{multirow}, -% \pkg{longtable}, \pkg{supertabular}, \pkg{xtab}, +% \pkg{longtable}, \pkg{supertabular}, \pkg{xtab}, \pkg{ltxtable}, % \pkg{booktabs}. \\ % % \midrule @@ -2743,16 +2825,14 @@ This boolean may be tested by the user for later use. % \midrule % % Lists: & Standard \LaTeX\ environments are supported, along with -% \pkg{enumitem}, \pkg{enumerate}, \pkg{paralist}. -% Spacing is still controlled by \CSS. \\ +% \pkg{enumitem}, \pkg{enumerate}, \pkg{paralist}, \pkg{hang}.\\ % % \midrule % % Environments: & Standard \LaTeX{} environments are supported. \\ % % \env{minipage}: & Supported with some \HTMLfive-imposed limitations. -% Nested minipages are supported. -% Footnotes appear at the bottom of the \HTML\ page. \\ +% Nested minipages are supported. \\ % % Quotations: & \pkg{verse}, \pkg{csquotes}, \pkg{epigraph} \\ % @@ -2768,11 +2848,16 @@ This boolean may be tested by the user for later use. % % \midrule % +% Todo: & \pkg{todo}, \pkg{todonotes}, \pkg{easy-todo}, \pkg{fixmetodonotes}, \pkg{fixme}. \\ +% +% \midrule +% % Direct formatting: & \cs{emph}, \cs{textsuperscript}, % \cs{textbf}, etc are supported. % \cs{bfseries}, etc.\ are not yet supported. -% \pkg{lettrine}, \pkg{ulem}, \pkg{soul}, \pkg{relsize}, \pkg{scalefnt}, -% and \pkg{realscripts} are supported. \\ +% \pkg{lettrine}, \pkg{ulem}, \pkg{soul}, \pkg{soulutf8}, \pkg{soulpos}, \pkg{cancel}, +% \pkg{relsize}, \pkg{scalefnt}, +% and \pkg{realscripts} are supported. \\ % % Ordinals: & \pkg{nth}, \pkg{fmtcount}, and \pkg{engord} are supported. \\ % @@ -2847,13 +2932,13 @@ This boolean may be tested by the user for later use. % % \subsection{TeX4ht} % -% \url{http://tug.org/tex4ht/}\DescribeProgram{TeX4ht} +% \url{http://tug.org/tex4ht/}\DescribeProgram{TeX4ht}\DescribeProgram{htlatex} % % This system uses native \LaTeX{} processing to produce a DVI file containing special commands, % and then uses additional post-processing for the \HTML\ conversion by way of numerous configuration % files. -% In some cases, \pkg{lwarp} provides a better \HTML\ conversion, and it -% supports a different set of packages. +% In most cases, \pkg{lwarp} provides a better \HTML\ conversion, +% while supporting more packages. % TeX4ht produces several other forms of output beyond \HTML. % % \subsection{Translators} @@ -3907,9 +3992,16 @@ This boolean may be tested by the user for later use. % % \pkg{lwarp} uses |pdftotext| to convert \PDF\ output into UTF-8-encoded % text. This process requires that UTF-8 information be embedded in the \PDF\ -% file, which usually prevents the use of bit-mapped fonts. +% file, which usually prevents the use of older bit-mapped fonts. % \index{font>bitmapped} % +% While using |pdflatex|, +% \margintag{pdflatex, T1, UTF8} +% \pkg{fontspec} is automatically loaded with T1 encoding, +% and \pkg{inputenc} is automatically loaded with UTF8 encoding, each of which +% is required for the conversion process. +% \pkg{fontspec} may be loaded with an additional encoding after \pkg{lwarp}. +% % While using |pdflatex|, if no font-related package is specified, the default % \margintag{vector fonts} % bit-mapped Computer Modern font is used, @@ -4043,7 +4135,8 @@ This boolean may be tested by the user for later use. % \end{table} % % -% \pkg{lwarp} supports |book|, |report|, and |article| classes. +% \pkg{lwarp} supports \pkg{book}, \pkg{report}, and \pkg{article} classes, +% as well as the equivalent Koma-script classes. % % Load the \pkg{lwarp} package immediately after the font and UTF-8 setup commands. % \changes{v0.16}{2016/04/08}{Docs: Moved location of \cs{usepackage\{lwarp\}}.} @@ -4121,7 +4214,8 @@ This boolean may be tested by the user for later use. % \cs{abstractname} & The name of the abstract. \\ % \cs{CSSFilename} & The \CSS\ for the following files. \\ % \cs{HTMLLanguage} & The |html lang| tag. \\ -% \cs{HTMLAuthor} & The \HTML\ |author| meta tag. \\ +% \cs{HTMLTitle} & The \HTML\ |title| meta tag, overriding \cs{title}. \\ +% \cs{HTMLAuthor} & The \HTML\ |author| meta tag, overriding \cs{author}. \\ % \cs{HTMLDescription} & The \HTML\ |description| meta tag. \\ % \cs{HTMLFirstPageTop} & Heading for the home page. \\ % \cs{HTMLPageTop} & Heading for the other pages. \\ @@ -4297,7 +4391,7 @@ This boolean may be tested by the user for later use. % % \end{description} % -% +% \needspace{2\baselineskip} % \item[Placed before \texttt{\cs{begin}\{document\}}, % or before any sectioning command which causes a file break:] \ % @@ -4319,9 +4413,20 @@ This boolean may be tested by the user for later use. % The \HTML\ file's |html lang| meta tag. % Defaults to |en-US|. % +% \ItemDescribeMacro{\HTMLTitle} \marg{title} \DescribeDefault{\cs{thetitle}} \quad +% Overrides \cs{title} for the \HTML\ header's meta title. +% Defaults to \cs{thetitle}, which is set by \cs{title}, or empty otherwise. +% Unlike the author, \cs{thetitle} is set by \cs{title} even if not using the \pkg{titling} package. +% % \ItemDescribeMacro{\HTMLAuthor} \marg{author} \DescribeDefault{\cs{theauthor}} \quad % The \HTML\ header's meta author. -% Defaults to \cs{theauthor}. +% Defaults to \cs{theauthor}, +% which is set by \cs{author} if using the \pkg{titling} package, +% but is empty otherwise. +% There are several ways to represent the author and affiliations, +% especially if using the \pkg{authblk} package, most of which do not result in +% a sensible \cs{theauthor}, so \cs{HTMLAuthor} is useful to create a list of +% authors without their affiliations. % % \ItemDescribeMacro{\HTMLDescription} \marg{description} \DescribeDefault{<empty>} \quad % Sets the \HTML\ \attribute{description} tag for @@ -4608,8 +4713,8 @@ This boolean may be tested by the user for later use. % \date{Optional date} % \end{Verbatim} % -% The title is used in the meta tags in the \HTML\ files, and the rest are used -% in |\maketitle|. +% The title is used in the meta tags in the \HTML\ files, +% unless overridden by \cs{HTMLTitle}, and the rest are used in |\maketitle|. % To use a \cs{subtitle} or \cs{published} field, see \cref{sec:publishedsubtitle}. % % @@ -4627,18 +4732,24 @@ This boolean may be tested by the user for later use. % additional information may be included as well. % % \DescribeMacro{\title} \marg{title} - +% % Avoid newlines in the |\title|; these will interfere with the % file break and \CSS\ detection. % \watchout % Use a |\subtitle| command instead (\cref{sec:publishedsubtitle}). -% In \HTML, the title will appear in a heading \element{h1}. +% The title will appear in the document \cs{maketitle} as a heading \element{h1}. +% The \HTML\ meta |title| tag will also have this title, unless \cs{HTMLTitle} +% is used to set the meta title to something else instead. % % \DescribeMacro{\author} \marg{author} % % In |\author|, use |\protect| before formatting commands such as |\textsc|. % \watchout -% In \HTML, the author will appear in a \element{div} class |author|. +% In \HTML, the author will appear in a \element{div} of class |author| in the +% \cs{maketitle}. +% If the \pkg{titling} package is used, the author will also appear in a \HTML\ meta tag, but +% \cs{HTMLAuthor} may be necessary to create a plain list of names if +% \cs{author} had affiliations added. % \cs{affiliation} is a new addition to \pkg{lwarp}. % % \DescribeMacro{\date} \marg{date} @@ -4684,6 +4795,17 @@ This boolean may be tested by the user for later use. % \hspace*{1em} |\HTMLDescription{}| % % +% \subsection{HTML page meta title} +% +% \index{HTML>meta tag>title} +% \index{title>HTML meta tag} +% \index{meta tag, HTML>title} +% \DescribeMacro{\HTMLTitle} \marg{title} \quad Sets the contents +% of the web page \element{meta name="title"} element. +% Defaults to |\HTMLtitle{\thetitle}|. +% May be set empty to cancel the meta title tag. +% +% % \subsection{HTML page meta author} % % \index{HTML>meta tag>author} @@ -4694,6 +4816,11 @@ This boolean may be tested by the user for later use. % Defaults to |\HTMLAuthor{\theauthor}|. % May be set empty to cancel the meta author tag. % +% \cs{author} may be used to create a list of authors and their affiliations, +% in several formats if using \pkg{authblk}, and these may not successfully parse +% properly into a sensible list for \cs{theauthor}. +% \cs{HTMLAuthor} may be used to set the meta tag to a simple list of names. +% % % \subsection{Modifying \protect\texttt{xindy} index processing} % \label{sec:modifyxindy} @@ -4785,7 +4912,7 @@ This boolean may be tested by the user for later use. % \index{item>empty}\index{list item, empty} % % -% \subsubsection{Filenames in lists} +% \subsubsection{Filenames and URLs in lists or footnotes} % % \index{underscore>filename}\index{file>underscore} % \changes{v0.24}{2017/03/13}{Docs: Filename underscore.} @@ -4803,6 +4930,9 @@ This boolean may be tested by the user for later use. % % \subsection{Boxes and minipages} % +% \subsubsection{Marginpars} +% +% \limitsmarginpars % % \subsubsection{Save Boxes} % @@ -5167,6 +5297,11 @@ This boolean may be tested by the user for later use. % \limitskeyfloat % % +% \subsection{Koma-Script} +% +% \limitskomascript +% +% % \subsection{Miscellaneous} % % @@ -5191,16 +5326,15 @@ This boolean may be tested by the user for later use. % % \limitsbabeltwo % -% -% \needspace{5\baselineskip} % -% \subsubsection{\pkg{todonotes} package} +% \subsubsection{\pkg{todonotes} and \pkg{luatodonotes} packages} % -% \DescribePackage{todonotes} % \limitstodonotes % % +% \subsubsection{\pkg{fixme}} % +% \limitsfixme % % % \clearpage @@ -5820,12 +5954,14 @@ This boolean may be tested by the user for later use. % \item [Tabular problems:] See \cref{sec:limitstabular}. % % \item [Obscure error messages:] ~ -% \begin{itemize} -% \item Be sure that a print version of the document compiles and -% that your document's \LaTeX{} code is correct, before attempting -% to generate an \HTML\ version. -% % \begin{description} +% \item [Print first:] Be sure that a print version of the document compiles and +% that your document's \LaTeX{} code is correct, before attempting +% to generate an \HTML\ version. +% +% \item [``Missing \$ inserted.'':] If using a filename or URL in a +% footnote or \cs{item}, escape underscores with \cs{\_}. +% % \item [``Leaders not followed by proper glue'':] This can be caused by % a missing |l@<floattype>| or |l@<sectiontype>| definition. % See \pkg{lwarp}'s definitions for examples. @@ -5838,7 +5974,6 @@ This boolean may be tested by the user for later use. % \end{sourcedisplay} % inside a group first. % \end{description} -% \end{itemize} % % \item [Missing sections:] ~ % \begin{itemize} @@ -5880,13 +6015,6 @@ This boolean may be tested by the user for later use. % selects |\usepackage[warpprint]{lwarp}| instead of |[warpHTML]|. % \end{itemize} -% \item [HTML document contains a single unformatted print -% document:] ~ -% \begin{itemize} -% \item Be sure that the document -% selects |\usepackage[warpHTML]{lwarp}| instead of |[warpprint]|. -% \end{itemize} -% % \item [Images are appearing in strange places:] ~ % \index{images>in strange places} % \begin{itemize} @@ -6109,8 +6237,24 @@ This boolean may be tested by the user for later use. % \end{macrocode} % % +% \section{pdfLaTeX T1 and UTF8 encoding} +% +% When using pdf\LaTeX, \pkg{lwarp} required T1 and UTF8 encoding. +% +% \XeLaTeX\ and Lua\LaTeX\ are both UTF8 by nature. +% +% \changes{v0.44}{2017/11/16}{If pdfLaTeX, require T1 and UTF8 encoding.} +% +% \begin{macrocode} +\ifPDFTeX +\RequirePackage[T1]{fontenc} +\RequirePackage[utf8]{inputenc} +\fi +% \end{macrocode} +% +% % -% \section{Unicode Input Characters} +% \section{Unicode input characters} % \changes{v0.18}{2016/05/17}{PDF Unicode input characters.} % \index{Unicode>input characters} % @@ -6155,9 +6299,11 @@ This boolean may be tested by the user for later use. % \DescribePackage{etoolbox} % Provides |\ifbool| and other functions. % +% \DescribePackage{xpatch} +% Patches macros with optional arguments. % \begin{macrocode} -\RequirePackage{etoolbox}[2011/01/03] -% requires v2.6 for \BeforeBeginEnvironment, etc. +\RequirePackage{etoolbox}[2011/01/03]% v2.6 for \BeforeBeginEnvironment, etc. +\RequirePackage{xpatch} % \end{macrocode} @@ -6581,8 +6727,7 @@ This boolean may be tested by the user for later use. % % % - - +% % \section{Misplaced packages} % % \changes{v0.21}{2017/02/22}{Add: Errors for misplaced packages.} @@ -6680,12 +6825,14 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{afterpage} \LWR@loadafter{algorithmicx} \LWR@loadafter{alltt} +\LWR@loadafter{amsmath} \LWR@loadafter{amsthm} \LWR@loadafter{anonchap} \LWR@loadafter{anysize} \LWR@loadafter{appendix} \LWR@loadafter{arabicfront} \LWR@loadafter{array} +\LWR@loadafter{atbegshi} \LWR@loadafter{authblk} \LWR@loadafter{balance} \LWR@loadafter{bigdelim} @@ -6695,6 +6842,7 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{boxedminipage} \LWR@loadafter{boxedminipage2e} \LWR@loadafter{breakurl} +\LWR@loadafter{cancel} \LWR@loadafter{ccaption} \LWR@loadafter{changepage} \LWR@loadafter{chngpage} @@ -6706,6 +6854,7 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{dblfnote} \LWR@loadafter{dcolumn} \LWR@loadafter{draftwatermark} +\LWR@loadafter{easy-todo} \LWR@loadafter{ebook} \LWR@loadafter{ellipsis} \LWR@loadafter{emptypage} @@ -6718,9 +6867,12 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{extramarks} \LWR@loadafter{fancybox} \LWR@loadafter{fancyhdr} +\LWR@loadafter{fancyref} \LWR@loadafter{fancyvrb} \LWR@loadafter{figcaps} \LWR@loadafter{fix2col} +\LWR@loadafter{fixme} +\LWR@loadafter{fixmetodonotes} \LWR@loadafter{float} \LWR@loadafter{floatflt} \LWR@loadafter{floatpag} @@ -6738,9 +6890,11 @@ For a possible alternative, see package(s) #2.} % \LWR@loadafter{graphics}% pre-loaded by xunicode % \LWR@loadafter{graphicx}% pre-loaded by xunicode \LWR@loadafter{grffile} +\LWR@loadafter{hang} \LWR@loadafter{hyperref} \LWR@loadafter{hyperxmp} \LWR@loadafter{idxlayout} +\LWR@loadafter{ifoddpage} \LWR@loadafter{indentfirst} % inputenc must be loaded before lwarp \LWR@loadafter{keyfloat} @@ -6752,6 +6906,7 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{longtable} \LWR@loadafter{lscape} \LWR@loadafter{ltcaption} +\LWR@loadafter{ltxtable} \LWR@loadafter{luatodonotes} \LWR@loadafter{marginfit} \LWR@loadafter{marginfix} @@ -6785,6 +6940,7 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{pfnote} \LWR@loadafter{placeins} \LWR@loadafter{prelim2e} +\LWR@loadafter{preview} \LWR@loadafter{quotchap} \LWR@loadafter{ragged2e} \LWR@loadafter{realscripts} @@ -6795,6 +6951,12 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{rotfloat} \LWR@loadafter{savetrees} % \LWR@loadafter{scalefnt}% loaded by babel-french +\LWR@loadafter{scrextend} +\LWR@loadafter{scrhack} +\LWR@loadafter{scrlayer} +\LWR@loadafter{scrlayer-notecolumn} +\LWR@loadafter{scrlayer-scrpage} +\LWR@loadafter{section} \LWR@loadafter{sectsty} \LWR@loadafter{setspace} \LWR@loadafter{shadow} @@ -6804,6 +6966,8 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{sidenotes} \LWR@loadafter{siunitx} \LWR@loadafter{soul} +\LWR@loadafter{soulpos} +\LWR@loadafter{soulutf8} \LWR@loadafter{stabular} \LWR@loadafter{subfig} \LWR@loadafter{supertabular} @@ -6820,17 +6984,24 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{titlesec} \LWR@loadafter{titletoc} \LWR@loadafter{titling} +% \LWR@loadafter{tocbasic}% preloaded by koma-script classes \LWR@loadafter{tocbibind} \LWR@loadafter{tocloft} +\LWR@loadafter{tocstyle} +\LWR@loadafter{todo} \LWR@loadafter{todonotes} \LWR@loadafter{transparent} \LWR@loadafter{trivfloat} -\LWR@loadafter{typearea} +% \end{macrocode} +% \changes{v0.44}{2017/11/19}{Adjustment for \pkg{koma-script}.} +% \begin{macrocode} +% \LWR@loadafter{typearea}% preloaded by koma-script classes \LWR@loadafter{ulem} \LWR@loadafter{upref} \LWR@loadafter{varioref} \LWR@loadafter{verse} \LWR@loadafter{wallpaper} +\LWR@loadafter{watermark} \LWR@loadafter{wrapfig} \LWR@loadafter{xcolor} \LWR@loadafter{xfrac} @@ -7091,8 +7262,13 @@ top=1in,bottom=1in,% % \DescribePackage{afterpackage} % Used to patch \pkg{titling} to add \cs{AddSubtitlePublished}. +% Provided by \pkg{scrlfile} or \pkg{afterpackage}. +% \changes{v0.44}{2017/11/19}{Adjustment for \pkg{koma-script}.} % \begin{macrocode} +\@ifundefined{AfterPackage}% +{ \RequirePackage{afterpackage} +}{} % \end{macrocode} % \begin{macrocode} @@ -7697,6 +7873,24 @@ top=1in,bottom=1in,% % \end{macrocode} +% \section{Koma-script} +% +% Load patches to \pkg{koma-script}. +% +% \codehtml +% \begin{macrocode} +\begin{warpHTML} +% \end{macrocode} +% +% \begin{macrocode} +\@ifclassloaded{scrbook}{\RequirePackage{lwarp-patch-komascript}}{} +\@ifclassloaded{scrartcl}{\RequirePackage{lwarp-patch-komascript}}{} +\@ifclassloaded{scrreprt}{\RequirePackage{lwarp-patch-komascript}}{} +% \end{macrocode} +% +% \begin{macrocode} +\end{warpHTML} +% \end{macrocode} % \section{HTML-conversion output modifications} @@ -7955,14 +8149,17 @@ top=1in,bottom=1in,% \let\LWR@orignewline\newline -\LetLtxMacro{\LWR@origitem}{\item} +\LetLtxMacro\LWR@origitem\item + +\AtBeginDocument{% in case packages change definition \LetLtxMacro{\LWR@origitemize}{\itemize} \LetLtxMacro{\LWR@endorigitemize}{\enditemize} \LetLtxMacro{\LWR@origenumerate}{\enumerate} \LetLtxMacro{\LWR@endorigenumerate}{\endenumerate} \LetLtxMacro{\LWR@origdescription}{\description} \LetLtxMacro{\LWR@endorigdescription}{\enddescription} +} \let\LWR@origpar\par @@ -7970,8 +8167,6 @@ top=1in,bottom=1in,% \let\LWR@orig@mpfootnotetext\@mpfootnotetext \let\LWR@origclearpage\clearpage -\let\clearpage\relax -\let\cleardoublepage\relax % \end{macrocode} % \begin{macrocode} @@ -8252,7 +8447,6 @@ a.tocsubtable {margin-left: 2em} a.toctheorem {margin-left: 0em} a.toclstlisting {margin-left: 0em} - body { font-family: "DejaVu Serif", "Bitstream Vera Serif", "Lucida Bright", Georgia, serif; @@ -8402,7 +8596,7 @@ blockquotation p { margin-right: 3em ; } -div.epigraph { +div.epigraph, div.dictum { line-height: 1.2; text-align: left ; padding: 3ex 1em 0ex 1em ; @@ -8415,7 +8609,7 @@ div.epigraph { -div.epigraphsource{ +div.epigraphsource, div.dictumauthor { text-align:right ; margin-left:auto ; /* max-width: 50% ; */ @@ -8424,8 +8618,9 @@ div.epigraphsource{ line-height: 1.2; } -div.epigraph p { padding: .5ex ; margin: 0ex ;} -div.epigraphsource p { padding: .5ex 0ex 0ex 0ex ; margin: 0ex ;} +div.epigraph p, div.dictum p { padding: .5ex ; margin: 0ex ;} +div.epigraphsource p, div.dictumauthor p { padding: .5ex 0ex 0ex 0ex ; margin: 0ex ;} +div.dictumauthor { font-style:italic } /* lettrine package: */ @@ -8519,7 +8714,13 @@ span.paragraph {font-size: 1em ; font-variant: normal ; span.subparagraph {font-size: 1em ; font-variant: normal ; margin-right: 1em ; } - +div.minisec { + font-family: "DejaVu Sans", "Bitstream Vera Sans", + Geneva, Verdana, sans-serif ; + font-style: normal ; + font-weight: bold ; + text-align: left ; +} /* Title of the file */ h1 { @@ -8571,7 +8772,7 @@ div.titlepage { border-top: 1px solid silver ; } -.marginpar { +.marginpar, .marginparblock { max-width:50%; float:right; text-align:left; @@ -8585,7 +8786,7 @@ div.titlepage { .marginpar br { margin-bottom: 2ex ; } -div.marginblock { +div.marginblock, div.marginparblock { max-width:50%; float:right; text-align:left; @@ -8594,14 +8795,19 @@ div.marginblock { overflow-x: auto; } -div.marginblock div.minipage { +div.marginblock div.minipage, +div.marginparblock div.minipage { display: block ; margin: 0pt auto 0pt auto ; } -div.marginblock div.minipage p { font-size: 85%} +div.marginblock div.minipage p , +div.marginparblock div.minipage p + { font-size: 85%} -div.marginblock br { margin-bottom: 2ex ; } +div.marginblock br , +div.marginparblock br + { margin-bottom: 2ex ; } section.textbody div.footnotes{ @@ -8905,14 +9111,14 @@ dl dt { dl dd p { margin-top: 0em; } -nav.toc, nav.lof, nav.lot, nav.lol, nav.lothm { +nav { font-family: "URW Classico", Optima, "Linux Biolinum O", "DejaVu Sans", "Bitstream Vera Sans", Geneva, Verdana, sans-serif ; margin-bottom: 4ex ; } -nav.toc p, nav.lof p, nav.lot p, nav.lol p, nav.lothm p { +nav p { line-height: 1.2 ; margin-top:.5ex ; margin-bottom:.5ex; @@ -9627,7 +9833,7 @@ span.abstractrunintitle{ } -div.epigraph { +div.epigraph, div.dictum { background: #f5f5eb ; background-image: linear-gradient(to bottom, #f5f5eb, #C8C8B8); @@ -9710,7 +9916,9 @@ div.fboxBlock div.minipage { box-shadow: none ; } figure.figure .minipage, figcaption .minipage { border: none; } -div.marginblock div.minipage { border: none; } +div.marginblock div.minipage , +div.marginparblock div.minipage + { border: none; } figure , div.marginblock { background-color: #eeeee7 ; @@ -10232,7 +10440,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.43" +printversion = "v0.44" function printhelp () print ("lwarpmk: Use lwarpmk -h or lwarpmk --help for help.") ; @@ -10983,7 +11191,7 @@ end -- not --version % \begin{macro}{\LWR@setexparray} \marg{name} \marg{index} \marg{contents} % \begin{macrocode} \NewDocumentCommand{\LWR@setexparray}{m m m}{% -\ifthenelse{\isempty{#3}}% +\ifstrempty{#3}% {\csdef{#1#2}{}}% {\expandafter\edef\csname #1#2\endcsname{\expandonce#3}}% } @@ -11191,7 +11399,7 @@ end -- not --version \equal{\LWR@tempone}{index}% }% {% - \LWR@traceinfo{prefixing the index name with an underscore.}% + \LWR@traceinfo{Prefixing the index name with an underscore.}% \_#1.html% }% % \end{macrocode} @@ -11312,9 +11520,9 @@ end -- not --version % \begin{macrocode} \newcommand*{\LWR@closeoneprevious}{% -\LWR@closeone{} +\LWR@closeone -\popclose{} +\popclose } % \end{macrocode} @@ -11329,7 +11537,8 @@ end -- not --version % \end{macrocode} % Close anything nested deeper than the desired depth: % \begin{macrocode} -\whiledo{\not\(\LWR@closedepthone<#1\)}{\LWR@closeoneprevious} +\whileboolexpr{not test{\ifnumcomp{\LWR@closedepthone}{<}{#1}}}% + {\LWR@closeoneprevious} } % \end{macrocode} % \end{macro} @@ -11574,6 +11783,7 @@ end -- not --version % % \changes{v0.20}{2016/12/24}{Fix: Minipages inside a span.} % \changes{v0.34}{2017/07/29}{Fix: Minipages, BlocksClass, and lists inside a span.} +% \changes{v0.44}{2017/11/15}{Added \env{list} and \env{trivlist}.} % % \begin{macrocode} \newcommand*{\LWR@nestspanitem}{% @@ -11584,7 +11794,7 @@ end -- not --version \newenvironment*{LWR@nestspan} {% \LWR@traceinfo{LWR@nestspan}% -\ifthenelse{\cnttest{\value{LWR@lateximagedepth}}{>}{0}}% +\ifnumcomp{\value{LWR@lateximagedepth}}{>}{0}% {% \LWR@traceinfo{LWR@nestspan: inside a lateximage}% }% @@ -11595,22 +11805,14 @@ end -- not --version \RenewDocumentEnvironment{BlockClass}{o m}{}{}% \renewcommand{\BlockClassSingle}[2]{##2}% \renewcommand{\LWR@forcenewpage}{}% - \renewcommand{\LWR@itemizestart}{% - \let\item\LWR@nestspanitem% - }% - \renewcommand{\LWR@itemizeend}{}% - \renewcommand{\LWR@enumeratestart}{% - \let\item\LWR@nestspanitem% - }% - \renewcommand{\LWR@enumerateend}{}% - \renewcommand{\LWR@descriptionstart}{% + \renewcommand{\LWR@liststart}{% \let\item\LWR@nestspanitem% }% - \renewcommand{\LWR@descriptionend}{}% + \renewcommand{\LWR@listend}{\LWR@htmltagc{br /}\LWR@htmltagc{br /}}% }% not in a lateximage }% starting env {% ending env -\ifthenelse{\cnttest{\value{LWR@lateximagedepth}}{>}{0}}% +\ifnumcomp{\value{LWR@lateximagedepth}}{>}{0}% {}% {\addtocounter{LWR@spandepth}{-1}}% \LWR@traceinfo{LWR@nestspan: done}% @@ -11730,7 +11932,7 @@ end -- not --version \newcommand{\LWR@htmlblockcomment} {% -\begingroup\catcode`\_=12% +\begingroup\catcode`\_=12 \LWR@htmlblockcommentb% } % \end{macrocode} @@ -11760,15 +11962,11 @@ end -- not --version % \changes{v0.34}{2017/08/02}{Moved optional argument in front of mandatory.} % % \begin{macrocode} -\NewDocumentCommand{\LWR@subhtmlelementclass}{m o m}{% +\NewDocumentCommand{\LWR@subhtmlelementclass}{m O{} m}{% \LWR@traceinfo{LWR@subhtmlelementclass #1 #3}% -\IfValueTF{#2}% -{% option - \ifthenelse{\equal{#2}{}}% - {\LWR@htmltag{#1 class="#3"}}% empty option - {\LWR@htmltag{#1 class="#3" style="#2"}}% non-empty option -}% option -{\LWR@htmltag{#1 class="#3"}}% no option +\ifblank{#2}% +{\LWR@htmltag{#1 class="#3"}}% empty option +{\LWR@htmltag{#1 class="#3" style="#2"}}% non-empty option \LWR@traceinfo{LWR@subhtmlelementclass done}% } % \end{macrocode} @@ -11976,10 +12174,10 @@ end -- not --version \LWR@stoppars% \ifbool{FormatWP}% {% - \LWR@maybeincthisfloat% + \LWR@maybeincthisautoid% \LWR@htmltag{% div class="#3" % - id="autofloat-\arabic{LWR@thisfloat}"% + id="autoid-\arabic{LWR@thisautoid}"% \ifblank{#1}{}{ style="#1"}% }% }% FormatWP @@ -12127,9 +12325,9 @@ end -- not --version % See if have already started a \env{lateximage} or a \element{span}. % If so, do not generate nested paragraph tags. % \begin{macrocode} - \ifthenelse{% - \cnttest{\value{LWR@lateximagedepth}}{>}{0} \OR% - \cnttest{\value{LWR@spandepth}}{>}{0}% + \ifboolexpr{ + test {\ifnumcomp{\value{LWR@lateximagedepth}}{>}{0}} or + test {\ifnumcomp{\value{LWR@spandepth}}{>}{0}} }% nested par tags? % \end{macrocode} % If so: Do nothing if already started a \env{lateximage} page. Cannot nest a \env{lateximage}. @@ -12194,19 +12392,18 @@ end -- not --version % \end{macrocode} % See if already started a \env{lateximage} or a \element{span}: % \begin{macrocode} - \ifthenelse{% - \cnttest{\value{LWR@lateximagedepth}}{>}{0} \OR% - \cnttest{\value{LWR@spandepth}}{>}{0}% + \ifboolexpr{ + test {\ifnumcomp{\value{LWR@lateximagedepth}}{>}{0}} or + test {\ifnumcomp{\value{LWR@spandepth}}{>}{0}} }% % \end{macrocode} % Do nothing if already started a \env{lateximage} or a \element{span}, % but add a parbreak if in a span but not a \env{lateximage}. % \begin{macrocode} {% no nested par tags - \ifthenelse{% - \cnttest{\value{LWR@spandepth}}{>}{0}% - \AND% - \cnttest{\value{LWR@lateximagedepth}}{=}{0}% + \ifboolexpr{ + test {\ifnumcomp{\value{LWR@spandepth}}{>}{0}} and + test {\ifnumcomp{\value{LWR@lateximagedepth}}{=}{0}} }% {\ifbool{LWR@intabularmetadata}{}{\unskip\LWR@htmltagc{br /}}}% {}% @@ -12236,7 +12433,7 @@ end -- not --version % but not in a table outside a row: % \begin{macrocode} {% not handling pars - \ifthenelse{\cnttest{\value{LWR@spandepth}}{>}{0}}% + \ifnumcomp{\value{LWR@spandepth}}{>}{0}% {\ifbool{LWR@intabularmetadata}{}{\unskip\LWR@htmltagc{br /}}}% {}% }% not handling pars @@ -12279,7 +12476,7 @@ end -- not --version % \end{macrocode} % Ignore if inside a span: % \begin{macrocode} -\ifthenelse{\cnttest{\value{LWR@spandepth}}{>}{0}}% +\ifnumcomp{\value{LWR@spandepth}}{>}{0}% {}% {% % \end{macrocode} @@ -12329,7 +12526,7 @@ end -- not --version % \end{macrocode} % Ignore if inside a span: % \begin{macrocode} -\ifthenelse{\cnttest{\value{LWR@spandepth}}{>}{0}}% +\ifnumcomp{\value{LWR@spandepth}}{>}{0}% {}% {% % \end{macrocode} @@ -12517,16 +12714,68 @@ end -- not --version -% \section{HTML meta description and author} +% \section{Title, HTML meta author, HTML meta description} % +% +% \codehtml +% \begin{macrocode} +\begin{warpHTML} +% \end{macrocode} +% +% \begin{macro}{\title} \marg{title} +% Modified to remember \cs{thetitle}, which is used to set the \HTML\ page titles. +% \index{HTML>meta tag>title} +% \index{title>HTML meta tag} +% \index{meta tag, HTML>title} +% \changes{v0.44}{2017/11/18}{Added \cs{thetitle}.} +% \begin{macrocode} +\let\LWR@origtitle\title - +\renewcommand*{\title}[1]{% + \LWR@origtitle{#1}% + \begingroup% + \renewcommand{\thanks}[1]{}% + \protected@xdef\thetitle{#1}% + \endgroup% +} +% \end{macrocode} +% \end{macro} +% +% \begin{macrocode} +\end{warpHTML} +% \end{macrocode} +% +% % \codeall % \begin{macrocode} \begin{warpall} % \end{macrocode} +% +% \begin{macro}{\HTMLTitle} \marg{Titlename} \qquad +% The Title to place into an \HTML\ meta tag. +% The default is to use the document \cs{title}'s setting. +% +% \index{HTML>meta tag>Title} +% \index{Title>HTML meta tag} +% \index{meta tag, HTML>Title} +% +% \changes{v0.44}{2017/11/18}{Added.} +% +% \begin{macrocode} +\providecommand{\thetitle}{} -% \begin{macro}{\HTMLAuthor} \marg{authorname} \qquad The author to place into an \HTML\ meta tag. +\newcommand{\theHTMLTitle}{\thetitle} + +\newcommand{\HTMLTitle}[1]{\renewcommand{\theHTMLTitle}{#1}} +% \end{macrocode} +% \end{macro} +% +% +% +% \begin{macro}{\HTMLAuthor} \marg{authorname} \qquad +% The author to place into an \HTML\ meta tag. +% If none given, the default is \cs{theauthor}, which is empty unless +% the \pkg{titling} package is used. % % \index{HTML>meta tag>author} % \index{author>HTML meta tag} @@ -12538,21 +12787,13 @@ end -- not --version % % \begin{macrocode} \providecommand{\theauthor}{} + \newcommand{\theHTMLAuthor}{\theauthor} \newcommand{\HTMLAuthor}[1]{\renewcommand{\theHTMLAuthor}{#1}} % \end{macrocode} % \end{macro} -% \begin{macrocode} -\end{warpall} -% \end{macrocode} - - -% \codeall -% \begin{macrocode} -\begin{warpall} -% \end{macrocode} % This is placed inside an \HTML\ meta tag at the start of each file. % This may be changed mid-document using \cs{HTMLDescription}, @@ -12685,6 +12926,7 @@ end -- not --version % % \begin{macrocode} \long\def\LWR@footnotetext#1{% +\LWR@traceinfo{LWR@footnotetext}% \global\setbox\LWR@footnotes=\vbox{% % \end{macrocode} % Add to any current footnotes: @@ -12834,11 +13076,14 @@ end -- not --version % \section{Marginpars} % +% \limitsmarginpars +% % \codehtml % \begin{macrocode} \begin{warpHTML} % \end{macrocode} + % \begin{macro}{\marginpar} \oarg{left} \marg{right} % % \changes{v0.21}{2017/02/11}{Fixed source listing.} @@ -12852,7 +13097,37 @@ end -- not --version #2 \end{LWR@BlockClassWP} }% -{\LWR@htmlspanclass{marginpar}{#2}}% +{% + \LWR@htmlspanclass{marginpar}{#2}% +}% +} +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\marginparBlock} \oarg{left} \marg{right} +% +% For use when the marginpar will be more than one paragraph, +% and/or contains more than simple text. +% +% 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.44}{2017/11/10}{Added.} +% +% \begin{macrocode} +\newcommand{\marginparBlock}[2][]{% +\ifbool{FormatWP}% +{% +\begin{LWR@BlockClassWP}{width:2in; float:right; margin:10pt}{}{marginblock} +#2 +\end{LWR@BlockClassWP} +}% +{% +\begin{BlockClass}[width:2in; float:right; margin:10pt]{marginparblock} +#2 +\end{BlockClass} +}% } % \end{macrocode} % \end{macro} @@ -12863,6 +13138,29 @@ end -- not --version % \end{macrocode} +% \codeprint +% \begin{macrocode} +\begin{warpprint} +% \end{macrocode} +% +% \begin{macro}{\marginparBlock} \oarg{left} \marg{right} +% +% For use when the marginpar will be more than one paragraph, +% and/or contains more than simple text. +% +% Print version. +% +% \begin{macrocode} +\LetLtxMacro\marginparBlock\marginpar +% \end{macrocode} +% \end{macro} +% +% \begin{macrocode} +\end{warpprint} +% \end{macrocode} + + + % \section{Splitting HTML files} % % \begin{itemize} @@ -13694,8 +13992,11 @@ end -- not --version % \begin{macro}{\part} * \oarg{TOC name} \marg{name} % % \changes{v0.38}{2017/08/21}{Fix with \texttt{article} class.} +% \changes{v0.44}{2017/11/21}{Add preamble for \pkg{koma-script}.} % % \begin{macrocode} +\newcommand{\part@preamble}{}% for koma-script + \DeclareDocumentCommand{\part}{s o m}{% \LWR@maybeprintpendingfootnotes{\LWR@depthpart}% \LWR@stoppars% @@ -13703,6 +14004,9 @@ end -- not --version \LWR@startnewdepth{\LWR@depthpart}{\LWR@printclosepart}% \LWR@section{#1}{#2}{#3}{part}% + +\part@preamble% for koma-script +\renewcommand{\part@preamble}{}% } % \end{macrocode} % \end{macro} @@ -13712,9 +14016,12 @@ end -- not --version % % \changes{v0.28}{2017/04/06}{If \EPUB, prints footnotes before each section.} % \changes{v0.40}{2017/09/22}{Added support for \pkg{quotchap}.} +% \changes{v0.44}{2017/11/21}{Add preamble for \pkg{koma-script}.} % \begin{macrocode} \let\@printcites\relax% for quotchap package +\newcommand{\chapter@preamble}{}% for koma-script + \@ifundefined{chapter} {} {% @@ -13726,7 +14033,11 @@ end -- not --version \LWR@startnewdepth{\LWR@depthchapter}{\LWR@printclosechapter}% \LWR@section{#1}{#2}{#3}{chapter}% + \@printcites% for quotchap package + +\chapter@preamble% for koma-script +\renewcommand{\chapter@preamble}{}% } } % \end{macrocode} @@ -13887,10 +14198,11 @@ end -- not --version % \end{macrocode} % % Author: +% \changes{v0.44}{2017/11/18}{Fix \cs{HTMLAuthor}.} % \begin{macrocode} -\ifcsempty{theHTMLAuthor}{}{ -\LWR@htmltag{meta name="author" content="\theHTMLAuthor" /}\LWR@orignewline -} +\ifthenelse{\equal{\theHTMLAuthor}{}}% +{}% +{\LWR@htmltag{meta name="author" content="\theHTMLAuthor" /}\LWR@orignewline}% % \end{macrocode} % % \pkg{lwarp} is the generator: @@ -13927,10 +14239,11 @@ script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"{}}% \LWR@htmltag{![endif]{-}{-}}\LWR@orignewline % \end{macrocode} % The page's title: +% \changes{v0.44}{2017/11/18}{Add \cs{HTMLTitle}.} % \begin{macrocode} -\ifcsvoid{thetitle}{}{% -\LWR@htmltag{title}\thetitle#1\LWR@htmltag{/title}\LWR@orignewline% -}% +\ifthenelse{\equal{\theHTMLTitle}{}}% +{}% +{\LWR@htmltag{title}\theHTMLTitle#1\LWR@htmltag{/title}\LWR@orignewline}% % \end{macrocode} % The page's stylesheet: % \begin{macrocode} @@ -13945,9 +14258,12 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% % \begin{macrocode} \ifbool{mathjax}% {% + \begingroup% + \LWR@restoreoriglists% \boolfalse{LWR@verbtags} \verbatiminput{lwarp_mathjax.txt}% \booltrue{LWR@verbtags} + \endgroup% \LWR@stoppars }% end of mathjax {}% @@ -15093,11 +15409,16 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% % Use a mono-spaced font to preserve horizontal positioning. % If horizontal alignment is important for the user, use a mono-spaced font % in the \CSS\ for the |verse| class. -% -% Also turn off \pkg{babel-french} extra space before punctuation: % \begin{macrocode} \begingroup% \LWR@origttfamily% +% \end{macrocode} +% Since inside a \element{pre}, restore the original list processing: +% \begin{macrocode} +\LWR@restoreoriglists% +% \end{macrocode} +% Turn off \pkg{babel-french} extra space before punctuation: +% \begin{macrocode} \LWR@FBcancel% % \end{macrocode} % Do not produce \HTML\ tags for \cs{hspace} inside a verse |par|. @@ -15283,13 +15604,70 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% % % \changes{v0.34}{2017/07/27}{Lists refactored to remove \pkg{enumitem} requirement.} % -% \subsection{Itemize} - +% \subsection{List environment} +% % \codehtml % \begin{macrocode} \begin{warpHTML} % \end{macrocode} + +% The following may be locally redefined by \env{enumerate} or \env{description}. +% \begin{macrocode} +\newcommand*{\LWR@printcloselist}{\LWR@printcloseitemize} +\newcommand*{\LWR@printopenlist}{ul style="list-style-type:none"} +% \end{macrocode} + +% \begin{macro}{\LWR@listitem} \oarg{label} +% +% Handles \cs{item} inside a \env{list}, \env{itemize}, or \env{enumerate}. +% +% See \cs{LWR@openparagraph} where extra \cs{hspace} is used to +% leave room for the label while inside a list during paragraph construction. +% +% \changes{v0.44}{2017/11/15}{Added \env{list} and \env{trivlist}.} +% \begin{macrocode} +\newcommand*{\LWR@listitem}{% +\LWR@stoppars% +\LWR@startnewdepth{\LWR@depthlistitem}{\LWR@printcloselistitem}% +\LWR@htmltag{li}% +\LWR@startpars% +\LWR@origitem% +} +% \end{macrocode} +% \end{macro} + +% \begin{environment}{list} \marg{label} \marg{commands} +% \changes{v0.44}{2017/11/15}{Added \env{list} and \env{trivlist}.} +% \begin{macrocode} +\newcommand*{\LWR@liststart}{% +\LWR@stoppars% +\LWR@pushoneclose{\LWR@depthlist}{\LWR@printcloselist}% +\LWR@htmltag{\LWR@printopenlist}\LWR@orignewline% +\LWR@startpars% +\setlength{\topsep}{0pt}% +\setlength{\partopsep}{0pt}% +\setlength{\itemsep}{0pt}% +\setlength{\parsep}{0pt}% +\setlength{\leftmargin}{0pt}% +\setlength{\rightmargin}{0pt}% +\setlength{\listparindent}{0pt}% +\setlength{\itemindent}{0pt}% +\setlength{\labelsep}{1em}% +} + +\newcommand*{\LWR@listend}{% +\LWR@stoppars% +\LWR@closeprevious{\LWR@depthlistitem}% +\LWR@closeoneprevious% +\LWR@startpars% +} +% \end{macrocode} +% \end{environment} + + +% \subsection{Itemize} + % \begin{macro}{\LWR@itemizeitem} \oarg{label} % % Handles |\item| inside an itemize or enumerate. @@ -15299,7 +15677,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% % \begin{macrocode} \newcommand*{\LWR@itemizeitem}{% \LWR@stoppars% -\LWR@startnewdepth{\LWR@depthlistitem}{\LWR@printcloselistitem{}}% +\LWR@startnewdepth{\LWR@depthlistitem}{\LWR@printcloselistitem}% \LWR@htmltag{li}% \LWR@startpars% \LWR@origitem% @@ -15310,19 +15688,10 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% % \begin{environment}{itemize} \oarg{options} % \begin{macrocode} \newcommand*{\LWR@itemizestart}{% -\LWR@stoppars% -\LWR@pushoneclose{\LWR@depthlist}{\LWR@printcloseitemize{}}% -\LWR@htmltag{ul style="list-style-type:none"{}}% -\LWR@startpars% +\renewcommand*{\LWR@printcloselist}{\LWR@printcloseitemize} +\renewcommand*{\LWR@printopenlist}{ul style="list-style-type:none"} \let\item\LWR@itemizeitem% } - -\newcommand*{\LWR@itemizeend}{% -\LWR@stoppars% -\LWR@closeprevious{\LWR@depthlistitem}% -\LWR@closeoneprevious{}% -\LWR@startpars% -} % \end{macrocode} % \end{environment} @@ -15335,19 +15704,10 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% % \begin{environment}{enumerate} \oarg{options} % \begin{macrocode} \newcommand*{\LWR@enumeratestart}{% -\LWR@stoppars% -\LWR@pushoneclose{\LWR@depthlist}{\LWR@printcloseitemize{}}% -\LWR@htmltag{ul style="list-style-type:none"{}}% -\LWR@startpars% +\renewcommand*{\LWR@printcloselist}{\LWR@printcloseitemize} +\renewcommand*{\LWR@printopenlist}{ul style="list-style-type:none"} \let\item\LWR@itemizeitem% } - -\newcommand*{\LWR@enumerateend}{% -\LWR@stoppars% -\LWR@closeprevious{\LWR@depthlistitem}% -\LWR@closeoneprevious{}% -\LWR@startpars% -} % \end{macrocode} % \end{environment} @@ -15361,7 +15721,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% {% \LWR@stoppars% \LWR@setlatestname{#1}% -\LWR@startnewdepth{\LWR@depthlistitem}{\LWR@printclosedescitem{}}% +\LWR@startnewdepth{\LWR@depthlistitem}{\LWR@printclosedescitem}% % \end{macrocode} % Temporarily disable \cs{hspace}, which |article.cls|, etc.\ use per \cs{item} % for |description|s only. @@ -15392,22 +15752,22 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% % \begin{environment}{description} \oarg{options} % \begin{macrocode} \newcommand*{\LWR@descriptionstart}{% -\LWR@stoppars% -\LWR@pushoneclose{\LWR@depthlist}{\LWR@printclosedescription{}}% -\LWR@htmltag{dl}% -\LWR@startpars% +\renewcommand*{\LWR@printcloselist}{\LWR@printclosedescription} +\renewcommand*{\LWR@printopenlist}{dl} \let\item\LWR@descitem% } - -\newcommand*{\LWR@descriptionend}{% -\LWR@stoppars% -\LWR@closeprevious{\LWR@depthlistitem}% -\LWR@closeoneprevious{}% -\LWR@startpars% -} % \end{macrocode} % \end{environment} + +% \subsection{Patching the lists} + +% \begin{macrocode} +\let\LWR@orig@trivlist\@trivlist +\let\LWR@origtrivlist\trivlist +\let\LWR@origendtrivlist\endtrivlist +% \end{macrocode} + % \begin{macro}{\LWR@patchlists} Patches list environments. % % \cs{LWr@patchlists} remembers \cs{item} as defined by whatever packages have @@ -15416,19 +15776,46 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% % This works with the native \LaTeX\ environments, as well as % those provided by \pkg{enumitem}, \pkg{enumerate}, and \pkg{paralist}. % +% \changes{v0.44}{2017/11/15}{Added \env{list} and \env{trivlist}.} +% % \begin{macrocode} \newcommand*{\LWR@patchlists}{% -\LetLtxMacro{\LWR@origitem}{\item} -\AtBeginEnvironment{itemize}{\LWR@itemizestart} -\AtEndEnvironment{itemize}{\LWR@itemizeend} -\AtBeginEnvironment{enumerate}{\LWR@enumeratestart} -\AtEndEnvironment{enumerate}{\LWR@enumerateend} -\AtBeginEnvironment{description}{\LWR@descriptionstart} -\AtEndEnvironment{description}{\LWR@descriptionend} + \let\item\LWR@listitem% + \renewcommand*{\@trivlist}{% + \LWR@liststart% + \LWR@orig@trivlist% + }% + \renewcommand*{\endtrivlist}{\LWR@origendtrivlist\LWR@listend}% + \renewcommand*{\trivlist}{% + \LWR@origtrivlist% + \def\makelabel####1{\LWR@orighspace{3em}####1}% + }% + \renewcommand*{\itemize}{\LWR@itemizestart\LWR@origitemize}% + \renewcommand*{\enumerate}{\LWR@enumeratestart\LWR@origenumerate}% + \renewcommand*{\description}{\LWR@descriptionstart\LWR@origdescription}% +% \AtBeginEnvironment{itemize}{\LWR@itemizestart}% +% \AtBeginEnvironment{enumerate}{\LWR@enumeratestart}% +% \AtBeginEnvironment{description}{\LWR@descriptionstart}% } % \end{macrocode} % \end{macro} +% \begin{macro}{\LWR@restoreoriglists} Restores the original \env{trivlist} environment. +% \begin{macrocode} +\newcommand*{\LWR@restoreoriglists}{% +\let\@trivlist\LWR@orig@trivlist% +\let\trivlist\LWR@origtrivlist% +\let\endtrivlist\LWR@origendtrivlist% +\LetLtxMacro\item\LWR@origitem% +\LetLtxMacro\itemize\LWR@origitemize% +\LetLtxMacro\enditemize\LWR@endorigitemize% +\LetLtxMacro\enumerate\LWR@origenumerate% +\LetLtxMacro\endenumerate\LWR@endorigenumerate% +\LetLtxMacro\description\LWR@origdescription% +\LetLtxMacro\enddescription\LWR@endorigdescription% +} +% \end{macrocode} +% \end{macro} % \begin{macrocode} \end{warpHTML} @@ -15752,7 +16139,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% % \begin{macrocode} \newcommand*{\LWR@tabularampersand}{% \LWR@traceinfo{LWR@tabularampersand}% -\ifthenelse{\cnttest{\value{LWR@tabulardepth}}{>}{0}}% +\ifnumcomp{\value{LWR@tabulardepth}}{>}{0}% {% % \end{macrocode} % If not skipping a multirow cell, close the current data cell. @@ -15766,7 +16153,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% % \end{macrocode} % Have not yet added data in this column: % \begin{macrocode} -\boolfalse{LWR@tabularcelladded}% + \boolfalse{LWR@tabularcelladded}% % \end{macrocode} % Look at the next token to decide multi or single column data tag. % \begin{macrocode} @@ -15833,14 +16220,19 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% % \end{macrocode} % Generate table data tags and ampersands until the right edge: % \begin{macrocode} -\whiledo{% - \(% - \boolean{LWR@intabularmetadata} \AND% - \NOT\boolean{LWR@tabularcelladded} \AND% - \cnttest{\value{LWR@tablecolindex}}{=}{\value{LWR@tabletotalcols}}% - \) \OR% - \cnttest{\value{LWR@tablecolindex}}{<}{\value{LWR@tabletotalcols}}% -}{% +\whileboolexpr{% + test { + \ifnumcomp{\value{LWR@tablecolindex}}{<}{\value{LWR@tabletotalcols}} + } or % + (% + bool{LWR@intabularmetadata} and% + not bool{LWR@tabularcelladded} and% + test { + \ifnumcomp{\value{LWR@tablecolindex}}{=}{\value{LWR@tabletotalcols}} + }% + )% +}% +{% \LWR@tabledatasinglecolumntag% % \end{macrocode} % The following is essentially \cs{LWR@tabularampersand} with @@ -15853,9 +16245,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% % \end{macrocode} % Starts the next cell: % \begin{macrocode} - \ifthenelse{% - \cnttest{\value{LWR@tablecolindex}}{<}{\value{LWR@tabletotalcols}}% - }% + \ifnumcomp{\value{LWR@tablecolindex}}{<}{\value{LWR@tabletotalcols}}% {\LWR@getmynexttoken}% {}% }% @@ -15880,14 +16270,10 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% % % \begin{macro}{\LWR@tabularendofline} % \begin{macrocode} -\NewDocumentCommand{\LWR@tabularendofline}{s o} -{% -\ifthenelse{\value{LWR@tablecolindex}<\value{LWR@tabletotalcols}}{% - \LWR@tabularfinishrow% -}% -{% - \LWR@closetabledatacell% -}% +\NewDocumentCommand{\LWR@tabularendofline}{s o}{% +\ifnumcomp{\value{LWR@tablecolindex}}{<}{\value{LWR@tabletotalcols}}% +{\LWR@tabularfinishrow}% +{\LWR@closetabledatacell}% % \begin{macrocode} \LWR@htmltag{/tr}\LWR@orignewline \global\booltrue{LWR@intabularmetadata} @@ -15940,9 +16326,10 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% % \end{macro} % \begin{macro}{\LWR@strresult} Holds the result of |Str| functions. +% \changes{v0.44}{2017/11/19}{Fix: \cs{providecommand}.} % \begin{macrocode} -\newcommand*{\LWR@strresult}{} -\newcommand*{\LWR@strresulttwo}{} +\providecommand*{\LWR@strresult}{} +\providecommand*{\LWR@strresulttwo}{} % \end{macrocode} % \end{macro} @@ -16048,7 +16435,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% % Store the result into a data array, expanding once out of \cs{LWR@colparameter}: % \begin{macrocode} \LWR@traceinfo{have now read the next token}% -\ifthenelse{\cnttest{\value{LWR@tabletotalcols}}=0} +\ifnumcomp{\value{LWR@tabletotalcols}}{=}{0}% {% left edge of the table: \LWR@traceinfo{at the left edge}% \LWR@setexparray{LWR@colatspec}{leftedge}{\LWR@colparameter}% @@ -16091,7 +16478,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% % Store the result into a data array, expanding once out of \cs{LWR@colparameter}: % \begin{macrocode} \LWR@traceinfo{have now read the next token}% -\ifthenelse{\cnttest{\value{LWR@tabletotalcols}}=0} +\ifnumcomp{\value{LWR@tabletotalcols}}{=}{0}% {% left edge of the table: \LWR@traceinfo{at the left edge}% \LWR@setexparray{LWR@colbangspec}{leftedge}{\LWR@colparameter}% @@ -16172,7 +16559,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% % \end{macrocode} % Remember the bar at this position: % \begin{macrocode} -\ifthenelse{\cnttest{\value{LWR@tabletotalcols}}=0}% +\ifnumcomp{\value{LWR@tabletotalcols}}{=}{0}% {% left edge of the table: \LWR@setexparray{LWR@colbarspec}{leftedge}{tvertbarl}% }% @@ -16400,7 +16787,12 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% % \end{macrocode} % Scan through the column specifications: % \begin{macrocode} -\whiledo{\not\value{LWR@tablecolspecindex}>\value{LWR@tablecolspecwidth}}{% +\whileboolexpr{% + not test{% + \ifnumcomp{\value{LWR@tablecolspecindex}}{>}{\value{LWR@tablecolspecwidth}}% + }% +}% +{% % \end{macrocode} % Place the next single-character column type into \cs{LWR@strresult}: % \begin{macrocode} @@ -16583,7 +16975,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% % \begin{macro}{\LWR@tabularleftedge} % \begin{macrocode} \newcommand*{\LWR@tabularleftedge}{% -\ifthenelse{\cnttest{\value{LWR@tablecolindex}}=1}% +\ifnumcomp{\value{LWR@tablecolindex}}{=}{1}% {% \LWR@printatbang{at}{leftedge}% \LWR@printatbang{bang}{leftedge}% @@ -16597,6 +16989,14 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% % \subsection{Data opening tag} + +% \begin{macro}{\LWR@thiscolspec} Temporary storage. +% \begin{macrocode} +\newcommand*{\LWR@thiscolspec}{} +% \end{macrocode} +% \end{macro} + + % \begin{macro}{\LWR@tabledatasinglecolumntag} % Print a table data opening tag with style for alignment % @@ -16647,20 +17047,21 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% % \begin{macrocode} \LWR@tdstartstyles% \LWR@addcmidrulewidth% - \LWR@addformatwpalignment% + \StrChar{\LWR@tablecolspec}{\arabic{LWR@tablecolindex}}[\LWR@thiscolspec]% + \LWR@addformatwpalignment{\LWR@thiscolspec}% \LWR@tdendstyles% }% % \end{macrocode} % If this is a p, m, b, or X column, allow paragraphs: % \begin{macrocode} - \ifthenelse{% - \equal{\LWR@strresult}{p}\OR% - \equal{\LWR@strresult}{m}\OR% - \equal{\LWR@strresult}{b}\OR% - \equal{\LWR@strresult}{P}\OR% - \equal{\LWR@strresult}{M}\OR% - \equal{\LWR@strresult}{B}\OR% - \equal{\LWR@strresult}{X}% + \ifboolexpr{% + test{ \ifdefstring{\LWR@strresult}{p} } or + test{ \ifdefstring{\LWR@strresult}{m} } or + test{ \ifdefstring{\LWR@strresult}{b} } or + test{ \ifdefstring{\LWR@strresult}{P} } or + test{ \ifdefstring{\LWR@strresult}{M} } or + test{ \ifdefstring{\LWR@strresult}{B} } or + test{ \ifdefstring{\LWR@strresult}{X} } }% {% allow pars \LWR@startpars% @@ -16753,8 +17154,10 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \newcommand*{\LWR@clearmidrules} {% \setcounter{LWR@midrulecounter}{1}% -\whiledo{% -\cnttest{\value{LWR@midrulecounter}}{<=}{\value{LWR@tablecolspecwidth}}% +\whileboolexpr{% + not test{% + \ifnumcomp{\value{LWR@midrulecounter}}{>}{\value{LWR@tablecolspecwidth}}% + }% }% {% \LWR@setexparray{LWR@midrules}{\arabic{LWR@midrulecounter}}{0pt}% @@ -16782,10 +17185,14 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% % \begin{macrocode} \newcommand*{\LWR@subcmidrule}[4]{% \setcounter{LWR@midrulecounter}{#3}% -\whiledo{\cnttest{\value{LWR@midrulecounter}}{<=}{#4}}% +\whileboolexpr{% + not test {% + \ifnumcomp{\value{LWR@midrulecounter}}{>}{#4}% + }% +}% {% -\LWR@setexparray{LWR@midrules}{\arabic{LWR@midrulecounter}}{#1}% -\addtocounter{LWR@midrulecounter}{1}% + \LWR@setexparray{LWR@midrules}{\arabic{LWR@midrulecounter}}{#1}% + \addtocounter{LWR@midrulecounter}{1}% }% whiledo \IfSubStr{#2}{l}{\LWR@setexparray{LWR@trimlrules}{#3}{l}}{}% \IfSubStr{#2}{r}{\LWR@setexparray{LWR@trimrrules}{#4}{r}}{}% @@ -16974,19 +17381,19 @@ text-align:#1; vertical-align:#2% % % \changes{v0.42}{2017/10/26}{If \protect\texttt{FormatWP} add explicit style % for cell alignment.} +% \changes{v0.44}{2017/11/08}{Fix for multicolumn alignment if \protect\texttt{FormatWP}.} % \begin{macrocode} -\newcommand*{\LWR@addformatwpalignment}{% +\newcommand*{\LWR@addformatwpalignment}[1]{% \ifbool{FormatWP}{% -\StrChar{\LWR@tablecolspec}{\arabic{LWR@tablecolindex}}[\LWR@strresult]% -\ifdefstring{\LWR@strresult}{l}{\LWR@WPcell{left}{middle}}{}% -\ifdefstring{\LWR@strresult}{c}{\LWR@WPcell{center}{middle}}{}% -\ifdefstring{\LWR@strresult}{r}{\LWR@WPcell{right}{middle}}{}% -\ifdefstring{\LWR@strresult}{p}{\LWR@WPcell{left}{bottom}}{}% -\ifdefstring{\LWR@strresult}{m}{\LWR@WPcell{left}{middle}}{}% -\ifdefstring{\LWR@strresult}{b}{\LWR@WPcell{left}{top}}{}% -\ifdefstring{\LWR@strresult}{P}{\LWR@WPcell{center}{bottom}}{}% -\ifdefstring{\LWR@strresult}{M}{\LWR@WPcell{center}{middle}}{}% -\ifdefstring{\LWR@strresult}{B}{\LWR@WPcell{center}{top}}{}% +\IfSubStr{#1}{l}{\LWR@WPcell{left}{middle}}{}% +\IfSubStr{#1}{c}{\LWR@WPcell{center}{middle}}{}% +\IfSubStr{#1}{r}{\LWR@WPcell{right}{middle}}{}% +\IfSubStr{#1}{p}{\LWR@WPcell{left}{bottom}}{}% +\IfSubStr{#1}{m}{\LWR@WPcell{left}{middle}}{}% +\IfSubStr{#1}{b}{\LWR@WPcell{left}{top}}{}% +\IfSubStr{#1}{P}{\LWR@WPcell{center}{bottom}}{}% +\IfSubStr{#1}{M}{\LWR@WPcell{center}{middle}}{}% +\IfSubStr{#1}{B}{\LWR@WPcell{center}{top}}{}% }{}% } % \end{macrocode} @@ -17042,7 +17449,7 @@ text-align:#1; vertical-align:#2% % \changes{v0.43}{2017/11/07}{Added vertical rules.} % \begin{macrocode} \IfStrEq{\LWR@strresult}{|}{% - \ifthenelse{\value{LWR@tablemulticolspos}=1}% + \ifnumcomp{\value{LWR@tablemulticolspos}}{=}{1}% {\booltrue{LWR@mcolvertbarl}}% {\booltrue{LWR@mcolvertbarr}}% }{}% @@ -17163,8 +17570,10 @@ text-align:#1; vertical-align:#2% % \end{macrocode} % Scan across the tokens in the column spec: % \begin{macrocode} -\whiledo{% - \NOT\value{LWR@tablemulticolspos}>\value{LWR@tablemulticolswidth}% +\whileboolexpr{% + not test {% + \ifnumcomp{\value{LWR@tablemulticolspos}}{>}{\value{LWR@tablemulticolswidth}}% + } }% {% % \end{macrocode} @@ -17278,7 +17687,7 @@ rowspan="#2" % % \begin{macrocode} \LWR@tdstartstyles% \LWR@addcmidrulewidth% -\LWR@addformatwpalignment% +\LWR@addformatwpalignment{#5}% \LWR@tdendstyles% }% end of the opening table data tag \global\boolfalse{LWR@intabularmetadata}% @@ -17348,7 +17757,7 @@ rowspan="#2" % % Remember the latest name for \cs{nameref}: % \begin{macrocode} \IfValueTF{#2}{% optional given? - \ifthenelse{\equal{#2}{}}% optional empty? + \ifblank{#2}% optional empty? {\LWR@setlatestname{#3}}% empty {\LWR@setlatestname{#2}}% given and non-empty }% optional given @@ -17382,13 +17791,13 @@ rowspan="#2" % % \begin{macrocode} \ifbool{LWR@starredlongtable}% {% - \ifthenelse{\equal{#2}{}}% TOC entry - {}% - {% - \refstepcounter{\LTcaptype}% - \protected@edef\@currentlabel{% - \csuse{p@\LTcaptype}\csuse{the\LTcaptype}}% - }% + \ifblank{#2}% TOC entry + {}% + {% + \refstepcounter{\LTcaptype}% + \protected@edef\@currentlabel{% + \csuse{p@\LTcaptype}\csuse{the\LTcaptype}}% + }% }{}% % \end{macrocode} % Create an \HTML\ caption. Afterwards, maybe make a LOT entry. @@ -17399,7 +17808,7 @@ rowspan="#2" % % \end{macrocode} % See if an optional caption was given: % \begin{macrocode} - \ifthenelse{\equal{#2}{}}% TOC entry empty + \ifblank{#2}% TOC entry empty % \end{macrocode} % if the optional caption was given, but empty, do not form a TOC entry % \begin{macrocode} @@ -17519,13 +17928,18 @@ rowspan="#2" % % \end{macrocode} % If at the left edge, add the at/bang columns for the left edge: % \begin{macrocode} -\ifthenelse{\value{LWR@tabhtmlcolindex}=1}{% +\ifnumcomp{\value{LWR@tabhtmlcolindex}}{=}{1}{% \LWR@subtabularhtmlcolumns{leftedge}% }{}% % \end{macrocode} % Walk across the \LaTeX\ columns looking for |@| and |!| columns: % \begin{macrocode} -\whiledo{\value{LWR@tabhtmlcolindex}<\value{LWR@tabhtmlcolend}}{% +\whileboolexpr{% + test {% + \ifnumcomp{\value{LWR@tabhtmlcolindex}}{<}{\value{LWR@tabhtmlcolend}}% + }% +}% +{% \LWR@subtabularhtmlcolumns{\arabic{LWR@tabhtmlcolindex}}% \addtocounter{LWR@tabhtmlcolindex}{1}% }% whiledo @@ -18140,14 +18554,19 @@ rowspan="#2" % % \begin{macrocode} {% \LWR@traceinfo{LWR@tabular ending}% -\ifthenelse{% - \(% - \boolean{LWR@intabularmetadata} \AND% - \NOT\boolean{LWR@tabularcelladded} \AND% - \cnttest{\value{LWR@tablecolindex}}{=}{\value{LWR@tabletotalcols}}% - \) \OR% - \cnttest{\value{LWR@tablecolindex}}{<}{\value{LWR@tabletotalcols}}% -}{% +\ifboolexpr{% + test {% + \ifnumcomp{\value{LWR@tablecolindex}}{<}{\value{LWR@tabletotalcols}} + } or % + (% + bool{LWR@intabularmetadata} and% + not bool{LWR@tabularcelladded} and% + test {% + \ifnumcomp{\value{LWR@tablecolindex}}{=}{\value{LWR@tabletotalcols}}% + }% + )% +}% +{% \LWR@tabularfinishrow% }% {% @@ -18292,8 +18711,9 @@ rowspan="#2" % % To remember the most recently defined section name, % description, or caption, for \cs{nameref}. % +% \changes{v0.44}{2017/11/19}{Adjustment for \pkg{koma-script}.} % \begin{macrocode} -\newcommand*{\@currentlabelname}{} +\providecommand*{\@currentlabelname}{} % \end{macrocode} % \end{macro} % @@ -18426,7 +18846,7 @@ rowspan="#2" % % Create an \HTML\ id tag unless are inside a lateximage, % since it would appear in the image: % \begin{macrocode} -\ifthenelse{\cnttest{\value{LWR@lateximagedepth}}{>}{0}}% +\ifnumcomp{\value{LWR@lateximagedepth}}{>}{0}% {}% {% not lateximage % \end{macrocode} @@ -18729,19 +19149,17 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}% % % \changes{v0.43}{2017/10/31}{Made robust.} % \begin{macrocode} -\newcommand*{\LWR@urlb}[1]{% -\href{#1}{#1}% -\endgroup% -\LWR@ensuredoingapar% +\NewDocumentCommand{\LWR@urlb}{m}{% +\LWR@hrefb{#1}{#1}% } -\DeclareRobustCommand*{\LWR@urla}{% +\DeclareRobustCommand*{\url}{% \LWR@ensuredoingapar% \begingroup\catcode`\_=12 \LWR@urlb% } -\let\url\LWR@urla +% \LetLtxMacro\url\LWR@urla % \end{macrocode} % \end{macro} @@ -18753,7 +19171,7 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}% % % \begin{macrocode} \newcommand*{\LWR@subinlineimage}[5][]{% -\ifthenelse{\equal{#1}{}}% +\ifblank{#1}% {\LWR@htmltag{img src="#3.#4" alt="#3" style="#5" class="#2"{}}}% {\LWR@htmltag{img src="#3.#4" alt="#1" style="#5" class="#2"{}}}% } @@ -18833,8 +19251,8 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}% % \end{macrocode} % There is a new float, so increment the unique float counter: % \begin{macrocode} -\addtocounter{LWR@thisfloat}{1}% -\booltrue{LWR@freezethisfloat}% +\addtocounter{LWR@thisautoid}{1}% +\booltrue{LWR@freezethisautoid}% % \end{macrocode} % % \begin{macrocode} @@ -18847,7 +19265,7 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}% % Open an \HTML\ |figure| tag: % \changes{v0.42}{2017/10/26}{If \protect\texttt{FormatWP} add a text frame.} % \begin{macrocode} -\LWR@htmltag{figure id="autofloat-\arabic{LWR@thisfloat}" class="#1"}% +\LWR@htmltag{figure id="autoid-\arabic{LWR@thisautoid}" class="#1"}% \ifbool{FormatWP}{% \LWR@orignewline% \LWR@BlockClassWP{}{}{wp#1}% @@ -18895,7 +19313,7 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}% \ifbool{FormatWP}{\endLWR@BlockClassWP}{}% \LWR@htmlelementend{figure}% \endgroup% -\boolfalse{LWR@freezethisfloat}% +\boolfalse{LWR@freezethisautoid}% \LWR@startpars% \ifbool{FormatWP}{\newline}{}% } @@ -18914,26 +19332,37 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}% -% \DescribeCounter{LWR@thisfloat} +% \DescribeCounter{LWR@thisautoid} % A sequential counter for all floats and theorems. % This is used to identify the float or theorem % then reference it from the List of Figures and % List of Tables. % \begin{macrocode} -\newcounter{LWR@thisfloat} +\newcounter{LWR@thisautoid} +% \end{macrocode} + +% \DescribeBoolean{LWR@freezethisautoid} +% Prevents multiple increments of \cs{LWR@thisautoid} inside a float. +% \begin{macrocode} +\newbool{LWR@freezethisautoid} +\boolfalse{LWR@freezethisautoid} % \end{macrocode} -% \DescribeBoolean{LWR@freezethisfloat} -% Prevents multiple increments of \cs{LWR@thisfloat} inside a float. +% \begin{macro}{\LWR@maybeincthisautoid} +% Possibly increments the autoid counter. % \begin{macrocode} -\newbool{LWR@freezethisfloat} -\boolfalse{LWR@freezethisfloat} +\newcommand*{\LWR@maybeincthisautoid}{% +\ifbool{LWR@freezethisautoid}{}{\addtocounter{LWR@thisautoid}{1}}% +} % \end{macrocode} +% \end{macro} -% \begin{macro}{\LWR@maybeincthisfloat} +% \begin{macro}{\LWR@newautoidanchor} +% Adds a new \element{autoid} anchor. % \begin{macrocode} -\newcommand*{\LWR@maybeincthisfloat}{% -\ifbool{LWR@freezethisfloat}{}{\addtocounter{LWR@thisfloat}{1}}% +\newcommand*{\LWR@newautoidanchor}{% +\LWR@maybeincthisautoid% +\LWR@htmltag{a id="autoid-\arabic{LWR@thisautoid}"{}}\LWR@htmltag{/a}% } % \end{macrocode} % \end{macro} @@ -18970,41 +19399,41 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}% % When a new \HTML\ file is marked in the \LaTeX\ \PDF\ file, % the \LaTeX\ page number at that point is stored in |LWR@latestautopage|, % (and the associated filename is remembered by the special \LaTeX\ labels). -% This page number is used to generate an |autofloat| \HTML\ \element{id} +% This page number is used to generate an |autopage| \HTML\ \element{id} % in the \HTML\ output at the start of the new \HTML\ file. -% Meanwhile, there is a float counter used to generate an \HTML\ |autofloat| +% Meanwhile, there is a float counter used to generate an \HTML\ |autoid| % \element{id} at the start of the float itself in the \HTML\ file. -% The |autopage| and |autofloat| values to use for each float are written to the +% The |autopage| and |autoid| values to use for each float are written to the % |.lof|, etc. files just before each float's entry. These values are used % by \cs{l@figure}, etc. to create the \HTML\ links in the List of Figures, etc. % -% \DescribeCounter{LWR@nextautofloat} Tracks autofloat for floats. +% \DescribeCounter{LWR@nextautoid} Tracks autoid for floats. % \DescribeCounter{LWR@nextautopage} Tracks autopage for floats. % % These are updated per float as the |.lof| file is read. % \begin{macrocode} -\newcounter{LWR@nextautofloat} +\newcounter{LWR@nextautoid} \newcounter{LWR@nextautopage} % \end{macrocode} % % -% \begin{macro}{\LWRsetnextfloat} \marg{autopage} \marg{autofloat} +% \begin{macro}{\LWRsetnextfloat} \marg{autopage} \marg{autoid} % % This is written to the |.lof| file just before each float's usual entry. -% The autopage and autofloat are remembered for \cs{l@figure} to use when +% The autopage and autoid are remembered for \cs{l@figure} to use when % creating the \HTML\ links. % % \begin{macrocode} \newcommand*{\LWRsetnextfloat}[2]{% \setcounter{LWR@nextautopage}{#1}% -\setcounter{LWR@nextautofloat}{#2}% +\setcounter{LWR@nextautoid}{#2}% } % \end{macrocode} % \end{macro} % \DescribeCounter{LWR@latestautopage} % Updated each time a new \HTML\ file is begun. -% \cs{LWRsetnextfloat} is written with this and the autofloat +% \cs{LWRsetnextfloat} is written with this and the autoid % by the modified \cs{addcontentsline} just before each float's entry. % \begin{macrocode} \newcounter{LWR@latestautopage} @@ -19109,15 +19538,13 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}% \let\LWR@origcaptionlistentry\captionlistentry \renewcommand*{\captionlistentry}{% -\LWR@maybeincthisfloat% \LWR@ensuredoingapar% -\LWR@htmltag{a id="autofloat-\arabic{LWR@thisfloat}"{}}\LWR@htmltag{/a}% \LWR@origcaptionlistentry% } \def\LWR@LTcaptionlistentry{% \LWR@ensuredoingapar% -\LWR@htmltag{a id="autofloat-\arabic{LWR@thisfloat}"{}}\LWR@htmltag{/a}% +\LWR@htmltag{a id="autoid-\arabic{LWR@thisautoid}"{}}\LWR@htmltag{/a}% \bgroup \@ifstar{\egroup\LWR@LT@captionlistentry}% gobble * {\egroup\LWR@LT@captionlistentry}}% @@ -19127,25 +19554,27 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}% % \end{macro} % \begin{macro}{\addcontentsline} -% Patched to write the autopage and autofloat before each float's entry. +% Patched to write the autopage and autoid before each float's entry. % No changes if writing |.toc| % For a theorem, automatically defines \cs{ext@<type>} as needed, to % mimic and reuse the float mechanism. % % \changes{v0.25}{2017/03/16}{Handles theorems.} +% \changes{v0.44}{2017/11/10}{Automatic \cs{LWR@newfloatanchor}.} % % \begin{macrocode} \let\LWR@origaddcontentsline\addcontentsline \renewcommand*{\addcontentsline}[3]{% -\ifthenelse{\equal{#1}{toc}}{}{% - \ifthenelse{\equal{#1}{thm}}{\csdef{ext@#2}{thm}}{} +\ifstrequal{#1}{toc}{}{% not TOC + \LWR@newautoidanchor% + \ifthenelse{\equal{#1}{thm}}{\csdef{ext@#2}{thm}}{}% \addtocontents{\@nameuse{ext@#2}}{% - \protect\LWRsetnextfloat% - {\arabic{LWR@latestautopage}}% - {\arabic{LWR@thisfloat}}% - }% addtocontents -}% not toc + \protect\LWRsetnextfloat% + {\arabic{LWR@latestautopage}}% + {\arabic{LWR@thisautoid}}% + }% +}% not TOC \LWR@origaddcontentsline{#1}{#2}{#3}% } % \end{macrocode} @@ -19159,9 +19588,7 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}% \let\LWR@origcaptionof\captionof \renewcommand*{\captionof}{% -\LWR@maybeincthisfloat% \LWR@stoppars -\LWR@htmltag{a id="autofloat-\arabic{LWR@thisfloat}"{}}\LWR@htmltag{/a}% \LWR@origcaptionof% } } @@ -19486,9 +19913,11 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}% % \changes{v0.38}{2017/08/21}{Added trailing \cs{quad}.} % % \begin{macrocode} -\renewcommand*{\numberline}[1]{% +\newcommand*{\LWR@numberline}[1]{% \LWR@sectionnumber{#1}\quad% } + +\LetLtxMacro\numberline\LWR@numberline % \end{macrocode} % \end{macro} @@ -19570,12 +19999,12 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}% \LWR@startpars% % \end{macrocode} % Create an \HTML\ link to -% filename\#autofloat-(float number), with text of the caption, +% filename\#autoid-(float number), with text of the caption, % of the given \HTML\ class. % \begin{macrocode} \LWR@subhyperrefclass{% \LWR@htmlrefsectionfilename{autopage-\arabic{LWR@nextautopage}}% - \#autofloat-\arabic{LWR@nextautofloat}}% + \#autoid-\arabic{LWR@nextautoid}}% {#4}{toc#2}% \LWR@stoppars% }{}% @@ -19693,13 +20122,15 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}% % Redefined to write the |LWR@latestautopage| counter instead of |page| % \changes{v0.28}{2017/04/13}{Improved indexing.} % \begin{macrocode} -\def\@wrindex#1{% +\def\LWR@wrindex#1{% \addtocounter{LWR@autoindex}{1}% \LWR@newlabel{LWRindex-\theLWR@autoindex}% \protected@write\@indexfile{}% {\string\indexentry{#1}{\theLWR@autoindex}}% \endgroup \@esphack} + +\let\@wrindex\LWR@wrindex % \end{macrocode} % \end{macro} @@ -19872,6 +20303,7 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}% \csletcs{endequation*}{LWR@origendequationstar}% % \LWR@restoreorigaccents% +\LWR@restoreoriglists% % \LWR@FBcancel% } @@ -19912,7 +20344,7 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}% \let\LWR@origtextdollar\$ \renewcommand*{\$}{% -\ifthenelse{\cnttest{\value{LWR@lateximagedepth}}{>}{0}}% +\ifnumcomp{\value{LWR@lateximagedepth}}{>}{0}% {\LWR@origtextdollar}% {\LWR@htmltagc{span}\LWR@origtextdollar\LWR@htmltagc{/span}}% } @@ -20561,6 +20993,8 @@ $#1$} % % The following \AmS\ environments are more easily patched in-place: % +% \changes{v0.44}{2017/11/16}{\pkg{AMS environments}: Fix: Groups for lateximages.} +% % \begin{environment}{multline} % \begin{macrocode} \BeforeBeginEnvironment{multline}{ @@ -20572,7 +21006,7 @@ $#1$} \LWR@beginhideamsmath } { - \lateximage[\LWR@amsmathbodynumbered{multline}] + \begin{lateximage}[\LWR@amsmathbodynumbered{multline}] } } @@ -20584,7 +21018,7 @@ $#1$} \boolfalse{LWR@amsmultline} \LWR@addmathjax{multline}{\the\@envbody} } -{\endlateximage} +{\end{lateximage}} } % \end{macrocode} @@ -20602,7 +21036,7 @@ $#1$} \LWR@beginhideamsmath } { - \lateximage[\LWR@amsmathbody{multline*}] + \begin{lateximage}[\LWR@amsmathbody{multline*}] } } @@ -20614,7 +21048,7 @@ $#1$} \boolfalse{LWR@amsmultline} \LWR@addmathjax{multline*}{\the\@envbody} } -{\endlateximage} +{\end{lateximage}} } @@ -20633,7 +21067,7 @@ $#1$} \LWR@beginhideamsmath } { - \lateximage[\LWR@amsmathbodynumbered{gather}] + \begin{lateximage}[\LWR@amsmathbodynumbered{gather}] } } @@ -20644,7 +21078,7 @@ $#1$} \LWR@endhideamsmath \LWR@addmathjax{gather}{\the\@envbody} } -{\endlateximage} +{\end{lateximage}} } % \end{macrocode} @@ -20661,7 +21095,7 @@ $#1$} \LWR@beginhideamsmath } { - \lateximage[\LWR@amsmathbody{gather*}] + \begin{lateximage}[\LWR@amsmathbody{gather*}] } } @@ -20672,7 +21106,7 @@ $#1$} \LWR@endhideamsmath \LWR@addmathjax{gather*}{\the\@envbody} } -{\endlateximage} +{\end{lateximage}} } % \end{macrocode} @@ -20690,7 +21124,7 @@ $#1$} \LWR@beginhideamsmath } { - \lateximage[\LWR@amsmathbodynumbered{align}] + \begin{lateximage}[\LWR@amsmathbodynumbered{align}] } } @@ -20701,7 +21135,7 @@ $#1$} \LWR@endhideamsmath \LWR@addmathjax{align}{\the\@envbody} } -{\endlateximage} +{\end{lateximage}} } % \end{macrocode} @@ -20719,7 +21153,7 @@ $#1$} \LWR@beginhideamsmath } { - \lateximage[\LWR@amsmathbody{align*}] + \begin{lateximage}[\LWR@amsmathbody{align*}] } } @@ -20730,7 +21164,7 @@ $#1$} \LWR@endhideamsmath \LWR@addmathjax{align*}{\the\@envbody} } -{\endlateximage} +{\end{lateximage}} } % \end{macrocode} @@ -20748,7 +21182,7 @@ $#1$} \LWR@beginhideamsmath } { - \lateximage[\LWR@amsmathbodynumbered{flalign}] + \begin{lateximage}[\LWR@amsmathbodynumbered{flalign}] } } @@ -20759,7 +21193,7 @@ $#1$} \LWR@endhideamsmath \LWR@addmathjax{flalign}{\the\@envbody} } -{\endlateximage} +{\end{lateximage}} } % \end{macrocode} @@ -20777,7 +21211,7 @@ $#1$} \LWR@beginhideamsmath } { - \lateximage[\LWR@amsmathbody{flalign*}] + \begin{lateximage}[\LWR@amsmathbody{flalign*}] } } @@ -20788,7 +21222,7 @@ $#1$} \LWR@endhideamsmath \LWR@addmathjax{flalign*}{\the\@envbody} } -{\endlateximage} +{\end{lateximage}} } % \end{macrocode} @@ -21160,7 +21594,7 @@ $#1$} % \end{macrocode} % While inside a lateximage, locally do not use mathjax: % \begin{macrocode} - \boolfalse{mathjax} + \boolfalse{mathjax}% % \end{macrocode} % Be sure that are doing a paragraph: % \begin{macrocode} @@ -21850,10 +22284,11 @@ $#1$} % \begin{environment}{picture} % \changes{v0.24}{2017/03/13}{Fix for inline images.} % \changes{v0.26}{2017/03/30}{Fix for \cs{makebox} in \env{picture}.} +% \changes{v0.44}{2017/11/16}{\pkg{overpic}: Fix: Groups for lateximages.} % \begin{macrocode} -\BeforeBeginEnvironment{picture}{\lateximage} +\BeforeBeginEnvironment{picture}{\begin{lateximage}} -\AfterEndEnvironment{picture}{\endlateximage} +\AfterEndEnvironment{picture}{\end{lateximage}} % \end{macrocode} % \end{environment} @@ -22060,9 +22495,9 @@ $#1$} % \begin{macrocode} \ifbool{FormatWP}{% -\addtocounter{LWR@thisfloat}{1}% -\booltrue{LWR@freezethisfloat}% -\LWR@htmltag{div id="autofloat-\arabic{LWR@thisfloat}" class="wpminipage"}% +\addtocounter{LWR@thisautoid}{1}% +\booltrue{LWR@freezethisautoid}% +\LWR@htmltag{div id="autoid-\arabic{LWR@thisautoid}" class="wpminipage"}% }{}% % \end{macrocode} @@ -22140,7 +22575,7 @@ $#1$} \ifbool{FormatWP}{% \LWR@htmlelementend{div}% -\boolfalse{LWR@freezethisfloat}% +\boolfalse{LWR@freezethisautoid}% }{}% \LWR@htmldivclassend{minipage}% @@ -23081,7 +23516,7 @@ width:\rndprintlength{\LWR@tempwidth}% % \end{macrocode} % Only if the width is not zero: % \begin{macrocode} -\ifthenelse{\dimtest{\LWR@tempwidth}{=}{0pt}}{}{% +\ifdimcomp{\LWR@tempwidth}{=}{0pt}{}{% % \end{macrocode} % If had a minipage this paragraph, try to inline the % white space without generating paragraph tags: @@ -23090,7 +23525,7 @@ width:\rndprintlength{\LWR@tempwidth}% % \end{macrocode} % Support the \HTML\ thin wrappable space: % \begin{macrocode} - \ifthenelse{\dimtest{\LWR@tempwidth}{=}{.16667em}} + \ifdimcomp{\LWR@tempwidth}{=}{.16667em}% {% \HTMLunicode{2009}% thin breakable space }% @@ -23200,6 +23635,14 @@ width:\rndprintlength{\LWR@tempwidth}% % \end{macrocode} % \end{macro} % +% \begin{macro}{\clearpage} +% \begin{macro}{\cleardoublepage} +% \begin{macrocode} +\renewcommand*{\clearpage}{} +\renewcommand*{\cleardoublepage}{} +% \end{macrocode} +% \end{macro} +% \end{macro} % % % \begin{macro}{\LWR@currenttextcolor} @@ -23271,12 +23714,12 @@ width:\rndprintlength{\LWR@tempwidth}% % The background color is used to draw the filled rule. % The color may be changed by \cs{textcolor}. % \begin{macrocode} - \ifbool{FormatWP}{}{background:\LWR@currenttextcolor; }% + \ifbool{FormatWP}{}{background:\LWR@currenttextcolor ; }% % \end{macrocode} % The width and height are printed, converted to PT: % \begin{macrocode} - width:\printlength{\LWR@tempwidth}; % - height:\printlength{\LWR@tempheight}; % + width:\printlength{\LWR@tempwidth} ; % + height:\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. @@ -23625,6 +24068,107 @@ width:\rndprintlength{\LWR@tempwidth}% % % % +% +% \iffalse +%<*patch-komascript> +% \fi +% +% \part{lwarp-patch-komascript.sty} +% +% \section{patch-komascript} +% +% \DescribePackage{lwarp-patch-komascript} +% Patches for \pkg{komascript} classes. +% +% \pkg{lwarp} loads this package when +% \pkg{scrbook}, \pkg{scrartcl}, or \pkg{scrreprt} are detected. +% +% \limitskomascript +% +% \changes{v0.44}{2017/11/19}{\pkg{lwarp-patch-komascript}: Added.} +% +% \codehtml +% +% \begin{macrocode} +\ProvidesPackage{lwarp-patch-komascript} +% \end{macrocode} +% +% \pkg{typearea} is emulated. +% \begin{macrocode} +\RequirePackage{lwarp-typearea} +% \end{macrocode} +% +% \pkg{tocbasic} is emulated. +% \begin{macrocode} +\RequirePackage{lwarp-tocbasic} +% \end{macrocode} +% +% \pkg{scrextend} patches most of the new macros. +% \begin{macrocode} +\RequirePackage{lwarp-scrextend} +% \end{macrocode} +% +% The \cs{minisec} is placed inside a \element{div} of class \attribute{minisec}. +% \begin{macrocode} +\renewcommand*{\minisec}[1]{ +\begin{BlockClass}{minisec} +#1 +\end{BlockClass} +} +% \end{macrocode} +% +% The part and chapter preambles are placed as plain text just after each heading. +% \begin{macrocode} +\@ifundefined{setpartpreamble}{}{ +\RenewDocumentCommand{\setpartpreamble}{o o +m}{% +\renewcommand{\part@preamble}{#3}% +} +} + +\@ifundefined{setchapterpreamble}{}{ +\RenewDocumentCommand{\setchapterpreamble}{o o +m}{% +\renewcommand{\chapter@preamble}{#3}% +} +} +% \end{macrocode} +% +% Simple captions are used in all cases. +% \begin{macrocode} +\LetLtxMacro\captionbelow\caption +\LetLtxMacro\captionabove\caption + +\LetLtxMacro\captionofbelow\captionof +\LetLtxMacro\captionofabove\captionof + +\RenewDocumentEnvironment{captionbeside}{o m o o o s} +{} +{% +\IfValueTF{#1}% +{\caption[#1]{#2}}% +{\caption{#2}}% +} + +\RenewDocumentEnvironment{captionofbeside}{m o m o o o s} +{} +{% +\IfValueTF{#2}% +{\captionof{#1}[#2]{#3}}% +{\captionof{#1}{#3}}% +} + +\RenewDocumentCommand{\setcapindent}{s m}{} +\renewcommand*{\setcaphanging}{} +\renewcommand*{\setcapwidth}[2][]{} +\renewcommand*{\setcapdynwidth}[2][]{} +\RenewDocumentCommand{\setcapmargin}{s o m}{} +% \end{macrocode} +% +% \iffalse +%</patch-komascript> +% \fi +% +% +% % \iffalse %<*a4> % \fi @@ -23634,7 +24178,7 @@ width:\rndprintlength{\LWR@tempwidth}% % \section{a4} % % \DescribePackage{a4} -% \pkg{a4} is emulated. +% \pkg{a4} is ignored. % % \changes{v0.39}{2017/08/27}{\pkg{a4}: Added.} % @@ -23664,7 +24208,7 @@ width:\rndprintlength{\LWR@tempwidth}% % \section{a4wide} % % \DescribePackage{a4wide} -% \pkg{a4wide} is emulated. +% \pkg{a4wide} is ignored. % % \changes{v0.39}{2017/08/27}{\pkg{a4wide}: Added.} % @@ -23690,7 +24234,7 @@ width:\rndprintlength{\LWR@tempwidth}% % \section{a5comb} % % \DescribePackage{a5comb} -% \pkg{a5comb} is emulated. +% \pkg{a5comb} is ignored. % % \changes{v0.39}{2017/08/27}{\pkg{a5comb}: Added.} % @@ -23816,6 +24360,8 @@ width:\rndprintlength{\LWR@tempwidth}% % % \section{adjmulticol} % +% \credits{Boris Veytsman} +% % \DescribePackage{adjmulticol} % \pkg{adjmulticol} is emulated. % @@ -23889,6 +24435,8 @@ margin-right:\rndprintlength{\LWR@templengthtwo}% % % \section{addlines} % +% \credits{Will Robertson} +% % \DescribePackage{addlines} % \pkg{addlines} is emulated. % @@ -23923,6 +24471,8 @@ margin-right:\rndprintlength{\LWR@templengthtwo}% % % \section{afterpage} % +% \credits{David Carlisle} +% % \DescribePackage{afterpage} Emulated. % % \changes{v0.20}{2017/01/11}{\pkg{afterpage}: Added.} @@ -23954,6 +24504,8 @@ margin-right:\rndprintlength{\LWR@templengthtwo}% % \section{algorithmicx} % \label{sec:algorithmicx} % +% \credits{Sz\'{a}sz J\'{a}nos} +% % \DescribePackage{algorithmicx} % \pkg{algorithmicx} is supported with minor adjustments. % @@ -23968,7 +24520,8 @@ margin-right:\rndprintlength{\LWR@templengthtwo}% % % \limitscombiningfloats % -% \changes{v0.42}{2017/10/27}{\pkg{algorithmic}: If \protect\texttt{FormatWP} add \cs{quad}s.} +% \changes{v0.42}{2017/10/27}{\pkg{algorithmicx}: If \protect\texttt{FormatWP} add \cs{quad}s.} +% \changes{v0.44}{2017/11/16}{\pkg{algorithmicx}: Improved comment symbol.} % % \codehtml % \begin{macrocode} @@ -23995,11 +24548,17 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"% }{}% \LWR@htmltagc{/span}% }% -% -\let\origComment\Comment% -% -\renewcommand{\Comment}[1]{\InlineClass{floatright}{\origComment{#1}}}% + +\let\LWR@origComment\Comment% + +\renewcommand{\Comment}[1]{% + \InlineClass{floatright}{\LWR@origComment{#1}}% +}% } + +\renewcommand\algorithmiccomment[1]{% +\hfill\HTMLunicode{25B7} #1% white right triangle +}% % \end{macrocode} % \begin{macrocode} @@ -24021,6 +24580,8 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"% % \section{alltt} % +% \credits{Johannes Braams} +% % \DescribePackage{alltt} % \pkg{alltt} is patched for use by \pkg{lwarp}. % @@ -24214,6 +24775,8 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"% % % \section{anonchap} % +% \credits{Peter Wilson} +% % \DescribePackage{anonchap} % \pkg{anonchap} is emulated. % @@ -24257,6 +24820,8 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"% % % \section{anysize} % +% \credits{Michael Salzenberg, Thomas Esser} +% % \DescribePackage{anysize} % \pkg{anysize} is emulated. % @@ -24290,6 +24855,8 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"% % % \section{appendix} % +% \credits{Peter Wilson} +% % \DescribePackage{appendix} % \pkg{appendix} is patched for use by \pkg{lwarp}. % @@ -24353,6 +24920,53 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"% % % % +% +% \iffalse +%<*atbegshi> +% \fi +% +% \part{lwarp-atbegshi.sty} +% +% \section{atbegshi} +% +% \credits{Heiko Oberdiek} +% +% \DescribePackage{atbegshi} Emulated. +% +% \changes{v0.44}{2017/11/10}{\pkg{atbegshi}: Added.} +% +% \codehtml +% +% Discard all options for \pkg{lwarp-atbegshi}: +% \begin{macrocode} +\LWR@ProvidesPackageDrop{atbegshi}[2011/10/05] +% \end{macrocode} +% +% \begin{macrocode} +\newcommand*{\AtBeginShipout}[1]{} +\newbox\AtBeginShipoutBox +\newcommand*{\AtBeginShipoutNext}[1]{} +\newcommand*{\AtBeginShipoutFirst}[1]{} +\newcommand*{\AtBeginShipoutDiscard}{} +\newcommand*{\AtBeginShipoutInit}{} +\newcommand*{\AtBeginShipoutAddToBox}[1]{} +\newcommand*{\AtBeginShipoutAddToBoxForeground}[1]{} +\newcommand*{\AtBeginShipoutUpperLeft}[1]{} +\newcommand*{\AtBeginShipoutUpperLeftForeground}[1]{} +\newcommand*{\AtBeginShipoutOriginalShipout}[1]{} +\def\AtBeginShipoutBoxWidth{0pt} +\def\AtBeginShipoutBoxHeight{0pt} +\def\AtBeginShipoutBoxDepth{0pt} + +% \end{macrocode} +% +% \iffalse +%</atbegshi> +% \fi +% +% +% +% % \iffalse %<*authblk> % \fi @@ -24361,6 +24975,8 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"% % % \section{authblk} % +% \credits{Patrick W. Daly} +% % \DescribePackage{authblk} % \pkg{authblk} is patched for \HTML. % @@ -24417,6 +25033,8 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"% % % \section{balance} % +% \credits{Patrick W. Daly} +% % \DescribePackage{balance} Emulated. % % \changes{v0.34}{2017/07/27}{\pkg{balance}: Added.} @@ -24450,6 +25068,8 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"% % \section{bigdelim} % \label{sec:bigdelim} % +% \credits{Piet van Oostrum, Øystein Bache, Jerry Leichter} +% % \DescribePackage{bigdelim} % \pkg{bigdelim} is used as-is for print or \env{lateximage}, and % patched for \HTML. @@ -24523,6 +25143,8 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"% % % \section{bigstrut} % +% \credits{Piet van Oostrum, Øystein Bache, Jerry Leichter} +% % \DescribePackage{bigstrut} % \pkg{bigstrut} is used as-is for print or \env{lateximage}, and % patched for \HTML. @@ -24561,9 +25183,10 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"% % \section{bookmark} % +% \credits{Heiko Oberdiek} +% % \DescribePackage{bookmark} -% \pkg{bookmark} is emulated during \HTML\ output, and -% the \pkg{bookmark} package is ignored. +% \pkg{bookmark} is emulated. % \changes{v0.20}{2017/01/03}{\pkg{bookmark}: Added.} % @@ -24599,6 +25222,7 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"% % \section{booktabs} % \label{sec:booktabs} % +% \credits{Simon Fear} % % \DescribePackage{booktabs} % \pkg{booktabs} is emulated during \HTML\ output, and @@ -24669,6 +25293,8 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"% % \section{boxedminipage2e} % +% \credits{Scott Pakin} +% % \DescribePackage{boxedminipage2e} % \pkg{boxedminipage2e} is emulated. % @@ -24707,6 +25333,8 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"% % % \section{breakurl} % +% \credits{Vilar Camara Neto} +% % \DescribePackage{breakurl} % \pkg{breakurl} is emulated. % @@ -24743,6 +25371,77 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"% % % % +% \iffalse +%<*cancel> +% \fi +% +% \part{lwarp-cancel.sty} +% +% \section{cancel} +% +% \DescribePackage{cancel} +% \pkg{cancel} is used as-is for SVG math, and emulated for HTML text output. +% +% \changes{v0.44}{2017/11/16}{\pkg{cancel}: Added.} +% +% \codehtml +% +% \begin{macrocode} +\LWR@ProvidesPackagePass{cancel} +% \end{macrocode} +% +% +% +% \cs{cancelto} is math-only, so is used as-is. +% \begin{macrocode} +\LetLtxMacro\LWR@origcancel\cancel +\LetLtxMacro\LWR@origbcancel\bcancel +\LetLtxMacro\LWR@origxcancel\xcancel + +\appto{\LWR@restoreorigformatting}{% +\LetLtxMacro\cancel\LWR@origcancel% +\LetLtxMacro\bcancel\LWR@origbcancel% +\LetLtxMacro\xcancel\LWR@origxcancel% +} +% \end{macrocode} + + +% \begin{noindmacro}{\LWR@cancelcolor} +% \marg{text} \marg{color} \marg{class} \marg{colorstyle} \marg{FormatWPstyle} +% +% Add colors if not empty: +% \begin{macrocode} +\newcommand{\LWR@cancelcolor}[5]{% +\ifcsempty{#2}% +{\LWR@HTMLtextstyle{#5}{#3}{#1}}% +{\LWR@htmlspanclass[#5;#4:\#\LWR@tempcolor]{#3}{#1}}% +} +% \end{macrocode} +% \end{noindmacro} + +% \begin{noindmacro}{\cancel} \marg{text} +% \begin{macrocode} +\DeclareRobustCommand{\cancel}[1]{% +\begingroup% +\CancelColor% +\LWR@findcurrenttextcolor% +\color{black}% +\LWR@cancelcolor{#1}{LWR@tempcolor}{sout}{text-decoration-color}% + {text-decoration:line-through}% +\endgroup% +} + +\LetLtxMacro\bcancel\cancel +\LetLtxMacro\xcancel\cancel +% \end{macrocode} +% \end{noindmacro} +% +% \iffalse +%</cancel> +% \fi +% +% +% % % \iffalse %<*caption2> @@ -24807,8 +25506,10 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"% % \section{changepage} % +% \credits{Peter Wilson} +% % \DescribePackage{changepage} -% \pkg{changepage} is ignored. +% \pkg{changepage} is emulated. % % \changes{v0.22}{2017/03/02}{\pkg{changepage}: Added.} % @@ -24828,6 +25529,13 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"% \newenvironment{adjustwidth*}[2]{}{} % \end{macrocode} +% \changes{v0.44}{2017/11/13}{\pkg{changepage}: Additional options.} +% \begin{macrocode} +\newcommand*{\strictpagecheck}{} +\newcommand*{\easypagecheck}{} +% \end{macrocode} + + % \iffalse %</changepage> % \fi @@ -24872,8 +25580,10 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"% % % \section{chappg} % +% \credits{Robin Fairbairns} +% % \DescribePackage{chappg} -% \pkg{chappg} is ignored. +% \pkg{chappg} is emulated. % % \changes{v0.38}{2017/08/25}{\pkg{chappg}: Added.} % @@ -24937,6 +25647,8 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"% % % \section{crop} % +% \credits{Melchior FRANZ} +% % \DescribePackage{crop} Emulated. % % \changes{v0.34}{2017/08/03}{\pkg{crop}: Added.} @@ -24969,6 +25681,8 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"% % % \section{cuted} % +% \credits{Sigitas Tolu\v{s}is} +% % \DescribePackage{cuted} % \pkg{cuted} is emulated. % @@ -25003,6 +25717,8 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"% % % \section{cutwin} % +% \credits{Peter Wilson and Alan Hoenig} +% % \DescribePackage{cutwin} Emulated. % % \changes{v0.26}{2017/03/30}{\pkg{cutwin}: Added.} @@ -25059,6 +25775,8 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"% % % \section{dblfnote} % +% \credits{Hiroshi Nakashima} +% % \DescribePackage{dblfnote} % \pkg{dblfnote} is emulated. % @@ -25101,8 +25819,7 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"% % \changes{v0.22}{2017/02/24}{\pkg{dcolumn}: Added.} % % \DescribePackage{dcolumn} -% \pkg{dcolumn} is emulated during \HTML\ output, and -% the \pkg{dcolumn} package is ignored. +% \pkg{dcolumn} is emulated by the \pkg{lwarp} core. % % \begin{macrocode} \LWR@ProvidesPackageDrop{dcolumn} @@ -25125,11 +25842,12 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"% % \section{draftwatermark} % \label{sec:draftwatermark} % +% \credits{Sergio Callegari} +% % \changes{v0.20}{2017/01/11}{\pkg{draftwatermark}: Added.} % % \DescribePackage{draftwatermark} -% \pkg{draftwatermark} is emulated during \HTML\ output, and -% the \pkg{draftwatermark} package is ignored. +% \pkg{draftwatermark} is emulated. % \codehtml @@ -25156,6 +25874,71 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"% % % % +% \iffalse +%<*easy-todo> +% \fi +% +% \part{lwarp-easy-todo.sty} + +% \section{easy-todo} +% +% \credits{Juan Rada-Vilela} +% +% \DescribePackage{easy-todo} +% \pkg{easy-todo} is patched for use by \pkg{lwarp}. +% +% \changes{v0.44}{2017/11/10}{\pkg{easy-todo}: Added.} +% +% \codehtml +% +% \begin{macrocode} +\LWR@ProvidesPackagePass{easy-todo} +% \end{macrocode} + +% \begin{noindmacro}{\listoftodos} +% Modified to correct buggy use of \cs{flushright}. +% \begin{macrocode} +\let\LWR@origlistoftodos\listoftodos + +\renewcommand{\listoftodos}{% +\begingroup +\renewcommand{\flushright}{} +\LWR@origlistoftodos +\endgroup +} +% \end{macrocode} +% \end{noindmacro} + + +% \begin{noindmacro}{\todoii} +% Modified to use \cs{textcolor} instead of \cs{color}. +% \begin{macrocode} +\renewcommand{\todoii}[2]{% +\ifthenelse{\equal{\@todoobeyfinal}{true}}{% + \ifoptionfinal{\todoenable{false}}{\todoenable{true}}% +}{}% +\ifthenelse{\equal{\@todoenable}{true}}{% +\refstepcounter{todos}% +\noindent{% + \todocolor% + \LWR@textcurrentcolor{% + \normalfont\scriptsize{\bfseries{\thetodos.#1}}% + }% +}% +\addcontentsline{lod}{todos}{\protect{\thetodos. }#2}% +}{}% +} +% \end{macrocode} +% \end{noindmacro} + + +% \iffalse +%</easy-todo> +% \fi +% +% +% +% % % \iffalse %<*ebook> @@ -25165,6 +25948,8 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"% % % \section{ebook} % +% \credits{Jørgen Steensgaard} +% % \DescribePackage{ebook} % \pkg{ebook} is emulated. % @@ -25204,11 +25989,12 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"% % \section{ellipsis} % \label{sec:ellipsis} % +% \credits{Peter J. Heslin} +% % \changes{v0.25}{2017/03/16}{\pkg{ellipsis}: Added.} % % \DescribePackage{ellipsis} -% \pkg{ellipsis} is emulated during \HTML\ output, and -% the \pkg{ellipsis} package is ignored. +% \pkg{ellipsis} is emulated. % \begin{macrocode} \LWR@ProvidesPackageDrop{ellipsis} @@ -25345,6 +26131,8 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"% % \section{enumitem} % \label{sec:enumitem} % +% \credits{Javier Bezos} +% % \DescribePackage{enumitem} % \pkg{enumitem} is supported with minor adjustments. % @@ -25404,10 +26192,10 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"% % \section{epigraph} % \label{sec:epigraph} % +% \credits{Peter Wilson} % % \DescribePackage{epigraph} -% \pkg{epigraph} is emulated during \HTML\ output, and -% the \pkg{epigraph} package is ignored. +% \pkg{epigraph} is emulated. % % \changes{v0.42}{2017/10/27}{\pkg{epigraph}: If \protect\texttt{FormatWP} add HTML styles.} % @@ -25482,11 +26270,12 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"% % \section{eso-pic} % \label{sec:eso-pic} % +% \credits{Rolf Niepraschk} +% % \changes{v0.20}{2017/01/11}{\pkg{eso-pic}: Added.} % % \DescribePackage{eso-pic} -% \pkg{eso-pic} is emulated during \HTML\ output, and -% the \pkg{eso-pic} package is ignored. +% \pkg{eso-pic} is emulated. % \codehtml @@ -25530,11 +26319,12 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"% % \section{everypage} % \label{sec:everypage} % +% \credits{Sergio Callegari} +% % \changes{v0.20}{2017/01/11}{\pkg{everypage}: Added.} % % \DescribePackage{everypage} -% \pkg{everypage} is emulated during \HTML\ output, and -% the \pkg{everypage} package is ignored. +% \pkg{everypage} is emulated. % \codehtml % \begin{macrocode} @@ -25563,6 +26353,8 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"% % % \section{everyshi} % +% \credits{Martin Schr\"{o}der} +% % \DescribePackage{everyshi} Emulated. % % \changes{v0.34}{2017/08/03}{\pkg{everyshi}: Added.} @@ -25596,8 +26388,10 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"% % \section{extramarks} % +% \credits{Piet van Oostrum} +% % \DescribePackage{extramarks} -% \pkg{extramarks} is not used. +% \pkg{extramarks} is emulated. % % \changes{v0.20}{2017/01/11}{\pkg{extramarks}: Added.} % @@ -25826,6 +26620,8 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"% % \section{fancyhdr} % +% \credits{Piet van Oostrum} +% % \DescribePackage{fancyhdr} % \pkg{fancyhdr} is nullified. % @@ -25867,6 +26663,83 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"% % % % +% \iffalse +%<*fancyref> +% \fi +% +% \part{lwarp-fancyref.sty} +% +% \section{fancyref} +% +% \DescribePackage{fancyref} +% \pkg{fancyref} is emulated. +% +% \changes{v0.44}{2017/11/22}{\pkg{fancyref}: Added.} +% +% \codehtml +% +% \begin{macrocode} +\LWR@ProvidesPackageDrop{fancyref} +% \end{macrocode} +% +% \begin{macrocode} +\newcommand*{\fancyrefhook}[1]{#1} +\newcommand*{\fref}[2][]{\cref{#2}} +\newcommand*{\Fref}[2][]{\Cref{#2}} +\newcommand*{\fancyrefchaplabelprefix}{chap} +\newcommand*{\fancyrefenumlabelprefix}{enum} +\newcommand*{\fancyrefeqlabelprefix}{eq} +\newcommand*{\fancyreffiglabelprefix}{fig} +\newcommand*{\fancyreffnlabelprefix}{fn} +\newcommand*{\fancyrefseclabelprefix}{sec} +\newcommand*{\fancyreftablabelprefix}{tab} +\newcommand*{\fancyrefchangeprefix}[2]{} +\newcommand*{\fancyrefargdelim}{:} +\newcommand*{\fancyrefloosespacing}{~} +\newcommand*{\fancyreftightspacing}{\,} +\newcommand*{\fancyrefdefaultspacing}{\fancyrefloosespacing} +\providecommand*{\chaptername}{Chapter} +\providecommand*{\figurename}{Figure} +\providecommand*{\pagename}{Page} +\providecommand*{\tablename}{Table} +\renewcommand*{\Frefchapname}{\chaptername} +\renewcommand*{\Frefenumname}{Item} +\renewcommand*{\Frefeqname}{Equation} +\renewcommand*{\Freffigname}{\figurename} +\renewcommand*{\Freffnname}{Footnote} +\renewcommand*{\Frefonname}{On} +\renewcommand*{\Frefpgname}{\pagename} +\renewcommand*{\Frefsecname}{Section} +\renewcommand*{\Frefseename}{See} +\renewcommand*{\Freftabname}{\tablename} +\renewcommand*{\Freffigshortname}{Fig.} +\renewcommand*{\Frefpgshortname}{P.} +\renewcommand*{\Freftabshortname}{Tab.} +\renewcommand*{\frefchapname}{\MakeLowercase{\Frefchapname}} +\renewcommand*{\frefenumname}{\MakeLowercase{\Frefenumname}} +\renewcommand*{\frefeqname}{\MakeLowercase{\Frefeqname}} +\renewcommand*{\freffigname}{\MakeLowercase{\Freffigname}} +\renewcommand*{\freffnname}{\MakeLowercase{\Freffnname}} +\renewcommand*{\frefonname}{\MakeLowercase{\Frefonname}} +\renewcommand*{\frefpgname}{\MakeLowercase{\Frefpgname}} +\renewcommand*{\frefsecname}{\MakeLowercase{\Frefsecname}} +\renewcommand*{\frefseename}{\MakeLowercase{\Frefseename}} +\renewcommand*{\freftabname}{\MakeLowercase{\Freftabname}} +\renewcommand*{\freffigshortname}{\MakeLowercase{\Freffigshortname}} +\renewcommand*{\frefpgshortname}{\MakeLowercase{\Frefpgshortname}} +\renewcommand*{\freftabshortname}{\MakeLowercase{\Freftabshortname}} +\newcommand*{\fancyrefaddcaptions}[2]{} +\newcommand*{\fancyrefdefaultformat}{\@empty} +\newcommand{\frefformat}[3]{} +\newcommand{\Frefformat}[3]{} +% \end{macrocode} +% +% \iffalse +%</fancyref> +% \fi +% +% +% % % % @@ -25995,35 +26868,21 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"% % behaviors depending on |frame|. % Original code is from the \pkg{fancyvrb} package. % \begin{macrocode} - -\newcommand*{\LWR@FVfindcurrentcolor}{% -\protect\colorlet{LWR@current@color}{.}% -\protect\convertcolorspec{named}{LWR@current@color}{HTML}\LWR@tempcolor% -} - -\newcommand*{\LWR@FVtextstyle}{% -\LWR@FVfindcurrentcolor -\ifdefstring{\LWR@tempcolor}{000000}% -{}% -{color: \#\LWR@tempcolor ; }% -} - - \newcommand*{\LWR@FVfindbordercolor}{% \FancyVerbRuleColor% -\LWR@FVfindcurrentcolor -\color{black} +\LWR@findcurrenttextcolor% +\color{black}% } % border width of \FV@FrameRule \newcommand*{\LWR@FVborderstyle}[1]{% -padding#1: \strip@pt\dimexpr \FV@FrameSep\relax\relax pt ; -\LWR@FVfindbordercolor -border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor ; +padding#1: \strip@pt\dimexpr \FV@FrameSep\relax\relax pt ; % +\LWR@FVfindbordercolor % +border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor ; % } \def\FV@Frame@none{% -\renewcommand*{\LWR@FVstyle}{\LWR@FVtextstyle}% +\renewcommand*{\LWR@FVstyle}{\LWR@currenttextcolorstyle}% \let\FV@BeginListFrame\LWR@fvstartnone% \let\FV@LeftListFrame\relax% \let\FV@RightListFrame\relax% @@ -26032,7 +26891,7 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor \FV@Frame@none% default values \def\FV@Frame@single{% -\renewcommand*{\LWR@FVstyle}{\LWR@FVtextstyle\LWR@FVborderstyle{}}% +\renewcommand*{\LWR@FVstyle}{\LWR@currenttextcolorstyle\LWR@FVborderstyle{}}% \let\FV@BeginListFrame\LWR@fvstartsingle% \let\FV@LeftListFrame\FV@LeftListFrame@Single% \let\FV@RightListFrame\FV@RightListFrame@Single% @@ -26040,7 +26899,7 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor \def\FV@Frame@lines{% \renewcommand*{\LWR@FVstyle}{% - \LWR@FVtextstyle\LWR@FVborderstyle{-top}\LWR@FVborderstyle{-bottom}% + \LWR@currenttextcolorstyle\LWR@FVborderstyle{-top}\LWR@FVborderstyle{-bottom}% }% \let\FV@BeginListFrame\LWR@fvstartline% \let\FV@LeftListFrame\relax% @@ -26048,21 +26907,21 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor \let\FV@EndListFrame\LWR@fvendline} \def\FV@Frame@topline{% -\renewcommand*{\LWR@FVstyle}{\LWR@FVtextstyle\LWR@FVborderstyle{-top}}% +\renewcommand*{\LWR@FVstyle}{\LWR@currenttextcolorstyle\LWR@FVborderstyle{-top}}% \let\FV@BeginListFrame\LWR@fvstartline% \let\FV@LeftListFrame\relax% \let\FV@RightListFrame\relax% \let\FV@EndListFrame\LWR@fvendnone} \def\FV@Frame@bottomline{% -\renewcommand*{\LWR@FVstyle}{\LWR@FVtextstyle\LWR@FVborderstyle{-bottom}}% +\renewcommand*{\LWR@FVstyle}{\LWR@currenttextcolorstyle\LWR@FVborderstyle{-bottom}}% \let\FV@BeginListFrame\LWR@fvstartnone% \let\FV@LeftListFrame\relax% \let\FV@RightListFrame\relax% \let\FV@EndListFrame\LWR@fvendline} \def\FV@Frame@leftline{% -\renewcommand*{\LWR@FVstyle}{\LWR@FVtextstyle\LWR@FVborderstyle{-left}}% +\renewcommand*{\LWR@FVstyle}{\LWR@currenttextcolorstyle\LWR@FVborderstyle{-left}}% % To define the \FV@FrameFillLine macro (from \FV@BeginListFrame) \ifx\FancyVerbFillColor\relax% \let\FV@FrameFillLine\relax% @@ -26183,6 +27042,8 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor % % \section{figcaps} % +% \credits{Patrick W. Daly} +% % \DescribePackage{figcaps} Emulated. % % \changes{v0.34}{2017/07/27}{\pkg{figcaps}: Added.} @@ -26240,6 +27101,136 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor % % % +% \iffalse +%<*fixme> +% \fi +% +% \part{lwarp-fixme.sty} + +% \section{fixme} +% +% \credits{Didier Verna} +% +% \DescribePackage{fixme} +% \pkg{fixme} is patched for use by \pkg{lwarp}. +% +% \limitsfixme +% +% \changes{v0.44}{2017/11/13}{\pkg{fixme}: Added.} +% +% \codehtml +% +% \begin{macrocode} +\LWR@ProvidesPackagePass{fixme} +% \end{macrocode} +% +% Restore \pkg{lwarp}'s version of \cs{@wrindex}, +% ignoring the \pkg{fixme} package's |target| option: +% \begin{macrocode} +\let\@wrindex\LWR@wrindex +% \end{macrocode} +% +% Float-related macros required by \pkg{lwarp}: +% \begin{macrocode} +\newcommand{\ext@fixme}{lox} + +\renewcommand{\l@fixme}[2]{\hypertocfloat{1}{fixme}{lox}{#1}{#2}} +% \end{macrocode} +% +% Other modifications: +% \begin{macrocode} +\def\FXFaceInlineHTMLStyle{font-weight:bold} + +\renewcommand*\FXLayoutInline[3]{ % +\InlineClass[\FXFaceInlineHTMLStyle]{fixmeinline}% + {\@fxtextstd{#1}{#2}{#3}}% +} + +\def\FXFaceEnvHTMLStyle{font-weight:bold} + +\renewcommand*\FXEnvLayoutPlainBegin[2]{% +\BlockClass[\FXFaceEnvHTMLStyle]{fixmebold} +\ignorespaces#2 \fxnotename{#1}: \ignorespaces} + +\renewcommand*\FXEnvLayoutPlainEnd[2]{\endBlockClass} + +\renewcommand*\FXEnvLayoutSignatureBegin[2]{% +\BlockClass[\FXFaceEnvHTMLStyle]{fixmebold} +\fxnotename{#1}: \ignorespaces} + +\renewcommand*\FXEnvLayoutSignatureEnd[2]{\@fxsignature{#2}\endBlockClass} + +\def\FXFaceSignatureHTMLStyle{font-style:italic} + +\DeclareRobustCommand*\@fxsignature[1]{% +\ifthenelse{\equal{#1}{}}% +{}% +{ -- {\InlineClass[\FXFaceSignatureHTMLStyle]{fixmesignature}{#1}}}% +} + + +\def\FXFaceTargetHTMLStyle{font-style:italic} + +\renewcommand\FXTargetLayoutPlain[2]{% + \InlineClass[\FXFaceTargetHTMLStyle]{fixmetarget}{#2}% +} +% \end{macrocode} + +% \iffalse +%</fixme> +% \fi +% +% +% +% +% \iffalse +%<*fixmetodonotes> +% \fi +% +% \part{lwarp-fixmetodonotes.sty} + +% \section{fixmetodonotes} +% +% \credits{Gioele Barabucci} +% +% \DescribePackage{fixmetodonotes} +% \pkg{fixmetodonotes} is patched for use by \pkg{lwarp}. +% +% \changes{v0.44}{2017/11/10}{\pkg{fixmetodonotes}: Added.} +% +% \codehtml +% +% \begin{macrocode} +\LWR@ProvidesPackagePass{fixmetodonotes} +% \end{macrocode} + +% \begin{macrocode} +\renewcommand{\NOTES@addtolist}[2]{% + \refstepcounter{NOTES@note}% +% \phantomsection% REMOVED + \addcontentsline{notes}{NOTES@note}{% + \protect\numberline{\theNOTES@note}{{#1}: {#2}}% + }% +} + +\renewcommand{\NOTES@marker}[2]{\fbox{% + \textcolor{#2}{% WAS \color + \textbf{#1}}% + }} + +\renewcommand{\NOTES@colorline}[2]{% + \bgroup% + \ULon{\LWR@backgroundcolor{#1}{#2}}% +} +% \end{macrocode} + +% \iffalse +%</fixmetodonotes> +% \fi +% +% +% +% % % \iffalse %<*float> @@ -26251,9 +27242,10 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor % \label{sec:newfloat} % \label{sec:float} % +% \credits{Anselm Lingnau} +% % \DescribePackage{float} -% \pkg{float} is emulated during \HTML\ output, and -% the \pkg{float} package is ignored. +% \pkg{float} is emulated. % % \changes{v0.20}{2017/01/22}{Improved float caption type handling.} % @@ -26347,6 +27339,8 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor % % \section{floatflt} % +% \credits{Mats Dahlgren} +% % \DescribePackage{floatflt} Emulated. % % \changes{v0.26}{2017/03/30}{\pkg{floatflt}: Added.} @@ -26417,6 +27411,8 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor % % \section{floatpag} % +% \credits{Vytas Statulevi\v{c}ius and Sigitas Tolu\v{s}is} +% % \DescribePackage{floatpag} Emulated. % % \changes{v0.34}{2017/08/03}{\pkg{floatpag}: Added.} @@ -26451,9 +27447,10 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor % \section{floatrow} % \label{sec:floatrow} % +% \credits{Olga Lapko} +% % \DescribePackage{floatrow} -% \pkg{floatrow} is emulated during \HTML\ output, and -% the \pkg{floatrow} package is ignored. +% \pkg{floatrow} is emulated. % \codehtml % \begin{macrocode} @@ -26790,6 +27787,8 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor % % \section{flushend} % +% \credits{Sigitas Tolu\v{s}is} +% % \DescribePackage{flushend} Emulated. % % \changes{v0.34}{2017/07/27}{\pkg{flushend}: Added.} @@ -26827,8 +27826,10 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor % \section{fncychap} % +% \credits{Ulf A. Lindgren} +% % \DescribePackage{fncychap} -% \pkg{fncychap} is ignored. +% \pkg{fncychap} is emulated. % % \changes{v0.38}{2017/08/24}{\pkg{fncychap}: Added.} % @@ -26882,6 +27883,8 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor % % \section{fnpos} % +% \credits{Hiroshi Nakashima} +% % \DescribePackage{fnpos} % \pkg{fnpos} is emulated. % @@ -26916,22 +27919,23 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor % \section{fontenc} % % \DescribePackage{fontenc} -% Error if \pkg{fontenc} is loaded after \pkg{lwarp}. +% If using pdf\LaTeX, \pkg{lwarp} used to require \pkg{fontspec} be loaded +% before \pkg{lwarp}, +% but now \pkg{lwarp} itself loads \cs{fontspec} with T1 encoding, which +% \pkg{lwarp} requires. \pkg{fontspec} is now allowed to be loaded with another +% encoding after \pkg{lwarp}. +% +% \pkg{lwarp-fontenc} is no longer necessary, but is still provided to overwrite +% older versions. % % \changes{v0.21}{2017/02/22}{\pkg{fontenc}: Added.} +% \changes{v0.44}{2017/11/16}{\pkg{fontenc}: Allowed after \pkg{lwarp}.} % - -% Discard all options for \pkg{lwarp-fontenc}: - % \codehtml % \begin{macrocode} -\LWR@ProvidesPackageDrop{fontenc} -% \end{macrocode} - -% \begin{macrocode} -\LWR@loadbefore{fontenc} +\LWR@ProvidesPackagePass{fontenc} % \end{macrocode} - +% % \iffalse %</fontenc> % \fi @@ -26987,8 +27991,7 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor % \changes{v0.26}{2017/03/27}{\pkg{footmisc}: Added.} % % \DescribePackage{footmisc} -% \pkg{footmisc} is emulated during \HTML\ output, and -% the \pkg{footmisc} package is ignored. +% \pkg{footmisc} is emulated. % % \begin{macrocode} \LWR@ProvidesPackageDrop{footmisc} @@ -27055,6 +28058,8 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor % % \section{footnote} % +% \credits{Mark Wooding} +% % \DescribePackage{footnote} % \pkg{footnote} is used with minor patches. % @@ -27351,7 +28356,7 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor % % \section{fullpage} % -% \DescribePackage{fullpage} Emulated. +% \DescribePackage{fullpage} \pkg{fullpage} is ignored. % % \changes{v0.34}{2017/07/27}{\pkg{fullpage}: Added.} % @@ -27379,6 +28384,8 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor % % \section{fullwidth} % +% \credits{Marco Daniel} +% % \DescribePackage{fullwidth} % \pkg{fullwidth} is emulated. % @@ -27419,6 +28426,8 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor % \section{geometry} % +% \credits{Hideo Umeki} +% % \DescribePackage{geometry} % \pkg{geometry} is preloaded by \pkg{lwarp}, but must be nullified % as seen by the user's source code. @@ -27457,6 +28466,8 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor % \section{glossaries} % +% \credits{Nicola L.C. Talbot} +% % \DescribePackage{glossaries} % \limitsglossaries % @@ -27510,6 +28521,8 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor % \section{graphics} % +% \credits{D. P. Carlisle} +% % \DescribePackage{graphics} % \pkg{graphics} is emulated. % @@ -27975,7 +28988,7 @@ img src="\LWR@parsedfilename" \LWR@orignewline% \LWR@traceinfo{includegraphics} \LWR@ensuredoingapar% \begingroup% -\catcode`\_=12% +\catcode`\_=12 \LWR@includegraphicsb% }% includegraphics }% AtBeginDocument @@ -28210,6 +29223,96 @@ img src="\LWR@parsedfilename" \LWR@orignewline% % % % +% \iffalse +%<*hang> +% \fi +% +% \part{lwarp-hang.sty} +% +% \section{hang} +% +% \DescribePackage{hang} +% \pkg{hang} is emulated. +% +% \changes{v0.44}{2017/11/15}{\pkg{hang}: Added.} +% +% \codehtml +% +% \begin{macrocode} +\LWR@ProvidesPackageDrop{hang} +% \end{macrocode} +% +% \begin{macrocode} +\newlength{\hangingindent} +\setlength{\hangingindent}{1em} +\newlength{\hangingleftmargin} +\setlength{\hangingleftmargin}{0em} + +\newcommand*{\LWR@findhangingleftmargin}{% +\setlength{\LWR@templengthone}{\hangingleftmargin}% +\addtolength{\LWR@templengthone}{\hangingindent}% +} + +\newenvironment{hangingpar} +{ + \LWR@findhangingleftmargin% + \uselengthunit{PT}% + \BlockClass[% + margin-left:\rndprintlength{\LWR@templengthone}; % + text-indent:-\rndprintlength{\hangingindent}% + ]% + {hangingpar}% +} +{\endBlockClass} + +\newenvironment{hanginglist} +{% + \renewcommand*{\LWR@printcloselist}{\LWR@printcloseitemize}% + \renewcommand*{\LWR@printopenlist}{% + \LWR@findhangingleftmargin% + \uselengthunit{PT}% + ul style="list-style-type:none; % + margin-left:\rndprintlength{\LWR@templengthone}; % + text-indent:-\rndprintlength{\hangingindent}"% + }% + \let\item\LWR@itemizeitem% + \list{}{}% +} +{\endlist} + +\newenvironment{compacthang} +{\hanginglist} +{\endhanginglist} + +\newlength{\labeledleftmargin} +\setlength{\labeledleftmargin}{0em} + +\newenvironment{labeledpar}[2] +{% + \BlockClass[% + \LWR@findhangingleftmargin% + \uselengthunit{PT}% + margin-left:\rndprintlength{\LWR@templengthone}; % + text-indent:-\rndprintlength{\hangingindent}% + ]{labeledpar}#2% +} +{\endBlockClass} + +\newenvironment{labeledlist}[1] +{\hanginglist} +{\endhanginglist} + +\newenvironment{compactlabel}[1] +{\hanginglist} +{\endhanginglist} +% \end{macrocode} +% +% \iffalse +%</hang> +% \fi +% +% +% % % % \iffalse @@ -28220,9 +29323,10 @@ img src="\LWR@parsedfilename" \LWR@orignewline% % \section{hyperref} % +% \credits{Sebastian Rahtz, Heiko Oberdiek} +% % \DescribePackage{hyperref} -% \pkg{hyperref} is emulated during \HTML\ output, and -% the \pkg{hyperref} package is ignored. +% \pkg{hyperref} is emulated. % \changes{v0.20}{2017/01/03}{\pkg{hyperref}: Additional user macros.} % @@ -28608,6 +29712,8 @@ img src="\LWR@parsedfilename" \LWR@orignewline% % % \section{idxlayout} % +% \credits{Thomas Titz} +% % \DescribePackage{idxlayout} Emulated. % % \changes{v0.34}{2017/07/27}{\pkg{idxlayout}: Added.} @@ -28648,6 +29754,53 @@ img src="\LWR@parsedfilename" \LWR@orignewline% % % % +% \iffalse +%<*ifoddpage> +% \fi + +% \part{lwarp-ifoddpage.sty} + +% \section{ifoddpage} +% +% \credits{Martin Scharrer} +% +% \DescribePackage{ifoddpage} +% \pkg{ifoddpage} is emulated. +% +% \changes{v0.44}{2017/11/13}{\pkg{ifoddpage}: Added.} +% +% \codehtml +% +% Discard all options for \pkg{lwarp-ifoddpage}: +% \begin{macrocode} +\LWR@ProvidesPackageDrop{ifoddpage} +% \end{macrocode} + +% \begin{macrocode} +\newif\ifoddpage + +\newif\ifoddpageoroneside + +\DeclareRobustCommand{\checkoddpage}{\oddpagetrue\oddpageoronesidetrue} + +\def\oddpage@page{1} + +\def\@ifoddpage{% + \expandafter\@firstoftwo +} + +\def\@ifoddpageoroneside{% + \expandafter\@firstoftwo +} +% \end{macrocode} + +% \iffalse +%</ifoddpage> +% \fi +% +% +% +% % % \iffalse %<*indentfirst> @@ -28720,6 +29873,8 @@ img src="\LWR@parsedfilename" \LWR@orignewline% % \section{keyfloat} % \label{sec:keyfloat} % +% \credits{Brian Dunn} +% % \DescribePackage{keyfloat} % \pkg{keyfloat} is supported with minor adjustments. % @@ -28886,8 +30041,10 @@ img src="\LWR@parsedfilename" \LWR@orignewline% % \section{layout} % +% \credits{Kent McPherson, Johannes Braams, Hideo Umeki} +% % \DescribePackage{layout} -% \pkg{layout} is ignored. +% \pkg{layout} is emulated. % % \changes{v0.22}{2017/03/01}{\pkg{layout}: Added.} % @@ -28917,6 +30074,8 @@ img src="\LWR@parsedfilename" \LWR@orignewline% % \section{letterspace} % +% \credits{R Schlicht} +% % \DescribePackage{letterspace} % \pkg{letterspace} is a subset of microtype, which is pre-loaded by \pkg{lwarp}. % All user options and macros are ignored and disabled. @@ -29019,11 +30178,12 @@ img src="\LWR@parsedfilename" \LWR@orignewline% % \section{lips} % \label{sec:lips} % +% \credits{Matt Swift} +% % \changes{v0.25}{2017/03/16}{\pkg{lips}: Added.} % % \DescribePackage{lips} -% \pkg{lips} is emulated during \HTML\ output, and -% the \pkg{lips} package is ignored. +% \pkg{lips} is emulated. % \begin{macrocode} % \LWR@ProvidesPackageDrop{lips} @@ -29310,10 +30470,10 @@ img src="\LWR@parsedfilename" \LWR@orignewline% % \section{longtable} % \label{sec:longtable} % +% \credits{David Carlisle} % % \DescribePackage{longtable} -% \pkg{longtable} is emulated during \HTML\ output, and -% the \pkg{longtable} package is ignored. +% \pkg{longtable} is emulated. % \codehtml % \begin{macrocode} @@ -29403,8 +30563,10 @@ img src="\LWR@parsedfilename" \LWR@orignewline% % \section{lscape} % +% \credits{D. P. Carlisle} +% % \DescribePackage{lscape} -% \pkg{lscape} is nullified. +% \pkg{lscape} is emulated. % % \changes{v0.22}{2017/03/01}{\pkg{lscape}: Added.} % @@ -29434,10 +30596,10 @@ img src="\LWR@parsedfilename" \LWR@orignewline% % \section{ltcaption} % \label{sec:ltcaption} % +% \credits{Axel Sommerfeldt} % % \DescribePackage{ltcaption} -% \pkg{ltcaption} is emulated during \HTML\ output, and -% the \pkg{ltcaption} package is ignored. +% \pkg{ltcaption} is emulated. % \changes{v0.20}{2017/01/29}{\pkg{ltcaption}: Added.} @@ -29465,6 +30627,40 @@ img src="\LWR@parsedfilename" \LWR@orignewline% % % % +% \iffalse +%<*ltxtable> +% \fi +% +% \part{lwarp-ltxtable.sty} +% +% \section{ltxtable} +% +% \DescribePackage{ltxtable} +% \pkg{ltxtable} is emulated. +% +% \changes{v0.44}{2017/11/15}{\pkg{ltxtable}: Added.} +% +% \codehtml +% +% \begin{macrocode} +\LWR@ProvidesPackageDrop{ltxtable} +% \end{macrocode} +% +% \begin{noindmacro}{\LTXtable} \marg{width} \marg{file} +% \begin{macrocode} +\newcommand*{\LTXtable}[2]{% +\input{#2}% +} +% \end{macrocode} +% \end{noindmacro} +% +% \iffalse +%</ltxtable> +% \fi +% +% +% +% % % % \iffalse @@ -29475,25 +30671,106 @@ img src="\LWR@parsedfilename" \LWR@orignewline% % % \section{luatodonotes} % +% \credits{Fabian Lipp} +% % \DescribePackage{luatodonotes} % \pkg{luatodonotes} is emulated. % % \limitstodonotes % -% \changes{v0.43}{2017/10/07}{\pkg{luatodonotes}: Added.} +% \changes{v0.43}{2017/11/07}{\pkg{luatodonotes}: Added.} +% \changes{v0.44}{2017/11/10}{\pkg{luatodonotes}: Improved.} % % \codehtml % % \begin{macrocode} -\LWR@ProvidesPackageDrop{luatodonotes} +\LWR@ProvidesPackagePass{luatodonotes} % \end{macrocode} % +% +% Nullify options: % \begin{macrocode} -\newcommand{\listoftodos}[1][]{} -\newcommand{\todo}[2][]{} -\newcommand{\missingfigure}[2][]{} -\newcommand{\todototoc}{} -\newcommand{\todoarea}[3][]{}% +\@todonotes@additionalMarginEnabledfalse +% \end{macrocode} +% +% +% \begin{macrocode} +\if@todonotes@disabled +\else + +\newcommand{\ext@todo}{tdo} + +\renewcommand{\l@todo}[2]{\hypertocfloat{1}{todo}{ldo}{#1}{#2}} + + +\renewcommand{\@todonotes@drawMarginNoteWithLine}{% +\fcolorbox + {\@todonotes@currentbordercolor} + {\@todonotes@currentbackgroundcolor} + {\arabic{@todonotes@numberoftodonotes}} +\marginpar{\@todonotes@drawMarginNote} +} + +\renewcommand{\@todonotes@drawInlineNote}{% +\fcolorboxBlock% + {\@todonotes@currentbordercolor}% + {\@todonotes@currentbackgroundcolor}% + {% + \if@todonotes@authorgiven% + {\@todonotes@author:\,}% + \fi% + \@todonotes@text% + }% +} + +\newcommand{\@todonotes@drawMarginNote}{% + \if@todonotes@authorgiven% + \@todonotes@author\par% + \fi% + \arabic{@todonotes@numberoftodonotes}: % + \fcolorbox% + {\@todonotes@currentbordercolor}% + {\@todonotes@currentbackgroundcolor}% + {% + \@todonotes@sizecommand% + \@todonotes@text % + }% +}% + +\renewcommand{\missingfigure}[2][]{% +\setkeys{todonotes}{#1}% +\addcontentsline{tdo}{todo}{\@todonotes@MissingFigureText: #2}% +\fcolorboxBlock% + {\@todonotes@currentbordercolor}% + {\@todonotes@currentfigcolor}% + {% + \setlength{\fboxrule}{4pt}% + \fcolorbox{red}{white}{Missing figure} \quad #2% + } +} + +\LetLtxMacro\LWRTODONOTES@orig@todocommon\@todocommon + +\RenewDocumentCommand{\@todocommon}{m m}{% +\begingroup% +\renewcommand*{\phantomsection}{}% +\LWRTODONOTES@orig@todocommon{#1}{#2}% +\endgroup% +} + +\renewcommand{\@todoarea}[3][]{% + \@todonotes@areaselectedtrue% + \@todocommon{#1}{#2}% + \todonotes@textmark@highlight{#3}% + \zref@label{@todonotes@\arabic{@todonotes@numberoftodonotes}@end}% +}% + + +\DeclareDocumentCommand{\todonotes@textmark@highlight}{m}{% +\InlineClass[background:\#B3FFB3]{highlight}{#1}% +} + +\fi% \if@todonotes@disabled % \end{macrocode} % % \iffalse @@ -29513,7 +30790,7 @@ img src="\LWR@parsedfilename" \LWR@orignewline% % % \section{marginfit} % -% \DescribePackage{marginfit} Emulated. +% \DescribePackage{marginfit} \pkg{marginfit} is ignored. % % \changes{v0.34}{2017/07/25}{\pkg{marginfit}: Added.} % @@ -29540,6 +30817,8 @@ img src="\LWR@parsedfilename" \LWR@orignewline% % % \section{marginfix} % +% \credits{Stephen Hicks} +% % \DescribePackage{marginfix} Emulated. % % \changes{v0.26}{2017/03/29}{\pkg{marginfix}: Added.} @@ -29582,6 +30861,8 @@ img src="\LWR@parsedfilename" \LWR@orignewline% % % \section{marginnote} % +% \credits{Markus Kohm} +% % \DescribePackage{marginnote} Emulated. % % \changes{v0.26}{2017/03/30}{\pkg{marginnote}: Added.} @@ -29620,6 +30901,8 @@ img src="\LWR@parsedfilename" \LWR@orignewline% % \section{mcaption} % +% \credits{Stephan Hennig} +% % \DescribePackage{mcaption} % \pkg{mcaption} is nullified. % @@ -29656,6 +30939,7 @@ img src="\LWR@parsedfilename" \LWR@orignewline% % \section{mdframed} % \label{sec:mdframed} % +% \credits{Marco Daniel, Elke Schubert} % % \DescribePackage{mdframed} % \pkg{mdframed} is loaded with options forced to @@ -30169,8 +31453,10 @@ background: % % \section{metalogo} % +% \credits{Andrew Gilbert Moschou} +% % \DescribePackage{metalogo} -% \pkg{metalogo} is ignored. +% \pkg{metalogo} is emulated. % % \changes{v0.38}{2017/08/25}{\pkg{metalogo}: Added.} % @@ -30207,6 +31493,8 @@ background: % \section{microtype} % +% \credits{R Schlicht} +% % \DescribePackage{microtype} % \pkg{microtype} is pre-loaded by \pkg{lwarp}. % All user options and macros are ignored and disabled. @@ -30269,6 +31557,8 @@ background: % % \section{midfloat} % +% \credits{Sigitas Tolu\v{s}is} + % \DescribePackage{midfloat} % \pkg{midfloat} is emulated. % @@ -30302,12 +31592,11 @@ background: % \section{moreverb} % \label{sec:moreverb} % +% \credits{Robin Fairbairns} % % \DescribePackage{moreverb} % \pkg{moreverb} is supported with some patches. % -% -% % \changes{v0.34}{2017/08/02}{\pkg{moreverb}: Added.} % \changes{v0.42}{2017/10/27}{\pkg{moreverb}: Simplified formatting of listings.} % @@ -30462,7 +31751,7 @@ background: % % \section{mparhack} % -% \DescribePackage{mparhack} Emulated. +% \DescribePackage{mparhack} Ignored. % % \changes{v0.26}{2017/03/29}{\pkg{mparhack}: Added.} % @@ -30491,10 +31780,10 @@ background: % \section{multicol} % \label{sec:multicol} % +% \credits{Frank Mittelbach} % % \DescribePackage{multicol} -% \pkg{multicol} is emulated during \HTML\ output, and -% the \pkg{multicol} package is ignored. +% \pkg{multicol} is emulated. % \codehtml % \begin{macrocode} @@ -30575,6 +31864,8 @@ background: % \section{multirow} % \label{sec:multirow} % +% \credits{Piet van Oostrum, Øystein Bache, Jerry Leichter} +% % \DescribePackage{multirow} % \pkg{multirow} is emulated during \HTML\ output, and % used as-is while inside a \env{lateximage}. @@ -30659,7 +31950,6 @@ class="td% % \begin{macrocode} \LWR@tdstartstyles% \LWR@addcmidrulewidth% -\LWR@addformatwpalignment% \LWR@tdendstyles% }% % \end{macrocode} @@ -30779,6 +32069,8 @@ class="td% % \section{needspace} % +% \credits{Peter Wilson} +% % \DescribePackage{needspace} % \pkg{needspace} is not used during \HTML\ conversion. % @@ -30876,6 +32168,8 @@ class="td% % \section{nextpage} % +% \credits{Peter Wilson} +% % \DescribePackage{nextpage} % \pkg{nextpage} is nullified. % @@ -30968,6 +32262,8 @@ class="td% % \section{nowidow} % +% \credits{Rapha\"{e}l Pinson} +% % \DescribePackage{nowidow} % \pkg{nowidow} is not used during \HTML\ conversion. % @@ -31178,9 +32474,9 @@ class="td% % an \HTML\ anchor. These are used for list-of-theorem cross-references. % \begin{macrocode} \newcommand{\LWR@inctheorem}{% -\addtocounter{LWR@thisfloat}{1}% +\addtocounter{LWR@thisautoid}{1}% \LWR@stoppars% -\LWR@htmltag{a id="autofloat-\arabic{LWR@thisfloat}"{}}\LWR@htmltag{/a}% +\LWR@htmltag{a id="autoid-\arabic{LWR@thisautoid}"{}}\LWR@htmltag{/a}% \LWR@startpars% } % \end{macrocode} @@ -31635,10 +32931,13 @@ class="td% % \section{overpic} % \label{sec:overpic} % +% \credits{Rolf Niepraschk} +% % \DescribePackage{overpic} % \pkg{overpic} is patched for use by \pkg{lwarp}. % % \changes{v0.42}{2017/10/16}{\pkg{overpic}: Added.} +% \changes{v0.44}{2017/11/16}{\pkg{overpic}: Fix: Groups for lateximages.} % % \limitsoverpic % @@ -31656,20 +32955,20 @@ class="td% \newcommand*{\overpicfontskip}{14} \BeforeBeginEnvironment{overpic}{% - \lateximage% + \begin{lateximage}% \fontsize{\overpicfontsize}{\overpicfontskip}% \selectfont% } -\AfterEndEnvironment{overpic}{\endlateximage} +\AfterEndEnvironment{overpic}{\end{lateximage}} \BeforeBeginEnvironment{Overpic}{% - \lateximage% + \begin{lateximage}% \fontsize{\overpicfontsize}{\overpicfontskip}% \selectfont% } -\AfterEndEnvironment{Overpic}{\endlateximage} +\AfterEndEnvironment{Overpic}{\end{lateximage}} % \end{macrocode} % \iffalse @@ -31717,6 +33016,8 @@ class="td% % \section{paralist} % \label{sec:paralist} % +% \credits{Bernd Schandl} +% % \DescribePackage{paralist} % \pkg{paralist} is supported with minor changes. @@ -31727,13 +33028,25 @@ class="td% \LWR@ProvidesPackagePass{paralist} % \end{macrocode} % +% The compact environments are identical to the regular ones: % \begin{macrocode} \AtBeginEnvironment{compactitem}{\LWR@itemizestart} -\AtEndEnvironment{compactitem}{\LWR@itemizeend} \AtBeginEnvironment{compactenum}{\LWR@enumeratestart} -\AtEndEnvironment{compactenum}{\LWR@enumerateend} \AtBeginEnvironment{compactdesc}{\LWR@descriptionstart} -\AtEndEnvironment{compactdesc}{\LWR@descriptionend} +\AtEndEnvironment{compactitem}{\LWR@listend} +\AtEndEnvironment{compactenum}{\LWR@listend} +\AtEndEnvironment{compactdesc}{\LWR@listend} +% \end{macrocode} +% +% For the inline environments, revert \cs{item} to its original print-mode version: +% \begin{macrocode} +\AtBeginEnvironment{inparaitem}{\LetLtxMacro\item\LWR@origitem} +\AtBeginEnvironment{inparaenum}{\LetLtxMacro\item\LWR@origitem} +\AtBeginEnvironment{inparadesc}{\LetLtxMacro\item\LWR@origitem} +% \end{macrocode} +% +% Manual formatting of the description labels: +% \begin{macrocode} \def\paradescriptionlabel#1{{\normalfont\textbf{#1}}} % \end{macrocode} % @@ -31815,9 +33128,12 @@ class="td% % % \section{pdfsync} % +% \credits{J. Laurens} +% % \DescribePackage{pdfsync} Emulated. % % \changes{v0.34}{2017/08/03}{\pkg{pdfsync}: Added.} +% \changes{v0.44}{2017/11/19}{\pkg{pdfsync}: Fixes.} % % \codehtml % @@ -31827,9 +33143,9 @@ class="td% % \end{macrocode} % % \begin{macrocode} -\let\pdfsync\relax -\let\pdfsyncstart\relax -\let\pdfsyncstop\relax +\newcommand*{\pdfsync}{} +\newcommand*{\pdfsyncstart}{} +\newcommand*{\pdfsyncstop}{} % \end{macrocode} % % \iffalse @@ -31877,6 +33193,8 @@ class="td% % % \section{placeins} % +% \credits{Donald Arseneau} +% % \DescribePackage{placeins} % \pkg{placeins} is not used during \HTML\ conversion. % @@ -31911,6 +33229,8 @@ class="td% % % \section{prelim2e} % +% \credits{Martin Schröder} +% % \DescribePackage{prelim2e} Emulated. % % \changes{v0.34}{2017/08/03}{\pkg{prelim2e}: Added.} @@ -31934,6 +33254,42 @@ class="td% % % % +% \iffalse +%<*preview> +% \fi +% +% \part{lwarp-preview.sty} +% +% \section{preview} +% +% \DescribePackage{preview} +% \pkg{preview} is ignored. +% +% \changes{v0.44}{2017/11/22}{\pkg{preview}: Added.} +% +% \codehtml +% +% \begin{macrocode} +\LWR@ProvidesPackageDrop{preview} +% \end{macrocode} +% +% \begin{macrocode} +\newenvironment{preview}{}{} +\newenvironment{nopreview}{}{} +\NewDocumentCommand{\PreviewMacro}{s o o +m}{} +\NewDocumentCommand{\PreviewEnvironment}{s o o +m}{} +\newcommand{\PreviewSnarfEnvironment}[2][]{} +\NewDocumentCommand{\PreviewOpen}{s o}{} +\NewDocumentCommand{\PreviewClose}{s o}{} +\let\ifPreview\iffalse% \fi for syntax highlighting +% \end{macrocode} +% +% \iffalse +%</preview> +% \fi +% +% +% % % % \iffalse @@ -31944,11 +33300,11 @@ class="td% % % \section{quotchap} % +% \credits{Karsten Tinnefeld, Jan Klever} +% % \DescribePackage{quotchap} % \pkg{quotchap} is emulated. % -% \credits{Karsten Tinnefeld, Jan Klever} -% % \changes{v0.40}{2017/09/22}{\pkg{quotchap}: Added.} % % \codehtml @@ -32024,6 +33380,8 @@ class="td% % % \section{ragged2e} % +% \credits{Martin Schröder} +% % \DescribePackage{ragged2e} % \pkg{ragged2e} is not used during \HTML\ conversion. % @@ -32079,6 +33437,8 @@ class="td% % % \section{realscripts} % +% \credits{Will Robertson} +% % \DescribePackage{realscripts} % \pkg{realscripts} is emulated. % See |lwarp.css| for the \element{span} of class \attribute{supsubscript}. @@ -32141,6 +33501,8 @@ class="td% % \section{relsize} % +% \credits{Donald Arseneau, Bernie Cosell, Matt Swift} +% % \DescribePackage{relsize} % \pkg{relsize} is patched for use by \pkg{lwarp}. % @@ -32213,6 +33575,9 @@ class="td% % \section{romanbar} % +% \credits{H.-Martin M\"{u}nch} + +% % \DescribePackage{romanbar} % \pkg{romanbar} is patched for use by \pkg{lwarp}. % @@ -32276,9 +33641,10 @@ class="td% % \section{rotating} % +% \credits{Robin Fairbairns, Sebastian Rahtz, Leonor Barroca} +% % \DescribePackage{rotating} -% \pkg{rotating} is emulated during \HTML\ output, and -% the \pkg{rotating} package is ignored. +% \pkg{rotating} is emulated. % % All rotations are ignored in \HTML\ output. % @@ -32321,9 +33687,10 @@ class="td% % \section{rotfloat} % +% \credits{Axel Sommerfeldt} +% % \DescribePackage{rotfloat} -% \pkg{rotfloat} is emulated during \HTML\ output, and -% the \pkg{rotfloat} package is ignored. +% \pkg{rotfloat} is emulated. % % \changes{v0.34}{2017/07/25}{\pkg{rotfloat}: Added.} % @@ -32413,6 +33780,8 @@ class="td% % \section{scalefnt} % +% \credits{D. Carlisle} +% % \DescribePackage{scalefnt} % \pkg{scalefnt} is ignored. % @@ -32435,6 +33804,468 @@ class="td% % % % +% \iffalse +%<*scrextend> +% \fi +% +% \part{lwarp-scrextend.sty} +% +% \section{scrextend} +% +% \DescribePackage{scrextend} +% \pkg{scrextend} is emulated. +% +% \usedbykomascript +% +% \changes{v0.44}{2017/11/20}{\pkg{scrextend}: Added.} +% +% \codehtml +% +% \begin{macrocode} +\LWR@ProvidesPackageDrop{scrextend} +% \end{macrocode} +% +% \begin{macrocode} +\DeclareDocumentCommand{\setkomafont}{m m}{} +\DeclareDocumentCommand{\addkomafont}{m m}{} +\DeclareDocumentCommand{\usekomafont}{m}{} + +\DeclareDocumentCommand{\usefontofkomafont}{m}{} +\DeclareDocumentCommand{\useencodingofkomafont}{m}{} +\DeclareDocumentCommand{\usesizeofkomafont}{m}{} +\DeclareDocumentCommand{\usefamilyofkomafont}{m}{} +\DeclareDocumentCommand{\useseriesofkomafont}{m}{} +\DeclareDocumentCommand{\useshapeofkomafont}{m}{} + +\AtBeginDocument{ +\let\LWR@maketitle\maketitle +\DeclareDocumentCommand{\maketitle}{o}{\LWR@maketitle} +} + +\DeclareDocumentCommand{\extratitle}{m}{} +\DeclareDocumentCommand{\titlehead}{m}{} +\DeclareDocumentCommand{\subject}{m}{} +\DeclareDocumentCommand{\publishers}{m}{\published{#1}} +\DeclareDocumentCommand{\uppertitleback}{m}{} +\DeclareDocumentCommand{\lowertitleback}{m}{} +\DeclareDocumentCommand{\dedication}{m}{} + +\DeclareDocumentCommand{\ifthispageodd}{m m}{#1} + +\DeclareDocumentCommand{\titlepagestyle}{}{} + +\DeclareDocumentCommand{\cleardoublepageusingstyle}{m}{} +\DeclareDocumentCommand{\cleardoubleemptypage}{}{} +\DeclareDocumentCommand{\cleardoubleplainpage}{}{} +\DeclareDocumentCommand{\cleardoublestandardpage}{}{} +\DeclareDocumentCommand{\cleardoubleoddpage}{}{} +\DeclareDocumentCommand{\cleardoubleoddpageusingstyle}{m}{} +\DeclareDocumentCommand{\cleardoubleoddemptypage}{}{} +\DeclareDocumentCommand{\cleardoubleoddplainpage}{}{} +\DeclareDocumentCommand{\cleardoubleoddstandardpage}{}{} +\DeclareDocumentCommand{\cleardoubleevenpage}{}{} +\DeclareDocumentCommand{\cleardoubleevenpageusingstyle}{m}{} +\DeclareDocumentCommand{\cleardoubleevenemptypage}{}{} +\DeclareDocumentCommand{\cleardoubleevenplainpage}{}{} +\DeclareDocumentCommand{\cleardoubleevenstandardpage}{}{} + +\DeclareDocumentCommand{\multiplefootnoteseparator}{}{% + \begingroup\let\thefootnotemark\multfootsep\@makefnmark\endgroup +} + +\DeclareDocumentCommand{\multfootsep}{}{,} + +\DeclareDocumentCommand{\footref}{m}{% + \begingroup + \unrestored@protected@xdef\@thefnmark{\ref{#1}}% + \endgroup + \@footnotemark +} + +\DeclareDocumentCommand{\deffootnote}{o m m m}{} +\DeclareDocumentCommand{\deffootnotemark}{m}{} +\DeclareDocumentCommand{\setfootnoterule}{o m}{} +\DeclareDocumentCommand{\raggedfootnote}{}{} + +\DeclareDocumentCommand{\dictum}{o m}{ +\begin{LWR@BlockClassWP}{text-align:right}{}{dictum} + #2 + \IfValueT{#1} + { + \ifbool{FormatWP} + {\begin{BlockClass}[border-top:1px solid gray]{dictumauthor}} + {\begin{BlockClass}{dictumauthor}} + \dictumauthorformat{#1} + \end{BlockClass} + } +\end{LWR@BlockClassWP} +} + +\DeclareDocumentCommand{\dictumwidth}{}{} +\DeclareDocumentCommand{\dictumauthorformat}{m}{(#1)} +\DeclareDocumentCommand{\dictumrule}{}{} +\DeclareDocumentCommand{\raggeddictum}{}{} +\DeclareDocumentCommand{\raggeddictumtext}{}{} +\DeclareDocumentCommand{\raggeddictumauthor}{}{} + +\DeclareDocumentEnvironment{labeling}{o m} +{% +\def\sc@septext{#1}% +\list{}{}% +\let\makelabel\labelinglabel% +} +{ +\endlist +} + +\DeclareDocumentCommand{\labelinglabel}{m}{% +#1 \qquad \sc@septext% +} + +\let\addmargin\relax +\let\endaddmargin\relax +\cslet{addmargin*}{\relax} +\cslet{endaddmargin*}{\relax} + +\NewDocumentEnvironment{addmargin}{s O{} m} +{ +\uselengthunit{PT}% +\setlength{\LWR@templengthtwo}{#3} +\ifblank{#2} +{ + \begin{BlockClass}[ + margin-left:\rndprintlength{\LWR@templengthtwo} ; + margin-right:\rndprintlength{\LWR@templengthtwo} + ]{addmargin} +} +{ + \setlength{\LWR@templengthone}{#2} + \begin{BlockClass}[ + margin-left:\rndprintlength{\LWR@templengthone} ; + margin-right:\rndprintlength{\LWR@templengthtwo} + ]{addmargin} +} +} +{\end{BlockClass}} +% \end{macrocode} +% Ref to create a starred environment: \\ +% \href +% {https://tex.stackexchange.com/questions/45401/use-the-s-star-argument-with-newdocumentenvironment} +% {\ttfamily https://tex.stackexchange.com/questions/45401/ \\ +% \hspace*{2em} use-the-s-star-argument-with-newdocumentenvironment} +% \begin{macrocode} + +\ExplSyntaxOn +\cs_new:cpn {addmargin*} {\addmargin*} +\cs_new_eq:cN {endaddmargin*} \endaddmargin +\ExplSyntaxOff + +\DeclareDocumentCommand{\marginline}{m}{\marginpar{#1}} +% \end{macrocode} +% +% \iffalse +%</scrextend> +% \fi +% +% +% +% \iffalse +%<*scrhack> +% \fi +% +% \part{lwarp-scrhack.sty} +% +% \section{scrhack} +% +% \DescribePackage{scrhack} +% \pkg{scrhack} is ignored. +% +% \changes{v0.44}{2017/11/22}{\pkg{scrhack}: Added.} +% +% \codehtml +% +% \begin{macrocode} +\LWR@ProvidesPackageDrop{scrhack} +% \end{macrocode} +% +% +% \iffalse +%</scrhack> +% \fi +% +% +% +% +% \iffalse +%<*scrlayer> +% \fi +% +% \part{lwarp-scrlayer.sty} +% +% \section{scrlayer} +% +% \credits{Markus Kohm} +% +% \DescribePackage{scrlayer} +% \pkg{scrlayer} is emulated. +% +% \testthis +% +% \changes{v0.44}{2017/11/22}{\pkg{scrlayer}: Added.} +% +% \codehtml +% +% \begin{macrocode} +\LWR@ProvidesPackageDrop{scrlayer} +% \end{macrocode} +% +% \begin{macrocode} +\newcommand*{\DeclareSectionNumberDepth}[2]{} +\newcommand*{\DeclareLayer}[2][]{} +\newcommand*{\DeclareNewLayer}[2][]{} +\newcommand*{\ProvideLayer}[2][]{} +\newcommand*{\RedeclareLayer}[2][]{} +\newcommand*{\ModifyLayer}[2][]{} +\newcommand*{\layerhalign}{} +\newcommand*{\layervalign}{} +\newcommand*{\layerxoffset}{} +\newcommand*{\layeryoffset}{} +\newcommand*{\layerwidth}{} +\newcommand*{\layerheight}{} +\providecommand*{\LenToUnit}[1]{\strip@pt\dimexpr#1*\p@/\unitlength} +\newcommand*{\putUL}[1]{} +\newcommand*{\putUR}[1]{} +\newcommand*{\putLL}[1]{} +\newcommand*{\putLR}[1]{} +\newcommand*{\putC}[1]{} +\newcommand*{\GetLayerContents}[1]{} +\newcommand{\IfLayerExists}[3]{#3} +\newcommand*{\DestroyLayer}[1]{} +\newcommand*{\layercontentsmeasure}{} +\newcommand*{\currentpagestyle}{} +\newcommand*{\BeforeSelectAnyPageStyle}[1]{} +\newcommand*{\AfterSelectAnyPageStyle}[1]{} +\newcommand*{\DeclarePageStyleAlias}[2]{} +\newcommand*{\DeclareNewPageStyleAlias}[2]{} +\newcommand*{\ProvidePageStyleAlias}[2]{} +\newcommand*{\RedeclarePageStyleAlias}[2]{} +\newcommand*{\DestroyPageStyleAlias}[1]{} +\newcommand*{\GetRealPageStyle}[1]{} +\newcommand*{\DeclarePageStyleByLayers}[3][]{} +\newcommand*{\DeclareNewPageStyleByLayers}[3][]{} +\newcommand*{\ProvidePageStyleByLayers}[3][]{} +\newcommand*{\RedeclarePageStyleByLayers}[3][]{} +\NewDocumentCommand{\ForEachLayerOfPageStyle}{s m m}{} +\newcommand*{\AddLayersToPageStyle}[2]{} +\newcommand*{\AddLayersAtBeginOfPageStyle}[2]{} +\newcommand*{\AddLayersAtEndOfPageStyle}[2]{} +\newcommand*{\RemoveLayersFromPageStyle}[2]{} +\newcommand*{\AddLayersToPageStyleBeforeLayer}[3]{} +\newcommand*{\AddLayersToPageStyleAfterLayer}[3]{} +\newcommand*{\UnifyLayersAtPageStyle}[1]{} +\newcommand*{\ModifyLayerPageStyleOptions}[2]{} +\newcommand*{\AddToLayerPageStyleOptions}[2]{} +\newcommand{\IfLayerPageStyleExists}[3]{#3} +\newcommand{\IfRealLayerPageStyleExists}[3]{#3} +\newcommand{\IfLayerAtPageStyle}[4]{#4} +\newcommand{\IfSomeLayerAtPageStyle}[4]{#4} +\newcommand{\IfLayersAtPageStyle}[4]{#4} +\newcommand*{\DestroyRealLayerPageStyle}[1]{} +\@ifundefined{footheight}{\newlength\footheight}{} +\DeclareDocumentCommand{\automark}{s o m}{} +\DeclareDocumentCommand{\manualmark}{}{} +\DeclareDocumentCommand{\MakeMarkcase}{m}{#1} +\DeclareDocumentCommand{\GenericMarkFormat}{}{} +\newcommand*{\@mkleft}[1]{} +\newcommand*{\@mkright}[1]{} +\newcommand*{\@mkdouble}[1]{} +\newcommand*{\@mkboth}[2]{} +\newcommand*{\scrlayerInitInterface}[1][]{} +\newcommand{\scrlayerAddToInterface}[3][]{} +\newcommand{\scrlayerAddCsToInterface}[3][]{} +\newcommand{\scrlayerOnAutoRemoveInterface}[2][]{} +% \end{macrocode} +% +% \iffalse +%</scrlayer> +% \fi +% +% +% +% \iffalse +%<*scrlayer-notecolumn> +% \fi +% +% \part{lwarp-scrlayer-notecolumn.sty} +% +% \section{scrlayer-notecolumn} +% +% \credits{Markus Kohm} +% +% \DescribePackage{scrlayer-notecolumn} +% \pkg{scrlayer-notecolumn} is emulated. +% +% \testthis +% +% \changes{v0.44}{2017/11/22}{\pkg{scrlayer-notecolumn}: Added.} +% +% \codehtml +% +% \begin{macrocode} +\LWR@ProvidesPackageDrop{scrlayer-notecolumn} +% \end{macrocode} +% +% \begin{macrocode} +\newcommand*{\DeclareNoteColumn}[2][]{} +\newcommand*{\DeclareNewNoteColumn}[2][]{} +\newcommand*{\ProvideNoteColumn}[2][]{} +\newcommand*{\RedeclareNoteColumn}[2][]{} +\NewDocumentCommand{\makenote}{s o m}{\marginpar{#3}} +\newcommand*{\syncwithnotecolumn}[1][]{} +\newcommand*{\syncwithnotecolumns}[1][]{} +\newcommand*{\clearnotecolumn}[1][]{} +\newcommand*{\clearnotecolumns}[1][]{} +% \end{macrocode} +% +% \iffalse +%</scrlayer-notecolumn> +% \fi +% +% +% +% +% \iffalse +%<*scrlayer-scrpage> +% \fi +% +% \part{lwarp-scrlayer-scrpage.sty} +% +% \section{scrlayer-scrpage} +% +% \credits{Markus Kohm} +% +% \DescribePackage{scrlayer-scrpage} +% \pkg{scrlayer-scrpage} is emulated. +% +% \testthis +% +% \changes{v0.44}{2017/11/22}{\pkg{scrlayer-scrpage}: Added.} +% +% \codehtml +% +% \begin{macrocode} +\LWR@ProvidesPackageDrop{scrlayer-scrpage} +% \end{macrocode} +% +% \begin{macrocode} +\@ifundefined{footheight}{\newlength\footheight}{} +\NewDocumentCommand{\lehead}{s o m}{} +\NewDocumentCommand{\cehead}{s o m}{} +\NewDocumentCommand{\rehead}{s o m}{} +\NewDocumentCommand{\lohead}{s o m}{} +\NewDocumentCommand{\cohead}{s o m}{} +\NewDocumentCommand{\rohead}{s o m}{} +\NewDocumentCommand{\lefoot}{s o m}{} +\NewDocumentCommand{\cefoot}{s o m}{} +\NewDocumentCommand{\refoot}{s o m}{} +\NewDocumentCommand{\lofoot}{s o m}{} +\NewDocumentCommand{\cofoot}{s o m}{} +\NewDocumentCommand{\rofoot}{s o m}{} +\NewDocumentCommand{\ohead}{s o m}{} +\NewDocumentCommand{\chead}{s o m}{} +\NewDocumentCommand{\ihead}{s o m}{} +\NewDocumentCommand{\ofoot}{s o m}{} +\NewDocumentCommand{\cfoot}{s o m}{} +\NewDocumentCommand{\ifoot}{s o m}{} +\DeclareDocumentCommand{\automark}{s o m}{} +\DeclareDocumentCommand{\manualmark}{}{} +\DeclareDocumentCommand{\MakeMarkcase}{m}{#1} +\DeclareDocumentCommand{\GenericMarkFormat}{}{} +\newcommand*{\defpairofpagestyles}[3][]{} +\newcommand*{\newpairofpagestyles}[3][]{} +\newcommand*{\renewpairofpagestyles}[3][]{} +\newcommand*{\providepairofpagestyles}[3][]{} +\newcommand*{\clearmainofpairofpagestyles} +\newcommand*{\clearplainofpairofpagestyles} +\newcommand*{\clearpairofpagestyles} +\NewDocumentCommand{\deftriplepagestyle}{m o o m m m m m m}{} +\NewDocumentCommand{\newtriplepagestyle}{m o o m m m m m m}{} +\NewDocumentCommand{\renewtriplepagestyle}{m o o m m m m m m}{} +\NewDocumentCommand{\providetriplepagestyle}{m o o m m m m m m}{} +\newcommand*{\defpagestyle}[3]{} +\newcommand*{\newpagestyle}[3]{} +\newcommand*{\providepagestyle}[3]{} +\newcommand*{\renewpagestyle}[3]{} +% \end{macrocode} +% +% \iffalse +%</scrlayer-scrpage> +% \fi +% +% +% +% +% \iffalse +%<*section> +% \fi +% +% \part{lwarp-section.sty} +% +% \section{section} +% +% \DescribePackage{section} +% \pkg{section} is ignored. +% +% \credits{Oliver Pretzel} +% +% \changes{v0.44}{2017/11/22}{\pkg{section}: Added.} +% +% \codehtml +% +% \begin{macrocode} +\LWR@ProvidesPackageDrop{section} +% \end{macrocode} +% +% \begin{macrocode} +\ifx\chapter\undefined + \def\chsize{\Large}\def\hdsize{\huge}\else + \def\chsize{\huge}\def\hdsize{\Huge} +\fi +\let\ttsize\LARGE +\let\ausize\large +\let\dasize\large +\let\secsize\Large +\let\subsize\large +\let\hdpos\raggedright +\newcounter{hddepth} +\let\fpind\relax +\def\ttfnt{} +\def\hdfnt{} +\def\fefnt{} +\def\thfnt{} +\def\pgfnt{} +\def\hmkfnt{} +\let\mkcse\uppercase +\def\hddot{} +\def\cpdot{:} +\def\nmdot{} +\ifx\secindent\undefined + \newdimen\secindent + \newskip\secpreskp + \newskip\secpstskp + \newdimen\subindent + \newskip\subpreskp + \newskip\subpstskp + \newskip\parpstskp + \newcount\c@hddepth +\fi +% \end{macrocode} +% +% \iffalse +%</section> +% \fi +% +% % % \iffalse %<*sectsty> @@ -32444,6 +34275,8 @@ class="td% % % \section{sectsty} % +% \credits{Rowland McDonnell} +% % \DescribePackage{sectsty} % \pkg{sectsty} is emulated. % @@ -32496,6 +34329,8 @@ class="td% % \section{setspace} % +% \credits{Robin Fairbairns} +% % \DescribePackage{setspace} % \pkg{setspace} is not used during \HTML\ conversion. % @@ -32563,6 +34398,8 @@ class="td% % \section{shadow} % +% \credits{Mauro Orlandini} +% % \DescribePackage{shadow} % \pkg{shadow} is emulated. % @@ -32632,6 +34469,8 @@ class="td% % \section{showkeys} % +% \credits{David Carlisle, Morten Høgholm} +% % \DescribePackage{showkeys} % \pkg{showkeys} is ignored. % @@ -32666,8 +34505,10 @@ class="td% % \section{sidecap} % +% \credits{Rolf Niepraschk, Hubert Gäßlein} +% % \DescribePackage{sidecap} -% \pkg{sidecap} is nullified. +% \pkg{sidecap} is emulated. % % \changes{v0.22}{2017/03/01}{\pkg{sidecap}: Added.} % @@ -32821,6 +34662,8 @@ class="td% % \section{siunitx} % +% \credits{Joseph Wright} +% % \DescribePackage{siunitx} % \pkg{siunitx} is patched for use by \pkg{lwarp}. % @@ -32920,7 +34763,7 @@ class="td% % \codehtml % % \begin{macrocode} -\LWR@ProvidesPackageDrop{soul} +\LWR@ProvidesPackageDrop{soul}[2003/11/17] \RequirePackage{xcolor}% for \convertcolorspec % \end{macrocode} % @@ -32965,7 +34808,7 @@ class="td% {\LWR@HTMLtextstyle{#5}{#3}{#1}}% {% \convertcolorspec{named}{\csuse{#2}}{HTML}\LWR@tempcolor% - \LWR@HTMLtextstyle{#5;#4:\#\LWR@tempcolor}{#3}{#1}% + \LWR@htmlspanclass[#5;#4:\#\LWR@tempcolor]{#3}{#1}% }% } % \end{macrocode} @@ -33026,6 +34869,83 @@ class="td% % % % +% \iffalse +%<*soulpos> +% \fi +% +% \part{lwarp-soulpos.sty} +% +% \section{soulpos} +% +% \credits{Javier Bezos} +% +% \DescribePackage{soulpos} +% \pkg{soulpos} is emulated. +% +% \changes{v0.44}{2017/11/10}{\pkg{soulpos}: Added.} +% +% \codehtml +% +% \begin{macrocode} +\RequirePackage{soul} +\RequirePackage{soulutf8} +\LWR@ProvidesPackageDrop{soulpos} +% \end{macrocode} +% +% \begin{macrocode} +\NewDocumentCommand{\ulposdef}{m o m}{} + +\newdimen\ulwidth + +\newcommand\ifulstarttype[1]{% +\expandafter\@secondoftwo% +} + +\newcommand\ifulendtype[1]{% +\expandafter\@secondoftwo% +} + +\newcommand{\ulstarttype}{0} +\newcommand{\ulendtype}{0} +\newcommand\ulpostolerance{0}% +% \end{macrocode} +% +% \iffalse +%</soulpos> +% \fi +% +% +% +% +% +% +% \iffalse +%<*soulutf8> +% \fi +% +% \part{lwarp-soulutf8.sty} +% +% \section{soulutf8} +% +% \DescribePackage{soulutf8} +% \pkg{soulutf8} is emulated. +% +% \pkg{lwarp}'s \HTML\ output naturally supports \acro{UTF}-8 encoding. +% +% \changes{v0.44}{2017/11/10}{\pkg{soulutf8}: Added.} +% +% \codehtml +% +% \begin{macrocode} +\LWR@ProvidesPackageDrop{soulutf8} +% \end{macrocode} +% +% +% \iffalse +%</soulutf8> +% \fi +% +% % % % @@ -33038,6 +34958,8 @@ class="td% % % \section{stabular} % +% \credits{Sigitas Tolu\v{s}is} +% % \DescribePackage{stabular} % \pkg{stabular} is emulated. % @@ -33415,9 +35337,11 @@ class="td% % \section{supertabular} % \label{sec:supertabular} % +% \credits{Johannes Braams, Theo Jurriens} +% % % \DescribePackage{supertabular} -% \pkg{supertabular} is emulated during \HTML\ output. +% \pkg{supertabular} is emulated. % % \changes{v0.39}{2017/08/30}{\pkg{supertabular}: Added.} % @@ -33452,7 +35376,10 @@ class="td% \let\topcaption\tablecaption \let\bottomcaption\tablecaption -\global\let\LWRST@caption\relax +% \end{macrocode} +% \changes{v0.44}{2017/11/19}{\pkg{supertabular}: Fix for caption.} +% \begin{macrocode} +\newcommand*{\LWRST@caption}{} \newcommand*{\shrinkheight}[1]{} @@ -33502,6 +35429,8 @@ class="td% % % \section{syntonly} % +% \credits{Frank Mittelbach, Rainer Sch\"{o}pf} +% % \DescribePackage{syntonly} Emulated. % % \changes{v0.34}{2017/07/26}{\pkg{syntonly}: Added.} @@ -33538,6 +35467,8 @@ class="td% % % \section{tabls} % +% \credits{Donald Arseneau} +% % \DescribePackage{tabls} % \pkg{tabls} is emulated. % \cs{LWR@hline} is used to handle the optional argument when @@ -33573,6 +35504,8 @@ class="td% % \section{tabularx} % +% \credits{David Carlisle} +% % \DescribePackage{tabularx} % \pkg{tabularx} is emulated by \pkg{lwarp}. % @@ -33612,6 +35545,8 @@ class="td% % \section{tabulary} % +% \credits{David Carlisle} +% % \DescribePackage{tabulary} % \pkg{tabulary} is emulated by \pkg{lwarp}. % @@ -33655,6 +35590,8 @@ class="td% % % \section{textarea} % +% \credits{Alexander I. Rozhenko} +% % \DescribePackage{textarea} % \pkg{textarea} is emulated. % @@ -33692,6 +35629,9 @@ class="td% % \section{textcomp} % +% \credits{Frank Mittelbach, Robin Fairbairns, Werner Lemberg} + +% % \DescribePackage{textcomp} % \pkg{textcomp} is patched for use by \pkg{lwarp}. % @@ -33900,11 +35840,12 @@ class="td% % \section{textpos} % \label{sec:textpos} % +% \credits{Norman Gray} +% % \changes{v0.20}{2017/01/11}{\pkg{textpos}: Added.} % % \DescribePackage{textpos} -% \pkg{textpos} is emulated during \HTML\ output, and -% the \pkg{textpos} package is ignored. +% \pkg{textpos} is emulated. % \codehtml % \begin{macrocode} @@ -34179,10 +36120,10 @@ class="td% % \section{threeparttable} % \label{sec:threeparttable} % +% \credits{Donald Arseneau} % % \DescribePackage{threeparttable} -% \pkg{threeparttable} is emulated during \HTML\ output, and -% the \pkg{threeparttable} package is ignored. +% \pkg{threeparttable} is emulated. % % Table note are contained inside a \CSS\ \element{div} of class |tnotes|. % If \pkg{enumitem} is used, the @@ -34257,6 +36198,8 @@ class="td% % % \section{tikz} % +% \credits{Till Tantau} +% % \DescribePackage{tikz} % \pkg{tikz} is supported. % @@ -34305,17 +36248,18 @@ class="td% % \changes{v0.13}{2016/03/23}{Fix dollar-redefined bug for newer package.} % \changes{v0.19}{2016/05/29}{Adapts to tikz version.} % \changes{v0.24}{2017/03/13}{Fix for inline images.} +% \changes{v0.44}{2017/11/16}{\pkg{tikz}: Fix: Groups for lateximages.} % % \begin{macrocode} \BeforeBeginEnvironment{tikzpicture}{% -\lateximage% +\begin{lateximage}% \ifbool{LWR@tikzbabel}% Test for Tikz version v3.0.0 {}% {\catcode`\$=3} % dollar sign is math shift } \AfterEndEnvironment{tikzpicture}{% -\endlateximage% +\end{lateximage}% \ifbool{LWR@tikzbabel}% Test for Tikz version v3.0.0 {}% {\catcode`\$=\active}% @@ -34345,6 +36289,8 @@ class="td% % \section{titleps} % +% \credits{Javier Bezos} +% % \DescribePackage{titleps} % \pkg{titleps} is loaded and used by \pkg{lwarp} during \HTML\ output. % All user options and macros are ignored and disabled. @@ -34615,6 +36561,8 @@ class="td% % \section{titlesec} % +% \credits{Javier Bezos} +% % \DescribePackage{titlesec} % \pkg{titlesec} is emulated. % All user options and macros are ignored and disabled. @@ -34758,6 +36706,8 @@ class="td% % \section{titletoc} % +% \credits{Javier Bezos} +% % \DescribePackage{titletoc} % \pkg{titletoc} is emulated. % All user options and macros are ignored and disabled. @@ -34897,6 +36847,8 @@ class="td% % \section{titling} % +% \credits{Peter Wilson} +% % \DescribePackage{titling} % % \limitstitlepage @@ -35189,6 +37141,51 @@ class="td% % % % \iffalse +%<*tocbasic> +% \fi +% +% \part{lwarp-tocbasic.sty} + +% \section{tocbasic} +% +% \credits{Markus Kohm} +% +% \DescribePackage{tocbasic} +% \pkg{tocbasic} is patched for use by \pkg{lwarp}. +% +% \usedbykomascript +% +% \changes{v0.44}{2017/11/20}{\pkg{tocbasic}: Added.} +% +% \codehtml +% +% \begin{macrocode} +\LWR@ProvidesPackagePass{tocbasic} +% \end{macrocode} + +% \begin{macrocode} +\DeclareDocumentCommand{\usetocbasicnumberline}{o}{} +\DeclareDocumentCommand{\DeclareTOCStyleEntry}{o m m}{} +\DeclareDocumentCommand{\DeclareTOCEntryStyle}{m o m}{} +\DeclareDocumentCommand{\DefineTOCEntryOption}{m o m}{} +\DeclareDocumentCommand{\DefineTOCEntryBooleanOption}{m o m m m}{} +\DeclareDocumentCommand{\DefineTOCEntryCommandOption}{m o m m m}{} +\DeclareDocumentCommand{\DefineTOCEntryIfOption}{m o m m m}{} +\DeclareDocumentCommand{\DefineTOCEntryLengthOption}{m o m m m}{} +\DeclareDocumentCommand{\DefineTOCEntryNumberOption}{m o m m m}{} +\DeclareDocumentCommand{\CloneTOCEntryStyle}{m m}{} +\DeclareDocumentCommand{\TOCEntryStyleInitCode}{m m}{} +\DeclareDocumentCommand{\TOCEntryStyleStartInitCode}{m m}{} +% \end{macrocode} + +% \iffalse +%</tocbasic> +% \fi +% +% +% +% +% \iffalse %<*tocbibind> % \fi % @@ -35197,6 +37194,8 @@ class="td% % \section{tocbibind} % \label{sec:tocbibind} % +% \credits{Peter Wilson} +% % \DescribePackage{tocbibind} % \pkg{tocbibind} is patched for use by \pkg{lwarp}. % @@ -35214,8 +37213,8 @@ class="td% % \end{macrocode} % \begin{macrocode} - \renewenvironment{theindex}% - {% +\renewenvironment{theindex}% +{% \if@bibchapter \if@donumindex \chapter{\indexname} @@ -35242,7 +37241,7 @@ class="td% \let\item\LWR@indexitem% \let\subitem\LWR@indexsubitem% \let\subsubitem\LWR@indexsubsubitem% -} +}{} % \end{macrocode} % % The following code is shared by \pkg{anonchap}. @@ -35277,6 +37276,8 @@ class="td% % \section{tocloft} % +% \credits {Peter Wilson} +% % \DescribePackage{tocloft} % \pkg{tocloft} is emulated. % Most user options and macros are ignored and disabled. @@ -35586,20 +37587,23 @@ class="td% % \end{macrocode} -% \begin{noindmacro}{\newlistof} \oarg{within} \marg{type} \marg{ext} \marg{listofname} -% -% Emulated through the \cs{newfloat} mechanism. +% \begin{noindmacro}{\newlistentry} \oarg{within} \marg{counter} \marg{ext} \marg{level-1} +% \changes{v0.44}{2017/11/09}{\pkg{tocloft}: Added \cs{newlistentry}.} % \begin{macrocode} -\NewDocumentCommand{\newlistof}{o m m m} -{% +\NewDocumentCommand{\newlistentry}{o m m m} +{ \IfValueTF{#1} -{\newfloat{#2}{tbp}{#3}[#1]} -{\newfloat{#2}{tbp}{#3}} -\@namedef{listof#2}{\listof{#2}{#4}} -\@namedef{#2depth}{1} -\expandafter\newlength\csuse{cftbefore#2skip} -\expandafter\newlength\csuse{cft#2indent} -\expandafter\newlength\csuse{cft#2numwidth} +{ + \newcounter{#2}[#1] + \expandafter\edef\csname the#2\endcsname{ + \expandafter\noexpand\csname the#1\endcsname.\noexpand\arabic{#2} + } +} +{\newcounter{#2}} +\@namedef{l@#2}##1##2{\hypertocfloat{1}{#2}{#3}{##1}{##2}} +\expandafter\newlength\csname cftbefore#2skip\endcsname +\expandafter\newlength\csname cft#2indent\endcsname +\expandafter\newlength\csname cft#2numwidth\endcsname \@namedef{cft#2font}{} \@namedef{cft#2presnum}{} \@namedef{cft#2aftersnum}{} @@ -35608,6 +37612,35 @@ class="td% \@namedef{cft#2dotsep}{1} \@namedef{cft#2pagefont}{} \@namedef{cft#2afterpnum}{} +\@namedef{toclevel@#2}{#4} +\@namedef{cft#2fillnum}##1{} +} +% \end{macrocode} +% \end{noindmacro} + + +% \begin{noindmacro}{\newlistof} \oarg{within} \marg{type} \marg{ext} \marg{listofname} +% +% Emulated through the \cs{newfloat} mechanism. +% \changes{v0.44}{2017/11/09}{\pkg{tocloft}: Improved \cs{newlistof}.} +% \begin{macrocode} +\NewDocumentCommand{\newlistof}{o m m m} +{% +\IfValueTF{#1} +{\newlistentry[#1]{#2}{#3}{0}} +{\newlistentry{#2}{#3}{0}} +\@namedef{ext@#2}{#3} +\newcounter{#3depth} +\setcounter{#3depth}{1} +\@namedef{cftmark#3}{} +\@namedef{listof#2}{\listof{#2}{#4}} +\@namedef{@cftmake#3title}{} +\expandafter\newlength\csname cftbefore#3titleskip\endcsname +\expandafter\newlength\csname cftafter#3titleskip\endcsname +\@namedef{cft#3titlefont}{} +\@namedef{cftafter#3title}{} +\@namedef{cft#3prehook}{} +\@namedef{cft#3posthook}{} } % \end{macrocode} % \end{noindmacro} @@ -35637,6 +37670,114 @@ class="td% % % % \iffalse +%<*tocstyle> +% \fi +% +% \part{lwarp-tocstyle.sty} +% +% \section{tocstyle} +% +% \DescribePackage{tocstyle} +% \pkg{tocstyle} is ignored. +% +% \testthis +% +% \changes{v0.44}{2017/11/19}{\pkg{tocstyle}: Added.} +% +% \codehtml +% +% \begin{macrocode} +\LWR@ProvidesPackageDrop{tocstyle} +% \end{macrocode} +% +% \begin{macrocode} +\newcommand*{\usetocstyle}[2][]{} +\newcommand*{\deactivatetocstyle}[1][]{} +\newcommand*{\reactivatetocstyle}[1][]{} +\NewDocumentCommand{\settocfeature}{o o m m}{} +\NewDocumentCommand{\settocstylefeature}{o m m}{} +\NewDocumentCommand{\newtocstyle}{o o m m}{} +\newcommand*{\aliastoc}[2]{} +\newcommand*{\showtoc}[2][]{} +\newcommand{\iftochasdepth}[4]{} +% \end{macrocode} +% +% \iffalse +%</tocstyle> +% \fi +% +% +% +% +% +% \iffalse +%<*todo> +% \fi +% +% \part{lwarp-todo.sty} + +% \section{todo} +% +% \credits{Federico Garcia} +% +% \DescribePackage{todo} +% \pkg{todo} is patched for use by \pkg{lwarp}. +% +% \changes{v0.44}{2017/11/13}{\pkg{todo}: Added.} +% +% \codehtml +% +% \begin{macrocode} +\LWR@ProvidesPackagePass{todo} +% \end{macrocode} + +% \begin{macrocode} +\renewcommand\todoitem[2]{% + \refstepcounter{todo}% + \item[% + \HTMLunicode{2610} \quad + \ref{todopage:\thetodo} + ] : {\todoformat\ifx#1\todomark\else\textbf{#1} \fi}#2% + \label{todolbl:\thetodo}% +}% + +\renewcommand\doneitem[2]{% + \stepcounter{todo}% + \item[% + \HTMLunicode{2611} \quad + \ref{todopage:\thetodo} + ] \@nameuse{@done\the\c@todo}: + {\todoformat\ifx#1\todomark\else\textbf{#1} \fi}#2% +} + +\xpatchcmd{\@displaytodo} + {\todoformat #1}{\todoformat \textbf{#1}}{} + {\PackageWarning{lwarp-todo}{Unable to patch @displaytodo.}} + +\xpatchcmd{\@displayfulltodo} + {\todoformat #1}{\todoformat \textbf{#1}}{} + {\PackageWarning{lwarp-todo}{Unable to patch @displayfulltodo.}} + +\patchcmd{\todoenv}{\itshape see text.}{\textit{see text.}}{} + {\PackageWarning{lwarp-todo}{Unable to patch todoenv.}} + +\patchcmd{\astodos}{\todoformat #1}{\todoformat \textbf{#1}}{} + {\PackageWarning{lwarp-todo}{Unable to patch astodos.}} + +\AtBeginDocument{ +\crefname{todo}{todo}{todos} +\Crefname{todo}{Todo}{Todos} +} +% \end{macrocode} + +% \iffalse +%</todo> +% \fi +% +% +% +% +% \iffalse %<*todonotes> % \fi % @@ -35644,24 +37785,95 @@ class="td% % % \section{todonotes} % +% \credits{Henrik Skov Midtiby} +% % \DescribePackage{todonotes} % \pkg{todonotes} is emulated. % % \limitstodonotes % -% \changes{v0.43}{2017/10/07}{\pkg{todonotes}: Added.} +% \changes{v0.43}{2017/11/07}{\pkg{todonotes}: Added.} +% \changes{v0.44}{2017/11/10}{\pkg{todonotes}: Improved.} % % \codehtml % % \begin{macrocode} -\LWR@ProvidesPackageDrop{todonotes} +\LWR@ProvidesPackagePass{todonotes} % \end{macrocode} % % \begin{macrocode} -\newcommand{\listoftodos}[1][]{} -\newcommand{\todo}[2][]{} -\newcommand{\missingfigure}[2][]{} -\newcommand{\todototoc}{} +\if@todonotes@disabled +\else + +\newcommand{\ext@todo}{tdo} + +\renewcommand{\l@todo}[2]{\hypertocfloat{1}{todo}{ldo}{#1}{#2}} + + +\renewcommand{\@todonotes@drawMarginNoteWithLine}{ +\fcolorbox + {\@todonotes@currentbordercolor} + {\@todonotes@currentbackgroundcolor} + {\arabic{@todonotes@numberoftodonotes}} +\marginpar{\@todonotes@drawMarginNote} +} + +\renewcommand{\@todonotes@drawInlineNote}{% +\fcolorboxBlock% + {\@todonotes@currentbordercolor}% + {\@todonotes@currentbackgroundcolor}% + {% + \if@todonotes@authorgiven% + {\@todonotes@author:\,}% + \fi% + \@todonotes@text% + }% +} + +\renewcommand{\@todonotes@drawMarginNote}{% + \if@todonotes@authorgiven% + \@todonotes@author\par% + \fi% + \arabic{@todonotes@numberoftodonotes}: % + \fcolorbox% + {\@todonotes@currentbordercolor}% + {\@todonotes@currentbackgroundcolor}% + {% + \@todonotes@sizecommand% + \@todonotes@text % + }% +}% + +\renewcommand{\@todonotes@drawLineToRightMargin}{} + +\renewcommand{\@todonotes@drawLineToLeftMargin}{} + +\renewcommand{\missingfigure}[2][]{% +\setkeys{todonotes}{#1}% +\addcontentsline{tdo}{todo}{\@todonotes@MissingFigureText: #2}% +\fcolorboxBlock% + {\@todonotes@currentbordercolor}% + {\@todonotes@currentfigcolor}% + {% + \setlength{\fboxrule}{4pt}% + \fcolorbox{red}{white}{Missing figure} \quad #2% + } +} + +\LetLtxMacro\LWRTODONOTES@orig@todo\@todo + +\RenewDocumentCommand{\@todo}{o m}{% +\begingroup% +\renewcommand*{\phantomsection}{}% +\IfValueTF{#1}{% + \LWRTODONOTES@orig@todo[#1]{#2}% +}{% + \LWRTODONOTES@orig@todo{#2}% +} +\endgroup% +} + +\fi% \if@todonotes@disabled % \end{macrocode} % % \iffalse @@ -35728,26 +37940,17 @@ class="td% % \section{trivfloat} % \label{sec:trivfloat} % +% \credits{Joseph Wright} +% % \DescribePackage{trivfloat} % \pkg{trivfloat} is forced to use the built-in \pkg{lwarp} % emulation for floats. - - +% +% % Discard all options for \pkg{lwarp-trivfloat}. % This tells \pkg{trivfloat} not to use \pkg{floatrow} or \pkg{memoir}. - -% \codehtml -% \begin{macrocode} -\LWR@ProvidesPackageDrop{trivfloat} -\LWR@origRequirePackage{trivfloat} -% \end{macrocode} - % -% \codeall -% \begin{macrocode} -\begin{warpall} -% \end{macrocode} - +% % To create a new float type and change its name: % \begin{Verbatim}[gobble=2,frame=lines,obeytabs,tabsize=4] % \trivfloat{example} @@ -35757,8 +37960,10 @@ class="td% % \end{Verbatim} % % +% % \begin{macrocode} -\end{warpall} +\LWR@ProvidesPackageDrop{trivfloat} +\LWR@origRequirePackage{trivfloat} % \end{macrocode} % \DescribeMacro{\tfl@chapter@fix} @@ -35812,7 +38017,7 @@ class="td% % % \begin{Verbatim}[gobble=2,frame=lines,obeytabs,tabsize=4] % \makeatletter -% \setcounter{tfl@float@cnt}{1}} % start trivfloats with .lob +% \setcounter{tfl@float@cnt}{1} % start trivfloats with .lob % \makeatletter % \end{Verbatim} @@ -35837,10 +38042,15 @@ class="td% % % \section{typearea} % +% \credits{Markus Kohm} +% % \DescribePackage{typearea} % \pkg{typearea} is emulated. % +% \usedbykomascript +% % \changes{v0.39}{2017/08/28}{\pkg{typearea}: Added.} +% \changes{v0.44}{2017/11/22}{\pkg{typearea}: Added expert commands.} % % \codehtml % @@ -35849,10 +38059,16 @@ class="td% % \end{macrocode} % % \begin{macrocode} -\newcommand*\typearea[2][\z@]{} -\newcommand*{\recalctypearea}{} +\DeclareDocumentCommand{\typearea}{o m}{} +\DeclareDocumentCommand{\recalctypearea}{}{} \@ifundefined{footheight}{\newlength\footheight}{} -\newcommand*\areaset[3][\z@]{} +\DeclareDocumentCommand{\areaset}{o m m}{} +\DeclareDocumentCommand{\activateareas}{}{} +\DeclareDocumentCommand{\storeareas}{m}{} +\DeclareDocumentCommand{\BeforeRestoreareas}{s m}{} +\DeclareDocumentCommand{\AfterRestoreareas}{s m}{} +\DeclareDocumentCommand{\AfterCalculatingTypearea}{s m}{} +\DeclareDocumentCommand{\AfterSettingArea}{s m}{} % \end{macrocode} % % \iffalse @@ -36057,7 +38273,7 @@ class="td% % % \begin{environment}{verse} % \changes{v0.18}{2016/05/13}{Supports verse, memoir packages.} -% The \env{verse} environment will be placed inside a \HTML\ |pre|. +% The \env{verse} environment will be placed inside a \HTML\ \element{pre}. % \begin{macrocode} \AfterEndPreamble{ \LWR@traceinfo{Patching verse.} @@ -36067,6 +38283,11 @@ class="td% \AtBeginEnvironment{verse} {% % \end{macrocode} +% Use the original \env{list} environment inside a \element{pre} to +% attempt to preserve formatting. +% \begin{macrocode} +\LWR@restoreoriglists% +% \end{macrocode} % \DescribePackage{verse}\DescribePackage{memoir}\index{memoir>verse} % The \pkg{verse} or \pkg{memoir} packages can place stanza numbers to the left % with their \cs{flagverse} command. \DescribeMacro{\flagverse} @@ -36083,15 +38304,14 @@ class="td% \unskip\LWR@origvspace{-\baselineskip} } % \end{macrocode} -% After the end of the \env{verse} environment, which places the |pre| tag at the +% After the end of the \env{verse} environment, which places the \element{pre} tag at the % regular left margin: % \begin{macrocode} -\AfterEndEnvironment{verse}{ -\unskip\LWR@origvspace{-\baselineskip} +\AtEndEnvironment{verse}{ \LWR@afterendverbatim } % \end{macrocode} -% Patch to place poemtitle inside an \HTML\ span of class |poemtitle|: +% Patch to place poemtitle inside an \HTML\ \element{span} of class |poemtitle|: % \begin{macrocode} \ifdef{\poemtitle}{ \DeclareDocumentCommand{\@vstypeptitle}{m}{% @@ -36124,11 +38344,12 @@ class="td% % \section{wallpaper} % \label{sec:wallpaper} % +% \credits{Michael H.F. Wilkinson} +% % \changes{v0.20}{2017/01/11}{\pkg{wallpaper}: Added.} % % \DescribePackage{wallpaper} -% \pkg{wallpaper} is emulated during \HTML\ output, and -% the \pkg{wallpaper} package is ignored. +% \pkg{wallpaper} is emulated. % \codehtml % \begin{macrocode} @@ -36162,6 +38383,41 @@ class="td% % % % +% \iffalse +%<*watermark> +% \fi +% +% \part{lwarp-watermark.sty} +% +% \section{watermark} +% +% \credits{Alexander I. Rozhenko} +% +% \DescribePackage{watermark} +% \pkg{watermark} is emulated. +% +% \changes{v0.44}{2017/11/10}{\pkg{watermark}: Added.} +% +% \codehtml +% +% \begin{macrocode} +\LWR@ProvidesPackageDrop{watermark} +% \end{macrocode} +% +% \begin{macrocode} +\newcommand{\watermark}[1]{} +\newcommand{\leftwatermark}[1]{} +\newcommand{\rightwatermark}[1]{} +\newcommand{\thiswatermark}[1]{} +\newcommand{\thispageheading}[1]{} +% \end{macrocode} +% +% \iffalse +%</watermark> +% \fi +% +% +% % % % \iffalse @@ -36173,11 +38429,12 @@ class="td% % \section{wrapfig} % \label{sec:wrapfig} % +% \credits{Donald Arseneau} +% % \changes{v0.20}{2017/01/11}{\pkg{wrapfig}: Added.} % % \DescribePackage{wrapfig} -% \pkg{wrapfig} is emulated during \HTML\ output, and -% the \pkg{wrapfig} package is ignored. +% \pkg{wrapfig} is emulated. % \codehtml % \begin{macrocode} @@ -36261,6 +38518,8 @@ class="td% % \section{xcolor} % \label{sec:xcolor} % +% \credits{Dr. Uwe Kern} +% % \DescribePackage{xcolor} % \pkg{xcolor} is supported by lwarp. % @@ -36445,6 +38704,47 @@ class="td% % \end{macrocode} % \end{noindmacro} % +% \begin{noindmacro}{\LWR@findcurrenttextcolor} +% \changes{v0.44}{2017/11/10}{\pkg{xcolor}: Added \cs{LWR@findcurrentcolor}.} +% Sets \cs{LWR@tempcolor} to the current color. +% \begin{macrocode} +\newcommand*{\LWR@findcurrenttextcolor}{% +\protect\colorlet{LWR@current@color}{.}% +\protect\convertcolorspec{named}{LWR@current@color}{HTML}\LWR@tempcolor% +} +% \end{macrocode} +% \end{noindmacro} + +% \begin{noindmacro}{\LWR@currenttextcolorstyle} +% Prints a color style for the current color. +% \changes{v0.44}{2017/11/10}{\pkg{xcolor}: Added \cs{LWR@currenttextcolorstyle}.} +% \begin{macrocode} +\newcommand*{\LWR@currenttextcolorstyle}{% +\LWR@findcurrenttextcolor% +\ifdefstring{\LWR@tempcolor}{000000}% +{}% +{color: \#\LWR@tempcolor ; }% +} +% \end{macrocode} +% \end{noindmacro} +% +% +% \begin{noindmacro}{\LWR@textcurrentcolor} \marg{text} +% Like \cs{textcolor} but uses the current \cs{color} instead. +% \changes{v0.44}{2017/11/10}{\pkg{xcolor}: Added \cs{LWR@textcurrentcolor}.} +% \begin{macrocode} +\newcommand*{\LWR@textcurrentcolor}[1]{% +\begingroup% +\LWR@FBcancel% +\LWR@findcurrenttextcolor% +\InlineClass[color:\#\LWR@tempcolor]{textcolor}{% + \renewcommand*{\LWR@currenttextcolor}{\#\LWR@tempcolor}% + #1% +}% +\endgroup% +} +% \end{macrocode} +% \end{noindmacro} % % % \begin{noindmacro}{\LWR@colorstyle} @@ -36473,6 +38773,26 @@ class="td% % \end{noindmacro} % % +% \begin{macro}{\LWR@backgroundcolor} +% \oarg{model} \marg{color} \marg{text} +% +% Similar to \cs{textcolor}, but prints black text against a color background. +% +% Converted into an \HTML\ hex color span. +% \changes{v0.44}{2017/11/10}{Added.} +% \begin{macrocode} +\NewDocumentCommand{\LWR@backgroundcolor}{O{named} m m}{% +\begingroup% +\LWR@FBcancel% +\InlineClass[background:\LWR@colorstyle{#1}{#2}]{backgroundcolor}{% +#3% +}% +\endgroup% +} +% \end{macrocode} +% \end{macro} +% +% % \subsection{HTML border} % % \begin{noindmacro}{\LWR@borderpadding} \marg{colorstyle} \marg{color} @@ -36511,7 +38831,6 @@ padding:\rndprintlength{\fboxsep}% \RenewDocumentCommand{\textcolor}{O{named} m m}{% \begingroup% \LWR@FBcancel% -\convertcolorspec{#1}{#2}{HTML}\LWR@tempcolor% \InlineClass[color:\LWR@colorstyle{#1}{#2}]{textcolor}{% \renewcommand*{\LWR@currenttextcolor}{\#\LWR@tempcolor}% #3% @@ -36533,8 +38852,9 @@ padding:\rndprintlength{\fboxsep}% % \begin{macro}{\nopagecolor} % Ignored. +% \changes{v0.44}{2017/11/19}{\pkg{xcolor}: Fix for \cs{nopagecolor}.} % \begin{macrocode} -\let\nopagecolor\relax +\renewcommand*{\nopagecolor}{} % \end{macrocode} % \end{macro} @@ -36638,7 +38958,7 @@ padding:\rndprintlength{\fboxsep}% {% yes background color \convertcolorspec{#3}{#4}{HTML}\LWR@tempcolortwo% \begin{BlockClass}[% - background:\#\LWR@tempcolortwo; % + background:\#\LWR@tempcolortwo\ ; % \LWR@borderpadding{#1}{#2}% ]{fcolorboxBlock} #5 @@ -36747,6 +39067,8 @@ height:\rndprintlength{\LWR@tempheight}% % \section{xfrac} % \label{sec:xfrac} % +% \credits{The \LaTeX3 Project} +% % \DescribePackage{xfrac} Supported by adding \pkg{xfrac} instances. % % \codehtml @@ -36909,12 +39231,11 @@ scaling = false % % \section{xltxtra} % +% \credits{Will Robertson, Jonathan Kew} % % \DescribePackage{xltxtra} % \pkg{xltxtra} is emulated. % -% \credits{Will Robertson, Jonathan Kew} -% % \changes{v0.38}{2017/08/25}{\pkg{xltxtra}: Added.} % \changes{v0.40}{2017/09/07}{\pkg{xltxtra}: Fix for \cs{showhyphens} with XeLaTeX.} % @@ -36964,6 +39285,8 @@ scaling = false % % \section{xmpincl} % +% \credits{Maarten Sneep} +% % \DescribePackage{xmpincl} Emulated. % % \changes{v0.34}{2017/08/03}{\pkg{xmpincl}: Added.} @@ -36997,9 +39320,10 @@ scaling = false % \section{xtab} % \label{sec:xtab} % +% \credits{Peter Wilson} % % \DescribePackage{xtab} -% \pkg{xtab} is emulated during \HTML\ output. +% \pkg{xtab} is emulated. % % \changes{v0.39}{2017/08/30}{\pkg{xtabular}: Added.} % @@ -37039,7 +39363,10 @@ scaling = false \let\topcaption\tablecaption \let\bottomcaption\tablecaption -\global\let\LWRXT@caption\relax +% \end{macrocode} +% \changes{v0.44}{2017/11/19}{\pkg{xtab}: Fix for caption.} +% \begin{macrocode} +\newcommand*{\LWRXT@caption}{} \newcommand*{\shrinkheight}[1]{} @@ -37090,6 +39417,8 @@ scaling = false % % \section{zwpagelayout} % +% \credits{Zdeněk Wagner} +% % \DescribePackage{zwpagelayout} % \pkg{zwpagelayout} is ignored. % diff --git a/Master/texmf-dist/source/latex/lwarp/lwarp.ins b/Master/texmf-dist/source/latex/lwarp/lwarp.ins index 1f6dac34b11..bf3172b44ed 100644 --- a/Master/texmf-dist/source/latex/lwarp/lwarp.ins +++ b/Master/texmf-dist/source/latex/lwarp/lwarp.ins @@ -33,6 +33,7 @@ version 2005/12/01 or later. \askforoverwritefalse \generate{ \file{lwarp.sty}{\from{lwarp.dtx}{package}} +\file{lwarp-patch-komascript.sty}{\from{lwarp.dtx}{patch-komascript}} \file{lwarp-a4.sty}{\from{lwarp.dtx}{a4}} \file{lwarp-a4wide.sty}{\from{lwarp.dtx}{a4wide}} \file{lwarp-a5comb.sty}{\from{lwarp.dtx}{a5comb}} @@ -47,6 +48,7 @@ version 2005/12/01 or later. \file{lwarp-anysize.sty}{\from{lwarp.dtx}{anysize}} \file{lwarp-appendix.sty}{\from{lwarp.dtx}{appendix}} \file{lwarp-arabicfront.sty}{\from{lwarp.dtx}{arabicfront}} +\file{lwarp-atbegshi.sty}{\from{lwarp.dtx}{atbegshi}} \file{lwarp-authblk.sty}{\from{lwarp.dtx}{authblk}} \file{lwarp-balance.sty}{\from{lwarp.dtx}{balance}} \file{lwarp-bigdelim.sty}{\from{lwarp.dtx}{bigdelim}} @@ -56,6 +58,7 @@ version 2005/12/01 or later. \file{lwarp-boxedminipage.sty}{\from{lwarp.dtx}{boxedminipage}} \file{lwarp-boxedminipage2e.sty}{\from{lwarp.dtx}{boxedminipage2e}} \file{lwarp-breakurl.sty}{\from{lwarp.dtx}{breakurl}} +\file{lwarp-cancel.sty}{\from{lwarp.dtx}{cancel}} \file{lwarp-ccaption.sty}{\from{lwarp.dtx}{ccaption}} \file{lwarp-changepage.sty}{\from{lwarp.dtx}{changepage}} \file{lwarp-chngpage.sty}{\from{lwarp.dtx}{chngpage}} @@ -67,6 +70,7 @@ version 2005/12/01 or later. \file{lwarp-dblfnote.sty}{\from{lwarp.dtx}{dblfnote}} \file{lwarp-dcolumn.sty}{\from{lwarp.dtx}{dcolumn}} \file{lwarp-draftwatermark.sty}{\from{lwarp.dtx}{draftwatermark}} +\file{lwarp-easy-todo.sty}{\from{lwarp.dtx}{easy-todo}} \file{lwarp-ebook.sty}{\from{lwarp.dtx}{ebook}} \file{lwarp-ellipsis.sty}{\from{lwarp.dtx}{ellipsis}} \file{lwarp-emptypage.sty}{\from{lwarp.dtx}{emptypage}} @@ -80,9 +84,12 @@ version 2005/12/01 or later. \file{lwarp-extramarks.sty}{\from{lwarp.dtx}{extramarks}} \file{lwarp-fancybox.sty}{\from{lwarp.dtx}{fancybox}} \file{lwarp-fancyhdr.sty}{\from{lwarp.dtx}{fancyhdr}} +\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-fix2col.sty}{\from{lwarp.dtx}{fix2col}} +\file{lwarp-fixme.sty}{\from{lwarp.dtx}{fixme}} +\file{lwarp-fixmetodonotes.sty}{\from{lwarp.dtx}{fixmetodonotes}} \file{lwarp-float.sty}{\from{lwarp.dtx}{float}} \file{lwarp-floatflt.sty}{\from{lwarp.dtx}{floatflt}} \file{lwarp-floatpag.sty}{\from{lwarp.dtx}{floatpag}} @@ -104,9 +111,11 @@ version 2005/12/01 or later. \file{lwarp-graphicx.sty}{\from{lwarp.dtx}{graphicx}} \file{lwarp-graphics.sty}{\from{lwarp.dtx}{graphics}} \file{lwarp-grffile.sty}{\from{lwarp.dtx}{grffile}} +\file{lwarp-hang.sty}{\from{lwarp.dtx}{hang}} \file{lwarp-hyperref.sty}{\from{lwarp.dtx}{hyperref}} \file{lwarp-hyperxmp.sty}{\from{lwarp.dtx}{hyperxmp}} \file{lwarp-idxlayout.sty}{\from{lwarp.dtx}{idxlayout}} +\file{lwarp-ifoddpage.sty}{\from{lwarp.dtx}{ifoddpage}} \file{lwarp-indentfirst.sty}{\from{lwarp.dtx}{indentfirst}} \file{lwarp-inputenc.sty}{\from{lwarp.dtx}{inputenc}} \file{lwarp-keyfloat.sty}{\from{lwarp.dtx}{keyfloat}} @@ -118,6 +127,7 @@ version 2005/12/01 or later. \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-luatodonotes.sty}{\from{lwarp.dtx}{luatodonotes}} \file{lwarp-marginfit.sty}{\from{lwarp.dtx}{marginfit}} \file{lwarp-marginfix.sty}{\from{lwarp.dtx}{marginfix}} @@ -150,6 +160,7 @@ version 2005/12/01 or later. \file{lwarp-pfnote.sty}{\from{lwarp.dtx}{pfnote}} \file{lwarp-placeins.sty}{\from{lwarp.dtx}{placeins}} \file{lwarp-prelim2e.sty}{\from{lwarp.dtx}{prelim2e}} +\file{lwarp-preview.sty}{\from{lwarp.dtx}{preview}} \file{lwarp-quotchap.sty}{\from{lwarp.dtx}{quotchap}} \file{lwarp-ragged2e.sty}{\from{lwarp.dtx}{ragged2e}} \file{lwarp-realscripts.sty}{\from{lwarp.dtx}{realscripts}} @@ -160,6 +171,12 @@ version 2005/12/01 or later. \file{lwarp-rotfloat.sty}{\from{lwarp.dtx}{rotfloat}} \file{lwarp-savetrees.sty}{\from{lwarp.dtx}{savetrees}} \file{lwarp-scalefnt.sty}{\from{lwarp.dtx}{scalefnt}} +\file{lwarp-scrextend.sty}{\from{lwarp.dtx}{scrextend}} +\file{lwarp-scrhack.sty}{\from{lwarp.dtx}{scrhack}} +\file{lwarp-scrlayer.sty}{\from{lwarp.dtx}{scrlayer}} +\file{lwarp-scrlayer-notecolumn.sty}{\from{lwarp.dtx}{scrlayer-notecolumn}} +\file{lwarp-scrlayer-scrpage.sty}{\from{lwarp.dtx}{scrlayer-scrpage}} +\file{lwarp-section.sty}{\from{lwarp.dtx}{section}} \file{lwarp-sectsty.sty}{\from{lwarp.dtx}{sectsty}} \file{lwarp-setspace.sty}{\from{lwarp.dtx}{setspace}} \file{lwarp-shadow.sty}{\from{lwarp.dtx}{shadow}} @@ -169,6 +186,8 @@ version 2005/12/01 or later. \file{lwarp-sidenotes.sty}{\from{lwarp.dtx}{sidenotes}} \file{lwarp-siunitx.sty}{\from{lwarp.dtx}{siunitx}} \file{lwarp-soul.sty}{\from{lwarp.dtx}{soul}} +\file{lwarp-soulpos.sty}{\from{lwarp.dtx}{soulpos}} +\file{lwarp-soulutf8.sty}{\from{lwarp.dtx}{soulutf8}} \file{lwarp-stabular.sty}{\from{lwarp.dtx}{stabular}} \file{lwarp-subfig.sty}{\from{lwarp.dtx}{subfig}} \file{lwarp-supertabular.sty}{\from{lwarp.dtx}{supertabular}} @@ -187,8 +206,11 @@ version 2005/12/01 or later. \file{lwarp-titlesec.sty}{\from{lwarp.dtx}{titlesec}} \file{lwarp-titletoc.sty}{\from{lwarp.dtx}{titletoc}} \file{lwarp-titling.sty}{\from{lwarp.dtx}{titling}} +\file{lwarp-tocbasic.sty}{\from{lwarp.dtx}{tocbasic}} \file{lwarp-tocbibind.sty}{\from{lwarp.dtx}{tocbibind}} \file{lwarp-tocloft.sty}{\from{lwarp.dtx}{tocloft}} +\file{lwarp-tocstyle.sty}{\from{lwarp.dtx}{tocstyle}} +\file{lwarp-todo.sty}{\from{lwarp.dtx}{todo}} \file{lwarp-todonotes.sty}{\from{lwarp.dtx}{todonotes}} \file{lwarp-transparent.sty}{\from{lwarp.dtx}{transparent}} \file{lwarp-trivfloat.sty}{\from{lwarp.dtx}{trivfloat}} @@ -197,6 +219,7 @@ version 2005/12/01 or later. \file{lwarp-upref.sty}{\from{lwarp.dtx}{upref}} \file{lwarp-verse.sty}{\from{lwarp.dtx}{verse}} \file{lwarp-wallpaper.sty}{\from{lwarp.dtx}{wallpaper}} +\file{lwarp-watermark.sty}{\from{lwarp.dtx}{watermark}} \file{lwarp-wrapfig.sty}{\from{lwarp.dtx}{wrapfig}} \file{lwarp-xcolor.sty}{\from{lwarp.dtx}{xcolor}} \file{lwarp-xfrac.sty}{\from{lwarp.dtx}{xfrac}} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-algorithmicx.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-algorithmicx.sty index 7a3ab4aaa6e..49211be29ed 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-algorithmicx.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-algorithmicx.sty @@ -35,10 +35,18 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"% }{}% \LWR@htmltagc{/span}% }% -\let\origComment\Comment% -\renewcommand{\Comment}[1]{\InlineClass{floatright}{\origComment{#1}}}% + +\let\LWR@origComment\Comment% + +\renewcommand{\Comment}[1]{% + \InlineClass{floatright}{\LWR@origComment{#1}}% +}% } +\renewcommand\algorithmiccomment[1]{% +\hfill\HTMLunicode{25B7} #1% white right triangle +}% + \end{warpHTML} \endinput diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-atbegshi.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-atbegshi.sty new file mode 100644 index 00000000000..79da130731e --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-atbegshi.sty @@ -0,0 +1,36 @@ +%% +%% This is file `lwarp-atbegshi.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `atbegshi') +%% This is a generated file. +%% Copyright 2016-2017 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +\LWR@ProvidesPackageDrop{atbegshi}[2011/10/05] +\newcommand*{\AtBeginShipout}[1]{} +\newbox\AtBeginShipoutBox +\newcommand*{\AtBeginShipoutNext}[1]{} +\newcommand*{\AtBeginShipoutFirst}[1]{} +\newcommand*{\AtBeginShipoutDiscard}{} +\newcommand*{\AtBeginShipoutInit}{} +\newcommand*{\AtBeginShipoutAddToBox}[1]{} +\newcommand*{\AtBeginShipoutAddToBoxForeground}[1]{} +\newcommand*{\AtBeginShipoutUpperLeft}[1]{} +\newcommand*{\AtBeginShipoutUpperLeftForeground}[1]{} +\newcommand*{\AtBeginShipoutOriginalShipout}[1]{} +\def\AtBeginShipoutBoxWidth{0pt} +\def\AtBeginShipoutBoxHeight{0pt} +\def\AtBeginShipoutBoxDepth{0pt} + +\endinput +%% +%% End of file `lwarp-atbegshi.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-cancel.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-cancel.sty new file mode 100644 index 00000000000..7c5373aa229 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-cancel.sty @@ -0,0 +1,49 @@ +%% +%% This is file `lwarp-cancel.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `cancel') +%% This is a generated file. +%% Copyright 2016-2017 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +\LWR@ProvidesPackagePass{cancel} +\LetLtxMacro\LWR@origcancel\cancel +\LetLtxMacro\LWR@origbcancel\bcancel +\LetLtxMacro\LWR@origxcancel\xcancel + +\appto{\LWR@restoreorigformatting}{% +\LetLtxMacro\cancel\LWR@origcancel% +\LetLtxMacro\bcancel\LWR@origbcancel% +\LetLtxMacro\xcancel\LWR@origxcancel% +} + +\newcommand{\LWR@cancelcolor}[5]{% +\ifcsempty{#2}% +{\LWR@HTMLtextstyle{#5}{#3}{#1}}% +{\LWR@htmlspanclass[#5;#4:\#\LWR@tempcolor]{#3}{#1}}% +} + +\DeclareRobustCommand{\cancel}[1]{% +\begingroup% +\CancelColor% +\LWR@findcurrenttextcolor% +\color{black}% +\LWR@cancelcolor{#1}{LWR@tempcolor}{sout}{text-decoration-color}% + {text-decoration:line-through}% +\endgroup% +} + +\LetLtxMacro\bcancel\cancel +\LetLtxMacro\xcancel\cancel +\endinput +%% +%% End of file `lwarp-cancel.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-changepage.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-changepage.sty index 3e980c5c31b..cd1be1bf28c 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-changepage.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-changepage.sty @@ -26,6 +26,9 @@ \newenvironment{adjustwidth}[2]{}{} \newenvironment{adjustwidth*}[2]{}{} +\newcommand*{\strictpagecheck}{} +\newcommand*{\easypagecheck}{} + \endinput %% %% End of file `lwarp-changepage.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-easy-todo.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-easy-todo.sty new file mode 100644 index 00000000000..07e598be14e --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-easy-todo.sty @@ -0,0 +1,48 @@ +%% +%% This is file `lwarp-easy-todo.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `easy-todo') +%% This is a generated file. +%% Copyright 2016-2017 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. + +\LWR@ProvidesPackagePass{easy-todo} + +\let\LWR@origlistoftodos\listoftodos + +\renewcommand{\listoftodos}{% +\begingroup +\renewcommand{\flushright}{} +\LWR@origlistoftodos +\endgroup +} + +\renewcommand{\todoii}[2]{% +\ifthenelse{\equal{\@todoobeyfinal}{true}}{% + \ifoptionfinal{\todoenable{false}}{\todoenable{true}}% +}{}% +\ifthenelse{\equal{\@todoenable}{true}}{% +\refstepcounter{todos}% +\noindent{% + \todocolor% + \LWR@textcurrentcolor{% + \normalfont\scriptsize{\bfseries{\thetodos.#1}}% + }% +}% +\addcontentsline{lod}{todos}{\protect{\thetodos. }#2}% +}{}% +} + +\endinput +%% +%% End of file `lwarp-easy-todo.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyref.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyref.sty new file mode 100644 index 00000000000..ce330c9ef49 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyref.sty @@ -0,0 +1,70 @@ +%% +%% This is file `lwarp-fancyref.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `fancyref') +%% This is a generated file. +%% Copyright 2016-2017 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +\LWR@ProvidesPackageDrop{fancyref} +\newcommand*{\fancyrefhook}[1]{#1} +\newcommand*{\fref}[2][]{\cref{#2}} +\newcommand*{\Fref}[2][]{\Cref{#2}} +\newcommand*{\fancyrefchaplabelprefix}{chap} +\newcommand*{\fancyrefenumlabelprefix}{enum} +\newcommand*{\fancyrefeqlabelprefix}{eq} +\newcommand*{\fancyreffiglabelprefix}{fig} +\newcommand*{\fancyreffnlabelprefix}{fn} +\newcommand*{\fancyrefseclabelprefix}{sec} +\newcommand*{\fancyreftablabelprefix}{tab} +\newcommand*{\fancyrefchangeprefix}[2]{} +\newcommand*{\fancyrefargdelim}{:} +\newcommand*{\fancyrefloosespacing}{~} +\newcommand*{\fancyreftightspacing}{\,} +\newcommand*{\fancyrefdefaultspacing}{\fancyrefloosespacing} +\providecommand*{\chaptername}{Chapter} +\providecommand*{\figurename}{Figure} +\providecommand*{\pagename}{Page} +\providecommand*{\tablename}{Table} +\renewcommand*{\Frefchapname}{\chaptername} +\renewcommand*{\Frefenumname}{Item} +\renewcommand*{\Frefeqname}{Equation} +\renewcommand*{\Freffigname}{\figurename} +\renewcommand*{\Freffnname}{Footnote} +\renewcommand*{\Frefonname}{On} +\renewcommand*{\Frefpgname}{\pagename} +\renewcommand*{\Frefsecname}{Section} +\renewcommand*{\Frefseename}{See} +\renewcommand*{\Freftabname}{\tablename} +\renewcommand*{\Freffigshortname}{Fig.} +\renewcommand*{\Frefpgshortname}{P.} +\renewcommand*{\Freftabshortname}{Tab.} +\renewcommand*{\frefchapname}{\MakeLowercase{\Frefchapname}} +\renewcommand*{\frefenumname}{\MakeLowercase{\Frefenumname}} +\renewcommand*{\frefeqname}{\MakeLowercase{\Frefeqname}} +\renewcommand*{\freffigname}{\MakeLowercase{\Freffigname}} +\renewcommand*{\freffnname}{\MakeLowercase{\Freffnname}} +\renewcommand*{\frefonname}{\MakeLowercase{\Frefonname}} +\renewcommand*{\frefpgname}{\MakeLowercase{\Frefpgname}} +\renewcommand*{\frefsecname}{\MakeLowercase{\Frefsecname}} +\renewcommand*{\frefseename}{\MakeLowercase{\Frefseename}} +\renewcommand*{\freftabname}{\MakeLowercase{\Freftabname}} +\renewcommand*{\freffigshortname}{\MakeLowercase{\Freffigshortname}} +\renewcommand*{\frefpgshortname}{\MakeLowercase{\Frefpgshortname}} +\renewcommand*{\freftabshortname}{\MakeLowercase{\Freftabshortname}} +\newcommand*{\fancyrefaddcaptions}[2]{} +\newcommand*{\fancyrefdefaultformat}{\@empty} +\newcommand{\frefformat}[3]{} +\newcommand{\Frefformat}[3]{} +\endinput +%% +%% End of file `lwarp-fancyref.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyvrb.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyvrb.sty index 471db8983b0..ecb8727ca62 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyvrb.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyvrb.sty @@ -69,33 +69,20 @@ \FV@EndListFrame@Lines% \LWR@fvendnone% } - -\newcommand*{\LWR@FVfindcurrentcolor}{% -\protect\colorlet{LWR@current@color}{.}% -\protect\convertcolorspec{named}{LWR@current@color}{HTML}\LWR@tempcolor% -} - -\newcommand*{\LWR@FVtextstyle}{% -\LWR@FVfindcurrentcolor -\ifdefstring{\LWR@tempcolor}{000000}% -{}% -{color: \#\LWR@tempcolor ; }% -} - \newcommand*{\LWR@FVfindbordercolor}{% \FancyVerbRuleColor% -\LWR@FVfindcurrentcolor -\color{black} +\LWR@findcurrenttextcolor% +\color{black}% } \newcommand*{\LWR@FVborderstyle}[1]{% -padding#1: \strip@pt\dimexpr \FV@FrameSep\relax\relax pt ; -\LWR@FVfindbordercolor -border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor ; +padding#1: \strip@pt\dimexpr \FV@FrameSep\relax\relax pt ; % +\LWR@FVfindbordercolor % +border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor ; % } \def\FV@Frame@none{% -\renewcommand*{\LWR@FVstyle}{\LWR@FVtextstyle}% +\renewcommand*{\LWR@FVstyle}{\LWR@currenttextcolorstyle}% \let\FV@BeginListFrame\LWR@fvstartnone% \let\FV@LeftListFrame\relax% \let\FV@RightListFrame\relax% @@ -104,7 +91,7 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor \FV@Frame@none% default values \def\FV@Frame@single{% -\renewcommand*{\LWR@FVstyle}{\LWR@FVtextstyle\LWR@FVborderstyle{}}% +\renewcommand*{\LWR@FVstyle}{\LWR@currenttextcolorstyle\LWR@FVborderstyle{}}% \let\FV@BeginListFrame\LWR@fvstartsingle% \let\FV@LeftListFrame\FV@LeftListFrame@Single% \let\FV@RightListFrame\FV@RightListFrame@Single% @@ -112,7 +99,7 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor \def\FV@Frame@lines{% \renewcommand*{\LWR@FVstyle}{% - \LWR@FVtextstyle\LWR@FVborderstyle{-top}\LWR@FVborderstyle{-bottom}% + \LWR@currenttextcolorstyle\LWR@FVborderstyle{-top}\LWR@FVborderstyle{-bottom}% }% \let\FV@BeginListFrame\LWR@fvstartline% \let\FV@LeftListFrame\relax% @@ -120,21 +107,21 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor \let\FV@EndListFrame\LWR@fvendline} \def\FV@Frame@topline{% -\renewcommand*{\LWR@FVstyle}{\LWR@FVtextstyle\LWR@FVborderstyle{-top}}% +\renewcommand*{\LWR@FVstyle}{\LWR@currenttextcolorstyle\LWR@FVborderstyle{-top}}% \let\FV@BeginListFrame\LWR@fvstartline% \let\FV@LeftListFrame\relax% \let\FV@RightListFrame\relax% \let\FV@EndListFrame\LWR@fvendnone} \def\FV@Frame@bottomline{% -\renewcommand*{\LWR@FVstyle}{\LWR@FVtextstyle\LWR@FVborderstyle{-bottom}}% +\renewcommand*{\LWR@FVstyle}{\LWR@currenttextcolorstyle\LWR@FVborderstyle{-bottom}}% \let\FV@BeginListFrame\LWR@fvstartnone% \let\FV@LeftListFrame\relax% \let\FV@RightListFrame\relax% \let\FV@EndListFrame\LWR@fvendline} \def\FV@Frame@leftline{% -\renewcommand*{\LWR@FVstyle}{\LWR@FVtextstyle\LWR@FVborderstyle{-left}}% +\renewcommand*{\LWR@FVstyle}{\LWR@currenttextcolorstyle\LWR@FVborderstyle{-left}}% \ifx\FancyVerbFillColor\relax% \let\FV@FrameFillLine\relax% \else% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-fixme.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-fixme.sty new file mode 100644 index 00000000000..1b64fc04c68 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-fixme.sty @@ -0,0 +1,61 @@ +%% +%% This is file `lwarp-fixme.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `fixme') +%% This is a generated file. +%% Copyright 2016-2017 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. + +\LWR@ProvidesPackagePass{fixme} +\let\@wrindex\LWR@wrindex +\newcommand{\ext@fixme}{lox} + +\renewcommand{\l@fixme}[2]{\hypertocfloat{1}{fixme}{lox}{#1}{#2}} +\def\FXFaceInlineHTMLStyle{font-weight:bold} + +\renewcommand*\FXLayoutInline[3]{ % +\InlineClass[\FXFaceInlineHTMLStyle]{fixmeinline}% + {\@fxtextstd{#1}{#2}{#3}}% +} + +\def\FXFaceEnvHTMLStyle{font-weight:bold} + +\renewcommand*\FXEnvLayoutPlainBegin[2]{% +\BlockClass[\FXFaceEnvHTMLStyle]{fixmebold} +\ignorespaces#2 \fxnotename{#1}: \ignorespaces} + +\renewcommand*\FXEnvLayoutPlainEnd[2]{\endBlockClass} + +\renewcommand*\FXEnvLayoutSignatureBegin[2]{% +\BlockClass[\FXFaceEnvHTMLStyle]{fixmebold} +\fxnotename{#1}: \ignorespaces} + +\renewcommand*\FXEnvLayoutSignatureEnd[2]{\@fxsignature{#2}\endBlockClass} + +\def\FXFaceSignatureHTMLStyle{font-style:italic} + +\DeclareRobustCommand*\@fxsignature[1]{% +\ifthenelse{\equal{#1}{}}% +{}% +{ -- {\InlineClass[\FXFaceSignatureHTMLStyle]{fixmesignature}{#1}}}% +} + +\def\FXFaceTargetHTMLStyle{font-style:italic} + +\renewcommand\FXTargetLayoutPlain[2]{% + \InlineClass[\FXFaceTargetHTMLStyle]{fixmetarget}{#2}% +} + +\endinput +%% +%% End of file `lwarp-fixme.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-fixmetodonotes.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-fixmetodonotes.sty new file mode 100644 index 00000000000..82c54c24a51 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-fixmetodonotes.sty @@ -0,0 +1,40 @@ +%% +%% This is file `lwarp-fixmetodonotes.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `fixmetodonotes') +%% This is a generated file. +%% Copyright 2016-2017 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. + +\LWR@ProvidesPackagePass{fixmetodonotes} + +\renewcommand{\NOTES@addtolist}[2]{% + \refstepcounter{NOTES@note}% + \addcontentsline{notes}{NOTES@note}{% + \protect\numberline{\theNOTES@note}{{#1}: {#2}}% + }% +} + +\renewcommand{\NOTES@marker}[2]{\fbox{% + \textcolor{#2}{% WAS \color + \textbf{#1}}% + }} + +\renewcommand{\NOTES@colorline}[2]{% + \bgroup% + \ULon{\LWR@backgroundcolor{#1}{#2}}% +} + +\endinput +%% +%% End of file `lwarp-fixmetodonotes.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-fontenc.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-fontenc.sty index 5138dfa0f68..a0cb426d29b 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-fontenc.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-fontenc.sty @@ -15,12 +15,7 @@ %% 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{fontenc} - -\LWR@loadbefore{fontenc} - +\LWR@ProvidesPackagePass{fontenc} \endinput %% %% End of file `lwarp-fontenc.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty index 8895747c1c2..04c1b770d86 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty @@ -274,7 +274,7 @@ img src="\LWR@parsedfilename" \LWR@orignewline% \LWR@traceinfo{includegraphics} \LWR@ensuredoingapar% \begingroup% -\catcode`\_=12% +\catcode`\_=12 \LWR@includegraphicsb% }% includegraphics }% AtBeginDocument diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-hang.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-hang.sty new file mode 100644 index 00000000000..30fba575b43 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-hang.sty @@ -0,0 +1,83 @@ +%% +%% This is file `lwarp-hang.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `hang') +%% This is a generated file. +%% Copyright 2016-2017 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +\LWR@ProvidesPackageDrop{hang} +\newlength{\hangingindent} +\setlength{\hangingindent}{1em} +\newlength{\hangingleftmargin} +\setlength{\hangingleftmargin}{0em} + +\newcommand*{\LWR@findhangingleftmargin}{% +\setlength{\LWR@templengthone}{\hangingleftmargin}% +\addtolength{\LWR@templengthone}{\hangingindent}% +} + +\newenvironment{hangingpar} +{ + \LWR@findhangingleftmargin% + \uselengthunit{PT}% + \BlockClass[% + margin-left:\rndprintlength{\LWR@templengthone}; % + text-indent:-\rndprintlength{\hangingindent}% + ]% + {hangingpar}% +} +{\endBlockClass} + +\newenvironment{hanginglist} +{% + \renewcommand*{\LWR@printcloselist}{\LWR@printcloseitemize}% + \renewcommand*{\LWR@printopenlist}{% + \LWR@findhangingleftmargin% + \uselengthunit{PT}% + ul style="list-style-type:none; % + margin-left:\rndprintlength{\LWR@templengthone}; % + text-indent:-\rndprintlength{\hangingindent}"% + }% + \let\item\LWR@itemizeitem% + \list{}{}% +} +{\endlist} + +\newenvironment{compacthang} +{\hanginglist} +{\endhanginglist} + +\newlength{\labeledleftmargin} +\setlength{\labeledleftmargin}{0em} + +\newenvironment{labeledpar}[2] +{% + \BlockClass[% + \LWR@findhangingleftmargin% + \uselengthunit{PT}% + margin-left:\rndprintlength{\LWR@templengthone}; % + text-indent:-\rndprintlength{\hangingindent}% + ]{labeledpar}#2% +} +{\endBlockClass} + +\newenvironment{labeledlist}[1] +{\hanginglist} +{\endhanginglist} + +\newenvironment{compactlabel}[1] +{\hanginglist} +{\endhanginglist} +\endinput +%% +%% End of file `lwarp-hang.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-ifoddpage.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-ifoddpage.sty new file mode 100644 index 00000000000..4aae9c65223 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-ifoddpage.sty @@ -0,0 +1,40 @@ +%% +%% This is file `lwarp-ifoddpage.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `ifoddpage') +%% This is a generated file. +%% Copyright 2016-2017 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. + + +\LWR@ProvidesPackageDrop{ifoddpage} + +\newif\ifoddpage + +\newif\ifoddpageoroneside + +\DeclareRobustCommand{\checkoddpage}{\oddpagetrue\oddpageoronesidetrue} + +\def\oddpage@page{1} + +\def\@ifoddpage{% + \expandafter\@firstoftwo +} + +\def\@ifoddpageoroneside{% + \expandafter\@firstoftwo +} + +\endinput +%% +%% End of file `lwarp-ifoddpage.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-ltxtable.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-ltxtable.sty new file mode 100644 index 00000000000..f0e445be889 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-ltxtable.sty @@ -0,0 +1,24 @@ +%% +%% This is file `lwarp-ltxtable.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `ltxtable') +%% This is a generated file. +%% Copyright 2016-2017 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +\LWR@ProvidesPackageDrop{ltxtable} +\newcommand*{\LTXtable}[2]{% +\input{#2}% +} +\endinput +%% +%% End of file `lwarp-ltxtable.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-luatodonotes.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-luatodonotes.sty index fe717da7589..13b7ce6da65 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-luatodonotes.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-luatodonotes.sty @@ -15,12 +15,82 @@ %% 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{luatodonotes} -\newcommand{\listoftodos}[1][]{} -\newcommand{\todo}[2][]{} -\newcommand{\missingfigure}[2][]{} -\newcommand{\todototoc}{} -\newcommand{\todoarea}[3][]{}% +\LWR@ProvidesPackagePass{luatodonotes} +\@todonotes@additionalMarginEnabledfalse +\if@todonotes@disabled +\else + +\newcommand{\ext@todo}{tdo} + +\renewcommand{\l@todo}[2]{\hypertocfloat{1}{todo}{ldo}{#1}{#2}} + +\renewcommand{\@todonotes@drawMarginNoteWithLine}{% +\fcolorbox + {\@todonotes@currentbordercolor} + {\@todonotes@currentbackgroundcolor} + {\arabic{@todonotes@numberoftodonotes}} +\marginpar{\@todonotes@drawMarginNote} +} + +\renewcommand{\@todonotes@drawInlineNote}{% +\fcolorboxBlock% + {\@todonotes@currentbordercolor}% + {\@todonotes@currentbackgroundcolor}% + {% + \if@todonotes@authorgiven% + {\@todonotes@author:\,}% + \fi% + \@todonotes@text% + }% +} + +\newcommand{\@todonotes@drawMarginNote}{% + \if@todonotes@authorgiven% + \@todonotes@author\par% + \fi% + \arabic{@todonotes@numberoftodonotes}: % + \fcolorbox% + {\@todonotes@currentbordercolor}% + {\@todonotes@currentbackgroundcolor}% + {% + \@todonotes@sizecommand% + \@todonotes@text % + }% +}% + +\renewcommand{\missingfigure}[2][]{% +\setkeys{todonotes}{#1}% +\addcontentsline{tdo}{todo}{\@todonotes@MissingFigureText: #2}% +\fcolorboxBlock% + {\@todonotes@currentbordercolor}% + {\@todonotes@currentfigcolor}% + {% + \setlength{\fboxrule}{4pt}% + \fcolorbox{red}{white}{Missing figure} \quad #2% + } +} + +\LetLtxMacro\LWRTODONOTES@orig@todocommon\@todocommon + +\RenewDocumentCommand{\@todocommon}{m m}{% +\begingroup% +\renewcommand*{\phantomsection}{}% +\LWRTODONOTES@orig@todocommon{#1}{#2}% +\endgroup% +} + +\renewcommand{\@todoarea}[3][]{% + \@todonotes@areaselectedtrue% + \@todocommon{#1}{#2}% + \todonotes@textmark@highlight{#3}% + \zref@label{@todonotes@\arabic{@todonotes@numberoftodonotes}@end}% +}% + +\DeclareDocumentCommand{\todonotes@textmark@highlight}{m}{% +\InlineClass[background:\#B3FFB3]{highlight}{#1}% +} + +\fi% \if@todonotes@disabled \endinput %% %% End of file `lwarp-luatodonotes.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-midfloat.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-midfloat.sty index 086076c5932..4e6cd302954 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-midfloat.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-midfloat.sty @@ -15,6 +15,7 @@ %% 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{midfloat} \newenvironment{strip}[1][]{}{} \newskip\stripsep diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-multirow.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-multirow.sty index b52c068a6df..60435db9a66 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-multirow.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-multirow.sty @@ -42,7 +42,6 @@ class="td% "% \LWR@tdstartstyles% \LWR@addcmidrulewidth% -\LWR@addformatwpalignment% \LWR@tdendstyles% }% \LWR@getexparray{LWR@colbeforespec}{\arabic{LWR@tablecolindex}}% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-ntheorem.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-ntheorem.sty index 760535b8269..768fa0d3fdc 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-ntheorem.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-ntheorem.sty @@ -103,9 +103,9 @@ \fi} } \newcommand{\LWR@inctheorem}{% -\addtocounter{LWR@thisfloat}{1}% +\addtocounter{LWR@thisautoid}{1}% \LWR@stoppars% -\LWR@htmltag{a id="autofloat-\arabic{LWR@thisfloat}"{}}\LWR@htmltag{/a}% +\LWR@htmltag{a id="autoid-\arabic{LWR@thisautoid}"{}}\LWR@htmltag{/a}% \LWR@startpars% } \gdef\newtheoremstyle#1#2#3{% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-overpic.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-overpic.sty index 5f09308af45..e02f72634e7 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-overpic.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-overpic.sty @@ -22,20 +22,20 @@ \newcommand*{\overpicfontskip}{14} \BeforeBeginEnvironment{overpic}{% - \lateximage% + \begin{lateximage}% \fontsize{\overpicfontsize}{\overpicfontskip}% \selectfont% } -\AfterEndEnvironment{overpic}{\endlateximage} +\AfterEndEnvironment{overpic}{\end{lateximage}} \BeforeBeginEnvironment{Overpic}{% - \lateximage% + \begin{lateximage}% \fontsize{\overpicfontsize}{\overpicfontskip}% \selectfont% } -\AfterEndEnvironment{Overpic}{\endlateximage} +\AfterEndEnvironment{Overpic}{\end{lateximage}} \endinput %% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-paralist.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-paralist.sty index 7b38dd79ff0..49213ad68bf 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-paralist.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-paralist.sty @@ -18,11 +18,14 @@ \LWR@ProvidesPackagePass{paralist} \AtBeginEnvironment{compactitem}{\LWR@itemizestart} -\AtEndEnvironment{compactitem}{\LWR@itemizeend} \AtBeginEnvironment{compactenum}{\LWR@enumeratestart} -\AtEndEnvironment{compactenum}{\LWR@enumerateend} \AtBeginEnvironment{compactdesc}{\LWR@descriptionstart} -\AtEndEnvironment{compactdesc}{\LWR@descriptionend} +\AtEndEnvironment{compactitem}{\LWR@listend} +\AtEndEnvironment{compactenum}{\LWR@listend} +\AtEndEnvironment{compactdesc}{\LWR@listend} +\AtBeginEnvironment{inparaitem}{\LetLtxMacro\item\LWR@origitem} +\AtBeginEnvironment{inparaenum}{\LetLtxMacro\item\LWR@origitem} +\AtBeginEnvironment{inparadesc}{\LetLtxMacro\item\LWR@origitem} \def\paradescriptionlabel#1{{\normalfont\textbf{#1}}} \endinput %% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-komascript.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-komascript.sty new file mode 100644 index 00000000000..c92d689bd46 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-komascript.sty @@ -0,0 +1,67 @@ +%% +%% This is file `lwarp-patch-komascript.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `patch-komascript') +%% This is a generated file. +%% Copyright 2016-2017 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +\ProvidesPackage{lwarp-patch-komascript} +\RequirePackage{lwarp-typearea} +\RequirePackage{lwarp-tocbasic} +\RequirePackage{lwarp-scrextend} +\renewcommand*{\minisec}[1]{ +\begin{BlockClass}{minisec} +#1 +\end{BlockClass} +} +\@ifundefined{setpartpreamble}{}{ +\RenewDocumentCommand{\setpartpreamble}{o o +m}{% +\renewcommand{\part@preamble}{#3}% +} +} + +\@ifundefined{setchapterpreamble}{}{ +\RenewDocumentCommand{\setchapterpreamble}{o o +m}{% +\renewcommand{\chapter@preamble}{#3}% +} +} +\LetLtxMacro\captionbelow\caption +\LetLtxMacro\captionabove\caption + +\LetLtxMacro\captionofbelow\captionof +\LetLtxMacro\captionofabove\captionof + +\RenewDocumentEnvironment{captionbeside}{o m o o o s} +{} +{% +\IfValueTF{#1}% +{\caption[#1]{#2}}% +{\caption{#2}}% +} + +\RenewDocumentEnvironment{captionofbeside}{m o m o o o s} +{} +{% +\IfValueTF{#2}% +{\captionof{#1}[#2]{#3}}% +{\captionof{#1}{#3}}% +} + +\RenewDocumentCommand{\setcapindent}{s m}{} +\renewcommand*{\setcaphanging}{} +\renewcommand*{\setcapwidth}[2][]{} +\renewcommand*{\setcapdynwidth}[2][]{} +\RenewDocumentCommand{\setcapmargin}{s o m}{} +\endinput +%% +%% End of file `lwarp-patch-komascript.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfsync.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfsync.sty index 26784207fcd..191ca40272f 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfsync.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfsync.sty @@ -16,9 +16,9 @@ %% and version 1.3 or later is part of all distributions of LaTeX %% version 2005/12/01 or later. \LWR@ProvidesPackageDrop{pdfsync} -\let\pdfsync\relax -\let\pdfsyncstart\relax -\let\pdfsyncstop\relax +\newcommand*{\pdfsync}{} +\newcommand*{\pdfsyncstart}{} +\newcommand*{\pdfsyncstop}{} \endinput %% %% End of file `lwarp-pdfsync.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-preview.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-preview.sty new file mode 100644 index 00000000000..263205b4c29 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-preview.sty @@ -0,0 +1,29 @@ +%% +%% This is file `lwarp-preview.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `preview') +%% This is a generated file. +%% Copyright 2016-2017 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +\LWR@ProvidesPackageDrop{preview} +\newenvironment{preview}{}{} +\newenvironment{nopreview}{}{} +\NewDocumentCommand{\PreviewMacro}{s o o +m}{} +\NewDocumentCommand{\PreviewEnvironment}{s o o +m}{} +\newcommand{\PreviewSnarfEnvironment}[2][]{} +\NewDocumentCommand{\PreviewOpen}{s o}{} +\NewDocumentCommand{\PreviewClose}{s o}{} +\let\ifPreview\iffalse% \fi for syntax highlighting +\endinput +%% +%% End of file `lwarp-preview.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-romanbar.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-romanbar.sty index 073e92d16e5..3f4a5c75267 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-romanbar.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-romanbar.sty @@ -16,6 +16,7 @@ %% and version 1.3 or later is part of all distributions of LaTeX %% version 2005/12/01 or later. + \LWR@ProvidesPackagePass{romanbar} \DeclareRobustCommand{\Roman@bar}[1]{% #1 is in Roman, i.e. MMXII diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-scrextend.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-scrextend.sty new file mode 100644 index 00000000000..3542c5e2feb --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-scrextend.sty @@ -0,0 +1,149 @@ +%% +%% This is file `lwarp-scrextend.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `scrextend') +%% This is a generated file. +%% Copyright 2016-2017 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +\LWR@ProvidesPackageDrop{scrextend} +\DeclareDocumentCommand{\setkomafont}{m m}{} +\DeclareDocumentCommand{\addkomafont}{m m}{} +\DeclareDocumentCommand{\usekomafont}{m}{} + +\DeclareDocumentCommand{\usefontofkomafont}{m}{} +\DeclareDocumentCommand{\useencodingofkomafont}{m}{} +\DeclareDocumentCommand{\usesizeofkomafont}{m}{} +\DeclareDocumentCommand{\usefamilyofkomafont}{m}{} +\DeclareDocumentCommand{\useseriesofkomafont}{m}{} +\DeclareDocumentCommand{\useshapeofkomafont}{m}{} + +\AtBeginDocument{ +\let\LWR@maketitle\maketitle +\DeclareDocumentCommand{\maketitle}{o}{\LWR@maketitle} +} + +\DeclareDocumentCommand{\extratitle}{m}{} +\DeclareDocumentCommand{\titlehead}{m}{} +\DeclareDocumentCommand{\subject}{m}{} +\DeclareDocumentCommand{\publishers}{m}{\published{#1}} +\DeclareDocumentCommand{\uppertitleback}{m}{} +\DeclareDocumentCommand{\lowertitleback}{m}{} +\DeclareDocumentCommand{\dedication}{m}{} + +\DeclareDocumentCommand{\ifthispageodd}{m m}{#1} + +\DeclareDocumentCommand{\titlepagestyle}{}{} + +\DeclareDocumentCommand{\cleardoublepageusingstyle}{m}{} +\DeclareDocumentCommand{\cleardoubleemptypage}{}{} +\DeclareDocumentCommand{\cleardoubleplainpage}{}{} +\DeclareDocumentCommand{\cleardoublestandardpage}{}{} +\DeclareDocumentCommand{\cleardoubleoddpage}{}{} +\DeclareDocumentCommand{\cleardoubleoddpageusingstyle}{m}{} +\DeclareDocumentCommand{\cleardoubleoddemptypage}{}{} +\DeclareDocumentCommand{\cleardoubleoddplainpage}{}{} +\DeclareDocumentCommand{\cleardoubleoddstandardpage}{}{} +\DeclareDocumentCommand{\cleardoubleevenpage}{}{} +\DeclareDocumentCommand{\cleardoubleevenpageusingstyle}{m}{} +\DeclareDocumentCommand{\cleardoubleevenemptypage}{}{} +\DeclareDocumentCommand{\cleardoubleevenplainpage}{}{} +\DeclareDocumentCommand{\cleardoubleevenstandardpage}{}{} + +\DeclareDocumentCommand{\multiplefootnoteseparator}{}{% + \begingroup\let\thefootnotemark\multfootsep\@makefnmark\endgroup +} + +\DeclareDocumentCommand{\multfootsep}{}{,} + +\DeclareDocumentCommand{\footref}{m}{% + \begingroup + \unrestored@protected@xdef\@thefnmark{\ref{#1}}% + \endgroup + \@footnotemark +} + +\DeclareDocumentCommand{\deffootnote}{o m m m}{} +\DeclareDocumentCommand{\deffootnotemark}{m}{} +\DeclareDocumentCommand{\setfootnoterule}{o m}{} +\DeclareDocumentCommand{\raggedfootnote}{}{} + +\DeclareDocumentCommand{\dictum}{o m}{ +\begin{LWR@BlockClassWP}{text-align:right}{}{dictum} + #2 + \IfValueT{#1} + { + \ifbool{FormatWP} + {\begin{BlockClass}[border-top:1px solid gray]{dictumauthor}} + {\begin{BlockClass}{dictumauthor}} + \dictumauthorformat{#1} + \end{BlockClass} + } +\end{LWR@BlockClassWP} +} + +\DeclareDocumentCommand{\dictumwidth}{}{} +\DeclareDocumentCommand{\dictumauthorformat}{m}{(#1)} +\DeclareDocumentCommand{\dictumrule}{}{} +\DeclareDocumentCommand{\raggeddictum}{}{} +\DeclareDocumentCommand{\raggeddictumtext}{}{} +\DeclareDocumentCommand{\raggeddictumauthor}{}{} + +\DeclareDocumentEnvironment{labeling}{o m} +{% +\def\sc@septext{#1}% +\list{}{}% +\let\makelabel\labelinglabel% +} +{ +\endlist +} + +\DeclareDocumentCommand{\labelinglabel}{m}{% +#1 \qquad \sc@septext% +} + +\let\addmargin\relax +\let\endaddmargin\relax +\cslet{addmargin*}{\relax} +\cslet{endaddmargin*}{\relax} + +\NewDocumentEnvironment{addmargin}{s O{} m} +{ +\uselengthunit{PT}% +\setlength{\LWR@templengthtwo}{#3} +\ifblank{#2} +{ + \begin{BlockClass}[ + margin-left:\rndprintlength{\LWR@templengthtwo} ; + margin-right:\rndprintlength{\LWR@templengthtwo} + ]{addmargin} +} +{ + \setlength{\LWR@templengthone}{#2} + \begin{BlockClass}[ + margin-left:\rndprintlength{\LWR@templengthone} ; + margin-right:\rndprintlength{\LWR@templengthtwo} + ]{addmargin} +} +} +{\end{BlockClass}} + +\ExplSyntaxOn +\cs_new:cpn {addmargin*} {\addmargin*} +\cs_new_eq:cN {endaddmargin*} \endaddmargin +\ExplSyntaxOff + +\DeclareDocumentCommand{\marginline}{m}{\marginpar{#1}} +\endinput +%% +%% End of file `lwarp-scrextend.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-scrhack.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-scrhack.sty new file mode 100644 index 00000000000..7765e7d05b2 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-scrhack.sty @@ -0,0 +1,21 @@ +%% +%% This is file `lwarp-scrhack.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `scrhack') +%% This is a generated file. +%% Copyright 2016-2017 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +\LWR@ProvidesPackageDrop{scrhack} +\endinput +%% +%% End of file `lwarp-scrhack.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-scrlayer-notecolumn.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-scrlayer-notecolumn.sty new file mode 100644 index 00000000000..1e1f8c7c7c0 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-scrlayer-notecolumn.sty @@ -0,0 +1,30 @@ +%% +%% This is file `lwarp-scrlayer-notecolumn.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `scrlayer-notecolumn') +%% This is a generated file. +%% Copyright 2016-2017 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +\LWR@ProvidesPackageDrop{scrlayer-notecolumn} +\newcommand*{\DeclareNoteColumn}[2][]{} +\newcommand*{\DeclareNewNoteColumn}[2][]{} +\newcommand*{\ProvideNoteColumn}[2][]{} +\newcommand*{\RedeclareNoteColumn}[2][]{} +\NewDocumentCommand{\makenote}{s o m}{\marginpar{#3}} +\newcommand*{\syncwithnotecolumn}[1][]{} +\newcommand*{\syncwithnotecolumns}[1][]{} +\newcommand*{\clearnotecolumn}[1][]{} +\newcommand*{\clearnotecolumns}[1][]{} +\endinput +%% +%% End of file `lwarp-scrlayer-notecolumn.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-scrlayer-scrpage.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-scrlayer-scrpage.sty new file mode 100644 index 00000000000..6561d29e023 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-scrlayer-scrpage.sty @@ -0,0 +1,59 @@ +%% +%% This is file `lwarp-scrlayer-scrpage.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `scrlayer-scrpage') +%% This is a generated file. +%% Copyright 2016-2017 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +\LWR@ProvidesPackageDrop{scrlayer-scrpage} +\@ifundefined{footheight}{\newlength\footheight}{} +\NewDocumentCommand{\lehead}{s o m}{} +\NewDocumentCommand{\cehead}{s o m}{} +\NewDocumentCommand{\rehead}{s o m}{} +\NewDocumentCommand{\lohead}{s o m}{} +\NewDocumentCommand{\cohead}{s o m}{} +\NewDocumentCommand{\rohead}{s o m}{} +\NewDocumentCommand{\lefoot}{s o m}{} +\NewDocumentCommand{\cefoot}{s o m}{} +\NewDocumentCommand{\refoot}{s o m}{} +\NewDocumentCommand{\lofoot}{s o m}{} +\NewDocumentCommand{\cofoot}{s o m}{} +\NewDocumentCommand{\rofoot}{s o m}{} +\NewDocumentCommand{\ohead}{s o m}{} +\NewDocumentCommand{\chead}{s o m}{} +\NewDocumentCommand{\ihead}{s o m}{} +\NewDocumentCommand{\ofoot}{s o m}{} +\NewDocumentCommand{\cfoot}{s o m}{} +\NewDocumentCommand{\ifoot}{s o m}{} +\DeclareDocumentCommand{\automark}{s o m}{} +\DeclareDocumentCommand{\manualmark}{}{} +\DeclareDocumentCommand{\MakeMarkcase}{m}{#1} +\DeclareDocumentCommand{\GenericMarkFormat}{}{} +\newcommand*{\defpairofpagestyles}[3][]{} +\newcommand*{\newpairofpagestyles}[3][]{} +\newcommand*{\renewpairofpagestyles}[3][]{} +\newcommand*{\providepairofpagestyles}[3][]{} +\newcommand*{\clearmainofpairofpagestyles} +\newcommand*{\clearplainofpairofpagestyles} +\newcommand*{\clearpairofpagestyles} +\NewDocumentCommand{\deftriplepagestyle}{m o o m m m m m m}{} +\NewDocumentCommand{\newtriplepagestyle}{m o o m m m m m m}{} +\NewDocumentCommand{\renewtriplepagestyle}{m o o m m m m m m}{} +\NewDocumentCommand{\providetriplepagestyle}{m o o m m m m m m}{} +\newcommand*{\defpagestyle}[3]{} +\newcommand*{\newpagestyle}[3]{} +\newcommand*{\providepagestyle}[3]{} +\newcommand*{\renewpagestyle}[3]{} +\endinput +%% +%% End of file `lwarp-scrlayer-scrpage.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-scrlayer.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-scrlayer.sty new file mode 100644 index 00000000000..0a6da93405b --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-scrlayer.sty @@ -0,0 +1,85 @@ +%% +%% This is file `lwarp-scrlayer.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `scrlayer') +%% This is a generated file. +%% Copyright 2016-2017 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +\LWR@ProvidesPackageDrop{scrlayer} +\newcommand*{\DeclareSectionNumberDepth}[2]{} +\newcommand*{\DeclareLayer}[2][]{} +\newcommand*{\DeclareNewLayer}[2][]{} +\newcommand*{\ProvideLayer}[2][]{} +\newcommand*{\RedeclareLayer}[2][]{} +\newcommand*{\ModifyLayer}[2][]{} +\newcommand*{\layerhalign}{} +\newcommand*{\layervalign}{} +\newcommand*{\layerxoffset}{} +\newcommand*{\layeryoffset}{} +\newcommand*{\layerwidth}{} +\newcommand*{\layerheight}{} +\providecommand*{\LenToUnit}[1]{\strip@pt\dimexpr#1*\p@/\unitlength} +\newcommand*{\putUL}[1]{} +\newcommand*{\putUR}[1]{} +\newcommand*{\putLL}[1]{} +\newcommand*{\putLR}[1]{} +\newcommand*{\putC}[1]{} +\newcommand*{\GetLayerContents}[1]{} +\newcommand{\IfLayerExists}[3]{#3} +\newcommand*{\DestroyLayer}[1]{} +\newcommand*{\layercontentsmeasure}{} +\newcommand*{\currentpagestyle}{} +\newcommand*{\BeforeSelectAnyPageStyle}[1]{} +\newcommand*{\AfterSelectAnyPageStyle}[1]{} +\newcommand*{\DeclarePageStyleAlias}[2]{} +\newcommand*{\DeclareNewPageStyleAlias}[2]{} +\newcommand*{\ProvidePageStyleAlias}[2]{} +\newcommand*{\RedeclarePageStyleAlias}[2]{} +\newcommand*{\DestroyPageStyleAlias}[1]{} +\newcommand*{\GetRealPageStyle}[1]{} +\newcommand*{\DeclarePageStyleByLayers}[3][]{} +\newcommand*{\DeclareNewPageStyleByLayers}[3][]{} +\newcommand*{\ProvidePageStyleByLayers}[3][]{} +\newcommand*{\RedeclarePageStyleByLayers}[3][]{} +\NewDocumentCommand{\ForEachLayerOfPageStyle}{s m m}{} +\newcommand*{\AddLayersToPageStyle}[2]{} +\newcommand*{\AddLayersAtBeginOfPageStyle}[2]{} +\newcommand*{\AddLayersAtEndOfPageStyle}[2]{} +\newcommand*{\RemoveLayersFromPageStyle}[2]{} +\newcommand*{\AddLayersToPageStyleBeforeLayer}[3]{} +\newcommand*{\AddLayersToPageStyleAfterLayer}[3]{} +\newcommand*{\UnifyLayersAtPageStyle}[1]{} +\newcommand*{\ModifyLayerPageStyleOptions}[2]{} +\newcommand*{\AddToLayerPageStyleOptions}[2]{} +\newcommand{\IfLayerPageStyleExists}[3]{#3} +\newcommand{\IfRealLayerPageStyleExists}[3]{#3} +\newcommand{\IfLayerAtPageStyle}[4]{#4} +\newcommand{\IfSomeLayerAtPageStyle}[4]{#4} +\newcommand{\IfLayersAtPageStyle}[4]{#4} +\newcommand*{\DestroyRealLayerPageStyle}[1]{} +\@ifundefined{footheight}{\newlength\footheight}{} +\DeclareDocumentCommand{\automark}{s o m}{} +\DeclareDocumentCommand{\manualmark}{}{} +\DeclareDocumentCommand{\MakeMarkcase}{m}{#1} +\DeclareDocumentCommand{\GenericMarkFormat}{}{} +\newcommand*{\@mkleft}[1]{} +\newcommand*{\@mkright}[1]{} +\newcommand*{\@mkdouble}[1]{} +\newcommand*{\@mkboth}[2]{} +\newcommand*{\scrlayerInitInterface}[1][]{} +\newcommand{\scrlayerAddToInterface}[3][]{} +\newcommand{\scrlayerAddCsToInterface}[3][]{} +\newcommand{\scrlayerOnAutoRemoveInterface}[2][]{} +\endinput +%% +%% End of file `lwarp-scrlayer.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-section.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-section.sty new file mode 100644 index 00000000000..749c4334a1f --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-section.sty @@ -0,0 +1,53 @@ +%% +%% This is file `lwarp-section.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `section') +%% This is a generated file. +%% Copyright 2016-2017 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +\LWR@ProvidesPackageDrop{section} +\ifx\chapter\undefined + \def\chsize{\Large}\def\hdsize{\huge}\else + \def\chsize{\huge}\def\hdsize{\Huge} +\fi +\let\ttsize\LARGE +\let\ausize\large +\let\dasize\large +\let\secsize\Large +\let\subsize\large +\let\hdpos\raggedright +\newcounter{hddepth} +\let\fpind\relax +\def\ttfnt{} +\def\hdfnt{} +\def\fefnt{} +\def\thfnt{} +\def\pgfnt{} +\def\hmkfnt{} +\let\mkcse\uppercase +\def\hddot{} +\def\cpdot{:} +\def\nmdot{} +\ifx\secindent\undefined + \newdimen\secindent + \newskip\secpreskp + \newskip\secpstskp + \newdimen\subindent + \newskip\subpreskp + \newskip\subpstskp + \newskip\parpstskp + \newcount\c@hddepth +\fi +\endinput +%% +%% End of file `lwarp-section.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-soul.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-soul.sty index 1dfaabf8668..acab55ea14e 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-soul.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-soul.sty @@ -15,7 +15,7 @@ %% 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{soul} +\LWR@ProvidesPackageDrop{soul}[2003/11/17] \RequirePackage{xcolor}% for \convertcolorspec \newcommand*{\LWR@soululcolor}{} @@ -36,7 +36,7 @@ {\LWR@HTMLtextstyle{#5}{#3}{#1}}% {% \convertcolorspec{named}{\csuse{#2}}{HTML}\LWR@tempcolor% - \LWR@HTMLtextstyle{#5;#4:\#\LWR@tempcolor}{#3}{#1}% + \LWR@htmlspanclass[#5;#4:\#\LWR@tempcolor]{#3}{#1}% }% } diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-soulpos.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-soulpos.sty new file mode 100644 index 00000000000..66eb3054fba --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-soulpos.sty @@ -0,0 +1,38 @@ +%% +%% This is file `lwarp-soulpos.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `soulpos') +%% This is a generated file. +%% Copyright 2016-2017 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +\RequirePackage{soul} +\RequirePackage{soulutf8} +\LWR@ProvidesPackageDrop{soulpos} +\NewDocumentCommand{\ulposdef}{m o m}{} + +\newdimen\ulwidth + +\newcommand\ifulstarttype[1]{% +\expandafter\@secondoftwo% +} + +\newcommand\ifulendtype[1]{% +\expandafter\@secondoftwo% +} + +\newcommand{\ulstarttype}{0} +\newcommand{\ulendtype}{0} +\newcommand\ulpostolerance{0}% +\endinput +%% +%% End of file `lwarp-soulpos.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-soulutf8.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-soulutf8.sty new file mode 100644 index 00000000000..a63888298f6 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-soulutf8.sty @@ -0,0 +1,21 @@ +%% +%% This is file `lwarp-soulutf8.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `soulutf8') +%% This is a generated file. +%% Copyright 2016-2017 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +\LWR@ProvidesPackageDrop{soulutf8} +\endinput +%% +%% End of file `lwarp-soulutf8.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-supertabular.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-supertabular.sty index 591131562eb..3d1a075ea57 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-supertabular.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-supertabular.sty @@ -40,7 +40,7 @@ \let\topcaption\tablecaption \let\bottomcaption\tablecaption -\global\let\LWRST@caption\relax +\newcommand*{\LWRST@caption}{} \newcommand*{\shrinkheight}[1]{} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-textcomp.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-textcomp.sty index 40112a31421..2e1f5eecfa4 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-textcomp.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-textcomp.sty @@ -16,6 +16,7 @@ %% and version 1.3 or later is part of all distributions of LaTeX %% version 2005/12/01 or later. + \LWR@ProvidesPackagePass{textcomp} \let\LWR@origtextdegree\textdegree \let\LWR@origtextcelsius\textcelsius diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-tikz.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-tikz.sty index db79ea24fc4..0f9c437c774 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-tikz.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-tikz.sty @@ -28,14 +28,14 @@ {\boolfalse{LWR@tikzbabel}} \BeforeBeginEnvironment{tikzpicture}{% -\lateximage% +\begin{lateximage}% \ifbool{LWR@tikzbabel}% Test for Tikz version v3.0.0 {}% {\catcode`\$=3} % dollar sign is math shift } \AfterEndEnvironment{tikzpicture}{% -\endlateximage% +\end{lateximage}% \ifbool{LWR@tikzbabel}% Test for Tikz version v3.0.0 {}% {\catcode`\$=\active}% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-tocbasic.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-tocbasic.sty new file mode 100644 index 00000000000..73c0f79e6ed --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-tocbasic.sty @@ -0,0 +1,36 @@ +%% +%% This is file `lwarp-tocbasic.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `tocbasic') +%% This is a generated file. +%% Copyright 2016-2017 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. + +\LWR@ProvidesPackagePass{tocbasic} + +\DeclareDocumentCommand{\usetocbasicnumberline}{o}{} +\DeclareDocumentCommand{\DeclareTOCStyleEntry}{o m m}{} +\DeclareDocumentCommand{\DeclareTOCEntryStyle}{m o m}{} +\DeclareDocumentCommand{\DefineTOCEntryOption}{m o m}{} +\DeclareDocumentCommand{\DefineTOCEntryBooleanOption}{m o m m m}{} +\DeclareDocumentCommand{\DefineTOCEntryCommandOption}{m o m m m}{} +\DeclareDocumentCommand{\DefineTOCEntryIfOption}{m o m m m}{} +\DeclareDocumentCommand{\DefineTOCEntryLengthOption}{m o m m m}{} +\DeclareDocumentCommand{\DefineTOCEntryNumberOption}{m o m m m}{} +\DeclareDocumentCommand{\CloneTOCEntryStyle}{m m}{} +\DeclareDocumentCommand{\TOCEntryStyleInitCode}{m m}{} +\DeclareDocumentCommand{\TOCEntryStyleStartInitCode}{m m}{} + +\endinput +%% +%% End of file `lwarp-tocbasic.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-tocbibind.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-tocbibind.sty index e75a91c1da2..2b8e3c55ead 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-tocbibind.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-tocbibind.sty @@ -20,8 +20,8 @@ \LWR@ProvidesPackagePass{tocbibind} - \renewenvironment{theindex}% - {% +\renewenvironment{theindex}% +{% \if@bibchapter \if@donumindex \chapter{\indexname} @@ -48,7 +48,7 @@ \let\item\LWR@indexitem% \let\subitem\LWR@indexsubitem% \let\subsubitem\LWR@indexsubsubitem% -} +}{} \renewcommand{\simplechapter}[1][\@empty]{% \def\@chapcntformat##1{% #1~\csname the##1\endcsname\simplechapterdelim\protect\quad% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-tocloft.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-tocloft.sty index 1e05d8fe368..1fe9a61bf71 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-tocloft.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-tocloft.sty @@ -202,16 +202,20 @@ \newcommand{\pagenumbersoff}[1]{} \newcommand{\pagenumberson}[1]{} -\NewDocumentCommand{\newlistof}{o m m m} -{% +\NewDocumentCommand{\newlistentry}{o m m m} +{ \IfValueTF{#1} -{\newfloat{#2}{tbp}{#3}[#1]} -{\newfloat{#2}{tbp}{#3}} -\@namedef{listof#2}{\listof{#2}{#4}} -\@namedef{#2depth}{1} -\expandafter\newlength\csuse{cftbefore#2skip} -\expandafter\newlength\csuse{cft#2indent} -\expandafter\newlength\csuse{cft#2numwidth} +{ + \newcounter{#2}[#1] + \expandafter\edef\csname the#2\endcsname{ + \expandafter\noexpand\csname the#1\endcsname.\noexpand\arabic{#2} + } +} +{\newcounter{#2}} +\@namedef{l@#2}##1##2{\hypertocfloat{1}{#2}{#3}{##1}{##2}} +\expandafter\newlength\csname cftbefore#2skip\endcsname +\expandafter\newlength\csname cft#2indent\endcsname +\expandafter\newlength\csname cft#2numwidth\endcsname \@namedef{cft#2font}{} \@namedef{cft#2presnum}{} \@namedef{cft#2aftersnum}{} @@ -220,6 +224,27 @@ \@namedef{cft#2dotsep}{1} \@namedef{cft#2pagefont}{} \@namedef{cft#2afterpnum}{} +\@namedef{toclevel@#2}{#4} +\@namedef{cft#2fillnum}##1{} +} + +\NewDocumentCommand{\newlistof}{o m m m} +{% +\IfValueTF{#1} +{\newlistentry[#1]{#2}{#3}{0}} +{\newlistentry{#2}{#3}{0}} +\@namedef{ext@#2}{#3} +\newcounter{#3depth} +\setcounter{#3depth}{1} +\@namedef{cftmark#3}{} +\@namedef{listof#2}{\listof{#2}{#4}} +\@namedef{@cftmake#3title}{} +\expandafter\newlength\csname cftbefore#3titleskip\endcsname +\expandafter\newlength\csname cftafter#3titleskip\endcsname +\@namedef{cft#3titlefont}{} +\@namedef{cftafter#3title}{} +\@namedef{cft#3prehook}{} +\@namedef{cft#3posthook}{} } \newcommand{\cftchapterprecis}[1]{% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-tocstyle.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-tocstyle.sty new file mode 100644 index 00000000000..3c3dfba16ba --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-tocstyle.sty @@ -0,0 +1,30 @@ +%% +%% This is file `lwarp-tocstyle.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `tocstyle') +%% This is a generated file. +%% Copyright 2016-2017 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +\LWR@ProvidesPackageDrop{tocstyle} +\newcommand*{\usetocstyle}[2][]{} +\newcommand*{\deactivatetocstyle}[1][]{} +\newcommand*{\reactivatetocstyle}[1][]{} +\NewDocumentCommand{\settocfeature}{o o m m}{} +\NewDocumentCommand{\settocstylefeature}{o m m}{} +\NewDocumentCommand{\newtocstyle}{o o m m}{} +\newcommand*{\aliastoc}[2]{} +\newcommand*{\showtoc}[2][]{} +\newcommand{\iftochasdepth}[4]{} +\endinput +%% +%% End of file `lwarp-tocstyle.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-todo.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-todo.sty new file mode 100644 index 00000000000..2814d1c7193 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-todo.sty @@ -0,0 +1,60 @@ +%% +%% This is file `lwarp-todo.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `todo') +%% This is a generated file. +%% Copyright 2016-2017 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. + +\LWR@ProvidesPackagePass{todo} + +\renewcommand\todoitem[2]{% + \refstepcounter{todo}% + \item[% + \HTMLunicode{2610} \quad + \ref{todopage:\thetodo} + ] : {\todoformat\ifx#1\todomark\else\textbf{#1} \fi}#2% + \label{todolbl:\thetodo}% +}% + +\renewcommand\doneitem[2]{% + \stepcounter{todo}% + \item[% + \HTMLunicode{2611} \quad + \ref{todopage:\thetodo} + ] \@nameuse{@done\the\c@todo}: + {\todoformat\ifx#1\todomark\else\textbf{#1} \fi}#2% +} + +\xpatchcmd{\@displaytodo} + {\todoformat #1}{\todoformat \textbf{#1}}{} + {\PackageWarning{lwarp-todo}{Unable to patch @displaytodo.}} + +\xpatchcmd{\@displayfulltodo} + {\todoformat #1}{\todoformat \textbf{#1}}{} + {\PackageWarning{lwarp-todo}{Unable to patch @displayfulltodo.}} + +\patchcmd{\todoenv}{\itshape see text.}{\textit{see text.}}{} + {\PackageWarning{lwarp-todo}{Unable to patch todoenv.}} + +\patchcmd{\astodos}{\todoformat #1}{\todoformat \textbf{#1}}{} + {\PackageWarning{lwarp-todo}{Unable to patch astodos.}} + +\AtBeginDocument{ +\crefname{todo}{todo}{todos} +\Crefname{todo}{Todo}{Todos} +} + +\endinput +%% +%% End of file `lwarp-todo.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-todonotes.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-todonotes.sty index 5fc3e762dcc..fc01e9edbb5 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-todonotes.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-todonotes.sty @@ -15,11 +15,78 @@ %% 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{todonotes} -\newcommand{\listoftodos}[1][]{} -\newcommand{\todo}[2][]{} -\newcommand{\missingfigure}[2][]{} -\newcommand{\todototoc}{} +\LWR@ProvidesPackagePass{todonotes} +\if@todonotes@disabled +\else + +\newcommand{\ext@todo}{tdo} + +\renewcommand{\l@todo}[2]{\hypertocfloat{1}{todo}{ldo}{#1}{#2}} + +\renewcommand{\@todonotes@drawMarginNoteWithLine}{ +\fcolorbox + {\@todonotes@currentbordercolor} + {\@todonotes@currentbackgroundcolor} + {\arabic{@todonotes@numberoftodonotes}} +\marginpar{\@todonotes@drawMarginNote} +} + +\renewcommand{\@todonotes@drawInlineNote}{% +\fcolorboxBlock% + {\@todonotes@currentbordercolor}% + {\@todonotes@currentbackgroundcolor}% + {% + \if@todonotes@authorgiven% + {\@todonotes@author:\,}% + \fi% + \@todonotes@text% + }% +} + +\renewcommand{\@todonotes@drawMarginNote}{% + \if@todonotes@authorgiven% + \@todonotes@author\par% + \fi% + \arabic{@todonotes@numberoftodonotes}: % + \fcolorbox% + {\@todonotes@currentbordercolor}% + {\@todonotes@currentbackgroundcolor}% + {% + \@todonotes@sizecommand% + \@todonotes@text % + }% +}% + +\renewcommand{\@todonotes@drawLineToRightMargin}{} + +\renewcommand{\@todonotes@drawLineToLeftMargin}{} + +\renewcommand{\missingfigure}[2][]{% +\setkeys{todonotes}{#1}% +\addcontentsline{tdo}{todo}{\@todonotes@MissingFigureText: #2}% +\fcolorboxBlock% + {\@todonotes@currentbordercolor}% + {\@todonotes@currentfigcolor}% + {% + \setlength{\fboxrule}{4pt}% + \fcolorbox{red}{white}{Missing figure} \quad #2% + } +} + +\LetLtxMacro\LWRTODONOTES@orig@todo\@todo + +\RenewDocumentCommand{\@todo}{o m}{% +\begingroup% +\renewcommand*{\phantomsection}{}% +\IfValueTF{#1}{% + \LWRTODONOTES@orig@todo[#1]{#2}% +}{% + \LWRTODONOTES@orig@todo{#2}% +} +\endgroup% +} + +\fi% \if@todonotes@disabled \endinput %% %% End of file `lwarp-todonotes.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-trivfloat.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-trivfloat.sty index c1e95e266e2..275434afa1b 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-trivfloat.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-trivfloat.sty @@ -17,15 +17,9 @@ %% version 2005/12/01 or later. - - \LWR@ProvidesPackageDrop{trivfloat} \LWR@origRequirePackage{trivfloat} -\begin{warpall} - -\end{warpall} - \begin{warpHTML} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-typearea.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-typearea.sty index bc114e6a4de..010b524170d 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-typearea.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-typearea.sty @@ -16,10 +16,16 @@ %% and version 1.3 or later is part of all distributions of LaTeX %% version 2005/12/01 or later. \LWR@ProvidesPackageDrop{typearea} -\newcommand*\typearea[2][\z@]{} -\newcommand*{\recalctypearea}{} +\DeclareDocumentCommand{\typearea}{o m}{} +\DeclareDocumentCommand{\recalctypearea}{}{} \@ifundefined{footheight}{\newlength\footheight}{} -\newcommand*\areaset[3][\z@]{} +\DeclareDocumentCommand{\areaset}{o m m}{} +\DeclareDocumentCommand{\activateareas}{}{} +\DeclareDocumentCommand{\storeareas}{m}{} +\DeclareDocumentCommand{\BeforeRestoreareas}{s m}{} +\DeclareDocumentCommand{\AfterRestoreareas}{s m}{} +\DeclareDocumentCommand{\AfterCalculatingTypearea}{s m}{} +\DeclareDocumentCommand{\AfterSettingArea}{s m}{} \endinput %% %% End of file `lwarp-typearea.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-verse.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-verse.sty index 461d3a5ed41..a5b041f642e 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-verse.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-verse.sty @@ -21,6 +21,7 @@ \LWR@traceinfo{Patching verse.} \AtBeginEnvironment{verse} {% +\LWR@restoreoriglists% \ifdef{\vleftskip}{% \setlength{\vleftskip}{\HTMLvleftskip} \setlength{\leftmargini}{\HTMLleftmargini} @@ -29,8 +30,7 @@ \LWR@atbeginverbatim{verse} \unskip\LWR@origvspace{-\baselineskip} } -\AfterEndEnvironment{verse}{ -\unskip\LWR@origvspace{-\baselineskip} +\AtEndEnvironment{verse}{ \LWR@afterendverbatim } \ifdef{\poemtitle}{ diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-watermark.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-watermark.sty new file mode 100644 index 00000000000..e0db46ef192 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-watermark.sty @@ -0,0 +1,26 @@ +%% +%% This is file `lwarp-watermark.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `watermark') +%% This is a generated file. +%% Copyright 2016-2017 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +\LWR@ProvidesPackageDrop{watermark} +\newcommand{\watermark}[1]{} +\newcommand{\leftwatermark}[1]{} +\newcommand{\rightwatermark}[1]{} +\newcommand{\thiswatermark}[1]{} +\newcommand{\thispageheading}[1]{} +\endinput +%% +%% End of file `lwarp-watermark.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty index 6ab31aea5eb..306c8e458ac 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty @@ -38,6 +38,27 @@ } \newcommand*{\LWR@tempcolor}{} \newcommand*{\LWR@tempcolortwo}{} +\newcommand*{\LWR@findcurrenttextcolor}{% +\protect\colorlet{LWR@current@color}{.}% +\protect\convertcolorspec{named}{LWR@current@color}{HTML}\LWR@tempcolor% +} + +\newcommand*{\LWR@currenttextcolorstyle}{% +\LWR@findcurrenttextcolor% +\ifdefstring{\LWR@tempcolor}{000000}% +{}% +{color: \#\LWR@tempcolor ; }% +} +\newcommand*{\LWR@textcurrentcolor}[1]{% +\begingroup% +\LWR@FBcancel% +\LWR@findcurrenttextcolor% +\InlineClass[color:\#\LWR@tempcolor]{textcolor}{% + \renewcommand*{\LWR@currenttextcolor}{\#\LWR@tempcolor}% + #1% +}% +\endgroup% +} \NewDocumentCommand{\LWR@colorstyle}{m m}{% \begingroup% \LWR@FBcancel% @@ -45,6 +66,14 @@ \#\LWR@tempcolor% \endgroup% } +\NewDocumentCommand{\LWR@backgroundcolor}{O{named} m m}{% +\begingroup% +\LWR@FBcancel% +\InlineClass[background:\LWR@colorstyle{#1}{#2}]{backgroundcolor}{% +#3% +}% +\endgroup% +} \newcommand*{\LWR@borderpadding}[2]{% \uselengthunit{PT}% border:\rndprintlength{\LWR@atleastonept} solid \LWR@colorstyle{#1}{#2} ; % @@ -53,7 +82,6 @@ padding:\rndprintlength{\fboxsep}% \RenewDocumentCommand{\textcolor}{O{named} m m}{% \begingroup% \LWR@FBcancel% -\convertcolorspec{#1}{#2}{HTML}\LWR@tempcolor% \InlineClass[color:\LWR@colorstyle{#1}{#2}]{textcolor}{% \renewcommand*{\LWR@currenttextcolor}{\#\LWR@tempcolor}% #3% @@ -63,7 +91,7 @@ padding:\rndprintlength{\fboxsep}% \renewcommand*{\pagecolor}[2][named]{} -\let\nopagecolor\relax +\renewcommand*{\nopagecolor}{} \RenewDocumentCommand{\colorbox}{O{named} m +m}{% \begingroup% @@ -127,7 +155,7 @@ padding:\rndprintlength{\fboxsep}% {% yes background color \convertcolorspec{#3}{#4}{HTML}\LWR@tempcolortwo% \begin{BlockClass}[% - background:\#\LWR@tempcolortwo; % + background:\#\LWR@tempcolortwo\ ; % \LWR@borderpadding{#1}{#2}% ]{fcolorboxBlock} #5 diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-xtab.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-xtab.sty index 33e55a7c2ae..72f6e84aae5 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-xtab.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-xtab.sty @@ -45,7 +45,7 @@ \let\topcaption\tablecaption \let\bottomcaption\tablecaption -\global\let\LWRXT@caption\relax +\newcommand*{\LWRXT@caption}{} \newcommand*{\shrinkheight}[1]{} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp.sty index 195c33a9dd0..a0ac4d906f1 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp.sty @@ -17,8 +17,7 @@ %% version 2005/12/01 or later. \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesPackage{lwarp} - [2017/11/08 v0.43 Allows LaTeX to directly produce HTML5 output.] - + [2017/11/22 v0.44 Allows LaTeX to directly produce HTML5 output.] @@ -29,6 +28,10 @@ \ifLuaTeX \RequirePackage{luatex85}% until the geometry package is updated \fi +\ifPDFTeX +\RequirePackage[T1]{fontenc} +\RequirePackage[utf8]{inputenc} +\fi \RequirePackage{newunicodechar} @@ -46,7 +49,8 @@ \else \fi -\RequirePackage{etoolbox}[2011/01/03] +\RequirePackage{etoolbox}[2011/01/03]% v2.6 for \BeforeBeginEnvironment, etc. +\RequirePackage{xpatch} \RequirePackage{ifplatform}% sense op-system platform \RequirePackage{letltxmacro} @@ -165,7 +169,6 @@ {\excludecomment{LWR@createlwarpmk}} - \newcommand*{\LWR@loadafter}[1]{% \@ifpackageloaded{#1} { @@ -206,12 +209,14 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{afterpage} \LWR@loadafter{algorithmicx} \LWR@loadafter{alltt} +\LWR@loadafter{amsmath} \LWR@loadafter{amsthm} \LWR@loadafter{anonchap} \LWR@loadafter{anysize} \LWR@loadafter{appendix} \LWR@loadafter{arabicfront} \LWR@loadafter{array} +\LWR@loadafter{atbegshi} \LWR@loadafter{authblk} \LWR@loadafter{balance} \LWR@loadafter{bigdelim} @@ -221,6 +226,7 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{boxedminipage} \LWR@loadafter{boxedminipage2e} \LWR@loadafter{breakurl} +\LWR@loadafter{cancel} \LWR@loadafter{ccaption} \LWR@loadafter{changepage} \LWR@loadafter{chngpage} @@ -232,6 +238,7 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{dblfnote} \LWR@loadafter{dcolumn} \LWR@loadafter{draftwatermark} +\LWR@loadafter{easy-todo} \LWR@loadafter{ebook} \LWR@loadafter{ellipsis} \LWR@loadafter{emptypage} @@ -244,9 +251,12 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{extramarks} \LWR@loadafter{fancybox} \LWR@loadafter{fancyhdr} +\LWR@loadafter{fancyref} \LWR@loadafter{fancyvrb} \LWR@loadafter{figcaps} \LWR@loadafter{fix2col} +\LWR@loadafter{fixme} +\LWR@loadafter{fixmetodonotes} \LWR@loadafter{float} \LWR@loadafter{floatflt} \LWR@loadafter{floatpag} @@ -260,9 +270,11 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{geometry} \LWR@loadafter{glossaries} \LWR@loadafter{grffile} +\LWR@loadafter{hang} \LWR@loadafter{hyperref} \LWR@loadafter{hyperxmp} \LWR@loadafter{idxlayout} +\LWR@loadafter{ifoddpage} \LWR@loadafter{indentfirst} \LWR@loadafter{keyfloat} \LWR@loadafter{layout} @@ -273,6 +285,7 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{longtable} \LWR@loadafter{lscape} \LWR@loadafter{ltcaption} +\LWR@loadafter{ltxtable} \LWR@loadafter{luatodonotes} \LWR@loadafter{marginfit} \LWR@loadafter{marginfix} @@ -302,6 +315,7 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{pfnote} \LWR@loadafter{placeins} \LWR@loadafter{prelim2e} +\LWR@loadafter{preview} \LWR@loadafter{quotchap} \LWR@loadafter{ragged2e} \LWR@loadafter{realscripts} @@ -311,6 +325,12 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{rotating} \LWR@loadafter{rotfloat} \LWR@loadafter{savetrees} +\LWR@loadafter{scrextend} +\LWR@loadafter{scrhack} +\LWR@loadafter{scrlayer} +\LWR@loadafter{scrlayer-notecolumn} +\LWR@loadafter{scrlayer-scrpage} +\LWR@loadafter{section} \LWR@loadafter{sectsty} \LWR@loadafter{setspace} \LWR@loadafter{shadow} @@ -320,6 +340,8 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{sidenotes} \LWR@loadafter{siunitx} \LWR@loadafter{soul} +\LWR@loadafter{soulpos} +\LWR@loadafter{soulutf8} \LWR@loadafter{stabular} \LWR@loadafter{subfig} \LWR@loadafter{supertabular} @@ -337,15 +359,17 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{titling} \LWR@loadafter{tocbibind} \LWR@loadafter{tocloft} +\LWR@loadafter{tocstyle} +\LWR@loadafter{todo} \LWR@loadafter{todonotes} \LWR@loadafter{transparent} \LWR@loadafter{trivfloat} -\LWR@loadafter{typearea} \LWR@loadafter{ulem} \LWR@loadafter{upref} \LWR@loadafter{varioref} \LWR@loadafter{verse} \LWR@loadafter{wallpaper} +\LWR@loadafter{watermark} \LWR@loadafter{wrapfig} \LWR@loadafter{xcolor} \LWR@loadafter{xfrac} @@ -407,7 +431,10 @@ top=1in,bottom=1in,% \RequirePackage{xparse} +\@ifundefined{AfterPackage}% +{ \RequirePackage{afterpackage} +}{} \end{warpall} @@ -651,6 +678,12 @@ top=1in,bottom=1in,% \end{warpall} +\begin{warpHTML} +\@ifclassloaded{scrbook}{\RequirePackage{lwarp-patch-komascript}}{} +\@ifclassloaded{scrartcl}{\RequirePackage{lwarp-patch-komascript}}{} +\@ifclassloaded{scrreprt}{\RequirePackage{lwarp-patch-komascript}}{} +\end{warpHTML} + \begin{warpall} \newbool{FormatEPUB} \boolfalse{FormatEPUB} @@ -793,14 +826,16 @@ top=1in,bottom=1in,% \let\LWR@orignewline\newline -\LetLtxMacro{\LWR@origitem}{\item} +\LetLtxMacro\LWR@origitem\item +\AtBeginDocument{% in case packages change definition \LetLtxMacro{\LWR@origitemize}{\itemize} \LetLtxMacro{\LWR@endorigitemize}{\enditemize} \LetLtxMacro{\LWR@origenumerate}{\enumerate} \LetLtxMacro{\LWR@endorigenumerate}{\endenumerate} \LetLtxMacro{\LWR@origdescription}{\description} \LetLtxMacro{\LWR@endorigdescription}{\enddescription} +} \let\LWR@origpar\par @@ -808,8 +843,6 @@ top=1in,bottom=1in,% \let\LWR@orig@mpfootnotetext\@mpfootnotetext \let\LWR@origclearpage\clearpage -\let\clearpage\relax -\let\cleardoublepage\relax \end{warpHTML} @@ -1113,7 +1146,7 @@ blockquotation p { margin-right: 3em ; } -div.epigraph { +div.epigraph, div.dictum { line-height: 1.2; text-align: left ; padding: 3ex 1em 0ex 1em ; @@ -1124,7 +1157,7 @@ div.epigraph { max-width: 27em ; } -div.epigraphsource{ +div.epigraphsource, div.dictumauthor { text-align:right ; margin-left:auto ; /* max-width: 50% ; */ @@ -1133,8 +1166,9 @@ div.epigraphsource{ line-height: 1.2; } -div.epigraph p { padding: .5ex ; margin: 0ex ;} -div.epigraphsource p { padding: .5ex 0ex 0ex 0ex ; margin: 0ex ;} +div.epigraph p, div.dictum p { padding: .5ex ; margin: 0ex ;} +div.epigraphsource p, div.dictumauthor p { padding: .5ex 0ex 0ex 0ex ; margin: 0ex ;} +div.dictumauthor { font-style:italic } /* lettrine package: */ span.lettrine { font-size: 3ex ; float: left ; } @@ -1222,6 +1256,14 @@ span.paragraph {font-size: 1em ; font-variant: normal ; span.subparagraph {font-size: 1em ; font-variant: normal ; margin-right: 1em ; } +div.minisec { + font-family: "DejaVu Sans", "Bitstream Vera Sans", + Geneva, Verdana, sans-serif ; + font-style: normal ; + font-weight: bold ; + text-align: left ; +} + /* Title of the file */ h1 { margin: 0ex 0em 0ex 0em ; @@ -1271,7 +1313,7 @@ div.titlepage { border-top: 1px solid silver ; } -.marginpar { +.marginpar, .marginparblock { max-width:50%; float:right; text-align:left; @@ -1285,7 +1327,7 @@ div.titlepage { .marginpar br { margin-bottom: 2ex ; } -div.marginblock { +div.marginblock, div.marginparblock { max-width:50%; float:right; text-align:left; @@ -1294,14 +1336,19 @@ div.marginblock { overflow-x: auto; } -div.marginblock div.minipage { +div.marginblock div.minipage, +div.marginparblock div.minipage { display: block ; margin: 0pt auto 0pt auto ; } -div.marginblock div.minipage p { font-size: 85%} +div.marginblock div.minipage p , +div.marginparblock div.minipage p + { font-size: 85%} -div.marginblock br { margin-bottom: 2ex ; } +div.marginblock br , +div.marginparblock br + { margin-bottom: 2ex ; } section.textbody div.footnotes{ margin: 3ex 0em 0ex 0em ; @@ -1588,14 +1635,14 @@ dl dt { dl dd p { margin-top: 0em; } -nav.toc, nav.lof, nav.lot, nav.lol, nav.lothm { +nav { font-family: "URW Classico", Optima, "Linux Biolinum O", "DejaVu Sans", "Bitstream Vera Sans", Geneva, Verdana, sans-serif ; margin-bottom: 4ex ; } -nav.toc p, nav.lof p, nav.lot p, nav.lol p, nav.lothm p { +nav p { line-height: 1.2 ; margin-top:.5ex ; margin-bottom:.5ex; @@ -2248,7 +2295,7 @@ span.abstractrunintitle{ font-weight:bold; } -div.epigraph { +div.epigraph, div.dictum { background: #f5f5eb ; background-image: linear-gradient(to bottom, #f5f5eb, #C8C8B8); @@ -2326,7 +2373,9 @@ div.fboxBlock div.minipage { box-shadow: none ; } figure.figure .minipage, figcaption .minipage { border: none; } -div.marginblock div.minipage { border: none; } +div.marginblock div.minipage , +div.marginparblock div.minipage + { border: none; } figure , div.marginblock { background-color: #eeeee7 ; @@ -2742,7 +2791,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.43" +printversion = "v0.44" function printhelp () print ("lwarpmk: Use lwarpmk -h or lwarpmk --help for help.") ; @@ -3374,7 +3423,7 @@ end -- not --version \begin{warpHTML} \NewDocumentCommand{\LWR@setexparray}{m m m}{% -\ifthenelse{\isempty{#3}}% +\ifstrempty{#3}% {\csdef{#1#2}{}}% {\expandafter\edef\csname #1#2\endcsname{\expandonce#3}}% } @@ -3453,7 +3502,7 @@ end -- not --version \equal{\LWR@tempone}{index}% }% {% - \LWR@traceinfo{prefixing the index name with an underscore.}% + \LWR@traceinfo{Prefixing the index name with an underscore.}% \_#1.html% }% {\HTMLFilename#1.html}% @@ -3507,14 +3556,15 @@ end -- not --version \newcommand*{\LWR@closeoneprevious}{% -\LWR@closeone{} +\LWR@closeone -\popclose{} +\popclose } \newcommand*{\LWR@closeprevious}[1]{ \LWR@stoppars -\whiledo{\not\(\LWR@closedepthone<#1\)}{\LWR@closeoneprevious} +\whileboolexpr{not test{\ifnumcomp{\LWR@closedepthone}{<}{#1}}}% + {\LWR@closeoneprevious} } \end{warpHTML} @@ -3627,7 +3677,7 @@ end -- not --version \newenvironment*{LWR@nestspan} {% \LWR@traceinfo{LWR@nestspan}% -\ifthenelse{\cnttest{\value{LWR@lateximagedepth}}{>}{0}}% +\ifnumcomp{\value{LWR@lateximagedepth}}{>}{0}% {% \LWR@traceinfo{LWR@nestspan: inside a lateximage}% }% @@ -3638,22 +3688,14 @@ end -- not --version \RenewDocumentEnvironment{BlockClass}{o m}{}{}% \renewcommand{\BlockClassSingle}[2]{##2}% \renewcommand{\LWR@forcenewpage}{}% - \renewcommand{\LWR@itemizestart}{% - \let\item\LWR@nestspanitem% - }% - \renewcommand{\LWR@itemizeend}{}% - \renewcommand{\LWR@enumeratestart}{% - \let\item\LWR@nestspanitem% - }% - \renewcommand{\LWR@enumerateend}{}% - \renewcommand{\LWR@descriptionstart}{% + \renewcommand{\LWR@liststart}{% \let\item\LWR@nestspanitem% }% - \renewcommand{\LWR@descriptionend}{}% + \renewcommand{\LWR@listend}{\LWR@htmltagc{br /}\LWR@htmltagc{br /}}% }% not in a lateximage }% starting env {% ending env -\ifthenelse{\cnttest{\value{LWR@lateximagedepth}}{>}{0}}% +\ifnumcomp{\value{LWR@lateximagedepth}}{>}{0}% {}% {\addtocounter{LWR@spandepth}{-1}}% \LWR@traceinfo{LWR@nestspan: done}% @@ -3725,7 +3767,7 @@ end -- not --version \newcommand{\LWR@htmlblockcomment} {% -\begingroup\catcode`\_=12% +\begingroup\catcode`\_=12 \LWR@htmlblockcommentb% } @@ -3736,15 +3778,11 @@ end -- not --version } -\NewDocumentCommand{\LWR@subhtmlelementclass}{m o m}{% +\NewDocumentCommand{\LWR@subhtmlelementclass}{m O{} m}{% \LWR@traceinfo{LWR@subhtmlelementclass #1 #3}% -\IfValueTF{#2}% -{% option - \ifthenelse{\equal{#2}{}}% - {\LWR@htmltag{#1 class="#3"}}% empty option - {\LWR@htmltag{#1 class="#3" style="#2"}}% non-empty option -}% option -{\LWR@htmltag{#1 class="#3"}}% no option +\ifblank{#2}% +{\LWR@htmltag{#1 class="#3"}}% empty option +{\LWR@htmltag{#1 class="#3" style="#2"}}% non-empty option \LWR@traceinfo{LWR@subhtmlelementclass done}% } @@ -3831,10 +3869,10 @@ end -- not --version \LWR@stoppars% \ifbool{FormatWP}% {% - \LWR@maybeincthisfloat% + \LWR@maybeincthisautoid% \LWR@htmltag{% div class="#3" % - id="autofloat-\arabic{LWR@thisfloat}"% + id="autoid-\arabic{LWR@thisautoid}"% \ifblank{#1}{}{ style="#1"}% }% }% FormatWP @@ -3905,9 +3943,9 @@ end -- not --version {% \ifbool{LWR@doingstartpars}% {% handling pars - \ifthenelse{% - \cnttest{\value{LWR@lateximagedepth}}{>}{0} \OR% - \cnttest{\value{LWR@spandepth}}{>}{0}% + \ifboolexpr{ + test {\ifnumcomp{\value{LWR@lateximagedepth}}{>}{0}} or + test {\ifnumcomp{\value{LWR@spandepth}}{>}{0}} }% nested par tags? {}% no nested par tags {% yes nest par tags @@ -3928,15 +3966,14 @@ end -- not --version {% \ifbool{LWR@doingapar}% {% handling pars - \ifthenelse{% - \cnttest{\value{LWR@lateximagedepth}}{>}{0} \OR% - \cnttest{\value{LWR@spandepth}}{>}{0}% + \ifboolexpr{ + test {\ifnumcomp{\value{LWR@lateximagedepth}}{>}{0}} or + test {\ifnumcomp{\value{LWR@spandepth}}{>}{0}} }% {% no nested par tags - \ifthenelse{% - \cnttest{\value{LWR@spandepth}}{>}{0}% - \AND% - \cnttest{\value{LWR@lateximagedepth}}{=}{0}% + \ifboolexpr{ + test {\ifnumcomp{\value{LWR@spandepth}}{>}{0}} and + test {\ifnumcomp{\value{LWR@lateximagedepth}}{=}{0}} }% {\ifbool{LWR@intabularmetadata}{}{\unskip\LWR@htmltagc{br /}}}% {}% @@ -3950,7 +3987,7 @@ end -- not --version }% end of yes nest par tags }% end of handling pars {% not handling pars - \ifthenelse{\cnttest{\value{LWR@spandepth}}{>}{0}}% + \ifnumcomp{\value{LWR@spandepth}}{>}{0}% {\ifbool{LWR@intabularmetadata}{}{\unskip\LWR@htmltagc{br /}}}% {}% }% not handling pars @@ -3964,7 +4001,7 @@ end -- not --version \newcommand*{\LWR@startpars}% {% -\ifthenelse{\cnttest{\value{LWR@spandepth}}{>}{0}}% +\ifnumcomp{\value{LWR@spandepth}}{>}{0}% {}% {% \ifbool{LWR@doingstartpars}% @@ -3981,7 +4018,7 @@ end -- not --version \newcommand*{\LWR@stoppars}% {% -\ifthenelse{\cnttest{\value{LWR@spandepth}}{>}{0}}% +\ifnumcomp{\value{LWR@spandepth}}{>}{0}% {}% {% \ifbool{LWR@doingapar}% @@ -4058,18 +4095,29 @@ end -- not --version \newcommand*{\CSSFilename}[1]{} \end{warpprint} +\begin{warpHTML} +\let\LWR@origtitle\title +\renewcommand*{\title}[1]{% + \LWR@origtitle{#1}% + \begingroup% + \renewcommand{\thanks}[1]{}% + \protected@xdef\thetitle{#1}% + \endgroup% +} +\end{warpHTML} \begin{warpall} +\providecommand{\thetitle}{} + +\newcommand{\theHTMLTitle}{\thetitle} +\newcommand{\HTMLTitle}[1]{\renewcommand{\theHTMLTitle}{#1}} \providecommand{\theauthor}{} + \newcommand{\theHTMLAuthor}{\theauthor} \newcommand{\HTMLAuthor}[1]{\renewcommand{\theHTMLAuthor}{#1}} -\end{warpall} - -\begin{warpall} - \newcommand{\LWR@currentHTMLDescription}{} @@ -4092,6 +4140,7 @@ end -- not --version \long\def\@makefntext#1{\textsuperscript{\@thefnmark} #1} \def\@makefnmark{\hbox{\textsuperscript{\@thefnmark}}} \long\def\LWR@footnotetext#1{% +\LWR@traceinfo{LWR@footnotetext}% \global\setbox\LWR@footnotes=\vbox{% \unvbox\LWR@footnotes% \protected@edef\@currentlabel{% @@ -4178,11 +4227,30 @@ end -- not --version #2 \end{LWR@BlockClassWP} }% -{\LWR@htmlspanclass{marginpar}{#2}}% +{% + \LWR@htmlspanclass{marginpar}{#2}% +}% +} +\newcommand{\marginparBlock}[2][]{% +\ifbool{FormatWP}% +{% +\begin{LWR@BlockClassWP}{width:2in; float:right; margin:10pt}{}{marginblock} +#2 +\end{LWR@BlockClassWP} +}% +{% +\begin{BlockClass}[width:2in; float:right; margin:10pt]{marginparblock} +#2 +\end{BlockClass} +}% } \end{warpHTML} +\begin{warpprint} +\LetLtxMacro\marginparBlock\marginpar +\end{warpprint} + \begin{warpall} @@ -4522,6 +4590,8 @@ end -- not --version } +\newcommand{\part@preamble}{}% for koma-script + \DeclareDocumentCommand{\part}{s o m}{% \LWR@maybeprintpendingfootnotes{\LWR@depthpart}% \LWR@stoppars% @@ -4529,10 +4599,15 @@ end -- not --version \LWR@startnewdepth{\LWR@depthpart}{\LWR@printclosepart}% \LWR@section{#1}{#2}{#3}{part}% + +\part@preamble% for koma-script +\renewcommand{\part@preamble}{}% } \let\@printcites\relax% for quotchap package +\newcommand{\chapter@preamble}{}% for koma-script + \@ifundefined{chapter} {} {% @@ -4544,7 +4619,11 @@ end -- not --version \LWR@startnewdepth{\LWR@depthchapter}{\LWR@printclosechapter}% \LWR@section{#1}{#2}{#3}{chapter}% + \@printcites% for quotchap package + +\chapter@preamble% for koma-script +\renewcommand{\chapter@preamble}{}% } } @@ -4621,9 +4700,9 @@ end -- not --version \LWR@htmltag{html lang="\LWR@currentHTMLLanguage"{}}\LWR@orignewline \LWR@htmltag{head}\LWR@orignewline \LWR@htmltag{meta charset="UTF-8" /}\LWR@orignewline -\ifcsempty{theHTMLAuthor}{}{ -\LWR@htmltag{meta name="author" content="\theHTMLAuthor" /}\LWR@orignewline -} +\ifthenelse{\equal{\theHTMLAuthor}{}}% +{}% +{\LWR@htmltag{meta name="author" content="\theHTMLAuthor" /}\LWR@orignewline}% \LWR@htmltag{meta name="generator" content="LaTeX lwarp package" /}% \LWR@orignewline \ifdefempty{\LWR@currentHTMLDescription}{}{% @@ -4639,17 +4718,20 @@ content="width=device-width, initial-scale=1.0" /}% script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"{}}% \LWR@htmltag{/script}\LWR@orignewline \LWR@htmltag{![endif]{-}{-}}\LWR@orignewline -\ifcsvoid{thetitle}{}{% -\LWR@htmltag{title}\thetitle#1\LWR@htmltag{/title}\LWR@orignewline% -}% +\ifthenelse{\equal{\theHTMLTitle}{}}% +{}% +{\LWR@htmltag{title}\theHTMLTitle#1\LWR@htmltag{/title}\LWR@orignewline}% \LWR@htmltag{% link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \LWR@orignewline \ifbool{mathjax}% {% + \begingroup% + \LWR@restoreoriglists% \boolfalse{LWR@verbtags} \verbatiminput{lwarp_mathjax.txt}% \booltrue{LWR@verbtags} + \endgroup% \LWR@stoppars }% end of mathjax {}% @@ -5040,6 +5122,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% }{}% \begingroup% \LWR@origttfamily% +\LWR@restoreoriglists% \LWR@FBcancel% \LetLtxMacro{\hspace}{\LWR@orighspace}% } @@ -5105,47 +5188,63 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \end{warpHTML} - \begin{warpHTML} -\newcommand*{\LWR@itemizeitem}{% +\newcommand*{\LWR@printcloselist}{\LWR@printcloseitemize} +\newcommand*{\LWR@printopenlist}{ul style="list-style-type:none"} + +\newcommand*{\LWR@listitem}{% \LWR@stoppars% -\LWR@startnewdepth{\LWR@depthlistitem}{\LWR@printcloselistitem{}}% +\LWR@startnewdepth{\LWR@depthlistitem}{\LWR@printcloselistitem}% \LWR@htmltag{li}% \LWR@startpars% \LWR@origitem% } -\newcommand*{\LWR@itemizestart}{% +\newcommand*{\LWR@liststart}{% \LWR@stoppars% -\LWR@pushoneclose{\LWR@depthlist}{\LWR@printcloseitemize{}}% -\LWR@htmltag{ul style="list-style-type:none"{}}% +\LWR@pushoneclose{\LWR@depthlist}{\LWR@printcloselist}% +\LWR@htmltag{\LWR@printopenlist}\LWR@orignewline% \LWR@startpars% -\let\item\LWR@itemizeitem% -} - -\newcommand*{\LWR@itemizeend}{% +\setlength{\topsep}{0pt}% +\setlength{\partopsep}{0pt}% +\setlength{\itemsep}{0pt}% +\setlength{\parsep}{0pt}% +\setlength{\leftmargin}{0pt}% +\setlength{\rightmargin}{0pt}% +\setlength{\listparindent}{0pt}% +\setlength{\itemindent}{0pt}% +\setlength{\labelsep}{1em}% +} + +\newcommand*{\LWR@listend}{% \LWR@stoppars% \LWR@closeprevious{\LWR@depthlistitem}% -\LWR@closeoneprevious{}% +\LWR@closeoneprevious% \LWR@startpars% } - -\newcommand*{\LWR@enumeratestart}{% +\newcommand*{\LWR@itemizeitem}{% \LWR@stoppars% -\LWR@pushoneclose{\LWR@depthlist}{\LWR@printcloseitemize{}}% -\LWR@htmltag{ul style="list-style-type:none"{}}% +\LWR@startnewdepth{\LWR@depthlistitem}{\LWR@printcloselistitem}% +\LWR@htmltag{li}% \LWR@startpars% +\LWR@origitem% +} + +\newcommand*{\LWR@itemizestart}{% +\renewcommand*{\LWR@printcloselist}{\LWR@printcloseitemize} +\renewcommand*{\LWR@printopenlist}{ul style="list-style-type:none"} \let\item\LWR@itemizeitem% } -\newcommand*{\LWR@enumerateend}{% -\LWR@stoppars% -\LWR@closeprevious{\LWR@depthlistitem}% -\LWR@closeoneprevious{}% -\LWR@startpars% + + +\newcommand*{\LWR@enumeratestart}{% +\renewcommand*{\LWR@printcloselist}{\LWR@printcloseitemize} +\renewcommand*{\LWR@printopenlist}{ul style="list-style-type:none"} +\let\item\LWR@itemizeitem% } @@ -5153,7 +5252,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% {% \LWR@stoppars% \LWR@setlatestname{#1}% -\LWR@startnewdepth{\LWR@depthlistitem}{\LWR@printclosedescitem{}}% +\LWR@startnewdepth{\LWR@depthlistitem}{\LWR@printclosedescitem}% \LetLtxMacro{\hspace}{\LWR@nohspace}% \LWR@origitem[]% \LetLtxMacro{\hspace}{\LWR@hspace}% @@ -5165,28 +5264,43 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% } \newcommand*{\LWR@descriptionstart}{% -\LWR@stoppars% -\LWR@pushoneclose{\LWR@depthlist}{\LWR@printclosedescription{}}% -\LWR@htmltag{dl}% -\LWR@startpars% +\renewcommand*{\LWR@printcloselist}{\LWR@printclosedescription} +\renewcommand*{\LWR@printopenlist}{dl} \let\item\LWR@descitem% } -\newcommand*{\LWR@descriptionend}{% -\LWR@stoppars% -\LWR@closeprevious{\LWR@depthlistitem}% -\LWR@closeoneprevious{}% -\LWR@startpars% -} + +\let\LWR@orig@trivlist\@trivlist +\let\LWR@origtrivlist\trivlist +\let\LWR@origendtrivlist\endtrivlist \newcommand*{\LWR@patchlists}{% -\LetLtxMacro{\LWR@origitem}{\item} -\AtBeginEnvironment{itemize}{\LWR@itemizestart} -\AtEndEnvironment{itemize}{\LWR@itemizeend} -\AtBeginEnvironment{enumerate}{\LWR@enumeratestart} -\AtEndEnvironment{enumerate}{\LWR@enumerateend} -\AtBeginEnvironment{description}{\LWR@descriptionstart} -\AtEndEnvironment{description}{\LWR@descriptionend} + \let\item\LWR@listitem% + \renewcommand*{\@trivlist}{% + \LWR@liststart% + \LWR@orig@trivlist% + }% + \renewcommand*{\endtrivlist}{\LWR@origendtrivlist\LWR@listend}% + \renewcommand*{\trivlist}{% + \LWR@origtrivlist% + \def\makelabel####1{\LWR@orighspace{3em}####1}% + }% + \renewcommand*{\itemize}{\LWR@itemizestart\LWR@origitemize}% + \renewcommand*{\enumerate}{\LWR@enumeratestart\LWR@origenumerate}% + \renewcommand*{\description}{\LWR@descriptionstart\LWR@origdescription}% +} + +\newcommand*{\LWR@restoreoriglists}{% +\let\@trivlist\LWR@orig@trivlist% +\let\trivlist\LWR@origtrivlist% +\let\endtrivlist\LWR@origendtrivlist% +\LetLtxMacro\item\LWR@origitem% +\LetLtxMacro\itemize\LWR@origitemize% +\LetLtxMacro\enditemize\LWR@endorigitemize% +\LetLtxMacro\enumerate\LWR@origenumerate% +\LetLtxMacro\endenumerate\LWR@endorigenumerate% +\LetLtxMacro\description\LWR@origdescription% +\LetLtxMacro\enddescription\LWR@endorigdescription% } \end{warpHTML} @@ -5304,12 +5418,12 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \newcommand*{\LWR@tabularampersand}{% \LWR@traceinfo{LWR@tabularampersand}% -\ifthenelse{\cnttest{\value{LWR@tabulardepth}}{>}{0}}% +\ifnumcomp{\value{LWR@tabulardepth}}{>}{0}% {% \unskip% \LWR@closetabledatacell% \addtocounter{LWR@tablecolindex}{1}% -\boolfalse{LWR@tabularcelladded}% + \boolfalse{LWR@tabularcelladded}% \LWR@getmynexttoken% }% {\LWR@origampmacro}% @@ -5329,22 +5443,25 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \booltrue{LWR@tabularmutemods}% }{}% \global\boolfalse{LWR@exitingtabular}% -\whiledo{% - \(% - \boolean{LWR@intabularmetadata} \AND% - \NOT\boolean{LWR@tabularcelladded} \AND% - \cnttest{\value{LWR@tablecolindex}}{=}{\value{LWR@tabletotalcols}}% - \) \OR% - \cnttest{\value{LWR@tablecolindex}}{<}{\value{LWR@tabletotalcols}}% -}{% +\whileboolexpr{% + test { + \ifnumcomp{\value{LWR@tablecolindex}}{<}{\value{LWR@tabletotalcols}} + } or % + (% + bool{LWR@intabularmetadata} and% + not bool{LWR@tabularcelladded} and% + test { + \ifnumcomp{\value{LWR@tablecolindex}}{=}{\value{LWR@tabletotalcols}} + }% + )% +}% +{% \LWR@tabledatasinglecolumntag% \LWR@closetabledatacell% \addtocounter{LWR@tablecolindex}{1}% \boolfalse{LWR@tabularcelladded}% \global\booltrue{LWR@emptyatbang}% - \ifthenelse{% - \cnttest{\value{LWR@tablecolindex}}{<}{\value{LWR@tabletotalcols}}% - }% + \ifnumcomp{\value{LWR@tablecolindex}}{<}{\value{LWR@tabletotalcols}}% {\LWR@getmynexttoken}% {}% }% @@ -5354,14 +5471,10 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% } -\NewDocumentCommand{\LWR@tabularendofline}{s o} -{% -\ifthenelse{\value{LWR@tablecolindex}<\value{LWR@tabletotalcols}}{% - \LWR@tabularfinishrow% -}% -{% - \LWR@closetabledatacell% -}% +\NewDocumentCommand{\LWR@tabularendofline}{s o}{% +\ifnumcomp{\value{LWR@tablecolindex}}{<}{\value{LWR@tabletotalcols}}% +{\LWR@tabularfinishrow}% +{\LWR@closetabledatacell}% \LWR@htmltag{/tr}\LWR@orignewline \global\booltrue{LWR@intabularmetadata} \global\boolfalse{LWR@startedrow} @@ -5382,8 +5495,8 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \newcommand*{\LWR@tablecolspec}{} -\newcommand*{\LWR@strresult}{} -\newcommand*{\LWR@strresulttwo}{} +\providecommand*{\LWR@strresult}{} +\providecommand*{\LWR@strresulttwo}{} \newcommand*{\LWR@origcolspec}{} @@ -5407,7 +5520,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \StrChar{\LWR@origcolspec}{\arabic{LWR@tablecolspecindex}}[\LWR@colparameter] \fullexpandarg% \LWR@traceinfo{have now read the next token}% -\ifthenelse{\cnttest{\value{LWR@tabletotalcols}}=0} +\ifnumcomp{\value{LWR@tabletotalcols}}{=}{0}% {% left edge of the table: \LWR@traceinfo{at the left edge}% \LWR@setexparray{LWR@colatspec}{leftedge}{\LWR@colparameter}% @@ -5431,7 +5544,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \StrChar{\LWR@origcolspec}{\arabic{LWR@tablecolspecindex}}[\LWR@colparameter] \fullexpandarg% \LWR@traceinfo{have now read the next token}% -\ifthenelse{\cnttest{\value{LWR@tabletotalcols}}=0} +\ifnumcomp{\value{LWR@tabletotalcols}}{=}{0}% {% left edge of the table: \LWR@traceinfo{at the left edge}% \LWR@setexparray{LWR@colbangspec}{leftedge}{\LWR@colparameter}% @@ -5464,7 +5577,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% } \newcommand*{\LWR@parsebarcolumn}{% \LWR@traceinfo{bar column}% -\ifthenelse{\cnttest{\value{LWR@tabletotalcols}}=0}% +\ifnumcomp{\value{LWR@tabletotalcols}}{=}{0}% {% left edge of the table: \LWR@setexparray{LWR@colbarspec}{leftedge}{tvertbarl}% }% @@ -5531,7 +5644,12 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \fullexpandarg% \LWR@traceinfo{finished StrLen}% \setcounter{LWR@tablecolspecwidth}{\LWR@strresult}% -\whiledo{\not\value{LWR@tablecolspecindex}>\value{LWR@tablecolspecwidth}}{% +\whileboolexpr{% + not test{% + \ifnumcomp{\value{LWR@tablecolspecindex}}{>}{\value{LWR@tablecolspecwidth}}% + }% +}% +{% \expandarg% \StrChar{\LWR@origcolspec}{\arabic{LWR@tablecolspecindex}}[\LWR@strresult]% \LWR@traceinfo{position \arabic{LWR@tablecolspecindex}: \LWR@strresult}% @@ -5631,7 +5749,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% } \newcommand*{\LWR@tabularleftedge}{% -\ifthenelse{\cnttest{\value{LWR@tablecolindex}}=1}% +\ifnumcomp{\value{LWR@tablecolindex}}{=}{1}% {% \LWR@printatbang{at}{leftedge}% \LWR@printatbang{bang}{leftedge}% @@ -5640,6 +5758,8 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% } +\newcommand*{\LWR@thiscolspec}{} + \newcommand*{\LWR@tabledatasinglecolumntag}% {% \LWR@maybenewtablerow% @@ -5657,17 +5777,18 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% "% \LWR@tdstartstyles% \LWR@addcmidrulewidth% - \LWR@addformatwpalignment% + \StrChar{\LWR@tablecolspec}{\arabic{LWR@tablecolindex}}[\LWR@thiscolspec]% + \LWR@addformatwpalignment{\LWR@thiscolspec}% \LWR@tdendstyles% }% - \ifthenelse{% - \equal{\LWR@strresult}{p}\OR% - \equal{\LWR@strresult}{m}\OR% - \equal{\LWR@strresult}{b}\OR% - \equal{\LWR@strresult}{P}\OR% - \equal{\LWR@strresult}{M}\OR% - \equal{\LWR@strresult}{B}\OR% - \equal{\LWR@strresult}{X}% + \ifboolexpr{% + test{ \ifdefstring{\LWR@strresult}{p} } or + test{ \ifdefstring{\LWR@strresult}{m} } or + test{ \ifdefstring{\LWR@strresult}{b} } or + test{ \ifdefstring{\LWR@strresult}{P} } or + test{ \ifdefstring{\LWR@strresult}{M} } or + test{ \ifdefstring{\LWR@strresult}{B} } or + test{ \ifdefstring{\LWR@strresult}{X} } }% {% allow pars \LWR@startpars% @@ -5704,8 +5825,10 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \newcommand*{\LWR@clearmidrules} {% \setcounter{LWR@midrulecounter}{1}% -\whiledo{% -\cnttest{\value{LWR@midrulecounter}}{<=}{\value{LWR@tablecolspecwidth}}% +\whileboolexpr{% + not test{% + \ifnumcomp{\value{LWR@midrulecounter}}{>}{\value{LWR@tablecolspecwidth}}% + }% }% {% \LWR@setexparray{LWR@midrules}{\arabic{LWR@midrulecounter}}{0pt}% @@ -5718,10 +5841,14 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \newcommand*{\LWR@subcmidrule}[4]{% \setcounter{LWR@midrulecounter}{#3}% -\whiledo{\cnttest{\value{LWR@midrulecounter}}{<=}{#4}}% +\whileboolexpr{% + not test {% + \ifnumcomp{\value{LWR@midrulecounter}}{>}{#4}% + }% +}% {% -\LWR@setexparray{LWR@midrules}{\arabic{LWR@midrulecounter}}{#1}% -\addtocounter{LWR@midrulecounter}{1}% + \LWR@setexparray{LWR@midrules}{\arabic{LWR@midrulecounter}}{#1}% + \addtocounter{LWR@midrulecounter}{1}% }% whiledo \IfSubStr{#2}{l}{\LWR@setexparray{LWR@trimlrules}{#3}{l}}{}% \IfSubStr{#2}{r}{\LWR@setexparray{LWR@trimrrules}{#4}{r}}{}% @@ -5800,18 +5927,17 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% text-align:#1; vertical-align:#2% } -\newcommand*{\LWR@addformatwpalignment}{% +\newcommand*{\LWR@addformatwpalignment}[1]{% \ifbool{FormatWP}{% -\StrChar{\LWR@tablecolspec}{\arabic{LWR@tablecolindex}}[\LWR@strresult]% -\ifdefstring{\LWR@strresult}{l}{\LWR@WPcell{left}{middle}}{}% -\ifdefstring{\LWR@strresult}{c}{\LWR@WPcell{center}{middle}}{}% -\ifdefstring{\LWR@strresult}{r}{\LWR@WPcell{right}{middle}}{}% -\ifdefstring{\LWR@strresult}{p}{\LWR@WPcell{left}{bottom}}{}% -\ifdefstring{\LWR@strresult}{m}{\LWR@WPcell{left}{middle}}{}% -\ifdefstring{\LWR@strresult}{b}{\LWR@WPcell{left}{top}}{}% -\ifdefstring{\LWR@strresult}{P}{\LWR@WPcell{center}{bottom}}{}% -\ifdefstring{\LWR@strresult}{M}{\LWR@WPcell{center}{middle}}{}% -\ifdefstring{\LWR@strresult}{B}{\LWR@WPcell{center}{top}}{}% +\IfSubStr{#1}{l}{\LWR@WPcell{left}{middle}}{}% +\IfSubStr{#1}{c}{\LWR@WPcell{center}{middle}}{}% +\IfSubStr{#1}{r}{\LWR@WPcell{right}{middle}}{}% +\IfSubStr{#1}{p}{\LWR@WPcell{left}{bottom}}{}% +\IfSubStr{#1}{m}{\LWR@WPcell{left}{middle}}{}% +\IfSubStr{#1}{b}{\LWR@WPcell{left}{top}}{}% +\IfSubStr{#1}{P}{\LWR@WPcell{center}{bottom}}{}% +\IfSubStr{#1}{M}{\LWR@WPcell{center}{middle}}{}% +\IfSubStr{#1}{B}{\LWR@WPcell{center}{top}}{}% }{}% } @@ -5838,7 +5964,7 @@ text-align:#1; vertical-align:#2% \IfStrEq{\LWR@strresult}{S}{r}{}% \IfStrEq{\LWR@strresult}{X}{p}{}% \IfStrEq{\LWR@strresult}{|}{% - \ifthenelse{\value{LWR@tablemulticolspos}=1}% + \ifnumcomp{\value{LWR@tablemulticolspos}}{=}{1}% {\booltrue{LWR@mcolvertbarl}}% {\booltrue{LWR@mcolvertbarr}}% }{}% @@ -5894,8 +6020,10 @@ text-align:#1; vertical-align:#2% \setcounter{LWR@tablemulticolspos}{1}% \StrLen{#1}[\LWR@strresult]% \setcounter{LWR@tablemulticolswidth}{\LWR@strresult}% -\whiledo{% - \NOT\value{LWR@tablemulticolspos}>\value{LWR@tablemulticolswidth}% +\whileboolexpr{% + not test {% + \ifnumcomp{\value{LWR@tablemulticolspos}}{>}{\value{LWR@tablemulticolswidth}}% + } }% {% #2{#1}% @@ -5938,7 +6066,7 @@ rowspan="#2" % "% \LWR@tdstartstyles% \LWR@addcmidrulewidth% -\LWR@addformatwpalignment% +\LWR@addformatwpalignment{#5}% \LWR@tdendstyles% }% end of the opening table data tag \global\boolfalse{LWR@intabularmetadata}% @@ -5961,7 +6089,7 @@ rowspan="#2" % \NewDocumentCommand{\LWR@longtabledatacaptiontag}{s o +m} {% \IfValueTF{#2}{% optional given? - \ifthenelse{\equal{#2}{}}% optional empty? + \ifblank{#2}% optional empty? {\LWR@setlatestname{#3}}% empty {\LWR@setlatestname{#2}}% given and non-empty }% optional given @@ -5978,18 +6106,18 @@ rowspan="#2" % {% No star: \ifbool{LWR@starredlongtable}% {% - \ifthenelse{\equal{#2}{}}% TOC entry - {}% - {% - \refstepcounter{\LTcaptype}% - \protected@edef\@currentlabel{% - \csuse{p@\LTcaptype}\csuse{the\LTcaptype}}% - }% + \ifblank{#2}% TOC entry + {}% + {% + \refstepcounter{\LTcaptype}% + \protected@edef\@currentlabel{% + \csuse{p@\LTcaptype}\csuse{the\LTcaptype}}% + }% }{}% \LWR@figcaption% \csuse{fnum@\LTcaptype}\CaptionSeparator#3% \endLWR@figcaption% - \ifthenelse{\equal{#2}{}}% TOC entry empty + \ifblank{#2}% TOC entry empty {}% {% TOC entry not empty \IfNoValueTF{#2}% No TOC entry? @@ -6045,10 +6173,15 @@ rowspan="#2" % \setcounter{LWR@tabhtmlcoltotal}{#2}% \setcounter{LWR@tabhtmlcolend}{#1}% \addtocounter{LWR@tabhtmlcolend}{#2}% -\ifthenelse{\value{LWR@tabhtmlcolindex}=1}{% +\ifnumcomp{\value{LWR@tabhtmlcolindex}}{=}{1}{% \LWR@subtabularhtmlcolumns{leftedge}% }{}% -\whiledo{\value{LWR@tabhtmlcolindex}<\value{LWR@tabhtmlcolend}}{% +\whileboolexpr{% + test {% + \ifnumcomp{\value{LWR@tabhtmlcolindex}}{<}{\value{LWR@tabhtmlcolend}}% + }% +}% +{% \LWR@subtabularhtmlcolumns{\arabic{LWR@tabhtmlcolindex}}% \addtocounter{LWR@tabhtmlcolindex}{1}% }% whiledo @@ -6304,14 +6437,19 @@ rowspan="#2" % }% {% \LWR@traceinfo{LWR@tabular ending}% -\ifthenelse{% - \(% - \boolean{LWR@intabularmetadata} \AND% - \NOT\boolean{LWR@tabularcelladded} \AND% - \cnttest{\value{LWR@tablecolindex}}{=}{\value{LWR@tabletotalcols}}% - \) \OR% - \cnttest{\value{LWR@tablecolindex}}{<}{\value{LWR@tabletotalcols}}% -}{% +\ifboolexpr{% + test {% + \ifnumcomp{\value{LWR@tablecolindex}}{<}{\value{LWR@tabletotalcols}} + } or % + (% + bool{LWR@intabularmetadata} and% + not bool{LWR@tabularcelladded} and% + test {% + \ifnumcomp{\value{LWR@tablecolindex}}{=}{\value{LWR@tabletotalcols}}% + }% + )% +}% +{% \LWR@tabularfinishrow% }% {% @@ -6336,7 +6474,7 @@ rowspan="#2" % \begin{warpHTML} -\newcommand*{\@currentlabelname}{} +\providecommand*{\@currentlabelname}{} \def\LWR@stripperiod#1.\ltx@empty#2\@nil{#1}% \newcommand*{\LWR@setlatestname}[1]{% \GetTitleStringExpand{#1}% @@ -6379,7 +6517,7 @@ rowspan="#2" % \newcommand*{\LWR@subsublabel}[1]{% -\ifthenelse{\cnttest{\value{LWR@lateximagedepth}}{>}{0}}% +\ifnumcomp{\value{LWR@lateximagedepth}}{>}{0}% {}% {% not lateximage \ifbool{LWR@doingstartpars}% @@ -6513,22 +6651,19 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}% \LWR@nolinkurlb% } -\newcommand*{\LWR@urlb}[1]{% -\href{#1}{#1}% -\endgroup% -\LWR@ensuredoingapar% +\NewDocumentCommand{\LWR@urlb}{m}{% +\LWR@hrefb{#1}{#1}% } -\DeclareRobustCommand*{\LWR@urla}{% +\DeclareRobustCommand*{\url}{% \LWR@ensuredoingapar% \begingroup\catcode`\_=12 \LWR@urlb% } -\let\url\LWR@urla \newcommand*{\LWR@subinlineimage}[5][]{% -\ifthenelse{\equal{#1}{}}% +\ifblank{#1}% {\LWR@htmltag{img src="#3.#4" alt="#3" style="#5" class="#2"{}}}% {\LWR@htmltag{img src="#3.#4" alt="#1" style="#5" class="#2"{}}}% } @@ -6545,11 +6680,11 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}% \NewDocumentCommand{\LWR@floatbegin}{m o}{% \ifbool{FormatWP}{\newline}{}% \LWR@stoppars -\addtocounter{LWR@thisfloat}{1}% -\booltrue{LWR@freezethisfloat}% +\addtocounter{LWR@thisautoid}{1}% +\booltrue{LWR@freezethisautoid}% \begingroup% \LWR@origraggedright% -\LWR@htmltag{figure id="autofloat-\arabic{LWR@thisfloat}" class="#1"}% +\LWR@htmltag{figure id="autoid-\arabic{LWR@thisautoid}" class="#1"}% \ifbool{FormatWP}{% \LWR@orignewline% \LWR@BlockClassWP{}{}{wp#1}% @@ -6575,20 +6710,25 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}% \ifbool{FormatWP}{\endLWR@BlockClassWP}{}% \LWR@htmlelementend{figure}% \endgroup% -\boolfalse{LWR@freezethisfloat}% +\boolfalse{LWR@freezethisautoid}% \LWR@startpars% \ifbool{FormatWP}{\newline}{}% } \let\end@float\LWR@floatend \let\end@dblfloat\LWR@floatend -\newcounter{LWR@thisfloat} +\newcounter{LWR@thisautoid} -\newbool{LWR@freezethisfloat} -\boolfalse{LWR@freezethisfloat} +\newbool{LWR@freezethisautoid} +\boolfalse{LWR@freezethisautoid} + +\newcommand*{\LWR@maybeincthisautoid}{% +\ifbool{LWR@freezethisautoid}{}{\addtocounter{LWR@thisautoid}{1}}% +} -\newcommand*{\LWR@maybeincthisfloat}{% -\ifbool{LWR@freezethisfloat}{}{\addtocounter{LWR@thisfloat}{1}}% +\newcommand*{\LWR@newautoidanchor}{% +\LWR@maybeincthisautoid% +\LWR@htmltag{a id="autoid-\arabic{LWR@thisautoid}"{}}\LWR@htmltag{/a}% } \newcommand*{\@captype}{} @@ -6599,11 +6739,11 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}% \AtBeginDocument{\renewcommand{\@makecaption}[2]{#1\CaptionSeparator#2}} -\newcounter{LWR@nextautofloat} +\newcounter{LWR@nextautoid} \newcounter{LWR@nextautopage} \newcommand*{\LWRsetnextfloat}[2]{% \setcounter{LWR@nextautopage}{#1}% -\setcounter{LWR@nextautofloat}{#2}% +\setcounter{LWR@nextautoid}{#2}% } \newcounter{LWR@latestautopage} @@ -6654,15 +6794,13 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}% \let\LWR@origcaptionlistentry\captionlistentry \renewcommand*{\captionlistentry}{% -\LWR@maybeincthisfloat% \LWR@ensuredoingapar% -\LWR@htmltag{a id="autofloat-\arabic{LWR@thisfloat}"{}}\LWR@htmltag{/a}% \LWR@origcaptionlistentry% } \def\LWR@LTcaptionlistentry{% \LWR@ensuredoingapar% -\LWR@htmltag{a id="autofloat-\arabic{LWR@thisfloat}"{}}\LWR@htmltag{/a}% +\LWR@htmltag{a id="autoid-\arabic{LWR@thisautoid}"{}}\LWR@htmltag{/a}% \bgroup \@ifstar{\egroup\LWR@LT@captionlistentry}% gobble * {\egroup\LWR@LT@captionlistentry}}% @@ -6672,14 +6810,15 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}% \let\LWR@origaddcontentsline\addcontentsline \renewcommand*{\addcontentsline}[3]{% -\ifthenelse{\equal{#1}{toc}}{}{% - \ifthenelse{\equal{#1}{thm}}{\csdef{ext@#2}{thm}}{} +\ifstrequal{#1}{toc}{}{% not TOC + \LWR@newautoidanchor% + \ifthenelse{\equal{#1}{thm}}{\csdef{ext@#2}{thm}}{}% \addtocontents{\@nameuse{ext@#2}}{% - \protect\LWRsetnextfloat% - {\arabic{LWR@latestautopage}}% - {\arabic{LWR@thisfloat}}% - }% addtocontents -}% not toc + \protect\LWRsetnextfloat% + {\arabic{LWR@latestautopage}}% + {\arabic{LWR@thisautoid}}% + }% +}% not TOC \LWR@origaddcontentsline{#1}{#2}{#3}% } @@ -6687,9 +6826,7 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}% \let\LWR@origcaptionof\captionof \renewcommand*{\captionof}{% -\LWR@maybeincthisfloat% \LWR@stoppars -\LWR@htmltag{a id="autofloat-\arabic{LWR@thisfloat}"{}}\LWR@htmltag{/a}% \LWR@origcaptionof% } } @@ -6816,10 +6953,12 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}% } -\renewcommand*{\numberline}[1]{% +\newcommand*{\LWR@numberline}[1]{% \LWR@sectionnumber{#1}\quad% } +\LetLtxMacro\numberline\LWR@numberline + \NewDocumentCommand{\hypertoc}{m m +m m}{% \ifthenelse{\cnttest{#1}{<=}{\value{tocdepth}}}{% \LWR@startpars% @@ -6847,7 +6986,7 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}% \LWR@startpars% \LWR@subhyperrefclass{% \LWR@htmlrefsectionfilename{autopage-\arabic{LWR@nextautopage}}% - \#autofloat-\arabic{LWR@nextautofloat}}% + \#autoid-\arabic{LWR@nextautoid}}% {#4}{toc#2}% \LWR@stoppars% }{}% @@ -6912,7 +7051,7 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}% \InlineClass{indexsubsubitem}{} } -\def\@wrindex#1{% +\def\LWR@wrindex#1{% \addtocounter{LWR@autoindex}{1}% \LWR@newlabel{LWRindex-\theLWR@autoindex}% \protected@write\@indexfile{}% @@ -6920,6 +7059,8 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}% \endgroup \@esphack} +\let\@wrindex\LWR@wrindex + \def\@wrglossary#1{% \addtocounter{LWR@autoglossary}{1}% \LWR@newlabel{LWRglossary-\theLWR@autoglossary}% @@ -7019,6 +7160,7 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}% \csletcs{equation*}{LWR@origequationstar}% \csletcs{endequation*}{LWR@origendequationstar}% \LWR@restoreorigaccents% +\LWR@restoreoriglists% \LWR@FBcancel% } @@ -7027,7 +7169,7 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}% \let\LWR@origtextdollar\$ \renewcommand*{\$}{% -\ifthenelse{\cnttest{\value{LWR@lateximagedepth}}{>}{0}}% +\ifnumcomp{\value{LWR@lateximagedepth}}{>}{0}% {\LWR@origtextdollar}% {\LWR@htmltagc{span}\LWR@origtextdollar\LWR@htmltagc{/span}}% } @@ -7282,7 +7424,7 @@ $#1$} \LWR@beginhideamsmath } { - \lateximage[\LWR@amsmathbodynumbered{multline}] + \begin{lateximage}[\LWR@amsmathbodynumbered{multline}] } } @@ -7294,7 +7436,7 @@ $#1$} \boolfalse{LWR@amsmultline} \LWR@addmathjax{multline}{\the\@envbody} } -{\endlateximage} +{\end{lateximage}} } @@ -7307,7 +7449,7 @@ $#1$} \LWR@beginhideamsmath } { - \lateximage[\LWR@amsmathbody{multline*}] + \begin{lateximage}[\LWR@amsmathbody{multline*}] } } @@ -7319,7 +7461,7 @@ $#1$} \boolfalse{LWR@amsmultline} \LWR@addmathjax{multline*}{\the\@envbody} } -{\endlateximage} +{\end{lateximage}} } @@ -7333,7 +7475,7 @@ $#1$} \LWR@beginhideamsmath } { - \lateximage[\LWR@amsmathbodynumbered{gather}] + \begin{lateximage}[\LWR@amsmathbodynumbered{gather}] } } @@ -7344,7 +7486,7 @@ $#1$} \LWR@endhideamsmath \LWR@addmathjax{gather}{\the\@envbody} } -{\endlateximage} +{\end{lateximage}} } @@ -7357,7 +7499,7 @@ $#1$} \LWR@beginhideamsmath } { - \lateximage[\LWR@amsmathbody{gather*}] + \begin{lateximage}[\LWR@amsmathbody{gather*}] } } @@ -7368,7 +7510,7 @@ $#1$} \LWR@endhideamsmath \LWR@addmathjax{gather*}{\the\@envbody} } -{\endlateximage} +{\end{lateximage}} } @@ -7381,7 +7523,7 @@ $#1$} \LWR@beginhideamsmath } { - \lateximage[\LWR@amsmathbodynumbered{align}] + \begin{lateximage}[\LWR@amsmathbodynumbered{align}] } } @@ -7392,7 +7534,7 @@ $#1$} \LWR@endhideamsmath \LWR@addmathjax{align}{\the\@envbody} } -{\endlateximage} +{\end{lateximage}} } @@ -7405,7 +7547,7 @@ $#1$} \LWR@beginhideamsmath } { - \lateximage[\LWR@amsmathbody{align*}] + \begin{lateximage}[\LWR@amsmathbody{align*}] } } @@ -7416,7 +7558,7 @@ $#1$} \LWR@endhideamsmath \LWR@addmathjax{align*}{\the\@envbody} } -{\endlateximage} +{\end{lateximage}} } @@ -7429,7 +7571,7 @@ $#1$} \LWR@beginhideamsmath } { - \lateximage[\LWR@amsmathbodynumbered{flalign}] + \begin{lateximage}[\LWR@amsmathbodynumbered{flalign}] } } @@ -7440,7 +7582,7 @@ $#1$} \LWR@endhideamsmath \LWR@addmathjax{flalign}{\the\@envbody} } -{\endlateximage} +{\end{lateximage}} } @@ -7453,7 +7595,7 @@ $#1$} \LWR@beginhideamsmath } { - \lateximage[\LWR@amsmathbody{flalign*}] + \begin{lateximage}[\LWR@amsmathbody{flalign*}] } } @@ -7464,7 +7606,7 @@ $#1$} \LWR@endhideamsmath \LWR@addmathjax{flalign*}{\the\@envbody} } -{\endlateximage} +{\end{lateximage}} } @@ -7618,7 +7760,7 @@ $#1$} \let\LWR@equationtag\theequation% \addtocounter{LWR@lateximagenumber}{1}% \LWR@traceinfo{lateximage: LWR@lateximagenumber is \arabic{LWR@lateximagenumber}}% - \boolfalse{mathjax} + \boolfalse{mathjax}% \LWR@ensuredoingapar% \addtocounter{LWR@externalfilecnt}{1}% \LWR@traceinfo{lateximage: LWR@externalfilecnt is \arabic{LWR@externalfilecnt}}% @@ -7902,9 +8044,9 @@ $#1$} \begin{warpHTML} -\BeforeBeginEnvironment{picture}{\lateximage} +\BeforeBeginEnvironment{picture}{\begin{lateximage}} -\AfterEndEnvironment{picture}{\endlateximage} +\AfterEndEnvironment{picture}{\end{lateximage}} \end{warpHTML} @@ -7974,9 +8116,9 @@ $#1$} \LWR@stoppars% \ifbool{FormatWP}{% -\addtocounter{LWR@thisfloat}{1}% -\booltrue{LWR@freezethisfloat}% -\LWR@htmltag{div id="autofloat-\arabic{LWR@thisfloat}" class="wpminipage"}% +\addtocounter{LWR@thisautoid}{1}% +\booltrue{LWR@freezethisautoid}% +\LWR@htmltag{div id="autoid-\arabic{LWR@thisautoid}" class="wpminipage"}% }{}% \LWR@traceinfo{minipage: creating div class}% @@ -8027,7 +8169,7 @@ $#1$} \ifbool{FormatWP}{% \LWR@htmlelementend{div}% -\boolfalse{LWR@freezethisfloat}% +\boolfalse{LWR@freezethisautoid}% }{}% \LWR@htmldivclassend{minipage}% @@ -8431,9 +8573,9 @@ width:\rndprintlength{\LWR@tempwidth}% \ifnum\gluestretchorder\LWR@tempwidth>0% \setlength{\LWR@tempwidth}{2em}% \fi% -\ifthenelse{\dimtest{\LWR@tempwidth}{=}{0pt}}{}{% +\ifdimcomp{\LWR@tempwidth}{=}{0pt}{}{% \LWR@minipagestoppars% - \ifthenelse{\dimtest{\LWR@tempwidth}{=}{.16667em}} + \ifdimcomp{\LWR@tempwidth}{=}{.16667em}% {% \HTMLunicode{2009}% thin breakable space }% @@ -8473,6 +8615,8 @@ width:\rndprintlength{\LWR@tempwidth}% \renewcommand*{\nopagebreak}[1][]{} \RenewDocumentCommand{\enlargethispage}{s m}{} +\renewcommand*{\clearpage}{} +\renewcommand*{\cleardoublepage}{} \newcommand*{\LWR@currenttextcolor}{black} \NewDocumentCommand{\LWR@rule}{o m m}{% \setlength{\LWR@tempwidth}{#2}% @@ -8495,9 +8639,9 @@ width:\rndprintlength{\LWR@tempwidth}% \LWR@htmltagc{% span style="% - \ifbool{FormatWP}{}{background:\LWR@currenttextcolor; }% - width:\printlength{\LWR@tempwidth}; % - height:\printlength{\LWR@tempheight}; % + \ifbool{FormatWP}{}{background:\LWR@currenttextcolor ; }% + width:\printlength{\LWR@tempwidth} ; % + height:\printlength{\LWR@tempheight} ; % \IfValueT{#1}% {% \setlength{\LWR@tempraise}{0pt-#1}% |