diff options
author | Karl Berry <karl@freefriends.org> | 2017-09-05 21:57:29 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2017-09-05 21:57:29 +0000 |
commit | 39b632f4114d433ae2c9b49a177ce30c519b46f3 (patch) | |
tree | cf93e6ff41dabbdcf83f04dddaa8a314a3b14bde /Master/texmf-dist/tex/latex/lwarp | |
parent | a62f77790bf4d66905f22ad01203d3b08301f6e5 (diff) |
lwarp (5sep17)
git-svn-id: svn://tug.org/texlive/trunk@45224 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/lwarp')
29 files changed, 929 insertions, 364 deletions
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-a4.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-a4.sty new file mode 100644 index 00000000000..1fdee8e575e --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-a4.sty @@ -0,0 +1,23 @@ +%% +%% This is file `lwarp-a4.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `a4') +%% 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{a4} +\newcommand*{\WideMargins}{} + +\endinput +%% +%% End of file `lwarp-a4.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-a4wide.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-a4wide.sty new file mode 100644 index 00000000000..4c3785e4d3e --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-a4wide.sty @@ -0,0 +1,22 @@ +%% +%% This is file `lwarp-a4wide.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `a4wide') +%% 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{a4wide} + +\endinput +%% +%% End of file `lwarp-a4wide.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-a5comb.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-a5comb.sty new file mode 100644 index 00000000000..f16b5db869d --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-a5comb.sty @@ -0,0 +1,22 @@ +%% +%% This is file `lwarp-a5comb.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `a5comb') +%% 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{a5comb} + +\endinput +%% +%% End of file `lwarp-a5comb.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-addlines.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-addlines.sty new file mode 100644 index 00000000000..3f9e941976c --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-addlines.sty @@ -0,0 +1,26 @@ +%% +%% This is file `lwarp-addlines.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `addlines') +%% 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{addlines} +\newcommand*\addlines[1][1]{} +\let\addline\addlines +\newcommand*\removelines[1][1]{} +\let\removeline\removelines + +\endinput +%% +%% End of file `lwarp-addlines.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-anysize.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-anysize.sty new file mode 100644 index 00000000000..75d0c99caba --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-anysize.sty @@ -0,0 +1,24 @@ +%% +%% This is file `lwarp-anysize.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `anysize') +%% 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{anysize} +\def\papersize#1#2{} +\def\marginsize#1#2#3#4{} + +\endinput +%% +%% End of file `lwarp-anysize.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-appendix.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-appendix.sty index e5b11926077..f736ee929d2 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-appendix.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-appendix.sty @@ -15,9 +15,7 @@ %% http://www.latex-project.org/lppl.txt %% and version 1.3 or later is part of all distributions of LaTeX %% version 2005/12/01 or later. - \LWR@ProvidesPackagePass{appendix} - \renewcommand*{\@chap@pppage}{% \part*{\appendixpagename} \if@dotoc@pp @@ -32,8 +30,6 @@ \fi } - - \endinput %% %% End of file `lwarp-appendix.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-authblk.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-authblk.sty new file mode 100644 index 00000000000..9a0ad9cd259 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-authblk.sty @@ -0,0 +1,34 @@ +%% +%% This is file `lwarp-authblk.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `authblk') +%% 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. +\@ifpackageloaded{titling}{ +\PackageError{lwarp-authblk} +{Package authblk must be loaded before titling} +{Titling appends authblk's author macro, so authblk must be loaded first.} +} +{} +\LWR@ProvidesPackagePass{authblk} +\LetLtxMacro\LWRAB@affil\affil + +\renewcommand{\affil}[2][]{% +\LWRAB@affil[#1]{\protect\InlineClass{affiliation}{#2}} +} +\renewcommand*{\authorcr}{\protect\LWR@newlinebr} + +\endinput +%% +%% End of file `lwarp-authblk.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-bigdelim.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-bigdelim.sty new file mode 100644 index 00000000000..478302ce1e6 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-bigdelim.sty @@ -0,0 +1,37 @@ +%% +%% This is file `lwarp-bigdelim.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `bigdelim') +%% 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{bigdelim} +\LetLtxMacro\LWR@origldelim\ldelim +\LetLtxMacro\LWR@origrdelim\rdelim +\RenewDocumentCommand{\ldelim}{m m m O{}}{% +\renewcommand{\LWR@multirowborder}{right}% +\multirow{#2}{#3}{#4 \InlineClass{ldelim}{#1}}% +} + +\RenewDocumentCommand{\rdelim}{m m m O{}}{% +\renewcommand{\LWR@multirowborder}{left}% +\multirow{#2}{#3}{\InlineClass{rdelim}{#1} #4}% +} +\appto{\LWR@restoreorigformatting}{% +\LetLtxMacro{\ldelim}{\LWR@origldelim}% +\LetLtxMacro{\rdelim}{\LWR@origrdelim}% +} + +\endinput +%% +%% End of file `lwarp-bigdelim.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-bigstrut.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-bigstrut.sty new file mode 100644 index 00000000000..0e306882965 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-bigstrut.sty @@ -0,0 +1,29 @@ +%% +%% This is file `lwarp-bigstrut.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `bigstrut') +%% 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{bigstrut} +\LetLtxMacro\LWR@origbigstrut\bigstrut + +\renewcommand\bigstrut[1][x]{} + +\appto{\LWR@restoreorigformatting}{% +\LetLtxMacro{\bigstrut}{\LWR@origbigstrut}% +} + +\endinput +%% +%% End of file `lwarp-bigstrut.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-bookmark.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-bookmark.sty index b0a7733a568..a8ef86cfa92 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-bookmark.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-bookmark.sty @@ -19,7 +19,6 @@ \LWR@ProvidesPackageDrop{bookmark} - \newcommand*{\bookmarksetup}[1]{} \newcommand*{\bookmarksetupnext}[1]{} \newcommand*{\bookmark}[2][]{} @@ -27,7 +26,6 @@ \newcommand*{\bookmarkget}[1]{} \newcommand{\BookmarkAtEnd}[1]{} - \endinput %% %% End of file `lwarp-bookmark.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-booktabs.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-booktabs.sty index 52db9e80c70..5f1bf1940f6 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-booktabs.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-booktabs.sty @@ -15,8 +15,6 @@ %% http://www.latex-project.org/lppl.txt %% and version 1.3 or later is part of all distributions of LaTeX %% version 2005/12/01 or later. - - \LWR@ProvidesPackagePass{booktabs} \LetLtxMacro\LWR@origtoprule\toprule \LetLtxMacro\LWR@origmidrule\midrule @@ -26,7 +24,6 @@ \LetLtxMacro\LWR@origmorecmidrules\morecmidrules \LetLtxMacro\LWR@origspecialrule\specialrule - \endinput %% %% End of file `lwarp-booktabs.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-chngpage.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-chngpage.sty new file mode 100644 index 00000000000..5e86fcce90b --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-chngpage.sty @@ -0,0 +1,22 @@ +%% +%% This is file `lwarp-chngpage.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `chngpage') +%% 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{chngpage}{changepage} + +\endinput +%% +%% End of file `lwarp-chngpage.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-ebook.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-ebook.sty new file mode 100644 index 00000000000..11cfd9ae8f1 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-ebook.sty @@ -0,0 +1,31 @@ +%% +%% This is file `lwarp-ebook.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `ebook') +%% 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{ebook} +\setcounter{secnumdepth}{0} +\setcounter{tocdepth}{2} + +\providecommand{\pagefill}[1][0.001mm]{\noindent} + +\providecommand{\ebook}{ +\setcounter{secnumdepth}{0} +\setcounter{tocdepth}{2} +} + +\endinput +%% +%% End of file `lwarp-ebook.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-epigraph.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-epigraph.sty index daaf4d54057..aad18d31908 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-epigraph.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-epigraph.sty @@ -56,7 +56,6 @@ \newcommand*{\undodrop}{} \newcommand{\cleartoevenpage}[1][]{} - \endinput %% %% End of file `lwarp-epigraph.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-eso-pic.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-eso-pic.sty index 68f5c330dfd..aa28b1dd489 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-eso-pic.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-eso-pic.sty @@ -18,7 +18,6 @@ - \LWR@ProvidesPackageDrop{eso-pic} \newcommand*{\LenToUnit}{} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-fullwidth.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-fullwidth.sty new file mode 100644 index 00000000000..3cdb22928d2 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-fullwidth.sty @@ -0,0 +1,29 @@ +%% +%% This is file `lwarp-fullwidth.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `fullwidth') +%% 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{fullwidth} +\newenvironment*{fullwidth}[1][]{% +\minipagefullwidth% +\minipage{\linewidth}% +} +{% +\endminipage% +} + +\endinput +%% +%% End of file `lwarp-fullwidth.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-lettrine.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-lettrine.sty index b5ea89ea622..ed0cbcbee95 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-lettrine.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-lettrine.sty @@ -40,9 +40,7 @@ \newif\ifLettrineRealHeight \newcommand*{\LettrineTextFont}{\scshape} - \newcommand*{\LettrineFontHook}{} - \newcommand*{\LettrineFont}[1]{\InlineClass{lettrine}{#1}} \newcommand*{\LettrineFontEPS}[1]{\includegraphics[height=1.5ex]{#1}} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-multirow.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-multirow.sty index f5bdf090c19..15c7bc93b4a 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-multirow.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-multirow.sty @@ -17,9 +17,44 @@ %% version 2005/12/01 or later. - -\LWR@ProvidesPackageDrop{multirow} - +\LWR@ProvidesPackagePass{multirow} +\LetLtxMacro\LWR@origmultirow\multirow +\newcommand{\LWR@multirowborder}{} +\RenewDocumentCommand{\multirow}{O{c} m o m o +m}% +{% +\LWR@traceinfo{*** multirow #1 #2 #4} +\LWR@maybenewtablerow% +\LWR@htmltag{td rowspan="#2" % +\IfValueT{#1}{% +\ifstrequal{#1}{b}{style="vertical-align:bottom" }{}% +\ifstrequal{#1}{t}{style="vertical-align:top" }{}% +}% +\ifdefvoid{\LWR@multirowborder}{}{% +style="border-\LWR@multirowborder: 2px solid black" % +} +class="td% +\StrChar{\LWR@tablecolspec}{\theLWR@tablecolspos}% +\ifthenelse{\equal{\LWR@getexparray{LWR@midrules}{\theLWR@tablecolspos}}{Y}}{rule}{}% +"{}} +\begingroup \LetLtxMacro{\\}{\LWR@endofline} #6 \endgroup +\LWR@stoppars% +\global\boolfalse{LWR@intabularmetadata}% +\renewcommand{\LWR@multirowborder}{}% +\LWR@traceinfo{*** multirow done}% +}% +\RenewDocumentCommand{\multicolumnrow}{m m O{} m O{} m O{} +m}{% +\LWR@tabularhtmlcolumns{\theLWR@tablecolspos}{#1} +\begingroup\LetLtxMacro{\\}{\LWR@endofline}% +\LWR@domulticolumn[#3][#4]{\theLWR@tabhtmlcoltotal}{#2}{#8}% +\endgroup% +\addtocounter{LWR@tablecolspos}{#1}% +\addtocounter{LWR@tablecolspos}{-1}% +\booltrue{LWR@skipatbang}% +} +\appto{\LWR@restoreorigformatting}{% +\LetLtxMacro\multirow\LWR@origmultirow% +\renewcommand{\multicolumnrow}{\LWR@origmulticolumnrow}% +} \endinput %% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-relsize.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-relsize.sty index d268bea0edb..65f129dd11b 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-relsize.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-relsize.sty @@ -25,7 +25,7 @@ \LetLtxMacro\LWR@origtextsmaller\textsmaller \let\LWR@textscale\textscale -\renewcommand*{\LWR@restoreorigrelsize}{% +\appto{\LWR@restoreorigformatting}{% \let\relsize\LWR@origrelsize% \LetLtxMacro\larger\LWR@origlarger% \LetLtxMacro\smaller\LWR@origsmaller% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-supertabular.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-supertabular.sty new file mode 100644 index 00000000000..16349be9ddd --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-supertabular.sty @@ -0,0 +1,76 @@ +%% +%% This is file `lwarp-supertabular.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `supertabular') +%% 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{supertabular} +\newcommand{\LWRST@firsthead}{} + +\newcommand{\tablefirsthead}[1]{% + \long\gdef\LWRST@firsthead{#1}% +} + +\newcommand{\tablehead}[1]{} +\newcommand{\tabletail}[1]{} + +\newcommand{\LWRST@lasttail}{} + +\newcommand{\tablelasttail}[1]{% + \long\gdef\LWRST@lasttail{#1}% +} + +\newcommand{\tablecaption}[2][]{% + \long\gdef\LWRST@caption{\caption[#1]{#2}}% +} + +\let\topcaption\tablecaption +\let\bottomcaption\tablecaption + +\global\let\LWRST@caption\relax + +\newcommand*{\shrinkheight}[1]{} + +\NewDocumentEnvironment{supertabular}{s o m} +{ +\LWR@traceinfo{supertabular} +\table +\LWRST@caption +\begin{tabular}{#3} +\TabularMacro\ifdefvoid{\LWRST@firsthead}% +{\LWR@getmynexttoken}% +{\expandafter\LWR@getmynexttoken\LWRST@firsthead}% +} +{% +\ifdefvoid{\LWRST@lasttail}% +{}% +{% +\TabularMacro\ResumeTabular% +\LWRST@lasttail% +}% +\end{tabular} +\endtable +\LWR@traceinfo{supertabular done} +} + +\NewDocumentEnvironment{mpsupertabular}{s o m} +{\minipage{\linewidth}\supertabular{#3}} +{\endsupertabular\endminipage} + + +\endinput +%% +%% End of file `lwarp-supertabular.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-textarea.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-textarea.sty new file mode 100644 index 00000000000..6b7ffb4bdbe --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-textarea.sty @@ -0,0 +1,27 @@ +%% +%% This is file `lwarp-textarea.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `textarea') +%% 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{textarea} +\newcommand\StartFromTextArea{} +\newcommand\StartFromHeaderArea{} +\newcommand*\RestoreTextArea{} +\newcommand*\ExpandTextArea[1][*]{} +\let\NCC@restoretextarea\@empty + +\endinput +%% +%% End of file `lwarp-textarea.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-textcomp.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-textcomp.sty index b858e141ee8..e25de7f94a5 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-textcomp.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-textcomp.sty @@ -62,9 +62,7 @@ \renewcommand*{\textcircled}[1]{% \InlineClass[border: 1px solid \LWR@currenttextcolor]{textcircled}{#1}% } -\let\LWR@restoreorigtextcomp\relax - -\newcommand*{\LWR@restoreorigtextcomp}{% +\appto{\LWR@restoreorigformatting}{% \let\textdegree\LWR@origtextdegree% \let\textcelsius\LWR@origtextcelsius% \let\textohm\LWR@origtextohm% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-titlesec.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-titlesec.sty index 0992011348d..de999d7cd94 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-titlesec.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-titlesec.sty @@ -51,9 +51,7 @@ \newcommand*{\ttl@row}[2][]{} \newcommand{\iftitlemeasuring}[2]{#2} - \newcommand{\assignpagestyle}[2]{#2} - \NewDocumentCommand{\titleclass}{m o m o} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-titling.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-titling.sty index 2237dba15aa..18e14d45c9e 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-titling.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-titling.sty @@ -22,21 +22,93 @@ \let\LWR@orig@bsmtitlempty\@bsmtitlempty \renewcommand*{\@bsmtitlempty}{% \LWR@orig@bsmtitlempty% -\global\let\published\relax% -\global\let\subtitle\relax% } \let\LWR@origkeepthetitle\keepthetitle \renewcommand*{\keepthetitle}{% \LWR@orig@keepthetitle% -\global\let\@published\@empty% -\global\let\@subtitle\@empty% } \let\LWR@origkilltitle\killtitle \renewcommand*{\killtitle}{% \LWR@orig@killtitle% -\global\let\thepublished\relax% -\global\let\thesubtitle\relax% } +\renewenvironment*{titlingpage} +{% +\LWR@printpendingfootnotes +\begin{titlepage} +\LWR@maketitlesetup +\let\maketitle\LWR@titlingmaketitle +} +{ +\end{titlepage} +} + +\pretitle{} +\posttitle{} + +\preauthor{} +\postauthor{} + +\predate{} +\postdate{} +\renewcommand*{\LWR@maketitlesetup}{% +\def\@makefnmark{\textsuperscript{\@thefnmark}} +\long\def\@makefntext##1{% +\makethanksmark \LWR@orighspace{1in} +##1% +}% +} +\renewcommand*{\maketitle}{% +\begin{titlepage} +\@bsmarkseries +\LWR@maketitlesetup +\@maketitle +\@thanks +\end{titlepage} +\@bscontmark +} +\DeclareDocumentCommand{\@maketitle}{}{% + \maketitlehooka + { + \LWR@stoppars\LWR@htmltag{h1} + \@bspretitle \@title \@bsposttitle + \LWR@htmltag{/h1}\LWR@startpars + } + \maketitlehookb + { + \begin{BlockClass}{author} + \renewcommand{\and}{ + \end{BlockClass} + \begin{BlockClass}{oneauthor} + } + \begin{BlockClass}{oneauthor} + \@bspreauthor \@author \@bspostauthor + \end{BlockClass} + \end{BlockClass} + } + \maketitlehookc + { + \begin{BlockClass}{titledate} + \@bspredate \@date \@bspostdate + \end{BlockClass} + } + \maketitlehookd +} +\renewcommand*{\LWR@titlingmaketitle}{% +\@thanks +\@bsmarkseries +\LWR@maketitlesetup +\@maketitle +\@thanks +\@bscontmark +} +\renewcommand{\thanksmarkseries}[1]{% +\def\@bsmarkseries{\renewcommand{\thefootnote}{\@nameuse{#1}{footnote}}}% +} +\if@titlepage + \thanksmarkseries{arabic} +\else + \thanksmarkseries{fnsymbol} +\fi \endinput %% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-typearea.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-typearea.sty new file mode 100644 index 00000000000..c4a81e065f0 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-typearea.sty @@ -0,0 +1,26 @@ +%% +%% This is file `lwarp-typearea.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `typearea') +%% 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{typearea} +\newcommand*\typearea[2][\z@]{} +\newcommand*{\recalctypearea}{} +\@ifundefined{footheight}{\newlength\footheight}{} +\newcommand*\areaset[3][\z@]{} +\endinput +%% +%% End of file `lwarp-typearea.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty index 260274c55f6..25cf80d7a8f 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty @@ -30,8 +30,7 @@ \LetLtxMacro\LWRorigprint@fcolorbox\fcolorbox \LetLtxMacro\LWRorigprint@fcolorboxBlock\fcolorbox \LetLtxMacro\LWRorigprint@boxframe\boxframe -\renewcommand*{\LWR@restoreorigxcolor}{% -\LWR@traceinfo{LWR@restoreorigxcolorformatting}% +\appto{\LWR@restoreorigformatting}{% \LetLtxMacro\textcolor\LWRprint@textcolor% \LetLtxMacro\pagecolor\LWRprint@pagecolor% \LetLtxMacro\nopagecolor\LWRprint@nopagecolor% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-xtab.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-xtab.sty new file mode 100644 index 00000000000..6798e112027 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-xtab.sty @@ -0,0 +1,83 @@ +%% +%% This is file `lwarp-xtab.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `xtab') +%% 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{xtab} +\newcommand{\LWRXT@firsthead}{} + +\newcommand{\tablefirsthead}[1]{% + \long\gdef\LWRXT@firsthead{#1}% +} + +\newcommand{\tablehead}[1]{} + +\newcommand{\tablelasthead}[1]{} + +\newcommand{\notablelasthead}{} + +\newcommand{\tabletail}[1]{} + +\newcommand{\LWRXT@lasttail}{} + +\newcommand{\tablelasttail}[1]{% + \long\gdef\LWRXT@lasttail{#1}% +} + +\newcommand{\tablecaption}[2][]{% + \long\gdef\LWRXT@caption{\caption[#1]{#2}}% +} + +\let\topcaption\tablecaption +\let\bottomcaption\tablecaption + +\global\let\LWRXT@caption\relax + +\newcommand*{\shrinkheight}[1]{} + +\newcommand*{\xentrystretch}[1]{} + +\NewDocumentEnvironment{xtabular}{s o m} +{ +\LWR@traceinfo{xtabular} +\table +\LWRXT@caption +\begin{tabular}{#3} +\TabularMacro\ifdefvoid{\LWRXT@firsthead}% +{\LWR@getmynexttoken}% +{\expandafter\LWR@getmynexttoken\LWRXT@firsthead}% +} +{% +\ifdefvoid{\LWRXT@lasttail}% +{}% +{% +\TabularMacro\ResumeTabular% +\LWRXT@lasttail% +}% +\end{tabular} +\endtable +\LWR@traceinfo{xtabular done} +} + +\NewDocumentEnvironment{mpxtabular}{s o m} +{\minipage{\linewidth}\xtabular{#3}} +{\endxtabular\endminipage} + +\endinput +%% +%% End of file `lwarp-xtab.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-zwpagelayout.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-zwpagelayout.sty new file mode 100644 index 00000000000..7bb7b849e4a --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-zwpagelayout.sty @@ -0,0 +1,74 @@ +%% +%% This is file `lwarp-zwpagelayout.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `zwpagelayout') +%% 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{zwpagelayout} +\def\noBboxes{} +\@onlypreamble\noBboxes + +\expandafter\ifx\csname definecolor\endcsname\relax \else + \definecolor{cmykblack}{cmyk}{0,0,0,1} + \definecolor{grblack}{gray}{0} + \definecolor{cmykred}{cmyk}{0,1,1,0} + \definecolor{cmykgreen}{cmyk}{1,0,1,0} + \definecolor{cmykblue}{cmyk}{1,1,0,0} + \definecolor{rgbred}{rgb}{1,0,0} + \definecolor{rgbgreen}{rgb}{0,1,0} + \definecolor{rgbblue}{rgb}{0,0,1} +\fi + +\let\OverprintXeTeXExtGState\relax + +\DeclareRobustCommand\SetOverprint{\ignorespaces} +\DeclareRobustCommand\SetKnockout{\ignorespaces} +\DeclareRobustCommand\textoverprint[1]{{\SetOverprint#1}} +\DeclareRobustCommand\textknockout[1]{{\SetKnockout#1}} + +\def\SetPDFminorversion#1{} +\@onlypreamble\SetPDFminorversion + +\newcommand*\Vcorr{} + +\DeclareRobustCommand\vb[1][]{} +\NewDocumentCommand{\NewOddPage}{* o}{} +\NewDocumentCommand{\NewEvenPage}{* o}{} +\def\SetOddPageMessage#{\gdef\ZW@oddwarning} +\def\SetEvenPageMessage#{\gdef\Z@@evenwarning} +\def\ZW@oddwarning{Empty page inserted}\let\ZW@evenwarning\ZW@oddwarning + +\def\clap#1{#1} + +\def\CropFlap{2in} +\def\CropSpine{1in} +\def\CropXSpine{1in} +\def\CropXtrim{.25in} +\def\CropYtrim{.25in} +\def\UserWidth{5in} +\def\UserLeftMargin{1in} +\def\UserRightMargin{1in} +\def\UserTopMargin{1in} +\def\UserBotMargin{1in} +\def\thePageNumber{\#\,\arabic{page}} +\ifXeTeX +\def\ifcaseZWdriver{\ifcase2} +\else +\def\ifcaseZWdriver{\ifcase1} +\fi +\DeclareRobustCommand\ZWifdriver[2]{} +\endinput +%% +%% End of file `lwarp-zwpagelayout.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp.sty index 124f1e70a7d..33c49ac4737 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/08/27 v0.38 Allows LaTeX to directly produce HTML5 output.] + [2017/09/05 v0.39 Allows LaTeX to directly produce HTML5 output.] @@ -196,27 +196,37 @@ or is superceded by another package. For a possible alternative, see package(s) #2.} } +\LWR@loadafter{a4} +\LWR@loadafter{a4wide} +\LWR@loadafter{a5comb} \LWR@loadafter{abstract} +\LWR@loadafter{addlines} \LWR@loadafter{afterpage} \LWR@loadafter{algorithmicx} \LWR@loadafter{alltt} \LWR@loadafter{amsthm} +\LWR@loadafter{anysize} \LWR@loadafter{appendix} \LWR@loadafter{arabicfront} \LWR@loadafter{array} +\LWR@loadafter{authblk} \LWR@loadafter{balance} +\LWR@loadafter{bigdelim} +\LWR@loadafter{bigstrut} \LWR@loadafter{bookmark} \LWR@loadafter{booktabs} \LWR@loadafter{boxedminipage} \LWR@loadafter{boxedminipage2e} \LWR@loadafter{ccaption} \LWR@loadafter{changepage} +\LWR@loadafter{chngpage} \LWR@loadafter{chappg} \LWR@loadafter{color} \LWR@loadafter{crop} \LWR@loadafter{cutwin} \LWR@loadafter{dcolumn} \LWR@loadafter{draftwatermark} +\LWR@loadafter{ebook} \LWR@loadafter{ellipsis} \LWR@loadafter{emptypage} \LWR@loadafter{enumerate} @@ -239,6 +249,7 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{fncychap} \LWR@loadafter{ftnright} \LWR@loadafter{fullpage} +\LWR@loadafter{fullwidth} \LWR@loadafter{geometry} \LWR@loadafter{glossaries} \LWR@loadafter{grffile} @@ -297,8 +308,10 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{siunitx} \LWR@loadafter{soul} \LWR@loadafter{subfig} +\LWR@loadafter{supertabular} \LWR@loadafter{tabularx} \LWR@loadafter{tabulary} +\LWR@loadafter{textarea} \LWR@loadafter{textpos} \LWR@loadafter{theorem} \LWR@loadafter{threeparttable} @@ -306,10 +319,12 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{titleps} \LWR@loadafter{titlesec} \LWR@loadafter{titletoc} +\LWR@loadafter{titling} \LWR@loadafter{tocbibind} \LWR@loadafter{tocloft} \LWR@loadafter{transparent} \LWR@loadafter{trivfloat} +\LWR@loadafter{typearea} \LWR@loadafter{ulem} \LWR@loadafter{upref} \LWR@loadafter{varioref} @@ -320,6 +335,8 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{xfrac} \LWR@loadafter{xltxtra} \LWR@loadafter{xmpincl} +\LWR@loadafter{xtab} +\LWR@loadafter{zwpagelayout} @@ -374,6 +391,8 @@ top=1in,bottom=1in,% \RequirePackage{xparse} +\RequirePackage{afterpackage} + \end{warpall} \begin{warpHTML} @@ -425,8 +444,6 @@ top=1in,bottom=1in,% \begin{warpall} -\RequirePackage{titling} - \RequirePackage{environ} \end{warpall} @@ -697,17 +714,6 @@ top=1in,bottom=1in,% \end{warpHTML} \begin{warpHTML} -\@ifpackageloaded{textcomp} -{ -\LWR@origRequirePackage{lwarp-textcomp} -} -{ -\providecommand*{\LWR@restoreorigtextcomp}{}% -} - -\end{warpHTML} - -\begin{warpHTML} \AtBeginDocument{ \LetLtxMacro{\LWR@origt}{\t} \ifPDFTeX @@ -1238,6 +1244,7 @@ div.abstract { padding: 1ex 1em 1ex 1em ; /* font-weight: bold ; */ font-size: 90% ; + text-align: left ; } div.abstract dl {line-height:1.5;} @@ -1531,6 +1538,8 @@ figure.subfigure, figure.subtable { figcaption .minipage { margin:0 ; padding: 0 } +div.minipage figure { border: none ; box-shadow: none ; } + div.floatrow { text-align: center; } div.floatrow figure { display: inline-block ; margin: 1ex 2% ; } @@ -1639,6 +1648,9 @@ td.tdb , td.tdbrule , td.tdB , td.tdBrule .tnoteitemheader {margin-right: 1em;} +/* for bigdelim */ +.ldelim, .rdelim { font-size: 200% } + /* center, flushleft, flushright environments */ div.center{text-align:center;} div.center table {margin-left:auto;margin-right:auto;} @@ -1695,12 +1707,19 @@ div.author margin: 3ex 0em 3ex 0em ; } +div.oneauthor { + display: inline-block ; + margin: 3ex 1em 0ex 1em ; +} + +/* div.author table { margin: 3ex auto 0ex auto ; background: none ; } div.author table tbody tr td { padding: .25ex ; } +*/ span.affiliation {font-size: .85em ; font-variant: small-caps; } @@ -2145,12 +2164,18 @@ div.sidebartitle{ text-shadow: 1px 1px 2px #808080; } -.minipage { +div.minipage { background-color: #eeeee7 ; border: 1px solid silver ; border-radius: 1ex ; } +section.textbody > div.minipage { + box-shadow: 3px 3px 3px #808080 ; +} + +div.fboxBlock div.minipage { box-shadow: none ; } + .framed .minipage , .framedleftbar .minipage { border: none ; background: none ; @@ -2575,7 +2600,7 @@ src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.1/MathJax.js?config=TeX- -- Print the usage of the lwarpmk command: -printversion = "v0.38" +printversion = "v0.39" function printhelp () print ("lwarpmk: Use lwarpmk -h or lwarpmk --help for help.") ; @@ -3925,6 +3950,12 @@ end -- not --version \protected@edef\@currentlabel {\csname p@mpfootnote\endcsname\@thefnmark}% \color@begingroup + \ifthenelse{% + \boolean{LWR@doingstartpars} \AND% + \cnttest{\value{LWR@lateximagedepth}}{=}{0}% + }% + {}% + {\LWR@htmltagc{\LWR@tagregularparagraph}}% \@makefntext{% \ignorespaces#1% }% @@ -4487,11 +4518,6 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \LWR@htmltag{section class="textbody"{}} \mainmatter \LWR@origpagenumbering{arabic} -\if@titlepage - \thanksmarkseries{arabic} -\else - \thanksmarkseries{fnsymbol} -\fi \LWR@patchlists \catcode`\$=\active \LWR@startpars @@ -4541,138 +4567,40 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \end{warpHTML} - -\begin{warpHTML} -\newrobustcmd{\affiliation}[1]{\\ \InlineClass{affiliation}{#1}} -\end{warpHTML} -\begin{warpprint} -\newrobustcmd{\affiliation}[1]{\\ \textsc{\small#1}} -\end{warpprint} \begin{warpall} -\renewcommand{\author}[1]{% -\gdef\@author{#1} -\begingroup - \renewcommand{\thanks}[1]{} - \renewcommand{\and}{\unskip, } - \renewcommand{\thanksmark}[1]{} - \renewcommand{\thanksgap}[1]{} - \renewcommand{\affiliation}[1]{} - \protected@xdef\theauthor{#1} -\endgroup} -\newcommand{\published}[1]{% -\gdef\@published{#1} -\begingroup - \renewcommand{\thanks}[1]{} - \renewcommand{\thanksmark}[1]{} - \renewcommand{\thanksgap}[1]{} - \protected@xdef\thepublished{#1} -\endgroup +\newrobustcmd{\affiliation}[1]{} +\end{warpall} +\begin{warpprint} +\AtBeginEnvironment{titlepage}{ +\renewrobustcmd{\affiliation}[1]{\\ \textsc{\small#1}} } -\newcommand{\@published}{} -\newcommand{\thepublished}{} -\newcommand{\subtitle}[1]{% -\gdef\@subtitle{#1} -\begingroup - \renewcommand{\thanks}[1]{} - \renewcommand{\thanksmark}[1]{} - \renewcommand{\thanksgap}[1]{} - \protected@xdef\thesubtitle{#1} -\endgroup + +\AtBeginDocument{ +\@ifpackageloaded{titling}{ +\AtBeginEnvironment{titlingpage}{ +\renewrobustcmd{\affiliation}[1]{\\ \textsc{\small#1}} } -\newcommand{\@subtitle}{} -\newcommand{\thesubtitle}{} -\end{warpall} +}{}% titling loaded +}% AtBeginDocument +\end{warpprint} \begin{warpHTML} \renewenvironment*{titlepage} { +\renewrobustcmd{\affiliation}[1]{\\ \InlineClass{affiliation}{##1}} +\LWR@printpendingfootnotes \LWR@forcenewpage -\BlockClass{titlepage}\LWR@subminipage -} -{\LWR@endsubminipage\endBlockClass} -\renewenvironment*{titlingpage} -{% -\begin{titlepage} -\LWR@maketitlesetup -\let\maketitle\LWR@titlingmaketitle +\BlockClass{titlepage} } { -\end{titlepage} -\@bscontmark +\endBlockClass +\LWR@printpendingfootnotes } \end{warpHTML} - \begin{warpall} \newcommand*{\printthanks}{\@thanks} -\AtEndEnvironment{titlingpage}{\@bscontmark} \end{warpall} \begin{warpHTML} -\newcommand{\prepublished}[1]{% -\def\@bsprepublished{\BlockClass{published}#1}% -} - -\newcommand{\postpublished}[1]{% -\def\@bspostpublished{#1\endBlockClass}% -} - -\renewcommand{\pretitle}[1]{% -\def\@bspretitle{#1\LWR@stoppars\LWR@htmltag{h1}}% -} - -\renewcommand{\posttitle}[1]{% -\def\@bsposttitle{\LWR@htmltag{/h1}\LWR@startpars#1}% -} - -\newcommand{\presubtitle}[1]{% -\def\@bspresubtitle{\BlockClass{subtitle}#1}% -} - -\newcommand{\postsubtitle}[1]{% -\def\@bspostsubtitle{#1\endBlockClass}% -} - -\renewcommand{\preauthor}[1]{% -\def\@bspreauthor{\BlockClass{author}#1}% -} - -\renewcommand{\postauthor}[1]{% -\def\@bspostauthor{#1\endBlockClass}% -} - -\renewcommand{\predate}[1]{% -\def\@bspredate{#1\BlockClass{titledate}}% -} - -\renewcommand{\postdate}[1]{% -\def\@bspostdate{\endBlockClass#1}% -} - -\prepublished{\begin{center}} -\postpublished{\par\end{center}} - -\pretitle{\begin{center}} -\posttitle{\par\end{center}} - -\presubtitle{\begin{center}} -\postsubtitle{\par\end{center}} - -\preauthor{\begin{center}% -\begin{tabular}[t]{c}% -} -\postauthor{\end{tabular}\par\end{center}} - -\predate{\begin{center}} -\postdate{\par\end{center}} -\newcommand*{\printpublished}{ -\ifthenelse{\equal{\thepublished}{}} -{} -{ - \begin{BlockClass}{published} - \@published - \end{BlockClass} -} -} - \newcommand*{\printtitle} { \LWR@stoppars @@ -4690,19 +4618,15 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \LWR@startpars } -\newcommand*{\printsubtitle}{ -\ifthenelse{\equal{\thesubtitle}{}} -{} -{ - \begin{BlockClass}{subtitle} - \@subtitle - \end{BlockClass} -} -} - \newcommand*{\printauthor}{ \begin{BlockClass}{author} -\begin{tabular}{c}\@author\end{tabular} +\renewcommand{\and}{% +\end{BlockClass} +\begin{BlockClass}{oneauthor} +} +\begin{BlockClass}{oneauthor} +\@author +\end{BlockClass} \end{BlockClass} } @@ -4716,136 +4640,29 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \begin{warpprint} -\newcommand*{\printpublished}{{\Large\scshape\@published}} \newcommand*{\printtitle}{{\Huge\@title}} -\newcommand*{\printsubtitle}{{\Large\itshape\@subtitle\bigskip}} - \newcommand*{\printauthor} {{\large\begin{tabular}[t]{c}\@author\end{tabular}}} \newcommand*{\printdate}{{\small\textit{\@date}}} -\providecommand{\maketitle}{} +\end{warpprint} +\begin{warpHTML} \if@titlepage - \renewcommand{\maketitle}{\begin{titlepage}% - \let\footnotesize\small - \let\footnoterule\relax - \LetLtxMacro{\footnote}{\thanks} - \@bsmarkseries - \def\@makefnmark{\rlap{\@textsuperscript{% - \normalfont\@bsthanksheadpre \tamark \@bsthanksheadpost}}}% - \long\def\@makefntext##1{\makethanksmark ##1} - \null\vfil - \vskip 60\p@ - \vspace*{\droptitle} - \maketitlehooka - \ifcsempty{@published} - {} - {{\@bsprepublished \@published \@bspostpublished}\maketitlehookaa} - {\@bspretitle \@title \@bsposttitle} - \ifcsempty{@subtitle} - {} - {\maketitlehookaaa{\@bspresubtitle \@subtitle \@bspostsubtitle}} - \maketitlehookb - {\@bspreauthor \@author \@bspostauthor} - \maketitlehookc - {\@bspredate \@date \@bspostdate} - \maketitlehookd - \par - \@thanks - \vfil\null - \end{titlepage}% - \@bscontmark % \setcounter{footnote}{0}% -%%% \@bsmtitlempty - } % end titlepage defs -\else - \renewcommand{\maketitle}{\par - \begingroup - \@bsmarkseries - \def\@makefnmark{\rlap{\@textsuperscript{% - \normalfont\@bsthanksheadpre \tamark \@bsthanksheadpost}}}% - \long\def\@makefntext##1{\makethanksmark ##1} - \if@twocolumn - \ifnum \col@number=\@ne - \@maketitle - \else - \twocolumn[\@maketitle]% - \fi - \else - \newpage - \global\@topnum\z@ - \@maketitle - \fi - \thispagestyle{plain}\@thanks - \endgroup - \@bscontmark % \setcounter{footnote}{0}% -%%% \@bsmtitlempty - } % end non-titlepage - - \def\@maketitle{% - \newpage - \null - \vskip 2em% - \vspace*{\droptitle} - \maketitlehooka - \ifcsempty{@published} - {} - {{\@bsprepublished \@published \@bspostpublished}\maketitlehookaa} - {\@bspretitle \@title \@bsposttitle} - \ifcsempty{@subtitle} - {} - {\maketitlehookaaa{\@bspresubtitle \@subtitle \@bspostsubtitle}} - \maketitlehookb - {\@bspreauthor \@author \@bspostauthor} - \maketitlehookc - {\@bspredate \@date \@bspostdate} - \maketitlehookd - \par - \vskip 1.5em} -\fi - -\providecommand{\maketitlehookaa}{} - -\providecommand{\maketitlehookaaa}{} - -\newcommand{\prepublished}[1]{% -\def\@bsprepublished{#1}% -} - -\newcommand{\postpublished}[1]{% -\def\@bspostpublished{#1}% -} - -\newcommand{\presubtitle}[1]{% -\def\@bspresubtitle{#1}% -} -\newcommand{\postsubtitle}[1]{% -\def\@bspostsubtitle{#1}% +\newcommand{\LWR@setfootnoteseries}{% + \renewcommand\thefootnote{\@arabic\c@footnote}% } -\if@titlepage -\prepublished{ -\vspace*{-\baselineskip}\vspace*{-\medskipamount}\vspace*{-2em} -\begin{center}} -\postpublished{\par\end{center}\vskip 2em} - -\presubtitle{\unskip\begin{center}\unskip} -\postsubtitle{\par\end{center}\vskip 2em} \else -\prepublished{\begin{center}} -\postpublished{\par\end{center}\vskip 0.5em} - -\presubtitle{\begin{center}\unskip} -\postsubtitle{\par\end{center}\vskip 0.5em} +\newcommand{\LWR@setfootnoteseries}{% + \renewcommand\thefootnote{\@fnsymbol\c@footnote}% +} \fi -\end{warpprint} -\begin{warpHTML} \newcommand*{\LWR@maketitlesetup}{% -\@bsmarkseries -\@mpbsmarkseries +\LWR@setfootnoteseries% \def\@makefnmark{\textsuperscript{\thefootnote}} \long\def\@makefntext##1{% -\makethanksmark \LWR@orighspace{1in} +\textsuperscript{\@thefnmark} \LWR@orighspace{1in} ##1% }% } @@ -4860,39 +4677,83 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \@maketitle \@thanks \end{titlepage} -\@bscontmark +\setcounter{footnote}{0}% +\global\let\thanks\relax +\global\let\maketitle\relax +\global\let\@maketitle\relax +\global\let\@thanks\@empty +\global\let\@author\@empty +\global\let\@date\@empty +\global\let\@title\@empty +\global\let\title\relax +\global\let\author\relax +\global\let\date\relax +\global\let\and\relax } - \DeclareDocumentCommand{\@maketitle}{}{% - \maketitlehooka - \ifcsempty{@published} - {} - {{\@bsprepublished \@published \@bspostpublished}\maketitlehookaa} - {\@bspretitle \@title \@bsposttitle} - \ifcsempty{@subtitle} - {} - {\maketitlehookaaa{\@bspresubtitle \@subtitle \@bspostsubtitle}} - \maketitlehookb - {\@bspreauthor \@author \@bspostauthor} - \maketitlehookc - {\@bspredate \@date \@bspostdate} - \maketitlehookd -} - -\providecommand{\maketitlehookaa}{} -\providecommand{\maketitlehookaaa}{} + \LWR@stoppars\LWR@htmltag{h1} + \@title + \LWR@htmltag{/h1}\LWR@startpars + \begin{BlockClass}{author} + \renewcommand{\and}{ + \end{BlockClass} + \begin{BlockClass}{oneauthor} + } + \begin{BlockClass}{oneauthor} + \@author + \end{BlockClass} + \end{BlockClass} + \begin{BlockClass}{titledate} + \@date + \end{BlockClass} +} \newcommand*{\LWR@titlingmaketitle}{% +\@thanks +\LWR@maketitlesetup \@maketitle \@thanks } +\end{warpHTML} +\begin{warpall} + +\AfterPackage{titling}{ +\newcommand*{\AddSubtitlePublished}{% + +\newcommand{\@published}{} + +\newcommand{\published}[1]{\gdef\@published{##1}} + +\renewcommand*{\maketitlehooka}{\printpublished} + +\newcommand*{\printpublished}{% +\warpprintonly{\begin{center}\unskip}% +\begin{BlockClass}{published}% +\warpprintonly{\large\itshape}% +\@published% +\end{BlockClass}% +\warpprintonly{\end{center}}% +} + +\newcommand{\@subtitle}{} -\renewcommand{\thanksmarkseries}[1]{% -\def\@mpbsmarkseries{% -\renewcommand*{\thempfootnote}{\@nameuse{#1}{mpfootnote}}}% -\def\@bsmarkseries{\renewcommand{\thefootnote}{\@nameuse{#1}{footnote}}}% +\newcommand{\subtitle}[1]{\gdef\@subtitle{##1}} + +\renewcommand*{\maketitlehookb}{\printsubtitle} + +\newcommand*{\printsubtitle}{% +\warpprintonly{\begin{center}\unskip}% +\begin{BlockClass}{subtitle}% +\warpprintonly{\Large\itshape}% +\@subtitle% +\end{BlockClass}% +\warpprintonly{\end{center}}% } -\end{warpHTML} + +}% \AddSubtitlePublished +}% AfterPackage + +\end{warpall} \begin{warpHTML} @@ -5190,9 +5051,11 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \end{warpHTML} \begin{warpall} \newcommand{\StartDefiningTabulars}{% +\LWR@traceinfo{StartDefiningTabulars} \warpHTMLonly{\catcode`\&=\active}% } \newcommand{\EndDefiningTabulars}{% +\LWR@traceinfo{EndDefiningTabulars} \warpHTMLonly{\catcode`\&=4}% } @@ -5584,24 +5447,40 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \newcommand{\LWR@multicoltext}{} -\NewDocumentCommand{\LWR@domulticolumn}{m m +m}{% -\LWR@traceinfo{lwr@domulticolumn -#1- -#2-}% +\NewDocumentCommand{\LWR@domulticolumn}{o o m m +m}{% +\LWR@traceinfo{lwr@domulticolumn -#1- -#2- -#3- -#4-}% \renewcommand{\LWR@multicoltext}{% -#3% +#5% \booltrue{LWR@validtablecol}% }% \LWR@maybenewtablerow% -\LWR@htmltag{td colspan="#1" +\LWR@htmltag{td colspan="#3" % +\IfValueTF{#2}{ % rows? +rowspan="#2" % +\IfValueT{#1}{% vpos? +\ifstrequal{#1}{b}{style="vertical-align:bottom" }{}% +\ifstrequal{#1}{t}{style="vertical-align:top" }{}% +}% vpos? +}{}% rows? class="td% -\LWR@parsemulticolumnalignment{#2}{\LWR@printmccoltype}% +\LWR@parsemulticolumnalignment{#4}{\LWR@printmccoltype}% \ifthenelse{\equal{\LWR@getexparray{LWR@midrules}{\theLWR@tablecolspos}}{Y}}{rule}{}% "% }% end of the opening table data tag \global\boolfalse{LWR@intabularmetadata}% -\LWR@parsemulticolumnalignment{#2}{\LWR@printmccoldata}% +\LWR@parsemulticolumnalignment{#4}{\LWR@printmccoldata}% } +\NewDocumentCommand{\LWR@htmlmulticolumn}{m m +m}% +{% +\LWR@tabularhtmlcolumns{\theLWR@tablecolspos}{#1} +\LWR@domulticolumn{\theLWR@tabhtmlcoltotal}{#2}{#3}% +\addtocounter{LWR@tablecolspos}{#1}% +\addtocounter{LWR@tablecolspos}{-1}% +\booltrue{LWR@skipatbang}% +} + \newbool{LWR@starredlongtable} \boolfalse{LWR@starredlongtable} \providecommand*{\LTcaptype}{table} @@ -5694,35 +5573,44 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \ifdefempty{\LWR@atbangspec}{}{\addtocounter{LWR@tabhtmlcoltotal}{1}}% }{}% } +\end{warpHTML} +\begin{warpall} +\DeclareExpandableDocumentCommand{\LWR@origmulticolumnrow}{m m O{c} m O{0} m O{0pt} +m}{% +\multicolumn{#1}{#2}{\@xmultirow[#3]{#4}[#5]{#6}[#7]{#8}} +} +\newcommand*{\multicolumnrow}{\LWR@origmulticolumnrow} +\end{warpall} +\begin{warpHTML} +\newcommand*{\LWR@donothing}{} +\newcommand*{\LWR@domidrule}{\booltrue{LWR@doinghline}} +\newcommand*{\LWR@dotbrule}{\booltrue{LWR@doingtbrule}} -\NewDocumentCommand{\LWR@tabledatamulticolumntag}{m m +m}% -{% -\LWR@tabularhtmlcolumns{\theLWR@tablecolspos}{#1} -\LWR@domulticolumn{\theLWR@tabhtmlcoltotal}{#2}{#3}% -\addtocounter{LWR@tablecolspos}{#1}% -\addtocounter{LWR@tablecolspos}{-1}% -\booltrue{LWR@skipatbang}% +\end{warpHTML} + + +\begin{warpall} +\let\TabularMacro\relax + +\end{warpall} + +\begin{warpHTML} + +\newcommand*{\ResumeTabular}{% +\global\boolfalse{LWR@exitingtabular}% +\LWR@getmynexttoken% } +\end{warpHTML} +\begin{warpprint} -\NewDocumentCommand{\LWR@tabledatamultirowtag}{m o m o m}% -{% -\LWR@maybenewtablerow% -\LWR@htmltag{td rowspan="#1" class="td% -\StrChar{\LWR@tablecolspec}{\theLWR@tablecolspos}% -\ifthenelse{\equal{\LWR@getexparray{LWR@midrules}{\theLWR@tablecolspos}}{Y}}{rule}{}% -"{}} -\begingroup \LetLtxMacro{\\}{\LWR@endofline} #5 \endgroup -\LWR@stoppars% -\global\boolfalse{LWR@intabularmetadata}% -}% +\newcommand*{\ResumeTabular}{} + +\end{warpprint} -\newcommand*{\LWR@donothing}{} -\newcommand*{\LWR@domidrule}{\booltrue{LWR@doinghline}} -\newcommand*{\LWR@dotbrule}{\booltrue{LWR@doingtbrule}} +\begin{warpHTML} \newbool{LWR@exitingtabular} @@ -5738,8 +5626,12 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% {\let\mynext\LWR@donothing}{}% \ifthenelse{\isequivalentto{\LWR@mynexttoken}{\multirow}}% {\let\mynext\LWR@donothing}{}% +\ifthenelse{\isequivalentto{\LWR@mynexttoken}{\multicolumnrow}}% +{\let\mynext\LWR@donothing}{}% \ifthenelse{\isequivalentto{\LWR@mynexttoken}{\mrowcell}}% {\let\mynext\LWR@donothing}{}% +\ifthenelse{\isequivalentto{\LWR@mynexttoken}{\TabularMacro}}% +{\let\mynext\LWR@donothing}{}% \ifthenelse{\isequivalentto{\LWR@mynexttoken}{\hline}}% {\let\mynext\LWR@donothing}{}% \ifthenelse{\isequivalentto{\LWR@mynexttoken}{\toprule}}% @@ -5814,8 +5706,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \DeclareDocumentCommand{\addlinespace}{o}{} \DeclareDocumentCommand{\morecmidrules}{}{} \DeclareDocumentCommand{\specialrule}{m m m}{\LWR@domidrule\LWR@getmynexttoken} -\LetLtxMacro{\multicolumn}{\LWR@tabledatamulticolumntag}% -\LetLtxMacro{\multirow}{\LWR@tabledatamultirowtag}% +\renewcommand{\multicolumn}{\LWR@htmlmulticolumn}% \renewcommand*{\mrowcell}{\global\booltrue{LWR@skippingmrowcell}}% \LetLtxMacro{\caption}{\LWR@longtabledatacaptiontag}% \global\boolfalse{LWR@tableparcell}% @@ -6510,7 +6401,6 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}% } }{}% not eq > 0 } -\newcommand*{\LWR@restoreorigrelsize}{} \newcommand*{\LWR@restoreorigformatting}{% \LWR@traceinfo{LWR@restoreorigformatting}% \LetLtxMacro{\hspace}{\LWR@orighspace}% @@ -6569,11 +6459,7 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}% \LetLtxMacro{\minipage}{\LWR@origminipage}% \let\endminipage\LWR@endminipage% \LetLtxMacro{\parbox}{\LWR@origparbox}% -\LWR@restoreorigxcolor% -\LWR@restoremoreorigxcolor% -\LWR@restoreorigtextcomp% \LWR@restoreorigaccents% -\LWR@restoreorigrelsize% \LWR@FBcancel% } @@ -7081,6 +6967,15 @@ class="#3"\LWR@orignewline}#2\LWR@htmltag{/a}% \end{warpHTML} +\begin{warpHTML} +\@ifpackageloaded{textcomp} +{ +\LWR@origRequirePackage{lwarp-textcomp} +} +{} + +\end{warpHTML} + \begin{warpHTML} @@ -7385,14 +7280,6 @@ img src="\thisgraphicspath\LWR@strresult\LWR@imageextension" \LWR@orignewline \end{warpHTML} - -\begin{warpall} - -\newcommand*{\LWR@restoreorigxcolor}{} -\newcommand*{\LWR@restoremoreorigxcolor}{} - -\end{warpall} - \begin{warpall} \AtBeginDocument{ \@ifpackageloaded{xcolor}{ @@ -7480,18 +7367,22 @@ img src="\thisgraphicspath\LWR@strresult\LWR@imageextension" \LWR@orignewline \LWR@traceinfo{*** finished end fcolorminipage}% } -\renewcommand*{\LWR@restoremoreorigxcolor}{% -\LWR@traceinfo{LWR@restoremoreorigxcolorformatting}% +\newcommand*{\LWR@restoreorigprintxcolor}{% +\LWR@traceinfo{LWR@restoreorigprintxcolor}% \LetLtxMacro\colorboxBlock\LWRprint@colorboxBlock% \LetLtxMacro\fcolorbox\LWRprint@fcolorbox% \LetLtxMacro\fcolorboxBlock\LWRprint@fcolorboxBlock% \LetLtxMacro\fcolorminipage\LWRprint@fcolorminipage% \LetLtxMacro\endfcolorminipage\endLWRprint@fcolorminipage% } -\warpprintonly{\LWR@restoremoreorigxcolor} + +\appto{\LWR@restoreorigformatting}{% +\LWR@restoreorigprintxcolor% +} +\warpprintonly{\LWR@restoreorigprintxcolor} \LWR@traceinfo{xcolor patches done} -}{}% xcolor +}{}% xcolor loaded }% AtBeginDocument \end{warpall} |