diff options
Diffstat (limited to 'macros/latex/contrib/lwarp')
| -rw-r--r-- | macros/latex/contrib/lwarp/README.txt | 2 | ||||
| -rw-r--r-- | macros/latex/contrib/lwarp/lwarp.dtx | 584 | ||||
| -rw-r--r-- | macros/latex/contrib/lwarp/lwarp.ins | 2 | ||||
| -rw-r--r-- | macros/latex/contrib/lwarp/lwarp.pdf | bin | 2970521 -> 2976111 bytes | |||
| -rwxr-xr-x | macros/latex/contrib/lwarp/lwarpmk.lua | 2 |
5 files changed, 455 insertions, 135 deletions
diff --git a/macros/latex/contrib/lwarp/README.txt b/macros/latex/contrib/lwarp/README.txt index 602ea9e737..58381f0c29 100644 --- a/macros/latex/contrib/lwarp/README.txt +++ b/macros/latex/contrib/lwarp/README.txt @@ -1,5 +1,5 @@ -LaTeX lwarp package v0.891 README.txt +LaTeX lwarp package v0.892 README.txt Files included are: diff --git a/macros/latex/contrib/lwarp/lwarp.dtx b/macros/latex/contrib/lwarp/lwarp.dtx index 8a40c80c2f..6d04f1898c 100644 --- a/macros/latex/contrib/lwarp/lwarp.dtx +++ b/macros/latex/contrib/lwarp/lwarp.dtx @@ -16,7 +16,7 @@ % \iffalse %<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01] %<package>\ProvidesPackage{lwarp} -%<package> [2020/09/22 v0.891 Allows LaTeX to directly produce HTML5 output.] +%<package> [2020/10/07 v0.892 Allows LaTeX to directly produce HTML5 output.] % %<*driver> \documentclass{ltxdoc} @@ -3027,7 +3027,7 @@ This boolean may be tested by the user for later use. %<*package> % \fi % -% \CheckSum{50243} +% \CheckSum{50415} % % \CharacterTable % {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -3160,6 +3160,7 @@ This boolean may be tested by the user for later use. % \changes{v0.88}{2020/07/19}{\ 2020/07/19} % \changes{v0.89}{2020/09/03}{\ 2020/09/03} % \changes{v0.891}{2020/09/22}{\ 2020/09/22} +% \changes{v0.892}{2020/10/07}{\ 2020/10/07} @@ -3383,6 +3384,18 @@ This boolean may be tested by the user for later use. % % \begin{description} % \needspace{2\baselineskip} +% \item[v0.892:] \pkg{minted}, \pkg{fvextra}, \brand{MathJax} \cs{left} \Slash \cs{right}. +% \begin{itemize} +% \item \pkg{fourier}, \pkg{libertinust1math}, \pkg{newpxmath}, \pkg{newtxmath}, +% \margintag{\brand{MathJax}} +% \pkg{newtxsf}, \pkg{unicode-math}: Added \brand{MathJax} +% \cs{left} \Slash \cs{right} support for additional delimiters. +% \item \pkg{textpos}: Updated to v1.10. +% \margintag{packages} +% \item \pkg{xcolor}: Fixed optional args for \cs{fcolorbox} and related. +% \item Added \pkg{fvextra}, \pkg{minted}. +% \end{itemize} +% \needspace{2\baselineskip} % \item[v0.891:] \brand{MathJax} additions and improvements. % \begin{itemize} % \item Now displays inline \cs{verb} text as \cs{texttt}. @@ -5646,7 +5659,7 @@ This boolean may be tested by the user for later use. % \mpkg{quoting}, \mpkg{verse}. \\ % % Verbatim: & -% \mpkg{fancyvrb}, \mpkg{moreverb}, \spkg{shortvrb}, \mpkg{verbatim}. \\ +% \mpkg{fancyvrb}, \mpkg{fvextra}, \mpkg{moreverb}, \spkg{shortvrb}, \mpkg{verbatim}. \\ % % Frames: & \mpkg{boxedminipage}, \mpkg{boxedminipage2e}, % \mpkg{fancybox}, \mpkg{fbox}\ejax, \mpkg{framed}, \mpkg{mdframed}, @@ -5740,7 +5753,8 @@ This boolean may be tested by the user for later use. % \mpkg{engtlc}\ejax, \spkg{fast-diagram}, \mpkg{ghsystem}, % \spkg{hepnicenames}, \spkg{heppennames}, \spkg{hepunits}\ejax, % \spkg{karnaughmap}, \mpkg{karnaugh-map}, -% \mpkg{listings}, \spkg{listingsutf8}, \spkg{linop}, \mpkg{mhchem}\sjax, \spkg{pgfgantt}, +% \mpkg{listings}, \spkg{listingsutf8}, \spkg{linop}, +% \mpkg{mhchem}\sjax, \mpkg{minted}, \spkg{pgfgantt}, % \mpkg{phfqit}, \spkg{physics}\sjax, \spkg{physunits}\ejax, \spkg{qcircuit}, % \mpkg{register}, \spkg{simpler-wick}, % \spkg{slashed}\ejax, \mpkg{steinmetz}\ejax, \spkg{structmech}, \mpkg{struktex}. @@ -12908,6 +12922,7 @@ This boolean may be tested by the user for later use. \LWR@loadafter{fullminipage} \LWR@loadafter{fullpage} \LWR@loadafter{fullwidth} +\LWR@loadafter{fvextra} \LWR@loadafter{fwlw} \LWR@loadafter{gensymb} \LWR@loadafter{gentombow} @@ -13000,6 +13015,7 @@ This boolean may be tested by the user for later use. \LWR@loadafter{midpage} \LWR@loadafter{minibox} \LWR@loadafter{minitoc} +\LWR@loadafter{minted} \LWR@loadafter{mismath} \LWR@loadafter{mleftright} % morefloats must be allowed early for print mode @@ -19614,7 +19630,7 @@ page_compositor "." % \changes{v0.86}{2020/05/03}{File: \filenm{lwarp_mathjax.txt}: Added support for starred macros.} % \changes{v0.87}{2020/05/20}{File: \filenm{lwarp_mathjax.txt}: Now provides \cs{ifstar}, \cs{ifnextchar}.} % \changes{v0.891}{2020/09/07}{File: \filenm{lwarp_mathjax.txt}: Renamed \filenm{tagformat} extension.} -% +% \changes{v0.892}{2020/09/26}{File: \filenm{lwarp_mathjax.txt}: Added \cs{left} \Slash \cs{right} delimiters.} % ^^A *lwarp_mathjax.txt % % \codeconfig @@ -19627,6 +19643,7 @@ page_compositor "." // Based on code by Davide P. Cervone. // Equation numbering: https://github.com/mathjax/MathJax/issues/2427 // Starred and ifnextchar macros: https://github.com/mathjax/MathJax/issues/2428 +// \left, \right delimiters: https://github.com/mathjax/MathJax/issues/2535 // // Modified by Brian Dunn to adjust equation numbering and add subequations. // @@ -19678,7 +19695,7 @@ MathJax = { const star = parser.GetStar(); // true if there is a * useArgument(parser, star ? resultstar : resultnostar); }, - + // This function implements an ifnextchar macro. IfnextcharFunction(parser, name) { let whichchar = parser.GetArgument(name); @@ -19704,6 +19721,7 @@ MathJax = { MathJax.config.section=neweqsection ; // a string with numeric meaning parser.tags.counter = parser.tags.allCounter = neweqnumber ; } + }); // Create the ifstar-ifnextchar-setequnumber package @@ -19726,6 +19744,51 @@ MathJax = { math.inputData.recompile.section = MathJax.config.section; } }); + + // For \left, \right with unicode-math: + const {DelimiterMap} = MathJax._.input.tex.SymbolMap; + const {Symbol} = MathJax._.input.tex.Symbol; + const {MapHandler} = MathJax._.input.tex.MapHandler; + const delimiter = MapHandler.getMap('delimiter'); + delimiter.add('\\lBrack', new Symbol('\\lBrack', '\u27E6')); + delimiter.add('\\rBrack', new Symbol('\\rBrack', '\u27E7')); + delimiter.add('\\lAngle', new Symbol('\\lAngle', '\u27EA')); + delimiter.add('\\rAngle', new Symbol('\\rAngle', '\u27EB')); + delimiter.add('\\lbrbrak', new Symbol('\\lbrbrak', '\u2772')); + delimiter.add('\\rbrbrak', new Symbol('\\rbrbrak', '\u2773')); + delimiter.add('\\lbag', new Symbol('\\lbag', '\u27C5')); + delimiter.add('\\rbag', new Symbol('\\rbag', '\u27C6')); + delimiter.add('\\llparenthesis', new Symbol('\\llparenthesis', '\u2987')); + delimiter.add('\\rrparenthesis', new Symbol('\\rrparenthesis', '\u2988')); + delimiter.add('\\llangle', new Symbol('\\llangle', '\u2989')); + delimiter.add('\\rrangle', new Symbol('\\rrangle', '\u298A')); + delimiter.add('\\Lbrbrak', new Symbol('\\Lbrbrak', '\u27EC')); + delimiter.add('\\Rbrbrak', new Symbol('\\Rbrbrak', '\u27ED')); + delimiter.add('\\lBrace', new Symbol('\\lBrace', '\u2983')); + delimiter.add('\\rBrace', new Symbol('\\rBrace', '\u2984')); + delimiter.add('\\lParen', new Symbol('\\lParen', '\u2985')); + delimiter.add('\\rParen', new Symbol('\\rParen', '\u2986')); + delimiter.add('\\lbrackubar', new Symbol('\\lbrackubar', '\u298B')); + delimiter.add('\\rbrackubar', new Symbol('\\rbrackubar', '\u298C')); + delimiter.add('\\lbrackultick', new Symbol('\\lbrackultick', '\u298D')); + delimiter.add('\\rbracklrtick', new Symbol('\\rbracklrtick', '\u298E')); + delimiter.add('\\lbracklltick', new Symbol('\\lbracklltick', '\u298F')); + delimiter.add('\\rbrackurtick', new Symbol('\\rbrackurtick', '\u2990')); + delimiter.add('\\langledot', new Symbol('\\langledot', '\u2991')); + delimiter.add('\\rangledot', new Symbol('\\rangledot', '\u2992')); + delimiter.add('\\lparenless', new Symbol('\\lparenless', '\u2993')); + delimiter.add('\\rparengtr', new Symbol('\\rparengtr', '\u2994')); + delimiter.add('\\Lparengtr', new Symbol('\\Lparengtr', '\u2995')); + delimiter.add('\\Rparenless', new Symbol('\\Rparenless', '\u2996')); + delimiter.add('\\lblkbrbrak', new Symbol('\\lblkbrbrak', '\u2997')); + delimiter.add('\\rblkbrbrak', new Symbol('\\rblkbrbrak', '\u2998')); + delimiter.add('\\lvzigzag', new Symbol('\\lvzigzag', '\u29D8')); + delimiter.add('\\rvzigzag', new Symbol('\\rvzigzag', '\u29D9')); + delimiter.add('\\Lvzigzag', new Symbol('\\Lvzigzag', '\u29DA')); + delimiter.add('\\Rvzigzag', new Symbol('\\Rvzigzag', '\u29DB')); + delimiter.add('\\lcurvyangle', new Symbol('\\lcurvyangle', '\u29FC')); + delimiter.add('\\rcurvyangle', new Symbol('\\rcurvyangle', '\u29FD')); + delimiter.add('\\Vvert', new Symbol('\\Vvert', '\u2980')); } // ready }, // startup @@ -19881,7 +19944,7 @@ MathJax = { -- Copyright 2016-2020 Brian Dunn -printversion = "v0.891" +printversion = "v0.892" requiredconfversion = "2" -- also at *lwarpmk.conf function printhelp () @@ -22342,6 +22405,7 @@ end -- not --version % \subsection{Div class and element class} + % \begin{macro}{\LWR@subhtmlelementclass} \marg{element} \oarg{style} \marg{class} % % Factored and reused in several places. @@ -22355,21 +22419,22 @@ end -- not --version % \changes{v0.34}{2017/08/02}{Moved optional argument in front of mandatory.} % \changes{v0.63}{2018/11/24}{Fix for \pkg{xeCJK}.} % \changes{v0.66}{2019/02/02}{Improved \HTML\ formatting.} +% \changes{v0.892}{2020/10/03}{Ignore empty class.} % % \begin{macrocode} \NewDocumentCommand{\LWR@subhtmlelementclass}{m O{} m}{% \LWR@traceinfo{LWR@subhtmlelementclass !#1!#2!#3!}% \ifblank{#2}% -{% empty option +{% empty style \LWR@htmltag{% - #1 % space - class=\textquotedbl#3\textquotedbl\ % space + #1% + \ifblank{#3}{}{ class=\textquotedbl#3\textquotedbl\ }% spaces }% }% -{% non-empty option +{% non-empty style \LWR@htmltag{% #1\LWR@indentHTML% - class=\textquotedbl#3\textquotedbl\LWR@indentHTML% + \ifblank{#3}{}{class=\textquotedbl#3\textquotedbl\LWR@indentHTML}% style=\textquotedbl#2\textquotedbl\LWR@orignewline% }% }% @@ -27562,6 +27627,7 @@ end -- not --version \par% }{}% % \end{macrocode} +% % Use a mono-spaced font to preserve horizontal positioning. % If horizontal alignment is important for the user, use a mono-spaced font % in the \CSS\ for the |verse| class. @@ -27573,10 +27639,9 @@ end -- not --version % \changes{v0.54}{2018/04/06}{Improved column alignment.} % \changes{v0.85}{2020/04/29}{Fix: Added print macros for \pkg{fontspec}.} % \begin{macrocode} -% \LWR@print@normalsize% \LWR@print@normalfont% \LWR@origttfamily% -\LWR@print@small% +\LWR@print@scriptsize% % \end{macrocode} % Since inside a \element{pre}, restore the original list processing: % \begin{macrocode} @@ -52927,7 +52992,14 @@ solid {\FancyVerbRuleColor{\LWR@origpound\LWR@tempcolor}} ; % space \let\FV@LeftListFrame\relax% \let\FV@RightListFrame\relax% \let\FV@EndListFrame\LWR@fvendline} - +% \end{macrocode} +% +% Seems to be required in some situations: +% \changes{v0.892}{2020/10/06}{\pkg{fancyvrb}: Provided \cs{FV@FrameFillLine}.} +% \begin{macrocode} +\def\FV@FrameFillLine{}% +% \end{macrocode} +% \begin{macrocode} \def\FV@Frame@leftline{% \renewcommand*{\LWR@FVstyle}{% \LWR@currenttextcolorstyle\LWR@indentHTMLtwo% @@ -53001,6 +53073,25 @@ solid {\FancyVerbRuleColor{\LWR@origpound\LWR@tempcolor}} ; % space } % \end{macrocode} +% \changes{v0.892}{2020/10/05}{\pkg{fancyvrb}: Adapted to \pkg{fvextra}.} +% \begin{macrocode} +\def\FV@ListProcessLine@i#1{% +% \hbox{% + \ifvoid\@labels\else + \hbox to \z@{\kern\@totalleftmargin\box\@labels\hss}% + \fi + \FV@ListProcessLine{#1}% +% }% +% \let\FV@ProcessLine\FV@ListProcessLine@ii% +} +% \end{macrocode} + +% \changes{v0.892}{2020/10/05}{\pkg{fancyvrb}: Adapted to \pkg{fvextra}.} +% \begin{macrocode} +\def\FV@ListProcessLastLine{} +% \end{macrocode} + + % \begin{environment}{BVerbatim} % \changes{v0.891}{2020/09/12}{\pkg{fancyvrb}: Fix: \env{BVerbatim} with labels.} % \begin{macrocode} @@ -55105,12 +55196,18 @@ solid {\FancyVerbRuleColor{\LWR@origpound\LWR@tempcolor}} ; % space \CustomizeMathJax{\let\othervarvarpi\othervarpi} \CustomizeMathJax{\let\othervarvarrho\othervarrho} \CustomizeMathJax{\let\varpartialdiff\partial} +% \end{macrocode} +% +% \filenm{lwarp_mathjax.txt} adds \cs{left} \Slash \cs{right} support for +% delimiters. +% \changes{v0.892}{2020/09/26}{\pkg{fourier}: Added \cs{left} \Slash \cs{right} support in \filenm{lwarp_mathjax.txt}.} +% \begin{macrocode} +\CustomizeMathJax{\let\llbracket\lBrack} +\CustomizeMathJax{\let\rrbracket\rBrack} +\CustomizeMathJax{\let\dblbrackleft\lBrack} +\CustomizeMathJax{\let\dblbrackright\rBrack} -\CustomizeMathJax{\let\llbracket[}% single only -\CustomizeMathJax{\let\rrbracket]}% single only -\CustomizeMathJax{\let\dblbrackleft[}% single only -\CustomizeMathJax{\let\dblbrackright]}% single only -\CustomizeMathJax{\let\VERT|}% single only +\CustomizeMathJax{\let\VERT|} \CustomizeMathJax{\newcommand{\parallelslant}{\mathrel{\unicode{x02AFD}}}} \CustomizeMathJax{\newcommand{\thething}{\mathord{\unicode{x1F60E}}}} @@ -55455,6 +55552,199 @@ solid {\FancyVerbRuleColor{\LWR@origpound\LWR@tempcolor}} ; % space % % % +% \iffalse +%<*fvextra> +% \fi +% +% \part{lwarp-fvextra.sty} +% +% \section{fvextra} +% +% \credits{Geoffrey M. Poore} +% +% \DescribePackage{fvextra} +% \pkg{fvextra} is patched for use by \pkg{lwarp}. +% +% \changes{v0.892}{2020/10/05}{\pkg{fvextra}: Added.} +% +% \codehtml +% +% \begin{macrocode} +\LWR@ProvidesPackagePass{fvextra}[2019/02/04] +% \end{macrocode} +% +% Ignored are \optn{highlight}, +% \optn{showtabs}, \optn{obeytabs}, \optn{tab}, \optn{tabcolor}. +% Also ignored are all options regarding line breaking +% except \optn{breaklines}, which is emulated as true. +% +% \optn{tabsize} is honored. +% +% If line numbers on the right side are used along with \optn{breaklines}, +% the line numbers will not be aligned. +% \begin{macrocode} + +\define@booleankey{FV}{obeytabs}% +% {\let\FV@ObeyTabsInit\FV@@ObeyTabsInit}% + {\let\FV@ObeyTabsInit\relax} + {\let\FV@ObeyTabsInit\relax} + +\define@key{FV}{tabcolor}% + {} + +\define@key{FV}{tab}{} + +\define@booleankey{FV}{showtabs}% +% {\def\FV@TabChar{\FV@TabColor{\FancyVerbTab}}}% + {\let\FV@TabChar\relax} + {\let\FV@TabChar\relax} + +\newbool{LWR@FV@breaklines} + +\define@booleankey{FV}{breaklines}% + {\FV@BreakLinesfalse + \booltrue{LWR@FV@breaklines} + \let\FV@ListProcessLine\FV@ListProcessLine@NoBreak} + {\FV@BreakLinesfalse + \boolfalse{LWR@FV@breaklines} + \let\FV@ListProcessLine\FV@ListProcessLine@NoBreak} +% \fvset{breaklines} + +\define@key{FV}{breakanywheresymbolpre}{\def\FancyVerbBreakAnywhereSymbolPre{}} +\fvset{breakanywheresymbolpre={}} + +\define@key{FV}{breakanywheresymbolpost}{\def\FancyVerbBreakAnywhereSymbolPost{}} +\fvset{breakanywheresymbolpost={}} + +\define@key{FV}{breakbeforesymbolpre}{\def\FancyVerbBreakBeforeSymbolPre{}} +\fvset{breakbeforesymbolpre={}} + +\define@key{FV}{breakbeforesymbolpost}{\def\FancyVerbBreakBeforeSymbolPost{}} +\fvset{breakbeforesymbolpost={}} + +\define@key{FV}{breakaftersymbolpre}{\def\FancyVerbBreakAfterSymbolPre{}} +\fvset{breakaftersymbolpre={}} + +\define@key{FV}{breakaftersymbolpost}{\def\FancyVerbBreakAfterSymbolPost{}} +\fvset{breakaftersymbolpost={}} + +\define@key{FV}{breaksymbolleft}{\def\FancyVerbBreakSymbolLeft{}} + +\define@key{FV}{breaksymbol}{\fvset{breaksymbolleft={}}} + +\fvset{breaksymbolleft={}} + +\define@key{FV}{breaksymbolright}{\def\FancyVerbBreakSymbolRight{}} +\fvset{breaksymbolright={}} + +\def\FV@ListProcessLine@NoBreak#1{% +% \hbox to \hsize{% +% \kern\leftmargin +% \hbox to \linewidth{% + \FV@LeftListNumber% + \FV@LeftListFrame% + \FancyVerbFormatLine{% + \FancyVerbHighlightLine{% + \FV@ObeyTabs{\FancyVerbFormatText{#1}}}}%\hss + \FV@RightListFrame% + \FV@RightListNumber% +% }% +% \hss}% +\null\par% lwarp +} + + +\newcommand*{\LWR@FV@linethensep}{% + \ifbool{LWR@FV@breaklines}% + {\theFancyVerbLine\kern\FV@NumberSep}% + {\hbox to\z@{\hss\theFancyVerbLine\kern\FV@NumberSep}}% +} + +\newcommand*{\LWR@FV@septhenline}{% + \ifbool{LWR@FV@breaklines}% + {\kern\FV@NumberSep\theFancyVerbLine}% + {\hbox to\z@{\kern\FV@NumberSep\theFancyVerbLine\hss}}% +} + +\xpatchcmd{\FV@Numbers@left} + {\hbox to\z@{\hss\theFancyVerbLine\kern\FV@NumberSep}} + {\LWR@FV@linethensep} + {} + {\LWR@patcherror{fvextra}{FV@Numbers@left A}} + +\xpatchcmd{\FV@Numbers@left} + {\hbox to\z@{\hss\theFancyVerbLine\kern\FV@NumberSep}} + {\LWR@FV@linethensep} + {} + {\LWR@patcherror{fvextra}{FV@Numbers@left B}} + +\xpatchcmd{\FV@Numbers@left} + {\hbox to\z@{\hss\theFancyVerbLine\kern\FV@NumberSep}} + {\LWR@FV@linethensep} + {} + {\LWR@patcherror{fvextra}{FV@Numbers@left C}} + +\xpatchcmd{\FV@Numbers@right} + {\hbox to\z@{\kern\FV@NumberSep\theFancyVerbLine\hss}} + {\LWR@FV@septhenline} + {} + {\LWR@patcherror{fvextra}{FV@Numbers@right A}} + +\xpatchcmd{\FV@Numbers@right} + {\hbox to\z@{\kern\FV@NumberSep\theFancyVerbLine\hss}} + {\LWR@FV@septhenline} + {} + {\LWR@patcherror{fvextra}{FV@Numbers@right B}} + +\xpatchcmd{\FV@Numbers@right} + {\hbox to\z@{\hss\theFancyVerbLine\kern\FV@NumberSep}} + {\LWR@FV@linethensep} + {} + {\LWR@patcherror{fvextra}{FV@Numbers@right C}} + +\xpatchcmd{\FV@Numbers@both} + {\hbox to\z@{\hss\theFancyVerbLine\kern\FV@NumberSep}} + {\LWR@FV@linethensep} + {} + {\LWR@patcherror{fvextra}{FV@Numbers@both A}} + +\xpatchcmd{\FV@Numbers@both} + {\hbox to\z@{\hss\theFancyVerbLine\kern\FV@NumberSep}} + {\LWR@FV@linethensep} + {} + {\LWR@patcherror{fvextra}{FV@Numbers@both B}} + +\xpatchcmd{\FV@Numbers@both} + {\hbox to\z@{\hss\theFancyVerbLine\kern\FV@NumberSep}} + {\LWR@FV@linethensep} + {} + {\LWR@patcherror{fvextra}{FV@Numbers@both C}} + +\xpatchcmd{\FV@Numbers@both} + {\hbox to\z@{\kern\FV@NumberSep\theFancyVerbLine\hss}} + {\LWR@FV@septhenline} + {} + {\LWR@patcherror{fvextra}{FV@Numbers@both D}} + +\xpatchcmd{\FV@Numbers@both} + {\hbox to\z@{\kern\FV@NumberSep\theFancyVerbLine\hss}} + {\LWR@FV@septhenline} + {} + {\LWR@patcherror{fvextra}{FV@Numbers@both E}} + +\xpatchcmd{\FV@Numbers@both} + {\hbox to\z@{\hss\theFancyVerbLine\kern\FV@NumberSep}} + {\LWR@FV@linethensep} + {} + {\LWR@patcherror{fvextra}{FV@Numbers@both F}} +% \end{macrocode} +% +% \iffalse +%</fvextra> +% \fi +% +% +% % % \iffalse %<*fwlw> @@ -56505,9 +56795,18 @@ solid {\FancyVerbRuleColor{\LWR@origpound\LWR@tempcolor}} ; % space \Ginclude@graphics{\detokenize\expandafter{\LWR@tempone}}% \endgroup% \filename@parse{\LWR@parsedfilename}% +% \end{macrocode} +% +% Remove doubled |//| in the directory path, +% from the 2020/10/01 \LaTeX\ kernel change. +% \changes{v0.892}{2020/10/01}{\pkg{graphics}: Fix path from kernel change.} +% \begin{macrocode} + \StrSubstitute{\LWR@parsedfilename}{//}{/}[\LWR@parsedfilename]% +% \end{macrocode} +% \begin{macrocode} \LWR@traceinfo{LWR@parsedfilename is \LWR@parsedfilename}% -% \LWR@sanitize{\LWR@parsedfilename}% % \end{macrocode} +% ^^A \LWR@sanitize{\LWR@parsedfilename}% % % If formatting for a word processor, find and set the actual image size, % without rotation, using \PDF\ instead of \SVG\ to find the original bounding box: @@ -60075,13 +60374,14 @@ do not attempt to patch lwarp's version of `hyperref'.)\MessageBreak} \CustomizeMathJax{\let\tensorsym\mathsfbfit} \CustomizeMathJax{\let\mathboldsans\mathsfbfit} \CustomizeMathJax{\let\mathbold\mathbfit} - -\CustomizeMathJax{\let\lBrack\lbrack}% not double -\CustomizeMathJax{\let\dlb\lBrack}% not double -\CustomizeMathJax{\let\rBrack\rbrack}% not double -\CustomizeMathJax{\let\drb\rBrack}% not double - -\CustomizeMathJax{\let\Vvert\Vert} +% \end{macrocode} +% +% \filenm{lwarp_mathjax.txt} adds \cs{left} \Slash \cs{right} support for +% delimiters. +% \changes{v0.892}{2020/09/26}{\pkg{libertinust1math}: Added \cs{left} \Slash \cs{right} support in \filenm{lwarp_mathjax.txt}.} +% \begin{macrocode} +\CustomizeMathJax{\let\dlb\lBrack} +\CustomizeMathJax{\let\drb\rBrack} \CustomizeMathJax{\let\sqrtsign\sqrt} @@ -60378,6 +60678,7 @@ do not attempt to patch lwarp's version of `hyperref'.)\MessageBreak} % \pkg{lineno} is partly emulated, but mostly ignored. % % \changes{v0.49}{2018/02/19}{\pkg{lineno}: Added.} +% \changes{v0.892}{2020/10/02}{\pkg{lineno}: Fix for \env{internallinenumbers*}.} % % \codehtml % @@ -60443,7 +60744,7 @@ do not attempt to patch lwarp's version of `hyperref'.)\MessageBreak} \newcommand\internallinenumbers{} \let\endinternallinenumbers\endlinenumbers -\@namedef{internallinenumbers*}{\internallinenumbers*} +\@namedef{internallinenumbers*}{\internallinenumbers} \expandafter\let\csname endinternallinenumbers*\endcsname\endlinenumbers \newcommand*{\linenoplaceholder}[1]{% redefine per language @@ -64374,6 +64675,85 @@ background: % % % \iffalse +%<*minted> +% \fi +% +% \part{lwarp-minted.sty} +% +% \section{minted} +% +% \credits{Geoffrey M. Poore} +% +% \DescribePackage{minted} +% \pkg{minted} is patched for use by \pkg{lwarp}. +% +% +% \optn{mathescape} and \optn{highlightlines} don't work. +% \trouble[limitations]{minted=\pkg{minted}} +% Line numbers on the right will not be aligned. +% Due to \prog{pdftotext}, extra spaces may appear in broken lines +% if other formatting is included. +% +% \changes{v0.892}{2020/10/07}{\pkg{minted}: Added.} +% +% \codehtml +% +% \begin{macrocode} +\LWR@ProvidesPackagePass{minted}[2017/07/19] +% \end{macrocode} +% +% \begin{macrocode} +\xpatchcmd{\minted} + {\setkeys{minted@opt@cmd}{#1}} + {% + \setkeys{minted@opt@cmd}{% + #1,% + mathescape=false,breaklines,texcomments=false,highlightlines={}% + }% + } + {} + {\LWR@patcherror{minted}{minted}} + +\xpatchcmd{\mintinline} + {\setkeys{minted@opt@cmd}{#1}} + {\setkeys{minted@opt@cmd}{% + #1,% + mathescape=false,breaklines,texcomments=false,highlightlines={}% + }% + } + {} + {\LWR@patcherror{minted}{mintinline}} + +\xpatchcmd{\mint} + {\setkeys{minted@opt@cmd}{#1}} + {% + \setkeys{minted@opt@cmd}{% + #1,% + mathescape=false,breaklines,texcomments=false,highlightlines={}% + }% + } + {} + {\LWR@patcherror{minted}{mint}} + +\xpatchcmd{\inputminted} + {\setkeys{minted@opt@cmd}{#1}} + {\setkeys{minted@opt@cmd}{% + #1,% + mathescape=false,breaklines,texcomments=false,highlightlines={}% + }% + } + {} + {\LWR@patcherror{minted}{inputminted}} +% \end{macrocode} +% +% \iffalse +%</minted> +% \fi +% +% +% +% +% \iffalse %<*mismath> % \fi % @@ -76821,13 +77201,15 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf', % \codehtml % \begin{macrocode} -\LWR@ProvidesPackageDrop{textpos}[2019/04/15] +\LWR@ProvidesPackageDrop{textpos}[2020/09/26] % \end{macrocode} % \begin{macrocode} \NewDocumentEnvironment{textblock}{m o r()}{}{} \NewDocumentEnvironment{textblock*}{m o r()}{}{} \newcommand*{\TPGrid}[3][]{} +\def\TPShowGrid{\@ifstar{\@TPShowGrid}{\@TPShowGrid}} +\def\@TPShowGrid#1#2{} \NewDocumentCommand{\TPMargin}{s o}{} \newcommand*{\textblockcolour}[1]{} \newcommand*{\textblockrulecolour}[1]{} @@ -80245,8 +80627,8 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf', % If the document source includes embedded Unicode characters, % \trouble[\brand{MathJax}]{unicode-math=\pkg{unicode-math}} % \trouble{mathjax=\brand{MathJax}>unicode-math=\pkg{unicode-math}} -% these will not be reproduced correctly for \prog{pdftotext}, -% so \brand{MathJax} will not work. +% these may not be reproduced correctly for \prog{pdftotext}, +% and thus not display correctly in \brand{MathJax}. % % Symbol font commands are emulated, but not all combinations are % supported by MathJax, especially with the dedicated Greek macros. @@ -80265,8 +80647,8 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf', % \cs{symbit} or similar. % % Macros from the categories \cs{mathopen}, \cs{mathclose}, and \cs{mathfence} -% \watchout[\cs{left}, \cs{right}] -% are emulated, although some do not accept \cs{left} and \cs{right}. +% are emulated. Due to current \brand{MathJax} limitations, not all +% stretch to the correct height. % % Also emulated are macros from the categories % \cs{mathpunct}, \cs{mathover}, \cs{mathunder}, \cs{mathaccent}, @@ -80274,8 +80656,8 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf', % % The individual \pkg{unicode-math} macros % of categories \cs{mathbin}, \cs{mathord}, and \cs{mathrel} -% are not supported by \brand{MathJax}, -% as there are more than two thounsand of them, but they may be added as needed. +% are not emulated for \brand{MathJax}, +% as there are more than two thousand of them, but they may be added as needed. % Place the following in the document preamble after loading \pkg{unicode-math}, % including a definition for each macro which is used in the document % but undefined in \brand{MathJax}: @@ -80432,94 +80814,15 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf', \CustomizeMathJax{\let\rparen)} \CustomizeMathJax{\newcommand{\cuberoot}[1]{\,{}^3\!\!\sqrt{#1}}\,} \CustomizeMathJax{\newcommand{\fourthroot}[1]{\,{}^4\!\!\sqrt{#1}}\,} - -\CustomizeMathJax{\let\lbrbrak[} -\CustomizeMathJax{\let\rbrbrak]} - -\CustomizeMathJax{\newcommand{\lbag}{\mathopen{\unicode{x027C5}}}}% not \left -\CustomizeMathJax{\newcommand{\rbag}{\mathclose{\unicode{x027C6}}}}% not \right - +% \end{macrocode} +% +% Many \cs{mathopen} \Slash \cs{mathclose} delimiters are +% defined in \filenm{lwarp_mathjax.txt}, where +% \cs{left} \Slash \cs{right} support is added. +% \changes{v0.892}{2020/09/26}{\pkg{unicode-math}: Adeed \brand{MathJax} support for \cs{left} \Slash \cs{right}.} +% \begin{macrocode} \CustomizeMathJax{\newcommand{\longdivision}[1]{\mathord{\unicode{x027CC}#1}}} -\CustomizeMathJax{\let\lBrack[} -\CustomizeMathJax{\let\rBrack]} -\CustomizeMathJax{\let\lAngle\langle} -\CustomizeMathJax{\let\rAngle\rangle} - -% not in MathJax font: -% \CustomizeMathJax{\newcommand{\Lbrbrak}{\mathopen{\unicode{x027EC}}}}% not \left -% \CustomizeMathJax{\newcommand{\Rbrbrak}{\mathopen{\unicode{x027ED}}}}% not \left -\CustomizeMathJax{\let\Lbrbrak[} -\CustomizeMathJax{\let\Rbrbrak]} - -\CustomizeMathJax{\let\lBrace\{} -\CustomizeMathJax{\let\rBrace\}} - -\CustomizeMathJax{\let\lParen(} -\CustomizeMathJax{\let\rParen)} - -% \CustomizeMathJax{\let\llparenthesis(} -% \CustomizeMathJax{\let\rrparenthesis)} -\CustomizeMathJax{\newcommand{\llparenthesis}{\mathopen{\unicode{x02987}}}}% not \left -\CustomizeMathJax{\newcommand{\rrparenthesis}{\mathopen{\unicode{x02988}}}}% not \right -% -% \CustomizeMathJax{\let\llangle\langle} -% \CustomizeMathJax{\let\rrangle\rangle} -\CustomizeMathJax{\newcommand{\llangle}{\mathopen{\unicode{x02989}}}}% not \left -\CustomizeMathJax{\newcommand{\rrangle}{\mathopen{\unicode{x0298A}}}}% not \right - -% \CustomizeMathJax{\let\lbrackubar[} -% \CustomizeMathJax{\let\rbrackubar]} -\CustomizeMathJax{\newcommand{\lbrackubar}{\mathopen{\unicode{x0298B}}}}% not \left -\CustomizeMathJax{\newcommand{\rbrackubar}{\mathopen{\unicode{x0298C}}}}% not \right - -% \CustomizeMathJax{\let\lbrackultick[} -% \CustomizeMathJax{\let\rbracklrtick]} -\CustomizeMathJax{\newcommand{\lbrackultick}{\mathopen{\unicode{x0298D}}}}% not \left -\CustomizeMathJax{\newcommand{\rbracklrtick}{\mathopen{\unicode{x0298E}}}}% not \right - -% \CustomizeMathJax{\let\lbracklltick[} -% \CustomizeMathJax{\let\rbrackurtick]} -\CustomizeMathJax{\newcommand{\lbracklltick}{\mathopen{\unicode{x0298F}}}}% not \left -\CustomizeMathJax{\newcommand{\rbrackurtick}{\mathopen{\unicode{x02990}}}}% not \right - -% \CustomizeMathJax{\let\langledot\langle} -% \CustomizeMathJax{\let\rangledot\rangle} -\CustomizeMathJax{\newcommand{\langledot}{\mathopen{\unicode{x02991}}}}% not \left -\CustomizeMathJax{\newcommand{\rangledot}{\mathopen{\unicode{x02992}}}}% not \right - -% \CustomizeMathJax{\let\lparenless(} -% \CustomizeMathJax{\let\rparengtr)} -\CustomizeMathJax{\newcommand{\lparenless}{\mathopen{\unicode{x02993}}}}% not \left -\CustomizeMathJax{\newcommand{\rparengtr}{\mathopen{\unicode{x02994}}}}% not \right - -% \CustomizeMathJax{\let\Lparengtr(} -% \CustomizeMathJax{\let\Rparenless)} -\CustomizeMathJax{\newcommand{\Lparengtr}{\mathopen{\unicode{x02995}}}}% not \left -\CustomizeMathJax{\newcommand{\Rparenless}{\mathopen{\unicode{x02996}}}}% not \right - -% \CustomizeMathJax{\let\lblkbrbrak[} -% \CustomizeMathJax{\let\rblkbrbrak]} -\CustomizeMathJax{\newcommand{\lblkbrbrak}{\mathopen{\unicode{x02997}}}}% not \left -\CustomizeMathJax{\newcommand{\rblkbrbrak}{\mathopen{\unicode{x02998}}}}% not \right - -% \CustomizeMathJax{\let\lvzigzag|} -% \CustomizeMathJax{\let\rvzigzag|} -\CustomizeMathJax{\newcommand{\lvzigzag}{\mathopen{\unicode{x029D8}}}}% not \left -\CustomizeMathJax{\newcommand{\rvzigzag}{\mathopen{\unicode{x029D9}}}}% not \right - -% \CustomizeMathJax{\let\Lvzigzag|} -% \CustomizeMathJax{\let\Rvzigzag|} -\CustomizeMathJax{\newcommand{\Lvzigzag}{\mathopen{\unicode{x029DA}}}}% not \left -\CustomizeMathJax{\newcommand{\Rvzigzag}{\mathopen{\unicode{x029DB}}}}% not \right - -% \CustomizeMathJax{\let\lcurvyangle\langle} -% \CustomizeMathJax{\let\rcurvyangle\rangle} -\CustomizeMathJax{\newcommand{\lcurvyangle}{\mathopen{\unicode{x029FC}}}}% not \left -\CustomizeMathJax{\newcommand{\rcurvyangle}{\mathopen{\unicode{x029FD}}}}% not \right - -\CustomizeMathJax{\newcommand{\Vvert}{\mathord{\unicode{x02980}}}}% not \left, etc. - \CustomizeMathJax{\newcommand{\mathcomma}{,}} \CustomizeMathJax{\newcommand{\mathcolon}{:}} \CustomizeMathJax{\newcommand{\mathsemicolon}{;}} @@ -82221,8 +82524,9 @@ padding:\LWR@printlength{\fboxsep}% % A background color of |none| creates a colored frame without a background color. % % \changes{v0.57}{2018/06/02}{\pkg{xcolor}: New system for switching print and \HTML\ outputs.} +% \changes{v0.892}{2020/10/05}{\pkg{xcolor}: Fixed second optional arg.} % \begin{macrocode} -\NewDocumentCommand{\LWR@HTML@fcolorbox}{O{named} m O{named} m +m}{% +\NewDocumentCommand{\LWR@HTML@fcolorbox}{O{named} m O{#1} m +m}{% \LWR@traceinfo{HTML fcolorbox #2 #4}% \begingroup% \LWR@FBcancel% @@ -82256,8 +82560,9 @@ padding:\LWR@printlength{\fboxsep}% % % A background color of |none| creates a colored frame without a background color. % +% \changes{v0.892}{2020/10/05}{\pkg{xcolor}: Fixed second optional arg.} % \begin{macrocode} -\NewDocumentCommand{\LWR@HTML@fcolorboxBlock}{O{named} m O{named} m +m}{% +\NewDocumentCommand{\LWR@HTML@fcolorboxBlock}{O{named} m O{#1} m +m}{% \LWR@traceinfo{HTML fcolorboxBlock #2 #4}% \begingroup% \LWR@FBcancel% @@ -82334,8 +82639,9 @@ width:\LWR@printlength{\LWR@tempwidth}% % \oarg{1:framemodel} \marg{2:framecolor} \oarg{3:boxmodel} \marg{4:boxcolor} % \oarg{5:align} \oarg{6:height} \oarg{7:inner-align} \marg{8:width} % +% \changes{v0.892}{2020/10/05}{\pkg{xcolor}: Fixed second optional arg.} % \begin{macrocode} -\NewDocumentEnvironment{LWR@HTML@fcolorminipage}{O{named} m O{named} m O{c} o o m} +\NewDocumentEnvironment{LWR@HTML@fcolorminipage}{O{named} m O{#1} m O{c} o o m} {% \LWR@FBcancel% \setlength{\LWR@tempwidth}{#8}% @@ -86304,11 +86610,15 @@ height:\LWR@printlength{\LWR@tempheight}% \CustomizeMathJax{\newcommand{\imathscr}{\mathord{\mathscr{i}}}} \CustomizeMathJax{\newcommand{\jmathscr}{\mathord{\mathscr{j}}}} +% \end{macrocode} +% +% \filenm{lwarp_mathjax.txt} adds \cs{left} \Slash \cs{right} support for +% delimiters. +% \changes{v0.892}{2020/09/26}{\pkg{lwarp-common-mathjax-newpxtxmath}: Added \cs{left} \Slash \cs{right} support in \filenm{lwarp_mathjax.txt}.} +% \begin{macrocode} +\CustomizeMathJax{\let\llbracket\lBrack} +\CustomizeMathJax{\let\rrbracket\rBrack} -\CustomizeMathJax{\let\llbracket[}% single only -\CustomizeMathJax{\let\rrbracket]}% single only -\CustomizeMathJax{\let\lBrack=\llbracket}% single only -\CustomizeMathJax{\let\rBrack=\rrbracket}% single only \CustomizeMathJax{\let\smlbrace\{} \CustomizeMathJax{\let\smrbrace\}} \CustomizeMathJax{\newcommand{\Perp}{\mathrel{\unicode{x02AEB}}}} @@ -86529,8 +86839,12 @@ height:\LWR@printlength{\LWR@tempheight}% \CustomizeMathJax{\newcommand{\primeS}{\prime}} \CustomizeMathJax{\newcommand{\invamp}{\mathbin{\unicode{x0214B}}}} -\CustomizeMathJax{\newcommand{\lbag}{\mathopen{\unicode{x027C5}}}} -\CustomizeMathJax{\newcommand{\rbag}{\mathclose{\unicode{x027C6}}}} +% \end{macrocode} +% +% \filenm{lwarp_mathjax.txt} adds \cs{left} \Slash \cs{right} support for +% delimiters. +% \changes{v0.892}{2020/09/26}{\pkg{lwarp-common-mathjax-newpxtxmath}: Added \cs{left} \Slash \cs{right} support in \filenm{lwarp_mathjax.txt}.} +% \begin{macrocode} \CustomizeMathJax{\newcommand{\Lbag}{\mathopen{\large\unicode{x027C5}}}} \CustomizeMathJax{\newcommand{\Rbag}{\mathclose{\large\unicode{x027C6}}}} \CustomizeMathJax{\newcommand{\circledless}{\mathrel{\unicode{x029C0}}}} @@ -86736,7 +87050,9 @@ height:\LWR@printlength{\LWR@tempheight}% \CustomizeMathJax{\let\sqcupplus\bigsqcupplus}% from kpfonts-otf \CustomizeMathJax{\newcommand{\parallelslant}{\mathrel{\unicode{x02AFD}}}} -\CustomizeMathJax{\newcommand{\parallelbackslant}{\mathrel{\unicode{x0005C}\!\!\unicode{x0005C}}}} +\CustomizeMathJax{\newcommand{\parallelbackslant}{% + \mathrel{\unicode{x0005C}\!\!\unicode{x0005C}}% +}} \CustomizeMathJax{\newcommand{\Eqqcolon}{\mathrel{=\!\unicode{x2237}}}} \CustomizeMathJax{\let\eqqColon\Eqqcolon}% for kpfonts-otf @@ -86775,7 +87091,9 @@ height:\LWR@printlength{\LWR@tempheight}% \CustomizeMathJax{\newcommand{\Wr}{\mathbin{\unicode{x02240}\!\unicode{x02240}}}} -\CustomizeMathJax{\newcommand{\dashleftrightarrow}{\mathrel{\unicode{x021E0}\!\unicode{x021E2}}}} +\CustomizeMathJax{\newcommand{\dashleftrightarrow}{% + \mathrel{\unicode{x021E0}\!\unicode{x021E2}}% +}} \CustomizeMathJax{\let\leftrightdasharrow\dashleftrightarrow}% for kpfonts-otf \end{warpMathJax} diff --git a/macros/latex/contrib/lwarp/lwarp.ins b/macros/latex/contrib/lwarp/lwarp.ins index af15c2f162..b4034d92f8 100644 --- a/macros/latex/contrib/lwarp/lwarp.ins +++ b/macros/latex/contrib/lwarp/lwarp.ins @@ -218,6 +218,7 @@ version 2005/12/01 or later. \file{lwarp-fullminipage.sty}{\from{lwarp.dtx}{fullminipage}} \file{lwarp-fullpage.sty}{\from{lwarp.dtx}{fullpage}} \file{lwarp-fullwidth.sty}{\from{lwarp.dtx}{fullwidth}} +\file{lwarp-fvextra.sty}{\from{lwarp.dtx}{fvextra}} \file{lwarp-fwlw.sty}{\from{lwarp.dtx}{fwlw}} \file{lwarp-gensymb.sty}{\from{lwarp.dtx}{gensymb}} \file{lwarp-gentombow.sty}{\from{lwarp.dtx}{gentombow}} @@ -310,6 +311,7 @@ version 2005/12/01 or later. \file{lwarp-midpage.sty}{\from{lwarp.dtx}{midpage}} \file{lwarp-minibox.sty}{\from{lwarp.dtx}{minibox}} \file{lwarp-minitoc.sty}{\from{lwarp.dtx}{minitoc}} +\file{lwarp-minted.sty}{\from{lwarp.dtx}{minted}} \file{lwarp-mismath.sty}{\from{lwarp.dtx}{mismath}} \file{lwarp-mleftright.sty}{\from{lwarp.dtx}{mleftright}} \file{lwarp-morefloats.sty}{\from{lwarp.dtx}{morefloats}} diff --git a/macros/latex/contrib/lwarp/lwarp.pdf b/macros/latex/contrib/lwarp/lwarp.pdf Binary files differindex df8c6908b0..08ea807dac 100644 --- a/macros/latex/contrib/lwarp/lwarp.pdf +++ b/macros/latex/contrib/lwarp/lwarp.pdf diff --git a/macros/latex/contrib/lwarp/lwarpmk.lua b/macros/latex/contrib/lwarp/lwarpmk.lua index 11a09285da..f9b591e313 100755 --- a/macros/latex/contrib/lwarp/lwarpmk.lua +++ b/macros/latex/contrib/lwarp/lwarpmk.lua @@ -2,7 +2,7 @@ -- Copyright 2016-2020 Brian Dunn -printversion = "v0.891" +printversion = "v0.892" requiredconfversion = "2" -- also at *lwarpmk.conf function printhelp () |