summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/epspdf/epspdf.tlu1238
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/epspdf/epspdftk.tcl469
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua59
-rw-r--r--Master/texmf-dist/doc/latex/lwarp/README.txt4
-rw-r--r--Master/texmf-dist/doc/latex/lwarp/lwarp.pdfbin2544151 -> 2303112 bytes
-rwxr-xr-xMaster/texmf-dist/scripts/lwarp/lwarpmk.lua59
-rw-r--r--Master/texmf-dist/source/latex/lwarp/lwarp.dtx3488
-rw-r--r--Master/texmf-dist/source/latex/lwarp/lwarp.ins12
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-CJK.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-CJKutf8.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-SIunits.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-a4.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-a4wide.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-abstract.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-accsupp.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-acro.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-acronym.sty33
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-adjmulticol.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-afterpage.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-algorithm2e.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-algorithmicx.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-alltt.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-amsmath.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-amsthm.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-anonchap.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-anysize.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-appendix.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-ar.sty60
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-arabicfront.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-array.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-arydshln.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-asymptote.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-attachfile.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-attachfile2.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-authblk.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-axodraw2.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-backref.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-balance.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-biblatex.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-bibunits.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-bigdelim.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-bigstrut.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-bitpattern.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-blowup.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-bookmark.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-booktabs.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-bophook.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-bounddvi.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-boxedminipage2e.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-breakurl.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-breqn.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-bxpapersize.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-bytefield.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-cancel.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-canoniclayout.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-caption.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-cases.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-changepage.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-chappg.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-chapterbib.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-chemmacros.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-chemnum.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-chngpage.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-cite.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-clrdblpg.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-color.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-colortbl.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-continue.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-copyrightbox.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-crop.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-cuted.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-cutwin.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-dblfloatfix.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-dblfnote.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-dcolumn.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-diagbox.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-draftcopy.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-draftwatermark.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-easy-todo.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-ed.sty38
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-ellipsis.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-embrac.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-emptypage.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-endfloat.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-endheads.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-enumerate.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-enumitem.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-epigraph.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-eso-pic.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-everypage.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-everyshi.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-extramarks.sty5
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-fancybox.sty4
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-fancyhdr.sty6
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-fancyref.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-fancytabs.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-fancyvrb.sty4
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-figcaps.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-figsize.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-fix2col.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-fixme.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-fixmetodonotes.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-flafter.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-floatflt.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-floatpag.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-floatrow.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-fltrace.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-flushend.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-fnbreak.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-fncychap.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-fnlineno.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-fnpos.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-fontenc.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-footmisc.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-footnote.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-footnotehyper.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-footnoterange.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-forest.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-framed.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-ftnright.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-fullwidth.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-gentombow.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-geometry.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-glossaries.sty4
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-gmeometric.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty69
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-grffile.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-grid.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-hang.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-hanging.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-hypcap.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-hypdestopt.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-hypernat.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-hyperxmp.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-hyphenat.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-idxlayout.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-ifoddpage.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-imakeidx.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-index.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-intopdf.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-keyfloat.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-layout.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-letterspace.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-lettrine.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-lineno.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-lips.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-listings.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-lltjext.sty4
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-longtable.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-lscape.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-ltablex.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-ltcaption.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-ltxgrid.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-ltxtable.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-lua-check-hyphen.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-luacolor.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-luatodonotes.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-magaz.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-makeidx.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-marginfit.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-marginfix.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-marginnote.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-mcaption.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-mdframed.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-memhfixc.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-metalogo.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-mhchem.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-microtype.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-midfloat.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-midpage.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-morefloats.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-moreverb.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-mparhack.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-multicol.sty11
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-multicolrule.sty3
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-multirow.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-multitoc.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-nameauth.sty85
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-natbib.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-nccfancyhdr.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-needspace.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-nextpage.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-nonfloat.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-nonumonpart.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-nopageno.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-notespages.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-nowidow.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-ntheorem.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-overpic.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-pagegrid.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-pagenote.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-pagesel.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-paralist.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-parnotes.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-parskip.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-pbox.sty4
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-pdflscape.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-pdfpages.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-pdfprivacy.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-pdfrender.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-pdfsync.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-pdftricks.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-pdfx.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-pfnote.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-phfqit.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-placeins.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-plarydshln.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-plext.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-plextarydshln.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-plextcolorbl.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-prelim2e.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-prettyref.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-pst-eps.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-pstool.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-pstricks.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-pxatbegshi.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-pxeveryshi.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-pxftnright.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-pxjahyper.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-quotchap.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-quoting.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-ragged2e.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-realscripts.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-register.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-relsize.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-resizegather.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-rmpage.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-romanbar.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-romanbarpagenumber.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-rotating.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-savetrees.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-schemata.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-scrextend.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-scrhack.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-scrlayer-notecolumn.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-scrlayer-scrpage.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-scrlayer.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-scrpage2.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-sectionbreak.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-sectsty.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-setspace.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-shadow.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-showkeys.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-sidecap.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-siunitx.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-soulpos.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-soulutf8.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-splitidx.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-stabular.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-stfloats.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-subcaption.sty34
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-subfig.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-subfigure.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-supertabular.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-syntonly.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-tabularx.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-tabulary.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-tascmac.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-textarea.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-textcomp.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-textfit.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-textpos.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-theorem.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-thinsp.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-threadcol.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-threeparttable.sty6
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-thumb.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-thumbs.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-titleps.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-titleref.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-titlesec.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-titletoc.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-titling.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-tocbasic.sty3
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-tocbibind.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-tocenter.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-tocloft.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-tocstyle.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-todo.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-todonotes.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-tram.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-transparent.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-trimclip.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-trivfloat.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-truncate.sty (renamed from Master/texmf-dist/tex/latex/lwarp/lwarp-indentfirst.sty)14
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-turnthepage.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-typearea.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-underscore.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-unitsdef.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-upref.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-url.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-uspace.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-verse.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-versonotes.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-vertbars.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-vmargin.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-vowel.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-vwcol.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-wallpaper.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-watermark.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-wrapfig.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-xellipsis.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-xfrac.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-xltabular.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-xltxtra.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-xmpincl.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-xtab.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-xurl.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-xy.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp-zwpagelayout.sty2
-rw-r--r--Master/texmf-dist/tex/latex/lwarp/lwarp.sty679
312 files changed, 3955 insertions, 3010 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/epspdf/epspdf.tlu b/Build/source/texk/texlive/linked_scripts/epspdf/epspdf.tlu
index 709a2d9b691..0007ade0742 100755
--- a/Build/source/texk/texlive/linked_scripts/epspdf/epspdf.tlu
+++ b/Build/source/texk/texlive/linked_scripts/epspdf/epspdf.tlu
@@ -2,17 +2,22 @@
kpse.set_program_name('texlua')
--- epspdf conversion utility
+--[[
+epspdf conversion utility
--- 0.6.0: first texlua version
--- 0.6.1: allow TeX installation on path with spaces
--- 0.6.2: compatibility fix for luatex 0.81
--- 0.6.3: compatibility fixes for luatex 0.9x
+0.6.0: first texlua version
+0.6.1: allow TeX installation on path with spaces
+0.6.2: compatibility fix for luatex 0.81
+0.6.3: compatibility fixes for luatex 0.9x
+0.6.4: adaptations for newer versions of LuaTeX and ghostscript;
+ some refactoring; better handling of some corner cases
-ep_version = '0.6.3'
-ep_copyright = '2006, 2008, 2009, 2010, 2011, 2013, 2014, 2015, 2016'
+Copyright (C) 2006-2019 Siep Kroonenberg
---[[
+siepo at bitmuis nl
+
+This program is free software, licensed under the GNU GPL, >=2.0.
+This software comes with absolutely NO WARRANTY. Use at your own risk!
Note.
TeX code for cropping pdfs adapted from Heiko Oberdiek's pdfcrop utility
@@ -26,14 +31,15 @@ Program structure
- other general utilities
- infrastructure: logging and temporary files
- reading and writing settings
- - gui function
+ - gui function for communicating with frontend
- boundingboxes
- manipulating [e]ps- and pdf files
- the PsPdf object:
- creator functions
- boundingbox handling
- one-step conversion methods
- - any_to_any method
+- any_to_any function.
+ this function checks options, the one-step converters check for success.
- main initialization section:
- collecting system information
- infrastructure: setting up logging and temp directory
@@ -71,6 +77,9 @@ else
path_sep = ';'
end
+infile = false
+outfile = false
+
bufsize=16000 -- for reading and writing files
-- these `declarations' are not really needed;
@@ -84,8 +93,8 @@ cwd = ''
-- Actual values determined during system-dependent initialization
is_miktex = false
is_tl_w32 = false
--- recent versions of miktex include pdftops
-auto_psp = true -- configuration of pdftops_prog not needed or not allowed
+
+-- Luatex 1.09 and later replace epdf with pdfe
-- some global file- and directory names
gs_prog = false
@@ -111,7 +120,7 @@ gray_options = false
-- logging ------------------------
-- we open and close the logfile anew for each write.
--- failure to open constitutes no error.
+-- failure to open does not constitute an error.
function print_log(s)
local f = io.open(logfile, 'a')
@@ -141,6 +150,9 @@ end
-- When run from the Tcl/Tk gui, this gui will capture error messages.
function errror(mess)
+ if infile and outfile then
+ mess = 'Failure to convert '..infile..' to '..outfile..':\n'..mess
+ end
if logfile then pcall(write_log, mess) end
-- ignore result of pcall: we can do nothing about failure
error(mess, 2)
@@ -151,38 +163,24 @@ function warn(mess)
print(mess)
end
-function dbg(mess)
- if options.debug then
- warn(mess)
- end
-end
-
---[[
-
-function dbg_opt()
- if options.debug then
- local mess = ''
- for _, k in ipairs({'bbox', 'gray', 'page'}) do
- mess = mess.. ' ' .. k .. ': ' .. tostring(options.k)
- end
- dbg(mess)
- end
-end
-
---]]
+-- function dbg(mess)
+-- if options.debug then
+-- warn(mess)
+-- end
+-- end
-- file- and path utilities ----------------
-function ep_shortname(path)
- if os.type=='unix' then
- return path
- else
- -- shortname appears not to work under miktex
- -- so return original path as a fallback
- local sp = lfs.shortname(path)
- return sp or path
- end
-end
+-- function ep_shortname(path)
+-- if os.type=='unix' then
+-- return path
+-- else
+-- -- shortname appears not to work under miktex
+-- -- so return original path as a fallback
+-- local sp = lfs.shortname(path)
+-- return sp or path
+-- end
+-- end
-- prepend or append dir to path if necessary
function maybe_add_path(dir, append)
@@ -288,41 +286,22 @@ end -- absolute_path
-- we return the original string, although we only need a yes or no answer
function find_on_path (prog)
- if os.type ~= 'unix' then
- errror('find_on_path: this is a unix-only function')
- end
- for d in string.gmatch(os.getenv('PATH'), '[^:]+') do
- if lfs.isfile(d..'/'..prog) then
- return prog
+ if os.type == 'unix' then
+ for d in string.gmatch(os.getenv('PATH'), '[^:]+') do
+ if lfs.isfile(d..'/'..prog) then
+ return prog
+ end
+ end
+ else
+ for d in string.gmatch(os.getenv('PATH'), '[^;]+') do
+ if lfs.isfile(d..'\\'..prog) then
+ return prog
+ end
end
end
return false
end -- find_on_path
--- On Windows, we do not count so much on the existing searchpath
--- so is_prog tests whether the file exists and is an exe file.
-
-function is_prog (path)
- -- 1. test for and if necessary add extension
- -- 2. test for existence
- -- 3. returns either false or absolute path
- if os.type ~= 'windows' then
- errror('is_prog: this is a Windows-only function')
- end
- if not path then
- return false
- end
- if not string.lower(string.sub(path,-4,-1))=='.exe' then
- path = path..'.exe'
- end
- path = absolute_path(path)
- if not (path and lfs.isfile(path)) then
- return false
- else
- return path
- end
-end -- is_prog
-
function dir_writable(d)
-- because directory attributes do not tell the whole story,
-- we actually try to create a file in the directory.
@@ -368,10 +347,8 @@ function system_tempdir ()
d = '/tmp'
end
end
- -- if d then dbg('system tempdir: '..d) end
-- cygwin: $TEMP=/tmp, root '/' being root of cygwin installation
if d and not dir_writable(d) then
- dbg('unfortunately, '..d..' not writable')
d = false
end
return d
@@ -424,6 +401,7 @@ function tab_combine (t)
return res
end -- tab_combine
+-- files ----------------------------------------------------
-- Copy a file in chunks, with optional length and offset.
-- Since files may be very large, we copy them piecemeal.
-- An initial chunk of size bufsize should be plenty to include
@@ -434,6 +412,22 @@ function slice_file(source, dest, len, offset, mode)
-- specifying false as value
-- Assume caller ensured parameters of correct type.
-- We do not allow negative offsets.
+
+ local copy2self = false
+ if source==dest then copy2self = true end
+ if os.type=='unix' and
+ lfs.attributes(source,'ino')==lfs.attributes(dest,'ino') then
+ copy2self = true
+ end
+ if copy2self and not len and not offset and mode~='ab' then
+ return -- nothing to do
+ elseif copy2self then
+ errror('slice_file invoked with identical source and destination '..
+ source..' and non-simple copy')
+ end
+ -- in practice any_to_any already checks for this.
+ -- in addition, the main program makes a backup if infile==outfile
+
local sz = lfs.attributes(source, 'size')
if not offset then
offset = 0
@@ -444,8 +438,6 @@ function slice_file(source, dest, len, offset, mode)
len = sz - offset
end
if not mode then mode = 'wb' end
- -- dbg('copying '..len..' bytes of '..source..' to '..dest..' from '..offset
- -- ..' in '..mode..' mode')
local buffer=''
local s=io.open(source, 'rb')
s:seek('set', offset)
@@ -474,6 +466,12 @@ function move_or_copy(source, dest)
warn('Removing old '..dest)
os.remove(dest) -- in case of failure, go ahead anyway
end
+ -- Windows: try first renaming in-place before moving to the right directory
+ if os.type == 'windows' then
+ if os.rename(source, source..'.renamed') then
+ source = source..'.renamed'
+ end
+ end
if not os.rename(source, dest) then
slice_file(source, dest) -- bails out on failure
local ok, err_mess = os.remove(source)
@@ -498,10 +496,8 @@ function mktemp(ext)
for i=0,99 do
froot = string.format('%02d.', i)
fname = froot..ext
- -- dbg('New temp file '..fname..'?')
if ext~='tex' then
if not lfs.isfile(fname) then
- -- dbg(fname..' available')
f = io.open(fname, 'wb')
if not f then
errror('Cannot create temporary file '..fname)
@@ -535,11 +531,9 @@ function mktemp(ext)
end
function waitasec()
- -- stupid windows file locking
- if os.type=='windows' and (tonumber(os.uname().version) or 0)>=6 then
+ -- stupid windows file locking; assume vista or later
+ if os.type=='windows' then
os.execute('timeout /t 1 /nobreak >nul')
- elseif os.type=='windows' then
- os.execute('ping -n 1 localhost >NUL')
-- else do nothing
end
-- error checking pointless
@@ -573,9 +567,9 @@ function cleantemp()
end
end
--- epsdevice -----------------------
+-- gs_epsdevice -----------------------
-function epsdevice()
+function gs_epsdevice()
local gh = io.popen(gs_prog..' -help')
local s = gh:read("*a")
gh:close()
@@ -599,17 +593,12 @@ function write_settings (file)
end
else -- stdout to be captured by epspdftk
f = io.output()
- if os.type=='windows' and not auto_psp then
- f:write('psp_config = yes', eol)
- end
end
for k, v in pairs(settings) do
- if k ~= 'pdftops_prog' or os.type=='windows' then
- if descriptions[k] and file then
- f:write(eol, '# ', descriptions[k], eol)
- end
- f:write(k, ' = ', tostring(v), eol)
+ if descriptions[k] and file then
+ f:write(eol, '# ', descriptions[k], eol)
end
+ f:write(k, ' = ', tostring(v), eol)
end
if file then
f:close()
@@ -634,15 +623,12 @@ function read_settings(file)
f:close()
end
if not contents or contents=='' then
- dbg('No settings read')
return
- -- else
- -- dbg(contents)
end
-- remove initial \r and \n characters
contents = string.gsub(contents, '^[\r\n]*', '');
-- gmatch chops contents into series of non-line-ending characters
- -- possibly followed by line-ending characters.
+ -- possibly followed by line-ending characters i.e. in lines
local k, v, vl, vnum
for l in string.gmatch(contents, '[^\r\n]+[\r\n]*') do
l = string.match(l,'[^\r\n]*')
@@ -660,31 +646,6 @@ function read_settings(file)
if in_list(v, pdf_versions) then
settings[k] = v
end
- --[[
- elseif k == 'ignore_hires_bb' then
- vl = string.lower(string.sub(v,1,1))
- if v == 0 or vl == 'n' or vl == 'f' then
- settings.use_hires_bb = true
- elseif v == 1 or vl == 'y' or vl == 't' then
- settings.use_hires_bb = false
- end
- elseif k == 'use_hires_bb' then
- vl = string.lower(string.sub(v,1,1))
- if v == 0 or vl == 'n' or vl == 'f' then
- settings.use_hires_bb = false
- elseif v == 1 or vl == 'y' or vl == 't' then
- settings.use_hires_bb = true
- end
- elseif k == 'bb_spread' then
- vnum = tonumber(v)
- if vnum and vnum >= 0 then
- settings[k] = math.modf(v) -- truncate to integer
- end
- --]]
- elseif k == 'pdftops_prog' then
- if is_miktex then
- settings.pdftops_prog = is_prog(v)
- end -- else ignore
elseif k == 'ignore_pdftops' then
vl = string.lower(string.sub(v,1,1))
if v == 0 or vl == 'n' or vl == 'f' then
@@ -707,13 +668,27 @@ function read_settings(file)
settings.pdf_viewer = v
elseif k == 'default_dir' then
settings.default_dir = v
- elseif k == 'default_dir' then
- settings.default_dir = v
end -- test for k
end -- not matching ^#
end -- for
end -- read settings
+function version_added()
+ for _, v in pairs(pdf_options) do
+ if string.find(v, '-dCompatibilityLevel') then
+ return true
+ end
+ end
+ return false
+end
+
+function maybe_add_version_parameter()
+ if options.type=='pdf' and not options.bbox and settings.pdf_version and
+ settings.pdf_version~='default' and not version_added() then
+ table.insert(pdf_options, '-dCompatibilityLevel#'..settings.pdf_version)
+ end
+end
+
-- gui: reading and writing settings -----------
function gui(action)
@@ -733,12 +708,19 @@ end
-- boundingboxes ---------------------------------------------------
--- [HR]Bb.coords names now same as those of epdf PDFRectangle
+-- [HR]Bb.coords names same as those of epdf PDFRectangle
+-- but the new pdfe simply uses an array
Bb = {}
Bb.coords = {'x1', 'y1', 'x2', 'y2'}
function Bb:from_rect(r)
+ -- also handle the case that r is a 4-element array:
+ if not r.x1 then r.x1 = r[1] end
+ if not r.y1 then r.y1 = r[2] end
+ if not r.x2 then r.x2 = r[3] end
+ if not r.y2 then r.y2 = r[4] end
+
for _,k in ipairs(self.coords) do
if not r[k] or type(r[k])~='number' then
errror('from_rect called with illegal parameters')
@@ -778,53 +760,6 @@ function Bb:from_comment(s)
return Bb:from_rect(b)
end
---[[ some no-longer-used bbox functions
-
-function Bb:copy ()
- local b = {}
- for _,k in ipairs(self.coords) do b[k] = self[k] end
- setmetatable(b, {__index=self})
-end
-
-function Bb:width()
- return self.x2 - self.x1
-end
-
-function Bb:height()
- return self.y2 - self.y1
-end
-
-function Bb:expand ()
- -- in-place expansion; does not return an object.
- -- any point in preserving non-negativity?
- local i = settings.bb_spread
- if i and i>0 then
- -- if x1~=0 then x1 = x1-1 end
- -- if y1~=0 then y1 = y1-1 end
- self.x1 = self.x1 - 1
- self.y1 = self.y1 - 1
- self.x2 = self.x2 + 1
- self.y2 = self.y2 + 1
- end
-end
-
--- gs handles this now
--- call this via pcall
-function Bb:wrapper()
- local fn = mktemp('ps')
- local f = io.open(fn, 'wb')
- f:write(string.format('%%%%BoundingBox: 0 0 %d %d\n',
- self:width(), self:height())
- .. string.format('<< /PageSize [%d %d] >> setpagedevice\n',
- self:width(), self:height())
- .. 'gsave\n'
- .. string.format('%d %d translate\n', -self.x1, -self.y1))
- f:close()
- return fn
-end
-
---]]
-
function Bb:nonnegative ()
return self.x1>=0 and self.y1>=0
end
@@ -842,6 +777,12 @@ HRBb = {}
setmetatable(HRBb, {__index=Bb})
function HRBb:from_rect(r)
+ -- also handle the case that r is a 4-element array:
+ if not r.x1 then r.x1 = r[1] end
+ if not r.y1 then r.y1 = r[2] end
+ if not r.x2 then r.x2 = r[3] end
+ if not r.y2 then r.y2 = r[4] end
+
for _,k in ipairs(self.coords) do
if not r[k] or type(r[k])~='number' then
errror('from_rect called with illegal parameters')
@@ -865,7 +806,6 @@ HRBb.bb_pat = '^%s*%%%%HiResBoundingBox:'
HRBb.bb_end = '^%s*%%%%HiResBoundingBox:%s*%(%s*atend%s*%)%s*$'
function HRBb:from_comment(s)
- -- dbg('hrbb from '..s)
local p = self.bb_pat..'%s*([-+.%deE]+)'..string.rep('%s+([-+.%deE]+)',3)
local b = {}
b.x1, b.y1, b.x2, b.y2 = string.match(s, p)
@@ -878,6 +818,10 @@ function HRBb:from_comment(s)
return HRBb:from_rect(b)
end
+function HRBb:nonnegative ()
+ return self.x1>=0 and self.y1>=0
+end
+
function HRBb:comment()
return string.format('%%%%HiResBoundingBox: %f %f %f %f',
self.x1, self.y1, self.x2, self.y2)
@@ -885,10 +829,6 @@ end
--[[
-function HRBb:expand ()
- errror('HRBb:expand not available')
-end
-
-- no longer used: gs handles this
-- call this one also via pcall
function HRBb:wrapper()
@@ -910,10 +850,10 @@ end
-- manipulating eps/ps/pdf files -----------------------------------
-function identify(path)
- local f = io.open(path, 'rb')
+function identify()
+ local f = io.open(infile, 'rb')
if not f then
- errror('Failure to open '..path..' for identification')
+ errror('Failure to open '..infile..' for identification')
end
local filestart= f:read(23)
f:close()
@@ -925,7 +865,7 @@ function identify(path)
return 'eps'
elseif string.match(filestart,'^%%!PS%-Adobe%-%d%.%d') then
for _, p in ipairs({'.eps', '.epi', '.epsi', '.epsf'}) do
- if string.sub(string.lower(path), -1-string.len(p),-1) == p then
+ if string.sub(string.lower(infile), -1-string.len(p),-1) == p then
return 'eps'
else
return 'ps'
@@ -940,45 +880,52 @@ function identify(path)
end -- identify
function pdf_props(path)
- local pdfdoc = epdf.open(path)
- if not pdfdoc then
- errror('epdf.open failed on '..path)
+ local pdfdoc, pgs, maver, miver
+ if pdfe then
+ pdfdoc = pdfe.open(path)
+ if pdfdoc then
+ pgs = pdfe.getnofpages(pdfdoc)
+ maver, miver = pdfe.getversion(pdfdoc)
+ end
+ if not (pdfdoc and pgs and maver and miver) then
+ errror('pdfe failed to get information about '..path)
+ end
+ pdfe.close(pdfdoc)
+ else
+ local cat
+ pdfdoc = epdf.open(path)
+ if pdfdoc then
+ cat = pdfdoc:getCatalog()
+ if cat then
+ pgs = cat:getNumPages()
+ end
+ maver = pdfdoc:getPDFMajorVersion()
+ miver = pdfdoc:getPDFMinorVersion()
+ end
+ if not (pdfdoc and pgs and maver and miver) then
+ errror('epdf failed to get information about '..path)
+ end
+ -- epdf.close(pdfdoc)
end
-- if os.type=='windows' then waitasec() end
- local cat = pdfdoc:getCatalog()
- if not cat then
- errror('Cannot open pdf catalog of '..path)
- end
- local pg = cat:getNumPages()
- if not pg then
- errror('Cannot read n. of pages of '..path)
- end
- local maver = pdfdoc:getPDFMajorVersion()
- if not maver then
- errror('Cannot read pdf major version of '..path)
- end
- local miver = pdfdoc:getPDFMinorVersion()
- if not miver then
- errror('Cannot read pdf minor version of '..path)
- end
if maver > 1 then
print(path..' has pdf major version \n'..tostring(maver)..
' which is unsupported;\n'..
'Continuing with fingers crossed...')
end
- return pg, miver, maver
-end
+ return pgs, miver, maver
+end -- pdf_props
-function info (infile)
- local intype = identify(infile)
+function info()
+ local intype = identify()
if not intype then
print(infile..' has an unsupported filetype.')
elseif intype~='pdf' then
print(infile..' has type '..intype..'.')
else
- local pg, miver, maver = pdf_props(infile)
+ local pgs, miver, maver = pdf_props(infile)
print(infile..' has type pdf, version '..tostring(maver)..
- '.'..tostring(miver)..' and has '..tostring(pg)..' pages.')
+ '.'..tostring(miver)..' and has '..tostring(pgs)..' pages.')
end
os.exit()
end
@@ -990,7 +937,6 @@ PsPdf = {}
-- creators
function PsPdf:new(ext)
- -- dbg('PsPdf:new')
local psp = {}
setmetatable(psp, {__index = self})
-- assign temp file
@@ -1013,7 +959,6 @@ function PsPdf:new(ext)
end -- PsPdf:new
function PsPdf:from_path(path)
- -- dbg('PsPdf:from_path')
local psp = {}
setmetatable(psp, {__index = self})
psp.path = path
@@ -1031,23 +976,40 @@ function PsPdf:from_path(path)
end
psp.bb = false
psp.hrbb = false
- -- calculate when needed
+ -- only calculate when needed
return psp
end -- PsPdf:from_path
---[===[ getting boundingbox property from file itself --------------
+-- do we need to downgrade the pdf to a lower version?
+-- consider [e]ps lower than any pdf version
+function PsPdf:to_downgrade()
+ if self.type~='pdf' then
+ return false
+ elseif options.type~='pdf' then
+ return true
+ elseif settings.pdf_version=='default' then
+ return false
+ elseif settings.pdf_version~='default' and
+ self.maver+0.1*self.miver-0.001 > tonumber(settings.pdf_version) then
+ -- -0.001: exact binary representation of pdf_version not guaranteed
+ return true
+ else
+ return false
+ end
+end
+
+--[[ getting boundingbox property from file itself --------------
-find_bb_simple: use only for eps PsPdf objects we generated
+get_bb_simple: use only for eps PsPdf objects we generated
ourselves, so we can assume that the bbox comments are in the header
and the hires bb lies within the lores bb.
Of course the file itself is not rewritten.
---]===]
+--]]
-function PsPdf:find_bb_simple()
- -- dbg('PsPdf:find_bb_simple')
+function PsPdf:get_bb_simple()
if self.type~='eps' then
- errror('find_bb_simple called with non-eps file '..self.path)
+ errror('get_bb_simple called with non-eps file '..self.path)
end
self.bb = false
self.hrbb = false
@@ -1074,9 +1036,7 @@ function PsPdf:find_bb_simple()
return self -- no real need for a return value
end
-function PsPdf:bb_from_gs(pg)
-
- -- dbg('bb_from_gs '..pg)
+function PsPdf:bb_from_gs()
if self.type=='ps' then
errror('bb_from_gs called with ps file '..self.path)
@@ -1086,19 +1046,25 @@ function PsPdf:bb_from_gs(pg)
end
if self.type=='eps' and not self.bb:nonnegative() then
errror('bb_from_gs called on ' .. self.path ..
- ' which has some negative boundingbox coordinates')
+ ' which has some negative boundingbox coordinates')
+ -- any_to_any should guard against such an invocation
end
- -- A pdf can also have negative ...Box coordinates, but apparently
- -- for pdf the bbox returned by gs is relative to the lower-left corner.
- -- Anyhow, with pdf it all works out even with negative coordinates.
-- Since Ghostscript writes the boundingbox comments to stderr,
-- we need a shell to intercept this output:
local bb_file = mktemp('dsc')
- local cmdline = gs_prog .. ' ' .. table.concat(gs_options,' ')
+ -- a somewhat low resolution parameter may help gs
+ -- deal with eps files with large coordinates
+ -- but this may impact the accuracy of the HRBb
+ local cmdline
+ if self.type=='eps' and (self.bb.x2 > 850 or self.bb.y2 > 850) then
+ cmdline = gs_prog .. ' -r300 ' .. table.concat(gs_options,' ')
+ else
+ cmdline = gs_prog .. ' ' .. table.concat(gs_options,' ')
+ end
if self.type=='pdf' then
- if not pg then pg=1 end
+ pg = options.page or 1
cmdline = cmdline .. ' -dFirstPage#' .. tostring(pg) ..
' -dLastPage#' .. tostring(pg)
end
@@ -1145,7 +1111,8 @@ end
function PsPdf:eps_clean()
-- return a PsPdf object referring to a new file
- -- without a preview header and with boundingbox(es) in the header
+ -- without a preview header and with boundingbox(es) in the header.
+ -- return a new file even if no changes were needed.
local function bytes2num (s, i)
-- convert substring s[i..i+3] to a number.
@@ -1158,7 +1125,6 @@ function PsPdf:eps_clean()
-- + string.byte(s,i+1)) + string.byte(s,i))
end
- -- dbg('PsPdf:eps_clean '..self.path)
if self.type~='eps' and self.type~='epsPreview' then
errror('epsclean called with non-eps file ' .. self.path)
end
@@ -1182,14 +1148,12 @@ function PsPdf:eps_clean()
if not offset then
errror('Could not read preview header of ' .. self.path)
end
- -- dbg(tostring(offset)..' '..tostring(ps_length))
end
-- create the PsPdf object which is to be returned
local psp
psp = PsPdf:new('eps')
- -- dbg(psp.path)
-- read an initial and if necessary a final chunk of the file
-- to find boundingbox comments.
@@ -1218,9 +1182,7 @@ function PsPdf:eps_clean()
-- remaining, unscanned length of input buffer slurp
local unscanned = math.min(ps_length,bufsize)
- -- dbg('bytes to be read: '..tostring(unscanned))
slurp = fin:read(unscanned)
- -- dbg('Read from '..self.path..': '..string.len(slurp)..' bytes')
-- unnecessary:
psp.bb = nil
@@ -1237,18 +1199,14 @@ function PsPdf:eps_clean()
atend = true
i_bb = i
elseif string.match(l, Bb.bb_pat) then
- -- dbg(l)
psp.bb = Bb:from_comment(l)
- -- dbg(psp.bb:comment())
-- from_comment errors out on failure; no need to check return value
i_bb = i
elseif string.match(l, HRBb.bb_end) then
hr_atend = true
i_hrbb = i
elseif string.match(l, HRBb.bb_pat) then
- -- dbg(l)
psp.hrbb = HRBb:from_comment(l)
- -- dbg(psp.hrbb:comment())
i_hrbb = i
end -- bbox line
end -- eol/non-eol
@@ -1281,14 +1239,11 @@ function PsPdf:eps_clean()
j_bb, j_hrbb, j_end = false, false, false
while unscanned>0 do
j = j - 1
- -- dbg(j)
if string.find(slurp,'[\n\r]', string.len(slurp)) then
- -- dbg('eol(s)')
slurp,l = string.match(slurp, '^(.-)([\n\r]+)$')
-- '-': non-greedy matching
else
slurp,l = string.match(slurp, '^(.-)([^\n\r]+)$')
- -- dbg(l)
if string.match(l, Bb.bb_pat) then
psp.bb = Bb:from_comment(l)
j_bb = j
@@ -1318,7 +1273,6 @@ function PsPdf:eps_clean()
post_lines[j_bb+1] = ''
end
if hr_atend and j_hrbb then
- -- dbg(psp.hrbb:comment())
-- pre_lines[i_hrbb] = post_lines[j_hrbb]
pre_lines[i_hrbb] = psp.hrbb:comment()
post_lines[j_hrbb] = ''
@@ -1340,19 +1294,14 @@ end -- eps_clean
function PsPdf:eps_crop()
- -- not a proper conversion, although
- -- we use the Ghostscript bbox device for a tight boundingbox.
+ -- conversion is not done by an external program, although
+ -- we invoke Ghostscript with a bbox device for a tight boundingbox.
-- We use both the regular and the hires boundingbox from gs.
-- The eps should already have been cleaned up by eps_clean,
-- and the current boundingbox should not contain negative coordinates,
-- otherwise the bbox output device may give incorrect results.
-- Only the boundingbox in the eps is rewritten.
- -- dbg('PsPdf:eps_crop '..self.path)
- if self.type~='eps' then
- errror('eps_crop called with non-eps file ' .. self.path)
- end
-
-- create the PsPdf object which is to be returned
local psp = PsPdf:new('eps')
@@ -1377,9 +1326,7 @@ function PsPdf:eps_crop()
-- remaining, unscanned length of input buffer slurp
local unscanned = math.min(ps_length,bufsize)
- -- dbg('bytes to be read: '..tostring(unscanned))
slurp = fin:read(unscanned)
- -- dbg('Read from '..self.path..': '..string.len(slurp)..' bytes')
i, i_bb, i_hrbb = 0, false, false
while unscanned>0 do
i = i+1
@@ -1421,17 +1368,21 @@ function PsPdf:eps_crop()
slice_file(self.path, psp.path,
lfs.attributes(self.path,'size') - offset, offset, 'ab')
options.bbox = false
- -- dbg('eps_crop from '..self.path..' to '..psp.path)
return psp
end -- eps_crop
---[===[ real conversions involving a single call of gs, pdftops or texlua
+--[[
+
+most of these conversions involve a single invocation of gs, pdftops or texlua
Each conversion fullfills all options that it can: gray, bbox and
page. gray when converting to pdf, bbox when converting from eps or
from pdf to pdf and page when converting from pdf. It then sets the
fullfilled option(s) to false.
+We make sure to do the tight boundingbox before a file format downgrade:
+rasterization of the page or graphic frustrates boundingbox calculation.
+
We like to preserve fonts as fonts. gs does this when generating
pdf, but may fail for fonts such as cid and large truetype when
generating PostScript. In such cases, pdftops may succeed. However,
@@ -1439,66 +1390,82 @@ it seems that if the page contains an element that does not cleanly
convert, pdftops simply rasterizes the entire page, and that this
choice is made per page.
---]===]
+--]]
--- TODO: multiple pages?
--- (means additional parameter checking)
+-- Converting from pdf to pdf using luatex; no grayscaling here
--- Converting from pdf to pdf using luatex; no grayscaling
+function PsPdf:getpgbox()
+ if options.page and options.page > self.pages then
+ errror('PsPdf:getpgbox called with non-existent page '.. options.page)
+ end
+ local pg = options.page or 1
+ local bb, hrbb, pgbox, pdfdoc, ppage
+ if pdfe then
+ pdfdoc = pdfe.open(self.path)
+ if pdfdoc then
+ ppage = pdfe.getpage(pdfdoc, pg)
+ if not ppage then errror('did not get page') end
+ if ppage then
+ pgbox = pdfe.getbox(ppage, 'MediaBox')
+ if not pgbox then
+ pgbox = pdfe.getbox(ppage, 'CropBox')
+ if not pgbox then
+ pgbox = pdfe.getbox(ppage, 'TrimBox')
+ if not pgbox then
+ errror('No box acquired')
+ end
+ end
+ end
+ end
+ end
+ pdfe.close(pdfdoc)
+ else
+ local cat
+ pdfdoc = epdf.open(self.path)
+ if pdfdoc then
+ cat = pdfdoc:getCatalog()
+ if cat then
+ ppage = cat:getPage(pg)
+ if ppage then
+ pgbox = ppage:getMediaBox()
+ if not pgbox then
+ pgbox = ppage:getCropBox()
+ if not pgbox then
+ pgbox = ppage:getTrimBox()
+ end
+ end
+ end
+ end
+ end
+ end
+ -- normalization and further checks, including for non-nil,
+ -- by HRBb:from_rect, which errors out on failures
+ if pgbox then
+ pgbox = HRBb:from_rect(pgbox)
+ -- this also converts numeric array indices to x1 ... y2 if necessary
+ else
+ errror('Cannot get page box from '..self.path..' page '..pg)
+ end
+ return pgbox
+end -- PsPdf:getpgbox
function PsPdf:pdf_crop()
- -- options to be fulfilled: page, boundingbox
- -- only called directly.
- -- embeds the pdf with crop parameters into a new (lua)tex document
- -- dbg('PsPdf:pdf_crop '..self.path)
- if not (options.bbox or options.page) then
- return self
- end
+ -- options to be fulfilled: page, boundingbox if possible
+ -- embeds the pdf with boundingbox parameters into a new (lua)tex document
if options.page and options.page > self.pages then
errror('PsPdf:pdf_crop called with non-existent page '.. options.page)
end
- local pg = options.page or 1
- local bb, hrbb, pgbox, pgboxname
- do
- local pdoc, pcat, ppage
- -- we already have the pages, miver and maver properties
- -- but need properties of the desired page as well
- pdoc = epdf.open(self.path)
- if not pdoc then
- errror('Epdf: cannot open '..self.path)
- end
- -- dbg('about to get catalog')
- pcat = pdoc:getCatalog()
- if not pcat then
- errror('Cannot open catalog of '..self.path)
- end
- -- dbg('got catalog')
- ppage = pcat:getPage(pg)
- if not ppage then
- errror('Epdf: cannot open page object '..tostring(pg)..' of '..self.path)
- end
- pgboxname = 'trimbox'
- pgbox = ppage:getTrimBox()
- if not pgbox then
- pgboxname = 'cropbox'
- pgbox = ppage:getCropBox()
- end
- if not pgbox then
- pgboxname = 'mediabox'
- pgbox = ppage:getMediaBox()
- end
- -- normalization and further checks, including for non-nil,
- -- by Bb:from_rect, which errors out on failures
- pgbox = HRBb:from_rect(pgbox)
- end
- if options.bbox then
- bb, hrbb = self:bb_from_gs(pg)
+ local bb, hrbb, pgbox
+ pgbox = self:getpgbox()
+ if options.bbox and pgbox:nonnegative() then
+ bb, hrbb = self:bb_from_gs()
+ options.bbox = false
else
hrbb = pgbox
end
- -- luatex on searchpath
+ -- luatex is on searchpath
local luatex_prog = 'luatex'
-- write TeX file which includes cropped pdf page
@@ -1552,12 +1519,10 @@ function PsPdf:pdf_crop()
pieces[6] = [[}%
\pdfrefximage\pdflastximage
}%
- \pdfhorigin=-#2bp\relax
+ \pdfhorigin=#2bp\relax
\pdfvorigin=#3bp\relax
\pagewidth=#4bp\relax
- \advance\pagewidth by -#2bp\relax
\pageheight=#5bp\relax
- \advance\pageheight by -#3bp\relax
\ht0=\pageheight
\shipout\box0\relax
}
@@ -1567,7 +1532,7 @@ function PsPdf:pdf_crop()
\csname @@end\endcsname
\end
]],
- options.page or 1, hrbb.x1, hrbb.y1, hrbb.x2, hrbb.y2)
+ options.page or 1, -hrbb.x1, hrbb.y1, hrbb.x2-hrbb.x1, hrbb.y2-hrbb.y1)
local textemp = mktemp('tex') -- this also took care of pdf:
local pdftemp = string.gsub(textemp, 'tex$', 'pdf')
@@ -1577,18 +1542,20 @@ function PsPdf:pdf_crop()
f:write(table.concat(pieces, ''))
f:close()
local cmd, res, psp
- if os.type=='unix' then
+ -- if os.type=='unix' then
cmd = {luatex_prog, '--safer', '--no-shell-escape', textemp}
log_cmd(cmd)
res = os.spawn(cmd)
- else
- cmd = luatex_prog..' --safer --no-shell-escape '..textemp
- log_cmd({cmd})
- -- os.execute('timeout /t 1 /nobreak >nul')
- res = os.execute(cmd)
- end
- if res and res==0 and lfs.attributes(pdftemp, 'size')>0 then
+ -- else
+ -- cmd = luatex_prog..' --safer --no-shell-escape '..textemp
+ -- log_cmd({cmd})
+ -- -- os.execute('timeout /t 1 /nobreak >nul')
+ -- res = os.execute(cmd)
+ -- end
+ if res and res==0 and lfs.attributes(pdftemp, 'size')>0 then
psp = PsPdf:from_path(pdftemp)
+ options.bbox = false
+ options.page = false
return psp
else
errror('pdf_crop failed on '..self.path)
@@ -1598,33 +1565,26 @@ end
function PsPdf:eps_to_pdf()
-- option to be fulfilled: gray
- -- set target and pdf version if applicable
- -- dbg('PsPdf:eps_to_pdf '..self.path)
+ -- set target and maybe pdf version if applicable
if self.type~='eps' then
errror('PsPdf:eps_to_pdf called for non-eps file '.. self.path)
end
local cmd
- if options.bbox and self.bb:nonnegative() then
- self = self:eps_crop() -- this sets options.bbox to false
- end
+ maybe_add_version_parameter()
cmd = tab_combine({{gs_prog}, gs_options, pdf_options})
- -- dbg(table.concat(cmd,' '))
if options.gray then
cmd = tab_combine({cmd, gray_options})
- -- dbg(table.concat(cmd,' '))
- options.gray = false
end
- table.insert(cmd, '-dEPSCrop') -- always hires bb
- -- dbg(table.concat(cmd,' '))
+ table.insert(cmd, '-dEPSCrop') -- uses existing hires bb
local psp = PsPdf:new('pdf')
table.insert(cmd, '-sOutputFile#'..psp.path)
- -- dbg(table.concat(cmd,' '))
- cmd = tab_combine({cmd, pdf_tail_options, {self.path}})
- -- dbg(table.concat(cmd,' '))
+ cmd = tab_combine({cmd, pdf_tail_options})
+ table.insert(cmd, self.path)
log_cmd(cmd)
local res = os.spawn(cmd)
if res and res==0 and lfs.attributes(psp.path, 'size')>0 then
psp.pages, psp.miver, psp.maver = pdf_props(psp.path)
+ options.gray = false
return psp
else
errror('eps_to_pdf failed on '..self.path)
@@ -1632,13 +1592,14 @@ function PsPdf:eps_to_pdf()
end -- eps_to_pdf
-- Converting from pdf to pdf with grayscaling and/or page selection
+-- or just eliminating negative boundingbox
function PsPdf:pdf_to_pdf()
- -- option to be fulfilled: gray and optionally page.
+ -- option to be fulfilled: gray, optionally page
+ -- side effect: makes bbox non-negative.
-- do not call this just for page selection because
-- pdf_crop can do this in a less invasive manner
- -- dbg('PsPdf:pdf_to_pdf '..self.path)
if self.type~='pdf' then
errror('PsPdf:pdf_to_pdf called for non-pdf file '.. self.path)
end
@@ -1647,28 +1608,24 @@ function PsPdf:pdf_to_pdf()
errror('PsPdf:pdf_to_pdf called with non-existent page '.. options.page)
end
cmd = tab_combine({{gs_prog}, gs_options, pdf_options})
- -- dbg(table.concat(cmd,' '))
if options.gray then
cmd = tab_combine({cmd, gray_options})
- -- dbg(table.concat(cmd,' '))
- options.gray = false
end
if options.page then
table.insert(cmd, '-dFirstPage#'..tostring(options.page))
table.insert(cmd, '-dLastPage#'..tostring(options.page))
- -- dbg(table.concat(cmd,' '))
- options.page = false
end
+ maybe_add_version_parameter()
local psp = PsPdf:new('pdf')
table.insert(cmd, '-sOutputFile#'..psp.path)
cmd = tab_combine({cmd, pdf_tail_options})
- -- dbg(table.concat(cmd,' '))
table.insert(cmd, self.path)
- -- dbg(table.concat(cmd,' '))
log_cmd(cmd)
local res = os.spawn(cmd)
if res and res==0 and lfs.attributes(psp.path, 'size')>0 then
psp.pages, psp.miver, psp.maver = pdf_props(psp.path)
+ options.gray = false
+ options.page = false
return psp
else
errror('pdf_to_pdf failed on '..self.path)
@@ -1677,34 +1634,19 @@ end -- pdf_to_pdf
function PsPdf:pdf_to_eps()
- -- options to be fulfilled: bbox and page
- -- dbg(tostring(settings.pdftops_prog))
- -- dbg('pdf_to_eps '..self.path)
+ -- options to be fulfilled: page
local psp = PsPdf:new('eps')
local cmd, res
- local page = false
- if self.pages > 1 then
- if options.page then
- page = options.page
- if page > self.pages then
- errror('PsPdf:pdf_to_eps called with non-existant page '..
- tostring(page))
- end
- else
- page = 1
- end
- page = tostring(page)
- end -- self.pages > 1
+ -- any_to_any already checked the validity and relevance of options.page
if pdftops then
- if page then
+ if options.page then
cmd = tab_combine({{pdftops}, ps_options,
- {'-f', page, '-l', page,
+ {'-f', options.page, '-l', options.page,
'-eps', self.path, psp.path}})
else
cmd = tab_combine({{pdftops}, ps_options,
{'-eps', self.path, psp.path}})
end
- options.page = false
log_cmd(cmd)
if os.type=='windows' then
-- suppress console output of 'No display font for...' messages,
@@ -1718,6 +1660,7 @@ function PsPdf:pdf_to_eps()
end
if res and res==0 and lfs.attributes(psp.path, 'size')>0 then
psp.pages = 1
+ options.page = false
else
errror('pdf_to_eps failed on '..self.path)
end
@@ -1766,37 +1709,37 @@ function PsPdf:pdf_to_eps()
if not fout then errror('Cannot write new file '.. newfile) end
fout:write(table.concat(pre_lines))
fout:close()
- -- dbg('fixing '..psp.path..' to '..newfile)
slice_file(psp.path, newfile,
lfs.attributes(psp.path,'size') - offset, offset, 'ab')
psp.path = newfile
end -- needs_fixing
else -- use ghostscript
- local epsdev = epsdevice()
+ local epsdev = gs_epsdevice()
if not epsdev then
errror('Conversion to eps not supported by this ghostscript')
end
cmd = tab_combine({{gs_prog}, gs_options,
{'-sDEVICE#'..epsdev, '-dHaveTrueTypes=true', '-dLanguageLevel#3'}})
- -- the restrictions on eps files are apparently
- -- incompatible with grayscaling
+ if options.gray then
+ cmd = tab_combine({cmd, gray_options})
+ end
if options.page then
table.insert(cmd, '-dFirstPage='..options.page)
table.insert(cmd, '-dLastPage='..options.page)
end
table.insert(cmd, '-sOutputFile='..psp.path)
table.insert(cmd, self.path)
- options.page = false
log_cmd(cmd)
res = os.spawn(cmd)
if res and res==0 and lfs.attributes(psp.path, 'size')>0 then
psp.pages = 1
+ options.page = false
+ options.gray = false
else
errror('pdf_to_eps failed on '..self.path)
end
end -- use ghostscript
- psp:find_bb_simple()
- if options.bbox then psp = psp:eps_crop() end
+ psp:get_bb_simple()
return psp
end -- pdf_to_eps
@@ -1804,7 +1747,6 @@ end -- pdf_to_eps
function PsPdf:ps_to_pdf()
-- options to be fulfilled: gray
- -- dbg('PsPdf:ps_to_pdf '..self.path)
if self.type~='ps' then
errror('PsPdf:ps_to_pdf called for non-ps file '.. self.path)
end
@@ -1812,7 +1754,6 @@ function PsPdf:ps_to_pdf()
cmd = tab_combine({{gs_prog}, gs_options, pdf_options})
if options.gray then
cmd = tab_combine({cmd, gray_options})
- options.gray = false
end
local psp = PsPdf:new('pdf')
table.insert(cmd, '-sOutputFile#'..psp.path)
@@ -1822,6 +1763,7 @@ function PsPdf:ps_to_pdf()
local res = os.spawn(cmd)
if res and res==0 and lfs.attributes(psp.path, 'size')>0 then
psp.pages, psp.miver, psp.maver = pdf_props(psp.path)
+ options.gray = false
return psp
else
errror('ps_to_pdf failed on '..self.path)
@@ -1832,24 +1774,14 @@ end -- PsPdf:ps_to_pdf
function PsPdf:pdf_to_ps()
-- options to be fulfilled: page and, if not using pdftops, also gray
- -- dbg('PsPdf:pdf_to_ps '..self.path)
local psp = PsPdf:new('ps')
- local page = false
- if self.pages>1 then
- if options.page and options.page > self.pages then
- errror('PsPdf:pdf_to_ps called with non-existant page '.. options.page)
- elseif options.page then
- page = tostring(options.page)
- psp.pages = 1
- end
- else
- psp.pages = self.pages
- end
+ -- options.page checked by any_to_any
+ psp.pages = self.pages
local cmd, res
if pdftops then
cmd = tab_combine({{pdftops}, ps_options})
- if page then
- cmd = tab_combine({cmd, {'-f', page, '-l', page}})
+ if options.page then
+ cmd = tab_combine({cmd, {'-f', options.page, '-l', options.page}})
end
cmd = tab_combine({cmd, {'-paper', 'match', self.path, psp.path}})
else -- use ghostscript
@@ -1857,17 +1789,14 @@ function PsPdf:pdf_to_ps()
{'-sDEVICE#ps2write', '-dHaveTrueTypes=true', '-dLanguageLevel#3'}})
if options.gray then
cmd = tab_combine({cmd, gray_options})
- -- dbg(table.concat(cmd,' '))
- options.gray = false
end
- if page then
- cmd = tab_combine({cmd, {'-dFirstPage#'..page, '-dLastPage#'..page}})
+ if options.page then
+ cmd = tab_combine({cmd,
+ {'-dFirstPage#'..options.page, '-dLastPage#'..options.page}})
end
table.insert(cmd, '-sOutputFile#'..psp.path)
- -- table.insert(cmd, '-f')
table.insert(cmd, self.path)
end
- options.page = false
log_cmd(cmd)
if os.type=='windows' and pdftops then
-- suppress console output of 'No display font for...' messages,
@@ -1880,79 +1809,123 @@ function PsPdf:pdf_to_ps()
res = os.spawn(cmd)
end
if res and res==0 and lfs.attributes(psp.path, 'size')>0 then
+ options.page = false
+ -- gs will have grayscaled if requested but pdftops will not
+ if not pdftops then options.gray = false end
return psp
else
errror('pdf_to_ps failed on '..self.path)
end
end -- PsPdf:pdf_to_ps
-function PsPdf:any_to_any()
+function PsPdf:ps_to_ps()
+ -- we do not accept a page option since we do not know
+ -- which pages are available.
+ -- if no gray option then there is no point in invoking this function.
+ local psp = PsPdf:new('ps')
+ local cmd = tab_combine({{gs_prog}, gs_options,
+ {'-sDEVICE#ps2write', '-dHaveTrueTypes=true', '-dLanguageLevel#3'}})
+ if options.gray then
+ cmd = tab_combine({cmd, gray_options})
+ end
+ table.insert(cmd, '-sOutputFile#'..psp.path)
+ table.insert(cmd, self.path)
+ log_cmd(cmd)
+ local res = os.spawn(cmd)
+ if res and res==0 and lfs.attributes(psp.path, 'size')>0 then
+ options.gray = false
+ return psp
+ else
+ errror('ps_to_ps failed on '..self.path)
+ end
+end -- PsPdf:ps_to_ps
+
+function any_to_any()
+
+ local psp = PsPdf:from_path(infile)
- -- weed out nonsense options
+ -- sanitize some options
- -- dbg('PsPdf:any_to_any '..self.path)
if options.type=='ps' then
options.bbox = false
- -- dbg('Ignoring bbox option for ps output')
end
- if options.bbox and not options.page then
+
+ if (options.bbox or options.type=='eps') and not options.page then
options.page = 1
- -- dbg('Selecting page 1 for bbox')
end
- if self.pages==1 then
+
+ if psp.type=='pdf' then
+ if options.page then
+ local pgs = pdf_props(infile)
+ if pgs<options.page then
+ errror(infile..' has only '..pgs..' page(s).')
+ elseif pgs==1 then
+ options.page = false
+ end
+ end
+ elseif psp.type=='eps' then
options.page = false
- -- dbg('dropping page selection; source is already a 1-page document')
end
- -- for _,o in ipairs({'page', 'gray', 'bbox'}) do
- -- -- if options[o] then dbg('Do option '..o) end
- -- end
+ -- psp.type=='ps': pages not yet known but maybe not needed
- -- `distiller' settings depend on whether final output is pdf
+ local do_something = false
+ if psp.type=='eps' then
+ do_something = true -- do at least cleanup
+ elseif psp.type~=options.type then
+ do_something = true
+ elseif options.page then
+ do_something = true
+ elseif options.bbox then
+ do_something = true
+ elseif options.gray then
+ do_something = true
+ elseif options.type=='pdf' then
+ if psp:to_downgrade() then
+ do_something = true
+ elseif settings.pdf_target and settings.pdf_target~=default then
+ do_something = true
+ end
+ end
+ if not do_something then
+ if infile~=outfile then
+ slice_file(infile, outfile)
+ end
+ return true
+ end
+
+ -- `distiller' settings
+ -- these depend on whether final output is pdf
-- '.setpdfwrite' is just some optimization option for ghostscript
if options.type=='pdf' then
- if settings.pdf_version~='default' then
- table.insert(pdf_options, '-dCompatibilityLevel#'..settings.pdf_version)
+ if settings.pdf_target and (settings.pdf_target~='default') then
+ table.insert(pdf_options, '-dPDFSETTINGS#/'..settings.pdf_target)
end
- -- below, consider adding <</NeverEmbed [/Times-Roman /TimesBold ...]>>
if settings.pdf_target=='screen' or settings.pdf_target=='ebook' then
- pdf_tailoptions = {'-c', '.setpdfwrite', '-f'}
+ pdf_tail_options = {'-c', '.setpdfwrite', '-f'}
-- -f ensures that the input filename is not added to the -c string
else
- pdf_tailoptions = {
- '-c', '.setpdfwrite <</NeverEmbed [ ] >> setdistillerparams', '-f'}
- end
- else
- pdf_tailoptions = {
+ pdf_tail_options = {
'-c', '.setpdfwrite <</NeverEmbed [ ] >> setdistillerparams', '-f'}
- end
-
- if options.type=='pdf' then
- table.insert(pdf_options, '-dPDFSETTINGS#/'..settings.pdf_target)
- if settings.pdf_version~='default' then
- table.insert(pdf_options, '-dCompatibilityLevel#'..settings.pdf_version)
end
- else
- table.insert(pdf_options, '-dPDFSETTINGS#/default')
end
- --[[
+ --[[ Actual conversions
each single-step conversion takes care of options it can handle
and sets those options to false.
- for boundingboxes, eps_crop is either called explicitly
- or called implicitly by another converter.
- pdf_crop is always called explicitly and always as the last step
+ Cropping a pdf is best be done before converting to postscript or
+ a low (<1.4) pdf version.
- all calls to external programs work on temporary files
+ all invocations of external programs work on temporary files
in the then-current temporary directory, with a simple generated
- filename. So no need to quote names of input- and output filenames.
+ filename. So no need to quote names of input- or output filenames.
--]]
- local psp = self
local newfile
if psp.type=='eps' or psp.type=='epsPreview' then
- -- As a side effect of eps_clean, the modified source file is copied
- -- to the temp subdirectory.
+ -- As a side effect of eps_clean, the modified or unmodified source file
+ -- is copied to our temp subdirectory.
+ -- We always create a new file.
psp = psp:eps_clean()
if options.bbox and psp.bb:nonnegative() then
psp = psp:eps_crop()
@@ -1960,99 +1933,153 @@ function PsPdf:any_to_any()
if options.type=='eps' then
if options.gray or options.bbox then
-- bbox: eps_crop was apparently not applicable: pdf roundtrip
- psp = psp:eps_to_pdf():pdf_to_eps()
+ psp = psp:eps_to_pdf()
+ if options.bbox then
+ psp = psp:pdf_crop()
+ end
+ psp = psp:pdf_to_eps()
end
elseif options.type=='pdf' then
psp = psp:eps_to_pdf()
if options.bbox then
psp = psp:pdf_crop()
end
+ if psp:to_downgrade() then
+ maybe_add_version_parameter()
+ psp = psp:pdf_to_pdf()
+ end
elseif options.type=='ps' then
+ -- often, the eps file is fine as a postscript file.
+ -- however, it may lack a showpage operator, or have a weird
+ -- boundingbox. converting back-and-forth to pdf solves both problems.
+ -- eps_to_pdf will take care of grayscaling
+ -- a tight boundingbox option is not supported for ps output.
psp = psp:eps_to_pdf():pdf_to_ps()
end
- return psp
+ slice_file(psp.path, outfile)
+ return true
elseif psp.type=='ps' then
+
-- preliminary:
-- copy infile to a file in the temp directory, needed for gs -dSAFER
newfile = mktemp(psp.type)
slice_file(psp.path, newfile)
- -- dbg(psp.path..' copied to '..newfile..' in '..lfs.currentdir())
psp.path = newfile
+ if options.type=='ps' and not options.page then
+ psp = psp:ps_to_ps()
+ slice_file(psp.path, outfile)
+ return true
+ end
+
+ -- remaining options require initial conversion to pdf
+ psp = psp:ps_to_pdf()
+ -- AFAIK, all high-level ps constructs are covered by any pdf version
+ -- so this option should not cause unnecessary loss of structure
+ maybe_add_version_parameter()
+
+ if options.page and options.page>1 then
+ -- could not check page option before
+ local pgs = pdf_props(psp.path)
+ if pgs<options.page then
+ errror(infile..' has only '..pgs..' page(s).')
+ elseif pgs==1 then
+ options.page = false
+ end
+ end
+
-- actual conversion
if options.type=='eps' then
- return psp:ps_to_pdf():pdf_to_eps()
+ if options.bbox then
+ psp = psp:pdf_crop()
+ end
+ psp = psp:pdf_to_eps()
elseif options.type=='pdf' then
if options.bbox or options.page then
- return psp:ps_to_pdf():pdf_crop()
- else
- return psp:ps_to_pdf()
+ psp = psp:pdf_crop()
+ -- else no action needed
end
elseif options.type=='ps' then
- if options.gray or options.page then
- return psp:ps_to_pdf():pdf_to_ps()
- else
- return psp -- no conversion necessary
- end
+ psp = psp:pdf_to_ps()
end -- pdf => ps
+ slice_file(psp.path, outfile)
+ return true
elseif psp.type=='pdf' then
+
+ if options.type=='pdf' and settings.pdf_target=='default' and
+ not options.gray and not options.bbox and not options.page and
+ not psp:to_downgrade() then
+ if infile~=outfile then
+ slice_file(infile, outfile)
+ end
+ return true
+ end
+
-- preliminary:
- -- copy infile to a file in the temp directory, for gs -dSAFER
+ -- copy infile to a file in the temp directory, needed for gs -dSAFER
newfile = mktemp(psp.type)
slice_file(psp.path, newfile)
- -- dbg(psp.path..' copied to '..newfile..' in '..lfs.currentdir())
- psp.path = newfile
+ psp = PsPdf:from_path(newfile)
+ local pgbox
-- actual conversion
if options.type=='eps' then
- if options.gray then
- -- one-step grayscaling available for gs/ps but not for gs/eps
- return psp:pdf_to_pdf():pdf_to_eps()
- else
- return psp:pdf_to_eps()
+ if options.bbox then
+ pgbox = psp:getpgbox() -- page n. available from options table
+ if not pgbox:nonnegative() or options.gray then
+ -- fix in extra pdf-to-pdf step
+ psp = psp:pdf_to_pdf()
+ end
+ -- we want to calculate a tight boundingbox before conversion to eps,
+ -- because this conversion may cause rasterization and baffle
+ -- gs' boundingbox calculations
+ psp = psp:pdf_crop()
+ elseif options.gray and pdftops then
+ psp = psp:pdf_to_pdf()
end
+ psp = psp:pdf_to_eps()
elseif options.type=='pdf' then
-- pdf_crop can take care of bbox and page,
- -- but not of gray and not of target use or pdf version
- do
- local need_gs = false
- -- compare actual and required versions,
- -- allowing for rounding differences
- if settings.pdf_version~='default' and
- (psp.maver+0.1*psp.miver)>tonumber(settings.pdf_version)-0.01 then
- need_gs = true
- end
- if settings.pdf_target~='default' then
- need_gs = true
- end
- if options.gray then
- need_gs = true
- end
- local need_crop = false
- if options.bbox then
- need_crop = true
- end
- if (not need_gs) and options.page then
- need_crop = true
- end
- if need_gs then
+ -- but not of gray and not of some pdf options
+ if options.bbox then
+ pgbox = psp:getpgbox()
+ if not pgbox:nonnegative() then
+ -- pdf_to_pdf fixes negative bbox parameters
+ -- and also takes care of page and gray
psp = psp:pdf_to_pdf()
end
- if need_crop or (psp.pages>1 and options.page) then
- psp = psp:pdf_crop()
- end
- return psp
+ psp = psp:pdf_crop()
+ end
+ need_gs = false
+ if psp:to_downgrade() then
+ need_gs = true
+ maybe_add_version_parameter()
+ end
+ if settings.pdf_target~='default' then
+ need_gs = true
+ end
+ if options.gray then
+ need_gs = true
+ end
+ if (not need_gs) and options.page then
+ psp = psp:pdf_crop()
+ -- less invasive that page selection by gs
+ end
+ if need_gs then
+ psp = psp:pdf_to_pdf() -- will handle page selection too
end
elseif options.type=='ps' then
if options.gray and pdftops then
- return psp:pdf_to_pdf():pdf_to_ps()
+ psp = psp:pdf_to_pdf():pdf_to_ps()
else
- return psp:pdf_to_ps()
+ psp = psp:pdf_to_ps()
end
end -- pdf => ps
- end -- psp.type=='ps'|'pdf'
+ slice_file(psp.path, outfile)
+ return true
+ end
end -- any_to_any
-- system-dependent initialization -----------------------------------
@@ -2067,11 +2094,10 @@ if os.type == 'windows' then cwd = string.gsub(cwd, '\\', '/') end
-- prepend (lua)tex directory to searchpath, if not already there
maybe_add_path(os.selfdir, false)
--- Windows: miktex, TL or neither. is_miktex, is_tl_w32, auto_psp
+-- Windows: miktex, TL or neither. is_miktex, is_tl_w32
-- no support yet for separate ghostscript
is_miktex = false
is_tl_w32 = false
-auto_psp = true -- only false for old miktex without included pdftops
if os.type == 'windows' then
if string.find (string.lower(kpse.version()), 'miktex') then
@@ -2096,14 +2122,9 @@ if os.type == 'windows' then
'/release-texlive.txt; TeX installation not supported.', 0)
end -- if isfile
end -- if not miktex
- -- recent miktex and any windows tl include pdftops
- if not lfs.isfile(string.gsub(os.selfdir, '\\', '/') .. '/pdftops.exe') then
- auto_psp = false
- end
end -- if windows
-- without Ghostscript we are dead in the water.
--- TL/w32: add to searchpath
gs_prog = false
do
local rt=''
@@ -2119,11 +2140,11 @@ do
elseif is_tl_w32 then
-- windows/TeX Live
-- grandparent of texlua.exe directory .. ...
- rt = string.gsub(os.selfdir,'[\\/][^\\/]+[\\/][^\\/]+$', '')
- ..'/tlpkg/tlgs'
- maybe_add_path(rt..'/bin', false)
- gs_prog = 'gswin32c.exe'
- --[[ problems with (at least) grayscaling
+ -- rt = string.gsub(os.selfdir,'[\\/][^\\/]+[\\/][^\\/]+$', '')
+ -- ..'/tlpkg/tlgs'
+ -- maybe_add_path(rt..'/bin', false)
+ -- -- gs_prog = 'gswin32c.exe'
+ -- ---[[ problems with (at least) grayscaling
gs_prog = 'rungs.exe'
--]]
else
@@ -2134,11 +2155,10 @@ end -- do
-- directory for configuration and log
epsdir = ''
if os.type == 'windows' then
- epsdir = fw(ep_shortname(os.getenv('APPDATA'))) .. '/epspdf'
+ epsdir = fw(os.getenv('APPDATA')) .. '/epspdf'
else
epsdir = os.getenv('HOME')..'/.epspdf'
end
--- dbg('epsdir: '..epsdir)
rcfile = epsdir .. '/config'
logfile = epsdir .. '/epspdf.log'
@@ -2166,26 +2186,29 @@ end -- if lfs...logfile
write_log('epspdf '..table.concat(arg, ' '))
---[[ some debug output
-
-dbg ('os is ' .. os.type .. ' and ' .. os.name)
-dbg ('texlua in ' .. os.selfdir)
-dbg('Ghostscript: ' .. gs_prog)
---]]
-
--[[
settings, initial values
-The values in the settings array have lowest priority - lower than
-autodetect and command-line options. We go for false rather than
-undefined, because this results in an actual settings entry.
+priority, from low to high:
+
+- built-in defaults
+- settings read from and written to the configuration file
+- command-line options, defined in the opts table
+
+The options- and settings tables are initialized from built-in
+defaults. We go for false rather than undefined, because this
+results in an actual settings- or options entry.
+
+Command-line options are copied to either options or settings.
We ignore illegal settings in the config file.
--]]
pdf_targets = {'screen', 'ebook', 'printer', 'prepress', 'default'}
-pdf_versions = {'1.2', '1.3', '1.4', 'default'}
+pdf_versions = {'1.2', '1.3', '1.4', '1.5', '1.6', '1.7', 'default'}
+-- ghostscript will substitute higher versions with
+-- the highest-supported version
settings = {}
descriptions = {}
@@ -2196,30 +2219,12 @@ descriptions.pdf_target = 'One of ' .. join(pdf_targets, ', ', ' or ')
settings.pdf_version = 'default'
descriptions.pdf_version = 'One of ' .. join(pdf_versions, ', ', ' or ')
---[[
--- is bb_spread still a useful setting?
--- look at gs options wrt boundingbox
--- settings.bb_spread = 1
--- descriptions.bb_spread = 'Safety margin in points for (low-res) boundingbox'
-
-settings.use_hires_bb = false
--- descriptions.use_hires_bb = 'Use high-resolution boundingbox if available'
--- Ignored; hires bb always used
---]]
-
--- because pdftops_prog is sometimes configurable, it is stored in settings.
--- it will not be used for TeX Live and only be read and written on Windows.
-
-settings.pdftops_prog = false
-descriptions.pdftops_prog =
- 'Full path to pdftops.exe (not used if TeX bin dir contains pdftops)'
-
settings.use_pdftops = true
descriptions.use_pdftops = 'Use pdftops if available'
-- epspdf stores ps- and pdf viewer settings on behalf of the gui interface
-- but does not use them itself.
--- They won't be used at all under osx or windows.
+-- They will not be used at all under macos or windows.
settings.ps_viewer = false
descriptions.ps_viewer =
@@ -2227,13 +2232,13 @@ descriptions.ps_viewer =
settings.pdf_viewer = false
descriptions.pdf_viewer =
- 'Epspdftk: viewer for pdf files; not used on Windows or OS X'
+ 'Epspdftk: viewer for pdf files; not used on Windows or Mac OS'
-- default_dir, which is used on all platforms, is only for the gui.
if os.type == 'windows' then
settings.default_dir =
- string.gsub(ep_shortname(os.getenv('USERPROFILE')), '\\', '/')
+ string.gsub(os.getenv('USERPROFILE'), '\\', '/')
else
settings.default_dir = os.getenv('HOME')
end
@@ -2257,6 +2262,7 @@ options.type = false -- implied via output filename on command line
-- We could make these `class attributes' for PsPdf but to what purpose?
-- For Windows shell commands, we need to substitute `#' for `='
-- when invoking Ghostscript. For simplicity, we do this across the board.
+-- -P- : do not look first in current directory
gs_options = {'-q', '-dNOPAUSE', '-dBATCH', '-P-', '-dSAFER'}
@@ -2273,25 +2279,18 @@ pdftops = false
-- gets a value only if we are going to use pdftops
ps_options = {'-level3'}
--- may add custom options later
-- `main program' inside scope-creating block ----------------------
do -- main program
- local infile = false
local in_dir = false -- directory of infile
- local outfile = false
local out_dir = false -- directory of outfile
- -- dbg('\nSettings are:\n')
- for k,v in pairs(settings) do dbg(k .. ' = ' .. tostring(v)) end
-
do -- Handle settings and command-line inside nested scope --------------
read_settings(rcfile)
- -- dbg('Defining cmdline options')
local opts = {}
opts.page = {
@@ -2345,16 +2344,6 @@ do -- main program
help = descriptions.pdf_version
}
- if os.type=='windows' and not auto_psp then
- opts.pdftops_prog = {
- type = 'string', val = nil,
- forms = {'--pdftops'},
- placeholder = 'PATH',
- negforms = nil,
- help = descriptions.pdftops_prog
- }
- end
-
opts.use_pdftops = {
type = 'boolean', val = nil,
forms = {'-U'},
@@ -2407,22 +2396,24 @@ do -- main program
-- a couple of functions only available during command-line parsing
local function show_version ()
- print('Epspdf version '..ep_version..'\nCopyright (c) '
- ..ep_copyright..' Siep Kroonenberg')
+ print('Epspdf version 0.6.4\nCopyright (c) 2006-2019 Siep Kroonenberg')
end
local function help (mess) -- requires opts array
- if mess then print(mess..eol) end
+ if mess then
+ print(mess..eol)
+ end
show_version()
-- below, string.gsub unindents its long-string parameter.
-- string.format removes the second return value of string.gsub.
- print(string.format('%s', string.gsub([[
+ print( -- string.format('%s',
+ string.gsub([[
Convert between [e]ps and pdf formats
Usage: epspdf[.tlu] [options] infile [outfile]
Default for outfile is file.pdf if infile is file.eps or file.ps
Default for outfile is file.eps if infile is file.pdf
- ]], '([\r\n]+) ', '%1')))
+ ]], '([\r\n]+) ', '%1')) --)
-- need to enforce an ordering, otherwise we could have used pairs(opts)
-- omitted below: no-op options
@@ -2431,31 +2422,28 @@ do -- main program
local intent_sp = string.rep(' ', indent_n)
local indent_fmt = '%-' .. tostring(indent_n) .. 's'
for _, o in ipairs({'page', 'gray', 'bbox', 'pdf_target', 'pdf_version',
- 'pdftops_prog', 'use_pdftops', 'save', 'info', 'debug',
- 'version', 'help'}) do
+ 'use_pdftops', 'save', 'info', 'debug', 'version', 'help'}) do
local v = opts[o]
- if v~='pdftops_prog' or not auto_psp then
- if v and v.help then
- local synt = join(v.forms, ', ')
- if v.type ~= 'boolean' then synt = synt .. ' ' .. v.placeholder end
+ if v and v.help then
+ local synt = join(v.forms, ', ')
+ if v.type ~= 'boolean' then synt = synt .. ' ' .. v.placeholder end
+ if string.len(synt)<indent_n then
+ print(string.format(indent_fmt, synt) .. v.help)
+ else
+ print(synt)
+ print(intent_sp .. v.help)
+ end
+ if v.negforms then
+ local neghelp = 'Reverses the above'
+ synt = join(v.negforms, ', ')
if string.len(synt)<indent_n then
- print(string.format(indent_fmt, synt) .. v.help)
+ print(string.format(indent_fmt, synt) .. neghelp)
else
print(synt)
- print(intent_sp .. v.help)
- end
- if v.negforms then
- local neghelp = 'Reverses the above'
- synt = join(v.negforms, ', ')
- if string.len(synt)<indent_n then
- print(string.format(indent_fmt, synt) .. neghelp)
- else
- print(synt)
- print(intent_sp .. neghelp)
- end
+ print(intent_sp .. neghelp)
end
end
- end -- ~=pdftops_prog or not auto_psp
+ end
end -- for
if mess then os.exit(1) else os.exit() end
end -- help
@@ -2471,7 +2459,6 @@ do -- main program
local i=1
while i<=#arg and string.sub(arg[i],1,1)=='-' do
- -- dbg('parse argument '..tostring(i)..': '..arg[i])
local parsed = false
local kk, vv = string.match(arg[i],'([^=]+)=(.*)$')
if kk==nil then
@@ -2480,7 +2467,6 @@ do -- main program
vv = strip_outer_spaces(vv)
end
for p, o in pairs(opts) do
- -- dbg(' try '..p)
if in_list(kk, o.forms) or in_list(kk, o.negforms) then
parsed = true
if o.type == 'boolean' then
@@ -2506,29 +2492,6 @@ do -- main program
i = i + 1
end -- while
- -- some debug output
-
- --[[
- if i<=#arg then
- dbg('non-option arguments:')
- for j=i,#arg do dbg(arg[j]) end
- dbg(eol)
- else
- dbg('no non-option arguments')
- end
-
- for i=1,#arg do dbg(arg[i]) end
-
- dbg(eol..'Options from command-line:')
- for p, o in pairs(opts) do
- if o.val==nil then
- dbg(p..': undefined')
- else
- dbg(p..': '..tostring(o.val))
- end
- end
- --]]
-
-- check and interpret opts.
-- Copy to either settings or to options table.
-- at syntax error, abort via help function.
@@ -2594,34 +2557,14 @@ do -- main program
end
end
- -- pdftops program; pdftops has already been been initialized to false
-
- -- pdftops_prog as command-line option
- if os.type=='windows' and not auto_psp and
- opts.pdftops_prog.val then
- settings.pdftops_prog = is_prog(opts.pdftops_prog.val)
- end
-
- -- pdftops should be on the path. otherwise, make it so if possible.
- if os.type=='windows' and not auto_psp then
- if settings.use_pdftops then
- pdftops = is_prog(settings.pdftops_prog)
- if pdftops then
- -- strip path and modify searchpath, to avoid paths with spaces
- maybe_add_path(string.gsub(pdftops, '[\\/][^\\/]*$', ''), 'append')
- pdftops = string.gsub(settings.pdftops_prog, '^.*[\\/]', '')
- end
- end
- elseif os.type=='windows' then
- if settings.use_pdftops then
- pdftops = 'pdftops.exe'
- end
- else
- if settings.use_pdftops then
+ -- pdftops should be on the path
+ if settings.use_pdftops then
+ if os.type=='windows' then
+ pdftops = find_on_path('pdftops.exe')
+ else
pdftops = find_on_path('pdftops')
end
end
- -- dbg('Option handling; pdftops is '..tostring(pdftops))
-- other options
@@ -2675,58 +2618,25 @@ do -- main program
-- one final quick option
if opts.info.val then
- info(infile)
- end
-
- -- add pdf_version and pdf_target to the options array,
- -- from where it will be set to false when realized
- if settings.pdf_target == 'default' then
- options.pdf_target = false
- else
- options.pdf_target = settings.pdf_target
+ info()
end
- if settings.pdf_version == 'default' then
- options.pdf_version = false
- else
- options.pdf_version = tonumber(settings.pdf_version)
- end
-
- end -- decoding command-line
- --[[
- dbg('After command-line processing\n Settings')
- -- print settings- and options array with dbg
- for k, v in pairs(settings) do
- dbg(k..': '..tostring(v))
- end
- dbg(' Options')
- for k, v in pairs(options) do
- dbg(k..': '..tostring(v))
- end
- --]]
+ end -- do (decoding command-line)
--[[
Once it becomes clear that real work needs to be done,
we shall create a temp directory.
- because of gs -dSAFER restrictions, infile must be in (a
- subdirectory of) the directory of the output file, e.g. in the
- temp directory.
-
- Also because of -dSAFER, we copy infile to the temp directory of
- it is not in the same directory as outfile.
+ because of gs -dSAFER restrictions, infile must be in (a
+ subdirectory of) the directory of the output file, e.g. in the
+ temp directory. So we copy infile to the temp directory.
--]]
- source = io.open(infile)
- if not source then
- error(infile .. ' not readable')
+ if not lfs.isfile(infile) or lfs.attributes(infile, 'size')==0 then
+ errror(infile..' does not exist or is empty.')
end
- source:close()
- -- if options.debug then
- -- warn('in: '..infile..'\nout: '..outfile..'\n\ncwd: '..cwd)
- -- end
infile, in_dir = absolute_path(infile)
outfile, out_dir = absolute_path(outfile)
if not out_dir then
@@ -2746,58 +2656,36 @@ do -- main program
tempdir = os.tmpdir()
if not tempdir then
errror('Cannot create directory for temporary files')
- else
- -- dbg('temp directory '..tempdir)
end
lfs.chdir(tempdir)
+ -- determine filetype from first few bytes of file
intype = identify(infile)
-- remaining cases: want a real conversion
if not intype then
- error(infile..' has an unsupported filetype')
+ errror(infile..' has an unsupported filetype')
end
- --sanity check on output filetype
+ -- valid output filetype?
options.type = string.match(outfile, '.*%.([^%.]+)$')
- if not options.type or (options.type~='ps'
- and options.type~='eps' and options.type~='pdf') then
+ if not options.type or (options.type~='ps' and
+ options.type~='eps' and options.type~='pdf') then
errror('Output file '..outfile..
' should have extension .eps, .ps or .pdf')
end
if outfile==infile then
- local insave = infile .. '.luasave'
- move_or_copy(infile, insave)
- infile = insave
- end
-
- -- had some trouble under msw when removing outfile later so try it now
- if lfs.isfile(outfile) then
- os.remove(outfile)
- -- if removal fails but outfile is overwritable then no real problem
+ slice_file(infile, infile..'.backup')
+ -- copy, not move, since outfile may be infile if there was nothing to do
end
- local fout = io.open(outfile, 'wb')
- if not fout then
- errror('Output file '..outfile..' not writable; aborting')
- else
- fout:close()
+ result = any_to_any(infile, outfile)
+ if not lfs.isfile(outfile) or lfs.attributes(outfile, 'size')==0 then
+ errror('Failed to generate '..outfile)
end
- source = PsPdf:from_path(infile)
- dest = source:any_to_any()
- if not lfs.isfile(dest.path) then
- errror('Failed to generate '..dest.path)
- end
- write_log('Copying or moving '..dest.path..' to '..outfile)
- move_or_copy(dest.path, outfile)
if not options.debug then
cleantemp()
end
- if lfs.isfile(outfile) and lfs.attributes(outfile, 'size')>0 then
- os.exit()
- else
- errror('Conversion failed')
- end
end
diff --git a/Build/source/texk/texlive/linked_scripts/epspdf/epspdftk.tcl b/Build/source/texk/texlive/linked_scripts/epspdf/epspdftk.tcl
index 7e4a7bc4c3c..26ed17efcfd 100755
--- a/Build/source/texk/texlive/linked_scripts/epspdf/epspdftk.tcl
+++ b/Build/source/texk/texlive/linked_scripts/epspdf/epspdftk.tcl
@@ -3,8 +3,8 @@
# epspdf conversion utility, GUI frontend
#####
-# Copyright (C) 2006, 2008, 2009, 2010, 2011, 2013, 2014, 2015, 2016 Siep Kroonenberg
-# n dot s dot kroonenberg at rug dot nl
+# Copyright (C) 2006-2019 Siep Kroonenberg
+# siepo at bitmuis dot nl
#
# This program is free software, licensed under the GNU GPL, >=2.0.
# This software comes with absolutely NO WARRANTY. Use at your own risk!
@@ -12,13 +12,15 @@
package require Tk
+if {[string index $::tcl_patchLevel 2] <5} {
+ tk_messageBox -message "Tcl/Tk version >= 8.5 required;\naborting..."
+ exit
+}
+
# tired of writing out this combined test again and again
set classic_unix [expr {$::tcl_platform(platform) eq "unix" && \
$::tcl_platform(os) ne "Darwin"}]
-# combo boxes and -ignorestderr introduced in Tk8.5
-set ge_85 [expr {[string index $::tcl_patchLevel 2] > 4}]
-
# normally, epspdf.tlu should be in the same directory
# and texlua should be on the searchpath.
# However, the Windows installer version wraps this script in a starpack.
@@ -35,7 +37,7 @@ proc write_log {s} {
}
}
-### calling epspdf.tlu #########################
+### invoking epspdf.tlu #########################
# Get full path of epspdf.tlu. It should be in the same directory as
# either this script or of the starpack containing this script,
@@ -60,6 +62,13 @@ proc set_progs {} {
set eproot [file dirname [file normalize [info nameofexecutable]]]
set ::epspdf_tlu [file join $eproot "epspdf.tlu"]
}
+ if {$::tcl_platform(platform) eq "windows"} {
+ # For actual conversions, epspdf invokes third-party command-line programs.
+ # To prevent the appearing of transient black console windows for such
+ # invocations, epspdf will be invoked via a batchfile.
+ # This is not necessary for getting info about a file.
+ set ::epspdf_cmd [file join $eproot "epspdf4tk.cmd"]
+ }
if {! [file exists $::epspdf_tlu]} {
tk_messageBox -type ok -icon error -message "Epspdf.tlu not found"
exit 1
@@ -95,9 +104,6 @@ proc is_prog {x} {
# create a global empty settings array
array set ::settings [list]
-# windows: pdftops from tex distro?
-set ::psp_config 0
-
# ask epspdf.tlu for currently configured settings.
# this does not include automatically configured or transient settings.
# the availability of viewers is handled here.
@@ -107,10 +113,6 @@ proc getsettings {} {
}
# write_log "settings from epspdf.tlu:\n$set_str\n"
set l [split $set_str "\r\n"]
- if {$::tcl_platform(platform) eq "windows"} {
- set ::psp_config 0
- set settings(pdftops_prog) ""
- }
foreach e $l {
# puts "settings: $e"
# $e is either a string "var = value"
@@ -122,13 +124,8 @@ proc getsettings {} {
set val [string trim [string range $e [expr $i+1] end]]
if {$val eq "true"} {set val 1}
if {$val eq "false"} {set val 0}
- if {$para eq "psp_config"} {
- set ::psp_config 1
- write_log "TL for Windows not detected by epspdf"
- } else {
- set ::settings($para) $val
- # write_log "setting $para is $val"
- }
+ set ::settings($para) $val
+ # write_log "setting $para is $val"
}
}
@@ -151,7 +148,7 @@ proc getsettings {} {
if {$::settings(pdf_viewer) ne "" && [is_prog $::settings(pdf_viewer)]} {
lappend ::pdf_viewers $::settings(pdf_viewer)
}
- foreach v {evince okular xpdf epdfview qpdfview zathura acroread gv} {
+ foreach v {evince okular mupdf qpdfview texworks xpdf zathura} {
if {$v ne $::settings(pdf_viewer) && [is_prog $v]} {
lappend ::pdf_viewers $v
}
@@ -224,154 +221,25 @@ proc viewable {} {
### groundwork for GUI #################################
# padding for buttons and frames
-proc packb {b args} {
- eval [linsert $args 0 pack $b -padx 3 -pady 3]
- $b configure -border 2
-}
-
-proc packf {f args} {
- eval [linsert $args 0 pack $f -padx 3 -pady 3]
-}
-
-# dummy widget for vertical spacing
-set idummy -1
-proc spacing {w} {
- incr ::idummy
- pack [label $w.$::idummy -text " "]
-}
+proc ppack {b args} {pack $b {*}$args -padx 3 -pady 3}
# bold font
-font create boldfont
-# create dummy label widget to get at the default label font properties
-label .dummy
-font configure boldfont -family [font actual [.dummy cget -font] -family]
-font configure boldfont -size [font actual [.dummy cget -font] -size]
-font configure boldfont -weight bold
-destroy .dummy
-
-# bitmaps for mycombo (no combobox in core tk8.4)
-image create bitmap dwnarrow -data {
-#define dwnarrow_width 15
-#define dwnarrow_height 10
-static unsigned char dwnarrow_bits[] = {
- 0x00, 0x00, 0x00, 0x00, 0xfc, 0x1f, 0xf8, 0x0f, 0xf0, 0x07, 0xe0, 0x03,
- 0xc0, 0x01, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00 };
-}
-
-image create bitmap uparrow -data {
-#define uparrow_width 15
-#define uparrow_height 10
-static unsigned char uparrow_bits[] = {
- 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0xc0, 0x01, 0xe0, 0x03, 0xf0, 0x07,
- 0xf8, 0x0f, 0xfc, 0x1f, 0x00, 0x00, 0x00, 0x00 };
-}
-
-# mycombo
-if {$::ge_85} {
- proc update_combo {w vls} {
- upvar $vls vs
- set new [$w get]
- if {$new ni $vs} {
- if {[is_prog $new]} {
- set vs [linsert $vs 0 $new]
- $w configure -values $vs
- } else {
- tk_messageBox -title Error -icon error -message "$vl Not a program"
- }
- }
- }
-} else {
- proc mycombo {w} {
- # entry widget and dropdown button
- frame $w
- frame $w.ef
- entry $w.ef.e -width 30 -borderwidth 1
- pack $w.ef.e -side left
- button $w.ef.b -image dwnarrow -command "toggle_list $w" -borderwidth 1
- pack $w.ef.b -side right
- pack $w.ef
- # 'drop-down' listbox; width should match entry widget above
- toplevel $w.lf -bd 0
- listbox $w.lf.l -yscrollcommand "$w.lf.s set" -height 4 -width 30 \
- -bd 1 -relief raised
- grid $w.lf.l -column 0 -row 0 -sticky news
- scrollbar $w.lf.s -command "$w.lf.l yview" -bd 1
- grid $w.lf.s -column 1 -row 0 -sticky ns
- grid columnconfigure $w.lf 0 -weight 1
- wm overrideredirect $w.lf 1
- wm transient $w.lf
- wm withdraw $w.lf
- # next two bindings:
- # final parameter: unmap/toggle listbox
- bind $w.lf.l <KeyRelease-space> {update_e %W [%W get active] 1}
- bind $w.lf.l <KeyRelease-Tab> {update_e %W [%W get active] 1}
- bind $w.lf.l <1> {update_e %W [%W index @%x,%y] 0}
- bind $w.lf.l <Double-1> {update_e %W [%W index @%x,%y] 1}
- bind $w.ef.e <Return> {update_l %W}
- bind $w.ef.e <Tab> {update_l %W}
- return $w
- }
-
- # toggle state of listbox.
- # this involves calculating the place where it should appear
- # and toggling the arrow image.
- proc toggle_list {w} {
- # $w.ef is the frame with the entry widget
- # $w.lf is the toplevel with the listbox
- # which needs to turn up right below $w.ef
- if {[wm state $w.lf] eq "withdrawn" || [wm state $w.lf] eq "iconified"} {
- set lfx [winfo rootx $w.ef]
- set lfy [expr [winfo rooty $w.ef] + [winfo height $w.ef]]
- wm geometry $w.lf [format "+%d+%d" $lfx $lfy]
- wm deiconify $w.lf
- $w.ef.b configure -image uparrow
- } else {
- wm withdraw $w.lf
- $w.ef.b configure -image dwnarrow
- }
- }
-
- # note: in tcl/tk 8.5, values of (some) widget variables can be accessed
- # directly and explicit use of upvar is unnecessary.
-
- # list => entry; optionally toggle list display
- proc update_e {v i toggle} {
- set w [winfo parent [winfo parent $v]]
- set lv [$w.lf.l cget -listvariable]
- upvar $lv l
- set tv [$w.ef.e cget -textvariable]
- upvar $tv t
- set t [lindex $l $i]
- if {$toggle} {toggle_list $w}
- }
-
- # entry => list
- proc update_l {v} {
- set w [winfo parent [winfo parent $v]]
- set tv [$w.ef.e cget -textvariable]
- upvar $tv t
- set lv [$w.lf.l cget -listvariable]
- upvar $lv l
- set found [lsearch $l $t]
- if { $found < 0} {
- set ok [$v validate]
- if {$ok} {
- lappend l $t
- set l [lsort $l]
- } else {
- tk_messageBox -message "Not a program"
- }
+font create bfont {*}[font configure TkDefaultFont]
+font configure bfont -weight bold
+
+proc update_combo {w vls} {
+ upvar $vls vs
+ set new [$w get]
+ if {$new ni $vs} {
+ if {[is_prog $new]} {
+ set vs [linsert $vs 0 $new]
+ $w configure -values $vs
+ } else {
+ tk_messageBox -title Error -icon error -message "$vl Not a program"
}
- set the_index [lsearch $l $t]
- $w.lf.l see $the_index
- $w.lf.l activate $the_index
- wm withdraw $w.lf
- $w.ef.b configure -image dwnarrow
}
}
-# end mycombo
-
### and now the actual GUI ###################################
wm title . "PostScript- and pdf conversions"
@@ -398,13 +266,14 @@ proc readhelp {} {
toplevel .help_t
wm title .help_t "EpsPdf help"
-packb [button .help_t.done -text "Close" -command {wm withdraw .help_t}] \
- -side bottom -anchor e -padx 50
+pack [ttk::frame .help_t.bg -padding 3] -fill both -expand 1
+ppack [ttk::button .help_t.done -text "Close" -command {wm withdraw .help_t}] \
+ -in .help_t.bg -side bottom -anchor e -padx 50
text .help_t.text -wrap word -width 60 -height 20 -setgrid 1 \
-yscrollcommand ".help_t.scroll set"
-scrollbar .help_t.scroll -command ".help_t.text yview"
-pack .help_t.scroll -side right -fill y
-pack .help_t.text -expand 1 -fill both
+ttk::scrollbar .help_t.scroll -command ".help_t.text yview"
+pack .help_t.scroll -in .help_t.bg -side right -fill y
+pack .help_t.text -in .help_t.bg -expand 1 -fill both
readhelp
.help_t.text configure -state disabled
wm withdraw .help_t
@@ -413,13 +282,14 @@ wm withdraw .help_t
toplevel .log_t
wm title .log_t "Epspdf log"
-packb [button .log_t.b -text "Close" -command {wm withdraw .log_t}] \
- -side bottom -anchor e -padx 50
+pack [ttk::frame .log_t.bg -padding 3] -fill both -expand 1
+ppack [ttk::button .log_t.b -text "Close" -command {wm withdraw .log_t}] \
+ -in .log_t.bg -side bottom -anchor e -padx 50
text .log_t.text -wrap word -relief flat -height 15 -width 60 \
-setgrid 1 -yscrollcommand ".log_t.scroll set"
-scrollbar .log_t.scroll -command ".log_t.text yview"
-pack .log_t.scroll -side right -fill y
-pack .log_t.text -expand 1 -fill both
+ttk::scrollbar .log_t.scroll -command ".log_t.text yview"
+pack .log_t.scroll -in .log_t.bg -side right -fill y
+pack .log_t.text -in .log_t.bg -expand 1 -fill both
.log_t.text configure -state disabled
wm withdraw .log_t
@@ -427,6 +297,7 @@ wm withdraw .log_t
toplevel .config_t
wm title .config_t "Configure epspdf"
+pack [ttk::frame .config_t.bg -padding 3] -fill both -expand 1
# The settings array is edited directly in the configuration screen:
# for most control widgets, we need a global external variable anyway,
@@ -438,120 +309,66 @@ wm title .config_t "Configure epspdf"
# viewers (not on windows or osx)
if {$::classic_unix} {
- packf [frame .config_t.viewf] -ipadx 4 -fill x
- grid [label .config_t.viewf.title -font boldfont -text "Viewers"] \
+ ppack [ttk::frame .config_t.viewf] -in .config_t.bg -ipadx 4 -fill x
+ grid [ttk::label .config_t.viewf.title -font bfont -text "Viewers"] \
-row 0 -column 0 -sticky w
- grid [label .config_t.viewf.lb_pdf -text "Pdf"] \
+ grid [ttk::label .config_t.viewf.lb_pdf -text "Pdf"] \
-row 1 -column 0 -sticky w
- grid [label .config_t.viewf.lb_ps -text "PostScript"] \
+ grid [ttk::label .config_t.viewf.lb_ps -text "PostScript"] \
-row 2 -column 0 -sticky w
- if {$::ge_85} {
- grid [ttk::combobox .config_t.viewf.pdf] -row 1 -column 1 -sticky e
- .config_t.viewf.pdf configure -values $::pdf_viewers
- .config_t.viewf.pdf configure -textvariable ::settings(pdf_viewer)
- bind .config_t.viewf.pdf <Return> {update_combo %W $::pdf_viewers}
- grid [ttk::combobox .config_t.viewf.ps] -row 2 -column 1 -sticky e
- .config_t.viewf.ps configure -values $::ps_viewers
- .config_t.viewf.ps configure -textvariable ::settings(ps_viewer)
- bind .config_t.viewf.ps <Return> {update_combo %W $::ps_viewers}
- } else {
- grid [mycombo .config_t.viewf.pdf] -row 1 -column 1 -sticky e
- .config_t.viewf.pdf.lf.l configure -listvariable ::pdf_viewers
- .config_t.viewf.pdf.ef.e configure -textvariable ::settings(pdf_viewer)
- .config_t.viewf.pdf.ef.e configure -vcmd {is_prog %P} -validate none
- grid [mycombo .config_t.viewf.ps] -row 2 -column 1 -sticky e -pady 4
- .config_t.viewf.ps.lf.l configure -listvariable ::ps_viewers
- .config_t.viewf.ps.ef.e configure -textvariable ::settings(ps_viewer)
- .config_t.viewf.ps.ef.e configure -vcmd {is_prog %P} -validate none
- }
+ grid [ttk::combobox .config_t.viewf.pdf] -row 1 -column 1 -sticky e
+ .config_t.viewf.pdf configure -values $::pdf_viewers
+ .config_t.viewf.pdf configure -textvariable ::settings(pdf_viewer)
+ bind .config_t.viewf.pdf <Return> {update_combo %W $::pdf_viewers}
+ grid [ttk::combobox .config_t.viewf.ps] -row 2 -column 1 -sticky e
+ .config_t.viewf.ps configure -values $::ps_viewers
+ .config_t.viewf.ps configure -textvariable ::settings(ps_viewer)
+ bind .config_t.viewf.ps <Return> {update_combo %W $::ps_viewers}
grid columnconfigure .config_t.viewf 1 -weight 1 -pad 2
-
- spacing .config_t
}
# settings for conversion to pdf
-packf [frame .config_t.pdff] -ipadx 4 -fill x
-pack [label .config_t.pdff.title -font boldfont -text "Conversion to pdf"] \
+ppack [ttk::frame .config_t.pdff] \
+ -in .config_t.bg -ipadx 4 -fill x -pady [list 10 0]
+pack [ttk::label .config_t.pdff.title -font bfont -text "Conversion to pdf"] \
-anchor w
-pack [label .config_t.pdff.l_target -text "Target use"] -anchor w
-pack [frame .config_t.pdff.f_targets] -fill x
+pack [ttk::label .config_t.pdff.l_target -text "Target use"] -anchor w
+pack [ttk::frame .config_t.pdff.f_targets] -fill x
foreach t {default printer prepress screen ebook} {
- pack [radiobutton .config_t.pdff.f_targets.$t \
+ pack [ttk::radiobutton .config_t.pdff.f_targets.$t \
-variable ::settings(pdf_target) \
-text $t -value $t] -side left -padx 2 -pady 4 -anchor w
}
-pack [label .config_t.pdff.l_version -text "Pdf version"] -anchor w
-pack [frame .config_t.pdff.f_version] -fill x
-foreach t {1.2 1.3 1.4 default} {
+pack [ttk::label .config_t.pdff.l_version -text "Pdf version"] -anchor w
+pack [ttk::frame .config_t.pdff.f_version] -fill x
+foreach t {1.2 1.3 1.4 1.5 1.6 1.7 default} {
regsub {\.} $t _ tp ; # replace dot in name: dots are path separators!
- pack [radiobutton .config_t.pdff.f_version.$tp \
+ pack [ttk::radiobutton .config_t.pdff.f_version.$tp \
-variable ::settings(pdf_version) \
-text $t -value $t] -side left -padx 2 -pady 4 -anchor w
}
-#pack [label .config_t.pdff.l_gs \
-# -text "Custom Ghostscript/ps2pdf parameters"] -anchor w
-#pack [entry .config_t.pdff.e_gs -border 1] -fill x -padx 2 -pady 2
-#.config_t.pdff.e_gs configure -textvariable settings(pdf_custom)
-
-spacing .config_t
-
# settings for conversion to EPS and PostScript
-packf [frame .config_t.psf] -ipadx 4 -fill x
-pack [label .config_t.psf.l_ps -text "Conversion to EPS and PostScript" \
- -font boldfont] -anchor w
-if { $::psp_config} {
- if {[string tolower [string range $::settings(pdftops_prog) end-3 end]] ne \
- ".exe"} {set ::settings(pdftops_prog) ""}
- pack [label .config_t.psf.l_pdftops -text "Find pdftops"] -anchor w
- pack [frame .config_t.psf.findf] -anchor w
- pack [entry .config_t.psf.findf.e -width 40] -side left -padx 4
- .config_t.psf.findf.e configure -textvariable ::settings(pdftops_prog)
- packb [button .config_t.psf.findf.b -text "Browse..." \
- -command find_pdftops] -side left
-}
-
-proc find_pdftops {} {
- set try [tk_getOpenFile -title "Find pdftops.exe" \
- -filetypes {{"Programs" {.exe}}} -initialdir "c:/"]
- if {$try ne ""} {
- .config_t.psf.findf.e delete 0 end
- .config_t.psf.findf.e insert 0 $try
- }
-}
+ppack [ttk::frame .config_t.psf] \
+ -in .config_t.bg -pady [list 10 0] -ipadx 4 -fill x
+pack [ttk::label .config_t.psf.l_ps -text "Conversion to EPS and PostScript" \
+ -font bfont] -anchor w
-pack [checkbutton .config_t.psf.c \
- -text "Use pdftops if available (recommended)"] -anchor w
+pack [ttk::checkbutton .config_t.psf.c \
+ -text "Use pdftops if available"] -anchor w
.config_t.psf.c configure -variable ::settings(use_pdftops) \
-onvalue 1 -offvalue 0
-spacing .config_t
-
-## hires boundingbox setting
-#
-#packf [frame .config_t.hiresf] -ipadx 4 -fill x
-#pack [label .config_t.hiresf.title -font boldfont -text "Hires BoundingBox"] \
-# -anchor w
-#pack [label .config_t.hiresf.l -text "Uncheck to prevent clipping"] \
-# -anchor w
-#
-#pack [checkbutton .config_t.hiresf.c \
-# -text "Use hires boundingbox if possible"] -anchor w
-#.config_t.hiresf.c configure \
-# -variable ::settings(ignore_hires_bb) -onvalue 0 -offvalue 1
-#
-#spacing .config_t
-
# buttons for closing the configuration screen
-pack [frame .config_t.buttonsf] -fill x
-packb [button .config_t.buttonsf.done -text "Done" -command putsettings] \
+pack [ttk::frame .config_t.buttonsf] -in .config_t.bg -pady [list 10 0] -fill x
+ppack [ttk::button .config_t.buttonsf.done -text "Done" -command putsettings] \
-side right
-packb [button .config_t.buttonsf.cancel -text "Cancel" \
+ppack [ttk::button .config_t.buttonsf.cancel -text "Cancel" \
-command cancelsettings] -side right
wm transient .config_t
@@ -566,20 +383,12 @@ proc edit_settings {} {
# store new settings
proc putsettings {} {
- if {$::classic_unix && ! $::ge_85} {
- wm withdraw .config_t.viewf.pdf.lf
- wm withdraw .config_t.viewf.ps.lf
- }
wm withdraw .config_t
grab release .config_t
write_settings
}
proc cancelsettings {} {
- if {$::classic_unix && ! $::ge_85} {
- wm withdraw .config_t.viewf.pdf.lf
- wm withdraw .config_t.viewf.ps.lf
- }
wm withdraw .config_t
grab release .config_t
# re-read config file / reg entries
@@ -593,93 +402,91 @@ proc show_w {w} {
raise $w
}
+pack [ttk::frame .bg -padding 3] -fill both -expand 1
+
# buttons to call up configure-, log- and help screens
-pack [frame .topf] -fill x
-packb [button .topf.config_t -text "Configure" \
+pack [ttk::frame .topf] -in .bg -fill x
+ppack [ttk::button .topf.config_t -text "Configure" \
-command edit_settings] -side left
-packb [button .topf.help_t -text "Help" \
+ppack [ttk::button .topf.help_t -text "Help" \
-command {show_w .help_t}] -side right
-packb [button .topf.logb -text "Show log" -command {show_w .log_t}] \
+ppack [ttk::button .topf.logb -text "Show log" -command {show_w .log_t}] \
-side right -anchor w
# file info in grid layout
-packf [frame .infof -relief sunken -border 1] -fill x
-grid [label .infof.dir_label -text "Directory" -anchor w] \
+ppack [ttk::frame .infof -relief sunken -border 1 -padding 3] -in .bg -fill x
+grid [ttk::label .infof.dir_label -text "Directory" -anchor w] \
-row 1 -column 1 -sticky w
-grid [label .infof.dir_value -textvariable ::gfile(dir) -anchor w] \
+grid [ttk::label .infof.dir_value -textvariable ::gfile(dir) -anchor w] \
-row 1 -column 2 -sticky w
-grid [label .infof.name_label -text "File" -anchor w] \
+grid [ttk::label .infof.name_label -text "File" -anchor w] \
-row 2 -column 1 -sticky w
-grid [label .infof.name_value -textvariable ::gfile(name) -anchor w] \
+grid [ttk::label .infof.name_value -textvariable ::gfile(name) -anchor w] \
-row 2 -column 2 -sticky w
-grid [label .infof.type_label -text "Type" -anchor w] \
+grid [ttk::label .infof.type_label -text "Type" -anchor w] \
-row 3 -column 1 -sticky w
-grid [label .infof.type_value -textvariable ::gfile(type) -anchor w] \
+grid [ttk::label .infof.type_value -textvariable ::gfile(type) -anchor w] \
-row 3 -column 2 -sticky w
-grid [label .infof.npages_label -text "Pages" -anchor w] \
+grid [ttk::label .infof.npages_label -text "Pages" -anchor w] \
-row 4 -column 1 -sticky w
-grid [label .infof.npages_value -textvariable ::gfile(npages) -anchor w] \
+grid [ttk::label .infof.npages_value -textvariable ::gfile(npages) -anchor w] \
-row 4 -column 2 -sticky w
grid columnconfigure .infof 1 -weight 1 -pad 2
grid columnconfigure .infof 2 -weight 3 -pad 2
-spacing .
-
# conversion options
-pack [frame .optsf] -fill x
+pack [ttk::frame .optsf] -in .bg -pady [list 10 0] -fill x
# grayscaling
-pack [frame .optsf.gray] -side left -anchor nw
-pack [label .optsf.gray.l -text "Grayscaling"] -anchor w
-pack [radiobutton .optsf.gray.off -text "No color conversion" \
+pack [ttk::frame .optsf.gray] -side left -anchor nw
+pack [ttk::label .optsf.gray.l -text "Grayscaling"] -anchor w
+pack [ttk::radiobutton .optsf.gray.off -text "No color conversion" \
-variable ::options(gray) -value "color"] -anchor w
-pack [radiobutton .optsf.gray.gray -text "Grayscale" \
+pack [ttk::radiobutton .optsf.gray.gray -text "Grayscale" \
-variable ::options(gray) -value "gray"] -anchor w
-#pack [radiobutton .optsf.gray.gRAY -text "Try harder to grayscale" \
-# -variable ::options(gray) -value "gRAY"] -anchor w
# output format
-pack [label .optsf.format] -side right -anchor ne
-pack [label .optsf.format.l -text "Output format"] -anchor w
-pack [radiobutton .optsf.format.pdf -text "pdf" -command set_widget_states \
- -variable ::options(format) -value "pdf"] -anchor w
-pack [radiobutton .optsf.format.eps -text "eps" -command set_widget_states \
- -variable ::options(format) -value "eps"] -anchor w
-pack [radiobutton .optsf.format.ps -text "ps" -command set_widget_states \
- -variable ::options(format) -value "ps"] -anchor w
-
-spacing .
+pack [ttk::label .optsf.format] -side right -anchor ne
+pack [ttk::label .optsf.format.l -text "Output format"] -anchor w
+ttk::radiobutton .optsf.format.pdf -text "pdf" \
+ -command set_widget_states -variable ::options(format) -value "pdf"
+ttk::radiobutton .optsf.format.eps -text "eps" -command set_widget_states \
+ -variable ::options(format) -value "eps"
+ttk::radiobutton .optsf.format.ps -text "ps" -command set_widget_states \
+ -variable ::options(format) -value "ps"
+pack .optsf.format.pdf -anchor w
+pack .optsf.format.eps -anchor w
+pack .optsf.format.ps -anchor w
# boundingbox
-pack [checkbutton .bbox -text "Compute tight boundingbox" \
- -variable ::options(bbox) -command set_widget_states] -anchor w
+pack [ttk::checkbutton .bbox -text "Compute tight boundingbox" \
+ -variable ::options(bbox) -command set_widget_states] \
+ -in .bg -anchor w -pady [list 10 0]
# page selection
-pack [frame .pagesf] -fill x
-pack [radiobutton .pagesf.all -text "Convert all pages" \
+pack [ttk::frame .pagesf] -in .bg -fill x
+pack [ttk::radiobutton .pagesf.all -text "Convert all pages" \
-variable ::options(pages) -value "all" -command set_widget_states] \
-side left
-pack [radiobutton .pagesf.single -text "Page:" \
+pack [ttk::radiobutton .pagesf.single -text "Page:" \
-variable ::options(pages) -value "single" -command set_widget_states] \
- -side left
+ -side left -padx [list 10 0]
pack [entry .pagesf.e -width 6 -textvariable ::options(page)] -side left
#.pagesf.e configure -vcmd {page_valid %W} -validate focusout \
# -invcmd "focusAndFlash %W [.pagesf.e cget -fg] [.pagesf.e cget -bg]"
.pagesf.e configure -vcmd {page_valid %W} -validate focusout \
-invcmd "see_red %W"
-spacing .
-
# temp files
-pack [checkbutton .clean -text "Remove temp files" \
- -variable ::options(clean)] -anchor w
+pack [ttk::checkbutton .clean -text "Remove temp files" \
+ -variable ::options(clean)] -in .bg -anchor w -pady [list 10 0]
proc focusAndFlash {w fg bg {count 9}} {
focus $w
@@ -720,17 +527,18 @@ proc page_valid {w} {
# end conversion options
-pack [label .status -justify left] -side bottom -anchor w -fill x -expand 1
+pack [ttk::label .status -justify left -text "Idle"] \
+ -in .bg -side bottom -anchor w -fill x -expand 1
# main buttons
-pack [frame .bottomf] -side bottom -fill x
-packb [button .bottomf.view -text "View" -command view] -side left
-packb [button .bottomf.open -text "Open" -command openDialog] \
+pack [ttk::frame .bottomf] -in .bg -side bottom -fill x
+ppack [ttk::button .bottomf.view -text "View" -command view] -side left
+ppack [ttk::button .bottomf.open -text "Open" -command openDialog] \
-side left -padx 2
-packb [button .bottomf.convert -text "Convert and save..." \
+ppack [ttk::button .bottomf.convert -text "Convert and save..." \
-command saveDialog] -side left -padx 2
-packb [button .bottomf.done -text "Done" -command exit] -side right
+ppack [ttk::button .bottomf.done -text "Done" -command exit] -side right
proc view {} {
if {! [viewable]} {
@@ -812,9 +620,7 @@ proc saveDialog {} {
# epspdf can read persistent options from configuration.
# only options from the options array need to be converted to parameters.
set args [list]
- if {$::options(gray) eq "gray"} {
- lappend args "-g"
- }
+ if {$::options(gray) eq "gray"} {lappend args "-g"}
if {$::options(bbox)} {lappend args "-b"}
if {! $::options(clean)} {lappend args "-d"}
if {$::options(pages) eq "single"} {
@@ -828,31 +634,36 @@ proc saveDialog {} {
}
update idletasks; # force immediate redisplay main window
- if {$::ge_85} {
- set failed [catch [linsert $args 0 \
- exec -ignorestderr $::texlua $::epspdf_tlu --gui=gui] result]
+ set cmd {} ; # necessary? if- and else blocks do not seem to define scopes
+ if {$::tcl_platform(platform) == "windows"} {
+ set cmd [linsert $args 0 exec -ignorestderr $::epspdf_cmd --gui=gui]
} else {
- set failed [catch [linsert $args 0 \
- exec $::texlua $::epspdf_tlu --gui=gui] result]
+ set cmd [linsert $args 0 exec -ignorestderr \
+ $::texlua $::epspdf_tlu --gui=gui]
}
+ set failed [catch $cmd result]
write_log $result
- if {$failed} {
+ if $failed {
tk_messageBox -icon error -type ok -message "Error; see log window"
} else {
set ::gfile(path) [file normalize $try]
set ::gfile(dir) [file dirname $::gfile(path)]
set ::gfile(type) $::options(format)
set ::gfile(name) [file tail $::gfile(path)]
- # parse result output
- regexp { is (\w+)(?: with (\d+) pages)?[\r\n]*$} \
- [string range $result [string last "File type of" $result] end] \
- mtc ::gfile(type) ::gfile(npages)
- if {$::gfile(type) eq "eps"} {set ::gfile(npages) 1}
+ if {$::gfile(type) eq "pdf"} {
+ if {! [catch {
+ exec $::texlua $::epspdf_tlu --gui=gui -i $::gfile(path)} \
+ result]} {
+ regexp {(\d+) pages\.$} $result mtc ::gfile(npages)
+ }
+ } elseif {$::gfile(type) eq "eps"} {
+ set ::gfile(npages) 1
+ }
set ::settings(default_dir) $::gfile(dir)
putsettings
set ::options(page) 1
}
- .status configure -text ""
+ .status configure -text "Idle"
foreach b {view open convert done} {
.bottomf.$b configure -state normal
}
diff --git a/Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua b/Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua
index aa7b01c66e9..33677933677 100755
--- a/Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua
+++ b/Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua
@@ -2,8 +2,8 @@
-- Copyright 2016-2018 Brian Dunn
-printversion = "v0.65"
-requiredconfversion = "1" -- also at *lwarpmk.conf
+printversion = "v0.66"
+requiredconfversion = "2" -- also at *lwarpmk.conf
function printhelp ()
print ("lwarpmk: Use lwarpmk -h or lwarpmk --help for help.") ;
@@ -103,6 +103,8 @@ end
-- Additional defaults:
confversion = "0"
opsystem = "Unix"
+imagesdirectory = "lateximages"
+imagesname = "image-"
latexmk = "false"
printlatexcmd = ""
HTMLlatexcmd = ""
@@ -164,6 +166,8 @@ elseif ( cvarname == "opsystem" ) then
elseif ( cvarname == "sourcename" ) then sourcename = cvalue
elseif ( cvarname == "homehtmlfilename" ) then homehtmlfilename = cvalue
elseif ( cvarname == "htmlfilename" ) then htmlfilename = cvalue
+elseif ( cvarname == "imagesdirectory" ) then imagesdirectory = cvalue
+elseif ( cvarname == "imagesname" ) then imagesname = cvalue
elseif ( cvarname == "latexmk" ) then latexmk = cvalue
elseif ( cvarname == "printlatexcmd" ) then printlatexcmd = cvalue
elseif ( cvarname == "HTMLlatexcmd" ) then HTMLlatexcmd = cvalue
@@ -379,34 +383,33 @@ end -- checkhtmlpdfexists
function warnlimages ()
--
--- Warning of a missing lateximages.txt file:
---
+-- Warning of a missing <sourcename>-images.txt file:
print ("lwarpmk: ===")
- print ("lwarpmk: \"lateximages.txt\" does not exist.")
+ print ("lwarpmk: \"" .. sourcename .. "-images.txt\" does not exist.")
print ("lwarpmk: Your project does not use SVG math or other lateximages,")
print ("lwarpmk: or the file has been deleted somehow.")
print ("lwarpmk: Use \"lwarpmk html\" to recompile your project")
- print ("lwarpmk: and recreate \"lateximages.txt\".")
+ print ("lwarpmk: and recreate \"" .. sourcename .. "-images.txt\".")
print ("lwarpmk: If your project does not use SVG math or other lateximages,")
- print ("lwarpmk: then \"lateximages.txt\" will never exist, and")
+ print ("lwarpmk: then \"" .. sourcename .. "-images.txt\" will never exist, and")
print ("lwarpmk: \"lwarpmk limages\" will not be necessary.")
print ("lwarpmk: ===")
end -- warnlimages
function checklimages ()
--
--- Check lateximages.txt to see if need to recompile first.
+-- Check <sourcename>.txt to see if need to recompile first.
-- If any entry has a page number of zero, then there were incorrect images.
--
-print ("lwarpmk: Checking for a valid lateximages.txt file.")
-local limagesfile = io.open("lateximages.txt", "r")
+print ("lwarpmk: Checking for a valid " .. sourcename .. "-images.txt file.")
+local limagesfile = io.open(sourcename .. "-images.txt", "r")
if ( limagesfile == nil ) then
warnlimages ()
os.exit(1)
end
-- Track warning to recompile if find a page 0
local pagezerowarning = false
--- Scan lateximages.txt
+-- Scan <sourcename>.txt
for line in limagesfile:lines() do
-- lwimgpage is the page number in the PDF which has the image
-- lwimghash is true if this filename is a hash
@@ -439,20 +442,20 @@ executecheckerror (
cmdgroupopenname ..
"pdfseparate -f " .. lwimgpage .. " -l " .. lwimgpage .. " " ..
sourcename .."_html.pdf " ..
- "lateximages" .. dirslash .."lateximagetemp-%d" .. ".pdf" ..
+ imagesdirectory .. dirslash .."lateximagetemp-%d" .. ".pdf" ..
seqname ..
-- Crop the image:
- "pdfcrop --hires lateximages" .. dirslash .. "lateximagetemp-" ..
+ "pdfcrop --hires " .. imagesdirectory .. dirslash .. "lateximagetemp-" ..
lwimgpage .. ".pdf " ..
- "lateximages" .. dirslash .. lwimgname .. ".pdf" ..
+ imagesdirectory .. dirslash .. lwimgname .. ".pdf" ..
seqname ..
-- Convert the image to svg:
- "pdftocairo -svg -noshrink lateximages" .. dirslash .. lwimgname .. ".pdf " ..
- "lateximages" .. dirslash .. lwimgname ..".svg" ..
+ "pdftocairo -svg -noshrink " .. imagesdirectory .. dirslash .. lwimgname .. ".pdf " ..
+ imagesdirectory .. dirslash .. lwimgname ..".svg" ..
seqname ..
-- Remove the temporary files:
- rmname .. " lateximages" .. dirslash .. lwimgname .. ".pdf" .. seqname ..
- rmname .. " lateximages" .. dirslash .. "lateximagetemp-" .. lwimgpage .. ".pdf" ..
+ rmname .. " " .. imagesdirectory .. dirslash .. lwimgname .. ".pdf" .. seqname ..
+ rmname .. " " .. imagesdirectory .. dirslash .. "lateximagetemp-" .. lwimgpage .. ".pdf" ..
cmdgroupclosename .. " >/dev/null " .. bgname
,
"File error trying to convert " .. lwimgfullname
@@ -495,7 +498,7 @@ end -- createwindowsimage
function createonelateximage ( line )
--
--- Given the next line of lateximages.txt, convert a single image.
+-- Given the next line of <sourcename>.txt, convert a single image.
--
-- lwimgpage is the page number in the PDF which has the image
-- lwimghash is true if this filename is a hash
@@ -508,7 +511,7 @@ if ( (i~=nil) ) then
pagezerowarning = true
else
-- Skip is this image is hashed and already exists:
- local lwimgfullname = "lateximages" .. dirslash .. lwimgname .. ".svg"
+ local lwimgfullname = imagesdirectory .. dirslash .. lwimgname .. ".svg"
if (
(lwimghash ~= "true") or
(lfs.attributes(lwimgfullname,"mode")==nil) -- file not exists
@@ -534,7 +537,7 @@ end -- createonelateximage
function createlateximages ()
--
--- Create lateximages based on lateximages.txt:
+-- Create lateximages based on <sourcename>.txt:
--
-- See if the document must be recompiled first:
checklimages ()
@@ -542,13 +545,13 @@ checklimages ()
checkhtmlpdfexists ()
-- Attempt to create the lateximages:
print ("lwarpmk: Creating lateximages.")
-local limagesfile = io.open("lateximages.txt", "r")
+local limagesfile = io.open(sourcename .. "-images.txt", "r")
if ( limagesfile == nil ) then
- warnlateximages ()
+ warnlimages ()
os.exit(1)
end
-- Create the lateximages directory, ignore error if already exists
-err = os.execute("mkdir lateximages")
+err = os.execute("mkdir " .. imagesdirectory)
-- For Windows, create lwarp_one_limage.cmd from lwarp_one_limage.txt:
if opsystem=="Windows" then
executecheckerror (
@@ -560,7 +563,7 @@ end -- create lwarp_one_limage.cmd
numimageprocesses = 0
-- Track warning to recompile if find a page 0
pagezerowarning = false
--- Scan lateximages.txt
+-- Scan <sourcename>.txt
for line in limagesfile:lines() do
createonelateximage ( line )
end -- do
@@ -758,7 +761,7 @@ os.execute(glossarycmd .. " " .. sourcename .. "_html")
updateanddone ()
-- lwarpmk limages:
--- Scan the lateximages.txt file to create lateximages.
+-- Scan the <sourcename>.txt file to create lateximages.
elseif arg[1] == "limages" then
loadconf ()
@@ -796,11 +799,11 @@ os.execute ( rmname .. " " ..
print ("lwarpmk: Done.")
-- lwarpmk cleanlimages
--- Remove images from the lateximages directory.
+-- Remove images from the imagesdirectory.
elseif arg[1] == "cleanlimages" then
loadconf ()
-os.execute ( rmname .. " lateximages/*" )
+os.execute ( rmname .. " " .. imagesdirectory .. dirslash .. "*" )
print ("lwarpmk: Done.")
-- lwarpmk epstopdf <list of file names>
diff --git a/Master/texmf-dist/doc/latex/lwarp/README.txt b/Master/texmf-dist/doc/latex/lwarp/README.txt
index 3a07e25a376..cf0b9cb4954 100644
--- a/Master/texmf-dist/doc/latex/lwarp/README.txt
+++ b/Master/texmf-dist/doc/latex/lwarp/README.txt
@@ -1,5 +1,5 @@
-LaTeX lwarp package v0.65 README.txt
+LaTeX lwarp package v0.66 README.txt
Files included are:
@@ -41,7 +41,7 @@ and version 1.3 or later is part of all distributions of LaTeX
version 2005/12/01 or later.
-Copyright 2016-2018 Brian Dunn
+Copyright 2016-2019 Brian Dunn
Homepage: http://BDTechConcepts.com
Email: bd@BDTechConcepts.com
diff --git a/Master/texmf-dist/doc/latex/lwarp/lwarp.pdf b/Master/texmf-dist/doc/latex/lwarp/lwarp.pdf
index 0f56931497c..619ca013f26 100644
--- a/Master/texmf-dist/doc/latex/lwarp/lwarp.pdf
+++ b/Master/texmf-dist/doc/latex/lwarp/lwarp.pdf
Binary files differ
diff --git a/Master/texmf-dist/scripts/lwarp/lwarpmk.lua b/Master/texmf-dist/scripts/lwarp/lwarpmk.lua
index aa7b01c66e9..33677933677 100755
--- a/Master/texmf-dist/scripts/lwarp/lwarpmk.lua
+++ b/Master/texmf-dist/scripts/lwarp/lwarpmk.lua
@@ -2,8 +2,8 @@
-- Copyright 2016-2018 Brian Dunn
-printversion = "v0.65"
-requiredconfversion = "1" -- also at *lwarpmk.conf
+printversion = "v0.66"
+requiredconfversion = "2" -- also at *lwarpmk.conf
function printhelp ()
print ("lwarpmk: Use lwarpmk -h or lwarpmk --help for help.") ;
@@ -103,6 +103,8 @@ end
-- Additional defaults:
confversion = "0"
opsystem = "Unix"
+imagesdirectory = "lateximages"
+imagesname = "image-"
latexmk = "false"
printlatexcmd = ""
HTMLlatexcmd = ""
@@ -164,6 +166,8 @@ elseif ( cvarname == "opsystem" ) then
elseif ( cvarname == "sourcename" ) then sourcename = cvalue
elseif ( cvarname == "homehtmlfilename" ) then homehtmlfilename = cvalue
elseif ( cvarname == "htmlfilename" ) then htmlfilename = cvalue
+elseif ( cvarname == "imagesdirectory" ) then imagesdirectory = cvalue
+elseif ( cvarname == "imagesname" ) then imagesname = cvalue
elseif ( cvarname == "latexmk" ) then latexmk = cvalue
elseif ( cvarname == "printlatexcmd" ) then printlatexcmd = cvalue
elseif ( cvarname == "HTMLlatexcmd" ) then HTMLlatexcmd = cvalue
@@ -379,34 +383,33 @@ end -- checkhtmlpdfexists
function warnlimages ()
--
--- Warning of a missing lateximages.txt file:
---
+-- Warning of a missing <sourcename>-images.txt file:
print ("lwarpmk: ===")
- print ("lwarpmk: \"lateximages.txt\" does not exist.")
+ print ("lwarpmk: \"" .. sourcename .. "-images.txt\" does not exist.")
print ("lwarpmk: Your project does not use SVG math or other lateximages,")
print ("lwarpmk: or the file has been deleted somehow.")
print ("lwarpmk: Use \"lwarpmk html\" to recompile your project")
- print ("lwarpmk: and recreate \"lateximages.txt\".")
+ print ("lwarpmk: and recreate \"" .. sourcename .. "-images.txt\".")
print ("lwarpmk: If your project does not use SVG math or other lateximages,")
- print ("lwarpmk: then \"lateximages.txt\" will never exist, and")
+ print ("lwarpmk: then \"" .. sourcename .. "-images.txt\" will never exist, and")
print ("lwarpmk: \"lwarpmk limages\" will not be necessary.")
print ("lwarpmk: ===")
end -- warnlimages
function checklimages ()
--
--- Check lateximages.txt to see if need to recompile first.
+-- Check <sourcename>.txt to see if need to recompile first.
-- If any entry has a page number of zero, then there were incorrect images.
--
-print ("lwarpmk: Checking for a valid lateximages.txt file.")
-local limagesfile = io.open("lateximages.txt", "r")
+print ("lwarpmk: Checking for a valid " .. sourcename .. "-images.txt file.")
+local limagesfile = io.open(sourcename .. "-images.txt", "r")
if ( limagesfile == nil ) then
warnlimages ()
os.exit(1)
end
-- Track warning to recompile if find a page 0
local pagezerowarning = false
--- Scan lateximages.txt
+-- Scan <sourcename>.txt
for line in limagesfile:lines() do
-- lwimgpage is the page number in the PDF which has the image
-- lwimghash is true if this filename is a hash
@@ -439,20 +442,20 @@ executecheckerror (
cmdgroupopenname ..
"pdfseparate -f " .. lwimgpage .. " -l " .. lwimgpage .. " " ..
sourcename .."_html.pdf " ..
- "lateximages" .. dirslash .."lateximagetemp-%d" .. ".pdf" ..
+ imagesdirectory .. dirslash .."lateximagetemp-%d" .. ".pdf" ..
seqname ..
-- Crop the image:
- "pdfcrop --hires lateximages" .. dirslash .. "lateximagetemp-" ..
+ "pdfcrop --hires " .. imagesdirectory .. dirslash .. "lateximagetemp-" ..
lwimgpage .. ".pdf " ..
- "lateximages" .. dirslash .. lwimgname .. ".pdf" ..
+ imagesdirectory .. dirslash .. lwimgname .. ".pdf" ..
seqname ..
-- Convert the image to svg:
- "pdftocairo -svg -noshrink lateximages" .. dirslash .. lwimgname .. ".pdf " ..
- "lateximages" .. dirslash .. lwimgname ..".svg" ..
+ "pdftocairo -svg -noshrink " .. imagesdirectory .. dirslash .. lwimgname .. ".pdf " ..
+ imagesdirectory .. dirslash .. lwimgname ..".svg" ..
seqname ..
-- Remove the temporary files:
- rmname .. " lateximages" .. dirslash .. lwimgname .. ".pdf" .. seqname ..
- rmname .. " lateximages" .. dirslash .. "lateximagetemp-" .. lwimgpage .. ".pdf" ..
+ rmname .. " " .. imagesdirectory .. dirslash .. lwimgname .. ".pdf" .. seqname ..
+ rmname .. " " .. imagesdirectory .. dirslash .. "lateximagetemp-" .. lwimgpage .. ".pdf" ..
cmdgroupclosename .. " >/dev/null " .. bgname
,
"File error trying to convert " .. lwimgfullname
@@ -495,7 +498,7 @@ end -- createwindowsimage
function createonelateximage ( line )
--
--- Given the next line of lateximages.txt, convert a single image.
+-- Given the next line of <sourcename>.txt, convert a single image.
--
-- lwimgpage is the page number in the PDF which has the image
-- lwimghash is true if this filename is a hash
@@ -508,7 +511,7 @@ if ( (i~=nil) ) then
pagezerowarning = true
else
-- Skip is this image is hashed and already exists:
- local lwimgfullname = "lateximages" .. dirslash .. lwimgname .. ".svg"
+ local lwimgfullname = imagesdirectory .. dirslash .. lwimgname .. ".svg"
if (
(lwimghash ~= "true") or
(lfs.attributes(lwimgfullname,"mode")==nil) -- file not exists
@@ -534,7 +537,7 @@ end -- createonelateximage
function createlateximages ()
--
--- Create lateximages based on lateximages.txt:
+-- Create lateximages based on <sourcename>.txt:
--
-- See if the document must be recompiled first:
checklimages ()
@@ -542,13 +545,13 @@ checklimages ()
checkhtmlpdfexists ()
-- Attempt to create the lateximages:
print ("lwarpmk: Creating lateximages.")
-local limagesfile = io.open("lateximages.txt", "r")
+local limagesfile = io.open(sourcename .. "-images.txt", "r")
if ( limagesfile == nil ) then
- warnlateximages ()
+ warnlimages ()
os.exit(1)
end
-- Create the lateximages directory, ignore error if already exists
-err = os.execute("mkdir lateximages")
+err = os.execute("mkdir " .. imagesdirectory)
-- For Windows, create lwarp_one_limage.cmd from lwarp_one_limage.txt:
if opsystem=="Windows" then
executecheckerror (
@@ -560,7 +563,7 @@ end -- create lwarp_one_limage.cmd
numimageprocesses = 0
-- Track warning to recompile if find a page 0
pagezerowarning = false
--- Scan lateximages.txt
+-- Scan <sourcename>.txt
for line in limagesfile:lines() do
createonelateximage ( line )
end -- do
@@ -758,7 +761,7 @@ os.execute(glossarycmd .. " " .. sourcename .. "_html")
updateanddone ()
-- lwarpmk limages:
--- Scan the lateximages.txt file to create lateximages.
+-- Scan the <sourcename>.txt file to create lateximages.
elseif arg[1] == "limages" then
loadconf ()
@@ -796,11 +799,11 @@ os.execute ( rmname .. " " ..
print ("lwarpmk: Done.")
-- lwarpmk cleanlimages
--- Remove images from the lateximages directory.
+-- Remove images from the imagesdirectory.
elseif arg[1] == "cleanlimages" then
loadconf ()
-os.execute ( rmname .. " lateximages/*" )
+os.execute ( rmname .. " " .. imagesdirectory .. dirslash .. "*" )
print ("lwarpmk: Done.")
-- lwarpmk epstopdf <list of file names>
diff --git a/Master/texmf-dist/source/latex/lwarp/lwarp.dtx b/Master/texmf-dist/source/latex/lwarp/lwarp.dtx
index 67e54f5c022..e49d34f4402 100644
--- a/Master/texmf-dist/source/latex/lwarp/lwarp.dtx
+++ b/Master/texmf-dist/source/latex/lwarp/lwarp.dtx
@@ -1,7 +1,7 @@
%
% \iffalse meta-comment
%
-% Copyright 2016-2018 Brian Dunn
+% Copyright 2016-2019 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> [2018/12/22 v0.65 Allows LaTeX to directly produce HTML5 output.]
+%<package> [2019/02/08 v0.66 Allows LaTeX to directly produce HTML5 output.]
%
%<*driver>
\documentclass{ltxdoc}
@@ -24,10 +24,11 @@
\usepackage{lmodern}
% \usepackage{libertine}
\usepackage[space]{erewhon}
-% \usepackage[varqu,varl]{inconsolata} % typewriter
-% \usepackage{roboto}
+\usepackage[varqu,varl]{inconsolata} % typewriter
+\usepackage{roboto}
+% \usepackage{sourcesanspro}
% \usepackage{cabin}
-\usepackage[tabular,semibold]{sourcesanspro}
+% \usepackage[tabular,semibold]{sourcesanspro}
\usepackage[T1]{fontenc}
@@ -130,11 +131,21 @@
\definecolor{codecolor}{rgb}{0,.4,.2}
\definecolor{overviewcolor}{rgb}{0,.2,.4}
+\usepackage[
+ left=2in,
+ right=1.5in,
+ top=1.5in,
+ bottom=1in
+]{geometry}
\usepackage{graphicx}
\graphicspath{{images/}}
+
\usepackage{metalogo}
+
+\makeatletter
+\@ifpackageloaded{erewhon}{
% for erewhon:
\setlogokern{Te}{-.08em}
\setlogokern{eX}{-0.04em}
@@ -143,6 +154,9 @@
\setlogokern{Xe}{-.04em}
\setlogokern{eL}{-.06em}
\setlogodrop{0.27ex}
+}{}
+\makeatother
+
\usepackage{enumitem}
@@ -182,70 +196,7 @@
\pagestyle{pageheadfoot}
-
-
-\usepackage{dtxdescribe}
-
-
-\DeclareRobustCommand{\thinskip}{\hskip 0.16667em\relax}
-\def\endash{–}
-\def\emdash{—}
-% \def\d@sh#1#2{\unskip#1\thinskip#2\thinskip\ignorespaces}
-% \def\dash{\d@sh\nobreak\endash}
-% \def\Dash{\d@sh\nobreak\emdash}
-\newcommand{\thinbrspace}{\hspace{.16667em}\penalty\exhyphenpenalty\hspace{0pt}}
-\newrobustcmd{\Dash}{\unskip\thinspace\textemdash\thinbrspace}
-\newrobustcmd{\dash}{\unskip\thinspace\mbox{--}\thinbrspace}
-\newrobustcmd{\Slash}{\unskip\thinspace/\thinbrspace}
-
-
-\newcommand{\ItemDescribeMacro}[1]{%
-\item[\cmd{#1}:]%
-\setlength{\parskip}{1.5ex}%
-\DescribeMacro{#1}%
-}
-
-\newcommand{\ItemDescribeEnv}[1]{%
-\item[\env{#1}:]%
-\setlength{\parskip}{1.5ex}%
-\DescribeEnv{#1}%
-}
-
-\newcommand{\ItemDescribeOption}[1]{%
-\item[\texttt{#1}:]%
-\setlength{\parskip}{1.5ex}%
-\DescribeOption{#1}%
-}
-
-\newcommand{\ItemDescribeCounter}[1]{%
-\item[\texttt{#1}:]%
-\setlength{\parskip}{1.5ex}%
-\DescribeCounter{#1}%
-}
-
-\newcommand{\ItemDescribeBoolean}[1]{%
-\item[\texttt{#1}:]%
-\setlength{\parskip}{1.5ex}%
-\DescribeBoolean{#1}%
-}
-
-% A macro which is not indexed:
-\makeatletter
-\newenvironment{noindmacro}[1]
-{
-\setlength{\parskip}{\marginparpush}
-\leavevmode\par\DTXD@margintag{}{\cmd{#1}}{}}
-{\unskip}
-\makeatother
-
-% An environment which is not indexed:
-\makeatletter
-\newenvironment{noindenvironment}[1]
-{
-\setlength{\parskip}{\marginparpush}
-\leavevmode\par\DTXD@margintag{}{#1}{Env}}
-{\unskip}
-\makeatother
+\usepackage{dtxdescribe}[2019/01/11]
\usepackage{splitidx}
@@ -281,24 +232,6 @@ Keywords={LaTeX, HTML, conversion}%
}}
-\pdfstringdefDisableCommands{
-\def\quad{ }
-\def\\{ }
-\def\pkg#1{#1}
-\def\cs#1{\textbackslash#1}
-\def\env#1{#1}
-\def\,{ }
-\def\prog#1{#1}
-\def\LuaLaTeX{LuaLaTeX}
-\def\XeLaTeX{XeLaTeX}
-\def\TeX{TeX}
-\def\LaTeX{LaTeX}
-\def\Dash{ --- }
-\def\dash{ -- }
-\def\element#1{#1}
-\def\attribute#1{#1}
-}
-
\usepackage{cleveref}
@@ -306,55 +239,19 @@ Keywords={LaTeX, HTML, conversion}%
\renewcommand{\partname}{Package}
\renewcommand*{\thepart}{\arabic{part}}
-
-\providerobustcmd*{\lmacro}[1]{\textbackslash#1}
-\providerobustcmd*{\cmds}[1]{\mbox{\texttt{\textbf{\textsl{#1}}}}}
-\providerobustcmd*{\env}[1]{\mbox{\texttt{#1}}}
-\providerobustcmd*{\ctr}[1]{\mbox{\texttt{#1}}}
-\providerobustcmd*{\bool}[1]{\mbox{\texttt{#1}}}
-
-% \providerobustcmd*{\pkg}[1]{\mbox{\textbf{\textsf{#1}}}}
-% \providerobustcmd*{\prog}[1]{\mbox{\textbf{\textsf{#1}}}}
-\providerobustcmd*{\pkg}[1]{\mbox{\textsf{#1}}}
-\providerobustcmd*{\prog}[1]{\mbox{\textsf{\textsl{#1}}}}
-
-\providerobustcmd*{\progcode}[1]{\mbox{\texttt{#1}}}
-\providerobustcmd*{\optn}[1]{\mbox{\texttt{#1}}}
-\providerobustcmd*{\filenm}[1]{\mbox{\texttt{#1}}}
-
-\providerobustcmd*{\brand}[1]{\textsc{#1}}
-
-\newrobustcmd{\acro}[1]{\textsc{\lowercase{#1}}}
-\newrobustcmd{\element}[1]{\texttt{<#1>}}
-\newrobustcmd{\attribute}[1]{\mbox{\texttt{#1}}}
-\newrobustcmd{\UI}[1]{\textbf{\textsf{#1}}}
-
-\newrobustcmd{\supregistered}{\textsuperscript{\textregistered}}
-
-\newrobustcmd{\TOC}{\acro{TOC}}
-\newrobustcmd{\LOF}{\acro{LOF}}
-\newrobustcmd{\LOT}{\acro{LOT}}
-
-\newrobustcmd{\HTML}{\acro{HTML}}
-\newrobustcmd{\HTMLfive}{\HTML\textsc{5}}
-\newrobustcmd{\CSS}{\acro{CSS}}
-\newrobustcmd{\CSSthree}{\CSS\textsc{3}}
-\newrobustcmd{\EPUB}{\acro{EPUB}}
-\newrobustcmd{\ODT}{\acro{ODT}}
-\newrobustcmd{\SVG}{\acro{SVG}}
-\newrobustcmd{\PNG}{\acro{PNG}}
-\newrobustcmd{\GIF}{\acro{GIF}}
-\newrobustcmd{\JPG}{\acro{JPG}}
-\newrobustcmd{\EPS}{\acro{EPS}}
-\newrobustcmd{\PDF}{\acro{PDF}}
-\newrobustcmd{\DVI}{\acro{DVI}}
-\newrobustcmd{\tikz}{Ti\textit{k}z}
-\newrobustcmd{\MathML}{Math\acro{ML}}
-\newrobustcmd{\CTAN}{\acro{CTAN}}
-\newrobustcmd{\TDS}{\acro{TDS}}
-\newrobustcmd{\UTF}{\acro{UTF}}
-
-\newcommand{\spslash}{\unskip\kern.085em/\hspace{.085em}\penalty\exhyphenpenalty\hspace{0pt}}
+\renewenvironment{abstract}
+ {
+ \addvspace{\bigskipamount}
+ \begin{center}
+ \textbf{\abstractname}
+ \end{center}
+% \small
+ \setlength{\parindent}{2em}
+ \setlength{\parskip}{0ex}
+ }
+ {
+ \addvspace{\bigskipamount}
+ }
\makeatletter
\newcommand*{\rulebreak}{%
@@ -362,8 +259,6 @@ Keywords={LaTeX, HTML, conversion}%
}
\makeatother
-\newcommand{\DescribeDefault}[1]{\margintag{\footnotesize \textgreen{Default: \texttt{#1}}}}
-
\newcommand{\goesto}{$\Rightarrow$}
\newcommand{\credits}[1]{{\footnotesize(\textit{Emulates or patches code by} \textsc{#1}.)}}
@@ -375,78 +270,15 @@ Keywords={LaTeX, HTML, conversion}%
\newcommand*{\testthis}{\textcolor{blue}{Please send bug reports!}\watchout[Not fully tested!]}
-\newcommand*{\fquad}{\hspace*{1em}}
-\newcommand*{\fqquad}{\hspace*{2em}}
-\newcommand*{\fqqquad}{\hspace*{3em}}
-
\newcommand{\textred}[1]{\textcolor{red}{#1}}
\newcommand{\textgreen}[1]{\textcolor{green!50!black}{#1}}
\newcommand{\textblue}[1]{\textcolor{blue!70!black}{#1}}
-\newcommand{\userentry}[1]{%
-\par
-\fqquad\begin{minipage}{\linewidth-2em}
-{\footnotesize Enter~$\Rightarrow$}\quad\texttt{#1}
-\end{minipage}
-\par
-}
-
-\newenvironment{sourcedisplay}
-{
-\leavevmode
-\par
-\fqquad\minipage{\linewidth-2em}
-\ttfamily
-}
-{%
-\endminipage
-\par
-}
-
-\newenvironment{UIdisplay}
-{
-\leavevmode
-\par
-\fqquad\minipage{\linewidth-2em}
-\sffamily\bfseries
-}
-{
-\endminipage
-\par
-}
-
-\newenvironment{docsidebar}[1][]
-{%
-\ifblank{#1}{}{\medskip}%
-\hfill\minipage{.9\linewidth}%
-\setlength{\parskip}{1.5ex}%
-\ifblank{#1}{}{\textit{#1}}%
-\leavevmode\smallskip\hrule%
-}
-{\smallskip\hrule\endminipage\hspace*{\fill}\bigskip}
-
\newcommand{\pdflatexonly}{
\textred{Only pre-loaded if \prog{pdflatex} is being used.}
\marginpar{\raggedleft\textblue{\prog{pdflatex} only:}}
}
-% From package dtxdescribe:
-% \makeatletter
-% \renewcommand{\watchout}[1][]{%
-% \@ifundefined{@captype}{% not float?
-% % \@bsphack%
-% \marginpar{\raggedleft%
-% \textcolor{red!50!black}{\warningsign\normalsize\quad#1}}%
-% % \@esphack%
-% \ignorespaces%
-% }{}% not float?
-% }
-% \makeatother
-
-% \newcommand{\margintag}[1]{%
-% \marginpar{\raggedleft\textblue{#1}}%
-% }
-
% \trouble[watchout phrase]{index entry}
\newcommand*{\trouble}[2][]{%
@@ -469,6 +301,7 @@ the \nameref{sec:indextrb} if something doesn't work.
The \nameref{sec:indexidx} contains automated entries for each package, macro, environment,
counter, boolean, and other objects; individually and also sorted by category.
A \nameref{sec:troubleshooting} section is also available.
+\smallskip
\hrule
\end{minipage}\margintag{Need help?}
}
@@ -567,7 +400,7 @@ but does not require that \pkg{hyperref} be loaded by the document.
Do not place a comment with a \texttt{\%} character between arguments
\trouble[comments between arguments]{hyperref=\pkg{hyperref}>comments between arguments}
-for \cs{hyperref}, etc., as it is neutralized for inclusion in \HTML\ \acro{URL}s.
+for \cs{hyperref}, etc., as it is neutralized for inclusion in \HTML\ \URL{}s.
\pkg{lwarp} can also load \pkg{url}, but \pkg{url} should not be used at the
same time as \pkg{hyperref}, since they both define the \cs{url} command.
@@ -583,7 +416,7 @@ automatically load \pkg{backref}, so \pkg{backref} must be loaded explicitly.
\newcommand{\limitsabstract}{%
If using the \optn{number} option with file splits,
-\trouble[missing \acro{TOC}]{abstract>missing \acro{TOC}}
+\trouble[missing \TOC]{abstract>missing \TOC}
be sure to place the table of contents before the abstract.
The \optn{number} option causes a section break which
may cause a file split, which would put a table of contents out
@@ -607,28 +440,12 @@ See \cref{sec:publishedsubtitle}.
\newcommand{\limitsappendix}{%
During \HTML\ conversion, the option \optn{toc} without
-\trouble[incorrect \acro{TOC} link]{appendix>incorrect \acro{TOC} link}
-the option \optn{page} results in a \acro{TOC} link to
+\trouble[incorrect \TOC\ link]{appendix>incorrect \TOC\ link}
+the option \optn{page} results in a \TOC\ link to
whichever section was before the \texttt{appendices} environment.
It is recommended to use both \texttt{toc} and also \texttt{page} at the same time.
}
-\newcommand{\limitsxindylanguage}{%
-The \pkg{lwarp} package option
-\DescribeOption{xindyLanguage}
-\DescribeDefault{english}
-\optn{xindyLanguage} sets the language used by \prog{xindy}.
-This is passed to \prog{xindy} using its \optn{-L} option
-when using \cmds{lwarpmk printindex} and \cmds{lwarpmk htmlindex}.
-
-The option
-\DescribeOption{xindyCodepage}
-\DescribeDefault{utf8}
-\optn{xindycodepage} sets the codepage used by \prog{xindy}.
-This is passed to \prog{xindy} using its \optn{-C} option
-when using \cmds{lwarpmk printindex} and \cmds{lwarpmk htmlindex}.
-}
-
\newcommand{\limitspdftotextenc}{%
The option
\DescribeOption{pdftotextEnc}
@@ -664,14 +481,14 @@ To do so, add to the start of the \filenm{.bib} file the following:
\DescribeOption[lwarpmk]{htmlglossary}
\prog{lwarpmk} has the commands \texttt{lwarpmk printglossary} and
\texttt{lwarpmk htmlglossary}, which process the glossaries created by the
-\pkg{glossaries} package using that package's \cmds{makeglossaries} command.
+\pkg{glossaries} package using that package's \prog{makeglossaries} program.
The shell command to execute is set by the \pkg{lwarp} option \optn{GlossaryCmd},
which defaults to \cmds{makeglossaries}.
The print or \HTML\ glossary filename is appended to this command.
In some situations it may be required to modify the default command,
-\trouble[\cmds{makeglossaries} not found]{makeglossaries=\prog{makeglossaries}>not found}
+\trouble[\prog{makeglossaries} not found]{makeglossaries=\prog{makeglossaries}>not found}
\trouble{glossaries=\pkg{glossaries}>makeglossaries=\prog{makeglossaries} not found}
such as to add the \cmds{perl} command in front:
\begin{sourcedisplay}
@@ -687,11 +504,11 @@ To set the language to use for processing glossaries with \prog{xindy}:
\fquad\ GlossaryCmd=\{makeglossaries \textred{-L english}\}, \\
] \{lwarp\}
\end{sourcedisplay}
-Other options for \cmds{makeglossaries} may be set as well.
+Other options for \prog{makeglossaries} may be set as well.
The glossaries may be placed in a numbered or unnumbered section, given
-\margintag{placement and \acro{TOC} options}
-a \acro{TOC} entry, and placed inline or on their own \HTML\ page:
+\margintag{placement and \TOC\ options}
+a \TOC\ entry, and placed inline or on their own \HTML\ page:
\begin{description}
\item [Numbered section, on its own \HTML\ page:]
@@ -736,8 +553,8 @@ though the page number is currently ignored.
\newcommand{\limitstocbibind}{%
An index may be placed inline with other \HTML\ text, or on its own \HTML\ page:
-\margintag{placement and \acro{TOC} options}
-\gindex{index>placement and \acro{TOC} options}
+\margintag{placement and \TOC\ options}
+\gindex{index>placement and \TOC\ options}
\gindex{index>table of contents}
\begin{description}
@@ -771,7 +588,7 @@ An index may be placed inline with other \HTML\ text, or on its own \HTML\ page:
\DescribePackage{tocbibind}
The \pkg{tocbibind}
- package may be used to automatically place an entry in the \acro{TOC}.
+ package may be used to automatically place an entry in the \TOC.
\begin{sourcedisplay}
\cs{usepackage}[nottoc]\{tocbibind\} \\
\dots \\
@@ -854,7 +671,7 @@ allowing other packages to work with it.
}
\newcommand*{\limitsendnotes}{%
-To place the endnotes in the \acro{TOC}, use:
+To place the endnotes in the \TOC, use:
\margintag{table of contents}
\begin{sourcedisplay}
\cs{usepackage}\{endnotes\} \\
@@ -1062,6 +879,16 @@ loading \pkg{lwarp}:
\cs{usepackage\{package\_name\}}
\end{sourcedisplay}
+\pkg{memoir} emulates a number of packages, and declares a version date for each
+\trouble[version numbers]{memoir=\pkg{memoir}>version clash}
+\trouble{package>version numbers with \pkg{memoir}}
+\trouble{version numbers>with \pkg{memoir}}
+which often does not match the date of the corresponding freestanding package.
+This can cause warnings about incorrect version numbers.
+Since \pkg{lwarp} is intended to support the freestanding packages,
+which are often newer than the date declared by \pkg{memoir}, it is hoped that
+\pkg{memoir} will update and change its emulated version numbers to match.
+
\cs{verbfootnote} is not supported.
\cs{newfootnoteseries}, etc. are not supported.
@@ -1091,16 +918,11 @@ but it will only work for print output.
\pkg{lwarp} provides \cs{attribution}, which
works for both print and \HTML\ output. To combine the two so that
\cs{attrib} is used for print and \cs{attribution} is used for \HTML:
-
-\begin{docsidebar}
-\raggedright
-\ttfamily
-\cs{begin}\{warpHTML\}
-
-\cs{let}\cs{attrib}\cs{attribution}
-
+\begin{sourcedisplay}
+\cs{begin}\{warpHTML\} \\
+\cs{let}\cs{attrib}\cs{attribution} \\
\cs{end}\{warpHTML\}
-\end{docsidebar}
+\end{sourcedisplay}
\DescribeLength{\vleftskip}
\DescribeLength{\vleftmargini}
@@ -1149,6 +971,10 @@ which defaults to:
\newcommand{\limitsmath}{%
+
+\subsubsection{Math in section names}
+\limitsmathinsectionnames
+
\subsubsection{Rendering tradeoffs}
Math may be rendered
@@ -1381,6 +1207,20 @@ Examples:
%\end{sourcedisplay}
%}
+\newcommand*{\limitsmathinsectionnames}{
+if using named files, in section names use paren math \texttt{\textbackslash(x+y\textbackslash)}
+\trouble[math in section names]{filename>math in}
+\trouble{sectioning>math in name}
+\trouble{math>section name}
+\trouble{math>file name}
+instead of dollar math \texttt{\$x+y\$}.
+(Dollar math works, but appears in the filename.)
+Or, use a short name for the \TOC\ entry without the math, or use
+\begin{sourcedisplay}
+\cs{section}\{\cs{texorpdfstring}\{\$1+2=3\$\}\{text description\}\}
+\end{sourcedisplay}
+}
+
\newcommand{\limitschemfig}{%
If using \cs{polymerdelim} to add delimiters to a \cs{chemfig},
wrap both inside a single \env{lateximage}:
@@ -1429,6 +1269,8 @@ It is recommended to use \pkg{cleveref} instead of \pkg{ntheorem}'s
}
\newcommand{\limitsgraphics}{%
+\limitsincludegraphicsscale
+
For \cs{includegraphics} with \filenm{.pdf} or \filenm{.eps} files,
\gindex{graphics>formats}
\gindex{includegraphics=\cs{includegraphics}>using}
@@ -1514,7 +1356,7 @@ enclose them inside \env{warpHTML} environments.
For font-proportional image sizes, use \texttt{ex} or \texttt{em}.
For fixed-sized images, use
\texttt{cm}, \texttt{mm}, \texttt{in}, \texttt{pt}, or \texttt{pc}.
-Use the keys \optn{width=.5\lmacro{linewidth}},
+Use the keys \optn{width=.5\cs{linewidth}},
or similar for \cs{textwidth} or \cs{textheight}
to give fixed-sized images proportional to a 6 by 9 inch text area.
Do not use the \optn{scale} option, since it is not well supported by \HTML\ browsers.
@@ -1547,6 +1389,19 @@ unlike \LaTeX{}, so expect some
ugly results for scaling and rotating.
}
+\newcommand*{\limitsincludegraphicsscale}{
+Avoid using the \cs{includegraphics} \optn{scale} option. Change:
+\trouble[\optn{scale}]{scale=\optn{scale} (\cs{includegraphics} option)}
+\trouble{includegraphics=\cs{includegraphics}>scale=\optn{scale}}
+\trouble{graphics>scale=\optn{scale} option}
+\begin{sourcedisplay}
+\cs{includegraphics}[scale=<xx>]\{\,\dots\}
+\end{sourcedisplay} to:
+\begin{sourcedisplay}
+\cs{includegraphics}[width=<yy>\textbackslash{linewidth}]\{\,\dots\}
+\end{sourcedisplay}
+}
+
\newcommand{\limitssvgimages}{%
When a math expression, \env{picture}, or \tikz\ environment is added or
\trouble[adding/removing]{SVG image>out of order}
@@ -1744,7 +1599,7 @@ following, especially if working with environments, macros inside tabulars,
multirows, \texttt{*} column specifiers, \pkg{siunitx} \texttt{S} columns,
or the packages \pkg{multirow}, \pkg{longtable}, \pkg{supertabular}, or \pkg{xtab}.
\begin{description}
-\item [Defining environments:] \
+\item [Defining macros and environments:] \
\begin{itemize}
\item When defining environments or macros which include \env{tabular} and
\trouble[Misplaced alignment tab character \&]%
@@ -1984,7 +1839,7 @@ Keep the \cs{endfirsthead} row, which is still relevent to \HTML\ output.
\begin{sourcedisplay}
\cs{begin}\{warpprint\} \ldots\ \cs{end}\{warpprint\}
\end{sourcedisplay}
-or place it inside \cs{warpingprintonly}.
+or place it inside \cs{warpprintonly}.
\pkg{longtable} is not supported inside a \env{lateximage}.%
\watchout[lateximage]
@@ -2081,57 +1936,73 @@ the page will be corrupted.
}
\newcommand{\limitsminipage}{%
-A line of text with an inline minipage
+A line of text with an inline \env{minipage}
\trouble[inline]{minipage>inline}
-or parbox will have the minipage or parbox placed onto its own line,
+or \cs{parbox} will have the \env{minipage} or \cs{parbox} placed onto its own line,
because a paragraph is a block element and cannot be made \attribute{inline-block}.
-Minipages and parboxes will be placed side-by-side in \HTML\
+\env{minipage}s and \cs{parbox}es will be placed side-by-side in \HTML\
\margintag{placement}
unless you place a \cs{newline} between them.
-Side-by-side minipages may be separated by \cs{quad}, \cs{qquad}, \cs{enskip},
+Side-by-side \env{minipage}s may be separated by \cs{quad}, \cs{qquad}, \cs{enskip},
\margintag{side-by-side}
\cs{hspace}, \cs{hfill}, or a \cs{rule}.
When inside a \env{center} environment, the result is
similar in print and \HTML. Paragraph tags are suppressed between
-side-by-side minipages and these spacing commands, but not at the start or end
+side-by-side \env{minipage}s and these spacing commands, but not at the start or end
of the paragraph.
-There is limited support for minipages inside an \HTML\ \element{span}.
-\margintag{in a span}
-\trouble{minipage>in a span}
+There is limited support for \env{minipage}s inside an \HTML\ \element{span}.
+\trouble[minipage in a span]{minipage>in a span}
An \HTML\ \element{div} cannot appear inside a \element{span}.
-While in a \element{span}, minipages, and parboxes, and any enclosed lists
+While in a \element{span}, \env{minipage}s, and \cs{parbox}es, and any enclosed lists
have limited \HTML\ tags, resulting in an ``inline'' format, without markup
except for \HTML\ breaks.
Use \cs{newline} or \cs{par} for an \HTML\ break.
When using \cs{linewidth}, \cs{textwidth}, and \cs{textheight},
-\margintag{size}
-widths and heights are scaled proportionally to a 6\texttimes{}9 inch text area.
+\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 minipage of width exactly \cs{linewidth} is automatically
-given no \HTML\ width.
-\margintag{no-width minipages}
+If a \env{minipage} or \cs{parbox} is assigned a width of exactly \cs{linewidth},
+\margintag{if width is \cs{linewidth}}
+in \HTML\ it is automatically given no \HTML\ width,
+thus allowed to fill the line as needed, similar to how it appears in print output.
A new macro \cs{minipagefullwidth} requests
-\margintag{full-width minipages}
-that the next minipage be generated
+\margintag{full-width if \HTML}
+that, during \HTML\ output, the next single \env{minipage} or \cs{parbox} be generated
without an \HTML\ \attribute{width} attribute, allowing it to be the full width of
-the display rather than the fixed width given.
-
-Nested minipages adopt their parent's text alignment in \HTML,
-whereas in regular \LaTeX{} \PDF\ output they do not.
+the display rather than the declared print-output width. This may be useful where
+the printed version's width makes no sense in \HTML.
+
+Inside a \env{tabular} or \env{multicols} environment,
+\trouble[\env{tabular}, \env{multicols}]{minipage>tabular=\env{tabular}, width in}
+\trouble{minipage>multicols=\env{multicols}, width in}
+where the width depends on the browser window,
+\cs{minipagefullwidth} is effectively used by default for
+every \env{minipage} or \cs{parbox} inside the environment.
+\DescribeMacro{\UseMinipageWidths}
+\DescribeMacro{\IgnoreMinipageWidths}
+\cs{UseMinipageWidths} may be used to tell \pkg{lwarp} to honor the specified
+widths of all following \env{minipage}s and \cs{parboxes} until the end
+of the local scope, and \cs{IgnoreMinipageWidths} may be used to tell \pkg{lwarp} to
+ignore the specified widths.
+
+Nested \env{minipage}s adopt their parent's text alignment in \HTML,
\trouble[text alignment]{minipage>alignment}
-Use a \env{flushleft} or similar environment in the child minipage
+whereas in regular \LaTeX{} \PDF\ output they do not.
+Use a \env{flushleft} or similar environment in the child \env{minipage}
to force a text alignment.
}
\newcommand{\limitsfancybox}{%
\pkg{fancybox}'s documentation has an example \env{FramedEqn} environment
\margintag{framed equation example}
-which combines math, \cs{Sbox}, a minipage, and an \cs{fbox}.
+which combines math, \cs{Sbox}, a \env{minipage}, and an \cs{fbox}.
This combination requires that the entire
environment be enclosed inside a \env{lateximage}, which is done by
adding \cs{lateximage} at the very start of \env{FramedEqn}'s beginning code, and
@@ -2242,7 +2113,7 @@ and likewise for subsubtitles.
\newcommand{\limitscaption}{%
To pass options to caption, select the options before loading \pkg{lwarp}:
-\trouble[options]{caption>options}
+\trouble[options]{caption=\pkg{caption}>options}
\begin{sourcedisplay}
\cs{documentclass}\{article\} \\
\dots \\
@@ -2255,13 +2126,17 @@ To pass options to caption, select the options before loading \pkg{lwarp}:
To ensure proper float numbering, set caption positions
such as:
-\trouble[numbering]{caption>numbering}
+\trouble[numbering]{caption=\pkg{caption}>numbering}
+\trouble{subcaption=\pkg{subcaption}>numbering}
\begin{sourcedisplay}
+\cs{captionsetup}[figure]\{position=bottom\} \\
+\cs{captionsetup}[subfigure]\{position=bottom\} \\
\cs{captionsetup}[table]\{position=top\} \\
-\cs{captionsetup}[figure]\{position=bottom\}
+\cs{captionsetup}[subtable]\{position=top\}
\end{sourcedisplay}
-Similarly for \pkg{subtable}, \pkg{subfigure},
-and \pkg{longtable}.
+Similarly for \pkg{longtable}.
+These positions depend on where the user places the \cs{caption} command
+inside each float.
}
\newcommand{\limitscombiningfloats}{%
@@ -2432,15 +2307,14 @@ the \HTML\ version should work as well using \pkg{lwarp}.
\pkg{newclude} modifies \cs{label} in a non-adaptive way, so
\pkg{newclude} must be loaded before \pkg{lwarp} is loaded:
\trouble[loading]{newclude=\pkg{newclude}}
-
-\begin{docsidebar}
+\begin{sourcedisplay}
\raggedright
\cs{documentclass\{article\}} \\
\ldots <font setup> \\
\cs{usepackage\{newclude\}} \\
\cs{usepackage[warpHTML]\{lwarp\}} \\
\ldots
-\end{docsidebar}
+\end{sourcedisplay}
}
\newcommand{\limitstodonotes}{%
@@ -2567,7 +2441,7 @@ This boolean may be tested by the user for later use.
%<*package>
% \fi
%
-% \CheckSum{27403}
+% \CheckSum{27831}
%
% \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
@@ -2614,7 +2488,7 @@ This boolean may be tested by the user for later use.
% \changes{v0.18}{2016/04/23}{File: lwarp.css: Improved \TOC\ outline display.}
% \changes{v0.18}{2016/05/13}{Test Suite: Verse package}
% \changes{v0.19}{2016/06/08}{\ 2016/06/08}
-% \changes{v0.19}{2016/05/25}{File: \filenm{lwarp\_mathjax.txt} added.}
+% \changes{v0.19}{2016/05/25}{File: \filenm{lwarp_mathjax.txt} added.}
% \changes{v0.19}{2016/06/01}{File: \filenm{lwarp.css}: \attribute{tnoteitemheader} added.}
% \changes{v0.20}{2017/02/09}{\ 2017/02/09}
% \changes{v0.20}{2016/06/27}{Test Suite: \HTML\ meta descriptions.}
@@ -2675,6 +2549,7 @@ This boolean may be tested by the user for later use.
% \changes{v0.63}{2018/12/03}{\ 2018/12/03}
% \changes{v0.64}{2018/12/08}{\ 2018/12/08}
% \changes{v0.65}{2018/12/22}{\ 2018/12/22}
+% \changes{v0.66}{2019/02/08}{\ 2019/02/08}
@@ -2687,85 +2562,105 @@ This boolean may be tested by the user for later use.
%
%
% \thispagestyle{empty}
+% \newgeometry{margin=1in}
%
% \begin{center}
% \includegraphics[width=.3\linewidth]{lwarp_logo.pdf}
%
-% \bigskip
-%
-% {\Huge The \textbf{lwarp} package}
+% {\Huge The \pkg{lwarp} package}
%
-% \smallskip
-%
-% {\Large \textup{\LaTeX{} to HTML}}
-%
-% \bigskip
+% {\Large \LaTeX\ to \HTML}
%
% \fileversion{} \Dash \filedate
%
-% \bigskip
-%
-% {\small\textcopyright{} 2016--2018} Brian Dunn\\ \small \texttt{bd@BDTechConcepts.com}
+% {\small\textcopyright{} 2016--2019} Brian Dunn\\ \small \texttt{bd@BDTechConcepts.com}
%
-%
-% ^^A % \title{The \pkg{lwarp} package\thanks{This document
-% ^^A % corresponds to \pkg{lwarp}~\fileversion,
-% ^^A % dated \filedate.}}
-% ^^A % \author{{\small\textcopyright{} 2016--2018} Brian Dunn\\ \small \texttt{bd@BDTechConcepts.com}}
-% ^^A % \published{}
-% ^^A % \subtitle{\textup{\LaTeX{} to HTML5}}
-% ^^A %
-% ^^A % \maketitle
-%
-% \vfill
+% \end{center}
%
% \begin{abstract}
% \noindent
-% The \pkg{lwarp} package allows \LaTeX\ to directly produce \HTMLfive\ output,
-% using external utility programs only for the final conversion of text and images.
-% Math may be represented by \SVG\ files or \brand{MathJax}.
+% The \pkg{lwarp} package converts \LaTeX\ to \HTML\ by using \LaTeX\ to process the
+% user's document and directly generate \HTML\ tags. External utility programs are only
+% used for the final conversion of text and images. Math may be represented
+% by \SVG\ images or MathJax. Hundreds of \LaTeX\ packages are supported.
+%
+% Documents may be produced by \DVI\ or \PDF\ \LaTeX, Lua\LaTeX, \XeLaTeX;
+% by several CJK engines, classes, and packages;
+% or by customized systems such as \pkg{perltex} and \pkg{pythontex}.
+% A \prog{texlua} script automates compilation, index,
+% glossary, and batch image processing, and also supports \prog{latexmk}.
+% Configuration is semi-automatic at the first manual compile. Support files
+% are self-generated. Print and \HTML\ versions of each document may coexist.
+%
+% Assistance is provided for \HTML\ import into \EPUB\ conversion software and
+% word processors.
+%
+% Requirements include the commonly-available \brand{Poppler} utilities
+% (included with \brand{MiKTeX}) and \brand{Perl}.
+% Detailed installation instructions are included for each of the
+% major operating systems and \TeX\ distributions.
+%
+% A quick-start tutorial is provided, as well as extensive documentation
+% for special cases, a general index, and a troubleshooting index.
+% Automatic testing of package load order and image generation offers
+% useful advice for resolving errors.
+%
+% \SVG\ math and many other generated images
+% include \LaTeX\ expressions in the \attribute{alt} tags.
+% \brand{MathJax} may be used with advanced equation numbering
+% under the direct control of \pkg{lwarp}.
+%
+% Complicated tables are supported, which copy/paste well into \brand{LibreOffice Writer}.
+%
+% 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.
+%
+% \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.
+% \HTML5 and \CSS3 are leveraged to provide advanced features such as
+% \pkg{booktabs} trim, multicolumns, side-by-side minipages, and
+% \brand{JavaScript}-free navigation.
+%
+% ^^A The \pkg{lwarp} package allows \LaTeX\ to directly produce \HTMLfive\ output,
+% ^^A using external utility programs only for the final conversion of text and images.
+% ^^A Math may be represented by \SVG\ files or \brand{MathJax}.
%
-% Documents may be produced by pdf\LaTeX, \LuaLaTeX, or \XeLaTeX.
-% A \prog{texlua} script removes the need for system utilities such as \prog{make} and \prog{gawk},
-% and also supports \prog{xindy} and \prog{latexmk}. Configuration is automatic at the
-% first manual compile.
+% ^^A Documents may be produced by pdf\LaTeX, \LuaLaTeX, or \XeLaTeX.
+% ^^A A \prog{texlua} script removes the need for system utilities such as \prog{make} and \prog{gawk},
+% ^^A and also supports \prog{xindy} and \prog{latexmk}. Configuration is automatic at the
+% ^^A first manual compile.
%
-% Print and \HTML\ versions of each document may coexist, each with its own
-% set of auxiliary files. Support files are self-generated on request.
-% Assistance is provided for import into \EPUB\ conversion software and word processors.
+% ^^A Print and \HTML\ versions of each document may coexist, each with its own
+% ^^A set of auxiliary files. Support files are self-generated on request.
+% ^^A Assistance is provided for import into \EPUB\ conversion software and word processors.
%
-% A modular package-loading system uses the \pkg{lwarp} version of a package for
-% \HTML\ when available.
-% More than 300 \LaTeX\ packages are supported with these
-% high-level source-compatibility replacements, and many others work as-is.
+% ^^A A modular package-loading system uses the \pkg{lwarp} version of a package for
+% ^^A \HTML\ when available.
+% ^^A More than 300 \LaTeX\ packages are supported with these
+% ^^A high-level source-compatibility replacements, and many others work as-is.
%
-% A tutorial is provided to quickly introduce the user to the major components
-% of the package.
+% ^^A A tutorial is provided to quickly introduce the user to the major components
+% ^^A of the package.
%
-% \bigskip
+% \end{abstract}
%
% \begin{center}
+% \setlength{\parskip}{1ex}
% \color{blue}
-% To update existing projects, see \cref{sec:updates}: \nameref{sec:updates}.
-%
-% \bigskip
-%
% For a list of supported features, see \cref{tab:supported}: \nameref{tab:supported}.
-% \end{center}
%
-% \bigskip
+% To update existing projects, see \cref{sec:updates}: \nameref{sec:updates}.
%
-% \noindent
-% \textcolor{red!30!black}{\bfseries
-% Note that this is still a ``beta'' version of \pkg{lwarp},
-% and some things may change in response to user feedback and
-% further project development.
-% }
+% \color{red!30!black}\bfseries
+% \pkg{Lwarp} is still in development. Changes are likely.
%
-% \bigskip
+% \end{center}
%
-% \footnotesize
% \begin{description}
+% \footnotesize
% \item[License:] \
%
% This work may be distributed and/or modified under the
@@ -2778,17 +2673,12 @@ This boolean may be tested by the user for later use.
% \end{description}
%
%
-% \end{abstract}
%
-% \vspace*{\fill}
-% \vspace*{\fill}
-% \vspace*{\fill}
+% \clearpage
%
-% \end{center}
+% \restoregeometry
%
-% \clearpage
-%
-% \section{Supporting \protect\TeX\ development}
+% \section{Support \protect\TeX\ development}
% \label{sec:supportinglatex}
% \changes{v0.42}{2017/10/30}{Docs: Added support page.}
%
@@ -2874,7 +2764,76 @@ This boolean may be tested by the user for later use.
%
% \begin{description}
% \needspace{2\baselineskip}
-% \item[v0.65:] \CSS\ layout, \attribute{alt} tags, Japanese. PENDING
+% \item[v0.66:] \pkg{xr}, multiple projects, image names/directory, \HTML\ formatting
+% \begin{itemize}
+% \item \newlwarpmkconf
+% \item Adds options \optn{ImagesDirectory} and \optn{ImagesName}
+% \margintag{\env{lateximage}}
+% to assign directory and name prefixes for \env{lateximage} images.
+% The new defaults include the jobname, allowing the image directories for
+% multiple projects to coexist.
+% \item To reuse existing \filenm{lateximage} directories, add \pkg{lwarp} options
+% \watchout[existing projects]
+% \begin{sourceverb}
+% \usepackage[
+% ImagesDirectory={lateximages},
+% ImagesName={lateximage-}
+% ]{lwarp}
+% \end{sourceverb}
+% If not reused, the existing \filenm{lateximages} directory and
+% \filenm{lateximages.txt} file may be removed.
+% \item Added \cs{FilenameLimit} to control the maximum length of the
+% \margintag{filenames}
+% filenames generated by \pkg{lwarp}.
+% \item Improved filename generation
+% \watchout[Possible filename changes]
+% when special characters or macros are used in section names.
+% \item Fix for \cmds{lwarpmk cleanlimages} with \brand{Windows}.
+% \margintag{\brand{Windows}}
+% \item Fixes for floats in the home page.
+% \margintag{floats}
+% \item Improved \CSS\ for definition lists, table notes.
+% \margintag{lists, table notes}
+% \item \env{tabular}: Fixes for \cs{par} in column specifier,
+% minipage inside \env{tabular}.
+% \margintag{\env{tabular}}
+% \item Indexing: Fix for a long line of multiple entries.
+% \margintag{indexing}
+% \item \cs{minipagefullwidth}: Fix for global changes.
+% \margintag{\env{minipage}}
+% \item Added \cs{UseMinipageWidths} and \cs{IgnoreMinipageWidths}.
+% See \cref{sec:minipages}.
+% \item Improved \cs{fbox}, \cs{fboxBlock}, \cs{fminipage} to use current text color.
+% \margintag{colors}
+% \item Improved \HTML\ output formatting.
+% \margintag{\HTML}
+% \item Added discussion regarding invalid \HTML. See \cref{sec:invalidhtml}.
+% \margintag{docs}
+% \item Added discussion regarding math in section names,
+% \cs{imagegraphics} \optn{scale} option. See \cref{sec:convertexisting}.
+% \item Added discussion regarding international languages in section names.
+% See \cref{sec:international}.
+% \item \pkg{caption}: Fix for options clash.
+% \margintag{packages}
+% \item \pkg{xr}, \pkg{xr-hyper}: Now compatible.
+% \item \pkg{subcaption}: Improved horizontal spacing.
+% \item \pkg{multicol}: Fix for minipage inside \env{multicols}.
+% \item \pkg{multicolrule}: Updated for v1.2.
+% \item \pkg{tocbasic}: Minor update.
+% \item \pkg{acronym}: Fix for acronym in float caption.
+% \item \pkg{kotexutf}: Patch with \prog{pdflatex} and new
+% \pkg{lwarp} labels.
+% \item \pkg{extramarks}, \pkg{fancyhdr}: Updated for v3.10.
+% \item \pkg{memoir}: Added docs regarding version numbers. See \cref{sec:limitsmemoir}.
+% \item \pkg{zref}: No longer required.
+% \item Added \pkg{ar}, \pkg{ed}, \pkg{indentfirst}, \pkg{nameauth}, \pkg{truncate}.
+% \item Verified to work as-is with \pkg{changelog}.
+% \item Prevented \pkg{colortab}, \pkg{epsf}, \pkg{hyper},
+% \pkg{picinpar}, \pkg{picins},
+% \pkg{sistyle}, \pkg{ucs}.
+% \end{itemize}
+% \needspace{2\baselineskip}
+% \item[v0.65:] \CSS\ layout, \attribute{alt} tags, Japanese.
% \begin{itemize}
% \item Moved the side\TOC\ to the left side,
% \margintag{page layout}
@@ -3264,10 +3223,10 @@ This boolean may be tested by the user for later use.
% \margintag{floats with \cs{centering}, etc.}
% and their \pkg{ragged2e} equivalents,
% when placed directly after:
-% \begin{sourcedisplay}
-% \cs{begin}\{floattype\} \\
-% \cs{centering}
-% \end{sourcedisplay}
+% \begin{sourceverb}
+% \begin{floattype}
+% \centering
+% \end{sourceverb}
% \item \pkg{tikz}: \cs{pgfpicture}, fit, align, font.
% \margintag{misc. fixes}
% \item \pkg{ragged2e}: \cs{centering} etc.
@@ -3297,7 +3256,7 @@ This boolean may be tested by the user for later use.
% \needspace{2\baselineskip}
% \item[v0.52:] Improved footnotes, \SVG\ math.
% \begin{itemize}
-% \item Improved install instructions regarding \filenm{lwarp\_baseline\_marker.png}.
+% \item Improved install instructions regarding \filenm{lwarp_baseline_marker.png}.
% \margintag{documentation}
% \item Added documentation regarding footnotes in section headings,
% and footnotes with \cs{VerbatimFootnotes}
@@ -3309,7 +3268,7 @@ This boolean may be tested by the user for later use.
% \margintag{SVG math}
% when generating \env{lateximage}s.
% \item Added user-adjustable \SVG\ math font scaling. See \cref{sec:mathfontscale}.
-% \item Added warnings if \filenm{lwarp\_baseline\_marker.png} is not present, or
+% \item Added warnings if \filenm{lwarp_baseline_marker.png} is not present, or
% if \pkg{graphicx} or \pkg{graphics} is not loaded.
% \item Improved \cs{ensuremath} hashing expansion.
% \item Fix: \env{equation*} with \env{split}.
@@ -3326,7 +3285,7 @@ This boolean may be tested by the user for later use.
% \item Fix: \cs{FileDepth}, misc. others, when input encoding is not \optn{utf8}.
% \item Fix: \cs{texorpdfstring} in a section name.
% \item \pkg{hyperref} emulation: Fix for \progcode{\#}, \progcode{\%}, \margintag{packages}
-% \progcode{\&}, \progcode{\~}, \progcode{\_} characters in \acro{URL}s.
+% \progcode{\&}, \progcode{\~}, \progcode{\_} characters in \URL{}s.
% \item \pkg{fancybox}, \pkg{fancyvrb}: Initial support for \cs{VerbatimFootnotes}.
% \item \pkg{nicefrac}: Added with fix for \cs{ensuremath}.
% \item \pkg{graphicx}: Fix for option defaults. Added v1.1a/b options.
@@ -3460,7 +3419,7 @@ This boolean may be tested by the user for later use.
% \needspace{2\baselineskip}
% \item[v0.45:] \
% \begin{itemize}
-% \item Improved \prog{MikTeX} install instructions.
+% \item Improved \prog{MiKTeX} install instructions.
% \margintag{documentation}
% \item Improved graphics and \pkg{epstopdf} instructions.
% \item Updates to the \nameref{sec:introduction}.
@@ -3498,7 +3457,7 @@ This boolean may be tested by the user for later use.
% Fixed web page title if \cs{HTMLTitle} empty and no \cs{title} given and
% not using \pkg{titling} package.
% \item Fixed web page author if \cs{HTMLauthor} is empty and \cs{author} is not given.
-% \item If using \prog{pdflatex}, automatically loads T1 and \acro{UTF}-8 encodings.
+% \item If using \prog{pdflatex}, automatically loads T1 and \UTF-8 encodings.
% \margintag{encodings}
% (Additional \pkg{fontenc} encodings may be loaded after \pkg{lwarp}.)
% \item Added \env{list} and \env{trivlist} environments, \pkg{hang}.\margintag{lists}
@@ -3559,7 +3518,7 @@ This boolean may be tested by the user for later use.
% been renamed |WPMarkFloats|.}
% \item New booleans control whether to place additional
% marks around minipages, at the table of contents,
-% at the \acro{LOF} and \acro{LOT}, and whether to
+% at the \LOF\ and \LOT, and whether to
% print math as \LaTeX\ source for copy/paste into the
% \prog{LibreOffice Writer TeXMaths} extension.
% \item Improved formatting for numerous objects.
@@ -3676,7 +3635,7 @@ This boolean may be tested by the user for later use.
% \item Added \cs{ForceHTMLPage} and \cs{ForceHTMLTOC} to force
% \margintag{starred sections}
% a starred sectional unit onto its own \HTML\ page
-% and with its own \acro{TOC} entry.
+% and with its own \TOC\ entry.
% See \cref{sec:forcesectionstar}.
% \item Modified the tutorial to use the new \cs{ForceHTMLPage}
% \margintag{updated tutorial}
@@ -3835,9 +3794,9 @@ This boolean may be tested by the user for later use.
% have been combined with \pkg{lwarp}.
%
% To modify existing documents, remove from the document source:
-% \begin{sourcedisplay}
-% \cs{usepackage}\{lwarp-newproject\}
-% \end{sourcedisplay}
+% \begin{sourceverb}
+% \usepackage{lwarp-newproject}
+% \end{sourceverb}
%
% The \pkg{lwarp} package now produces the configuration files during
% print output, and also accepts the option \optn{lwarpmk} if desired.
@@ -3872,13 +3831,13 @@ This boolean may be tested by the user for later use.
% \needspace{2\baselineskip}
% \item Per the above changes, in existing documents,
% modify the package load of \pkg{lwarp}, such as:
-% \begin{Verbatim}[tabsize=4,gobble=2]
+% \begin{sourceverb}
% \usepackage[
% HomeHTMLFilename=index,
% HTMLFilename={},
% xindyLanguage=english
% ]{lwarp}
-% \end{Verbatim}
+% \end{sourceverb}
%
% \item The file |lwarp_html.xdy| has been renamed |lwarp.xdy|.
% To update each document's project:
@@ -4262,9 +4221,7 @@ This boolean may be tested by the user for later use.
% ^^A *supported features
%
% \begin{longtable}{>{\raggedright}p{.3\linewidth}p{.6\linewidth}}
-% \caption{\protect\LaTeX--\acro{HTML} generation ---
-% \pkg{lwarp} package ---
-% Supported features\label{tab:supported}} \endfirsthead
+% \caption{\LaTeX\ \pkg{lwarp} package --- Supported features\label{tab:supported}} \endfirsthead
% \warpprintonly{\multicolumn{2}{c}{\pkg{lwarp} Supported Functions --- continued} \\
% Category & Status \\ \toprule \endhead}
%
@@ -4341,7 +4298,7 @@ This boolean may be tested by the user for later use.
% Sectioning: & Adds \progcode{FileDepth} for splitting the \HTML\ output.
% Files may be numbered sequentially or named according to section name.
% Common short words and punctuation are removed from the filenames.
-% \pkg{anonchap}, \pkg{bsheaders}, \pkg{fncychap}, \pkg{quotchap},
+% \pkg{anonchap}, \pkg{bsheaders}, \pkg{fncychap}, \pkg{indentfirst}, \pkg{quotchap},
% \pkg{section}, \pkg{sectionbreak}, \pkg{sectsty}, \pkg{titlesec}.
%
% Tested to work as-is: \pkg{secdot}.\\
@@ -4372,7 +4329,7 @@ This boolean may be tested by the user for later use.
% Cross-references: &
% \pkg{bookmark}, \pkg{breakurl}, \pkg{cleveref}, \pkg{fancyref},
% \pkg{hypdestopt}, \pkg{hyperref}, \pkg{prettyref},
-% \pkg{titleref}, \pkg{url}, \pkg{varioref}, \pkg{xurl}. \\
+% \pkg{titleref}, \pkg{url}, \pkg{varioref}, \pkg{xr}, \pkg{xr-hyper}, \pkg{xurl}. \\
%
% \midrule
%
@@ -4501,7 +4458,7 @@ This boolean may be tested by the user for later use.
% \pkg{lua-check-hyphen}, \pkg{luacolor},
% \pkg{magaz}, \pkg{nowidow}, \pkg{pdfrender}, \pkg{realscripts}, \pkg{relsize},
% \pkg{scalefnt}, \pkg{soul}, \pkg{soulpos}, \pkg{soulutf8},
-% \pkg{textfit}, \pkg{thinsp}, \pkg{trimclip},
+% \pkg{textfit}, \pkg{thinsp}, \pkg{trimclip}, \pkg{truncate},
% \pkg{ulem}, \pkg{underscore}, \pkg{uspace},
% \pkg{widows-and-orphans}, \pkg{xellipsis}. \\
%
@@ -4542,7 +4499,8 @@ This boolean may be tested by the user for later use.
% \midrule
%
% Science and engineering: &
-% \pkg{algorithm2e}, \pkg{algorithmicx}, \pkg{axodraw2}, \pkg{bitpattern}, \pkg{bytefield},
+% \pkg{algorithm2e}, \pkg{algorithmicx}, \pkg{ar},
+% \pkg{axodraw2}, \pkg{bitpattern}, \pkg{bytefield},
% \pkg{chemfig}, \pkg{chemformula}, \pkg{chemgreek}, \pkg{chemmacros}, \pkg{chemnum},
% \pkg{listings}, \pkg{mhchem}, \pkg{phfqit}, \pkg{register}.
%
@@ -4556,8 +4514,8 @@ This boolean may be tested by the user for later use.
%
% \midrule
%
-% Arts and humanities: & \pkg{forest}, \pkg{musicography}, \pkg{octave},
-% \pkg{schemata}, \pkg{semantic-markup}, \pkg{vowel}, \pkg{xpiano}.
+% Arts and humanities: & \pkg{forest}, \pkg{musicography}, \pkg{nameauth},
+% \pkg{octave}, \pkg{schemata}, \pkg{semantic-markup}, \pkg{vowel}, \pkg{xpiano}.
%
% Tested to work as-is:
% \pkg{phonrule}, \pkg{piano}, \pkg{tikz-dependency}. \\
@@ -4565,10 +4523,13 @@ This boolean may be tested by the user for later use.
% \midrule
%
% Editorial: & \pkg{changebar},
-% \pkg{easy-todo}, \pkg{errata}, \pkg{fixme},
+% \pkg{easy-todo}, \pkg{ed}, \pkg{errata}, \pkg{fixme},
% \pkg{fixmetodonotes},
% \pkg{pdfcomment}, \pkg{pdfmarginpar},
-% \pkg{todo}, \pkg{todonotes}, \pkg{tram}, \pkg{xechangebar}. \\
+% \pkg{todo}, \pkg{todonotes}, \pkg{tram}, \pkg{xechangebar}.
+%
+% Tested to work as-is:
+% \pkg{changelog} \\
%
% \midrule
%
@@ -4882,8 +4843,8 @@ This boolean may be tested by the user for later use.
% \changes{v0.62}{2018/11/03}{Docs: \prog{MiKTeX Console}}
% \item For older versions of MiK\TeX,
% to install \pkg{lwarp} the first time,
-% use the \prog{MikTeX Package Manager (Admin)}.
-% To update \pkg{lwarp}, use \prog{MikTeX Update (Admin)}.
+% use the \prog{MiKTeX Package Manager (Admin)}.
+% To update \pkg{lwarp}, use \prog{MiKTeX Update (Admin)}.
% \item Either way, also update the package \pkg{miktex-misc}, which will install and
% update the \prog{lwarpmk} executable.
% \end{enumerate}
@@ -4908,9 +4869,9 @@ This boolean may be tested by the user for later use.
% In the \UI{Settings} window, \UI{Roots} tab, look for a local \TDS\ root.
% \end{description}
% This should be something like:
-% \begin{sourcedisplay}
-% |/usr/local/texlive/texmf-local/|
-% \end{sourcedisplay}
+% \begin{sourceverb}
+% /usr/local/texlive/texmf-local/
+% \end{sourceverb}
% \item Unpack the archive in the \TDS\ local directory.
% \item Renew the cache:
% \userentry{mktexlsr} \quad —\,or\,—
@@ -4939,17 +4900,17 @@ This boolean may be tested by the user for later use.
% \end{Verbatim}
% \item Copy the |.sty| files somewhere such as the \TeX\ Live local tree
% found in the previous \CTAN\ \TDS\ section, under the subdirectory:
-% \begin{sourcedisplay}
-% |<texlocal>/tex/latex/local/lwarp|
-% \end{sourcedisplay}
-% \item Copy \filenm{lwarp\_baseline\_marker.png} and \filenm{lwarp\_baseline\_marker.eps}
+% \begin{sourceverb}
+% <texlocal>/tex/latex/local/lwarp
+% \end{sourceverb}
+% \item Copy \filenm{lwarp_baseline_marker.png} and \filenm{lwarp_baseline_marker.eps}
% to the same place as the \filenm{.sty} files.
% \changes{v0.52}{2018/03/24}{Docs: Improved install instructions.}
% \item Copy the documentation \filenm{lwarp.pdf} to a \filenm{source} directory in the local tree,
% such as:
-% \begin{sourcedisplay}
-% |<texlocal>/doc/local/lwarp|
-% \end{sourcedisplay}
+% \begin{sourceverb}
+% <texlocal>/doc/local/lwarp
+% \end{sourceverb}
% \item Renew the cache:
% \userentry{mktexlsr} \quad —\,or\,—
% \userentry{texhash}
@@ -4967,8 +4928,8 @@ This boolean may be tested by the user for later use.
% document source files. The resultant |*.sty| and \filenm{lwarpmk.lua} files
% may be used as-is, so long as they are in the same directory
% as the document source.
-% The files \filenm{lwarp\_baseline\_marker.png} and
-% \filenm{lwarp\_baseline\_marker.eps} must also be copied as well.
+% The files \filenm{lwarp_baseline_marker.png} and
+% \filenm{lwarp_baseline_marker.eps} must also be copied as well.
% \changes{v0.52}{2018/03/24}{Docs: Improved install instructions.}
% This approach is especially useful if
% you would like to temporarily test\margintag{Just testing!}\
@@ -5014,14 +4975,14 @@ This boolean may be tested by the user for later use.
% \item Locate the \TeX\ Live binaries:
% \userentry{kpsewhich -var-value TEXMFROOT}
% This will be something like:
-% \begin{sourcedisplay}
-% |/usr/local/texlive/<year>|
-% \end{sourcedisplay}
+% \begin{sourceverb}
+% /usr/local/texlive/<year>
+% \end{sourceverb}
% The binaries are then located in the |bin/<arch>| directory
% under the root:
-% \begin{sourcedisplay}
-% |/usr/local/texlive/<year>/bin/<architecture>/|
-% \end{sourcedisplay}
+% \begin{sourceverb}
+% /usr/local/texlive/<year>/bin/<architecture>/
+% \end{sourceverb}
% In this directory you will find programs
% such as \prog{pdflatex} and \prog{makeindex}.
% \item In the binaries directory,
@@ -5041,16 +5002,15 @@ This boolean may be tested by the user for later use.
% \item [\brand{Windows} MiK\TeX:] Create a new |lwarpmk.bat| file:
% \begin{enumerate}
% \item Locate the MiK\TeX\ binaries. These will be in a directory such as:
-% \begin{sourcedisplay}
-% |C:\Program Files\MiKTeX 2.9\miktex\bin\x64|
-% \end{sourcedisplay}
+% \begin{sourceverb}
+% C:\Program Files\MiKTeX 2.9\miktex\bin\x64
+% \end{sourceverb}
% In this directory you will find programs
% such as |pdflatex.exe| and |makeindex.exe|.
% \item Create a new file named |lwarpmk.bat| containing:
-% \begin{sourcedisplay}
-% {\footnotesize
-% |texlua "C:\Program Files\MiKTeX 2.9\scripts\lwarp\lwarp.texlua" %*|}
-% \end{sourcedisplay}
+% \begin{sourceverb}
+% texlua "C:\Program Files\MiKTeX 2.9\scripts\lwarp\lwarp.texlua" %*
+% \end{sourceverb}
% This will call the copy of \filenm{lwarpmk.lua}
% which is in the |scripts| directory of the distribution.
% \end{enumerate}
@@ -5063,9 +5023,9 @@ This boolean may be tested by the user for later use.
% \begin{enumerate}
% \item When compiling the tutorial in \cref{sec:tutorial},
% use the \optn{lwarpmk} option for the \pkg{lwarp} package:
-% \begin{sourcedisplay}
-% |\usepackage[lwarpmk]{lwarp}|
-% \end{sourcedisplay}
+% \begin{sourceverb}
+% \usepackage[lwarpmk]{lwarp}
+% \end{sourceverb}
% \item When the tutorial is compiled with \prog{pdflatex}, the file \filenm{lwarpmk.lua}
% will be generated along with the other configuration files.
% \item \filenm{lwarpmk.lua} may be used for this project:
@@ -5117,7 +5077,7 @@ This boolean may be tested by the user for later use.
% \item [To install \prog{xindy}, \prog{latexmk}, and \prog{pdfcrop}:] \
%
% The \TeX\ utilities \prog{xindy}, \prog{latexmk}, and \prog{pdfcrop} may be installed
-% in \prog{TexLive} with \prog{tlmgr}, installed by \prog{MikTeX}, provided by
+% in \prog{TexLive} with \prog{tlmgr}, installed by \prog{MiKTeX}, provided by
% your operating system's package manager, or downloaded from the \prog{CTAN} archive:
% \changes{v0.45}{2017/11/30}{Docs: Improved install instructions.}
% \begin{sourcedisplay}
@@ -5204,7 +5164,7 @@ This boolean may be tested by the user for later use.
%
% \subsection{Starting a new project}
%
-% \changes{v0.21}{2017/02/23}{File: \filenm{lwarp\_tutorial.txt} added.}
+% \changes{v0.21}{2017/02/23}{File: \filenm{lwarp_tutorial.txt} added.}
%
% \begin{enumerate}
%
@@ -5781,6 +5741,7 @@ This boolean may be tested by the user for later use.
%
% \changes{v0.48}{2018/02/05}{Docs: Converting an existing document.}
% \changes{v0.51}{2018/03/04}{Docs: Updated Converting an existing document.}
+% \changes{v0.66}{2019/02/07}{Docs: Updated Converting an existing document.}
%
% To convert an existing document for use with \pkg{lwarp}:
% \begin{enumerate}
@@ -5802,13 +5763,8 @@ This boolean may be tested by the user for later use.
% ^^A \cs{includegraphics}\{filename\}
% ^^A \end{sourcedisplay}
% ^^A Other image formats may have a file extension.
-% \item Avoid the \optn{scale} option. Change:
-% \begin{sourcedisplay}
-% \cs{includegraphics}[scale=<xx>]
-% \end{sourcedisplay} to:
-% \begin{sourcedisplay}
-% \cs{includegraphics}[width=<yy>\textbackslash{linewidth}]
-% \end{sourcedisplay}
+% \item \limitsmathinsectionnames
+% \item \limitsincludegraphicsscale
% \item Possible changes to \env{tabular} environments include
% |*| columns, \pkg{multirow}, \pkg{longtable}, \pkg{supertabular}, \pkg{xtab},
% \pkg{bigdelim}. See \cref{sec:limitstabular}.
@@ -6097,6 +6053,7 @@ This boolean may be tested by the user for later use.
% \DescribePackage{lwarp}
% \gindex{lwarp=\pkg{lwarp}>loading}
% \gindex{lwarp=\pkg{lwarp}>options}
+% \pkg{lwarp} package options are as follows:
%
% \begin{description}
%
@@ -6229,7 +6186,7 @@ This boolean may be tested by the user for later use.
% \trouble[xindy]{xindy=\pkg{xindy}>options>PrintIndexCmd=\optn{PrintIndexCmd}}
% be sure to assign an \prog{xindy}
% language and codepage with the |-L| and |-C| \prog{xindy} options, as the
-% \prog{lwarp} \optn{xindyLanguage} and \optn{xindyCodepage} options are not
+% \pkg{lwarp} \optn{xindyLanguage} and \optn{xindyCodepage} options are not
% used for the \optn{PrintIndexCmd} option when it is set manually.
%
% This option is stored in the configuration files \filenm{lwarpmk.conf}
@@ -6269,7 +6226,7 @@ This boolean may be tested by the user for later use.
% \trouble[xindy]{xindy=\pkg{xindy}>options>HTMLIndexCmd=\optn{HTMLIndexCmd}}
% be sure to assign an \prog{xindy}
% language and codepage with the |-L| and |-C| \prog{xindy} options, as the
-% \prog{lwarp} \optn{xindyLanguage} and \optn{xindyCodepage} options are not
+% \pkg{lwarp} \optn{xindyLanguage} and \optn{xindyCodepage} options are not
% used for the \optn{HTMLIndexCmd} option when it is set manually.
%
% As with \optn{PrintIndexCmd}, to generate complicated indexes it may be
@@ -6304,7 +6261,7 @@ This boolean may be tested by the user for later use.
% \trouble[xindy]{xindy=\pkg{xindy}>options>LatexmkIndexCmd=\optn{LatexmkIndexCmd}}
% be sure to assign an \prog{xindy}
% language and codepage with the |-L| and |-C| \prog{xindy} options, as the
-% \prog{lwarp} \optn{xindyLanguage} and \optn{xindyCodepage} options are not
+% \pkg{lwarp} \optn{xindyLanguage} and \optn{xindyCodepage} options are not
% used for the \optn{LatexmkIndexCmd} option when it is set manually.
%
%
@@ -6392,6 +6349,7 @@ This boolean may be tested by the user for later use.
% FileDepth & Sectioning depth of the file splits. \\
% CombineHigherDepths & Combine higher section levels. \\
% FileSectionNames & Use section names for file names, else use numbers. \\
+% \cs{FilenameLimit} & Maximum length of the generated filenames. \\
% \midrule
% FootnoteDepth & Sectioning depth of footnotes. \\
% \midrule
@@ -6598,6 +6556,12 @@ This boolean may be tested by the user for later use.
% so the rest of the filename must be sufficiently unique to avoid name collisions.
% \gindex{file>unique names}
%
+% \ItemDescribeMacro{\FilenameLimit} \DescribeDefault{80}
+% \gindex{file>name length}
+% The maximum length of the filenames generated by \pkg{lwarp}.
+% ``\filenm{.html}'' is added to this length.
+% Redefine with \cs{newcommand}.
+%
% \ItemDescribeCounter{FootnoteDepth} \DescribeDefault{3}
% Determines where to place pending footnotes.
% |3| places footnotes before each break down to the \cs{subsubsection} level.
@@ -6847,7 +6811,7 @@ This boolean may be tested by the user for later use.
% Note that |sample_project.css| is overwritten whenever \pkg{lwarp}
% is loaded in print mode.
% It is therefore important to rename the file
-% \trouble[Rename it!]{sample=\filenm{sample\_projects.css}>overwritten}
+% \trouble[Rename it!]{sample=\filenm{sample_projects.css}>overwritten}
% to something like |<project>.css| before
% using it, so that your own changes are not overwritten.
%
@@ -7143,6 +7107,19 @@ This boolean may be tested by the user for later use.
% \end{sourcedisplay}
% \end{description}
%
+%
+% \subsubsection{Invalid \HTML}
+% \label{sec:invalidhtml}
+%
+% \trouble{HTML>invalid}
+% \trouble{HTML>validation}
+% Additionally, some objects are valid \LaTeX, but invalid \HTML.
+% An example is a tabular inside \cs{textbf}, since \HTML\ does not allow a table
+% inside a span. \pkg{lwarp} will create the table, and the browser may support it,
+% but the result is technically invalid.
+%
+%
+%
% \subsection{Formatting}
%
% \subsubsection{Text formatting}
@@ -7192,7 +7169,7 @@ This boolean may be tested by the user for later use.
% \trouble{list>empty item}
%
%
-% \subsubsection{Filenames and \acro{URL}s in lists or footnotes}
+% \subsubsection{Filenames and \URL{}s in lists or footnotes}
%
% \gindex{underscore>filename}\gindex{file>underscore in name}
% \gindex{list>filename}
@@ -7425,41 +7402,41 @@ This boolean may be tested by the user for later use.
% bibliographies, and the index.
% See the following sections where applicable.
% Continue here if interested in the reason for adding these commands to \pkg{lwarp}.
-% \trouble{endnotes>\HTML\ page and \TOC}
-% \trouble{glossaries=\pkg{glossaries}>\HTML\ page and \TOC}
-% \trouble{bibliography>\HTML\ page and \TOC}
-% \trouble{index>\HTML\ page and \TOC}
-% \gindex{endnotes>\HTML\ page and \TOC}
-% \gindex{glossaries=\pkg{glossaries}>\HTML\ page and \TOC}
-% \gindex{bibliography>\HTML\ page and \TOC}
-% \gindex{index>\HTML\ page and \TOC}
+% \trouble{endnotes>HTML=\HTML\ page and \TOC}
+% \trouble{glossaries=\pkg{glossaries}>HTML=\HTML\ page and \TOC}
+% \trouble{bibliography>HTML=\HTML\ page and \TOC}
+% \trouble{index>HTML=\HTML\ page and \TOC}
+% \gindex{endnotes>HTML=\HTML\ page and \TOC}
+% \gindex{glossaries=\pkg{glossaries}>HTML=\HTML\ page and \TOC}
+% \gindex{bibliography>HTML=\HTML\ page and \TOC}
+% \gindex{index>HTML=\HTML\ page and \TOC}
%
% Some packages use \cs{chapter*} or \cs{section*} to introduce reference
% material such as notes or lists, often to be placed in the back matter of a book.
% These starred sections are placed inline instead of on their own \HTML\ pages,
-% and they are not given \acro{TOC} entries.
+% and they are not given \TOC\ entries.
%
% \pkg{lwarp} provides a method to cause a starred section to be on its own \HTML\ page,
% subject to \texttt{FileDepth}, and also a method to cause the starred section
-% to have its own \acro{TOC} entry during \HTML\ output.
+% to have its own \TOC\ entry during \HTML\ output.
%
% \DescribeMacro{\ForceHTMLPage}
% To place a starred section on its own \HTML\ page, use \cs{ForceHTMLPage} just before
% the \cs{chapter*} or \cs{section*}. \pkg{lwarp} will create a new page for the
% starred sectional unit.
%
-% A starred sectional unit does not have a \acro{TOC} entry unless one is placed
+% A starred sectional unit does not have a \TOC\ entry unless one is placed
% manually. The typical method using \cs{phantomsection} and \cs{addcontentsline}
% works for inline text but fails when the new starred section is given its own
-% webpage after the \acro{TOC} entry is created, or when creating an \EPUB\ where
-% the \acro{TOC} entry will point to the page before the starred section.
-% If the starred section has its own \HTML\ page but no correct \acro{TOC} entry
+% webpage after the \TOC\ entry is created, or when creating an \EPUB\ where
+% the \TOC\ entry will point to the page before the starred section.
+% If the starred section has its own \HTML\ page but no correct \TOC\ entry
% \trouble[inaccessible \HTML\ page]{HTML>inaccessible pages>starred section}
% \trouble{sectioning>starred section}
% pointing to that page, the page will be inaccessible unless some other link is created.
%
% \DescribeMacro{\ForceHTMLTOC}
-% To automatically force the \HTML\ version of the document to have a \acro{TOC} entry
+% To automatically force the \HTML\ version of the document to have a \TOC\ entry
% for a starred section, use \cs{ForceHTMLTOC} just before
% the \cs{chapter*} or \cs{section*},
% and place \cs{phantomsection} and \cs{addcontentsline} inside a \env{warpprint}
@@ -7515,6 +7492,7 @@ This boolean may be tested by the user for later use.
% \limitsbibtex
%
%
+% \needspace{10\baselineskip}
% \subsubsection{\pkg{glossaries} package}
% \label{sec:glossaries}
%
@@ -7548,7 +7526,7 @@ This boolean may be tested by the user for later use.
% \margintag{manual processing}
% without the use of \prog{lwarpmk}, but adjustments will be required to
% process \HTML\ indexes as well. In general, \filenm{*.idx} and \filenm{*.ind} files
-% will be accompanied by \filenm{*\_html.idx} and \filenm{*\_html.ind} files.
+% will be accompanied by \filenm{*_html.idx} and \filenm{*_html.ind} files.
%
% If using a custom indexing style file,
% \margintag{custom index style}
@@ -7593,7 +7571,7 @@ This boolean may be tested by the user for later use.
% \end{sourcedisplay}
% The usual \filenm{.idx} and \filenm{.ind} files will be used,
% along with the new \filenm{lwarp.ist} style file.
-% When creating the \HTML\ index, ``\filenm{\_html}'' is automatically appended
+% When creating the \HTML\ index, ``\filenm{_html}'' is automatically appended
% to each of the names.
%
% \prog{lwarpmk} will use \prog{latexmk} if specified, in which case
@@ -7657,7 +7635,7 @@ This boolean may be tested by the user for later use.
% \end{sourcedisplay}
% \emph{For \brand{Windows}, replace the two ``;'' characters with ``\&''.}\watchout[\brand{Windows}]
%
-% When creating the \HTML\ index, ``\filenm{\_html}'' is automatically appended
+% When creating the \HTML\ index, ``\filenm{_html}'' is automatically appended
% to the index filenames.
%
% Use \userentry{lwarpmk printindex} \userentry{lwarpmk htmlindex}
@@ -7698,7 +7676,7 @@ This boolean may be tested by the user for later use.
% \cs{makeindex} \\
% \cs{newindex}[Second Index]\{secondname\} \\
% \end{sourcedisplay}
-% When creating the \HTML\ index, ``\filenm{\_html}'' is automatically appended
+% When creating the \HTML\ index, ``\filenm{_html}'' is automatically appended
% to each of the names.
%
% Use \userentry{lwarpmk printindex} \userentry{lwarpmk htmlindex}
@@ -7723,7 +7701,7 @@ This boolean may be tested by the user for later use.
% \cs{makeindex} \\
% \cs{newindex}[Second Index]\{secondname\} \\
% \end{sourcedisplay}
-% When creating the \HTML\ index, ``\filenm{\_html}'' is automatically appended
+% When creating the \HTML\ index, ``\filenm{_html}'' is automatically appended
% to each of the names.
%
% Use \userentry{lwarpmk printindex} \userentry{lwarpmk htmlindex}
@@ -7804,9 +7782,9 @@ This boolean may be tested by the user for later use.
% For the first compile, use
% \watchout[enable shell escape]
% \userentry{pdflatex \textred{-\/-shell-escape} projectname.tex}
-% \userentry{pdflatex \textred{-\/-enable-write18} projectname.tex \quad \textrm{(MikTeX)}}
+% \userentry{pdflatex \textred{-\/-enable-write18} projectname.tex \quad \textrm{(MiKTeX)}}
% or similar with \prog{xelatex} or \prog{lualatex}.
-% \prog{lwarp} will remember that shell escape was used.
+% \pkg{lwarp} will remember that shell escape was used.
%
% \prog{imakeidx} will automatically execute \prog{splitindex},
% and will also use \prog{makeindex} to compile the indexes.
@@ -7839,9 +7817,9 @@ This boolean may be tested by the user for later use.
% For the first compile, use
% \watchout[enable shell escape]
% \userentry{pdflatex \textred{-\/-shell-escape} projectname.tex}
-% \userentry{pdflatex \textred{-\/-enable-write18} projectname.tex \quad \textrm{(MikTeX)}}
+% \userentry{pdflatex \textred{-\/-enable-write18} projectname.tex \quad \textrm{(MiKTeX)}}
% or similar with \prog{xelatex} or \prog{lualatex}.
-% \prog{lwarp} will remember that shell escape was used.
+% \pkg{lwarp} will remember that shell escape was used.
%
% \prog{imakeidx} will automatically execute \prog{splitindex} if selected,
% and will also use \prog{xindy} to compile the indexes.
@@ -7900,7 +7878,7 @@ This boolean may be tested by the user for later use.
%
% \texttt{<projectname>} is the \cs{jobname}:
% if compiling ``\filenm{name.tex}'', use the filenames \filenm{name.idx} and
-% \filenm{name\_html.idx}.
+% \filenm{name_html.idx}.
%
% Use \userentry{lwarpmk printindex} \userentry{lwarpmk htmlindex}
% to compile the indexes.
@@ -7967,7 +7945,7 @@ This boolean may be tested by the user for later use.
%
% \texttt{<projectname>} is the \cs{jobname}:
% if compiling ``\filenm{name.tex}'', use the filenames \filenm{name.idx} and
-% \filenm{name\_html.idx}.
+% \filenm{name_html.idx}.
%
% Use \userentry{lwarpmk printindex} \userentry{lwarpmk htmlindex}
% to compile the indexes.
@@ -8045,7 +8023,7 @@ This boolean may be tested by the user for later use.
%
% \texttt{<projectname>} is the \cs{jobname}:
% if compiling ``\filenm{name.tex}'', use the filenames \filenm{name.idx} and
-% \filenm{name\_html.idx}.
+% \filenm{name_html.idx}.
%
% Use \userentry{lwarpmk printindex} \userentry{lwarpmk htmlindex}
% to compile the indexes.
@@ -8178,7 +8156,7 @@ This boolean may be tested by the user for later use.
% see \filenm{lwarp.xdy} for \cs{textbf} and \cs{textit} as examples.
%
%
-% \subsubsection{Index positions, \acro{TOC}, \pkg{tocbibind}}
+% \subsubsection{Index positions, \TOC, \pkg{tocbibind}}
% \limitstocbibind
%
% \limitstocloft
@@ -8189,6 +8167,7 @@ This boolean may be tested by the user for later use.
%
% \changes{v0.42}{2017/10/30}{Docs: Reorganized math limitations}
% \label{sec:limitsmath}
+%
% \limitsmath
%
% \subsubsection{Catcode changes}
@@ -8209,7 +8188,7 @@ This boolean may be tested by the user for later use.
% \gindex{math>display with complicated objects}
% \gindex{math>dynamic}
% \gindex{dynamic math}
-% \trouble{math>\tikz}
+% \trouble{math>tikz=\tikz}
% \trouble{tikz>in math}
% \trouble{MathJax=\brand{MathJax}>errors}
% \trouble{HTML>alt tags}
@@ -8402,10 +8381,33 @@ This boolean may be tested by the user for later use.
% \subsection{\brand{Memoir} class}
% \label{sec:limitsmemoir}
%
+% \changes{v0.66}{2019/02/06}{\pkg{memoir}: Docs re: version numbers.}
+%
% \DescribeClass{memoir}
% \limitsmemoir
%
%
+% \subsection{International languages}
+% \label{sec:international}
+%
+% If using \prog{pdflatex} with the setting |\booltrue{FileSectionNames}|,
+% \trouble[section and file names]{sectioning>international language}
+% \trouble{filename>corrupted}
+% \trouble{filename>international, \UTF-8}
+% \gindex{international>section names}
+% \gindex{foreign>section names}
+% \gindex{section>international languages}
+% \gindex{file>international languages}
+% non-\acro{ASCII} text in section names can result in corrupted \HTML\ file names.
+% \prog{pdflatex} may be used if setting |\boolfalse{FileSectionNames}|, in which case
+% \HTML\ file numbers will be generated.
+%
+% For correct \HTML\ file names, use \prog{xelatex}, \prog{lualatex},
+% or dedicated document classes \Slash engines.
+%
+% (As of this writing, this warning is only relevent to the \pkg{kotex} package.)
+%
+%
% \subsection{Miscellaneous packages}
%
% \subsubsection{\pkg{verse} and \pkg{memoir}}
@@ -8428,7 +8430,6 @@ This boolean may be tested by the user for later use.
%
% \DescribePackage{babel}
% ^^A \limitsbabelone
-%
% \limitsbabeltwo
%
%
@@ -8469,7 +8470,7 @@ This boolean may be tested by the user for later use.
% See \cref{sec:mhchem}.
%
%
-% \subsubsection{xparse}
+% \subsubsection{\pkg{xparse} package}
%
% \changes{v0.45}{2017/12/09}{Docs: \pkg{xparse} warnings.}
% \DescribePackage{xparse}
@@ -8477,6 +8478,13 @@ This boolean may be tested by the user for later use.
% \gindex{xparse=\pkg{xparse}>warnings}
%
%
+% \subsubsection{\pkg{kotex} package}
+%
+% \DescribePackage{kotex}
+% See \cref{sec:international} regarding \prog{pdflatex} and
+% Korean section names.
+% \trouble[Korean section names]{filename>Korean}
+%
%
% \clearpage
%
@@ -8504,9 +8512,9 @@ This boolean may be tested by the user for later use.
% \begin{description}
% \item [\optn{PrintLatexCmd}] should be set to shell commands which take \filenm{project.tex}
% and generate \filenm{project.pdf}.
-% \item[\optn{HTMLLatexCmd}] should be set to take \filenm{project\_html.tex} and
-% generate \filenm{project\_html.pdf}.
-% \prog{lwarpmk} will then take \filenm{project\_html.pdf} and
+% \item[\optn{HTMLLatexCmd}] should be set to take \filenm{project_html.tex} and
+% generate \filenm{project_html.pdf}.
+% \prog{lwarpmk} will then take \filenm{project_html.pdf} and
% automatically convert it and generate \filenm{project.html}.
% \end{description}
%
@@ -8582,10 +8590,10 @@ This boolean may be tested by the user for later use.
% using it.
% \begin{description}
% \item[\cmds{latexmk project.tex}] would create \filenm{project.pdf} as normal.
-% \item[\cmds{latexmk project\_html.tex}] would create \filenm{project\_html.pdf},
+% \item[\cmds{latexmk project\_html.tex}] would create \filenm{project_html.pdf},
% then
% \item [\cmds{lwarpmk pdftohtml project\_html.pdf}] would take
-% \filenm{project\_html.pdf} and convert it to \filenm{project.html}.
+% \filenm{project_html.pdf} and convert it to \filenm{project.html}.
% \end{description}
%
% \prog{latexmk} may simplify the use of packages such as \pkg{sagetex}.
@@ -8670,15 +8678,15 @@ This boolean may be tested by the user for later use.
% |\usepackage{lwarp}| must be used, and it generates \filenm{lwarpmk.conf}
% when the print version is created.
%
-% To generate \HTML, first have \filenm{project\_html.tex} be compiled to
-% generate \filenm{project\_html.pdf}.
+% To generate \HTML, first have \filenm{project_html.tex} be compiled to
+% generate \filenm{project_html.pdf}.
% This must be in \PDF\ format.
-% Finally, have \filenm{project\_html.pdf} be converted to \HTML\ using
+% Finally, have \filenm{project_html.pdf} be converted to \HTML\ using
% \cmds{lwarpmk pdftohtml project\_html.pdf},
% and convert \SVG\ math with \cmds{lwarpmk limages}.
%
%
-% \subsection{\acro{UTF}-8 locale}
+% \subsection{\UTF-8 locale}
% \label{sec:utf8locale}
% \gindex{locale}
% \gindex{UTF-8>locale}
@@ -8736,8 +8744,8 @@ This boolean may be tested by the user for later use.
% A special boolean is provided to simplify the process of
% converting \pkg{lwarp} \HTML\ output to \EPUB:
%
+% \begin{docsidebar}[\bool{FormatEPUB}]
% \DescribeBoolean{FormatEPUB} \DescribeDefault{false}
-% \begin{docsidebar}[\texttt{FormatEPUB}]
% \raggedright
% |FormatEPUB| changes \HTML\ output for easy \EPUB\ conversion
% via an external program. Removes per-file headers, footers, and nav.
@@ -8776,7 +8784,7 @@ This boolean may be tested by the user for later use.
% do a breadth-first search of the files.
% For \prog{Calibre}, this option is found in
% \begin{UIdisplay}
-% \textsf{Preferences $\to$ Plugins $\to$ File type plugins $\to$ \HTML\ to Zip}
+% Preferences $\to$ Plugins $\to$ File type plugins $\to$ \HTML\ to Zip
% \end{UIdisplay}
% Check the box \textsf{Add linked files in breadth first order.}
% Set the document encoding as |utf-8|\trouble[encoding]{EPUB>encoding},
@@ -8793,8 +8801,8 @@ This boolean may be tested by the user for later use.
% which is \HTML\ heading level \element{h3}.
% For \prog{Calibre}, this option is found in
% \begin{UIdisplay}
-% \textsf{Preferences $\to$ Conversion (Common Options) $\to$
-% Structure Detection $\to$ Detect chapters at (XPath expression)}
+% Preferences $\to$ Conversion (Common Options) $\to$
+% Structure Detection $\to$ Detect chapters at (XPath expression)
% \end{UIdisplay}
% Select the ``magic wand'' to the right of this entry box, and set
% the first entry
@@ -8804,7 +8812,7 @@ This boolean may be tested by the user for later use.
% to ``h4''. (Or ``h3'' for document classes with \cs{chapter}s.)
% The \textsf{Detect chapters at} field should then show
% \begin{UIdisplay}
-% //h:h4 \qquad \textrm{---\,or\,---} \qquad //h:h3
+% //h:h4 \qquad \textmd{\textrm{---\,or\,---}} \qquad //h:h3
% \end{UIdisplay}
%
% This option is also available on the main tool bar at the \textsf{Convert books}
@@ -8857,9 +8865,8 @@ This boolean may be tested by the user for later use.
%
% A special boolean is provided to simplify the process of
% converting \pkg{lwarp} \HTML\ output to \EPUB:
-%
+% \begin{docsidebar}[\bool{FormatWP}]
% \DescribeBoolean{FormatWP} \DescribeDefault{false}
-% \begin{docsidebar}[\texttt{FormatWP}]
% \raggedright
% Changes \HTML\ output for easier conversion
% by a word processor.
@@ -8953,8 +8960,8 @@ This boolean may be tested by the user for later use.
% to word-processor frames and captions.
% }
%
+% \begin{docsidebar}[\bool{WPMarkFloats}]
% \DescribeBoolean{WPMarkFloats} \DescribeDefault{false}
-% \begin{docsidebar}[\texttt{WPMarkFloats}]
% \raggedright
% \describeWPMarkFloats
% \end{docsidebar}
@@ -8972,8 +8979,8 @@ This boolean may be tested by the user for later use.
% to word-processor frames.
% }
%
+% \begin{docsidebar}[\bool{WPMarkMinipages}]
% \DescribeBoolean{WPMarkMinipages} \DescribeDefault{false}
-% \begin{docsidebar}[\texttt{WPMarkMinipages}]
% \raggedright
% \describeWPMarkMinipages
% \end{docsidebar}
@@ -8985,13 +8992,13 @@ This boolean may be tested by the user for later use.
% === table of contents === \\
% \end{sourcedisplay}
% where the Table of Contents would have been.
-% This helps identify where to insert the actual \acro{TOC}.
+% This helps identify where to insert the actual \TOC.
%
-% \emph{If set |false|, the actual \acro{TOC} is printed instead.}
+% \emph{If set |false|, the actual \TOC\ is printed instead.}
% }
%
+% \begin{docsidebar}[\bool{WPMarkTOC}]
% \DescribeBoolean{WPMarkTOC} \DescribeDefault{true}
-% \begin{docsidebar}[\texttt{WPMarkTOC}]
% \raggedright
% \describeWPMarkTOC
% \end{docsidebar}
@@ -9009,8 +9016,8 @@ This boolean may be tested by the user for later use.
% \emph{If set |false|, the actual lists are printed instead.}
% }
%
+% \begin{docsidebar}[\bool{WPMarkLOFT}]
% \DescribeBoolean{WPMarkLOFT} \DescribeDefault{false}
-% \begin{docsidebar}[\texttt{WPMarkLOFT}]
% \raggedright
% \describeWPMarkLOFT
% \end{docsidebar}
@@ -9022,12 +9029,12 @@ This boolean may be tested by the user for later use.
% This is useful for cut/paste into the \prog{LibreOffice Writer TeXMaths} extension.
% }
%
-% \DescribeBoolean{WPMarkMath} \DescribeDefault{false}
-% \DescribeProgram{TeXMaths}
+% \begin{docsidebar}[\bool{WPMarkMath}]
% \trouble{TeXMaths}
% \trouble{siunitx>with TeXMaths}
% \margintag{siunitx}
-% \begin{docsidebar}[\texttt{WPMarkMath}]
+% \DescribeBoolean{WPMarkMath} \DescribeDefault{false}
+% \DescribeProgram{TeXMaths}
% \raggedright
% \describeWPMarkMath
%
@@ -9053,9 +9060,9 @@ This boolean may be tested by the user for later use.
% See \cref{tab:WPsectionheadings} on \cpageref{tab:WPsectionheadings}.
% }
%
+% \begin{docsidebar}[\bool{WPTitleHeading}]
% \DescribeBoolean{WPTitleHeading} \DescribeDefault{false}
% \margintag{section headings}
-% \begin{docsidebar}[\texttt{WPTitleHeading}]
% \raggedright
% \describeWPTitleHeading
% \end{docsidebar}
@@ -9109,7 +9116,7 @@ This boolean may be tested by the user for later use.
% \item Set |\booltrue{WPMarkTOC}| and |\boolfalse{WPMarkLOFT}|
% \item Use \pkg{lwarp} to generate the \HTML\ document.
% \item Copy/paste from the \HTML\ document into an empty \prog{LibreOffice Writer} document.
-% \item Manually insert a \brand{LibreOffice} \acro{TOC} in the \brand{LibreOffice} document.
+% \item Manually insert a \brand{LibreOffice} \TOC\ in the \brand{LibreOffice} document.
% \item Manually add frames around each float, adding a caption which is cut/pasted from
% each float's simulated caption.
% \item Manually create cross references.
@@ -9137,7 +9144,7 @@ This boolean may be tested by the user for later use.
% Cross references are not actual \brand{LibreOffice} linked cross references.
%
% The List of Figures and List of Tables are not linked.
-% The pasted pseudo \acro{LOF} and \acro{LOT} match the numbering
+% The pasted pseudo \LOF\ and \LOT\ match the numbering
% of the \LaTeX\ and \HTML\ versions.
%
% Equation numbering is not automatic, but the equation numbers in \SVG\ math
@@ -9631,7 +9638,7 @@ This boolean may be tested by the user for later use.
% \trouble{cross reference>incorrect link}
% \trouble{reference>\% character between arguments}
% arguments of \cs{hyperref}, etc., as this character is among those which
-% is neutralized for inclusion in \HTML\ \acro{URL}s.
+% is neutralized for inclusion in \HTML\ \URL{}s.
%
% \item [Em-dashes or En-dashes in listing captions and titles:] \
%
@@ -9715,8 +9722,8 @@ This boolean may be tested by the user for later use.
% \subsection{Compiling the \filenm{lwarp.dtx} file}
%
% \begin{description}
-% \item [\filenm{lwarp\_tutorial.tex}:] Copy or link \filenm{lwarp\_tutorial.txt}
-% from the \acro{TDS} |doc| directory to the |source| directory,
+% \item [\filenm{lwarp_tutorial.tex}:] Copy or link \filenm{lwarp_tutorial.txt}
+% from the \TDS\ |doc| directory to the |source| directory,
% or wherever you wish to compile the documentation.
% This file is included verbatim in the documentation, but is in the \filenm{doc}
% directory so that it may be found by \prog{texdoc} and copied by the user.
@@ -9997,7 +10004,7 @@ This boolean may be tested by the user for later use.
%
% \clearpage
%
-% \section{Detecting the \TeX\ Engine — \prog{pdflatex}, \prog{lualatex}, \prog{xelatex}}
+% \section{Detecting the \TeX\ engine — \prog{pdflatex}, \prog{lualatex}, \prog{xelatex}}
%
% \changes{v0.16}{2016/04/07}{Added XeLaTeX, LuaLaTeX support.}
% See: \url{http://tex.stackexchange.com/a/47579}.
@@ -10270,6 +10277,8 @@ For a possible alternative, see class(es) #2.}
% \changes{v0.54}{2018/09/26}{Never load \pkg{aecompl}.}
% \changes{v0.62}{2018/11/18}{Added early checks for \pkg{CJK}, \pkg{CJKutf8}.}
% \changes{v0.65}{2018/12/15}{Added early checks for \pkg{jarticle}, \pkg{tarticle}, and related.}
+% \changes{v0.66}{2019/01/04}{Added early checks for \pkg{colortab}, \pkg{epsf}, \pkg{hyper},
+% \pkg{picinpar}, \pkg{picins}, \pkg{sistyle}, \pkg{ucs}.}
%
% \begin{macrocode}
\LWR@earlyclassloadnever{jarticle}{ujarticle}
@@ -10302,9 +10311,16 @@ For a possible alternative, see class(es) #2.}
% \end{macrocode}
% Others:
% \begin{macrocode}
+\LWR@earlyloadnever{colortab}{colortbl}
+\LWR@earlyloadnever{epsf}{graphicx}
\LWR@earlyloadnever{fancyheadings}{fancyhdr}
\LWR@earlyloadnever{glossary}{glossaries}
+\LWR@earlyloadnever{hyper}{hyperref}
+\LWR@earlyloadnever{picinpar}{floatflt, wrapfig}
+\LWR@earlyloadnever{picins}{floatflt, wrapfig}
+\LWR@earlyloadnever{sistyle}{siunitx}
\LWR@earlyloadnever{t1enc}{fontenc, inputenc, inputenx}
+\LWR@earlyloadnever{ucs}{inputenc, inputencx}
\LWR@earlyloadnever{wasysym}{textcomp, amssymb, amsfonts, mnsymbol, fdsymbol}
% \end{macrocode}
%
@@ -10344,6 +10360,7 @@ For a possible alternative, see class(es) #2.}
\LWR@loadafter{anonchap}
\LWR@loadafter{anysize}
\LWR@notmemoirloadafter{appendix}
+\LWR@loadafter{ar}
\LWR@loadafter{arabicfront}
\LWR@notmemoirloadafter{array}
\LWR@loadafter{arydshln}
@@ -10409,6 +10426,7 @@ For a possible alternative, see class(es) #2.}
\LWR@loadafter{draftwatermark}
\LWR@loadafter{easy-todo}
\LWR@loadafter{ebook}
+\LWR@loadafter{ed}
\LWR@loadafter{ellipsis}
\LWR@loadafter{embrac}
\LWR@loadafter{emptypage}
@@ -10485,7 +10503,6 @@ For a possible alternative, see class(es) #2.}
\LWR@loadafter{idxlayout}
\LWR@loadafter{ifoddpage}
\LWR@loadafter{imakeidx}
-\LWR@loadafter{indentfirst}
\LWR@notmemoirloadafter{index}
% inputenc must be loaded before lwarp
% inputenx must be loaded before lwarp
@@ -10531,6 +10548,7 @@ For a possible alternative, see class(es) #2.}
\LWR@loadafter{multirow}
\LWR@loadafter{multitoc}
\LWR@loadafter{musicography}
+\LWR@loadafter{nameauth}
\LWR@loadafter{nameref}
\LWR@loadafter{natbib}
\LWR@notmemoirloadafter{nccfancyhdr}
@@ -10629,6 +10647,7 @@ For a possible alternative, see class(es) #2.}
\LWR@loadafter{srctex}
\LWR@loadafter{stabular}
\LWR@notltjloadafter{stfloats}
+\LWR@loadafter{subcaption}
\LWR@loadafter{subfig}
\LWR@loadafter{subfigure}
\LWR@loadafter{supertabular}
@@ -10663,6 +10682,7 @@ For a possible alternative, see class(es) #2.}
\LWR@loadafter{transparent}
\LWR@loadafter{trimclip}
\LWR@loadafter{trivfloat}
+\LWR@loadafter{truncate}
\LWR@loadafter{turnthepage}
\LWR@loadafter{twoup}
% \end{macrocode}
@@ -10747,16 +10767,16 @@ For a possible alternative, see class(es) #2.}
% \end{macrocode}
%
%
-% \section{pdf\LaTeX\ T1 and \acro{UTF}-8 encoding}
+% \section{pdf\LaTeX\ T1 and \UTF-8 encoding}
%
-% When using pdf\LaTeX, \pkg{lwarp} requires T1 encoding, and recommends \acro{UTF}-8 encoding.
+% When using pdf\LaTeX, \pkg{lwarp} requires T1 encoding, and recommends \UTF-8 encoding.
%
% If some other input encoding is already defined, \pkg{lwarp} will
% try to use it instead, and hope for the best.
%
-% \XeLaTeX\ and Lua\LaTeX\ are both \acro{UTF}-8 by nature.
+% \XeLaTeX\ and Lua\LaTeX\ are both \UTF-8 by nature.
%
-% \changes{v0.44}{2017/11/16}{If pdfLaTeX, require T1 and \acro{UTF}-8 encoding.}
+% \changes{v0.44}{2017/11/16}{If pdfLaTeX, require T1 and \UTF-8 encoding.}
% \changes{v0.52}{2018/03/26}{If pdfLaTeX, allow other input encoding.}
% \changes{v0.63}{2018/11/25}{p\TeX: Encoding.}
%
@@ -10904,6 +10924,25 @@ For a possible alternative, see class(es) #2.}
% \end{macro}
%
%
+% \begin{macro}{\LWR@firstoffour} \marg{first} \marg{second} \marg{third} \marg{fourth}
+% \changes{v0.63}{2019/01/25}{Added.}
+% \begin{macro}{\LWR@secondoffour} \marg{first} \marg{second} \marg{third} \marg{fourth}
+% \begin{macro}{\LWR@thirdoffour} \marg{first} \marg{second} \marg{third} \marg{fourth}
+% \begin{macro}{\LWR@fourthoffour} \marg{first} \marg{second} \marg{third} \marg{fourth}
+%
+% Expands to the nth of the four arguments.
+% Used for extra cross referencing.
+%
+% \begin{macrocode}
+\long\def\LWR@firstoffour#1#2#3#4{#1}
+\long\def\LWR@secondoffour#1#2#3#4{#2}
+\long\def\LWR@thirdoffour#1#2#3#4{#3}
+\long\def\LWR@fourthoffour#1#2#3#4{#4}
+% \end{macrocode}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
%
%
% \section{Operating-System portability}
@@ -10953,6 +10992,30 @@ For a possible alternative, see class(es) #2.}
% \end{macrocode}
%
%
+% The literal |{| character.
+% The ampersand is temporarily set to the begin group character during the
+% definition of the leftbrace macro.
+% \begin{macrocode}
+\catcode`\&=1
+\catcode`\{=12
+\def\LWRleftbrace&{}
+\catcode`\{=1
+\catcode`\&=4
+% \end{macrocode}
+%
+%
+% The literal |}| character.
+% The ampersand is temporarily set to the end group character during the
+% definition of the leftbrace macro.
+% \begin{macrocode}
+\catcode`\&=2
+\catcode`\}=12
+\def\LWRrightbrace{}&
+\catcode`\}=2
+\catcode`\&=4
+% \end{macrocode}
+%
+%
% The literal |#| character:
% \begin{macrocode}
\catcode`\#=12
@@ -11130,8 +11193,8 @@ For a possible alternative, see class(es) #2.}
% \changes{v0.19}{2016/05/25}{Options: mathsvg and mathjax}
% \DescribeOption{mathsvg}
% Option \optn{mathsvg} selects \SVG\ math display:
-% \gindex{math>\optn{mathsvg} option}
-% \gindex{SVG>\optn{mathsvg} option}
+% \gindex{math>mathsvg=\optn{mathsvg} option}
+% \gindex{SVG>mathsvg=\optn{mathsvg} option}
% If the \optn{mathsvg} option is given, boolean |mathjax| is false,
% and may be used for \cs{ifbool} tests.
% \begin{macrocode}
@@ -11149,7 +11212,7 @@ For a possible alternative, see class(es) #2.}
%
% \DescribeOption{mathjax}
% Option \optn{mathjax} selects \brand{MathJax} math display:
-% \gindex{math>\optn{mathjax} option}
+% \gindex{math>mathjax=\optn{mathjax} option}
% \gindex{MathJax=\brand{MathJax}>mathjax=\optn{mathjax} option}
% If the \optn{mathjax} option is given, boolean |mathjax| is true, may be used for \cs{ifbool} tests.
% \begin{macrocode}
@@ -11167,7 +11230,7 @@ For a possible alternative, see class(es) #2.}
% ^^A \DescribeOption{mathKaTeX}
% ^^A Option \optn{mathKaTeX} selects Ka\TeX\ math display:
-% ^^A \gindex{math>\optn{mathKaTeX} option}
+% ^^A \gindex{math>mathKaTeX=\optn{mathKaTeX} option}
% ^^A \gindex{KaTeX=Ka\TeX>mathKaTeX=\optn{mathKaTeX} option}
% ^^A If the \optn{mathKaTeX} option is given, boolean |mathKaTeX| is true,
% ^^A may be used for \cs{ifbool} tests.
@@ -11185,6 +11248,7 @@ For a possible alternative, see class(es) #2.}
% \DescribeOption{BaseJobname}
+% \DescribeDefault{\cs{jobname}}
% Option \optn{BaseJobname} sets the \cs{BaseJobname} for this document.
%
% This is the \cs{jobname} of the printed version, even if currently
@@ -11196,8 +11260,30 @@ For a possible alternative, see class(es) #2.}
% \end{macrocode}
+% \DescribeOption{ImagesDirectory}
+% \DescribeDefault{\cs{jobname}-images}
+% Option \optn{ImagesDirectory} sets the name of the directory
+% to use for the \env{lateximages}.
+%
+% \changes{v0.66}{2019/01/27}{Added option \optn{ImagesDirectory}.}
+% \begin{macrocode}
+\DeclareStringOption[\BaseJobname-images]{ImagesDirectory}
+% \end{macrocode}
+
+
+% \DescribeOption{ImagesName}
+% \DescribeDefault{image-}
+% Option \optn{ImagesName} sets the prefix
+% to use for the \env{lateximages}.
+%
+% \changes{v0.66}{2019/01/27}{Added option \optn{ImagesName}.}
+% \begin{macrocode}
+\DeclareStringOption[image-]{ImagesName}
+% \end{macrocode}
+
+
% \DescribeOption{makeindexStyle} Selects a custom |.ist| file.
-% The default is |lwarp.ist|.
+% \DescribeDefault{lwarp.ist}
% A customized file should be based on |lwarp.ist|, and must retain
% the lines related to \cs{hyperindexref}.
%
@@ -11209,7 +11295,7 @@ For a possible alternative, see class(es) #2.}
% \DescribeOption{xindyStyle} Selects a custom |.xdy| file.
-% The default is |lwarp.xdy|.
+% \DescribeDefault{lwarp.xdy}
% A customized file should be based on |lwarp.xdy|, and must retain
% the line
% \begin{Verbatim}[gobble=2]
@@ -11225,6 +11311,7 @@ For a possible alternative, see class(es) #2.}
% \DescribeOption{xindyLanguage} Sets the \pkg{xindy} language to be assigned
+% \DescribeDefault{english}
% in \prog{lwarpmk}'s configuration files. This is then used by \prog{lwarpmk} while
% processing the index and glossary.
%
@@ -11238,6 +11325,7 @@ For a possible alternative, see class(es) #2.}
% \DescribeOption{xindyCodepage} Sets the \pkg{xindy} codepage to be assigned
+% \DescribeDefault{utf8}
% in \prog{lwarpmk}'s configuration files. This is then used by \prog{lwarpmk} while
% processing the index.
% ^^A and glossary.
@@ -11295,7 +11383,7 @@ For a possible alternative, see class(es) #2.}
-% \DescribeOption{HomeHTMLFilename} \DescribeDefault{\cs{\BaseJobname}}
+% \DescribeOption{HomeHTMLFilename} \DescribeDefault{\cs{BaseJobname}}
% The filename of the homepage.
% The default is the jobname.
% This option is stored into \cs{LWR@HomeHTMLFilename},
@@ -11443,6 +11531,11 @@ For a possible alternative, see class(es) #2.}
% \end{macrocode}
+
+
+% \subsection{Additional options support}
+
+
% Assign the \cs{BaseJobname} if the user hasn't provided one:
% \begin{macrocode}
\providecommand*{\BaseJobname}{\LWR@BaseJobname}
@@ -11452,15 +11545,52 @@ For a possible alternative, see class(es) #2.}
% Defaults unless already over-ridden by the user:
% \begin{macrocode}
\ifcsempty{LWR@HomeHTMLFilename}{
-\newcommand*{\HomeHTMLFilename}{\BaseJobname}
+ \newcommand*{\HomeHTMLFilename}{\BaseJobname}
}{
-\csedef{HomeHTMLFilename}{\LWR@HomeHTMLFilename}
+ \csedef{HomeHTMLFilename}{\LWR@HomeHTMLFilename}
}
\csedef{HTMLFilename}{\LWR@HTMLFilename}
% \end{macrocode}
%
%
+% Special handling for underscores in labels and filenames.
+%
+% \begin{macro}{\LWR@sanitized} The sanitized version of what was given
+% to \cs{LWR@sanitize}.
+% Characters are set to their detokenized versions.
+% Required for underscores in labels and filenames.
+% \begin{macrocode}
+\newcommand*{\LWR@sanitized}{}
+% \end{macrocode}
+% \end{macro}
+
+% \begin{macro}{\LWR@sanitize} \marg{text}
+%
+% Sanitizes the text and returns the result in \cs{LWR@sanitized}.
+% \begin{macrocode}
+\newcommand*{\LWR@sanitize}[1]{%
+\edef\LWR@sanitized{#1}%
+\edef\LWR@sanitized{\detokenize\expandafter{\LWR@sanitized}}%
+}
+% \end{macrocode}
+% \end{macro}
+
+
+% Sanitize some string options to neutralize underscores.
+% \changes{v0.66}{2019/01/28}{Sanitize filenames.}
+% \begin{macrocode}
+\LWR@sanitize{\LWR@BaseJobname}
+\edef\LWR@BaseJobname{\LWR@sanitized}
+
+\LWR@sanitize{\LWR@ImagesDirectory}
+\edef\LWR@ImagesDirectory{\LWR@sanitized}
+
+\LWR@sanitize{\LWR@ImagesName}
+\edef\LWR@ImagesName{\LWR@sanitized}
+% \end{macrocode}
+%
+%
%
% \cs{LWR@PrintIndexCmd} and \cs{LWR@HTMLIndexCmd} are tested to see if they are empty.
% If so, they are set to a reasonable defaults for a single index using \prog{makeindex},
@@ -12007,8 +12137,13 @@ For a possible alternative, see class(es) #2.}
% \DescribePackage{xstring}
+% There was a short-term bug in \pkg{xstring} regarding \cs{IfInteger} which affected
+% \pkg{lwarp}'s index generation. The updated version is requested here.
+% \trouble[index]{index>xstring=\pkg{xstring} bug}
+% \trouble{index>numbers, not links}
+% \trouble{xstring=\pkg{xstring}}
% \begin{macrocode}
-\RequirePackage{xstring}
+\RequirePackage{xstring}[2019/02/01]
% \end{macrocode}
@@ -12030,14 +12165,8 @@ For a possible alternative, see class(es) #2.}
% \end{macrocode}
-% \DescribePackage{zref}
-% Used for cross-references.
-% \begin{macrocode}
-\RequirePackage{zref}
-% \end{macrocode}
-
-
-% \changes{v0.40}{2017/09/07}{No longer preloads \pkg{xfrac}.}
+% \changes{v0.40}{2017/09/07}{\pkg{xfrac}: No longer preloaded.}
+% \changes{v0.66}{2019/01/27}{\pkg{zref}: No longer used.}
% \DescribePackage{printlen}
@@ -12130,6 +12259,8 @@ For a possible alternative, see class(es) #2.}
% \changes{v0.63}{2018/12/02}{Added to reduce number of \filenm{lwarp-*} files.}
% \changes{v0.64}{2018/12/07}{Prevented \pkg{bitfield}, \pkg{doublespace},
% \pkg{newthm}, \pkg{rplain}, \pkg{si}.}
+% \changes{v0.66}{2019/01/04}{Prevented \pkg{colortab}, \pkg{epsf}, \pkg{hyper}, \pkg{picinpar},
+% \pkg{picins}, \pkg{sistyle}, \pkg{ucs}.}
%
% The following should never be loaded:
% \begin{macrocode}
@@ -12140,13 +12271,20 @@ For a possible alternative, see class(es) #2.}
\LWR@checkloadnever{#1}{boxedminipage}{boxedminipage2e}
\LWR@checkloadnever{#1}{caption2}{caption}
\LWR@checkloadnever{#1}{ccaption}{caption}
+\LWR@checkloadnever{#1}{colortab}{colortbl}
\LWR@checkloadnever{#1}{doublespace}{setspace}
+\LWR@checkloadnever{#1}{epsf}{graphicx}
\LWR@checkloadnever{#1}{fancyheadings}{fancyhdr}
\LWR@checkloadnever{#1}{glossary}{glossaries}
+\LWR@checkloadnever{#1}{hyper}{hyperref}
\LWR@checkloadnever{#1}{newthm}{ntheorem}
+\LWR@checkloadnever{#1}{picinpar}{floatflt, wrapfig}
+\LWR@checkloadnever{#1}{picins}{floatflt, wrapfig}
\LWR@checkloadnever{#1}{rplain}{fancyhdr}
\LWR@checkloadnever{#1}{si}{siunitx}
+\LWR@checkloadnever{#1}{sistyle}{siunitx}
\LWR@checkloadnever{#1}{t1enc}{fontenc, inputenc, inputenx}
+\LWR@checkloadnever{#1}{ucs}{inputenc, inputencx}
\LWR@checkloadnever{#1}{wasysym}{textcomp, amssymb, amsfonts, mnsymbol, fdsymbol}
% \end{macrocode}
%
@@ -12212,7 +12350,7 @@ For a possible alternative, see class(es) #2.}
{% yes filename was found
% \end{macrocode}
% Check if the package should be loaded before \pkg{lwarp},
-% or never at all:
+% or never at all:
% \begin{macrocode}
\LWR@checkloadfilename{\LWR@strresulttwo}%
% \end{macrocode}
@@ -12374,8 +12512,10 @@ For a possible alternative, see class(es) #2.}
% \DescribePackage{caption}
% \changes{v0.47}{2018/01/29}{\pkg{caption}: Also loads \pkg{lwarp-caption}.}
+% \changes{v0.66}{2018/12/29}{\pkg{caption}: Fix for options clash.}
% \begin{macrocode}
-\RequirePackage{caption}%
+\LWR@origRequirePackage{caption}
+\AtBeginDocument{\RequirePackage{lwarp-caption}}%
% \end{macrocode}
% \begin{macrocode}
@@ -13115,6 +13255,9 @@ For a possible alternative, see class(es) #2.}
\let\LWR@origllap\llap
\let\LWR@origrlap\rlap
\let\LWR@orighfilneg\hfilneg
+\let\LWR@orighspace\hspace
+
+\let\LWR@origrule\rule
\let\LWR@origmedskip\medskip
\let\LWR@origbigskip\bigskip
@@ -13291,7 +13434,7 @@ For a possible alternative, see class(es) #2.}
-% \section{Configuration Files}
+% \section{Configuration files}
% \changes{v0.20}{2016/12/20}{\pkg{lwarp-newproject}: Added.}
% \changes{v0.30}{2017/04/27}{\pkg{lwarp-newproject} removed, and combined with \pkg{lwarp}.}
@@ -13331,7 +13474,7 @@ For a possible alternative, see class(es) #2.}
% \end{macrocode}
-% \subsection{\filenm{project\_html.tex}}
+% \subsection{\filenm{project_html.tex}}
%
% \DescribeFile{project_html.tex} Used to allow an \HTML\ version of the
% document to exist alongside the print version.
@@ -13367,7 +13510,7 @@ For a possible alternative, see class(es) #2.}
% Incremented by one each time the configuration file format changes.
% (This is NOT the same as the \pkg{lwarp} version number.)
% \begin{macrocode}
-\newcommand*{\LWR@lwarpconfversion}{1}% also in lwarpmk.lua
+\newcommand*{\LWR@lwarpconfversion}{2}% also in lwarpmk.lua
% \end{macrocode}
% \end{macro}
%
@@ -13392,7 +13535,7 @@ For a possible alternative, see class(es) #2.}
% Used to form the basic compilation command for a document, adding
% the optional shell escape.
%
-% Engine is \prog{pdflatex}, etc. Suffix is empty or \filenm{\_html}
+% Engine is \prog{pdflatex}, etc. Suffix is empty or \filenm{_html}
% \begin{macrocode}
\newcommand*{\LWR@compilecmd}[2]{%
#1 \LWR@shellescapecmd \jobname#2%
@@ -13405,7 +13548,7 @@ For a possible alternative, see class(es) #2.}
%
% Adds to the compilation command.
%
-% Cmd is \prog{dvipdfmx}, etc. Suffix is empty or \filenm{\_html}
+% Cmd is \prog{dvipdfmx}, etc. Suffix is empty or \filenm{_html}
% \changes{v0.61}{2018/10/06}{Removed spaces.}
% \begin{macrocode}
\newcommand*{\LWR@addcompilecmd}[2]{%
@@ -13422,7 +13565,7 @@ For a possible alternative, see class(es) #2.}
\newcommand*{\LWR@unknownengine}{%
\PackageError{lwarp}
{Unknown LaTeX engine.}
- {Lwarp only knows about pdflatex, dvi latex, xelatex, and lualatex.}
+ {Lwarp only knows about pdflatex, dvi latex, xelatex, lualatex, and upLateX.}
}
% \end{macrocode}
% \end{macro}
@@ -13696,6 +13839,7 @@ For a possible alternative, see class(es) #2.}
%
% \changes{v0.59}{2018/08/21}{Compilation commands now preassigned by \pkg{lwarp} instead
% of being computed by \prog{lwarpmk}.}
+% \changes{v0.66}{2019/01/27}{Added \optn{ImagesDirectory} and \optn{ImagesName}.}
% \begin{macrocode}
\newcommand{\LWR@writeconf}[1]{
\ifcsdef{LWR@quickfile}{}{\newwrite{\LWR@quickfile}}
@@ -13709,6 +13853,8 @@ For a possible alternative, see class(es) #2.}
\immediate\write\LWR@quickfile{sourcename = [[\jobname]]}
\immediate\write\LWR@quickfile{homehtmlfilename = [[\HomeHTMLFilename]]}
\immediate\write\LWR@quickfile{htmlfilename = [[\HTMLFilename]]}
+\immediate\write\LWR@quickfile{imagesdirectory = [[\LWR@ImagesDirectory]]}
+\immediate\write\LWR@quickfile{imagesname = [[\LWR@ImagesName]]}
\immediate\write\LWR@quickfile{latexmk = [[\ifbool{LWR@latexmk}{true}{false}]]}
\immediate\write\LWR@quickfile{printlatexcmd = [[\LWR@PrintLatexCmd]]}
\immediate\write\LWR@quickfile{HTMLlatexcmd = [[\LWR@HTMLLatexCmd]]}
@@ -13821,6 +13967,7 @@ For a possible alternative, see class(es) #2.}
% \changes{v0.65}{2018/12/09}{\filenm{lwarp.css}: Side\TOC to left for improved \cs{marginpar}s.}
% \changes{v0.65}{2018/12/09}{\filenm{lwarp.css}: Added \cs{sishape}, \cs{textsi}.}
% \changes{v0.65}{2018/12/18}{\filenm{lwarp.css}: Improved \CSS\ for page layout.}
+% \changes{v0.66}{2019/01/02}{\filenm{lwarp.css}: Improved \CSS\ for definition lists.}
%
% ^^A *lwarp.css
%
@@ -14294,12 +14441,12 @@ div.titlepage div.mpfootnotes {
-ol {
+ul, ol {
margin: 1ex 1em 1ex 0em;
line-height: 1.2;
}
-ul, body dir, body menu {
+body dir, body menu {
margin: 3ex 1em 3ex 0em;
line-height: 1.2;
}
@@ -14522,7 +14669,7 @@ div.wpminipage { border: 1px solid green ; margin: .5ex ; padding: .5ex ;}
.mdframed p { padding: 0ex .5em 0ex .5em ; }
-.mdframed dl { padding: 0ex .5em 0ex .5em ; }
+.mdframed dl { padding: 1ex .5em 0ex .5em ; }
.mdframedtitle {
padding: .5ex 0pt 0pt 0pt ;
@@ -14591,13 +14738,20 @@ dl {
}
dl dt {
- margin-top: 1ex;
- margin-left: 1em ;
+ display: block ;
+ float:left ;
font-weight: bold;
+ padding-right: 1em ;
}
+dl dd { display: block ; }
+
+dl dd:after { content: "" ; display: block ; clear: both }
+
dl dd p { margin-top: 0em; }
+dd ul, dd ol, dd dl { clear: both ; padding-top: 1ex }
+
nav {
font-family: "URW Classico", Optima, "Linux Biolinum O",
@@ -14834,7 +14988,7 @@ td.tdb , td.tdbrule , td.tdB , td.tdBrule
.tnotes {
margin: 0ex 5% 1ex 5% ;
padding: 0.5ex 1em 0.5ex 1em;
- font-size:.85em;
+ font-size:.80em;
text-align: left ;
}
@@ -15311,7 +15465,7 @@ span.sidetocthetitle { display: none }
-% \subsection{\filenm{lwarp\_sagebrush.css}}
+% \subsection{\filenm{lwarp_sagebrush.css}}
% \DescribeFile{lwarp_sagebrush.css}
% An optional \CSS\ which may be used for
@@ -15320,7 +15474,7 @@ span.sidetocthetitle { display: none }
% If used, this must be present both when compiling the project
% and also when distributing the \HTML\ files.
%
-% \changes{v0.65}{2018/12/09}{\filenm{lwarp\_sagebrush.css}: Side\TOC to left for improved \cs{marginpar}s.}
+% \changes{v0.65}{2018/12/09}{\filenm{lwarp_sagebrush.css}: Side\TOC to left for improved \cs{marginpar}s.}
%
% ^^A *lwarp_sagebrush.css
%
@@ -15579,7 +15733,7 @@ nav.sidetoc a:hover {
-% \subsection{\filenm{lwarp\_formal.css}}
+% \subsection{\filenm{lwarp_formal.css}}
% \DescribeFile{lwarp_formal.css}
% An optional \CSS\ which may be used for
@@ -15588,8 +15742,9 @@ nav.sidetoc a:hover {
% If used, this must be present both when compiling the project
% and also when distributing the \HTML\ files.
%
-% \changes{v0.62}{2018/11/10}{\filenm{lwarp\_formal.css}: Fix: Font for verse.}
-% \changes{v0.65}{2018/12/09}{\filenm{lwarp\_formal.css}: Side\TOC to left for improved \cs{marginpar}s.}
+% \changes{v0.62}{2018/11/10}{\filenm{lwarp_formal.css}: Fix: Font for verse.}
+% \changes{v0.65}{2018/12/09}{\filenm{lwarp_formal.css}: Side\TOC to left for improved \cs{marginpar}s.}
+% \changes{v0.66}{2019/01/02}{\filenm{lwarp_formal.css}: Improved \CSS\ for table notes.}
%
% ^^A *lwarp_formal.css
%
@@ -15739,6 +15894,8 @@ div.figurecaption , .lstlisting {
.tnotes {
background: #fffcf5 ;
+ border-top: 1px solid silver ;
+ border-bottom: 1px solid silver ;
}
.theorem {
@@ -15798,7 +15955,7 @@ nav.botnavigation {
-% \subsection{\filenm{sample\_project.css}}
+% \subsection{\filenm{sample_project.css}}
% \DescribeFile{sample_project.css}
% The project-specific \CSS\ file. Use with \cs{CSSFilename}.
@@ -15841,7 +15998,7 @@ nav.botnavigation {
%
% The page compositor line is for \pkg{memoir}'s \cs{specialindex}.
%
-% \changes{v0.58}{2018/06/17}{\filenm{lwarp\_html.ist}: Added.}
+% \changes{v0.58}{2018/06/17}{\filenm{lwarp_html.ist}: Added.}
%
% ^^A *lwarp.ist
%
@@ -15888,7 +16045,7 @@ page_compositor "."
% \href{https://tex.stackexchange.com/questions/80300/how-can-i-convince-hyperref-and-xindy-to-play-together-nicely}
% {https://tex.stackexchange.com/questions/80300/ \\ \fqquad\ how-can-i-convince-hyperref-and-xindy-to-play-together-nicely}
%
-% \changes{v0.30}{2017/04/28}{File: \filenm{lwarp\_html.xdy} renamed to \filenm{lwarp.xdy}.}
+% \changes{v0.30}{2017/04/28}{File: \filenm{lwarp_html.xdy} renamed to \filenm{lwarp.xdy}.}
% \changes{v0.30}{2017/04/26}{Fix: \filenm{lwarp.xdy} only written in print mode.}
% \changes{v0.58}{2018/06/19}{\filenm{lwarp.xdy}: Requires \filenm{makeindex.xdy}.}
% \changes{v0.58}{2018/06/21}{\filenm{lwarp.xdy}: Supports bold, italic.}
@@ -15925,7 +16082,7 @@ page_compositor "."
% \end{macrocode}
-% \subsection{\filenm{lwarp\_one\_limage.cmd}}
+% \subsection{\filenm{lwarp_one_limage.cmd}}
%
% \DescribeFile{lwarp_one_limage.cmd}
% Used by \pkg{lwarp} to help make \env{lateximage}s when using \brand{Windows}.
@@ -15937,34 +16094,47 @@ page_compositor "."
% The arguments are each of the three fields from \filenm{lateximages.txt},
% and also the base name of the source file.
%
-% \prog{MikTeX} does not allow file \filenm{lwarp\_one\_limage.cmd} to be
-% created directly by \prog{lwarpmk}, so \filenm{lwarp\_one\_limage.txt} is created instead,
-% then copied to \filenm{lwarp\_one\_limage.cmd} by \prog{lwarpmk}.
+% \prog{MiKTeX} does not allow file \filenm{lwarp_one_limage.cmd} to be
+% created directly by \prog{lwarpmk}, so \filenm{lwarp_one_limage.txt} is created instead,
+% then copied to \filenm{lwarp_one_limage.cmd} by \prog{lwarpmk}.
% This occurs each time \prog{lwarpmk} used to create \env{lateximage}s.
%
-% \changes{v0.50}{2018/02/27}{\filenm{lwarp\_one\_limage.txt}: Added.}
-% \changes{v0.51}{2018/03/16}{\filenm{lwarp\_one\_limage.txt}: \prog{pdftocairo} \optn{-noshrink} added.}
+% \changes{v0.50}{2018/02/27}{\filenm{lwarp_one_limage.txt}: Added.}
+% \changes{v0.51}{2018/03/16}{\filenm{lwarp_one_limage.txt}: \prog{pdftocairo} \optn{-noshrink} added.}
+% \changes{v0.66}{2019/01/30}{\filenm{lwarp_one_limage.txt}: Image directory and prefix.}
%
% ^^A *lwarp_one_limage.txt
%
% \codeconfig
% \begin{macrocode}
\begin{LWRwriteconf}
-\begin{filecontents*}{lwarp_one_limage.txt}
-@echo off
-pdfseparate -f %1 -l %1 %4_html.pdf lateximages\lateximagetemp-%%d.pdf
-pdfcrop --hires lateximages\lateximagetemp-%1.pdf lateximages\%3.pdf
-pdftocairo -svg -noshrink lateximages\%3.pdf lateximages\%3.svg
-del lateximages\%3.pdf
-del lateximages\lateximagetemp-%1.pdf
-exit
-\end{filecontents*}
+\immediate\openout\LWR@quickfile=lwarp_one_limage.txt
+\immediate\write\LWR@quickfile{%
+ pdfseparate -f \LWRpercent 1 -l \LWRpercent 1 \LWRpercent 4_html.pdf %
+ \LWR@ImagesDirectory\OSPathSymbol lateximagetemp-\LWRpercent\LWRpercent d.pdf%
+}
+\immediate\write\LWR@quickfile{%
+ pdfcrop --hires \LWR@ImagesDirectory\OSPathSymbol lateximagetemp-\LWRpercent 1.pdf %
+ \LWR@ImagesDirectory\OSPathSymbol\LWRpercent 3.pdf%
+}
+\immediate\write\LWR@quickfile{%
+ pdftocairo -svg -noshrink \LWR@ImagesDirectory\OSPathSymbol\LWRpercent 3.pdf %
+ \LWR@ImagesDirectory\OSPathSymbol\LWRpercent 3.svg%
+}
+\immediate\write\LWR@quickfile{%
+ del \LWR@ImagesDirectory\OSPathSymbol\LWRpercent 3.pdf%
+}
+\immediate\write\LWR@quickfile{%
+ del \LWR@ImagesDirectory\OSPathSymbol lateximagetemp-\LWRpercent 1.pdf%
+}
+\immediate\write\LWR@quickfile{exit}
+\immediate\closeout\LWR@quickfile
\end{LWRwriteconf}
% \end{macrocode}
-% \subsection{\filenm{lwarp\_mathjax.txt}}
+% \subsection{\filenm{lwarp_mathjax.txt}}
% \DescribeFile{lwarp_mathjax.txt}
% Used by \pkg{lwarp} when using \brand{MathJax}.
@@ -15973,15 +16143,15 @@ exit
% but does not need to be present when distributing
% the resulting \HTML\ files.
%
-% \changes{v0.28}{2017/04/11}{File: \filenm{lwarp\_mathjax.txt}: Updated \protect\acro{CDN} repository.}
-% \changes{v0.30}{2017/04/26}{Fix: \filenm{lwarp\_mathjax.txt}: Only written in print mode.}
-% \changes{v0.34}{2017/07/27}{File: \filenm{lwarp\_mathjax.txt}: Version change.}
-% \changes{v0.42}{2017/10/16}{File: \filenm{lwarp\_mathjax.txt}: Updated \pkg{siunitx} script.}
-% \changes{v0.45}{2017/12/21}{File: \filenm{lwarp\_mathjax.txt}: Allow \brand{MathJax} inside \env{tabbing}.}
-% \changes{v0.45}{2018/01/23}{File: \filenm{lwarp\_mathjax.txt}: Allow \brand{MathJax} inside \env{verse}.}
-% \changes{v0.59}{2018/07/13}{File: \filenm{lwarp\_mathjax.txt}: Updated to MathJax v2.7.4.}
-% \changes{v0.59}{2018/07/16}{File: \filenm{lwarp\_mathjax.txt}: Fix: Removed chapter number from tagged non-numeric MathJax equations.}
-% \changes{v0.62}{2018/11/05}{File: \filenm{lwarp\_mathjax.txt}: Removed inoperable \pkg{siunitx} extension.}
+% \changes{v0.28}{2017/04/11}{File: \filenm{lwarp_mathjax.txt}: Updated \protect\acro{CDN} repository.}
+% \changes{v0.30}{2017/04/26}{Fix: \filenm{lwarp_mathjax.txt}: Only written in print mode.}
+% \changes{v0.34}{2017/07/27}{File: \filenm{lwarp_mathjax.txt}: Version change.}
+% \changes{v0.42}{2017/10/16}{File: \filenm{lwarp_mathjax.txt}: Updated \pkg{siunitx} script.}
+% \changes{v0.45}{2017/12/21}{File: \filenm{lwarp_mathjax.txt}: Allow \brand{MathJax} inside \env{tabbing}.}
+% \changes{v0.45}{2018/01/23}{File: \filenm{lwarp_mathjax.txt}: Allow \brand{MathJax} inside \env{verse}.}
+% \changes{v0.59}{2018/07/13}{File: \filenm{lwarp_mathjax.txt}: Updated to MathJax v2.7.4.}
+% \changes{v0.59}{2018/07/16}{File: \filenm{lwarp_mathjax.txt}: Fix: Removed chapter number from tagged non-numeric MathJax equations.}
+% \changes{v0.62}{2018/11/05}{File: \filenm{lwarp_mathjax.txt}: Removed inoperable \pkg{siunitx} extension.}
%
%
% ^^A *lwarp_mathjax.txt
@@ -16104,7 +16274,7 @@ src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.4/MathJax.js?config=TeX-
-% ^^A \subsection{\filenm{lwarp\_KaTeX.txt}}
+% ^^A \subsection{\filenm{lwarp_KaTeX.txt}}
% ^^A \DescribeFile{lwarp_KaTeX.txt}
% ^^A Used by \pkg{lwarp} when using Ka\TeX.
@@ -16113,7 +16283,7 @@ src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.4/MathJax.js?config=TeX-
% ^^A but does not need to be present when distributing
% ^^A the resulting \HTML\ files.
%
-% ^^A \changes{v0.59}{2018/11/03}{File: \filenm{lwarp\_KaTeX.txt}: Added.}
+% ^^A \changes{v0.59}{2018/11/03}{File: \filenm{lwarp_KaTeX.txt}: Added.}
%
%
% ^^A ^^A *lwarp_KaTeX.txt
@@ -16204,6 +16374,8 @@ src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.4/MathJax.js?config=TeX-
% \changes{v0.59}{2018/08/05}{\prog{lwarpmk}: Double insead of single-dashed \optn{-\/-shell-escape} option.}
% \changes{v0.59}{2018/08/21}{\prog{lwarpmk}: Consolidated compiling options into \optn{printlatexcmd} and \optn{HTMLlatexcmd}.}
% \changes{v0.59}{2018/09/06}{\prog{lwarpmk}: Added \cmds{lwarpmk epstopdf}.}
+% \changes{v0.66}{2019/01/27}{\prog{lwarpmk}: Added \optn{ImagesDirectory} and \optn{ImagesName}.}
+% \changes{v0.66}{2019/01/30}{\prog{lwarpmk}: Fix for \cmds{cleanlimages}.}%
%
% The following is only generated if the \optn{lwarpmk} option
% was given to \pkg{lwarp}.
@@ -16219,8 +16391,8 @@ src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.4/MathJax.js?config=TeX-
-- Copyright 2016-2018 Brian Dunn
-printversion = "v0.65"
-requiredconfversion = "1" -- also at *lwarpmk.conf
+printversion = "v0.66"
+requiredconfversion = "2" -- also at *lwarpmk.conf
function printhelp ()
print ("lwarpmk: Use lwarpmk -h or lwarpmk --help for help.") ;
@@ -16324,6 +16496,8 @@ end
-- Additional defaults:
confversion = "0"
opsystem = "Unix"
+imagesdirectory = "lateximages"
+imagesname = "image-"
latexmk = "false"
printlatexcmd = ""
HTMLlatexcmd = ""
@@ -16385,6 +16559,8 @@ elseif ( cvarname == "opsystem" ) then
elseif ( cvarname == "sourcename" ) then sourcename = cvalue
elseif ( cvarname == "homehtmlfilename" ) then homehtmlfilename = cvalue
elseif ( cvarname == "htmlfilename" ) then htmlfilename = cvalue
+elseif ( cvarname == "imagesdirectory" ) then imagesdirectory = cvalue
+elseif ( cvarname == "imagesname" ) then imagesname = cvalue
elseif ( cvarname == "latexmk" ) then latexmk = cvalue
elseif ( cvarname == "printlatexcmd" ) then printlatexcmd = cvalue
elseif ( cvarname == "HTMLlatexcmd" ) then HTMLlatexcmd = cvalue
@@ -16612,16 +16788,15 @@ end -- checkhtmlpdfexists
function warnlimages ()
--
--- Warning of a missing lateximages.txt file:
---
+-- Warning of a missing <sourcename>-images.txt file:
print ("lwarpmk: ===")
- print ("lwarpmk: \"lateximages.txt\" does not exist.")
+ print ("lwarpmk: \"" .. sourcename .. "-images.txt\" does not exist.")
print ("lwarpmk: Your project does not use SVG math or other lateximages,")
print ("lwarpmk: or the file has been deleted somehow.")
print ("lwarpmk: Use \"lwarpmk html\" to recompile your project")
- print ("lwarpmk: and recreate \"lateximages.txt\".")
+ print ("lwarpmk: and recreate \"" .. sourcename .. "-images.txt\".")
print ("lwarpmk: If your project does not use SVG math or other lateximages,")
- print ("lwarpmk: then \"lateximages.txt\" will never exist, and")
+ print ("lwarpmk: then \"" .. sourcename .. "-images.txt\" will never exist, and")
print ("lwarpmk: \"lwarpmk limages\" will not be necessary.")
print ("lwarpmk: ===")
end -- warnlimages
@@ -16629,18 +16804,18 @@ end -- warnlimages
function checklimages ()
--
--- Check lateximages.txt to see if need to recompile first.
+-- Check <sourcename>.txt to see if need to recompile first.
-- If any entry has a page number of zero, then there were incorrect images.
--
-print ("lwarpmk: Checking for a valid lateximages.txt file.")
-local limagesfile = io.open("lateximages.txt", "r")
+print ("lwarpmk: Checking for a valid " .. sourcename .. "-images.txt file.")
+local limagesfile = io.open(sourcename .. "-images.txt", "r")
if ( limagesfile == nil ) then
warnlimages ()
os.exit(1)
end
-- Track warning to recompile if find a page 0
local pagezerowarning = false
--- Scan lateximages.txt
+-- Scan <sourcename>.txt
for line in limagesfile:lines() do
-- lwimgpage is the page number in the PDF which has the image
-- lwimghash is true if this filename is a hash
@@ -16674,20 +16849,20 @@ executecheckerror (
cmdgroupopenname ..
"pdfseparate -f " .. lwimgpage .. " -l " .. lwimgpage .. " " ..
sourcename .."_html.pdf " ..
- "lateximages" .. dirslash .."lateximagetemp-%d" .. ".pdf" ..
+ imagesdirectory .. dirslash .."lateximagetemp-%d" .. ".pdf" ..
seqname ..
-- Crop the image:
- "pdfcrop --hires lateximages" .. dirslash .. "lateximagetemp-" ..
+ "pdfcrop --hires " .. imagesdirectory .. dirslash .. "lateximagetemp-" ..
lwimgpage .. ".pdf " ..
- "lateximages" .. dirslash .. lwimgname .. ".pdf" ..
+ imagesdirectory .. dirslash .. lwimgname .. ".pdf" ..
seqname ..
-- Convert the image to svg:
- "pdftocairo -svg -noshrink lateximages" .. dirslash .. lwimgname .. ".pdf " ..
- "lateximages" .. dirslash .. lwimgname ..".svg" ..
+ "pdftocairo -svg -noshrink " .. imagesdirectory .. dirslash .. lwimgname .. ".pdf " ..
+ imagesdirectory .. dirslash .. lwimgname ..".svg" ..
seqname ..
-- Remove the temporary files:
- rmname .. " lateximages" .. dirslash .. lwimgname .. ".pdf" .. seqname ..
- rmname .. " lateximages" .. dirslash .. "lateximagetemp-" .. lwimgpage .. ".pdf" ..
+ rmname .. " " .. imagesdirectory .. dirslash .. lwimgname .. ".pdf" .. seqname ..
+ rmname .. " " .. imagesdirectory .. dirslash .. "lateximagetemp-" .. lwimgpage .. ".pdf" ..
cmdgroupclosename .. " >/dev/null " .. bgname
,
"File error trying to convert " .. lwimgfullname
@@ -16732,7 +16907,7 @@ end -- createwindowsimage
function createonelateximage ( line )
--
--- Given the next line of lateximages.txt, convert a single image.
+-- Given the next line of <sourcename>.txt, convert a single image.
--
-- lwimgpage is the page number in the PDF which has the image
-- lwimghash is true if this filename is a hash
@@ -16745,7 +16920,7 @@ if ( (i~=nil) ) then
pagezerowarning = true
else
-- Skip is this image is hashed and already exists:
- local lwimgfullname = "lateximages" .. dirslash .. lwimgname .. ".svg"
+ local lwimgfullname = imagesdirectory .. dirslash .. lwimgname .. ".svg"
if (
(lwimghash ~= "true") or
(lfs.attributes(lwimgfullname,"mode")==nil) -- file not exists
@@ -16772,7 +16947,7 @@ end -- createonelateximage
function createlateximages ()
--
--- Create lateximages based on lateximages.txt:
+-- Create lateximages based on <sourcename>.txt:
--
-- See if the document must be recompiled first:
checklimages ()
@@ -16780,13 +16955,13 @@ checklimages ()
checkhtmlpdfexists ()
-- Attempt to create the lateximages:
print ("lwarpmk: Creating lateximages.")
-local limagesfile = io.open("lateximages.txt", "r")
+local limagesfile = io.open(sourcename .. "-images.txt", "r")
if ( limagesfile == nil ) then
- warnlateximages ()
+ warnlimages ()
os.exit(1)
end
-- Create the lateximages directory, ignore error if already exists
-err = os.execute("mkdir lateximages")
+err = os.execute("mkdir " .. imagesdirectory)
-- For Windows, create lwarp_one_limage.cmd from lwarp_one_limage.txt:
if opsystem=="Windows" then
executecheckerror (
@@ -16798,7 +16973,7 @@ end -- create lwarp_one_limage.cmd
numimageprocesses = 0
-- Track warning to recompile if find a page 0
pagezerowarning = false
--- Scan lateximages.txt
+-- Scan <sourcename>.txt
for line in limagesfile:lines() do
createonelateximage ( line )
end -- do
@@ -17012,7 +17187,7 @@ updateanddone ()
-- lwarpmk limages:
--- Scan the lateximages.txt file to create lateximages.
+-- Scan the <sourcename>.txt file to create lateximages.
elseif arg[1] == "limages" then
loadconf ()
@@ -17054,11 +17229,11 @@ print ("lwarpmk: Done.")
-- lwarpmk cleanlimages
--- Remove images from the lateximages directory.
+-- Remove images from the imagesdirectory.
elseif arg[1] == "cleanlimages" then
loadconf ()
-os.execute ( rmname .. " lateximages/*" )
+os.execute ( rmname .. " " .. imagesdirectory .. dirslash .. "*" )
print ("lwarpmk: Done.")
-- lwarpmk epstopdf <list of file names>
@@ -17186,8 +17361,9 @@ end -- not --version
%
% Note that nested \LaTeX\ structures may push depths which are non-sequential.
% \watchout
-
+%
% \begin{docsidebar}[Ex:]
+% \vspace*{-2\baselineskip}
% \begin{Verbatim}[gobble=2,obeytabs,tabsize=4]
% \begin{itemize}
% \item{A}
@@ -17196,6 +17372,7 @@ end -- not --version
% \end{description}
% \end{itemize}
% \end{Verbatim}
+% \vspace{-\baselineskip}
% \end{docsidebar}
% \begin{macrocode}
@@ -17314,12 +17491,16 @@ end -- not --version
% \end{macrocode}
%
% \begin{macro}{\LWR@setexparray} \marg{name} \marg{index} \marg{contents}
+% \changes{v0.66}{2018/12/31}{Fix with \cs{par}.}
% \begin{macrocode}
\NewDocumentCommand{\LWR@setexparray}{m m m}{%
+ \begingroup%
+ \let\par\relax%
\xdef\LWR@thisexparrayname{#1#2}%
\ifstrempty{#3}%
{\csgdef{\LWR@thisexparrayname}{}}%
{\csxdef{\LWR@thisexparrayname}{#3}}%
+ \endgroup%
}
% \end{macrocode}
% \end{macro}
@@ -17488,43 +17669,6 @@ end -- not --version
-% \section{Sanitizing labels and filenames}
-%
-% Special handling for underscores in labels and filenames.
-
-% \codehtml
-% \begin{macrocode}
-\begin{warpHTML}
-% \end{macrocode}
-
-% \begin{macro}{\LWR@sanitized} The sanitized version of what was given
-% to \cs{LWR@sanitize}.
-% Characters are set to their detokenized versions.
-% Required for underscores in labels and filenames.
-% \begin{macrocode}
-\newcommand*{\LWR@sanitized}{}
-% \end{macrocode}
-% \end{macro}
-
-% \begin{macro}{\LWR@sanitize} \marg{text}
-%
-% Sanitizes the text and returns the result in \cs{LWR@sanitized}.
-% \begin{macrocode}
-\newcommand*{\LWR@sanitize}[1]{%
-\LWR@traceinfo{LWR@sanitize: !#1!}%
-\edef\LWR@sanitized{#1}%
-\LWR@traceinfo{LWR@sanitize expanded: !\LWR@sanitized!}%
-\edef\LWR@sanitized{\detokenize\expandafter{\LWR@sanitized}}%
-\LWR@traceinfo{LWR@sanitize result: !\LWR@sanitized!}%
-}
-% \end{macrocode}
-% \end{macro}
-
-% \begin{macrocode}
-\end{warpHTML}
-% \end{macrocode}
-
-
% \section{\HTML\ entities}
@@ -17561,16 +17705,20 @@ end -- not --version
% \end{macrocode}
% \begin{macro}{\textless}
-% \begin{macro}{\textgreater}
+% \changes{v0.66}{2019/02/07}{Made robust.}
% \begin{macrocode}
\let\LWR@origtextless\textless
-\renewcommand*{\textless}{\HTMLentity{lt}}
+\renewrobustcmd*{\textless}{\HTMLentity{lt}}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\textgreater}
+% \changes{v0.66}{2019/02/07}{Made robust.}
+% \begin{macrocode}
\let\LWR@origtextgreater\textgreater
-\renewcommand*{\textgreater}{\HTMLentity{gt}}
+\renewrobustcmd*{\textgreater}{\HTMLentity{gt}}
% \end{macrocode}
% \end{macro}
-% \end{macro}
% \begin{macrocode}
\end{warpHTML}
@@ -17678,6 +17826,7 @@ end -- not --version
% \changes{v0.20}{2016/09/11}{HTMLFilename: removed additional trailing '-', and may be empty.}
% \changes{v0.20}{2016/09/11}{Sections called ``Index'' or ``index'' have an underscore
% prepended to their filenames if no prefix.}
+% \changes{v0.66}{2019/01/30}{Sanitize underscores.}
%
% Prints the filename for a given section: |\HTMLFilename{}filenumber/name.html|
% \begin{macrocode}
@@ -17688,16 +17837,16 @@ end -- not --version
% The filename must be detokenized for underscores.
% \begin{macrocode}
% \LWR@traceinfo{about to assign temp}%
-\edef\LWR@tempone{#1}%
+\LWR@sanitize{#1}%
\LWR@traceinfo{about to compare with ??}%
-\ifthenelse{\equal{\LWR@tempone}{??}}%
+\ifthenelse{\equal{\LWR@sanitized}{??}}%
{\LWR@traceinfo{found ??}}%
{\LWR@traceinfo{not found ??}}%
\LWR@traceinfo{about to compare with zero or empty}%
\ifthenelse{%
- \equal{\LWR@tempone}{0}%
- \OR \equal{\LWR@tempone}{}%
- \OR \equal{\LWR@tempone}{??}%
+ \equal{\LWR@sanitized}{0}%
+ \OR \equal{\LWR@sanitized}{}%
+ \OR \equal{\LWR@sanitized}{??}%
}%
{%
\LWR@traceinfo{LWR@htmlsectionfilename B \HomeHTMLFilename.html}%
@@ -17708,20 +17857,22 @@ end -- not --version
% with a leading underscore to avoid colliding with the \HTML\ filename |index.html|:
% \begin{macrocode}
{%
- \LWR@traceinfo{LWR@htmlsectionfilename C \LWR@tempone}%
+ \LWR@traceinfo{LWR@htmlsectionfilename C \LWR@sanitized}%
\ifthenelse{%
\equal{\HTMLFilename}{} \AND
- \equal{\LWR@tempone}{Index} \OR
- \equal{\LWR@tempone}{index}%
+ \equal{\LWR@sanitized}{Index} \OR
+ \equal{\LWR@sanitized}{index}%
}%
{%
\LWR@traceinfo{Prefixing the index name with an underscore.}%
- \_#1.html%
+ \_\LWR@sanitized.html%
}%
% \end{macrocode}
% Otherwise, create a filename with the chosen prefix:
% \begin{macrocode}
- {\HTMLFilename\LWR@isolate{#1}.html}%
+ {%
+ \HTMLFilename\LWR@isolate{\LWR@sanitized}.html%
+ }%
}%
\LWR@traceinfo{LWR@htmlsectionfilename Z}%
}
@@ -17806,17 +17957,26 @@ end -- not --version
% For print output, if \pkg{hyperref} is available a hyperlink to the first page
% is used, named by \cs{linkhomename}.
% If \pkg{hyperref} is not available, a pageref is used instead.
+%
+% \cs{BaseJobname} is included in the link label in case multiple
+% documents are cross-referenced.
+%
% \changes{v0.63}{2018/11/29}{Fix: Print version.}
+% \changes{v0.66}{2019/01/23}{Fix: Document cross-references.}
% \begin{macrocode}
\AtBeginDocument{
\@ifundefined{hyperref}{
- \newcommand*{\LinkHome}{\linkhomename\ --- page \pageref{page-LWRfirstpage}}
+ \newcommand*{\LinkHome}{%
+ \linkhomename\ --- page \pageref{\BaseJobname-page-LWRfirstpage}%
+ }
}{
- \newcommand*{\LinkHome}{\hyperref[page-LWRfirstpage]{\linkhomename}}
+ \newcommand*{\LinkHome}{%
+ \hyperref[\BaseJobname-page-LWRfirstpage]{\linkhomename}%
+ }
}
}
-\AfterEndPreamble{\label{page-LWRfirstpage}}
+\AfterEndPreamble{\label{\BaseJobname-page-LWRfirstpage}}
% \end{macrocode}
% \end{macro}
@@ -18164,6 +18324,20 @@ end -- not --version
% \end{macrocode}
+% \subsection{\HTML\ output formatting}
+%
+% Helps format the output \HTML\ code for human readability.
+%
+% \begin{macro}{\LWR@indentHTML} Newline and indent the output \HTML\ code.
+% \changes{v0.66}{2019/02/01}{Added.}
+% \begin{macrocode}
+\newcommand*{\LWR@indentHTML}{%
+ \LWR@orignewline\LWR@origrule{2em}{0pt}%
+}
+% \end{macrocode}
+% \end{macro}
+
+
% \subsection{\HTML\ tags}
% \begin{macro}{\LWR@htmltagc} \marg{tag}
@@ -18180,7 +18354,6 @@ end -- not --version
\LWR@isolate{#1}%
\protect\LWR@origtextgreater%
\endgroup%
-% \LWR@traceinfo{LWR@htmltagc: done}%
}
% \end{macrocode}
% \end{macro}
@@ -18377,19 +18550,23 @@ end -- not --version
% \changes{v0.20}{2017/01/17}{Factored code.}
% \changes{v0.34}{2017/08/02}{Moved optional argument in front of mandatory.}
% \changes{v0.63}{2018/11/24}{Fix for \pkg{xeCJK}.}
+% \changes{v0.66}{2019/02/02}{Improved \HTML\ formatting.}
%
% \begin{macrocode}
\NewDocumentCommand{\LWR@subhtmlelementclass}{m O{} m}{%
\LWR@traceinfo{LWR@subhtmlelementclass !#1!#2!#3!}%
\ifblank{#2}%
{% empty option
- \LWR@htmltag{#1 class=\textquotedbl#3\textquotedbl}%
-}%
-{% non-empty option
\LWR@htmltag{%
#1 % space
class=\textquotedbl#3\textquotedbl\ % space
- style=\textquotedbl#2\textquotedbl%
+ }%
+}%
+{% non-empty option
+ \LWR@htmltag{%
+ #1\LWR@indentHTML%
+ class=\textquotedbl#3\textquotedbl\LWR@indentHTML%
+ style=\textquotedbl#2\textquotedbl\LWR@orignewline%
}%
}%
\LWR@traceinfo{LWR@subhtmlelementclass done}%
@@ -18819,8 +18996,9 @@ end -- not --version
\PN@parnotes@auto%
% \end{macrocode}
% The opening paragraph tag:
+% \changes{v0.66}{2019/02/02}{Improved \HTML\ formatting.}
% \begin{macrocode}
- \LWR@htmltagc{\LWR@tagregularparagraph}%
+ \LWR@htmltagc{\LWR@tagregularparagraph}\LWR@orignewline%
% \end{macrocode}
% Now have started a paragraph.
% \begin{macrocode}
@@ -18840,6 +19018,26 @@ end -- not --version
% \end{macro}
+% \begin{macro}{\LWR@closeparagraph@br}
+%
+% Add an \HTML\ break if in a span, and not in a \env{lateximage},
+% and not in tabular metadata. Factored from \cs{LWR@closeparagraph}.
+%
+% \changes{v0.66}{2019/01/01}{Factored.}
+% \begin{macrocode}
+\newcommand*{\LWR@closeparagraph@br}
+{%
+ \ifboolexpr{
+ test {\ifnumcomp{\value{LWR@spandepth}}{>}{0}} and
+ test {\ifnumcomp{\value{LWR@lateximagedepth}}{=}{0}} and
+ not bool {LWR@intabularmetadata}
+ }%
+ {\unskip\LWR@htmltagc{br /}}%
+ {}%
+}
+% \end{macrocode}
+% \end{macro}
+
% \begin{macro}{\LWR@closeparagraph}
% \changes{v0.20}{2017/01/17}{No break tags in the start/end of a tabular.}
@@ -18865,16 +19063,11 @@ end -- not --version
test {\ifnumcomp{\value{LWR@spandepth}}{>}{0}}
}%
% \end{macrocode}
-% Do nothing if already started a \env{lateximage} or a \element{span},
-% but add a parbreak if in a span but not a \env{lateximage}.
+% Add a parbreak if in a span, not in a lateximage,
+% and not in table metadata.
% \begin{macrocode}
{% no nested par tags
- \ifboolexpr{
- test {\ifnumcomp{\value{LWR@spandepth}}{>}{0}} and
- test {\ifnumcomp{\value{LWR@lateximagedepth}}{=}{0}}
- }%
- {\ifbool{LWR@intabularmetadata}{}{\unskip\LWR@htmltagc{br /}}}%
- {}%
+ \LWR@closeparagraph@br%
}% no nested par tags
% \end{macrocode}
% If have not already started a \env{lateximage} or a \element{span}:
@@ -18882,8 +19075,9 @@ end -- not --version
{% yes nest par tags
% \end{macrocode}
% Print a closing tag and some extra vertical space.
+% \changes{v0.66}{2019/02/02}{Improved \HTML\ formatting.}
% \begin{macrocode}
- \unskip%
+ \leavevmode\LWR@orignewline%
\LWR@htmltagc{/\LWR@tagregularparagraph}%
\LWR@orignewline%
% \end{macrocode}
@@ -18904,13 +19098,12 @@ end -- not --version
}% end of yes nest par tags
}% end of handling pars
% \end{macrocode}
-% Add a parbreak if in a span,
-% but not in a table outside a row:
+% Add a parbreak if in a span, not in a lateximage,
+% and not in table metadata.
+% \changes{v0.66}{2019/01/01}{Fix: Combined span, \env{tabular}, and \env{lateximage}.}
% \begin{macrocode}
{% not handling pars
- \ifnumcomp{\value{LWR@spandepth}}{>}{0}%
- {\ifbool{LWR@intabularmetadata}{}{\unskip\LWR@htmltagc{br /}}}%
- {}%
+ \LWR@closeparagraph@br%
}% not handling pars
% \end{macrocode}
% In most cases, finish with a \LaTeX\ \cs{par}, but in the case
@@ -19033,8 +19226,9 @@ end -- not --version
{%
% \end{macrocode}
% Print a closing tag:
+% \changes{v0.66}{2019/02/02}{Improved \HTML\ formatting.}
% \begin{macrocode}
- \unskip%
+ \leavevmode\LWR@orignewline%
\LWR@htmltagc{/\LWR@tagregularparagraph}%
\LWR@orignewline%
% \end{macrocode}
@@ -19083,6 +19277,34 @@ end -- not --version
+% \section{Indentfirst}
+%
+% \DescribePackage{indentfirst}
+% \pkg{indentfirst} redefines \cs{@afterindentfalse} to be \cs{@afterindenttrue}.
+% This is reversed \cs{AtBeginDocument} here.
+%
+% \changes{v0.66}{2019/02/04}{Added support for \pkg{indentfirst}.}
+%
+% \codehtml
+% \begin{macrocode}
+\begin{warpHTML}
+% \end{macrocode}
+
+% \begin{macrocode}
+\AtBeginDocument{
+\def\@afterindentfalse{\let\if@afterindent\iffalse}
+\@afterindentfalse
+}
+\let\LWR@afterindent@syntaxhighlight\fi% syntax highlighting
+% \end{macrocode}
+
+
+
+% \begin{macrocode}
+\end{warpHTML}
+% \end{macrocode}
+
+
% \section{Page headers and footers}
% \codeall
@@ -19430,13 +19652,14 @@ end -- not --version
\renewrobustcmd{\textsuperscript}[1]{\LWR@htmlspan{sup}{##1}}%
% \end{macrocode}
% Use paragraph tags if in a tabular data cell or a \env{lateximage}:
+% \changes{v0.66}{2019/02/02}{Improved \HTML\ formatting.}
% \begin{macrocode}
\ifthenelse{%
\boolean{LWR@doingstartpars} \AND%
\cnttest{\value{LWR@lateximagedepth}}{=}{0}%
}%
{}%
- {\LWR@htmltagc{\LWR@tagregularparagraph}}%
+ {\LWR@htmltagc{\LWR@tagregularparagraph}\LWR@orignewline}%
% \end{macrocode}
% Append the footnote to the list:
% \begin{macrocode}
@@ -19500,13 +19723,14 @@ end -- not --version
\color@begingroup%
% \end{macrocode}
% Use paragraph tags if in a tabular data cell or a \env{lateximage}:
+% \changes{v0.66}{2019/02/02}{Improved \HTML\ formatting.}
% \begin{macrocode}
\ifthenelse{%
\boolean{LWR@doingstartpars} \AND%
\cnttest{\value{LWR@lateximagedepth}}{=}{0}%
}%
{}%
- {\LWR@htmltagc{\LWR@tagregularparagraph}}%
+ {\LWR@htmltagc{\LWR@tagregularparagraph}\LWR@orignewline}%
% \end{macrocode}
% \begin{macrocode}
\@makefntext{%
@@ -19743,6 +19967,15 @@ end -- not --version
\booltrue{CombineHigherDepths}
% \end{macrocode}
+
+% \begin{macro}{\FilenameLimit}
+% Maximum length of the generated filenames.
+% \begin{macrocode}
+\newcommand*{\FilenameLimit}{80}
+% \end{macrocode}
+% \end{macro}
+
+
% \begin{macrocode}
\end{warpall}
% \end{macrocode}
@@ -19755,8 +19988,13 @@ end -- not --version
% \begin{macro}{\LWR@thisfilename}
% The currently-active filename or number.
+% At first, this is the homepage.
% \begin{macrocode}
-\newcommand*{\LWR@thisfilename}{}
+\AtBeginDocument{
+\ifbool{FileSectionNames}%
+ {\newcommand*{\LWR@thisfilename}{\HomeHTMLFilename}}
+ {\newcommand*{\LWR@thisfilename}{0}}
+}
% \end{macrocode}
% \end{macro}
@@ -19769,6 +20007,27 @@ end -- not --version
% \end{macro}
+% \begin{macro}{\LWR@simplifyname} * \marg{expression} \qquad Simplify \cs{LWR@thisnewfilename}.
+%
+% If starred, detokenizes the input expression.
+% If found, changes the expression to a single detokenized dash.
+%
+% \begin{macrocode}
+\NewDocumentCommand{\LWR@simplifyname}{s m}{%
+\IfBooleanTF{#1}{%
+ \StrSubstitute{\LWR@thisnewfilename}%
+ {\detokenize{#2}}%
+ {\detokenize{-}}[\LWR@thisnewfilename]%
+}{%
+ \StrSubstitute{\LWR@thisnewfilename}%
+ {#2}%
+ {\detokenize{-}}[\LWR@thisnewfilename]%
+}
+}
+% \end{macrocode}
+% \end{macro}
+
+
% \begin{macro}{\LWR@filenamenoblanks} \marg{filename}
%
% Convert blanks into dashes, removes short words,
@@ -19781,6 +20040,9 @@ end -- not --version
% Use the optional \TOC\ caption entry parameter for formatting.
% Remember to \cs{protect} \LaTeX\ commands which appear in
% section names and \TOC\ captions.
+%
+% \changes{v0.66}{2019/02/07}{Improved file name generation.}
+%
% \begin{macrocode}
\newcommand*{\LWR@filenamenoblanks}[1]{%
\begingroup
@@ -19793,102 +20055,127 @@ end -- not --version
\renewcommand*{\LWR@htmltagc}[1]{}%
% \end{macrocode}
%
-% Replaces common symbols and short words with hyphens:
% \begin{macrocode}
\edef\LWR@thisnewfilename{#1}%
+% \end{macrocode}
+% Replaces common macros with hyphens.
+% (\cs{\&} is done by \cs{LWR@nullfonts}.)
+% \begin{macrocode}
+\RenewDocumentCommand{\LWR@subsingledollar}{s m m m}{}%
+\LWR@simplifyname{\_}
+\LWR@simplifyname{\#}
+\LWR@simplifyname{\textbackslash}
+\LWR@simplifyname{\protect}
+\LWR@simplifyname{\ }
+\LWR@simplifyname{<}
+\LWR@simplifyname{>}
+\LWR@simplifyname{\textless}
+\LWR@simplifyname{\textgreater}
+% \end{macrocode}
+% \changes{v0.66}{2019/02/06}{Fix: Section names detokenized.}
+% \begin{macrocode}
+\edef\LWR@thisnewfilename{\detokenize\expandafter{\LWR@thisnewfilename}}%
+% \end{macrocode}
+% \begin{macrocode}
\LWR@traceinfo{LWR@filenamenoblanks edef: !\LWR@thisnewfilename!}%
\fullexpandarg%
% \end{macrocode}
-%
% Convert spaces into hyphens:
-%
-% \changes{v0.45}{2017/12/29}{Fix: Section names with \cs{\ }.}
% \begin{macrocode}
-\StrSubstitute{\LWR@thisnewfilename}{\ }{-}[\LWR@thisnewfilename]
-\StrSubstitute{\LWR@thisnewfilename}{ }{-}[\LWR@thisnewfilename]
+\LWR@simplifyname*{ }
% \end{macrocode}
% Convert punctutation into hyphens:
-% ^^A \StrSubstitute{\LWR@thisnewfilename}{é}{e}[\LWR@thisnewfilename]
-% \begin{macrocode}
-\StrSubstitute{\LWR@thisnewfilename}{,}{-}[\LWR@thisnewfilename]
-\StrSubstitute{\LWR@thisnewfilename}{'}{-}[\LWR@thisnewfilename]
-\StrSubstitute{\LWR@thisnewfilename}%
- {\LWR@origampersand}{-}[\LWR@thisnewfilename]
-\StrSubstitute{\LWR@thisnewfilename}{+}{-}[\LWR@thisnewfilename]
-\StrSubstitute{\LWR@thisnewfilename}{,}{-}[\LWR@thisnewfilename]
-\StrSubstitute{\LWR@thisnewfilename}{/}{-}[\LWR@thisnewfilename]
-\StrSubstitute{\LWR@thisnewfilename}{:}{-}[\LWR@thisnewfilename]
-\StrSubstitute{\LWR@thisnewfilename}{;}{-}[\LWR@thisnewfilename]
-\StrSubstitute{\LWR@thisnewfilename}{=}{-}[\LWR@thisnewfilename]
-\StrSubstitute{\LWR@thisnewfilename}{?}{-}[\LWR@thisnewfilename]
-\StrSubstitute{\LWR@thisnewfilename}{@}{-}[\LWR@thisnewfilename]
-\StrSubstitute{\LWR@thisnewfilename}{"}{-}[\LWR@thisnewfilename]
-\StrSubstitute{\LWR@thisnewfilename}%
- {\textless}{-}[\LWR@thisnewfilename]
-\StrSubstitute{\LWR@thisnewfilename}%
- {\textgreater}{-}[\LWR@thisnewfilename]
-\StrSubstitute{\LWR@thisnewfilename}{\LWR@origpound}{-}[\LWR@thisnewfilename]
-% \end{macrocode}
-% \changes{v0.45}{2017/12/29}{Fix: Section names with underscores.}
-% \begin{macrocode}
-\StrSubstitute{\LWR@thisnewfilename}{\_}{-}[\LWR@thisnewfilename]
-\StrSubstitute{\LWR@thisnewfilename}{\%}{-}[\LWR@thisnewfilename]
-\StrSubstitute{\LWR@thisnewfilename}{\{}{-}[\LWR@thisnewfilename]
-\StrSubstitute{\LWR@thisnewfilename}{\}}{-}[\LWR@thisnewfilename]
-\StrSubstitute{\LWR@thisnewfilename}{|}{-}[\LWR@thisnewfilename]
-\StrSubstitute{\LWR@thisnewfilename}%
- {\textbackslash}{-}[\LWR@thisnewfilename]
-\StrSubstitute{\LWR@thisnewfilename}{^}{-}[\LWR@thisnewfilename]
-\StrSubstitute{\LWR@thisnewfilename}{~}{-}[\LWR@thisnewfilename]
-\StrSubstitute{\LWR@thisnewfilename}{~{}}{-}[\LWR@thisnewfilename]
-% "~{}" for babel
-\StrSubstitute{\LWR@thisnewfilename}{[}{-}[\LWR@thisnewfilename]
-\StrSubstitute{\LWR@thisnewfilename}{]}{-}[\LWR@thisnewfilename]
-\StrSubstitute{\LWR@thisnewfilename}{`}{-}[\LWR@thisnewfilename]
+% \begin{macrocode}
+\LWR@simplifyname*{!}
+\LWR@simplifyname*{,}
+\LWR@simplifyname*{'}
+\LWR@simplifyname*{+}
+\LWR@simplifyname*{,}
+\LWR@simplifyname*{/}
+\LWR@simplifyname*{:}
+\LWR@simplifyname*{;}
+\LWR@simplifyname*{=}
+\LWR@simplifyname*{?}
+\LWR@simplifyname*{@}
+\LWR@simplifyname*{^}
+\LWR@simplifyname*{&}
+\LWR@simplifyname*{"}
+\LWR@simplifyname*{<}
+\LWR@simplifyname*{>}
+% \end{macrocode}
+% \changes{v0.66}{2019/02/06}{Fix: Section names with macros.}
+% \begin{macrocode}
+\LWR@simplifyname{\LWRbackslash}
+\LWR@simplifyname{\LWRleftbrace}
+\LWR@simplifyname{\LWRrightbrace}
+% \end{macrocode}
+% \changes{v0.66}{2019/02/06}{Fix: Section names with percent.}
+% \begin{macrocode}
+\LWR@simplifyname{\LWRpercent}
+\LWR@simplifyname{\LWRdollar}
+% \end{macrocode}
+% \begin{macrocode}
+\LWR@simplifyname*{|}
+\LWR@simplifyname*{^}
+\LWR@simplifyname*{~}
+\LWR@simplifyname*{[}
+\LWR@simplifyname*{]}
+\LWR@simplifyname*{`}
% \end{macrocode}
% Convert short words:
% \begin{macrocode}
-\StrSubstitute{\LWR@thisnewfilename}{-s-}{-}[\LWR@thisnewfilename]
-\StrSubstitute{\LWR@thisnewfilename}{-S-}{-}[\LWR@thisnewfilename]
-\StrSubstitute{\LWR@thisnewfilename}{-a-}{-}[\LWR@thisnewfilename]
-\StrSubstitute{\LWR@thisnewfilename}{-A-}{-}[\LWR@thisnewfilename]
-\StrSubstitute{\LWR@thisnewfilename}{-an-}{-}[\LWR@thisnewfilename]
-\StrSubstitute{\LWR@thisnewfilename}{-AN-}{-}[\LWR@thisnewfilename]
-\StrSubstitute{\LWR@thisnewfilename}{-to-}{-}[\LWR@thisnewfilename]
-\StrSubstitute{\LWR@thisnewfilename}{-TO-}{-}[\LWR@thisnewfilename]
-\StrSubstitute{\LWR@thisnewfilename}{-by-}{-}[\LWR@thisnewfilename]
-\StrSubstitute{\LWR@thisnewfilename}{-BY-}{-}[\LWR@thisnewfilename]
-\StrSubstitute{\LWR@thisnewfilename}{-of-}{-}[\LWR@thisnewfilename]
-\StrSubstitute{\LWR@thisnewfilename}{-OF-}{-}[\LWR@thisnewfilename]
-\StrSubstitute{\LWR@thisnewfilename}{-and-}{-}[\LWR@thisnewfilename]
-\StrSubstitute{\LWR@thisnewfilename}{-AND-}{-}[\LWR@thisnewfilename]
-\StrSubstitute{\LWR@thisnewfilename}{-for-}{-}[\LWR@thisnewfilename]
-\StrSubstitute{\LWR@thisnewfilename}{-FOR-}{-}[\LWR@thisnewfilename]
-\StrSubstitute{\LWR@thisnewfilename}{-the-}{-}[\LWR@thisnewfilename]
-\StrSubstitute{\LWR@thisnewfilename}{-THE-}{-}[\LWR@thisnewfilename]
+\LWR@simplifyname*{-s-}
+\LWR@simplifyname*{-S-}
+\LWR@simplifyname*{-a-}
+\LWR@simplifyname*{-A-}
+\LWR@simplifyname*{-an-}
+\LWR@simplifyname*{-AN-}
+\LWR@simplifyname*{-to-}
+\LWR@simplifyname*{-TO-}
+\LWR@simplifyname*{-by-}
+\LWR@simplifyname*{-BY-}
+\LWR@simplifyname*{-of-}
+\LWR@simplifyname*{-OF-}
+\LWR@simplifyname*{-and-}
+\LWR@simplifyname*{-AND-}
+\LWR@simplifyname*{-for-}
+\LWR@simplifyname*{-FOR-}
+\LWR@simplifyname*{-the-}
+\LWR@simplifyname*{-THE-}
% \end{macrocode}
% Convert multiple hyphens:
% \begin{macrocode}
-\StrSubstitute{\LWR@thisnewfilename}{-----}{-}[\LWR@thisnewfilename]
-\StrSubstitute{\LWR@thisnewfilename}{----}{-}[\LWR@thisnewfilename]
-\StrSubstitute{\LWR@thisnewfilename}{---}{-}[\LWR@thisnewfilename]
-\StrSubstitute{\LWR@thisnewfilename}{--}{-}[\LWR@thisnewfilename]
+\LWR@simplifyname*{-----}
+\LWR@simplifyname*{----}
+\LWR@simplifyname*{---}
+\LWR@simplifyname*{--}
% \end{macrocode}
% If pdf\LaTeX\ and not \optn{utf8} encoding, don't try to convert emdash, endash:
% \changes{v0.52}{2018/04/01}{Fix: \cs{FileDepth} with non-utf8 encoding.}
% \begin{macrocode}
\ifPDFTeX% pdflatex or dvi latex
\ifdefstring{\inputencodingname}{utf8}{%
-\StrSubstitute{\LWR@thisnewfilename}{—}{-}[\LWR@thisnewfilename]
+\LWR@simplifyname*{—}
% emdash
-\StrSubstitute{\LWR@thisnewfilename}{–}{-}[\LWR@thisnewfilename]
+\LWR@simplifyname*{–}
% endash
}{}%
\else% not PDFTeX
-\StrSubstitute{\LWR@thisnewfilename}{—}{-}[\LWR@thisnewfilename]
-\StrSubstitute{\LWR@thisnewfilename}{–}{-}[\LWR@thisnewfilename]
+\LWR@simplifyname*{—}
+\LWR@simplifyname*{–}
\fi%
% \end{macrocode}
+% If ends with a dash, remove the trailing dash:
+% \begin{macrocode}
+\IfEndWith{\LWR@thisnewfilename}{\detokenize{-}}{%
+ \StrGobbleRight{\LWR@thisnewfilename}{1}[\LWR@thisnewfilename]%
+}{}%
+% \end{macrocode}
+% Limits the length of the filename:
+% \changes{v0.66}{2019/02/07}{Limits filename length.}
+% \begin{macrocode}
+\StrLeft{\LWR@thisnewfilename}{\FilenameLimit}[\LWR@thisnewfilename]%
+% \end{macrocode}
% Return the global result:
% \begin{macrocode}
\global\let\LWR@thisfilename\LWR@thisnewfilename%
@@ -19907,6 +20194,13 @@ end -- not --version
% \end{macrocode}
+% \DescribeFile{*_html.aux}
+% A new entry in the \filenm{*_html.aux} file is used to help
+% cross-references:
+% \begin{sourceverb}
+% \newlabel{autopage-<nnn>}{{<x>}{<y>}}
+% \end{sourceverb}
+%
% \begin{macro}{\LWR@newautopagelabel} \marg{pagenumber counter}
% \changes{v0.48}{2018/02/11}{Fix: \TOC, \LOF, \LOT\ links.}
% \begin{macrocode}
@@ -20076,9 +20370,9 @@ end -- not --version
\newcommand*{\LWR@newhtmlfile}[1]{
\LWR@traceinfo{LWR@newhtmlfile}
% \end{macrocode}
-
+%
% At the bottom of the ending file:
-
+%
% \changes{v0.65}{2018/12/18}{Improved \CSS\ for page layout.}
% \begin{macrocode}
\LWR@htmlelementclassend{section}{textbody}
@@ -20141,7 +20435,7 @@ end -- not --version
% \begin{macrocode}
\LWR@filenamenoblanks{#1}%
% \end{macrocode}
-% Create a macro name from the MD5 hash of the file name.
+% Create a macro name from the MD5 hash of the file name, to detect duplicates:
% \begin{macrocode}
\edef\LWR@hashedname{\LWR@mdfive{\LWR@thisfilename}}%
% \end{macrocode}
@@ -20161,13 +20455,12 @@ end -- not --version
{
Section name ``#1'', at the line number listed below,
generates the filename ``\LWR@thisfilename'',
- which appears to be a duplicate%
+ which appears to be a duplicate.
+ There is a previous section with an identical or similar name.%
}
{
- Look for another section of the same type with a similar
- or identical name.
- (Lwarp sanitizes most symbols and common short words
- when generating file names, and this may cause a conflict.)
+ Lwarp sanitizes most symbols and a few common short words
+ when generating file names, and this may cause a conflict.
}
}
}
@@ -20375,7 +20668,7 @@ end -- not --version
% \begin{macro}{\ForceHTMLTOC}
% For \HTML\ output, forces the next section to have a \TOC\ entry, even if starred.
% For use with \cs{printindex} and others which generate a starred section
-% which should be in the \acro{TOC} so that it may be accessed via \HTML.
+% which should be in the \TOC\ so that it may be accessed via \HTML.
% Not necessary if used with \pkg{tocbibind}. Also see \cs{ForceHTMLPage}.
%
% For print output, no effect.
@@ -20598,9 +20891,11 @@ end -- not --version
% was created. If a math expression is included in the section name,
% and SVG math is used, the corresponding \env{lateximage} will cause the
% page number to change by the time the following autosec label is created.
-% \changes{v0.43}{2017/11/01}{\progcode{LWR@currentautosec}: Added.}
+% \changes{v0.43}{2017/11/01}{\ctr{LWR@currentautosec}: Added.}
+% \changes{v0.66}{2019/01/28}{\ctr{LWR@currentautosec}: Fix for \LOF, \LOT float in home page.}
% \begin{macrocode}
\newcounter{LWR@currentautosec}
+\setcounter{LWR@currentautosec}{1}
% \end{macrocode}
%
%
@@ -20706,7 +21001,6 @@ end -- not --version
% \changes{v0.52}{2018/03/28}{Fix: Footnote numbering: Use short \TOC\ entry
% for HTMLDebug comments.}
% \begin{macrocode}
-
\ifbool{HTMLDebugComments}{%
\begingroup%
\LWR@nullfonts%
@@ -20716,10 +21010,9 @@ end -- not --version
\IfNoValueTF{#2}% short TOC
{\LWR@htmlcomment{Opening #4 ``#3''}}%
{\LWR@htmlcomment{Opening #4 ``#2''}}%
- }
+ }\LWR@orignewline%
\endgroup%
-}{}%
-
+}{}
% \end{macrocode}
% For inline sections paragraph and subparagraph, start a new paragraph now:
% \begin{macrocode}
@@ -20851,16 +21144,21 @@ end -- not --version
\LWR@isolate{#3}%
% \end{macrocode}
% Close the heading tag, such as /H2:
+% \changes{v0.66}{2019/02/02}{Improved \HTML\ formatting.}
% \begin{macrocode}
\LWR@traceinfo{LWR@section: about to close the heading tag}%
\LWR@htmltag{\@nameuse{LWR@tag#4end}}%
+\LWR@orignewline%
% \end{macrocode}
% Generate a \LaTeX{} label:
% \changes{v0.43}{2017/11/01}{Fix: Math in section name.}
% \changes{v0.48}{2018/02/11}{Fix: \TOC, \LOF, \LOT\ links.}
+% \changes{v0.66}{2019/01/28}{Fix: \TOC, \LOF, \LOT\ links.}
+% \changes{v0.66}{2019/02/02}{Improved \HTML\ formatting.}
% \begin{macrocode}
\LWR@traceinfo{LWR@section: about to create the LaTeX label}%
-\LWR@newautopagelabel{LWR@currentautosec}%
+\setcounter{LWR@latestautopage}{\value{page}}%
+\LWR@newautopagelabel{LWR@currentautosec}\LWR@orignewline%
% \end{macrocode}
% Start paragraph handing unless is an inline paragraph or subparagraph:
% \begin{macrocode}
@@ -21451,9 +21749,9 @@ end -- not --version
\setlength{\parskip}{2ex}
% \end{macrocode}
%
-% For the |lateximages| record file:
+% For the \env{lateximages} record file:
% \begin{macrocode}
-\immediate\openout\LWR@lateximagesfile=lateximages.txt
+\immediate\openout\LWR@lateximagesfile=\BaseJobname-images.txt
% \end{macrocode}
%
% Removes space around the caption in the \HTML:
@@ -21564,6 +21862,14 @@ end -- not --version
% ^^A \LWR@customizeKaTeX
% ^^A % \end{macrocode}
%
+%
+% First autopage label in case a figure occurs early.
+% \changes{v0.66}{2019/01/28}{Fix: \TOC, \LOF, \LOT\ links.}
+% \begin{macrocode}
+\setcounter{LWR@latestautopage}{\value{page}}%
+\LWR@newautopagelabel{LWR@currentautosec}%
+% \end{macrocode}
+%
% \begin{macrocode}
\LWR@traceinfo{LWR@lwarpStart: done}
}
@@ -24441,6 +24747,7 @@ end -- not --version
% \begin{Verbatim}[tabsize=4,gobble=2]
% \newcolumntype{P}[1]{>{\centering\arraybackslash}p{#1}}
% \end{Verbatim}
+% \vspace{-\baselineskip}
% \end{docsidebar}
% \begin{macrocode}
\IfStrEq{\LWR@strresult}{P}{\LWR@parsepcolumn{P}}{}%
@@ -26863,6 +27170,11 @@ rowspan="#2" %
\StartDefiningTabulars%
\protected\gdef&{\LWR@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@forceminipagefullwidth}
+% \end{macrocode}
% Nest one level deeper of tabular paragraph handling:
% \changes{v0.46}{2018/01/18}{Fix: Tabular empty lines.}
% \begin{macrocode}
@@ -26957,8 +27269,13 @@ rowspan="#2" %
% commands are custom-written for them.
% Emulating both avoids several layers of patches.
%
-% The \pkg{zref} package is used to remember section name, file, and
-% lateximage depth and number for each label.
+% \DescribeFile{*_html.aux}
+% A new entry in \filenm{*_html.aux} is used to remember section name, file, and
+% lateximage depth and number for each label:
+% \begin{sourceverb}
+% \newlabel{<labelname>@lwarp}{{<section name>}{<filename>}
+% {<limagedepth>}{<limagenumber>}}
+% \end{sourceverb}
%
% \Cref{tab:crossrefdata} shows the data structures related to cross-referencing.
%
@@ -26986,12 +27303,14 @@ rowspan="#2" %
% \item [Added by \pkg{lwarp}:] \hfill (\HTML\ only)
% \begin{description}
% \item [\cs{label}:] Adds \HTML\ tags (\cref{sec:labels}),
-% plus \cs{splabel} data (\cref{sec:zrefsetup}):
+% and another \filenm{.aux} entry (\cref{sec:lwarplabelsetup}).
+% \item [\cs{newlabel}:] Unchanged. When the |.aux| file is read, sets \cs{r@<label>@lwarp}.
+% \item [\cs{r@<label>@lwarp}:] Set to |{{section_name}{file_name}{depth}{number}}|:
% \begin{description}
-% \item [zLWR@name:] The section name for this label.
-% \item [zLWR@htmlfilenumer:] The filenumber or name for this label.
-% \item [zLWR@lateximagedepth:] The |lateximagedepth| for this label.
-% \item [zLWR@lateximagenumber:] The |lateximagenumber| for this label.
+% \item [\cs{LWR@nameref}:] The section name for this label.
+% \item [\cs{LWR@htmlfileref}:] The filenumber or name for this label.
+% \item [\cs{LWR@lateximagedepthref}:] The |lateximagedepth| for this label.
+% \item [\cs{LWR@lateximagenumberref}:] The |lateximagenumber| for this label.
% \end{description}
% \item [\cs{nameref}:] Emualted from \pkg{hyperref} for \pkg{lwarp}.
% See \cref{sec:references}.
@@ -27012,7 +27331,7 @@ rowspan="#2" %
% Also see \cref{sec:footnotesregular} for use with footnotes.
% \item [\cs{label}:] Writes to the |.aux| file:
% \qquad |\newlabel{<label>@cref}{{\cref@currentlabel}{\thepage}}|
-% \item [\cs{newlabel}:] (Unchanged.) When the |.aux| file is read, sets \cs{r@<label>@cref}.
+% \item [\cs{newlabel}:] Unchanged. When the |.aux| file is read, sets \cs{r@<label>@cref}.
% \item [\cs{r@<label>@cref}:] Set to: |{{\cref@currentlabel}{\thepage}}|
% \item [Utility functions:] See \cs{cref@getlabel}, \cs{cref@gettype},
% \cs{cref@getcounter}, \cs{cref@getprefix}.
@@ -27072,7 +27391,7 @@ rowspan="#2" %
\newcommand*{\LWR@setlatestname}[1]{%
% \end{macrocode}
% Remove \cs{label} and other commands from the name, the strip any final period.
-% See \pkg{zref-titleref} and \pkg{gettitlestring}.
+% See \pkg{gettitlestring}.
% \begin{macrocode}
\GetTitleStringExpand{#1}%
\edef\@currentlabelname{\detokenize\expandafter{\GetTitleStringResult}}%
@@ -27085,74 +27404,61 @@ rowspan="#2" %
% \end{macro}
-% \subsection{\pkg{zref} setup}
-% \label{sec:zrefsetup}
-
+% \subsection{New \pkg{lwarp} labels.}
+% \label{sec:lwarplabelsetup}
+%
+% \DescribeFile{*_html.aux}
+% A new entry in \filenm{*_html.aux} is used to remember section name, file, and
+% lateximage depth and number for each label:
+% \begin{sourceverb}
+% \newlabel{<labelname>@lwarp}{{<section name>}{<filename>}
+% {<limagedepth>}{<limagenumber>}}
+% \end{sourceverb}
+%
+%
% See: \\
% \href{http://tex.stackexchange.com/questions/57194/extract-section-number-from-equation-reference}
% {\ttfamily http://tex.stackexchange.com/questions/57194/ \\
% \fqquad\ extract-section-number-from-equation-reference}
%
-% Create a new property list called special:
-% \begin{macrocode}
-\zref@newlist{special}
-% \end{macrocode}
-%
-% Define a new property which has the name of the most recently declared section:
-% \begin{macrocode}
-\zref@newprop{zLWR@name}{\@currentlabelname}
-% \end{macrocode}
-%
-% Define a new property which has either a filename or a file number:
-% \begin{macrocode}
-\zref@newprop{zLWR@htmlfilenumber}{%
-\ifbool{FileSectionNames}{\LWR@thisfilename}{\arabic{LWR@htmlfilenumber}}%
-}%
-% \end{macrocode}
-%
-% Additional properties for lateximages:
-% \begin{macrocode}
-\zref@newprop{zLWR@lateximagedepth}{\arabic{LWR@lateximagedepth}}
-\zref@newprop{zLWR@lateximagenumber}{\arabic{LWR@lateximagenumber}}
-% \end{macrocode}
%
-% |zLWR@htmlfilenumber| property holds the file number or name
+% \begin{macro}{\LWR@setref} \marg{args list} \marg{selector} \marg{label}
%
-% Add a |LWR@htmlfilenumber| property, and lateximage properties to special:
-% \begin{macrocode}
-\zref@addprop{special}{zLWR@name}
-\zref@addprop{special}{zLWR@htmlfilenumber}
-\zref@addprop{special}{zLWR@lateximagedepth}
-\zref@addprop{special}{zLWR@lateximagenumber}
-% \end{macrocode}
+% \cs{@setref} without the \cs{null} (\cs{hbox}), and without the
+% warning messages.
+% Each caused problems with \pkg{lwarp} references.
+% The regular reference will cause the warning.
%
-% Returns the selected field:
+% \changes{v0.66}{2019/01/30}{No longer use \pkg{zref}.}
% \begin{macrocode}
-\newcommand*{\LWR@spref}[2]{%
-\zref@extractdefault{#1}{#2}{??}%
-}
+\def\LWR@setref#1#2#3{%
+ \ifx#1\relax%
+ ??%
+ \else%
+ \expandafter#2#1%
+ \fi}
% \end{macrocode}
+% \end{macro}
%
%
% \begin{macro}{\LWR@nameref} \marg{label}
% Returns the section name for this label:
+% \changes{v0.66}{2019/01/27}{No longer use \pkg{zref}.}
% \begin{macrocode}
\newcommand*{\LWR@nameref}[1]{%
-\LWR@spref{#1}{zLWR@name}%
+ \expandafter\LWR@setref\csname r@#1@lwarp\endcsname\LWR@firstoffour{#1}%
}
% \end{macrocode}
% \end{macro}
%
%
% \begin{macro}{\LWR@htmlfileref} \marg{label}
-% \changes{v0.24}{2017/03/13}{Fix: Index links while \cs{tracinglwarp}.}
% Returns the file number or name for this label:
+% \changes{v0.24}{2017/03/13}{Fix: Index links while \cs{tracinglwarp}.}
+% \changes{v0.66}{2019/01/27}{No longer use \pkg{zref}.}
% \begin{macrocode}
\newcommand*{\LWR@htmlfileref}[1]{%
-% \end{macrocode}
-% DO NOT USE \cs{LWR@traceinfo} HERE! Will be expanded.
-% \begin{macrocode}
-\LWR@spref{#1}{zLWR@htmlfilenumber}%
+ \expandafter\LWR@setref\csname r@#1@lwarp\endcsname\LWR@secondoffour{#1}%
}
% \end{macrocode}
% \end{macro}
@@ -27160,9 +27466,10 @@ rowspan="#2" %
%
% \begin{macro}{\LWR@lateximagedepthref} \marg{label}
% Returns the |lateximagedepth| for this label:
+% \changes{v0.66}{2019/01/27}{No longer use \pkg{zref}.}
% \begin{macrocode}
\newcommand*{\LWR@lateximagedepthref}[1]{%
-\LWR@spref{#1}{zLWR@lateximagedepth}%
+ \expandafter\LWR@setref\csname r@#1@lwarp\endcsname\LWR@thirdoffour{#1}%
}
% \end{macrocode}
% \end{macro}
@@ -27171,21 +27478,31 @@ rowspan="#2" %
%
% \begin{macro}{\LWR@lateximagenumberref} \marg{label}
% Returns the |lateximagenumber| for this label:
+% \changes{v0.66}{2019/01/27}{No longer use \pkg{zref}.}
% \begin{macrocode}
\newcommand*{\LWR@lateximagenumberref}[1]{%
-\LWR@spref{#1}{zLWR@lateximagenumber}%
+ \expandafter\LWR@setref\csname r@#1@lwarp\endcsname\LWR@fourthoffour{#1}%
}
% \end{macrocode}
% \end{macro}
%
%
-% \begin{macro}{\LWR@splabel} \marg{label}
+% \begin{macro}{\LWR@lwarplabel} \marg{label}
% Sanitize the name and then creates the label:
+% \changes{v0.66}{2019/01/27}{No longer use \pkg{zref}.}
% \begin{macrocode}
-\newcommand*{\LWR@splabel}[1]{%
-\LWR@traceinfo{LWR@splabel !#1!}%
+\newcommand*{\LWR@lwarplabel}[1]{%
+\LWR@traceinfo{LWR@lwarplabel !#1!}%
\LWR@setlatestname{\@currentlabelname}%
-\zref@labelbylist{#1}{special}%
+ \@bsphack%
+ \protected@write\@auxout{}%
+ {\string\newlabel{#1@lwarp}{%
+ {\@currentlabelname}%
+ {\ifbool{FileSectionNames}{\LWR@thisfilename}{\arabic{LWR@htmlfilenumber}}}%
+ {\arabic{LWR@lateximagedepth}}%
+ {\arabic{LWR@lateximagenumber}}%
+ }}%
+ \@esphack%
}
% \end{macrocode}
% \end{macro}
@@ -27242,7 +27559,7 @@ rowspan="#2" %
% \begin{macro}{\LWR@new@label} \parg{bookmark} \marg{label} \oarg{type}
%
% \cs{label} during \HTML\ output when not in \SVG\ math mode,
-% removing extra spaces around the label, as done by regular \LaTeX\ \cs{label}.
+% removing extra spaces around the label, as done by a regular \LaTeX\ \cs{label}.
%
% The is also used during a \env{lateximage}, including \SVG\ math, since
% the special label handling is required, but \cs{LWR@sublabel} does not
@@ -27270,7 +27587,7 @@ rowspan="#2" %
\LWR@traceinfo{LWR@new@label: filesectionnames is \ifbool{FileSectionNames}{true}{false}}%
\LWR@traceinfo{LWR@new@label: LWR@thisfilename is !\LWR@thisfilename!}%
\LWR@traceinfo{LWR@new@label: LWR@htmlfilenumber is \arabic{LWR@htmlfilenumber}}%
-\LWR@splabel{#2}%
+\LWR@lwarplabel{#2}%
\LWR@sublabel{#2}%
% \@esphack%
\LWR@traceinfo{LWR@new@label: done}%
@@ -27290,11 +27607,11 @@ rowspan="#2" %
%
% \changes{v0.28}{2017/04/13}{Removed space.}
% \changes{v0.47}{2018/01/26}{Fix: Line wrap at \HTML\ hyphen.}
+% \changes{v0.66}{2019/01/27}{No longer use \pkg{zref}.}
%
% \begin{macrocode}
\newcommand*{\LWR@startref}[1]
{%
-\edef\LWR@lidref{\LWR@lateximagedepthref{#1}}%
\LWR@sanitize{#1}%
\LWR@traceinfo{LWR@startref A: !#1!}%
% \end{macrocode}
@@ -27311,7 +27628,7 @@ rowspan="#2" %
% See if |LWR@lateximagedepth| is unknown:
% \begin{macrocode}
\LWR@traceinfo{LWR@startref D: !#1!}%
-\ifthenelse{\equal{\LWR@lidref}{??}}%
+\ifcsundef{r@#1@lwarp}%
% \end{macrocode}
% ``|??|'' if |LWR@lateximagedepth| is unknown,
% so create a link with an unknown destination:
@@ -27326,11 +27643,9 @@ rowspan="#2" %
% or a regular link otherwise:
% \begin{macrocode}
{%
- \LWR@traceinfo{LWR@startref D1: \LWR@lidref}%
- \ifthenelse{\cnttest{\LWR@lidref}{>}{0}}%
+ \ifthenelse{\cnttest{\LWR@lateximagedepthref{#1}}{>}{0}}%
{%
- \LWR@traceinfo{LWR@startref D2: \LWR@lidref}%
- lateximage\LWR@lateximagenumberref{#1}%
+ \LWR@ImagesName\LWR@lateximagenumberref{#1}%
}%
{%
\LWR@traceinfo{LWR@startref D3}%
@@ -27503,8 +27818,8 @@ autopage-\theLWR@currentautosec%
\LWR@traceinfo{LWR@subhyperref !#1!}%
\LWR@sanitize{#1}%
\LWR@htmltag{%
- a href="\LWR@sanitized" %
- target="\_{}blank"\LWR@orignewline%
+ a href="\LWR@sanitized" % space
+ target="\_{}blank" % space
}%
}
% \end{macrocode}
@@ -27529,15 +27844,15 @@ autopage-\theLWR@currentautosec%
% \begin{macro}{\LWR@subhyperrefclass} \marg{URL} \marg{text} \marg{htmlclass}
% \changes{v0.18}{2016/04/14}{Improved \HTML\ output linebreaks.}
% \changes{v0.45}{2017/12/29}{Improved URLs with underscores.}
+% \changes{v0.66}{2019/02/02}{Improved \HTML\ formatting.}
% \begin{macrocode}
\NewDocumentCommand{\LWR@subhyperrefclass}{m +m m}{%
\LWR@htmltag{%
- a href="%
- \begingroup\@sanitize#1\endgroup%
- " %
- class="#3"\LWR@orignewline%
-}%
-#2%
+ a % space
+ href="\begingroup\@sanitize#1\endgroup" % space
+ class="#3" % space
+}\LWR@orignewline%
+#2\LWR@orignewline%
\LWR@htmltag{/a}%
\LWR@ensuredoingapar%
}
@@ -27552,7 +27867,7 @@ autopage-\theLWR@currentautosec%
%
% \changes{v0.43}{2017/10/31}{Made robust.}
% \changes{v0.49}{2018/02/18}{Fix: Adapt to classes.}
-% \changes{v0.52}{2018/03/26}{Fix: \progcode{\#}, \progcode{\%}, \progcode{\&}, \progcode{\~}, \progcode{\_} in \acro{URL}.}
+% \changes{v0.52}{2018/03/26}{Fix: \progcode{\#}, \progcode{\%}, \progcode{\&}, \progcode{\~}, \progcode{\_} in \URL.}
% \changes{v0.57}{2018/06/05}{Fix: Text catcodes.}
% \begin{macrocode}
\DeclareDocumentCommand{\LWR@hrefb}{O{} m}{%
@@ -27578,8 +27893,8 @@ autopage-\theLWR@currentautosec%
%
% Print the name of the link without creating the link:
% \changes{v0.43}{2017/10/31}{Made robust.}
-% \changes{v0.45}{2017/12/29}{Fix: Underscore in \acro{URL}.}
-% \changes{v0.52}{2018/03/26}{Fix: \progcode{\#}, \progcode{\%}, \progcode{\&}, \progcode{\~}, \progcode{\_} in \acro{URL}.}
+% \changes{v0.45}{2017/12/29}{Fix: Underscore in \URL.}
+% \changes{v0.52}{2018/03/26}{Fix: \progcode{\#}, \progcode{\%}, \progcode{\&}, \progcode{\~}, \progcode{\_} in \URL.}
% \begin{macrocode}
\newcommand*{\LWR@nolinkurlb}[1]{%
\LWR@ensuredoingapar%
@@ -27612,7 +27927,7 @@ autopage-\theLWR@currentautosec%
% \changes{v0.43}{2017/10/31}{Made robust.}
% \changes{v0.45}{2017/12/29}{Improved URLs with underscores.}
% \changes{v0.49}{2018/02/18}{Fix: Adapt to classes.}
-% \changes{v0.52}{2018/03/26}{Fix: \progcode{\#}, \progcode{\%}, \progcode{\&}, \progcode{\~}, \progcode{\_} in \acro{URL}.}
+% \changes{v0.52}{2018/03/26}{Fix: \progcode{\#}, \progcode{\%}, \progcode{\&}, \progcode{\~}, \progcode{\_} in \URL.}
% \begin{macrocode}
\DeclareDocumentCommand{\LWR@urlb}{m}{%
\LWR@ensuredoingapar%
@@ -27639,11 +27954,26 @@ autopage-\theLWR@currentautosec%
% \marg{filename} \marg{extension} \marg{style}
%
% \changes{v0.18}{2016/05/18}{Suppress extra space.}
+% \changes{v0.66}{2019/02/02}{Improved \HTML\ formatting.}
% \begin{macrocode}
\newcommand*{\LWR@subinlineimage}[5][]{%
\ifblank{#1}%
-{\LWR@htmltag{img src="#3.#4" alt="#3" style="#5" class="#2"}}%
-{\LWR@htmltag{img src="#3.#4" alt="#1" style="#5" class="#2"}}%
+{%
+ \LWR@htmltag{img \LWR@indentHTML
+ src="#3.#4" \LWR@indentHTML
+ alt="#3" \LWR@indentHTML
+ style="#5" \LWR@indentHTML
+ class="#2" \LWR@orignewline
+ }%
+}%
+{%
+ \LWR@htmltag{img \LWR@indentHTML
+ src="#3.#4" \LWR@indentHTML
+ alt="#1" \LWR@indentHTML
+ style="#5" \LWR@indentHTML
+ class="#2" \LWR@orignewline
+ }%
+}%
}
% \end{macrocode}
% \end{macro}
@@ -27734,7 +28064,7 @@ autopage-\theLWR@currentautosec%
% The figure is assigned a \attribute{class} equal to its type,
% and another class according to the \pkg{float} package style, if used.
% Note that \cs{csuse} returns an empty string if \cs{LWR@floatstyle@<type>}
-% is note defined.
+% is not defined.
% \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.}
% \changes{v0.56}{2018/05/14}{Adds a \element{class} per \pkg{float} package style.}
@@ -27981,16 +28311,20 @@ autopage-\theLWR@currentautosec%
% \end{macrocode}
%
%
-% \begin{macro}{\LWRsetnextfloat} \marg{autopage} \marg{autoid}
%
-% This is written to the |.lof|, |.lot| file just before each float's usual entry.
-% The |autopage| and |autoid| are remembered for \cs{l@figure} to use when
+% \begin{macro}{\LWRsetnextfloat} \marg{autopage} \marg{float autoid}
+%
+% \DescribeFile{*_html.lof}
+% \DescribeFile{*_html.lot}
+% This is written to the \filenm{*_html.lof} or \filenm{*_html.lot} file
+% just before each float's usual entry.
+% The |autopage| and the float's |autoid| are remembered for \cs{l@figure} to use when
% creating the \HTML\ links.
%
% \begin{macrocode}
\newcommand*{\LWRsetnextfloat}[2]{%
-\setcounter{LWR@nextautopage}{#1}%
-\setcounter{LWR@nextautoid}{#2}%
+ \setcounter{LWR@nextautopage}{#1}%
+ \setcounter{LWR@nextautoid}{#2}%
}
% \end{macrocode}
% \end{macro}
@@ -28031,7 +28365,10 @@ autopage-\theLWR@currentautosec%
%
% \begin{macro}{\LWR@HTML@caption@begin} \marg{type}
%
-% Low-level patches to create \HTML\ tags for captions.
+% Low-level code to create \HTML\ tags for captions.
+%
+% The print versions are from the \pkg{caption} package.
+%
% \changes{v0.47}{2018/01/28}{Fix: Argument passed to \cs{LWR@origcaption@begin}.}
% \changes{v0.58}{2018/06/07}{Improved print/\HTML\ output selection.}
% \begin{macrocode}
@@ -28419,15 +28756,17 @@ autopage-\theLWR@currentautosec%
%
% It may be renamed by redefining \cs{sidetocname}, and may contain paragraphs.
%
-% \CSS\ may be used to format the sideTOC:
+% \CSS\ may be used to format the side\TOC:
%
-% \begin{docsidebar}[CSS related to sideTOC:]
-% \raggedright
+% \begin{docsidebar}[CSS related to side\TOC:]
+% \vspace*{-\baselineskip}
% \begin{description}[parsep=0ex]
+% \vspace*{-\baselineskip}
% \item [|div.sidetoccontainer|:] The entire side\TOC.
% \item [|div.sidetoctitle|:] The title.
% \item [|div.sidetoccontents|:] The table of contents.
% \end{description}
+% \vspace*{-\baselineskip}
% \end{docsidebar}
% \begin{macrocode}
@@ -28832,10 +29171,13 @@ autopage-\theLWR@currentautosec%
% \end{macro}
-% \begin{macro}{\LWR@hyperindexrefnullified} \qquad
+% \begin{macro}{\LWR@hyperindexrefnullified}
% Handles macros commonly seen inside an \cs{index} entry.
+% Each macro is redefined to create and format a link to its entry.
%
% To handle additional macros:
+% \trouble[index formatting]{index>formatting}
+% \gindex{index>formatting}
% \begin{sourcedisplay}
% \cs{appto}\cs{LWR@hyperindexrefnullified}\{\dots\}
% \end{sourcedisplay}
@@ -28869,10 +29211,28 @@ autopage-\theLWR@currentautosec%
% \changes{v0.20}{2016/12/19}{Print mode provided in case \pkg{hyperref} not used.}
% \changes{v0.28}{2017/04/13}{Improved indexing.}
% \changes{v0.58}{2018/06/17}{Adds support for \cs{see}, \cs{seealso}, \cs{emph}, \cs{textbf}, etc.}
+% \changes{v0.66}{2019/02/05}{Fix: Long index entries.}
% \begin{macrocode}
\newcommand{\hyperindexref}[1]{%
-\IfInteger{#1}%
- {\LWR@indexnameref{#1}}%
+% \end{macrocode}
+% In long index lines with numerous entries,
+% \prog{makeindex} can insert a newline before the page number,
+% resulting in an extra space before the first digit.
+% If the first character is a space, remove it first.
+% ^^A Or use the trimspaces package.
+% \begin{macrocode}
+\def\LWR@tempone{#1}%
+\IfBeginWith{\LWR@tempone}{ }{%
+ \StrGobbleLeft{\LWR@tempone}{1}[\LWR@tempone]%
+}{}%
+% \end{macrocode}
+% If a numeric entry, create a link.
+% If not numeric, such as \cs{see}, use the entry as-is.
+% \cs{emph}, \cs{textit}, etc. have been redefined above to create and
+% format the entry.
+% \begin{macrocode}
+\IfInteger{\LWR@tempone}%
+ {\LWR@indexnameref{\LWR@tempone}}%
{%
\begingroup%
\LWR@hyperindexrefnullified
@@ -29244,7 +29604,7 @@ autopage-\theLWR@currentautosec%
% image.
% If neither is loaded, no marker is used.
% \changes{v0.51}{2018/03/16}{Improved \SVG\ math baseline.}
-% \changes{v0.52}{2018/03/24}{Warnings if \filenm{lwarp\_baseline\_marker.png} is not present
+% \changes{v0.52}{2018/03/24}{Warnings if \filenm{lwarp_baseline_marker.png} is not present
% or if graphicx/s not loaded.}
% \changes{v0.59}{2018/09/02}{Uses \filenm{.eps} if \DVI\ \prog{latex}.}
% \begin{macrocode}
@@ -29555,7 +29915,7 @@ autopage-\theLWR@currentautosec%
% These markers are seen by \prog{pdfcrop},
% and force vertically-centered objects such as a dash
% to be raised off the baseline in the cropped image,
-% and also force the total width and left \spslash right margins to be correct.
+% and also force the total width and left \Slash right margins to be correct.
% (Except that in some fonts a character may exceed the bounding box, and thus
% may appear wider than expected when converted to an image.)
% \changes{v0.51}{2018/03/10}{SVG math baseline improved with invisible rule at corner.}
@@ -30829,6 +31189,21 @@ autopage-\theLWR@currentautosec%
%
% \describehashing
%
+% \DescribeFile{*_html.aux}
+% A new label is placed into the file \filenm{*_html.aux}:
+% \begin{sourceverb}
+% \newlabel{LWRlateximage-<BaseJobname>-<number>}{{<x>}{<y>}}
+% \end{sourceverb}
+% This is used to find the image in the \PDF\ file, according to its name.
+%
+% \DescribeFile{*-images.txt}
+% A list of images to generate is created in \filenm{<jobname>-images.txt}.
+% Each line has three pipe-delimited fields,
+% containing the \PDF\ page number from \filenm{<jobname>_html.pdf}, where the image
+% is located, a boolean indicating whether the image is hashed, and
+% the filename of the image.
+%
+%
% \changes{v0.18}{2016/05/18}{Suppress extra space.}
% \changes{v0.18}{2016/05/18}{pdfcrop: -{}-hires added.}
% \changes{v0.18}{2016/05/19}{Reorganize \cs{HomeHTMLFilename} logic.}
@@ -30841,6 +31216,7 @@ autopage-\theLWR@currentautosec%
% the \protect\env{lateximage} \protect\env{minipage}.}
% \changes{v0.47}{2018/01/24}{Added \CSS\ style option.}
% \changes{v0.51}{2018/03/07}{Added additional hashing option.}
+% \changes{v0.66}{2019/01/27}{Adds \cs{BaseJobname} for multiple projects.}
%
% \begin{macrocode}
\catcode`\$=\active%
@@ -30902,21 +31278,26 @@ autopage-\theLWR@currentautosec%
% \end{macrocode}
% Figure out what the next page number will be.
% \cs{setcounterpageref} assigns |LWR@LIpage| to the page number for
-% the reference |LWRlateximageXXX|:
+% the reference |LWRlateximage-BaseJobname-XXX|:
% \begin{macrocode}
- \setcounterpageref{LWR@LIpage}{LWRlateximage\arabic{LWR@lateximagenumber}}%
+ \setcounterpageref{LWR@LIpage}{%
+ LWRlateximage-\BaseJobname-\arabic{LWR@lateximagenumber}%
+ }%
\LWR@traceinfo{lateximage: LWR@LIpage is \arabic{LWR@LIpage}}%
% \end{macrocode}
% Create an \HTML\ span which will hold the comment which contains the \prog{pdftotext} translation
% of the image's page, and also will hold the link to the |.svg| file:
+% \changes{v0.66}{2019/02/02}{Improved \HTML\ formatting.}
% \begin{macrocode}
- \LWR@htmltag{span id="lateximage\arabic{LWR@lateximagenumber}" % extra space
- class="lateximagesource"}%
+ \LWR@htmltag{span\LWR@indentHTML%
+ id="lateximage-\BaseJobname-\arabic{LWR@lateximagenumber}"\LWR@indentHTML
+ class="lateximagesource"\LWR@orignewline
+ }%
% \end{macrocode}
-% Write instructions to the |lateximages.txt| file:
+% Write instructions to the |<ImagesDirectory>.txt| file:
% \changes{v0.50}{2018/02/22}{MD5 hash avoids duplicate \SVG\ math.}
% \begin{macrocode}
- \LWR@traceinfo{lateximage: about to write to lateximages.txt}%
+ \LWR@traceinfo{lateximage: about to write to \BaseJobname-images.txt}%
\IfBooleanTF{#1}% starred
{% hash
\LWR@traceinfo{lateximage: hash true, adding %
@@ -30927,7 +31308,6 @@ autopage-\theLWR@currentautosec%
% \begin{macrocode}
\edef\LWR@hashedname{%
\LWR@mdfive{\detokenize\expandafter{#2}-!-#3}%
-% \LWR@mdfive{\detokenize\expandafter{#2}-!-\detokenize\expandafter{#3}}%
}%
\LWR@traceinfo{lateximage: hash is \LWR@hashedname}%
% \end{macrocode}
@@ -30943,7 +31323,7 @@ autopage-\theLWR@currentautosec%
% \begin{macrocode}
\LWR@traceinfo{lateximage: hash false}%
\immediate\write\LWR@lateximagesfile{%
- |\arabic{LWR@LIpage}|false|lateximage-\arabic{LWR@externalfilecnt}|%
+ |\arabic{LWR@LIpage}|false|\LWR@ImagesName\arabic{LWR@externalfilecnt}|%
}%
}% no hash
% \end{macrocode}
@@ -30987,7 +31367,7 @@ autopage-\theLWR@currentautosec%
% Create the |LWRlateximage<number>| label:
% \begin{macrocode}
\LWR@traceinfo{lateximage: about to create label}%
- \LWR@orig@label{LWRlateximage\arabic{LWR@lateximagenumber}}%
+ \LWR@orig@label{LWRlateximage-\BaseJobname-\arabic{LWR@lateximagenumber}}%
\LWR@traceinfo{lateximage: finished creating the label}%
% \end{macrocode}
% Enable print-mode math functions:
@@ -31066,15 +31446,15 @@ autopage-\theLWR@currentautosec%
{% hash
\LWR@subinlineimage[#2]{lateximage}%
{%
- lateximages\OSPathSymbol%
+ \LWR@ImagesDirectory\OSPathSymbol%
\LWR@print@mbox{\LWR@hashedname}%
}{svg}{#4}%
}% hash
{% no hash
\LWR@subinlineimage[#2]{lateximage}%
{%
- lateximages\OSPathSymbol%
- \LWR@print@mbox{lateximage-\theLWR@externalfilecnt}%
+ \LWR@ImagesDirectory\OSPathSymbol%
+ \LWR@print@mbox{\LWR@ImagesName\theLWR@externalfilecnt}%
}{svg}{#4}%
}% no hash
% \end{macrocode}
@@ -31974,30 +32354,66 @@ autopage-\theLWR@currentautosec%
\boolfalse{LWR@minipagefullwidth}
% \end{macrocode}
%
+%
+% \DescribeBoolean{LWR@forceminipagefullwidth} Should the next minipage
+% have no \HTML\ |width|? Used to force full width for all minipages
+% in an environment such as \env{tabular} or \env{multicols},
+% where the actual width depends on the browser width.
+% Controlled by \cs{useminipagewidths} and \cs{ignoreminipagewidths}.
+% \begin{macrocode}
+\newbool{LWR@forceminipagefullwidth}
+\boolfalse{LWR@forceminipagefullwidth}
+% \end{macrocode}
+%
+%
% \begin{macro}{\minipagefullwidth} Requests that the next minipage
% have no |width| tag in \HTML:
% \changes{v0.19}{2016/05/28}{Added: No width tag for the next minipage in HTML.}
+% \changes{v0.66}{2018/12/28}{Made \cs{global}.}
%
% \codehtml
%
% \begin{macrocode}
-\newcommand*{\minipagefullwidth}{\booltrue{LWR@minipagefullwidth}}
+\newcommand*{\minipagefullwidth}{\global\booltrue{LWR@minipagefullwidth}}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\UseMinipageWidths} Locally requests that minipage widths be
+% honored.
+% \changes{v0.66}{2018/12/31}{Added,}
+% \begin{macrocode}
+\newcommand*{\UseMinipageWidths}{\boolfalse{LWR@forceminipagefullwidth}}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\IgnoreMinipageWidths} Locally requests that minipage widths be
+% honored.
+% \changes{v0.66}{2018/12/31}{Added,}
+% \begin{macrocode}
+\newcommand*{\IgnoreMinipageWidths}{\booltrue{LWR@forceminipagefullwidth}}
\end{warpHTML}
% \end{macrocode}
+% \end{macro}
+%
%
% \codeprint
%
% \begin{macrocode}
\begin{warpprint}
\newcommand*{\minipagefullwidth}{}
+\newcommand*{\UseMinipageWidths}{}
+\newcommand*{\IgnoreMinipageWidths}{}
\end{warpprint}
% \end{macrocode}
%
+%
+%
% \codehtml
% \begin{macrocode}
\begin{warpHTML}
% \end{macrocode}
-% \end{macro}
+%
+%
%
%
% \DescribeBoolean{LWR@minipagethispar}
@@ -32099,14 +32515,19 @@ autopage-\theLWR@currentautosec%
\ifthenelse{\equal{#3}{s}}{\LWR@print@mbox{justify-content:space-between} ; }{}%
% \end{macrocode}
% Print the width and optional height styles:
+% \changes{v0.66}{2018/12/31}{Honor \cs{LWR@forceminipagefullwidth}.}
% \begin{macrocode}
\LWR@traceinfo{minipage: about to print the width of \LWR@printlength{\LWR@minipagewidth}}%
\ifbool{LWR@minipagefullwidth}%
-{\boolfalse{LWR@minipagefullwidth}}%
+{\global\boolfalse{LWR@minipagefullwidth}}%
{%
- \ifthenelse{\lengthtest{#4}=\linewidth}%
- {}%
- {width:\LWR@printlength{\LWR@minipagewidth} ; }%
+ \ifbool{LWR@forceminipagefullwidth}%
+ {}%
+ {%
+ \ifthenelse{\lengthtest{#4}=\linewidth}%
+ {}%
+ {width:\LWR@printlength{\LWR@minipagewidth} ; }%
+ }%
}%
\LWR@traceinfo{minipage: about to print the height}%
\ifblank{#2}{}{height:\LWR@printlength{\LWR@minipageheight} ; }%
@@ -32330,15 +32751,19 @@ autopage-\theLWR@currentautosec%
%
%
-% \begin{macro}{\LWR@blackborderpadding}
+% \begin{macro}{\LWR@fboxstyle}
% Prints the \HTML\ attributes for a black border and padding.
%
% \cs{LWR@forceminwidth} must be used first in order to set the border width.
%
+% \changes{v0.66}{2019/02/04}{Use current text color.}
+%
% \begin{macrocode}
-\newcommand*{\LWR@blackborderpadding}{%
-border:\LWR@printlength{\LWR@atleastonept} solid black ; %
-padding:\LWR@printlength{\fboxsep}%
+\newcommand*{\LWR@fboxstyle}{%
+\LWR@findcurrenttextcolor%
+border:\LWR@printlength{\LWR@atleastonept} solid \LWR@origpound\LWR@tempcolor ; %
+padding:\LWR@printlength{\fboxsep} ; %
+color:\LWR@origpound\LWR@tempcolor%
}
% \end{macrocode}
% \end{macro}
@@ -32349,6 +32774,7 @@ padding:\LWR@printlength{\fboxsep}%
% Creates a framed inline span enclosing the text.
%
% \changes{v0.36}{2017/08/10}{Fix: Uses \cs{fboxrule} and \cs{fboxsep}.}
+% \changes{v0.66}{2019/02/02}{Fix: Removed extra space.}
%
% Create a new \HTML\ version, but don't use it until after \pkg{xcolor}
% may have loaded:
@@ -32357,8 +32783,8 @@ padding:\LWR@printlength{\fboxsep}%
\LWR@traceinfo{HTML fbox}%
\LWR@forceminwidth{\fboxrule}%
\InlineClass[%
-\LWR@blackborderpadding%
-]{fbox}{#1}
+\LWR@fboxstyle%
+]{fbox}{#1}%
}
% \end{macrocode}
% \pkg{xcolor} \cs{let}s things to \cs{fbox} when it is loaded,
@@ -32394,7 +32820,7 @@ padding:\LWR@printlength{\fboxsep}%
\newcommand{\LWR@HTML@fboxBlock}[1]{%
\LWR@forceminwidth{\fboxrule}%
\begin{BlockClass}[%
-\LWR@blackborderpadding%
+\LWR@fboxstyle%
]{fboxBlock}
#1
\end{BlockClass}
@@ -32491,7 +32917,7 @@ padding:\LWR@printlength{\fboxsep}%
% \end{macrocode}
% \begin{macrocode}
\begin{BlockClass}[%
-\LWR@blackborderpadding ; %
+\LWR@fboxstyle ; %
\IfValueT{#2}{height:\LWR@printlength{\LWR@tempheight} ; }%
width:\LWR@printlength{\LWR@tempwidth}%
]{fminipage}%
@@ -32761,8 +33187,8 @@ width:\LWR@printlength{\LWR@tempwidth}%
% \end{macrocode}
-
-% \begin{macro}{\LWR@nullfonts} Removes formatting during filename operations.
+% \begin{macro}{\LWR@nullfonts} Removes formatting during filename operations,
+% file references, and \HTML\ comments.
%
% \textred{Use only inside a group.}\watchout
%
@@ -32776,6 +33202,7 @@ width:\LWR@printlength{\LWR@tempwidth}%
% \changes{v0.48}{2018/02/04}{Fix: \cs{newline} in title.}
% \changes{v0.65}{2018/12/09}{Added \cs{textsi}.}
% \begin{macrocode}
+\catcode`\$=\active% redefining $ below
\newcommand*{\LWR@nullfonts}{%
\LetLtxMacro\emph\LWR@null@emph%
\LetLtxMacro\textmd\LWR@null@textmd%
@@ -32807,7 +33234,6 @@ width:\LWR@printlength{\LWR@tempwidth}%
\LetLtxMacro\normalfont\LWR@null@normalfont%
\LetLtxMacro\em\LWR@null@em%
% \end{macrocode}
-% \changes{v0.50}{2018/02/20}{Robustify macros.}
% \begin{macrocode}
\renewcommand*{\,}{-}%
\renewcommand*{~}{-}%
@@ -32840,6 +33266,24 @@ width:\LWR@printlength{\LWR@tempwidth}%
\def\(##1\){}%
\def\[##1\]{}%
\RenewDocumentCommand{\LWR@subsingledollar}{s m m m}{}%
+\protected\def$##1${}%
+% \end{macrocode}
+% Nullify logos:
+% \changes{v0.66}{2019/02/01}{Logos.}
+% \begin{macrocode}
+\renewcommand*{\TeX}{TeX}%
+\renewcommand*{\LaTeX}{LaTeX}%
+\renewcommand*{\LaTeXe}{LaTeX2e}%
+\renewcommand*{\LuaTeX}{LuaTeX}%
+\renewcommand*{\LuaLaTeX}{LuaLaTeX}%
+\renewcommand*{\XeTeX}{XeTeX}%
+\renewcommand*{\XeLaTeX}{XeLaTeX}%
+\renewcommand*{\ConTeXt}{ConTeXt}%
+\renewcommand*{\BibTeX}{BibTeX}%
+\renewcommand*{\MakeIndex}{MakeIndex}%
+\renewcommand*{\AmS}{AmS}%
+\renewcommand*{\MiKTeX}{MiKTeX}%
+\renewcommand*{\LyX}{LyX}%
% \end{macrocode}
% Use the simpler form with \cs{texorpdfstring}:
% \changes{v0.52}{2018/03/31}{Fix: \cs{texorpdfstring} in section names.}
@@ -32847,6 +33291,7 @@ width:\LWR@printlength{\LWR@tempwidth}%
\let\texorpdfstring\relax%
\newcommand{\texorpdfstring}[2]{##2}%
}
+\catcode`\$=3%
% \end{macrocode}
% \end{macro}
@@ -33111,9 +33556,10 @@ width:\LWR@printlength{\LWR@tempwidth}%
% \begin{macro}{\LWR@findcurrenttextcolor}
% \changes{v0.51}{2018/03/14}{Added \cs{LWR@findcurrenttextcolor} when no \pkg{xcolor}.}
% Sets \cs{LWR@tempcolor} to the current color.
+% \changes{v0.66}{2019/02/04}{Fix: Color if \pkg{xcolor} not loaded.}
% \begin{macrocode}
\newcommand*{\LWR@findcurrenttextcolor}{%
-\renewcommand{\LWR@tempcolor}{black}%
+\renewcommand{\LWR@tempcolor}{000000}%
}
% \end{macrocode}
% \end{macro}
@@ -33629,10 +34075,11 @@ width:\LWR@printlength{\LWR@tempwidth}%
% The width and height are NOT rounded, since a height of
% less than 1pt is quite common in \LaTeX\ code.
% \changes{v0.57}{2018/06/02}{Fix: Colored rules.}
+% \changes{v0.66}{2019/02/02}{Improved \HTML\ formatting.}
% \begin{macrocode}
\LWR@findcurrenttextcolor%
\LWR@htmltagc{%
- span
+ span\LWR@indentHTML%
style="%
% \end{macrocode}
% The background color is used to draw the filled rule.
@@ -33658,18 +34105,18 @@ width:\LWR@printlength{\LWR@tempwidth}%
{%
\setlength{\LWR@tempraise}{0pt-#1}%
\setlength{\LWR@tempraise}{\LWR@tempraise*2}%
- \LWR@orignewline%
+ \LWR@indentHTML%
-ms-transform: translate(0pt,\LWR@printlength{\LWR@tempraise}); %
- \LWR@orignewline%
+ \LWR@indentHTML%
-webkit-transform: translate(0pt,\LWR@printlength{\LWR@tempraise}); %
- \LWR@orignewline%
+ \LWR@indentHTML%
transform: translate(0pt,\LWR@printlength{\LWR@tempraise}); %
- \LWR@orignewline%
+ \LWR@indentHTML%
}%
% \end{macrocode}
% Display inline-block to place the span inline with the text:
% \begin{macrocode}
- display:inline-block;"%
+ display:inline-block;"\LWR@orignewline%
}%
% \end{macrocode}
% If formatting for a word processor, approximate with a number of underscores,
@@ -33990,7 +34437,7 @@ width:\LWR@printlength{\LWR@tempwidth}%
-% \section{\brand{Koma-script} classes}
+% \section{Loading \brand{Koma-script} class patches}
%
% Load patches to \pkg{koma-script}.
%
@@ -34010,7 +34457,7 @@ width:\LWR@printlength{\LWR@tempwidth}%
% \end{macrocode}
-% \section{\brand{Memoir} class}
+% \section{Loading \brand{Memoir} class patches}
%
% Load patches to \pkg{memoir}.
%
@@ -34031,8 +34478,7 @@ width:\LWR@printlength{\LWR@tempwidth}%
-
-% \section{\pkg{ut*} classes}
+% \section{\pkg{ut*} class patches}
%
% Load patches to \pkg{uj*} and \pkg{ut*} classes, as well as \pkg{ltj*} classes.
%
@@ -34121,7 +34567,7 @@ width:\LWR@printlength{\LWR@tempwidth}%
% ^^A *ctex
-% \section{C\TeX patch}
+% \section{C\TeX\ patches}
%
% Patches for \pkg{ctex} and related classes,
% which are loaded before \pkg{lwarp}.
@@ -34162,6 +34608,49 @@ width:\LWR@printlength{\LWR@tempwidth}%
% \end{macrocode}
%
%
+%
+% ^^A *kotexutf
+% \section{\pkg{kotexutf} patches}
+%
+% Patch for \pkg{kotexutf}, which is loaded before \pkg{lwarp}.
+%
+% \pkg{kotexutf}'s \cs{@setref} was conflicting with \pkg{lwarp}'s
+% cross references.
+%
+% \changes{v0.66}{2019/01/29}{\pkg{kotexutf}: Patch for references.}
+%
+% \codehtml
+% \begin{macrocode}
+\begin{warpHTML}
+% \end{macrocode}
+%
+% If \pkg{kotexutf}'s version of \cs{@setref} is detected,
+% it is reverted to the original.
+% \begin{macrocode}
+\AtBeginDocument{
+\@ifpackageloaded{kotexutf}{%
+ \def\LWR@kotexutf@setref#1#2#3{%
+ \@setref@dhucs@orig{#1}{#2}{#3}%
+ \ifx#1\relax\else
+ \bgroup
+ \dhucs@make@cjkchar@null
+ \edef\@temp{\expandafter#2#1}\global\josatoks\expandafter{\@temp}%
+ \egroup
+ \fi%
+ }%
+
+ \ifdefequal{\@setref}{\LWR@kotexutf@setref}{
+ \let\@setref\@setref@dhucs@orig
+ }{}
+}{}
+}
+% \end{macrocode}
+%
+% \begin{macrocode}
+\end{warpHTML}
+% \end{macrocode}
+%
+%
% \iffalse
%</package>
% \fi
@@ -34173,7 +34662,7 @@ width:\LWR@printlength{\LWR@tempwidth}%
%
%
%
-% \changes{v0.20}{2016/12/12}{Code factored into independent \filenm{lwarp\_html} files.}
+% \changes{v0.20}{2016/12/12}{Code factored into independent \filenm{lwarp_html} files.}
%
% ^^A The following adjustments apply to the lwarp-* package listings:
%
@@ -34200,7 +34689,7 @@ width:\LWR@printlength{\LWR@tempwidth}%
%
%
%
-%
+% \changes{v0.66}{2018/12/29}{Package dates added where possible.}
%
%
% \iffalse
@@ -34289,7 +34778,7 @@ width:\LWR@printlength{\LWR@tempwidth}%
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{a4}
+\LWR@ProvidesPackageDrop{a4}[2004/04/15]
% \end{macrocode}
%
% \begin{macrocode}
@@ -34320,7 +34809,7 @@ width:\LWR@printlength{\LWR@tempwidth}%
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{a4wide}
+\LWR@ProvidesPackageDrop{a4wide}[1994/08/30]
% \end{macrocode}
%
%
@@ -34390,7 +34879,7 @@ width:\LWR@printlength{\LWR@tempwidth}%
%
% Accept all options for \pkg{lwarp-abstract}:
% \begin{macrocode}
-\LWR@ProvidesPackagePass{abstract}
+\LWR@ProvidesPackagePass{abstract}[2009/06/08]
% \end{macrocode}
@@ -34512,7 +35001,7 @@ width:\LWR@printlength{\LWR@tempwidth}%
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{accsupp}
+\LWR@ProvidesPackageDrop{accsupp}[2018/03/28]
% \end{macrocode}
%
% \begin{macrocode}
@@ -34544,7 +35033,7 @@ width:\LWR@printlength{\LWR@tempwidth}%
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackagePass{acro}
+\LWR@ProvidesPackagePass{acro}[2017/01/30]
% \end{macrocode}
@@ -34648,7 +35137,7 @@ width:\LWR@printlength{\LWR@tempwidth}%
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackagePass{acronym}
+\LWR@ProvidesPackagePass{acronym}[2015/03/21]
% \end{macrocode}
% Uses \cs{textit} instead of \cs{itshape}:
@@ -34666,46 +35155,36 @@ width:\LWR@printlength{\LWR@tempwidth}%
% }
% \end{macrocode}
-% Modified for \pkg{cleveref} and \pkg{zref}:
+% Fix for acronym labels in the captions of floats.
+% \changes{v0.66}{2019/01/28}{\pkg{acronym}: Fix for acronym in caption.}
+% \begin{macrocode}
+\renewcommand{\@starttoc}[1]{
+\LWR@htmlelementclass{nav}{#1}
+\LetLtxMacro\@verridelabel\@gobble
+\LWR@orig@starttoc{#1}
+\LWR@htmlelementclassend{nav}{#1}
+}
+% \end{macrocode}
+
+
+% Modified for \pkg{cleveref} and \pkg{lwarp}:
+% \changes{v0.66}{2019/01/27}{\pkg{acronym}: No longer uses \pkg{zref}.}
% \begin{macrocode}
\renewcommand*\AC@und@newl@bel[3]{%
\@ifundefined{#1@#3}%
{%
\global\expandafter\let\csname#2@#3\endcsname\@nnil
+ \global\expandafter\let\csname#2@#3@lwarp\endcsname\@nnil% lwarp
\global\expandafter\let\csname#2@#3@cref\endcsname\@nnil% lwarp
}%
{%
\global\expandafter\let\csname#1@#3\endcsname\relax
+ \global\expandafter\let\csname#1@#3@lwarp\endcsname\relax% lwarp
\global\expandafter\let\csname#1@#3@cref\endcsname\relax% lwarp
- \global\expandafter\let\csname Z@R@#3\endcsname\relax% lwarp
}%
}%
% \end{macrocode}
-% Modified for \pkg{cleveref} and \pkg{zref}:
-% \begin{macrocode}
-\renewcommand*\AC@testdef[3]{%
-\ifstrequal{#1}{Z@R}{}{% lwarp
- \@ifundefined{s@#2}\@secondoftwo\@firstofone
- {%
- \expandafter\ifx\csname s@#2\endcsname\empty
- \expandafter\@firstofone
- \else
- \expandafter\xdef\csname s@#2\endcsname{%
- \expandafter\expandafter
- \expandafter\@gobble
- \csname s@#2\endcsname
- }%
- \expandafter\@gobble
- \fi
- }%
- {%
- \@testdef{#1}{#2}{#3}%
- }%
-}% lwarp
-}%
-% \end{macrocode}
-
% \iffalse
%</acronym>
% \fi
@@ -34737,7 +35216,7 @@ width:\LWR@printlength{\LWR@tempwidth}%
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{adjmulticol}
+\LWR@ProvidesPackageDrop{adjmulticol}[2012/01/20]
% \end{macrocode}
%
% \begin{macrocode}
@@ -34844,7 +35323,7 @@ width:\LWR@printlength{\LWR@tempwidth}%
%
% Discard all options for \pkg{lwarp-afterpage}:
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{afterpage}
+\LWR@ProvidesPackageDrop{afterpage}[2014/10/28]
% \end{macrocode}
%
% \begin{macrocode}
@@ -34880,7 +35359,7 @@ width:\LWR@printlength{\LWR@tempwidth}%
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackagePass{algorithm2e}
+\LWR@ProvidesPackagePass{algorithm2e}[2017/07/18]
% \end{macrocode}
% For the list-of entries:
@@ -35121,7 +35600,7 @@ width:\LWR@printlength{\LWR@tempwidth}%
%
% \codehtml
% \begin{macrocode}
-\LWR@ProvidesPackagePass{algorithmicx}
+\LWR@ProvidesPackagePass{algorithmicx}[2005/04/27]
% \end{macrocode}
%
%
@@ -35199,7 +35678,7 @@ span style="width:\LWR@printlength{\ALG@thistlm}; display:inline-block;"%
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackagePass{alltt}
+\LWR@ProvidesPackagePass{alltt}[1997/06/16]
% \end{macrocode}
%
% \begin{macrocode}
@@ -35242,7 +35721,7 @@ span style="width:\LWR@printlength{\ALG@thistlm}; display:inline-block;"%
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackagePass{amsmath}
+\LWR@ProvidesPackagePass{amsmath}[2017/09/02]
% \end{macrocode}
%
% Patches to allow \cs{eqref} inside a caption:
@@ -35663,7 +36142,7 @@ span style="width:\LWR@printlength{\ALG@thistlm}; display:inline-block;"%
% \end{macrocode}
%
% \begin{macrocode}
-\LWR@ProvidesPackagePass{amsthm}
+\LWR@ProvidesPackagePass{amsthm}[2017/10/31]
% \end{macrocode}
% Storage for the style being used for new theorems:
@@ -35876,7 +36355,7 @@ span style="width:\LWR@printlength{\ALG@thistlm}; display:inline-block;"%
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{anonchap}
+\LWR@ProvidesPackageDrop{anonchap}[2009/08/03]
% \end{macrocode}
%
% \begin{macrocode}
@@ -35917,7 +36396,7 @@ span style="width:\LWR@printlength{\ALG@thistlm}; display:inline-block;"%
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{anysize}
+\LWR@ProvidesPackageDrop{anysize}[1994/08/13]
% \end{macrocode}
%
% \begin{macrocode}
@@ -35954,7 +36433,7 @@ span style="width:\LWR@printlength{\ALG@thistlm}; display:inline-block;"%
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackagePass{appendix}
+\LWR@ProvidesPackagePass{appendix}[2009/09/02]
% \end{macrocode}
%
% \begin{macrocode}
@@ -35982,6 +36461,110 @@ span style="width:\LWR@printlength{\ALG@thistlm}; display:inline-block;"%
%
%
% \iffalse
+%<*ar>
+% \fi
+%
+% \part{lwarp-ar.sty}
+%
+% \section{ar}
+%
+% \credits{Agostino De Marco}
+%
+% \DescribePackage{ar}
+% \pkg{ar} is patched for use by \pkg{lwarp}.
+%
+% \changes{v0.66}{2018/12/31}{\pkg{ar}: Added.}
+%
+% \codehtml
+%
+% \begin{macrocode}
+\LWR@ProvidesPackagePass{ar}[2012/01/23]
+% \end{macrocode}
+%
+% Measure and print the width of the supplied glyph.
+% \begin{macrocode}
+\newlength{\LWR@ar@width}
+
+\newcommand*{\LWR@ar@printwidth}[1]{%
+ \setlength{\LWR@ar@width}{\widthof{#1}}%
+ width:%
+ \LWR@convertto{em}{\the\LWR@ar@width}em%
+}
+% \end{macrocode}
+%
+% The \HTML\ version of \cs{AR}:
+% \begin{macrocode}
+\newrobustcmd*{\LWR@HTML@AR}{%
+% \end{macrocode}
+% Start a hashed \env{lateximage}, additionally hashed by the font series,
+% with a width depending on the given glyph:
+% \begin{macrocode}
+ \begin{lateximage}*[AR][\LWR@f@series][\LWR@ar@printwidth{\LWR@print@AR}]%
+% \end{macrocode}
+% For text mode, set the font series according to the \HTML\ font series:
+% \begin{macrocode}
+ \ifmmode\else\csuse{LWR@orig\LWR@f@series series}\fi%
+% \end{macrocode}
+% Print the original glyph using the newly set font series:
+% \begin{macrocode}
+ \LWR@print@AR%
+% \end{macrocode}
+% Done.
+% \begin{macrocode}
+ \end{lateximage}%
+}
+% \end{macrocode}
+%
+% Combine the print and \HTML\ versions:
+% \begin{macrocode}
+\LWR@formatted{AR}
+% \end{macrocode}
+%
+% \begin{macrocode}
+\newrobustcmd*{\LWR@HTML@ARb}{%
+ \begin{lateximage}*[AR][b][\LWR@ar@printwidth{\LWR@print@ARb}]%
+ \LWR@print@ARb%
+ \end{lateximage}%
+}
+\LWR@formatted{ARb}
+% \end{macrocode}
+%
+% \begin{macrocode}
+\newrobustcmd*{\LWR@HTML@ARss}{%
+ \begin{lateximage}*[ARss][\LWR@f@series][\LWR@ar@printwidth{\LWR@print@ARss}]%
+ \ifmmode\else\csuse{LWR@orig\LWR@f@series series}\fi%
+ \LWR@print@ARss%
+ \end{lateximage}%
+}
+\LWR@formatted{ARss}
+% \end{macrocode}
+%
+% \begin{macrocode}
+\newrobustcmd*{\LWR@HTML@ARssb}{%
+ \begin{lateximage}*[AR][ssb][\LWR@ar@printwidth{\LWR@print@ARssb}]%
+ \LWR@print@ARssb%
+ \end{lateximage}%
+}
+\LWR@formatted{ARssb}
+% \end{macrocode}
+%
+% \begin{macrocode}
+\newrobustcmd*{\LWR@HTML@ARtt}{%
+ \begin{lateximage}*[AR][tt][\LWR@ar@printwidth{\LWR@print@ARtt}]%
+ \LWR@print@ARtt%
+ \end{lateximage}%
+}
+\LWR@formatted{ARtt}
+% \end{macrocode}
+%
+% \iffalse
+%</ar>
+% \fi
+%
+%
+%
+%
+% \iffalse
%<*arabicfront>
% \fi
%
@@ -35997,7 +36580,7 @@ span style="width:\LWR@printlength{\ALG@thistlm}; display:inline-block;"%
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{arabicfront}
+\LWR@ProvidesPackageDrop{arabicfront}[2006/09/03]
% \end{macrocode}
%
%
@@ -36033,7 +36616,7 @@ span style="width:\LWR@printlength{\ALG@thistlm}; display:inline-block;"%
\let\firsthline\relax
\let\lasthline\relax
-\LWR@ProvidesPackagePass{array}
+\LWR@ProvidesPackagePass{array}[2018/12/30]
% \end{macrocode}
%
% \begin{macrocode}
@@ -36083,7 +36666,7 @@ span style="width:\LWR@printlength{\ALG@thistlm}; display:inline-block;"%
\RequirePackage{array}
% \end{macrocode}
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{arydshln}
+\LWR@ProvidesPackageDrop{arydshln}[2018/09/26]
% \end{macrocode}
%
% Ignored, but included for source compatibility:
@@ -36201,7 +36784,7 @@ span style="width:\LWR@printlength{\ALG@thistlm}; display:inline-block;"%
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackagePass{asymptote}
+\LWR@ProvidesPackagePass{asymptote}[2016/11/26]
% \end{macrocode}
%
% \begin{macrocode}
@@ -36294,7 +36877,7 @@ span style="width:\LWR@printlength{\ALG@thistlm}; display:inline-block;"%
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackagePass{attachfile}
+\LWR@ProvidesPackagePass{attachfile}[2016/09/18]
% \end{macrocode}
%
% Encloses each icon:
@@ -36376,7 +36959,7 @@ span style="width:\LWR@printlength{\ALG@thistlm}; display:inline-block;"%
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackagePass{attachfile2}
+\LWR@ProvidesPackagePass{attachfile2}[2016/05/16]
% \end{macrocode}
%
% Adds memory of the selected color:
@@ -36524,7 +37107,7 @@ span style="width:\LWR@printlength{\ALG@thistlm}; display:inline-block;"%
%
% Load \pkg{authblk}:
% \begin{macrocode}
-\LWR@ProvidesPackagePass{authblk}
+\LWR@ProvidesPackagePass{authblk}[2001/02/27]
% \end{macrocode}
%
% Patch to add a class for the affiliation:
@@ -36595,7 +37178,7 @@ span style="width:\LWR@printlength{\ALG@thistlm}; display:inline-block;"%
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackagePass{axodraw2}
+\LWR@ProvidesPackagePass{axodraw2}[2018/02/15]
% \end{macrocode}
% \begin{macrocode}
@@ -36635,7 +37218,7 @@ span style="width:\LWR@printlength{\ALG@thistlm}; display:inline-block;"%
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackagePass{backref}
+\LWR@ProvidesPackagePass{backref}[2016/05/21]
% \end{macrocode}
% Force the \optn{hyperref} option:
@@ -36670,7 +37253,7 @@ span style="width:\LWR@printlength{\ALG@thistlm}; display:inline-block;"%
%
% Discard all options for \pkg{lwarp-balance}:
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{balance}
+\LWR@ProvidesPackageDrop{balance}[1999/02/23]
% \end{macrocode}
%
%
@@ -36727,7 +37310,7 @@ span style="width:\LWR@printlength{\ALG@thistlm}; display:inline-block;"%
% \end{macrocode}
%
% \begin{macrocode}
-\LWR@ProvidesPackagePass{biblatex}
+\LWR@ProvidesPackagePass{biblatex}[2018/03/04]
% \end{macrocode}
%
%
@@ -36755,7 +37338,7 @@ span style="width:\LWR@printlength{\ALG@thistlm}; display:inline-block;"%
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackagePass{bibunits}
+\LWR@ProvidesPackagePass{bibunits}[2004/05/12]
% \end{macrocode}
% \begin{macrocode}
@@ -36806,7 +37389,7 @@ span style="width:\LWR@printlength{\ALG@thistlm}; display:inline-block;"%
%
% Next, load the package's new definitions:
% \begin{macrocode}
-\LWR@ProvidesPackagePass{bigdelim}
+\LWR@ProvidesPackagePass{bigdelim}[2018/08/03]
% \end{macrocode}
%
%
@@ -36855,7 +37438,7 @@ span style="width:\LWR@printlength{\ALG@thistlm}; display:inline-block;"%
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackagePass{bigstrut}
+\LWR@ProvidesPackagePass{bigstrut}[2018/08/03]
% \end{macrocode}
%
% \begin{macrocode}
@@ -36895,7 +37478,7 @@ span style="width:\LWR@printlength{\ALG@thistlm}; display:inline-block;"%
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackagePass{bitpattern}
+\LWR@ProvidesPackagePass{bitpattern}[2015/12/11]
% \end{macrocode}
%
% \begin{macrocode}
@@ -36935,7 +37518,7 @@ span style="width:\LWR@printlength{\ALG@thistlm}; display:inline-block;"%
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{blowup}
+\LWR@ProvidesPackageDrop{blowup}[2018/01/02]
% \end{macrocode}
%
% \begin{macrocode}
@@ -37016,7 +37599,7 @@ span style="width:\LWR@printlength{\ALG@thistlm}; display:inline-block;"%
%
% Discard all options for \pkg{lwarp-bookmark}:
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{bookmark}
+\LWR@ProvidesPackageDrop{bookmark}[2016/05/17]
% \end{macrocode}
%
% \begin{macrocode}
@@ -37064,7 +37647,7 @@ span style="width:\LWR@printlength{\ALG@thistlm}; display:inline-block;"%
\LetLtxMacro\morecmidrules\relax
\LetLtxMacro\specialrule\relax
-\LWR@ProvidesPackagePass{booktabs}
+\LWR@ProvidesPackagePass{booktabs}[2016/04/27]
% \end{macrocode}
%
% \changes{v0.41}{2017/10/03}{Improved rules.}
@@ -37153,7 +37736,7 @@ span style="width:\LWR@printlength{\ALG@thistlm}; display:inline-block;"%
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{bophook}
+\LWR@ProvidesPackageDrop{bophook}[2001/03/29]
% \end{macrocode}
%
% \begin{macrocode}
@@ -37184,7 +37767,7 @@ span style="width:\LWR@printlength{\ALG@thistlm}; display:inline-block;"%
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{bounddvi}
+\LWR@ProvidesPackageDrop{bounddvi}[2016/12/28]
% \end{macrocode}
%
% \iffalse
@@ -37213,7 +37796,7 @@ span style="width:\LWR@printlength{\ALG@thistlm}; display:inline-block;"%
%
% Discard all options for \pkg{lwarp-boxedminipage2e}:
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{boxedminipage2e}
+\LWR@ProvidesPackageDrop{boxedminipage2e}[2015/03/09]
% \end{macrocode}
% \begin{macrocode}
@@ -37248,14 +37831,14 @@ span style="width:\LWR@printlength{\ALG@thistlm}; display:inline-block;"%
% \pkg{breakurl} is emulated.
%
% \changes{v0.43}{2017/10/31}{\pkg{breakurl}: Added.}
-% \changes{v0.45}{2017/12/29}{\pkg{breakurl}: Fix: Underscore in \acro{URL}.}
-% \changes{v0.52}{2018/03/26}{\pkg{breakurl}: Fix: \progcode{\#}, \progcode{\%}, \progcode{\&}, \progcode{\~}, \progcode{\_} in \acro{URL}.}
+% \changes{v0.45}{2017/12/29}{\pkg{breakurl}: Fix: Underscore in \URL.}
+% \changes{v0.52}{2018/03/26}{\pkg{breakurl}: Fix: \progcode{\#}, \progcode{\%}, \progcode{\&}, \progcode{\~}, \progcode{\_} in \URL.}
% \changes{v0.57}{2018/06/05}{\pkg{breakurl}: Fix: Text catcodes.}
%
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{breakurl}
+\LWR@ProvidesPackageDrop{breakurl}[2013/04/10]
% \end{macrocode}
%
% \begin{macrocode}
@@ -37313,7 +37896,7 @@ span style="width:\LWR@printlength{\ALG@thistlm}; display:inline-block;"%
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackagePass{breqn}
+\LWR@ProvidesPackagePass{breqn}[2017/01/27]
% \end{macrocode}
%
% \begin{macrocode}
@@ -37437,7 +38020,7 @@ span style="width:\LWR@printlength{\ALG@thistlm}; display:inline-block;"%
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{bxpapersize}
+\LWR@ProvidesPackageDrop{bxpapersize}[2017/10/08]
% \end{macrocode}
%
% \begin{macrocode}
@@ -37470,7 +38053,7 @@ span style="width:\LWR@printlength{\ALG@thistlm}; display:inline-block;"%
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackagePass{bytefield}
+\LWR@ProvidesPackagePass{bytefield}[2017/09/15]
% \end{macrocode}
% \begin{macrocode}
@@ -37502,7 +38085,7 @@ span style="width:\LWR@printlength{\ALG@thistlm}; display:inline-block;"%
%
% \begin{macrocode}
\LWR@origRequirePackage{lwarp-xcolor}% for \convertcolorspec
-\LWR@ProvidesPackagePass{cancel}
+\LWR@ProvidesPackagePass{cancel}[2013/04/12]
% \end{macrocode}
%
%
@@ -37576,7 +38159,7 @@ span style="width:\LWR@printlength{\ALG@thistlm}; display:inline-block;"%
% \codehtml
s%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{canoniclayout}
+\LWR@ProvidesPackageDrop{canoniclayout}[2011/11/05]
% \end{macrocode}
%
% \begin{macrocode}
@@ -37609,7 +38192,7 @@ s%
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackagePass{caption}
+\LWR@ProvidesPackagePass{caption}[2018/10/05]
% \end{macrocode}
% \begin{macrocode}
@@ -37804,7 +38387,7 @@ s%
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackagePass{cases}
+\LWR@ProvidesPackagePass{cases}[2002/05/02]
% \end{macrocode}
%
% \begin{macrocode}
@@ -37896,7 +38479,7 @@ s%
%
% Discard all options for \pkg{lwarp-changepage}:
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{changepage}
+\LWR@ProvidesPackageDrop{changepage}[2009/10/20]
% \end{macrocode}
% \begin{macrocode}
@@ -37929,39 +38512,6 @@ s%
%
%
% \iffalse
-%<*chngpage>
-% \fi
-
-% \part{lwarp-chngpage.sty}
-
-% \section{chngpage}
-%
-% \credits{Peter Wilson}
-%
-% \DescribePackage{chngpage}
-% \pkg{chngpage} is emulated.
-%
-% \changes{v0.54}{2018/04/19}{\pkg{chngpage}: Added.}
-% \changes{v0.62}{2018/10/18}{\pkg{chngpage}: Fix: Loads \pkg{lwarp-chngpage}.}
-%
-% \codehtml
-%
-% Discard all options for \pkg{lwarp-chngpage}:
-% \begin{macrocode}
-\LWR@ProvidesPackageDrop{chngpage}
-\LWR@origRequirePackage{lwarp-changepage}
-% \end{macrocode}
-
-% \iffalse
-%</chngpage>
-% \fi
-%
-%
-%
-%
-%
-%
-% \iffalse
%<*chappg>
% \fi
%
@@ -37979,7 +38529,7 @@ s%
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{chappg}
+\LWR@ProvidesPackageDrop{chappg}[2006/05/09]
% \end{macrocode}
%
% \begin{macrocode}
@@ -38012,7 +38562,7 @@ s%
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackagePass{chapterbib}
+\LWR@ProvidesPackagePass{chapterbib}[2010/09/18]
% \end{macrocode}
% \begin{macrocode}
@@ -38100,6 +38650,8 @@ s%
%
%
%
+%
+%
% \iffalse
%<*chemformula>
% \fi
@@ -38476,7 +39028,7 @@ s%
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackagePass{chemmacros}
+\LWR@ProvidesPackagePass{chemmacros}[2017/08/28]
% \end{macrocode}
%
% SVG file hashing assumes that the relevent options are constant for the entire document.
@@ -39532,7 +40084,7 @@ name = \chemmacros_translate:n {scheme-name}
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackagePass{chemnum}
+\LWR@ProvidesPackagePass{chemnum}[2016/04/14]
% \end{macrocode}
% \begin{macrocode}
@@ -39606,6 +40158,37 @@ name = \chemmacros_translate:n {scheme-name}
%
%
%
+%
+% \iffalse
+%<*chngpage>
+% \fi
+
+% \part{lwarp-chngpage.sty}
+
+% \section{chngpage}
+%
+% \credits{Peter Wilson}
+%
+% \DescribePackage{chngpage}
+% \pkg{chngpage} is emulated.
+%
+% \changes{v0.54}{2018/04/19}{\pkg{chngpage}: Added.}
+% \changes{v0.62}{2018/10/18}{\pkg{chngpage}: Fix: Loads \pkg{lwarp-chngpage}.}
+%
+% \codehtml
+%
+% Discard all options for \pkg{lwarp-chngpage}:
+% \begin{macrocode}
+\LWR@ProvidesPackageDrop{chngpage}[2009/10/20]
+\LWR@origRequirePackage{lwarp-changepage}
+% \end{macrocode}
+
+% \iffalse
+%</chngpage>
+% \fi
+%
+%
+%
% \iffalse
%<*cite>
% \fi
@@ -39624,7 +40207,7 @@ name = \chemmacros_translate:n {scheme-name}
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackagePass{cite}
+\LWR@ProvidesPackagePass{cite}[2015/02/27]
% \end{macrocode}
% For the [super] option, the \cs{kern} must be removed:
@@ -39669,7 +40252,7 @@ name = \chemmacros_translate:n {scheme-name}
\LWR@loadnever{CJK}{ctex, xeCJK}
}
-\LWR@ProvidesPackagePass{CJK}
+\LWR@ProvidesPackagePass{CJK}[2015/04/18]
% \end{macrocode}
%
% \iffalse
@@ -39698,7 +40281,7 @@ name = \chemmacros_translate:n {scheme-name}
\LWR@loadnever{CJKutf8}{ctex, xeCJK}
}
-\LWR@ProvidesPackagePass{CJKutf8}
+\LWR@ProvidesPackagePass{CJKutf8}[2015/04/18]
% \end{macrocode}
%
% \iffalse
@@ -39724,7 +40307,7 @@ name = \chemmacros_translate:n {scheme-name}
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{clrdblpg}
+\LWR@ProvidesPackageDrop{clrdblpg}[2018/04/21]
% \end{macrocode}
%
% \iffalse
@@ -39784,7 +40367,7 @@ name = \chemmacros_translate:n {scheme-name}
%
% \codehtml
% \begin{macrocode}
-\LWR@ProvidesPackagePass{color}
+\LWR@ProvidesPackagePass{color}[2016/07/10]
\RequirePackage{xcolor}
% \end{macrocode}
%
@@ -39817,7 +40400,7 @@ name = \chemmacros_translate:n {scheme-name}
% \begin{macrocode}
\let\rowcolor\relax
-\LWR@ProvidesPackagePass{colortbl}
+\LWR@ProvidesPackagePass{colortbl}[2018/12/12]
% \end{macrocode}
%
%
@@ -39944,7 +40527,7 @@ name = \chemmacros_translate:n {scheme-name}
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{continue}
+\LWR@ProvidesPackageDrop{continue}}[2018/12/09]
% \end{macrocode}
%
% \begin{macrocode}
@@ -39988,7 +40571,7 @@ name = \chemmacros_translate:n {scheme-name}
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{copyrightbox}
+\LWR@ProvidesPackageDrop{copyrightbox}[2011/11/27]
% \end{macrocode}
%
% \begin{macrocode}
@@ -40035,7 +40618,7 @@ name = \chemmacros_translate:n {scheme-name}
%
% Discard all options for \pkg{lwarp-crop}:
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{crop}
+\LWR@ProvidesPackageDrop{crop}[2003/05/20]
% \end{macrocode}
%
% \begin{macrocode}
@@ -40069,7 +40652,7 @@ name = \chemmacros_translate:n {scheme-name}
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{cuted}
+\LWR@ProvidesPackageDrop{cuted}[2012/10/04]
% \end{macrocode}
%
% \begin{macrocode}
@@ -40105,7 +40688,7 @@ name = \chemmacros_translate:n {scheme-name}
%
% Discard all options for \pkg{lwarp-cutwin}:
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{cutwin}
+\LWR@ProvidesPackageDrop{cutwin}[2010/09/29]
% \end{macrocode}
%
% \begin{macrocode}
@@ -40161,7 +40744,7 @@ name = \chemmacros_translate:n {scheme-name}
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{dblfloatfix}
+\LWR@ProvidesPackageDrop{dblfloatfix}[2012/12/31]
% \end{macrocode}
%
% \iffalse
@@ -40189,7 +40772,7 @@ name = \chemmacros_translate:n {scheme-name}
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{dblfnote}
+\LWR@ProvidesPackageDrop{dblfnote}[1999/07/14]
% \end{macrocode}
%
% \begin{macrocode}
@@ -40226,7 +40809,7 @@ name = \chemmacros_translate:n {scheme-name}
% \pkg{dcolumn} is emulated by the \pkg{lwarp} core.
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{dcolumn}
+\LWR@ProvidesPackageDrop{dcolumn}[2014/10/28]
% \end{macrocode}
%
% \iffalse
@@ -40254,7 +40837,7 @@ name = \chemmacros_translate:n {scheme-name}
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackagePass{diagbox}
+\LWR@ProvidesPackagePass{diagbox}[2016/12/28]
% \end{macrocode}
%
% To restore print-mode inside a \env{lateximage}:
@@ -40394,7 +40977,7 @@ name = \chemmacros_translate:n {scheme-name}
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{draftcopy}
+\LWR@ProvidesPackageDrop{draftcopy}[2002/02/25]
% \end{macrocode}
%
% \begin{macrocode}
@@ -40476,7 +41059,7 @@ name = \chemmacros_translate:n {scheme-name}
% \codehtml
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{draftwatermark}
+\LWR@ProvidesPackageDrop{draftwatermark}[2015/02/19]
% \end{macrocode}
% \begin{macrocode}
@@ -40516,7 +41099,7 @@ name = \chemmacros_translate:n {scheme-name}
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackagePass{easy-todo}
+\LWR@ProvidesPackagePass{easy-todo}[2014/01/01]
% \end{macrocode}
% \begin{noindmacro}{\listoftodos}
@@ -40605,6 +41188,60 @@ name = \chemmacros_translate:n {scheme-name}
%
%
% \iffalse
+%<*ed>
+% \fi
+%
+% \part{lwarp-ed.sty}
+%
+% \section{ed}
+%
+% \credits{Michael Kohlhase}
+%
+% \DescribePackage{ed}
+% \pkg{ed} is patched for use by \pkg{lwarp}.
+%
+% \changes{v0.66}{2019/02/05}{\pkg{ed}: Added.}
+%
+% \codehtml
+%
+% \begin{macrocode}
+\LWR@ProvidesPackagePass{ed}[2012/01/29]
+% \end{macrocode}
+%
+% Bugs:
+% \begin{enumerate}
+% \item \env{todolist} fails with the \optn{hide} option, as does \cs{edexplanation}.
+% \item \cs{edstubURI} is actually \cs{edstuURI}.
+% \end{enumerate}
+%
+% \begin{macrocode}
+\RequirePackage{xcolor}
+
+\renewenvironment{edstub}[2][The following blue text]
+{%
+ \def\@test{#1}%
+ \begin{center}%
+ \huge%
+ \textcolor{red}{%
+ #1 is only a provisional stub\\\Large
+ the Office document
+ \ifx\ed@stubURI\@empty{#2}\else\href{\ed@stubURI}{#2}\fi\
+ contains more text\\which will be merged for the final document%
+ }%
+ \end{center}%
+ \BlockClass[color:blue]{edstub}%
+}
+{\endBlockClass}
+% \end{macrocode}
+%
+% \iffalse
+%</ed>
+% \fi
+%
+%
+%
+%
+% \iffalse
%<*ellipsis>
% \fi
@@ -40622,7 +41259,7 @@ name = \chemmacros_translate:n {scheme-name}
% \pkg{ellipsis} is emulated.
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{ellipsis}
+\LWR@ProvidesPackageDrop{ellipsis}[2004/09/28]
\newcommand{\ellipsisgap}{0.1em}
@@ -40655,7 +41292,7 @@ name = \chemmacros_translate:n {scheme-name}
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackagePass{embrac}
+\LWR@ProvidesPackagePass{embrac}[2017/07/04]
% \end{macrocode}
%
% \begin{macrocode}
@@ -40715,7 +41352,7 @@ name = \chemmacros_translate:n {scheme-name}
%
% Discard all options for \pkg{lwarp-emptypage}:
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{emptypage}
+\LWR@ProvidesPackageDrop{emptypage}[2010/05/30]
% \end{macrocode}
% \iffalse
@@ -40744,7 +41381,7 @@ name = \chemmacros_translate:n {scheme-name}
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{endfloat}
+\LWR@ProvidesPackageDrop{endfloat}[2018/03/24]
% \end{macrocode}
%
% \begin{macrocode}
@@ -40789,7 +41426,7 @@ name = \chemmacros_translate:n {scheme-name}
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{endheads}
+\LWR@ProvidesPackageDrop{endheads}[2017/04/06]
% \end{macrocode}
%
% \begin{macrocode}
@@ -40896,7 +41533,7 @@ name = \chemmacros_translate:n {scheme-name}
%
% \codehtml
% \begin{macrocode}
-\LWR@ProvidesPackagePass{enumerate}
+\LWR@ProvidesPackagePass{enumerate}[2015/07/23]
% \end{macrocode}
%
%
@@ -40925,11 +41562,11 @@ name = \chemmacros_translate:n {scheme-name}
% \pkg{enumitem} is supported with minor adjustments.
%
% \changes{v0.34}{2017/07/27}{\pkg{enumitem}: Added, no longer required.}
-% \changes{v0.63}{2018/12/02}{\pkg{emumitem}: Nullifiy \cs{DrawEnumitemLabel}.}
+% \changes{v0.63}{2018/12/02}{\pkg{emumitem}: v3.6: Nullifiy \cs{DrawEnumitemLabel}.}
%
% \codehtml
% \begin{macrocode}
-\LWR@ProvidesPackagePass{enumitem}
+\LWR@ProvidesPackagePass{enumitem}[2018/11/30]
% \end{macrocode}
%
%
@@ -40993,7 +41630,7 @@ name = \chemmacros_translate:n {scheme-name}
% \codehtml
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{epigraph}
+\LWR@ProvidesPackageDrop{epigraph}[2009/09/02]
% \end{macrocode}
% \begin{macrocode}
@@ -41128,7 +41765,7 @@ name = \chemmacros_translate:n {scheme-name}
% \section{epstopdf}
%
% \DescribePackage{epstopdf}
-% Previous versions of \pkg{lwarp} had a nullfied verison, but
+% Previous versions of \pkg{lwarp} had a nullfied version, but
% now \pkg{epstopdf-base} is supported.
% \pkg{lwarp-epstopdf} becomes a placeholder to overwrite
% previous versions.
@@ -41331,7 +41968,7 @@ name = \chemmacros_translate:n {scheme-name}
% \codehtml
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{eso-pic}
+\LWR@ProvidesPackageDrop{eso-pic}[2018/04/12]
% \end{macrocode}
% \begin{macrocode}
@@ -41382,7 +42019,7 @@ name = \chemmacros_translate:n {scheme-name}
% \codehtml
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{everypage}
+\LWR@ProvidesPackageDrop{everypage}[2007/06/20]
% \end{macrocode}
% \begin{macrocode}
@@ -41415,7 +42052,7 @@ name = \chemmacros_translate:n {scheme-name}
%
% Discard all options for \pkg{lwarp-everyshi}:
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{everyshi}
+\LWR@ProvidesPackageDrop{everyshi}[2001/05/15]
% \end{macrocode}
%
% \begin{macrocode}
@@ -41444,12 +42081,13 @@ name = \chemmacros_translate:n {scheme-name}
% \pkg{extramarks} is emulated.
%
% \changes{v0.20}{2017/01/11}{\pkg{extramarks}: Added.}
+% \changes{v0.66}{2019/02/02}{\pkg{extramarks}: Updated to v3.10.}
%
% \codehtml
%
% Discard all options for \pkg{lwarp-extramarks}:
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{extramarks}
+\LWR@ProvidesPackageDrop{extramarks}[2019/01/31]
% \end{macrocode}
% \begin{macrocode}
@@ -41462,8 +42100,11 @@ name = \chemmacros_translate:n {scheme-name}
\newcommand*{\lastxmark}{}
\newcommand*{\topxmark}{}
\newcommand*{\topleftxmark}{}
+\newcommand*{\toprightxmark}{}
\newcommand*{\firstleftmark}{}
\newcommand*{\lastrightmark}{}
+\newcommand*{\firstrightmark}{}
+\newcommand*{\lastleftmark}{}
% \end{macrocode}
% \iffalse
@@ -41498,7 +42139,7 @@ name = \chemmacros_translate:n {scheme-name}
% \changes{v0.52}{2018/03/29}{\pkg{fancyvrb}: Initial support for \cs{VerbatimFootnotes}.}
%
% \begin{macrocode}
-\LWR@ProvidesPackagePass{fancybox}
+\LWR@ProvidesPackagePass{fancybox}[2010/05/15]
% \end{macrocode}
%
% After the preamble is loaded, after any patches to \env{Verbatim}:
@@ -41540,13 +42181,14 @@ name = \chemmacros_translate:n {scheme-name}
\renewrobustcmd{\textsuperscript}[1]{\LWR@htmlspan{sup}{##1}}%
% \end{macrocode}
% Use paragraph tags if in a tabular data cell or a \env{lateximage}:
+% \changes{v0.66}{2019/02/02}{Improved \HTML\ formatting.}
% \begin{macrocode}
\ifthenelse{%
\boolean{LWR@doingstartpars} \AND%
\cnttest{\value{LWR@lateximagedepth}}{=}{0}%
}%
{}%
- {\LWR@htmltagc{\LWR@tagregularparagraph}}%
+ {\LWR@htmltagc{\LWR@tagregularparagraph}\LWR@orignewline}%
% \end{macrocode}
% Append the footnote to the list:
% \begin{macrocode}
@@ -41762,12 +42404,13 @@ name = \chemmacros_translate:n {scheme-name}
%
% \changes{v0.20}{2017/01/11}{\pkg{fancyhdr}: Added.}
% \changes{v0.33}{2017/06/18}{\pkg{fancyhdr}: Fix: Optional args for \cs{lhead}, etc.}
+% \changes{v0.66}{2019/02/02}{\pkg{fancyhdr}: Updated to v3.10.}
%
% \codehtml
%
% Discard all options for \pkg{lwarp-fancyhdr}:
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{fancyhdr}
+\LWR@ProvidesPackageDrop{fancyhdr}[2019/01/31]
% \end{macrocode}
% \begin{macrocode}
@@ -41783,12 +42426,16 @@ name = \chemmacros_translate:n {scheme-name}
\newcommand*{\rfoot}[2][]{}
\newcommand*{\headrulewidth}{}
\newcommand*{\footrulewidth}{}
+\newcommand*{\headrule}{}
+\newcommand*{\footrule}{}
+\newlength{\headwidth}
\newcommand*{\fancyheadoffset}[2][]{}
\newcommand*{\fancyfootoffset}[2][]{}
\newcommand*{\fancyhfoffset}[2][]{}
\newcommand*{\iffloatpage}[2]{#2}
\newcommand*{\ifftopfloat}[2]{#2}
\newcommand*{\iffbotfloat}[2]{#2}
+\newcommand*{\iffootnote}[2]{#2}
% \end{macrocode}
% \iffalse
@@ -41815,7 +42462,7 @@ name = \chemmacros_translate:n {scheme-name}
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackagePass{fancyref}
+\LWR@ProvidesPackagePass{fancyref}[1999/02/03]
% \end{macrocode}
%
% To remove the \optn{margin} option, if \cs{fancyrefhook} is anything
@@ -41885,7 +42532,7 @@ name = \chemmacros_translate:n {scheme-name}
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{fancytabs}
+\LWR@ProvidesPackageDrop{fancytabs}[2016/03/29]
% \end{macrocode}
%
% \begin{macrocode}
@@ -41937,7 +42584,7 @@ name = \chemmacros_translate:n {scheme-name}
% \begin{macrocode}
\RequirePackage{xcolor}% for \convertcolorspec
-\LWR@ProvidesPackagePass{fancyvrb}
+\LWR@ProvidesPackagePass{fancyvrb}[2008/02/07]
% \end{macrocode}
%
% Initial default patch for fancyvrb:
@@ -41986,13 +42633,14 @@ name = \chemmacros_translate:n {scheme-name}
\renewrobustcmd{\textsuperscript}[1]{\LWR@htmlspan{sup}{##1}}%
% \end{macrocode}
% Use paragraph tags if in a tabular data cell or a \env{lateximage}:
+% \changes{v0.66}{2019/02/02}{Improved \HTML\ formatting.}
% \begin{macrocode}
\ifthenelse{%
\boolean{LWR@doingstartpars} \AND%
\cnttest{\value{LWR@lateximagedepth}}{=}{0}%
}%
{}%
- {\LWR@htmltagc{\LWR@tagregularparagraph}}%
+ {\LWR@htmltagc{\LWR@tagregularparagraph}\LWR@orignewline}%
% \end{macrocode}
% Append the footnote to the list:
% \begin{macrocode}
@@ -42287,7 +42935,7 @@ solid \LWR@origpound\LWR@tempcolor ; %
%
% Discard all options for \pkg{lwarp-figcaps}:
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{figcaps}
+\LWR@ProvidesPackageDrop{figcaps}[1999/02/23]
% \end{macrocode}
%
% \begin{macrocode}
@@ -42326,7 +42974,7 @@ solid \LWR@origpound\LWR@tempcolor ; %
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{figsize}
+\LWR@ProvidesPackageDrop{figsize}[2002/03/18]
% \end{macrocode}
%
% Emulates a virtual 6\texttimes9 inch textsize.
@@ -42366,7 +43014,7 @@ solid \LWR@origpound\LWR@tempcolor ; %
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{fix2col}
+\LWR@ProvidesPackageDrop{fix2col}[2015/11/13]
% \end{macrocode}
%
%
@@ -42398,7 +43046,7 @@ solid \LWR@origpound\LWR@tempcolor ; %
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackagePass{fixme}
+\LWR@ProvidesPackagePass{fixme}[2017/03/05]
% \end{macrocode}
%
% Restore \pkg{lwarp}'s version of \cs{@wrindex},
@@ -42478,7 +43126,7 @@ solid \LWR@origpound\LWR@tempcolor ; %
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackagePass{fixmetodonotes}
+\LWR@ProvidesPackagePass{fixmetodonotes}[2013/04/28]
% \end{macrocode}
% \begin{macrocode}
@@ -42525,7 +43173,7 @@ solid \LWR@origpound\LWR@tempcolor ; %
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{flafter}
+\LWR@ProvidesPackageDrop{flafter}[2018/01/08]
\providecommand\fl@trace[1]{}
% \end{macrocode}
%
@@ -42710,7 +43358,7 @@ solid \LWR@origpound\LWR@tempcolor ; %
%
% Discard all options for \pkg{lwarp-floatflt}:
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{floatflt}
+\LWR@ProvidesPackageDrop{floatflt}[1997/07/16]
% \end{macrocode}
%
%
@@ -42781,7 +43429,7 @@ solid \LWR@origpound\LWR@tempcolor ; %
%
% Discard all options for \pkg{lwarp-floatpag}:
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{floatpag}
+\LWR@ProvidesPackageDrop{floatpag}[2012/05/29]
% \end{macrocode}
%
% \begin{macrocode}
@@ -42814,7 +43462,7 @@ solid \LWR@origpound\LWR@tempcolor ; %
% \codehtml
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{floatrow}
+\LWR@ProvidesPackageDrop{floatrow}[2008/08/02]
% \end{macrocode}
% \changes{v0.14}{2016/03/31}{\pkg{floatrow}: Added.}
@@ -43154,7 +43802,7 @@ solid \LWR@origpound\LWR@tempcolor ; %
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{fltrace}
+\LWR@ProvidesPackageDrop{fltrace}[2018/01/08]
% \end{macrocode}
%
% \begin{macrocode}
@@ -43189,7 +43837,7 @@ solid \LWR@origpound\LWR@tempcolor ; %
%
% Discard all options for \pkg{lwarp-flushend}:
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{flushend}
+\LWR@ProvidesPackageDrop{flushend}[2017/03/27]
% \end{macrocode}
%
% \begin{macrocode}
@@ -43225,7 +43873,7 @@ solid \LWR@origpound\LWR@tempcolor ; %
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{fnbreak}
+\LWR@ProvidesPackageDrop{fnbreak}[2012/01/01]
% \end{macrocode}
%
% \begin{macrocode}
@@ -43262,7 +43910,7 @@ solid \LWR@origpound\LWR@tempcolor ; %
%
% Discard all options for \pkg{lwarp-fncychap}:
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{fncychap}
+\LWR@ProvidesPackageDrop{fncychap}[2007/07/30]
% \end{macrocode}
% \begin{macrocode}
@@ -43317,7 +43965,7 @@ solid \LWR@origpound\LWR@tempcolor ; %
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{fnlineno}
+\LWR@ProvidesPackageDrop{fnlineno}[2011/01/07]
% \end{macrocode}
%
% \iffalse
@@ -43344,7 +43992,7 @@ solid \LWR@origpound\LWR@tempcolor ; %
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{fnpos}
+\LWR@ProvidesPackageDrop{fnpos}[1999/07/14]
% \end{macrocode}
%
% \begin{macrocode}
@@ -43384,7 +44032,7 @@ solid \LWR@origpound\LWR@tempcolor ; %
%
% \codehtml
% \begin{macrocode}
-\LWR@ProvidesPackagePass{fontenc}
+\LWR@ProvidesPackagePass{fontenc}[2017/04/05]
% \end{macrocode}
%
% \iffalse
@@ -43413,7 +44061,7 @@ solid \LWR@origpound\LWR@tempcolor ; %
% \pkg{lwarp} incidentally happens to emulate the \optn{stable} option.
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{footmisc}
+\LWR@ProvidesPackageDrop{footmisc}[2011/06/06]
% \end{macrocode}
%
% Some nullified commands:
@@ -43487,7 +44135,7 @@ solid \LWR@origpound\LWR@tempcolor ; %
%
% \codehtml
% \begin{macrocode}
-\LWR@ProvidesPackagePass{footnote}
+\LWR@ProvidesPackagePass{footnote}[1997/01/28]
% \end{macrocode}
%
% Removed print-version formatting:
@@ -43565,7 +44213,7 @@ solid \LWR@origpound\LWR@tempcolor ; %
% Discard all options for \pkg{lwarp-footnotehyper}:
% \begin{macrocode}
\RequirePackage{footnote}
-\LWR@ProvidesPackageDrop{footnotehyper}
+\LWR@ProvidesPackageDrop{footnotehyper}[2018/01/23]
% \end{macrocode}
%
%
@@ -43594,7 +44242,7 @@ solid \LWR@origpound\LWR@tempcolor ; %
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackagePass{footnoterange}
+\LWR@ProvidesPackagePass{footnoterange}[2012/02/17]
% \end{macrocode}
%
% \begin{macrocode}
@@ -43660,7 +44308,7 @@ solid \LWR@origpound\LWR@tempcolor ; %
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackagePass{forest}
+\LWR@ProvidesPackagePass{forest}[2017/07/14]
% \end{macrocode}
% \begin{macrocode}
@@ -43710,7 +44358,7 @@ solid \LWR@origpound\LWR@tempcolor ; %
%
% Accept all options for \pkg{lwarp-framed}:
% \begin{macrocode}
-\LWR@ProvidesPackagePass{framed}
+\LWR@ProvidesPackagePass{framed}[2011/10/22]
\RequirePackage{xcolor}% for \convertcolorspec
% \end{macrocode}
@@ -43866,7 +44514,7 @@ solid \LWR@origpound\LWR@tempcolor ; %
%
% Discard all options for \pkg{lwarp-ftnright}:
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{ftnright}
+\LWR@ProvidesPackageDrop{ftnright}[2014/10/28]
% \end{macrocode}
% \iffalse
@@ -43956,7 +44604,7 @@ solid \LWR@origpound\LWR@tempcolor ; %
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{fullwidth}
+\LWR@ProvidesPackageDrop{fullwidth}[2011/11/18]
% \end{macrocode}
%
% \begin{macrocode}
@@ -44028,7 +44676,7 @@ solid \LWR@origpound\LWR@tempcolor ; %
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{gentombow}
+\LWR@ProvidesPackageDrop{gentombow}[2018/05/17]
% \end{macrocode}
%
% \begin{macrocode}
@@ -44067,7 +44715,7 @@ solid \LWR@origpound\LWR@tempcolor ; %
%
% Discard all options for \pkg{lwarp-geometry}:
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{geometry}
+\LWR@ProvidesPackageDrop{geometry}[2018/04/16]
% \end{macrocode}
%
% \begin{macrocode}
@@ -44106,12 +44754,14 @@ solid \LWR@origpound\LWR@tempcolor ; %
%
% \begin{macrocode}
\PassOptionsToPackage{xindy}{glossaries}
-\LWR@ProvidesPackagePass{glossaries}
+
+\LWR@ProvidesPackagePass{glossaries}[2018/07/23]
+
\setupglossaries{nonumberlist}
\setglossarystyle{index}
% \end{macrocode}
%
-% Patched to fix \acro{TOC} pointing to the previous page:
+% Patched to fix \TOC\ pointing to the previous page:
% \begin{macrocode}
\renewcommand*{\@p@glossarysection}[2]{%
\glsclearpage
@@ -44122,11 +44772,11 @@ solid \LWR@origpound\LWR@tempcolor ; %
}%
{%
% \end{macrocode}
-% In the original, the \acro{TOC} entry was made before the section,
+% In the original, the \TOC\ entry was made before the section,
% thus linking to the phantomsection in the printed version, but for
% \HTML, this caused the link to point to the page before the glossaries,
% which could be a different \HTML\ file.
-% Here, the \acro{TOC} entry is made after the section is created:
+% Here, the \TOC\ entry is made after the section is created:
% \begin{macrocode}
\csname\@@glossarysec\endcsname*{#2}%
\@gls@toc{#1}{\@@glossarysec}% Moved after the previous line.
@@ -44198,7 +44848,7 @@ solid \LWR@origpound\LWR@tempcolor ; %
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{gmeometric}
+\LWR@ProvidesPackageDrop{gmeometric}[2008/11/22]
% \end{macrocode}
%
% \iffalse
@@ -44228,7 +44878,7 @@ solid \LWR@origpound\LWR@tempcolor ; %
%
% \codehtml
% \begin{macrocode}
-\LWR@ProvidesPackagePass{graphics}
+\LWR@ProvidesPackagePass{graphics}[2017/06/25]
% \end{macrocode}
@@ -44562,6 +45212,7 @@ solid \LWR@origpound\LWR@tempcolor ; %
% \changes{v0.45}{2017/12/29}{Improved URLs with underscores.}
% \changes{v0.59}{2018/09/07}{Now works with \filenm{.pdf} and \filenm{.eps}
% filename extensions.}
+% \changes{v0.66}{2019/02/02}{Improved \HTML\ formatting.}
% \begin{macrocode}
\NewDocumentCommand{\LWR@includegraphicsb}{s o o m}
{%
@@ -44708,14 +45359,15 @@ solid \LWR@origpound\LWR@tempcolor ; %
{% start of href
\LWR@traceinfo{LWR@includegraphicsb: about to LWR@htmltag}%
\LWR@htmltag{% start of image tags
-img src="%
+img\LWR@indentHTML%
+src="%
% \end{macrocode}
% \changes{v0.62}{2018/10/27}{Fix: Filename expansion.}
% \begin{macrocode}
\detokenize\expandafter{\LWR@parsedfilename}%
% \end{macrocode}
% \begin{macrocode}
-" \LWR@orignewline%
+"\LWR@indentHTML%
% \end{macrocode}
% Only include a style tag if a width, height, angle, or scale was given:
% \begin{macrocode}
@@ -44728,43 +45380,42 @@ img src="%
\NOT\equal{\LWR@igyscale}{1}
}%
{%
- \LWR@origtilde{} style="%
+ style="\LWR@indentHTML
\ifthenelse{\NOT\equal{\LWR@igwidthstyle}{}}%
- {\LWR@igwidthstyle; }{}%
+ {\LWR@igwidthstyle;\LWR@indentHTML}{}%
\ifthenelse{\NOT\equal{\LWR@igheightstyle}{}}%
- {\LWR@igheightstyle; }{}%
+ {\LWR@igheightstyle;\LWR@indentHTML}{}%
\ifthenelse{\NOT\equal{\LWR@igorigin}{}}%
{%
- \LWR@origtilde{} transform-origin: \LWR@originnames{\LWR@igorigin}; %
- \LWR@orignewline%
+ transform-origin: \LWR@originnames{\LWR@igorigin};\LWR@indentHTML%
}{}%
\ifthenelse{\NOT\equal{\LWR@igangle}{}}%
{%
- \LWR@rotstyle{-ms-}{\LWR@igangle} % extra space
- \LWR@rotstyle{-webkit-}{\LWR@igangle} % extra space
- \LWR@rotstyle{}{\LWR@igangle }%
+ \LWR@rotstyle{-ms-}{\LWR@igangle}\LWR@indentHTML
+ \LWR@rotstyle{-webkit-}{\LWR@igangle}\LWR@indentHTML
+ \LWR@rotstyle{}{\LWR@igangle }\LWR@indentHTML
}{}%
\ifthenelse{%
\NOT\equal{\LWR@igxscale}{1}\OR%
\NOT\equal{\LWR@igyscale}{1}%
}%
{%
- \LWR@scalestyle{-ms-}{\LWR@igxscale}{\LWR@igyscale} % extra space
- \LWR@scalestyle{-webkit-}{\LWR@igxscale}{\LWR@igyscale} % extra space
- \LWR@scalestyle{}{\LWR@igxscale}{\LWR@igyscale}%
- }{} % extra space
+ \LWR@scalestyle{-ms-}{\LWR@igxscale}{\LWR@igyscale}\LWR@indentHTML
+ \LWR@scalestyle{-webkit-}{\LWR@igxscale}{\LWR@igyscale}\LWR@indentHTML
+ \LWR@scalestyle{}{\LWR@igxscale}{\LWR@igyscale}\LWR@indentHTML
+ }{}%
%
\ifthenelse{\NOT\equal{\LWR@opacity}{1}}%
- {opacity:\LWR@opacity; }{}%
+ {opacity:\LWR@opacity;\LWR@indentHTML}{}%
%
- " \LWR@orignewline%
+ "\LWR@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}
-\LWR@origtilde{} class="\LWR@igclass" \LWR@orignewline%
-\LWR@origtilde{} alt="\LWR@igalt" \LWR@orignewline%
+class="\LWR@igclass"\LWR@indentHTML%
+alt="\LWR@igalt" \LWR@orignewline%
}% end of image tags
}% end of href
% \end{macrocode}
@@ -44878,20 +45529,24 @@ img src="%
\setkeys{krotbox}{#1}%
% \end{macrocode}
% Select |inline-block| so that \HTML\ will transform this span:
+% \changes{v0.66}{2019/02/02}{Improved \HTML\ formatting.}
% \begin{macrocode}
-\LWR@htmltagc{span style="display: inline-block; %
+\LWR@htmltagc{%
+ span\LWR@indentHTML
+ style="\LWR@indentHTML
+ display: inline-block;\LWR@indentHTML
% \end{macrocode}
% If an origin was given, translate and print the origin information:
% \begin{macrocode}
-\ifthenelse{\NOT\equal{\LWR@rotboxorigin}{}}%
-{transform-origin: \LWR@originnames{\LWR@rotboxorigin};\LWR@origtilde}{}%
+ \ifthenelse{\NOT\equal{\LWR@rotboxorigin}{}}%
+ {transform-origin: \LWR@originnames{\LWR@rotboxorigin};\LWR@indentHTML}{}%
% \end{macrocode}
% Print the rotation information:
% \begin{macrocode}
-\LWR@rotstyle{-ms-}{#2} % extra space
-\LWR@rotstyle{-webkit-}{#2} % extra space
-\LWR@rotstyle{}{#2} % extra space
-"}\LWR@orignewline%
+ \LWR@rotstyle{-ms-}{#2}\LWR@indentHTML
+ \LWR@rotstyle{-webkit-}{#2}\LWR@indentHTML
+ \LWR@rotstyle{}{#2}"\LWR@orignewline%
+}\LWR@orignewline%
% \end{macrocode}
% Print the text to be rotated:
% \begin{macrocode}
@@ -44925,15 +45580,20 @@ img src="%
\NewDocumentCommand{\LWR@HTML@scalebox}{m o m}{%
% \end{macrocode}
% Select |inline-block| so that \HTML\ will transform this span:
+% \changes{v0.66}{2019/02/02}{Improved \HTML\ formatting.}
% \begin{macrocode}
-\LWR@htmltagc{span style="display: inline-block; %
+\LWR@htmltagc{%
+ span\LWR@indentHTML
+ style="\LWR@indentHTML
+ display: inline-block;\LWR@indentHTML
% \end{macrocode}
% Print the scaling information:
% \begin{macrocode}
-\LWR@scalestyle{-ms-}{#1}{\IfNoValueTF{#2}{#1}{#2}} % extra space
-\LWR@scalestyle{-webkit-}{#1}{\IfNoValueTF{#2}{#1}{#2}} % extra space
-\LWR@scalestyle{}{#1}{\IfNoValueTF{#2}{#1}{#2}} % extra space
-"}%
+ \LWR@scalestyle{-ms-}{#1}{\IfNoValueTF{#2}{#1}{#2}}\LWR@indentHTML
+ \LWR@scalestyle{-webkit-}{#1}{\IfNoValueTF{#2}{#1}{#2}}\LWR@indentHTML
+ \LWR@scalestyle{}{#1}{\IfNoValueTF{#2}{#1}{#2}}
+ "\LWR@orignewline
+}\LWR@orignewline%
% \end{macrocode}
% Print the text to be scaled:
% \begin{macrocode}
@@ -45054,7 +45714,7 @@ img src="%
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackagePass{grffile}
+\LWR@ProvidesPackagePass{grffile}[2017/06/30]
% \end{macrocode}
%
% \iffalse
@@ -45081,7 +45741,7 @@ img src="%
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{grid}
+\LWR@ProvidesPackageDrop{grid}[2009/06/16]
% \end{macrocode}
%
% \begin{macrocode}
@@ -45190,7 +45850,7 @@ img src="%
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{hang}
+\LWR@ProvidesPackageDrop{hang}[2017/02/18]
% \end{macrocode}
%
% \begin{macrocode}
@@ -45284,7 +45944,7 @@ img src="%
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{hanging}
+\LWR@ProvidesPackageDrop{hanging}[2009/09/02]
% \end{macrocode}
%
%
@@ -45358,7 +46018,7 @@ img src="%
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{hypcap}
+\LWR@ProvidesPackageDrop{hypcap}[2016/05/16]
% \end{macrocode}
%
% \begin{macrocode}
@@ -45392,7 +46052,7 @@ img src="%
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{hypdestopt}
+\LWR@ProvidesPackageDrop{hypdestopt}[2016/05/21]
% \end{macrocode}
%
% \iffalse
@@ -45418,7 +46078,7 @@ img src="%
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{hypernat}
+\LWR@ProvidesPackageDrop{hypernat}[2001/07/09]
% \end{macrocode}
%
% \iffalse
@@ -45466,8 +46126,8 @@ img src="%
% Insert an image with alt text:
%
% \changes{v0.43}{2017/10/31}{\pkg{hyperref}: Made robust.}
-% \changes{v0.45}{2017/12/29}{\pkg{hyperref}: Fix: Underscore in \acro{URL}.}
-% \changes{v0.52}{2018/03/26}{\pkg{hyperref}: Fix: \progcode{\#}, \progcode{\%}, \progcode{\&}, \progcode{\~}, \progcode{\_} in \acro{URL}.}
+% \changes{v0.45}{2017/12/29}{\pkg{hyperref}: Fix: Underscore in \URL.}
+% \changes{v0.52}{2018/03/26}{\pkg{hyperref}: Fix: \progcode{\#}, \progcode{\%}, \progcode{\&}, \progcode{\~}, \progcode{\_} in \URL.}
% \begin{macrocode}
\NewDocumentCommand{\LWR@hyperimageb}{m +m}{%
\LWR@ensuredoingapar%
@@ -45497,7 +46157,7 @@ img src="%
%
% Creates an \HTML\ anchor to |category.name| with the given text.
%
-% \changes{v0.52}{2018/03/26}{\pkg{hyperref}: Fix: \progcode{\#}, \progcode{\%}, \progcode{\&}, \progcode{\~}, \progcode{\_} in \acro{URL}.}
+% \changes{v0.52}{2018/03/26}{\pkg{hyperref}: Fix: \progcode{\#}, \progcode{\%}, \progcode{\&}, \progcode{\~}, \progcode{\_} in \URL.}
% \begin{macrocode}
\NewDocumentCommand{\LWR@hyperdefb}{m m +m}{%
\LWR@ensuredoingapar%
@@ -45522,8 +46182,8 @@ img src="%
%
% \begin{noindmacro}{\LWR@hyperrefb} \marg{1: URL} \marg{2: category}
% \marg{3: name} \marg{4: text}
-% \changes{v0.45}{2018/01/02}{\pkg{hyperref}: Fix: Underscore in \acro{URL}.}
-% \changes{v0.52}{2018/03/26}{\pkg{hyperref}: Fix: \progcode{\#}, \progcode{\%}, \progcode{\&}, \progcode{\~}, \progcode{\_} in \acro{URL}.}
+% \changes{v0.45}{2018/01/02}{\pkg{hyperref}: Fix: Underscore in \URL.}
+% \changes{v0.52}{2018/03/26}{\pkg{hyperref}: Fix: \progcode{\#}, \progcode{\%}, \progcode{\&}, \progcode{\~}, \progcode{\_} in \URL.}
% \changes{v0.57}{2018/06/05}{\pkg{subcaption}: Fix: \cs{subref}.}
%
% Creates an \HTML\ link to |URL#category.name| with the given text.
@@ -45603,7 +46263,7 @@ img src="%
%
% Creates an anchor to |name| with the given text.
%
-% \changes{v0.52}{2018/03/26}{\pkg{hyperref}: Fix: \progcode{\#}, \progcode{\%}, \progcode{\&}, \progcode{\~}, \progcode{\_} in \acro{URL}.}
+% \changes{v0.52}{2018/03/26}{\pkg{hyperref}: Fix: \progcode{\#}, \progcode{\%}, \progcode{\&}, \progcode{\~}, \progcode{\_} in \URL.}
% \begin{macrocode}
\NewDocumentCommand{\LWR@hypertargetb}{m +m}{%
\label{LWR-ht-#1}%
@@ -45631,7 +46291,7 @@ img src="%
%
% Declared because also defined by \pkg{memoir}.
%
-% \changes{v0.52}{2018/03/26}{\pkg{hyperref}: Fix: \progcode{\#}, \progcode{\%}, \progcode{\&}, \progcode{\~}, \progcode{\_} in \acro{URL}.}
+% \changes{v0.52}{2018/03/26}{\pkg{hyperref}: Fix: \progcode{\#}, \progcode{\%}, \progcode{\&}, \progcode{\~}, \progcode{\_} in \URL.}
% \changes{v0.54}{2018/04/19}{\pkg{hyperref}: Fix: \cs{ref} in \cs{hyperref} and \cs{hyperlink} caused nested link.}
% \changes{v0.54}{2018/04/19}{\pkg{hyperref}: Fix: \cs{hyperref} and \cs{hyperlink} with special chars in text.}
% \begin{macrocode}
@@ -45892,7 +46552,7 @@ img src="%
%
% Discard all options for \pkg{lwarp-hyperxmp}:
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{hyperxmp}
+\LWR@ProvidesPackageDrop{hyperxmp}[2018/11/27]
% \end{macrocode}
%
%
@@ -45921,7 +46581,7 @@ img src="%
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackagePass{hyphenat}
+\LWR@ProvidesPackagePass{hyphenat}[2009/09/02]
% \end{macrocode}
%
% \begin{macrocode}
@@ -45981,7 +46641,7 @@ img src="%
%
% Discard all options for \pkg{lwarp-idxlayout}:
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{idxlayout}
+\LWR@ProvidesPackageDrop{idxlayout}[2012/03/30]
% \end{macrocode}
%
% \begin{macrocode}
@@ -46032,7 +46692,7 @@ img src="%
%
% Discard all options for \pkg{lwarp-ifoddpage}:
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{ifoddpage}
+\LWR@ProvidesPackageDrop{ifoddpage}[2016/04/23]
% \end{macrocode}
% \begin{macrocode}
@@ -46081,7 +46741,7 @@ img src="%
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackagePass{imakeidx}
+\LWR@ProvidesPackagePass{imakeidx}[2016/10/15]
% \end{macrocode}
%
% Use the new \HTML\ suffix:
@@ -46328,34 +46988,6 @@ img src="%
%
%
% \iffalse
-%<*indentfirst>
-% \fi
-
-% \part{lwarp-indentfirst.sty}
-
-% \section{indentfirst}
-%
-% \DescribePackage{indentfirst}
-% \pkg{indentfirst} is ignored.
-%
-% \changes{v0.22}{2017/03/01}{\pkg{indentfirst}: Added.}
-%
-% Discard all options for \pkg{lwarp-indentfirst}:
-
-% \codehtml
-%
-% \begin{macrocode}
-\LWR@ProvidesPackageDrop{indentfirst}
-% \end{macrocode}
-
-% \iffalse
-%</indentfirst>
-% \fi
-%
-%
-%
-%
-% \iffalse
%<*index>
% \fi
%
@@ -46374,7 +47006,7 @@ img src="%
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackagePass{index}
+\LWR@ProvidesPackagePass{index}[2004/01/20]
% \end{macrocode}
%
% Use \cs{theLWR@autoindex} instead of \cs{thepage}.
@@ -46476,7 +47108,7 @@ img src="%
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{intopdf}
+\LWR@ProvidesPackageDrop{intopdf}[2018/03/15]
% \end{macrocode}
%
% \begin{macrocode}
@@ -46513,7 +47145,7 @@ img src="%
%
% \codehtml
% \begin{macrocode}
-\LWR@ProvidesPackagePass{keyfloat}
+\LWR@ProvidesPackagePass{keyfloat}[2017/05/12]
% \end{macrocode}
% After \pkg{keyfloat} has loaded:
@@ -46743,7 +47375,7 @@ width=\KFLT@imagewidth,height=\KFLT@h]{\KFLT@i}%
%
% Discard all options for \pkg{lwarp-layout}:
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{layout}
+\LWR@ProvidesPackageDrop{layout}[2014/10/28]
% \end{macrocode}
% \begin{macrocode}
@@ -46806,7 +47438,7 @@ width=\KFLT@imagewidth,height=\KFLT@h]{\KFLT@i}%
%
% Discard all options for \pkg{lwarp-letterspace}:
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{letterspace}
+\LWR@ProvidesPackageDrop{letterspace}[2018/01/14]
% \end{macrocode}
% \begin{macrocode}
@@ -46843,7 +47475,7 @@ width=\KFLT@imagewidth,height=\KFLT@h]{\KFLT@i}%
%
% Discard all options for \pkg{lwarp-lettrine}:
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{lettrine}
+\LWR@ProvidesPackageDrop{lettrine}[2018-08-28]
% \end{macrocode}
%
% The initial letter is in a \element{span} of class |lettrine|, and the following
@@ -46905,7 +47537,7 @@ width=\KFLT@imagewidth,height=\KFLT@h]{\KFLT@i}%
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{lineno}
+\LWR@ProvidesPackageDrop{lineno}[2005/11/02]
% \end{macrocode}
%
% \begin{macrocode}
@@ -47053,7 +47685,7 @@ width=\KFLT@imagewidth,height=\KFLT@h]{\KFLT@i}%
% \begin{macrocode}
% \LWR@ProvidesPackageDrop{lips}
\PackageInfo{lwarp}{Using the lwarp version of package `lips'.}%
-\ProvidesPackage{lwarp-lips}
+\ProvidesPackage{lwarp-lips}[2001/08/31]
\NewDocumentCommand{\Lips}{}{\textellipsis}
@@ -47104,7 +47736,7 @@ width=\KFLT@imagewidth,height=\KFLT@h]{\KFLT@i}%
%
%
% \begin{macrocode}
-\LWR@ProvidesPackagePass{listings}
+\LWR@ProvidesPackagePass{listings}[2015/06/04]
% \end{macrocode}
% ^^A For passing optional arguments to an environment, see:
@@ -47396,7 +48028,7 @@ width=\KFLT@imagewidth,height=\KFLT@h]{\KFLT@i}%
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackagePass{lltjext}
+\LWR@ProvidesPackagePass{lltjext}[2018/10/07]
% \end{macrocode}
%
% \begin{macrocode}
@@ -47435,7 +48067,7 @@ width=\KFLT@imagewidth,height=\KFLT@h]{\KFLT@i}%
}
\RenewDocumentCommand{\pbox}{d<> O{0pt} O{c} m}{%
-\booltrue{LWR@minipagefullwidth}%
+\global\booltrue{LWR@minipagefullwidth}%
\parbox{#2}{#4}%
}
% \end{macrocode}
@@ -47464,7 +48096,7 @@ width=\KFLT@imagewidth,height=\KFLT@h]{\KFLT@i}%
% \codehtml
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{longtable}
+\LWR@ProvidesPackageDrop{longtable}[2014/10/28]
% \end{macrocode}
%
% \limitslongtable
@@ -47565,7 +48197,7 @@ width=\KFLT@imagewidth,height=\KFLT@h]{\KFLT@i}%
%
% Discard all options for \pkg{lwarp-lscape}.
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{lscape}
+\LWR@ProvidesPackageDrop{lscape}[2000/10/22]
% \end{macrocode}
% \begin{macrocode}
@@ -47603,7 +48235,7 @@ width=\KFLT@imagewidth,height=\KFLT@h]{\KFLT@i}%
% \begin{macrocode}
\RequirePackage{tabularx}
-\LWR@ProvidesPackageDrop{ltablex}
+\LWR@ProvidesPackageDrop{ltablex}[2014/08/13]
\DeclareDocumentEnvironment{tabularx}{m o m}
{\longtable{#3}}
@@ -47645,7 +48277,7 @@ width=\KFLT@imagewidth,height=\KFLT@h]{\KFLT@i}%
% \codehtml
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{ltcaption}
+\LWR@ProvidesPackageDrop{ltcaption}[2018/08/26]
% \end{macrocode}
%
@@ -47685,7 +48317,7 @@ width=\KFLT@imagewidth,height=\KFLT@h]{\KFLT@i}%
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{ltxgrid}
+\LWR@ProvidesPackageDrop{ltxgrid}[2010/07/25]
% \end{macrocode}
%
% \begin{macrocode}
@@ -47724,7 +48356,7 @@ width=\KFLT@imagewidth,height=\KFLT@h]{\KFLT@i}%
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{ltxtable}
+\LWR@ProvidesPackageDrop{ltxtable}[1995/12/11]
% \end{macrocode}
%
% \begin{noindmacro}{\LTXtable} \marg{width} \marg{file}
@@ -47758,7 +48390,7 @@ width=\KFLT@imagewidth,height=\KFLT@h]{\KFLT@i}%
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{lua-check-hyphen}
+\LWR@ProvidesPackageDrop{lua-check-hyphen}[2018/04/19]
% \end{macrocode}
%
% \begin{macrocode}
@@ -47815,7 +48447,7 @@ width=\KFLT@imagewidth,height=\KFLT@h]{\KFLT@i}%
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{luacolor}
+\LWR@ProvidesPackageDrop{luacolor}[2016/05/16]
% \end{macrocode}
%
% \begin{macrocode}
@@ -47850,7 +48482,7 @@ width=\KFLT@imagewidth,height=\KFLT@h]{\KFLT@i}%
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackagePass{luatodonotes}
+\LWR@ProvidesPackagePass{luatodonotes}[2017/09/30]
% \end{macrocode}
%
%
@@ -47973,7 +48605,7 @@ width=\KFLT@imagewidth,height=\KFLT@h]{\KFLT@i}%
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{magaz}
+\LWR@ProvidesPackageDrop{magaz}[2011/11/24]
% \end{macrocode}
%
% \begin{macrocode}
@@ -48017,7 +48649,7 @@ width=\KFLT@imagewidth,height=\KFLT@h]{\KFLT@i}%
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackagePass{makeidx}
+\LWR@ProvidesPackagePass{makeidx}[2014/09/29]
% \end{macrocode}
%
% \cs{@wrindex} is redefined \cs{AtBeginDocument} by the \pkg{lwarp} core.
@@ -48090,7 +48722,7 @@ width=\KFLT@imagewidth,height=\KFLT@h]{\KFLT@i}%
%
% Discard all options for \pkg{lwarp-marginfit}:
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{marginfit}
+\LWR@ProvidesPackageDrop{marginfit}[2018/06/08]
% \end{macrocode}
%
% \iffalse
@@ -48119,7 +48751,7 @@ width=\KFLT@imagewidth,height=\KFLT@h]{\KFLT@i}%
%
% Discard all options for \pkg{lwarp-marginfix}:
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{marginfix}
+\LWR@ProvidesPackageDrop{marginfix}[2013/09/08]
% \end{macrocode}
%
% \begin{macrocode}
@@ -48164,7 +48796,7 @@ width=\KFLT@imagewidth,height=\KFLT@h]{\KFLT@i}%
%
% Discard all options for \pkg{lwarp-marginnote}:
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{marginnote}
+\LWR@ProvidesPackageDrop{marginnote}[2018/08/09]
% \end{macrocode}
%
% \changes{v0.57}{2018/06/05}{\pkg{marginnote}: Fix: Long optional argument.}
@@ -48208,7 +48840,7 @@ width=\KFLT@imagewidth,height=\KFLT@h]{\KFLT@i}%
%
% Discard all options for \pkg{lwarp-mcaption}:
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{mcaption}
+\LWR@ProvidesPackageDrop{mcaption}[2009/03/13]
% \end{macrocode}
% \begin{macrocode}
@@ -48257,7 +48889,7 @@ width=\KFLT@imagewidth,height=\KFLT@h]{\KFLT@i}%
% \begin{macrocode}
\RequirePackage{xcolor}% for \convertcolorspec
-\LWR@ProvidesPackageDrop{mdframed}
+\LWR@ProvidesPackageDrop{mdframed}[2013/07/01]
% \end{macrocode}
%
%
@@ -48833,7 +49465,7 @@ background:
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{memhfixc}
+\LWR@ProvidesPackageDrop{memhfixc}[2013/05/30]
% \end{macrocode}
%
% \iffalse
@@ -48862,7 +49494,7 @@ background:
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{metalogo}
+\LWR@ProvidesPackageDrop{metalogo}[2010/05/29]
% \end{macrocode}
%
% \begin{macrocode}
@@ -48915,8 +49547,8 @@ background:
% When producing \HTML\ output, \pkg{lwarp} does not support
% \trouble[nested math]{mhchem=\pkg{mhchem}>nested dollar signs}
% the use of nested dollar signs in \pkg{mhchem} expressions.
-% \gindex{array>\pkg{mhchem}}
-% \gindex{math>\pkg{mhchem}}
+% \gindex{array>mhchem=\pkg{mhchem}}
+% \gindex{math>mhchem=\pkg{mhchem}}
%
% For some examples from the \pkg{mhchem} manual, change as follows:
% \begin{Verbatim}[gobble=2,frame=leftline, xleftmargin=.5in,obeytabs,tabsize=4]
@@ -48941,7 +49573,7 @@ background:
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackagePass{mhchem}
+\LWR@ProvidesPackagePass{mhchem}[2018/06/22]
% \end{macrocode}
% The original definition of \cs{ce}:
@@ -49054,7 +49686,7 @@ background:
%
% Discard all options for \pkg{lwarp-microtype}:
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{microtype}
+\LWR@ProvidesPackageDrop{microtype}[2018/01/14]
% \end{macrocode}
% \begin{macrocode}
@@ -49115,7 +49747,7 @@ background:
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{midfloat}
+\LWR@ProvidesPackageDrop{midfloat}[2012/05/29]
% \end{macrocode}
%
% \begin{macrocode}
@@ -49146,7 +49778,7 @@ background:
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{midpage}
+\LWR@ProvidesPackageDrop{midpage}[2009/09/03]
% \end{macrocode}
%
% \changes{v0.47}{2018/01/26}{\pkg{midpage}: Fix: Line wrap at \HTML\ hyphen.}
@@ -49181,7 +49813,7 @@ background:
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{morefloats}
+\LWR@ProvidesPackageDrop{morefloats}[2015/07/22]
% \end{macrocode}
%
% \iffalse
@@ -49214,7 +49846,7 @@ background:
% \end{macrocode}
%
% \begin{macrocode}
-\LWR@ProvidesPackagePass{moreverb}
+\LWR@ProvidesPackagePass{moreverb}[2008/06/03]
% \end{macrocode}
%
% \begin{macrocode}
@@ -49325,7 +49957,7 @@ background:
%
% Discard all options for \pkg{lwarp-mparhack}:
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{mparhack}
+\LWR@ProvidesPackageDrop{mparhack}[2005/04/17]
% \end{macrocode}
%
% \iffalse
@@ -49352,7 +49984,7 @@ background:
% \codehtml
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{multicol}[2015/09/13]
+\LWR@ProvidesPackageDrop{multicol}[2018/12/27]
% \end{macrocode}
% Multicols are converted into a 1--3 column display, browser-supported.
@@ -49372,12 +50004,22 @@ background:
% \HTML\ \element{div} class to contain everything:
% \begin{macrocode}
{
-\LWR@forcenewpage
-\BlockClass{multicols}
+ \LWR@forcenewpage
+ \BlockClass{multicols}
% \end{macrocode}
% Optional \HTML\ \element{div} class for the heading:
% \begin{macrocode}
-\IfValueT{#3}{\begin{BlockClass}{multicolsheading}#3\end{BlockClass}}}
+ \IfValueT{#3}{\begin{BlockClass}{multicolsheading}#3\end{BlockClass}}%
+% \end{macrocode}
+% Change \cs{linewidth} to compensate for expected size:
+% \begin{macrocode}
+ \setlength{\linewidth}{\linewidth/#2}
+% \end{macrocode}
+% Locally force any minipages to be fullwidth:
+% \changes{v0.66}{2018/12/31}{Fix: Minipages inside \env{multicols}.}
+% \begin{macrocode}
+ \booltrue{LWR@forceminipagefullwidth}
+}
% \end{macrocode}
% When done with the environment, close the \element{div}:
% \begin{macrocode}
@@ -49437,17 +50079,19 @@ background:
% \pkg{multicolrule} is ignored.
%
% \changes{v0.65}{2018/12/21}{\pkg{multicolrule}: Added.}
+% \changes{v0.66}{2019/01/04}{\pkg{multicolrule}: Updated for v1.2.}
%
% \codehtml
%
% \begin{macrocode}
\RequirePackage{multicol}
-\LWR@ProvidesPackageDrop{multicolrule}
+\LWR@ProvidesPackageDrop{multicolrule}[2019/01/01]
% \end{macrocode}
%
% \begin{macrocode}
\newcommand*{\SetMCRule}[1]{}
+\NewDocumentCommand{\DeclareMCRulePattern}{m m}{}
% \end{macrocode}
%
% \iffalse
@@ -49487,7 +50131,7 @@ background:
% \end{macrocode}
%
% \begin{macrocode}
-\LWR@ProvidesPackagePass{multirow}
+\LWR@ProvidesPackagePass{multirow}[2018/08/03]
% \end{macrocode}
%
%
@@ -49664,7 +50308,7 @@ class="td%
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{multitoc}
+\LWR@ProvidesPackageDrop{multitoc}[1999/06/08]
% \end{macrocode}
%
% \begin{macrocode}
@@ -49795,6 +50439,102 @@ class="td%
%
%
% \iffalse
+%<*nameauth>
+% \fi
+%
+% \part{lwarp-nameauth.sty}
+%
+% \section{nameauth}
+%
+% \credits{Charles P. Schaum}
+%
+% \DescribePackage{nameauth}
+% \pkg{nameauth} is patched for use by \pkg{lwarp}.
+%
+% \changes{v0.66}{2019/02/05}{\pkg{nameauth}: Added.}
+%
+% \codehtml
+%
+% \begin{macrocode}
+\LWR@ProvidesPackagePass{nameauth}[2017/03/22]
+% \end{macrocode}
+%
+% \pkg{lwarp} formatting is inserted in the following.
+% \begin{macrocode}
+\renewcommand*\@nameauth@Hook[1]
+{%
+ \if@nameauth@Lock
+ \@nameauth@InHooktrue%
+ \protected@edef\test{#1}%
+ \expandafter\@nameauth@TestDot\expandafter{\test}%
+ \if@nameauth@InAKA
+ \if@nameauth@AlwaysFormat
+ \@nameauth@FirstFormattrue%
+ \else
+ \unless\if@nameauth@AKAFormat
+ \@nameauth@FirstFormatfalse\fi
+ \fi
+ \if@nameauth@MainFormat
+ \if@nameauth@FirstFormat
+ \bgroup\NamesFormat{%
+ \LWR@textcurrentcolor{\LWR@textcurrentfont{#1}}% lwarp
+ }\egroup%
+ \else
+ \bgroup\MainNameHook{%
+ \LWR@textcurrentcolor{\LWR@textcurrentfont{#1}}% lwarp
+ }\egroup%
+ \fi
+ \else
+ \if@nameauth@FirstFormat
+ \bgroup\FrontNamesFormat{%
+ \LWR@textcurrentcolor{\LWR@textcurrentfont{#1}}% lwarp
+ }\egroup%
+ \else
+ \bgroup\FrontNameHook{%
+ \LWR@textcurrentcolor{\LWR@textcurrentfont{#1}}% lwarp
+ }\egroup%
+ \fi
+ \fi
+ \else
+ \if@nameauth@AlwaysFormat
+ \@nameauth@FirstFormattrue%
+ \fi
+ \if@nameauth@MainFormat
+ \if@nameauth@FirstFormat
+ \bgroup\NamesFormat{%
+ \LWR@textcurrentcolor{\LWR@textcurrentfont{#1}}% lwarp
+ }\egroup%
+ \else
+ \bgroup\MainNameHook{%
+ \LWR@textcurrentcolor{\LWR@textcurrentfont{#1}}% lwarp
+ }\egroup%
+ \fi
+ \else
+ \if@nameauth@FirstFormat
+ \bgroup\FrontNamesFormat{%
+ \LWR@textcurrentcolor{\LWR@textcurrentfont{#1}}% lwarp
+ }\egroup%
+ \else
+ \bgroup\FrontNameHook{%
+ \LWR@textcurrentcolor{\LWR@textcurrentfont{#1}}% lwarp
+ }\egroup%
+ \fi
+ \fi
+ \fi
+ \@nameauth@FirstFormatfalse%
+ \@nameauth@InHookfalse%
+ \fi
+}
+% \end{macrocode}
+%
+% \iffalse
+%</nameauth>
+% \fi
+%
+%
+%
+%
+% \iffalse
%<*nameref>
% \fi
@@ -49842,7 +50582,7 @@ class="td%
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackagePass{natbib}
+\LWR@ProvidesPackagePass{natbib}[2010/09/13]
% \end{macrocode}
%
% Replace math $<$ and $>$ with \cs{textless} and \cs{textgreater}:
@@ -49899,7 +50639,7 @@ class="td%
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{nccfancyhdr}
+\LWR@ProvidesPackageDrop{nccfancyhdr}[2004/12/07]
% \end{macrocode}
%
% \begin{macrocode}
@@ -49964,7 +50704,7 @@ class="td%
%
% Discard all options for \pkg{lwarp-needspace}:
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{needspace}
+\LWR@ProvidesPackageDrop{needspace}[2010/09/12]
\DeclareDocumentCommand{\needspace}{m}{}
\DeclareDocumentCommand{\Needspace}{s m}{}
@@ -49996,7 +50736,7 @@ class="td%
%
% Discard all options for \pkg{lwarp-nextpage}.
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{nextpage}
+\LWR@ProvidesPackageDrop{nextpage}[2009/09/03]
% \end{macrocode}
% \begin{macrocode}
@@ -50095,7 +50835,7 @@ class="td%
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{nonfloat}
+\LWR@ProvidesPackageDrop{nonfloat}[1999/07/05]
% \end{macrocode}
%
% \begin{macrocode}
@@ -50127,7 +50867,7 @@ class="td%
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{nonumonpart}
+\LWR@ProvidesPackageDrop{nonumonpart}[2011/04/15]
% \end{macrocode}
%
%
@@ -50153,7 +50893,7 @@ class="td%
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{nopageno}
+\LWR@ProvidesPackageDrop{nopageno}[1989/01/01]
% \end{macrocode}
%
%
@@ -50182,7 +50922,7 @@ class="td%
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{notespages}
+\LWR@ProvidesPackageDrop{notespages}[2016/08/21]
% \end{macrocode}
%
% \begin{macrocode}
@@ -50234,7 +50974,7 @@ class="td%
% \codehtml
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{nowidow}
+\LWR@ProvidesPackageDrop{nowidow}[2011/09/20]
% \end{macrocode}
% \begin{noindmacro}{\nowidow} \oarg{lines}
@@ -50340,7 +51080,7 @@ class="td%
\DeclareOption{amsmath}{}
\DeclareOption{hyperref}{}
-\LWR@ProvidesPackagePass{ntheorem}
+\LWR@ProvidesPackagePass{ntheorem}[2011/08/15]
% \end{macrocode}
%
%
@@ -51053,7 +51793,7 @@ class="td%
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackagePass{overpic}
+\LWR@ProvidesPackagePass{overpic}[2017/10/06]
% \end{macrocode}
% \begin{macrocode}
@@ -51100,7 +51840,7 @@ class="td%
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{pagegrid}
+\LWR@ProvidesPackageDrop{pagegrid}[2016/05/16]
% \end{macrocode}
%
% \begin{macrocode}
@@ -51130,7 +51870,7 @@ class="td%
% \codehtml
% \begin{macrocode}
\DeclareOption{page}{}
-\LWR@ProvidesPackagePass{pagenote}
+\LWR@ProvidesPackagePass{pagenote}[2009/09/03]
% \end{macrocode}
%
% \iffalse
@@ -51157,7 +51897,7 @@ class="td%
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{pagesel}
+\LWR@ProvidesPackageDrop{pagesel}[2016/05/16]
% \end{macrocode}
%
% \iffalse
@@ -51187,7 +51927,7 @@ class="td%
%
% \codehtml
% \begin{macrocode}
-\LWR@ProvidesPackagePass{paralist}
+\LWR@ProvidesPackagePass{paralist}[2017/01/22]
% \end{macrocode}
%
% The compact environments are identical to the regular ones:
@@ -51238,7 +51978,7 @@ class="td%
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackagePass{parnotes}
+\LWR@ProvidesPackagePass{parnotes}[2016/08/15]
% \end{macrocode}
%
% \begin{macrocode}
@@ -51312,7 +52052,7 @@ class="td%
%
% Discard all options for \pkg{lwarp-parskip}.
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{parskip}
+\LWR@ProvidesPackageDrop{parskip}[2001/04/09]
% \end{macrocode}
% \iffalse
@@ -51341,12 +52081,12 @@ class="td%
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{pbox}
+\LWR@ProvidesPackageDrop{pbox}[2011/12/07]
% \end{macrocode}
%
% \begin{macrocode}
\NewDocumentCommand{\pbox}{O{t} O{} O{t} m +m}{%
-\booltrue{LWR@minipagefullwidth}%
+\global\booltrue{LWR@minipagefullwidth}%
\parbox[#1][#2][#3]{#4}{#5}%
}
@@ -51429,7 +52169,7 @@ class="td%
%
% Discard all options for \pkg{lwarp-pdflscape}:
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{pdflscape}
+\LWR@ProvidesPackageDrop{pdflscape}[2016/05/14]
% \end{macrocode}
%
% \iffalse
@@ -51498,7 +52238,7 @@ class="td%
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackagePass{pdfpages}
+\LWR@ProvidesPackagePass{pdfpages}[2017-10-31]
% \end{macrocode}
%
% Disable option which have no meaning for \HTML\ output:
@@ -51660,7 +52400,7 @@ class="td%
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{pdfprivacy}
+\LWR@ProvidesPackageDrop{pdfprivacy}[2017/12/03]
% \end{macrocode}
%
% \iffalse
@@ -51685,7 +52425,7 @@ class="td%
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{pdfrender}
+\LWR@ProvidesPackageDrop{pdfrender}[2016/05/17]
% \end{macrocode}
%
% \begin{macrocode}
@@ -51718,7 +52458,7 @@ class="td%
%
% Discard all options for \pkg{lwarp-pdfsync}:
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{pdfsync}
+\LWR@ProvidesPackageDrop{pdfsync}[2008/01/26]
% \end{macrocode}
%
% \begin{macrocode}
@@ -51754,7 +52494,7 @@ class="td%
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackagePass{pdftricks}
+\LWR@ProvidesPackagePass{pdftricks}[2003/08/10]
% \end{macrocode}
%
% Reuse the print-mode images:
@@ -51803,7 +52543,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{pdfx}
+\LWR@ProvidesPackageDrop{pdfx}[2017/05/18]
% \end{macrocode}
%
% \iffalse
@@ -51831,7 +52571,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{pfnote}
+\LWR@ProvidesPackageDrop{pfnote}[1999/07/14]
% \end{macrocode}
%
% \iffalse
@@ -51858,7 +52598,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackagePass{phfqit}
+\LWR@ProvidesPackagePass{phfqit}[2017/08/16]
% \end{macrocode}
% \begin{macrocode}
@@ -51903,7 +52643,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
% \codehtml
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{placeins}
+\LWR@ProvidesPackageDrop{placeins}[2005/04/18]
% \end{macrocode}
% \begin{macrocode}
@@ -51933,7 +52673,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{plarydshln}
+\LWR@ProvidesPackageDrop{plarydshln}[2018/10/20]
% \end{macrocode}
%
% \begin{macrocode}
@@ -52005,7 +52745,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
% \pbox <t/y> [width] [l/r] {contents}
\RenewDocumentCommand{\pbox}{d<> O{0pt} O{c} m}{%
-\booltrue{LWR@minipagefullwidth}%
+\global\booltrue{LWR@minipagefullwidth}%
\parbox{#2}{#4}%
}
% \end{macrocode}
@@ -52036,7 +52776,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{plextarydshln}
+\LWR@ProvidesPackageDrop{plextarydshln}[2018/10/20]
% \end{macrocode}
%
% \begin{macrocode}
@@ -52059,14 +52799,14 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
% \section{plextcolortbl}
%
% \DescribePackage{plextcolortbl}
-% \pkg{plextcolortbl} is emulated by \pkg{lwarp-arydshln}.
+% \pkg{plextcolortbl} is emulated by \pkg{lwarp-colortbl}.
%
% \changes{v0.65}{2018/12/17}{\pkg{plextcolortbl}: Added.}
%
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{plextcolortbl}
+\LWR@ProvidesPackageDrop{plextcolortbl}[2018/09/19]
% \end{macrocode}
%
% \begin{macrocode}
@@ -52099,7 +52839,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
%
% Discard all options for \pkg{lwarp-prelim2e}:
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{prelim2e}
+\LWR@ProvidesPackageDrop{prelim2e}[2009/05/29]
% \end{macrocode}
%
% \begin{macrocode}
@@ -52134,7 +52874,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackagePass{prettyref}
+\LWR@ProvidesPackagePass{prettyref}[1998/07/09]
% \end{macrocode}
% \begin{macrocode}
@@ -52290,7 +53030,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackagePass{pst-eps}
+\LWR@ProvidesPackagePass{pst-eps}[2005/05/20]
% \end{macrocode}
%
% \begin{macrocode}
@@ -52325,7 +53065,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackagePass{pstool}
+\LWR@ProvidesPackagePass{pstool}[2018/01/20]
% \end{macrocode}
%
% Each image is placed inside a \env{lateximage} to capture the results of \pkg{psfrag}.
@@ -52372,7 +53112,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackagePass{pstricks}
+\LWR@ProvidesPackagePass{pstricks}[2018/01/06]
% \end{macrocode}
%
% \begin{macrocode}
@@ -52404,7 +53144,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{pxatbegshi}
+\LWR@ProvidesPackageDrop{pxatbegshi}[2017/11/04]
% \end{macrocode}
%
% \begin{macrocode}
@@ -52433,7 +53173,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{pxeveryshi}
+\LWR@ProvidesPackageDrop{pxeveryshi}[2012/05/19]
% \end{macrocode}
%
% \begin{macrocode}
@@ -52463,7 +53203,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{pxftnright}
+\LWR@ProvidesPackageDrop{pxftnright}[2017/02/28]
% \end{macrocode}
%
% \begin{macrocode}
@@ -52493,7 +53233,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{pxjahyper}
+\LWR@ProvidesPackageDrop{pxjahyper}[2018/07/15]
% \end{macrocode}
%
% \iffalse
@@ -52521,7 +53261,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{quotchap}
+\LWR@ProvidesPackageDrop{quotchap}[2012/10/20]
% \end{macrocode}
%
% \begin{macrocode}
@@ -52599,7 +53339,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackagePass{quoting}
+\LWR@ProvidesPackagePass{quoting}[2014/01/28]
% \end{macrocode}
% \begin{macrocode}
@@ -52643,7 +53383,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
% \codehtml
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{ragged2e}
+\LWR@ProvidesPackageDrop{ragged2e}[2009/05/21]
% \end{macrocode}
% \begin{macrocode}
@@ -52701,7 +53441,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{realscripts}
+\LWR@ProvidesPackageDrop{realscripts}[2016/02/13]
% \end{macrocode}
%
% \begin{macrocode}
@@ -52799,11 +53539,12 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
%
% \changes{v0.57}{2018/06/03}{\pkg{register}: Added.}
% \changes{v0.62}{2018/11/12}{\pkg{register}: Updated to v1.8.}
+% \changes{v0.66}{2019/01/04}{\pkg{register}: Verified for v1.9.}
%
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackagePass{register}[2018/11/10]
+\LWR@ProvidesPackagePass{register}[2019/01/01]
% \end{macrocode}
% \begin{macrocode}
@@ -52866,7 +53607,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackagePass{relsize}
+\LWR@ProvidesPackagePass{relsize}[2013/03/29]
% \end{macrocode}
%
% \begin{macrocode}
@@ -52932,7 +53673,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
% \begin{sourcedisplay}
% \cs{usepackage}[makeindex,\textred{makeindexStyle=\{lwarp\_repeatindex\}}]\{lwarp\}
% \end{sourcedisplay}
-% where \filenm{lwarp\_repeatindex.ist} may be copied from the following
+% where \filenm{lwarp_repeatindex.ist} may be copied from the following
% modified version of \filenm{lwarp.ist}:
% \begin{Verbatim}[gobble=2,obeytabs,tabsize=4,frame=leftline]
% preamble
@@ -52998,7 +53739,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{resizegather}
+\LWR@ProvidesPackageDrop{resizegather}[2016/05/16]
% \end{macrocode}
%
% \begin{macrocode}
@@ -53029,7 +53770,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{rmpage}
+\LWR@ProvidesPackageDrop{rmpage}[1997/09/29]
% \end{macrocode}
%
% \iffalse
@@ -53061,7 +53802,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackagePass{romanbar}
+\LWR@ProvidesPackagePass{romanbar}[2012/01/01]
% \end{macrocode}
% \begin{macrocode}
@@ -53094,7 +53835,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{romanbarpagenumber}
+\LWR@ProvidesPackageDrop{romanbarpagenumber}[2015/02/06]
% \end{macrocode}
%
%
@@ -53123,7 +53864,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
%
% \codehtml
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{rotating}
+\LWR@ProvidesPackageDrop{rotating}[2016/08/11]
% \end{macrocode}
% \begin{macrocode}
@@ -53273,7 +54014,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
%
% Discard all options for \pkg{lwarp-savetrees}:
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{savetrees}
+\LWR@ProvidesPackageDrop{savetrees}[2016/04/13]
% \end{macrocode}
%
%
@@ -53335,7 +54076,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackagePass{schemata}
+\LWR@ProvidesPackagePass{schemata}[2016/01/25]
% \end{macrocode}
% \begin{macrocode}
@@ -53382,7 +54123,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{scrextend}
+\LWR@ProvidesPackageDrop{scrextend}[2018/03/30]
% \end{macrocode}
%
% \begin{macrocode}
@@ -53544,7 +54285,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{scrhack}
+\LWR@ProvidesPackageDrop{scrhack}[2018/03/30]
% \end{macrocode}
%
%
@@ -53575,7 +54316,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{scrlayer}
+\LWR@ProvidesPackageDrop{scrlayer}[2018/03/30]
% \end{macrocode}
%
% \begin{macrocode}
@@ -53681,7 +54422,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{scrlayer-notecolumn}
+\LWR@ProvidesPackageDrop{scrlayer-notecolumn}[2018/02/02]
% \end{macrocode}
%
% \begin{macrocode}
@@ -53723,7 +54464,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{scrlayer-scrpage}
+\LWR@ProvidesPackageDrop{scrlayer-scrpage}[2018/03/30]
% \end{macrocode}
%
% \begin{macrocode}
@@ -53799,7 +54540,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{scrpage2}
+\LWR@ProvidesPackageDrop{scrpage2}[2018/03/30]
% \end{macrocode}
%
% \begin{macrocode}
@@ -53934,7 +54675,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackagePass{sectionbreak}
+\LWR@ProvidesPackagePass{sectionbreak}[2018-01-03]
% \end{macrocode}
% \begin{macrocode}
@@ -53977,7 +54718,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{sectsty}
+\LWR@ProvidesPackageDrop{sectsty}[2002/02/25]
% \end{macrocode}
%
% \begin{macrocode}
@@ -54108,7 +54849,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
% \codehtml
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{setspace}
+\LWR@ProvidesPackageDrop{setspace}[2011/12/19]
\newcommand*{\setstretch}[1]{}
\newcommand*{\SetSinglespace}[1]{}
@@ -54176,7 +54917,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
%
% Discard all options for \pkg{lwarp-shadow}:
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{shadow}
+\LWR@ProvidesPackageDrop{shadow}[2003/02/19]
% \end{macrocode}
% \begin{macrocode}
@@ -54217,7 +54958,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
%
% Discard all options for \pkg{lwarp-showidx}:
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{showidx}
+\LWR@ProvidesPackageDrop{showidx}[2014/09/29]
% \end{macrocode}
%
% \cs{@wrindex} is redefined \cs{AtBeginDocument} by the \pkg{lwarp} core.
@@ -54249,7 +54990,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
%
% Discard all options for \pkg{lwarp-showkeys}:
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{showkeys}
+\LWR@ProvidesPackageDrop{showkeys}[2014/10/28]
% \end{macrocode}
% \begin{macrocode}
@@ -54285,7 +55026,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
%
% Discard all options for \pkg{lwarp-sidecap}.
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{sidecap}
+\LWR@ProvidesPackageDrop{sidecap}[2003/06/06]
% \end{macrocode}
% See: \\
@@ -54452,7 +55193,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackagePass{SIunits}
+\LWR@ProvidesPackagePass{SIunits}[2007/12/02]
% \end{macrocode}
%
% Patched for copy/paste with the \HTML\ \attribute{alt} tag:
@@ -54506,7 +55247,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
% \begin{macrocode}
\RequirePackage{xcolor}% for \convertcolorspec
-\LWR@ProvidesPackagePass{siunitx}
+\LWR@ProvidesPackagePass{siunitx}[2018/05/17]
% \end{macrocode}
% \changes{v0.50}{2018/02/24}{\pkg{siunitx}: Improved units.}
@@ -54922,7 +55663,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
% \begin{macrocode}
\RequirePackage{soul}
\RequirePackage{soulutf8}
-\LWR@ProvidesPackageDrop{soulpos}
+\LWR@ProvidesPackageDrop{soulpos}[2012/02/25]
% \end{macrocode}
%
% \begin{macrocode}
@@ -54970,7 +55711,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{soulutf8}
+\LWR@ProvidesPackageDrop{soulutf8}[2016/05/16]
% \end{macrocode}
%
%
@@ -55002,7 +55743,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackagePass{splitidx}
+\LWR@ProvidesPackagePass{splitidx}[2016/02/18]
% \end{macrocode}
%
% \begin{macrocode}
@@ -55157,7 +55898,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{stabular}
+\LWR@ProvidesPackageDrop{stabular}[2014/03/20]
% \end{macrocode}
%
% \oarg{vpos} \marg{colspec}
@@ -55208,7 +55949,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{stfloats}
+\LWR@ProvidesPackageDrop{stfloats}[2017/03/27]
% \end{macrocode}
%
% \pkg{stfloats} may have been preloaded by a \pkg{ltj*} class.
@@ -55235,6 +55976,58 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
%
%
%
+% \iffalse
+%<*subcaption>
+% \fi
+%
+% \part{lwarp-subcaption.sty}
+%
+% \section{subcaption}
+%
+% \credits{Axel Sommerfeldt}
+%
+% \DescribePackage{subcaption}
+% \pkg{subcaption} is patched for use by \pkg{lwarp}.
+%
+% \changes{v0.66}{2018/12/31}{\pkg{subcaption}: Added.}
+%
+% \codehtml
+%
+% \begin{macrocode}
+\LWR@ProvidesPackagePass{subcaption}[2018/05/01]
+% \end{macrocode}
+%
+% Tells \pkg{lwarp} to ignore minipage widths inside a subfigure or subtable.
+% In print mode the minipages are used to place the items next to each other.
+% In \HTML\ they are placed side-by-side automatically.
+% \begin{macrocode}
+\ifdef{\subcaption@minipage}{
+ \xpatchcmd{\subcaption@minipage}
+ {\minipage}
+ {\minipagefullwidth\minipage}
+ {}
+ {\LWR@patcherror{subcaption}{subcaption@minipage}}
+}{}
+% \end{macrocode}
+%
+% Likewise for a \cs{subcaptionbox}:
+% \begin{macrocode}
+\ifdef{\subcaptionbox}{
+ \xpretocmd{\subcaptionbox}
+ {\minipagefullwidth}
+ {}
+ {\LWR@patcherror{subcaption}{subcaptionbox}}
+}{}
+% \end{macrocode}
+%
+% \iffalse
+%</subcaption>
+% \fi
+%
+%
+%
+%
+%
%
%
% \iffalse
@@ -55258,7 +56051,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
%
% Accept all options for \pkg{lwarp-subfig}:
% \begin{macrocode}
-\LWR@ProvidesPackagePass{subfig}
+\LWR@ProvidesPackagePass{subfig}[2005/06/28]
% \end{macrocode}
% \begin{noindmacro}{\sf@@@subfloat}
@@ -55554,7 +56347,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{subfigure}
+\LWR@ProvidesPackageDrop{subfigure}[2002/03/15]
\RequirePackage{subfig}
% \end{macrocode}
%
@@ -55607,7 +56400,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
%
% \codehtml
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{supertabular}
+\LWR@ProvidesPackageDrop{supertabular}[2004/02/20]
% \end{macrocode}
%
% \limitssupertabular
@@ -55704,7 +56497,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
%
% Discard all options for \pkg{lwarp-syntonly}:
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{syntonly}
+\LWR@ProvidesPackageDrop{syntonly}[2017/06/30]
% \end{macrocode}
%
% \begin{macrocode}
@@ -55780,7 +56573,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
%
% Discard all options for \pkg{lwarp-tabularx}:
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{tabularx}
+\LWR@ProvidesPackageDrop{tabularx}[2016/02/03]
% \end{macrocode}
% \begin{macrocode}
@@ -55823,7 +56616,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
% Column types |L|, |C|, |R|, and |J| are emulated by \pkg{lwarp}
% core code.
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{tabulary}
+\LWR@ProvidesPackageDrop{tabulary}[2014/06/11]
% \end{macrocode}
% \begin{macrocode}
@@ -55864,7 +56657,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{tascmac}
+\LWR@ProvidesPackageDrop{tascmac}[2018/03/09]
% \end{macrocode}
%
% \begin{macrocode}
@@ -55971,7 +56764,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{textarea}
+\LWR@ProvidesPackageDrop{textarea}[2005/12/26]
% \end{macrocode}
%
% \begin{macrocode}
@@ -56024,7 +56817,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackagePass{textcomp}
+\LWR@ProvidesPackagePass{textcomp}[2017/04/05]
% \end{macrocode}
%
%
@@ -56183,7 +56976,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{textfit}
+\LWR@ProvidesPackageDrop{textfit}[1994/04/15]
% \end{macrocode}
%
% \begin{macrocode}
@@ -56237,7 +57030,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
% \codehtml
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{textpos}
+\LWR@ProvidesPackageDrop{textpos}[2016/06/07]
% \end{macrocode}
% \begin{macrocode}
@@ -56300,7 +57093,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackagePass{theorem}
+\LWR@ProvidesPackagePass{theorem}[2014/10/28]
% \end{macrocode}
@@ -56516,7 +57309,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{thinsp}
+\LWR@ProvidesPackageDrop{thinsp}[2016/10/02]
% \end{macrocode}
%
% \begin{macrocode}
@@ -56552,7 +57345,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{threadcol}
+\LWR@ProvidesPackageDrop{threadcol}[2013/01/06]
% \end{macrocode}
%
% \begin{macrocode}
@@ -56588,18 +57381,18 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
% \codehtml
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{threeparttable}
+\LWR@ProvidesPackageDrop{threeparttable}[2003/06/13]
% \end{macrocode}
-
-% \begin{noindmacro}{\LWR@printtablenote} \marg{text}
-%
-% Prints the table note item header inside a \CSS\ class of |tnoteitemheader|.
-% \begin{macrocode}
-\newcommand{\LWR@printtablenote}[1]{\InlineClass{tnoteitemheader}{#1}}
-% \end{macrocode}
-% \end{noindmacro}
+% ^^A Broken:
+% ^^A % \begin{noindmacro}{\LWR@printtablenote} \marg{text}
+% ^^A %
+% ^^A % Prints the table note item header inside a \CSS\ class of |tnoteitemheader|.
+% ^^A % \begin{macrocode}
+% ^^A % \newrobustcmd{\LWR@printtablenote}[1]{\InlineClass{tnoteitemheader}{#1}}
+% ^^A % \end{macrocode}
+% ^^A % \end{noindmacro}
@@ -56617,9 +57410,12 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
{%
\LWR@forcenewpage
\BlockClass{tnotes}%
-\ltx@ifpackageloaded{enumitem}{%
-\setlist[description]{format=\LWR@printtablenote}%
-}{}%
+% \end{macrocode}
+% ^^A broken:
+% ^^A % \ltx@ifpackageloaded{enumitem}{%
+% ^^A % \setlist[description]{format=\LWR@printtablenote}%
+% ^^A % }{}%
+% \begin{macrocode}
\description%
}
{%
@@ -56658,7 +57454,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{thumb}
+\LWR@ProvidesPackageDrop{thumb}[1997/12/24]
% \end{macrocode}
%
% \begin{macrocode}
@@ -56690,7 +57486,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{thumbs}
+\LWR@ProvidesPackageDrop{thumbs}[2014/03/09]
% \end{macrocode}
%
% \begin{macrocode}
@@ -56846,7 +57642,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
%
% \codehtml
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{titleps}
+\LWR@ProvidesPackageDrop{titleps}[2016/03/15]
% \end{macrocode}
%
% \cs{pagestyle} and \cs{thispagestyle} are already disabled in the \pkg{lwarp} code.
@@ -57082,7 +57878,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
%
% \codehtml
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{titleref}
+\LWR@ProvidesPackageDrop{titleref}[2001/04/05]
\LetLtxMacro\titleref\nameref
@@ -57129,7 +57925,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
% \codehtml
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{titlesec}
+\LWR@ProvidesPackageDrop{titlesec}[2016/03/21]
% \end{macrocode}
% \begin{noindmacro}{\titlelabel} \marg{label-format}
@@ -57274,7 +58070,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
% \codehtml
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{titletoc}
+\LWR@ProvidesPackageDrop{titletoc}[2011/12/15]
% \end{macrocode}
%
@@ -57417,7 +58213,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
% \codehtml
% \begin{macrocode}
-\LWR@ProvidesPackagePass{titling}
+\LWR@ProvidesPackagePass{titling}[2009/09/04]
% \end{macrocode}
%
%
@@ -57710,7 +58506,6 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
%
%
%
-%
% \iffalse
%<*tocbasic>
% \fi
@@ -57722,21 +58517,23 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
% \credits{Markus Kohm}
%
% \DescribePackage{tocbasic}
-% \pkg{tocbasic} is patched for use by \pkg{lwarp}.
-%
+% \pkg{tocbasic} is nullified for \pkg{lwarp}.
+% %
% \usedbykomascript
%
% \changes{v0.44}{2017/11/20}{\pkg{tocbasic}: Added.}
+% \changes{v0.66}{2019/01/12}{\pkg{tocbasic}: Updated to v3.26a.}
%
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackagePass{tocbasic}
+\LWR@ProvidesPackagePass{tocbasic}[2018/12/30]
% \end{macrocode}
% \begin{macrocode}
\DeclareDocumentCommand{\usetocbasicnumberline}{o}{}
\DeclareDocumentCommand{\DeclareTOCStyleEntry}{o m m}{}
+\DeclareDocumentCommand{\DeclareTOCStyleEntries}{o m m}{}
\DeclareDocumentCommand{\DeclareTOCEntryStyle}{m o m}{}
\DeclareDocumentCommand{\DefineTOCEntryOption}{m o m}{}
\DeclareDocumentCommand{\DefineTOCEntryBooleanOption}{m o m m m}{}
@@ -57780,7 +58577,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
% \begin{macrocode}
\let\simplechapterdelim\relax
-\LWR@ProvidesPackagePass{tocbibind}
+\LWR@ProvidesPackagePass{tocbibind}[2010/10/13]
% \end{macrocode}
% \begin{macrocode}
@@ -57852,7 +58649,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{tocenter}
+\LWR@ProvidesPackageDrop{tocenter}[2004/12/09]
% \end{macrocode}
%
% \begin{macrocode}
@@ -57892,7 +58689,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
% \codehtml
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{tocloft}
+\LWR@ProvidesPackageDrop{tocloft}[2017/08/31]
% \end{macrocode}
%
@@ -58300,7 +59097,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{tocstyle}
+\LWR@ProvidesPackageDrop{tocstyle}[2017/02/23]
% \end{macrocode}
%
% \begin{macrocode}
@@ -58341,7 +59138,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackagePass{todo}
+\LWR@ProvidesPackagePass{todo}[2010/03/31]
% \end{macrocode}
% \begin{macrocode}
@@ -58411,7 +59208,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackagePass{todonotes}
+\LWR@ProvidesPackagePass{todonotes}[2012/07/25]
% \end{macrocode}
%
% \begin{macrocode}
@@ -58536,7 +59333,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{tram}
+\LWR@ProvidesPackageDrop{tram}[2013/04/04]
% \end{macrocode}
%
% \begin{macrocode}
@@ -58575,7 +59372,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
%
% Discard all options for \pkg{lwarp-transparent}:
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{transparent}
+\LWR@ProvidesPackageDrop{transparent}[2016/05/16]
% \end{macrocode}
%
% \begin{macrocode}
@@ -58613,7 +59410,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{trimclip}
+\LWR@ProvidesPackageDrop{trimclip}[2018/04/08]
% \end{macrocode}
%
% The third argument, the text, is not touched.
@@ -58672,7 +59469,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
% Discard all options for \pkg{lwarp-trivfloat}.
% This tells \pkg{trivfloat} not to use \pkg{floatrow} or \pkg{memoir}.
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{trivfloat}
+\LWR@ProvidesPackageDrop{trivfloat}[2009/04/23]
\LWR@origRequirePackage{trivfloat}
% \end{macrocode}
@@ -58744,6 +59541,39 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
%
%
% \iffalse
+%<*truncate>
+% \fi
+%
+% \part{lwarp-truncate.sty}
+%
+% \section{truncate}
+%
+% \DescribePackage{truncate}
+% \pkg{truncate} is ignored.
+%
+% \changes{v0.66}{2019/02/03}{\pkg{truncate}: Added.}
+%
+% \codehtml
+%
+% \begin{macrocode}
+\LWR@ProvidesPackageDrop{truncate}[2001/08/20]
+% \end{macrocode}
+%
+% \begin{macrocode}
+\providecommand{\TruncateMarker}{}
+\newcommand{\truncate}[3][\TruncateMarker]{#3}
+% \end{macrocode}
+%
+% \iffalse
+%</truncate>
+% \fi
+%
+%
+%
+%
+%
+%
+% \iffalse
%<*turnthepage>
% \fi
%
@@ -58759,7 +59589,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{turnthepage}
+\LWR@ProvidesPackageDrop{turnthepage}[2011/03/24]
% \end{macrocode}
%
% \begin{macrocode}
@@ -58824,7 +59654,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{typearea}
+\LWR@ProvidesPackageDrop{typearea}[2018/03/30]
% \end{macrocode}
%
% \begin{macrocode}
@@ -58975,7 +59805,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{underscore}
+\LWR@ProvidesPackageDrop{underscore}[2006/09/13]
% \end{macrocode}
%
% \iffalse
@@ -59001,7 +59831,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
%
% Values are not styled by \CSS, and take the style of the surrounding \HTML\ text.
%
-% Units are styled according to the print verison,
+% Units are styled according to the print version,
% so they will be forced to upright roman in \HTML\ if the print version does so.
% It may be necessary to adjust the document's body \CSS\ to match the print version.
%
@@ -59087,7 +59917,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackagePass{unitsdef}
+\LWR@ProvidesPackagePass{unitsdef}[2005/01/04]
% \end{macrocode}
%
% \begin{macrocode}
@@ -59138,7 +59968,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
%
% Discard all options for \pkg{lwarp-upref}:
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{upref}
+\LWR@ProvidesPackageDrop{upref}[2007/03/14]
% \end{macrocode}
%
%
@@ -59168,7 +59998,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackagePass{url}
+\LWR@ProvidesPackagePass{url}[2013/09/16]
% \end{macrocode}
% \pkg{url} uses math mode to print its string inside a group, so the original meaning
@@ -59206,7 +60036,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{uspace}
+\LWR@ProvidesPackageDrop{uspace}[2016/11/06]
% \end{macrocode}
%
% \iffalse
@@ -59235,7 +60065,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
%
% Pass all options for \pkg{lwarp-verse}:
% \begin{macrocode}
-\LWR@ProvidesPackagePass{verse}
+\LWR@ProvidesPackagePass{verse}[2009/09/04]
% \end{macrocode}
%
@@ -59324,7 +60154,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{versonotes}
+\LWR@ProvidesPackageDrop{versonotes}[2015/12/08]
% \end{macrocode}
%
% \begin{macrocode}
@@ -59360,7 +60190,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{vertbars}
+\LWR@ProvidesPackageDrop{vertbars}[2010/11/27]
% \end{macrocode}
%
% \begin{macrocode}
@@ -59405,7 +60235,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{vmargin}
+\LWR@ProvidesPackageDrop{vmargin}[2004/07/15]
% \end{macrocode}
%
% \begin{macrocode}
@@ -59459,7 +60289,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackagePass{vowel}
+\LWR@ProvidesPackagePass{vowel}[2002/08/08]
% \end{macrocode}
% \begin{macrocode}
@@ -59529,7 +60359,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
%
% \codehtml
% \begin{macrocode}
-\LWR@ProvidesPackagePass{vwcol}
+\LWR@ProvidesPackagePass{vwcol}[2015/02/10]
% \end{macrocode}
%
% Factored from \cs{vwcol}.
@@ -59677,7 +60507,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
% \codehtml
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{wallpaper}
+\LWR@ProvidesPackageDrop{wallpaper}[2005/01/18]
% \end{macrocode}
% \begin{macrocode}
@@ -59726,7 +60556,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{watermark}
+\LWR@ProvidesPackageDrop{watermark}[2004/12/09]
% \end{macrocode}
%
% \begin{macrocode}
@@ -59793,7 +60623,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
% \codehtml
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{wrapfig}
+\LWR@ProvidesPackageDrop{wrapfig}[2003/01/31]
% \end{macrocode}
%
%
@@ -60041,7 +60871,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf',
%
% \codehtml
% \begin{macrocode}
-\LWR@ProvidesPackagePass{xcolor}
+\LWR@ProvidesPackagePass{xcolor}[2016/05/11]
% \end{macrocode}
% \begin{macrocode}
@@ -60624,7 +61454,7 @@ height:\LWR@printlength{\LWR@tempheight}%
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackagePass{xellipsis}
+\LWR@ProvidesPackagePass{xellipsis}[2015/11/01]
% \end{macrocode}
% \begin{macrocode}
@@ -60718,7 +61548,7 @@ height:\LWR@printlength{\LWR@tempheight}%
%
% \codehtml
% \begin{macrocode}
-\LWR@ProvidesPackagePass{xfrac}
+\LWR@ProvidesPackagePass{xfrac}[2018-08-23]
% \end{macrocode}
% In the user's document preamble, \pkg{lwarp} should be loaded
@@ -60755,7 +61585,7 @@ height:\LWR@printlength{\LWR@tempheight}%
% \begin{macro}{\xfracHTMLfontsize}
% \changes{v0.19}{2016/06/06}{Added.}
-% \gindex{font>size>\pkg{xfrac}}
+% \gindex{font>size>xfrac=\pkg{xfrac}}
% User-redefinable macro which controls the font size of the fraction.
% \begin{macrocode}
\newcommand*{\xfracHTMLfontsize}{.6em}
@@ -60913,7 +61743,7 @@ height:\LWR@printlength{\LWR@tempheight}%
% \begin{macrocode}
\RequirePackage{tabularx}
-\LWR@ProvidesPackageDrop{xltabular}
+\LWR@ProvidesPackageDrop{xltabular}[2018/05/23]
\DeclareDocumentEnvironment{xltabular}{o m m}
{\longtable{#3}}
@@ -60948,7 +61778,7 @@ height:\LWR@printlength{\LWR@tempheight}%
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{xltxtra}
+\LWR@ProvidesPackageDrop{xltxtra}[2016/01/21]
% \end{macrocode}
%
% \begin{macrocode}
@@ -61001,7 +61831,7 @@ height:\LWR@printlength{\LWR@tempheight}%
%
% Discard all options for \pkg{lwarp-xmpincl}:
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{xmpincl}
+\LWR@ProvidesPackageDrop{xmpincl}[2008/05/10]
% \end{macrocode}
%
% \begin{macrocode}
@@ -61121,7 +61951,7 @@ height:\LWR@printlength{\LWR@tempheight}%
%
% \codehtml
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{xtab}
+\LWR@ProvidesPackageDrop{xtab}[2011/07/31]
% \end{macrocode}
%
% \limitssupertabular
@@ -61261,7 +62091,7 @@ height:\LWR@printlength{\LWR@tempheight}%
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{xurl}
+\LWR@ProvidesPackageDrop{xurl}[2018/06/02]
% \end{macrocode}
%
% \iffalse
@@ -61294,7 +62124,7 @@ height:\LWR@printlength{\LWR@tempheight}%
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackagePass{xy}
+\LWR@ProvidesPackagePass{xy}[2013/10/06]
% \end{macrocode}
% \begin{macrocode}
@@ -61384,7 +62214,7 @@ height:\LWR@printlength{\LWR@tempheight}%
% \codehtml
%
% \begin{macrocode}
-\LWR@ProvidesPackageDrop{zwpagelayout}
+\LWR@ProvidesPackageDrop{zwpagelayout}[2013/01/13]
% \end{macrocode}
%
% \begin{macrocode}
diff --git a/Master/texmf-dist/source/latex/lwarp/lwarp.ins b/Master/texmf-dist/source/latex/lwarp/lwarp.ins
index accdefe8f57..883e7c7a788 100644
--- a/Master/texmf-dist/source/latex/lwarp/lwarp.ins
+++ b/Master/texmf-dist/source/latex/lwarp/lwarp.ins
@@ -1,5 +1,5 @@
%% lwarp.ins
-%% Copyright 2016-2017 Brian Dunn
+%% Copyright 2016-2019 Brian Dunn
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -14,7 +14,7 @@
%% The Current Maintainer of this work is Brian Dunn.
%%
%% This work consists of the files lwarp.dtx and lwarp.ins
-%% and the derived file lwarp.sty.
+%% and the derived files lwarp.sty and lwarp-*.sty
\input docstrip.tex
\keepsilent
%% \usedir{tex/latex/ package }
@@ -53,6 +53,7 @@ version 2005/12/01 or later.
\file{lwarp-anonchap.sty}{\from{lwarp.dtx}{anonchap}}
\file{lwarp-anysize.sty}{\from{lwarp.dtx}{anysize}}
\file{lwarp-appendix.sty}{\from{lwarp.dtx}{appendix}}
+\file{lwarp-ar.sty}{\from{lwarp.dtx}{ar}}
\file{lwarp-arabicfront.sty}{\from{lwarp.dtx}{arabicfront}}
\file{lwarp-array.sty}{\from{lwarp.dtx}{array}}
\file{lwarp-arydshln.sty}{\from{lwarp.dtx}{arydshln}}
@@ -88,7 +89,6 @@ version 2005/12/01 or later.
\file{lwarp-cases.sty}{\from{lwarp.dtx}{cases}}
\file{lwarp-changebar.sty}{\from{lwarp.dtx}{changebar}}
\file{lwarp-changepage.sty}{\from{lwarp.dtx}{changepage}}
-\file{lwarp-chngpage.sty}{\from{lwarp.dtx}{chngpage}}
\file{lwarp-chappg.sty}{\from{lwarp.dtx}{chappg}}
\file{lwarp-chapterbib.sty}{\from{lwarp.dtx}{chapterbib}}
\file{lwarp-chemfig.sty}{\from{lwarp.dtx}{chemfig}}
@@ -97,6 +97,7 @@ version 2005/12/01 or later.
\file{lwarp-chemmacros.sty}{\from{lwarp.dtx}{chemmacros}}
\file{lwarp-chemnum.sty}{\from{lwarp.dtx}{chemnum}}
\file{lwarp-chkfloat.sty}{\from{lwarp.dtx}{chkfloat}}
+\file{lwarp-chngpage.sty}{\from{lwarp.dtx}{chngpage}}
\file{lwarp-cite.sty}{\from{lwarp.dtx}{cite}}
\file{lwarp-CJK.sty}{\from{lwarp.dtx}{CJK}}
\file{lwarp-CJKutf8.sty}{\from{lwarp.dtx}{CJKutf8}}
@@ -119,6 +120,7 @@ version 2005/12/01 or later.
\file{lwarp-draftwatermark.sty}{\from{lwarp.dtx}{draftwatermark}}
\file{lwarp-easy-todo.sty}{\from{lwarp.dtx}{easy-todo}}
\file{lwarp-ebook.sty}{\from{lwarp.dtx}{ebook}}
+\file{lwarp-ed.sty}{\from{lwarp.dtx}{ed}}
\file{lwarp-ellipsis.sty}{\from{lwarp.dtx}{ellipsis}}
\file{lwarp-embrac.sty}{\from{lwarp.dtx}{embrac}}
\file{lwarp-emptypage.sty}{\from{lwarp.dtx}{emptypage}}
@@ -192,7 +194,6 @@ version 2005/12/01 or later.
\file{lwarp-idxlayout.sty}{\from{lwarp.dtx}{idxlayout}}
\file{lwarp-ifoddpage.sty}{\from{lwarp.dtx}{ifoddpage}}
\file{lwarp-imakeidx.sty}{\from{lwarp.dtx}{imakeidx}}
-\file{lwarp-indentfirst.sty}{\from{lwarp.dtx}{indentfirst}}
\file{lwarp-index.sty}{\from{lwarp.dtx}{index}}
\file{lwarp-intopdf.sty}{\from{lwarp.dtx}{intopdf}}
\file{lwarp-keyfloat.sty}{\from{lwarp.dtx}{keyfloat}}
@@ -237,6 +238,7 @@ version 2005/12/01 or later.
\file{lwarp-multirow.sty}{\from{lwarp.dtx}{multirow}}
\file{lwarp-multitoc.sty}{\from{lwarp.dtx}{multitoc}}
\file{lwarp-musicography.sty}{\from{lwarp.dtx}{musicography}}
+\file{lwarp-nameauth.sty}{\from{lwarp.dtx}{nameauth}}
\file{lwarp-nameref.sty}{\from{lwarp.dtx}{nameref}}
\file{lwarp-natbib.sty}{\from{lwarp.dtx}{natbib}}
\file{lwarp-nccfancyhdr.sty}{\from{lwarp.dtx}{nccfancyhdr}}
@@ -330,6 +332,7 @@ version 2005/12/01 or later.
\file{lwarp-srctex.sty}{\from{lwarp.dtx}{srctex}}
\file{lwarp-stabular.sty}{\from{lwarp.dtx}{stabular}}
\file{lwarp-stfloats.sty}{\from{lwarp.dtx}{stfloats}}
+\file{lwarp-subcaption.sty}{\from{lwarp.dtx}{subcaption}}
\file{lwarp-subfig.sty}{\from{lwarp.dtx}{subfig}}
\file{lwarp-subfigure.sty}{\from{lwarp.dtx}{subfigure}}
\file{lwarp-supertabular.sty}{\from{lwarp.dtx}{supertabular}}
@@ -365,6 +368,7 @@ version 2005/12/01 or later.
\file{lwarp-transparent.sty}{\from{lwarp.dtx}{transparent}}
\file{lwarp-trimclip.sty}{\from{lwarp.dtx}{trimclip}}
\file{lwarp-trivfloat.sty}{\from{lwarp.dtx}{trivfloat}}
+\file{lwarp-truncate.sty}{\from{lwarp.dtx}{truncate}}
\file{lwarp-turnthepage.sty}{\from{lwarp.dtx}{turnthepage}}
\file{lwarp-twoup.sty}{\from{lwarp.dtx}{twoup}}
\file{lwarp-typearea.sty}{\from{lwarp.dtx}{typearea}}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-CJK.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-CJK.sty
index c08f6a2e620..b67e3c507e0 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-CJK.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-CJK.sty
@@ -19,7 +19,7 @@
\LWR@loadnever{CJK}{ctex, xeCJK}
}
-\LWR@ProvidesPackagePass{CJK}
+\LWR@ProvidesPackagePass{CJK}[2015/04/18]
\endinput
%%
%% End of file `lwarp-CJK.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-CJKutf8.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-CJKutf8.sty
index 07644d99e43..5ba65a9d32d 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-CJKutf8.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-CJKutf8.sty
@@ -19,7 +19,7 @@
\LWR@loadnever{CJKutf8}{ctex, xeCJK}
}
-\LWR@ProvidesPackagePass{CJKutf8}
+\LWR@ProvidesPackagePass{CJKutf8}[2015/04/18]
\endinput
%%
%% End of file `lwarp-CJKutf8.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-SIunits.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-SIunits.sty
index d210dc7a038..cf60698d94e 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-SIunits.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-SIunits.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackagePass{SIunits}
+\LWR@ProvidesPackagePass{SIunits}[2007/12/02]
\DeclareRobustCommand{\unit}[2]{%
\@inunitcommandtrue% original
\LWR@subsingledollar*% lwarp
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-a4.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-a4.sty
index 96ccb036421..8300cebf584 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-a4.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-a4.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{a4}
+\LWR@ProvidesPackageDrop{a4}[2004/04/15]
\newcommand*{\WideMargins}{}
\endinput
%%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-a4wide.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-a4wide.sty
index b7b4856ccac..e78fd5f9d31 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-a4wide.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-a4wide.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{a4wide}
+\LWR@ProvidesPackageDrop{a4wide}[1994/08/30]
\endinput
%%
%% End of file `lwarp-a4wide.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-abstract.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-abstract.sty
index 4c263a3dce4..58fd6e6b496 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-abstract.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-abstract.sty
@@ -16,7 +16,7 @@
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
\ProvideDocumentEnvironment{abstract}{}{}{}
-\LWR@ProvidesPackagePass{abstract}
+\LWR@ProvidesPackagePass{abstract}[2009/06/08]
\AtBeginDocument{
\BeforeBeginEnvironment{abstract}{
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-accsupp.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-accsupp.sty
index 73f2939e9f1..d90297667ea 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-accsupp.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-accsupp.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{accsupp}
+\LWR@ProvidesPackageDrop{accsupp}[2018/03/28]
\newcommand*{\BeginAccSupp}[1]{}
\newcommand*{\EndAccSupp}[1]{}
\endinput
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-acro.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-acro.sty
index d0e9fbd83dd..19b9e76d870 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-acro.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-acro.sty
@@ -16,7 +16,7 @@
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackagePass{acro}
+\LWR@ProvidesPackagePass{acro}[2017/01/30]
\ExplSyntaxOn
\NewDocumentCommand \LWR@DeclareAcronym {mm}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-acronym.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-acronym.sty
index 3f0c114ce89..521bd0be089 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-acronym.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-acronym.sty
@@ -16,7 +16,7 @@
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackagePass{acronym}
+\LWR@ProvidesPackagePass{acronym}[2015/03/21]
\renewcommand{\acfia}[1]{%
{\textit{\AC@acl{#1}}} (\ifAC@starred\acs*{#1}\else\acs{#1}\fi)}
@@ -24,40 +24,27 @@
\renewcommand*\AC@acs[1]{%
\expandafter\AC@get\csname fn@#1\endcsname\@firstoftwo{#1}}
+\renewcommand{\@starttoc}[1]{
+\LWR@htmlelementclass{nav}{#1}
+\LetLtxMacro\@verridelabel\@gobble
+\LWR@orig@starttoc{#1}
+\LWR@htmlelementclassend{nav}{#1}
+}
+
\renewcommand*\AC@und@newl@bel[3]{%
\@ifundefined{#1@#3}%
{%
\global\expandafter\let\csname#2@#3\endcsname\@nnil
+ \global\expandafter\let\csname#2@#3@lwarp\endcsname\@nnil% lwarp
\global\expandafter\let\csname#2@#3@cref\endcsname\@nnil% lwarp
}%
{%
\global\expandafter\let\csname#1@#3\endcsname\relax
+ \global\expandafter\let\csname#1@#3@lwarp\endcsname\relax% lwarp
\global\expandafter\let\csname#1@#3@cref\endcsname\relax% lwarp
- \global\expandafter\let\csname Z@R@#3\endcsname\relax% lwarp
}%
}%
-\renewcommand*\AC@testdef[3]{%
-\ifstrequal{#1}{Z@R}{}{% lwarp
- \@ifundefined{s@#2}\@secondoftwo\@firstofone
- {%
- \expandafter\ifx\csname s@#2\endcsname\empty
- \expandafter\@firstofone
- \else
- \expandafter\xdef\csname s@#2\endcsname{%
- \expandafter\expandafter
- \expandafter\@gobble
- \csname s@#2\endcsname
- }%
- \expandafter\@gobble
- \fi
- }%
- {%
- \@testdef{#1}{#2}{#3}%
- }%
-}% lwarp
-}%
-
\endinput
%%
%% End of file `lwarp-acronym.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-adjmulticol.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-adjmulticol.sty
index 5e1c6431e2b..821d30baac5 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-adjmulticol.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-adjmulticol.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{adjmulticol}
+\LWR@ProvidesPackageDrop{adjmulticol}[2012/01/20]
\RequirePackage{multicol}
\NewDocumentEnvironment{adjmulticols}{s m m m}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-afterpage.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-afterpage.sty
index 3376be7a49d..f23f1037c8f 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-afterpage.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-afterpage.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{afterpage}
+\LWR@ProvidesPackageDrop{afterpage}[2014/10/28]
\newcommand{\afterpage}[1]{#1}
\endinput
%%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-algorithm2e.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-algorithm2e.sty
index fddd7183fa4..19d3b4c1b7f 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-algorithm2e.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-algorithm2e.sty
@@ -16,7 +16,7 @@
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackagePass{algorithm2e}
+\LWR@ProvidesPackagePass{algorithm2e}[2017/07/18]
\renewcommand{\l@algocf}[2]{\hypertocfloat{1}{algocf}{loa}{#1}{#2}}
\newcommand*{\LWR@floatstyle@algocf}{ruled}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-algorithmicx.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-algorithmicx.sty
index 711b7497d64..8c9768d6658 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-algorithmicx.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-algorithmicx.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackagePass{algorithmicx}
+\LWR@ProvidesPackagePass{algorithmicx}[2005/04/27]
\begin{warpHTML}
\AtBeginEnvironment{algorithmic}{%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-alltt.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-alltt.sty
index 828a4f0f99d..4f5b7d1b825 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-alltt.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-alltt.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackagePass{alltt}
+\LWR@ProvidesPackagePass{alltt}[1997/06/16]
\AfterEndPreamble{
\LWR@traceinfo{Patching alltt.}
\AtBeginEnvironment{alltt}{%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-amsmath.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-amsmath.sty
index 2a08c69341a..08fcdee9442 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-amsmath.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-amsmath.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackagePass{amsmath}
+\LWR@ProvidesPackagePass{amsmath}[2017/09/02]
\def\maketag@@@#1{\text{#1}}
\def\tagform@#1{\maketag@@@{(\ignorespaces#1\unskip)}}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-amsthm.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-amsthm.sty
index 0a7b0132cd5..63581a35433 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-amsthm.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-amsthm.sty
@@ -27,7 +27,7 @@
}
}
{}
-\LWR@ProvidesPackagePass{amsthm}
+\LWR@ProvidesPackagePass{amsthm}[2017/10/31]
\newcommand{\LWR@newtheoremstyle}{plain}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-anonchap.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-anonchap.sty
index b286738419d..6e20a3ed104 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-anonchap.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-anonchap.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{anonchap}
+\LWR@ProvidesPackageDrop{anonchap}[2009/08/03]
\newcommand{\simplechapter}[1][\@empty]{%
\def\@chapcntformat##1{%
#1~\csname the##1\endcsname\simplechapterdelim\quad%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-anysize.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-anysize.sty
index 9b2617cc8c3..2ceba0e48b1 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-anysize.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-anysize.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{anysize}
+\LWR@ProvidesPackageDrop{anysize}[1994/08/13]
\def\papersize#1#2{}
\def\marginsize#1#2#3#4{}
\endinput
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-appendix.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-appendix.sty
index 4794c1f132f..4e07d3fe4d6 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-appendix.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-appendix.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackagePass{appendix}
+\LWR@ProvidesPackagePass{appendix}[2009/09/02]
\renewcommand*{\@chap@pppage}{%
\part*{\appendixpagename}
\if@dotoc@pp
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-ar.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-ar.sty
new file mode 100644
index 00000000000..68f93bea94c
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-ar.sty
@@ -0,0 +1,60 @@
+%%
+%% This is file `lwarp-ar.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx (with options: `ar')
+%% This is a generated file.
+%% Copyright 2016-2018 Brian Dunn
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+\LWR@ProvidesPackagePass{ar}[2012/01/23]
+\newlength{\LWR@ar@width}
+
+\newcommand*{\LWR@ar@printwidth}[1]{%
+ \setlength{\LWR@ar@width}{\widthof{#1}}%
+ width:%
+ \LWR@convertto{em}{\the\LWR@ar@width}em%
+}
+\newrobustcmd*{\LWR@HTML@AR}{%
+ \begin{lateximage}*[AR][\LWR@f@series][\LWR@ar@printwidth{\LWR@print@AR}]%
+ \ifmmode\else\csuse{LWR@orig\LWR@f@series series}\fi%
+ \LWR@print@AR%
+ \end{lateximage}%
+}
+\LWR@formatted{AR}
+\newrobustcmd*{\LWR@HTML@ARb}{%
+ \begin{lateximage}*[AR][b][\LWR@ar@printwidth{\LWR@print@ARb}]%
+ \LWR@print@ARb%
+ \end{lateximage}%
+}
+\LWR@formatted{ARb}
+\newrobustcmd*{\LWR@HTML@ARss}{%
+ \begin{lateximage}*[ARss][\LWR@f@series][\LWR@ar@printwidth{\LWR@print@ARss}]%
+ \ifmmode\else\csuse{LWR@orig\LWR@f@series series}\fi%
+ \LWR@print@ARss%
+ \end{lateximage}%
+}
+\LWR@formatted{ARss}
+\newrobustcmd*{\LWR@HTML@ARssb}{%
+ \begin{lateximage}*[AR][ssb][\LWR@ar@printwidth{\LWR@print@ARssb}]%
+ \LWR@print@ARssb%
+ \end{lateximage}%
+}
+\LWR@formatted{ARssb}
+\newrobustcmd*{\LWR@HTML@ARtt}{%
+ \begin{lateximage}*[AR][tt][\LWR@ar@printwidth{\LWR@print@ARtt}]%
+ \LWR@print@ARtt%
+ \end{lateximage}%
+}
+\LWR@formatted{ARtt}
+\endinput
+%%
+%% End of file `lwarp-ar.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-arabicfront.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-arabicfront.sty
index 7a961fb23a6..f32f0822eb1 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-arabicfront.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-arabicfront.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{arabicfront}
+\LWR@ProvidesPackageDrop{arabicfront}[2006/09/03]
\endinput
%%
%% End of file `lwarp-arabicfront.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-array.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-array.sty
index 7cfc796ca70..a8d3f4a86a0 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-array.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-array.sty
@@ -18,7 +18,7 @@
\let\firsthline\relax
\let\lasthline\relax
-\LWR@ProvidesPackagePass{array}
+\LWR@ProvidesPackagePass{array}[2018/12/30]
\newcommand*{\LWR@HTML@firsthline}{\LWR@HTMLhline}%
\LWR@expandableformatted{firsthline}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-arydshln.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-arydshln.sty
index 4eb5247ed4d..60f4e6b06a1 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-arydshln.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-arydshln.sty
@@ -17,7 +17,7 @@
%% version 2005/12/01 or later.
\RequirePackage{array}
-\LWR@ProvidesPackageDrop{arydshln}
+\LWR@ProvidesPackageDrop{arydshln}[2018/09/26]
\newdimen\dashlinedash \dashlinedash4pt %
\newdimen\dashlinegap \dashlinegap4pt %
\let\hdashlinewidth\dashlinedash
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-asymptote.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-asymptote.sty
index 907fb4c0288..502b6f09a7f 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-asymptote.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-asymptote.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackagePass{asymptote}
+\LWR@ProvidesPackagePass{asymptote}[2016/11/26]
\BeforeBeginEnvironment{asy}{\begin{lateximage}[(-asymptote-~\packagediagramname)]}
\AfterEndEnvironment{asy}{\end{lateximage}}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-attachfile.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-attachfile.sty
index e52a1f7f2dd..615580bbe0a 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-attachfile.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-attachfile.sty
@@ -16,7 +16,7 @@
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackagePass{attachfile}
+\LWR@ProvidesPackagePass{attachfile}[2016/09/18]
\newenvironment*{LWR@attachfile@icon}
{
\begin{lateximage}*%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-attachfile2.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-attachfile2.sty
index 5e1b0c09299..7ca5d7083ab 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-attachfile2.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-attachfile2.sty
@@ -16,7 +16,7 @@
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackagePass{attachfile2}
+\LWR@ProvidesPackagePass{attachfile2}[2016/05/16]
\def\LWR@attachfiletwo@color{}%
\define@key{AtFi}{color}{%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-authblk.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-authblk.sty
index 9f3af3b6443..e6339201697 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-authblk.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-authblk.sty
@@ -21,7 +21,7 @@
{Titling appends authblk's author macro, so authblk must be loaded first.}
}
{}
-\LWR@ProvidesPackagePass{authblk}
+\LWR@ProvidesPackagePass{authblk}[2001/02/27]
\LetLtxMacro\LWRAB@affil\affil
\renewcommand{\affil}[2][]{%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-axodraw2.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-axodraw2.sty
index b6d92cb41d3..8b2a0b31820 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-axodraw2.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-axodraw2.sty
@@ -16,7 +16,7 @@
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackagePass{axodraw2}
+\LWR@ProvidesPackagePass{axodraw2}[2018/02/15]
\BeforeBeginEnvironment{axopicture}{\begin{lateximage}[(-axopicture-~\packagediagramname)]}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-backref.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-backref.sty
index 0722a4f18df..b7c812914ad 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-backref.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-backref.sty
@@ -16,7 +16,7 @@
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackagePass{backref}
+\LWR@ProvidesPackagePass{backref}[2016/05/21]
\def\backref{}\let\backrefxxx\hyper@section@backref
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-balance.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-balance.sty
index 99f6b10586e..5d2a6941c93 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-balance.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-balance.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{balance}
+\LWR@ProvidesPackageDrop{balance}[1999/02/23]
\newcommand*{\balance}{}
\newcommand*{\nobalance}{}
\endinput
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-biblatex.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-biblatex.sty
index 2195151c4d7..96edbf63316 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-biblatex.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-biblatex.sty
@@ -18,7 +18,7 @@
\ifdef{\newfloat@addtocontents@ORI}{
\let\addtocontents\newfloat@addtocontents@ORI
}{}
-\LWR@ProvidesPackagePass{biblatex}
+\LWR@ProvidesPackagePass{biblatex}[2018/03/04]
\endinput
%%
%% End of file `lwarp-biblatex.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-bibunits.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-bibunits.sty
index 7cec6e0ab88..9f652d93b09 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-bibunits.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-bibunits.sty
@@ -16,7 +16,7 @@
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackagePass{bibunits}
+\LWR@ProvidesPackagePass{bibunits}[2004/05/12]
\def\bu@bibdata{\BaseJobname}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-bigdelim.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-bigdelim.sty
index a6e49f9987e..fef52d7655e 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-bigdelim.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-bigdelim.sty
@@ -17,7 +17,7 @@
%% version 2005/12/01 or later.
\let\ldelim\relax
\let\rdelim\relax
-\LWR@ProvidesPackagePass{bigdelim}
+\LWR@ProvidesPackagePass{bigdelim}[2018/08/03]
\NewDocumentCommand{\LWR@HTML@ldelim}{m m m O{}}{%
\renewcommand{\LWR@multirowborder}{right}%
\multirow{#2}{#3}{#4 \InlineClass{ldelim}{#1}}%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-bigstrut.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-bigstrut.sty
index 7d344bb1bca..3b4841c5fef 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-bigstrut.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-bigstrut.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackagePass{bigstrut}
+\LWR@ProvidesPackagePass{bigstrut}[2018/08/03]
\LetLtxMacro\LWR@origbigstrut\bigstrut
\renewcommand\bigstrut[1][x]{}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-bitpattern.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-bitpattern.sty
index 9de7bb21214..64b46f0e2dc 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-bitpattern.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-bitpattern.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackagePass{bitpattern}
+\LWR@ProvidesPackagePass{bitpattern}[2015/12/11]
\xpatchcmd{\bitpattern}
{\begingroup}
{\begin{lateximage}[(-bitpattern-~\packagediagramname)]}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-blowup.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-blowup.sty
index 9a13b437bcf..d9129fb13bd 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-blowup.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-blowup.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{blowup}
+\LWR@ProvidesPackageDrop{blowup}[2018/01/02]
\newcommand*\blowUp[1]{}
\endinput
%%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-bookmark.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-bookmark.sty
index 36b5a08db5e..6c05221612c 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-bookmark.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-bookmark.sty
@@ -18,7 +18,7 @@
-\LWR@ProvidesPackageDrop{bookmark}
+\LWR@ProvidesPackageDrop{bookmark}[2016/05/17]
\newcommand*{\bookmarksetup}[1]{}
\newcommand*{\bookmarksetupnext}[1]{}
\newcommand*{\bookmark}[2][]{}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-booktabs.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-booktabs.sty
index 62aec695049..52f150d9c5f 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-booktabs.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-booktabs.sty
@@ -23,7 +23,7 @@
\LetLtxMacro\morecmidrules\relax
\LetLtxMacro\specialrule\relax
-\LWR@ProvidesPackagePass{booktabs}
+\LWR@ProvidesPackagePass{booktabs}[2016/04/27]
\DeclareDocumentCommand{\LWR@HTML@toprule}{o d()}%
{%
\IfValueTF{#1}%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-bophook.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-bophook.sty
index cbdb943378d..c22b13c688b 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-bophook.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-bophook.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{bophook}
+\LWR@ProvidesPackageDrop{bophook}[2001/03/29]
\newcommand*{\AtBeginPage}[1]{}
\newcommand*{\PageLayout}[1]{}
\endinput
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-bounddvi.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-bounddvi.sty
index 581346e43f9..983b0715754 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-bounddvi.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-bounddvi.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{bounddvi}
+\LWR@ProvidesPackageDrop{bounddvi}[2016/12/28]
\endinput
%%
%% End of file `lwarp-bounddvi.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-boxedminipage2e.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-boxedminipage2e.sty
index f8c89ce3b5b..5514e660946 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-boxedminipage2e.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-boxedminipage2e.sty
@@ -17,7 +17,7 @@
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{boxedminipage2e}
+\LWR@ProvidesPackageDrop{boxedminipage2e}[2015/03/09]
\newenvironment{boxedminipage}{%
\begin{BlockClass}{framebox}%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-breakurl.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-breakurl.sty
index 2661fe8f670..911a470b715 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-breakurl.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-breakurl.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{breakurl}
+\LWR@ProvidesPackageDrop{breakurl}[2013/04/10]
\LetLtxMacro\burl\url
\NewDocumentCommand{\LWR@burlaltb}{O{} +m m}{%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-breqn.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-breqn.sty
index 3b69a0e9bb7..3b986ae00d0 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-breqn.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-breqn.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackagePass{breqn}
+\LWR@ProvidesPackagePass{breqn}[2017/01/27]
\setkeys{breqn}{spread={5pt}}
\def\eqnumside{R}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-bxpapersize.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-bxpapersize.sty
index b6711dc6e8d..acbba002da2 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-bxpapersize.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-bxpapersize.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{bxpapersize}
+\LWR@ProvidesPackageDrop{bxpapersize}[2017/10/08]
\providecommand*\papersizesetup{\bxpapersizesetup}
\newcommand*\bxpapersizesetup[1]{}
\endinput
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-bytefield.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-bytefield.sty
index d4ac74bf02e..5f731cc11e3 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-bytefield.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-bytefield.sty
@@ -16,7 +16,7 @@
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackagePass{bytefield}
+\LWR@ProvidesPackagePass{bytefield}[2017/09/15]
\BeforeBeginEnvironment{bytefield}{\begin{lateximage}[(-bytefield-~\packagediagramname)]}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-cancel.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-cancel.sty
index 43742816932..31811da3339 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-cancel.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-cancel.sty
@@ -16,7 +16,7 @@
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
\LWR@origRequirePackage{lwarp-xcolor}% for \convertcolorspec
-\LWR@ProvidesPackagePass{cancel}
+\LWR@ProvidesPackagePass{cancel}[2013/04/12]
\LetLtxMacro\LWR@origcancel\cancel
\LetLtxMacro\LWR@origbcancel\bcancel
\LetLtxMacro\LWR@origxcancel\xcancel
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-canoniclayout.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-canoniclayout.sty
index 6c0ffa3f425..45e357dc407 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-canoniclayout.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-canoniclayout.sty
@@ -16,7 +16,7 @@
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
s%
-\LWR@ProvidesPackageDrop{canoniclayout}
+\LWR@ProvidesPackageDrop{canoniclayout}[2011/11/05]
\newcommand*{\currentfontletters}{}
\newcommand*{\charactersperpage}{}
\endinput
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-caption.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-caption.sty
index 994bcdef452..85ff82bca8a 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-caption.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-caption.sty
@@ -16,7 +16,7 @@
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackagePass{caption}
+\LWR@ProvidesPackagePass{caption}[2018/10/05]
\renewcommand\caption@ibox[3]{%
\@testopt{\caption@iibox{#1}{#2}{#3}}{%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-cases.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-cases.sty
index dc52db4538f..6915b73e607 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-cases.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-cases.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackagePass{cases}
+\LWR@ProvidesPackagePass{cases}[2002/05/02]
\BeforeBeginEnvironment{numcases}{
\begin{BlockClass}{displaymathnumbered}
\LWR@newautoidanchor%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-changepage.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-changepage.sty
index ea2e773c68b..e1833041ad6 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-changepage.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-changepage.sty
@@ -17,7 +17,7 @@
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{changepage}
+\LWR@ProvidesPackageDrop{changepage}[2009/10/20]
\newif\ifoddpage
\DeclareRobustCommand{\checkoddpage}{\oddpagetrue}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-chappg.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-chappg.sty
index d180a40a539..09613eb8bf6 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-chappg.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-chappg.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{chappg}
+\LWR@ProvidesPackageDrop{chappg}[2006/05/09]
\renewcommand{\pagenumbering}[2][]{}
\providecommand{\chappgsep}{--}
\endinput
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-chapterbib.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-chapterbib.sty
index c43d90da378..6a645825270 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-chapterbib.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-chapterbib.sty
@@ -16,7 +16,7 @@
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackagePass{chapterbib}
+\LWR@ProvidesPackagePass{chapterbib}[2010/09/18]
\xdef\@savedjobname{\BaseJobname}
\let\@currentipfile\@savedjobname
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-chemmacros.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-chemmacros.sty
index 71a336e8140..89a4cbc6297 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-chemmacros.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-chemmacros.sty
@@ -16,7 +16,7 @@
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackagePass{chemmacros}
+\LWR@ProvidesPackagePass{chemmacros}[2017/08/28]
\ExplSyntaxOn
\newcommand{\@ifchemmacrosmoduleloaded}[1]{%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-chemnum.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-chemnum.sty
index 478cd42d89d..705f668e505 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-chemnum.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-chemnum.sty
@@ -16,7 +16,7 @@
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackagePass{chemnum}
+\LWR@ProvidesPackagePass{chemnum}[2016/04/14]
\ExplSyntaxOn
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-chngpage.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-chngpage.sty
index 827698a89ba..fabc29d8537 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-chngpage.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-chngpage.sty
@@ -17,7 +17,7 @@
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{chngpage}
+\LWR@ProvidesPackageDrop{chngpage}[2009/10/20]
\LWR@origRequirePackage{lwarp-changepage}
\endinput
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-cite.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-cite.sty
index 77313d6a534..bd6a8f5ec4c 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-cite.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-cite.sty
@@ -16,7 +16,7 @@
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackagePass{cite}
+\LWR@ProvidesPackagePass{cite}[2015/02/27]
\def\LWRCT@biblabel#1{\@citess{#1}\kern-\labelsep\,}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-clrdblpg.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-clrdblpg.sty
index 49874e1f151..ecd05af4c1b 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-clrdblpg.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-clrdblpg.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{clrdblpg}
+\LWR@ProvidesPackageDrop{clrdblpg}[2018/04/21]
\endinput
%%
%% End of file `lwarp-clrdblpg.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-color.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-color.sty
index 7fa7a4caeb6..04413cea648 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-color.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-color.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackagePass{color}
+\LWR@ProvidesPackagePass{color}[2016/07/10]
\RequirePackage{xcolor}
\endinput
%%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-colortbl.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-colortbl.sty
index 58afb3fbfc7..efbae39df01 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-colortbl.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-colortbl.sty
@@ -17,7 +17,7 @@
%% version 2005/12/01 or later.
\let\rowcolor\relax
-\LWR@ProvidesPackagePass{colortbl}
+\LWR@ProvidesPackagePass{colortbl}[2018/12/12]
\NewDocumentCommand{\LWR@HTML@columncolor}{O{named} m o o}{%
\convertcolorspec{#1}{#2}{HTML}\LWR@columnHTMLcolor%
\LWR@addtabularcellcolor%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-continue.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-continue.sty
index eb59e27b5a2..477467cf624 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-continue.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-continue.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{continue}
+\LWR@ProvidesPackageDrop{continue}}[2018/12/09]
\newcommand*{\flagcont}{}
\newcommand*{\flagend}{}
\newcommand*{\flagword}{}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-copyrightbox.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-copyrightbox.sty
index 9101bab3510..41f83eed03e 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-copyrightbox.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-copyrightbox.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{copyrightbox}
+\LWR@ProvidesPackageDrop{copyrightbox}[2011/11/27]
\newcommand{\copyrightbox}[3][r]{%
\begin{BlockClass}[
display: inline-flex;
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-crop.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-crop.sty
index ad5af72cfe7..58e1a893151 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-crop.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-crop.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{crop}
+\LWR@ProvidesPackageDrop{crop}[2003/05/20]
\newcommand*{\crop}[1][]{}
\newcommand*{\cropdef}[6][]{}
\endinput
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-cuted.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-cuted.sty
index 056a2171b6e..6586ddfb753 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-cuted.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-cuted.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{cuted}
+\LWR@ProvidesPackageDrop{cuted}[2012/10/04]
\newenvironment{strip}{}{}
\newskip\stripsep
\def\oldcolsbreak#1{}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-cutwin.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-cutwin.sty
index 512f4d6d42f..fe70a392c97 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-cutwin.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-cutwin.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{cutwin}
+\LWR@ProvidesPackageDrop{cutwin}[2010/09/29]
\newcommand*{\opencutleft}{}
\newcommand*{\opencutright}{}
\newcommand*{\opencutcenter}{}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-dblfloatfix.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-dblfloatfix.sty
index 806d480e0f7..5366b02d96f 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-dblfloatfix.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-dblfloatfix.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{dblfloatfix}
+\LWR@ProvidesPackageDrop{dblfloatfix}[2012/12/31]
\endinput
%%
%% End of file `lwarp-dblfloatfix.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-dblfnote.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-dblfnote.sty
index 66d2aee8bd1..214ebf0e051 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-dblfnote.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-dblfnote.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{dblfnote}
+\LWR@ProvidesPackageDrop{dblfnote}[1999/07/14]
\newcounter{DFNsloppiness}
\newdimen\DFNcolumnsep
\newdimen\DFNcolumnwidth
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-dcolumn.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-dcolumn.sty
index 5da5db25b13..8ffbb2fc6c7 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-dcolumn.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-dcolumn.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{dcolumn}
+\LWR@ProvidesPackageDrop{dcolumn}[2014/10/28]
\endinput
%%
%% End of file `lwarp-dcolumn.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-diagbox.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-diagbox.sty
index 8c227a07c15..65a03606c05 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-diagbox.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-diagbox.sty
@@ -16,7 +16,7 @@
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackagePass{diagbox}
+\LWR@ProvidesPackagePass{diagbox}[2016/12/28]
\LetLtxMacro\LWR@origdiagbox@double\diagbox@double
\LetLtxMacro\LWR@origdiagbox@triple\diagbox@triple
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-draftcopy.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-draftcopy.sty
index f830e128976..084bc30041b 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-draftcopy.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-draftcopy.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{draftcopy}
+\LWR@ProvidesPackageDrop{draftcopy}[2002/02/25]
\newcommand{\draftcopyVersion}[1]{}
\newcommand{\draftcopySetGrey}[1]{}
\newcommand{\draftcopySetScale}[1]{}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-draftwatermark.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-draftwatermark.sty
index 904fe1e804c..7e8677cd6b9 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-draftwatermark.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-draftwatermark.sty
@@ -19,7 +19,7 @@
-\LWR@ProvidesPackageDrop{draftwatermark}
+\LWR@ProvidesPackageDrop{draftwatermark}[2015/02/19]
\newcommand{\SetWatermarkAngle}[1]{}
\newcommand{\SetWatermarkColor}[1]{}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-easy-todo.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-easy-todo.sty
index de66e41fe05..da40a3827f2 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-easy-todo.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-easy-todo.sty
@@ -16,7 +16,7 @@
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackagePass{easy-todo}
+\LWR@ProvidesPackagePass{easy-todo}[2014/01/01]
\let\LWR@origlistoftodos\listoftodos
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-ed.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-ed.sty
new file mode 100644
index 00000000000..9701589ed4f
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-ed.sty
@@ -0,0 +1,38 @@
+%%
+%% This is file `lwarp-ed.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx (with options: `ed')
+%% This is a generated file.
+%% Copyright 2016-2018 Brian Dunn
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+\LWR@ProvidesPackagePass{ed}[2012/01/29]
+\RequirePackage{xcolor}
+
+\renewenvironment{edstub}[2][The following blue text]
+{%
+ \def\@test{#1}%
+ \begin{center}%
+ \huge%
+ \textcolor{red}{%
+ #1 is only a provisional stub\\\Large
+ the Office document
+ \ifx\ed@stubURI\@empty{#2}\else\href{\ed@stubURI}{#2}\fi\
+ contains more text\\which will be merged for the final document%
+ }%
+ \end{center}%
+ \BlockClass[color:blue]{edstub}%
+}
+{\endBlockClass}
+\endinput
+%%
+%% End of file `lwarp-ed.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-ellipsis.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-ellipsis.sty
index 5e646ec6dcf..dd712011306 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-ellipsis.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-ellipsis.sty
@@ -18,7 +18,7 @@
-\LWR@ProvidesPackageDrop{ellipsis}
+\LWR@ProvidesPackageDrop{ellipsis}[2004/09/28]
\newcommand{\ellipsisgap}{0.1em}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-embrac.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-embrac.sty
index 52cfac3a7e9..b26ff0342db 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-embrac.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-embrac.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackagePass{embrac}
+\LWR@ProvidesPackagePass{embrac}[2017/07/04]
\LetLtxMacro\LWR@orig@HTML@emph\LWR@HTML@emph
\RenewDocumentCommand{\LWR@HTML@emph}{s m}{\LWR@orig@HTML@emph{#2}}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-emptypage.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-emptypage.sty
index c29ca596c20..4f7a8ea465e 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-emptypage.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-emptypage.sty
@@ -17,7 +17,7 @@
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{emptypage}
+\LWR@ProvidesPackageDrop{emptypage}[2010/05/30]
\endinput
%%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-endfloat.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-endfloat.sty
index 7a1c2a62f37..9addcba89be 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-endfloat.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-endfloat.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{endfloat}
+\LWR@ProvidesPackageDrop{endfloat}[2018/03/24]
\newcommand\figureplace{}
\newcommand\tableplace{}
\newcommand\floatplace[1]{}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-endheads.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-endheads.sty
index 7a3d721bff4..ff8961316b8 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-endheads.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-endheads.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{endheads}
+\LWR@ProvidesPackageDrop{endheads}[2017/04/06]
\newcommand{\changesinglepageabbrev}[1]{}
\newcommand{\changemultiplepageabbrev}[1]{}
\newcommand{\changenotesname}[1]{}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-enumerate.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-enumerate.sty
index ea2a39a3aa4..4b6a679b486 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-enumerate.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-enumerate.sty
@@ -16,7 +16,7 @@
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackagePass{enumerate}
+\LWR@ProvidesPackagePass{enumerate}[2015/07/23]
\endinput
%%
%% End of file `lwarp-enumerate.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-enumitem.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-enumitem.sty
index 2dbd0d1f26d..0ba7480225d 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-enumitem.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-enumitem.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackagePass{enumitem}
+\LWR@ProvidesPackagePass{enumitem}[2018/11/30]
\begin{warpHTML}
\let\LWR@enumitem@orignewlist\newlist
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-epigraph.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-epigraph.sty
index 16b4229c91b..d484d585b0b 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-epigraph.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-epigraph.sty
@@ -18,7 +18,7 @@
-\LWR@ProvidesPackageDrop{epigraph}
+\LWR@ProvidesPackageDrop{epigraph}[2009/09/02]
\DeclareDocumentCommand{\qitem}{m m}
{
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-eso-pic.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-eso-pic.sty
index 80592c200fd..29181f1f52b 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-eso-pic.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-eso-pic.sty
@@ -18,7 +18,7 @@
-\LWR@ProvidesPackageDrop{eso-pic}
+\LWR@ProvidesPackageDrop{eso-pic}[2018/04/12]
\newcommand*{\LenToUnit}{}
\newcommand{\AtPageUpperLeft}[1]{}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-everypage.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-everypage.sty
index aa2bcaa75f5..5620d8233b7 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-everypage.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-everypage.sty
@@ -18,7 +18,7 @@
-\LWR@ProvidesPackageDrop{everypage}
+\LWR@ProvidesPackageDrop{everypage}[2007/06/20]
\newcommand*{\AddEverypageHook}[1]{}
\newcommand*{\AddThispageHook}[1]{}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-everyshi.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-everyshi.sty
index 073ff556142..875580a201e 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-everyshi.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-everyshi.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{everyshi}
+\LWR@ProvidesPackageDrop{everyshi}[2001/05/15]
\newcommand*{\EveryShipout}[1]{}
\newcommand*{\AtNextShipout}[1]{}
\endinput
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-extramarks.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-extramarks.sty
index 820e3c45f1f..42c2ea2096d 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-extramarks.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-extramarks.sty
@@ -17,7 +17,7 @@
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{extramarks}
+\LWR@ProvidesPackageDrop{extramarks}[2019/01/31]
\newcommand*{\extramarks}[2]{}
\newcommand*{\firstleftxmark}{}
@@ -28,8 +28,11 @@
\newcommand*{\lastxmark}{}
\newcommand*{\topxmark}{}
\newcommand*{\topleftxmark}{}
+\newcommand*{\toprightxmark}{}
\newcommand*{\firstleftmark}{}
\newcommand*{\lastrightmark}{}
+\newcommand*{\firstrightmark}{}
+\newcommand*{\lastleftmark}{}
\endinput
%%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-fancybox.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-fancybox.sty
index bbd4e3825ee..42f2b593d44 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-fancybox.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-fancybox.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackagePass{fancybox}
+\LWR@ProvidesPackagePass{fancybox}[2010/05/15]
\AfterEndPreamble{
\LWR@traceinfo{Patching fancybox.}
\def\VerbatimFootnotes{%
@@ -35,7 +35,7 @@
\cnttest{\value{LWR@lateximagedepth}}{=}{0}%
}%
{}%
- {\LWR@htmltagc{\LWR@tagregularparagraph}}%
+ {\LWR@htmltagc{\LWR@tagregularparagraph}\LWR@orignewline}%
\@makefntext{}%
\bgroup%
\aftergroup{\V@@@footnotetext}%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyhdr.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyhdr.sty
index 1a93b496b11..a1cf26c5dcd 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyhdr.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyhdr.sty
@@ -17,7 +17,7 @@
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{fancyhdr}
+\LWR@ProvidesPackageDrop{fancyhdr}[2019/01/31]
\newcommand*{\fancyhead}[2][]{}
\newcommand*{\fancyfoot}[2][]{}
@@ -31,12 +31,16 @@
\newcommand*{\rfoot}[2][]{}
\newcommand*{\headrulewidth}{}
\newcommand*{\footrulewidth}{}
+\newcommand*{\headrule}{}
+\newcommand*{\footrule}{}
+\newlength{\headwidth}
\newcommand*{\fancyheadoffset}[2][]{}
\newcommand*{\fancyfootoffset}[2][]{}
\newcommand*{\fancyhfoffset}[2][]{}
\newcommand*{\iffloatpage}[2]{#2}
\newcommand*{\ifftopfloat}[2]{#2}
\newcommand*{\iffbotfloat}[2]{#2}
+\newcommand*{\iffootnote}[2]{#2}
\endinput
%%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyref.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyref.sty
index 454c452bb96..ba6c05c3d56 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyref.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyref.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackagePass{fancyref}
+\LWR@ProvidesPackagePass{fancyref}[1999/02/03]
\newcommand*{\LWRfref@parenfancyrefhook}[1]{(#1)}
\ifdefstrequal{\fancyrefhook}{\LWRfref@parenfancyrefhook}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-fancytabs.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-fancytabs.sty
index 8e930d8a1fe..0b7c231505e 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-fancytabs.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-fancytabs.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{fancytabs}
+\LWR@ProvidesPackageDrop{fancytabs}[2016/03/29]
\newcommand{\fancytab}[3][RIGHT]{}
\newcommand{\fancytabsStyle}[1]{}
\newcommand{\fancytabsHeight}[1]{}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyvrb.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyvrb.sty
index 61c57ee783e..cd9282b2219 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyvrb.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-fancyvrb.sty
@@ -17,7 +17,7 @@
%% version 2005/12/01 or later.
\RequirePackage{xcolor}% for \convertcolorspec
-\LWR@ProvidesPackagePass{fancyvrb}
+\LWR@ProvidesPackagePass{fancyvrb}[2008/02/07]
\fvset{frame=none}%
\AfterEndPreamble{
\LWR@traceinfo{Patching fancyvrb.}
@@ -39,7 +39,7 @@
\cnttest{\value{LWR@lateximagedepth}}{=}{0}%
}%
{}%
- {\LWR@htmltagc{\LWR@tagregularparagraph}}%
+ {\LWR@htmltagc{\LWR@tagregularparagraph}\LWR@orignewline}%
\@makefntext{}%
\bgroup%
\aftergroup{\V@@@footnotetext}%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-figcaps.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-figcaps.sty
index 70f1919ab68..081c193ae78 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-figcaps.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-figcaps.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{figcaps}
+\LWR@ProvidesPackageDrop{figcaps}[1999/02/23]
\newcommand*{\figcapson}{}
\newcommand*{\figcapsoff}{}
\newcommand*{\printfigures}{}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-figsize.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-figsize.sty
index 3c0b3a5f459..b0ebcd4b565 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-figsize.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-figsize.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{figsize}
+\LWR@ProvidesPackageDrop{figsize}[2002/03/18]
\newlength{\figwidth}
\newlength{\figheight}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-fix2col.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-fix2col.sty
index 85851fa8afd..096abd8cf39 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-fix2col.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-fix2col.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{fix2col}
+\LWR@ProvidesPackageDrop{fix2col}[2015/11/13]
\endinput
%%
%% End of file `lwarp-fix2col.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-fixme.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-fixme.sty
index a064511b55d..1a602efeca5 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-fixme.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-fixme.sty
@@ -16,7 +16,7 @@
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackagePass{fixme}
+\LWR@ProvidesPackagePass{fixme}[2017/03/05]
\let\@wrindex\LWR@wrindex
\newcommand{\ext@fixme}{lox}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-fixmetodonotes.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-fixmetodonotes.sty
index fd3bd2744a6..2c9ac33e6fd 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-fixmetodonotes.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-fixmetodonotes.sty
@@ -16,7 +16,7 @@
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackagePass{fixmetodonotes}
+\LWR@ProvidesPackagePass{fixmetodonotes}[2013/04/28]
\renewcommand{\NOTES@addtolist}[2]{%
\refstepcounter{NOTES@note}%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-flafter.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-flafter.sty
index e5c21ea61e7..36fcdf4724c 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-flafter.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-flafter.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{flafter}
+\LWR@ProvidesPackageDrop{flafter}[2018/01/08]
\providecommand\fl@trace[1]{}
\endinput
%%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-floatflt.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-floatflt.sty
index 47226d7af23..ce1e1973993 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-floatflt.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-floatflt.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{floatflt}
+\LWR@ProvidesPackageDrop{floatflt}[1997/07/16]
\NewDocumentEnvironment{KFLTfloatflt@marginfloat}{O{-1.2ex} m m}
{%
\setlength{\LWR@templengthone}{#3}%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-floatpag.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-floatpag.sty
index 81ef9e7f447..9c1d4565092 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-floatpag.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-floatpag.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{floatpag}
+\LWR@ProvidesPackageDrop{floatpag}[2012/05/29]
\newcommand*{\floatpagestyle}[1]{}
\newcommand*{\rotfloatpagestyle}[1]{}
\newcommand*{\thisfloatpagestyle}[1]{}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-floatrow.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-floatrow.sty
index d5827bb74a4..c96f6c4b8bd 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-floatrow.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-floatrow.sty
@@ -18,7 +18,7 @@
-\LWR@ProvidesPackageDrop{floatrow}
+\LWR@ProvidesPackageDrop{floatrow}[2008/08/02]
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-fltrace.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-fltrace.sty
index 7cb16fcb5e8..2c5ed78ecaf 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-fltrace.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-fltrace.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{fltrace}
+\LWR@ProvidesPackageDrop{fltrace}[2018/01/08]
\def\tracefloats{}
\def\tracefloatsoff{}
\def\tracefloatvals{}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-flushend.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-flushend.sty
index 0c53f72061a..920a3ebadce 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-flushend.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-flushend.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{flushend}
+\LWR@ProvidesPackageDrop{flushend}[2017/03/27]
\newcommand*{\flushend}{}
\newcommand*{\raggedend}{}
\newcommand*{\flushcolsend}{}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-fnbreak.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-fnbreak.sty
index d27d5d3e63f..ae915c12509 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-fnbreak.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-fnbreak.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{fnbreak}
+\LWR@ProvidesPackageDrop{fnbreak}[2012/01/01]
\newcommand*{\fnbreakverbose}{}
\newcommand*{\fnbreaknonverbose}{}
\newcommand*{\fnbreaklabel}{}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-fncychap.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-fncychap.sty
index 5c234932e88..dc62c086e95 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-fncychap.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-fncychap.sty
@@ -17,7 +17,7 @@
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{fncychap}
+\LWR@ProvidesPackageDrop{fncychap}[2007/07/30]
\def\mghrulefill#1{}
\def\ChNameLowerCase{}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-fnlineno.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-fnlineno.sty
index a7fde5ccf40..25a48441de6 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-fnlineno.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-fnlineno.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{fnlineno}
+\LWR@ProvidesPackageDrop{fnlineno}[2011/01/07]
\endinput
%%
%% End of file `lwarp-fnlineno.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-fnpos.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-fnpos.sty
index 29f64314007..9b2e930686e 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-fnpos.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-fnpos.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{fnpos}
+\LWR@ProvidesPackageDrop{fnpos}[1999/07/14]
\newcommand*{\makeFNbottom}{}
\newcommand*{\makeFNmid}{}
\newcommand*{\makeFNbelow}{}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-fontenc.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-fontenc.sty
index 1ee0eb7d46f..314c906cee4 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-fontenc.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-fontenc.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackagePass{fontenc}
+\LWR@ProvidesPackagePass{fontenc}[2017/04/05]
\endinput
%%
%% End of file `lwarp-fontenc.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-footmisc.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-footmisc.sty
index 61b2daf18d9..b253b320b5f 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-footmisc.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-footmisc.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{footmisc}
+\LWR@ProvidesPackageDrop{footmisc}[2011/06/06]
\newcommand{\footnotelayout}{}
\newcommand{\setfnsymbol}[1]{}
\NewDocumentCommand{\DefineFNsymbols}{s m o m}{}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-footnote.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-footnote.sty
index 3c3baaf7432..ac422e9e3f5 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-footnote.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-footnote.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackagePass{footnote}
+\LWR@ProvidesPackagePass{footnote}[1997/01/28]
\def\fn@startnote{%
\protected@edef\@currentlabel{\csname p@\@mpfn\endcsname\@thefnmark}%
}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-footnotehyper.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-footnotehyper.sty
index 64c537bbd06..7bc03366319 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-footnotehyper.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-footnotehyper.sty
@@ -18,7 +18,7 @@
\RequirePackage{footnote}
-\LWR@ProvidesPackageDrop{footnotehyper}
+\LWR@ProvidesPackageDrop{footnotehyper}[2018/01/23]
\endinput
%%
%% End of file `lwarp-footnotehyper.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-footnoterange.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-footnoterange.sty
index 985e91bc31a..d33c366c957 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-footnoterange.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-footnoterange.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackagePass{footnoterange}
+\LWR@ProvidesPackagePass{footnoterange}[2012/02/17]
\csletcs{footnoterange}{footnoterange*}
\csletcs{endfootnoterange}{endfootnoterange*}
\endinput
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-forest.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-forest.sty
index 4b4e1ee7688..3dc8e4adb1a 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-forest.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-forest.sty
@@ -16,7 +16,7 @@
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackagePass{forest}
+\LWR@ProvidesPackagePass{forest}[2017/07/14]
\BeforeBeginEnvironment{forest}{\begin{lateximage}[forest]}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-framed.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-framed.sty
index b59c4209b1e..3618a9363cd 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-framed.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-framed.sty
@@ -16,7 +16,7 @@
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackagePass{framed}
+\LWR@ProvidesPackagePass{framed}[2011/10/22]
\RequirePackage{xcolor}% for \convertcolorspec
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-ftnright.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-ftnright.sty
index 33b79f6ef0d..fd26d2a7695 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-ftnright.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-ftnright.sty
@@ -17,7 +17,7 @@
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{ftnright}
+\LWR@ProvidesPackageDrop{ftnright}[2014/10/28]
\endinput
%%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-fullwidth.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-fullwidth.sty
index 8cd46c52925..a59dbe6dff2 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-fullwidth.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-fullwidth.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{fullwidth}
+\LWR@ProvidesPackageDrop{fullwidth}[2011/11/18]
\newenvironment*{fullwidth}[1][]{%
\minipagefullwidth%
\minipage{\linewidth}%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-gentombow.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-gentombow.sty
index 2753e214f08..2ad362a124c 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-gentombow.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-gentombow.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{gentombow}
+\LWR@ProvidesPackageDrop{gentombow}[2018/05/17]
\newcommand{\settombowbanner}[1]{}
\newcommand{\settombowbannerfont}[1]{}
\newcommand{\settombowwidth}[1]{}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-geometry.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-geometry.sty
index 431cb3bc2f1..3f694234126 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-geometry.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-geometry.sty
@@ -17,7 +17,7 @@
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{geometry}
+\LWR@ProvidesPackageDrop{geometry}[2018/04/16]
\renewcommand*{\geometry}[1]{}
\renewcommand*{\newgeometry}[1]{}
\renewcommand*{\restoregeometry}{}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-glossaries.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-glossaries.sty
index bff36548dc9..34199bbd8db 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-glossaries.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-glossaries.sty
@@ -17,7 +17,9 @@
%% version 2005/12/01 or later.
\PassOptionsToPackage{xindy}{glossaries}
-\LWR@ProvidesPackagePass{glossaries}
+
+\LWR@ProvidesPackagePass{glossaries}[2018/07/23]
+
\setupglossaries{nonumberlist}
\setglossarystyle{index}
\renewcommand*{\@p@glossarysection}[2]{%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-gmeometric.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-gmeometric.sty
index a12491c0900..78c9572d1ad 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-gmeometric.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-gmeometric.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{gmeometric}
+\LWR@ProvidesPackageDrop{gmeometric}[2008/11/22]
\endinput
%%
%% End of file `lwarp-gmeometric.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty
index 497baad7b2b..96d77d44bba 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-graphics.sty
@@ -17,7 +17,7 @@
%% version 2005/12/01 or later.
-\LWR@ProvidesPackagePass{graphics}
+\LWR@ProvidesPackagePass{graphics}[2017/06/25]
\AtBeginDocument{
@@ -265,9 +265,10 @@
{% start of href
\LWR@traceinfo{LWR@includegraphicsb: about to LWR@htmltag}%
\LWR@htmltag{% start of image tags
-img src="%
+img\LWR@indentHTML%
+src="%
\detokenize\expandafter{\LWR@parsedfilename}%
-" \LWR@orignewline%
+"\LWR@indentHTML%
\ifthenelse{
\NOT\equal{\LWR@igwidthstyle}{} \OR
\NOT\equal{\LWR@igheightstyle}{} \OR
@@ -277,39 +278,38 @@ img src="%
\NOT\equal{\LWR@igyscale}{1}
}%
{%
- \LWR@origtilde{} style="%
+ style="\LWR@indentHTML
\ifthenelse{\NOT\equal{\LWR@igwidthstyle}{}}%
- {\LWR@igwidthstyle; }{}%
+ {\LWR@igwidthstyle;\LWR@indentHTML}{}%
\ifthenelse{\NOT\equal{\LWR@igheightstyle}{}}%
- {\LWR@igheightstyle; }{}%
+ {\LWR@igheightstyle;\LWR@indentHTML}{}%
\ifthenelse{\NOT\equal{\LWR@igorigin}{}}%
{%
- \LWR@origtilde{} transform-origin: \LWR@originnames{\LWR@igorigin}; %
- \LWR@orignewline%
+ transform-origin: \LWR@originnames{\LWR@igorigin};\LWR@indentHTML%
}{}%
\ifthenelse{\NOT\equal{\LWR@igangle}{}}%
{%
- \LWR@rotstyle{-ms-}{\LWR@igangle} % extra space
- \LWR@rotstyle{-webkit-}{\LWR@igangle} % extra space
- \LWR@rotstyle{}{\LWR@igangle }%
+ \LWR@rotstyle{-ms-}{\LWR@igangle}\LWR@indentHTML
+ \LWR@rotstyle{-webkit-}{\LWR@igangle}\LWR@indentHTML
+ \LWR@rotstyle{}{\LWR@igangle }\LWR@indentHTML
}{}%
\ifthenelse{%
\NOT\equal{\LWR@igxscale}{1}\OR%
\NOT\equal{\LWR@igyscale}{1}%
}%
{%
- \LWR@scalestyle{-ms-}{\LWR@igxscale}{\LWR@igyscale} % extra space
- \LWR@scalestyle{-webkit-}{\LWR@igxscale}{\LWR@igyscale} % extra space
- \LWR@scalestyle{}{\LWR@igxscale}{\LWR@igyscale}%
- }{} % extra space
+ \LWR@scalestyle{-ms-}{\LWR@igxscale}{\LWR@igyscale}\LWR@indentHTML
+ \LWR@scalestyle{-webkit-}{\LWR@igxscale}{\LWR@igyscale}\LWR@indentHTML
+ \LWR@scalestyle{}{\LWR@igxscale}{\LWR@igyscale}\LWR@indentHTML
+ }{}%
%
\ifthenelse{\NOT\equal{\LWR@opacity}{1}}%
- {opacity:\LWR@opacity; }{}%
+ {opacity:\LWR@opacity;\LWR@indentHTML}{}%
%
- " \LWR@orignewline%
+ "\LWR@indentHTML%
}{}%
-\LWR@origtilde{} class="\LWR@igclass" \LWR@orignewline%
-\LWR@origtilde{} alt="\LWR@igalt" \LWR@orignewline%
+class="\LWR@igclass"\LWR@indentHTML%
+alt="\LWR@igalt" \LWR@orignewline%
}% end of image tags
}% end of href
\endgroup
@@ -358,13 +358,16 @@ img src="%
\NewDocumentCommand{\LWR@HTML@rotatebox}{O{} m +m}{%
\renewcommand*{\LWR@rotboxorigin}{}
\setkeys{krotbox}{#1}%
-\LWR@htmltagc{span style="display: inline-block; %
-\ifthenelse{\NOT\equal{\LWR@rotboxorigin}{}}%
-{transform-origin: \LWR@originnames{\LWR@rotboxorigin};\LWR@origtilde}{}%
-\LWR@rotstyle{-ms-}{#2} % extra space
-\LWR@rotstyle{-webkit-}{#2} % extra space
-\LWR@rotstyle{}{#2} % extra space
-"}\LWR@orignewline%
+\LWR@htmltagc{%
+ span\LWR@indentHTML
+ style="\LWR@indentHTML
+ display: inline-block;\LWR@indentHTML
+ \ifthenelse{\NOT\equal{\LWR@rotboxorigin}{}}%
+ {transform-origin: \LWR@originnames{\LWR@rotboxorigin};\LWR@indentHTML}{}%
+ \LWR@rotstyle{-ms-}{#2}\LWR@indentHTML
+ \LWR@rotstyle{-webkit-}{#2}\LWR@indentHTML
+ \LWR@rotstyle{}{#2}"\LWR@orignewline%
+}\LWR@orignewline%
\begin{LWR@nestspan}%
#3%
\LWR@htmltagc{/span}%
@@ -376,11 +379,15 @@ img src="%
\AtBeginDocument{
\NewDocumentCommand{\LWR@HTML@scalebox}{m o m}{%
-\LWR@htmltagc{span style="display: inline-block; %
-\LWR@scalestyle{-ms-}{#1}{\IfNoValueTF{#2}{#1}{#2}} % extra space
-\LWR@scalestyle{-webkit-}{#1}{\IfNoValueTF{#2}{#1}{#2}} % extra space
-\LWR@scalestyle{}{#1}{\IfNoValueTF{#2}{#1}{#2}} % extra space
-"}%
+\LWR@htmltagc{%
+ span\LWR@indentHTML
+ style="\LWR@indentHTML
+ display: inline-block;\LWR@indentHTML
+ \LWR@scalestyle{-ms-}{#1}{\IfNoValueTF{#2}{#1}{#2}}\LWR@indentHTML
+ \LWR@scalestyle{-webkit-}{#1}{\IfNoValueTF{#2}{#1}{#2}}\LWR@indentHTML
+ \LWR@scalestyle{}{#1}{\IfNoValueTF{#2}{#1}{#2}}
+ "\LWR@orignewline
+}\LWR@orignewline%
\begin{LWR@nestspan}%
#3%
\LWR@htmltagc{/span}%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-grffile.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-grffile.sty
index 34abd49dcf6..8d5308daca7 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-grffile.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-grffile.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackagePass{grffile}
+\LWR@ProvidesPackagePass{grffile}[2017/06/30]
\endinput
%%
%% End of file `lwarp-grffile.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-grid.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-grid.sty
index f56d74bc608..87614148c2e 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-grid.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-grid.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{grid}
+\LWR@ProvidesPackageDrop{grid}[2009/06/16]
\newenvironment*{gridenv}{}{}
\endinput
%%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-hang.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-hang.sty
index d9151d0884c..aac3b756e6c 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-hang.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-hang.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{hang}
+\LWR@ProvidesPackageDrop{hang}[2017/02/18]
\newlength{\hangingindent}
\setlength{\hangingindent}{1em}
\newlength{\hangingleftmargin}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-hanging.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-hanging.sty
index d0532f9afee..e818944c175 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-hanging.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-hanging.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{hanging}
+\LWR@ProvidesPackageDrop{hanging}[2009/09/02]
\@ifclassloaded{memoir}{
\let\hangpara\relax
\let\hangparas\relax
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-hypcap.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-hypcap.sty
index a51dd82ee6c..ebab4d9e260 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-hypcap.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-hypcap.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{hypcap}
+\LWR@ProvidesPackageDrop{hypcap}[2016/05/16]
\newcommand*{\capstart}{}
\newcommand*{\hypcapspace}{}
\newcommand*{\hypcapredef}[1]{}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-hypdestopt.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-hypdestopt.sty
index a63e2b6c112..7526fc42825 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-hypdestopt.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-hypdestopt.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{hypdestopt}
+\LWR@ProvidesPackageDrop{hypdestopt}[2016/05/21]
\endinput
%%
%% End of file `lwarp-hypdestopt.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-hypernat.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-hypernat.sty
index e9bbeb7dab1..3ecd0000705 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-hypernat.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-hypernat.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{hypernat}
+\LWR@ProvidesPackageDrop{hypernat}[2001/07/09]
\endinput
%%
%% End of file `lwarp-hypernat.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperxmp.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperxmp.sty
index 6067b360622..f8c296033db 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperxmp.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-hyperxmp.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{hyperxmp}
+\LWR@ProvidesPackageDrop{hyperxmp}[2018/11/27]
\endinput
%%
%% End of file `lwarp-hyperxmp.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-hyphenat.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-hyphenat.sty
index 9e8a242d8d2..a07e3cd5c96 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-hyphenat.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-hyphenat.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackagePass{hyphenat}
+\LWR@ProvidesPackagePass{hyphenat}[2009/09/02]
\LetLtxMacro\LWRHYNAT@origtextnhtt\textnhtt
\LetLtxMacro\LWRHYNAT@orignhttfamily\nhttfamily
\LetLtxMacro\LWRHYNAT@orignohyphens\nohyphens
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-idxlayout.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-idxlayout.sty
index 0afeb859509..7a8c3c618d5 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-idxlayout.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-idxlayout.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{idxlayout}
+\LWR@ProvidesPackageDrop{idxlayout}[2012/03/30]
\newcommand{\LWR@indexprenote}{}
\preto\printindex{
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-ifoddpage.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-ifoddpage.sty
index 4d161c0630b..c2a61b9ca56 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-ifoddpage.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-ifoddpage.sty
@@ -17,7 +17,7 @@
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{ifoddpage}
+\LWR@ProvidesPackageDrop{ifoddpage}[2016/04/23]
\newif\ifoddpage
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-imakeidx.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-imakeidx.sty
index 31dac887354..ee35301bb5a 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-imakeidx.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-imakeidx.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackagePass{imakeidx}
+\LWR@ProvidesPackagePass{imakeidx}[2016/10/15]
\catcode`\_=12%
\define@key{imki}{name}{\def\imki@name{#1_html}}
\catcode`\_=8%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-index.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-index.sty
index 030097e33da..ac16a26bc8b 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-index.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-index.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackagePass{index}
+\LWR@ProvidesPackagePass{index}[2004/01/20]
\xpatchcmd{\newindex}
{\x@newindex[thepage]}
{%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-intopdf.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-intopdf.sty
index 40e18b892be..08bde94f001 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-intopdf.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-intopdf.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{intopdf}
+\LWR@ProvidesPackageDrop{intopdf}[2018/03/15]
\NewDocumentCommand{\attachandlink}{m o m m}{%
\href{#1}{#4}%
}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-keyfloat.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-keyfloat.sty
index b40292f99d0..eebba0bd43c 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-keyfloat.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-keyfloat.sty
@@ -17,7 +17,7 @@
%% version 2005/12/01 or later.
-\LWR@ProvidesPackagePass{keyfloat}
+\LWR@ProvidesPackagePass{keyfloat}[2017/05/12]
\AtBeginDocument{
\RenewDocumentCommand{\KFLT@onefigureimage}{}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-layout.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-layout.sty
index 53e30b95262..b2f11ae3080 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-layout.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-layout.sty
@@ -17,7 +17,7 @@
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{layout}
+\LWR@ProvidesPackageDrop{layout}[2014/10/28]
\NewDocumentCommand{\layout}{s}{}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-letterspace.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-letterspace.sty
index e92a59e77b7..bc9c27dbd05 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-letterspace.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-letterspace.sty
@@ -18,7 +18,7 @@
-\LWR@ProvidesPackageDrop{letterspace}
+\LWR@ProvidesPackageDrop{letterspace}[2018/01/14]
\newcommand*\lsstyle{}
\newcommand\textls[2][]{}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-lettrine.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-lettrine.sty
index 547decf2339..6a88b23d910 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-lettrine.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-lettrine.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{lettrine}
+\LWR@ProvidesPackageDrop{lettrine}[2018-08-28]
\DeclareDocumentCommand{\lettrine}{o m m}{%
\InlineClass{lettrine}{#2}\InlineClass{lettrinetext}{#3} % extra space
}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-lineno.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-lineno.sty
index f9532a910de..e6d1610695b 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-lineno.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-lineno.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{lineno}
+\LWR@ProvidesPackageDrop{lineno}[2005/11/02]
\newcommand*\resetlinenumber[1][\@ne]{}
\def\linenumbers{%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-lips.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-lips.sty
index 786c71d929d..4bd02fc5a87 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-lips.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-lips.sty
@@ -19,7 +19,7 @@
\PackageInfo{lwarp}{Using the lwarp version of package `lips'.}%
-\ProvidesPackage{lwarp-lips}
+\ProvidesPackage{lwarp-lips}[2001/08/31]
\NewDocumentCommand{\Lips}{}{\textellipsis}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-listings.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-listings.sty
index 2b998fd2475..93282300c6c 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-listings.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-listings.sty
@@ -18,7 +18,7 @@
\begin{warpHTML}
-\LWR@ProvidesPackagePass{listings}
+\LWR@ProvidesPackagePass{listings}[2015/06/04]
\lst@column@flexible
\let\LWR@origlst@Init\lst@Init
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-lltjext.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-lltjext.sty
index bdf82bd9dfe..538117ae709 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-lltjext.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-lltjext.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackagePass{lltjext}
+\LWR@ProvidesPackagePass{lltjext}[2018/10/07]
\protected\def\yoko{%
\directlua{luatexja.direction.set_list_direction(4, 'yoko')}%
}
@@ -51,7 +51,7 @@
}
\RenewDocumentCommand{\pbox}{d<> O{0pt} O{c} m}{%
-\booltrue{LWR@minipagefullwidth}%
+\global\booltrue{LWR@minipagefullwidth}%
\parbox{#2}{#4}%
}
\endinput
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-longtable.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-longtable.sty
index 28213a5da06..00d7a5815a0 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-longtable.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-longtable.sty
@@ -18,7 +18,7 @@
-\LWR@ProvidesPackageDrop{longtable}
+\LWR@ProvidesPackageDrop{longtable}[2014/10/28]
\newenvironment{longtable*}[2][]{%
\LWR@floatbegin{table}%
\setcaptiontype{\LTcaptype}%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-lscape.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-lscape.sty
index edd434cc1a6..7b7165b4c6b 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-lscape.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-lscape.sty
@@ -17,7 +17,7 @@
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{lscape}
+\LWR@ProvidesPackageDrop{lscape}[2000/10/22]
\newenvironment*{landscape}{}{}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-ltablex.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-ltablex.sty
index f847e68a514..c473d15a733 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-ltablex.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-ltablex.sty
@@ -19,7 +19,7 @@
\RequirePackage{tabularx}
-\LWR@ProvidesPackageDrop{ltablex}
+\LWR@ProvidesPackageDrop{ltablex}[2014/08/13]
\DeclareDocumentEnvironment{tabularx}{m o m}
{\longtable{#3}}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-ltcaption.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-ltcaption.sty
index a651217295a..0c2b1f519eb 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-ltcaption.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-ltcaption.sty
@@ -19,7 +19,7 @@
-\LWR@ProvidesPackageDrop{ltcaption}
+\LWR@ProvidesPackageDrop{ltcaption}[2018/08/26]
\newlength{\LTcapskip}
\newlength{\LTcapleft}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-ltxgrid.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-ltxgrid.sty
index 28059a5e799..a876ea0f5fc 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-ltxgrid.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-ltxgrid.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{ltxgrid}
+\LWR@ProvidesPackageDrop{ltxgrid}[2010/07/25]
\newcommand*{\onecolumngrid}{}
\newcommand*{\twocolumngrid}{}
\newcommand*{\removestuff}{}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-ltxtable.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-ltxtable.sty
index 2c8c891da6f..800b5741a1b 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-ltxtable.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-ltxtable.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{ltxtable}
+\LWR@ProvidesPackageDrop{ltxtable}[1995/12/11]
\newcommand*{\LTXtable}[2]{%
\input{#2}%
}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-lua-check-hyphen.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-lua-check-hyphen.sty
index d8cad08f9b7..45c3149663a 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-lua-check-hyphen.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-lua-check-hyphen.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{lua-check-hyphen}
+\LWR@ProvidesPackageDrop{lua-check-hyphen}[2018/04/19]
\newcommand*{\LuaCheckHyphen}[1]{}
\endinput
%%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-luacolor.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-luacolor.sty
index 275aec1809b..349e57a6171 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-luacolor.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-luacolor.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{luacolor}
+\LWR@ProvidesPackageDrop{luacolor}[2016/05/16]
\newcommand{\luacolorProcessBox}[1]{}
\endinput
%%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-luatodonotes.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-luatodonotes.sty
index bd872a94eec..83b09b67da5 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-luatodonotes.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-luatodonotes.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackagePass{luatodonotes}
+\LWR@ProvidesPackagePass{luatodonotes}[2017/09/30]
\@todonotes@additionalMarginEnabledfalse
\if@todonotes@disabled
\else
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-magaz.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-magaz.sty
index 4f655ff9fbe..e496cf66233 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-magaz.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-magaz.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{magaz}
+\LWR@ProvidesPackageDrop{magaz}[2011/11/24]
\newcommand\FirstLine[1]{%
\begingroup%
\FirstLineFont{%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-makeidx.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-makeidx.sty
index b5710178cfe..9b3cafea5fe 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-makeidx.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-makeidx.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackagePass{makeidx}
+\LWR@ProvidesPackagePass{makeidx}[2014/09/29]
\preto\printindex{%
\LWR@orignewpage%
\LWR@startpars%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-marginfit.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-marginfit.sty
index 235d2b7e157..05a6a86350e 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-marginfit.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-marginfit.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{marginfit}
+\LWR@ProvidesPackageDrop{marginfit}[2018/06/08]
\endinput
%%
%% End of file `lwarp-marginfit.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-marginfix.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-marginfix.sty
index f0b24f0bd9e..71bad0859ed 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-marginfix.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-marginfix.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{marginfix}
+\LWR@ProvidesPackageDrop{marginfix}[2013/09/08]
\newcommand*{\marginskip}[1]{}
\newcommand*{\clearmargin}{}
\newcommand*{\softclearmargin}{}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-marginnote.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-marginnote.sty
index 5109a2a9d36..1fce0a398d8 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-marginnote.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-marginnote.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{marginnote}
+\LWR@ProvidesPackageDrop{marginnote}[2018/08/09]
\NewDocumentCommand{\marginnote}{+o +m o}{\marginpar{#2}}
\newcommand*{\marginnoteleftadjust}{}
\newcommand*{\marginnoterightadjust}{}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-mcaption.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-mcaption.sty
index 17194a86b06..21db057431e 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-mcaption.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-mcaption.sty
@@ -17,7 +17,7 @@
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{mcaption}
+\LWR@ProvidesPackageDrop{mcaption}[2009/03/13]
\newenvironment{margincap}{}{}
\newcommand*{\margincapalign}{}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-mdframed.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-mdframed.sty
index 6f56f47f368..e0b3dc28c45 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-mdframed.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-mdframed.sty
@@ -19,7 +19,7 @@
\RequirePackage{xcolor}% for \convertcolorspec
-\LWR@ProvidesPackageDrop{mdframed}
+\LWR@ProvidesPackageDrop{mdframed}[2013/07/01]
\LWR@origRequirePackage[framemethod=none]{mdframed}
\AtBeginDocument{
\def\mdf@trivlist#1{%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-memhfixc.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-memhfixc.sty
index 167864fdd0e..f7d8a78d424 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-memhfixc.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-memhfixc.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{memhfixc}
+\LWR@ProvidesPackageDrop{memhfixc}[2013/05/30]
\endinput
%%
%% End of file `lwarp-memhfixc.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-metalogo.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-metalogo.sty
index 4aad5da06cd..5dfa7a1f522 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-metalogo.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-metalogo.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{metalogo}
+\LWR@ProvidesPackageDrop{metalogo}[2010/05/29]
\newcommand\setlogokern[2]{}
\newcommand\setlogodrop[2][XeTeX]{}
\newcommand\setLaTeXa[1]{}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-mhchem.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-mhchem.sty
index 6c8f0cec2e6..cb538616127 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-mhchem.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-mhchem.sty
@@ -16,7 +16,7 @@
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackagePass{mhchem}
+\LWR@ProvidesPackagePass{mhchem}[2018/06/22]
\LetLtxMacro\LWR@mhchem@origce\ce
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-microtype.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-microtype.sty
index edee78b25d3..39e5ad7383f 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-microtype.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-microtype.sty
@@ -18,7 +18,7 @@
-\LWR@ProvidesPackageDrop{microtype}
+\LWR@ProvidesPackageDrop{microtype}[2018/01/14]
\DeclareDocumentCommand{\DeclareMicrotypeSet}{o m m}{}
\DeclareDocumentCommand{\UseMicrotypeSet}{o m}{}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-midfloat.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-midfloat.sty
index 7d488cdcab9..73000f4875f 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-midfloat.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-midfloat.sty
@@ -16,7 +16,7 @@
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{midfloat}
+\LWR@ProvidesPackageDrop{midfloat}[2012/05/29]
\newenvironment{strip}[1][]{}{}
\newskip\stripsep
\endinput
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-midpage.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-midpage.sty
index d4aac90162a..a69bfe2bb60 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-midpage.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-midpage.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{midpage}
+\LWR@ProvidesPackageDrop{midpage}[2009/09/03]
\newenvironment{midpage}
{\begin{BlockClass}[%
\LWR@print@mbox{margin-top:6ex} ; \LWR@print@mbox{margin-bottom:6ex}%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-morefloats.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-morefloats.sty
index d7d0f7a0acf..86733480e2b 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-morefloats.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-morefloats.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{morefloats}
+\LWR@ProvidesPackageDrop{morefloats}[2015/07/22]
\endinput
%%
%% End of file `lwarp-morefloats.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-moreverb.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-moreverb.sty
index 4a372065d22..e25021d8e0b 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-moreverb.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-moreverb.sty
@@ -16,7 +16,7 @@
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
\begin{warpHTML}
-\LWR@ProvidesPackagePass{moreverb}
+\LWR@ProvidesPackagePass{moreverb}[2008/06/03]
\BeforeBeginEnvironment{verbatimtab}{%
\LWR@forcenewpage
\LWR@atbeginverbatim{3}{Verbatim}%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-mparhack.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-mparhack.sty
index ba78fec0115..6384a9c549e 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-mparhack.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-mparhack.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{mparhack}
+\LWR@ProvidesPackageDrop{mparhack}[2005/04/17]
\endinput
%%
%% End of file `lwarp-mparhack.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-multicol.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-multicol.sty
index abc18b3f5a4..663a1803078 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-multicol.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-multicol.sty
@@ -18,16 +18,19 @@
-\LWR@ProvidesPackageDrop{multicol}[2015/09/13]
+\LWR@ProvidesPackageDrop{multicol}[2018/12/27]
\begin{warpHTML}
\NewDocumentEnvironment{multicols}{s m o}
{
-\LWR@forcenewpage
-\BlockClass{multicols}
-\IfValueT{#3}{\begin{BlockClass}{multicolsheading}#3\end{BlockClass}}}
+ \LWR@forcenewpage
+ \BlockClass{multicols}
+ \IfValueT{#3}{\begin{BlockClass}{multicolsheading}#3\end{BlockClass}}%
+ \setlength{\linewidth}{\linewidth/#2}
+ \booltrue{LWR@forceminipagefullwidth}
+}
{\endBlockClass}
\newcommand*{\columnbreak}{}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-multicolrule.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-multicolrule.sty
index c63ab76d721..412f600059e 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-multicolrule.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-multicolrule.sty
@@ -17,8 +17,9 @@
%% version 2005/12/01 or later.
\RequirePackage{multicol}
-\LWR@ProvidesPackageDrop{multicolrule}
+\LWR@ProvidesPackageDrop{multicolrule}[2019/01/01]
\newcommand*{\SetMCRule}[1]{}
+\NewDocumentCommand{\DeclareMCRulePattern}{m m}{}
\endinput
%%
%% End of file `lwarp-multicolrule.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-multirow.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-multirow.sty
index 6e1356070d2..bd67e1dc842 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-multirow.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-multirow.sty
@@ -18,7 +18,7 @@
\LetLtxMacro\multirow\relax
-\LWR@ProvidesPackagePass{multirow}
+\LWR@ProvidesPackagePass{multirow}[2018/08/03]
\newcommand{\LWR@multirowborder}{}
\NewDocumentCommand{\LWR@HTML@multirow}{O{c} m o m o +m}%
{%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-multitoc.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-multitoc.sty
index 109f28dbeb8..12b8d208234 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-multitoc.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-multitoc.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{multitoc}
+\LWR@ProvidesPackageDrop{multitoc}[1999/06/08]
\newcommand{\multicolumntoc}{2}
\newcommand{\multicolumnlot}{2}
\newcommand{\multicolumnlof}{2}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-nameauth.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-nameauth.sty
new file mode 100644
index 00000000000..1e96f71afae
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-nameauth.sty
@@ -0,0 +1,85 @@
+%%
+%% This is file `lwarp-nameauth.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx (with options: `nameauth')
+%% This is a generated file.
+%% Copyright 2016-2018 Brian Dunn
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+\LWR@ProvidesPackagePass{nameauth}[2017/03/22]
+\renewcommand*\@nameauth@Hook[1]
+{%
+ \if@nameauth@Lock
+ \@nameauth@InHooktrue%
+ \protected@edef\test{#1}%
+ \expandafter\@nameauth@TestDot\expandafter{\test}%
+ \if@nameauth@InAKA
+ \if@nameauth@AlwaysFormat
+ \@nameauth@FirstFormattrue%
+ \else
+ \unless\if@nameauth@AKAFormat
+ \@nameauth@FirstFormatfalse\fi
+ \fi
+ \if@nameauth@MainFormat
+ \if@nameauth@FirstFormat
+ \bgroup\NamesFormat{%
+ \LWR@textcurrentcolor{\LWR@textcurrentfont{#1}}% lwarp
+ }\egroup%
+ \else
+ \bgroup\MainNameHook{%
+ \LWR@textcurrentcolor{\LWR@textcurrentfont{#1}}% lwarp
+ }\egroup%
+ \fi
+ \else
+ \if@nameauth@FirstFormat
+ \bgroup\FrontNamesFormat{%
+ \LWR@textcurrentcolor{\LWR@textcurrentfont{#1}}% lwarp
+ }\egroup%
+ \else
+ \bgroup\FrontNameHook{%
+ \LWR@textcurrentcolor{\LWR@textcurrentfont{#1}}% lwarp
+ }\egroup%
+ \fi
+ \fi
+ \else
+ \if@nameauth@AlwaysFormat
+ \@nameauth@FirstFormattrue%
+ \fi
+ \if@nameauth@MainFormat
+ \if@nameauth@FirstFormat
+ \bgroup\NamesFormat{%
+ \LWR@textcurrentcolor{\LWR@textcurrentfont{#1}}% lwarp
+ }\egroup%
+ \else
+ \bgroup\MainNameHook{%
+ \LWR@textcurrentcolor{\LWR@textcurrentfont{#1}}% lwarp
+ }\egroup%
+ \fi
+ \else
+ \if@nameauth@FirstFormat
+ \bgroup\FrontNamesFormat{%
+ \LWR@textcurrentcolor{\LWR@textcurrentfont{#1}}% lwarp
+ }\egroup%
+ \else
+ \bgroup\FrontNameHook{%
+ \LWR@textcurrentcolor{\LWR@textcurrentfont{#1}}% lwarp
+ }\egroup%
+ \fi
+ \fi
+ \fi
+ \@nameauth@FirstFormatfalse%
+ \@nameauth@InHookfalse%
+ \fi
+}
+\endinput
+%%
+%% End of file `lwarp-nameauth.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-natbib.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-natbib.sty
index c769c3656c9..21a387acc84 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-natbib.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-natbib.sty
@@ -16,7 +16,7 @@
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackagePass{natbib}
+\LWR@ProvidesPackagePass{natbib}[2010/09/13]
\newcommand{\LWRNB@NAT@open}{$<$}
\newcommand{\LWRNB@patchnatbibopenclose}{
\ifdefstrequal{\NAT@open}{\LWRNB@NAT@open}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-nccfancyhdr.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-nccfancyhdr.sty
index 3a856513eda..3590c8d2b7d 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-nccfancyhdr.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-nccfancyhdr.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{nccfancyhdr}
+\LWR@ProvidesPackageDrop{nccfancyhdr}[2004/12/07]
\newcommand*{\headrulewidth}{}
\newcommand*{\footrulewidth}{}
\newcommand{\headstrutheight}{}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-needspace.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-needspace.sty
index ff14862ea21..2614f62761d 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-needspace.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-needspace.sty
@@ -17,7 +17,7 @@
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{needspace}
+\LWR@ProvidesPackageDrop{needspace}[2010/09/12]
\DeclareDocumentCommand{\needspace}{m}{}
\DeclareDocumentCommand{\Needspace}{s m}{}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-nextpage.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-nextpage.sty
index 75a64300bf1..21f9eedf247 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-nextpage.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-nextpage.sty
@@ -17,7 +17,7 @@
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{nextpage}
+\LWR@ProvidesPackageDrop{nextpage}[2009/09/03]
\DeclareDocumentCommand{\cleartoevenpage}{o}{}
\DeclareDocumentCommand{\movetoevenpage}{o}{}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-nonfloat.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-nonfloat.sty
index cd14cedced6..a3d0516dcf0 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-nonfloat.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-nonfloat.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{nonfloat}
+\LWR@ProvidesPackageDrop{nonfloat}[1999/07/05]
\LetLtxMacro\topcaption\caption
\newcommand{\figcaption}{\def\@captype{figure}\caption}
\newcommand{\tabcaption}{\def\@captype{table}\topcaption}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-nonumonpart.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-nonumonpart.sty
index 47a989f8788..b86afc1d2c6 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-nonumonpart.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-nonumonpart.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{nonumonpart}
+\LWR@ProvidesPackageDrop{nonumonpart}[2011/04/15]
\endinput
%%
%% End of file `lwarp-nonumonpart.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-nopageno.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-nopageno.sty
index 2a2eaeadf24..01a0e3845e5 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-nopageno.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-nopageno.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{nopageno}
+\LWR@ProvidesPackageDrop{nopageno}[1989/01/01]
\endinput
%%
%% End of file `lwarp-nopageno.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-notespages.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-notespages.sty
index c302c4b91ed..170c2e20089 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-notespages.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-notespages.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{notespages}
+\LWR@ProvidesPackageDrop{notespages}[2016/08/21]
\newcommand*{\npnotesname}{}
\newcommand*{\npnotestext}{}
\newcommand*{\remainingtextheight}{}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-nowidow.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-nowidow.sty
index 6ba92bada47..460534ef44a 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-nowidow.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-nowidow.sty
@@ -18,7 +18,7 @@
-\LWR@ProvidesPackageDrop{nowidow}
+\LWR@ProvidesPackageDrop{nowidow}[2011/09/20]
\newcommand*{\nowidow}[1][]{}
\newcommand*{\setnowidow}[1][]{}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-ntheorem.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-ntheorem.sty
index bfaec5c566b..0d7e5e0dbec 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-ntheorem.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-ntheorem.sty
@@ -34,7 +34,7 @@
\DeclareOption{amsmath}{}
\DeclareOption{hyperref}{}
-\LWR@ProvidesPackagePass{ntheorem}
+\LWR@ProvidesPackagePass{ntheorem}[2011/08/15]
\newcommand{\LWR@newtheoremstyle}{plain}
\AtBeginDocument{
\@ifpackageloaded{cleveref}{
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-overpic.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-overpic.sty
index d8936eebf53..2b75e33136b 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-overpic.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-overpic.sty
@@ -16,7 +16,7 @@
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackagePass{overpic}
+\LWR@ProvidesPackagePass{overpic}[2017/10/06]
\newcommand*{\overpicfontsize}{12}
\newcommand*{\overpicfontskip}{14}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-pagegrid.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-pagegrid.sty
index 31f986e3369..36da438c0e7 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-pagegrid.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-pagegrid.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{pagegrid}
+\LWR@ProvidesPackageDrop{pagegrid}[2016/05/16]
\newcommand*{\pagegridsetup}[1]{}
\endinput
%%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-pagenote.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-pagenote.sty
index 3ce323a9dde..df73ce31a67 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-pagenote.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-pagenote.sty
@@ -18,7 +18,7 @@
\DeclareOption{page}{}
-\LWR@ProvidesPackagePass{pagenote}
+\LWR@ProvidesPackagePass{pagenote}[2009/09/03]
\endinput
%%
%% End of file `lwarp-pagenote.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-pagesel.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-pagesel.sty
index 1ea976df496..b23b681192b 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-pagesel.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-pagesel.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{pagesel}
+\LWR@ProvidesPackageDrop{pagesel}[2016/05/16]
\endinput
%%
%% End of file `lwarp-pagesel.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-paralist.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-paralist.sty
index 069579d0310..641ac2aef03 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-paralist.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-paralist.sty
@@ -16,7 +16,7 @@
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackagePass{paralist}
+\LWR@ProvidesPackagePass{paralist}[2017/01/22]
\LetLtxMacro\compactitem\itemize
\LetLtxMacro\compactenum\enumerate
\LetLtxMacro\compactdesc\description
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-parnotes.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-parnotes.sty
index 32a4c6c240a..d148fa6eb2d 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-parnotes.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-parnotes.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackagePass{parnotes}
+\LWR@ProvidesPackagePass{parnotes}[2016/08/15]
\long\def\PN@parnote@real#1#2{%
\parnotemark{#1}%
% Unless this is the first parnote in \PN@text, add a separator first
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-parskip.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-parskip.sty
index 7aafd0eb613..d13d1391f8d 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-parskip.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-parskip.sty
@@ -17,7 +17,7 @@
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{parskip}
+\LWR@ProvidesPackageDrop{parskip}[2001/04/09]
\endinput
%%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-pbox.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-pbox.sty
index a90e26875aa..db987e4791f 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-pbox.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-pbox.sty
@@ -15,9 +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@ProvidesPackageDrop{pbox}
+\LWR@ProvidesPackageDrop{pbox}[2011/12/07]
\NewDocumentCommand{\pbox}{O{t} O{} O{t} m +m}{%
-\booltrue{LWR@minipagefullwidth}%
+\global\booltrue{LWR@minipagefullwidth}%
\parbox[#1][#2][#3]{#4}{#5}%
}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-pdflscape.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-pdflscape.sty
index 2ec560e763d..6833594125f 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-pdflscape.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-pdflscape.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{pdflscape}
+\LWR@ProvidesPackageDrop{pdflscape}[2016/05/14]
\endinput
%%
%% End of file `lwarp-pdflscape.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfpages.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfpages.sty
index 38953326780..968e6aceccc 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfpages.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfpages.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackagePass{pdfpages}
+\LWR@ProvidesPackagePass{pdfpages}[2017-10-31]
\define@key{pdfpages}{fitpaper}[false]{}
\define@key{pdfpages}{landscape}[false]{}
\define@key{pdfpages}{openright}[false]{}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfprivacy.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfprivacy.sty
index f684a064c12..8f4b5ccc90e 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfprivacy.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfprivacy.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{pdfprivacy}
+\LWR@ProvidesPackageDrop{pdfprivacy}[2017/12/03]
\endinput
%%
%% End of file `lwarp-pdfprivacy.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfrender.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfrender.sty
index 9fc86eb4128..4535447b826 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfrender.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfrender.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{pdfrender}
+\LWR@ProvidesPackageDrop{pdfrender}[2016/05/17]
\newcommand*{\pdfrender}[1]{}
\newcommand{\textpdfrender}[2]{#2}
\endinput
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfsync.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfsync.sty
index 2a5b91511d1..3ce823a176d 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfsync.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfsync.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{pdfsync}
+\LWR@ProvidesPackageDrop{pdfsync}[2008/01/26]
\newcommand*{\pdfsync}{}
\newcommand*{\pdfsyncstart}{}
\newcommand*{\pdfsyncstop}{}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-pdftricks.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-pdftricks.sty
index 63b6da8d004..9094e51ee17 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-pdftricks.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-pdftricks.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackagePass{pdftricks}
+\LWR@ProvidesPackagePass{pdftricks}[2003/08/10]
\def\PDFTfigname{\BaseJobname-fig\thepsfig}
\PackageWarning{lwarp-pdftricks}{
When the pdftricks images change,
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfx.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfx.sty
index 4a3e7df0115..1d5b4579a80 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfx.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-pdfx.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{pdfx}
+\LWR@ProvidesPackageDrop{pdfx}[2017/05/18]
\endinput
%%
%% End of file `lwarp-pdfx.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-pfnote.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-pfnote.sty
index 7967c22c6cb..e7ad3771462 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-pfnote.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-pfnote.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{pfnote}
+\LWR@ProvidesPackageDrop{pfnote}[1999/07/14]
\endinput
%%
%% End of file `lwarp-pfnote.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-phfqit.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-phfqit.sty
index d1f723d2e35..39f4cb87529 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-phfqit.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-phfqit.sty
@@ -16,7 +16,7 @@
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackagePass{phfqit}
+\LWR@ProvidesPackagePass{phfqit}[2017/08/16]
\LetLtxMacro\LWR@origbitstring\bitstring
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-placeins.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-placeins.sty
index 9c901faea81..fdcaf5fdded 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-placeins.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-placeins.sty
@@ -17,7 +17,7 @@
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{placeins}
+\LWR@ProvidesPackageDrop{placeins}[2005/04/18]
\newcommand*{\FloatBarrier}{}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-plarydshln.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-plarydshln.sty
index 4cfbe279aef..691ab3d83ef 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-plarydshln.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-plarydshln.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{plarydshln}
+\LWR@ProvidesPackageDrop{plarydshln}[2018/10/20]
\LWR@origRequirePackage{lwarp-arydshln}
\endinput
%%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-plext.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-plext.sty
index 0087362c6d1..370fc36959b 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-plext.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-plext.sty
@@ -44,7 +44,7 @@
}
\RenewDocumentCommand{\pbox}{d<> O{0pt} O{c} m}{%
-\booltrue{LWR@minipagefullwidth}%
+\global\booltrue{LWR@minipagefullwidth}%
\parbox{#2}{#4}%
}
\endinput
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-plextarydshln.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-plextarydshln.sty
index 7d5764be332..f84539d8f65 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-plextarydshln.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-plextarydshln.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{plextarydshln}
+\LWR@ProvidesPackageDrop{plextarydshln}[2018/10/20]
\LWR@origRequirePackage{lwarp-arydshln}
\endinput
%%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-plextcolorbl.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-plextcolorbl.sty
index ec4666377ea..1f3ad1640c1 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-plextcolorbl.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-plextcolorbl.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{plextcolortbl}
+\LWR@ProvidesPackageDrop{plextcolortbl}[2018/09/19]
\LWR@origRequirePackage{lwarp-colortbl}
\endinput
%%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-prelim2e.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-prelim2e.sty
index 09fedf01429..d26af8c899d 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-prelim2e.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-prelim2e.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{prelim2e}
+\LWR@ProvidesPackageDrop{prelim2e}[2009/05/29]
\newcommand{\PrelimText}{}
\newcommand{\PrelimTextStyle}{}
\newcommand{\PrelimWords}{}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-prettyref.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-prettyref.sty
index d30b8a69a9b..498f7854166 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-prettyref.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-prettyref.sty
@@ -16,7 +16,7 @@
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackagePass{prettyref}
+\LWR@ProvidesPackagePass{prettyref}[1998/07/09]
\newrefformat{fig}{Figure \ref{#1}}
\newrefformat{tab}{Table \ref{#1}}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-pst-eps.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-pst-eps.sty
index 1a1654db8fd..074f48fc5b5 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-pst-eps.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-pst-eps.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackagePass{pst-eps}
+\LWR@ProvidesPackagePass{pst-eps}[2005/05/20]
\renewenvironment{TeXtoEPS}{}{}
\renewcommand{\PSTtoEPS}[3][]{}
\endinput
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-pstool.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-pstool.sty
index 0331ae1e622..ec1f2a15333 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-pstool.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-pstool.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackagePass{pstool}
+\LWR@ProvidesPackagePass{pstool}[2018/01/20]
\renewcommand\pstool@alwaysprocess[3][]{%
\begin{lateximage}[(-pstool-~\packagediagramname)]%
\includegraphics{#2.pdf}%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-pstricks.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-pstricks.sty
index d4f3e032de2..cb163fc963e 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-pstricks.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-pstricks.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackagePass{pstricks}
+\LWR@ProvidesPackagePass{pstricks}[2018/01/06]
\BeforeBeginEnvironment{pspicture}{\begin{lateximage}[(pspicture)]}
\AfterEndEnvironment{pspicture}{\end{lateximage}}
\endinput
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-pxatbegshi.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-pxatbegshi.sty
index 380864b6896..bad22aa4690 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-pxatbegshi.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-pxatbegshi.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{pxatbegshi}
+\LWR@ProvidesPackageDrop{pxatbegshi}[2017/11/04]
\LWR@origRequirePackage{lwarp-atbegshi}
\endinput
%%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-pxeveryshi.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-pxeveryshi.sty
index fb38713fbe7..a3073b06824 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-pxeveryshi.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-pxeveryshi.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{pxeveryshi}
+\LWR@ProvidesPackageDrop{pxeveryshi}[2012/05/19]
\LWR@origRequirePackage{lwarp-everyshi}
\endinput
%%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-pxftnright.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-pxftnright.sty
index a6cdc9a7048..6802c0947f8 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-pxftnright.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-pxftnright.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{pxftnright}
+\LWR@ProvidesPackageDrop{pxftnright}[2017/02/28]
\LWR@origRequirePackage{lwarp-ftnright}
\endinput
%%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-pxjahyper.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-pxjahyper.sty
index 593f13417dd..f8c5369eb02 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-pxjahyper.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-pxjahyper.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{pxjahyper}
+\LWR@ProvidesPackageDrop{pxjahyper}[2018/07/15]
\endinput
%%
%% End of file `lwarp-pxjahyper.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-quotchap.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-quotchap.sty
index 27ec2dba27a..e117486bb56 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-quotchap.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-quotchap.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{quotchap}
+\LWR@ProvidesPackageDrop{quotchap}[2012/10/20]
\newcommand{\@quotchap}{}
\newlength{\LWR@quotchapwidth}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-quoting.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-quoting.sty
index 16aba1f64da..72ff8b4761a 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-quoting.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-quoting.sty
@@ -16,7 +16,7 @@
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackagePass{quoting}
+\LWR@ProvidesPackagePass{quoting}[2014/01/28]
\xpatchcmd{\quoting}{\quo@begintext}
{\begin{LWR@blocktextcurrentfont}\quo@begintext}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-ragged2e.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-ragged2e.sty
index 508716b79f1..464cc849805 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-ragged2e.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-ragged2e.sty
@@ -17,7 +17,7 @@
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{ragged2e}
+\LWR@ProvidesPackageDrop{ragged2e}[2009/05/21]
\LetLtxMacro\Centering\centering
\LetLtxMacro\RaggedLeft\raggedleft
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-realscripts.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-realscripts.sty
index 2cb38b2edb8..3c77af5136b 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-realscripts.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-realscripts.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{realscripts}
+\LWR@ProvidesPackageDrop{realscripts}[2016/02/13]
\let\realsuperscript\textsuperscript
\let\realsubscript\textsubscript
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-register.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-register.sty
index 05ed82060ef..76cc9639588 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-register.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-register.sty
@@ -16,7 +16,7 @@
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackagePass{register}[2018/11/10]
+\LWR@ProvidesPackagePass{register}[2019/01/01]
\xpatchcmd{\register}
{\centering}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-relsize.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-relsize.sty
index f4b6368b763..5725777533a 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-relsize.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-relsize.sty
@@ -16,7 +16,7 @@
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackagePass{relsize}
+\LWR@ProvidesPackagePass{relsize}[2013/03/29]
\let\LWR@origrelsize\relsize
\LetLtxMacro\LWR@origlarger\larger
\LetLtxMacro\LWR@origsmaller\smaller
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-resizegather.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-resizegather.sty
index 80f3c97d1f6..5d8a5042bee 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-resizegather.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-resizegather.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{resizegather}
+\LWR@ProvidesPackageDrop{resizegather}[2016/05/16]
\newcommand*{\resizegathersetup}[1]{}
\endinput
%%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-rmpage.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-rmpage.sty
index 0c510086198..970f3c88081 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-rmpage.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-rmpage.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{rmpage}
+\LWR@ProvidesPackageDrop{rmpage}[1997/09/29]
\endinput
%%
%% End of file `lwarp-rmpage.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-romanbar.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-romanbar.sty
index 48ac021bc5a..723891e13bc 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-romanbar.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-romanbar.sty
@@ -17,7 +17,7 @@
%% version 2005/12/01 or later.
-\LWR@ProvidesPackagePass{romanbar}
+\LWR@ProvidesPackagePass{romanbar}[2012/01/01]
\DeclareRobustCommand{\Roman@bar}[1]{% #1 is in Roman, i.e. MMXII
\InlineClass[%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-romanbarpagenumber.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-romanbarpagenumber.sty
index 475e4adaf74..5e57ef52682 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-romanbarpagenumber.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-romanbarpagenumber.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{romanbarpagenumber}
+\LWR@ProvidesPackageDrop{romanbarpagenumber}[2015/02/06]
\endinput
%%
%% End of file `lwarp-romanbarpagenumber.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-rotating.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-rotating.sty
index f5a0584da28..bae13c45d88 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-rotating.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-rotating.sty
@@ -17,7 +17,7 @@
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{rotating}
+\LWR@ProvidesPackageDrop{rotating}[2016/08/11]
\LetLtxMacro\sidewaystable\table
\let\endsidewaystable\endtable
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-savetrees.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-savetrees.sty
index b3478bc281a..cb307c2da5d 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-savetrees.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-savetrees.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{savetrees}
+\LWR@ProvidesPackageDrop{savetrees}[2016/04/13]
\endinput
%%
%% End of file `lwarp-savetrees.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-schemata.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-schemata.sty
index 8b7519ade3e..52f2f695ebd 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-schemata.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-schemata.sty
@@ -16,7 +16,7 @@
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackagePass{schemata}
+\LWR@ProvidesPackagePass{schemata}[2016/01/25]
\LetLtxMacro\LWR@schemata@origschema\schema
\LetLtxMacro\LWR@schemata@origSchema\Schema
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-scrextend.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-scrextend.sty
index 3e67d4dc2c1..1b1355c6f6c 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-scrextend.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-scrextend.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{scrextend}
+\LWR@ProvidesPackageDrop{scrextend}[2018/03/30]
\DeclareDocumentCommand{\setkomafont}{m m}{}
\DeclareDocumentCommand{\addkomafont}{m m}{}
\DeclareDocumentCommand{\usekomafont}{m}{}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-scrhack.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-scrhack.sty
index c5fbc2b3549..e36fc7a80d4 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-scrhack.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-scrhack.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{scrhack}
+\LWR@ProvidesPackageDrop{scrhack}[2018/03/30]
\endinput
%%
%% End of file `lwarp-scrhack.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-scrlayer-notecolumn.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-scrlayer-notecolumn.sty
index 7a3572825da..09ca2463356 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-scrlayer-notecolumn.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-scrlayer-notecolumn.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{scrlayer-notecolumn}
+\LWR@ProvidesPackageDrop{scrlayer-notecolumn}[2018/02/02]
\newcommand*{\DeclareNoteColumn}[2][]{}
\newcommand*{\DeclareNewNoteColumn}[2][]{}
\newcommand*{\ProvideNoteColumn}[2][]{}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-scrlayer-scrpage.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-scrlayer-scrpage.sty
index da728c6b0e1..d6dc3dc720f 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-scrlayer-scrpage.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-scrlayer-scrpage.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{scrlayer-scrpage}
+\LWR@ProvidesPackageDrop{scrlayer-scrpage}[2018/03/30]
\@ifundefined{footheight}{\newlength\footheight}{}
\NewDocumentCommand{\lehead}{s o m}{}
\NewDocumentCommand{\cehead}{s o m}{}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-scrlayer.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-scrlayer.sty
index 90ceb7be7e9..b945694fee2 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-scrlayer.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-scrlayer.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{scrlayer}
+\LWR@ProvidesPackageDrop{scrlayer}[2018/03/30]
\newcommand*{\DeclareSectionNumberDepth}[2]{}
\newcommand*{\DeclareLayer}[2][]{}
\newcommand*{\DeclareNewLayer}[2][]{}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-scrpage2.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-scrpage2.sty
index 12a5c2b3f5a..89fd81e3105 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-scrpage2.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-scrpage2.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{scrpage2}
+\LWR@ProvidesPackageDrop{scrpage2}[2018/03/30]
\@ifundefined{footheight}{\newlength\footheight}{}
\NewDocumentCommand{\lehead}{o m}{}
\NewDocumentCommand{\cehead}{o m}{}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-sectionbreak.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-sectionbreak.sty
index 5231852206a..490038f9841 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-sectionbreak.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-sectionbreak.sty
@@ -16,7 +16,7 @@
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackagePass{sectionbreak}
+\LWR@ProvidesPackagePass{sectionbreak}[2018-01-03]
\renewcommand\asterism{\HTMLunicode{2042}}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-sectsty.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-sectsty.sty
index c27b98d78d7..19a2dc5e98f 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-sectsty.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-sectsty.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{sectsty}
+\LWR@ProvidesPackageDrop{sectsty}[2002/02/25]
\newcommand*{\partfont} [1] {}
\newcommand*{\partnumberfont} [1] {}
\newcommand*{\parttitlefont} [1] {}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-setspace.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-setspace.sty
index 5371a767e4a..6c7eac4f7fd 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-setspace.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-setspace.sty
@@ -19,7 +19,7 @@
-\LWR@ProvidesPackageDrop{setspace}
+\LWR@ProvidesPackageDrop{setspace}[2011/12/19]
\newcommand*{\setstretch}[1]{}
\newcommand*{\SetSinglespace}[1]{}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-shadow.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-shadow.sty
index 1a2a5bfc9ad..93528818e15 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-shadow.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-shadow.sty
@@ -17,7 +17,7 @@
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{shadow}
+\LWR@ProvidesPackageDrop{shadow}[2003/02/19]
\newdimen\sboxsep
\newdimen\sboxrule
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-showkeys.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-showkeys.sty
index 66cb44a4324..c7861931d04 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-showkeys.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-showkeys.sty
@@ -17,7 +17,7 @@
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{showkeys}
+\LWR@ProvidesPackageDrop{showkeys}[2014/10/28]
\NewDocumentCommand{\showkeys}{s}{}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-sidecap.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-sidecap.sty
index 6adce9c43b1..dd07166e820 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-sidecap.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-sidecap.sty
@@ -17,7 +17,7 @@
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{sidecap}
+\LWR@ProvidesPackageDrop{sidecap}[2003/06/06]
\NewDocumentEnvironment{SCtable}{soo}
{\IfValueTF{#3}{\table[#3]}{\table}}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-siunitx.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-siunitx.sty
index 34b6190c005..2f71938c278 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-siunitx.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-siunitx.sty
@@ -18,7 +18,7 @@
\RequirePackage{xcolor}% for \convertcolorspec
-\LWR@ProvidesPackagePass{siunitx}
+\LWR@ProvidesPackagePass{siunitx}[2018/05/17]
\AtBeginDocument{% in case textcomp was not loaded
\DeclareSIUnit\bohr{\textit{a}\textsubscript{0}}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-soulpos.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-soulpos.sty
index 5260e4c2f6d..317a5744fea 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-soulpos.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-soulpos.sty
@@ -17,7 +17,7 @@
%% version 2005/12/01 or later.
\RequirePackage{soul}
\RequirePackage{soulutf8}
-\LWR@ProvidesPackageDrop{soulpos}
+\LWR@ProvidesPackageDrop{soulpos}[2012/02/25]
\NewDocumentCommand{\ulposdef}{m o m}{}
\newdimen\ulwidth
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-soulutf8.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-soulutf8.sty
index 52738c7864a..a1c72d50997 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-soulutf8.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-soulutf8.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{soulutf8}
+\LWR@ProvidesPackageDrop{soulutf8}[2016/05/16]
\endinput
%%
%% End of file `lwarp-soulutf8.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-splitidx.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-splitidx.sty
index 460125cee78..13209ea07de 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-splitidx.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-splitidx.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackagePass{splitidx}
+\LWR@ProvidesPackagePass{splitidx}[2016/02/18]
\catcode`\_=12%
\xpatchcmd{\newindex}
{\jobname-#2.idx}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-stabular.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-stabular.sty
index 3b656b2219d..7055be9c9f1 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-stabular.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-stabular.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{stabular}
+\LWR@ProvidesPackageDrop{stabular}[2014/03/20]
\newenvironment{stabular}[2][c]
{
\begin{tabular}[#1]{#2}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-stfloats.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-stfloats.sty
index edacbe93fae..351b8ae8071 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-stfloats.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-stfloats.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{stfloats}
+\LWR@ProvidesPackageDrop{stfloats}[2017/03/27]
\providecommand*{\fnbelowfloat}{}
\providecommand*{\fnunderfloat}{}
\providecommand*{\setbaselinefloat}{}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-subcaption.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-subcaption.sty
new file mode 100644
index 00000000000..0cb71dde01c
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-subcaption.sty
@@ -0,0 +1,34 @@
+%%
+%% This is file `lwarp-subcaption.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lwarp.dtx (with options: `subcaption')
+%% This is a generated file.
+%% Copyright 2016-2018 Brian Dunn
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+\LWR@ProvidesPackagePass{subcaption}[2018/05/01]
+\ifdef{\subcaption@minipage}{
+ \xpatchcmd{\subcaption@minipage}
+ {\minipage}
+ {\minipagefullwidth\minipage}
+ {}
+ {\LWR@patcherror{subcaption}{subcaption@minipage}}
+}{}
+\ifdef{\subcaptionbox}{
+ \xpretocmd{\subcaptionbox}
+ {\minipagefullwidth}
+ {}
+ {\LWR@patcherror{subcaption}{subcaptionbox}}
+}{}
+\endinput
+%%
+%% End of file `lwarp-subcaption.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-subfig.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-subfig.sty
index 9bcabeadd7c..1a3cea3b850 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-subfig.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-subfig.sty
@@ -16,7 +16,7 @@
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackagePass{subfig}
+\LWR@ProvidesPackagePass{subfig}[2005/06/28]
\long\def\sf@@@subfloat#1[#2][#3]#4{%
\begin{minipage}{\linewidth}% lwarp
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-subfigure.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-subfigure.sty
index f69086f105c..cd175aea964 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-subfigure.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-subfigure.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{subfigure}
+\LWR@ProvidesPackageDrop{subfigure}[2002/03/15]
\RequirePackage{subfig}
\LetLtxMacro\subfigure\subfloat
\LetLtxMacro\subtable\subfloat
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-supertabular.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-supertabular.sty
index e25733f35e9..81485b1451f 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-supertabular.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-supertabular.sty
@@ -17,7 +17,7 @@
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{supertabular}
+\LWR@ProvidesPackageDrop{supertabular}[2004/02/20]
\newcommand{\LWRST@firsthead}{}
\newcommand{\tablefirsthead}[1]{%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-syntonly.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-syntonly.sty
index ca0992c2959..0ec3d5e4a64 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-syntonly.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-syntonly.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{syntonly}
+\LWR@ProvidesPackageDrop{syntonly}[2017/06/30]
\newif\ifsyntax@
\syntax@false
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-tabularx.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-tabularx.sty
index 0c13cddabf9..06304697f49 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-tabularx.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-tabularx.sty
@@ -17,7 +17,7 @@
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{tabularx}
+\LWR@ProvidesPackageDrop{tabularx}[2016/02/03]
\DeclareDocumentEnvironment{tabularx}{m o m}
{\tabular{#3}}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-tabulary.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-tabulary.sty
index 8cc750f8dbb..ae149278bce 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-tabulary.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-tabulary.sty
@@ -17,7 +17,7 @@
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{tabulary}
+\LWR@ProvidesPackageDrop{tabulary}[2014/06/11]
\NewDocumentEnvironment{tabulary}{m o m}
{\tabular{#3}}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-tascmac.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-tascmac.sty
index 5ab7326d0ea..0c6488a5390 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-tascmac.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-tascmac.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{tascmac}
+\LWR@ProvidesPackageDrop{tascmac}[2018/03/09]
\newenvironment*{boxnote}
{
\BlockClass[
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-textarea.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-textarea.sty
index 78f4e102ce4..054dfa31f2a 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-textarea.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-textarea.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{textarea}
+\LWR@ProvidesPackageDrop{textarea}[2005/12/26]
\newcommand\StartFromTextArea{}
\newcommand\StartFromHeaderArea{}
\newcommand*\RestoreTextArea{}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-textcomp.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-textcomp.sty
index a2381bcfc4e..8772465ecfe 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-textcomp.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-textcomp.sty
@@ -17,7 +17,7 @@
%% version 2005/12/01 or later.
-\LWR@ProvidesPackagePass{textcomp}
+\LWR@ProvidesPackagePass{textcomp}[2017/04/05]
\AtBeginDocument{
\ifPDFTeX% pdflatex or dvi latex
\newcommand*{\LWR@HTML@textdegree}{\HTMLentity{deg}}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-textfit.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-textfit.sty
index 41f2231d9b4..c39bad3dd0c 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-textfit.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-textfit.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{textfit}
+\LWR@ProvidesPackageDrop{textfit}[1994/04/15]
\newsavebox{\LWR@textfitbox}
\newcommand*{\LWR@textfitscale}[2]{%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-textpos.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-textpos.sty
index de1a5bb8ffe..204068e6d97 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-textpos.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-textpos.sty
@@ -18,7 +18,7 @@
-\LWR@ProvidesPackageDrop{textpos}
+\LWR@ProvidesPackageDrop{textpos}[2016/06/07]
\NewDocumentEnvironment{textblock}{m r()}{}{}
\NewDocumentEnvironment{textblock*}{m o r()}{}{}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-theorem.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-theorem.sty
index ec8c754ee22..ba8e4a0a5a1 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-theorem.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-theorem.sty
@@ -16,7 +16,7 @@
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackagePass{theorem}
+\LWR@ProvidesPackagePass{theorem}[2014/10/28]
\newcommand{\LWR@newtheoremstyle}{plain}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-thinsp.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-thinsp.sty
index 4fe1c937c0c..6d9b065719b 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-thinsp.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-thinsp.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{thinsp}
+\LWR@ProvidesPackageDrop{thinsp}[2016/10/02]
\AtBeginDocument{
\let\thinthinspace\relax% defined by some packages
\newcommand*{\thinthinspace}{\thinspace}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-threadcol.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-threadcol.sty
index 3318a6466ab..a16181277e1 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-threadcol.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-threadcol.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{threadcol}
+\LWR@ProvidesPackageDrop{threadcol}[2013/01/06]
\newcommand{\setthreadname}[1]{}
\endinput
%%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-threeparttable.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-threeparttable.sty
index e241621739a..07d2d6f7ddc 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-threeparttable.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-threeparttable.sty
@@ -18,9 +18,8 @@
-\LWR@ProvidesPackageDrop{threeparttable}
+\LWR@ProvidesPackageDrop{threeparttable}[2003/06/13]
-\newcommand{\LWR@printtablenote}[1]{\InlineClass{tnoteitemheader}{#1}}
\newenvironment*{threeparttable}[1][b]{}{}
@@ -28,9 +27,6 @@
{%
\LWR@forcenewpage
\BlockClass{tnotes}%
-\ltx@ifpackageloaded{enumitem}{%
-\setlist[description]{format=\LWR@printtablenote}%
-}{}%
\description%
}
{%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-thumb.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-thumb.sty
index f26ef6f1973..bffc9a80a14 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-thumb.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-thumb.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{thumb}
+\LWR@ProvidesPackageDrop{thumb}[1997/12/24]
\newcommand*{\Overviewpage}{}
\newlength{\thumbheight}
\newlength{\thumbwidth}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-thumbs.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-thumbs.sty
index 0a8a80cd82b..1156aa09a08 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-thumbs.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-thumbs.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{thumbs}
+\LWR@ProvidesPackageDrop{thumbs}[2014/03/09]
\newcommand{\addthumb}[4]{}
\newcommand{\addtitlethumb}[5]{}
\newcommand{\stopthumb}{}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-titleps.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-titleps.sty
index 040533a6c0b..97aed37c9c2 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-titleps.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-titleps.sty
@@ -17,7 +17,7 @@
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{titleps}
+\LWR@ProvidesPackageDrop{titleps}[2016/03/15]
\NewDocumentCommand{\newpagestyle}{m o m}{}
\NewDocumentCommand{\renewpagestyle}{m o m}{}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-titleref.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-titleref.sty
index 4213cb7e6e2..560653f54e0 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-titleref.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-titleref.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{titleref}
+\LWR@ProvidesPackageDrop{titleref}[2001/04/05]
\LetLtxMacro\titleref\nameref
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-titlesec.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-titlesec.sty
index 738a07efcbf..2c64a5b411d 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-titlesec.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-titlesec.sty
@@ -19,7 +19,7 @@
-\LWR@ProvidesPackageDrop{titlesec}
+\LWR@ProvidesPackageDrop{titlesec}[2016/03/21]
\newcommand*{\titlelabel}[1]{}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-titletoc.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-titletoc.sty
index 8b1d1a40f97..f28855b9403 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-titletoc.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-titletoc.sty
@@ -19,7 +19,7 @@
-\LWR@ProvidesPackageDrop{titletoc}
+\LWR@ProvidesPackageDrop{titletoc}[2011/12/15]
\NewDocumentCommand{\dottedcontents}{m o m m m}{}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-titling.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-titling.sty
index daf3c4db07d..7456452610b 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-titling.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-titling.sty
@@ -18,7 +18,7 @@
-\LWR@ProvidesPackagePass{titling}
+\LWR@ProvidesPackagePass{titling}[2009/09/04]
\let\LWR@orig@bsmtitlempty\@bsmtitlempty
\renewcommand*{\@bsmtitlempty}{%
\LWR@orig@bsmtitlempty%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-tocbasic.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-tocbasic.sty
index 0a2193d552e..d3a5cc8bda6 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-tocbasic.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-tocbasic.sty
@@ -16,10 +16,11 @@
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackagePass{tocbasic}
+\LWR@ProvidesPackagePass{tocbasic}[2018/12/30]
\DeclareDocumentCommand{\usetocbasicnumberline}{o}{}
\DeclareDocumentCommand{\DeclareTOCStyleEntry}{o m m}{}
+\DeclareDocumentCommand{\DeclareTOCStyleEntries}{o m m}{}
\DeclareDocumentCommand{\DeclareTOCEntryStyle}{m o m}{}
\DeclareDocumentCommand{\DefineTOCEntryOption}{m o m}{}
\DeclareDocumentCommand{\DefineTOCEntryBooleanOption}{m o m m m}{}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-tocbibind.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-tocbibind.sty
index 6708e2e6a6a..206562aecb3 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-tocbibind.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-tocbibind.sty
@@ -18,7 +18,7 @@
\let\simplechapterdelim\relax
-\LWR@ProvidesPackagePass{tocbibind}
+\LWR@ProvidesPackagePass{tocbibind}[2010/10/13]
\renewenvironment{theindex}%
{%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-tocenter.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-tocenter.sty
index f3aaa940531..34300ea0605 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-tocenter.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-tocenter.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{tocenter}
+\LWR@ProvidesPackageDrop{tocenter}[2004/12/09]
\NewDocumentCommand{\ToCenter}{s o m m}{}
\NewDocumentCommand{\FromMargins}{s o m m m m}{}
\endinput
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-tocloft.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-tocloft.sty
index 8e1976128b7..914f69b764c 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-tocloft.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-tocloft.sty
@@ -18,7 +18,7 @@
-\LWR@ProvidesPackageDrop{tocloft}
+\LWR@ProvidesPackageDrop{tocloft}[2017/08/31]
\newcommand{\tocloftpagestyle}[1]{}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-tocstyle.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-tocstyle.sty
index 6fcbbeeede3..1f6344aff4d 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-tocstyle.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-tocstyle.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{tocstyle}
+\LWR@ProvidesPackageDrop{tocstyle}[2017/02/23]
\newcommand*{\usetocstyle}[2][]{}
\newcommand*{\deactivatetocstyle}[1][]{}
\newcommand*{\reactivatetocstyle}[1][]{}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-todo.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-todo.sty
index 3106abe1072..31c43b75e1e 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-todo.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-todo.sty
@@ -16,7 +16,7 @@
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackagePass{todo}
+\LWR@ProvidesPackagePass{todo}[2010/03/31]
\renewcommand\todoitem[2]{%
\refstepcounter{todo}%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-todonotes.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-todonotes.sty
index fc064eca47e..601938ab02b 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-todonotes.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-todonotes.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackagePass{todonotes}
+\LWR@ProvidesPackagePass{todonotes}[2012/07/25]
\if@todonotes@disabled
\else
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-tram.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-tram.sty
index 4fadab9882b..9c37e5d813b 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-tram.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-tram.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{tram}
+\LWR@ProvidesPackageDrop{tram}[2013/04/04]
\newenvironment{tram}[1][]%
{\BlockClass[background:lightgray]{tram}}
{\endBlockClass}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-transparent.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-transparent.sty
index fb9d85084a7..ee64fc44f8a 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-transparent.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-transparent.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{transparent}
+\LWR@ProvidesPackageDrop{transparent}[2016/05/16]
\newcommand*{\transparent}[1]{\edef\LWR@opacity{#1}}
\newcommand*{\texttransparent}[2]{%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-trimclip.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-trimclip.sty
index 40d104cbafa..a7bc0b91d67 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-trimclip.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-trimclip.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{trimclip}
+\LWR@ProvidesPackageDrop{trimclip}[2018/04/08]
\csdef{trimbox}{\@ifstar\@gobble\@gobble}
\csletcs{trimbox*}{trimbox}
\def\endtrimbox{}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-trivfloat.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-trivfloat.sty
index a6c6f6bedf5..5edac378109 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-trivfloat.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-trivfloat.sty
@@ -17,7 +17,7 @@
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{trivfloat}
+\LWR@ProvidesPackageDrop{trivfloat}[2009/04/23]
\LWR@origRequirePackage{trivfloat}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-indentfirst.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-truncate.sty
index c9dbabe4948..6dccec62e54 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-indentfirst.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-truncate.sty
@@ -1,10 +1,10 @@
%%
-%% This is file `lwarp-indentfirst.sty',
+%% This is file `lwarp-truncate.sty',
%% generated with the docstrip utility.
%%
%% The original source files were:
%%
-%% lwarp.dtx (with options: `indentfirst')
+%% lwarp.dtx (with options: `truncate')
%% This is a generated file.
%% Copyright 2016-2018 Brian Dunn
%%
@@ -15,11 +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@ProvidesPackageDrop{indentfirst}
-
+\LWR@ProvidesPackageDrop{truncate}[2001/08/20]
+\providecommand{\TruncateMarker}{}
+\newcommand{\truncate}[3][\TruncateMarker]{#3}
\endinput
%%
-%% End of file `lwarp-indentfirst.sty'.
+%% End of file `lwarp-truncate.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-turnthepage.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-turnthepage.sty
index 61b4e521ee9..207eb1e74dd 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-turnthepage.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-turnthepage.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{turnthepage}
+\LWR@ProvidesPackageDrop{turnthepage}[2011/03/24]
\newcommand{\turnthepage}{}
\endinput
%%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-typearea.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-typearea.sty
index 50c96875147..cd394d0d83f 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-typearea.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-typearea.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{typearea}
+\LWR@ProvidesPackageDrop{typearea}[2018/03/30]
\DeclareDocumentCommand{\typearea}{o m}{}
\DeclareDocumentCommand{\recalctypearea}{}{}
\@ifundefined{footheight}{\newlength\footheight}{}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-underscore.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-underscore.sty
index 7c718832dac..af20680dbf9 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-underscore.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-underscore.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{underscore}
+\LWR@ProvidesPackageDrop{underscore}[2006/09/13]
\endinput
%%
%% End of file `lwarp-underscore.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-unitsdef.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-unitsdef.sty
index ba42b0aa8fc..48833a4eef3 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-unitsdef.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-unitsdef.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackagePass{unitsdef}
+\LWR@ProvidesPackagePass{unitsdef}[2005/01/04]
\renewcommand{\unitvaluesep}{\,}
\renewcommand{\unittimes}{\@@setunitsepfalse\HTMLunicode{22c5}}% \cdot
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-upref.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-upref.sty
index bee0e4619fc..b7061e09679 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-upref.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-upref.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{upref}
+\LWR@ProvidesPackageDrop{upref}[2007/03/14]
\endinput
%%
%% End of file `lwarp-upref.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-url.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-url.sty
index ee8b6ab195e..668842a83ab 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-url.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-url.sty
@@ -16,7 +16,7 @@
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackagePass{url}
+\LWR@ProvidesPackagePass{url}[2013/09/16]
\LetLtxMacro\LWR@url@origUrl@FormatString\Url@FormatString
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-uspace.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-uspace.sty
index cb7be20ccfc..e3e96e4dac5 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-uspace.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-uspace.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{uspace}
+\LWR@ProvidesPackageDrop{uspace}[2016/11/06]
\endinput
%%
%% End of file `lwarp-uspace.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-verse.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-verse.sty
index 0604b36353e..e41dc40f377 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-verse.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-verse.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackagePass{verse}
+\LWR@ProvidesPackagePass{verse}[2009/09/04]
\AfterEndPreamble{
\LWR@traceinfo{Patching verse.}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-versonotes.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-versonotes.sty
index 8a57f3f6c1a..a3bb1b8db26 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-versonotes.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-versonotes.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{versonotes}
+\LWR@ProvidesPackageDrop{versonotes}[2015/12/08]
\newcommand{\versonote}[1]{\marginpar{#1}}
\newdimen\versotextwidth
\newdimen\versoleftmargin
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-vertbars.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-vertbars.sty
index be4ab558b18..763c747e350 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-vertbars.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-vertbars.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{vertbars}
+\LWR@ProvidesPackageDrop{vertbars}[2010/11/27]
\newlength{\barwidth}
\setlength{\barwidth}{0.4pt}
\newlength{\barspace}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-vmargin.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-vmargin.sty
index fd591d54c09..200e9a8bdeb 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-vmargin.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-vmargin.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{vmargin}
+\LWR@ProvidesPackageDrop{vmargin}[2004/07/15]
\newcommand*{\LWRVM@customsize}[2]{}
\newcommand*{\setpapersize}[2][]{\ifstrequal{#2}{custom}{\LWRVM@customsize}{}}
\newcommand*{\setmargins}[8]{}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-vowel.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-vowel.sty
index bfd2c5d11fb..8d4b8865c87 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-vowel.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-vowel.sty
@@ -16,7 +16,7 @@
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackagePass{vowel}
+\LWR@ProvidesPackagePass{vowel}[2002/08/08]
\renewenvironment{vowel}[1][]
{%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-vwcol.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-vwcol.sty
index a045a12d9b9..f92c8da7c19 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-vwcol.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-vwcol.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackagePass{vwcol}
+\LWR@ProvidesPackagePass{vwcol}[2015/02/10]
\newcommand*{\LWR@vwcol@addrule}[1]{%
\appto{\LWR@vwcolstyle}{%
#1: %
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-wallpaper.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-wallpaper.sty
index 300247f76c8..d00938775c3 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-wallpaper.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-wallpaper.sty
@@ -18,7 +18,7 @@
-\LWR@ProvidesPackageDrop{wallpaper}
+\LWR@ProvidesPackageDrop{wallpaper}[2005/01/18]
\newcommand*{\CenterWallPaper}[2]{}
\newcommand*{\ThisCenterWallPaper}[2]{}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-watermark.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-watermark.sty
index d2424dee1a9..f2bb25bf6fd 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-watermark.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-watermark.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{watermark}
+\LWR@ProvidesPackageDrop{watermark}[2004/12/09]
\newcommand{\watermark}[1]{}
\newcommand{\leftwatermark}[1]{}
\newcommand{\rightwatermark}[1]{}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-wrapfig.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-wrapfig.sty
index 77ce54b9ce3..8103b055c1f 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-wrapfig.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-wrapfig.sty
@@ -18,7 +18,7 @@
-\LWR@ProvidesPackageDrop{wrapfig}
+\LWR@ProvidesPackageDrop{wrapfig}[2003/01/31]
\newcommand*{\LWR@wrapposition}{}
\newcommand*{\LWR@subwrapfigure}[2]{%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty
index 9ebd82e2f96..f3c9ef1d9a0 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-xcolor.sty
@@ -17,7 +17,7 @@
%% version 2005/12/01 or later.
-\LWR@ProvidesPackagePass{xcolor}
+\LWR@ProvidesPackagePass{xcolor}[2016/05/11]
\begin{warpHTML}
\LetLtxMacro\LWR@print@pagecolor\pagecolor
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-xellipsis.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-xellipsis.sty
index 0d0caad9d86..4680bf8b960 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-xellipsis.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-xellipsis.sty
@@ -16,7 +16,7 @@
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackagePass{xellipsis}
+\LWR@ProvidesPackagePass{xellipsis}[2015/11/01]
\newcommand*{\LWR@xellipsespace}[1]{%
\ifdim#1=0pt\else%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-xfrac.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-xfrac.sty
index 08d66341e34..67d07568ac5 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-xfrac.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-xfrac.sty
@@ -17,7 +17,7 @@
%% version 2005/12/01 or later.
-\LWR@ProvidesPackagePass{xfrac}
+\LWR@ProvidesPackagePass{xfrac}[2018-08-23]
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-xltabular.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-xltabular.sty
index 7a4ad2b39ef..b8badb5ef1a 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-xltabular.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-xltabular.sty
@@ -19,7 +19,7 @@
\RequirePackage{tabularx}
-\LWR@ProvidesPackageDrop{xltabular}
+\LWR@ProvidesPackageDrop{xltabular}[2018/05/23]
\DeclareDocumentEnvironment{xltabular}{o m m}
{\longtable{#3}}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-xltxtra.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-xltxtra.sty
index 2c250b4770b..8f197bffbca 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-xltxtra.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-xltxtra.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{xltxtra}
+\LWR@ProvidesPackageDrop{xltxtra}[2016/01/21]
\RequirePackage{realscripts}
\RequirePackage{metalogo}
\newcommand*\TeX@logo@spacing[6]{}
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-xmpincl.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-xmpincl.sty
index 2b4f98adace..1c05e682653 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-xmpincl.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-xmpincl.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{xmpincl}
+\LWR@ProvidesPackageDrop{xmpincl}[2008/05/10]
\newcommand*{\includexmp}[1]{}
\endinput
%%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-xtab.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-xtab.sty
index 42393ec23a6..ae592b27cf2 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-xtab.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-xtab.sty
@@ -17,7 +17,7 @@
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{xtab}
+\LWR@ProvidesPackageDrop{xtab}[2011/07/31]
\newcommand{\LWRXT@firsthead}{}
\newcommand{\tablefirsthead}[1]{%
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-xurl.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-xurl.sty
index a7e43d79665..5ce820c6a42 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-xurl.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-xurl.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{xurl}
+\LWR@ProvidesPackageDrop{xurl}[2018/06/02]
\endinput
%%
%% End of file `lwarp-xurl.sty'.
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-xy.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-xy.sty
index 03fe67998e5..55918dc2e4f 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-xy.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-xy.sty
@@ -16,7 +16,7 @@
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackagePass{xy}
+\LWR@ProvidesPackagePass{xy}[2013/10/06]
\AtBeginDocument{
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-zwpagelayout.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-zwpagelayout.sty
index f6b414d8ac4..84735260a51 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-zwpagelayout.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-zwpagelayout.sty
@@ -15,7 +15,7 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-\LWR@ProvidesPackageDrop{zwpagelayout}
+\LWR@ProvidesPackageDrop{zwpagelayout}[2013/01/13]
\def\noBboxes{}
\@onlypreamble\noBboxes
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp.sty
index 83ca291fcb5..6c5a86c3451 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp.sty
@@ -17,7 +17,7 @@
%% version 2005/12/01 or later.
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesPackage{lwarp}
- [2018/12/22 v0.65 Allows LaTeX to directly produce HTML5 output.]
+ [2019/02/08 v0.66 Allows LaTeX to directly produce HTML5 output.]
@@ -145,9 +145,16 @@ For a possible alternative, see class(es) #2.}
}
\LWR@earlyloadnever{bxcjkjatype}{upLaTeX, bxjsarticle, ujarticle, utarticle}
\LWR@earlyloadnever{hangul}{kotex, xetexko, luatexko}
+\LWR@earlyloadnever{colortab}{colortbl}
+\LWR@earlyloadnever{epsf}{graphicx}
\LWR@earlyloadnever{fancyheadings}{fancyhdr}
\LWR@earlyloadnever{glossary}{glossaries}
+\LWR@earlyloadnever{hyper}{hyperref}
+\LWR@earlyloadnever{picinpar}{floatflt, wrapfig}
+\LWR@earlyloadnever{picins}{floatflt, wrapfig}
+\LWR@earlyloadnever{sistyle}{siunitx}
\LWR@earlyloadnever{t1enc}{fontenc, inputenc, inputenx}
+\LWR@earlyloadnever{ucs}{inputenc, inputencx}
\LWR@earlyloadnever{wasysym}{textcomp, amssymb, amsfonts, mnsymbol, fdsymbol}
\LWR@loadafter{2in1}
\LWR@loadafter{2up}
@@ -171,6 +178,7 @@ For a possible alternative, see class(es) #2.}
\LWR@loadafter{anonchap}
\LWR@loadafter{anysize}
\LWR@notmemoirloadafter{appendix}
+\LWR@loadafter{ar}
\LWR@loadafter{arabicfront}
\LWR@notmemoirloadafter{array}
\LWR@loadafter{arydshln}
@@ -233,6 +241,7 @@ For a possible alternative, see class(es) #2.}
\LWR@loadafter{draftwatermark}
\LWR@loadafter{easy-todo}
\LWR@loadafter{ebook}
+\LWR@loadafter{ed}
\LWR@loadafter{ellipsis}
\LWR@loadafter{embrac}
\LWR@loadafter{emptypage}
@@ -304,7 +313,6 @@ For a possible alternative, see class(es) #2.}
\LWR@loadafter{idxlayout}
\LWR@loadafter{ifoddpage}
\LWR@loadafter{imakeidx}
-\LWR@loadafter{indentfirst}
\LWR@notmemoirloadafter{index}
\LWR@loadafter{intopdf}
\LWR@loadafter{keyfloat}
@@ -346,6 +354,7 @@ For a possible alternative, see class(es) #2.}
\LWR@loadafter{multirow}
\LWR@loadafter{multitoc}
\LWR@loadafter{musicography}
+\LWR@loadafter{nameauth}
\LWR@loadafter{nameref}
\LWR@loadafter{natbib}
\LWR@notmemoirloadafter{nccfancyhdr}
@@ -440,6 +449,7 @@ For a possible alternative, see class(es) #2.}
\LWR@loadafter{srctex}
\LWR@loadafter{stabular}
\LWR@notltjloadafter{stfloats}
+\LWR@loadafter{subcaption}
\LWR@loadafter{subfig}
\LWR@loadafter{subfigure}
\LWR@loadafter{supertabular}
@@ -472,6 +482,7 @@ For a possible alternative, see class(es) #2.}
\LWR@loadafter{transparent}
\LWR@loadafter{trimclip}
\LWR@loadafter{trivfloat}
+\LWR@loadafter{truncate}
\LWR@loadafter{turnthepage}
\LWR@loadafter{twoup}
\LWR@loadafter{underscore}
@@ -581,6 +592,10 @@ For a possible alternative, see class(es) #2.}
\@ifpackageloaded{xeCJK}{
\renewcommand{\LWR@isolate}[1]{\null#1\null}%
}{}
+\long\def\LWR@firstoffour#1#2#3#4{#1}
+\long\def\LWR@secondoffour#1#2#3#4{#2}
+\long\def\LWR@thirdoffour#1#2#3#4{#3}
+\long\def\LWR@fourthoffour#1#2#3#4{#4}
\let\LWRpercent\@percentchar
\catcode`\$=12
\def\LWRdollar{$}
@@ -593,6 +608,16 @@ For a possible alternative, see class(es) #2.}
&def&LWRbackslash{\}
&catcode`&\=0
\catcode`\&=4
+\catcode`\&=1
+\catcode`\{=12
+\def\LWRleftbrace&{}
+\catcode`\{=1
+\catcode`\&=4
+\catcode`\&=2
+\catcode`\}=12
+\def\LWRrightbrace{}&
+\catcode`\}=2
+\catcode`\&=4
\catcode`\#=12
\def\LWRhash{#}
\catcode`\#=6
@@ -655,6 +680,10 @@ For a possible alternative, see class(es) #2.}
\DeclareStringOption[\jobname]{BaseJobname}
+\DeclareStringOption[\BaseJobname-images]{ImagesDirectory}
+
+\DeclareStringOption[image-]{ImagesName}
+
\DeclareStringOption[lwarp.ist]{makeindexStyle}
\DeclareStringOption[lwarp.xdy]{xindyStyle}
@@ -708,15 +737,31 @@ For a possible alternative, see class(es) #2.}
\ProcessKeyvalOptions*\relax
+
\providecommand*{\BaseJobname}{\LWR@BaseJobname}
\ifcsempty{LWR@HomeHTMLFilename}{
-\newcommand*{\HomeHTMLFilename}{\BaseJobname}
+ \newcommand*{\HomeHTMLFilename}{\BaseJobname}
}{
-\csedef{HomeHTMLFilename}{\LWR@HomeHTMLFilename}
+ \csedef{HomeHTMLFilename}{\LWR@HomeHTMLFilename}
}
\csedef{HTMLFilename}{\LWR@HTMLFilename}
+\newcommand*{\LWR@sanitized}{}
+
+\newcommand*{\LWR@sanitize}[1]{%
+\edef\LWR@sanitized{#1}%
+\edef\LWR@sanitized{\detokenize\expandafter{\LWR@sanitized}}%
+}
+
+\LWR@sanitize{\LWR@BaseJobname}
+\edef\LWR@BaseJobname{\LWR@sanitized}
+
+\LWR@sanitize{\LWR@ImagesDirectory}
+\edef\LWR@ImagesDirectory{\LWR@sanitized}
+
+\LWR@sanitize{\LWR@ImagesName}
+\edef\LWR@ImagesName{\LWR@sanitized}
\ifdefempty{\LWR@PrintIndexCmd}{
\renewcommand{\LWR@PrintIndexCmd}{%
makeindex -s \LWR@makeindexStyle \space \jobname.idx%
@@ -879,7 +924,7 @@ For a possible alternative, see class(es) #2.}
\begin{warpall}
-\RequirePackage{xstring}
+\RequirePackage{xstring}[2019/02/01]
\RequirePackage{environ}
@@ -887,8 +932,6 @@ For a possible alternative, see class(es) #2.}
\begin{warpHTML}
-\RequirePackage{zref}
-
\RequirePackage{printlen}
@@ -927,13 +970,20 @@ For a possible alternative, see class(es) #2.}
\LWR@checkloadnever{#1}{boxedminipage}{boxedminipage2e}
\LWR@checkloadnever{#1}{caption2}{caption}
\LWR@checkloadnever{#1}{ccaption}{caption}
+\LWR@checkloadnever{#1}{colortab}{colortbl}
\LWR@checkloadnever{#1}{doublespace}{setspace}
+\LWR@checkloadnever{#1}{epsf}{graphicx}
\LWR@checkloadnever{#1}{fancyheadings}{fancyhdr}
\LWR@checkloadnever{#1}{glossary}{glossaries}
+\LWR@checkloadnever{#1}{hyper}{hyperref}
\LWR@checkloadnever{#1}{newthm}{ntheorem}
+\LWR@checkloadnever{#1}{picinpar}{floatflt, wrapfig}
+\LWR@checkloadnever{#1}{picins}{floatflt, wrapfig}
\LWR@checkloadnever{#1}{rplain}{fancyhdr}
\LWR@checkloadnever{#1}{si}{siunitx}
+\LWR@checkloadnever{#1}{sistyle}{siunitx}
\LWR@checkloadnever{#1}{t1enc}{fontenc, inputenc, inputenx}
+\LWR@checkloadnever{#1}{ucs}{inputenc, inputencx}
\LWR@checkloadnever{#1}{wasysym}{textcomp, amssymb, amsfonts, mnsymbol, fdsymbol}
\LWR@checkloadbefore{#1}{ctex}
\LWR@checkloadbefore{#1}{fontspec}
@@ -1050,7 +1100,8 @@ For a possible alternative, see class(es) #2.}
\begin{warpHTML}
-\RequirePackage{caption}%
+\LWR@origRequirePackage{caption}
+\AtBeginDocument{\RequirePackage{lwarp-caption}}%
\end{warpHTML}
@@ -1321,6 +1372,9 @@ For a possible alternative, see class(es) #2.}
\let\LWR@origllap\llap
\let\LWR@origrlap\rlap
\let\LWR@orighfilneg\hfilneg
+\let\LWR@orighspace\hspace
+
+\let\LWR@origrule\rule
\let\LWR@origmedskip\medskip
\let\LWR@origbigskip\bigskip
@@ -1469,7 +1523,7 @@ For a possible alternative, see class(es) #2.}
\begin{LWRwriteconf}
-\newcommand*{\LWR@lwarpconfversion}{1}% also in lwarpmk.lua
+\newcommand*{\LWR@lwarpconfversion}{2}% also in lwarpmk.lua
\ifshellescape
\def\LWR@shellescapecmd{--shell-escape }
\else
@@ -1485,7 +1539,7 @@ For a possible alternative, see class(es) #2.}
\newcommand*{\LWR@unknownengine}{%
\PackageError{lwarp}
{Unknown LaTeX engine.}
- {Lwarp only knows about pdflatex, dvi latex, xelatex, and lualatex.}
+ {Lwarp only knows about pdflatex, dvi latex, xelatex, lualatex, and upLateX.}
}
\newcommand*{\LWR@latexmkvar}[2]{%
-e
@@ -1631,6 +1685,8 @@ For a possible alternative, see class(es) #2.}
\immediate\write\LWR@quickfile{sourcename = [[\jobname]]}
\immediate\write\LWR@quickfile{homehtmlfilename = [[\HomeHTMLFilename]]}
\immediate\write\LWR@quickfile{htmlfilename = [[\HTMLFilename]]}
+\immediate\write\LWR@quickfile{imagesdirectory = [[\LWR@ImagesDirectory]]}
+\immediate\write\LWR@quickfile{imagesname = [[\LWR@ImagesName]]}
\immediate\write\LWR@quickfile{latexmk = [[\ifbool{LWR@latexmk}{true}{false}]]}
\immediate\write\LWR@quickfile{printlatexcmd = [[\LWR@PrintLatexCmd]]}
\immediate\write\LWR@quickfile{HTMLlatexcmd = [[\LWR@HTMLLatexCmd]]}
@@ -2110,12 +2166,12 @@ div.titlepage div.mpfootnotes {
border-top: none ;
}
-ol {
+ul, ol {
margin: 1ex 1em 1ex 0em;
line-height: 1.2;
}
-ul, body dir, body menu {
+body dir, body menu {
margin: 3ex 1em 3ex 0em;
line-height: 1.2;
}
@@ -2327,7 +2383,7 @@ div.wpminipage { border: 1px solid green ; margin: .5ex ; padding: .5ex ;}
.mdframed p { padding: 0ex .5em 0ex .5em ; }
-.mdframed dl { padding: 0ex .5em 0ex .5em ; }
+.mdframed dl { padding: 1ex .5em 0ex .5em ; }
.mdframedtitle {
padding: .5ex 0pt 0pt 0pt ;
@@ -2393,13 +2449,20 @@ dl {
}
dl dt {
- margin-top: 1ex;
- margin-left: 1em ;
+ display: block ;
+ float:left ;
font-weight: bold;
+ padding-right: 1em ;
}
+dl dd { display: block ; }
+
+dl dd:after { content: "" ; display: block ; clear: both }
+
dl dd p { margin-top: 0em; }
+dd ul, dd ol, dd dl { clear: both ; padding-top: 1ex }
+
nav {
font-family: "URW Classico", Optima, "Linux Biolinum O",
"DejaVu Sans", "Bitstream Vera Sans",
@@ -2625,7 +2688,7 @@ td.tdb , td.tdbrule , td.tdB , td.tdBrule
.tnotes {
margin: 0ex 5% 1ex 5% ;
padding: 0.5ex 1em 0.5ex 1em;
- font-size:.85em;
+ font-size:.80em;
text-align: left ;
}
@@ -3437,6 +3500,8 @@ div.figurecaption , .lstlisting {
.tnotes {
background: #fffcf5 ;
+ border-top: 1px solid silver ;
+ border-bottom: 1px solid silver ;
}
.theorem {
@@ -3561,15 +3626,27 @@ page_compositor "."
\end{LWRwriteconf}
\begin{LWRwriteconf}
-\begin{filecontents*}{lwarp_one_limage.txt}
-@echo off
-pdfseparate -f %1 -l %1 %4_html.pdf lateximages\lateximagetemp-%%d.pdf
-pdfcrop --hires lateximages\lateximagetemp-%1.pdf lateximages\%3.pdf
-pdftocairo -svg -noshrink lateximages\%3.pdf lateximages\%3.svg
-del lateximages\%3.pdf
-del lateximages\lateximagetemp-%1.pdf
-exit
-\end{filecontents*}
+\immediate\openout\LWR@quickfile=lwarp_one_limage.txt
+\immediate\write\LWR@quickfile{%
+ pdfseparate -f \LWRpercent 1 -l \LWRpercent 1 \LWRpercent 4_html.pdf %
+ \LWR@ImagesDirectory\OSPathSymbol lateximagetemp-\LWRpercent\LWRpercent d.pdf%
+}
+\immediate\write\LWR@quickfile{%
+ pdfcrop --hires \LWR@ImagesDirectory\OSPathSymbol lateximagetemp-\LWRpercent 1.pdf %
+ \LWR@ImagesDirectory\OSPathSymbol\LWRpercent 3.pdf%
+}
+\immediate\write\LWR@quickfile{%
+ pdftocairo -svg -noshrink \LWR@ImagesDirectory\OSPathSymbol\LWRpercent 3.pdf %
+ \LWR@ImagesDirectory\OSPathSymbol\LWRpercent 3.svg%
+}
+\immediate\write\LWR@quickfile{%
+ del \LWR@ImagesDirectory\OSPathSymbol\LWRpercent 3.pdf%
+}
+\immediate\write\LWR@quickfile{%
+ del \LWR@ImagesDirectory\OSPathSymbol lateximagetemp-\LWRpercent 1.pdf%
+}
+\immediate\write\LWR@quickfile{exit}
+\immediate\closeout\LWR@quickfile
\end{LWRwriteconf}
@@ -3679,8 +3756,8 @@ src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.4/MathJax.js?config=TeX-
-- Copyright 2016-2018 Brian Dunn
-printversion = "v0.65"
-requiredconfversion = "1" -- also at *lwarpmk.conf
+printversion = "v0.66"
+requiredconfversion = "2" -- also at *lwarpmk.conf
function printhelp ()
print ("lwarpmk: Use lwarpmk -h or lwarpmk --help for help.") ;
@@ -3780,6 +3857,8 @@ end
-- Additional defaults:
confversion = "0"
opsystem = "Unix"
+imagesdirectory = "lateximages"
+imagesname = "image-"
latexmk = "false"
printlatexcmd = ""
HTMLlatexcmd = ""
@@ -3841,6 +3920,8 @@ elseif ( cvarname == "opsystem" ) then
elseif ( cvarname == "sourcename" ) then sourcename = cvalue
elseif ( cvarname == "homehtmlfilename" ) then homehtmlfilename = cvalue
elseif ( cvarname == "htmlfilename" ) then htmlfilename = cvalue
+elseif ( cvarname == "imagesdirectory" ) then imagesdirectory = cvalue
+elseif ( cvarname == "imagesname" ) then imagesname = cvalue
elseif ( cvarname == "latexmk" ) then latexmk = cvalue
elseif ( cvarname == "printlatexcmd" ) then printlatexcmd = cvalue
elseif ( cvarname == "HTMLlatexcmd" ) then HTMLlatexcmd = cvalue
@@ -4056,34 +4137,33 @@ end -- checkhtmlpdfexists
function warnlimages ()
--
--- Warning of a missing lateximages.txt file:
---
+-- Warning of a missing <sourcename>-images.txt file:
print ("lwarpmk: ===")
- print ("lwarpmk: \"lateximages.txt\" does not exist.")
+ print ("lwarpmk: \"" .. sourcename .. "-images.txt\" does not exist.")
print ("lwarpmk: Your project does not use SVG math or other lateximages,")
print ("lwarpmk: or the file has been deleted somehow.")
print ("lwarpmk: Use \"lwarpmk html\" to recompile your project")
- print ("lwarpmk: and recreate \"lateximages.txt\".")
+ print ("lwarpmk: and recreate \"" .. sourcename .. "-images.txt\".")
print ("lwarpmk: If your project does not use SVG math or other lateximages,")
- print ("lwarpmk: then \"lateximages.txt\" will never exist, and")
+ print ("lwarpmk: then \"" .. sourcename .. "-images.txt\" will never exist, and")
print ("lwarpmk: \"lwarpmk limages\" will not be necessary.")
print ("lwarpmk: ===")
end -- warnlimages
function checklimages ()
--
--- Check lateximages.txt to see if need to recompile first.
+-- Check <sourcename>.txt to see if need to recompile first.
-- If any entry has a page number of zero, then there were incorrect images.
--
-print ("lwarpmk: Checking for a valid lateximages.txt file.")
-local limagesfile = io.open("lateximages.txt", "r")
+print ("lwarpmk: Checking for a valid " .. sourcename .. "-images.txt file.")
+local limagesfile = io.open(sourcename .. "-images.txt", "r")
if ( limagesfile == nil ) then
warnlimages ()
os.exit(1)
end
-- Track warning to recompile if find a page 0
local pagezerowarning = false
--- Scan lateximages.txt
+-- Scan <sourcename>.txt
for line in limagesfile:lines() do
-- lwimgpage is the page number in the PDF which has the image
-- lwimghash is true if this filename is a hash
@@ -4116,20 +4196,20 @@ executecheckerror (
cmdgroupopenname ..
"pdfseparate -f " .. lwimgpage .. " -l " .. lwimgpage .. " " ..
sourcename .."_html.pdf " ..
- "lateximages" .. dirslash .."lateximagetemp-%d" .. ".pdf" ..
+ imagesdirectory .. dirslash .."lateximagetemp-%d" .. ".pdf" ..
seqname ..
-- Crop the image:
- "pdfcrop --hires lateximages" .. dirslash .. "lateximagetemp-" ..
+ "pdfcrop --hires " .. imagesdirectory .. dirslash .. "lateximagetemp-" ..
lwimgpage .. ".pdf " ..
- "lateximages" .. dirslash .. lwimgname .. ".pdf" ..
+ imagesdirectory .. dirslash .. lwimgname .. ".pdf" ..
seqname ..
-- Convert the image to svg:
- "pdftocairo -svg -noshrink lateximages" .. dirslash .. lwimgname .. ".pdf " ..
- "lateximages" .. dirslash .. lwimgname ..".svg" ..
+ "pdftocairo -svg -noshrink " .. imagesdirectory .. dirslash .. lwimgname .. ".pdf " ..
+ imagesdirectory .. dirslash .. lwimgname ..".svg" ..
seqname ..
-- Remove the temporary files:
- rmname .. " lateximages" .. dirslash .. lwimgname .. ".pdf" .. seqname ..
- rmname .. " lateximages" .. dirslash .. "lateximagetemp-" .. lwimgpage .. ".pdf" ..
+ rmname .. " " .. imagesdirectory .. dirslash .. lwimgname .. ".pdf" .. seqname ..
+ rmname .. " " .. imagesdirectory .. dirslash .. "lateximagetemp-" .. lwimgpage .. ".pdf" ..
cmdgroupclosename .. " >/dev/null " .. bgname
,
"File error trying to convert " .. lwimgfullname
@@ -4172,7 +4252,7 @@ end -- createwindowsimage
function createonelateximage ( line )
--
--- Given the next line of lateximages.txt, convert a single image.
+-- Given the next line of <sourcename>.txt, convert a single image.
--
-- lwimgpage is the page number in the PDF which has the image
-- lwimghash is true if this filename is a hash
@@ -4185,7 +4265,7 @@ if ( (i~=nil) ) then
pagezerowarning = true
else
-- Skip is this image is hashed and already exists:
- local lwimgfullname = "lateximages" .. dirslash .. lwimgname .. ".svg"
+ local lwimgfullname = imagesdirectory .. dirslash .. lwimgname .. ".svg"
if (
(lwimghash ~= "true") or
(lfs.attributes(lwimgfullname,"mode")==nil) -- file not exists
@@ -4211,7 +4291,7 @@ end -- createonelateximage
function createlateximages ()
--
--- Create lateximages based on lateximages.txt:
+-- Create lateximages based on <sourcename>.txt:
--
-- See if the document must be recompiled first:
checklimages ()
@@ -4219,13 +4299,13 @@ checklimages ()
checkhtmlpdfexists ()
-- Attempt to create the lateximages:
print ("lwarpmk: Creating lateximages.")
-local limagesfile = io.open("lateximages.txt", "r")
+local limagesfile = io.open(sourcename .. "-images.txt", "r")
if ( limagesfile == nil ) then
- warnlateximages ()
+ warnlimages ()
os.exit(1)
end
-- Create the lateximages directory, ignore error if already exists
-err = os.execute("mkdir lateximages")
+err = os.execute("mkdir " .. imagesdirectory)
-- For Windows, create lwarp_one_limage.cmd from lwarp_one_limage.txt:
if opsystem=="Windows" then
executecheckerror (
@@ -4237,7 +4317,7 @@ end -- create lwarp_one_limage.cmd
numimageprocesses = 0
-- Track warning to recompile if find a page 0
pagezerowarning = false
--- Scan lateximages.txt
+-- Scan <sourcename>.txt
for line in limagesfile:lines() do
createonelateximage ( line )
end -- do
@@ -4435,7 +4515,7 @@ os.execute(glossarycmd .. " " .. sourcename .. "_html")
updateanddone ()
-- lwarpmk limages:
--- Scan the lateximages.txt file to create lateximages.
+-- Scan the <sourcename>.txt file to create lateximages.
elseif arg[1] == "limages" then
loadconf ()
@@ -4473,11 +4553,11 @@ os.execute ( rmname .. " " ..
print ("lwarpmk: Done.")
-- lwarpmk cleanlimages
--- Remove images from the lateximages directory.
+-- Remove images from the imagesdirectory.
elseif arg[1] == "cleanlimages" then
loadconf ()
-os.execute ( rmname .. " lateximages/*" )
+os.execute ( rmname .. " " .. imagesdirectory .. dirslash .. "*" )
print ("lwarpmk: Done.")
-- lwarpmk epstopdf <list of file names>
@@ -4546,7 +4626,6 @@ end -- not --version
-
\newcommand*{\LWR@closedepthone}{\LWR@depthnone}% top of the stack
\newcommand*{\LWR@closedepthtwo}{\LWR@depthnone}
\newcommand*{\LWR@closedepththree}{\LWR@depthnone}
@@ -4621,10 +4700,13 @@ end -- not --version
\begin{warpHTML}
\NewDocumentCommand{\LWR@setexparray}{m m m}{%
+ \begingroup%
+ \let\par\relax%
\xdef\LWR@thisexparrayname{#1#2}%
\ifstrempty{#3}%
{\csgdef{\LWR@thisexparrayname}{}}%
{\csxdef{\LWR@thisexparrayname}{#3}}%
+ \endgroup%
}
\newcommand*{\LWR@getexparray}[2]{%
\@nameuse{#1#2}%
@@ -4672,21 +4754,6 @@ end -- not --version
\begin{warpHTML}
-\newcommand*{\LWR@sanitized}{}
-
-\newcommand*{\LWR@sanitize}[1]{%
-\LWR@traceinfo{LWR@sanitize: !#1!}%
-\edef\LWR@sanitized{#1}%
-\LWR@traceinfo{LWR@sanitize expanded: !\LWR@sanitized!}%
-\edef\LWR@sanitized{\detokenize\expandafter{\LWR@sanitized}}%
-\LWR@traceinfo{LWR@sanitize result: !\LWR@sanitized!}%
-}
-
-\end{warpHTML}
-
-
-\begin{warpHTML}
-
\let\LWR@origampersand\&
\newcommand*{\HTMLentity}[1]{%
\begingroup%
@@ -4699,10 +4766,10 @@ end -- not --version
\renewrobustcmd*{\&}{\HTMLentity{amp}}
\let\LWR@origtextless\textless
-\renewcommand*{\textless}{\HTMLentity{lt}}
+\renewrobustcmd*{\textless}{\HTMLentity{lt}}
\let\LWR@origtextgreater\textgreater
-\renewcommand*{\textgreater}{\HTMLentity{gt}}
+\renewrobustcmd*{\textgreater}{\HTMLentity{gt}}
\end{warpHTML}
@@ -4731,33 +4798,35 @@ end -- not --version
\newcommand*{\LWR@htmlsectionfilename}[1]{%
\LWR@traceinfo{LWR@htmlsectionfilename A !\detokenize{#1}!}%
-\edef\LWR@tempone{#1}%
+\LWR@sanitize{#1}%
\LWR@traceinfo{about to compare with ??}%
-\ifthenelse{\equal{\LWR@tempone}{??}}%
+\ifthenelse{\equal{\LWR@sanitized}{??}}%
{\LWR@traceinfo{found ??}}%
{\LWR@traceinfo{not found ??}}%
\LWR@traceinfo{about to compare with zero or empty}%
\ifthenelse{%
- \equal{\LWR@tempone}{0}%
- \OR \equal{\LWR@tempone}{}%
- \OR \equal{\LWR@tempone}{??}%
+ \equal{\LWR@sanitized}{0}%
+ \OR \equal{\LWR@sanitized}{}%
+ \OR \equal{\LWR@sanitized}{??}%
}%
{%
\LWR@traceinfo{LWR@htmlsectionfilename B \HomeHTMLFilename.html}%
\HomeHTMLFilename.html%
}%
{%
- \LWR@traceinfo{LWR@htmlsectionfilename C \LWR@tempone}%
+ \LWR@traceinfo{LWR@htmlsectionfilename C \LWR@sanitized}%
\ifthenelse{%
\equal{\HTMLFilename}{} \AND
- \equal{\LWR@tempone}{Index} \OR
- \equal{\LWR@tempone}{index}%
+ \equal{\LWR@sanitized}{Index} \OR
+ \equal{\LWR@sanitized}{index}%
}%
{%
\LWR@traceinfo{Prefixing the index name with an underscore.}%
- \_#1.html%
+ \_\LWR@sanitized.html%
+ }%
+ {%
+ \HTMLFilename\LWR@isolate{\LWR@sanitized}.html%
}%
- {\HTMLFilename\LWR@isolate{#1}.html}%
}%
\LWR@traceinfo{LWR@htmlsectionfilename Z}%
}
@@ -4792,13 +4861,17 @@ end -- not --version
\AtBeginDocument{
\@ifundefined{hyperref}{
- \newcommand*{\LinkHome}{\linkhomename\ --- page \pageref{page-LWRfirstpage}}
+ \newcommand*{\LinkHome}{%
+ \linkhomename\ --- page \pageref{\BaseJobname-page-LWRfirstpage}%
+ }
}{
- \newcommand*{\LinkHome}{\hyperref[page-LWRfirstpage]{\linkhomename}}
+ \newcommand*{\LinkHome}{%
+ \hyperref[\BaseJobname-page-LWRfirstpage]{\linkhomename}%
+ }
}
}
-\AfterEndPreamble{\label{page-LWRfirstpage}}
+\AfterEndPreamble{\label{\BaseJobname-page-LWRfirstpage}}
\end{warpprint}
@@ -4958,6 +5031,10 @@ end -- not --version
}%
}
+\newcommand*{\LWR@indentHTML}{%
+ \LWR@orignewline\LWR@origrule{2em}{0pt}%
+}
+
\newcommand*{\LWR@htmltagc}[1]{%
\LWR@traceinfo{LWR@htmltagc !\detokenize{#1}!}%
@@ -5073,13 +5150,16 @@ end -- not --version
\LWR@traceinfo{LWR@subhtmlelementclass !#1!#2!#3!}%
\ifblank{#2}%
{% empty option
- \LWR@htmltag{#1 class=\textquotedbl#3\textquotedbl}%
-}%
-{% non-empty option
\LWR@htmltag{%
#1 % space
class=\textquotedbl#3\textquotedbl\ % space
- style=\textquotedbl#2\textquotedbl%
+ }%
+}%
+{% non-empty option
+ \LWR@htmltag{%
+ #1\LWR@indentHTML%
+ class=\textquotedbl#3\textquotedbl\LWR@indentHTML%
+ style=\textquotedbl#2\textquotedbl\LWR@orignewline%
}%
}%
\LWR@traceinfo{LWR@subhtmlelementclass done}%
@@ -5269,7 +5349,7 @@ end -- not --version
{}% no nested par tags
{% yes nest par tags
\PN@parnotes@auto%
- \LWR@htmltagc{\LWR@tagregularparagraph}%
+ \LWR@htmltagc{\LWR@tagregularparagraph}\LWR@orignewline%
\global\booltrue{LWR@doingapar}%
\let\par\LWR@closeparagraph%
}% end of yes nest par tags
@@ -5277,6 +5357,17 @@ end -- not --version
{}% not handling pars
}
+\newcommand*{\LWR@closeparagraph@br}
+{%
+ \ifboolexpr{
+ test {\ifnumcomp{\value{LWR@spandepth}}{>}{0}} and
+ test {\ifnumcomp{\value{LWR@lateximagedepth}}{=}{0}} and
+ not bool {LWR@intabularmetadata}
+ }%
+ {\unskip\LWR@htmltagc{br /}}%
+ {}%
+}
+
\newcommand*{\LWR@closeparagraph}
{%
\ifbool{LWR@doingapar}%
@@ -5286,15 +5377,10 @@ end -- not --version
test {\ifnumcomp{\value{LWR@spandepth}}{>}{0}}
}%
{% no nested par tags
- \ifboolexpr{
- test {\ifnumcomp{\value{LWR@spandepth}}{>}{0}} and
- test {\ifnumcomp{\value{LWR@lateximagedepth}}{=}{0}}
- }%
- {\ifbool{LWR@intabularmetadata}{}{\unskip\LWR@htmltagc{br /}}}%
- {}%
+ \LWR@closeparagraph@br%
}% no nested par tags
{% yes nest par tags
- \unskip%
+ \leavevmode\LWR@orignewline%
\LWR@htmltagc{/\LWR@tagregularparagraph}%
\LWR@orignewline%
\global\boolfalse{LWR@doingapar}%
@@ -5303,9 +5389,7 @@ end -- not --version
}% end of yes nest par tags
}% end of handling pars
{% not handling pars
- \ifnumcomp{\value{LWR@spandepth}}{>}{0}%
- {\ifbool{LWR@intabularmetadata}{}{\unskip\LWR@htmltagc{br /}}}%
- {}%
+ \LWR@closeparagraph@br%
}% not handling pars
\ifboolexpr{%
not bool {LWR@doingapar} and
@@ -5353,7 +5437,7 @@ end -- not --version
{%
\ifbool{LWR@doingapar}%
{%
- \unskip%
+ \leavevmode\LWR@orignewline%
\LWR@htmltagc{/\LWR@tagregularparagraph}%
\LWR@orignewline%
\global\boolfalse{LWR@doingapar}%
@@ -5371,6 +5455,16 @@ end -- not --version
\end{warpHTML}
+\begin{warpHTML}
+
+\AtBeginDocument{
+\def\@afterindentfalse{\let\if@afterindent\iffalse}
+\@afterindentfalse
+}
+\let\LWR@afterindent@syntaxhighlight\fi% syntax highlighting
+
+\end{warpHTML}
+
\begin{warpall}
@@ -5465,7 +5559,7 @@ end -- not --version
\cnttest{\value{LWR@lateximagedepth}}{=}{0}%
}%
{}%
- {\LWR@htmltagc{\LWR@tagregularparagraph}}%
+ {\LWR@htmltagc{\LWR@tagregularparagraph}\LWR@orignewline}%
\@makefntext{#1}%
\ifthenelse{%
\boolean{LWR@doingstartpars} \AND%
@@ -5498,7 +5592,7 @@ end -- not --version
\cnttest{\value{LWR@lateximagedepth}}{=}{0}%
}%
{}%
- {\LWR@htmltagc{\LWR@tagregularparagraph}}%
+ {\LWR@htmltagc{\LWR@tagregularparagraph}\LWR@orignewline}%
\@makefntext{%
\ignorespaces#1%
}%
@@ -5592,85 +5686,113 @@ end -- not --version
\newbool{CombineHigherDepths}
\booltrue{CombineHigherDepths}
+\newcommand*{\FilenameLimit}{80}
+
\end{warpall}
\begin{warpHTML}
-\newcommand*{\LWR@thisfilename}{}
+\AtBeginDocument{
+\ifbool{FileSectionNames}%
+ {\newcommand*{\LWR@thisfilename}{\HomeHTMLFilename}}
+ {\newcommand*{\LWR@thisfilename}{0}}
+}
\newcommand*{\LWR@thisnewfilename}{}
+\NewDocumentCommand{\LWR@simplifyname}{s m}{%
+\IfBooleanTF{#1}{%
+ \StrSubstitute{\LWR@thisnewfilename}%
+ {\detokenize{#2}}%
+ {\detokenize{-}}[\LWR@thisnewfilename]%
+}{%
+ \StrSubstitute{\LWR@thisnewfilename}%
+ {#2}%
+ {\detokenize{-}}[\LWR@thisnewfilename]%
+}
+}
+
\newcommand*{\LWR@filenamenoblanks}[1]{%
\begingroup
\LWR@nullfonts%
\renewcommand*{\LWR@htmltagc}[1]{}%
\edef\LWR@thisnewfilename{#1}%
+\RenewDocumentCommand{\LWR@subsingledollar}{s m m m}{}%
+\LWR@simplifyname{\_}
+\LWR@simplifyname{\#}
+\LWR@simplifyname{\textbackslash}
+\LWR@simplifyname{\protect}
+\LWR@simplifyname{\ }
+\LWR@simplifyname{<}
+\LWR@simplifyname{>}
+\LWR@simplifyname{\textless}
+\LWR@simplifyname{\textgreater}
+\edef\LWR@thisnewfilename{\detokenize\expandafter{\LWR@thisnewfilename}}%
\LWR@traceinfo{LWR@filenamenoblanks edef: !\LWR@thisnewfilename!}%
\fullexpandarg%
-\StrSubstitute{\LWR@thisnewfilename}{\ }{-}[\LWR@thisnewfilename]
-\StrSubstitute{\LWR@thisnewfilename}{ }{-}[\LWR@thisnewfilename]
-\StrSubstitute{\LWR@thisnewfilename}{,}{-}[\LWR@thisnewfilename]
-\StrSubstitute{\LWR@thisnewfilename}{'}{-}[\LWR@thisnewfilename]
-\StrSubstitute{\LWR@thisnewfilename}%
- {\LWR@origampersand}{-}[\LWR@thisnewfilename]
-\StrSubstitute{\LWR@thisnewfilename}{+}{-}[\LWR@thisnewfilename]
-\StrSubstitute{\LWR@thisnewfilename}{,}{-}[\LWR@thisnewfilename]
-\StrSubstitute{\LWR@thisnewfilename}{/}{-}[\LWR@thisnewfilename]
-\StrSubstitute{\LWR@thisnewfilename}{:}{-}[\LWR@thisnewfilename]
-\StrSubstitute{\LWR@thisnewfilename}{;}{-}[\LWR@thisnewfilename]
-\StrSubstitute{\LWR@thisnewfilename}{=}{-}[\LWR@thisnewfilename]
-\StrSubstitute{\LWR@thisnewfilename}{?}{-}[\LWR@thisnewfilename]
-\StrSubstitute{\LWR@thisnewfilename}{@}{-}[\LWR@thisnewfilename]
-\StrSubstitute{\LWR@thisnewfilename}{"}{-}[\LWR@thisnewfilename]
-\StrSubstitute{\LWR@thisnewfilename}%
- {\textless}{-}[\LWR@thisnewfilename]
-\StrSubstitute{\LWR@thisnewfilename}%
- {\textgreater}{-}[\LWR@thisnewfilename]
-\StrSubstitute{\LWR@thisnewfilename}{\LWR@origpound}{-}[\LWR@thisnewfilename]
-\StrSubstitute{\LWR@thisnewfilename}{\_}{-}[\LWR@thisnewfilename]
-\StrSubstitute{\LWR@thisnewfilename}{\%}{-}[\LWR@thisnewfilename]
-\StrSubstitute{\LWR@thisnewfilename}{\{}{-}[\LWR@thisnewfilename]
-\StrSubstitute{\LWR@thisnewfilename}{\}}{-}[\LWR@thisnewfilename]
-\StrSubstitute{\LWR@thisnewfilename}{|}{-}[\LWR@thisnewfilename]
-\StrSubstitute{\LWR@thisnewfilename}%
- {\textbackslash}{-}[\LWR@thisnewfilename]
-\StrSubstitute{\LWR@thisnewfilename}{^}{-}[\LWR@thisnewfilename]
-\StrSubstitute{\LWR@thisnewfilename}{~}{-}[\LWR@thisnewfilename]
-\StrSubstitute{\LWR@thisnewfilename}{~{}}{-}[\LWR@thisnewfilename]
-\StrSubstitute{\LWR@thisnewfilename}{[}{-}[\LWR@thisnewfilename]
-\StrSubstitute{\LWR@thisnewfilename}{]}{-}[\LWR@thisnewfilename]
-\StrSubstitute{\LWR@thisnewfilename}{`}{-}[\LWR@thisnewfilename]
-\StrSubstitute{\LWR@thisnewfilename}{-s-}{-}[\LWR@thisnewfilename]
-\StrSubstitute{\LWR@thisnewfilename}{-S-}{-}[\LWR@thisnewfilename]
-\StrSubstitute{\LWR@thisnewfilename}{-a-}{-}[\LWR@thisnewfilename]
-\StrSubstitute{\LWR@thisnewfilename}{-A-}{-}[\LWR@thisnewfilename]
-\StrSubstitute{\LWR@thisnewfilename}{-an-}{-}[\LWR@thisnewfilename]
-\StrSubstitute{\LWR@thisnewfilename}{-AN-}{-}[\LWR@thisnewfilename]
-\StrSubstitute{\LWR@thisnewfilename}{-to-}{-}[\LWR@thisnewfilename]
-\StrSubstitute{\LWR@thisnewfilename}{-TO-}{-}[\LWR@thisnewfilename]
-\StrSubstitute{\LWR@thisnewfilename}{-by-}{-}[\LWR@thisnewfilename]
-\StrSubstitute{\LWR@thisnewfilename}{-BY-}{-}[\LWR@thisnewfilename]
-\StrSubstitute{\LWR@thisnewfilename}{-of-}{-}[\LWR@thisnewfilename]
-\StrSubstitute{\LWR@thisnewfilename}{-OF-}{-}[\LWR@thisnewfilename]
-\StrSubstitute{\LWR@thisnewfilename}{-and-}{-}[\LWR@thisnewfilename]
-\StrSubstitute{\LWR@thisnewfilename}{-AND-}{-}[\LWR@thisnewfilename]
-\StrSubstitute{\LWR@thisnewfilename}{-for-}{-}[\LWR@thisnewfilename]
-\StrSubstitute{\LWR@thisnewfilename}{-FOR-}{-}[\LWR@thisnewfilename]
-\StrSubstitute{\LWR@thisnewfilename}{-the-}{-}[\LWR@thisnewfilename]
-\StrSubstitute{\LWR@thisnewfilename}{-THE-}{-}[\LWR@thisnewfilename]
-\StrSubstitute{\LWR@thisnewfilename}{-----}{-}[\LWR@thisnewfilename]
-\StrSubstitute{\LWR@thisnewfilename}{----}{-}[\LWR@thisnewfilename]
-\StrSubstitute{\LWR@thisnewfilename}{---}{-}[\LWR@thisnewfilename]
-\StrSubstitute{\LWR@thisnewfilename}{--}{-}[\LWR@thisnewfilename]
+\LWR@simplifyname*{ }
+\LWR@simplifyname*{!}
+\LWR@simplifyname*{,}
+\LWR@simplifyname*{'}
+\LWR@simplifyname*{+}
+\LWR@simplifyname*{,}
+\LWR@simplifyname*{/}
+\LWR@simplifyname*{:}
+\LWR@simplifyname*{;}
+\LWR@simplifyname*{=}
+\LWR@simplifyname*{?}
+\LWR@simplifyname*{@}
+\LWR@simplifyname*{^}
+\LWR@simplifyname*{&}
+\LWR@simplifyname*{"}
+\LWR@simplifyname*{<}
+\LWR@simplifyname*{>}
+\LWR@simplifyname{\LWRbackslash}
+\LWR@simplifyname{\LWRleftbrace}
+\LWR@simplifyname{\LWRrightbrace}
+\LWR@simplifyname{\LWRpercent}
+\LWR@simplifyname{\LWRdollar}
+\LWR@simplifyname*{|}
+\LWR@simplifyname*{^}
+\LWR@simplifyname*{~}
+\LWR@simplifyname*{[}
+\LWR@simplifyname*{]}
+\LWR@simplifyname*{`}
+\LWR@simplifyname*{-s-}
+\LWR@simplifyname*{-S-}
+\LWR@simplifyname*{-a-}
+\LWR@simplifyname*{-A-}
+\LWR@simplifyname*{-an-}
+\LWR@simplifyname*{-AN-}
+\LWR@simplifyname*{-to-}
+\LWR@simplifyname*{-TO-}
+\LWR@simplifyname*{-by-}
+\LWR@simplifyname*{-BY-}
+\LWR@simplifyname*{-of-}
+\LWR@simplifyname*{-OF-}
+\LWR@simplifyname*{-and-}
+\LWR@simplifyname*{-AND-}
+\LWR@simplifyname*{-for-}
+\LWR@simplifyname*{-FOR-}
+\LWR@simplifyname*{-the-}
+\LWR@simplifyname*{-THE-}
+\LWR@simplifyname*{-----}
+\LWR@simplifyname*{----}
+\LWR@simplifyname*{---}
+\LWR@simplifyname*{--}
\ifPDFTeX% pdflatex or dvi latex
\ifdefstring{\inputencodingname}{utf8}{%
-\StrSubstitute{\LWR@thisnewfilename}{—}{-}[\LWR@thisnewfilename]
-\StrSubstitute{\LWR@thisnewfilename}{–}{-}[\LWR@thisnewfilename]
+\LWR@simplifyname*{—}
+\LWR@simplifyname*{–}
}{}%
\else% not PDFTeX
-\StrSubstitute{\LWR@thisnewfilename}{—}{-}[\LWR@thisnewfilename]
-\StrSubstitute{\LWR@thisnewfilename}{–}{-}[\LWR@thisnewfilename]
+\LWR@simplifyname*{—}
+\LWR@simplifyname*{–}
\fi%
+\IfEndWith{\LWR@thisnewfilename}{\detokenize{-}}{%
+ \StrGobbleRight{\LWR@thisnewfilename}{1}[\LWR@thisnewfilename]%
+}{}%
+\StrLeft{\LWR@thisnewfilename}{\FilenameLimit}[\LWR@thisnewfilename]%
\global\let\LWR@thisfilename\LWR@thisnewfilename%
\endgroup%
\LWR@traceinfo{LWR@filenamenoblanks: result is \LWR@thisfilename}%
@@ -5733,8 +5855,6 @@ end -- not --version
\newcommand*{\LWR@newhtmlfile}[1]{
\LWR@traceinfo{LWR@newhtmlfile}
-
-
\LWR@htmlelementclassend{section}{textbody}
\LWR@htmlelementclassend{div}{bodycontainer}
\LWR@htmlelementclassend{div}{bodyandsidetoc}
@@ -5772,13 +5892,12 @@ end -- not --version
{
Section name ``#1'', at the line number listed below,
generates the filename ``\LWR@thisfilename'',
- which appears to be a duplicate%
+ which appears to be a duplicate.
+ There is a previous section with an identical or similar name.%
}
{
- Look for another section of the same type with a similar
- or identical name.
- (Lwarp sanitizes most symbols and common short words
- when generating file names, and this may cause a conflict.)
+ Lwarp sanitizes most symbols and a few common short words
+ when generating file names, and this may cause a conflict.
}
}
}
@@ -5894,6 +6013,7 @@ end -- not --version
\let\@partcntformat\@seccntformat
\newcommand*{\@partnameformat}{\LWR@isolate{\partname}~}%
\newcounter{LWR@currentautosec}
+\setcounter{LWR@currentautosec}{1}
\DeclareDocumentCommand{\LWR@section}{m m m m}{%
\LWR@traceinfo{LWR@section: starting}%
\LWR@stoppars%
@@ -5936,7 +6056,6 @@ end -- not --version
\LWR@traceinfo{LWR@section: about to LWR@setlatestname}%
\IfValueTF{#2}{\LWR@setlatestname{#2}}{\LWR@setlatestname{#3}}%
}%
-
\ifbool{HTMLDebugComments}{%
\begingroup%
\LWR@nullfonts%
@@ -5946,10 +6065,9 @@ end -- not --version
\IfNoValueTF{#2}% short TOC
{\LWR@htmlcomment{Opening #4 ``#3''}}%
{\LWR@htmlcomment{Opening #4 ``#2''}}%
- }
+ }\LWR@orignewline%
\endgroup%
-}{}%
-
+}{}
\ifthenelse{%
\cnttest{\@nameuse{LWR@depth#4}}{>=}{\LWR@depthparagraph}%
}%
@@ -6036,8 +6154,10 @@ end -- not --version
\LWR@isolate{#3}%
\LWR@traceinfo{LWR@section: about to close the heading tag}%
\LWR@htmltag{\@nameuse{LWR@tag#4end}}%
+\LWR@orignewline%
\LWR@traceinfo{LWR@section: about to create the LaTeX label}%
-\LWR@newautopagelabel{LWR@currentautosec}%
+\setcounter{LWR@latestautopage}{\value{page}}%
+\LWR@newautopagelabel{LWR@currentautosec}\LWR@orignewline%
\ifthenelse{%
\cnttest{\@nameuse{LWR@depth#4}}{<}{\LWR@depthparagraph}%
}%
@@ -6321,7 +6441,7 @@ end -- not --version
\linespread{1.3}%
\setlength{\parindent}{0pt}
\setlength{\parskip}{2ex}
-\immediate\openout\LWR@lateximagesfile=lateximages.txt
+\immediate\openout\LWR@lateximagesfile=\BaseJobname-images.txt
\setlength{\belowcaptionskip}{0ex}
\setlength{\abovecaptionskip}{0ex}
\renewcommand{\ps@plain}{}
@@ -6357,6 +6477,8 @@ end -- not --version
\LetLtxMacro\LWR@syntaxhighlightone$% balance for editor syntax highlighting
\LWR@startpars
\LWR@customizeMathJax
+\setcounter{LWR@latestautopage}{\value{page}}%
+\LWR@newautopagelabel{LWR@currentautosec}%
\LWR@traceinfo{LWR@lwarpStart: done}
}
\catcode`\$=3% math shift until lwarp starts
@@ -8552,6 +8674,7 @@ rowspan="#2" %
\global\boolfalse{LWR@emptyatbang}%
\StartDefiningTabulars%
\protected\gdef&{\LWR@tabularampersand}%
+\booltrue{LWR@forceminipagefullwidth}
\addtocounter{LWR@tabularpardepth}{1}%
\LWR@traceinfo{LWR@@HTML@tabular: about to LWR@getmynexttoken}%
\LWR@getmynexttoken%
@@ -8616,37 +8739,36 @@ rowspan="#2" %
}%
}
-
-\zref@newlist{special}
-\zref@newprop{zLWR@name}{\@currentlabelname}
-\zref@newprop{zLWR@htmlfilenumber}{%
-\ifbool{FileSectionNames}{\LWR@thisfilename}{\arabic{LWR@htmlfilenumber}}%
-}%
-\zref@newprop{zLWR@lateximagedepth}{\arabic{LWR@lateximagedepth}}
-\zref@newprop{zLWR@lateximagenumber}{\arabic{LWR@lateximagenumber}}
-\zref@addprop{special}{zLWR@name}
-\zref@addprop{special}{zLWR@htmlfilenumber}
-\zref@addprop{special}{zLWR@lateximagedepth}
-\zref@addprop{special}{zLWR@lateximagenumber}
-\newcommand*{\LWR@spref}[2]{%
-\zref@extractdefault{#1}{#2}{??}%
-}
+\def\LWR@setref#1#2#3{%
+ \ifx#1\relax%
+ ??%
+ \else%
+ \expandafter#2#1%
+ \fi}
\newcommand*{\LWR@nameref}[1]{%
-\LWR@spref{#1}{zLWR@name}%
+ \expandafter\LWR@setref\csname r@#1@lwarp\endcsname\LWR@firstoffour{#1}%
}
\newcommand*{\LWR@htmlfileref}[1]{%
-\LWR@spref{#1}{zLWR@htmlfilenumber}%
+ \expandafter\LWR@setref\csname r@#1@lwarp\endcsname\LWR@secondoffour{#1}%
}
\newcommand*{\LWR@lateximagedepthref}[1]{%
-\LWR@spref{#1}{zLWR@lateximagedepth}%
+ \expandafter\LWR@setref\csname r@#1@lwarp\endcsname\LWR@thirdoffour{#1}%
}
\newcommand*{\LWR@lateximagenumberref}[1]{%
-\LWR@spref{#1}{zLWR@lateximagenumber}%
+ \expandafter\LWR@setref\csname r@#1@lwarp\endcsname\LWR@fourthoffour{#1}%
}
-\newcommand*{\LWR@splabel}[1]{%
-\LWR@traceinfo{LWR@splabel !#1!}%
+\newcommand*{\LWR@lwarplabel}[1]{%
+\LWR@traceinfo{LWR@lwarplabel !#1!}%
\LWR@setlatestname{\@currentlabelname}%
-\zref@labelbylist{#1}{special}%
+ \@bsphack%
+ \protected@write\@auxout{}%
+ {\string\newlabel{#1@lwarp}{%
+ {\@currentlabelname}%
+ {\ifbool{FileSectionNames}{\LWR@thisfilename}{\arabic{LWR@htmlfilenumber}}}%
+ {\arabic{LWR@lateximagedepth}}%
+ {\arabic{LWR@lateximagenumber}}%
+ }}%
+ \@esphack%
}
@@ -8680,7 +8802,7 @@ rowspan="#2" %
\LWR@traceinfo{LWR@new@label: filesectionnames is \ifbool{FileSectionNames}{true}{false}}%
\LWR@traceinfo{LWR@new@label: LWR@thisfilename is !\LWR@thisfilename!}%
\LWR@traceinfo{LWR@new@label: LWR@htmlfilenumber is \arabic{LWR@htmlfilenumber}}%
-\LWR@splabel{#2}%
+\LWR@lwarplabel{#2}%
\LWR@sublabel{#2}%
\LWR@traceinfo{LWR@new@label: done}%
}
@@ -8688,7 +8810,6 @@ rowspan="#2" %
\newcommand*{\LWR@startref}[1]
{%
-\edef\LWR@lidref{\LWR@lateximagedepthref{#1}}%
\LWR@sanitize{#1}%
\LWR@traceinfo{LWR@startref A: !#1!}%
\LWR@htmltag{a href="%
@@ -8697,17 +8818,15 @@ rowspan="#2" %
\LWR@traceinfo{LWR@startref C}%
\LWR@origpound%
\LWR@traceinfo{LWR@startref D: !#1!}%
-\ifthenelse{\equal{\LWR@lidref}{??}}%
+\ifcsundef{r@#1@lwarp}%
{%
\LWR@traceinfo{LWR@startref D0: ??}%
??%
}%
{%
- \LWR@traceinfo{LWR@startref D1: \LWR@lidref}%
- \ifthenelse{\cnttest{\LWR@lidref}{>}{0}}%
+ \ifthenelse{\cnttest{\LWR@lateximagedepthref{#1}}{>}{0}}%
{%
- \LWR@traceinfo{LWR@startref D2: \LWR@lidref}%
- lateximage\LWR@lateximagenumberref{#1}%
+ \LWR@ImagesName\LWR@lateximagenumberref{#1}%
}%
{%
\LWR@traceinfo{LWR@startref D3}%
@@ -8770,8 +8889,8 @@ autopage-\theLWR@currentautosec%
\LWR@traceinfo{LWR@subhyperref !#1!}%
\LWR@sanitize{#1}%
\LWR@htmltag{%
- a href="\LWR@sanitized" %
- target="\_{}blank"\LWR@orignewline%
+ a href="\LWR@sanitized" % space
+ target="\_{}blank" % space
}%
}
@@ -8783,12 +8902,11 @@ autopage-\theLWR@currentautosec%
\NewDocumentCommand{\LWR@subhyperrefclass}{m +m m}{%
\LWR@htmltag{%
- a href="%
- \begingroup\@sanitize#1\endgroup%
- " %
- class="#3"\LWR@orignewline%
-}%
-#2%
+ a % space
+ href="\begingroup\@sanitize#1\endgroup" % space
+ class="#3" % space
+}\LWR@orignewline%
+#2\LWR@orignewline%
\LWR@htmltag{/a}%
\LWR@ensuredoingapar%
}
@@ -8848,8 +8966,22 @@ autopage-\theLWR@currentautosec%
\newcommand*{\LWR@subinlineimage}[5][]{%
\ifblank{#1}%
-{\LWR@htmltag{img src="#3.#4" alt="#3" style="#5" class="#2"}}%
-{\LWR@htmltag{img src="#3.#4" alt="#1" style="#5" class="#2"}}%
+{%
+ \LWR@htmltag{img \LWR@indentHTML
+ src="#3.#4" \LWR@indentHTML
+ alt="#3" \LWR@indentHTML
+ style="#5" \LWR@indentHTML
+ class="#2" \LWR@orignewline
+ }%
+}%
+{%
+ \LWR@htmltag{img \LWR@indentHTML
+ src="#3.#4" \LWR@indentHTML
+ alt="#1" \LWR@indentHTML
+ style="#5" \LWR@indentHTML
+ class="#2" \LWR@orignewline
+ }%
+}%
}
\end{warpHTML}
@@ -8970,8 +9102,8 @@ autopage-\theLWR@currentautosec%
\newcounter{LWR@nextautoid}
\newcounter{LWR@nextautopage}
\newcommand*{\LWRsetnextfloat}[2]{%
-\setcounter{LWR@nextautopage}{#1}%
-\setcounter{LWR@nextautoid}{#2}%
+ \setcounter{LWR@nextautopage}{#1}%
+ \setcounter{LWR@nextautoid}{#2}%
}
\newcounter{LWR@latestautopage}
@@ -9343,8 +9475,12 @@ autopage-\theLWR@currentautosec%
}
\newcommand{\hyperindexref}[1]{%
-\IfInteger{#1}%
- {\LWR@indexnameref{#1}}%
+\def\LWR@tempone{#1}%
+\IfBeginWith{\LWR@tempone}{ }{%
+ \StrGobbleLeft{\LWR@tempone}{1}[\LWR@tempone]%
+}{}%
+\IfInteger{\LWR@tempone}%
+ {\LWR@indexnameref{\LWR@tempone}}%
{%
\begingroup%
\LWR@hyperindexrefnullified
@@ -10186,11 +10322,15 @@ autopage-\theLWR@currentautosec%
\LWR@ensuredoingapar%
\addtocounter{LWR@externalfilecnt}{1}%
\LWR@traceinfo{lateximage: LWR@externalfilecnt is \arabic{LWR@externalfilecnt}}%
- \setcounterpageref{LWR@LIpage}{LWRlateximage\arabic{LWR@lateximagenumber}}%
+ \setcounterpageref{LWR@LIpage}{%
+ LWRlateximage-\BaseJobname-\arabic{LWR@lateximagenumber}%
+ }%
\LWR@traceinfo{lateximage: LWR@LIpage is \arabic{LWR@LIpage}}%
- \LWR@htmltag{span id="lateximage\arabic{LWR@lateximagenumber}" % extra space
- class="lateximagesource"}%
- \LWR@traceinfo{lateximage: about to write to lateximages.txt}%
+ \LWR@htmltag{span\LWR@indentHTML%
+ id="lateximage-\BaseJobname-\arabic{LWR@lateximagenumber}"\LWR@indentHTML
+ class="lateximagesource"\LWR@orignewline
+ }%
+ \LWR@traceinfo{lateximage: about to write to \BaseJobname-images.txt}%
\IfBooleanTF{#1}% starred
{% hash
\LWR@traceinfo{lateximage: hash true, adding %
@@ -10206,7 +10346,7 @@ autopage-\theLWR@currentautosec%
{% no hash
\LWR@traceinfo{lateximage: hash false}%
\immediate\write\LWR@lateximagesfile{%
- |\arabic{LWR@LIpage}|false|lateximage-\arabic{LWR@externalfilecnt}|%
+ |\arabic{LWR@LIpage}|false|\LWR@ImagesName\arabic{LWR@externalfilecnt}|%
}%
}% no hash
\LWR@traceinfo{lateximage: about to create open comment}%
@@ -10223,7 +10363,7 @@ autopage-\theLWR@currentautosec%
\def\thempfn{\thefootnote}%
\LetLtxMacro\@footnotetext\LWR@footnotetext%
\LWR@traceinfo{lateximage: about to create label}%
- \LWR@orig@label{LWRlateximage\arabic{LWR@lateximagenumber}}%
+ \LWR@orig@label{LWRlateximage-\BaseJobname-\arabic{LWR@lateximagenumber}}%
\LWR@traceinfo{lateximage: finished creating the label}%
\LetLtxMacro$\LWR@origdollar%
\catcode`\$=3% math shift
@@ -10262,15 +10402,15 @@ autopage-\theLWR@currentautosec%
{% hash
\LWR@subinlineimage[#2]{lateximage}%
{%
- lateximages\OSPathSymbol%
+ \LWR@ImagesDirectory\OSPathSymbol%
\LWR@print@mbox{\LWR@hashedname}%
}{svg}{#4}%
}% hash
{% no hash
\LWR@subinlineimage[#2]{lateximage}%
{%
- lateximages\OSPathSymbol%
- \LWR@print@mbox{lateximage-\theLWR@externalfilecnt}%
+ \LWR@ImagesDirectory\OSPathSymbol%
+ \LWR@print@mbox{\LWR@ImagesName\theLWR@externalfilecnt}%
}{svg}{#4}%
}% no hash
\LWR@ensuredoingapar%
@@ -10668,10 +10808,16 @@ autopage-\theLWR@currentautosec%
\newlength{\LWR@minipageheight}
\newbool{LWR@minipagefullwidth}
\boolfalse{LWR@minipagefullwidth}
-\newcommand*{\minipagefullwidth}{\booltrue{LWR@minipagefullwidth}}
+\newbool{LWR@forceminipagefullwidth}
+\boolfalse{LWR@forceminipagefullwidth}
+\newcommand*{\minipagefullwidth}{\global\booltrue{LWR@minipagefullwidth}}
+\newcommand*{\UseMinipageWidths}{\boolfalse{LWR@forceminipagefullwidth}}
+\newcommand*{\IgnoreMinipageWidths}{\booltrue{LWR@forceminipagefullwidth}}
\end{warpHTML}
\begin{warpprint}
\newcommand*{\minipagefullwidth}{}
+\newcommand*{\UseMinipageWidths}{}
+\newcommand*{\IgnoreMinipageWidths}{}
\end{warpprint}
\begin{warpHTML}
\newbool{LWR@minipagethispar}
@@ -10714,11 +10860,15 @@ autopage-\theLWR@currentautosec%
\ifthenelse{\equal{#3}{s}}{\LWR@print@mbox{justify-content:space-between} ; }{}%
\LWR@traceinfo{minipage: about to print the width of \LWR@printlength{\LWR@minipagewidth}}%
\ifbool{LWR@minipagefullwidth}%
-{\boolfalse{LWR@minipagefullwidth}}%
+{\global\boolfalse{LWR@minipagefullwidth}}%
{%
- \ifthenelse{\lengthtest{#4}=\linewidth}%
- {}%
- {width:\LWR@printlength{\LWR@minipagewidth} ; }%
+ \ifbool{LWR@forceminipagefullwidth}%
+ {}%
+ {%
+ \ifthenelse{\lengthtest{#4}=\linewidth}%
+ {}%
+ {width:\LWR@printlength{\LWR@minipagewidth} ; }%
+ }%
}%
\LWR@traceinfo{minipage: about to print the height}%
\ifblank{#2}{}{height:\LWR@printlength{\LWR@minipageheight} ; }%
@@ -10821,16 +10971,18 @@ autopage-\theLWR@currentautosec%
{}%
}
-\newcommand*{\LWR@blackborderpadding}{%
-border:\LWR@printlength{\LWR@atleastonept} solid black ; %
-padding:\LWR@printlength{\fboxsep}%
+\newcommand*{\LWR@fboxstyle}{%
+\LWR@findcurrenttextcolor%
+border:\LWR@printlength{\LWR@atleastonept} solid \LWR@origpound\LWR@tempcolor ; %
+padding:\LWR@printlength{\fboxsep} ; %
+color:\LWR@origpound\LWR@tempcolor%
}
\newcommand{\LWR@HTML@fbox}[1]{%
\LWR@traceinfo{HTML fbox}%
\LWR@forceminwidth{\fboxrule}%
\InlineClass[%
-\LWR@blackborderpadding%
-]{fbox}{#1}
+\LWR@fboxstyle%
+]{fbox}{#1}%
}
\AtBeginDocument{\LWR@formatted{fbox}}
\end{warpHTML}
@@ -10841,7 +10993,7 @@ padding:\LWR@printlength{\fboxsep}%
\newcommand{\LWR@HTML@fboxBlock}[1]{%
\LWR@forceminwidth{\fboxrule}%
\begin{BlockClass}[%
-\LWR@blackborderpadding%
+\LWR@fboxstyle%
]{fboxBlock}
#1
\end{BlockClass}
@@ -10889,7 +11041,7 @@ padding:\LWR@printlength{\fboxsep}%
\IfValueT{#2}{\setlength{\LWR@tempheight}{#2}}%
\LWR@stoppars%
\begin{BlockClass}[%
-\LWR@blackborderpadding ; %
+\LWR@fboxstyle ; %
\IfValueT{#2}{height:\LWR@printlength{\LWR@tempheight} ; }%
width:\LWR@printlength{\LWR@tempwidth}%
]{fminipage}%
@@ -11054,6 +11206,7 @@ width:\LWR@printlength{\LWR@tempwidth}%
\DeclareRobustCommand{\LWR@null@normalfont}{}
\DeclareRobustCommand{\LWR@null@em}{}
+\catcode`\$=\active% redefining $ below
\newcommand*{\LWR@nullfonts}{%
\LetLtxMacro\emph\LWR@null@emph%
\LetLtxMacro\textmd\LWR@null@textmd%
@@ -11094,9 +11247,24 @@ width:\LWR@printlength{\LWR@tempwidth}%
\def\(##1\){}%
\def\[##1\]{}%
\RenewDocumentCommand{\LWR@subsingledollar}{s m m m}{}%
+\protected\def$##1${}%
+\renewcommand*{\TeX}{TeX}%
+\renewcommand*{\LaTeX}{LaTeX}%
+\renewcommand*{\LaTeXe}{LaTeX2e}%
+\renewcommand*{\LuaTeX}{LuaTeX}%
+\renewcommand*{\LuaLaTeX}{LuaLaTeX}%
+\renewcommand*{\XeTeX}{XeTeX}%
+\renewcommand*{\XeLaTeX}{XeLaTeX}%
+\renewcommand*{\ConTeXt}{ConTeXt}%
+\renewcommand*{\BibTeX}{BibTeX}%
+\renewcommand*{\MakeIndex}{MakeIndex}%
+\renewcommand*{\AmS}{AmS}%
+\renewcommand*{\MiKTeX}{MiKTeX}%
+\renewcommand*{\LyX}{LyX}%
\let\texorpdfstring\relax%
\newcommand{\texorpdfstring}[2]{##2}%
}
+\catcode`\$=3%
\newcommand*{\LWR@f@family}{rm}
@@ -11197,7 +11365,7 @@ width:\LWR@printlength{\LWR@tempwidth}%
\newcommand*{\LWR@tempcolor}{}
\newcommand*{\LWR@tempcolortwo}{}
\newcommand*{\LWR@findcurrenttextcolor}{%
-\renewcommand{\LWR@tempcolor}{black}%
+\renewcommand{\LWR@tempcolor}{000000}%
}
\NewDocumentCommand{\LWR@textcurrentcolor}{m}{%
\renewcommand*{\LWR@currenttextcolor}{black}%
@@ -11386,7 +11554,7 @@ width:\LWR@printlength{\LWR@tempwidth}%
\LWR@minipagestoppars%
\LWR@findcurrenttextcolor%
\LWR@htmltagc{%
- span
+ span\LWR@indentHTML%
style="%
\ifbool{FormatWP}{}{background:\LWR@currenttextcolor ; }%
width:\LWR@printlength{\LWR@tempwidth} ; %
@@ -11396,15 +11564,15 @@ width:\LWR@printlength{\LWR@tempwidth}%
{%
\setlength{\LWR@tempraise}{0pt-#1}%
\setlength{\LWR@tempraise}{\LWR@tempraise*2}%
- \LWR@orignewline%
+ \LWR@indentHTML%
-ms-transform: translate(0pt,\LWR@printlength{\LWR@tempraise}); %
- \LWR@orignewline%
+ \LWR@indentHTML%
-webkit-transform: translate(0pt,\LWR@printlength{\LWR@tempraise}); %
- \LWR@orignewline%
+ \LWR@indentHTML%
transform: translate(0pt,\LWR@printlength{\LWR@tempraise}); %
- \LWR@orignewline%
+ \LWR@indentHTML%
}%
- display:inline-block;"%
+ display:inline-block;"\LWR@orignewline%
}%
\ifbool{FormatWP}{%
\setlength{\LWR@templengthone}{\LWR@tempwidth}%
@@ -11639,6 +11807,25 @@ width:\LWR@printlength{\LWR@tempwidth}%
}{}
}
\end{warpHTML}
+\begin{warpHTML}
+\AtBeginDocument{
+\@ifpackageloaded{kotexutf}{%
+ \def\LWR@kotexutf@setref#1#2#3{%
+ \@setref@dhucs@orig{#1}{#2}{#3}%
+ \ifx#1\relax\else
+ \bgroup
+ \dhucs@make@cjkchar@null
+ \edef\@temp{\expandafter#2#1}\global\josatoks\expandafter{\@temp}%
+ \egroup
+ \fi%
+ }%
+
+ \ifdefequal{\@setref}{\LWR@kotexutf@setref}{
+ \let\@setref\@setref@dhucs@orig
+ }{}
+}{}
+}
+\end{warpHTML}
\endinput
%%
%% End of file `lwarp.sty'.