diff options
author | Karl Berry <karl@freefriends.org> | 2019-06-08 21:41:53 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2019-06-08 21:41:53 +0000 |
commit | f59eaadd336001e0df9b784bab26f72ea6ae83c3 (patch) | |
tree | 1355186465d2b404681366aff13d10065a1829a3 /Master/texmf-dist/tex/latex/lwarp/lwarp.sty | |
parent | 05fdcf5329e9cad9bf82381d8e588fbe86d84326 (diff) |
lwarp (8jun19)
git-svn-id: svn://tug.org/texlive/trunk@51346 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/lwarp/lwarp.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/lwarp/lwarp.sty | 517 |
1 files changed, 292 insertions, 225 deletions
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp.sty index 72dfd66c253..e9e738fd8a2 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/04/29 v0.71 Allows LaTeX to directly produce HTML5 output.] + [2019/06/08 v0.72 Allows LaTeX to directly produce HTML5 output.] @@ -215,6 +215,7 @@ \LWR@loadafter{autonum} \LWR@loadafter{axessibility} \LWR@loadafter{axodraw2} +\LWR@loadafter{backnaur} \LWR@loadafter{backref} \LWR@loadafter{balance} \LWR@loadafter{bbding} @@ -348,6 +349,7 @@ \LWR@loadafter{gridset} \LWR@loadafter{hang} \LWR@loadafter{hanging} +\LWR@loadafter{hypbmsec} \LWR@loadafter{hypcap} \LWR@loadafter{hypdestopt} \LWR@loadafter{hypernat} @@ -399,6 +401,7 @@ \LWR@loadafter{microtype} \LWR@loadafter{midfloat} \LWR@loadafter{midpage} +\LWR@loadafter{minibox} \LWR@loadafter{minitoc} \LWR@notmemoirloadafter{moreverb} \LWR@notmemoirloadafter{movie15} @@ -436,6 +439,7 @@ \LWR@notmemoirloadafter{parskip} \LWR@loadafter{pbox} \LWR@loadafter{pdfcomment} +\LWR@loadafter{pdfcrypt} \LWR@loadafter{pdflscape} \LWR@loadafter{pdfmarginpar} \LWR@loadafter{pdfpages} @@ -495,6 +499,7 @@ \LWR@loadafter{semantic-markup} \LWR@notmemoirloadafter{setspace} \LWR@loadafter{shadow} +\LWR@loadafter{shapepar} \LWR@notmemoirloadafter{showidx} \LWR@loadafter{showkeys} \LWR@loadafter{showtags} @@ -502,6 +507,7 @@ \LWR@loadafter{sidenotes} \LWR@loadafter{SIunits} \LWR@loadafter{siunitx} +\LWR@loadafter{slantsc} \LWR@loadafter{soul} \LWR@loadafter{soulpos} \LWR@loadafter{soulutf8} @@ -516,6 +522,7 @@ \LWR@loadafter{subfigure} \LWR@loadafter{supertabular} \LWR@loadafter{t1inc} +\LWR@loadafter{tabfigures} \LWR@loadafter{tabls} \LWR@loadafter{tablefootnote} \LWR@notmemoirloadafter{tabularx} @@ -582,6 +589,8 @@ \LWR@loadafter{xmpincl} \LWR@loadafter{xpiano} \LWR@loadafter{xpinyin} +\LWR@loadafter{xr} +\LWR@loadafter{xr-hyper} \LWR@loadafter{xtab} \LWR@loadafter{xurl} \LWR@loadafter{xy} @@ -1104,6 +1113,8 @@ \LWR@checkloadbefore{#1}{fontspec} \LWR@checkloadbefore{#1}{inputenc} \LWR@checkloadbefore{#1}{inputenx} +\LWR@checkloadbefore{#1}{nfssext-cfr} +\LWR@checkloadbefore{#1}{fontaxes} \LWR@checkloadbefore{#1}{kotex} \LWR@checkloadbefore{#1}{luatexja} \LWR@checkloadbefore{#1}{luatexja-fontspec} @@ -1380,8 +1391,12 @@ \csletcs{endLWR@print@#1}{end#1}% }{}% \DeclareDocumentEnvironment{#1}{}% - {\@nameuse{LWR@\LWR@formatting @#1}}% - {\@nameuse{endLWR@\LWR@formatting @#1}}% + {% + \@nameuse{LWR@\LWR@formatting @#1}% + }% + {% + \@nameuse{endLWR@\LWR@formatting @#1}% + }% } \newcommand*{\LWR@expandableformattedenv}[1]{% \ifcsundef{LWR@print@#1}{% @@ -1390,8 +1405,12 @@ \csletcs{endLWR@print@#1}{end#1}% }{}% \DeclareExpandableDocumentEnvironment{#1}{}% - {\@nameuse{LWR@\LWR@formatting @#1}}% - {\@nameuse{endLWR@\LWR@formatting @#1}}% + {% + \@nameuse{LWR@\LWR@formatting @#1}% + }% + {% + \@nameuse{endLWR@\LWR@formatting @#1}% + }% } \end{warpHTML} @@ -1509,20 +1528,8 @@ \let\LWR@origtextellipsis\textellipsis \let\LWR@orig@textquotedbl\textquotedbl -\LetLtxMacro\LWR@origrmfamily\rmfamily -\LetLtxMacro\LWR@origsffamily\sffamily \LetLtxMacro\LWR@origttfamily\ttfamily -\LetLtxMacro\LWR@origbfseries\bfseries -\LetLtxMacro\LWR@origmdseries\mdseries -\LetLtxMacro\LWR@origupshape\upshape -\LetLtxMacro\LWR@origslshape\slshape -\LetLtxMacro\LWR@origscshape\scshape -\@ifundefined{sishape}{ - \LetLtxMacro\LWR@origsishape\scshape -}{ - \LetLtxMacro\LWR@origsishape\sishape -} -\LetLtxMacro\LWR@origitshape\itshape + \LetLtxMacro\LWR@origem\em \LetLtxMacro\LWR@orignormalfont\normalfont @@ -1848,7 +1855,7 @@ \begin{filecontents*}{lwarp.css} /* CSS stylesheet for the LaTeX lwarp package - Copyright 2016-2018 Brian Dunn — BD Tech Concepts LLC + Copyright 2016-2019 Brian Dunn — BD Tech Concepts LLC */ /* a fix for older browsers: */ @@ -1920,15 +1927,18 @@ span.textit, div.textit { font-style: italic; } span.textmd, div.textmd { font-weight: normal; } +span.texteb { font-weight: bolder; } + +span.textlg { font-weight: lighter; } + span.textsc, div.textsc { font-variant: small-caps; font-variant-numeric: oldstyle-nums ; } -span.textsi, div.textsi { - font-style: italic ; - font-variant: small-caps; - font-variant-numeric: oldstyle-nums ; +span.textulc, div.textulc { + font-variant: normal ; + font-variant-numeric: normal ; } span.textsl, div.textsl { font-style: oblique; } @@ -3178,6 +3188,26 @@ div.amsthmproof span.amsthmnoteremark {} +/* For the backnaur package: */ +div.backnaur { + display: block ; + margin: 2ex 2em 2ex 2em ; +} + +div.backnaur p { + margin: .25ex 0ex .25ex 0ex ; +} + +div.backnaurprod { + display: inline-block ; + min-width: 8em ; + text-align:right ; +} + +div.backnaurdesc { + display: inline-block ; +} + /* For the notes package: */ div.notesimportantnote, div.noteswarningnote, div.notesinformationnote { clear: both ; @@ -3954,9 +3984,9 @@ src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX- \begin{filecontents*}{lwarpmk.lua} #!/usr/bin/env texlua --- Copyright 2016-2018 Brian Dunn +-- Copyright 2016-2019 Brian Dunn -printversion = "v0.71" +printversion = "v0.72" requiredconfversion = "2" -- also at *lwarpmk.conf function printhelp () @@ -4833,6 +4863,7 @@ end -- not --version \newcommand*{\LWR@depthsubparagraph}{5} \newcommand*{\LWR@depthlist}{6} \newcommand*{\LWR@depthlistitem}{7} +\let\LWR@depthdescitem\LWR@depthlistitem \newcommand*{\LWR@closeone}{}% top of the stack @@ -4865,59 +4896,59 @@ end -- not --version -\NewDocumentCommand{\pushclose}{m m} -{ -\global\let\LWR@closetwelve\LWR@closeeleven -\global\let\LWR@closeeleven\LWR@closeten -\global\let\LWR@closeten\LWR@closenine -\global\let\LWR@closenine\LWR@closeeight -\global\let\LWR@closeeight\LWR@closeseven -\global\let\LWR@closeseven\LWR@closesix -\global\let\LWR@closesix\LWR@closefive -\global\let\LWR@closefive\LWR@closefour -\global\let\LWR@closefour\LWR@closethree -\global\let\LWR@closethree\LWR@closetwo -\global\let\LWR@closetwo\LWR@closeone -\global\let\LWR@closeone#1 -\global\let\LWR@closedepthtwelve\LWR@closedeptheleven -\global\let\LWR@closedeptheleven\LWR@closedepthten -\global\let\LWR@closedepthten\LWR@closedepthnine -\global\let\LWR@closedepthnine\LWR@closedeptheight -\global\let\LWR@closedeptheight\LWR@closedepthseven -\global\let\LWR@closedepthseven\LWR@closedepthsix -\global\let\LWR@closedepthsix\LWR@closedepthfive -\global\let\LWR@closedepthfive\LWR@closedepthfour -\global\let\LWR@closedepthfour\LWR@closedepththree -\global\let\LWR@closedepththree\LWR@closedepthtwo -\global\let\LWR@closedepthtwo\LWR@closedepthone -\global\let\LWR@closedepthone#2 -} - - -\newcommand*{\popclose} -{ -\global\let\LWR@closeone\LWR@closetwo -\global\let\LWR@closetwo\LWR@closethree -\global\let\LWR@closethree\LWR@closefour -\global\let\LWR@closefour\LWR@closefive -\global\let\LWR@closefive\LWR@closesix -\global\let\LWR@closesix\LWR@closeseven -\global\let\LWR@closeseven\LWR@closeeight -\global\let\LWR@closeeight\LWR@closenine -\global\let\LWR@closenine\LWR@closeten -\global\let\LWR@closeten\LWR@closeeleven -\global\let\LWR@closeeleven\LWR@closetwelve -\global\let\LWR@closedepthone\LWR@closedepthtwo -\global\let\LWR@closedepthtwo\LWR@closedepththree -\global\let\LWR@closedepththree\LWR@closedepthfour -\global\let\LWR@closedepthfour\LWR@closedepthfive -\global\let\LWR@closedepthfive\LWR@closedepthsix -\global\let\LWR@closedepthsix\LWR@closedepthseven -\global\let\LWR@closedepthseven\LWR@closedeptheight -\global\let\LWR@closedeptheight\LWR@closedepthnine -\global\let\LWR@closedepthnine\LWR@closedepthten -\global\let\LWR@closedepthten\LWR@closedeptheleven -\global\let\LWR@closedeptheleven\LWR@closedepthtwelve +\NewDocumentCommand{\LWR@pushclose}{m} +{% +\global\let\LWR@closetwelve\LWR@closeeleven% +\global\let\LWR@closeeleven\LWR@closeten% +\global\let\LWR@closeten\LWR@closenine% +\global\let\LWR@closenine\LWR@closeeight% +\global\let\LWR@closeeight\LWR@closeseven% +\global\let\LWR@closeseven\LWR@closesix% +\global\let\LWR@closesix\LWR@closefive% +\global\let\LWR@closefive\LWR@closefour% +\global\let\LWR@closefour\LWR@closethree% +\global\let\LWR@closethree\LWR@closetwo% +\global\let\LWR@closetwo\LWR@closeone% +\global\csletcs{LWR@closeone}{LWR@printclose#1}% +\global\let\LWR@closedepthtwelve\LWR@closedeptheleven% +\global\let\LWR@closedeptheleven\LWR@closedepthten% +\global\let\LWR@closedepthten\LWR@closedepthnine% +\global\let\LWR@closedepthnine\LWR@closedeptheight% +\global\let\LWR@closedeptheight\LWR@closedepthseven% +\global\let\LWR@closedepthseven\LWR@closedepthsix% +\global\let\LWR@closedepthsix\LWR@closedepthfive% +\global\let\LWR@closedepthfive\LWR@closedepthfour% +\global\let\LWR@closedepthfour\LWR@closedepththree% +\global\let\LWR@closedepththree\LWR@closedepthtwo% +\global\let\LWR@closedepthtwo\LWR@closedepthone% +\global\csletcs{LWR@closedepthone}{LWR@depth#1}% +} + + +\newcommand*{\LWR@popclose} +{% +\global\let\LWR@closeone\LWR@closetwo% +\global\let\LWR@closetwo\LWR@closethree% +\global\let\LWR@closethree\LWR@closefour% +\global\let\LWR@closefour\LWR@closefive% +\global\let\LWR@closefive\LWR@closesix% +\global\let\LWR@closesix\LWR@closeseven% +\global\let\LWR@closeseven\LWR@closeeight% +\global\let\LWR@closeeight\LWR@closenine% +\global\let\LWR@closenine\LWR@closeten% +\global\let\LWR@closeten\LWR@closeeleven% +\global\let\LWR@closeeleven\LWR@closetwelve% +\global\let\LWR@closedepthone\LWR@closedepthtwo% +\global\let\LWR@closedepthtwo\LWR@closedepththree% +\global\let\LWR@closedepththree\LWR@closedepthfour% +\global\let\LWR@closedepthfour\LWR@closedepthfive% +\global\let\LWR@closedepthfive\LWR@closedepthsix% +\global\let\LWR@closedepthsix\LWR@closedepthseven% +\global\let\LWR@closedepthseven\LWR@closedeptheight% +\global\let\LWR@closedeptheight\LWR@closedepthnine% +\global\let\LWR@closedepthnine\LWR@closedepthten% +\global\let\LWR@closedepthten\LWR@closedeptheleven% +\global\let\LWR@closedeptheleven\LWR@closedepthtwelve% } \end{warpHTML} @@ -5142,18 +5173,21 @@ end -- not --version \LWR@closeone -\popclose +\LWR@popclose } \newcommand*{\LWR@closeprevious}[1]{ -\LWR@traceinfo{LWR@closeprevious to depth #1, depths are \LWR@subprintstack}% +\LWR@traceinfo{% + LWR@closeprevious to depth \csuse{LWR@depth#1}, % + depths are \LWR@subprintstack% +}% \LWR@stoppars% -\whileboolexpr{test{\ifnumcomp{\LWR@closedepthone}{>}{#1}}}% +\whileboolexpr{test{\ifnumcomp{\LWR@closedepthone}{>}{\csuse{LWR@depth#1}}}}% {% \LWR@traceinfo{LWR@closeprevious: closing out depth \LWR@closedepthone}% \LWR@closeoneprevious% }% -\ifboolexpr{test{\ifnumcomp{\LWR@closedepthone}{=}{#1}}}% +\ifboolexpr{test{\ifnumcomp{\LWR@closedepthone}{=}{\csuse{LWR@depth#1}}}}% {% \LWR@traceinfo{LWR@closeprevious: closing out depth \LWR@closedepthone}% \LWR@closeoneprevious% @@ -6075,7 +6109,7 @@ end -- not --version \ifnumequal{\value{LWR@previousautopagelabel}}{\value{page}}% {}% no action if this autopage label has already been defined {% - \label{autopage-\arabic{#1}}% + \label{\BaseJobname-autopage-\arabic{#1}}% \setcounter{LWR@previousautopagelabel}{\value{page}} }% } @@ -6272,14 +6306,14 @@ end -- not --version }% } -\NewDocumentCommand{\LWR@pushoneclose}{m m}{% +\NewDocumentCommand{\LWR@pushoneclose}{m}{% \LWR@traceinfo{LWR@pushoneclose #1}% - \pushclose{#2}{#1}% + \LWR@pushclose{#1}% } -\NewDocumentCommand{\LWR@startnewdepth}{m m}{% +\NewDocumentCommand{\LWR@startnewdepth}{m}{% \LWR@closeprevious{#1}% -\LWR@pushoneclose{#1}{#2}% +\LWR@pushoneclose{#1}% } \newcounter{LWR@prevFileDepth} \setcounter{LWR@prevFileDepth}{\LWR@depthsubparagraph} @@ -6291,8 +6325,12 @@ end -- not --version \newcounter{LWR@currentautosec} \setcounter{LWR@currentautosec}{1} \DeclareDocumentCommand{\LWR@section}{m m m m}{% -\LWR@traceinfo{LWR@section: starting}% +\IfValueTF{#2}% + {\LWR@traceinfo{LWR@section: starting #4 #2}}% + {\LWR@traceinfo{LWR@section: starting #4 #3}}% +\LWR@maybeprintpendingfootnotes{\csuse{LWR@depth#4}}% \LWR@stoppars% +\LWR@startnewdepth{#4}% \global\boolfalse{LWR@minipagethispar}% \LWR@traceinfo{LWR@section: testing whether to start a new HTML file}% \IfBooleanT{#1}{\LWR@traceinfo{LWR@section: starred}}% @@ -6481,16 +6519,11 @@ end -- not --version \newcommand{\part@preamble}{}% for koma-script -\DeclareDocumentCommand{\part}{s o m}{% -\LWR@maybeprintpendingfootnotes{\LWR@depthpart}% -\LWR@stoppars% - -\LWR@startnewdepth{\LWR@depthpart}{\LWR@printclosepart}% - -\LWR@section{#1}{#2}{#3}{part}% +\DeclareDocumentCommand{\part}{s d() o o d() m}{% + \LWR@section{#1}{#3}{#6}{part}% -\part@preamble% for koma-script -\renewcommand{\part@preamble}{}% + \part@preamble% for koma-script + \renewcommand{\part@preamble}{}% } \let\@printcites\relax% for quotchap package @@ -6500,71 +6533,34 @@ end -- not --version \@ifundefined{chapter} {} {% -\DeclareDocumentCommand{\chapter}{s o o m}{% -\IfValueTF{#2}{ -\LWR@traceinfo{chapter #2}% -}{ -\LWR@traceinfo{chapter #4}% -} -\LWR@maybeprintpendingfootnotes{\LWR@depthchapter}% -\LWR@stoppars% - -\LWR@startnewdepth{\LWR@depthchapter}{\LWR@printclosechapter}% - -\LWR@section{#1}{#2}{#4}{chapter}% + \DeclareDocumentCommand{\chapter}{s d() o o d() m}{% + \LWR@section{#1}{#3}{#6}{chapter}% -\@printcites% for quotchap package + \@printcites% for quotchap package -\chapter@preamble% for koma-script -\renewcommand{\chapter@preamble}{}% -} + \chapter@preamble% for koma-script + \renewcommand{\chapter@preamble}{}% + } } -\DeclareDocumentCommand{\section}{s o o m}{% -\LWR@traceinfo{section: starting}% -\LWR@maybeprintpendingfootnotes{\LWR@depthsection}% -\LWR@stoppars% - -\LWR@startnewdepth{\LWR@depthsection}{\LWR@printclosesection}% - -\LWR@section{#1}{#2}{#4}{section}% +\DeclareDocumentCommand{\section}{s d() o o d() m}{% + \LWR@section{#1}{#3}{#6}{section}% } -\DeclareDocumentCommand{\subsection}{s o m}{% -\LWR@maybeprintpendingfootnotes{\LWR@depthsubsection}% -\LWR@stoppars% - -\LWR@startnewdepth{\LWR@depthsubsection}{\LWR@printclosesubsection}% - -\LWR@section{#1}{#2}{#3}{subsection}% +\DeclareDocumentCommand{\subsection}{s d() o o d() m}{% + \LWR@section{#1}{#3}{#6}{subsection}% } -\DeclareDocumentCommand{\subsubsection}{s o m}{% -\LWR@maybeprintpendingfootnotes{\LWR@depthsubsubsection}% -\LWR@stoppars% - -\LWR@startnewdepth{\LWR@depthsubsubsection}% -{\LWR@printclosesubsubsection}% - -\LWR@section{#1}{#2}{#3}{subsubsection}% +\DeclareDocumentCommand{\subsubsection}{s d() o o d() m}{% + \LWR@section{#1}{#3}{#6}{subsubsection}% } -\DeclareDocumentCommand{\paragraph}{s o m}{% -\LWR@maybeprintpendingfootnotes{\LWR@depthparagraph}% -\LWR@stoppars% - -\LWR@startnewdepth{\LWR@depthparagraph}{\LWR@printcloseparagraph}% - -\LWR@section{#1}{#2}{#3}{paragraph}% +\DeclareDocumentCommand{\paragraph}{s d() o o d() m}{% + \LWR@section{#1}{#3}{#6}{paragraph}% } -\DeclareDocumentCommand{\subparagraph}{s o m}{% -\LWR@maybeprintpendingfootnotes{\LWR@depthsubparagraph}% -\LWR@stoppars% - -\LWR@startnewdepth{\LWR@depthsubparagraph}{\LWR@printclosesubparagraph}% - -\LWR@section{#1}{#2}{#3}{subparagraph}% +\DeclareDocumentCommand{\subparagraph}{s d() o o d() m}{% + \LWR@section{#1}{#3}{#6}{subparagraph}% } \end{warpHTML} @@ -6769,7 +6765,7 @@ end -- not --version \newcommand*{\LWR@LwarpEnd} { \LWR@stoppars -\LWR@closeprevious{\LWR@depthfinished} +\LWR@closeprevious{finished} \LWR@htmlelementclassend{section}{textbody} \LWR@htmlelementclassend{div}{bodycontainer} @@ -7244,7 +7240,7 @@ end -- not --version \newcommand*{\LWR@listitem}{% \LWR@stoppars% -\LWR@startnewdepth{\LWR@depthlistitem}{\LWR@printcloselistitem}% +\LWR@startnewdepth{listitem}% \LWR@htmltag{li}% \LWR@startpars% \LWR@origitem% @@ -7262,7 +7258,7 @@ end -- not --version \newcommand*{\LWR@liststart}{% \LWR@traceinfo{LWR@liststart}% \LWR@stoppars% -\LWR@pushoneclose{\LWR@depthlist}{\LWR@printcloselist}% +\LWR@pushoneclose{list}% \LWR@htmltag{\LWR@printopenlist}\LWR@orignewline% \LWR@startpars% \setlength{\topsep}{0pt}% @@ -7279,14 +7275,14 @@ end -- not --version \newcommand*{\LWR@listend}{% \LWR@traceinfo{LWR@listend}% \LWR@stoppars% -\LWR@closeprevious{\LWR@depthlist}% +\LWR@closeprevious{list}% \LWR@startpars% } \newcommand*{\LWR@itemizeitem}{% \LWR@stoppars% -\LWR@startnewdepth{\LWR@depthlistitem}{\LWR@printcloselistitem}% +\LWR@startnewdepth{listitem}% \LWR@htmltag{li}% \LWR@startpars% \LWR@origitem% @@ -7313,7 +7309,7 @@ end -- not --version {% \LWR@stoppars% \LWR@setlatestname{#1}% -\LWR@startnewdepth{\LWR@depthlistitem}{\LWR@printclosedescitem}% +\LWR@startnewdepth{descitem}% \LWR@select@html@nohspace% \LWR@origitem[]% \LWR@select@html@hspace% @@ -8463,17 +8459,17 @@ end -- not --version \addtocounter{LWR@tablemulticolspos}{3}% skip parameters \LWR@multicoltext% }{}% -\IfStrEq{\LWR@strresult}{p}{\LWR@multicolpartext{0}}{}% -\IfStrEq{\LWR@strresult}{m}{\LWR@multicolpartext{0}}{}% -\IfStrEq{\LWR@strresult}{b}{\LWR@multicolpartext{0}}{}% -\IfStrEq{\LWR@strresult}{P}{\LWR@multicolpartext{0}}{}% -\IfStrEq{\LWR@strresult}{M}{\LWR@multicolpartext{0}}{}% -\IfStrEq{\LWR@strresult}{B}{\LWR@multicolpartext{0}}{}% +\IfStrEq{\LWR@strresult}{p}{\LWR@multicolpartext{2}}{}% +\IfStrEq{\LWR@strresult}{m}{\LWR@multicolpartext{2}}{}% +\IfStrEq{\LWR@strresult}{b}{\LWR@multicolpartext{2}}{}% +\IfStrEq{\LWR@strresult}{P}{\LWR@multicolpartext{2}}{}% +\IfStrEq{\LWR@strresult}{M}{\LWR@multicolpartext{2}}{}% +\IfStrEq{\LWR@strresult}{B}{\LWR@multicolpartext{2}}{}% \IfStrEq{\LWR@strresult}{w}{\LWR@multicolpartext{3}}{}% \IfStrEq{\LWR@strresult}{W}{\LWR@multicolpartext{3}}{}% \IfStrEq{\LWR@strresult}{S}{\LWR@multicoltext}{}% \IfStrEq{\LWR@strresult}{s}{\LWR@multicoltext}{}% -\IfStrEq{\LWR@strresult}{X}{\LWR@multicolpartext{0}}{}% +\IfStrEq{\LWR@strresult}{X}{\LWR@multicolpartext{1}}{}% \IfStrEq{\LWR@strresult}{|}{\LWR@multicolskip}{}% \IfStrEq{\LWR@strresult}{:}{\LWR@multicolskip}{}% \IfStrEq{\LWR@strresult}{;}{% @@ -9580,8 +9576,8 @@ autopage-\theLWR@currentautosec% \NewDocumentCommand{\LWR@subtableofcontents}{m m}{% \@ifundefined{chapter} -{\LWR@closeprevious{\LWR@depthsection}} -{\LWR@closeprevious{\LWR@depthchapter}} +{\LWR@closeprevious{section}} +{\LWR@closeprevious{chapter}} \LWR@printpendingfootnotes \@ifundefined{chapter}{\section*{#2}}{\chapter*{#2}} \LWR@htmlelementclass{nav}{#1} @@ -9709,7 +9705,7 @@ autopage-\theLWR@currentautosec% {% \LWR@startpars% \LWR@subhyperrefclass{% - \LWR@htmlrefsectionfilename{autopage-#4}% + \LWR@htmlrefsectionfilename{\BaseJobname-autopage-#4}% \LWR@origpound\LWR@print@mbox{autosec-#4}% }{#3}{toc#2}% \LWR@maybetocdata% @@ -9740,7 +9736,9 @@ autopage-\theLWR@currentautosec% {% \LWR@startpars% \LWR@subhyperrefclass{% - \LWR@htmlrefsectionfilename{autopage-\arabic{LWR@nextautopage}}% + \LWR@htmlrefsectionfilename{% + \BaseJobname-autopage-\arabic{LWR@nextautopage}% + }% \LWR@origpound\LWR@print@mbox{autoid-\arabic{LWR@nextautoid}}}% {#4}{toc#2}% \LWR@maybetocdata% @@ -9844,11 +9842,14 @@ autopage-\theLWR@currentautosec% \newcommand{\LWR@hyperindexrefnullified}{% \renewrobustcmd{\emph}[1]{\LWR@HTML@emph{\LWR@doindexentry{##1}}}% \renewrobustcmd{\textbf}[1]{\LWR@HTML@textbf{\LWR@doindexentry{##1}}}% +\renewrobustcmd{\texteb}[1]{\LWR@HTML@texteb{\LWR@doindexentry{##1}}}% +\renewrobustcmd{\textlg}[1]{\LWR@HTML@textlg{\LWR@doindexentry{##1}}}% \renewrobustcmd{\textrm}[1]{\LWR@HTML@textrm{\LWR@doindexentry{##1}}}% \renewrobustcmd{\textsf}[1]{\LWR@HTML@textsf{\LWR@doindexentry{##1}}}% \renewrobustcmd{\texttt}[1]{\LWR@HTML@texttt{\LWR@doindexentry{##1}}}% \renewrobustcmd{\textup}[1]{\LWR@HTML@textup{\LWR@doindexentry{##1}}}% \renewrobustcmd{\textsc}[1]{\LWR@HTML@textsc{\LWR@doindexentry{##1}}}% +\renewrobustcmd{\textulc}[1]{\LWR@HTML@textulc{\LWR@doindexentry{##1}}}% \renewrobustcmd{\textsi}[1]{\LWR@HTML@textsi{\LWR@doindexentry{##1}}}% \renewrobustcmd{\textit}[1]{\LWR@HTML@textit{\LWR@doindexentry{##1}}}% \renewrobustcmd{\textsl}[1]{\LWR@HTML@textsl{\LWR@doindexentry{##1}}}% @@ -9930,16 +9931,6 @@ autopage-\theLWR@currentautosec% \let\textless\LWR@origtextless% \let\textgreater\LWR@origtextgreater% \let\&\LWR@origampersand% -\LetLtxMacro\rmfamily\LWR@origrmfamily% -\LetLtxMacro\sffamily\LWR@origsffamily% -\LetLtxMacro\ttfamily\LWR@origttfamily% -\LetLtxMacro\bfseries\LWR@origbfseries% -\LetLtxMacro\mdseries\LWR@origmdseries% -\LetLtxMacro\upshape\LWR@origupshape% -\LetLtxMacro\slshape\LWR@origslshape% -\LetLtxMacro\scshape\LWR@origscshape% -\LetLtxMacro\sishape\LWR@origsishape% -\LetLtxMacro\itshape\LWR@origitshape% \LetLtxMacro\em\LWR@origem% \LetLtxMacro\normalfont\LWR@orignormalfont% \let\sp\LWR@origsp% @@ -10073,6 +10064,8 @@ autopage-\theLWR@currentautosec% \@nameuse{LWR@orig\LWR@f@series series}% \LWR@traceinfo{Using font shape \LWR@f@shape}% \@nameuse{LWR@orig\LWR@f@shape shape}% + \LWR@traceinfo{Using font caps shape \LWR@f@shapecaps}% + \@nameuse{LWR@orig\LWR@f@shapecaps shape}% \global\advance\c@LWR@lateximagedepth 1\relax% \ifmmode% \global\sbox{\LWR@singledollarbox}{#4}% @@ -10163,6 +10156,7 @@ autopage-\theLWR@currentautosec% FM\LWR@f@family% SR\LWR@f@series% SH\LWR@f@shape% + SHC\LWR@f@shapecaps% CL\LWR@tempcolor% FB\LWR@tempone% xfakebold ]% @@ -10909,6 +10903,10 @@ autopage-\theLWR@currentautosec% \LWR@PreloadedPackage{graphics} \LWR@PreloadedPackage{graphicx} +\LWR@PreloadedPackage{fontaxes} + +\LWR@PreloadedPackage{nfssext-cfr} + \LWR@PreloadedPackage{ulem} \LWR@PreloadedPackage{xetexko-vertical} @@ -11515,9 +11513,10 @@ color:\LWR@origpound\LWR@tempcolor% \LWR@htmlspan{em}{#1}% }% } + \LWR@formatted{emph} -\DeclareRobustCommand{\LWR@null@emph}[1]{#1} +\newcommand{\LWR@null@emph}[1]{#1} \DeclareRobustCommand{\LWR@HTML@textmd}[1]{% {% @@ -11525,9 +11524,10 @@ color:\LWR@origpound\LWR@tempcolor% \InlineClass(font-weight:normal){textmd}{#1}% }% } + \LWR@formatted{textmd} -\DeclareRobustCommand{\LWR@null@textmd}[1]{#1} +\newcommand{\LWR@null@textmd}[1]{#1} \DeclareRobustCommand{\LWR@HTML@textbf}[1]{% {% @@ -11535,9 +11535,32 @@ color:\LWR@origpound\LWR@tempcolor% \LWR@htmlspan{b}{#1}% }% } + \LWR@formatted{textbf} -\DeclareRobustCommand{\LWR@null@textbf}[1]{#1} +\newcommand{\LWR@null@textbf}[1]{#1} + +\DeclareRobustCommand{\LWR@HTML@texteb}[1]{% + {% + \ebweight% + \InlineClass{texteb}{#1}% + }% +} + +\LWR@formatted{texteb} + +\newcommand{\LWR@null@texteb}[1]{#1} + +\DeclareRobustCommand{\LWR@HTML@textlg}[1]{% + {% + \lgweight% + \InlineClass{textlg}{#1}% + }% +} + +\LWR@formatted{textlg} + +\newcommand{\LWR@null@textlg}[1]{#1} \DeclareRobustCommand{\LWR@HTML@textrm}[1]{% {% @@ -11545,9 +11568,10 @@ color:\LWR@origpound\LWR@tempcolor% \InlineClass(font-family:serif){textrm}{#1}% }% } + \LWR@formatted{textrm} -\DeclareRobustCommand{\LWR@null@textrm}[1]{#1} +\newcommand{\LWR@null@textrm}[1]{#1} \DeclareRobustCommand{\LWR@HTML@textsf}[1]{% {% @@ -11555,9 +11579,10 @@ color:\LWR@origpound\LWR@tempcolor% \InlineClass(font-family:sans){textsf}{#1}% }% } + \LWR@formatted{textsf} -\DeclareRobustCommand{\LWR@null@textsf}[1]{#1} +\newcommand{\LWR@null@textsf}[1]{#1} \DeclareRobustCommand{\LWR@HTML@texttt}[1]{% {% @@ -11565,9 +11590,10 @@ color:\LWR@origpound\LWR@tempcolor% \LWR@htmlspan{kbd}{#1}% }% } + \LWR@formatted{texttt} -\DeclareRobustCommand{\LWR@null@texttt}[1]{#1} +\newcommand{\LWR@null@texttt}[1]{#1} \DeclareRobustCommand{\LWR@HTML@textup}[1]{% {% @@ -11575,9 +11601,10 @@ color:\LWR@origpound\LWR@tempcolor% \InlineClass(font-style:normal){textup}{#1}% }% } + \LWR@formatted{textup} -\DeclareRobustCommand{\LWR@null@textup}[1]{#1} +\newcommand{\LWR@null@textup}[1]{#1} \DeclareRobustCommand{\LWR@HTML@textit}[1]{% {% @@ -11585,22 +11612,32 @@ color:\LWR@origpound\LWR@tempcolor% \LWR@htmlspan{i}{#1}% }% } + \LWR@formatted{textit} -\DeclareRobustCommand{\LWR@null@textit}[1]{#1} +\newcommand{\LWR@null@textit}[1]{#1} \DeclareRobustCommand{\LWR@HTML@textsc}[1]{% {% \scshape% - \InlineClass( - font-variant: small-caps ; - font-variant-numeric: oldstyle-nums ; - ){textsc}{#1}% + \InlineClass{textsc}{#1}% }% } + \LWR@formatted{textsc} -\DeclareRobustCommand{\LWR@null@textsc}[1]{#1} +\newcommand{\LWR@null@textsc}[1]{#1} + +\DeclareRobustCommand{\LWR@HTML@textulc}[1]{% + {% + \ulcshape% + \InlineClass{textulc}{#1}% + }% +} + +\LWR@formatted{textulc} + +\newcommand{\LWR@null@textulc}[1]{#1} \@ifundefined{textsi}{ \LetLtxMacro\LWR@print@textsi\LWR@print@textsc @@ -11609,16 +11646,13 @@ color:\LWR@origpound\LWR@tempcolor% \DeclareRobustCommand{\LWR@HTML@textsi}[1]{% {% \sishape% - \InlineClass( - font-style: italic; - font-variant: small-caps ; - font-variant-numeric: oldstyle-nums ; - ){textsi}{#1}% + \textsc{\textit{#1}}% }% } + \LWR@formatted{textsi} -\DeclareRobustCommand{\LWR@null@textsi}[1]{#1} +\newcommand{\LWR@null@textsi}[1]{#1} \DeclareRobustCommand{\LWR@HTML@textsl}[1]{% {% @@ -11626,26 +11660,30 @@ color:\LWR@origpound\LWR@tempcolor% \InlineClass(font-style:oblique){textsl}{#1}% }% } + \LWR@formatted{textsl} -\DeclareRobustCommand{\LWR@null@textsl}[1]{#1} +\newcommand{\LWR@null@textsl}[1]{#1} \DeclareRobustCommand{\LWR@HTML@textnormal}[1]{\textmd{\textrm{\textup{#1}}}} -\LWR@formatted{textnormal} -\DeclareRobustCommand{\LWR@null@textnormal}[1]{#1} +\LWR@formatted{textnormal} -\DeclareRobustCommand{\LWR@null@rmfamily}{} -\DeclareRobustCommand{\LWR@null@sffamily}{} -\DeclareRobustCommand{\LWR@null@ttfamily}{} -\DeclareRobustCommand{\LWR@null@bfseries}{} -\DeclareRobustCommand{\LWR@null@mdseries}{} -\DeclareRobustCommand{\LWR@null@upshape}{} -\DeclareRobustCommand{\LWR@null@slshape}{} -\DeclareRobustCommand{\LWR@null@scshape}{} -\DeclareRobustCommand{\LWR@null@itshape}{} -\DeclareRobustCommand{\LWR@null@normalfont}{} -\DeclareRobustCommand{\LWR@null@em}{} +\newcommand{\LWR@null@textnormal}[1]{#1} + +\newcommand{\LWR@null@rmfamily}{} +\newcommand{\LWR@null@sffamily}{} +\newcommand{\LWR@null@ttfamily}{} +\newcommand{\LWR@null@bfseries}{} +\newcommand{\LWR@null@ebweight}{} +\newcommand{\LWR@null@lgweight}{} +\newcommand{\LWR@null@mdseries}{} +\newcommand{\LWR@null@upshape}{} +\newcommand{\LWR@null@slshape}{} +\newcommand{\LWR@null@scshape}{} +\newcommand{\LWR@null@itshape}{} +\newcommand{\LWR@null@normalfont}{} +\newcommand{\LWR@null@em}{} \catcode`\$=\active% redefining $ below \catcode`\_=12% redefining \_ below @@ -11659,6 +11697,7 @@ color:\LWR@origpound\LWR@tempcolor% \LetLtxMacro\textup\LWR@null@textup% \LetLtxMacro\textit\LWR@null@textit% \LetLtxMacro\textsc\LWR@null@textsc% +\LetLtxMacro\textulc\LWR@null@textulc% \LetLtxMacro\textsi\LWR@null@textsi% \LetLtxMacro\textsl\LWR@null@textsl% \LetLtxMacro\textnormal\LWR@null@textnormal% @@ -11670,6 +11709,7 @@ color:\LWR@origpound\LWR@tempcolor% \LetLtxMacro\upshape\LWR@null@upshape% \LetLtxMacro\slshape\LWR@null@slshape% \LetLtxMacro\scshape\LWR@null@scshape% +\LetLtxMacro\ulcshape\LWR@null@ulcshape% \LetLtxMacro\sishape\LWR@null@sishape% \LetLtxMacro\itshape\LWR@null@itshape% \LetLtxMacro\normalfont\LWR@null@normalfont% @@ -11795,6 +11835,7 @@ color:\LWR@origpound\LWR@tempcolor% \newcommand*{\LWR@f@family}{rm} \newcommand*{\LWR@f@series}{md} \newcommand*{\LWR@f@shape}{up} +\newcommand*{\LWR@f@shapecaps}{ulc} \newcounter{LWR@textcurrentfontdepth} \setcounter{LWR@textcurrentfontdepth}{0} @@ -11811,7 +11852,8 @@ color:\LWR@origpound\LWR@tempcolor% \InlineClass{% text\LWR@f@family\LWR@origtilde{}% text\LWR@f@series\LWR@origtilde{}% - text\LWR@f@shape% + text\LWR@f@shape\LWR@origtilde{}% + text\LWR@f@shapecaps% }% {#1}% \addtocounter{LWR@textcurrentfontdepth}{-1}% @@ -11822,35 +11864,60 @@ color:\LWR@origpound\LWR@tempcolor% \BlockClass{% text\LWR@f@family\LWR@origtilde{}% text\LWR@f@series\LWR@origtilde{}% - text\LWR@f@shape% + text\LWR@f@shape\LWR@origtilde{}% + text\LWR@f@shapecaps% }% }{\endBlockClass} -\renewrobustcmd*{\mdseries}{\renewcommand*{\LWR@f@series}{md}} +\newrobustcmd*{\LWR@HTML@mdseries}{\renewcommand*{\LWR@f@series}{md}} +\LWR@formatted{mdseries} -\renewrobustcmd*{\bfseries}{\renewcommand*{\LWR@f@series}{bf}} +\newrobustcmd*{\LWR@HTML@bfseries}{\renewcommand*{\LWR@f@series}{bf}} +\LWR@formatted{bfseries} -\renewrobustcmd*{\rmfamily}{\renewcommand*{\LWR@f@family}{rm}} +\newrobustcmd*{\LWR@HTML@ebweight}{\renewcommand*{\LWR@f@series}{eb}} +\LWR@formatted{ebweight} -\renewrobustcmd*{\sffamily}{\renewcommand*{\LWR@f@family}{sf}} +\newrobustcmd*{\LWR@HTML@lgweight}{\renewcommand*{\LWR@f@series}{lg}} +\LWR@formatted{lgweight} -\renewrobustcmd*{\ttfamily}{\renewcommand*{\LWR@f@family}{tt}} +\newrobustcmd*{\LWR@HTML@rmfamily}{\renewcommand*{\LWR@f@family}{rm}} +\LWR@formatted{rmfamily} -\renewrobustcmd*{\upshape}{\renewcommand*{\LWR@f@shape}{up}} +\newrobustcmd*{\LWR@HTML@sffamily}{\renewcommand*{\LWR@f@family}{sf}} +\LWR@formatted{sffamily} -\renewrobustcmd*{\itshape}{\renewcommand*{\LWR@f@shape}{it}} +\newrobustcmd*{\LWR@HTML@ttfamily}{\renewcommand*{\LWR@f@family}{tt}} +\LWR@formatted{ttfamily} -\renewrobustcmd*{\scshape}{\renewcommand*{\LWR@f@shape}{sc}} +\newrobustcmd*{\LWR@HTML@upshape}{\renewcommand*{\LWR@f@shape}{up}} +\LWR@formatted{upshape} + +\newrobustcmd*{\LWR@HTML@itshape}{\renewcommand*{\LWR@f@shape}{it}} +\LWR@formatted{itshape} + +\newrobustcmd*{\LWR@HTML@scshape}{\renewcommand*{\LWR@f@shapecaps}{sc}} +\LWR@formatted{scshape} + +\@ifundefined{ulcshape}{ + \LetLtxMacro\ulcshape\upshape +}{} +\newrobustcmd*{\LWR@HTML@ulcshape}{\renewcommand*{\LWR@f@shapecaps}{ulc}} +\LWR@formatted{ulcshape} \@ifundefined{sishape}{ - \newrobustcmd*{\sishape}{\renewcommand*{\LWR@f@shape}{si}} -}{ - \renewrobustcmd*{\sishape}{\renewcommand*{\LWR@f@shape}{si}} + \LetLtxMacro\sishape\scshape +}{} +\newrobustcmd*{\LWR@HTML@sishape}{% + \renewcommand*{\LWR@f@shape}{it} + \renewcommand*{\LWR@f@shapecaps}{sc}% } +\LWR@formatted{sishape} -\renewrobustcmd*{\slshape}{\renewcommand*{\LWR@f@shape}{sl}} +\newrobustcmd*{\LWR@HTML@slshape}{\renewcommand*{\LWR@f@shape}{sl}} +\LWR@formatted{slshape} -\renewrobustcmd*{\normalfont}{\rmfamily\mdseries\upshape} +\renewrobustcmd*{\normalfont}{\rmfamily\mdseries\upshape\ulcshape} \renewcommand{\sp}[1]{\text{<sup>#1</sup>}{}} |