diff options
| author | Karl Berry <karl@freefriends.org> | 2017-09-26 23:20:37 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2017-09-26 23:20:37 +0000 |
| commit | b482e67a123af24b726b884c6f5ba992e3a37b0b (patch) | |
| tree | fda79325a3a802526e8d97c7bf851d1a1a76163c /Master | |
| parent | ddbb47b55229a220d99b4e5e630bab06c543149e (diff) | |
lwarp (26sep17)
git-svn-id: svn://tug.org/texlive/trunk@45406 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
172 files changed, 2873 insertions, 1634 deletions
diff --git a/Master/texmf-dist/doc/latex/lwarp/README.txt b/Master/texmf-dist/doc/latex/lwarp/README.txt index 2fe8a549f8c..b517771e018 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.39 README.txt +LaTeX lwarp package v0.40 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 cfdead6d480..6d941b66130 100644 --- a/Master/texmf-dist/doc/latex/lwarp/lwarp.pdf +++ b/Master/texmf-dist/doc/latex/lwarp/lwarp.pdf diff --git a/Master/texmf-dist/scripts/lwarp/lwarpmk.lua b/Master/texmf-dist/scripts/lwarp/lwarpmk.lua index 83e427b029d..0fbeac022bc 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.39" +printversion = "v0.40" 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 ba6ac00dd1f..22db6861f1e 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/09/05 v0.39 Allows LaTeX to directly produce HTML5 output.] +%<package> [2017/09/25 v0.40 Allows LaTeX to directly produce HTML5 output.] % %<*driver> \documentclass{ltxdoc} @@ -65,6 +65,18 @@ \newunicodechar{ê}{\^{e}} \newunicodechar{Ω}{\textohm} \newunicodechar{μ}{\textmu} +\newunicodechar{⁅}{\textlquill} +\newunicodechar{⁆}{\textrquill} +\newunicodechar{℗}{\textcircledP} +\newunicodechar{—}{\texttwelveudash}% emdash +\newunicodechar{—}{\textthreequartersemdash}% emdash +\newunicodechar{℧}{\textmho} +\newunicodechar{₦}{\textnaira} +\newunicodechar{₱}{\textpeso} +\newunicodechar{℞}{\textrecipe} +\newunicodechar{‱}{\textpertenthousand} +\newunicodechar{฿}{\textbaht} +\newunicodechar{℠}{\textservicemark} \usepackage[log-declarations=false]{xparse} @@ -104,6 +116,8 @@ \usepackage{array} \usepackage{longtable} \usepackage{booktabs} +\usepackage{multirow} +\usepackage{bigdelim} \usepackage[normalem]{ulem} @@ -174,7 +188,23 @@ \DescribeBoolean{#1}% } +% A macro which is not indexed: +\makeatletter +\newenvironment{noindmacro}[1] +{ +\setlength{\parskip}{\marginparpush} +\leavevmode\par\DTXD@margintag{}{\cmd{#1}}{}} +{\unskip} +\makeatother +% An environment which is not indexed: +\makeatletter +\newenvironment{noindenvironment}[1] +{ +\setlength{\parskip}{\marginparpush} +\leavevmode\par\DTXD@margintag{}{#1}{Env}} +{\unskip} +\makeatother \usepackage{microtype} @@ -333,11 +363,24 @@ Green-colored tags in the left margin show which sections of source code apply to the generation of \HTML, print, or both forms of output. } -\newcommand{\limitspageref}{\pkg{cleveref} and \pkg{varioref} are supported, -but printed page numbers do not map to \HTML, so a section name or a text phrase -are used instead. -See \cref{sec:successfulcommands} to redefine the message which is printed -for page number references. +\newcommand{\limitscpageref}{\pkg{cleveref} and \pkg{varioref} are supported, +\watchout[\pkg{cleveref} page numbers] +but printed page numbers do not map to \HTML, +so a section name or a text phrase +are used for \cs{cpageref} and \cs{cpagerefrange}. +This phrase includes \cs{cpagerefFor}, which defaults to ``for''. + +\needspace{3\baselineskip} +Ex: +\begin{sourcedisplay} + \cs{cpageref}\{tab:first,tab:second\} \\ + \hspace*{-2em} in \HTML\ becomes:\\ + \rmfamily + ``pages \textbf{for} table \textcolor{red}{4.1} and + \textbf{for} table \textcolor{red}{4.2}'' +\end{sourcedisplay} +See \cs{cpagerefFor} at \cpageref{sec:cpagereffor} +to redefine the message which is printed for page number references. } \newcommand{\limitshyperlinks}{% @@ -441,6 +484,8 @@ a \acro{TOC} entry, and placed inline or on their own \HTML page: \limitsindexlanguage +\limitstocloft + An index may be placed inline with other \HTML\ text, or on its own \HTML\ page: \margintag{placement and \acro{TOC} options} @@ -490,12 +535,21 @@ An index may be placed inline with other \HTML\ text, or on its own \HTML\ page: \cs{ForceHTMLPage} \\ \cs{printindex} \end{sourcedisplay} +\end{description} - Use the \pkg{tocbibind} \texttt{numindex} option to generate a numbered index. +Use the \pkg{tocbibind} \texttt{numindex} option to generate a numbered index. \DescribeOption[tocbibind]{numindex} - Without this option, the index heading has no number. +Without this option, the index heading has no number. \margintag{numbered index section} -\end{description} +} + +\newcommand{\limitstocloft}{% +If using \pkg{tocloft} with \pkg{tocbibind}, \pkg{anonchap}, +\watchout[\pkg{tocloft} \& other packages] +\pkg{fncychap}, or other packages which change chapter title formatting, +load \pkg{tocloft} with its \texttt{titles} option, which +tells \pkg{tocloft} to use standard \LaTeX\ commands to create the titles, +allowing other packages to work with it. } \newcommand*{\limitspagenote}{% @@ -544,6 +598,9 @@ and a \cs{fill} is converted to a \cs{qquad}. } \newcommand{\limitstextcomp}{% +Some \pkg{textcomp} symbols do not have Unicode equivalents, and thus +are not supported. + Many \pkg{textcomp} symbols are not supported by many fonts. \watchout[Missing symbols] Try using more complete fonts in the \CSS, but expect to see gaps in coverage. @@ -570,14 +627,26 @@ may limit how small the output will be displayed. \newcommand{\limitsreferences}{% \cs{nameref} refers to the most recently-used section where the \cs{label} -was defined. If no section has been defined before the \cs{label}, +was defined. +If no section has been defined before the \cs{label}, +\watchout[empty link] the link will be empty. Index entries also use \cs{nameref} and have the same limitation. } +\newcommand{\limitspfnote}{ +While emulating \pkg{pfnote}, \pkg{lwarp} is not able to reset \HTML\ footnote +\watchout[\pkg{pfnote} numbers] +numbers per page number to match the printed version, +as \HTML\ has no concept of page numbers. +\pkg{lwarp} therefore uses continuous footnote numbering even for \pkg{pfnote}. +} + \newcommand{\limitsfootnotes}{ \pkg{lwarp} uses native \LaTeX\ footnote code, although with its own \cs{box} to avoid the \LaTeX\ output routine. The usual functions work as-is. + +\limitspfnote } \newcommand{\limitsverse}{% @@ -772,6 +841,32 @@ It is recommended to use \pkg{cleveref} instead of \pkg{ntheorem}'s \newcommand{\limitsgraphics}{% +For \cs{includegraphics} with \texttt{.pdf} files, +\watchout[\texttt{.pdf} image files] +the user should provide a \texttt{.pdf} image file, and also +a \texttt{.svg}, \texttt{.png}, or \texttt{.jpg} version of the same image. +\textcolor{red}{These should be referred to without a file extension:} +\watchout[no file extension] +\begin{sourcedisplay} +\cs{includegraphics}\{filename\} \% print:.pdf, HTML:.svg or other +\end{sourcedisplay} +For print output, \pkg{lwarp} will automatically choose the \texttt{.pdf} if available, +other some other format otherwise. +For \HTML, one of the other formats is used instead. + +If a \texttt{.pdf} file is explicitly referred to with its file extension, +a link to the \texttt{.pdf} file will appear in the \HTML\ output. +\begin{sourcedisplay} +\cs{includegraphics}\{filename.pdf\} \% creates a link in HTML +\end{sourcedisplay} + +For \texttt{.png}, \texttt{.jpg}, or \texttt{.gif} image files, +\margintag{other image files} +the same file may be used in +both print or \HTML\ versions, and may be used with a file extension, +but will also be used without the file extension if it is the only file of +its base name. + If using the older \pkg{graphics} syntax, use both optional arguments \watchout[\pkg{graphics} vs. \pkg{graphicx}] for \cs{includegraphics}. @@ -780,17 +875,13 @@ Note that viewports are not supported by \pkg{warp}; \watchout[viewports] the entire image will be shown. -\cs{graphicspath} only works for a single directory; -\watchout[\cs{graphicspath}] -all graphics must be in this directory. - For \cs{includegraphics}, avoid \texttt{px} and \% units for width and height, or \margintag{units} enclose them inside \env{warpHTML} environments. For font-proportional image sizes, use \texttt{ex} or \texttt{em}. For fixed-sized images, use \texttt{cm}, \texttt{mm}, \texttt{in}, \texttt{pt}, or \texttt{pc}. -Using the keys \cmds{width=.5\lmacro{linewidth}}, +Use the keys \cmds{width=.5\lmacro{linewidth}}, or similar for \cmds{\lmacro{textwidth}} or \cmds{\lmacro{textheight}} to give fixed-sized images proportional to a 6 by 9 inch text area. @@ -805,20 +896,12 @@ With \HTML\ output, \cs{includegraphics} accepts an optional the \HTML\ output will include that class for the image. The class is ignored for print output. -For \cs{includegraphics} the user should provide both \texttt{.pdf} and \texttt{.svg} -images, but always refer to -\watchout[image file types] -\texttt{.pdf} images in the document source. -All \cs{includegraphics} references to \texttt{.pdf} will automatically -be changed to \texttt{.svg} for \HTML\ output, and will be left as \texttt{.pdf} for print output. -Images may also be \texttt{.jpg} and \texttt{.png}, and will be used as-is for either output. - \cs{rotatebox} accepts the optional \texttt{origin} key. \margintag{\cs{rotatebox}} -\cs{rotatebox}, \cs{scalebox}, and \cs{reflectbox} depend on modern browser -support. +\cs{rotatebox}, \cs{scalebox}, and \cs{reflectbox} depend \watchout[browser support] +on modern browser support. The \CSSthree\ standard declares that when an object is transformed the whitespace which they occupied is preserved, unlike \LaTeX{}, so expect some @@ -851,13 +934,11 @@ see \cref{sec:tutorialmathjax} to use MathJax instead. } \newcommand{\limitsgrffile}{% -\pkg{grffile} is partially emulated. +\pkg{grffile} is supported as-is. File types known to the browser are displayed, and unknown file types are given a link. Each \PDF\ image for print mode should be accompanied \watchout[matching \PDF\ and \SVG] -by an \SVG\ version for \HTML. -No attempt is made to convert input or filename encodings. -\watchout[encodings] +by an \SVG, \PNG, or \JPG\ version for \HTML. } \newcommand{\limitscolor}{% @@ -905,7 +986,7 @@ Use \CSS\ or \cs{textcolor} where possible. Tabular mostly works as expected, but pay special attention to the following, especially if working with environments, macros inside tabulars, multirows, \texttt{*} column specifiers, \pkg{siunitx} \texttt{S} columns, -or the packages \pkg{longtable}, \pkg{supertabular}, or \pkg{xtab}. +or the packages \pkg{multirow}, \pkg{longtable}, \pkg{supertabular}, or \pkg{xtab}. \begin{description} \item [Defining environments:] \ \begin{itemize} @@ -1044,6 +1125,8 @@ To create a 2 column, 3 row cell: The two arguments for \cs{multicolumn} come first, followed by the five arguments for \cs{multirow}, many of which are optional, followed by the contents. +Note that recent versions of \pkg{multirow} include a new optional +\texttt{vposn} argument. } \newcommand{\limitsresumetabular}{% @@ -1106,6 +1189,31 @@ For \cs{tablefirsthead}, etc., enclose them as follows: See \cref{sec:limitstabular}. } +\newcommand{\limitsbigdelim}{% +\cs{ldelim} and \cs{rdelim} use \cs{multirow}, so +\watchout[use \cs{mrowcell}] +\cs{mrowcell} must be used in the proper number of empty cells in the +same column below \cs{ldelim} or \cs{rdelim}, but not in cells which +are above or below the delimiter: +\begin{sourcedisplay} +\hrule\smallskip +\cs{begin}\{tabular\}\{lll\} \\ +\textcolor{green}{<empty>} \& a \& b \textbackslash\textbackslash \\ +\cs{ldelim}\{\textbackslash\{\}\{2\}\{.25in\}[left ] \& c \& d \textbackslash\textbackslash \\ +\textcolor{red}{\cs{mrowcell}} \& e \& f \textbackslash\textbackslash \\ +\textcolor{green}{<empty>} \& g \& h \textbackslash\textbackslash \\ +\cs{end}\{tabular\} +\smallskip\hrule +\begin{tabular}{lll} + & a & b \\ +\ldelim{\{}{2}{.25in}[left ] & c & d \\ +\mrowcell & e & f \\ + & g & h \\ +\end{tabular} +\hrule +\end{sourcedisplay} +} + \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. @@ -1443,7 +1551,7 @@ This boolean may be tested by the user for later use. %<*package> % \fi % -% \CheckSum{13780} +% \CheckSum{14147} % % \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 @@ -1524,6 +1632,7 @@ This boolean may be tested by the user for later use. % \changes{v0.37}{2017/08/19}{\ 2017/08/19} % \changes{v0.38}{2017/08/27}{\ 2017/08/27} % \changes{v0.39}{2017/09/05}{\ 2017/09/05} +% \changes{v0.40}{2017/09/25}{\ 2017/09/25} @@ -1658,6 +1767,38 @@ 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.40:] \ +% \begin{itemize} +% \item \pkg{graphics} and \pkg{graphicx} have been moved from the +% \margintag{\pkg{graphics}, \pkg{graphicx}} +% \pkg{lwarp} core, and are only loaded if requested with \cs{usepackage}. +% \item Improved \pkg{graphics} \cs{graphicspath} support. +% \margintag{\cs{includegraphics} path} +% Multiple image directories may now be used. +% \textcolor{red}{Refer to |.pdf| files without a file extension} +% \watchout[image file extensions] +% to allow the \HTML\ version +% to use a |.svg|, |.png|, |.jpg|, or |.gif| version instead. +% See \cref{sec:limitsgraphics}. +% \item \pkg{grffile} is now directly supported instead of emulated. +% \item Fix for \pkg{bigdelim}, and improved documentation. +% \margintag{\pkg{bigdelim}} +% See \cref{sec:bigdelim}. +% \item Improved \LaTeX\ and \pkg{textcomp} symbols.\margintag{\pkg{symbols}} +% \item Fix for \LaTeX\ logos and \cs{InlineClass}, etc. inside a \env{lateximage}. +% \margintag{\pkg{fixes}} +% \item Fix for \pkg{xltxtra} with \XeLaTeX. +% \item Fixes for \pkg{tocbibind} with \cs{simplechapter}, etc. +% \item Fixes for \cs{multicolumnrow} and \cs{nullfonts} with older versions +% of \pkg{multirow} and \pkg{xparse}. +% \item Added \cs{underline}. +% \item Added \pkg{adjmulticol}.\margintag{margins} +% \item Added \pkg{cuted}, \pkg{midfloat}.\margintag{columns} +% \item Added \pkg{pfnote}, \pkg{fnpos}, \pkg{dblfnote}.\margintag{footnotes} +% \item Added \pkg{stabular}, \pkg{tabls}.\margintag{tabular} +% \item Added \pkg{sectsty}, \pkg{anonchap}, \pkg{quotchap}.\margintag{sectioning} +% \end{itemize} +% \needspace{2\baselineskip} % \item[v0.39:] \ % \begin{itemize} % \item Improved the titlepage \HTML\ code, \cs{thanks} notes, @@ -1689,8 +1830,10 @@ This boolean may be tested by the user for later use. % See \cref{sec:limitstabular}. % \end{itemize} % \item Added \pkg{supertabular}, \pkg{xtab}, \pkg{bigstrut}, \pkg{bigdelim}. -% \item Added \pkg{fullwidth}. +% \margintag{tabular} +% \item Added \pkg{fullwidth}.\margintag{margins} % \item Added \pkg{addlines}, \pkg{anysize}, \pkg{a4}, \pkg{a4wide}, \pkg{a5comb}, +% \margintag{page layout} % \pkg{textarea}, \pkg{zwpagelayout}, \pkg{typearea}, \pkg{ebook}. % \end{itemize} % \item[v0.38:] \ @@ -1710,10 +1853,11 @@ This boolean may be tested by the user for later use. % and \cs{ForceHTMLTOC} macros. % \item Added \pkg{appendix}, \pkg{tocbibind}, \pkg{fncychap}, \pkg{fix2col}. % \margintag{packages} -% \item Added \pkg{relsize}, \pkg{scalefnt}. +% \item Added \pkg{relsize}, \pkg{scalefnt}.\margintag{font size} % \item Added \pkg{realscripts}, \pkg{metalogo}, \pkg{xltxtra}. % \item Added \pkg{grffile}, \pkg{romanbar}. % \item Added \pkg{arabicfront}, \pkg{chappg}, \pkg{nonumonpart}, \pkg{nopageno}, +% \margintag{page numbering} % \pkg{romanbarpagenumber}. % \item Docs: Improved description of the use of front/back matter. % \margintag{front \& back matter} @@ -1721,6 +1865,7 @@ This boolean may be tested by the user for later use. % \item Fix: \pkg{color} requests \pkg{xcolor}. % \item Fix: \cs{part} for |article| class. % \end{itemize} +% \needspace{2\baselineskip} % \item[v0.37:] \ % \begin{itemize} % \item \cs{include} now maintains independent |.aux| files @@ -1987,7 +2132,7 @@ This boolean may be tested by the user for later use. % ^^A \needspace{2\baselineskip} % ^^A \item[v0.25:] \ % ^^A \begin{itemize} -% ^^A \item Fix: Allows \pkg{graphicx} and \pkg{graphicsx} before \pkg{lwarp} because +% ^^A \item Fix: Allows \pkg{graphicx} and \pkg{graphicx} before \pkg{lwarp} because % ^^A \XeLaTeX\ and \LuaLaTeX\ use \pkg{xunicode} which uses \pkg{graphics}. % ^^A \item Package support for \pkg{framed}, several theorem packages, and ellipses. % ^^A \end{itemize} @@ -2233,7 +2378,8 @@ This boolean may be tested by the user for later use. % 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}. \\ +% Emulates \pkg{titlesec}, \pkg{fncychap}, \pkg{sectsty}, +% \pkg{anonchap}, \pkg{quotchap}. \\ % % Table of contents, figures, tables: & Supported, with hyperlinks. % Supports \pkg{tocbibind}. Emulates \pkg{titletoc} and \pkg{tocloft}. \\ @@ -2283,7 +2429,7 @@ This boolean may be tested by the user for later use. % Floats: & Appear where declared. % \pkg{float}, \pkg{rotfloat}, \pkg{newfloat}, \pkg{caption} and \pkg{subcaption}, % \pkg{subfig}, \pkg{capt-of}, \pkg{placeins}, \pkg{trivfloat}, \pkg{floatrow}, -% \pkg{keyfloat}, \pkg{wrapfig}, \pkg{cutwin}, \pkg{floatflt}. \\ +% \pkg{subfloat}, \pkg{keyfloat}, \pkg{wrapfig}, \pkg{cutwin}, \pkg{floatflt}. \\ % % \midrule % @@ -2301,7 +2447,7 @@ This boolean may be tested by the user for later use. % References to \PDF\ files are changed to \SVG, other image types % are accepted as well. % \cs{rotatebox} and \cs{scalebox} are supported as well as \HTML\ can handle. -% \pkg{grffile} is emulated. \\ +% \pkg{grffile} is supported. \\ % % \pkg{rotating}: & Emulated. All objects are displayed unrotated. \\ % @@ -4402,20 +4548,32 @@ This boolean may be tested by the user for later use. % % \limitsreferences % -% \subsubsection{Page references} The printed page does not translate to the \HTML\ -% page, so references to page numbers are converted to parentheses containing -% \cs{pagerefPageFor}, which defaults to ``see '', +% \subsubsection{Page references} The printed page does not translate +% to the \HTML\ +% \watchout[\LaTeX\ page numbers] +% page, so \cs{pageref} references are converted to parentheses containing +% \cs{pagerefPageFor}, which defaults to ``see~'', % followed by a hyperlink to the appropriate -% object. Ex: ``Sec.~\textcolor{red}{1.23} -% on page (see sec.~\textcolor{red}{1.23})''. +% object. +% +% Ex: +% \begin{sourcedisplay} +% \cs{ref}\{sec:name\} on page \cs{pageref}\{sec:name\} \\ +% \rmfamily +% \hspace*{-2em} in \HTML\ becomes: \\ +% ``Sec.~\textcolor{red}{1.23} +% on page (\textbf{see} +% sec.~\textcolor{red}{1.23})''. +% \end{sourcedisplay} % \cs{pagerefPageFor} may be redefined to ``page for '', empty, etc. +% See \cpageref{sec:pagerefpagefor}. % % % \subsubsection{\pkg{cleveref} and \pkg{varioref} packages} % % \changes{v0.22}{2017/03/01}{\pkg{varioref}: Supported.} % -% \limitspageref +% \limitscpageref % % \subsubsection{Hyperlinks, \pkg{hyperref}, and \pkg{url}} % @@ -4473,6 +4631,7 @@ This boolean may be tested by the user for later use. % For print output, \cs{ForceHTMLTOC} and \cs{ForceHTMLPage} have no effect. % % +% % \subsubsection{\pkg{abstract} package} % % \limitsabstract @@ -4483,6 +4642,12 @@ This boolean may be tested by the user for later use. % \limitstitlepage % % +% \subsubsection{\pkg{tocloft} package} +% +% \DescribeOption[tocloft]{titles} +% \limitstocloft +% +% % \subsubsection{\pkg{appendix} package} % % \limitsappendix @@ -4513,7 +4678,9 @@ This boolean may be tested by the user for later use. % % \limitsindex % -% See \cref{sec:index}. +% See \cref{sec:index} for \pkg{lwarp}'s core index and glossary code, +% and \cref{sec:tocbibind} for \pkg{tocbibind}. +% % % % @@ -4552,6 +4719,7 @@ This boolean may be tested by the user for later use. % % % \subsection{Graphics} +% \label{sec:limitsgraphics} % % \limitsgraphics % @@ -4586,9 +4754,13 @@ This boolean may be tested by the user for later use. % % \limitssupertabular % +% \subsubsection{\pkg{bigdelim} package} % +% \limitsbigdelim +% +% +% \subsection{Floats} % -% % \subsubsection{\pkg{float}, \pkg{trivfloat}, and/or \pkg{algorithmicx} together} % % \limitscombiningfloats @@ -4600,8 +4772,6 @@ This boolean may be tested by the user for later use. % % % -% \subsection{Floats} -% % % \subsubsection{\pkg{subfig} package} % @@ -5034,7 +5204,7 @@ This boolean may be tested by the user for later use. % \item Use |lwarpmk again| followed % by |lwarpmk html| or |lwarpmk print| to compile the document one more time. % \item \limitsreferences -% \item \limitspageref +% \item \limitscpageref % \end{itemize} % % \item [Em-dashes or En-dashes in listing captions and titles:] \ @@ -5838,11 +6008,13 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{a4wide} \LWR@loadafter{a5comb} \LWR@loadafter{abstract} +\LWR@loadafter{adjmulticol} \LWR@loadafter{addlines} \LWR@loadafter{afterpage} \LWR@loadafter{algorithmicx} \LWR@loadafter{alltt} \LWR@loadafter{amsthm} +\LWR@loadafter{anonchap} \LWR@loadafter{anysize} \LWR@loadafter{appendix} \LWR@loadafter{arabicfront} @@ -5861,7 +6033,9 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{chappg} \LWR@loadafter{color} \LWR@loadafter{crop} +\LWR@loadafter{cuted} \LWR@loadafter{cutwin} +\LWR@loadafter{dblfnote} \LWR@loadafter{dcolumn} \LWR@loadafter{draftwatermark} \LWR@loadafter{ebook} @@ -5885,6 +6059,7 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{floatrow} \LWR@loadafter{flushend} \LWR@loadafter{fncychap} +\LWR@loadafter{fnpos} \LWR@loadafter{ftnright} \LWR@loadafter{fullpage} \LWR@loadafter{fullwidth} @@ -5913,6 +6088,7 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{mdframed} \LWR@loadafter{metalogo} \LWR@loadafter{microtype} +\LWR@loadafter{midfloat} \LWR@loadafter{moreverb} \LWR@loadafter{mparhack} %\LWR@loadafter{multicol}% loaded by ltxdoc @@ -5930,8 +6106,10 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{parskip} \LWR@loadafter{pdflscape} \LWR@loadafter{pdfsync} +\LWR@loadafter{pfnote} \LWR@loadafter{placeins} \LWR@loadafter{prelim2e} +\LWR@loadafter{quotchap} \LWR@loadafter{ragged2e} \LWR@loadafter{realscripts} \LWR@loadafter{relsize} @@ -5941,6 +6119,7 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{rotfloat} \LWR@loadafter{savetrees} % \LWR@loadafter{scalefnt}% loaded by babel-french +\LWR@loadafter{sectsty} \LWR@loadafter{setspace} \LWR@loadafter{shadow} \LWR@loadafter{showidx} @@ -5949,8 +6128,10 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{sidenotes} \LWR@loadafter{siunitx} \LWR@loadafter{soul} +\LWR@loadafter{stabular} \LWR@loadafter{subfig} \LWR@loadafter{supertabular} +\LWR@loadafter{tabls} \LWR@loadafter{tabularx} \LWR@loadafter{tabulary} \LWR@loadafter{textarea} @@ -6454,14 +6635,8 @@ top=1in,bottom=1in,% % \end{macrocode} -% \DescribePackage{xfrac} -% -% Patched for \HTML\ use. -% See \cref{sec:xfrac}. -% \begin{macrocode} -\RequirePackage{xfrac} -% \end{macrocode} +% \changes{v0.40}{2017/09/07}{No longer preloads \pkg{xfrac}.} % % Used to convert lengths for image width/height options. @@ -6944,6 +7119,7 @@ top=1in,bottom=1in,% \let\LWR@origsb\sb \let\LWR@origtextsuperscript\textsuperscript \let\LWR@origtextsubscript\textsubscript +\LetLtxMacro\LWR@origunderline\underline \let\LWR@origscriptsize\scriptsize @@ -6968,10 +7144,8 @@ top=1in,bottom=1in,% \LetLtxMacro{\LWR@origdescription}{\description} \LetLtxMacro{\LWR@endorigdescription}{\enddescription} - \let\LWR@origpar\par - \LetLtxMacro{\LWR@origfootnote}{\footnote} \let\LWR@orig@mpfootnotetext\@mpfootnotetext @@ -6986,10 +7160,6 @@ top=1in,bottom=1in,% - - - - % \section{Accents} % % \limitsaccents @@ -7317,6 +7487,10 @@ span.textsf { span.textcircled { border: 1px solid black ; border-radius: 1ex ; } +span.underline { + text-decoration: underline ; + text-decoration-skip ; +} /* For realscripts */ @@ -7341,9 +7515,6 @@ span.textcircled { border: 1px solid black ; border-radius: 1ex ; } top: .5em; } - - - span.attribution { margin-left: 1em ; font-size: 80% ; font-variant: small-caps; } @@ -7361,7 +7532,15 @@ blockquote { margin-right: 0px ; } -blockquote p { +/* quotchap is for the quotchap package */ +div.quotchap { + font-style: oblique ; + overflow-x: auto ; + margin-left: 2em ; + margin-right: 2em ; +} + +blockquote p, div.quotchap p { line-height: 1.5; text-align: left ; font-size: .85em ; @@ -7369,6 +7548,20 @@ blockquote p { margin-right: 3em ; } +/* qauthor is for the quotchap package */ +div.qauthor { + display: block ; + text-align: right ; + margin-left: auto ; + margin-right: 2em ; + font-size: 80% ; + font-variant: small-caps; +} + +div.qauthor p { + text-align: right ; +} + blockquotation { margin-left: 0px ; margin-right: 0px ; @@ -9201,7 +9394,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.39" +printversion = "v0.40" function printhelp () print ("lwarpmk: Use lwarpmk -h or lwarpmk --help for help.") ; @@ -10533,8 +10726,8 @@ end -- not --version % a paragraph to start if the span is at the beginning of a new paragraph. % % |\end{LWR@nestspan}| must follow the \element{/span} or a \element{p} may appear -% inside the span. % \watchout +% inside the span. % % \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.} @@ -10560,7 +10753,7 @@ end -- not --version \renewcommand{\BlockClassSingle}[2]{##2}% \renewcommand{\LWR@forcenewpage}{}% \renewcommand{\LWR@itemizestart}{% - \let\item\LWR@nestspanitem% + \let\item\LWR@nestspanitem% }% \renewcommand{\LWR@itemizeend}{}% \renewcommand{\LWR@enumeratestart}{% @@ -10572,8 +10765,8 @@ end -- not --version }% \renewcommand{\LWR@descriptionend}{}% }% not in a lateximage -}% -{% +}% starting env +{% ending env \ifthenelse{\cnttest{\value{LWR@lateximagedepth}}{>}{0}}% {}% {\addtocounter{LWR@spandepth}{-1}}% @@ -10612,11 +10805,13 @@ end -- not --version % % \begin{macrocode} \NewDocumentCommand{\LWR@htmlspanclass}{o m +m}{% +\LWR@traceinfo{LWR@htmlspanclass #2}% \LWR@ensuredoingapar% \LWR@subhtmlelementclass{span}[#1]{#2}% \begin{LWR@nestspan}% #3% \LWR@htmltagc{/span}% +\LWR@traceinfo{LWR@htmlspanclass done}% \end{LWR@nestspan}% } % \end{macrocode} @@ -10723,13 +10918,15 @@ end -- not --version % % \begin{macrocode} \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 + {\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 +{\LWR@htmltag{#1 class="#3"}}% no option +\LWR@traceinfo{LWR@subhtmlelementclass done}% } % \end{macrocode} % \end{macro} @@ -10838,10 +11035,12 @@ end -- not --version % These are high-level commands which allow the creation of % arbitrary block or inline % sections which may be formatted with \CSS. - +% +% Nullified versions are provided for print mode. +% % For other direct-formatting commands, see \cref{sec:directformatting}. - - +% +% % \begin{environment}{BlockClass} \oarg{style} \marg{class} \quad % High-level interface for \element{div} classes. % @@ -12267,7 +12466,7 @@ end -- not --version % \end{macrocode} % % -% \begin{macro}{\@seccntformat} +% \begin{macro}{\@seccntformat} \marg{sectiontype} % \changes{v0.38}{2017/08/21}{Added for \pkg{appendix}.} % % \begin{macrocode} @@ -12276,6 +12475,30 @@ end -- not --version % \end{macro} % % +% \begin{macro}{\simplechapterdelim} Used by \pkg{tocbibind} and \pkg{anonchap}. +% \changes{v0.40}{2017/09/12}{Added for \pkg{tocbibind}, \pkg{anonchap}.} +% +% \begin{macrocode} +\newcommand*{\simplechapterdelim}{} +% \end{macrocode} +% \end{macro} +% +% +% \begin{macro}{\@chapcntformat} \marg{sectiontype} +% +% \cs{let} to \cs{@seccntformat} by default, but may be redefined +% by \cs{simplechapter} and \cs{restorechapter} from \pkg{tocbibind} or +% \pkg{anonchap}. +% +% \changes{v0.40}{2017/09/12}{Added for \pkg{tocbibind}, \pkg{anonchap}.} +% +% \begin{macrocode} +\let\@chapcntformat\@seccntformat +% \end{macrocode} +% \end{macro} +% +% +% % \begin{macro}{\LWR@section} * \oarg{TOC name} \marg{name} \marg{sectiontype} % % \changes{v0.20}{2017/01/09}{Combined higher-level sections together into files.} @@ -12360,10 +12583,10 @@ end -- not --version % \end{macrocode} % Remember this section's name for \cs{nameref}: % \begin{macrocode} -\IfValueTF{#3}{% +\IfValueT{#3}{% \LWR@traceinfo{LWR@section: about to LWR@setlatestname}% \IfValueTF{#2}{\LWR@setlatestname{#2}}{\LWR@setlatestname{#3}}% -}{}% +}% % \end{macrocode} % Print an opening comment with the level and the name; % ex: ``section'' ``Introduction'' @@ -12462,7 +12685,11 @@ end -- not --version \ifthenelse{% \cnttest{\csuse{LWR@depth#4}}{<=}{\value{secnumdepth}}% }% - {\protect\LWR@sectionnumber{\@seccntformat{#4}}}% + {% + \ifstrequal{#4}{chapter}% + {\protect\LWR@sectionnumber{\@chapcntformat{#4}}}% + {\protect\LWR@sectionnumber{\@seccntformat{#4}}}% + }% {}% \LWR@traceinfo{LWR@section: finished print section number}% }{}% @@ -12549,7 +12776,10 @@ end -- not --version % \begin{macro}{\chapter} * \oarg{TOC name} \marg{name} % % \changes{v0.28}{2017/04/06}{If \EPUB, prints footnotes before each section.} +% \changes{v0.40}{2017/09/22}{Added support for \pkg{quotchap}.} % \begin{macrocode} +\let\@printcites\relax% for quotchap package + \@ifundefined{chapter} {} {% @@ -12561,6 +12791,7 @@ end -- not --version \LWR@startnewdepth{\LWR@depthchapter}{\LWR@printclosechapter}% \LWR@section{#1}{#2}{#3}{chapter}% +\@printcites% for quotchap package } } % \end{macrocode} @@ -12928,12 +13159,6 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \let\XeLaTeX\LWR@XeLaTeX \let\ConTeXt\LWR@ConTeXt % \end{macrocode} -% Graphics: -% \begin{macrocode} -\LetLtxMacro{\rotatebox}{\LWR@rotatebox} -\LetLtxMacro{\scalebox}{\LWR@scalebox} -\let\reflectbox\LWR@reflectbox -% \end{macrocode} % Not yet started any paragraph handling: % \begin{macrocode} \global\boolfalse{LWR@doingapar} @@ -15504,7 +15729,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% % \end{macrocode} % % \begin{macrocode} -\IfValueTF{#2}{ % rows? +\IfValueT{#2}{ % rows? rowspan="#2" % % \end{macrocode} % @@ -15513,7 +15738,7 @@ rowspan="#2" % \ifstrequal{#1}{b}{style="vertical-align:bottom" }{}% \ifstrequal{#1}{t}{style="vertical-align:top" }{}% }% vpos? -}{}% rows? +}% rows? % \end{macrocode} % % \begin{macrocode} @@ -15808,13 +16033,59 @@ rowspan="#2" % % problem-with-abbreviation-of-multirow-and-multicolumn-latex} % % \changes{v0.39}{2017/08/31}{Added.} +% \changes{v0.40}{2017/09/22}{Fix: Adapts to older \pkg{multirow} and \pkg{xparse}.} +% +% After the user may have +% \begin{macrocode} +\AtBeginDocument{ +% \end{macrocode} +% +% |\@ifundefined{@xmultirow}| determines if \pkg{multirow} was never loaded. % % \begin{macrocode} -\DeclareExpandableDocumentCommand{\LWR@origmulticolumnrow}{m m O{c} m O{0} m O{0pt} +m}{% -\multicolumn{#1}{#2}{\@xmultirow[#3]{#4}[#5]{#6}[#7]{#8}} +\@ifundefined{@xmultirow} +{}% no version of multirow was loaded +{% \@xmultirow defined, so some version of multirow was loaded +% \end{macrocode} +% +% |\@ifpackageloaded{multirow}| determines if v2.0 or later of +% \pkg{multirow} was used, which included the \cs{ProvidesPackage} macro. +% +% \begin{macrocode} +\@ifpackageloaded{multirow}{% v2.0 or newer +\@ifpackagelater{multirow}{2016/09/01}% 2016/09/27 for v2.0 +{% v2.0+: +\DeclareExpandableDocumentCommand{\LWR@origmulticolumnrow}% + {+m +m +O{c} +m +O{0} +m +O{0pt} +m}% +{\multicolumn{#1}{#2}{\@xmultirow[#3]{#4}[#5]{#6}[#7]{#8}}}% } - -\newcommand*{\multicolumnrow}{\LWR@origmulticolumnrow} +{% loaded but older, probably not executed: +\DeclareExpandableDocumentCommand{\LWR@origmulticolumnrow}% + {+m +m +O{c} +m +O{0} +m +O{0pt} +m}% +{\multicolumn{#1}{#2}{\@xmultirow{#4}[#5]{#6}[#7]{#8}}}% +} +}% packageloaded{multirow} +% \end{macrocode} +% +% If not |\@ifpackageloaded{multirow}| but \cs{@xmultirow} is defined, +% then this must be v1.6 or earlier, which did not |\ProvidesPackage{multirow}|, +% and did not have the |vposn| option. +% +% \begin{macrocode} +{% v1.6 or older did not \ProvidePackage +\DeclareExpandableDocumentCommand{\LWR@origmulticolumnrow}% + {+m +m +O{c} +m +O{0} +m +O{0pt} +m}% +{\multicolumn{#1}{#2}{\@xmultirow{#4}[#5]{#6}[#7]{#8}}}% +} +% \end{macrocode} +% +% The user-level interface. This is provided if the \HTML\ version was +% not already given. +% +% \begin{macrocode} +\providecommand*{\multicolumnrow}{\LWR@origmulticolumnrow} +}% \@xmultirow defined, so multirow was loaded +}% AtBeginDocument % \end{macrocode} % \end{macro} % @@ -15836,6 +16107,12 @@ rowspan="#2" % \newcommand*{\LWR@domidrule}{\booltrue{LWR@doinghline}} \newcommand*{\LWR@dotbrule}{\booltrue{LWR@doingtbrule}} % \end{macrocode} +% +% In case \pkg{bigdelim} is not loaded: +% \begin{macrocode} +\newcommand*{\ldelim}{} +\newcommand*{\rdelim}{} +% \end{macrocode} % \begin{macrocode} \end{warpHTML} @@ -15923,6 +16200,7 @@ rowspan="#2" % % % \changes{v0.34}{2017/08/08}{\pkg{booktabs}: Works inside \env{lateximage}.} % \changes{v0.39}{2017/08/29}{Don't start a data cell if see \cs{TabularMacro}.} +% \changes{v0.40}{2017/09/09}{Fix for \pkg{bigdelim}: \cs{ldelim}, \cs{rdelim}.} % % \begin{macrocode} \newbool{LWR@exitingtabular} @@ -15940,57 +16218,63 @@ rowspan="#2" % % \end{macrocode} % If exiting the tabular: % \begin{macrocode} -\ifthenelse{\isequivalentto{\LWR@mynexttoken}{\end}}% -{\booltrue{LWR@exitingtabular}}{}% +\ifdefequal{\LWR@mynexttoken}{\end}% + {\booltrue{LWR@exitingtabular}}{}% % \end{macrocode} % \env{longtable} can have a caption in a cell % \begin{macrocode} -\ifthenelse{\isequivalentto{\LWR@mynexttoken}{\caption}}% -{\let\mynext\LWR@donothing}{}% +\ifdefequal{\LWR@mynexttoken}{\caption}% + {\let\mynext\LWR@donothing}{}% % \end{macrocode} % Look for other things which would not start a table cell: % \begin{macrocode} -\ifthenelse{\isequivalentto{\LWR@mynexttoken}{\multicolumn}}% -{\let\mynext\LWR@donothing}{}% -\ifthenelse{\isequivalentto{\LWR@mynexttoken}{\multirow}}% -{\let\mynext\LWR@donothing}{}% -\ifthenelse{\isequivalentto{\LWR@mynexttoken}{\multicolumnrow}}% -{\let\mynext\LWR@donothing}{}% +\ifdefequal{\LWR@mynexttoken}{\multicolumn}% + {\let\mynext\LWR@donothing}{}% +\ifdefequal{\LWR@mynexttoken}{\multirow}% + {\let\mynext\LWR@donothing}{}% +\ifdefequal{\LWR@mynexttoken}{\multicolumnrow}% + {\let\mynext\LWR@donothing}{}% % \end{macrocode} % if come to an |\mrowcell|, this is a cell to be skipped over % \begin{macrocode} -\ifthenelse{\isequivalentto{\LWR@mynexttoken}{\mrowcell}}% -{\let\mynext\LWR@donothing}{}% +\ifdefequal{\LWR@mynexttoken}{\mrowcell}% + {\let\mynext\LWR@donothing}{}% +% +\ifdefequal{\LWR@mynexttoken}{\TabularMacro}% + {\let\mynext\LWR@donothing}{}% +% +\ifdefequal{\LWR@mynexttoken}{\hline}% + {\let\mynext\LWR@donothing}{}% % -\ifthenelse{\isequivalentto{\LWR@mynexttoken}{\TabularMacro}}% -{\let\mynext\LWR@donothing}{}% +\ifdefequal{\LWR@mynexttoken}{\toprule}% + {\let\mynext\LWR@donothing}{}% % -\ifthenelse{\isequivalentto{\LWR@mynexttoken}{\hline}}% -{\let\mynext\LWR@donothing}{}% +\ifdefequal{\LWR@mynexttoken}{\midrule}% + {\let\mynext\LWR@donothing}{}% % -\ifthenelse{\isequivalentto{\LWR@mynexttoken}{\toprule}}% -{\let\mynext\LWR@donothing}{}% +\ifdefequal{\LWR@mynexttoken}{\cmidrule}% + {\let\mynext\LWR@donothing}{}% % -\ifthenelse{\isequivalentto{\LWR@mynexttoken}{\midrule}}% -{\let\mynext\LWR@donothing}{}% +\ifdefequal{\LWR@mynexttoken}{\specialrule}% + {\let\mynext\LWR@donothing}{}% % -\ifthenelse{\isequivalentto{\LWR@mynexttoken}{\cmidrule}}% -{\let\mynext\LWR@donothing}{}% +\ifdefequal{\LWR@mynexttoken}{\cline}% + {\let\mynext\LWR@donothing}{}% % -\ifthenelse{\isequivalentto{\LWR@mynexttoken}{\specialrule}}% -{\let\mynext\LWR@donothing}{}% +\ifdefequal{\LWR@mynexttoken}{\bottomrule}% + {\let\mynext\LWR@donothing}{}% % -\ifthenelse{\isequivalentto{\LWR@mynexttoken}{\cline}}% -{\let\mynext\LWR@donothing}{}% +\ifdefequal{\LWR@mynexttoken}{\warpprintonly}% + {\let\mynext\LWR@donothing}{}% % -\ifthenelse{\isequivalentto{\LWR@mynexttoken}{\bottomrule}}% -{\let\mynext\LWR@donothing}{}% +\ifdefequal{\LWR@mynexttoken}{\warpHTMLonly}% + {\let\mynext\LWR@donothing}{}% % -\ifthenelse{\isequivalentto{\LWR@mynexttoken}{\warpprintonly}} -{\let\mynext\LWR@donothing}{}% +\ifdefequal{\LWR@mynexttoken}{\ldelim}% + {\let\mynext\LWR@donothing}{}% % -\ifthenelse{\isequivalentto{\LWR@mynexttoken}{\warpHTMLonly}} -{\let\mynext\LWR@donothing}{}% +\ifdefequal{\LWR@mynexttoken}{\rdelim}% + {\let\mynext\LWR@donothing}{}% % \end{macrocode} % no action for an |\end| token % @@ -16049,6 +16333,23 @@ rowspan="#2" % % \end{macrocode} % % +% \begin{macro}{\LWR@hline} +% The definition of \cs{hline} depends on whether \pkg{tabls} has been loaded. +% If so, optional space below the line may be specified, but will be ignored. +% +% \changes{v0.40}{2017/09/06}{Added.} +% +% \begin{macrocode} +\AtBeginDocument{ +\@ifpackageloaded{lwarp-tabls} +{\newcommand*{\LWR@hline}[1][]{\LWR@domidrule\LWR@getmynexttoken}} +{\newcommand*{\LWR@hline}{\LWR@domidrule\LWR@getmynexttoken}} +}% AtBeginDocument +% \end{macrocode} +% \end{macro} +% +% +% % \begin{environment}{LWR@tabular} \oarg{vertposition} \marg{colspecs} % % The new tabular environment will be |\let| in |\LWR@LwarpStart|, @@ -16116,10 +16417,12 @@ rowspan="#2" % % The following may appear before a data cell is created, % so after doing their actions, we look ahead with |\LWR@getmynextoken| % to see if the next token might create a new data cell: +% +% The optional parameter for \cs{hline} supports the \pkg{tabls} package. % \begin{macrocode} \LWR@traceinfo{LWR@tabular: redefining macros}% -\renewcommand*{\hline}{\LWR@domidrule\LWR@getmynexttoken}% - +\renewcommand*{\hline}{\LWR@hline}% +% \RenewDocumentCommand{\cline}{m}% {\LWR@docmidrule{##1}\LWR@getmynexttoken}% @@ -16598,7 +16901,8 @@ rowspan="#2" % % \end{macro} -% \begin{macro}{\pagerefPageFor} Text for starred page references. +% \label{sec:pagerefpagefor} +% \begin{macro}{\pagerefPageFor} Text for page references. % % \begin{macrocode} \newcommand*{\pagerefPageFor}{see } @@ -17957,13 +18261,22 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}% % \changes{v0.34}{2017/08/08}{\pkg{booktabs}: Works inside \env{lateximage}.} % \changes{v0.36}{2017/08/16}{\pkg{siunitx}: Improved super/subscripts in a \env{lateximage}.} % \changes{v0.39}{2017/09/01}{Appended with \cs{appto} instead of calling various macros.} +% \changes{v0.40}{2017/09/09}{Improved symbols inside a \env{lateximage}.} +% \changes{v0.40}{2017/09/09}{Improved \protect\LaTeX\ logos inside a \env{lateximage}.} +% \changes{v0.40}{2017/09/09}{Nullified \cs{InlineClass}, etc. inside a \env{lateximage}.} % % \begin{macrocode} \newcommand*{\LWR@restoreorigformatting}{% \LWR@traceinfo{LWR@restoreorigformatting}% +\RenewDocumentCommand{\InlineClass}{o m +m}{##3}% +\RenewDocumentEnvironment{BlockClass}{o m}{}{}% +\renewcommand{\BlockClassSingle}[2]{##2}% \LetLtxMacro{\hspace}{\LWR@orighspace}% \LetLtxMacro\rule\LWR@origrule% \let\,\LWR@origcomma% disable HTML short unbreakable space +\let\textellipsis\LWR@origtextellipsis% +\let\textless\LWR@origtextless% +\let\textgreater\LWR@origtextgreater% \LetLtxMacro{\textrm}{\LWR@origtextrm}% \LetLtxMacro{\textsf}{\LWR@origtextsf}% \LetLtxMacro{\texttt}{\LWR@origtexttt}% @@ -17990,6 +18303,7 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}% \let\sb\LWR@origsb% \let\textsuperscript\LWR@origtextsuperscript% \let\textsubscript\LWR@origtextsubscript% +\LetLtxMacro\underline\LWR@origunderline% \let~\LWR@origtilde% \let\enskip\LWR@origenskip% \let\quad\LWR@origquad% @@ -18005,9 +18319,11 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}% \LetLtxMacro\specialrule\LWR@origspecialrule% \let\newline\LWR@orignewline% \LetLtxMacro{\raisebox}{\LWR@origraisebox}% +\LetLtxMacro\includegraphics\LWR@origincludegraphics% \LetLtxMacro{\scalebox}{\LWR@origscalebox}% \LetLtxMacro{\rotatebox}{\LWR@origrotatebox}% \let\reflectbox\LWR@origreflectbox% +\LetLtxMacro\resizebox\LWR@origresizebox% \let\framebox\LWR@origframebox% \let\makebox\LWR@origmakebox% \let\fbox\LWRprint@fbox% @@ -18017,6 +18333,10 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}% \LetLtxMacro{\minipage}{\LWR@origminipage}% \let\endminipage\LWR@endminipage% \LetLtxMacro{\parbox}{\LWR@origparbox}% +\let\TeX\LWR@origTeX% +\let\LaTeX\LWR@origLaTeX% +\let\LaTeXe\LWR@origLaTeXe% +\renewcommand*{\Xe}{X\textsubscript{E}}% % \LWR@restoreorigaccents% % @@ -19062,7 +19382,7 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}% -% \section{Textcomp} +% \section{Pre-loaded packages} % % \codehtml % \begin{macrocode} @@ -19081,6 +19401,16 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}% {} % \end{macrocode} +% If \pkg{graphics} or \pkg{graphicx} were loaded before \pkg{lwarp}, +% perhaps by \pkg{xunicode}, explicitly load the lwarp patches now: +% \begin{macrocode} +\@ifpackageloaded{graphics} +{ +\LWR@origRequirePackage{lwarp-graphics} +} +{} +% \end{macrocode} + % \begin{macrocode} \end{warpHTML} % \end{macrocode} @@ -19135,425 +19465,6 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}% % % \limitsgraphics % -% \codehtml -% \begin{macrocode} -\begin{warpHTML} -% \end{macrocode} - - - -% \subsection{\cs{graphicspath}} - -% \begin{macro}{\graphicspath} \marg{path} -% \begin{macrocode} -\newcommand*{\thisgraphicspath}{{}} -\renewcommand*{\graphicspath}[1]{\renewcommand*{\thisgraphicspath}{#1}} -% \end{macrocode} -% \end{macro} - -% ^^A \begin{Verbatim}[gobble=2,frame=lines,obeytabs,tabsize=4] -% ^^A \DeclareGraphicsExtensions{.svg,.gif,.png,.jpg} -% ^^A \DeclareGraphicsRule{.svg}{svg}{.png}{} -% ^^A \end{Verbatim} - -% \begin{macro}{\DeclareGraphicsExtensions} \marg{list} -% \begin{macro}{\DeclareGraphicsRule} \marg{} \marg{} \marg{} \marg{} -% \begin{macrocode} -\renewcommand*{\DeclareGraphicsExtensions}[1]{} -\renewcommand*{\DeclareGraphicsRule}[4]{} -% \end{macrocode} -% \end{macro} -% \end{macro} - - -% \subsection{Length conversions and graphics options} -% -% A scaled image in \LaTeX{} by default takes only as much space -% on the page as it -% requires, but \HTML\ browsers use as much space as the -% \watchout[whitespace] -% original unscaled image would have taken, -% with the scaled image over- or under-flowing the area. - -% \begin{macrocode} -\renewcommand*{\unitspace}{} -% \end{macrocode} - -% Used to store the user's selected dimensions and \HTML\ class. -% -% The class defaults to ``inlineimage'' unless changed by a |class=xyx| option. -% \begin{macrocode} -\newlength{\LWR@igwidth} -\newlength{\LWR@igheight} -\newcommand*{\LWR@igwidthstyle}{} -\newcommand*{\LWR@igheightstyle}{} -\newcommand*{\LWR@igorigin}{} -\newcommand*{\LWR@igangle}{} -\newcommand*{\LWR@igxscale}{1} -\newcommand*{\LWR@igyscale}{1} -\newcommand*{\LWR@igclass}{inlineimage} -% \end{macrocode} - -% Set the actions of each of the key/value combinations for -% \cs{includegraphics}. Many are ignored. -% -% If an optional width was given, set an \HTML\ style: -% \begin{macrocode} -\define@key{igraph}{width}{% -\setlength{\LWR@igwidth}{#1}% -\ifthenelse{\lengthtest{\LWR@igwidth > 0pt}}% -{% -% \end{macrocode} -% Default to use the converted fixed length given: -% \begin{macrocode} - \uselengthunit{PT}% - \renewcommand*{\LWR@igwidthstyle}{width:\rndprintlength{\LWR@igwidth}}% -% \end{macrocode} -% If ex or em dimensions were given, use those instead: -% \begin{macrocode} - \IfEndWith{#1}{ex}% - {\renewcommand*{\LWR@igwidthstyle}{width:#1}}% yes ex - {}% not ex - \IfEndWith{#1}{em}% - {\renewcommand*{\LWR@igwidthstyle}{width:#1}}% yes em - {}% not em - \IfEndWith{#1}{\%}% - {\renewcommand*{\LWR@igwidthstyle}{width:#1}}% yes percent - {}% not percent - \IfEndWith{#1}{px}% - {\renewcommand*{\LWR@igwidthstyle}{width:#1}}% yes px - {}% not px -}{}% end of length > 0pt -} -% \end{macrocode} -% -% If an optional height was given, set an \HTML\ style: -% \begin{macrocode} -\define@key{igraph}{height}{% -\setlength{\LWR@igheight}{#1}% -\ifthenelse{\lengthtest{\LWR@igheight > 0pt}}% -{% -% \end{macrocode} -% Default to use the converted fixed length given: -% \begin{macrocode} - \uselengthunit{PT}% - \renewcommand*{\LWR@igheightstyle}{% - height:\rndprintlength{\LWR@igheight} % - }% -% \end{macrocode} -% If ex or em dimensions were given, use those instead: -% \begin{macrocode} - \IfEndWith{#1}{ex}% - {\renewcommand*{\LWR@igheightstyle}{height:#1}}% yes ex - {}% not ex - \IfEndWith{#1}{em}% - {\renewcommand*{\LWR@igheightstyle}{height:#1}}% yes em - {}% not em - \IfEndWith{#1}{\%}% - {\renewcommand*{\LWR@igheightstyle}{height:#1}}% yes percent - {}% not percent - \IfEndWith{#1}{px}% - {\renewcommand*{\LWR@igheightstyle}{height:#1}}% yes px - {}% not px -}{}% end of length > 0pt -} -% \end{macrocode} -% -% -% Handle origin key: -% \begin{macrocode} -\define@key{igraph}{origin}{% -\renewcommand*{\LWR@igorigin}{#1}% -} -% \end{macrocode} -% -% -% Handle angle key: -% \begin{macrocode} -\define@key{igraph}{angle}{\renewcommand*{\LWR@igangle}{#1}} -% \end{macrocode} -% -% -% Handle class key: -% \begin{macrocode} -\define@key{igraph}{class}{\renewcommand*{\LWR@igclass}{#1}} - -% \end{macrocode} -% ^^A \define@key{igraph}{xscale}{\renewcommand*{\LWR@igxscale}{#1}} -% ^^A \define@key{igraph}{yscale}{\renewcommand*{\LWR@igyscale}{#1}} -% It appears that \pkg{graphicx} does not have separate keys for -% |xscale| and |yscale|. |scale| adjusts both at the same time. -% \begin{macrocode} -\define@key{igraph}{scale}{% -\renewcommand*{\LWR@igxscale}{#1}% -\renewcommand*{\LWR@igyscale}{#1}} -% \end{macrocode} -% -% Numerous ignored keys: -% \begin{macrocode} -\define@key{igraph}{bb}{} -\define@key{igraph}{bbllx}{} -\define@key{igraph}{bblly}{} -\define@key{igraph}{bburx}{} -\define@key{igraph}{bbury}{} -\define@key{igraph}{natwidth}{} -\define@key{igraph}{natheight}{} -\define@key{igraph}{hiresbb}{} -\define@key{igraph}{viewport}{} -\define@key{igraph}{trim}{} -\define@key{igraph}{totalheight}{} -\define@key{igraph}{keepaspectratio}{} -\define@key{igraph}{clip}{} -\define@key{igraph}{draft}{} -\define@key{igraph}{type}{} -\define@key{igraph}{ext}{} -\define@key{igraph}{read}{} -\define@key{igraph}{command}{} -% \end{macrocode} - - -% \begin{macro}{\LWR@rotstyle} \marg{prefix} \marg{degrees} -% -% Prints the rotate style with the given prefix. -% -% |prefix| is |-ms-| or |-webkit-| or nothing, and is used to generate -% three versions of the |transform:rotate| style. -% \begin{macrocode} -\newcommand*{\LWR@rotstyle}[2]{% - #1transform:rotate(-#2deg); -} -% \end{macrocode} -% \end{macro} - - -% \begin{macro}{\LWR@scalestyle} \marg{prefix} \marg{xscale} \marg{yscale} -% -% Prints the scale style with the given prefix. -% -% |prefix| is |-ms-| or |-webkit-| or nothing, and is used to generate -% three versions of the |transform:scale| style. -% \begin{macrocode} -\newcommand*{\LWR@scalestyle}[3]{% - #1transform:scale(#2,#3); -} -% \end{macrocode} -% \end{macro} - - - - -% \subsection{\cs{includegraphics}} - -% \DescribeBoolean{LWR@infloatrow} -% Used to compute \cs{linewidth}. -% \begin{macrocode} -\newbool{LWR@infloatrow} -\boolfalse{LWR@infloatrow} -% \end{macrocode} - -% \cs{LWR@opacity} may be set by the \pkg{transparent} package. -% For \HTML\ it is only used for \cs{includegraphics}. -% \begin{macrocode} -\def\LWR@opacity{1} -% \end{macrocode} - - -% \begin{macrocode} -\newcommand*{\LWR@imageextension}{} -\newcommand*{\LWR@expgraphicsfilename}{} -% \end{macrocode} - -% \begin{macro}{\LWR@includegraphicsb} * \oarg{2: options} \oarg{3: options} \marg{4: filename} -% -% \pkg{graphics} syntax is \cs{includegraphics} * \oarg{llx,lly} \oarg{urx,ury} \marg{file} -% -% \pkg{graphicx} syntax is \cs{includegraphics} \oarg{key values} \marg{file} -% -% If |#3| is empty, only one optional argument was given, thus \pkg{graphicx} syntax. -% -% \changes{v0.18}{2016/04/14}{Improved \HTML\ output linebreaks.} -% \changes{v0.18}{2016/05/17}{Fix: \cs{linewidth}, \cs{textwidth}, \cs{textheight} -% inside a minipage.} -% \changes{v0.18}{2016/05/17}{em, ex, \%, px dimensions preserved.} -% \changes{v0.18}{2016/05/17}{Add: svgz file extension.} -% \changes{v0.20}{2016/08/20}{Fix: \cs{linewidth} in a floatrow.} -% \changes{v0.20}{2017/01/12}{Fix: Expands filename.} -% \changes{v0.28}{2017/04/12}{Adapts to \pkg{graphics} syntax.} -% \changes{v0.29}{2017/04/15}{Fix: Error when no optional arguments.} -% \begin{macrocode} -\NewDocumentCommand{\LWR@includegraphicsb}{s o o m} -{% -% \end{macrocode} -% Start the image tag on a new line, allow \PDF\ output word wrap: -% \begin{macrocode} -\LWR@origtilde \LWR@orignewline% -% \end{macrocode} -% Temporarily compute |\linewidth|, |\textwidth|, |\textheight| arguments with a 6x9 inch size -% until the next |\endgroup|. -% \begin{macrocode} -\ifthenelse{\cnttest{\value{LWR@minipagedepth}}{=}{0}}% -{% - \ifbool{LWR@infloatrow}% - {} - {% not in a minipage or a floatrow: - \setlength{\linewidth}{6in}% - \setlength{\textwidth}{6in}% - \setlength{\textheight}{9in}% - }% -}{}% -% \end{macrocode} -% See if can find the image by adding an extension: -% -% Preference is |svgz|, then |svg|, |gif|, |png|, and |jpg|. -% -% |\detokenize\expandafter| allows underscore characters in filenames. -% -% \begin{macrocode} -\edef\LWR@expgraphicsfilename{#4} -\renewcommand*{\LWR@imageextension}{}% -\IfFileExists{\detokenize\expandafter\thisgraphicspath\LWR@expgraphicsfilename.jpg}% -{\renewcommand*{\LWR@imageextension}{.jpg}}{}% -\IfFileExists{\detokenize\expandafter\thisgraphicspath\LWR@expgraphicsfilename.JPG}% -{\renewcommand*{\LWR@imageextension}{.JPG}}{}% -\IfFileExists{\detokenize\expandafter\thisgraphicspath\LWR@expgraphicsfilename.png}% -{\renewcommand*{\LWR@imageextension}{.png}}{}% -\IfFileExists{\detokenize\expandafter\thisgraphicspath\LWR@expgraphicsfilename.PNG}% -{\renewcommand*{\LWR@imageextension}{.PNG}}{}% -\IfFileExists{\detokenize\expandafter\thisgraphicspath\LWR@expgraphicsfilename.gif}% -{\renewcommand*{\LWR@imageextension}{.gif}}{}% -\IfFileExists{\detokenize\expandafter\thisgraphicspath\LWR@expgraphicsfilename.GIF}% -{\renewcommand*{\LWR@imageextension}{.GIF}}{}% -\IfFileExists{\detokenize\expandafter\thisgraphicspath\LWR@expgraphicsfilename.svg}% -{\renewcommand*{\LWR@imageextension}{.svg}}{}% -\IfFileExists{\detokenize\expandafter\thisgraphicspath\LWR@expgraphicsfilename.SVG}% -{\renewcommand*{\LWR@imageextension}{.SVG}}{}% -\IfFileExists{\detokenize\expandafter\thisgraphicspath\LWR@expgraphicsfilename.svgz}% -{\renewcommand*{\LWR@imageextension}{.svgz}}{}% -\IfFileExists{\detokenize\expandafter\thisgraphicspath\LWR@expgraphicsfilename.SVGZ}% -{\renewcommand*{\LWR@imageextension}{.SVGZ}}{}% -% \end{macrocode} -% -% Convert a \PDF\ extension to \SVG, leave the result in |\LWR@strresult|: -% -% Must also |\detokenize| |.pdf| and |.svg| comparison strings. -% \begin{macrocode} -\StrSubstitute{\detokenize\expandafter{\LWR@expgraphicsfilename}}% -{\detokenize{.pdf}}{\detokenize{.svg}}[\LWR@strresult]% -% -\StrSubstitute{\LWR@strresult}% -{\detokenize{.PDF}}{\detokenize{.SVG}}[\LWR@strresult]% -% \end{macrocode} -% For correct em sizing during the width and height conversions: -% \begin{macrocode} -\large% -% \end{macrocode} -% Reset some defaults, possibly will be changed below if options were given: -% \begin{macrocode} -\setlength{\LWR@igwidth}{0pt}% -\setlength{\LWR@igheight}{0pt}% -\renewcommand*{\LWR@igwidthstyle}{}% -\renewcommand*{\LWR@igheightstyle}{}% -\renewcommand*{\LWR@igorigin}{}% -\renewcommand*{\LWR@igangle}{}% -\renewcommand*{\LWR@igxscale}{1}% -\renewcommand*{\LWR@igyscale}{1}% -\renewcommand*{\LWR@igclass}{inlineimage}% -% \end{macrocode} -% -% If |#3| is empty, only one optional argument was given, thus \pkg{graphicx} syntax: -% \begin{macrocode} -\IfValueTF{#3}{}{% -\IfValueTF{#2}% -{\setkeys{igraph}{#2}}% -{\setkeys{igraph}{}}% -}% -% \end{macrocode} -% Create the \HTML\ reference with the graphicspath, filename, extension, -% alt tag, style, and class. -% -% The \cs{LWR@origtilde} adds space between tags in case this -% is being done inside a \cs{savebox} where \cs{newline} has no effect. -% \begin{macrocode} -\href{\thisgraphicspath\LWR@strresult\LWR@imageextension}% -{% start of href -\LWR@htmltag{% start of image tags -img src="\thisgraphicspath\LWR@strresult\LWR@imageextension" \LWR@orignewline -\LWR@origtilde{} alt="\LWR@strresult" \LWR@orignewline -% \end{macrocode} -% Only include a style tag if a width, height, angle, or scale was given: -% \begin{macrocode} -\ifthenelse{ - \NOT\equal{\LWR@igwidthstyle}{} \OR - \NOT\equal{\LWR@igheightstyle}{} \OR - \NOT\equal{\LWR@igorigin}{} \OR - \NOT\equal{\LWR@igangle}{} \OR - \NOT\equal{\LWR@igxscale}{1} \OR - \NOT\equal{\LWR@igyscale}{1} -}% -{\LWR@origtilde{} style="% -\ifthenelse{\NOT\equal{\LWR@igwidthstyle}{}}% -{\LWR@igwidthstyle;}{}% -\ifthenelse{\NOT\equal{\LWR@igheightstyle}{}}% -{\LWR@igheightstyle;}{}% -\ifthenelse{\NOT\equal{\LWR@igorigin}{}}% -{\LWR@origtilde{} transform-origin: \LWR@originnames{\LWR@igorigin}; \LWR@orignewline}{}% -\ifthenelse{\NOT\equal{\LWR@igangle}{}}% -{% -\LWR@rotstyle{-ms-}{\LWR@igangle}% -\LWR@rotstyle{-webkit-}{\LWR@igangle}% -\LWR@rotstyle{}{\LWR@igangle% -}}{}% -\ifthenelse{\NOT\equal{\LWR@igxscale}{1}\OR% -\NOT\equal{\LWR@igyscale}{1}}% -{\LWR@scalestyle{-ms-}{\LWR@igxscale}{\LWR@igyscale}% -\LWR@scalestyle{-webkit-}{\LWR@igxscale}{\LWR@igyscale}% -\LWR@scalestyle{}{\LWR@igxscale}{\LWR@igyscale}}{}% -% -\ifthenelse{\NOT\equal{\LWR@opacity}{1}}% -{opacity:\LWR@opacity;}% -{}% -% -" \LWR@orignewline}{}% -% \end{macrocode} -% Set the class: -% \begin{macrocode} -\LWR@origtilde{} class="\LWR@igclass" \LWR@orignewline% -}% end of image tags -}% end of href -\endgroup -% \end{macrocode} -% Return to small-sized output: -% \begin{macrocode} -\LWR@origscriptsize -} -% \end{macrocode} -% \end{macro} - -% \begin{macro}{\includegraphics} \oarg{key=val} \marg{filename} - -% Handles width and height, converted to fixed width and heights. - -% Converts any |.pdf| references to |.svg| for \HTML\ - -% The user should always refer to |.pdf| in the document source. - -% \begin{macrocode} -\renewcommand*{\includegraphics} -{% -% \end{macrocode} -% This graphic should trigger an \HTML\ paragraph even if alone, -% so ensure that are doing paragraph handling: -% \begin{macrocode} -\LWR@ensuredoingapar% -\begingroup% -\LWR@includegraphicsb% -} -% \end{macrocode} -% \end{macro} - -% \begin{macrocode} -\end{warpHTML} -% \end{macrocode} % \codeprint % @@ -19565,182 +19476,8 @@ img src="\thisgraphicspath\LWR@strresult\LWR@imageextension" \LWR@orignewline % \end{macrocode} -% \subsection{\cs{rotatebox}, \cs{scalebox}, \cs{reflectbox}} -% \codehtml -% \begin{macrocode} -\begin{warpHTML} -% \end{macrocode} -% \begin{macro}{\LWR@rotboxorigin} Holds the origin key letters. -% \begin{macrocode} -\newcommand*{\LWR@rotboxorigin}{} -% \end{macrocode} -% \end{macro} -% -% -% \begin{macro}{\LWR@originname} \marg{letter} -% -% Given one \LaTeX{} origin key value, -% translate into an \HTML\ origin word: -% \begin{macrocode} -\newcommand*{\LWR@originname}[1]{% -\ifthenelse{\equal{#1}{t}}{top}{}% -\ifthenelse{\equal{#1}{b}}{bottom}{}% -\ifthenelse{\equal{#1}{c}}{center}{}% -\ifthenelse{\equal{#1}{l}}{left}{}% -\ifthenelse{\equal{#1}{r}}{right}{}% -} -% \end{macrocode} -% \end{macro} -% -% -% \begin{macro}{\LWR@originnames} \marg{letters} -% -% Given one- or two-letter \LaTeX{} origin key values, -% translate into \HTML\ origin words: -% \begin{macrocode} -\newcommand*{\LWR@originnames}[1]{% -\StrChar{#1}{1}[\LWR@strresult]% -\LWR@originname{\LWR@strresult} -\StrChar{#1}{2}[\LWR@strresult]% -\LWR@originname{\LWR@strresult} -} -% \end{macrocode} -% \end{macro} -% -% -% Handle the origin key for \cs{rotatebox}: -% \begin{macrocode} -\define@key{krotbox}{origin}{% -\renewcommand*{\LWR@rotboxorigin}{#1}% -} -% \end{macrocode} -% These keys are ignored: -% \begin{macrocode} -\define@key{krotbox}{x}{} -\define@key{krotbox}{y}{} -\define@key{krotbox}{units}{} -% \end{macrocode} -% -% -% \begin{macro}{\rotatebox} \oarg{keyval list} \marg{angle} \marg{text} -% -% Will \cs{let}\cs{rotatebox}\cs{LWR@rotatebox} at \cs{LWR@LwarpStart}, -% in case \cs{rotatebox} was over-written by a later package load. -% \begin{macrocode} -\LetLtxMacro\LWR@origrotatebox\rotatebox - -\NewDocumentCommand{\LWR@rotatebox}{O{} m +m}{% -% \end{macrocode} -% Reset the origin to ``none-given'': -% \begin{macrocode} -\renewcommand*{\LWR@rotboxorigin}{} -% \end{macrocode} -% Process the optional keys, which may set \cs{LWR@rotateboxorigin}: -% \begin{macrocode} -\setkeys{krotbox}{#1}% -% \end{macrocode} -% Select |inline-block| so that \HTML\ will transform this span: -% \begin{macrocode} -\LWR@htmltagc{span style="display: inline-block; % -% \end{macrocode} -% If an origin was given, translate and print the origin information: -% \begin{macrocode} -\ifthenelse{\NOT\equal{\LWR@rotboxorigin}{}}% -{transform-origin: \LWR@originnames{\LWR@rotboxorigin};\LWR@origtilde}{}% -% \end{macrocode} -% Print the rotation information: -% \begin{macrocode} -\LWR@rotstyle{-ms-}{#2} % -\LWR@rotstyle{-webkit-}{#2} % -\LWR@rotstyle{}{#2} % -"{}}\LWR@orignewline% -% \end{macrocode} -% Print the text to be rotated: -% \begin{macrocode} -\begin{LWR@nestspan}% -#3% -% \end{macrocode} -% Close the span: -% \begin{macrocode} -\LWR@htmltagc{/span}% -\end{LWR@nestspan}% -} -% \end{macrocode} -% \end{macro} - -% \begin{macro}{\scalebox} \marg{h-scale} \oarg{v-scale} \marg{text} -% -% Will \cs{let}\cs{scalebox}\cs{LWR@scalebox} at \cs{LWR@LwarpStart}, -% in case \cs{scalebox} was over-written by a later package load. -% \begin{macrocode} -\LetLtxMacro\LWR@origscalebox\scalebox - -\NewDocumentCommand{\LWR@scalebox}{m o m}{% -% \end{macrocode} -% Select |inline-block| so that \HTML\ will transform this span: -% \begin{macrocode} -\LWR@htmltagc{span style="display: inline-block; % -% \end{macrocode} -% Print the scaling information: -% \begin{macrocode} -\LWR@scalestyle{-ms-}{#1}{\IfNoValueTF{#2}{#1}{#2}} % -\LWR@scalestyle{-webkit-}{#1}{\IfNoValueTF{#2}{#1}{#2}} % -\LWR@scalestyle{}{#1}{\IfNoValueTF{#2}{#1}{#2}} % -"{}}% -% \end{macrocode} -% Print the text to be scaled: -% \begin{macrocode} -\begin{LWR@nestspan}% -#3% -% \end{macrocode} -% Close the span: -% \begin{macrocode} -\LWR@htmltagc{/span}% -\end{LWR@nestspan}% -} -% \end{macrocode} -% \end{macro} - -% \begin{macro}{\reflectbox} \marg{text} -% -% Will \cs{let}\cs{reflectbox}\cs{LWR@reflectbox} at \cs{LWR@LwarpStart}, -% in case \\ -% \cs{reflectbox} was over-written by a later package load. -% \begin{macrocode} -\let\LWR@origreflectbox\reflectbox - -\newcommand{\LWR@reflectbox}[1]{\LWR@scalebox{-1}[1]{#1}} -% \end{macrocode} -% \end{macro} - -% \begin{macrocode} -\end{warpHTML} -% \end{macrocode} - - -% \subsection{Null functions} -% -% These functions are not supported by \pkg{lwarp}'s \HTML\ conversion. - -% \codehtml -% \begin{macrocode} -\begin{warpHTML} -% \end{macrocode} - - -% \begin{macro}{\resizebox} \marg{h-length} \marg{v-length} \marg{text} -% -% Simply prints its text argument. -% \begin{macrocode} -\renewcommand{\resizebox}[3]{#3} -% \end{macrocode} -% \end{macro} - -% \begin{macrocode} -\end{warpHTML} -% \end{macrocode} @@ -19958,6 +19695,8 @@ img src="\thisgraphicspath\LWR@strresult\LWR@imageextension" \LWR@orignewline % \DescribePackage{cleveref} % \pkg{cleveref} package is used as-is with minor patches. % +% \limitscpageref +% % \pkg{cleveref} and the following associated macro patches are % \margintag{loading order} % automatically preloaded at the end of the preamble via \cs{AtEndPreamble} @@ -19969,7 +19708,7 @@ img src="\thisgraphicspath\LWR@strresult\LWR@imageextension" \LWR@orignewline % \cs{crefname}, then \pkg{cleveref} may be loaded in the user's preamble near the % end, and \pkg{lwarp}'s additional loading of \pkg{cleveref} will have no effect. % -% \Cref{tab:crossrefdata} on \pageref{tab:crossrefdata} +% \Cref{tab:crossrefdata} on page \pageref{tab:crossrefdata} % shows the data structure of the label/reference system % as revised by \pkg{lwarp} and \pkg{cleveref}. @@ -20033,7 +19772,7 @@ img src="\thisgraphicspath\LWR@strresult\LWR@imageextension" \LWR@orignewline % ^^A \cref@getpageref{#2}{\@temppage}#1{\@temppage}{}{}} - +% \label{sec:cpagereffor} % \begin{macro}{\cpagerefFor} Redefinable word between ``page(s)'' and the page numbers. % % \changes{v0.20}{2017/01/03}{User-redefinable word for page references.} @@ -20287,7 +20026,7 @@ img src="\thisgraphicspath\LWR@strresult\LWR@imageextension" \LWR@orignewline \LWR@traceinfo{computed width is \rndprintlength{\LWR@minipagewidth}} \addtocounter{LWR@minipagedepth}{1}% \setlength{\LWR@minipageheight}{\textheight}% default unless specified -\IfValueTF{#2}{\setlength{\LWR@minipageheight}{#2}}{}% +\IfValueT{#2}{\setlength{\LWR@minipageheight}{#2}}% % \end{macrocode} % \LaTeX{} wants to start a paragraph for the new minipage, then start a paragraph again % for the contents of the minipage, so cancel the paragraph tag handling @@ -20320,7 +20059,7 @@ img src="\thisgraphicspath\LWR@strresult\LWR@imageextension" \LWR@orignewline {width:\rndprintlength{\LWR@minipagewidth} ; }% }% \LWR@traceinfo{minipage: about to print the height}% -\IfValueTF{#2}{height:\rndprintlength{\LWR@minipageheight} ; }{}% +\IfValueT{#2}{height:\rndprintlength{\LWR@minipageheight} ; }% "{}}% % \end{macrocode} % Finish with an empty line to start \LaTeX{} minipage processing on a new line. @@ -20551,11 +20290,11 @@ padding:\rndprintlength{\fboxsep}% \LWR@traceinfo{fminipage #1 #2 #3 #4}% \LWR@forceminwidth{\fboxrule}% \setlength{\LWR@tempwidth}{#4}% -\IfValueTF{#2}{\setlength{\LWR@tempheight}{#2}}{}% +\IfValueT{#2}{\setlength{\LWR@tempheight}{#2}}% \begin{BlockClass}[% \LWR@blackborderpadding ; % \uselengthunit{PT}% -\IfValueTF{#2}{height:\rndprintlength{\LWR@tempheight} ; }{}% +\IfValueT{#2}{height:\rndprintlength{\LWR@tempheight} ; }% width:\rndprintlength{\LWR@tempwidth}% ]{fminipage}% } @@ -20820,6 +20559,7 @@ width:\rndprintlength{\LWR@tempwidth}% % \begin{macro}{\LWR@nullfonts} Removes formatting during filename operations. % \changes{v0.34}{2017/08/05}{Improved font control.} % \changes{v0.36}{2017/08/15}{Fix: Filenames while using MathJax.} +% \changes{v0.40}{2017/09/21}{Fix: Long arguments for expandable command.} % \begin{macrocode} \newcommand*{\LWR@nullfonts}{% \LetLtxMacro{\emph}{\LWR@nullemph}% @@ -20852,8 +20592,9 @@ width:\rndprintlength{\LWR@tempwidth}% \renewcommand*{\&}{and}% \renewcommand{\textsuperscript}[1]{##1}% \renewcommand{\textsubscript}[1]{##1}% +\LetLtxMacro\underline\LWR@origunderline% \RenewDocumentCommand{\LWR@htmlspanclass}{o m +m}{##3}% -\DeclareExpandableDocumentCommand{\InlineClass}{o m +m}{##3}% +\DeclareExpandableDocumentCommand{\InlineClass}{+o +m +m}{##3}% } % \end{macrocode} % \end{macro} @@ -20966,6 +20707,15 @@ width:\rndprintlength{\LWR@tempwidth}% % \end{macro} +% \begin{macro}{\underline} \marg{text} +% \changes{v0.40}{2017/09/12}{Added.} +% \begin{macrocode} +\renewcommand{\underline}[1]{\InlineClass{underline}{#1}} +% \end{macrocode} +% \end{macro} + + + % \begin{macro}{\hfill} % \changes{v0.20}{2016/12/12}{Inserts a \cs{qquad}.} % \begin{macrocode} @@ -21015,6 +20765,7 @@ width:\rndprintlength{\LWR@tempwidth}% \let\LWR@origvspace\vspace \let\LWR@origrule\rule \let\LWR@origmedskip\medskip +\let\LWR@origtextellipsis\textellipsis % \end{macrocode} % Direct-formatting space commands become \HTML\ entities: @@ -21393,7 +21144,7 @@ width:\rndprintlength{\LWR@tempwidth}% % limits the allowable syntax. To do:\ A superior method would compute a % ratio of \LaTeX\ ex height, then print that to \HTML\ with an ex unit. % \begin{macrocode} - \IfValueTF{#1}% + \IfValueT{#1}% {% \setlength{\LWR@tempraise}{0pt-#1}% \setlength{\LWR@tempraise}{\LWR@tempraise*2}% @@ -21404,7 +21155,7 @@ width:\rndprintlength{\LWR@tempwidth}% \LWR@orignewline% transform: translate(0pt,\printlength{\LWR@tempraise}); % \LWR@orignewline% - }{}% + }% % \end{macrocode} % Display inline-block to place the span inline with the text: % \begin{macrocode} @@ -21494,6 +21245,8 @@ width:\rndprintlength{\LWR@tempwidth}% % |latexlogofont| is a \CSS\ class used to select the font for the rest of the logo in % \LaTeX, \LuaTeX, \ConTeXt, etc. % \begin{macrocode} +\let\LWR@origTeX\TeX + \newcommand*{\LWR@TeX} {\InlineClass{latexlogofont}% {\InlineClass{latexlogo}{T\textsubscript{e}X}}} @@ -21503,11 +21256,15 @@ width:\rndprintlength{\LWR@tempwidth}% % \begin{macro}{\LaTeX} % \begin{macro}{\LaTeXe} \LaTeX, \LaTeXe % \begin{macrocode} +\let\LWR@origLaTeX\LaTeX + \newcommand*{\LWR@LaTeX} {\InlineClass{latexlogofont}% {\InlineClass{latexlogo}% {L\textsuperscript{a}T\textsubscript{e}X}}} +\let\LWR@origLaTeXe\LaTeXe + \renewcommand*{\LaTeXe} {\LaTeX\InlineClass{latexlogofont}% {\,2\textsubscript{\textit{\HTMLunicode{3B5}}}}} @@ -21875,6 +21632,81 @@ width:\rndprintlength{\LWR@tempwidth}% % % % +% \iffalse +%<*adjmulticol> +% \fi +% +% \part{lwarp-adjmulticol.sty} +% +% \section{adjmulticol} +% +% \DescribePackage{adjmulticol} +% \pkg{adjmulticol} is emulated. +% +% Emulation similar to \pkg{multicols} is used, with adjusted margins. +% If the number of columns is specified as 1, it is set so, but if +% two or greater are used, \pkg{lwarp} allows a variable number of columns +% up to three. +% +% \changes{v0.40}{2017/09/06}{\pkg{adjmulticol}: Added.} +% +% \codehtml +% +% \begin{macrocode} +\LWR@ProvidesPackageDrop{adjmulticol} +% \end{macrocode} +% +% \begin{macrocode} +\RequirePackage{multicol} +% \end{macrocode} +% Used to compute margins: +% \begin{macrocode} +\newlength{\LWR@templengthone}% +\newlength{\LWR@templengthtwo}% +% \end{macrocode} +% * \marg{numcols} \marg{left margi} \marg{right margin} +% \marginpar{\hfill\env{adjmulticols}} +% \begin{macrocode} +\NewDocumentEnvironment{adjmulticols}{s m m m} +{% +% \end{macrocode} +% Compute the margins, and limit to positive only: +% \begin{macrocode} +\setlength{\LWR@templengthone}{#3}% +\ifdimcomp{\LWR@templengthone}{<}{0pt}{\setlength{\LWR@templengthone}{0pt}}{}% +\setlength{\LWR@templengthtwo}{#4} +\ifdimcomp{\LWR@templengthtwo}{<}{0pt}{\setlength{\LWR@templengthtwo}{0pt}}{}% +% \end{macrocode} +% If one column is specified, use a \element{div} of class \attribute{singlecolumn}, +% else use \attribute{multicols}: +% \begin{macrocode} +\newcommand*{\LWR@mcolstype}{multicols}% +\ifnumcomp{#2}{=}{1}{\renewcommand*{\LWR@mcolstype}{singlecolumn}}{}% +% \end{macrocode} +% Help avoid page overflow: +% \begin{macrocode} +\LWR@forcenewpage% +% \end{macrocode} +% Print margins in points: +% \begin{macrocode} +\uselengthunit{PT}% +% \end{macrocode} +% Create the \element{div} with the given margin and class: +% \begin{macrocode} +\BlockClass[% +margin-left:\rndprintlength{\LWR@templengthone} ; % +margin-right:\rndprintlength{\LWR@templengthtwo}% +]{\LWR@mcolstype}% +} +{\endBlockClass} +% \end{macrocode} +% +% \iffalse +%</adjmulticol> +% \fi +% +% +% % % \iffalse %<*addlines> @@ -22190,6 +22022,49 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"% % % % \iffalse +%<*anonchap> +% \fi +% +% \part{lwarp-anonchap.sty} +% +% \section{anonchap} +% +% \DescribePackage{anonchap} +% \pkg{anonchap} is emulated. +% +% \limitstocloft +% +% The code is shared by \pkg{tocbibind}. +% +% \changes{v0.40}{2017/09/12}{\pkg{anonchap}: Added.} +% +% \codehtml +% +% \begin{macrocode} +\LWR@ProvidesPackageDrop{anonchap} +% \end{macrocode} +% +% \begin{macrocode} +\newcommand{\simplechapter}[1][\@empty]{% + \def\@chapcntformat##1{% + #1~\csname the##1\endcsname\simplechapterdelim\protect\quad% + }% +} + +\newcommand{\restorechapter}{% +\let\@chapcntformat\@seccntformat% +} +% \end{macrocode} +% +% \iffalse +%</anonchap> +% \fi +% +% +% +% +% +% \iffalse %<*anysize> % \fi % @@ -22388,6 +22263,7 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"% % \part{lwarp-bigdelim.sty} % % \section{bigdelim} +% \label{sec:bigdelim} % % \DescribePackage{bigdelim} % \pkg{bigdelim} is used as-is for print or \env{lateximage}, and @@ -22399,10 +22275,21 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"% % The delimiter character is given a \element{span} class of \attribute{ldelim} or % \attribute{rdelim}, and the default \CSS\ sets this to \attribute{font-size:200\%} % +% \limitsbigdelim +% % \changes{v0.39}{2017/08/31}{\pkg{bigdelim}: Added.} +% \changes{v0.40}{2017/09/09}{\pkg{bigdelim}: Improved documentation.} % % \codehtml % +% First, remove the temporary definitions of \cs{ldelim} and \cs{rdelim}, which were +% previously defined for tabular scanning in case \pkg{bigdelim} was not loaded: +% \begin{macrocode} +\let\ldelim\relax +\let\rdelim\relax +% \end{macrocode} +% +% Next, load the package's new definitions: % \begin{macrocode} \LWR@ProvidesPackagePass{bigdelim} % \end{macrocode} @@ -22847,6 +22734,40 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"% % % % \iffalse +%<*cuted> +% \fi +% +% \part{lwarp-cuted.sty} +% +% \section{cuted} +% +% \DescribePackage{cuted} +% \pkg{cuted} is emulated. +% +% \changes{v0.40}{2017/09/07}{\pkg{cuted}: Added.} +% +% \codehtml +% +% \begin{macrocode} +\LWR@ProvidesPackageDrop{cuted} +% \end{macrocode} +% +% \begin{macrocode} +\newenvironment{strip}{}{} +\newskip\stripsep +\def\oldcolsbreak#1{} +% \end{macrocode} +% +% \iffalse +%</cuted> +% \fi +% +% +% +% +% +% +% \iffalse %<*cutwin> % \fi % @@ -22903,6 +22824,44 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"% % % % \iffalse +%<*dblfnote> +% \fi +% +% \part{lwarp-dblfnote.sty} +% +% \section{dblfnote} +% +% \DescribePackage{dblfnote} +% \pkg{dblfnote} is emulated. +% +% \changes{v0.40}{2017/09/06}{\pkg{dblfnote}: Added.} +% +% \codehtml +% +% \begin{macrocode} +\LWR@ProvidesPackageDrop{dblfnote} +% \end{macrocode} +% +% \begin{macrocode} +\newcounter{DFNsloppiness} +\newdimen\DFNcolumnsep +\newdimen\DFNcolumnwidth +\def\DFNallowcbreak{} +\def\DFNinhibitcbreak{} +\def\DFNtrysingle{} +\def\DFNalwaysdouble{} +\def\DFNruleboth{} +\def\DFNruleleft{} +% \end{macrocode} +% +% \iffalse +%</dblfnote> +% \fi +% +% +% +% +% \iffalse %<*dcolumn> % \fi % @@ -24257,8 +24216,8 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor } % \end{macrocode} -% ^^A \begin{macro}{\floatbox} -% \cs{floatbox} \oarg{1 preamble} \marg{2 captype} +% \begin{noindmacro}{\floatbox} +% \oarg{1 preamble} \marg{2 captype} % \oarg{3 width} \oarg{4 height} \oarg{5 vert pos} % \marg{6 caption} \marg{7 object} % @@ -24331,7 +24290,7 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor }% assume subfig } % \end{macrocode} -% ^^A \end{macro} +% \end{noindmacro} % Not used: @@ -24351,8 +24310,8 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor % \end{macrocode} -% ^^A \begin{macro}{\newfloatcommand} \marg{1 command} \marg{2 captype} -% ^^A \oarg{3 preamble} \oarg{4 default width} +% \begin{noindmacro}{\newfloatcommand} \marg{1 command} \marg{2 captype} +% \oarg{3 preamble} \oarg{4 default width} % % Preamble and default width are ignored. % \begin{macrocode} @@ -24362,10 +24321,10 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor } } % \end{macrocode} -% ^^A \end{macro} +% \end{noindmacro} -% ^^A \begin{macro}{\renewfloatcommand} \marg{1 command} \marg{2 captype} -% ^^A \oarg{3 preamble} \oarg{4 default width} +% \begin{noindmacro}{\renewfloatcommand} \marg{1 command} \marg{2 captype} +% \oarg{3 preamble} \oarg{4 default width} % % Preamble and default width are ignored. % \begin{macrocode} @@ -24375,32 +24334,32 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor } } % \end{macrocode} -% ^^A \end{macro} +% \end{noindmacro} -% ^^A \begin{macro}{\ffigbox} \oarg{width} \oarg{height} \oarg{vposn} -% ^^A \marg{caption commands} \marg{contents} +% \begin{noindmacro}{\ffigbox} \oarg{width} \oarg{height} \oarg{vposn} +% \marg{caption commands} \marg{contents} % \begin{macrocode} \newfloatcommand{ffigbox}{figure}[\nocapbeside][] % \end{macrocode} -% ^^A \end{macro} +% \end{noindmacro} % -% ^^A \begin{macro}{\ttabbox} \oarg{width} \oarg{height} \oarg{vposn} -% ^^A \marg{caption commands} \marg{contents} +% \begin{noindmacro}{\ttabbox} \oarg{width} \oarg{height} \oarg{vposn} +% \marg{caption commands} \marg{contents} % \changes{v0.15}{2016/03/31}{Fixed \& handling.} % \begin{macrocode} \newfloatcommand{ttabbox}{table}[\captop][\FBwidth] % \end{macrocode} -% ^^A \end{macro} +% \end{noindmacro} % -% ^^A \begin{macro}{\fcapside} \oarg{width} \oarg{height} \oarg{vposn} -% ^^A \marg{caption commands} \marg{contents} +% \begin{noindmacro}{\fcapside} \oarg{width} \oarg{height} \oarg{vposn} +% \marg{caption commands} \marg{contents} % \begin{macrocode} \newfloatcommand{fcapside}{figure}[\capbeside][] % \end{macrocode} -% ^^A \end{macro} +% \end{noindmacro} -% ^^A \begin{environment}{floatrow} \oarg{numfloats} +% \begin{noindenvironment}{floatrow} \oarg{numfloats} % \changes{v0.20}{2016/08/20}{Fix: \cs{linewidth} in a floatrow.} % % The row of floats is placed into a \element{div} of class |floatrow|. @@ -24420,7 +24379,7 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor \endBlockClass } % \end{macrocode} -% ^^A \end{environment} +% \end{noindenvironment} % % Keys for \cs{DeclareNewFloatType}: % \begin{macrocode} @@ -24437,7 +24396,7 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor \define@key{frowkeys}{relatedcapstyle}{}% % \end{macrocode} -% ^^A \begin{macro}{\DeclareNewFloatType} \marg{type} \marg{options} +% \begin{noindmacro}{\DeclareNewFloatType} \marg{type} \marg{options} % % Use |\listof{type}{Title}| to print a list of the floats. % \begin{macrocode} @@ -24480,7 +24439,7 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor {\floatname{#1}{\LWR@frowkeyname}}% } % \end{macrocode} -% ^^A \end{macro} +% \end{noindmacro} % Not used: % \begin{macrocode} @@ -24495,7 +24454,7 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor \NewDocumentCommand{\RawFloats}{o o}{} % \end{macrocode} -% ^^A \begin{macro}{\RawCaption} \marg{text} +% \begin{noindmacro}{\RawCaption} \marg{text} % % \changes{v0.15}{2016/03/31}{Fix: steps counter} % @@ -24503,10 +24462,10 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor % \begin{macrocode} \newcommand{\RawCaption}[1]{#1} % \end{macrocode} -% ^^A \end{macro} +% \end{noindmacro} -% ^^A \begin{macro}{\floatfoot} \marg{text} +% \begin{noindmacro}{\floatfoot} \marg{text} % % Places additional text inside a float, % inside a \CSS\ \element{div} of class |floatfoot|. @@ -24517,7 +24476,7 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor \end{BlockClass} } % \end{macrocode} -% ^^A \end{macro} +% \end{noindmacro} % ^^A \DescribeBoolean{LWR@insubfloatrow} @@ -24527,7 +24486,7 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor \boolfalse{LWR@insubfloatrow} % \end{macrocode} -% ^^A \begin{environment}{subfloatrow} \oarg{num\_floats} +% \begin{noindenvironment}{subfloatrow} \oarg{num\_floats} % \changes{v0.15}{2016/04/01}{Added} % \begin{macrocode} \newenvironment*{subfloatrow}[1][2] @@ -24550,7 +24509,7 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor \boolfalse{LWR@insubfloatrow} } % \end{macrocode} -% ^^A \end{environment} +% \end{noindenvironment} % \iffalse %</floatrow> @@ -24655,6 +24614,39 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor % % % \iffalse +%<*fnpos> +% \fi +% +% \part{lwarp-fnpos.sty} +% +% \section{fnpos} +% +% \DescribePackage{fnpos} +% \pkg{fnpos} is emulated. +% +% \changes{v0.40}{2017/09/06}{\pkg{fnpos}: Added.} +% +% \codehtml +% +% \begin{macrocode} +\LWR@ProvidesPackageDrop{fnpos} +% \end{macrocode} +% +% \begin{macrocode} +\newcommand*{\makeFNbottom}{} +\newcommand*{\makeFNmid}{} +\newcommand*{\makeFNbelow}{} +\newcommand*{\makeFNabove}{} +% \end{macrocode} +% +% \iffalse +%</fnpos> +% \fi +% +% +% +% +% \iffalse %<*fontenc> % \fi % @@ -25261,11 +25253,553 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor % \pkg{graphics} is emulated. % % \changes{v0.28}{2017/04/12}{\pkg{graphics}: Added.} +% \changes{v0.40}{2017/09/07}{\pkg{graphics}: Moved out of the \pkg{lwarp} core.} +% \changes{v0.40}{2017/09/07}{\pkg{graphics}: Restores \cs{includegraphics} +% and \cs{DeclareGraphicsExtensions} in a \env{lateximage}.} % % \codehtml % \begin{macrocode} -\LWR@ProvidesPackageDrop{graphics} +\LWR@ProvidesPackagePass{graphics} % \end{macrocode} + + +% \subsection{Graphics extensions} + +% \begin{macro}{\DeclareGraphicsExtensions} \marg{list} +% +% \cs{AtBeginDocument} allow \SVG\ files instead of \PDF: +% \begin{macrocode} +\AtBeginDocument{ +\DeclareGraphicsExtensions{.svg,.SVG,.gif,.GIF,.png,.PNG,.jpg,.JPG,.jpeg,.JPEG} +\DeclareGraphicsRule{.svg}{svg}{.svg}{} +\DeclareGraphicsRule{.SVG}{svg}{.SVG}{} +} +% \end{macrocode} +% Inside a \env{lateximage}, allow \PDF\ instead of \SVG: +% \begin{macrocode} +\appto\LWR@restoreorigformatting{% +\DeclareGraphicsExtensions{.pdf,.PDF,.gif,.GIF,.png,.PNG,.jpg,.JPG,.jpeg,.JPEG}% +} +% \end{macrocode} +% \end{macro} + + +% \subsection{Length conversions and graphics options} +% +% A scaled image in \LaTeX{} by default takes only as much space +% on the page as it +% requires, but \HTML\ browsers use as much space as the +% \watchout[whitespace] +% original unscaled image would have taken, +% with the scaled image over- or under-flowing the area. + +% \begin{macrocode} +\AtBeginDocument{ +\renewcommand*{\unitspace}{} +} +% \end{macrocode} + +% Used to store the user's selected dimensions and \HTML\ class. +% +% The class defaults to ``inlineimage'' unless changed by a |class=xyx| option. +% \begin{macrocode} +\newlength{\LWR@igwidth} +\newlength{\LWR@igheight} +\newcommand*{\LWR@igwidthstyle}{} +\newcommand*{\LWR@igheightstyle}{} +\newcommand*{\LWR@igorigin}{} +\newcommand*{\LWR@igangle}{} +\newcommand*{\LWR@igxscale}{1} +\newcommand*{\LWR@igyscale}{1} +\newcommand*{\LWR@igclass}{inlineimage} +% \end{macrocode} + +% Set the actions of each of the key/value combinations for +% \cs{includegraphics}. Many are ignored. +% +% If an optional width was given, set an \HTML\ style: +% \begin{macrocode} +\define@key{igraph}{width}{% +\setlength{\LWR@igwidth}{#1}% +\ifthenelse{\lengthtest{\LWR@igwidth > 0pt}}% +{% +% \end{macrocode} +% Default to use the converted fixed length given: +% \begin{macrocode} + \uselengthunit{PT}% + \renewcommand*{\LWR@igwidthstyle}{width:\rndprintlength{\LWR@igwidth}}% +% \end{macrocode} +% If ex or em dimensions were given, use those instead: +% \begin{macrocode} + \IfEndWith{#1}{ex}% + {\renewcommand*{\LWR@igwidthstyle}{width:#1}}% yes ex + {}% not ex + \IfEndWith{#1}{em}% + {\renewcommand*{\LWR@igwidthstyle}{width:#1}}% yes em + {}% not em + \IfEndWith{#1}{\%}% + {\renewcommand*{\LWR@igwidthstyle}{width:#1}}% yes percent + {}% not percent + \IfEndWith{#1}{px}% + {\renewcommand*{\LWR@igwidthstyle}{width:#1}}% yes px + {}% not px +}{}% end of length > 0pt +} +% \end{macrocode} +% +% If an optional height was given, set an \HTML\ style: +% \begin{macrocode} +\define@key{igraph}{height}{% +\setlength{\LWR@igheight}{#1}% +\ifthenelse{\lengthtest{\LWR@igheight > 0pt}}% +{% +% \end{macrocode} +% Default to use the converted fixed length given: +% \begin{macrocode} + \uselengthunit{PT}% + \renewcommand*{\LWR@igheightstyle}{% + height:\rndprintlength{\LWR@igheight} % + }% +% \end{macrocode} +% If ex or em dimensions were given, use those instead: +% \begin{macrocode} + \IfEndWith{#1}{ex}% + {\renewcommand*{\LWR@igheightstyle}{height:#1}}% yes ex + {}% not ex + \IfEndWith{#1}{em}% + {\renewcommand*{\LWR@igheightstyle}{height:#1}}% yes em + {}% not em + \IfEndWith{#1}{\%}% + {\renewcommand*{\LWR@igheightstyle}{height:#1}}% yes percent + {}% not percent + \IfEndWith{#1}{px}% + {\renewcommand*{\LWR@igheightstyle}{height:#1}}% yes px + {}% not px +}{}% end of length > 0pt +} +% \end{macrocode} +% +% +% Handle origin key: +% \begin{macrocode} +\define@key{igraph}{origin}{% +\renewcommand*{\LWR@igorigin}{#1}% +} +% \end{macrocode} +% +% +% Handle angle key: +% \begin{macrocode} +\define@key{igraph}{angle}{\renewcommand*{\LWR@igangle}{#1}} +% \end{macrocode} +% +% +% Handle class key: +% \begin{macrocode} +\define@key{igraph}{class}{\renewcommand*{\LWR@igclass}{#1}} + +% \end{macrocode} +% ^^A \define@key{igraph}{xscale}{\renewcommand*{\LWR@igxscale}{#1}} +% ^^A \define@key{igraph}{yscale}{\renewcommand*{\LWR@igyscale}{#1}} +% It appears that \pkg{graphicx} does not have separate keys for +% |xscale| and |yscale|. |scale| adjusts both at the same time. +% \begin{macrocode} +\define@key{igraph}{scale}{% +\renewcommand*{\LWR@igxscale}{#1}% +\renewcommand*{\LWR@igyscale}{#1}} +% \end{macrocode} +% +% Numerous ignored keys: +% \begin{macrocode} +\define@key{igraph}{bb}{} +\define@key{igraph}{bbllx}{} +\define@key{igraph}{bblly}{} +\define@key{igraph}{bburx}{} +\define@key{igraph}{bbury}{} +\define@key{igraph}{natwidth}{} +\define@key{igraph}{natheight}{} +\define@key{igraph}{hiresbb}{} +\define@key{igraph}{viewport}{} +\define@key{igraph}{trim}{} +\define@key{igraph}{totalheight}{} +\define@key{igraph}{keepaspectratio}{} +\define@key{igraph}{clip}{} +\define@key{igraph}{draft}{} +\define@key{igraph}{type}{} +\define@key{igraph}{ext}{} +\define@key{igraph}{read}{} +\define@key{igraph}{command}{} +% \end{macrocode} + + +% \begin{macro}{\LWR@rotstyle} \marg{prefix} \marg{degrees} +% +% Prints the rotate style with the given prefix. +% +% |prefix| is |-ms-| or |-webkit-| or nothing, and is used to generate +% three versions of the |transform:rotate| style. +% \begin{macrocode} +\newcommand*{\LWR@rotstyle}[2]{% + #1transform:rotate(-#2deg); +} +% \end{macrocode} +% \end{macro} + + +% \begin{macro}{\LWR@scalestyle} \marg{prefix} \marg{xscale} \marg{yscale} +% +% Prints the scale style with the given prefix. +% +% |prefix| is |-ms-| or |-webkit-| or nothing, and is used to generate +% three versions of the |transform:scale| style. +% \begin{macrocode} +\newcommand*{\LWR@scalestyle}[3]{% + #1transform:scale(#2,#3); +} +% \end{macrocode} +% \end{macro} + + + + +% \subsection{\cs{includegraphics}} + +% \DescribeBoolean{LWR@infloatrow} +% Used to compute \cs{linewidth}. +% \begin{macrocode} +\newbool{LWR@infloatrow} +\boolfalse{LWR@infloatrow} +% \end{macrocode} + +% \cs{LWR@opacity} may be set by the \pkg{transparent} package. +% For \HTML\ it is only used for \cs{includegraphics}. +% \begin{macrocode} +\def\LWR@opacity{1} +% \end{macrocode} + + +% \begin{macro}{\LWR@includegraphicsb} * \oarg{2: options} \oarg{3: options} \marg{4: filename} +% +% \pkg{graphics} syntax is \cs{includegraphics} * \oarg{llx,lly} \oarg{urx,ury} \marg{file} +% +% \pkg{graphicx} syntax is \cs{includegraphics} \oarg{key values} \marg{file} +% +% If |#3| is empty, only one optional argument was given, thus \pkg{graphicx} syntax. +% +% \changes{v0.18}{2016/04/14}{Improved \HTML\ output linebreaks.} +% \changes{v0.18}{2016/05/17}{Fix: \cs{linewidth}, \cs{textwidth}, \cs{textheight} +% inside a minipage.} +% \changes{v0.18}{2016/05/17}{em, ex, \%, px dimensions preserved.} +% \changes{v0.18}{2016/05/17}{Add: svgz file extension.} +% \changes{v0.20}{2016/08/20}{Fix: \cs{linewidth} in a floatrow.} +% \changes{v0.20}{2017/01/12}{Fix: Expands filename.} +% \changes{v0.28}{2017/04/12}{Adapts to \pkg{graphics} syntax.} +% \changes{v0.29}{2017/04/15}{Fix: Error when no optional arguments.} +% \changes{v0.40}{2017/09/08}{Add: Full \cs{graphicspath} support.} +% \begin{macrocode} +\NewDocumentCommand{\LWR@includegraphicsb}{s o o m} +{% +\LWR@traceinfo{LWR@includegraphicsb #4}% +% \end{macrocode} +% Start the image tag on a new line, allow \PDF\ output word wrap: +% \begin{macrocode} +\LWR@origtilde \LWR@orignewline% +% \end{macrocode} +% Temporarily compute |\linewidth|, |\textwidth|, |\textheight| arguments with a 6x9 inch size +% until the next |\endgroup|. +% \begin{macrocode} +\ifthenelse{\cnttest{\value{LWR@minipagedepth}}{=}{0}}% +{% + \ifbool{LWR@infloatrow}% + {} + {% not in a minipage or a floatrow: + \setlength{\linewidth}{6in}% + \setlength{\textwidth}{6in}% + \setlength{\textheight}{9in}% + }% +}{}% +% \end{macrocode} +% \begin{macrocode} +\renewcommand*{\Gin@setfile}[3]{% +\LWR@traceinfo{Gin@setfile ##3}% +\xdef\LWR@parsedfilename{##3}% +}% +\Ginclude@graphics{\detokenize{#4}}% +\filename@parse{\LWR@parsedfilename}% +% \end{macrocode} +% +% For correct em sizing during the width and height conversions: +% \begin{macrocode} +\large% +% \end{macrocode} +% Reset some defaults, possibly will be changed below if options were given: +% \begin{macrocode} +\setlength{\LWR@igwidth}{0pt}% +\setlength{\LWR@igheight}{0pt}% +\renewcommand*{\LWR@igwidthstyle}{}% +\renewcommand*{\LWR@igheightstyle}{}% +\renewcommand*{\LWR@igorigin}{}% +\renewcommand*{\LWR@igangle}{}% +\renewcommand*{\LWR@igxscale}{1}% +\renewcommand*{\LWR@igyscale}{1}% +\renewcommand*{\LWR@igclass}{inlineimage}% +% \end{macrocode} +% +% If |#3| is empty, only one optional argument was given, thus \pkg{graphicx} syntax: +% \begin{macrocode} +\IfValueF{#3}{% +\IfValueTF{#2}% +{\setkeys{igraph}{#2}}% +{\setkeys{igraph}{}}% +}% +% \end{macrocode} +% Create the \HTML\ reference with the graphicspath, filename, extension, +% alt tag, style, and class. +% +% The \cs{LWR@origtilde} adds space between tags in case this +% is being done inside a \cs{savebox} where \cs{newline} has no effect. +% \begin{macrocode} +\LWR@traceinfo{LWR@includegraphicsb: about to create href}% +\href{\LWR@parsedfilename}% +{% start of href +\LWR@traceinfo{LWR@includegraphicsb: about to LWR@htmltag}% +\LWR@htmltag{% start of image tags +img src="\LWR@parsedfilename" \LWR@orignewline% +\LWR@origtilde{} alt="[\filename@base]" \LWR@orignewline% +% \end{macrocode} +% Only include a style tag if a width, height, angle, or scale was given: +% \begin{macrocode} +\ifthenelse{ + \NOT\equal{\LWR@igwidthstyle}{} \OR + \NOT\equal{\LWR@igheightstyle}{} \OR + \NOT\equal{\LWR@igorigin}{} \OR + \NOT\equal{\LWR@igangle}{} \OR + \NOT\equal{\LWR@igxscale}{1} \OR + \NOT\equal{\LWR@igyscale}{1} +}% +{\LWR@origtilde{} style="% +\ifthenelse{\NOT\equal{\LWR@igwidthstyle}{}}% +{\LWR@igwidthstyle;}{}% +\ifthenelse{\NOT\equal{\LWR@igheightstyle}{}}% +{\LWR@igheightstyle;}{}% +\ifthenelse{\NOT\equal{\LWR@igorigin}{}}% +{\LWR@origtilde{} transform-origin: \LWR@originnames{\LWR@igorigin}; \LWR@orignewline}{}% +\ifthenelse{\NOT\equal{\LWR@igangle}{}}% +{% +\LWR@rotstyle{-ms-}{\LWR@igangle}% +\LWR@rotstyle{-webkit-}{\LWR@igangle}% +\LWR@rotstyle{}{\LWR@igangle% +}}{}% +\ifthenelse{\NOT\equal{\LWR@igxscale}{1}\OR% +\NOT\equal{\LWR@igyscale}{1}}% +{\LWR@scalestyle{-ms-}{\LWR@igxscale}{\LWR@igyscale}% +\LWR@scalestyle{-webkit-}{\LWR@igxscale}{\LWR@igyscale}% +\LWR@scalestyle{}{\LWR@igxscale}{\LWR@igyscale}}{}% +% +\ifthenelse{\NOT\equal{\LWR@opacity}{1}}% +{opacity:\LWR@opacity;}% +{}% +% +" \LWR@orignewline}{}% +% \end{macrocode} +% Set the class: +% \begin{macrocode} +\LWR@origtilde{} class="\LWR@igclass" \LWR@orignewline% +}% end of image tags +}% end of href +\endgroup +% \end{macrocode} +% Return to small-sized output: +% \begin{macrocode} +\LWR@origscriptsize +\LWR@traceinfo{LWR@includegraphicsb done}% +} +% \end{macrocode} +% \end{macro} + +% \begin{macro}{\includegraphics} \oarg{key=val} \marg{filename} + +% Handles width and height, converted to fixed width and heights. + +% Converts any |.pdf| references to |.svg| for \HTML\ + +% The user should always refer to |.pdf| in the document source. + +% \begin{macrocode} +\LetLtxMacro\LWR@origincludegraphics\includegraphics + +\AtBeginDocument{ +\renewcommand*{\includegraphics} +{% +% \end{macrocode} +% This graphic should trigger an \HTML\ paragraph even if alone, +% so ensure that are doing paragraph handling: +% \begin{macrocode} +\LWR@traceinfo{includegraphics} +\LWR@ensuredoingapar% +\begingroup% +\catcode`\_=12% +\LWR@includegraphicsb% +}% includegraphics +}% AtBeginDocument +% \end{macrocode} +% \end{macro} + + +% \begin{macro}{\LWR@rotboxorigin} Holds the origin key letters. +% \begin{macrocode} +\newcommand*{\LWR@rotboxorigin}{} +% \end{macrocode} +% \end{macro} +% +% +% \begin{macro}{\LWR@originname} \marg{letter} +% +% Given one \LaTeX{} origin key value, +% translate into an \HTML\ origin word: +% \begin{macrocode} +\newcommand*{\LWR@originname}[1]{% +\ifthenelse{\equal{#1}{t}}{top}{}% +\ifthenelse{\equal{#1}{b}}{bottom}{}% +\ifthenelse{\equal{#1}{c}}{center}{}% +\ifthenelse{\equal{#1}{l}}{left}{}% +\ifthenelse{\equal{#1}{r}}{right}{}% +} +% \end{macrocode} +% \end{macro} +% +% +% \begin{macro}{\LWR@originnames} \marg{letters} +% +% Given one- or two-letter \LaTeX{} origin key values, +% translate into \HTML\ origin words: +% \begin{macrocode} +\newcommand*{\LWR@originnames}[1]{% +\StrChar{#1}{1}[\LWR@strresult]% +\LWR@originname{\LWR@strresult} +\StrChar{#1}{2}[\LWR@strresult]% +\LWR@originname{\LWR@strresult} +} +% \end{macrocode} +% \end{macro} +% +% +% Handle the origin key for \cs{rotatebox}: +% \begin{macrocode} +\define@key{krotbox}{origin}{% +\renewcommand*{\LWR@rotboxorigin}{#1}% +} +% \end{macrocode} +% These keys are ignored: +% \begin{macrocode} +\define@key{krotbox}{x}{} +\define@key{krotbox}{y}{} +\define@key{krotbox}{units}{} +% \end{macrocode} +% +% +% \begin{macro}{\rotatebox} \oarg{keyval list} \marg{angle} \marg{text} +% \begin{macrocode} +\LetLtxMacro\LWR@origrotatebox\rotatebox + +\AtBeginDocument{ +\RenewDocumentCommand{\rotatebox}{O{} m +m}{% +% \end{macrocode} +% Reset the origin to ``none-given'': +% \begin{macrocode} +\renewcommand*{\LWR@rotboxorigin}{} +% \end{macrocode} +% Process the optional keys, which may set \cs{LWR@rotateboxorigin}: +% \begin{macrocode} +\setkeys{krotbox}{#1}% +% \end{macrocode} +% Select |inline-block| so that \HTML\ will transform this span: +% \begin{macrocode} +\LWR@htmltagc{span style="display: inline-block; % +% \end{macrocode} +% If an origin was given, translate and print the origin information: +% \begin{macrocode} +\ifthenelse{\NOT\equal{\LWR@rotboxorigin}{}}% +{transform-origin: \LWR@originnames{\LWR@rotboxorigin};\LWR@origtilde}{}% +% \end{macrocode} +% Print the rotation information: +% \begin{macrocode} +\LWR@rotstyle{-ms-}{#2} % +\LWR@rotstyle{-webkit-}{#2} % +\LWR@rotstyle{}{#2} % +"{}}\LWR@orignewline% +% \end{macrocode} +% Print the text to be rotated: +% \begin{macrocode} +\begin{LWR@nestspan}% +#3% +% \end{macrocode} +% Close the span: +% \begin{macrocode} +\LWR@htmltagc{/span}% +\end{LWR@nestspan}% +} +}% AtBeginDocument +% \end{macrocode} +% \end{macro} + +% \begin{macro}{\scalebox} \marg{h-scale} \oarg{v-scale} \marg{text} +% \begin{macrocode} +\LetLtxMacro\LWR@origscalebox\scalebox + +\AtBeginDocument{ +\RenewDocumentCommand{\scalebox}{m o m}{% +% \end{macrocode} +% Select |inline-block| so that \HTML\ will transform this span: +% \begin{macrocode} +\LWR@htmltagc{span style="display: inline-block; % +% \end{macrocode} +% Print the scaling information: +% \begin{macrocode} +\LWR@scalestyle{-ms-}{#1}{\IfNoValueTF{#2}{#1}{#2}} % +\LWR@scalestyle{-webkit-}{#1}{\IfNoValueTF{#2}{#1}{#2}} % +\LWR@scalestyle{}{#1}{\IfNoValueTF{#2}{#1}{#2}} % +"{}}% +% \end{macrocode} +% Print the text to be scaled: +% \begin{macrocode} +\begin{LWR@nestspan}% +#3% +% \end{macrocode} +% Close the span: +% \begin{macrocode} +\LWR@htmltagc{/span}% +\end{LWR@nestspan}% +} +}% AtBeginDocument +% \end{macrocode} +% \end{macro} + +% \begin{macro}{\reflectbox} \marg{text} +% \begin{macrocode} +\let\LWR@origreflectbox\reflectbox + +\AtBeginDocument{ +\renewcommand{\reflectbox}[1]{\scalebox{-1}[1]{#1}} +} +% \end{macrocode} +% \end{macro} + + + +% \begin{macro}{\resizebox} \marg{h-length} \marg{v-length} \marg{text} +% +% Simply prints its text argument. +% \begin{macrocode} +\LetLtxMacro\LWR@origresizebox\resizebox + +\AtBeginDocument{ +\renewcommand{\resizebox}[3]{#3} +} +% \end{macrocode} +% \end{macro} + + % % \iffalse %</graphics> @@ -25286,12 +25820,19 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor % \DescribePackage{graphicx} % \pkg{graphicx} is emulated. % +% \pkg{graphicx} loads \pkg{graphics}, which also loads \pkg{lwarp-graphics}, +% which remembers the original graphics definitions for use inside a \env{lateximage}, +% and then patches them \cs{AtBeginDocument} for \HTML\ output. +% +% \pkg{lwarp-graphics} handles the syntax of either \pkg{graphics} or \pkg{graphicx}. +% +% \changes{v0.40}{2017/09/07}{\pkg{graphicx}: Moved out of the \pkg{lwarp} core.} +% % \codehtml % \begin{macrocode} -\LWR@ProvidesPackageDrop{graphicx} +\LWR@ProvidesPackagePass{graphicx} % \end{macrocode} - % \iffalse %</graphicx> % \fi @@ -25313,24 +25854,17 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor % \DescribePackage{grffile} % \limitsgrffile % +% \pkg{lwarp-grffile} now exists as a placeholder since \pkg{grffile} +% used to be emulated by \pkg{lwarp}, and thus older versions of \pkg{lwarp-grffile} +% may exist and should be overwritten by this newer version. +% % \changes{v0.38}{2017/08/25}{\pkg{grffile}: Added.} +% \changes{v0.40}{2017/09/25}{\pkg{grffile}: Directly supported.} % % \codehtml % % \begin{macrocode} -\LWR@ProvidesPackageDrop{grffile} -% \end{macrocode} -% -% \begin{macrocode} -\define@key{igraph}{multidot}{} -\define@key{igraph}{babel}{} -\define@key{igraph}{extendedchars}{} -\define@key{igraph}{encoding}{} -\define@key{igraph}{inputencoding}{} -\define@key{igraph}{filenameencoding}{} -\define@key{igraph}{space}{} - -\newcommand*{\grffilesetup}[1]{} +\LWR@ProvidesPackagePass{grffile} % \end{macrocode} % % \iffalse @@ -25373,7 +25907,7 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor -% ^^A \begin{macro}{\hyperimage} \marg{url} \marg{alt text} +% \begin{noindmacro}{\hyperimage} \marg{url} \marg{alt text} % % Insert an image with alt text: % \begin{macrocode} @@ -25389,10 +25923,12 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor \LWR@hyperimageb% } % \end{macrocode} -% ^^A \end{macro} +% \end{noindmacro} % % -% ^^A \begin{macro}{\hyperdef} \marg{1: category} \marg{2: name} \marg{3: text} +% \begin{noindmacro}{\hyperdef} +% \marg{1: category} \marg{2: name} \marg{3: text} +% % Creates an \HTML\ anchor to |category.name| with the given text. % % \begin{macrocode} @@ -25402,11 +25938,11 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor #3% } % \end{macrocode} -% ^^A \end{macro} +% \end{noindmacro} % % -% ^^A \begin{macro}{\LWR@hyperrefb} \marg{1: URL} \marg{2: category} -% ^^A \marg{3: name} \marg{4: text} +% \begin{noindmacro}{\LWR@hyperrefb} \marg{1: URL} \marg{2: category} +% \marg{3: name} \marg{4: text} % % Creates an \HTML\ link to |URL#category.name| with the given text. % \begin{macrocode} @@ -25417,9 +25953,9 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor \endgroup% } % \end{macrocode} -% ^^A \end{macro} +% \end{noindmacro} -% ^^A \begin{macro}{\LWR@hyperrefc} \oarg{label} \marg{text} +% \begin{noindmacro}{\LWR@hyperrefc} \oarg{label} \marg{text} % % Creates text as an \HTML\ link to the \LaTeX\ label. % \begin{macrocode} @@ -25430,12 +25966,11 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor \endgroup% } % \end{macrocode} -% ^^A \end{macro} +% \end{noindmacro} -% ^^A \begin{macro}{\hyperref} -% ^^A \marg{1: URL} \marg{2: category} \marg{3: name} \marg{4: text} \quad -or- -% -% ^^A \oarg{1: label} \marg{2: text} +% \begin{noindmacro}{\hyperref} +% \marg{1: URL} \marg{2: category} \marg{3: name} \marg{4: text} \quad ---\,or\,--- \\ +% \oarg{1: label} \marg{2: text} % % \begin{macrocode} \newcommand{\hyperref}{% @@ -25444,11 +25979,12 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor \@ifnextchar[\LWR@hyperrefc\LWR@hyperrefb% } % \end{macrocode} -% ^^A \end{macro} +% \end{noindmacro} -% ^^A \begin{macro}{\hypertarget} \marg{name} \marg{text} +% \begin{noindmacro}{\hypertarget} \marg{name} \marg{text} +% % Creates an anchor to |name| with the given text. % % \begin{macrocode} @@ -25457,10 +25993,10 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor #2% } % \end{macrocode} -% ^^A \end{macro} +% \end{noindmacro} -% ^^A \begin{macro}{\hyperlink} \marg{name} \marg{text} +% \begin{noindmacro}{\hyperlink} \marg{name} \marg{text} % % Creates a link to the anchor created by hypertarget, % with the given link text. @@ -25470,10 +26006,10 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor \hyperref[#1]{#2}% } % \end{macrocode} -% ^^A \end{macro} +% \end{noindmacro} -% ^^A \begin{macro}{\autoref} * \marg{label} +% \begin{noindmacro}{\autoref} * \marg{label} % % For \HTML, \cs{cleveref} is used instead. % @@ -25482,10 +26018,10 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor \IfBooleanTF{#1}{\ref{#2}}{\cref{#2}}% } % \end{macrocode} -% ^^A \end{macro} +% \end{noindmacro} % % -% ^^A \begin{macro}{\autopageref} \marg{label} +% \begin{noindmacro}{\autopageref} \marg{label} % % For \HTML, \cs{cleveref} is used instead. % @@ -25494,59 +26030,59 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor \IfBooleanTF{#1}{\cpageref{#2}}{\cref{#2}}% } % \end{macrocode} -% ^^A \end{macro} +% \end{noindmacro} -% ^^A \begin{macro}{\pdfstringdef} \marg{macroname} \marg{\TeX{}string} +% \begin{noindmacro}{\pdfstringdef} \marg{macroname} \marg{\TeX{}string} % % \begin{macrocode} \newcommand{\pdfstringdef}[2]{} % \end{macrocode} -% ^^A \end{macro} +% \end{noindmacro} -% ^^A \begin{macro}{\pdfbookmark} \oarg{level} \marg{text} \marg{name} +% \begin{noindmacro}{\pdfbookmark} \oarg{level} \marg{text} \marg{name} % % \begin{macrocode} \newcommand{\pdfbookmark}[3][]{} % \end{macrocode} -% ^^A \end{macro} +% \end{noindmacro} -% ^^A \begin{macro}{\currentpdfbookmark} \marg{text} \marg{name} +% \begin{noindmacro}{\currentpdfbookmark} \marg{text} \marg{name} % % \begin{macrocode} \newcommand{\currentpdfbookmark}[2]{} % \end{macrocode} -% ^^A \end{macro} +% \end{noindmacro} -% ^^A \begin{macro}{\subpdfbookmark} \marg{text} \marg{name} +% \begin{noindmacro}{\subpdfbookmark} \marg{text} \marg{name} % % \begin{macrocode} \newcommand{\subpdfbookmark}[2]{} % \end{macrocode} -% ^^A \end{macro} +% \end{noindmacro} -% ^^A \begin{macro}{\belowpdfbookmark} \marg{text} \marg{name} +% \begin{noindmacro}{\belowpdfbookmark} \marg{text} \marg{name} % % \begin{macrocode} \newcommand{\belowpdfbookmark}[2]{} % \end{macrocode} -% ^^A \end{macro} +% \end{noindmacro} -% ^^A \begin{macro}{\texorpdfstring} \marg{\TeX{}string} \marg{PDFstring} +% \begin{noindmacro}{\texorpdfstring} \marg{\TeX{}string} \marg{PDFstring} % % \begin{macrocode} \newcommand{\texorpdfstring}[2]{#2} % \end{macrocode} -% ^^A \end{macro} +% \end{noindmacro} -% ^^A \begin{macro}{\hypercalcbp} \marg{dimen} \quad +% \begin{noindmacro}{\hypercalcbp} \marg{dimen} \quad % From \pkg{hyperref}. % % \begin{macrocode} @@ -25554,127 +26090,127 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor \strip@pt\dimexpr 0.99626401\dimexpr(#1)\relax\relax }% % \end{macrocode} -% ^^A \end{macro} +% \end{noindmacro} -% ^^A \begin{macro}{\Acrobatmenu} \marg{menuoption} \marg{text} +% \begin{noindmacro}{\Acrobatmenu} \marg{menuoption} \marg{text} % % \begin{macrocode} \newcommand{\Acrobatmenu}[2]{} % \end{macrocode} -% ^^A \end{macro} +% \end{noindmacro} -% ^^A \begin{macro}{\TextField} \oarg{parameters} \marg{label} +% \begin{noindmacro}{\TextField} \oarg{parameters} \marg{label} % % \begin{macrocode} \newcommand*{\TextField}[2][]{} % \end{macrocode} -% ^^A \end{macro} +% \end{noindmacro} -% ^^A \begin{macro}{\CheckBox} \oarg{parameters} \marg{label} +% \begin{noindmacro}{\CheckBox} \oarg{parameters} \marg{label} % % \begin{macrocode} \newcommand*{\CheckBox}[2][]{} % \end{macrocode} -% ^^A \end{macro} +% \end{noindmacro} -% ^^A \begin{macro}{\ChoiceMenu} \oarg{parameters} \marg{label} \marg{choices} +% \begin{noindmacro}{\ChoiceMenu} \oarg{parameters} \marg{label} \marg{choices} % % \begin{macrocode} \newcommand{\ChoiceMenu}[3][]{} % \end{macrocode} -% ^^A \end{macro} +% \end{noindmacro} -% ^^A \begin{macro}{\PushButton} \oarg{parameters} \marg{label} +% \begin{noindmacro}{\PushButton} \oarg{parameters} \marg{label} % % \begin{macrocode} \newcommand*{\PushButton}[2][]{} % \end{macrocode} -% ^^A \end{macro} +% \end{noindmacro} -% ^^A \begin{macro}{\Submit} \oarg{parameters} \marg{label} +% \begin{noindmacro}{\Submit} \oarg{parameters} \marg{label} % % \begin{macrocode} \newcommand*{\Submit}[2][]{} % \end{macrocode} -% ^^A \end{macro} +% \end{noindmacro} -% ^^A \begin{macro}{\Reset} \oarg{parameters} \marg{label} +% \begin{noindmacro}{\Reset} \oarg{parameters} \marg{label} % % \begin{macrocode} \newcommand*{\Reset}[2][]{} % \end{macrocode} -% ^^A \end{macro} +% \end{noindmacro} -% ^^A \begin{macro}{\LayoutTextField} \marg{label} \marg{field} +% \begin{noindmacro}{\LayoutTextField} \marg{label} \marg{field} % % \begin{macrocode} \newcommand*{\LayoutTextField}[2]{} % \end{macrocode} -% ^^A \end{macro} +% \end{noindmacro} -% ^^A \begin{macro}{\LayoutChoiceField} \marg{label} \marg{field} +% \begin{noindmacro}{\LayoutChoiceField} \marg{label} \marg{field} % % \begin{macrocode} \newcommand*{\LayoutChoiceField}[2]{} % \end{macrocode} -% ^^A \end{macro} +% \end{noindmacro} -% ^^A \begin{macro}{\LayoutCheckField} \marg{label} \marg{field} +% \begin{noindmacro}{\LayoutCheckField} \marg{label} \marg{field} % % \begin{macrocode} \newcommand*{\LayoutCheckField}[2]{} % \end{macrocode} -% ^^A \end{macro} +% \end{noindmacro} -% ^^A \begin{macro}{\MakeRadioField} \marg{width} \marg{height} +% \begin{noindmacro}{\MakeRadioField} \marg{width} \marg{height} % % \begin{macrocode} \newcommand*{\MakeRadioField}[2]{} % \end{macrocode} -% ^^A \end{macro} +% \end{noindmacro} -% ^^A \begin{macro}{\MakeCheckField} \marg{width} \marg{height} +% \begin{noindmacro}{\MakeCheckField} \marg{width} \marg{height} % % \begin{macrocode} \newcommand*{\MakeCheckField}[2]{} % \end{macrocode} -% ^^A \end{macro} +% \end{noindmacro} -% ^^A \begin{macro}{\MakeTextField} \marg{width} \marg{height} +% \begin{noindmacro}{\MakeTextField} \marg{width} \marg{height} % % \begin{macrocode} \newcommand*{\MakeTextField}[2]{} % \end{macrocode} -% ^^A \end{macro} +% \end{noindmacro} -% ^^A \begin{macro}{\MakeChoiceField} \marg{width} \marg{height} +% \begin{noindmacro}{\MakeChoiceField} \marg{width} \marg{height} % % \begin{macrocode} \newcommand*{\MakeChoiceField}[2]{} % \end{macrocode} -% ^^A \end{macro} +% \end{noindmacro} -% ^^A \begin{macro}{\MakeFieldButton} \marg{text} +% \begin{noindmacro}{\MakeFieldButton} \marg{text} % % \begin{macrocode} \newcommand{\MakeFieldButton}[1]{} % \end{macrocode} -% ^^A \end{macro} +% \end{noindmacro} % \iffalse %</hyperref> @@ -26208,7 +26744,7 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor % \end{macrocode} % % -% ^^A \begin{macro}{\lst@Init} \marg{backslash-processing} +% \begin{noindmacro}{\lst@Init} \marg{backslash-processing} \quad % Done at the start of a listing. % \begin{macrocode} \renewcommand{\lst@Init}[1]{% @@ -26241,10 +26777,10 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor \fi% } % \end{macrocode} -% ^^A \end{macro} +% \end{noindmacro} % % -% ^^A \begin{macro}{\lst@DeInit} Done at the end of a listing. +% \begin{noindmacro}{\lst@DeInit} \quad Done at the end of a listing. % \begin{macrocode} \renewcommand*{\lst@DeInit}{% \lst@ifdisplaystyle% @@ -26271,11 +26807,11 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor \LWR@origlst@DeInit% } % \end{macrocode} -% ^^A \end{macro} +% \end{noindmacro} % % % -% ^^A \begin{macro}{\lst@MakeCaption} \marg{t/b} +% \begin{noindmacro}{\lst@MakeCaption} \marg{t/b} % % This is called BOTH at the top and at the bottom of each listing. % @@ -26368,7 +26904,7 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor \LWR@traceinfo{DONE WITH CAPTION at #1}% } % \end{macrocode} -% ^^A \end{macro} +% \end{noindmacro} % % % Patched to keep left line numbers outside of the left margin, and @@ -26779,7 +27315,7 @@ endinnercode={\LWR@stoppars}, % \end{macrocode} % % -% ^^A \begin{macro}{\LWR@mdfprintcolor} \marg{mdfcolorkey} +% \begin{noindmacro}{\LWR@mdfprintcolor} \marg{mdfcolorkey} % % Given the \pkg{mdframed} key, print the color. % \begin{macrocode} @@ -26788,9 +27324,9 @@ endinnercode={\LWR@stoppars}, \#\LWR@tempcolor } % \end{macrocode} -% ^^A \end{macro} +% \end{noindmacro} -% ^^A \begin{macro}{\LWR@mdfprintlength} \marg{mdflengthkey} +% \begin{noindmacro}{\LWR@mdfprintlength} \marg{mdflengthkey} % % Given the \pkg{mdframed} key, print the length. % \begin{macrocode} @@ -26798,10 +27334,10 @@ endinnercode={\LWR@stoppars}, \rndprintlength{\csuse{mdf@#1@length}} } % \end{macrocode} -% ^^A \end{macro} +% \end{noindmacro} % -% ^^A \begin{macro}{\LWR@mdframedstart} +% \begin{noindmacro}{\LWR@mdframedstart} % Actions before an mdframe starts. % % Encapsulate a frame inside a \element{div} of the desired |class|. @@ -26859,9 +27395,9 @@ border-radius: \LWR@mdfprintlength{roundcorner} ; \LWR@orignewline \LetLtxMacro\makebox\LWR@origmakebox% } % \end{macrocode} -% ^^A \end{macro} +% \end{noindmacro} % -% ^^A \begin{macro}{\LWR@mdframedend} +% \begin{noindmacro}{\LWR@mdframedend} % Actions after an mdframe ends. % % After closing the \element{div}, globally restore to the default environment type: @@ -26881,10 +27417,10 @@ border-radius: \LWR@mdfprintlength{roundcorner} ; \LWR@orignewline \LWR@startpars% } % \end{macrocode} -% ^^A \end{macro} +% \end{noindmacro} % % -% ^^A \begin{macro}{\mdfframedtitleenv} \marg{title} +% \begin{noindmacro}{\mdfframedtitleenv} \marg{title} % % Encapsulation of the original which places the title % inside a \element{span} of class |mdframedtitle|: @@ -26951,10 +27487,11 @@ border-radius: } } % \end{macrocode} -% ^^A \end{macro} +% \end{noindmacro} % % -% ^^A \begin{macro}{\LWR@mdfsubtitlecommon} \marg{sub -or subsub} \oarg{options} \marg{title} +% \begin{noindmacro}{\LWR@mdfsubtitlecommon} +% \marg{sub -or- subsub} \oarg{options} \marg{title} % % Common code for \cs{LWR@mdfsubtitle} and \cs{LWR@mdfsubsubtitle}. % @@ -27022,9 +27559,9 @@ background: } % \end{macrocode} -% ^^A \end{macro} +% \end{noindmacro} % -% ^^A \begin{macro}{\LWR@mdfsubtitle} \oarg{options} \marg{title} +% \begin{noindmacro}{\LWR@mdfsubtitle} \oarg{options} \marg{title} % \begin{macrocode} \let\LWR@origmdfsubtitle\mdfsubtitle @@ -27033,10 +27570,10 @@ background: } \let\mdfsubtitle\LWR@mdfsubtitle % \end{macrocode} -% ^^A \end{macro} +% \end{noindmacro} % % -% ^^A \begin{macro}{\LWR@mdfsubsubtitle} \oarg{options} \marg{title} +% \begin{noindmacro}{\LWR@mdfsubsubtitle} \oarg{options} \marg{title} % \begin{macrocode} \let\LWR@origmdfsubsubtitle\mdfsubsubtitle @@ -27045,19 +27582,19 @@ background: } \let\mdfsubsubtitle\LWR@mdfsubsubtitle % \end{macrocode} -% ^^A \end{macro} +% \end{noindmacro} % % % -% ^^A \begin{macro}{\LWR@mdthisenv} +% \begin{noindmacro}{\LWR@mdthisenv} % Stores the environment of the frame about to be created: % \begin{macrocode} \newcommand*{\LWR@mdthisenv}{mdframed} % \end{macrocode} -% ^^A \end{macro} +% \end{noindmacro} % % -% ^^A \begin{macro}{\newmdenv} \oarg{options} \marg{env-name} +% \begin{noindmacro}{\newmdenv} \oarg{options} \marg{env-name} % % Modified from the original to remember the environment. % \begin{macrocode} @@ -27071,9 +27608,9 @@ background: {\end{mdframed}}% } % \end{macrocode} -% ^^A \end{macro} +% \end{noindmacro} % -% ^^A \begin{macro}{\surroundwithmdframed} \oarg{options} \marg{environment} +% \begin{noindmacro}{\surroundwithmdframed} \oarg{options} \marg{environment} % % Modified from the original to remember the environment. % \begin{macrocode} @@ -27084,10 +27621,10 @@ background: \AfterEndEnvironment{#2}{\end{mdframed}}% } % \end{macrocode} -% ^^A \end{macro} +% \end{noindmacro} % % -% ^^A \begin{macro}{\mdtheorem} \oarg{mdframed-options}{envname} +% \begin{noindmacro}{\mdtheorem} \oarg{mdframed-options}{envname} % \oarg{numberedlike} \marg{caption} \oarg{within} % % Modified from the original to remember the environment. @@ -27184,19 +27721,20 @@ background: }% } % \end{macrocode} -% ^^A \end{macro} +% \end{noindmacro} % % -% ^^A \begin{macro}{\newmdtheoremenv} \oarg{mdframed-options}{envname} +% \begin{noindmacro}{\newmdtheoremenv} \oarg{mdframed-options}{envname} % \oarg{numberedlike} \marg{caption} \oarg{within} % % Modified from the original to remember the environment. % \begin{macrocode} \DeclareDocumentCommand\newmdtheoremenv{O{} m o m o }{% \ifboolexpr{ test {\IfNoValueTF {#3}} and test {\IfNoValueTF {#5}} }% - {\newtheorem{#2}{#4}}{% - \IfValueTF{#3}{\newtheorem{#2}[#3]{#4}}{}% - \IfValueTF{#5}{\newtheorem{#2}{#4}[#5]}{}% + {\newtheorem{#2}{#4}}% + {% + \IfValueT{#3}{\newtheorem{#2}[#3]{#4}}% + \IfValueT{#5}{\newtheorem{#2}{#4}[#5]}% }% \BeforeBeginEnvironment{#2}{% \renewcommand*{\LWR@mdthisenv}{md#2}% @@ -27205,7 +27743,7 @@ background: \end{mdframed}}% } % \end{macrocode} -% ^^A \end{macro} +% \end{noindmacro} % \iffalse %</mdframed> @@ -27315,6 +27853,36 @@ background: % % % +% \iffalse +%<*midfloat> +% \fi +% +% \part{lwarp-midfloat.sty} +% +% \section{midfloat} +% +% \DescribePackage{midfloat} +% \pkg{midfloat} is emulated. +% +% \changes{v0.40}{2017/09/07}{\pkg{midfloat}: Added.} +% +% \codehtml +% +% \begin{macrocode} +\LWR@ProvidesPackageDrop{midfloat} +% \end{macrocode} +% +% \begin{macrocode} +\newenvironment{strip}[1][]{}{} +\newskip\stripsep +% \end{macrocode} +% +% \iffalse +%</midfloat> +% \fi +% +% +% % % % \iffalse @@ -27493,7 +28061,7 @@ background: \begin{warpHTML} % \end{macrocode} -% ^^A \begin{environment}{multicols} * \marg{numcols} \oarg{heading} +% \begin{noindenvironment}{multicols} * \marg{numcols} \oarg{heading} % \begin{macrocode} \NewDocumentEnvironment{multicols}{s m o} % \end{macrocode} @@ -27505,13 +28073,13 @@ background: % \end{macrocode} % Optional \HTML\ \element{div} class for the heading: % \begin{macrocode} -\IfValueTF{#3}{\begin{BlockClass}{multicolsheading}#3\end{BlockClass}}{}} +\IfValueT{#3}{\begin{BlockClass}{multicolsheading}#3\end{BlockClass}}} % \end{macrocode} % When done with the environment, close the \element{div}: % \begin{macrocode} {\endBlockClass} % \end{macrocode} -% ^^A \end{environment} +% \end{noindenvironment} % Emulated null functions which are not used in \HTML: % \begin{macrocode} @@ -27593,6 +28161,7 @@ background: % \changes{v0.39}{2017/08/30}{Add: New optional \protect\texttt{vpos} argument.} % \changes{v0.39}{2017/08/30}{Add: Supports left/right border for \pkg{bigdelim}.} % \changes{v0.39}{2017/08/30}{Fix: Long text argument.} +% \changes{v0.40}{2017/09/22}{Improved \pkg{bigdelim} borders.} % \begin{macrocode} \RenewDocumentCommand{\multirow}{O{c} m o m o +m}% {% @@ -27613,7 +28182,8 @@ background: % The left/right border, if given: % \begin{macrocode} \ifdefvoid{\LWR@multirowborder}{}{% -style="border-\LWR@multirowborder: 2px solid black" % +style="border-\LWR@multirowborder: 2px dotted black ; % +padding-\LWR@multirowborder: 2px" % } % \end{macrocode} % A class adds the column spec and the rule: @@ -27658,7 +28228,7 @@ class="td% % \changes{v0.39}{2017/08/30}{Added.} % % \begin{macrocode} -\RenewDocumentCommand{\multicolumnrow}{m m O{} m O{} m O{} +m}{% +\NewDocumentCommand{\multicolumnrow}{m m O{} m O{} m O{} +m}{% % \end{macrocode} % Figure out how many extra \HTML\ columns to add for |@| and |!| columns: % \begin{macrocode} @@ -27942,24 +28512,24 @@ class="td% \LWR@ProvidesPackageDrop{nowidow} % \end{macrocode} -% ^^A \begin{macro}{\nowidow} \oarg{lines} -% ^^A \begin{macro}{\setnowidow} \oarg{lines} +% \begin{noindmacro}{\nowidow} \oarg{lines} +% \begin{noindmacro}{\setnowidow} \oarg{lines} % \begin{macrocode} \newcommand*{\nowidow}[1][]{} \newcommand*{\setnowidow}[1][]{} % \end{macrocode} -% ^^A \end{macro} -% ^^A \end{macro} - -% ^^A \begin{macro}{\noclub} \oarg{lines} -% ^^A \begin{macro}{\setnoclub} \oarg{lines} +% \end{noindmacro} +% \end{noindmacro} +% +% \begin{noindmacro}{\noclub} \oarg{lines} +% \begin{noindmacro}{\setnoclub} \oarg{lines} % \begin{macrocode} \newcommand*{\noclub}[1][]{} \newcommand*{\setnoclub}[1][]{} % \end{macrocode} -% ^^A \end{macro} -% ^^A \end{macro} - +% \end{noindmacro} +% \end{noindmacro} +% % \iffalse %</nowidow> % \fi @@ -28702,6 +29272,37 @@ class="td% % % % +% +% +% \iffalse +%<*pfnote> +% \fi +% +% \part{lwarp-pfnote.sty} +% +% \section{pfnote} +% +% \DescribePackage{pfnote} +% \pkg{pfnote} is emulated. +% +% \limitspfnote +% +% \changes{v0.40}{2017/09/06}{\pkg{pfnote}: Added.} +% +% \codehtml +% +% \begin{macrocode} +\LWR@ProvidesPackageDrop{pfnote} +% \end{macrocode} +% +% \iffalse +%</pfnote> +% \fi +% +% +% +% +% % \iffalse %<*placeins> % \fi @@ -28769,6 +29370,85 @@ class="td% % % % +% \iffalse +%<*quotchap> +% \fi +% +% \part{lwarp-quotchap.sty} +% +% \section{quotchap} +% +% \DescribePackage{quotchap} +% \pkg{quotchap} is emulated. +% +% \credits{Karsten Tinnefeld, Jan Klever} +% +% \changes{v0.40}{2017/09/22}{\pkg{quotchap}: Added.} +% +% \codehtml +% +% \begin{macrocode} +\LWR@ProvidesPackageDrop{quotchap} +% \end{macrocode} +% +% \begin{macrocode} +\newcommand{\@quotchap}{} +\newlength{\LWR@quotchapwidth} + +\let\@printcites\relax + +\newcommand*{\@iprintcites}{% +% \end{macrocode} +% Place the quotes inside a \element{div} +% of class \attribute{quotchap}, +% of the maximum selected width: +% \begin{macrocode} +\uselengthunit{PT}% +\begin{BlockClass}[max-width: \rndprintlength{\LWR@quotchapwidth}]{quotchap} +%\begin{minipage}{\LWR@quotchapwidth} +\@quotchap +%\end{minipage} +\end{BlockClass} +% \end{macrocode} +% Deactivate the quote printing: +% \begin{macrocode} +\global\let\@printcites\relax +} + +\NewEnviron{savequote}[1][\linewidth]{% +% \end{macrocode} +% Remember the width, adjusted for \HTML, +% and make the length assignment global, per: \\ +%\href{https://tex.stackexchange.com/questions/300823/why-is-setlength-ineffective-inside-a-tabular-environment} +%{\ttfamily https://tex.stackexchange.com/questions/300823/ \\ +% \hspace*{2em} why-is-setlength-ineffective-inside-a-tabular-environment} +% \begin{macrocode} +\setlength{\LWR@quotchapwidth}{#1*2}% +\global\LWR@quotchapwidth=\LWR@quotchapwidth% +% \end{macrocode} +% Remember the body, and activate the quote printing: +% \begin{macrocode} +\global\let\@quotchap\BODY +\global\let\@printcites\@iprintcites% +} +% \end{macrocode} +% The quotation author is placed inside a \element{div} +% of class \attribute{qauthor}: +% \begin{macrocode} +\newcommand{\qauthor}[1]{\begin{BlockClass}{qauthor}{#1}\end{BlockClass}} +% \end{macrocode} +% \cs{qsetcnfont} is ignored: +% \begin{macrocode} +\newcommand{\qsetcnfont}[1]{} +% \end{macrocode} +% +% \iffalse +%</quotchap> +% \fi +% +% +% +% % % \iffalse %<*ragged2e> @@ -29195,6 +29875,56 @@ class="td% % % % +% \iffalse +%<*sectsty> +% \fi +% +% \part{lwarp-sectsty.sty} +% +% \section{sectsty} +% +% \DescribePackage{sectsty} +% \pkg{sectsty} is emulated. +% +% \changes{v0.40}{2017/09/12}{\pkg{sectsty}: Added.} +% +% \codehtml +% +% \begin{macrocode} +\LWR@ProvidesPackageDrop{sectsty} +% \end{macrocode} +% +% \begin{macrocode} +\newcommand*{\partfont} [1] {} +\newcommand*{\partnumberfont} [1] {} +\newcommand*{\parttitlefont} [1] {} +\newcommand*{\chapterfont} [1] {} +\newcommand*{\chapternumberfont} [1] {} +\newcommand*{\chaptertitlefont} [1] {} +\newcommand*{\sectionfont} [1] {} +\newcommand*{\subsectionfont} [1] {} +\newcommand*{\subsubsectionfont} [1] {} +\newcommand*{\paragraphfont} [1] {} +\newcommand*{\subparagraphfont} [1] {} +\newcommand*{\minisecfont} [1] {} +\newcommand*{\allsectionsfont}[1] {} +\newcommand{\nohang}{} +% \end{macrocode} +% \cs{sectionrule} is only to be used in |*font| commands, thus it is ignored. +% \begin{macrocode} +\newcommand*{\sectionrule}[5]{} + +\def\ulemheading#1#2{} +% \end{macrocode} +% +% \iffalse +%</sectsty> +% \fi +% +% +% +% +% % % % \iffalse @@ -29673,6 +30403,56 @@ class="td% % % % +% \iffalse +%<*stabular> +% \fi +% +% \part{lwarp-stabular.sty} +% +% \section{stabular} +% +% \DescribePackage{stabular} +% \pkg{stabular} is emulated. +% +% \changes{v0.40}{2017/09/07}{\pkg{stabular}: Added.} +% +% \codehtml +% +% \begin{macrocode} +\LWR@ProvidesPackageDrop{stabular} +% \end{macrocode} +% +% \oarg{vpos} \marg{colspec} +% \marginpar{\hfill {\footnotesize Env} \env{stabular}} +% \begin{macrocode} +\newenvironment{stabular}[2][c] +{ +\renewcommand{\noalign}[1]{} +\begin{tabular}[#1]{#2} +} +{\end{tabular}} +% \end{macrocode} +% +% \marg{width} \oarg{vpos} \marg{colspec} +% \marginpar{\hfill {\footnotesize Env} \env{stabular}} +% \begin{macrocode} +\NewDocumentEnvironment{stabular*}{m o m} +{ +\renewcommand{\noalign}[1]{} +\begin{tabular}[#2]{#3} +} +{\end{tabular}} +% \end{macrocode} +% +% \iffalse +%</stabular> +% \fi +% +% +% +% +% +% % % \iffalse %<*subfig> @@ -30098,6 +30878,39 @@ class="td% % % % +% \iffalse +%<*tabls> +% \fi +% +% \part{lwarp-tabls.sty} +% +% \section{tabls} +% +% \DescribePackage{tabls} +% \pkg{tabls} is emulated. +% \cs{LWR@hline} is used to handle the optional argument when +% \pkg{tabls} is loaded. +% +% \changes{v0.40}{2017/09/06}{\pkg{tabls}: Added.} +% +% \codehtml +% +% \begin{macrocode} +\LWR@ProvidesPackageDrop{tabls} +% \end{macrocode} +% +% \begin{macrocode} +\newdimen\tablinesep +\newdimen\arraylinesep +\newdimen\extrarulesep +% \end{macrocode} +% +% \iffalse +%</tabls> +% \fi +% +% +% % % % \iffalse @@ -30234,6 +31047,8 @@ class="td% % % \changes{v0.37}{2017/08/18}{\pkg{textcomp}: Improved support.} % \changes{v0.38}{2017/08/21}{\pkg{textcomp}: Removed from \pkg{lwarp} core.} +% \changes{v0.40}{2017/09/07}{\pkg{textcomp}: Additional symbols, +% improved XeLaTeX and LuaLaTeX support.} % % \codehtml % @@ -30242,13 +31057,25 @@ class="td% % \end{macrocode} % % -% % The following are restored for print when inside a \env{lateximage}: % \begin{macrocode} \let\LWR@origtextdegree\textdegree \let\LWR@origtextcelsius\textcelsius \let\LWR@origtextohm\textohm \let\LWR@origtextmu\textmu +\let\LWR@origtextlquill\textlquill +\let\LWR@origtextrquill\textrquill +\let\LWR@origtextcircledP\textcircledP +\let\LWR@origtexttwelveudash\texttwelveudash +\let\LWR@origtextthreequartersemdash\textthreequartersemdash +\let\LWR@origtextmho\textmho +\let\LWR@origtextnaira\textnaira +\let\LWR@origtextpeso\textpeso +\let\LWR@origtextrecipe\textrecipe +\let\LWR@origtextpertenthousand\textpertenthousand +\let\LWR@origtextbaht\textbaht +\let\LWR@origtextdiscount\textdiscount +\let\LWR@origtextservicemark\textservicemark \LetLtxMacro\LWR@origcapitalcedilla\capitalcedilla \LetLtxMacro\LWR@origcapitalogonek\capitalogonek \LetLtxMacro\LWR@origcapitalgrave\capitalgrave @@ -30264,18 +31091,51 @@ class="td% \LetLtxMacro\LWR@origcapitaldotaccent\capitaldotaccent \LetLtxMacro\LWR@origtextcircled\textcircled % \end{macrocode} -% For \HTML, use \HTML\ entities or direct Unicode, depending on the engine: +% For \HTML, use \HTML\ entities or direct Unicode, depending on the engine. +% +% \cs{AtBeginDocument} improves support for \LuaLaTeX\ and \XeLaTeX. % \begin{macrocode} +\AtBeginDocument{ \ifPDFTeX \renewcommand*{\textdegree}{\HTMLentity{deg}} -\renewcommand*{\textcelsius}{\HTMLentity{deg}\,C} +\renewcommand*{\textcelsius}{\HTMLunicode{2103}} \renewcommand*{\textohm}{\HTMLunicode{2126}} \renewcommand*{\textmu}{\HTMLunicode{00B5}} +\renewcommand*{\textlquill}{\HTMLunicode{2045}} +\renewcommand*{\textrquill}{\HTMLunicode{2046}} +\renewcommand*{\textcircledP}{\HTMLunicode{2117}} +\renewcommand*{\texttwelveudash}{\HTMLunicode{2014}}% emdash +\renewcommand*{\textthreequartersemdash}{\HTMLunicode{2014}}% emdash +\renewcommand*{\textmho}{\HTMLunicode{2127}} +\renewcommand*{\textnaira}{\HTMLunicode{20A6}} +\renewcommand*{\textpeso}{\HTMLunicode{20B1}} +\renewcommand*{\textrecipe}{\HTMLunicode{211E}} +\renewcommand*{\textpertenthousand}{\HTMLunicode{2031}} +\renewcommand*{\textbaht}{\HTMLunicode{0E3F}} +\renewcommand*{\textdiscount}{\%} +\renewcommand*{\textservicemark}{\HTMLunicode{2120}} \else +% \end{macrocode} +% NOTE: Some of the following do not print well in the listing. +% Consult the .dtx or .sty file for the actual characters. +% \begin{macrocode} \renewcommand*{\textdegree}{°} -\renewcommand*{\textcelsius}{°C} +\renewcommand*{\textcelsius}{℃} \renewcommand*{\textohm}{Ω} -\renewcommand*{\textmu}{μ} +\renewcommand*{\textmu}{µ} +\renewcommand*{\textlquill}{⁅} +\renewcommand*{\textrquill}{⁆} +\renewcommand*{\textcircledP}{℗} +\renewcommand*{\texttwelveudash}{—}% emdash +\renewcommand*{\textthreequartersemdash}{—}% emdash +\renewcommand*{\textmho}{℧} +\renewcommand*{\textnaira}{₦} +\renewcommand*{\textpeso}{₱} +\renewcommand*{\textrecipe}{℞} +\renewcommand*{\textpertenthousand}{‱} +\renewcommand*{\textbaht}{฿} +\renewcommand*{\textdiscount}{\%} +\renewcommand*{\textservicemark}{℠} \fi % \end{macrocode} % For \HTML, Unicode diacritical marks are used: @@ -30299,6 +31159,7 @@ class="td% \renewcommand*{\textcircled}[1]{% \InlineClass[border: 1px solid \LWR@currenttextcolor]{textcircled}{#1}% } +}% AtBeginDocument % \end{macrocode} % % When a \env{lateximage} is begun: @@ -30308,6 +31169,19 @@ class="td% \let\textcelsius\LWR@origtextcelsius% \let\textohm\LWR@origtextohm% \let\textmu\LWR@origtextmu% +\let\textlquill\LWR@origtextlquill% +\let\textrquill\LWR@origtextrquill% +\let\textcircledP\LWR@origtextcircledP% +\let\texttwelveudash\LWR@origtexttwelveudash% +\let\textthreequartersemdash\LWR@origtextthreequartersemdash% +\let\textmho\LWR@origtextmho% +\let\textnaira\LWR@origtextnaira% +\let\textpeso\LWR@origtextpeso% +\let\textrecipe\LWR@origtextrecipe% +\let\textpertenthousand\LWR@origtextpertenthousand% +\let\textbaht\LWR@origtextbaht% +\let\textdiscount\LWR@origtextdiscount% +\let\textservicemark\LWR@origtextservicemark% \LetLtxMacro\capitalcedilla\LWR@origcapitalcedilla% \LetLtxMacro\capitalogonek\LWR@origcapitalogonek% \LetLtxMacro\capitalgrave\LWR@origcapitalgrave% @@ -30633,24 +31507,24 @@ class="td% -% ^^A \begin{macro}{\LWR@printtablenote} \marg{text} +% \begin{noindmacro}{\LWR@printtablenote} \marg{text} % % Prints the table note item header inside a \CSS\ class of |tnoteitemheader|. % \begin{macrocode} \newcommand{\LWR@printtablenote}[1]{\InlineClass{tnoteitemheader}{#1}} % \end{macrocode} -% ^^A \end{macro} +% \end{noindmacro} -% ^^A \begin{environment}{threeparttable} \oarg{alignment} +% \begin{noindenvironment}{threeparttable} \oarg{alignment} % To emulate threeparttable: % \begin{macrocode} \newenvironment*{threeparttable}[1][b]{}{} % \end{macrocode} -% ^^A \end{environment} +% \end{noindenvironment} -% ^^A \begin{environment}{tablenotes} \oarg{options} +% \begin{noindenvironment}{tablenotes} \oarg{options} % \changes{v0.19}{2016/06/01}{CSS for table note item.} % \begin{macrocode} \newenvironment*{tablenotes}[1][] @@ -30667,12 +31541,13 @@ class="td% \endBlockClass% } % \end{macrocode} -% ^^A \end{environment} -% ^^A \begin{macro}{\tnote} +% \end{noindenvironment} +% +% \begin{noindmacro}{\tnote} \marg{text} % \begin{macrocode} \newcommand{\tnote}[1]{\LWR@htmlspan{sup}{#1}} % \end{macrocode} -% ^^A \end{macro} +% \end{noindmacro} % \iffalse %</threeparttable> @@ -30798,75 +31673,75 @@ class="td% % % \cs{pagestyle} and \cs{thispagestyle} are already disabled in the \pkg{lwarp} code. % -% ^^A \begin{macro}{\newpagestyle} \marg{name} \oarg{style} \marg{commands} -% ^^A \begin{macro}{\renewpagestyle} \marg{name} \oarg{style} \marg{commands} +% \begin{noindmacro}{\newpagestyle} \marg{name} \oarg{style} \marg{commands} +% \begin{noindmacro}{\renewpagestyle} \marg{name} \oarg{style} \marg{commands} % \begin{macrocode} \NewDocumentCommand{\newpagestyle}{m o m}{} \NewDocumentCommand{\renewpagestyle}{m o m}{} % \end{macrocode} -% ^^A \end{macro} -% ^^A \end{macro} +% \end{noindmacro} +% \end{noindmacro} -% ^^A \begin{macro}{\sethead} \oarg{el} \oarg{ec} \oarg{er} \marg{ol} \marg{oc} \marg{or} -% ^^A \begin{macro}{\setfoot} \oarg{el} \oarg{ec} \oarg{er} \marg{ol} \marg{oc} \marg{or} +% \begin{noindmacro}{\sethead} \oarg{el} \oarg{ec} \oarg{er} \marg{ol} \marg{oc} \marg{or} +% \begin{noindmacro}{\setfoot} \oarg{el} \oarg{ec} \oarg{er} \marg{ol} \marg{oc} \marg{or} % \begin{macrocode} \NewDocumentCommand{\sethead}{o o o m m m}{} \NewDocumentCommand{\setfoot}{o o o m m m}{} % \end{macrocode} -% ^^A \end{macro} -% ^^A \end{macro} +% \end{noindmacro} +% \end{noindmacro} -% ^^A \begin{macro}{\settitlemarks} * \marg{names} +% \begin{noindmacro}{\settitlemarks} * \marg{names} % \begin{macrocode} \NewDocumentCommand{\settitlemarks}{s m}{} % \end{macrocode} -% ^^A \end{macro} +% \end{noindmacro} -% ^^A \begin{macro}{\headrule} -% ^^A \begin{macro}{\footrule} +% \begin{noindmacro}{\headrule} +% \begin{noindmacro}{\footrule} % \begin{macrocode} \newcommand*{\headrule}{} \newcommand*{\footrule}{} % \end{macrocode} -% ^^A \end{macro} -% ^^A \end{macro} +% \end{noindmacro} +% \end{noindmacro} -% ^^A \begin{macro}{\setheadrule} \marg{length} -% ^^A \begin{macro}{\setfootrule} \marg{length} +% \begin{noindmacro}{\setheadrule} \marg{length} +% \begin{noindmacro}{\setfootrule} \marg{length} % \begin{macrocode} \newcommand*{\setheadrule}[1]{} \newcommand*{\setfootrule}[1]{} % \end{macrocode} -% ^^A \end{macro} -% ^^A \end{macro} +% \end{noindmacro} +% \end{noindmacro} -% ^^A \begin{macro}{\makeheadrule} -% ^^A \begin{macro}{\makefootrule} +% \begin{noindmacro}{\makeheadrule} +% \begin{noindmacro}{\makefootrule} % \begin{macrocode} \newcommand*{\makeheadrule}{} \newcommand*{\makefootrule}{} % \end{macrocode} -% ^^A \end{macro} -% ^^A \end{macro} +% \end{noindmacro} +% \end{noindmacro} -% ^^A \begin{macro}{\setmarkboth} \marg{code} +% \begin{noindmacro}{\setmarkboth} \marg{code} % \begin{macrocode} \newcommand{\setmarkboth}[1]{} % \end{macrocode} -% ^^A \end{macro} +% \end{noindmacro} -% ^^A \begin{macro}{\widenhead} +% \begin{noindmacro}{\widenhead} % \begin{macrocode} \NewDocumentCommand{\widenhead}{s o o m m}{} % \end{macrocode} -% ^^A \end{macro} +% \end{noindmacro} -% ^^A \begin{macro}{\bottitlemarks} -% ^^A \begin{macro}{\toptitlemarks} -% ^^A \begin{macro}{\firsttitlemarks} -% ^^A \begin{macro}{\nexttitlemarks} -% ^^A \begin{macro}{\outertitlemarks} -% ^^A \begin{macro}{\innertitlemarks} +% \begin{noindmacro}{\bottitlemarks} +% \begin{noindmacro}{\toptitlemarks} +% \begin{noindmacro}{\firsttitlemarks} +% \begin{noindmacro}{\nexttitlemarks} +% \begin{noindmacro}{\outertitlemarks} +% \begin{noindmacro}{\innertitlemarks} % \begin{macrocode} \newcommand*{\bottitlemarks}{} \newcommand*{\toptitlemarks}{} @@ -30875,67 +31750,67 @@ class="td% \newcommand*{\outertitlemarks}{} \newcommand*{\innertitlemarks}{} % \end{macrocode} -% ^^A \end{macro} -% ^^A \end{macro} -% ^^A \end{macro} -% ^^A \end{macro} -% ^^A \end{macro} -% ^^A \end{macro} +% \end{noindmacro} +% \end{noindmacro} +% \end{noindmacro} +% \end{noindmacro} +% \end{noindmacro} +% \end{noindmacro} -% ^^A \begin{macro}{\newtitlemark} * \marg{name} +% \begin{noindmacro}{\newtitlemark} * \marg{name} % \begin{macrocode} \NewDocumentCommand{\newtitlemark}{s m}{} % \end{macrocode} -% ^^A \end{macro} +% \end{noindmacro} -% ^^A \begin{macro}{\pretitlemark} * \marg{section} \marg{text} +% \begin{noindmacro}{\pretitlemark} * \marg{section} \marg{text} % \begin{macrocode} \NewDocumentCommand{\pretitlemark}{s m m}{} % \end{macrocode} -% ^^A \end{macro} +% \end{noindmacro} -% ^^A \begin{macro}{\ifsamemark} \marg{group} \marg{command} \marg{true} \marg{false} +% \begin{noindmacro}{\ifsamemark} \marg{group} \marg{command} \marg{true} \marg{false} % \begin{macrocode} \newcommand{\ifsamemark}[4]{} % \end{macrocode} -% ^^A \end{macro} +% \end{noindmacro} -% ^^A \begin{macro}{\setfloathead} * \oarg{.} \oarg{.} \oarg{.} \marg{.} \marg{.} \marg{.} \marg{extra} \oarg{which} -% ^^A \begin{macro}{\setfloatfoot} * \oarg{.} \oarg{.} \oarg{.} \marg{.} \marg{.} \marg{.} \marg{extra} \oarg{which} +% \begin{noindmacro}{\setfloathead} * \oarg{.} \oarg{.} \oarg{.} \marg{.} \marg{.} \marg{.} \marg{extra} \oarg{which} +% \begin{noindmacro}{\setfloatfoot} * \oarg{.} \oarg{.} \oarg{.} \marg{.} \marg{.} \marg{.} \marg{extra} \oarg{which} % \begin{macrocode} \NewDocumentCommand{\setfloathead}{s o o o m m m m m}{} \NewDocumentCommand{\setfloatfoot}{s o o o m m m m m}{} % \end{macrocode} -% ^^A \end{macro} -% ^^A \end{macro} +% \end{noindmacro} +% \end{noindmacro} -% ^^A \begin{macro}{\nextfloathead} * \oarg{.} \oarg{.} \oarg{.} \marg{.} \marg{.} \marg{.} \marg{extra} \oarg{which} -% ^^A \begin{macro}{\nextfloatfoot} * \oarg{.} \oarg{.} \oarg{.} \marg{.} \marg{.} \marg{.} \marg{extra} \oarg{which} +% \begin{noindmacro}{\nextfloathead} * \oarg{.} \oarg{.} \oarg{.} \marg{.} \marg{.} \marg{.} \marg{extra} \oarg{which} +% \begin{noindmacro}{\nextfloatfoot} * \oarg{.} \oarg{.} \oarg{.} \marg{.} \marg{.} \marg{.} \marg{extra} \oarg{which} % \begin{macrocode} \NewDocumentCommand{\nextfloathead}{s o o o m m m m m}{} \NewDocumentCommand{\nextfloatfoot}{s o o o m m m m m}{} % \end{macrocode} -% ^^A \end{macro} -% ^^A \end{macro} +% \end{noindmacro} +% \end{noindmacro} -% ^^A \begin{macro}{\newmarkset} \marg{markset} +% \begin{noindmacro}{\newmarkset} \marg{markset} % \begin{macrocode} \newcommand{\newmarkset}[1]{} % \end{macrocode} -% ^^A \end{macro} +% \end{noindmacro} -% ^^A \begin{macro}{\newextramark} * \marg{markset} \marg{macro-name} +% \begin{noindmacro}{\newextramark} * \marg{markset} \marg{macro-name} % \begin{macrocode} \NewDocumentCommand{\newextramarkset}{s m m}{} % \end{macrocode} -% ^^A \end{macro} +% \end{noindmacro} -% ^^A \begin{macro}{\botextramarks} \marg{markset} -% ^^A \begin{macro}{\topextramarks} \marg{markset} -% ^^A \begin{macro}{\firstextramarks} \marg{markset} -% ^^A \begin{macro}{\nextextramarks} \marg{markset} -% ^^A \begin{macro}{\outerextramarks} \marg{markset} -% ^^A \begin{macro}{\innerextramarks} \marg{markset} +% \begin{noindmacro}{\botextramarks} \marg{markset} +% \begin{noindmacro}{\topextramarks} \marg{markset} +% \begin{noindmacro}{\firstextramarks} \marg{markset} +% \begin{noindmacro}{\nextextramarks} \marg{markset} +% \begin{noindmacro}{\outerextramarks} \marg{markset} +% \begin{noindmacro}{\innerextramarks} \marg{markset} % \begin{macrocode} \newcommand{\botextramarks}[1]{} \newcommand{\topextramarks}[1]{} @@ -30944,12 +31819,12 @@ class="td% \newcommand{\outerextramarks}[1]{} \newcommand{\innerextramarks}[1]{} % \end{macrocode} -% ^^A \end{macro} -% ^^A \end{macro} -% ^^A \end{macro} -% ^^A \end{macro} -% ^^A \end{macro} -% ^^A \end{macro} +% \end{noindmacro} +% \end{noindmacro} +% \end{noindmacro} +% \end{noindmacro} +% \end{noindmacro} +% \end{noindmacro} % \iffalse %</titleps> @@ -31013,16 +31888,16 @@ class="td% \LWR@ProvidesPackageDrop{titlesec} % \end{macrocode} -% ^^A \begin{macro}{\titlelabel} \marg{label-format} +% \begin{noindmacro}{\titlelabel} \marg{label-format} % \begin{macrocode} \newcommand*{\titlelabel}[1]{} % \end{macrocode} -% ^^A \end{macro} +% \end{noindmacro} -% ^^A \begin{macro}{\titleformat*} \marg{command} \marg{format} +% \begin{noindmacro}{\titleformat*} \marg{command} \marg{format} % -% ^^A \begin{macro}{\titleformat} \marg{command} \oarg{shape} \marg{format} -% ^^A \marg{label} \marg{sep} \marg{begfore} \oarg{after} +% \begin{noindmacro}{\titleformat} \marg{command} \oarg{shape} \marg{format} +% \marg{label} \marg{sep} \marg{begfore} \oarg{after} % \begin{macrocode} \newcommand\titleformat{% \@ifstar{\ttl@format@s}% @@ -31030,30 +31905,30 @@ class="td% \newcommand{\ttl@format@s}[1]{} \NewDocumentCommand{\ttl@format@i}{m o m m m m o}{} % \end{macrocode} -% ^^A \end{macro} -% ^^A \end{macro} +% \end{noindmacro} +% \end{noindmacro} -% ^^A \begin{macro}{\chaptertitlename} +% \begin{noindmacro}{\chaptertitlename} % \begin{macrocode} \@ifundefined{@chapapp}{\let\@chapapp\chaptername}{} \newcommand\chaptertitlename{\@chapapp} % \end{macrocode} -% ^^A \end{macro} +% \end{noindmacro} -% ^^A \begin{macro}{\titlespacing} * \marg{command} \marg{left} \marg{before} \marg{after} \oarg{right} +% \begin{noindmacro}{\titlespacing} * \marg{command} \marg{left} \marg{before} \marg{after} \oarg{right} % % \begin{macrocode} \NewDocumentCommand{\titlespacing}{s m m m m o}{} % \end{macrocode} -% ^^A \end{macro} +% \end{noindmacro} -% ^^A \begin{macro}{\filright} -% ^^A \begin{macro}{\filcenter} -% ^^A \begin{macro}{\filleft} -% ^^A \begin{macro}{\fillast} -% ^^A \begin{macro}{\filinner} -% ^^A \begin{macro}{\filouter} +% \begin{noindmacro}{\filright} +% \begin{noindmacro}{\filcenter} +% \begin{noindmacro}{\filleft} +% \begin{noindmacro}{\fillast} +% \begin{noindmacro}{\filinner} +% \begin{noindmacro}{\filouter} % \begin{macrocode} \newcommand*{\filright}{} \newcommand*{\filcenter}{} @@ -31062,45 +31937,45 @@ class="td% \newcommand*{\filinner}{} \newcommand*{\filouter}{} % \end{macrocode} -% ^^A \end{macro} -% ^^A \end{macro} -% ^^A \end{macro} -% ^^A \end{macro} -% ^^A \end{macro} -% ^^A \end{macro} +% \end{noindmacro} +% \end{noindmacro} +% \end{noindmacro} +% \end{noindmacro} +% \end{noindmacro} +% \end{noindmacro} -% ^^A \begin{macro}{\wordsep} +% \begin{noindmacro}{\wordsep} % \begin{macrocode} \newcommand\wordsep{\fontdimen\tw@\font \@plus \fontdimen\thr@@\font \@minus \fontdimen4\font} % \end{macrocode} -% ^^A \end{macro} +% \end{noindmacro} -% ^^A \begin{macro}{\titleline} * \oarg{align} \marg{material} +% \begin{noindmacro}{\titleline} * \oarg{align} \marg{material} % \begin{macrocode} \NewDocumentCommand{\titleline}{s o m}{} % \end{macrocode} -% ^^A \end{macro} +% \end{noindmacro} -% ^^A \begin{macro}{\titlerule} \oarg{height} +% \begin{noindmacro}{\titlerule} \oarg{height} % \begin{macrocode} \providecommand*\titlerule{\@ifstar{\ttl@row}{\ttl@rule}} \newcommand*{\ttl@rule}[1][]{} \newcommand*{\ttl@row}[2][]{} % \end{macrocode} -% ^^A \end{macro} +% \end{noindmacro} -% ^^A \begin{macro}{\iftitlemeasuring} \marg{true} \marg{false} -% ^^A \begin{macro}{\assignpagestyle} \marg{command} \marg{pagestyle} -% ^^A \begin{macro}{\titleclass} \marg{name} \oarg{startlevel} \marg{class} \oarg{cmd} +% \begin{noindmacro}{\iftitlemeasuring} \marg{true} \marg{false} +% \begin{noindmacro}{\assignpagestyle} \marg{command} \marg{pagestyle} +% \begin{noindmacro}{\titleclass} \marg{name} \oarg{startlevel} \marg{class} \oarg{cmd} % \begin{macrocode} \newcommand{\iftitlemeasuring}[2]{#2} \newcommand{\assignpagestyle}[2]{#2} \NewDocumentCommand{\titleclass}{m o m o} % \end{macrocode} -% ^^A \end{macro} -% ^^A \end{macro} -% ^^A \end{macro} +% \end{noindmacro} +% \end{noindmacro} +% \end{noindmacro} % \iffalse %</titlesec> @@ -31135,93 +32010,93 @@ class="td% % \end{macrocode} % -% ^^A \begin{macro}{\dottedcontents} \marg{section} \oarg{left} \marg{above} \marg{label} \marg{leader} +% \begin{noindmacro}{\dottedcontents} \marg{section} \oarg{left} \marg{above} \marg{label} \marg{leader} % \begin{macrocode} \NewDocumentCommand{\dottedcontents}{m o m m m}{} % \end{macrocode} -% ^^A \end{macro} +% \end{noindmacro} -% ^^A \begin{macro}{\titlecontents} * \marg{section} \oarg{left} \marg{above} -% ^^A \marg{numbered} \marg{numberless} \marg{filler} -% ^^A \oarg{below or begin} \oarg{separator} \oarg{end} +% \begin{noindmacro}{\titlecontents} * \marg{section} \oarg{left} \marg{above} +% \marg{numbered} \marg{numberless} \marg{filler} +% \oarg{below or begin} \oarg{separator} \oarg{end} % \begin{macrocode} \newcommand{\titlecontents}{\@ifstar{\ttl@tcstar}{\ttl@tcnostar}} \NewDocumentCommand{\ttl@tcstar}{m o m m m m o o o}{} \NewDocumentCommand{\ttl@tcnostar}{m o m m m m o}{} % \end{macrocode} -% ^^A \end{macro} +% \end{noindmacro} -% ^^A \begin{macro}{\contentsmargin} \oarg{correction} \marg{right} +% \begin{noindmacro}{\contentsmargin} \oarg{correction} \marg{right} % \begin{macrocode} \newcommand{\contentsmargin}[2][]{} % \end{macrocode} -% ^^A \end{macro} +% \end{noindmacro} -% ^^A \begin{macro}{\thecontentslabel} -% ^^A \begin{macro}{\thecontentspage} +% \begin{noindmacro}{\thecontentslabel} +% \begin{noindmacro}{\thecontentspage} % \begin{macrocode} \newcommand*{\thecontentslabel}{thecontentslabel} \newcommand*{\thecontentspage}{thecontentspage} % \end{macrocode} -% ^^A \end{macro} -% ^^A \end{macro} +% \end{noindmacro} +% \end{noindmacro} -% ^^A \begin{macro}{\contentslabel} \oarg{format} \marg{space} -% ^^A \begin{macro}{\contentspage} \oarg{format} +% \begin{noindmacro}{\contentslabel} \oarg{format} \marg{space} +% \begin{noindmacro}{\contentspage} \oarg{format} % \begin{macrocode} \newcommand{\contentslabel}[2][]{\thecontentslabel} \newcommand{\contentspage}[1][]{\thecontentspage} % \end{macrocode} -% ^^A \end{macro} -% ^^A \end{macro} +% \end{noindmacro} +% \end{noindmacro} -% ^^A \begin{macro}{\contentspush} \marg{text} +% \begin{noindmacro}{\contentspush} \marg{text} % \begin{macrocode} \newcommand{\contentspush}[1]{} % \end{macrocode} -% ^^A \end{macro} +% \end{noindmacro} -% ^^A \begin{macro}{\contentsuse} \marg{name} \marg{text} +% \begin{noindmacro}{\contentsuse} \marg{name} \marg{text} % \begin{macrocode} \newcommand{\contentsuse}[2]{} % \end{macrocode} -% ^^A \end{macro} +% \end{noindmacro} -% ^^A \begin{macro}{\startcontents} \oarg{name} -% ^^A \begin{macro}{\stopcontents} \oarg{name} -% ^^A \begin{macro}{\resumecontents} \oarg{name} +% \begin{noindmacro}{\startcontents} \oarg{name} +% \begin{noindmacro}{\stopcontents} \oarg{name} +% \begin{noindmacro}{\resumecontents} \oarg{name} % \begin{macrocode} \newcommand*{\startcontents}[1][]{} \newcommand*{\stopcontents}[1][]{} \newcommand*{\resumecontents}[1][]{} % \end{macrocode} -% ^^A \end{macro} -% ^^A \end{macro} -% ^^A \end{macro} +% \end{noindmacro} +% \end{noindmacro} +% \end{noindmacro} -% ^^A \begin{macro}{\printcontents} \oarg{name} \marg{prefix} \marg{start} \marg{code} +% \begin{noindmacro}{\printcontents} \oarg{name} \marg{prefix} \marg{start} \marg{code} % \begin{macrocode} \newcommand{\printcontents}[4][]{} % \end{macrocode} -% ^^A \end{macro} +% \end{noindmacro} -% ^^A \begin{macro}{\startlist} \oarg{name} \marg{list} -% ^^A \begin{macro}{\stoplist} \oarg{name} \marg{list} -% ^^A \begin{macro}{\resumelist} \oarg{name} \marg{list} +% \begin{noindmacro}{\startlist} \oarg{name} \marg{list} +% \begin{noindmacro}{\stoplist} \oarg{name} \marg{list} +% \begin{noindmacro}{\resumelist} \oarg{name} \marg{list} % \begin{macrocode} \newcommand{\startlist}[2][]{} \newcommand{\stoplist}[2][]{} \newcommand{\resumelist}[2][]{} % \end{macrocode} -% ^^A \end{macro} -% ^^A \end{macro} -% ^^A \end{macro} +% \end{noindmacro} +% \end{noindmacro} +% \end{noindmacro} -% ^^A \begin{macro}{\printlist} \oarg{name} \marg{list} \marg{prefix} \marg{code} +% \begin{noindmacro}{\printlist} \oarg{name} \marg{list} \marg{prefix} \marg{code} % \begin{macrocode} \newcommand{\printlist}[4][]{} % \end{macrocode} -% ^^A \end{macro} +% \end{noindmacro} % \iffalse @@ -31539,15 +32414,21 @@ class="td% % \part{lwarp-tocbibind.sty} % \section{tocbibind} +% \label{sec:tocbibind} % % \DescribePackage{tocbibind} % \pkg{tocbibind} is patched for use by \pkg{lwarp}. % +% \limitsindex +% % \changes{v0.38}{2017/08/22}{\pkg{tocbibind}: Added.} +% \changes{v0.40}{2017/09/12}{\pkg{tocbibind}: Improved for \cs{simplechapter}.} % % \codehtml % % \begin{macrocode} +\let\simplechapterdelim\relax + \LWR@ProvidesPackagePass{tocbibind} % \end{macrocode} @@ -31583,14 +32464,26 @@ class="td% } % \end{macrocode} % +% The following code is shared by \pkg{anonchap}. +% +% \begin{macrocode} +\renewcommand{\simplechapter}[1][\@empty]{% + \def\@chapcntformat##1{% + #1~\csname the##1\endcsname\simplechapterdelim\protect\quad% + }% +} + +\renewcommand{\restorechapter}{% +\let\@chapcntformat\@seccntformat% +} +% \end{macrocode} +% % \iffalse %</tocbibind> % \fi % % % - - % % % @@ -31607,7 +32500,9 @@ class="td% % \pkg{tocloft} is emulated. % Most user options and macros are ignored and disabled. % \cs{newlistof} and \cs{cftchapterprecis} are supported. - +% +% \limitstocloft +% % \changes{v0.20}{2017/01/03}{\pkg{tocloft}: Added.} % % @@ -31619,24 +32514,24 @@ class="td% % \end{macrocode} % -% ^^A \begin{macro}{\tocloftpagestyle} \marg{style} +% \begin{noindmacro}{\tocloftpagestyle} \marg{style} % \begin{macrocode} \newcommand{\tocloftpagestyle}[1]{} % \end{macrocode} -% ^^A \end{macro} +% \end{noindmacro} -% ^^A \begin{macro}{\cftmarktoc} -% ^^A \begin{macro}{\cfttoctitlefont} -% ^^A \begin{macro}{\cftaftertoctitle} +% \begin{noindmacro}{\cftmarktoc} +% \begin{noindmacro}{\cfttoctitlefont} +% \begin{noindmacro}{\cftaftertoctitle} % \begin{macrocode} \newcommand*{\cftmarktoc}{} \newcommand*{\cfttoctitlefont}{} \newcommand*{\cftaftertoctitle}{} % \end{macrocode} -% ^^A \end{macro} -% ^^A \end{macro} -% ^^A \end{macro} +% \end{noindmacro} +% \end{noindmacro} +% \end{noindmacro} % \begin{macrocode} \newlength{\cftbeforetoctitleskip} @@ -31644,17 +32539,17 @@ class="td% % \end{macrocode} -% ^^A \begin{macro}{\cftmarklof} -% ^^A \begin{macro}{\cftloftitlefont} -% ^^A \begin{macro}{\cftafterloftitle} +% \begin{noindmacro}{\cftmarklof} +% \begin{noindmacro}{\cftloftitlefont} +% \begin{noindmacro}{\cftafterloftitle} % \begin{macrocode} \newcommand*{\cftmarklof}{} \newcommand*{\cftloftitlefont}{} \newcommand*{\cftafterloftitle}{} % \end{macrocode} -% ^^A \end{macro} -% ^^A \end{macro} -% ^^A \end{macro} +% \end{noindmacro} +% \end{noindmacro} +% \end{noindmacro} % \begin{macrocode} \newlength{\cftbeforeloftitleskip} @@ -31662,17 +32557,17 @@ class="td% % \end{macrocode} -% ^^A \begin{macro}{\cftmarklot} -% ^^A \begin{macro}{\cftlottitlefont} -% ^^A \begin{macro}{\cftafterlottitle} +% \begin{noindmacro}{\cftmarklot} +% \begin{noindmacro}{\cftlottitlefont} +% \begin{noindmacro}{\cftafterlottitle} % \begin{macrocode} \newcommand*{\cftmarklot}{} \newcommand*{\cftlottitlefont}{} \newcommand*{\cftafterlottitle}{} % \end{macrocode} -% ^^A \end{macro} -% ^^A \end{macro} -% ^^A \end{macro} +% \end{noindmacro} +% \end{noindmacro} +% \end{noindmacro} % \begin{macrocode} \newlength{\cftbeforelottitleskip} @@ -31680,34 +32575,38 @@ class="td% % \end{macrocode} -% ^^A \begin{macro}{\cftdot} -% ^^A \begin{macro}{\cftdotsep} -% ^^A \begin{macro}{\cftnodots} +% \begin{noindmacro}{\cftdot} +% \begin{noindmacro}{\cftdotsep} +% \begin{noindmacro}{\cftnodots} % \begin{macrocode} \newcommand*{\cftdot}{.} \providecommand*{\cftdotsep}{1} \newcommand*{\cftnodots}{5000} +% \end{macrocode} +% \end{noindmacro} +% \end{noindmacro} +% \end{noindmacro} +% \begin{noindmacro}{\cftdotfill} \marg{sep} +% \begin{macrocode} \providecommand{\cftdotfill}[1]{} % \end{macrocode} -% ^^A \end{macro} -% ^^A \end{macro} -% ^^A \end{macro} +% \end{noindmacro} -% ^^A \begin{macro}{\cftsetpnumwidth} \marg{length} -% ^^A \begin{macro}{\cftsetrmarg} \marg{length} +% \begin{noindmacro}{\cftsetpnumwidth} \marg{length} +% \begin{noindmacro}{\cftsetrmarg} \marg{length} % \begin{macrocode} \newcommand*{\cftsetpnumwidth}[1]{} \newcommand*{\cftsetrmarg}[1]{} % \end{macrocode} -% ^^A \end{macro} -% ^^A \end{macro} +% \end{noindmacro} +% \end{noindmacro} -% ^^A \begin{macro}{\cftpnumalign} \marg{alignment} +% \begin{noindmacro}{\cftpnumalign} \marg{alignment} % \begin{macrocode} \newcommand*{\cftpnumalign}[1]{} % \end{macrocode} -% ^^A \end{macro} +% \end{noindmacro} % \begin{macrocode} \newlength{\cftparskip} @@ -31879,7 +32778,7 @@ class="td% % \end{macrocode} -% ^^A \begin{macro}{\newlistof} \oarg{within} \marg{type} \marg{ext} \marg{listofname} +% \begin{noindmacro}{\newlistof} \oarg{within} \marg{type} \marg{ext} \marg{listofname} % % Emulated through the \cs{newfloat} mechanism. % \begin{macrocode} @@ -31903,7 +32802,7 @@ class="td% \@namedef{cft#2afterpnum}{} } % \end{macrocode} -% ^^A \end{macro} +% \end{noindmacro} % \cs{cftchapterprecis} from \pkg{tocloft}: @@ -32651,7 +33550,7 @@ style="width:\rndprintlength{\LWR@wrapwidth} ; % % % % Inside a \env{lateximage} the following gets restored to their print-mode actions: -% \margintag{\cs{LWR@restoreorigformatting}} +% \margintag{\small\cs{LWR@restoreorigformatting}} % \begin{macrocode} \appto{\LWR@restoreorigformatting}{% \LetLtxMacro\textcolor\LWRprint@textcolor% @@ -32663,20 +33562,18 @@ style="width:\rndprintlength{\LWR@wrapwidth} ; % } % \end{macrocode} % -% +% \begin{noindmacro}{\LWR@tempcolor} % The color converted to \HTML\ colorspace. -% \margintag{\cs{LWR@tempcolor}} % \begin{macrocode} \newcommand*{\LWR@tempcolor}{} \newcommand*{\LWR@tempcolortwo}{} % \end{macrocode} -% ^^A \end{macro} -% +% \end{noindmacro} % % % +% \begin{noindmacro}{\LWR@colorstyle} % \marg{1: styletext} \marg{2: model} \marg{3: color} -% \margintag{\cs{LWR@colorstyle}} % % \changes{v0.19}{2016/06/01}{Supports colored \cs{rule}.} % \changes{v0.36}{2017/08/11}{\pkg{xcolor}: Refactored \cs{LWR@colorstyle}.} @@ -32698,9 +33595,10 @@ style="width:\rndprintlength{\LWR@wrapwidth} ; % \endgroup% } % \end{macrocode} +% \end{noindmacro} % % -% \begin{macro}{\LWR@borderpadding} \marg{colorstyle} \marg{color} +% \begin{noindmacro}{\LWR@borderpadding} \marg{colorstyle} \marg{color} % Prints the \HTML attributes for a black border and padding. % % \cs{LWR@forceminwidth} must be used first in order to set the border width. @@ -32712,7 +33610,7 @@ border:\rndprintlength{\LWR@atleastonept} solid \LWR@colorstyle{#1}{#2} ; % padding:\rndprintlength{\fboxsep}% } % \end{macrocode} -% \end{macro} +% \end{noindmacro} % % % @@ -32877,38 +33775,37 @@ padding:\rndprintlength{\fboxsep}% % \label{sec:fcolorminipage} -% \begin{environment}{fcolorminipage} -% \oarg{1:framemodel} \marg{2:framecolor} \oarg{3:boxmodel} \marg{4:boxcolor} -% \oarg{5:align} \oarg{6:height} \oarg{7:inner-align} \marg{8:width} -% % Creates a framed \HTML\ \element{div} around its contents. % % A print-output version is defined in the \pkg{lwarp} core: \cref{sec:xcolorpatches} % % \changes{v0.34}{2017/07/31}{Added.} % +% \begin{noindmacro}{\LWR@subfcolorminipage} % \marg{framemodel} \marg{framecolor} \marg{background tag} \marg{height} -% \margintag{\cs{LWR@subfcolorminipage}} % \begin{macrocode} \NewDocumentCommand{\LWR@subfcolorminipage}{m m m m}{% \begin{BlockClass}[% #3% \LWR@borderpadding{#1}{#2} ; % -\IfValueTF{#4}{height:\rndprintlength{\LWR@tempheight} ; }{}% +\IfValueT{#4}{height:\rndprintlength{\LWR@tempheight} ; }% width:\rndprintlength{\LWR@tempwidth}% ]{fcolorminipage}% } % \end{macrocode} +% \end{noindmacro} +% +% +% \begin{environment}{fcolorminipage} +% \oarg{1:framemodel} \marg{2:framecolor} \oarg{3:boxmodel} \marg{4:boxcolor} +% \oarg{5:align} \oarg{6:height} \oarg{7:inner-align} \marg{8:width} % -% \oarg{1:framestyle} \marg{2:framecolor} \oarg{3:bkgcolorstyle} \marg{4:bkgcolor} -% \margintag{\env{fcolorminipage}} -% \oarg{5:align} \oarg{6:height} \oarg{7:inneralign} \marg{8:width} % \begin{macrocode} \NewDocumentEnvironment{fcolorminipage}{O{named} m O{named} m O{c} o o m} {% \LWR@FBcancel% \setlength{\LWR@tempwidth}{#8}% -\IfValueTF{#6}{\setlength{\LWR@tempheight}{#6}}{}% +\IfValueT{#6}{\setlength{\LWR@tempheight}{#6}}% \uselengthunit{PT}% \LWR@forceminwidth{\fboxrule}% \convertcolorspec{#1}{#2}{HTML}\LWR@tempcolor% @@ -33074,6 +33971,7 @@ denominator-format = {% % \begin{macrocode} scaling = false } + \DeclareInstance{xfrac}{lmr}{text}{ numerator-format = {% \LetLtxMacro{\scalebox}{\LWR@noscalebox}% @@ -33086,6 +33984,7 @@ denominator-format = {% % \begin{macrocode} scaling = false } + \DeclareInstance{xfrac}{lmss}{text}{ numerator-format = {% \LetLtxMacro{\scalebox}{\LWR@noscalebox}% @@ -33098,6 +33997,7 @@ denominator-format = {% % \begin{macrocode} scaling = false } + \DeclareInstance{xfrac}{lmtt}{text}{ numerator-format = {% \LetLtxMacro{\scalebox}{\LWR@noscalebox}% @@ -33139,6 +34039,7 @@ scaling = false % \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.} % % \codehtml % @@ -33165,7 +34066,7 @@ scaling = false \newcommand\xxt@namedglyph@fallback[1]{[#1]} -\newcommand{\showhyphens}[1]{} +\DeclareDocumentCommand{\showhyphens}{m}{} % \end{macrocode} % % \iffalse diff --git a/Master/texmf-dist/source/latex/lwarp/lwarp.ins b/Master/texmf-dist/source/latex/lwarp/lwarp.ins index 0b4e7b197b0..d13f0495ae2 100644 --- a/Master/texmf-dist/source/latex/lwarp/lwarp.ins +++ b/Master/texmf-dist/source/latex/lwarp/lwarp.ins @@ -37,11 +37,13 @@ version 2005/12/01 or later. \file{lwarp-a4wide.sty}{\from{lwarp.dtx}{a4wide}} \file{lwarp-a5comb.sty}{\from{lwarp.dtx}{a5comb}} \file{lwarp-abstract.sty}{\from{lwarp.dtx}{abstract}} +\file{lwarp-adjmulticol.sty}{\from{lwarp.dtx}{adjmulticol}} \file{lwarp-addlines.sty}{\from{lwarp.dtx}{addlines}} \file{lwarp-afterpage.sty}{\from{lwarp.dtx}{afterpage}} \file{lwarp-algorithmicx.sty}{\from{lwarp.dtx}{algorithmicx}} \file{lwarp-alltt.sty}{\from{lwarp.dtx}{alltt}} \file{lwarp-amsthm.sty}{\from{lwarp.dtx}{amsthm}} +\file{lwarp-anonchap.sty}{\from{lwarp.dtx}{anonchap}} \file{lwarp-anysize.sty}{\from{lwarp.dtx}{anysize}} \file{lwarp-appendix.sty}{\from{lwarp.dtx}{appendix}} \file{lwarp-arabicfront.sty}{\from{lwarp.dtx}{arabicfront}} @@ -59,7 +61,9 @@ version 2005/12/01 or later. \file{lwarp-chappg.sty}{\from{lwarp.dtx}{chappg}} \file{lwarp-color.sty}{\from{lwarp.dtx}{color}} \file{lwarp-crop.sty}{\from{lwarp.dtx}{crop}} +\file{lwarp-cuted.sty}{\from{lwarp.dtx}{cuted}} \file{lwarp-cutwin.sty}{\from{lwarp.dtx}{cutwin}} +\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-ebook.sty}{\from{lwarp.dtx}{ebook}} @@ -84,6 +88,7 @@ version 2005/12/01 or later. \file{lwarp-floatrow.sty}{\from{lwarp.dtx}{floatrow}} \file{lwarp-flushend.sty}{\from{lwarp.dtx}{flushend}} \file{lwarp-fncychap.sty}{\from{lwarp.dtx}{fncychap}} +\file{lwarp-fnpos.sty}{\from{lwarp.dtx}{fnpos}} \file{lwarp-footmisc.sty}{\from{lwarp.dtx}{footmisc}} \file{lwarp-footnote.sty}{\from{lwarp.dtx}{footnote}} \file{lwarp-footnotehyper.sty}{\from{lwarp.dtx}{footnotehyper}} @@ -118,6 +123,7 @@ version 2005/12/01 or later. \file{lwarp-mcaption.sty}{\from{lwarp.dtx}{mcaption}} \file{lwarp-mdframed.sty}{\from{lwarp.dtx}{mdframed}} \file{lwarp-microtype.sty}{\from{lwarp.dtx}{microtype}} +\file{lwarp-midfloat.sty}{\from{lwarp.dtx}{midfloat}} \file{lwarp-metalogo.sty}{\from{lwarp.dtx}{metalogo}} \file{lwarp-moreverb.sty}{\from{lwarp.dtx}{moreverb}} \file{lwarp-mparhack.sty}{\from{lwarp.dtx}{mparhack}} @@ -137,8 +143,10 @@ version 2005/12/01 or later. \file{lwarp-parskip.sty}{\from{lwarp.dtx}{parskip}} \file{lwarp-pdflscape.sty}{\from{lwarp.dtx}{pdflscape}} \file{lwarp-pdfsync.sty}{\from{lwarp.dtx}{pdfsync}} +\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-quotchap.sty}{\from{lwarp.dtx}{quotchap}} \file{lwarp-ragged2e.sty}{\from{lwarp.dtx}{ragged2e}} \file{lwarp-realscripts.sty}{\from{lwarp.dtx}{realscripts}} \file{lwarp-relsize.sty}{\from{lwarp.dtx}{relsize}} @@ -148,6 +156,7 @@ 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-sectsty.sty}{\from{lwarp.dtx}{sectsty}} \file{lwarp-setspace.sty}{\from{lwarp.dtx}{setspace}} \file{lwarp-shadow.sty}{\from{lwarp.dtx}{shadow}} \file{lwarp-showidx.sty}{\from{lwarp.dtx}{idx}} @@ -156,11 +165,13 @@ 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-stabular.sty}{\from{lwarp.dtx}{stabular}} \file{lwarp-subfig.sty}{\from{lwarp.dtx}{subfig}} \file{lwarp-supertabular.sty}{\from{lwarp.dtx}{supertabular}} \file{lwarp-syntonly.sty}{\from{lwarp.dtx}{syntonly}} \file{lwarp-tabularx.sty}{\from{lwarp.dtx}{tabularx}} \file{lwarp-tabulary.sty}{\from{lwarp.dtx}{tabulary}} +\file{lwarp-tabls.sty}{\from{lwarp.dtx}{tabls}} \file{lwarp-textarea.sty}{\from{lwarp.dtx}{textarea}} \file{lwarp-textcomp.sty}{\from{lwarp.dtx}{textcomp}} \file{lwarp-textpos.sty}{\from{lwarp.dtx}{textpos}} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-a4.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-a4.sty index 1fdee8e575e..5385e5397ea 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-a4.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-a4.sty @@ -17,7 +17,6 @@ %% version 2005/12/01 or later. \LWR@ProvidesPackageDrop{a4} \newcommand*{\WideMargins}{} - \endinput %% %% End of file `lwarp-a4.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-a4wide.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-a4wide.sty index 4c3785e4d3e..75115e571ec 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-a4wide.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-a4wide.sty @@ -16,7 +16,6 @@ %% and version 1.3 or later is part of all distributions of LaTeX %% version 2005/12/01 or later. \LWR@ProvidesPackageDrop{a4wide} - \endinput %% %% End of file `lwarp-a4wide.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-a5comb.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-a5comb.sty index f16b5db869d..7e156f5d3fa 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-a5comb.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-a5comb.sty @@ -16,7 +16,6 @@ %% and version 1.3 or later is part of all distributions of LaTeX %% version 2005/12/01 or later. \LWR@ProvidesPackageDrop{a5comb} - \endinput %% %% End of file `lwarp-a5comb.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-abstract.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-abstract.sty index c5c216bb3e4..d5f78b8c505 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-abstract.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-abstract.sty @@ -81,7 +81,6 @@ \fi - \endinput %% %% End of file `lwarp-abstract.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-addlines.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-addlines.sty index 3f9e941976c..e485c3b2121 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-addlines.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-addlines.sty @@ -20,7 +20,6 @@ \let\addline\addlines \newcommand*\removelines[1][1]{} \let\removeline\removelines - \endinput %% %% End of file `lwarp-addlines.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-adjmulticol.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-adjmulticol.sty new file mode 100644 index 00000000000..9408e96bc7a --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-adjmulticol.sty @@ -0,0 +1,40 @@ +%% +%% This is file `lwarp-adjmulticol.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `adjmulticol') +%% 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{adjmulticol} +\RequirePackage{multicol} +\newlength{\LWR@templengthone}% +\newlength{\LWR@templengthtwo}% +\NewDocumentEnvironment{adjmulticols}{s m m m} +{% +\setlength{\LWR@templengthone}{#3}% +\ifdimcomp{\LWR@templengthone}{<}{0pt}{\setlength{\LWR@templengthone}{0pt}}{}% +\setlength{\LWR@templengthtwo}{#4} +\ifdimcomp{\LWR@templengthtwo}{<}{0pt}{\setlength{\LWR@templengthtwo}{0pt}}{}% +\newcommand*{\LWR@mcolstype}{multicols}% +\ifnumcomp{#2}{=}{1}{\renewcommand*{\LWR@mcolstype}{singlecolumn}}{}% +\LWR@forcenewpage% +\uselengthunit{PT}% +\BlockClass[% +margin-left:\rndprintlength{\LWR@templengthone} ; % +margin-right:\rndprintlength{\LWR@templengthtwo}% +]{\LWR@mcolstype}% +} +{\endBlockClass} +\endinput +%% +%% End of file `lwarp-adjmulticol.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-afterpage.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-afterpage.sty index e55ef5e32d2..0e0a91cf3a3 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-afterpage.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-afterpage.sty @@ -17,7 +17,6 @@ %% version 2005/12/01 or later. \LWR@ProvidesPackageDrop{afterpage} \newcommand{\afterpage}[1]{#1} - \endinput %% %% End of file `lwarp-afterpage.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-algorithmicx.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-algorithmicx.sty index 0e902da8cc9..9adcd25396f 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-algorithmicx.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-algorithmicx.sty @@ -34,7 +34,6 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"% \end{warpHTML} - \endinput %% %% End of file `lwarp-algorithmicx.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-alltt.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-alltt.sty index 4a05954c32f..3153d9d562a 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-alltt.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-alltt.sty @@ -27,7 +27,6 @@ \AfterEndEnvironment{alltt}{\unskip\LWR@origvspace*{-\baselineskip}\LWR@afterendverbatim} } - \endinput %% %% End of file `lwarp-alltt.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-amsthm.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-amsthm.sty index e3c61be84a1..6d2b70ba793 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-amsthm.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-amsthm.sty @@ -99,7 +99,6 @@ \@endpefalse } - \endinput %% %% End of file `lwarp-amsthm.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-anonchap.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-anonchap.sty new file mode 100644 index 00000000000..95d947d9249 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-anonchap.sty @@ -0,0 +1,30 @@ +%% +%% This is file `lwarp-anonchap.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `anonchap') +%% 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{anonchap} +\newcommand{\simplechapter}[1][\@empty]{% + \def\@chapcntformat##1{% + #1~\csname the##1\endcsname\simplechapterdelim\protect\quad% + }% +} + +\newcommand{\restorechapter}{% +\let\@chapcntformat\@seccntformat% +} +\endinput +%% +%% End of file `lwarp-anonchap.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-anysize.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-anysize.sty index 75d0c99caba..b5d2594592d 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-anysize.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-anysize.sty @@ -18,7 +18,6 @@ \LWR@ProvidesPackageDrop{anysize} \def\papersize#1#2{} \def\marginsize#1#2#3#4{} - \endinput %% %% End of file `lwarp-anysize.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-appendix.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-appendix.sty index f736ee929d2..44355e88652 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-appendix.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-appendix.sty @@ -29,7 +29,6 @@ \addappheadtotoc \fi } - \endinput %% %% End of file `lwarp-appendix.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-arabicfront.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-arabicfront.sty index f54c8997e32..ba654a2c2ca 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-arabicfront.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-arabicfront.sty @@ -16,7 +16,6 @@ %% and version 1.3 or later is part of all distributions of LaTeX %% version 2005/12/01 or later. \LWR@ProvidesPackageDrop{arabicfront} - \endinput %% %% End of file `lwarp-arabicfront.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-authblk.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-authblk.sty index 9a0ad9cd259..362f1ac0ad5 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-authblk.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-authblk.sty @@ -28,7 +28,6 @@ \LWRAB@affil[#1]{\protect\InlineClass{affiliation}{#2}} } \renewcommand*{\authorcr}{\protect\LWR@newlinebr} - \endinput %% %% End of file `lwarp-authblk.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-balance.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-balance.sty index 568c405d1af..15c7ca58dcd 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-balance.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-balance.sty @@ -18,7 +18,6 @@ \LWR@ProvidesPackageDrop{balance} \newcommand*{\balance}{} \newcommand*{\nobalance}{} - \endinput %% %% End of file `lwarp-balance.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-bigdelim.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-bigdelim.sty index 478302ce1e6..d3fe7347b2d 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-bigdelim.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-bigdelim.sty @@ -15,6 +15,8 @@ %% 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. +\let\ldelim\relax +\let\rdelim\relax \LWR@ProvidesPackagePass{bigdelim} \LetLtxMacro\LWR@origldelim\ldelim \LetLtxMacro\LWR@origrdelim\rdelim @@ -31,7 +33,6 @@ \LetLtxMacro{\ldelim}{\LWR@origldelim}% \LetLtxMacro{\rdelim}{\LWR@origrdelim}% } - \endinput %% %% End of file `lwarp-bigdelim.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-bigstrut.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-bigstrut.sty index 0e306882965..36e7528dffd 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-bigstrut.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-bigstrut.sty @@ -23,7 +23,6 @@ \appto{\LWR@restoreorigformatting}{% \LetLtxMacro{\bigstrut}{\LWR@origbigstrut}% } - \endinput %% %% End of file `lwarp-bigstrut.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-bookmark.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-bookmark.sty index a8ef86cfa92..488c6c278da 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-bookmark.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-bookmark.sty @@ -25,7 +25,6 @@ \newcommand*{\bookmarkdefinestyle}[2]{} \newcommand*{\bookmarkget}[1]{} \newcommand{\BookmarkAtEnd}[1]{} - \endinput %% %% End of file `lwarp-bookmark.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-booktabs.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-booktabs.sty index 5f1bf1940f6..e1d2ef4f50a 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-booktabs.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-booktabs.sty @@ -23,7 +23,6 @@ \LetLtxMacro\LWR@origaddlinespace\addlinespace \LetLtxMacro\LWR@origmorecmidrules\morecmidrules \LetLtxMacro\LWR@origspecialrule\specialrule - \endinput %% %% End of file `lwarp-booktabs.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-boxedminipage.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-boxedminipage.sty index c177a961640..7cc99db7ac8 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-boxedminipage.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-boxedminipage.sty @@ -16,7 +16,6 @@ %% and version 1.3 or later is part of all distributions of LaTeX %% version 2005/12/01 or later. \LWR@loadnever{boxedminipage}{boxedminipage2e} - \endinput %% %% End of file `lwarp-boxedminipage.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-boxedminipage2e.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-boxedminipage2e.sty index 9d8abe8a19f..f190ee0e856 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-boxedminipage2e.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-boxedminipage2e.sty @@ -28,7 +28,6 @@ \end{BlockClass} } - \endinput %% %% End of file `lwarp-boxedminipage2e.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-ccaption.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-ccaption.sty index 5144fcbf411..6ad676dbd2c 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-ccaption.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-ccaption.sty @@ -21,7 +21,6 @@ \LWR@loadnever{ccaption}{caption} - \endinput %% %% End of file `lwarp-ccaption.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-changepage.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-changepage.sty index 0a86136df5c..3e980c5c31b 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-changepage.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-changepage.sty @@ -26,7 +26,6 @@ \newenvironment{adjustwidth}[2]{}{} \newenvironment{adjustwidth*}[2]{}{} - \endinput %% %% End of file `lwarp-changepage.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-chappg.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-chappg.sty index cc67c934cd9..c983b8ac2a3 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-chappg.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-chappg.sty @@ -18,7 +18,6 @@ \LWR@ProvidesPackageDrop{chappg} \renewcommand{\pagenumbering}[2][]{} \providecommand{\chappgsep}{--} - \endinput %% %% End of file `lwarp-chappg.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-chngpage.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-chngpage.sty index 5e86fcce90b..e7491649353 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-chngpage.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-chngpage.sty @@ -16,7 +16,6 @@ %% and version 1.3 or later is part of all distributions of LaTeX %% version 2005/12/01 or later. \LWR@loadnever{chngpage}{changepage} - \endinput %% %% End of file `lwarp-chngpage.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-color.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-color.sty index 9abf240da45..834b336ebb1 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-color.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-color.sty @@ -17,7 +17,6 @@ %% version 2005/12/01 or later. \LWR@ProvidesPackagePass{color} \RequirePackage{xcolor} - \endinput %% %% End of file `lwarp-color.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-crop.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-crop.sty index fdfc1e811c0..92882551a24 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-crop.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-crop.sty @@ -18,7 +18,6 @@ \LWR@ProvidesPackageDrop{crop} \newcommand*{\crop}[1][]{} \newcommand*{\cropdef}[6][]{} - \endinput %% %% End of file `lwarp-crop.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-cuted.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-cuted.sty new file mode 100644 index 00000000000..e9d679aac0a --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-cuted.sty @@ -0,0 +1,24 @@ +%% +%% This is file `lwarp-cuted.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `cuted') +%% 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{cuted} +\newenvironment{strip}{}{} +\newskip\stripsep +\def\oldcolsbreak#1{} +\endinput +%% +%% End of file `lwarp-cuted.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-cutwin.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-cutwin.sty index 0dc18f7386b..b89b2b48e56 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-cutwin.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-cutwin.sty @@ -41,7 +41,6 @@ \begin{picture}(0,0) \putstuffinpic \end{picture}} - \endinput %% %% End of file `lwarp-cutwin.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-dblfnote.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-dblfnote.sty new file mode 100644 index 00000000000..33c7c567d5c --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-dblfnote.sty @@ -0,0 +1,30 @@ +%% +%% This is file `lwarp-dblfnote.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `dblfnote') +%% 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{dblfnote} +\newcounter{DFNsloppiness} +\newdimen\DFNcolumnsep +\newdimen\DFNcolumnwidth +\def\DFNallowcbreak{} +\def\DFNinhibitcbreak{} +\def\DFNtrysingle{} +\def\DFNalwaysdouble{} +\def\DFNruleboth{} +\def\DFNruleleft{} +\endinput +%% +%% End of file `lwarp-dblfnote.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-dcolumn.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-dcolumn.sty index 670df991327..f9e82a803da 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-dcolumn.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-dcolumn.sty @@ -16,7 +16,6 @@ %% and version 1.3 or later is part of all distributions of LaTeX %% version 2005/12/01 or later. \LWR@ProvidesPackageDrop{dcolumn} - \endinput %% %% End of file `lwarp-dcolumn.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-draftwatermark.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-draftwatermark.sty index 5dbadb163c2..3c8e3e608cf 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-draftwatermark.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-draftwatermark.sty @@ -30,7 +30,6 @@ \newcommand{\SetWatermarkVertCenter}[1]{} \newcommand{\SetWatermarkText}[1]{} - \endinput %% %% End of file `lwarp-draftwatermark.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-ebook.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-ebook.sty index 11cfd9ae8f1..cd1cb6d4a7a 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-ebook.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-ebook.sty @@ -25,7 +25,6 @@ \setcounter{secnumdepth}{0} \setcounter{tocdepth}{2} } - \endinput %% %% End of file `lwarp-ebook.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-ellipsis.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-ellipsis.sty index 5149064bc2e..168775adc01 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-ellipsis.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-ellipsis.sty @@ -22,7 +22,6 @@ \newcommand{\ellipsisgap}{0.1em} - \endinput %% %% End of file `lwarp-ellipsis.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-emptypage.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-emptypage.sty index 824227f5da6..637559a08c9 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-emptypage.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-emptypage.sty @@ -19,7 +19,6 @@ \LWR@ProvidesPackageDrop{emptypage} - \endinput %% %% End of file `lwarp-emptypage.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-endnotes.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-endnotes.sty index b721435b51f..ab261f9beef 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-endnotes.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-endnotes.sty @@ -24,7 +24,6 @@ \def\@makeenmark{\hbox{\LWR@htmlspan{sup}{\normalfont\theenmark}}} \def\makeenmark{\@makeenmark} - \endinput %% %% End of file `lwarp-endnotes.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-enumerate.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-enumerate.sty index 31f0d6cc8aa..c15721e63a0 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-enumerate.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-enumerate.sty @@ -17,7 +17,6 @@ %% version 2005/12/01 or later. \LWR@ProvidesPackagePass{enumerate} - \endinput %% %% End of file `lwarp-enumerate.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-enumitem.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-enumitem.sty index eff9017d92f..69e61d69b38 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-enumitem.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-enumitem.sty @@ -28,7 +28,6 @@ \end{warpHTML} - \endinput %% %% End of file `lwarp-enumitem.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-epigraph.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-epigraph.sty index aad18d31908..6175f28ab95 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-epigraph.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-epigraph.sty @@ -55,7 +55,6 @@ \newcommand{\dropchapter}[1]{} \newcommand*{\undodrop}{} \newcommand{\cleartoevenpage}[1][]{} - \endinput %% %% End of file `lwarp-epigraph.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-eso-pic.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-eso-pic.sty index aa28b1dd489..b56685abffd 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-eso-pic.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-eso-pic.sty @@ -38,7 +38,6 @@ \newcommand*{\ClearShipoutPictureFG}{} \newcommand{\gridSetup}[6][]{} - \endinput %% %% End of file `lwarp-eso-pic.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-everypage.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-everypage.sty index 4d9de911eb8..e61ca8712c0 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-everypage.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-everypage.sty @@ -23,7 +23,6 @@ \newcommand*{\AddEverypageHook}[1]{} \newcommand*{\AddThispageHook}[1]{} - \endinput %% %% End of file `lwarp-everypage.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-everyshi.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-everyshi.sty index b6f228813d7..d20e80cc9dc 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-everyshi.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-everyshi.sty @@ -18,7 +18,6 @@ \LWR@ProvidesPackageDrop{everyshi} \newcommand*{\EveryShipout}[1]{} \newcommand*{\AtNextShipout}[1]{} - \endinput %% %% End of file `lwarp-everyshi.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-extramarks.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-extramarks.sty index db5c166134d..9e94df697d9 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-extramarks.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-extramarks.sty @@ -31,7 +31,6 @@ \newcommand*{\firstleftmark}{} \newcommand*{\lastrightmark}{} - \endinput %% %% End of file `lwarp-extramarks.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-fancybox.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-fancybox.sty index 811b9b3c259..43185f35f5d 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-fancybox.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-fancybox.sty @@ -93,7 +93,6 @@ \LWR@afterendverbatim% } \end{warpHTML} - \endinput %% %% End of file `lwarp-fancybox.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyhdr.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyhdr.sty index f44dec2516a..48933536a65 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyhdr.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyhdr.sty @@ -38,7 +38,6 @@ \newcommand*{\ifftopfloat}[2]{#2} \newcommand*{\iffbotfloat}[2]{#2} - \endinput %% %% End of file `lwarp-fancyhdr.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyvrb.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyvrb.sty index bd8b9049549..471db8983b0 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyvrb.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyvrb.sty @@ -208,7 +208,6 @@ border#1: \strip@pt\dimexpr \FV@FrameRule\relax\relax pt solid \#\LWR@tempcolor } % \AfterEndPreamble \end{warpHTML} - \endinput %% %% End of file `lwarp-fancyvrb.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-figcaps.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-figcaps.sty index 30c78cef071..d42a23cf6ae 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-figcaps.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-figcaps.sty @@ -24,7 +24,6 @@ \def\figurecapname{Figure Captions} \def\tablepagename{Tables} \def\figurepagename{Figures} - \endinput %% %% End of file `lwarp-figcaps.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-fix2col.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-fix2col.sty index 61df238120c..f13ec7aecf5 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-fix2col.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-fix2col.sty @@ -16,7 +16,6 @@ %% and version 1.3 or later is part of all distributions of LaTeX %% version 2005/12/01 or later. \LWR@ProvidesPackageDrop{fix2col} - \endinput %% %% End of file `lwarp-fix2col.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-float.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-float.sty index f67242b9cee..6ce7d78b9ca 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-float.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-float.sty @@ -42,7 +42,6 @@ \NewDocumentCommand{\restylefloat}{s m}{% } - \endinput %% %% End of file `lwarp-float.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-floatflt.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-floatflt.sty index d4c0581263a..dc14571e023 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-floatflt.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-floatflt.sty @@ -36,7 +36,6 @@ \DeclareDocumentEnvironment{floatingtable}{o +m} {\begin{KFLTfloatflt@marginfloat}{table}#2} {\end{KFLTfloatflt@marginfloat}} - \endinput %% %% End of file `lwarp-floatflt.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-floatpag.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-floatpag.sty index 8e9c272bc78..c3912bcc43a 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-floatpag.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-floatpag.sty @@ -19,7 +19,6 @@ \newcommand*{\floatpagestyle}[1]{} \newcommand*{\rotfloatpagestyle}[1]{} \newcommand*{\thisfloatpagestyle}[1]{} - \endinput %% %% End of file `lwarp-floatpag.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-floatrow.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-floatrow.sty index d85254f163b..efdf831f078 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-floatrow.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-floatrow.sty @@ -180,7 +180,6 @@ \boolfalse{LWR@insubfloatrow} } - \endinput %% %% End of file `lwarp-floatrow.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-flushend.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-flushend.sty index 6dfc8efc3ca..9672ae47b95 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-flushend.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-flushend.sty @@ -23,7 +23,6 @@ \newcommand*{\atColsBreak}[1]{} \newcommand*{\atColsEnd}[1]{} \newcommand*{\showcolsendrule}{} - \endinput %% %% End of file `lwarp-flushend.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-fncychap.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-fncychap.sty index ebeaf90c762..6542a5c317c 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-fncychap.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-fncychap.sty @@ -44,7 +44,6 @@ \newcommand{\FmN}[1]{#1} \newcommand{\FmTi}[1]{#1} - \endinput %% %% End of file `lwarp-fncychap.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-fnpos.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-fnpos.sty new file mode 100644 index 00000000000..3e12b0db889 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-fnpos.sty @@ -0,0 +1,25 @@ +%% +%% This is file `lwarp-fnpos.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `fnpos') +%% 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{fnpos} +\newcommand*{\makeFNbottom}{} +\newcommand*{\makeFNmid}{} +\newcommand*{\makeFNbelow}{} +\newcommand*{\makeFNabove}{} +\endinput +%% +%% End of file `lwarp-fnpos.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-fontenc.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-fontenc.sty index 96eb4db530d..5138dfa0f68 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-fontenc.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-fontenc.sty @@ -21,7 +21,6 @@ \LWR@loadbefore{fontenc} - \endinput %% %% End of file `lwarp-fontenc.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-fontspec.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-fontspec.sty index cbcc31dcc71..9af1946bd8f 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-fontspec.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-fontspec.sty @@ -20,7 +20,6 @@ \LWR@loadbefore{fontspec} - \endinput %% %% End of file `lwarp-fontspec.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-footmisc.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-footmisc.sty index bef409ace29..4c749966490 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-footmisc.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-footmisc.sty @@ -49,7 +49,6 @@ \endgroup \@footnotemark } - \endinput %% %% End of file `lwarp-footmisc.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-footnote.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-footnote.sty index 9f99624483b..9da839dd532 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-footnote.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-footnote.sty @@ -44,7 +44,6 @@ } \let\endfootnote\fn@endfntext \let\endfootnotetext\endfootnote - \endinput %% %% End of file `lwarp-footnote.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-footnotehyper.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-footnotehyper.sty index e732d766ec6..d76644d04f3 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-footnotehyper.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-footnotehyper.sty @@ -19,7 +19,6 @@ \RequirePackage{footnote} \LWR@ProvidesPackageDrop{footnotehyper} - \endinput %% %% End of file `lwarp-footnotehyper.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-framed.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-framed.sty index 9cc8aee5422..50218d3d4ae 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-framed.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-framed.sty @@ -117,7 +117,6 @@ \@tempboxa% } - \endinput %% %% End of file `lwarp-framed.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-ftnright.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-ftnright.sty index fcc1f00d12a..7689e016cf6 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-ftnright.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-ftnright.sty @@ -19,7 +19,6 @@ \LWR@ProvidesPackageDrop{ftnright} - \endinput %% %% End of file `lwarp-ftnright.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-fullpage.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-fullpage.sty index c280ae85875..bc517f86663 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-fullpage.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-fullpage.sty @@ -16,7 +16,6 @@ %% and version 1.3 or later is part of all distributions of LaTeX %% version 2005/12/01 or later. \LWR@ProvidesPackageDrop{fullpage} - \endinput %% %% End of file `lwarp-fullpage.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-fullwidth.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-fullwidth.sty index 3cdb22928d2..1eb992f9c2a 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-fullwidth.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-fullwidth.sty @@ -23,7 +23,6 @@ {% \endminipage% } - \endinput %% %% End of file `lwarp-fullwidth.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-geometry.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-geometry.sty index 616f5ca03dc..61c1a43b917 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-geometry.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-geometry.sty @@ -26,7 +26,6 @@ \renewcommand*{\savegeometry}[1]{} \renewcommand*{\loadgeometry}[1]{} - \endinput %% %% End of file `lwarp-geometry.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-glossaries.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-glossaries.sty index f75b1ad8bd1..f30a5337752 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-glossaries.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-glossaries.sty @@ -33,7 +33,6 @@ }% \@@glossaryseclabel } - \endinput %% %% End of file `lwarp-glossaries.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty index 9d3dfbc167e..ac05d9f80b5 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty @@ -17,7 +17,281 @@ %% version 2005/12/01 or later. -\LWR@ProvidesPackageDrop{graphics} +\LWR@ProvidesPackagePass{graphics} + + +\AtBeginDocument{ +\DeclareGraphicsExtensions{.svg,.SVG,.gif,.GIF,.png,.PNG,.jpg,.JPG,.jpeg,.JPEG} +\DeclareGraphicsRule{.svg}{svg}{.svg}{} +\DeclareGraphicsRule{.SVG}{svg}{.SVG}{} +} +\appto\LWR@restoreorigformatting{% +\DeclareGraphicsExtensions{.pdf,.PDF,.gif,.GIF,.png,.PNG,.jpg,.JPG,.jpeg,.JPEG}% +} + + +\AtBeginDocument{ +\renewcommand*{\unitspace}{} +} + +\newlength{\LWR@igwidth} +\newlength{\LWR@igheight} +\newcommand*{\LWR@igwidthstyle}{} +\newcommand*{\LWR@igheightstyle}{} +\newcommand*{\LWR@igorigin}{} +\newcommand*{\LWR@igangle}{} +\newcommand*{\LWR@igxscale}{1} +\newcommand*{\LWR@igyscale}{1} +\newcommand*{\LWR@igclass}{inlineimage} + +\define@key{igraph}{width}{% +\setlength{\LWR@igwidth}{#1}% +\ifthenelse{\lengthtest{\LWR@igwidth > 0pt}}% +{% + \uselengthunit{PT}% + \renewcommand*{\LWR@igwidthstyle}{width:\rndprintlength{\LWR@igwidth}}% + \IfEndWith{#1}{ex}% + {\renewcommand*{\LWR@igwidthstyle}{width:#1}}% yes ex + {}% not ex + \IfEndWith{#1}{em}% + {\renewcommand*{\LWR@igwidthstyle}{width:#1}}% yes em + {}% not em + \IfEndWith{#1}{\%}% + {\renewcommand*{\LWR@igwidthstyle}{width:#1}}% yes percent + {}% not percent + \IfEndWith{#1}{px}% + {\renewcommand*{\LWR@igwidthstyle}{width:#1}}% yes px + {}% not px +}{}% end of length > 0pt +} +\define@key{igraph}{height}{% +\setlength{\LWR@igheight}{#1}% +\ifthenelse{\lengthtest{\LWR@igheight > 0pt}}% +{% + \uselengthunit{PT}% + \renewcommand*{\LWR@igheightstyle}{% + height:\rndprintlength{\LWR@igheight} % + }% + \IfEndWith{#1}{ex}% + {\renewcommand*{\LWR@igheightstyle}{height:#1}}% yes ex + {}% not ex + \IfEndWith{#1}{em}% + {\renewcommand*{\LWR@igheightstyle}{height:#1}}% yes em + {}% not em + \IfEndWith{#1}{\%}% + {\renewcommand*{\LWR@igheightstyle}{height:#1}}% yes percent + {}% not percent + \IfEndWith{#1}{px}% + {\renewcommand*{\LWR@igheightstyle}{height:#1}}% yes px + {}% not px +}{}% end of length > 0pt +} +\define@key{igraph}{origin}{% +\renewcommand*{\LWR@igorigin}{#1}% +} +\define@key{igraph}{angle}{\renewcommand*{\LWR@igangle}{#1}} +\define@key{igraph}{class}{\renewcommand*{\LWR@igclass}{#1}} + +\define@key{igraph}{scale}{% +\renewcommand*{\LWR@igxscale}{#1}% +\renewcommand*{\LWR@igyscale}{#1}} +\define@key{igraph}{bb}{} +\define@key{igraph}{bbllx}{} +\define@key{igraph}{bblly}{} +\define@key{igraph}{bburx}{} +\define@key{igraph}{bbury}{} +\define@key{igraph}{natwidth}{} +\define@key{igraph}{natheight}{} +\define@key{igraph}{hiresbb}{} +\define@key{igraph}{viewport}{} +\define@key{igraph}{trim}{} +\define@key{igraph}{totalheight}{} +\define@key{igraph}{keepaspectratio}{} +\define@key{igraph}{clip}{} +\define@key{igraph}{draft}{} +\define@key{igraph}{type}{} +\define@key{igraph}{ext}{} +\define@key{igraph}{read}{} +\define@key{igraph}{command}{} + +\newcommand*{\LWR@rotstyle}[2]{% + #1transform:rotate(-#2deg); +} + +\newcommand*{\LWR@scalestyle}[3]{% + #1transform:scale(#2,#3); +} + + +\newbool{LWR@infloatrow} +\boolfalse{LWR@infloatrow} + +\def\LWR@opacity{1} + +\NewDocumentCommand{\LWR@includegraphicsb}{s o o m} +{% +\LWR@traceinfo{LWR@includegraphicsb #4}% +\LWR@origtilde \LWR@orignewline% +\ifthenelse{\cnttest{\value{LWR@minipagedepth}}{=}{0}}% +{% + \ifbool{LWR@infloatrow}% + {} + {% not in a minipage or a floatrow: + \setlength{\linewidth}{6in}% + \setlength{\textwidth}{6in}% + \setlength{\textheight}{9in}% + }% +}{}% +\renewcommand*{\Gin@setfile}[3]{% +\LWR@traceinfo{Gin@setfile ##3}% +\xdef\LWR@parsedfilename{##3}% +}% +\Ginclude@graphics{\detokenize{#4}}% +\filename@parse{\LWR@parsedfilename}% +\large% +\setlength{\LWR@igwidth}{0pt}% +\setlength{\LWR@igheight}{0pt}% +\renewcommand*{\LWR@igwidthstyle}{}% +\renewcommand*{\LWR@igheightstyle}{}% +\renewcommand*{\LWR@igorigin}{}% +\renewcommand*{\LWR@igangle}{}% +\renewcommand*{\LWR@igxscale}{1}% +\renewcommand*{\LWR@igyscale}{1}% +\renewcommand*{\LWR@igclass}{inlineimage}% +\IfValueF{#3}{% +\IfValueTF{#2}% +{\setkeys{igraph}{#2}}% +{\setkeys{igraph}{}}% +}% +\LWR@traceinfo{LWR@includegraphicsb: about to create href}% +\href{\LWR@parsedfilename}% +{% start of href +\LWR@traceinfo{LWR@includegraphicsb: about to LWR@htmltag}% +\LWR@htmltag{% start of image tags +img src="\LWR@parsedfilename" \LWR@orignewline% +\LWR@origtilde{} alt="[\filename@base]" \LWR@orignewline% +\ifthenelse{ + \NOT\equal{\LWR@igwidthstyle}{} \OR + \NOT\equal{\LWR@igheightstyle}{} \OR + \NOT\equal{\LWR@igorigin}{} \OR + \NOT\equal{\LWR@igangle}{} \OR + \NOT\equal{\LWR@igxscale}{1} \OR + \NOT\equal{\LWR@igyscale}{1} +}% +{\LWR@origtilde{} style="% +\ifthenelse{\NOT\equal{\LWR@igwidthstyle}{}}% +{\LWR@igwidthstyle;}{}% +\ifthenelse{\NOT\equal{\LWR@igheightstyle}{}}% +{\LWR@igheightstyle;}{}% +\ifthenelse{\NOT\equal{\LWR@igorigin}{}}% +{\LWR@origtilde{} transform-origin: \LWR@originnames{\LWR@igorigin}; \LWR@orignewline}{}% +\ifthenelse{\NOT\equal{\LWR@igangle}{}}% +{% +\LWR@rotstyle{-ms-}{\LWR@igangle}% +\LWR@rotstyle{-webkit-}{\LWR@igangle}% +\LWR@rotstyle{}{\LWR@igangle% +}}{}% +\ifthenelse{\NOT\equal{\LWR@igxscale}{1}\OR% +\NOT\equal{\LWR@igyscale}{1}}% +{\LWR@scalestyle{-ms-}{\LWR@igxscale}{\LWR@igyscale}% +\LWR@scalestyle{-webkit-}{\LWR@igxscale}{\LWR@igyscale}% +\LWR@scalestyle{}{\LWR@igxscale}{\LWR@igyscale}}{}% +\ifthenelse{\NOT\equal{\LWR@opacity}{1}}% +{opacity:\LWR@opacity;}% +{}% +" \LWR@orignewline}{}% +\LWR@origtilde{} class="\LWR@igclass" \LWR@orignewline% +}% end of image tags +}% end of href +\endgroup +\LWR@origscriptsize +\LWR@traceinfo{LWR@includegraphicsb done}% +} + + + + + +\LetLtxMacro\LWR@origincludegraphics\includegraphics + +\AtBeginDocument{ +\renewcommand*{\includegraphics} +{% +\LWR@traceinfo{includegraphics} +\LWR@ensuredoingapar% +\begingroup% +\catcode`\_=12% +\LWR@includegraphicsb% +}% includegraphics +}% AtBeginDocument + +\newcommand*{\LWR@rotboxorigin}{} +\newcommand*{\LWR@originname}[1]{% +\ifthenelse{\equal{#1}{t}}{top}{}% +\ifthenelse{\equal{#1}{b}}{bottom}{}% +\ifthenelse{\equal{#1}{c}}{center}{}% +\ifthenelse{\equal{#1}{l}}{left}{}% +\ifthenelse{\equal{#1}{r}}{right}{}% +} +\newcommand*{\LWR@originnames}[1]{% +\StrChar{#1}{1}[\LWR@strresult]% +\LWR@originname{\LWR@strresult} +\StrChar{#1}{2}[\LWR@strresult]% +\LWR@originname{\LWR@strresult} +} +\define@key{krotbox}{origin}{% +\renewcommand*{\LWR@rotboxorigin}{#1}% +} +\define@key{krotbox}{x}{} +\define@key{krotbox}{y}{} +\define@key{krotbox}{units}{} +\LetLtxMacro\LWR@origrotatebox\rotatebox + +\AtBeginDocument{ +\RenewDocumentCommand{\rotatebox}{O{} m +m}{% +\renewcommand*{\LWR@rotboxorigin}{} +\setkeys{krotbox}{#1}% +\LWR@htmltagc{span style="display: inline-block; % +\ifthenelse{\NOT\equal{\LWR@rotboxorigin}{}}% +{transform-origin: \LWR@originnames{\LWR@rotboxorigin};\LWR@origtilde}{}% +\LWR@rotstyle{-ms-}{#2} % +\LWR@rotstyle{-webkit-}{#2} % +\LWR@rotstyle{}{#2} % +"{}}\LWR@orignewline% +\begin{LWR@nestspan}% +#3% +\LWR@htmltagc{/span}% +\end{LWR@nestspan}% +} +}% AtBeginDocument + +\LetLtxMacro\LWR@origscalebox\scalebox + +\AtBeginDocument{ +\RenewDocumentCommand{\scalebox}{m o m}{% +\LWR@htmltagc{span style="display: inline-block; % +\LWR@scalestyle{-ms-}{#1}{\IfNoValueTF{#2}{#1}{#2}} % +\LWR@scalestyle{-webkit-}{#1}{\IfNoValueTF{#2}{#1}{#2}} % +\LWR@scalestyle{}{#1}{\IfNoValueTF{#2}{#1}{#2}} % +"{}}% +\begin{LWR@nestspan}% +#3% +\LWR@htmltagc{/span}% +\end{LWR@nestspan}% +} +}% AtBeginDocument + +\let\LWR@origreflectbox\reflectbox + +\AtBeginDocument{ +\renewcommand{\reflectbox}[1]{\scalebox{-1}[1]{#1}} +} + +\LetLtxMacro\LWR@origresizebox\resizebox + +\AtBeginDocument{ +\renewcommand{\resizebox}[3]{#3} +} \endinput %% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-graphicx.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-graphicx.sty index 62b4ba695bb..47abc0d6da5 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-graphicx.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-graphicx.sty @@ -17,8 +17,7 @@ %% version 2005/12/01 or later. -\LWR@ProvidesPackageDrop{graphicx} - +\LWR@ProvidesPackagePass{graphicx} \endinput %% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-grffile.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-grffile.sty index 9cbbf3299c7..21865e88d67 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-grffile.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-grffile.sty @@ -15,17 +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{grffile} -\define@key{igraph}{multidot}{} -\define@key{igraph}{babel}{} -\define@key{igraph}{extendedchars}{} -\define@key{igraph}{encoding}{} -\define@key{igraph}{inputencoding}{} -\define@key{igraph}{filenameencoding}{} -\define@key{igraph}{space}{} - -\newcommand*{\grffilesetup}[1]{} - +\LWR@ProvidesPackagePass{grffile} \endinput %% %% End of file `lwarp-grffile.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperref.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperref.sty index 4d612eeb5fa..b9882e5fc06 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperref.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperref.sty @@ -125,7 +125,6 @@ \newcommand{\MakeFieldButton}[1]{} - \endinput %% %% End of file `lwarp-hyperref.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperxmp.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperxmp.sty index dc874cde2ee..9fb1ed187c2 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperxmp.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperxmp.sty @@ -16,7 +16,6 @@ %% and version 1.3 or later is part of all distributions of LaTeX %% version 2005/12/01 or later. \LWR@ProvidesPackageDrop{hyperxmp} - \endinput %% %% End of file `lwarp-hyperxmp.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-idxlayout.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-idxlayout.sty index eca0553fe6d..facada26dda 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-idxlayout.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-idxlayout.sty @@ -35,7 +35,6 @@ \newcommand*{\indexjustific}{} \newcommand*{\indexsubsdelim}{} \newcommand*{\indexstheadcase}{} - \endinput %% %% End of file `lwarp-idxlayout.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-indentfirst.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-indentfirst.sty index 02373ce5ca4..65a9a5b7e80 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-indentfirst.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-indentfirst.sty @@ -20,7 +20,6 @@ \LWR@ProvidesPackageDrop{indentfirst} - \endinput %% %% End of file `lwarp-indentfirst.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-inputenc.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-inputenc.sty index 0d245534769..9d976026d8a 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-inputenc.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-inputenc.sty @@ -21,7 +21,6 @@ \LWR@loadbefore{inputenc} - \endinput %% %% End of file `lwarp-inputenc.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-keyfloat.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-keyfloat.sty index 8b9dad6b04f..a30e33a9074 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-keyfloat.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-keyfloat.sty @@ -67,7 +67,6 @@ }% AtBeginDocument - \endinput %% %% End of file `lwarp-keyfloat.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-layout.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-layout.sty index 78ea49773c2..d799a78fe34 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-layout.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-layout.sty @@ -21,7 +21,6 @@ \NewDocumentCommand{\layout}{s}{} - \endinput %% %% End of file `lwarp-layout.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-letterspace.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-letterspace.sty index 7a95441092a..c2f1353987b 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-letterspace.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-letterspace.sty @@ -25,7 +25,6 @@ \def\textls#1#{} \newcommand*\lslig[1]{#1} - \endinput %% %% End of file `lwarp-letterspace.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-lettrine.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-lettrine.sty index ed0cbcbee95..d24b787798e 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-lettrine.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-lettrine.sty @@ -43,7 +43,6 @@ \newcommand*{\LettrineFontHook}{} \newcommand*{\LettrineFont}[1]{\InlineClass{lettrine}{#1}} \newcommand*{\LettrineFontEPS}[1]{\includegraphics[height=1.5ex]{#1}} - \endinput %% %% End of file `lwarp-lettrine.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-lips.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-lips.sty index b3b51356fc0..a323c48dd0f 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-lips.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-lips.sty @@ -36,7 +36,6 @@ \newcommand \LPNobreakList {} - \endinput %% %% End of file `lwarp-lips.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-listings.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-listings.sty index 407910d0d92..134ca9b20e5 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-listings.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-listings.sty @@ -125,7 +125,6 @@ }{\PackageError{Listings}{Numbers #1 unknown}\@ehc}} \end{warpHTML} - \endinput %% %% End of file `lwarp-listings.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-longtable.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-longtable.sty index c2c0bac789a..acef725862f 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-longtable.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-longtable.sty @@ -58,7 +58,6 @@ \newlength{\LTcapwidth} \renewcommand*{\kill}{\LWR@tabularendofline} - \endinput %% %% End of file `lwarp-longtable.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-lscape.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-lscape.sty index f2396aa200a..87e093ee194 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-lscape.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-lscape.sty @@ -21,7 +21,6 @@ \newenvironment*{landscape}{}{} - \endinput %% %% End of file `lwarp-lscape.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-ltcaption.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-ltcaption.sty index 24d8a2c0f25..01fbf6add9a 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-ltcaption.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-ltcaption.sty @@ -25,7 +25,6 @@ \newlength{\LTcapleft} \newlength{\LTcapright} \newcommand*{\LTcapmarginsfalse}{} - \endinput %% %% End of file `lwarp-ltcaption.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-marginfit.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-marginfit.sty index 0e9f52d1a3a..777c939ddc4 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-marginfit.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-marginfit.sty @@ -16,7 +16,6 @@ %% and version 1.3 or later is part of all distributions of LaTeX %% version 2005/12/01 or later. \LWR@ProvidesPackageDrop{marginfit} - \endinput %% %% End of file `lwarp-marginfit.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-marginfix.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-marginfix.sty index 6e0cd490475..1886d21ae01 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-marginfix.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-marginfix.sty @@ -26,7 +26,6 @@ \newcommand*{\blockmargin}[1][]{} \newcommand*{\unblockmargin}[1][]{} \newcommand*{\marginphantom}[2][]{} - \endinput %% %% End of file `lwarp-marginfix.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-marginnote.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-marginnote.sty index be8f51c792b..9e00b76716d 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-marginnote.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-marginnote.sty @@ -25,7 +25,6 @@ \newcommand*{\marginfont}{} \newcommand*{\raggedleftmarginnote}{} \newcommand*{\raggedrightmarginnote}{} - \endinput %% %% End of file `lwarp-marginnote.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-mcaption.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-mcaption.sty index 394c6096171..74a93c60ceb 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-mcaption.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-mcaption.sty @@ -23,7 +23,6 @@ \newcommand*{\margincapalign}{} \newlength{\margincapsep} - \endinput %% %% End of file `lwarp-mcaption.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-mdframed.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-mdframed.sty index 6b2f64085f0..9aa0f793047 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-mdframed.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-mdframed.sty @@ -249,9 +249,10 @@ background: } \DeclareDocumentCommand\newmdtheoremenv{O{} m o m o }{% \ifboolexpr{ test {\IfNoValueTF {#3}} and test {\IfNoValueTF {#5}} }% - {\newtheorem{#2}{#4}}{% - \IfValueTF{#3}{\newtheorem{#2}[#3]{#4}}{}% - \IfValueTF{#5}{\newtheorem{#2}{#4}[#5]}{}% + {\newtheorem{#2}{#4}}% + {% + \IfValueT{#3}{\newtheorem{#2}[#3]{#4}}% + \IfValueT{#5}{\newtheorem{#2}{#4}[#5]}% }% \BeforeBeginEnvironment{#2}{% \renewcommand*{\LWR@mdthisenv}{md#2}% @@ -260,7 +261,6 @@ background: \end{mdframed}}% } - \endinput %% %% End of file `lwarp-mdframed.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-metalogo.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-metalogo.sty index 3f687794e62..4a36afbfd09 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-metalogo.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-metalogo.sty @@ -22,7 +22,6 @@ \newcommand\setLaTeXee[1]{} \newcommand\seteverylogo[1]{} \newcommand\everylogo[1]{} - \endinput %% %% End of file `lwarp-metalogo.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-microtype.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-microtype.sty index 3c45a4b9b02..0061012e6e3 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-microtype.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-microtype.sty @@ -51,7 +51,6 @@ \@onlypreamble\DeclareMicrotypeVariants \@onlypreamble\DeclareMicrotypeBabelHook - \endinput %% %% End of file `lwarp-microtype.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-midfloat.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-midfloat.sty new file mode 100644 index 00000000000..086076c5932 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-midfloat.sty @@ -0,0 +1,23 @@ +%% +%% This is file `lwarp-midfloat.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `midfloat') +%% 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{midfloat} +\newenvironment{strip}[1][]{}{} +\newskip\stripsep +\endinput +%% +%% End of file `lwarp-midfloat.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-moreverb.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-moreverb.sty index 97d9774ede0..8816b81c49a 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-moreverb.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-moreverb.sty @@ -88,7 +88,6 @@ } \end{warpHTML} - \endinput %% %% End of file `lwarp-moreverb.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-mparhack.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-mparhack.sty index 0bb0f051813..cfc39a98d2e 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-mparhack.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-mparhack.sty @@ -16,7 +16,6 @@ %% and version 1.3 or later is part of all distributions of LaTeX %% version 2005/12/01 or later. \LWR@ProvidesPackageDrop{mparhack} - \endinput %% %% End of file `lwarp-mparhack.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-multicol.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-multicol.sty index a81bcbb53ab..69db5903c3e 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-multicol.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-multicol.sty @@ -27,7 +27,7 @@ { \LWR@forcenewpage \BlockClass{multicols} -\IfValueTF{#3}{\begin{BlockClass}{multicolsheading}#3\end{BlockClass}}{}} +\IfValueT{#3}{\begin{BlockClass}{multicolsheading}#3\end{BlockClass}}} {\endBlockClass} \newcommand*{\columnbreak}{} @@ -50,7 +50,6 @@ \end{warpHTML} - \endinput %% %% End of file `lwarp-multicol.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-multirow.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-multirow.sty index 15c7bc93b4a..94ce1f9aafb 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-multirow.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-multirow.sty @@ -30,7 +30,8 @@ \ifstrequal{#1}{t}{style="vertical-align:top" }{}% }% \ifdefvoid{\LWR@multirowborder}{}{% -style="border-\LWR@multirowborder: 2px solid black" % +style="border-\LWR@multirowborder: 2px dotted black ; % +padding-\LWR@multirowborder: 2px" % } class="td% \StrChar{\LWR@tablecolspec}{\theLWR@tablecolspos}% @@ -42,7 +43,7 @@ class="td% \renewcommand{\LWR@multirowborder}{}% \LWR@traceinfo{*** multirow done}% }% -\RenewDocumentCommand{\multicolumnrow}{m m O{} m O{} m O{} +m}{% +\NewDocumentCommand{\multicolumnrow}{m m O{} m O{} m O{} +m}{% \LWR@tabularhtmlcolumns{\theLWR@tablecolspos}{#1} \begingroup\LetLtxMacro{\\}{\LWR@endofline}% \LWR@domulticolumn[#3][#4]{\theLWR@tabhtmlcoltotal}{#2}{#8}% @@ -55,7 +56,6 @@ class="td% \LetLtxMacro\multirow\LWR@origmultirow% \renewcommand{\multicolumnrow}{\LWR@origmulticolumnrow}% } - \endinput %% %% End of file `lwarp-multirow.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-nameref.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-nameref.sty index 6aa2b97090b..04b0f2b2052 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-nameref.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-nameref.sty @@ -23,7 +23,6 @@ \DeclareOption*{} \ProcessOptions\relax - \endinput %% %% End of file `lwarp-nameref.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-needspace.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-needspace.sty index 2ec5cccb03d..d207716e39c 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-needspace.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-needspace.sty @@ -22,7 +22,6 @@ \newcommand*{\needspace}[1]{} \DeclareDocumentCommand{\Needspace}{s m}{} - \endinput %% %% End of file `lwarp-needspace.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-newclude.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-newclude.sty index 0103ef15206..c7bf7b97112 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-newclude.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-newclude.sty @@ -21,7 +21,6 @@ \LWR@loadbefore{newclude} - \endinput %% %% End of file `lwarp-newclude.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-newunicodechar.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-newunicodechar.sty index a170c2bfa90..b06d1f69915 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-newunicodechar.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-newunicodechar.sty @@ -21,7 +21,6 @@ \LWR@loadbefore{newunicodechar} - \endinput %% %% End of file `lwarp-newunicodechar.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-nextpage.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-nextpage.sty index 531268331bb..0dcffdf7d0f 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-nextpage.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-nextpage.sty @@ -24,7 +24,6 @@ \newcommand{\cleartooddpage}[1][]{} \newcommand{\movetooddpage}[1][]{} - \endinput %% %% End of file `lwarp-nextpage.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-nonumonpart.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-nonumonpart.sty index 93670822291..2c179264345 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-nonumonpart.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-nonumonpart.sty @@ -16,7 +16,6 @@ %% and version 1.3 or later is part of all distributions of LaTeX %% version 2005/12/01 or later. \LWR@ProvidesPackageDrop{nonumonpart} - \endinput %% %% End of file `lwarp-nonumonpart.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-nopageno.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-nopageno.sty index 189e5d81757..2c930be7a1a 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-nopageno.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-nopageno.sty @@ -16,7 +16,6 @@ %% and version 1.3 or later is part of all distributions of LaTeX %% version 2005/12/01 or later. \LWR@ProvidesPackageDrop{nopageno} - \endinput %% %% End of file `lwarp-nopageno.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-nowidow.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-nowidow.sty index 2cc775e0534..ee368983256 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-nowidow.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-nowidow.sty @@ -22,11 +22,8 @@ \newcommand*{\nowidow}[1][]{} \newcommand*{\setnowidow}[1][]{} - \newcommand*{\noclub}[1][]{} \newcommand*{\setnoclub}[1][]{} - - \endinput %% %% End of file `lwarp-nowidow.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-ntheorem.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-ntheorem.sty index b1fc4fdc0b3..63d3fc41746 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-ntheorem.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-ntheorem.sty @@ -423,7 +423,6 @@ \def\Box{\text{\HTMLunicode{25A1}}}% UTF-8 white box } \newcommand*{\thref}[1]{\cref{#1}} - \endinput %% %% End of file `lwarp-ntheorem.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-pagenote.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-pagenote.sty index 91553b42c9f..f5f078e00ff 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-pagenote.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-pagenote.sty @@ -19,7 +19,6 @@ \DeclareOption{page}{} \LWR@ProvidesPackagePass{pagenote} - \endinput %% %% End of file `lwarp-pagenote.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-paralist.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-paralist.sty index 2822ff2470d..7b38dd79ff0 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-paralist.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-paralist.sty @@ -24,7 +24,6 @@ \AtBeginEnvironment{compactdesc}{\LWR@descriptionstart} \AtEndEnvironment{compactdesc}{\LWR@descriptionend} \def\paradescriptionlabel#1{{\normalfont\textbf{#1}}} - \endinput %% %% End of file `lwarp-paralist.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-parskip.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-parskip.sty index cc9f22e5a40..8ea5d9853b6 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-parskip.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-parskip.sty @@ -19,7 +19,6 @@ \LWR@ProvidesPackageDrop{parskip} - \endinput %% %% End of file `lwarp-parskip.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-pdflscape.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-pdflscape.sty index a730b1792f0..77c4bca36fe 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-pdflscape.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-pdflscape.sty @@ -16,7 +16,6 @@ %% and version 1.3 or later is part of all distributions of LaTeX %% version 2005/12/01 or later. \LWR@ProvidesPackageDrop{pdflscape} - \endinput %% %% End of file `lwarp-pdflscape.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfsync.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfsync.sty index b26a330a935..26784207fcd 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfsync.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfsync.sty @@ -19,7 +19,6 @@ \let\pdfsync\relax \let\pdfsyncstart\relax \let\pdfsyncstop\relax - \endinput %% %% End of file `lwarp-pdfsync.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-pfnote.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-pfnote.sty new file mode 100644 index 00000000000..7bac54a7c01 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-pfnote.sty @@ -0,0 +1,21 @@ +%% +%% This is file `lwarp-pfnote.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `pfnote') +%% 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{pfnote} +\endinput +%% +%% End of file `lwarp-pfnote.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-placeins.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-placeins.sty index 821737b2314..15b024ee36b 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-placeins.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-placeins.sty @@ -21,7 +21,6 @@ \newcommand*{\FloatBarrier}{} - \endinput %% %% End of file `lwarp-placeins.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-prelim2e.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-prelim2e.sty index 2f3d4f8cc45..59dd4fe10a2 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-prelim2e.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-prelim2e.sty @@ -19,7 +19,6 @@ \newcommand{\PrelimText}{} \newcommand{\PrelimTextStyle}{} \newcommand{\PrelimWords}{} - \endinput %% %% End of file `lwarp-prelim2e.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-quotchap.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-quotchap.sty new file mode 100644 index 00000000000..7822c42e918 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-quotchap.sty @@ -0,0 +1,42 @@ +%% +%% This is file `lwarp-quotchap.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `quotchap') +%% 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{quotchap} +\newcommand{\@quotchap}{} +\newlength{\LWR@quotchapwidth} + +\let\@printcites\relax + +\newcommand*{\@iprintcites}{% +\uselengthunit{PT}% +\begin{BlockClass}[max-width: \rndprintlength{\LWR@quotchapwidth}]{quotchap} +\@quotchap +\end{BlockClass} +\global\let\@printcites\relax +} + +\NewEnviron{savequote}[1][\linewidth]{% +\setlength{\LWR@quotchapwidth}{#1*2}% +\global\LWR@quotchapwidth=\LWR@quotchapwidth% +\global\let\@quotchap\BODY +\global\let\@printcites\@iprintcites% +} +\newcommand{\qauthor}[1]{\begin{BlockClass}{qauthor}{#1}\end{BlockClass}} +\newcommand{\qsetcnfont}[1]{} +\endinput +%% +%% End of file `lwarp-quotchap.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-ragged2e.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-ragged2e.sty index 850464db539..79ab2dbc526 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-ragged2e.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-ragged2e.sty @@ -42,7 +42,6 @@ \newenvironment*{FlushRight}{\flushright}{\endflushright} \newenvironment*{justify}{\justifying}{\endjustifying} - \endinput %% %% End of file `lwarp-ragged2e.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-realscripts.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-realscripts.sty index 128a23b13d6..3982325d1a5 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-realscripts.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-realscripts.sty @@ -51,7 +51,6 @@ \textsubscript{#4}\textsuperscript{#3}% }% } - \endinput %% %% End of file `lwarp-realscripts.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-relsize.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-relsize.sty index 65f129dd11b..8319957105e 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-relsize.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-relsize.sty @@ -56,7 +56,6 @@ \setcounter{LWR@relsizetemp}{100*\real{#1}}% \InlineClass[font-size:\arabic{LWR@relsizetemp}\%]{textscale}{#2}% } - \endinput %% %% End of file `lwarp-relsize.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-romanbar.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-romanbar.sty index e1c022a2dbf..073e92d16e5 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-romanbar.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-romanbar.sty @@ -24,7 +24,6 @@ ]{romanbar}{#1}% } - \endinput %% %% End of file `lwarp-romanbar.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-romanbarpagenumber.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-romanbarpagenumber.sty index 74aa176d791..456d620bd9b 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-romanbarpagenumber.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-romanbarpagenumber.sty @@ -16,7 +16,6 @@ %% and version 1.3 or later is part of all distributions of LaTeX %% version 2005/12/01 or later. \LWR@ProvidesPackageDrop{romanbarpagenumber} - \endinput %% %% End of file `lwarp-romanbarpagenumber.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-rotating.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-rotating.sty index c81f71bf23a..94243a77016 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-rotating.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-rotating.sty @@ -32,7 +32,6 @@ \let\rotcaption\caption \let\@makerotcaption\@makecaption - \endinput %% %% End of file `lwarp-rotating.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-rotfloat.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-rotfloat.sty index e359bb761c6..011ab6d59a3 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-rotfloat.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-rotfloat.sty @@ -34,7 +34,6 @@ \cslet{listof#1s}\relax \cslet{listof#1es}\relax } - \endinput %% %% End of file `lwarp-rotfloat.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-savetrees.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-savetrees.sty index ff19d92a6c1..679b6475d00 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-savetrees.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-savetrees.sty @@ -16,7 +16,6 @@ %% and version 1.3 or later is part of all distributions of LaTeX %% version 2005/12/01 or later. \LWR@ProvidesPackageDrop{savetrees} - \endinput %% %% End of file `lwarp-savetrees.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-scalefnt.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-scalefnt.sty index 282cf4c35e6..0c08dc5b326 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-scalefnt.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-scalefnt.sty @@ -18,7 +18,6 @@ \LWR@ProvidesPackageDrop{scalefnt} \DeclareRobustCommand\scalefont[1]{} - \endinput %% %% End of file `lwarp-scalefnt.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-sectsty.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-sectsty.sty new file mode 100644 index 00000000000..d759412b268 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-sectsty.sty @@ -0,0 +1,38 @@ +%% +%% This is file `lwarp-sectsty.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `sectsty') +%% 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{sectsty} +\newcommand*{\partfont} [1] {} +\newcommand*{\partnumberfont} [1] {} +\newcommand*{\parttitlefont} [1] {} +\newcommand*{\chapterfont} [1] {} +\newcommand*{\chapternumberfont} [1] {} +\newcommand*{\chaptertitlefont} [1] {} +\newcommand*{\sectionfont} [1] {} +\newcommand*{\subsectionfont} [1] {} +\newcommand*{\subsubsectionfont} [1] {} +\newcommand*{\paragraphfont} [1] {} +\newcommand*{\subparagraphfont} [1] {} +\newcommand*{\minisecfont} [1] {} +\newcommand*{\allsectionsfont}[1] {} +\newcommand{\nohang}{} +\newcommand*{\sectionrule}[5]{} + +\def\ulemheading#1#2{} +\endinput +%% +%% End of file `lwarp-sectsty.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-setspace.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-setspace.sty index 45ad17ca3d4..a8e454210ae 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-setspace.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-setspace.sty @@ -61,7 +61,6 @@ } {\endBlockClass} - \endinput %% %% End of file `lwarp-setspace.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-shadow.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-shadow.sty index 8773a35ef6a..193a5591035 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-shadow.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-shadow.sty @@ -27,7 +27,6 @@ \InlineClass{shabox}{#1}% } - \endinput %% %% End of file `lwarp-shadow.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-showidx.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-showidx.sty index 67fd0757a7d..24bd0244915 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-showidx.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-showidx.sty @@ -15,7 +15,6 @@ %% 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. - \endinput %% %% End of file `lwarp-showidx.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-showkeys.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-showkeys.sty index 08f784889e7..c032f4c14b7 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-showkeys.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-showkeys.sty @@ -21,7 +21,6 @@ \NewDocumentCommand{\showkeys}{s}{} - \endinput %% %% End of file `lwarp-showkeys.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-sidecap.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-sidecap.sty index 8beddf3bd9f..0669fce1338 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-sidecap.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-sidecap.sty @@ -39,7 +39,6 @@ \newenvironment*{wide}{}{} - \endinput %% %% End of file `lwarp-sidecap.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-sidenotes.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-sidenotes.sty index cc163ee14fd..42b5c1e5339 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-sidenotes.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-sidenotes.sty @@ -63,7 +63,6 @@ \renewenvironment{table*} {\@dblfloat{table}} {\end@dblfloat} - \endinput %% %% End of file `lwarp-sidenotes.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-siunitx.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-siunitx.sty index eaf8c4cd94b..124652703f2 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-siunitx.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-siunitx.sty @@ -27,7 +27,6 @@ }% AtBeginDocument - \endinput %% %% End of file `lwarp-siunitx.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-soul.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-soul.sty index 27bc4046f88..aec6a684692 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-soul.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-soul.sty @@ -65,7 +65,6 @@ \let\textul\ul \let\texthl\hl \let\textcaps\caps - \endinput %% %% End of file `lwarp-soul.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-stabular.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-stabular.sty new file mode 100644 index 00000000000..3e47e4a3289 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-stabular.sty @@ -0,0 +1,33 @@ +%% +%% This is file `lwarp-stabular.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `stabular') +%% 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{stabular} +\newenvironment{stabular}[2][c] +{ +\renewcommand{\noalign}[1]{} +\begin{tabular}[#1]{#2} +} +{\end{tabular}} +\NewDocumentEnvironment{stabular*}{m o m} +{ +\renewcommand{\noalign}[1]{} +\begin{tabular}[#2]{#3} +} +{\end{tabular}} +\endinput +%% +%% End of file `lwarp-stabular.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-subfig.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-subfig.sty index ddb4669d11a..e5e1ab4fcd7 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-subfig.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-subfig.sty @@ -216,7 +216,6 @@ \renewcommand{\l@subfigure}[2]{\hypertocfloat{2}{subfigure}{lof}{#1}{#2}} \renewcommand{\l@subtable}[2]{\hypertocfloat{2}{subtable}{lot}{#1}{#2}} - \endinput %% %% End of file `lwarp-subfig.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-supertabular.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-supertabular.sty index 16349be9ddd..591131562eb 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-supertabular.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-supertabular.sty @@ -70,7 +70,6 @@ {\minipage{\linewidth}\supertabular{#3}} {\endsupertabular\endminipage} - \endinput %% %% End of file `lwarp-supertabular.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-syntonly.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-syntonly.sty index f93436209e0..8ca59206b5c 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-syntonly.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-syntonly.sty @@ -22,7 +22,6 @@ \newcommand*{\syntaxonly}{} \@onlypreamble\syntaxonly - \endinput %% %% End of file `lwarp-syntonly.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-tabls.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-tabls.sty new file mode 100644 index 00000000000..2bf7ee86b01 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-tabls.sty @@ -0,0 +1,24 @@ +%% +%% This is file `lwarp-tabls.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `tabls') +%% 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{tabls} +\newdimen\tablinesep +\newdimen\arraylinesep +\newdimen\extrarulesep +\endinput +%% +%% End of file `lwarp-tabls.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-tabularx.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-tabularx.sty index 65e529da7af..3b1d41eb8a3 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-tabularx.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-tabularx.sty @@ -27,7 +27,6 @@ {\tabular{#3}} {\endtabular} - \endinput %% %% End of file `lwarp-tabularx.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-tabulary.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-tabulary.sty index 48335c59499..f2a7b3c5b07 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-tabulary.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-tabulary.sty @@ -31,7 +31,6 @@ \newdimen\tymax \def\tyformat{} - \endinput %% %% End of file `lwarp-tabulary.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-textarea.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-textarea.sty index 6b7ffb4bdbe..f8e3b165110 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-textarea.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-textarea.sty @@ -21,7 +21,6 @@ \newcommand*\RestoreTextArea{} \newcommand*\ExpandTextArea[1][*]{} \let\NCC@restoretextarea\@empty - \endinput %% %% End of file `lwarp-textarea.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-textcomp.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-textcomp.sty index e25de7f94a5..c1eae9e4b71 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-textcomp.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-textcomp.sty @@ -21,6 +21,19 @@ \let\LWR@origtextcelsius\textcelsius \let\LWR@origtextohm\textohm \let\LWR@origtextmu\textmu +\let\LWR@origtextlquill\textlquill +\let\LWR@origtextrquill\textrquill +\let\LWR@origtextcircledP\textcircledP +\let\LWR@origtexttwelveudash\texttwelveudash +\let\LWR@origtextthreequartersemdash\textthreequartersemdash +\let\LWR@origtextmho\textmho +\let\LWR@origtextnaira\textnaira +\let\LWR@origtextpeso\textpeso +\let\LWR@origtextrecipe\textrecipe +\let\LWR@origtextpertenthousand\textpertenthousand +\let\LWR@origtextbaht\textbaht +\let\LWR@origtextdiscount\textdiscount +\let\LWR@origtextservicemark\textservicemark \LetLtxMacro\LWR@origcapitalcedilla\capitalcedilla \LetLtxMacro\LWR@origcapitalogonek\capitalogonek \LetLtxMacro\LWR@origcapitalgrave\capitalgrave @@ -35,16 +48,43 @@ \LetLtxMacro\LWR@origcapitalmacron\capitalmacron \LetLtxMacro\LWR@origcapitaldotaccent\capitaldotaccent \LetLtxMacro\LWR@origtextcircled\textcircled +\AtBeginDocument{ \ifPDFTeX \renewcommand*{\textdegree}{\HTMLentity{deg}} -\renewcommand*{\textcelsius}{\HTMLentity{deg}\,C} +\renewcommand*{\textcelsius}{\HTMLunicode{2103}} \renewcommand*{\textohm}{\HTMLunicode{2126}} \renewcommand*{\textmu}{\HTMLunicode{00B5}} +\renewcommand*{\textlquill}{\HTMLunicode{2045}} +\renewcommand*{\textrquill}{\HTMLunicode{2046}} +\renewcommand*{\textcircledP}{\HTMLunicode{2117}} +\renewcommand*{\texttwelveudash}{\HTMLunicode{2014}}% emdash +\renewcommand*{\textthreequartersemdash}{\HTMLunicode{2014}}% emdash +\renewcommand*{\textmho}{\HTMLunicode{2127}} +\renewcommand*{\textnaira}{\HTMLunicode{20A6}} +\renewcommand*{\textpeso}{\HTMLunicode{20B1}} +\renewcommand*{\textrecipe}{\HTMLunicode{211E}} +\renewcommand*{\textpertenthousand}{\HTMLunicode{2031}} +\renewcommand*{\textbaht}{\HTMLunicode{0E3F}} +\renewcommand*{\textdiscount}{\%} +\renewcommand*{\textservicemark}{\HTMLunicode{2120}} \else \renewcommand*{\textdegree}{°} -\renewcommand*{\textcelsius}{°C} +\renewcommand*{\textcelsius}{℃} \renewcommand*{\textohm}{Ω} -\renewcommand*{\textmu}{μ} +\renewcommand*{\textmu}{µ} +\renewcommand*{\textlquill}{⁅} +\renewcommand*{\textrquill}{⁆} +\renewcommand*{\textcircledP}{℗} +\renewcommand*{\texttwelveudash}{—}% emdash +\renewcommand*{\textthreequartersemdash}{—}% emdash +\renewcommand*{\textmho}{℧} +\renewcommand*{\textnaira}{₦} +\renewcommand*{\textpeso}{₱} +\renewcommand*{\textrecipe}{℞} +\renewcommand*{\textpertenthousand}{‱} +\renewcommand*{\textbaht}{฿} +\renewcommand*{\textdiscount}{\%} +\renewcommand*{\textservicemark}{℠} \fi \renewcommand*{\capitalcedilla}[1]{#1\HTMLunicode{0327}} \renewcommand*{\capitalogonek}[1]{#1\HTMLunicode{0328}} @@ -62,11 +102,25 @@ \renewcommand*{\textcircled}[1]{% \InlineClass[border: 1px solid \LWR@currenttextcolor]{textcircled}{#1}% } +}% AtBeginDocument \appto{\LWR@restoreorigformatting}{% \let\textdegree\LWR@origtextdegree% \let\textcelsius\LWR@origtextcelsius% \let\textohm\LWR@origtextohm% \let\textmu\LWR@origtextmu% +\let\textlquill\LWR@origtextlquill% +\let\textrquill\LWR@origtextrquill% +\let\textcircledP\LWR@origtextcircledP% +\let\texttwelveudash\LWR@origtexttwelveudash% +\let\textthreequartersemdash\LWR@origtextthreequartersemdash% +\let\textmho\LWR@origtextmho% +\let\textnaira\LWR@origtextnaira% +\let\textpeso\LWR@origtextpeso% +\let\textrecipe\LWR@origtextrecipe% +\let\textpertenthousand\LWR@origtextpertenthousand% +\let\textbaht\LWR@origtextbaht% +\let\textdiscount\LWR@origtextdiscount% +\let\textservicemark\LWR@origtextservicemark% \LetLtxMacro\capitalcedilla\LWR@origcapitalcedilla% \LetLtxMacro\capitalogonek\LWR@origcapitalogonek% \LetLtxMacro\capitalgrave\LWR@origcapitalgrave% @@ -82,7 +136,6 @@ \LetLtxMacro\capitaldotaccent\LWR@origcapitaldotaccent% \LetLtxMacro\textcircled\LWR@origtextcircled% } - \endinput %% %% End of file `lwarp-textcomp.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-textpos.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-textpos.sty index d1717b0ade7..21c805d6997 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-textpos.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-textpos.sty @@ -37,7 +37,6 @@ \newcommand*{\showtextsize}{} \newcommand{\textblockorigin}[2]{} - \endinput %% %% End of file `lwarp-textpos.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-theorem.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-theorem.sty index 31445047f0a..2a597dada71 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-theorem.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-theorem.sty @@ -172,7 +172,6 @@ ]} } \gdef\@endtheorem{\endBlockClass\endtrivlist} - \endinput %% %% End of file `lwarp-theorem.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-threeparttable.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-threeparttable.sty index 8259967e848..d56adf85638 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-threeparttable.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-threeparttable.sty @@ -39,7 +39,6 @@ } \newcommand{\tnote}[1]{\LWR@htmlspan{sup}{#1}} - \endinput %% %% End of file `lwarp-threeparttable.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-tikz.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-tikz.sty index 27d650ca68c..db79ea24fc4 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-tikz.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-tikz.sty @@ -43,7 +43,6 @@ \end{warpHTML} - \endinput %% %% End of file `lwarp-tikz.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-titleps.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-titleps.sty index 45ee6066488..be307149118 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-titleps.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-titleps.sty @@ -69,7 +69,6 @@ \newcommand{\outerextramarks}[1]{} \newcommand{\innerextramarks}[1]{} - \endinput %% %% End of file `lwarp-titleps.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-titleref.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-titleref.sty index 36bece512c3..dd8376af42f 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-titleref.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-titleref.sty @@ -16,7 +16,6 @@ %% and version 1.3 or later is part of all distributions of LaTeX %% version 2005/12/01 or later. \LWR@loadnever{titleref}{hyperref and nameref} - \endinput %% %% End of file `lwarp-titleref.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-titlesec.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-titlesec.sty index de999d7cd94..73f92bf8dfa 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-titlesec.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-titlesec.sty @@ -54,7 +54,6 @@ \newcommand{\assignpagestyle}[2]{#2} \NewDocumentCommand{\titleclass}{m o m o} - \endinput %% %% End of file `lwarp-titlesec.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-titletoc.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-titletoc.sty index db1fbadf003..b545422099c 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-titletoc.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-titletoc.sty @@ -51,7 +51,6 @@ \newcommand{\printlist}[4][]{} - \endinput %% %% End of file `lwarp-titletoc.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-titling.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-titling.sty index 18e14d45c9e..47d9b18a9ad 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-titling.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-titling.sty @@ -109,7 +109,6 @@ \else \thanksmarkseries{fnsymbol} \fi - \endinput %% %% End of file `lwarp-titling.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-tocbibind.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-tocbibind.sty index 834f23cb9e0..e75a91c1da2 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-tocbibind.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-tocbibind.sty @@ -16,6 +16,8 @@ %% and version 1.3 or later is part of all distributions of LaTeX %% version 2005/12/01 or later. +\let\simplechapterdelim\relax + \LWR@ProvidesPackagePass{tocbibind} \renewenvironment{theindex}% @@ -47,7 +49,15 @@ \let\subitem\LWR@indexsubitem% \let\subsubitem\LWR@indexsubsubitem% } +\renewcommand{\simplechapter}[1][\@empty]{% + \def\@chapcntformat##1{% + #1~\csname the##1\endcsname\simplechapterdelim\protect\quad% + }% +} +\renewcommand{\restorechapter}{% +\let\@chapcntformat\@seccntformat% +} \endinput %% %% End of file `lwarp-tocbibind.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-tocloft.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-tocloft.sty index 4951458aafb..ac033b8d0f9 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-tocloft.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-tocloft.sty @@ -18,8 +18,6 @@ - - \LWR@ProvidesPackageDrop{tocloft} \newcommand{\tocloftpagestyle}[1]{} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-transparent.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-transparent.sty index 92fbb443968..221759527b4 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-transparent.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-transparent.sty @@ -15,7 +15,6 @@ %% 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{transparent} \newcommand*{\transparent}[1]{\edef\LWR@opacity{#1}} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-trivfloat.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-trivfloat.sty index afff8086bf6..c1e95e266e2 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-trivfloat.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-trivfloat.sty @@ -19,7 +19,6 @@ - \LWR@ProvidesPackageDrop{trivfloat} \LWR@origRequirePackage{trivfloat} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-typearea.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-typearea.sty index c4a81e065f0..bc114e6a4de 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-typearea.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-typearea.sty @@ -15,7 +15,6 @@ %% 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{typearea} \newcommand*\typearea[2][\z@]{} \newcommand*{\recalctypearea}{} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-ulem.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-ulem.sty index e191ec1a12c..c89139bd40d 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-ulem.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-ulem.sty @@ -15,7 +15,6 @@ %% 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. - \LetLtxMacro\LWR@ulemorigemph\emph \LetLtxMacro\LWR@ulemorigtextbf\textbf \NewDocumentCommand{\uline}{+m}{% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-upref.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-upref.sty index b95e9ce656e..81cfd6fa7f8 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-upref.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-upref.sty @@ -15,7 +15,6 @@ %% 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{upref} \endinput %% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-verse.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-verse.sty index c28a760537c..3c52cad9193 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-verse.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-verse.sty @@ -15,7 +15,6 @@ %% 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{verse} \AfterEndPreamble{ diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-wallpaper.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-wallpaper.sty index 44377d23af2..228e89f88d6 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-wallpaper.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-wallpaper.sty @@ -18,7 +18,6 @@ - \LWR@ProvidesPackageDrop{wallpaper} \newcommand*{\CenterWallPaper}[2]{} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-wrapfig.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-wrapfig.sty index de994f68963..4eb11999622 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-wrapfig.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-wrapfig.sty @@ -18,7 +18,6 @@ - \LWR@ProvidesPackageDrop{wrapfig} \newlength{\LWR@wrapwidth} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty index 25cf80d7a8f..73ef5eb9276 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty @@ -17,7 +17,6 @@ %% version 2005/12/01 or later. - \LWR@ProvidesPackagePass{xcolor} \begin{warpHTML} @@ -143,7 +142,7 @@ padding:\rndprintlength{\fboxsep}% \begin{BlockClass}[% #3% \LWR@borderpadding{#1}{#2} ; % -\IfValueTF{#4}{height:\rndprintlength{\LWR@tempheight} ; }{}% +\IfValueT{#4}{height:\rndprintlength{\LWR@tempheight} ; }% width:\rndprintlength{\LWR@tempwidth}% ]{fcolorminipage}% } @@ -151,7 +150,7 @@ width:\rndprintlength{\LWR@tempwidth}% {% \LWR@FBcancel% \setlength{\LWR@tempwidth}{#8}% -\IfValueTF{#6}{\setlength{\LWR@tempheight}{#6}}{}% +\IfValueT{#6}{\setlength{\LWR@tempheight}{#6}}% \uselengthunit{PT}% \LWR@forceminwidth{\fboxrule}% \convertcolorspec{#1}{#2}{HTML}\LWR@tempcolor% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-xfrac.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-xfrac.sty index 35ddcb151f7..8c9ccc12762 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-xfrac.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-xfrac.sty @@ -17,7 +17,6 @@ %% version 2005/12/01 or later. - \LWR@ProvidesPackagePass{xfrac} @@ -50,6 +49,7 @@ denominator-format = {% \LWR@htmlsmallfontstart{}\,#1\LWR@htmlsmallfontend}, scaling = false } + \DeclareInstance{xfrac}{lmr}{text}{ numerator-format = {% \LetLtxMacro{\scalebox}{\LWR@noscalebox}% @@ -59,6 +59,7 @@ denominator-format = {% \LWR@htmlsmallfontstart{}\,#1\LWR@htmlsmallfontend}, scaling = false } + \DeclareInstance{xfrac}{lmss}{text}{ numerator-format = {% \LetLtxMacro{\scalebox}{\LWR@noscalebox}% @@ -68,6 +69,7 @@ denominator-format = {% \LWR@htmlsmallfontstart{}\,#1\LWR@htmlsmallfontend}, scaling = false } + \DeclareInstance{xfrac}{lmtt}{text}{ numerator-format = {% \LetLtxMacro{\scalebox}{\LWR@noscalebox}% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-xltxtra.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-xltxtra.sty index 8c52012dd3b..746ac736e28 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-xltxtra.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-xltxtra.sty @@ -15,7 +15,6 @@ %% 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{xltxtra} \RequirePackage{realscripts} \RequirePackage{metalogo} @@ -35,7 +34,7 @@ \newcommand\xxt@namedglyph@fallback[1]{[#1]} -\newcommand{\showhyphens}[1]{} +\DeclareDocumentCommand{\showhyphens}{m}{} \endinput %% %% End of file `lwarp-xltxtra.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-xmpincl.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-xmpincl.sty index bd7012d30c8..3d8faeb3a03 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-xmpincl.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-xmpincl.sty @@ -15,7 +15,6 @@ %% 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{xmpincl} \newcommand*{\includexmp}[1]{} \endinput diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-xtab.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-xtab.sty index 6798e112027..33e55a7c2ae 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-xtab.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-xtab.sty @@ -17,7 +17,6 @@ %% version 2005/12/01 or later. - \LWR@ProvidesPackageDrop{xtab} \newcommand{\LWRXT@firsthead}{} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-zwpagelayout.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-zwpagelayout.sty index 7bb7b849e4a..808d1e5e966 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-zwpagelayout.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-zwpagelayout.sty @@ -15,7 +15,6 @@ %% 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{zwpagelayout} \def\noBboxes{} \@onlypreamble\noBboxes diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp.sty index 33c49ac4737..09b09364a47 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp.sty @@ -17,7 +17,7 @@ %% version 2005/12/01 or later. \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesPackage{lwarp} - [2017/09/05 v0.39 Allows LaTeX to directly produce HTML5 output.] + [2017/09/25 v0.40 Allows LaTeX to directly produce HTML5 output.] @@ -200,11 +200,13 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{a4wide} \LWR@loadafter{a5comb} \LWR@loadafter{abstract} +\LWR@loadafter{adjmulticol} \LWR@loadafter{addlines} \LWR@loadafter{afterpage} \LWR@loadafter{algorithmicx} \LWR@loadafter{alltt} \LWR@loadafter{amsthm} +\LWR@loadafter{anonchap} \LWR@loadafter{anysize} \LWR@loadafter{appendix} \LWR@loadafter{arabicfront} @@ -223,7 +225,9 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{chappg} \LWR@loadafter{color} \LWR@loadafter{crop} +\LWR@loadafter{cuted} \LWR@loadafter{cutwin} +\LWR@loadafter{dblfnote} \LWR@loadafter{dcolumn} \LWR@loadafter{draftwatermark} \LWR@loadafter{ebook} @@ -247,6 +251,7 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{floatrow} \LWR@loadafter{flushend} \LWR@loadafter{fncychap} +\LWR@loadafter{fnpos} \LWR@loadafter{ftnright} \LWR@loadafter{fullpage} \LWR@loadafter{fullwidth} @@ -273,6 +278,7 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{mdframed} \LWR@loadafter{metalogo} \LWR@loadafter{microtype} +\LWR@loadafter{midfloat} \LWR@loadafter{moreverb} \LWR@loadafter{mparhack} \LWR@loadafter{multirow} @@ -289,8 +295,10 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{parskip} \LWR@loadafter{pdflscape} \LWR@loadafter{pdfsync} +\LWR@loadafter{pfnote} \LWR@loadafter{placeins} \LWR@loadafter{prelim2e} +\LWR@loadafter{quotchap} \LWR@loadafter{ragged2e} \LWR@loadafter{realscripts} \LWR@loadafter{relsize} @@ -299,6 +307,7 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{rotating} \LWR@loadafter{rotfloat} \LWR@loadafter{savetrees} +\LWR@loadafter{sectsty} \LWR@loadafter{setspace} \LWR@loadafter{shadow} \LWR@loadafter{showidx} @@ -307,8 +316,10 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{sidenotes} \LWR@loadafter{siunitx} \LWR@loadafter{soul} +\LWR@loadafter{stabular} \LWR@loadafter{subfig} \LWR@loadafter{supertabular} +\LWR@loadafter{tabls} \LWR@loadafter{tabularx} \LWR@loadafter{tabulary} \LWR@loadafter{textarea} @@ -456,8 +467,6 @@ top=1in,bottom=1in,% \RequirePackage{amsmath} -\RequirePackage{xfrac} - \RequirePackage{printlen} \end{warpHTML} @@ -678,6 +687,7 @@ top=1in,bottom=1in,% \let\LWR@origsb\sb \let\LWR@origtextsuperscript\textsuperscript \let\LWR@origtextsubscript\textsubscript +\LetLtxMacro\LWR@origunderline\underline \let\LWR@origscriptsize\scriptsize @@ -919,6 +929,11 @@ span.textsf { span.textcircled { border: 1px solid black ; border-radius: 1ex ; } +span.underline { + text-decoration: underline ; + text-decoration-skip ; +} + /* For realscripts */ .supsubscript { display: inline-block; @@ -958,7 +973,15 @@ blockquote { margin-right: 0px ; } -blockquote p { +/* quotchap is for the quotchap package */ +div.quotchap { + font-style: oblique ; + overflow-x: auto ; + margin-left: 2em ; + margin-right: 2em ; +} + +blockquote p, div.quotchap p { line-height: 1.5; text-align: left ; font-size: .85em ; @@ -966,6 +989,20 @@ blockquote p { margin-right: 3em ; } +/* qauthor is for the quotchap package */ +div.qauthor { + display: block ; + text-align: right ; + margin-left: auto ; + margin-right: 2em ; + font-size: 80% ; + font-variant: small-caps; +} + +div.qauthor p { + text-align: right ; +} + blockquotation { margin-left: 0px ; margin-right: 0px ; @@ -2600,7 +2637,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.39" +printversion = "v0.40" function printhelp () print ("lwarpmk: Use lwarpmk -h or lwarpmk --help for help.") ; @@ -3496,7 +3533,7 @@ end -- not --version \renewcommand{\BlockClassSingle}[2]{##2}% \renewcommand{\LWR@forcenewpage}{}% \renewcommand{\LWR@itemizestart}{% - \let\item\LWR@nestspanitem% + \let\item\LWR@nestspanitem% }% \renewcommand{\LWR@itemizeend}{}% \renewcommand{\LWR@enumeratestart}{% @@ -3508,8 +3545,8 @@ end -- not --version }% \renewcommand{\LWR@descriptionend}{}% }% not in a lateximage -}% -{% +}% starting env +{% ending env \ifthenelse{\cnttest{\value{LWR@lateximagedepth}}{>}{0}}% {}% {\addtocounter{LWR@spandepth}{-1}}% @@ -3528,11 +3565,13 @@ end -- not --version } \NewDocumentCommand{\LWR@htmlspanclass}{o m +m}{% +\LWR@traceinfo{LWR@htmlspanclass #2}% \LWR@ensuredoingapar% \LWR@subhtmlelementclass{span}[#1]{#2}% \begin{LWR@nestspan}% #3% \LWR@htmltagc{/span}% +\LWR@traceinfo{LWR@htmlspanclass done}% \end{LWR@nestspan}% } @@ -3592,13 +3631,15 @@ end -- not --version \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 + {\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 +{\LWR@htmltag{#1 class="#3"}}% no option +\LWR@traceinfo{LWR@subhtmlelementclass done}% } \NewDocumentCommand{\LWR@htmlelementclass}{m o m}{% @@ -3648,8 +3689,6 @@ end -- not --version \end{warpHTML} - - \begin{warpHTML} \NewDocumentEnvironment{BlockClass}{o m}% { @@ -4196,6 +4235,8 @@ end -- not --version \newcounter{LWR@prevFileDepth} \setcounter{LWR@prevFileDepth}{\LWR@depthsubparagraph} \def\@seccntformat#1{\csname the#1\endcsname\protect\quad} +\newcommand*{\simplechapterdelim}{} +\let\@chapcntformat\@seccntformat \DeclareDocumentCommand{\LWR@section}{m m m m}{% \LWR@traceinfo{LWR@section |#2| |#3|}% \LWR@traceinfo{LWR@section: not an empty section}% @@ -4231,10 +4272,10 @@ end -- not --version \LWR@orignewpage% }% not new file -\IfValueTF{#3}{% +\IfValueT{#3}{% \LWR@traceinfo{LWR@section: about to LWR@setlatestname}% \IfValueTF{#2}{\LWR@setlatestname{#2}}{\LWR@setlatestname{#3}}% -}{}% +}% \ifbool{HTMLDebugComments}{% \LWR@htmlcomment{Opening #4 ``#3''{}}% @@ -4291,7 +4332,11 @@ end -- not --version \ifthenelse{% \cnttest{\csuse{LWR@depth#4}}{<=}{\value{secnumdepth}}% }% - {\protect\LWR@sectionnumber{\@seccntformat{#4}}}% + {% + \ifstrequal{#4}{chapter}% + {\protect\LWR@sectionnumber{\@chapcntformat{#4}}}% + {\protect\LWR@sectionnumber{\@seccntformat{#4}}}% + }% {}% \LWR@traceinfo{LWR@section: finished print section number}% }{}% @@ -4331,6 +4376,8 @@ end -- not --version \LWR@section{#1}{#2}{#3}{part}% } +\let\@printcites\relax% for quotchap package + \@ifundefined{chapter} {} {% @@ -4342,6 +4389,7 @@ end -- not --version \LWR@startnewdepth{\LWR@depthchapter}{\LWR@printclosechapter}% \LWR@section{#1}{#2}{#3}{chapter}% +\@printcites% for quotchap package } } @@ -4501,9 +4549,6 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \let\XeTeX\LWR@XeTeX \let\XeLaTeX\LWR@XeLaTeX \let\ConTeXt\LWR@ConTeXt -\LetLtxMacro{\rotatebox}{\LWR@rotatebox} -\LetLtxMacro{\scalebox}{\LWR@scalebox} -\let\reflectbox\LWR@reflectbox \global\boolfalse{LWR@doingapar} \global\boolfalse{LWR@doingstartpars} \LWR@traceinfo{LWR@lwarpStart: Starting new file.} @@ -5455,13 +5500,13 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% }% \LWR@maybenewtablerow% \LWR@htmltag{td colspan="#3" % -\IfValueTF{#2}{ % rows? +\IfValueT{#2}{ % rows? rowspan="#2" % \IfValueT{#1}{% vpos? \ifstrequal{#1}{b}{style="vertical-align:bottom" }{}% \ifstrequal{#1}{t}{style="vertical-align:top" }{}% }% vpos? -}{}% rows? +}% rows? class="td% \LWR@parsemulticolumnalignment{#4}{\LWR@printmccoltype}% \ifthenelse{\equal{\LWR@getexparray{LWR@midrules}{\theLWR@tablecolspos}}{Y}}{rule}{}% @@ -5575,16 +5620,38 @@ rowspan="#2" % } \end{warpHTML} \begin{warpall} -\DeclareExpandableDocumentCommand{\LWR@origmulticolumnrow}{m m O{c} m O{0} m O{0pt} +m}{% -\multicolumn{#1}{#2}{\@xmultirow[#3]{#4}[#5]{#6}[#7]{#8}} -} - -\newcommand*{\multicolumnrow}{\LWR@origmulticolumnrow} +\AtBeginDocument{ +\@ifundefined{@xmultirow} +{}% no version of multirow was loaded +{% \@xmultirow defined, so some version of multirow was loaded +\@ifpackageloaded{multirow}{% v2.0 or newer +\@ifpackagelater{multirow}{2016/09/01}% 2016/09/27 for v2.0 +{% v2.0+: +\DeclareExpandableDocumentCommand{\LWR@origmulticolumnrow}% + {+m +m +O{c} +m +O{0} +m +O{0pt} +m}% +{\multicolumn{#1}{#2}{\@xmultirow[#3]{#4}[#5]{#6}[#7]{#8}}}% +} +{% loaded but older, probably not executed: +\DeclareExpandableDocumentCommand{\LWR@origmulticolumnrow}% + {+m +m +O{c} +m +O{0} +m +O{0pt} +m}% +{\multicolumn{#1}{#2}{\@xmultirow{#4}[#5]{#6}[#7]{#8}}}% +} +}% packageloaded{multirow} +{% v1.6 or older did not \ProvidePackage +\DeclareExpandableDocumentCommand{\LWR@origmulticolumnrow}% + {+m +m +O{c} +m +O{0} +m +O{0pt} +m}% +{\multicolumn{#1}{#2}{\@xmultirow{#4}[#5]{#6}[#7]{#8}}}% +} +\providecommand*{\multicolumnrow}{\LWR@origmulticolumnrow} +}% \@xmultirow defined, so multirow was loaded +}% AtBeginDocument \end{warpall} \begin{warpHTML} \newcommand*{\LWR@donothing}{} \newcommand*{\LWR@domidrule}{\booltrue{LWR@doinghline}} \newcommand*{\LWR@dotbrule}{\booltrue{LWR@doingtbrule}} +\newcommand*{\ldelim}{} +\newcommand*{\rdelim}{} \end{warpHTML} @@ -5618,38 +5685,42 @@ rowspan="#2" % {% \LWR@traceinfo{LWR@tabledatacolumntag}% \let\mynext\LWR@tabledatasinglecolumntag% -\ifthenelse{\isequivalentto{\LWR@mynexttoken}{\end}}% -{\booltrue{LWR@exitingtabular}}{}% -\ifthenelse{\isequivalentto{\LWR@mynexttoken}{\caption}}% -{\let\mynext\LWR@donothing}{}% -\ifthenelse{\isequivalentto{\LWR@mynexttoken}{\multicolumn}}% -{\let\mynext\LWR@donothing}{}% -\ifthenelse{\isequivalentto{\LWR@mynexttoken}{\multirow}}% -{\let\mynext\LWR@donothing}{}% -\ifthenelse{\isequivalentto{\LWR@mynexttoken}{\multicolumnrow}}% -{\let\mynext\LWR@donothing}{}% -\ifthenelse{\isequivalentto{\LWR@mynexttoken}{\mrowcell}}% -{\let\mynext\LWR@donothing}{}% -\ifthenelse{\isequivalentto{\LWR@mynexttoken}{\TabularMacro}}% -{\let\mynext\LWR@donothing}{}% -\ifthenelse{\isequivalentto{\LWR@mynexttoken}{\hline}}% -{\let\mynext\LWR@donothing}{}% -\ifthenelse{\isequivalentto{\LWR@mynexttoken}{\toprule}}% -{\let\mynext\LWR@donothing}{}% -\ifthenelse{\isequivalentto{\LWR@mynexttoken}{\midrule}}% -{\let\mynext\LWR@donothing}{}% -\ifthenelse{\isequivalentto{\LWR@mynexttoken}{\cmidrule}}% -{\let\mynext\LWR@donothing}{}% -\ifthenelse{\isequivalentto{\LWR@mynexttoken}{\specialrule}}% -{\let\mynext\LWR@donothing}{}% -\ifthenelse{\isequivalentto{\LWR@mynexttoken}{\cline}}% -{\let\mynext\LWR@donothing}{}% -\ifthenelse{\isequivalentto{\LWR@mynexttoken}{\bottomrule}}% -{\let\mynext\LWR@donothing}{}% -\ifthenelse{\isequivalentto{\LWR@mynexttoken}{\warpprintonly}} -{\let\mynext\LWR@donothing}{}% -\ifthenelse{\isequivalentto{\LWR@mynexttoken}{\warpHTMLonly}} -{\let\mynext\LWR@donothing}{}% +\ifdefequal{\LWR@mynexttoken}{\end}% + {\booltrue{LWR@exitingtabular}}{}% +\ifdefequal{\LWR@mynexttoken}{\caption}% + {\let\mynext\LWR@donothing}{}% +\ifdefequal{\LWR@mynexttoken}{\multicolumn}% + {\let\mynext\LWR@donothing}{}% +\ifdefequal{\LWR@mynexttoken}{\multirow}% + {\let\mynext\LWR@donothing}{}% +\ifdefequal{\LWR@mynexttoken}{\multicolumnrow}% + {\let\mynext\LWR@donothing}{}% +\ifdefequal{\LWR@mynexttoken}{\mrowcell}% + {\let\mynext\LWR@donothing}{}% +\ifdefequal{\LWR@mynexttoken}{\TabularMacro}% + {\let\mynext\LWR@donothing}{}% +\ifdefequal{\LWR@mynexttoken}{\hline}% + {\let\mynext\LWR@donothing}{}% +\ifdefequal{\LWR@mynexttoken}{\toprule}% + {\let\mynext\LWR@donothing}{}% +\ifdefequal{\LWR@mynexttoken}{\midrule}% + {\let\mynext\LWR@donothing}{}% +\ifdefequal{\LWR@mynexttoken}{\cmidrule}% + {\let\mynext\LWR@donothing}{}% +\ifdefequal{\LWR@mynexttoken}{\specialrule}% + {\let\mynext\LWR@donothing}{}% +\ifdefequal{\LWR@mynexttoken}{\cline}% + {\let\mynext\LWR@donothing}{}% +\ifdefequal{\LWR@mynexttoken}{\bottomrule}% + {\let\mynext\LWR@donothing}{}% +\ifdefequal{\LWR@mynexttoken}{\warpprintonly}% + {\let\mynext\LWR@donothing}{}% +\ifdefequal{\LWR@mynexttoken}{\warpHTMLonly}% + {\let\mynext\LWR@donothing}{}% +\ifdefequal{\LWR@mynexttoken}{\ldelim}% + {\let\mynext\LWR@donothing}{}% +\ifdefequal{\LWR@mynexttoken}{\rdelim}% + {\let\mynext\LWR@donothing}{}% \mynext% } @@ -5670,6 +5741,11 @@ rowspan="#2" % \newcommand*{\LWR@origaddlinespace}[1][]{} \newcommand*{\LWR@origmorecmidrules}{} \newcommand*{\LWR@origspecialrule}[3]{\hline} +\AtBeginDocument{ +\@ifpackageloaded{lwarp-tabls} +{\newcommand*{\LWR@hline}[1][]{\LWR@domidrule\LWR@getmynexttoken}} +{\newcommand*{\LWR@hline}{\LWR@domidrule\LWR@getmynexttoken}} +}% AtBeginDocument \StartDefiningTabulars \newenvironment*{LWR@tabular}[2][] @@ -5690,8 +5766,7 @@ rowspan="#2" % \LWR@clearmidrules% \LetLtxMacro{\\}{\LWR@tabularendofline}% \LWR@traceinfo{LWR@tabular: redefining macros}% -\renewcommand*{\hline}{\LWR@domidrule\LWR@getmynexttoken}% - +\renewcommand*{\hline}{\LWR@hline}% \RenewDocumentCommand{\cline}{m}% {\LWR@docmidrule{##1}\LWR@getmynexttoken}% @@ -6403,9 +6478,15 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}% } \newcommand*{\LWR@restoreorigformatting}{% \LWR@traceinfo{LWR@restoreorigformatting}% +\RenewDocumentCommand{\InlineClass}{o m +m}{##3}% +\RenewDocumentEnvironment{BlockClass}{o m}{}{}% +\renewcommand{\BlockClassSingle}[2]{##2}% \LetLtxMacro{\hspace}{\LWR@orighspace}% \LetLtxMacro\rule\LWR@origrule% \let\,\LWR@origcomma% disable HTML short unbreakable space +\let\textellipsis\LWR@origtextellipsis% +\let\textless\LWR@origtextless% +\let\textgreater\LWR@origtextgreater% \LetLtxMacro{\textrm}{\LWR@origtextrm}% \LetLtxMacro{\textsf}{\LWR@origtextsf}% \LetLtxMacro{\texttt}{\LWR@origtexttt}% @@ -6432,6 +6513,7 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}% \let\sb\LWR@origsb% \let\textsuperscript\LWR@origtextsuperscript% \let\textsubscript\LWR@origtextsubscript% +\LetLtxMacro\underline\LWR@origunderline% \let~\LWR@origtilde% \let\enskip\LWR@origenskip% \let\quad\LWR@origquad% @@ -6447,9 +6529,11 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}% \LetLtxMacro\specialrule\LWR@origspecialrule% \let\newline\LWR@orignewline% \LetLtxMacro{\raisebox}{\LWR@origraisebox}% +\LetLtxMacro\includegraphics\LWR@origincludegraphics% \LetLtxMacro{\scalebox}{\LWR@origscalebox}% \LetLtxMacro{\rotatebox}{\LWR@origrotatebox}% \let\reflectbox\LWR@origreflectbox% +\LetLtxMacro\resizebox\LWR@origresizebox% \let\framebox\LWR@origframebox% \let\makebox\LWR@origmakebox% \let\fbox\LWRprint@fbox% @@ -6459,6 +6543,10 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}% \LetLtxMacro{\minipage}{\LWR@origminipage}% \let\endminipage\LWR@endminipage% \LetLtxMacro{\parbox}{\LWR@origparbox}% +\let\TeX\LWR@origTeX% +\let\LaTeX\LWR@origLaTeX% +\let\LaTeXe\LWR@origLaTeXe% +\renewcommand*{\Xe}{X\textsubscript{E}}% \LWR@restoreorigaccents% \LWR@FBcancel% } @@ -6974,6 +7062,12 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}% } {} +\@ifpackageloaded{graphics} +{ +\LWR@origRequirePackage{lwarp-graphics} +} +{} + \end{warpHTML} @@ -6989,297 +7083,11 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}% \end{warpHTML} -\begin{warpHTML} - - -\newcommand*{\thisgraphicspath}{{}} -\renewcommand*{\graphicspath}[1]{\renewcommand*{\thisgraphicspath}{#1}} - - -\renewcommand*{\DeclareGraphicsExtensions}[1]{} -\renewcommand*{\DeclareGraphicsRule}[4]{} - - -\renewcommand*{\unitspace}{} - -\newlength{\LWR@igwidth} -\newlength{\LWR@igheight} -\newcommand*{\LWR@igwidthstyle}{} -\newcommand*{\LWR@igheightstyle}{} -\newcommand*{\LWR@igorigin}{} -\newcommand*{\LWR@igangle}{} -\newcommand*{\LWR@igxscale}{1} -\newcommand*{\LWR@igyscale}{1} -\newcommand*{\LWR@igclass}{inlineimage} - -\define@key{igraph}{width}{% -\setlength{\LWR@igwidth}{#1}% -\ifthenelse{\lengthtest{\LWR@igwidth > 0pt}}% -{% - \uselengthunit{PT}% - \renewcommand*{\LWR@igwidthstyle}{width:\rndprintlength{\LWR@igwidth}}% - \IfEndWith{#1}{ex}% - {\renewcommand*{\LWR@igwidthstyle}{width:#1}}% yes ex - {}% not ex - \IfEndWith{#1}{em}% - {\renewcommand*{\LWR@igwidthstyle}{width:#1}}% yes em - {}% not em - \IfEndWith{#1}{\%}% - {\renewcommand*{\LWR@igwidthstyle}{width:#1}}% yes percent - {}% not percent - \IfEndWith{#1}{px}% - {\renewcommand*{\LWR@igwidthstyle}{width:#1}}% yes px - {}% not px -}{}% end of length > 0pt -} -\define@key{igraph}{height}{% -\setlength{\LWR@igheight}{#1}% -\ifthenelse{\lengthtest{\LWR@igheight > 0pt}}% -{% - \uselengthunit{PT}% - \renewcommand*{\LWR@igheightstyle}{% - height:\rndprintlength{\LWR@igheight} % - }% - \IfEndWith{#1}{ex}% - {\renewcommand*{\LWR@igheightstyle}{height:#1}}% yes ex - {}% not ex - \IfEndWith{#1}{em}% - {\renewcommand*{\LWR@igheightstyle}{height:#1}}% yes em - {}% not em - \IfEndWith{#1}{\%}% - {\renewcommand*{\LWR@igheightstyle}{height:#1}}% yes percent - {}% not percent - \IfEndWith{#1}{px}% - {\renewcommand*{\LWR@igheightstyle}{height:#1}}% yes px - {}% not px -}{}% end of length > 0pt -} -\define@key{igraph}{origin}{% -\renewcommand*{\LWR@igorigin}{#1}% -} -\define@key{igraph}{angle}{\renewcommand*{\LWR@igangle}{#1}} -\define@key{igraph}{class}{\renewcommand*{\LWR@igclass}{#1}} - -\define@key{igraph}{scale}{% -\renewcommand*{\LWR@igxscale}{#1}% -\renewcommand*{\LWR@igyscale}{#1}} -\define@key{igraph}{bb}{} -\define@key{igraph}{bbllx}{} -\define@key{igraph}{bblly}{} -\define@key{igraph}{bburx}{} -\define@key{igraph}{bbury}{} -\define@key{igraph}{natwidth}{} -\define@key{igraph}{natheight}{} -\define@key{igraph}{hiresbb}{} -\define@key{igraph}{viewport}{} -\define@key{igraph}{trim}{} -\define@key{igraph}{totalheight}{} -\define@key{igraph}{keepaspectratio}{} -\define@key{igraph}{clip}{} -\define@key{igraph}{draft}{} -\define@key{igraph}{type}{} -\define@key{igraph}{ext}{} -\define@key{igraph}{read}{} -\define@key{igraph}{command}{} - -\newcommand*{\LWR@rotstyle}[2]{% - #1transform:rotate(-#2deg); -} - -\newcommand*{\LWR@scalestyle}[3]{% - #1transform:scale(#2,#3); -} - - -\newbool{LWR@infloatrow} -\boolfalse{LWR@infloatrow} - -\def\LWR@opacity{1} - -\newcommand*{\LWR@imageextension}{} -\newcommand*{\LWR@expgraphicsfilename}{} - -\NewDocumentCommand{\LWR@includegraphicsb}{s o o m} -{% -\LWR@origtilde \LWR@orignewline% -\ifthenelse{\cnttest{\value{LWR@minipagedepth}}{=}{0}}% -{% - \ifbool{LWR@infloatrow}% - {} - {% not in a minipage or a floatrow: - \setlength{\linewidth}{6in}% - \setlength{\textwidth}{6in}% - \setlength{\textheight}{9in}% - }% -}{}% -\edef\LWR@expgraphicsfilename{#4} -\renewcommand*{\LWR@imageextension}{}% -\IfFileExists{\detokenize\expandafter\thisgraphicspath\LWR@expgraphicsfilename.jpg}% -{\renewcommand*{\LWR@imageextension}{.jpg}}{}% -\IfFileExists{\detokenize\expandafter\thisgraphicspath\LWR@expgraphicsfilename.JPG}% -{\renewcommand*{\LWR@imageextension}{.JPG}}{}% -\IfFileExists{\detokenize\expandafter\thisgraphicspath\LWR@expgraphicsfilename.png}% -{\renewcommand*{\LWR@imageextension}{.png}}{}% -\IfFileExists{\detokenize\expandafter\thisgraphicspath\LWR@expgraphicsfilename.PNG}% -{\renewcommand*{\LWR@imageextension}{.PNG}}{}% -\IfFileExists{\detokenize\expandafter\thisgraphicspath\LWR@expgraphicsfilename.gif}% -{\renewcommand*{\LWR@imageextension}{.gif}}{}% -\IfFileExists{\detokenize\expandafter\thisgraphicspath\LWR@expgraphicsfilename.GIF}% -{\renewcommand*{\LWR@imageextension}{.GIF}}{}% -\IfFileExists{\detokenize\expandafter\thisgraphicspath\LWR@expgraphicsfilename.svg}% -{\renewcommand*{\LWR@imageextension}{.svg}}{}% -\IfFileExists{\detokenize\expandafter\thisgraphicspath\LWR@expgraphicsfilename.SVG}% -{\renewcommand*{\LWR@imageextension}{.SVG}}{}% -\IfFileExists{\detokenize\expandafter\thisgraphicspath\LWR@expgraphicsfilename.svgz}% -{\renewcommand*{\LWR@imageextension}{.svgz}}{}% -\IfFileExists{\detokenize\expandafter\thisgraphicspath\LWR@expgraphicsfilename.SVGZ}% -{\renewcommand*{\LWR@imageextension}{.SVGZ}}{}% -\StrSubstitute{\detokenize\expandafter{\LWR@expgraphicsfilename}}% -{\detokenize{.pdf}}{\detokenize{.svg}}[\LWR@strresult]% -\StrSubstitute{\LWR@strresult}% -{\detokenize{.PDF}}{\detokenize{.SVG}}[\LWR@strresult]% -\large% -\setlength{\LWR@igwidth}{0pt}% -\setlength{\LWR@igheight}{0pt}% -\renewcommand*{\LWR@igwidthstyle}{}% -\renewcommand*{\LWR@igheightstyle}{}% -\renewcommand*{\LWR@igorigin}{}% -\renewcommand*{\LWR@igangle}{}% -\renewcommand*{\LWR@igxscale}{1}% -\renewcommand*{\LWR@igyscale}{1}% -\renewcommand*{\LWR@igclass}{inlineimage}% -\IfValueTF{#3}{}{% -\IfValueTF{#2}% -{\setkeys{igraph}{#2}}% -{\setkeys{igraph}{}}% -}% -\href{\thisgraphicspath\LWR@strresult\LWR@imageextension}% -{% start of href -\LWR@htmltag{% start of image tags -img src="\thisgraphicspath\LWR@strresult\LWR@imageextension" \LWR@orignewline -\LWR@origtilde{} alt="\LWR@strresult" \LWR@orignewline -\ifthenelse{ - \NOT\equal{\LWR@igwidthstyle}{} \OR - \NOT\equal{\LWR@igheightstyle}{} \OR - \NOT\equal{\LWR@igorigin}{} \OR - \NOT\equal{\LWR@igangle}{} \OR - \NOT\equal{\LWR@igxscale}{1} \OR - \NOT\equal{\LWR@igyscale}{1} -}% -{\LWR@origtilde{} style="% -\ifthenelse{\NOT\equal{\LWR@igwidthstyle}{}}% -{\LWR@igwidthstyle;}{}% -\ifthenelse{\NOT\equal{\LWR@igheightstyle}{}}% -{\LWR@igheightstyle;}{}% -\ifthenelse{\NOT\equal{\LWR@igorigin}{}}% -{\LWR@origtilde{} transform-origin: \LWR@originnames{\LWR@igorigin}; \LWR@orignewline}{}% -\ifthenelse{\NOT\equal{\LWR@igangle}{}}% -{% -\LWR@rotstyle{-ms-}{\LWR@igangle}% -\LWR@rotstyle{-webkit-}{\LWR@igangle}% -\LWR@rotstyle{}{\LWR@igangle% -}}{}% -\ifthenelse{\NOT\equal{\LWR@igxscale}{1}\OR% -\NOT\equal{\LWR@igyscale}{1}}% -{\LWR@scalestyle{-ms-}{\LWR@igxscale}{\LWR@igyscale}% -\LWR@scalestyle{-webkit-}{\LWR@igxscale}{\LWR@igyscale}% -\LWR@scalestyle{}{\LWR@igxscale}{\LWR@igyscale}}{}% -\ifthenelse{\NOT\equal{\LWR@opacity}{1}}% -{opacity:\LWR@opacity;}% -{}% -" \LWR@orignewline}{}% -\LWR@origtilde{} class="\LWR@igclass" \LWR@orignewline% -}% end of image tags -}% end of href -\endgroup -\LWR@origscriptsize -} - - - - - -\renewcommand*{\includegraphics} -{% -\LWR@ensuredoingapar% -\begingroup% -\LWR@includegraphicsb% -} - -\end{warpHTML} \begin{warpprint} \define@key{Gin}{class}{} \end{warpprint} - -\begin{warpHTML} - -\newcommand*{\LWR@rotboxorigin}{} -\newcommand*{\LWR@originname}[1]{% -\ifthenelse{\equal{#1}{t}}{top}{}% -\ifthenelse{\equal{#1}{b}}{bottom}{}% -\ifthenelse{\equal{#1}{c}}{center}{}% -\ifthenelse{\equal{#1}{l}}{left}{}% -\ifthenelse{\equal{#1}{r}}{right}{}% -} -\newcommand*{\LWR@originnames}[1]{% -\StrChar{#1}{1}[\LWR@strresult]% -\LWR@originname{\LWR@strresult} -\StrChar{#1}{2}[\LWR@strresult]% -\LWR@originname{\LWR@strresult} -} -\define@key{krotbox}{origin}{% -\renewcommand*{\LWR@rotboxorigin}{#1}% -} -\define@key{krotbox}{x}{} -\define@key{krotbox}{y}{} -\define@key{krotbox}{units}{} -\LetLtxMacro\LWR@origrotatebox\rotatebox - -\NewDocumentCommand{\LWR@rotatebox}{O{} m +m}{% -\renewcommand*{\LWR@rotboxorigin}{} -\setkeys{krotbox}{#1}% -\LWR@htmltagc{span style="display: inline-block; % -\ifthenelse{\NOT\equal{\LWR@rotboxorigin}{}}% -{transform-origin: \LWR@originnames{\LWR@rotboxorigin};\LWR@origtilde}{}% -\LWR@rotstyle{-ms-}{#2} % -\LWR@rotstyle{-webkit-}{#2} % -\LWR@rotstyle{}{#2} % -"{}}\LWR@orignewline% -\begin{LWR@nestspan}% -#3% -\LWR@htmltagc{/span}% -\end{LWR@nestspan}% -} - -\LetLtxMacro\LWR@origscalebox\scalebox - -\NewDocumentCommand{\LWR@scalebox}{m o m}{% -\LWR@htmltagc{span style="display: inline-block; % -\LWR@scalestyle{-ms-}{#1}{\IfNoValueTF{#2}{#1}{#2}} % -\LWR@scalestyle{-webkit-}{#1}{\IfNoValueTF{#2}{#1}{#2}} % -\LWR@scalestyle{}{#1}{\IfNoValueTF{#2}{#1}{#2}} % -"{}}% -\begin{LWR@nestspan}% -#3% -\LWR@htmltagc{/span}% -\end{LWR@nestspan}% -} - -\let\LWR@origreflectbox\reflectbox - -\newcommand{\LWR@reflectbox}[1]{\LWR@scalebox{-1}[1]{#1}} - -\end{warpHTML} - - -\begin{warpHTML} - -\renewcommand{\resizebox}[3]{#3} - -\end{warpHTML} - \begin{warpall} \AtBeginDocument{ \@ifpackageloaded{xcolor}{ @@ -7496,7 +7304,7 @@ img src="\thisgraphicspath\LWR@strresult\LWR@imageextension" \LWR@orignewline \LWR@traceinfo{computed width is \rndprintlength{\LWR@minipagewidth}} \addtocounter{LWR@minipagedepth}{1}% \setlength{\LWR@minipageheight}{\textheight}% default unless specified -\IfValueTF{#2}{\setlength{\LWR@minipageheight}{#2}}{}% +\IfValueT{#2}{\setlength{\LWR@minipageheight}{#2}}% \LWR@stoppars% \LWR@traceinfo{minipage: creating div class}% \LWR@orignewpage% @@ -7518,7 +7326,7 @@ img src="\thisgraphicspath\LWR@strresult\LWR@imageextension" \LWR@orignewline {width:\rndprintlength{\LWR@minipagewidth} ; }% }% \LWR@traceinfo{minipage: about to print the height}% -\IfValueTF{#2}{height:\rndprintlength{\LWR@minipageheight} ; }{}% +\IfValueT{#2}{height:\rndprintlength{\LWR@minipageheight} ; }% "{}}% \LWR@origminipage{6in}% The preceding empty line is required. @@ -7615,11 +7423,11 @@ padding:\rndprintlength{\fboxsep}% \LWR@traceinfo{fminipage #1 #2 #3 #4}% \LWR@forceminwidth{\fboxrule}% \setlength{\LWR@tempwidth}{#4}% -\IfValueTF{#2}{\setlength{\LWR@tempheight}{#2}}{}% +\IfValueT{#2}{\setlength{\LWR@tempheight}{#2}}% \begin{BlockClass}[% \LWR@blackborderpadding ; % \uselengthunit{PT}% -\IfValueTF{#2}{height:\rndprintlength{\LWR@tempheight} ; }{}% +\IfValueT{#2}{height:\rndprintlength{\LWR@tempheight} ; }% width:\rndprintlength{\LWR@tempwidth}% ]{fminipage}% } @@ -7756,8 +7564,9 @@ width:\rndprintlength{\LWR@tempwidth}% \renewcommand*{\&}{and}% \renewcommand{\textsuperscript}[1]{##1}% \renewcommand{\textsubscript}[1]{##1}% +\LetLtxMacro\underline\LWR@origunderline% \RenewDocumentCommand{\LWR@htmlspanclass}{o m +m}{##3}% -\DeclareExpandableDocumentCommand{\InlineClass}{o m +m}{##3}% +\DeclareExpandableDocumentCommand{\InlineClass}{+o +m +m}{##3}% } \renewcommand*{\mdseries}{} @@ -7792,6 +7601,8 @@ width:\rndprintlength{\LWR@tempwidth}% \AtBeginDocument{\let\fup\textsuperscript} +\renewcommand{\underline}[1]{\InlineClass{underline}{#1}} + \renewcommand*{\hfill}{\qquad} \renewcommand*{\hrulefill}{\rule{1in}{1pt}} @@ -7812,6 +7623,7 @@ width:\rndprintlength{\LWR@tempwidth}% \let\LWR@origvspace\vspace \let\LWR@origrule\rule \let\LWR@origmedskip\medskip +\let\LWR@origtextellipsis\textellipsis \renewcommand*{\,}{\HTMLunicode{202f}} % HTML thin non-breakable space @@ -7946,7 +7758,7 @@ width:\rndprintlength{\LWR@tempwidth}% background:\LWR@currenttextcolor; % width:\printlength{\LWR@tempwidth}; % height:\printlength{\LWR@tempheight}; % - \IfValueTF{#1}% + \IfValueT{#1}% {% \setlength{\LWR@tempraise}{0pt-#1}% \setlength{\LWR@tempraise}{\LWR@tempraise*2}% @@ -7957,7 +7769,7 @@ width:\rndprintlength{\LWR@tempwidth}% \LWR@orignewline% transform: translate(0pt,\printlength{\LWR@tempraise}); % \LWR@orignewline% - }{}% + }% display:inline-block;"% }% \LWR@htmltagc{/span}% @@ -7980,14 +7792,20 @@ width:\rndprintlength{\LWR@tempwidth}% \begin{warpHTML} +\let\LWR@origTeX\TeX + \newcommand*{\LWR@TeX} {\InlineClass{latexlogofont}% {\InlineClass{latexlogo}{T\textsubscript{e}X}}} +\let\LWR@origLaTeX\LaTeX + \newcommand*{\LWR@LaTeX} {\InlineClass{latexlogofont}% {\InlineClass{latexlogo}% {L\textsuperscript{a}T\textsubscript{e}X}}} +\let\LWR@origLaTeXe\LaTeXe + \renewcommand*{\LaTeXe} {\LaTeX\InlineClass{latexlogofont}% {\,2\textsubscript{\textit{\HTMLunicode{3B5}}}}} @@ -8036,7 +7854,6 @@ width:\rndprintlength{\LWR@tempwidth}% \end{warpHTML} - \endinput %% %% End of file `lwarp.sty'. |