From db28af0c6e1e6a1e6ccd86b36e0741fefe34e830 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 6 Mar 2019 22:24:57 +0000 Subject: lwarp (6mar19) git-svn-id: svn://tug.org/texlive/trunk@50266 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/source/latex/lwarp/lwarp.dtx | 1138 ++++++++++++++++++++++-- Master/texmf-dist/source/latex/lwarp/lwarp.ins | 9 + 2 files changed, 1059 insertions(+), 88 deletions(-) (limited to 'Master/texmf-dist/source/latex/lwarp') diff --git a/Master/texmf-dist/source/latex/lwarp/lwarp.dtx b/Master/texmf-dist/source/latex/lwarp/lwarp.dtx index d496722fde7..83805776f64 100644 --- a/Master/texmf-dist/source/latex/lwarp/lwarp.dtx +++ b/Master/texmf-dist/source/latex/lwarp/lwarp.dtx @@ -16,7 +16,7 @@ % \iffalse %\NeedsTeXFormat{LaTeX2e}[1999/12/01] %\ProvidesPackage{lwarp} -% [2019/02/23 v0.67 Allows LaTeX to directly produce HTML5 output.] +% [2019/03/05 v0.68 Allows LaTeX to directly produce HTML5 output.] % %<*driver> \documentclass{ltxdoc} @@ -800,21 +800,46 @@ Index entries also use \cs{nameref} and have the same limitation. } \newcommand{\limitspfnote}{ -While emulating \pkg{pfnote}, \pkg{lwarp} is not able to reset \HTML\ footnote +While emulating \pkg{pfnote}, +\margintag{\pkg{pfnote}} +\pkg{lwarp} is not able to reset \HTML\ footnote \trouble[\pkg{pfnote} numbers]{pfnote=\pkg{pfnote}>numbering} numbers per page number to match the printed version, as \HTML\ has no concept of page numbers. \pkg{lwarp} therefore uses continuous footnote numbering even for \pkg{pfnote}. } +\newcommand{\limitsperpage}{ +To have footnote numbers reset each time footnotes are printed: +\margintag{footnote numbering} +\begin{sourcedisplay} +\cs{setcounter}\{footnoteReset\}\{1\} +\end{sourcedisplay} + +For \pkg{bigfoot}, \pkg{manyfoot}, or \pkg{perpage}: +\begin{sourcedisplay} +\cs{MakePerPage}\{footnoteX\} \\ +\textrm{--- or ---} \\ +\cs{MakeSortedPerPage}\{footnoteX\} +\end{sourcedisplay} +The footnotes are reset when they are printed, according to section level +as set by \ctr{FootnoteDepth}, which is not necessarily by \HTML\ page. +This is recommended for \cs{alph}, \cs{Alph}, or \cs{fnsymbol} footnotes, +due to the limited number of symbols which are available. +} + \newcommand{\limitsfootnotes}{ \pkg{lwarp} uses native \LaTeX\ footnote code, although with its own \cs{box} to avoid the \LaTeX\ output routine. The usual functions mostly work as-is. +\limitsperpage + The \pkg{footmisc} \optn{stable} option is emulated by \pkg{lwarp}. +\margintag{\pkg{footmisc}} When using footnotes in sectioning commands, \trouble[sectioning commands]{footnote>sectioning, \pkg{footmisc}} +\trouble{footmisc=\pkg{footmisc}} to generate consistent results between print and \HTML, use the \pkg{footmisc} package with the \optn{stable} option, provide a short \TOC\ entry, and \cs{protect} the \cs{footnote}: @@ -824,9 +849,13 @@ provide a short \TOC\ entry, and \cs{protect} the \cs{footnote}: \cs{subsection}\textred{[Subsection Name]}\\ \fqquad\{Subsection Name\textred{\cs{protect}}\cs{footnote}\{A footnote.\}\} \end{sourcedisplay} -If using \pkg{memoir} class, with which \pkg{lwarp} preloads \pkg{footmisc}, the + +If using \pkg{memoir} class, +\margintag{\pkg{memoir} with \pkg{footmisc}} +with which \pkg{lwarp} preloads \pkg{footmisc}, the \optn{stable} option must be declared before \pkg{lwarp} is loaded: \trouble[\pkg{memoir}]{footnote>memoir=\pkg{memoir}} +\trouble{memoir=\pkg{memoir}>footmisc=\pkg{footmisc}} \begin{sourcedisplay} \cs{PassOptionsToPackage}\{\textred{stable}\}\{footmisc\} \\ \cs{usepackage}\{lwarp\} \\ @@ -841,6 +870,7 @@ adjust \cs{secnumdepth} instead. \newcommand{\limitsverbatimfootnotes}{% If using \pkg{fancybox} or \pkg{fancyvrb} with \cs{VerbatimFootnotes}, +\margintag{\pkg{fancybox}, \pkg{fancyvrb}} \trouble[\cs{VerbatimFootnotes}]{footnote>VerbatimFootnotes=\cs{VerbatimFootnotes}} and using footnotes in a sectioning command or display math, \trouble[sectioning or displaymath]{footnote>sectioning, verbatim} @@ -861,6 +891,25 @@ At present there is a bug such that paragraph closing tags are not present in footnotes when \cs{VerbatimFootnotes} are selected. The browser usually compensates. } +\newcommand{\limitsmanyfootbigfoot}{% +If using the \pkg{bigfoot} package, and possibly also \pkg{manyfoot}, +\margintag{\pkg{bigfoot}, \pkg{manyfoot}} +\trouble{bigfoot=\pkg{bigfoot}} +\trouble{manyfoot=\pkg{manyfoot}} +problems may occur with counter allocation because \pkg{lwarp} uses many counters, +and there is a difference in how counters numbered 256 and up are handled in pdf\LaTeX. +With \pkg{bigfoot} this has been known to show up as an error +related to one footnote insert being forbidden inside another. Another problem +showed up as a input stack error, and which of these problems occurred depended on how +many counters were allocated. + +As a possible solution, try creating several new counters before defining +\pkg{bigfoot} or \pkg{manyfoot} footnotes, +hoping to shift the problematic counter above the 256 threshold. +It may instead be necessary to use \XeLaTeX\ or \LuaLaTeX\ +instead of pdf\LaTeX. +} + \newcommand{\limitskomascript}{ Many features are ignored during the \HTML\ conversion. The goal is source-level compatibility. @@ -1427,11 +1476,14 @@ display math and objects such as \tikz\ may move to new image numbers when the document is changed. Before attempting to create the \SVG\ image files, +\margintag{recompile first} \prog{lwarpmk} verifies that the \HTML\ version of the document exists and has correct internal image references.\footnote{This becomes important when dealing with a document containing thousands of images.} If it is necessary to recompile the document's \HTML\ version one more time, -\prog{lwarpmk} will inform the user with an error message.% +\prog{lwarpmk} usually will inform the user with an error message, +but there are some conditions which cannot be detected, so the user +should watch for the \LaTeX\ recompile warnings. If \HTML\ appears where an \SVG\ image should be, % \trouble[\HTML\ instead of images]{image>appears as \HTML\ code}% @@ -1441,7 +1493,6 @@ If \HTML\ appears where an \SVG\ image should be, % \trouble{HTML>image appear as \HTML\ code} recompile the document one more time to get the page numbers back in sync, then remake the images one more time. -\prog{lwarpmk} attempts to detect this situation and print a warning. Incorrect \SVG\ images will also occur if the document changes the \progcode{page} counter: @@ -1832,21 +1883,30 @@ left \& right \textbackslash\textbackslash \\ } \newcommand{\limitslongtable}{% -Longtable \cs{endhead}, \cs{endfoot}, and \cs{endlastfoot} rows are -not used for \HTML, and these rows should be disabled. -\trouble[Misplaced \cs{noalign}]{Misplaced \cs{noalign}} +Use one of either \cs{endhead} or \cs{endfirsthead} for both print and \HTML, +and use a \cs{warpprintonly} macro to disable the other head phrase, +and also the \cs{endfoot} and \cs{endfirstfoot} phrases. +(See \cref{sec:limitsthreeparttablex} if using \pkg{threeparttablex}.) \trouble{tabular>endhead=\cs{endhead}, \cs{endfoot}, \cs{endlastfoot}} -Use - \begin{sourcedisplay} - \cs{warpprintonly}\{row contents\} - \end{sourcedisplay} -instead of - \begin{sourcedisplay} - \cs{begin}\{warpprint\} \ldots\ \cs{end}\{warpprint\} - \end{sourcedisplay} -Doing so helps avoid ``Misplaced \cs{noalign}.'' when using \cs{begin}\{warpprint\}. +\begin{sourcedisplay} +\cs{begin}\{longtable\}\{ [column specifiers] \} \\ +{[} \dots ] \cs{endfirsthead} \quad \textgreen{\% or \cs{endhead}, for print and HTML} \\ +\textred{\cs{warpprintonly}\{} \qquad\qquad \textgreen{\% not used in HTML} \\ +\fquad [ \dots ] \cs{endhead} \qquad \textgreen{\% or \cs{endfirsthead}} \\ +\fquad [ \dots ] \cs{endfoot} \\ +\fquad [ ] \cs{endlastfoot} \\ +\textred{\}} \\ +\dots\ \textblue{table contents} \dots \\ +\textred{\cs{warpHTMLonly}\{} \\ +\fquad {[} ] \quad \textgreen{\% HTML last footer, without \cs{endfoot} \\ +\hspace*{\fill} \% or \cs{endlastfoot}.} \\ +\textred{\}} \\ +\cs{end}\{longtable\} +\end{sourcedisplay} -Keep the \cs{endfirsthead} row, which is still relevent to \HTML\ output. +Use the \cs{warpprintonly} macro instead of the \env{warpprint} environment. +\trouble[Misplaced \cs{noalign}]{Misplaced \cs{noalign}} +Doing so helps avoid ``Misplaced \cs{noalign}.'' when using \cs{begin}\{warpprint\}. \cs{kill} is ignored, place a \cs{kill} line inside \trouble[\cs{kill}]{tabular>kill=\cs{kill}} @@ -1859,6 +1919,37 @@ or place it inside \cs{warpprintonly}. \watchout[lateximage] } +\newcommand{\limitsthreeparttablex}{% +\pkg{threeparttablex} is used with \pkg{longtable} and \pkg{booktabs} as follows: +\begin{sourcedisplay} +\cs{begin}\{longtable\}\{ [column specifiers] \} \\ +{[} \dots ] \cs{endfirsthead} \quad \textgreen{\% or \cs{endhead}, for print and HTML} \\ +\textred{\cs{warpprintonly}\{} \qquad\qquad \textgreen{\% not used in HTML} \\ +\fquad [ \dots ] \cs{endhead} \qquad \textgreen{\% or \cs{endfirsthead}} \\ +\fquad [ \dots ] \cs{endfoot} \\ +\fquad \textblue{\cs{bottomrule} \cs{insertTableNotes} \cs{endlastfoot}} \\ +\textred{\}} \\ +\dots\ \textblue{table contents} \dots \\ +\textred{\cs{warpHTMLonly}\{} \quad \textgreen{\% HTML last footer} \\ +\fquad \textblue{\cs{bottomrule}} \\ +\fquad \textblue{\cs{UseMinipageWidths}} \qquad \textgreen{\% optional} \\ +\fquad \textblue{\cs{insertTableNotes}} \\ +\fquad \textblue{\cs{endlastfoot}} \\ +\textred{\}} \\ +\cs{end}\{longtable\} +\end{sourcedisplay} + +The table notes are created using a \cs{multicolumn}. +\margintag{table width} +By default the width is not specified to the browser, so long table notes +can cause the table to be spread out horizontally. +For \HTML\ output, \pkg{lwarp} guesses the width of the table depending on +the number of columns, then restricts its guess to a min/max range. +To use this guess for the width of the table notes, use \cs{UseMinipageWidths} before +\cs{insertTableNotes}. The width is then specified, and in many cases the result is +an improvement in overall table layout. +} + \newcommand{\limitssupertabular}{% For \cs{tablefirsthead}, etc., enclose them as follows: \trouble[Misplaced alignment tab character \&]% @@ -2455,7 +2546,7 @@ This boolean may be tested by the user for later use. %<*package> % \fi % -% \CheckSum{29792} +% \CheckSum{30413} % % \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 @@ -2565,6 +2656,7 @@ This boolean may be tested by the user for later use. % \changes{v0.65}{2018/12/22}{\ 2018/12/22} % \changes{v0.66}{2019/02/08}{\ 2019/02/08} % \changes{v0.67}{2019/02/23}{\ 2019/02/23} +% \changes{v0.68}{2019/03/05}{\ 2019/03/05} @@ -2779,6 +2871,26 @@ This boolean may be tested by the user for later use. % % \begin{description} % \needspace{2\baselineskip} +% \item[v0.68:] Error handling, tabulars, footnotes. +% \begin{itemize} +% \item \prog{lwarpmk}: Improved error handling for image generation if +% \margintag{\prog{lwarpmk}} +% compile was incomplete. +% \item \env{tabular}: Fix for \cs{warpprintonly}. +% \item \pkg{longtable}: Improved flexibility for \cs{endhead}, etc. +% \margintag{packages} +% Improved error reporting if \cs{endhead}, etc. incorrect for \pkg{lwarp}. +% \item \pkg{threeparttable}: Fix for caption type. +% \item \pkg{hyperref}: Fix for options with braces. +% \item \pkg{morefloats}: Fix to be loaded early for print output. +% \item \pkg{listings}: Updated for v1.7. +% \item Added \pkg{bigfoot}, \pkg{fnpara}, \pkg{footnotebackref}, \pkg{manyfoot}, +% \pkg{tablefootnote}, \pkg{threeparttablex}. +% \item Added \pkg{layouts}, \pkg{niceframe}, +% \pkg{perpage}, \pkg{showtags}. +% \item Prevented \pkg{alg}, \pkg{algorithmic}, \pkg{pdfcprot}, \pkg{fncylab}. +% \end{itemize} +% \needspace{2\baselineskip} % \item[v0.67:] Filename generation, symbol fonts. % \begin{itemize} % \item Documentation fix for \filenm{-images}, \filenm{-images.txt}. @@ -4321,13 +4433,14 @@ This boolean may be tested by the user for later use. % \pkg{fullminipage}, \pkg{fullpage}, % \pkg{fwlw}, \pkg{geometry}, \pkg{gmeometric}, % \pkg{grid}, \pkg{grid-system}, \pkg{gridset}, -% \pkg{layaureo}, \pkg{leading}, -% \pkg{ltxgrid}, \pkg{nccfancyhdr}, \pkg{notespages}, \pkg{pagegrid}, -% \pkg{pdfprivacy}, \pkg{pagesel}, \pkg{preview}, \pkg{rmpage}, +% \pkg{layaureo}, \pkg{layout}, \pkg{layouts}, \pkg{leading}, +% \pkg{ltxgrid}, \pkg{nccfancyhdr}, \pkg{notespages}, \pkg{nowidow}, +% \pkg{pagegrid}, \pkg{pdfprivacy}, \pkg{pagesel}, +% \pkg{preview}, \pkg{rmpage}, % \pkg{scrlayer-scrpage}, \pkg{scrpage2}, \pkg{textarea}, \pkg{threadcol}, % \pkg{thumb}, \pkg{thumbs}, \pkg{titleps}, \pkg{tocenter}, % \pkg{turnthepage}, \pkg{twoup}, \pkg{typearea}, \pkg{vmargin}, -% \pkg{watermark}, \pkg{zwpagelayout}. +% \pkg{watermark}, \pkg{widows-and-orphans}, \pkg{zwpagelayout}. % % Tested to work as-is: \pkg{underlin}.\\ % @@ -4353,20 +4466,20 @@ This boolean may be tested by the user for later use. % % \pkg{idxlayout}, \pkg{imakeidx}, \pkg{index}, \pkg{makeidx}, \pkg{repeatindex}, \pkg{splitidx}. % -% Tested to work as-is: \pkg{hvindex}, \pkg{sepfootnotes}.\\ +% Tested to work as-is: \pkg{hvindex}. \\ % % Glossary: & \pkg{gloss}, \pkg{glossaries} and \prog{xindy}, \pkg{nomencl}.\\ % % Bibliography: & \pkg{babelbib}, \pkg{backref}, \pkg{biblatex}, \pkg{bibunits}, -% \pkg{chapterbib}, \pkg{cite}, \pkg{hypernat}, \pkg{natbib}. +% \pkg{chapterbib}, \pkg{cite}, \pkg{hypernat}, \pkg{natbib}, \pkg{showtags}. % % Tested to work as-is: \pkg{notes2bib}. \\ % % \midrule % % Cross-references: & -% \pkg{bookmark}, \pkg{breakurl}, \pkg{cleveref}, \pkg{fancyref}, -% \pkg{hypdestopt}, \pkg{hyperref}, \pkg{prettyref}, +% \pkg{bookmark}, \pkg{breakurl}, \pkg{cleveref}, \pkg{fancyref}, +% \pkg{hypdestopt}, \pkg{hyperref}, \pkg{perpage}, \pkg{prettyref}, % \pkg{titleref}, \pkg{url}, \pkg{varioref}, \pkg{xr}, \pkg{xr-hyper}, \pkg{xurl}. \\ % % \midrule @@ -4375,13 +4488,14 @@ This boolean may be tested by the user for later use. % \pkg{scrlayer-notecolumn}, \pkg{versonotes}. \\ % % Footnotes: & Adds \progcode{FootnoteDepth} to print footnotes at section breaks. -% \pkg{dblfnote}, -% \pkg{endheads}, \pkg{endnotes}, \pkg{fnbreak}, \pkg{fnpos}, -% \pkg{footmisc}, \pkg{footnote}, \pkg{footnoterange}, \pkg{footnpag}, -% \pkg{marginnote}, \pkg{nccfoots}, \pkg{pagenote}, -% \pkg{parnotes}, \pkg{pfnote}, \pkg{sidenote}. +% \pkg{bigfoot}, \pkg{dblfnote}, +% \pkg{endheads}, \pkg{endnotes}, \pkg{fnbreak}, \pkg{fnpara}, \pkg{fnpos}, +% \pkg{footmisc}, \pkg{footnote}, \pkg{footnotebackref}, +% \pkg{footnoterange}, \pkg{footnpag}, \pkg{manyfoot}, +% \pkg{marginnote}, \pkg{pagenote}, +% \pkg{parnotes}, \pkg{pfnote}, \pkg{sidenote}, \pkg{tablefootnote}. % -% Tested to work as-is: \pkg{fixfoot}. \\ +% Tested to work as-is: \pkg{fixfoot}, \pkg{nccfoots}, \pkg{sepfootnotes}. \\ % % \midrule % @@ -4430,7 +4544,7 @@ This boolean may be tested by the user for later use. % \env{tabular} environment, \pkg{array}, \pkg{arydshln}, \pkg{bigdelim}, \pkg{booktabs}, % \pkg{colortbl}, \pkg{diagbox}, \pkg{longtable}, \pkg{ltablex}, \pkg{ltxtable}, % \pkg{multirow}, \pkg{supertabular}, \pkg{tabularx}, \pkg{tabulary}, -% \pkg{threeparttable}, \pkg{xltabular}, \pkg{xtab}. \\ +% \pkg{threeparttable}, \pkg{threeparttablex}, \pkg{xltabular}, \pkg{xtab}. \\ % % \midrule % @@ -4479,7 +4593,7 @@ This boolean may be tested by the user for later use. % \pkg{fancyvrb}, \pkg{moreverb}, \pkg{shortvrb}, \pkg{verbatim}. \\ % % Frames: & \pkg{boxedminipage2e}, \pkg{fancybox}, \pkg{framed}, \pkg{mdframed}, -% \pkg{shadow}, \pkg{vertbars}. \\ +% \pkg{niceframe}, \pkg{shadow}, \pkg{vertbars}. \\ % % Multi-columns: & \pkg{adjmulticol}, \pkg{multicol}, \pkg{multicolrule}, \pkg{vwcol}. \\ % @@ -4495,11 +4609,11 @@ This boolean may be tested by the user for later use. % \pkg{cancel}, \pkg{ellipsis}, \pkg{embrac}, \pkg{enparen}, % \pkg{hyphenat}, \pkg{lettrine}, \pkg{lips}, % \pkg{lua-check-hyphen}, \pkg{luacolor}, -% \pkg{magaz}, \pkg{nowidow}, \pkg{pdfrender}, \pkg{realscripts}, \pkg{relsize}, +% \pkg{magaz}, \pkg{pdfrender}, \pkg{realscripts}, \pkg{relsize}, % \pkg{scalefnt}, \pkg{soul}, \pkg{soulpos}, \pkg{soulutf8}, % \pkg{textfit}, \pkg{thinsp}, \pkg{trimclip}, \pkg{truncate}, % \pkg{ulem}, \pkg{umoline}, \pkg{underscore}, \pkg{uspace}, -% \pkg{widows-and-orphans}, \pkg{xellipsis}. \\ +% \pkg{xellipsis}. \\ % % Acronyms: & \pkg{acro}, \pkg{acronym}. \\ % @@ -5485,7 +5599,7 @@ This boolean may be tested by the user for later use. % \subsection{Generating the \SVG\ images} % \label{sec:tutorialsvgmath} % -% By default \pkg{lwarp} represents math as \SVG\ images with +% By default \pkg{lwarp} represents math as \SVG\ images, with % \margintag{math as \SVG\ images} % the \LaTeX\ source included in \attribute{alt} attributes. In this way, % the math is displayed as it was drawn by \LaTeX, and the \LaTeX\ source @@ -7461,7 +7575,8 @@ This boolean may be tested by the user for later use. % \subsubsection{Footnotes and page notes} % \label{sec:limitsfootnotes} % -% \trouble{footnote>misnumbered} +% \trouble{footnote>numbering} +% \gindex{footnotes>numbering} % \trouble{footnote>in sectioning command} % % \limitsfootnotes @@ -7474,6 +7589,7 @@ This boolean may be tested by the user for later use. % % \limitspfnote % +% \limitsmanyfootbigfoot % % % \subsection{Front and back matter} @@ -8439,9 +8555,18 @@ This boolean may be tested by the user for later use. % \subsubsection{\pkg{longtable} package} % % \DescribePackage{longtable} +% \trouble{longtable=\pkg{longtable}>endhead=\cs{endhead}, etc.} +% \trouble{endhead=\cs{endhead}, etc.} % \limitslongtable % % +% \subsubsection{\pkg{threeparttablex} package} +% \label{sec:limitsthreeparttablex} +% \DescribePackage{threeparttablex} +% \trouble{threeparttablex=\pkg{threeparttablex}} +% \limitsthreeparttablex +% +% % \subsubsection{\pkg{supertabular} and \pkg{xtab} packages} % % \DescribePackage{supertabular} @@ -8465,7 +8590,7 @@ This boolean may be tested by the user for later use. % % \DescribePackage{float} % \DescribePackage{trivfloat} -% \DescribePackage{algorithmx} +% \DescribePackage{algorithmicx} % \limitscombiningfloats % % @@ -10403,6 +10528,7 @@ For a possible alternative, see class(es) #2.} % \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}.} +% \changes{v0.68}{2019/02/26}{Prevented \pkg{alg}, \pkg{algorithmic}, \pkg{fncylab}, \pkg{pdfcprot}.} % % \begin{macrocode} \LWR@earlyclassloadnever{jarticle}{ujarticle} @@ -10414,6 +10540,8 @@ For a possible alternative, see class(es) #2.} \LWR@earlyloadnever{ae}{cm-super, lmodern} \LWR@earlyloadnever{aecompl}{cm-super, lmodern} \LWR@earlyloadnever{aecc}{cm-super, lmodern} +\LWR@earlyloadnever{alg}{algorithm2e, algorithmicx} +\LWR@earlyloadnever{algorithmic}{algorithm2e, algorithmicx} \LWR@earlyloadnever{boxedminipage}{boxedminipage2e} \LWR@earlyloadnever{caption2}{caption} % \LWR@earlyloadnever{ccaption}{caption}% might be preloaded by memoir @@ -10438,8 +10566,10 @@ For a possible alternative, see class(es) #2.} \LWR@earlyloadnever{colortab}{colortbl} \LWR@earlyloadnever{epsf}{graphicx} \LWR@earlyloadnever{fancyheadings}{fancyhdr} +\LWR@earlyloadnever{fncylab}{cleveref} \LWR@earlyloadnever{glossary}{glossaries} \LWR@earlyloadnever{hyper}{hyperref} +\LWR@earlyloadnever{pdfcprot}{microtype} \LWR@earlyloadnever{picinpar}{floatflt, wrapfig} \LWR@earlyloadnever{picins}{floatflt, wrapfig} \LWR@earlyloadnever{sistyle}{siunitx} @@ -10500,6 +10630,7 @@ For a possible alternative, see class(es) #2.} \LWR@loadafter{balance} \LWR@loadafter{bbding} \LWR@loadafter{bigdelim} +\LWR@loadafter{bigfoot} \LWR@loadafter{bigstrut} \LWR@loadafter{bitpattern} \LWR@loadafter{blowup} @@ -10596,6 +10727,7 @@ For a possible alternative, see class(es) #2.} \LWR@loadafter{fnbreak} \LWR@loadafter{fncychap} \LWR@loadafter{fnlineno} +\LWR@loadafter{fnpara} \LWR@loadafter{fnpos} \LWR@loadafter{fontawesome} \LWR@loadafter{fontawesome5} @@ -10603,6 +10735,7 @@ For a possible alternative, see class(es) #2.} % fontspec must be loaded before lwarp \LWR@loadafter{footmisc} \LWR@loadafter{footnote} +\LWR@loadafter{footnotebackref} \LWR@loadafter{footnotehyper} \LWR@loadafter{footnoterange} \LWR@loadafter{footnpag} @@ -10645,6 +10778,7 @@ For a possible alternative, see class(es) #2.} \LWR@loadafter{keyfloat} \LWR@loadafter{layaureo} \LWR@loadafter{layout} +\LWR@loadafter{layouts} \LWR@loadafter{leading} \LWR@loadafter{letterspace} \LWR@loadafter{lettrine} @@ -10663,6 +10797,7 @@ For a possible alternative, see class(es) #2.} \LWR@loadafter{luatodonotes} \LWR@loadafter{magaz} \LWR@notmemoirloadafter{makeidx} +\LWR@loadafter{manyfoot} \LWR@loadafter{marginfit} \LWR@loadafter{marginfix} \LWR@loadafter{marginnote} @@ -10675,7 +10810,7 @@ For a possible alternative, see class(es) #2.} \LWR@loadafter{microtype} \LWR@loadafter{midfloat} \LWR@loadafter{midpage} -\LWR@loadafter{morefloats} +% morefloats must be allowed early for print mode \LWR@notmemoirloadafter{moreverb} % morewrites must be loaded before lwarp \LWR@notmemoirloadafter{mparhack} @@ -10695,6 +10830,7 @@ For a possible alternative, see class(es) #2.} % newunicodechar must be loaded before lwarp \LWR@notmemoirloadafter{nextpage} \LWR@loadafter{nicefrac} +\LWR@loadafter{niceframe} \LWR@loadafter{nomencl} \LWR@loadafter{nonfloat} \LWR@loadafter{nonumonpart} @@ -10721,6 +10857,7 @@ For a possible alternative, see class(es) #2.} \LWR@loadafter{pdfsync} \LWR@loadafter{pdftricks} \LWR@loadafter{pdfx} +\LWR@loadafter{perpage} \LWR@loadafter{pfnote} \LWR@loadafter{phfqit} \LWR@loadafter{pifont} @@ -10775,6 +10912,7 @@ For a possible alternative, see class(es) #2.} \LWR@loadafter{shadow} \LWR@notmemoirloadafter{showidx} \LWR@loadafter{showkeys} +\LWR@loadafter{showtags} \LWR@loadafter{sidecap} \LWR@loadafter{sidenotes} \LWR@loadafter{SIunits} @@ -10794,6 +10932,7 @@ For a possible alternative, see class(es) #2.} \LWR@loadafter{supertabular} \LWR@loadafter{t1inc} \LWR@loadafter{tabls} +\LWR@loadafter{tablefootnote} \LWR@notmemoirloadafter{tabularx} \LWR@loadafter{tabulary} \LWR@loadafter{tascmac} @@ -10805,6 +10944,7 @@ For a possible alternative, see class(es) #2.} \LWR@loadafter{thinsp} \LWR@loadafter{threadcol} \LWR@loadafter{threeparttable} +\LWR@loadafter{threeparttablex} \LWR@loadafter{thumb} \LWR@loadafter{thumbs} \LWR@loadafter{tikz} @@ -10881,7 +11021,7 @@ For a possible alternative, see class(es) #2.} % \begin{macrocode} \newcommand{\LWR@mdfive}[1]{% \PackageError{lwarp} -{No MD5 macro was found.} +{No MD5 macro was found} {Lwarp must find the macros pdfmdfivesum or mdfivesum.} } % \end{macrocode} @@ -12354,7 +12494,7 @@ For a possible alternative, see class(es) #2.} % \end{macrocode} % \DescribePackage{varwidth} -% Used for print-mode \env{lateximage}: +% Used for print-mode \env{lateximage}. % \begin{macrocode} \RequirePackage{varwidth} % \end{macrocode} @@ -12433,12 +12573,15 @@ For a possible alternative, see class(es) #2.} % \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}.} +% \changes{v0.68}{2019/02/26}{Prevented \pkg{alg}, \pkg{algorithmic}, \pkg{fncylab}, \pkg{pdfcprot}.} % % The following should never be loaded: % \begin{macrocode} \newcommand*{\LWR@checkloadfilename}[1]{% \LWR@checkloadnever{#1}{ae}{latinmodern} \LWR@checkloadnever{#1}{aecc}{latinmodern} +\LWR@checkloadnever{#1}{alg}{algorithm2e, algorithmicx} +\LWR@checkloadnever{#1}{algorithmic}{algorithm2e, algorithmicx} \LWR@checkloadnever{#1}{bitfield}{bytefield} \LWR@checkloadnever{#1}{boxedminipage}{boxedminipage2e} \LWR@checkloadnever{#1}{caption2}{caption} @@ -12447,9 +12590,11 @@ For a possible alternative, see class(es) #2.} \LWR@checkloadnever{#1}{doublespace}{setspace} \LWR@checkloadnever{#1}{epsf}{graphicx} \LWR@checkloadnever{#1}{fancyheadings}{fancyhdr} +\LWR@checkloadnever{#1}{fncylab}{cleveref} \LWR@checkloadnever{#1}{glossary}{glossaries} \LWR@checkloadnever{#1}{hyper}{hyperref} \LWR@checkloadnever{#1}{newthm}{ntheorem} +\LWR@checkloadnever{#1}{pdfcprot}{microtype} \LWR@checkloadnever{#1}{picinpar}{floatflt, wrapfig} \LWR@checkloadnever{#1}{picins}{floatflt, wrapfig} \LWR@checkloadnever{#1}{rplain}{fancyhdr} @@ -14150,6 +14295,7 @@ For a possible alternative, see class(es) #2.} % \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.} +% \changes{v0.66}{2019/02/28}{\filenm{lwarp.css}: Added \pkg{niceframe}.} % % ^^A *lwarp.css % @@ -14918,6 +15064,35 @@ div.wpminipage { border: 1px solid green ; margin: .5ex ; padding: .5ex ;} .framedtitle p { padding: .3em } +/* For the niceframe package: */ + +div.niceframe, div.curlyframe, div.artdecoframe, div.generalframe { + padding: 1ex ; + margin: 2ex auto ; + border-radius: 2ex ; +} + +div.niceframe { + border: 6px groove black ; +} + +div.curlyframe { + border-left: 3px dotted black ; + border-right: 3px dotted black ; + border-radius: 6ex ; +} + +div.artdecoframe { + border-left: 10px double black ; + border-right: 10px double black ; + border-radius: 6ex ; +} + +div.generalframe { + border: 6px groove black ; +} + + dl { margin: 1ex 2em 1ex 0em; @@ -15179,6 +15354,11 @@ td.tdb , td.tdbrule , td.tdB , td.tdBrule text-align: left ; } +.minipage .tnotes { + margin: 0pt ; + padding: 0pt ; +} + .tnotes dl dt p {margin-bottom:0px;} .tnoteitemheader {margin-right: 1em;} @@ -16582,6 +16762,7 @@ src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.4/MathJax.js?config=TeX- % \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}.}% +% \changes{v0.68}{2019/03/02}{\prog{lwarpmk}: Improved error handling if incomplete compile.}% % % The following is only generated if the \optn{lwarpmk} option % was given to \pkg{lwarp}. @@ -16597,7 +16778,7 @@ src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.4/MathJax.js?config=TeX- -- Copyright 2016-2018 Brian Dunn -printversion = "v0.67" +printversion = "v0.68" requiredconfversion = "2" -- also at *lwarpmk.conf function printhelp () @@ -17008,6 +17189,16 @@ function warnlimages () end -- warnlimages +function warnlimagesrecompile () +-- Warning if must recompile before creating limages: + print ("") + print ("lwarpmk: ===") + print ("lwarpmk: The document must be recompiled before creating the lateximages.") + print ("lwarpmk: Enter \"lwarpmk html\" again, then try \"lwarpmk limages\" again.") + print ("lwarpmk: ===") +end --warnlimagesrecompile + + function checklimages () -- -- Check .txt to see if need to recompile first. @@ -17036,12 +17227,14 @@ for line in limagesfile:lines() do end end -- if i~=nil end -- do +-- The last line should be |end|end|end|. +-- If not, the compile must have aborted, and the images are incomplete. +if ( lwimgpage ~= "end" ) then + warnlimagesrecompile() + os.exit(1) ; +end if ( pagezerowarning ) then - print ("") - print ("lwarpmk: ===") - print ("lwarpmk: The document must be recompiled before creating the lateximages.") - print ("lwarpmk: Enter \"lwarpmk html\" again, then try \"lwarpmk limages\" again.") - print ("lwarpmk: ===") + warnlimagesrecompile() os.exit(1) ; end -- pagezerowarning end -- checklimages @@ -17124,6 +17317,8 @@ if ( (i~=nil) ) then -- Skip if the page number is 0: if ( lwimgpage == "0" ) then pagezerowarning = true + -- Skip if the page number is "end": + else if ( lwimgpage == "end" ) then else -- Skip is this image is hashed and already exists: local lwimgfullname = imagesdirectory .. dirslash .. lwimgname .. ".svg" @@ -17146,6 +17341,7 @@ if ( (i~=nil) ) then createwindowsimage (lwimgfullname) end end -- not hashed or not exists + end -- not page "end" end -- not page 0 end -- not nil end -- createonelateximage @@ -19741,7 +19937,7 @@ end -- not --version % \subsection{Regular page footnotes} % In \HTML\ documents, footnotes are placed at the % bottom of the web page or the section, depending on \progcode{FootnoteDepth}, -% using the \LaTeX\ box \cs{LWR@footnotes}. +% using the \LaTeX\ box \cs{LWR@footnotebox}. % Using this instead of the original \cs{footins} box % avoids having footnotes be printed by the output routine, % since footnotes should be printed per \HTML\ page @@ -19777,7 +19973,29 @@ end -- not --version \newcounter{FootnoteDepth} \setcounter{FootnoteDepth}{3} % \end{macrocode} - +% +% +% \DescribeCounter{footnoteReset} +% \DescribeDefault{0} +% If non-zero, the \ctr{footnote} counter +% is reset to this value each time the footnotes are printed, +% as controlled by \ctr{FootnoteDepth}. +% For the \pkg{manyfoot} and \pkg{bigfoot} packages, +% additional counters such as |footnoteReset| will be defined as well. +% These counters may be set non-zero by the user, and +% are also set if the \pkg{perpage}'s +% \cs{MakePerPage} or \cs{MakeSortedPerPage} macros are used for the +% |footnote| or |footnote| counters. +% +% (The name is not capitalized because it is made from the counter's name with +% ``Reset'' appended.) +% +% \begin{macrocode} +\newcounter{footnoteReset} +\setcounter{footnoteReset}{0} +% \end{macrocode} +% +% % \begin{macrocode} \end{warpall} % \end{macrocode} @@ -19790,13 +20008,16 @@ end -- not --version % \end{macrocode} +% \begin{macro}{\LWR@footnotebox} % Patch \LaTeX\ footnotes to use a new \cs{box} instead of an insert % for \pkg{lwarp} footnotes. % This avoids having the original \cs{footins} appear % at the bottom of a \env{lateximage}, which is on its own new page. % \begin{macrocode} -\newbox\LWR@footnotes +\newbox\LWR@footnotebox % \end{macrocode} +% \end{macro} +% % % Much of the following has unneeded print-mode formatting removed. % @@ -19827,20 +20048,23 @@ end -- not --version % \cs{let}\cs{@footnotetext}\cs{LWR@footnotetext} % \end{sourcedisplay} % -% \begin{macro}{\LWR@footnotetext} \marg{text} +% \begin{macro}{\LWR@@footnotetext} \marg{text} \marg{footnote box name} +% +% Factored to allow multiple footnote boxes for \pkg{manyfoot}. % % \changes{v0.27}{2017/04/04}{Fix for table footnote par tags.} % \changes{v0.36}{2017/08/15}{Extra \protect\HTML\ source space after paragraphs.} % \changes{v0.36}{2017/08/16}{Force \protect\HTML\ superscripts.} +% \changes{v0.68}{2019/03/04}{Factored for multiple foot boxes.} % % \begin{macrocode} -\long\def\LWR@footnotetext#1{% +\long\def\LWR@@footnotetext#1#2{% \LWR@traceinfo{LWR@footnotetext}% -\global\setbox\LWR@footnotes=\vbox{% +\global\setbox\csname #2\endcsname=\vbox{% % \end{macrocode} % Add to any current footnotes: % \begin{macrocode} - \unvbox\LWR@footnotes% + \unvbox\csname #2\endcsname% % \end{macrocode} % Remember the footnote number for \cs{ref}: % \begin{macrocode} @@ -19896,6 +20120,13 @@ end -- not --version % \end{macrocode} % \end{macro} +% \begin{macro}{\LWR@footnotetext} \marg{text} +% \begin{macrocode} +\long\def\LWR@footnotetext#1{\LWR@@footnotetext{#1}{LWR@footnotebox}} +% \end{macrocode} +% \end{macro} +% +% % \begin{macro}{\@footnotetext} \marg{text} % \begin{macrocode} \LetLtxMacro\@footnotetext\LWR@footnotetext @@ -19980,22 +20211,40 @@ end -- not --version % % \subsection{Printing pending footnotes} % -% \begin{macro}{\LWR@printpendingfootnotes} -% Enclose the footnotes in a class, print, then clear. +% +% \begin{macro}{\LWR@@printpendingfootnotes} \marg{footnote counter name} % \begin{macrocode} -\newcommand*{\LWR@printpendingfootnotes}{% -\ifvoid\LWR@footnotes\else +\newcommand*{\LWR@@printpendingfootnotes}[1]{% +\expandafter\ifvoid\csname LWR@#1box\endcsname\else \LWR@forcenewpage \begin{BlockClass}{footnotes} \LWR@origmedskip - \unvbox\LWR@footnotes - \setbox\LWR@footnotes=\vbox{} + \unvbox\csuse{LWR@#1box} + \setbox\csuse{LWR@#1box}=\vbox{} \end{BlockClass} + \ifltxcounter{#1Reset}{% + \ifnumgreater{\value{#1Reset}}{0}{% + \setcounter{#1}{\value{#1Reset}}% + \addtocounter{#1}{-1}% + }{}% + }{}% \fi } % \end{macrocode} % \end{macro} % +% \begin{macro}{\LWR@printpendingfootnotes} +% Enclose the footnotes in a class, print, then clear. +% For \pkg{manynotes}, new footnotes may be added via \cs{appto}. +% +% \changes{v0.68}{2019/03/04}{Factored for multiple footnote boxes.} +% \begin{macrocode} +\newcommand*{\LWR@printpendingfootnotes}{% + \LWR@@printpendingfootnotes{footnote}% +} +% \end{macrocode} +% \end{macro} +% % \begin{macro}{\LWR@maybeprintpendingfootnotes} \marg{depth} % Used to print footnotes before sections only if formatting for an \EPUB\ or word processor: % \changes{v0.43}{2017/11/08}{Added \progcode{FootnoteDepth}.} @@ -22219,6 +22468,9 @@ end -- not --version % \end{macrocode} % For \env{lateximage} commands: % \begin{macrocode} +\immediate\write\LWR@lateximagesfile{% + |end|end|end|% +}% \immediate\closeout\LWR@lateximagesfile } % \end{macrocode} @@ -27224,6 +27476,22 @@ rowspan="#2" % % \end{macro} +% \begin{macro}{\LWR@tabular@warpprintonly} \marg{contents} +% +% Only process the contents if producing printed output. +% Modified inside a \env{tabular} to grab the next token. +% \changes{v0.68}{2019/03/01}{Added.} +% \begin{macrocode} +\newcommand{\LWR@tabular@warpprintonly}[1]{% + \ifbool{warpingprint}{#1}{}% + \LWR@getmynexttoken% +} +% \end{macrocode} +% \end{macro} +% +% + + % \begin{macro}{\LWR@nullifyNoAutoSpacing} % For \pkg{babel-french}, turn off auto spacing at the start of the tabular, % then nullify the autospacing commands inside the tabular, @@ -27327,6 +27595,12 @@ rowspan="#2" % \LetLtxMacro{\\}{\LWR@tabularendofline}% % \end{macrocode} % +% \cs{warpprintonly} inside a \env{tabular} must grab the next token. +% \changes{v0.68}{2019/03/01}{Fix: \cs{warpprintonly} inside \env{tabular}.} +% \begin{macrocode} +\LetLtxMacro\warpprintonly\LWR@tabular@warpprintonly% +% \end{macrocode} +% % The following adjust for \pkg{colortbl}. % \changes{v0.48}{2018/02/06}{\pkg{colortbl}: Added.} % \begin{macrocode} @@ -31532,6 +31806,8 @@ autopage-\theLWR@currentautosec% % containing the \PDF\ page number from \filenm{_html.pdf}, where the image % is located, a boolean indicating whether the image is hashed, and % the filename of the image. +% The last line has ``end'' in each field, and is used to detect +% an incomplete compile. % % % \changes{v0.18}{2016/05/18}{Suppress extra space.} @@ -32629,7 +32905,7 @@ autopage-\theLWR@currentautosec% -% \section{Boxes and Minipages} +% \section{Minipages and Boxes} % % A \CSS\ flexbox is used for minipages and parboxes, % allowing external and internal vertical positioning. @@ -32743,9 +33019,6 @@ autopage-\theLWR@currentautosec% \begin{warpHTML} % \end{macrocode} % -% -% -% % \DescribeBoolean{LWR@minipagethispar} % Has a minipage been seen this paragraph? % If true, prevents paragraph tags around horizontal space @@ -33138,6 +33411,7 @@ color:\LWR@origpound\LWR@tempcolor% \begin{warpall} \let\fboxBlock\fbox \end{warpall} + \begin{warpHTML} % \end{macrocode} % \codehtml @@ -38201,6 +38475,49 @@ span style="width:\LWR@printlength{\ALG@thistlm}; display:inline-block;"% % % % +% \iffalse +%<*bigfoot> +% \fi +% +% \part{lwarp-bigfoot.sty} +% +% \section{bigfoot} +% +% \DescribePackage{bigfoot} +% \pkg{bigfoot} is emulated. +% +% \changes{v0.68}{2019/03/05}{\pkg{bigfoot}: Added.} +% +% \codehtml +% +% \begin{macrocode} +\LWR@ProvidesPackageDrop{bigfoot}[2015/08/30] +% \end{macrocode} +% +% \begin{macrocode} +\RequirePackage{manyfoot} +\RequirePackage{perpage} + +\def\RestyleFootnote#1#2{} +\def\FootnoteSpecific#1{} +\def\DefineFootnoteStack#1{} +\def\PushFootnoteMark#1{} +\def\PopFootnoteMark#1{} +\def\hfootfraction{0.9} +\def\vtypefraction{0.7} +\def\FootnoteMinimum{1sp} +\def\FootnoteMainMinimum{0pt} +\newcount\bigfoottolerance +\bigfoottolerance=100 +\providecommand\footnotecarryratio{2} +% \end{macrocode} +% +% \iffalse +% +% \fi +% +% +% % % \iffalse %<*bigstrut> @@ -43143,11 +43460,11 @@ name = \chemmacros_translate:n {scheme-name} % \begin{macrocode} \def\V@@footnotetext{% \LWR@traceinfo{V@footnotetext}% -\global\setbox\LWR@footnotes=\vbox\bgroup% +\global\setbox\LWR@footnotebox=\vbox\bgroup% % \end{macrocode} % Add to any current footnotes: % \begin{macrocode} - \unvbox\LWR@footnotes% + \unvbox\LWR@footnotebox% % \end{macrocode} % Remember the footnote number for \cs{ref}: % \begin{macrocode} @@ -43595,11 +43912,11 @@ name = \chemmacros_translate:n {scheme-name} % \begin{macrocode} \def\V@@footnotetext{% \LWR@traceinfo{V@footnotetext}% -\global\setbox\LWR@footnotes=\vbox\bgroup% +\global\setbox\LWR@footnotebox=\vbox\bgroup% % \end{macrocode} % Add to any current footnotes: % \begin{macrocode} - \unvbox\LWR@footnotes% + \unvbox\LWR@footnotebox% % \end{macrocode} % Remember the footnote number for \cs{ref}: % \begin{macrocode} @@ -44968,7 +45285,6 @@ solid \LWR@origpound\LWR@tempcolor ; % % % % -% % \iffalse %<*fnlineno> % \fi @@ -44994,6 +45310,33 @@ solid \LWR@origpound\LWR@tempcolor ; % % % % +% +% \iffalse +%<*fnpara> +% \fi +% +% \part{lwarp-fnpara.sty} +% +% \section{fnpara} +% +% \DescribePackage{fnpara} +% \pkg{fnpara} is ignored. +% +% \changes{v0.68}{2019/02/28}{\pkg{fnpara}: Added.} +% +% \codehtml +% +% \begin{macrocode} +\LWR@ProvidesPackageDrop{fnpara} +% \end{macrocode} +% +% \iffalse +% +% \fi +% +% +% +% % \iffalse %<*fnpos> % \fi @@ -45369,6 +45712,32 @@ solid \LWR@origpound\LWR@tempcolor ; % % % % +% \iffalse +%<*footnotebackref> +% \fi +% +% \part{lwarp-footnotebackref.sty} +% +% \section{footnotebackref} +% +% \DescribePackage{footnotebackref} +% \pkg{footnotebackref} is ignored. +% +% \changes{v0.68}{2019/03/01}{\pkg{footnotebackref}: Added.} +% +% \codehtml +% +% \begin{macrocode} +\LWR@ProvidesPackageDrop{footnotebackref}[2012/07/01] +% \end{macrocode} +% +% \iffalse +% +% \fi +% +% +% +% % % \iffalse %<*footnotehyper> @@ -47359,7 +47728,13 @@ alt="\LWR@igalt" \LWR@orignewline% \typeout{ do not attempt to patch lwarp's version of `hyperref'.} % \ProvidesPackage{lwarp-#1-#2} \DeclareOption*{} -\ProcessOptions\relax +% \end{macrocode} +% \changes{v0.68}{2019/02/28}{\pkg{hyperref}: Fix for options with braces.} +% \begin{macrocode} +% \ProcessOptions\relax +\let\ds@\@empty% from the original \ProcessOptions +\edef\@curroptions{}% lwarp modification to \ProcessOptions +\@process@ptions\relax% from the original \ProcessOptions % \end{macrocode} % \begin{macrocode} @@ -48798,10 +49173,8 @@ alt="\LWR@igalt" \LWR@orignewline% % \section{layout} % -% \credits{Kent McPherson, Johannes Braams, Hideo Umeki} -% % \DescribePackage{layout} -% \pkg{layout} is emulated. +% \pkg{layout} is ignored. % % \changes{v0.22}{2017/03/01}{\pkg{layout}: Added.} % @@ -48823,6 +49196,175 @@ alt="\LWR@igalt" \LWR@orignewline% % % % +% +% \iffalse +%<*layouts> +% \fi +% +% \part{lwarp-layouts.sty} +% +% \section{layouts} +% +% \DescribePackage{layouts} +% \pkg{layouts} is ignored. +% +% \changes{v0.68}{2019/02/26}{\pkg{layouts}: Added.} +% +% \codehtml +% +% \begin{macrocode} +\LWR@ProvidesPackageDrop{layouts}[2009/09/02] +% \end{macrocode} +% +% \begin{macrocode} +\newif\ifoddpagelayout + \oddpagelayouttrue +\newif\iftwocolumnlayout + \twocolumnlayoutfalse +\newif\ifdrawmarginpars + \drawmarginparstrue +\newif\ifdrawparameters + \drawparameterstrue +\newif\iflistaspara + \listasparatrue +\newif\ifruninhead + \runinheadfalse +\newif\ifprintparameters + \printparameterstrue +\newif\ifdrawdimensions + \drawdimensionsfalse +\newif\ifprintheadings + \printheadingstrue +\newcommand{\testdrawdimensions}{} +\newcommand{\testprintparameters}{} +\newcommand{\setlabelfont}[1]{} +\newcommand{\setparametertextfont}[1]{} +\newcommand{\setvaluestextsize}[1]{} +\newcommand{\setlayoutscale}[1]{} +\newcommand{\setuplayouts}{} +\newcommand{\printinunitsof}[1]{} +\newcommand{\prntlen}[1]{} +\newcommand{\trypaperwidth}[1]{} +\newcommand{\trypaperheight}[1]{} +\newcommand{\tryhoffset}[1]{} +\newcommand{\tryvoffset}[1]{} +\newcommand{\trytopmargin}[1]{} +\newcommand{\tryheadheight}[1]{} +\newcommand{\tryheadsep}[1]{} +\newcommand{\trytextheight}[1]{} +\newcommand{\tryfootskip}[1]{} +\newcommand{\tryoddsidemargin}[1]{} +\newcommand{\tryevensidemargin}[1]{} +\newcommand{\trytextwidth}[1]{} +\newcommand{\trymarginparsep}[1]{} +\newcommand{\trymarginparwidth}[1]{} +\newcommand{\trymarginparpush}[1]{} +\newcommand{\trycolumnsep}[1]{} +\newcommand{\trycolumnseprule}[1]{} +\newcommand{\setfootbox}[2]{} +\newcommand{\currentpage}{} +\newcommand{\drawpage}{(draw page)} +\newcommand{\pagediagram}{(page diagram)} +\newcommand{\pagedesign}{(page design)} +\newcommand{\pagevalues}{(page values)} +\newcommand{\trystockwidth}[1]{} +\newcommand{\trystockheight}[1]{} +\newcommand{\trytrimedge}[1]{} +\newcommand{\trytrimtop}[1]{} +\newcommand{\tryuppermargin}[1]{} +\newcommand{\tryspinemargin}[1]{} +\newcommand{\currentstock}{} +\newcommand{\drawstock}{(draw stock)} +\newcommand{\stockdiagram}{(stock diagram)} +\newcommand{\stockdesign}{(stock design)} +\newcommand{\stockvalues}{(stock values)} +\newcommand{\tryitemindent}[1]{} +\newcommand{\trylabelwidth}[1]{} +\newcommand{\trylabelsep}[1]{} +\newcommand{\tryleftmargin}[1]{} +\newcommand{\tryrightmargin}[1]{} +\newcommand{\trylistparindent}[1]{} +\newcommand{\trytopsep}[1]{} +\newcommand{\tryparskip}[1]{} +\newcommand{\trypartopsep}[1]{} +\newcommand{\tryparsep}[1]{} +\newcommand{\tryitemsep}[1]{} +\newcommand{\currentlist}{} +\newcommand{\drawlist}{(draw list)} +\newcommand{\listdiagram}{(list diagram)} +\newcommand{\listdesign}{(list design)} +\newcommand{\listvalues}{(list values)} +\newcommand{\tryfootins}[1]{} +\newcommand{\tryfootnotesep}[1]{} +\newcommand{\tryfootnotebaseline}[1]{} +\newcommand{\tryfootruleheight}[1]{} +\newcommand{\tryfootrulefrac}[1]{} +\newcommand{\currentfootnote}{} +\newcommand{\drawfootnote}{(draw footnote)} +\newcommand{\footnotediagram}{(footnote diagram)} +\newcommand{\footnotedesign}{(footnote design)} +\newcommand{\footnotevalues}{(footnote values)} +\newcommand{\tryparindent}[1]{} +\newcommand{\tryparlinewidth}[1]{} +\newcommand{\tryparbaselineskip}[1]{} +\newcommand{\currentparagraph}{} +\newcommand{\drawparagraph}{(draw paragraph)} +\newcommand{\paragraphdiagram}{(paragraph diagram)} +\newcommand{\paragraphdesign}{(paragraph design)} +\newcommand{\paragraphvalues}{(paragraph values)} +\newcommand{\trybeforeskip}[1]{} +\newcommand{\tryafterskip}[1]{} +\newcommand{\tryindent}[1]{} +\newcommand{\currentheading}{} +\newcommand{\drawheading}[1]{(draw heading)} +\newcommand{\headingdiagram}[1]{(heading diagram)} +\newcommand{\headingdesign}[1]{(heading design)} +\newcommand{\headingvalues}{(heading values)} +\newcommand{\trytextfloatsep}[1]{} +\newcommand{\tryfloatsep}[1]{} +\newcommand{\tryintextsep}[1]{} +\newcommand{\trytopfigrule}[1]{} +\newcommand{\trybotfigrule}[1]{} +\newcommand{\currentfloat}{} +\newcommand{\drawfloat}{(draw float)} +\newcommand{\floatdiagram}{(float diagram)} +\newcommand{\floatdesign}{(float design)} +\newcommand{\floatvalues}{(float values)} +\newcommand{\trytotalnumber}[1]{} +\newcommand{\trytopnumber}[1]{} +\newcommand{\trybottomnumber}[1]{} +\newcommand{\trytopfraction}[1]{} +\newcommand{\trytextfraction}[1]{} +\newcommand{\trybottomfraction}[1]{} +\newcommand{\currentfloatpage}{} +\newcommand{\drawfloatpage}{(draw floatpage)} +\newcommand{\floatpagediagram}{(floatpage diagram)} +\newcommand{\floatpagedesign}{(floatpage design)} +\newcommand{\floatpagevalues}{(floatpage values)} +\newcommand{\trytocindent}[1]{} +\newcommand{\trytocnumwidth}[1]{} +\newcommand{\trytoclinewidth}[1]{} +\newcommand{\trytocrmarg}[1]{} +\newcommand{\trytocpnumwidth}[1]{} +\newcommand{\trytocdotsep}[1]{} +\newcommand{\currenttoc}{} +\newcommand{\drawtoc}{(draw toc)} +\newcommand{\tocdiagram}{(toc diagram)} +\newcommand{\tocdesign}{(toc design)} +\newcommand{\tocvalues}{(toc values)} +\newcommand{\drawaspread}[8][0]{(a spread)} +\newcommand{\drawfontframe}[1]{(font frame)} +\newcommand{\drawfontframelabel}[1]{} +% \end{macrocode} +% +% \iffalse +% +% \fi +% +% +% +% +% % \iffalse %<*leading> % \fi @@ -49170,7 +49712,7 @@ alt="\LWR@igalt" \LWR@orignewline% % % % \begin{macrocode} -\LWR@ProvidesPackagePass{listings}[2015/06/04] +\LWR@ProvidesPackagePass{listings}[2018/09/02] % \end{macrocode} % ^^A For passing optional arguments to an environment, see: @@ -49408,14 +49950,15 @@ alt="\LWR@igalt" \LWR@orignewline% % place right line numbers in a field \cs{VerbatimHTMLWidth} wide. % % \changes{v0.60}{2018/09/12}{\pkg{listings}: Fix if inside a list.} +% \changes{v0.68}{2019/03/05}{\pkg{listings}: Fix for \pkg{listings} v1.7.} % % ^^A \DescribeKey[listings]{numbers} Activates line numbers. % \begin{macrocode} \lst@Key{numbers}{none}{% \let\lst@PlaceNumber\@empty \lstKV@SwitchCases{#1}% - {none&\\% - left&\def\lst@PlaceNumber{% + {none:\\% + left:\def\lst@PlaceNumber{% % \end{macrocode} % For now, \pkg{lwarp} places left line numbers inline. % Ideally the entire line would be moved to the right, but @@ -49426,7 +49969,7 @@ alt="\LWR@igalt" \LWR@orignewline% \lst@numberstyle{\thelstnumber}\kern\lst@numbersep% % } }\\% - right&\def\lst@PlaceNumber{\LWR@origrlap{\LWR@orignormalfont + right:\def\lst@PlaceNumber{\LWR@origrlap{\LWR@orignormalfont \kern 6in \kern\lst@numbersep \lst@numberstyle{\thelstnumber}}}% }{\PackageError{Listings}{Numbers #1 unknown}\@ehc}} @@ -49540,6 +50083,14 @@ alt="\LWR@igalt" \LWR@orignewline% % {\texttt{http://tex.stackexchange.com/questions/43006/\\why-is-input-not-expandable}} % % +% Used to detect more than one of \cs{endhead} and \cs{endfirsthead} in use +% for \HTML\ at the same time. +% \begin{macrocode} +\newbool{LWR@longtable@havehead} +\boolfalse{LWR@longtable@havehead} +% \end{macrocode} +% +% % \begin{environment}{longtable} * \oarg{horizalignment} \marg{colspec} % Emulates the \env{longtable} environment. % @@ -49547,7 +50098,7 @@ alt="\LWR@igalt" \LWR@orignewline% % The unstarred version steps the counter once at the beginning, but % not at each caption. % -% Options [c], [l], and [r] are thrown away. +% Options [c], [l], and [r] are ignored. % \begin{macrocode} \newenvironment{longtable*}[2][]{% \LWR@floatbegin{table}% @@ -49556,6 +50107,7 @@ alt="\LWR@igalt" \LWR@orignewline% \caption@setoptions{@longtable}% \caption@LT@setup% \booltrue{LWR@starredlongtable}% +\boolfalse{LWR@longtable@havehead}% \let\captionlistentry\LWR@LTcaptionlistentry% \tabular{#2} } @@ -49568,6 +50120,7 @@ alt="\LWR@igalt" \LWR@orignewline% \caption@setoptions{@longtable}% \caption@LT@setup% \refstepcounter{\LTcaptype}% +\boolfalse{LWR@longtable@havehead}% \let\captionlistentry\LWR@LTcaptionlistentry% \tabular{#2} } @@ -49578,10 +50131,63 @@ alt="\LWR@igalt" \LWR@orignewline% % Provided for compatibility, but ignored: % \begin{macrocode} \newcounter{LTchunksize} -\def\endhead{\LWR@tabularendofline}% throws away options //[dim] and //* -\def\endfirsthead{\LWR@tabularendofline} -\def\endfoot{\LWR@tabularendofline} -\def\endlastfoot{\LWR@tabularendofline} +% \end{macrocode} +% +% Error for heads which should have been in \cs{warpprintonly}: +% \begin{macrocode} +\newcommand*{\LWR@longtable@headerror}{% + \PackageError{lwarp} + {For longtable:\MessageBreak + 1: Keep either one of an \protect\endhead\space or + \protect\endfirsthead\space\MessageBreak + \space phrase as-is, to be used by both print and HTML.\MessageBreak + 2: Place any other \protect\end... phrases inside a\MessageBreak + \space\protect\warpprintonly\space macro, + to be ignored by HTML.\MessageBreak + 3: Add a final footer for HTML at the end of the table\MessageBreak + \space inside a \protect\warpHTMLonly\space macro. + This can be\MessageBreak + \space a copy of an \protect\endfoot\space or + \protect\endfirstfoot\space phrase,\MessageBreak + \space but without the actual \protect\endfoot\space + or \protect\endfirstfoot\MessageBreak + \space macros. If using threeparttablex, add\MessageBreak + \space \protect\insertTableNotes\space here, + optionally with\MessageBreak + \space \protect\UseMinipageWidths\space in front.\MessageBreak + See the lwarp documentation regarding longtables\MessageBreak + and threeparttablex} + {See the lwarp documentation regading longtables and threeparttablex.} +} +% \end{macrocode} +% +% Error if more than one of \cs{endhead} or \cs{endfirsthead} is +% outside of \env{warpprintonly}. +% \changes{v0.68}{2019/03/01}{\pkg{longtable}: Improved error handling.} +% \begin{macrocode} +\newcommand*{\LWR@longtable@maybeheaderror}{% +\ifbool{LWR@longtable@havehead}% + {\LWR@longtable@headerror}% + {% + \booltrue{LWR@longtable@havehead} + \LWR@tabularendofline% throws away options //[dim] and //* + }% +} +% \end{macrocode} +% +% Error if more than one of these is outside of \env{warpprint}. +% \begin{macrocode} +\def\endhead{\LWR@longtable@maybeheaderror} +\def\endfirsthead{\LWR@longtable@maybeheaderror} +% \end{macrocode} +% +% Error if ANY of these is outside of \env{warpprint}. +% \begin{macrocode} +\def\endfoot{\LWR@longtable@headerror} +\def\endlastfoot{\LWR@longtable@headerror} +% \end{macrocode} +% +% \begin{macrocode} \newcommand\tabularnewline{\LWR@tabularendofline} \newcommand{\setlongtables}{}% Obsolete command, does nothing. \newlength{\LTleft} @@ -50106,6 +50712,122 @@ alt="\LWR@igalt" \LWR@orignewline% % % % +% \iffalse +%<*manyfoot> +% \fi +% +% \part{lwarp-manyfoot.sty} +% +% \section{manyfoot} +% +% \DescribePackage{manyfoot} +% \pkg{manyfoot} is emulated. +% +% \limitsmanyfootbigfoot +% +% \pkg{lwarp}'s emulation of \pkg{bigfoot} uses \pkg{manyfoot}, so +% some of the \pkg{bigfoot} enhancements are included here. +% +% The \pkg{bigfoot} ``default'' footnote is ignored, using the \pkg{lwarp} +% version instead. +% +% \changes{v0.68}{2019/03/03}{\pkg{manyfoot}: Added.} +% +% \codehtml +% +% \begin{macrocode} +\LWR@ProvidesPackageDrop{manyfoot}[2005/09/11] +% \end{macrocode} +% +% \begin{macrocode} +\RequirePackage{nccfoots} + +\newcommand{\extrafootnoterule}{} + +\let\defaultfootnoterule\footnoterule + +\newcommand*{\SelectFootnoteRule}[2][0]{} + +\newcommand{\footnoterulepriority}{1} + +\newcommand{\SetFootnoteHook}[1]{} +\@onlypreamble\SetFootnoteHook + +\newcommand{\SplitNote}{} + +\newcommand*\ExtraParaSkip[1]{} + +\newcommand*{\newfootnote}[2][plain]{% + \ifstrequal{#2}{default}{}{% not "default" + \expandafter\newbox\csname LWR@footnote#2box\endcsname% + \appto{\LWR@printpendingfootnotes}{% + \LWR@@printpendingfootnotes{footnote#2}% + } + \long\csdef{Footnotetext#2}##1##2{% + \NCC@makefnmark{##1}% + \LWR@@footnotetext{##2}{LWR@footnote#2box}% + }% + \long\csdef{Footnotetext#2+}##1##2{% + \NCC@makefnmark{##1}% + \LWR@@footnotetext{##2}{LWR@footnote#2box}% + }% + }% not "default" +} +\@onlypreamble\newfootnote + +\newcommand*{\DeclareNewFootnote}[2][plain]{% + \@ifnextchar[% + {\LWR@manyfoot@declare{#1}{#2}}% + {\LWR@manyfoot@declare{#1}{#2}[arabic]}% +} + +\def\LWR@manyfoot@declare#1#2[#3]{% +\ifstrequal{#2}{default}{}{% not "default" + \newfootnote[#1]{#2}% + \newcounter{footnote#2}% + \newcounter{footnote#2Reset}% + \setcounter{footnote#2Reset}{0}% + \csdef{thefootnote#2}{% + \expandafter\noexpand\csname @#3\endcsname% + \expandafter\noexpand\csname c@footnote#2\endcsname% + }% +% \end{macrocode} +% For \pkg{bigfoot}, the footnote commands may be appended with one or two +% plusses or one or two minuses, which are ignored in \HTML. +% \begin{macrocode} + \expandafter\NewDocumentCommand\csname footnote#2\endcsname{t{+}t{+}t{-}t{-}}{% + \stepcounter{footnote#2}% + \protected@xdef\@thefnmark{\csname thefootnote#2\endcsname}% + \@footnotemark% + \csuse{Footnotetext#2}{\@thefnmark}% absorbs the footnote contents + }% + \csdef{footnotemark#2}{% + \stepcounter{footnote#2}% + \protected@xdef\@thefnmark{\csname thefootnote#2\endcsname}% + \@footnotemark% + }% + \expandafter\NewDocumentCommand\csname footnotetext#2\endcsname{t{+}t{+}t{-}t{-}}{% + \protected@xdef\@thefnmark{\csname thefootnote#2\endcsname}% + \csuse{Footnotetext#2}{\@thefnmark}% absorbs the footnote contents + }% + \csdef{Footnotemark#2}{% + \Footnotemark% + }% + \csdef{Footnote#2}##1{% + \Footnotemark{##1}% + \csuse{Footnotetext#2}{##1}% + }% +}% not "default" +} +\@onlypreamble\DeclareNewFootnote +% \end{macrocode} +% +% \iffalse +% +% \fi +% +% +% % % % \iffalse @@ -52330,6 +53052,48 @@ class="td% % % % +% +% \iffalse +%<*niceframe> +% \fi +% +% \part{lwarp-niceframe.sty} +% +% \section{niceframe} +% +% \DescribePackage{niceframe} +% \pkg{niceframe} is emulated. +% +% \changes{v0.68}{2019/02/28}{\pkg{niceframe}: Added.} +% +% \codehtml +% +% \begin{macrocode} +\LWR@ProvidesPackageDrop{niceframe}% the original date is in yyyy/dd/mm format +% \end{macrocode} +% +% \begin{macrocode} +\newcommand{\LWR@niceframe}[3]{ + \setlength{\LWR@templengthone}{#1} + \begin{BlockClass}[max-width:\LWR@printlength{\LWR@templengthone}]{#3} + #2 + \end{BlockClass} +} + +\newcommand{\niceframe}[2][\textwidth]{\LWR@niceframe{#1}{#2}{niceframe}} +\newcommand{\curlyframe}[2][\textwidth]{\LWR@niceframe{#1}{#2}{curlyframe}} +\newcommand{\artdecoframe}[2][\textwidth]{\LWR@niceframe{#1}{#2}{artdecoframe}} + +\newcommand{\generalframe}[9]{\LWR@niceframe{\textwidth}{#9}{generalframe}} +% \end{macrocode} +% +% \iffalse +% +% \fi +% +% +% +% % \iffalse %<*nomencl> % \fi @@ -53754,6 +54518,7 @@ class="td% % % % +% % \iffalse %<*pdflscape> % \fi @@ -54154,6 +54919,89 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf', % % % +% +% +% \iffalse +%<*perpage> +% \fi +% +% \part{lwarp-perpage.sty} +% +% \section{perpage} +% +% \credits{David Kastrup} +% +% \DescribePackage{perpage} +% \pkg{perpage} is mostly ignored, but support is added for footnote counters. +% +% There is no page number in \HTML, so most counters are not reset. +% If the document redefines \cs{the} to include \cs{theperpage}, +% it is necessary to place that redefininition inside a \env{warpprint} +% environment to avoid modifying the \HTML\ defintions. +% +% \cs{AddAbsoluteCounter} must not be inside \env{warpprint}, as the +% counter must be added for \HTML\ also, although it is not incremented. +% +% \limitsperpage +% +% \changes{v0.68}{2019/02/26}{\pkg{perpage}: Added.} +% +% \codehtml +% +% \begin{macrocode} +\LWR@ProvidesPackageDrop{perpage}[2014/10/25] +% \end{macrocode} +% +% \begin{macrocode} +\newcommand\AddAbsoluteCounter[1] +{ + \@ifundefined{c@abs#1}{% + \expandafter\newcount\csname c@abs#1\endcsname + \global\value{abs#1}\@ne +% \global\expandafter\let\csname cl@abs#1\endcsname\@empty + \expandafter\xdef\csname theabs#1\endcsname{% +% \noexpand\number \csname c@abs#1\endcsname + }% +% \global\@namedef{c@pabs@#1}{\pp@cl@begin +% \stepcounter{abs#1}% +% \pp@cl@end}% +% \@addtoreset{pabs@#1}{#1} + } + {} +} + +\AddAbsoluteCounter{page} +\def\theabspage{1} + +\newcommand*\MakePerPage[2][1]{% + \ifltxcounter{#2Reset}{% + \setcounter{#2Reset}{#1}% + }{ + +}% +} + +\newcommand*\MakeSorted[1]{} + +\newcommand*\MakeSortedPerPage[2][1]{% + \ifltxcounter{#2Reset}{% + \setcounter{#2Reset}{#1}% + }{ +}% +} + +\newcommand*{\theperpage}{1} +% \end{macrocode} +% +% \iffalse +% +% \fi +% +% +% +% +% +% % \iffalse %<*pfnote> % \fi @@ -56661,6 +57509,35 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf', % % % +% \iffalse +%<*showtags> +% \fi +% +% \part{lwarp-showtags.sty} +% +% \section{showtags} +% +% \DescribePackage{showtags} +% \pkg{showtags} is ignored. +% +% \changes{v0.68}{2019/02/26}{\pkg{showtags}: Added.} +% +% \codehtml +% +% \begin{macrocode} +\LWR@ProvidesPackageDrop{showtags}% no version is given +% \end{macrocode} +% +% \begin{macrocode} +\newcommand{\thecitetag}[1]{} +% \end{macrocode} +% +% \iffalse +% +% \fi +% +% +% % % \iffalse %<*sidecap> @@ -58219,6 +59096,38 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf', % % % +% +% \iffalse +%<*tablefootnote> +% \fi +% +% \part{lwarp-tablefootnote.sty} +% +% \section{tablefootnote} +% +% \DescribePackage{tablefootnote} +% \pkg{tablefootnote} is ignored. +% +% \changes{v0.68}{2018/03/01}{\pkg{tablefootnote}: Added.} +% +% \codehtml +% +% \begin{macrocode} +\LWR@ProvidesPackageDrop{tablefootnote}[2014/01/26] +% \end{macrocode} +% +% This works because in \HTML\ tables are no longer floats. +% \begin{macrocode} +\LetLtxMacro\tablefootnote\footnote +% \end{macrocode} +% +% \iffalse +% +% \fi +% +% +% +% % \iffalse %<*tabls> % \fi @@ -59140,8 +60049,11 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf', % \begin{noindenvironment}{threeparttable} \oarg{alignment} % To emulate threeparttable: +% \changes{v0.68}{2019/03/01}{\pkg{threeparttable}: Fix for caption type.} % \begin{macrocode} -\newenvironment*{threeparttable}[1][b]{}{} +\newenvironment*{threeparttable}[1][b] + {\def\@captype{table}} + {} % \end{macrocode} % \end{noindenvironment} @@ -59180,6 +60092,56 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf', % % % +% +% \iffalse +%<*threeparttablex> +% \fi +% +% \part{lwarp-threeparttablex.sty} +% +% \section{threeparttablex} +% +% \DescribePackage{threeparttablex} +% \pkg{threeparttablex} is patched for use by \pkg{lwarp}. +% +% \limitsthreeparttablex +% +% \changes{v0.68}{2019/03/01}{\pkg{threeparttablex}: Added.} +% +% \codehtml +% +% \begin{macrocode} +\LWR@ProvidesPackagePass{threeparttablex}[2013/07/23] +% \end{macrocode} +% +% The width is guessed depending on the number of columns, then +% limited to a min/max. +% \begin{macrocode} +\renewcommand\insertTableNotes{% + \setlength{\LWR@templengthone}{.375in*\value{LWR@tabletotalLaTeXcols}}% + \setlength{\LWR@templengthone}{\minof{\textwidth}{\LWR@templengthone}}% + \setlength{\LWR@templengthone}{\maxof{2.5in}{\LWR@templengthone}}% + \multicolumn{\value{LWR@tabletotalLaTeXcols}}{c}{% + \parbox{\LWR@templengthone}{% + \begin{tablenotes}[\TPTL@optarg]% + \TPTL@font% + \TPTL@body% + \end{tablenotes}% + }% + }% +} + +\renewcommand\TPTL@tnotex[2]{\tnote{\nameref{#2}}} +% \end{macrocode} +% +% \iffalse +% +% \fi +% +% +% +% +% % \iffalse %<*thumb> % \fi @@ -61236,9 +62198,9 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf', % \subsection{Combining \cs{newfloat}, \cs{trivfloat}, and \pkg{algorithmicx}} % \label{sec:combiningfloats} -% \gindex{newfloat=\pkg{newfloat}>with \pkg{trivfloat}, \pkg{algorithmic}} -% \gindex{trivfloat=\pkg{trivfloat}>with \pkg{newfloat}, \pkg{algorithmic}} -% \gindex{algorithmic=\pkg{algorithmic}>with \pkg{newfloat}, \pkg{trivfloat}} +% \gindex{newfloat=\pkg{newfloat}>with \pkg{trivfloat}, \pkg{algorithmicx}} +% \gindex{trivfloat=\pkg{trivfloat}>with \pkg{newfloat}, \pkg{algorithmicx}} +% \gindex{algorithmicx=\pkg{algorithmicx}>with \pkg{newfloat}, \pkg{trivfloat}} % % \codeall % \begin{macrocode} diff --git a/Master/texmf-dist/source/latex/lwarp/lwarp.ins b/Master/texmf-dist/source/latex/lwarp/lwarp.ins index 133823ea3a4..9eefa717f23 100644 --- a/Master/texmf-dist/source/latex/lwarp/lwarp.ins +++ b/Master/texmf-dist/source/latex/lwarp/lwarp.ins @@ -71,6 +71,7 @@ version 2005/12/01 or later. \file{lwarp-biblatex.sty}{\from{lwarp.dtx}{biblatex}} \file{lwarp-bibunits.sty}{\from{lwarp.dtx}{bibunits}} \file{lwarp-bigdelim.sty}{\from{lwarp.dtx}{bigdelim}} +\file{lwarp-bigfoot.sty}{\from{lwarp.dtx}{bigfoot}} \file{lwarp-bigstrut.sty}{\from{lwarp.dtx}{bigstrut}} \file{lwarp-bitpattern.sty}{\from{lwarp.dtx}{bitpattern}} \file{lwarp-blowup.sty}{\from{lwarp.dtx}{blowup}} @@ -170,6 +171,7 @@ version 2005/12/01 or later. \file{lwarp-fontawesome5.sty}{\from{lwarp.dtx}{fontawesome5}} \file{lwarp-footmisc.sty}{\from{lwarp.dtx}{footmisc}} \file{lwarp-footnote.sty}{\from{lwarp.dtx}{footnote}} +\file{lwarp-footnotebackref.sty}{\from{lwarp.dtx}{footnotebackref}} \file{lwarp-footnotehyper.sty}{\from{lwarp.dtx}{footnotehyper}} \file{lwarp-footnoterange.sty}{\from{lwarp.dtx}{footnoterange}} \file{lwarp-fontenc.sty}{\from{lwarp.dtx}{fontenc}} @@ -210,6 +212,7 @@ version 2005/12/01 or later. \file{lwarp-keyfloat.sty}{\from{lwarp.dtx}{keyfloat}} \file{lwarp-layaureo.sty}{\from{lwarp.dtx}{layaureo}} \file{lwarp-layout.sty}{\from{lwarp.dtx}{layout}} +\file{lwarp-layouts.sty}{\from{lwarp.dtx}{layouts}} \file{lwarp-leading.sty}{\from{lwarp.dtx}{leading}} \file{lwarp-letterspace.sty}{\from{lwarp.dtx}{letterspace}} \file{lwarp-lettrine.sty}{\from{lwarp.dtx}{lettrine}} @@ -229,6 +232,7 @@ version 2005/12/01 or later. \file{lwarp-luatodonotes.sty}{\from{lwarp.dtx}{luatodonotes}} \file{lwarp-magaz.sty}{\from{lwarp.dtx}{magaz}} \file{lwarp-makeidx.sty}{\from{lwarp.dtx}{makeidx}} +\file{lwarp-manyfoot.sty}{\from{lwarp.dtx}{manyfoot}} \file{lwarp-marginal.sty}{\from{lwarp.dtx}{marginal}} \file{lwarp-marginfit.sty}{\from{lwarp.dtx}{marginfit}} \file{lwarp-marginfix.sty}{\from{lwarp.dtx}{marginfix}} @@ -258,6 +262,7 @@ version 2005/12/01 or later. \file{lwarp-needspace.sty}{\from{lwarp.dtx}{needspace}} \file{lwarp-nextpage.sty}{\from{lwarp.dtx}{nextpage}} \file{lwarp-nicefrac.sty}{\from{lwarp.dtx}{nicefrac}} +\file{lwarp-niceframe.sty}{\from{lwarp.dtx}{niceframe}} \file{lwarp-nomencl.sty}{\from{lwarp.dtx}{nomencl}} \file{lwarp-nonfloat.sty}{\from{lwarp.dtx}{nonfloat}} \file{lwarp-nonumonpart.sty}{\from{lwarp.dtx}{nonumonpart}} @@ -284,6 +289,7 @@ version 2005/12/01 or later. \file{lwarp-pdfsync.sty}{\from{lwarp.dtx}{pdfsync}} \file{lwarp-pdftricks.sty}{\from{lwarp.dtx}{pdftricks}} \file{lwarp-pdfx.sty}{\from{lwarp.dtx}{pdfx}} +\file{lwarp-perpage.sty}{\from{lwarp.dtx}{perpage}} \file{lwarp-pfnote.sty}{\from{lwarp.dtx}{pfnote}} \file{lwarp-phfqit.sty}{\from{lwarp.dtx}{phfqit}} \file{lwarp-pifont.sty}{\from{lwarp.dtx}{pifont}} @@ -336,6 +342,7 @@ version 2005/12/01 or later. \file{lwarp-shadow.sty}{\from{lwarp.dtx}{shadow}} \file{lwarp-showidx.sty}{\from{lwarp.dtx}{idx}} \file{lwarp-showkeys.sty}{\from{lwarp.dtx}{showkeys}} +\file{lwarp-showtags.sty}{\from{lwarp.dtx}{showtags}} \file{lwarp-sidecap.sty}{\from{lwarp.dtx}{sidecap}} \file{lwarp-sidenotes.sty}{\from{lwarp.dtx}{sidenotes}} \file{lwarp-SIunits.sty}{\from{lwarp.dtx}{SIunits}} @@ -355,6 +362,7 @@ version 2005/12/01 or later. \file{lwarp-supertabular.sty}{\from{lwarp.dtx}{supertabular}} \file{lwarp-syntonly.sty}{\from{lwarp.dtx}{syntonly}} \file{lwarp-tabls.sty}{\from{lwarp.dtx}{tabls}} +\file{lwarp-tablefootnote.sty}{\from{lwarp.dtx}{tablefootnote}} \file{lwarp-tabularx.sty}{\from{lwarp.dtx}{tabularx}} \file{lwarp-tabulary.sty}{\from{lwarp.dtx}{tabulary}} \file{lwarp-tascmac.sty}{\from{lwarp.dtx}{tascmac}} @@ -366,6 +374,7 @@ version 2005/12/01 or later. \file{lwarp-thinsp.sty}{\from{lwarp.dtx}{thinsp}} \file{lwarp-threadcol.sty}{\from{lwarp.dtx}{threadcol}} \file{lwarp-threeparttable.sty}{\from{lwarp.dtx}{threeparttable}} +\file{lwarp-threeparttablex.sty}{\from{lwarp.dtx}{threeparttablex}} \file{lwarp-thumb.sty}{\from{lwarp.dtx}{thumb}} \file{lwarp-thumbs.sty}{\from{lwarp.dtx}{thumbs}} \file{lwarp-tikz.sty}{\from{lwarp.dtx}{tikz}} -- cgit v1.2.3