From 019026f69bab4296c0d65e507b13b3904b866382 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 25 Mar 2020 21:11:36 +0000 Subject: lwarp (25mar20) git-svn-id: svn://tug.org/texlive/trunk@54546 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/latex/lwarp/lwarp-amsmath.sty | 2 +- .../texmf-dist/tex/latex/lwarp/lwarp-chemfig.sty | 12 +- .../tex/latex/lwarp/lwarp-draftwatermark.sty | 4 +- .../texmf-dist/tex/latex/lwarp/lwarp-endnotes.sty | 11 +- Master/texmf-dist/tex/latex/lwarp/lwarp-etoc.sty | 136 +++++++++++++++++++++ .../texmf-dist/tex/latex/lwarp/lwarp-luatexko.sty | 119 ++++++++++++++++++ .../tex/latex/lwarp/lwarp-marginnote.sty | 7 ++ .../texmf-dist/tex/latex/lwarp/lwarp-nccfoots.sty | 25 ++++ .../texmf-dist/tex/latex/lwarp/lwarp-pagenote.sty | 5 + .../texmf-dist/tex/latex/lwarp/lwarp-parnotes.sty | 12 ++ .../tex/latex/lwarp/lwarp-patch-memoir.sty | 4 - .../texmf-dist/tex/latex/lwarp/lwarp-sidenotes.sty | 7 ++ Master/texmf-dist/tex/latex/lwarp/lwarp-soul.sty | 1 + .../texmf-dist/tex/latex/lwarp/lwarp-syntonly.sty | 2 + Master/texmf-dist/tex/latex/lwarp/lwarp-ulem.sty | 3 +- .../texmf-dist/tex/latex/lwarp/lwarp-xpinyin.sty | 57 ++++++++- Master/texmf-dist/tex/latex/lwarp/lwarp.sty | 91 +++++++++++--- 17 files changed, 468 insertions(+), 30 deletions(-) create mode 100644 Master/texmf-dist/tex/latex/lwarp/lwarp-etoc.sty create mode 100644 Master/texmf-dist/tex/latex/lwarp/lwarp-luatexko.sty create mode 100644 Master/texmf-dist/tex/latex/lwarp/lwarp-nccfoots.sty (limited to 'Master/texmf-dist/tex/latex/lwarp') diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-amsmath.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-amsmath.sty index 69a5bff980b..6623857b95a 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-amsmath.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-amsmath.sty @@ -126,7 +126,7 @@ \AfterEndEnvironment{alignat*}{\LWR@amsmathenv@after*{alignat*}} \begin{warpMathJax} -\CustomizeMathJax{\newcommand{\intertext}[1]{\\ \text{#1}\notag \\}} +\CustomizeMathJax{\newcommand{\intertext}[1]{\text{#1}\notag \\}} \end{warpMathJax} \endinput %% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-chemfig.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-chemfig.sty index a66820cbf93..124bef6fac1 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-chemfig.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-chemfig.sty @@ -16,11 +16,21 @@ %% and version 1.3 or later is part of all distributions of LaTeX %% version 2005/12/01 or later. -\LWR@ProvidesPackagePass{chemfig} +\LWR@ProvidesPackagePass{chemfig}[2020/03/05] \catcode`\_=11 +\@ifpackagelater{chemfig}{2020/03/05} +{ + \xpretocmd\charge{\begin{lateximage}[-chemfig-~\PackageDiagramAltText]} + {}{\LWR@patcherror{chemfig}{charge}} + \xpretocmd\Charge{\begin{lateximage}[-chemfig-~\PackageDiagramAltText]} + {}{\LWR@patcherror{chemfig}{Charge}} + \xapptocmd\charge_c{\end{lateximage}} + {}{\LWR@patcherror{chemfig}{charge_c}} +}{} + \@ifpackagelater{chemfig}{2019/04/18}% {% 2019/04/18 or newer diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-draftwatermark.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-draftwatermark.sty index 10f5f953634..b1a3cc80b5f 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-draftwatermark.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-draftwatermark.sty @@ -19,8 +19,10 @@ -\LWR@ProvidesPackageDrop{draftwatermark}[2015/02/19] +\LWR@ProvidesPackageDrop{draftwatermark}[2020/03/14] +\newcommand{\DraftwatermarkOptions}[1]{} +\newcommand{\DraftwatermarkStdMark}{} \newcommand{\SetWatermarkAngle}[1]{} \newcommand{\SetWatermarkColor}[1]{} \newcommand{\SetWatermarkLightness}[1]{} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-endnotes.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-endnotes.sty index 9dcd224b2b6..5124b8bf8a6 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-endnotes.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-endnotes.sty @@ -21,9 +21,18 @@ \leavevmode \makeenmark } +\def\LWR@HTML@@makeenmark{\hbox{\LWR@htmlspan{sup}{\normalfont\theenmark}}} +\LWR@formatted{@makeenmark} -\def\@makeenmark{\hbox{\LWR@htmlspan{sup}{\normalfont\theenmark}}} \def\makeenmark{\@makeenmark} +\begin{warpMathJax} +\def\endnotename{endnote} +\appto\LWR@syncnotenumbers{\LWR@synconenotenumber{LWRendnote}{\theendnote}} +\appto\LWR@syncnotenames{\LWR@synconenotename{LWRendnote}{\endnotename}} +\CustomizeMathJax{\def\LWRendnote{1}} +\CustomizeMathJax{\newcommand{\endnote}[2][\LWRendnote]{{}^{\mathrm{#1}}}} +\CustomizeMathJax{\newcommand{\endnotemark}[1][\LWRendnote]{{}^{\mathrm{#1}}}} +\end{warpMathJax} \endinput %% %% End of file `lwarp-endnotes.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-etoc.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-etoc.sty new file mode 100644 index 00000000000..a8f7117d15b --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-etoc.sty @@ -0,0 +1,136 @@ +%% +%% This is file `lwarp-etoc.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `etoc') +%% This is a generated file. +%% Copyright 2016-2020 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{etoc}[2019/11/17] +\def\etocsetlevel#1#2{} +\def\etocskipfirstprefix{} +\let\etocthename \@empty +\let\etocthenumber \@empty +\let\etocthepage \@empty +\let\etocthelinkedname \@empty +\let\etocthelinkednumber \@empty +\let\etocthelinkedpage \@empty +\let\etocthelink \@firstofone % prior to 1.08j its was \let to \@empty +\DeclareRobustCommand*{\etocname} {} +\DeclareRobustCommand*{\etocnumber}{} +\DeclareRobustCommand*{\etocpage} {} +\DeclareRobustCommand*{\etoclink} {\@firstofone} +\DeclareRobustCommand*{\etocifnumbered}{\@firstoftwo} +\DeclareRobustCommand*{\etociffirst}{\@firstoftwo} +\DeclareRobustCommand*\etocifwasempty{\@firstoftwo} +\let\etocaftertitlehook \@empty +\let\etocaftercontentshook \@empty +\def\etoctableofcontents{} +\newcommand*\localtableofcontents{} +\newcommand*\localtableofcontentswithrelativedepth[1]{} +\newcommand\etocsettocstyle[2]{} +\long\def\etocsetstyle#1#2#3#4#5{} +\def\etocfontminustwo {\normalfont \LARGE \bfseries} +\def\etocfontminusone {\normalfont \large \bfseries} +\def\etocfontzero {\normalfont \large \bfseries} +\def\etocfontone {\normalfont \normalsize \bfseries} +\def\etocfonttwo {\normalfont \normalsize} +\def\etocfontthree {\normalfont \footnotesize} +\def\etocsepminustwo {4ex \@plus .5ex \@minus .5ex} +\def\etocsepminusone {4ex \@plus .5ex \@minus .5ex} +\def\etocsepzero {2.5ex \@plus .4ex \@minus .4ex} +\def\etocsepone {1.5ex \@plus .3ex \@minus .3ex} +\def\etocseptwo {.5ex \@plus .1ex \@minus .1ex} +\def\etocsepthree {.25ex \@plus .05ex \@minus .05ex} +\def\etocbaselinespreadminustwo {1} +\def\etocbaselinespreadminusone {1} +\def\etocbaselinespreadzero {1} +\def\etocbaselinespreadone {1} +\def\etocbaselinespreadtwo {1} +\def\etocbaselinespreadthree {.9} +\def\etocminustwoleftmargin {1.5em plus 0.5fil} +\def\etocminustworightmargin {1.5em plus -0.5fil} +\def\etocminusoneleftmargin {1em} +\def\etocminusonerightmargin {1em} +\def\etoctoclineleaders + {\hbox{\normalfont\normalsize\hb@xt@2ex {\hss.\hss}}} +\def\etocabbrevpagename {p.~} +\def\etocpartname {Part}% modified 1.08b +\def\etocbookname {Book} +\def\etocdefaultlines{} +\def\etocabovetocskip{3.5ex \@plus 1ex \@minus .2ex} +\def\etocbelowtocskip{3.5ex \@plus 1ex \@minus .2ex} +\def\etoccolumnsep{2em} +\def\etocmulticolsep{0ex} +\def\etocmulticolpretolerance{-1} +\def\etocmulticoltolerance{200} +\def\etocdefaultnbcol{2} +\def\etocinnertopsep{2ex} +\newcommand\etocmulticolstyle[2][]{} +\def\etocinnerbottomsep{3.5ex} +\def\etocinnerleftsep{2em} +\def\etocinnerrightsep{2em} +\def\etoctoprule{\hrule} +\def\etocleftrule{\vrule} +\def\etocrightrule{\vrule} +\def\etocbottomrule{\hrule} +\def\etoctoprulecolorcmd{\relax} +\def\etocbottomrulecolorcmd{\relax} +\def\etocleftrulecolorcmd{\relax} +\def\etocrightrulecolorcmd{\relax} +\newcommand*\etocruledstyle[2][]{} +\def\etocframedmphook{\relax} +\long\def\etocbkgcolorcmd{\relax} +\newcommand*\etocframedstyle[2][]{} +\def\etocmulticol{} +\def\etocruled{} +\def\etocframed{} +\def\etoclocalmulticol{} +\def\etoclocalruled{} +\def\etoclocalframed{} +\def\etocarticlestyle{} +\def\etocarticlestylenomarks{} +\def\etocbookstyle{} +\def\etocbookstylenomarks{} +\let\etocreportstyle\etocbookstyle +\let\etocreportstylenomarks\etocbookstylenomarks +\def\etocmemoirtoctotocfmt #1#2{} +\def\etocmemoirstyle{} +\def\etocscrartclstyle{} +\let\etocscrbookstyle\etocscrartclstyle +\let\etocscrreprtstyle\etocscrartclstyle +\def\etocstandarddisplaystyle{\etocarticlestyle} +\newcommand*\etocmarkboth[1]{} +\newcommand*\etocmarkbothnouc[1]{} +\newcommand\etoctocstyle[3][section]{} +\newcommand\etoctocstylewithmarks[4][section]{} +\newcommand\etoctocstylewithmarksnouc[4][section]{} +\def\etocignoretoctocdepth{} +\def\etocsettocdepth[1]{} +\def\etocdepthtag #1#{\Etoc@depthtag } +\def\Etoc@depthtag #1{} +\def\etocignoredepthtags {} +\def\etocobeydepthtags {} +\def\etocsettagdepth #1#2{} +\def\invisibletableofcontents {} +\def\invisiblelocaltableofcontents{} +\def\etocsetnexttocdepth #1{} +\def\etocsetlocaltop #1#{\Etoc@set@localtop} +\def\Etoc@set@localtop #1{} +\def\etocstandardlines {} +\def\etoctoclines {} +\let\etocaftertochook \@empty +\let\etocbeforetitlehook \@empty +\appto\tableofcontents{\def\tableofcontents{}} +\endinput +%% +%% End of file `lwarp-etoc.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-luatexko.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-luatexko.sty new file mode 100644 index 00000000000..2082a6320d9 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-luatexko.sty @@ -0,0 +1,119 @@ +%% +%% This is file `lwarp-luatexko.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `luatexko') +%% This is a generated file. +%% Copyright 2016-2020 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{luatexko}[2020/03/20] +\newcommand{\LWR@HTML@dotemph}[1]{% + \InlineClass[text-emphasis-style: dot]{dotemph}{#1}% +} +\LWR@formatted{dotemph} + +\newcommand{\LWR@HTML@ruby}[2]{% + \LWR@htmltagc{ruby}% + \LWR@htmltagc{rb}#1\LWR@htmltagc{/rb}% + \LWR@htmltagc{rp}(\LWR@htmltagc{/rp}% + \LWR@htmltagc{rt}#2\LWR@htmltagc{/rt}% + \LWR@htmltagc{rp})\LWR@htmltagc{/rp}% + \LWR@htmltagc{/ruby}% +} +\LWR@formatted{ruby} +\NewDocumentCommand{\LWR@HTML@uline}{+m}{% + \InlineClass% + (text-decoration:underline; text-decoration-skip: auto)% + [% + text-underline-offset: \ulinedown ; + text-decoration-thickness: \ulinewidth% + ]% + {uline}{\LWR@isolate{#1}}% +} +\LWR@formatted{uline} + +\NewDocumentCommand{\LWR@HTML@uuline}{+m}{% + \InlineClass% + (% + text-decoration:underline; text-decoration-skip: auto;% + text-decoration-style:double% + )% + [% + text-underline-offset: \ulinedown ; + text-decoration-thickness: \ulinewidth% + ]% + {uuline}{\LWR@isolate{#1}}% +} +\LWR@formatted{uuline} + +\NewDocumentCommand{\LWR@HTML@uwave}{+m}{% + \InlineClass% + (% + text-decoration:underline; text-decoration-skip: auto;% + text-decoration-style:wavy% + )% + [% + text-underline-offset: \ulinedown ; + text-decoration-thickness: \ulinewidth% + ]% + {uwave}{\LWR@isolate{#1}}% +} +\LWR@formatted{uwave} + +\NewDocumentCommand{\LWR@HTML@sout}{+m}{% + \InlineClass% + (text-decoration:line-through)% + [text-decoration-thickness: \ulinewidth]% + {sout}{\LWR@isolate{#1}}% +} +\LWR@formatted{sout} + +\NewDocumentCommand{\LWR@HTML@xout}{+m}{% + \InlineClass% + (text-decoration:line-through)% + [text-decoration-thickness: \ulinewidth]% + {xout}{\LWR@isolate{#1}}% +} +\LWR@formatted{xout} + +\NewDocumentCommand{\LWR@HTML@dashuline}{+m}{% + \InlineClass% + (% + text-decoration:underline;% + text-decoration-skip: auto;% + text-decoration-style:dashed% + )% + [% + text-underline-offset: \ulinedown ; + text-decoration-thickness: \ulinewidth% + ]% + {dashuline}{\LWR@isolate{#1}}% +} +\LWR@formatted{dashuline} + +\NewDocumentCommand{\LWR@HTML@dotuline}{+m}{% + \InlineClass% + (% + text-decoration:underline;% + text-decoration-skip: auto;% + text-decoration-style: dotted% + )% + [% + text-underline-offset: \ulinedown ; + text-decoration-thickness: \ulinewidth% + ]% + {dotuline}{\LWR@isolate{#1}}% +} +\LWR@formatted{dotuline} +\endinput +%% +%% End of file `lwarp-luatexko.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-marginnote.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-marginnote.sty index 573c0259f28..62775ee1a0c 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-marginnote.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-marginnote.sty @@ -25,6 +25,13 @@ \newcommand*{\marginfont}{} \newcommand*{\raggedleftmarginnote}{} \newcommand*{\raggedrightmarginnote}{} +\appto\LWR@restoreorigformatting{% + \RenewDocumentCommand{\marginnote}{+o +m o}{} +} +\begin{warpMathJax} +\CustomizeMathJax{\newcommand{\LWRmarginnote}[1][]{}} +\CustomizeMathJax{\newcommand{\marginnote}[2][]{\qquad{\small\textrm{#2}}\LWRmarginnote}} +\end{warpMathJax} \endinput %% %% End of file `lwarp-marginnote.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-nccfoots.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-nccfoots.sty new file mode 100644 index 00000000000..3dd306947d6 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-nccfoots.sty @@ -0,0 +1,25 @@ +%% +%% This is file `lwarp-nccfoots.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lwarp.dtx (with options: `nccfoots') +%% This is a generated file. +%% Copyright 2016-2020 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{nccfoots}[2005/02/03] +\begin{warpMathJax} +\CustomizeMathJax{\newcommand{\Footnotemark}[1]{{}^{\mathrm{#1}}}} +\CustomizeMathJax{\newcommand{\Footnote}[2]{\Footnotemark{#1}}} +\end{warpMathJax} +\endinput +%% +%% End of file `lwarp-nccfoots.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-pagenote.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-pagenote.sty index 40ca4c3e529..e6c884f18c5 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-pagenote.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-pagenote.sty @@ -19,6 +19,11 @@ \DeclareOption{page}{} \LWR@ProvidesPackagePass{pagenote}[2009/09/03] +\begin{warpMathJax} +\appto\LWR@syncnotenumbers{\LWR@synconenotenumber{LWRpagenote}{\thepagenote}} +\CustomizeMathJax{\def\LWRpagenote{1}} +\CustomizeMathJax{\newcommand{\pagenote}[2][\LWRpagenote]{{}^{\mathrm{#1}}}} +\end{warpMathJax} \endinput %% %% End of file `lwarp-pagenote.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-parnotes.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-parnotes.sty index b97bf664009..bec0e85c1fe 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-parnotes.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-parnotes.sty @@ -58,6 +58,18 @@ \crefname{parnotemark}{paragraph note}{paragraph notes}% \Crefname{parnotemark}{Paragraph note}{Paragraph notes} } +\begin{warpMathJax} +\providecommand{\parnotename}{parnote} +\appto\LWR@syncnotenumbers{% + \addtocounter{parnotemark}{-1}% specific to parnotes + \LWR@synconenotenumber{LWRparnote}{\theparnotemark}% + \addtocounter{parnotemark}{1}% specific to parnotes +} +\appto\LWR@syncnotenames{\LWR@synconenotename{LWRparnote}{\parnotename}} +\CustomizeMathJax{\def\LWRparnote{1}} +\CustomizeMathJax{\newcommand{\parnote}[2][\LWRparnote]{{}^{\mathrm{#1}}}} +\CustomizeMathJax{\newcommand{\parnotemark}[1][\LWRparnote]{{}^{\mathrm{#1}}}} +\end{warpMathJax} \endinput %% %% End of file `lwarp-parnotes.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-memoir.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-memoir.sty index 851868441a9..fc19c62e397 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-memoir.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-memoir.sty @@ -256,8 +256,6 @@ \csletcs{appendixpage*}{appendixpage} \renewcommand*{\namedsubappendices}{} \renewcommand*{\unnamedsubappendices}{} -\renewcommand*{\setsecnumdepth}[1]{}% todo tocvsec2 -\renewcommand*{\maxsecnumdepth}[1]{}% todo tocvsec2 \renewcommand*{\beforebookskip}{} \renewcommand*{\afterbookskip}{} \renewcommand*{\beforepartskip}{} @@ -472,8 +470,6 @@ \renewcommand*{\ensureonecol}{} \renewcommand*{\restorefromonecol}{} \renewcommand*{\doccoltocetc}{} -\renewcommand*{\maxtocdepth}[1]{}% tocvsec2 -\renewcommand*{\settocdepth}[1]{}% tocvsec2 \renewcommand{\tocheadstart}{} \renewcommand{\printtoctitle}[1]{} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-sidenotes.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-sidenotes.sty index 30e2f04a5c7..fd7083aeb0b 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-sidenotes.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-sidenotes.sty @@ -61,6 +61,13 @@ \renewenvironment{table*} {\@dblfloat{table}} {\end@dblfloat} +\begin{warpMathJax} +\providecommand{\sidenotename}{sidenote} +\appto\LWR@syncnotenumbers{\LWR@synconenotenumber{LWRsidenote}{\thesidenote}} +\appto\LWR@syncnotenames{\LWR@synconenotename{LWRsidenote}{\sidenotename}} +\CustomizeMathJax{\def\LWRsidenote{1}} +\CustomizeMathJax{\newcommand{\sidenotemark}[1][\LWRsidenote]{{}^{\mathrm{#1}}}} +\end{warpMathJax} \endinput %% %% End of file `lwarp-sidenotes.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-soul.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-soul.sty index 3cbe798a8ca..3ae76bcb2ca 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-soul.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-soul.sty @@ -69,6 +69,7 @@ \newcommand*{\resetul}{} \newcommand*{\setuldepth}[1]{} \newcommand*{\setuloverlap}[1]{} +\newcommand*{\<}{} \newcommand*{\setulcolor}[1]{\renewcommand{\LWR@soululcolor}{#1}} \newcommand*{\setstcolor}[1]{\renewcommand{\LWR@soulstcolor}{#1}} \newcommand*{\sethlcolor}[1]{\renewcommand{\LWR@soulhlcolor}{#1}} diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-syntonly.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-syntonly.sty index 44a635992a1..02058b23280 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-syntonly.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-syntonly.sty @@ -22,6 +22,8 @@ \newcommand*{\syntaxonly}{} \@onlypreamble\syntaxonly + +\def\nopages@{} \endinput %% %% End of file `lwarp-syntonly.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-ulem.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-ulem.sty index 58403351f4b..2206492d05b 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-ulem.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-ulem.sty @@ -55,6 +55,7 @@ (text-decoration:line-through)% {xout}{\LWR@isolate{#1}}% } +\LWR@formatted{xout} \NewDocumentCommand{\LWR@HTML@dashuline}{+m}{% \InlineClass% @@ -65,7 +66,7 @@ )% {dashuline}{\LWR@isolate{#1}}% } -\LWR@formatted{xout} +\LWR@formatted{dashuline} \NewDocumentCommand{\LWR@HTML@dotuline}{+m}{% \InlineClass% diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-xpinyin.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-xpinyin.sty index 7dd73f7c36a..33482536cb4 100644 --- a/Master/texmf-dist/tex/latex/lwarp/lwarp-xpinyin.sty +++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-xpinyin.sty @@ -15,14 +15,59 @@ %% 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{xpinyin}[2018/01/28] -\RenewDocumentEnvironment{pinyinscope}{O{}}{}{} - -\RenewDocumentCommand{\xpinyin}{s O{} m}{% - \IfBooleanTF{#1}{#3}{\@firstoftwo#3}% +\LWR@ProvidesPackagePass{xpinyin}[2019-04-07] +\ExplSyntaxOn +\cs_new_protected_nopar:Npn \LWR@HTML@__xpinyin_make_pinyin_box:nnn #1#2#3 +{ + \color_group_begin: \color_ensure_current: + \l__xpinyin_pinyin_box_hook_tl + \renewcommand*{\l__xpinyin_ratio_tl}{1}% for pdftotext + \__xpinyin_select_font: + \clist_if_exist:cTF { c__xpinyin_multiple_ #1 _clist } + { \l__xpinyin_multiple_tl \l__xpinyin_format_tl } + { \l__xpinyin_format_tl } + \ifdefempty{\l__xpinyin_format_tl} + {#3} + {\LWR@textcurrentcolor{#3}} + \color_group_end: } +\LWR@formatted{__xpinyin_make_pinyin_box:nnn} + +\cs_new_protected_nopar:Npn \LWR@HTML@__xpinyin_CJKsymbol:nn #1#2 + { + \__xpinyin_leavevmode: + \LWR@htmltagc{ruby} + \LWR@htmltagc{rb} + \__xpinyin_save_CJKsymbol:n {#2}\null% \null removes extra space + \LWR@htmltagc{/rb\space} + \LWR@htmltagc{rp}(\LWR@htmltagc{/rp\space} + \LWR@htmltagc{rt} + \__xpinyin_make_pinyin_box:nnn {#1} {#2} { \use:c { c__xpinyin_ #1 _tl } } + \LWR@htmltagc{/rt\space} + \LWR@htmltagc{rp})\LWR@htmltagc{/rp\space} + \LWR@htmltagc{/ruby\space}\null + } +\LWR@formatted{__xpinyin_CJKsymbol:nn} + +\cs_new_protected_nopar:Npn \LWR@HTML@__xpinyin_single_CJKsymbol:nn #1#2 + { + \__xpinyin_leavevmode: + \LWR@htmltagc{ruby} + \LWR@htmltagc{rb} + \__xpinyin_save_CJKsymbol:n {#1}\null% \null removes extra space + \LWR@htmltagc{/rb\space} + \LWR@htmltagc{rp}(\LWR@htmltagc{/rp\space} + \LWR@htmltagc{rt} + \__xpinyin_make_pinyin_box:xnn + { \__xpinyin_to_unicode:n {#1} } {#1} { \__xpinyin_pinyin:n {#2} } + \LWR@htmltagc{/rt\space} + \LWR@htmltagc{rp})\LWR@htmltagc{/rp\space} + \LWR@htmltagc{/ruby\space}\null + } +\LWR@formatted{__xpinyin_single_CJKsymbol:nn} -\RenewDocumentCommand{\enablepinyin}{}{} +\ExplSyntaxOff +\renewcommand*{\LWR@disablepinyin}{\disablepinyin} \endinput %% %% End of file `lwarp-xpinyin.sty'. diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp.sty index ea0bba113a2..09abb4ef2a9 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} - [2020/03/04 v0.81 Allows LaTeX to directly produce HTML5 output.] + [2020/03/25 v0.82 Allows LaTeX to directly produce HTML5 output.] @@ -82,9 +82,9 @@ \@ifpackageloaded{#1} {} { -\PackageError{lwarp} -{Package #1 must be loaded before lwarp} -{Move \detokenize{\usepackage}{#1} before \detokenize{\usepackage}{lwarp}.} + \PackageError{lwarp} + {Package #1 must be loaded before lwarp} + {Move \detokenize{\usepackage}{#1} before \detokenize{\usepackage}{lwarp}.} } } @@ -295,6 +295,7 @@ \LWR@loadafter{eqparbox} \LWR@loadafter{errata} \LWR@loadafter{eso-pic} +\LWR@loadafter{etoc} \LWR@loadafter{eurosym} \LWR@loadafter{everypage} \LWR@loadafter{everyshi} @@ -432,6 +433,7 @@ \LWR@loadafter{nameref} \LWR@loadafter{natbib} \LWR@notmemoirloadafter{nccfancyhdr} +\LWR@loadafter{nccfoots} \LWR@loadafter{nccmath} \LWR@notmemoirloadafter{needspace} \LWR@loadafter{newtxmath} @@ -559,6 +561,7 @@ \LWR@loadafter{subsupscripts} \LWR@loadafter{supertabular} \LWR@loadafter{svg} +\LWR@loadafter{syntonly} \LWR@loadafter{t1inc} \LWR@loadafter{tabfigures} \LWR@loadafter{tabls} @@ -749,6 +752,7 @@ \@ifpackageloaded{xeCJK}{ \renewcommand{\LWR@isolate}[1]{\null#1\null}% }{} +\newcommand*{\LWR@disablepinyin}{} \newcommand*{\LWR@forceemptyline}{% \LWR@origrule{0pt}{1\baselineskip}% \LWR@orignewline% @@ -4193,7 +4197,7 @@ src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.6/MathJax.js?config=TeX- -- Copyright 2016-2020 Brian Dunn -printversion = "v0.81" +printversion = "v0.82" requiredconfversion = "2" -- also at *lwarpmk.conf function printhelp () @@ -5304,6 +5308,8 @@ end -- not --version \newcommand*{\LWR@htmlsectionfilename}[1]{% \LWR@traceinfo{LWR@htmlsectionfilename A !\detokenize{#1}!}% +\begingroup% +\LWR@disablepinyin% \LWR@sanitize{#1}% \LWR@traceinfo{about to compare with ??}% \ifthenelse{\equal{\LWR@sanitized}{??}}% @@ -5335,6 +5341,7 @@ end -- not --version }% }% \LWR@traceinfo{LWR@htmlsectionfilename Z}% +\endgroup% } \newcommand*{\LWR@htmlrefsectionfilename}[1]{% @@ -6093,6 +6100,7 @@ end -- not --version \csname p@footnote\endcsname\@thefnmark% }% @currentlabel \color@begingroup% + \LWR@disablepinyin% \renewrobustcmd{\textsuperscript}[1]{\LWR@htmlspan{sup}{##1}}% \ifthenelse{% \boolean{LWR@doingstartpars} \AND% @@ -6486,10 +6494,28 @@ end -- not --version \typeout{---} } +\providecommand{\footnotename}{footnote} + +\end{warpHTML} + +\begin{warpMathJax} +\xdef\LWR@customizedMathJax{\LWR@customizedMathJax% + \LWRbackslash(% + \LWRbackslash{}newcommand% + \{\LWRbackslash{}footnotename\}% + \{\footnotename\}% + \LWRbackslash)\par% +} +\end{warpMathJax} + +\begin{warpMathJax} +\CustomizeMathJax{\def\LWRfootnote{1}} +\CustomizeMathJax{\newcommand{\footnote}[2][\LWRfootnote]{{}^{\mathrm{#1}}}} +\CustomizeMathJax{\newcommand{\footnotemark}[1][\LWRfootnote]{{}^{\mathrm{#1}}}} +\end{warpMathJax} + \begin{warpMathJax} \CustomizeMathJax{\newcommand\ensuremath[1]{#1}} -\CustomizeMathJax{\newcommand\footnote[2][]{\text{( Footnote #1 )}}} -\CustomizeMathJax{\newcommand\footnotemark[1][]{\text{( Footnote #1 )}}} \CustomizeMathJax{% absorb two optional arguments \newcommand{\LWRframebox}[2][]{\fbox{#2}} \newcommand{\framebox}[1][]{\LWRframebox} @@ -6503,6 +6529,8 @@ end -- not --version \CustomizeMathJax{\newcommand{\luatexdirectlua}[1]{\text{(directlua)}}} \end{warpMathJax} +\begin{warpHTML}% due to warpMathJax + \newcommand{\LWR@customizeMathJax}{% \ifbool{mathjax}{ \LWR@stoppars @@ -10062,11 +10090,12 @@ end -- not --version \LWR@traceinfo{LWR@myshorttoc: #1}% \LWR@ensuredoingapar% \IfFileExists{\jobname.#1}{% - \LWR@traceinfo{LWR@myshorttoc: loading}% - \begingroup% - \makeatletter% - \@input{\jobname.#1}% - \endgroup% + \LWR@traceinfo{LWR@myshorttoc: loading}% + \begingroup% + \makeatletter% + \LWR@disablepinyin% + \@input{\jobname.#1}% + \endgroup% }% {}% \LWR@traceinfo{LWR@myshorttoc: done}% @@ -10747,7 +10776,11 @@ end -- not --version }% {% \LWR@traceinfo{LWR@subsingledollar: Mathjax}% - {\textbackslash(\LWR@HTMLsanitize{#4}\textbackslash)}% + {% + \textbackslash(% + \LWR@HTMLsanitize{#4}% + \textbackslash)% + }% }% mathjax {% not mathjax \LWR@traceinfo{% @@ -10913,22 +10946,26 @@ end -- not --version \newcounter{LWR@nextequation} \newcommand*{\LWR@syncmathjax}{% \ifcsdef{thechapter}{ + \LWR@stoppars% \InlineClass{hidden}{ \textbackslash( \textbackslash{}seteqsection \{\thechapter\} \textbackslash) } + \LWR@startpars% } {}% not using chapters \ifthenelse{\cnttest{\value{equation}}>0} { \setcounter{LWR@nextequation}{\value{equation}} \addtocounter{LWR@nextequation}{1} + \LWR@stoppars% \InlineClass{hidden}{ \textbackslash( \textbackslash{}seteqnumber \{\arabic{LWR@nextequation}\} \textbackslash) } + \LWR@startpars% }{}% not eq > 0 } \NewDocumentCommand{\LWR@hidelatexequation}{m +m}{% @@ -10964,7 +11001,7 @@ end -- not --version \ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }% { - \LWR@syncmathjax + \LWR@syncmathjax% \LWR@hidelatexequation{#2}{#1} } {% not mathjax @@ -11001,12 +11038,34 @@ end -- not --version \newcommand*{\LWR@doendequation}[1]{% \ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }% {% - \LWR@addmathjax{#1}{\BODY}% + \IfSubStr{\detokenize\expandafter{\BODY}}{\detokenize{note}}{% + \InlineClass{hidden}{\LWR@syncnotenumbers}% + \LWR@addmathjax{#1}{\BODY}% + \InlineClass{hidden}{\LWR@syncnotenames}% + }{% + \LWR@addmathjax{#1}{\BODY}% + }% }{}% \gdef\LWR@ThisAltText{}% } +\newcommand*{\LWR@synconenotenumber}[2]{% + \textbackslash( + \textbackslash{}def\textbackslash{}#1\{#2\} + \textbackslash) +} + +\newcommand*{\LWR@syncnotenumbers}{\LWR@synconenotenumber{LWRfootnote}{\thefootnote}} + +\newcommand*{\LWR@synconenotename}[2]{% + \textbackslash( + \textbackslash{}def\textbackslash{}#1\{#2\} + \textbackslash) +} + +\newcommand*{\LWR@syncnotenames}{\LWR@synconenotename{LWRfootnote}{\footnotename}} + \AtBeginDocument{ \let\equation\relax \let\endequation\relax @@ -11520,6 +11579,8 @@ end -- not --version \LWR@PreloadedPackage{lltjext} +\LWR@PreloadedPackage{luatexko} + \end{warpHTML} -- cgit v1.2.3