diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/lwarp/lwarp.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/lwarp/lwarp.sty | 173 |
1 files changed, 113 insertions, 60 deletions
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp.sty index 8691e932519..930690dcd95 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} - [2018/02/14 v0.48 Allows LaTeX to directly produce HTML5 output.] + [2018/02/19 v0.49 Allows LaTeX to directly produce HTML5 output.] @@ -272,6 +272,7 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{fancyref} \LWR@loadafter{fancyvrb} \LWR@loadafter{figcaps} +\LWR@loadafter{figsize} \LWR@loadafter{fix2col} \LWR@loadafter{fixme} \LWR@loadafter{fixmetodonotes} @@ -283,6 +284,7 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{fltrace} \LWR@loadafter{flushend} \LWR@loadafter{fncychap} +\LWR@loadafter{fnlineno} \LWR@loadafter{fnpos} \LWR@loadafter{footmisc} \LWR@loadafter{footnote} @@ -299,9 +301,11 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{hang} \LWR@loadafter{hanging} \LWR@loadafter{hypcap} +\LWR@loadafter{hypdestopt} \LWR@loadafter{hypernat} \LWR@loadafter{hyperref} \LWR@loadafter{hyperxmp} +\LWR@loadafter{hyphenat} \LWR@loadafter{idxlayout} \LWR@loadafter{ifoddpage} \LWR@loadafter{indentfirst} @@ -309,12 +313,14 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{layout} \LWR@loadafter{letterspace} \LWR@loadafter{lettrine} +\LWR@loadafter{lineno} \LWR@loadafter{lips} \LWR@loadafter{listings} \LWR@loadafter{longtable} \LWR@loadafter{lscape} \LWR@loadafter{ltcaption} \LWR@loadafter{ltxtable} +\LWR@loadafter{luacolor} \LWR@loadafter{luatodonotes} \LWR@loadafter{marginfit} \LWR@loadafter{marginfix} @@ -340,10 +346,12 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{nowidow} \LWR@loadafter{ntheorem} \LWR@loadafter{overpic} +\LWR@loadafter{pagegrid} \LWR@notmemoirloadafter{pagenote} \LWR@loadafter{pagesel} \LWR@loadafter{paralist} \LWR@notmemoirloadafter{parskip} +\LWR@loadafter{pdfrender} \LWR@loadafter{pdflscape} \LWR@loadafter{pdfsync} \LWR@loadafter{pfnote} @@ -355,6 +363,7 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{ragged2e} \LWR@loadafter{realscripts} \LWR@loadafter{relsize} +\LWR@loadafter{resizegather} \LWR@loadafter{romanbar} \LWR@loadafter{romanbarpagenumber} \LWR@loadafter{rotating} @@ -408,7 +417,9 @@ For a possible alternative, see package(s) #2.} \LWR@loadafter{upref} \LWR@loadafter{varioref}% no lwarp package provided \LWR@notmemoirloadafter{verse} +\LWR@loadafter{vertbars} \LWR@loadafter{vmargin} +\LWR@loadafter{vwcol} \LWR@loadafter{wallpaper} \LWR@loadafter{watermark} \LWR@loadafter{wrapfig} @@ -537,10 +548,24 @@ top=1in,bottom=1in,% \PassOptionsToPackage{leqno}{amsmath} \RequirePackage{amsmath} +\def\maketag@@@#1{#1} +\def\tagform@#1{\maketag@@@{(\ignorespaces#1\unskip)}} \RequirePackage{printlen} +\newrobustcmd*{\LWR@printlength}[1]{% +\begingroup% +\uselengthunit{PT}% +\renewcommand*{\unitspace}{}% +\ifdimless{#1}{10pt}{% + \printlength{#1}% +}{% + \rndprintlength{#1}% +}% +\endgroup% +} + \end{warpHTML} \begin{warpprint} @@ -2941,7 +2966,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.48" +printversion = "v0.49" function printhelp () print ("lwarpmk: Use lwarpmk -h or lwarpmk --help for help.") ; @@ -5079,7 +5104,13 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \end{warpHTML} \begin{warpall} -\newrobustcmd{\affiliation}[1]{} +\ifcsvoid{@titlepagefalse}{ + \newif\if@titlepage + \@titlepagefalse +}{} +\end{warpall} +\begin{warpall} +\providerobustcmd{\affiliation}[1]{} \end{warpall} \begin{warpprint} \AtBeginEnvironment{titlepage}{ @@ -5818,14 +5849,15 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \ifnumcomp{\value{LWR@tablecolindex}}{<}{\value{LWR@tabletotalcols}}% {\LWR@tabularfinishrow}% {\LWR@closetabledatacell}% -\LWR@htmltag{/tr}\LWR@orignewline -\global\booltrue{LWR@intabularmetadata} -\global\boolfalse{LWR@startedrow} +\LWR@htmltag{/tr}\LWR@orignewline% +\@rowc@lors% +\global\booltrue{LWR@intabularmetadata}% +\global\boolfalse{LWR@startedrow}% \global\boolfalse{LWR@doinghline}% \global\boolfalse{LWR@doingtbrule}% \global\boolfalse{LWR@doingcmidrule}% \LWR@clearmidrules% -\renewcommand*{\LWR@rowHTMLcolor}{} +\renewcommand*{\LWR@rowHTMLcolor}{}% \setcounter{LWR@tablecolindex}{1}% \boolfalse{LWR@tabularcelladded}% \LWR@getmynexttoken% @@ -6012,11 +6044,14 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \LWR@traceinfo{LWR@parsetablecols: done}% }% - -\newcommand{\LWR@columnHTMLcolor}{} -\newcommand{\LWR@rowHTMLcolor}{} -\newcommand{\LWR@cellHTMLcolor}{} -\newcommand{\LWR@ruleHTMLcolor}{} + \@ifundefined{rownum}{\newcount\rownum}{} +\newcommand*{\@rowcolors}{} +\newcommand*{\@rowc@lors}{} +\newcommand*{\LWR@xcolorrowHTMLcolor}{} +\newcommand*{\LWR@columnHTMLcolor}{} +\newcommand*{\LWR@rowHTMLcolor}{} +\newcommand*{\LWR@cellHTMLcolor}{} +\newcommand*{\LWR@ruleHTMLcolor}{} \NewDocumentCommand{\LWR@HTMLcolumncolor}{O{named} m o o}{} \NewDocumentCommand{\LWR@HTMLrowcolor}{O{named} m o o}{\LWR@getmynexttoken} @@ -6284,8 +6319,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% {% custom width and/or color \LWR@forceminwidth{#1}% \LWR@tdaddstyle% - \uselengthunit{PT}% - border-top:\rndprintlength{\LWR@atleastonept} solid % + border-top:\LWR@printlength{\LWR@atleastonept} solid % \ifdefvoid{\LWR@ruleHTMLcolor}{% \ifdimcomp{#1}{<}{\LWR@lightrulewidth}% {\#A0A0A0}% @@ -6326,11 +6360,17 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% \newcommand*{\LWR@addtabularrowcolor}{% \ifbool{LWR@tabularmutemods}{}{% - \ifdefvoid{\LWR@rowHTMLcolor}{}% - {% row color + \ifdefvoid{\LWR@rowHTMLcolor}{% + \ifdefvoid{\LWR@xcolorrowHTMLcolor}{}% + {% xcolor row color + \LWR@tdaddstyle% + background:\#\LWR@xcolorrowHTMLcolor% + }% + }% + {% explicit row color \LWR@tdaddstyle% background:\#\LWR@rowHTMLcolor% - }% row color + }% }% } @@ -6379,9 +6419,13 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}% {% \ifdefvoid{\LWR@rowHTMLcolor}% {% - \ifdefvoid{\LWR@columnHTMLcolor}% - {}% - {\LWR@subaddtabularcellcolor{\LWR@columnHTMLcolor}}% + \ifdefvoid{\LWR@xcolorrowHTMLcolor}% + {% + \ifdefvoid{\LWR@columnHTMLcolor}% + {}% + {\LWR@subaddtabularcellcolor{\LWR@columnHTMLcolor}}% + }% + {\LWR@subaddtabularcellcolor{\LWR@xcolorrowHTMLcolor}}% }% {\LWR@subaddtabularcellcolor{\LWR@rowHTMLcolor}}% }% @@ -6525,6 +6569,7 @@ rowspan="#2" % \ifbool{LWR@mcolvertbarr}{ tvertbarr}{}% "% \LWR@tdstartstyles% +\LWR@addtabularrowcolor% \LWR@addcmidrulewidth% \LWR@addtabularhrulecolor% \LWR@addmulticolvertrulecolor% @@ -6726,6 +6771,8 @@ rowspan="#2" % {\let\mynext\LWR@donothing}{}% \ifdefequal{\LWR@mynexttoken}{\multicolumnrow}% {\let\mynext\LWR@donothing}{}% +\ifdefequal{\LWR@mynexttoken}{\noalign}% + {\let\mynext\LWR@donothing}{}% \ifdefequal{\LWR@mynexttoken}{\mrowcell}% {\let\mynext\LWR@donothing}{}% \ifdefequal{\LWR@mynexttoken}{\mcolrowcell}% @@ -6796,6 +6843,16 @@ rowspan="#2" % \newcommand*{\LWR@origaddlinespace}[1][]{} \newcommand*{\LWR@origmorecmidrules}{} \newcommand*{\LWR@origspecialrule}[3]{\hline} +\LetLtxMacro\LWR@orignoalign\noalign + +\newcommand{\LWR@tabularnoalign}[1]{% +\begingroup% +\global\advance\rownum\m@ne% +\renewcommand*{\LWR@xcolorrowHTMLcolor}{}% +\multicolumn{\value{LWR@tabletotalcols}}{l}{#1} \\ +\endgroup% +\LWR@getmynexttoken% +} \AtBeginDocument{ \@ifpackageloaded{lwarp-tabls} { @@ -6853,20 +6910,22 @@ rowspan="#2" % \boolfalse{LWR@tabularcelladded}% \LWR@clearmidrules% \LetLtxMacro{\\}{\LWR@tabularendofline}% -\LetLtxMacro\columncolor\LWR@HTMLcolumncolor -\LetLtxMacro\rowcolor\LWR@HTMLrowcolor -\LetLtxMacro\cellcolor\LWR@HTMLcellcolor -\LetLtxMacro\arrayrulecolor\LWR@HTMLarrayrulecolor -\LetLtxMacro\doublerulesepcolor\LWR@HTMLdoublerulesepcolor -\renewcommand*{\LWR@columnHTMLcolor}{} -\renewcommand*{\LWR@rowHTMLcolor}{} -\renewcommand*{\LWR@cellHTMLcolor}{} -\edef\LWR@vertruleHTMLcolor{\LWR@ruleHTMLcolor} -\setcounter{LWR@cellcolordepth}{0} +\LetLtxMacro\columncolor\LWR@HTMLcolumncolor% +\LetLtxMacro\rowcolor\LWR@HTMLrowcolor% +\LetLtxMacro\cellcolor\LWR@HTMLcellcolor% +\LetLtxMacro\arrayrulecolor\LWR@HTMLarrayrulecolor% +\LetLtxMacro\doublerulesepcolor\LWR@HTMLdoublerulesepcolor% +\renewcommand*{\LWR@columnHTMLcolor}{}% +\renewcommand*{\LWR@rowHTMLcolor}{}% +\renewcommand*{\LWR@cellHTMLcolor}{}% +\@rowcolors% +\edef\LWR@vertruleHTMLcolor{\LWR@ruleHTMLcolor}% +\setcounter{LWR@cellcolordepth}{0}% \LWR@traceinfo{LWR@tabular: redefining macros}% +\LetLtxMacro\noalign\LWR@tabularnoalign% \LetLtxMacro\hline\LWR@HTMLhline% \LetLtxMacro\cline\LWR@HTMLcline% -\DeclareDocumentCommand{\toprule}{o d()} +\DeclareDocumentCommand{\toprule}{o d()}% {% \IfValueTF{##1}% {\LWR@docmidrule[##1](){1-\arabic{LWR@tabletotalcols}}}% @@ -6888,7 +6947,7 @@ rowspan="#2" % \LWR@getmynexttoken}% \DeclareDocumentCommand{\cmidrule}{O{\LWR@cmidrulewidth} d() m}% {\LWR@docmidrule[##1](##2){##3}\LWR@getmynexttoken}% -\DeclareDocumentCommand{\bottomrule}{o d()} +\DeclareDocumentCommand{\bottomrule}{o d()}% {% \IfValueTF{##1}% {\LWR@docmidrule[##1](){1-\arabic{LWR@tabletotalcols}}}% @@ -6946,6 +7005,7 @@ rowspan="#2" % \LWR@closetabledatacell% }% \LWR@htmlblocktag{/tr}% +\@rowc@lors% \LWR@htmlblocktag{/table}% \global\boolfalse{LWR@intabularmetadata}% \addtocounter{LWR@tabulardepth}{-1}% @@ -7143,7 +7203,7 @@ autopage-\theLWR@currentautosec% \LWR@ensuredoingapar% } -\NewDocumentCommand{\href}{O{} m +m}{% +\DeclareDocumentCommand{\href}{O{} m +m}{% \LWR@ensuredoingapar% \LWR@subhyperref{#2}{#3}% } @@ -7155,7 +7215,7 @@ autopage-\theLWR@currentautosec% \LWR@templink% } -\NewDocumentCommand{\url}{m}{% +\DeclareDocumentCommand{\url}{m}{% \LWR@ensuredoingapar% \def\LWR@templink{#1}% \@onelevel@sanitize\LWR@templink% @@ -7714,6 +7774,7 @@ autopage-\theLWR@currentautosec% \let\qquad\LWR@origqquad% \LetLtxMacro\tabular\LWR@origtabular% \LetLtxMacro\endtabular\LWR@origendtabular% +\LetLtxMacro\noalign\LWR@orignoalign% \LetLtxMacro\hline\LWR@orighline% \LetLtxMacro\toprule\LWR@origtoprule% \LetLtxMacro\midrule\LWR@origmidrule% @@ -7799,7 +7860,6 @@ autopage-\theLWR@currentautosec% \protected\gdef\LWR@subsingledollar#1{% \begingroup% -\normalsize% \ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }% {% {\textbackslash(\LWR@HTMLsanitize{#1}\textbackslash)}% @@ -7816,6 +7876,7 @@ autopage-\theLWR@currentautosec% \global\setlength{\LWR@singledollarheight}{\totalheightof{% \LWR@origdollar#1\LWR@origdollar% }*\real{.8}}% + \LWR@origscriptsize% \def\LWR@singledollarstyle{% height:\LWR@convertto{em}{\the\LWR@singledollarheight }em% }% @@ -8780,7 +8841,6 @@ autopage-\theLWR@currentautosec% \boolfalse{LWR@minipagethispar} \RenewDocumentEnvironment{minipage}{O{t} o O{t} m} {% -\uselengthunit{PT}% \begingroup \setlength{\LWR@minipagewidth}{#4}% \ifthenelse{\cnttest{\value{LWR@minipagedepth}}{=}{0}}{% @@ -8790,7 +8850,7 @@ autopage-\theLWR@currentautosec% \setlength{\textwidth}{6in}% \setlength{\textheight}{9in}% }{}% -\LWR@traceinfo{computed width is \rndprintlength{\LWR@minipagewidth}}% +\LWR@traceinfo{computed width is \LWR@printlength{\LWR@minipagewidth}}% \setlength{\LWR@minipageheight}{\textheight}% default unless specified \IfValueT{#2}{\setlength{\LWR@minipageheight}{#2}}% \addtocounter{LWR@minipagedepth}{1}% @@ -8811,17 +8871,16 @@ autopage-\theLWR@currentautosec% \ifthenelse{\equal{#3}{c}}{\LWR@origmbox{justify-content:center} ; }{}% \ifthenelse{\equal{#3}{b}}{\LWR@origmbox{justify-content:flex-end} ; }{}% \ifthenelse{\equal{#3}{s}}{\LWR@origmbox{justify-content:space-between} ; }{}% -\LWR@traceinfo{minipage: about to print the width of \rndprintlength{\LWR@minipagewidth}}% -\uselengthunit{PT}% +\LWR@traceinfo{minipage: about to print the width of \LWR@printlength{\LWR@minipagewidth}}% \ifbool{LWR@minipagefullwidth}% {\boolfalse{LWR@minipagefullwidth}}% {% \ifthenelse{\lengthtest{#4}=\linewidth}% {}% - {width:\rndprintlength{\LWR@minipagewidth} ; }% + {width:\LWR@printlength{\LWR@minipagewidth} ; }% }% \LWR@traceinfo{minipage: about to print the height}% -\IfValueT{#2}{height:\rndprintlength{\LWR@minipageheight} ; }% +\IfValueT{#2}{height:\LWR@printlength{\LWR@minipageheight} ; }% "}% \setlength{\linewidth}{#4}% the original width @@ -8878,11 +8937,10 @@ autopage-\theLWR@currentautosec% \ifstrequal{#3}{r}{\def\LWR@align{right}}{}% \ifstrequal{#3}{s}{\def\LWR@align{justify}}{}% \setlength{\LWR@tempwidth}{#2}% - \uselengthunit{PT}% \InlineClass[% \LWR@origmbox{display:inline-block} ; % \LWR@origmbox{text-align}:\LWR@align\ ; % - width:\rndprintlength{\LWR@tempwidth}% + width:\LWR@printlength{\LWR@tempwidth}% ]% {makebox}% {#4}% @@ -8908,9 +8966,8 @@ autopage-\theLWR@currentautosec% } \newcommand*{\LWR@blackborderpadding}{% -\uselengthunit{PT}% -border:\rndprintlength{\LWR@atleastonept} solid black ; % -padding:\rndprintlength{\fboxsep}% +border:\LWR@printlength{\LWR@atleastonept} solid black ; % +padding:\LWR@printlength{\fboxsep}% } \let\LWRprint@fbox\fbox \newcommand{\LWRhtml@fbox}[1]{% @@ -8939,9 +8996,8 @@ padding:\rndprintlength{\fboxsep}% \IfValueT{#2}{\setlength{\LWR@tempheight}{#2}}% \begin{BlockClass}[% \LWR@blackborderpadding ; % -\uselengthunit{PT}% -\IfValueT{#2}{height:\rndprintlength{\LWR@tempheight} ; }% -width:\rndprintlength{\LWR@tempwidth}% +\IfValueT{#2}{height:\LWR@printlength{\LWR@tempheight} ; }% +width:\LWR@printlength{\LWR@tempwidth}% ]{fminipage}% } {% @@ -9197,10 +9253,9 @@ width:\rndprintlength{\LWR@tempwidth}% \renewcommand*{\LARGE}{} \renewcommand*{\huge}{} \renewcommand*{\Huge}{} +\DeclareDocumentCommand{\onecolumn}{}{} -\renewcommand*{\onecolumn}{} - -\renewcommand{\twocolumn}[1][]{ +\DeclareDocumentCommand{\twocolumn}{O{}}{ #1 @@ -9263,9 +9318,8 @@ width:\rndprintlength{\LWR@tempwidth}% \HTMLunicode{2009}% thin breakable space }% {% - \uselengthunit{PT}% \LWR@htmltagc{% - span style="width:\printlength{\LWR@tempwidth}; % + span style="width:\LWR@printlength{\LWR@tempwidth}; % display:inline-block"% }% \ifbool{FormatWP}{% @@ -9318,23 +9372,22 @@ width:\rndprintlength{\LWR@tempwidth}% }% {\setlength{\LWR@tempheight}{1pt}}{}% \LWR@minipagestoppars% - \uselengthunit{PT}% \LWR@htmltagc{% span style="% \ifbool{FormatWP}{}{background:\LWR@currenttextcolor ; }% - width:\printlength{\LWR@tempwidth} ; % - height:\printlength{\LWR@tempheight} ; % + width:\LWR@printlength{\LWR@tempwidth} ; % + height:\LWR@printlength{\LWR@tempheight} ; % \IfValueT{#1}% {% \setlength{\LWR@tempraise}{0pt-#1}% \setlength{\LWR@tempraise}{\LWR@tempraise*2}% \LWR@orignewline% - -ms-transform: translate(0pt,\printlength{\LWR@tempraise}); % + -ms-transform: translate(0pt,\LWR@printlength{\LWR@tempraise}); % \LWR@orignewline% - -webkit-transform: translate(0pt,\printlength{\LWR@tempraise}); % + -webkit-transform: translate(0pt,\LWR@printlength{\LWR@tempraise}); % \LWR@orignewline% - transform: translate(0pt,\printlength{\LWR@tempraise}); % + transform: translate(0pt,\LWR@printlength{\LWR@tempraise}); % \LWR@orignewline% }% display:inline-block;"% |