diff options
| author | Karl Berry <karl@freefriends.org> | 2017-03-23 21:28:36 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2017-03-23 21:28:36 +0000 |
| commit | a446276fde2e4a633907b16a14023894d6df7054 (patch) | |
| tree | 02f2dd0fd46a864032895b8b37c58aa3269670ec /Master/texmf-dist | |
| parent | 652642986982eb46e55c24b1163900fd1f995055 (diff) | |
lwarp (23mar17)
git-svn-id: svn://tug.org/texlive/trunk@43584 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
84 files changed, 5247 insertions, 115 deletions
diff --git a/Master/texmf-dist/doc/latex/lwarp/README.txt b/Master/texmf-dist/doc/latex/lwarp/README.txt index 9dfa5747aea..f144b473b76 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.24 README.txt +LaTeX lwarp package v0.25 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 b2728b86fd8..3497496c212 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 22a3ffa0f0e..acc2a442820 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.24" +printversion = "v0.25" 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 7d75f17ad54..25aeed06563 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/03/15 v0.24 Allows LaTeX to directly produce HTML5 output.] +%<package> [2017/03/22 v0.25 Allows LaTeX to directly produce HTML5 output.] % %<*driver> \documentclass{ltxdoc} @@ -56,7 +56,6 @@ \newunicodechar{Ô}{\^{O}} \newunicodechar{ê}{\^{e}} - \usepackage[log-declarations=false]{xparse} \usepackage[lwarpmk]{lwarp-newproject} @@ -178,6 +177,9 @@ Keywords={LaTeX, HTML, conversion}% \newcommand{\goesto}{$\Rightarrow$} +\newcommand{\credits}[1]{{\footnotesize(\textit{Based on original code by} \textsc{#1}.)}} + + \newcommand{\userentry}[1]{% \par \smallskip @@ -421,6 +423,22 @@ Limitations when using MathJax include: \end{itemize} } +\newcommand{\limitsntheorem}{% +This conversion is not total. +\watchout[Font control] +Font control is via \acro{CSS}, and the custom \LaTeX\ font settings +are ignored. + +\pkg{ntheorem} has a bug with equation numbering in AMS environments +\watchout[Equation numbering] +when the option \texttt{thref} is used. \pkg{lwarp} does not share +this bug, so equations with \cs{split}, etc, are numbered correctly +with \pkg{lwarp}'s \acro{HTML} output, but not with the print output. +It is recommended to use \pkg{cleveref} instead of \pkg{ntheorem}'s +\texttt{thref} option. +} + + \newcommand{\limitsgraphics}{% \cs{graphicspath} only works for a single directory; \margintag{\cs{graphicspath}} @@ -799,7 +817,7 @@ operating-system path separator used by \pkg{lwarp}. %<*package> % \fi % -% \CheckSum{9001} +% \CheckSum{10279} % % \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 @@ -861,6 +879,8 @@ operating-system path separator used by \pkg{lwarp}. % \changes{v0.22}{2017/03/02}{\ 2017/03/02} % \changes{v0.23}{2017/03/02}{\ 2017/03/02} % \changes{v0.24}{2017/03/15}{\ 2017/03/15} +% \changes{v0.25}{2017/03/22}{\ 2016/03/22} +% \changes{v0.25}{2017/03/16}{Docs: Adds credits for patched code.} @@ -987,9 +1007,19 @@ operating-system path separator used by \pkg{lwarp}. % \section{Updates} % \label{sec:updates} % +% The following is intended for those updating existing projects which use +% \pkg{lwarp}, highlighting any special changes which must be made due +% to improvements or modifications in \pkg{lwarp} itself. +% % For a detailed list of changes, see the Change History on page \pageref{sec:changehistory}. % % \begin{description} +% \item[v0.25:] \ +% \begin{itemize} +% \item Fix: Allows \pkg{graphicx} and \pkg{graphicsx} before \pkg{lwarp} because +% \XeLaTeX\ and \LuaLaTeX\ use \pkg{xunicode} which uses \pkg{graphics}. +% \item Package support for \pkg{framed}, several theorem packages, and ellipses. +% \end{itemize} % \item[v0.24:] \ % \begin{itemize} % \item \pkg{tikz}'s |babel| library is load automatically as needed. @@ -1228,6 +1258,7 @@ operating-system path separator used by \pkg{lwarp}. % \AmS{} environments are supported. % User-defined macros are available during converson, % due to native \LaTeX{} processing.\\ +% \pkg{theorem}, \pkg{amsthm}, \pkg{ntheorem}: & Supported, with added \acro{CSS} tags. \\ % \midrule % Floats: & Supported, appear where declared. % \pkg{float} is emulated, \pkg{newfloat} is supported, @@ -1267,13 +1298,12 @@ operating-system path separator used by \pkg{lwarp}. % \pkg{enumitem}: & Supported, although spacing is still controlled by \acro{CSS}. \\ % \midrule % Environments: & Standard \LaTeX{} environments are supported. \\ -% \pkg{theorem}: & Supported, with added \acro{CSS} tags. \\ % \pkg{picture} and \pkg{tikz}: & Converted to an \acro{SVG} image. \\ % \env{minipage}: & Supported with some \acro{HTML}5-imposed limitations. % Nested minipages are supported. % Footnotes appear at the bottom of the \acro{HTML} page. \\ % \pkg{fancyvrb}: & Supported except for verbatim footnotes. \\ -% \pkg{mdframed}: & Supported \\ +% \pkg{framed}, \pkg{mdframed}: & Supported \\ % \pkg{multicol}: & Emulated, with \acro{CSS}3. % Converted to up to three columns with an optional heading, % per browser support. Single-column if unsupported.\\ @@ -1317,8 +1347,7 @@ operating-system path separator used by \pkg{lwarp}. % % Supported packages include everything listed in the table of contents, % plus each of the following in \cref{tab:additionalsupported}, -% and certainly others as well. -% Not all have been thoroughly tested. +% and probably others which have not yet been tested. % Many are simply nullfied during \acro{HTML} output. % Others are not affected by the output mode and thus work as-is. % @@ -1333,7 +1362,7 @@ operating-system path separator used by \pkg{lwarp}. % fancyvrb, fileerr, % newtxmath, % siunitx, somedefs, -% theorem, tikz, trace, +% tikz, trace, % varioref, % xspace % \end{table} @@ -3094,6 +3123,10 @@ operating-system path separator used by \pkg{lwarp}. % \margintag{custom MathJax macros} % see page \pageref{ex:mathjaxmacros}. % +% \subsubsection{Ntheorem} +% +% \limitsntheorem +% % % \subsubsection{Graphics} % @@ -3247,14 +3280,38 @@ operating-system path separator used by \pkg{lwarp}. % or \cs{LWR@ProvidesPackagePass}. If |Drop|ped, the original print-version % package is ignored, and only the |lwarp-| version is used. % Use this where the original print version is useless for \acro{HTML}. -% If |Pass|ed, the original package is loaded first, with the supplied options, then -% the |lwarp-| version continues loading as well. Use this when \acro{HTML} +% If |Pass|ed, the original package is loaded first, with the user-supplied options, +% then the |lwarp-| version continues loading as well. +% See \cref{sec:ntheorem} (\nameref{sec:ntheorem}) +% for an example of selectively disabling user options for a package. +% Use this when \acro{HTML} % output only requires some modifications of the original package. % For a case where the original package is usable without changes, there is no % need to create a |lwarp-| version. % % +% \subsection{Testing \protect\pkg{lwarp}} +% +% \changes{v0.25}{2017/03/22}{Docs: Testing \protect\pkg{lwarp}.} +% +% When changes have been made, test the print output before testing the +% \acro{HTML}. The print output compiles faster, and any errors in the printed +% version will be easier to figure out than the \acro{HTML} version. +% +% The package \pkg{lwarp-newproject} must be loaded to set up the configuration +% files, but may be commented out from then on unless the configuration changes. +% A small amount of time is taken each time \pkg{lwarp-newproject} is run. +% +% Remember that the configuration files are only rewritten when compiling the +% printed version of the document, and when \pkg{lwarp-newproject} is enabled. +% +% Sometimes it is worth checking the |<project>_html.pdf| file, which is the +% \acro{PDF} containing \acro{HTML} tags. Also, |<project>_html.html| has +% the text conversion of these tags, before the file is split into individual +% \acro{HTML} files. % +% It is also worth checking the browser's tools for verifying the correctness +% of \acro{HTML} and \acro{CSS} code. % % % \section{Troubleshooting} @@ -3825,20 +3882,45 @@ after lwarp.} % \end{macro} +% \begin{macro}{\LWR@loadnever} \marg{badpackagename} \marg{replacementpkgname} +% +% The first packages is not supported, so tell the user to use the second instead. +% +% \changes{v0.25}{2017/03/16}{Added the ability to prevent conflicting packages.} +% +% \begin{macrocode} +\newcommand*{\LWR@loadnever}[2]{% +\PackageError{lwarp} +{Package #1 does not work with lwarp's HTML conversion. +Please use the #2 package instead} +{Package #1 conflicts with lwarp in some way, but package #2 probably will work instead.} +} +% \end{macrocode} +% \end{macro} + + + + % Packages which should only be loaded after \pkg{lwarp} are tested % here to trip an error of they have already been loaded. % +% \changes{v0.25}{2017/03/16}{Fix: Allows XE\LaTeX\ and +% \LuaLaTeX\ to preload graphics and graphicx.} +% % The following packages must be loaded after \pkg{lwarp}: % \begin{macrocode} \LWR@loadafter{abstract} \LWR@loadafter{afterpage} \LWR@loadafter{algorithmicx} \LWR@loadafter{alltt} +\LWR@loadafter{amsthm} \LWR@loadafter{bookmark} \LWR@loadafter{booktabs} \LWR@loadafter{changepage} \LWR@loadafter{dcolumn} \LWR@loadafter{draftwatermark} +\LWR@loadafter{ellipsis} +\LWR@loadafter{emptypage} \LWR@loadafter{enumerate} \LWR@loadafter{epigraph} \LWR@loadafter{eso-pic} @@ -3849,13 +3931,14 @@ after lwarp.} \LWR@loadafter{float} \LWR@loadafter{ftnright} \LWR@loadafter{geometry} -\LWR@loadafter{graphics} -\LWR@loadafter{graphicx} +% \LWR@loadafter{graphics}% pre-loaded by xunicode +% \LWR@loadafter{graphicx}% pre-loaded by xunicode \LWR@loadafter{hyperref} \LWR@loadafter{indentfirst} \LWR@loadafter{keyfloat} \LWR@loadafter{layout} \LWR@loadafter{letterspace} +\LWR@loadafter{lips} \LWR@loadafter{listings} \LWR@loadafter{longtable} \LWR@loadafter{lscape} @@ -3870,17 +3953,20 @@ after lwarp.} \LWR@loadafter{newtxmath} \LWR@loadafter{nextpage} \LWR@loadafter{nowidow} +\LWR@loadafter{ntheorem} \LWR@loadafter{pagenote} \LWR@loadafter{parskip} \LWR@loadafter{placeins} \LWR@loadafter{ragged2e} \LWR@loadafter{rotating} \LWR@loadafter{setspace} +\LWR@loadafter{showidx} \LWR@loadafter{showkeys} \LWR@loadafter{sidecap} \LWR@loadafter{subfig} \LWR@loadafter{tabularx} \LWR@loadafter{textpos} +\LWR@loadafter{theorem} \LWR@loadafter{threeparttable} \LWR@loadafter{tikz} \LWR@loadafter{titleps} @@ -5348,18 +5434,15 @@ top=1in,bottom=1in,% % \subsection{HTML tags} % \begin{macro}{\LWR@htmltagc} \marg{tag} -% Break ligatures in \acro{HTML} tags. +% Break ligatures and use upright apostrophes in \acro{HTML} tags. % %|\protect| is in case the tag appears in TOC, LOF, LOT. % \begin{macrocode} + \newcommand*{\LWR@htmltagc}[1]{% {% -\LWR@origttfamily% -% \protect\LWR@origtexttt{% -% \protect\LWR@origtextbf{% -\LWR@origtextless#1\LWR@origtextgreater% -% }% -% }% +\protect\LWR@origttfamily% +\protect\LWR@origtextless#1\protect\LWR@origtextgreater% }% } % \end{macrocode} @@ -7359,10 +7442,6 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% % \end{macrocode} % Graphics: % \begin{macrocode} -\let\textcolor\LWR@textcolor -\let\pagecolor\LWR@pagecolor -\let\colorbox\LWR@colorbox -\let\fcolorbox\LWR@fcolorbox \let\rotatebox\LWR@rotatebox \let\scalebox\LWR@scalebox \let\reflectbox\LWR@reflectbox @@ -8873,6 +8952,9 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% % \section{Theorems} % +% \changes{v0.25}{2017/03/17}{Basic \LaTeX\ theorems: improved \acro{CSS}.} +% +% % \DescribeMacro{\newtheorem} \marg{text} \oarg{counter} -or- \oarg{oldname} \marg{text} % % A few minor changes are made to supply \acro{HTML} tags. @@ -8891,18 +8973,16 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% % \begin{macro}{\@begintheorem} \marg{name} \marg{number} % \begin{macrocode} \renewcommand{\@begintheorem}[2]{% -\LWR@htmldivclass{theorem} +\BlockClass{theoremcontents} \InlineClass{theoremlabel}{#1\ #2\ } -\LWR@htmldivclass{theoremcontents} } % \end{macrocode} % \end{macro} % \begin{macro}{\@opargbegintheorem} \marg{name} \marg{number} \marg{oparg} % \begin{macrocode} \renewcommand{\@opargbegintheorem}[3]{% -\BlockClass{theorem} -\InlineClass{theoremlabel}{#1\ #2\ (#3)\ } \BlockClass{theoremcontents} +\InlineClass{theoremlabel}{#1\ #2\ (#3)\ } } % \end{macrocode} % \end{macro} @@ -8910,7 +8990,6 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% % \begin{macrocode} \renewcommand*{\@endtheorem}{% \endBlockClass% theoremcontents -\endBlockClass% theorem } % \end{macrocode} % \end{macro} @@ -10876,14 +10955,16 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% % \end{macro} % % -% \begin{macro}{\LWR@newlabel} \marg{label} +% \begin{macro}{\LWR@newlabel} \marg{label} \oarg{type} % % \cs{label} during \acro{HTML} output when not in math mode, % removing extra spaces around the label, as done by regular \LaTeX\ \cs{label}. % % \pkg{clevereref} later encases this to add its own cross-referencing. +% +% The optional \meta{type} is per the \pkg{ntheorem} package, and is ignored. % \begin{macrocode} -\newcommand*{\LWR@newlabel}[1]{% +\NewDocumentCommand{\LWR@newlabel}{m o}{% \LWR@traceinfo{LWR@newlabel: !#1!}% % \@bsphack% % \end{macrocode} @@ -11296,8 +11377,9 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}% % \DescribeCounter{LWR@thisfloat} -% A sequential counter for all floats. -% This is used to identify the float then reference it from the List of Figures and +% A sequential counter for all floats and theorems. +% This is used to identify the float or theorem +% then reference it from the List of Figures and % List of Tables. % \begin{macrocode} \newcounter{LWR@thisfloat} @@ -11485,18 +11567,24 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}% % \begin{macro}{\addcontentsline} % Patched to write the autopage and autofloat before each float's entry. -% No changes if writing |.toc|. +% No changes if writing |.toc| +% For a theorem, automatically defines \cs{ext@<type>} as needed, to +% mimic and reuse the float mechanism. +% +% \changes{v0.25}{2017/03/16}{Handles theorems.} +% % \begin{macrocode} \let\LWR@origaddcontentsline\addcontentsline \renewcommand*{\addcontentsline}[3]{% \ifthenelse{\equal{#1}{toc}}{}{% +\ifthenelse{\equal{#1}{thm}}{\csdef{ext@#2}{thm}}{} \addtocontents{\@nameuse{ext@#2}}{% \protect\LWRsetnextfloat% {\arabic{LWR@latestautopage}}% {\arabic{LWR@thisfloat}}% -}% -}% +}% addtocontents +}% not toc \LWR@origaddcontentsline{#1}{#2}{#3}% } % \end{macrocode} @@ -11833,7 +11921,7 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}% % \begin{macro}{\hypertocfloat} \marg{1: depth} \marg{2: type} -% \marg{3: caption} \marg{4: page} +% \marg{3: ext of parent} \marg{4: caption} \marg{5: page} % % \begin{description} % \item[\#1] is depth @@ -15124,7 +15212,6 @@ display:inline-block;"% - % \clearpage % \section{lwarpmk.conf} @@ -15223,7 +15310,7 @@ homehtmlfilename = "\HomeHTMLFileName"% % \iffalse %<*lwarp-newproject> % \fi - +% % \part{lwarp-newproject.sty} % % \changes{v0.20}{2016/12/20}{\pkg{lwarp-newproject}: Added.} @@ -15466,6 +15553,7 @@ a.tocfigure {margin-left: 0em} a.tocsubfigure {margin-left: 2em} a.toctable {margin-left: 0em} a.tocsubtable {margin-left: 2em} +a.toctheorem {margin-left: 0em} a.toclstlisting {margin-left: 0em} @@ -15838,16 +15926,7 @@ div.onehalfspace { line-height: 1.5 ; } div.doublespace { line-height: 2 ; } -.theorem { - background: #e0e0e0; - padding: 1ex ; - margin: 1em ; - border: 1px solid silver ; -} - -.theoremlabel { font-weight: bold ; } -.theoremcontents { font-style: italic; margin-left: 1em ; } /* Minipage environments, vertically aligned to top, center, bottom: */ @@ -15915,6 +15994,38 @@ div.doublespace { line-height: 2 ; } } +/* framed package */ +.framed { + margin: 3ex 0em 3ex 0em ; + border: 1px solid black; + border-radius: 0px ; + padding: .3ex 1em 0ex 1em ; + display: block ; +} + +.snugframed { + margin: 3ex 0em 3ex 0em ; + border: 1px solid black; + border-radius: 0px ; + display: block ; +} + +.framedleftbar { + margin: 3ex 0em 3ex 0em ; + border-left: 3pt solid black; + border-radius: 0px ; + padding: .3ex .2em .3ex 1em ; + display: block ; +} + +.framedtitle { + margin: 0em ; + padding: 0em ; + font-size: 130% +} + +.framedtitle p { padding: .3em } + dl { @@ -15930,14 +16041,14 @@ dl dt { dl dd p { margin-top: 0em; } -nav.toc, nav.lof, nav.lot, nav.lol { +nav.toc, nav.lof, nav.lot, nav.lol, nav.lothm { font-family: "URW Classico", Optima, "Linux Biolinum O", "DejaVu Sans", "Bitstream Vera Sans", Geneva, Verdana, sans-serif ; margin-bottom: 4ex ; } -nav.toc p, nav.lof p, nav.lot p, nav.lol p { +nav.toc p, nav.lof p, nav.lot p, nav.lol p, nav.lothm p { line-height: 1.2 ; margin-top:.5ex ; margin-bottom:.5ex; @@ -16311,11 +16422,92 @@ div.multicols { -webkit-columns: 3 380px ; -moz-columns: 3 380px ; columns: 3 380px ; } div.multicols p {margin-top: 0ex} + + /* Used to support algorithmicx: */ span.floatright { float: right ; } + +/* Native LaTeX theorems: */ + +.theoremcontents { font-style: italic; margin-top: 3ex ; margin-bottom: 3ex ; } +.theoremlabel { font-style: normal; font-weight: bold ; margin-right: .5em ; } + + +/* theorem, amsthm, and ntheorem packages */ + +span.theoremheader, +span.theoremheaderplain, +span.theoremheaderdefinition, +span.theoremheaderbreak, +span.theoremheadermarginbreak, +span.theoremheaderchangebreak, +span.theoremheaderchange, +span.theoremheadermargin +{ + font-style:normal ; font-weight: bold ; margin-right: 1em ; +} + +span.amsthmnameplain, +span.amsthmnamedefinition, +span.amsthmnumberplain, +span.amsthmnumberdefinition +{ + font-style:normal ; font-weight: bold ; +} + + +span.amsthmnameremark, +span.amsthmnumberremark +{font-style:italic ; font-weight: normal ; } + + +span.amsthmnoteplain, +span.amsthmnotedefinition +{font-style:normal ;} + + +span.theoremheaderremark, +span.theoremheaderproof, +span.amsthmproofname +{font-style:italic ; font-weight: normal ; margin-right: 1em ; } + +span.theoremheadersc +{ + font-style:normal ; + font-variant: small-caps ; + font-weight: normal ; + margin-right: 1em ; +} + +.theoremendmark {float:right} + +div.amsthmbodyplain, div.theorembodyplain, div.theorembodynonumberplain, +div.theorembodybreak, div.theorembodynonumberbreak, +div.theorembodymarginbreak, +div.theorembodychangebreak, +div.theorembodychange, +div.theorembodymargin +{ + font-style:italic; + margin-top: 3ex ; margin-bottom: 3ex ; +} + +div.theorembodydefinition, div.theorembodyremark, div.theorembodyproof, +div.theorembodyplainupright, nonumberplainuprightsc, +div.amsthmbodydefinition, div.amsthmbodyremark, +div.amsthmproof +{ + font-style: normal ; + margin-top: 3ex ; margin-bottom: 3ex ; +} + +span.amsthmnoteremark {} + + + /* For CSS LaTeX and related logos: Based on: @@ -16603,6 +16795,13 @@ div.sidebartitle{ border-radius: 1ex ; } +.framed .minipage , .framedleftbar .minipage { + border: none ; + background: none ; + padding: 0ex ; + margin: 0ex ; +} + figure.figure .minipage, figcaption .minipage { border: none; } div.marginblock div.minipage { border: none; } @@ -17084,7 +17283,7 @@ MathJax.Hub.Config({ -- Print the usage of the lwarpmk command: -printversion = "v0.24" +printversion = "v0.25" function printhelp () print ("lwarpmk: Use lwarpmk -h or lwarpmk --help for help.") ; @@ -17546,6 +17745,8 @@ end -- not --version % % \section{Abstract} % +% \credits{Peter Wilson} +% % \DescribePackage{abstract} % \pkg{abstract} is supported and patched by \pkg{lwarp}. % @@ -17757,6 +17958,156 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"% +% \clearpage + +% \iffalse +%<*amsthm> +% \fi + +% \part{lwarp-amsthm.sty} + +% \section{AMSthm} +% +% \credits{Publications Technical Group --- American Mathematical Society} +% +% \DescribePackage{amsthm} +% \pkg{amsthm} is patched for use by \pkg{lwarp}. +% +% \changes{v0.25}{2017/03/15}{\pkg{amsthm}: Added.} +% +% \begin{description} +% \item[CSS styling of theorems and proofs:] \ +% \begin{description} +% \item [Theorem:] |div| of class |amsthmbody<theoremstyle>| +% \item [Theorem Name:] |span| of class |amsthmname<theoremtyle>| +% \item [Theorem Number:] |span| of class |amsthmnumber<theoremstyle>| +% \item [Theorem Note:] |span| of class |amsthmnote<theoremstyle>| +% \item [Proof:] |div| of class |amsthmproof| +% \item [Proof Name:] |span| of class |amsthmproofname| +% \end{description} +% where |<theoremstyle>| is |plain|, |definition|, etc. +% \end{description} +% +% +% \codehtml +% +% \begin{macrocode} +\LWR@ProvidesPackagePass{amsthm} +% \end{macrocode} + +% Storage for the style being used for new theorems: +% \begin{macrocode} +\newcommand{\LWR@newtheoremstyle}{plain} +% \end{macrocode} + +% Patched to remember the style being used for new theorems: +% \begin{macrocode} +\renewcommand{\theoremstyle}[1]{% + \@ifundefined{th@#1}{% + \PackageWarning{amsthm}{Unknown theoremstyle `#1'}% + \thm@style{plain}% + \renewcommand{\LWR@newtheoremstyle}{plain}% new + }{% + \thm@style{#1}% + \renewcommand{\LWR@newtheoremstyle}{#1}% new + }% +} +% \end{macrocode} + +% Patched to remember the style for this theorem type: +% \begin{macrocode} +\def\@xnthm#1#2{% + \csedef{LWR@thmstyle#2}{\LWR@newtheoremstyle}% new + \let\@tempa\relax + \@xp\@ifdefinable\csname #2\endcsname{% + \global\@xp\let\csname end#2\endcsname\@endtheorem + \ifx *#1% unnumbered, need to get one more mandatory arg + \edef\@tempa##1{% + \gdef\@xp\@nx\csname#2\endcsname{% + \@nx\@thm{\@xp\@nx\csname th@\the\thm@style\endcsname}% + {}{##1}}}% + \else % numbered theorem, need to check for optional arg + \def\@tempa{\@oparg{\@ynthm{#2}}[]}% + \fi + \AtBeginEnvironment{#2}{\edef\LWR@thisthmstyle{\csuse{LWR@thmstyle#2}}}% new + }% + \@tempa +} +% \end{macrocode} + +% Patched to enclose with \acro{CSS}: +% \begin{macrocode} +\newcommand{\LWR@haveamsthmname}{ +\renewcommand{\thmname}[1]{\InlineClass{amsthmname\LWR@thisthmstyle}{##1}} +} + +\newcommand{\LWR@haveamsthmnumber}{ +\renewcommand{\thmnumber}[1]{\InlineClass{amsthmnumber\LWR@thisthmstyle}{##1}} +} + +\newcommand{\LWR@haveamsthmnote}{ +\renewcommand{\thmnote}[1]{\InlineClass{amsthmnote\LWR@thisthmstyle}{##1}} +} + +\LWR@haveamsthmname +\LWR@haveamsthmnumber +\LWR@haveamsthmnote +% \end{macrocode} +% +% Patches for \acro{CSS}: +% \begin{macrocode} +\def\@begintheorem#1#2[#3]{% + \BlockClass{amsthmbody\LWR@thisthmstyle}% new + \deferred@thm@head{ + \the\thm@headfont \thm@indent + \@ifempty{#1}{\let\thmname\@gobble}{\LWR@haveamsthmname}% new + \@ifempty{#2}{\let\thmnumber\@gobble}{\LWR@haveamsthmnumber}% new + \@ifempty{#3}{\let\thmnote\@gobble}{\LWR@haveamsthmnote}% new + \thm@swap\swappedhead\thmhead{#1}{#2}{#3}% + \the\thm@headpunct~ + \thmheadnl % possibly a newline. + \hskip\thm@headsep + }% + \ignorespaces} +% \end{macrocode} +% +% Patched for \acro{CSS}: +% \begin{macrocode} +\def\@endtheorem{\endBlockClass\endtrivlist\@endpefalse } +% \end{macrocode} +% +% +% Proof QED symbol: +% \begin{macrocode} +\AtBeginDocument{ +\def\openbox{\text{\HTMLunicode{25A1}}}% UTF-8 white box +\def\blacksquare{\text{\HTMLunicode{220E}}}% UTF-8 end-of-proof +\def\Box{\text{\HTMLunicode{25A1}}}% UTF-8 white box +} +% \end{macrocode} +% +% Patched for \acro{CSS}: +% \begin{macrocode} +\renewenvironment{proof}[1][\proofname]{\par + \BlockClass{amsthmproof}% new + \pushQED{\qed}% + \normalfont \topsep6\p@\@plus6\p@\relax + \trivlist + \item[\hskip\labelsep + \InlineClass{amsthmproofname}{#1\@addpunct{.}}]\ignorespaces% changes +}{% + \InlineClass{theoremendmark}{\popQED}\endtrivlist% + \endBlockClass% new + \@endpefalse +} +% \end{macrocode} + + +% \iffalse +%</amsthm> +% \fi + + % \iffalse %<*bookmark> @@ -17833,6 +18184,34 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"% % \iffalse +%<*ccaption> +% \fi + +% \part{lwarp-ccaption.sty} + +% \section{Ccaption} +% +% \DescribePackage{ccaption} +% \pkg{ccaption} is not used. +% The user is recommended to use \pkg{caption} instead. + +% \changes{v0.25}{2017/03/16}{\pkg{ccaption}: Prevented.} + +% \codehtml +% \begin{macrocode} +\LWR@loadnever{ccaption}{caption} +% \end{macrocode} + + +% \iffalse +%</ccaption> +% \fi + + + +% \clearpage + +% \iffalse %<*changepage> % \fi @@ -17896,6 +18275,8 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"% +% \clearpage + % \iffalse %<*draftwatermark> % \fi @@ -17934,6 +18315,59 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"% +% \iffalse +%<*ellipsis> +% \fi + +% \part{lwarp-ellipsis.sty} + +% \section{Ellipsis} +% \label{sec:ellipsis} +% +% \changes{v0.25}{2017/03/16}{\pkg{ellipsis}: Added.} +% +% \DescribePackage{ellipsis} +% \pkg{ellipsis} is emulated during \acro{HTML} output, and +% the \pkg{ellipsis} package is ignored. + +% \begin{macrocode} +\LWR@ProvidesPackageDrop{ellipsis} + +\newcommand{\ellipsisgap}{0.1em} +% \end{macrocode} + +% \iffalse +%</ellipsis> +% \fi + + +% \clearpage + +% \iffalse +%<*emptypage> +% \fi + +% \part{lwarp-emptypage.sty} + +% \section{Emptypage} +% +% \DescribePackage{emptypage} +% \pkg{emptypage} is ignored. +% +% \changes{v0.25}{2017/03/22}{\pkg{emptypage}: Added.} +% +% \codehtml +% +% Discard all options for \pkg{lwarp-emptypage}: +% \begin{macrocode} +\LWR@ProvidesPackageDrop{emptypage} +% \end{macrocode} + +% \iffalse +%</emptypage> +% \fi + + % \clearpage % \iffalse @@ -18173,6 +18607,7 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"% +% \clearpage % \iffalse %<*fancyhdr> @@ -18721,6 +19156,156 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"% + +% \clearpage + +% \iffalse +%<*framed> +% \fi + +% \part{lwarp-framed.sty} +% +% \section{Framed} +% +% \credits{Donald Arseneau} +% +% \DescribePackage{framed} +% \pkg{framed} is supported and patched by \pkg{lwarp}. +% +% \changes{v0.25}{2017/03/19}{\pkg{framed}: Added.} +% +% \codehtml +% +% Accept all options for \pkg{lwarp-framed}: +% \begin{macrocode} +\LWR@ProvidesPackagePass{framed} +% \end{macrocode} + + +% \begin{macrocode} + +\renewenvironment{framed}{% +\BlockClass{framed}% +} +{\endBlockClass} + +\renewenvironment{oframed}{% +\BlockClass{framed}% +} +{\endBlockClass} + + +\renewenvironment{shaded}{% +\convertcolorspec{named}{shadecolor}{HTML}\LWR@tempcolor% +\BlockClass{framed}[background: \#\LWR@tempcolor]% +} +{\endBlockClass} + +\renewenvironment{shaded*}{% +\convertcolorspec{named}{shadecolor}{HTML}\LWR@tempcolor% +\BlockClass{framed}[background: \#\LWR@tempcolor]% +} +{\endBlockClass} + + +\renewenvironment{leftbar}{% + \BlockClass{framedleftbar} + \def\FrameCommand{}% + \MakeFramed {} +}% + {\endMakeFramed\endBlockClass} + + +\renewenvironment{snugshade}{% +\convertcolorspec{named}{shadecolor}{HTML}\LWR@tempcolor% +\BlockClass{snugframed}[background: \#\LWR@tempcolor]% +} +{\endBlockClass} + +\renewenvironment{snugshade*}{% +\convertcolorspec{named}{shadecolor}{HTML}\LWR@tempcolor% +\BlockClass{snugframed}[background: \#\LWR@tempcolor]% +} +{\endBlockClass} + +\let\oframed\framed +\let\endoframed\endframed + + +\RenewEnviron{titled-frame}[1]{% +\CustomFBox{#1}{}{0pt}{0pt}{0pt}{0pt}{\BODY} +} +% \end{macrocode} + + + +% \cs{CustomFBox} \marg{toptitle} \marg{bottitle} +% \marg{thicknesstop} \marg{bottom} \marg{left} \marg{right} +% \marg{text contents} +% \begin{macrocode} +\renewcommand{\CustomFBox}[7]{% +\convertcolorspec{named}{TFFrameColor}{HTML}\LWR@tempcolor% +\begin{BlockClass}{framed}[border: 3px solid \#\LWR@tempcolor]% +\ifthenelse{\isempty{#1}}{}{% not empty +\begin{BlockClass}{framedtitle}[background: \#\LWR@tempcolor]% +\textcolor{TFTitleColor}{\textbf{#1}}% +\end{BlockClass} +}% not empty + +#7 + +\ifthenelse{\isempty{#2}}{}{% not empty +\convertcolorspec{named}{TFFrameColor}{HTML}\LWR@tempcolor% +\begin{BlockClass}{framedtitle}[background: \#\LWR@tempcolor]% +\textcolor{TFTitleColor}{\textbf{#2}}% +\end{BlockClass} +}% not empty +\end{BlockClass} +} +% \end{macrocode} + +% \cs{TitleBarFrame} \oarg{marker} \marg{title} \marg{contents} +% \begin{macrocode} +\renewcommand\TitleBarFrame[3][]{ +\CustomFBox + {#2}{}% + \fboxrule\fboxrule\fboxrule\fboxrule + {#3}% +} +% \end{macrocode} + + +% \begin{macrocode} +\renewcommand{\TF@Title}[1]{#1} +% \end{macrocode} + + +% \env{MakeFramed} \marg{settings} +% \begin{macrocode} +\let\MakeFramed\relax +\let\endMakeFramed\relax + +\NewEnviron{MakeFramed}[1]{% +\FrameCommand{\begin{minipage}{\linewidth}\BODY\end{minipage}}% +} +% \end{macrocode} + + +% \cs{fb@put@frame} \marg{frame cmd no split} \marg{frame cmd split} +% \begin{macrocode} +\renewcommand*{\fb@put@frame}[2]{% +\relax% +\@tempboxa% +} +% \end{macrocode} + +% \iffalse +%</framed> +% \fi + + + + % \clearpage % \iffalse @@ -18800,12 +19385,7 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"% % \codehtml % \begin{macrocode} -\PackageError{lwarp-graphics} - {The graphics package is not supported by - the lwarp package's HTML conversion. - Please use graphicx instead. \protect\usepackage{graphicx}} - {Graphicx requires a different syntax but is more flexible, - and it is emulated by lwarp.} +\LWR@loadnever{graphics}{graphicx} % \end{macrocode} @@ -19379,6 +19959,48 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"% % \fi +% \clearpage + +% \iffalse +%<*lips> +% \fi + +% \part{lwarp-lips.sty} + +% \section{Lips} +% \label{sec:lips} +% +% \changes{v0.25}{2017/03/16}{\pkg{lips}: Added.} +% +% \DescribePackage{lips} +% \pkg{lips} is emulated during \acro{HTML} output, and +% the \pkg{lips} package is ignored. + +% \begin{macrocode} +% \LWR@ProvidesPackageDrop{lips} +\PackageInfo{lwarp}{Using the lwarp version of package `lips'.}% +\ProvidesPackage{lwarp-lips} + +\NewDocumentCommand{\Lips}{}{\textellipsis} + +\NewDocumentCommand{\BracketedLips}{}{[\textellipsis]} + +\let\lips\Lips +\let\olips\lips + +\DeclareOption*{} +\DeclareOption{mla}{ +\let\lips\BracketedLips +} +\ProcessOptions\relax + +\newcommand \LPNobreakList {} +% \end{macrocode} + +% \iffalse +%</lips> +% \fi + % \clearpage @@ -19392,6 +20014,9 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"% % \section{Listings} % \label{sec:listings} % +% \credits{Carsten Heinz, Brooks Moses, Jobst Hoffmann} + +% % \DescribePackage{listings} % \pkg{listings} is supported with some limitations. % Text formatting is not yet supported. @@ -19799,6 +20424,7 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"% +% \clearpage % \iffalse %<*mcaption> @@ -19882,12 +20508,16 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"% % % ^^A \DescribeMacro{\mdfsetup} % To handle CSS and paragraphs, -% patch code at start and end of environment and contents: +% patch code at start and end of environment and contents. +% \cs{LWR@origraggedright} helps avoid hyphenation. +% +% \changes{v0.25}{2017/03/16}{\pkg{mdframed}: Help avoid hyphenation.} +% % \begin{macrocode} \mdfsetup{ -startcode={\LWR@mdframedstart}, +startcode={\LWR@mdframedstart\LWR@origraggedright}, endcode={\LWR@mdframedend}, -startinnercode={\LWR@startpars}, +startinnercode={\LWR@startpars\LWR@origraggedright}, endinnercode={\LWR@stoppars}, } % \end{macrocode} @@ -20619,6 +21249,565 @@ solid +% \clearpage + +% \iffalse +%<*ntheorem> +% \fi + +% \part{lwarp-ntheorem.sty} +% +% \section{Ntheorem} +% +% \label{sec:ntheorem} +% +% \credits{Wolfgang May, Andreas Schedler} +% +% \DescribePackage{ntheorem} +% \pkg{ntheorem} is patched for use by \pkg{lwarp}. +% +% \changes{v0.25}{2017/03/22}{\pkg{ntheorem}: Added.} +% +% \begin{description} +% \item[CSS styling of theorems and proofs:] \ +% \begin{description} +% \item [Theorem:] |div| of class |theorembody<theoremstyle>| +% \item [Theorem Header:] |span| of class |theoremheader<style>| +% \end{description} +% where |<theoremstyle>| is |plain|, |break|, etc. +% \end{description} +% +% \limitsntheorem +% +% Options |amsthm| or |standard| choose which set of theorems and proofs +% to initialize. +% +% The options |thmmarks| and |amsmath| are disabled, since they +% \watchout[Disabled options] +% heavily modify the underlying math code. Theorem marks are emulated. +% The AMS-math modifications are not done. +% +% Option |thref| is disabled because \pkg{cleveref} functions are used instead. +% \cs{thref} is emulated. +% +% Option |hyperref| is disabled because \pkg{lwarp} emulated \pkg{hyperref}. +% +% \codehtml +% +% Some disabled options: +% \begin{macrocode} +\DeclareOption{thref}{} + + +\newbool{LWR@ntheoremmarks} +\boolfalse{LWR@ntheoremmarks} + +\DeclareOption{thmmarks}{ +\booltrue{LWR@ntheoremmarks} +\newif\ifsetendmark\setendmarktrue +} + + +\newbool{LWR@ntheoremamsthm} +\boolfalse{LWR@ntheoremamsthm} + +\DeclareOption{amsthm}{\booltrue{LWR@ntheoremamsthm}} + + +\DeclareOption{amsmath}{} +\DeclareOption{hyperref}{} + + +\LWR@ProvidesPackagePass{ntheorem} +% \end{macrocode} +% +% +% +% Storage for the style being used for new theorems. +% \begin{macrocode} +\newcommand{\LWR@newtheoremstyle}{plain} +% \end{macrocode} +% +% Patched to remember the style being used for new theorems: +% \begin{macrocode} +\gdef\theoremstyle#1{% + \@ifundefined{th@#1}{\@warning + {Unknown theoremstyle `#1'. Using `plain'}% + \theorem@style{plain} + \renewcommand{\LWR@newtheoremstyle}{plain}% new + }% + { + \theorem@style{#1} + \renewcommand{\LWR@newtheoremstyle}{#1}% new + } +} +% \end{macrocode} + +% Patched to remember the style for this theorem type, +% and set it later when the environment is started. +% \begin{macrocode} + +\gdef\@xnthm#1#2[#3]{% + \ifthm@tempif + \csedef{LWR@thmstyle#1}{\LWR@newtheoremstyle}% new + \expandafter\@ifundefined{c@#1}% + {\@definecounter{#1}}{}% + \@newctr{#1}[#3]% + \expandafter\xdef\csname the#1\endcsname{% + \expandafter\noexpand\csname the#3\endcsname \@thmcountersep + {\noexpand\csname\the\theoremnumbering\endcsname{#1}}}% + \expandafter\gdef\csname mkheader@#1\endcsname + {\csname setparms@#1\endcsname + \@thm{#1}{#1}{#2} + }% + \global\@namedef{end#1}{\@endtheorem} + \AtBeginEnvironment{#1}{\edef\LWR@thisthmstyle{\csuse{LWR@thmstyle#1}}}% new + \fi +} + +\gdef\@ynthm#1#2{% + \ifthm@tempif + \csedef{LWR@thmstyle#1}{\LWR@newtheoremstyle}% new + \expandafter\@ifundefined{c@#1}% + {\@definecounter{#1}}{}% + \expandafter\xdef\csname the#1\endcsname + {\noexpand\csname\the\theoremnumbering\endcsname{#1}}% + \expandafter\gdef\csname mkheader@#1\endcsname + {\csname setparms@#1\endcsname + \@thm{#1}{#1}{#2} + }% + \global\@namedef{end#1}{\@endtheorem} + \AtBeginEnvironment{#1}{\edef\LWR@thisthmstyle{\csuse{LWR@thmstyle#1}}}% new + \fi +} + +\gdef\@othm#1[#2]#3{% + \@ifundefined{c@#2}{\@nocounterr{#2}}% + {\ifthm@tempif + \csedef{LWR@thmstyle#1}{\LWR@newtheoremstyle}% new + \global\@namedef{the#1}{\@nameuse{the#2}}% + \expandafter\protected@xdef\csname num@addtheoremline#1\endcsname{% + \noexpand\@num@addtheoremline{#1}{#3}}% + \expandafter\protected@xdef\csname nonum@addtheoremline#1\endcsname{% + \noexpand\@nonum@addtheoremline{#1}{#3}}% + \theoremkeyword{#3}% + \expandafter\protected@xdef\csname #1Keyword\endcsname + {\the\theoremkeyword}% + \expandafter\gdef\csname mkheader@#1\endcsname + {\csname setparms@#1\endcsname + \@thm{#1}{#2}{#3} + }% + \global\@namedef{end#1}{\@endtheorem} + \AtBeginEnvironment{#1}{\edef\LWR@thisthmstyle{\csuse{LWR@thmstyle#1}}}% new + \fi} +} +% \end{macrocode} +% +% +% Mimics a float by incrementing the float counter and generating +% an \acro{HTML} anchor. These are used for list-of-theorem cross-references. +% \begin{macrocode} +\newcommand{\LWR@inctheorem}{% +\addtocounter{LWR@thisfloat}{1}% +\LWR@stoppars% +\LWR@htmltag{a id="autofloat-\arabic{LWR@thisfloat}"{}}\LWR@htmltag{/a}% +\LWR@startpars% +} +% \end{macrocode} +% +% +% The following are patched for \acro{CSS}. +% +% These were in individual files |thp.sty| for plain, +% |thmb.sty| for margin break, etc. +% They are gathered together here. +% +% Each theorem is encased in a \env{BlockClass} environment +% of class |theorembody<style>|. +% +% Each header is encased in an \cs{InlineClass} of class |theoremheader<style>|. +% \begin{macrocode} +\gdef\newtheoremstyle#1#2#3{% + \expandafter\@ifundefined{th@#1}% + {\expandafter\gdef\csname th@#1\endcsname{% + \def\@begintheorem####1####2{% +\BlockClass{theorembody#1}%\LWR@thisthmstyle% new +\LWR@inctheorem% new +#2}% + \def\@opargbegintheorem####1####2####3{% +\BlockClass{theorembody#1}%\LWR@thisthmstyle% new +\LWR@inctheorem% new +#3}% +}% +}% +{\PackageError{\basename}{Theorem style #1 already defined}\@eha} +} + +\renewtheoremstyle{plain}% + {\item[\hskip\labelsep \theorem@headerfont + \InlineClass{theoremheaderplain}{##1\ ##2\theorem@separator}]}% + {\item[\hskip\labelsep \theorem@headerfont + \InlineClass{theoremheaderplain}{##1\ ##2\ (##3)\theorem@separator}]} + +\renewtheoremstyle{break}% + {\item[ +% \rlap{\vbox{\hbox{ + \hskip\labelsep \theorem@headerfont + \InlineClass{theoremheaderbreak}{##1\ ##2\theorem@separator}\newline +% }\hbox{\strut}}} + ]}% + {\item[ +% \rlap{\vbox{\hbox{ + \hskip\labelsep \theorem@headerfont + \InlineClass{theoremheaderbreak}{##1\ ##2\ (##3)\theorem@separator}\newline +% }\hbox{\strut}}} + ]} + +\renewtheoremstyle{change}% + {\item[\hskip\labelsep + \theorem@headerfont + \InlineClass{theoremheaderchange}{##2\ ##1\theorem@separator}]}% + {\item[\hskip\labelsep + \theorem@headerfont + \InlineClass{theoremheaderchange}{##2\ ##1\ (##3)\theorem@separator}]} + +\renewtheoremstyle{changebreak}% + {\item[ +% \rlap{\vbox{\hbox{ + \hskip\labelsep \theorem@headerfont + \InlineClass{theoremheaderchangebreak}{##2\ ##1\theorem@separator}\newline +% }\hbox{\strut}}} + ]}% + {\item[ +% \rlap{\vbox{\hbox{ + \hskip\labelsep \theorem@headerfont + \InlineClass{theoremheaderchangebreak}{##2\ ##1\ (##3)\theorem@separator}\newline +% }\hbox{\strut}}} + ]} + +\renewtheoremstyle{margin}% + {\item[\hskip\labelsep\theorem@headerfont + \InlineClass{theoremheadermargin}{##2 \qquad ##1\theorem@separator} + ]}% + {\item[\hskip\labelsep\theorem@headerfont + \InlineClass{theoremheadermargin}{##2 \qquad ##1\ (##3)\theorem@separator} + ]} + +\renewtheoremstyle{marginbreak}% + {\item[\hskip\labelsep\theorem@headerfont + \InlineClass{theoremheadermarginbreak}{##2 \qquad ##1\theorem@separator}\newline + ]}% + {\item[\hskip\labelsep\theorem@headerfont + \InlineClass{theoremheadermarginbreak}{##2 \qquad ##1\ (##3)\theorem@separator}\newline + ]} + +\renewtheoremstyle{nonumberplain}% + {\item[\theorem@headerfont\hskip\labelsep + \InlineClass{theoremheaderplain}{##1\theorem@separator}]}% + {\item[\theorem@headerfont\hskip \labelsep + \InlineClass{theoremheaderplain}{##1\ (##3)\theorem@separator}]} + +\renewtheoremstyle{nonumberbreak}% + {\item[ +% \rlap{\vbox{\hbox{ + \hskip\labelsep \theorem@headerfont + \InlineClass{theoremheaderbreak}{##1\theorem@separator}\newline +% }\hbox{\strut}}} + ]}% + {\item[ +% \rlap{\vbox{\hbox{ + \hskip\labelsep \theorem@headerfont + \InlineClass{theoremheaderbreak}{##1\ (##3)\theorem@separator}\newline +% }\hbox{\strut}}} + ]} + +\renewtheoremstyle{empty}% + {\item[]}% + {\item[\theorem@headerfont \hskip\labelsep\relax + \InlineClass{theoremheaderplain}{##3}]} + +\renewtheoremstyle{emptybreak}% + {\item[]}% + {\item[\theorem@headerfont \hskip\labelsep\relax + \InlineClass{theoremheaderplain}{##3}] \ \newline} +% \end{macrocode} +% +% The following manually adjust the \acro{CSS} for the standard configuration +% objects which are not a purely plain style: +% \begin{macrocode} +\ifbool{LWR@ntheoremamsthm}{}{ +% upright text via CSS +\newtheoremstyle{plainupright}% + {\item[\hskip\labelsep \theorem@headerfont + \InlineClass{theoremheaderplain}{##1\ ##2\theorem@separator}]}% + {\item[\hskip\labelsep \theorem@headerfont + \InlineClass{theoremheaderplain}{##1\ ##2\ (##3)\theorem@separator}]} + +% upright text and small caps header via CSS +\newtheoremstyle{nonumberplainuprightsc}% + {\item[\theorem@headerfont\hskip\labelsep + \InlineClass{theoremheadersc}{##1\theorem@separator}]}% + {\item[\theorem@headerfont\hskip \labelsep + \InlineClass{theoremheadersc}{##1\ (##3)\theorem@separator}]} +% \end{macrocode} +% +% The following standard configuration is renewed using the new \acro{CSS}: +% \begin{macrocode} +\theoremstyle{plainupright} +\theorembodyfont{\upshape} +\theoremsymbol{\ensuremath{_\Box}} +\renewtheorem{Example}{Example} +\renewtheorem{example}{Example} +\renewtheorem{Beispiel}{Beispiel} +\renewtheorem{beispiel}{Beispiel} +\renewtheorem{Bemerkung}{Bemerkung} +\renewtheorem{bemerkung}{Bemerkung} +\renewtheorem{Anmerkung}{Anmerkung} +\renewtheorem{anmerkung}{Anmerkung} +\renewtheorem{Remark}{Remark} +\renewtheorem{remark}{Remark} +\renewtheorem{Definition}{Definition} +\renewtheorem{definition}{Definition} + +\theoremstyle{nonumberplainuprightsc} +\theoremsymbol{\ensuremath{_\blacksquare}} +\renewtheorem{Proof}{Proof} +\renewtheorem{proof}{Proof} +\renewtheorem{Beweis}{Beweis} +\renewtheorem{beweis}{Beweis} +\qedsymbol{\ensuremath{_\blacksquare}} + +\theoremsymbol{} +}% not amsthm +% \end{macrocode} +% +% +% Only if the |amsthm| option was given: +% \begin{macrocode} +\ifbool{LWR@ntheoremamsthm}{ + +\gdef\th@plain{% + \def\theorem@headerfont{\normalfont\bfseries}\itshape% + \def\@begintheorem##1##2{% + \BlockClass{theorembodyplain}% new + \LWR@inctheorem% new + \item[\hskip\labelsep +% \theorem@headerfont + \InlineClass{theoremheaderplain}{##1\ ##2.} + ]}% + \def\@opargbegintheorem##1##2##3{% + \BlockClass{theorembodyplain}% new + \LWR@inctheorem% new + \item[\hskip\labelsep +% \theorem@headerfont + \InlineClass{theoremheaderplain}{##1\ ##2\ (##3).} + ]}} + +\gdef\th@nonumberplain{% + \def\theorem@headerfont{\normalfont\bfseries}\itshape% + \def\@begintheorem##1##2{% + \BlockClass{theorembodyplain}% new + \LWR@inctheorem% new + \item[\hskip\labelsep +% \theorem@headerfont + \InlineClass{theoremheaderplain}{##1.} + ]}% + \def\@opargbegintheorem##1##2##3{% + \BlockClass{theorembodyplain}% new + \LWR@inctheorem% new + \item[\hskip\labelsep +% \theorem@headerfont + \InlineClass{theoremheaderplain}{##1\ (##3).} + ]}} + +\gdef\th@definition{% + \def\theorem@headerfont{\normalfont\bfseries}\normalfont% + \def\@begintheorem##1##2{% + \BlockClass{theorembodydefinition}% new + \LWR@inctheorem% new + \item[\hskip\labelsep +% \theorem@headerfont + \InlineClass{theoremheaderdefinition}{##1\ ##2.} + ]}% + \def\@opargbegintheorem##1##2##3{% + \BlockClass{theorembodydefinition}% new + \LWR@inctheorem% new + \item[\hskip\labelsep +% \theorem@headerfont + \InlineClass{theoremheaderdefinition}{##1\ ##2\ (##3).} + ]}} + +\gdef\th@nonumberdefinition{% + \def\theorem@headerfont{\normalfont\bfseries}\normalfont% + \def\@begintheorem##1##2{% + \BlockClass{theorembodydefinition}% new + \LWR@inctheorem% new + \item[\hskip\labelsep +% \theorem@headerfont + \InlineClass{theoremheaderdefinition}{##1.} + ]}% + \def\@opargbegintheorem##1##2##3{% + \BlockClass{theorembodydefinition}% new + \LWR@inctheorem% new + \item[\hskip\labelsep +% \theorem@headerfont + \InlineClass{theoremheaderdefinition}{##1\ (##3).} + ]}} + +\gdef\th@remark{% + \def\theorem@headerfont{\itshape}\normalfont% + \def\@begintheorem##1##2{% + \BlockClass{theorembodyremark}% new + \LWR@inctheorem% new + \item[\hskip\labelsep +% \theorem@headerfont + \InlineClass{theoremheaderremark}{##1\ ##2.} + ]}% + \def\@opargbegintheorem##1##2##3{% + \BlockClass{theorembodyremark}% new + \LWR@inctheorem% new + \item[\hskip\labelsep +% \theorem@headerfont + \InlineClass{theoremheaderremark}{##1\ ##2\ (##3).} + ]}} + +\gdef\th@nonumberremark{% + \def\theorem@headerfont{\itshape}\normalfont% + \def\@begintheorem##1##2{% + \BlockClass{theorembodyremark}% new + \LWR@inctheorem% new + \item[\hskip\labelsep +% \theorem@headerfont + \InlineClass{theoremheaderremark}{##1.} + ]}% + \def\@opargbegintheorem##1##2##3{% + \BlockClass{theorembodyremark}% new + \LWR@inctheorem% new + \item[\hskip\labelsep +% \theorem@headerfont + \InlineClass{theoremheaderremark}{##1\ (##3).} + ]}} + +\gdef\th@proof{% + \def\theorem@headerfont{\normalfont\bfseries}\itshape% + \def\@begintheorem##1##2{% + \BlockClass{theorembodyproof}% new + \LWR@inctheorem% new + \item[\hskip\labelsep +% \theorem@headerfont + \InlineClass{theoremheaderproof}{##1.} + ]}% + \def\@opargbegintheorem##1##2##3{% + \BlockClass{theorembodyroof}% new + \LWR@inctheorem% new + \item[\hskip\labelsep +% \theorem@headerfont + \InlineClass{theoremheaderproof}{##1\ (##3).} + ]}} + + + +\newcounter{proof}% +\if@thmmarks + \newcounter{currproofctr}% + \newcounter{endproofctr}% +\fi + +\gdef\proofSymbol{\openbox} + +\newcommand{\proofname}{Proof} + +\newenvironment{proof}[1][\proofname]{ + \th@proof + \def\theorem@headerfont{\itshape}% + \normalfont + \theoremsymbol{\ensuremath{_\blacksquare}} + \@thm{proof}{proof}{#1} +}% +{\@endtheorem} + +}{}% amsthm option +% \end{macrocode} +% +% Patched for \acro{CSS}: +% \begin{macrocode} +\let\LWR@origendtheorem\@endtheorem +\renewcommand{\@endtheorem}{% +\ifbool{LWR@ntheoremmarks}{% +\ifsetendmark% +\InlineClass{theoremendmark}{\csname\InTheoType Symbol\endcsname}% +\setendmarkfalse% +\fi% +}{}% +\LWR@origendtheorem% +\ifbool{LWR@ntheoremmarks}{\global\setendmarktrue}{}% +\endBlockClass% +} +% \end{macrocode} + +% \begin{macrocode} +\gdef\NoEndMark{\global\setendmarkfalse} +% \end{macrocode} + + + +% Redefined to reuse the float mechanism to add list-of-theorem links: +% +% \cs{thm@thmline} \marg{1: printed type} \marg{2: \#} \marg{3: optional} \marg{4: page} +% \begin{macrocode} +\renewcommand{\thm@@thmline@noname}[4]{% +\hypertocfloat{1}{theorem}{thm}{#2 #3}{}% +} + +\renewcommand{\thm@@thmline@name}[4]{% +\hypertocfloat{1}{theorem}{thm}{#1 #2 #3}{}% +} +% \end{macrocode} +% +% This was redefined by \pkg{ntheorem} when loaded, +% so it is now redefined for \pkg{lwarp}: +% \begin{macrocode} +\def\thm@@thmline{\thm@@thmline@name} +% \end{macrocode} + + +% Patch for \acro{CSS}: +% \begin{macrocode} +\def\listtheorems#1{ +\LWR@htmlelementclass{nav}{lothm}% +\begingroup +\c@tocdepth=-2% +\def\thm@list{#1}\thm@processlist +\endgroup +\LWR@htmlelementclassend{nav}{lothm}% +} +% \end{macrocode} + +% Proof QED symbol: +% \begin{macrocode} + +\newcommand{\qed}{\qquad\the\qedsymbol} + +\AtBeginDocument{ +\def\openbox{\text{\HTMLunicode{25A1}}}% UTF-8 white box +\def\blacksquare{\text{\HTMLunicode{220E}}}% UTF-8 end-of-proof +\def\Box{\text{\HTMLunicode{25A1}}}% UTF-8 white box +} +% \end{macrocode} +% +% \cs{thref} \marg{label} +% \begin{macrocode} +\newcommand*{\thref}[1]{\cref{#1}} +% \end{macrocode} + + +% +% \iffalse +%</ntheorem> +% \fi + + +% \clearpage % \iffalse %<*pagenote> @@ -20882,6 +22071,34 @@ solid +% clearpage + +% \iffalse +%<*showidx> +% \fi + +% \part{lwarp-showidx.sty} + +% \section{Showidx} +% +% \DescribePackage{showidx} +% \pkg{showidx} is ignored. +% +% \changes{v0.25}{2017/03/22}{\pkg{showidx}: Added.} +% +% \codehtml +% +% Discard all options for \pkg{lwarp-showidx}: +% \begin{macrocode} +\LWR@ProvidesPackageDrop{showidx} +% \end{macrocode} + +% \iffalse +%</showidx> +% \fi + + + % \iffalse %<*showkeys> % \fi @@ -20983,6 +22200,8 @@ solid % % \section{Subfig} % +% \credits{Steven Douglas Cochran} +% % \DescribePackage{subfig} % \pkg{subfig} is supported and patched by \pkg{lwarp}. % @@ -21357,6 +22576,216 @@ solid % \clearpage % \iffalse +%<*theorem> +% \fi + +% \part{lwarp-theorem.sty} +% +% \section{Theorem} +% +% \credits{Frank Mittelbach} +% +% \DescribePackage{theorem} +% \pkg{theorem} is patched for use by \pkg{lwarp}. +% +% \changes{v0.25}{2017/03/16}{\pkg{theorem}: Added.} +% +% \begin{description} +% \item[CSS styling of theorems and proofs:] \ +% \begin{description} +% \item [Theorem:] |div| of class |theorembody<theoremstyle>| +% \item [Theorem Header:] |span| of class |theoremheader| +% \end{description} +% where |<theoremstyle>| is |plain|, |break|, etc. +% \end{description} +% +% +% \codehtml +% +% \begin{macrocode} +\LWR@ProvidesPackagePass{theorem} +% \end{macrocode} + +% Storage for the style being used for new theorems: +% \begin{macrocode} +\newcommand{\LWR@newtheoremstyle}{plain} +% \end{macrocode} + +% Patched to remember the style being used for new theorems: +% \begin{macrocode} +\gdef\theoremstyle#1{% + \@ifundefined{th@#1}{\@warning + {Unknown theoremstyle `#1'. Using `plain'}% + \theorem@style{plain}% + \renewcommand{\LWR@newtheoremstyle}{plain}% new + }% + {% + \theorem@style{#1}% + \renewcommand{\LWR@newtheoremstyle}{#1}% new + }% + \begingroup + \csname th@\the\theorem@style \endcsname + \endgroup} +% \end{macrocode} + +% Patched to remember the style for this theorem type, +% and set it later when the environment is started. +% \begin{macrocode} +\gdef\@xnthm#1#2[#3]{% + \expandafter\@ifdefinable\csname #1\endcsname + {% + \csedef{LWR@thmstyle#1}{\LWR@newtheoremstyle}% new + \@definecounter{#1}\@newctr{#1}[#3]% + \expandafter\xdef\csname the#1\endcsname + {\expandafter \noexpand \csname the#3\endcsname + \@thmcountersep \@thmcounter{#1}}% + \def\@tempa{\global\@namedef{#1}}% + \expandafter \@tempa \expandafter{% + \csname th@\the \theorem@style + \expandafter \endcsname \the \theorem@bodyfont + \@thm{#1}{#2}}% + \global \expandafter \let \csname end#1\endcsname \@endtheorem + \AtBeginEnvironment{#1}{\edef\LWR@thisthmstyle{\csuse{LWR@thmstyle#1}}}% new + }} + +\gdef\@ynthm#1#2{% + \expandafter\@ifdefinable\csname #1\endcsname + { + \csedef{LWR@thmstyle#1}{\LWR@newtheoremstyle}% new + \@definecounter{#1}% + \expandafter\xdef\csname the#1\endcsname{\@thmcounter{#1}}% + \def\@tempa{\global\@namedef{#1}}\expandafter \@tempa + \expandafter{\csname th@\the \theorem@style \expandafter + \endcsname \the\theorem@bodyfont \@thm{#1}{#2}}% + \global \expandafter \let \csname end#1\endcsname \@endtheorem + \AtBeginEnvironment{#1}{\edef\LWR@thisthmstyle{\csuse{LWR@thmstyle#1}}}% new + }} + +\gdef\@othm#1[#2]#3{% + \expandafter\ifx\csname c@#2\endcsname\relax + \@nocounterr{#2}% + \else + \expandafter\@ifdefinable\csname #1\endcsname + { + \csedef{LWR@thmstyle#1}{\LWR@newtheoremstyle}% new + \expandafter \xdef \csname the#1\endcsname + {\expandafter \noexpand \csname the#2\endcsname}% + \def\@tempa{\global\@namedef{#1}}\expandafter \@tempa + \expandafter{\csname th@\the \theorem@style \expandafter + \endcsname \the\theorem@bodyfont \@thm{#2}{#3}}% + \global \expandafter \let \csname end#1\endcsname \@endtheorem + \AtBeginEnvironment{#1}{\edef\LWR@thisthmstyle{\csuse{LWR@thmstyle#1}}}% new + }% + \fi} +% \end{macrocode} +% +% +% The following are patched for \acro{CSS}. +% +% These were in individual files |thp.sty| for plain, +% |thmb.sty| for margin break, etc. +% They are gathered together here. +% +% Each theorem is encased in a \env{BlockClass} environment +% of class |theorembody<style>|. +% +% Each header is encased in an \cs{InlineClass} of class |theoremheader|. +% \begin{macrocode} +\gdef\th@plain{%\normalfont\itshape + \def\@begintheorem##1##2{% + \BlockClass{theorembody\LWR@thisthmstyle}% new + \item[\hskip\labelsep + \InlineClass{theoremheader}{##1\ ##2} + ]}% +\def\@opargbegintheorem##1##2##3{% + \BlockClass{theorembody\LWR@thisthmstyle}% new + \item[\hskip\labelsep + \InlineClass{theoremheader}{##1\ ##2\ (##3)} + ]} +} + +\gdef\th@break{%\normalfont\slshape + \def\@begintheorem##1##2{% + \BlockClass{theorembody\LWR@thisthmstyle}% new + \item[\hskip \labelsep + \InlineClass{theoremheader}{##1\ ##2}\newline% + ]}% +\def\@opargbegintheorem##1##2##3{% + \BlockClass{theorembody\LWR@thisthmstyle}% new + \item[\hskip \labelsep + \InlineClass{theoremheader}{##1\ ##2\ (##3)}\newline + ]} +} + +\gdef\th@marginbreak{%\normalfont\slshape + \def\@begintheorem##1##2{ + \BlockClass{theorembody\LWR@thisthmstyle}% new + \item[\hskip\labelsep % + \InlineClass{theoremheader}{##2 \qquad ##1}\newline + ]}% +\def\@opargbegintheorem##1##2##3{% + \BlockClass{theorembody\LWR@thisthmstyle}% new + \item[\hskip\labelsep % + \InlineClass{theoremheader}{##2 \qquad ##1\ % + (##3)}\newline + ]} +} + +\gdef\th@changebreak{%\normalfont\slshape + \def\@begintheorem##1##2{ + \BlockClass{theorembody\LWR@thisthmstyle}% new + \item[\hskip\labelsep + \InlineClass{theoremheader}{##2\ ##1}\newline + ]}% +\def\@opargbegintheorem##1##2##3{% + \BlockClass{theorembody\LWR@thisthmstyle}% new + \item[\hskip\labelsep + \InlineClass{theoremheader}{ ##2\ ##1\ % + (##3)}\newline + ]} +} + +\gdef\th@change{%\normalfont\slshape + \def\@begintheorem##1##2{ + \BlockClass{theorembody\LWR@thisthmstyle}% new + \item[\hskip\labelsep + \InlineClass{theoremheader}{##2\ ##1} + ]}% +\def\@opargbegintheorem##1##2##3{% + \BlockClass{theorembody\LWR@thisthmstyle}% new + \item[\hskip\labelsep + \InlineClass{theoremheader}{##2\ ##1\ (##3)} + ]} +} + +\gdef\th@margin{%\normalfont\slshape + \def\@begintheorem##1##2{ + \BlockClass{theorembody\LWR@thisthmstyle}% new + \item[\hskip\labelsep + \InlineClass{theoremheader}{##2 \qquad ##1} + ]}% +\def\@opargbegintheorem##1##2##3{% + \BlockClass{theorembody\LWR@thisthmstyle}% new + \item[\hskip\labelsep + \InlineClass{theoremheader}{##2 \qquad ##1\ (##3)} + ]} +} +% \end{macrocode} +% +% Patched for \acro{CSS}: +% \begin{macrocode} +\gdef\@endtheorem{\endBlockClass\endtrivlist} +% \end{macrocode} +% +% \iffalse +%</theorem> +% \fi + + + +% \clearpage + +% \iffalse %<*threeparttable> % \fi @@ -21460,16 +22889,11 @@ solid \begin{warpHTML} % \end{macrocode} - - % \begin{macrocode} \newboolean{LWR@tikzbabel} \@ifpackagelater{tikz}{2013/12/20}% Test for Tikz version v3.0.0 -{ -\usetikzlibrary{babel} -\booltrue{LWR@tikzbabel} -} +{\usetikzlibrary{babel}\booltrue{LWR@tikzbabel}} {\boolfalse{LWR@tikzbabel}} % \end{macrocode} @@ -22470,6 +23894,8 @@ solid % \section{Verse} % +% \credits{Peter Wilson} +% % \DescribePackage{verse} % \pkg{verse} is supported and patched by \pkg{lwarp}. % @@ -22540,6 +23966,8 @@ solid % \fi + + % \clearpage % % \iffalse @@ -22734,7 +24162,7 @@ style="width:\rndprintlength{\LWR@wrapwidth} ; % % If used for \cs{textcolor}, with a styletext of |color:|, then the new color is % copied into \\ \cs{LWR@currenttextcolor} for possible re-use in \cs{rule}. % \begin{macrocode} -\NewDocumentCommand{\LWR@colorstyle}{m m m +m}{% +\NewDocumentCommand{\LWR@colorstyle}{m m m m}{% % \end{macrocode} % Use the \pkg{xcolor} package to convert to an \acro{HTML} color space: % \begin{macrocode} @@ -22780,7 +24208,7 @@ style="width:\rndprintlength{\LWR@wrapwidth} ; % % \oarg{model} \marg{color} \marg{text} % is converted into an \acro{HTML} hex color span. % \begin{macrocode} -\NewDocumentCommand{\LWR@textcolor}{O{named} m +m}{% +\NewDocumentCommand{\LWR@textcolor}{O{named} m m}{% \begingroup% \LWR@colorstyle{color:}{#1}{#2}{#3}% \endgroup% @@ -22817,17 +24245,32 @@ style="width:\rndprintlength{\LWR@wrapwidth} ; % % \oarg{framemodel} \marg{framecolor} \oarg{boxmodel} \marg{boxcolor} \marg{text} % is converted into a framed \acro{HTML} hex background color span. % +% A background color of "none" creates a colored frame without a background color. +% % \begin{macrocode} \NewDocumentCommand{\LWR@fcolorbox}{O{named} m O{named} m m}{% \begingroup% +\ifthenelse{\equal{#4}{none}}{% no background color +\LWR@colorstyle{border:1px solid }{#1}{#2}{#5}% +}{% yes background color \LWR@colorstyle{border:1px solid }{#1}{#2}% {\LWR@colorstyle{background:}{#3}{#4}{#5}}% +}% \endgroup% } % \end{macrocode} % ^^A \end{macro} +% Redirect to new definitions: +% \begin{macrocode} +\let\textcolor\LWR@textcolor +\let\pagecolor\LWR@pagecolor +\let\colorbox\LWR@colorbox +\let\fcolorbox\LWR@fcolorbox +% \end{macrocode} + + % \iffalse %</xcolor> % \fi diff --git a/Master/texmf-dist/source/latex/lwarp/lwarp.ins b/Master/texmf-dist/source/latex/lwarp/lwarp.ins index 2ec40e32f01..02b95e085fc 100644 --- a/Master/texmf-dist/source/latex/lwarp/lwarp.ins +++ b/Master/texmf-dist/source/latex/lwarp/lwarp.ins @@ -38,11 +38,15 @@ version 2005/12/01 or later. \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-bookmark.sty}{\from{lwarp.dtx}{bookmark}} \file{lwarp-booktabs.sty}{\from{lwarp.dtx}{booktabs}} +\file{lwarp-ccaption.sty}{\from{lwarp.dtx}{ccaption}} \file{lwarp-changepage.sty}{\from{lwarp.dtx}{changepage}} \file{lwarp-dcolumn.sty}{\from{lwarp.dtx}{dcolumn}} \file{lwarp-draftwatermark.sty}{\from{lwarp.dtx}{draftwatermark}} +\file{lwarp-ellipsis.sty}{\from{lwarp.dtx}{ellipsis}} +\file{lwarp-emptypage.sty}{\from{lwarp.dtx}{emptypage}} \file{lwarp-enumerate.sty}{\from{lwarp.dtx}{enumerate}} \file{lwarp-epigraph.sty}{\from{lwarp.dtx}{epigraph}} \file{lwarp-eso-pic.sty}{\from{lwarp.dtx}{eso-pic}} @@ -53,6 +57,7 @@ version 2005/12/01 or later. \file{lwarp-floatrow.sty}{\from{lwarp.dtx}{floatrow}} \file{lwarp-fontenc.sty}{\from{lwarp.dtx}{fontenc}} \file{lwarp-fontspec.sty}{\from{lwarp.dtx}{fontspec}} +\file{lwarp-framed.sty}{\from{lwarp.dtx}{framed}} \file{lwarp-ftnright.sty}{\from{lwarp.dtx}{ftnright}} \file{lwarp-geometry.sty}{\from{lwarp.dtx}{geometry}} \file{lwarp-graphicx.sty}{\from{lwarp.dtx}{graphicx}} @@ -63,6 +68,7 @@ version 2005/12/01 or later. \file{lwarp-keyfloat.sty}{\from{lwarp.dtx}{keyfloat}} \file{lwarp-layout.sty}{\from{lwarp.dtx}{layout}} \file{lwarp-letterspace.sty}{\from{lwarp.dtx}{letterspace}} +\file{lwarp-lips.sty}{\from{lwarp.dtx}{lips}} \file{lwarp-listings.sty}{\from{lwarp.dtx}{listings}} \file{lwarp-longtable.sty}{\from{lwarp.dtx}{longtable}} \file{lwarp-lscape.sty}{\from{lwarp.dtx}{lscape}} @@ -78,6 +84,7 @@ version 2005/12/01 or later. \file{lwarp-newunicodechar.sty}{\from{lwarp.dtx}{newunicodechar}} \file{lwarp-nextpage.sty}{\from{lwarp.dtx}{nextpage}} \file{lwarp-nowidow.sty}{\from{lwarp.dtx}{nowidow}} +\file{lwarp-ntheorem.sty}{\from{lwarp.dtx}{ntheorem}} \file{lwarp-pagenote.sty}{\from{lwarp.dtx}{pagenote}} \file{lwarp-parskip.sty}{\from{lwarp.dtx}{parskip}} \file{lwarp-placeins.sty}{\from{lwarp.dtx}{placeins}} @@ -85,10 +92,12 @@ version 2005/12/01 or later. \file{lwarp-rotating.sty}{\from{lwarp.dtx}{rotating}} \file{lwarp-setspace.sty}{\from{lwarp.dtx}{setspace}} \file{lwarp-sidecap.sty}{\from{lwarp.dtx}{sidecap}} +\file{lwarp-showidx.sty}{\from{lwarp.dtx}{idx}} \file{lwarp-showkeys.sty}{\from{lwarp.dtx}{showkeys}} \file{lwarp-subfig.sty}{\from{lwarp.dtx}{subfig}} \file{lwarp-tabularx.sty}{\from{lwarp.dtx}{tabularx}} \file{lwarp-textpos.sty}{\from{lwarp.dtx}{textpos}} +\file{lwarp-theorem.sty}{\from{lwarp.dtx}{theorem}} \file{lwarp-threeparttable.sty}{\from{lwarp.dtx}{threeparttable}} \file{lwarp-tikz.sty}{\from{lwarp.dtx}{tikz}} \file{lwarp-titleps.sty}{\from{lwarp.dtx}{titleps}} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-abstract.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-abstract.sty index 4c470c63641..dbe49f6c5e7 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-abstract.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-abstract.sty @@ -188,6 +188,27 @@ + + + + + + + + + + + + + + + + + + + + + \endinput %% %% End of file `lwarp-abstract.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-afterpage.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-afterpage.sty index f56a93787ff..392e7e6b82e 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-afterpage.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-afterpage.sty @@ -130,6 +130,27 @@ + + + + + + + + + + + + + + + + + + + + + \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 bb8af86c89e..c31f2fde6bc 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-algorithmicx.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-algorithmicx.sty @@ -146,6 +146,27 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"% + + + + + + + + + + + + + + + + + + + + + \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 f568d17e1f5..7e707a15dca 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-alltt.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-alltt.sty @@ -133,6 +133,27 @@ + + + + + + + + + + + + + + + + + + + + + \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 new file mode 100644 index 00000000000..930bcda25e9 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-amsthm.sty @@ -0,0 +1,232 @@ +%% +%% This is file `lwarp-amsthm.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `amsthm') +%% This is a generated file. +%% Copyright 2016-2017 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. + + + + + + + + + + + + + + + +\LWR@ProvidesPackagePass{amsthm} + +\newcommand{\LWR@newtheoremstyle}{plain} + +\renewcommand{\theoremstyle}[1]{% + \@ifundefined{th@#1}{% + \PackageWarning{amsthm}{Unknown theoremstyle `#1'}% + \thm@style{plain}% +\renewcommand{\LWR@newtheoremstyle}{plain}% new + }{% + \thm@style{#1}% +\renewcommand{\LWR@newtheoremstyle}{#1}% new + }% +} + +\def\@xnthm#1#2{% + \csedef{LWR@thmstyle#2}{\LWR@newtheoremstyle}% new + \let\@tempa\relax + \@xp\@ifdefinable\csname #2\endcsname{% + \global\@xp\let\csname end#2\endcsname\@endtheorem + \ifx *#1% unnumbered, need to get one more mandatory arg + \edef\@tempa##1{% + \gdef\@xp\@nx\csname#2\endcsname{% + \@nx\@thm{\@xp\@nx\csname th@\the\thm@style\endcsname}% + {}{##1}}}% + \else % numbered theorem, need to check for optional arg + \def\@tempa{\@oparg{\@ynthm{#2}}[]}% + \fi +\AtBeginEnvironment{#2}{\edef\LWR@thisthmstyle{\csuse{LWR@thmstyle#2}}}% new + }% + \@tempa +} + +\newcommand{\LWR@haveamsthmname}{ +\renewcommand{\thmname}[1]{\InlineClass{amsthmname\LWR@thisthmstyle}{##1}} +} + +\newcommand{\LWR@haveamsthmnumber}{ +\renewcommand{\thmnumber}[1]{\InlineClass{amsthmnumber\LWR@thisthmstyle}{##1}} +} + +\newcommand{\LWR@haveamsthmnote}{ +\renewcommand{\thmnote}[1]{\InlineClass{amsthmnote\LWR@thisthmstyle}{##1}} +} + +\LWR@haveamsthmname +\LWR@haveamsthmnumber +\LWR@haveamsthmnote +\def\@begintheorem#1#2[#3]{% + \BlockClass{amsthmbody\LWR@thisthmstyle}% new + \deferred@thm@head{ +\the\thm@headfont \thm@indent + \@ifempty{#1}{\let\thmname\@gobble}{\LWR@haveamsthmname}% new + \@ifempty{#2}{\let\thmnumber\@gobble}{\LWR@haveamsthmnumber}% new + \@ifempty{#3}{\let\thmnote\@gobble}{\LWR@haveamsthmnote}% new + \thm@swap\swappedhead\thmhead{#1}{#2}{#3}% + \the\thm@headpunct~ + \thmheadnl % possibly a newline. + \hskip\thm@headsep + }% + \ignorespaces} +\def\@endtheorem{\endBlockClass\endtrivlist\@endpefalse } +\AtBeginDocument{ +\def\openbox{\text{\HTMLunicode{25A1}}}% UTF-8 white box +\def\blacksquare{\text{\HTMLunicode{220E}}}% UTF-8 end-of-proof +\def\Box{\text{\HTMLunicode{25A1}}}% UTF-8 white box +} +\renewenvironment{proof}[1][\proofname]{\par +\BlockClass{amsthmproof}% new + \pushQED{\qed}% + \normalfont \topsep6\p@\@plus6\p@\relax + \trivlist + \item[\hskip\labelsep + \InlineClass{amsthmproofname}{#1\@addpunct{.}}]\ignorespaces% changes +}{% + \InlineClass{theoremendmark}{\popQED}\endtrivlist% + \endBlockClass% new + \@endpefalse +} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +\endinput +%% +%% End of file `lwarp-amsthm.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-bookmark.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-bookmark.sty index 67b812d00e9..91f1b9e5c42 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-bookmark.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-bookmark.sty @@ -30,6 +30,8 @@ + + \LWR@ProvidesPackageDrop{bookmark} \newcommand*{\bookmarksetup}[1]{} @@ -136,6 +138,25 @@ + + + + + + + + + + + + + + + + + + + \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 f4cb4a77035..e7e6a81af27 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-booktabs.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-booktabs.sty @@ -32,6 +32,8 @@ + + \LWR@ProvidesPackageDrop{booktabs} \newcommand*{\addlinespace}[1]{} \newcommand*{\morecmidrules}{} @@ -132,6 +134,25 @@ + + + + + + + + + + + + + + + + + + + \endinput %% %% End of file `lwarp-booktabs.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-ccaption.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-ccaption.sty new file mode 100644 index 00000000000..79cf1c85149 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-ccaption.sty @@ -0,0 +1,156 @@ +%% +%% This is file `lwarp-ccaption.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `ccaption') +%% 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@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 829844a250d..a11aa3afd0d 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-changepage.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-changepage.sty @@ -32,6 +32,10 @@ + + + + \LWR@ProvidesPackageDrop{changepage} \newif\ifoddpage @@ -135,6 +139,23 @@ + + + + + + + + + + + + + + + + + \endinput %% %% End of file `lwarp-changepage.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-dcolumn.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-dcolumn.sty index 573e6069beb..e99b678edf6 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-dcolumn.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-dcolumn.sty @@ -34,6 +34,10 @@ + + + + \LWR@ProvidesPackageDrop{dcolumn} @@ -129,6 +133,23 @@ + + + + + + + + + + + + + + + + + \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 4bbab9ac043..467d0559cf9 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-draftwatermark.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-draftwatermark.sty @@ -36,6 +36,11 @@ + + + + + \LWR@ProvidesPackageDrop{draftwatermark} \newcommand{\SetWatermarkAngle}[1]{} @@ -139,6 +144,22 @@ + + + + + + + + + + + + + + + + \endinput %% %% End of file `lwarp-draftwatermark.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-ellipsis.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-ellipsis.sty new file mode 100644 index 00000000000..bb76767e53f --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-ellipsis.sty @@ -0,0 +1,157 @@ +%% +%% This is file `lwarp-ellipsis.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `ellipsis') +%% 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{ellipsis} + +\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 new file mode 100644 index 00000000000..4f86ec45251 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-emptypage.sty @@ -0,0 +1,154 @@ +%% +%% This is file `lwarp-emptypage.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `emptypage') +%% 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{emptypage} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +\endinput +%% +%% End of file `lwarp-emptypage.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-enumerate.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-enumerate.sty index 7290d1fef8c..e2cb282563e 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-enumerate.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-enumerate.sty @@ -36,6 +36,14 @@ + + + + + + + + \LWR@ProvidesPackageDrop{enumerate} \def\enit@shl#1{% @@ -136,6 +144,19 @@ + + + + + + + + + + + + + \endinput %% %% End of file `lwarp-enumerate.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-epigraph.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-epigraph.sty index b3b14a2f7d7..95b772ff0e0 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-epigraph.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-epigraph.sty @@ -39,6 +39,14 @@ + + + + + + + + \LWR@ProvidesPackageDrop{epigraph} \newcommand{\qitem}[2] @@ -165,6 +173,19 @@ + + + + + + + + + + + + + \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 12b9f0d5f56..e8c8ed2db8f 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-eso-pic.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-eso-pic.sty @@ -40,6 +40,14 @@ + + + + + + + + \LWR@ProvidesPackageDrop{eso-pic} \newcommand*{\LenToUnit}{} @@ -148,6 +156,19 @@ + + + + + + + + + + + + + \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 90d4796865e..369c043e564 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-everypage.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-everypage.sty @@ -40,6 +40,14 @@ + + + + + + + + \LWR@ProvidesPackageDrop{everypage} \newcommand*{\AddEverypageHook}[1]{} @@ -132,6 +140,19 @@ + + + + + + + + + + + + + \endinput %% %% End of file `lwarp-everypage.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-extramarks.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-extramarks.sty index 412e7b86796..c9e8ba1d735 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-extramarks.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-extramarks.sty @@ -40,6 +40,14 @@ + + + + + + + + \LWR@ProvidesPackageDrop{extramarks} \newcommand*{\extramarks}[2]{} @@ -140,6 +148,19 @@ + + + + + + + + + + + + + \endinput %% %% End of file `lwarp-extramarks.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyhdr.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyhdr.sty index b9a811558c0..f3035b771bd 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyhdr.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyhdr.sty @@ -41,6 +41,15 @@ + + + + + + + + + \LWR@ProvidesPackageDrop{fancyhdr} \newcommand*{\fancyhead}[2][]{} @@ -147,6 +156,18 @@ + + + + + + + + + + + + \endinput %% %% End of file `lwarp-fancyhdr.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-float.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-float.sty index 5e8a906f38a..602cd8c651b 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-float.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-float.sty @@ -43,6 +43,15 @@ + + + + + + + + + \LWR@ProvidesPackageDrop{float}[2016/03/04] @@ -153,6 +162,18 @@ + + + + + + + + + + + + \endinput %% %% End of file `lwarp-float.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-floatrow.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-floatrow.sty index fa8388f28d1..5bfb41731e5 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-floatrow.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-floatrow.sty @@ -46,6 +46,15 @@ + + + + + + + + + \LWR@ProvidesPackageDrop{floatrow} @@ -287,6 +296,18 @@ + + + + + + + + + + + + \endinput %% %% End of file `lwarp-floatrow.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-fontenc.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-fontenc.sty index a602feb9451..ab88a426589 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-fontenc.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-fontenc.sty @@ -46,6 +46,15 @@ + + + + + + + + + \LWR@ProvidesPackageDrop{fontenc} \LWR@loadbefore{fontenc} @@ -130,6 +139,18 @@ + + + + + + + + + + + + \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 5ef016a8a4e..b83acc75796 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-fontspec.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-fontspec.sty @@ -46,6 +46,15 @@ + + + + + + + + + \LWR@ProvidesPackageDrop{fontspec} \LWR@loadbefore{fontspec} @@ -129,6 +138,18 @@ + + + + + + + + + + + + \endinput %% %% End of file `lwarp-fontspec.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-framed.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-framed.sty new file mode 100644 index 00000000000..5ca5029df95 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-framed.sty @@ -0,0 +1,243 @@ +%% +%% This is file `lwarp-framed.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `framed') +%% This is a generated file. +%% Copyright 2016-2017 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +\LWR@ProvidesPackagePass{framed} + + +\renewenvironment{framed}{% +\BlockClass{framed}% +} +{\endBlockClass} + +\renewenvironment{oframed}{% +\BlockClass{framed}% +} +{\endBlockClass} + +\renewenvironment{shaded}{% +\convertcolorspec{named}{shadecolor}{HTML}\LWR@tempcolor% +\BlockClass{framed}[background: \#\LWR@tempcolor]% +} +{\endBlockClass} + +\renewenvironment{shaded*}{% +\convertcolorspec{named}{shadecolor}{HTML}\LWR@tempcolor% +\BlockClass{framed}[background: \#\LWR@tempcolor]% +} +{\endBlockClass} + +\renewenvironment{leftbar}{% +\BlockClass{framedleftbar} + \def\FrameCommand{}% + \MakeFramed {} +}% + {\endMakeFramed\endBlockClass} + +\renewenvironment{snugshade}{% +\convertcolorspec{named}{shadecolor}{HTML}\LWR@tempcolor% +\BlockClass{snugframed}[background: \#\LWR@tempcolor]% +} +{\endBlockClass} + +\renewenvironment{snugshade*}{% +\convertcolorspec{named}{shadecolor}{HTML}\LWR@tempcolor% +\BlockClass{snugframed}[background: \#\LWR@tempcolor]% +} +{\endBlockClass} + +\let\oframed\framed +\let\endoframed\endframed + +\RenewEnviron{titled-frame}[1]{% +\CustomFBox{#1}{}{0pt}{0pt}{0pt}{0pt}{\BODY} +} + +\renewcommand{\CustomFBox}[7]{% +\convertcolorspec{named}{TFFrameColor}{HTML}\LWR@tempcolor% +\begin{BlockClass}{framed}[border: 3px solid \#\LWR@tempcolor]% +\ifthenelse{\isempty{#1}}{}{% not empty +\begin{BlockClass}{framedtitle}[background: \#\LWR@tempcolor]% +\textcolor{TFTitleColor}{\textbf{#1}}% +\end{BlockClass} +}% not empty + +#7 + +\ifthenelse{\isempty{#2}}{}{% not empty +\convertcolorspec{named}{TFFrameColor}{HTML}\LWR@tempcolor% +\begin{BlockClass}{framedtitle}[background: \#\LWR@tempcolor]% +\textcolor{TFTitleColor}{\textbf{#2}}% +\end{BlockClass} +}% not empty +\end{BlockClass} +} + +\renewcommand\TitleBarFrame[3][]{ +\CustomFBox + {#2}{}% + \fboxrule\fboxrule\fboxrule\fboxrule + {#3}% +} + +\renewcommand{\TF@Title}[1]{#1} + +\let\MakeFramed\relax +\let\endMakeFramed\relax + +\NewEnviron{MakeFramed}[1]{% +\FrameCommand{\begin{minipage}{\linewidth}\BODY\end{minipage}}% +} + +\renewcommand*{\fb@put@frame}[2]{% +\relax% +\@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 b65fd706640..2f7895e91a3 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-ftnright.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-ftnright.sty @@ -49,6 +49,17 @@ + + + + + + + + + + + \LWR@ProvidesPackageDrop{ftnright} @@ -128,6 +139,16 @@ + + + + + + + + + + \endinput %% %% End of file `lwarp-ftnright.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-geometry.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-geometry.sty index f438541ab9e..f58582b63be 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-geometry.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-geometry.sty @@ -51,6 +51,17 @@ + + + + + + + + + + + \LWR@ProvidesPackageDrop{geometry} \renewcommand*{\geometry}[1]{} @@ -135,6 +146,16 @@ + + + + + + + + + + \endinput %% %% End of file `lwarp-geometry.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty index ab923d0d05c..5b5b728ecef 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty @@ -52,12 +52,28 @@ -\PackageError{lwarp-graphics} -{The graphics package is not supported by -the lwarp package's HTML conversion. -Please use graphicx instead. \protect\usepackage{graphicx}} -{Graphicx requires a different syntax but is more flexible, -and it is emulated by lwarp.} + + + + + + + + + + + +\LWR@loadnever{graphics}{graphicx} + + + + + + + + + + diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-graphicx.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-graphicx.sty index ed3fb17ebb4..42bfd7f6213 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-graphicx.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-graphicx.sty @@ -53,6 +53,17 @@ + + + + + + + + + + + \LWR@ProvidesPackageDrop{graphicx} @@ -129,6 +140,16 @@ + + + + + + + + + + \endinput %% %% End of file `lwarp-graphicx.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperref.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperref.sty index a08f4ca0fba..defd5e7975d 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperref.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperref.sty @@ -55,6 +55,17 @@ + + + + + + + + + + + \typeout{Using the lwarp html version of package `hyperref' — discarding options.} \typeout{ Are not using ProvidesPackage, so that other packages} \typeout{ do not attempt to patch lwarp's version of `hyperref'.} @@ -234,6 +245,16 @@ + + + + + + + + + + \endinput %% %% End of file `lwarp-hyperref.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-indentfirst.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-indentfirst.sty index 2d10317e991..70a80343793 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-indentfirst.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-indentfirst.sty @@ -56,6 +56,17 @@ + + + + + + + + + + + \LWR@ProvidesPackageDrop{indentfirst} @@ -129,6 +140,16 @@ + + + + + + + + + + \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 cf6b095209f..3d2fe38f6c0 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-inputenc.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-inputenc.sty @@ -56,6 +56,17 @@ + + + + + + + + + + + \LWR@ProvidesPackageDrop{inputenc} \LWR@loadbefore{inputenc} @@ -130,6 +141,16 @@ + + + + + + + + + + \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 27e3cbfeda6..1ff1e3f4966 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-keyfloat.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-keyfloat.sty @@ -58,6 +58,17 @@ + + + + + + + + + + + \LWR@ProvidesPackagePass{keyfloat} \AtBeginDocument{ @@ -157,6 +168,16 @@ + + + + + + + + + + \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 4d23afef1fe..53b7ef06cd2 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-layout.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-layout.sty @@ -59,6 +59,17 @@ + + + + + + + + + + + \LWR@ProvidesPackageDrop{layout} \NewDocumentCommand{\layout}{s}{} @@ -130,6 +141,16 @@ + + + + + + + + + + \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 018d3b54c64..130f48b71a0 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-letterspace.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-letterspace.sty @@ -61,6 +61,17 @@ + + + + + + + + + + + \LWR@ProvidesPackageDrop{letterspace} \newcommand*\lsstyle{} @@ -134,6 +145,16 @@ + + + + + + + + + + \endinput %% %% End of file `lwarp-letterspace.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-lips.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-lips.sty new file mode 100644 index 00000000000..61471f60c6b --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-lips.sty @@ -0,0 +1,171 @@ +%% +%% This is file `lwarp-lips.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `lips') +%% 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. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +\PackageInfo{lwarp}{Using the lwarp version of package `lips'.}% +\ProvidesPackage{lwarp-lips} + +\NewDocumentCommand{\Lips}{}{\textellipsis} + +\NewDocumentCommand{\BracketedLips}{}{[\textellipsis]} + +\let\lips\Lips +\let\olips\lips + +\DeclareOption*{} +\DeclareOption{mla}{ +\let\lips\BracketedLips +} +\ProcessOptions\relax + +\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 ea2fca8b889..c1329066b5a 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-listings.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-listings.sty @@ -62,6 +62,20 @@ + + + + + + + + + + + + + + \begin{warpHTML} \LWR@ProvidesPackagePass{listings} @@ -233,6 +247,14 @@ + + + + + + + + \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 d569b6cd3f2..b4158dff15e 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-longtable.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-longtable.sty @@ -65,6 +65,19 @@ + + + + + + + + + + + + + \LWR@ProvidesPackageDrop{longtable} @@ -170,6 +183,14 @@ + + + + + + + + \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 e8e7c0cbdb2..6c50cb98a7f 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-lscape.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-lscape.sty @@ -66,6 +66,19 @@ + + + + + + + + + + + + + \LWR@ProvidesPackageDrop{lscape} \newenvironment*{landscape}{}{} @@ -130,6 +143,14 @@ + + + + + + + + \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 49de52cee3b..fafe0ce3dd4 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-ltcaption.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-ltcaption.sty @@ -69,6 +69,19 @@ + + + + + + + + + + + + + \LWR@ProvidesPackageDrop{ltcaption} \newlength{\LTcapskip} @@ -135,6 +148,14 @@ + + + + + + + + \endinput %% %% End of file `lwarp-ltcaption.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-mcaption.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-mcaption.sty index 3dbdf2bbebd..78ee6a4b968 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-mcaption.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-mcaption.sty @@ -68,6 +68,20 @@ + + + + + + + + + + + + + + \LWR@ProvidesPackageDrop{mcaption} \newenvironment{margincap}{}{} @@ -132,6 +146,13 @@ + + + + + + + \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 0555655a0d2..a1b74c0383f 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-mdframed.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-mdframed.sty @@ -70,14 +70,28 @@ + + + + + + + + + + + + + + \LWR@ProvidesPackageDrop{mdframed} \LWR@origRequirePackage{amsthm} \LWR@origRequirePackage[framemethod=none]{mdframed} \mdfsetup{ -startcode={\LWR@mdframedstart}, +startcode={\LWR@mdframedstart\LWR@origraggedright}, endcode={\LWR@mdframedend}, -startinnercode={\LWR@startpars}, +startinnercode={\LWR@startpars\LWR@origraggedright}, endinnercode={\LWR@stoppars}, } \newcommand*{\LWR@mdfprintcolor}[1]{% @@ -287,6 +301,13 @@ solid + + + + + + + \endinput %% %% End of file `lwarp-mdframed.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-microtype.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-microtype.sty index 47fb8539ab5..2b75582586d 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-microtype.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-microtype.sty @@ -73,6 +73,20 @@ + + + + + + + + + + + + + + \LWR@ProvidesPackageDrop{microtype} \renewcommand*\DeclareMicrotypeSet[3][]{} @@ -161,6 +175,13 @@ + + + + + + + \endinput %% %% End of file `lwarp-microtype.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-multicol.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-multicol.sty index d7e9b07229e..e535f7f4f06 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-multicol.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-multicol.sty @@ -75,6 +75,20 @@ + + + + + + + + + + + + + + \LWR@ProvidesPackageDrop{multicol}[2015/09/13] @@ -157,6 +171,13 @@ + + + + + + + \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 ceb0967d563..17185bb2a8f 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-multirow.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-multirow.sty @@ -77,6 +77,20 @@ + + + + + + + + + + + + + + \LWR@ProvidesPackageDrop{multirow} @@ -129,6 +143,13 @@ + + + + + + + \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 f72ad7c1f73..359f2d3c3f6 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-nameref.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-nameref.sty @@ -77,6 +77,20 @@ + + + + + + + + + + + + + + \typeout{Using the lwarp html version of package `nameref' — discarding options.} \typeout{ Are not using ProvidesPackage, so that other packages} \typeout{ do not attempt to patch lwarp's version of `nameref'.} @@ -132,6 +146,13 @@ + + + + + + + \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 4e472e399e7..36045c70bc6 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-needspace.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-needspace.sty @@ -78,6 +78,20 @@ + + + + + + + + + + + + + + \LWR@ProvidesPackageDrop{needspace} \newcommand*{\needspace}[1]{} @@ -131,6 +145,13 @@ + + + + + + + \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 a721939d307..b50ea7fc794 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-newclude.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-newclude.sty @@ -79,6 +79,20 @@ + + + + + + + + + + + + + + \LWR@ProvidesPackageDrop{newclude} \LWR@loadbefore{newclude} @@ -130,6 +144,13 @@ + + + + + + + \endinput %% %% End of file `lwarp-newclude.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-newproject.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-newproject.sty index f50d99d2b01..3ecb88915e8 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-newproject.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-newproject.sty @@ -20,7 +20,6 @@ - \ProvidesPackage{lwarp-newproject} \RequirePackage{etoolbox} @@ -130,6 +129,7 @@ a.tocfigure {margin-left: 0em} a.tocsubfigure {margin-left: 2em} a.toctable {margin-left: 0em} a.tocsubtable {margin-left: 2em} +a.toctheorem {margin-left: 0em} a.toclstlisting {margin-left: 0em} body { @@ -481,17 +481,6 @@ div.singlespace { line-height: 1.2 ; } div.onehalfspace { line-height: 1.5 ; } div.doublespace { line-height: 2 ; } -.theorem { - background: #e0e0e0; - padding: 1ex ; - margin: 1em ; - border: 1px solid silver ; -} - -.theoremlabel { font-weight: bold ; } - -.theoremcontents { font-style: italic; margin-left: 1em ; } - /* Minipage environments, vertically aligned to top, center, bottom: */ .minipage { /* display: inline-block ; */ @@ -553,6 +542,38 @@ div.doublespace { line-height: 2 ; } /* display: inline-block ; */ } +/* framed package */ +.framed { + margin: 3ex 0em 3ex 0em ; + border: 1px solid black; + border-radius: 0px ; + padding: .3ex 1em 0ex 1em ; + display: block ; +} + +.snugframed { + margin: 3ex 0em 3ex 0em ; + border: 1px solid black; + border-radius: 0px ; + display: block ; +} + +.framedleftbar { + margin: 3ex 0em 3ex 0em ; + border-left: 3pt solid black; + border-radius: 0px ; + padding: .3ex .2em .3ex 1em ; + display: block ; +} + +.framedtitle { +margin: 0em ; +padding: 0em ; + font-size: 130% +} + +.framedtitle p { padding: .3em } + dl { margin: 1ex 2em 1ex 0em; line-height: 1.3; @@ -565,14 +586,14 @@ dl dt { dl dd p { margin-top: 0em; } -nav.toc, nav.lof, nav.lot, nav.lol { +nav.toc, nav.lof, nav.lot, nav.lol, nav.lothm { font-family: "URW Classico", Optima, "Linux Biolinum O", "DejaVu Sans", "Bitstream Vera Sans", Geneva, Verdana, sans-serif ; margin-bottom: 4ex ; } -nav.toc p, nav.lof p, nav.lot p, nav.lol p { +nav.toc p, nav.lof p, nav.lot p, nav.lol p, nav.lothm p { line-height: 1.2 ; margin-top:.5ex ; margin-bottom:.5ex; @@ -923,6 +944,78 @@ div.multicols p {margin-top: 0ex} /* Used to support algorithmicx: */ span.floatright { float: right ; } +/* Native LaTeX theorems: */ + +.theoremcontents { font-style: italic; margin-top: 3ex ; margin-bottom: 3ex ; } +.theoremlabel { font-style: normal; font-weight: bold ; margin-right: .5em ; } + +/* theorem, amsthm, and ntheorem packages */ + +span.theoremheader, +span.theoremheaderplain, +span.theoremheaderdefinition, +span.theoremheaderbreak, +span.theoremheadermarginbreak, +span.theoremheaderchangebreak, +span.theoremheaderchange, +span.theoremheadermargin +{ +font-style:normal ; font-weight: bold ; margin-right: 1em ; +} + +span.amsthmnameplain, +span.amsthmnamedefinition, +span.amsthmnumberplain, +span.amsthmnumberdefinition +{ +font-style:normal ; font-weight: bold ; +} + +span.amsthmnameremark, +span.amsthmnumberremark +{font-style:italic ; font-weight: normal ; } + +span.amsthmnoteplain, +span.amsthmnotedefinition +{font-style:normal ;} + +span.theoremheaderremark, +span.theoremheaderproof, +span.amsthmproofname +{font-style:italic ; font-weight: normal ; margin-right: 1em ; } + +span.theoremheadersc +{ +font-style:normal ; +font-variant: small-caps ; +font-weight: normal ; +margin-right: 1em ; +} + +.theoremendmark {float:right} + +div.amsthmbodyplain, div.theorembodyplain, div.theorembodynonumberplain, +div.theorembodybreak, div.theorembodynonumberbreak, +div.theorembodymarginbreak, +div.theorembodychangebreak, +div.theorembodychange, +div.theorembodymargin +{ +font-style:italic; +margin-top: 3ex ; margin-bottom: 3ex ; +} + +div.theorembodydefinition, div.theorembodyremark, div.theorembodyproof, +div.theorembodyplainupright, nonumberplainuprightsc, +div.amsthmbodydefinition, div.amsthmbodyremark, +div.amsthmproof +{ +font-style: normal ; +margin-top: 3ex ; margin-bottom: 3ex ; +} + +span.amsthmnoteremark {} + /* For CSS LaTeX and related logos: Based on: @@ -1182,6 +1275,13 @@ font-size: 1.5em ; border-radius: 1ex ; } +.framed .minipage , .framedleftbar .minipage { +border: none ; +background: none ; +padding: 0ex ; +margin: 0ex ; +} + figure.figure .minipage, figcaption .minipage { border: none; } div.marginblock div.minipage { border: none; } @@ -1577,7 +1677,7 @@ MathJax.Hub.Config({ -- Print the usage of the lwarpmk command: -printversion = "v0.24" +printversion = "v0.25" function printhelp () print ("lwarpmk: Use lwarpmk -h or lwarpmk --help for help.") ; @@ -2108,6 +2208,27 @@ end -- not --version + + + + + + + + + + + + + + + + + + + + + \endinput %% %% End of file `lwarp-newproject.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-newunicodechar.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-newunicodechar.sty index 96e675014f2..fb5102374e9 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-newunicodechar.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-newunicodechar.sty @@ -80,6 +80,20 @@ + + + + + + + + + + + + + + \LWR@ProvidesPackageDrop{newunicodechar} \LWR@loadbefore{newunicodechar} @@ -130,6 +144,13 @@ + + + + + + + \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 0fe5c1c8fdd..60461ef608e 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-nextpage.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-nextpage.sty @@ -81,6 +81,20 @@ + + + + + + + + + + + + + + \LWR@ProvidesPackageDrop{nextpage} \newcommand{\cleartoevenpage}[1][]{} @@ -133,6 +147,13 @@ + + + + + + + \endinput %% %% End of file `lwarp-nextpage.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-nowidow.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-nowidow.sty index accbe65a987..0b8fb0579fb 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-nowidow.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-nowidow.sty @@ -83,6 +83,20 @@ + + + + + + + + + + + + + + \LWR@ProvidesPackageDrop{nowidow} \newcommand*{\nowidow}[1][]{} @@ -135,6 +149,13 @@ + + + + + + + \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 new file mode 100644 index 00000000000..21a1229a28d --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-ntheorem.sty @@ -0,0 +1,543 @@ +%% +%% This is file `lwarp-ntheorem.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `ntheorem') +%% 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. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +\DeclareOption{thref}{} + +\newbool{LWR@ntheoremmarks} +\boolfalse{LWR@ntheoremmarks} + +\DeclareOption{thmmarks}{ +\booltrue{LWR@ntheoremmarks} +\newif\ifsetendmark\setendmarktrue +} + +\newbool{LWR@ntheoremamsthm} +\boolfalse{LWR@ntheoremamsthm} + +\DeclareOption{amsthm}{\booltrue{LWR@ntheoremamsthm}} + +\DeclareOption{amsmath}{} +\DeclareOption{hyperref}{} + +\LWR@ProvidesPackagePass{ntheorem} +\newcommand{\LWR@newtheoremstyle}{plain} +\gdef\theoremstyle#1{% + \@ifundefined{th@#1}{\@warning + {Unknown theoremstyle `#1'. Using `plain'}% + \theorem@style{plain} + \renewcommand{\LWR@newtheoremstyle}{plain}% new +}% + { +\theorem@style{#1} + \renewcommand{\LWR@newtheoremstyle}{#1}% new +} +} + + +\gdef\@xnthm#1#2[#3]{% + \ifthm@tempif + \csedef{LWR@thmstyle#1}{\LWR@newtheoremstyle}% new + \expandafter\@ifundefined{c@#1}% + {\@definecounter{#1}}{}% + \@newctr{#1}[#3]% + \expandafter\xdef\csname the#1\endcsname{% + \expandafter\noexpand\csname the#3\endcsname \@thmcountersep + {\noexpand\csname\the\theoremnumbering\endcsname{#1}}}% + \expandafter\gdef\csname mkheader@#1\endcsname + {\csname setparms@#1\endcsname + \@thm{#1}{#1}{#2} +}% + \global\@namedef{end#1}{\@endtheorem} + \AtBeginEnvironment{#1}{\edef\LWR@thisthmstyle{\csuse{LWR@thmstyle#1}}}% new + \fi +} + +\gdef\@ynthm#1#2{% + \ifthm@tempif + \csedef{LWR@thmstyle#1}{\LWR@newtheoremstyle}% new + \expandafter\@ifundefined{c@#1}% + {\@definecounter{#1}}{}% + \expandafter\xdef\csname the#1\endcsname + {\noexpand\csname\the\theoremnumbering\endcsname{#1}}% + \expandafter\gdef\csname mkheader@#1\endcsname + {\csname setparms@#1\endcsname + \@thm{#1}{#1}{#2} +}% + \global\@namedef{end#1}{\@endtheorem} + \AtBeginEnvironment{#1}{\edef\LWR@thisthmstyle{\csuse{LWR@thmstyle#1}}}% new + \fi +} + +\gdef\@othm#1[#2]#3{% + \@ifundefined{c@#2}{\@nocounterr{#2}}% + {\ifthm@tempif + \csedef{LWR@thmstyle#1}{\LWR@newtheoremstyle}% new + \global\@namedef{the#1}{\@nameuse{the#2}}% + \expandafter\protected@xdef\csname num@addtheoremline#1\endcsname{% + \noexpand\@num@addtheoremline{#1}{#3}}% + \expandafter\protected@xdef\csname nonum@addtheoremline#1\endcsname{% + \noexpand\@nonum@addtheoremline{#1}{#3}}% + \theoremkeyword{#3}% + \expandafter\protected@xdef\csname #1Keyword\endcsname + {\the\theoremkeyword}% + \expandafter\gdef\csname mkheader@#1\endcsname + {\csname setparms@#1\endcsname + \@thm{#1}{#2}{#3} +}% + \global\@namedef{end#1}{\@endtheorem} + \AtBeginEnvironment{#1}{\edef\LWR@thisthmstyle{\csuse{LWR@thmstyle#1}}}% new + \fi} +} +\newcommand{\LWR@inctheorem}{% +\addtocounter{LWR@thisfloat}{1}% +\LWR@stoppars% +\LWR@htmltag{a id="autofloat-\arabic{LWR@thisfloat}"{}}\LWR@htmltag{/a}% +\LWR@startpars% +} +\gdef\newtheoremstyle#1#2#3{% + \expandafter\@ifundefined{th@#1}% + {\expandafter\gdef\csname th@#1\endcsname{% + \def\@begintheorem####1####2{% +\BlockClass{theorembody#1}%\LWR@thisthmstyle% new +\LWR@inctheorem% new +#2}% + \def\@opargbegintheorem####1####2####3{% +\BlockClass{theorembody#1}%\LWR@thisthmstyle% new +\LWR@inctheorem% new +#3}% +}% +}% +{\PackageError{\basename}{Theorem style #1 already defined}\@eha} +} + +\renewtheoremstyle{plain}% + {\item[\hskip\labelsep \theorem@headerfont +\InlineClass{theoremheaderplain}{##1\ ##2\theorem@separator}]}% + {\item[\hskip\labelsep \theorem@headerfont +\InlineClass{theoremheaderplain}{##1\ ##2\ (##3)\theorem@separator}]} + +\renewtheoremstyle{break}% + {\item[ +\hskip\labelsep \theorem@headerfont +\InlineClass{theoremheaderbreak}{##1\ ##2\theorem@separator}\newline +]}% + {\item[ +\hskip\labelsep \theorem@headerfont +\InlineClass{theoremheaderbreak}{##1\ ##2\ (##3)\theorem@separator}\newline +]} + +\renewtheoremstyle{change}% + {\item[\hskip\labelsep +\theorem@headerfont +\InlineClass{theoremheaderchange}{##2\ ##1\theorem@separator}]}% + {\item[\hskip\labelsep +\theorem@headerfont +\InlineClass{theoremheaderchange}{##2\ ##1\ (##3)\theorem@separator}]} + +\renewtheoremstyle{changebreak}% + {\item[ +\hskip\labelsep \theorem@headerfont +\InlineClass{theoremheaderchangebreak}{##2\ ##1\theorem@separator}\newline +]}% + {\item[ +\hskip\labelsep \theorem@headerfont +\InlineClass{theoremheaderchangebreak}{##2\ ##1\ (##3)\theorem@separator}\newline +]} + +\renewtheoremstyle{margin}% + {\item[\hskip\labelsep\theorem@headerfont +\InlineClass{theoremheadermargin}{##2 \qquad ##1\theorem@separator} +]}% + {\item[\hskip\labelsep\theorem@headerfont +\InlineClass{theoremheadermargin}{##2 \qquad ##1\ (##3)\theorem@separator} +]} + +\renewtheoremstyle{marginbreak}% + {\item[\hskip\labelsep\theorem@headerfont +\InlineClass{theoremheadermarginbreak}{##2 \qquad ##1\theorem@separator}\newline +]}% + {\item[\hskip\labelsep\theorem@headerfont +\InlineClass{theoremheadermarginbreak}{##2 \qquad ##1\ (##3)\theorem@separator}\newline +]} + +\renewtheoremstyle{nonumberplain}% + {\item[\theorem@headerfont\hskip\labelsep +\InlineClass{theoremheaderplain}{##1\theorem@separator}]}% + {\item[\theorem@headerfont\hskip \labelsep +\InlineClass{theoremheaderplain}{##1\ (##3)\theorem@separator}]} + +\renewtheoremstyle{nonumberbreak}% + {\item[ +\hskip\labelsep \theorem@headerfont +\InlineClass{theoremheaderbreak}{##1\theorem@separator}\newline +]}% + {\item[ +\hskip\labelsep \theorem@headerfont +\InlineClass{theoremheaderbreak}{##1\ (##3)\theorem@separator}\newline +]} + +\renewtheoremstyle{empty}% + {\item[]}% + {\item[\theorem@headerfont \hskip\labelsep\relax +\InlineClass{theoremheaderplain}{##3}]} + +\renewtheoremstyle{emptybreak}% + {\item[]}% + {\item[\theorem@headerfont \hskip\labelsep\relax +\InlineClass{theoremheaderplain}{##3}] \ \newline} +\ifbool{LWR@ntheoremamsthm}{}{ +\newtheoremstyle{plainupright}% + {\item[\hskip\labelsep \theorem@headerfont +\InlineClass{theoremheaderplain}{##1\ ##2\theorem@separator}]}% + {\item[\hskip\labelsep \theorem@headerfont +\InlineClass{theoremheaderplain}{##1\ ##2\ (##3)\theorem@separator}]} + +\newtheoremstyle{nonumberplainuprightsc}% + {\item[\theorem@headerfont\hskip\labelsep +\InlineClass{theoremheadersc}{##1\theorem@separator}]}% + {\item[\theorem@headerfont\hskip \labelsep +\InlineClass{theoremheadersc}{##1\ (##3)\theorem@separator}]} +\theoremstyle{plainupright} +\theorembodyfont{\upshape} +\theoremsymbol{\ensuremath{_\Box}} +\renewtheorem{Example}{Example} +\renewtheorem{example}{Example} +\renewtheorem{Beispiel}{Beispiel} +\renewtheorem{beispiel}{Beispiel} +\renewtheorem{Bemerkung}{Bemerkung} +\renewtheorem{bemerkung}{Bemerkung} +\renewtheorem{Anmerkung}{Anmerkung} +\renewtheorem{anmerkung}{Anmerkung} +\renewtheorem{Remark}{Remark} +\renewtheorem{remark}{Remark} +\renewtheorem{Definition}{Definition} +\renewtheorem{definition}{Definition} + +\theoremstyle{nonumberplainuprightsc} +\theoremsymbol{\ensuremath{_\blacksquare}} +\renewtheorem{Proof}{Proof} +\renewtheorem{proof}{Proof} +\renewtheorem{Beweis}{Beweis} +\renewtheorem{beweis}{Beweis} +\qedsymbol{\ensuremath{_\blacksquare}} + +\theoremsymbol{} +}% not amsthm +\ifbool{LWR@ntheoremamsthm}{ + +\gdef\th@plain{% + \def\theorem@headerfont{\normalfont\bfseries}\itshape% + \def\@begintheorem##1##2{% +\BlockClass{theorembodyplain}% new +\LWR@inctheorem% new + \item[\hskip\labelsep + \InlineClass{theoremheaderplain}{##1\ ##2.} +]}% + \def\@opargbegintheorem##1##2##3{% +\BlockClass{theorembodyplain}% new +\LWR@inctheorem% new + \item[\hskip\labelsep + \InlineClass{theoremheaderplain}{##1\ ##2\ (##3).} +]}} + +\gdef\th@nonumberplain{% + \def\theorem@headerfont{\normalfont\bfseries}\itshape% + \def\@begintheorem##1##2{% +\BlockClass{theorembodyplain}% new +\LWR@inctheorem% new + \item[\hskip\labelsep + \InlineClass{theoremheaderplain}{##1.} +]}% + \def\@opargbegintheorem##1##2##3{% +\BlockClass{theorembodyplain}% new +\LWR@inctheorem% new + \item[\hskip\labelsep + \InlineClass{theoremheaderplain}{##1\ (##3).} +]}} + +\gdef\th@definition{% + \def\theorem@headerfont{\normalfont\bfseries}\normalfont% + \def\@begintheorem##1##2{% +\BlockClass{theorembodydefinition}% new +\LWR@inctheorem% new + \item[\hskip\labelsep + \InlineClass{theoremheaderdefinition}{##1\ ##2.} +]}% + \def\@opargbegintheorem##1##2##3{% +\BlockClass{theorembodydefinition}% new +\LWR@inctheorem% new + \item[\hskip\labelsep + \InlineClass{theoremheaderdefinition}{##1\ ##2\ (##3).} +]}} + +\gdef\th@nonumberdefinition{% + \def\theorem@headerfont{\normalfont\bfseries}\normalfont% + \def\@begintheorem##1##2{% +\BlockClass{theorembodydefinition}% new +\LWR@inctheorem% new + \item[\hskip\labelsep + \InlineClass{theoremheaderdefinition}{##1.} +]}% + \def\@opargbegintheorem##1##2##3{% +\BlockClass{theorembodydefinition}% new +\LWR@inctheorem% new + \item[\hskip\labelsep + \InlineClass{theoremheaderdefinition}{##1\ (##3).} +]}} + +\gdef\th@remark{% + \def\theorem@headerfont{\itshape}\normalfont% + \def\@begintheorem##1##2{% +\BlockClass{theorembodyremark}% new +\LWR@inctheorem% new + \item[\hskip\labelsep + \InlineClass{theoremheaderremark}{##1\ ##2.} +]}% + \def\@opargbegintheorem##1##2##3{% +\BlockClass{theorembodyremark}% new +\LWR@inctheorem% new + \item[\hskip\labelsep + \InlineClass{theoremheaderremark}{##1\ ##2\ (##3).} +]}} + +\gdef\th@nonumberremark{% + \def\theorem@headerfont{\itshape}\normalfont% + \def\@begintheorem##1##2{% +\BlockClass{theorembodyremark}% new +\LWR@inctheorem% new + \item[\hskip\labelsep + \InlineClass{theoremheaderremark}{##1.} +]}% + \def\@opargbegintheorem##1##2##3{% +\BlockClass{theorembodyremark}% new +\LWR@inctheorem% new + \item[\hskip\labelsep + \InlineClass{theoremheaderremark}{##1\ (##3).} +]}} + +\gdef\th@proof{% + \def\theorem@headerfont{\normalfont\bfseries}\itshape% + \def\@begintheorem##1##2{% +\BlockClass{theorembodyproof}% new +\LWR@inctheorem% new + \item[\hskip\labelsep + \InlineClass{theoremheaderproof}{##1.} +]}% + \def\@opargbegintheorem##1##2##3{% +\BlockClass{theorembodyroof}% new +\LWR@inctheorem% new + \item[\hskip\labelsep + \InlineClass{theoremheaderproof}{##1\ (##3).} +]}} + +\newcounter{proof}% +\if@thmmarks +\newcounter{currproofctr}% +\newcounter{endproofctr}% +\fi + +\gdef\proofSymbol{\openbox} + +\newcommand{\proofname}{Proof} + +\newenvironment{proof}[1][\proofname]{ +\th@proof +\def\theorem@headerfont{\itshape}% +\normalfont +\theoremsymbol{\ensuremath{_\blacksquare}} +\@thm{proof}{proof}{#1} +}% +{\@endtheorem} + +}{}% amsthm option +\let\LWR@origendtheorem\@endtheorem +\renewcommand{\@endtheorem}{% +\ifbool{LWR@ntheoremmarks}{% +\ifsetendmark% +\InlineClass{theoremendmark}{\csname\InTheoType Symbol\endcsname}% +\setendmarkfalse% +\fi% +}{}% +\LWR@origendtheorem% +\ifbool{LWR@ntheoremmarks}{\global\setendmarktrue}{}% +\endBlockClass% +} + +\gdef\NoEndMark{\global\setendmarkfalse} + +\renewcommand{\thm@@thmline@noname}[4]{% +\hypertocfloat{1}{theorem}{thm}{#2 #3}{}% +} + +\renewcommand{\thm@@thmline@name}[4]{% +\hypertocfloat{1}{theorem}{thm}{#1 #2 #3}{}% +} +\def\thm@@thmline{\thm@@thmline@name} + +\def\listtheorems#1{ +\LWR@htmlelementclass{nav}{lothm}% +\begingroup +\c@tocdepth=-2% +\def\thm@list{#1}\thm@processlist +\endgroup +\LWR@htmlelementclassend{nav}{lothm}% +} + + +\newcommand{\qed}{\qquad\the\qedsymbol} + +\AtBeginDocument{ +\def\openbox{\text{\HTMLunicode{25A1}}}% UTF-8 white box +\def\blacksquare{\text{\HTMLunicode{220E}}}% UTF-8 end-of-proof +\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 1bd09c3db67..5eeeaee846b 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-pagenote.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-pagenote.sty @@ -85,6 +85,23 @@ + + + + + + + + + + + + + + + + + \LWR@ProvidesPackageDrop{pagenote} \renewcommand*{\makepagenote}{} \RenewDocumentCommand{\printnotes}{s}{} @@ -134,6 +151,10 @@ + + + + \endinput %% %% End of file `lwarp-pagenote.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-parskip.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-parskip.sty index 18899008492..6f069f01cfa 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-parskip.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-parskip.sty @@ -85,6 +85,23 @@ + + + + + + + + + + + + + + + + + \LWR@ProvidesPackageDrop{parskip} @@ -128,6 +145,10 @@ + + + + \endinput %% %% End of file `lwarp-parskip.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-placeins.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-placeins.sty index 5da3393a9d7..fd281a0cfd6 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-placeins.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-placeins.sty @@ -86,6 +86,23 @@ + + + + + + + + + + + + + + + + + \LWR@ProvidesPackageDrop{placeins} \newcommand*{\FloatBarrier}{} @@ -130,6 +147,10 @@ + + + + \endinput %% %% End of file `lwarp-placeins.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-ragged2e.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-ragged2e.sty index 214bd879986..abbd40bb50e 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-ragged2e.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-ragged2e.sty @@ -87,6 +87,23 @@ + + + + + + + + + + + + + + + + + \LWR@ProvidesPackageDrop{ragged2e} \newcommand*{\Centering}{\centering} @@ -151,6 +168,10 @@ + + + + \endinput %% %% End of file `lwarp-ragged2e.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-rotating.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-rotating.sty index 125e8edf648..ca68b65e161 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-rotating.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-rotating.sty @@ -89,6 +89,23 @@ + + + + + + + + + + + + + + + + + \LWR@ProvidesPackageDrop{rotating} \let\sidewaystable\table @@ -141,6 +158,10 @@ + + + + \endinput %% %% End of file `lwarp-rotating.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-setspace.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-setspace.sty index c59497c59a0..06c95c46c77 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-setspace.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-setspace.sty @@ -93,6 +93,23 @@ + + + + + + + + + + + + + + + + + \LWR@ProvidesPackageDrop{setspace} \newcommand*{\setstretch}[1]{} @@ -158,6 +175,10 @@ + + + + \endinput %% %% End of file `lwarp-setspace.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-showidx.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-showidx.sty new file mode 100644 index 00000000000..23c63b7d5c4 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-showidx.sty @@ -0,0 +1,150 @@ +%% +%% This is file `lwarp-showidx.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `idx') +%% 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. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +\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 166d843913e..456ed725291 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-showkeys.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-showkeys.sty @@ -92,6 +92,25 @@ + + + + + + + + + + + + + + + + + + + \LWR@ProvidesPackageDrop{showkeys} \NewDocumentCommand{\showkeys}{s}{} @@ -130,6 +149,8 @@ + + \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 a67c1fcf64f..87d940d6c7c 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-sidecap.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-sidecap.sty @@ -94,6 +94,25 @@ + + + + + + + + + + + + + + + + + + + \LWR@ProvidesPackageDrop{sidecap} \NewDocumentEnvironment{SCtable}{soo} @@ -148,6 +167,8 @@ + + \endinput %% %% End of file `lwarp-sidecap.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-subfig.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-subfig.sty index 14b698c8bad..889c70badaa 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-subfig.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-subfig.sty @@ -95,6 +95,25 @@ + + + + + + + + + + + + + + + + + + + \LWR@ProvidesPackagePass{subfig} \long\def\sf@@@subfloat#1[#2][#3]#4{% @@ -325,6 +344,8 @@ + + \endinput %% %% End of file `lwarp-subfig.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-tabularx.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-tabularx.sty index 8007f93855c..cac5295b5cd 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-tabularx.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-tabularx.sty @@ -98,6 +98,25 @@ + + + + + + + + + + + + + + + + + + + \LWR@ProvidesPackageDrop{tabularx} \newenvironment{tabularx}[2] @@ -136,6 +155,8 @@ + + \endinput %% %% End of file `lwarp-tabularx.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-textpos.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-textpos.sty index edc32546c69..83b94246046 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-textpos.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-textpos.sty @@ -101,6 +101,25 @@ + + + + + + + + + + + + + + + + + + + \LWR@ProvidesPackageDrop{textpos} \NewDocumentEnvironment{textblock}{m r()}{}{} @@ -146,6 +165,8 @@ + + \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 new file mode 100644 index 00000000000..3ab9ad636af --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-theorem.sty @@ -0,0 +1,295 @@ +%% +%% This is file `lwarp-theorem.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `theorem') +%% This is a generated file. +%% Copyright 2016-2017 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +\LWR@ProvidesPackagePass{theorem} + +\newcommand{\LWR@newtheoremstyle}{plain} + +\gdef\theoremstyle#1{% + \@ifundefined{th@#1}{\@warning + {Unknown theoremstyle `#1'. Using `plain'}% + \theorem@style{plain}% + \renewcommand{\LWR@newtheoremstyle}{plain}% new + }% + {% + \theorem@style{#1}% + \renewcommand{\LWR@newtheoremstyle}{#1}% new + }% + \begingroup + \csname th@\the\theorem@style \endcsname + \endgroup} + +\gdef\@xnthm#1#2[#3]{% + \expandafter\@ifdefinable\csname #1\endcsname + {% + \csedef{LWR@thmstyle#1}{\LWR@newtheoremstyle}% new + \@definecounter{#1}\@newctr{#1}[#3]% + \expandafter\xdef\csname the#1\endcsname + {\expandafter \noexpand \csname the#3\endcsname + \@thmcountersep \@thmcounter{#1}}% + \def\@tempa{\global\@namedef{#1}}% + \expandafter \@tempa \expandafter{% + \csname th@\the \theorem@style + \expandafter \endcsname \the \theorem@bodyfont + \@thm{#1}{#2}}% + \global \expandafter \let \csname end#1\endcsname \@endtheorem + \AtBeginEnvironment{#1}{\edef\LWR@thisthmstyle{\csuse{LWR@thmstyle#1}}}% new + }} + +\gdef\@ynthm#1#2{% +\expandafter\@ifdefinable\csname #1\endcsname + { +\csedef{LWR@thmstyle#1}{\LWR@newtheoremstyle}% new +\@definecounter{#1}% + \expandafter\xdef\csname the#1\endcsname{\@thmcounter{#1}}% + \def\@tempa{\global\@namedef{#1}}\expandafter \@tempa + \expandafter{\csname th@\the \theorem@style \expandafter + \endcsname \the\theorem@bodyfont \@thm{#1}{#2}}% + \global \expandafter \let \csname end#1\endcsname \@endtheorem + \AtBeginEnvironment{#1}{\edef\LWR@thisthmstyle{\csuse{LWR@thmstyle#1}}}% new + }} + +\gdef\@othm#1[#2]#3{% + \expandafter\ifx\csname c@#2\endcsname\relax + \@nocounterr{#2}% + \else + \expandafter\@ifdefinable\csname #1\endcsname + { +\csedef{LWR@thmstyle#1}{\LWR@newtheoremstyle}% new +\expandafter \xdef \csname the#1\endcsname + {\expandafter \noexpand \csname the#2\endcsname}% + \def\@tempa{\global\@namedef{#1}}\expandafter \@tempa + \expandafter{\csname th@\the \theorem@style \expandafter + \endcsname \the\theorem@bodyfont \@thm{#2}{#3}}% + \global \expandafter \let \csname end#1\endcsname \@endtheorem + \AtBeginEnvironment{#1}{\edef\LWR@thisthmstyle{\csuse{LWR@thmstyle#1}}}% new +}% + \fi} +\gdef\th@plain{%\normalfont\itshape + \def\@begintheorem##1##2{% +\BlockClass{theorembody\LWR@thisthmstyle}% new + \item[\hskip\labelsep +\InlineClass{theoremheader}{##1\ ##2} +]}% +\def\@opargbegintheorem##1##2##3{% +\BlockClass{theorembody\LWR@thisthmstyle}% new + \item[\hskip\labelsep +\InlineClass{theoremheader}{##1\ ##2\ (##3)} +]} +} + +\gdef\th@break{%\normalfont\slshape + \def\@begintheorem##1##2{% +\BlockClass{theorembody\LWR@thisthmstyle}% new +\item[\hskip \labelsep +\InlineClass{theoremheader}{##1\ ##2}\newline% +]}% +\def\@opargbegintheorem##1##2##3{% +\BlockClass{theorembody\LWR@thisthmstyle}% new + \item[\hskip \labelsep +\InlineClass{theoremheader}{##1\ ##2\ (##3)}\newline +]} +} + +\gdef\th@marginbreak{%\normalfont\slshape + \def\@begintheorem##1##2{ +\BlockClass{theorembody\LWR@thisthmstyle}% new +\item[\hskip\labelsep % +\InlineClass{theoremheader}{##2 \qquad ##1}\newline +]}% +\def\@opargbegintheorem##1##2##3{% +\BlockClass{theorembody\LWR@thisthmstyle}% new +\item[\hskip\labelsep % +\InlineClass{theoremheader}{##2 \qquad ##1\ % +(##3)}\newline +]} +} + +\gdef\th@changebreak{%\normalfont\slshape + \def\@begintheorem##1##2{ +\BlockClass{theorembody\LWR@thisthmstyle}% new +\item[\hskip\labelsep +\InlineClass{theoremheader}{##2\ ##1}\newline +]}% +\def\@opargbegintheorem##1##2##3{% +\BlockClass{theorembody\LWR@thisthmstyle}% new +\item[\hskip\labelsep +\InlineClass{theoremheader}{ ##2\ ##1\ % +(##3)}\newline +]} +} + +\gdef\th@change{%\normalfont\slshape + \def\@begintheorem##1##2{ +\BlockClass{theorembody\LWR@thisthmstyle}% new +\item[\hskip\labelsep +\InlineClass{theoremheader}{##2\ ##1} +]}% +\def\@opargbegintheorem##1##2##3{% +\BlockClass{theorembody\LWR@thisthmstyle}% new +\item[\hskip\labelsep +\InlineClass{theoremheader}{##2\ ##1\ (##3)} +]} +} + +\gdef\th@margin{%\normalfont\slshape + \def\@begintheorem##1##2{ +\BlockClass{theorembody\LWR@thisthmstyle}% new +\item[\hskip\labelsep +\InlineClass{theoremheader}{##2 \qquad ##1} +]}% +\def\@opargbegintheorem##1##2##3{% +\BlockClass{theorembody\LWR@thisthmstyle}% new +\item[\hskip\labelsep +\InlineClass{theoremheader}{##2 \qquad ##1\ (##3)} +]} +} +\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 96f03811e22..0df5bea67e8 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-threeparttable.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-threeparttable.sty @@ -103,6 +103,27 @@ + + + + + + + + + + + + + + + + + + + + + \LWR@ProvidesPackageDrop{threeparttable} \newcommand{\LWR@printtablenote}[1]{\InlineClass{tnoteitemheader}{#1}} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-tikz.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-tikz.sty index 354ce7d6617..0dc8f379a45 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-tikz.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-tikz.sty @@ -103,6 +103,27 @@ + + + + + + + + + + + + + + + + + + + + + \LWR@ProvidesPackagePass{tikz} @@ -111,10 +132,7 @@ \newboolean{LWR@tikzbabel} \@ifpackagelater{tikz}{2013/12/20}% Test for Tikz version v3.0.0 -{ -\usetikzlibrary{babel} -\booltrue{LWR@tikzbabel} -} +{\usetikzlibrary{babel}\booltrue{LWR@tikzbabel}} {\boolfalse{LWR@tikzbabel}} \BeforeBeginEnvironment{tikzpicture}{% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-titleps.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-titleps.sty index eba76342e8b..380ed11add2 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-titleps.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-titleps.sty @@ -108,6 +108,27 @@ + + + + + + + + + + + + + + + + + + + + + \LWR@ProvidesPackageDrop{titleps} \RenewDocumentCommand{\newpagestyle}{m o m}{} \RenewDocumentCommand{\renewpagestyle}{m o m}{} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-titlesec.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-titlesec.sty index 570991c9b4f..951aabd7d12 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-titlesec.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-titlesec.sty @@ -110,6 +110,27 @@ + + + + + + + + + + + + + + + + + + + + + \LWR@ProvidesPackageDrop{titlesec} \newcommand*{\titlelabel}[1]{} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-titletoc.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-titletoc.sty index bb09e79b3ec..396d665f7b4 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-titletoc.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-titletoc.sty @@ -112,6 +112,27 @@ + + + + + + + + + + + + + + + + + + + + + \LWR@ProvidesPackageDrop{titletoc} \NewDocumentCommand{\dottedcontents}{m o m m m}{} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-titling.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-titling.sty index 8c2f5216c99..15c53fc3789 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-titling.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-titling.sty @@ -113,6 +113,27 @@ + + + + + + + + + + + + + + + + + + + + + \LWR@ProvidesPackagePass{titling} \let\LWR@orig@bsmtitlempty\@bsmtitlempty \renewcommand*{\@bsmtitlempty}{% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-tocloft.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-tocloft.sty index 2d97467ad29..dd431f15f6a 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-tocloft.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-tocloft.sty @@ -116,6 +116,27 @@ + + + + + + + + + + + + + + + + + + + + + \LWR@ProvidesPackageDrop{tocloft} \newcommand{\tocloftpagestyle}[1]{} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-trivfloat.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-trivfloat.sty index c1f2e5b74e5..f3e86679300 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-trivfloat.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-trivfloat.sty @@ -118,6 +118,27 @@ + + + + + + + + + + + + + + + + + + + + + \LWR@ProvidesPackageDrop{trivfloat} \LWR@origRequirePackage{trivfloat} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-verse.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-verse.sty index 0b9f468b82d..1ba032f72b0 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-verse.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-verse.sty @@ -118,6 +118,27 @@ + + + + + + + + + + + + + + + + + + + + + \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 dc63e4c3761..dd2f1ddfc71 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-wallpaper.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-wallpaper.sty @@ -120,6 +120,27 @@ + + + + + + + + + + + + + + + + + + + + + \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 1f6c2796026..fa907eca961 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-wrapfig.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-wrapfig.sty @@ -121,6 +121,27 @@ + + + + + + + + + + + + + + + + + + + + + \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 32043419464..68baf3bc3b5 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty @@ -123,13 +123,34 @@ + + + + + + + + + + + + + + + + + + + + + \LWR@ProvidesPackagePass{xcolor} \newcommand*{\LWR@tempcolor}{} \newcommand*{\LWR@currenttextcolor}{black} -\NewDocumentCommand{\LWR@colorstyle}{m m m +m}{% +\NewDocumentCommand{\LWR@colorstyle}{m m m m}{% \convertcolorspec{#2}{#3}{HTML}\LWR@tempcolor% \ifthenelse{\equal{#1}{color:}}% {\renewcommand*{\LWR@currenttextcolor}{\#\LWR@tempcolor}}{}% @@ -143,7 +164,7 @@ -\NewDocumentCommand{\LWR@textcolor}{O{named} m +m}{% +\NewDocumentCommand{\LWR@textcolor}{O{named} m m}{% \begingroup% \LWR@colorstyle{color:}{#1}{#2}{#3}% \endgroup% @@ -159,11 +180,20 @@ \NewDocumentCommand{\LWR@fcolorbox}{O{named} m O{named} m m}{% \begingroup% +\ifthenelse{\equal{#4}{none}}{% no background color +\LWR@colorstyle{border:1px solid }{#1}{#2}{#5}% +}{% yes background color \LWR@colorstyle{border:1px solid }{#1}{#2}% {\LWR@colorstyle{background:}{#3}{#4}{#5}}% +}% \endgroup% } +\let\textcolor\LWR@textcolor +\let\pagecolor\LWR@pagecolor +\let\colorbox\LWR@colorbox +\let\fcolorbox\LWR@fcolorbox + diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-xfrac.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-xfrac.sty index 6da4283cab2..e82dbd0ac6d 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-xfrac.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-xfrac.sty @@ -124,6 +124,27 @@ + + + + + + + + + + + + + + + + + + + + + \LWR@ProvidesPackagePass{xfrac} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp.sty index 438e5652786..99e2bdbb732 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/03/15 v0.24 Allows LaTeX to directly produce HTML5 output.] + [2017/03/22 v0.25 Allows LaTeX to directly produce HTML5 output.] @@ -124,15 +124,25 @@ after lwarp.} {Move \detokenize{\usepackage}{#1} before \detokenize{\usepackage}{lwarp}.} } +\newcommand*{\LWR@loadnever}[2]{% +\PackageError{lwarp} +{Package #1 does not work with lwarp's HTML conversion. +Please use the #2 package instead} +{Package #1 conflicts with lwarp in some way, but package #2 probably will work instead.} +} + \LWR@loadafter{abstract} \LWR@loadafter{afterpage} \LWR@loadafter{algorithmicx} \LWR@loadafter{alltt} +\LWR@loadafter{amsthm} \LWR@loadafter{bookmark} \LWR@loadafter{booktabs} \LWR@loadafter{changepage} \LWR@loadafter{dcolumn} \LWR@loadafter{draftwatermark} +\LWR@loadafter{ellipsis} +\LWR@loadafter{emptypage} \LWR@loadafter{enumerate} \LWR@loadafter{epigraph} \LWR@loadafter{eso-pic} @@ -143,13 +153,12 @@ after lwarp.} \LWR@loadafter{float} \LWR@loadafter{ftnright} \LWR@loadafter{geometry} -\LWR@loadafter{graphics} -\LWR@loadafter{graphicx} \LWR@loadafter{hyperref} \LWR@loadafter{indentfirst} \LWR@loadafter{keyfloat} \LWR@loadafter{layout} \LWR@loadafter{letterspace} +\LWR@loadafter{lips} \LWR@loadafter{listings} \LWR@loadafter{longtable} \LWR@loadafter{lscape} @@ -163,17 +172,20 @@ after lwarp.} \LWR@loadafter{newtxmath} \LWR@loadafter{nextpage} \LWR@loadafter{nowidow} +\LWR@loadafter{ntheorem} \LWR@loadafter{pagenote} \LWR@loadafter{parskip} \LWR@loadafter{placeins} \LWR@loadafter{ragged2e} \LWR@loadafter{rotating} \LWR@loadafter{setspace} +\LWR@loadafter{showidx} \LWR@loadafter{showkeys} \LWR@loadafter{sidecap} \LWR@loadafter{subfig} \LWR@loadafter{tabularx} \LWR@loadafter{textpos} +\LWR@loadafter{theorem} \LWR@loadafter{threeparttable} \LWR@loadafter{tikz} \LWR@loadafter{titleps} @@ -747,10 +759,11 @@ top=1in,bottom=1in,% \newcommand*{\LWR@tagregularparagraph}{p} + \newcommand*{\LWR@htmltagc}[1]{% {% -\LWR@origttfamily% -\LWR@origtextless#1\LWR@origtextgreater% +\protect\LWR@origttfamily% +\protect\LWR@origtextless#1\protect\LWR@origtextgreater% }% } @@ -1609,10 +1622,6 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \let\XeTeX\LWR@XeTeX \let\XeLaTeX\LWR@XeLaTeX \let\ConTeXt\LWR@ConTeXt -\let\textcolor\LWR@textcolor -\let\pagecolor\LWR@pagecolor -\let\colorbox\LWR@colorbox -\let\fcolorbox\LWR@fcolorbox \let\rotatebox\LWR@rotatebox \let\scalebox\LWR@scalebox \let\reflectbox\LWR@reflectbox @@ -2280,18 +2289,15 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \begin{warpHTML} \renewcommand{\@begintheorem}[2]{% -\LWR@htmldivclass{theorem} +\BlockClass{theoremcontents} \InlineClass{theoremlabel}{#1\ #2\ } -\LWR@htmldivclass{theoremcontents} } \renewcommand{\@opargbegintheorem}[3]{% -\BlockClass{theorem} -\InlineClass{theoremlabel}{#1\ #2\ (#3)\ } \BlockClass{theoremcontents} +\InlineClass{theoremlabel}{#1\ #2\ (#3)\ } } \renewcommand*{\@endtheorem}{% \endBlockClass% theoremcontents -\endBlockClass% theorem } \end{warpHTML} @@ -3079,7 +3085,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% }% pars not allowed }% not lateximage } -\newcommand*{\LWR@newlabel}[1]{% +\NewDocumentCommand{\LWR@newlabel}{m o}{% \LWR@traceinfo{LWR@newlabel: !#1!}% \LWR@origlabel{#1}% \LWR@traceinfo{LWR@newlabel: filesectionnames is \ifbool{FileSectionNames}{true}{false}}% @@ -3319,12 +3325,13 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}% \renewcommand*{\addcontentsline}[3]{% \ifthenelse{\equal{#1}{toc}}{}{% +\ifthenelse{\equal{#1}{thm}}{\csdef{ext@#2}{thm}}{} \addtocontents{\@nameuse{ext@#2}}{% \protect\LWRsetnextfloat% {\arabic{LWR@latestautopage}}% {\arabic{LWR@thisfloat}}% -}% -}% +}% addtocontents +}% not toc \LWR@origaddcontentsline{#1}{#2}{#3}% } @@ -4978,6 +4985,27 @@ homehtmlfilename = "\HomeHTMLFileName"% + + + + + + + + + + + + + + + + + + + + + \endinput %% %% End of file `lwarp.sty'. |