From 96053081ddf50ffc6860dd4ff9b019bf0c12df5f Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 22 Mar 2019 20:50:19 +0000 Subject: lwarp (22mar19) git-svn-id: svn://tug.org/texlive/trunk@50535 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/lwarp/lwarp-amsthm.sty | 9 +- Master/texmf-dist/tex/latex/lwarp/lwarp-array.sty | 2 + Master/texmf-dist/tex/latex/lwarp/lwarp-ctable.sty | 135 ++++++++++++ Master/texmf-dist/tex/latex/lwarp/lwarp-eqlist.sty | 32 +++ .../texmf-dist/tex/latex/lwarp/lwarp-eqparbox.sty | 58 +++++ Master/texmf-dist/tex/latex/lwarp/lwarp-ftcap.sty | 21 ++ .../texmf-dist/tex/latex/lwarp/lwarp-graphics.sty | 7 + .../texmf-dist/tex/latex/lwarp/lwarp-keyfloat.sty | 244 +++++++++++++++++---- .../tex/latex/lwarp/lwarp-listliketab.sty | 24 ++ .../texmf-dist/tex/latex/lwarp/lwarp-longtable.sty | 3 +- .../texmf-dist/tex/latex/lwarp/lwarp-minitoc.sty | 22 ++ .../texmf-dist/tex/latex/lwarp/lwarp-multirow.sty | 2 + .../texmf-dist/tex/latex/lwarp/lwarp-rotating.sty | 1 + .../tex/latex/lwarp/lwarp-supertabular.sty | 1 + .../texmf-dist/tex/latex/lwarp/lwarp-tabularx.sty | 1 + .../texmf-dist/tex/latex/lwarp/lwarp-tabulary.sty | 1 + .../texmf-dist/tex/latex/lwarp/lwarp-tocdata.sty | 82 +++++++ .../texmf-dist/tex/latex/lwarp/lwarp-topcapt.sty | 22 ++ Master/texmf-dist/tex/latex/lwarp/lwarp-xtab.sty | 1 + Master/texmf-dist/tex/latex/lwarp/lwarp.sty | 230 +++++++++++++++---- 20 files changed, 804 insertions(+), 94 deletions(-) create mode 100644 Master/texmf-dist/tex/latex/lwarp/lwarp-ctable.sty create mode 100644 Master/texmf-dist/tex/latex/lwarp/lwarp-eqlist.sty create mode 100644 Master/texmf-dist/tex/latex/lwarp/lwarp-eqparbox.sty create mode 100644 Master/texmf-dist/tex/latex/lwarp/lwarp-ftcap.sty create mode 100644 Master/texmf-dist/tex/latex/lwarp/lwarp-listliketab.sty create mode 100644 Master/texmf-dist/tex/latex/lwarp/lwarp-minitoc.sty create mode 100644 Master/texmf-dist/tex/latex/lwarp/lwarp-tocdata.sty create mode 100644 Master/texmf-dist/tex/latex/lwarp/lwarp-topcapt.sty (limited to 'Master/texmf-dist/tex') diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-amsthm.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-amsthm.sty index 65d74241974..4fc6ebf5d3c 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-amsthm.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-amsthm.sty @@ -19,11 +19,12 @@ \@ifpackageloaded{mdframed}{ \PackageError{lwarp} - {Package mdframed must be loaded after package amsthm.} + {Package mdframed must be loaded after package amsthm} {% - Move \detokenize{\usepackage}{amsthm} before \detokenize{\usepackage}{mdframed}. - Package amsthm may be loaded by something else, which must also be moved - before mdframed.% + Move \detokenize{\usepackage}{amsthm} before + \detokenize{\usepackage}{mdframed}.\MessageBreak + Package amsthm may be loaded by something else,\MessageBreak + which must also be moved before mdframed.% } } {} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-array.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-array.sty index a8d3f4a86a0..51ba29d078d 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-array.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-array.sty @@ -24,6 +24,8 @@ \newcommand*{\LWR@HTML@lasthline}{\LWR@HTMLhline}% \LWR@expandableformatted{lasthline} +\providecommand*{\LWR@HTML@tabularnewline}{\LWR@tabularendofline} +\LWR@formatted{tabularnewline} \endinput %% %% End of file `lwarp-array.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-ctable.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-ctable.sty new file mode 100644 index 00000000000..d5ac3142ee8 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-ctable.sty @@ -0,0 +1,135 @@ +%% +%% This is file `lwarp-ctable.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `ctable') +%% This is a generated file. +%% Copyright 2016-2018 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +\LWR@ProvidesPackagePass{ctable}[2015/10/17] +\newcommand{\LWR@HTML@ctable}[4][]{% + \let\@CTtaborfig \@dfltCTtaborfig + \let\@CTalign \@dfltCTalign + \let\@CTsideways \@dfltCTsideways + \let\@CTcontinued \empty + \let\@CTpos \@dfltCTpos + \let\@CTcaption \empty + \let\@CTcap \undefined + \let\@CTlabel \empty + \let\@CTbotcap \@dfltCTbotcap + \let\@CTstarred \@dfltCTstarred + \let\@CTsuper \@dfltCTsuper + \let\@CTnotespar \@dfltCTnotespar + \let\@CTdoinside \@dfltCTdoinside + \let\@CTbgopacity \@dfltCTbgopacity + \@CTframerule \@dfltCTframerule + \@CTcaptionskip \@dfltCTcaptionskip + \@CTframesep \@dfltCTframesep + \@CTwidth \@dfltCTwidth + \@CTmaxwidth \@dfltCTmaxwidth + \@CTmincapwidth \@dfltCTmincapwidth + \@CTfooterwidth \@dfltCTfooterwidth + \def\@CTfgactual {@dfltCTframefg}% + \def\@CTbgactual {@dfltCTframebg}% + \def\@CTbeg {\begin{\@CTsideways\@CTtaborfig\@CTstarred}}% + \def\@CTbegin {\@CTbeg}% + \def\@CTend {\end{\@CTsideways\@CTtaborfig\@CTstarred}}% + \setkeys{CT}{#1}% + \ifx\@CTcap\undefined\let\@CTcap\@CTcaption\fi + \ifx\@CTcap\empty + \if@CTcaptionloaded\else + \PackageWarningNoLine{ctable}{\MessageBreak + An empty cap= option prevents lot/loc entry only\MessageBreak + if the caption package is loaded!} + \fi + \fi + \if@CTinmemoir\else + \ifx\@CTbotcap\undefined + \PackageError{ctable}{\MessageBreak + You can, currently, use the sidecap option only with\MessageBreak + memoir documents. Use topcap or botcap only} + \fi + \fi + \ifdim\@CTwidth=0pt\else + \ifdim\@CTmaxwidth=0pt\else + \PackageError{ctable}{\MessageBreak + You may not use the width and maxwidth options together\MessageBreak + Use either width or maxwidth} + \fi + \fi + \ifx\@CTpos\empty + \ifx\@CTsideways\empty\else + \PackageError{ctable}{\MessageBreak + You may not use the pos and sideways options together\MessageBreak + Rotated tables and figures are always typeset on a separate page} + \fi + \fi + \ifx\@CTcaption\empty + \ifx\@CTlabel\empty\else + \PackageError{ctable}{\MessageBreak + You may not label a captionless table\MessageBreak + Such a label can't be referenced} + \fi + \fi + \@CTbegin + \ifx\@CTcontinued\empty\else\addtocounter{\@CTtaborfig}{-1}\fi + \@CTalign + \begin{center} + \setlength{\fboxrule}{\@CTframerule} + \setlength{\fboxsep}{\@CTframesep} + \LWR@forceminwidth{\fboxrule}% lwarp + \convertcolorspec{named}{\@CTbgactual}{HTML}\LWR@tempcolor% lwarp + \begin{BlockClass}[% lwarp + border: + \LWR@printlength{\LWR@atleastonept} + solid + \LWR@colorstyle{named}{\@CTfgactual} ; % + padding:\LWR@printlength{\fboxsep} ; % + \ifdefstring{\LWR@tempcolor}{FFFFFF}{}{% + background: \LWR@colorstyle{named}{\@CTbgactual} ; % + }% + ]{fminipage}% lwarp + \ifx\@CTbotcap\@CTfalse\@CTCaption\vskip\@CTcaptionskip\fi + \ifx\@CTbotcap\undefined% + \begin{sidecaption}[\@CTcap]{\@CTcaption}[\@CTlabel] + \fi + \@CTdoinside + \begin{tabularx}{\linewidth}{#2}% lwarp + #4% + \end{tabularx}% lwarp + \def\@CTfootnotes{#3}% + \ifx#3\empty\else{% append footnotes, if any + \begin{BlockClass}{tnotes}% lwarp + #3 + \end{BlockClass}% lwarp + } + \fi + \ifx\@CTbotcap\undefined\end{sidecaption}\fi + \ifx\@CTbotcap\@CTtrue\vskip\@CTcaptionskip\@CTCaption\fi + \end{BlockClass} + \end{center} + \@CTend +} +\LWR@formatted{ctable} +\LetLtxMacro\FL\toprule +\newcommand{\LWR@HTML@tmark}[1][a]{% + \textsuperscript{\textrm{\textit{#1}}} +} +\LWR@formatted{tmark} + +\newcommand{\LWR@HTML@tnote}[2][a]{% + \tmark[#1]\,#2\par +} +\LWR@formatted{tnote} +\endinput +%% +%% End of file `lwarp-ctable.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-eqlist.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-eqlist.sty new file mode 100644 index 00000000000..88e278f6f4c --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-eqlist.sty @@ -0,0 +1,32 @@ +%% +%% This is file `lwarp-eqlist.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `eqlist') +%% This is a generated file. +%% Copyright 2016-2018 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +\LWR@ProvidesPackageDrop{eqlist}[2002/08/15] +\newenvironment{eqlist}[1][]{\description}{\enddescription} +\newenvironment{eqlist*}[1][]{\description}{\enddescription} +\newenvironment{Eqlist}[2][]{\description}{\enddescription} +\newenvironment{Eqlist*}[2][]{\description}{\enddescription} +\newcommand*{\longitem}[1][]{\item[#1]} +\newcommand*{\eqlistinit}{} +\newcommand*{\eqliststarinit}{} +\newcommand*{\eqlistinitpar}{} +\def\eqlistlabel#1{#1} +\newcommand{\eqlistauto}[1]{} +\newcommand{\eqlistnoauto}{} +\endinput +%% +%% End of file `lwarp-eqlist.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-eqparbox.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-eqparbox.sty new file mode 100644 index 00000000000..aca4e1617c7 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-eqparbox.sty @@ -0,0 +1,58 @@ +%% +%% This is file `lwarp-eqparbox.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `eqparbox') +%% This is a generated file. +%% Copyright 2016-2018 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +\LWR@ProvidesPackagePass{eqparbox}[2017/09/03] +\NewDocumentCommand{\LWR@HTML@eqparbox}{O{t} O{} O{t} m +m}{% + {% + \minipagefullwidth% + \parbox[#1][#2][#3]{\linewidth}{#5}% + }% +} +\LWR@formatted{eqparbox} + +\NewDocumentCommand{\LWR@HTML@eqmakebox}{o o m}{% + \makebox[#2]{#3}% +} +\LWR@formatted{eqmakebox} + +\NewDocumentCommand{\LWR@HTML@eqframebox}{o o m}{% + \framebox[#2]{#3}% +} +\LWR@formatted{eqframebox} + +\NewDocumentEnvironment{LWR@HTML@eqminipage}{O{t} O{} O{t} m} +{% + \begingroup% + \minipagefullwidth% + \minipage[#1][#2][#3]{\linewidth}% +}% +{% + \endminipage% + \endgroup% +} + +\newcommand*{\LWR@HTML@eqboxwidth}[1]{.25\linewidth} +\LWR@formatted{eqboxwidth} + +\newcommand*{\LWR@HTML@eqsetminwidth}[2]{} +\newcommand*{\LWR@HTML@eqsetmaxwidth}[2]{} + +\newcommand*{\LWR@HTML@eqsetminwidthto}[2]{} +\newcommand*{\LWR@HTML@eqsetmaxwidthto}[2]{} +\endinput +%% +%% End of file `lwarp-eqparbox.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-ftcap.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-ftcap.sty new file mode 100644 index 00000000000..f03c5cd9776 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-ftcap.sty @@ -0,0 +1,21 @@ +%% +%% This is file `lwarp-ftcap.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `ftcap') +%% This is a generated file. +%% Copyright 2016-2018 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +\LWR@ProvidesPackageDrop{ftcap} +\endinput +%% +%% End of file `lwarp-ftcap.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty index ac1b3e59d65..2610fb0c7b8 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty @@ -100,6 +100,13 @@ \define@key{igraph}{class}{\renewcommand*{\LWR@igclass}{#1}} \define@key{igraph}{alt}{\renewcommand*{\LWR@igalt}{#1}} \define@key{igraph}{scale}{% + \ifthenelse{\equal{#1}{1}}{}{% must expand #1 + \PackageWarning{lwarp}{% + It is recommended to use\MessageBreak + [width=xx\protect\linewidth]\MessageBreak + instead of [scale=yy],% + }% + }% \renewcommand*{\LWR@igxscale}{#1}% \renewcommand*{\LWR@igyscale}{#1}% } diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-keyfloat.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-keyfloat.sty index 329de5bc815..2e379d53ac8 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-keyfloat.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-keyfloat.sty @@ -17,40 +17,115 @@ %% version 2005/12/01 or later. -\LWR@ProvidesPackagePass{keyfloat}[2017/05/12] +\LWR@ProvidesPackagePass{keyfloat}[2019/03/21] + +\@ifpackagelater{keyfloat}{2019/03/21}{}{ + \PackageError{lwarp-keyfloat} + {% + The keyfloat package is out of date.\MessageBreak + Update to keyfloat v2.00 2019/03/21 or later% + } + {% + Please update the keyfloat package. It's worth it!% + } +} \AtBeginDocument{ -\RenewDocumentCommand{\KFLT@onefigureimage}{} +\providecommand*{\KFLT@LWR@hook@boxouter}{} +\renewcommand*{\KFLT@LWR@hook@boxouter}{% + \ifbool{KFLT@keywrap}{}{% + \ifnumequal{\value{KFLT@keyfloatdepth}}{0}{% + \setlength{\linewidth}{6in}% + \setlength{\textwidth}{6in}% + \setlength{\textheight}{9in}% + }{}% + }% +} + +\let\KFLT@LWR@hook@boxouter@minipage\relax +\let\endKFLT@LWR@hook@boxouter@minipage\relax +\newenvironment*{KFLT@LWR@hook@boxouter@minipage}[2][]{}{} + +\providecommand*{\KFLT@LWR@hook@keysubfloats}{} +\renewcommand*{\KFLT@LWR@hook@keysubfloats}{% + \ifbool{KFLT@keywrap}{}{% + \ifnumequal{\value{KFLT@keyfloatdepth}}{0}{% + \setlength{\linewidth}{6in}% + \setlength{\textwidth}{6in}% + \setlength{\textheight}{9in}% + }{}% + }% +} + +\let\KFLT@LWR@hook@keyfloatsminipage\relax +\let\endKFLT@LWR@hook@keyfloatsminipage\relax +\newenvironment*{KFLT@LWR@hook@keyfloatsminipage}[1]{}{} + +\providecommand*{\KFLT@LWR@hook@keyfloats}{} +\renewcommand*{\KFLT@LWR@hook@keyfloats}{% + \ifbool{KFLT@keywrap}{}{% + \ifnumequal{\value{KFLT@keyfloatdepth}}{0}{% + \setlength{\linewidth}{6in}% + \setlength{\textwidth}{6in}% + \setlength{\textheight}{9in}% + }{}% + }% +} + +\renewcommand*{\KFLT@maybeendfloatrow}{% + \ifnumless{\value{KFLT@thiscol}}{\value{KFLT@numcols}}% + {}% thiscol < numcols + {% >= + \defcounter{KFLT@thiscol}{0}% + }% +}% + +\renewcommand{\KFLT@trackrows}% +{% + \ifboolexpr{% + test {\ifnumgreater{\value{KFLT@keyfloatdepth}}{0}} or% + bool{KFLT@inkeysubfloats}% + }% + {% nested + \KFLT@maybestartfloatrow% + \ifnumgreater{\value{KFLT@thiscol}}{1}% + {% + }% + {}% + }% nested + {}% not nested +} +\RenewDocumentCommand{\KFLT@onefigureimage}{m} {% \LWR@traceinfo{KFLT@onefigureimage}% \ifthenelse{\NOT\equal{\KFLT@lw}{}}% {% - \includegraphics% - [scale=\KFLT@s,width=\KFLT@imagewidth]{\KFLT@i}% + \KFLT@frame{\includegraphics% + [scale=\KFLT@s,width=\KFLT@imagewidth]{#1}}% }% {% not linewidth \ifthenelse{\dimtest{\KFLT@w}{>}{0pt}}% {% width is given \ifthenelse{\dimtest{\KFLT@h}{>}{0pt}}% {% w and h - \includegraphics% + \KFLT@frame{\includegraphics% [scale=\KFLT@s,% - width=\KFLT@imagewidth,height=\KFLT@h]{\KFLT@i}% + width=\KFLT@imagewidth,height=\KFLT@h]{#1}}% }% w and h {% only w - \includegraphics% - [scale=\KFLT@s,width=\KFLT@imagewidth]{\KFLT@i}% + \KFLT@frame{\includegraphics% + [scale=\KFLT@s,width=\KFLT@imagewidth]{#1}}% }% only w }% width is given {% width is not given \ifthenelse{\dimtest{\KFLT@h}{>}{0pt}}% {% - \includegraphics% - [scale=\KFLT@s,height=\KFLT@h]{\KFLT@i}% + \KFLT@frame{\includegraphics% + [scale=\KFLT@s,height=\KFLT@h]{#1}}% }% {% - \includegraphics% - [scale=\KFLT@s]{\KFLT@i}% + \KFLT@frame{\includegraphics% + [scale=\KFLT@s]{#1}}% }% }% width is not given }% not linewidth @@ -58,51 +133,138 @@ } \RenewDocumentEnvironment{KFLT@boxinner}{} {% -\LWR@traceinfo{KFLT@boxinner}% -\LWR@stoppars% + \LWR@traceinfo{KFLT@boxinner}% + \LWR@stoppars% + \minipagefullwidth% + \ifboolexpr{bool{KFLT@ft} or bool{KFLT@f}}{ + \fminipage{\KFLT@imagewidth}% + }{% + \minipage{\KFLT@imagewidth}% + }% } -{ -\LWR@startpars% -\LWR@traceinfo{KFLT@boxinner: done}% +{% + \ifboolexpr{bool{KFLT@ft} or bool{KFLT@f}}{ + \endfminipage% + }{% + \endminipage% + }% + \LWR@startpars% + \LWR@traceinfo{KFLT@boxinner: done}% } +\newcommand*{\LWR@KFLT@settextalign}[1]{% + \def\LWR@KFLT@textalign{justify}% + \ifcsstring{KFLT@#1textalign}{\centering}% + {\def\LWR@KFLT@textalign{center}}% + {}% + \ifcsstring{KFLT@#1textalign}{\raggedleft}% + {\def\LWR@KFLT@textalign{right}}% + {}% + \ifcsstring{KFLT@#1textalign}{\raggedright}% + {\def\LWR@KFLT@textalign{left}}% + {}% +} + +\renewcommand{\KFLT@addtext}[1] +{% + \ifcsempty{KFLT@#1t}% + {}% no text + {% text to add + {% local + \addvspace{\smallskipamount}% + \LWR@KFLT@settextalign{#1}% + \begin{BlockClass}[text-align:\LWR@KFLT@textalign]{floatnotes}% + \setlength{\parskip}{1.5ex}% + \setlength{\parindent}{0em}% + \csuse{KFLT@#1t}% + \end{BlockClass}% + }% local + }% text to add +} + +\@ifpackageloaded{tocdata} +{} +{% tocdata not loaded + + \newcommand*{\LWR@KFLT@setnamealign}[1]{% + \def\LWR@KFLT@textalign{justify}% + \ifstrequal{#1}{\centering}% + {\def\LWR@KFLT@textalign{center}}% + {}% + \ifstrequal{#1}{\raggedleft}% + {\def\LWR@KFLT@textalign{right}}% + {}% + \ifstrequal{#1}{\raggedright}% + {\def\LWR@KFLT@textalign{left}}% + {}% + } + + \renewcommand*{\KFLT@@addartisttext}[3]{% + % \end{macrocode} + % Add space and create the name inside a full-width minipage: + % \begin{macrocode} + % \begin{minipage}{\linewidth}% + \LWR@KFLT@setnamealign{#3}% + \begin{BlockClass}[text-align:\LWR@KFLT@textalign]{floatnotes}% + % \end{macrocode} + % Text alignment is |#3|, and depends on artist or author: + % \begin{macrocode} + % #3% + % \end{macrocode} + % |#1| is empty or '|subgrp'| \\ + % |#2| is empty for artist, `|u|' for author: + % \begin{macrocode} + \footnotesize\textsc{% + \KFLT@optionalname{\csuse{KFLT@#1a#2p}}% + \KFLT@optionalname{\csuse{KFLT@#1a#2f}}% + \csuse{KFLT@#1a#2l}% + \csuse{KFLT@#1a#2s}% + }% + % \end{minipage}% + \end{BlockClass} + } + +}% tocdata not loaded + \DeclareDocumentEnvironment{KFLT@marginfloat}{O{-1.2ex} m} {% -\LWR@BlockClassWP{float:right; width:2in; margin:10pt}{}{marginblock}% -\captionsetup{type=#2}% + \LWR@BlockClassWP{float:right; width:2in; margin:10pt}{}{marginblock}% + \captionsetup{type=#2}% + \minipage{2in}% } {% -\endLWR@BlockClassWP% + \endminipage% + \endLWR@BlockClassWP% } \DeclareDocumentEnvironment{marginfigure}{o} - {\begin{KFLT@marginfloat}{figure}} - {\end{KFLT@marginfloat}} + {\begin{KFLT@marginfloat}{figure}} + {\end{KFLT@marginfloat}} \DeclareDocumentEnvironment{margintable}{o} - {\begin{KFLT@marginfloat}{table}} - {\end{KFLT@marginfloat}} + {\begin{KFLT@marginfloat}{table}} + {\end{KFLT@marginfloat}} \DeclareDocumentEnvironment{keywrap}{m +m} {% -\LWR@ensuredoingapar% -\setlength{\LWR@templengthone}{#1}% -\begin{LWR@BlockClassWP}{% - float:right; width:\LWR@printlength{\LWR@templengthone}; % extra space - margin:10pt% -}% -{% - width:\LWR@printlength{\LWR@templengthone}% -}% -{marginblock}% -\setlength{\linewidth}{.95\LWR@templengthone}% -#2% -\end{LWR@BlockClassWP}% -} -{% + \LWR@ensuredoingapar% + \setlength{\linewidth}{6in}% + \setlength{\LWR@templengthone}{#1}% + \begin{LWR@BlockClassWP}% + {% + float:right; width:\LWR@printlength{\LWR@templengthone}; % extra space + margin:10pt% + }% + {% + width:\LWR@printlength{\LWR@templengthone}% + }% + {marginblock}% + \setlength{\linewidth}{.95\LWR@templengthone}% + \booltrue{KFLT@keywrap}% + #2% + \end{LWR@BlockClassWP}% } - - +{} }% AtBeginDocument \endinput diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-listliketab.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-listliketab.sty new file mode 100644 index 00000000000..df80c46ed17 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-listliketab.sty @@ -0,0 +1,24 @@ +%% +%% This is file `lwarp-listliketab.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `listliketab') +%% This is a generated file. +%% Copyright 2016-2018 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +\LWR@ProvidesPackageDrop{listliketab}[2005/01/09] +\newcommand*{\storestyleof}[1]{} +\newcommand*{\storeliststyle}{} +\newenvironment{listliketab}{}{} +\endinput +%% +%% End of file `lwarp-listliketab.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-longtable.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-longtable.sty index 30a6da0545e..611352d24d1 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-longtable.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-longtable.sty @@ -84,7 +84,8 @@ \def\endfirsthead{\LWR@longtable@maybeheaderror} \def\endfoot{\LWR@longtable@headerror} \def\endlastfoot{\LWR@longtable@headerror} -\newcommand\tabularnewline{\LWR@tabularendofline} +\providecommand*{\LWR@HTML@tabularnewline}{\LWR@tabularendofline} +\LWR@formatted{tabularnewline} \newcommand{\setlongtables}{}% Obsolete command, does nothing. \newlength{\LTleft} \newlength{\LTright} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-minitoc.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-minitoc.sty new file mode 100644 index 00000000000..defc2f01d59 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-minitoc.sty @@ -0,0 +1,22 @@ +%% +%% This is file `lwarp-minitoc.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `minitoc') +%% This is a generated file. +%% Copyright 2016-2018 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +\LWR@ProvidesPackageDrop{minitoc}[2018/07/12] +\usepackage{mtcoff} +\endinput +%% +%% End of file `lwarp-minitoc.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-multirow.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-multirow.sty index bd67e1dc842..47f830c04b1 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-multirow.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-multirow.sty @@ -23,6 +23,7 @@ \NewDocumentCommand{\LWR@HTML@multirow}{O{c} m o m o +m}% {% \LWR@traceinfo{*** LWR@HTML@multirow #1 #2 #4}% +\booltrue{LWR@usedmultirow}% \LWR@maybenewtablerow% \LWR@tabularleftedge% \LWR@htmltag{td rowspan="#2" % @@ -58,6 +59,7 @@ class="td% \AtBeginDocument{ \NewExpandableDocumentCommand{\LWR@HTML@multicolumnrow}{m m O{} m O{} m O{} +m}{% +\booltrue{LWR@usedmultirow}% \LWR@tabularhtmlcolumns{\arabic{LWR@tableLaTeXcolindex}}{#1} \begingroup% \LetLtxMacro{\\}{\LWR@endofline}% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-rotating.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-rotating.sty index bae13c45d88..be95d0fb964 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-rotating.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-rotating.sty @@ -18,6 +18,7 @@ \LWR@ProvidesPackageDrop{rotating}[2016/08/11] +\RequirePackage{graphicx} \LetLtxMacro\sidewaystable\table \let\endsidewaystable\endtable diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-supertabular.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-supertabular.sty index 81485b1451f..1b349795003 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-supertabular.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-supertabular.sty @@ -65,6 +65,7 @@ }% \end{tabular}% \end{table}% +\gdef\LWRST@caption{}% \LWR@traceinfo{supertabular done}% } diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-tabularx.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-tabularx.sty index 06304697f49..ab413732887 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-tabularx.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-tabularx.sty @@ -18,6 +18,7 @@ \LWR@ProvidesPackageDrop{tabularx}[2016/02/03] +\RequirePackage{array} \DeclareDocumentEnvironment{tabularx}{m o m} {\tabular{#3}} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-tabulary.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-tabulary.sty index ae149278bce..24de3812aa5 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-tabulary.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-tabulary.sty @@ -18,6 +18,7 @@ \LWR@ProvidesPackageDrop{tabulary}[2014/06/11] +\RequirePackage{array} \NewDocumentEnvironment{tabulary}{m o m} {\tabular{#3}} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-tocdata.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-tocdata.sty new file mode 100644 index 00000000000..61ec79c43b2 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-tocdata.sty @@ -0,0 +1,82 @@ +%% +%% This is file `lwarp-tocdata.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `tocdata') +%% This is a generated file. +%% Copyright 2016-2018 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +\LWR@ProvidesPackagePass{tocdata}[2019/03/21] +\renewcommand*{\LWR@maybetocdata}{% + \ifdefempty{\TD@thistocdata}{}{% + \qquad --- \InlineClass{authorartist}{\TD@thistocdata}% + \def\TD@thistocdata{} + } +} + +\renewrobustcmd{\tocdatapartprint}[4] +{% + \LWR@htmltagc{br /}% + \InlineClass{authorartist}{% + \qquad --- % + \TD@optionalname{#1}\TD@optionalname{#2}#3#4% + }% +} + +\@ifundefined{chapter}{}{ + \let\tocdatachapterprint\tocdatapartprint +} +\let\tocdatasectionprint\tocdatapartprint +\let\tocdatasubsectionprint\tocdatapartprint + +\newcommand*{\LWR@TD@settextalign}[1]{% + \def\LWR@TD@textalign{justify}% + \ifcsstring{TD@#1align}{\centering}% + {\def\LWR@TD@textalign{center}}% + {}% + \ifcsstring{TD@#1align}{\raggedleft}% + {\def\LWR@TD@textalign{right}}% + {}% + \ifcsstring{TD@#1align}{\raggedright}% + {\def\LWR@TD@textalign{left}}% + {}% +} + +\renewcommand{\TD@artistauthorprint}[5]{% + \LWR@TD@settextalign{#1}% + \begin{BlockClass}[text-align:\LWR@TD@textalign]{floatnotes}% + \InlineClass{authorartist}{\TD@optionalname{#2}\TD@optionalname{#3}#4#5}% + \end{BlockClass}% +} + +\newcommand*{\LWR@TD@setnamealign}[1]{% + \def\LWR@TD@textalign{justify}% + \ifcsstring{TD@#1textalign}{\centering}% + {\def\LWR@TD@textalign{center}}% + {}% + \ifcsstring{TD@#1textalign}{\raggedleft}% + {\def\LWR@TD@textalign{right}}% + {}% + \ifcsstring{TD@#1textalign}{\raggedright}% + {\def\LWR@TD@textalign{left}}% + {}% +} + +\renewcommand{\TD@artistauthortextprint}[2]{% + \LWR@TD@setnamealign{#1}% + \begin{BlockClass}[text-align:\LWR@TD@textalign]{floatnotes}% + #2% + \end{BlockClass}% +} +\endinput +%% +%% End of file `lwarp-tocdata.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-topcapt.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-topcapt.sty new file mode 100644 index 00000000000..e1e53684e91 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-topcapt.sty @@ -0,0 +1,22 @@ +%% +%% This is file `lwarp-topcapt.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `topcapt') +%% This is a generated file. +%% Copyright 2016-2018 Brian Dunn +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +\LWR@ProvidesPackageDrop{topcapt}[2004/12/11] +\LetLtxMacro\topcaption\caption +\endinput +%% +%% End of file `lwarp-topcapt.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-xtab.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-xtab.sty index ae592b27cf2..c6d65e15406 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-xtab.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-xtab.sty @@ -72,6 +72,7 @@ }% \end{tabular}% \endtable% +\gdef\LWRXT@caption{}% \LWR@traceinfo{xtabular done}% } diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp.sty index 45aebc5efbf..e041933521a 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} - [2019/03/05 v0.68 Allows LaTeX to directly produce HTML5 output.] + [2019/03/21 v0.69 Allows LaTeX to directly produce HTML5 output.] @@ -51,10 +51,15 @@ \@ifpackageloaded{#1} { \PackageError{lwarp} - {Package #1, or one which uses #1, must be loaded after lwarp} - {Move \detokenize{\usepackage}{#1} after \detokenize{\usepackage}{lwarp}. - Package #1 may also be loaded by something else, which must also be moved - after lwarp.} + {% + Package #1,\MessageBreak + or one which uses #1,\MessageBreak + must be loaded after lwarp + } + {Move \detokenize{\usepackage}{#1} after + \detokenize{\usepackage}{lwarp}.\MessageBreak + Package #1 may also be loaded by something else,\MessageBreak + which must also be moved after lwarp.} } {} } @@ -96,11 +101,16 @@ \newcommand*{\LWR@loadnever}[2]{% \PackageError{lwarp} -{Package #1 is not supported by lwarp's HTML conversion. -Package(s) #2 may be useful instead} -{Package #1 might conflict with lwarp in some way, -or is superceded by another package. -For a possible alternative, see package(s) #2.} +{% + Package #1 is not supported\MessageBreak + by lwarp's HTML conversion.\MessageBreak + Package(s) #2 may be useful instead +} +{% + Package #1 might conflict with lwarp in some way,\MessageBreak + or is superceded by another package.\MessageBreak + For a possible alternative, see package(s) #2. +} } \newcommand*{\LWR@checkloadnever}[3]{% \edef\LWR@tempone{#1}% @@ -111,21 +121,31 @@ For a possible alternative, see package(s) #2.} \newcommand*{\LWR@earlyloadnever}[2]{% \@ifpackageloaded{#1}{% \PackageError{lwarp} -{Package #1 is not supported by lwarp's HTML conversion. -Package(s) #2 may be useful instead} -{Package #1 might conflict with lwarp in some way, -or is superceded by another package. -For a possible alternative, see package(s) #2.} +{% + Package #1 is not supported\MessageBreak + by lwarp's HTML conversion.\MessageBreak + Package(s) #2 may be useful instead +} +{% + Package #1 might conflict with lwarp in some way,\MessageBreak + or is superceded by another package.\MessageBreak + For a possible alternative, see package(s) #2. +} }{}% } \newcommand*{\LWR@earlyclassloadnever}[2]{% \@ifclassloaded{#1}{% \PackageError{lwarp} -{Class #1 is not supported by lwarp's HTML conversion. -Class(es) #2 may be useful instead} -{Class #1 might conflict with lwarp in some way, -or is superceded by another class. -For a possible alternative, see class(es) #2.} +{% + Class #1 is not supported\MessageBreak + by lwarp's HTML conversion.\MessageBreak + Class(es) #2 may be useful instead +} +{% + Class #1 might conflict with lwarp in some way,\MessageBreak + or is superceded by another class.\MessageBreak + For a possible alternative, see class(es) #2. +} }{}% } \LWR@earlyclassloadnever{jarticle}{ujarticle} @@ -237,6 +257,7 @@ For a possible alternative, see class(es) #2.} \LWR@loadafter{continue} \LWR@loadafter{copyrightbox} \LWR@notmemoirloadafter{crop} +\LWR@loadafter{ctable} \LWR@loadafter{cuted} \LWR@loadafter{cutwin} \LWR@loadafter{dblfloatfix} @@ -263,6 +284,8 @@ For a possible alternative, see class(es) #2.} \LWR@loadafter{epsfig} \LWR@loadafter{epstopdf} \LWR@loadafter{epstopdf-base} +\LWR@loadafter{eqlist} +\LWR@loadafter{eqparbox} \LWR@loadafter{errata} \LWR@loadafter{eso-pic} \LWR@loadafter{eurosym} @@ -305,6 +328,7 @@ For a possible alternative, see class(es) #2.} \LWR@loadafter{foreign} \LWR@loadafter{forest} \LWR@loadafter{framed} +\LWR@loadafter{ftcap} \LWR@loadafter{ftnright} \LWR@loadafter{fullminipage} \LWR@loadafter{fullpage} @@ -343,6 +367,7 @@ For a possible alternative, see class(es) #2.} \LWR@loadafter{lineno} \LWR@loadafter{lips} \LWR@loadafter{listings} +\LWR@loadafter{listliketab} \LWR@loadafter{longtable} \LWR@loadafter{lscape} \LWR@loadafter{ltablex} @@ -368,6 +393,7 @@ For a possible alternative, see class(es) #2.} \LWR@loadafter{microtype} \LWR@loadafter{midfloat} \LWR@loadafter{midpage} +\LWR@loadafter{minitoc} \LWR@notmemoirloadafter{moreverb} \LWR@notmemoirloadafter{mparhack} \LWR@loadafter{multicap} @@ -503,11 +529,13 @@ For a possible alternative, see class(es) #2.} \LWR@loadafter{titletoc} \LWR@notmemoirloadafter{titling} \LWR@notmemoirloadafter{tocbibind} +\LWR@loadafter{tocdata} \LWR@loadafter{tocenter} \LWR@notmemoirloadafter{tocloft} \LWR@loadafter{tocstyle} \LWR@loadafter{todo} \LWR@loadafter{todonotes} +\LWR@loadafter{topcapt} \LWR@loadafter{tram} \LWR@loadafter{transparent} \LWR@loadafter{trimclip} @@ -1125,7 +1153,9 @@ For a possible alternative, see class(es) #2.} \begin{warpHTML} \NewDocumentCommand{\LWR@ProvidesPackagePass}{m o}{ -\PackageInfo{lwarp}{Using package `#1' and adding lwarp modifications, including options,}% +\PackageInfo{lwarp}{% + Using package `#1' and adding lwarp modifications,\MessageBreak + including options,}% \IfValueTF{#2} {\ProvidesPackage{lwarp-#1}[#2]} {\ProvidesPackage{lwarp-#1}} @@ -1139,7 +1169,10 @@ For a possible alternative, see class(es) #2.} } \NewDocumentCommand{\LWR@ProvidesPackageDrop}{m o}{ -\PackageInfo{lwarp}{Replacing package `#1' with the lwarp version, discarding options,}% +\PackageInfo{lwarp}{% + Replacing package `#1' with the lwarp version,\MessageBreak + and discarding options,% +}% \IfValueTF{#2} {\ProvidesPackage{lwarp-#1}[#2]} {\ProvidesPackage{lwarp-#1}} @@ -2171,6 +2204,7 @@ div.titlepage { div.marginblock, div.marginparblock { max-width:50%; + min-width: 10em; /* room for caption */ float:right; text-align:left; margin: 1ex 0.5em 1ex 1em ; @@ -3018,6 +3052,19 @@ span.alg2elinenumber{ /* Used for algorithmicx: */ span.floatright { float: right ; } +/* keyfloat and tocdata: */ +.floatnotes { + margin: 0ex 5% 0ex 5% ; + padding: 0ex 1em 0ex 1em ; + font-size:.80em ; + text-align: left ; +} + +.authorartist{ + font-size:.70em ; + font-style: italic; +} + /* Native LaTeX theorems: */ .theoremcontents { font-style: italic; margin-top: 3ex ; margin-bottom: 3ex ; } @@ -3867,7 +3914,7 @@ src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.4/MathJax.js?config=TeX- -- Copyright 2016-2018 Brian Dunn -printversion = "v0.68" +printversion = "v0.69" requiredconfversion = "2" -- also at *lwarpmk.conf function printhelp () @@ -6045,13 +6092,17 @@ end -- not --version \csdef{LWR@filename\LWR@hashedname}{}% }{% \PackageError{lwarp} - { - Section name ``#1'', at the line number listed below, - generates the filename ``\LWR@thisfilename'', - which appears to be a duplicate. - There is a previous section with an identical or similar name.% + {% + Section name\MessageBreak + ``#1'',\MessageBreak + at the line number listed below,\MessageBreak + generates the filename\MessageBreak + ``\LWR@thisfilename'',\MessageBreak + which appears to be a duplicate.\MessageBreak + There is a previous section with an\MessageBreak + identical or similar name% } - { + {% Lwarp sanitizes most symbols and a few common short words when generating file names, and this may cause a conflict. } @@ -7292,6 +7343,10 @@ end -- not --version \newbool{LWR@skippingmcolrowcell} +\newbool{LWR@usedmultirow} + +\newbool{LWR@foundmrowcell} + \newbool{LWR@skipatbang} \newbool{LWR@emptyatbang} @@ -7616,6 +7671,17 @@ end -- not --version \addtocounter{LWR@tablecolspecindex}{2}% } +\newcommand*{\LWR@parsestarcolumn}{% + \PackageError{lwarp}% + {% + The tabular star column specifier\MessageBreak + *{xx}{yy}\MessageBreak + is not yet supported by lwarp% + }% + {Convert *{xx}{yy} to xx copies of yy.}% + \addtocounter{LWR@tablecolspecindex}{2}% +} + \newcommand*{\LWR@parseDcolumn}[1]{% \LWR@parsenormalcolumn{#1}% \addtocounter{LWR@tablecolspecindex}{3}% @@ -7693,6 +7759,7 @@ end -- not --version \IfStrEq{\LWR@strresult}{b}{\LWR@parsepcolumn{b}}{}% \IfStrEq{\LWR@strresult}{w}{\LWR@parsewcolumn}{}% \IfStrEq{\LWR@strresult}{W}{\LWR@parsewcolumn}{}% +\IfStrEq{\LWR@strresult}{*}{\LWR@parsestarcolumn}{}% \IfStrEq{\LWR@strresult}{D}{\LWR@parseDcolumn{c}}{}% \IfStrEq{\LWR@strresult}{X}{\LWR@parsenormalcolumn{X}}{}% \IfStrEq{\LWR@strresult}{P}{\LWR@parsepcolumn{P}}{}% @@ -8775,6 +8842,8 @@ rowspan="#2" % \LWR@nullifyNoAutoSpacing% \global\boolfalse{LWR@exitingtabular}% \global\boolfalse{LWR@tabularmutemods}% +\boolfalse{LWR@usedmultirow} +\boolfalse{LWR@foundmrowcell} \global\booltrue{LWR@intabularmetadata}% \LWR@traceinfo{LWR@@tabular: About to LWR@forecenewpage.}% \LWR@forcenewpage @@ -8826,10 +8895,12 @@ rowspan="#2" % \LWR@maybenewtablerow% \LWR@tabularleftedge% \global\booltrue{LWR@skippingmrowcell}% + \booltrue{LWR@foundmrowcell}% }% \renewcommand*{\mcolrowcell}{% \LWR@maybenewtablerow% \global\booltrue{LWR@skippingmcolrowcell}% + \booltrue{LWR@foundmrowcell}% }% \LetLtxMacro\caption\LWR@longtabledatacaptiontag% \global\boolfalse{LWR@tableparcell}% @@ -8873,6 +8944,25 @@ rowspan="#2" % \addtocounter{LWR@tabulardepth}{-1}% \protected\gdef&{\LWR@origampmacro}% \StopDefiningTabulars% +\ifbool{LWR@usedmultirow}{% + \ifbool{LWR@foundmrowcell}% + {}% + {% + \PackageError{lwarp}% + {% + When using \protect\multirow, \protect\multicolumnrow,\MessageBreak + or the bigdelim package,\MessageBreak + place \protect\mrowcell\space or \protect\mcolrowcell\MessageBreak + in empty cells which are to be skipped.\MessageBreak + See the lwarp package documentation:\MessageBreak + "Special cases and limitations" -> "Tabular" + }% + {% + See the lwarp package documentation:\MessageBreak + "Special cases and limitations" -> "Tabular". + }% + }% +}{}% \LWR@traceinfo{LWR@HTML@endtabular finished}% } @@ -9494,6 +9584,8 @@ autopage-\theLWR@currentautosec% \LetLtxMacro\numberline\LWR@numberline +\newcommand*{\LWR@maybetocdata}{} + \NewDocumentCommand{\hypertoc}{m m +m m}{% \LWR@traceinfo{hypertoc !#1!#2!#3!#4!}% \ifthenelse{\cnttest{#1}{<=}{\value{tocdepth}}}% @@ -9503,6 +9595,7 @@ autopage-\theLWR@currentautosec% \LWR@htmlrefsectionfilename{autopage-#4}% \LWR@origpound\LWR@print@mbox{autosec-#4}% }{#3}{toc#2}% + \LWR@maybetocdata% \LWR@stoppars% }% {}% @@ -9533,6 +9626,7 @@ autopage-\theLWR@currentautosec% \LWR@htmlrefsectionfilename{autopage-\arabic{LWR@nextautopage}}% \LWR@origpound\LWR@print@mbox{autoid-\arabic{LWR@nextautoid}}}% {#4}{toc#2}% + \LWR@maybetocdata% \LWR@stoppars% }% {}% @@ -10582,7 +10676,6 @@ autopage-\theLWR@currentautosec% \LWR@traceinfo{lateximage: ending outer-most lateximage}% \endLWR@print@minipage% \LWR@orignewpage% - \LWR@print@scriptsize% \LWR@print@vspace*{.5\baselineskip}% \LWR@htmlclosecomment% \LWR@traceinfo{lateximage: The page after the image is \arabic{page}}% @@ -11118,32 +11211,64 @@ autopage-\theLWR@currentautosec% \newcommand*{\LWR@HTML@mbox}[1]{#1} \LWR@formatted{mbox} -\NewDocumentCommand{\LWR@HTML@makebox}{d() o o m}{% -\IfValueTF{#2}% -{% - {% scope +\NewDocumentCommand{\LWR@@makebox@paren}{m m}{% +\IfValueTF{#2}{% + \setlength{\LWR@tempwidth}{#1\unitlength}% + \setlength{\LWR@tempheight}{#2\unitlength}% + \appto{\LWR@temptwo}{% + \LWR@print@mbox{width:\LWR@printlength{\LWR@tempwidth}} ; % space + \LWR@print@mbox{height:\LWR@printlength{\LWR@tempheight}} ; % space + }% +}{% + \PackageError{lwarp}% + {(width,height) is missing a comma ',' character}% + {\protect\makebox\space \protect\framebox\space accept + a size in the format (width,height).}% +}% +} +\newcommand*{\LWR@@makebox@align}[1]{% \def\LWR@align{center}% - \ifstrequal{#3}{l}{\def\LWR@align{left}}{}% - \ifstrequal{#3}{r}{\def\LWR@align{right}}{}% - \ifstrequal{#3}{s}{\def\LWR@align{justify}}{}% - \setlength{\LWR@tempwidth}{#2}% + \ifstrequal{#1}{l}{\def\LWR@align{left}}{}% + \ifstrequal{#1}{r}{\def\LWR@align{right}}{}% + \ifstrequal{#1}{s}{\def\LWR@align{justify}}{}% + \appto{\LWR@temptwo}{% + \LWR@print@mbox{text-align:\LWR@align} ; % + }% +} +\NewDocumentCommand{\LWR@HTML@makebox}{>{\SplitArgument{1}{,}}d() o o m}{% +{% scope + \def\LWR@temptwo{}% + \IfValueTF{#1}% + {% (width,height) .. + \LWR@@makebox@paren #1% + \IfValueT{#2}% + {% (width,height) [posn] + \LWR@@makebox@align{#2}% + }% + }% + {% [width] + \setlength{\LWR@tempwidth}{#2}% + \appto{\LWR@temptwo}{% + width:\LWR@printlength{\LWR@tempwidth} ; % space + }% + \IfValueT{#3}% + {% [width] [posn] + \LWR@@makebox@align{#3}% + }% + }% \InlineClass[% \LWR@print@mbox{display:inline-block} ; % - \LWR@print@mbox{text-align}:\LWR@align\ ; % - width:\LWR@printlength{\LWR@tempwidth}% + \LWR@temptwo% ]% {makebox}% {#4}% - }% scope -}% -{#4}% no width +}% scope } - \LWR@formatted{makebox} \LetLtxMacro\LWR@origframebox\framebox -\NewDocumentCommand{\LWR@HTML@framebox}{o o m}{% -\fbox{\makebox[#1][#2]{#3}}% +\NewDocumentCommand{\LWR@HTML@framebox}{d() o o m}{% + \fbox{\makebox(#1)[#2][#3]{#4}}% } \LWR@formatted{framebox} @@ -11219,7 +11344,6 @@ color:\LWR@origpound\LWR@tempcolor% \LetLtxMacro\endfminipage\endLWR@print@fminipage \end{warpall} - \begin{warpHTML} \NewDocumentEnvironment{LWR@HTML@fminipage}{O{t} o O{t} m} @@ -11232,7 +11356,17 @@ color:\LWR@origpound\LWR@tempcolor% \begin{BlockClass}[% \LWR@fboxstyle ; % \IfValueT{#2}{height:\LWR@printlength{\LWR@tempheight} ; }% -width:\LWR@printlength{\LWR@tempwidth}% +\ifbool{LWR@minipagefullwidth}% +{\global\boolfalse{LWR@minipagefullwidth}}% +{% + \ifbool{LWR@forceminipagefullwidth}% + {}% + {% + \ifthenelse{\lengthtest{\LWR@tempwidth}=\linewidth}% + {}% + {width:\LWR@printlength{\LWR@tempwidth} ; }% + }% +}% ]{fminipage}% } {% -- cgit v1.2.3