texlive[53632] trunk: lwarp (1feb20)
commits+karl at tug.org
commits+karl at tug.org
Sat Feb 1 23:15:59 CET 2020
Revision: 53632
http://tug.org/svn/texlive?view=revision&revision=53632
Author: karl
Date: 2020-02-01 23:15:59 +0100 (Sat, 01 Feb 2020)
Log Message:
-----------
lwarp (1feb20)
Modified Paths:
--------------
trunk/Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua
trunk/Build/source/texk/texlive/linked_scripts/texlive/mktexpk
trunk/Build/source/texk/texlive/linked_scripts/texlive/mktextfm
trunk/Master/texmf-dist/doc/latex/lwarp/README.txt
trunk/Master/texmf-dist/doc/latex/lwarp/lwarp.pdf
trunk/Master/texmf-dist/scripts/lwarp/lwarpmk.lua
trunk/Master/texmf-dist/source/latex/lwarp/lwarp.dtx
trunk/Master/texmf-dist/source/latex/lwarp/lwarp.ins
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-2in1.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-2up.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-CJK.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-CJKutf8.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-SIunits.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-a4.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-a4wide.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-a5comb.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-abstract.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-academicons.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-accessibility.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-accsupp.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-acro.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-acronym.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-addlines.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-adjmulticol.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-afterpage.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-algorithm2e.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-algorithmicx.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-alltt.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-amsmath.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-amsthm.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-anonchap.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-anysize.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-appendix.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-ar.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-arabicfront.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-array.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-arydshln.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-asymptote.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-atbegshi.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-attachfile.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-attachfile2.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-authblk.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-autonum.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-axessibility.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-axodraw2.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-backnaur.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-backref.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-balance.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-bbding.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-biblatex.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-bibunits.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-bigdelim.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-bigfoot.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-bigstrut.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-bitpattern.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-blowup.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-booklet.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-bookmark.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-booktabs.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-bophook.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-bounddvi.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-boxedminipage2e.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-breakurl.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-breqn.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-bsheaders.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-bxpapersize.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-bytefield.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-cancel.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-canoniclayout.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-caption.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-cases.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-changebar.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-changelayout.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-changepage.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-changes.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-chappg.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-chapterbib.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-chemfig.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-chemformula.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-chemgreek.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-chemmacros.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-chemnum.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-chkfloat.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-chngpage.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-cite.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-clrdblpg.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-cmdtrack.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-color.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-colortbl.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-common-multimedia.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-continue.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-copyrightbox.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-crop.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-ctable.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-cuted.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-cutwin.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-dblfloatfix.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-dblfnote.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-dcolumn.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-diagbox.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-dingbat.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-dprogress.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-draftcopy.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-draftfigure.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-draftwatermark.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-easy-todo.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-ebook.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-ed.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-ellipsis.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-embrac.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-emptypage.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-endfloat.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-endheads.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-endnotes.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-enumerate.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-enumitem.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-epigraph.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-epsfig.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-epstopdf-base.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-epstopdf.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-eqlist.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-eqparbox.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-errata.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-eso-pic.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-eurosym.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-everypage.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-everyshi.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-extramarks.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fancybox.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyhdr.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyref.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fancytabs.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyvrb.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-figcaps.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-figsize.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fitbox.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fix2col.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fixme.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fixmetodonotes.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-flafter.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-flippdf.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-float.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-floatflt.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-floatpag.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-floatrow.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fltrace.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-flushend.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fnbreak.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fncychap.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fnlineno.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fnpos.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fontawesome.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fontawesome5.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fontaxes.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fontenc.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-footmisc.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-footnote.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-footnotebackref.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-footnotehyper.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-footnoterange.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-footnpag.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-foreign.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-forest.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-framed.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-ftcap.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-ftnright.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fullminipage.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fullpage.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fullwidth.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fwlw.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-gentombow.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-geometry.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-gloss.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-glossaries.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-gmeometric.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-graphicx.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-grffile.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-grid-system.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-grid.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-gridset.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-hang.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-hanging.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-hypbmsec.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-hypcap.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-hypdestopt.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-hypernat.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperref.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperxmp.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-hyphenat.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-idxlayout.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-ifoddpage.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-imakeidx.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-index.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-inputtrc.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-intopdf.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-karnaugh-map.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-keyfloat.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-layaureo.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-layout.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-layouts.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-leading.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-letterspace.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-lettrine.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-lineno.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-lips.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-listings.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-listliketab.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-lltjext.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-longtable.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-lscape.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-ltablex.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-ltcaption.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-ltxgrid.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-ltxtable.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-lua-check-hyphen.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-lua-visual-debug.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-luacolor.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-luatodonotes.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-lyluatex.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-magaz.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-makeidx.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-manyfoot.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-marginal.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-marginfit.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-marginfix.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-marginnote.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-marvosym.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-mathtools.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-mcaption.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-mdframed.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-media9.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-memhfixc.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-metalogo.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-metalogox.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-mhchem.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-microtype.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-midfloat.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-midpage.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-minibox.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-minitoc.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-morefloats.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-moreverb.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-movie15.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-mparhack.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-multicap.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-multicol.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-multicolrule.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-multimedia.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-multirow.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-multitoc.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-musicography.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-nameauth.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-nameref.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-natbib.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-nccfancyhdr.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-needspace.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-nextpage.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-nfssext-cfr.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-nicefrac.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-niceframe.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-nomencl.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-nonfloat.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-nonumonpart.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-nopageno.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-notes.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-notespages.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-nowidow.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-ntheorem.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-octave.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-overpic.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pagegrid.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pagenote.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pagesel.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-paralist.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-parnotes.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-parskip.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-komascript.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-memoir.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pbox.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfcomment.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfcrypt.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pdflscape.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfmarginpar.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfpages.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfprivacy.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfrender.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfsync.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pdftricks.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfx.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-perpage.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pfnote.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-phfqit.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pifont.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-placeins.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-plarydshln.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-plext.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-plextarydshln.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-plextcolorbl.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-prelim2e.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-prettyref.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-preview.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-psfrag.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-psfragx.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pst-eps.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pstool.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pstricks.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pxatbegshi.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pxeveryshi.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pxftnright.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pxjahyper.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-quotchap.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-quoting.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-ragged2e.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-realscripts.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-refcheck.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-register.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-relsize.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-repeatindex.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-resizegather.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-rmpage.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-romanbar.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-romanbarpagenumber.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-rotating.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-rotfloat.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-rviewport.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-savetrees.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-scalefnt.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-schemata.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-scrextend.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-scrhack.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-scrlayer-notecolumn.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-scrlayer-scrpage.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-scrlayer.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-scrpage2.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-section.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-sectionbreak.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-sectsty.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-semantic-markup.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-setspace.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-shadow.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-shapepar.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-showidx.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-showkeys.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-showtags.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-sidecap.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-sidenotes.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-siunitx.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-slantsc.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-soul.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-soulpos.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-soulutf8.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-splitidx.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-srcltx.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-srctex.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-stabular.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-stackengine.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-stfloats.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-struktex.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-subcaption.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-subfig.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-subfigure.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-supertabular.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-syntonly.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-tabfigures.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-tablefootnote.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-tabls.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-tabularx.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-tabulary.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-tascmac.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-textarea.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-textcomp.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-textfit.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-textpos.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-theorem.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-thinsp.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-threadcol.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-threeparttable.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-threeparttablex.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-thumb.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-thumbs.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-tikz.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-titleps.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-titleref.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-titlesec.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-titletoc.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-titling.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-tocbasic.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-tocbibind.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-tocdata.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-tocenter.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-tocloft.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-tocstyle.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-todo.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-todonotes.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-topcapt.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-tram.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-transparent.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-trimclip.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-trivfloat.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-truncate.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-turnthepage.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-twoup.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-typearea.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-typicons.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-ulem.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-umoline.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-underscore.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-units.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-unitsdef.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-upref.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-url.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-uspace.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-verse.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-versonotes.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-vertbars.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-vmargin.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-vowel.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-vpe.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-vwcol.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-wallpaper.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-watermark.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-widows-and-orphans.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-wrapfig.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xbmks.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xechangebar.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xellipsis.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xetexko-vertical.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xfakebold.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xfrac.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xltabular.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xltxtra.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xmpincl.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xpiano.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xpinyin.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xr-hyper.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xr.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xtab.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xunicode.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xurl.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xy.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-zhlineskip.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-zwpagelayout.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp.sty
Added Paths:
-----------
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-awesomebox.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-bm.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-braket.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-parallel.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-parcolumns.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfcol.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfcolfoot.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfcolmk.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfcolparallel.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfcolparcolumns.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-physics.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-slashed.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-steinmetz.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-svg.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-unicode-math.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-widetable.sty
trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-witharrows.sty
Modified: trunk/Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua
===================================================================
--- trunk/Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua 2020-02-01 22:15:59 UTC (rev 53632)
@@ -1,8 +1,8 @@
#!/usr/bin/env texlua
--- Copyright 2016-2019 Brian Dunn
+-- Copyright 2016-2020 Brian Dunn
-printversion = "v0.78"
+printversion = "v0.79"
requiredconfversion = "2" -- also at *lwarpmk.conf
function printhelp ()
@@ -699,7 +699,7 @@
-- print intro:
-print ("lwarpmk: " .. printversion .. " Automated make for the LaTeX lwarp package.")
+print ("lwarpmk: " .. printversion .. " Automated make for the LaTeX Lwarp package.")
-- lwarpmk print:
Modified: trunk/Build/source/texk/texlive/linked_scripts/texlive/mktexpk
===================================================================
--- trunk/Build/source/texk/texlive/linked_scripts/texlive/mktexpk 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Build/source/texk/texlive/linked_scripts/texlive/mktexpk 2020-02-01 22:15:59 UTC (rev 53632)
@@ -7,7 +7,7 @@
# Originally written by Thomas Esser, Karl Berry, and Olaf Weber.
# Public domain.
-version='$Id: mktexpk 53254 2019-12-29 19:18:55Z karl $'
+version='$Id: mktexpk 53602 2020-01-30 22:18:33Z karl $'
progname=`echo $0 | sed 's%.*/%%'`
# preferentially use subprograms from our own directory.
@@ -20,7 +20,7 @@
--dpi DPI use resolution DPI.
--bdpi BDPI use base resolution BDPI.
---mag MAG use magnificiation MAG.
+--mag MAG use magnification MAG.
--mfmode MODE use MODE as the METAFONT mode.
--destdir DESTDIR write fonts in DESTDIR.
@@ -35,15 +35,15 @@
If you expected the font to be available as an outline, and thus this
script does not work and should not have been called, most likely the
-font's .tfm name is missing from the relevant map file (e.g.,
-psfonts.map for dvips, pdftex.map for pdftex). These map files are
-typically maintained using updmap; q.v.
+font's .tfm name is missing from the relevant map file (i.e.,
+psfonts.map for dvips-syntax programs, pdftex.map for pdftex-syntax
+programs). These map files are typically maintained using updmap; q.v.
For step-by-step instructions on making new fonts known to TeX, see
-http://tug.org/fonts/fontinstall.html.
+https://tug.org/fonts/fontinstall.html.
Report bugs to: tex-k at tug.org
-TeX Live home page: <http://tug.org/texlive/>
+TeX Live home page: <https://tug.org/texlive/>
"
# Handle non-positional options, except for --version/--help
@@ -144,7 +144,7 @@
8000) MODE=dpdfezzz;;
*) echo "$progname: Can't guess mode for $BDPI dpi devices." >&2
echo "$progname: Use a config file or option to specify the mode; see:" >&2
- echo "$progname: http://tug.org/texinfohtml/kpathsea.html#Unable-to-generate-fonts" >&2
+ echo "$progname: https://tug.org/texinfohtml/kpathsea.html#Unable-to-generate-fonts" >&2
exit 1
esac
fi
Modified: trunk/Build/source/texk/texlive/linked_scripts/texlive/mktextfm
===================================================================
--- trunk/Build/source/texk/texlive/linked_scripts/texlive/mktextfm 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Build/source/texk/texlive/linked_scripts/texlive/mktextfm 2020-02-01 22:15:59 UTC (rev 53632)
@@ -7,7 +7,7 @@
# Primarily written by Thomas Esser, Karl Berry, and Olaf Weber.
# Public domain.
-version='$Id: mktextfm 53254 2019-12-29 19:18:55Z karl $'
+version='$Id: mktextfm 53602 2020-01-30 22:18:33Z karl $'
progname=`echo $0 | sed 's%.*/%%'`
# preferentially use subprograms from our own directory.
@@ -21,15 +21,22 @@
to install into, either the absolute directory name to use (if it starts
with a /) or relative to the default DESTDIR (if not).
+See the mktexpk and updmap help messages for more general information on
+making fonts available.
+
+If the environment variable MF_MODE_EXTRA_INFO is non-empty, the
+codingscheme and other so-called Xerox-world information will be
+included in the tfm file.
+
Report bugs to: tex-k at tug.org
-TeX Live home page: <http://tug.org/texlive/>
+TeX Live home page: <https://tug.org/texlive/>
"
# Handle non-positional options, except for --version/--help
while test $# -gt 0; do
case "$1" in
- --destdir) shift; DEST="$1"; shift ;;
- --destdir=*) DEST=`echo "$1" | sed 's/--destdir=//'`; shift ;;
+ --destdir|-destdir) shift; DEST="$1"; shift ;;
+ --destdir=*|-destdir=*) DEST=`echo "$1" | sed 's/--*destdir=//'`; shift ;;
--version|-version) break ;;
--help|-help) break ;;
*) break ;;
@@ -99,7 +106,20 @@
MF=mf
fi
- cmd="$MF \mode:=$MODE; mag:=$MAG; nonstopmode; input $NAME"
+ # The idea here is to provide a programmatic way to get the
+ # codingscheme and other so-called Xerox-world information into the
+ # tfm: if the envvar MF_MODE_EXTRA_INFO is set, then modes.mf (as of
+ # the 3.9 release in January 2020) will arrange for that. We do not
+ # do this by default because Knuth objected.
+ #
+ if test -n "$MF_MODE_EXTRA_INFO"; then
+ mf_extra_info="if known mode_include_extra_info_available: "
+ mf_extra_info="$mf_extra_info mode_include_extra_info fi"
+ else
+ mf_extra_info=""
+ fi
+
+ cmd="$MF \mode:=$MODE; mag:=$MAG; $mf_extra_info; nonstopmode; input $NAME"
fi
echo "$progname: Running $cmd"
Modified: trunk/Master/texmf-dist/doc/latex/lwarp/README.txt
===================================================================
--- trunk/Master/texmf-dist/doc/latex/lwarp/README.txt 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/doc/latex/lwarp/README.txt 2020-02-01 22:15:59 UTC (rev 53632)
@@ -1,5 +1,5 @@
-LaTeX lwarp package v0.78 README.txt
+LaTeX lwarp package v0.79 README.txt
Files included are:
@@ -41,7 +41,7 @@
version 2005/12/01 or later.
-Copyright 2016-2019 Brian Dunn
+Copyright 2016-2020 Brian Dunn
Homepage: http://BDTechConcepts.com
Email: bd at BDTechConcepts.com
Modified: trunk/Master/texmf-dist/doc/latex/lwarp/lwarp.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/scripts/lwarp/lwarpmk.lua
===================================================================
--- trunk/Master/texmf-dist/scripts/lwarp/lwarpmk.lua 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/scripts/lwarp/lwarpmk.lua 2020-02-01 22:15:59 UTC (rev 53632)
@@ -1,8 +1,8 @@
#!/usr/bin/env texlua
--- Copyright 2016-2019 Brian Dunn
+-- Copyright 2016-2020 Brian Dunn
-printversion = "v0.78"
+printversion = "v0.79"
requiredconfversion = "2" -- also at *lwarpmk.conf
function printhelp ()
@@ -699,7 +699,7 @@
-- print intro:
-print ("lwarpmk: " .. printversion .. " Automated make for the LaTeX lwarp package.")
+print ("lwarpmk: " .. printversion .. " Automated make for the LaTeX Lwarp package.")
-- lwarpmk print:
Modified: trunk/Master/texmf-dist/source/latex/lwarp/lwarp.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/lwarp/lwarp.dtx 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/source/latex/lwarp/lwarp.dtx 2020-02-01 22:15:59 UTC (rev 53632)
@@ -1,7 +1,7 @@
%
% \iffalse meta-comment
%
-% Copyright 2016-2019 Brian Dunn
+% 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
@@ -16,7 +16,7 @@
% \iffalse
%<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
%<package>\ProvidesPackage{lwarp}
-%<package> [2019/11/07 v0.78 Allows LaTeX to directly produce HTML5 output.]
+%<package> [2020/02/01 v0.79 Allows LaTeX to directly produce HTML5 output.]
%
%<*driver>
\documentclass{ltxdoc}
@@ -233,7 +233,7 @@
\hypersetup{%
pdfinfo={%
-Title={LaTeX lwarp package},%
+Title={LaTeX Lwarp package},%
Author={Brian Dunn},%
Subject={LaTeX to HTML conversion},%
Keywords={LaTeX, HTML, conversion}%
@@ -303,6 +303,7 @@
\newcommand{\epkg}[1]{\textcolor[Hsb]{300,1,.5}{\pkg{#1}}}% package emulated for HTML
\newcommand{\ipkg}[1]{\textcolor[Hsb]{0,0,.5}{\pkg{#1}}}% package ignored
\newcommand{\wpkg}[1]{\textcolor[Hsb]{0,1,.5}{\pkg{#1}}}% package warning special case
+\newcommand{\sjax}{\textsuperscript{\textcolor{orange!70!black}{MJ}}}
% green/cyan/blue/magenta
% \newcommand{\spkg}[1]{\textcolor[Hsb]{120,1,.4}{\pkg{#1}}}% package supported as-is
@@ -1174,6 +1175,7 @@
before and after each image.
\subsubsection{\brand{MathJax} option}
+\label{sec:limitsmathjax}
The popular \brand{MathJax} alternative (\url{mathjax.org}) may be used to display math.
\margintag{\brand{MathJax} math option}
@@ -1202,41 +1204,63 @@
\margintag{\brand{MathJax} limitations}
\DescribeProgram{MathJax}
\begin{itemize}
-\item \brand{MathJax} itself does not support subequations.
- \margintag{subequations}
-\trouble{MathJax=\brand{MathJax}>subequations}%
-\trouble{math>subequations}%
+\item \brand{MathJax} does not support \cs{multicolumn} or \pkg{multirow}.
+ \trouble[\cs{multicolumn}, \pkg{multirow}]%
+ {multicolumn=\cs{multicolumn}>MathJax=\brand{MathJax}}
+ \trouble{multirow=\pkg{multirow}>MathJax=\brand{MathJax}}
+ \trouble{array=\env{array}>MathJax=\brand{MathJax}}
+ \trouble{MathJax=\brand{MathJax}>multicolumn=\cs{multicolumn}}
+ \trouble{MathJax=\brand{MathJax}>multirow=\cs{multirow}}
+ These may be used in text \env{tabular}s or \SVG\ math,
+ but in \brand{MathJax} math \env{array}s they are emulated.
+ \cs{multicolumn} only fills a single cell, resulting in a short row.
+ \cs{multirow} simply prints its text on the first line.
+
+\item \brand{MathJax} does not support subequations.
+ \trouble[subequations]{MathJax=\brand{MathJax}>subequations}%
+ \trouble{math>subequations}%
This may be improved by parsing the \LaTeX{}
math expression to manually insert tags, but this has not yet been done.
+
\item Footnotes inside equations are not yet supported while using \brand{MathJax}.
- \margintag{footnotes in math}
+ \watchout[footnotes in math]
+ \pkg{lwarp} provides a basic emulation for \brand{MathJax}.
+
+\item Inside a \brand{MathJax} expression,
+ \trouble[references in math]{MathJax=\brand{MathJax}>references}
+ \trouble{cross reference>MathJax=\brand{MathJax}}
+ \trouble{reference>MathJax=\brand{MathJax}}
+ references to equations work within the same \HTML\ web page, but do not
+ work when referring to an equation in a different \HTML\ web page.
+ Outside of a \brand{MathJax} expression, in the text body, references work
+ as expected.
+
\item Math appearing inside a lateximage,
\margintag{lateximage}
and therefore also inside a \tikz\ or \env{picture}
- environment, is rendered as SVG math even if \brand{MathJax} is used in the rest of the document.
-\item Usage of \pkg{siunitx} inside a math equation
- \margintag{siunitx}
- is supported via a third-party \brand{MathJax} extension.
- While inside a math expression, do not use \cs{SI} or \cs{si} inside \cs{text},
- where it will be rendered as normal text.
- \trouble[siunitx inside an equation]{siunitx=\pkg{siunitx}>MathJax=\brand{MathJax}}
- \trouble{MathJax=\brand{MathJax}>siunitx=\pkg{siunitx}}
+ environment, is rendered as SVG math even if \brand{MathJax}
+ is used in the rest of the document.
- \href{https://github.com/burnpanck/MathJax-siunitx}
- {\texttt{https://github.com/burnpanck/MathJax-siunitx}}
+\item For \pkg{siunitx},
+ \margintag{\pkg{siunitx}}
+ see \nameref{sec:limitssiunitx}, \cref{sec:limitssiunitx}.
- Also see \cref{sec:limitssiunitx}.
+\item For \pkg{physics},
+ \margintag{\pkg{physics}}
+ see \nameref{sec:limitsphysics}, \cref{sec:limitsphysics}.
\item A \env{tabbing} environment is emulated
- using an \HTML\ \element{pre}.\margintag{tabbing}
+ using an \HTML\ \element{pre}.\margintag{tabbing}\
While \brand{MathJax} is enabled inside \env{tabbing}, the browser may not correctly
render the horizontal alignment of the math and text following after on the same line.
-\item Other math-related macros and packages are not supported by \brand{MathJax},
+\item Other math-related macros and packages are not directly supported by \brand{MathJax},
\trouble[other macros and packages]{MathJax=\brand{MathJax}>unsupported packages}
including \cs{ensuremath} and \pkg{bigdelim},
- along with occasionally-used macros such as \cs{relax}.
- \pkg{lwarp} emulates footnotes, \pkg{units}, and \pkg{nicefrac} for MathJax.
+ and occasionally-used macros such as \cs{relax}.
+ While using \brand{MathJax}, \pkg{lwarp} provides emulation
+ for footnotes, \pkg{bm}, \pkg{mathtools},
+ \pkg{nicefrac}, \pkg{siunitx}, and \pkg{units}.
\end{itemize}
}
@@ -1315,14 +1339,27 @@
Examples:
\begin{sourcedisplay}
+\cs{begin}\{warpMathJax\} \\
\cs{CustomizeMathJax}\{ \\
\fqquad\cs{newcommand}\{\cs{expval}\}[1]\{\cs{langle}\#1\cs{rangle}\} \\
\fqquad\cs{newcommand}\{\cs{abs}\}[1]\{\cs{lvert}\#1\cs{rvert}\} \\
\} \\
-\cs{CustomizeMathJax}\{\cs{newcommand}\{\cs{arsinh}\}\{\cs{text}\{arsinh\}\}\} \\
-\cs{CustomizeMathJax}\{\cs{newcommand}\{\cs{arcosh}\}\{\cs{text}\{arcosh\}\}\}
-\cs{CustomizeMathJax}\{\cs{newcommand}\{\cs{NN}\}\{\cs{mathbb}\{N\}\}\}
+\cs{CustomizeMathJax}\{\cs{newcommand}\{\cs{arcsinh}\}\{\cs{text}\{arcsinh\}\}\} \\
+\cs{CustomizeMathJax}\{\cs{newcommand}\{\cs{arccosh}\}\{\cs{text}\{arccosh\}\}\} \\
+\cs{CustomizeMathJax}\{\cs{newcommand}\{\cs{NN}\}\{\cs{mathbb}\{N\}\}\} \\
+\cs{end}\{warpMathJax\}
\end{sourcedisplay}
+
+\pkg{lwarp} already provides \brand{MathJax} customizations for some packages.
+
+When using \pkg{siunitx}, a similar process may be used to add custom units:
+\margintag{\pkg{siunitx}}
+\begin{sourcedisplay}
+\cs{begin}\{warpMathJax\} \\
+\cs{CustomizeMathJax}\{\cs{newcommand}\{\cs{myunit}\}\{\cs{mathrm}\{WXYZ\}\}\} \\
+\cs{CustomizeMathJax}\{\cs{newcommand}\{\cs{umyunit}\}\{\cs{mathrm}\{\cs{micro}\cs{myunit}\}\}\} \\
+\cs{end}\{warpMathJax\}
+\end{sourcedisplay}
}
%\newcommand{\limitscustomizeKaTeX}{%
@@ -1359,6 +1396,41 @@
\end{sourcedisplay}
}
+\newcommand{\limitsmathtools}{%
+ \trouble[equation numbering]{mathtools=\pkg{mathtools}}
+ \optn{showonlyrefs} is disabled, as it conflicts with \pkg{cleveref}, which is
+ used by \pkg{lwarp}. Equation numbers may not match the print version.
+
+ \optn{mathic} is not emulated for \HTML.
+ \watchout[italic correction]
+
+ If using \brand{MathJax}:
+ \trouble[\brand{MathJax}]{MathJax=\brand{MathJax}>mathtools=\pkg{mathtools}}
+ \begin{itemize}
+ \item Starred macros are not available. Starred environments do work.
+ \item \pkg{mathtools} \optn{disallowspaces} does not work for \brand{MathJax}.
+ Protect brackets which are not optional arguments, such as:
+ \begin{sourcedisplay}
+ \cs{begin}\{gathered\}\textred{\{\}} \\
+ {[}p{]}=1 \dots \\
+ \cs{end}\{gathered\}
+ \end{sourcedisplay}
+ \item \optn{showonlyrefs} does not work in \brand{MathJax}, and will result
+ in a difference in equation numbering compared to the print version.
+ \item Due to \brand{MathJax} limitations, the following do not render well:
+ \cs{overbracket}, \cs{underbracket}, \cs{overbrace}, \cs{underbrace},
+ \env{rcases}, \env{drcases}, \cs{Aboxed}, and \linebreak \cs{ArrowBetweenLines}.
+ \item For the new \env{cases}-like environments,
+ \cs{text} must be used to set the normal roman font if desired.
+ \item \env{alignat} in \brand{MathJax} requires math mode, but
+ in \LaTeX it doesn't. It may be required to use \env{warpHTML} and
+ \env{warpprint} to isolate a version for each mode.
+ \item \cs{DeclareParedDelimiter} and related must be in the preamble
+ before \linebreak \texttt{\cs{begin}\{document\}}.
+ The starred versions of each macro are not created.
+ \end{itemize}
+}
+
\newcommand{\limitschemfig}{%
If using \cs{polymerdelim} to add delimiters to a \cs{chemfig},
wrap both inside a single \env{lateximage}:
@@ -1849,10 +1921,7 @@
rounded top corners.
Trim corners are not rounded with \texttt{@} or \texttt{!} columns,
and full-width rules ignore trim.
-
- \item \cs{toprule}, \cs{midrule}, \cs{bottomrule}, and \cs{hline}
- \margintag{full-width rules}
- ignore trim. When given an optional width, each cell is styled
+ When given an optional width, each cell is styled
to create the custom border. Without an optional width, the entire
row is given a class to assign the standard border.
@@ -1970,6 +2039,11 @@
\dots\ \& & \textred{\cs{mcolrowcell}} \hfill \& \hfill \textred{\cs{mcolrowcell}} & \&\ \dots \\
\end{tabular}
\end{sourcedisplay}
+ \item \brand{MathJax} does not support \pkg{multirow}, so it is emulated
+ \trouble[MathJax]{MathJax=\brand{MathJax}>multirow=\cs{multirow}}
+ \trouble{multirow=\pkg{multirow}>MathJax=\brand{MathJax}}
+ to only print its text on the first row.
+ \cs{multirow} works as expected in text \env{tabular}s or \SVG\ math.
\end{itemize}
}
@@ -2108,6 +2182,9 @@
\end{tabular}
\hrule
\end{sourcedisplay}
+
+For \brand{MathJax}, limited emulation is provided which merely prints the
+delimter and optional text in the first row.
}
\newcommand{\limitscolortbl}{%
@@ -2198,11 +2275,11 @@
except for \HTML\ breaks.
Use \cs{newline} or \cs{par} for an \HTML\ break.
-When using \cs{linewidth}, \cs{textwidth}, and \cs{textheight},
+When using \env{minipage}, \cs{parbox}, and \env{fminipage},
\trouble[minipage size]{minipage>size}
-widths and heights in \HTML\ are scaled proportionally to a 6\texttimes{}9 inch text area,
-and inside a \env{multicols} \cs{linewidth} is divided by the specified number
-of columns.
+a virtual $6 \times 9$ inch text area is used for
+\cs{linewidth}, \cs{textwidth}, and \cs{textheight}, both for sizing the minipage,
+and also for its contents.
If a \env{minipage} or \cs{parbox} is assigned a width of exactly \cs{linewidth},
\margintag{if width is \cs{linewidth}}
@@ -2229,6 +2306,10 @@
of the local scope, and \cs{IgnoreMinipageWidths} may be used to tell \pkg{lwarp} to
ignore the specified widths.
+Inside a \env{multicols}, \cs{linewidth} is divided by the specified number
+\trouble[\pkg{multicol}]{multicol=\pkg{multicol}>\cs{linewidth}}
+of columns.
+
Nested \env{minipage}s adopt their parent's text alignment in \HTML,
\trouble[text alignment]{minipage>alignment}
whereas in regular \LaTeX{} \PDF\ output they do not.
@@ -2377,6 +2458,7 @@
To ensure proper float numbering, set caption positions
such as:
\trouble[numbering]{caption=\pkg{caption}>numbering}
+\trouble{float>numbering}
\trouble{subcaption=\pkg{subcaption}>numbering}
\begin{sourcedisplay}
\cs{captionsetup}[figure]\{position=bottom\} \\
@@ -2474,19 +2556,52 @@
Some units will require that the expression be placed inside math mode.
\trouble[math mode required]{siunitx=\pkg{siunitx}}
-\trouble{siunitx>MathJax=\brand{MathJax}}
-\trouble{MathJax=\brand{MathJax}>siunitx=\pkg{siunitx}}
-\textred{NOTE: As of this writing, the \pkg{siunitx} extension
-for \brand{MathJax} is not currently hosted at any public CDN,
-thus \pkg{siunitx} is not usable with \brand{MathJax} unless a local copy
-of this extension is created first.
-See \cs{MathJaxFilename} to select a custom MathJax script.}
-
Tabular \texttt{S} columns are rendered as simple \texttt{c} columns,
\trouble[\env{tabular}]{siunitx=\pkg{siunitx}>tabular S and s columns}
and tabular \texttt{s} columns are not supported.
These may be replaced by \texttt{c} columns with each cell contained in
\cs{num} or \cs{si}.
+
+For math mode with \SVG\ display, the original \pkg{siunitx} code is used while
+generating the \SVG\ image.
+For text mode, \pkg{lwarp} uses an emulation which provides a very effective
+\HTML\ interpretation of \pkg{siunitx}.
+For math expressions while using \brand{MathJax},
+\trouble{siunitx=\pkg{siunitx}>MathJax=\brand{MathJax}}
+\trouble[MathJax]{MathJax=\brand{MathJax}>siunitx=\pkg{siunitx}}
+a limited emulation is used.
+Most functions work reasonably well, but many options cannot be emulated.
+\pkg{siunitx} macros with more than one optional value cannot absorb the second optional
+value, and complicated parsing such as for \cs{ang} is not supported.
+The result usually looks fine, and otherwise is enough to get the meaning across.
+
+\pkg{lwarp}'s \brand{MathJax} emulation for \pkg{siunitx} is meant to be a
+stop-gap measure until an extension is included in \brand{MathJax}.
+As of this writing, the third-party \pkg{siunitx} extension
+for \brand{MathJax} is not currently hosted at any public CDN,
+thus \pkg{siunitx} is not usable with this extension unless a local copy
+of this extension is created first.
+See \cs{MathJaxFilename} to select a custom MathJax script, but \pkg{lwarp}'s
+emulation would have to be diabled as well.
+
+Document modifications required for \brand{MathJax}:
+\begin{itemize}
+\item Custom units may be added with \cs{CustomizeMathJax}.
+ \margintag{custom units}
+ See the \pkg{lwarp-siunitx} code for examples.
+\item Units work better using \texttt{\textasciitilde} between units
+ \watchout[unit spacing]
+ instead of using periods.
+\item To square or cube compound units,
+ \watchout[\cs{square}, \cs{cubic}]
+ enclose the following compound units in braces:
+ \begin{sourcedisplay}
+ \cs{cubic}\textred{\{}\cs{centi}\cs{meter}\textred{\}}
+ \end{sourcedisplay}
+ Single units do not require braces.
+\end{itemize}
+
+Also see \nameref{sec:limitsmathjax}, \cref{sec:limitsmathjax}.
}
\newcommand{\limitsnicefrac}{%
@@ -2497,7 +2612,35 @@
These packages do work with \pkg{lwarp}'s option \optn{svgmath}.
}
+\newcommand{\limitsphysics}{%
+\pkg{physics} works as-is for \HTML\ with \SVG\ math.
+For \brand{MathJax}, emulation is provided via \brand{MathJax} macros.
+These are not the same as the third-party \brand{MathJax} extension.
+
+\begin{itemize}
+\item The \optn{notrig} option is honored.
+\item Starred macros are not yet detected.\watchout
+\item Most macros don't work with \cs{big}, etc.\watchout
+\item Macros do not auto-detect variable numbers of mandatory arguments. \watchout
+ Provide empty \texttt{\{\}} arguments for those which are not used.
+\item Many of the macros do not work with auto-detected delimiters. \watchout
+ Use the delimiter-specific versions instead.
+ Some macros do not even consider the following arguments,
+ so they may work as expected.
+\item For \cs{Re} and \cs{Im}, the arguments must be in braces.\watchout
+\item For \cs{functionalderivative}, for the example in the manual with $(E-TS)$,
+ enclose the parens in braces.
+\item \cs{expectationvalue} requires and uses two mandatory arguments, \watchout
+ unlike the third-party \brand{MathJax} \pkg{physics} extension.
+\item Each of \cs{matrixquantity}, \cs{smallmatrixquantity},
+ and \cs{matrixdeterminant} work,
+ while \cs{identitymatrix} and the following simply print a place-holder,
+ and must be replaced by hand.
+\end{itemize}
+}
+
+
% \newcommand{\limitsbabelone}{%
% If using \pkg{babel} with French, use
% \watchout[French]%
@@ -2692,7 +2835,7 @@
%<*package>
% \fi
%
-% \CheckSum{33374}
+% \CheckSum{36513}
%
% \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
@@ -2813,6 +2956,7 @@
% \changes{v0.76}{2019/10/08}{\ 2019/10/08}
% \changes{v0.77}{2019/10/15}{\ 2019/10/15}
% \changes{v0.78}{2019/11/07}{\ 2019/11/07}
+% \changes{v0.79}{2020/02/01}{\ 2020/02/01}
@@ -2836,7 +2980,7 @@
%
% \fileversion{} \Dash \filedate
%
-% {\small\textcopyright{} 2016--2019} Brian Dunn\\ \small \texttt{bd at BDTechConcepts.com}
+% {\small\textcopyright{} 2016--2020} Brian Dunn\\ \small \texttt{bd at BDTechConcepts.com}
%
% \end{center}
%
@@ -2878,8 +3022,9 @@
% Supported classes and packages include \pkg{memoir} and \pkg{koma-script},
% \pkg{cleveref}, \pkg{caption}, \pkg{mdframed}, \pkg{siunitx},
% and many popular packages for tabulars, floats, graphics, theorems, the title page,
-% bibliography, indexing, footnotes, and editorial work.
-%
+% bibliography, indexing, footnotes, and editorial work, as well as a number of CJK-related
+% classes and packages.
+%
% \TeX\ is a self-modifying tokenized macro-expansion language.
% Since \pkg{lwarp} is written directly in \LaTeX, it is able to interpret the document's
% meaning at a deeper level than external conversions which merely approximate \TeX.
@@ -3033,6 +3178,42 @@
%
% \begin{description}
% \needspace{2\baselineskip}
+% \item[v0.79:] \brand{MathJax}, nested \env{tabular}.
+% \begin{itemize}
+% \item Added or improved \brand{MathJax} emulation for
+% \margintag{\brand{MathJax}}
+% \pkg{amsmath}, \pkg{ar}, \pkg{arydshln}, \pkg{bm},
+% \pkg{bigdelim}, \pkg{bigstrut}, \pkg{booktabs}, \pkg{braket},
+% \pkg{mathtools}, \pkg{multirow}, \pkg{physics}, \pkg{siunitx}, \pkg{slashed},
+% \pkg{unicode-math}, \pkg{xfakebold}.
+% \item Warn if using certain packages not supported by \brand{MathJax}.
+% \item \env{tabular}: Now may be nested.
+% \margintag{core}
+% \item \env{minipage}, \cs{parbox}, \env{fminipage},
+% \cs{makebox}, \cs{framebox}: Fix: Adjust for virtual page size.
+% \item Uses new \pkg{iftex}.
+% \item \pkg{graphicx}: Fix: Negative angles.
+% \margintag{packages}
+% \item \pkg{caption}: Fix: \cs{captionlistentry} with \pkg{longtable}.
+% \item \pkg{multirow}: Fix: Centered vertical alignment.
+% \item \pkg{siunitx}: Fix: \cs{square}, \cs{cubed}.
+% \item \pkg{booktabs}: Fix: \pkg{memoir} with \env{lateximage}.
+% \item \pkg{babel} and \pkg{polyglossia}: Added troubleshooting warnings.
+% \item \pkg{fontawesome}, \pkg{fontawesome5}: Supports text color and size.
+% \item \pkg{transparent}: Fix: \env{lateximage}s.
+% \item \pkg{epigraph}: Updated to v1.5e.
+% \item \pkg{xurl}: Updated to v0.08.
+% \item \pkg{subcaption}: Fixed with \pkg{memoir}.
+% \item \pkg{floatrow}: Fix: \cs{linewidth}. No longer require \pkg{float}, \pkg{graphics}.
+% \item \pkg{floatflt}, \pkg{wrapfig}, \pkg{niceframe}: Fix: Adjust for virtual page size.
+% \item Added \pkg{widetable}, \pkg{witharrows}, \pkg{steinmetz}.
+% \item Added \pkg{awesomebox}, \pkg{catoptions}.
+% \item Added \pkg{svg}, supports \pkg{svg-extract}.
+% \item Added \pkg{parcolumns}, \pkg{pdfcolparcolumns},
+% \item Added \pkg{parallel}, \pkg{pdfcolparallel}.
+% \item Added \pkg{pdfcol}, \pkg{pdfcolfoot}, \pkg{pdfcolmk}.
+% \end{itemize}
+% \needspace{2\baselineskip}
% \item[v0.78:] Fixes for support files, \attribute{alt} tags, hyperlinks, and the 2019/10 \LaTeX\ release.
% \begin{itemize}
% \item Docs: Improved documentation regarding package options.
@@ -4722,6 +4903,7 @@
% \Cref{tab:supported} lists some of the various \LaTeX{} features and packages
% which may be used.
%
+%
% Package names are colored according to their support level:
% \begin{description}
% \item[\spkg{name}:] Supported as-is.
@@ -4729,6 +4911,7 @@
% as print output in \SVG\ math or \env{lateximage} environments.
% \item[\epkg{name}:] Emulated for \HTML\ output.
% \item[\ipkg{name}:] Ignored for \HTML\ output, but provides source-level compatibility.
+% \item[\sjax:] Emulated for \brand{MathJax}, subject to limitations.
% \end{description}
%
% \renewcommand{\arraystretch}{1.5}
@@ -4804,7 +4987,8 @@
% \ipkg{grid}, \mpkg{grid-system}, \ipkg{gridset},
% \ipkg{layaureo}, \ipkg{layout}, \ipkg{layouts}, \ipkg{leading},
% \ipkg{ltxgrid}, \ipkg{nccfancyhdr}, \ipkg{notespages}, \ipkg{nowidow},
-% \ipkg{pagegrid}, \ipkg{pagesel}, \ipkg{pdfcrypt}, \ipkg{pdfprivacy},
+% \ipkg{pagegrid}, \ipkg{pagesel}, \epkg{parallel}, \epkg{parcolumns},
+% \ipkg{pdfcolparallel}, \ipkg{pdfcolparcolumns}, \ipkg{pdfcrypt}, \ipkg{pdfprivacy},
% \ipkg{preview}, \epkg{ragged2e}, \ipkg{rmpage},
% \epkg{scrlayer-scrpage}, \epkg{scrpage2}, \epkg{setspace},
% \ipkg{textarea}, \ipkg{threadcol},
@@ -4867,7 +5051,7 @@
% \epkg{footmisc}, \mpkg{footnote}, \ipkg{footnotebackref},
% \mpkg{footnoterange}, \ipkg{footnpag}, \epkg{manyfoot},
% \epkg{marginnote}, \spkg{nccfoots}, \spkg{pagenote},
-% \mpkg{parnotes}, \ipkg{pfnote}, \spkg{sepfootnotes},
+% \mpkg{parnotes}, \ipkg{pdfcolfoot}, \ipkg{pfnote}, \spkg{sepfootnotes},
% \mpkg{sidenotes}, \ipkg{tablefootnote}.
% \\
%
@@ -4876,7 +5060,7 @@
% Math: & Converted to \SVG\ images with \HTML\ \element{alt} tags containing the
% \LaTeX\ source for the math expression.
% \brand{MathJax} supported as an alternative.
-% \mpkg{amsmath}: \AmS\ environments are supported.
+% \mpkg{amsmath}\sjax: \AmS\ environments are supported.
% User-defined macros are available during converson,
% due to native \LaTeX\ processing.\\
%
@@ -4884,10 +5068,11 @@
% \mpkg{amsthm}, \mpkg{ntheorem}, \mpkg{theorem}. \\
%
% Additional math: & Math fonts via \SVG\ images,
-% \spkg{amscd}, \ipkg{autonum}, \mpkg{backnaur}, \spkg{bm}, \spkg{braket},
+% \spkg{amscd}, \ipkg{autonum}, \mpkg{backnaur}, \mpkg{bm}\sjax, \spkg{braket}\sjax,
% \mpkg{breqn}, \mpkg{cases}, \spkg{delarray}, \spkg{guass}, \spkg{jkmath},
-% \spkg{mathspec}, \mpkg{mathtools}, \spkg{nicematrix}, \spkg{pb-diagram},
-% \ipkg{resizegather}, \spkg{unicode-math}, \mpkg{xfakebold}, \mpkg{xy}.
+% \spkg{mathspec}, \mpkg{mathtools}\sjax, \spkg{nicematrix}, \spkg{pb-diagram},
+% \ipkg{resizegather}, \spkg{unicode-math}\sjax, \mpkg{witharrows}\sjax,
+% \mpkg{xfakebold}\sjax, \mpkg{xy}.
% Many others work as-is. \\
%
% Display math with \cs{displaymathother}: & %
@@ -4896,8 +5081,8 @@
% \midrule
%
% Units and fractions: &
-% \mpkg{nicefrac}, \mpkg{SIunits}, \mpkg{siunitx},
-% \mpkg{units}, \mpkg{unitsdef}, \mpkg{xfrac}. \\
+% \mpkg{nicefrac}\sjax, \mpkg{SIunits}, \mpkg{siunitx}\sjax,
+% \mpkg{units}\sjax, \mpkg{unitsdef}, \mpkg{xfrac}. \\
%
% \midrule
%
@@ -4913,12 +5098,13 @@
% \midrule
%
% Tabular: &
-% \env{tabular} environment, \mpkg{array}, \epkg{arydshln},
-% \mpkg{bigdelim}, \mpkg{booktabs},
+% \env{tabular} environment, \mpkg{array}\sjax, \epkg{arydshln}\sjax,
+% \mpkg{bigdelim}\sjax, \mpkg{bigstrut}\sjax, \mpkg{booktabs}\sjax,
% \mpkg{colortbl}, \mpkg{ctable}, \mpkg{diagbox}, \epkg{longtable},
% \epkg{ltablex}, \epkg{ltxtable},
-% \mpkg{multirow}, \epkg{supertabular}, \epkg{tabularx}, \epkg{tabulary},
-% \epkg{threeparttable}, \mpkg{threeparttablex}, \epkg{xltabular}, \epkg{xtab}. \\
+% \mpkg{multirow}\sjax, \epkg{supertabular}, \epkg{tabularx}, \epkg{tabulary},
+% \epkg{threeparttable}, \mpkg{threeparttablex},
+% \epkg{widetable}, \epkg{xltabular}, \epkg{xtab}. \\
%
% \midrule
%
@@ -4936,7 +5122,7 @@
% \epkg{figsize}, \ipkg{fitbox},
% \spkg{grffile}, \epkg{media9}, \epkg{movie15}, \epkg{multimedia}, \mpkg{overpic},
% \mpkg{psfrag}, \mpkg{psfragx}, \mpkg{pst-eps}, \mpkg{pstool}, \mpkg{pstricks},
-% \spkg{rviewport}, \spkg{tikz-3dplot}. \\
+% \spkg{rviewport}, \mpkg{svg}, \spkg{svg-extract}, \spkg{tikz-3dplot}. \\
%
% \midrule
%
@@ -4984,8 +5170,9 @@
% \cs{bfseries}, etc.\ are only supported in some cases.
% \mpkg{cancel}, \epkg{ellipsis}, \mpkg{embrac}, \spkg{enparen},
% \ipkg{hyphenat}, \epkg{lettrine}, \epkg{lips},
-% \ipkg{lua-check-hyphen}, \ipkg{luacolor},
-% \epkg{magaz}, \ipkg{pdfrender}, \epkg{realscripts}, \mpkg{relsize},
+% \ipkg{lua-check-hyphen}, \ipkg{luacolor}, \epkg{magaz}, \ipkg{normalcolor},
+% \ipkg{pdfcol}, \ipkg{pdfcolmk},
+% \ipkg{pdfrender}, \epkg{realscripts}, \mpkg{relsize},
% \ipkg{scalefnt}, \epkg{soul}, \epkg{soulpos}, \epkg{soulutf8}, \mpkg{stackengine},
% \epkg{textfit}, \epkg{thinsp}, \ipkg{trimclip}, \ipkg{truncate},
% \mpkg{ulem}, \mpkg{umoline}, \ipkg{underscore}, \ipkg{uspace},
@@ -5036,7 +5223,7 @@
% \midrule
%
% Science and engineering: &
-% \mpkg{algorithm2e}, \mpkg{algorithmicx}, \mpkg{ar}, \spkg{askmaps},
+% \mpkg{algorithm2e}, \mpkg{algorithmicx}, \mpkg{ar}\sjax, \spkg{askmaps},
% \mpkg{axodraw2}, \mpkg{bitpattern}, \spkg{blochsphere}, \spkg{bodegraph},
% \spkg{bohr}, \mpkg{bytefield},
% \mpkg{chemfig}, \mpkg{chemformula}, \mpkg{chemgreek},
@@ -5043,9 +5230,10 @@
% \mpkg{chemmacros}, \mpkg{chemnum},
% \spkg{circuitikz}, \spkg{elements}, \spkg{engtlc}, \spkg{fast-diagram},
% \spkg{hepnicenames}, \spkg{heppennames}, \spkg{karnaughmap}, \mpkg{karnaugh-map},
-% \mpkg{listings}, \spkg{linop}, \mpkg{mhchem}, \spkg{pgfgantt},
-% \mpkg{phfqit}, \spkg{physics}, \spkg{qcircuit}, \mpkg{register}, \spkg{simpler-wick},
-% \spkg{slashed}, \spkg{structmech}, \mpkg{struktex}.
+% \mpkg{listings}, \spkg{linop}, \mpkg{mhchem}\sjax, \spkg{pgfgantt},
+% \mpkg{phfqit}, \spkg{physics}\sjax, \spkg{qcircuit},
+% \mpkg{register}, \spkg{simpler-wick},
+% \spkg{slashed}\sjax, \mpkg{steinmetz}\sjax, \spkg{structmech}, \mpkg{struktex}.
% \spkg{tikz-karnaugh}, \spkg{tikzcodeblocks} \\
%
% \midrule
@@ -5058,7 +5246,7 @@
%
% \midrule
%
-% Admonitions: & \epkg{notes}. \\
+% Admonitions: & \epkg{awesomebox}, \epkg{notes}. \\
%
% Editorial: & \ipkg{changebar}, \spkg{changelog}, \mpkg{changes},
% \mpkg{easy-todo}, \spkg{easyReview}, \mpkg{ed}, \mpkg{errata}, \mpkg{fixme},
@@ -5073,6 +5261,8 @@
%
% \midrule
%
+% Package handling: & \spkg{catoptions}. \\
+%
% Debug: & \ipkg{chkfloat}, \ipkg{cmdtrack}, \ipkg{dprogress},
% \ipkg{lua-visual-debug}, \ipkg{refcheck},
% \ipkg{srcltx}, \ipkg{srctex}, \ipkg{vpe}, \ipkg{xbmks}. \\
@@ -7631,7 +7821,7 @@
% \osportabilityusage
%
%
-% \subsection{Selecting actions for print or \HTML\ output}
+% \subsection{Selecting actions for print, \HTML, or \brand{MathJax} output}
% \label{sec:selectingoutput}
% \gindex{settings>selecting output}
% \changes{v0.15}{2016/04/05}{Docs: Clarify print/\HTML\ output.}
@@ -7638,7 +7828,7 @@
%
% The following environments and macros are used to select actions which only apply
% to either traditional \LaTeX{} print-formatted \PDF\ generation,
-% or to \HTML\ generation.
+% or to \HTML\ generation, or to \HTML\ with \brand{MathJax}.
%
% For most of built-in \LaTeX\ and many additional packages
% there is user-level source code support or emulation,
@@ -7651,8 +7841,8 @@
% the titlepage for print and another for \HTML.
% \DescribeEnv{warpHTML}
-% Anything which is to be done only for \HTMLfive{} output
-% is surrounded by a |warpHTML| environment:
+% Anything which is to be done only for \HTMLfive\ output
+% is surrounded by a \env{warpHTML} environment:
% \begin{Verbatim}[gobble=2,frame=lines,obeytabs,tabsize=4]
% \begin{warpHTML}
% ... something to be done only during \HTML\ generation
@@ -7664,7 +7854,7 @@
%
% \DescribeEnv{warpprint}
% Anything which is to be done only for print output
-% is surrounded by a |warpprint| environment:
+% is surrounded by a \env{warpprint} environment:
% \begin{Verbatim}[gobble=2,frame=lines,obeytabs,tabsize=4]
% \begin{warpprint}
% ... something to be done only during traditional \PDF\ generation
@@ -7675,7 +7865,7 @@
%
% \DescribeEnv{warpall}
% Anything which is to be done for any output
-% may be surrounded by a |warpall| environment. Doing so is optional.
+% may be surrounded by a \env{warpall} environment. Doing so is optional.
% \begin{Verbatim}[gobble=2,frame=lines,obeytabs,tabsize=4]
% \begin{warpall}
% ... something to be done during print \PDF\ or \HTML\ output
@@ -7694,6 +7884,10 @@
%
% Performs the given actions only when \HTML\ output is being generated.
%
+% \DescribeEnv{warpMathJax}
+% Anything which is to be done only while using \HTML\ output with \brand{MathJax}
+% is surrounded by a \env{warpMathJax} environment.
+% Usually, this is \cs{CustomizeMathJax}, used to add emulation macros.
%
%
% \subsection{Commands to be placed into the \env{warpprint} environment}
@@ -9089,6 +9283,7 @@
%
% \limitsmathdisplay
%
+%
% \subsubsection{\pkg{ntheorem} package}
%
% \DescribePackage{ntheorem}
@@ -9095,6 +9290,12 @@
% \limitsntheorem
%
%
+% \subsubsection{\pkg{mathtools} package}
+%
+% \DescribePackage{mathtools}
+% \limitsmathtools
+%
+%
% \subsubsection{\pkg{siunitx} package}
% \label{sec:limitssiunitx}
%
@@ -9107,8 +9308,19 @@
% \DescribePackage{units}
% \DescribePackage{nicefrac}
% \limitsnicefrac
-%
%
+%
+% \subsubsection{\pkg{physics} package}
+% \label{sec:limitsphysics}
+%
+% \trouble{MathJax=\brand{MathJax}>physics=\pkg{physics}}
+% \trouble{physics=\pkg{physics}>MathJax=\brand{MathJax}}
+%
+% \DescribePackage{physics}
+% \limitsphysics
+%
+%
+%
% \subsubsection{\pkg{newtxmath} package}
%
% \DescribePackage{newtxmath}
@@ -9408,7 +9620,7 @@
%
% \subsubsection{\pkg{chemformula} package}
% \limitschemformula
-% \trouble{array>chemformula=\pkg{chemformula}}
+% \trouble{array=\env{array}>chemformula=\pkg{chemformula}}
% \trouble{math>chemformula=\pkg{chemformula}}
%
%
@@ -9978,7 +10190,7 @@
%
% \begin{docsidebar}[\bool{WPMarkMath}]
% \trouble{TeXMaths}
-% \trouble{siunitx>with TeXMaths}
+% \trouble{siunitx=\pkg{siunitx}>with \prog{TeXMaths}}
% \margintag{siunitx}
% \DescribeBoolean{WPMarkMath} \DescribeDefault{false}
% \DescribeProgram{TeXMaths}
@@ -10490,6 +10702,10 @@
% of the package until \pkg{lwarp} is updated.
% \item[\pkg{longtable}:] \pkg{lwarp}'s \pkg{longtable} package issues
% detailed error messages regarding the use of the table headers and footers.
+% \item[\pkg{polyglossia}:] If used, an informative message is printed to
+% instruct the user to be sure to set a language, without which an error will occur.
+% \item[\pkg{babel} or \pkg{polyglossia}:] An informative message is printed to
+% note that not all langauges are supported by \pkg{cleveref}.
% \end{description}
%
% \subsubsection{Compiling}
@@ -10574,7 +10790,7 @@
%
% \item [``No room for a new \cs{write}.'':] Before |\usepackage{lwarp}|, add:
% \trouble{No room for a new \cs{write}}
-% \trouble{morewrites}
+% \trouble{morewrites=\pkg{morewrites}}
% \begin{sourcedisplay}
% \cs{usepackage}\{morewrites\} \\
% \cs{morewritessetup}\{allocate=10\}
@@ -10595,9 +10811,10 @@
% \end{sourcedisplay}
% \trouble{Label(s) may have changed}
%
-% \item [``Leaders not followed by proper glue'':] This can be caused by
-% a missing |l@<floattype>| or |l@<sectiontype>| definition.
-% See \pkg{lwarp}'s definitions for examples.
+% \item [``Leaders not followed by proper glue'':] ~ \\
+% This can be caused by
+% a missing |l@<floattype>| or |l@<sectiontype>| definition.
+% See \pkg{lwarp}'s definitions for examples.
% \trouble{Leaders not followed by proper glue}
%
% \item [``Improper \cs{prevdepth}'':]
@@ -10627,7 +10844,7 @@
% If using BibTeX, see \cref{sec:limitsbibtex}.\watchout[BibTeX]
%
% \item[``\texttt{!~Undefined control sequence. \dots\ \cs{@begindocumenthook}''}:] ~
-% \watchout[\pkg{polyglossia}]
+% \watchout[\pkg{polyglossia}] \\
% See \cref{sec:limitspolyglossia}
% if using \pkg{polyglossia}.
%
@@ -11085,9 +11302,14 @@
% Detects \XeTeX{} and \LuaLaTeX:
% \gindex{Xe\LaTeX>detection}\gindex{Lua\LaTeX>detection}
%
+% \changes{v0.63}{2018/11/25}{Added p\TeX support.}
+% \changes{v0.79}{2020/01/05}{\pkg{luatex85}: Removed.}
+% \changes{v0.79}{2020/01/05}{\pkg{ifpdf}, \pkg{ifptex}: Provided by \pkg{iftex}.}
% \begin{macrocode}
-\RequirePackage{iftex}
+\RequirePackage{iftex}[2019/11/07]
+
\newif\ifxetexorluatex
+
\ifXeTeX
\xetexorluatextrue
\else
@@ -11097,22 +11319,10 @@
\xetexorluatexfalse
\fi
\fi
-
-\ifLuaTeX
-\RequirePackage{luatex85}% until the geometry package is updated
-\fi
-
-\RequirePackage{ifpdf}
% \end{macrocode}
%
-% \changes{v0.63}{2018/11/25}{Added p\TeX support.}
%
-% \begin{macrocode}
-\RequirePackage{ifptex}
-% \end{macrocode}
%
-%
-%
% \section{Early package requirements}
%
% \DescribePackage{etoolbox}
@@ -11281,7 +11491,7 @@
{%
Package #1 is not supported\MessageBreak
by lwarp's HTML conversion.\MessageBreak
- Package(s) #2 may be useful instead
+ Package(s) #2 may be useful instead%
}
{%
Package #1 might conflict with lwarp in some way,\MessageBreak
@@ -11317,23 +11527,14 @@
% This version checks immediately for packages which may have been loaded before \pkg{lwarp}.
%
% \changes{v0.54}{2018/04/06}{Added.}
+% \changes{v0.79}{2020/01/09}{Factored.}
%
% \begin{macrocode}
\newcommand*{\LWR at earlyloadnever}[2]{%
-\@ifpackageloaded{#1}{%
-\PackageError{lwarp}
-{%
- Package #1 is not supported\MessageBreak
- by lwarp's HTML conversion.\MessageBreak
- Package(s) #2 may be useful instead
+ \@ifpackageloaded{#1}{%
+ \LWR at loadnever{#1}{#2}%
+ }{}%
}
-{%
- Package #1 might conflict with lwarp in some way,\MessageBreak
- or is superceded by another package.\MessageBreak
- For a possible alternative, see package(s) #2.
-}
-}{}%
-}
% \end{macrocode}
% \end{macro}
%
@@ -11386,9 +11587,27 @@
\LWR at earlyloadnever{aecc}{cm-super, lmodern}
\LWR at earlyloadnever{alg}{algorithm2e, algorithmicx}
\LWR at earlyloadnever{algorithmic}{algorithm2e, algorithmicx}
+\LWR at earlyloadnever{bitfield}{bytefield}
\LWR at earlyloadnever{boxedminipage}{boxedminipage2e}
\LWR at earlyloadnever{caption2}{caption}
% \LWR at earlyloadnever{ccaption}{caption}% might be preloaded by memoir
+\LWR at earlyloadnever{colortab}{colortbl}
+\LWR at earlyloadnever{doublespace}{setspace}
+\LWR at earlyloadnever{epsf}{graphicx}
+\LWR at earlyloadnever{fancyheadings}{fancyhdr}
+\LWR at earlyloadnever{fncylab}{cleveref}
+\LWR at earlyloadnever{glossary}{glossaries}
+\LWR at earlyloadnever{hyper}{hyperref}
+\LWR at earlyloadnever{newthm}{ntheorem}
+\LWR at earlyloadnever{pdfcprot}{microtype}
+\LWR at earlyloadnever{picinpar}{floatflt, wrapfig}
+\LWR at earlyloadnever{picins}{floatflt, wrapfig}
+\LWR at earlyloadnever{rplain}{fancyhdr}
+\LWR at earlyloadnever{si}{siunitx}
+\LWR at earlyloadnever{sistyle}{siunitx}
+\LWR at earlyloadnever{t1enc}{fontenc, inputenc, inputenx}
+\LWR at earlyloadnever{ucs}{inputenc, inputencx}
+\LWR at earlyloadnever{wasysym}{textcomp, amssymb, amsfonts, mnsymbol, fdsymbol}
% \end{macrocode}
% The older \pkg{CJK} and \pkg{CJKutf8} only work with \pkg{xeCJK}:
% \begin{macrocode}
@@ -11405,22 +11624,6 @@
% \begin{macrocode}
\LWR at earlyloadnever{hangul}{kotex, xetexko, luatexko}
% \end{macrocode}
-% Others:
-% \begin{macrocode}
-\LWR at earlyloadnever{colortab}{colortbl}
-\LWR at earlyloadnever{epsf}{graphicx}
-\LWR at earlyloadnever{fancyheadings}{fancyhdr}
-\LWR at earlyloadnever{fncylab}{cleveref}
-\LWR at earlyloadnever{glossary}{glossaries}
-\LWR at earlyloadnever{hyper}{hyperref}
-\LWR at earlyloadnever{pdfcprot}{microtype}
-\LWR at earlyloadnever{picinpar}{floatflt, wrapfig}
-\LWR at earlyloadnever{picins}{floatflt, wrapfig}
-\LWR at earlyloadnever{sistyle}{siunitx}
-\LWR at earlyloadnever{t1enc}{fontenc, inputenc, inputenx}
-\LWR at earlyloadnever{ucs}{inputenc, inputencx}
-\LWR at earlyloadnever{wasysym}{textcomp, amssymb, amsfonts, mnsymbol, fdsymbol}
-% \end{macrocode}
%
%
% \subsection{Enforcing package loading after \pkg{lwarp}}
@@ -11449,8 +11652,6 @@
\LWR at loadafter{acronym}
\LWR at loadafter{adjmulticol}
\LWR at loadafter{addlines}
-\LWR at loadafter{ae}
-\LWR at loadafter{aecc}
\LWR at loadafter{afterpage}
\LWR at loadafter{algorithm2e}
\LWR at loadafter{algorithmicx}
@@ -11470,6 +11671,7 @@
\LWR at loadafter{attachfile2}
\LWR at loadafter{authblk}
\LWR at loadafter{autonum}
+\LWR at loadafter{awesomebox}
\LWR at loadafter{axessibility}
\LWR at loadafter{axodraw2}
\LWR at loadafter{backnaur}
@@ -11481,13 +11683,14 @@
\LWR at loadafter{bigstrut}
\LWR at loadafter{bitpattern}
\LWR at loadafter{blowup}
+\LWR at loadafter{bm}
\LWR at loadafter{booklet}
\LWR at loadafter{bookmark}
\LWR at notmemoirloadafter{booktabs}
\LWR at loadafter{bophook}
\LWR at loadafter{bounddvi}
-\LWR at loadafter{boxedminipage}
\LWR at loadafter{boxedminipage2e}
+\LWR at loadafter{braket}
\LWR at loadafter{breakurl}
\LWR at loadafter{breqn}
\LWR at loadafter{bsheaders}
@@ -11557,7 +11760,6 @@
\LWR at loadafter{extramarks}
\LWR at loadafter{fancybox}
\LWR at loadafter{fancyhdr}
-\LWR at loadafter{fancyheadings}
\LWR at loadafter{fancyref}
\LWR at loadafter{fancytabs}
\LWR at loadafter{fancyvrb}
@@ -11708,9 +11910,16 @@
\LWR at notmemoirloadafter{pagenote}
\LWR at loadafter{pagesel}
\LWR at loadafter{paralist}
+\LWR at loadafter{parallel}
+\LWR at loadafter{parcolumns}
\LWR at loadafter{parnotes}
\LWR at notmemoirloadafter{parskip}
\LWR at loadafter{pbox}
+\LWR at loadafter{pdfcol}
+\LWR at loadafter{pdfcolfoot}
+\LWR at loadafter{pdfcolmk}
+\LWR at loadafter{pdfcolparallel}
+\LWR at loadafter{pdfcolparcolumns}
\LWR at loadafter{pdfcomment}
\LWR at loadafter{pdfcrypt}
\LWR at loadafter{pdflscape}
@@ -11724,6 +11933,7 @@
\LWR at loadafter{perpage}
\LWR at loadafter{pfnote}
\LWR at loadafter{phfqit}
+\LWR at loadafter{physics}
\LWR at loadafter{pifont}
\LWR at loadafter{placeins}
\LWR at loadafter{plarray}
@@ -11783,6 +11993,7 @@
\LWR at loadafter{SIunits}
\LWR at loadafter{siunitx}
\LWR at loadafter{slantsc}
+\LWR at loadafter{slashed}
\LWR at loadafter{soul}
\LWR at loadafter{soulpos}
\LWR at loadafter{soulutf8}
@@ -11791,6 +12002,7 @@
\LWR at loadafter{srctex}
\LWR at loadafter{stabular}
\LWR at loadafter{stackengine}
+\LWR at loadafter{steinmetz}
\LWR at notltjloadafter{stfloats}
\LWR at loadafter{struktex}
\LWR at loadafter{subcaption}
@@ -11797,6 +12009,7 @@
\LWR at loadafter{subfig}
\LWR at loadafter{subfigure}
\LWR at loadafter{supertabular}
+\LWR at loadafter{svg}
\LWR at loadafter{t1inc}
\LWR at loadafter{tabfigures}
\LWR at loadafter{tabls}
@@ -11844,6 +12057,7 @@
% \LWR at loadafter{ulem}% preloaded by ctexart and related classes
\LWR at loadafter{umoline}
\LWR at loadafter{underscore}
+\LWR at loadafter{unicode-math}
\LWR at loadafter{units}
\LWR at loadafter{unitsdef}
\LWR at loadafter{upref}
@@ -11859,7 +12073,9 @@
\LWR at loadafter{vwcol}
\LWR at loadafter{wallpaper}
\LWR at loadafter{watermark}
+\LWR at loadafter{widetable}
\LWR at loadafter{widows-and-orphans}
+\LWR at loadafter{witharrows}
\LWR at loadafter{wrapfig}
\LWR at loadafter{xbmks}
\LWR at loadafter{xcolor}
@@ -11885,7 +12101,6 @@
%
%
%
-%
% \section{MD5 hashing}
%
% The MD5 hash is used for \env{lateximage} filenames for \SVG\ math.
@@ -11925,7 +12140,8 @@
%
% \section{pdf\LaTeX\ T1 and \UTF-8 encoding}
%
-% When using pdf\LaTeX, \pkg{lwarp} requires T1 encoding, and recommends \UTF-8 encoding.
+% When using pdf\LaTeX, \pkg{lwarp} requires T1 font encoding,
+% and recommends \UTF-8 input encoding.
%
% If some other input encoding is already defined, \pkg{lwarp} will
% try to use it instead, and hope for the best.
@@ -11987,7 +12203,7 @@
\newunicodechar{⨯}{\texttimes}
\ifPDFTeX% pdflatex or dvi latex
-\newunicodechar{ff}{ff}% the first arguments are ligatures
+\newunicodechar{ff}{ff}% Here, the first arguments are ligatures.
\newunicodechar{fi}{fi}
\newunicodechar{fl}{fl}
\newunicodechar{ffi}{ffi}
@@ -12055,8 +12271,11 @@
%
%
%
+%
+%
% \section{Miscellaneous tools}
%
+%
% \subsection{Lengths and units}
%
% \begin{macro}{\LWR at providelength} \marg{\cs{lengthname}}
@@ -12095,6 +12314,19 @@
% \end{macro}
+% \subsection{Counters}
+
+% \begin{macro}{\defaddtocounter} \marg{name} \marg{value}
+%
+% Locally add to a counter.
+% \begin{macrocode}
+\providecommand*{\defaddtocounter}[2]{%
+ \defcounter{#1}{\value{#1}+#2}%
+}
+% \end{macrocode}
+% \end{macro}
+
+
% \subsection{Patching}
% \begin{macro}{\LWR at patcherror} \marg{packagename} \marg{macroname}
@@ -12104,7 +12336,7 @@
\newcommand*{\LWR at patcherror}[2]{%
\PackageError{lwarp}
{Unable to patch package #1, macro #2}
-{Please contact the author of the lwarp package.}
+{Please contact the author of the Lwarp package.}
}
% \end{macrocode}
% \end{macro}
@@ -12218,7 +12450,27 @@
% \end{environment}
%
%
+% \subsection{Converting a macro name to a cs name}
%
+% \begin{macro}{\macrotocsname} \marg{macro name with backslash}
+%
+% Results in the macro name without the leading backslash.
+%
+% Ref: \href{https://tex.stackexchange.com/questions/42318/removing-a-backslash-from-a-character-sequence}
+% {\texttt{https://tex.stackexchange.com/questions/42318/removing-a-backslash-from-a-character-sequence}}
+%
+% \changes{v0.79}{2020/01/18}{Added.}
+% \begin{macrocode}
+\newcommand*{\macrotocsname}[1]{%
+ \ifcat\relax\noexpand#1%
+ \expandafter\expandafter\expandafter\@gobble\expandafter\string
+ \fi
+ #1%
+}
+% \end{macrocode}
+% \end{macro}
+%
+%
% \section{Operating-System portability}
% \label{sec:OSportability}
% \changes{v0.11}{2016/03/11}{Added section: Operating-System portability.}
@@ -12977,34 +13229,53 @@
% \end{environment}
-% \begin{environment}{warpprint}
% \begin{environment}{warpHTML}
-% Anything in the |warpprint| environment will be generated for print output only.
%
% For \HTML\ output:
% \begin{macrocode}
\ifbool{warpingHTML}
-{\includecomment{warpHTML}}
-{\excludecomment{warpHTML}}%
+ {\includecomment{warpHTML}}
+ {\excludecomment{warpHTML}}%
% \end{macrocode}
+% \end{environment}
+% \begin{environment}{warpprint}
+%
+% Anything in the |warpprint| environment will be generated for print output only.
% \begin{macrocode}
\ifbool{warpingprint}
-{\includecomment{warpprint}}
-{\excludecomment{warpprint}}
+ {\includecomment{warpprint}}
+ {\excludecomment{warpprint}}
% \end{macrocode}
+% \end{environment}
+
+% \begin{environment}{warpMathJax}
+% Only if \brand{MathJax} is being used along with \HTML.
+% \changes{v0.79}{2020/01/26}{Added.}
+% \begin{macrocode}
+\begin{warpprint}
+\excludecomment{warpMathJax}
+\end{warpprint}
+
+\begin{warpHTML}
+\ifbool{mathjax}
+ {\includecomment{warpMathJax}}
+ {\excludecomment{warpMathJax}}
+\end{warpHTML}
+% \end{macrocode}
% \end{environment}
-% \end{environment}
+% \begin{environment}{LWR at creatinglwarpmk}
% Optionally generate a local copy of \prog{lwarpmk}.
% Default to no.
% \begin{macrocode}
\ifbool{LWR at creatinglwarpmk}
-{\includecomment{LWR at createlwarpmk}}
-{\excludecomment{LWR at createlwarpmk}}
+ {\includecomment{LWR at createlwarpmk}}
+ {\excludecomment{LWR at createlwarpmk}}
% \end{macrocode}
+% \end{environment}
%
%
%
@@ -13283,8 +13554,9 @@
% \end{macrocode}
%
% The user's paper size is saved for later reuse,
-% such as by the \pkg{pdfpages} package.
-% \begin{macrocode}
+% such as by the \pkg{pdfpages} or \pkg{parallel} packages.
+% \changes{v0.79}{2019/12/29}{\pkg{geometry}: Also save \cs{textwidth}, \cs{textheight}.}
+%% \begin{macrocode}
\newlength{\LWR at userspaperwidth}
\setlength{\LWR at userspaperwidth}{\paperwidth}
@@ -13293,6 +13565,12 @@
\newlength{\LWR at usersmarginparwidth}
\setlength{\LWR at usersmarginparwidth}{\marginparwidth}
+
+\newlength{\LWR at userstextwidth}
+\setlength{\LWR at userstextwidth}{\textwidth}
+
+\newlength{\LWR at userstextheight}
+\setlength{\LWR at userstextwidth}{\textheight}
% \end{macrocode}
%
% For \pkg{lwarp}, use a very large page and margins
@@ -13585,15 +13863,15 @@
% \changes{v0.49}{2018/02/19}{Fix: Group \pkg{printlen} changes.}
% \begin{macrocode}
\newrobustcmd*{\LWR at printlength}[1]{%
-\begingroup%
-\uselengthunit{PT}%
-\renewcommand*{\unitspace}{}%
-\ifdimless{#1}{10pt}{%
- \printlength{#1}%
-}{%
- \rndprintlength{#1}%
-}%
-\endgroup%
+ \begingroup%
+ \uselengthunit{PT}%
+ \renewcommand*{\unitspace}{}%
+ \ifdimless{#1}{10pt}{%
+ \printlength{#1}%
+ }{%
+ \rndprintlength{#1}%
+ }%
+ \endgroup%
}
% \end{macrocode}
% \end{macro}
@@ -13692,18 +13970,20 @@
% \changes{v0.66}{2019/01/04}{Prevented \pkg{colortab}, \pkg{epsf}, \pkg{hyper}, \pkg{picinpar},
% \pkg{picins}, \pkg{sistyle}, \pkg{ucs}.}
% \changes{v0.68}{2019/02/26}{Prevented \pkg{alg}, \pkg{algorithmic}, \pkg{fncylab}, \pkg{pdfcprot}.}
+% \changes{v0.79}{2020/01/09}{Prevented \pkg{bxcjkjatype}, \pkg{hangul}.}
%
% The following should never be loaded:
% \begin{macrocode}
\newcommand*{\LWR at checkloadfilename}[1]{%
-\LWR at checkloadnever{#1}{ae}{latinmodern}
-\LWR at checkloadnever{#1}{aecc}{latinmodern}
+\LWR at checkloadnever{#1}{ae}{cm-super, lmodern}
+\LWR at checkloadnever{#1}{aecc}{cm-super, lmodern}
+\LWR at checkloadnever{#1}{aecompl}{cm-super, lmodern}
\LWR at checkloadnever{#1}{alg}{algorithm2e, algorithmicx}
\LWR at checkloadnever{#1}{algorithmic}{algorithm2e, algorithmicx}
\LWR at checkloadnever{#1}{bitfield}{bytefield}
\LWR at checkloadnever{#1}{boxedminipage}{boxedminipage2e}
\LWR at checkloadnever{#1}{caption2}{caption}
-\LWR at checkloadnever{#1}{ccaption}{caption}
+\LWR at checkloadnever{#1}{ccaption}{caption}% might be preloaded by memoir
\LWR at checkloadnever{#1}{colortab}{colortbl}
\LWR at checkloadnever{#1}{doublespace}{setspace}
\LWR at checkloadnever{#1}{epsf}{graphicx}
@@ -13721,6 +14001,8 @@
\LWR at checkloadnever{#1}{t1enc}{fontenc, inputenc, inputenx}
\LWR at checkloadnever{#1}{ucs}{inputenc, inputencx}
\LWR at checkloadnever{#1}{wasysym}{textcomp, amssymb, amsfonts, mnsymbol, fdsymbol}
+\LWR at checkloadnever{#1}{bxcjkjatype}{upLaTeX, bxjsarticle, ujarticle, utarticle}
+\LWR at checkloadnever{#1}{hangul}{kotex, xetexko, luatexko}
% \end{macrocode}
%
% ^^A *loadbefore
@@ -13895,27 +14177,48 @@
% Uses the original package, including options.
% \begin{macrocode}
\NewDocumentCommand{\LWR at ProvidesPackagePass}{m o}{
-\PackageInfo{lwarp}{%
- Using package `#1' and adding lwarp modifications,\MessageBreak
- including options,}%
-\IfValueTF{#2}
- {\ProvidesPackage{lwarp-#1}[#2]}
- {\ProvidesPackage{lwarp-#1}}
-\DeclareOption*{%
- \PassOptionsToPackage{\CurrentOption}{#1}%
-}
-\ProcessOptions\relax%
-\IfValueTF{#2}%
- {\LWR at origRequirePackage{#1}[#2]}%
- {\LWR at origRequirePackage{#1}}%
+ \PackageInfo{lwarp}{%
+ Using package `#1' and adding lwarp modifications,\MessageBreak
+ including options,}%
+ \IfValueTF{#2}%
+ {\ProvidesPackage{lwarp-#1}[#2]}%
+ {\ProvidesPackage{lwarp-#1}}%
+ \DeclareOption*{%
+ \PassOptionsToPackage{\CurrentOption}{#1}%
+ }%
+ \ProcessOptions\relax%
% \end{macrocode}
+%
+% If using \pkg{catoptions}, an error occurs if a package is loaded with an option
+% then loaded again with no options. \pkg{lwarp} does this if a package is preloaded
+% then later patched. To avoid an error while using \pkg{catoptions},
+% if a package has already been loaded, it is loaded again with its original options.
+% \changes{v0.79}{2019/12/31}{Fix: \pkg{catoptions}.}
+% \begin{macrocode}
+ \@ifpackageloaded{#1}{%
+ \edef\LWR at tempone{\csuse{opt@#1.sty}}%
+ \IfValueTF{#2}%
+ {%
+ \expandafter\LWR at origRequirePackage%
+ \expandafter[\LWR at tempone]{#1}[#2]%
+ }%
+ {%
+ \expandafter\LWR at origRequirePackage%
+ \expandafter[\LWR at tempone]{#1}%
+ }%
+ }{%
+ \IfValueTF{#2}%
+ {\LWR at origRequirePackage{#1}[#2]}%
+ {\LWR at origRequirePackage{#1}}%
+ }%
+% \end{macrocode}
% In some cases, the following seems to be required
% to avoid an ``unknown option'' error, such
% as when loading \pkg{xcolor} with options.
% \changes{v0.62}{2018/11/11}{Fix: Unknown option error.}
% \begin{macrocode}
-\DeclareOption*{}%
-\ProcessOptions\relax%
+ \DeclareOption*{}%
+ \ProcessOptions\relax%
}
% \end{macrocode}
% \end{macro}
@@ -15457,6 +15760,7 @@
% \changes{v0.74}{2019/08/04}{\filenm{lwarp.css}: Added \pkg{lyluatex}.}
% \changes{v0.75}{2019/09/22}{\filenm{lwarp.css}: Improved marginblock.}
% \changes{v0.76}{2019/10/02}{\filenm{lwarp.css}: Fix for small caps.}
+% \changes{v0.79}{2020/01/17}{\filenm{lwarp.css}: Fix: Nested \env{tabular}s.}
%
% ^^A *lwarp.css
%
@@ -15465,8 +15769,8 @@
\begin{LWRwriteconf}
\begin{filecontents*}[overwrite]{lwarp.css}
/*
- CSS stylesheet for the LaTeX lwarp package
- Copyright 2016-2019 Brian Dunn — BD Tech Concepts LLC
+ CSS stylesheet for the LaTeX Lwarp package
+ Copyright 2016-2020 Brian Dunn — BD Tech Concepts LLC
*/
@@ -16453,7 +16757,7 @@
line-height: 1.3 ;
}
-tr.hline td {border-top: 1px solid #808080 ; margin-top: 0ex ;
+table > tbody > tr.hline > td {border-top: 1px solid #808080 ; margin-top: 0ex ;
margin-bottom: 0ex ; } /* for \hline */
tr.tbrule td {border-top: 1px solid black ; margin-top: 0ex ;
@@ -18022,10 +18326,10 @@
\begin{filecontents*}[overwrite]{lwarpmk.lua}
#!/usr/bin/env texlua
--- Copyright 2016-2019 Brian Dunn
+-- Copyright 2016-2020 Brian Dunn
-printversion = "v0.78"
+printversion = "v0.79"
requiredconfversion = "2" -- also at *lwarpmk.conf
function printhelp ()
@@ -18752,7 +19056,7 @@
-- print intro:
-print ("lwarpmk: " .. printversion .. " Automated make for the LaTeX lwarp package.")
+print ("lwarpmk: " .. printversion .. " Automated make for the LaTeX Lwarp package.")
-- lwarpmk print:
@@ -19198,15 +19502,16 @@
%
% \begin{macro}{\LWR at setexparray} \marg{name} \marg{index} \marg{contents}
% \changes{v0.66}{2018/12/31}{Fix with \cs{par}.}
+% \changes{v0.79}{2020/01/18}{Fix: Nested \env{tabular}s.}
% \begin{macrocode}
\NewDocumentCommand{\LWR at setexparray}{m m m}{%
- \begingroup%
+ \let\LWR at temp@par\par%
\let\par\relax%
- \xdef\LWR at thisexparrayname{#1#2}%
+ \edef\LWR at thisexparrayname{#1#2}%
\ifstrempty{#3}%
- {\csgdef{\LWR at thisexparrayname}{}}%
- {\csxdef{\LWR at thisexparrayname}{#3}}%
- \endgroup%
+ {\csdef{\LWR at thisexparrayname}{}}%
+ {\csedef{\LWR at thisexparrayname}{#3}}%
+ \let\par\LWR at temp@par%
}
% \end{macrocode}
% \end{macro}
@@ -19249,8 +19554,8 @@
% \changes{v0.33}{2017/06/20}{Add: Avoids error: \protect\texttt{Misplaced alignment tab character \&}.}
% \begin{macrocode}
\newcommand{\StartDefiningTabulars}{%
-\LWR at traceinfo{StartDefiningTabulars}%
-\warpHTMLonly{\catcode`\&=\active}%
+ \LWR at traceinfo{StartDefiningTabulars}%
+ \warpHTMLonly{\catcode`\&=\active}%
}
% \end{macrocode}
% \end{macro}
@@ -19258,8 +19563,8 @@
% \begin{macro}{\StopDefiningTabulars} Place after defining something with |&| in it.
% \begin{macrocode}
\newcommand{\StopDefiningTabulars}{%
-\LWR at traceinfo{StopDefiningTabulars}%
-\warpHTMLonly{\catcode`\&=4}%
+ \LWR at traceinfo{StopDefiningTabulars}%
+ \warpHTMLonly{\catcode`\&=4}%
}
% \end{macrocode}
% \end{macro}
@@ -19280,8 +19585,8 @@
% \changes{v0.57}{2018/05/23}{Added.}
% \begin{macrocode}
\newcommand{\StartDefiningMath}{%
-\LWR at traceinfo{StartDefiningMath}%
-\warpHTMLonly{\catcode`\$=\active}%
+ \LWR at traceinfo{StartDefiningMath}%
+ \warpHTMLonly{\catcode`\$=\active}%
}
% \end{macrocode}
% \end{macro}
@@ -19289,8 +19594,8 @@
% \begin{macro}{\StopDefiningMath} Place after defining something with |$| in it.
% \begin{macrocode}
\newcommand{\StopDefiningMath}{%
-\LWR at traceinfo{StopDefiningMath}%
-\warpHTMLonly{\catcode`\$=3}% math shift
+ \LWR at traceinfo{StopDefiningMath}%
+ \warpHTMLonly{\catcode`\$=3}% math shift
}
% \end{macrocode}
% \end{macro}
@@ -21607,7 +21912,7 @@
\expandafter\ifvoid\csname LWR@#1box\endcsname\else
\LWR at forcenewpage
\begin{BlockClass}{footnotes}
- \LWR at origmedskip
+ \null
\unvbox\csuse{LWR@#1box}
\setbox\csuse{LWR@#1box}=\vbox{}
\end{BlockClass}
@@ -21658,7 +21963,7 @@
\ifvoid\LWR at mpfootnotes\else
\LWR at forcenewpage
\begin{BlockClass}{footnotes}
- \LWR at print@vspace*{\baselineskip}
+ \null
\unvbox\LWR at mpfootnotes
\setbox\LWR at mpfootnotes=\vbox{}
\end{BlockClass}
@@ -22105,6 +22410,110 @@
% \end{macro}
+
+% \subsection{Sanitizing expressions for \HTML}
+
+% Math expressions are converted to |lateximage|s,
+% and some math environments may contain
+% |&|, |<|, or |>|, which should not be allowed
+% inside an \HTML\ \element{alt} tag, so must convert them to \HTML\ entities.
+%
+%
+% \begin{macro}{\LWR at subHTMLsanitize}
+%
+% \cs{LWR at strresult} must first be set by \cs{LWR at HTMLsanitize},
+% \cs{LWR at HTMLsanitizeexpand}, or \cs{CustomizeMathJax}.
+%
+% \changes{v0.36}{2017/08/16}{Fix for \pkg{babel-french}.}
+% \changes{v0.51}{2018/03/07}{Fix: Escapes double quotes.}
+% \changes{v0.79}{2020/01/27}{Fix: \cs{\&}. Factored.}
+% \begin{macrocode}
+\newcommand{\LWR at subHTMLsanitize}{%
+% \end{macrocode}
+% The |&|, |<|, and |>| may be interpreted by the browser:
+% \begin{macrocode}
+ \protect\StrSubstitute{\detokenize\expandafter{\LWR at strresult}}%
+ {\detokenize{&}}{\detokenize{&}}[\LWR at strresult]%
+% \end{macrocode}
+% \begin{macrocode}
+ \protect\StrSubstitute{\detokenize\expandafter{\LWR at strresult}}%
+ {\detokenize{<}}{\detokenize{<}}[\LWR at strresult]%
+% \end{macrocode}
+% \begin{macrocode}
+ \protect\StrSubstitute{\detokenize\expandafter{\LWR at strresult}}%
+ {\detokenize{>}}{\detokenize{>}}[\LWR at strresult]%
+% \end{macrocode}
+% The double quote occasionally causes problems.
+% \begin{macrocode}
+ \protect\StrSubstitute{\detokenize\expandafter{\LWR at strresult}}%
+ {\detokenize{"}}{\detokenize{"}}[\LWR at strresult]%
+% \end{macrocode}
+% MathJax allows expressions to be defined with \cs{newcommand}.
+% These expressions would appear with |##| for each argument,
+% and each must be changed to a single |#|.
+% This must be done after all the above changes.
+% Attempting another conversion after this causes an error upon further expansion.
+% \begin{macrocode}
+ \protect\StrSubstitute{\detokenize\expandafter{\LWR at strresult}}%
+ {\detokenize{##}}{\LWR at origpound}[\LWR at strresult]%
+% \end{macrocode}
+% \begin{macrocode}
+}
+% \end{macrocode}
+% \end{macro}
+
+
+% \begin{macro}{\LWR at HTMLsanitize} \marg{text}
+%
+% \begin{macrocode}
+\newrobustcmd{\LWR at HTMLsanitize}[1]{%
+% \end{macrocode}
+% Cancel French \pkg{babel} character handling,
+% and fully expand the strings:
+% \begin{macrocode}
+ \begingroup%
+ \LWR at FBcancel%
+ \fullexpandarg%
+ \protect\StrSubstitute{\detokenize{#1}}%
+ {\detokenize{\&}}{\detokenize{&}}[\LWR at strresult]%
+ \LWR at subHTMLsanitize%
+ \LWR at strresult%
+ \endgroup%
+}
+% \end{macrocode}
+% \end{macro}
+
+
+% \begin{macro}{\LWR at HTMLsanitizeexpand} \marg{text}
+%
+% This version expands the argument before sanitizing it.
+%
+% \changes{v0.36}{2017/08/16}{Fix for \pkg{babel-french}.}
+% \changes{v0.51}{2018/03/07}{Fix: Escapes double quotes.}
+% \changes{v0.79}{2020/01/27}{Fix: \cs{\&}.}
+% \begin{macrocode}
+\newrobustcmd{\LWR at HTMLsanitizeexpand}[1]{%
+% \end{macrocode}
+% Cancel French \pkg{babel} character handling,
+% and fully expand the strings:
+% \begin{macrocode}
+ \begingroup%
+ \LWR at FBcancel%
+ \fullexpandarg%
+% \end{macrocode}
+% The difference between this and \cs{LWR at HTMLsanitize} (without ``expand'')
+% is the following \cs{expandafter}:
+% \begin{macrocode}
+ \protect\StrSubstitute{\detokenize\expandafter{#1}}%
+ {\detokenize{\&}}{\detokenize{&}}[\LWR at strresult]%
+ \LWR at subHTMLsanitize%
+ \LWR at strresult%
+ \endgroup%
+}
+% \end{macrocode}
+% \end{macro}
+
+
% \subsection{Customizing \brand{MathJax}}
% \begin{macro}{\LWR at customizedMathJax}
@@ -22119,22 +22528,62 @@
%
% \limitscustomizemathjax
%
+%
% \changes{v0.52}{2018/03/31}{Added.}
+% \changes{v0.79}{2020/01/22}{Fix: Sanitize for \HTML.}
% \begin{macrocode}
-\newcommand*{\CustomizeMathJax}[1]{%
- \appto{\LWR at customizedMathJax}{%
- \(#1\)\par
+\newcommand*{\LWR at subcustomizedmathjax}[1]{%
+ \begingroup%
+ \LWR at FBcancel%
+ \fullexpandarg%
+ \protect\StrSubstitute{\detokenize{#1}}%
+ {\detokenize{\&}}{\detokenize{&}}[\LWR at strresult]%
+ \LWR at subHTMLsanitize%
+ \xdef\LWR at customizedMathJax{%
+ \LWR at customizedMathJax%
+ \LWR at strresult%
}%
+ \endgroup%
}
+
+\newcommand*{\CustomizeMathJax}[1]{%
+ \appto\LWR at customizedMathJax{\LWRbackslash(}%
+ \LWR at subcustomizedmathjax{#1}%
+ \appto\LWR at customizedMathJax{\LWRbackslash)\par}%
+}
% \end{macrocode}
% \end{macro}
+%
+%
+% Default customizations:
+%
+% \changes{v0.51}{2018/03/18}{MathJax: Nullifies \cs{ensuremath}.}
+% \changes{v0.57}{2018/05/24}{MathJax: Supports \cs{footnote}, \cs{footnotemark}.}
+% \changes{v0.79}{2020/01/24}{\brand{MathJax}: Additional macros.}
+% \begin{macrocode}
+\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}
+}
+\CustomizeMathJax{\newcommand{\setlength}[2]{}}
+\CustomizeMathJax{\newcommand{\addtolength}[2]{}}
+\CustomizeMathJax{\newcommand{\setcounter}[2]{}}
+\CustomizeMathJax{\newcommand{\addtocounter}[2]{}}
+\CustomizeMathJax{\newcommand{\cline}[1]{}}
+\CustomizeMathJax{\newcommand{\directlua}[1]{\text{(directlua)}}}
+\CustomizeMathJax{\newcommand{\luatexdirectlua}[1]{\text{(directlua)}}}
+\end{warpMathJax}
+% \end{macrocode}
% \begin{macro}{\LWR at customizeMathJax}
% Prints MathJax commands to the \HTML\ output.
%
-% \changes{v0.51}{2018/03/18}{MathJax: Nullifies \cs{ensuremath}.}
-% \changes{v0.57}{2018/05/24}{MathJax: Supports \cs{footnote}, \cs{footnotemark}.}
+% \changes{v0.79}{2020/01/28}{MathJax: Hide definitions.}
% \begin{macrocode}
\newcommand{\LWR at customizeMathJax}{%
\ifbool{mathjax}{
@@ -22142,17 +22591,13 @@
% ^^A \ifboolexpr{bool{mathjax} and not bool{mathKaTeX}}{
% \begin{macrocode}
\LWR at stoppars
-\LWR at htmlcomment{Nullify \textbackslash{}ensuremath, footnotes for MathJax:}
+\LWR at htmlcomment{MathJax customizations:}
-\(\newcommand\ensuremath[1]{##1}\)
-
-\(\newcommand\footnote[2][]{\text{( Footnote ##1 )}}\)
-
-\(\newcommand\footnotemark[1][]{\text{( Footnote ##1 )}}\)
-
-\LWR at htmlcomment{Additional customizations for MathJax:}
-
+\begin{BlockClass}{hidden}
+\LWR at stoppars
\LWR at customizedMathJax
+\LWR at startpars
+\end{BlockClass}
\LWR at startpars
}{}
@@ -22490,10 +22935,7 @@
% \end{macrocode}
%
-% If using \brand{MathJax},
-% disable \cs{ensuremath} by printing a nullified
-% definition at the start of each file, and add further customizations:
-% \changes{v0.51}{2018/03/18}{MathJax: Nullifies \cs{ensuremath}.}
+% If using \brand{MathJax}, print the customizations here.
% \begin{macrocode}
\LWR at customizeMathJax
% \end{macrocode}
@@ -23478,7 +23920,7 @@
\LWR at htmltag{%
meta % space
name=\LWR at orig@textquotedbl{}generator\LWR at orig@textquotedbl\ % space
- content=\LWR at orig@textquotedbl{}LaTeX lwarp package\LWR at orig@textquotedbl\ /%
+ content=\LWR at orig@textquotedbl{}LaTeX Lwarp package\LWR at orig@textquotedbl\ /%
}\LWR at orignewline%
% \end{macrocode}
% If there is a description, add it now:
@@ -25540,7 +25982,7 @@
% \end{macrocode}
% \end{macro}
-% \cs{futurelet} copies the next token then executes a function to analyze
+% \cs{futurelet} copies the next token then executes a function to analyze it.
% \cs{LWR at futurenonspacelet} does the same, but ignores intervening white space
@@ -25550,10 +25992,13 @@
% \begin{macrocode}
\def\LWR at futurenonspacelet#1{\def\LWR at cs{#1}%
\afterassignment\LWR at fnslone\let\nexttoken= }
+
\def\LWR at fnslone{\expandafter\futurelet\LWR at cs\LWR at fnsltwo}
+
\def\LWR at fnsltwo{%
\expandafter\ifx\LWR at cs\@sptoken\let\next=\LWR at fnslthree%
\else\let\next=\nexttoken\fi\next}
+
\def\LWR at fnslthree{\afterassignment\LWR at fnslone\let\next= }
% \end{macrocode}
% \end{macro}
@@ -25562,9 +26007,9 @@
% Looks ahead and copies the next token into \cs{LWR at mynexttoken}.
% \begin{macrocode}
\newcommand*{\LWR at getmynexttoken}{%
-\LWR at traceinfo{LWR at getmynexttoken}%
+ \LWR at traceinfo{LWR at getmynexttoken}%
% nothing must follow this next line
-\LWR at futurenonspacelet\LWR at mynexttoken\LWR at tabledatacolumntag
+ \LWR at futurenonspacelet\LWR at mynexttoken\LWR at tabledatacolumntag
}
% \end{macrocode}
% \end{macro}
@@ -25571,6 +26016,10 @@
% \subsection{Tabular variables}
+%
+% In order to support nested \env{tabular}s, each of these is used locally.
+% For local counters, \pkg{etoolbox}'s \cs{defcounter} and
+% \pkg{lwarp}'s new \cs{defaddtocounter} are used.
% \DescribeBoolean{LWR at startedrow}
% True if should print a row tag before this column.
@@ -25677,6 +26126,40 @@
% \end{macrocode}
+% \DescribeBoolean{LWR at exitingtabular}
+% When \cs{end} is found, turns off the next opening data tag.
+% \begin{macrocode}
+\newbool{LWR at exitingtabular}
+% \end{macrocode}
+
+
+% \DescribeBoolean{LWR at tabularmutemods}
+% Mutes \HTML\ output for |@|, |!|, |<| and |>|.
+%
+% This is used while printing the final row to generate \cs{bottomrule}s.
+% \begin{macrocode}
+\newbool{LWR at tabularmutemods}
+% \end{macrocode}
+
+
+% \DescribeBoolean{LWR at validtablecol} True if found a valid table column type.
+% \begin{macrocode}
+\newbool{LWR at validtablecol}
+% \end{macrocode}
+%
+%
+% \DescribeBoolean{LWR at opttablecol} True if found a table column optional argument.
+% \begin{macrocode}
+\newbool{LWR at opttablecol}
+% \end{macrocode}
+
+% Used to add a style to a table data cell:
+% \begin{macrocode}
+\newbool{LWR at tdhavecellstyle}
+% \end{macrocode}
+
+
+
% \DescribeCounter{LWR at tabularDepth}
% Tracks whether |&| is being used inside a \env{tabular}.
% \begin{macrocode}
@@ -25788,6 +26271,57 @@
% \DescribeObject{LWR at colbarspec} A data array of specifications for vertical rules.
+
+% \DescribeCounter{LWR at cellcolordepth}
+% Counts how many cell color \element{div}s were added to the current tabular data cell.
+% \begin{macrocode}
+\newcounter{LWR at cellcolordepth}
+% \end{macrocode}
+
+
+
+% \subsubsection{Multicolumn variables}
+
+% \begin{macrocode}
+\newcounter{LWR at tablemulticolswidth}
+% \end{macrocode}
+%
+% Indexes into the multicolumn specification:
+% \begin{macrocode}
+\newcounter{LWR at tablemulticolspos}
+% \end{macrocode}
+
+% Remembers multicolumn vertical rules if found in the column spec.
+% \begin{macrocode}
+\newcounter{LWR at mcolvertbarsl}
+\newcounter{LWR at mcolvertbarsr}
+\newcounter{LWR at mcolvertbarsldash}
+\newcounter{LWR at mcolvertbarsrdash}
+\newbool{LWR at mcolvertbaronleft}
+% \end{macrocode}
+
+
+% \subsubsection{Longtable variables}
+% \DescribeBoolean{LWR at starredlongtable}
+% Per the \pkg{caption} pacakge, step the counter if |longtable*|.
+%
+% \begin{macrocode}
+\newbool{LWR at starredlongtable}
+\boolfalse{LWR at starredlongtable}
+% \end{macrocode}
+%
+
+% \subsubsection{Midrule variables}
+
+% \DescribeCounter{LWR at midrulecounter}
+% Indexes across the |LWR at midrules| and |LWR at trim<l/r>rules| data arrays.
+% \begin{macrocode}
+\newcounter{LWR at midrulecounter}
+% \end{macrocode}
+
+
+
+
% \subsection{Handling \&, @, !, and bar}
%
% \begin{minipage}{\linewidth}
@@ -25800,12 +26334,12 @@
% \begin{macro}{\LWR at instertatbangcols}
% \begin{macrocode}
\newcommand*{\LWR at insertatbangcols}{%
-\ifbool{LWR at skipatbang}%
-{}%
-{%
- \LWR at printatbang{at}{\arabic{LWR at tableLaTeXcolindex}}%
- \LWR at printatbang{bang}{\arabic{LWR at tableLaTeXcolindex}}%
-}%
+ \ifbool{LWR at skipatbang}%
+ {}%
+ {%
+ \LWR at printatbang{at}{\arabic{LWR at tableLaTeXcolindex}}%
+ \LWR at printatbang{bang}{\arabic{LWR at tableLaTeXcolindex}}%
+ }%
}
% \end{macrocode}
% \end{macro}
@@ -25821,50 +26355,53 @@
%
% \begin{macrocode}
\newcommand*{\LWR at closetabledatacell}{%
-\global\booltrue{LWR at intabularmetadata}%
-\ifbool{LWR at exitingtabular}%
-{%
+ \booltrue{LWR at intabularmetadata}%
+ \ifbool{LWR at exitingtabular}%
+ {%
% \end{macrocode}
% \changes{v0.71}{2019/04/27}{Fix: Tabular par tags.}
% \begin{macrocode}
- \LWR at stoppars%
-}%
-{% not exiting tabular
- \ifboolexpr{bool{LWR at skippingmrowcell} or bool{LWR at skippingmcolrowcell}}%
- {%
+ \LWR at stoppars%
+ }%
+ {% not exiting tabular
+ \ifboolexpr{bool{LWR at skippingmrowcell} or bool{LWR at skippingmcolrowcell}}%
+ {%
% \end{macrocode}
% \changes{v0.71}{2019/04/27}{Fix: Tabular par tags.}
% \begin{macrocode}
- \LWR at stoppars%
+ \LWR at stoppars%
% \end{macrocode}
% If not skipping a \cs{multicolumnrow} cell,
% insert the |@| and |!| columns after this non-existant column.
% \changes{v0.41}{2017/10/03}{Fix: At/bang column with \cs{multirow}.}
% \begin{macrocode}
- \ifbool{LWR at skippingmcolrowcell}%
- {}%
- {\LWR at insertatbangcols}%
- }%
- {% not skippingmrowcell
+ \ifbool{LWR at skippingmcolrowcell}%
+ {}%
+ {\LWR at insertatbangcols}%
+ }%
+ {% not skippingmrowcell
% \end{macrocode}
% Insert any |<| then any |@| and |!| column contents, unless muted
% for the \cs{bottomrule} or a \cs{multicolumn}:
% \changes{v0.41}{2017/10/02}{Fix: Cancel \progcode{\protect\textless} for \cs{multicolumn}.}
% \begin{macrocode}
- \unskip%
- \ifboolexpr{%
- bool{LWR at tabularmutemods} or
- bool{LWR at skipatbang} or
- bool{LWR at emptyatbang}
- }%
- {}%
- {\LWR at getexparray{LWR at colafterspec}{\arabic{LWR at tableLaTeXcolindex}}}%
+ \unskip%
+ \ifboolexpr{%
+ bool{LWR at tabularmutemods} or
+ bool{LWR at skipatbang} or
+ bool{LWR at emptyatbang}
+ }%
+ {}%
+ {%
+ \LWR at getexparray{LWR at colafterspec}%
+ {\arabic{LWR at tableLaTeXcolindex}}%
+ }%
% \end{macrocode}
% Close paragraphs:
% \changes{v0.71}{2019/04/27}{Fix: Tabular par tags.}
% \begin{macrocode}
- \LWR at stoppars%
- \global\boolfalse{LWR at tableparcell}%
+ \LWR at stoppars%
+ \boolfalse{LWR at tableparcell}%
% \end{macrocode}
%
% Close the table data cell.
@@ -25872,28 +26409,29 @@
% Close any color \element{div}s.
% \changes{v0.48}{2018/02/06}{\pkg{colortbl}: Added.}
% \begin{macrocode}
- \whileboolexpr{test {\ifnumcomp{\value{LWR at cellcolordepth}}{>}{0}}}{%
- \LWR at htmltag{/div}\LWR at orignewline%
- \addtocounter{LWR at cellcolordepth}{-1}%
- }%
+ \whileboolexpr{test {\ifnumcomp{\value{LWR at cellcolordepth}}{>}{0}}}{%
+ \LWR at htmltag{/div}\LWR at orignewline%
+ \defaddtocounter{LWR at cellcolordepth}{-1}%
+ }%
% \end{macrocode}
% Skip the |@| and |!| cells if are closing a multicolumn cell.
% \begin{macrocode}
- \leavevmode\unskip\LWR at htmltag{/td}\LWR at orignewline%
- \global\booltrue{LWR at tabularcelladded}%
- \LWR at insertatbangcols%
- }% not skipping mrowcell
-}% not exiting tabular
-\global\boolfalse{LWR at skippingmrowcell}%
-\global\boolfalse{LWR at skippingmcolrowcell}%
-\global\boolfalse{LWR at skipatbang}%
+ \leavevmode\unskip\LWR at htmltag{/td}\LWR at orignewline%
+ \global\booltrue{LWR at tabularcelladded}%
+ \LWR at insertatbangcols%
+ }% not skipping mrowcell
+ }% not exiting tabular
+ \boolfalse{LWR at skippingmrowcell}%
+ \boolfalse{LWR at skippingmcolrowcell}%
+ \boolfalse{LWR at skipatbang}%
% \end{macrocode}
% Color control. Column is set by |>{}| for each cell, so it must be cleared here.
% \changes{v0.48}{2018/02/06}{\pkg{colortbl}: Added.}
+% \changes{v0.79}{2020/01/18}{Fix: Nested \env{tabular}s.}
% \begin{macrocode}
-\gdef\LWR at cellHTMLcolor{}
-\gdef\LWR at columnHTMLcolor{}
-\setcounter{LWR at cellcolordepth}{0}
+ \def\LWR at cellHTMLcolor{}%
+ \def\LWR at columnHTMLcolor{}%
+ \defcounter{LWR at cellcolordepth}{0}%
}
% \end{macrocode}
% \end{macro}
@@ -25928,31 +26466,33 @@
%
% \begin{macrocode}
\newcommand*{\LWR at tabularampersand}{%
-\LWR at traceinfo{LWR at tabularampersand}%
-\ifnumcomp{\value{LWR at tabulardepth}}{>}{0}%
-{%
+ \LWR at traceinfo{LWR at tabularampersand}%
+ \ifnumcomp{\value{LWR at tabulardepth}}{>}{0}%
+ {%
% \end{macrocode}
% If not skipping a multirow cell, close the current data cell.
% \begin{macrocode}
- \unskip%
- \LWR at closetabledatacell%
+ \unskip%
+ \LWR at closetabledatacell%
% \end{macrocode}
% Move to the next column.
% \begin{macrocode}
- \addtocounter{LWR at tableLaTeXcolindex}{1}%
+ \defaddtocounter{LWR at tableLaTeXcolindex}{1}%
% \end{macrocode}
% Have not yet added data in this column:
% \begin{macrocode}
- \global\boolfalse{LWR at tabularcelladded}%
+ \global\boolfalse{LWR at tabularcelladded}%
% \end{macrocode}
% Look at the next token to decide multi or single column data tag.
% \begin{macrocode}
- \LWR at getmynexttoken%
-}%
+ \LWR at getmynexttoken%
+ }%
% \end{macrocode}
% If not inside a tabular, performs the original action:
% \begin{macrocode}
-{\LWR at origampmacro}%
+ {%
+ \LWR at origampmacro%
+ }%
}
% \end{macrocode}
% |&| is left with its original catcode for now.
@@ -25984,14 +26524,14 @@
% If not exiting the tabular, or doing a rule, or have already started a row,
% finish this row:
% \begin{macrocode}
-\ifboolexpr{%
- not bool {LWR at exitingtabular} or%
- bool{LWR at doingtbrule} or%
- bool{LWR at doingcmidrule} or%
- test{\ifnumcomp{\value{LWR at hlines}}{>}{0}} or%
- test{\ifnumcomp{\value{LWR at hdashedlines}}{>}{0}} or%
- bool{LWR at startedrow}%
-}{%
+ \ifboolexpr{%
+ not bool {LWR at exitingtabular} or%
+ bool{LWR at doingtbrule} or%
+ bool{LWR at doingcmidrule} or%
+ test{\ifnumcomp{\value{LWR at hlines}}{>}{0}} or%
+ test{\ifnumcomp{\value{LWR at hdashedlines}}{>}{0}} or%
+ bool{LWR at startedrow}%
+ }{%
% \end{macrocode}
% To temporarily turn off |LWR at exitingtabular| so that
% table data tags will still be generated:
@@ -25999,60 +26539,63 @@
% If generating a final row for the \cs{bottomrule} borders,
% turn off the |@|, |!|, |<|, and |>| column output:
% \begin{macrocode}
-\ifbool{LWR at exitingtabular}{%
- \global\booltrue{LWR at tabularmutemods}%
-}{%
- \global\boolfalse{LWR at tabularmutemods}%
-}%
+ \ifbool{LWR at exitingtabular}{%
+ \booltrue{LWR at tabularmutemods}%
+ }{%
+ \boolfalse{LWR at tabularmutemods}%
+ }%
% \end{macrocode}
% Locally reenable the table data tags until finished with the final row:
% \begin{macrocode}
-\global\boolfalse{LWR at exitingtabular}%
+ \boolfalse{LWR at exitingtabular}%
% \end{macrocode}
% Generate table data tags and ampersands until the right edge:
% \begin{macrocode}
-\whileboolexpr{%
- test {
- \ifnumcomp{\value{LWR at tableLaTeXcolindex}}{<}{\value{LWR at tabletotalLaTeXcols}}
- } or %
- (%
- bool{LWR at intabularmetadata} and%
- not bool{LWR at tabularcelladded} and%
+ \whileboolexpr{%
test {
- \ifnumcomp{\value{LWR at tableLaTeXcolindex}}{=}{\value{LWR at tabletotalLaTeXcols}}
- }%
- )%
-}%
-{%
- \LWR at tabledatasinglecolumntag%
+ \ifnumcomp{\value{LWR at tableLaTeXcolindex}}{<}
+ {\value{LWR at tabletotalLaTeXcols}}
+ } or %
+ (%
+ bool{LWR at intabularmetadata} and%
+ not bool{LWR at tabularcelladded} and%
+ test {
+ \ifnumcomp{\value{LWR at tableLaTeXcolindex}}{=}
+ {\value{LWR at tabletotalLaTeXcols}}
+ }%
+ )%
+ }%
+ {%
+ \LWR at tabledatasinglecolumntag%
% \end{macrocode}
% The following is essentially \cs{LWR at tabularampersand} with
% |LWR at emptyatbang| added to empty the following cells:
% \begin{macrocode}
- \LWR at closetabledatacell%
- \addtocounter{LWR at tableLaTeXcolindex}{1}%
- \global\boolfalse{LWR at tabularcelladded}%
- \global\booltrue{LWR at emptyatbang}%
+ \LWR at closetabledatacell%
+ \defaddtocounter{LWR at tableLaTeXcolindex}{1}%
+ \global\boolfalse{LWR at tabularcelladded}%
+ \booltrue{LWR at emptyatbang}%
% \end{macrocode}
% Starts the next cell:
% \begin{macrocode}
- \ifnumcomp{\value{LWR at tableLaTeXcolindex}}{<}{\value{LWR at tabletotalLaTeXcols}}%
- {\LWR at getmynexttoken}%
- {}%
-}%
+ \ifnumcomp{\value{LWR at tableLaTeXcolindex}}{<}
+ {\value{LWR at tabletotalLaTeXcols}}%
+ {\LWR at getmynexttoken}%
+ {}%
+ }%
% \end{macrocode}
% Reenable the original |LWR at exitingtabular| to close the entire table:
% \begin{macrocode}
-\ifbool{LWR at tabularmutemods}{%
- \global\booltrue{LWR at exitingtabular}%
-}{%
- \global\boolfalse{LWR at exitingtabular}%
-}%
-\global\boolfalse{LWR at tabularmutemods}%
+ \ifbool{LWR at tabularmutemods}{%
+ \booltrue{LWR at exitingtabular}%
+ }{%
+ \boolfalse{LWR at exitingtabular}%
+ }%
+ \boolfalse{LWR at tabularmutemods}%
% \end{macrocode}
% \begin{macrocode}
-\global\boolfalse{LWR at emptyatbang}%
-}{}% ifboolexpr
+ \boolfalse{LWR at emptyatbang}%
+ }{}% ifboolexpr
}
% \end{macrocode}
% \end{macro}
@@ -26072,51 +26615,55 @@
% \end{macrocode}
% Finish the row:
% \begin{macrocode}
-\ifnumcomp{\value{LWR at tableLaTeXcolindex}}{<}{\value{LWR at tabletotalLaTeXcols}}%
- {\LWR at tabularfinishrow}%
- {\LWR at closetabledatacell}%
-\LWR at htmltag{/tr}\LWR at orignewline%
+ \ifnumcomp{\value{LWR at tableLaTeXcolindex}}{<}
+ {\value{LWR at tabletotalLaTeXcols}}%
+ {\LWR at tabularfinishrow}%
+ {\LWR at closetabledatacell}%
+ \LWR at htmltag{/tr}\LWR at orignewline%
% \end{macrocode}
% \pkg{xcolor} row color support:
% \begin{macrocode}
-\@rowc at lors%
+ \@rowc at lors%
% \end{macrocode}
% No longer inside a data cell:
% \begin{macrocode}
-\global\booltrue{LWR at intabularmetadata}%
+ \booltrue{LWR at intabularmetadata}%
% \end{macrocode}
% Not yet started a table row:
% \begin{macrocode}
-\global\boolfalse{LWR at startedrow}%
+ \boolfalse{LWR at startedrow}%
% \end{macrocode}
% Additional setup:
% \begin{macrocode}
-\setcounter{LWR at hlines}{0}%
-\setcounter{LWR at hdashedlines}{0}%
-\global\boolfalse{LWR at doingtbrule}%
-\global\boolfalse{LWR at doingcmidrule}%
-\LWR at clearmidrules%
-\gdef\LWR at rowHTMLcolor{}%
+ \defcounter{LWR at hlines}{0}%
+ \defcounter{LWR at hdashedlines}{0}%
+ \boolfalse{LWR at doingtbrule}%
+ \boolfalse{LWR at doingcmidrule}%
+ \LWR at clearmidrules%
% \end{macrocode}
+% \changes{v0.79}{2020/01/18}{Fix: Nested \env{tabular}s.}
+% \begin{macrocode}
+ \def\LWR at rowHTMLcolor{}%
+% \end{macrocode}
% Start at first column:
% \begin{macrocode}
-\setcounter{LWR at tableLaTeXcolindex}{1}%
+ \defcounter{LWR at tableLaTeXcolindex}{1}%
% \end{macrocode}
% Have not yet added data in this column:
% \begin{macrocode}
-\global\boolfalse{LWR at tabularcelladded}%
+ \global\boolfalse{LWR at tabularcelladded}%
% \end{macrocode}
% Allow \TeX\ to flush the pending paragraph.
% Not doing so causes a slowdown for very large tables.
% \changes{v0.60}{2018/09/17}{Fix: Slowdown for long tables.}
% \begin{macrocode}
-\LWR at stoppars
-\LWR at origpar
+ \LWR at stoppars%
+ \LWR at origpar%
% \end{macrocode}
% Look at the next token to decide between single column data tag
% or a special case:
% \begin{macrocode}
-\LWR at getmynexttoken%
+ \LWR at getmynexttoken%
}
% \end{macrocode}
% \end{macro}
@@ -26132,16 +26679,16 @@
% The |w| column alignment will be seen as a single unit such as |{c}|.
% \begin{macrocode}
\newcommand*{\LWR at columnspeclookahead}[1]{%
-\setcounter{LWR at tempcountone}{\value{LWR at tablecolspecindex}}%
-\addtocounter{LWR at tempcountone}{#1}%
-\fullexpandarg%
-\StrChar{\LWR at origcolspec}{\arabic{LWR at tempcountone}}[\LWR at strresulttwo]%
+ \setcounter{LWR at tempcountone}{\value{LWR at tablecolspecindex}}%
+ \addtocounter{LWR at tempcountone}{#1}%
+ \fullexpandarg%
+ \StrChar{\LWR at origcolspec}{\arabic{LWR at tempcountone}}[\LWR at strresulttwo]%
% \end{macrocode}
% Get the contents of the first group in \cs{LWR at strresulttwo}:
% \begin{macrocode}
-\exploregroups%
-\StrChar{\LWR at strresulttwo}{1}[\LWR at strresulttwo]%
-\noexploregroups%
+ \exploregroups%
+ \StrChar{\LWR at strresulttwo}{1}[\LWR at strresulttwo]%
+ \noexploregroups%
}
% \end{macrocode}
% \end{macro}
@@ -26155,6 +26702,7 @@
\newcommand*{\LWR at colparameter}{}
% \end{macrocode}
%
+%
% \begin{macro}{\LWR at parseatcolumn}
%
% Handles |@{text}| columns.
@@ -26166,36 +26714,40 @@
% \end{macrocode}
% Move to the next token after the '@':
% \begin{macrocode}
-\LWR at traceinfo{at column}%
-\addtocounter{LWR at tablecolspecindex}{1}%
+ \LWR at traceinfo{at column}%
+ \defaddtocounter{LWR at tablecolspecindex}{1}%
% \end{macrocode}
% Read the next token into \cs{LWR at colparameter}, expanding once:
% \begin{macrocode}
-\LWR at traceinfo{about to read the next token:}%
-\expandarg%
-\StrChar{\LWR at origcolspec}%
- {\arabic{LWR at tablecolspecindex}}[\LWR at colparameter]
-\fullexpandarg%
+ \LWR at traceinfo{about to read the next token:}%
+ \expandarg%
+ \StrChar{\LWR at origcolspec}%
+ {\arabic{LWR at tablecolspecindex}}[\LWR at colparameter]%
+ \fullexpandarg%
% \end{macrocode}
% Store the result into a data array, expanding once out of \cs{LWR at colparameter}:
+% \changes{v0.79}{2020/01/16}{Remove outermost braces.}
% \begin{macrocode}
-\LWR at traceinfo{have now read the next token}%
-\ifnumcomp{\value{LWR at tabletotalLaTeXcols}}{=}{0}%
-{% left edge of the table:
- \LWR at traceinfo{at the left edge}%
- \LWR at setexparray{LWR at colatspec}{leftedge}{\LWR at colparameter}%
- \LWR at traceinfo{at the left edge: %
- \LWR at getexparray{LWR at colatspec}{leftedge}}%
-}%
-{% not at the left edge:
- \LWR at traceinfo{not at the left edge}%
- \LWR at setexparray{LWR at colatspec}%
- {\arabic{LWR at tabletotalLaTeXcols}}{\LWR at colparameter}%
- \LWR at traceinfo{at \arabic{LWR at tabletotalLaTeXcols}: %
- \LWR at getexparray{LWR at colatspec}{\arabic{LWR at tabletotalLaTeXcols}}}%
-}%
-\let\LWR at colparameter\relax%
-\global\booltrue{LWR at validtablecol}%
+ \LWR at traceinfo{have now read the next token}%
+ \ifnumcomp{\value{LWR at tabletotalLaTeXcols}}{=}{0}%
+ {% left edge of the table:
+ \LWR at traceinfo{at the left edge}%
+ \LWR at setexparray{LWR at colatspec}%
+ {leftedge}%
+ {\expandafter\@firstofone\LWR at colparameter}%
+ \LWR at traceinfo{at the left edge: %
+ \LWR at getexparray{LWR at colatspec}{leftedge}}%
+ }%
+ {% not at the left edge:
+ \LWR at traceinfo{not at the left edge}%
+ \LWR at setexparray{LWR at colatspec}%
+ {\arabic{LWR at tabletotalLaTeXcols}}%
+ {\expandafter\@firstofone\LWR at colparameter}%
+ \LWR at traceinfo{at \arabic{LWR at tabletotalLaTeXcols}: %
+ \LWR at getexparray{LWR at colatspec}{\arabic{LWR at tabletotalLaTeXcols}}}%
+ }%
+ \let\LWR at colparameter\relax%
+ \booltrue{LWR at validtablecol}%
}
% \end{macrocode}
% \end{macro}
@@ -26211,34 +26763,38 @@
% \end{macrocode}
% Move to the next token after the '!':
% \begin{macrocode}
-\LWR at traceinfo{bang column}%
-\addtocounter{LWR at tablecolspecindex}{1}%
+ \LWR at traceinfo{bang column}%
+ \defaddtocounter{LWR at tablecolspecindex}{1}%
% \end{macrocode}
% Read the next token into \cs{LWR at colparameter}, expanding once:
% \begin{macrocode}
-\LWR at traceinfo{about to read the next token:}%
-\expandarg%
-\StrChar{\LWR at origcolspec}%
- {\arabic{LWR at tablecolspecindex}}[\LWR at colparameter]
-\fullexpandarg%
+ \LWR at traceinfo{about to read the next token:}%
+ \expandarg%
+ \StrChar{\LWR at origcolspec}%
+ {\arabic{LWR at tablecolspecindex}}[\LWR at colparameter]%
+ \fullexpandarg%
% \end{macrocode}
% Store the result into a data array,
% expanding once out of \cs{LWR at colparameter}:
+% \changes{v0.79}{2020/01/16}{Remove outermost braces.}
% \begin{macrocode}
-\LWR at traceinfo{have now read the next token}%
-\ifnumcomp{\value{LWR at tabletotalLaTeXcols}}{=}{0}%
-{% left edge of the table:
- \LWR at traceinfo{at the left edge}%
- \LWR at setexparray{LWR at colbangspec}{leftedge}{\LWR at colparameter}%
-}%
-{% not at the left edge:
- \LWR at traceinfo{not at the left edge}%
- \LWR at setexparray{LWR at colbangspec}%
- {\arabic{LWR at tabletotalLaTeXcols}}{\LWR at colparameter}%
- \LWR at traceinfo{bang \arabic{LWR at tabletotalLaTeXcols}: \LWR at colparameter!}%
-}%
-\let\LWR at colparameter\relax%
-\global\booltrue{LWR at validtablecol}%
+ \LWR at traceinfo{have now read the next token}%
+ \ifnumcomp{\value{LWR at tabletotalLaTeXcols}}{=}{0}%
+ {% left edge of the table:
+ \LWR at traceinfo{at the left edge}%
+ \LWR at setexparray{LWR at colbangspec}%
+ {leftedge}%
+ {\expandafter\@firstofone\LWR at colparameter}%
+ }%
+ {% not at the left edge:
+ \LWR at traceinfo{not at the left edge}%
+ \LWR at setexparray{LWR at colbangspec}%
+ {\arabic{LWR at tabletotalLaTeXcols}}%
+ {\expandafter\@firstofone\LWR at colparameter}%
+ \LWR at traceinfo{bang \arabic{LWR at tabletotalLaTeXcols}: \LWR at colparameter!}%
+ }%
+ \let\LWR at colparameter\relax%
+ \booltrue{LWR at validtablecol}%
}
% \end{macrocode}
% \end{macro}
@@ -26254,21 +26810,23 @@
% \end{macrocode}
% Move to the next token after the '>':
% \begin{macrocode}
-\addtocounter{LWR at tablecolspecindex}{1}%
+ \defaddtocounter{LWR at tablecolspecindex}{1}%
% \end{macrocode}
% Read the next token, expanding once into \cs{LWR at colparameter}:
% \begin{macrocode}
-\expandarg%
-\StrChar{\LWR at origcolspec}%
- {\arabic{LWR at tablecolspecindex}}[\LWR at colparameter]%
-\fullexpandarg%
+ \expandarg%
+ \StrChar{\LWR at origcolspec}%
+ {\arabic{LWR at tablecolspecindex}}[\LWR at colparameter]%
+ \fullexpandarg%
% \end{macrocode}
% Store the result into a data array, expanding once out of \cs{LWR at colparameter}:
+% \changes{v0.79}{2020/01/16}{Remove outermost braces.}
% \begin{macrocode}
-\LWR at setexparray{LWR at colbeforespec}%
- {\arabic{LWR at tabletotalLaTeXcolsnext}}{\LWR at colparameter}%
-\let\LWR at colparameter\relax%
-\global\booltrue{LWR at validtablecol}%
+ \LWR at setexparray{LWR at colbeforespec}%
+ {\arabic{LWR at tabletotalLaTeXcolsnext}}%
+ {\expandafter\@firstofone\LWR at colparameter}%
+ \let\LWR at colparameter\relax%
+ \booltrue{LWR at validtablecol}%
}
% \end{macrocode}
% \end{macro}
@@ -26282,21 +26840,23 @@
% \end{macrocode}
% Move to the next token after the '<':
% \begin{macrocode}
-\addtocounter{LWR at tablecolspecindex}{1}%
+ \defaddtocounter{LWR at tablecolspecindex}{1}%
% \end{macrocode}
% Read the next token, expanding once into \cs{LWR at colparameter}:
% \begin{macrocode}
-\expandarg%
-\StrChar{\LWR at origcolspec}%
- {\arabic{LWR at tablecolspecindex}}[\LWR at colparameter]%
-\fullexpandarg%
+ \expandarg%
+ \StrChar{\LWR at origcolspec}%
+ {\arabic{LWR at tablecolspecindex}}[\LWR at colparameter]%
+ \fullexpandarg%
% \end{macrocode}
% Store the result into a data array, expanding once out of \cs{LWR at colparameter}:
+% \changes{v0.79}{2020/01/16}{Remove outermost braces.}
% \begin{macrocode}
-\LWR at setexparray{LWR at colafterspec}%
- {\arabic{LWR at tabletotalLaTeXcols}}{\LWR at colparameter}%
-\let\LWR at colparameter\relax%
-\global\booltrue{LWR at validtablecol}%
+ \LWR at setexparray{LWR at colafterspec}%
+ {\arabic{LWR at tabletotalLaTeXcols}}%
+ {\expandafter\@firstofone\LWR at colparameter}%
+ \let\LWR at colparameter\relax%
+ \booltrue{LWR at validtablecol}%
}
% \end{macrocode}
% \end{macro}
@@ -26309,32 +26869,32 @@
%
% \begin{macrocode}
\newcommand*{\LWR at parsebarcolumn}{%
-\LWR at traceinfo{LWR at parsebarcolumn}%
+ \LWR at traceinfo{LWR at parsebarcolumn}%
% \end{macrocode}
% Remember the bar at this position:
% \begin{macrocode}
-\ifnumcomp{\value{LWR at tabletotalLaTeXcols}}{=}{0}%
-{% left edge of the table:
- \edef\LWR at tempone{\LWR at getexparray{LWR at colbarspec}{leftedge}}%
- \ifdefstring{\LWR at tempone}{tvertbarl}%
- {\LWR at setexparray{LWR at colbarspec}{leftedge}{tvertbarldouble}}%
- {\LWR at setexparray{LWR at colbarspec}{leftedge}{tvertbarl}}%
-}%
-{% not at the left edge:
- \edef\LWR at tempone{%
- \LWR at getexparray{LWR at colbarspec}{\arabic{LWR at tabletotalLaTeXcols}}%
+ \ifnumcomp{\value{LWR at tabletotalLaTeXcols}}{=}{0}%
+ {% left edge of the table:
+ \edef\LWR at tempone{\LWR at getexparray{LWR at colbarspec}{leftedge}}%
+ \ifdefstring{\LWR at tempone}{tvertbarl}%
+ {\LWR at setexparray{LWR at colbarspec}{leftedge}{tvertbarldouble}}%
+ {\LWR at setexparray{LWR at colbarspec}{leftedge}{tvertbarl}}%
}%
- \ifdefstring{\LWR at tempone}{tvertbarr}%
- {%
- \LWR at setexparray{LWR at colbarspec}%
- {\arabic{LWR at tabletotalLaTeXcols}}{tvertbarrdouble}%
+ {% not at the left edge:
+ \edef\LWR at tempone{%
+ \LWR at getexparray{LWR at colbarspec}{\arabic{LWR at tabletotalLaTeXcols}}%
+ }%
+ \ifdefstring{\LWR at tempone}{tvertbarr}%
+ {%
+ \LWR at setexparray{LWR at colbarspec}%
+ {\arabic{LWR at tabletotalLaTeXcols}}{tvertbarrdouble}%
+ }%
+ {%
+ \LWR at setexparray{LWR at colbarspec}%
+ {\arabic{LWR at tabletotalLaTeXcols}}{tvertbarr}%
+ }%
}%
- {%
- \LWR at setexparray{LWR at colbarspec}%
- {\arabic{LWR at tabletotalLaTeXcols}}{tvertbarr}%
- }%
-}%
-\global\booltrue{LWR at validtablecol}%
+ \booltrue{LWR at validtablecol}%
}
% \end{macrocode}
% \end{macro}
@@ -26345,28 +26905,28 @@
% \changes{v0.56}{2018/05/04}{\pkg{arydshln}: Added.}
% \begin{macrocode}
\newcommand*{\LWR at parsecoloncolumn}{%
-\LWR at traceinfo{LWR at parsecoloncolumn}%
+ \LWR at traceinfo{LWR at parsecoloncolumn}%
% \end{macrocode}
% Remember the bar at this position:
% \begin{macrocode}
-\ifnumcomp{\value{LWR at tabletotalLaTeXcols}}{=}{0}%
-{% left edge of the table:
- \edef\LWR at tempone{\LWR at getexparray{LWR at colbarspec}{leftedge}}%
- \ifdefstring{\LWR at tempone}{tvertbarldash}%
- {\LWR at setexparray{LWR at colbarspec}{leftedge}{tvertbarldoubledash}}%
- {\LWR at setexparray{LWR at colbarspec}{leftedge}{tvertbarldash}}%
-}%
-{% not at the left edge:
- \edef\LWR at tempone{%
- \LWR at getexparray{LWR at colbarspec}{\arabic{LWR at tabletotalLaTeXcols}}%
+ \ifnumcomp{\value{LWR at tabletotalLaTeXcols}}{=}{0}%
+ {% left edge of the table:
+ \edef\LWR at tempone{\LWR at getexparray{LWR at colbarspec}{leftedge}}%
+ \ifdefstring{\LWR at tempone}{tvertbarldash}%
+ {\LWR at setexparray{LWR at colbarspec}{leftedge}{tvertbarldoubledash}}%
+ {\LWR at setexparray{LWR at colbarspec}{leftedge}{tvertbarldash}}%
}%
- \ifdefstring{\LWR at tempone}{tvertbarrdash}%
- {\LWR at setexparray{LWR at colbarspec}%
- {\arabic{LWR at tabletotalLaTeXcols}}{tvertbarrdoubledash}}%
- {\LWR at setexparray{LWR at colbarspec}%
- {\arabic{LWR at tabletotalLaTeXcols}}{tvertbarrdash}}%
-}%
-\global\booltrue{LWR at validtablecol}%
+ {% not at the left edge:
+ \edef\LWR at tempone{%
+ \LWR at getexparray{LWR at colbarspec}{\arabic{LWR at tabletotalLaTeXcols}}%
+ }%
+ \ifdefstring{\LWR at tempone}{tvertbarrdash}%
+ {\LWR at setexparray{LWR at colbarspec}%
+ {\arabic{LWR at tabletotalLaTeXcols}}{tvertbarrdoubledash}}%
+ {\LWR at setexparray{LWR at colbarspec}%
+ {\arabic{LWR at tabletotalLaTeXcols}}{tvertbarrdash}}%
+ }%
+ \booltrue{LWR at validtablecol}%
}
% \end{macrocode}
% \end{macro}
@@ -26380,11 +26940,11 @@
% \end{macrocode}
% Treat |;| as a |:| column:
% \begin{macrocode}
-\LWR at parsecoloncolumn%
+ \LWR at parsecoloncolumn%
% \end{macrocode}
% Skip the following width token:
% \begin{macrocode}
-\addtocounter{LWR at tablecolspecindex}{1}%
+ \defaddtocounter{LWR at tablecolspecindex}{1}%
}
% \end{macrocode}
% \end{macro}
@@ -26398,21 +26958,21 @@
% and pre-clear another column of at, before, and after specs.
% \begin{macrocode}
\newcommand*{\LWR at parsenormalcolumn}[1]{%
-\addtocounter{LWR at tabletotalLaTeXcols}{1}%
-\addtocounter{LWR at tabletotalLaTeXcolsnext}{1}%
+ \defaddtocounter{LWR at tabletotalLaTeXcols}{1}%
+ \defaddtocounter{LWR at tabletotalLaTeXcolsnext}{1}%
% \end{macrocode}
% \changes{v0.60}{2018/09/17}{\env{tabular}: Improved memory management: Not using \pkg{xstring}.}
% \begin{macrocode}
-\LWR at setexparray{LWR at tablecolspec}{\arabic{LWR at tabletotalLaTeXcols}}{#1}%
+ \LWR at setexparray{LWR at tablecolspec}{\arabic{LWR at tabletotalLaTeXcols}}{#1}%
% \end{macrocode}
% \begin{macrocode}
-\LWR at traceinfo{normal column \arabic{LWR at tabletotalLaTeXcols}: #1}%
-\LWR at setexparray{LWR at colatspec}{\arabic{LWR at tabletotalLaTeXcolsnext}}{}%
-\LWR at setexparray{LWR at colbangspec}{\arabic{LWR at tabletotalLaTeXcolsnext}}{}%
-\LWR at setexparray{LWR at colbeforespec}{\arabic{LWR at tabletotalLaTeXcolsnext}}{}%
-\LWR at setexparray{LWR at colafterspec}{\arabic{LWR at tabletotalLaTeXcolsnext}}{}%
-\LWR at setexparray{LWR at colbarspec}{\arabic{LWR at tabletotalLaTeXcolsnext}}{}%
-\global\booltrue{LWR at validtablecol}%
+ \LWR at traceinfo{normal column \arabic{LWR at tabletotalLaTeXcols}: #1}%
+ \LWR at setexparray{LWR at colatspec}{\arabic{LWR at tabletotalLaTeXcolsnext}}{}%
+ \LWR at setexparray{LWR at colbangspec}{\arabic{LWR at tabletotalLaTeXcolsnext}}{}%
+ \LWR at setexparray{LWR at colbeforespec}{\arabic{LWR at tabletotalLaTeXcolsnext}}{}%
+ \LWR at setexparray{LWR at colafterspec}{\arabic{LWR at tabletotalLaTeXcolsnext}}{}%
+ \LWR at setexparray{LWR at colbarspec}{\arabic{LWR at tabletotalLaTeXcolsnext}}{}%
+ \booltrue{LWR at validtablecol}%
}
% \end{macrocode}
% \end{macro}
@@ -26427,11 +26987,11 @@
% \end{macrocode}
% Converts to the given column type:
% \begin{macrocode}
-\LWR at parsenormalcolumn{#1}%
+ \LWR at parsenormalcolumn{#1}%
% \end{macrocode}
% Skips the following width token:
% \begin{macrocode}
-\addtocounter{LWR at tablecolspecindex}{1}%
+ \defaddtocounter{LWR at tablecolspecindex}{1}%
}
% \end{macrocode}
% \end{macro}
@@ -26445,12 +27005,12 @@
\newcommand*{\LWR at parsewcolumn}{%
% \end{macrocode}
% \begin{macrocode}
-\LWR at columnspeclookahead{1}%
-\expandafter\LWR at parsenormalcolumn\expandafter{\LWR at strresulttwo}%
+ \LWR at columnspeclookahead{1}%
+ \expandafter\LWR at parsenormalcolumn\expandafter{\LWR at strresulttwo}%
% \end{macrocode}
% Skips the following width and alignment tokens:
% \begin{macrocode}
-\addtocounter{LWR at tablecolspecindex}{2}%
+ \defaddtocounter{LWR at tablecolspecindex}{2}%
}
% \end{macrocode}
% \end{macro}
@@ -26462,7 +27022,7 @@
% Star columns should already have been expanded, so this should never be used.
% \begin{macrocode}
\newcommand*{\LWR at parsestarcolumn}{%
- \addtocounter{LWR at tablecolspecindex}{2}%
+ \defaddtocounter{LWR at tablecolspecindex}{2}%
}
% \end{macrocode}
% \end{macro}
@@ -26482,17 +27042,17 @@
% \end{macrocode}
% Converts to the given column type.
% \begin{macrocode}
-\LWR at parsenormalcolumn{#1}%
+ \LWR at parsenormalcolumn{#1}%
% \end{macrocode}
% Skips the following three parameters.
% \begin{macrocode}
-\addtocounter{LWR at tablecolspecindex}{3}%
+ \defaddtocounter{LWR at tablecolspecindex}{3}%
}
% \end{macrocode}
% \end{macro}
-% \subsection{Expanding the star column specifiations}
+% \subsection{Expanding the star column specifications}
% \DescribeCounter{LWR at starcount}
% Internal count for duplicating star columns.
@@ -26670,18 +27230,7 @@
% \end{table}
%
%
-% \DescribeBoolean{LWR at validtablecol} True if found a valid table column type.
-% \begin{macrocode}
-\newbool{LWR at validtablecol}
-% \end{macrocode}
%
-%
-% \DescribeBoolean{LWR at opttablecol} True if found a table column optional argument.
-% \begin{macrocode}
-\newbool{LWR at opttablecol}
-% \end{macrocode}
-%
-%
% \begin{macro}{\LWR at parsetablecols} \marg{colspecs}
%
% Scans the column specification left to right.
@@ -26700,22 +27249,22 @@
%
% \begin{macrocode}
\newcommand*{\LWR at parsetablecols}[1]{%
-\LWR at traceinfo{LWR at parsetablecols}%
+ \LWR at traceinfo{LWR at parsetablecols}%
% \end{macrocode}
% Remember the original supplied column spec:
% \begin{macrocode}
-\renewcommand*{\LWR at origcolspec}{#1}%
+ \renewcommand*{\LWR at origcolspec}{#1}%
% \end{macrocode}
% Remove spaces:
% \changes{v0.43}{2017/11/01}{Ignore spaces in col spec.}
% \begin{macrocode}
-\expandarg%
-\StrSubstitute{\LWR at origcolspec}{ }{}[\LWR at origcolspec]%
+ \expandarg%
+ \StrSubstitute{\LWR at origcolspec}{ }{}[\LWR at origcolspec]%
% \end{macrocode}
%
% Expand any star columns:
% \begin{macrocode}
-\expandcolspec%
+ \expandcolspec%
% \end{macrocode}
%
% The parsed column spec data array, |LWR at tablecolspec|,
@@ -26724,123 +27273,123 @@
% Total number of columns found so far.
% Also pre-initialize the first several columns of specs:
% \begin{macrocode}
-\setcounter{LWR at tabletotalLaTeXcols}{0}%
-\setcounter{LWR at tabletotalLaTeXcolsnext}{1}%
-\LWR at setexparray{LWR at colatspec}{leftedge}{}%
-\LWR at setexparray{LWR at colatspec}{1}{}%
-\LWR at setexparray{LWR at colatspec}{2}{}%
-\LWR at setexparray{LWR at colatspec}{3}{}%
-\LWR at setexparray{LWR at colbangspec}{leftedge}{}%
-\LWR at setexparray{LWR at colbangspec}{1}{}%
-\LWR at setexparray{LWR at colbangspec}{2}{}%
-\LWR at setexparray{LWR at colbangspec}{3}{}%
-\LWR at setexparray{LWR at colbeforespec}{1}{}%
-\LWR at setexparray{LWR at colbeforespec}{2}{}%
-\LWR at setexparray{LWR at colbeforespec}{3}{}%
-\LWR at setexparray{LWR at colafterspec}{1}{}%
-\LWR at setexparray{LWR at colafterspec}{2}{}%
-\LWR at setexparray{LWR at colafterspec}{3}{}%
-\LWR at setexparray{LWR at colbarspec}{leftedge}{}%
-\LWR at setexparray{LWR at colbarspec}{1}{}%
-\LWR at setexparray{LWR at colbarspec}{2}{}%
-\LWR at setexparray{LWR at colbarspec}{3}{}%
+ \defcounter{LWR at tabletotalLaTeXcols}{0}%
+ \defcounter{LWR at tabletotalLaTeXcolsnext}{1}%
+ \LWR at setexparray{LWR at colatspec}{leftedge}{}%
+ \LWR at setexparray{LWR at colatspec}{1}{}%
+ \LWR at setexparray{LWR at colatspec}{2}{}%
+ \LWR at setexparray{LWR at colatspec}{3}{}%
+ \LWR at setexparray{LWR at colbangspec}{leftedge}{}%
+ \LWR at setexparray{LWR at colbangspec}{1}{}%
+ \LWR at setexparray{LWR at colbangspec}{2}{}%
+ \LWR at setexparray{LWR at colbangspec}{3}{}%
+ \LWR at setexparray{LWR at colbeforespec}{1}{}%
+ \LWR at setexparray{LWR at colbeforespec}{2}{}%
+ \LWR at setexparray{LWR at colbeforespec}{3}{}%
+ \LWR at setexparray{LWR at colafterspec}{1}{}%
+ \LWR at setexparray{LWR at colafterspec}{2}{}%
+ \LWR at setexparray{LWR at colafterspec}{3}{}%
+ \LWR at setexparray{LWR at colbarspec}{leftedge}{}%
+ \LWR at setexparray{LWR at colbarspec}{1}{}%
+ \LWR at setexparray{LWR at colbarspec}{2}{}%
+ \LWR at setexparray{LWR at colbarspec}{3}{}%
% \end{macrocode}
% Starting at the first column specification:
% \begin{macrocode}
-\setcounter{LWR at tablecolspecindex}{1}%
+ \defcounter{LWR at tablecolspecindex}{1}%
% \end{macrocode}
% Place the colspecs string length into \cs{LWR at strresult},
% and remember the number of characters in the column specification:
% \begin{macrocode}
-\expandarg%
-\StrLen{\LWR at origcolspec}[\LWR at strresult]%
-\fullexpandarg%
-\LWR at traceinfo{original column spec length: \LWR at strresult}%
-\setcounter{LWR at tablecolspecwidth}{\LWR at strresult}%
+ \expandarg%
+ \StrLen{\LWR at origcolspec}[\LWR at strresult]%
+ \fullexpandarg%
+ \LWR at traceinfo{original column spec length: \LWR at strresult}%
+ \defcounter{LWR at tablecolspecwidth}{\LWR at strresult}%
% \end{macrocode}
% Haven't seen any optional arguments so far
% \begin{macrocode}
-\global\boolfalse{LWR at opttablecol}%
+ \boolfalse{LWR at opttablecol}%
% \end{macrocode}
% Scan through the column specifications:
% \begin{macrocode}
-\whileboolexpr{%
- not test{%
- \ifnumcomp{\value{LWR at tablecolspecindex}}{>}%
- {\value{LWR at tablecolspecwidth}}%
+ \whileboolexpr{%
+ not test{%
+ \ifnumcomp{\value{LWR at tablecolspecindex}}{>}%
+ {\value{LWR at tablecolspecwidth}}%
+ }%
}%
-}%
-{%
+ {%
% \end{macrocode}
% Place the next single-character column type into \cs{LWR at strresult}:
% \begin{macrocode}
-\expandarg%
-\StrChar{\LWR at origcolspec}{\arabic{LWR at tablecolspecindex}}[\LWR at strresult]%
-\LWR at traceinfo{position \arabic{LWR at tablecolspecindex}: \LWR at strresult}%
-\fullexpandarg%
+ \expandarg%
+ \StrChar{\LWR at origcolspec}{\arabic{LWR at tablecolspecindex}}[\LWR at strresult]%
+ \LWR at traceinfo{position \arabic{LWR at tablecolspecindex}: \LWR at strresult}%
+ \fullexpandarg%
% \end{macrocode}
% Not yet found a valid column type:
% \begin{macrocode}
-\global\boolfalse{LWR at validtablecol}%
+ \boolfalse{LWR at validtablecol}%
% \end{macrocode}
%
% Skip over any optional arguments, such as \pkg{siunitx} |S| column:
% \changes{v0.48}{2018/02/04}{Fix: Ignore optional tabular column arguments.}
% \begin{macrocode}
-\IfStrEq{\LWR at strresult}{[}{\global\booltrue{LWR at opttablecol}}{}%
+ \IfStrEq{\LWR at strresult}{[}{\booltrue{LWR at opttablecol}}{}%
% \end{macrocode}
%
% Throw away anything found inside the optional argument:
% \begin{macrocode}
-\ifbool{LWR at opttablecol}%
-{}% inside an optional argument
-{% not an optional tabular argument
+ \ifbool{LWR at opttablecol}%
+ {}% inside an optional argument
+ {% not an optional tabular argument
% \end{macrocode}
% Not inside an optional argument, so consider the column type:
% \begin{macrocode}
-\IfStrEq{\LWR at strresult}{l}{\LWR at parsenormalcolumn{l}}{}%
-\IfStrEq{\LWR at strresult}{c}{\LWR at parsenormalcolumn{c}}{}%
-\IfStrEq{\LWR at strresult}{r}{\LWR at parsenormalcolumn{r}}{}%
-\IfStrEq{\LWR at strresult}{L}{\LWR at parsenormalcolumn{l}}{}%
-\IfStrEq{\LWR at strresult}{C}{\LWR at parsenormalcolumn{c}}{}%
-\IfStrEq{\LWR at strresult}{R}{\LWR at parsenormalcolumn{r}}{}%
-\IfStrEq{\LWR at strresult}{J}{\LWR at parsenormalcolumn{l}}{}%
+ \IfStrEq{\LWR at strresult}{l}{\LWR at parsenormalcolumn{l}}{}%
+ \IfStrEq{\LWR at strresult}{c}{\LWR at parsenormalcolumn{c}}{}%
+ \IfStrEq{\LWR at strresult}{r}{\LWR at parsenormalcolumn{r}}{}%
+ \IfStrEq{\LWR at strresult}{L}{\LWR at parsenormalcolumn{l}}{}%
+ \IfStrEq{\LWR at strresult}{C}{\LWR at parsenormalcolumn{c}}{}%
+ \IfStrEq{\LWR at strresult}{R}{\LWR at parsenormalcolumn{r}}{}%
+ \IfStrEq{\LWR at strresult}{J}{\LWR at parsenormalcolumn{l}}{}%
% \end{macrocode}
% \begin{macrocode}
-\IfStrEq{\LWR at strresult}{S}{\LWR at parsenormalcolumn{c}}{}%
-\IfStrEq{\LWR at strresult}{s}{\LWR at parsenormalcolumn{c}}{}%
+ \IfStrEq{\LWR at strresult}{S}{\LWR at parsenormalcolumn{c}}{}%
+ \IfStrEq{\LWR at strresult}{s}{\LWR at parsenormalcolumn{c}}{}%
% \end{macrocode}
% \begin{macrocode}
-\IfStrEq{\LWR at strresult}{\detokenize{@}}{\LWR at parseatcolumn}{}%
-\IfStrEq{\LWR at strresult}{!}{\LWR at parsebangcolumn}{}%
-\IfStrEq{\LWR at strresult}{>}{\LWR at parsebeforecolumn}{}%
-\IfStrEq{\LWR at strresult}{<}{\LWR at parseaftercolumn}{}%
-\IfStrEq{\LWR at strresult}{|}{\LWR at parsebarcolumn}{}%
-\IfStrEq{\LWR at strresult}{:}{\LWR at parsecoloncolumn}{}%
-\IfStrEq{\LWR at strresult}{;}{\LWR at parsesemicoloncolumn}{}%
+ \IfStrEq{\LWR at strresult}{\detokenize{@}}{\LWR at parseatcolumn}{}%
+ \IfStrEq{\LWR at strresult}{!}{\LWR at parsebangcolumn}{}%
+ \IfStrEq{\LWR at strresult}{>}{\LWR at parsebeforecolumn}{}%
+ \IfStrEq{\LWR at strresult}{<}{\LWR at parseaftercolumn}{}%
+ \IfStrEq{\LWR at strresult}{|}{\LWR at parsebarcolumn}{}%
+ \IfStrEq{\LWR at strresult}{:}{\LWR at parsecoloncolumn}{}%
+ \IfStrEq{\LWR at strresult}{;}{\LWR at parsesemicoloncolumn}{}%
% \end{macrocode}
% \begin{macrocode}
-\IfStrEq{\LWR at strresult}{p}{\LWR at parsepcolumn{p}}{}%
-\IfStrEq{\LWR at strresult}{m}{\LWR at parsepcolumn{m}}{}%
-\IfStrEq{\LWR at strresult}{b}{\LWR at parsepcolumn{b}}{}%
+ \IfStrEq{\LWR at strresult}{p}{\LWR at parsepcolumn{p}}{}%
+ \IfStrEq{\LWR at strresult}{m}{\LWR at parsepcolumn{m}}{}%
+ \IfStrEq{\LWR at strresult}{b}{\LWR at parsepcolumn{b}}{}%
% \end{macrocode}
% \changes{v0.56}{2018/05/10}{Added \pkg{array} \texttt{W} column.}
% \begin{macrocode}
-\IfStrEq{\LWR at strresult}{w}{\LWR at parsewcolumn}{}%
-\IfStrEq{\LWR at strresult}{W}{\LWR at parsewcolumn}{}%
+ \IfStrEq{\LWR at strresult}{w}{\LWR at parsewcolumn}{}%
+ \IfStrEq{\LWR at strresult}{W}{\LWR at parsewcolumn}{}%
% \end{macrocode}
% A star column:
% \begin{macrocode}
-\IfStrEq{\LWR at strresult}{*}{\LWR at parsestarcolumn}{}%
+ \IfStrEq{\LWR at strresult}{*}{\LWR at parsestarcolumn}{}%
% \end{macrocode}
% From the \pkg{dcolumn} package:
% \begin{macrocode}
-\IfStrEq{\LWR at strresult}{D}{\LWR at parseDcolumn{c}}{}%
+ \IfStrEq{\LWR at strresult}{D}{\LWR at parseDcolumn{c}}{}%
% \end{macrocode}
% From the \pkg{tabularx} package.
% X column has no parameter, but will be given paragraph tags.
% \begin{macrocode}
-\IfStrEq{\LWR at strresult}{X}{\LWR at parsenormalcolumn{X}}{}%
+ \IfStrEq{\LWR at strresult}{X}{\LWR at parsenormalcolumn{X}}{}%
% \end{macrocode}
% \begin{docsidebar}
% \raggedright
@@ -26851,26 +27400,26 @@
% \vspace{-\baselineskip}
% \end{docsidebar}
% \begin{macrocode}
-\IfStrEq{\LWR at strresult}{P}{\LWR at parsepcolumn{P}}{}%
-\IfStrEq{\LWR at strresult}{M}{\LWR at parsepcolumn{M}}{}%
-\IfStrEq{\LWR at strresult}{B}{\LWR at parsepcolumn{B}}{}%
+ \IfStrEq{\LWR at strresult}{P}{\LWR at parsepcolumn{P}}{}%
+ \IfStrEq{\LWR at strresult}{M}{\LWR at parsepcolumn{M}}{}%
+ \IfStrEq{\LWR at strresult}{B}{\LWR at parsepcolumn{B}}{}%
% \end{macrocode}
% If this column was an invalid column type, convert it to an |l| column:
% \begin{macrocode}
-\ifbool{LWR at validtablecol}{}{%
- \LWR at traceinfo{invalid column type: \LWR at strresult}%
- \LWR at parsenormalcolumn{l}%
-}%
-}% not an optional column argument
+ \ifbool{LWR at validtablecol}{}{%
+ \LWR at traceinfo{invalid column type: \LWR at strresult}%
+ \LWR at parsenormalcolumn{l}%
+ }%
+ }% not an optional column argument
% \end{macrocode}
% If read the closing bracket, no longer inside the optional argument:
% \begin{macrocode}
-\IfStrEq{\LWR at strresult}{]}{\global\boolfalse{LWR at opttablecol}}{}%
+ \IfStrEq{\LWR at strresult}{]}{\boolfalse{LWR at opttablecol}}{}%
% \end{macrocode}
% Move to the next character:
% \begin{macrocode}
-\addtocounter{LWR at tablecolspecindex}{1}%
-}% whiledo
+ \defaddtocounter{LWR at tablecolspecindex}{1}%
+ }% whiledo
}%
% \end{macrocode}
% \end{macro}
@@ -26979,42 +27528,42 @@
% \begin{macrocode}
\newcommand*{\LWR at maybenewtablerow}
{%
-\ifbool{LWR at startedrow}%
-{}% started the row
-{% not started the row
+ \ifbool{LWR at startedrow}%
+ {}% started the row
+ {% not started the row
% \end{macrocode}
% Remember that now have started the row:
% \begin{macrocode}
- \global\booltrue{LWR at startedrow}%
+ \booltrue{LWR at startedrow}%
% \end{macrocode}
% Create the row tag, with a class if necessary.
% \begin{macrocode}
- \global\booltrue{LWR at intabularmetadata}%
- \ifboolexpr{%
- test{\ifnumcomp{\value{LWR at hlines}}{>}{0}} or%
- test{\ifnumcomp{\value{LWR at hdashedlines}}{>}{0}}%
- }%
- {%
- \LWR at htmltag{tr class="hline" }%
- \LWR at orignewline%
- }%
- {% not doing hline
- \ifbool{LWR at doingtbrule}%
+ \booltrue{LWR at intabularmetadata}%
+ \ifboolexpr{%
+ test{\ifnumcomp{\value{LWR at hlines}}{>}{0}} or%
+ test{\ifnumcomp{\value{LWR at hdashedlines}}{>}{0}}%
+ }%
{%
- \ifdefvoid{\LWR at ruleHTMLcolor}{%
- \LWR at htmltag{tr class="tbrule"}%
- }{%
- \LWR at htmltag{%
- tr class="tbrule" % space
- style="border-top: 1px solid % space
- \LWR at origpound\LWR at ruleHTMLcolor "%
+ \LWR at htmltag{tr class="hline" }%
+ \LWR at orignewline%
+ }%
+ {% not doing hline
+ \ifbool{LWR at doingtbrule}%
+ {%
+ \ifdefvoid{\LWR at ruleHTMLcolor}{%
+ \LWR at htmltag{tr class="tbrule"}%
+ }{%
+ \LWR at htmltag{%
+ tr class="tbrule" % space
+ style="border-top: 1px solid % space
+ \LWR at origpound\LWR at ruleHTMLcolor "%
+ }%
}%
+ \LWR at orignewline%
}%
- \LWR at orignewline%
- }%
- {\LWR at htmltag{tr}\LWR at orignewline}%
- }% end of not doing hline
-}% end of not started the row
+ {\LWR at htmltag{tr}\LWR at orignewline}%
+ }% end of not doing hline
+ }% end of not started the row
}
% \end{macrocode}
% \end{macro}
@@ -27030,20 +27579,20 @@
%
% \begin{macrocode}
\newcommand*{\LWR at printbartag}[1]{%
-\LWR at traceinfo{LWR at printbartag !#1!}%
-\ifboolexpr{bool{LWR at tabularmutemods} or bool{LWR at emptyatbang}}%
-{}% muting or empty
-{% not muting
- \edef\LWR at tempone{\LWR at getexparray{LWR at colbarspec}{#1}}%
- \ifdefempty{\LWR at tempone}{}{ \LWR at tempone}%
-}% not muting
-\LWR at traceinfo{LWR at printbartag done}%
+ \LWR at traceinfo{LWR at printbartag !#1!}%
+ \ifboolexpr{bool{LWR at tabularmutemods} or bool{LWR at emptyatbang}}%
+ {}% muting or empty
+ {% not muting
+ \edef\LWR at tempone{\LWR at getexparray{LWR at colbarspec}{#1}}%
+ \ifdefempty{\LWR at tempone}{}{ \LWR at tempone}%
+ }% not muting
+ \LWR at traceinfo{LWR at printbartag done}%
}
% \end{macrocode}
% \end{macro}
-% \subsection{Printing at or bang tags}
+% \subsection{Printing @ or ! tags}
% \begin{macro}{\LWR at printatbang} \marg{at -or- bang} \marg{index}
%
@@ -27054,35 +27603,35 @@
% \end{macrocode}
% Fetch the column at or bang spec:
% \begin{macrocode}
-\xdef\LWR at atbangspec{\LWR at getexparray{LWR at col#1spec}{#2}}%
-\LWR at traceinfo{atbang: #2 !\LWR at atbangspec!}%
+ \xdef\LWR at atbangspec{\LWR at getexparray{LWR at col#1spec}{#2}}%
+ \LWR at traceinfo{atbang: #2 !\LWR at atbangspec!}%
% \end{macrocode}
% Only generate if is not empty;
% \begin{macrocode}
-\ifdefempty{\LWR at atbangspec}%
-{}%
-{% not empty
- \LWR at htmltag{%
- td class="td#1%
- \LWR at subaddcmidruletrim{}{}%
- \LWR at printbartag{#2}%
- "%
- \LWR at tdstartstyles%
- \LWR at addcmidrulewidth%
- \LWR at addcdashline%
- \LWR at addtabularrulecolors%
- \LWR at tdendstyles%
- }%
+ \ifdefempty{\LWR at atbangspec}%
+ {}%
+ {% not empty
+ \LWR at htmltag{%
+ td class="td#1%
+ \LWR at subaddcmidruletrim{}{}%
+ \LWR at printbartag{#2}%
+ "%
+ \LWR at tdstartstyles%
+ \LWR at addcmidrulewidth%
+ \LWR at addcdashline%
+ \LWR at addtabularrulecolors%
+ \LWR at tdendstyles%
+ }%
% \end{macrocode}
% Create an empty cell if muting for the \cs{bottomrule}:
% \begin{macrocode}
- \ifboolexpr{bool{LWR at tabularmutemods} or bool{LWR at emptyatbang}}%
- {}%
- {\LWR at atbangspec}%
+ \ifboolexpr{bool{LWR at tabularmutemods} or bool{LWR at emptyatbang}}%
+ {}%
+ {\LWR at atbangspec}%
%
- \LWR at htmltag{/td}\LWR at orignewline%
- \global\booltrue{LWR at tabularcelladded}%
-}% not empty
+ \LWR at htmltag{/td}\LWR at orignewline%
+ \global\booltrue{LWR at tabularcelladded}%
+ }% not empty
}%
% \end{macrocode}
% \end{macro}
@@ -27091,9 +27640,9 @@
% \begin{macro}{\LWR at addleftmostbartag}
% \begin{macrocode}
\newcommand*{\LWR at addleftmostbartag}{%
-\ifnumcomp{\value{LWR at tableLaTeXcolindex}}{=}{1}{%
- \LWR at printbartag{leftedge}%
-}{}%
+ \ifnumcomp{\value{LWR at tableLaTeXcolindex}}{=}{1}{%
+ \LWR at printbartag{leftedge}%
+ }{}%
}
% \end{macrocode}
% \end{macro}
@@ -27102,12 +27651,12 @@
% \begin{macro}{\LWR at tabularleftedge}
% \begin{macrocode}
\newcommand*{\LWR at tabularleftedge}{%
-\ifnumcomp{\value{LWR at tableLaTeXcolindex}}{=}{1}%
-{%
- \LWR at printatbang{at}{leftedge}%
- \LWR at printatbang{bang}{leftedge}%
-}% left edge
-{}% not left edge
+ \ifnumcomp{\value{LWR at tableLaTeXcolindex}}{=}{1}%
+ {%
+ \LWR at printatbang{at}{leftedge}%
+ \LWR at printatbang{bang}{leftedge}%
+ }% left edge
+ {}% not left edge
}
% \end{macrocode}
% \end{macro}
@@ -27134,102 +27683,104 @@
% \begin{macrocode}
\newcommand*{\LWR at tabledatasinglecolumntag}%
{%
-\LWR at traceinfo{LWR at tabledatasinglecolumntag}%
-\LWR at maybenewtablerow%
+ \LWR at traceinfo{LWR at tabledatasinglecolumntag}%
+ \LWR at maybenewtablerow%
% \end{macrocode}
% Don't start a new paragraph tag if have already started one:
% \begin{macrocode}
-\ifbool{LWR at intabularmetadata}%
-{%
+ \ifbool{LWR at intabularmetadata}%
+ {%
% \end{macrocode}
% If have found the end of tabular command, do not create the next data cell:
% \begin{macrocode}
- \ifbool{LWR at exitingtabular}{}%
- {% not exiting tabular
+ \ifbool{LWR at exitingtabular}{}%
+ {% not exiting tabular
% \end{macrocode}
% Print the |@| and |!| contents before first column:
% \begin{macrocode}
- \LWR at tabularleftedge%
+ \LWR at tabularleftedge%
% \end{macrocode}
% Fetch the current column's alignment character into \cs{LWR at strresult}:
% \changes{v0.60}{2018/09/17}{\env{tabular}: Improved memory management: Not using \pkg{xstring}.}
% \begin{macrocode}
- \xdef\LWR at strresult{%
- \LWR at getexparray{LWR at tablecolspec}{\arabic{LWR at tableLaTeXcolindex}}%
- }%
+ \xdef\LWR at strresult{%
+ \LWR at getexparray{LWR at tablecolspec}{\arabic{LWR at tableLaTeXcolindex}}%
+ }%
% \end{macrocode}
% print the start of a new table data cell:
% \begin{macrocode}
-\LWR at traceinfo{LWR at tabledatasinglecolumntag: about to print td tag}%
- \LWR at htmltag{td class="td%
+ \LWR at traceinfo{LWR at tabledatasinglecolumntag: about to print td tag}%
+ \LWR at htmltag{%
+ td class="td%
% \end{macrocode}
% append this column's spec:
% \begin{macrocode}
- \LWR at strresult%
+ \LWR at strresult%
% \end{macrocode}
% If this column has a cmidrule, add ``rule'' to the end of the \HTML\ class tag.
% Also add vertical bar tags.
% \begin{macrocode}
- \LWR at addcmidruletrim%
- \LWR at addleftmostbartag%
- \LWR at printbartag{\arabic{LWR at tableLaTeXcolindex}}%
- "%
+ \LWR at addcmidruletrim%
+ \LWR at addleftmostbartag%
+ \LWR at printbartag{\arabic{LWR at tableLaTeXcolindex}}%
+ "%
% \end{macrocode}
% Add styles for rules, alignment:
% \changes{v0.42}{2017/10/26}{If \progcode{FormatWP} add cell alignment.}
% \begin{macrocode}
- \LWR at tdstartstyles%
- \LWR at addcmidrulewidth%
- \LWR at addcdashline%
+ \LWR at tdstartstyles%
+ \LWR at addcmidrulewidth%
+ \LWR at addcdashline%
% \end{macrocode}
% \changes{v0.60}{2018/09/17}{\env{tabular}: Improved memory management: Not using \pkg{xstring}.}
% \begin{macrocode}
- \xdef\LWR at thiscolspec{%
- \LWR at getexparray{LWR at tablecolspec}{\arabic{LWR at tableLaTeXcolindex}}%
- }%
- \LWR at addformatwpalignment{\LWR at thiscolspec}%
+ \xdef\LWR at thiscolspec{%
+ \LWR at getexparray{LWR at tablecolspec}%
+ {\arabic{LWR at tableLaTeXcolindex}}%
+ }%
+ \LWR at addformatwpalignment{\LWR at thiscolspec}%
% \end{macrocode}
% Add styles for cell and rule colors:
% \changes{v0.48}{2018/02/08}{\pkg{colortbl}: Added.}
% \begin{macrocode}
- \LWR at addtabularrowcolor%
- \LWR at addtabularrulecolors%
+ \LWR at addtabularrowcolor%
+ \LWR at addtabularrulecolors%
% \end{macrocode}
% \begin{macrocode}
- \LWR at tdendstyles%
- }% HTML td
- \LWR at traceinfo{LWR at tabledatasinglecolumntag: done printing td tag}%
+ \LWR at tdendstyles%
+ }% HTML td
+ \LWR at traceinfo{LWR at tabledatasinglecolumntag: done printing td tag}%
% \end{macrocode}
% If this is a |p|, |m|, |b|, or X column, allow paragraphs:
% \begin{macrocode}
- \ifboolexpr{%
- test{ \ifdefstring{\LWR at strresult}{p} } or
- test{ \ifdefstring{\LWR at strresult}{m} } or
- test{ \ifdefstring{\LWR at strresult}{b} } or
- test{ \ifdefstring{\LWR at strresult}{P} } or
- test{ \ifdefstring{\LWR at strresult}{M} } or
- test{ \ifdefstring{\LWR at strresult}{B} } or
- test{ \ifdefstring{\LWR at strresult}{X} }
- }%
- {% allow pars
- \LWR at traceinfo{LWR at tabledatasinglecolumntag: about to LWR at startpars}%
- \global\booltrue{LWR at tableparcell}%
- \LWR at startpars%
- \LWR at traceinfo{LWR at tabledatasinglecolumntag: done with LWR at startpars}%
- }% allow pars
- {}% no pars
+ \ifboolexpr{%
+ test{ \ifdefstring{\LWR at strresult}{p} } or
+ test{ \ifdefstring{\LWR at strresult}{m} } or
+ test{ \ifdefstring{\LWR at strresult}{b} } or
+ test{ \ifdefstring{\LWR at strresult}{P} } or
+ test{ \ifdefstring{\LWR at strresult}{M} } or
+ test{ \ifdefstring{\LWR at strresult}{B} } or
+ test{ \ifdefstring{\LWR at strresult}{X} }
+ }%
+ {% allow pars
+ \LWR at traceinfo{LWR at tabledatasinglecolumntag: about to LWR at startpars}%
+ \booltrue{LWR at tableparcell}%
+ \LWR at startpars%
+ \LWR at traceinfo{LWR at tabledatasinglecolumntag: done with LWR at startpars}%
+ }% allow pars
+ {}% no pars
% \end{macrocode}
% Print the |>| contents unless muted for the \cs{bottomrule}:
% \begin{macrocode}
- \ifboolexpr{bool{LWR at tabularmutemods} or bool{LWR at emptyatbang}}%
- {}%
- {%
- \LWR at getexparray{LWR at colbeforespec}{\arabic{LWR at tableLaTeXcolindex}}%
- }%
- \global\boolfalse{LWR at intabularmetadata}%
- }% not exiting tabular
-}{}% in tabular metadata
-\LWR at traceinfo{LWR at tabledatasinglecolumntag: done}%
+ \ifboolexpr{bool{LWR at tabularmutemods} or bool{LWR at emptyatbang}}%
+ {}%
+ {%
+ \LWR at getexparray{LWR at colbeforespec}{\arabic{LWR at tableLaTeXcolindex}}%
+ }%
+ \boolfalse{LWR at intabularmetadata}%
+ }% not exiting tabular
+ }{}% in tabular metadata
+ \LWR at traceinfo{LWR at tabledatasinglecolumntag: done}%
}%
% \end{macrocode}
% \end{macro}
@@ -27256,14 +27807,7 @@
-% \DescribeCounter{LWR at midrulecounter}
-% Indexes across the |LWR at midrules| and |LWR at trim<l/r>rules| data arrays.
-% \begin{macrocode}
-\newcounter{LWR at midrulecounter}
-% \end{macrocode}
-
-
% \DescribeLength{\LWR at heavyrulewidth}
% The default width of the rule.
% \begin{macrocode}
@@ -27311,21 +27855,21 @@
% \begin{macrocode}
\newcommand*{\LWR at clearmidrules}
{%
-\setcounter{LWR at midrulecounter}{1}%
-\whileboolexpr{%
- not test{%
- \ifnumcomp{\value{LWR at midrulecounter}}{>}%
- {\value{LWR at tabletotalLaTeXcols}}%
+ \defcounter{LWR at midrulecounter}{1}%
+ \whileboolexpr{%
+ not test{%
+ \ifnumcomp{\value{LWR at midrulecounter}}{>}%
+ {\value{LWR at tabletotalLaTeXcols}}%
+ }%
}%
-}%
-{%
- \LWR at setexparray{LWR at midrules}{\arabic{LWR at midrulecounter}}{0pt}%
- \setlength{\LWR at thiscmidrulewidth}{\LWR at cmidrulewidth}%
- \LWR at setexparray{LWR at trimlrules}{\arabic{LWR at midrulecounter}}{}%
- \LWR at setexparray{LWR at trimrrules}{\arabic{LWR at midrulecounter}}{}%
- \LWR at setexparray{LWR at cdashlines}{\arabic{LWR at midrulecounter}}{N}%
- \addtocounter{LWR at midrulecounter}{1}%
-}%
+ {%
+ \LWR at setexparray{LWR at midrules}{\arabic{LWR at midrulecounter}}{0pt}%
+ \setlength{\LWR at thiscmidrulewidth}{\LWR at cmidrulewidth}%
+ \LWR at setexparray{LWR at trimlrules}{\arabic{LWR at midrulecounter}}{}%
+ \LWR at setexparray{LWR at trimrrules}{\arabic{LWR at midrulecounter}}{}%
+ \LWR at setexparray{LWR at cdashlines}{\arabic{LWR at midrulecounter}}{N}%
+ \defaddtocounter{LWR at midrulecounter}{1}%
+ }%
}
% \end{macrocode}
% \end{macro}
@@ -27344,19 +27888,19 @@
%
% \begin{macrocode}
\newcommand*{\LWR at subcmidrule}[4]{%
-\setcounter{LWR at midrulecounter}{#3}%
-\whileboolexpr{%
- not test {%
- \ifnumcomp{\value{LWR at midrulecounter}}{>}{#4}%
+ \defcounter{LWR at midrulecounter}{#3}%
+ \whileboolexpr{%
+ not test {%
+ \ifnumcomp{\value{LWR at midrulecounter}}{>}{#4}%
+ }%
}%
-}%
-{%
- \LWR at setexparray{LWR at midrules}{\arabic{LWR at midrulecounter}}{#1}%
- \addtocounter{LWR at midrulecounter}{1}%
-}% whiledo
-\IfSubStr{#2}{l}{\LWR at setexparray{LWR at trimlrules}{#3}{l}}{}%
-\IfSubStr{#2}{r}{\LWR at setexparray{LWR at trimrrules}{#4}{r}}{}%
-\global\booltrue{LWR at doingcmidrule}%
+ {%
+ \LWR at setexparray{LWR at midrules}{\arabic{LWR at midrulecounter}}{#1}%
+ \defaddtocounter{LWR at midrulecounter}{1}%
+ }% whiledo
+ \IfSubStr{#2}{l}{\LWR at setexparray{LWR at trimlrules}{#3}{l}}{}%
+ \IfSubStr{#2}{r}{\LWR at setexparray{LWR at trimrrules}{#4}{r}}{}%
+ \booltrue{LWR at doingcmidrule}%
}
% \end{macrocode}
% \end{macro}
@@ -27386,17 +27930,17 @@
%
% \begin{macrocode}
\newcommand*{\LWR at subcdashline}[2]{%
-\setcounter{LWR at midrulecounter}{#1}%
-\whileboolexpr{%
- not test {%
- \ifnumcomp{\value{LWR at midrulecounter}}{>}{#2}%
+ \defcounter{LWR at midrulecounter}{#1}%
+ \whileboolexpr{%
+ not test {%
+ \ifnumcomp{\value{LWR at midrulecounter}}{>}{#2}%
+ }%
}%
-}%
-{%
- \LWR at setexparray{LWR at cdashlines}{\arabic{LWR at midrulecounter}}{Y}%
- \addtocounter{LWR at midrulecounter}{1}%
-}% whiledo
-\global\booltrue{LWR at doingcmidrule}%
+ {%
+ \LWR at setexparray{LWR at cdashlines}{\arabic{LWR at midrulecounter}}{Y}%
+ \defaddtocounter{LWR at midrulecounter}{1}%
+ }% whiledo
+ \booltrue{LWR at doingcmidrule}%
}
% \end{macrocode}
% \end{macro}
@@ -27427,15 +27971,10 @@
% \end{macrocode}
-% Used to add a style to a table data cell:
-% \begin{macrocode}
-\newbool{LWR at tdhavecellstyle}
-% \end{macrocode}
-
% \begin{macro}{\LWR at tdstartstyles}
% Begins possibly adding a table data cell style.
% \begin{macrocode}
-\newcommand*{\LWR at tdstartstyles}{\global\boolfalse{LWR at tdhavecellstyle}}
+\newcommand*{\LWR at tdstartstyles}{\boolfalse{LWR at tdhavecellstyle}}
% \end{macrocode}
% \end{macro}
@@ -27443,10 +27982,10 @@
% Starts adding a table data cell style.
% \begin{macrocode}
\newcommand*{\LWR at tdaddstyle}{%
-\ifbool{LWR at tdhavecellstyle}%
-{; }%
-{ style="}%
-\booltrue{LWR at tdhavecellstyle}%
+ \ifbool{LWR at tdhavecellstyle}%
+ {; }%
+ { style="}%
+ \booltrue{LWR at tdhavecellstyle}%
}
% \end{macrocode}
% \end{macro}
@@ -27456,10 +27995,11 @@
% Prints the closing quote.
% \begin{macrocode}
\newcommand*{\LWR at tdendstyles}{%
-\ifbool{LWR at tdhavecellstyle}{%
- "%
- \global\boolfalse{LWR at tdhavecellstyle}%
-}{}%
+ \ifbool{LWR at tdhavecellstyle}%
+ {%
+ "%
+ \boolfalse{LWR at tdhavecellstyle}%
+ }{}%
}
% \end{macrocode}
% \end{macro}
@@ -27473,23 +28013,23 @@
%
% \begin{macrocode}
\newcommand*{\LWR at subaddcmidruletrim}[2]{%
-\setlength{\LWR at templengthone}{%
- \LWR at getexparray{LWR at midrules}{\arabic{LWR at tableLaTeXcolindex}}%
-}%
-\ifdimcomp{\LWR at templengthone}{>}{0pt}%
-{%
+ \setlength{\LWR at templengthone}{%
+ \LWR at getexparray{LWR at midrules}{\arabic{LWR at tableLaTeXcolindex}}%
+ }%
+ \ifdimcomp{\LWR at templengthone}{>}{0pt}%
+ {%
% \end{macrocode}
% Print the class with left and right trim letters appended:
% \begin{macrocode}
- \LWR at origtilde tdrule#1#2%
+ \LWR at origtilde tdrule#1#2%
% \end{macrocode}
% Remember the width of the rule:
% \begin{macrocode}
- \setlength{\LWR at thiscmidrulewidth}{\LWR at templengthone}%
-}%
-{%
- \setlength{\LWR at thiscmidrulewidth}{0pt}%
-}%
+ \setlength{\LWR at thiscmidrulewidth}{\LWR at templengthone}%
+ }%
+ {%
+ \setlength{\LWR at thiscmidrulewidth}{0pt}%
+ }%
}
% \end{macrocode}
% \end{macro}
@@ -27502,9 +28042,9 @@
%
% \begin{macrocode}
\newcommand*{\LWR at addcmidruletrim}{%
-\LWR at subaddcmidruletrim%
-{\LWR at getexparray{LWR at trimlrules}{\arabic{LWR at tableLaTeXcolindex}}}%
-{\LWR at getexparray{LWR at trimrrules}{\arabic{LWR at tableLaTeXcolindex}}}%
+ \LWR at subaddcmidruletrim%
+ {\LWR at getexparray{LWR at trimlrules}{\arabic{LWR at tableLaTeXcolindex}}}%
+ {\LWR at getexparray{LWR at trimrrules}{\arabic{LWR at tableLaTeXcolindex}}}%
}
% \end{macrocode}
% \end{macro}
@@ -27525,42 +28065,42 @@
% Only add a custom width if |thiswidth| is different than the |defaultwidth|,
% or if a color is being used:
% \begin{macrocode}
-\ifboolexpr{%
- test{\ifdimcomp{#1}{=}{0pt}} or
- (
- ( test{\ifdimcomp{#1}{=}{#2}} and not bool{FormatWP} )
- and ( test {\ifdefvoid{\LWR at ruleHTMLcolor}} )
- )
-}%
-{}% default width and color
-{% custom width and/or color
+ \ifboolexpr{%
+ test{\ifdimcomp{#1}{=}{0pt}} or
+ (
+ ( test{\ifdimcomp{#1}{=}{#2}} and not bool{FormatWP} )
+ and ( test {\ifdefvoid{\LWR at ruleHTMLcolor}} )
+ )
+ }%
+ {}% default width and color
+ {% custom width and/or color
% \end{macrocode}
% Ensure that the width is wide enough to display in the browser:
% \begin{macrocode}
- \LWR at forceminwidth{#1}%
+ \LWR at forceminwidth{#1}%
% \end{macrocode}
% Begin adding another style:
% \begin{macrocode}
- \LWR at tdaddstyle%
+ \LWR at tdaddstyle%
% \end{macrocode}
% The style itself:
% \begin{macrocode}
- border-top:\LWR at printlength{\LWR at atleastonept} solid %
+ border-top:\LWR at printlength{\LWR at atleastonept} solid % space
% \end{macrocode}
% If default gray, the darkness of the color depends on the thickness of the rule:
% \begin{macrocode}
- \ifdefvoid{\LWR at ruleHTMLcolor}{%
- \ifdimcomp{#1}{<}{\LWR at lightrulewidth}%
- {\LWR at origpound{}A0A0A0}%
- {% lightrule or heaver
- \ifdimcomp{#1}{<}{\LWR at heavyrulewidth}%
- {\LWR at origpound{}808080}%
- {black}%
- }% lightrule or heavier
- }{%
- \LWR at origpound\LWR at ruleHTMLcolor%
- }
-}% custom width and/or color
+ \ifdefvoid{\LWR at ruleHTMLcolor}{%
+ \ifdimcomp{#1}{<}{\LWR at lightrulewidth}%
+ {\LWR at origpound{}A0A0A0}%
+ {% lightrule or heaver
+ \ifdimcomp{#1}{<}{\LWR at heavyrulewidth}%
+ {\LWR at origpound{}808080}%
+ {black}%
+ }% lightrule or heavier
+ }{%
+ \LWR at origpound\LWR at ruleHTMLcolor%
+ }%
+ }% custom width and/or color
}
% \end{macrocode}
% \end{macro}
@@ -27572,7 +28112,7 @@
% Must be placed between \cs{LWR at tdstartstyles} and \cs{LWR at tdendstyles}.
% \begin{macrocode}
\newcommand{\LWR at addcmidrulewidth}{%
-\LWR at addrulewidth{\LWR at thiscmidrulewidth}{\LWR at cmidrulewidth}%
+ \LWR at addrulewidth{\LWR at thiscmidrulewidth}{\LWR at cmidrulewidth}%
}
% \end{macrocode}
% \end{macro}
@@ -27585,16 +28125,16 @@
% \changes{v0.56}{2018/05/04}{\pkg{arydshln}: Added.}
% \begin{macrocode}
\newcommand{\LWR at addcdashline}{%
-\edef\LWR at tempone{%
- \LWR at getexparray{LWR at cdashlines}{\arabic{LWR at tableLaTeXcolindex}}%
-}%
-\ifdefstring{\LWR at tempone}{Y}{%
- \LWR at tdaddstyle%
- border-top: 1pt dashed %
- \ifdefvoid{\LWR at ruleHTMLcolor}%
- {black}%
- {\LWR at origpound\LWR at ruleHTMLcolor}%
-}{}%
+ \edef\LWR at tempone{%
+ \LWR at getexparray{LWR at cdashlines}{\arabic{LWR at tableLaTeXcolindex}}%
+ }%
+ \ifdefstring{\LWR at tempone}{Y}{%
+ \LWR at tdaddstyle%
+ border-top: 1pt dashed %
+ \ifdefvoid{\LWR at ruleHTMLcolor}%
+ {black}%
+ {\LWR at origpound\LWR at ruleHTMLcolor}%
+ }{}%
}
% \end{macrocode}
% \end{macro}
@@ -27604,8 +28144,8 @@
% \changes{v0.47}{2018/01/26}{Fix: Line wrap at \HTML\ hyphen.}
% \begin{macrocode}
\newcommand*{\LWR at WPcell}[2]{%
-\LWR at tdaddstyle%
-\LWR at print@mbox{text-align:#1}; \LWR at print@mbox{vertical-align:#2}%
+ \LWR at tdaddstyle%
+ \LWR at print@mbox{text-align:#1}; \LWR at print@mbox{vertical-align:#2}%
}
% \end{macrocode}
% \end{macro}
@@ -27620,17 +28160,17 @@
% \changes{v0.44}{2017/11/08}{Fix for multicolumn alignment if \progcode{FormatWP}.}
% \begin{macrocode}
\newcommand*{\LWR at addformatwpalignment}[1]{%
-\ifbool{FormatWP}{%
-\IfSubStr{#1}{l}{\LWR at WPcell{left}{middle}}{}%
-\IfSubStr{#1}{c}{\LWR at WPcell{center}{middle}}{}%
-\IfSubStr{#1}{r}{\LWR at WPcell{right}{middle}}{}%
-\IfSubStr{#1}{p}{\LWR at WPcell{left}{bottom}}{}%
-\IfSubStr{#1}{m}{\LWR at WPcell{left}{middle}}{}%
-\IfSubStr{#1}{b}{\LWR at WPcell{left}{top}}{}%
-\IfSubStr{#1}{P}{\LWR at WPcell{center}{bottom}}{}%
-\IfSubStr{#1}{M}{\LWR at WPcell{center}{middle}}{}%
-\IfSubStr{#1}{B}{\LWR at WPcell{center}{top}}{}%
-}{}%
+ \ifbool{FormatWP}{%
+ \IfSubStr{#1}{l}{\LWR at WPcell{left}{middle}}{}%
+ \IfSubStr{#1}{c}{\LWR at WPcell{center}{middle}}{}%
+ \IfSubStr{#1}{r}{\LWR at WPcell{right}{middle}}{}%
+ \IfSubStr{#1}{p}{\LWR at WPcell{left}{bottom}}{}%
+ \IfSubStr{#1}{m}{\LWR at WPcell{left}{middle}}{}%
+ \IfSubStr{#1}{b}{\LWR at WPcell{left}{top}}{}%
+ \IfSubStr{#1}{P}{\LWR at WPcell{center}{bottom}}{}%
+ \IfSubStr{#1}{M}{\LWR at WPcell{center}{middle}}{}%
+ \IfSubStr{#1}{B}{\LWR at WPcell{center}{top}}{}%
+ }{}%
}
% \end{macrocode}
% \end{macro}
@@ -27646,19 +28186,19 @@
%
% \begin{macrocode}
\newcommand*{\LWR at addtabularrowcolor}{%
-\ifbool{LWR at tabularmutemods}{}{%
- \ifdefvoid{\LWR at rowHTMLcolor}{%
- \ifdefvoid{\LWR at xcolorrowHTMLcolor}{}%
- {% xcolor row color
+ \ifbool{LWR at tabularmutemods}{}{%
+ \ifdefvoid{\LWR at rowHTMLcolor}{%
+ \ifdefvoid{\LWR at xcolorrowHTMLcolor}{}%
+ {% xcolor row color
+ \LWR at tdaddstyle%
+ background:\LWR at origpound\LWR at xcolorrowHTMLcolor%
+ }%
+ }%
+ {% explicit row color
\LWR at tdaddstyle%
- background:\LWR at origpound\LWR at xcolorrowHTMLcolor%
+ background:\LWR at origpound\LWR at rowHTMLcolor%
}%
}%
- {% explicit row color
- \LWR at tdaddstyle%
- background:\LWR at origpound\LWR at rowHTMLcolor%
- }%
-}%
}
% \end{macrocode}
% \end{macro}
@@ -27674,60 +28214,60 @@
% \end{macrocode}
% If either form of horizontal rule is requested:
% \begin{macrocode}
-\ifboolexpr{%
- test{\ifnumcomp{\value{LWR at hlines}}{>}{0}} or%
- test{\ifnumcomp{\value{LWR at hdashedlines}}{>}{0}} or%
- bool{LWR at doingtbrule}%
-}{%
+ \ifboolexpr{%
+ test{\ifnumcomp{\value{LWR at hlines}}{>}{0}} or%
+ test{\ifnumcomp{\value{LWR at hdashedlines}}{>}{0}} or%
+ bool{LWR at doingtbrule}%
+ }{%
% \end{macrocode}
% If there is a no custom color:
% \begin{macrocode}
- \ifdefvoid{\LWR at ruleHTMLcolor}%
- {%
- \ifnumcomp{\value{LWR at hlines}}{>}{1}%
+ \ifdefvoid{\LWR at ruleHTMLcolor}%
{%
- \LWR at tdaddstyle%
- border-top: 4px double%
- }{% else
- \ifnumcomp{\value{LWR at hdashedlines}}{>}{1}%
- {%
- \LWR at tdaddstyle%
- border-top: 2px dashed%
- }{% else
- \ifnumcomp{\value{LWR at hdashedlines}}{=}{1}%
- {%
- \LWR at tdaddstyle%
- border-top: 1px dashed%
- }{}}}%
+ \ifnumcomp{\value{LWR at hlines}}{>}{1}%
+ {%
+ \LWR at tdaddstyle%
+ border-top: 4px double%
+ }{% else
+ \ifnumcomp{\value{LWR at hdashedlines}}{>}{1}%
+ {%
+ \LWR at tdaddstyle%
+ border-top: 2px dashed%
+ }{% else
+ \ifnumcomp{\value{LWR at hdashedlines}}{=}{1}%
+ {%
+ \LWR at tdaddstyle%
+ border-top: 1px dashed%
+ }{}}}%
% \end{macrocode}
% If no color and not doubled or dashed, then add nothing, since
% a simpler rule is the default.
% \begin{macrocode}
- }%
+ }%
% \end{macrocode}
% If there is a custom color:
% \begin{macrocode}
- {%
- \ifnumcomp{\value{LWR at hlines}}{>}{1}%
{%
- \LWR at tdaddstyle%
- border-top: 4px double \LWR at origpound\LWR at ruleHTMLcolor%
- }{% else
- \ifnumcomp{\value{LWR at hdashedlines}}{>}{1}%
- {%
- \LWR at tdaddstyle%
- border-top: 2px dashed \LWR at origpound\LWR at ruleHTMLcolor%
- }{% else
- \ifnumcomp{\value{LWR at hdashedlines}}{=}{1}%
- {%
- \LWR at tdaddstyle%
- border-top: 1px dashed \LWR at origpound\LWR at ruleHTMLcolor%
- }{% else
- \LWR at tdaddstyle%
- border-top: 1px solid \LWR at origpound\LWR at ruleHTMLcolor%
- }}}%
- }%
-}{}%
+ \ifnumcomp{\value{LWR at hlines}}{>}{1}%
+ {%
+ \LWR at tdaddstyle%
+ border-top: 4px double \LWR at origpound\LWR at ruleHTMLcolor%
+ }{% else
+ \ifnumcomp{\value{LWR at hdashedlines}}{>}{1}%
+ {%
+ \LWR at tdaddstyle%
+ border-top: 2px dashed \LWR at origpound\LWR at ruleHTMLcolor%
+ }{% else
+ \ifnumcomp{\value{LWR at hdashedlines}}{=}{1}%
+ {%
+ \LWR at tdaddstyle%
+ border-top: 1px dashed \LWR at origpound\LWR at ruleHTMLcolor%
+ }{% else
+ \LWR at tdaddstyle%
+ border-top: 1px solid \LWR at origpound\LWR at ruleHTMLcolor%
+ }}}%
+ }%
+ }{}%
}
% \end{macrocode}
% \end{macro}
@@ -27746,88 +28286,81 @@
% \end{macrocode}
% Custom horizonal rule color:
% \begin{macrocode}
-\LWR at addtabularhrulecolor%
+ \LWR at addtabularhrulecolor%
% \end{macrocode}
% No vertical rules if finishing the \env{tabular} with a row of empty cells:
% \begin{macrocode}
-\ifbool{LWR at tabularmutemods}{}{%
+ \ifbool{LWR at tabularmutemods}{}{%
% \end{macrocode}
% If at the leftmost cell, possibly add a leftmost vertical rule:
% \begin{macrocode}
- \ifnumequal{\value{LWR at tableLaTeXcolindex}}{1}{%
+ \ifnumequal{\value{LWR at tableLaTeXcolindex}}{1}{%
% \end{macrocode}
% Fetch the left edge's vertical bar specification:
% \begin{macrocode}
- \edef\LWR at tempone{\LWR at getexparray{LWR at colbarspec}{leftedge}}%
+ \edef\LWR at tempone{\LWR at getexparray{LWR at colbarspec}{leftedge}}%
% \end{macrocode}
% Add a custom style if a vertical bar was requested:
% \begin{macrocode}
- \ifdefstring{\LWR at tempone}{tvertbarl}{%
+ \ifdefstring{\LWR at tempone}{tvertbarl}{%
+ \LWR at tdaddstyle%
+ border-left: 1px solid % space
+ \LWR at vertruleHTMLcolor%
+ }{}%
+ \ifdefstring{\LWR at tempone}{tvertbarldouble}{%
+ \LWR at tdaddstyle%
+ border-left: 4px double % space
+ \LWR at vertruleHTMLcolor%
+ }{}%
+ \ifdefstring{\LWR at tempone}{tvertbarldash}{%
+ \LWR at tdaddstyle%
+ border-left: 1px dashed % space
+ \LWR at vertruleHTMLcolor%
+ }{}%
+ \ifdefstring{\LWR at tempone}{tvertbarldoubledash}{%
+ \LWR at tdaddstyle%
+ border-left: 2px dashed % space
+ \LWR at vertruleHTMLcolor%
+ }{}%
+ }{}%
+% \end{macrocode}
+% Possibly add a right vertical rule for this cell:
+% \begin{macrocode}
+ \edef\LWR at tempone{%
+ \LWR at getexparray{LWR at colbarspec}{\arabic{LWR at tableLaTeXcolindex}}%
+ }%
+ \ifdefstring{\LWR at tempone}{tvertbarr}{%
+% \end{macrocode}
+% Add a custom style if a vertical bar was requested:
+% \begin{macrocode}
\LWR at tdaddstyle%
- border-left: 1px solid % space
- \LWR at vertruleHTMLcolor%
+ border-right: 1px solid \LWR at vertruleHTMLcolor%
}{}%
- \ifdefstring{\LWR at tempone}{tvertbarldouble}{%
+ \ifdefstring{\LWR at tempone}{tvertbarrdouble}{%
\LWR at tdaddstyle%
- border-left: 4px double % space
- \LWR at vertruleHTMLcolor%
+ border-right: 4px double \LWR at vertruleHTMLcolor%
}{}%
- \ifdefstring{\LWR at tempone}{tvertbarldash}{%
+ \ifdefstring{\LWR at tempone}{tvertbarrdash}{%
\LWR at tdaddstyle%
- border-left: 1px dashed % space
- \LWR at vertruleHTMLcolor%
+ border-right: 1px dashed \LWR at vertruleHTMLcolor%
}{}%
- \ifdefstring{\LWR at tempone}{tvertbarldoubledash}{%
+ \ifdefstring{\LWR at tempone}{tvertbarrdoubledash}{%
\LWR at tdaddstyle%
- border-left: 2px dashed % space
- \LWR at vertruleHTMLcolor%
+ border-right: 2px dashed \LWR at vertruleHTMLcolor%
}{}%
- }{}%
-% \end{macrocode}
-% Possibly add a right vertical rule for this cell:
-% \begin{macrocode}
- \edef\LWR at tempone{%
- \LWR at getexparray{LWR at colbarspec}{\arabic{LWR at tableLaTeXcolindex}}%
}%
- \ifdefstring{\LWR at tempone}{tvertbarr}{%
-% \end{macrocode}
-% Add a custom style if a vertical bar was requested:
-% \begin{macrocode}
- \LWR at tdaddstyle%
- border-right: 1px solid \LWR at vertruleHTMLcolor%
- }{}%
- \ifdefstring{\LWR at tempone}{tvertbarrdouble}{%
- \LWR at tdaddstyle%
- border-right: 4px double \LWR at vertruleHTMLcolor%
- }{}%
- \ifdefstring{\LWR at tempone}{tvertbarrdash}{%
- \LWR at tdaddstyle%
- border-right: 1px dashed \LWR at vertruleHTMLcolor%
- }{}%
- \ifdefstring{\LWR at tempone}{tvertbarrdoubledash}{%
- \LWR at tdaddstyle%
- border-right: 2px dashed \LWR at vertruleHTMLcolor%
- }{}%
-}%
}
% \end{macrocode}
% \end{macro}
-% \DescribeCounter{LWR at cellcolordepth}
-% Counts how many cell color \element{div}s were added to the current tabular data cell.
-% \begin{macrocode}
-\newcounter{LWR at cellcolordepth}
-% \end{macrocode}
-
-
% \begin{macro}{\LWR at subaddtabularcellcolor} \marg{\HTML\ color}
% \begin{macrocode}
\newcommand*{\LWR at subaddtabularcellcolor}[1]{%
-\LWR at htmltag{div class="cellcolor" style="%
- background:\LWR at origpound{}{}#1 %
-" }%
-\addtocounter{LWR at cellcolordepth}{1}%
+ \LWR at htmltag{div class="cellcolor" style="%
+ background:\LWR at origpound{}{}#1 %
+ " }%
+ \defaddtocounter{LWR at cellcolordepth}{1}%
}
% \end{macrocode}
% \end{macro}
@@ -27837,21 +28370,21 @@
% \changes{v0.49}{2018/02/18}{\pkg{xcolor}: Added tabular row colors.}
% \begin{macrocode}
\newcommand*{\LWR at addtabularcellcolor}{%
-\ifdefvoid{\LWR at cellHTMLcolor}%
-{%
- \ifdefvoid{\LWR at rowHTMLcolor}%
+ \ifdefvoid{\LWR at cellHTMLcolor}%
{%
- \ifdefvoid{\LWR at xcolorrowHTMLcolor}%
+ \ifdefvoid{\LWR at rowHTMLcolor}%
{%
- \ifdefvoid{\LWR at columnHTMLcolor}%
- {}%
- {\LWR at subaddtabularcellcolor{\LWR at columnHTMLcolor}}%
+ \ifdefvoid{\LWR at xcolorrowHTMLcolor}%
+ {%
+ \ifdefvoid{\LWR at columnHTMLcolor}%
+ {}%
+ {\LWR at subaddtabularcellcolor{\LWR at columnHTMLcolor}}%
+ }%
+ {\LWR at subaddtabularcellcolor{\LWR at xcolorrowHTMLcolor}}%
}%
- {\LWR at subaddtabularcellcolor{\LWR at xcolorrowHTMLcolor}}%
+ {\LWR at subaddtabularcellcolor{\LWR at rowHTMLcolor}}%
}%
- {\LWR at subaddtabularcellcolor{\LWR at rowHTMLcolor}}%
-}%
-{\LWR at subaddtabularcellcolor{\LWR at cellHTMLcolor}}%
+ {\LWR at subaddtabularcellcolor{\LWR at cellHTMLcolor}}%
}
% \end{macrocode}
% \end{macro}
@@ -27861,24 +28394,6 @@
% \subsubsection{Parsing multicolumns}
-% \begin{macrocode}
-\newcounter{LWR at tablemulticolswidth}
-% \end{macrocode}
-%
-% Indexes into the multicolumn specification:
-% \begin{macrocode}
-\newcounter{LWR at tablemulticolspos}
-% \end{macrocode}
-
-% Remembers multicolumn vertical rules if found in the column spec.
-% \begin{macrocode}
-\newcounter{LWR at mcolvertbarsl}
-\newcounter{LWR at mcolvertbarsr}
-\newcounter{LWR at mcolvertbarsldash}
-\newcounter{LWR at mcolvertbarsrdash}
-\newbool{LWR at mcolvertbaronleft}%
-% \end{macrocode}
-
% \begin{macro}{\LWR at printmccoltype} \marg{colspec}
% Print any valid column type found. Does not print |@|, |!|, |>|, or |<| columns
% or their associated tokens.
@@ -27886,64 +28401,64 @@
% This is printed as part of the table data tag's |class|.
% \begin{macrocode}
\newcommand*{\LWR at printmccoltype}[1]{%
-\LWR at traceinfo{lwr at printmccoltype -#1-}%
+ \LWR at traceinfo{lwr at printmccoltype -#1-}%
% \end{macrocode}
% Get one token of the column spec:
% \begin{macrocode}
-\StrChar{#1}{\arabic{LWR at tablemulticolspos}}[\LWR at strresult]%
+ \StrChar{#1}{\arabic{LWR at tablemulticolspos}}[\LWR at strresult]%
% \end{macrocode}
% Add to the \HTML\ tag depending on which column type is found:
% \begin{macrocode}
-\IfStrEq{\LWR at strresult}{l}{l}{}%
-\IfStrEq{\LWR at strresult}{c}{c}{}%
-\IfStrEq{\LWR at strresult}{r}{r}{}%
-\IfStrEq{\LWR at strresult}{p}{p}{}%
-\IfStrEq{\LWR at strresult}{m}{m}{}%
-\IfStrEq{\LWR at strresult}{b}{b}{}%
-\IfStrEq{\LWR at strresult}{P}{P}{}%
-\IfStrEq{\LWR at strresult}{M}{M}{}%
-\IfStrEq{\LWR at strresult}{B}{B}{}%
+ \IfStrEq{\LWR at strresult}{l}{l}{}%
+ \IfStrEq{\LWR at strresult}{c}{c}{}%
+ \IfStrEq{\LWR at strresult}{r}{r}{}%
+ \IfStrEq{\LWR at strresult}{p}{p}{}%
+ \IfStrEq{\LWR at strresult}{m}{m}{}%
+ \IfStrEq{\LWR at strresult}{b}{b}{}%
+ \IfStrEq{\LWR at strresult}{P}{P}{}%
+ \IfStrEq{\LWR at strresult}{M}{M}{}%
+ \IfStrEq{\LWR at strresult}{B}{B}{}%
% \end{macrocode}
% \changes{v0.56}{2018/05/10}{Added \pkg{array} \texttt{W} column.}
% \begin{macrocode}
-\IfStrEq{\LWR at strresult}{w}{w}{}%
-\IfStrEq{\LWR at strresult}{W}{W}{}%
+ \IfStrEq{\LWR at strresult}{w}{w}{}%
+ \IfStrEq{\LWR at strresult}{W}{W}{}%
% \end{macrocode}
% \begin{macrocode}
-\IfStrEq{\LWR at strresult}{S}{c}{}%
-\IfStrEq{\LWR at strresult}{s}{c}{}%
+ \IfStrEq{\LWR at strresult}{S}{c}{}%
+ \IfStrEq{\LWR at strresult}{s}{c}{}%
% \end{macrocode}
% \begin{macrocode}
-\IfStrEq{\LWR at strresult}{X}{p}{}%
+ \IfStrEq{\LWR at strresult}{X}{p}{}%
% \end{macrocode}
% \changes{v0.43}{2017/11/07}{Added vertical rules.}
% \changes{v0.56}{2018/04/30}{Adds support for double vertical rules.}
% \changes{v0.56}{2018/05/05}{Adds support for dashed vertical rules.}
% \begin{macrocode}
-\IfStrEq{\LWR at strresult}{|}%
-{%
- \ifbool{LWR at mcolvertbaronleft}%
- {\addtocounter{LWR at mcolvertbarsl}{1}}% left edge
- {\addtocounter{LWR at mcolvertbarsr}{1}}% not left edge
-}%
-{%
- \IfStrEq{\LWR at strresult}{:}%
+ \IfStrEq{\LWR at strresult}{|}%
{%
\ifbool{LWR at mcolvertbaronleft}%
- {\addtocounter{LWR at mcolvertbarsldash}{1}}% left edge
- {\addtocounter{LWR at mcolvertbarsrdash}{1}}% not left edge
+ {\defaddtocounter{LWR at mcolvertbarsl}{1}}% left edge
+ {\defaddtocounter{LWR at mcolvertbarsr}{1}}% not left edge
}%
{%
- \IfStrEq{\LWR at strresult}{;}%
+ \IfStrEq{\LWR at strresult}{:}%
{%
\ifbool{LWR at mcolvertbaronleft}%
- {\addtocounter{LWR at mcolvertbarsldash}{1}}% left edge
- {\addtocounter{LWR at mcolvertbarsrdash}{1}}% not left edge
+ {\defaddtocounter{LWR at mcolvertbarsldash}{1}}% left edge
+ {\defaddtocounter{LWR at mcolvertbarsrdash}{1}}% not left edge
}%
- {\boolfalse{LWR at mcolvertbaronleft}}%
+ {%
+ \IfStrEq{\LWR at strresult}{;}%
+ {%
+ \ifbool{LWR at mcolvertbaronleft}%
+ {\defaddtocounter{LWR at mcolvertbarsldash}{1}}% left edge
+ {\defaddtocounter{LWR at mcolvertbarsrdash}{1}}% not left edge
+ }%
+ {\boolfalse{LWR at mcolvertbaronleft}}%
+ }%
}%
-}%
-\LWR at traceinfo{lwr at printmccoltype done}%
+ \LWR at traceinfo{lwr at printmccoltype done}%
}
% \end{macrocode}
% \end{macro}
@@ -27953,10 +28468,10 @@
% \changes{v0.56}{2018/05/12}{Fix: \cs{multicolumn} parameters.}
% \begin{macrocode}
\newcommand*{\LWR at multicolpartext}[1]{%
-\LWR at startpars%
-\LWR at multicoltext%
-\addtocounter{LWR at tablemulticolspos}{#1}%
-\LWR at stoppars%
+ \LWR at startpars%
+ \LWR at multicoltext%
+ \defaddtocounter{LWR at tablemulticolspos}{#1}%
+ \LWR at stoppars%
}
% \end{macrocode}
% \end{macro}
@@ -27965,13 +28480,13 @@
% For |@|, |!|, |>|, |<|, print the next token without paragraph tags:
% \begin{macrocode}
\newcommand*{\LWR at multicolother}[1]{%
-\addtocounter{LWR at tablemulticolspos}{1}%
-\StrChar{#1}{\arabic{LWR at tablemulticolspos}}[\LWR at strresult]%
-\LWR at strresult%
+ \defaddtocounter{LWR at tablemulticolspos}{1}%
+ \StrChar{#1}{\arabic{LWR at tablemulticolspos}}[\LWR at strresult]%
+ \LWR at strresult%
% \end{macrocode}
% A valid column data type was found:
% \begin{macrocode}
-\global\booltrue{LWR at validtablecol}%
+ \booltrue{LWR at validtablecol}%
}
% \end{macrocode}
% \end{macro}
@@ -27983,7 +28498,7 @@
% \end{macrocode}
% A valid column data type was found:
% \begin{macrocode}
-\global\booltrue{LWR at validtablecol}%
+ \booltrue{LWR at validtablecol}%
}
% \end{macrocode}
% \end{macro}
@@ -27998,66 +28513,67 @@
%
% \begin{macrocode}
\newcommand*{\LWR at printmccoldata}[1]{%
-\LWR at traceinfo{lwr at printmccoldata -#1}%
+ \LWR at traceinfo{lwr at printmccoldata -#1}%
% \end{macrocode}
% Not yet found a valid column type:
% \begin{macrocode}
-\global\boolfalse{LWR at validtablecol}%
+ \boolfalse{LWR at validtablecol}%
% \end{macrocode}
-% Get one token of the column spec:
+% Get one token of the column spec, into a local copy in case nested.
% \begin{macrocode}
-\StrChar{#1}{\arabic{LWR at tablemulticolspos}}[\LWR at strresult]%
+ \StrChar{#1}{\arabic{LWR at tablemulticolspos}}[\LWR at strresult]%
+ \edef\LWR at printmccoldatatoken{\LWR at strresult}%
% \end{macrocode}
% Print the text depending on which column type is found.
% Also handles |@|, |>|, |<| as it comes to them.
% \begin{macrocode}
-\IfStrEq{\LWR at strresult}{l}{\LWR at multicoltext}{}%
-\IfStrEq{\LWR at strresult}{c}{\LWR at multicoltext}{}%
-\IfStrEq{\LWR at strresult}{r}{\LWR at multicoltext}{}%
-\IfStrEq{\LWR at strresult}{D}{%
-\addtocounter{LWR at tablemulticolspos}{3}% skip parameters
-\LWR at multicoltext%
-}{}%
+ \IfStrEq{\LWR at printmccoldatatoken}{l}{\LWR at multicoltext}{}%
+ \IfStrEq{\LWR at printmccoldatatoken}{c}{\LWR at multicoltext}{}%
+ \IfStrEq{\LWR at printmccoldatatoken}{r}{\LWR at multicoltext}{}%
+ \IfStrEq{\LWR at printmccoldatatoken}{D}{%
+ \defaddtocounter{LWR at tablemulticolspos}{3}% skip parameters
+ \LWR at multicoltext%
+ }{}%
% \end{macrocode}
% \changes{v0.56}{2018/05/12}{Fix: \cs{multicolumn} parameters.}
% \changes{v0.72}{2019/06/07}{Fix: \cs{multicolumn} parameters.}
% \begin{macrocode}
-\IfStrEq{\LWR at strresult}{p}{\LWR at multicolpartext{2}}{}%
-\IfStrEq{\LWR at strresult}{m}{\LWR at multicolpartext{2}}{}%
-\IfStrEq{\LWR at strresult}{b}{\LWR at multicolpartext{2}}{}%
-\IfStrEq{\LWR at strresult}{P}{\LWR at multicolpartext{2}}{}%
-\IfStrEq{\LWR at strresult}{M}{\LWR at multicolpartext{2}}{}%
-\IfStrEq{\LWR at strresult}{B}{\LWR at multicolpartext{2}}{}%
+ \IfStrEq{\LWR at printmccoldatatoken}{p}{\LWR at multicolpartext{2}}{}%
+ \IfStrEq{\LWR at printmccoldatatoken}{m}{\LWR at multicolpartext{2}}{}%
+ \IfStrEq{\LWR at printmccoldatatoken}{b}{\LWR at multicolpartext{2}}{}%
+ \IfStrEq{\LWR at printmccoldatatoken}{P}{\LWR at multicolpartext{2}}{}%
+ \IfStrEq{\LWR at printmccoldatatoken}{M}{\LWR at multicolpartext{2}}{}%
+ \IfStrEq{\LWR at printmccoldatatoken}{B}{\LWR at multicolpartext{2}}{}%
% \end{macrocode}
% \changes{v0.56}{2018/05/10}{Added \pkg{array} \texttt{W} column.}
% \begin{macrocode}
-\IfStrEq{\LWR at strresult}{w}{\LWR at multicolpartext{3}}{}%
-\IfStrEq{\LWR at strresult}{W}{\LWR at multicolpartext{3}}{}%
+ \IfStrEq{\LWR at printmccoldatatoken}{w}{\LWR at multicolpartext{3}}{}%
+ \IfStrEq{\LWR at printmccoldatatoken}{W}{\LWR at multicolpartext{3}}{}%
% \end{macrocode}
% \begin{macrocode}
-\IfStrEq{\LWR at strresult}{S}{\LWR at multicoltext}{}%
-\IfStrEq{\LWR at strresult}{s}{\LWR at multicoltext}{}%
+ \IfStrEq{\LWR at printmccoldatatoken}{S}{\LWR at multicoltext}{}%
+ \IfStrEq{\LWR at printmccoldatatoken}{s}{\LWR at multicoltext}{}%
% \end{macrocode}
% \begin{macrocode}
-\IfStrEq{\LWR at strresult}{X}{\LWR at multicolpartext{1}}{}%
-\IfStrEq{\LWR at strresult}{|}{\LWR at multicolskip}{}%
-\IfStrEq{\LWR at strresult}{:}{\LWR at multicolskip}{}%
-\IfStrEq{\LWR at strresult}{;}{%
- \LWR at multicolskip%
- \addtocounter{LWR at tablemulticolspos}{1}% skip parameter
-}{}%
-\IfStrEq{\LWR at strresult}{\detokenize{@}}{\LWR at multicolother{#1}}{}%
-\IfStrEq{\LWR at strresult}{\detokenize{!}}{\LWR at multicolother{#1}}{}%
-\IfStrEq{\LWR at strresult}{\detokenize{>}}{\LWR at multicolother{#1}}{}%
-\IfStrEq{\LWR at strresult}{\detokenize{<}}{\LWR at multicolother{#1}}{}%
+ \IfStrEq{\LWR at printmccoldatatoken}{X}{\LWR at multicolpartext{1}}{}%
+ \IfStrEq{\LWR at printmccoldatatoken}{|}{\LWR at multicolskip}{}%
+ \IfStrEq{\LWR at printmccoldatatoken}{:}{\LWR at multicolskip}{}%
+ \IfStrEq{\LWR at printmccoldatatoken}{;}{%
+ \LWR at multicolskip%
+ \defaddtocounter{LWR at tablemulticolspos}{1}% skip parameter
+ }{}%
+ \IfStrEq{\LWR at printmccoldatatoken}{\detokenize{@}}{\LWR at multicolother{#1}}{}%
+ \IfStrEq{\LWR at printmccoldatatoken}{\detokenize{!}}{\LWR at multicolother{#1}}{}%
+ \IfStrEq{\LWR at printmccoldatatoken}{\detokenize{>}}{\LWR at multicolother{#1}}{}%
+ \IfStrEq{\LWR at printmccoldatatoken}{\detokenize{<}}{\LWR at multicolother{#1}}{}%
% \end{macrocode}
% If an invalid column type:
% \begin{macrocode}
-\ifbool{LWR at validtablecol}{}{\LWR at multicoltext}%
+ \ifbool{LWR at validtablecol}{}{\LWR at multicoltext{}}%
% \end{macrocode}
% Tracing:
% \begin{macrocode}
-\LWR at traceinfo{lwr at printmccoldata done}%
+ \LWR at traceinfo{lwr at printmccoldata done}%
}
% \end{macrocode}
% \end{macro}
@@ -28075,28 +28591,28 @@
% which will NOT match |l|, |c|, |r|, or |p|.
% \begin{macrocode}
\newcommand*{\LWR at parsemulticolumnalignment}[2]{%
-\setcounter{LWR at tablemulticolspos}{1}%
-\StrLen{#1}[\LWR at strresult]%
-\setcounter{LWR at tablemulticolswidth}{\LWR at strresult}%
+ \defcounter{LWR at tablemulticolspos}{1}%
+ \StrLen{#1}[\LWR at strresult]%
+ \defcounter{LWR at tablemulticolswidth}{\LWR at strresult}%
% \end{macrocode}
% Scan across the tokens in the column spec:
% \begin{macrocode}
-\whileboolexpr{%
- not test {%
- \ifnumcomp{\value{LWR at tablemulticolspos}}{>}%
- {\value{LWR at tablemulticolswidth}}%
+ \whileboolexpr{%
+ not test {%
+ \ifnumcomp{\value{LWR at tablemulticolspos}}{>}%
+ {\value{LWR at tablemulticolswidth}}%
+ }%
}%
-}%
-{%
+ {%
% \end{macrocode}
% Execute the assigned print function for each token in the column spec:
% \begin{macrocode}
-#2{#1}%
+ #2{#1}%
% \end{macrocode}
% Move to the next token in the column spec:
% \begin{macrocode}
-\addtocounter{LWR at tablemulticolspos}{1}%
-}%
+ \defaddtocounter{LWR at tablemulticolspos}{1}%
+ }%
}
% \end{macrocode}
% \end{macro}
@@ -28113,46 +28629,46 @@
% \end{macrocode}
% No vertical rules if finishing the \env{tabular} with a row of empty cells:
% \begin{macrocode}
-\ifbool{LWR at tabularmutemods}{}{%
+ \ifbool{LWR at tabularmutemods}{}{%
% \end{macrocode}
% Left side:
% \begin{macrocode}
- \ifnumcomp{\value{LWR at mcolvertbarsl}}{=}{1}{%
- \LWR at tdaddstyle%
- border-left: 1px solid \LWR at vertruleHTMLcolor%
- }{}%
- \ifnumcomp{\value{LWR at mcolvertbarsl}}{>}{1}{%
- \LWR at tdaddstyle%
- border-left: 4px double \LWR at vertruleHTMLcolor%
- }{}%
- \ifnumcomp{\value{LWR at mcolvertbarsldash}}{=}{1}{%
- \LWR at tdaddstyle%
- border-left: 1px dashed \LWR at vertruleHTMLcolor%
- }{}%
- \ifnumcomp{\value{LWR at mcolvertbarsldash}}{>}{1}{%
- \LWR at tdaddstyle%
- border-left: 2px dashed \LWR at vertruleHTMLcolor%
- }{}%
+ \ifnumcomp{\value{LWR at mcolvertbarsl}}{=}{1}{%
+ \LWR at tdaddstyle%
+ border-left: 1px solid \LWR at vertruleHTMLcolor%
+ }{}%
+ \ifnumcomp{\value{LWR at mcolvertbarsl}}{>}{1}{%
+ \LWR at tdaddstyle%
+ border-left: 4px double \LWR at vertruleHTMLcolor%
+ }{}%
+ \ifnumcomp{\value{LWR at mcolvertbarsldash}}{=}{1}{%
+ \LWR at tdaddstyle%
+ border-left: 1px dashed \LWR at vertruleHTMLcolor%
+ }{}%
+ \ifnumcomp{\value{LWR at mcolvertbarsldash}}{>}{1}{%
+ \LWR at tdaddstyle%
+ border-left: 2px dashed \LWR at vertruleHTMLcolor%
+ }{}%
% \end{macrocode}
% Right side:
% \begin{macrocode}
- \ifnumcomp{\value{LWR at mcolvertbarsr}}{=}{1}{%
- \LWR at tdaddstyle%
- border-right: 1px solid \LWR at vertruleHTMLcolor%
- }{}%
- \ifnumcomp{\value{LWR at mcolvertbarsr}}{>}{1}{%
- \LWR at tdaddstyle%
- border-right: 4px double \LWR at vertruleHTMLcolor%
- }{}%
- \ifnumcomp{\value{LWR at mcolvertbarsrdash}}{=}{1}{%
- \LWR at tdaddstyle%
- border-right: 1px dashed \LWR at vertruleHTMLcolor%
- }{}%
- \ifnumcomp{\value{LWR at mcolvertbarsrdash}}{>}{1}{%
- \LWR at tdaddstyle%
- border-right: 2px dashed \LWR at vertruleHTMLcolor%
- }{}%
-}%
+ \ifnumcomp{\value{LWR at mcolvertbarsr}}{=}{1}{%
+ \LWR at tdaddstyle%
+ border-right: 1px solid \LWR at vertruleHTMLcolor%
+ }{}%
+ \ifnumcomp{\value{LWR at mcolvertbarsr}}{>}{1}{%
+ \LWR at tdaddstyle%
+ border-right: 4px double \LWR at vertruleHTMLcolor%
+ }{}%
+ \ifnumcomp{\value{LWR at mcolvertbarsrdash}}{=}{1}{%
+ \LWR at tdaddstyle%
+ border-right: 1px dashed \LWR at vertruleHTMLcolor%
+ }{}%
+ \ifnumcomp{\value{LWR at mcolvertbarsrdash}}{>}{1}{%
+ \LWR at tdaddstyle%
+ border-right: 2px dashed \LWR at vertruleHTMLcolor%
+ }{}%
+ }%
}
% \end{macrocode}
% \end{macro}
@@ -28178,58 +28694,61 @@
%
% \begin{macrocode}
\NewDocumentCommand{\LWR at domulticolumn}{o o m m m +m}{%
-\LWR at traceinfo{LWR at domulticolumn -#1- -#2- -#4- -#5-}%
+ \LWR at traceinfo{LWR at domulticolumn -#1- -#2- -#4- -#5-}%
% \end{macrocode}
% Remember the text to be inserted, and
% remember that a valid column type was found:
% \begin{macrocode}
-\renewcommand{\LWR at multicoltext}{%
-#6%
-\global\booltrue{LWR at validtablecol}%
-}%
+ \renewcommand{\LWR at multicoltext}{%
+ #6%
+ \booltrue{LWR at validtablecol}%
+ }%
% \end{macrocode}
% Compute the rightmost column to be included.
% This is used to create the right trim.
% \changes{v0.43}{2017/11/07}{Fix: Multicolumn trim.}
% \begin{macrocode}
-\setcounter{LWR at lastmulticolumn}{\value{LWR at tableLaTeXcolindex}}%
-\addtocounter{LWR at lastmulticolumn}{#3}%
-\addtocounter{LWR at lastmulticolumn}{-1}%
+ \defcounter{LWR at lastmulticolumn}{\value{LWR at tableLaTeXcolindex}}%
+ \defaddtocounter{LWR at lastmulticolumn}{#3}%
+ \defaddtocounter{LWR at lastmulticolumn}{-1}%
% \end{macrocode}
% Row processing:
% \begin{macrocode}
-\LWR at maybenewtablerow%
+ \LWR at maybenewtablerow%
% \end{macrocode}
% Begin the opening table data tag:
% \begin{macrocode}
-\LWR at htmltag{td colspan="#4" %
+ \LWR at htmltag{%
+ td colspan="#4" %
% \end{macrocode}
%
% \begin{macrocode}
-\IfValueT{#2}{ % rows?
-rowspan="#2" %
+ \IfValueT{#2}{ % rows?
+ rowspan="#2" %
% \end{macrocode}
%
% \changes{v0.47}{2018/01/26}{Fix: Line wrap at \HTML\ hyphen.}
% \begin{macrocode}
-\IfValueT{#1}{% vpos?
-\ifstrequal{#1}{b}{style="\LWR at print@mbox{vertical-align:bottom}" }{}%
-\ifstrequal{#1}{t}{style="\LWR at print@mbox{vertical-align:top}" }{}%
-}% vpos?
-}% rows?
+ \IfValueT{#1}{% vpos?
+ \ifstrequal{#1}{b}%
+ {style="\LWR at print@mbox{vertical-align:bottom}" }{}%
+ \ifstrequal{#1}{t}%
+ {style="\LWR at print@mbox{vertical-align:top}" }{}%
+ }% vpos?
+ }% rows?
% \end{macrocode}
%
% \begin{macrocode}
- class="td%
+ class="td%
% \end{macrocode}
% Print the column type and vertical bars:
% \begin{macrocode}
-\setcounter{LWR at mcolvertbarsl}{0}%
-\setcounter{LWR at mcolvertbarsr}{0}%
-\setcounter{LWR at mcolvertbarsldash}{0}%
-\setcounter{LWR at mcolvertbarsrdash}{0}%
-\booltrue{LWR at mcolvertbaronleft}%
-\LWR at parsemulticolumnalignment{#5}{\LWR at printmccoltype}%
+ \defcounter{LWR at mcolvertbarsl}{0}%
+ \defcounter{LWR at mcolvertbarsr}{0}%
+ \defcounter{LWR at mcolvertbarsldash}{0}%
+ \defcounter{LWR at mcolvertbarsrdash}{0}%
+ \booltrue{LWR at mcolvertbaronleft}%
+ \LWR at parsemulticolumnalignment{#5}{\LWR at printmccoltype}%
% \end{macrocode}
% If this column has a cmidrule, add ``rule'' to the end of the \HTML\ class tag.
%
@@ -28236,9 +28755,15 @@
% If this position had a ``Y'' then add ``rule'' for a horizontal rule:
% \changes{v0.43}{2017/11/07}{Fix: Multicolumn trim.}
% \begin{macrocode}
-\LWR at subaddcmidruletrim%
-{\LWR at getexparray{LWR at trimlrules}{\arabic{LWR at tableLaTeXcolindex}}}%
-{\LWR at getexparray{LWR at trimrrules}{\arabic{LWR at lastmulticolumn}}}%
+ \LWR at subaddcmidruletrim%
+ {%
+ \LWR at getexparray{LWR at trimlrules}%
+ {\arabic{LWR at tableLaTeXcolindex}}%
+ }%
+ {%
+ \LWR at getexparray{LWR at trimrrules}%
+ {\arabic{LWR at lastmulticolumn}}%
+ }%
% \end{macrocode}
% Also add vertical bar class.
% \changes{v0.41}{2017/10/07}{Added vertical rules.}
@@ -28246,38 +28771,39 @@
% \changes{v0.56}{2018/04/30}{Adds support for double vertical rules.}
% \changes{v0.56}{2018/05/05}{Adds support for dashed vertical rules.}
% \begin{macrocode}
-\ifnumcomp{\value{LWR at mcolvertbarsl}}{=}{1}{ tvertbarl}{}%
-\ifnumcomp{\value{LWR at mcolvertbarsl}}{>}{1}{ tvertbarldouble}{}%
-\ifnumcomp{\value{LWR at mcolvertbarsr}}{=}{1}{ tvertbarr}{}%
-\ifnumcomp{\value{LWR at mcolvertbarsr}}{>}{1}{ tvertbarrdouble}{}%
-\ifnumcomp{\value{LWR at mcolvertbarsldash}}{=}{1}{ tvertbarldash}{}%
-\ifnumcomp{\value{LWR at mcolvertbarsldash}}{>}{1}{ tvertbarldoubledash}{}%
-\ifnumcomp{\value{LWR at mcolvertbarsrdash}}{=}{1}{ tvertbarrdash}{}%
-\ifnumcomp{\value{LWR at mcolvertbarsrdash}}{>}{1}{ tvertbarrdoubledash}{}%
+ \ifnumcomp{\value{LWR at mcolvertbarsl}}{=}{1}{ tvertbarl}{}%
+ \ifnumcomp{\value{LWR at mcolvertbarsl}}{>}{1}{ tvertbarldouble}{}%
+ \ifnumcomp{\value{LWR at mcolvertbarsr}}{=}{1}{ tvertbarr}{}%
+ \ifnumcomp{\value{LWR at mcolvertbarsr}}{>}{1}{ tvertbarrdouble}{}%
+ \ifnumcomp{\value{LWR at mcolvertbarsldash}}{=}{1}{ tvertbarldash}{}%
+ \ifnumcomp{\value{LWR at mcolvertbarsldash}}{>}{1}%
+ { tvertbarldoubledash}{}%
+ \ifnumcomp{\value{LWR at mcolvertbarsrdash}}{=}{1}{ tvertbarrdash}{}%
+ \ifnumcomp{\value{LWR at mcolvertbarsrdash}}{>}{1}%
+ { tvertbarrdoubledash}{}%
% \end{macrocode}
% Close the class tag's opening quote:
-"% NOT A TYPO
% \begin{macrocode}
-%
+ "%
% \end{macrocode}
% \changes{v0.42}{2017/10/26}{If \progcode{FormatWP} add cell alignment.}
% \begin{macrocode}
-\LWR at tdstartstyles%
+ \LWR at tdstartstyles%
% \end{macrocode}
% \changes{v0.49}{2018/02/18}{\pkg{xcolor}: Added tabular row colors.}
% \begin{macrocode}
-\LWR at addtabularrowcolor%
+ \LWR at addtabularrowcolor%
% \end{macrocode}
% \begin{macrocode}
-\LWR at addcmidrulewidth%
-\LWR at addcdashline%
-\LWR at addtabularhrulecolor%
-\LWR at addmulticolvertrulecolor%
-\LWR at addformatwpalignment{#5}%
-\LWR at tdendstyles%
-}% end of the opening table data tag
-\global\boolfalse{LWR at intabularmetadata}%
-\LWR at parsemulticolumnalignment{#5}{\LWR at printmccoldata}%
+ \LWR at addcmidrulewidth%
+ \LWR at addcdashline%
+ \LWR at addtabularhrulecolor%
+ \LWR at addmulticolvertrulecolor%
+ \LWR at addformatwpalignment{#5}%
+ \LWR at tdendstyles%
+ }% end of the opening table data tag
+ \boolfalse{LWR at intabularmetadata}%
+ \LWR at parsemulticolumnalignment{#5}{\LWR at printmccoldata}%
}
% \end{macrocode}
% \end{macro}
@@ -28292,20 +28818,20 @@
% \end{macrocode}
% Figure out how many extra \HTML\ columns to add for |@| and |!| columns:
% \begin{macrocode}
-\LWR at tabularhtmlcolumns{\arabic{LWR at tableLaTeXcolindex}}{#1}
+ \LWR at tabularhtmlcolumns{\arabic{LWR at tableLaTeXcolindex}}{#1}%
% \end{macrocode}
% Create the multicolumn tag:
% \begin{macrocode}
-\LWR at domulticolumn{#1}{\arabic{LWR at tabhtmlcoltotal}}{#2}{#3}%
+ \LWR at domulticolumn{#1}{\arabic{LWR at tabhtmlcoltotal}}{#2}{#3}%
% \end{macrocode}
% Move to the next \LaTeX\ column:
% \begin{macrocode}
-\addtocounter{LWR at tableLaTeXcolindex}{#1}%
-\addtocounter{LWR at tableLaTeXcolindex}{-1}%
+ \defaddtocounter{LWR at tableLaTeXcolindex}{#1}%
+ \defaddtocounter{LWR at tableLaTeXcolindex}{-1}%
% \end{macrocode}
% Skip any trailing |@| or |!| columns for this cell:
% \begin{macrocode}
-\global\booltrue{LWR at skipatbang}%
+ \booltrue{LWR at skipatbang}%
}
% \end{macrocode}
% \end{macro}
@@ -28317,15 +28843,7 @@
%
% \pkg{longtable} captions use \cs{multicolumn}.
-% \DescribeBoolean{LWR at starredlongtable}
-% Per the \pkg{caption} pacakge, step the counter if |longtable*|.
%
-% \begin{macrocode}
-\newbool{LWR at starredlongtable}
-\boolfalse{LWR at starredlongtable}
-% \end{macrocode}
-%
-%
% Per the \pkg{caption} package. User-redefinable float type.
% \begin{macrocode}
\providecommand*{\LTcaptype}{table}
@@ -28342,12 +28860,12 @@
% \end{macrocode}
% Remember the latest name for \cs{nameref}:
% \begin{macrocode}
-\IfValueTF{#2}{% optional given?
- \ifblank{#2}% optional empty?
- {\LWR at setlatestname{#3}}% empty
- {\LWR at setlatestname{#2}}% given and non-empty
-}% optional given
-{\LWR at setlatestname{#3}}% no optional
+ \IfValueTF{#2}{% optional given?
+ \ifblank{#2}% optional empty?
+ {\LWR at setlatestname{#3}}% empty
+ {\LWR at setlatestname{#2}}% given and non-empty
+ }% optional given
+ {\LWR at setlatestname{#3}}% no optional
% \end{macrocode}
% Create a multicolumn across all the columns:
%
@@ -28354,98 +28872,97 @@
% Figure out how many extra \HTML\ columns to add for |@| and |!| columns
% found between the first and the last column:
% \begin{macrocode}
-\LWR at tabularhtmlcolumns{1}{\arabic{LWR at tabletotalLaTeXcols}}
+ \LWR at tabularhtmlcolumns{1}{\arabic{LWR at tabletotalLaTeXcols}}%
% \end{macrocode}
% Create the multicolumn tag:
% \begin{macrocode}
-\LWR at domulticolumn{\arabic{LWR at tabletotalLaTeXcols}}%
- {\arabic{LWR at tabhtmlcoltotal}}%
- {P}%
-{% \LWR at domulticolumn
-\IfBooleanTF{#1}% star?
+ \LWR at domulticolumn{\arabic{LWR at tabletotalLaTeXcols}}%
+ {\arabic{LWR at tabhtmlcoltotal}}%
+ {P}%
+ {% \LWR at domulticolumn
+ \IfBooleanTF{#1}% star?
% \end{macrocode}
% Star version, show a caption but do not make a LOT entry:
% \begin{macrocode}
-{% yes star
- \LWR at figcaption%
- \LWR at isolate{#3}%
- \endLWR at figcaption%
-}%
-{% No star:
+ {% yes star
+ \LWR at figcaption%
+ \LWR at isolate{#3}%
+ \endLWR at figcaption%
+ }%
+ {% No star:
% \end{macrocode}
% Not the star version:
%
% Don't step the counter if |\caption[]{A caption.}|
% \begin{macrocode}
- \ifbool{LWR at starredlongtable}%
- {%
- \ifblank{#2}% TOC entry
- {}%
+ \ifbool{LWR at starredlongtable}%
{%
- \refstepcounter{\LTcaptype}%
- \protected at edef\@currentlabel{%
- \@nameuse{p@\LTcaptype}\@nameuse{the\LTcaptype}%
+ \ifblank{#2}% TOC entry
+ {}%
+ {%
+ \refstepcounter{\LTcaptype}%
+ \protected at edef\@currentlabel{%
+ \@nameuse{p@\LTcaptype}\@nameuse{the\LTcaptype}%
+ }%
}%
- }%
- }{}%
+ }{}%
% \end{macrocode}
% Create an \HTML\ caption. Afterwards, maybe make a LOT entry.
% \begin{macrocode}
- \LWR at figcaption%
- \LWR at isolate{\@nameuse{fnum@\LTcaptype}}%
- \CaptionSeparator%
- \LWR at isolate{#3}%
- \endLWR at figcaption%
+ \LWR at figcaption%
+ \LWR at isolate{\@nameuse{fnum@\LTcaptype}}%
+ \CaptionSeparator%
+ \LWR at isolate{#3}%
+ \endLWR at figcaption%
% \end{macrocode}
% See if an optional caption was given:
% \begin{macrocode}
- \ifblank{#2}% TOC entry empty
+ \ifblank{#2}% TOC entry empty
% \end{macrocode}
% if the optional caption was given, but empty, do not form a \TOC\ entry
% \begin{macrocode}
- {}%
+ {}%
% \end{macrocode}
% If the optional caption was given, but might only be |[]|:
% \begin{macrocode}
- {% TOC entry not empty
- \IfNoValueTF{#2}% No TOC entry?
+ {% TOC entry not empty
+ \IfNoValueTF{#2}% No TOC entry?
% \end{macrocode}
% The optional caption is |[]|:
% \begin{macrocode}
- {% No TOC entry
- \addcontentsline%
- {\@nameuse{ext@\LTcaptype}}%
- {\LTcaptype}%
- {%
- \protect\numberline%
- {\LWR at isolate{\@nameuse{p@\LTcaptype}}\@nameuse{the\LTcaptype}}%
- {\ignorespaces \LWR at isolate{#3}\protect\relax}%
- }%
- }% end of No TOC entry
+ {% No TOC entry
+ \addcontentsline%
+ {\@nameuse{ext@\LTcaptype}}%
+ {\LTcaptype}%
+ {%
+ \protect\numberline%
+ {\LWR at isolate{\@nameuse{p@\LTcaptype}}\@nameuse{the\LTcaptype}}%
+ {\ignorespaces \LWR at isolate{#3}\protect\relax}%
+ }%
+ }% end of No TOC entry
% \end{macrocode}
% The optional caption has text enclosed:
% \begin{macrocode}
- {% yes TOC entry
- \addcontentsline%
- {\@nameuse{ext@\LTcaptype}}%
- {\LTcaptype}%
- {%
- \protect\numberline%
- {\LWR at isolate{\@nameuse{p@\LTcaptype}}\@nameuse{the\LTcaptype}}%
- {\ignorespaces \LWR at isolate{#2}\protect\relax}%
- }%
- }% end of yes TOC entry
- }% end of TOC entry not empty
-}% end of no star
+ {% yes TOC entry
+ \addcontentsline%
+ {\@nameuse{ext@\LTcaptype}}%
+ {\LTcaptype}%
+ {%
+ \protect\numberline%
+ {\LWR at isolate{\@nameuse{p@\LTcaptype}}\@nameuse{the\LTcaptype}}%
+ {\ignorespaces \LWR at isolate{#2}\protect\relax}%
+ }%
+ }% end of yes TOC entry
+ }% end of TOC entry not empty
+ }% end of no star
% \end{macrocode}
% Skip any trailing |@| or |!| columns for this cell:
% \begin{macrocode}
-\global\booltrue{LWR at skipatbang}%
-}% end of \LWR at domulticolumn
+ \booltrue{LWR at skipatbang}%
+ }% end of \LWR at domulticolumn
+ \defaddtocounter{LWR at tableLaTeXcolindex}{\value{LWR at tabletotalLaTeXcols}}%
+ \defaddtocounter{LWR at tableLaTeXcolindex}{-1}
-\addtocounter{LWR at tableLaTeXcolindex}{\arabic{LWR at tabletotalLaTeXcols}}
-\addtocounter{LWR at tableLaTeXcolindex}{-1}
-
}
% \end{macrocode}
% \end{macro}
@@ -28486,7 +29003,7 @@
% \begin{macrocode}
\ifdefempty{\LWR at atbangspec}%
{}%
- {\addtocounter{LWR at tabhtmlcoltotal}{1}}%
+ {\defaddtocounter{LWR at tabhtmlcoltotal}{1}}%
% \end{macrocode}
% Likewise for the |!| columns:
% \begin{macrocode}
@@ -28493,7 +29010,7 @@
\edef\LWR at atbangspec{\LWR at getexparray{LWR at colbangspec}{#1}}%
\ifdefempty{\LWR at atbangspec}%
{}%
- {\addtocounter{LWR at tabhtmlcoltotal}{1}}%
+ {\defaddtocounter{LWR at tabhtmlcoltotal}{1}}%
}
% \end{macrocode}
% \end{macro}
@@ -28512,28 +29029,28 @@
% and begin with the count being the \LaTeX\ span, to which additional |@| and |!|
% columns may be added:
% \begin{macrocode}
-\setcounter{LWR at tabhtmlcolindex}{#1}%
-\setcounter{LWR at tabhtmlcoltotal}{#2}%
-\setcounter{LWR at tabhtmlcolend}{#1}%
-\addtocounter{LWR at tabhtmlcolend}{#2}%
+ \defcounter{LWR at tabhtmlcolindex}{#1}%
+ \defcounter{LWR at tabhtmlcoltotal}{#2}%
+ \defcounter{LWR at tabhtmlcolend}{#1}%
+ \defaddtocounter{LWR at tabhtmlcolend}{#2}%
% \end{macrocode}
% If at the left edge, add the at/bang columns for the left edge:
% \begin{macrocode}
-\ifnumcomp{\value{LWR at tabhtmlcolindex}}{=}{1}{%
- \LWR at subtabularhtmlcolumns{leftedge}%
-}{}%
+ \ifnumcomp{\value{LWR at tabhtmlcolindex}}{=}{1}{%
+ \LWR at subtabularhtmlcolumns{leftedge}%
+ }{}%
% \end{macrocode}
% Walk across the \LaTeX\ columns looking for |@| and |!| columns:
% \begin{macrocode}
-\whileboolexpr{%
- test {%
- \ifnumcomp{\value{LWR at tabhtmlcolindex}}{<}{\value{LWR at tabhtmlcolend}}%
+ \whileboolexpr{%
+ test {%
+ \ifnumcomp{\value{LWR at tabhtmlcolindex}}{<}{\value{LWR at tabhtmlcolend}}%
+ }%
}%
-}%
-{%
- \LWR at subtabularhtmlcolumns{\arabic{LWR at tabhtmlcolindex}}%
- \addtocounter{LWR at tabhtmlcolindex}{1}%
-}% whiledo
+ {%
+ \LWR at subtabularhtmlcolumns{\arabic{LWR at tabhtmlcolindex}}%
+ \defaddtocounter{LWR at tabhtmlcolindex}{1}%
+ }% whiledo
}
% \end{macrocode}
% \end{macro}
@@ -28721,9 +29238,9 @@
% \begin{macrocode}
\newcommand*{\ResumeTabular}{%
-\global\boolfalse{LWR at exitingtabular}%
-\global\boolfalse{LWR at tabularmutemods}%
-\LWR at getmynexttoken%
+ \boolfalse{LWR at exitingtabular}%
+ \boolfalse{LWR at tabularmutemods}%
+ \LWR at getmynexttoken%
}
% \end{macrocode}
% \end{macro}
@@ -28758,23 +29275,9 @@
% \end{macrocode}
-% \DescribeBoolean{LWR at exitingtabular}
-% When \cs{end} is found, turns off the next opening data tag.
-% \begin{macrocode}
-\newbool{LWR at exitingtabular}
-% \end{macrocode}
-% \DescribeBoolean{LWR at tabularmutemods}
-% Mutes \HTML\ output for |@|, |!|, |<| and |>|.
-%
-% This is used while printing the final row to generate \cs{bottomrule}s.
-% \begin{macrocode}
-\newbool{LWR at tabularmutemods}
-% \end{macrocode}
-
-
% \begin{macro}{\LWR at tabledatacolumntag}
% Open a new \HTML\ table cell unless the next token is for a macro
% which does not create data, such as \cs{hline}, \cs{toprule}, etc:
@@ -28786,7 +29289,7 @@
% \begin{macrocode}
\newcommand*{\LWR at tabledatacolumntag}%
{%
-\LWR at traceinfo{LWR at tabledatacolumntag}%
+ \LWR at traceinfo{LWR at tabledatacolumntag}%
% \end{macrocode}
% \hspace*{.5in} |\show\LWR at mynexttoken| to see what tokens to look for
% \begin{macrocode}
@@ -28793,134 +29296,134 @@
% \end{macrocode}
% If not any of the below, start a new table cell:
% \begin{macrocode}
-\global\let\LWR at mynextaction\LWR at tabledatasinglecolumntag%
+ \global\let\LWR at mynextaction\LWR at tabledatasinglecolumntag%
% \end{macrocode}
% If exiting the tabular:
% \begin{macrocode}
-\ifdefequal{\LWR at mynexttoken}{\end}%
- {\global\booltrue{LWR at exitingtabular}}{}%
+ \ifdefequal{\LWR at mynexttoken}{\end}%
+ {\booltrue{LWR at exitingtabular}}{}%
% \end{macrocode}
% \env{longtable} can have a caption in a cell
% \begin{macrocode}
-\ifdefequal{\LWR at mynexttoken}{\caption}%
- {\global\let\LWR at mynextaction\LWR at donothing}{}%
+ \ifdefequal{\LWR at mynexttoken}{\caption}%
+ {\global\let\LWR at mynextaction\LWR at donothing}{}%
% \end{macrocode}
% Look for other things which would not start a table cell:
% \begin{macrocode}
-\ifdefequal{\LWR at mynexttoken}{\multicolumn}%
- {\global\let\LWR at mynextaction\LWR at donothing}{}%
-\ifdefequal{\LWR at mynexttoken}{\multirow}%
- {\global\let\LWR at mynextaction\LWR at donothing}{}%
-\ifdefequal{\LWR at mynexttoken}{\multicolumnrow}%
- {\global\let\LWR at mynextaction\LWR at donothing}{}%
-\ifdefequal{\LWR at mynexttoken}{\noalign}%
- {\global\let\LWR at mynextaction\LWR at donothing}{}%
+ \ifdefequal{\LWR at mynexttoken}{\multicolumn}%
+ {\global\let\LWR at mynextaction\LWR at donothing}{}%
+ \ifdefequal{\LWR at mynexttoken}{\multirow}%
+ {\global\let\LWR at mynextaction\LWR at donothing}{}%
+ \ifdefequal{\LWR at mynexttoken}{\multicolumnrow}%
+ {\global\let\LWR at mynextaction\LWR at donothing}{}%
+ \ifdefequal{\LWR at mynexttoken}{\noalign}%
+ {\global\let\LWR at mynextaction\LWR at donothing}{}%
% \end{macrocode}
% If an \cs{mrowcell}, this is a cell to be skipped over:
% \begin{macrocode}
-\ifdefequal{\LWR at mynexttoken}{\mrowcell}%
- {\global\let\LWR at mynextaction\LWR at donothing}{}%
+ \ifdefequal{\LWR at mynexttoken}{\mrowcell}%
+ {\global\let\LWR at mynextaction\LWR at donothing}{}%
% \end{macrocode}
% If an \cs{mcolrowcell}, this is a cell to be skipped over:
% \begin{macrocode}
-\ifdefequal{\LWR at mynexttoken}{\mcolrowcell}%
- {\global\let\LWR at mynextaction\LWR at donothing}{}%
+ \ifdefequal{\LWR at mynexttoken}{\mcolrowcell}%
+ {\global\let\LWR at mynextaction\LWR at donothing}{}%
% \end{macrocode}
% \begin{macrocode}
-\ifdefequal{\LWR at mynexttoken}{\TabularMacro}%
- {\global\let\LWR at mynextaction\LWR at donothing}{}%
+ \ifdefequal{\LWR at mynexttoken}{\TabularMacro}%
+ {\global\let\LWR at mynextaction\LWR at donothing}{}%
% \end{macrocode}
% \begin{macrocode}
-\ifdefequal{\LWR at mynexttoken}{\hline}%
- {\global\let\LWR at mynextaction\LWR at donothing}{}%
+ \ifdefequal{\LWR at mynexttoken}{\hline}%
+ {\global\let\LWR at mynextaction\LWR at donothing}{}%
% \end{macrocode}
% \begin{macrocode}
-\ifdefequal{\LWR at mynexttoken}{\firsthline}%
- {\global\let\LWR at mynextaction\LWR at donothing}{}%
+ \ifdefequal{\LWR at mynexttoken}{\firsthline}%
+ {\global\let\LWR at mynextaction\LWR at donothing}{}%
% \end{macrocode}
% \begin{macrocode}
-\ifdefequal{\LWR at mynexttoken}{\lasthline}%
- {\global\let\LWR at mynextaction\LWR at donothing}{}%
+ \ifdefequal{\LWR at mynexttoken}{\lasthline}%
+ {\global\let\LWR at mynextaction\LWR at donothing}{}%
% \end{macrocode}
% \begin{macrocode}
-\ifdefequal{\LWR at mynexttoken}{\toprule}%
- {\global\let\LWR at mynextaction\LWR at donothing}{}%
+ \ifdefequal{\LWR at mynexttoken}{\toprule}%
+ {\global\let\LWR at mynextaction\LWR at donothing}{}%
% \end{macrocode}
% \begin{macrocode}
-\ifdefequal{\LWR at mynexttoken}{\midrule}%
- {\global\let\LWR at mynextaction\LWR at donothing}{}%
+ \ifdefequal{\LWR at mynexttoken}{\midrule}%
+ {\global\let\LWR at mynextaction\LWR at donothing}{}%
% \end{macrocode}
% \begin{macrocode}
-\ifdefequal{\LWR at mynexttoken}{\cmidrule}%
- {\global\let\LWR at mynextaction\LWR at donothing}{}%
+ \ifdefequal{\LWR at mynexttoken}{\cmidrule}%
+ {\global\let\LWR at mynextaction\LWR at donothing}{}%
% \end{macrocode}
% \changes{v0.56}{2018/05/02}{Fix: \cs{morecmidrules}}
% \begin{macrocode}
-\ifdefequal{\LWR at mynexttoken}{\morecmidrules}%
- {\global\let\LWR at mynextaction\LWR at donothing}{}%
+ \ifdefequal{\LWR at mynexttoken}{\morecmidrules}%
+ {\global\let\LWR at mynextaction\LWR at donothing}{}%
% \end{macrocode}
% \begin{macrocode}
-\ifdefequal{\LWR at mynexttoken}{\specialrule}%
- {\global\let\LWR at mynextaction\LWR at donothing}{}%
+ \ifdefequal{\LWR at mynexttoken}{\specialrule}%
+ {\global\let\LWR at mynextaction\LWR at donothing}{}%
% \end{macrocode}
% \begin{macrocode}
-\ifdefequal{\LWR at mynexttoken}{\cline}%
- {\global\let\LWR at mynextaction\LWR at donothing}{}%
+ \ifdefequal{\LWR at mynexttoken}{\cline}%
+ {\global\let\LWR at mynextaction\LWR at donothing}{}%
% \end{macrocode}
% \begin{macrocode}
-\ifdefequal{\LWR at mynexttoken}{\bottomrule}%
- {\global\let\LWR at mynextaction\LWR at donothing}{}%
+ \ifdefequal{\LWR at mynexttoken}{\bottomrule}%
+ {\global\let\LWR at mynextaction\LWR at donothing}{}%
% \end{macrocode}
% \begin{macrocode}
-\ifdefequal{\LWR at mynexttoken}{\rowcolor}%
- {\global\let\LWR at mynextaction\LWR at donothing}{}%
+ \ifdefequal{\LWR at mynexttoken}{\rowcolor}%
+ {\global\let\LWR at mynextaction\LWR at donothing}{}%
% \end{macrocode}
% \begin{macrocode}
-\ifdefequal{\LWR at mynexttoken}{\arrayrulecolor}%
- {\global\let\LWR at mynextaction\LWR at donothing}{}%
+ \ifdefequal{\LWR at mynexttoken}{\arrayrulecolor}%
+ {\global\let\LWR at mynextaction\LWR at donothing}{}%
% \end{macrocode}
% \begin{macrocode}
-\ifdefequal{\LWR at mynexttoken}{\doublerulesepcolor}%
- {\global\let\LWR at mynextaction\LWR at donothing}{}%
+ \ifdefequal{\LWR at mynexttoken}{\doublerulesepcolor}%
+ {\global\let\LWR at mynextaction\LWR at donothing}{}%
% \end{macrocode}
% \begin{macrocode}
-\ifdefequal{\LWR at mynexttoken}{\warpprintonly}%
- {\global\let\LWR at mynextaction\LWR at donothing}{}%
+ \ifdefequal{\LWR at mynexttoken}{\warpprintonly}%
+ {\global\let\LWR at mynextaction\LWR at donothing}{}%
% \end{macrocode}
% \begin{macrocode}
-\ifdefequal{\LWR at mynexttoken}{\warpHTMLonly}%
- {\global\let\LWR at mynextaction\LWR at donothing}{}%
+ \ifdefequal{\LWR at mynexttoken}{\warpHTMLonly}%
+ {\global\let\LWR at mynextaction\LWR at donothing}{}%
% \end{macrocode}
% \begin{macrocode}
-\ifdefequal{\LWR at mynexttoken}{\ldelim}%
- {\global\let\LWR at mynextaction\LWR at donothing}{}%
+ \ifdefequal{\LWR at mynexttoken}{\ldelim}%
+ {\global\let\LWR at mynextaction\LWR at donothing}{}%
% \end{macrocode}
% \begin{macrocode}
-\ifdefequal{\LWR at mynexttoken}{\rdelim}%
- {\global\let\LWR at mynextaction\LWR at donothing}{}%
+ \ifdefequal{\LWR at mynexttoken}{\rdelim}%
+ {\global\let\LWR at mynextaction\LWR at donothing}{}%
% \end{macrocode}
% For \pkg{arydshln}:
% \begin{macrocode}
-\ifdefequal{\LWR at mynexttoken}{\hdashline}%
- {\global\let\LWR at mynextaction\LWR at donothing}{}%
+ \ifdefequal{\LWR at mynexttoken}{\hdashline}%
+ {\global\let\LWR at mynextaction\LWR at donothing}{}%
% \end{macrocode}
% \begin{macrocode}
-\ifdefequal{\LWR at mynexttoken}{\cdashline}%
- {\global\let\LWR at mynextaction\LWR at donothing}{}%
+ \ifdefequal{\LWR at mynexttoken}{\cdashline}%
+ {\global\let\LWR at mynextaction\LWR at donothing}{}%
% \end{macrocode}
% \begin{macrocode}
-\ifdefequal{\LWR at mynexttoken}{\firsthdashline}%
- {\global\let\LWR at mynextaction\LWR at donothing}{}%
+ \ifdefequal{\LWR at mynexttoken}{\firsthdashline}%
+ {\global\let\LWR at mynextaction\LWR at donothing}{}%
% \end{macrocode}
% \begin{macrocode}
-\ifdefequal{\LWR at mynexttoken}{\lasthdashline}%
- {\global\let\LWR at mynextaction\LWR at donothing}{}%
+ \ifdefequal{\LWR at mynexttoken}{\lasthdashline}%
+ {\global\let\LWR at mynextaction\LWR at donothing}{}%
% \end{macrocode}
% Ignore an empty line between rows:
% \changes{v0.45}{2017/12/06}{Fix: Empty line between rows.}
% \begin{macrocode}
-\ifdefequal{\LWR at mynexttoken}{\par}%
- {\global\let\LWR at mynextaction\LWR at donothing}{}%
+ \ifdefequal{\LWR at mynexttoken}{\par}%
+ {\global\let\LWR at mynextaction\LWR at donothing}{}%
% \end{macrocode}
%
% No action for an \cs{end} token.
@@ -28930,9 +29433,9 @@
%
% Start the new table cell if was not any of the above:
% \begin{macrocode}
-\LWR at traceinfo{LWR at tabledatacolumntag: about to do mynext}%
-\LWR at mynextaction%
-\LWR at traceinfo{LWR at tabledatacolumntag: done}%
+ \LWR at traceinfo{LWR at tabledatacolumntag: about to do mynext}%
+ \LWR at mynextaction%
+ \LWR at traceinfo{LWR at tabledatacolumntag: done}%
}
% \end{macrocode}
% \end{macro}
@@ -28996,26 +29499,19 @@
%
% These are default defininitions in case \pkg{booktabs} is not loaded,
% and are not expected to used, but must exist as placeholders.
-% They are pre-deleted in case \pkg{memoir} has already loaded \pkg{booktabs}.
+% \pkg{memoir} may have already loaded \pkg{booktabs}.
%
% \changes{v0.34}{2017/08/08}{\pkg{booktabs}: Works inside \env{lateximage}.}
% \changes{v0.58}{2018/06/21}{\pkg{memoir}: Fix for \pkg{booktabs}.}
+% \changes{v0.79}{2019/12/09}{\pkg{booktabs}: Fix for \pkg{memoir} with \env{lateximage}.}
% \begin{macrocode}
-\LetLtxMacro\toprule\relax
-\LetLtxMacro\midrule\relax
-\LetLtxMacro\cmidrule\cline
-\LetLtxMacro\bottomrule\relax
-\LetLtxMacro\addlinespace\relax
-\LetLtxMacro\morecmidrules\relax
-\LetLtxMacro\specialrule\relax
-
-\newcommand*{\toprule}[1][]{\hline}
-\newcommand*{\midrule}[1][]{\hline}
-\LetLtxMacro\cmidrule\cline
-\newcommand*{\bottomrule}[1][]{\hline}
-\newcommand*{\addlinespace}[1][]{}
-\newcommand*{\morecmidrules}{}
-\newcommand*{\specialrule}[3]{\hline}
+\providecommand*{\toprule}[1][]{\hline}
+\providecommand*{\midrule}[1][]{\hline}
+\providecommand*{\cmidrule}{\cline}
+\providecommand*{\bottomrule}[1][]{\hline}
+\providecommand*{\addlinespace}[1][]{}
+\providecommand*{\morecmidrules}{}
+\providecommand*{\specialrule}[3]{\hline}
% \end{macrocode}
%
%
@@ -29022,17 +29518,18 @@
% \begin{macro}{\noalign} \marg{text}
% Redefined for use inside \env{tabular}.
% \changes{v0.49}{2018/02/18}{Fix: \cs{noalign} inside \env{tabular}.}
+% \changes{v0.79}{2020/01/18}{Fix: Nested \env{tabular}s.}
% \begin{macrocode}
\LetLtxMacro\LWR at orignoalign\noalign
\newcommand{\LWR at tabularnoalign}[1]{%
-\begingroup%
-\global\advance\rownum\m at ne%
-\renewcommand*{\LWR at xcolorrowHTMLcolor}{}%
-\multicolumn{\value{LWR at tabletotalLaTeXcols}}{l}{#1} \\
-\endgroup%
-% \@rowc at lors%
-\LWR at getmynexttoken%
+ \advance\rownum\m at ne%
+ \LetLtxMacro\LWR at save@xcolorrowHTMLcolor\LWR at xcolorrowHTMLcolor%
+ \renewcommand*{\LWR at xcolorrowHTMLcolor}{}%
+ \multicolumn{\value{LWR at tabletotalLaTeXcols}}{l}{#1} \\
+ \LetLtxMacro\LWR at xcolorrowHTMLcolor\LWR at save@xcolorrowHTMLcolor%
+ % \@rowc at lors%
+ \LWR at getmynexttoken%
}
% \end{macrocode}
% \end{macro}
@@ -29046,21 +29543,23 @@
%
% \begin{macrocode}
\AtBeginDocument{
+
\@ifpackageloaded{lwarp-tabls}
{
-\newcommand*{\LWR at HTMLhline}[1][]{%
- \ifbool{FormatWP}%
- {\LWR at docmidrule{1-\arabic{LWR at tabletotalLaTeXcols}}}%
- {\addtocounter{LWR at hlines}{1}}%
- \LWR at getmynexttoken}%
+ \newcommand*{\LWR at HTMLhline}[1][]{%
+ \ifbool{FormatWP}%
+ {\LWR at docmidrule{1-\arabic{LWR at tabletotalLaTeXcols}}}%
+ {\defaddtocounter{LWR at hlines}{1}}%
+ \LWR at getmynexttoken}%
}
{
-\newcommand*{\LWR at HTMLhline}{%
- \ifbool{FormatWP}%
- {\LWR at docmidrule{1-\arabic{LWR at tabletotalLaTeXcols}}}%
- {\addtocounter{LWR at hlines}{1}}%
- \LWR at getmynexttoken}%
+ \newcommand*{\LWR at HTMLhline}{%
+ \ifbool{FormatWP}%
+ {\LWR at docmidrule{1-\arabic{LWR at tabletotalLaTeXcols}}}%
+ {\defaddtocounter{LWR at hlines}{1}}%
+ \LWR at getmynexttoken}%
}
+
}% AtBeginDocument
% \end{macrocode}
% \end{macro}
@@ -29069,7 +29568,7 @@
% \begin{macro}{\LWR at HTMLcline} \marg{columns}
% \begin{macrocode}
\NewDocumentCommand{\LWR at HTMLcline}{m}%
-{\LWR at docmidrule{#1}\LWR at getmynexttoken}%
+ {\LWR at docmidrule{#1}\LWR at getmynexttoken}%
% \end{macrocode}
% \end{macro}
@@ -29129,8 +29628,9 @@
\NewDocumentCommand{\LWR at HTML@@tabular}{d<> o m}
{%
-\LWR at traceinfo{LWR at HTML@@tabular started}%
+ \LWR at traceinfo{LWR at HTML@@tabular started}%
% \end{macrocode}
+%
% In \LaTeX, a \env{tabular} may be placed inside a \env{minipage},
% \watchout[\element{table} inside \element{span}]
% but in \HTML\ a \element{table} may not be inside a \element{span}.
@@ -29146,28 +29646,28 @@
% a warning is issued here instructing the user to please isolate the \element{span}
% to print-only.
% \begin{macrocode}
-\ifnumcomp{\value{LWR at spandepth}}{>}{0}{%
- \PackageWarning{lwarp}{%
- A tabular is being used inside a span such as\MessageBreak
- a minipage. Some formatting may not be correct\MessageBreak
- in the tabular.\MessageBreak
- It is recommended to use \protect\warpprintonly\space or the\MessageBreak
- warpprint environment to isolate the span to\MessageBreak
- print-only,%
- }
-}{}%
-\addtocounter{LWR at tabulardepth}{1}%
+ \ifnumcomp{\value{LWR at spandepth}}{>}{0}{%
+ \PackageWarning{lwarp}{%
+ A tabular is being used inside a span such as\MessageBreak
+ a minipage. Some formatting may not be correct\MessageBreak
+ in the tabular.\MessageBreak
+ It is recommended to use \protect\warpprintonly\space or the\MessageBreak
+ warpprint environment to isolate the span to\MessageBreak
+ print-only,%
+ }
+ }{}%
+ \addtocounter{LWR at tabulardepth}{1}%
% \end{macrocode}
% Not yet started a table row:
% \begin{macrocode}
-\global\boolfalse{LWR at startedrow}%
+ \boolfalse{LWR at startedrow}%
% \end{macrocode}
% Not yet doing any rules:
% \begin{macrocode}
-\setcounter{LWR at hlines}{0}%
-\setcounter{LWR at hdashedlines}{0}%
-\global\boolfalse{LWR at doingtbrule}%
-\global\boolfalse{LWR at doingcmidrule}%
+ \defcounter{LWR at hlines}{0}%
+ \defcounter{LWR at hdashedlines}{0}%
+ \boolfalse{LWR at doingtbrule}%
+ \boolfalse{LWR at doingcmidrule}%
% \end{macrocode}
%
% For \pkg{babel-french}, turn off auto spacing one time, then nullify
@@ -29176,33 +29676,38 @@
% \changes{v0.41}{2017/10/06}{Fix: \cs{NoAutoSpacing} in a tabular
% with \pkg{babel-french}.}
% \begin{macrocode}
-\LWR at nullifyNoAutoSpacing%
+ \LWR at nullifyNoAutoSpacing%
% \end{macrocode}
%
% Have not yet found the end of tabular command.
% Unmute the |@| and |!| columns.
% \begin{macrocode}
-\global\boolfalse{LWR at exitingtabular}%
-\global\boolfalse{LWR at tabularmutemods}%
+ \boolfalse{LWR at exitingtabular}%
+ \boolfalse{LWR at tabularmutemods}%
% \end{macrocode}
%
% Error if failed to use \cs{mrowcell} or \cs{mcolrowcell} when needed.
% \changes{v0.69}{2019/03/07}{Error if \cs{multirow} without \cs{mrowcell}.}
% \begin{macrocode}
-\boolfalse{LWR at usedmultirow}
-\boolfalse{LWR at foundmrowcell}
+ \boolfalse{LWR at usedmultirow}%
+ \boolfalse{LWR at foundmrowcell}%
% \end{macrocode}
%
+%
+% \begin{macrocode}
+ \renewcommand*{\LWR at multicoltext}{}%
+% \end{macrocode}
+%
% Create the |table| tag:
% \begin{macrocode}
-\global\booltrue{LWR at intabularmetadata}%
-\LWR at traceinfo{LWR@@tabular: About to LWR at forecenewpage.}%
-\LWR at forcenewpage
-\LWR at htmlblocktag{table}%
+ \booltrue{LWR at intabularmetadata}%
+ \LWR at traceinfo{LWR@@tabular: About to LWR at forecenewpage.}%
+ \LWR at forcenewpage
+ \LWR at htmlblocktag{table}%
% \end{macrocode}
% Parse the table columns:
% \begin{macrocode}
-\LWR at parsetablecols{#3}%
+ \LWR at parsetablecols{#3}%
% \end{macrocode}
%
% Table col spec is: \cs{LWR at tablecolspec} which is a string of |llccrr|, etc.
@@ -29209,40 +29714,41 @@
%
% Do not place the table inside a paragraph:
% \begin{macrocode}
-\LWR at stoppars%
+ \LWR at stoppars%
% \end{macrocode}
% Track column \#:
% \begin{macrocode}
-\setcounter{LWR at tableLaTeXcolindex}{1}%
+ \defcounter{LWR at tableLaTeXcolindex}{1}%
% \end{macrocode}
% Have not yet added data in this column:
% \begin{macrocode}
-\global\boolfalse{LWR at tabularcelladded}%
+ \global\boolfalse{LWR at tabularcelladded}%
% \end{macrocode}
% Start looking for midrules:
% \begin{macrocode}
-\LWR at clearmidrules%
+ \LWR at clearmidrules%
% \end{macrocode}
% |\\| becomes a macro to end the table row:
% \begin{macrocode}
-\LetLtxMacro{\\}{\LWR at tabularendofline}%
+ \LetLtxMacro{\\}{\LWR at tabularendofline}%
% \end{macrocode}
%
% \cs{warpprintonly} inside a \env{tabular} must grab the next token.
% \changes{v0.68}{2019/03/01}{Fix: \cs{warpprintonly} inside \env{tabular}.}
% \begin{macrocode}
-\LetLtxMacro\warpprintonly\LWR at tabular@warpprintonly%
+ \LetLtxMacro\warpprintonly\LWR at tabular@warpprintonly%
% \end{macrocode}
%
% The following adjust for \pkg{colortbl}.
% \changes{v0.48}{2018/02/06}{\pkg{colortbl}: Added.}
+% \changes{v0.79}{2020/01/18}{\pkg{colortbl}: Fix: Nested \env{tabular}s.}
% \begin{macrocode}
-\LetLtxMacro\arrayrulecolor\arrayrulecolornexttoken%
-\LetLtxMacro\doublerulesepcolor\doublerulesepcolornexttoken%
-\gdef\LWR at columnHTMLcolor{}%
-\gdef\LWR at rowHTMLcolor{}%
-\gdef\LWR at cellHTMLcolor{}%
-\@rowcolors%
+ \LetLtxMacro\arrayrulecolor\arrayrulecolornexttoken%
+ \LetLtxMacro\doublerulesepcolor\doublerulesepcolornexttoken%
+ \def\LWR at columnHTMLcolor{}%
+ \def\LWR at rowHTMLcolor{}%
+ \def\LWR at cellHTMLcolor{}%
+ \@rowcolors%
% \end{macrocode}
%
% The vertical rules are set to the color active at the start of the tabular.
@@ -29250,14 +29756,14 @@
% but not the vertical rules.
% \changes{v0.65}{2018/12/19}{Fix: Rule color.}
% \begin{macrocode}
-\ifdefvoid{\LWR at ruleHTMLcolor}%
- {\edef\LWR at vertruleHTMLcolor{black}}%
- {\edef\LWR at vertruleHTMLcolor{\LWR at origpound\LWR at ruleHTMLcolor}}%
+ \ifdefvoid{\LWR at ruleHTMLcolor}%
+ {\edef\LWR at vertruleHTMLcolor{black}}%
+ {\edef\LWR at vertruleHTMLcolor{\LWR at origpound\LWR at ruleHTMLcolor}}%
% \end{macrocode}
%
% Tracking the depth of cell color \element{div}s:
% \begin{macrocode}
-\setcounter{LWR at cellcolordepth}{0}%
+ \defcounter{LWR at cellcolordepth}{0}%
% \end{macrocode}
%
% The following may appear before a data cell is created,
@@ -29266,39 +29772,39 @@
%
% The optional parameter for \cs{hline} supports the \pkg{tabls} package.
% \begin{macrocode}
-\LWR at traceinfo{LWR@@HTML at tabular: redefining macros}%
-\LetLtxMacro\noalign\LWR at tabularnoalign%
-\LetLtxMacro\hline\LWR at HTMLhline%
-\LetLtxMacro\cline\LWR at HTMLcline%
+ \LWR at traceinfo{LWR@@HTML at tabular: redefining macros}%
+ \LetLtxMacro\noalign\LWR at tabularnoalign%
+ \LetLtxMacro\hline\LWR at HTMLhline%
+ \LetLtxMacro\cline\LWR at HTMLcline%
% \end{macrocode}
% \begin{macrocode}
-\DeclareDocumentCommand{\hdashline}{o}{%
- \ifbool{FormatWP}%
- {\LWR at docdashline{1-\arabic{LWR at tabletotalLaTeXcols}}}%
- {\addtocounter{LWR at hdashedlines}{1}}%
- \LWR at getmynexttoken%
-}%
+ \DeclareDocumentCommand{\hdashline}{o}{%
+ \ifbool{FormatWP}%
+ {\LWR at docdashline{1-\arabic{LWR at tabletotalLaTeXcols}}}%
+ {\defaddtocounter{LWR at hdashedlines}{1}}%
+ \LWR at getmynexttoken%
+ }%
% \end{macrocode}
% \begin{macrocode}
-\DeclareDocumentCommand{\cdashline}{m}{%
- \LWR at docdashline{##1}\LWR at getmynexttoken%
-}%
+ \DeclareDocumentCommand{\cdashline}{m}{%
+ \LWR at docdashline{##1}\LWR at getmynexttoken%
+ }%
% \end{macrocode}
% \begin{macrocode}
-\DeclareDocumentCommand{\firsthdashline}{o}{%
- \ifbool{FormatWP}%
- {\LWR at docdashline{1-\arabic{LWR at tabletotalLaTeXcols}}}%
- {\addtocounter{LWR at hdashedlines}{1}}%
- \LWR at getmynexttoken%
-}%
+ \DeclareDocumentCommand{\firsthdashline}{o}{%
+ \ifbool{FormatWP}%
+ {\LWR at docdashline{1-\arabic{LWR at tabletotalLaTeXcols}}}%
+ {\defaddtocounter{LWR at hdashedlines}{1}}%
+ \LWR at getmynexttoken%
+ }%
% \end{macrocode}
% \begin{macrocode}
-\DeclareDocumentCommand{\lasthdashline}{o}{%
- \ifbool{FormatWP}%
- {\LWR at docdashline{1-\arabic{LWR at tabletotalLaTeXcols}}}%
- {\addtocounter{LWR at hdashedlines}{1}}%
- \LWR at getmynexttoken%
-}%
+ \DeclareDocumentCommand{\lasthdashline}{o}{%
+ \ifbool{FormatWP}%
+ {\LWR at docdashline{1-\arabic{LWR at tabletotalLaTeXcols}}}%
+ {\defaddtocounter{LWR at hdashedlines}{1}}%
+ \LWR at getmynexttoken%
+ }%
% \end{macrocode}
% The following create data cells and will have no more data in this cell,
% so we do not want to look ahead for a possible data cell,
@@ -29305,47 +29811,47 @@
% so do not want to use \cs{LWR at getmynexttoken}.
% \changes{v0.69}{2019/03/07}{Error if \cs{multirow} without \cs{mrowcell}.}
% \begin{macrocode}
-\renewcommand{\multicolumn}{\LWR at htmlmulticolumn}%
-\renewcommand*{\mrowcell}{%
- \LWR at maybenewtablerow%
- \LWR at tabularleftedge%
- \global\booltrue{LWR at skippingmrowcell}%
- \booltrue{LWR at foundmrowcell}%
-}%
-\renewcommand*{\mcolrowcell}{%
- \LWR at maybenewtablerow%
- \global\booltrue{LWR at skippingmcolrowcell}%
- \booltrue{LWR at foundmrowcell}%
-}%
-\LetLtxMacro\caption\LWR at longtabledatacaptiontag%
+ \renewcommand{\multicolumn}{\LWR at htmlmulticolumn}%
+ \renewcommand*{\mrowcell}{%
+ \LWR at maybenewtablerow%
+ \LWR at tabularleftedge%
+ \booltrue{LWR at skippingmrowcell}%
+ \booltrue{LWR at foundmrowcell}%
+ }%
+ \renewcommand*{\mcolrowcell}{%
+ \LWR at maybenewtablerow%
+ \booltrue{LWR at skippingmcolrowcell}%
+ \booltrue{LWR at foundmrowcell}%
+ }%
+ \LetLtxMacro\caption\LWR at longtabledatacaptiontag%
% \end{macrocode}
% Reset for new processing:
% \begin{macrocode}
-\global\boolfalse{LWR at tableparcell}%
-\global\boolfalse{LWR at skippingmrowcell}%
-\global\boolfalse{LWR at skippingmcolrowcell}%
-\global\boolfalse{LWR at skipatbang}%
-\global\boolfalse{LWR at emptyatbang}%
+ \boolfalse{LWR at tableparcell}%
+ \boolfalse{LWR at skippingmrowcell}%
+ \boolfalse{LWR at skippingmcolrowcell}%
+ \boolfalse{LWR at skipatbang}%
+ \boolfalse{LWR at emptyatbang}%
% \end{macrocode}
% Set |&| for its special meaning inside the tabular:
% \begin{macrocode}
-\StartDefiningTabulars%
-\protected\gdef&{\LWR at tabularampersand}%
+ \StartDefiningTabulars%
+ \protected\gdef&{\LWR at tabularampersand}%
% \end{macrocode}
% Locally force any minipages to be fullwidth, until the end of the \env{tabular}:
% \changes{v0.66}{2018/12/31}{Fix: Minipages inside \env{tabular}.}
% \begin{macrocode}
-\booltrue{LWR at forceminipagefullwidth}
+ \booltrue{LWR at forceminipagefullwidth}%
% \end{macrocode}
% Nest one level deeper of tabular paragraph handling:
% \changes{v0.46}{2018/01/18}{Fix: Tabular empty lines.}
% \begin{macrocode}
-\addtocounter{LWR at tabularpardepth}{1}%
+ \addtocounter{LWR at tabularpardepth}{1}%
% \end{macrocode}
% Look ahead for a possible table data cell:
% \begin{macrocode}
-\LWR at traceinfo{LWR@@HTML at tabular: about to LWR at getmynexttoken}%
-\LWR at getmynexttoken%
+ \LWR at traceinfo{LWR@@HTML at tabular: about to LWR at getmynexttoken}%
+ \LWR at getmynexttoken%
}%
% \end{macrocode}
%
@@ -29355,50 +29861,55 @@
% \begin{macrocode}
\newcommand*{\LWR at HTML@endtabular}
{%
-\LWR at traceinfo{LWR at HTML@endtabular}%
+ \LWR at traceinfo{LWR at HTML@endtabular}%
% \end{macrocode}
% Unnest one level of tabular paragraph handling:
% \changes{v0.46}{2018/01/18}{Fix: Tabular empty lines.}
% \begin{macrocode}
-\addtocounter{LWR at tabularpardepth}{-1}%
-\ifboolexpr{%
- test {%
- \ifnumcomp{\value{LWR at tableLaTeXcolindex}}{<}{\value{LWR at tabletotalLaTeXcols}}
- } or %
- (%
- bool{LWR at intabularmetadata} and%
- not bool{LWR at tabularcelladded} and%
+ \addtocounter{LWR at tabularpardepth}{-1}%
+ \ifboolexpr{%
test {%
- \ifnumcomp{\value{LWR at tableLaTeXcolindex}}{=}{\value{LWR at tabletotalLaTeXcols}}%
- }%
- )%
-}%
-{%
- \LWR at tabularfinishrow%
-}%
-{%
- \LWR at closetabledatacell%
-}%
-\LWR at htmlblocktag{/tr}%
+ \ifnumcomp{\value{LWR at tableLaTeXcolindex}}{<}%
+ {\value{LWR at tabletotalLaTeXcols}}
+ } or %
+ (%
+ bool{LWR at intabularmetadata} and%
+ not bool{LWR at tabularcelladded} and%
+ test {%
+ \ifnumcomp{\value{LWR at tableLaTeXcolindex}}{=}%
+ {\value{LWR at tabletotalLaTeXcols}}%
+ }%
+ )%
+ }%
+ {%
+ \LWR at tabularfinishrow%
+ }%
+ {%
+ \LWR at closetabledatacell%
+ }%
+ \LWR at htmlblocktag{/tr}%
% \end{macrocode}
% \pkg{xcolor} row color support:
% \begin{macrocode}
-\@rowc at lors%
+ \@rowc at lors%
% \end{macrocode}
% \begin{macrocode}
-\LWR at htmlblocktag{/table}%
-\global\boolfalse{LWR at intabularmetadata}%
+ \LWR at htmlblocktag{/table}%
+ \boolfalse{LWR at intabularmetadata}%
% \end{macrocode}
%
% Unnest one level of tabular:
% \begin{macrocode}
-\addtocounter{LWR at tabulardepth}{-1}%
+ \addtocounter{LWR at tabulardepth}{-1}%
% \end{macrocode}
%
% Restore |&| to its usual meaning:
+% \changes{v0.79}{2020/01/18}{Fix: Nested \env{tabular}s.}
% \begin{macrocode}
-\protected\gdef&{\LWR at origampmacro}%
-\StopDefiningTabulars%
+ \ifnumequal{\value{LWR at tabulardepth}}{0}{%
+ \protected\gdef&{\LWR at origampmacro}%
+ \StopDefiningTabulars%
+ }{}%
% \end{macrocode}
%
% Error if used \cs{multirow} or \cs{multicolumnrow} without
@@ -29405,28 +29916,28 @@
% using \cs{mrowcell} or \cs{mcolrowcell}.
% \changes{v0.69}{2019/03/07}{Error if \cs{multirow} without \cs{mrowcell}.}
% \begin{macrocode}
-\ifbool{LWR at usedmultirow}{%
- \ifbool{LWR at foundmrowcell}%
- {}%
- {%
- \PackageError{lwarp}%
+ \ifbool{LWR at usedmultirow}{%
+ \ifbool{LWR at foundmrowcell}%
+ {}%
{%
- When using \protect\multirow, \protect\multicolumnrow,\MessageBreak
- or the bigdelim package,\MessageBreak
- place \protect\mrowcell\space or \protect\mcolrowcell\MessageBreak
- in empty cells which are to be skipped.\MessageBreak
- See the lwarp package documentation:\MessageBreak
- "Special cases and limitations" -> "Tabular"
+ \PackageError{lwarp}%
+ {%
+ When using \protect\multirow, \protect\multicolumnrow,\MessageBreak
+ or the bigdelim package,\MessageBreak
+ place \protect\mrowcell\space or \protect\mcolrowcell\MessageBreak
+ in empty cells which are to be skipped.\MessageBreak
+ See the Lwarp package documentation:\MessageBreak
+ "Special cases and limitations" -> "Tabular"
+ }%
+ {%
+ See the Lwarp package documentation:\MessageBreak
+ "Special cases and limitations" -> "Tabular".
+ }%
}%
- {%
- See the lwarp package documentation:\MessageBreak
- "Special cases and limitations" -> "Tabular".
- }%
- }%
-}{}%
+ }{}%
% \end{macrocode}
% \begin{macrocode}
-\LWR at traceinfo{LWR at HTML@endtabular finished}%
+ \LWR at traceinfo{LWR at HTML@endtabular finished}%
}
\csletcs{LWR at HTML@endtabular*}{LWR at HTML@endtabular}
@@ -29582,12 +30093,12 @@
% Remove \cs{label} and other commands from the name, the strip any final period.
% See \pkg{gettitlestring}.
% \begin{macrocode}
-\GetTitleStringExpand{#1}%
-\edef\@currentlabelname{\detokenize\expandafter{\GetTitleStringResult}}%
-\edef\@currentlabelname{%
- \expandafter\LWR at stripperiod\@currentlabelname%
- \ltx at empty.\ltx at empty\@nil%
-}%
+ \GetTitleStringExpand{#1}%
+ \edef\@currentlabelname{\detokenize\expandafter{\GetTitleStringResult}}%
+ \edef\@currentlabelname{%
+ \expandafter\LWR at stripperiod\@currentlabelname%
+ \ltx at empty.\ltx at empty\@nil%
+ }%
}
% \end{macrocode}
% \end{macro}
@@ -29681,17 +30192,23 @@
% \changes{v0.66}{2019/01/27}{No longer use \pkg{zref}.}
% \begin{macrocode}
\newcommand*{\LWR at lwarplabel}[1]{%
-\LWR at traceinfo{LWR at lwarplabel !#1!}%
-\LWR at setlatestname{\@currentlabelname}%
- \@bsphack%
- \protected at write\@auxout{}%
- {\string\newlabel{#1 at lwarp}{%
- {\@currentlabelname}%
- {\ifbool{FileSectionNames}{\LWR at thisfilename}{\arabic{LWR at htmlfilenumber}}}%
- {\arabic{LWR at lateximagedepth}}%
- {\arabic{LWR at lateximagenumber}}%
- }}%
- \@esphack%
+ \LWR at traceinfo{LWR at lwarplabel !#1!}%
+ \LWR at setlatestname{\@currentlabelname}%
+ \@bsphack%
+ \protected at write\@auxout{}%
+ {%
+ \string\newlabel{#1 at lwarp}{%
+ {\@currentlabelname}%
+ {%
+ \ifbool{FileSectionNames}%
+ {\LWR at thisfilename}%
+ {\arabic{LWR at htmlfilenumber}}%
+ }%
+ {\arabic{LWR at lateximagedepth}}%
+ {\arabic{LWR at lateximagenumber}}%
+ }%
+ }%
+ \@esphack%
}
% \end{macrocode}
% \end{macro}
@@ -29710,36 +30227,39 @@
% \changes{v0.45}{2017/12/29}{Fix: Labels with underscores.}
% \begin{macrocode}
\newcommand*{\LWR at sublabel}[1]{%
-\LWR at traceinfo{LWR at sublabel !#1!}%
+ \LWR at traceinfo{LWR at sublabel !#1!}%
% \end{macrocode}
% Create an \HTML\ id tag unless are inside a lateximage,
% since it would appear in the image:
% \begin{macrocode}
-\ifnumcomp{\value{LWR at lateximagedepth}}{>}{0}%
-{}%
-{% not lateximage
+ \ifnumcomp{\value{LWR at lateximagedepth}}{>}{0}%
+ {}%
+ {% not lateximage
% \end{macrocode}
% If not doing a lateximage, create an \HTML\ ID tag:
% \changes{v0.47}{2018/01/26}{Fix: Line wrap at \HTML\ hyphen.}
% (To be factored\dots)
% \begin{macrocode}
- \LWR at sanitize{#1}%
- \ifbool{LWR at doingstartpars}%
- {% pars allowed
- \ifbool{LWR at doingapar}%
- {% par started
- \LWR at htmltag{a \LWR at print@mbox{id="\LWR at sanitized"}}\LWR at htmltag{/a}%
- }% par started
- {% par not started
- \LWR at stoppars%
- \LWR at htmltag{a \LWR at print@mbox{id="\LWR at sanitized"}}\LWR at htmltag{/a}%
- \LWR at startpars%
- }% par not started
- }% pars allowed
- {% pars not allowed
- \LWR at htmltag{a \LWR at print@mbox{id="\LWR at sanitized"}}\LWR at htmltag{/a}%
- }% pars not allowed
-}% not lateximage
+ \LWR at sanitize{#1}%
+ \ifbool{LWR at doingstartpars}%
+ {% pars allowed
+ \ifbool{LWR at doingapar}%
+ {% par started
+ \LWR at htmltag{a \LWR at print@mbox{id="\LWR at sanitized"}}%
+ \LWR at htmltag{/a}%
+ }% par started
+ {% par not started
+ \LWR at stoppars%
+ \LWR at htmltag{a \LWR at print@mbox{id="\LWR at sanitized"}}%
+ \LWR at htmltag{/a}%
+ \LWR at startpars%
+ }% par not started
+ }% pars allowed
+ {% pars not allowed
+ \LWR at htmltag{a \LWR at print@mbox{id="\LWR at sanitized"}}%
+ \LWR at htmltag{/a}%
+ }% pars not allowed
+ }% not lateximage
}
% \end{macrocode}
% \end{macro}
@@ -29762,24 +30282,31 @@
%
% \begin{macrocode}
\NewDocumentCommand{\LWR at new@label}{d() m o}{%
-\LWR at traceinfo{LWR at new@label: starting}%
-\LWR at traceinfo{LWR at new@label: !#2!}%
+ \LWR at traceinfo{LWR at new@label: starting}%
+ \LWR at traceinfo{LWR at new@label: !#2!}%
% \@bsphack%
% \end{macrocode}
% Create a traditional \LaTeX\ label, as modified by \pkg{cleveref}:
% \begin{macrocode}
-\LWR at orig@label{#2}%
+ \LWR at orig@label{#2}%
% \end{macrocode}
% Create a special label which holds the section number,
% |LWR at htmlfilenumber|, |LWR at lateximagedepth|, and |LWR at lateximagenumber|:
% \begin{macrocode}
-\LWR at traceinfo{LWR at new@label: filesectionnames is \ifbool{FileSectionNames}{true}{false}}%
-\LWR at traceinfo{LWR at new@label: LWR at thisfilename is !\LWR at thisfilename!}%
-\LWR at traceinfo{LWR at new@label: LWR at htmlfilenumber is \arabic{LWR at htmlfilenumber}}%
-\LWR at lwarplabel{#2}%
-\LWR at sublabel{#2}%
-% \@esphack%
-\LWR at traceinfo{LWR at new@label: done}%
+ \LWR at traceinfo{%
+ LWR at new@label: filesectionnames is %
+ \ifbool{FileSectionNames}{true}{false}%
+ }%
+ \LWR at traceinfo{%
+ LWR at new@label: LWR at thisfilename is !\LWR at thisfilename!%
+ }%
+ \LWR at traceinfo{%
+ LWR at new@label: LWR at htmlfilenumber is \arabic{LWR at htmlfilenumber}%
+ }%
+ \LWR at lwarplabel{#2}%
+ \LWR at sublabel{#2}%
+ % \@esphack%
+ \LWR at traceinfo{LWR at new@label: done}%
}
% \end{macrocode}
% \end{macro}
@@ -29815,61 +30342,61 @@
% \begin{macrocode}
\newcommand*{\LWR at startref}[1]
{%
-\LWR at sanitize{#1}%
-\LWR at traceinfo{LWR at startref A: !#1!}%
+ \LWR at sanitize{#1}%
+ \LWR at traceinfo{LWR at startref A: !#1!}%
% \end{macrocode}
% Create the filename part of the link:
% \begin{macrocode}
-\LWR at htmltag{a href="%
-\LWR at traceinfo{LWR at startref B}%
-\LWR at print@mbox{\LWR at htmlrefsectionfilename{#1}}%
-\LWR at traceinfo{LWR at startref C}%
-\LWR at origpound%
+ \LWR at htmltag{a href="%
+ \LWR at traceinfo{LWR at startref B}%
+ \LWR at print@mbox{\LWR at htmlrefsectionfilename{#1}}%
+ \LWR at traceinfo{LWR at startref C}%
+ \LWR at origpound%
% \end{macrocode}
% Create the destination id:
%
% See if |LWR at lateximagedepth| is unknown:
% \begin{macrocode}
-\LWR at traceinfo{LWR at startref D: !#1!}%
-\ifcsundef{r@#1 at lwarp}%
+ \LWR at traceinfo{LWR at startref D: !#1!}%
+ \ifcsundef{r@#1 at lwarp}%
% \end{macrocode}
% ``|??|'' if |LWR at lateximagedepth| is unknown,
% so create a link with an unknown destination:
% \begin{macrocode}
-{%
- \LWR at traceinfo{LWR at startref D0: ??}%
- ??%
-}%
+ {%
+ \LWR at traceinfo{LWR at startref D0: ??}%
+ ??%
+ }%
% \end{macrocode}
% If |LWR at lateximagedepth| is known.
% Use a lateximage if the depth is greater than zero,
% or a regular link otherwise:
% \begin{macrocode}
-{%
- \ifthenelse{\cnttest{\LWR at lateximagedepthref{#1}}{>}{0}}%
- {%
- \LWR at ImagesName\LWR at lateximagenumberref{#1}%
- }%
- {%
- \LWR at traceinfo{LWR at startref D3}%
+ {%
+ \ifthenelse{\cnttest{\LWR at lateximagedepthref{#1}}{>}{0}}%
+ {%
+ \LWR at ImagesName\LWR at lateximagenumberref{#1}%
+ }%
+ {%
+ \LWR at traceinfo{LWR at startref D3}%
% \end{macrocode}
% \cs{detokenize} is used to allow underscores in the labels:
% \changes{v0.45}{2017/12/01}{Fix: Labels with underscores.}
% \begin{macrocode}
- \LWR at print@mbox{\LWR at sanitized}%
- }%
-}%
-\LWR at traceinfo{LWR at startref E}%
+ \LWR at print@mbox{\LWR at sanitized}%
+ }%
+ }%
+ \LWR at traceinfo{LWR at startref E}%
% \end{macrocode}
% Closing quote:
% \begin{macrocode}
-"%
+ "%
% \end{macrocode}
% Maybe add a title:
% \begin{macrocode}
-\LWR at addlinktitle%
-}%
-\LWR at traceinfo{LWR at startref F}%
+ \LWR at addlinktitle%
+ }%
+ \LWR at traceinfo{LWR at startref F}%
}
% \end{macrocode}
% \end{macro}
@@ -29882,10 +30409,10 @@
% but prints its own text, such as ``|1(b)|''.
% \begin{macrocode}
\NewDocumentCommand{\LWR at subnewref}{m m}{%
-\LWR at traceinfo{LWR at subnewref #1 #2}%
-\LWR at startref{#1}%
-\LWR at print@ref{#2}%
-\LWR at htmltag{/a}%
+ \LWR at traceinfo{LWR at subnewref #1 #2}%
+ \LWR at startref{#1}%
+ \LWR at print@ref{#2}%
+ \LWR at htmltag{/a}%
}
% \end{macrocode}
% \end{macro}
@@ -29901,10 +30428,10 @@
% \changes{v0.58}{2018/06/07}{Improved print/\HTML\ output selection.}
% \begin{macrocode}
\NewDocumentCommand{\LWR at HTML@ref}{s m}{%
-\LWR at traceinfo{LWR at HTML@ref !#2!}%
-\IfBooleanTF{#1}%
-{\LWR at print@ref{#2}}%
-{\LWR at subnewref{#2}{#2}}%
+ \LWR at traceinfo{LWR at HTML@ref !#2!}%
+ \IfBooleanTF{#1}%
+ {\LWR at print@ref{#2}}%
+ {\LWR at subnewref{#2}{#2}}%
}
\LWR at formatted{ref}
@@ -29942,9 +30469,9 @@
%
% \begin{macrocode}
\NewDocumentCommand{\LWR at new@pageref}{s m}{%
-\IfBooleanTF{#1}%
-{(\pagerefPageFor\LWR at print@ref{#2})}%
-{(\cpageref{#2})}%
+ \IfBooleanTF{#1}%
+ {(\pagerefPageFor\LWR at print@ref{#2})}%
+ {(\cpageref{#2})}%
}
% \end{macrocode}
% \end{macro}
@@ -29955,13 +30482,13 @@
% \changes{v0.43}{2017/10/31}{Made robust.}
% \begin{macrocode}
\newrobustcmd*{\nameref}[1]{%
-\LWR at traceinfo{nameref}%
-\LWR at startref{#1}%
-\LWR at traceinfo{nameref B}%
-\LWR at nameref{#1}%
-\LWR at traceinfo{nameref C}%
-\LWR at htmltag{/a}%
-\LWR at traceinfo{nameref: done}%
+ \LWR at traceinfo{nameref}%
+ \LWR at startref{#1}%
+ \LWR at traceinfo{nameref B}%
+ \LWR at nameref{#1}%
+ \LWR at traceinfo{nameref C}%
+ \LWR at htmltag{/a}%
+ \LWR at traceinfo{nameref: done}%
}
% \end{macrocode}
% \end{macro}
@@ -30005,9 +30532,11 @@
% \changes{v0.45}{2018/01/14}{Added.}
% \begin{macrocode}
\AtBeginDocument{
+
\def\@currentHref{%
-autopage-\theLWR at currentautosec%
+ autopage-\theLWR at currentautosec%
}
+
}
% \end{macrocode}
% \end{macro}
@@ -30288,21 +30817,21 @@
%
% \begin{macrocode}
\NewDocumentCommand{\LWR at floatbegin}{m o}{%
-\ifbool{FormatWP}{\newline}{}%
-\LWR at stoppars
+ \ifbool{FormatWP}{\newline}{}%
+ \LWR at stoppars%
% \end{macrocode}
% There is a new float, so increment the unique float counter:
% \begin{macrocode}
-\addtocounter{LWR at thisautoid}{1}%
-\booltrue{LWR at freezethisautoid}%
+ \addtocounter{LWR at thisautoid}{1}%
+ \booltrue{LWR at freezethisautoid}%
% \end{macrocode}
%
% \begin{macrocode}
-\begingroup%
+ \begingroup%
% \end{macrocode}
% Settings while inside the environment:
% \begin{macrocode}
-\LWR at print@raggedright%
+ \LWR at print@raggedright%
% \end{macrocode}
% Open an \HTML\ |figure| tag.
% The figure is assigned a \attribute{class} equal to its type,
@@ -30313,34 +30842,34 @@
% \changes{v0.47}{2018/01/26}{Fix: Line wrap at \HTML\ hyphen.}
% \changes{v0.56}{2018/05/14}{Adds a \element{class} per \pkg{float} package style.}
% \begin{macrocode}
-\LWR at htmltag{%
- figure id="\LWR at print@mbox{autoid-\arabic{LWR at thisautoid}}" % space
- class="#1 \@nameuse{LWR at floatstyle@#1}"%
-}%
-\ifbool{FormatWP}{%
- \LWR at orignewline%
- \LWR at BlockClassWP{}{}{wp#1}%
-}{}%
+ \LWR at htmltag{%
+ figure id="\LWR at print@mbox{autoid-\arabic{LWR at thisautoid}}" % space
+ class="#1 \@nameuse{LWR at floatstyle@#1}"%
+ }%
+ \ifbool{FormatWP}{%
+ \LWR at orignewline%
+ \LWR at BlockClassWP{}{}{wp#1}%
+ }{}%
% \end{macrocode}
% Update the caption type:
% \begin{macrocode}
-\renewcommand*{\@captype}{#1}%
-\caption at settype{#1}%
+ \renewcommand*{\@captype}{#1}%
+ \caption at settype{#1}%
% \end{macrocode}
% Mark the float for a word processor conversion:
% \begin{macrocode}
-\LWR at startpars%
-\ifboolexpr{bool{FormatWP} and bool{WPMarkFloats}}{%
+ \LWR at startpars%
+ \ifboolexpr{bool{FormatWP} and bool{WPMarkFloats}}{%
-=== begin #1 ===
+ === begin #1 ===
-}{}%
+ }{}%
% \end{macrocode}
% Look for \cs{centering}, etc:
% \changes{v0.54}{2018/04/19}{Honor \cs{centering}, etc. in floats.}
% \changes{v0.55}{2018/04/24}{Fix: Float optional args.}
% \begin{macrocode}
-\LWR at futurenonspacelet\LWR at mynexttoken\LWR at floatalignment%
+ \LWR at futurenonspacelet\LWR at mynexttoken\LWR at floatalignment%
}
% \end{macrocode}
% \end{macro}
@@ -30349,12 +30878,16 @@
% \changes{v0.55}{2018/04/25}{Fix: \cs{centering}, etc. for \pkg{koma-script}.}
% \begin{macrocode}
\AtBeginDocument{
+
\@ifpackageloaded{tocbasic}{
+
\appto\figure at atbegin{%
-\LWR at futurenonspacelet\LWR at mynexttoken\LWR at floatalignment%
+ \LWR at futurenonspacelet\LWR at mynexttoken\LWR at floatalignment%
}
-}{}
-}
+
+}{}% tocbasic
+
+}% AtBeginDocument
% \end{macrocode}
%
%
@@ -30378,26 +30911,26 @@
% If saw a \cs{centering}, finish the \env{center} environment:
% \changes{v0.54}{2018/04/19}{Honor \cs{centering}, etc. in floats.}
% \begin{macrocode}
-\LWR at endfloatalignment%
+ \LWR at endfloatalignment%
% \end{macrocode}
% Mark the float end for a word processor conversion:
% \begin{macrocode}
-\ifboolexpr{bool{FormatWP} and bool{WPMarkFloats}}{%
+ \ifboolexpr{bool{FormatWP} and bool{WPMarkFloats}}{%
-=== end ===
+ === end ===
-}{}%
-\LWR at stoppars%
+ }{}%
+ \LWR at stoppars%
% \end{macrocode}
% Close an \HTML\ |figure| tag:
% \changes{v0.42}{2017/10/26}{If \progcode{FormatWP} add a text frame.}
% \begin{macrocode}
-\ifbool{FormatWP}{\endLWR at BlockClassWP}{}%
-\LWR at htmlelementend{figure}%
-\endgroup%
-\boolfalse{LWR at freezethisautoid}%
-\LWR at startpars%
-\ifbool{FormatWP}{\newline}{}%
+ \ifbool{FormatWP}{\endLWR at BlockClassWP}{}%
+ \LWR at htmlelementend{figure}%
+ \endgroup%
+ \boolfalse{LWR at freezethisautoid}%
+ \LWR at startpars%
+ \ifbool{FormatWP}{\newline}{}%
}
% \end{macrocode}
% \end{macro}
@@ -30439,22 +30972,28 @@
\boolfalse{LWR at freezethisautoid}
% \end{macrocode}
+% \begin{macro}{\LWR at forcenewautoidanchor}
+% Adds a new \element{autoid} anchor.
+% \changes{v0.79}{2019/12/09}{Factored.}
+% \begin{macrocode}
+\newcommand*{\LWR at forcenewautoidanchor}{%
+ \addtocounter{LWR at thisautoid}{1}%
+ \LWR at htmltag{a id="\LWR at print@mbox{autoid-\arabic{LWR at thisautoid}}"}%
+ \LWR at htmltag{/a}%
+}
+% \end{macrocode}
+% \end{macro}
+
% \begin{macro}{\LWR at newautoidanchor}
-% Adds a new \element{autoid} anchor.
+% Sometimes adds a new \element{autoid} anchor.
% \changes{v0.45}{2017/12/07}{Fix: No anchor if frozen autoid.}
% \changes{v0.47}{2018/01/26}{Fix: Line wrap at \HTML\ hyphen.}
% \changes{v0.51}{2018/03/16}{Fix: No autoid is inside a \env{lateximage}.}
% \begin{macrocode}
\newcommand*{\LWR at newautoidanchor}{%
-\ifnumcomp{\value{LWR at lateximagedepth}}{>}{0}%
-{}%
-{%
- \ifbool{LWR at freezethisautoid}{}{%
- \addtocounter{LWR at thisautoid}{1}%
- \LWR at htmltag{a id="\LWR at print@mbox{autoid-\arabic{LWR at thisautoid}}"}%
- \LWR at htmltag{/a}%
- }%
-}%
+ \ifnumcomp{\value{LWR at lateximagedepth}}{>}{0}%
+ {}%
+ {\ifbool{LWR at freezethisautoid}{}{\LWR at forcenewautoidanchor}}%
}
% \end{macrocode}
% \end{macro}
@@ -30481,18 +31020,18 @@
% \changes{v0.54}{2018/04/19}{Honor \cs{centering}, etc. in floats.}
% \begin{macrocode}
\newcommand*{\LWR at floatalignment}{%
-\ifdefstrequal{\LWR at mynexttoken}{\centering}{%
- \center%
- \renewcommand*{\LWR at floatalignmentname}{center}%
-}{}%
-\ifdefstrequal{\LWR at mynexttoken}{\raggedright}{%
- \flushleft%
- \renewcommand*{\LWR at floatalignmentname}{flushleft}%
-}{}%
-\ifdefstrequal{\LWR at mynexttoken}{\raggedleft}{%
- \flushright%
- \renewcommand*{\LWR at floatalignmentname}{flushright}%
-}{}%
+ \ifdefstrequal{\LWR at mynexttoken}{\centering}{%
+ \center%
+ \renewcommand*{\LWR at floatalignmentname}{center}%
+ }{}%
+ \ifdefstrequal{\LWR at mynexttoken}{\raggedright}{%
+ \flushleft%
+ \renewcommand*{\LWR at floatalignmentname}{flushleft}%
+ }{}%
+ \ifdefstrequal{\LWR at mynexttoken}{\raggedleft}{%
+ \flushright%
+ \renewcommand*{\LWR at floatalignmentname}{flushright}%
+ }{}%
}
% \end{macrocode}
% \end{macro}
@@ -30502,8 +31041,10 @@
% \changes{v0.54}{2018/04/19}{Honor \cs{centering}, etc. in floats.}
% \begin{macrocode}
\newcommand*{\LWR at endfloatalignment}{%
-\ifdefvoid{\LWR at floatalignmentname}{}{\@nameuse{end\LWR at floatalignmentname}}%
-\renewcommand*{\LWR at floatalignmentname}{}%
+ \ifdefvoid{\LWR at floatalignmentname}%
+ {}%
+ {\@nameuse{end\LWR at floatalignmentname}}%
+ \renewcommand*{\LWR at floatalignmentname}{}%
}
% \end{macrocode}
% \end{macro}
@@ -30594,14 +31135,14 @@
% \changes{v0.65}{2018/12/21}{Uses \element{figurecaption} instead of \element{figcaption}.}
% \begin{macrocode}
\newenvironment*{LWR at figcaption}
- {
+ {%
\ifbool{FormatWP}{%
- \BlockClass[font-style:italic]{figurecaption}
+ \BlockClass[font-style:italic]{figurecaption}%
% \LWR at print@vspace*{\baselineskip}
- }{
- \BlockClass{figurecaption}
+ }{%
+ \BlockClass{figurecaption}%
}%
- }
+ }%
{\endBlockClass}
% \end{macrocode}
% \end{environment}
@@ -30618,23 +31159,23 @@
% \begin{macrocode}
\newcommand*{\LWR at HTML@caption at begin}[1]
{%
-\LWR at traceinfo{LWR at HTML@caption at begin}%
+ \LWR at traceinfo{LWR at HTML@caption at begin}%
% \end{macrocode}
% Keep par and minipage changes local:
% \begin{macrocode}
-\begingroup%
+ \begingroup%
% \end{macrocode}
% No need for a |minipage| or \cs{parbox} inside the caption:
% \begin{macrocode}
-\RenewDocumentEnvironment{minipage}{O{t} o O{t} m}{}{}%
-\RenewDocumentCommand{\parbox}{O{t} O{} O{t} m +m}{##5}%
+ \RenewDocumentEnvironment{minipage}{O{t} o O{t} m}{}{}%
+ \RenewDocumentCommand{\parbox}{O{t} O{} O{t} m +m}{##5}%
% \end{macrocode}
% Enclose the original caption code inside an \HTML\ tag:
% \begin{macrocode}
-\LWR at figcaption%
-\LWR at traceinfo{LWR at HTML@caption at begin: about to LWR at origcaption@begin}%
-\LWR at print@caption at begin{#1}%
-\LWR at traceinfo{LWR at HTML@caption at begin: done}%
+ \LWR at figcaption%
+ \LWR at traceinfo{LWR at HTML@caption at begin: about to LWR at origcaption@begin}%
+ \LWR at print@caption at begin{#1}%
+ \LWR at traceinfo{LWR at HTML@caption at begin: done}%
}
% \end{macrocode}
% \end{macro}
@@ -30645,15 +31186,15 @@
% \begin{macrocode}
\newcommand*{\LWR at HTML@caption at end}
{%
-\LWR at traceinfo{LWR at HTML@caption at end}%
-\LWR at print@caption at end%
+ \LWR at traceinfo{LWR at HTML@caption at end}%
+ \LWR at print@caption at end%
% \end{macrocode}
% Closing tag:
% \begin{macrocode}
-\endLWR at figcaption%
-\endgroup%
-% \leavevmode% avoid bad space factor (0) error
-\LWR at traceinfo{LWR at HTML@caption at end: done}%
+ \endLWR at figcaption%
+ \endgroup%
+ % \leavevmode% avoid bad space factor (0) error
+ \LWR at traceinfo{LWR at HTML@caption at end: done}%
}
% \end{macrocode}
% \end{macro}
@@ -30682,18 +31223,24 @@
\let\LWR at origcaptionlistentry\captionlistentry
\renewcommand*{\captionlistentry}{%
-\LWR at ensuredoingapar%
-\LWR at origcaptionlistentry%
+ \LWR at ensuredoingapar%
+ \LWR at origcaptionlistentry%
}
+% \end{macrocode}
+%
+% \changes{v0.79}{2019/12/09}{Fix: Duplicate \attribute{auto-id}.}
+% \begin{macrocode}
+\def\LWR at LTcaptionlistentry{%
+ \LWR at ensuredoingapar%
+ \LWR at forcenewautoidanchor%
+ \bgroup
+ \@ifstar{\egroup\LWR at LT@captionlistentry}% gobble *
+ {\egroup\LWR at LT@captionlistentry}%
+}%
-\def\LWR at LTcaptionlistentry{%
-\LWR at ensuredoingapar%
-\LWR at htmltag{a id="\LWR at print@mbox{autoid-\arabic{LWR at thisautoid}}"}\LWR at htmltag{/a}%
- \bgroup
- \@ifstar{\egroup\LWR at LT@captionlistentry}% gobble *
- {\egroup\LWR at LT@captionlistentry}}%
\def\LWR at LT@captionlistentry#1{%
- \caption at listentry\@firstoftwo[\LTcaptype]{#1}}%
+ \caption at listentry\@firstoftwo[\LTcaptype]{#1}%
+}%
% \end{macrocode}
% \end{macro}
@@ -30710,26 +31257,26 @@
\let\LWR at origaddcontentsline\addcontentsline
\renewcommand*{\addcontentsline}[3]{%
-\ifstrequal{#1}{toc}{}{% not TOC
+ \ifstrequal{#1}{toc}{}{% not TOC
% \end{macrocode}
% \changes{v0.51}{2018/03/11}{No anchor ID if inside \SVG\ image.}
% \begin{macrocode}
-\ifnumcomp{\value{LWR at lateximagedepth}}{>}{0}%
- {}%
- {\LWR at newautoidanchor}%
+ \ifnumcomp{\value{LWR at lateximagedepth}}{>}{0}%
+ {}%
+ {\LWR at newautoidanchor}%
% \end{macrocode}
% \changes{v0.51}{2018/03/11}{Add missing support for float mechanism if necessary.}
% \begin{macrocode}
- \ifcsvoid{ext@#2}{\csdef{ext@#2}{#1}}{}%
+ \ifcsvoid{ext@#2}{\csdef{ext@#2}{#1}}{}%
% \end{macrocode}
% \begin{macrocode}
- \addtocontents{\@nameuse{ext@#2}}{%
- \protect\LWRsetnextfloat%
- {\arabic{LWR at latestautopage}}%
- {\arabic{LWR at thisautoid}}%
- }%
-}% not TOC
-\LWR at origaddcontentsline{#1}{#2}{#3}%
+ \addtocontents{\@nameuse{ext@#2}}{%
+ \protect\LWRsetnextfloat%
+ {\arabic{LWR at latestautopage}}%
+ {\arabic{LWR at thisautoid}}%
+ }%
+ }% not TOC
+ \LWR at origaddcontentsline{#1}{#2}{#3}%
}
% \end{macrocode}
% \end{macro}
@@ -30743,13 +31290,15 @@
% Patched to handle paragraph tags.
% \begin{macrocode}
\AtBeginDocument{
+
\let\LWR at origcaptionof\captionof
\renewcommand*{\captionof}{%
-\LWR at stoppars%
-\LWR at origcaptionof%
+ \LWR at stoppars%
+ \LWR at origcaptionof%
}
-}
+
+}% AtBeginDocument
% \end{macrocode}
% \end{macro}
@@ -30795,13 +31344,13 @@
% the side\TOC\ may be referred to again in each \HTML\ page.
% \begin{macrocode}
\newcommand*{\LWR at myshorttoc}[1]{%
-\LWR at traceinfo{LWR at myshorttoc: #1}%
-\LWR at ensuredoingapar%
+ \LWR at traceinfo{LWR at myshorttoc: #1}%
+ \LWR at ensuredoingapar%
% \end{macrocode}
% Only if the file exists:
% \begin{macrocode}
-\IfFileExists{\jobname.#1}{%
-\LWR at traceinfo{LWR at myshorttoc: loading}%
+ \IfFileExists{\jobname.#1}{%
+ \LWR at traceinfo{LWR at myshorttoc: loading}%
% \end{macrocode}
%
% Many of the commands in the file will have |@| characters in them, so |@|
@@ -30808,16 +31357,16 @@
% \watchout
% must be made a regular letter.
% \begin{macrocode}
-\begingroup%
-\makeatletter%
+ \begingroup%
+ \makeatletter%
% \end{macrocode}
% Read in the \TOC\ file:
% \begin{macrocode}
-\@input{\jobname.#1}%
-\endgroup%
-}%
-{}%
-\LWR at traceinfo{LWR at myshorttoc: done}%
+ \@input{\jobname.#1}%
+ \endgroup%
+ }%
+ {}%
+ \LWR at traceinfo{LWR at myshorttoc: done}%
}
% \end{macrocode}
% \end{macro}
@@ -30831,30 +31380,30 @@
% \end{macrocode}
% Closes previous levels:
% \begin{macrocode}
-\@ifundefined{chapter}
-{\LWR at closeprevious{section}}
-{\LWR at closeprevious{chapter}}
+ \@ifundefined{chapter}%
+ {\LWR at closeprevious{section}}%
+ {\LWR at closeprevious{chapter}}%
% \end{macrocode}
% Prints any pending footnotes so that they appear above the potentially
% large \TOC:
% \begin{macrocode}
-\LWR at printpendingfootnotes
+ \LWR at printpendingfootnotes%
% \end{macrocode}
% Place the list into its own chapter (if defined) or section:
% \begin{macrocode}
-\@ifundefined{chapter}{\section*{#2}}{\chapter*{#2}}
+ \@ifundefined{chapter}{\section*{#2}}{\chapter*{#2}}%
% \end{macrocode}
% Create a new \HTML\ |nav| containing the \TOC/\LOF/\LOT:
% \begin{macrocode}
-\LWR at htmlelementclass{nav}{#1}
+ \LWR at htmlelementclass{nav}{#1}%
% \end{macrocode}
% Create the actual list:
% \begin{macrocode}
-\LWR at myshorttoc{#1}
+ \LWR at myshorttoc{#1}%
% \end{macrocode}
% Close the |nav|:
% \begin{macrocode}
-\LWR at htmlelementclassend{nav}{#1}
+ \LWR at htmlelementclassend{nav}{#1}%
}
% \end{macrocode}
% \end{macro}
@@ -30866,9 +31415,9 @@
\let\LWR at orig@starttoc\@starttoc
\renewcommand{\@starttoc}[1]{
-\LWR at htmlelementclass{nav}{#1}
-\LWR at orig@starttoc{#1}
-\LWR at htmlelementclassend{nav}{#1}
+ \LWR at htmlelementclass{nav}{#1}%
+ \LWR at orig@starttoc{#1}%
+ \LWR at htmlelementclassend{nav}{#1}%
}
% \end{macrocode}
% \end{macro}
@@ -30895,6 +31444,7 @@
% \changes{v0.45}{2017/12/09}{Fix: Empty sidetoc.}
% \begin{macrocode}
\AtBeginDocument{
+
\let\LWR at origtableofcontents\tableofcontents
\renewcommand*{\tableofcontents}{%
@@ -30903,24 +31453,25 @@
% which will presumably auto-generate its own updated table of contents:
% \changes{v0.42}{2017/10/18}{Added boolean \progcode{WPMarkTOC}.}
% \begin{macrocode}
-\ifboolexpr{bool{FormatWP} and bool{WPMarkTOC}}{
+ \ifboolexpr{bool{FormatWP} and bool{WPMarkTOC}}{
-=== table of contents ===
+ === table of contents ===
-}
-{
+ }
+ {
% \end{macrocode}
% Copy the |.toc| file to |.sidetoc| for printing the side\TOC.
% The original |.toc| file is renewed when \cs{tableofcontents} is finished.
% \begin{macrocode}
- \ifbool{LWR at copiedsidetoc}{}{%
- \LWR at copyfile{\jobname.toc}{\jobname.sidetoc}%
- \booltrue{LWR at copiedsidetoc}%
- }%
- \LWR at printpendingfootnotes
- \LWR at origtableofcontents
-}
+ \ifbool{LWR at copiedsidetoc}{}{%
+ \LWR at copyfile{\jobname.toc}{\jobname.sidetoc}%
+ \booltrue{LWR at copiedsidetoc}%
+ }%
+ \LWR at printpendingfootnotes
+ \LWR at origtableofcontents
+ }
}% \tableofcontents
+
}% AtBeginDocument
% \end{macrocode}
% \end{macro}
@@ -30931,16 +31482,16 @@
\let\LWR at origlistoffigures\listoffigures
\renewcommand*{\listoffigures}{
-\ifboolexpr{bool{FormatWP} and bool{WPMarkLOFT}}{
+ \ifboolexpr{bool{FormatWP} and bool{WPMarkLOFT}}{
-=== list of figures ===
+ === list of figures ===
+ }
+ {
+ \LWR at printpendingfootnotes
+ \LWR at origlistoffigures
+ }
}
-{
- \LWR at printpendingfootnotes
- \LWR at origlistoffigures
-}
-}
% \end{macrocode}
% \end{macro}
@@ -30950,16 +31501,16 @@
\let\LWR at origlistoftables\listoftables
\renewcommand*{\listoftables}{
-\ifboolexpr{bool{FormatWP} and bool{WPMarkLOFT}}{
+ \ifboolexpr{bool{FormatWP} and bool{WPMarkLOFT}}{
-=== list of tables ===
+ === list of tables ===
+ }
+ {
+ \LWR at printpendingfootnotes
+ \LWR at origlistoftables
+ }
}
-{
- \LWR at printpendingfootnotes
- \LWR at origlistoftables
-}
-}
% \end{macrocode}
% \end{macro}
@@ -30977,13 +31528,13 @@
% \changes{v0.61}{2018/09/26}{Fix: \pkg{newfloat} lists.}
% \begin{macrocode}
\NewDocumentCommand{\listof}{m +m}{%
-\@ifundefined{l@#1}{%
- \csdef{l@#1}##1##2{\hypertocfloat{1}{#1}{\@nameuse{ext@#1}}{##1}{##2}}%
-}{}%
-\LWR at subtableofcontents{\@nameuse{ext@#1}}{#2}
-\expandafter\newwrite\csname tf@\csname ext@#1\endcsname\endcsname
-\immediate\openout \csname tf@\csname ext@#1\endcsname\endcsname
- \jobname.\@nameuse{ext@#1}\relax
+ \@ifundefined{l@#1}{%
+ \csdef{l@#1}##1##2{\hypertocfloat{1}{#1}{\@nameuse{ext@#1}}{##1}{##2}}%
+ }{}%
+ \LWR at subtableofcontents{\@nameuse{ext@#1}}{#2}%
+ \expandafter\newwrite\csname tf@\csname ext@#1\endcsname\endcsname%
+ \immediate\openout \csname tf@\csname ext@#1\endcsname\endcsname%
+ \jobname.\@nameuse{ext@#1}\relax%
}
% \end{macrocode}
% \end{macro}
@@ -31058,36 +31609,36 @@
% \begin{macro}{\LWR at sidetoc}
% Creates the actual side-TOC.
% \begin{macrocode}
-\newcommand*{\LWR at sidetoc}{
-\LWR at forcenewpage
-\LWR at stoppars
+\newcommand*{\LWR at sidetoc}{%
+ \LWR at forcenewpage
+ \LWR at stoppars
% \end{macrocode}
% The entire side\TOC\ is placed into a |nav| of class |sidetoc|.
% \begin{macrocode}
-\LWR at htmlelementclass{div}{sidetoccontainer}
-\LWR at htmlelementclass{nav}{sidetoc}
+ \LWR at htmlelementclass{div}{sidetoccontainer}
+ \LWR at htmlelementclass{nav}{sidetoc}
-\setcounter{tocdepth}{\value{SideTOCDepth}}
+ \setcounter{tocdepth}{\value{SideTOCDepth}}
% \end{macrocode}
% The title is placed into a \element{div} of class \attribute{sidetoctitle}, and may
% contain paragraphs.
% \begin{macrocode}
-\begin{BlockClass}{sidetoctitle}
-\ifcsvoid{thetitle}{}{\InlineClass{sidetocthetitle}{\thetitle}\par}
-\sidetocname
-\end{BlockClass}
+ \begin{BlockClass}{sidetoctitle}
+ \ifcsvoid{thetitle}{}{\InlineClass{sidetocthetitle}{\thetitle}\par}
+ \sidetocname
+ \end{BlockClass}
% \end{macrocode}
% The table of contents is placed into a \element{div} of class \attribute{sidetoccontents}.
% \begin{macrocode}
-\begin{BlockClass}{sidetoccontents}
-\LinkHome
+ \begin{BlockClass}{sidetoccontents}
+ \LinkHome
-\LWR at myshorttoc{sidetoc}
-\end{BlockClass}
-\LWR at htmlelementclassend{nav}{sidetoc}
-\LWR at htmlelementclassend{div}{sidetoccontainer}
+ \LWR at myshorttoc{sidetoc}
+ \end{BlockClass}
+ \LWR at htmlelementclassend{nav}{sidetoc}
+ \LWR at htmlelementclassend{div}{sidetoccontainer}
}
% \end{macrocode}
% \end{macro}
@@ -31107,7 +31658,7 @@
%
% \begin{macrocode}
\newcommand*{\LWR at numberline}[1]{%
-\LWR at sectionnumber{#1}\quad%
+ \LWR at sectionnumber{#1}\quad%
}
\LetLtxMacro\numberline\LWR at numberline
@@ -31135,13 +31686,13 @@
% \end{description}
% \begin{macrocode}
\NewDocumentCommand{\hypertoc}{m m +m m}{%
-\LWR at traceinfo{hypertoc !#1!#2!#3!#4!}%
+ \LWR at traceinfo{hypertoc !#1!#2!#3!#4!}%
% \end{macrocode}
% Respond to |tocdepth|:
% \begin{macrocode}
-\ifthenelse{\cnttest{#1}{<=}{\value{tocdepth}}}%
- {%
- \LWR at startpars%
+ \ifthenelse{\cnttest{#1}{<=}{\value{tocdepth}}}%
+ {%
+ \LWR at startpars%
% \end{macrocode}
%
% Create an \HTML\ link to |<filename>#autosec-(page)|, with the name,
@@ -31152,20 +31703,20 @@
% \changes{v0.47}{2018/01/26}{Fix: Line wrap at \HTML\ hyphen.}
% \changes{v0.72}{2019/06/05}{Fix: References for \pkg{xr}, \pkg{xr-hyper}.}
% \begin{macrocode}
- \LWR at subhyperrefclass{%
- \LWR at htmlrefsectionfilename{\BaseJobname-autopage-#4}%
- \LWR at origpound\LWR at print@mbox{autosec-#4}%
- }{#3}{toc#2}%
+ \LWR at subhyperrefclass{%
+ \LWR at htmlrefsectionfilename{\BaseJobname-autopage-#4}%
+ \LWR at origpound\LWR at print@mbox{autosec-#4}%
+ }{#3}{toc#2}%
% \end{macrocode}
% \changes{v0.69}{2019/03/21}{Added support for \pkg{tocdata}.}
% \begin{macrocode}
- \LWR at maybetocdata%
+ \LWR at maybetocdata%
% \end{macrocode}
% \begin{macrocode}
- \LWR at stoppars%
- }%
- {}%
-\LWR at traceinfo{hypertoc done}%
+ \LWR at stoppars%
+ }%
+ {}%
+ \LWR at traceinfo{hypertoc done}%
}
% \end{macrocode}
% \end{macro}
@@ -31173,8 +31724,8 @@
% \DescribeCounter{lofdepth} \TOC\ depth for figures.
% \begin{macrocode}
\@ifclassloaded{memoir}{}{
-\newcounter{lofdepth}
-\setcounter{lofdepth}{1}
+ \newcounter{lofdepth}
+ \setcounter{lofdepth}{1}
}
% \end{macrocode}
@@ -31181,8 +31732,8 @@
% \DescribeCounter{lotdepth} \TOC\ depth for tables.
% \begin{macrocode}
\@ifclassloaded{memoir}{}{
-\newcounter{lotdepth}
-\setcounter{lotdepth}{1}
+ \newcounter{lotdepth}
+ \setcounter{lotdepth}{1}
}
% \end{macrocode}
@@ -31202,22 +31753,22 @@
%
% \begin{macrocode}
\newcommand{\hypertocfloat}[5]{%
-\LWR at startpars
+ \LWR at startpars%
% \end{macrocode}
% If some float-creation package has not yet defined
% the float type's |lofdepth| counter, etc, define it here:
% \begin{macrocode}
-\@ifundefined{c@#3depth}{%
-\newcounter{#3depth}%
-\setcounter{#3depth}{1}%
-}{}%
+ \@ifundefined{c@#3depth}{%
+ \newcounter{#3depth}%
+ \setcounter{#3depth}{1}%
+ }{}%
% \end{macrocode}
% Respond to |lofdepth|, etc.:
% \begin{macrocode}
-\LWR at traceinfo{hypertocfloat depth is #1 #3depth is \arabic{#3depth}}%
-\ifthenelse{\cnttest{#1}{<=}{\arabic{#3depth}}}%
- {%
- \LWR at startpars%
+ \LWR at traceinfo{hypertocfloat depth is #1 #3depth is \arabic{#3depth}}%
+ \ifthenelse{\cnttest{#1}{<=}{\arabic{#3depth}}}%
+ {%
+ \LWR at startpars%
% \end{macrocode}
%
% Create an \HTML\ link to
@@ -31229,21 +31780,21 @@
% \changes{v0.47}{2018/01/26}{Fix: Line wrap at \HTML\ hyphen.}
% \changes{v0.72}{2019/06/05}{Fix: References for \pkg{xr}, \pkg{xr-hyper}.}
% \begin{macrocode}
- \LWR at subhyperrefclass{%
- \LWR at htmlrefsectionfilename{%
- \BaseJobname-autopage-\arabic{LWR at nextautopage}%
- }%
- \LWR at origpound\LWR at print@mbox{autoid-\arabic{LWR at nextautoid}}}%
- {#4}{toc#2}%
+ \LWR at subhyperrefclass{%
+ \LWR at htmlrefsectionfilename{%
+ \BaseJobname-autopage-\arabic{LWR at nextautopage}%
+ }%
+ \LWR at origpound\LWR at print@mbox{autoid-\arabic{LWR at nextautoid}}}%
+ {#4}{toc#2}%
% \end{macrocode}
% \changes{v0.69}{2019/03/21}{Added support for \pkg{tocdata}.}
% \begin{macrocode}
- \LWR at maybetocdata%
+ \LWR at maybetocdata%
% \end{macrocode}
% \begin{macrocode}
- \LWR at stoppars%
- }%
- {}%
+ \LWR at stoppars%
+ }%
+ {}%
}
% \end{macrocode}
% \end{macro}
@@ -31363,10 +31914,12 @@
% \begin{environment}{theindex}
% \begin{macrocode}
\@ifundefined{chapter}
-{\newcommand*{\LWR at indexsection}[1]{\section*{#1}}}
-{\newcommand*{\LWR at indexsection}[1]{\chapter*{#1}}}
+ {\newcommand*{\LWR at indexsection}[1]{\section*{#1}}}
+ {\newcommand*{\LWR at indexsection}[1]{\chapter*{#1}}}
+
\AtBeginDocument{
+
\renewenvironment*{theindex}{%
\LWR at indexsection{\indexname}%
\let\item\LWR at indexitem%
@@ -31373,6 +31926,7 @@
\let\subitem\LWR at indexsubitem%
\let\subsubitem\LWR at indexsubsubitem%
}{}
+
}% AtBeginDocument
% \end{macrocode}
% \end{environment}
@@ -31386,7 +31940,7 @@
% \begin{macrocode}
\newcommand{\LWR at indexitem}[1][\@empty]{
-\InlineClass{indexitem}{\LWR at htmlcomment{}}#1%
+ \InlineClass{indexitem}{\LWR at htmlcomment{}}#1%
}
% \end{macrocode}
% \end{macro}
@@ -31396,7 +31950,7 @@
% \begin{macrocode}
\newcommand{\LWR at indexsubitem}{
-\InlineClass{indexsubitem}{\LWR at htmlcomment{}}
+ \InlineClass{indexsubitem}{\LWR at htmlcomment{}}%
}
% \end{macrocode}
% \end{macro}
@@ -31406,7 +31960,7 @@
% \begin{macrocode}
\newcommand{\LWR at indexsubsubitem}{
-\InlineClass{indexsubsubitem}{\LWR at htmlcomment{}}
+ \InlineClass{indexsubsubitem}{\LWR at htmlcomment{}}%
}
% \end{macrocode}
% \end{macro}
@@ -31417,12 +31971,13 @@
% \changes{v0.28}{2017/04/13}{Improved indexing.}
% \begin{macrocode}
\def\LWR at wrindex#1{%
-\addtocounter{LWR at autoindex}{1}%
-\LWR at new@label{LWRindex-\arabic{LWR at autoindex}}%
-\protected at write\@indexfile{}%
-{\string\indexentry{#1}{\arabic{LWR at autoindex}}}%
-\endgroup
-\@esphack}
+ \addtocounter{LWR at autoindex}{1}%
+ \LWR at new@label{LWRindex-\arabic{LWR at autoindex}}%
+ \protected at write\@indexfile{}%
+ {\string\indexentry{#1}{\arabic{LWR at autoindex}}}%
+ \endgroup%
+ \@esphack%
+}
\AtBeginDocument{
\let\@wrindex\LWR at wrindex
@@ -31435,12 +31990,13 @@
% Redefined to write the |LWR at latestautopage| counter instead of |page|.
% \begin{macrocode}
\def\@wrglossary#1{%
-\addtocounter{LWR at autoglossary}{1}%
-\LWR at new@label{LWRglossary-\theLWR at autoglossary}%
-\protected at write\@glossaryfile{}%
-{\string\glossaryentry{#1}{\theLWR at autoglossary}}%
-\endgroup
-\@esphack}
+ \addtocounter{LWR at autoglossary}{1}%
+ \LWR at new@label{LWRglossary-\theLWR at autoglossary}%
+ \protected at write\@glossaryfile{}%
+ {\string\glossaryentry{#1}{\theLWR at autoglossary}}%
+ \endgroup%
+ \@esphack%
+}
% \end{macrocode}
% \end{macro}
@@ -31460,9 +32016,9 @@
% \changes{v0.58}{2018/06/17}{Adds support for \cs{see}, \cs{seealso}, \cs{emph}, \cs{textbf}, etc.}
% \begin{macrocode}
\newrobustcmd{\LWR at doindexentry}[1]{%
-\IfInteger{#1}%
- {\LWR at indexnameref{#1}}%
- {#1}%
+ \IfInteger{#1}%
+ {\LWR at indexnameref{#1}}%
+ {#1}%
}
% \end{macrocode}
% \end{macro}
@@ -31484,19 +32040,19 @@
% \changes{v0.65}{2018/12/09}{Added \cs{textsi}.}
% \begin{macrocode}
\newcommand{\LWR at hyperindexrefnullified}{%
-\renewrobustcmd{\emph}[1]{\LWR at HTML@emph{\LWR at doindexentry{##1}}}%
-\renewrobustcmd{\textbf}[1]{\LWR at HTML@textbf{\LWR at doindexentry{##1}}}%
-\renewrobustcmd{\texteb}[1]{\LWR at HTML@texteb{\LWR at doindexentry{##1}}}%
-\renewrobustcmd{\textlg}[1]{\LWR at HTML@textlg{\LWR at doindexentry{##1}}}%
-\renewrobustcmd{\textrm}[1]{\LWR at HTML@textrm{\LWR at doindexentry{##1}}}%
-\renewrobustcmd{\textsf}[1]{\LWR at HTML@textsf{\LWR at doindexentry{##1}}}%
-\renewrobustcmd{\texttt}[1]{\LWR at HTML@texttt{\LWR at doindexentry{##1}}}%
-\renewrobustcmd{\textup}[1]{\LWR at HTML@textup{\LWR at doindexentry{##1}}}%
-\renewrobustcmd{\textsc}[1]{\LWR at HTML@textsc{\LWR at doindexentry{##1}}}%
-\renewrobustcmd{\textulc}[1]{\LWR at HTML@textulc{\LWR at doindexentry{##1}}}%
-\renewrobustcmd{\textsi}[1]{\LWR at HTML@textsi{\LWR at doindexentry{##1}}}%
-\renewrobustcmd{\textit}[1]{\LWR at HTML@textit{\LWR at doindexentry{##1}}}%
-\renewrobustcmd{\textsl}[1]{\LWR at HTML@textsl{\LWR at doindexentry{##1}}}%
+ \renewrobustcmd{\emph}[1]{\LWR at HTML@emph{\LWR at doindexentry{##1}}}%
+ \renewrobustcmd{\textbf}[1]{\LWR at HTML@textbf{\LWR at doindexentry{##1}}}%
+ \renewrobustcmd{\texteb}[1]{\LWR at HTML@texteb{\LWR at doindexentry{##1}}}%
+ \renewrobustcmd{\textlg}[1]{\LWR at HTML@textlg{\LWR at doindexentry{##1}}}%
+ \renewrobustcmd{\textrm}[1]{\LWR at HTML@textrm{\LWR at doindexentry{##1}}}%
+ \renewrobustcmd{\textsf}[1]{\LWR at HTML@textsf{\LWR at doindexentry{##1}}}%
+ \renewrobustcmd{\texttt}[1]{\LWR at HTML@texttt{\LWR at doindexentry{##1}}}%
+ \renewrobustcmd{\textup}[1]{\LWR at HTML@textup{\LWR at doindexentry{##1}}}%
+ \renewrobustcmd{\textsc}[1]{\LWR at HTML@textsc{\LWR at doindexentry{##1}}}%
+ \renewrobustcmd{\textulc}[1]{\LWR at HTML@textulc{\LWR at doindexentry{##1}}}%
+ \renewrobustcmd{\textsi}[1]{\LWR at HTML@textsi{\LWR at doindexentry{##1}}}%
+ \renewrobustcmd{\textit}[1]{\LWR at HTML@textit{\LWR at doindexentry{##1}}}%
+ \renewrobustcmd{\textsl}[1]{\LWR at HTML@textsl{\LWR at doindexentry{##1}}}%
}
% \end{macrocode}
% \end{macro}
@@ -31521,10 +32077,10 @@
% If the first character is a space, remove it first.
% ^^A Or use the trimspaces package.
% \begin{macrocode}
-\def\LWR at tempone{#1}%
-\IfBeginWith{\LWR at tempone}{ }{%
- \StrGobbleLeft{\LWR at tempone}{1}[\LWR at tempone]%
-}{}%
+ \def\LWR at tempone{#1}%
+ \IfBeginWith{\LWR at tempone}{ }{%
+ \StrGobbleLeft{\LWR at tempone}{1}[\LWR at tempone]%
+ }{}%
% \end{macrocode}
% If a numeric entry, create a link.
% If not numeric, such as \cs{see}, use the entry as-is.
@@ -31531,14 +32087,14 @@
% \cs{emph}, \cs{textit}, etc. have been redefined above to create and
% format the entry.
% \begin{macrocode}
-\IfInteger{\LWR at tempone}%
- {\LWR at indexnameref{\LWR at tempone}}%
- {%
- \begingroup%
- \LWR at hyperindexrefnullified
- #1%
- \endgroup%
- }%
+ \IfInteger{\LWR at tempone}%
+ {\LWR at indexnameref{\LWR at tempone}}%
+ {%
+ \begingroup%
+ \LWR at hyperindexrefnullified%
+ #1%
+ \endgroup%
+ }%
}
% \end{macrocode}
% \end{macro}
@@ -31625,7 +32181,9 @@
% \changes{v0.45}{2018/01/13}{Patched to emphasize titles.}
% \begin{macrocode}
\AtBeginDocument{
+
\AtBeginEnvironment{thebibliography}{
+
\providecommand*{\LWR at newem}[1]{\textit{#1}}
\renewrobustcmd{\em}{%
@@ -31640,7 +32198,9 @@
\endgroup
\LWR at em@after\egroup
}
+
}% \AtBeginEnvironment{thebibliography}
+
}% \AtBeginDocument
% \end{macrocode}
% \end{environment}
@@ -31683,57 +32243,57 @@
% \begin{macrocode}
\newcommand*{\LWR at restoreorigformatting}{%
-\LWR at traceinfo{LWR at restoreorigformatting}%
+ \LWR at traceinfo{LWR at restoreorigformatting}%
% \end{macrocode}
% Numerous macros change their print/\HTML\ meaning depending on \cs{LWR at formatting}:
% \begin{macrocode}
-\renewcommand*{\LWR at formatting}{print}%
-\linespread{1}%
+ \renewcommand*{\LWR at formatting}{print}%
+ \linespread{1}%
% \end{macrocode}
%
% \begin{macrocode}
-\let\par\LWR at origpar%
+ \let\par\LWR at origpar%
% \end{macrocode}
%
% \begin{macrocode}
-\LWR at select@print at hspace%
+ \LWR at select@print at hspace%
% \end{macrocode}
%
% \changes{v0.48}{2018/02/04}{Fix: Spacing in \SVG\ math, \env{lateximage}, \tikz.}
% \begin{macrocode}
-\LetLtxMacro\hfil\LWR at orighfil%
-\let\hss\LWR at orighss%
-\let\llap\LWR at origllap%
-\let\rlap\LWR at origrlap%
-\let\hfilneg\LWR at orighfilneg%
+ \LetLtxMacro\hfil\LWR at orighfil%
+ \let\hss\LWR at orighss%
+ \let\llap\LWR at origllap%
+ \let\rlap\LWR at origrlap%
+ \let\hfilneg\LWR at orighfilneg%
% \end{macrocode}
% \begin{macrocode}
-\let\,\LWR at origcomma% disable HTML short unbreakable space
-\let\thinspace\LWR at origthinspace% disable HTML short unbreakable space
-\let\negthinspace\LWR at orignegthinspace% disable HTML negative short unbreakable space
-\let\textellipsis\LWR at origtextellipsis%
-\let\textless\LWR at origtextless%
-\let\textgreater\LWR at origtextgreater%
+ \let\,\LWR at origcomma% disable HTML short unbreakable space
+ \let\thinspace\LWR at origthinspace% disable HTML short unbreakable space
+ \let\negthinspace\LWR at orignegthinspace% disable HTML negative short unbreakable space
+ \let\textellipsis\LWR at origtextellipsis%
+ \let\textless\LWR at origtextless%
+ \let\textgreater\LWR at origtextgreater%
% \end{macrocode}
% \changes{v0.70}{2019/03/28}{Fix: \cs{\&} in a lateximage.}
% \begin{macrocode}
-\let\&\LWR at origampersand%
+ \let\&\LWR at origampersand%
% \end{macrocode}
% \changes{v0.72}{2019/05/24}{Use \cs{LWR at formatted} for \cs{bfseries}, etc.}
% \begin{macrocode}
-\LetLtxMacro\em\LWR at origem%
-\LetLtxMacro\normalfont\LWR at orignormalfont%
-\let\sp\LWR at origsp%
-\let\sb\LWR at origsb%
-\LetLtxMacro\textsuperscript\LWR at origtextsuperscript%
-\LetLtxMacro\@textsuperscript\LWR at orig@textsuperscript%
-\LetLtxMacro\textsubscript\LWR at origtextsubscript%
-\LetLtxMacro\@textsubscript\LWR at orig@textsubscript%
-\LetLtxMacro\underline\LWR at origunderline%
-\let~\LWR at origtilde%
-\let\enskip\LWR at origenskip%
-\let\quad\LWR at origquad%
-\let\qquad\LWR at origqquad%
+ \LetLtxMacro\em\LWR at origem%
+ \LetLtxMacro\normalfont\LWR at orignormalfont%
+ \let\sp\LWR at origsp%
+ \let\sb\LWR at origsb%
+ \LetLtxMacro\textsuperscript\LWR at origtextsuperscript%
+ \LetLtxMacro\@textsuperscript\LWR at orig@textsuperscript%
+ \LetLtxMacro\textsubscript\LWR at origtextsubscript%
+ \LetLtxMacro\@textsubscript\LWR at orig@textsubscript%
+ \LetLtxMacro\underline\LWR at origunderline%
+ \let~\LWR at origtilde%
+ \let\enskip\LWR at origenskip%
+ \let\quad\LWR at origquad%
+ \let\qquad\LWR at origqquad%
% \end{macrocode}
%
% \cs{endtabular} must be restored to its original,
@@ -31740,25 +32300,25 @@
% instead of relying on \pkg{lwarp}'s \cs{LWR at formatted} mechanism:
% \changes{v0.65}{2018/12/16}{Fix: \env{tabular*}.}
% \begin{macrocode}
-\LetLtxMacro\endtabular\LWR at origendtabular%
-\csletcs{endtabular*}{LWR at origendtabular*}%
+ \LetLtxMacro\endtabular\LWR at origendtabular%
+ \csletcs{endtabular*}{LWR at origendtabular*}%
% \end{macrocode}
% \begin{macrocode}
-\LetLtxMacro\noalign\LWR at orignoalign%
-\LetLtxMacro\hline\LWR at orighline%
+ \LetLtxMacro\noalign\LWR at orignoalign%
+ \LetLtxMacro\hline\LWR at orighline%
% \end{macrocode}
% \begin{macrocode}
-\let\newline\LWR at orignewline%
-\LetLtxMacro\includegraphics\LWR at origincludegraphics%
+ \let\newline\LWR at orignewline%
+ \LetLtxMacro\includegraphics\LWR at origincludegraphics%
% \end{macrocode}
% \changes{v0.42}{2017/10/16}{Improved \cs{ensuremath}.}
% \begin{macrocode}
-\LetLtxMacro\@ensuredmath\LWR at origensuredmath%
+ \LetLtxMacro\@ensuredmath\LWR at origensuredmath%
%
-\LWR at restoreorigaccents%
-\LWR at restoreoriglists%
+ \LWR at restoreorigaccents%
+ \LWR at restoreoriglists%
%
-\LWR at FBcancel%
+ \LWR at FBcancel%
}
% \end{macrocode}
% \end{macro}
@@ -31776,19 +32336,10 @@
%
% \subsection{Limitations}
%
-% \limitsmath
+% See \nameref{sec:limitsmath}, \cref{sec:limitsmath}.
%
-% \subsubsection{Catcode changes}
-% \limitsmathcatcode
%
-% \subsubsection{Complicated inline math objects}
-% \limitsmathinline
%
-% \subsubsection{Complicated display math objects}
-%
-% \limitsmathdisplay
-
-
% \subsection{\HTML\ \attribute{alt} tag names}
%
% Redefinable names for the \HTML\ \attribute{alt} tags,
@@ -31801,7 +32352,7 @@
% \begin{macro}{\AltTextOpen} The opening part of \HTML\ \attribute{alt} tag for
-% an image. The default is a left parenthesis.
+% an image. The default is a left parenthesis. \\
% \DescribeDefault{(}
% \changes{v0.74}{2019/08/20}{Added.}
% \begin{macrocode}
@@ -31811,7 +32362,7 @@
% \begin{macro}{\AltTextClose} The closing part of \HTML\ \attribute{alt} tag for
-% an image. The default is a right parenthesis.
+% an image. The default is a right parenthesis. \\
% \DescribeDefault{(}
% \changes{v0.74}{2019/08/20}{Added.}
% \begin{macrocode}
@@ -31976,9 +32527,9 @@
\let\LWR at origtextdollar\$
\renewcommand*{\$}{%
-\ifnumcomp{\value{LWR at lateximagedepth}}{>}{0}%
-{\LWR at origtextdollar}%
-{\HTMLunicode{00024}}%
+ \ifnumcomp{\value{LWR at lateximagedepth}}{>}{0}%
+ {\LWR at origtextdollar}%
+ {\HTMLunicode{00024}}%
}
% \end{macrocode}
@@ -32058,86 +32609,39 @@
% \end{macro}
-% \begin{macro}{\LWR at subsingledollar} * \marg{2: alt text} \marg{3: add'l hashing}
-% \marg{4: math expression}
-%
-% For inline math.
-% Uses MathJax, or for \SVG\ math the image is measured and ajusted to the baseline
-% of the \HTML\ output, and placed inside a \env{lateximage}.
-%
-% \describehashing
-%
-% \changes{v0.19}{2016/05/25}{\brand{MathJax} support.}
-% \changes{v0.42}{2017/10/26}{If \progcode{FormatWP} print LaTeX expression.}
-% \changes{v0.47}{2018/01/24}{Added \SVG\ math image baseline adjust and em sizing.}
-% \changes{v0.50}{2018/02/23}{Fix: Use \env{lateximage} even if MathJax.}
-% \changes{v0.50}{2018/02/24}{Improved \SVG\ math \attribute{alt} tags.}
+% \DescribeBoolean{LWR at unknownmathsize}
+% If \tikz\ or other objects are used inside math mode, the resulting
+% image may exceed the \TeX\ box, resulting in an incorrect measurement of
+% the size of the resulting image. If this is so, the \HTML\ styles for
+% image size and depth will be neutralized.
% \begin{macrocode}
-\newlength{\LWR at singledollarwidth}
-\newlength{\LWR at singledollarheight}
-\newlength{\LWR at singledollardepth}
+\newbool{LWR at unknownmathsize}
+% \end{macrocode}
-\newsavebox{\LWR at singledollarbox}
-\NewDocumentCommand{\LWR at subsingledollar}{s m m m}{%
-\LWR at traceinfo{LWR at subsingledollar}%
-% \end{macrocode}
-% \begin{macrocode}
-\ifnumcomp{\value{LWR at lateximagedepth}}{>}{0}%
-{%
-\LWR at traceinfo{LWR at subsingledollar: already in a lateximage}%
- #4% contents
-}%
-{% not in a lateximage
-\begingroup%
-% \end{macrocode}
-% Support for \pkg{xfakebold}:
-% \changes{v0.67}{2019/02/17}{\pkg{xfakebold}: Added support.}
-% \begin{macrocode}
-\LWR at applyxfakebold%
-% \end{macrocode}
-% MathJax cannot parse the often complicated \TeX\ expressions which
-% appear in the various uses of \cs{ensuredmath}.
-% \cs{ensuremath} forces the \attribute{alt} tag to ``|(math image)|'', as
-% translated according to \cs{MathImageAltText}.
-% If this is the case, force the use of a \env{lateximage} even if MathJax.
-% Likewise for \pkg{siunitx} if |parse-numbers=false|.
+% \begin{macro}{\LWR at singledollarmeasure} \marg{math expression}
%
-% If MathJax, or if formatting math for a word processor, and not \cs{ensuredmath},
-% and not a dynamic math expression, print the math expression:
-% \changes{v0.51}{2018/03/11}{Fix: \cs{ensuredmath} inside \SVG\ image.}
-% \changes{v0.57}{2018/05/23}{Fix: Dynamic inline math expressions.}
+% Measures the size of the image of the math expression.
+%
+% (In some circumstances \SVG\ math is used even if \brand{MathJax} is
+% preferred.)
+%
+% \begin{description}
+% \item [SVG math:] \cs{LWR at origensuredmath} is part of argument \#4.
+% \item [SVG math \cs{ensuremath}:] \cs{LWR at origensuredmath} is part of argument \#4.
+% \item [SVG dynamic math:] \cs{LWR at origensuredmath} is part of argument \#4.
+% \item [Mathjax:] Argument \#4 is the contents of the math expression
+% without \cs{LWR at origensuredmath}. This case is handled above.
+% \item [Mathjax \cs{ensuremath}:] \cs{LWR at origensuredmath} is part of argument \#4.
+% \item [Mathjax dynamic math:] Argument \#4 is the contents of the math expression
+% without \cs{LWR at origensuredmath}, so \cs{LWR at origensuredmath} is added below.\
+% \item [\cs{ifmmode}:] Included ``just in case''.
+% \end{description}
+%
+% Factored from \cs{LWR at subsingledollarsvg}.
+% \changes{v0.79}{2019/12/14}{Factored.}
% \begin{macrocode}
-\ifboolexpr{%
- (
- bool{mathjax} or
- ( bool{FormatWP} and bool{WPMarkMath} )
- ) and
- ( not test {
- \ifstrequal {#2}
- {\AltTextOpen\MathImageAltText\AltTextClose} % from \ensuredmath
- }
- ) and
- ( not bool{LWR at dynamicmath} )
-}%
-% \end{macrocode}
-% For \brand{MathJax}, print the math between |\(| and |\)|:
-% \begin{macrocode}
-{%
- \LWR at traceinfo{LWR at subsingledollar: Mathjax}%
- {\textbackslash(\LWR at HTMLsanitize{#4}\textbackslash)}%
-}% mathjax
-% \end{macrocode}
-% For SVG, print the math inside a \env{lateximage},
-% with an \element{alt} tag of the \LaTeX\ code,
-% and a \CSS\ style to control the baseline adjustment.
-% \begin{macrocode}
-{% not mathjax
-\LWR at traceinfo{LWR at subsingledollar: NOT mathjax, or is ensuremath, or is dynamic}%
-% \end{macrocode}
-% Measure the depth, width, and height of the math image:
-% \changes{v0.51}{2018/03/04}{Fix: SVG math with enclosed \env{lateximage}.}
-% \begin{macrocode}
+\newcommand*{\LWR at singledollarmeasure}[1]{%
\begingroup%
% \end{macrocode}
% Temporarily disable formatting while measuring the image parameters:
@@ -32158,34 +32662,28 @@
% \begin{macrocode}
\global\advance\c at LWR@lateximagedepth 1\relax%
% \end{macrocode}
-% Typeset and save the contents, depending on how they were generated:
-% \begin{description}
-% \item [SVG math:] \cs{LWR at origensuredmath} is part of argument \#4.
-% \item [SVG math \cs{ensuremath}:] \cs{LWR at origensuredmath} is part of argument \#4.
-% \item [SVG dynamic math:] \cs{LWR at origensuredmath} is part of argument \#4.
-% \item [Mathjax:] Argument \#4 is the contents of the math expression
-% without \cs{LWR at origensuredmath}. This case is handled above.
-% \item [Mathjax \cs{ensuremath}:] \cs{LWR at origensuredmath} is part of argument \#4.
-% \item [Mathjax dynamic math:] Argument \#4 is the contents of the math expression
-% without \cs{LWR at origensuredmath}, so \cs{LWR at origensuredmath} is added below.\
-% \item [\cs{ifmmode}:] Included ``just in case''.
-% \end{description}
%
+% Typeset the math in a box.
+% While doing so, some macros or environments may set \bool{LWR at unknownmathsize},
+% in which case this will be used to cancel the \HTML\ styles being generated here.
+%
% \changes{v0.51}{2018/03/07}{Fix: \env{lateximage} inside \AmS\ \cs{text}.}
% \changes{v0.51}{2018/03/12}{Typeset \SVG\ math only once during measurement.}
% \changes{v0.57}{2018/05/23}{Fix: Dynamic inline math expressions.}
% \begin{macrocode}
+ \boolfalse{LWR at unknownmathsize}%
\ifmmode%
- \global\sbox{\LWR at singledollarbox}{#4}%
+ \global\sbox{\LWR at singledollarbox}{#1}%
\else%
\ifbool{LWR at dynamicmath}{%
\ifbool{mathjax}{%
- \global\sbox{\LWR at singledollarbox}{\LWR at origensuredmath{#4}}%
+ \global\sbox{\LWR at singledollarbox}%
+ {\LWR at origensuredmath{#1}}%
}{%
- \global\sbox{\LWR at singledollarbox}{#4}%
+ \global\sbox{\LWR at singledollarbox}{#1}%
}%
}{%
- \global\sbox{\LWR at singledollarbox}{#4}%
+ \global\sbox{\LWR at singledollarbox}{#1}%
}%
\fi%
% \end{macrocode}
@@ -32238,8 +32736,32 @@
% \end{macrocode}
% \begin{macrocode}
\endgroup%
+}
% \end{macrocode}
+% \end{macro}
+
+
+% \begin{macro}{\LWR at subsingledollarsvg} * \marg{2: alt text} \marg{3: add'l hashing}
+% \marg{4: math expression}
%
+% For inline math.
+% Uses \SVG\ math. The image is measured and ajusted to the baseline
+% of the \HTML\ output, and placed inside a \env{lateximage}.
+%
+% (In some circumstances \SVG\ math is used even if \brand{MathJax} is
+% preferred.)
+%
+% Factored from \cs{LWR at subsingledollar}.
+% \changes{v0.79}{2019/12/14}{Factored.}
+% \begin{macrocode}
+\newcommand*{\LWR at subsingledollarsvg}[4]{%
+% \end{macrocode}
+% Measure the depth, width, and height of the math image:
+% \changes{v0.51}{2018/03/04}{Fix: SVG math with enclosed \env{lateximage}.}
+% \begin{macrocode}
+ \LWR at singledollarmeasure{#4}%
+% \end{macrocode}
+%
% Set a style for the the height or width.
% The |em| unit is used so that the math scales according to the
% user's selected font size.
@@ -32290,6 +32812,18 @@
\def\LWR at singledollardepthstyle{}%
}%
% \end{macrocode}
+%
+% If using certain \tikz\ actions inside math, the resulting image may exceed the
+% \TeX\ boundaries, so the \HTML\ size styles may be incorrect, and must
+% be neutralized.
+% \changes{v0.79}{2020/01/31}{Adjust for unknown size.}
+% \begin{macrocode}
+ \ifbool{LWR at unknownmathsize}{%
+ \def\LWR at singledollarstyle{}%
+ \def\LWR at singledollardepthstyle{}%
+ }{}%
+% \end{macrocode}
+%
% Create the \env{lateximage} using the alternate tag and the computed
% size and depth.
% The star causes \env{lateximage} to use an MD5 hash as the filename.
@@ -32304,9 +32838,9 @@
[\MathImageAltText]% alt tag
[]% no add'l hashing
[\LWR at singledollarstyle \LWR at singledollardepthstyle]% CSS
- }{%
+ }{% not dynamic math
\LWR at traceinfo{subsingledollar: static}%
- \IfValueTF{#1}{%
+ \IfValueTF{#1}{% #1 True
\LWR at findcurrenttextcolor% sets \LWR at tempcolor
% \end{macrocode}
% Support for \pkg{xfakebold}:
@@ -32330,13 +32864,13 @@
FB\LWR at tempone% xfakebold
]%
[\LWR at singledollarstyle \LWR at singledollardepthstyle]% CSS
- }{%
+ }{% #1 False
\begin{lateximage}% no hashing
[#2]% alt
[]% no add'l hashing
[\LWR at singledollarstyle \LWR at singledollardepthstyle]% CSS
}%
- }%
+ }% not dynamic math
% \end{macrocode}
% Place small and almost transparent markers on the baseline
% at the left and right edges of the image.
@@ -32366,15 +32900,110 @@
% \begin{macrocode}
\end{lateximage}%
%
-}% not mathjax
-\endgroup%
-}% not in a lateximage
+}
% \end{macrocode}
+% \end{macro}
+
+
+% \begin{macro}{\LWR at subsingledollar} * \marg{2: alt text} \marg{3: add'l hashing}
+% \marg{4: math expression}
+%
+% For inline math.
+% Uses MathJax, or for \SVG\ math the image is measured and ajusted to the baseline
+% of the \HTML\ output, and placed inside a \env{lateximage}.
+%
+% \begin{description}
+% \item [SVG math:] \cs{LWR at origensuredmath} is part of argument \#4.
+% \item [SVG math \cs{ensuremath}:] \cs{LWR at origensuredmath} is part of argument \#4.
+% \item [SVG dynamic math:] \cs{LWR at origensuredmath} is part of argument \#4.
+% \item [Mathjax:] Argument \#4 is the contents of the math expression
+% without \cs{LWR at origensuredmath}. This case is handled above.
+% \item [Mathjax \cs{ensuremath}:] \cs{LWR at origensuredmath} is part of argument \#4.
+% \item [Mathjax dynamic math:] Argument \#4 is the contents of the math expression
+% without \cs{LWR at origensuredmath}, so \cs{LWR at origensuredmath} is added below.\
+% \end{description}
+%
+% \describehashing
+%
+% \changes{v0.19}{2016/05/25}{\brand{MathJax} support.}
+% \changes{v0.42}{2017/10/26}{If \progcode{FormatWP} print LaTeX expression.}
+% \changes{v0.47}{2018/01/24}{Added \SVG\ math image baseline adjust and em sizing.}
+% \changes{v0.50}{2018/02/23}{Fix: Use \env{lateximage} even if MathJax.}
+% \changes{v0.50}{2018/02/24}{Improved \SVG\ math \attribute{alt} tags.}
+% \begin{macrocode}
+\newlength{\LWR at singledollarwidth}
+\newlength{\LWR at singledollarheight}
+\newlength{\LWR at singledollardepth}
+
+\newsavebox{\LWR at singledollarbox}
+
+\NewDocumentCommand{\LWR at subsingledollar}{s m m m}{%
+ \LWR at traceinfo{LWR at subsingledollar}%
+% \end{macrocode}
+% \begin{macrocode}
+ \ifnumcomp{\value{LWR at lateximagedepth}}{>}{0}%
+ {%
+ \LWR at traceinfo{LWR at subsingledollar: already in a lateximage}%
+ #4% contents
+ }%
+ {% not in a lateximage
+ \begingroup%
+% \end{macrocode}
+% Support for \pkg{xfakebold}:
+% \changes{v0.67}{2019/02/17}{\pkg{xfakebold}: Added support.}
+% \begin{macrocode}
+ \LWR at applyxfakebold%
+% \end{macrocode}
+% MathJax cannot parse the often complicated \TeX\ expressions which
+% appear in the various uses of \cs{ensuredmath}.
+% \cs{ensuremath} forces the \attribute{alt} tag to ``|(math image)|'', as
+% translated according to \cs{MathImageAltText}.
+% If this is the case, force the use of a \env{lateximage} even if MathJax.
+% Likewise for \pkg{siunitx} if |parse-numbers=false|.
+%
+% If MathJax, or if formatting math for a word processor, and not \cs{ensuredmath},
+% and not a dynamic math expression, print the math expression:
+% \changes{v0.51}{2018/03/11}{Fix: \cs{ensuredmath} inside \SVG\ image.}
+% \changes{v0.57}{2018/05/23}{Fix: Dynamic inline math expressions.}
+% \begin{macrocode}
+ \ifboolexpr{%
+ (
+ bool{mathjax} or
+ ( bool{FormatWP} and bool{WPMarkMath} )
+ ) and
+ ( not test {
+ \ifstrequal {#2}% from \ensuredmath
+ {\AltTextOpen\MathImageAltText\AltTextClose}
+ }
+ ) and
+ ( not bool{LWR at dynamicmath} )
+ }%
+% \end{macrocode}
+% For \brand{MathJax}, print the math between |\(| and |\)|:
+% \begin{macrocode}
+ {%
+ \LWR at traceinfo{LWR at subsingledollar: Mathjax}%
+ {\textbackslash(\LWR at HTMLsanitize{#4}\textbackslash)}%
+ }% mathjax
+% \end{macrocode}
+% For SVG, print the math inside a \env{lateximage},
+% with an \element{alt} tag of the \LaTeX\ code,
+% and a \CSS\ style to control the baseline adjustment.
+% \begin{macrocode}
+ {% not mathjax
+ \LWR at traceinfo{%
+ LWR at subsingledollar: NOT mathjax, or is ensuremath, or is dynamic%
+ }%
+ \LWR at subsingledollarsvg{#1}{#2}{#3}{#4}%
+ }% not mathjax
+ \endgroup%
+ }% not in a lateximage
+% \end{macrocode}
% Clear the single-use \attribute{alt} text:
% \changes{v0.74}{2019/08/20}{Add \cs{ThisAltText}.}
% \begin{macrocode}
-\gdef\LWR at ThisAltText{}%
-\LWR at traceinfo{LWR at subsingledollar: done}%
+ \gdef\LWR at ThisAltText{}%
+ \LWR at traceinfo{LWR at subsingledollar: done}%
}
% \end{macrocode}
% \end{macro}
@@ -32542,39 +33171,38 @@
\LetLtxMacro\LWR at origensuredmath\@ensuredmath
\renewcommand{\@ensuredmath}[1]{%
-\ifbool{mathjax}{%
- \LWR at subsingledollar*{\AltTextOpen\MathImageAltText\AltTextClose}{%
- \protect\LWR at HTMLsanitize{\detokenize\expandafter{#1}}%
- }{\relax%
- \LWR at origensuredmath{#1}%
- }%
-}{% SVG math
+ \ifbool{mathjax}{%
+ \LWR at subsingledollar*{\AltTextOpen\MathImageAltText\AltTextClose}{%
+ \protect\LWR at HTMLsanitize{\detokenize\expandafter{#1}}%
+ }{\relax%
+ \LWR at origensuredmath{#1}%
+ }%
+ }{% SVG math
% \end{macrocode}
% If already inside a \env{lateximage} in math mode, continue as-is.
% \begin{macrocode}
-\ifmmode%
- \LWR at origensuredmath{#1}%
-\else%
+ \ifmmode%
+ \LWR at origensuredmath{#1}%
+ \else%
% \end{macrocode}
% Create an inline math \env{lateximage} with a simple \attribute{alt} tag
% and additional hashing according to the contents.
% \begin{macrocode}
- \ifnumcomp{\value{LWR at lateximagedepth}}{>}{0}%
- {\LWR at origensuredmath{#1}}%
- {%
- \LWR at subsingledollar*{\AltTextOpen\MathImageAltText\AltTextClose}{%
- \protect\LWR at HTMLsanitize{\detokenize\expandafter{#1}}%
- }{%
- \LWR at origensuredmath{#1}%
- }%
+ \ifnumcomp{\value{LWR at lateximagedepth}}{>}{0}%
+ {\LWR at origensuredmath{#1}}%
+ {%
+ \LWR at subsingledollar*%
+ {\AltTextOpen\MathImageAltText\AltTextClose}%
+ {\protect\LWR at HTMLsanitize{\detokenize\expandafter{#1}}}%
+ {\LWR at origensuredmath{#1}}%
+ }%
+ \fi%
}%
-\fi%
-}%
% \end{macrocode}
% Clear the single-use \attribute{alt} text:
% \changes{v0.74}{2019/08/20}{Add \cs{ThisAltText}.}
% \begin{macrocode}
-\gdef\LWR at ThisAltText{}%
+ \gdef\LWR at ThisAltText{}%
}
% \end{macrocode}
% \end{macro}
@@ -32682,35 +33310,35 @@
% If using chapters, place the chapter number in front of the equation.
% Otherwise, use the simple equation number.
% \begin{macrocode}
-\ifcsdef{thechapter}{
- \InlineClass{hidden}{
- \textbackslash(
- \textbackslash{}seteqsection \{\thechapter\}
- \textbackslash)
+ \ifcsdef{thechapter}{
+ \InlineClass{hidden}{
+ \textbackslash(
+ \textbackslash{}seteqsection \{\thechapter\}
+ \textbackslash)
+ }
}
-}
-{}% not using chapters
+ {}% not using chapters
% \end{macrocode}
% \brand{MathJax} doesn't allow setting the equation number to 1:
% \begin{macrocode}
-\ifthenelse{\cnttest{\value{equation}}>0}
-{
+ \ifthenelse{\cnttest{\value{equation}}>0}
+ {
% \end{macrocode}
% Tell \brand{MathJax} that the next set of equations begins with the current \LaTeX{} equation
% number, plus one.
% \begin{macrocode}
- \setcounter{LWR at nextequation}{\value{equation}}
- \addtocounter{LWR at nextequation}{1}
+ \setcounter{LWR at nextequation}{\value{equation}}
+ \addtocounter{LWR at nextequation}{1}
% \end{macrocode}
% Place the \brand{MathJax} command inside ``\cs{(}'' and ``\cs{)}'' characters,
% to be printed to \HTML, not interpreted by \LaTeX.
% \begin{macrocode}
- \InlineClass{hidden}{
- \textbackslash(
- \textbackslash{}seteqnumber \{\arabic{LWR at nextequation}\}
- \textbackslash)
- }
-}{}% not eq > 0
+ \InlineClass{hidden}{
+ \textbackslash(
+ \textbackslash{}seteqnumber \{\arabic{LWR at nextequation}\}
+ \textbackslash)
+ }
+ }{}% not eq > 0
}
% \end{macrocode}
% \end{macro}
@@ -32725,19 +33353,19 @@
% \end{macrocode}
% Stop \HTML\ paragraph handling and open an \HTML\ comment:
% \begin{macrocode}
-\LWR at stoppars
-\LWR at htmlopencomment
+ \LWR at stoppars
+ \LWR at htmlopencomment
% \end{macrocode}
% Start the \LaTeX\ math environment inside the \HTML\ comment:
% \begin{macrocode}
-\begingroup
-\@nameuse{LWR at orig#1}
+ \begingroup
+ \@nameuse{LWR at orig#1}
% \end{macrocode}
% While in the math environment,
% restore various commands to their \LaTeX\ meanings.
% \begin{macrocode}
-\LWR at restoreorigformatting
+ \LWR at restoreorigformatting
% \end{macrocode}
% ^^A When a label is encountered, the \HTML\ comment is closed,
% ^^A the label is generated in an \HTML-output context,
@@ -32746,18 +33374,18 @@
%
% Print the contents of the equation:
% \begin{macrocode}
-#2
+ #2
% \end{macrocode}
% End the \LaTeX{} math environment inside the \HTML\ comment:
% \begin{macrocode}
-\@nameuse{LWR at origend#1}
-\endgroup
+ \@nameuse{LWR at origend#1}
+ \endgroup
% \end{macrocode}
% Close the \HTML\ comment and resume \HTML\ paragraph handling:
% \begin{macrocode}
-\LWR at htmlclosecomment
-\LWR at startpars
+ \LWR at htmlclosecomment
+ \LWR at startpars
}
% \end{macrocode}
% \end{macro}
@@ -32773,17 +33401,17 @@
% \end{macrocode}
% Enclose the \brand{MathJax} environment inside printed ``\cs{(}'' and ``\cs{)}'' characters.
% \begin{macrocode}
-\LWR at origtilde\LWR at orignewline
-\textbackslash{}begin\{#1\}
+ \LWR at origtilde\LWR at orignewline
+ \textbackslash{}begin\{#1\}
% \end{macrocode}
% Print the contents, sanitizing for \HTML\ special characters.
% \begin{macrocode}
-\LWR at HTMLsanitizeexpand{\detokenize\expandafter{#2}}
+ \LWR at HTMLsanitizeexpand{\detokenize\expandafter{#2}}
% \end{macrocode}
% Close the \brand{MathJax} environment:
% \begin{macrocode}
-\textbackslash{}end\{#1\}
-\LWR at orignewline
+ \textbackslash{}end\{#1\}
+ \LWR at orignewline
}
% \end{macrocode}
% \end{macro}
@@ -32826,21 +33454,21 @@
% If |mathjax| or |FormatWP|, print the \LaTeX\ expression:
% \changes{v0.42}{2017/10/26}{If \progcode{FormatWP} print LaTeX expression.}
% \begin{macrocode}
-\ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }%
+ \ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }%
% \end{macrocode}
% \brand{MathJax} output:
% \begin{macrocode}
-{
+ {
% \end{macrocode}
% Print commands to syncronize \brand{MathJax}'s equation number and format
% to the current \LaTeX\ chapter/section and equation number:
% \begin{macrocode}
- \LWR at syncmathjax
+ \LWR at syncmathjax
% \end{macrocode}
% Print the \LaTeX\ math inside an \HTML\ comment:
% \begin{macrocode}
- \LWR at hidelatexequation{#2}{#1}
-}
+ \LWR at hidelatexequation{#2}{#1}
+ }
% \end{macrocode}
% SVG output:
% Create the |lateximage| along with an \HTML\ \element{alt} tag
@@ -32847,7 +33475,7 @@
% having an equation number, the \LaTeX{} equation environment
% commmands, and the contents of the environment's \cs{BODY}.
% \begin{macrocode}
-{% not mathjax
+ {% not mathjax
% \end{macrocode}
% Begin the \env{lateximage} with an \element{alt} tag containing the math source:
% \changes{v0.50}{2018/03/02}{Improved \SVG\ math display.}
@@ -32854,47 +33482,47 @@
% \changes{v0.51}{2018/03/11}{Fix: \cs{addcontentsline} inside \SVG\ math. Provides an autoid anchor.}
% \changes{v0.52}{2018/03/31}{Fix: \env{equation*} now based on \env{equation} instead of \env{displaymath}.}
% \begin{macrocode}
- \ifstrequal{#2}{equation*}{%
- \begin{BlockClass}{displaymath}%
- }{%
- \begin{BlockClass}{displaymathnumbered}%
- }%
- \LWR at newautoidanchor%
- \booltrue{LWR at indisplaymathimage}%
- \begin{lateximage}[%
\ifstrequal{#2}{equation*}{%
- \ifdefequal{\LWR at equationtag}{\theequation}{%
-% no tag was given
+ \begin{BlockClass}{displaymath}%
+ }{%
+ \begin{BlockClass}{displaymathnumbered}%
+ }%
+ \LWR at newautoidanchor%
+ \booltrue{LWR at indisplaymathimage}%
+ \begin{lateximage}[%
+ \ifstrequal{#2}{equation*}{%
+ \ifdefequal{\LWR at equationtag}{\theequation}{%
+ % no tag was given
+ }{%
+ (\LWR at equationtag) % tag was given
+ }%
}{%
- (\LWR at equationtag) % tag was given
+ (\LWR at equationtag) % automatic numbering
}%
- }{%
- (\LWR at equationtag) % automatic numbering
- }%
- \textbackslash{begin\{#2\}} % extra space
- \LWR at HTMLsanitizeexpand{\detokenize\expandafter{#1}} % extra space
- \textbackslash{end\{#2\}}%
- ]*% alt tag
+ \textbackslash{begin\{#2\}} % extra space
+ \LWR at HTMLsanitizeexpand{\detokenize\expandafter{#1}} % extra space
+ \textbackslash{end\{#2\}}%
+ ]*% alt tag
% \end{macrocode}
% Support for \pkg{xfakebold}:
% \changes{v0.67}{2019/02/17}{\pkg{xfakebold}: Added support.}
% \begin{macrocode}
- \LWR at applyxfakebold%
+ \LWR at applyxfakebold%
% \end{macrocode}
% Create the actual \LaTeX-formatted equation inside
% the |lateximage| using the contents of the environment.
% \begin{macrocode}
- \@nameuse{LWR at orig#2}%
- #1% contents collected by \collect at body
- \@nameuse{LWR at origend#2}%
- \end{lateximage}%
- \end{BlockClass}%
-}% not mathjax
+ \@nameuse{LWR at orig#2}%
+ #1% contents collected by \collect at body
+ \@nameuse{LWR at origend#2}%
+ \end{lateximage}%
+ \end{BlockClass}%
+ }% not mathjax
% \end{macrocode}
% Clear the single-use \attribute{alt} text:
% \changes{v0.74}{2019/08/20}{Add \cs{ThisAltText}.}
% \begin{macrocode}
-\gdef\LWR at ThisAltText{}%
+ \gdef\LWR at ThisAltText{}%
}
% \end{macrocode}
%
@@ -32912,7 +33540,7 @@
% Clear the single-use \attribute{alt} text:
% \changes{v0.74}{2019/08/20}{Add \cs{ThisAltText}.}
% \begin{macrocode}
-\gdef\LWR at ThisAltText{}%
+ \gdef\LWR at ThisAltText{}%
}
% \end{macrocode}
% \end{macro}
@@ -32936,13 +33564,15 @@
% macro called \cs{BODY}.
% \begin{macrocode}
\AtBeginDocument{
+
\NewEnviron{equation}%
-{\LWR at doequation{\BODY}{equation}}%
-[\LWR at doendequation{equation}]
+ {\LWR at doequation{\BODY}{equation}}%
+ [\LWR at doendequation{equation}]
\LetLtxMacro\LWR at equationnormal\equation
\LetLtxMacro\endLWR at equationnormal\endequation
-}
+
+}% AtBeginDocument
% \end{macrocode}
% \end{environment}
@@ -32950,13 +33580,15 @@
% \begin{environment}{equation*}
% \begin{macrocode}
\AtBeginDocument{
+
\NewEnviron{equation*}%
-{\LWR at doequation{\BODY}{equation*}}%
-[\LWR at doendequation{equation*}]
+ {\LWR at doequation{\BODY}{equation*}}%
+ [\LWR at doendequation{equation*}]
\csletcs{LWR at equationnormalstar}{equation*}
\csletcs{LWR at endequationnormalstar}{endequation*}
-}
+
+}% AtBeginDocument
% \end{macrocode}
% \end{environment}
@@ -32984,15 +33616,15 @@
% \changes{v0.51}{2018/03/21}{Processing for complicated display math.}
% \begin{macrocode}
\newcommand*{\displaymathnormal}{%
-\ifbool{LWR at origmathjax}{\booltrue{mathjax}}{\boolfalse{mathjax}}%
-\LetLtxMacro\[\LWR at openbracketnormal%
-\LetLtxMacro\]\LWR at closebracketnormal%
-\LetLtxMacro\displaymath\LWR at displaymathnormal%
-\LetLtxMacro\enddisplaymath\endLWR at displaymathnormal%
-\LetLtxMacro\equation\LWR at equationnormal%
-\LetLtxMacro\endequation\endLWR at equationnormal%
-\csletcs{equation*}{LWR at equationnormalstar}%
-\csletcs{endequation*}{LWR at endequationnormalstar}%
+ \ifbool{LWR at origmathjax}{\booltrue{mathjax}}{\boolfalse{mathjax}}%
+ \LetLtxMacro\[\LWR at openbracketnormal%
+ \LetLtxMacro\]\LWR at closebracketnormal%
+ \LetLtxMacro\displaymath\LWR at displaymathnormal%
+ \LetLtxMacro\enddisplaymath\endLWR at displaymathnormal%
+ \LetLtxMacro\equation\LWR at equationnormal%
+ \LetLtxMacro\endequation\endLWR at equationnormal%
+ \csletcs{equation*}{LWR at equationnormalstar}%
+ \csletcs{endequation*}{LWR at endequationnormalstar}%
}
% \end{macrocode}
% \end{macro}
@@ -33005,15 +33637,15 @@
% \changes{v0.51}{2018/03/21}{Processing for complicated display math.}
% \begin{macrocode}
\newcommand*{\displaymathother}{%
-\boolfalse{mathjax}%
-\LetLtxMacro\displaymath\LWR at displaymathother%
-\LetLtxMacro\enddisplaymath\endLWR at displaymathother%
-\LetLtxMacro\[\LWR at displaymathother%
-\LetLtxMacro\]\endLWR at displaymathother%
-\LetLtxMacro\equation\LWR at equationother%
-\LetLtxMacro\endequation\endLWR at equationother%
-\csletcs{equation*}{displaymath}%
-\csletcs{endequation*}{enddisplaymath}%
+ \boolfalse{mathjax}%
+ \LetLtxMacro\displaymath\LWR at displaymathother%
+ \LetLtxMacro\enddisplaymath\endLWR at displaymathother%
+ \LetLtxMacro\[\LWR at displaymathother%
+ \LetLtxMacro\]\endLWR at displaymathother%
+ \LetLtxMacro\equation\LWR at equationother%
+ \LetLtxMacro\endequation\endLWR at equationother%
+ \csletcs{equation*}{displaymath}%
+ \csletcs{endequation*}{enddisplaymath}%
}
% \end{macrocode}
% \end{macro}
@@ -33075,22 +33707,22 @@
% then by \pkg{cleveref}.
% \begin{macrocode}
\newcommand*{\LWR at htmlmathlabel}[1]{%
-\LWR at traceinfo{LWR at htmlmathlabelb #1}%
+ \LWR at traceinfo{LWR at htmlmathlabelb #1}%
% \end{macrocode}
% If |mathjax| or |FormatWP|, print the \LaTeX\ expression:
% \changes{v0.42}{2017/10/26}{If \progcode{FormatWP} print LaTeX expression.}
% \begin{macrocode}
-\ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }%
-{%
+ \ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }%
+ {%
% \end{macrocode}
% The combined \LaTeX\ \& \HTML\ label is printed in a \cs{text} field:
% \begin{macrocode}
- \text{%
+ \text{%
% \end{macrocode}
% Shift the label over to the right side of the environment to avoid
% over-printing the math:
% \begin{macrocode}
- \ifbool{LWR at amsmultline}{}{\hspace*{\totwidth@}}%
+ \ifbool{LWR at amsmultline}{}{\hspace*{\totwidth@}}%
% \end{macrocode}
% Temporarily end the \HTML\ comment,
% insert the \LaTeX{} \& \HTML\ label, then
@@ -33098,14 +33730,14 @@
% \cs{@firstofone} is required to remove extra braces
% introduced by the \pkg{amsmath} package.)
% \begin{macrocode}
- \LWR at htmlclosecomment%
- \LWR at origltx@label{#1}%
- \LWR at htmlopencomment%
- }% text
-}% mathjax
-{%
- \LWR at origltx@label{#1}%
-}%
+ \LWR at htmlclosecomment%
+ \LWR at origltx@label{#1}%
+ \LWR at htmlopencomment%
+ }% text
+ }% mathjax
+ {%
+ \LWR at origltx@label{#1}%
+ }%
}
% \end{macrocode}
% \end{macro}
@@ -33116,12 +33748,12 @@
% Starts hiding \LaTeX\ math inside an \HTML\ comment.
% \begin{macrocode}
\newcommand*{\LWR at beginhideamsmath}{
-\LWR at stoppars
-\LWR at origtilde\LWR at orignewline
-\LWR at htmlopencomment
+ \LWR at stoppars
+ \LWR at origtilde\LWR at orignewline
+ \LWR at htmlopencomment
-\begingroup
-\LWR at restoreorigformatting
+ \begingroup
+ \LWR at restoreorigformatting
}
% \end{macrocode}
% \end{macro}
@@ -33130,11 +33762,11 @@
% Ends hiding \LaTeX\ math inside an \HTML\ comment.
% \begin{macrocode}
\newcommand*{\LWR at endhideamsmath}{
-\endgroup
+ \endgroup
-\LWR at htmlclosecomment
-\LWR at orignewline
-\LWR at startpars
+ \LWR at htmlclosecomment
+ \LWR at orignewline
+ \LWR at startpars
}
% \end{macrocode}
% \end{macro}
@@ -33190,8 +33822,8 @@
% If |mathjax| or |FormatWP|, print the \LaTeX\ expression:
% \changes{v0.42}{2017/10/26}{If \progcode{FormatWP} print LaTeX expression.}
% \begin{macrocode}
-\ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }%
-{%
+ \ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }%
+ {%
% \end{macrocode}
%
% If \brand{MathJax}, the environment contents (the \cs{BODY}) are executed in a
@@ -33198,36 +33830,36 @@
% \HTML\ comment to trigger the correct equation number increment (if not starred),
% then are included verbatim in the output for \brand{MathJax} to interpret:
% \begin{macrocode}
- \LWR at syncmathjax
- \boolfalse{LWR at amsmultline}
- \ifbool{LWR at numbereqnarray}
- {
+ \LWR at syncmathjax%
+ \boolfalse{LWR at amsmultline}%
+ \ifbool{LWR at numbereqnarray}%
+ {%
% \end{macrocode}
%
% If numbering the equations, execute a copy inside an \HTML\ comment block:
% \begin{macrocode}
- \LWR at beginhideamsmath
- \LWR at origeqnarray
- \BODY
- \LWR at origendeqnarray
- \LWR at endhideamsmath
+ \LWR at beginhideamsmath%
+ \LWR at origeqnarray%
+ \BODY%
+ \LWR at origendeqnarray%
+ \LWR at endhideamsmath%
% \end{macrocode}
%
% Then print the (sanitized) contents to the output for \brand{MathJax} to interpret:
% \begin{macrocode}
- \LWR at addmathjax{eqnarray}{\BODY}
- }%
- {% not LWR at numbereqnarray
+ \LWR at addmathjax{eqnarray}{\BODY}%
+ }%
+ {% not LWR at numbereqnarray
% \end{macrocode}
%
% If not numbering equations, just create the contents for \brand{MathJax}:
% \begin{macrocode}
- \LWR at addmathjax{eqnarray*}{\BODY}
- }% LWR at numbereqnarray
-}% mathjax
-{% not mathjax
- \ifbool{LWR at numbereqnarray}
- {
+ \LWR at addmathjax{eqnarray*}{\BODY}%
+ }% LWR at numbereqnarray
+ }% mathjax
+ {% not mathjax
+ \ifbool{LWR at numbereqnarray}%
+ {%
% \end{macrocode}
%
% For numbered \SVG\ equations, first create a \env{lateximage} with
@@ -33236,60 +33868,60 @@
% \changes{v0.50}{2018/03/02}{Improved \SVG\ math display.}
% \changes{v0.51}{2018/03/11}{Fix: \cs{addcontentsline} inside \SVG\ math. Provides an autoid anchor.}
% \begin{macrocode}
- \begin{BlockClass}{displaymathnumbered}%
- \LWR at newautoidanchor%
- \booltrue{LWR at indisplaymathimage}%
- \begin{lateximage}[(\LWR at startingequationtag--\LWR at equationtag)
- \LWR at addmathjax{eqnarray}{\BODY}]*
+ \begin{BlockClass}{displaymathnumbered}%
+ \LWR at newautoidanchor%
+ \booltrue{LWR at indisplaymathimage}%
+ \begin{lateximage}[(\LWR at startingequationtag--\LWR at equationtag)%
+ \LWR at addmathjax{eqnarray}{\BODY}]*%
% \end{macrocode}
% Support for \pkg{xfakebold}:
% \changes{v0.67}{2019/02/17}{\pkg{xfakebold}: Added support.}
% \begin{macrocode}
- \LWR at applyxfakebold%
+ \LWR at applyxfakebold%
% \end{macrocode}
% Create the image contents using an actual \env{eqnarray}:
% \begin{macrocode}
- \LWR at origeqnarray
- \BODY
- \LWR at origendeqnarray
- \end{lateximage}
- \end{BlockClass}
- }%
- {% not LWR at numbereqnarray
+ \LWR at origeqnarray%
+ \BODY%
+ \LWR at origendeqnarray%
+ \end{lateximage}%
+ \end{BlockClass}%
+ }%
+ {% not LWR at numbereqnarray
% \end{macrocode}
% If not numbered, do the same, but an extra \cs{nonumber} seems to be required:
% \changes{v0.50}{2018/03/02}{Improved \SVG\ math display.}
% \changes{v0.51}{2018/03/11}{Fix: \cs{addcontentsline} inside \SVG\ math. Provides an autoid anchor.}
% \begin{macrocode}
- \begin{BlockClass}{displaymath}
- \LWR at newautoidanchor%
- \booltrue{LWR at indisplaymathimage}%
- \begin{lateximage}[\LWR at addmathjax{eqnarray*}{\BODY}]*
+ \begin{BlockClass}{displaymath}%
+ \LWR at newautoidanchor%
+ \booltrue{LWR at indisplaymathimage}%
+ \begin{lateximage}[\LWR at addmathjax{eqnarray*}{\BODY}]*%
% \end{macrocode}
% Support for \pkg{xfakebold}:
% \changes{v0.67}{2019/02/17}{\pkg{xfakebold}: Added support.}
% \begin{macrocode}
- \LWR at applyxfakebold%
+ \LWR at applyxfakebold%
% \end{macrocode}
% \begin{macrocode}
- \LWR at origeqnarray
- \BODY
- \nonumber
- \LWR at origendeqnarray
- \end{lateximage}
- \end{BlockClass}
- }% LWR at numbereqnarray
-}% not mathjax
+ \LWR at origeqnarray%
+ \BODY%
+ \nonumber%
+ \LWR at origendeqnarray%
+ \end{lateximage}%
+ \end{BlockClass}%
+ }% LWR at numbereqnarray
+ }% not mathjax
% \end{macrocode}
%
% Default to number equations in the future:
% \begin{macrocode}
-\booltrue{LWR at numbereqnarray}
+ \booltrue{LWR at numbereqnarray}%
% \end{macrocode}
% Clear the single-use \attribute{alt} text:
% \changes{v0.74}{2019/08/20}{Add \cs{ThisAltText}.}
% \begin{macrocode}
-\gdef\LWR at ThisAltText{}%
+ \gdef\LWR at ThisAltText{}%
}
% \end{macrocode}
%
@@ -33443,116 +34075,15 @@
% \end{macrocode}
-% \subsection{Sanitizing math expressions for \HTML}
+% \subsection{Equation numbers}
+
% \codehtml
% \begin{macrocode}
\begin{warpHTML}
% \end{macrocode}
-% \begin{macro}{\LWR at HTMLsanitize} \marg{text}
-%
-% Math expressions are converted to |lateximage|s,
-% and some math environments may contain
-% |&|, |<|, or |>|, which should not be allowed
-% inside an \HTML\ \element{alt} tag, so must convert them to \HTML\ entities.
-%
-% Two versions follow, depending on expansion needs.
-% There may be a better way\dots
-%
-% \changes{v0.36}{2017/08/16}{Fix for \pkg{babel-french}.}
-% \changes{v0.51}{2018/03/07}{Fix: Escapes double quotes.}
-% \begin{macrocode}
-\newrobustcmd{\LWR at HTMLsanitize}[1]{%
-% \end{macrocode}
-% Cancel French \pkg{babel} character handling,
-% and fully expand the strings:
-% \begin{macrocode}
-\begingroup%
-\LWR at FBcancel%
-\fullexpandarg%
-% \end{macrocode}
-% The |&|, |<|, and |>| may be interpreted by the browser:
-% \begin{macrocode}
-\protect\StrSubstitute{\detokenize{#1}}%
-{\detokenize{&}}{\detokenize{&}}[\LWR at strresult]%
-% \end{macrocode}
-% \begin{macrocode}
-\protect\StrSubstitute{\detokenize\expandafter{\LWR at strresult}}%
-{\detokenize{<}}{\detokenize{<}}[\LWR at strresult]%
-% \end{macrocode}
-% \begin{macrocode}
-\protect\StrSubstitute{\detokenize\expandafter{\LWR at strresult}}%
-{\detokenize{>}}{\detokenize{>}}[\LWR at strresult]%
-% \end{macrocode}
-% The double quote occasionally causes problems.
-% \begin{macrocode}
-\protect\StrSubstitute{\detokenize\expandafter{\LWR at strresult}}%
-{\detokenize{"}}{\detokenize{"}}[\LWR at strresult]%
-% \end{macrocode}
-% MathJax allows expressions to be defined with \cs{newcommand}.
-% These expressions would appear with |##| for each argument,
-% and each must be changed to a single |#|.
-% This must be done after all the above changes.
-% Attempting another conversion after this causes an error upon further expansion.
-% \begin{macrocode}
-\protect\StrSubstitute{\detokenize\expandafter{\LWR at strresult}}%
-{\detokenize{##}}{\LWR at origpound}[\LWR at strresult]%
-% \end{macrocode}
-% \begin{macrocode}
-\LWR at strresult%
-\endgroup%
-}
-% \end{macrocode}
-% \end{macro}
-
-% \begin{macro}{\LWR at HTMLsanitizeexpand} \marg{text}
-%
-% This version expands the argument before sanitizing it.
-%
-% \changes{v0.36}{2017/08/16}{Fix for \pkg{babel-french}.}
-% \changes{v0.51}{2018/03/07}{Fix: Escapes double quotes.}
-% \begin{macrocode}
-\newrobustcmd{\LWR at HTMLsanitizeexpand}[1]{%
-% \end{macrocode}
-% Cancel French \pkg{babel} character handling,
-% and fully expand the strings:
-% \begin{macrocode}
-\begingroup%
-\LWR at FBcancel%
-\fullexpandarg%
-% \end{macrocode}
-% The difference between this and \cs{LWR at HTMLsanitize} (without ``expand'')
-% is the following \cs{expandafter}:
-% \begin{macrocode}
-\protect\StrSubstitute{\detokenize\expandafter{#1}}%
-{\detokenize{&}}{\detokenize{&}}[\LWR at strresult]%
-% \end{macrocode}
-% \begin{macrocode}
-\protect\StrSubstitute{\detokenize\expandafter{\LWR at strresult}}%
-{\detokenize{<}}{\detokenize{<}}[\LWR at strresult]%
-% \end{macrocode}
-% \begin{macrocode}
-\protect\StrSubstitute{\detokenize\expandafter{\LWR at strresult}}%
-{\detokenize{>}}{\detokenize{>}}[\LWR at strresult]%
-% \end{macrocode}
-% \begin{macrocode}
-\protect\StrSubstitute{\detokenize\expandafter{\LWR at strresult}}%
-{\detokenize{"}}{\detokenize{"}}[\LWR at strresult]%
-% \end{macrocode}
-% \cs{LWR at HTMLsanitizeexpand} is not used for defining new MathJax macros,
-% so the |##| conversion is not needed here.
-% \begin{macrocode}
-\LWR at strresult%
-\endgroup%
-}
-% \end{macrocode}
-% \end{macro}
-
-
-% \subsection{Equation numbers}
-
% \DescribeCounter{LWR at startingequation}
% For use with |lateximage| and multi-line numbered equations.
% Remembers the next equation number so that it may be printed
@@ -33566,13 +34097,13 @@
\@ifundefined{chapter}
{
\renewcommand{\theLWR at startingequation}{%
-\arabic{LWR at startingequation}%
+ \arabic{LWR at startingequation}%
}
}
{% chapter defined
\renewcommand{\theLWR at startingequation}{%
-\ifnumcomp{\value{chapter}}{>}{0}{\arabic{chapter}.}{}%
-\arabic{LWR at startingequation}%
+ \ifnumcomp{\value{chapter}}{>}{0}{\arabic{chapter}.}{}%
+ \arabic{LWR at startingequation}%
}
}
% \end{macrocode}
@@ -33620,12 +34151,12 @@
%
% \begin{macrocode}
\NewDocumentCommand{\LWR at remembertag}{m}{%
-\ifbool{LWR at isstartingequation}%
-{%
- \global\boolfalse{LWR at isstartingequation}%
- \xdef\LWR at startingequationtag{#1}%
-}{}%
-\xdef\LWR at equationtag{#1}%
+ \ifbool{LWR at isstartingequation}%
+ {%
+ \global\boolfalse{LWR at isstartingequation}%
+ \xdef\LWR at startingequationtag{#1}%
+ }{}%
+ \xdef\LWR at equationtag{#1}%
}%
% \end{macrocode}
% \end{macro}
@@ -33647,9 +34178,9 @@
% \begin{macrocode}
\newcommand*{\LWR at amsmathbody}[1]
{%
-\textbackslash\{begin\}\{#1\} % extra space
-\LWR at HTMLsanitizeexpand{\detokenize\expandafter{\the\@envbody}}%
-\textbackslash\{end\}\{#1\}%
+ \textbackslash\{begin\}\{#1\} % extra space
+ \LWR at HTMLsanitizeexpand{\detokenize\expandafter{\the\@envbody}}%
+ \textbackslash\{end\}\{#1\}%
}
% \end{macrocode}
% \end{macro}
@@ -33664,10 +34195,10 @@
% \begin{macrocode}
\newcommand*{\LWR at amsmathbodynumbered}[1]
{%
-\ifnumcomp{\value{LWR at startingequation}}{=}{\value{equation}}%
-{(\LWR at equationtag)}%
-{(\LWR at startingequationtag--\LWR at equationtag)} % extra space
-\LWR at amsmathbody{#1} % extra space
+ \ifnumcomp{\value{LWR at startingequation}}{=}{\value{equation}}%
+ {(\LWR at equationtag)}%
+ {(\LWR at startingequationtag--\LWR at equationtag)} % extra space
+ \LWR at amsmathbody{#1} % extra space
}
% \end{macrocode}
% \end{macro}
@@ -33796,7 +34327,7 @@
% printed in a multi-equation environment:
% \changes{v0.42}{2017/10/12}{Fix: Numbering and naming AMS math environments.}
% \begin{macrocode}
-\LWR at traceinfo{lateximage: starting outer-most lateximage}%
+ \LWR at traceinfo{lateximage: starting outer-most lateximage}%
\setcounter{LWR at startingequation}{\value{equation}}%
\addtocounter{LWR at startingequation}{1}%
\booltrue{LWR at isstartingequation}%
@@ -33904,10 +34435,16 @@
\LWR at traceinfo{lateximage: about to create a new page}%
\LWR at orignewpage%
% \end{macrocode}
-% Typeset the image in a ``standard'' width page and font size:
+% If the current page is larger,
+% typeset the image in a ``standard'' width page and font size:
+% \changes{v0.79}{2020/01/05}{Improved \cs{linewidth}.}
% \begin{macrocode}
\LWR at traceinfo{lateximage: about to create minipage}%
- \LWR at print@minipage{6in}%
+ \ifdimless{\linewidth}{6in}{%
+ \LWR at print@minipage{\linewidth}%
+ }{%
+ \LWR at print@minipage{6in}%
+ }%
\@nameuse{LWR at print@\LateximageFontSizeName}%
% \end{macrocode}
% Temporarily restore formatting to its \PDF\ definitions:
@@ -34079,10 +34616,10 @@
% \begin{macrocode}
\renewenvironment*{center}
{
-\LWR at forcenewpage
-\ifbool{FormatWP}
-{\BlockClass[\LWR at print@mbox{text-align:center}]{center}}
-{\BlockClass{center}}
+ \LWR at forcenewpage
+ \ifbool{FormatWP}
+ {\BlockClass[\LWR at print@mbox{text-align:center}]{center}}
+ {\BlockClass{center}}
}
{\endBlockClass}
% \end{macrocode}
@@ -34094,10 +34631,10 @@
% \begin{macrocode}
\renewenvironment*{flushright}
{
-\LWR at forcenewpage
-\ifbool{FormatWP}
-{\BlockClass[\LWR at print@mbox{text-align:right}]{flushright}}
-{\BlockClass{flushright}}
+ \LWR at forcenewpage
+ \ifbool{FormatWP}
+ {\BlockClass[\LWR at print@mbox{text-align:right}]{flushright}}
+ {\BlockClass{flushright}}
}
{\endBlockClass}
% \end{macrocode}
@@ -34108,10 +34645,10 @@
% \begin{macrocode}
\renewenvironment*{flushleft}
{
-\LWR at forcenewpage
-\ifbool{FormatWP}
-{\BlockClass[\LWR at print@mbox{text-align:left}]{flushleft}}
-{\BlockClass{flushleft}}
+ \LWR at forcenewpage
+ \ifbool{FormatWP}
+ {\BlockClass[\LWR at print@mbox{text-align:left}]{flushleft}}
+ {\BlockClass{flushleft}}
}
{\endBlockClass}
% \end{macrocode}
@@ -34126,9 +34663,9 @@
% \changes{v0.54}{2018/04/19}{Added debug comment.}
% \begin{macrocode}
\newcommand*{\LWR at HTML@centering}{%
-\ifbool{HTMLDebugComments}{%
- \LWR at htmlcomment{centering}%
-}{}%
+ \ifbool{HTMLDebugComments}{%
+ \LWR at htmlcomment{centering}%
+ }{}%
}
\LWR at formatted{centering}
% \end{macrocode}
@@ -34138,9 +34675,9 @@
% \changes{v0.54}{2018/04/19}{Added debug comment.}
% \begin{macrocode}
\newcommand*{\LWR at HTML@raggedleft}{%
-\ifbool{HTMLDebugComments}{%
- \LWR at htmlcomment{raggedleft}%
-}{}%
+ \ifbool{HTMLDebugComments}{%
+ \LWR at htmlcomment{raggedleft}%
+ }{}%
}
\LWR at formatted{raggedleft}
% \end{macrocode}
@@ -34150,9 +34687,9 @@
% \changes{v0.54}{2018/04/19}{Added debug comment.}
% \begin{macrocode}
\newcommand*{\LWR at HTML@raggedright}{%
-\ifbool{HTMLDebugComments}{%
- \LWR at htmlcomment{raggedright}%
-}{}%
+ \ifbool{HTMLDebugComments}{%
+ \LWR at htmlcomment{raggedright}%
+ }{}%
}
\LWR at formatted{raggedright}
% \end{macrocode}
@@ -34291,9 +34828,6 @@
-
-
-
% \section{\pkg{siunitx}}
% \label{sec:siunitx}
@@ -34889,16 +35423,8 @@
\begin{warpHTML}
% \end{macrocode}
-% \subsection{Counters and lengths}
-% \DescribeCounter{LWR at minipagedepth}
-% Used to only reset the line width at the outermost minipage.
-% \begin{macrocode}
-\newcounter{LWR at minipagedepth}
-\setcounter{LWR at minipagedepth}{0}
-% \end{macrocode}
-
-
+% \subsection{Computed lengths}
%
% \DescribeLength{\LWR at minipagewidth}
% Used to convert the width into printable units.
@@ -34905,6 +35431,7 @@
% \begin{macrocode}
\newlength{\LWR at minipagewidth}
% \end{macrocode}
+%
% \DescribeLength{\LWR at minipageheight}
% Used to convert the height into printable units.
% \begin{macrocode}
@@ -34912,7 +35439,43 @@
% \end{macrocode}
%
%
+% \subsection{Virtual page size}
%
+% \DescribeCounter{LWR at virtualpagedepth}
+% Used to only reset the line width at the outermost minipage.
+% \begin{macrocode}
+\newcounter{LWR at virtualpagedepth}
+\setcounter{LWR at virtualpagedepth}{0}
+% \end{macrocode}
+%
+% \begin{environment}{LWR at setvirtualpage} * \oarg{columns}
+%
+% If not nesting a minipage, adjust \cs{linewidth}, \cs{textwidth},
+% and \cs{textheight} for a virtual $6 \times 9$ page, and start on a new
+% \PDF\ page to help prevent page overflows.
+%
+% If starred, force a new page in the \PDF\ before generating more \HTML.
+% This may be done to reduce the chance of page overflow when starting a
+% new minipage.
+%
+% The optional number of columns defaults to 1.
+%
+% \changes{v0.79}{2020/01/08}{Factored.}
+% \begin{macrocode}
+\NewDocumentEnvironment{LWR at setvirtualpage}{s O{1}}{%
+ \ifnumequal{\value{LWR at virtualpagedepth}}{0}{%
+ \IfBooleanT{#1}{\LWR at orignewpage}%
+ \setlength{\linewidth}{6in/#2}%
+ \setlength{\textwidth}{6in}%
+ \setlength{\textheight}{9in}%
+ }{}%
+ \addtocounter{LWR at virtualpagedepth}{1}%
+}
+{\addtocounter{LWR at virtualpagedepth}{-1}}
+% \end{macrocode}
+% \end{environment}
+%
+%
% \subsection{Footnote handling}
%
% Also see \cref{sec:footnotes} for other forms of footnotes.
@@ -35019,42 +35582,31 @@
\LWR at traceinfo{minipage}%
% \end{macrocode}
%
-% Temporarily open a group, in which width and height is
+% Start an environment, in which width and height is
% computed based on a virtual page size instead of
% the extra-large \PDF\ page used during \HTML\ tag generation.
%
-% The following used to be an actual \LaTeX\ minipage.
-% \changes{v0.45}{2017/12/01}{Fix: Improper \cs{prevdepth}.}
+% \changes{v0.79}{2020/01/07}{Fix: Adjust for virtual page size.}
% \begin{macrocode}
-\begingroup%
+\begin{LWR at setvirtualpage}*%
% \end{macrocode}
-% Compute width, adjusted for frames:
+%
+% Save the requested width now that \cs{linewidth}, etc. are adjusted to virtual size.
+% \changes{v0.79}{2020/01/07}{Fix: Adjust for virtual page size.}
% \begin{macrocode}
\setlength{\LWR at minipagewidth}{#4}%
-\ifthenelse{\cnttest{\value{LWR at minipagedepth}}{=}{0}}{%
-% \end{macrocode}
-% Only create a new page if not yet nested:
-% \begin{macrocode}
- \LWR at orignewpage%
-% \end{macrocode}
-% Adjust virtual page size:
-% \begin{macrocode}
+\ifnumequal{\value{LWR at virtualpagedepth}}{1}{%
\addtolength{\LWR at minipagewidth}{3em}% room for frames
- \setlength{\linewidth}{6in}%
- \setlength{\textwidth}{6in}%
- \setlength{\textheight}{9in}%
}{}%
\LWR at traceinfo{computed width is \LWR at printlength{\LWR at minipagewidth}}%
% \end{macrocode}
+%
% Compute height:
% \begin{macrocode}
\setlength{\LWR at minipageheight}{\textheight}% default unless specified
\ifblank{#2}{}{\setlength{\LWR at minipageheight}{#2}}%
% \end{macrocode}
-% Track nesting depth:
-% \begin{macrocode}
-\addtocounter{LWR at minipagedepth}{1}%
-% \end{macrocode}
+%
% \LaTeX{} wants to start a paragraph for the virtual minipage,
% then start a paragraph again for the contents of the minipage,
% so cancel the paragraph tag handling until the minipage has begun.
@@ -35062,6 +35614,7 @@
\ifbool{FormatWP}{\newline}{}%
\LWR at stoppars%
% \end{macrocode}
+%
% If |FormatWP|, add a text frame:
% \changes{v0.42}{2017/10/26}{If \progcode{FormatWP} add a text frame.}
% \changes{v0.47}{2018/01/26}{Fix: Line wrap at \HTML\ hyphen.}
@@ -35076,6 +35629,7 @@
}{}%
% \end{macrocode}
+%
% Create the \element{div} tag with optional alignment style:
% \changes{v0.47}{2018/01/26}{Fix: Line wrap at \HTML\ hyphen.}
% \begin{macrocode}
@@ -35089,6 +35643,7 @@
\ifthenelse{\equal{#3}{b}}{\LWR at print@mbox{justify-content:flex-end} ; }{}%
\ifthenelse{\equal{#3}{s}}{\LWR at print@mbox{justify-content:space-between} ; }{}%
% \end{macrocode}
+%
% Print the width and optional height styles:
% \changes{v0.66}{2018/12/31}{Honor \cs{LWR at forceminipagefullwidth}.}
% \begin{macrocode}
@@ -35108,11 +35663,13 @@
\ifblank{#2}{}{height:\LWR at printlength{\LWR at minipageheight} ; }%
"}%
% \end{macrocode}
+%
% Finish with an empty line to start the contents on a new line.
% \begin{macrocode}
% The preceding empty line is required.
% \end{macrocode}
+%
% Set the user-accessible line and text width and height values
% inside the virtual minipage.
% These do not affect the actual size of the \PDF\ output,
@@ -35122,16 +35679,19 @@
% which is restored here. This is done instead of settings back to \#4,
% in case \#4 was \cs{linewidth}, which was changed to 6in above.
% \changes{v0.75}{2019/09/17}{Fix: \cs{linewidth}.}
+% \changes{v0.79}{2019/09/17}{Fix: \cs{linewidth} frame padding.}
% \begin{macrocode}
-\setlength{\linewidth}{\LWR at minipagewidth}% the padded width
-\addtolength{\linewidth}{-3em}% the original width
-\setlength{\textwidth}{6in}%
-\setlength{\textheight}{9in}%
+\ifnumequal{\value{LWR at virtualpagedepth}}{1}{%
+ \addtolength{\LWR at minipagewidth}{-3em}% undo frame padding
+}{}%
+\setlength{\linewidth}{\LWR at minipagewidth}%
% \end{macrocode}
+%
% \cs{raggedright} cancels hyphenation, which will be done by \HTML\ instead.
% \begin{macrocode}
\LWR at print@raggedright%
% \end{macrocode}
+%
% Set minipage footnotes:
% \begin{macrocode}
\def\@mpfn{mpfootnote}%
@@ -35138,6 +35698,7 @@
\def\thempfn{\thempfootnote}\c at mpfootnote\z@%
\let\@footnotetext\@mpfootnotetext%
% \end{macrocode}
+%
% Resume paragraph tag handling for the contents of the minipage:
% \changes{v0.42}{2017/10/18}{Added boolean \progcode{WPMarkMinipages}.}
% \begin{macrocode}
@@ -35151,11 +35712,13 @@
}% finished \minipage
{% \endminipage
% \end{macrocode}
+%
% Print pending minipage footnotes:
% \changes{v0.45}{2017/12/01}{Fix: Improper \cs{prevdepth}.}
% \begin{macrocode}
\LWR at printpendingmpfootnotes%
% \end{macrocode}
+%
% End the environment with closing tag:
% \changes{v0.42}{2017/10/18}{Added boolean \progcode{WPMarkMinipages}.}
% \begin{macrocode}
@@ -35165,11 +35728,6 @@
}{}%
\LWR at stoppars%
-% \end{macrocode}
-% The following used to be an actual \LaTeX\ minipage.
-% \changes{v0.45}{2017/12/01}{Fix: Improper \cs{prevdepth}.}
-% \begin{macrocode}
-\endgroup%
\ifbool{FormatWP}{%
@@ -35178,10 +35736,11 @@
}{}%
\LWR at htmldivclassend{minipage}%
-\addtocounter{LWR at minipagedepth}{-1}%
+\end{LWR at setvirtualpage}%
\LWR at startpars%
\ifbool{FormatWP}{\newline}{}%
% \end{macrocode}
+%
% Prevent paragraph tags around horizontal white space
% until the start of the next paragraph:
% \begin{macrocode}
@@ -35284,6 +35843,7 @@
% \changes{v0.70}{2019/04/02}{Fix: Accept long arg.}
% \changes{v0.70}{2019/04/02}{Fix: No width given.}
% \changes{v0.70}{2019/04/02}{Fix: Ignore width of 0pt.}
+% \changes{v0.79}{2020/01/07}{Fix: Adjust for virtual page size.}
% \begin{macrocode}
\NewDocumentCommand{\LWR at HTML@makebox}{>{\SplitArgument{1}{,}}d() o o +m}{%
% \end{macrocode}
@@ -35290,38 +35850,38 @@
%
% Build the style depending on arguments:
% \begin{macrocode}
-{% scope
- \def\LWR at temptwo{}%
- \IfValueTF{#1}%
- {% (width,height) ..
- \LWR@@makebox at paren #1%
- \IfValueT{#2}%
- {% (width,height) [posn]
- \LWR@@makebox at align{#2}%
+ \begin{LWR at setvirtualpage}%
+ \def\LWR at temptwo{}%
+ \IfValueTF{#1}%
+ {% (width,height) ..
+ \LWR@@makebox at paren #1%
+ \IfValueT{#2}%
+ {% (width,height) [posn]
+ \LWR@@makebox at align{#2}%
+ }%
}%
- }%
- {% [width]
- \IfValueT{#2}% [width]
- {%
- \setlength{\LWR at tempwidth}{#2}%
- \ifdimgreater{\LWR at tempwidth}{0pt}{%
- \appto{\LWR at temptwo}{%
- width:\LWR at printlength{\LWR at tempwidth} ; % space
- }%
- }{}%
+ {% [width]
+ \IfValueT{#2}% [width]
+ {%
+ \setlength{\LWR at tempwidth}{#2}%
+ \ifdimgreater{\LWR at tempwidth}{0pt}{%
+ \appto{\LWR at temptwo}{%
+ width:\LWR at printlength{\LWR at tempwidth} ; % space
+ }%
+ }{}%
+ }%
}%
- }%
- \IfValueT{#3}%
- {% [width] [posn]
- \LWR@@makebox at align{#3}%
- }%
- \InlineClass[%
- \LWR at print@mbox{display:inline-block} ; %
- \LWR at temptwo%
- ]%
- {makebox}%
- {#4}%
-}% scope
+ \IfValueT{#3}%
+ {% [width] [posn]
+ \LWR@@makebox at align{#3}%
+ }%
+ \InlineClass[%
+ \LWR at print@mbox{display:inline-block} ; %
+ \LWR at temptwo%
+ ]%
+ {makebox}%
+ {#4}%
+ \end{LWR at setvirtualpage}%
}
\LWR at formatted{makebox}
% \end{macrocode}
@@ -35529,10 +36089,19 @@
\NewDocumentEnvironment{LWR at HTML@fminipage}{O{t} o O{t} m}
{%
\LWR at traceinfo{fminipage #1 #2 #3 #4}%
-\LWR at forceminwidth{\fboxrule}%
+% \end{macrocode}
+%
+% Locally change to the virtual page size before processing the requested sizes:
+% \changes{v0.79}{2020/01/07}{Fix: Adjust for virtual page size.}
+% \begin{macrocode}
+\begin{LWR at setvirtualpage}*%
\setlength{\LWR at tempwidth}{#4}%
\IfValueT{#2}{\setlength{\LWR at tempheight}{#2}}%
% \end{macrocode}
+% Use a rule of at least one pixel in width:
+% \begin{macrocode}
+\LWR at forceminwidth{\fboxrule}%
+% \end{macrocode}
% \changes{v0.62}{2018/11/11}{Fix: Horiz white space.}
% \begin{macrocode}
\LWR at stoppars%
@@ -35556,7 +36125,9 @@
}
{%
\end{BlockClass}%
+\end{LWR at setvirtualpage}%
% \end{macrocode}
+%
% Prevent paragraph tags around horizontal white space
% until the start of the next paragraph:
% \changes{v0.62}{2018/11/11}{Fix: Horiz white space.}
@@ -36485,38 +37056,41 @@
}
% \end{macrocode}
%
-% Direct-formatting font sizes are ignored:
+% Direct-formatting font sizes are remembered for future use:
%
% \changes{v0.58}{2018/06/07}{Improved print/\HTML\ output selection.}
+% \changes{v0.79}{2020/01/01}{Remember \HTML\ font size.}
% \begin{macrocode}
-\newrobustcmd*{\LWR at HTML@normalsize}{}
+\newcommand*{\LWR at font@size}{normalsize}
+
+\newrobustcmd*{\LWR at HTML@normalsize}{\renewcommand*{\LWR at font@size}{normalsize}}
\LWR at formatted{normalsize}
-\newrobustcmd*{\LWR at HTML@small}{}
+\newrobustcmd*{\LWR at HTML@small}{\renewcommand*{\LWR at font@size}{small}}
\LWR at formatted{small}
-\newrobustcmd*{\LWR at HTML@footnotesize}{}
+\newrobustcmd*{\LWR at HTML@footnotesize}{\renewcommand*{\LWR at font@size}{footnotesize}}
\LWR at formatted{footnotesize}
-\newrobustcmd*{\LWR at HTML@scriptsize}{}
+\newrobustcmd*{\LWR at HTML@scriptsize}{\renewcommand*{\LWR at font@size}{scriptsize}}
\LWR at formatted{scriptsize}
-\newrobustcmd*{\LWR at HTML@tiny}{}
+\newrobustcmd*{\LWR at HTML@tiny}{\renewcommand*{\LWR at font@size}{tiny}}
\LWR at formatted{tiny}
-\newrobustcmd*{\LWR at HTML@large}{}
+\newrobustcmd*{\LWR at HTML@large}{\renewcommand*{\LWR at font@size}{large}}
\LWR at formatted{large}
-\newrobustcmd*{\LWR at HTML@Large}{}
+\newrobustcmd*{\LWR at HTML@Large}{\renewcommand*{\LWR at font@size}{Large}}
\LWR at formatted{Large}
-\newrobustcmd*{\LWR at HTML@LARGE}{}
+\newrobustcmd*{\LWR at HTML@LARGE}{\renewcommand*{\LWR at font@size}{LARGE}}
\LWR at formatted{LARGE}
-\newrobustcmd*{\LWR at HTML@huge}{}
+\newrobustcmd*{\LWR at HTML@huge}{\renewcommand*{\LWR at font@size}{huge}}
\LWR at formatted{huge}
-\newrobustcmd*{\LWR at HTML@Huge}{}
+\newrobustcmd*{\LWR at HTML@Huge}{\renewcommand*{\LWR at font@size}{Huge}}
\LWR at formatted{Huge}
% \end{macrocode}
%
@@ -37523,8 +38097,145 @@
% \begin{macrocode}
\end{warpHTML}
% \end{macrocode}
+
+
+
+
+% \section{\pkg{babel} and \pkg{polyglossia} warnings}
+% \label{sec:languages}
%
+% \changes{v0.79}{2019/12/15}{\pkg{babel} and \pkg{polyglossia}: Added info messages.}
%
+% \pkg{lwarp} prints a message instructing the user how to avoid the following error.
+%
+% (These are not \cs{PackageWarning}s because there may not be a problem.)
+%
+% \limitspolyglossia
+%
+% \codehtml
+% \begin{macrocode}
+\begin{warpHTML}
+\AtBeginDocument{
+
+\@ifpackageloaded{polyglossia}{
+ \PackageWarningNoLine{lwarp}
+ {%
+ Polyglossia has been loaded. Lwarp also uses cleveref.\MessageBreak
+ See the cleveref documentation regarding\MessageBreak
+ polyglossia support%
+ }
+ \typeout{If the error}
+ \typeout{\space\space``! Undefined control sequence.
+ \space ... \space \protect\@begindocumenthook''}
+ \typeout{occurs here, use the polyglossia macro:}
+ \typeout{\space\space\protect\setmainlanguage\protect{...\protect}}
+ \typeout{---}
+}{
+ \@ifpackageloaded{babel}{
+ \PackageWarningNoLine{lwarp}
+ {%
+ Babel has been loaded. Lwarp also uses cleveref.\MessageBreak
+ See the cleveref documentation regarding\MessageBreak
+ babel support%
+ }
+ }{}
+}
+
+}
+\end{warpHTML}
+% \end{macrocode}
+%
+%
+%
+%
+% \section{\brand{MathJax} warnings}
+% ^^A *mathjax
+%
+% \begin{macro}{\LWR at mathjaxwarn} \marg{packagename} \marg{More text.}
+%
+% To be done \cs{AtBeginDocument}.
+%
+% \changes{v0.79}{2020/01/18}{Warn if using packages not supported by \brand{MathJax}.}
+% \begin{macrocode}
+\newcommand*{\LWR at mathjaxwarn}[2]{%
+ \@ifpackageloaded{lwarp-#1}{%
+ \ifblank{#2}{%
+ \PackageWarningNoLine{lwarp}
+ {%
+ Lwarp provides emulation for MathJax when used\MessageBreak
+ with the #1 package%
+ }
+ }{%
+ \PackageWarningNoLine{lwarp}
+ {%
+ Lwarp provides emulation for MathJax when used\MessageBreak
+ with the #1 package.\MessageBreak
+ #2%
+ }
+ }%
+ }{}%
+}
+
+\AtBeginDocument{
+ \ifbool{mathjax}{
+ \LWR at mathjaxwarn{arydshln}
+ {In a math array, do not use the optional argument\MessageBreak
+ for \protect\cdashline.\space\space
+ Furthermore, \protect\cline\space is not\MessageBreak
+ supported by MathJax}
+ \LWR at mathjaxwarn{autonum}
+ {MathJax does not support equation+.\MessageBreak
+ You may use the warpprint and warpHTML\MessageBreak
+ environments to isolate the package load\MessageBreak
+ and the equation+ environments}
+ \LWR at mathjaxwarn{backnaur}
+ {You may enclose its uses inside\MessageBreak
+ lateximage environments to force SVG output,\MessageBreak
+ but this also changes the print output}
+ \LWR at mathjaxwarn{bigdelim}
+ {Delimiters appear only of the first line}
+ \LWR at mathjaxwarn{booktabs}
+ {In a math array, do not use (trim) for \protect\cmidrule}
+ \LWR at mathjaxwarn{breqn}
+ {Each environment becomes an SVG image}
+ \LWR at mathjaxwarn{delarray}
+ {Enclose its uses inside lateximage\MessageBreak
+ environments to force SVG output}
+ \LWR at mathjaxwarn{jkmath}{}
+ \LWR at mathjaxwarn{mathspec}{}
+ \LWR at mathjaxwarn{mathtools}
+ {Avoid starred macros.\MessageBreak
+ See the Lwarp manual for other limitations}
+ \LWR at mathjaxwarn{multirow}
+ {Multirow works as expected in text mode, but\MessageBreak
+ limited emulation is provided for MathJax math.\MessageBreak
+ \protect\multirow\space ignores all arguments except\MessageBreak
+ the text}
+ \LWR at mathjaxwarn{pb-diagram}
+ {Enclose its uses inside lateximage environments\MessageBreak
+ to force SVG output}
+ \LWR at mathjaxwarn{physics}
+ {The third-party extension is not yet used.\MessageBreak
+ Avoid starred macros and automatic delimiters.\MessageBreak
+ Use all mandatory arguments, adding empty as needed.\MessageBreak
+ See the Lwarp manual for details}
+ \LWR at mathjaxwarn{unicode-math}
+ {Not all characters are encoded correctly.\MessageBreak
+ Some symbol fonts are not supported by MathJax,\MessageBreak
+ and are only approximated}
+ \LWR at mathjaxwarn{witharrows}
+ {Arrows can only point to the next line.\MessageBreak
+ Text is only placed on a single line}
+ \LWR at mathjaxwarn{xy}
+ {xy works in text, but in math you must\MessageBreak
+ enclose its uses inside lateximage\MessageBreak
+ environments to force SVG output}
+ }{}
+}
+% \end{macrocode}
+% \end{macro}
+%
+%
% \iffalse
%</package>
% \fi
@@ -38807,6 +39518,14 @@
}% not mathjax
% \end{macrocode}
%
+%
+% For nesting \AmS\ environments:
+% \begin{macrocode}
+\newcounter{LWR at amsmathdepth}
+\setcounter{LWR at amsmathdepth}{0}
+% \end{macrocode}
+%
+%
% The following \AmS\ environments are patched in-place:
%
% \changes{v0.44}{2017/11/16}{AMS environments: Fix: Groups for \env{lateximage}s.}
@@ -38835,24 +39554,28 @@
% \begin{noindmacro}{\LWR at amsmathenv@before} \marg{environment name}
%
% Embeds the environment with \brand{MathJax} or a \env{lateximage}.
+% \changes{v0.79}{2020/01/31}{AMS environments: Fix: Nested.}
% \begin{macrocode}
\newcommand*{\LWR at amsmathenv@before}[1]{%
- \LWR at stoppars%
- \ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }%
- {
- \LWR at syncmathjax
- \boolfalse{LWR at amsmultline}
- \ifstrequal{#1}{multline}{\booltrue{LWR at amsmultline}}{}
- \ifstrequal{#1}{multline*}{\booltrue{LWR at amsmultline}}{}
+ \ifnumequal{\value{LWR at amsmathdepth}}{0}{%
+ \LWR at stoppars%
+ \ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }%
+ {
+ \LWR at syncmathjax
+ \boolfalse{LWR at amsmultline}
+ \ifstrequal{#1}{multline}{\booltrue{LWR at amsmultline}}{}
+ \ifstrequal{#1}{multline*}{\booltrue{LWR at amsmultline}}{}
% \end{macrocode}
% \pkg{autonum}'s ``+'' environments are not supported by \brand{MathJax}.
% \watchout
% \begin{macrocode}
- \LWR at beginhideamsmath
- }
- {
- \LWR at amsmathenv@@before{#1}
- }
+ \LWR at beginhideamsmath
+ }
+ {
+ \LWR at amsmathenv@@before{#1}
+ }
+ }{}
+ \addtocounter{LWR at amsmathdepth}{1}
}
% \end{macrocode}
% \end{noindmacro}
@@ -38862,6 +39585,7 @@
%
% Embeds the environment inside a \env{lateximage}.
% \changes{v0.73}{2019/06/25}{AMS environments: Fix: Paragraph tags.}
+% \changes{v0.79}{2020/01/31}{AMS environments: Fix: Nested.}
% \begin{macrocode}
\newcommand*{\LWR at amsmathenv@@after}{%
\end{lateximage}\end{BlockClass}\LWR at startpars%
@@ -38875,18 +39599,21 @@
% Embeds the environment with \brand{MathJax} or a \env{lateximage}.
% \begin{macrocode}
\newcommand*{\LWR at amsmathenv@after}[1]{%
- \ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }%
- {
- \LWR at endhideamsmath
- \boolfalse{LWR at amsmultline}
- \LWR at addmathjax{#1}{\the\@envbody}
- }
- {\LWR at amsmathenv@@after}
+ \ifnumequal{\value{LWR at amsmathdepth}}{1}{%
+ \ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }%
+ {
+ \LWR at endhideamsmath
+ \boolfalse{LWR at amsmultline}
+ \LWR at addmathjax{#1}{\the\@envbody}
+ }
+ {\LWR at amsmathenv@@after}
% \end{macrocode}
% Clear the single-use \attribute{alt} text:
% \changes{v0.74}{2019/08/20}{Add \cs{ThisAltText}.}
% \begin{macrocode}
-\gdef\LWR at ThisAltText{}%
+ \gdef\LWR at ThisAltText{}%
+ }{}
+ \addtocounter{LWR at amsmathdepth}{-1}
}
% \end{macrocode}
% \end{noindmacro}
@@ -38982,6 +39709,15 @@
% \end{macrocode}
% \end{environment}
%
+%
+% For \brand{MathJax}:
+% \changes{v0.79}{2020/01/27}{\pkg{amsmath}: Added \brand{MathJax} emulation.}
+% \begin{macrocode}
+\begin{warpMathJax}
+\CustomizeMathJax{\newcommand{\intertext}[1]{\\ \text{#1}\notag \\}}
+\end{warpMathJax}
+% \end{macrocode}
+%
% \iffalse
%</amsmath>
% \fi
@@ -39459,6 +40195,17 @@
\LWR at formatted{ARtt}
% \end{macrocode}
%
+%
+% For \brand{MathJax}:
+% \changes{v0.79}{2020/01/30}{\pkg{ar}: Added \brand{MathJax} emulation.}
+% \begin{macrocode}
+\begin{warpMathJax}
+\CustomizeMathJax{\newcommand{\AR}{\mathit{A\!\!R}}}
+\CustomizeMathJax{\newcommand{\ARb}{\boldsymbol{A\!\!R}}}
+\end{warpMathJax}
+% \end{macrocode}
+%
+%
% \iffalse
%</ar>
% \fi
@@ -39535,6 +40282,13 @@
\LWR at formatted{tabularnewline}
% \end{macrocode}
%
+% For \brand{MathJax}:
+% \begin{macrocode}
+\CustomizeMathJax{
+\newcommand{\multicolumn}[3]{#3}% only uses one cell
+}
+% \end{macrocode}
+%
% \iffalse
%</array>
% \fi
@@ -39565,6 +40319,10 @@
% a single-dashed rule is displayed as a single-dashed border, and
% a double-dashed rule is displayed as a thicker single-dashed border.
%
+% For \brand{MathJax}, limited emulation is provided for math mode.
+% \trouble{arydshln=\pkg{arydshln}}
+% \trouble{Mathjax=\brand{MathJax}>arydshln=\pkg{arydshln}}
+%
% \changes{v0.56}{2018/05/02}{\pkg{arydshln}: Added.}
%
% \codehtml
@@ -39661,6 +40419,16 @@
\def\adl at inactivecdl[#1-#2][#3]{\ifnum0=`{\fi}\cline{#1-#2}}
% \end{macrocode}
+
+% \changes{v0.79}{2020/01/30}{\pkg{arydshln}: Added \brand{MathJax} emulation.}
+% \begin{macrocode}
+\begin{warpMathJax}
+\CustomizeMathJax{\newcommand{\firsthdashline}[1][]{\hdashline}}
+\CustomizeMathJax{\let\lasthdashline\firsthdashline}
+\CustomizeMathJax{\let\cdashline\cline}
+\end{warpMathJax}
+% \end{macrocode}
+
% \iffalse
%</arydshln>
% \fi
@@ -40116,8 +40884,88 @@
%
%
%
+% \iffalse
+%<*awesomebox>
+% \fi
%
+% \part{lwarp-awesomebox.sty}
+%
+% \section{awesomebox}
+%
+% \credits{\'{E}tienne Deparis}
+%
+% \DescribePackage{awesomebox}
+% \pkg{awesomebox} is patched for use by \pkg{lwarp}.
+%
+% \changes{v0.79}{2020/01/01}{\pkg{awesomebox}: Added.}
+%
+% \codehtml
+%
+% \begin{macrocode}
+\LWR at ProvidesPackagePass{awesomebox}[2019/07/27]
+% \end{macrocode}
+%
+% \begin{macrocode}
+\newcommand*{\LWR at awesomebox@boxborders}{}%
+\newcommand*{\LWR at awesomebox@contentsborders}{}%
+
+\newcommand*{\LWR at awesomebox@ruleborders}{%
+ border-top: 1px solid black ;
+ border-bottom: 1px solid black%
+}
+
+% \awesomebox[1:vrulecolor][2:hrule][3:title]{4:vrulewidth}{5:icon}{6:iconcolor}{7:content}
+\RenewDocumentCommand \awesomebox { O{abvrulecolor} O{} o m m m +m }{%
+ \begin{awesomeblock}[#1][#2][#3]{#4}{#5}{#6}
+ #7
+ \end{awesomeblock}
+}
+
+% \begin{awesomeblock}[1:vrulecolor][2:hrule][3:title]{4:vrulewidth}{5:icon}{6:iconcolor}
+% <contents>
+% \end{awesomeblock}
+\RenewDocumentEnvironment{awesomeblock}{ O{abvrulecolor} O{} o m m m }
+{%
+ \LWR at forceminwidth{#4}%
+ \convertcolorspec{named}{#1}{HTML}\LWR at tempcolor%
+ \renewcommand*{\LWR at awesomebox@boxborders}{}%
+ \renewcommand*{\LWR at awesomebox@contentsborders}{}%
+ \ifdefstrequal{\abShortLine}{#2}{%
+ \renewcommand*{\LWR at awesomebox@contentsborders}{\LWR at awesomebox@ruleborders}%
+ }{}%
+ \ifdefstrequal{\abLongLine}{#2}{%
+ \renewcommand*{\LWR at awesomebox@boxborders}{\LWR at awesomebox@ruleborders}%
+ }{}%
+ \begin{BlockClass}[\LWR at awesomebox@boxborders]{awesomebox}
+ \begin{BlockClass}[%
+ margin-left: 2\% ;
+ vertical-align: top
+ ]{minipage}
+ \color{#6}\Huge #5
+ \end{BlockClass}
+ \begin{BlockClass}[%
+ width:75\% ;
+ vertical-align: top ;
+ padding-left: 1em ;
+ \LWR at awesomebox@contentsborders ;
+ border-left: \LWR at printlength{\LWR at atleastonept} %
+ solid \LWR at origpound\LWR at tempcolor%
+ ]{minipage}
+ \IfValueTF{#3}{#3\newline}{}
+}
+{%
+ \end{BlockClass}
+ \end{BlockClass}
+}
+% \end{macrocode}
+%
% \iffalse
+%</awesomebox>
+% \fi
+%
+%
+%
+% \iffalse
%<*axessibility>
% \fi
%
@@ -40756,6 +41604,22 @@
\LWR at formatted{rdelim}
% \end{macrocode}
+
+% Limited emulation for \brand{MathJax}.
+% The delimiter is printed on the first row, along with any optional text.
+% \changes{v0.79}{2020/01/20}{\pkg{bigdelim}: Added \brand{MathJax} emulation.}
+% \begin{macrocode}
+\begin{warpMathJax}
+\CustomizeMathJax{
+% \ldelim ( [n]{width}[text]
+ \newcommand{\LWRldelim}[1][]{\text{#1}~\LWRbigdelim}
+ \def\ldelim#1#2#3{\def\LWRbigdelim{#1}\LWRldelim}
+% \rdelim ) [n]{width}[text]
+ \newcommand{\LWRrdelim}[1][]{\LWRbigdelim~\text{#1}}
+ \def\rdelim#1#2#3{\def\LWRbigdelim{#1}\LWRrdelim}
+}
+\end{warpMathJax}
+% \end{macrocode}
%
% \iffalse
%</bigdelim>
@@ -40838,9 +41702,17 @@
\appto\LWR at restoreorigformatting{%
\LetLtxMacro\bigstrut\LWR at origbigstrut%
}
+
% \end{macrocode}
%
+% \changes{v0.79}{2020/01/20}{\pkg{bigstrut}: Added \brand{MathJax} emulation.}
+% \begin{macrocode}
+\CustomizeMathJax{
+ \newcommand{\bigstrut}[1][]{}
+}
+% \end{macrocode}
%
+%
% \iffalse
%</bigstrut>
% \fi
@@ -40921,8 +41793,53 @@
%
%
%
+% \iffalse
+%<*bm>
+% \fi
%
+% \part{lwarp-bm.sty}
+%
+% \section{bm}
+%
+% \credits{David Carlisle, Frank Mittelbach}
+%
+% \DescribePackage{bm}
+% \pkg{bm} is patched for use by \pkg{lwarp}.
+%
+% \changes{v0.79}{2020/02/18}{\pkg{bm}: Added.}
+%
+% \codehtml
+%
+% \begin{macrocode}
+\LWR at ProvidesPackagePass{bm}[2019/07/24]
+% \end{macrocode}
+%
+% \cs{DeclareBoldMathCommand} must only be used in the preamble, since it
+% adds to the \brand{MathJax} setup code.
+%
+% \begin{macrocode}
+\begin{warpMathJax}
+\LetLtxMacro\LWR at orig@DeclareBoldMathCommand\DeclareBoldMathCommand
+
+\renewcommand\DeclareBoldMathCommand[3][bold]{%
+ \LWR at orig@DeclareBoldMathCommand[#1]{#2}{#3}%
+ \CustomizeMathJax{\newcommand{#2}{\boldsymbol{#3}}}%
+}
+
+\@onlypreamble\DeclareBoldMathCommand
+
+\CustomizeMathJax{\newcommand{\bm}[1]{\boldsymbol{#1}}}
+\end{warpMathJax}
+% \end{macrocode}
+%
% \iffalse
+%</bm>
+% \fi
+%
+%
+%
+%
+% \iffalse
%<*booklet>
% \fi
%
@@ -41022,20 +41939,34 @@
% \pkg{booktabs} is emulated during \HTML\ output, and
% used as-is during print output and inside an \HTML\ \env{lateximage}.
%
+% For \brand{MathJax}, emulation is provided in math mode, but \watchout[\cs{cmidrule}]
+% \trouble{booktabs=\pkg{booktabs}}
+% \trouble{Mathjax=\brand{MathJax}>booktabs=\pkg{booktabs}}
+% \cs{cmidrule} trim must not be used.
+%
% \changes{v0.34}{2017/08/08}{\pkg{booktabs}: Works inside \env{lateximage}.}
%
% \codehtml
%
-% First, forget the placeholder macros:
+% If \pkg{booktabs} has already been loaded before \pkg{lwarp},
+% such as by \pkg{memoir}, use it as-is.
+% If not, the \pkg{lwarp} core will have placed some dummy macros which should
+% be removed before loading the actual \pkg{booktabs} definitions.
+% \changes{v0.79}{2019/12/09}{\pkg{booktabs}: Fix for \pkg{memoir} with \env{lateximage}.}
% \begin{macrocode}
-\LetLtxMacro\toprule\relax
-\LetLtxMacro\midrule\relax
-\LetLtxMacro\cmidrule\cline
-\LetLtxMacro\bottomrule\relax
-\LetLtxMacro\addlinespace\relax
-\LetLtxMacro\morecmidrules\relax
-\LetLtxMacro\specialrule\relax
-
+\@ifpackageloaded{booktabs}{}{
+ \LetLtxMacro\toprule\relax
+ \LetLtxMacro\midrule\relax
+ \LetLtxMacro\cmidrule\cline
+ \LetLtxMacro\bottomrule\relax
+ \LetLtxMacro\addlinespace\relax
+ \LetLtxMacro\morecmidrules\relax
+ \LetLtxMacro\specialrule\relax
+}
+% \end{macrocode}
+%
+% Next, load the \pkg{booktabs} package:
+% \begin{macrocode}
\LWR at ProvidesPackagePass{booktabs}[2019/10/08]
% \end{macrocode}
%
@@ -41058,7 +41989,7 @@
{%
\ifbool{FormatWP}%
{\LWR at docmidrule[#1](){1-\arabic{LWR at tabletotalLaTeXcols}}}%
- {\global\booltrue{LWR at doingtbrule}}%
+ {\booltrue{LWR at doingtbrule}}%
}%
\LWR at getmynexttoken}
@@ -41071,7 +42002,7 @@
{%
\ifbool{FormatWP}%
{\LWR at docmidrule[#1](){1-\arabic{LWR at tabletotalLaTeXcols}}}%
- {\addtocounter{LWR at hlines}{1}}%
+ {\defaddtocounter{LWR at hlines}{1}}%
}%
\LWR at getmynexttoken}
@@ -41090,7 +42021,7 @@
{%
\ifbool{FormatWP}%
{\LWR at docmidrule[#1](){1-\arabic{LWR at tabletotalLaTeXcols}}}%
- {\global\booltrue{LWR at doingtbrule}}%
+ {\booltrue{LWR at doingtbrule}}%
}%
\LWR at getmynexttoken%
}%
@@ -41111,6 +42042,22 @@
\LWR at expandableformatted{specialrule}
% \end{macrocode}
%
+%
+% For \brand{MathJax}:
+% \changes{v0.79}{2020/01/30}{\pkg{booktabs}: Added \brand{MathJax} emulation.}
+% \begin{macrocode}
+\begin{warpMathJax}
+\CustomizeMathJax{\newcommand{\toprule}[1][]{\hline}}
+\CustomizeMathJax{\let\midrule\toprule}
+\CustomizeMathJax{\let\bottomrule\toprule}
+\CustomizeMathJax{\newcommand{\cmidrule}[2][]{}}% avoid (trim)
+\CustomizeMathJax{\newcommand{\morecmidrules}{}}
+\CustomizeMathJax{\newcommand{\specialrule}[3]{\hline}}
+\CustomizeMathJax{\newcommand{\addlinespace}[1][]{}}
+\end{warpMathJax}
+% \end{macrocode}
+%
+%
% \iffalse
%</booktabs>
% \fi
@@ -41220,7 +42167,50 @@
%
%
%
+%
% \iffalse
+%<*braket>
+% \fi
+%
+% \part{lwarp-braket.sty}
+%
+% \section{braket}
+%
+% \credits{Donald Arseneau}
+%
+% \DescribePackage{braket}
+% \pkg{braket} works as-is for \HTML\ with \SVG\ math.
+% For \brand{MathJax}, emulation is provided by \brand{MathJax} macros.
+%
+% \changes{v0.79}{2020/01/29}{\pkg{braket}: Added.}
+%
+% \codehtml
+%
+% \begin{macrocode}
+\LWR at ProvidesPackagePass{braket}% No date is provided by the file.
+% \end{macrocode}
+%
+% \begin{macrocode}
+\begin{warpMathJax}
+\CustomizeMathJax{\newcommand{\bra}[1]{\langle#1\vert}}
+\CustomizeMathJax{\newcommand{\Bra}[1]{\left\langle#1\right\vert}}
+\CustomizeMathJax{\newcommand{\ket}[1]{\vert#1\rangle}}
+\CustomizeMathJax{\newcommand{\Ket}[1]{\left\vert#1\right\rangle}}
+\CustomizeMathJax{\newcommand{\braket}[1]{\langle#1\rangle}}
+\CustomizeMathJax{\newcommand{\Braket}[1]{\left\langle#1\right\rangle}}
+\CustomizeMathJax{\newcommand{\set}[1]{\{#1\}}}
+\CustomizeMathJax{\newcommand{\Set}[1]{\left\{#1\right\}}}
+\end{warpMathJax}
+% \end{macrocode}
+%
+% \iffalse
+%</braket>
+% \fi
+%
+%
+%
+%
+% \iffalse
%<*breakurl>
% \fi
%
@@ -41283,12 +42273,12 @@
% \DescribePackage{breqn}
% \pkg{breqn} is patched for use by \pkg{lwarp}.
%
-% \env{darray} is not supported.
+% \env{darray} is not supported, and in fact does not work in
+% the print version either.
% \trouble[\env{darray}]{breqn=\pkg{breqn}>darray}
%
-% MathJax does not support \pkg{breqn}.
-% \trouble[\brand{MathJax}]{breqn=\pkg{breqn}>MathJax=\brand{MathJax}}
-% \trouble{MathJax=\brand{MathJax}>breqn=\pkg{breqn}}
+% While using \brand{MathJax}, \pkg{breqn} objects are
+% converted to \SVG\ images.
%
% \changes{v0.59}{2018/07/25}{\pkg{breqn}: Added.}
%
@@ -41597,8 +42587,8 @@
\typeout{---}
\typeout{Packages lwarp and caption:}
\typeout{If a ``Missing \protect\begin\protect{document\protect}'' error occurs here,}
-\typeout{try using \space \protect\usepackage\protect{caption\protect}\space\protect\captionsetup{options}}
-\typeout{instead of \protect\usepackage[options]\protect{caption\protect}.}
+\typeout{try using: \space \protect\usepackage\protect{caption\protect}\space\protect\captionsetup{options}}
+\typeout{instead of: \protect\usepackage[options]\protect{caption\protect}.}
\typeout{---}
\LWR at ProvidesPackagePass{caption}[2019/09/01]
@@ -41813,11 +42803,8 @@
% \pkg{cases} is patched for use by \pkg{lwarp}.
%
%
+% While using \brand{MathJax}, \pkg{cases} objects are converted to \SVG\ math images.
%
-% MathJax does not support \pkg{cases}.
-% \trouble[\brand{MathJax}]{cases=\pkg{cases}>MathJax=\brand{MathJax}}
-% \trouble{MathJax=\brand{MathJax}>cases=\pkg{cases}}
-%
% \changes{v0.58}{2018/06/08}{\pkg{cases}: Added.}
%
% \codehtml
@@ -44133,8 +45120,8 @@
% \changes{v0.57}{2018/06/02}{\pkg{colortbl}: New system for switching print and \HTML\ outputs.}
% \begin{macrocode}
\NewDocumentCommand{\LWR at HTML@columncolor}{O{named} m o o}{%
-\convertcolorspec{#1}{#2}{HTML}\LWR at columnHTMLcolor%
-\LWR at addtabularcellcolor%
+ \convertcolorspec{#1}{#2}{HTML}\LWR at columnHTMLcolor%
+ \LWR at addtabularcellcolor%
}
\AtBeginDocument{\LWR at formatted{columncolor}}
@@ -44151,8 +45138,8 @@
% \changes{v0.57}{2018/06/02}{\pkg{colortbl}: New system for switching print and \HTML\ outputs.}
% \begin{macrocode}
\NewDocumentCommand{\LWR at HTML@rowcolor}{O{named} m o o}{%
-\convertcolorspec{#1}{#2}{HTML}\LWR at rowHTMLcolor%
-\LWR at getmynexttoken%
+ \convertcolorspec{#1}{#2}{HTML}\LWR at rowHTMLcolor%
+ \LWR at getmynexttoken%
}
\AtBeginDocument{\LWR at expandableformatted{rowcolor}}
@@ -44165,8 +45152,8 @@
% \changes{v0.57}{2018/06/02}{\pkg{colortbl}: New system for switching print and \HTML\ outputs.}
% \begin{macrocode}
\NewDocumentCommand{\LWR at HTML@cellcolor}{O{named} m o o}{%
-\convertcolorspec{#1}{#2}{HTML}\LWR at cellHTMLcolor%
-\LWR at addtabularcellcolor%
+ \convertcolorspec{#1}{#2}{HTML}\LWR at cellHTMLcolor%
+ \LWR at addtabularcellcolor%
}
\AtBeginDocument{\LWR at formatted{cellcolor}}
@@ -44181,7 +45168,7 @@
% \changes{v0.57}{2018/06/02}{\pkg{colortbl}: New system for switching print and \HTML\ outputs.}
% \begin{macrocode}
\newcommand{\LWR at HTML@arrayrulecolor}[2][named]{%
-\convertcolorspec{#1}{#2}{HTML}\LWR at ruleHTMLcolor%
+ \convertcolorspec{#1}{#2}{HTML}\LWR at ruleHTMLcolor%
}
\AtBeginDocument{\LWR at expandableformatted{arrayrulecolor}}
@@ -44195,8 +45182,8 @@
% \changes{v0.57}{2018/06/02}{\pkg{colortbl}: New system for switching print and \HTML\ outputs.}
% \begin{macrocode}
\newcommand{\LWR at HTML@arrayrulecolornexttoken}[2][named]{%
-\convertcolorspec{#1}{#2}{HTML}\LWR at ruleHTMLcolor%
-\LWR at getmynexttoken%
+ \convertcolorspec{#1}{#2}{HTML}\LWR at ruleHTMLcolor%
+ \LWR at getmynexttoken%
}
\AtBeginDocument{\LWR at expandableformatted{arrayrulecolornexttoken}}
@@ -45661,6 +46648,12 @@
\newcommand{\cleartoevenpage}[1][]{}
% \end{macrocode}
%
+% \changes{v0.79}{2020/01/06}{\pkg{epigraph}: Updated to v1.5e.}
+% \begin{macrocode}
+\newif\ifepigraphnoindent
+\newcommand\epigraphnoindent{\epigraphnoindenttrue}
+% \end{macrocode}
+%
% \iffalse
%</epigraph>
% \fi
@@ -47560,22 +48553,34 @@
% \begin{noindenvironment} \oarg{offset} \marg{type} \marg{width}
% Borrowed from the \pkg{lwarp} version of \pkg{keyfloat}:
% \changes{v0.42}{2017/10/26}{\pkg{floatflt}: Added width.}
+% \changes{v0.79}{2020/01/08}{\pkg{floatflt}: Improved width control.}
% \begin{macrocode}
\NewDocumentEnvironment{KFLTfloatflt at marginfloat}{O{-1.2ex} m m}
{%
-\setlength{\LWR at templengthone}{#3}%
-\LWR at BlockClassWP{%
- float:right; %
- width:\LWR at printlength{\LWR at templengthone}; % extra space
- margin:10pt%
-}{%
- width:\LWR at printlength{\LWR at templengthone}%
-}%
-{marginblock}%
-\captionsetup{type=#2}%
+ \begin{LWR at setvirtualpage}*%
+ \ifblank{#3}{%
+ \LWR at BlockClassWP{%
+ float:right; %
+ width: 1.5in; % reasonable dummy width for word processor
+ margin:10pt%
+ }{}%
+ {marginblock}%
+ }{%
+ \setlength{\LWR at templengthone}{#3}%
+ \LWR at BlockClassWP{%
+ float:right; %
+ width:\LWR at printlength{\LWR at templengthone}; % extra space
+ margin:10pt%
+ }{%
+ width:\LWR at printlength{\LWR at templengthone}%
+ }%
+ {marginblock}%
+ }%
+ \captionsetup{type=#2}%
}
{%
-\endLWR at BlockClassWP%
+ \endLWR at BlockClassWP%
+ \end{LWR at setvirtualpage}%
}
% \end{macrocode}
% \end{noindenvironment}
@@ -47591,7 +48596,7 @@
% \begin{noindenvironment}{floatingtable} \oarg{placement}
% \begin{macrocode}
\DeclareDocumentEnvironment{floatingtable}{o}
- {\begin{KFLTfloatflt at marginfloat}{table}{1.5in}}
+ {\begin{KFLTfloatflt at marginfloat}{table}{}}
{\end{KFLTfloatflt at marginfloat}}
% \end{macrocode}
% \end{noindenvironment}
@@ -47821,22 +48826,19 @@
% \begin{noindenvironment}{floatrow} \oarg{numfloats}
% \changes{v0.20}{2016/08/20}{Fix: \cs{linewidth} in a floatrow.}
+% \changes{v0.79}{2020/01/10}{Factored to \cs{LWR at setvirtualpage}.}
+% \changes{v0.79}{2020/01/10}{Fix: Use full \cs{linewidth}.}
%
% The row of floats is placed into a \element{div} of class |floatrow|.
% \begin{macrocode}
\newenvironment*{floatrow}[1][2]
-{
-\LWR at forcenewpage
-\BlockClass{floatrow}
-% \end{macrocode}
-% While inside the floatrow, divide the \cs{linewidth} by the number of floats.
-% \begin{macrocode}
-\booltrue{LWR at infloatrow}
-\setlength{\linewidth}{6in/#1}
+{%
+ \begin{LWR at setvirtualpage}*%
+ \BlockClass{floatrow}%
}
{
-\boolfalse{LWR at infloatrow}
-\endBlockClass
+ \endBlockClass%
+ \end{LWR at setvirtualpage}%
}
% \end{macrocode}
% \end{noindenvironment}
@@ -47877,19 +48879,22 @@
\LWR at traceinfo{finished setkeys frowkeys}%
% \end{macrocode}
% Create a new float with optional [within]:
+% \changes{v0.79}{2020/01/10}{Fix: Use \pkg{newfloat} instead of \pkg{float}.}
% \begin{macrocode}
\ifthenelse{\equal{\LWR at frowkeywithin}{}}%
{%
- \LWR at traceinfo{about to newfloat #1 \LWR at frowkeyplacement\ %
- \LWR at frowkeyfileext}%
- \newfloat{#1}{\LWR at frowkeyplacement}{\LWR at frowkeyfileext}%
+ \DeclareFloatingEnvironment[
+ placement=\LWR at frowkeyplacement,
+ fileext=\LWR at frowkeyfileext
+ ]{#1}%
}%
{%
- \LWR at traceinfo{about to newfloat #1\ \LWR at frowkeyplacement\ %
- \LWR at frowkeyfileext\ \LWR at frowkeywithin}%
- \newfloat{#1}{\LWR at frowkeyplacement}%
- {\LWR at frowkeyfileext}[\LWR at frowkeywithin]%
- \LWR at traceinfo{finished newfloat #1}%
+ \DeclareFloatingEnvironment[
+ placement=\LWR at frowkeyplacement,
+ fileext=\LWR at frowkeyfileext,
+ within=\LWR at frowkeywithin
+ ]{#1}%
+% \LWR at traceinfo{finished newfloat #1}%
}%
% \end{macrocode}
% Rename the float if a name was given:
@@ -47896,7 +48901,9 @@
% \begin{macrocode}
\ifthenelse{\equal{\LWR at frowkeyname}{}}%
{}%
- {\floatname{#1}{\LWR at frowkeyname}}%
+ {%
+ \SetupFloatingEnvironment{#1}{name={\LWR at frowkeyname}}%
+ }%
}
% \end{macrocode}
% \end{noindmacro}
@@ -48258,6 +49265,8 @@
% For \XeLaTeX\ and \LuaLaTeX, the \attribute{alt} tag is generic.
%
% \changes{v0.67}{2019/02/22}{\pkg{fontawesome}: Added.}
+% \changes{v0.79}{2020/01/01}{\pkg{fontawesome}: Supports font size, color.}
+% \changes{v0.79}{2020/01/01}{\pkg{fontawesome}: Refactored with fix for \cs{FAthree}.}
%
% \codehtml
%
@@ -48273,12 +49282,12 @@
\newfontfamily{\LWR at orig@FA}{FontAwesome}
\newcommand*{\LWR at fontawesome@xelatex at symbol}[1]{%
-\begin{lateximage}*[icon][fontawesomexetex#1]%
-\begingroup%
-\LWR at orig@FA%
-\LWR at orig@symbol{#1}%
-\endgroup%
-\end{lateximage}%
+ \LWR at findcurrenttextcolor%
+ \begin{lateximage}*[icon][fontawesomexetex#1SZ\LWR at font@size{}CL\LWR at tempcolor]%
+ \csuse{\LWR at font@size}%
+ \LWR at orig@FA%
+ \LWR at orig@symbol{#1}%
+ \end{lateximage}%
}
\RenewDocumentCommand{\FA}{}{%
@@ -48287,31 +49296,25 @@
\else
+\newcommand*{\LWR at fontawesome@symbolX}[2]{%
+ \LWR at findcurrenttextcolor%
+ \begin{lateximage}*[icon #1][fontawesome#2#1SZ\LWR at font@size{}CL\LWR at tempcolor]%
+ \csuse{\LWR at font@size}%
+ \fontencoding{U}\fontfamily{fontawesome#2}\selectfont%
+ \LWR at orig@symbol{#1}%
+ \end{lateximage}%
+}
+
\newcommand*{\LWR at fontawesome@symbolone}[1]{%
-\begin{lateximage}*[icon #1][fontawesomeone#1]%
-\begingroup%
-\fontencoding{U}\fontfamily{fontawesomeone}\selectfont%
-\LWR at orig@symbol{#1}%
-\endgroup%
-\end{lateximage}%
+ \LWR at fontawesome@symbolX{#1}{one}%
}
\newcommand*{\LWR at fontawesome@symboltwo}[1]{%
-\begin{lateximage}*[icon #1][fontawesometwo#1]%
-\begingroup%
-\fontencoding{U}\fontfamily{fontawesometwo}\selectfont%
-\LWR at orig@symbol{#1}%
-\endgroup%
-\end{lateximage}%
+ \LWR at fontawesome@symbolX{#1}{two}%
}
\newcommand*{\LWR at fontawesome@symbolthree}[1]{%
-\begin{lateximage}*[icon #1][fontawesomethree#1]%
-\begingroup%
-\fontencoding{U}\fontfamily{fontawesomeonethree}\selectfont%
-\LWR at orig@symbol{#1}%
-\endgroup%
-\end{lateximage}%
+ \LWR at fontawesome@symbolX{#1}{three}%
}
\renewrobustcmd\FAone{%
@@ -48354,6 +49357,7 @@
% The \attribute{alt} tag has the name of the icon.
%
% \changes{v0.67}{2019/02/22}{\pkg{fontawesome5}: Added.}
+% \changes{v0.79}{2020/01/01}{\pkg{fontawesome5}: Supports font size, color.}
%
% \codehtml
%
@@ -48364,8 +49368,10 @@
% \begin{macrocode}
\ExplSyntaxOn
\cs_set:Nn\fontawesome_use_icon:nn{
+ \LWR at findcurrenttextcolor
\cs_if_exist:cTF{c__fontawesome_slot_#2_tl}{
- \begin{lateximage}*[#2][#1]
+ \begin{lateximage}*[#2][fontawesome5#1SZ\LWR at font@size{}CL\LWR at tempcolor]
+ \csuse{\LWR at font@size}
\exp_last_unbraced:Nv
\__fontawesome_icon_at:nnnn
{c__fontawesome_slot_#2_tl}
@@ -49584,7 +50590,7 @@
%
%
% Handle \optn{origin} key:
-% \changes{v0.52}{2018/03/27}{pkg{graphics}: Added defaults.}
+% \changes{v0.52}{2018/03/27}{\pkg{graphics}: Added defaults.}
% \begin{macrocode}
\define at key{igraph}{origin}[c]{%
\renewcommand*{\LWR at igorigin}{#1}%
@@ -49605,7 +50611,7 @@
%
% Handle \optn{alt} key:
% \changes{v0.65}{2018/12/19}{\pkg{graphics}: Added \cs{includegraphics} \attribute{alt} key.}
-% \changes{v0.74}{2019/08/20}{Add \cs{ThisAltText}.}
+% \changes{v0.74}{2019/08/20}{\pkg{graphics}: Add \cs{ThisAltText}.}
% \begin{macrocode}
\define at key{igraph}{alt}{\renewcommand*{\LWR at igalt}{#1}}
% \end{macrocode}
@@ -49630,7 +50636,7 @@
% \end{macrocode}
%
% Numerous ignored keys:
-% \changes{v0.52}{2018/03/27}{pkg{graphics}: Added defaults.}
+% \changes{v0.52}{2018/03/27}{\pkg{graphics}: Added defaults.}
% \begin{macrocode}
\define at key{igraph}{bb}{}
\define at key{igraph}{bbllx}{}
@@ -49652,7 +50658,7 @@
\define at key{igraph}{command}{}
% \end{macrocode}
% New in v1.1a:
-% \changes{v0.52}{2018/03/27}{pkg{graphicx}: Updated for v1.1a.}
+% \changes{v0.52}{2018/03/27}{\pkg{graphics}: Updated for v1.1a.}
% \begin{macrocode}
\define at key{igraph}{quite}{}
\define at key{igraph}{page}{}
@@ -49660,7 +50666,7 @@
\define at key{igraph}{interpolate}[true]{}
% \end{macrocode}
% New in v1.1b:
-% \changes{v0.52}{2018/03/27}{pkg{graphicx}: Updated for v1.1b.}
+% \changes{v0.52}{2018/03/27}{\pkg{graphics}: Updated for v1.1b.}
% \begin{macrocode}
\define at key{igraph}{decodearray}{}
% \end{macrocode}
@@ -49668,21 +50674,24 @@
% \subsection{Printing \HTML\ styles}
-% \begin{macro}{\LWR at rotstyle} \marg{prefix} \marg{degrees}
+% \begin{noindmacro}{\LWR at rotstyle} \marg{prefix} \marg{degrees}
%
% Prints the rotate style with the given prefix.
%
% |prefix| is |-ms-| or |-webkit-| or nothing, and is used to generate
% three versions of the |transform:rotate| style.
+% \changes{v0.79}{2019/12/05}{\pkg{graphics}: Fix for negative angles.}
% \begin{macrocode}
\newcommand*{\LWR at rotstyle}[2]{%
- #1transform:rotate(-#2deg);
+ \edef\LWR at tempone{#2}%
+ \setcounter{LWR at tempcountone}{-1*\real{\LWR at tempone}} % space
+ #1transform:rotate(\arabic{LWR at tempcountone}deg); % space
}
% \end{macrocode}
-% \end{macro}
+% \end{noindmacro}
-% \begin{macro}{\LWR at scalestyle} \marg{prefix} \marg{xscale} \marg{yscale}
+% \begin{noindmacro}{\LWR at scalestyle} \marg{prefix} \marg{xscale} \marg{yscale}
%
% Prints the scale style with the given prefix.
%
@@ -49690,10 +50699,10 @@
% three versions of the |transform:scale| style.
% \begin{macrocode}
\newcommand*{\LWR at scalestyle}[3]{%
- #1transform:scale(#2,#3);
+ #1transform:scale(#2,#3);
}
% \end{macrocode}
-% \end{macro}
+% \end{noindmacro}
@@ -49700,32 +50709,26 @@
% \subsection{\cs{includegraphics}}
-% \DescribeBoolean{LWR at infloatrow}
-% Used to compute \cs{linewidth}.
-% \begin{macrocode}
-\newbool{LWR at infloatrow}
-\boolfalse{LWR at infloatrow}
-% \end{macrocode}
-% \begin{macro}{\LWR at opacity} For \HTML, used only for \cs{includegraphics}.
+% \begin{noindmacro}{\LWR at opacity} For \HTML, used only for \cs{includegraphics}.
%
% \cs{LWR at opacity} may be set by the \pkg{transparent} package.
% \begin{macrocode}
\def\LWR at opacity{1}
% \end{macrocode}
-% \end{macro}
+% \end{noindmacro}
-% \begin{macro}{\LWR at imagesizebox}
+% \begin{noindmacro}{\LWR at imagesizebox}
% Used to determine the actual image size if needed.
% \begin{macrocode}
\newsavebox{\LWR at imagesizebox}
% \end{macrocode}
-% \end{macro}
+% \end{noindmacro}
-% \begin{macro}{\LWR at HTML@Gin at setfile} \marg{w} \marg{h} \marg{filename}
+% \begin{noindmacro}{\LWR at HTML@Gin at setfile} \marg{w} \marg{h} \marg{filename}
% Sets the parsed filename for \HTML\ output.
% \begin{macrocode}
\newcommand*{\LWR at HTML@Gin at setfile}[3]{%
@@ -49732,7 +50735,7 @@
\xdef\LWR at parsedfilename{#3}%
}
% \end{macrocode}
-% \end{macro}
+% \end{noindmacro}
% \DescribeKey[Gin]{class} \CSS\ class for the image.
@@ -49739,7 +50742,7 @@
%
% Define the new class key for the print-mode version of \cs{includegraphics},
% which is enabled inside a \env{lateximage}.
-% \changes{v0.42}{2017/10/24}{\pkg{includegraphics}: Fix: Class key.}
+% \changes{v0.42}{2017/10/24}{\pkg{graphics}: Fix: Class key.}
% \changes{v0.65}{2018/12/19}{\pkg{graphics}: Added \cs{includegraphics} \attribute{alt} key.}
% \begin{macrocode}
\AtBeginDocument{
@@ -49749,7 +50752,7 @@
% \end{macrocode}
-% \begin{macro}{\LWR at replaceEPSSVG}
+% \begin{noindmacro}{\LWR at replaceEPSSVG}
%
% Usually, references to \EPS\ files become \SVG\ files,
% but if the \pkg{epstopdf} package is being used, it automatically
@@ -49767,11 +50770,174 @@
}%
}
% \end{macrocode}
-% \end{macro}
+% \end{noindmacro}
-% \begin{macro}{\LWR at includegraphicsb} * \oarg{2: options} \oarg{3: options} \marg{4: filename}
+% \begin{noindmacro}{\LWR at ig@wpimagesizes} * \oarg{2: options} \oarg{3: options} \marg{4: filename}
%
+% 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:
+% \changes{v0.42}{2017/10/24}{\pkg{graphics}: If \progcode{FormatWP}, use explicit size.}
+% \changes{v0.61}{2018/10/06}{\pkg{graphics}: Fix: \EPS\ for \DVI\ \LaTeX.}
+% \changes{v0.62}{2018/10/27}{\pkg{graphics}: Fix: \bool{FormatWP}.}
+% \changes{v0.79}{2019/12/09}{\pkg{graphics}: Factored from \cs{LWR at includegraphicsb}.}
+% \begin{macrocode}
+\newcommand*{\LWR at ig@wpimagesizes}[4]{%
+ \ifbool{FormatWP}{%
+ \begingroup%
+ \LWR at restoreorigformatting%
+ \ifpdf%
+ \appto\LWR at restoreorigformatting{%
+ \DeclareGraphicsExtensions{%
+ .pdf,.PDF,.gif,.GIF,.png,.PNG,.jpg,.JPG,.jpeg,.JPEG%
+ }%
+ }%
+ \else% \ifpdf
+ \ifXeTeX%
+ \appto\LWR at restoreorigformatting{%
+ \DeclareGraphicsExtensions{%
+ .pdf,.PDF,.gif,.GIF,.png,.PNG,.jpg,.JPG,.jpeg,.JPEG%
+ }%
+ }%
+ \else%
+ \appto\LWR at restoreorigformatting{%
+ \DeclareGraphicsExtensions{%
+ .eps,.EPS,.gif,.GIF,.png,.PNG,.jpg,.JPG,.jpeg,.JPEG%
+ }%
+ }%
+ \fi%
+ \fi% \ifpdf
+ \define at key{Gin}{angle}{}%
+ \IfBooleanTF{#1}%
+ {% starred
+ \IfValueTF{#3}%
+ {%
+ \global\sbox{\LWR at imagesizebox}{%
+ \LWR at origincludegraphics*[#2][#3]{#4}%
+ }%
+ }%
+ {%
+ \IfValueTF{#2}%
+ {%
+ \global\sbox{\LWR at imagesizebox}{%
+ \LWR at origincludegraphics*[#2]{#4}%
+ }%
+ }{%
+ \global\sbox{\LWR at imagesizebox}{%
+ \LWR at origincludegraphics*{#4}%
+ }%
+ }%
+ }%
+ }% starred
+ {% not starred
+ \IfValueTF{#3}%
+ {%
+ \global\sbox{\LWR at imagesizebox}{%
+ \LWR at origincludegraphics[#2][#3]{#4}%
+ }%
+ }%
+ {%
+ \IfValueTF{#2}%
+ {%
+ \global\sbox{\LWR at imagesizebox}{%
+ \LWR at origincludegraphics[#2]{#4}%
+ }%
+ }{%
+ \global\sbox{\LWR at imagesizebox}{%
+ \LWR at origincludegraphics{#4}%
+ }%
+ }%
+ }%
+ }% not starred
+ \endgroup%
+ \settowidth{\LWR at igwidth}{\usebox{\LWR at imagesizebox}}%
+ \global\renewcommand*{\LWR at igwidthstyle}{%
+ width:\LWR at printlength{\LWR at igwidth}%
+ }%
+ \settoheight{\LWR at igheight}{\usebox{\LWR at imagesizebox}}%
+ \global\renewcommand*{\LWR at igheightstyle}{%
+ height:\LWR at printlength{\LWR at igheight}%
+ }%
+ }{}% FormatWP
+}
+% \end{macrocode}
+% \end{noindmacro}
+
+
+% \begin{noindmacro}{\LWR at ig@htmltag}
+% For the \HTML\ reference, add the graphicspath, filename, extension,
+% alt tag, style, and class.
+% \changes{v0.79}{2019/12/09}{\pkg{graphics}: Factored from \cs{LWR at includegraphicsb}.}
+% \begin{macrocode}
+\newcommand*{\LWR at ig@htmltag}{%
+ img\LWR at indentHTML%
+ src="%
+% \end{macrocode}
+% \changes{v0.62}{2018/10/27}{\pkg{graphics}: Fix: Filename expansion.}
+% \begin{macrocode}
+ \detokenize\expandafter{\LWR at parsedfilename}%
+% \end{macrocode}
+% \begin{macrocode}
+ "\LWR at indentHTML%
+% \end{macrocode}
+% Only include a style tag if a width, height, angle, or scale was given:
+% \begin{macrocode}
+ \ifthenelse{
+ \NOT\equal{\LWR at igwidthstyle}{} \OR
+ \NOT\equal{\LWR at igheightstyle}{} \OR
+ \NOT\equal{\LWR at igorigin}{} \OR
+ \NOT\equal{\LWR at igangle}{} \OR
+ \NOT\equal{\LWR at igxscale}{1} \OR
+ \NOT\equal{\LWR at igyscale}{1}
+ }%
+ {%
+ style="\LWR at indentHTML
+ \ifthenelse{\NOT\equal{\LWR at igwidthstyle}{}}%
+ {\LWR at igwidthstyle;\LWR at indentHTML}{}%
+ \ifthenelse{\NOT\equal{\LWR at igheightstyle}{}}%
+ {\LWR at igheightstyle;\LWR at indentHTML}{}%
+ \ifthenelse{\NOT\equal{\LWR at igorigin}{}}%
+ {%
+ transform-origin: \LWR at originnames{\LWR at igorigin};%
+ \LWR at indentHTML%
+ }{}%
+ \ifthenelse{\NOT\equal{\LWR at igangle}{}}%
+ {%
+ \LWR at rotstyle{-ms-}{\LWR at igangle}\LWR at indentHTML
+ \LWR at rotstyle{-webkit-}{\LWR at igangle}\LWR at indentHTML
+ \LWR at rotstyle{}{\LWR at igangle }\LWR at indentHTML
+ }{}%
+ \ifthenelse{%
+ \NOT\equal{\LWR at igxscale}{1}\OR%
+ \NOT\equal{\LWR at igyscale}{1}%
+ }%
+ {%
+ \LWR at scalestyle{-ms-}{\LWR at igxscale}{\LWR at igyscale}%
+ \LWR at indentHTML
+ \LWR at scalestyle{-webkit-}{\LWR at igxscale}{\LWR at igyscale}%
+ \LWR at indentHTML
+ \LWR at scalestyle{}{\LWR at igxscale}{\LWR at igyscale}%
+ \LWR at indentHTML
+ }{}%
+ %
+ \ifthenelse{\NOT\equal{\LWR at opacity}{1}}%
+ {opacity:\LWR at opacity;\LWR at indentHTML}{}%
+ %
+ "\LWR at indentHTML%
+ }{}%
+% \end{macrocode}
+% Set the class and alt tag:
+% \changes{v0.65}{2018/12/19}{\pkg{graphics}: Added \cs{includegraphics} \attribute{alt} key.}
+% \begin{macrocode}
+ class="\LWR at igclass"\LWR at indentHTML%
+ alt="\AltTextOpen\LWR at igalt\AltTextClose" \LWR at orignewline%
+}% end of image tags
+% \end{macrocode}
+% \end{noindmacro}
+
+
+% \begin{noindmacro}{\LWR at includegraphicsb} * \oarg{2: options} \oarg{3: options} \marg{4: filename}
+%
% \pkg{graphics} syntax is \cs{includegraphics} * \oarg{llx,lly} \oarg{urx,ury} \marg{file}
%
% \pkg{graphicx} syntax is \cs{includegraphics} \oarg{key values} \marg{file}
@@ -49782,21 +50948,21 @@
% |#4| will be \cs{LWR at epsfig@filename}, which will have been set by the |file| or |figure| keys.
% Therefore, |#4| must not be used until after the keys have been processed.
%
-% \changes{v0.18}{2016/04/14}{Improved \HTML\ output linebreaks.}
-% \changes{v0.18}{2016/05/17}{Fix: \cs{linewidth}, \cs{textwidth}, \cs{textheight}
+% \changes{v0.18}{2016/04/14}{\pkg{graphics}: Improved \HTML\ output linebreaks.}
+% \changes{v0.18}{2016/05/17}{\pkg{graphics}: Fix: \cs{linewidth}, \cs{textwidth}, \cs{textheight}
% inside a minipage.}
-% \changes{v0.18}{2016/05/17}{em, ex, \%, px dimensions preserved.}
-% \changes{v0.18}{2016/05/17}{Add: svgz file extension.}
-% \changes{v0.20}{2016/08/20}{Fix: \cs{linewidth} in a floatrow.}
-% \changes{v0.20}{2017/01/12}{Fix: Expands filename.}
-% \changes{v0.28}{2017/04/12}{Adapts to \pkg{graphics} syntax.}
-% \changes{v0.29}{2017/04/15}{Fix: Error when no optional arguments.}
-% \changes{v0.40}{2017/09/08}{Add: Full \cs{graphicspath} support.}
-% \changes{v0.42}{2017/10/26}{Fix: Filename expansion.}
-% \changes{v0.45}{2017/12/29}{Improved URLs with underscores.}
-% \changes{v0.59}{2018/09/07}{Now works with \filenm{.pdf} and \filenm{.eps}
+% \changes{v0.18}{2016/05/17}{\pkg{graphics}: em, ex, \%, px dimensions preserved.}
+% \changes{v0.18}{2016/05/17}{\pkg{graphics}: Add: svgz file extension.}
+% \changes{v0.20}{2016/08/20}{\pkg{graphics}: Fix: \cs{linewidth} in a floatrow.}
+% \changes{v0.20}{2017/01/12}{\pkg{graphics}: Fix: Expands filename.}
+% \changes{v0.28}{2017/04/12}{\pkg{graphics}: Adapts to \pkg{graphics} syntax.}
+% \changes{v0.29}{2017/04/15}{\pkg{graphics}: Fix: Error when no optional arguments.}
+% \changes{v0.40}{2017/09/08}{\pkg{graphics}: Add: Full \cs{graphicspath} support.}
+% \changes{v0.42}{2017/10/26}{\pkg{graphics}: Fix: Filename expansion.}
+% \changes{v0.45}{2017/12/29}{\pkg{graphics}: Improved URLs with underscores.}
+% \changes{v0.59}{2018/09/07}{\pkg{graphics}: Now works with \filenm{.pdf} and \filenm{.eps}
% filename extensions.}
-% \changes{v0.66}{2019/02/02}{Improved \HTML\ formatting.}
+% \changes{v0.66}{2019/02/02}{\pkg{graphics}: Improved \HTML\ formatting.}
% \begin{macrocode}
\NewDocumentCommand{\LWR at includegraphicsb}{s o o m}
{%
@@ -49803,226 +50969,101 @@
% \end{macrocode}
% Start the image tag on a new line, allow \PDF\ output word wrap:
% \begin{macrocode}
-\LWR at origtilde \LWR at orignewline%
+ \LWR at origtilde \LWR at orignewline%
% \end{macrocode}
% Temporarily compute \cs{linewidth}, \cs{textwidth}, \cs{textheight} arguments with a 6x9 inch size
% until the next \cs{endgroup}.
-% \changes{v0.48}{2018/02/11}{Fix: Virtual page size limited to a group.}
+% \changes{v0.48}{2018/02/11}{\pkg{graphics}: Fix: Virtual page size limited to a group.}
+% \changes{v0.79}{2020/01/10}{Factored to \cs{LWR at setvirtualpage}.}
% \begin{macrocode}
-\begingroup%
-\ifthenelse{\cnttest{\value{LWR at minipagedepth}}{=}{0}}%
-{%
- \ifbool{LWR at infloatrow}%
- {}
- {% not in a minipage or a floatrow:
- \setlength{\linewidth}{6in}%
- \setlength{\textwidth}{6in}%
- \setlength{\textheight}{9in}%
- }%
-}{}%
+ \begin{LWR at setvirtualpage}%
% \end{macrocode}
% For correct em sizing during the width and height conversions:
% \begin{macrocode}
-\large%
+ \large%
% \end{macrocode}
% Reset some defaults, possibly will be changed below if options were given:
% \begin{macrocode}
-\setlength{\LWR at igwidth}{0pt}%
-\setlength{\LWR at igheight}{0pt}%
-\renewcommand*{\LWR at igwidthstyle}{}%
-\renewcommand*{\LWR at igheightstyle}{}%
-\renewcommand*{\LWR at igorigin}{}%
-\renewcommand*{\LWR at igangle}{}%
-\renewcommand*{\LWR at igxscale}{1}%
-\renewcommand*{\LWR at igyscale}{1}%
-\renewcommand*{\LWR at igclass}{inlineimage}%
+ \setlength{\LWR at igwidth}{0pt}%
+ \setlength{\LWR at igheight}{0pt}%
+ \renewcommand*{\LWR at igwidthstyle}{}%
+ \renewcommand*{\LWR at igheightstyle}{}%
+ \renewcommand*{\LWR at igorigin}{}%
+ \renewcommand*{\LWR at igangle}{}%
+ \renewcommand*{\LWR at igxscale}{1}%
+ \renewcommand*{\LWR at igyscale}{1}%
+ \renewcommand*{\LWR at igclass}{inlineimage}%
% \end{macrocode}
% \changes{v0.65}{2018/12/19}{\pkg{graphics}: Added \cs{includegraphics} \attribute{alt} key.}
-% \changes{v0.74}{2019/08/20}{Add \cs{ThisAltText}.}
-% \changes{v0.78}{2019/10/17}{Fix: \attribute{alt} tag expansion.}
+% \changes{v0.74}{2019/08/20}{\pkg{graphics}: Add \cs{ThisAltText}.}
+% \changes{v0.78}{2019/10/17}{\pkg{graphics}: Fix: \attribute{alt} tag expansion.}
% \begin{macrocode}
-\ifdefvoid{\LWR at ThisAltText}{%
- \edef\LWR at igalt{\ImageAltText}%
-}{%
- \edef\LWR at igalt{\LWR at ThisAltText}%
-}%
+ \ifdefvoid{\LWR at ThisAltText}{%
+ \edef\LWR at igalt{\ImageAltText}%
+ }{%
+ \edef\LWR at igalt{\LWR at ThisAltText}%
+ }%
% \end{macrocode}
%
% If |#3| is empty, only one optional argument was given, thus \pkg{graphicx} syntax:
% \begin{macrocode}
-\IfValueF{#3}{%
- \IfValueTF{#2}%
- {\setkeys{igraph}{#2}}%
- {\setkeys{igraph}{}}%
-}%
+ \IfValueF{#3}{%
+ \IfValueTF{#2}%
+ {\setkeys{igraph}{#2}}%
+ {\setkeys{igraph}{}}%
+ }%
% \end{macrocode}
%
% Fully expand and detokenize the filename,
% changing the file extension to \filenm{.svg} if necessary.
-% \changes{v0.59}{2018/08/28}{Fix: Expand filename.}
-% \changes{v0.61}{2018/10/01}{Set keys before using filename, for \pkg{epsfig}.}
+% \changes{v0.59}{2018/08/28}{\pkg{graphics}: Fix: Expand filename.}
+% \changes{v0.61}{2018/10/01}{\pkg{graphics}: Set keys before using filename, for \pkg{epsfig}.}
% \begin{macrocode}
-\begingroup%
-\LetLtxMacro\Gin at setfile\LWR at HTML@Gin at setfile%
-\edef\LWR at tempone{#4}%
-\StrSubstitute{\LWR at tempone}{.pdf}{.svg}[\LWR at tempone]%
-\StrSubstitute{\LWR at tempone}{.PDF}{.SVG}[\LWR at tempone]%
-\LWR at replaceEPSSVG%
-\xdef\LWR at parsedfilename{\LWR at tempone}%
-\Ginclude at graphics{\detokenize\expandafter{\LWR at tempone}}%
-\endgroup%
-\filename at parse{\LWR at parsedfilename}%
-\LWR at traceinfo{LWR at parsedfilename is \LWR at parsedfilename}%
+ \begingroup%
+ \LetLtxMacro\Gin at setfile\LWR at HTML@Gin at setfile%
+ \edef\LWR at tempone{#4}%
+ \StrSubstitute{\LWR at tempone}{.pdf}{.svg}[\LWR at tempone]%
+ \StrSubstitute{\LWR at tempone}{.PDF}{.SVG}[\LWR at tempone]%
+ \LWR at replaceEPSSVG%
+ \xdef\LWR at parsedfilename{\LWR at tempone}%
+ \Ginclude at graphics{\detokenize\expandafter{\LWR at tempone}}%
+ \endgroup%
+ \filename at parse{\LWR at parsedfilename}%
+ \LWR at traceinfo{LWR at parsedfilename is \LWR at parsedfilename}%
% \LWR at sanitize{\LWR at parsedfilename}%
% \end{macrocode}
%
% 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:
-% \changes{v0.42}{2017/10/24}{If \progcode{FormatWP}, use explicit size.}
-% \changes{v0.61}{2018/10/06}{Fix: \EPS\ for \DVI\ \LaTeX.}
-% \changes{v0.62}{2018/10/27}{Fix: \bool{FormatWP}.}
% \begin{macrocode}
-\ifbool{FormatWP}{%
- \begingroup%
- \LWR at restoreorigformatting%
- \ifpdf%
- \appto\LWR at restoreorigformatting{%
- \DeclareGraphicsExtensions{.pdf,.PDF,.gif,.GIF,.png,.PNG,.jpg,.JPG,.jpeg,.JPEG}%
- }%
- \else% \ifpdf
- \ifXeTeX%
- \appto\LWR at restoreorigformatting{%
- \DeclareGraphicsExtensions{.pdf,.PDF,.gif,.GIF,.png,.PNG,.jpg,.JPG,.jpeg,.JPEG}%
- }%
- \else%
- \appto\LWR at restoreorigformatting{%
- \DeclareGraphicsExtensions{.eps,.EPS,.gif,.GIF,.png,.PNG,.jpg,.JPG,.jpeg,.JPEG}%
- }%
- \fi%
- \fi% \ifpdf
- \define at key{Gin}{angle}{}%
- \IfBooleanTF{#1}%
- {% starred
- \IfValueTF{#3}%
- {%
- \global\sbox{\LWR at imagesizebox}{\LWR at origincludegraphics*[#2][#3]{#4}}%
- }%
- {%
- \IfValueTF{#2}%
- {%
- \global\sbox{\LWR at imagesizebox}{\LWR at origincludegraphics*[#2]{#4}}%
- }{%
- \global\sbox{\LWR at imagesizebox}{\LWR at origincludegraphics*{#4}}%
- }%
- }%
- }% starred
- {% not starred
- \IfValueTF{#3}%
- {%
- \global\sbox{\LWR at imagesizebox}{\LWR at origincludegraphics[#2][#3]{#4}}%
- }%
- {%
- \IfValueTF{#2}%
- {%
- \global\sbox{\LWR at imagesizebox}{\LWR at origincludegraphics[#2]{#4}}%
- }{%
- \global\sbox{\LWR at imagesizebox}{\LWR at origincludegraphics{#4}}%
- }%
- }%
- }% not starred
- \endgroup%
- \settowidth{\LWR at igwidth}{\usebox{\LWR at imagesizebox}}%
- \global\renewcommand*{\LWR at igwidthstyle}{width:\LWR at printlength{\LWR at igwidth}}%
- \settoheight{\LWR at igheight}{\usebox{\LWR at imagesizebox}}%
- \global\renewcommand*{\LWR at igheightstyle}{height:\LWR at printlength{\LWR at igheight}}%
-}{}% FormatWP
+ \LWR at ig@wpimagesizes{#1}{#2}{#3}{#4}%
% \end{macrocode}
%
% Create the \HTML\ reference with the graphicspath, filename, extension,
-% alt tag, style, and class.
-%
-% The \cs{LWR at origtilde} adds space between tags in case this
-% is being done inside a \cs{savebox} where \cs{newline} has no effect.
+% alt tag, style, and class:
% \begin{macrocode}
-\LWR at traceinfo{LWR at includegraphicsb: about to create href}%
-\href{\LWR at parsedfilename}%
-{% start of href
-\LWR at traceinfo{LWR at includegraphicsb: about to LWR at htmltag}%
-\LWR at htmltag{% start of image tags
-img\LWR at indentHTML%
-src="%
+ \LWR at traceinfo{LWR at includegraphicsb: about to create href}%
+ \href{\LWR at parsedfilename}%
+ {% start of href
+ \LWR at traceinfo{LWR at includegraphicsb: about to LWR at htmltag}%
+ \LWR at htmltag{\LWR at ig@htmltag}%
+ }% end of href
% \end{macrocode}
-% \changes{v0.62}{2018/10/27}{Fix: Filename expansion.}
-% \begin{macrocode}
-\detokenize\expandafter{\LWR at parsedfilename}%
-% \end{macrocode}
-% \begin{macrocode}
-"\LWR at indentHTML%
-% \end{macrocode}
-% Only include a style tag if a width, height, angle, or scale was given:
-% \begin{macrocode}
-\ifthenelse{
- \NOT\equal{\LWR at igwidthstyle}{} \OR
- \NOT\equal{\LWR at igheightstyle}{} \OR
- \NOT\equal{\LWR at igorigin}{} \OR
- \NOT\equal{\LWR at igangle}{} \OR
- \NOT\equal{\LWR at igxscale}{1} \OR
- \NOT\equal{\LWR at igyscale}{1}
-}%
-{%
- style="\LWR at indentHTML
- \ifthenelse{\NOT\equal{\LWR at igwidthstyle}{}}%
- {\LWR at igwidthstyle;\LWR at indentHTML}{}%
- \ifthenelse{\NOT\equal{\LWR at igheightstyle}{}}%
- {\LWR at igheightstyle;\LWR at indentHTML}{}%
- \ifthenelse{\NOT\equal{\LWR at igorigin}{}}%
- {%
- transform-origin: \LWR at originnames{\LWR at igorigin};\LWR at indentHTML%
- }{}%
- \ifthenelse{\NOT\equal{\LWR at igangle}{}}%
- {%
- \LWR at rotstyle{-ms-}{\LWR at igangle}\LWR at indentHTML
- \LWR at rotstyle{-webkit-}{\LWR at igangle}\LWR at indentHTML
- \LWR at rotstyle{}{\LWR at igangle }\LWR at indentHTML
- }{}%
- \ifthenelse{%
- \NOT\equal{\LWR at igxscale}{1}\OR%
- \NOT\equal{\LWR at igyscale}{1}%
- }%
- {%
- \LWR at scalestyle{-ms-}{\LWR at igxscale}{\LWR at igyscale}\LWR at indentHTML
- \LWR at scalestyle{-webkit-}{\LWR at igxscale}{\LWR at igyscale}\LWR at indentHTML
- \LWR at scalestyle{}{\LWR at igxscale}{\LWR at igyscale}\LWR at indentHTML
- }{}%
- %
- \ifthenelse{\NOT\equal{\LWR at opacity}{1}}%
- {opacity:\LWR at opacity;\LWR at indentHTML}{}%
- %
- "\LWR at indentHTML%
-}{}%
-% \end{macrocode}
-% Set the class and alt tag:
-% \changes{v0.65}{2018/12/19}{\pkg{graphics}: Added \cs{includegraphics} \attribute{alt} key.}
-% \begin{macrocode}
-class="\LWR at igclass"\LWR at indentHTML%
-alt="\AltTextOpen\LWR at igalt\AltTextClose" \LWR at orignewline%
-}% end of image tags
-}% end of href
-% \end{macrocode}
% Return to original page size and font size:
-% \changes{v0.48}{2018/02/11}{Fix: Virtual page size limited to a group.}
+% \changes{v0.48}{2018/02/11}{\pkg{graphics}: Fix: Virtual page size limited to a group.}
% \begin{macrocode}
-\endgroup
+ \end{LWR at setvirtualpage}%
% \end{macrocode}
% Clear the single-use \attribute{alt} text:
-% \changes{v0.74}{2019/08/20}{Add \cs{ThisAltText}.}
+% \changes{v0.74}{2019/08/20}{\pkg{graphics}: Add \cs{ThisAltText}.}
% \begin{macrocode}
-\gdef\LWR at ThisAltText{}%
-\LWR at traceinfo{LWR at includegraphicsb done}%
+ \gdef\LWR at ThisAltText{}%
+ \LWR at traceinfo{LWR at includegraphicsb done}%
}
% \end{macrocode}
-% \end{macro}
+% \end{noindmacro}
+
% \begin{macro}{\includegraphics} \oarg{key=val} \marg{filename}
% Handles width and height, converted to fixed width and heights.
@@ -50053,14 +51094,14 @@
% \subsection{Boxes}
-% \begin{macro}{\LWR at rotboxorigin} Holds the origin key letters.
+% \begin{noindmacro}{\LWR at rotboxorigin} Holds the origin key letters.
% \begin{macrocode}
\newcommand*{\LWR at rotboxorigin}{}
% \end{macrocode}
-% \end{macro}
+% \end{noindmacro}
%
%
-% \begin{macro}{\LWR at originname} \marg{letter}
+% \begin{noindmacro}{\LWR at originname} \marg{letter}
%
% Given one \LaTeX{} origin key value,
% translate into an \HTML\ origin word:
@@ -50073,10 +51114,10 @@
\ifthenelse{\equal{#1}{r}}{right}{}%
}
% \end{macrocode}
-% \end{macro}
+% \end{noindmacro}
%
%
-% \begin{macro}{\LWR at originnames} \marg{letters}
+% \begin{noindmacro}{\LWR at originnames} \marg{letters}
%
% Given one- or two-letter \LaTeX{} origin key values,
% translate into \HTML\ origin words:
@@ -50088,7 +51129,7 @@
\LWR at originname{\LWR at strresult}
}
% \end{macrocode}
-% \end{macro}
+% \end{noindmacro}
%
%
% Handle the \optn{origin} key for \cs{rotatebox}:
@@ -51995,6 +53036,7 @@
}
% \end{macrocode}
+
% After \pkg{keyfloat} has loaded:
% \begin{macrocode}
\AtBeginDocument{
@@ -52018,18 +53060,7 @@
%
% \changes{v0.75}{2019/09/12}{\pkg{keyfloat}: Fix: \cs{normalcolor}.}
% \begin{macrocode}
-\providecommand*{\KFLT at LWR@hook at keysubfloats}{}
-\renewcommand*{\KFLT at LWR@hook at keysubfloats}{%
- \ifbool{KFLT at keywrap}{%
- }{%
- \ifnumequal{\value{KFLT at keyfloatdepth}}{0}{%
- \setlength{\linewidth}{6in}%
- \setlength{\textwidth}{6in}%
- \setlength{\textheight}{9in}%
- }{}%
- }%
- \normalcolor%
-}
+\LetLtxMacro\KFLT at LWR@hook at keysubfloats\KFLT at LWR@hook at boxouter
\let\KFLT at LWR@hook at keyfloatsminipage\relax
\let\endKFLT at LWR@hook at keyfloatsminipage\relax
@@ -52038,18 +53069,7 @@
%
% \changes{v0.75}{2019/09/12}{\pkg{keyfloat}: Fix: \cs{normalcolor}.}
% \begin{macrocode}
-\providecommand*{\KFLT at LWR@hook at keyfloats}{}
-\renewcommand*{\KFLT at LWR@hook at keyfloats}{%
- \ifbool{KFLT at keywrap}{%
- }{%
- \ifnumequal{\value{KFLT at keyfloatdepth}}{0}{%
- \setlength{\linewidth}{6in}%
- \setlength{\textwidth}{6in}%
- \setlength{\textheight}{9in}%
- }{}%
- }%
- \normalcolor%
-}
+\LetLtxMacro\KFLT at LWR@hook at keyfloats\KFLT at LWR@hook at boxouter
\renewcommand*{\KFLT at maybeendfloatrow}{%
\ifnumless{\value{KFLT at thiscol}}{\value{KFLT at numcols}}%
@@ -52289,12 +53309,12 @@
% \begin{noindenvironment}{keywrap} \marg{width} \marg{keyfloat}
+% \changes{v0.79}{2020/01/10}{Factored to \cs{LWR at setvirtualpage}.}
% ^^A % Modified to vertically align minipage for \HTML\ output:
% \begin{macrocode}
\DeclareDocumentEnvironment{keywrap}{m +m}
{%
- \LWR at ensuredoingapar%
- \setlength{\linewidth}{6in}% in case #1 has \linewidth
+ \begin{LWR at setvirtualpage}*
\setlength{\LWR at templengthone}{#1}%
\begin{LWR at BlockClassWP}%
{%
@@ -52307,6 +53327,7 @@
\booltrue{KFLT at keywrap}%
#2%
\end{LWR at BlockClassWP}%
+ \end{LWR at setvirtualpage}%
}
{}
% \end{macrocode}
@@ -53319,28 +54340,28 @@
% Options [c], [l], and [r] are ignored.
% \begin{macrocode}
\newenvironment{longtable*}[2][]{%
-\LWR at floatbegin{table}%
-\setcaptiontype{\LTcaptype}%
-\caption at setoptions{longtable}%
-\caption at setoptions{@longtable}%
-\caption at LT@setup%
-\booltrue{LWR at starredlongtable}%
-\boolfalse{LWR at longtable@havehead}%
-\let\captionlistentry\LWR at LTcaptionlistentry%
-\tabular{#2}
+ \LWR at floatbegin{table}%
+ \setcaptiontype{\LTcaptype}%
+ \caption at setoptions{longtable}%
+ \caption at setoptions{@longtable}%
+ \caption at LT@setup%
+ \booltrue{LWR at starredlongtable}%
+ \boolfalse{LWR at longtable@havehead}%
+ \let\captionlistentry\LWR at LTcaptionlistentry%
+ \tabular{#2}%
}
{\endtabular\LWR at floatend}
\newenvironment{longtable}[2][]{%
-\LWR at floatbegin{table}%
-\setcaptiontype{\LTcaptype}%
-\caption at setoptions{longtable}%
-\caption at setoptions{@longtable}%
-\caption at LT@setup%
-\refstepcounter{\LTcaptype}%
-\boolfalse{LWR at longtable@havehead}%
-\let\captionlistentry\LWR at LTcaptionlistentry%
-\tabular{#2}
+ \LWR at floatbegin{table}%
+ \setcaptiontype{\LTcaptype}%
+ \caption at setoptions{longtable}%
+ \caption at setoptions{@longtable}%
+ \caption at LT@setup%
+ \refstepcounter{\LTcaptype}%
+ \boolfalse{LWR at longtable@havehead}%
+ \let\captionlistentry\LWR at LTcaptionlistentry%
+ \tabular{#2}%
}
{\endtabular\LWR at floatend}
% \end{macrocode}
@@ -53373,9 +54394,9 @@
\space \protect\insertTableNotes\space here,
optionally with\MessageBreak
\space \protect\UseMinipageWidths\space in front.\MessageBreak
- See the lwarp documentation regarding longtables\MessageBreak
+ See the Lwarp documentation regarding longtables\MessageBreak
and threeparttablex}
- {See the lwarp documentation regading longtables and threeparttablex.}
+ {See the Lwarp documentation regading longtables and threeparttablex.}
}
% \end{macrocode}
%
@@ -53490,6 +54511,7 @@
% \pkg{ltablex} is emulated by \pkg{lwarp}.
%
% \changes{v0.57}{2018/05/25}{\pkg{ltablex}: Added.}
+% \changes{v0.79}{2020/01/18}{\pkg{ltablex}: Fix: Require \pkg{longtable}.}
%
% \codehtml
%
@@ -53496,6 +54518,7 @@
% Relies on \pkg{tabularx}.
%
% \begin{macrocode}
+\RequirePackage{longtable}
\RequirePackage{tabularx}
\LWR at ProvidesPackageDrop{ltablex}[2014/08/13]
@@ -53615,10 +54638,12 @@
% \pkg{caption} package, while \pkg{lwarp} does.
%
% \changes{v0.44}{2017/11/15}{\pkg{ltxtable}: Added.}
+% \changes{v0.79}{2020/01/18}{\pkg{ltxtable}: Fix: Required packages.}
%
% \codehtml
%
% \begin{macrocode}
+\RequirePackage{tabularx,longtable}
\LWR at ProvidesPackageDrop{ltxtable}[1995/12/11]
% \end{macrocode}
%
@@ -53625,7 +54650,7 @@
% \begin{noindmacro}{\LTXtable} \marg{width} \marg{file}
% \begin{macrocode}
\newcommand*{\LTXtable}[2]{%
-\input{#2}%
+ \input{#2}%
}
% \end{macrocode}
% \end{noindmacro}
@@ -54423,9 +55448,9 @@
%
% \DescribePackage{mathtools}
% \pkg{mathtools} is patched for use by \pkg{lwarp}.
+% Emulation macros are provided for \brand{MathJax}.
%
-% \optn{showonlyrefs} and \optn{mathic} are disabled.
-% \trouble[numbering, italics]{mathtools=\pkg{mathtools}}
+% \limitsmathtools
%
% \changes{v0.70}{2019/03/28}{\pkg{mathtools}: Added.}
%
@@ -54445,7 +55470,18 @@
% Forces \optn{showonlyrefs} off because \pkg{lwarp} uses \pkg{cleveref},
% which is not compatible with \optn{showonlyrefs}.
% \begin{macrocode}
-\renewcommand*\MT_showonlyrefs_true:{\MT_showonlyrefs_false:}
+\renewcommand*\MT_showonlyrefs_true:{%
+ \PackageWarningNoLine{lwarp}
+ {%
+ Mathtools \space showonlyrefs \space conflicts \space
+ with \space cleveref,\MessageBreak
+ which \space is \space used \space by \space lwarp, \space
+ so \space showonlyrefs \space is\MessageBreak
+ forced \space off. \space\space
+ Equation \space numbers \space may \space not \space match%
+ }
+ \MT_showonlyrefs_false:
+}
\mathtoolsset{showonlyrefs=false}
% \end{macrocode}
%
@@ -54459,6 +55495,193 @@
\MHInternalSyntaxOff
% \end{macrocode}
%
+%
+% For \brand{MathJax}:
+%
+% \changes{v0.79}{2020/01/26}{\pkg{mathtools}: Added \brand{MathJax} emulation.}
+% \begin{macrocode}
+\begin{warpMathJax}
+\CustomizeMathJax{\newcommand{\mathllap}[2][]{{#1#2}}}
+\CustomizeMathJax{\newcommand{\mathrlap}[2][]{{#1#2}}}
+\CustomizeMathJax{\newcommand{\mathclap}[2][]{{#1#2}}}
+\CustomizeMathJax{\newcommand{\mathmbox}[1]{#1}}
+\CustomizeMathJax{\newcommand{\clap}[1]{#1}}
+\CustomizeMathJax{\newcommand{\LWRmathmakebox}[2][]{#2}}
+\CustomizeMathJax{\newcommand{\mathmakebox}[1][]{\LWRmathmakebox}}
+\CustomizeMathJax{\newcommand{\cramped}[2][]{{#1#2}}}
+\CustomizeMathJax{\newcommand{\crampedllap}[2][]{{#1#2}}}
+\CustomizeMathJax{\newcommand{\crampedrlap}[2][]{{#1#2}}}
+\CustomizeMathJax{\newcommand{\crampedclap}[2][]{{#1#2}}}
+\CustomizeMathJax{\newenvironment{crampedsubarray}[1]{}{}}
+\CustomizeMathJax{\newcommand{\crampedsubstack}{}}
+\CustomizeMathJax{\newcommand{\smashoperator}[2][]{#2}}
+\CustomizeMathJax{\newcommand{\SwapAboveDisplaySkip}{}}
+
+\CustomizeMathJax{\require{extpfeil}}
+\CustomizeMathJax{\Newextarrow\xleftrightarrow{10,10}{0x2194}}
+\CustomizeMathJax{\Newextarrow\xLeftarrow{10,10}{0x21d0}}
+\CustomizeMathJax{\Newextarrow\xhookleftarrow{10,10}{0x21a9}}
+\CustomizeMathJax{\Newextarrow\xmapsto{10,10}{0x21a6}}
+\CustomizeMathJax{\Newextarrow\xRightarrow{10,10}{0x21d2}}
+\CustomizeMathJax{\Newextarrow\xLeftrightarrow{10,10}{0x21d4}}
+\CustomizeMathJax{\Newextarrow\xhookrightarrow{10,10}{0x21aa}}
+\CustomizeMathJax{\Newextarrow\xrightharpoondown{10,10}{0x21c1}}
+\CustomizeMathJax{\Newextarrow\xleftharpoondown{10,10}{0x21bd}}
+\CustomizeMathJax{\Newextarrow\xrightleftharpoons{10,10}{0x21cc}}
+\CustomizeMathJax{\Newextarrow\xrightharpoonup{10,10}{0x21c0}}
+\CustomizeMathJax{\Newextarrow\xleftharpoonup{10,10}{0x21bc}}
+\CustomizeMathJax{\Newextarrow\xleftrightharpoons{10,10}{0x21cb}}
+
+\CustomizeMathJax{\newcommand{\LWRdounderbracket}[1]{\underline{#1}}}
+\CustomizeMathJax{\newcommand{\LWRunderbracket}[2][]{\LWRdounderbracket{#2}}}
+\CustomizeMathJax{\newcommand{\underbracket}[1][]{\LWRunderbracket}}
+\CustomizeMathJax{\newcommand{\LWRdooverbracket}[1]{\overline{#1}}}
+\CustomizeMathJax{\newcommand{\LWRoverbracket}[2][]{\LWRdooverbracket{#2}}}
+\CustomizeMathJax{\newcommand{\overbracket}[1][]{\LWRoverbracket}}
+
+\CustomizeMathJax{\newcommand{\LaTeXunderbrace}[1]{\underbrace{#1}}}
+\CustomizeMathJax{\newcommand{\LaTeXoverbrace}[1]{\overbrace{#1}}}
+
+\CustomizeMathJax{\newenvironment{matrix*}[1][]{\begin{matrix}}{\end{matrix}}}
+\CustomizeMathJax{\newenvironment{pmatrix*}[1][]{\begin{pmatrix}}{\end{pmatrix}}}
+\CustomizeMathJax{\newenvironment{bmatrix*}[1][]{\begin{bmatrix}}{\end{bmatrix}}}
+\CustomizeMathJax{\newenvironment{Bmatrix*}[1][]{\begin{Bmatrix}}{\end{Bmatrix}}}
+\CustomizeMathJax{\newenvironment{vmatrix*}[1][]{\begin{vmatrix}}{\end{vmatrix}}}
+\CustomizeMathJax{\newenvironment{Vmatrix*}[1][]{\begin{Vmatrix}}{\end{Vmatrix}}}
+\CustomizeMathJax{\newenvironment{smallmatrix*}[1][]{\begin{matrix}}{\end{matrix}}}
+\CustomizeMathJax{\newenvironment{psmallmatrix*}[1][]{\begin{pmatrix}}{\end{pmatrix}}}
+\CustomizeMathJax{\newenvironment{bsmallmatrix*}[1][]{\begin{bmatrix}}{\end{bmatrix}}}
+\CustomizeMathJax{\newenvironment{Bsmallmatrix*}[1][]{\begin{Bmatrix}}{\end{Bmatrix}}}
+\CustomizeMathJax{\newenvironment{vsmallmatrix*}[1][]{\begin{vmatrix}}{\end{vmatrix}}}
+\CustomizeMathJax{\newenvironment{Vsmallmatrix*}[1][]{\begin{Vmatrix}}{\end{Vmatrix}}}
+\CustomizeMathJax{\newenvironment{psmallmatrix}[1][]{\begin{pmatrix}}{\end{pmatrix}}}
+\CustomizeMathJax{\newenvironment{bsmallmatrix}[1][]{\begin{bmatrix}}{\end{bmatrix}}}
+\CustomizeMathJax{\newenvironment{Bsmallmatrix}[1][]{\begin{Bmatrix}}{\end{Bmatrix}}}
+\CustomizeMathJax{\newenvironment{vsmallmatrix}[1][]{\begin{vmatrix}}{\end{vmatrix}}}
+\CustomizeMathJax{\newenvironment{Vsmallmatrix}[1][]{\begin{Vmatrix}}{\end{Vmatrix}}}
+
+
+\CustomizeMathJax{\newcommand{\LWRmultlined}[1][]{\begin{multline*}}}
+\CustomizeMathJax{\newenvironment{multlined}[1][]{\LWRmultlined}{\end{multline*}}}
+
+\CustomizeMathJax{\let\LWRorigshoveleft\shoveleft}
+\CustomizeMathJax{\renewcommand{\shoveleft}[1][]{\LWRorigshoveleft}}
+\CustomizeMathJax{\let\LWRorigshoveright\shoveright}
+\CustomizeMathJax{\renewcommand{\shoveright}[1][]{\LWRorigshoveright}}
+
+\CustomizeMathJax{\newenvironment{dcases}{\begin{cases}}{\end{cases}}}
+\CustomizeMathJax{\newenvironment{dcases*}{\begin{cases}}{\end{cases}}}
+\CustomizeMathJax{\newenvironment{rcases}{\begin{cases}}{\end{cases}}}
+\CustomizeMathJax{\newenvironment{rcases*}{\begin{cases}}{\end{cases}}}
+\CustomizeMathJax{\newenvironment{drcases}{\begin{cases}}{\end{cases}}}
+\CustomizeMathJax{\newenvironment{drcases*}{\begin{cases}}{\end{cases}}}
+\CustomizeMathJax{\newenvironment{cases*}{\begin{cases}}{\end{cases}}}
+
+\CustomizeMathJax{\newcommand{\MoveEqLeft}[1][]{}}
+
+\CustomizeMathJax{% special parsing to handle '&' in argument
+ \def\LWRAboxed#1!|!{\fbox{\(#1\)}&\fbox{\(#2\)}}
+ \newcommand{\Aboxed}[1]{\LWRAboxed#1&&!|!}
+}
+
+\CustomizeMathJax{
+ \newcommand{\ArrowBetweenLines}[1][\Updownarrow]{#1}% no starred
+}
+
+\CustomizeMathJax{\newcommand{\shortintertext}[1]{\\ \text{#1}\notag \\}}
+
+\CustomizeMathJax{\newcommand{\vdotswithin}[1]{\hspace{.5em}\vdots}}
+\CustomizeMathJax{\newcommand{\shortvdotswithin}[1]{ & \hspace{.5em}\vdots \\}}
+\CustomizeMathJax{\newcommand{\MTFlushSpaceAbove}{}}
+\CustomizeMathJax{\newcommand{\MTFlushSpaceBelow}{\\}}
+
+% The following does not create a starred version of the macro:
+\LetLtxMacro\LWR at mathtools@orig at DeclarePairedDelimiter\DeclarePairedDelimiter
+\renewcommand{\DeclarePairedDelimiter}[3]{
+ \LWR at mathtools@orig at DeclarePairedDelimiter{#1}{#2}{#3}
+ \CustomizeMathJax{\newcommand{#1}[2][]{{##1#2##2##1#3}}}
+}
+\@onlypreamble\DeclareParedDelimiter
+
+% (\cs{DeclarePairedDelimiterX} is already defined to use \cs{\DeclarePairedDelimiterXPP}.)
+
+% The following does not create a starred version of the macro.
+\LetLtxMacro\LWR at mathtools@orig at DeclarePairedDelimiterXPP\DeclarePairedDelimiterXPP
+\DeclareDocumentCommand{\DeclarePairedDelimiterXPP}{m O{1} m m m m m}{
+ \LWR at mathtools@orig at DeclarePairedDelimiterXPP{#1}[#2]{#3}{#4}{#5}{#6}{#7}
+ \appto\LWR at customizedMathJax{\LWRbackslash(}%
+ \appto\LWR at customizedMathJax{%
+ \LWRbackslash{}newcommand\{\LWRbackslash\macrotocsname{#1}LWRsub\}%
+ }%
+ \appto\LWR at customizedMathJax{[#2]}%
+ \appto\LWR at customizedMathJax{\{\{\LWRbackslash{}delimsize}%
+ \LWR at subcustomizedmathjax{#3#4#7}%
+ \appto\LWR at customizedMathJax{\LWRbackslash{}delimsize}%
+ \LWR at subcustomizedmathjax{#5#6}%
+ \appto\LWR at customizedMathJax{\}\}}%
+ \appto\LWR at customizedMathJax{\LWRbackslash)\par}%
+ \appto\LWR at customizedMathJax{\LWRbackslash(}%
+ \appto\LWR at customizedMathJax{%
+ \LWRbackslash{}newcommand\{\LWRbackslash\macrotocsname{#1}\}[1][]%
+ }%
+ \appto\LWR at customizedMathJax{%
+ \{
+ \LWRbackslash{}def\LWRbackslash{}delimsize\{\#1\}
+ \LWRbackslash\macrotocsname{#1}LWRsub
+ \}%
+ }%
+ \appto\LWR at customizedMathJax{\LWRbackslash)\par}%
+}
+\@onlypreamble\DeclareParedDelimiterXPP
+\@onlypreamble\DeclareParedDelimiterX
+
+\CustomizeMathJax{\newcommand\lparen{(}}
+\CustomizeMathJax{\newcommand\rparen{)}}
+\CustomizeMathJax{\newcommand{\vcentcolon}{:}}
+\CustomizeMathJax{\newcommand{\ordinarycolon}{:}}
+
+\CustomizeMathJax{\newcommand\dblcolon{\vcentcolon\vcentcolon}}
+\CustomizeMathJax{\newcommand\coloneqq{\vcentcolon=}}
+\CustomizeMathJax{\newcommand\Coloneqq{\dblcolon=}}
+\CustomizeMathJax{\newcommand\coloneq{\vcentcolon{-}}}
+\CustomizeMathJax{\newcommand\Coloneq{\dblcolon{-}}}
+
+\CustomizeMathJax{\newcommand\eqqcolon{=\vcentcolon}}
+\CustomizeMathJax{\newcommand\Eqqcolon{=\dblcolon}}
+\CustomizeMathJax{\newcommand\eqcolon{\mathrel{-}\vcentcolon}}
+\CustomizeMathJax{\newcommand\Eqcolon{\mathrel{-}\dblcolon}}
+
+\CustomizeMathJax{\newcommand\colonapprox{\vcentcolon\approx}}
+\CustomizeMathJax{\newcommand\Colonapprox{\dblcolon\approx}}
+\CustomizeMathJax{\newcommand\colonsim{\vcentcolon\sim}}
+\CustomizeMathJax{\newcommand\Colonsim{\dblcolon\sim}}
+
+\CustomizeMathJax{\newcommand{\nuparrow}{\cancel{\uparrow}}}
+\CustomizeMathJax{\newcommand{\ndownarrow}{\cancel{\downarrow}}}
+\CustomizeMathJax{\newcommand{\bigtimes}{{\Large\times}}}
+
+\CustomizeMathJax{\newcommand{\prescript}[3]{{}^{#1}_{#2}#3}}
+
+
+\CustomizeMathJax{\newenvironment{lgathered}{\begin{gathered}}{\end{gathered}}}
+\CustomizeMathJax{\newenvironment{rgathered}{\begin{gathered}}{\end{gathered}}}
+
+\LetLtxMacro\LWR at mathtools@orig at newgathered\newgathered
+\renewcommand{\newgathered}[4]{%
+ \LWR at mathtools@orig at newgathered{#1}{#2}{#3}{#4}%
+ \appto\LWR at customizedMathJax{\LWRbackslash(}%
+ \LWR at subcustomizedmathjax{%
+ \newenvironment{#1}{\begin{gathered}}{\end{gathered}}%
+ }%
+ \appto\LWR at customizedMathJax{\LWRbackslash)}%
+}
+\@onlypreamble\newgathered
+
+\CustomizeMathJax{\newcommand{\splitfrac}[2]{{}^{#1}_{#2}}}
+\CustomizeMathJax{\let\splitdfrac\splitfrac}
+\end{warpMathJax}
+% \end{macrocode}
+%
% \iffalse
%</mathtools>
% \fi
@@ -56261,11 +57484,11 @@
\LWR at htmltag{td rowspan="#2" %
% \end{macrocode}
% The vertical alignment, if given:
+% \changes{v0.79}{2020/01/17}{\pkg{multirow}: Fix: Centered vertical alignment.}
% \begin{macrocode}
-\IfValueT{#1}{%
+\ifstrequal{#1}{c}{style="\LWR at print@mbox{vertical-align:middle}" }{}%
\ifstrequal{#1}{b}{style="\LWR at print@mbox{vertical-align:bottom}" }{}%
\ifstrequal{#1}{t}{style="\LWR at print@mbox{vertical-align:top}" }{}%
-}%
% \end{macrocode}
% The left/right border, if given:
% \begin{macrocode}
@@ -56310,7 +57533,7 @@
% \begin{macrocode}
\begingroup\LetLtxMacro{\\}{\LWR at endofline}#6\endgroup%
\LWR at stoppars%
-\global\boolfalse{LWR at intabularmetadata}%
+\boolfalse{LWR at intabularmetadata}%
\renewcommand{\LWR at multirowborder}{}%
\LWR at traceinfo{*** LWR at HTML@multirow done}%
}%
@@ -56351,21 +57574,22 @@
% \begin{macrocode}
\LWR at tabularhtmlcolumns{\arabic{LWR at tableLaTeXcolindex}}{#1}
% \end{macrocode}
-% Create the multicolumn/multirow tag:
+% Create the multicolumn/multirow tag, temporarily redefining the end of line.
+% (Using a group caused problems with a nested \env{tabular}.
+% \changes{v0.79}{2020/01/18}{\pkg{multirow}: Fix: Nested \env{tabular}s.}
% \begin{macrocode}
-\begingroup%
\LetLtxMacro{\\}{\LWR at endofline}%
\LWR at domulticolumn[#3][#4]{#1}{\arabic{LWR at tabhtmlcoltotal}}{#2}{#8}%
-\endgroup%
+\LetLtxMacro{\\}{\LWR at tabularendofline}%
% \end{macrocode}
% Move to the next \LaTeX\ column:
% \begin{macrocode}
-\addtocounter{LWR at tableLaTeXcolindex}{#1}%
-\addtocounter{LWR at tableLaTeXcolindex}{-1}%
+\defaddtocounter{LWR at tableLaTeXcolindex}{#1}%
+\defaddtocounter{LWR at tableLaTeXcolindex}{-1}%
% \end{macrocode}
% Skip any trailing |@| or |!| columns for this cell:
% \begin{macrocode}
-\global\booltrue{LWR at skipatbang}%
+\booltrue{LWR at skipatbang}%
}
\LWR at expandableformatted{multicolumnrow}
@@ -56375,6 +57599,23 @@
% \end{macro}
%
%
+% For \brand{MathJax}.
+% Only the text is used. All other parameters are ignored.
+% \changes{v0.79}{2020/01/27}{\pkg{multirow}: Add: \brand{MathJax} emulation.}
+% \begin{macrocode}
+\begin{warpMathJax}
+% \multirow[vpos]{num}[bigstruts]{width}[vmove]{text}
+\CustomizeMathJax{\newcommand{\LWRsubmultirow}[2][]{#2}}
+\CustomizeMathJax{\newcommand{\LWRmultirow}[2][]{\LWRsubmultirow}}
+\CustomizeMathJax{\newcommand{\multirow}[2][]{\LWRmultirow}}
+%
+\CustomizeMathJax{\newcommand{\mrowcell}{}}
+\CustomizeMathJax{\newcommand{\mcolrowcell}{}}
+\CustomizeMathJax{\newcommand{\STneed}[1]{}}
+\end{warpMathJax}
+% \end{macrocode}
+%
+%
% \iffalse
%</multirow>
% \fi
@@ -57459,7 +58700,9 @@
%
% For Mathjax:
% \begin{macrocode}
+\begin{warpMathJax}
\CustomizeMathJax{\newcommand{\nicefrac}[3][]{#2/#3}}
+\end{warpMathJax}
% \end{macrocode}
%
% ^^A For Ka\TeX:
@@ -57494,12 +58737,15 @@
\LWR at ProvidesPackageDrop{niceframe}% the original date is in yyyy/dd/mm format
% \end{macrocode}
%
+% \changes{v0.79}{2020/01/07}{\pkg{niceframe}: Fix: Adjust for virtual page size.}
% \begin{macrocode}
-\newcommand{\LWR at niceframe}[3]{
- \setlength{\LWR at templengthone}{#1}
- \begin{BlockClass}[max-width:\LWR at printlength{\LWR at templengthone}]{#3}
+\newcommand{\LWR at niceframe}[3]{%
+ \begin{LWR at setvirtualpage}*%
+ \setlength{\LWR at templengthone}{#1}%
+ \begin{BlockClass}[max-width:\LWR at printlength{\LWR at templengthone}]{#3}%
#2
- \end{BlockClass}
+ \end{BlockClass}%
+ \end{LWR at setvirtualpage}%
}
\newcommand{\niceframe}[2][\textwidth]{\LWR at niceframe{#1}{#2}{niceframe}}
@@ -58750,8 +59996,250 @@
%
%
%
+% \iffalse
+%<*parallel>
+% \fi
%
+% \part{lwarp-parallel.sty}
+%
+% \section{parallel}
+%
+% \credits{Matthias Eckermann}
+%
+% \DescribePackage{parallel} \pkg{parallel} is emulated.
+%
+% Package options are ignored. Footnotes are treated as normal \pkg{lwarp} footnotes.
+%
+% Environment option \optn{c} gives side-by-side \element{div}s
+% of class \attribute{minipage}, each of whose width is a percent depending
+% on the given left and right widths, proportional to \cs{linewidth}.
+%
+% Inside each environment, \cs{linewidth} and \cs{textwidth} are
+% set for the print-output sizes.
+%
+% \changes{v0.79}{2019/12/29}{\pkg{parallel}: Added.}
+%
+% \codehtml
+%
+% Discard all options for \pkg{lwarp-parallel}:
+% \begin{macrocode}
+\LWR at ProvidesPackageDrop{parallel}[2003/04/13]
+% \end{macrocode}
+%
+%
+% \begin{macrocode}
+\newcounter{LWR at parallel@Lwidth}
+\newcounter{LWR at parallel@Rwidth}
+\newcommand*{\LWR at parallel@border}
+
+\newenvironment*{Parallel}[3][]%
+ {%
+ \LWR at printpendingfootnotes%
+ \setlength{\linewidth}{\LWR at userstextwidth}%
+ \setlength{\textwidth}{\LWR at userstextwidth}%
+ \renewcommand*{\LWR at parallel@border}{}%
+ \ifstrequal{#1}{v}%
+ {%
+ \renewcommand*{\LWR at parallel@border}{ ; border-left: 2px solid black}%
+ }%
+ {}%
+ \ifblank{#2}{%
+ \ifblank{#3}{% {}{}
+ \setcounter{LWR at parallel@Lwidth}{45}%
+ \setcounter{LWR at parallel@Rwidth}{45}%
+ }% {}{}
+ {% {}{x}
+ \setlength{\LWR at templengthone}{\linewidth-#3}%
+ \setcounter{LWR at parallel@Lwidth}{%
+ 90*\ratio{\LWR at templengthone}{\linewidth}%
+ }%
+ \setcounter{LWR at parallel@Rwidth}{%
+ 90*\ratio{#3}{\linewidth}%
+ }%
+ }% {}{x}
+ }% #2 blank
+ {% #2 non-blank
+ \ifblank{#3}{% {x}{}
+ \setcounter{LWR at parallel@Lwidth}{%
+ 90*\ratio{#2}{\linewidth}%
+ }%
+ \setlength{\LWR at templengthone}{\linewidth-#2}%
+ \setcounter{LWR at parallel@Rwidth}{%
+ 90*\ratio{\LWR at templengthone}{\linewidth}%
+ }%
+ }% {x}{}
+ {% {x}{x}
+ \setcounter{LWR at parallel@Lwidth}{%
+ 90*\ratio{#2}{\linewidth}%
+ }%
+ \setcounter{LWR at parallel@Rwidth}{%
+ 90*\ratio{#3}{\linewidth}%
+ }%
+ }% {x}{x}
+ }% #2 non-blank
+ }
+ {%
+ \ParallelAtEnd%
+ \renewcommand*{\ParallelAtEnd}{}%
+ \LWR at printpendingfootnotes%
+ }
+
+\newcommand*{\ParallelLText}[1]{%
+ \begin{BlockClass}[%
+ width:\arabic{LWR at parallel@Lwidth}\% ; % space
+ padding: .5ex 1\% ; % space
+ ]{minipage}%
+ #1%
+ \end{BlockClass}%
+}
+
+\newcommand*{\ParallelRText}[1]{%
+ \begin{BlockClass}[%
+ width:\arabic{LWR at parallel@Rwidth}\% ; % space
+ padding: .5ex 1\% ; % space
+ \LWR at parallel@border%
+ ]{minipage}%
+ #1%
+ \end{BlockClass}%
+}
+
+\newcommand*{\ParallelPar}{\LWR at printpendingfootnotes}
+
+\newcommand*{\ParallelAtEnd}{}
+% \end{macrocode}
+%
% \iffalse
+%</parallel>
+% \fi
+%
+%
+%
+%
+%
+%
+%
+% \iffalse
+%<*parcolumns>
+% \fi
+%
+% \part{lwarp-parcolumns.sty}
+%
+% \section{parcolumns}
+%
+% \credits{Jonathan Sauer}
+%
+% \DescribePackage{parcolumns} \pkg{parcolumns} is emulated.
+%
+% \optn{rulebetween} is honored. The other keys are ignored, including \optn{colwidths}.
+%
+% Each column is placed inside a \element{div} of class \attribute{minipage},
+% each of whose width is fixed at 85\% divided by the number of columns.
+% In most cases, this results in side-by-side minipages adapting to the browser width.
+% Inside each minipage, \cs{linewidth}, \cs{textwidth}, and \cs{textheight} are
+% set for a virtual $6\times9$ inch page, with \cs{linewidth} divided by the number
+% of columns.
+%
+% \changes{v0.79}{2019/12/22}{\pkg{parcolumns}: Added.}
+%
+% \codehtml
+%
+% Discard all options for \pkg{lwarp-parcolumns}:
+% \begin{macrocode}
+\RequirePackage{keyval}%
+
+\LWR at ProvidesPackageDrop{parcolumns}[2004/11/25]
+% \end{macrocode}
+%
+% \begin{macrocode}
+\newcounter{LWR at parcolumns@numcols}
+\newcounter{LWR at parcolumns@thiscol}
+\newcounter{LWR at parcolumns@width}
+\newbool{LWR at parcolumns@started}
+\newbool{LWR at parcolumns@rule}
+
+\define at key{LWRparcols}{colwidths}{}
+\define at key{LWRparcols}{distance}{}
+\define at key{LWRparcols}{rulebetween}[true]{%
+ \setbool{LWR at parcolumns@rule}{#1}%
+}
+\define at key{LWRparcols}{nofirstindent}{}
+\define at key{LWRparcols}{sloppy}{}
+\define at key{LWRparcols}{sloppyspaces}{}
+
+\newenvironment*{parcolumns}[2][]
+ {%
+ \begin{LWR at setvirtualpage}*[#2]%
+ \setcounter{LWR at parcolumns@numcols}{#2}%
+ \setcounter{LWR at parcolumns@thiscol}{1}%
+ \boolfalse{LWR at parcolumns@started}%
+ \boolfalse{LWR at parcolumns@rule}%
+ \setcounter{LWR at parcolumns@width}{%
+ 85/#2
+ }%
+ \setkeys{LWRparcols}{#1}%
+ }
+ {\end{LWR at setvirtualpage}}
+
+\newcommand{\LWR at parcolumns@onecol}[1]{%
+ \ifbool{LWR at parcolumns@started}%
+ {}%
+ {%
+ \LWR at htmldivclass{parcolumns}%
+ \booltrue{LWR at parcolumns@started}%
+ }%
+ \ifboolexpr{%
+ bool {LWR at parcolumns@rule} and
+ test {%
+ \ifnumgreater
+ {\value{LWR at parcolumns@thiscol}}
+ {1}
+ }%
+ }%
+ {\renewcommand{\LWR at tempone}{ ; border-left: 2px solid black}}%
+ {\renewcommand{\LWR at tempone}{}}%
+ \begin{BlockClass}[%
+ width:\arabic{LWR at parcolumns@width}\% ; % space
+ padding: .5ex 1\% ; % space
+ \LWR at tempone%
+ ]{minipage}%
+ #1%
+ \end{BlockClass}%
+ \addtocounter{LWR at parcolumns@thiscol}{1}%
+}
+
+\newcommand{\colchunk}[2][\value{LWR at parcolumns@thiscol}]{%
+ \whileboolexpr{%
+ test {%
+ \ifnumcomp%
+ {\value{LWR at parcolumns@thiscol}}
+ {<}
+ {#1}%
+ }%
+ }{%
+ \LWR at parcolumns@onecol{}%
+ }%
+ \LWR at parcolumns@onecol{#2}%
+}
+
+\newcommand*{\colplacechunks}{%
+ \ifbool{LWR at parcolumns@started}%
+ {%
+ \LWR at htmldivclassend{div}%
+ \boolfalse{LWR at parcolumns@started}%
+ }%
+ {}%
+ \setcounter{LWR at parcolumns@thiscol}{1}%
+}
+% \end{macrocode}
+%
+% \iffalse
+%</parcolumns>
+% \fi
+%
+%
+%
+%
+% \iffalse
%<*parnotes>
% \fi
%
@@ -58896,10 +60384,199 @@
%
%
%
+% \iffalse
+%<*pdfcol>
+% \fi
%
+% \part{lwarp-pdfcol.sty}
%
+% \section{pdfcol}
%
+% \DescribePackage{pdfcol}
+% \pkg{pdfcol} is ignored.
+%
+% \changes{v0.79}{2019/12/18}{\pkg{pdfcol}: Added.}
+%
+% \codehtml
+%
+% \begin{macrocode}
+\LWR at ProvidesPackageDrop{pdfcol}[2018/11/01]
+
+\ltx at newif\ifpdfcolAvailable
+\pdfcolAvailablefalse
+
+\def\pdfcolErrorNoStacks{
+ \PackageInfo{lwarp-pdfcol}{Ignoring pdfcol for HTML output.}
+}
+
+\def\pdfcolInitStack#1{}%
+
+\long\def\pdfcolIfStackExists#1#2#3{#3}%
+
+\def\pdfcolSwitchStack#1{}%
+
+\def\pdfcolSetCurrentColor{}%
+
+\def\pdfcolSetCurrent#1{}%
+% \end{macrocode}
+%
% \iffalse
+%</pdfcol>
+% \fi
+%
+%
+%
+%
+% \iffalse
+%<*pdfcolfoot>
+% \fi
+%
+% \part{lwarp-pdfcolfoot.sty}
+%
+% \section{pdfcolfoot}
+%
+% \DescribePackage{pdfcolfoot}
+% \pkg{pdfcolfoot} is ignored.
+%
+% \changes{v0.79}{2019/12/18}{\pkg{pdfcolfoot}: Added.}
+%
+% \codehtml
+%
+% \begin{macrocode}
+\LWR at ProvidesPackageDrop{pdfcolfoot}[2016/05/16]
+
+\newcommand*{\pdfcolfoot at switch}{}
+
+\newcommand*{\pdfcolfoot at current}{}
+% \end{macrocode}
+%
+% \iffalse
+%</pdfcolfoot>
+% \fi
+%
+%
+%
+%
+% \iffalse
+%<*pdfcolmk>
+% \fi
+%
+% \part{lwarp-pdfcolmk.sty}
+%
+% \section{pdfcolmk}
+%
+% \DescribePackage{pdfcolmk}
+% \pkg{pdfcolmk} is ignored.
+%
+% \changes{v0.79}{2019/11/18}{\pkg{pdfcolmk}: Added.}
+%
+% \codehtml
+%
+% \begin{macrocode}
+\LWR at ProvidesPackageDrop{pdfcolmk}[2016/05/16]
+% \end{macrocode}
+%
+% \iffalse
+%</pdfcolmk>
+% \fi
+%
+%
+%
+%
+% \iffalse
+%<*pdfcolparallel>
+% \fi
+%
+% \part{lwarp-pdfcolparallel.sty}
+%
+% \section{pdfcolparallel}
+%
+% \DescribePackage{pdfcolparallel}
+% \pkg{pdfcolparallel} is ignored.
+%
+% \changes{v0.79}{2019/12/29}{\pkg{pdfcolparallel}: Added.}
+%
+% \codehtml
+%
+% \begin{macrocode}
+\RequirePackage{keyval}%
+
+\LWR at ProvidesPackageDropA{pdfcolparallel}{2016/05/16}
+% \end{macrocode}
+% Pass options to \pkg{parallel}:
+% \begin{macrocode}
+\DeclareOption*{%
+ \PassoptionsToPackage{\CurrentOption}{parallel}%
+}
+% \end{macrocode}
+% Process the options:
+% \begin{macrocode}
+\LWR at ProvidesPackageDropB
+% \end{macrocode}
+%
+% Require \pkg{parallel} with the given options:
+% \begin{macrocode}
+\RequirePackage{parallel}[2003/04/13]
+% \end{macrocode}
+%
+% Ignore the new key:
+% \begin{macrocode}
+\define at key{parallel}{rulebetweencolor}{}
+% \end{macrocode}
+%
+% \iffalse
+%</pdfcolparallel>
+% \fi
+%
+%
+%
+%
+% \iffalse
+%<*pdfcolparcolumns>
+% \fi
+%
+% \part{lwarp-pdfcolparcolumns.sty}
+%
+% \section{pdfcolparcolumns}
+%
+% \DescribePackage{pdfcolparcolumns}
+% \pkg{pdfcolparcolumns} is ignored.
+%
+% \changes{v0.79}{2019/12/22}{\pkg{pdfcolparcolumns}: Added.}
+%
+% \codehtml
+%
+% \begin{macrocode}
+\LWR at ProvidesPackageDropA{pdfcolparcolumns}{2016/05/16}
+% \end{macrocode}
+% Pass options to \pkg{parcolumns}:
+% \begin{macrocode}
+\DeclareOption*{%
+ \PassoptionsToPackage{\CurrentOption}{parcolumns}%
+}
+% \end{macrocode}
+% Process the options:
+% \begin{macrocode}
+\LWR at ProvidesPackageDropB
+% \end{macrocode}
+% Require \pkg{parcolumns} with the given options:
+% \begin{macrocode}
+\RequirePackage{parcolumns}[2004/11/25]
+% \end{macrocode}
+%
+% Ignore the new key:
+% \begin{macrocode}
+\define at key{LWRparcols}{rulebetweencolor}{}
+% \end{macrocode}
+%
+% \iffalse
+%</pdfcolparcolumns>
+% \fi
+%
+%
+%
+%
+% \iffalse
%<*pdfcomment>
% \fi
%
@@ -59528,6 +61205,318 @@
%
%
% \iffalse
+%<*physics>
+% \fi
+%
+% \part{lwarp-physics.sty}
+%
+% \section{physics}
+%
+% \credits{Sergio C. de la Barrera}
+%
+% \DescribePackage{physics}
+% \limitsphysics
+%
+% \changes{v0.79}{2020/01/29}{\pkg{physics}: Added.}
+%
+% \codehtml
+%
+% \begin{macrocode}
+\LWR at ProvidesPackagePass{physics}% No date is provided by the package.
+% \end{macrocode}
+%
+% \begin{macrocode}
+% doesn't work with \big, etc:
+\begin{warpMathJax}
+\CustomizeMathJax{\newcommand{\quantity}{}}
+\CustomizeMathJax{\let\qty\quantity}
+\CustomizeMathJax{\newcommand{\pqty}[1]{\left(#1\right)}}
+\CustomizeMathJax{\newcommand{\bqty}[1]{\left\lbrack#1\right\rbrack}}
+\CustomizeMathJax{\newcommand{\vqty}[1]{\left\vert#1\right\rvert}}
+\CustomizeMathJax{\newcommand{\Bqty}[1]{\left\lbrace#1\right\rbrace}}
+
+% doesn't work with \big, etc., no star
+\CustomizeMathJax{\newcommand{\absolutevalue}[1]{\left\lvert#1\right\rvert}}
+\CustomizeMathJax{\let\abs\absolutevalue}
+
+% doesn't work with \big, etc., no star
+\CustomizeMathJax{\newcommand{\norm}[1]{%
+ \left\lvert\left\lvert#1\right\rvert\right\rvert}%
+}
+
+% doesn't work with \big, etc., no star, no paren or bracket
+\CustomizeMathJax{\newcommand{\evaluated}[1]{#1\vert}}
+\CustomizeMathJax{\let\eval\evaluated}
+
+% no \Big, star
+\CustomizeMathJax{\newcommand{\order}[1]{\mathcal{O}\left(#1\right)}}
+
+% no \Big, star
+\CustomizeMathJax{\newcommand{\commutator}[2]{\left\lbrack#1,#2\right\rbrack}}
+\CustomizeMathJax{\let\comm\commutator}
+
+% no \Big, star
+\CustomizeMathJax{\newcommand{\anticommutator}[2]{%
+ \left\lbrace#1,#2\right\rbrace}%
+}
+\CustomizeMathJax{\let\acomm\anticommutator}
+
+% no \Big, star
+\CustomizeMathJax{\let\poissonbracket\anticommutator}
+\CustomizeMathJax{\let\pb\anticommutator}
+
+% no star
+\CustomizeMathJax{\newcommand{\vectorbold}[1]{\mathbf{#1}}}
+\CustomizeMathJax{\let\vb\vectorbold}
+
+% no star
+\CustomizeMathJax{\newcommand{\vectorarrow}[1]{\vec{\mathbf{#1}}}}
+\CustomizeMathJax{\let\va\vectorarrow}
+
+% no star
+\CustomizeMathJax{\newcommand{\vectorunit}[1]{\mathbf{\hat{#1}}}}
+\CustomizeMathJax{\let\va\vectorunit}
+
+\CustomizeMathJax{\newcommand{\dotproduct}{\boldsymbol\cdot}}
+\CustomizeMathJax{\let\vdot\dotproduct}
+
+\CustomizeMathJax{\newcommand{\crossproduct}{\boldsymbol\times}}
+\CustomizeMathJax{\let\cross\crossproduct}
+\CustomizeMathJax{\let\cp\crossproduct}
+
+\CustomizeMathJax{\newcommand{\gradient}{\mathbf{\nabla}}}
+\CustomizeMathJax{\let\grad\gradient}
+
+\CustomizeMathJax{\let\divisionsymbol\div}
+
+\CustomizeMathJax{\newcommand{\divergence}{\nabla\vdot}}
+\CustomizeMathJax{\let\div\divergence}
+
+\CustomizeMathJax{\newcommand{\curl}{\nabla\cross}}
+
+\CustomizeMathJax{\newcommand{\laplacian}{\nabla^2}}
+
+% responds to notrig option
+\ifx\trigopt 1
+ \CustomizeMathJax{\DeclareMathOperator{\sine}{sin}}
+ \CustomizeMathJax{\DeclareMathOperator{\cosine}{cos}}
+ \CustomizeMathJax{\DeclareMathOperator{\tangent}{tan}}
+ \CustomizeMathJax{\DeclareMathOperator{\cosecant}{csc}}
+ \CustomizeMathJax{\DeclareMathOperator{\secant}{sec}}
+ \CustomizeMathJax{\DeclareMathOperator{\cotangent}{cot}}
+ \CustomizeMathJax{\DeclareMathOperator{\arcsine}{arcsin}}
+ \CustomizeMathJax{\DeclareMathOperator{\arccosine}{arccos}}
+ \CustomizeMathJax{\DeclareMathOperator{\arctangent}{arctan}}
+ \CustomizeMathJax{\DeclareMathOperator{\hypsine}{sinh}}
+ \CustomizeMathJax{\DeclareMathOperator{\hypcosine}{cosh}}
+ \CustomizeMathJax{\DeclareMathOperator{\hyptangent}{tanh}}
+ \CustomizeMathJax{\DeclareMathOperator{\hypcotangent}{coth}}
+ \CustomizeMathJax{\DeclareMathOperator{\exponential}{exp}}
+ \CustomizeMathJax{\DeclareMathOperator{\logarithm}{log}}
+ \CustomizeMathJax{\DeclareMathOperator{\naturallogarithm}{\ln}}
+ \CustomizeMathJax{\DeclareMathOperator{\determinant}{det}}
+ \CustomizeMathJax{\DeclareMathOperator{\Probability}{Pr}}
+ \CustomizeMathJax{\newcommand{\sin}[1][{}]{\mathrm{sin}^#1}}
+ \CustomizeMathJax{\newcommand{\sinh}[1][{}]{\mathrm{sinh}^#1}}
+ \CustomizeMathJax{\newcommand{\arcsin}[1][{}]{\mathrm{arcsin}^#1}}
+ \CustomizeMathJax{\newcommand{\asin}[1][{}]{\mathrm{asin}^#1}}
+ \CustomizeMathJax{\newcommand{\cos}[1][{}]{\mathrm{cos}^#1}}
+ \CustomizeMathJax{\newcommand{\cosh}[1][{}]{\mathrm{cosh}^#1}}
+ \CustomizeMathJax{\newcommand{\arccos}[1][{}]{\mathrm{arccos}^#1}}
+ \CustomizeMathJax{\newcommand{\acos}[1][{}]{\mathrm{acos}^#1}}
+ \CustomizeMathJax{\newcommand{\tan}[1][{}]{\mathrm{tan}^#1}}
+ \CustomizeMathJax{\newcommand{\tanh}[1][{}]{\mathrm{tanh}^#1}}
+ \CustomizeMathJax{\newcommand{\arctan}[1][{}]{\mathrm{arctan}^#1}}
+ \CustomizeMathJax{\newcommand{\atan}[1][{}]{\mathrm{atan}^#1}}
+ \CustomizeMathJax{\newcommand{\csc}[1][{}]{\mathrm{csc}^#1}}
+ \CustomizeMathJax{\newcommand{\csch}[1][{}]{\mathrm{csch}^#1}}
+ \CustomizeMathJax{\newcommand{\arccsc}[1][{}]{\mathrm{arccsc}^#1}}
+ \CustomizeMathJax{\newcommand{\acsc}[1][{}]{\mathrm{acsc}^#1}}
+ \CustomizeMathJax{\newcommand{\sec}[1][{}]{\mathrm{sec}^#1}}
+ \CustomizeMathJax{\newcommand{\sech}[1][{}]{\mathrm{sech}^#1}}
+ \CustomizeMathJax{\newcommand{\arcsec}[1][{}]{\mathrm{arcsec}^#1}}
+ \CustomizeMathJax{\newcommand{\asec}[1][{}]{\mathrm{asec}^#1}}
+ \CustomizeMathJax{\newcommand{\cot}[1][{}]{\mathrm{cot}^#1}}
+ \CustomizeMathJax{\newcommand{\coth}[1][{}]{\mathrm{coth}^#1}}
+ \CustomizeMathJax{\newcommand{\arccot}[1][{}]{\mathrm{arccot}^#1}}
+ \CustomizeMathJax{\newcommand{\acot}[1][{}]{\mathrm{acot}^#1}}
+\else
+ \CustomizeMathJax{\DeclareMathOperator{\arccsc}{arccsc}}
+ \CustomizeMathJax{\DeclareMathOperator{\arcsec}{arcsec}}
+ \CustomizeMathJax{\DeclareMathOperator{\arccot}{arccot}}
+ \CustomizeMathJax{\DeclareMathOperator{\asin}{asin}}
+ \CustomizeMathJax{\DeclareMathOperator{\acos}{acos}}
+ \CustomizeMathJax{\DeclareMathOperator{\atan}{atan}}
+ \CustomizeMathJax{\DeclareMathOperator{\acsc}{acsc}}
+ \CustomizeMathJax{\DeclareMathOperator{\asec}{asec}}
+ \CustomizeMathJax{\DeclareMathOperator{\acot}{acot}}
+ \CustomizeMathJax{\DeclareMathOperator{\csch}{csch}}
+ \CustomizeMathJax{\DeclareMathOperator{\sech}{sech}}
+ \CustomizeMathJax{\newcommand{\tr}{\trace}}
+ \CustomizeMathJax{\newcommand{\Tr}{\Trace}}
+ \CustomizeMathJax{\newcommand{\Res}{\Residue}}
+\fi
+
+\CustomizeMathJax{\DeclareMathOperator{\trace}{tr}}
+\CustomizeMathJax{\let\tr\trace}
+\CustomizeMathJax{\DeclareMathOperator{\Trace}{Tr}}
+\CustomizeMathJax{\let\Tr\Trace}
+\CustomizeMathJax{\DeclareMathOperator{\rank}{rank}}
+\CustomizeMathJax{\DeclareMathOperator{\erf}{erf}}
+\CustomizeMathJax{\DeclareMathOperator{\Residue}{Res}}
+\CustomizeMathJax{\newcommand{\principalvalue}{\mathcal{P}}}
+\CustomizeMathJax{\let\pv\principalvalue}
+\CustomizeMathJax{\newcommand{\PV}{\text{P.V.}}}
+\CustomizeMathJax{\newcommand{\real}{\mathcal{R}}}
+\CustomizeMathJax{\newcommand{\imaginary}{\mathcal{I}}}
+
+% must be brace arguments
+\CustomizeMathJax{\newcommand{\Re}[1]{\mathrm{Re}\left\lbrace#1\right\rbrace}}
+\CustomizeMathJax{\newcommand{\Im}[1]{\mathrm{Im}\left\lbrace#1\right\rbrace}}
+
+\CustomizeMathJax{\newcommand{\qqtext}[1]{\quad\mathrm{#1}\quad}}
+\CustomizeMathJax{\let\qq\qqtext}
+\CustomizeMathJax{\newcommand{\qqcomma}{\text{,}\quad}}
+\CustomizeMathJax{\let\qc\qqcomma}
+\CustomizeMathJax{\newcommand{\qcc}{\quad\text{c.c.}\quad}}
+\CustomizeMathJax{\let\qcc}
+\CustomizeMathJax{\newcommand{\qif}{\quad\text{if}\quad}}
+\CustomizeMathJax{\newcommand{\qthen}{\quad\text{then}\quad}}
+\CustomizeMathJax{\newcommand{\qelse}{\quad\text{else}\quad}}
+\CustomizeMathJax{\newcommand{\qotherwise}{\quad\text{otherwise}\quad}}
+\CustomizeMathJax{\newcommand{\qunless}{\quad\text{unless}\quad}}
+\CustomizeMathJax{\newcommand{\qgiven}{\quad\text{given}\quad}}
+\CustomizeMathJax{\newcommand{\qusing}{\quad\text{using}\quad}}
+\CustomizeMathJax{\newcommand{\qassume}{\quad\text{assume}\quad}}
+\CustomizeMathJax{\newcommand{\qsince}{\quad\text{since}\quad}}
+\CustomizeMathJax{\newcommand{\qlet}{\quad\text{let}\quad}}
+\CustomizeMathJax{\newcommand{\qfor}{\quad\text{for}\quad}}
+\CustomizeMathJax{\newcommand{\qall}{\quad\text{all}\quad}}
+\CustomizeMathJax{\newcommand{\qeven}{\quad\text{even}\quad}}
+\CustomizeMathJax{\newcommand{\qodd}{\quad\text{odd}\quad}}
+\CustomizeMathJax{\newcommand{\qinteger}{\quad\text{integer}\quad}}
+\CustomizeMathJax{\newcommand{\qand}{\quad\text{and}\quad}}
+\CustomizeMathJax{\newcommand{\qor}{\quad\text{or}\quad}}
+\CustomizeMathJax{\newcommand{\qas}{\quad\text{as}\quad}}
+\CustomizeMathJax{\newcommand{\qin}{\quad\text{in}\quad}}
+
+\CustomizeMathJax{\newcommand{\differential}[1][]{\text{d}^{#1}}}
+\CustomizeMathJax{\let\dd\differential}
+
+\CustomizeMathJax{\newcommand{\derivative}[3][]{%
+ \frac{\text{d}^{#1}#2}{\text{d}#3^{#1}}}%
+}
+\CustomizeMathJax{\let\dv\derivative}
+
+\CustomizeMathJax{\newcommand{\partialderivative}[3][]{%
+ \frac{\partial^{#1}#2}{\partial#3^{#1}}}%
+}
+\CustomizeMathJax{\let\pderivative\partialderivative}
+\CustomizeMathJax{\let\pdv\partialderivative}
+
+\CustomizeMathJax{\newcommand{\variation}{\delta}}
+\CustomizeMathJax{\let\var\variation}
+
+% Must provide two mandatory args.
+% For the example in the manual with (E-TS), enclose the parens in braces
+\CustomizeMathJax{\newcommand{\functionalderivative}[3][]{%
+ \frac{\delta^{#1}#2}{\delta#3^{#1}}}%
+}
+\CustomizeMathJax{\let\fdv\functionalderivative}
+
+
+% use \braket to contract
+\CustomizeMathJax{\newcommand{\bra}[1]{\langle{#1}\rvert}}
+\CustomizeMathJax{\newcommand{\ket}[1]{\lvert{#1}\rangle}}
+
+% must have two args
+\CustomizeMathJax{\newcommand{\innerproduct}[2]{%
+ \left\langle{#1}\middle\vert{#2}\right\rangle}%
+}
+\CustomizeMathJax{\let\braket\innerproduct}
+\CustomizeMathJax{\let\ip\innerproduct}
+
+% must have two args
+\CustomizeMathJax{\newcommand{\outerproduct}[2]{%
+ \left\lvert{#1}\middle\rangle\!\middle\langle#2\right\rvert}%
+}
+\CustomizeMathJax{\let\dyad\outerproduct}
+\CustomizeMathJax{\let\op\outerproduct}
+
+% must have two args, unlike the MathJax version
+\CustomizeMathJax{\newcommand{\expectationvalue}[2]{%
+ \left\langle{#2}\middle\vert{#1}\middle\vert{#2}\right\rangle}%
+}
+\CustomizeMathJax{\let\expval\expectationvalue}
+\CustomizeMathJax{\let\ev\expectationvalue}
+
+\CustomizeMathJax{\newcommand{\matrixelement}[3]{%
+ \left\langle{#1}\middle\vert{#2}\middle\vert{#3}\right\rangle}%
+}
+\CustomizeMathJax{\let\mel\matrixelement}
+
+\CustomizeMathJax{\newcommand{\matrixquantity}[1]{\begin{matrix}#1\end{matrix}}}
+\CustomizeMathJax{\let\mqty\matrixquantity}
+\CustomizeMathJax{\newcommand{\pmqty}[1]{\begin{pmatrix}#1\end{pmatrix}}}
+\CustomizeMathJax{\newcommand{\Pmqty}[1]{%
+ \left\lgroup\begin{matrix}#1\end{matrix}\right\rgroup}%
+}
+\CustomizeMathJax{\newcommand{\bmqty}[1]{\begin{bmatrix}#1\end{bmatrix}}}
+\CustomizeMathJax{\newcommand{\vmqty}[1]{\begin{vmatrix}#1\end{vmatrix}}}
+
+\CustomizeMathJax{\newcommand{\smallmatrixquantity}[1]{%
+ \begin{smallmatrix}#1\end{smallmatrix}}%
+}
+\CustomizeMathJax{\let\smqty\smallmatrixquantity}
+\CustomizeMathJax{\newcommand{\spmqty}[1]{%
+ \pqty{\begin{smallmatrix}#1\end{smallmatrix}}}%
+}
+\CustomizeMathJax{\newcommand{\sPmqty}[1]{%
+ \left\lgroup\begin{smallmatrix}#1\end{smallmatrix}\right\rgroup}%
+}
+\CustomizeMathJax{\newcommand{\sbmqty}[1]{%
+ \bqty{\begin{smallmatrix}#1\end{smallmatrix}}}%
+}
+\CustomizeMathJax{\newcommand{\svmqty}[1]{%
+ \vqty{\begin{smallmatrix}#1\end{smallmatrix}}}%
+}
+
+\CustomizeMathJax{\let\matrixdeterminant\vmqty}
+\CustomizeMathJax{\let\mdet\vmqty}
+\CustomizeMathJax{\let\smdet\svmqty}
+
+\CustomizeMathJax{\newcommand{\identitymatrix}[1]{(\text{imat}\{#1\})}}
+\CustomizeMathJax{\let\imat\identitymatrix}
+
+\CustomizeMathJax{\newcommand{\xmatrix}[3]{(\text{xmat}\{\}\{#2\}\{#3\})}}
+\CustomizeMathJax{\let\xmat\xmatrix}
+
+\CustomizeMathJax{\newcommand{\zeromatrix}[2]{(\text{zmat}\{#1\}\{#2\})}}
+\CustomizeMathJax{\let\zmat\zeromatrix}
+
+\CustomizeMathJax{\newcommand{\paulimatrix}[1]{(\text{pmat}\{#1\})}}
+\CustomizeMathJax{\let\pmat\paulimatrix}
+
+\CustomizeMathJax{\newcommand{\diagonalmatrix}[2][]{%
+ \left(\text{dmat}\right)}%
+}
+\CustomizeMathJax{\let\dmat\diagonalmatrix}
+
+\CustomizeMathJax{\newcommand{\antidiagonalmatrix}[2][]{%
+ \left(\text{admat}\right)}%
+}
+\CustomizeMathJax{\let\admat\antidiagonalmatrix}
+\end{warpMathJax}
+% \end{macrocode}
+%
+% \iffalse
+%</physics>
+% \fi
+%
+%
+%
+%
+% \iffalse
%<*pifont>
% \fi
%
@@ -62396,25 +64385,82 @@
\__siunitx_number_output_parse:n {#1}
}
{
- \__siunitx_unit_output_pre_print:
% \end{macrocode}
% For |parse-numbers=false|:
% \changes{v0.48}{2018/02/14}{\pkg{siunitx}: Improved \SVG\ math.}
% \changes{v0.50}{2018/02/24}{\pkg{siunitx}: Improved \SVG\ math \attribute{alt} tags.}
+% \changes{v0.79}{2020/01/21}{\pkg{siunitx}: Improved \brand{MathJax}.}
% \begin{macrocode}
+ \__siunitx_unit_output_pre_print:
+ \begingroup% lwarp
+ \boolfalse{mathjax}% lwarp
% \__siunitx_print:nn { number } { \ensuremath {#1} }
- \LWR at subsingledollar{% lwarp
- \textbackslash( \LWR at HTMLsanitize{#1} \textbackslash)% lwarp
- }{siunitx}{%
- \__siunitx_print:nn { number } {%
- \LWR at origensuredmath{#1}%
- }%
- }% lwarp
+ \LWR at subsingledollar{% lwarp
+ \textbackslash( \LWR at HTMLsanitize{#1} \textbackslash)% lwarp
+ }{siunitx}{%
+ \__siunitx_print:nn { number } {%
+ \LWR at origensuredmath{#1}%
+ }%
+ }% lwarp
+ \endgroup% lwarp
+ \__siunitx_unit_output_print:
+ }
+ \group_end:% lwarp
+}
% \end{macrocode}
+%
+% For |parse-numbers=false|:
+% \changes{v0.79}{2020/01/21}{\pkg{siunitx}: Improved \brand{MathJax}.}
% \begin{macrocode}
+\cs_set_protected:Npn \__siunitx_range_numbers_aux:n #1
+ {
+ \bool_if:NTF \l__siunitx_number_parse_bool
+ {
+ \tl_clear:N \l__siunitx_number_out_tl
+ \tl_clear:N \l__siunitx_number_out_saved_tl
+ \bool_set_false:N \l__siunitx_number_compound_bool
+ \__siunitx_number_output_parse:n {#1}
+ \bool_if:NT \l__siunitx_number_compound_bool
+ { \msg_error:nnx { siunitx } { multi-part-range } {#1} }
+ }
+ {
+ \__siunitx_unit_output_pre_print:
+ \begingroup% lwarp
+ \boolfalse{mathjax}% lwarp
+% \__siunitx_print:nn { number } {#1}
+ \LWR at subsingledollar{% lwarp
+ \textbackslash( \LWR at HTMLsanitize{#1} \textbackslash)% lwarp
+ }{siunitx}{%
+ \__siunitx_print:nn { number } {
+ \LWR at origensuredmath{#1}%
+ } % lwarp
+ }% lwarp
+ \endgroup% lwarp
+ \__siunitx_unit_output_print:
+ }
+ }
+% \end{macrocode}
+%
+% For |parse-numbers=false|:
+% \changes{v0.79}{2020/01/21}{\pkg{siunitx}: Improved \brand{MathJax}.}
+% \begin{macrocode}
+\cs_set_protected:Npn \__siunitx_angle_print_direct_aux:nn #1#2 {
+ \tl_if_empty:nF {#1}
+ {
+ \tl_set:Nn \l__siunitx_unit_tl {#2}
+ \begingroup% lwarp
+ \boolfalse{mathjax}% lwarp
+% \__siunitx_print:nn { number } {#1}
+ \LWR at subsingledollar{% lwarp
+ \textbackslash( \LWR at HTMLsanitize{#1} \textbackslash)% lwarp
+ }{siunitx}{%
+ \__siunitx_print:nn { number } {
+ \LWR at origensuredmath{#1}%
+ } % lwarp
+ }% lwarp
+ \endgroup% lwarp
\__siunitx_unit_output_print:
}
- \group_end:% lwarp
}
%
% \end{macrocode}
@@ -62492,7 +64538,13 @@
}
% \end{macrocode}
%
+% \changes{v0.79}{2020/01/20}{\pkg{siunitx}: Fix: \cs{square}, \cs{cubed}.}
% \begin{macrocode}
+\cs_undefine:N \__siunitx_textsuperscript:n
+\cs_new_protected:Npn \__siunitx_textsuperscript:n #1 {\textsuperscript{#1}}
+% \end{macrocode}
+%
+% \begin{macrocode}
\RenewDocumentCommand \num { o m } {
\leavevmode
\group_begin:% lwarp
@@ -62562,6 +64614,241 @@
\ExplSyntaxOff
% \end{macrocode}
+% For \brand{MathJax}.
+% (The following runs much faster as separate \cs{CusomizeMathJax} calls instead
+% of one single call.)
+% \begin{macrocode}
+\begin{warpMathJax}
+\CustomizeMathJax{\newcommand{\ang}[2][]{(\mathrm{#2})\degree}}
+\CustomizeMathJax{\newcommand{\num}[2][]{\mathrm{#2}}}
+\CustomizeMathJax{\newcommand{\si}[2][]{\mathrm{#2}}}
+%
+% \SI[opt]{num}[preunit]{unit}
+\CustomizeMathJax{\newcommand{\LWRSI}[2][]{\mathrm{#1\LWRSInumber\,#2}}}
+\CustomizeMathJax{\newcommand{\SI}[2][]{\def\LWRSInumber{#2}\LWRSI}}
+%
+\CustomizeMathJax{\newcommand{\numlist}[2][]{\mathrm{#2}}}
+\CustomizeMathJax{\newcommand{\numrange}[3][]{\mathrm{#2~-- #3}}}
+\CustomizeMathJax{\newcommand{\SIlist}[3][]{\mathrm{#2\,#3}}}
+\CustomizeMathJax{\newcommand{\SIrange}[4][]{\mathrm{#2\,#4~-- #3\,#4}}}
+\CustomizeMathJax{\newcommand{\tablenum}[2][]{\mathrm{#2}}}
+%
+\CustomizeMathJax{\newcommand{\ampere}{\mathrm{A}}}
+\CustomizeMathJax{\newcommand{\candela}{\mathrm{cd}}}
+\CustomizeMathJax{\newcommand{\kelvin}{\mathrm{K}}}
+\CustomizeMathJax{\newcommand{\kilogram}{\mathrm{kg}}}
+\CustomizeMathJax{\newcommand{\metre}{\mathrm{m}}}
+\CustomizeMathJax{\newcommand{\mole}{\mathrm{mol}}}
+\CustomizeMathJax{\newcommand{\second}{\mathrm{s}}}
+%
+\CustomizeMathJax{\newcommand{\becquerel}{\mathrm{Bq}}}
+\CustomizeMathJax{\newcommand{\degreeCelsius}{\unicode{x2103}}}
+\CustomizeMathJax{\newcommand{\coulomb}{\mathrm{C}}}
+\CustomizeMathJax{\newcommand{\farad}{\mathrm{F}}}
+\CustomizeMathJax{\newcommand{\gray}{\mathrm{Gy}}}
+\CustomizeMathJax{\newcommand{\hertz}{\mathrm{Hz}}}
+\CustomizeMathJax{\newcommand{\henry}{\mathrm{H}}}
+\CustomizeMathJax{\newcommand{\joule}{\mathrm{J}}}
+\CustomizeMathJax{\newcommand{\katal}{\mathrm{kat}}}
+\CustomizeMathJax{\newcommand{\lumen}{\mathrm{lm}}}
+\CustomizeMathJax{\newcommand{\lux}{\mathrm{lx}}}
+\CustomizeMathJax{\newcommand{\newton}{\mathrm{N}}}
+\CustomizeMathJax{\newcommand{\ohm}{\mathrm{\Omega}}}
+\CustomizeMathJax{\newcommand{\pascal}{\mathrm{Pa}}}
+\CustomizeMathJax{\newcommand{\radian}{\mathrm{rad}}}
+\CustomizeMathJax{\newcommand{\siemens}{\mathrm{S}}}
+\CustomizeMathJax{\newcommand{\sievert}{\mathrm{Sv}}}
+\CustomizeMathJax{\newcommand{\steradian}{\mathrm{sr}}}
+\CustomizeMathJax{\newcommand{\tesla}{\mathrm{T}}}
+\CustomizeMathJax{\newcommand{\volt}{\mathrm{V}}}
+\CustomizeMathJax{\newcommand{\watt}{\mathrm{W}}}
+\CustomizeMathJax{\newcommand{\weber}{\mathrm{Wb}}}
+\CustomizeMathJax{\newcommand{\day}{\mathrm{d}}}
+\CustomizeMathJax{\newcommand{\degree}{\mathrm{^\circ}}}
+\CustomizeMathJax{\newcommand{\hectare}{\mathrm{ha}}}
+\CustomizeMathJax{\newcommand{\hour}{\mathrm{h}}}
+\CustomizeMathJax{\newcommand{\litre}{\mathrm{l}}}
+\CustomizeMathJax{\newcommand{\liter}{\mathrm{L}}}
+\CustomizeMathJax{\newcommand{\arcminute}{^\prime}}
+\CustomizeMathJax{\newcommand{\minute}{\mathrm{min}}}
+\CustomizeMathJax{\newcommand{\arcsecond}{^{\prime\prime}}}
+\CustomizeMathJax{\newcommand{\tonne}{\mathrm{t}}}
+\CustomizeMathJax{\newcommand{\astronomicalunit}{au}}
+\CustomizeMathJax{\newcommand{\atomicmassunit}{u}}
+\CustomizeMathJax{\newcommand{\bohr}{\mathit{a}_0}}
+\CustomizeMathJax{\newcommand{\clight}{\mathit{c}_0}}
+\CustomizeMathJax{\newcommand{\dalton}{\mathrm{D}_\mathrm{a}}}
+\CustomizeMathJax{\newcommand{\electronmass}{\mathit{m}_{\mathrm{e}}}}
+\CustomizeMathJax{\newcommand{\electronvolt}{\mathrm{eV}}}
+\CustomizeMathJax{\newcommand{\elementarycharge}{\mathit{e}}}
+\CustomizeMathJax{\newcommand{\hartree}{\mathit{E}_{\mathrm{h}}}}
+\CustomizeMathJax{\newcommand{\planckbar}{\mathit{\unicode{x0127}}}}
+\CustomizeMathJax{\newcommand{\angstrom}{\mathrm{\unicode{x00C5}}}}
+\CustomizeMathJax{\let\LWRorigbar\bar}
+\CustomizeMathJax{\newcommand{\bar}{\mathrm{bar}}}
+\CustomizeMathJax{\newcommand{\barn}{\mathrm{b}}}
+\CustomizeMathJax{\newcommand{\bel}{\mathrm{B}}}
+\CustomizeMathJax{\newcommand{\decibel}{\mathrm{dB}}}
+\CustomizeMathJax{\newcommand{\knot}{\mathrm{kn}}}
+\CustomizeMathJax{\newcommand{\mmHg}{\mathrm{mmHg}}}
+\CustomizeMathJax{\newcommand{\nauticalmile}{\mathrm{M}}}
+\CustomizeMathJax{\newcommand{\neper}{\mathrm{Np}}}
+%
+\CustomizeMathJax{\newcommand{\yocto}{\mathrm{y}}}
+\CustomizeMathJax{\newcommand{\zepto}{\mathrm{z}}}
+\CustomizeMathJax{\newcommand{\atto}{\mathrm{a}}}
+\CustomizeMathJax{\newcommand{\femto}{\mathrm{f}}}
+\CustomizeMathJax{\newcommand{\pico}{\mathrm{p}}}
+\CustomizeMathJax{\newcommand{\nano}{\mathrm{n}}}
+\CustomizeMathJax{\newcommand{\micro}{\mathrm{\unicode{x00B5}}}}
+\CustomizeMathJax{\newcommand{\milli}{\mathrm{m}}}
+\CustomizeMathJax{\newcommand{\centi}{\mathrm{c}}}
+\CustomizeMathJax{\newcommand{\deci}{\mathrm{d}}}
+\CustomizeMathJax{\newcommand{\deca}{\mathrm{da}}}
+\CustomizeMathJax{\newcommand{\hecto}{\mathrm{h}}}
+\CustomizeMathJax{\newcommand{\kilo}{\mathrm{k}}}
+\CustomizeMathJax{\newcommand{\mega}{\mathrm{M}}}
+\CustomizeMathJax{\newcommand{\giga}{\mathrm{G}}}
+\CustomizeMathJax{\newcommand{\tera}{\mathrm{T}}}
+\CustomizeMathJax{\newcommand{\peta}{\mathrm{P}}}
+\CustomizeMathJax{\newcommand{\exa}{\mathrm{E}}}
+\CustomizeMathJax{\newcommand{\zetta}{\mathrm{Z}}}
+\CustomizeMathJax{\newcommand{\yotta}{\mathrm{Y}}}
+%
+\CustomizeMathJax{\newcommand{\percent}{\mathrm{\%}}}
+%
+\CustomizeMathJax{\newcommand{\meter}{\mathrm{m}}}
+\CustomizeMathJax{\newcommand{\metre}{\mathrm{m}}}
+%
+\CustomizeMathJax{\newcommand{\gram}{\mathrm{g}}}
+\CustomizeMathJax{\newcommand{\kg}{\kilo\gram}}
+\CustomizeMathJax{\newcommand{\of}[1]{_{\mathrm{#1}}}}
+\CustomizeMathJax{\newcommand{\squared}{^2}}
+\CustomizeMathJax{\newcommand{\square}[1]{\mathrm{#1}^2}}
+\CustomizeMathJax{\newcommand{\cubed}{^3}}
+\CustomizeMathJax{\newcommand{\cubic}[1]{\mathrm{#1}^3}}
+\CustomizeMathJax{\newcommand{\per}{/}}
+\CustomizeMathJax{\newcommand{\celsius}{\unicode{x2103}}}
+%
+\CustomizeMathJax{\newcommand{\fg}{\femto\gram}}
+\CustomizeMathJax{\newcommand{\pg}{\pico\gram}}
+\CustomizeMathJax{\newcommand{\ng}{\nano\gram}}
+\CustomizeMathJax{\newcommand{\ug}{\micro\gram}}
+\CustomizeMathJax{\newcommand{\mg}{\milli\gram}}
+\CustomizeMathJax{\newcommand{\g}{\gram}}
+\CustomizeMathJax{\newcommand{\kg}{\kilo\gram}}
+%
+\CustomizeMathJax{\newcommand{\amu}{\mathrm{u}}}
+%
+\CustomizeMathJax{\newcommand{\pm}{\pico\metre}}
+\CustomizeMathJax{\newcommand{\nm}{\nano\metre}}
+\CustomizeMathJax{\newcommand{\um}{\micro\metre}}
+\CustomizeMathJax{\newcommand{\mm}{\milli\metre}}
+\CustomizeMathJax{\newcommand{\cm}{\centi\metre}}
+\CustomizeMathJax{\newcommand{\dm}{\deci\metre}}
+\CustomizeMathJax{\newcommand{\m}{\metre}}
+\CustomizeMathJax{\newcommand{\km}{\kilo\metre}}
+%
+\CustomizeMathJax{\newcommand{\as}{\atto\second}}
+\CustomizeMathJax{\newcommand{\fs}{\femto\second}}
+\CustomizeMathJax{\newcommand{\ps}{\pico\second}}
+\CustomizeMathJax{\newcommand{\ns}{\nano\second}}
+\CustomizeMathJax{\newcommand{\us}{\micro\second}}
+\CustomizeMathJax{\newcommand{\ms}{\milli\second}}
+\CustomizeMathJax{\newcommand{\s}{\second}}
+%
+\CustomizeMathJax{\newcommand{\fmol}{\femto\mol}}
+\CustomizeMathJax{\newcommand{\pmol}{\pico\mol}}
+\CustomizeMathJax{\newcommand{\nmol}{\nano\mol}}
+\CustomizeMathJax{\newcommand{\umol}{\micro\mol}}
+\CustomizeMathJax{\newcommand{\mmol}{\milli\mol}}
+\CustomizeMathJax{\newcommand{\mol}{\mol}}
+\CustomizeMathJax{\newcommand{\kmol}{\kilo\mol}}
+%
+\CustomizeMathJax{\newcommand{\pA}{\pico\ampere}}
+\CustomizeMathJax{\newcommand{\nA}{\nano\ampere}}
+\CustomizeMathJax{\newcommand{\uA}{\micro\ampere}}
+\CustomizeMathJax{\newcommand{\mA}{\milli\ampere}}
+\CustomizeMathJax{\newcommand{\A}{\ampere}}
+\CustomizeMathJax{\newcommand{\kA}{\kilo\ampere}}
+%
+\CustomizeMathJax{\newcommand{\ul}{\micro\litre}}
+\CustomizeMathJax{\newcommand{\ml}{\milli\litre}}
+\CustomizeMathJax{\newcommand{\l}{\litre}}
+\CustomizeMathJax{\newcommand{\hl}{\hecto\litre}}
+\CustomizeMathJax{\newcommand{\uL}{\micro\liter}}
+\CustomizeMathJax{\newcommand{\mL}{\milli\liter}}
+\CustomizeMathJax{\newcommand{\L}{\liter}}
+\CustomizeMathJax{\newcommand{\hL}{\hecto\liter}}
+%
+\CustomizeMathJax{\newcommand{\mHz}{\milli\hertz}}
+\CustomizeMathJax{\newcommand{\Hz}{\hertz}}
+\CustomizeMathJax{\newcommand{\kHz}{\kilo\hertz}}
+\CustomizeMathJax{\newcommand{\MHz}{\mega\hertz}}
+\CustomizeMathJax{\newcommand{\GHz}{\giga\hertz}}
+\CustomizeMathJax{\newcommand{\THz}{\tera\hertz}}
+%
+\CustomizeMathJax{\newcommand{\mN}{\milli\newton}}
+\CustomizeMathJax{\newcommand{\N}{\newton}}
+\CustomizeMathJax{\newcommand{\kN}{\kilo\newton}}
+\CustomizeMathJax{\newcommand{\MN}{\mega\newton}}
+%
+\CustomizeMathJax{\newcommand{\Pa}{\pascal}}
+\CustomizeMathJax{\newcommand{\kPa}{\kilo\pascal}}
+\CustomizeMathJax{\newcommand{\MPa}{\mega\pascal}}
+\CustomizeMathJax{\newcommand{\GPa}{\giga\pascal}}
+%
+\CustomizeMathJax{\newcommand{\mohm}{\milli\ohm}}
+\CustomizeMathJax{\newcommand{\kohm}{\kilo\ohm}}
+\CustomizeMathJax{\newcommand{\Mohm}{\mega\ohm}}
+%
+\CustomizeMathJax{\newcommand{\pV}{\pico\volt}}
+\CustomizeMathJax{\newcommand{\nV}{\nano\volt}}
+\CustomizeMathJax{\newcommand{\uV}{\micro\volt}}
+\CustomizeMathJax{\newcommand{\mV}{\milli\volt}}
+\CustomizeMathJax{\newcommand{\V}{\volt}}
+\CustomizeMathJax{\newcommand{\kV}{\kilo\volt}}
+%
+\CustomizeMathJax{\newcommand{\W}{\watt}}
+\CustomizeMathJax{\newcommand{\uW}{\micro\watt}}
+\CustomizeMathJax{\newcommand{\mW}{\milli\watt}}
+\CustomizeMathJax{\newcommand{\kW}{\kilo\watt}}
+\CustomizeMathJax{\newcommand{\MW}{\mega\watt}}
+\CustomizeMathJax{\newcommand{\GW}{\giga\watt}}
+%
+\CustomizeMathJax{\newcommand{\J}{\joule}}
+\CustomizeMathJax{\newcommand{\uJ}{\micro\joule}}
+\CustomizeMathJax{\newcommand{\mJ}{\milli\joule}}
+\CustomizeMathJax{\newcommand{\kJ}{\kilo\joule}}
+%
+\CustomizeMathJax{\newcommand{\eV}{\electronvolt}}
+\CustomizeMathJax{\newcommand{\meV}{\milli\electronvolt}}
+\CustomizeMathJax{\newcommand{\keV}{\kilo\electronvolt}}
+\CustomizeMathJax{\newcommand{\MeV}{\mega\electronvolt}}
+\CustomizeMathJax{\newcommand{\GeV}{\giga\electronvolt}}
+\CustomizeMathJax{\newcommand{\TeV}{\tera\electronvolt}}
+%
+\CustomizeMathJax{\newcommand{\kWh}{\kilo\watt\hour}}
+%
+\CustomizeMathJax{\newcommand{\F}{\farad}}
+\CustomizeMathJax{\newcommand{\fF}{\femto\farad}}
+\CustomizeMathJax{\newcommand{\pF}{\pico\farad}}
+%
+\CustomizeMathJax{\newcommand{\K}{\mathrm{K}}}
+%
+\CustomizeMathJax{\newcommand{\dB}{\mathrm{dB}}}
+%
+\CustomizeMathJax{\newcommand{\kibi}{\mathrm{Ki}}}
+\CustomizeMathJax{\newcommand{\mebi}{\mathrm{Mi}}}
+\CustomizeMathJax{\newcommand{\gibi}{\mathrm{Gi}}}
+\CustomizeMathJax{\newcommand{\tebi}{\mathrm{Ti}}}
+\CustomizeMathJax{\newcommand{\pebi}{\mathrm{Pi}}}
+\CustomizeMathJax{\newcommand{\exbi}{\mathrm{Ei}}}
+\CustomizeMathJax{\newcommand{\zebi}{\mathrm{Zi}}}
+\CustomizeMathJax{\newcommand{\yobi}{\mathrm{Yi}}}
+\end{warpMathJax}
+% \end{macrocode}
+
% \iffalse
%</siunitx>
% \fi
@@ -62609,8 +64896,43 @@
%
%
%
+% \iffalse
+%<*slashed>
+% \fi
%
+% \part{lwarp-slashed.sty}
+%
+% \section{slashed}
+%
+% \credits{David Carlisle}
+%
+% \DescribePackage{slashed}
+% \pkg{slashed} works as-s for \HTML\ \SVG\ math.
+% For \brand{MathJax}, emulation is provided.
+%
+% \changes{v0.79}{2020/01/30}{\pkg{slashed}: Added.}
+%
+% \codehtml
+%
+% \begin{macrocode}
+\LWR at ProvidesPackagePass{slashed}[1997/01/16]
+% \end{macrocode}
+%
+% \begin{macrocode}
+\begin{warpMathJax}
+\CustomizeMathJax{\newcommand{\slashed}[1]{\cancel{#1}}}
+\end{warpMathJax}
+% \end{macrocode}
+%
% \iffalse
+%</slashed>
+% \fi
+%
+%
+%
+%
+%
+% \iffalse
%<*soul>
% \fi
%
@@ -63151,8 +65473,49 @@
%
%
%
+% \iffalse
+%<*steinmetz>
+% \fi
%
+% \part{lwarp-steinmetz.sty}
+%
+% \section{steinmetz}
+%
+% \credits{Enrico Gregorio}
+%
+% \DescribePackage{steinmetz}
+% \pkg{steinmetz} is patched for use by \pkg{lwarp}.
+% Emulation is provided for \brand{MathJax}
+%
+% \changes{v0.79}{2020/01/31}{\pkg{steinmetz}: Added.}
+%
+% \codehtml
+%
+% \begin{macrocode}
+\LWR at ProvidesPackagePass{steinmetz}[2009/06/14]
+% \end{macrocode}
+%
+% \begin{macrocode}
+\begin{warpHTML}
+\renewcommand{\phase}[2][]{%
+ \begin{lateximage}*[steinmetz\{\detokenize{#2}\}]
+ \ensuremath{\underline{/#2}}
+ \end{lateximage}
+}
+\end{warpHTML}
+
+\begin{warpMathJax}
+\CustomizeMathJax{\newcommand{\phase}[2][]{\underline{/#2}}}
+\end{warpMathJax}
+% \end{macrocode}
+%
% \iffalse
+%</steinmetz>
+% \fi
+%
+%
+%
+% \iffalse
%<*stfloats>
% \fi
%
@@ -63754,9 +66117,59 @@
%
%
%
+% \iffalse
+%<*svg>
+% \fi
%
+% \part{lwarp-svg.sty}
%
+% \section{svg}
+%
+% \credits{Philip Ilten, Falk Hanisch}
+%
+% \DescribePackage{svg}
+% \pkg{svg} is patched for use by \pkg{lwarp}.
+%
+% \changes{v0.79}{2020/01/05}{\pkg{svg}: Added.}
+%
+% \codehtml
+%
+% \begin{macrocode}
+\LWR at ProvidesPackagePass{svg}[2019/10/22]
+% \end{macrocode}
+%
+% \begin{macrocode}
+\xpretocmd{\includesvg}%
+ {\begin{lateximage}}%
+ {}%
+ {\LWR at patcherror{svg}{includesvg}}
+
+\xapptocmd{\includesvg}%
+ {\end{lateximage}}%
+ {}%
+ {\LWR at patcherror{svg}{includesvg}}
+
+\xpretocmd{\includeinkscape}%
+ {\begin{lateximage}}%
+ {}%
+ {\LWR at patcherror{svg}{includeinkscape}}
+
+\xapptocmd{\includeinkscape}%
+ {\end{lateximage}}%
+ {}%
+ {\LWR at patcherror{svg}{includeinkscape}}
+% \end{macrocode}
+%
% \iffalse
+%</svg>
+% \fi
+%
+%
+%
+%
+%
+%
+% \iffalse
%<*syntonly>
% \fi
%
@@ -66951,23 +69364,29 @@
% \trouble[Not \XeLaTeX!]{transparent=\pkg{transparent}}
%
% \changes{v0.36}{2017/08/09}{\pkg{transparent}: Added.}
+% \changes{v0.79}{2020/01/05}{\pkg{transparent}: Supports \env{lateximage}s.}
%
% \codehtml
%
% Discard all options for \pkg{lwarp-transparent}:
% \begin{macrocode}
-\LWR at ProvidesPackageDrop{transparent}[2016/05/16]
+\LWR at ProvidesPackagePass{transparent}[2019/11/29]
% \end{macrocode}
%
% \begin{macrocode}
-\newcommand*{\transparent}[1]{\edef\LWR at opacity{#1}}
+\newcommand*{\LWR at HTML@transparent}[1]{\edef\LWR at opacity{#1}}
-\newcommand*{\texttransparent}[2]{%
+\LWR at formatted{transparent}
+
+
+\newcommand*{\LWR at HTML@texttransparent}[2]{%
\begingroup%
\transparent{#1}%
\InlineClass[opacity: #1]{transparent}{#2}%
\endgroup%
}
+
+\LWR at formatted{texttransparent}
% \end{macrocode}
%
% \iffalse
@@ -67513,6 +69932,76 @@
%
%
% \iffalse
+%<*unicode-math>
+% \fi
+%
+% \part{lwarp-unicode-math.sty}
+%
+% \section{unicode-math}
+%
+% \credits{Will Robertson}
+%
+% \DescribePackage{unicode-math}
+% \pkg{unicode-math} is supported as-is for \HTML\ with \SVG math.
+% For \brand{MathJax}, many characters do not seem to be encoded correctly,
+% and so are not read correctly by \prog{pdftotext} for \HTML.
+% Symbol font commands are emulated, but not all combinations are
+% supported by MathJax.
+%
+% \changes{v0.79}{2020/01/30}{\pkg{unicode-math}: Added.}
+%
+% \codehtml
+%
+% \begin{macrocode}
+\LWR at ProvidesPackagePass{unicode-math}[2019/09/26]
+% \end{macrocode}
+%
+% \begin{macrocode}
+\begin{warpHTML}
+% Not all are possible in MathJax.
+\CustomizeMathJax{\let\symnormal\mathrm}
+\CustomizeMathJax{\let\symliteral\mathrm}
+\CustomizeMathJax{\let\symbb\mathbb}
+\CustomizeMathJax{\let\symbbit\mathbb}% not italic
+\CustomizeMathJax{\let\symcal\mathcal}
+\CustomizeMathJax{\let\symscr\mathscr}
+\CustomizeMathJax{\let\symfrak\mathfrak}
+\CustomizeMathJax{\let\symsfup\mathsf}% not up
+\CustomizeMathJax{\let\symsfit\mathit}% not sans
+\CustomizeMathJax{\let\symbfsf\mathbf}% not sans
+\CustomizeMathJax{\let\symbfup\mathbf}% not up
+\CustomizeMathJax{\let\symbfit\mathit}% not bold
+\CustomizeMathJax{\let\symbfcal\mathcal}% not bold
+\CustomizeMathJax{\let\symbfscr\mathscr}% not bold
+\CustomizeMathJax{\let\symbffrak\mathfrak}% not bold
+\CustomizeMathJax{\let\symbfsfup\mathbf}% not sans
+\CustomizeMathJax{\let\symbfsfit\mathit}% not bold nor sans
+% Duplicates below are commented out.
+\CustomizeMathJax{\let\symup\mathrm}
+\CustomizeMathJax{\let\symbf\mathbf}% \symbfup defined above
+\CustomizeMathJax{\let\symit\mathit}
+% \CustomizeMathJax{\let\symbfit\mathit}% not bold
+\CustomizeMathJax{\let\symsf\mathsf}
+% \CustomizeMathJax{\let\symbfsfup\mathbf}% not sans
+% \CustomizeMathJax{\let\symsfit\mathit}% not sans
+% \CustomizeMathJax{\let\symbfsfit\mathit}% not bold nor sans
+\CustomizeMathJax{\let\symtt\mathtt}
+% \CustomizeMathJax{\let\symbb\mathbb}
+% \CustomizeMathJax{\let\symbbit\mathbb}% not italic
+% \CustomizeMathJax{\let\symscr\mathscr}
+% \CustomizeMathJax{\let\symbfscr\mathscr}% not bold
+% \CustomizeMathJax{\let\symfrak\mathfrak}
+\CustomizeMathJax{\let\symbffrac\mathbffrac}
+\end{warpHTML}
+% \end{macrocode}
+%
+% \iffalse
+%</unicode-math>
+% \fi
+%
+%
+%
+% \iffalse
%<*units>
% \fi
%
@@ -67572,8 +70061,10 @@
%
% For Mathjax:
% \begin{macrocode}
+\begin{warpMathJax}
\CustomizeMathJax{\newcommand{\unit}[2][]{#1 #2}}
\CustomizeMathJax{\newcommand{\unitfrac}[3][]{#1 #2/#3}}
+\end{warpMathJax}
% \end{macrocode}
% ^^A For Ka\TeX:
@@ -68277,7 +70768,41 @@
%
%
%
+%
+%
% \iffalse
+%<*widetable>
+% \fi
+%
+% \part{lwarp-widetable.sty}
+%
+% \section{widetable}
+%
+% \credits{Claudio Beccari}
+%
+% \DescribePackage{widetable}
+% \pkg{widetable} is emulated.
+%
+% \changes{v0.79}{2020/01/07}{\pkg{widetable}: Added.}
+%
+% \codehtml
+%
+% \begin{macrocode}
+\LWR at ProvidesPackageDrop{widetable}[2019-06-25]
+% \end{macrocode}
+%
+% \begin{macrocode}
+\newenvironment{widetable}{\begin{tabular*}}{\end{tabular*}}
+% \end{macrocode}
+%
+% \iffalse
+%</widetable>
+% \fi
+%
+%
+%
+%
+% \iffalse
%<*widows-and-orphans>
% \fi
%
@@ -68310,6 +70835,104 @@
%
%
% \iffalse
+%<*witharrows>
+% \fi
+%
+% \part{lwarp-witharrows.sty}
+%
+% \section{witharrows}
+%
+% \credits{F. Pantigny}
+%
+% \DescribePackage{witharrows}
+% \pkg{witharrows} is patched for use by \pkg{lwarp}.
+% Emulation is provided for \brand{MathJax}.
+%
+% \changes{v0.79}{2020/01/31}{\pkg{witharrows}: Added.}
+%
+% \codehtml
+%
+% \begin{macrocode}
+\LWR at ProvidesPackagePass{witharrows}[2019/12/27]
+% \end{macrocode}
+%
+% \begin{macrocode}
+\begin{warpHTML}
+\makeatletter
+\ifbool{mathjax}{
+ % For the hidden print version in the HTML:
+ \newcommand{\Arrow}[2][]{}
+ \newcommand{\unicode}[1]{}
+ \NewDocumentEnvironment { DispWithArrows } { ! d < > ! O { } +b}
+ {
+ \IfValueTF{#1}{
+ \begin{displaymath}
+ #1 \left\lbrace
+ \begin{align}
+ #3
+ \end{align}
+ \right .
+ \end{displaymath}
+ }{
+ \begin{displaymath}
+ \begin{align}
+ #3
+ \end{align}
+ \end{displaymath}
+ }
+ }
+ {}
+ \NewDocumentEnvironment { DispWithArrows* } { ! d < > ! O { } +b}
+ {
+ \IfValueTF{#1}{
+ \begin{displaymath}
+ #1 \left\lbrace
+ \begin{align*}
+ #3
+ \end{align*}
+ \right .
+ \end{displaymath}
+ }{
+ \begin{displaymath}
+ \begin{align*}
+ #3
+ \end{align*}
+ \end{displaymath}
+ }
+ }
+ {}
+}{
+ % If not MathJax, use SVG images.
+ \BeforeBeginEnvironment{WithArrows}{\global\booltrue{LWR at unknownmathsize}}
+ \BeforeBeginEnvironment{DispWithArrows}{%
+ \begin{BlockClass}{displaymathnumbered}%
+ \begin{lateximage}%
+ }
+ \AfterEndEnvironment{DispWithArrows}{\end{lateximage}\end{BlockClass}}
+ \BeforeBeginEnvironment{DispWithArrows*}{%
+ \begin{BlockClass}{displaymath}%
+ \begin{lateximage}%
+ }
+ \AfterEndEnvironment{DispWithArrows*}{\end{lateximage}\end{BlockClass}}
+}
+\makeatother
+\end{warpHTML}
+
+\begin{warpMathJax}
+\CustomizeMathJax{\newenvironment{WithArrows}[1][]{\begin{aligned}}{\end{aligned}}}
+% Unable to make a sized box.
+\CustomizeMathJax{\newcommand{\Arrow}[2][]{&{\Large\unicode{x2938}}~\textit{#2}}}
+\end{warpMathJax}
+% \end{macrocode}
+%
+% \iffalse
+%</witharrows>
+% \fi
+%
+%
+%
+%
+% \iffalse
%<*wrapfig>
% \fi
@@ -68351,7 +70974,7 @@
margin:10pt%
}%
{%
- \LWR at wrapposition%
+ width:\LWR at printlength{\LWR at templengthone}; \LWR at wrapposition; %
}%
{marginblock}%
% \end{macrocode}
@@ -68363,31 +70986,37 @@
\NewDocumentEnvironment{wrapfigure}{o m o m}
{%
+\begin{LWR at setvirtualpage}*%
\LWR at subwrapfigure{#2}{#4}%
\captionsetup{type=figure}%
}
{%
\endLWR at BlockClassWP%
+\end{LWR at setvirtualpage}%
}
\NewDocumentEnvironment{wraptable}{o m o m}
{%
+\begin{LWR at setvirtualpage}*%
\LWR at subwrapfigure{#2}{#4}%
\captionsetup{type=table}%
}
{%
\endLWR at BlockClassWP%
+\end{LWR at setvirtualpage}%
}
\NewDocumentEnvironment{wrapfloat}{m o m o m}
{%
+\begin{LWR at setvirtualpage}*%
\LWR at subwrapfigure{#3}{#5}%
\captionsetup{type=#1}%
}
{%
\endLWR at BlockClassWP%
+\end{LWR at setvirtualpage}%
}
\newlength{\wrapoverhang}
@@ -69048,6 +71677,7 @@
%
% \subsection{Row colors}
% \changes{v0.49}{2018/02/17}{\pkg{xcolor}: Added tabular row colors.}
+% \changes{v0.79}{2020/01/18}{\pkg{xcolor}: Fix: Nested \env{tabular}s.}
%
% \begin{noindmacro}{\rowc at l@rs} \oarg{cmds} \marg{startrow} \marg{odd color} \marg{even color}
% \begin{macrocode}
@@ -69055,8 +71685,8 @@
\def\rowc at l@rs[#1]#2#3#4%
{
-\global\rownum=1
- \global\@rowcolorstrue
+\rownum=1%
+ \@rowcolorstrue%
\@ifxempty{#3}%
{\def\@oddrowcolor{\@norowcolor}}%
{%
@@ -69116,10 +71746,11 @@
%
% \begin{noindmacro}{\@rowc at lors} Executed at the end of each row.
+% \changes{v0.79}{2020/01/18}{\pkg{xcolor}: Fix: Nested \env{tabular}s.}
% \begin{macrocode}
\def\@rowc at lors{%
% \noalign{%
- \global\advance\rownum\@ne%
+ \advance\rownum\@ne%
% }%
\@rowcolors%
}
@@ -69303,6 +71934,14 @@
}
% \end{macrocode}
%
+% For \brand{MathJax}, \pkg{xfakebold} is ignored.
+% \begin{macrocode}
+\begin{warpMathJax}
+\CustomizeMathJax{\newcommand{\setBold}[1][]{}}
+\CustomizeMathJax{\newcommand{\unsetBold}{}}
+\end{warpMathJax}
+% \end{macrocode}
+%
% \iffalse
%</xfakebold>
% \fi
@@ -69503,6 +72142,7 @@
% \pkg{xltabular} is emulated by \pkg{lwarp}.
%
% \changes{v0.57}{2018/05/25}{\pkg{xltabular}: Added.}
+% \changes{v0.79}{2020/01/18}{\pkg{xltabular}: Fix: Require \pkg{ltablex}.}
%
% \codehtml
%
@@ -69519,6 +72159,7 @@
%
% \begin{macrocode}
\RequirePackage{tabularx}
+\RequirePackage{ltablex}
\LWR at ProvidesPackageDrop{xltabular}[2018/05/23]
@@ -69996,11 +72637,14 @@
% \pkg{xurl} is ignored.
%
% \changes{v0.47}{2018/01/25}{\pkg{xurl}: Added.}
+% \changes{v0.79}{2020/01/16}{\pkg{xurl}: Updated to v0.08.}
%
% \codehtml
%
% \begin{macrocode}
-\LWR at ProvidesPackageDrop{xurl}[2018/06/02]
+\LWR at ProvidesPackageDrop{xurl}[2020/01/14]
+
+\def\useOriginalUrlSetting{}
% \end{macrocode}
%
% \iffalse
@@ -70288,9 +72932,9 @@
% The \cs{minisec} is placed inside a \element{div} of class \attribute{minisec}.
% \begin{macrocode}
\renewcommand*{\minisec}[1]{
-\begin{BlockClass}{minisec}
-#1
-\end{BlockClass}
+ \begin{BlockClass}{minisec}
+ #1
+ \end{BlockClass}
}
% \end{macrocode}
%
@@ -70298,13 +72942,13 @@
% \begin{macrocode}
\@ifundefined{setpartpreamble}{}{
\RenewDocumentCommand{\setpartpreamble}{o o +m}{%
-\renewcommand{\part at preamble}{#3}%
+ \renewcommand{\part at preamble}{#3}%
}
}
\@ifundefined{setchapterpreamble}{}{
\RenewDocumentCommand{\setchapterpreamble}{o o +m}{%
-\renewcommand{\chapter at preamble}{#3}%
+ \renewcommand{\chapter at preamble}{#3}%
}
}
% \end{macrocode}
@@ -70323,17 +72967,17 @@
\RenewDocumentEnvironment{captionbeside}{o m o o o s}
{}
{%
-\IfValueTF{#1}%
-{\caption[#1]{#2}}%
-{\caption{#2}}%
+ \IfValueTF{#1}%
+ {\caption[#1]{#2}}%
+ {\caption{#2}}%
}
\RenewDocumentEnvironment{captionofbeside}{m o m o o o s}
{}
{%
-\IfValueTF{#2}%
-{\captionof{#1}[#2]{#3}}%
-{\captionof{#1}{#3}}%
+ \IfValueTF{#2}%
+ {\captionof{#1}[#2]{#3}}%
+ {\captionof{#1}{#3}}%
}
\RenewDocumentCommand{\setcapindent}{s m}{}
@@ -70415,9 +73059,25 @@
\RequirePackage{lwarp-parskip}
\RequirePackage{lwarp-setspace}% req'd
\RequirePackage{lwarp-showidx}
-\RequirePackage{lwarp-subfigure}% red'q
+% \end{macrocode}
+
+% Avoids a conflict with \pkg{memoir}:
+% \changes{v0.79}{2020/01/06}{\pkg{subcaption}: Fix with \pkg{memoir}.}
+% \begin{macrocode}
+\AtBeginDocument{%
+ \@ifpackageloaded{subcaption}{}{
+ \RequirePackage{lwarp-subfigure}
+ \let\subfigure\subbottom
+ \let\subtable\subtop
+ }%
+}%
+% \end{macrocode}
+%
+% ^^A Not sure why this is here:
+% \begin{macrocode}
\makeindex
% \end{macrocode}
+%
% \pkg{subfigure} is emulated via \pkg{subfig}, which pre-defines
% |subfigure| and |subtable|, but \pkg{memoir} does not, so
% they must be tested for here:
@@ -70641,11 +73301,12 @@
\newcommand{\titlingpageend}[2]{}
\let\andnext\and
\renewcommand*{\thanksmarkstyle}[1]{}
+
\renewcommand{\thanksfootmark}{%
-\thanksscript{\tamark}%
+ \thanksscript{\tamark}%
}
-% \newlength{\thanksmarksep}
+% \newlength{\thanksmarksep}% already provided by memoir
% \end{macrocode}
%
% \subsection{Abstracts}
@@ -70690,7 +73351,7 @@
}
\DeclareDocumentCommand{\frontmatter}{s}{%
-\boolfalse{LWR at mainmatter}%
+ \boolfalse{LWR at mainmatter}%
}
% \end{macrocode}
%
@@ -70812,17 +73473,17 @@
\RenewDocumentCommand{\plainbreak}{s m}{\begin{center}~\end{center}}
\RenewDocumentCommand{\fancybreak}{s +m}{%
-\begin{center}#2\end{center}%
+ \begin{center}#2\end{center}%
}
\RenewDocumentCommand{\plainfancybreak}{s m m +m}{%
-\begin{center}#4\end{center}%
+ \begin{center}#4\end{center}%
}
\RenewDocumentCommand{\pfbreak}{s}{%
-\begin{center}
-\pfbreakdisplay
-\end{center}
+ \begin{center}
+ \pfbreakdisplay
+ \end{center}
}
% \newlength{\pfbreakskip}
@@ -70913,13 +73574,14 @@
\renewcommand*{\leftcenterright}{}
\renewcommand{\leftspringright}[4]{%
-\begin{minipage}{#1\linewidth}#3\end{minipage}\qquad%
-\begin{minipage}{#2\linewidth}\begin{flushright}#4\end{flushright}\end{minipage}%
+ \begin{minipage}{#1\linewidth}#3\end{minipage}\qquad%
+ \begin{minipage}{#2\linewidth}\begin{flushright}#4\end{flushright}\end{minipage}%
}
\renewenvironment*{blockdescription}
{\LWR at descriptionstart\LWR at origdescription}
{\enddescription}
+
\renewcommand*{\blockdescriptionlabel}[1]{\textbf{#1}}
\renewenvironment*{labelled}[1]{\begin{description}}{\end{description}}
\renewenvironment*{flexlabelled}[6]{\begin{description}}{\end{description}}
@@ -71190,9 +73852,9 @@
% \marg{3: ext} \marg{4: capname}
% \begin{macrocode}
\RenewDocumentCommand{\newfloat}{o m m m}{%
-\IfValueTF{#1}%
-{\DeclareFloatingEnvironment[fileext=#3,within=#1,name={#4}]{#2}}%
-{\DeclareFloatingEnvironment[fileext=#3,name={#4}]{#2}}%
+ \IfValueTF{#1}%
+ {\DeclareFloatingEnvironment[fileext=#3,within=#1,name={#4}]{#2}}%
+ {\DeclareFloatingEnvironment[fileext=#3,name={#4}]{#2}}%
% \end{macrocode}
% \pkg{newfloat} package automatically creates the \cs{listof} command
% for new floats, but \pkg{float} does not,
@@ -71199,8 +73861,8 @@
% so remove \cs{listof} here in case it is manually created later.
% ^^A *8* keep the following?
% \begin{macrocode}
-\cslet{listof#2s}\relax%
-\cslet{listof#2es}\relax%
+ \cslet{listof#2s}\relax%
+ \cslet{listof#2es}\relax%
}
% \end{macrocode}
% \end{noindmacro}
@@ -71213,23 +73875,23 @@
% \begin{macrocode}
\RenewDocumentCommand{\newlistof}{o m m m}
{%
-\IfValueTF{#1}
-{\newlistentry[#1]{#2}{#3}{0}}
-{\newlistentry{#2}{#3}{0}}
-\@namedef{ext@#2}{#3}%
-\@ifundefined{c@#3depth}{\newcounter{#3depth}}{}%
-\setcounter{#3depth}{1}%
-\@namedef{#3mark}{}%
-\@namedef{#2}{\listof{#2}{#4}}
-\@namedef{@cftmake#3title}{}
-\@ifundefined{cftbefore#3titleskip}{
- \expandafter\newlength\csname cftbefore#3titleskip\endcsname
- \expandafter\newlength\csname cftafter#3titleskip\endcsname
-}{}
-\@namedef{cft#3titlefont}{}
-\@namedef{cftafter#3title}{}
-\@namedef{cft#3prehook}{}
-\@namedef{cft#3posthook}{}
+ \IfValueTF{#1}%
+ {\newlistentry[#1]{#2}{#3}{0}}%
+ {\newlistentry{#2}{#3}{0}}%
+ \@namedef{ext@#2}{#3}%
+ \@ifundefined{c@#3depth}{\newcounter{#3depth}}{}%
+ \setcounter{#3depth}{1}%
+ \@namedef{#3mark}{}%
+ \@namedef{#2}{\listof{#2}{#4}}%
+ \@namedef{@cftmake#3title}{}%
+ \@ifundefined{cftbefore#3titleskip}{%
+ \expandafter\newlength\csname cftbefore#3titleskip\endcsname%
+ \expandafter\newlength\csname cftafter#3titleskip\endcsname%
+ }{}%
+ \@namedef{cft#3titlefont}{}%
+ \@namedef{cftafter#3title}{}%
+ \@namedef{cft#3prehook}{}%
+ \@namedef{cft#3posthook}{}%
}
% \end{macrocode}
% \end{noindmacro}
@@ -71243,11 +73905,11 @@
% \begin{macrocode}
\NewDocumentEnvironment{KFLTmemoir at marginfloat}{O{-1.2ex} m}
{% start
-\LWR at BlockClassWP{float:right; width:2in; margin:10pt}{}{marginblock}%
-\captionsetup{type=#2}%
+ \LWR at BlockClassWP{float:right; width:2in; margin:10pt}{}{marginblock}%
+ \captionsetup{type=#2}%
}
{%
-\endLWR at BlockClassWP%
+ \endLWR at BlockClassWP%
}
\DeclareDocumentEnvironment{marginfigure}{o}
@@ -71279,7 +73941,7 @@
\renewcommand{\subcaption}[2][]{%
-\ifblank{#1}{\subfloat[#2]{}}{\subfloat[#1][#2]{}}%
+ \ifblank{#1}{\subfloat[#2]{}}{\subfloat[#1][#2]{}}%
}
\renewcommand{\contsubcaption}{\ContinuedFloat\subcaption}
@@ -71300,9 +73962,9 @@
\RenewDocumentEnvironment{sidecaption}{o m o}
{}
-{
-\IfValueTF{#1}{\caption[#1]{#2}}{\caption{#2}}%
-\IfValueT{#3}{\label{#3}}%
+{%
+ \IfValueTF{#1}{\caption[#1]{#2}}{\caption{#2}}%
+ \IfValueT{#3}{\label{#3}}%
}
% \newlength{\sidecapwidth}
@@ -71316,26 +73978,26 @@
\RenewDocumentEnvironment{sidecontcaption}{m o}
{}
{%
-\ContinuedFloat%
-\caption{#1}%
+ \ContinuedFloat%
+ \caption{#1}%
% \end{macrocode}
% Without \cs{@captype}, the section is referred to instead.
% \begin{macrocode}
-\IfValueT{#2}{\label[\@captype]{#2}}%
+ \IfValueT{#2}{\label[\@captype]{#2}}%
}
% \end{macrocode}
% \cs{sidenamedlegend} does not appear to use the \TOC\ argument.
% \begin{macrocode}
\renewenvironment{sidenamedlegend}[2][]{
-\begin{center}
-\@nameuse{\@captype name}\CaptionSeparator#2
-\end{center}
+ \begin{center}
+ \@nameuse{\@captype name}\CaptionSeparator#2
+ \end{center}
}
{}
\renewenvironment{sidelegend}[1]
{\begin{center}
-#1
+ #1
}
{\end{center}}
@@ -71349,11 +74011,11 @@
\LetLtxMacro\endctabular\endtabular
\renewcommand{\autorows}[5][]{%
-#5
+ #5%
}
\renewcommand{\autocols}[5][]{%
-#5
+ #5%
}
% \end{macrocode}
%
@@ -71364,10 +74026,10 @@
\renewcommand*{\feetbelowfloat}{}
\renewcommand*{\feetatbottom}{}
-\renewcommand*{\verbfootnote}[2][]{
-\PackageError{lwarp,memoir}
-{Verbatim footnotes are not yet supported by lwarp.}
-{This may be improved some day.}
+\renewcommand*{\verbfootnote}[2][]{%
+ \PackageError{lwarp,memoir}%
+ {Verbatim footnotes are not yet supported by lwarp.}%
+ {This may be improved some day.}%
}
\renewcommand*{\plainfootnotes}{}
@@ -71376,10 +74038,10 @@
\renewcommand*{\paragraphfootnotes}{}
\renewcommand*{\footfudgefiddle}{}
-\renewcommand*{\newfootnoteseries}[1]{
-\PackageError{lwarp,memoir}
-{Memoir footnote series are not yet supported by lwarp.}
-{This may be improved some day.}
+\renewcommand*{\newfootnoteseries}[1]{%
+ \PackageError{lwarp,memoir}%
+ {Memoir footnote series are not yet supported by lwarp.}%
+ {This may be improved some day.}%
}
\renewcommand*{\plainfootstyle}[1]{}
@@ -71467,9 +74129,9 @@
% \renewcommand*{\linenumberfont}[1]{}
\DeclareDocumentCommand{\PoemTitle}{s o o m}{%
-\IfValueTF{#2}%
-{\poemtitle[#2]{#4}}%
-{\poemtitle{#4}}%
+ \IfValueTF{#2}%
+ {\poemtitle[#2]{#4}}%
+ {\poemtitle{#4}}%
}
\renewcommand*{\NumberPoemTitle}{}
@@ -71710,12 +74372,12 @@
\renewcommand{\postcaption}[1]{}
\renewcommand{\midbicaption}[1]{}
\renewcommand{\contcaption}[1]{%
-% \ContinuedFloat%
-% \caption{#1}%
-\begin{LWR at figcaption}% later becomes \caption*
-\LWR at isolate{\@nameuse{\@captype name}}~%
-\thechapter.\the\value{\@captype}\CaptionSeparator\LWR at isolate{#1}%
-\end{LWR at figcaption}
+% \ContinuedFloat%
+% \caption{#1}%
+ \begin{LWR at figcaption}% later becomes \caption*
+ \LWR at isolate{\@nameuse{\@captype name}}~%
+ \thechapter.\the\value{\@captype}\CaptionSeparator\LWR at isolate{#1}%
+ \end{LWR at figcaption}%
}
% \end{macrocode}
@@ -71731,11 +74393,11 @@
% \begin{macrocode}
\renewcommand{\legend}[1]{\begin{center}#1\\\end{center}}
-\renewcommand{\namedlegend}[2][]{
-\begin{center}
-\@nameuse{fleg\@captype}\CaptionSeparator#2\\
-\end{center}
-\@nameuse{flegtoc\@captype}{#1}
+\renewcommand{\namedlegend}[2][]{%
+ \begin{center}
+ \@nameuse{fleg\@captype}\CaptionSeparator#2\\
+ \end{center}
+ \@nameuse{flegtoc\@captype}{#1}
}
\renewcommand{\newfixedcaption}[3][\caption]{%
@@ -71746,31 +74408,32 @@
\providecommand{#2}{\def\@captype{#3}#1}}
\renewcommand{\bitwonumcaption}[6][]{%
-\ifblank{#2}{\caption{#3}}{\caption[#2]{#3}}%
-\addtocounter{\@captype}{-1}%
-\begingroup%
-\csdef{\@captype name}{#4}%
-\ifblank{#5}{\caption{#6}}{\caption[#5]{#6}}%
-\endgroup%
-\ifblank{#1}{}{\label{#1}}%
+ \ifblank{#2}{\caption{#3}}{\caption[#2]{#3}}%
+ \addtocounter{\@captype}{-1}%
+ \begingroup%
+ \csdef{\@captype name}{#4}%
+ \ifblank{#5}{\caption{#6}}{\caption[#5]{#6}}%
+ \endgroup%
+ \ifblank{#1}{}{\label{#1}}%
}
\LetLtxMacro\bionenumcaption\bitwonumcaption% todo
\renewcommand{\bicaption}[5][]{%
-\ifblank{#2}{\caption{#3}}{\caption[#2]{#3}}%
-\begin{LWR at figcaption}% later becomes \caption*
-\LWR at isolate{#4} \thechapter.\the\value{\@captype}\CaptionSeparator\LWR at isolate{#5}%
-\end{LWR at figcaption}
-\ifblank{#1}{}{\label{#1}}%
+ \ifblank{#2}{\caption{#3}}{\caption[#2]{#3}}%
+ \begin{LWR at figcaption}% later becomes \caption*
+ \LWR at isolate{#4} % space
+ \thechapter.\the\value{\@captype}\CaptionSeparator\LWR at isolate{#5}%
+ \end{LWR at figcaption}%
+ \ifblank{#1}{}{\label{#1}}%
}
\renewcommand{\bicontcaption}[3]{%
-\contcaption{#1}%
-\begingroup%
-\csdef{\@captype name}{#2}%
-\contcaption{#3}%
-\endgroup%
+ \contcaption{#1}%
+ \begingroup%
+ \csdef{\@captype name}{#2}%
+ \contcaption{#3}%
+ \endgroup%
}
% \end{macrocode}
% ^^A *8* todo:
@@ -71781,26 +74444,25 @@
% \LetLtxMacro\longbicaption\bicaption%
\RenewDocumentCommand{\subtop}{O{} O{} m}{%
-\subfloat[#1][#2]{#3}%
+ \subfloat[#1][#2]{#3}%
}
\RenewDocumentCommand{\subbottom}{O{} O{} m}{%
-\subfloat[#1][#2]{#3}%
+ \subfloat[#1][#2]{#3}%
}
\renewcommand{\contsubtop}{%
-\ContinuedFloat\addtocounter{\@captype}{1}%
-\subtop}
+ \ContinuedFloat\addtocounter{\@captype}{1}%
+ \subtop%
+}
\renewcommand{\contsubbottom}{%
-\ContinuedFloat\addtocounter{\@captype}{1}%
-\subbottom}
+ \ContinuedFloat\addtocounter{\@captype}{1}%
+ \subbottom%
+}
\renewcommand{\subconcluded}{}
-\let\subfigure\subbottom
-\let\subtable\subtop
-
\let\contsubtable\contsubtop
\let\contsubfigure\contsubbottom
% \end{macrocode}
Modified: trunk/Master/texmf-dist/source/latex/lwarp/lwarp.ins
===================================================================
--- trunk/Master/texmf-dist/source/latex/lwarp/lwarp.ins 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/source/latex/lwarp/lwarp.ins 2020-02-01 22:15:59 UTC (rev 53632)
@@ -20,7 +20,7 @@
%% \usedir{tex/latex/ package }
\preamble
This is a generated file.
-Copyright 2016-2019 Brian Dunn
+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
@@ -65,6 +65,7 @@
\file{lwarp-attachfile2.sty}{\from{lwarp.dtx}{attachfile2}}
\file{lwarp-authblk.sty}{\from{lwarp.dtx}{authblk}}
\file{lwarp-autonum.sty}{\from{lwarp.dtx}{autonum}}
+\file{lwarp-awesomebox.sty}{\from{lwarp.dtx}{awesomebox}}
\file{lwarp-axessibility.sty}{\from{lwarp.dtx}{axessibility}}
\file{lwarp-axodraw2.sty}{\from{lwarp.dtx}{axodraw2}}
\file{lwarp-backnaur.sty}{\from{lwarp.dtx}{backnaur}}
@@ -78,6 +79,7 @@
\file{lwarp-bigstrut.sty}{\from{lwarp.dtx}{bigstrut}}
\file{lwarp-bitpattern.sty}{\from{lwarp.dtx}{bitpattern}}
\file{lwarp-blowup.sty}{\from{lwarp.dtx}{blowup}}
+\file{lwarp-bm.sty}{\from{lwarp.dtx}{bm}}
\file{lwarp-booklet.sty}{\from{lwarp.dtx}{booklet}}
\file{lwarp-bookmark.sty}{\from{lwarp.dtx}{bookmark}}
\file{lwarp-booktabs.sty}{\from{lwarp.dtx}{booktabs}}
@@ -84,6 +86,7 @@
\file{lwarp-bophook.sty}{\from{lwarp.dtx}{bophook}}
\file{lwarp-bounddvi.sty}{\from{lwarp.dtx}{bounddvi}}
\file{lwarp-boxedminipage2e.sty}{\from{lwarp.dtx}{boxedminipage2e}}
+\file{lwarp-braket.sty}{\from{lwarp.dtx}{braket}}
\file{lwarp-breakurl.sty}{\from{lwarp.dtx}{breakurl}}
\file{lwarp-breqn.sty}{\from{lwarp.dtx}{breqn}}
\file{lwarp-bsheaders.sty}{\from{lwarp.dtx}{bsheaders}}
@@ -298,9 +301,16 @@
\file{lwarp-pagenote.sty}{\from{lwarp.dtx}{pagenote}}
\file{lwarp-pagesel.sty}{\from{lwarp.dtx}{pagesel}}
\file{lwarp-paralist.sty}{\from{lwarp.dtx}{paralist}}
+\file{lwarp-parallel.sty}{\from{lwarp.dtx}{parallel}}
+\file{lwarp-parcolumns.sty}{\from{lwarp.dtx}{parcolumns}}
\file{lwarp-parnotes.sty}{\from{lwarp.dtx}{parnotes}}
\file{lwarp-parskip.sty}{\from{lwarp.dtx}{parskip}}
\file{lwarp-pbox.sty}{\from{lwarp.dtx}{pbox}}
+\file{lwarp-pdfcol.sty}{\from{lwarp.dtx}{pdfcol}}
+\file{lwarp-pdfcolfoot.sty}{\from{lwarp.dtx}{pdfcolfoot}}
+\file{lwarp-pdfcolmk.sty}{\from{lwarp.dtx}{pdfcolmk}}
+\file{lwarp-pdfcolparallel.sty}{\from{lwarp.dtx}{pdfcolparallel}}
+\file{lwarp-pdfcolparcolumns.sty}{\from{lwarp.dtx}{pdfcolparcolumns}}
\file{lwarp-pdfcomment.sty}{\from{lwarp.dtx}{pdfcomment}}
\file{lwarp-pdfcrypt.sty}{\from{lwarp.dtx}{pdfcrypt}}
\file{lwarp-pdflscape.sty}{\from{lwarp.dtx}{pdflscape}}
@@ -314,6 +324,7 @@
\file{lwarp-perpage.sty}{\from{lwarp.dtx}{perpage}}
\file{lwarp-pfnote.sty}{\from{lwarp.dtx}{pfnote}}
\file{lwarp-phfqit.sty}{\from{lwarp.dtx}{phfqit}}
+\file{lwarp-physics.sty}{\from{lwarp.dtx}{physics}}
\file{lwarp-pifont.sty}{\from{lwarp.dtx}{pifont}}
\file{lwarp-placeins.sty}{\from{lwarp.dtx}{placeins}}
\file{lwarp-plarydshln.sty}{\from{lwarp.dtx}{plarydshln}}
@@ -371,6 +382,7 @@
\file{lwarp-SIunits.sty}{\from{lwarp.dtx}{SIunits}}
\file{lwarp-siunitx.sty}{\from{lwarp.dtx}{siunitx}}
\file{lwarp-slantsc.sty}{\from{lwarp.dtx}{slantsc}}
+\file{lwarp-slashed.sty}{\from{lwarp.dtx}{slashed}}
\file{lwarp-soul.sty}{\from{lwarp.dtx}{soul}}
\file{lwarp-soulpos.sty}{\from{lwarp.dtx}{soulpos}}
\file{lwarp-soulutf8.sty}{\from{lwarp.dtx}{soulutf8}}
@@ -379,6 +391,7 @@
\file{lwarp-srctex.sty}{\from{lwarp.dtx}{srctex}}
\file{lwarp-stabular.sty}{\from{lwarp.dtx}{stabular}}
\file{lwarp-stackengine.sty}{\from{lwarp.dtx}{stackengine}}
+\file{lwarp-steinmetz.sty}{\from{lwarp.dtx}{steinmetz}}
\file{lwarp-stfloats.sty}{\from{lwarp.dtx}{stfloats}}
\file{lwarp-struktex.sty}{\from{lwarp.dtx}{struktex}}
\file{lwarp-subcaption.sty}{\from{lwarp.dtx}{subcaption}}
@@ -385,6 +398,7 @@
\file{lwarp-subfig.sty}{\from{lwarp.dtx}{subfig}}
\file{lwarp-subfigure.sty}{\from{lwarp.dtx}{subfigure}}
\file{lwarp-supertabular.sty}{\from{lwarp.dtx}{supertabular}}
+\file{lwarp-svg.sty}{\from{lwarp.dtx}{svg}}
\file{lwarp-syntonly.sty}{\from{lwarp.dtx}{syntonly}}
\file{lwarp-tabfigures.sty}{\from{lwarp.dtx}{tabfigures}}
\file{lwarp-tablefootnote.sty}{\from{lwarp.dtx}{tablefootnote}}
@@ -430,6 +444,7 @@
\file{lwarp-ulem.sty}{\from{lwarp.dtx}{ulem}}
\file{lwarp-umoline.sty}{\from{lwarp.dtx}{umoline}}
\file{lwarp-underscore.sty}{\from{lwarp.dtx}{underscore}}
+\file{lwarp-unicode-math.sty}{\from{lwarp.dtx}{unicode-math}}
\file{lwarp-units.sty}{\from{lwarp.dtx}{units}}
\file{lwarp-unitsdef.sty}{\from{lwarp.dtx}{unitsdef}}
\file{lwarp-upref.sty}{\from{lwarp.dtx}{upref}}
@@ -444,7 +459,9 @@
\file{lwarp-vwcol.sty}{\from{lwarp.dtx}{vwcol}}
\file{lwarp-wallpaper.sty}{\from{lwarp.dtx}{wallpaper}}
\file{lwarp-watermark.sty}{\from{lwarp.dtx}{watermark}}
+\file{lwarp-widetable.sty}{\from{lwarp.dtx}{widetable}}
\file{lwarp-widows-and-orphans.sty}{\from{lwarp.dtx}{widows-and-orphans}}
+\file{lwarp-witharrows.sty}{\from{lwarp.dtx}{witharrows}}
\file{lwarp-wrapfig.sty}{\from{lwarp.dtx}{wrapfig}}
\file{lwarp-xbmks.sty}{\from{lwarp.dtx}{xbmks}}
\file{lwarp-xcolor.sty}{\from{lwarp.dtx}{xcolor}}
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-2in1.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-2in1.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-2in1.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `2in1')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-2up.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-2up.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-2up.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `2up')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-CJK.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-CJK.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-CJK.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `CJK')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-CJKutf8.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-CJKutf8.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-CJKutf8.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `CJKutf8')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-SIunits.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-SIunits.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-SIunits.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `SIunits')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-a4.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-a4.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-a4.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `a4')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-a4wide.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-a4wide.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-a4wide.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `a4wide')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-a5comb.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-a5comb.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-a5comb.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `a5comb')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-abstract.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-abstract.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-abstract.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `abstract')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-academicons.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-academicons.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-academicons.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `academicons')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-accessibility.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-accessibility.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-accessibility.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `accessibility')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-accsupp.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-accsupp.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-accsupp.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `accsupp')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-acro.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-acro.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-acro.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `acro')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-acronym.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-acronym.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-acronym.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `acronym')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-addlines.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-addlines.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-addlines.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `addlines')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-adjmulticol.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-adjmulticol.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-adjmulticol.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `adjmulticol')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-afterpage.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-afterpage.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-afterpage.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `afterpage')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-algorithm2e.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-algorithm2e.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-algorithm2e.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `algorithm2e')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-algorithmicx.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-algorithmicx.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-algorithmicx.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `algorithmicx')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-alltt.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-alltt.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-alltt.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `alltt')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-amsmath.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-amsmath.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-amsmath.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `amsmath')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
@@ -35,6 +35,8 @@
}
}% not mathjax
+\newcounter{LWR at amsmathdepth}
+\setcounter{LWR at amsmathdepth}{0}
\newcommand*{\LWR at amsmathenv@@before}[1]{%
\begin{BlockClass}{displaymathnumbered}
\LWR at newautoidanchor%
@@ -43,31 +45,37 @@
\LWR at applyxfakebold%
}
\newcommand*{\LWR at amsmathenv@before}[1]{%
- \LWR at stoppars%
- \ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }%
- {
- \LWR at syncmathjax
- \boolfalse{LWR at amsmultline}
- \ifstrequal{#1}{multline}{\booltrue{LWR at amsmultline}}{}
- \ifstrequal{#1}{multline*}{\booltrue{LWR at amsmultline}}{}
- \LWR at beginhideamsmath
- }
- {
- \LWR at amsmathenv@@before{#1}
- }
+ \ifnumequal{\value{LWR at amsmathdepth}}{0}{%
+ \LWR at stoppars%
+ \ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }%
+ {
+ \LWR at syncmathjax
+ \boolfalse{LWR at amsmultline}
+ \ifstrequal{#1}{multline}{\booltrue{LWR at amsmultline}}{}
+ \ifstrequal{#1}{multline*}{\booltrue{LWR at amsmultline}}{}
+ \LWR at beginhideamsmath
+ }
+ {
+ \LWR at amsmathenv@@before{#1}
+ }
+ }{}
+ \addtocounter{LWR at amsmathdepth}{1}
}
\newcommand*{\LWR at amsmathenv@@after}{%
\end{lateximage}\end{BlockClass}\LWR at startpars%
}
\newcommand*{\LWR at amsmathenv@after}[1]{%
- \ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }%
- {
- \LWR at endhideamsmath
- \boolfalse{LWR at amsmultline}
- \LWR at addmathjax{#1}{\the\@envbody}
- }
- {\LWR at amsmathenv@@after}
-\gdef\LWR at ThisAltText{}%
+ \ifnumequal{\value{LWR at amsmathdepth}}{1}{%
+ \ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }%
+ {
+ \LWR at endhideamsmath
+ \boolfalse{LWR at amsmultline}
+ \LWR at addmathjax{#1}{\the\@envbody}
+ }
+ {\LWR at amsmathenv@@after}
+ \gdef\LWR at ThisAltText{}%
+ }{}
+ \addtocounter{LWR at amsmathdepth}{-1}
}
\BeforeBeginEnvironment{multline}{\LWR at amsmathenv@before{multline}}
@@ -109,6 +117,9 @@
\BeforeBeginEnvironment{alignat*}{\LWR at amsmathenv@before{alignat*}}
\AfterEndEnvironment{alignat*}{\LWR at amsmathenv@after{alignat*}}
+\begin{warpMathJax}
+\CustomizeMathJax{\newcommand{\intertext}[1]{\\ \text{#1}\notag \\}}
+\end{warpMathJax}
\endinput
%%
%% End of file `lwarp-amsmath.sty'.
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-amsthm.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-amsthm.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-amsthm.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `amsthm')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-anonchap.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-anonchap.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-anonchap.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `anonchap')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-anysize.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-anysize.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-anysize.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `anysize')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-appendix.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-appendix.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-appendix.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `appendix')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-ar.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-ar.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-ar.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `ar')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
@@ -55,6 +55,10 @@
\end{lateximage}%
}
\LWR at formatted{ARtt}
+\begin{warpMathJax}
+\CustomizeMathJax{\newcommand{\AR}{\mathit{A\!\!R}}}
+\CustomizeMathJax{\newcommand{\ARb}{\boldsymbol{A\!\!R}}}
+\end{warpMathJax}
\endinput
%%
%% End of file `lwarp-ar.sty'.
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-arabicfront.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-arabicfront.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-arabicfront.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `arabicfront')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-array.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-array.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-array.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `array')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
@@ -26,6 +26,9 @@
\LWR at expandableformatted{lasthline}
\providecommand*{\LWR at HTML@tabularnewline}{\LWR at tabularendofline}
\LWR at formatted{tabularnewline}
+\CustomizeMathJax{
+\newcommand{\multicolumn}[3]{#3}% only uses one cell
+}
\endinput
%%
%% End of file `lwarp-array.sty'.
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-arydshln.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-arydshln.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-arydshln.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `arydshln')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
@@ -67,6 +67,12 @@
\def\adl at inactivecdl[#1-#2][#3]{\ifnum0=`{\fi}\cline{#1-#2}}
+\begin{warpMathJax}
+\CustomizeMathJax{\newcommand{\firsthdashline}[1][]{\hdashline}}
+\CustomizeMathJax{\let\lasthdashline\firsthdashline}
+\CustomizeMathJax{\let\cdashline\cline}
+\end{warpMathJax}
+
\endinput
%%
%% End of file `lwarp-arydshln.sty'.
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-asymptote.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-asymptote.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-asymptote.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `asymptote')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-atbegshi.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-atbegshi.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-atbegshi.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `atbegshi')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-attachfile.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-attachfile.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-attachfile.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `attachfile')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-attachfile2.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-attachfile2.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-attachfile2.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `attachfile2')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-authblk.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-authblk.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-authblk.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `authblk')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-autonum.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-autonum.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-autonum.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `autonum')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Added: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-awesomebox.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-awesomebox.sty (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-awesomebox.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -0,0 +1,68 @@
+%%
+%% This is file `lwarp-awesomebox.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx (with options: `awesomebox')
+%% 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 at ProvidesPackagePass{awesomebox}[2019/07/27]
+\newcommand*{\LWR at awesomebox@boxborders}{}%
+\newcommand*{\LWR at awesomebox@contentsborders}{}%
+
+\newcommand*{\LWR at awesomebox@ruleborders}{%
+ border-top: 1px solid black ;
+ border-bottom: 1px solid black%
+}
+
+\RenewDocumentCommand \awesomebox { O{abvrulecolor} O{} o m m m +m }{%
+ \begin{awesomeblock}[#1][#2][#3]{#4}{#5}{#6}
+ #7
+ \end{awesomeblock}
+}
+
+\RenewDocumentEnvironment{awesomeblock}{ O{abvrulecolor} O{} o m m m }
+{%
+ \LWR at forceminwidth{#4}%
+ \convertcolorspec{named}{#1}{HTML}\LWR at tempcolor%
+ \renewcommand*{\LWR at awesomebox@boxborders}{}%
+ \renewcommand*{\LWR at awesomebox@contentsborders}{}%
+ \ifdefstrequal{\abShortLine}{#2}{%
+ \renewcommand*{\LWR at awesomebox@contentsborders}{\LWR at awesomebox@ruleborders}%
+ }{}%
+ \ifdefstrequal{\abLongLine}{#2}{%
+ \renewcommand*{\LWR at awesomebox@boxborders}{\LWR at awesomebox@ruleborders}%
+ }{}%
+ \begin{BlockClass}[\LWR at awesomebox@boxborders]{awesomebox}
+ \begin{BlockClass}[%
+ margin-left: 2\% ;
+ vertical-align: top
+ ]{minipage}
+ \color{#6}\Huge #5
+ \end{BlockClass}
+ \begin{BlockClass}[%
+ width:75\% ;
+ vertical-align: top ;
+ padding-left: 1em ;
+ \LWR at awesomebox@contentsborders ;
+ border-left: \LWR at printlength{\LWR at atleastonept} %
+ solid \LWR at origpound\LWR at tempcolor%
+ ]{minipage}
+ \IfValueTF{#3}{#3\newline}{}
+}
+{%
+ \end{BlockClass}
+ \end{BlockClass}
+}
+\endinput
+%%
+%% End of file `lwarp-awesomebox.sty'.
Property changes on: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-awesomebox.sty
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-axessibility.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-axessibility.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-axessibility.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `axessibility')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-axodraw2.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-axodraw2.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-axodraw2.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `axodraw2')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-backnaur.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-backnaur.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-backnaur.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `backnaur')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-backref.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-backref.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-backref.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `backref')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-balance.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-balance.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-balance.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `balance')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-bbding.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-bbding.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-bbding.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `bbding')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-biblatex.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-biblatex.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-biblatex.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `biblatex')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-bibunits.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-bibunits.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-bibunits.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `bibunits')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-bigdelim.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-bigdelim.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-bigdelim.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `bigdelim')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
@@ -31,6 +31,15 @@
}
\LWR at formatted{rdelim}
+
+\begin{warpMathJax}
+\CustomizeMathJax{
+ \newcommand{\LWRldelim}[1][]{\text{#1}~\LWRbigdelim}
+ \def\ldelim#1#2#3{\def\LWRbigdelim{#1}\LWRldelim}
+ \newcommand{\LWRrdelim}[1][]{\LWRbigdelim~\text{#1}}
+ \def\rdelim#1#2#3{\def\LWRbigdelim{#1}\LWRrdelim}
+}
+\end{warpMathJax}
\endinput
%%
%% End of file `lwarp-bigdelim.sty'.
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-bigfoot.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-bigfoot.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-bigfoot.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `bigfoot')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-bigstrut.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-bigstrut.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-bigstrut.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `bigstrut')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
@@ -23,6 +23,10 @@
\appto\LWR at restoreorigformatting{%
\LetLtxMacro\bigstrut\LWR at origbigstrut%
}
+
+\CustomizeMathJax{
+ \newcommand{\bigstrut}[1][]{}
+}
\endinput
%%
%% End of file `lwarp-bigstrut.sty'.
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-bitpattern.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-bitpattern.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-bitpattern.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `bitpattern')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-blowup.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-blowup.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-blowup.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `blowup')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Added: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-bm.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-bm.sty (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-bm.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -0,0 +1,33 @@
+%%
+%% This is file `lwarp-bm.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx (with options: `bm')
+%% 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 at ProvidesPackagePass{bm}[2019/07/24]
+\begin{warpMathJax}
+\LetLtxMacro\LWR at orig@DeclareBoldMathCommand\DeclareBoldMathCommand
+
+\renewcommand\DeclareBoldMathCommand[3][bold]{%
+ \LWR at orig@DeclareBoldMathCommand[#1]{#2}{#3}%
+ \CustomizeMathJax{\newcommand{#2}{\boldsymbol{#3}}}%
+}
+
+\@onlypreamble\DeclareBoldMathCommand
+
+\CustomizeMathJax{\newcommand{\bm}[1]{\boldsymbol{#1}}}
+\end{warpMathJax}
+\endinput
+%%
+%% End of file `lwarp-bm.sty'.
Property changes on: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-bm.sty
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-booklet.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-booklet.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-booklet.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `booklet')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-bookmark.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-bookmark.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-bookmark.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `bookmark')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-booktabs.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-booktabs.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-booktabs.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `booktabs')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
@@ -15,14 +15,15 @@
%% 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.
-\LetLtxMacro\toprule\relax
-\LetLtxMacro\midrule\relax
-\LetLtxMacro\cmidrule\cline
-\LetLtxMacro\bottomrule\relax
-\LetLtxMacro\addlinespace\relax
-\LetLtxMacro\morecmidrules\relax
-\LetLtxMacro\specialrule\relax
-
+\@ifpackageloaded{booktabs}{}{
+ \LetLtxMacro\toprule\relax
+ \LetLtxMacro\midrule\relax
+ \LetLtxMacro\cmidrule\cline
+ \LetLtxMacro\bottomrule\relax
+ \LetLtxMacro\addlinespace\relax
+ \LetLtxMacro\morecmidrules\relax
+ \LetLtxMacro\specialrule\relax
+}
\LWR at ProvidesPackagePass{booktabs}[2019/10/08]
\LetLtxMacro\@BLTrule\@BTnormal
\DeclareDocumentCommand{\LWR at HTML@toprule}{o d()}%
@@ -32,7 +33,7 @@
{%
\ifbool{FormatWP}%
{\LWR at docmidrule[#1](){1-\arabic{LWR at tabletotalLaTeXcols}}}%
- {\global\booltrue{LWR at doingtbrule}}%
+ {\booltrue{LWR at doingtbrule}}%
}%
\LWR at getmynexttoken}
@@ -45,7 +46,7 @@
{%
\ifbool{FormatWP}%
{\LWR at docmidrule[#1](){1-\arabic{LWR at tabletotalLaTeXcols}}}%
- {\addtocounter{LWR at hlines}{1}}%
+ {\defaddtocounter{LWR at hlines}{1}}%
}%
\LWR at getmynexttoken}
@@ -64,7 +65,7 @@
{%
\ifbool{FormatWP}%
{\LWR at docmidrule[#1](){1-\arabic{LWR at tabletotalLaTeXcols}}}%
- {\global\booltrue{LWR at doingtbrule}}%
+ {\booltrue{LWR at doingtbrule}}%
}%
\LWR at getmynexttoken%
}%
@@ -83,6 +84,15 @@
{\LWR at docmidrule[#1](){1-\arabic{LWR at tabletotalLaTeXcols}}\LWR at getmynexttoken}%
\LWR at expandableformatted{specialrule}
+\begin{warpMathJax}
+\CustomizeMathJax{\newcommand{\toprule}[1][]{\hline}}
+\CustomizeMathJax{\let\midrule\toprule}
+\CustomizeMathJax{\let\bottomrule\toprule}
+\CustomizeMathJax{\newcommand{\cmidrule}[2][]{}}% avoid (trim)
+\CustomizeMathJax{\newcommand{\morecmidrules}{}}
+\CustomizeMathJax{\newcommand{\specialrule}[3]{\hline}}
+\CustomizeMathJax{\newcommand{\addlinespace}[1][]{}}
+\end{warpMathJax}
\endinput
%%
%% End of file `lwarp-booktabs.sty'.
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-bophook.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-bophook.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-bophook.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `bophook')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-bounddvi.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-bounddvi.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-bounddvi.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `bounddvi')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-boxedminipage2e.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-boxedminipage2e.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-boxedminipage2e.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `boxedminipage2e')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Added: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-braket.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-braket.sty (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-braket.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -0,0 +1,31 @@
+%%
+%% This is file `lwarp-braket.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx (with options: `braket')
+%% 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 at ProvidesPackagePass{braket}% No date is provided by the file.
+\begin{warpMathJax}
+\CustomizeMathJax{\newcommand{\bra}[1]{\langle#1\vert}}
+\CustomizeMathJax{\newcommand{\Bra}[1]{\left\langle#1\right\vert}}
+\CustomizeMathJax{\newcommand{\ket}[1]{\vert#1\rangle}}
+\CustomizeMathJax{\newcommand{\Ket}[1]{\left\vert#1\right\rangle}}
+\CustomizeMathJax{\newcommand{\braket}[1]{\langle#1\rangle}}
+\CustomizeMathJax{\newcommand{\Braket}[1]{\left\langle#1\right\rangle}}
+\CustomizeMathJax{\newcommand{\set}[1]{\{#1\}}}
+\CustomizeMathJax{\newcommand{\Set}[1]{\left\{#1\right\}}}
+\end{warpMathJax}
+\endinput
+%%
+%% End of file `lwarp-braket.sty'.
Property changes on: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-braket.sty
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-breakurl.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-breakurl.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-breakurl.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `breakurl')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-breqn.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-breqn.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-breqn.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `breqn')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-bsheaders.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-bsheaders.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-bsheaders.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `bsheaders')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-bxpapersize.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-bxpapersize.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-bxpapersize.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `bxpapersize')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-bytefield.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-bytefield.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-bytefield.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `bytefield')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-cancel.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-cancel.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-cancel.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `cancel')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-canoniclayout.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-canoniclayout.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-canoniclayout.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `canoniclayout')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-caption.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-caption.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-caption.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `caption')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
@@ -19,8 +19,8 @@
\typeout{---}
\typeout{Packages lwarp and caption:}
\typeout{If a ``Missing \protect\begin\protect{document\protect}'' error occurs here,}
-\typeout{try using \space \protect\usepackage\protect{caption\protect}\space\protect\captionsetup{options}}
-\typeout{instead of \protect\usepackage[options]\protect{caption\protect}.}
+\typeout{try using: \space \protect\usepackage\protect{caption\protect}\space\protect\captionsetup{options}}
+\typeout{instead of: \protect\usepackage[options]\protect{caption\protect}.}
\typeout{---}
\LWR at ProvidesPackagePass{caption}[2019/09/01]
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-cases.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-cases.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-cases.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `cases')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-changebar.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-changebar.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-changebar.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `changebar')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-changelayout.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-changelayout.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-changelayout.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `changelayout')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-changepage.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-changepage.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-changepage.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `changepage')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-changes.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-changes.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-changes.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `changes')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-chappg.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-chappg.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-chappg.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `chappg')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-chapterbib.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-chapterbib.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-chapterbib.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `chapterbib')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-chemfig.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-chemfig.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-chemfig.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `chemfig')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-chemformula.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-chemformula.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-chemformula.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `chemformula')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-chemgreek.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-chemgreek.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-chemgreek.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `chemgreek')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-chemmacros.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-chemmacros.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-chemmacros.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `chemmacros')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-chemnum.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-chemnum.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-chemnum.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `chemnum')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-chkfloat.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-chkfloat.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-chkfloat.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `chkfloat')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-chngpage.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-chngpage.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-chngpage.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `chngpage')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-cite.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-cite.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-cite.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `cite')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-clrdblpg.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-clrdblpg.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-clrdblpg.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `clrdblpg')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-cmdtrack.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-cmdtrack.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-cmdtrack.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `cmdtrack')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-color.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-color.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-color.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `color')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-colortbl.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-colortbl.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-colortbl.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `colortbl')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
@@ -19,33 +19,33 @@
\LWR at ProvidesPackagePass{colortbl}[2018/12/12]
\NewDocumentCommand{\LWR at HTML@columncolor}{O{named} m o o}{%
-\convertcolorspec{#1}{#2}{HTML}\LWR at columnHTMLcolor%
-\LWR at addtabularcellcolor%
+ \convertcolorspec{#1}{#2}{HTML}\LWR at columnHTMLcolor%
+ \LWR at addtabularcellcolor%
}
\AtBeginDocument{\LWR at formatted{columncolor}}
\NewDocumentCommand{\LWR at HTML@rowcolor}{O{named} m o o}{%
-\convertcolorspec{#1}{#2}{HTML}\LWR at rowHTMLcolor%
-\LWR at getmynexttoken%
+ \convertcolorspec{#1}{#2}{HTML}\LWR at rowHTMLcolor%
+ \LWR at getmynexttoken%
}
\AtBeginDocument{\LWR at expandableformatted{rowcolor}}
\NewDocumentCommand{\LWR at HTML@cellcolor}{O{named} m o o}{%
-\convertcolorspec{#1}{#2}{HTML}\LWR at cellHTMLcolor%
-\LWR at addtabularcellcolor%
+ \convertcolorspec{#1}{#2}{HTML}\LWR at cellHTMLcolor%
+ \LWR at addtabularcellcolor%
}
\AtBeginDocument{\LWR at formatted{cellcolor}}
\newcommand{\LWR at HTML@arrayrulecolor}[2][named]{%
-\convertcolorspec{#1}{#2}{HTML}\LWR at ruleHTMLcolor%
+ \convertcolorspec{#1}{#2}{HTML}\LWR at ruleHTMLcolor%
}
\AtBeginDocument{\LWR at expandableformatted{arrayrulecolor}}
\newcommand{\LWR at HTML@arrayrulecolornexttoken}[2][named]{%
-\convertcolorspec{#1}{#2}{HTML}\LWR at ruleHTMLcolor%
-\LWR at getmynexttoken%
+ \convertcolorspec{#1}{#2}{HTML}\LWR at ruleHTMLcolor%
+ \LWR at getmynexttoken%
}
\AtBeginDocument{\LWR at expandableformatted{arrayrulecolornexttoken}}
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-common-multimedia.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-common-multimedia.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-common-multimedia.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `common-multimedia')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-continue.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-continue.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-continue.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `continue')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-copyrightbox.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-copyrightbox.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-copyrightbox.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `copyrightbox')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-crop.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-crop.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-crop.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `crop')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-ctable.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-ctable.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-ctable.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `ctable')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-cuted.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-cuted.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-cuted.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `cuted')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-cutwin.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-cutwin.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-cutwin.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `cutwin')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-dblfloatfix.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-dblfloatfix.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-dblfloatfix.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `dblfloatfix')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-dblfnote.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-dblfnote.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-dblfnote.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `dblfnote')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-dcolumn.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-dcolumn.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-dcolumn.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `dcolumn')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-diagbox.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-diagbox.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-diagbox.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `diagbox')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-dingbat.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-dingbat.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-dingbat.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `dingbat')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-dprogress.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-dprogress.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-dprogress.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `dprogress')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-draftcopy.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-draftcopy.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-draftcopy.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `draftcopy')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-draftfigure.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-draftfigure.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-draftfigure.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `draftfigure')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-draftwatermark.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-draftwatermark.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-draftwatermark.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `draftwatermark')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-easy-todo.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-easy-todo.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-easy-todo.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `easy-todo')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-ebook.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-ebook.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-ebook.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `ebook')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-ed.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-ed.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-ed.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `ed')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-ellipsis.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-ellipsis.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-ellipsis.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `ellipsis')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-embrac.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-embrac.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-embrac.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `embrac')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-emptypage.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-emptypage.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-emptypage.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `emptypage')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-endfloat.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-endfloat.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-endfloat.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `endfloat')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-endheads.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-endheads.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-endheads.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `endheads')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-endnotes.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-endnotes.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-endnotes.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `endnotes')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-enumerate.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-enumerate.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-enumerate.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `enumerate')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-enumitem.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-enumitem.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-enumitem.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `enumitem')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-epigraph.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-epigraph.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-epigraph.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `epigraph')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
@@ -67,6 +67,8 @@
\let\cleartoevenpage\relax% also in nextpage
\newcommand{\cleartoevenpage}[1][]{}
+\newif\ifepigraphnoindent
+\newcommand\epigraphnoindent{\epigraphnoindenttrue}
\endinput
%%
%% End of file `lwarp-epigraph.sty'.
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-epsfig.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-epsfig.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-epsfig.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `epsfig')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-epstopdf-base.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-epstopdf-base.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-epstopdf-base.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `epstopdf-base')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-epstopdf.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-epstopdf.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-epstopdf.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `epstopdf')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-eqlist.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-eqlist.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-eqlist.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `eqlist')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-eqparbox.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-eqparbox.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-eqparbox.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `eqparbox')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-errata.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-errata.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-errata.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `errata')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-eso-pic.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-eso-pic.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-eso-pic.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `eso-pic')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-eurosym.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-eurosym.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-eurosym.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `eurosym')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-everypage.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-everypage.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-everypage.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `everypage')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-everyshi.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-everyshi.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-everyshi.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `everyshi')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-extramarks.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-extramarks.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-extramarks.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `extramarks')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fancybox.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fancybox.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fancybox.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `fancybox')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyhdr.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyhdr.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyhdr.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `fancyhdr')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyref.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyref.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyref.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `fancyref')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fancytabs.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fancytabs.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fancytabs.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `fancytabs')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyvrb.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyvrb.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyvrb.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `fancyvrb')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-figcaps.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-figcaps.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-figcaps.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `figcaps')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-figsize.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-figsize.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-figsize.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `figsize')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fitbox.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fitbox.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fitbox.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `fitbox')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fix2col.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fix2col.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fix2col.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `fix2col')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fixme.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fixme.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fixme.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `fixme')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fixmetodonotes.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fixmetodonotes.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fixmetodonotes.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `fixmetodonotes')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-flafter.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-flafter.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-flafter.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `flafter')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-flippdf.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-flippdf.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-flippdf.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `flippdf')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-float.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-float.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-float.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `float')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-floatflt.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-floatflt.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-floatflt.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `floatflt')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
@@ -18,25 +18,36 @@
\LWR at ProvidesPackageDrop{floatflt}[1997/07/16]
\NewDocumentEnvironment{KFLTfloatflt at marginfloat}{O{-1.2ex} m m}
{%
-\setlength{\LWR at templengthone}{#3}%
-\LWR at BlockClassWP{%
- float:right; %
- width:\LWR at printlength{\LWR at templengthone}; % extra space
- margin:10pt%
-}{%
- width:\LWR at printlength{\LWR at templengthone}%
-}%
-{marginblock}%
-\captionsetup{type=#2}%
+ \begin{LWR at setvirtualpage}*%
+ \ifblank{#3}{%
+ \LWR at BlockClassWP{%
+ float:right; %
+ width: 1.5in; % reasonable dummy width for word processor
+ margin:10pt%
+ }{}%
+ {marginblock}%
+ }{%
+ \setlength{\LWR at templengthone}{#3}%
+ \LWR at BlockClassWP{%
+ float:right; %
+ width:\LWR at printlength{\LWR at templengthone}; % extra space
+ margin:10pt%
+ }{%
+ width:\LWR at printlength{\LWR at templengthone}%
+ }%
+ {marginblock}%
+ }%
+ \captionsetup{type=#2}%
}
{%
-\endLWR at BlockClassWP%
+ \endLWR at BlockClassWP%
+ \end{LWR at setvirtualpage}%
}
\DeclareDocumentEnvironment{floatingfigure}{o m}
{\begin{KFLTfloatflt at marginfloat}{figure}{#2}}
{\end{KFLTfloatflt at marginfloat}}
\DeclareDocumentEnvironment{floatingtable}{o}
- {\begin{KFLTfloatflt at marginfloat}{table}{1.5in}}
+ {\begin{KFLTfloatflt at marginfloat}{table}{}}
{\end{KFLTfloatflt at marginfloat}}
\endinput
%%
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-floatpag.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-floatpag.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-floatpag.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `floatpag')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-floatrow.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-floatrow.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-floatrow.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `floatrow')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
@@ -97,15 +97,13 @@
\newfloatcommand{fcapside}{figure}[\capbeside][]
\newenvironment*{floatrow}[1][2]
-{
-\LWR at forcenewpage
-\BlockClass{floatrow}
-\booltrue{LWR at infloatrow}
-\setlength{\linewidth}{6in/#1}
+{%
+ \begin{LWR at setvirtualpage}*%
+ \BlockClass{floatrow}%
}
{
-\boolfalse{LWR at infloatrow}
-\endBlockClass
+ \endBlockClass%
+ \end{LWR at setvirtualpage}%
}
\newcommand*{\LWR at frowkeyplacement}{}
\newcommand*{\LWR at frowkeyname}{}
@@ -130,20 +128,23 @@
\LWR at traceinfo{finished setkeys frowkeys}%
\ifthenelse{\equal{\LWR at frowkeywithin}{}}%
{%
- \LWR at traceinfo{about to newfloat #1 \LWR at frowkeyplacement\ %
- \LWR at frowkeyfileext}%
- \newfloat{#1}{\LWR at frowkeyplacement}{\LWR at frowkeyfileext}%
+ \DeclareFloatingEnvironment[
+ placement=\LWR at frowkeyplacement,
+ fileext=\LWR at frowkeyfileext
+ ]{#1}%
}%
{%
- \LWR at traceinfo{about to newfloat #1\ \LWR at frowkeyplacement\ %
- \LWR at frowkeyfileext\ \LWR at frowkeywithin}%
- \newfloat{#1}{\LWR at frowkeyplacement}%
- {\LWR at frowkeyfileext}[\LWR at frowkeywithin]%
- \LWR at traceinfo{finished newfloat #1}%
+ \DeclareFloatingEnvironment[
+ placement=\LWR at frowkeyplacement,
+ fileext=\LWR at frowkeyfileext,
+ within=\LWR at frowkeywithin
+ ]{#1}%
}%
\ifthenelse{\equal{\LWR at frowkeyname}{}}%
{}%
- {\floatname{#1}{\LWR at frowkeyname}}%
+ {%
+ \SetupFloatingEnvironment{#1}{name={\LWR at frowkeyname}}%
+ }%
}
\newcommand{\buildFBBOX}[2]{}
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fltrace.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fltrace.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fltrace.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `fltrace')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-flushend.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-flushend.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-flushend.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `flushend')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fnbreak.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fnbreak.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fnbreak.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `fnbreak')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fncychap.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fncychap.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fncychap.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `fncychap')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fnlineno.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fnlineno.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fnlineno.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `fnlineno')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fnpos.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fnpos.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fnpos.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `fnpos')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fontawesome.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fontawesome.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fontawesome.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `fontawesome')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
@@ -23,12 +23,12 @@
\newfontfamily{\LWR at orig@FA}{FontAwesome}
\newcommand*{\LWR at fontawesome@xelatex at symbol}[1]{%
-\begin{lateximage}*[icon][fontawesomexetex#1]%
-\begingroup%
-\LWR at orig@FA%
-\LWR at orig@symbol{#1}%
-\endgroup%
-\end{lateximage}%
+ \LWR at findcurrenttextcolor%
+ \begin{lateximage}*[icon][fontawesomexetex#1SZ\LWR at font@size{}CL\LWR at tempcolor]%
+ \csuse{\LWR at font@size}%
+ \LWR at orig@FA%
+ \LWR at orig@symbol{#1}%
+ \end{lateximage}%
}
\RenewDocumentCommand{\FA}{}{%
@@ -37,31 +37,25 @@
\else
+\newcommand*{\LWR at fontawesome@symbolX}[2]{%
+ \LWR at findcurrenttextcolor%
+ \begin{lateximage}*[icon #1][fontawesome#2#1SZ\LWR at font@size{}CL\LWR at tempcolor]%
+ \csuse{\LWR at font@size}%
+ \fontencoding{U}\fontfamily{fontawesome#2}\selectfont%
+ \LWR at orig@symbol{#1}%
+ \end{lateximage}%
+}
+
\newcommand*{\LWR at fontawesome@symbolone}[1]{%
-\begin{lateximage}*[icon #1][fontawesomeone#1]%
-\begingroup%
-\fontencoding{U}\fontfamily{fontawesomeone}\selectfont%
-\LWR at orig@symbol{#1}%
-\endgroup%
-\end{lateximage}%
+ \LWR at fontawesome@symbolX{#1}{one}%
}
\newcommand*{\LWR at fontawesome@symboltwo}[1]{%
-\begin{lateximage}*[icon #1][fontawesometwo#1]%
-\begingroup%
-\fontencoding{U}\fontfamily{fontawesometwo}\selectfont%
-\LWR at orig@symbol{#1}%
-\endgroup%
-\end{lateximage}%
+ \LWR at fontawesome@symbolX{#1}{two}%
}
\newcommand*{\LWR at fontawesome@symbolthree}[1]{%
-\begin{lateximage}*[icon #1][fontawesomethree#1]%
-\begingroup%
-\fontencoding{U}\fontfamily{fontawesomeonethree}\selectfont%
-\LWR at orig@symbol{#1}%
-\endgroup%
-\end{lateximage}%
+ \LWR at fontawesome@symbolX{#1}{three}%
}
\renewrobustcmd\FAone{%
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fontawesome5.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fontawesome5.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fontawesome5.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `fontawesome5')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
@@ -18,8 +18,10 @@
\LWR at ProvidesPackagePass{fontawesome5}[2018/07/27]
\ExplSyntaxOn
\cs_set:Nn\fontawesome_use_icon:nn{
+ \LWR at findcurrenttextcolor
\cs_if_exist:cTF{c__fontawesome_slot_#2_tl}{
- \begin{lateximage}*[#2][#1]
+ \begin{lateximage}*[#2][fontawesome5#1SZ\LWR at font@size{}CL\LWR at tempcolor]
+ \csuse{\LWR at font@size}
\exp_last_unbraced:Nv
\__fontawesome_icon_at:nnnn
{c__fontawesome_slot_#2_tl}
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fontaxes.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fontaxes.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fontaxes.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `fontaxes')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fontenc.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fontenc.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fontenc.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `fontenc')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-footmisc.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-footmisc.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-footmisc.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `footmisc')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-footnote.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-footnote.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-footnote.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `footnote')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-footnotebackref.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-footnotebackref.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-footnotebackref.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `footnotebackref')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-footnotehyper.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-footnotehyper.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-footnotehyper.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `footnotehyper')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-footnoterange.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-footnoterange.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-footnoterange.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `footnoterange')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-footnpag.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-footnpag.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-footnpag.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `footnpag')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-foreign.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-foreign.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-foreign.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `foreign')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-forest.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-forest.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-forest.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `forest')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-framed.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-framed.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-framed.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `framed')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-ftcap.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-ftcap.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-ftcap.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `ftcap')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-ftnright.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-ftnright.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-ftnright.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `ftnright')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fullminipage.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fullminipage.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fullminipage.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `fullminipage')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fullpage.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fullpage.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fullpage.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `fullpage')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fullwidth.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fullwidth.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fullwidth.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `fullwidth')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fwlw.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fwlw.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-fwlw.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `fwlw')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-gentombow.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-gentombow.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-gentombow.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `gentombow')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-geometry.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-geometry.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-geometry.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `geometry')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-gloss.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-gloss.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-gloss.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `gloss')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-glossaries.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-glossaries.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-glossaries.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `glossaries')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-gmeometric.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-gmeometric.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-gmeometric.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `gmeometric')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `graphics')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
@@ -136,17 +136,16 @@
\newcommand*{\LWR at rotstyle}[2]{%
- #1transform:rotate(-#2deg);
+ \edef\LWR at tempone{#2}%
+ \setcounter{LWR at tempcountone}{-1*\real{\LWR at tempone}} % space
+ #1transform:rotate(\arabic{LWR at tempcountone}deg); % space
}
\newcommand*{\LWR at scalestyle}[3]{%
- #1transform:scale(#2,#3);
+ #1transform:scale(#2,#3);
}
-\newbool{LWR at infloatrow}
-\boolfalse{LWR at infloatrow}
-
\def\LWR at opacity{1}
\newsavebox{\LWR at imagesizebox}
@@ -172,160 +171,182 @@
}%
}
-\NewDocumentCommand{\LWR at includegraphicsb}{s o o m}
-{%
-\LWR at origtilde \LWR at orignewline%
-\begingroup%
-\ifthenelse{\cnttest{\value{LWR at minipagedepth}}{=}{0}}%
-{%
- \ifbool{LWR at infloatrow}%
- {}
- {% not in a minipage or a floatrow:
- \setlength{\linewidth}{6in}%
- \setlength{\textwidth}{6in}%
- \setlength{\textheight}{9in}%
- }%
-}{}%
-\large%
-\setlength{\LWR at igwidth}{0pt}%
-\setlength{\LWR at igheight}{0pt}%
-\renewcommand*{\LWR at igwidthstyle}{}%
-\renewcommand*{\LWR at igheightstyle}{}%
-\renewcommand*{\LWR at igorigin}{}%
-\renewcommand*{\LWR at igangle}{}%
-\renewcommand*{\LWR at igxscale}{1}%
-\renewcommand*{\LWR at igyscale}{1}%
-\renewcommand*{\LWR at igclass}{inlineimage}%
-\ifdefvoid{\LWR at ThisAltText}{%
- \edef\LWR at igalt{\ImageAltText}%
-}{%
- \edef\LWR at igalt{\LWR at ThisAltText}%
-}%
-\IfValueF{#3}{%
- \IfValueTF{#2}%
- {\setkeys{igraph}{#2}}%
- {\setkeys{igraph}{}}%
-}%
-\begingroup%
-\LetLtxMacro\Gin at setfile\LWR at HTML@Gin at setfile%
-\edef\LWR at tempone{#4}%
-\StrSubstitute{\LWR at tempone}{.pdf}{.svg}[\LWR at tempone]%
-\StrSubstitute{\LWR at tempone}{.PDF}{.SVG}[\LWR at tempone]%
-\LWR at replaceEPSSVG%
-\xdef\LWR at parsedfilename{\LWR at tempone}%
-\Ginclude at graphics{\detokenize\expandafter{\LWR at tempone}}%
-\endgroup%
-\filename at parse{\LWR at parsedfilename}%
-\LWR at traceinfo{LWR at parsedfilename is \LWR at parsedfilename}%
-\ifbool{FormatWP}{%
- \begingroup%
- \LWR at restoreorigformatting%
- \ifpdf%
- \appto\LWR at restoreorigformatting{%
- \DeclareGraphicsExtensions{.pdf,.PDF,.gif,.GIF,.png,.PNG,.jpg,.JPG,.jpeg,.JPEG}%
- }%
- \else% \ifpdf
- \ifXeTeX%
- \appto\LWR at restoreorigformatting{%
- \DeclareGraphicsExtensions{.pdf,.PDF,.gif,.GIF,.png,.PNG,.jpg,.JPG,.jpeg,.JPEG}%
- }%
- \else%
- \appto\LWR at restoreorigformatting{%
- \DeclareGraphicsExtensions{.eps,.EPS,.gif,.GIF,.png,.PNG,.jpg,.JPG,.jpeg,.JPEG}%
- }%
- \fi%
- \fi% \ifpdf
- \define at key{Gin}{angle}{}%
- \IfBooleanTF{#1}%
- {% starred
- \IfValueTF{#3}%
- {%
- \global\sbox{\LWR at imagesizebox}{\LWR at origincludegraphics*[#2][#3]{#4}}%
+\newcommand*{\LWR at ig@wpimagesizes}[4]{%
+ \ifbool{FormatWP}{%
+ \begingroup%
+ \LWR at restoreorigformatting%
+ \ifpdf%
+ \appto\LWR at restoreorigformatting{%
+ \DeclareGraphicsExtensions{%
+ .pdf,.PDF,.gif,.GIF,.png,.PNG,.jpg,.JPG,.jpeg,.JPEG%
+ }%
}%
- {%
- \IfValueTF{#2}%
- {%
- \global\sbox{\LWR at imagesizebox}{\LWR at origincludegraphics*[#2]{#4}}%
- }{%
- \global\sbox{\LWR at imagesizebox}{\LWR at origincludegraphics*{#4}}%
+ \else% \ifpdf
+ \ifXeTeX%
+ \appto\LWR at restoreorigformatting{%
+ \DeclareGraphicsExtensions{%
+ .pdf,.PDF,.gif,.GIF,.png,.PNG,.jpg,.JPG,.jpeg,.JPEG%
}%
}%
- }% starred
- {% not starred
- \IfValueTF{#3}%
- {%
- \global\sbox{\LWR at imagesizebox}{\LWR at origincludegraphics[#2][#3]{#4}}%
+ \else%
+ \appto\LWR at restoreorigformatting{%
+ \DeclareGraphicsExtensions{%
+ .eps,.EPS,.gif,.GIF,.png,.PNG,.jpg,.JPG,.jpeg,.JPEG%
+ }%
}%
- {%
- \IfValueTF{#2}%
+ \fi%
+ \fi% \ifpdf
+ \define at key{Gin}{angle}{}%
+ \IfBooleanTF{#1}%
+ {% starred
+ \IfValueTF{#3}%
{%
- \global\sbox{\LWR at imagesizebox}{\LWR at origincludegraphics[#2]{#4}}%
- }{%
- \global\sbox{\LWR at imagesizebox}{\LWR at origincludegraphics{#4}}%
+ \global\sbox{\LWR at imagesizebox}{%
+ \LWR at origincludegraphics*[#2][#3]{#4}%
+ }%
}%
+ {%
+ \IfValueTF{#2}%
+ {%
+ \global\sbox{\LWR at imagesizebox}{%
+ \LWR at origincludegraphics*[#2]{#4}%
+ }%
+ }{%
+ \global\sbox{\LWR at imagesizebox}{%
+ \LWR at origincludegraphics*{#4}%
+ }%
+ }%
+ }%
+ }% starred
+ {% not starred
+ \IfValueTF{#3}%
+ {%
+ \global\sbox{\LWR at imagesizebox}{%
+ \LWR at origincludegraphics[#2][#3]{#4}%
+ }%
+ }%
+ {%
+ \IfValueTF{#2}%
+ {%
+ \global\sbox{\LWR at imagesizebox}{%
+ \LWR at origincludegraphics[#2]{#4}%
+ }%
+ }{%
+ \global\sbox{\LWR at imagesizebox}{%
+ \LWR at origincludegraphics{#4}%
+ }%
+ }%
+ }%
+ }% not starred
+ \endgroup%
+ \settowidth{\LWR at igwidth}{\usebox{\LWR at imagesizebox}}%
+ \global\renewcommand*{\LWR at igwidthstyle}{%
+ width:\LWR at printlength{\LWR at igwidth}%
}%
- }% not starred
- \endgroup%
- \settowidth{\LWR at igwidth}{\usebox{\LWR at imagesizebox}}%
- \global\renewcommand*{\LWR at igwidthstyle}{width:\LWR at printlength{\LWR at igwidth}}%
- \settoheight{\LWR at igheight}{\usebox{\LWR at imagesizebox}}%
- \global\renewcommand*{\LWR at igheightstyle}{height:\LWR at printlength{\LWR at igheight}}%
-}{}% FormatWP
-\LWR at traceinfo{LWR at includegraphicsb: about to create href}%
-\href{\LWR at parsedfilename}%
-{% start of href
-\LWR at traceinfo{LWR at includegraphicsb: about to LWR at htmltag}%
-\LWR at htmltag{% start of image tags
-img\LWR at indentHTML%
-src="%
-\detokenize\expandafter{\LWR at parsedfilename}%
-"\LWR at indentHTML%
-\ifthenelse{
- \NOT\equal{\LWR at igwidthstyle}{} \OR
- \NOT\equal{\LWR at igheightstyle}{} \OR
- \NOT\equal{\LWR at igorigin}{} \OR
- \NOT\equal{\LWR at igangle}{} \OR
- \NOT\equal{\LWR at igxscale}{1} \OR
- \NOT\equal{\LWR at igyscale}{1}
-}%
-{%
- style="\LWR at indentHTML
- \ifthenelse{\NOT\equal{\LWR at igwidthstyle}{}}%
- {\LWR at igwidthstyle;\LWR at indentHTML}{}%
- \ifthenelse{\NOT\equal{\LWR at igheightstyle}{}}%
- {\LWR at igheightstyle;\LWR at indentHTML}{}%
- \ifthenelse{\NOT\equal{\LWR at igorigin}{}}%
+ \settoheight{\LWR at igheight}{\usebox{\LWR at imagesizebox}}%
+ \global\renewcommand*{\LWR at igheightstyle}{%
+ height:\LWR at printlength{\LWR at igheight}%
+ }%
+ }{}% FormatWP
+}
+
+\newcommand*{\LWR at ig@htmltag}{%
+ img\LWR at indentHTML%
+ src="%
+ \detokenize\expandafter{\LWR at parsedfilename}%
+ "\LWR at indentHTML%
+ \ifthenelse{
+ \NOT\equal{\LWR at igwidthstyle}{} \OR
+ \NOT\equal{\LWR at igheightstyle}{} \OR
+ \NOT\equal{\LWR at igorigin}{} \OR
+ \NOT\equal{\LWR at igangle}{} \OR
+ \NOT\equal{\LWR at igxscale}{1} \OR
+ \NOT\equal{\LWR at igyscale}{1}
+ }%
+ {%
+ style="\LWR at indentHTML
+ \ifthenelse{\NOT\equal{\LWR at igwidthstyle}{}}%
+ {\LWR at igwidthstyle;\LWR at indentHTML}{}%
+ \ifthenelse{\NOT\equal{\LWR at igheightstyle}{}}%
+ {\LWR at igheightstyle;\LWR at indentHTML}{}%
+ \ifthenelse{\NOT\equal{\LWR at igorigin}{}}%
+ {%
+ transform-origin: \LWR at originnames{\LWR at igorigin};%
+ \LWR at indentHTML%
+ }{}%
+ \ifthenelse{\NOT\equal{\LWR at igangle}{}}%
{%
- transform-origin: \LWR at originnames{\LWR at igorigin};\LWR at indentHTML%
+ \LWR at rotstyle{-ms-}{\LWR at igangle}\LWR at indentHTML
+ \LWR at rotstyle{-webkit-}{\LWR at igangle}\LWR at indentHTML
+ \LWR at rotstyle{}{\LWR at igangle }\LWR at indentHTML
}{}%
- \ifthenelse{\NOT\equal{\LWR at igangle}{}}%
- {%
- \LWR at rotstyle{-ms-}{\LWR at igangle}\LWR at indentHTML
- \LWR at rotstyle{-webkit-}{\LWR at igangle}\LWR at indentHTML
- \LWR at rotstyle{}{\LWR at igangle }\LWR at indentHTML
+ \ifthenelse{%
+ \NOT\equal{\LWR at igxscale}{1}\OR%
+ \NOT\equal{\LWR at igyscale}{1}%
+ }%
+ {%
+ \LWR at scalestyle{-ms-}{\LWR at igxscale}{\LWR at igyscale}%
+ \LWR at indentHTML
+ \LWR at scalestyle{-webkit-}{\LWR at igxscale}{\LWR at igyscale}%
+ \LWR at indentHTML
+ \LWR at scalestyle{}{\LWR at igxscale}{\LWR at igyscale}%
+ \LWR at indentHTML
+ }{}%
+ %
+ \ifthenelse{\NOT\equal{\LWR at opacity}{1}}%
+ {opacity:\LWR at opacity;\LWR at indentHTML}{}%
+ %
+ "\LWR at indentHTML%
}{}%
- \ifthenelse{%
- \NOT\equal{\LWR at igxscale}{1}\OR%
- \NOT\equal{\LWR at igyscale}{1}%
+ class="\LWR at igclass"\LWR at indentHTML%
+ alt="\AltTextOpen\LWR at igalt\AltTextClose" \LWR at orignewline%
+}% end of image tags
+
+\NewDocumentCommand{\LWR at includegraphicsb}{s o o m}
+{%
+ \LWR at origtilde \LWR at orignewline%
+ \begin{LWR at setvirtualpage}%
+ \large%
+ \setlength{\LWR at igwidth}{0pt}%
+ \setlength{\LWR at igheight}{0pt}%
+ \renewcommand*{\LWR at igwidthstyle}{}%
+ \renewcommand*{\LWR at igheightstyle}{}%
+ \renewcommand*{\LWR at igorigin}{}%
+ \renewcommand*{\LWR at igangle}{}%
+ \renewcommand*{\LWR at igxscale}{1}%
+ \renewcommand*{\LWR at igyscale}{1}%
+ \renewcommand*{\LWR at igclass}{inlineimage}%
+ \ifdefvoid{\LWR at ThisAltText}{%
+ \edef\LWR at igalt{\ImageAltText}%
+ }{%
+ \edef\LWR at igalt{\LWR at ThisAltText}%
}%
- {%
- \LWR at scalestyle{-ms-}{\LWR at igxscale}{\LWR at igyscale}\LWR at indentHTML
- \LWR at scalestyle{-webkit-}{\LWR at igxscale}{\LWR at igyscale}\LWR at indentHTML
- \LWR at scalestyle{}{\LWR at igxscale}{\LWR at igyscale}\LWR at indentHTML
- }{}%
- %
- \ifthenelse{\NOT\equal{\LWR at opacity}{1}}%
- {opacity:\LWR at opacity;\LWR at indentHTML}{}%
- %
- "\LWR at indentHTML%
-}{}%
-class="\LWR at igclass"\LWR at indentHTML%
-alt="\AltTextOpen\LWR at igalt\AltTextClose" \LWR at orignewline%
-}% end of image tags
-}% end of href
-\endgroup
-\gdef\LWR at ThisAltText{}%
-\LWR at traceinfo{LWR at includegraphicsb done}%
+ \IfValueF{#3}{%
+ \IfValueTF{#2}%
+ {\setkeys{igraph}{#2}}%
+ {\setkeys{igraph}{}}%
+ }%
+ \begingroup%
+ \LetLtxMacro\Gin at setfile\LWR at HTML@Gin at setfile%
+ \edef\LWR at tempone{#4}%
+ \StrSubstitute{\LWR at tempone}{.pdf}{.svg}[\LWR at tempone]%
+ \StrSubstitute{\LWR at tempone}{.PDF}{.SVG}[\LWR at tempone]%
+ \LWR at replaceEPSSVG%
+ \xdef\LWR at parsedfilename{\LWR at tempone}%
+ \Ginclude at graphics{\detokenize\expandafter{\LWR at tempone}}%
+ \endgroup%
+ \filename at parse{\LWR at parsedfilename}%
+ \LWR at traceinfo{LWR at parsedfilename is \LWR at parsedfilename}%
+ \LWR at ig@wpimagesizes{#1}{#2}{#3}{#4}%
+ \LWR at traceinfo{LWR at includegraphicsb: about to create href}%
+ \href{\LWR at parsedfilename}%
+ {% start of href
+ \LWR at traceinfo{LWR at includegraphicsb: about to LWR at htmltag}%
+ \LWR at htmltag{\LWR at ig@htmltag}%
+ }% end of href
+ \end{LWR at setvirtualpage}%
+ \gdef\LWR at ThisAltText{}%
+ \LWR at traceinfo{LWR at includegraphicsb done}%
}
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-graphicx.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-graphicx.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-graphicx.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `graphicx')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-grffile.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-grffile.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-grffile.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `grffile')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-grid-system.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-grid-system.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-grid-system.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `grid-system')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-grid.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-grid.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-grid.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `grid')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-gridset.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-gridset.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-gridset.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `gridset')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-hang.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-hang.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-hang.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `hang')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-hanging.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-hanging.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-hanging.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `hanging')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-hypbmsec.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-hypbmsec.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-hypbmsec.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `hypbmsec')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-hypcap.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-hypcap.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-hypcap.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `hypcap')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-hypdestopt.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-hypdestopt.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-hypdestopt.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `hypdestopt')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-hypernat.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-hypernat.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-hypernat.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `hypernat')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperref.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperref.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperref.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `hyperref')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperxmp.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperxmp.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperxmp.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `hyperxmp')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-hyphenat.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-hyphenat.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-hyphenat.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `hyphenat')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-idxlayout.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-idxlayout.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-idxlayout.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `idxlayout')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-ifoddpage.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-ifoddpage.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-ifoddpage.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `ifoddpage')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-imakeidx.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-imakeidx.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-imakeidx.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `imakeidx')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-index.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-index.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-index.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `index')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-inputtrc.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-inputtrc.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-inputtrc.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `inputtrc')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-intopdf.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-intopdf.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-intopdf.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `intopdf')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-karnaugh-map.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-karnaugh-map.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-karnaugh-map.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `karnaugh-map')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-keyfloat.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-keyfloat.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-keyfloat.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `keyfloat')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
@@ -43,34 +43,12 @@
}%
\normalcolor%
}
-\providecommand*{\KFLT at LWR@hook at keysubfloats}{}
-\renewcommand*{\KFLT at LWR@hook at keysubfloats}{%
- \ifbool{KFLT at keywrap}{%
- }{%
- \ifnumequal{\value{KFLT at keyfloatdepth}}{0}{%
- \setlength{\linewidth}{6in}%
- \setlength{\textwidth}{6in}%
- \setlength{\textheight}{9in}%
- }{}%
- }%
- \normalcolor%
-}
+\LetLtxMacro\KFLT at LWR@hook at keysubfloats\KFLT at LWR@hook at boxouter
\let\KFLT at LWR@hook at keyfloatsminipage\relax
\let\endKFLT at LWR@hook at keyfloatsminipage\relax
\newenvironment*{KFLT at LWR@hook at keyfloatsminipage}[1]{}{}
-\providecommand*{\KFLT at LWR@hook at keyfloats}{}
-\renewcommand*{\KFLT at LWR@hook at keyfloats}{%
- \ifbool{KFLT at keywrap}{%
- }{%
- \ifnumequal{\value{KFLT at keyfloatdepth}}{0}{%
- \setlength{\linewidth}{6in}%
- \setlength{\textwidth}{6in}%
- \setlength{\textheight}{9in}%
- }{}%
- }%
- \normalcolor%
-}
+\LetLtxMacro\KFLT at LWR@hook at keyfloats\KFLT at LWR@hook at boxouter
\renewcommand*{\KFLT at maybeendfloatrow}{%
\ifnumless{\value{KFLT at thiscol}}{\value{KFLT at numcols}}%
@@ -252,8 +230,7 @@
\DeclareDocumentEnvironment{keywrap}{m +m}
{%
- \LWR at ensuredoingapar%
- \setlength{\linewidth}{6in}% in case #1 has \linewidth
+ \begin{LWR at setvirtualpage}*
\setlength{\LWR at templengthone}{#1}%
\begin{LWR at BlockClassWP}%
{%
@@ -266,6 +243,7 @@
\booltrue{KFLT at keywrap}%
#2%
\end{LWR at BlockClassWP}%
+ \end{LWR at setvirtualpage}%
}
{}
}% AtBeginDocument
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-layaureo.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-layaureo.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-layaureo.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `layaureo')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-layout.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-layout.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-layout.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `layout')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-layouts.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-layouts.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-layouts.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `layouts')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-leading.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-leading.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-leading.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `leading')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-letterspace.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-letterspace.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-letterspace.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `letterspace')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-lettrine.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-lettrine.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-lettrine.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `lettrine')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-lineno.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-lineno.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-lineno.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `lineno')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-lips.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-lips.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-lips.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `lips')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-listings.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-listings.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-listings.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `listings')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-listliketab.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-listliketab.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-listliketab.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `listliketab')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-lltjext.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-lltjext.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-lltjext.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `lltjext')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-longtable.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-longtable.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-longtable.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `longtable')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
@@ -22,28 +22,28 @@
\newbool{LWR at longtable@havehead}
\boolfalse{LWR at longtable@havehead}
\newenvironment{longtable*}[2][]{%
-\LWR at floatbegin{table}%
-\setcaptiontype{\LTcaptype}%
-\caption at setoptions{longtable}%
-\caption at setoptions{@longtable}%
-\caption at LT@setup%
-\booltrue{LWR at starredlongtable}%
-\boolfalse{LWR at longtable@havehead}%
-\let\captionlistentry\LWR at LTcaptionlistentry%
-\tabular{#2}
+ \LWR at floatbegin{table}%
+ \setcaptiontype{\LTcaptype}%
+ \caption at setoptions{longtable}%
+ \caption at setoptions{@longtable}%
+ \caption at LT@setup%
+ \booltrue{LWR at starredlongtable}%
+ \boolfalse{LWR at longtable@havehead}%
+ \let\captionlistentry\LWR at LTcaptionlistentry%
+ \tabular{#2}%
}
{\endtabular\LWR at floatend}
\newenvironment{longtable}[2][]{%
-\LWR at floatbegin{table}%
-\setcaptiontype{\LTcaptype}%
-\caption at setoptions{longtable}%
-\caption at setoptions{@longtable}%
-\caption at LT@setup%
-\refstepcounter{\LTcaptype}%
-\boolfalse{LWR at longtable@havehead}%
-\let\captionlistentry\LWR at LTcaptionlistentry%
-\tabular{#2}
+ \LWR at floatbegin{table}%
+ \setcaptiontype{\LTcaptype}%
+ \caption at setoptions{longtable}%
+ \caption at setoptions{@longtable}%
+ \caption at LT@setup%
+ \refstepcounter{\LTcaptype}%
+ \boolfalse{LWR at longtable@havehead}%
+ \let\captionlistentry\LWR at LTcaptionlistentry%
+ \tabular{#2}%
}
{\endtabular\LWR at floatend}
@@ -68,9 +68,9 @@
\space \protect\insertTableNotes\space here,
optionally with\MessageBreak
\space \protect\UseMinipageWidths\space in front.\MessageBreak
- See the lwarp documentation regarding longtables\MessageBreak
+ See the Lwarp documentation regarding longtables\MessageBreak
and threeparttablex}
- {See the lwarp documentation regading longtables and threeparttablex.}
+ {See the Lwarp documentation regading longtables and threeparttablex.}
}
\newcommand*{\LWR at longtable@maybeheaderror}{%
\ifbool{LWR at longtable@havehead}%
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-lscape.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-lscape.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-lscape.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `lscape')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-ltablex.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-ltablex.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-ltablex.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `ltablex')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
@@ -17,6 +17,7 @@
%% version 2005/12/01 or later.
+\RequirePackage{longtable}
\RequirePackage{tabularx}
\LWR at ProvidesPackageDrop{ltablex}[2014/08/13]
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-ltcaption.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-ltcaption.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-ltcaption.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `ltcaption')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-ltxgrid.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-ltxgrid.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-ltxgrid.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `ltxgrid')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-ltxtable.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-ltxtable.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-ltxtable.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `ltxtable')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
@@ -15,9 +15,10 @@
%% 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.
+\RequirePackage{tabularx,longtable}
\LWR at ProvidesPackageDrop{ltxtable}[1995/12/11]
\newcommand*{\LTXtable}[2]{%
-\input{#2}%
+ \input{#2}%
}
\endinput
%%
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-lua-check-hyphen.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-lua-check-hyphen.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-lua-check-hyphen.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `lua-check-hyphen')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-lua-visual-debug.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-lua-visual-debug.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-lua-visual-debug.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `lua-visual-debug')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-luacolor.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-luacolor.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-luacolor.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `luacolor')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-luatodonotes.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-luatodonotes.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-luatodonotes.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `luatodonotes')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-lyluatex.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-lyluatex.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-lyluatex.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `lyluatex')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-magaz.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-magaz.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-magaz.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `magaz')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-makeidx.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-makeidx.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-makeidx.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `makeidx')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-manyfoot.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-manyfoot.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-manyfoot.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `manyfoot')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-marginal.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-marginal.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-marginal.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `marginal')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-marginfit.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-marginfit.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-marginfit.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `marginfit')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-marginfix.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-marginfix.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-marginfix.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `marginfix')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-marginnote.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-marginnote.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-marginnote.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `marginnote')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-marvosym.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-marvosym.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-marvosym.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `marvosym')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-mathtools.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-mathtools.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-mathtools.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `mathtools')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
@@ -18,11 +18,197 @@
\LWR at ProvidesPackagePass{mathtools}[2018/01/08]
\RequirePackage{graphicx}
\MHInternalSyntaxOn
-\renewcommand*\MT_showonlyrefs_true:{\MT_showonlyrefs_false:}
+\renewcommand*\MT_showonlyrefs_true:{%
+ \PackageWarningNoLine{lwarp}
+ {%
+ Mathtools \space showonlyrefs \space conflicts \space
+ with \space cleveref,\MessageBreak
+ which \space is \space used \space by \space lwarp, \space
+ so \space showonlyrefs \space is\MessageBreak
+ forced \space off. \space\space
+ Equation \space numbers \space may \space not \space match%
+ }
+ \MT_showonlyrefs_false:
+}
\mathtoolsset{showonlyrefs=false}
\renewcommand*{\MT_mathic_true:}{\MT_mathic_false:}
\mathtoolsset{mathic=false}
\MHInternalSyntaxOff
+\begin{warpMathJax}
+\CustomizeMathJax{\newcommand{\mathllap}[2][]{{#1#2}}}
+\CustomizeMathJax{\newcommand{\mathrlap}[2][]{{#1#2}}}
+\CustomizeMathJax{\newcommand{\mathclap}[2][]{{#1#2}}}
+\CustomizeMathJax{\newcommand{\mathmbox}[1]{#1}}
+\CustomizeMathJax{\newcommand{\clap}[1]{#1}}
+\CustomizeMathJax{\newcommand{\LWRmathmakebox}[2][]{#2}}
+\CustomizeMathJax{\newcommand{\mathmakebox}[1][]{\LWRmathmakebox}}
+\CustomizeMathJax{\newcommand{\cramped}[2][]{{#1#2}}}
+\CustomizeMathJax{\newcommand{\crampedllap}[2][]{{#1#2}}}
+\CustomizeMathJax{\newcommand{\crampedrlap}[2][]{{#1#2}}}
+\CustomizeMathJax{\newcommand{\crampedclap}[2][]{{#1#2}}}
+\CustomizeMathJax{\newenvironment{crampedsubarray}[1]{}{}}
+\CustomizeMathJax{\newcommand{\crampedsubstack}{}}
+\CustomizeMathJax{\newcommand{\smashoperator}[2][]{#2}}
+\CustomizeMathJax{\newcommand{\SwapAboveDisplaySkip}{}}
+
+\CustomizeMathJax{\require{extpfeil}}
+\CustomizeMathJax{\Newextarrow\xleftrightarrow{10,10}{0x2194}}
+\CustomizeMathJax{\Newextarrow\xLeftarrow{10,10}{0x21d0}}
+\CustomizeMathJax{\Newextarrow\xhookleftarrow{10,10}{0x21a9}}
+\CustomizeMathJax{\Newextarrow\xmapsto{10,10}{0x21a6}}
+\CustomizeMathJax{\Newextarrow\xRightarrow{10,10}{0x21d2}}
+\CustomizeMathJax{\Newextarrow\xLeftrightarrow{10,10}{0x21d4}}
+\CustomizeMathJax{\Newextarrow\xhookrightarrow{10,10}{0x21aa}}
+\CustomizeMathJax{\Newextarrow\xrightharpoondown{10,10}{0x21c1}}
+\CustomizeMathJax{\Newextarrow\xleftharpoondown{10,10}{0x21bd}}
+\CustomizeMathJax{\Newextarrow\xrightleftharpoons{10,10}{0x21cc}}
+\CustomizeMathJax{\Newextarrow\xrightharpoonup{10,10}{0x21c0}}
+\CustomizeMathJax{\Newextarrow\xleftharpoonup{10,10}{0x21bc}}
+\CustomizeMathJax{\Newextarrow\xleftrightharpoons{10,10}{0x21cb}}
+
+\CustomizeMathJax{\newcommand{\LWRdounderbracket}[1]{\underline{#1}}}
+\CustomizeMathJax{\newcommand{\LWRunderbracket}[2][]{\LWRdounderbracket{#2}}}
+\CustomizeMathJax{\newcommand{\underbracket}[1][]{\LWRunderbracket}}
+\CustomizeMathJax{\newcommand{\LWRdooverbracket}[1]{\overline{#1}}}
+\CustomizeMathJax{\newcommand{\LWRoverbracket}[2][]{\LWRdooverbracket{#2}}}
+\CustomizeMathJax{\newcommand{\overbracket}[1][]{\LWRoverbracket}}
+
+\CustomizeMathJax{\newcommand{\LaTeXunderbrace}[1]{\underbrace{#1}}}
+\CustomizeMathJax{\newcommand{\LaTeXoverbrace}[1]{\overbrace{#1}}}
+
+\CustomizeMathJax{\newenvironment{matrix*}[1][]{\begin{matrix}}{\end{matrix}}}
+\CustomizeMathJax{\newenvironment{pmatrix*}[1][]{\begin{pmatrix}}{\end{pmatrix}}}
+\CustomizeMathJax{\newenvironment{bmatrix*}[1][]{\begin{bmatrix}}{\end{bmatrix}}}
+\CustomizeMathJax{\newenvironment{Bmatrix*}[1][]{\begin{Bmatrix}}{\end{Bmatrix}}}
+\CustomizeMathJax{\newenvironment{vmatrix*}[1][]{\begin{vmatrix}}{\end{vmatrix}}}
+\CustomizeMathJax{\newenvironment{Vmatrix*}[1][]{\begin{Vmatrix}}{\end{Vmatrix}}}
+\CustomizeMathJax{\newenvironment{smallmatrix*}[1][]{\begin{matrix}}{\end{matrix}}}
+\CustomizeMathJax{\newenvironment{psmallmatrix*}[1][]{\begin{pmatrix}}{\end{pmatrix}}}
+\CustomizeMathJax{\newenvironment{bsmallmatrix*}[1][]{\begin{bmatrix}}{\end{bmatrix}}}
+\CustomizeMathJax{\newenvironment{Bsmallmatrix*}[1][]{\begin{Bmatrix}}{\end{Bmatrix}}}
+\CustomizeMathJax{\newenvironment{vsmallmatrix*}[1][]{\begin{vmatrix}}{\end{vmatrix}}}
+\CustomizeMathJax{\newenvironment{Vsmallmatrix*}[1][]{\begin{Vmatrix}}{\end{Vmatrix}}}
+\CustomizeMathJax{\newenvironment{psmallmatrix}[1][]{\begin{pmatrix}}{\end{pmatrix}}}
+\CustomizeMathJax{\newenvironment{bsmallmatrix}[1][]{\begin{bmatrix}}{\end{bmatrix}}}
+\CustomizeMathJax{\newenvironment{Bsmallmatrix}[1][]{\begin{Bmatrix}}{\end{Bmatrix}}}
+\CustomizeMathJax{\newenvironment{vsmallmatrix}[1][]{\begin{vmatrix}}{\end{vmatrix}}}
+\CustomizeMathJax{\newenvironment{Vsmallmatrix}[1][]{\begin{Vmatrix}}{\end{Vmatrix}}}
+
+\CustomizeMathJax{\newcommand{\LWRmultlined}[1][]{\begin{multline*}}}
+\CustomizeMathJax{\newenvironment{multlined}[1][]{\LWRmultlined}{\end{multline*}}}
+
+\CustomizeMathJax{\let\LWRorigshoveleft\shoveleft}
+\CustomizeMathJax{\renewcommand{\shoveleft}[1][]{\LWRorigshoveleft}}
+\CustomizeMathJax{\let\LWRorigshoveright\shoveright}
+\CustomizeMathJax{\renewcommand{\shoveright}[1][]{\LWRorigshoveright}}
+
+\CustomizeMathJax{\newenvironment{dcases}{\begin{cases}}{\end{cases}}}
+\CustomizeMathJax{\newenvironment{dcases*}{\begin{cases}}{\end{cases}}}
+\CustomizeMathJax{\newenvironment{rcases}{\begin{cases}}{\end{cases}}}
+\CustomizeMathJax{\newenvironment{rcases*}{\begin{cases}}{\end{cases}}}
+\CustomizeMathJax{\newenvironment{drcases}{\begin{cases}}{\end{cases}}}
+\CustomizeMathJax{\newenvironment{drcases*}{\begin{cases}}{\end{cases}}}
+\CustomizeMathJax{\newenvironment{cases*}{\begin{cases}}{\end{cases}}}
+
+\CustomizeMathJax{\newcommand{\MoveEqLeft}[1][]{}}
+
+\CustomizeMathJax{% special parsing to handle '&' in argument
+ \def\LWRAboxed#1!|!{\fbox{\(#1\)}&\fbox{\(#2\)}}
+ \newcommand{\Aboxed}[1]{\LWRAboxed#1&&!|!}
+}
+
+\CustomizeMathJax{
+ \newcommand{\ArrowBetweenLines}[1][\Updownarrow]{#1}% no starred
+}
+
+\CustomizeMathJax{\newcommand{\shortintertext}[1]{\\ \text{#1}\notag \\}}
+
+\CustomizeMathJax{\newcommand{\vdotswithin}[1]{\hspace{.5em}\vdots}}
+\CustomizeMathJax{\newcommand{\shortvdotswithin}[1]{ & \hspace{.5em}\vdots \\}}
+\CustomizeMathJax{\newcommand{\MTFlushSpaceAbove}{}}
+\CustomizeMathJax{\newcommand{\MTFlushSpaceBelow}{\\}}
+
+\LetLtxMacro\LWR at mathtools@orig at DeclarePairedDelimiter\DeclarePairedDelimiter
+\renewcommand{\DeclarePairedDelimiter}[3]{
+ \LWR at mathtools@orig at DeclarePairedDelimiter{#1}{#2}{#3}
+ \CustomizeMathJax{\newcommand{#1}[2][]{{##1#2##2##1#3}}}
+}
+\@onlypreamble\DeclareParedDelimiter
+
+
+\LetLtxMacro\LWR at mathtools@orig at DeclarePairedDelimiterXPP\DeclarePairedDelimiterXPP
+\DeclareDocumentCommand{\DeclarePairedDelimiterXPP}{m O{1} m m m m m}{
+ \LWR at mathtools@orig at DeclarePairedDelimiterXPP{#1}[#2]{#3}{#4}{#5}{#6}{#7}
+ \appto\LWR at customizedMathJax{\LWRbackslash(}%
+ \appto\LWR at customizedMathJax{%
+ \LWRbackslash{}newcommand\{\LWRbackslash\macrotocsname{#1}LWRsub\}%
+ }%
+ \appto\LWR at customizedMathJax{[#2]}%
+ \appto\LWR at customizedMathJax{\{\{\LWRbackslash{}delimsize}%
+ \LWR at subcustomizedmathjax{#3#4#7}%
+ \appto\LWR at customizedMathJax{\LWRbackslash{}delimsize}%
+ \LWR at subcustomizedmathjax{#5#6}%
+ \appto\LWR at customizedMathJax{\}\}}%
+ \appto\LWR at customizedMathJax{\LWRbackslash)\par}%
+ \appto\LWR at customizedMathJax{\LWRbackslash(}%
+ \appto\LWR at customizedMathJax{%
+ \LWRbackslash{}newcommand\{\LWRbackslash\macrotocsname{#1}\}[1][]%
+ }%
+ \appto\LWR at customizedMathJax{%
+ \{
+ \LWRbackslash{}def\LWRbackslash{}delimsize\{\#1\}
+ \LWRbackslash\macrotocsname{#1}LWRsub
+ \}%
+ }%
+ \appto\LWR at customizedMathJax{\LWRbackslash)\par}%
+}
+\@onlypreamble\DeclareParedDelimiterXPP
+\@onlypreamble\DeclareParedDelimiterX
+
+\CustomizeMathJax{\newcommand\lparen{(}}
+\CustomizeMathJax{\newcommand\rparen{)}}
+\CustomizeMathJax{\newcommand{\vcentcolon}{:}}
+\CustomizeMathJax{\newcommand{\ordinarycolon}{:}}
+
+\CustomizeMathJax{\newcommand\dblcolon{\vcentcolon\vcentcolon}}
+\CustomizeMathJax{\newcommand\coloneqq{\vcentcolon=}}
+\CustomizeMathJax{\newcommand\Coloneqq{\dblcolon=}}
+\CustomizeMathJax{\newcommand\coloneq{\vcentcolon{-}}}
+\CustomizeMathJax{\newcommand\Coloneq{\dblcolon{-}}}
+
+\CustomizeMathJax{\newcommand\eqqcolon{=\vcentcolon}}
+\CustomizeMathJax{\newcommand\Eqqcolon{=\dblcolon}}
+\CustomizeMathJax{\newcommand\eqcolon{\mathrel{-}\vcentcolon}}
+\CustomizeMathJax{\newcommand\Eqcolon{\mathrel{-}\dblcolon}}
+
+\CustomizeMathJax{\newcommand\colonapprox{\vcentcolon\approx}}
+\CustomizeMathJax{\newcommand\Colonapprox{\dblcolon\approx}}
+\CustomizeMathJax{\newcommand\colonsim{\vcentcolon\sim}}
+\CustomizeMathJax{\newcommand\Colonsim{\dblcolon\sim}}
+
+\CustomizeMathJax{\newcommand{\nuparrow}{\cancel{\uparrow}}}
+\CustomizeMathJax{\newcommand{\ndownarrow}{\cancel{\downarrow}}}
+\CustomizeMathJax{\newcommand{\bigtimes}{{\Large\times}}}
+
+\CustomizeMathJax{\newcommand{\prescript}[3]{{}^{#1}_{#2}#3}}
+
+\CustomizeMathJax{\newenvironment{lgathered}{\begin{gathered}}{\end{gathered}}}
+\CustomizeMathJax{\newenvironment{rgathered}{\begin{gathered}}{\end{gathered}}}
+
+\LetLtxMacro\LWR at mathtools@orig at newgathered\newgathered
+\renewcommand{\newgathered}[4]{%
+ \LWR at mathtools@orig at newgathered{#1}{#2}{#3}{#4}%
+ \appto\LWR at customizedMathJax{\LWRbackslash(}%
+ \LWR at subcustomizedmathjax{%
+ \newenvironment{#1}{\begin{gathered}}{\end{gathered}}%
+ }%
+ \appto\LWR at customizedMathJax{\LWRbackslash)}%
+}
+\@onlypreamble\newgathered
+
+\CustomizeMathJax{\newcommand{\splitfrac}[2]{{}^{#1}_{#2}}}
+\CustomizeMathJax{\let\splitdfrac\splitfrac}
+\end{warpMathJax}
\endinput
%%
%% End of file `lwarp-mathtools.sty'.
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-mcaption.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-mcaption.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-mcaption.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `mcaption')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-mdframed.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-mdframed.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-mdframed.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `mdframed')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-media9.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-media9.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-media9.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `media9')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-memhfixc.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-memhfixc.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-memhfixc.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `memhfixc')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-metalogo.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-metalogo.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-metalogo.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `metalogo')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-metalogox.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-metalogox.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-metalogox.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `metalogox')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-mhchem.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-mhchem.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-mhchem.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `mhchem')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-microtype.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-microtype.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-microtype.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `microtype')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-midfloat.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-midfloat.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-midfloat.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `midfloat')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-midpage.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-midpage.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-midpage.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `midpage')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-minibox.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-minibox.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-minibox.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `minibox')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-minitoc.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-minitoc.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-minitoc.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `minitoc')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-morefloats.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-morefloats.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-morefloats.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `morefloats')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-moreverb.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-moreverb.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-moreverb.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `moreverb')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-movie15.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-movie15.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-movie15.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `movie15')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-mparhack.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-mparhack.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-mparhack.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `mparhack')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-multicap.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-multicap.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-multicap.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `multicap')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-multicol.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-multicol.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-multicol.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `multicol')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-multicolrule.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-multicolrule.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-multicolrule.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `multicolrule')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-multimedia.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-multimedia.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-multimedia.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `multimedia')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-multirow.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-multirow.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-multirow.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `multirow')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
@@ -27,10 +27,9 @@
\LWR at maybenewtablerow%
\LWR at tabularleftedge%
\LWR at htmltag{td rowspan="#2" %
-\IfValueT{#1}{%
+\ifstrequal{#1}{c}{style="\LWR at print@mbox{vertical-align:middle}" }{}%
\ifstrequal{#1}{b}{style="\LWR at print@mbox{vertical-align:bottom}" }{}%
\ifstrequal{#1}{t}{style="\LWR at print@mbox{vertical-align:top}" }{}%
-}%
\ifdefvoid{\LWR at multirowborder}{}{%
style="\LWR at print@mbox{border-\LWR at multirowborder:} 2px dotted black ; %
\LWR at print@mbox{padding-\LWR at multirowborder:} 2px" %
@@ -50,7 +49,7 @@
\LWR at getexparray{LWR at colbeforespec}{\arabic{LWR at tableLaTeXcolindex}}%
\begingroup\LetLtxMacro{\\}{\LWR at endofline}#6\endgroup%
\LWR at stoppars%
-\global\boolfalse{LWR at intabularmetadata}%
+\boolfalse{LWR at intabularmetadata}%
\renewcommand{\LWR at multirowborder}{}%
\LWR at traceinfo{*** LWR at HTML@multirow done}%
}%
@@ -61,18 +60,25 @@
\NewExpandableDocumentCommand{\LWR at HTML@multicolumnrow}{m m O{} m O{} m O{} +m}{%
\booltrue{LWR at usedmultirow}%
\LWR at tabularhtmlcolumns{\arabic{LWR at tableLaTeXcolindex}}{#1}
-\begingroup%
\LetLtxMacro{\\}{\LWR at endofline}%
\LWR at domulticolumn[#3][#4]{#1}{\arabic{LWR at tabhtmlcoltotal}}{#2}{#8}%
-\endgroup%
-\addtocounter{LWR at tableLaTeXcolindex}{#1}%
-\addtocounter{LWR at tableLaTeXcolindex}{-1}%
-\global\booltrue{LWR at skipatbang}%
+\LetLtxMacro{\\}{\LWR at tabularendofline}%
+\defaddtocounter{LWR at tableLaTeXcolindex}{#1}%
+\defaddtocounter{LWR at tableLaTeXcolindex}{-1}%
+\booltrue{LWR at skipatbang}%
}
\LWR at expandableformatted{multicolumnrow}
}% \AtBeginDocument
+\begin{warpMathJax}
+\CustomizeMathJax{\newcommand{\LWRsubmultirow}[2][]{#2}}
+\CustomizeMathJax{\newcommand{\LWRmultirow}[2][]{\LWRsubmultirow}}
+\CustomizeMathJax{\newcommand{\multirow}[2][]{\LWRmultirow}}
+\CustomizeMathJax{\newcommand{\mrowcell}{}}
+\CustomizeMathJax{\newcommand{\mcolrowcell}{}}
+\CustomizeMathJax{\newcommand{\STneed}[1]{}}
+\end{warpMathJax}
\endinput
%%
%% End of file `lwarp-multirow.sty'.
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-multitoc.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-multitoc.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-multitoc.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `multitoc')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-musicography.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-musicography.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-musicography.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `musicography')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-nameauth.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-nameauth.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-nameauth.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `nameauth')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-nameref.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-nameref.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-nameref.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `nameref')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-natbib.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-natbib.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-natbib.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `natbib')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-nccfancyhdr.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-nccfancyhdr.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-nccfancyhdr.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `nccfancyhdr')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-needspace.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-needspace.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-needspace.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `needspace')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-nextpage.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-nextpage.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-nextpage.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `nextpage')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-nfssext-cfr.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-nfssext-cfr.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-nfssext-cfr.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `nfssext-cfr')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-nicefrac.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-nicefrac.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-nicefrac.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `nicefrac')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
@@ -38,7 +38,9 @@
}
\LWR at formatted{@UnitsUglyFrac}
+\begin{warpMathJax}
\CustomizeMathJax{\newcommand{\nicefrac}[3][]{#2/#3}}
+\end{warpMathJax}
\endinput
%%
%% End of file `lwarp-nicefrac.sty'.
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-niceframe.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-niceframe.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-niceframe.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `niceframe')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
@@ -16,11 +16,13 @@
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
\LWR at ProvidesPackageDrop{niceframe}% the original date is in yyyy/dd/mm format
-\newcommand{\LWR at niceframe}[3]{
- \setlength{\LWR at templengthone}{#1}
- \begin{BlockClass}[max-width:\LWR at printlength{\LWR at templengthone}]{#3}
+\newcommand{\LWR at niceframe}[3]{%
+ \begin{LWR at setvirtualpage}*%
+ \setlength{\LWR at templengthone}{#1}%
+ \begin{BlockClass}[max-width:\LWR at printlength{\LWR at templengthone}]{#3}%
#2
- \end{BlockClass}
+ \end{BlockClass}%
+ \end{LWR at setvirtualpage}%
}
\newcommand{\niceframe}[2][\textwidth]{\LWR at niceframe{#1}{#2}{niceframe}}
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-nomencl.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-nomencl.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-nomencl.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `nomencl')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-nonfloat.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-nonfloat.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-nonfloat.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `nonfloat')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-nonumonpart.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-nonumonpart.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-nonumonpart.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `nonumonpart')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-nopageno.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-nopageno.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-nopageno.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `nopageno')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-notes.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-notes.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-notes.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `notes')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-notespages.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-notespages.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-notespages.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `notespages')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-nowidow.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-nowidow.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-nowidow.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `nowidow')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-ntheorem.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-ntheorem.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-ntheorem.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `ntheorem')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-octave.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-octave.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-octave.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `octave')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-overpic.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-overpic.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-overpic.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `overpic')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pagegrid.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pagegrid.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pagegrid.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `pagegrid')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pagenote.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pagenote.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pagenote.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `pagenote')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pagesel.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pagesel.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pagesel.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `pagesel')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-paralist.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-paralist.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-paralist.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `paralist')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Added: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-parallel.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-parallel.sty (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-parallel.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -0,0 +1,99 @@
+%%
+%% This is file `lwarp-parallel.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx (with options: `parallel')
+%% 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 at ProvidesPackageDrop{parallel}[2003/04/13]
+\newcounter{LWR at parallel@Lwidth}
+\newcounter{LWR at parallel@Rwidth}
+\newcommand*{\LWR at parallel@border}
+
+\newenvironment*{Parallel}[3][]%
+ {%
+ \LWR at printpendingfootnotes%
+ \setlength{\linewidth}{\LWR at userstextwidth}%
+ \setlength{\textwidth}{\LWR at userstextwidth}%
+ \renewcommand*{\LWR at parallel@border}{}%
+ \ifstrequal{#1}{v}%
+ {%
+ \renewcommand*{\LWR at parallel@border}{ ; border-left: 2px solid black}%
+ }%
+ {}%
+ \ifblank{#2}{%
+ \ifblank{#3}{% {}{}
+ \setcounter{LWR at parallel@Lwidth}{45}%
+ \setcounter{LWR at parallel@Rwidth}{45}%
+ }% {}{}
+ {% {}{x}
+ \setlength{\LWR at templengthone}{\linewidth-#3}%
+ \setcounter{LWR at parallel@Lwidth}{%
+ 90*\ratio{\LWR at templengthone}{\linewidth}%
+ }%
+ \setcounter{LWR at parallel@Rwidth}{%
+ 90*\ratio{#3}{\linewidth}%
+ }%
+ }% {}{x}
+ }% #2 blank
+ {% #2 non-blank
+ \ifblank{#3}{% {x}{}
+ \setcounter{LWR at parallel@Lwidth}{%
+ 90*\ratio{#2}{\linewidth}%
+ }%
+ \setlength{\LWR at templengthone}{\linewidth-#2}%
+ \setcounter{LWR at parallel@Rwidth}{%
+ 90*\ratio{\LWR at templengthone}{\linewidth}%
+ }%
+ }% {x}{}
+ {% {x}{x}
+ \setcounter{LWR at parallel@Lwidth}{%
+ 90*\ratio{#2}{\linewidth}%
+ }%
+ \setcounter{LWR at parallel@Rwidth}{%
+ 90*\ratio{#3}{\linewidth}%
+ }%
+ }% {x}{x}
+ }% #2 non-blank
+ }
+ {%
+ \ParallelAtEnd%
+ \renewcommand*{\ParallelAtEnd}{}%
+ \LWR at printpendingfootnotes%
+ }
+
+\newcommand*{\ParallelLText}[1]{%
+ \begin{BlockClass}[%
+ width:\arabic{LWR at parallel@Lwidth}\% ; % space
+ padding: .5ex 1\% ; % space
+ ]{minipage}%
+ #1%
+ \end{BlockClass}%
+}
+
+\newcommand*{\ParallelRText}[1]{%
+ \begin{BlockClass}[%
+ width:\arabic{LWR at parallel@Rwidth}\% ; % space
+ padding: .5ex 1\% ; % space
+ \LWR at parallel@border%
+ ]{minipage}%
+ #1%
+ \end{BlockClass}%
+}
+
+\newcommand*{\ParallelPar}{\LWR at printpendingfootnotes}
+
+\newcommand*{\ParallelAtEnd}{}
+\endinput
+%%
+%% End of file `lwarp-parallel.sty'.
Property changes on: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-parallel.sty
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-parcolumns.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-parcolumns.sty (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-parcolumns.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -0,0 +1,102 @@
+%%
+%% This is file `lwarp-parcolumns.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx (with options: `parcolumns')
+%% 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.
+\RequirePackage{keyval}%
+
+\LWR at ProvidesPackageDrop{parcolumns}[2004/11/25]
+\newcounter{LWR at parcolumns@numcols}
+\newcounter{LWR at parcolumns@thiscol}
+\newcounter{LWR at parcolumns@width}
+\newbool{LWR at parcolumns@started}
+\newbool{LWR at parcolumns@rule}
+
+\define at key{LWRparcols}{colwidths}{}
+\define at key{LWRparcols}{distance}{}
+\define at key{LWRparcols}{rulebetween}[true]{%
+ \setbool{LWR at parcolumns@rule}{#1}%
+}
+\define at key{LWRparcols}{nofirstindent}{}
+\define at key{LWRparcols}{sloppy}{}
+\define at key{LWRparcols}{sloppyspaces}{}
+
+\newenvironment*{parcolumns}[2][]
+ {%
+ \begin{LWR at setvirtualpage}*[#2]%
+ \setcounter{LWR at parcolumns@numcols}{#2}%
+ \setcounter{LWR at parcolumns@thiscol}{1}%
+ \boolfalse{LWR at parcolumns@started}%
+ \boolfalse{LWR at parcolumns@rule}%
+ \setcounter{LWR at parcolumns@width}{%
+ 85/#2
+ }%
+ \setkeys{LWRparcols}{#1}%
+ }
+ {\end{LWR at setvirtualpage}}
+
+\newcommand{\LWR at parcolumns@onecol}[1]{%
+ \ifbool{LWR at parcolumns@started}%
+ {}%
+ {%
+ \LWR at htmldivclass{parcolumns}%
+ \booltrue{LWR at parcolumns@started}%
+ }%
+ \ifboolexpr{%
+ bool {LWR at parcolumns@rule} and
+ test {%
+ \ifnumgreater
+ {\value{LWR at parcolumns@thiscol}}
+ {1}
+ }%
+ }%
+ {\renewcommand{\LWR at tempone}{ ; border-left: 2px solid black}}%
+ {\renewcommand{\LWR at tempone}{}}%
+ \begin{BlockClass}[%
+ width:\arabic{LWR at parcolumns@width}\% ; % space
+ padding: .5ex 1\% ; % space
+ \LWR at tempone%
+ ]{minipage}%
+ #1%
+ \end{BlockClass}%
+ \addtocounter{LWR at parcolumns@thiscol}{1}%
+}
+
+\newcommand{\colchunk}[2][\value{LWR at parcolumns@thiscol}]{%
+ \whileboolexpr{%
+ test {%
+ \ifnumcomp%
+ {\value{LWR at parcolumns@thiscol}}
+ {<}
+ {#1}%
+ }%
+ }{%
+ \LWR at parcolumns@onecol{}%
+ }%
+ \LWR at parcolumns@onecol{#2}%
+}
+
+\newcommand*{\colplacechunks}{%
+ \ifbool{LWR at parcolumns@started}%
+ {%
+ \LWR at htmldivclassend{div}%
+ \boolfalse{LWR at parcolumns@started}%
+ }%
+ {}%
+ \setcounter{LWR at parcolumns@thiscol}{1}%
+}
+\endinput
+%%
+%% End of file `lwarp-parcolumns.sty'.
Property changes on: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-parcolumns.sty
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-parnotes.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-parnotes.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-parnotes.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `parnotes')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-parskip.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-parskip.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-parskip.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `parskip')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-komascript.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-komascript.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-komascript.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `patch-komascript')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
@@ -38,19 +38,19 @@
}% AtBeginDocument
\renewcommand*{\minisec}[1]{
-\begin{BlockClass}{minisec}
-#1
-\end{BlockClass}
+ \begin{BlockClass}{minisec}
+ #1
+ \end{BlockClass}
}
\@ifundefined{setpartpreamble}{}{
\RenewDocumentCommand{\setpartpreamble}{o o +m}{%
-\renewcommand{\part at preamble}{#3}%
+ \renewcommand{\part at preamble}{#3}%
}
}
\@ifundefined{setchapterpreamble}{}{
\RenewDocumentCommand{\setchapterpreamble}{o o +m}{%
-\renewcommand{\chapter at preamble}{#3}%
+ \renewcommand{\chapter at preamble}{#3}%
}
}
\AtBeginDocument{
@@ -64,17 +64,17 @@
\RenewDocumentEnvironment{captionbeside}{o m o o o s}
{}
{%
-\IfValueTF{#1}%
-{\caption[#1]{#2}}%
-{\caption{#2}}%
+ \IfValueTF{#1}%
+ {\caption[#1]{#2}}%
+ {\caption{#2}}%
}
\RenewDocumentEnvironment{captionofbeside}{m o m o o o s}
{}
{%
-\IfValueTF{#2}%
-{\captionof{#1}[#2]{#3}}%
-{\captionof{#1}{#3}}%
+ \IfValueTF{#2}%
+ {\captionof{#1}[#2]{#3}}%
+ {\captionof{#1}{#3}}%
}
\RenewDocumentCommand{\setcapindent}{s m}{}
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-memoir.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-memoir.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-patch-memoir.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `patch-memoir')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
@@ -38,7 +38,14 @@
\RequirePackage{lwarp-parskip}
\RequirePackage{lwarp-setspace}% req'd
\RequirePackage{lwarp-showidx}
-\RequirePackage{lwarp-subfigure}% red'q
+
+\AtBeginDocument{%
+ \@ifpackageloaded{subcaption}{}{
+ \RequirePackage{lwarp-subfigure}
+ \let\subfigure\subbottom
+ \let\subtable\subtop
+ }%
+}%
\makeindex
\LetLtxMacro\LWR at memorignewsubfloat\newsubfloat
\RenewDocumentCommand{\newsubfloat}{O{} m}{%
@@ -213,8 +220,9 @@
\newcommand{\titlingpageend}[2]{}
\let\andnext\and
\renewcommand*{\thanksmarkstyle}[1]{}
+
\renewcommand{\thanksfootmark}{%
-\thanksscript{\tamark}%
+ \thanksscript{\tamark}%
}
\renewcommand*{\abstractcol}{}
@@ -239,7 +247,7 @@
}
\DeclareDocumentCommand{\frontmatter}{s}{%
-\boolfalse{LWR at mainmatter}%
+ \boolfalse{LWR at mainmatter}%
}
\renewcommand*{\raggedbottomsection}{}
\renewcommand*{\normalbottomsection}{}
@@ -354,17 +362,17 @@
\RenewDocumentCommand{\plainbreak}{s m}{\begin{center}~\end{center}}
\RenewDocumentCommand{\fancybreak}{s +m}{%
-\begin{center}#2\end{center}%
+ \begin{center}#2\end{center}%
}
\RenewDocumentCommand{\plainfancybreak}{s m m +m}{%
-\begin{center}#4\end{center}%
+ \begin{center}#4\end{center}%
}
\RenewDocumentCommand{\pfbreak}{s}{%
-\begin{center}
-\pfbreakdisplay
-\end{center}
+ \begin{center}
+ \pfbreakdisplay
+ \end{center}
}
\renewcommand{\pfbreakdisplay}{*\quad*\quad*}
@@ -436,13 +444,14 @@
\renewcommand*{\leftcenterright}{}
\renewcommand{\leftspringright}[4]{%
-\begin{minipage}{#1\linewidth}#3\end{minipage}\qquad%
-\begin{minipage}{#2\linewidth}\begin{flushright}#4\end{flushright}\end{minipage}%
+ \begin{minipage}{#1\linewidth}#3\end{minipage}\qquad%
+ \begin{minipage}{#2\linewidth}\begin{flushright}#4\end{flushright}\end{minipage}%
}
\renewenvironment*{blockdescription}
{\LWR at descriptionstart\LWR at origdescription}
{\enddescription}
+
\renewcommand*{\blockdescriptionlabel}[1]{\textbf{#1}}
\renewenvironment*{labelled}[1]{\begin{description}}{\end{description}}
\renewenvironment*{flexlabelled}[6]{\begin{description}}{\end{description}}
@@ -636,40 +645,40 @@
\DeclareRobustCommand{\cftpagenumbersoff}[1]{}
\DeclareRobustCommand{\cftpagenumberson}[1]{}
\RenewDocumentCommand{\newfloat}{o m m m}{%
-\IfValueTF{#1}%
-{\DeclareFloatingEnvironment[fileext=#3,within=#1,name={#4}]{#2}}%
-{\DeclareFloatingEnvironment[fileext=#3,name={#4}]{#2}}%
-\cslet{listof#2s}\relax%
-\cslet{listof#2es}\relax%
+ \IfValueTF{#1}%
+ {\DeclareFloatingEnvironment[fileext=#3,within=#1,name={#4}]{#2}}%
+ {\DeclareFloatingEnvironment[fileext=#3,name={#4}]{#2}}%
+ \cslet{listof#2s}\relax%
+ \cslet{listof#2es}\relax%
}
\RenewDocumentCommand{\newlistof}{o m m m}
{%
-\IfValueTF{#1}
-{\newlistentry[#1]{#2}{#3}{0}}
-{\newlistentry{#2}{#3}{0}}
-\@namedef{ext@#2}{#3}%
-\@ifundefined{c@#3depth}{\newcounter{#3depth}}{}%
-\setcounter{#3depth}{1}%
-\@namedef{#3mark}{}%
-\@namedef{#2}{\listof{#2}{#4}}
-\@namedef{@cftmake#3title}{}
-\@ifundefined{cftbefore#3titleskip}{
- \expandafter\newlength\csname cftbefore#3titleskip\endcsname
- \expandafter\newlength\csname cftafter#3titleskip\endcsname
-}{}
-\@namedef{cft#3titlefont}{}
-\@namedef{cftafter#3title}{}
-\@namedef{cft#3prehook}{}
-\@namedef{cft#3posthook}{}
+ \IfValueTF{#1}%
+ {\newlistentry[#1]{#2}{#3}{0}}%
+ {\newlistentry{#2}{#3}{0}}%
+ \@namedef{ext@#2}{#3}%
+ \@ifundefined{c@#3depth}{\newcounter{#3depth}}{}%
+ \setcounter{#3depth}{1}%
+ \@namedef{#3mark}{}%
+ \@namedef{#2}{\listof{#2}{#4}}%
+ \@namedef{@cftmake#3title}{}%
+ \@ifundefined{cftbefore#3titleskip}{%
+ \expandafter\newlength\csname cftbefore#3titleskip\endcsname%
+ \expandafter\newlength\csname cftafter#3titleskip\endcsname%
+ }{}%
+ \@namedef{cft#3titlefont}{}%
+ \@namedef{cftafter#3title}{}%
+ \@namedef{cft#3prehook}{}%
+ \@namedef{cft#3posthook}{}%
}
\renewcommand{\setfloatadjustment}[2]{}
\NewDocumentEnvironment{KFLTmemoir at marginfloat}{O{-1.2ex} m}
{% start
-\LWR at BlockClassWP{float:right; width:2in; margin:10pt}{}{marginblock}%
-\captionsetup{type=#2}%
+ \LWR at BlockClassWP{float:right; width:2in; margin:10pt}{}{marginblock}%
+ \captionsetup{type=#2}%
}
{%
-\endLWR at BlockClassWP%
+ \endLWR at BlockClassWP%
}
\DeclareDocumentEnvironment{marginfigure}{o}
@@ -697,7 +706,7 @@
\renewcommand{\flegtocfigure}{}
\renewcommand{\subcaption}[2][]{%
-\ifblank{#1}{\subfloat[#2]{}}{\subfloat[#1][#2]{}}%
+ \ifblank{#1}{\subfloat[#2]{}}{\subfloat[#1][#2]{}}%
}
\renewcommand{\contsubcaption}{\ContinuedFloat\subcaption}
@@ -718,9 +727,9 @@
\RenewDocumentEnvironment{sidecaption}{o m o}
{}
-{
-\IfValueTF{#1}{\caption[#1]{#2}}{\caption{#2}}%
-\IfValueT{#3}{\label{#3}}%
+{%
+ \IfValueTF{#1}{\caption[#1]{#2}}{\caption{#2}}%
+ \IfValueT{#3}{\label{#3}}%
}
\renewcommand*{\setsidecaps}[2]{}
@@ -731,20 +740,20 @@
\RenewDocumentEnvironment{sidecontcaption}{m o}
{}
{%
-\ContinuedFloat%
-\caption{#1}%
-\IfValueT{#2}{\label[\@captype]{#2}}%
+ \ContinuedFloat%
+ \caption{#1}%
+ \IfValueT{#2}{\label[\@captype]{#2}}%
}
\renewenvironment{sidenamedlegend}[2][]{
-\begin{center}
-\@nameuse{\@captype name}\CaptionSeparator#2
-\end{center}
+ \begin{center}
+ \@nameuse{\@captype name}\CaptionSeparator#2
+ \end{center}
}
{}
\renewenvironment{sidelegend}[1]
{\begin{center}
-#1
+ #1
}
{\end{center}}
@@ -757,20 +766,20 @@
\LetLtxMacro\endctabular\endtabular
\renewcommand{\autorows}[5][]{%
-#5
+ #5%
}
\renewcommand{\autocols}[5][]{%
-#5
+ #5%
}
\renewcommand*{\feetabovefloat}{}
\renewcommand*{\feetbelowfloat}{}
\renewcommand*{\feetatbottom}{}
-\renewcommand*{\verbfootnote}[2][]{
-\PackageError{lwarp,memoir}
-{Verbatim footnotes are not yet supported by lwarp.}
-{This may be improved some day.}
+\renewcommand*{\verbfootnote}[2][]{%
+ \PackageError{lwarp,memoir}%
+ {Verbatim footnotes are not yet supported by lwarp.}%
+ {This may be improved some day.}%
}
\renewcommand*{\plainfootnotes}{}
@@ -779,10 +788,10 @@
\renewcommand*{\paragraphfootnotes}{}
\renewcommand*{\footfudgefiddle}{}
-\renewcommand*{\newfootnoteseries}[1]{
-\PackageError{lwarp,memoir}
-{Memoir footnote series are not yet supported by lwarp.}
-{This may be improved some day.}
+\renewcommand*{\newfootnoteseries}[1]{%
+ \PackageError{lwarp,memoir}%
+ {Memoir footnote series are not yet supported by lwarp.}%
+ {This may be improved some day.}%
}
\renewcommand*{\plainfootstyle}[1]{}
@@ -845,9 +854,9 @@
\renewcommand*{\vleftofline}[1]{#1}
\DeclareDocumentCommand{\PoemTitle}{s o o m}{%
-\IfValueTF{#2}%
-{\poemtitle[#2]{#4}}%
-{\poemtitle{#4}}%
+ \IfValueTF{#2}%
+ {\poemtitle[#2]{#4}}%
+ {\poemtitle{#4}}%
}
\renewcommand*{\NumberPoemTitle}{}
@@ -1019,10 +1028,10 @@
\renewcommand{\postcaption}[1]{}
\renewcommand{\midbicaption}[1]{}
\renewcommand{\contcaption}[1]{%
-\begin{LWR at figcaption}% later becomes \caption*
-\LWR at isolate{\@nameuse{\@captype name}}~%
-\thechapter.\the\value{\@captype}\CaptionSeparator\LWR at isolate{#1}%
-\end{LWR at figcaption}
+ \begin{LWR at figcaption}% later becomes \caption*
+ \LWR at isolate{\@nameuse{\@captype name}}~%
+ \thechapter.\the\value{\@captype}\CaptionSeparator\LWR at isolate{#1}%
+ \end{LWR at figcaption}%
}
\newlength{\abovelegendskip}
@@ -1032,11 +1041,11 @@
\renewcommand{\legend}[1]{\begin{center}#1\\\end{center}}
-\renewcommand{\namedlegend}[2][]{
-\begin{center}
-\@nameuse{fleg\@captype}\CaptionSeparator#2\\
-\end{center}
-\@nameuse{flegtoc\@captype}{#1}
+\renewcommand{\namedlegend}[2][]{%
+ \begin{center}
+ \@nameuse{fleg\@captype}\CaptionSeparator#2\\
+ \end{center}
+ \@nameuse{flegtoc\@captype}{#1}
}
\renewcommand{\newfixedcaption}[3][\caption]{%
@@ -1047,54 +1056,54 @@
\providecommand{#2}{\def\@captype{#3}#1}}
\renewcommand{\bitwonumcaption}[6][]{%
-\ifblank{#2}{\caption{#3}}{\caption[#2]{#3}}%
-\addtocounter{\@captype}{-1}%
-\begingroup%
-\csdef{\@captype name}{#4}%
-\ifblank{#5}{\caption{#6}}{\caption[#5]{#6}}%
-\endgroup%
-\ifblank{#1}{}{\label{#1}}%
+ \ifblank{#2}{\caption{#3}}{\caption[#2]{#3}}%
+ \addtocounter{\@captype}{-1}%
+ \begingroup%
+ \csdef{\@captype name}{#4}%
+ \ifblank{#5}{\caption{#6}}{\caption[#5]{#6}}%
+ \endgroup%
+ \ifblank{#1}{}{\label{#1}}%
}
\LetLtxMacro\bionenumcaption\bitwonumcaption% todo
\renewcommand{\bicaption}[5][]{%
-\ifblank{#2}{\caption{#3}}{\caption[#2]{#3}}%
-\begin{LWR at figcaption}% later becomes \caption*
-\LWR at isolate{#4} \thechapter.\the\value{\@captype}\CaptionSeparator\LWR at isolate{#5}%
-\end{LWR at figcaption}
-\ifblank{#1}{}{\label{#1}}%
+ \ifblank{#2}{\caption{#3}}{\caption[#2]{#3}}%
+ \begin{LWR at figcaption}% later becomes \caption*
+ \LWR at isolate{#4} % space
+ \thechapter.\the\value{\@captype}\CaptionSeparator\LWR at isolate{#5}%
+ \end{LWR at figcaption}%
+ \ifblank{#1}{}{\label{#1}}%
}
\renewcommand{\bicontcaption}[3]{%
-\contcaption{#1}%
-\begingroup%
-\csdef{\@captype name}{#2}%
-\contcaption{#3}%
-\endgroup%
+ \contcaption{#1}%
+ \begingroup%
+ \csdef{\@captype name}{#2}%
+ \contcaption{#3}%
+ \endgroup%
}
\RenewDocumentCommand{\subtop}{O{} O{} m}{%
-\subfloat[#1][#2]{#3}%
+ \subfloat[#1][#2]{#3}%
}
\RenewDocumentCommand{\subbottom}{O{} O{} m}{%
-\subfloat[#1][#2]{#3}%
+ \subfloat[#1][#2]{#3}%
}
\renewcommand{\contsubtop}{%
-\ContinuedFloat\addtocounter{\@captype}{1}%
-\subtop}
+ \ContinuedFloat\addtocounter{\@captype}{1}%
+ \subtop%
+}
\renewcommand{\contsubbottom}{%
-\ContinuedFloat\addtocounter{\@captype}{1}%
-\subbottom}
+ \ContinuedFloat\addtocounter{\@captype}{1}%
+ \subbottom%
+}
\renewcommand{\subconcluded}{}
-\let\subfigure\subbottom
-\let\subtable\subtop
-
\let\contsubtable\contsubtop
\let\contsubfigure\contsubbottom
\newcommand{\newfloatentry}[4][\@empty]{TODO: newfloatentry}
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pbox.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pbox.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pbox.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `pbox')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Added: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfcol.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfcol.sty (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfcol.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -0,0 +1,38 @@
+%%
+%% This is file `lwarp-pdfcol.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx (with options: `pdfcol')
+%% 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 at ProvidesPackageDrop{pdfcol}[2018/11/01]
+
+\ltx at newif\ifpdfcolAvailable
+\pdfcolAvailablefalse
+
+\def\pdfcolErrorNoStacks{
+ \PackageInfo{lwarp-pdfcol}{Ignoring pdfcol for HTML output.}
+}
+
+\def\pdfcolInitStack#1{}%
+
+\long\def\pdfcolIfStackExists#1#2#3{#3}%
+
+\def\pdfcolSwitchStack#1{}%
+
+\def\pdfcolSetCurrentColor{}%
+
+\def\pdfcolSetCurrent#1{}%
+\endinput
+%%
+%% End of file `lwarp-pdfcol.sty'.
Property changes on: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfcol.sty
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfcolfoot.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfcolfoot.sty (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfcolfoot.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -0,0 +1,25 @@
+%%
+%% This is file `lwarp-pdfcolfoot.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx (with options: `pdfcolfoot')
+%% 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 at ProvidesPackageDrop{pdfcolfoot}[2016/05/16]
+
+\newcommand*{\pdfcolfoot at switch}{}
+
+\newcommand*{\pdfcolfoot at current}{}
+\endinput
+%%
+%% End of file `lwarp-pdfcolfoot.sty'.
Property changes on: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfcolfoot.sty
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfcolmk.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfcolmk.sty (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfcolmk.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -0,0 +1,21 @@
+%%
+%% This is file `lwarp-pdfcolmk.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx (with options: `pdfcolmk')
+%% 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 at ProvidesPackageDrop{pdfcolmk}[2016/05/16]
+\endinput
+%%
+%% End of file `lwarp-pdfcolmk.sty'.
Property changes on: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfcolmk.sty
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfcolparallel.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfcolparallel.sty (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfcolparallel.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -0,0 +1,29 @@
+%%
+%% This is file `lwarp-pdfcolparallel.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx (with options: `pdfcolparallel')
+%% 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.
+\RequirePackage{keyval}%
+
+\LWR at ProvidesPackageDropA{pdfcolparallel}{2016/05/16}
+\DeclareOption*{%
+ \PassoptionsToPackage{\CurrentOption}{parallel}%
+}
+\LWR at ProvidesPackageDropB
+\RequirePackage{parallel}[2003/04/13]
+\define at key{parallel}{rulebetweencolor}{}
+\endinput
+%%
+%% End of file `lwarp-pdfcolparallel.sty'.
Property changes on: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfcolparallel.sty
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfcolparcolumns.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfcolparcolumns.sty (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfcolparcolumns.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -0,0 +1,27 @@
+%%
+%% This is file `lwarp-pdfcolparcolumns.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx (with options: `pdfcolparcolumns')
+%% 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 at ProvidesPackageDropA{pdfcolparcolumns}{2016/05/16}
+\DeclareOption*{%
+ \PassoptionsToPackage{\CurrentOption}{parcolumns}%
+}
+\LWR at ProvidesPackageDropB
+\RequirePackage{parcolumns}[2004/11/25]
+\define at key{LWRparcols}{rulebetweencolor}{}
+\endinput
+%%
+%% End of file `lwarp-pdfcolparcolumns.sty'.
Property changes on: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfcolparcolumns.sty
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfcomment.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfcomment.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfcomment.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `pdfcomment')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfcrypt.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfcrypt.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfcrypt.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `pdfcrypt')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pdflscape.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pdflscape.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pdflscape.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `pdflscape')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfmarginpar.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfmarginpar.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfmarginpar.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `pdfmarginpar')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfpages.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfpages.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfpages.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `pdfpages')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfprivacy.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfprivacy.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfprivacy.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `pdfprivacy')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfrender.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfrender.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfrender.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `pdfrender')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfsync.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfsync.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfsync.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `pdfsync')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pdftricks.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pdftricks.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pdftricks.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `pdftricks')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfx.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfx.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfx.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `pdfx')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-perpage.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-perpage.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-perpage.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `perpage')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pfnote.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pfnote.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pfnote.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `pfnote')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-phfqit.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-phfqit.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-phfqit.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `phfqit')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Added: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-physics.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-physics.sty (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-physics.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -0,0 +1,282 @@
+%%
+%% This is file `lwarp-physics.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx (with options: `physics')
+%% 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 at ProvidesPackagePass{physics}% No date is provided by the package.
+\begin{warpMathJax}
+\CustomizeMathJax{\newcommand{\quantity}{}}
+\CustomizeMathJax{\let\qty\quantity}
+\CustomizeMathJax{\newcommand{\pqty}[1]{\left(#1\right)}}
+\CustomizeMathJax{\newcommand{\bqty}[1]{\left\lbrack#1\right\rbrack}}
+\CustomizeMathJax{\newcommand{\vqty}[1]{\left\vert#1\right\rvert}}
+\CustomizeMathJax{\newcommand{\Bqty}[1]{\left\lbrace#1\right\rbrace}}
+
+\CustomizeMathJax{\newcommand{\absolutevalue}[1]{\left\lvert#1\right\rvert}}
+\CustomizeMathJax{\let\abs\absolutevalue}
+
+\CustomizeMathJax{\newcommand{\norm}[1]{%
+ \left\lvert\left\lvert#1\right\rvert\right\rvert}%
+}
+
+\CustomizeMathJax{\newcommand{\evaluated}[1]{#1\vert}}
+\CustomizeMathJax{\let\eval\evaluated}
+
+\CustomizeMathJax{\newcommand{\order}[1]{\mathcal{O}\left(#1\right)}}
+
+\CustomizeMathJax{\newcommand{\commutator}[2]{\left\lbrack#1,#2\right\rbrack}}
+\CustomizeMathJax{\let\comm\commutator}
+
+\CustomizeMathJax{\newcommand{\anticommutator}[2]{%
+ \left\lbrace#1,#2\right\rbrace}%
+}
+\CustomizeMathJax{\let\acomm\anticommutator}
+
+\CustomizeMathJax{\let\poissonbracket\anticommutator}
+\CustomizeMathJax{\let\pb\anticommutator}
+
+\CustomizeMathJax{\newcommand{\vectorbold}[1]{\mathbf{#1}}}
+\CustomizeMathJax{\let\vb\vectorbold}
+
+\CustomizeMathJax{\newcommand{\vectorarrow}[1]{\vec{\mathbf{#1}}}}
+\CustomizeMathJax{\let\va\vectorarrow}
+
+\CustomizeMathJax{\newcommand{\vectorunit}[1]{\mathbf{\hat{#1}}}}
+\CustomizeMathJax{\let\va\vectorunit}
+
+\CustomizeMathJax{\newcommand{\dotproduct}{\boldsymbol\cdot}}
+\CustomizeMathJax{\let\vdot\dotproduct}
+
+\CustomizeMathJax{\newcommand{\crossproduct}{\boldsymbol\times}}
+\CustomizeMathJax{\let\cross\crossproduct}
+\CustomizeMathJax{\let\cp\crossproduct}
+
+\CustomizeMathJax{\newcommand{\gradient}{\mathbf{\nabla}}}
+\CustomizeMathJax{\let\grad\gradient}
+
+\CustomizeMathJax{\let\divisionsymbol\div}
+
+\CustomizeMathJax{\newcommand{\divergence}{\nabla\vdot}}
+\CustomizeMathJax{\let\div\divergence}
+
+\CustomizeMathJax{\newcommand{\curl}{\nabla\cross}}
+
+\CustomizeMathJax{\newcommand{\laplacian}{\nabla^2}}
+
+\ifx\trigopt 1
+ \CustomizeMathJax{\DeclareMathOperator{\sine}{sin}}
+ \CustomizeMathJax{\DeclareMathOperator{\cosine}{cos}}
+ \CustomizeMathJax{\DeclareMathOperator{\tangent}{tan}}
+ \CustomizeMathJax{\DeclareMathOperator{\cosecant}{csc}}
+ \CustomizeMathJax{\DeclareMathOperator{\secant}{sec}}
+ \CustomizeMathJax{\DeclareMathOperator{\cotangent}{cot}}
+ \CustomizeMathJax{\DeclareMathOperator{\arcsine}{arcsin}}
+ \CustomizeMathJax{\DeclareMathOperator{\arccosine}{arccos}}
+ \CustomizeMathJax{\DeclareMathOperator{\arctangent}{arctan}}
+ \CustomizeMathJax{\DeclareMathOperator{\hypsine}{sinh}}
+ \CustomizeMathJax{\DeclareMathOperator{\hypcosine}{cosh}}
+ \CustomizeMathJax{\DeclareMathOperator{\hyptangent}{tanh}}
+ \CustomizeMathJax{\DeclareMathOperator{\hypcotangent}{coth}}
+ \CustomizeMathJax{\DeclareMathOperator{\exponential}{exp}}
+ \CustomizeMathJax{\DeclareMathOperator{\logarithm}{log}}
+ \CustomizeMathJax{\DeclareMathOperator{\naturallogarithm}{\ln}}
+ \CustomizeMathJax{\DeclareMathOperator{\determinant}{det}}
+ \CustomizeMathJax{\DeclareMathOperator{\Probability}{Pr}}
+ \CustomizeMathJax{\newcommand{\sin}[1][{}]{\mathrm{sin}^#1}}
+ \CustomizeMathJax{\newcommand{\sinh}[1][{}]{\mathrm{sinh}^#1}}
+ \CustomizeMathJax{\newcommand{\arcsin}[1][{}]{\mathrm{arcsin}^#1}}
+ \CustomizeMathJax{\newcommand{\asin}[1][{}]{\mathrm{asin}^#1}}
+ \CustomizeMathJax{\newcommand{\cos}[1][{}]{\mathrm{cos}^#1}}
+ \CustomizeMathJax{\newcommand{\cosh}[1][{}]{\mathrm{cosh}^#1}}
+ \CustomizeMathJax{\newcommand{\arccos}[1][{}]{\mathrm{arccos}^#1}}
+ \CustomizeMathJax{\newcommand{\acos}[1][{}]{\mathrm{acos}^#1}}
+ \CustomizeMathJax{\newcommand{\tan}[1][{}]{\mathrm{tan}^#1}}
+ \CustomizeMathJax{\newcommand{\tanh}[1][{}]{\mathrm{tanh}^#1}}
+ \CustomizeMathJax{\newcommand{\arctan}[1][{}]{\mathrm{arctan}^#1}}
+ \CustomizeMathJax{\newcommand{\atan}[1][{}]{\mathrm{atan}^#1}}
+ \CustomizeMathJax{\newcommand{\csc}[1][{}]{\mathrm{csc}^#1}}
+ \CustomizeMathJax{\newcommand{\csch}[1][{}]{\mathrm{csch}^#1}}
+ \CustomizeMathJax{\newcommand{\arccsc}[1][{}]{\mathrm{arccsc}^#1}}
+ \CustomizeMathJax{\newcommand{\acsc}[1][{}]{\mathrm{acsc}^#1}}
+ \CustomizeMathJax{\newcommand{\sec}[1][{}]{\mathrm{sec}^#1}}
+ \CustomizeMathJax{\newcommand{\sech}[1][{}]{\mathrm{sech}^#1}}
+ \CustomizeMathJax{\newcommand{\arcsec}[1][{}]{\mathrm{arcsec}^#1}}
+ \CustomizeMathJax{\newcommand{\asec}[1][{}]{\mathrm{asec}^#1}}
+ \CustomizeMathJax{\newcommand{\cot}[1][{}]{\mathrm{cot}^#1}}
+ \CustomizeMathJax{\newcommand{\coth}[1][{}]{\mathrm{coth}^#1}}
+ \CustomizeMathJax{\newcommand{\arccot}[1][{}]{\mathrm{arccot}^#1}}
+ \CustomizeMathJax{\newcommand{\acot}[1][{}]{\mathrm{acot}^#1}}
+\else
+ \CustomizeMathJax{\DeclareMathOperator{\arccsc}{arccsc}}
+ \CustomizeMathJax{\DeclareMathOperator{\arcsec}{arcsec}}
+ \CustomizeMathJax{\DeclareMathOperator{\arccot}{arccot}}
+ \CustomizeMathJax{\DeclareMathOperator{\asin}{asin}}
+ \CustomizeMathJax{\DeclareMathOperator{\acos}{acos}}
+ \CustomizeMathJax{\DeclareMathOperator{\atan}{atan}}
+ \CustomizeMathJax{\DeclareMathOperator{\acsc}{acsc}}
+ \CustomizeMathJax{\DeclareMathOperator{\asec}{asec}}
+ \CustomizeMathJax{\DeclareMathOperator{\acot}{acot}}
+ \CustomizeMathJax{\DeclareMathOperator{\csch}{csch}}
+ \CustomizeMathJax{\DeclareMathOperator{\sech}{sech}}
+ \CustomizeMathJax{\newcommand{\tr}{\trace}}
+ \CustomizeMathJax{\newcommand{\Tr}{\Trace}}
+ \CustomizeMathJax{\newcommand{\Res}{\Residue}}
+\fi
+
+\CustomizeMathJax{\DeclareMathOperator{\trace}{tr}}
+\CustomizeMathJax{\let\tr\trace}
+\CustomizeMathJax{\DeclareMathOperator{\Trace}{Tr}}
+\CustomizeMathJax{\let\Tr\Trace}
+\CustomizeMathJax{\DeclareMathOperator{\rank}{rank}}
+\CustomizeMathJax{\DeclareMathOperator{\erf}{erf}}
+\CustomizeMathJax{\DeclareMathOperator{\Residue}{Res}}
+\CustomizeMathJax{\newcommand{\principalvalue}{\mathcal{P}}}
+\CustomizeMathJax{\let\pv\principalvalue}
+\CustomizeMathJax{\newcommand{\PV}{\text{P.V.}}}
+\CustomizeMathJax{\newcommand{\real}{\mathcal{R}}}
+\CustomizeMathJax{\newcommand{\imaginary}{\mathcal{I}}}
+
+\CustomizeMathJax{\newcommand{\Re}[1]{\mathrm{Re}\left\lbrace#1\right\rbrace}}
+\CustomizeMathJax{\newcommand{\Im}[1]{\mathrm{Im}\left\lbrace#1\right\rbrace}}
+
+\CustomizeMathJax{\newcommand{\qqtext}[1]{\quad\mathrm{#1}\quad}}
+\CustomizeMathJax{\let\qq\qqtext}
+\CustomizeMathJax{\newcommand{\qqcomma}{\text{,}\quad}}
+\CustomizeMathJax{\let\qc\qqcomma}
+\CustomizeMathJax{\newcommand{\qcc}{\quad\text{c.c.}\quad}}
+\CustomizeMathJax{\let\qcc}
+\CustomizeMathJax{\newcommand{\qif}{\quad\text{if}\quad}}
+\CustomizeMathJax{\newcommand{\qthen}{\quad\text{then}\quad}}
+\CustomizeMathJax{\newcommand{\qelse}{\quad\text{else}\quad}}
+\CustomizeMathJax{\newcommand{\qotherwise}{\quad\text{otherwise}\quad}}
+\CustomizeMathJax{\newcommand{\qunless}{\quad\text{unless}\quad}}
+\CustomizeMathJax{\newcommand{\qgiven}{\quad\text{given}\quad}}
+\CustomizeMathJax{\newcommand{\qusing}{\quad\text{using}\quad}}
+\CustomizeMathJax{\newcommand{\qassume}{\quad\text{assume}\quad}}
+\CustomizeMathJax{\newcommand{\qsince}{\quad\text{since}\quad}}
+\CustomizeMathJax{\newcommand{\qlet}{\quad\text{let}\quad}}
+\CustomizeMathJax{\newcommand{\qfor}{\quad\text{for}\quad}}
+\CustomizeMathJax{\newcommand{\qall}{\quad\text{all}\quad}}
+\CustomizeMathJax{\newcommand{\qeven}{\quad\text{even}\quad}}
+\CustomizeMathJax{\newcommand{\qodd}{\quad\text{odd}\quad}}
+\CustomizeMathJax{\newcommand{\qinteger}{\quad\text{integer}\quad}}
+\CustomizeMathJax{\newcommand{\qand}{\quad\text{and}\quad}}
+\CustomizeMathJax{\newcommand{\qor}{\quad\text{or}\quad}}
+\CustomizeMathJax{\newcommand{\qas}{\quad\text{as}\quad}}
+\CustomizeMathJax{\newcommand{\qin}{\quad\text{in}\quad}}
+
+\CustomizeMathJax{\newcommand{\differential}[1][]{\text{d}^{#1}}}
+\CustomizeMathJax{\let\dd\differential}
+
+\CustomizeMathJax{\newcommand{\derivative}[3][]{%
+ \frac{\text{d}^{#1}#2}{\text{d}#3^{#1}}}%
+}
+\CustomizeMathJax{\let\dv\derivative}
+
+\CustomizeMathJax{\newcommand{\partialderivative}[3][]{%
+ \frac{\partial^{#1}#2}{\partial#3^{#1}}}%
+}
+\CustomizeMathJax{\let\pderivative\partialderivative}
+\CustomizeMathJax{\let\pdv\partialderivative}
+
+\CustomizeMathJax{\newcommand{\variation}{\delta}}
+\CustomizeMathJax{\let\var\variation}
+
+\CustomizeMathJax{\newcommand{\functionalderivative}[3][]{%
+ \frac{\delta^{#1}#2}{\delta#3^{#1}}}%
+}
+\CustomizeMathJax{\let\fdv\functionalderivative}
+
+\CustomizeMathJax{\newcommand{\bra}[1]{\langle{#1}\rvert}}
+\CustomizeMathJax{\newcommand{\ket}[1]{\lvert{#1}\rangle}}
+
+\CustomizeMathJax{\newcommand{\innerproduct}[2]{%
+ \left\langle{#1}\middle\vert{#2}\right\rangle}%
+}
+\CustomizeMathJax{\let\braket\innerproduct}
+\CustomizeMathJax{\let\ip\innerproduct}
+
+\CustomizeMathJax{\newcommand{\outerproduct}[2]{%
+ \left\lvert{#1}\middle\rangle\!\middle\langle#2\right\rvert}%
+}
+\CustomizeMathJax{\let\dyad\outerproduct}
+\CustomizeMathJax{\let\op\outerproduct}
+
+\CustomizeMathJax{\newcommand{\expectationvalue}[2]{%
+ \left\langle{#2}\middle\vert{#1}\middle\vert{#2}\right\rangle}%
+}
+\CustomizeMathJax{\let\expval\expectationvalue}
+\CustomizeMathJax{\let\ev\expectationvalue}
+
+\CustomizeMathJax{\newcommand{\matrixelement}[3]{%
+ \left\langle{#1}\middle\vert{#2}\middle\vert{#3}\right\rangle}%
+}
+\CustomizeMathJax{\let\mel\matrixelement}
+
+\CustomizeMathJax{\newcommand{\matrixquantity}[1]{\begin{matrix}#1\end{matrix}}}
+\CustomizeMathJax{\let\mqty\matrixquantity}
+\CustomizeMathJax{\newcommand{\pmqty}[1]{\begin{pmatrix}#1\end{pmatrix}}}
+\CustomizeMathJax{\newcommand{\Pmqty}[1]{%
+ \left\lgroup\begin{matrix}#1\end{matrix}\right\rgroup}%
+}
+\CustomizeMathJax{\newcommand{\bmqty}[1]{\begin{bmatrix}#1\end{bmatrix}}}
+\CustomizeMathJax{\newcommand{\vmqty}[1]{\begin{vmatrix}#1\end{vmatrix}}}
+
+\CustomizeMathJax{\newcommand{\smallmatrixquantity}[1]{%
+ \begin{smallmatrix}#1\end{smallmatrix}}%
+}
+\CustomizeMathJax{\let\smqty\smallmatrixquantity}
+\CustomizeMathJax{\newcommand{\spmqty}[1]{%
+ \pqty{\begin{smallmatrix}#1\end{smallmatrix}}}%
+}
+\CustomizeMathJax{\newcommand{\sPmqty}[1]{%
+ \left\lgroup\begin{smallmatrix}#1\end{smallmatrix}\right\rgroup}%
+}
+\CustomizeMathJax{\newcommand{\sbmqty}[1]{%
+ \bqty{\begin{smallmatrix}#1\end{smallmatrix}}}%
+}
+\CustomizeMathJax{\newcommand{\svmqty}[1]{%
+ \vqty{\begin{smallmatrix}#1\end{smallmatrix}}}%
+}
+
+\CustomizeMathJax{\let\matrixdeterminant\vmqty}
+\CustomizeMathJax{\let\mdet\vmqty}
+\CustomizeMathJax{\let\smdet\svmqty}
+
+\CustomizeMathJax{\newcommand{\identitymatrix}[1]{(\text{imat}\{#1\})}}
+\CustomizeMathJax{\let\imat\identitymatrix}
+
+\CustomizeMathJax{\newcommand{\xmatrix}[3]{(\text{xmat}\{\}\{#2\}\{#3\})}}
+\CustomizeMathJax{\let\xmat\xmatrix}
+
+\CustomizeMathJax{\newcommand{\zeromatrix}[2]{(\text{zmat}\{#1\}\{#2\})}}
+\CustomizeMathJax{\let\zmat\zeromatrix}
+
+\CustomizeMathJax{\newcommand{\paulimatrix}[1]{(\text{pmat}\{#1\})}}
+\CustomizeMathJax{\let\pmat\paulimatrix}
+
+\CustomizeMathJax{\newcommand{\diagonalmatrix}[2][]{%
+ \left(\text{dmat}\right)}%
+}
+\CustomizeMathJax{\let\dmat\diagonalmatrix}
+
+\CustomizeMathJax{\newcommand{\antidiagonalmatrix}[2][]{%
+ \left(\text{admat}\right)}%
+}
+\CustomizeMathJax{\let\admat\antidiagonalmatrix}
+\end{warpMathJax}
+\endinput
+%%
+%% End of file `lwarp-physics.sty'.
Property changes on: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-physics.sty
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pifont.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pifont.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pifont.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `pifont')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-placeins.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-placeins.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-placeins.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `placeins')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-plarydshln.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-plarydshln.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-plarydshln.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `plarydshln')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-plext.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-plext.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-plext.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `plext')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-plextarydshln.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-plextarydshln.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-plextarydshln.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `plextarydshln')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-plextcolorbl.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-plextcolorbl.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-plextcolorbl.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `plextcolortbl')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-prelim2e.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-prelim2e.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-prelim2e.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `prelim2e')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-prettyref.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-prettyref.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-prettyref.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `prettyref')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-preview.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-preview.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-preview.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `preview')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-psfrag.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-psfrag.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-psfrag.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `psfrag')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-psfragx.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-psfragx.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-psfragx.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `psfragx')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pst-eps.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pst-eps.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pst-eps.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `pst-eps')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pstool.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pstool.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pstool.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `pstool')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pstricks.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pstricks.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pstricks.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `pstricks')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pxatbegshi.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pxatbegshi.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pxatbegshi.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `pxatbegshi')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pxeveryshi.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pxeveryshi.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pxeveryshi.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `pxeveryshi')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pxftnright.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pxftnright.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pxftnright.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `pxftnright')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pxjahyper.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pxjahyper.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-pxjahyper.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `pxjahyper')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-quotchap.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-quotchap.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-quotchap.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `quotchap')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-quoting.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-quoting.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-quoting.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `quoting')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-ragged2e.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-ragged2e.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-ragged2e.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `ragged2e')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-realscripts.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-realscripts.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-realscripts.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `realscripts')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-refcheck.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-refcheck.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-refcheck.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `refcheck')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-register.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-register.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-register.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `register')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-relsize.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-relsize.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-relsize.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `relsize')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-repeatindex.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-repeatindex.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-repeatindex.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `repeatindex')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-resizegather.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-resizegather.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-resizegather.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `resizegather')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-rmpage.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-rmpage.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-rmpage.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `rmpage')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-romanbar.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-romanbar.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-romanbar.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `romanbar')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-romanbarpagenumber.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-romanbarpagenumber.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-romanbarpagenumber.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `romanbarpagenumber')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-rotating.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-rotating.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-rotating.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `rotating')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-rotfloat.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-rotfloat.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-rotfloat.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `rotfloat')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-rviewport.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-rviewport.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-rviewport.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `rviewport')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-savetrees.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-savetrees.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-savetrees.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `savetrees')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-scalefnt.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-scalefnt.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-scalefnt.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `scalefnt')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-schemata.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-schemata.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-schemata.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `schemata')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-scrextend.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-scrextend.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-scrextend.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `scrextend')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-scrhack.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-scrhack.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-scrhack.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `scrhack')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-scrlayer-notecolumn.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-scrlayer-notecolumn.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-scrlayer-notecolumn.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `scrlayer-notecolumn')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-scrlayer-scrpage.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-scrlayer-scrpage.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-scrlayer-scrpage.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `scrlayer-scrpage')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-scrlayer.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-scrlayer.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-scrlayer.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `scrlayer')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-scrpage2.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-scrpage2.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-scrpage2.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `scrpage2')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-section.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-section.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-section.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `section')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-sectionbreak.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-sectionbreak.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-sectionbreak.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `sectionbreak')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-sectsty.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-sectsty.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-sectsty.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `sectsty')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-semantic-markup.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-semantic-markup.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-semantic-markup.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `semantic-markup')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-setspace.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-setspace.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-setspace.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `setspace')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-shadow.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-shadow.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-shadow.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `shadow')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-shapepar.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-shapepar.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-shapepar.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `shapepar')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-showidx.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-showidx.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-showidx.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `idx')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-showkeys.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-showkeys.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-showkeys.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `showkeys')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-showtags.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-showtags.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-showtags.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `showtags')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-sidecap.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-sidecap.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-sidecap.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `sidecap')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-sidenotes.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-sidenotes.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-sidenotes.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `sidenotes')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-siunitx.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-siunitx.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-siunitx.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `siunitx')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
@@ -94,18 +94,64 @@
\__siunitx_number_output_parse:n {#1}
}
{
- \__siunitx_unit_output_pre_print:
- \LWR at subsingledollar{% lwarp
- \textbackslash( \LWR at HTMLsanitize{#1} \textbackslash)% lwarp
- }{siunitx}{%
- \__siunitx_print:nn { number } {%
- \LWR at origensuredmath{#1}%
- }%
- }% lwarp
- \__siunitx_unit_output_print:
+ \__siunitx_unit_output_pre_print:
+ \begingroup% lwarp
+ \boolfalse{mathjax}% lwarp
+ \LWR at subsingledollar{% lwarp
+ \textbackslash( \LWR at HTMLsanitize{#1} \textbackslash)% lwarp
+ }{siunitx}{%
+ \__siunitx_print:nn { number } {%
+ \LWR at origensuredmath{#1}%
+ }%
+ }% lwarp
+ \endgroup% lwarp
+ \__siunitx_unit_output_print:
}
\group_end:% lwarp
}
+\cs_set_protected:Npn \__siunitx_range_numbers_aux:n #1
+ {
+ \bool_if:NTF \l__siunitx_number_parse_bool
+ {
+ \tl_clear:N \l__siunitx_number_out_tl
+ \tl_clear:N \l__siunitx_number_out_saved_tl
+ \bool_set_false:N \l__siunitx_number_compound_bool
+ \__siunitx_number_output_parse:n {#1}
+ \bool_if:NT \l__siunitx_number_compound_bool
+ { \msg_error:nnx { siunitx } { multi-part-range } {#1} }
+ }
+ {
+ \__siunitx_unit_output_pre_print:
+ \begingroup% lwarp
+ \boolfalse{mathjax}% lwarp
+ \LWR at subsingledollar{% lwarp
+ \textbackslash( \LWR at HTMLsanitize{#1} \textbackslash)% lwarp
+ }{siunitx}{%
+ \__siunitx_print:nn { number } {
+ \LWR at origensuredmath{#1}%
+ } % lwarp
+ }% lwarp
+ \endgroup% lwarp
+ \__siunitx_unit_output_print:
+ }
+ }
+\cs_set_protected:Npn \__siunitx_angle_print_direct_aux:nn #1#2 {
+ \tl_if_empty:nF {#1}
+ {
+ \tl_set:Nn \l__siunitx_unit_tl {#2}
+ \begingroup% lwarp
+ \boolfalse{mathjax}% lwarp
+ \LWR at subsingledollar{% lwarp
+ \textbackslash( \LWR at HTMLsanitize{#1} \textbackslash)% lwarp
+ }{siunitx}{%
+ \__siunitx_print:nn { number } {
+ \LWR at origensuredmath{#1}%
+ } % lwarp
+ }% lwarp
+ \endgroup% lwarp
+ \__siunitx_unit_output_print:
+ }
+}
\cs_undefine:N \__siunitx_number_output_quotient_fraction:
\cs_new_protected:Npn \__siunitx_number_output_quotient_fraction: {
\bool_set_true:N \l__siunitx_number_compound_bool
@@ -168,6 +214,8 @@
\l__siunitx_tmpa_tl
{ \__siunitx_print:nV { number } \l__siunitx_tmpa_tl }
}
+\cs_undefine:N \__siunitx_textsuperscript:n
+\cs_new_protected:Npn \__siunitx_textsuperscript:n #1 {\textsuperscript{#1}}
\RenewDocumentCommand \num { o m } {
\leavevmode
\group_begin:% lwarp
@@ -235,6 +283,207 @@
\ExplSyntaxOff
+\begin{warpMathJax}
+\CustomizeMathJax{\newcommand{\ang}[2][]{(\mathrm{#2})\degree}}
+\CustomizeMathJax{\newcommand{\num}[2][]{\mathrm{#2}}}
+\CustomizeMathJax{\newcommand{\si}[2][]{\mathrm{#2}}}
+\CustomizeMathJax{\newcommand{\LWRSI}[2][]{\mathrm{#1\LWRSInumber\,#2}}}
+\CustomizeMathJax{\newcommand{\SI}[2][]{\def\LWRSInumber{#2}\LWRSI}}
+\CustomizeMathJax{\newcommand{\numlist}[2][]{\mathrm{#2}}}
+\CustomizeMathJax{\newcommand{\numrange}[3][]{\mathrm{#2~-- #3}}}
+\CustomizeMathJax{\newcommand{\SIlist}[3][]{\mathrm{#2\,#3}}}
+\CustomizeMathJax{\newcommand{\SIrange}[4][]{\mathrm{#2\,#4~-- #3\,#4}}}
+\CustomizeMathJax{\newcommand{\tablenum}[2][]{\mathrm{#2}}}
+\CustomizeMathJax{\newcommand{\ampere}{\mathrm{A}}}
+\CustomizeMathJax{\newcommand{\candela}{\mathrm{cd}}}
+\CustomizeMathJax{\newcommand{\kelvin}{\mathrm{K}}}
+\CustomizeMathJax{\newcommand{\kilogram}{\mathrm{kg}}}
+\CustomizeMathJax{\newcommand{\metre}{\mathrm{m}}}
+\CustomizeMathJax{\newcommand{\mole}{\mathrm{mol}}}
+\CustomizeMathJax{\newcommand{\second}{\mathrm{s}}}
+\CustomizeMathJax{\newcommand{\becquerel}{\mathrm{Bq}}}
+\CustomizeMathJax{\newcommand{\degreeCelsius}{\unicode{x2103}}}
+\CustomizeMathJax{\newcommand{\coulomb}{\mathrm{C}}}
+\CustomizeMathJax{\newcommand{\farad}{\mathrm{F}}}
+\CustomizeMathJax{\newcommand{\gray}{\mathrm{Gy}}}
+\CustomizeMathJax{\newcommand{\hertz}{\mathrm{Hz}}}
+\CustomizeMathJax{\newcommand{\henry}{\mathrm{H}}}
+\CustomizeMathJax{\newcommand{\joule}{\mathrm{J}}}
+\CustomizeMathJax{\newcommand{\katal}{\mathrm{kat}}}
+\CustomizeMathJax{\newcommand{\lumen}{\mathrm{lm}}}
+\CustomizeMathJax{\newcommand{\lux}{\mathrm{lx}}}
+\CustomizeMathJax{\newcommand{\newton}{\mathrm{N}}}
+\CustomizeMathJax{\newcommand{\ohm}{\mathrm{\Omega}}}
+\CustomizeMathJax{\newcommand{\pascal}{\mathrm{Pa}}}
+\CustomizeMathJax{\newcommand{\radian}{\mathrm{rad}}}
+\CustomizeMathJax{\newcommand{\siemens}{\mathrm{S}}}
+\CustomizeMathJax{\newcommand{\sievert}{\mathrm{Sv}}}
+\CustomizeMathJax{\newcommand{\steradian}{\mathrm{sr}}}
+\CustomizeMathJax{\newcommand{\tesla}{\mathrm{T}}}
+\CustomizeMathJax{\newcommand{\volt}{\mathrm{V}}}
+\CustomizeMathJax{\newcommand{\watt}{\mathrm{W}}}
+\CustomizeMathJax{\newcommand{\weber}{\mathrm{Wb}}}
+\CustomizeMathJax{\newcommand{\day}{\mathrm{d}}}
+\CustomizeMathJax{\newcommand{\degree}{\mathrm{^\circ}}}
+\CustomizeMathJax{\newcommand{\hectare}{\mathrm{ha}}}
+\CustomizeMathJax{\newcommand{\hour}{\mathrm{h}}}
+\CustomizeMathJax{\newcommand{\litre}{\mathrm{l}}}
+\CustomizeMathJax{\newcommand{\liter}{\mathrm{L}}}
+\CustomizeMathJax{\newcommand{\arcminute}{^\prime}}
+\CustomizeMathJax{\newcommand{\minute}{\mathrm{min}}}
+\CustomizeMathJax{\newcommand{\arcsecond}{^{\prime\prime}}}
+\CustomizeMathJax{\newcommand{\tonne}{\mathrm{t}}}
+\CustomizeMathJax{\newcommand{\astronomicalunit}{au}}
+\CustomizeMathJax{\newcommand{\atomicmassunit}{u}}
+\CustomizeMathJax{\newcommand{\bohr}{\mathit{a}_0}}
+\CustomizeMathJax{\newcommand{\clight}{\mathit{c}_0}}
+\CustomizeMathJax{\newcommand{\dalton}{\mathrm{D}_\mathrm{a}}}
+\CustomizeMathJax{\newcommand{\electronmass}{\mathit{m}_{\mathrm{e}}}}
+\CustomizeMathJax{\newcommand{\electronvolt}{\mathrm{eV}}}
+\CustomizeMathJax{\newcommand{\elementarycharge}{\mathit{e}}}
+\CustomizeMathJax{\newcommand{\hartree}{\mathit{E}_{\mathrm{h}}}}
+\CustomizeMathJax{\newcommand{\planckbar}{\mathit{\unicode{x0127}}}}
+\CustomizeMathJax{\newcommand{\angstrom}{\mathrm{\unicode{x00C5}}}}
+\CustomizeMathJax{\let\LWRorigbar\bar}
+\CustomizeMathJax{\newcommand{\bar}{\mathrm{bar}}}
+\CustomizeMathJax{\newcommand{\barn}{\mathrm{b}}}
+\CustomizeMathJax{\newcommand{\bel}{\mathrm{B}}}
+\CustomizeMathJax{\newcommand{\decibel}{\mathrm{dB}}}
+\CustomizeMathJax{\newcommand{\knot}{\mathrm{kn}}}
+\CustomizeMathJax{\newcommand{\mmHg}{\mathrm{mmHg}}}
+\CustomizeMathJax{\newcommand{\nauticalmile}{\mathrm{M}}}
+\CustomizeMathJax{\newcommand{\neper}{\mathrm{Np}}}
+\CustomizeMathJax{\newcommand{\yocto}{\mathrm{y}}}
+\CustomizeMathJax{\newcommand{\zepto}{\mathrm{z}}}
+\CustomizeMathJax{\newcommand{\atto}{\mathrm{a}}}
+\CustomizeMathJax{\newcommand{\femto}{\mathrm{f}}}
+\CustomizeMathJax{\newcommand{\pico}{\mathrm{p}}}
+\CustomizeMathJax{\newcommand{\nano}{\mathrm{n}}}
+\CustomizeMathJax{\newcommand{\micro}{\mathrm{\unicode{x00B5}}}}
+\CustomizeMathJax{\newcommand{\milli}{\mathrm{m}}}
+\CustomizeMathJax{\newcommand{\centi}{\mathrm{c}}}
+\CustomizeMathJax{\newcommand{\deci}{\mathrm{d}}}
+\CustomizeMathJax{\newcommand{\deca}{\mathrm{da}}}
+\CustomizeMathJax{\newcommand{\hecto}{\mathrm{h}}}
+\CustomizeMathJax{\newcommand{\kilo}{\mathrm{k}}}
+\CustomizeMathJax{\newcommand{\mega}{\mathrm{M}}}
+\CustomizeMathJax{\newcommand{\giga}{\mathrm{G}}}
+\CustomizeMathJax{\newcommand{\tera}{\mathrm{T}}}
+\CustomizeMathJax{\newcommand{\peta}{\mathrm{P}}}
+\CustomizeMathJax{\newcommand{\exa}{\mathrm{E}}}
+\CustomizeMathJax{\newcommand{\zetta}{\mathrm{Z}}}
+\CustomizeMathJax{\newcommand{\yotta}{\mathrm{Y}}}
+\CustomizeMathJax{\newcommand{\percent}{\mathrm{\%}}}
+\CustomizeMathJax{\newcommand{\meter}{\mathrm{m}}}
+\CustomizeMathJax{\newcommand{\metre}{\mathrm{m}}}
+\CustomizeMathJax{\newcommand{\gram}{\mathrm{g}}}
+\CustomizeMathJax{\newcommand{\kg}{\kilo\gram}}
+\CustomizeMathJax{\newcommand{\of}[1]{_{\mathrm{#1}}}}
+\CustomizeMathJax{\newcommand{\squared}{^2}}
+\CustomizeMathJax{\newcommand{\square}[1]{\mathrm{#1}^2}}
+\CustomizeMathJax{\newcommand{\cubed}{^3}}
+\CustomizeMathJax{\newcommand{\cubic}[1]{\mathrm{#1}^3}}
+\CustomizeMathJax{\newcommand{\per}{/}}
+\CustomizeMathJax{\newcommand{\celsius}{\unicode{x2103}}}
+\CustomizeMathJax{\newcommand{\fg}{\femto\gram}}
+\CustomizeMathJax{\newcommand{\pg}{\pico\gram}}
+\CustomizeMathJax{\newcommand{\ng}{\nano\gram}}
+\CustomizeMathJax{\newcommand{\ug}{\micro\gram}}
+\CustomizeMathJax{\newcommand{\mg}{\milli\gram}}
+\CustomizeMathJax{\newcommand{\g}{\gram}}
+\CustomizeMathJax{\newcommand{\kg}{\kilo\gram}}
+\CustomizeMathJax{\newcommand{\amu}{\mathrm{u}}}
+\CustomizeMathJax{\newcommand{\pm}{\pico\metre}}
+\CustomizeMathJax{\newcommand{\nm}{\nano\metre}}
+\CustomizeMathJax{\newcommand{\um}{\micro\metre}}
+\CustomizeMathJax{\newcommand{\mm}{\milli\metre}}
+\CustomizeMathJax{\newcommand{\cm}{\centi\metre}}
+\CustomizeMathJax{\newcommand{\dm}{\deci\metre}}
+\CustomizeMathJax{\newcommand{\m}{\metre}}
+\CustomizeMathJax{\newcommand{\km}{\kilo\metre}}
+\CustomizeMathJax{\newcommand{\as}{\atto\second}}
+\CustomizeMathJax{\newcommand{\fs}{\femto\second}}
+\CustomizeMathJax{\newcommand{\ps}{\pico\second}}
+\CustomizeMathJax{\newcommand{\ns}{\nano\second}}
+\CustomizeMathJax{\newcommand{\us}{\micro\second}}
+\CustomizeMathJax{\newcommand{\ms}{\milli\second}}
+\CustomizeMathJax{\newcommand{\s}{\second}}
+\CustomizeMathJax{\newcommand{\fmol}{\femto\mol}}
+\CustomizeMathJax{\newcommand{\pmol}{\pico\mol}}
+\CustomizeMathJax{\newcommand{\nmol}{\nano\mol}}
+\CustomizeMathJax{\newcommand{\umol}{\micro\mol}}
+\CustomizeMathJax{\newcommand{\mmol}{\milli\mol}}
+\CustomizeMathJax{\newcommand{\mol}{\mol}}
+\CustomizeMathJax{\newcommand{\kmol}{\kilo\mol}}
+\CustomizeMathJax{\newcommand{\pA}{\pico\ampere}}
+\CustomizeMathJax{\newcommand{\nA}{\nano\ampere}}
+\CustomizeMathJax{\newcommand{\uA}{\micro\ampere}}
+\CustomizeMathJax{\newcommand{\mA}{\milli\ampere}}
+\CustomizeMathJax{\newcommand{\A}{\ampere}}
+\CustomizeMathJax{\newcommand{\kA}{\kilo\ampere}}
+\CustomizeMathJax{\newcommand{\ul}{\micro\litre}}
+\CustomizeMathJax{\newcommand{\ml}{\milli\litre}}
+\CustomizeMathJax{\newcommand{\l}{\litre}}
+\CustomizeMathJax{\newcommand{\hl}{\hecto\litre}}
+\CustomizeMathJax{\newcommand{\uL}{\micro\liter}}
+\CustomizeMathJax{\newcommand{\mL}{\milli\liter}}
+\CustomizeMathJax{\newcommand{\L}{\liter}}
+\CustomizeMathJax{\newcommand{\hL}{\hecto\liter}}
+\CustomizeMathJax{\newcommand{\mHz}{\milli\hertz}}
+\CustomizeMathJax{\newcommand{\Hz}{\hertz}}
+\CustomizeMathJax{\newcommand{\kHz}{\kilo\hertz}}
+\CustomizeMathJax{\newcommand{\MHz}{\mega\hertz}}
+\CustomizeMathJax{\newcommand{\GHz}{\giga\hertz}}
+\CustomizeMathJax{\newcommand{\THz}{\tera\hertz}}
+\CustomizeMathJax{\newcommand{\mN}{\milli\newton}}
+\CustomizeMathJax{\newcommand{\N}{\newton}}
+\CustomizeMathJax{\newcommand{\kN}{\kilo\newton}}
+\CustomizeMathJax{\newcommand{\MN}{\mega\newton}}
+\CustomizeMathJax{\newcommand{\Pa}{\pascal}}
+\CustomizeMathJax{\newcommand{\kPa}{\kilo\pascal}}
+\CustomizeMathJax{\newcommand{\MPa}{\mega\pascal}}
+\CustomizeMathJax{\newcommand{\GPa}{\giga\pascal}}
+\CustomizeMathJax{\newcommand{\mohm}{\milli\ohm}}
+\CustomizeMathJax{\newcommand{\kohm}{\kilo\ohm}}
+\CustomizeMathJax{\newcommand{\Mohm}{\mega\ohm}}
+\CustomizeMathJax{\newcommand{\pV}{\pico\volt}}
+\CustomizeMathJax{\newcommand{\nV}{\nano\volt}}
+\CustomizeMathJax{\newcommand{\uV}{\micro\volt}}
+\CustomizeMathJax{\newcommand{\mV}{\milli\volt}}
+\CustomizeMathJax{\newcommand{\V}{\volt}}
+\CustomizeMathJax{\newcommand{\kV}{\kilo\volt}}
+\CustomizeMathJax{\newcommand{\W}{\watt}}
+\CustomizeMathJax{\newcommand{\uW}{\micro\watt}}
+\CustomizeMathJax{\newcommand{\mW}{\milli\watt}}
+\CustomizeMathJax{\newcommand{\kW}{\kilo\watt}}
+\CustomizeMathJax{\newcommand{\MW}{\mega\watt}}
+\CustomizeMathJax{\newcommand{\GW}{\giga\watt}}
+\CustomizeMathJax{\newcommand{\J}{\joule}}
+\CustomizeMathJax{\newcommand{\uJ}{\micro\joule}}
+\CustomizeMathJax{\newcommand{\mJ}{\milli\joule}}
+\CustomizeMathJax{\newcommand{\kJ}{\kilo\joule}}
+\CustomizeMathJax{\newcommand{\eV}{\electronvolt}}
+\CustomizeMathJax{\newcommand{\meV}{\milli\electronvolt}}
+\CustomizeMathJax{\newcommand{\keV}{\kilo\electronvolt}}
+\CustomizeMathJax{\newcommand{\MeV}{\mega\electronvolt}}
+\CustomizeMathJax{\newcommand{\GeV}{\giga\electronvolt}}
+\CustomizeMathJax{\newcommand{\TeV}{\tera\electronvolt}}
+\CustomizeMathJax{\newcommand{\kWh}{\kilo\watt\hour}}
+\CustomizeMathJax{\newcommand{\F}{\farad}}
+\CustomizeMathJax{\newcommand{\fF}{\femto\farad}}
+\CustomizeMathJax{\newcommand{\pF}{\pico\farad}}
+\CustomizeMathJax{\newcommand{\K}{\mathrm{K}}}
+\CustomizeMathJax{\newcommand{\dB}{\mathrm{dB}}}
+\CustomizeMathJax{\newcommand{\kibi}{\mathrm{Ki}}}
+\CustomizeMathJax{\newcommand{\mebi}{\mathrm{Mi}}}
+\CustomizeMathJax{\newcommand{\gibi}{\mathrm{Gi}}}
+\CustomizeMathJax{\newcommand{\tebi}{\mathrm{Ti}}}
+\CustomizeMathJax{\newcommand{\pebi}{\mathrm{Pi}}}
+\CustomizeMathJax{\newcommand{\exbi}{\mathrm{Ei}}}
+\CustomizeMathJax{\newcommand{\zebi}{\mathrm{Zi}}}
+\CustomizeMathJax{\newcommand{\yobi}{\mathrm{Yi}}}
+\end{warpMathJax}
+
\endinput
%%
%% End of file `lwarp-siunitx.sty'.
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-slantsc.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-slantsc.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-slantsc.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `slantsc')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Added: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-slashed.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-slashed.sty (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-slashed.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -0,0 +1,24 @@
+%%
+%% This is file `lwarp-slashed.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx (with options: `slashed')
+%% 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 at ProvidesPackagePass{slashed}[1997/01/16]
+\begin{warpMathJax}
+\CustomizeMathJax{\newcommand{\slashed}[1]{\cancel{#1}}}
+\end{warpMathJax}
+\endinput
+%%
+%% End of file `lwarp-slashed.sty'.
Property changes on: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-slashed.sty
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-soul.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-soul.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-soul.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `soul')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-soulpos.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-soulpos.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-soulpos.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `soulpos')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-soulutf8.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-soulutf8.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-soulutf8.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `soulutf8')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-splitidx.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-splitidx.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-splitidx.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `splitidx')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-srcltx.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-srcltx.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-srcltx.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `srcltx')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-srctex.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-srctex.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-srctex.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `srctex')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-stabular.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-stabular.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-stabular.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `stabular')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-stackengine.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-stackengine.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-stackengine.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `stackengine')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Added: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-steinmetz.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-steinmetz.sty (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-steinmetz.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -0,0 +1,32 @@
+%%
+%% This is file `lwarp-steinmetz.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx (with options: `steinmetz')
+%% 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 at ProvidesPackagePass{steinmetz}[2009/06/14]
+\begin{warpHTML}
+\renewcommand{\phase}[2][]{%
+ \begin{lateximage}*[steinmetz\{\detokenize{#2}\}]
+ \ensuremath{\underline{/#2}}
+ \end{lateximage}
+}
+\end{warpHTML}
+
+\begin{warpMathJax}
+\CustomizeMathJax{\newcommand{\phase}[2][]{\underline{/#2}}}
+\end{warpMathJax}
+\endinput
+%%
+%% End of file `lwarp-steinmetz.sty'.
Property changes on: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-steinmetz.sty
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-stfloats.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-stfloats.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-stfloats.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `stfloats')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-struktex.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-struktex.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-struktex.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `struktex')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-subcaption.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-subcaption.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-subcaption.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `subcaption')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-subfig.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-subfig.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-subfig.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `subfig')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-subfigure.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-subfigure.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-subfigure.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `subfigure')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-supertabular.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-supertabular.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-supertabular.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `supertabular')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Added: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-svg.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-svg.sty (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-svg.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -0,0 +1,40 @@
+%%
+%% This is file `lwarp-svg.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx (with options: `svg')
+%% 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 at ProvidesPackagePass{svg}[2019/10/22]
+\xpretocmd{\includesvg}%
+ {\begin{lateximage}}%
+ {}%
+ {\LWR at patcherror{svg}{includesvg}}
+
+\xapptocmd{\includesvg}%
+ {\end{lateximage}}%
+ {}%
+ {\LWR at patcherror{svg}{includesvg}}
+
+\xpretocmd{\includeinkscape}%
+ {\begin{lateximage}}%
+ {}%
+ {\LWR at patcherror{svg}{includeinkscape}}
+
+\xapptocmd{\includeinkscape}%
+ {\end{lateximage}}%
+ {}%
+ {\LWR at patcherror{svg}{includeinkscape}}
+\endinput
+%%
+%% End of file `lwarp-svg.sty'.
Property changes on: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-svg.sty
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-syntonly.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-syntonly.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-syntonly.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `syntonly')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-tabfigures.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-tabfigures.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-tabfigures.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `tabfigures')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-tablefootnote.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-tablefootnote.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-tablefootnote.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `tablefootnote')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-tabls.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-tabls.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-tabls.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `tabls')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-tabularx.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-tabularx.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-tabularx.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `tabularx')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-tabulary.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-tabulary.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-tabulary.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `tabulary')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-tascmac.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-tascmac.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-tascmac.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `tascmac')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-textarea.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-textarea.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-textarea.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `textarea')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-textcomp.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-textcomp.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-textcomp.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `textcomp')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-textfit.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-textfit.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-textfit.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `textfit')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-textpos.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-textpos.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-textpos.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `textpos')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-theorem.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-theorem.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-theorem.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `theorem')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-thinsp.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-thinsp.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-thinsp.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `thinsp')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-threadcol.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-threadcol.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-threadcol.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `threadcol')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-threeparttable.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-threeparttable.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-threeparttable.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `threeparttable')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-threeparttablex.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-threeparttablex.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-threeparttablex.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `threeparttablex')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-thumb.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-thumb.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-thumb.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `thumb')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-thumbs.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-thumbs.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-thumbs.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `thumbs')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-tikz.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-tikz.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-tikz.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `tikz')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-titleps.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-titleps.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-titleps.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `titleps')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-titleref.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-titleref.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-titleref.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `titleref')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-titlesec.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-titlesec.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-titlesec.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `titlesec')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-titletoc.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-titletoc.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-titletoc.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `titletoc')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-titling.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-titling.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-titling.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `titling')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-tocbasic.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-tocbasic.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-tocbasic.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `tocbasic')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-tocbibind.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-tocbibind.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-tocbibind.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `tocbibind')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-tocdata.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-tocdata.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-tocdata.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `tocdata')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-tocenter.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-tocenter.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-tocenter.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `tocenter')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-tocloft.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-tocloft.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-tocloft.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `tocloft')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-tocstyle.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-tocstyle.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-tocstyle.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `tocstyle')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-todo.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-todo.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-todo.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `todo')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-todonotes.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-todonotes.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-todonotes.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `todonotes')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-topcapt.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-topcapt.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-topcapt.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `topcapt')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-tram.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-tram.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-tram.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `tram')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-transparent.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-transparent.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-transparent.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `transparent')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
@@ -15,15 +15,19 @@
%% 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 at ProvidesPackageDrop{transparent}[2016/05/16]
-\newcommand*{\transparent}[1]{\edef\LWR at opacity{#1}}
+\LWR at ProvidesPackagePass{transparent}[2019/11/29]
+\newcommand*{\LWR at HTML@transparent}[1]{\edef\LWR at opacity{#1}}
-\newcommand*{\texttransparent}[2]{%
+\LWR at formatted{transparent}
+
+\newcommand*{\LWR at HTML@texttransparent}[2]{%
\begingroup%
\transparent{#1}%
\InlineClass[opacity: #1]{transparent}{#2}%
\endgroup%
}
+
+\LWR at formatted{texttransparent}
\endinput
%%
%% End of file `lwarp-transparent.sty'.
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-trimclip.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-trimclip.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-trimclip.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `trimclip')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-trivfloat.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-trivfloat.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-trivfloat.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `trivfloat')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-truncate.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-truncate.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-truncate.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `truncate')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-turnthepage.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-turnthepage.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-turnthepage.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `turnthepage')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-twoup.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-twoup.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-twoup.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `twoup')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-typearea.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-typearea.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-typearea.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `typearea')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-typicons.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-typicons.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-typicons.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `typicons')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-ulem.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-ulem.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-ulem.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `ulem')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-umoline.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-umoline.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-umoline.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `umoline')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-underscore.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-underscore.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-underscore.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `underscore')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Added: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-unicode-math.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-unicode-math.sty (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-unicode-math.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -0,0 +1,46 @@
+%%
+%% This is file `lwarp-unicode-math.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx (with options: `unicode-math')
+%% 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 at ProvidesPackagePass{unicode-math}[2019/09/26]
+\begin{warpHTML}
+\CustomizeMathJax{\let\symnormal\mathrm}
+\CustomizeMathJax{\let\symliteral\mathrm}
+\CustomizeMathJax{\let\symbb\mathbb}
+\CustomizeMathJax{\let\symbbit\mathbb}% not italic
+\CustomizeMathJax{\let\symcal\mathcal}
+\CustomizeMathJax{\let\symscr\mathscr}
+\CustomizeMathJax{\let\symfrak\mathfrak}
+\CustomizeMathJax{\let\symsfup\mathsf}% not up
+\CustomizeMathJax{\let\symsfit\mathit}% not sans
+\CustomizeMathJax{\let\symbfsf\mathbf}% not sans
+\CustomizeMathJax{\let\symbfup\mathbf}% not up
+\CustomizeMathJax{\let\symbfit\mathit}% not bold
+\CustomizeMathJax{\let\symbfcal\mathcal}% not bold
+\CustomizeMathJax{\let\symbfscr\mathscr}% not bold
+\CustomizeMathJax{\let\symbffrak\mathfrak}% not bold
+\CustomizeMathJax{\let\symbfsfup\mathbf}% not sans
+\CustomizeMathJax{\let\symbfsfit\mathit}% not bold nor sans
+\CustomizeMathJax{\let\symup\mathrm}
+\CustomizeMathJax{\let\symbf\mathbf}% \symbfup defined above
+\CustomizeMathJax{\let\symit\mathit}
+\CustomizeMathJax{\let\symsf\mathsf}
+\CustomizeMathJax{\let\symtt\mathtt}
+\CustomizeMathJax{\let\symbffrac\mathbffrac}
+\end{warpHTML}
+\endinput
+%%
+%% End of file `lwarp-unicode-math.sty'.
Property changes on: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-unicode-math.sty
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-units.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-units.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-units.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `units')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
@@ -40,8 +40,10 @@
}
\LWR at formatted{unitfrac}
+\begin{warpMathJax}
\CustomizeMathJax{\newcommand{\unit}[2][]{#1 #2}}
\CustomizeMathJax{\newcommand{\unitfrac}[3][]{#1 #2/#3}}
+\end{warpMathJax}
\endinput
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-unitsdef.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-unitsdef.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-unitsdef.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `unitsdef')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-upref.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-upref.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-upref.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `upref')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-url.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-url.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-url.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `url')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-uspace.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-uspace.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-uspace.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `uspace')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-verse.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-verse.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-verse.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `verse')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-versonotes.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-versonotes.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-versonotes.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `versonotes')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-vertbars.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-vertbars.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-vertbars.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `vertbars')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-vmargin.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-vmargin.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-vmargin.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `vmargin')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-vowel.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-vowel.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-vowel.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `vowel')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-vpe.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-vpe.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-vpe.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `vpe')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-vwcol.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-vwcol.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-vwcol.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `vwcol')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-wallpaper.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-wallpaper.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-wallpaper.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `wallpaper')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-watermark.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-watermark.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-watermark.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `watermark')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Added: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-widetable.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-widetable.sty (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-widetable.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -0,0 +1,22 @@
+%%
+%% This is file `lwarp-widetable.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx (with options: `widetable')
+%% 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 at ProvidesPackageDrop{widetable}[2019-06-25]
+\newenvironment{widetable}{\begin{tabular*}}{\end{tabular*}}
+\endinput
+%%
+%% End of file `lwarp-widetable.sty'.
Property changes on: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-widetable.sty
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-widows-and-orphans.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-widows-and-orphans.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-widows-and-orphans.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `widows-and-orphans')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Added: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-witharrows.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-witharrows.sty (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-witharrows.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -0,0 +1,86 @@
+%%
+%% This is file `lwarp-witharrows.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx (with options: `witharrows')
+%% 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 at ProvidesPackagePass{witharrows}[2019/12/27]
+\begin{warpHTML}
+\makeatletter
+\ifbool{mathjax}{
+ % For the hidden print version in the HTML:
+ \newcommand{\Arrow}[2][]{}
+ \newcommand{\unicode}[1]{}
+ \NewDocumentEnvironment { DispWithArrows } { ! d < > ! O { } +b}
+ {
+ \IfValueTF{#1}{
+ \begin{displaymath}
+ #1 \left\lbrace
+ \begin{align}
+ #3
+ \end{align}
+ \right .
+ \end{displaymath}
+ }{
+ \begin{displaymath}
+ \begin{align}
+ #3
+ \end{align}
+ \end{displaymath}
+ }
+ }
+ {}
+ \NewDocumentEnvironment { DispWithArrows* } { ! d < > ! O { } +b}
+ {
+ \IfValueTF{#1}{
+ \begin{displaymath}
+ #1 \left\lbrace
+ \begin{align*}
+ #3
+ \end{align*}
+ \right .
+ \end{displaymath}
+ }{
+ \begin{displaymath}
+ \begin{align*}
+ #3
+ \end{align*}
+ \end{displaymath}
+ }
+ }
+ {}
+}{
+ % If not MathJax, use SVG images.
+ \BeforeBeginEnvironment{WithArrows}{\global\booltrue{LWR at unknownmathsize}}
+ \BeforeBeginEnvironment{DispWithArrows}{%
+ \begin{BlockClass}{displaymathnumbered}%
+ \begin{lateximage}%
+ }
+ \AfterEndEnvironment{DispWithArrows}{\end{lateximage}\end{BlockClass}}
+ \BeforeBeginEnvironment{DispWithArrows*}{%
+ \begin{BlockClass}{displaymath}%
+ \begin{lateximage}%
+ }
+ \AfterEndEnvironment{DispWithArrows*}{\end{lateximage}\end{BlockClass}}
+}
+\makeatother
+\end{warpHTML}
+
+\begin{warpMathJax}
+\CustomizeMathJax{\newenvironment{WithArrows}[1][]{\begin{aligned}}{\end{aligned}}}
+\CustomizeMathJax{\newcommand{\Arrow}[2][]{&{\Large\unicode{x2938}}~\textit{#2}}}
+\end{warpMathJax}
+\endinput
+%%
+%% End of file `lwarp-witharrows.sty'.
Property changes on: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-witharrows.sty
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-wrapfig.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-wrapfig.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-wrapfig.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `wrapfig')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
@@ -35,7 +35,7 @@
margin:10pt%
}%
{%
- \LWR at wrapposition%
+ width:\LWR at printlength{\LWR at templengthone}; \LWR at wrapposition; %
}%
{marginblock}%
\setlength{\linewidth}{\LWR at templengthone}%
@@ -43,29 +43,35 @@
\NewDocumentEnvironment{wrapfigure}{o m o m}
{%
+\begin{LWR at setvirtualpage}*%
\LWR at subwrapfigure{#2}{#4}%
\captionsetup{type=figure}%
}
{%
\endLWR at BlockClassWP%
+\end{LWR at setvirtualpage}%
}
\NewDocumentEnvironment{wraptable}{o m o m}
{%
+\begin{LWR at setvirtualpage}*%
\LWR at subwrapfigure{#2}{#4}%
\captionsetup{type=table}%
}
{%
\endLWR at BlockClassWP%
+\end{LWR at setvirtualpage}%
}
\NewDocumentEnvironment{wrapfloat}{m o m o m}
{%
+\begin{LWR at setvirtualpage}*%
\LWR at subwrapfigure{#3}{#5}%
\captionsetup{type=#1}%
}
{%
\endLWR at BlockClassWP%
+\end{LWR at setvirtualpage}%
}
\newlength{\wrapoverhang}
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xbmks.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xbmks.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xbmks.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `xbmks')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `xcolor')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
@@ -240,8 +240,8 @@
\def\rowc at l@rs[#1]#2#3#4%
{
-\global\rownum=1
- \global\@rowcolorstrue
+\rownum=1%
+ \@rowcolorstrue%
\@ifxempty{#3}%
{\def\@oddrowcolor{\@norowcolor}}%
{%
@@ -285,7 +285,7 @@
}
\def\@rowc at lors{%
- \global\advance\rownum\@ne%
+ \advance\rownum\@ne%
\@rowcolors%
}
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xechangebar.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xechangebar.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xechangebar.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `xechangebar')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xellipsis.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xellipsis.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xellipsis.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `xellipsis')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xetexko-vertical.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xetexko-vertical.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xetexko-vertical.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `xetexko-vertical')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xfakebold.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xfakebold.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xfakebold.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `xfakebold')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
@@ -24,6 +24,10 @@
\renewcommand*{\LWR at applyxfakebold}{%
\ifbool{LWR at xfakebold}{\LWR at orig@setBold}{\LWR at orig@unsetBold}%
}
+\begin{warpMathJax}
+\CustomizeMathJax{\newcommand{\setBold}[1][]{}}
+\CustomizeMathJax{\newcommand{\unsetBold}{}}
+\end{warpMathJax}
\endinput
%%
%% End of file `lwarp-xfakebold.sty'.
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xfrac.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xfrac.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xfrac.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `xfrac')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xltabular.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xltabular.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xltabular.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `xltabular')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
@@ -18,6 +18,7 @@
\RequirePackage{tabularx}
+\RequirePackage{ltablex}
\LWR at ProvidesPackageDrop{xltabular}[2018/05/23]
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xltxtra.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xltxtra.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xltxtra.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `xltxtra')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xmpincl.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xmpincl.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xmpincl.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `xmpincl')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xpiano.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xpiano.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xpiano.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `xpiano')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xpinyin.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xpinyin.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xpinyin.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `xpinyin')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xr-hyper.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xr-hyper.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xr-hyper.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `xr-hyper')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xr.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xr.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xr.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `xr')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xtab.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xtab.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xtab.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `xtab')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xunicode.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xunicode.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xunicode.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `xunicode')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xurl.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xurl.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xurl.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `xurl')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
@@ -15,7 +15,9 @@
%% 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 at ProvidesPackageDrop{xurl}[2018/06/02]
+\LWR at ProvidesPackageDrop{xurl}[2020/01/14]
+
+\def\useOriginalUrlSetting{}
\endinput
%%
%% End of file `lwarp-xurl.sty'.
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xy.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xy.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-xy.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `xy')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-zhlineskip.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-zhlineskip.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-zhlineskip.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `zhlineskip')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-zwpagelayout.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-zwpagelayout.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp-zwpagelayout.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `zwpagelayout')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
Modified: trunk/Master/texmf-dist/tex/latex/lwarp/lwarp.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lwarp/lwarp.sty 2020-02-01 22:14:47 UTC (rev 53631)
+++ trunk/Master/texmf-dist/tex/latex/lwarp/lwarp.sty 2020-02-01 22:15:59 UTC (rev 53632)
@@ -6,7 +6,7 @@
%%
%% lwarp.dtx (with options: `package')
%% This is a generated file.
-%% Copyright 2016-2019 Brian Dunn
+%% 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
@@ -17,7 +17,7 @@
%% version 2005/12/01 or later.
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesPackage{lwarp}
- [2019/11/07 v0.78 Allows LaTeX to directly produce HTML5 output.]
+ [2020/02/01 v0.79 Allows LaTeX to directly produce HTML5 output.]
@@ -25,8 +25,10 @@
-\RequirePackage{iftex}
+\RequirePackage{iftex}[2019/11/07]
+
\newif\ifxetexorluatex
+
\ifXeTeX
\xetexorluatextrue
\else
@@ -36,13 +38,6 @@
\xetexorluatexfalse
\fi
\fi
-
-\ifLuaTeX
-\RequirePackage{luatex85}% until the geometry package is updated
-\fi
-
-\RequirePackage{ifpdf}
-\RequirePackage{ifptex}
\RequirePackage{etoolbox}[2011/01/03]% v2.6 for \BeforeBeginEnvironment, etc.
\RequirePackage{xpatch}
@@ -105,7 +100,7 @@
{%
Package #1 is not supported\MessageBreak
by lwarp's HTML conversion.\MessageBreak
- Package(s) #2 may be useful instead
+ Package(s) #2 may be useful instead%
}
{%
Package #1 might conflict with lwarp in some way,\MessageBreak
@@ -120,20 +115,10 @@
}{}%
}
\newcommand*{\LWR at earlyloadnever}[2]{%
-\@ifpackageloaded{#1}{%
-\PackageError{lwarp}
-{%
- Package #1 is not supported\MessageBreak
- by lwarp's HTML conversion.\MessageBreak
- Package(s) #2 may be useful instead
+ \@ifpackageloaded{#1}{%
+ \LWR at loadnever{#1}{#2}%
+ }{}%
}
-{%
- Package #1 might conflict with lwarp in some way,\MessageBreak
- or is superceded by another package.\MessageBreak
- For a possible alternative, see package(s) #2.
-}
-}{}%
-}
\newcommand*{\LWR at earlyclassloadnever}[2]{%
\@ifclassloaded{#1}{%
\PackageError{lwarp}
@@ -160,27 +145,32 @@
\LWR at earlyloadnever{aecc}{cm-super, lmodern}
\LWR at earlyloadnever{alg}{algorithm2e, algorithmicx}
\LWR at earlyloadnever{algorithmic}{algorithm2e, algorithmicx}
+\LWR at earlyloadnever{bitfield}{bytefield}
\LWR at earlyloadnever{boxedminipage}{boxedminipage2e}
\LWR at earlyloadnever{caption2}{caption}
-\@ifpackageloaded{xeCJK}{}{
- \LWR at earlyloadnever{CJK}{ctex, xeCJK}
- \LWR at earlyloadnever{CJKutf8}{ctex, xeCJK}
-}
-\LWR at earlyloadnever{bxcjkjatype}{upLaTeX, bxjsarticle, ujarticle, utarticle}
-\LWR at earlyloadnever{hangul}{kotex, xetexko, luatexko}
\LWR at earlyloadnever{colortab}{colortbl}
+\LWR at earlyloadnever{doublespace}{setspace}
\LWR at earlyloadnever{epsf}{graphicx}
\LWR at earlyloadnever{fancyheadings}{fancyhdr}
\LWR at earlyloadnever{fncylab}{cleveref}
\LWR at earlyloadnever{glossary}{glossaries}
\LWR at earlyloadnever{hyper}{hyperref}
+\LWR at earlyloadnever{newthm}{ntheorem}
\LWR at earlyloadnever{pdfcprot}{microtype}
\LWR at earlyloadnever{picinpar}{floatflt, wrapfig}
\LWR at earlyloadnever{picins}{floatflt, wrapfig}
+\LWR at earlyloadnever{rplain}{fancyhdr}
+\LWR at earlyloadnever{si}{siunitx}
\LWR at earlyloadnever{sistyle}{siunitx}
\LWR at earlyloadnever{t1enc}{fontenc, inputenc, inputenx}
\LWR at earlyloadnever{ucs}{inputenc, inputencx}
\LWR at earlyloadnever{wasysym}{textcomp, amssymb, amsfonts, mnsymbol, fdsymbol}
+\@ifpackageloaded{xeCJK}{}{
+ \LWR at earlyloadnever{CJK}{ctex, xeCJK}
+ \LWR at earlyloadnever{CJKutf8}{ctex, xeCJK}
+}
+\LWR at earlyloadnever{bxcjkjatype}{upLaTeX, bxjsarticle, ujarticle, utarticle}
+\LWR at earlyloadnever{hangul}{kotex, xetexko, luatexko}
\LWR at loadafter{2in1}
\LWR at loadafter{2up}
\LWR at loadafter{a4}
@@ -194,8 +184,6 @@
\LWR at loadafter{acronym}
\LWR at loadafter{adjmulticol}
\LWR at loadafter{addlines}
-\LWR at loadafter{ae}
-\LWR at loadafter{aecc}
\LWR at loadafter{afterpage}
\LWR at loadafter{algorithm2e}
\LWR at loadafter{algorithmicx}
@@ -214,6 +202,7 @@
\LWR at loadafter{attachfile2}
\LWR at loadafter{authblk}
\LWR at loadafter{autonum}
+\LWR at loadafter{awesomebox}
\LWR at loadafter{axessibility}
\LWR at loadafter{axodraw2}
\LWR at loadafter{backnaur}
@@ -225,13 +214,14 @@
\LWR at loadafter{bigstrut}
\LWR at loadafter{bitpattern}
\LWR at loadafter{blowup}
+\LWR at loadafter{bm}
\LWR at loadafter{booklet}
\LWR at loadafter{bookmark}
\LWR at notmemoirloadafter{booktabs}
\LWR at loadafter{bophook}
\LWR at loadafter{bounddvi}
-\LWR at loadafter{boxedminipage}
\LWR at loadafter{boxedminipage2e}
+\LWR at loadafter{braket}
\LWR at loadafter{breakurl}
\LWR at loadafter{breqn}
\LWR at loadafter{bsheaders}
@@ -299,7 +289,6 @@
\LWR at loadafter{extramarks}
\LWR at loadafter{fancybox}
\LWR at loadafter{fancyhdr}
-\LWR at loadafter{fancyheadings}
\LWR at loadafter{fancyref}
\LWR at loadafter{fancytabs}
\LWR at loadafter{fancyvrb}
@@ -437,9 +426,16 @@
\LWR at notmemoirloadafter{pagenote}
\LWR at loadafter{pagesel}
\LWR at loadafter{paralist}
+\LWR at loadafter{parallel}
+\LWR at loadafter{parcolumns}
\LWR at loadafter{parnotes}
\LWR at notmemoirloadafter{parskip}
\LWR at loadafter{pbox}
+\LWR at loadafter{pdfcol}
+\LWR at loadafter{pdfcolfoot}
+\LWR at loadafter{pdfcolmk}
+\LWR at loadafter{pdfcolparallel}
+\LWR at loadafter{pdfcolparcolumns}
\LWR at loadafter{pdfcomment}
\LWR at loadafter{pdfcrypt}
\LWR at loadafter{pdflscape}
@@ -453,6 +449,7 @@
\LWR at loadafter{perpage}
\LWR at loadafter{pfnote}
\LWR at loadafter{phfqit}
+\LWR at loadafter{physics}
\LWR at loadafter{pifont}
\LWR at loadafter{placeins}
\LWR at loadafter{plarray}
@@ -510,6 +507,7 @@
\LWR at loadafter{SIunits}
\LWR at loadafter{siunitx}
\LWR at loadafter{slantsc}
+\LWR at loadafter{slashed}
\LWR at loadafter{soul}
\LWR at loadafter{soulpos}
\LWR at loadafter{soulutf8}
@@ -518,6 +516,7 @@
\LWR at loadafter{srctex}
\LWR at loadafter{stabular}
\LWR at loadafter{stackengine}
+\LWR at loadafter{steinmetz}
\LWR at notltjloadafter{stfloats}
\LWR at loadafter{struktex}
\LWR at loadafter{subcaption}
@@ -524,6 +523,7 @@
\LWR at loadafter{subfig}
\LWR at loadafter{subfigure}
\LWR at loadafter{supertabular}
+\LWR at loadafter{svg}
\LWR at loadafter{t1inc}
\LWR at loadafter{tabfigures}
\LWR at loadafter{tabls}
@@ -564,6 +564,7 @@
\LWR at loadafter{typicons}
\LWR at loadafter{umoline}
\LWR at loadafter{underscore}
+\LWR at loadafter{unicode-math}
\LWR at loadafter{units}
\LWR at loadafter{unitsdef}
\LWR at loadafter{upref}
@@ -579,7 +580,9 @@
\LWR at loadafter{vwcol}
\LWR at loadafter{wallpaper}
\LWR at loadafter{watermark}
+\LWR at loadafter{widetable}
\LWR at loadafter{widows-and-orphans}
+\LWR at loadafter{witharrows}
\LWR at loadafter{wrapfig}
\LWR at loadafter{xbmks}
\LWR at loadafter{xcolor}
@@ -637,7 +640,7 @@
\newunicodechar{⨯}{\texttimes}
\ifPDFTeX% pdflatex or dvi latex
-\newunicodechar{ff}{ff}% the first arguments are ligatures
+\newunicodechar{ff}{ff}% Here, the first arguments are ligatures.
\newunicodechar{fi}{fi}
\newunicodechar{fl}{fl}
\newunicodechar{ffi}{ffi}
@@ -691,10 +694,15 @@
}
+\providecommand*{\defaddtocounter}[2]{%
+ \defcounter{#1}{\value{#1}+#2}%
+}
+
+
\newcommand*{\LWR at patcherror}[2]{%
\PackageError{lwarp}
{Unable to patch package #1, macro #2}
-{Please contact the author of the lwarp package.}
+{Please contact the author of the Lwarp package.}
}
\newcommand{\LWR at isolate}[1]{#1}%
@@ -740,6 +748,12 @@
\color at setgroup
\ignorespaces}
\let\LWR at endglrbox\LWR at endlrbox
+\newcommand*{\macrotocsname}[1]{%
+ \ifcat\relax\noexpand#1%
+ \expandafter\expandafter\expandafter\@gobble\expandafter\string
+ \fi
+ #1%
+}
\let\LWRpercent\@percentchar
\catcode`\$=12
\def\LWRdollar{$}
@@ -964,17 +978,26 @@
\includecomment{warpall}
\ifbool{warpingHTML}
-{\includecomment{warpHTML}}
-{\excludecomment{warpHTML}}%
+ {\includecomment{warpHTML}}
+ {\excludecomment{warpHTML}}%
\ifbool{warpingprint}
-{\includecomment{warpprint}}
-{\excludecomment{warpprint}}
+ {\includecomment{warpprint}}
+ {\excludecomment{warpprint}}
+\begin{warpprint}
+\excludecomment{warpMathJax}
+\end{warpprint}
+\begin{warpHTML}
+\ifbool{mathjax}
+ {\includecomment{warpMathJax}}
+ {\excludecomment{warpMathJax}}
+\end{warpHTML}
+
\ifbool{LWR at creatinglwarpmk}
-{\includecomment{LWR at createlwarpmk}}
-{\excludecomment{LWR at createlwarpmk}}
+ {\includecomment{LWR at createlwarpmk}}
+ {\excludecomment{LWR at createlwarpmk}}
\begin{warpHTML}
@@ -1025,6 +1048,7 @@
\booltrue{LWR at allowanothergeometry}
\AtEndPreamble{
\LWR at origsavegeometry{LWR at usergeometry}
+%% \begin{macrocode}
\newlength{\LWR at userspaperwidth}
\setlength{\LWR at userspaperwidth}{\paperwidth}
@@ -1033,6 +1057,12 @@
\newlength{\LWR at usersmarginparwidth}
\setlength{\LWR at usersmarginparwidth}{\marginparwidth}
+
+\newlength{\LWR at userstextwidth}
+\setlength{\LWR at userstextwidth}{\textwidth}
+
+\newlength{\LWR at userstextheight}
+\setlength{\LWR at userstextwidth}{\textheight}
\LWR at origgeometry{
reset,
paperheight=190in,
@@ -1129,15 +1159,15 @@
\RequirePackage{printlen}
\newrobustcmd*{\LWR at printlength}[1]{%
-\begingroup%
-\uselengthunit{PT}%
-\renewcommand*{\unitspace}{}%
-\ifdimless{#1}{10pt}{%
- \printlength{#1}%
-}{%
- \rndprintlength{#1}%
-}%
-\endgroup%
+ \begingroup%
+ \uselengthunit{PT}%
+ \renewcommand*{\unitspace}{}%
+ \ifdimless{#1}{10pt}{%
+ \printlength{#1}%
+ }{%
+ \rndprintlength{#1}%
+ }%
+ \endgroup%
}
\end{warpHTML}
@@ -1169,14 +1199,15 @@
}
\newcommand*{\LWR at checkloadfilename}[1]{%
-\LWR at checkloadnever{#1}{ae}{latinmodern}
-\LWR at checkloadnever{#1}{aecc}{latinmodern}
+\LWR at checkloadnever{#1}{ae}{cm-super, lmodern}
+\LWR at checkloadnever{#1}{aecc}{cm-super, lmodern}
+\LWR at checkloadnever{#1}{aecompl}{cm-super, lmodern}
\LWR at checkloadnever{#1}{alg}{algorithm2e, algorithmicx}
\LWR at checkloadnever{#1}{algorithmic}{algorithm2e, algorithmicx}
\LWR at checkloadnever{#1}{bitfield}{bytefield}
\LWR at checkloadnever{#1}{boxedminipage}{boxedminipage2e}
\LWR at checkloadnever{#1}{caption2}{caption}
-\LWR at checkloadnever{#1}{ccaption}{caption}
+\LWR at checkloadnever{#1}{ccaption}{caption}% might be preloaded by memoir
\LWR at checkloadnever{#1}{colortab}{colortbl}
\LWR at checkloadnever{#1}{doublespace}{setspace}
\LWR at checkloadnever{#1}{epsf}{graphicx}
@@ -1194,6 +1225,8 @@
\LWR at checkloadnever{#1}{t1enc}{fontenc, inputenc, inputenx}
\LWR at checkloadnever{#1}{ucs}{inputenc, inputencx}
\LWR at checkloadnever{#1}{wasysym}{textcomp, amssymb, amsfonts, mnsymbol, fdsymbol}
+\LWR at checkloadnever{#1}{bxcjkjatype}{upLaTeX, bxjsarticle, ujarticle, utarticle}
+\LWR at checkloadnever{#1}{hangul}{kotex, xetexko, luatexko}
\LWR at checkloadbefore{#1}{ctex}
\LWR at checkloadbefore{#1}{fontspec}
\LWR at checkloadbefore{#1}{inputenc}
@@ -1289,22 +1322,35 @@
\begin{warpHTML}
\NewDocumentCommand{\LWR at ProvidesPackagePass}{m o}{
-\PackageInfo{lwarp}{%
- Using package `#1' and adding lwarp modifications,\MessageBreak
- including options,}%
-\IfValueTF{#2}
- {\ProvidesPackage{lwarp-#1}[#2]}
- {\ProvidesPackage{lwarp-#1}}
-\DeclareOption*{%
- \PassOptionsToPackage{\CurrentOption}{#1}%
+ \PackageInfo{lwarp}{%
+ Using package `#1' and adding lwarp modifications,\MessageBreak
+ including options,}%
+ \IfValueTF{#2}%
+ {\ProvidesPackage{lwarp-#1}[#2]}%
+ {\ProvidesPackage{lwarp-#1}}%
+ \DeclareOption*{%
+ \PassOptionsToPackage{\CurrentOption}{#1}%
+ }%
+ \ProcessOptions\relax%
+ \@ifpackageloaded{#1}{%
+ \edef\LWR at tempone{\csuse{opt@#1.sty}}%
+ \IfValueTF{#2}%
+ {%
+ \expandafter\LWR at origRequirePackage%
+ \expandafter[\LWR at tempone]{#1}[#2]%
+ }%
+ {%
+ \expandafter\LWR at origRequirePackage%
+ \expandafter[\LWR at tempone]{#1}%
+ }%
+ }{%
+ \IfValueTF{#2}%
+ {\LWR at origRequirePackage{#1}[#2]}%
+ {\LWR at origRequirePackage{#1}}%
+ }%
+ \DeclareOption*{}%
+ \ProcessOptions\relax%
}
-\ProcessOptions\relax%
-\IfValueTF{#2}%
- {\LWR at origRequirePackage{#1}[#2]}%
- {\LWR at origRequirePackage{#1}}%
-\DeclareOption*{}%
-\ProcessOptions\relax%
-}
\newcommand*{\LWR at ProvidesPackageDropA}[2]{%
\PackageInfo{lwarp}{%
@@ -1946,8 +1992,8 @@
\begin{LWRwriteconf}
\begin{filecontents*}[overwrite]{lwarp.css}
/*
- CSS stylesheet for the LaTeX lwarp package
- Copyright 2016-2019 Brian Dunn — BD Tech Concepts LLC
+ CSS stylesheet for the LaTeX Lwarp package
+ Copyright 2016-2020 Brian Dunn — BD Tech Concepts LLC
*/
/* a fix for older browsers: */
@@ -2895,7 +2941,7 @@
line-height: 1.3 ;
}
-tr.hline td {border-top: 1px solid #808080 ; margin-top: 0ex ;
+table > tbody > tr.hline > td {border-top: 1px solid #808080 ; margin-top: 0ex ;
margin-bottom: 0ex ; } /* for \hline */
tr.tbrule td {border-top: 1px solid black ; margin-top: 0ex ;
@@ -4102,9 +4148,9 @@
\begin{filecontents*}[overwrite]{lwarpmk.lua}
#!/usr/bin/env texlua
--- Copyright 2016-2019 Brian Dunn
+-- Copyright 2016-2020 Brian Dunn
-printversion = "v0.78"
+printversion = "v0.79"
requiredconfversion = "2" -- also at *lwarpmk.conf
function printhelp ()
@@ -4801,7 +4847,7 @@
-- print intro:
-print ("lwarpmk: " .. printversion .. " Automated make for the LaTeX lwarp package.")
+print ("lwarpmk: " .. printversion .. " Automated make for the LaTeX Lwarp package.")
-- lwarpmk print:
@@ -5115,13 +5161,13 @@
\begin{warpHTML}
\NewDocumentCommand{\LWR at setexparray}{m m m}{%
- \begingroup%
+ \let\LWR at temp@par\par%
\let\par\relax%
- \xdef\LWR at thisexparrayname{#1#2}%
+ \edef\LWR at thisexparrayname{#1#2}%
\ifstrempty{#3}%
- {\csgdef{\LWR at thisexparrayname}{}}%
- {\csxdef{\LWR at thisexparrayname}{#3}}%
- \endgroup%
+ {\csdef{\LWR at thisexparrayname}{}}%
+ {\csedef{\LWR at thisexparrayname}{#3}}%
+ \let\par\LWR at temp@par%
}
\newcommand*{\LWR at getexparray}[2]{%
\@nameuse{#1#2}%
@@ -5131,12 +5177,12 @@
\begin{warpall}
\newcommand{\StartDefiningTabulars}{%
-\LWR at traceinfo{StartDefiningTabulars}%
-\warpHTMLonly{\catcode`\&=\active}%
+ \LWR at traceinfo{StartDefiningTabulars}%
+ \warpHTMLonly{\catcode`\&=\active}%
}
\newcommand{\StopDefiningTabulars}{%
-\LWR at traceinfo{StopDefiningTabulars}%
-\warpHTMLonly{\catcode`\&=4}%
+ \LWR at traceinfo{StopDefiningTabulars}%
+ \warpHTMLonly{\catcode`\&=4}%
}
\newbool{LWR at mathmacro}
@@ -5143,12 +5189,12 @@
\boolfalse{LWR at mathmacro}
\newcommand{\StartDefiningMath}{%
-\LWR at traceinfo{StartDefiningMath}%
-\warpHTMLonly{\catcode`\$=\active}%
+ \LWR at traceinfo{StartDefiningMath}%
+ \warpHTMLonly{\catcode`\$=\active}%
}
\newcommand{\StopDefiningMath}{%
-\LWR at traceinfo{StopDefiningMath}%
-\warpHTMLonly{\catcode`\$=3}% math shift
+ \LWR at traceinfo{StopDefiningMath}%
+ \warpHTMLonly{\catcode`\$=3}% math shift
}
\end{warpall}
@@ -6065,7 +6111,7 @@
\expandafter\ifvoid\csname LWR@#1box\endcsname\else
\LWR at forcenewpage
\begin{BlockClass}{footnotes}
- \LWR at origmedskip
+ \null
\unvbox\csuse{LWR@#1box}
\setbox\csuse{LWR@#1box}=\vbox{}
\end{BlockClass}
@@ -6094,7 +6140,7 @@
\ifvoid\LWR at mpfootnotes\else
\LWR at forcenewpage
\begin{BlockClass}{footnotes}
- \LWR at print@vspace*{\baselineskip}
+ \null
\unvbox\LWR at mpfootnotes
\setbox\LWR at mpfootnotes=\vbox{}
\end{BlockClass}
@@ -6290,28 +6336,90 @@
}
+\newcommand{\LWR at subHTMLsanitize}{%
+ \protect\StrSubstitute{\detokenize\expandafter{\LWR at strresult}}%
+ {\detokenize{&}}{\detokenize{&}}[\LWR at strresult]%
+ \protect\StrSubstitute{\detokenize\expandafter{\LWR at strresult}}%
+ {\detokenize{<}}{\detokenize{<}}[\LWR at strresult]%
+ \protect\StrSubstitute{\detokenize\expandafter{\LWR at strresult}}%
+ {\detokenize{>}}{\detokenize{>}}[\LWR at strresult]%
+ \protect\StrSubstitute{\detokenize\expandafter{\LWR at strresult}}%
+ {\detokenize{"}}{\detokenize{"}}[\LWR at strresult]%
+ \protect\StrSubstitute{\detokenize\expandafter{\LWR at strresult}}%
+ {\detokenize{##}}{\LWR at origpound}[\LWR at strresult]%
+}
+
+\newrobustcmd{\LWR at HTMLsanitize}[1]{%
+ \begingroup%
+ \LWR at FBcancel%
+ \fullexpandarg%
+ \protect\StrSubstitute{\detokenize{#1}}%
+ {\detokenize{\&}}{\detokenize{&}}[\LWR at strresult]%
+ \LWR at subHTMLsanitize%
+ \LWR at strresult%
+ \endgroup%
+}
+
+\newrobustcmd{\LWR at HTMLsanitizeexpand}[1]{%
+ \begingroup%
+ \LWR at FBcancel%
+ \fullexpandarg%
+ \protect\StrSubstitute{\detokenize\expandafter{#1}}%
+ {\detokenize{\&}}{\detokenize{&}}[\LWR at strresult]%
+ \LWR at subHTMLsanitize%
+ \LWR at strresult%
+ \endgroup%
+}
+
+
\newcommand*{\LWR at customizedMathJax}{}
-\newcommand*{\CustomizeMathJax}[1]{%
- \appto{\LWR at customizedMathJax}{%
- \(#1\)\par
+\newcommand*{\LWR at subcustomizedmathjax}[1]{%
+ \begingroup%
+ \LWR at FBcancel%
+ \fullexpandarg%
+ \protect\StrSubstitute{\detokenize{#1}}%
+ {\detokenize{\&}}{\detokenize{&}}[\LWR at strresult]%
+ \LWR at subHTMLsanitize%
+ \xdef\LWR at customizedMathJax{%
+ \LWR at customizedMathJax%
+ \LWR at strresult%
}%
+ \endgroup%
}
+\newcommand*{\CustomizeMathJax}[1]{%
+ \appto\LWR at customizedMathJax{\LWRbackslash(}%
+ \LWR at subcustomizedmathjax{#1}%
+ \appto\LWR at customizedMathJax{\LWRbackslash)\par}%
+}
+\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}
+}
+\CustomizeMathJax{\newcommand{\setlength}[2]{}}
+\CustomizeMathJax{\newcommand{\addtolength}[2]{}}
+\CustomizeMathJax{\newcommand{\setcounter}[2]{}}
+\CustomizeMathJax{\newcommand{\addtocounter}[2]{}}
+\CustomizeMathJax{\newcommand{\cline}[1]{}}
+\CustomizeMathJax{\newcommand{\directlua}[1]{\text{(directlua)}}}
+\CustomizeMathJax{\newcommand{\luatexdirectlua}[1]{\text{(directlua)}}}
+\end{warpMathJax}
+
\newcommand{\LWR at customizeMathJax}{%
\ifbool{mathjax}{
\LWR at stoppars
-\LWR at htmlcomment{Nullify \textbackslash{}ensuremath, footnotes for MathJax:}
+\LWR at htmlcomment{MathJax customizations:}
-\(\newcommand\ensuremath[1]{##1}\)
-
-\(\newcommand\footnote[2][]{\text{( Footnote ##1 )}}\)
-
-\(\newcommand\footnotemark[1][]{\text{( Footnote ##1 )}}\)
-
-\LWR at htmlcomment{Additional customizations for MathJax:}
-
+\begin{BlockClass}{hidden}
+\LWR at stoppars
\LWR at customizedMathJax
+\LWR at startpars
+\end{BlockClass}
\LWR at startpars
}{}
@@ -6814,7 +6922,7 @@
\LWR at htmltag{%
meta % space
name=\LWR at orig@textquotedbl{}generator\LWR at orig@textquotedbl\ % space
- content=\LWR at orig@textquotedbl{}LaTeX lwarp package\LWR at orig@textquotedbl\ /%
+ content=\LWR at orig@textquotedbl{}LaTeX Lwarp package\LWR at orig@textquotedbl\ /%
}\LWR at orignewline%
\ifdefempty{\LWR at currentHTMLDescription}{}{%
\LWR at htmltag{%
@@ -7587,15 +7695,18 @@
\def\LWR at futurenonspacelet#1{\def\LWR at cs{#1}%
\afterassignment\LWR at fnslone\let\nexttoken= }
+
\def\LWR at fnslone{\expandafter\futurelet\LWR at cs\LWR at fnsltwo}
+
\def\LWR at fnsltwo{%
\expandafter\ifx\LWR at cs\@sptoken\let\next=\LWR at fnslthree%
\else\let\next=\nexttoken\fi\next}
+
\def\LWR at fnslthree{\afterassignment\LWR at fnslone\let\next= }
\newcommand*{\LWR at getmynexttoken}{%
-\LWR at traceinfo{LWR at getmynexttoken}%
-\LWR at futurenonspacelet\LWR at mynexttoken\LWR at tabledatacolumntag
+ \LWR at traceinfo{LWR at getmynexttoken}%
+ \LWR at futurenonspacelet\LWR at mynexttoken\LWR at tabledatacolumntag
}
@@ -7632,6 +7743,15 @@
\newbool{LWR at intabularmetadata}
\boolfalse{LWR at intabularmetadata}
+\newbool{LWR at exitingtabular}
+
+\newbool{LWR at tabularmutemods}
+
+\newbool{LWR at validtablecol}
+\newbool{LWR at opttablecol}
+
+\newbool{LWR at tdhavecellstyle}
+
\newcounter{LWR at tabulardepth}
\setcounter{LWR at tabulardepth}{0}
\newcounter{LWR at tabularpardepth}
@@ -7658,56 +7778,77 @@
\newcounter{LWR at tabletotalLaTeXcolsnext}
+\newcounter{LWR at cellcolordepth}
+
+\newcounter{LWR at tablemulticolswidth}
+\newcounter{LWR at tablemulticolspos}
+
+\newcounter{LWR at mcolvertbarsl}
+\newcounter{LWR at mcolvertbarsr}
+\newcounter{LWR at mcolvertbarsldash}
+\newcounter{LWR at mcolvertbarsrdash}
+\newbool{LWR at mcolvertbaronleft}
+
+\newbool{LWR at starredlongtable}
+\boolfalse{LWR at starredlongtable}
+
+
+\newcounter{LWR at midrulecounter}
+
+
\newcommand*{\LWR at insertatbangcols}{%
-\ifbool{LWR at skipatbang}%
-{}%
-{%
- \LWR at printatbang{at}{\arabic{LWR at tableLaTeXcolindex}}%
- \LWR at printatbang{bang}{\arabic{LWR at tableLaTeXcolindex}}%
-}%
+ \ifbool{LWR at skipatbang}%
+ {}%
+ {%
+ \LWR at printatbang{at}{\arabic{LWR at tableLaTeXcolindex}}%
+ \LWR at printatbang{bang}{\arabic{LWR at tableLaTeXcolindex}}%
+ }%
}
\newcommand*{\LWR at closetabledatacell}{%
-\global\booltrue{LWR at intabularmetadata}%
-\ifbool{LWR at exitingtabular}%
-{%
- \LWR at stoppars%
-}%
-{% not exiting tabular
- \ifboolexpr{bool{LWR at skippingmrowcell} or bool{LWR at skippingmcolrowcell}}%
+ \booltrue{LWR at intabularmetadata}%
+ \ifbool{LWR at exitingtabular}%
{%
\LWR at stoppars%
- \ifbool{LWR at skippingmcolrowcell}%
- {}%
- {\LWR at insertatbangcols}%
}%
- {% not skippingmrowcell
- \unskip%
- \ifboolexpr{%
- bool{LWR at tabularmutemods} or
- bool{LWR at skipatbang} or
- bool{LWR at emptyatbang}
+ {% not exiting tabular
+ \ifboolexpr{bool{LWR at skippingmrowcell} or bool{LWR at skippingmcolrowcell}}%
+ {%
+ \LWR at stoppars%
+ \ifbool{LWR at skippingmcolrowcell}%
+ {}%
+ {\LWR at insertatbangcols}%
}%
- {}%
- {\LWR at getexparray{LWR at colafterspec}{\arabic{LWR at tableLaTeXcolindex}}}%
- \LWR at stoppars%
- \global\boolfalse{LWR at tableparcell}%
- \whileboolexpr{test {\ifnumcomp{\value{LWR at cellcolordepth}}{>}{0}}}{%
- \LWR at htmltag{/div}\LWR at orignewline%
- \addtocounter{LWR at cellcolordepth}{-1}%
- }%
- \leavevmode\unskip\LWR at htmltag{/td}\LWR at orignewline%
- \global\booltrue{LWR at tabularcelladded}%
- \LWR at insertatbangcols%
- }% not skipping mrowcell
-}% not exiting tabular
-\global\boolfalse{LWR at skippingmrowcell}%
-\global\boolfalse{LWR at skippingmcolrowcell}%
-\global\boolfalse{LWR at skipatbang}%
-\gdef\LWR at cellHTMLcolor{}
-\gdef\LWR at columnHTMLcolor{}
-\setcounter{LWR at cellcolordepth}{0}
+ {% not skippingmrowcell
+ \unskip%
+ \ifboolexpr{%
+ bool{LWR at tabularmutemods} or
+ bool{LWR at skipatbang} or
+ bool{LWR at emptyatbang}
+ }%
+ {}%
+ {%
+ \LWR at getexparray{LWR at colafterspec}%
+ {\arabic{LWR at tableLaTeXcolindex}}%
+ }%
+ \LWR at stoppars%
+ \boolfalse{LWR at tableparcell}%
+ \whileboolexpr{test {\ifnumcomp{\value{LWR at cellcolordepth}}{>}{0}}}{%
+ \LWR at htmltag{/div}\LWR at orignewline%
+ \defaddtocounter{LWR at cellcolordepth}{-1}%
+ }%
+ \leavevmode\unskip\LWR at htmltag{/td}\LWR at orignewline%
+ \global\booltrue{LWR at tabularcelladded}%
+ \LWR at insertatbangcols%
+ }% not skipping mrowcell
+ }% not exiting tabular
+ \boolfalse{LWR at skippingmrowcell}%
+ \boolfalse{LWR at skippingmcolrowcell}%
+ \boolfalse{LWR at skipatbang}%
+ \def\LWR at cellHTMLcolor{}%
+ \def\LWR at columnHTMLcolor{}%
+ \defcounter{LWR at cellcolordepth}{0}%
}
\let\LWR at origampmacro&
@@ -7714,251 +7855,265 @@
\end{warpHTML}
\begin{warpHTML}
\newcommand*{\LWR at tabularampersand}{%
-\LWR at traceinfo{LWR at tabularampersand}%
-\ifnumcomp{\value{LWR at tabulardepth}}{>}{0}%
-{%
- \unskip%
- \LWR at closetabledatacell%
- \addtocounter{LWR at tableLaTeXcolindex}{1}%
- \global\boolfalse{LWR at tabularcelladded}%
- \LWR at getmynexttoken%
-}%
-{\LWR at origampmacro}%
+ \LWR at traceinfo{LWR at tabularampersand}%
+ \ifnumcomp{\value{LWR at tabulardepth}}{>}{0}%
+ {%
+ \unskip%
+ \LWR at closetabledatacell%
+ \defaddtocounter{LWR at tableLaTeXcolindex}{1}%
+ \global\boolfalse{LWR at tabularcelladded}%
+ \LWR at getmynexttoken%
+ }%
+ {%
+ \LWR at origampmacro%
+ }%
}
\newcommand*{\LWR at tabularfinishrow}{%
-\ifboolexpr{%
- not bool {LWR at exitingtabular} or%
- bool{LWR at doingtbrule} or%
- bool{LWR at doingcmidrule} or%
- test{\ifnumcomp{\value{LWR at hlines}}{>}{0}} or%
- test{\ifnumcomp{\value{LWR at hdashedlines}}{>}{0}} or%
- bool{LWR at startedrow}%
-}{%
-\ifbool{LWR at exitingtabular}{%
- \global\booltrue{LWR at tabularmutemods}%
-}{%
- \global\boolfalse{LWR at tabularmutemods}%
-}%
-\global\boolfalse{LWR at exitingtabular}%
-\whileboolexpr{%
- test {
- \ifnumcomp{\value{LWR at tableLaTeXcolindex}}{<}{\value{LWR at tabletotalLaTeXcols}}
- } or %
- (%
- bool{LWR at intabularmetadata} and%
- not bool{LWR at tabularcelladded} and%
+ \ifboolexpr{%
+ not bool {LWR at exitingtabular} or%
+ bool{LWR at doingtbrule} or%
+ bool{LWR at doingcmidrule} or%
+ test{\ifnumcomp{\value{LWR at hlines}}{>}{0}} or%
+ test{\ifnumcomp{\value{LWR at hdashedlines}}{>}{0}} or%
+ bool{LWR at startedrow}%
+ }{%
+ \ifbool{LWR at exitingtabular}{%
+ \booltrue{LWR at tabularmutemods}%
+ }{%
+ \boolfalse{LWR at tabularmutemods}%
+ }%
+ \boolfalse{LWR at exitingtabular}%
+ \whileboolexpr{%
test {
- \ifnumcomp{\value{LWR at tableLaTeXcolindex}}{=}{\value{LWR at tabletotalLaTeXcols}}
- }%
- )%
-}%
-{%
- \LWR at tabledatasinglecolumntag%
- \LWR at closetabledatacell%
- \addtocounter{LWR at tableLaTeXcolindex}{1}%
- \global\boolfalse{LWR at tabularcelladded}%
- \global\booltrue{LWR at emptyatbang}%
- \ifnumcomp{\value{LWR at tableLaTeXcolindex}}{<}{\value{LWR at tabletotalLaTeXcols}}%
- {\LWR at getmynexttoken}%
- {}%
-}%
-\ifbool{LWR at tabularmutemods}{%
- \global\booltrue{LWR at exitingtabular}%
-}{%
- \global\boolfalse{LWR at exitingtabular}%
-}%
-\global\boolfalse{LWR at tabularmutemods}%
-\global\boolfalse{LWR at emptyatbang}%
-}{}% ifboolexpr
+ \ifnumcomp{\value{LWR at tableLaTeXcolindex}}{<}
+ {\value{LWR at tabletotalLaTeXcols}}
+ } or %
+ (%
+ bool{LWR at intabularmetadata} and%
+ not bool{LWR at tabularcelladded} and%
+ test {
+ \ifnumcomp{\value{LWR at tableLaTeXcolindex}}{=}
+ {\value{LWR at tabletotalLaTeXcols}}
+ }%
+ )%
+ }%
+ {%
+ \LWR at tabledatasinglecolumntag%
+ \LWR at closetabledatacell%
+ \defaddtocounter{LWR at tableLaTeXcolindex}{1}%
+ \global\boolfalse{LWR at tabularcelladded}%
+ \booltrue{LWR at emptyatbang}%
+ \ifnumcomp{\value{LWR at tableLaTeXcolindex}}{<}
+ {\value{LWR at tabletotalLaTeXcols}}%
+ {\LWR at getmynexttoken}%
+ {}%
+ }%
+ \ifbool{LWR at tabularmutemods}{%
+ \booltrue{LWR at exitingtabular}%
+ }{%
+ \boolfalse{LWR at exitingtabular}%
+ }%
+ \boolfalse{LWR at tabularmutemods}%
+ \boolfalse{LWR at emptyatbang}%
+ }{}% ifboolexpr
}
\NewDocumentCommand{\LWR at tabularendofline}{s o}{%
-\ifnumcomp{\value{LWR at tableLaTeXcolindex}}{<}{\value{LWR at tabletotalLaTeXcols}}%
- {\LWR at tabularfinishrow}%
- {\LWR at closetabledatacell}%
-\LWR at htmltag{/tr}\LWR at orignewline%
-\@rowc at lors%
-\global\booltrue{LWR at intabularmetadata}%
-\global\boolfalse{LWR at startedrow}%
-\setcounter{LWR at hlines}{0}%
-\setcounter{LWR at hdashedlines}{0}%
-\global\boolfalse{LWR at doingtbrule}%
-\global\boolfalse{LWR at doingcmidrule}%
-\LWR at clearmidrules%
-\gdef\LWR at rowHTMLcolor{}%
-\setcounter{LWR at tableLaTeXcolindex}{1}%
-\global\boolfalse{LWR at tabularcelladded}%
-\LWR at stoppars
-\LWR at origpar
-\LWR at getmynexttoken%
+ \ifnumcomp{\value{LWR at tableLaTeXcolindex}}{<}
+ {\value{LWR at tabletotalLaTeXcols}}%
+ {\LWR at tabularfinishrow}%
+ {\LWR at closetabledatacell}%
+ \LWR at htmltag{/tr}\LWR at orignewline%
+ \@rowc at lors%
+ \booltrue{LWR at intabularmetadata}%
+ \boolfalse{LWR at startedrow}%
+ \defcounter{LWR at hlines}{0}%
+ \defcounter{LWR at hdashedlines}{0}%
+ \boolfalse{LWR at doingtbrule}%
+ \boolfalse{LWR at doingcmidrule}%
+ \LWR at clearmidrules%
+ \def\LWR at rowHTMLcolor{}%
+ \defcounter{LWR at tableLaTeXcolindex}{1}%
+ \global\boolfalse{LWR at tabularcelladded}%
+ \LWR at stoppars%
+ \LWR at origpar%
+ \LWR at getmynexttoken%
}
\newcommand*{\LWR at columnspeclookahead}[1]{%
-\setcounter{LWR at tempcountone}{\value{LWR at tablecolspecindex}}%
-\addtocounter{LWR at tempcountone}{#1}%
-\fullexpandarg%
-\StrChar{\LWR at origcolspec}{\arabic{LWR at tempcountone}}[\LWR at strresulttwo]%
-\exploregroups%
-\StrChar{\LWR at strresulttwo}{1}[\LWR at strresulttwo]%
-\noexploregroups%
+ \setcounter{LWR at tempcountone}{\value{LWR at tablecolspecindex}}%
+ \addtocounter{LWR at tempcountone}{#1}%
+ \fullexpandarg%
+ \StrChar{\LWR at origcolspec}{\arabic{LWR at tempcountone}}[\LWR at strresulttwo]%
+ \exploregroups%
+ \StrChar{\LWR at strresulttwo}{1}[\LWR at strresulttwo]%
+ \noexploregroups%
}
\newcommand*{\LWR at colparameter}{}
\newcommand*{\LWR at parseatcolumn}{%
-\LWR at traceinfo{at column}%
-\addtocounter{LWR at tablecolspecindex}{1}%
-\LWR at traceinfo{about to read the next token:}%
-\expandarg%
-\StrChar{\LWR at origcolspec}%
- {\arabic{LWR at tablecolspecindex}}[\LWR at colparameter]
-\fullexpandarg%
-\LWR at traceinfo{have now read the next token}%
-\ifnumcomp{\value{LWR at tabletotalLaTeXcols}}{=}{0}%
-{% left edge of the table:
- \LWR at traceinfo{at the left edge}%
- \LWR at setexparray{LWR at colatspec}{leftedge}{\LWR at colparameter}%
- \LWR at traceinfo{at the left edge: %
- \LWR at getexparray{LWR at colatspec}{leftedge}}%
-}%
-{% not at the left edge:
- \LWR at traceinfo{not at the left edge}%
- \LWR at setexparray{LWR at colatspec}%
- {\arabic{LWR at tabletotalLaTeXcols}}{\LWR at colparameter}%
- \LWR at traceinfo{at \arabic{LWR at tabletotalLaTeXcols}: %
- \LWR at getexparray{LWR at colatspec}{\arabic{LWR at tabletotalLaTeXcols}}}%
-}%
-\let\LWR at colparameter\relax%
-\global\booltrue{LWR at validtablecol}%
+ \LWR at traceinfo{at column}%
+ \defaddtocounter{LWR at tablecolspecindex}{1}%
+ \LWR at traceinfo{about to read the next token:}%
+ \expandarg%
+ \StrChar{\LWR at origcolspec}%
+ {\arabic{LWR at tablecolspecindex}}[\LWR at colparameter]%
+ \fullexpandarg%
+ \LWR at traceinfo{have now read the next token}%
+ \ifnumcomp{\value{LWR at tabletotalLaTeXcols}}{=}{0}%
+ {% left edge of the table:
+ \LWR at traceinfo{at the left edge}%
+ \LWR at setexparray{LWR at colatspec}%
+ {leftedge}%
+ {\expandafter\@firstofone\LWR at colparameter}%
+ \LWR at traceinfo{at the left edge: %
+ \LWR at getexparray{LWR at colatspec}{leftedge}}%
+ }%
+ {% not at the left edge:
+ \LWR at traceinfo{not at the left edge}%
+ \LWR at setexparray{LWR at colatspec}%
+ {\arabic{LWR at tabletotalLaTeXcols}}%
+ {\expandafter\@firstofone\LWR at colparameter}%
+ \LWR at traceinfo{at \arabic{LWR at tabletotalLaTeXcols}: %
+ \LWR at getexparray{LWR at colatspec}{\arabic{LWR at tabletotalLaTeXcols}}}%
+ }%
+ \let\LWR at colparameter\relax%
+ \booltrue{LWR at validtablecol}%
}
\newcommand*{\LWR at parsebangcolumn}{%
-\LWR at traceinfo{bang column}%
-\addtocounter{LWR at tablecolspecindex}{1}%
-\LWR at traceinfo{about to read the next token:}%
-\expandarg%
-\StrChar{\LWR at origcolspec}%
- {\arabic{LWR at tablecolspecindex}}[\LWR at colparameter]
-\fullexpandarg%
-\LWR at traceinfo{have now read the next token}%
-\ifnumcomp{\value{LWR at tabletotalLaTeXcols}}{=}{0}%
-{% left edge of the table:
- \LWR at traceinfo{at the left edge}%
- \LWR at setexparray{LWR at colbangspec}{leftedge}{\LWR at colparameter}%
-}%
-{% not at the left edge:
- \LWR at traceinfo{not at the left edge}%
- \LWR at setexparray{LWR at colbangspec}%
- {\arabic{LWR at tabletotalLaTeXcols}}{\LWR at colparameter}%
- \LWR at traceinfo{bang \arabic{LWR at tabletotalLaTeXcols}: \LWR at colparameter!}%
-}%
-\let\LWR at colparameter\relax%
-\global\booltrue{LWR at validtablecol}%
+ \LWR at traceinfo{bang column}%
+ \defaddtocounter{LWR at tablecolspecindex}{1}%
+ \LWR at traceinfo{about to read the next token:}%
+ \expandarg%
+ \StrChar{\LWR at origcolspec}%
+ {\arabic{LWR at tablecolspecindex}}[\LWR at colparameter]%
+ \fullexpandarg%
+ \LWR at traceinfo{have now read the next token}%
+ \ifnumcomp{\value{LWR at tabletotalLaTeXcols}}{=}{0}%
+ {% left edge of the table:
+ \LWR at traceinfo{at the left edge}%
+ \LWR at setexparray{LWR at colbangspec}%
+ {leftedge}%
+ {\expandafter\@firstofone\LWR at colparameter}%
+ }%
+ {% not at the left edge:
+ \LWR at traceinfo{not at the left edge}%
+ \LWR at setexparray{LWR at colbangspec}%
+ {\arabic{LWR at tabletotalLaTeXcols}}%
+ {\expandafter\@firstofone\LWR at colparameter}%
+ \LWR at traceinfo{bang \arabic{LWR at tabletotalLaTeXcols}: \LWR at colparameter!}%
+ }%
+ \let\LWR at colparameter\relax%
+ \booltrue{LWR at validtablecol}%
}
\newcommand*{\LWR at parsebeforecolumn}{%
-\addtocounter{LWR at tablecolspecindex}{1}%
-\expandarg%
-\StrChar{\LWR at origcolspec}%
- {\arabic{LWR at tablecolspecindex}}[\LWR at colparameter]%
-\fullexpandarg%
-\LWR at setexparray{LWR at colbeforespec}%
- {\arabic{LWR at tabletotalLaTeXcolsnext}}{\LWR at colparameter}%
-\let\LWR at colparameter\relax%
-\global\booltrue{LWR at validtablecol}%
+ \defaddtocounter{LWR at tablecolspecindex}{1}%
+ \expandarg%
+ \StrChar{\LWR at origcolspec}%
+ {\arabic{LWR at tablecolspecindex}}[\LWR at colparameter]%
+ \fullexpandarg%
+ \LWR at setexparray{LWR at colbeforespec}%
+ {\arabic{LWR at tabletotalLaTeXcolsnext}}%
+ {\expandafter\@firstofone\LWR at colparameter}%
+ \let\LWR at colparameter\relax%
+ \booltrue{LWR at validtablecol}%
}
\newcommand*{\LWR at parseaftercolumn}{%
-\addtocounter{LWR at tablecolspecindex}{1}%
-\expandarg%
-\StrChar{\LWR at origcolspec}%
- {\arabic{LWR at tablecolspecindex}}[\LWR at colparameter]%
-\fullexpandarg%
-\LWR at setexparray{LWR at colafterspec}%
- {\arabic{LWR at tabletotalLaTeXcols}}{\LWR at colparameter}%
-\let\LWR at colparameter\relax%
-\global\booltrue{LWR at validtablecol}%
+ \defaddtocounter{LWR at tablecolspecindex}{1}%
+ \expandarg%
+ \StrChar{\LWR at origcolspec}%
+ {\arabic{LWR at tablecolspecindex}}[\LWR at colparameter]%
+ \fullexpandarg%
+ \LWR at setexparray{LWR at colafterspec}%
+ {\arabic{LWR at tabletotalLaTeXcols}}%
+ {\expandafter\@firstofone\LWR at colparameter}%
+ \let\LWR at colparameter\relax%
+ \booltrue{LWR at validtablecol}%
}
\newcommand*{\LWR at parsebarcolumn}{%
-\LWR at traceinfo{LWR at parsebarcolumn}%
-\ifnumcomp{\value{LWR at tabletotalLaTeXcols}}{=}{0}%
-{% left edge of the table:
- \edef\LWR at tempone{\LWR at getexparray{LWR at colbarspec}{leftedge}}%
- \ifdefstring{\LWR at tempone}{tvertbarl}%
- {\LWR at setexparray{LWR at colbarspec}{leftedge}{tvertbarldouble}}%
- {\LWR at setexparray{LWR at colbarspec}{leftedge}{tvertbarl}}%
-}%
-{% not at the left edge:
- \edef\LWR at tempone{%
- \LWR at getexparray{LWR at colbarspec}{\arabic{LWR at tabletotalLaTeXcols}}%
+ \LWR at traceinfo{LWR at parsebarcolumn}%
+ \ifnumcomp{\value{LWR at tabletotalLaTeXcols}}{=}{0}%
+ {% left edge of the table:
+ \edef\LWR at tempone{\LWR at getexparray{LWR at colbarspec}{leftedge}}%
+ \ifdefstring{\LWR at tempone}{tvertbarl}%
+ {\LWR at setexparray{LWR at colbarspec}{leftedge}{tvertbarldouble}}%
+ {\LWR at setexparray{LWR at colbarspec}{leftedge}{tvertbarl}}%
}%
- \ifdefstring{\LWR at tempone}{tvertbarr}%
- {%
- \LWR at setexparray{LWR at colbarspec}%
- {\arabic{LWR at tabletotalLaTeXcols}}{tvertbarrdouble}%
+ {% not at the left edge:
+ \edef\LWR at tempone{%
+ \LWR at getexparray{LWR at colbarspec}{\arabic{LWR at tabletotalLaTeXcols}}%
+ }%
+ \ifdefstring{\LWR at tempone}{tvertbarr}%
+ {%
+ \LWR at setexparray{LWR at colbarspec}%
+ {\arabic{LWR at tabletotalLaTeXcols}}{tvertbarrdouble}%
+ }%
+ {%
+ \LWR at setexparray{LWR at colbarspec}%
+ {\arabic{LWR at tabletotalLaTeXcols}}{tvertbarr}%
+ }%
}%
- {%
- \LWR at setexparray{LWR at colbarspec}%
- {\arabic{LWR at tabletotalLaTeXcols}}{tvertbarr}%
- }%
-}%
-\global\booltrue{LWR at validtablecol}%
+ \booltrue{LWR at validtablecol}%
}
\newcommand*{\LWR at parsecoloncolumn}{%
-\LWR at traceinfo{LWR at parsecoloncolumn}%
-\ifnumcomp{\value{LWR at tabletotalLaTeXcols}}{=}{0}%
-{% left edge of the table:
- \edef\LWR at tempone{\LWR at getexparray{LWR at colbarspec}{leftedge}}%
- \ifdefstring{\LWR at tempone}{tvertbarldash}%
- {\LWR at setexparray{LWR at colbarspec}{leftedge}{tvertbarldoubledash}}%
- {\LWR at setexparray{LWR at colbarspec}{leftedge}{tvertbarldash}}%
-}%
-{% not at the left edge:
- \edef\LWR at tempone{%
- \LWR at getexparray{LWR at colbarspec}{\arabic{LWR at tabletotalLaTeXcols}}%
+ \LWR at traceinfo{LWR at parsecoloncolumn}%
+ \ifnumcomp{\value{LWR at tabletotalLaTeXcols}}{=}{0}%
+ {% left edge of the table:
+ \edef\LWR at tempone{\LWR at getexparray{LWR at colbarspec}{leftedge}}%
+ \ifdefstring{\LWR at tempone}{tvertbarldash}%
+ {\LWR at setexparray{LWR at colbarspec}{leftedge}{tvertbarldoubledash}}%
+ {\LWR at setexparray{LWR at colbarspec}{leftedge}{tvertbarldash}}%
}%
- \ifdefstring{\LWR at tempone}{tvertbarrdash}%
- {\LWR at setexparray{LWR at colbarspec}%
- {\arabic{LWR at tabletotalLaTeXcols}}{tvertbarrdoubledash}}%
- {\LWR at setexparray{LWR at colbarspec}%
- {\arabic{LWR at tabletotalLaTeXcols}}{tvertbarrdash}}%
-}%
-\global\booltrue{LWR at validtablecol}%
+ {% not at the left edge:
+ \edef\LWR at tempone{%
+ \LWR at getexparray{LWR at colbarspec}{\arabic{LWR at tabletotalLaTeXcols}}%
+ }%
+ \ifdefstring{\LWR at tempone}{tvertbarrdash}%
+ {\LWR at setexparray{LWR at colbarspec}%
+ {\arabic{LWR at tabletotalLaTeXcols}}{tvertbarrdoubledash}}%
+ {\LWR at setexparray{LWR at colbarspec}%
+ {\arabic{LWR at tabletotalLaTeXcols}}{tvertbarrdash}}%
+ }%
+ \booltrue{LWR at validtablecol}%
}
\newcommand*{\LWR at parsesemicoloncolumn}{%
-\LWR at parsecoloncolumn%
-\addtocounter{LWR at tablecolspecindex}{1}%
+ \LWR at parsecoloncolumn%
+ \defaddtocounter{LWR at tablecolspecindex}{1}%
}
\newcommand*{\LWR at parsenormalcolumn}[1]{%
-\addtocounter{LWR at tabletotalLaTeXcols}{1}%
-\addtocounter{LWR at tabletotalLaTeXcolsnext}{1}%
-\LWR at setexparray{LWR at tablecolspec}{\arabic{LWR at tabletotalLaTeXcols}}{#1}%
-\LWR at traceinfo{normal column \arabic{LWR at tabletotalLaTeXcols}: #1}%
-\LWR at setexparray{LWR at colatspec}{\arabic{LWR at tabletotalLaTeXcolsnext}}{}%
-\LWR at setexparray{LWR at colbangspec}{\arabic{LWR at tabletotalLaTeXcolsnext}}{}%
-\LWR at setexparray{LWR at colbeforespec}{\arabic{LWR at tabletotalLaTeXcolsnext}}{}%
-\LWR at setexparray{LWR at colafterspec}{\arabic{LWR at tabletotalLaTeXcolsnext}}{}%
-\LWR at setexparray{LWR at colbarspec}{\arabic{LWR at tabletotalLaTeXcolsnext}}{}%
-\global\booltrue{LWR at validtablecol}%
+ \defaddtocounter{LWR at tabletotalLaTeXcols}{1}%
+ \defaddtocounter{LWR at tabletotalLaTeXcolsnext}{1}%
+ \LWR at setexparray{LWR at tablecolspec}{\arabic{LWR at tabletotalLaTeXcols}}{#1}%
+ \LWR at traceinfo{normal column \arabic{LWR at tabletotalLaTeXcols}: #1}%
+ \LWR at setexparray{LWR at colatspec}{\arabic{LWR at tabletotalLaTeXcolsnext}}{}%
+ \LWR at setexparray{LWR at colbangspec}{\arabic{LWR at tabletotalLaTeXcolsnext}}{}%
+ \LWR at setexparray{LWR at colbeforespec}{\arabic{LWR at tabletotalLaTeXcolsnext}}{}%
+ \LWR at setexparray{LWR at colafterspec}{\arabic{LWR at tabletotalLaTeXcolsnext}}{}%
+ \LWR at setexparray{LWR at colbarspec}{\arabic{LWR at tabletotalLaTeXcolsnext}}{}%
+ \booltrue{LWR at validtablecol}%
}
\newcommand*{\LWR at parsepcolumn}[1]{%
-\LWR at parsenormalcolumn{#1}%
-\addtocounter{LWR at tablecolspecindex}{1}%
+ \LWR at parsenormalcolumn{#1}%
+ \defaddtocounter{LWR at tablecolspecindex}{1}%
}
\newcommand*{\LWR at parsewcolumn}{%
-\LWR at columnspeclookahead{1}%
-\expandafter\LWR at parsenormalcolumn\expandafter{\LWR at strresulttwo}%
-\addtocounter{LWR at tablecolspecindex}{2}%
+ \LWR at columnspeclookahead{1}%
+ \expandafter\LWR at parsenormalcolumn\expandafter{\LWR at strresulttwo}%
+ \defaddtocounter{LWR at tablecolspecindex}{2}%
}
\newcommand*{\LWR at parsestarcolumn}{%
- \addtocounter{LWR at tablecolspecindex}{2}%
+ \defaddtocounter{LWR at tablecolspecindex}{2}%
}
\newcommand*{\LWR at parseDcolumn}[1]{%
-\LWR at parsenormalcolumn{#1}%
-\addtocounter{LWR at tablecolspecindex}{3}%
+ \LWR at parsenormalcolumn{#1}%
+ \defaddtocounter{LWR at tablecolspecindex}{3}%
}
@@ -7997,93 +8152,91 @@
}
-\newbool{LWR at validtablecol}
-\newbool{LWR at opttablecol}
\newcommand*{\LWR at parsetablecols}[1]{%
-\LWR at traceinfo{LWR at parsetablecols}%
-\renewcommand*{\LWR at origcolspec}{#1}%
-\expandarg%
-\StrSubstitute{\LWR at origcolspec}{ }{}[\LWR at origcolspec]%
-\expandcolspec%
-\setcounter{LWR at tabletotalLaTeXcols}{0}%
-\setcounter{LWR at tabletotalLaTeXcolsnext}{1}%
-\LWR at setexparray{LWR at colatspec}{leftedge}{}%
-\LWR at setexparray{LWR at colatspec}{1}{}%
-\LWR at setexparray{LWR at colatspec}{2}{}%
-\LWR at setexparray{LWR at colatspec}{3}{}%
-\LWR at setexparray{LWR at colbangspec}{leftedge}{}%
-\LWR at setexparray{LWR at colbangspec}{1}{}%
-\LWR at setexparray{LWR at colbangspec}{2}{}%
-\LWR at setexparray{LWR at colbangspec}{3}{}%
-\LWR at setexparray{LWR at colbeforespec}{1}{}%
-\LWR at setexparray{LWR at colbeforespec}{2}{}%
-\LWR at setexparray{LWR at colbeforespec}{3}{}%
-\LWR at setexparray{LWR at colafterspec}{1}{}%
-\LWR at setexparray{LWR at colafterspec}{2}{}%
-\LWR at setexparray{LWR at colafterspec}{3}{}%
-\LWR at setexparray{LWR at colbarspec}{leftedge}{}%
-\LWR at setexparray{LWR at colbarspec}{1}{}%
-\LWR at setexparray{LWR at colbarspec}{2}{}%
-\LWR at setexparray{LWR at colbarspec}{3}{}%
-\setcounter{LWR at tablecolspecindex}{1}%
-\expandarg%
-\StrLen{\LWR at origcolspec}[\LWR at strresult]%
-\fullexpandarg%
-\LWR at traceinfo{original column spec length: \LWR at strresult}%
-\setcounter{LWR at tablecolspecwidth}{\LWR at strresult}%
-\global\boolfalse{LWR at opttablecol}%
-\whileboolexpr{%
- not test{%
- \ifnumcomp{\value{LWR at tablecolspecindex}}{>}%
- {\value{LWR at tablecolspecwidth}}%
+ \LWR at traceinfo{LWR at parsetablecols}%
+ \renewcommand*{\LWR at origcolspec}{#1}%
+ \expandarg%
+ \StrSubstitute{\LWR at origcolspec}{ }{}[\LWR at origcolspec]%
+ \expandcolspec%
+ \defcounter{LWR at tabletotalLaTeXcols}{0}%
+ \defcounter{LWR at tabletotalLaTeXcolsnext}{1}%
+ \LWR at setexparray{LWR at colatspec}{leftedge}{}%
+ \LWR at setexparray{LWR at colatspec}{1}{}%
+ \LWR at setexparray{LWR at colatspec}{2}{}%
+ \LWR at setexparray{LWR at colatspec}{3}{}%
+ \LWR at setexparray{LWR at colbangspec}{leftedge}{}%
+ \LWR at setexparray{LWR at colbangspec}{1}{}%
+ \LWR at setexparray{LWR at colbangspec}{2}{}%
+ \LWR at setexparray{LWR at colbangspec}{3}{}%
+ \LWR at setexparray{LWR at colbeforespec}{1}{}%
+ \LWR at setexparray{LWR at colbeforespec}{2}{}%
+ \LWR at setexparray{LWR at colbeforespec}{3}{}%
+ \LWR at setexparray{LWR at colafterspec}{1}{}%
+ \LWR at setexparray{LWR at colafterspec}{2}{}%
+ \LWR at setexparray{LWR at colafterspec}{3}{}%
+ \LWR at setexparray{LWR at colbarspec}{leftedge}{}%
+ \LWR at setexparray{LWR at colbarspec}{1}{}%
+ \LWR at setexparray{LWR at colbarspec}{2}{}%
+ \LWR at setexparray{LWR at colbarspec}{3}{}%
+ \defcounter{LWR at tablecolspecindex}{1}%
+ \expandarg%
+ \StrLen{\LWR at origcolspec}[\LWR at strresult]%
+ \fullexpandarg%
+ \LWR at traceinfo{original column spec length: \LWR at strresult}%
+ \defcounter{LWR at tablecolspecwidth}{\LWR at strresult}%
+ \boolfalse{LWR at opttablecol}%
+ \whileboolexpr{%
+ not test{%
+ \ifnumcomp{\value{LWR at tablecolspecindex}}{>}%
+ {\value{LWR at tablecolspecwidth}}%
+ }%
}%
+ {%
+ \expandarg%
+ \StrChar{\LWR at origcolspec}{\arabic{LWR at tablecolspecindex}}[\LWR at strresult]%
+ \LWR at traceinfo{position \arabic{LWR at tablecolspecindex}: \LWR at strresult}%
+ \fullexpandarg%
+ \boolfalse{LWR at validtablecol}%
+ \IfStrEq{\LWR at strresult}{[}{\booltrue{LWR at opttablecol}}{}%
+ \ifbool{LWR at opttablecol}%
+ {}% inside an optional argument
+ {% not an optional tabular argument
+ \IfStrEq{\LWR at strresult}{l}{\LWR at parsenormalcolumn{l}}{}%
+ \IfStrEq{\LWR at strresult}{c}{\LWR at parsenormalcolumn{c}}{}%
+ \IfStrEq{\LWR at strresult}{r}{\LWR at parsenormalcolumn{r}}{}%
+ \IfStrEq{\LWR at strresult}{L}{\LWR at parsenormalcolumn{l}}{}%
+ \IfStrEq{\LWR at strresult}{C}{\LWR at parsenormalcolumn{c}}{}%
+ \IfStrEq{\LWR at strresult}{R}{\LWR at parsenormalcolumn{r}}{}%
+ \IfStrEq{\LWR at strresult}{J}{\LWR at parsenormalcolumn{l}}{}%
+ \IfStrEq{\LWR at strresult}{S}{\LWR at parsenormalcolumn{c}}{}%
+ \IfStrEq{\LWR at strresult}{s}{\LWR at parsenormalcolumn{c}}{}%
+ \IfStrEq{\LWR at strresult}{\detokenize{@}}{\LWR at parseatcolumn}{}%
+ \IfStrEq{\LWR at strresult}{!}{\LWR at parsebangcolumn}{}%
+ \IfStrEq{\LWR at strresult}{>}{\LWR at parsebeforecolumn}{}%
+ \IfStrEq{\LWR at strresult}{<}{\LWR at parseaftercolumn}{}%
+ \IfStrEq{\LWR at strresult}{|}{\LWR at parsebarcolumn}{}%
+ \IfStrEq{\LWR at strresult}{:}{\LWR at parsecoloncolumn}{}%
+ \IfStrEq{\LWR at strresult}{;}{\LWR at parsesemicoloncolumn}{}%
+ \IfStrEq{\LWR at strresult}{p}{\LWR at parsepcolumn{p}}{}%
+ \IfStrEq{\LWR at strresult}{m}{\LWR at parsepcolumn{m}}{}%
+ \IfStrEq{\LWR at strresult}{b}{\LWR at parsepcolumn{b}}{}%
+ \IfStrEq{\LWR at strresult}{w}{\LWR at parsewcolumn}{}%
+ \IfStrEq{\LWR at strresult}{W}{\LWR at parsewcolumn}{}%
+ \IfStrEq{\LWR at strresult}{*}{\LWR at parsestarcolumn}{}%
+ \IfStrEq{\LWR at strresult}{D}{\LWR at parseDcolumn{c}}{}%
+ \IfStrEq{\LWR at strresult}{X}{\LWR at parsenormalcolumn{X}}{}%
+ \IfStrEq{\LWR at strresult}{P}{\LWR at parsepcolumn{P}}{}%
+ \IfStrEq{\LWR at strresult}{M}{\LWR at parsepcolumn{M}}{}%
+ \IfStrEq{\LWR at strresult}{B}{\LWR at parsepcolumn{B}}{}%
+ \ifbool{LWR at validtablecol}{}{%
+ \LWR at traceinfo{invalid column type: \LWR at strresult}%
+ \LWR at parsenormalcolumn{l}%
+ }%
+ }% not an optional column argument
+ \IfStrEq{\LWR at strresult}{]}{\boolfalse{LWR at opttablecol}}{}%
+ \defaddtocounter{LWR at tablecolspecindex}{1}%
+ }% whiledo
}%
-{%
-\expandarg%
-\StrChar{\LWR at origcolspec}{\arabic{LWR at tablecolspecindex}}[\LWR at strresult]%
-\LWR at traceinfo{position \arabic{LWR at tablecolspecindex}: \LWR at strresult}%
-\fullexpandarg%
-\global\boolfalse{LWR at validtablecol}%
-\IfStrEq{\LWR at strresult}{[}{\global\booltrue{LWR at opttablecol}}{}%
-\ifbool{LWR at opttablecol}%
-{}% inside an optional argument
-{% not an optional tabular argument
-\IfStrEq{\LWR at strresult}{l}{\LWR at parsenormalcolumn{l}}{}%
-\IfStrEq{\LWR at strresult}{c}{\LWR at parsenormalcolumn{c}}{}%
-\IfStrEq{\LWR at strresult}{r}{\LWR at parsenormalcolumn{r}}{}%
-\IfStrEq{\LWR at strresult}{L}{\LWR at parsenormalcolumn{l}}{}%
-\IfStrEq{\LWR at strresult}{C}{\LWR at parsenormalcolumn{c}}{}%
-\IfStrEq{\LWR at strresult}{R}{\LWR at parsenormalcolumn{r}}{}%
-\IfStrEq{\LWR at strresult}{J}{\LWR at parsenormalcolumn{l}}{}%
-\IfStrEq{\LWR at strresult}{S}{\LWR at parsenormalcolumn{c}}{}%
-\IfStrEq{\LWR at strresult}{s}{\LWR at parsenormalcolumn{c}}{}%
-\IfStrEq{\LWR at strresult}{\detokenize{@}}{\LWR at parseatcolumn}{}%
-\IfStrEq{\LWR at strresult}{!}{\LWR at parsebangcolumn}{}%
-\IfStrEq{\LWR at strresult}{>}{\LWR at parsebeforecolumn}{}%
-\IfStrEq{\LWR at strresult}{<}{\LWR at parseaftercolumn}{}%
-\IfStrEq{\LWR at strresult}{|}{\LWR at parsebarcolumn}{}%
-\IfStrEq{\LWR at strresult}{:}{\LWR at parsecoloncolumn}{}%
-\IfStrEq{\LWR at strresult}{;}{\LWR at parsesemicoloncolumn}{}%
-\IfStrEq{\LWR at strresult}{p}{\LWR at parsepcolumn{p}}{}%
-\IfStrEq{\LWR at strresult}{m}{\LWR at parsepcolumn{m}}{}%
-\IfStrEq{\LWR at strresult}{b}{\LWR at parsepcolumn{b}}{}%
-\IfStrEq{\LWR at strresult}{w}{\LWR at parsewcolumn}{}%
-\IfStrEq{\LWR at strresult}{W}{\LWR at parsewcolumn}{}%
-\IfStrEq{\LWR at strresult}{*}{\LWR at parsestarcolumn}{}%
-\IfStrEq{\LWR at strresult}{D}{\LWR at parseDcolumn{c}}{}%
-\IfStrEq{\LWR at strresult}{X}{\LWR at parsenormalcolumn{X}}{}%
-\IfStrEq{\LWR at strresult}{P}{\LWR at parsepcolumn{P}}{}%
-\IfStrEq{\LWR at strresult}{M}{\LWR at parsepcolumn{M}}{}%
-\IfStrEq{\LWR at strresult}{B}{\LWR at parsepcolumn{B}}{}%
-\ifbool{LWR at validtablecol}{}{%
- \LWR at traceinfo{invalid column type: \LWR at strresult}%
- \LWR at parsenormalcolumn{l}%
-}%
-}% not an optional column argument
-\IfStrEq{\LWR at strresult}{]}{\global\boolfalse{LWR at opttablecol}}{}%
-\addtocounter{LWR at tablecolspecindex}{1}%
-}% whiledo
-}%
\@ifundefined{rownum}{\newcount\rownum}{}
\newcommand*{\@rowcolors}{}
@@ -8104,89 +8257,89 @@
\newcommand*{\LWR at maybenewtablerow}
{%
-\ifbool{LWR at startedrow}%
-{}% started the row
-{% not started the row
- \global\booltrue{LWR at startedrow}%
- \global\booltrue{LWR at intabularmetadata}%
- \ifboolexpr{%
- test{\ifnumcomp{\value{LWR at hlines}}{>}{0}} or%
- test{\ifnumcomp{\value{LWR at hdashedlines}}{>}{0}}%
- }%
- {%
- \LWR at htmltag{tr class="hline" }%
- \LWR at orignewline%
- }%
- {% not doing hline
- \ifbool{LWR at doingtbrule}%
+ \ifbool{LWR at startedrow}%
+ {}% started the row
+ {% not started the row
+ \booltrue{LWR at startedrow}%
+ \booltrue{LWR at intabularmetadata}%
+ \ifboolexpr{%
+ test{\ifnumcomp{\value{LWR at hlines}}{>}{0}} or%
+ test{\ifnumcomp{\value{LWR at hdashedlines}}{>}{0}}%
+ }%
{%
- \ifdefvoid{\LWR at ruleHTMLcolor}{%
- \LWR at htmltag{tr class="tbrule"}%
- }{%
- \LWR at htmltag{%
- tr class="tbrule" % space
- style="border-top: 1px solid % space
- \LWR at origpound\LWR at ruleHTMLcolor "%
+ \LWR at htmltag{tr class="hline" }%
+ \LWR at orignewline%
+ }%
+ {% not doing hline
+ \ifbool{LWR at doingtbrule}%
+ {%
+ \ifdefvoid{\LWR at ruleHTMLcolor}{%
+ \LWR at htmltag{tr class="tbrule"}%
+ }{%
+ \LWR at htmltag{%
+ tr class="tbrule" % space
+ style="border-top: 1px solid % space
+ \LWR at origpound\LWR at ruleHTMLcolor "%
+ }%
}%
+ \LWR at orignewline%
}%
- \LWR at orignewline%
- }%
- {\LWR at htmltag{tr}\LWR at orignewline}%
- }% end of not doing hline
-}% end of not started the row
+ {\LWR at htmltag{tr}\LWR at orignewline}%
+ }% end of not doing hline
+ }% end of not started the row
}
\newcommand*{\LWR at printbartag}[1]{%
-\LWR at traceinfo{LWR at printbartag !#1!}%
-\ifboolexpr{bool{LWR at tabularmutemods} or bool{LWR at emptyatbang}}%
-{}% muting or empty
-{% not muting
- \edef\LWR at tempone{\LWR at getexparray{LWR at colbarspec}{#1}}%
- \ifdefempty{\LWR at tempone}{}{ \LWR at tempone}%
-}% not muting
-\LWR at traceinfo{LWR at printbartag done}%
+ \LWR at traceinfo{LWR at printbartag !#1!}%
+ \ifboolexpr{bool{LWR at tabularmutemods} or bool{LWR at emptyatbang}}%
+ {}% muting or empty
+ {% not muting
+ \edef\LWR at tempone{\LWR at getexparray{LWR at colbarspec}{#1}}%
+ \ifdefempty{\LWR at tempone}{}{ \LWR at tempone}%
+ }% not muting
+ \LWR at traceinfo{LWR at printbartag done}%
}
\newcommand*{\LWR at printatbang}[2]{%
-\xdef\LWR at atbangspec{\LWR at getexparray{LWR at col#1spec}{#2}}%
-\LWR at traceinfo{atbang: #2 !\LWR at atbangspec!}%
-\ifdefempty{\LWR at atbangspec}%
-{}%
-{% not empty
- \LWR at htmltag{%
- td class="td#1%
- \LWR at subaddcmidruletrim{}{}%
- \LWR at printbartag{#2}%
- "%
- \LWR at tdstartstyles%
- \LWR at addcmidrulewidth%
- \LWR at addcdashline%
- \LWR at addtabularrulecolors%
- \LWR at tdendstyles%
- }%
- \ifboolexpr{bool{LWR at tabularmutemods} or bool{LWR at emptyatbang}}%
+ \xdef\LWR at atbangspec{\LWR at getexparray{LWR at col#1spec}{#2}}%
+ \LWR at traceinfo{atbang: #2 !\LWR at atbangspec!}%
+ \ifdefempty{\LWR at atbangspec}%
{}%
- {\LWR at atbangspec}%
- \LWR at htmltag{/td}\LWR at orignewline%
- \global\booltrue{LWR at tabularcelladded}%
-}% not empty
+ {% not empty
+ \LWR at htmltag{%
+ td class="td#1%
+ \LWR at subaddcmidruletrim{}{}%
+ \LWR at printbartag{#2}%
+ "%
+ \LWR at tdstartstyles%
+ \LWR at addcmidrulewidth%
+ \LWR at addcdashline%
+ \LWR at addtabularrulecolors%
+ \LWR at tdendstyles%
+ }%
+ \ifboolexpr{bool{LWR at tabularmutemods} or bool{LWR at emptyatbang}}%
+ {}%
+ {\LWR at atbangspec}%
+ \LWR at htmltag{/td}\LWR at orignewline%
+ \global\booltrue{LWR at tabularcelladded}%
+ }% not empty
}%
\newcommand*{\LWR at addleftmostbartag}{%
-\ifnumcomp{\value{LWR at tableLaTeXcolindex}}{=}{1}{%
- \LWR at printbartag{leftedge}%
-}{}%
+ \ifnumcomp{\value{LWR at tableLaTeXcolindex}}{=}{1}{%
+ \LWR at printbartag{leftedge}%
+ }{}%
}
\newcommand*{\LWR at tabularleftedge}{%
-\ifnumcomp{\value{LWR at tableLaTeXcolindex}}{=}{1}%
-{%
- \LWR at printatbang{at}{leftedge}%
- \LWR at printatbang{bang}{leftedge}%
-}% left edge
-{}% not left edge
+ \ifnumcomp{\value{LWR at tableLaTeXcolindex}}{=}{1}%
+ {%
+ \LWR at printatbang{at}{leftedge}%
+ \LWR at printatbang{bang}{leftedge}%
+ }% left edge
+ {}% not left edge
}
@@ -8194,60 +8347,62 @@
\newcommand*{\LWR at tabledatasinglecolumntag}%
{%
-\LWR at traceinfo{LWR at tabledatasinglecolumntag}%
-\LWR at maybenewtablerow%
-\ifbool{LWR at intabularmetadata}%
-{%
- \ifbool{LWR at exitingtabular}{}%
- {% not exiting tabular
- \LWR at tabularleftedge%
- \xdef\LWR at strresult{%
- \LWR at getexparray{LWR at tablecolspec}{\arabic{LWR at tableLaTeXcolindex}}%
- }%
-\LWR at traceinfo{LWR at tabledatasinglecolumntag: about to print td tag}%
- \LWR at htmltag{td class="td%
- \LWR at strresult%
- \LWR at addcmidruletrim%
- \LWR at addleftmostbartag%
- \LWR at printbartag{\arabic{LWR at tableLaTeXcolindex}}%
- "%
- \LWR at tdstartstyles%
- \LWR at addcmidrulewidth%
- \LWR at addcdashline%
- \xdef\LWR at thiscolspec{%
- \LWR at getexparray{LWR at tablecolspec}{\arabic{LWR at tableLaTeXcolindex}}%
- }%
- \LWR at addformatwpalignment{\LWR at thiscolspec}%
- \LWR at addtabularrowcolor%
- \LWR at addtabularrulecolors%
- \LWR at tdendstyles%
- }% HTML td
- \LWR at traceinfo{LWR at tabledatasinglecolumntag: done printing td tag}%
- \ifboolexpr{%
- test{ \ifdefstring{\LWR at strresult}{p} } or
- test{ \ifdefstring{\LWR at strresult}{m} } or
- test{ \ifdefstring{\LWR at strresult}{b} } or
- test{ \ifdefstring{\LWR at strresult}{P} } or
- test{ \ifdefstring{\LWR at strresult}{M} } or
- test{ \ifdefstring{\LWR at strresult}{B} } or
- test{ \ifdefstring{\LWR at strresult}{X} }
- }%
- {% allow pars
- \LWR at traceinfo{LWR at tabledatasinglecolumntag: about to LWR at startpars}%
- \global\booltrue{LWR at tableparcell}%
- \LWR at startpars%
- \LWR at traceinfo{LWR at tabledatasinglecolumntag: done with LWR at startpars}%
- }% allow pars
- {}% no pars
- \ifboolexpr{bool{LWR at tabularmutemods} or bool{LWR at emptyatbang}}%
- {}%
- {%
- \LWR at getexparray{LWR at colbeforespec}{\arabic{LWR at tableLaTeXcolindex}}%
- }%
- \global\boolfalse{LWR at intabularmetadata}%
- }% not exiting tabular
-}{}% in tabular metadata
-\LWR at traceinfo{LWR at tabledatasinglecolumntag: done}%
+ \LWR at traceinfo{LWR at tabledatasinglecolumntag}%
+ \LWR at maybenewtablerow%
+ \ifbool{LWR at intabularmetadata}%
+ {%
+ \ifbool{LWR at exitingtabular}{}%
+ {% not exiting tabular
+ \LWR at tabularleftedge%
+ \xdef\LWR at strresult{%
+ \LWR at getexparray{LWR at tablecolspec}{\arabic{LWR at tableLaTeXcolindex}}%
+ }%
+ \LWR at traceinfo{LWR at tabledatasinglecolumntag: about to print td tag}%
+ \LWR at htmltag{%
+ td class="td%
+ \LWR at strresult%
+ \LWR at addcmidruletrim%
+ \LWR at addleftmostbartag%
+ \LWR at printbartag{\arabic{LWR at tableLaTeXcolindex}}%
+ "%
+ \LWR at tdstartstyles%
+ \LWR at addcmidrulewidth%
+ \LWR at addcdashline%
+ \xdef\LWR at thiscolspec{%
+ \LWR at getexparray{LWR at tablecolspec}%
+ {\arabic{LWR at tableLaTeXcolindex}}%
+ }%
+ \LWR at addformatwpalignment{\LWR at thiscolspec}%
+ \LWR at addtabularrowcolor%
+ \LWR at addtabularrulecolors%
+ \LWR at tdendstyles%
+ }% HTML td
+ \LWR at traceinfo{LWR at tabledatasinglecolumntag: done printing td tag}%
+ \ifboolexpr{%
+ test{ \ifdefstring{\LWR at strresult}{p} } or
+ test{ \ifdefstring{\LWR at strresult}{m} } or
+ test{ \ifdefstring{\LWR at strresult}{b} } or
+ test{ \ifdefstring{\LWR at strresult}{P} } or
+ test{ \ifdefstring{\LWR at strresult}{M} } or
+ test{ \ifdefstring{\LWR at strresult}{B} } or
+ test{ \ifdefstring{\LWR at strresult}{X} }
+ }%
+ {% allow pars
+ \LWR at traceinfo{LWR at tabledatasinglecolumntag: about to LWR at startpars}%
+ \booltrue{LWR at tableparcell}%
+ \LWR at startpars%
+ \LWR at traceinfo{LWR at tabledatasinglecolumntag: done with LWR at startpars}%
+ }% allow pars
+ {}% no pars
+ \ifboolexpr{bool{LWR at tabularmutemods} or bool{LWR at emptyatbang}}%
+ {}%
+ {%
+ \LWR at getexparray{LWR at colbeforespec}{\arabic{LWR at tableLaTeXcolindex}}%
+ }%
+ \boolfalse{LWR at intabularmetadata}%
+ }% not exiting tabular
+ }{}% in tabular metadata
+ \LWR at traceinfo{LWR at tabledatasinglecolumntag: done}%
}%
@@ -8254,8 +8409,6 @@
-\newcounter{LWR at midrulecounter}
-
\newlength{\LWR at heavyrulewidth}
\setlength{\LWR at heavyrulewidth}{.08em}
@@ -8270,37 +8423,37 @@
\newcommand*{\LWR at clearmidrules}
{%
-\setcounter{LWR at midrulecounter}{1}%
-\whileboolexpr{%
- not test{%
- \ifnumcomp{\value{LWR at midrulecounter}}{>}%
- {\value{LWR at tabletotalLaTeXcols}}%
+ \defcounter{LWR at midrulecounter}{1}%
+ \whileboolexpr{%
+ not test{%
+ \ifnumcomp{\value{LWR at midrulecounter}}{>}%
+ {\value{LWR at tabletotalLaTeXcols}}%
+ }%
}%
-}%
-{%
- \LWR at setexparray{LWR at midrules}{\arabic{LWR at midrulecounter}}{0pt}%
- \setlength{\LWR at thiscmidrulewidth}{\LWR at cmidrulewidth}%
- \LWR at setexparray{LWR at trimlrules}{\arabic{LWR at midrulecounter}}{}%
- \LWR at setexparray{LWR at trimrrules}{\arabic{LWR at midrulecounter}}{}%
- \LWR at setexparray{LWR at cdashlines}{\arabic{LWR at midrulecounter}}{N}%
- \addtocounter{LWR at midrulecounter}{1}%
-}%
+ {%
+ \LWR at setexparray{LWR at midrules}{\arabic{LWR at midrulecounter}}{0pt}%
+ \setlength{\LWR at thiscmidrulewidth}{\LWR at cmidrulewidth}%
+ \LWR at setexparray{LWR at trimlrules}{\arabic{LWR at midrulecounter}}{}%
+ \LWR at setexparray{LWR at trimrrules}{\arabic{LWR at midrulecounter}}{}%
+ \LWR at setexparray{LWR at cdashlines}{\arabic{LWR at midrulecounter}}{N}%
+ \defaddtocounter{LWR at midrulecounter}{1}%
+ }%
}
\newcommand*{\LWR at subcmidrule}[4]{%
-\setcounter{LWR at midrulecounter}{#3}%
-\whileboolexpr{%
- not test {%
- \ifnumcomp{\value{LWR at midrulecounter}}{>}{#4}%
+ \defcounter{LWR at midrulecounter}{#3}%
+ \whileboolexpr{%
+ not test {%
+ \ifnumcomp{\value{LWR at midrulecounter}}{>}{#4}%
+ }%
}%
-}%
-{%
- \LWR at setexparray{LWR at midrules}{\arabic{LWR at midrulecounter}}{#1}%
- \addtocounter{LWR at midrulecounter}{1}%
-}% whiledo
-\IfSubStr{#2}{l}{\LWR at setexparray{LWR at trimlrules}{#3}{l}}{}%
-\IfSubStr{#2}{r}{\LWR at setexparray{LWR at trimrrules}{#4}{r}}{}%
-\global\booltrue{LWR at doingcmidrule}%
+ {%
+ \LWR at setexparray{LWR at midrules}{\arabic{LWR at midrulecounter}}{#1}%
+ \defaddtocounter{LWR at midrulecounter}{1}%
+ }% whiledo
+ \IfSubStr{#2}{l}{\LWR at setexparray{LWR at trimlrules}{#3}{l}}{}%
+ \IfSubStr{#2}{r}{\LWR at setexparray{LWR at trimrrules}{#4}{r}}{}%
+ \booltrue{LWR at doingcmidrule}%
}
\NewDocumentCommand{\LWR at docmidrule}
@@ -8308,17 +8461,17 @@
{\LWR at subcmidrule{#1}{#2}#3}
\newcommand*{\LWR at subcdashline}[2]{%
-\setcounter{LWR at midrulecounter}{#1}%
-\whileboolexpr{%
- not test {%
- \ifnumcomp{\value{LWR at midrulecounter}}{>}{#2}%
+ \defcounter{LWR at midrulecounter}{#1}%
+ \whileboolexpr{%
+ not test {%
+ \ifnumcomp{\value{LWR at midrulecounter}}{>}{#2}%
+ }%
}%
-}%
-{%
- \LWR at setexparray{LWR at cdashlines}{\arabic{LWR at midrulecounter}}{Y}%
- \addtocounter{LWR at midrulecounter}{1}%
-}% whiledo
-\global\booltrue{LWR at doingcmidrule}%
+ {%
+ \LWR at setexparray{LWR at cdashlines}{\arabic{LWR at midrulecounter}}{Y}%
+ \defaddtocounter{LWR at midrulecounter}{1}%
+ }% whiledo
+ \booltrue{LWR at doingcmidrule}%
}
\NewDocumentCommand{\LWR at docdashline}
@@ -8332,406 +8485,395 @@
\newlength{\LWR at templengththree}
\newcounter{LWR at tempcountone}
-\newbool{LWR at tdhavecellstyle}
+\newcommand*{\LWR at tdstartstyles}{\boolfalse{LWR at tdhavecellstyle}}
-\newcommand*{\LWR at tdstartstyles}{\global\boolfalse{LWR at tdhavecellstyle}}
-
\newcommand*{\LWR at tdaddstyle}{%
-\ifbool{LWR at tdhavecellstyle}%
-{; }%
-{ style="}%
-\booltrue{LWR at tdhavecellstyle}%
+ \ifbool{LWR at tdhavecellstyle}%
+ {; }%
+ { style="}%
+ \booltrue{LWR at tdhavecellstyle}%
}
\newcommand*{\LWR at tdendstyles}{%
-\ifbool{LWR at tdhavecellstyle}{%
- "%
- \global\boolfalse{LWR at tdhavecellstyle}%
-}{}%
+ \ifbool{LWR at tdhavecellstyle}%
+ {%
+ "%
+ \boolfalse{LWR at tdhavecellstyle}%
+ }{}%
}
\newcommand*{\LWR at subaddcmidruletrim}[2]{%
-\setlength{\LWR at templengthone}{%
- \LWR at getexparray{LWR at midrules}{\arabic{LWR at tableLaTeXcolindex}}%
-}%
-\ifdimcomp{\LWR at templengthone}{>}{0pt}%
-{%
- \LWR at origtilde tdrule#1#2%
- \setlength{\LWR at thiscmidrulewidth}{\LWR at templengthone}%
-}%
-{%
- \setlength{\LWR at thiscmidrulewidth}{0pt}%
-}%
+ \setlength{\LWR at templengthone}{%
+ \LWR at getexparray{LWR at midrules}{\arabic{LWR at tableLaTeXcolindex}}%
+ }%
+ \ifdimcomp{\LWR at templengthone}{>}{0pt}%
+ {%
+ \LWR at origtilde tdrule#1#2%
+ \setlength{\LWR at thiscmidrulewidth}{\LWR at templengthone}%
+ }%
+ {%
+ \setlength{\LWR at thiscmidrulewidth}{0pt}%
+ }%
}
\newcommand*{\LWR at addcmidruletrim}{%
-\LWR at subaddcmidruletrim%
-{\LWR at getexparray{LWR at trimlrules}{\arabic{LWR at tableLaTeXcolindex}}}%
-{\LWR at getexparray{LWR at trimrrules}{\arabic{LWR at tableLaTeXcolindex}}}%
+ \LWR at subaddcmidruletrim%
+ {\LWR at getexparray{LWR at trimlrules}{\arabic{LWR at tableLaTeXcolindex}}}%
+ {\LWR at getexparray{LWR at trimrrules}{\arabic{LWR at tableLaTeXcolindex}}}%
}
\newcommand{\LWR at addrulewidth}[2]{%
-\ifboolexpr{%
- test{\ifdimcomp{#1}{=}{0pt}} or
- (
- ( test{\ifdimcomp{#1}{=}{#2}} and not bool{FormatWP} )
- and ( test {\ifdefvoid{\LWR at ruleHTMLcolor}} )
- )
-}%
-{}% default width and color
-{% custom width and/or color
- \LWR at forceminwidth{#1}%
- \LWR at tdaddstyle%
- border-top:\LWR at printlength{\LWR at atleastonept} solid %
- \ifdefvoid{\LWR at ruleHTMLcolor}{%
- \ifdimcomp{#1}{<}{\LWR at lightrulewidth}%
- {\LWR at origpound{}A0A0A0}%
- {% lightrule or heaver
- \ifdimcomp{#1}{<}{\LWR at heavyrulewidth}%
- {\LWR at origpound{}808080}%
- {black}%
- }% lightrule or heavier
- }{%
- \LWR at origpound\LWR at ruleHTMLcolor%
- }
-}% custom width and/or color
+ \ifboolexpr{%
+ test{\ifdimcomp{#1}{=}{0pt}} or
+ (
+ ( test{\ifdimcomp{#1}{=}{#2}} and not bool{FormatWP} )
+ and ( test {\ifdefvoid{\LWR at ruleHTMLcolor}} )
+ )
+ }%
+ {}% default width and color
+ {% custom width and/or color
+ \LWR at forceminwidth{#1}%
+ \LWR at tdaddstyle%
+ border-top:\LWR at printlength{\LWR at atleastonept} solid % space
+ \ifdefvoid{\LWR at ruleHTMLcolor}{%
+ \ifdimcomp{#1}{<}{\LWR at lightrulewidth}%
+ {\LWR at origpound{}A0A0A0}%
+ {% lightrule or heaver
+ \ifdimcomp{#1}{<}{\LWR at heavyrulewidth}%
+ {\LWR at origpound{}808080}%
+ {black}%
+ }% lightrule or heavier
+ }{%
+ \LWR at origpound\LWR at ruleHTMLcolor%
+ }%
+ }% custom width and/or color
}
\newcommand{\LWR at addcmidrulewidth}{%
-\LWR at addrulewidth{\LWR at thiscmidrulewidth}{\LWR at cmidrulewidth}%
+ \LWR at addrulewidth{\LWR at thiscmidrulewidth}{\LWR at cmidrulewidth}%
}
\newcommand{\LWR at addcdashline}{%
-\edef\LWR at tempone{%
- \LWR at getexparray{LWR at cdashlines}{\arabic{LWR at tableLaTeXcolindex}}%
-}%
-\ifdefstring{\LWR at tempone}{Y}{%
- \LWR at tdaddstyle%
- border-top: 1pt dashed %
- \ifdefvoid{\LWR at ruleHTMLcolor}%
- {black}%
- {\LWR at origpound\LWR at ruleHTMLcolor}%
-}{}%
+ \edef\LWR at tempone{%
+ \LWR at getexparray{LWR at cdashlines}{\arabic{LWR at tableLaTeXcolindex}}%
+ }%
+ \ifdefstring{\LWR at tempone}{Y}{%
+ \LWR at tdaddstyle%
+ border-top: 1pt dashed %
+ \ifdefvoid{\LWR at ruleHTMLcolor}%
+ {black}%
+ {\LWR at origpound\LWR at ruleHTMLcolor}%
+ }{}%
}
\newcommand*{\LWR at WPcell}[2]{%
-\LWR at tdaddstyle%
-\LWR at print@mbox{text-align:#1}; \LWR at print@mbox{vertical-align:#2}%
+ \LWR at tdaddstyle%
+ \LWR at print@mbox{text-align:#1}; \LWR at print@mbox{vertical-align:#2}%
}
\newcommand*{\LWR at addformatwpalignment}[1]{%
-\ifbool{FormatWP}{%
-\IfSubStr{#1}{l}{\LWR at WPcell{left}{middle}}{}%
-\IfSubStr{#1}{c}{\LWR at WPcell{center}{middle}}{}%
-\IfSubStr{#1}{r}{\LWR at WPcell{right}{middle}}{}%
-\IfSubStr{#1}{p}{\LWR at WPcell{left}{bottom}}{}%
-\IfSubStr{#1}{m}{\LWR at WPcell{left}{middle}}{}%
-\IfSubStr{#1}{b}{\LWR at WPcell{left}{top}}{}%
-\IfSubStr{#1}{P}{\LWR at WPcell{center}{bottom}}{}%
-\IfSubStr{#1}{M}{\LWR at WPcell{center}{middle}}{}%
-\IfSubStr{#1}{B}{\LWR at WPcell{center}{top}}{}%
-}{}%
+ \ifbool{FormatWP}{%
+ \IfSubStr{#1}{l}{\LWR at WPcell{left}{middle}}{}%
+ \IfSubStr{#1}{c}{\LWR at WPcell{center}{middle}}{}%
+ \IfSubStr{#1}{r}{\LWR at WPcell{right}{middle}}{}%
+ \IfSubStr{#1}{p}{\LWR at WPcell{left}{bottom}}{}%
+ \IfSubStr{#1}{m}{\LWR at WPcell{left}{middle}}{}%
+ \IfSubStr{#1}{b}{\LWR at WPcell{left}{top}}{}%
+ \IfSubStr{#1}{P}{\LWR at WPcell{center}{bottom}}{}%
+ \IfSubStr{#1}{M}{\LWR at WPcell{center}{middle}}{}%
+ \IfSubStr{#1}{B}{\LWR at WPcell{center}{top}}{}%
+ }{}%
}
\newcommand*{\LWR at addtabularrowcolor}{%
-\ifbool{LWR at tabularmutemods}{}{%
- \ifdefvoid{\LWR at rowHTMLcolor}{%
- \ifdefvoid{\LWR at xcolorrowHTMLcolor}{}%
- {% xcolor row color
+ \ifbool{LWR at tabularmutemods}{}{%
+ \ifdefvoid{\LWR at rowHTMLcolor}{%
+ \ifdefvoid{\LWR at xcolorrowHTMLcolor}{}%
+ {% xcolor row color
+ \LWR at tdaddstyle%
+ background:\LWR at origpound\LWR at xcolorrowHTMLcolor%
+ }%
+ }%
+ {% explicit row color
\LWR at tdaddstyle%
- background:\LWR at origpound\LWR at xcolorrowHTMLcolor%
+ background:\LWR at origpound\LWR at rowHTMLcolor%
}%
}%
- {% explicit row color
- \LWR at tdaddstyle%
- background:\LWR at origpound\LWR at rowHTMLcolor%
- }%
-}%
}
\newcommand*{\LWR at addtabularhrulecolor}{%
-\ifboolexpr{%
- test{\ifnumcomp{\value{LWR at hlines}}{>}{0}} or%
- test{\ifnumcomp{\value{LWR at hdashedlines}}{>}{0}} or%
- bool{LWR at doingtbrule}%
-}{%
- \ifdefvoid{\LWR at ruleHTMLcolor}%
- {%
- \ifnumcomp{\value{LWR at hlines}}{>}{1}%
+ \ifboolexpr{%
+ test{\ifnumcomp{\value{LWR at hlines}}{>}{0}} or%
+ test{\ifnumcomp{\value{LWR at hdashedlines}}{>}{0}} or%
+ bool{LWR at doingtbrule}%
+ }{%
+ \ifdefvoid{\LWR at ruleHTMLcolor}%
{%
- \LWR at tdaddstyle%
- border-top: 4px double%
- }{% else
- \ifnumcomp{\value{LWR at hdashedlines}}{>}{1}%
+ \ifnumcomp{\value{LWR at hlines}}{>}{1}%
+ {%
+ \LWR at tdaddstyle%
+ border-top: 4px double%
+ }{% else
+ \ifnumcomp{\value{LWR at hdashedlines}}{>}{1}%
+ {%
+ \LWR at tdaddstyle%
+ border-top: 2px dashed%
+ }{% else
+ \ifnumcomp{\value{LWR at hdashedlines}}{=}{1}%
+ {%
+ \LWR at tdaddstyle%
+ border-top: 1px dashed%
+ }{}}}%
+ }%
{%
- \LWR at tdaddstyle%
- border-top: 2px dashed%
- }{% else
- \ifnumcomp{\value{LWR at hdashedlines}}{=}{1}%
- {%
- \LWR at tdaddstyle%
- border-top: 1px dashed%
- }{}}}%
- }%
- {%
- \ifnumcomp{\value{LWR at hlines}}{>}{1}%
- {%
- \LWR at tdaddstyle%
- border-top: 4px double \LWR at origpound\LWR at ruleHTMLcolor%
- }{% else
- \ifnumcomp{\value{LWR at hdashedlines}}{>}{1}%
- {%
- \LWR at tdaddstyle%
- border-top: 2px dashed \LWR at origpound\LWR at ruleHTMLcolor%
- }{% else
- \ifnumcomp{\value{LWR at hdashedlines}}{=}{1}%
- {%
- \LWR at tdaddstyle%
- border-top: 1px dashed \LWR at origpound\LWR at ruleHTMLcolor%
- }{% else
- \LWR at tdaddstyle%
- border-top: 1px solid \LWR at origpound\LWR at ruleHTMLcolor%
- }}}%
- }%
-}{}%
+ \ifnumcomp{\value{LWR at hlines}}{>}{1}%
+ {%
+ \LWR at tdaddstyle%
+ border-top: 4px double \LWR at origpound\LWR at ruleHTMLcolor%
+ }{% else
+ \ifnumcomp{\value{LWR at hdashedlines}}{>}{1}%
+ {%
+ \LWR at tdaddstyle%
+ border-top: 2px dashed \LWR at origpound\LWR at ruleHTMLcolor%
+ }{% else
+ \ifnumcomp{\value{LWR at hdashedlines}}{=}{1}%
+ {%
+ \LWR at tdaddstyle%
+ border-top: 1px dashed \LWR at origpound\LWR at ruleHTMLcolor%
+ }{% else
+ \LWR at tdaddstyle%
+ border-top: 1px solid \LWR at origpound\LWR at ruleHTMLcolor%
+ }}}%
+ }%
+ }{}%
}
\newcommand*{\LWR at addtabularrulecolors}{%
-\LWR at addtabularhrulecolor%
-\ifbool{LWR at tabularmutemods}{}{%
- \ifnumequal{\value{LWR at tableLaTeXcolindex}}{1}{%
- \edef\LWR at tempone{\LWR at getexparray{LWR at colbarspec}{leftedge}}%
- \ifdefstring{\LWR at tempone}{tvertbarl}{%
+ \LWR at addtabularhrulecolor%
+ \ifbool{LWR at tabularmutemods}{}{%
+ \ifnumequal{\value{LWR at tableLaTeXcolindex}}{1}{%
+ \edef\LWR at tempone{\LWR at getexparray{LWR at colbarspec}{leftedge}}%
+ \ifdefstring{\LWR at tempone}{tvertbarl}{%
+ \LWR at tdaddstyle%
+ border-left: 1px solid % space
+ \LWR at vertruleHTMLcolor%
+ }{}%
+ \ifdefstring{\LWR at tempone}{tvertbarldouble}{%
+ \LWR at tdaddstyle%
+ border-left: 4px double % space
+ \LWR at vertruleHTMLcolor%
+ }{}%
+ \ifdefstring{\LWR at tempone}{tvertbarldash}{%
+ \LWR at tdaddstyle%
+ border-left: 1px dashed % space
+ \LWR at vertruleHTMLcolor%
+ }{}%
+ \ifdefstring{\LWR at tempone}{tvertbarldoubledash}{%
+ \LWR at tdaddstyle%
+ border-left: 2px dashed % space
+ \LWR at vertruleHTMLcolor%
+ }{}%
+ }{}%
+ \edef\LWR at tempone{%
+ \LWR at getexparray{LWR at colbarspec}{\arabic{LWR at tableLaTeXcolindex}}%
+ }%
+ \ifdefstring{\LWR at tempone}{tvertbarr}{%
\LWR at tdaddstyle%
- border-left: 1px solid % space
- \LWR at vertruleHTMLcolor%
+ border-right: 1px solid \LWR at vertruleHTMLcolor%
}{}%
- \ifdefstring{\LWR at tempone}{tvertbarldouble}{%
+ \ifdefstring{\LWR at tempone}{tvertbarrdouble}{%
\LWR at tdaddstyle%
- border-left: 4px double % space
- \LWR at vertruleHTMLcolor%
+ border-right: 4px double \LWR at vertruleHTMLcolor%
}{}%
- \ifdefstring{\LWR at tempone}{tvertbarldash}{%
+ \ifdefstring{\LWR at tempone}{tvertbarrdash}{%
\LWR at tdaddstyle%
- border-left: 1px dashed % space
- \LWR at vertruleHTMLcolor%
+ border-right: 1px dashed \LWR at vertruleHTMLcolor%
}{}%
- \ifdefstring{\LWR at tempone}{tvertbarldoubledash}{%
+ \ifdefstring{\LWR at tempone}{tvertbarrdoubledash}{%
\LWR at tdaddstyle%
- border-left: 2px dashed % space
- \LWR at vertruleHTMLcolor%
+ border-right: 2px dashed \LWR at vertruleHTMLcolor%
}{}%
- }{}%
- \edef\LWR at tempone{%
- \LWR at getexparray{LWR at colbarspec}{\arabic{LWR at tableLaTeXcolindex}}%
}%
- \ifdefstring{\LWR at tempone}{tvertbarr}{%
- \LWR at tdaddstyle%
- border-right: 1px solid \LWR at vertruleHTMLcolor%
- }{}%
- \ifdefstring{\LWR at tempone}{tvertbarrdouble}{%
- \LWR at tdaddstyle%
- border-right: 4px double \LWR at vertruleHTMLcolor%
- }{}%
- \ifdefstring{\LWR at tempone}{tvertbarrdash}{%
- \LWR at tdaddstyle%
- border-right: 1px dashed \LWR at vertruleHTMLcolor%
- }{}%
- \ifdefstring{\LWR at tempone}{tvertbarrdoubledash}{%
- \LWR at tdaddstyle%
- border-right: 2px dashed \LWR at vertruleHTMLcolor%
- }{}%
-}%
}
-\newcounter{LWR at cellcolordepth}
-
\newcommand*{\LWR at subaddtabularcellcolor}[1]{%
-\LWR at htmltag{div class="cellcolor" style="%
- background:\LWR at origpound{}{}#1 %
-" }%
-\addtocounter{LWR at cellcolordepth}{1}%
+ \LWR at htmltag{div class="cellcolor" style="%
+ background:\LWR at origpound{}{}#1 %
+ " }%
+ \defaddtocounter{LWR at cellcolordepth}{1}%
}
\newcommand*{\LWR at addtabularcellcolor}{%
-\ifdefvoid{\LWR at cellHTMLcolor}%
-{%
- \ifdefvoid{\LWR at rowHTMLcolor}%
+ \ifdefvoid{\LWR at cellHTMLcolor}%
{%
- \ifdefvoid{\LWR at xcolorrowHTMLcolor}%
+ \ifdefvoid{\LWR at rowHTMLcolor}%
{%
- \ifdefvoid{\LWR at columnHTMLcolor}%
- {}%
- {\LWR at subaddtabularcellcolor{\LWR at columnHTMLcolor}}%
+ \ifdefvoid{\LWR at xcolorrowHTMLcolor}%
+ {%
+ \ifdefvoid{\LWR at columnHTMLcolor}%
+ {}%
+ {\LWR at subaddtabularcellcolor{\LWR at columnHTMLcolor}}%
+ }%
+ {\LWR at subaddtabularcellcolor{\LWR at xcolorrowHTMLcolor}}%
}%
- {\LWR at subaddtabularcellcolor{\LWR at xcolorrowHTMLcolor}}%
+ {\LWR at subaddtabularcellcolor{\LWR at rowHTMLcolor}}%
}%
- {\LWR at subaddtabularcellcolor{\LWR at rowHTMLcolor}}%
-}%
-{\LWR at subaddtabularcellcolor{\LWR at cellHTMLcolor}}%
+ {\LWR at subaddtabularcellcolor{\LWR at cellHTMLcolor}}%
}
-\newcounter{LWR at tablemulticolswidth}
-\newcounter{LWR at tablemulticolspos}
-
-\newcounter{LWR at mcolvertbarsl}
-\newcounter{LWR at mcolvertbarsr}
-\newcounter{LWR at mcolvertbarsldash}
-\newcounter{LWR at mcolvertbarsrdash}
-\newbool{LWR at mcolvertbaronleft}%
-
\newcommand*{\LWR at printmccoltype}[1]{%
-\LWR at traceinfo{lwr at printmccoltype -#1-}%
-\StrChar{#1}{\arabic{LWR at tablemulticolspos}}[\LWR at strresult]%
-\IfStrEq{\LWR at strresult}{l}{l}{}%
-\IfStrEq{\LWR at strresult}{c}{c}{}%
-\IfStrEq{\LWR at strresult}{r}{r}{}%
-\IfStrEq{\LWR at strresult}{p}{p}{}%
-\IfStrEq{\LWR at strresult}{m}{m}{}%
-\IfStrEq{\LWR at strresult}{b}{b}{}%
-\IfStrEq{\LWR at strresult}{P}{P}{}%
-\IfStrEq{\LWR at strresult}{M}{M}{}%
-\IfStrEq{\LWR at strresult}{B}{B}{}%
-\IfStrEq{\LWR at strresult}{w}{w}{}%
-\IfStrEq{\LWR at strresult}{W}{W}{}%
-\IfStrEq{\LWR at strresult}{S}{c}{}%
-\IfStrEq{\LWR at strresult}{s}{c}{}%
-\IfStrEq{\LWR at strresult}{X}{p}{}%
-\IfStrEq{\LWR at strresult}{|}%
-{%
- \ifbool{LWR at mcolvertbaronleft}%
- {\addtocounter{LWR at mcolvertbarsl}{1}}% left edge
- {\addtocounter{LWR at mcolvertbarsr}{1}}% not left edge
-}%
-{%
- \IfStrEq{\LWR at strresult}{:}%
+ \LWR at traceinfo{lwr at printmccoltype -#1-}%
+ \StrChar{#1}{\arabic{LWR at tablemulticolspos}}[\LWR at strresult]%
+ \IfStrEq{\LWR at strresult}{l}{l}{}%
+ \IfStrEq{\LWR at strresult}{c}{c}{}%
+ \IfStrEq{\LWR at strresult}{r}{r}{}%
+ \IfStrEq{\LWR at strresult}{p}{p}{}%
+ \IfStrEq{\LWR at strresult}{m}{m}{}%
+ \IfStrEq{\LWR at strresult}{b}{b}{}%
+ \IfStrEq{\LWR at strresult}{P}{P}{}%
+ \IfStrEq{\LWR at strresult}{M}{M}{}%
+ \IfStrEq{\LWR at strresult}{B}{B}{}%
+ \IfStrEq{\LWR at strresult}{w}{w}{}%
+ \IfStrEq{\LWR at strresult}{W}{W}{}%
+ \IfStrEq{\LWR at strresult}{S}{c}{}%
+ \IfStrEq{\LWR at strresult}{s}{c}{}%
+ \IfStrEq{\LWR at strresult}{X}{p}{}%
+ \IfStrEq{\LWR at strresult}{|}%
{%
\ifbool{LWR at mcolvertbaronleft}%
- {\addtocounter{LWR at mcolvertbarsldash}{1}}% left edge
- {\addtocounter{LWR at mcolvertbarsrdash}{1}}% not left edge
+ {\defaddtocounter{LWR at mcolvertbarsl}{1}}% left edge
+ {\defaddtocounter{LWR at mcolvertbarsr}{1}}% not left edge
}%
{%
- \IfStrEq{\LWR at strresult}{;}%
+ \IfStrEq{\LWR at strresult}{:}%
{%
\ifbool{LWR at mcolvertbaronleft}%
- {\addtocounter{LWR at mcolvertbarsldash}{1}}% left edge
- {\addtocounter{LWR at mcolvertbarsrdash}{1}}% not left edge
+ {\defaddtocounter{LWR at mcolvertbarsldash}{1}}% left edge
+ {\defaddtocounter{LWR at mcolvertbarsrdash}{1}}% not left edge
}%
- {\boolfalse{LWR at mcolvertbaronleft}}%
+ {%
+ \IfStrEq{\LWR at strresult}{;}%
+ {%
+ \ifbool{LWR at mcolvertbaronleft}%
+ {\defaddtocounter{LWR at mcolvertbarsldash}{1}}% left edge
+ {\defaddtocounter{LWR at mcolvertbarsrdash}{1}}% not left edge
+ }%
+ {\boolfalse{LWR at mcolvertbaronleft}}%
+ }%
}%
-}%
-\LWR at traceinfo{lwr at printmccoltype done}%
+ \LWR at traceinfo{lwr at printmccoltype done}%
}
\newcommand*{\LWR at multicolpartext}[1]{%
-\LWR at startpars%
-\LWR at multicoltext%
-\addtocounter{LWR at tablemulticolspos}{#1}%
-\LWR at stoppars%
+ \LWR at startpars%
+ \LWR at multicoltext%
+ \defaddtocounter{LWR at tablemulticolspos}{#1}%
+ \LWR at stoppars%
}
\newcommand*{\LWR at multicolother}[1]{%
-\addtocounter{LWR at tablemulticolspos}{1}%
-\StrChar{#1}{\arabic{LWR at tablemulticolspos}}[\LWR at strresult]%
-\LWR at strresult%
-\global\booltrue{LWR at validtablecol}%
+ \defaddtocounter{LWR at tablemulticolspos}{1}%
+ \StrChar{#1}{\arabic{LWR at tablemulticolspos}}[\LWR at strresult]%
+ \LWR at strresult%
+ \booltrue{LWR at validtablecol}%
}
\newcommand*{\LWR at multicolskip}{%
-\global\booltrue{LWR at validtablecol}%
+ \booltrue{LWR at validtablecol}%
}
\newcommand*{\LWR at printmccoldata}[1]{%
-\LWR at traceinfo{lwr at printmccoldata -#1}%
-\global\boolfalse{LWR at validtablecol}%
-\StrChar{#1}{\arabic{LWR at tablemulticolspos}}[\LWR at strresult]%
-\IfStrEq{\LWR at strresult}{l}{\LWR at multicoltext}{}%
-\IfStrEq{\LWR at strresult}{c}{\LWR at multicoltext}{}%
-\IfStrEq{\LWR at strresult}{r}{\LWR at multicoltext}{}%
-\IfStrEq{\LWR at strresult}{D}{%
-\addtocounter{LWR at tablemulticolspos}{3}% skip parameters
-\LWR at multicoltext%
-}{}%
-\IfStrEq{\LWR at strresult}{p}{\LWR at multicolpartext{2}}{}%
-\IfStrEq{\LWR at strresult}{m}{\LWR at multicolpartext{2}}{}%
-\IfStrEq{\LWR at strresult}{b}{\LWR at multicolpartext{2}}{}%
-\IfStrEq{\LWR at strresult}{P}{\LWR at multicolpartext{2}}{}%
-\IfStrEq{\LWR at strresult}{M}{\LWR at multicolpartext{2}}{}%
-\IfStrEq{\LWR at strresult}{B}{\LWR at multicolpartext{2}}{}%
-\IfStrEq{\LWR at strresult}{w}{\LWR at multicolpartext{3}}{}%
-\IfStrEq{\LWR at strresult}{W}{\LWR at multicolpartext{3}}{}%
-\IfStrEq{\LWR at strresult}{S}{\LWR at multicoltext}{}%
-\IfStrEq{\LWR at strresult}{s}{\LWR at multicoltext}{}%
-\IfStrEq{\LWR at strresult}{X}{\LWR at multicolpartext{1}}{}%
-\IfStrEq{\LWR at strresult}{|}{\LWR at multicolskip}{}%
-\IfStrEq{\LWR at strresult}{:}{\LWR at multicolskip}{}%
-\IfStrEq{\LWR at strresult}{;}{%
- \LWR at multicolskip%
- \addtocounter{LWR at tablemulticolspos}{1}% skip parameter
-}{}%
-\IfStrEq{\LWR at strresult}{\detokenize{@}}{\LWR at multicolother{#1}}{}%
-\IfStrEq{\LWR at strresult}{\detokenize{!}}{\LWR at multicolother{#1}}{}%
-\IfStrEq{\LWR at strresult}{\detokenize{>}}{\LWR at multicolother{#1}}{}%
-\IfStrEq{\LWR at strresult}{\detokenize{<}}{\LWR at multicolother{#1}}{}%
-\ifbool{LWR at validtablecol}{}{\LWR at multicoltext}%
-\LWR at traceinfo{lwr at printmccoldata done}%
+ \LWR at traceinfo{lwr at printmccoldata -#1}%
+ \boolfalse{LWR at validtablecol}%
+ \StrChar{#1}{\arabic{LWR at tablemulticolspos}}[\LWR at strresult]%
+ \edef\LWR at printmccoldatatoken{\LWR at strresult}%
+ \IfStrEq{\LWR at printmccoldatatoken}{l}{\LWR at multicoltext}{}%
+ \IfStrEq{\LWR at printmccoldatatoken}{c}{\LWR at multicoltext}{}%
+ \IfStrEq{\LWR at printmccoldatatoken}{r}{\LWR at multicoltext}{}%
+ \IfStrEq{\LWR at printmccoldatatoken}{D}{%
+ \defaddtocounter{LWR at tablemulticolspos}{3}% skip parameters
+ \LWR at multicoltext%
+ }{}%
+ \IfStrEq{\LWR at printmccoldatatoken}{p}{\LWR at multicolpartext{2}}{}%
+ \IfStrEq{\LWR at printmccoldatatoken}{m}{\LWR at multicolpartext{2}}{}%
+ \IfStrEq{\LWR at printmccoldatatoken}{b}{\LWR at multicolpartext{2}}{}%
+ \IfStrEq{\LWR at printmccoldatatoken}{P}{\LWR at multicolpartext{2}}{}%
+ \IfStrEq{\LWR at printmccoldatatoken}{M}{\LWR at multicolpartext{2}}{}%
+ \IfStrEq{\LWR at printmccoldatatoken}{B}{\LWR at multicolpartext{2}}{}%
+ \IfStrEq{\LWR at printmccoldatatoken}{w}{\LWR at multicolpartext{3}}{}%
+ \IfStrEq{\LWR at printmccoldatatoken}{W}{\LWR at multicolpartext{3}}{}%
+ \IfStrEq{\LWR at printmccoldatatoken}{S}{\LWR at multicoltext}{}%
+ \IfStrEq{\LWR at printmccoldatatoken}{s}{\LWR at multicoltext}{}%
+ \IfStrEq{\LWR at printmccoldatatoken}{X}{\LWR at multicolpartext{1}}{}%
+ \IfStrEq{\LWR at printmccoldatatoken}{|}{\LWR at multicolskip}{}%
+ \IfStrEq{\LWR at printmccoldatatoken}{:}{\LWR at multicolskip}{}%
+ \IfStrEq{\LWR at printmccoldatatoken}{;}{%
+ \LWR at multicolskip%
+ \defaddtocounter{LWR at tablemulticolspos}{1}% skip parameter
+ }{}%
+ \IfStrEq{\LWR at printmccoldatatoken}{\detokenize{@}}{\LWR at multicolother{#1}}{}%
+ \IfStrEq{\LWR at printmccoldatatoken}{\detokenize{!}}{\LWR at multicolother{#1}}{}%
+ \IfStrEq{\LWR at printmccoldatatoken}{\detokenize{>}}{\LWR at multicolother{#1}}{}%
+ \IfStrEq{\LWR at printmccoldatatoken}{\detokenize{<}}{\LWR at multicolother{#1}}{}%
+ \ifbool{LWR at validtablecol}{}{\LWR at multicoltext{}}%
+ \LWR at traceinfo{lwr at printmccoldata done}%
}
\newcommand*{\LWR at parsemulticolumnalignment}[2]{%
-\setcounter{LWR at tablemulticolspos}{1}%
-\StrLen{#1}[\LWR at strresult]%
-\setcounter{LWR at tablemulticolswidth}{\LWR at strresult}%
-\whileboolexpr{%
- not test {%
- \ifnumcomp{\value{LWR at tablemulticolspos}}{>}%
- {\value{LWR at tablemulticolswidth}}%
+ \defcounter{LWR at tablemulticolspos}{1}%
+ \StrLen{#1}[\LWR at strresult]%
+ \defcounter{LWR at tablemulticolswidth}{\LWR at strresult}%
+ \whileboolexpr{%
+ not test {%
+ \ifnumcomp{\value{LWR at tablemulticolspos}}{>}%
+ {\value{LWR at tablemulticolswidth}}%
+ }%
}%
-}%
-{%
-#2{#1}%
-\addtocounter{LWR at tablemulticolspos}{1}%
-}%
+ {%
+ #2{#1}%
+ \defaddtocounter{LWR at tablemulticolspos}{1}%
+ }%
}
\newcommand*{\LWR at addmulticolvertrulecolor}{%
-\ifbool{LWR at tabularmutemods}{}{%
- \ifnumcomp{\value{LWR at mcolvertbarsl}}{=}{1}{%
- \LWR at tdaddstyle%
- border-left: 1px solid \LWR at vertruleHTMLcolor%
- }{}%
- \ifnumcomp{\value{LWR at mcolvertbarsl}}{>}{1}{%
- \LWR at tdaddstyle%
- border-left: 4px double \LWR at vertruleHTMLcolor%
- }{}%
- \ifnumcomp{\value{LWR at mcolvertbarsldash}}{=}{1}{%
- \LWR at tdaddstyle%
- border-left: 1px dashed \LWR at vertruleHTMLcolor%
- }{}%
- \ifnumcomp{\value{LWR at mcolvertbarsldash}}{>}{1}{%
- \LWR at tdaddstyle%
- border-left: 2px dashed \LWR at vertruleHTMLcolor%
- }{}%
- \ifnumcomp{\value{LWR at mcolvertbarsr}}{=}{1}{%
- \LWR at tdaddstyle%
- border-right: 1px solid \LWR at vertruleHTMLcolor%
- }{}%
- \ifnumcomp{\value{LWR at mcolvertbarsr}}{>}{1}{%
- \LWR at tdaddstyle%
- border-right: 4px double \LWR at vertruleHTMLcolor%
- }{}%
- \ifnumcomp{\value{LWR at mcolvertbarsrdash}}{=}{1}{%
- \LWR at tdaddstyle%
- border-right: 1px dashed \LWR at vertruleHTMLcolor%
- }{}%
- \ifnumcomp{\value{LWR at mcolvertbarsrdash}}{>}{1}{%
- \LWR at tdaddstyle%
- border-right: 2px dashed \LWR at vertruleHTMLcolor%
- }{}%
-}%
+ \ifbool{LWR at tabularmutemods}{}{%
+ \ifnumcomp{\value{LWR at mcolvertbarsl}}{=}{1}{%
+ \LWR at tdaddstyle%
+ border-left: 1px solid \LWR at vertruleHTMLcolor%
+ }{}%
+ \ifnumcomp{\value{LWR at mcolvertbarsl}}{>}{1}{%
+ \LWR at tdaddstyle%
+ border-left: 4px double \LWR at vertruleHTMLcolor%
+ }{}%
+ \ifnumcomp{\value{LWR at mcolvertbarsldash}}{=}{1}{%
+ \LWR at tdaddstyle%
+ border-left: 1px dashed \LWR at vertruleHTMLcolor%
+ }{}%
+ \ifnumcomp{\value{LWR at mcolvertbarsldash}}{>}{1}{%
+ \LWR at tdaddstyle%
+ border-left: 2px dashed \LWR at vertruleHTMLcolor%
+ }{}%
+ \ifnumcomp{\value{LWR at mcolvertbarsr}}{=}{1}{%
+ \LWR at tdaddstyle%
+ border-right: 1px solid \LWR at vertruleHTMLcolor%
+ }{}%
+ \ifnumcomp{\value{LWR at mcolvertbarsr}}{>}{1}{%
+ \LWR at tdaddstyle%
+ border-right: 4px double \LWR at vertruleHTMLcolor%
+ }{}%
+ \ifnumcomp{\value{LWR at mcolvertbarsrdash}}{=}{1}{%
+ \LWR at tdaddstyle%
+ border-right: 1px dashed \LWR at vertruleHTMLcolor%
+ }{}%
+ \ifnumcomp{\value{LWR at mcolvertbarsrdash}}{>}{1}{%
+ \LWR at tdaddstyle%
+ border-right: 2px dashed \LWR at vertruleHTMLcolor%
+ }{}%
+ }%
}
\newcommand{\LWR at multicoltext}{}
@@ -8739,136 +8881,144 @@
\newcounter{LWR at lastmulticolumn}
\NewDocumentCommand{\LWR at domulticolumn}{o o m m m +m}{%
-\LWR at traceinfo{LWR at domulticolumn -#1- -#2- -#4- -#5-}%
-\renewcommand{\LWR at multicoltext}{%
-#6%
-\global\booltrue{LWR at validtablecol}%
-}%
-\setcounter{LWR at lastmulticolumn}{\value{LWR at tableLaTeXcolindex}}%
-\addtocounter{LWR at lastmulticolumn}{#3}%
-\addtocounter{LWR at lastmulticolumn}{-1}%
-\LWR at maybenewtablerow%
-\LWR at htmltag{td colspan="#4" %
-\IfValueT{#2}{ % rows?
-rowspan="#2" %
-\IfValueT{#1}{% vpos?
-\ifstrequal{#1}{b}{style="\LWR at print@mbox{vertical-align:bottom}" }{}%
-\ifstrequal{#1}{t}{style="\LWR at print@mbox{vertical-align:top}" }{}%
-}% vpos?
-}% rows?
- class="td%
-\setcounter{LWR at mcolvertbarsl}{0}%
-\setcounter{LWR at mcolvertbarsr}{0}%
-\setcounter{LWR at mcolvertbarsldash}{0}%
-\setcounter{LWR at mcolvertbarsrdash}{0}%
-\booltrue{LWR at mcolvertbaronleft}%
-\LWR at parsemulticolumnalignment{#5}{\LWR at printmccoltype}%
-\LWR at subaddcmidruletrim%
-{\LWR at getexparray{LWR at trimlrules}{\arabic{LWR at tableLaTeXcolindex}}}%
-{\LWR at getexparray{LWR at trimrrules}{\arabic{LWR at lastmulticolumn}}}%
-\ifnumcomp{\value{LWR at mcolvertbarsl}}{=}{1}{ tvertbarl}{}%
-\ifnumcomp{\value{LWR at mcolvertbarsl}}{>}{1}{ tvertbarldouble}{}%
-\ifnumcomp{\value{LWR at mcolvertbarsr}}{=}{1}{ tvertbarr}{}%
-\ifnumcomp{\value{LWR at mcolvertbarsr}}{>}{1}{ tvertbarrdouble}{}%
-\ifnumcomp{\value{LWR at mcolvertbarsldash}}{=}{1}{ tvertbarldash}{}%
-\ifnumcomp{\value{LWR at mcolvertbarsldash}}{>}{1}{ tvertbarldoubledash}{}%
-\ifnumcomp{\value{LWR at mcolvertbarsrdash}}{=}{1}{ tvertbarrdash}{}%
-\ifnumcomp{\value{LWR at mcolvertbarsrdash}}{>}{1}{ tvertbarrdoubledash}{}%
-"% NOT A TYPO
-\LWR at tdstartstyles%
-\LWR at addtabularrowcolor%
-\LWR at addcmidrulewidth%
-\LWR at addcdashline%
-\LWR at addtabularhrulecolor%
-\LWR at addmulticolvertrulecolor%
-\LWR at addformatwpalignment{#5}%
-\LWR at tdendstyles%
-}% end of the opening table data tag
-\global\boolfalse{LWR at intabularmetadata}%
-\LWR at parsemulticolumnalignment{#5}{\LWR at printmccoldata}%
+ \LWR at traceinfo{LWR at domulticolumn -#1- -#2- -#4- -#5-}%
+ \renewcommand{\LWR at multicoltext}{%
+ #6%
+ \booltrue{LWR at validtablecol}%
+ }%
+ \defcounter{LWR at lastmulticolumn}{\value{LWR at tableLaTeXcolindex}}%
+ \defaddtocounter{LWR at lastmulticolumn}{#3}%
+ \defaddtocounter{LWR at lastmulticolumn}{-1}%
+ \LWR at maybenewtablerow%
+ \LWR at htmltag{%
+ td colspan="#4" %
+ \IfValueT{#2}{ % rows?
+ rowspan="#2" %
+ \IfValueT{#1}{% vpos?
+ \ifstrequal{#1}{b}%
+ {style="\LWR at print@mbox{vertical-align:bottom}" }{}%
+ \ifstrequal{#1}{t}%
+ {style="\LWR at print@mbox{vertical-align:top}" }{}%
+ }% vpos?
+ }% rows?
+ class="td%
+ \defcounter{LWR at mcolvertbarsl}{0}%
+ \defcounter{LWR at mcolvertbarsr}{0}%
+ \defcounter{LWR at mcolvertbarsldash}{0}%
+ \defcounter{LWR at mcolvertbarsrdash}{0}%
+ \booltrue{LWR at mcolvertbaronleft}%
+ \LWR at parsemulticolumnalignment{#5}{\LWR at printmccoltype}%
+ \LWR at subaddcmidruletrim%
+ {%
+ \LWR at getexparray{LWR at trimlrules}%
+ {\arabic{LWR at tableLaTeXcolindex}}%
+ }%
+ {%
+ \LWR at getexparray{LWR at trimrrules}%
+ {\arabic{LWR at lastmulticolumn}}%
+ }%
+ \ifnumcomp{\value{LWR at mcolvertbarsl}}{=}{1}{ tvertbarl}{}%
+ \ifnumcomp{\value{LWR at mcolvertbarsl}}{>}{1}{ tvertbarldouble}{}%
+ \ifnumcomp{\value{LWR at mcolvertbarsr}}{=}{1}{ tvertbarr}{}%
+ \ifnumcomp{\value{LWR at mcolvertbarsr}}{>}{1}{ tvertbarrdouble}{}%
+ \ifnumcomp{\value{LWR at mcolvertbarsldash}}{=}{1}{ tvertbarldash}{}%
+ \ifnumcomp{\value{LWR at mcolvertbarsldash}}{>}{1}%
+ { tvertbarldoubledash}{}%
+ \ifnumcomp{\value{LWR at mcolvertbarsrdash}}{=}{1}{ tvertbarrdash}{}%
+ \ifnumcomp{\value{LWR at mcolvertbarsrdash}}{>}{1}%
+ { tvertbarrdoubledash}{}%
+ "%
+ \LWR at tdstartstyles%
+ \LWR at addtabularrowcolor%
+ \LWR at addcmidrulewidth%
+ \LWR at addcdashline%
+ \LWR at addtabularhrulecolor%
+ \LWR at addmulticolvertrulecolor%
+ \LWR at addformatwpalignment{#5}%
+ \LWR at tdendstyles%
+ }% end of the opening table data tag
+ \boolfalse{LWR at intabularmetadata}%
+ \LWR at parsemulticolumnalignment{#5}{\LWR at printmccoldata}%
}
\NewDocumentCommand{\LWR at htmlmulticolumn}{m m +m}%
{%
-\LWR at tabularhtmlcolumns{\arabic{LWR at tableLaTeXcolindex}}{#1}
-\LWR at domulticolumn{#1}{\arabic{LWR at tabhtmlcoltotal}}{#2}{#3}%
-\addtocounter{LWR at tableLaTeXcolindex}{#1}%
-\addtocounter{LWR at tableLaTeXcolindex}{-1}%
-\global\booltrue{LWR at skipatbang}%
+ \LWR at tabularhtmlcolumns{\arabic{LWR at tableLaTeXcolindex}}{#1}%
+ \LWR at domulticolumn{#1}{\arabic{LWR at tabhtmlcoltotal}}{#2}{#3}%
+ \defaddtocounter{LWR at tableLaTeXcolindex}{#1}%
+ \defaddtocounter{LWR at tableLaTeXcolindex}{-1}%
+ \booltrue{LWR at skipatbang}%
}
-\newbool{LWR at starredlongtable}
-\boolfalse{LWR at starredlongtable}
\providecommand*{\LTcaptype}{table}
\NewDocumentCommand{\LWR at longtabledatacaptiontag}{s o +m}
{%
-\IfValueTF{#2}{% optional given?
- \ifblank{#2}% optional empty?
- {\LWR at setlatestname{#3}}% empty
- {\LWR at setlatestname{#2}}% given and non-empty
-}% optional given
-{\LWR at setlatestname{#3}}% no optional
-\LWR at tabularhtmlcolumns{1}{\arabic{LWR at tabletotalLaTeXcols}}
-\LWR at domulticolumn{\arabic{LWR at tabletotalLaTeXcols}}%
- {\arabic{LWR at tabhtmlcoltotal}}%
- {P}%
-{% \LWR at domulticolumn
-\IfBooleanTF{#1}% star?
-{% yes star
- \LWR at figcaption%
- \LWR at isolate{#3}%
- \endLWR at figcaption%
-}%
-{% No star:
- \ifbool{LWR at starredlongtable}%
- {%
- \ifblank{#2}% TOC entry
- {}%
+ \IfValueTF{#2}{% optional given?
+ \ifblank{#2}% optional empty?
+ {\LWR at setlatestname{#3}}% empty
+ {\LWR at setlatestname{#2}}% given and non-empty
+ }% optional given
+ {\LWR at setlatestname{#3}}% no optional
+ \LWR at tabularhtmlcolumns{1}{\arabic{LWR at tabletotalLaTeXcols}}%
+ \LWR at domulticolumn{\arabic{LWR at tabletotalLaTeXcols}}%
+ {\arabic{LWR at tabhtmlcoltotal}}%
+ {P}%
+ {% \LWR at domulticolumn
+ \IfBooleanTF{#1}% star?
+ {% yes star
+ \LWR at figcaption%
+ \LWR at isolate{#3}%
+ \endLWR at figcaption%
+ }%
+ {% No star:
+ \ifbool{LWR at starredlongtable}%
{%
- \refstepcounter{\LTcaptype}%
- \protected at edef\@currentlabel{%
- \@nameuse{p@\LTcaptype}\@nameuse{the\LTcaptype}%
- }%
- }%
- }{}%
- \LWR at figcaption%
- \LWR at isolate{\@nameuse{fnum@\LTcaptype}}%
- \CaptionSeparator%
- \LWR at isolate{#3}%
- \endLWR at figcaption%
- \ifblank{#2}% TOC entry empty
- {}%
- {% TOC entry not empty
- \IfNoValueTF{#2}% No TOC entry?
- {% No TOC entry
- \addcontentsline%
- {\@nameuse{ext@\LTcaptype}}%
- {\LTcaptype}%
+ \ifblank{#2}% TOC entry
+ {}%
{%
- \protect\numberline%
- {\LWR at isolate{\@nameuse{p@\LTcaptype}}\@nameuse{the\LTcaptype}}%
- {\ignorespaces \LWR at isolate{#3}\protect\relax}%
+ \refstepcounter{\LTcaptype}%
+ \protected at edef\@currentlabel{%
+ \@nameuse{p@\LTcaptype}\@nameuse{the\LTcaptype}%
+ }%
}%
- }% end of No TOC entry
- {% yes TOC entry
- \addcontentsline%
- {\@nameuse{ext@\LTcaptype}}%
- {\LTcaptype}%
- {%
- \protect\numberline%
- {\LWR at isolate{\@nameuse{p@\LTcaptype}}\@nameuse{the\LTcaptype}}%
- {\ignorespaces \LWR at isolate{#2}\protect\relax}%
- }%
- }% end of yes TOC entry
- }% end of TOC entry not empty
-}% end of no star
-\global\booltrue{LWR at skipatbang}%
-}% end of \LWR at domulticolumn
+ }{}%
+ \LWR at figcaption%
+ \LWR at isolate{\@nameuse{fnum@\LTcaptype}}%
+ \CaptionSeparator%
+ \LWR at isolate{#3}%
+ \endLWR at figcaption%
+ \ifblank{#2}% TOC entry empty
+ {}%
+ {% TOC entry not empty
+ \IfNoValueTF{#2}% No TOC entry?
+ {% No TOC entry
+ \addcontentsline%
+ {\@nameuse{ext@\LTcaptype}}%
+ {\LTcaptype}%
+ {%
+ \protect\numberline%
+ {\LWR at isolate{\@nameuse{p@\LTcaptype}}\@nameuse{the\LTcaptype}}%
+ {\ignorespaces \LWR at isolate{#3}\protect\relax}%
+ }%
+ }% end of No TOC entry
+ {% yes TOC entry
+ \addcontentsline%
+ {\@nameuse{ext@\LTcaptype}}%
+ {\LTcaptype}%
+ {%
+ \protect\numberline%
+ {\LWR at isolate{\@nameuse{p@\LTcaptype}}\@nameuse{the\LTcaptype}}%
+ {\ignorespaces \LWR at isolate{#2}\protect\relax}%
+ }%
+ }% end of yes TOC entry
+ }% end of TOC entry not empty
+ }% end of no star
+ \booltrue{LWR at skipatbang}%
+ }% end of \LWR at domulticolumn
+ \defaddtocounter{LWR at tableLaTeXcolindex}{\value{LWR at tabletotalLaTeXcols}}%
+ \defaddtocounter{LWR at tableLaTeXcolindex}{-1}
-\addtocounter{LWR at tableLaTeXcolindex}{\arabic{LWR at tabletotalLaTeXcols}}
-\addtocounter{LWR at tableLaTeXcolindex}{-1}
-
}
@@ -8881,30 +9031,30 @@
\edef\LWR at atbangspec{\LWR at getexparray{LWR at colatspec}{#1}}%
\ifdefempty{\LWR at atbangspec}%
{}%
- {\addtocounter{LWR at tabhtmlcoltotal}{1}}%
+ {\defaddtocounter{LWR at tabhtmlcoltotal}{1}}%
\edef\LWR at atbangspec{\LWR at getexparray{LWR at colbangspec}{#1}}%
\ifdefempty{\LWR at atbangspec}%
{}%
- {\addtocounter{LWR at tabhtmlcoltotal}{1}}%
+ {\defaddtocounter{LWR at tabhtmlcoltotal}{1}}%
}
\newcommand*{\LWR at tabularhtmlcolumns}[2]{%
-\setcounter{LWR at tabhtmlcolindex}{#1}%
-\setcounter{LWR at tabhtmlcoltotal}{#2}%
-\setcounter{LWR at tabhtmlcolend}{#1}%
-\addtocounter{LWR at tabhtmlcolend}{#2}%
-\ifnumcomp{\value{LWR at tabhtmlcolindex}}{=}{1}{%
- \LWR at subtabularhtmlcolumns{leftedge}%
-}{}%
-\whileboolexpr{%
- test {%
- \ifnumcomp{\value{LWR at tabhtmlcolindex}}{<}{\value{LWR at tabhtmlcolend}}%
+ \defcounter{LWR at tabhtmlcolindex}{#1}%
+ \defcounter{LWR at tabhtmlcoltotal}{#2}%
+ \defcounter{LWR at tabhtmlcolend}{#1}%
+ \defaddtocounter{LWR at tabhtmlcolend}{#2}%
+ \ifnumcomp{\value{LWR at tabhtmlcolindex}}{=}{1}{%
+ \LWR at subtabularhtmlcolumns{leftedge}%
+ }{}%
+ \whileboolexpr{%
+ test {%
+ \ifnumcomp{\value{LWR at tabhtmlcolindex}}{<}{\value{LWR at tabhtmlcolend}}%
+ }%
}%
-}%
-{%
- \LWR at subtabularhtmlcolumns{\arabic{LWR at tabhtmlcolindex}}%
- \addtocounter{LWR at tabhtmlcolindex}{1}%
-}% whiledo
+ {%
+ \LWR at subtabularhtmlcolumns{\arabic{LWR at tabhtmlcolindex}}%
+ \defaddtocounter{LWR at tabhtmlcolindex}{1}%
+ }% whiledo
}
\end{warpHTML}
\begin{warpHTML}
@@ -8964,9 +9114,9 @@
\begin{warpHTML}
\newcommand*{\ResumeTabular}{%
-\global\boolfalse{LWR at exitingtabular}%
-\global\boolfalse{LWR at tabularmutemods}%
-\LWR at getmynexttoken%
+ \boolfalse{LWR at exitingtabular}%
+ \boolfalse{LWR at tabularmutemods}%
+ \LWR at getmynexttoken%
}
\end{warpHTML}
@@ -8980,79 +9130,75 @@
\begin{warpHTML}
-\newbool{LWR at exitingtabular}
-
-\newbool{LWR at tabularmutemods}
-
\newcommand*{\LWR at tabledatacolumntag}%
{%
-\LWR at traceinfo{LWR at tabledatacolumntag}%
-\global\let\LWR at mynextaction\LWR at tabledatasinglecolumntag%
-\ifdefequal{\LWR at mynexttoken}{\end}%
- {\global\booltrue{LWR at exitingtabular}}{}%
-\ifdefequal{\LWR at mynexttoken}{\caption}%
- {\global\let\LWR at mynextaction\LWR at donothing}{}%
-\ifdefequal{\LWR at mynexttoken}{\multicolumn}%
- {\global\let\LWR at mynextaction\LWR at donothing}{}%
-\ifdefequal{\LWR at mynexttoken}{\multirow}%
- {\global\let\LWR at mynextaction\LWR at donothing}{}%
-\ifdefequal{\LWR at mynexttoken}{\multicolumnrow}%
- {\global\let\LWR at mynextaction\LWR at donothing}{}%
-\ifdefequal{\LWR at mynexttoken}{\noalign}%
- {\global\let\LWR at mynextaction\LWR at donothing}{}%
-\ifdefequal{\LWR at mynexttoken}{\mrowcell}%
- {\global\let\LWR at mynextaction\LWR at donothing}{}%
-\ifdefequal{\LWR at mynexttoken}{\mcolrowcell}%
- {\global\let\LWR at mynextaction\LWR at donothing}{}%
-\ifdefequal{\LWR at mynexttoken}{\TabularMacro}%
- {\global\let\LWR at mynextaction\LWR at donothing}{}%
-\ifdefequal{\LWR at mynexttoken}{\hline}%
- {\global\let\LWR at mynextaction\LWR at donothing}{}%
-\ifdefequal{\LWR at mynexttoken}{\firsthline}%
- {\global\let\LWR at mynextaction\LWR at donothing}{}%
-\ifdefequal{\LWR at mynexttoken}{\lasthline}%
- {\global\let\LWR at mynextaction\LWR at donothing}{}%
-\ifdefequal{\LWR at mynexttoken}{\toprule}%
- {\global\let\LWR at mynextaction\LWR at donothing}{}%
-\ifdefequal{\LWR at mynexttoken}{\midrule}%
- {\global\let\LWR at mynextaction\LWR at donothing}{}%
-\ifdefequal{\LWR at mynexttoken}{\cmidrule}%
- {\global\let\LWR at mynextaction\LWR at donothing}{}%
-\ifdefequal{\LWR at mynexttoken}{\morecmidrules}%
- {\global\let\LWR at mynextaction\LWR at donothing}{}%
-\ifdefequal{\LWR at mynexttoken}{\specialrule}%
- {\global\let\LWR at mynextaction\LWR at donothing}{}%
-\ifdefequal{\LWR at mynexttoken}{\cline}%
- {\global\let\LWR at mynextaction\LWR at donothing}{}%
-\ifdefequal{\LWR at mynexttoken}{\bottomrule}%
- {\global\let\LWR at mynextaction\LWR at donothing}{}%
-\ifdefequal{\LWR at mynexttoken}{\rowcolor}%
- {\global\let\LWR at mynextaction\LWR at donothing}{}%
-\ifdefequal{\LWR at mynexttoken}{\arrayrulecolor}%
- {\global\let\LWR at mynextaction\LWR at donothing}{}%
-\ifdefequal{\LWR at mynexttoken}{\doublerulesepcolor}%
- {\global\let\LWR at mynextaction\LWR at donothing}{}%
-\ifdefequal{\LWR at mynexttoken}{\warpprintonly}%
- {\global\let\LWR at mynextaction\LWR at donothing}{}%
-\ifdefequal{\LWR at mynexttoken}{\warpHTMLonly}%
- {\global\let\LWR at mynextaction\LWR at donothing}{}%
-\ifdefequal{\LWR at mynexttoken}{\ldelim}%
- {\global\let\LWR at mynextaction\LWR at donothing}{}%
-\ifdefequal{\LWR at mynexttoken}{\rdelim}%
- {\global\let\LWR at mynextaction\LWR at donothing}{}%
-\ifdefequal{\LWR at mynexttoken}{\hdashline}%
- {\global\let\LWR at mynextaction\LWR at donothing}{}%
-\ifdefequal{\LWR at mynexttoken}{\cdashline}%
- {\global\let\LWR at mynextaction\LWR at donothing}{}%
-\ifdefequal{\LWR at mynexttoken}{\firsthdashline}%
- {\global\let\LWR at mynextaction\LWR at donothing}{}%
-\ifdefequal{\LWR at mynexttoken}{\lasthdashline}%
- {\global\let\LWR at mynextaction\LWR at donothing}{}%
-\ifdefequal{\LWR at mynexttoken}{\par}%
- {\global\let\LWR at mynextaction\LWR at donothing}{}%
-\LWR at traceinfo{LWR at tabledatacolumntag: about to do mynext}%
-\LWR at mynextaction%
-\LWR at traceinfo{LWR at tabledatacolumntag: done}%
+ \LWR at traceinfo{LWR at tabledatacolumntag}%
+ \global\let\LWR at mynextaction\LWR at tabledatasinglecolumntag%
+ \ifdefequal{\LWR at mynexttoken}{\end}%
+ {\booltrue{LWR at exitingtabular}}{}%
+ \ifdefequal{\LWR at mynexttoken}{\caption}%
+ {\global\let\LWR at mynextaction\LWR at donothing}{}%
+ \ifdefequal{\LWR at mynexttoken}{\multicolumn}%
+ {\global\let\LWR at mynextaction\LWR at donothing}{}%
+ \ifdefequal{\LWR at mynexttoken}{\multirow}%
+ {\global\let\LWR at mynextaction\LWR at donothing}{}%
+ \ifdefequal{\LWR at mynexttoken}{\multicolumnrow}%
+ {\global\let\LWR at mynextaction\LWR at donothing}{}%
+ \ifdefequal{\LWR at mynexttoken}{\noalign}%
+ {\global\let\LWR at mynextaction\LWR at donothing}{}%
+ \ifdefequal{\LWR at mynexttoken}{\mrowcell}%
+ {\global\let\LWR at mynextaction\LWR at donothing}{}%
+ \ifdefequal{\LWR at mynexttoken}{\mcolrowcell}%
+ {\global\let\LWR at mynextaction\LWR at donothing}{}%
+ \ifdefequal{\LWR at mynexttoken}{\TabularMacro}%
+ {\global\let\LWR at mynextaction\LWR at donothing}{}%
+ \ifdefequal{\LWR at mynexttoken}{\hline}%
+ {\global\let\LWR at mynextaction\LWR at donothing}{}%
+ \ifdefequal{\LWR at mynexttoken}{\firsthline}%
+ {\global\let\LWR at mynextaction\LWR at donothing}{}%
+ \ifdefequal{\LWR at mynexttoken}{\lasthline}%
+ {\global\let\LWR at mynextaction\LWR at donothing}{}%
+ \ifdefequal{\LWR at mynexttoken}{\toprule}%
+ {\global\let\LWR at mynextaction\LWR at donothing}{}%
+ \ifdefequal{\LWR at mynexttoken}{\midrule}%
+ {\global\let\LWR at mynextaction\LWR at donothing}{}%
+ \ifdefequal{\LWR at mynexttoken}{\cmidrule}%
+ {\global\let\LWR at mynextaction\LWR at donothing}{}%
+ \ifdefequal{\LWR at mynexttoken}{\morecmidrules}%
+ {\global\let\LWR at mynextaction\LWR at donothing}{}%
+ \ifdefequal{\LWR at mynexttoken}{\specialrule}%
+ {\global\let\LWR at mynextaction\LWR at donothing}{}%
+ \ifdefequal{\LWR at mynexttoken}{\cline}%
+ {\global\let\LWR at mynextaction\LWR at donothing}{}%
+ \ifdefequal{\LWR at mynexttoken}{\bottomrule}%
+ {\global\let\LWR at mynextaction\LWR at donothing}{}%
+ \ifdefequal{\LWR at mynexttoken}{\rowcolor}%
+ {\global\let\LWR at mynextaction\LWR at donothing}{}%
+ \ifdefequal{\LWR at mynexttoken}{\arrayrulecolor}%
+ {\global\let\LWR at mynextaction\LWR at donothing}{}%
+ \ifdefequal{\LWR at mynexttoken}{\doublerulesepcolor}%
+ {\global\let\LWR at mynextaction\LWR at donothing}{}%
+ \ifdefequal{\LWR at mynexttoken}{\warpprintonly}%
+ {\global\let\LWR at mynextaction\LWR at donothing}{}%
+ \ifdefequal{\LWR at mynexttoken}{\warpHTMLonly}%
+ {\global\let\LWR at mynextaction\LWR at donothing}{}%
+ \ifdefequal{\LWR at mynexttoken}{\ldelim}%
+ {\global\let\LWR at mynextaction\LWR at donothing}{}%
+ \ifdefequal{\LWR at mynexttoken}{\rdelim}%
+ {\global\let\LWR at mynextaction\LWR at donothing}{}%
+ \ifdefequal{\LWR at mynexttoken}{\hdashline}%
+ {\global\let\LWR at mynextaction\LWR at donothing}{}%
+ \ifdefequal{\LWR at mynexttoken}{\cdashline}%
+ {\global\let\LWR at mynextaction\LWR at donothing}{}%
+ \ifdefequal{\LWR at mynexttoken}{\firsthdashline}%
+ {\global\let\LWR at mynextaction\LWR at donothing}{}%
+ \ifdefequal{\LWR at mynexttoken}{\lasthdashline}%
+ {\global\let\LWR at mynextaction\LWR at donothing}{}%
+ \ifdefequal{\LWR at mynexttoken}{\par}%
+ {\global\let\LWR at mynextaction\LWR at donothing}{}%
+ \LWR at traceinfo{LWR at tabledatacolumntag: about to do mynext}%
+ \LWR at mynextaction%
+ \LWR at traceinfo{LWR at tabledatacolumntag: done}%
}
\end{warpHTML}
@@ -9073,51 +9219,46 @@
\begin{warpHTML}
-\LetLtxMacro\toprule\relax
-\LetLtxMacro\midrule\relax
-\LetLtxMacro\cmidrule\cline
-\LetLtxMacro\bottomrule\relax
-\LetLtxMacro\addlinespace\relax
-\LetLtxMacro\morecmidrules\relax
-\LetLtxMacro\specialrule\relax
-
-\newcommand*{\toprule}[1][]{\hline}
-\newcommand*{\midrule}[1][]{\hline}
-\LetLtxMacro\cmidrule\cline
-\newcommand*{\bottomrule}[1][]{\hline}
-\newcommand*{\addlinespace}[1][]{}
-\newcommand*{\morecmidrules}{}
-\newcommand*{\specialrule}[3]{\hline}
+\providecommand*{\toprule}[1][]{\hline}
+\providecommand*{\midrule}[1][]{\hline}
+\providecommand*{\cmidrule}{\cline}
+\providecommand*{\bottomrule}[1][]{\hline}
+\providecommand*{\addlinespace}[1][]{}
+\providecommand*{\morecmidrules}{}
+\providecommand*{\specialrule}[3]{\hline}
\LetLtxMacro\LWR at orignoalign\noalign
\newcommand{\LWR at tabularnoalign}[1]{%
-\begingroup%
-\global\advance\rownum\m at ne%
-\renewcommand*{\LWR at xcolorrowHTMLcolor}{}%
-\multicolumn{\value{LWR at tabletotalLaTeXcols}}{l}{#1} \\
-\endgroup%
-\LWR at getmynexttoken%
+ \advance\rownum\m at ne%
+ \LetLtxMacro\LWR at save@xcolorrowHTMLcolor\LWR at xcolorrowHTMLcolor%
+ \renewcommand*{\LWR at xcolorrowHTMLcolor}{}%
+ \multicolumn{\value{LWR at tabletotalLaTeXcols}}{l}{#1} \\
+ \LetLtxMacro\LWR at xcolorrowHTMLcolor\LWR at save@xcolorrowHTMLcolor%
+ % \@rowc at lors%
+ \LWR at getmynexttoken%
}
\AtBeginDocument{
+
\@ifpackageloaded{lwarp-tabls}
{
-\newcommand*{\LWR at HTMLhline}[1][]{%
- \ifbool{FormatWP}%
- {\LWR at docmidrule{1-\arabic{LWR at tabletotalLaTeXcols}}}%
- {\addtocounter{LWR at hlines}{1}}%
- \LWR at getmynexttoken}%
+ \newcommand*{\LWR at HTMLhline}[1][]{%
+ \ifbool{FormatWP}%
+ {\LWR at docmidrule{1-\arabic{LWR at tabletotalLaTeXcols}}}%
+ {\defaddtocounter{LWR at hlines}{1}}%
+ \LWR at getmynexttoken}%
}
{
-\newcommand*{\LWR at HTMLhline}{%
- \ifbool{FormatWP}%
- {\LWR at docmidrule{1-\arabic{LWR at tabletotalLaTeXcols}}}%
- {\addtocounter{LWR at hlines}{1}}%
- \LWR at getmynexttoken}%
+ \newcommand*{\LWR at HTMLhline}{%
+ \ifbool{FormatWP}%
+ {\LWR at docmidrule{1-\arabic{LWR at tabletotalLaTeXcols}}}%
+ {\defaddtocounter{LWR at hlines}{1}}%
+ \LWR at getmynexttoken}%
}
+
}% AtBeginDocument
\NewDocumentCommand{\LWR at HTMLcline}{m}%
-{\LWR at docmidrule{#1}\LWR at getmynexttoken}%
+ {\LWR at docmidrule{#1}\LWR at getmynexttoken}%
\newcommand{\LWR at tabular@warpprintonly}[1]{%
\ifbool{warpingprint}{#1}{}%
@@ -9142,148 +9283,153 @@
\NewDocumentCommand{\LWR at HTML@@tabular}{d<> o m}
{%
-\LWR at traceinfo{LWR at HTML@@tabular started}%
-\ifnumcomp{\value{LWR at spandepth}}{>}{0}{%
- \PackageWarning{lwarp}{%
- A tabular is being used inside a span such as\MessageBreak
- a minipage. Some formatting may not be correct\MessageBreak
- in the tabular.\MessageBreak
- It is recommended to use \protect\warpprintonly\space or the\MessageBreak
- warpprint environment to isolate the span to\MessageBreak
- print-only,%
- }
-}{}%
-\addtocounter{LWR at tabulardepth}{1}%
-\global\boolfalse{LWR at startedrow}%
-\setcounter{LWR at hlines}{0}%
-\setcounter{LWR at hdashedlines}{0}%
-\global\boolfalse{LWR at doingtbrule}%
-\global\boolfalse{LWR at doingcmidrule}%
-\LWR at nullifyNoAutoSpacing%
-\global\boolfalse{LWR at exitingtabular}%
-\global\boolfalse{LWR at tabularmutemods}%
-\boolfalse{LWR at usedmultirow}
-\boolfalse{LWR at foundmrowcell}
-\global\booltrue{LWR at intabularmetadata}%
-\LWR at traceinfo{LWR@@tabular: About to LWR at forecenewpage.}%
-\LWR at forcenewpage
-\LWR at htmlblocktag{table}%
-\LWR at parsetablecols{#3}%
-\LWR at stoppars%
-\setcounter{LWR at tableLaTeXcolindex}{1}%
-\global\boolfalse{LWR at tabularcelladded}%
-\LWR at clearmidrules%
-\LetLtxMacro{\\}{\LWR at tabularendofline}%
-\LetLtxMacro\warpprintonly\LWR at tabular@warpprintonly%
-\LetLtxMacro\arrayrulecolor\arrayrulecolornexttoken%
-\LetLtxMacro\doublerulesepcolor\doublerulesepcolornexttoken%
-\gdef\LWR at columnHTMLcolor{}%
-\gdef\LWR at rowHTMLcolor{}%
-\gdef\LWR at cellHTMLcolor{}%
-\@rowcolors%
-\ifdefvoid{\LWR at ruleHTMLcolor}%
- {\edef\LWR at vertruleHTMLcolor{black}}%
- {\edef\LWR at vertruleHTMLcolor{\LWR at origpound\LWR at ruleHTMLcolor}}%
-\setcounter{LWR at cellcolordepth}{0}%
-\LWR at traceinfo{LWR@@HTML at tabular: redefining macros}%
-\LetLtxMacro\noalign\LWR at tabularnoalign%
-\LetLtxMacro\hline\LWR at HTMLhline%
-\LetLtxMacro\cline\LWR at HTMLcline%
-\DeclareDocumentCommand{\hdashline}{o}{%
- \ifbool{FormatWP}%
- {\LWR at docdashline{1-\arabic{LWR at tabletotalLaTeXcols}}}%
- {\addtocounter{LWR at hdashedlines}{1}}%
+ \LWR at traceinfo{LWR at HTML@@tabular started}%
+ \ifnumcomp{\value{LWR at spandepth}}{>}{0}{%
+ \PackageWarning{lwarp}{%
+ A tabular is being used inside a span such as\MessageBreak
+ a minipage. Some formatting may not be correct\MessageBreak
+ in the tabular.\MessageBreak
+ It is recommended to use \protect\warpprintonly\space or the\MessageBreak
+ warpprint environment to isolate the span to\MessageBreak
+ print-only,%
+ }
+ }{}%
+ \addtocounter{LWR at tabulardepth}{1}%
+ \boolfalse{LWR at startedrow}%
+ \defcounter{LWR at hlines}{0}%
+ \defcounter{LWR at hdashedlines}{0}%
+ \boolfalse{LWR at doingtbrule}%
+ \boolfalse{LWR at doingcmidrule}%
+ \LWR at nullifyNoAutoSpacing%
+ \boolfalse{LWR at exitingtabular}%
+ \boolfalse{LWR at tabularmutemods}%
+ \boolfalse{LWR at usedmultirow}%
+ \boolfalse{LWR at foundmrowcell}%
+ \renewcommand*{\LWR at multicoltext}{}%
+ \booltrue{LWR at intabularmetadata}%
+ \LWR at traceinfo{LWR@@tabular: About to LWR at forecenewpage.}%
+ \LWR at forcenewpage
+ \LWR at htmlblocktag{table}%
+ \LWR at parsetablecols{#3}%
+ \LWR at stoppars%
+ \defcounter{LWR at tableLaTeXcolindex}{1}%
+ \global\boolfalse{LWR at tabularcelladded}%
+ \LWR at clearmidrules%
+ \LetLtxMacro{\\}{\LWR at tabularendofline}%
+ \LetLtxMacro\warpprintonly\LWR at tabular@warpprintonly%
+ \LetLtxMacro\arrayrulecolor\arrayrulecolornexttoken%
+ \LetLtxMacro\doublerulesepcolor\doublerulesepcolornexttoken%
+ \def\LWR at columnHTMLcolor{}%
+ \def\LWR at rowHTMLcolor{}%
+ \def\LWR at cellHTMLcolor{}%
+ \@rowcolors%
+ \ifdefvoid{\LWR at ruleHTMLcolor}%
+ {\edef\LWR at vertruleHTMLcolor{black}}%
+ {\edef\LWR at vertruleHTMLcolor{\LWR at origpound\LWR at ruleHTMLcolor}}%
+ \defcounter{LWR at cellcolordepth}{0}%
+ \LWR at traceinfo{LWR@@HTML at tabular: redefining macros}%
+ \LetLtxMacro\noalign\LWR at tabularnoalign%
+ \LetLtxMacro\hline\LWR at HTMLhline%
+ \LetLtxMacro\cline\LWR at HTMLcline%
+ \DeclareDocumentCommand{\hdashline}{o}{%
+ \ifbool{FormatWP}%
+ {\LWR at docdashline{1-\arabic{LWR at tabletotalLaTeXcols}}}%
+ {\defaddtocounter{LWR at hdashedlines}{1}}%
+ \LWR at getmynexttoken%
+ }%
+ \DeclareDocumentCommand{\cdashline}{m}{%
+ \LWR at docdashline{##1}\LWR at getmynexttoken%
+ }%
+ \DeclareDocumentCommand{\firsthdashline}{o}{%
+ \ifbool{FormatWP}%
+ {\LWR at docdashline{1-\arabic{LWR at tabletotalLaTeXcols}}}%
+ {\defaddtocounter{LWR at hdashedlines}{1}}%
+ \LWR at getmynexttoken%
+ }%
+ \DeclareDocumentCommand{\lasthdashline}{o}{%
+ \ifbool{FormatWP}%
+ {\LWR at docdashline{1-\arabic{LWR at tabletotalLaTeXcols}}}%
+ {\defaddtocounter{LWR at hdashedlines}{1}}%
+ \LWR at getmynexttoken%
+ }%
+ \renewcommand{\multicolumn}{\LWR at htmlmulticolumn}%
+ \renewcommand*{\mrowcell}{%
+ \LWR at maybenewtablerow%
+ \LWR at tabularleftedge%
+ \booltrue{LWR at skippingmrowcell}%
+ \booltrue{LWR at foundmrowcell}%
+ }%
+ \renewcommand*{\mcolrowcell}{%
+ \LWR at maybenewtablerow%
+ \booltrue{LWR at skippingmcolrowcell}%
+ \booltrue{LWR at foundmrowcell}%
+ }%
+ \LetLtxMacro\caption\LWR at longtabledatacaptiontag%
+ \boolfalse{LWR at tableparcell}%
+ \boolfalse{LWR at skippingmrowcell}%
+ \boolfalse{LWR at skippingmcolrowcell}%
+ \boolfalse{LWR at skipatbang}%
+ \boolfalse{LWR at emptyatbang}%
+ \StartDefiningTabulars%
+ \protected\gdef&{\LWR at tabularampersand}%
+ \booltrue{LWR at forceminipagefullwidth}%
+ \addtocounter{LWR at tabularpardepth}{1}%
+ \LWR at traceinfo{LWR@@HTML at tabular: about to LWR at getmynexttoken}%
\LWR at getmynexttoken%
}%
-\DeclareDocumentCommand{\cdashline}{m}{%
- \LWR at docdashline{##1}\LWR at getmynexttoken%
-}%
-\DeclareDocumentCommand{\firsthdashline}{o}{%
- \ifbool{FormatWP}%
- {\LWR at docdashline{1-\arabic{LWR at tabletotalLaTeXcols}}}%
- {\addtocounter{LWR at hdashedlines}{1}}%
- \LWR at getmynexttoken%
-}%
-\DeclareDocumentCommand{\lasthdashline}{o}{%
- \ifbool{FormatWP}%
- {\LWR at docdashline{1-\arabic{LWR at tabletotalLaTeXcols}}}%
- {\addtocounter{LWR at hdashedlines}{1}}%
- \LWR at getmynexttoken%
-}%
-\renewcommand{\multicolumn}{\LWR at htmlmulticolumn}%
-\renewcommand*{\mrowcell}{%
- \LWR at maybenewtablerow%
- \LWR at tabularleftedge%
- \global\booltrue{LWR at skippingmrowcell}%
- \booltrue{LWR at foundmrowcell}%
-}%
-\renewcommand*{\mcolrowcell}{%
- \LWR at maybenewtablerow%
- \global\booltrue{LWR at skippingmcolrowcell}%
- \booltrue{LWR at foundmrowcell}%
-}%
-\LetLtxMacro\caption\LWR at longtabledatacaptiontag%
-\global\boolfalse{LWR at tableparcell}%
-\global\boolfalse{LWR at skippingmrowcell}%
-\global\boolfalse{LWR at skippingmcolrowcell}%
-\global\boolfalse{LWR at skipatbang}%
-\global\boolfalse{LWR at emptyatbang}%
-\StartDefiningTabulars%
-\protected\gdef&{\LWR at tabularampersand}%
-\booltrue{LWR at forceminipagefullwidth}
-\addtocounter{LWR at tabularpardepth}{1}%
-\LWR at traceinfo{LWR@@HTML at tabular: about to LWR at getmynexttoken}%
-\LWR at getmynexttoken%
-}%
\newcommand*{\LWR at HTML@endtabular}
{%
-\LWR at traceinfo{LWR at HTML@endtabular}%
-\addtocounter{LWR at tabularpardepth}{-1}%
-\ifboolexpr{%
- test {%
- \ifnumcomp{\value{LWR at tableLaTeXcolindex}}{<}{\value{LWR at tabletotalLaTeXcols}}
- } or %
- (%
- bool{LWR at intabularmetadata} and%
- not bool{LWR at tabularcelladded} and%
+ \LWR at traceinfo{LWR at HTML@endtabular}%
+ \addtocounter{LWR at tabularpardepth}{-1}%
+ \ifboolexpr{%
test {%
- \ifnumcomp{\value{LWR at tableLaTeXcolindex}}{=}{\value{LWR at tabletotalLaTeXcols}}%
- }%
- )%
-}%
-{%
- \LWR at tabularfinishrow%
-}%
-{%
- \LWR at closetabledatacell%
-}%
-\LWR at htmlblocktag{/tr}%
-\@rowc at lors%
-\LWR at htmlblocktag{/table}%
-\global\boolfalse{LWR at intabularmetadata}%
-\addtocounter{LWR at tabulardepth}{-1}%
-\protected\gdef&{\LWR at origampmacro}%
-\StopDefiningTabulars%
-\ifbool{LWR at usedmultirow}{%
- \ifbool{LWR at foundmrowcell}%
- {}%
- {%
- \PackageError{lwarp}%
- {%
- When using \protect\multirow, \protect\multicolumnrow,\MessageBreak
- or the bigdelim package,\MessageBreak
- place \protect\mrowcell\space or \protect\mcolrowcell\MessageBreak
- in empty cells which are to be skipped.\MessageBreak
- See the lwarp package documentation:\MessageBreak
- "Special cases and limitations" -> "Tabular"
+ \ifnumcomp{\value{LWR at tableLaTeXcolindex}}{<}%
+ {\value{LWR at tabletotalLaTeXcols}}
+ } or %
+ (%
+ bool{LWR at intabularmetadata} and%
+ not bool{LWR at tabularcelladded} and%
+ test {%
+ \ifnumcomp{\value{LWR at tableLaTeXcolindex}}{=}%
+ {\value{LWR at tabletotalLaTeXcols}}%
}%
+ )%
+ }%
+ {%
+ \LWR at tabularfinishrow%
+ }%
+ {%
+ \LWR at closetabledatacell%
+ }%
+ \LWR at htmlblocktag{/tr}%
+ \@rowc at lors%
+ \LWR at htmlblocktag{/table}%
+ \boolfalse{LWR at intabularmetadata}%
+ \addtocounter{LWR at tabulardepth}{-1}%
+ \ifnumequal{\value{LWR at tabulardepth}}{0}{%
+ \protected\gdef&{\LWR at origampmacro}%
+ \StopDefiningTabulars%
+ }{}%
+ \ifbool{LWR at usedmultirow}{%
+ \ifbool{LWR at foundmrowcell}%
+ {}%
{%
- See the lwarp package documentation:\MessageBreak
- "Special cases and limitations" -> "Tabular".
+ \PackageError{lwarp}%
+ {%
+ When using \protect\multirow, \protect\multicolumnrow,\MessageBreak
+ or the bigdelim package,\MessageBreak
+ place \protect\mrowcell\space or \protect\mcolrowcell\MessageBreak
+ in empty cells which are to be skipped.\MessageBreak
+ See the Lwarp package documentation:\MessageBreak
+ "Special cases and limitations" -> "Tabular"
+ }%
+ {%
+ See the Lwarp package documentation:\MessageBreak
+ "Special cases and limitations" -> "Tabular".
+ }%
}%
- }%
-}{}%
-\LWR at traceinfo{LWR at HTML@endtabular finished}%
+ }{}%
+ \LWR at traceinfo{LWR at HTML@endtabular finished}%
}
\csletcs{LWR at HTML@endtabular*}{LWR at HTML@endtabular}
@@ -9306,12 +9452,12 @@
\providecommand*{\@currentlabelname}{}
\def\LWR at stripperiod#1.\ltx at empty#2\@nil{#1}%
\newcommand*{\LWR at setlatestname}[1]{%
-\GetTitleStringExpand{#1}%
-\edef\@currentlabelname{\detokenize\expandafter{\GetTitleStringResult}}%
-\edef\@currentlabelname{%
- \expandafter\LWR at stripperiod\@currentlabelname%
- \ltx at empty.\ltx at empty\@nil%
-}%
+ \GetTitleStringExpand{#1}%
+ \edef\@currentlabelname{\detokenize\expandafter{\GetTitleStringResult}}%
+ \edef\@currentlabelname{%
+ \expandafter\LWR at stripperiod\@currentlabelname%
+ \ltx at empty.\ltx at empty\@nil%
+ }%
}
\def\LWR at setref#1#2#3{%
@@ -9333,53 +9479,70 @@
\expandafter\LWR at setref\csname r@#1 at lwarp\endcsname\LWR at fourthoffour{#1}%
}
\newcommand*{\LWR at lwarplabel}[1]{%
-\LWR at traceinfo{LWR at lwarplabel !#1!}%
-\LWR at setlatestname{\@currentlabelname}%
- \@bsphack%
- \protected at write\@auxout{}%
- {\string\newlabel{#1 at lwarp}{%
- {\@currentlabelname}%
- {\ifbool{FileSectionNames}{\LWR at thisfilename}{\arabic{LWR at htmlfilenumber}}}%
- {\arabic{LWR at lateximagedepth}}%
- {\arabic{LWR at lateximagenumber}}%
- }}%
- \@esphack%
+ \LWR at traceinfo{LWR at lwarplabel !#1!}%
+ \LWR at setlatestname{\@currentlabelname}%
+ \@bsphack%
+ \protected at write\@auxout{}%
+ {%
+ \string\newlabel{#1 at lwarp}{%
+ {\@currentlabelname}%
+ {%
+ \ifbool{FileSectionNames}%
+ {\LWR at thisfilename}%
+ {\arabic{LWR at htmlfilenumber}}%
+ }%
+ {\arabic{LWR at lateximagedepth}}%
+ {\arabic{LWR at lateximagenumber}}%
+ }%
+ }%
+ \@esphack%
}
\newcommand*{\LWR at sublabel}[1]{%
-\LWR at traceinfo{LWR at sublabel !#1!}%
-\ifnumcomp{\value{LWR at lateximagedepth}}{>}{0}%
-{}%
-{% not lateximage
- \LWR at sanitize{#1}%
- \ifbool{LWR at doingstartpars}%
- {% pars allowed
- \ifbool{LWR at doingapar}%
- {% par started
- \LWR at htmltag{a \LWR at print@mbox{id="\LWR at sanitized"}}\LWR at htmltag{/a}%
- }% par started
- {% par not started
- \LWR at stoppars%
- \LWR at htmltag{a \LWR at print@mbox{id="\LWR at sanitized"}}\LWR at htmltag{/a}%
- \LWR at startpars%
- }% par not started
- }% pars allowed
- {% pars not allowed
- \LWR at htmltag{a \LWR at print@mbox{id="\LWR at sanitized"}}\LWR at htmltag{/a}%
- }% pars not allowed
-}% not lateximage
+ \LWR at traceinfo{LWR at sublabel !#1!}%
+ \ifnumcomp{\value{LWR at lateximagedepth}}{>}{0}%
+ {}%
+ {% not lateximage
+ \LWR at sanitize{#1}%
+ \ifbool{LWR at doingstartpars}%
+ {% pars allowed
+ \ifbool{LWR at doingapar}%
+ {% par started
+ \LWR at htmltag{a \LWR at print@mbox{id="\LWR at sanitized"}}%
+ \LWR at htmltag{/a}%
+ }% par started
+ {% par not started
+ \LWR at stoppars%
+ \LWR at htmltag{a \LWR at print@mbox{id="\LWR at sanitized"}}%
+ \LWR at htmltag{/a}%
+ \LWR at startpars%
+ }% par not started
+ }% pars allowed
+ {% pars not allowed
+ \LWR at htmltag{a \LWR at print@mbox{id="\LWR at sanitized"}}%
+ \LWR at htmltag{/a}%
+ }% pars not allowed
+ }% not lateximage
}
\NewDocumentCommand{\LWR at new@label}{d() m o}{%
-\LWR at traceinfo{LWR at new@label: starting}%
-\LWR at traceinfo{LWR at new@label: !#2!}%
-\LWR at orig@label{#2}%
-\LWR at traceinfo{LWR at new@label: filesectionnames is \ifbool{FileSectionNames}{true}{false}}%
-\LWR at traceinfo{LWR at new@label: LWR at thisfilename is !\LWR at thisfilename!}%
-\LWR at traceinfo{LWR at new@label: LWR at htmlfilenumber is \arabic{LWR at htmlfilenumber}}%
-\LWR at lwarplabel{#2}%
-\LWR at sublabel{#2}%
-\LWR at traceinfo{LWR at new@label: done}%
+ \LWR at traceinfo{LWR at new@label: starting}%
+ \LWR at traceinfo{LWR at new@label: !#2!}%
+ \LWR at orig@label{#2}%
+ \LWR at traceinfo{%
+ LWR at new@label: filesectionnames is %
+ \ifbool{FileSectionNames}{true}{false}%
+ }%
+ \LWR at traceinfo{%
+ LWR at new@label: LWR at thisfilename is !\LWR at thisfilename!%
+ }%
+ \LWR at traceinfo{%
+ LWR at new@label: LWR at htmlfilenumber is \arabic{LWR at htmlfilenumber}%
+ }%
+ \LWR at lwarplabel{#2}%
+ \LWR at sublabel{#2}%
+ % \@esphack%
+ \LWR at traceinfo{LWR at new@label: done}%
}
@@ -9392,48 +9555,48 @@
\newcommand*{\LWR at startref}[1]
{%
-\LWR at sanitize{#1}%
-\LWR at traceinfo{LWR at startref A: !#1!}%
-\LWR at htmltag{a href="%
-\LWR at traceinfo{LWR at startref B}%
-\LWR at print@mbox{\LWR at htmlrefsectionfilename{#1}}%
-\LWR at traceinfo{LWR at startref C}%
-\LWR at origpound%
-\LWR at traceinfo{LWR at startref D: !#1!}%
-\ifcsundef{r@#1 at lwarp}%
-{%
- \LWR at traceinfo{LWR at startref D0: ??}%
- ??%
-}%
-{%
- \ifthenelse{\cnttest{\LWR at lateximagedepthref{#1}}{>}{0}}%
- {%
- \LWR at ImagesName\LWR at lateximagenumberref{#1}%
- }%
- {%
- \LWR at traceinfo{LWR at startref D3}%
- \LWR at print@mbox{\LWR at sanitized}%
- }%
-}%
-\LWR at traceinfo{LWR at startref E}%
-"%
-\LWR at addlinktitle%
-}%
-\LWR at traceinfo{LWR at startref F}%
+ \LWR at sanitize{#1}%
+ \LWR at traceinfo{LWR at startref A: !#1!}%
+ \LWR at htmltag{a href="%
+ \LWR at traceinfo{LWR at startref B}%
+ \LWR at print@mbox{\LWR at htmlrefsectionfilename{#1}}%
+ \LWR at traceinfo{LWR at startref C}%
+ \LWR at origpound%
+ \LWR at traceinfo{LWR at startref D: !#1!}%
+ \ifcsundef{r@#1 at lwarp}%
+ {%
+ \LWR at traceinfo{LWR at startref D0: ??}%
+ ??%
+ }%
+ {%
+ \ifthenelse{\cnttest{\LWR at lateximagedepthref{#1}}{>}{0}}%
+ {%
+ \LWR at ImagesName\LWR at lateximagenumberref{#1}%
+ }%
+ {%
+ \LWR at traceinfo{LWR at startref D3}%
+ \LWR at print@mbox{\LWR at sanitized}%
+ }%
+ }%
+ \LWR at traceinfo{LWR at startref E}%
+ "%
+ \LWR at addlinktitle%
+ }%
+ \LWR at traceinfo{LWR at startref F}%
}
\NewDocumentCommand{\LWR at subnewref}{m m}{%
-\LWR at traceinfo{LWR at subnewref #1 #2}%
-\LWR at startref{#1}%
-\LWR at print@ref{#2}%
-\LWR at htmltag{/a}%
+ \LWR at traceinfo{LWR at subnewref #1 #2}%
+ \LWR at startref{#1}%
+ \LWR at print@ref{#2}%
+ \LWR at htmltag{/a}%
}
\NewDocumentCommand{\LWR at HTML@ref}{s m}{%
-\LWR at traceinfo{LWR at HTML@ref !#2!}%
-\IfBooleanTF{#1}%
-{\LWR at print@ref{#2}}%
-{\LWR at subnewref{#2}{#2}}%
+ \LWR at traceinfo{LWR at HTML@ref !#2!}%
+ \IfBooleanTF{#1}%
+ {\LWR at print@ref{#2}}%
+ {\LWR at subnewref{#2}{#2}}%
}
\LWR at formatted{ref}
@@ -9443,19 +9606,19 @@
\newcommand*{\pagerefPageFor}{see }
\NewDocumentCommand{\LWR at new@pageref}{s m}{%
-\IfBooleanTF{#1}%
-{(\pagerefPageFor\LWR at print@ref{#2})}%
-{(\cpageref{#2})}%
+ \IfBooleanTF{#1}%
+ {(\pagerefPageFor\LWR at print@ref{#2})}%
+ {(\cpageref{#2})}%
}
\newrobustcmd*{\nameref}[1]{%
-\LWR at traceinfo{nameref}%
-\LWR at startref{#1}%
-\LWR at traceinfo{nameref B}%
-\LWR at nameref{#1}%
-\LWR at traceinfo{nameref C}%
-\LWR at htmltag{/a}%
-\LWR at traceinfo{nameref: done}%
+ \LWR at traceinfo{nameref}%
+ \LWR at startref{#1}%
+ \LWR at traceinfo{nameref B}%
+ \LWR at nameref{#1}%
+ \LWR at traceinfo{nameref C}%
+ \LWR at htmltag{/a}%
+ \LWR at traceinfo{nameref: done}%
}
\LetLtxMacro\Nameref\nameref
@@ -9464,9 +9627,11 @@
\AtBeginDocument{
+
\def\@currentHref{%
-autopage-\theLWR at currentautosec%
+ autopage-\theLWR at currentautosec%
}
+
}
\newcommand*{\LWR at linkcatcodes}{%
@@ -9585,53 +9750,57 @@
\begin{warpHTML}
\NewDocumentCommand{\LWR at floatbegin}{m o}{%
-\ifbool{FormatWP}{\newline}{}%
-\LWR at stoppars
-\addtocounter{LWR at thisautoid}{1}%
-\booltrue{LWR at freezethisautoid}%
-\begingroup%
-\LWR at print@raggedright%
-\LWR at htmltag{%
- figure id="\LWR at print@mbox{autoid-\arabic{LWR at thisautoid}}" % space
- class="#1 \@nameuse{LWR at floatstyle@#1}"%
-}%
-\ifbool{FormatWP}{%
- \LWR at orignewline%
- \LWR at BlockClassWP{}{}{wp#1}%
-}{}%
-\renewcommand*{\@captype}{#1}%
-\caption at settype{#1}%
-\LWR at startpars%
-\ifboolexpr{bool{FormatWP} and bool{WPMarkFloats}}{%
+ \ifbool{FormatWP}{\newline}{}%
+ \LWR at stoppars%
+ \addtocounter{LWR at thisautoid}{1}%
+ \booltrue{LWR at freezethisautoid}%
+ \begingroup%
+ \LWR at print@raggedright%
+ \LWR at htmltag{%
+ figure id="\LWR at print@mbox{autoid-\arabic{LWR at thisautoid}}" % space
+ class="#1 \@nameuse{LWR at floatstyle@#1}"%
+ }%
+ \ifbool{FormatWP}{%
+ \LWR at orignewline%
+ \LWR at BlockClassWP{}{}{wp#1}%
+ }{}%
+ \renewcommand*{\@captype}{#1}%
+ \caption at settype{#1}%
+ \LWR at startpars%
+ \ifboolexpr{bool{FormatWP} and bool{WPMarkFloats}}{%
-=== begin #1 ===
+ === begin #1 ===
-}{}%
-\LWR at futurenonspacelet\LWR at mynexttoken\LWR at floatalignment%
+ }{}%
+ \LWR at futurenonspacelet\LWR at mynexttoken\LWR at floatalignment%
}
\AtBeginDocument{
+
\@ifpackageloaded{tocbasic}{
+
\appto\figure at atbegin{%
-\LWR at futurenonspacelet\LWR at mynexttoken\LWR at floatalignment%
+ \LWR at futurenonspacelet\LWR at mynexttoken\LWR at floatalignment%
}
-}{}
-}
+
+}{}% tocbasic
+
+}% AtBeginDocument
\let\@float\LWR at floatbegin
\let\@dblfloat\LWR at floatbegin
\newcommand*{\LWR at floatend}{%
-\LWR at endfloatalignment%
-\ifboolexpr{bool{FormatWP} and bool{WPMarkFloats}}{%
+ \LWR at endfloatalignment%
+ \ifboolexpr{bool{FormatWP} and bool{WPMarkFloats}}{%
-=== end ===
+ === end ===
-}{}%
-\LWR at stoppars%
-\ifbool{FormatWP}{\endLWR at BlockClassWP}{}%
-\LWR at htmlelementend{figure}%
-\endgroup%
-\boolfalse{LWR at freezethisautoid}%
-\LWR at startpars%
-\ifbool{FormatWP}{\newline}{}%
+ }{}%
+ \LWR at stoppars%
+ \ifbool{FormatWP}{\endLWR at BlockClassWP}{}%
+ \LWR at htmlelementend{figure}%
+ \endgroup%
+ \boolfalse{LWR at freezethisautoid}%
+ \LWR at startpars%
+ \ifbool{FormatWP}{\newline}{}%
}
\let\end at float\LWR at floatend
\let\end at dblfloat\LWR at floatend
@@ -9643,16 +9812,16 @@
\newbool{LWR at freezethisautoid}
\boolfalse{LWR at freezethisautoid}
+\newcommand*{\LWR at forcenewautoidanchor}{%
+ \addtocounter{LWR at thisautoid}{1}%
+ \LWR at htmltag{a id="\LWR at print@mbox{autoid-\arabic{LWR at thisautoid}}"}%
+ \LWR at htmltag{/a}%
+}
+
\newcommand*{\LWR at newautoidanchor}{%
-\ifnumcomp{\value{LWR at lateximagedepth}}{>}{0}%
-{}%
-{%
- \ifbool{LWR at freezethisautoid}{}{%
- \addtocounter{LWR at thisautoid}{1}%
- \LWR at htmltag{a id="\LWR at print@mbox{autoid-\arabic{LWR at thisautoid}}"}%
- \LWR at htmltag{/a}%
- }%
-}%
+ \ifnumcomp{\value{LWR at lateximagedepth}}{>}{0}%
+ {}%
+ {\ifbool{LWR at freezethisautoid}{}{\LWR at forcenewautoidanchor}}%
}
\newcommand*{\@captype}{}
@@ -9660,23 +9829,25 @@
\newcommand*{\LWR at floatalignmentname}{}
\newcommand*{\LWR at floatalignment}{%
-\ifdefstrequal{\LWR at mynexttoken}{\centering}{%
- \center%
- \renewcommand*{\LWR at floatalignmentname}{center}%
-}{}%
-\ifdefstrequal{\LWR at mynexttoken}{\raggedright}{%
- \flushleft%
- \renewcommand*{\LWR at floatalignmentname}{flushleft}%
-}{}%
-\ifdefstrequal{\LWR at mynexttoken}{\raggedleft}{%
- \flushright%
- \renewcommand*{\LWR at floatalignmentname}{flushright}%
-}{}%
+ \ifdefstrequal{\LWR at mynexttoken}{\centering}{%
+ \center%
+ \renewcommand*{\LWR at floatalignmentname}{center}%
+ }{}%
+ \ifdefstrequal{\LWR at mynexttoken}{\raggedright}{%
+ \flushleft%
+ \renewcommand*{\LWR at floatalignmentname}{flushleft}%
+ }{}%
+ \ifdefstrequal{\LWR at mynexttoken}{\raggedleft}{%
+ \flushright%
+ \renewcommand*{\LWR at floatalignmentname}{flushright}%
+ }{}%
}
\newcommand*{\LWR at endfloatalignment}{%
-\ifdefvoid{\LWR at floatalignmentname}{}{\@nameuse{end\LWR at floatalignmentname}}%
-\renewcommand*{\LWR at floatalignmentname}{}%
+ \ifdefvoid{\LWR at floatalignmentname}%
+ {}%
+ {\@nameuse{end\LWR at floatalignmentname}}%
+ \renewcommand*{\LWR at floatalignmentname}{}%
}
@@ -9701,33 +9872,34 @@
\setcounter{LWR at latestautopage}{1}
\newenvironment*{LWR at figcaption}
- {
+ {%
\ifbool{FormatWP}{%
- \BlockClass[font-style:italic]{figurecaption}
- }{
- \BlockClass{figurecaption}
+ \BlockClass[font-style:italic]{figurecaption}%
+ }{%
+ \BlockClass{figurecaption}%
}%
- }
+ }%
{\endBlockClass}
\newcommand*{\LWR at HTML@caption at begin}[1]
{%
-\LWR at traceinfo{LWR at HTML@caption at begin}%
-\begingroup%
-\RenewDocumentEnvironment{minipage}{O{t} o O{t} m}{}{}%
-\RenewDocumentCommand{\parbox}{O{t} O{} O{t} m +m}{##5}%
-\LWR at figcaption%
-\LWR at traceinfo{LWR at HTML@caption at begin: about to LWR at origcaption@begin}%
-\LWR at print@caption at begin{#1}%
-\LWR at traceinfo{LWR at HTML@caption at begin: done}%
+ \LWR at traceinfo{LWR at HTML@caption at begin}%
+ \begingroup%
+ \RenewDocumentEnvironment{minipage}{O{t} o O{t} m}{}{}%
+ \RenewDocumentCommand{\parbox}{O{t} O{} O{t} m +m}{##5}%
+ \LWR at figcaption%
+ \LWR at traceinfo{LWR at HTML@caption at begin: about to LWR at origcaption@begin}%
+ \LWR at print@caption at begin{#1}%
+ \LWR at traceinfo{LWR at HTML@caption at begin: done}%
}
\newcommand*{\LWR at HTML@caption at end}
{%
-\LWR at traceinfo{LWR at HTML@caption at end}%
-\LWR at print@caption at end%
-\endLWR at figcaption%
-\endgroup%
-\LWR at traceinfo{LWR at HTML@caption at end: done}%
+ \LWR at traceinfo{LWR at HTML@caption at end}%
+ \LWR at print@caption at end%
+ \endLWR at figcaption%
+ \endgroup%
+ % \leavevmode% avoid bad space factor (0) error
+ \LWR at traceinfo{LWR at HTML@caption at end: done}%
}
\AtBeginDocument{
@@ -9738,44 +9910,48 @@
\let\LWR at origcaptionlistentry\captionlistentry
\renewcommand*{\captionlistentry}{%
-\LWR at ensuredoingapar%
-\LWR at origcaptionlistentry%
+ \LWR at ensuredoingapar%
+ \LWR at origcaptionlistentry%
}
+\def\LWR at LTcaptionlistentry{%
+ \LWR at ensuredoingapar%
+ \LWR at forcenewautoidanchor%
+ \bgroup
+ \@ifstar{\egroup\LWR at LT@captionlistentry}% gobble *
+ {\egroup\LWR at LT@captionlistentry}%
+}%
-\def\LWR at LTcaptionlistentry{%
-\LWR at ensuredoingapar%
-\LWR at htmltag{a id="\LWR at print@mbox{autoid-\arabic{LWR at thisautoid}}"}\LWR at htmltag{/a}%
- \bgroup
- \@ifstar{\egroup\LWR at LT@captionlistentry}% gobble *
- {\egroup\LWR at LT@captionlistentry}}%
\def\LWR at LT@captionlistentry#1{%
- \caption at listentry\@firstoftwo[\LTcaptype]{#1}}%
+ \caption at listentry\@firstoftwo[\LTcaptype]{#1}%
+}%
\let\LWR at origaddcontentsline\addcontentsline
\renewcommand*{\addcontentsline}[3]{%
-\ifstrequal{#1}{toc}{}{% not TOC
-\ifnumcomp{\value{LWR at lateximagedepth}}{>}{0}%
- {}%
- {\LWR at newautoidanchor}%
- \ifcsvoid{ext@#2}{\csdef{ext@#2}{#1}}{}%
- \addtocontents{\@nameuse{ext@#2}}{%
- \protect\LWRsetnextfloat%
- {\arabic{LWR at latestautopage}}%
- {\arabic{LWR at thisautoid}}%
- }%
-}% not TOC
-\LWR at origaddcontentsline{#1}{#2}{#3}%
+ \ifstrequal{#1}{toc}{}{% not TOC
+ \ifnumcomp{\value{LWR at lateximagedepth}}{>}{0}%
+ {}%
+ {\LWR at newautoidanchor}%
+ \ifcsvoid{ext@#2}{\csdef{ext@#2}{#1}}{}%
+ \addtocontents{\@nameuse{ext@#2}}{%
+ \protect\LWRsetnextfloat%
+ {\arabic{LWR at latestautopage}}%
+ {\arabic{LWR at thisautoid}}%
+ }%
+ }% not TOC
+ \LWR at origaddcontentsline{#1}{#2}{#3}%
}
\AtBeginDocument{
+
\let\LWR at origcaptionof\captionof
\renewcommand*{\captionof}{%
-\LWR at stoppars%
-\LWR at origcaptionof%
+ \LWR at stoppars%
+ \LWR at origcaptionof%
}
-}
+}% AtBeginDocument
+
\end{warpHTML}
@@ -9783,96 +9959,98 @@
\newcommand*{\LWR at myshorttoc}[1]{%
-\LWR at traceinfo{LWR at myshorttoc: #1}%
-\LWR at ensuredoingapar%
-\IfFileExists{\jobname.#1}{%
-\LWR at traceinfo{LWR at myshorttoc: loading}%
-\begingroup%
-\makeatletter%
-\@input{\jobname.#1}%
-\endgroup%
-}%
-{}%
-\LWR at traceinfo{LWR at myshorttoc: done}%
+ \LWR at traceinfo{LWR at myshorttoc: #1}%
+ \LWR at ensuredoingapar%
+ \IfFileExists{\jobname.#1}{%
+ \LWR at traceinfo{LWR at myshorttoc: loading}%
+ \begingroup%
+ \makeatletter%
+ \@input{\jobname.#1}%
+ \endgroup%
+ }%
+ {}%
+ \LWR at traceinfo{LWR at myshorttoc: done}%
}
\NewDocumentCommand{\LWR at subtableofcontents}{m m}{%
-\@ifundefined{chapter}
-{\LWR at closeprevious{section}}
-{\LWR at closeprevious{chapter}}
-\LWR at printpendingfootnotes
-\@ifundefined{chapter}{\section*{#2}}{\chapter*{#2}}
-\LWR at htmlelementclass{nav}{#1}
-\LWR at myshorttoc{#1}
-\LWR at htmlelementclassend{nav}{#1}
+ \@ifundefined{chapter}%
+ {\LWR at closeprevious{section}}%
+ {\LWR at closeprevious{chapter}}%
+ \LWR at printpendingfootnotes%
+ \@ifundefined{chapter}{\section*{#2}}{\chapter*{#2}}%
+ \LWR at htmlelementclass{nav}{#1}%
+ \LWR at myshorttoc{#1}%
+ \LWR at htmlelementclassend{nav}{#1}%
}
\let\LWR at orig@starttoc\@starttoc
\renewcommand{\@starttoc}[1]{
-\LWR at htmlelementclass{nav}{#1}
-\LWR at orig@starttoc{#1}
-\LWR at htmlelementclassend{nav}{#1}
+ \LWR at htmlelementclass{nav}{#1}%
+ \LWR at orig@starttoc{#1}%
+ \LWR at htmlelementclassend{nav}{#1}%
}
\newbool{LWR at copiedsidetoc}
\boolfalse{LWR at copiedsidetoc}
\AtBeginDocument{
+
\let\LWR at origtableofcontents\tableofcontents
\renewcommand*{\tableofcontents}{%
-\ifboolexpr{bool{FormatWP} and bool{WPMarkTOC}}{
+ \ifboolexpr{bool{FormatWP} and bool{WPMarkTOC}}{
-=== table of contents ===
+ === table of contents ===
-}
-{
- \ifbool{LWR at copiedsidetoc}{}{%
- \LWR at copyfile{\jobname.toc}{\jobname.sidetoc}%
- \booltrue{LWR at copiedsidetoc}%
- }%
- \LWR at printpendingfootnotes
- \LWR at origtableofcontents
-}
+ }
+ {
+ \ifbool{LWR at copiedsidetoc}{}{%
+ \LWR at copyfile{\jobname.toc}{\jobname.sidetoc}%
+ \booltrue{LWR at copiedsidetoc}%
+ }%
+ \LWR at printpendingfootnotes
+ \LWR at origtableofcontents
+ }
}% \tableofcontents
+
}% AtBeginDocument
\let\LWR at origlistoffigures\listoffigures
\renewcommand*{\listoffigures}{
-\ifboolexpr{bool{FormatWP} and bool{WPMarkLOFT}}{
+ \ifboolexpr{bool{FormatWP} and bool{WPMarkLOFT}}{
-=== list of figures ===
+ === list of figures ===
+ }
+ {
+ \LWR at printpendingfootnotes
+ \LWR at origlistoffigures
+ }
}
-{
- \LWR at printpendingfootnotes
- \LWR at origlistoffigures
-}
-}
\let\LWR at origlistoftables\listoftables
\renewcommand*{\listoftables}{
-\ifboolexpr{bool{FormatWP} and bool{WPMarkLOFT}}{
+ \ifboolexpr{bool{FormatWP} and bool{WPMarkLOFT}}{
-=== list of tables ===
+ === list of tables ===
+ }
+ {
+ \LWR at printpendingfootnotes
+ \LWR at origlistoftables
+ }
}
-{
- \LWR at printpendingfootnotes
- \LWR at origlistoftables
-}
-}
\NewDocumentCommand{\listof}{m +m}{%
-\@ifundefined{l@#1}{%
- \csdef{l@#1}##1##2{\hypertocfloat{1}{#1}{\@nameuse{ext@#1}}{##1}{##2}}%
-}{}%
-\LWR at subtableofcontents{\@nameuse{ext@#1}}{#2}
-\expandafter\newwrite\csname tf@\csname ext@#1\endcsname\endcsname
-\immediate\openout \csname tf@\csname ext@#1\endcsname\endcsname
- \jobname.\@nameuse{ext@#1}\relax
+ \@ifundefined{l@#1}{%
+ \csdef{l@#1}##1##2{\hypertocfloat{1}{#1}{\@nameuse{ext@#1}}{##1}{##2}}%
+ }{}%
+ \LWR at subtableofcontents{\@nameuse{ext@#1}}{#2}%
+ \expandafter\newwrite\csname tf@\csname ext@#1\endcsname\endcsname%
+ \immediate\openout \csname tf@\csname ext@#1\endcsname\endcsname%
+ \jobname.\@nameuse{ext@#1}\relax%
}
@@ -9900,31 +10078,31 @@
\begin{warpHTML}
-\newcommand*{\LWR at sidetoc}{
-\LWR at forcenewpage
-\LWR at stoppars
+\newcommand*{\LWR at sidetoc}{%
+ \LWR at forcenewpage
+ \LWR at stoppars
-\LWR at htmlelementclass{div}{sidetoccontainer}
-\LWR at htmlelementclass{nav}{sidetoc}
+ \LWR at htmlelementclass{div}{sidetoccontainer}
+ \LWR at htmlelementclass{nav}{sidetoc}
-\setcounter{tocdepth}{\value{SideTOCDepth}}
+ \setcounter{tocdepth}{\value{SideTOCDepth}}
-\begin{BlockClass}{sidetoctitle}
-\ifcsvoid{thetitle}{}{\InlineClass{sidetocthetitle}{\thetitle}\par}
-\sidetocname
-\end{BlockClass}
-\begin{BlockClass}{sidetoccontents}
-\LinkHome
+ \begin{BlockClass}{sidetoctitle}
+ \ifcsvoid{thetitle}{}{\InlineClass{sidetocthetitle}{\thetitle}\par}
+ \sidetocname
+ \end{BlockClass}
+ \begin{BlockClass}{sidetoccontents}
+ \LinkHome
-\LWR at myshorttoc{sidetoc}
-\end{BlockClass}
-\LWR at htmlelementclassend{nav}{sidetoc}
-\LWR at htmlelementclassend{div}{sidetoccontainer}
+ \LWR at myshorttoc{sidetoc}
+ \end{BlockClass}
+ \LWR at htmlelementclassend{nav}{sidetoc}
+ \LWR at htmlelementclassend{div}{sidetoccontainer}
}
\newcommand*{\LWR at numberline}[1]{%
-\LWR at sectionnumber{#1}\quad%
+ \LWR at sectionnumber{#1}\quad%
}
\LetLtxMacro\numberline\LWR at numberline
@@ -9932,51 +10110,51 @@
\newcommand*{\LWR at maybetocdata}{}
\NewDocumentCommand{\hypertoc}{m m +m m}{%
-\LWR at traceinfo{hypertoc !#1!#2!#3!#4!}%
-\ifthenelse{\cnttest{#1}{<=}{\value{tocdepth}}}%
- {%
- \LWR at startpars%
- \LWR at subhyperrefclass{%
- \LWR at htmlrefsectionfilename{\BaseJobname-autopage-#4}%
- \LWR at origpound\LWR at print@mbox{autosec-#4}%
- }{#3}{toc#2}%
- \LWR at maybetocdata%
- \LWR at stoppars%
- }%
- {}%
-\LWR at traceinfo{hypertoc done}%
+ \LWR at traceinfo{hypertoc !#1!#2!#3!#4!}%
+ \ifthenelse{\cnttest{#1}{<=}{\value{tocdepth}}}%
+ {%
+ \LWR at startpars%
+ \LWR at subhyperrefclass{%
+ \LWR at htmlrefsectionfilename{\BaseJobname-autopage-#4}%
+ \LWR at origpound\LWR at print@mbox{autosec-#4}%
+ }{#3}{toc#2}%
+ \LWR at maybetocdata%
+ \LWR at stoppars%
+ }%
+ {}%
+ \LWR at traceinfo{hypertoc done}%
}
\@ifclassloaded{memoir}{}{
-\newcounter{lofdepth}
-\setcounter{lofdepth}{1}
+ \newcounter{lofdepth}
+ \setcounter{lofdepth}{1}
}
\@ifclassloaded{memoir}{}{
-\newcounter{lotdepth}
-\setcounter{lotdepth}{1}
+ \newcounter{lotdepth}
+ \setcounter{lotdepth}{1}
}
\newcommand{\hypertocfloat}[5]{%
-\LWR at startpars
-\@ifundefined{c@#3depth}{%
-\newcounter{#3depth}%
-\setcounter{#3depth}{1}%
-}{}%
-\LWR at traceinfo{hypertocfloat depth is #1 #3depth is \arabic{#3depth}}%
-\ifthenelse{\cnttest{#1}{<=}{\arabic{#3depth}}}%
- {%
- \LWR at startpars%
- \LWR at subhyperrefclass{%
- \LWR at htmlrefsectionfilename{%
- \BaseJobname-autopage-\arabic{LWR at nextautopage}%
+ \LWR at startpars%
+ \@ifundefined{c@#3depth}{%
+ \newcounter{#3depth}%
+ \setcounter{#3depth}{1}%
+ }{}%
+ \LWR at traceinfo{hypertocfloat depth is #1 #3depth is \arabic{#3depth}}%
+ \ifthenelse{\cnttest{#1}{<=}{\arabic{#3depth}}}%
+ {%
+ \LWR at startpars%
+ \LWR at subhyperrefclass{%
+ \LWR at htmlrefsectionfilename{%
+ \BaseJobname-autopage-\arabic{LWR at nextautopage}%
+ }%
+ \LWR at origpound\LWR at print@mbox{autoid-\arabic{LWR at nextautoid}}}%
+ {#4}{toc#2}%
+ \LWR at maybetocdata%
+ \LWR at stoppars%
}%
- \LWR at origpound\LWR at print@mbox{autoid-\arabic{LWR at nextautoid}}}%
- {#4}{toc#2}%
- \LWR at maybetocdata%
- \LWR at stoppars%
- }%
- {}%
+ {}%
}
\DeclareDocumentCommand{\l at book}{m m}{\hypertoc{-2}{book}{#1}{#2}}
@@ -10018,10 +10196,11 @@
\setcounter{LWR at autoglossary}{0}
\@ifundefined{chapter}
-{\newcommand*{\LWR at indexsection}[1]{\section*{#1}}}
-{\newcommand*{\LWR at indexsection}[1]{\chapter*{#1}}}
+ {\newcommand*{\LWR at indexsection}[1]{\section*{#1}}}
+ {\newcommand*{\LWR at indexsection}[1]{\chapter*{#1}}}
\AtBeginDocument{
+
\renewenvironment*{theindex}{%
\LWR at indexsection{\indexname}%
\let\item\LWR at indexitem%
@@ -10028,30 +10207,32 @@
\let\subitem\LWR at indexsubitem%
\let\subsubitem\LWR at indexsubsubitem%
}{}
+
}% AtBeginDocument
\newcommand{\LWR at indexitem}[1][\@empty]{
-\InlineClass{indexitem}{\LWR at htmlcomment{}}#1%
+ \InlineClass{indexitem}{\LWR at htmlcomment{}}#1%
}
\newcommand{\LWR at indexsubitem}{
-\InlineClass{indexsubitem}{\LWR at htmlcomment{}}
+ \InlineClass{indexsubitem}{\LWR at htmlcomment{}}%
}
\newcommand{\LWR at indexsubsubitem}{
-\InlineClass{indexsubsubitem}{\LWR at htmlcomment{}}
+ \InlineClass{indexsubsubitem}{\LWR at htmlcomment{}}%
}
\def\LWR at wrindex#1{%
-\addtocounter{LWR at autoindex}{1}%
-\LWR at new@label{LWRindex-\arabic{LWR at autoindex}}%
-\protected at write\@indexfile{}%
-{\string\indexentry{#1}{\arabic{LWR at autoindex}}}%
-\endgroup
-\@esphack}
+ \addtocounter{LWR at autoindex}{1}%
+ \LWR at new@label{LWRindex-\arabic{LWR at autoindex}}%
+ \protected at write\@indexfile{}%
+ {\string\indexentry{#1}{\arabic{LWR at autoindex}}}%
+ \endgroup%
+ \@esphack%
+}
\AtBeginDocument{
\let\@wrindex\LWR at wrindex
@@ -10058,50 +10239,51 @@
}
\def\@wrglossary#1{%
-\addtocounter{LWR at autoglossary}{1}%
-\LWR at new@label{LWRglossary-\theLWR at autoglossary}%
-\protected at write\@glossaryfile{}%
-{\string\glossaryentry{#1}{\theLWR at autoglossary}}%
-\endgroup
-\@esphack}
+ \addtocounter{LWR at autoglossary}{1}%
+ \LWR at new@label{LWRglossary-\theLWR at autoglossary}%
+ \protected at write\@glossaryfile{}%
+ {\string\glossaryentry{#1}{\theLWR at autoglossary}}%
+ \endgroup%
+ \@esphack%
+}
\newcommand*{\LWR at indexnameref}[1]{\nameref{LWRindex-#1}}
\newrobustcmd{\LWR at doindexentry}[1]{%
-\IfInteger{#1}%
- {\LWR at indexnameref{#1}}%
- {#1}%
+ \IfInteger{#1}%
+ {\LWR at indexnameref{#1}}%
+ {#1}%
}
\newcommand{\LWR at hyperindexrefnullified}{%
-\renewrobustcmd{\emph}[1]{\LWR at HTML@emph{\LWR at doindexentry{##1}}}%
-\renewrobustcmd{\textbf}[1]{\LWR at HTML@textbf{\LWR at doindexentry{##1}}}%
-\renewrobustcmd{\texteb}[1]{\LWR at HTML@texteb{\LWR at doindexentry{##1}}}%
-\renewrobustcmd{\textlg}[1]{\LWR at HTML@textlg{\LWR at doindexentry{##1}}}%
-\renewrobustcmd{\textrm}[1]{\LWR at HTML@textrm{\LWR at doindexentry{##1}}}%
-\renewrobustcmd{\textsf}[1]{\LWR at HTML@textsf{\LWR at doindexentry{##1}}}%
-\renewrobustcmd{\texttt}[1]{\LWR at HTML@texttt{\LWR at doindexentry{##1}}}%
-\renewrobustcmd{\textup}[1]{\LWR at HTML@textup{\LWR at doindexentry{##1}}}%
-\renewrobustcmd{\textsc}[1]{\LWR at HTML@textsc{\LWR at doindexentry{##1}}}%
-\renewrobustcmd{\textulc}[1]{\LWR at HTML@textulc{\LWR at doindexentry{##1}}}%
-\renewrobustcmd{\textsi}[1]{\LWR at HTML@textsi{\LWR at doindexentry{##1}}}%
-\renewrobustcmd{\textit}[1]{\LWR at HTML@textit{\LWR at doindexentry{##1}}}%
-\renewrobustcmd{\textsl}[1]{\LWR at HTML@textsl{\LWR at doindexentry{##1}}}%
+ \renewrobustcmd{\emph}[1]{\LWR at HTML@emph{\LWR at doindexentry{##1}}}%
+ \renewrobustcmd{\textbf}[1]{\LWR at HTML@textbf{\LWR at doindexentry{##1}}}%
+ \renewrobustcmd{\texteb}[1]{\LWR at HTML@texteb{\LWR at doindexentry{##1}}}%
+ \renewrobustcmd{\textlg}[1]{\LWR at HTML@textlg{\LWR at doindexentry{##1}}}%
+ \renewrobustcmd{\textrm}[1]{\LWR at HTML@textrm{\LWR at doindexentry{##1}}}%
+ \renewrobustcmd{\textsf}[1]{\LWR at HTML@textsf{\LWR at doindexentry{##1}}}%
+ \renewrobustcmd{\texttt}[1]{\LWR at HTML@texttt{\LWR at doindexentry{##1}}}%
+ \renewrobustcmd{\textup}[1]{\LWR at HTML@textup{\LWR at doindexentry{##1}}}%
+ \renewrobustcmd{\textsc}[1]{\LWR at HTML@textsc{\LWR at doindexentry{##1}}}%
+ \renewrobustcmd{\textulc}[1]{\LWR at HTML@textulc{\LWR at doindexentry{##1}}}%
+ \renewrobustcmd{\textsi}[1]{\LWR at HTML@textsi{\LWR at doindexentry{##1}}}%
+ \renewrobustcmd{\textit}[1]{\LWR at HTML@textit{\LWR at doindexentry{##1}}}%
+ \renewrobustcmd{\textsl}[1]{\LWR at HTML@textsl{\LWR at doindexentry{##1}}}%
}
\newcommand{\hyperindexref}[1]{%
-\def\LWR at tempone{#1}%
-\IfBeginWith{\LWR at tempone}{ }{%
- \StrGobbleLeft{\LWR at tempone}{1}[\LWR at tempone]%
-}{}%
-\IfInteger{\LWR at tempone}%
- {\LWR at indexnameref{\LWR at tempone}}%
- {%
- \begingroup%
- \LWR at hyperindexrefnullified
- #1%
- \endgroup%
- }%
+ \def\LWR at tempone{#1}%
+ \IfBeginWith{\LWR at tempone}{ }{%
+ \StrGobbleLeft{\LWR at tempone}{1}[\LWR at tempone]%
+ }{}%
+ \IfInteger{\LWR at tempone}%
+ {\LWR at indexnameref{\LWR at tempone}}%
+ {%
+ \begingroup%
+ \LWR at hyperindexrefnullified%
+ #1%
+ \endgroup%
+ }%
}
\end{warpHTML}
@@ -10124,7 +10306,9 @@
}
\renewcommand{\@biblabel}[1]{[#1]\quad}
\AtBeginDocument{
+
\AtBeginEnvironment{thebibliography}{
+
\providecommand*{\LWR at newem}[1]{\textit{#1}}
\renewrobustcmd{\em}{%
@@ -10139,7 +10323,9 @@
\endgroup
\LWR at em@after\egroup
}
+
}% \AtBeginEnvironment{thebibliography}
+
}% \AtBeginDocument
\end{warpHTML}
@@ -10148,49 +10334,48 @@
\begin{warpHTML}
\newcommand*{\LWR at restoreorigformatting}{%
-\LWR at traceinfo{LWR at restoreorigformatting}%
-\renewcommand*{\LWR at formatting}{print}%
-\linespread{1}%
-\let\par\LWR at origpar%
-\LWR at select@print at hspace%
-\LetLtxMacro\hfil\LWR at orighfil%
-\let\hss\LWR at orighss%
-\let\llap\LWR at origllap%
-\let\rlap\LWR at origrlap%
-\let\hfilneg\LWR at orighfilneg%
-\let\,\LWR at origcomma% disable HTML short unbreakable space
-\let\thinspace\LWR at origthinspace% disable HTML short unbreakable space
-\let\negthinspace\LWR at orignegthinspace% disable HTML negative short unbreakable space
-\let\textellipsis\LWR at origtextellipsis%
-\let\textless\LWR at origtextless%
-\let\textgreater\LWR at origtextgreater%
-\let\&\LWR at origampersand%
-\LetLtxMacro\em\LWR at origem%
-\LetLtxMacro\normalfont\LWR at orignormalfont%
-\let\sp\LWR at origsp%
-\let\sb\LWR at origsb%
-\LetLtxMacro\textsuperscript\LWR at origtextsuperscript%
-\LetLtxMacro\@textsuperscript\LWR at orig@textsuperscript%
-\LetLtxMacro\textsubscript\LWR at origtextsubscript%
-\LetLtxMacro\@textsubscript\LWR at orig@textsubscript%
-\LetLtxMacro\underline\LWR at origunderline%
-\let~\LWR at origtilde%
-\let\enskip\LWR at origenskip%
-\let\quad\LWR at origquad%
-\let\qquad\LWR at origqquad%
-\LetLtxMacro\endtabular\LWR at origendtabular%
-\csletcs{endtabular*}{LWR at origendtabular*}%
-\LetLtxMacro\noalign\LWR at orignoalign%
-\LetLtxMacro\hline\LWR at orighline%
-\let\newline\LWR at orignewline%
-\LetLtxMacro\includegraphics\LWR at origincludegraphics%
-\LetLtxMacro\@ensuredmath\LWR at origensuredmath%
-\LWR at restoreorigaccents%
-\LWR at restoreoriglists%
-\LWR at FBcancel%
+ \LWR at traceinfo{LWR at restoreorigformatting}%
+ \renewcommand*{\LWR at formatting}{print}%
+ \linespread{1}%
+ \let\par\LWR at origpar%
+ \LWR at select@print at hspace%
+ \LetLtxMacro\hfil\LWR at orighfil%
+ \let\hss\LWR at orighss%
+ \let\llap\LWR at origllap%
+ \let\rlap\LWR at origrlap%
+ \let\hfilneg\LWR at orighfilneg%
+ \let\,\LWR at origcomma% disable HTML short unbreakable space
+ \let\thinspace\LWR at origthinspace% disable HTML short unbreakable space
+ \let\negthinspace\LWR at orignegthinspace% disable HTML negative short unbreakable space
+ \let\textellipsis\LWR at origtextellipsis%
+ \let\textless\LWR at origtextless%
+ \let\textgreater\LWR at origtextgreater%
+ \let\&\LWR at origampersand%
+ \LetLtxMacro\em\LWR at origem%
+ \LetLtxMacro\normalfont\LWR at orignormalfont%
+ \let\sp\LWR at origsp%
+ \let\sb\LWR at origsb%
+ \LetLtxMacro\textsuperscript\LWR at origtextsuperscript%
+ \LetLtxMacro\@textsuperscript\LWR at orig@textsuperscript%
+ \LetLtxMacro\textsubscript\LWR at origtextsubscript%
+ \LetLtxMacro\@textsubscript\LWR at orig@textsubscript%
+ \LetLtxMacro\underline\LWR at origunderline%
+ \let~\LWR at origtilde%
+ \let\enskip\LWR at origenskip%
+ \let\quad\LWR at origquad%
+ \let\qquad\LWR at origqquad%
+ \LetLtxMacro\endtabular\LWR at origendtabular%
+ \csletcs{endtabular*}{LWR at origendtabular*}%
+ \LetLtxMacro\noalign\LWR at orignoalign%
+ \LetLtxMacro\hline\LWR at orighline%
+ \let\newline\LWR at orignewline%
+ \LetLtxMacro\includegraphics\LWR at origincludegraphics%
+ \LetLtxMacro\@ensuredmath\LWR at origensuredmath%
+ \LWR at restoreorigaccents%
+ \LWR at restoreoriglists%
+ \LWR at FBcancel%
}
\end{warpHTML}
-
\begin{warpall}
\newcommand*{\AltTextOpen}{(}
@@ -10239,9 +10424,9 @@
\let\LWR at origtextdollar\$
\renewcommand*{\$}{%
-\ifnumcomp{\value{LWR at lateximagedepth}}{>}{0}%
-{\LWR at origtextdollar}%
-{\HTMLunicode{00024}}%
+ \ifnumcomp{\value{LWR at lateximagedepth}}{>}{0}%
+ {\LWR at origtextdollar}%
+ {\HTMLunicode{00024}}%
}
\AtBeginDocument{
@@ -10285,40 +10470,9 @@
}% AtBeginDocument
-\newlength{\LWR at singledollarwidth}
-\newlength{\LWR at singledollarheight}
-\newlength{\LWR at singledollardepth}
+\newbool{LWR at unknownmathsize}
-\newsavebox{\LWR at singledollarbox}
-
-\NewDocumentCommand{\LWR at subsingledollar}{s m m m}{%
-\LWR at traceinfo{LWR at subsingledollar}%
-\ifnumcomp{\value{LWR at lateximagedepth}}{>}{0}%
-{%
-\LWR at traceinfo{LWR at subsingledollar: already in a lateximage}%
- #4% contents
-}%
-{% not in a lateximage
-\begingroup%
-\LWR at applyxfakebold%
-\ifboolexpr{%
- (
- bool{mathjax} or
- ( bool{FormatWP} and bool{WPMarkMath} )
- ) and
- ( not test {
- \ifstrequal {#2}
- {\AltTextOpen\MathImageAltText\AltTextClose} % from \ensuredmath
- }
- ) and
- ( not bool{LWR at dynamicmath} )
-}%
-{%
- \LWR at traceinfo{LWR at subsingledollar: Mathjax}%
- {\textbackslash(\LWR at HTMLsanitize{#4}\textbackslash)}%
-}% mathjax
-{% not mathjax
-\LWR at traceinfo{LWR at subsingledollar: NOT mathjax, or is ensuremath, or is dynamic}%
+\newcommand*{\LWR at singledollarmeasure}[1]{%
\begingroup%
\LWR at restoreorigformatting%
\RenewDocumentEnvironment{lateximage}{s o s o o}{}{}% inside group
@@ -10325,17 +10479,19 @@
\LWR at print@normalsize%
\LWR at setcurrentfont%
\global\advance\c at LWR@lateximagedepth 1\relax%
+ \boolfalse{LWR at unknownmathsize}%
\ifmmode%
- \global\sbox{\LWR at singledollarbox}{#4}%
+ \global\sbox{\LWR at singledollarbox}{#1}%
\else%
\ifbool{LWR at dynamicmath}{%
\ifbool{mathjax}{%
- \global\sbox{\LWR at singledollarbox}{\LWR at origensuredmath{#4}}%
+ \global\sbox{\LWR at singledollarbox}%
+ {\LWR at origensuredmath{#1}}%
}{%
- \global\sbox{\LWR at singledollarbox}{#4}%
+ \global\sbox{\LWR at singledollarbox}{#1}%
}%
}{%
- \global\sbox{\LWR at singledollarbox}{#4}%
+ \global\sbox{\LWR at singledollarbox}{#1}%
}%
\fi%
\global\sbox{\LWR at singledollarbox}{%
@@ -10361,6 +10517,10 @@
}%
\global\LWR at singledollarheight=\LWR at singledollarheight%
\endgroup%
+}
+
+\newcommand*{\LWR at subsingledollarsvg}[4]{%
+ \LWR at singledollarmeasure{#4}%
\ifdimgreater{\LWR at singledollarwidth}{.7\LWR at singledollarheight}{%
\def\LWR at singledollarstyle{%
width:\LWR at convertto{em}{\the\LWR at singledollarwidth} em%
@@ -10394,6 +10554,10 @@
}{%
\def\LWR at singledollardepthstyle{}%
}%
+ \ifbool{LWR at unknownmathsize}{%
+ \def\LWR at singledollarstyle{}%
+ \def\LWR at singledollardepthstyle{}%
+ }{}%
\ifbool{LWR at dynamicmath}{%
\LWR at traceinfo{subsingledollar: dynamic}%
\begin{lateximage}% no hashing
@@ -10400,9 +10564,9 @@
[\MathImageAltText]% alt tag
[]% no add'l hashing
[\LWR at singledollarstyle \LWR at singledollardepthstyle]% CSS
- }{%
+ }{% not dynamic math
\LWR at traceinfo{subsingledollar: static}%
- \IfValueTF{#1}{%
+ \IfValueTF{#1}{% #1 True
\LWR at findcurrenttextcolor% sets \LWR at tempcolor
\ifbool{LWR at xfakebold}%
{\def\LWR at tempone{Y}}%
@@ -10420,25 +10584,64 @@
FB\LWR at tempone% xfakebold
]%
[\LWR at singledollarstyle \LWR at singledollardepthstyle]% CSS
- }{%
+ }{% #1 False
\begin{lateximage}% no hashing
[#2]% alt
[]% no add'l hashing
[\LWR at singledollarstyle \LWR at singledollardepthstyle]% CSS
}%
- }%
+ }% not dynamic math
\LWR at addbaselinemarker%
\LWR at applyxfakebold%
\usebox{\LWR at singledollarbox}%
\LWR at addbaselinemarker%
\end{lateximage}%
-}% not mathjax
-\endgroup%
-}% not in a lateximage
-\gdef\LWR at ThisAltText{}%
-\LWR at traceinfo{LWR at subsingledollar: done}%
}
+\newlength{\LWR at singledollarwidth}
+\newlength{\LWR at singledollarheight}
+\newlength{\LWR at singledollardepth}
+
+\newsavebox{\LWR at singledollarbox}
+
+\NewDocumentCommand{\LWR at subsingledollar}{s m m m}{%
+ \LWR at traceinfo{LWR at subsingledollar}%
+ \ifnumcomp{\value{LWR at lateximagedepth}}{>}{0}%
+ {%
+ \LWR at traceinfo{LWR at subsingledollar: already in a lateximage}%
+ #4% contents
+ }%
+ {% not in a lateximage
+ \begingroup%
+ \LWR at applyxfakebold%
+ \ifboolexpr{%
+ (
+ bool{mathjax} or
+ ( bool{FormatWP} and bool{WPMarkMath} )
+ ) and
+ ( not test {
+ \ifstrequal {#2}% from \ensuredmath
+ {\AltTextOpen\MathImageAltText\AltTextClose}
+ }
+ ) and
+ ( not bool{LWR at dynamicmath} )
+ }%
+ {%
+ \LWR at traceinfo{LWR at subsingledollar: Mathjax}%
+ {\textbackslash(\LWR at HTMLsanitize{#4}\textbackslash)}%
+ }% mathjax
+ {% not mathjax
+ \LWR at traceinfo{%
+ LWR at subsingledollar: NOT mathjax, or is ensuremath, or is dynamic%
+ }%
+ \LWR at subsingledollarsvg{#1}{#2}{#3}{#4}%
+ }% not mathjax
+ \endgroup%
+ }% not in a lateximage
+ \gdef\LWR at ThisAltText{}%
+ \LWR at traceinfo{LWR at subsingledollar: done}%
+}
+
\LetLtxMacro\LWR at origdollar$
\LetLtxMacro\LWR at secondorigdollar$% balance for editor syntax highlighting
@@ -10517,28 +10720,27 @@
\LetLtxMacro\LWR at origensuredmath\@ensuredmath
\renewcommand{\@ensuredmath}[1]{%
-\ifbool{mathjax}{%
- \LWR at subsingledollar*{\AltTextOpen\MathImageAltText\AltTextClose}{%
- \protect\LWR at HTMLsanitize{\detokenize\expandafter{#1}}%
- }{\relax%
- \LWR at origensuredmath{#1}%
- }%
-}{% SVG math
-\ifmmode%
- \LWR at origensuredmath{#1}%
-\else%
- \ifnumcomp{\value{LWR at lateximagedepth}}{>}{0}%
- {\LWR at origensuredmath{#1}}%
- {%
+ \ifbool{mathjax}{%
\LWR at subsingledollar*{\AltTextOpen\MathImageAltText\AltTextClose}{%
- \protect\LWR at HTMLsanitize{\detokenize\expandafter{#1}}%
- }{%
+ \protect\LWR at HTMLsanitize{\detokenize\expandafter{#1}}%
+ }{\relax%
\LWR at origensuredmath{#1}%
}%
+ }{% SVG math
+ \ifmmode%
+ \LWR at origensuredmath{#1}%
+ \else%
+ \ifnumcomp{\value{LWR at lateximagedepth}}{>}{0}%
+ {\LWR at origensuredmath{#1}}%
+ {%
+ \LWR at subsingledollar*%
+ {\AltTextOpen\MathImageAltText\AltTextClose}%
+ {\protect\LWR at HTMLsanitize{\detokenize\expandafter{#1}}}%
+ {\LWR at origensuredmath{#1}}%
+ }%
+ \fi%
}%
-\fi%
-}%
-\gdef\LWR at ThisAltText{}%
+ \gdef\LWR at ThisAltText{}%
}
\let\math\relax
@@ -10583,46 +10785,46 @@
\newcounter{LWR at nextequation}
\newcommand*{\LWR at syncmathjax}{%
-\ifcsdef{thechapter}{
- \InlineClass{hidden}{
- \textbackslash(
- \textbackslash{}seteqsection \{\thechapter\}
- \textbackslash)
+ \ifcsdef{thechapter}{
+ \InlineClass{hidden}{
+ \textbackslash(
+ \textbackslash{}seteqsection \{\thechapter\}
+ \textbackslash)
+ }
}
+ {}% not using chapters
+ \ifthenelse{\cnttest{\value{equation}}>0}
+ {
+ \setcounter{LWR at nextequation}{\value{equation}}
+ \addtocounter{LWR at nextequation}{1}
+ \InlineClass{hidden}{
+ \textbackslash(
+ \textbackslash{}seteqnumber \{\arabic{LWR at nextequation}\}
+ \textbackslash)
+ }
+ }{}% not eq > 0
}
-{}% not using chapters
-\ifthenelse{\cnttest{\value{equation}}>0}
-{
- \setcounter{LWR at nextequation}{\value{equation}}
- \addtocounter{LWR at nextequation}{1}
- \InlineClass{hidden}{
- \textbackslash(
- \textbackslash{}seteqnumber \{\arabic{LWR at nextequation}\}
- \textbackslash)
- }
-}{}% not eq > 0
-}
\NewDocumentCommand{\LWR at hidelatexequation}{m +m}{%
-\LWR at stoppars
-\LWR at htmlopencomment
+ \LWR at stoppars
+ \LWR at htmlopencomment
-\begingroup
-\@nameuse{LWR at orig#1}
-\LWR at restoreorigformatting
-#2
-\@nameuse{LWR at origend#1}
-\endgroup
+ \begingroup
+ \@nameuse{LWR at orig#1}
+ \LWR at restoreorigformatting
+ #2
+ \@nameuse{LWR at origend#1}
+ \endgroup
-\LWR at htmlclosecomment
-\LWR at startpars
+ \LWR at htmlclosecomment
+ \LWR at startpars
}
\NewDocumentCommand{\LWR at addmathjax}{m +m}{%
-\LWR at origtilde\LWR at orignewline
-\textbackslash{}begin\{#1\}
-\LWR at HTMLsanitizeexpand{\detokenize\expandafter{#2}}
-\textbackslash{}end\{#1\}
-\LWR at orignewline
+ \LWR at origtilde\LWR at orignewline
+ \textbackslash{}begin\{#1\}
+ \LWR at HTMLsanitizeexpand{\detokenize\expandafter{#2}}
+ \textbackslash{}end\{#1\}
+ \LWR at orignewline
}
\AtBeginDocument{
@@ -10633,40 +10835,41 @@
}
\newcommand*{\LWR at doequation}[2]{%
-\ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }%
-{
- \LWR at syncmathjax
- \LWR at hidelatexequation{#2}{#1}
-}
-{% not mathjax
- \ifstrequal{#2}{equation*}{%
- \begin{BlockClass}{displaymath}%
- }{%
- \begin{BlockClass}{displaymathnumbered}%
- }%
- \LWR at newautoidanchor%
- \booltrue{LWR at indisplaymathimage}%
- \begin{lateximage}[%
+ \ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }%
+ {
+ \LWR at syncmathjax
+ \LWR at hidelatexequation{#2}{#1}
+ }
+ {% not mathjax
\ifstrequal{#2}{equation*}{%
- \ifdefequal{\LWR at equationtag}{\theequation}{%
+ \begin{BlockClass}{displaymath}%
+ }{%
+ \begin{BlockClass}{displaymathnumbered}%
+ }%
+ \LWR at newautoidanchor%
+ \booltrue{LWR at indisplaymathimage}%
+ \begin{lateximage}[%
+ \ifstrequal{#2}{equation*}{%
+ \ifdefequal{\LWR at equationtag}{\theequation}{%
+ % no tag was given
+ }{%
+ (\LWR at equationtag) % tag was given
+ }%
}{%
- (\LWR at equationtag) % tag was given
+ (\LWR at equationtag) % automatic numbering
}%
- }{%
- (\LWR at equationtag) % automatic numbering
- }%
- \textbackslash{begin\{#2\}} % extra space
- \LWR at HTMLsanitizeexpand{\detokenize\expandafter{#1}} % extra space
- \textbackslash{end\{#2\}}%
- ]*% alt tag
- \LWR at applyxfakebold%
- \@nameuse{LWR at orig#2}%
- #1% contents collected by \collect at body
- \@nameuse{LWR at origend#2}%
- \end{lateximage}%
- \end{BlockClass}%
-}% not mathjax
-\gdef\LWR at ThisAltText{}%
+ \textbackslash{begin\{#2\}} % extra space
+ \LWR at HTMLsanitizeexpand{\detokenize\expandafter{#1}} % extra space
+ \textbackslash{end\{#2\}}%
+ ]*% alt tag
+ \LWR at applyxfakebold%
+ \@nameuse{LWR at orig#2}%
+ #1% contents collected by \collect at body
+ \@nameuse{LWR at origend#2}%
+ \end{lateximage}%
+ \end{BlockClass}%
+ }% not mathjax
+ \gdef\LWR at ThisAltText{}%
}
\newcommand*{\LWR at doendequation}[1]{%
\ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }%
@@ -10674,7 +10877,7 @@
\LWR at addmathjax{#1}{\BODY}%
}{}%
-\gdef\LWR at ThisAltText{}%
+ \gdef\LWR at ThisAltText{}%
}
\AtBeginDocument{
@@ -10685,23 +10888,27 @@
}
\AtBeginDocument{
+
\NewEnviron{equation}%
-{\LWR at doequation{\BODY}{equation}}%
-[\LWR at doendequation{equation}]
+ {\LWR at doequation{\BODY}{equation}}%
+ [\LWR at doendequation{equation}]
\LetLtxMacro\LWR at equationnormal\equation
\LetLtxMacro\endLWR at equationnormal\endequation
-}
+}% AtBeginDocument
+
\AtBeginDocument{
+
\NewEnviron{equation*}%
-{\LWR at doequation{\BODY}{equation*}}%
-[\LWR at doendequation{equation*}]
+ {\LWR at doequation{\BODY}{equation*}}%
+ [\LWR at doendequation{equation*}]
\csletcs{LWR at equationnormalstar}{equation*}
\csletcs{LWR at endequationnormalstar}{endequation*}
-}
+}% AtBeginDocument
+
\AtBeginDocument{
\LetLtxMacro\LWR at equationless\equation
\LetLtxMacro\endLWR at equationless\endequation
@@ -10710,27 +10917,27 @@
}
\newcommand*{\displaymathnormal}{%
-\ifbool{LWR at origmathjax}{\booltrue{mathjax}}{\boolfalse{mathjax}}%
-\LetLtxMacro\[\LWR at openbracketnormal%
-\LetLtxMacro\]\LWR at closebracketnormal%
-\LetLtxMacro\displaymath\LWR at displaymathnormal%
-\LetLtxMacro\enddisplaymath\endLWR at displaymathnormal%
-\LetLtxMacro\equation\LWR at equationnormal%
-\LetLtxMacro\endequation\endLWR at equationnormal%
-\csletcs{equation*}{LWR at equationnormalstar}%
-\csletcs{endequation*}{LWR at endequationnormalstar}%
+ \ifbool{LWR at origmathjax}{\booltrue{mathjax}}{\boolfalse{mathjax}}%
+ \LetLtxMacro\[\LWR at openbracketnormal%
+ \LetLtxMacro\]\LWR at closebracketnormal%
+ \LetLtxMacro\displaymath\LWR at displaymathnormal%
+ \LetLtxMacro\enddisplaymath\endLWR at displaymathnormal%
+ \LetLtxMacro\equation\LWR at equationnormal%
+ \LetLtxMacro\endequation\endLWR at equationnormal%
+ \csletcs{equation*}{LWR at equationnormalstar}%
+ \csletcs{endequation*}{LWR at endequationnormalstar}%
}
\newcommand*{\displaymathother}{%
-\boolfalse{mathjax}%
-\LetLtxMacro\displaymath\LWR at displaymathother%
-\LetLtxMacro\enddisplaymath\endLWR at displaymathother%
-\LetLtxMacro\[\LWR at displaymathother%
-\LetLtxMacro\]\endLWR at displaymathother%
-\LetLtxMacro\equation\LWR at equationother%
-\LetLtxMacro\endequation\endLWR at equationother%
-\csletcs{equation*}{displaymath}%
-\csletcs{endequation*}{enddisplaymath}%
+ \boolfalse{mathjax}%
+ \LetLtxMacro\displaymath\LWR at displaymathother%
+ \LetLtxMacro\enddisplaymath\endLWR at displaymathother%
+ \LetLtxMacro\[\LWR at displaymathother%
+ \LetLtxMacro\]\endLWR at displaymathother%
+ \LetLtxMacro\equation\LWR at equationother%
+ \LetLtxMacro\endequation\endLWR at equationother%
+ \csletcs{equation*}{displaymath}%
+ \csletcs{endequation*}{enddisplaymath}%
}
\end{warpHTML}
@@ -10748,36 +10955,36 @@
\boolfalse{LWR at amsmultline}
\newcommand*{\LWR at htmlmathlabel}[1]{%
-\LWR at traceinfo{LWR at htmlmathlabelb #1}%
-\ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }%
-{%
- \text{%
- \ifbool{LWR at amsmultline}{}{\hspace*{\totwidth@}}%
- \LWR at htmlclosecomment%
- \LWR at origltx@label{#1}%
- \LWR at htmlopencomment%
- }% text
-}% mathjax
-{%
- \LWR at origltx@label{#1}%
-}%
+ \LWR at traceinfo{LWR at htmlmathlabelb #1}%
+ \ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }%
+ {%
+ \text{%
+ \ifbool{LWR at amsmultline}{}{\hspace*{\totwidth@}}%
+ \LWR at htmlclosecomment%
+ \LWR at origltx@label{#1}%
+ \LWR at htmlopencomment%
+ }% text
+ }% mathjax
+ {%
+ \LWR at origltx@label{#1}%
+ }%
}
\newcommand*{\LWR at beginhideamsmath}{
-\LWR at stoppars
-\LWR at origtilde\LWR at orignewline
-\LWR at htmlopencomment
+ \LWR at stoppars
+ \LWR at origtilde\LWR at orignewline
+ \LWR at htmlopencomment
-\begingroup
-\LWR at restoreorigformatting
+ \begingroup
+ \LWR at restoreorigformatting
}
\newcommand*{\LWR at endhideamsmath}{
-\endgroup
+ \endgroup
-\LWR at htmlclosecomment
-\LWR at orignewline
-\LWR at startpars
+ \LWR at htmlclosecomment
+ \LWR at orignewline
+ \LWR at startpars
}
@@ -10786,54 +10993,54 @@
\newbool{LWR at numbereqnarray}
\booltrue{LWR at numbereqnarray}
\newcommand{\LWR at eqnarrayfactor}{%
-\ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }%
-{%
- \LWR at syncmathjax
- \boolfalse{LWR at amsmultline}
- \ifbool{LWR at numbereqnarray}
- {
- \LWR at beginhideamsmath
- \LWR at origeqnarray
- \BODY
- \LWR at origendeqnarray
- \LWR at endhideamsmath
- \LWR at addmathjax{eqnarray}{\BODY}
- }%
- {% not LWR at numbereqnarray
- \LWR at addmathjax{eqnarray*}{\BODY}
- }% LWR at numbereqnarray
-}% mathjax
-{% not mathjax
- \ifbool{LWR at numbereqnarray}
- {
- \begin{BlockClass}{displaymathnumbered}%
- \LWR at newautoidanchor%
- \booltrue{LWR at indisplaymathimage}%
- \begin{lateximage}[(\LWR at startingequationtag--\LWR at equationtag)
- \LWR at addmathjax{eqnarray}{\BODY}]*
- \LWR at applyxfakebold%
- \LWR at origeqnarray
- \BODY
- \LWR at origendeqnarray
- \end{lateximage}
- \end{BlockClass}
- }%
- {% not LWR at numbereqnarray
- \begin{BlockClass}{displaymath}
- \LWR at newautoidanchor%
- \booltrue{LWR at indisplaymathimage}%
- \begin{lateximage}[\LWR at addmathjax{eqnarray*}{\BODY}]*
- \LWR at applyxfakebold%
- \LWR at origeqnarray
- \BODY
- \nonumber
- \LWR at origendeqnarray
- \end{lateximage}
- \end{BlockClass}
- }% LWR at numbereqnarray
-}% not mathjax
-\booltrue{LWR at numbereqnarray}
-\gdef\LWR at ThisAltText{}%
+ \ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }%
+ {%
+ \LWR at syncmathjax%
+ \boolfalse{LWR at amsmultline}%
+ \ifbool{LWR at numbereqnarray}%
+ {%
+ \LWR at beginhideamsmath%
+ \LWR at origeqnarray%
+ \BODY%
+ \LWR at origendeqnarray%
+ \LWR at endhideamsmath%
+ \LWR at addmathjax{eqnarray}{\BODY}%
+ }%
+ {% not LWR at numbereqnarray
+ \LWR at addmathjax{eqnarray*}{\BODY}%
+ }% LWR at numbereqnarray
+ }% mathjax
+ {% not mathjax
+ \ifbool{LWR at numbereqnarray}%
+ {%
+ \begin{BlockClass}{displaymathnumbered}%
+ \LWR at newautoidanchor%
+ \booltrue{LWR at indisplaymathimage}%
+ \begin{lateximage}[(\LWR at startingequationtag--\LWR at equationtag)%
+ \LWR at addmathjax{eqnarray}{\BODY}]*%
+ \LWR at applyxfakebold%
+ \LWR at origeqnarray%
+ \BODY%
+ \LWR at origendeqnarray%
+ \end{lateximage}%
+ \end{BlockClass}%
+ }%
+ {% not LWR at numbereqnarray
+ \begin{BlockClass}{displaymath}%
+ \LWR at newautoidanchor%
+ \booltrue{LWR at indisplaymathimage}%
+ \begin{lateximage}[\LWR at addmathjax{eqnarray*}{\BODY}]*%
+ \LWR at applyxfakebold%
+ \LWR at origeqnarray%
+ \BODY%
+ \nonumber%
+ \LWR at origendeqnarray%
+ \end{lateximage}%
+ \end{BlockClass}%
+ }% LWR at numbereqnarray
+ }% not mathjax
+ \booltrue{LWR at numbereqnarray}%
+ \gdef\LWR at ThisAltText{}%
}
\RenewEnviron{eqnarray}
{%
@@ -10866,53 +11073,18 @@
\begin{warpHTML}
-\newrobustcmd{\LWR at HTMLsanitize}[1]{%
-\begingroup%
-\LWR at FBcancel%
-\fullexpandarg%
-\protect\StrSubstitute{\detokenize{#1}}%
-{\detokenize{&}}{\detokenize{&}}[\LWR at strresult]%
-\protect\StrSubstitute{\detokenize\expandafter{\LWR at strresult}}%
-{\detokenize{<}}{\detokenize{<}}[\LWR at strresult]%
-\protect\StrSubstitute{\detokenize\expandafter{\LWR at strresult}}%
-{\detokenize{>}}{\detokenize{>}}[\LWR at strresult]%
-\protect\StrSubstitute{\detokenize\expandafter{\LWR at strresult}}%
-{\detokenize{"}}{\detokenize{"}}[\LWR at strresult]%
-\protect\StrSubstitute{\detokenize\expandafter{\LWR at strresult}}%
-{\detokenize{##}}{\LWR at origpound}[\LWR at strresult]%
-\LWR at strresult%
-\endgroup%
-}
-
-\newrobustcmd{\LWR at HTMLsanitizeexpand}[1]{%
-\begingroup%
-\LWR at FBcancel%
-\fullexpandarg%
-\protect\StrSubstitute{\detokenize\expandafter{#1}}%
-{\detokenize{&}}{\detokenize{&}}[\LWR at strresult]%
-\protect\StrSubstitute{\detokenize\expandafter{\LWR at strresult}}%
-{\detokenize{<}}{\detokenize{<}}[\LWR at strresult]%
-\protect\StrSubstitute{\detokenize\expandafter{\LWR at strresult}}%
-{\detokenize{>}}{\detokenize{>}}[\LWR at strresult]%
-\protect\StrSubstitute{\detokenize\expandafter{\LWR at strresult}}%
-{\detokenize{"}}{\detokenize{"}}[\LWR at strresult]%
-\LWR at strresult%
-\endgroup%
-}
-
-
\newcounter{LWR at startingequation}
\@ifundefined{chapter}
{
\renewcommand{\theLWR at startingequation}{%
-\arabic{LWR at startingequation}%
+ \arabic{LWR at startingequation}%
}
}
{% chapter defined
\renewcommand{\theLWR at startingequation}{%
-\ifnumcomp{\value{chapter}}{>}{0}{\arabic{chapter}.}{}%
-\arabic{LWR at startingequation}%
+ \ifnumcomp{\value{chapter}}{>}{0}{\arabic{chapter}.}{}%
+ \arabic{LWR at startingequation}%
}
}
@@ -10927,12 +11099,12 @@
\ifbool{mathjax}{}{% not mathjax
\NewDocumentCommand{\LWR at remembertag}{m}{%
-\ifbool{LWR at isstartingequation}%
-{%
- \global\boolfalse{LWR at isstartingequation}%
- \xdef\LWR at startingequationtag{#1}%
-}{}%
-\xdef\LWR at equationtag{#1}%
+ \ifbool{LWR at isstartingequation}%
+ {%
+ \global\boolfalse{LWR at isstartingequation}%
+ \xdef\LWR at startingequationtag{#1}%
+ }{}%
+ \xdef\LWR at equationtag{#1}%
}%
}% not mathjax
@@ -10941,17 +11113,17 @@
\newcommand*{\LWR at amsmathbody}[1]
{%
-\textbackslash\{begin\}\{#1\} % extra space
-\LWR at HTMLsanitizeexpand{\detokenize\expandafter{\the\@envbody}}%
-\textbackslash\{end\}\{#1\}%
+ \textbackslash\{begin\}\{#1\} % extra space
+ \LWR at HTMLsanitizeexpand{\detokenize\expandafter{\the\@envbody}}%
+ \textbackslash\{end\}\{#1\}%
}
\newcommand*{\LWR at amsmathbodynumbered}[1]
{%
-\ifnumcomp{\value{LWR at startingequation}}{=}{\value{equation}}%
-{(\LWR at equationtag)}%
-{(\LWR at startingequationtag--\LWR at equationtag)} % extra space
-\LWR at amsmathbody{#1} % extra space
+ \ifnumcomp{\value{LWR at startingequation}}{=}{\value{equation}}%
+ {(\LWR at equationtag)}%
+ {(\LWR at startingequationtag--\LWR at equationtag)} % extra space
+ \LWR at amsmathbody{#1} % extra space
}
@@ -10992,7 +11164,7 @@
\global\advance\c at LWR@lateximagedepth 1\relax% Due to AmS \text macro.
}%
{% start of outer-most lateximage
-\LWR at traceinfo{lateximage: starting outer-most lateximage}%
+ \LWR at traceinfo{lateximage: starting outer-most lateximage}%
\setcounter{LWR at startingequation}{\value{equation}}%
\addtocounter{LWR at startingequation}{1}%
\booltrue{LWR at isstartingequation}%
@@ -11047,7 +11219,11 @@
\LWR at traceinfo{lateximage: about to create a new page}%
\LWR at orignewpage%
\LWR at traceinfo{lateximage: about to create minipage}%
- \LWR at print@minipage{6in}%
+ \ifdimless{\linewidth}{6in}{%
+ \LWR at print@minipage{\linewidth}%
+ }{%
+ \LWR at print@minipage{6in}%
+ }%
\@nameuse{LWR at print@\LateximageFontSizeName}%
\LWR at traceinfo{lateximage: about to temporarily restore formatting}%
\LWR at restoreorigformatting%
@@ -11123,50 +11299,50 @@
\renewenvironment*{center}
{
-\LWR at forcenewpage
-\ifbool{FormatWP}
-{\BlockClass[\LWR at print@mbox{text-align:center}]{center}}
-{\BlockClass{center}}
+ \LWR at forcenewpage
+ \ifbool{FormatWP}
+ {\BlockClass[\LWR at print@mbox{text-align:center}]{center}}
+ {\BlockClass{center}}
}
{\endBlockClass}
\renewenvironment*{flushright}
{
-\LWR at forcenewpage
-\ifbool{FormatWP}
-{\BlockClass[\LWR at print@mbox{text-align:right}]{flushright}}
-{\BlockClass{flushright}}
+ \LWR at forcenewpage
+ \ifbool{FormatWP}
+ {\BlockClass[\LWR at print@mbox{text-align:right}]{flushright}}
+ {\BlockClass{flushright}}
}
{\endBlockClass}
\renewenvironment*{flushleft}
{
-\LWR at forcenewpage
-\ifbool{FormatWP}
-{\BlockClass[\LWR at print@mbox{text-align:left}]{flushleft}}
-{\BlockClass{flushleft}}
+ \LWR at forcenewpage
+ \ifbool{FormatWP}
+ {\BlockClass[\LWR at print@mbox{text-align:left}]{flushleft}}
+ {\BlockClass{flushleft}}
}
{\endBlockClass}
\newcommand*{\LWR at HTML@centering}{%
-\ifbool{HTMLDebugComments}{%
- \LWR at htmlcomment{centering}%
-}{}%
+ \ifbool{HTMLDebugComments}{%
+ \LWR at htmlcomment{centering}%
+ }{}%
}
\LWR at formatted{centering}
\newcommand*{\LWR at HTML@raggedleft}{%
-\ifbool{HTMLDebugComments}{%
- \LWR at htmlcomment{raggedleft}%
-}{}%
+ \ifbool{HTMLDebugComments}{%
+ \LWR at htmlcomment{raggedleft}%
+ }{}%
}
\LWR at formatted{raggedleft}
\newcommand*{\LWR at HTML@raggedright}{%
-\ifbool{HTMLDebugComments}{%
- \LWR at htmlcomment{raggedright}%
-}{}%
+ \ifbool{HTMLDebugComments}{%
+ \LWR at htmlcomment{raggedright}%
+ }{}%
}
\LWR at formatted{raggedright}
@@ -11491,12 +11667,20 @@
\begin{warpHTML}
-
-\newcounter{LWR at minipagedepth}
-\setcounter{LWR at minipagedepth}{0}
-
\newlength{\LWR at minipagewidth}
\newlength{\LWR at minipageheight}
+\newcounter{LWR at virtualpagedepth}
+\setcounter{LWR at virtualpagedepth}{0}
+\NewDocumentEnvironment{LWR at setvirtualpage}{s O{1}}{%
+ \ifnumequal{\value{LWR at virtualpagedepth}}{0}{%
+ \IfBooleanT{#1}{\LWR at orignewpage}%
+ \setlength{\linewidth}{6in/#2}%
+ \setlength{\textwidth}{6in}%
+ \setlength{\textheight}{9in}%
+ }{}%
+ \addtocounter{LWR at virtualpagedepth}{1}%
+}
+{\addtocounter{LWR at virtualpagedepth}{-1}}
\newbool{LWR at minipagefullwidth}
\boolfalse{LWR at minipagefullwidth}
\newbool{LWR at forceminipagefullwidth}
@@ -11516,19 +11700,14 @@
\NewDocumentEnvironment{LWR at HTML@sub at minipage}{m m m m}
{%
\LWR at traceinfo{minipage}%
-\begingroup%
+\begin{LWR at setvirtualpage}*%
\setlength{\LWR at minipagewidth}{#4}%
-\ifthenelse{\cnttest{\value{LWR at minipagedepth}}{=}{0}}{%
- \LWR at orignewpage%
+\ifnumequal{\value{LWR at virtualpagedepth}}{1}{%
\addtolength{\LWR at minipagewidth}{3em}% room for frames
- \setlength{\linewidth}{6in}%
- \setlength{\textwidth}{6in}%
- \setlength{\textheight}{9in}%
}{}%
\LWR at traceinfo{computed width is \LWR at printlength{\LWR at minipagewidth}}%
\setlength{\LWR at minipageheight}{\textheight}% default unless specified
\ifblank{#2}{}{\setlength{\LWR at minipageheight}{#2}}%
-\addtocounter{LWR at minipagedepth}{1}%
\ifbool{FormatWP}{\newline}{}%
\LWR at stoppars%
\ifbool{FormatWP}{%
@@ -11565,10 +11744,10 @@
\ifblank{#2}{}{height:\LWR at printlength{\LWR at minipageheight} ; }%
"}%
-\setlength{\linewidth}{\LWR at minipagewidth}% the padded width
-\addtolength{\linewidth}{-3em}% the original width
-\setlength{\textwidth}{6in}%
-\setlength{\textheight}{9in}%
+\ifnumequal{\value{LWR at virtualpagedepth}}{1}{%
+ \addtolength{\LWR at minipagewidth}{-3em}% undo frame padding
+}{}%
+\setlength{\linewidth}{\LWR at minipagewidth}%
\LWR at print@raggedright%
\def\@mpfn{mpfootnote}%
\def\thempfn{\thempfootnote}\c at mpfootnote\z@%
@@ -11589,7 +11768,6 @@
}{}%
\LWR at stoppars%
-\endgroup%
\ifbool{FormatWP}{%
@@ -11598,7 +11776,7 @@
}{}%
\LWR at htmldivclassend{minipage}%
-\addtocounter{LWR at minipagedepth}{-1}%
+\end{LWR at setvirtualpage}%
\LWR at startpars%
\ifbool{FormatWP}{\newline}{}%
\global\booltrue{LWR at minipagethispar}%
@@ -11647,38 +11825,38 @@
}%
}
\NewDocumentCommand{\LWR at HTML@makebox}{>{\SplitArgument{1}{,}}d() o o +m}{%
-{% scope
- \def\LWR at temptwo{}%
- \IfValueTF{#1}%
- {% (width,height) ..
- \LWR@@makebox at paren #1%
- \IfValueT{#2}%
- {% (width,height) [posn]
- \LWR@@makebox at align{#2}%
+ \begin{LWR at setvirtualpage}%
+ \def\LWR at temptwo{}%
+ \IfValueTF{#1}%
+ {% (width,height) ..
+ \LWR@@makebox at paren #1%
+ \IfValueT{#2}%
+ {% (width,height) [posn]
+ \LWR@@makebox at align{#2}%
+ }%
}%
- }%
- {% [width]
- \IfValueT{#2}% [width]
- {%
- \setlength{\LWR at tempwidth}{#2}%
- \ifdimgreater{\LWR at tempwidth}{0pt}{%
- \appto{\LWR at temptwo}{%
- width:\LWR at printlength{\LWR at tempwidth} ; % space
- }%
- }{}%
+ {% [width]
+ \IfValueT{#2}% [width]
+ {%
+ \setlength{\LWR at tempwidth}{#2}%
+ \ifdimgreater{\LWR at tempwidth}{0pt}{%
+ \appto{\LWR at temptwo}{%
+ width:\LWR at printlength{\LWR at tempwidth} ; % space
+ }%
+ }{}%
+ }%
}%
- }%
- \IfValueT{#3}%
- {% [width] [posn]
- \LWR@@makebox at align{#3}%
- }%
- \InlineClass[%
- \LWR at print@mbox{display:inline-block} ; %
- \LWR at temptwo%
- ]%
- {makebox}%
- {#4}%
-}% scope
+ \IfValueT{#3}%
+ {% [width] [posn]
+ \LWR@@makebox at align{#3}%
+ }%
+ \InlineClass[%
+ \LWR at print@mbox{display:inline-block} ; %
+ \LWR at temptwo%
+ ]%
+ {makebox}%
+ {#4}%
+ \end{LWR at setvirtualpage}%
}
\LWR at formatted{makebox}
\NewDocumentCommand{\LWR at HTML@framebox}{d() o o +m}{%
@@ -11766,9 +11944,10 @@
\NewDocumentEnvironment{LWR at HTML@fminipage}{O{t} o O{t} m}
{%
\LWR at traceinfo{fminipage #1 #2 #3 #4}%
-\LWR at forceminwidth{\fboxrule}%
+\begin{LWR at setvirtualpage}*%
\setlength{\LWR at tempwidth}{#4}%
\IfValueT{#2}{\setlength{\LWR at tempheight}{#2}}%
+\LWR at forceminwidth{\fboxrule}%
\LWR at stoppars%
\begin{BlockClass}[%
\LWR at fboxstyle ; %
@@ -11788,6 +11967,7 @@
}
{%
\end{BlockClass}%
+\end{LWR at setvirtualpage}%
\global\booltrue{LWR at minipagethispar}%
\LWR at traceinfo{fminipage done}%
}
@@ -12286,34 +12466,36 @@
\renewrobustcmd*{~}{\HTMLentity{nbsp}}
\renewrobustcmd*{\textellipsis}{\HTMLunicode{2026}}
}
-\newrobustcmd*{\LWR at HTML@normalsize}{}
+\newcommand*{\LWR at font@size}{normalsize}
+
+\newrobustcmd*{\LWR at HTML@normalsize}{\renewcommand*{\LWR at font@size}{normalsize}}
\LWR at formatted{normalsize}
-\newrobustcmd*{\LWR at HTML@small}{}
+\newrobustcmd*{\LWR at HTML@small}{\renewcommand*{\LWR at font@size}{small}}
\LWR at formatted{small}
-\newrobustcmd*{\LWR at HTML@footnotesize}{}
+\newrobustcmd*{\LWR at HTML@footnotesize}{\renewcommand*{\LWR at font@size}{footnotesize}}
\LWR at formatted{footnotesize}
-\newrobustcmd*{\LWR at HTML@scriptsize}{}
+\newrobustcmd*{\LWR at HTML@scriptsize}{\renewcommand*{\LWR at font@size}{scriptsize}}
\LWR at formatted{scriptsize}
-\newrobustcmd*{\LWR at HTML@tiny}{}
+\newrobustcmd*{\LWR at HTML@tiny}{\renewcommand*{\LWR at font@size}{tiny}}
\LWR at formatted{tiny}
-\newrobustcmd*{\LWR at HTML@large}{}
+\newrobustcmd*{\LWR at HTML@large}{\renewcommand*{\LWR at font@size}{large}}
\LWR at formatted{large}
-\newrobustcmd*{\LWR at HTML@Large}{}
+\newrobustcmd*{\LWR at HTML@Large}{\renewcommand*{\LWR at font@size}{Large}}
\LWR at formatted{Large}
-\newrobustcmd*{\LWR at HTML@LARGE}{}
+\newrobustcmd*{\LWR at HTML@LARGE}{\renewcommand*{\LWR at font@size}{LARGE}}
\LWR at formatted{LARGE}
-\newrobustcmd*{\LWR at HTML@huge}{}
+\newrobustcmd*{\LWR at HTML@huge}{\renewcommand*{\LWR at font@size}{huge}}
\LWR at formatted{huge}
-\newrobustcmd*{\LWR at HTML@Huge}{}
+\newrobustcmd*{\LWR at HTML@Huge}{\renewcommand*{\LWR at font@size}{Huge}}
\LWR at formatted{Huge}
\DeclareDocumentCommand{\onecolumn}{}{}
@@ -12736,6 +12918,111 @@
}{}
}
\end{warpHTML}
+
+\begin{warpHTML}
+\AtBeginDocument{
+
+\@ifpackageloaded{polyglossia}{
+ \PackageWarningNoLine{lwarp}
+ {%
+ Polyglossia has been loaded. Lwarp also uses cleveref.\MessageBreak
+ See the cleveref documentation regarding\MessageBreak
+ polyglossia support%
+ }
+ \typeout{If the error}
+ \typeout{\space\space``! Undefined control sequence.
+ \space ... \space \protect\@begindocumenthook''}
+ \typeout{occurs here, use the polyglossia macro:}
+ \typeout{\space\space\protect\setmainlanguage\protect{...\protect}}
+ \typeout{---}
+}{
+ \@ifpackageloaded{babel}{
+ \PackageWarningNoLine{lwarp}
+ {%
+ Babel has been loaded. Lwarp also uses cleveref.\MessageBreak
+ See the cleveref documentation regarding\MessageBreak
+ babel support%
+ }
+ }{}
+}
+
+}
+\end{warpHTML}
+\newcommand*{\LWR at mathjaxwarn}[2]{%
+ \@ifpackageloaded{lwarp-#1}{%
+ \ifblank{#2}{%
+ \PackageWarningNoLine{lwarp}
+ {%
+ Lwarp provides emulation for MathJax when used\MessageBreak
+ with the #1 package%
+ }
+ }{%
+ \PackageWarningNoLine{lwarp}
+ {%
+ Lwarp provides emulation for MathJax when used\MessageBreak
+ with the #1 package.\MessageBreak
+ #2%
+ }
+ }%
+ }{}%
+}
+
+\AtBeginDocument{
+ \ifbool{mathjax}{
+ \LWR at mathjaxwarn{arydshln}
+ {In a math array, do not use the optional argument\MessageBreak
+ for \protect\cdashline.\space\space
+ Furthermore, \protect\cline\space is not\MessageBreak
+ supported by MathJax}
+ \LWR at mathjaxwarn{autonum}
+ {MathJax does not support equation+.\MessageBreak
+ You may use the warpprint and warpHTML\MessageBreak
+ environments to isolate the package load\MessageBreak
+ and the equation+ environments}
+ \LWR at mathjaxwarn{backnaur}
+ {You may enclose its uses inside\MessageBreak
+ lateximage environments to force SVG output,\MessageBreak
+ but this also changes the print output}
+ \LWR at mathjaxwarn{bigdelim}
+ {Delimiters appear only of the first line}
+ \LWR at mathjaxwarn{booktabs}
+ {In a math array, do not use (trim) for \protect\cmidrule}
+ \LWR at mathjaxwarn{breqn}
+ {Each environment becomes an SVG image}
+ \LWR at mathjaxwarn{delarray}
+ {Enclose its uses inside lateximage\MessageBreak
+ environments to force SVG output}
+ \LWR at mathjaxwarn{jkmath}{}
+ \LWR at mathjaxwarn{mathspec}{}
+ \LWR at mathjaxwarn{mathtools}
+ {Avoid starred macros.\MessageBreak
+ See the Lwarp manual for other limitations}
+ \LWR at mathjaxwarn{multirow}
+ {Multirow works as expected in text mode, but\MessageBreak
+ limited emulation is provided for MathJax math.\MessageBreak
+ \protect\multirow\space ignores all arguments except\MessageBreak
+ the text}
+ \LWR at mathjaxwarn{pb-diagram}
+ {Enclose its uses inside lateximage environments\MessageBreak
+ to force SVG output}
+ \LWR at mathjaxwarn{physics}
+ {The third-party extension is not yet used.\MessageBreak
+ Avoid starred macros and automatic delimiters.\MessageBreak
+ Use all mandatory arguments, adding empty as needed.\MessageBreak
+ See the Lwarp manual for details}
+ \LWR at mathjaxwarn{unicode-math}
+ {Not all characters are encoded correctly.\MessageBreak
+ Some symbol fonts are not supported by MathJax,\MessageBreak
+ and are only approximated}
+ \LWR at mathjaxwarn{witharrows}
+ {Arrows can only point to the next line.\MessageBreak
+ Text is only placed on a single line}
+ \LWR at mathjaxwarn{xy}
+ {xy works in text, but in math you must\MessageBreak
+ enclose its uses inside lateximage\MessageBreak
+ environments to force SVG output}
+ }{}
+}
\endinput
%%
%% End of file `lwarp.sty'.
More information about the tex-live-commits
mailing list.