summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/lwarp
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-01-30 21:05:29 +0000
committerKarl Berry <karl@freefriends.org>2018-01-30 21:05:29 +0000
commit83e0b95d2f78cf405abe952e383dcd0d986eee66 (patch)
tree322c558d9417cafdf345ae56b31ef814ac057e72 /Master/texmf-dist/source/latex/lwarp
parent1b674ef86fe17b1011f19a929dfd82253eb90995 (diff)
lwarp (30jan18)
git-svn-id: svn://tug.org/texlive/trunk@46495 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/lwarp')
-rw-r--r--Master/texmf-dist/source/latex/lwarp/lwarp.dtx1150
-rw-r--r--Master/texmf-dist/source/latex/lwarp/lwarp.ins9
2 files changed, 871 insertions, 288 deletions
diff --git a/Master/texmf-dist/source/latex/lwarp/lwarp.dtx b/Master/texmf-dist/source/latex/lwarp/lwarp.dtx
index bba769cc09e..f56128ea9d4 100644
--- a/Master/texmf-dist/source/latex/lwarp/lwarp.dtx
+++ b/Master/texmf-dist/source/latex/lwarp/lwarp.dtx
@@ -16,7 +16,7 @@
% \iffalse
%<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
%<package>\ProvidesPackage{lwarp}
-%<package> [2018/01/23 v0.46 Allows LaTeX to directly produce HTML5 output.]
+%<package> [2018/01/30 v0.47 Allows LaTeX to directly produce HTML5 output.]
%
%<*driver>
\documentclass{ltxdoc}
@@ -890,6 +890,10 @@ only the first and last is copy/pasted, as a range.
No tags are listed inside a starred \AmS\ environment, although the \cs{tag}
macro will still appear inside the \LaTeX\ math expression.
+SVG math does not work inside \TeX\ boxes, since a \cs{newpage} is required
+\watchout[SVG math in \TeX\ boxes]
+before and after each image.
+
\subsubsection{MathJax option}
The popular MathJax alternative (\url{mathjax.org}) may be used to display math.
@@ -1641,6 +1645,17 @@ Footnotes are currently placed at the bottom of the \HTML\ page.
}
\newcommand{\limitscaption}{%
+To pass options to caption, select the options before loading \pkg{lwarp}:
+\begin{sourcedisplay}
+\cs{documentclass}\{article\} \\
+\dots \\
+\cs{PassOptionsToPackage}\{options\_list\}\{caption\} \\
+\dots \\
+\cs{usepackage\{lwarp\}} \\
+\dots \\
+\cs{usepackage\{caption\}}
+\end{sourcedisplay}\watchout[options]
+
To ensure proper float numbering, set caption positions
such as:
\begin{sourcedisplay}
@@ -1863,7 +1878,7 @@ This boolean may be tested by the user for later use.
%<*package>
% \fi
%
-% \CheckSum{19275}
+% \CheckSum{19653}
%
% \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
@@ -1951,6 +1966,7 @@ This boolean may be tested by the user for later use.
% \changes{v0.44}{2017/11/22}{\ 2017/11/22}
% \changes{v0.45}{2018/01/14}{\ 2018/01/14}
% \changes{v0.46}{2018/01/23}{\ 2018/01/23}
+% \changes{v0.47}{2018/01/30}{\ 2018/01/30}
@@ -2110,12 +2126,12 @@ This boolean may be tested by the user for later use.
% To make a contribution: \hfill
% \href{https://www.tug.org/donate.html}{\texttt{https://www.tug.org/donate.html}}
%
-% For users of MiK\TeX: \hfill
-% \href{https://miktex.org/donations.html}{\texttt{https://miktex.org/donations.html}}
-%
% For country-specific \TeX\ users groups: \hfill
% \href{http://tug.org/usergroups.html}{\texttt{http://tug.org/usergroups.html}}
%
+% For users of MiK\TeX: \hfill
+% \href{https://miktex.org/donations.html}{\texttt{https://miktex.org/donations.html}}
+%
% \endgroup
%
% \clearpage
@@ -2142,13 +2158,20 @@ This boolean may be tested by the user for later use.
% For a detailed list of changes, see the Change History on page \pageref{sec:changehistory}.
%
% \begin{description}
+% \item[v0.47:] \
+% \begin{itemize}
+% \item Improved \SVG\ math baseline and sizing.
+% \item Fixes: \SVG math in captions, subcaptions, \cs{nameref}.
+% \item Fixes: Line wrap at hyphen in \HTML\ output.
+% \item Added \pkg{endheads}, \pkg{multitoc}, \pkg{sectionbreak},
+% \pkg{blowup}, \pkg{xurl}.
+% \end{itemize}
% \item[v0.46:] \
% \begin{itemize}
% \item \cs{PrintStack} changed to \cs{LWRPrintStack}.\watchout[name change]
% \item Fix: Empty lines between \env{tabular} rows.\margintag{misc. fixes}
% \item Fix: Stack unnesting.
-% \item Fix: SVG math and \env{lateximage}s in numerous situations
-% (but still more to do).
+% \item Fix: SVG math and \env{lateximage}s in numerous situations.
% \item Fix: Spaces in \cs{usepackage}.
% \item Fix: Now allows MathJax inside \env{verse}.
% \end{itemize}
@@ -2937,18 +2960,18 @@ This boolean may be tested by the user for later use.
% \pkg{preview},
% \pkg{draftwatermark}, \pkg{watermark},
% \pkg{everyshi}, \pkg{atbegshi}, \pkg{continue}, \pkg{fwlw}, \pkg{turnthepage},
-% \pkg{pagesel}. \\
+% \pkg{pagesel}, \pkg{blowup}. \\
%
% Sectioning: & Supported, with hyperlinks.
% Adds \cmds{FileDepth} for splitting the \HTML\ output.
% Files may be numbered sequentially or named according to section name.
% Common short words and punctuation is removed from the filenames.
% Emulates \pkg{titlesec}, \pkg{fncychap}, \pkg{sectsty}, \pkg{section},
-% \pkg{anonchap}, \pkg{quotchap}. \\
+% \pkg{anonchap}, \pkg{quotchap}, \pkg{sectionbreak}. \\
%
% Table of contents, figures, tables: & Supported, with hyperlinks.
% Supports \pkg{tocbibind}. Emulates \pkg{titletoc}, \pkg{tocloft},
-% \pkg{tocbasic}, and \pkg{tocstyle}. \\
+% \pkg{tocbasic}, and \pkg{tocstyle}, \pkg{multitoc}. \\
%
% Title page: & \cs{maketitle}, \env{titlepage}, \pkg{titling}, \pkg{authblk}. \\
%
@@ -2964,7 +2987,7 @@ This boolean may be tested by the user for later use.
%
% Cross-references: & Emulated, with hyperlinks.
% \pkg{hyperref}, \pkg{cleveref}, \pkg{varioref}, \pkg{fancyref}, \pkg{prettyref},
-% \pkg{titleref}, \pkg{url}, \pkg{breakurl}. \\
+% \pkg{titleref}, \pkg{url}, \pkg{breakurl}, \pkg{xurl}. \\
%
% Languages: & \pkg{babel}. (\pkg{polyglossia} is untested.) \\
%
@@ -2974,7 +2997,8 @@ This boolean may be tested by the user for later use.
%
% Footnotes: & Adds \cmds{FootnoteDepth} to print footnotes at section breaks.
% \pkg{footnote}, \pkg{footmisc},
-% \pkg{marginnote}, \pkg{sidenote}, \pkg{pagenote}, \pkg{endnotes}, \pkg{footnpag}. \\
+% \pkg{marginnote}, \pkg{sidenote}, \pkg{pagenote},
+% \pkg{endnotes}, \pkg{endheads}, \pkg{footnpag}. \\
%
% \midrule
%
@@ -6078,7 +6102,11 @@ This boolean may be tested by the user for later use.
% \section{Modifying \pkg{lwarp}}
% \pagestyle{pageheadfoot}
%
-% To quickly find a package in |lwarp.dtx|, search for |*packagename|.
+% To quickly find the source for a package in |lwarp.dtx|, search for |*packagename|,
+% such as |*siunitx|.
+%
+% Likewise, to quickly find the source for a file in |lwarp.dtx|,
+% search for |*filename|, such as |*lwarp.css|.
%
% Purely text-based packages probably will work as-is when generating
% \HTML.
@@ -6092,6 +6120,10 @@ This boolean may be tested by the user for later use.
% To create a custom \HTML\ block or inline \CSS\ class,
% see \cref{sec:highlevelclasses}.
%
+% Any \TeX\ boxes must be undone, as \SVG\ math or \env{lateximage}s
+% \watchout[\TeX\ boxes]
+% require \cs{newpage}, which will not work in a \TeX\ box.
+%
% \subsection{Creating an \pkg{lwarp} version of a package}
%
% When creating \HTML,
@@ -6124,6 +6156,7 @@ This boolean may be tested by the user for later use.
% will not need to be emulated for \HTML\ output. Only the ``user-facing''
% macros need to be nullified or emulated.
%
+% \needspace{10\baselineskip}
% Each |lwarp-| package should first call either
% \begin{sourcedisplay}
% \cs{LWR@ProvidesPackageDrop}
@@ -6274,9 +6307,15 @@ This boolean may be tested by the user for later use.
% \index{warning>Leaders not followed by proper glue.}
% \index{Leaders not followed by proper glue.}
%
-% \item [``Improper \cs{prevdepth}'':] (Associated with \cs{LWR@orignewpage}.)
-% Something tried to use
-% \cs{ensuremath} where \pkg{lwarp} then tried to create a \env{lateximage}.
+% \item [``Improper \cs{prevdepth}'':]
+% \env{lateximage}s and \SVG\ math require \cs{newpage}, which
+% cannot work inside \TeX\ boxes or \cs{ensuremath}.
+% Anything using \cs{newsavebox}, \cs{newbox}, \env{lrbox},
+% \cs{savebox}, \cs{hbox}, \cs{vbox}, \cs{usebox}, \cs{sbox},
+% etc., must be modified to work without box commands.
+%
+% \medskip
+%
% If you can locate what used \cs{ensuremath}, have it temporarily set:
% \begin{sourcedisplay}
% \cs{LetLtxMacro}\cs{@ensuredmath}\cs{LWR@origensuredmath}
@@ -6623,6 +6662,14 @@ This boolean may be tested by the user for later use.
% \end{macro}
%
%
+% Prints a length in the given units, without printing the unit itself.
+% \begin{macro}{LWR@convertto} \marg{dest unit} \marg{length}
+% \begin{macrocode}
+\newcommand*{\LWR@convertto}[2]{\strip@pt\dimexpr #2*65536/\number\dimexpr 1#1}
+% \end{macrocode}
+% \end{macro}
+
+%
%
% \section{Early package requirements}
%
@@ -7189,12 +7236,14 @@ For a possible alternative, see package(s) #2.}
\LWR@loadafter{balance}
\LWR@loadafter{bigdelim}
\LWR@loadafter{bigstrut}
+\LWR@loadafter{blowup}
\LWR@loadafter{bookmark}
\LWR@notmemoirloadafter{booktabs}
\LWR@loadafter{boxedminipage}
\LWR@loadafter{boxedminipage2e}
\LWR@loadafter{breakurl}
\LWR@loadafter{cancel}
+\LWR@loadafter{caption}
\LWR@notmemoirloadafter{ccaption}
\LWR@loadafter{changebar}
\LWR@notmemoirloadafter{changepage}
@@ -7214,6 +7263,7 @@ For a possible alternative, see package(s) #2.}
\LWR@loadafter{ellipsis}
\LWR@loadafter{emptypage}
\LWR@loadafter{endfloat}
+\LWR@loadafter{endheads}
\LWR@loadafter{endnotes}
\LWR@notmemoirloadafter{enumerate}
\LWR@loadafter{enumitem}
@@ -7289,6 +7339,7 @@ For a possible alternative, see package(s) #2.}
\LWR@notmemoirloadafter{mparhack}
%\LWR@loadafter{multicol}% loaded by ltxdoc
\LWR@loadafter{multirow}
+\LWR@loadafter{multitoc}
\LWR@loadafter{nameref}
\LWR@loadafter{natbib}
\LWR@notmemoirloadafter{needspace}
@@ -7328,6 +7379,7 @@ For a possible alternative, see package(s) #2.}
\LWR@loadafter{scrlayer-notecolumn}
\LWR@loadafter{scrlayer-scrpage}
\LWR@loadafter{section}
+\LWR@loadafter{sectionbreak}
\LWR@loadafter{sectsty}
\LWR@notmemoirloadafter{setspace}
\LWR@loadafter{shadow}
@@ -7382,6 +7434,7 @@ For a possible alternative, see package(s) #2.}
\LWR@loadafter{xltxtra}
\LWR@loadafter{xmpincl}
\LWR@loadafter{xtab}
+\LWR@loadafter{xurl}
\LWR@loadafter{zwpagelayout}
% \end{macrocode}
@@ -7800,15 +7853,9 @@ top=1in,bottom=1in,%
\RequirePackage{newfloat}
% \end{macrocode}
-% \DescribePackage{caption}
-% \begin{macrocode}
-\RequirePackage{caption}
-% \end{macrocode}
-
% \changes{v0.24}{2017/03/06}{No longer preloads \pkg{subcaption};
% conflicted with \pkg{subfig}.}
-
% \begin{macrocode}
\end{warpHTML}
% \end{macrocode}
@@ -7927,9 +7974,7 @@ top=1in,bottom=1in,%
% The original name with blanks is in |LWR@strresult| and
% the final name with no blanks goes into |LWR@strresulttwo|.
% \begin{macrocode}
-\LWR@traceinfo{LWR@lookforpackagename with blanks: !\LWR@strresult!}%
\StrSubstitute[100]{\LWR@strresult}{ }{}[\LWR@strresulttwo]%
-\LWR@traceinfo{LWR@lookforpackagename without blanks: !\LWR@strresulttwo!}%
% \end{macrocode}
% See if the package name was found:
% \begin{macrocode}
@@ -8047,6 +8092,25 @@ top=1in,bottom=1in,%
% \end{macrocode}
+% \section{Additional required packages}
+
+% \codehtml
+% \begin{macrocode}
+\begin{warpHTML}
+% \end{macrocode}
+
+% \DescribePackage{caption}
+% \changes{v0.47}{2018/01/29}{\pkg{caption}: Also loads \pkg{lwarp-caption}.}
+% \begin{macrocode}
+\RequirePackage{caption}%
+% \end{macrocode}
+
+% \begin{macrocode}
+\end{warpHTML}
+% \end{macrocode}
+
+
+
% \section{File handles}
@@ -8114,9 +8178,9 @@ top=1in,bottom=1in,%
% \begin{macro}{\@include} \marg{filename} Modified to load |_html_inc| files.
% \begin{macrocode}
\def\@include#1 {%
-\immediate\openout\LWR@quickfile #1_html_inc.tex% new
-\immediate\write\LWR@quickfile{\string\input{#1.tex}}% new
-\immediate\closeout\LWR@quickfile% new
+\immediate\openout\LWR@quickfile #1_html_inc.tex% lwarp
+\immediate\write\LWR@quickfile{\string\input{#1.tex}}% lwarp
+\immediate\closeout\LWR@quickfile% lwarp
\LWR@origclearpage% \changed
\if@filesw
\immediate\write\@mainaux{\string\@input{#1_html_inc.aux}}% changed
@@ -8781,6 +8845,7 @@ homehtmlfilename = "\HomeHTMLFilename"%
% \texttt{marginpar} and \texttt{marginblock}.}
% \changes{v0.30}{2017/04/26}{Fix: \protect\texttt{*.css} files only written in print mode.}
%
+% ^^A *lwarp.css
% \begin{macrocode}
\begin{warpprint}
\begin{filecontents*}{lwarp.css}
@@ -10136,6 +10201,7 @@ nav.botnavigation { display:none; }
% If used, this must be present both when compiling the project
% and also when distributing the \HTML\ files.
%
+% ^^A *lwarp_sagebrush.css
% \begin{macrocode}
\begin{warpprint}
\begin{filecontents*}{lwarp_sagebrush.css}
@@ -10275,14 +10341,14 @@ div.sidebartitle{
text-shadow: 1px 1px 2px #808080;
}
-
-
div.minipage {
background-color: #eeeee7 ;
border: 1px solid silver ;
border-radius: 1ex ;
}
+div.framebox div.minipage {border:none ; background:none}
+
section.textbody > div.minipage {
box-shadow: 3px 3px 3px #808080 ;
}
@@ -10398,6 +10464,7 @@ nav.sidetoc a:hover {
% If used, this must be present both when compiling the project
% and also when distributing the \HTML\ files.
%
+% ^^A *lwarp_formal.css
% \begin{macrocode}
\begin{warpprint}
\begin{filecontents*}{lwarp_formal.css}
@@ -10620,6 +10687,7 @@ nav.botnavigation {
% If used, this must be present both when compiling the project
% and also when distributing the \HTML\ files.
%
+% ^^A *sample_project.css
% \begin{macrocode}
\begin{warpprint}
\begin{filecontents*}{sample_project.css}
@@ -10653,6 +10721,7 @@ nav.botnavigation {
% \changes{v0.30}{2017/04/28}{File: \protect\texttt{lwarp\_html.xdy} renamed to \protect\texttt{lwarp.xdy}.}
% \changes{v0.30}{2017/04/26}{Fix: \protect\texttt{lwarp.xdy} only written in print mode.}
%
+% ^^A *lwarp.xdy
% \begin{macrocode}
\begin{warpprint}
\begin{filecontents*}{lwarp.xdy}
@@ -10696,6 +10765,7 @@ nav.botnavigation {
% \changes{v0.45}{2018/01/23}{File: \protect\texttt{lwarp\_mathjax.txt}: Allow MathJax inside \env{verse}.}
%
%
+% ^^A *lwarp_mathjax.txt
% \begin{macrocode}
\begin{warpprint}
\begin{filecontents*}{lwarp_mathjax.txt}
@@ -10828,7 +10898,9 @@ src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.1/MathJax.js?config=TeX-
% due to \protect\texttt{luatex} changes.}
% \changes{v0.37}{2017/08/19}{\protect\texttt{lwarpmk}: Removes additional \HTML\ \protect\texttt{aux} files.}
% \changes{v0.38}{2017/08/24}{\protect\texttt{lwarpmk}: Added print1 and html1 actions.}
+% \changes{v0.47}{2018/01/24}{\protect\texttt{lwarpmk}: pdfcrop: Removed hires option for improved crop accuracy.}
%
+% ^^A *lwarpmk.lua
% \begin{macrocode}
\begin{filecontents*}{lwarpmk.lua}
#!/usr/bin/env texlua
@@ -10837,7 +10909,7 @@ src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.1/MathJax.js?config=TeX-
-- Print the usage of the lwarpmk command:
-printversion = "v0.46"
+printversion = "v0.47"
function printhelp ()
print ("lwarpmk: Use lwarpmk -h or lwarpmk --help for help.") ;
@@ -11122,7 +11194,7 @@ err = os.execute(
lwimgpage .. " " .. sourcename .."_html.pdf lateximagetemp-%d.pdf")
-- Crop the image:
err = os.execute(
-"pdfcrop --hires lateximagetemp-" .. lwimgpage ..".pdf lateximage-" .. lwimgnum ..".pdf")
+"pdfcrop lateximagetemp-" .. lwimgpage ..".pdf lateximage-" .. lwimgnum ..".pdf")
if ( err ~= 0 ) then print ( "lwarpmk: File error.") ; os.exit(1) ; end
-- Convert the image to svg:
err = os.execute(
@@ -12357,6 +12429,7 @@ end -- not --version
%
% \begin{macro}{\LWR@htmlopencomment}
% \begin{macro}{\LWR@htmlclosecomment}
+% \changes{v0.47}{2018/01/25}{Add \cs{mbox} to prevent line breaks.}
% \begin{macrocode}
\newcommand*{\LWR@htmlopencomment}{%
{%
@@ -12364,7 +12437,7 @@ end -- not --version
\begingroup%
\LWR@FBcancel%
\ifmmode\else\protect\LWR@origttfamily\fi%
-\LWR@origtextless{}!{-}{-}%
+\mbox{\LWR@origtextless{}!{-}{-}}%
\endgroup%
}%
}
@@ -12375,7 +12448,7 @@ end -- not --version
\begingroup%
\LWR@FBcancel%
\ifmmode\else\protect\LWR@origttfamily\fi%
-{-}{-}\LWR@origtextgreater{}%
+\mbox{{-}{-}\LWR@origtextgreater}%
\endgroup%
}%
}
@@ -12629,6 +12702,7 @@ end -- not --version
% These are often used when |\ifbool{FormatWP}|.
%
% \changes{v0.42}{2017/10/26}{Added to factor code.}
+% \changes{v0.47}{2018/01/26}{Fix: Line wrap at \HTML\ hyphen.}
%
% \codehtml
% \begin{macrocode}
@@ -12641,7 +12715,7 @@ end -- not --version
\addtocounter{LWR@thisautoidWP}{1}%
\LWR@htmltag{%
div class="#3" %
- id="autoidWP-\arabic{LWR@thisautoidWP}"%
+ id="\mbox{autoidWP-\arabic{LWR@thisautoidWP}}"%
\ifblank{#1}{}{ style="#1"}%
}%
}% FormatWP
@@ -14137,9 +14211,10 @@ end -- not --version
% \begin{macro}{\LWR@createautosec} \marg{section type}
%
% Create an autosection tag.
+% \changes{v0.47}{2018/01/26}{Fix: Line wrap at \HTML\ hyphen.}
% \begin{macrocode}
\newcommand*{\LWR@createautosec}[1]{%
-\LWR@htmltag{#1 id="autosec-\arabic{page}"}%
+\LWR@htmltag{#1 id="\mbox{autosec-\arabic{page}}"}%
}
% \end{macrocode}
% \end{macro}
@@ -14977,6 +15052,13 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
\catcode`\$=\active
% \end{macrocode}
%
+% Required for \cs{nameref} to work with \SVG\ math:
+% \changes{v0.47}{2018/01/25}{Fix for \SVG\ math in \cs{nameref}.}
+% \begin{macrocode}
+\immediate\write\@mainaux{\catcode`\string$\active}%
+\LetLtxMacro\LWR@syntaxhighlightone$% balance for editor syntax highlighting
+% \end{macrocode}
+%
% Allow \HTML\ paragraphs to begin:
% \begin{macrocode}
\LWR@startpars
@@ -16153,11 +16235,20 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
% \end{macrocode}
-% The following may be locally redefined by \env{enumerate} or \env{description}.
+% \begin{macro}{\LWR@printcloselist}
+% May be locally redefined by \env{enumerate} or \env{description}.
% \begin{macrocode}
\newcommand*{\LWR@printcloselist}{\LWR@printcloseitemize}
-\newcommand*{\LWR@printopenlist}{ul style="list-style-type:none"}
% \end{macrocode}
+% \end{macro}
+
+% \begin{macro}{\LWR@printopenlist}
+% May be locally redefined by \env{enumerate} or \env{description}.
+% \changes{v0.47}{2018/01/26}{Fix: Line wrap at \HTML\ hyphen.}
+% \begin{macrocode}
+\newcommand*{\LWR@printopenlist}{ul style="\mbox{list-style-type:none}"}
+% \end{macrocode}
+% \end{macro}
% ^^A \begin{macro}{\LWR@@labels} \pkg{lwarp} replacement for \cs{\@labels}.
@@ -16380,10 +16471,11 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
% \end{macro}
% \begin{environment}{itemize} \oarg{options}
+% \changes{v0.47}{2018/01/26}{Fix: Line wrap at \HTML\ hyphen.}
% \begin{macrocode}
\newcommand*{\LWR@itemizestart}{%
\renewcommand*{\LWR@printcloselist}{\LWR@printcloseitemize}
-\renewcommand*{\LWR@printopenlist}{ul style="list-style-type:none"}
+\renewcommand*{\LWR@printopenlist}{ul style="\mbox{list-style-type:none}"}
\let\item\LWR@itemizeitem%
}
% \end{macrocode}
@@ -16396,10 +16488,11 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
% An \HTML\ unordered list is used with customized \LaTeX-generated labels.
% \begin{environment}{enumerate} \oarg{options}
+% \changes{v0.47}{2018/01/26}{Fix: Line wrap at \HTML\ hyphen.}
% \begin{macrocode}
\newcommand*{\LWR@enumeratestart}{%
\renewcommand*{\LWR@printcloselist}{\LWR@printcloseitemize}
-\renewcommand*{\LWR@printopenlist}{ul style="list-style-type:none"}
+\renewcommand*{\LWR@printopenlist}{ul style="\mbox{list-style-type:none}"}
\let\item\LWR@itemizeitem%
}
% \end{macrocode}
@@ -17937,6 +18030,7 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
% \begin{macrocode}
\newlength{\LWR@templengthone}%
\newlength{\LWR@templengthtwo}%
+\newlength{\LWR@templengththree}%
% \end{macrocode}
@@ -18084,10 +18178,11 @@ link rel="stylesheet" type="text/css" href="\LWR@currentcss" /}%
% \begin{macro}{\LWR@WPcell} \marg{text-align} \marg{vertical-align}
+% \changes{v0.47}{2018/01/26}{Fix: Line wrap at \HTML\ hyphen.}
% \begin{macrocode}
\newcommand*{\LWR@WPcell}[2]{%
\LWR@tdaddstyle%
-text-align:#1; vertical-align:#2%
+\mbox{text-align:#1}; \mbox{vertical-align:#2}%
}
% \end{macrocode}
% \end{macro}
@@ -18364,10 +18459,11 @@ text-align:#1; vertical-align:#2%
rowspan="#2" %
% \end{macrocode}
%
+% \changes{v0.47}{2018/01/26}{Fix: Line wrap at \HTML\ hyphen.}
% \begin{macrocode}
\IfValueT{#1}{% vpos?
-\ifstrequal{#1}{b}{style="vertical-align:bottom" }{}%
-\ifstrequal{#1}{t}{style="vertical-align:top" }{}%
+\ifstrequal{#1}{b}{style="\mbox{vertical-align:bottom}" }{}%
+\ifstrequal{#1}{t}{style="\mbox{vertical-align:top}" }{}%
}% vpos?
}% rows?
% \end{macrocode}
@@ -19542,7 +19638,9 @@ rowspan="#2" %
% Returns the file number for this label:
% \begin{macrocode}
\newcommand*{\LWR@htmlfileref}[1]{%
-% DO NOT USE \LWR@traceinfo HERE! Will be expanded.
+% \end{macrocode}
+% DO NOT USE \cs{LWR@traceinfo} HERE! Will be expanded.
+% \begin{macrocode}
\LWR@spref{#1}{zLWR@htmlfilenumber}%
}
% \end{macrocode}
@@ -19605,6 +19703,7 @@ rowspan="#2" %
{% not lateximage
% \end{macrocode}
% If not doing a lateximage, create an \HTML\ ID tag:
+% \changes{v0.47}{2018/01/26}{Fix: Line wrap at \HTML\ hyphen.}
% (To be factored\dots)
% \begin{macrocode}
\LWR@sanitize{#1}%
@@ -19612,16 +19711,16 @@ rowspan="#2" %
{% pars allowed
\ifbool{LWR@doingapar}%
{% par started
- \LWR@htmltag{a id="\LWR@sanitized"}\LWR@htmltag{/a}%
+ \LWR@htmltag{a \mbox{id="\LWR@sanitized"}}\LWR@htmltag{/a}%
}% par started
{% par not started
\LWR@stoppars%
- \LWR@htmltag{a id="\LWR@sanitized"}\LWR@htmltag{/a}%
+ \LWR@htmltag{a \mbox{id="\LWR@sanitized"}}\LWR@htmltag{/a}%
\LWR@startpars%
}% par not started
}% pars allowed
{% pars not allowed
- \LWR@htmltag{a id="\LWR@sanitized"}\LWR@htmltag{/a}%
+ \LWR@htmltag{a \mbox{id="\LWR@sanitized"}}\LWR@htmltag{/a}%
}% pars not allowed
}% not lateximage
}
@@ -19675,6 +19774,7 @@ rowspan="#2" %
% Open an \HTML\ tag reference to a filename, \# character, and a label.
%
% \changes{v0.28}{2017/04/13}{Removed space.}
+% \changes{v0.47}{2018/01/26}{Fix: Line wrap at \HTML\ hyphen.}
%
% \begin{macrocode}
\newcommand*{\LWR@startref}[1]
@@ -19687,7 +19787,7 @@ rowspan="#2" %
% \begin{macrocode}
\LWR@htmltag{a href="%
\LWR@traceinfo{LWR@startref B}%
-\LWR@htmlrefsectionfilename{#1}%
+\mbox{\LWR@htmlrefsectionfilename{#1}}%
\LWR@traceinfo{LWR@startref C}%
\#%
% \end{macrocode}
@@ -19723,7 +19823,7 @@ rowspan="#2" %
% \cs{detokenize} is used to allow underscores in the labels:
% \changes{v0.45}{2017/12/01}{Fix: Labels with underscores.}
% \begin{macrocode}
- \LWR@sanitized%
+ \mbox{\LWR@sanitized}%
}%
}%
\LWR@traceinfo{LWR@startref E}%
@@ -19798,14 +19898,14 @@ rowspan="#2" %
%
% \changes{v0.43}{2017/10/31}{Made robust.}
% \begin{macrocode}
-\DeclareRobustCommand*{\nameref}[1]{%
-\LWR@traceinfo{nameref A}%
+\newrobustcmd*{\nameref}[1]{%
+\LWR@traceinfo{nameref}%
\LWR@startref{#1}%
\LWR@traceinfo{nameref B}%
\LWR@nameref{#1}%
\LWR@traceinfo{nameref C}%
\LWR@htmltag{/a}%
-\LWR@traceinfo{nameref D}%
+\LWR@traceinfo{nameref: done}%
}
% \end{macrocode}
% \end{macro}
@@ -20051,8 +20151,9 @@ autopage-\theLWR@currentautosec%
% \end{macrocode}
% Open an \HTML\ |figure| tag:
% \changes{v0.42}{2017/10/26}{If \protect\texttt{FormatWP} add a text frame.}
+% \changes{v0.47}{2018/01/26}{Fix: Line wrap at \HTML\ hyphen.}
% \begin{macrocode}
-\LWR@htmltag{figure id="autoid-\arabic{LWR@thisautoid}" class="#1"}%
+\LWR@htmltag{figure id="\mbox{autoid-\arabic{LWR@thisautoid}}" class="#1"}%
\ifbool{FormatWP}{%
\LWR@orignewline%
\LWR@BlockClassWP{}{}{wp#1}%
@@ -20146,11 +20247,12 @@ autopage-\theLWR@currentautosec%
% \begin{macro}{\LWR@newautoidanchor}
% Adds a new \element{autoid} anchor.
% \changes{v0.45}{2017/12/07}{Fix: No anchor if frozen autoid.}
+% \changes{v0.47}{2018/01/26}{Fix: Line wrap at \HTML\ hyphen.}
% \begin{macrocode}
\newcommand*{\LWR@newautoidanchor}{%
\ifbool{LWR@freezethisautoid}{}{%
\addtocounter{LWR@thisautoid}{1}%
- \LWR@htmltag{a id="autoid-\arabic{LWR@thisautoid}"}\LWR@htmltag{/a}%
+ \LWR@htmltag{a id="\mbox{autoid-\arabic{LWR@thisautoid}}"}\LWR@htmltag{/a}%
}%
}
% \end{macrocode}
@@ -20178,7 +20280,12 @@ autopage-\theLWR@currentautosec%
%
% Prints the float type and number, the caption separator, and the caption text.
% \begin{macrocode}
-\AtBeginDocument{\renewcommand{\@makecaption}[2]{#1\CaptionSeparator#2}}
+\AtBeginDocument{\renewcommand{\@makecaption}[2]{%
+ \LWR@traceinfo{@makecaption}%
+ #1\CaptionSeparator#2%
+ \LWR@traceinfo{@makecaption: done}%
+}%
+}
% \end{macrocode}
% \end{macro}
@@ -20237,15 +20344,19 @@ autopage-\theLWR@currentautosec%
% \begin{macrocode}
\newenvironment*{LWR@figcaption}
{%
+\LWR@traceinfo{LWR@figcaption env start}%
\LWR@htmlblocktag{figcaption}
\ifbool{FormatWP}{%
\begin{BlockClass}[font-style:italic]{italic}
\LWR@origvspace*{\baselineskip}
}{}%
+\LWR@traceinfo{LWR@figcaption env start: done}%
}
{%
+\LWR@traceinfo{LWR@figcaption env end}%
\ifbool{FormatWP}{\end{BlockClass}}{}%
\LWR@htmlblocktag{/figcaption}%
+\LWR@traceinfo{LWR@figcaption env end: done}%
}
% \end{macrocode}
% \end{environment}
@@ -20260,8 +20371,9 @@ autopage-\theLWR@currentautosec%
% \begin{macro}{\LWR@caption@begin}
% Low-level patches to create \HTML\ tags for captions.
+% \changes{v0.47}{2018/01/28}{Fix: Argument passed to \cs{LWR@origcaption@begin}.}
% \begin{macrocode}
-\newcommand{\LWR@caption@begin}
+\newcommand{\LWR@caption@begin}[1]
{
\LWR@traceinfo{LWR@caption@begin}%
% \end{macrocode}
@@ -20281,7 +20393,9 @@ autopage-\theLWR@currentautosec%
% Enclose the original caption code inside an \HTML\ tag:
% \begin{macrocode}
\LWR@figcaption%
-\LWR@origcaption@begin%
+\LWR@traceinfo{LWR@caption@begin: about to LWR@origcaption@begin}%
+\LWR@origcaption@begin{#1}%
+\LWR@traceinfo{LWR@caption@begin: done}%
}
% \end{macrocode}
% \end{macro}
@@ -20291,6 +20405,7 @@ autopage-\theLWR@currentautosec%
% \begin{macrocode}
\newcommand{\LWR@caption@end}
{%
+\LWR@traceinfo{LWR@caption@end}%
\LWR@origcaption@end%
% \end{macrocode}
% Subcaptions were being over-written by the closing \HTML\ tag:
@@ -20323,6 +20438,7 @@ autopage-\theLWR@currentautosec%
% \begin{macro}{\captionlistentry}
% Tracks the float number for this caption used outside a float.
% Patched to create an \HTML\ anchor.
+% \changes{v0.47}{2018/01/26}{Fix: Line wrap at \HTML\ hyphen.}
% \begin{macrocode}
\let\LWR@origcaptionlistentry\captionlistentry
@@ -20333,7 +20449,7 @@ autopage-\theLWR@currentautosec%
\def\LWR@LTcaptionlistentry{%
\LWR@ensuredoingapar%
-\LWR@htmltag{a id="autoid-\arabic{LWR@thisautoid}"}\LWR@htmltag{/a}%
+\LWR@htmltag{a id="\mbox{autoid-\arabic{LWR@thisautoid}}"}\LWR@htmltag{/a}%
\bgroup
\@ifstar{\egroup\LWR@LT@captionlistentry}% gobble *
{\egroup\LWR@LT@captionlistentry}}%
@@ -20762,9 +20878,10 @@ autopage-\theLWR@currentautosec%
% \end{macrocode}
% Create an \HTML\ link to filename\#autosec-(page), with text of the caption,
% of the given \HTML\ class.
+% \changes{v0.47}{2018/01/26}{Fix: Line wrap at \HTML\ hyphen.}
% \begin{macrocode}
\LWR@subhyperrefclass{%
- \LWR@htmlrefsectionfilename{autopage-#4}\#autosec-#4%
+ \LWR@htmlrefsectionfilename{autopage-#4}\#\mbox{autosec-#4}%
}{#3}{toc#2}%
\LWR@stoppars%
}
@@ -20825,10 +20942,11 @@ autopage-\theLWR@currentautosec%
% Create an \HTML\ link to
% filename\#autoid-(float number), with text of the caption,
% of the given \HTML\ class.
+% \changes{v0.47}{2018/01/26}{Fix: Line wrap at \HTML\ hyphen.}
% \begin{macrocode}
\LWR@subhyperrefclass{%
\LWR@htmlrefsectionfilename{autopage-\arabic{LWR@nextautopage}}%
- \#autoid-\arabic{LWR@nextautoid}}%
+ \#\mbox{autoid-\arabic{LWR@nextautoid}}}%
{#4}{toc#2}%
\LWR@stoppars%
}{}%
@@ -21309,31 +21427,106 @@ autopage-\theLWR@currentautosec%
% \end{macro}
%
%
-% \begin{macro}{\LWR@singledollar}
-%
-% \changes{v0.19}{2016/05/25}{MathJax support.}
%
+% \begin{macro}{\LWR@singledollar}
% Redefine the single dollar sign to place math inside a \env{lateximage}, or use MathJax:
%
+% \changes{v0.19}{2016/05/25}{MathJax support.}
% \changes{v0.42}{2017/10/26}{If \protect\texttt{FormatWP} print LaTeX expression.}
+% \changes{v0.47}{2018/01/24}{Added \SVG\ math image baseline adjust and em sizing.}
% \begin{macrocode}
+\newlength{\LWR@singledollarwidth}
+\newlength{\LWR@singledollarheight}
+\newlength{\LWR@singledollardepth}
+
\protected\gdef\LWR@subsingledollar#1{%
+\begingroup%
+\normalsize%
\ifboolexpr{bool{mathjax} or ( bool{FormatWP} and bool{WPMarkMath} ) }%
% \end{macrocode}
% For MathJax, print the math between |\(| and |\)|:
% \begin{macrocode}
{%
- {\textbackslash(\LWR@HTMLsanitize{#1}\textbackslash)}%
+ {\textbackslash(\LWR@HTMLsanitize{#1}\textbackslash)}%
}% mathjax
% \end{macrocode}
-% For SVG, print the math inside a \env{lateximage}, with an \element{alt} tag of the \LaTeX\ code:
+% For SVG, print the math inside a \env{lateximage},
+% with an \element{alt} tag of the \LaTeX\ code,
+% and a \CSS\ style to control the baseline adjustment.
% \begin{macrocode}
{% not mathjax
- \begin{lateximage}%
- [\textbackslash( \LWR@HTMLsanitize{#1} \textbackslash)]%
+% \end{macrocode}
+% Measure the depth, width, and height of the math image:
+% \begin{macrocode}
+ \LWR@restoreorigformatting%
+ \LWR@orignormalsize%
+ \global\setlength{\LWR@singledollardepth}{\depthof{%
\LWR@origdollar#1\LWR@origdollar%
- \end{lateximage}%
+ }*\real{.8}}%
+ \global\setlength{\LWR@singledollarwidth}{\widthof{%
+ \LWR@origdollar#1\LWR@origdollar%
+ }*\real{.8}}%
+ \global\setlength{\LWR@singledollarheight}{\totalheightof{%
+ \LWR@origdollar#1\LWR@origdollar%
+ }*\real{.8}}%
+% \end{macrocode}
+% Set a style for the the height or width.
+% The |em| unit is used so that the math scales according to the
+% user's selected font size.
+% Start with the larger of width or height:
+% \begin{macrocode}
+% \ifdimgreater{\LWR@singledollarwidth}{\LWR@singledollarheight}{%
+% \def\LWR@singledollarstyle{%
+% width:\LWR@convertto{em}{\the\LWR@singledollarwidth} em%
+% }%
+% }{%
+ \def\LWR@singledollarstyle{%
+ height:\LWR@convertto{em}{\the\LWR@singledollarheight }em%
+ }%
+% }%
+% \end{macrocode}
+% If narrow width, use the height. Single-letter variables look best if they all are
+% scaled according to height.
+% \begin{macrocode}
+% \ifdimless{\LWR@singledollarwidth}{.8em}%
+% {%
+% \def\LWR@singledollarstyle{%
+% height:\LWR@convertto{em}{\the\LWR@singledollarheight }em%
+% }%
+% }%
+% {}%
+% \end{macrocode}
+% If extremely thin, use the width:
+% \begin{macrocode}
+ \ifdimless{\LWR@singledollarheight}{.3em}%
+ {%
+ \def\LWR@singledollarstyle{%
+ width:\LWR@convertto{em}{\the\LWR@singledollarwidth} em%
+ }%
+ }%
+ {}%
+% \end{macrocode}
+% If there is significant text depth, add the depth to the style.
+% \changes{v0.47}{2018/01/26}{Fix: Line wrap at \HTML\ hyphen.}
+% \begin{macrocode}
+ \ifdimgreater{\LWR@singledollardepth}{0.01em}{%
+ \def\LWR@singledollardepthstyle{%
+ \ ; \mbox{vertical-align:-\LWR@convertto{em}{\the\LWR@singledollardepth} em} %
+ }%
+ }{%
+ \def\LWR@singledollardepthstyle{}%
+ }%
+% \end{macrocode}
+% Create the \env{lateximage} using the alternate tag and the computed
+% size and depth.
+% \begin{macrocode}
+ \begin{lateximage}%
+ [\textbackslash( \LWR@HTMLsanitize{#1} \textbackslash)]%
+ [\LWR@singledollarstyle \LWR@singledollardepthstyle]%
+ \LWR@origdollar#1\LWR@origdollar%
+ \end{lateximage}%
}%
+\endgroup%
}
\protected\gdef\LWR@singledollar#1${%
@@ -21347,14 +21540,10 @@ autopage-\theLWR@currentautosec%
% \begin{macro}{\)}
% Redefine to the above dollar macros.
% \begin{macrocode}
-\protected\gdef\(#1\){%
-$#1$}
+\protected\gdef\(#1\){$#1$}
\protected\gdef\[#1\]{$$#1$$}
\endgroup
-
-
-
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -22428,7 +22617,7 @@ $#1$}
% \subsection{\env{lateximage}}
-% \begin{environment}{lateximage} \oarg{\element{alt} tag}
+% \begin{environment}{lateximage} \oarg{\element{alt} tag} \oarg{CSS style}
%
% \changes{v0.18}{2016/05/18}{Surpress extra space.}
% \changes{v0.18}{2016/05/18}{pdfcrop: -{}-hires added.}
@@ -22440,12 +22629,12 @@ $#1$}
% \cs{raisebox}, \cs{scalebox}, \cs{reflectbox}.}
% \changes{v0.36}{2017/08/16}{Footnotes appear in regular text instead of
% the \protect\env{lateximage} \protect\env{minipage}.}
+% \changes{v0.47}{2018/01/24}{Added \CSS\ style option.}
%
% \begin{macrocode}
\catcode`\$=\active%
-
-\NewDocumentEnvironment{lateximage}{O{image}}
+\NewDocumentEnvironment{lateximage}{O{image}O{}}
{%
\LWR@traceinfo{lateximage: starting on \jobname.pdf page \arabic{page}}%
% \end{macrocode}
@@ -22502,7 +22691,7 @@ $#1$}
% of the image's page, and also will hold the link to the |.svg| file:
% \begin{macrocode}
\LWR@htmltag{span id="lateximage\arabic{LWR@lateximagenumber}" %
- class="lateximagesource"} \LWR@orignewline
+ class="lateximagesource"}%
% \end{macrocode}
% Write instructions to the |lateximages.txt| file:
% \begin{macrocode}
@@ -22591,13 +22780,14 @@ $#1$}
% Close the \HTML\ comment which encapsulated any traces of the lateximage picked up by |pdftotext|:
% \begin{macrocode}
\LWR@origvspace*{.5\baselineskip}%
- \LWR@htmlclosecomment{}\LWR@orignewline%
+ \LWR@htmlclosecomment%
\LWR@traceinfo{lateximage: The page after the image is \arabic{page}}%
% \end{macrocode}
% Create a link to the lateximage, allowing its natural height:
+% \changes{v0.47}{2018/01/26}{Fix: Line wrap at \HTML\ hyphen.}
% \begin{macrocode}
\LWR@subinlineimage[#1]{lateximage}%
- {lateximages\OSPathSymbol{}lateximage-\theLWR@externalfilecnt}{svg}{}%
+ {lateximages\OSPathSymbol{}\mbox{lateximage-\theLWR@externalfilecnt}}{svg}{#2}%
% \end{macrocode}
% Be sure that are doing a paragraph:
% \begin{macrocode}
@@ -22624,8 +22814,7 @@ $#1$}
% \codeprint
% \begin{macrocode}
\begin{warpprint}
-% \newenvironment{lateximage}[1][]{\minipage{\linewidth}}{\endminipage}
-\newenvironment{lateximage}[1][]{}{}
+\NewDocumentEnvironment{lateximage}{O{image}O{}}{}{}
\end{warpprint}
% \end{macrocode}
% \end{environment}
@@ -22643,12 +22832,13 @@ $#1$}
% \begin{environment}{center}
% Replace \env{center} functionality with \CSS\ tags:
% \changes{v0.42}{2017/10/26}{If \protect\texttt{FormatWP} use explicit \attribute{text-align}.}
+% \changes{v0.47}{2018/01/26}{Fix: Line wrap at \HTML\ hyphen.}
% \begin{macrocode}
\renewenvironment*{center}
{
\LWR@forcenewpage
\ifbool{FormatWP}
-{\BlockClass[text-align:center]{center}}
+{\BlockClass[\mbox{text-align:center}]{center}}
{\BlockClass{center}}
}
{\endBlockClass}
@@ -22657,12 +22847,13 @@ $#1$}
% \begin{environment}{flushright}
+% \changes{v0.47}{2018/01/26}{Fix: Line wrap at \HTML\ hyphen.}
% \begin{macrocode}
\renewenvironment*{flushright}
{
\LWR@forcenewpage
\ifbool{FormatWP}
-{\BlockClass[text-align:right]{flushright}}
+{\BlockClass[\mbox{text-align:right}]{flushright}}
{\BlockClass{flushright}}
}
{\endBlockClass}
@@ -22670,12 +22861,13 @@ $#1$}
% \end{environment}
% \begin{environment}{flushleft}
+% \changes{v0.47}{2018/01/26}{Fix: Line wrap at \HTML\ hyphen.}
% \begin{macrocode}
\renewenvironment*{flushleft}
{
\LWR@forcenewpage
\ifbool{FormatWP}
-{\BlockClass[text-align:left]{flushleft}}
+{\BlockClass[\mbox{text-align:left}]{flushleft}}
{\BlockClass{flushleft}}
}
{\endBlockClass}
@@ -23277,7 +23469,8 @@ $#1$}
% \end{macrocode}
%
%
-% \begin{environment}{minipage} \oarg{vert position} \oarg{height} \oarg{inner vert position} \marg{width}
+% \begin{environment}{minipage} \oarg{vert position} \oarg{height}
+% \oarg{inner vert position} \marg{width}
% \changes{v0.18}{2016/05/17}{Fix: \cs{linewidth}, \cs{textwidth}, \cs{textheight} inside a minipage.}
%
% The vertical positions may be 'c', 't', or 'b'.
@@ -23339,25 +23532,27 @@ $#1$}
% \end{macrocode}
% If |FormatWP|, add a text frame:
% \changes{v0.42}{2017/10/26}{If \protect\texttt{FormatWP} add a text frame.}
+% \changes{v0.47}{2018/01/26}{Fix: Line wrap at \HTML\ hyphen.}
% \begin{macrocode}
\ifbool{FormatWP}{%
\addtocounter{LWR@thisautoidWP}{1}%
-\LWR@htmltag{div id="autoidWP-\arabic{LWR@thisautoidWP}" class="wpminipage"}%
+\LWR@htmltag{div id="\mbox{autoidWP-\arabic{LWR@thisautoidWP}}" class="wpminipage"}%
}{}%
% \end{macrocode}
% Create the \element{div} tag with optional alignment style:
+% \changes{v0.47}{2018/01/26}{Fix: Line wrap at \HTML\ hyphen.}
% \begin{macrocode}
\LWR@traceinfo{minipage: creating div class}%
\LWR@htmltag{div class="minipage" style="%
-\ifthenelse{\equal{#1}{t}}{vertical-align:bottom ; }{}%
-\ifthenelse{\equal{#1}{c}}{vertical-align:middle ; }{}%
-\ifthenelse{\equal{#1}{b}}{vertical-align:top ; }{}%
-\ifthenelse{\equal{#3}{t}}{justify-content:flex-start ; }{}%
-\ifthenelse{\equal{#3}{c}}{justify-content:center ; }{}%
-\ifthenelse{\equal{#3}{b}}{justify-content:flex-end ; }{}%
-\ifthenelse{\equal{#3}{s}}{justify-content:space-between ; }{}%
+\ifthenelse{\equal{#1}{t}}{\mbox{vertical-align:bottom} ; }{}%
+\ifthenelse{\equal{#1}{c}}{\mbox{vertical-align:middle} ; }{}%
+\ifthenelse{\equal{#1}{b}}{\mbox{vertical-align:top} ; }{}%
+\ifthenelse{\equal{#3}{t}}{\mbox{justify-content:flex-start} ; }{}%
+\ifthenelse{\equal{#3}{c}}{\mbox{justify-content:center} ; }{}%
+\ifthenelse{\equal{#3}{b}}{\mbox{justify-content:flex-end} ; }{}%
+\ifthenelse{\equal{#3}{s}}{\mbox{justify-content:space-between} ; }{}%
% \end{macrocode}
% Print the width and optional height styles:
% \begin{macrocode}
@@ -23501,11 +23696,12 @@ $#1$}
% \end{macrocode}
% \attribute{inline-block} allows \attribute{width} and
% \attribute{text-alignment} to be used in a \element{span}.
+% \changes{v0.47}{2018/01/26}{Fix: Line wrap at \HTML\ hyphen.}
% \begin{macrocode}
\uselengthunit{PT}%
\InlineClass[%
- display:inline-block ; %
- text-align:\LWR@align\ ; %
+ \mbox{display:inline-block} ; %
+ \mbox{text-align}:\LWR@align\ ; %
width:\rndprintlength{\LWR@tempwidth}%
]%
{makebox}%
@@ -25285,10 +25481,11 @@ width:\rndprintlength{\LWR@tempwidth}%
\uselengthunit{PT}%
% \end{macrocode}
% Create the \element{div} with the given margin and class:
+% \changes{v0.47}{2018/01/26}{\pkg{adjmulticol}: Fix: Line wrap at \HTML\ hyphen.}
% \begin{macrocode}
\BlockClass[%
-margin-left:\rndprintlength{\LWR@templengthone} ; %
-margin-right:\rndprintlength{\LWR@templengthtwo}%
+\mbox{margin-left:\rndprintlength{\LWR@templengthone}} ; %
+\mbox{margin-right:\rndprintlength{\LWR@templengthtwo}}%
]{\LWR@mcolstype}%
}
{\endBlockClass}
@@ -25537,10 +25734,10 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
\@ifundefined{th@#1}{%
\PackageWarning{amsthm}{Unknown theoremstyle `#1'}%
\thm@style{plain}%
- \renewcommand{\LWR@newtheoremstyle}{plain}% new
+ \renewcommand{\LWR@newtheoremstyle}{plain}% lwarp
}{%
\thm@style{#1}%
- \renewcommand{\LWR@newtheoremstyle}{#1}% new
+ \renewcommand{\LWR@newtheoremstyle}{#1}% lwarp
}%
}
% \end{macrocode}
@@ -25548,7 +25745,7 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
% Patched to remember the style for this theorem type:
% \begin{macrocode}
\def\@xnthm#1#2{%
- \csedef{LWR@thmstyle#2}{\LWR@newtheoremstyle}% new
+ \csedef{LWR@thmstyle#2}{\LWR@newtheoremstyle}% lwarp
\let\@tempa\relax
\@xp\@ifdefinable\csname #2\endcsname{%
\global\@xp\let\csname end#2\endcsname\@endtheorem
@@ -25560,7 +25757,7 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
\else % numbered theorem, need to check for optional arg
\def\@tempa{\@oparg{\@ynthm{#2}}[]}%
\fi
- \AtBeginEnvironment{#2}{\edef\LWR@thisthmstyle{\csuse{LWR@thmstyle#2}}}% new
+ \AtBeginEnvironment{#2}{\edef\LWR@thisthmstyle{\csuse{LWR@thmstyle#2}}}% lwarp
}%
\@tempa
}
@@ -25591,9 +25788,9 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
\item[
% \deferred@thm@head{
% \the\thm@headfont \thm@indent
- \@ifempty{#1}{\let\thmname\@gobble}{\LWR@haveamsthmname}% new
- \@ifempty{#2}{\let\thmnumber\@gobble}{\LWR@haveamsthmnumber}% new
- \@ifempty{#3}{\let\thmnote\@gobble}{\LWR@haveamsthmnote}% new
+ \@ifempty{#1}{\let\thmname\@gobble}{\LWR@haveamsthmname}% lwarp
+ \@ifempty{#2}{\let\thmnumber\@gobble}{\LWR@haveamsthmnumber}% lwarp
+ \@ifempty{#3}{\let\thmnote\@gobble}{\LWR@haveamsthmnote}% lwarp
\thm@swap\swappedhead\thmhead{#1}{#2}{#3}%
\the\thm@headpunct~
\thmheadnl % possibly a newline.
@@ -25609,8 +25806,8 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
\def\@thm#1#2#3{%
\ifhmode\unskip\unskip\par\fi
\normalfont
- \LWR@forcenewpage% new
- \BlockClass{amsthmbody\LWR@thisthmstyle}% new
+ \LWR@forcenewpage% lwarp
+ \BlockClass{amsthmbody\LWR@thisthmstyle}% lwarp
\trivlist
\let\thmheadnl\relax
\let\thm@swap\@gobble
@@ -25638,8 +25835,8 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
\def\cref@thmoptarg[#1]#2#3#4{%
\ifhmode\unskip\unskip\par\fi%
\normalfont%
- \LWR@forcenewpage% new
- \BlockClass{amsthmbody\LWR@thisthmstyle}% new
+ \LWR@forcenewpage% lwarp
+ \BlockClass{amsthmbody\LWR@thisthmstyle}% lwarp
\trivlist%
\let\thmheadnl\relax%
\let\thm@swap\@gobble%
@@ -25678,8 +25875,8 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
% Patched for \CSS:
% \begin{macrocode}
\renewenvironment{proof}[1][\proofname]{\par
-\LWR@forcenewpage% new
- \BlockClass{amsthmproof}% new
+\LWR@forcenewpage% lwarp
+ \BlockClass{amsthmproof}% lwarp
\pushQED{\qed}%
\normalfont \topsep6\p@\@plus6\p@\relax
\trivlist
@@ -25687,7 +25884,7 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
\InlineClass{amsthmproofname}{#1\@addpunct{.}}]\ignorespaces% changes
}{%
\InlineClass{theoremendmark}{\popQED}\endtrivlist%
- \endBlockClass% new
+ \endBlockClass% lwarp
\@endpefalse
}
% \end{macrocode}
@@ -26189,6 +26386,36 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
%
%
%
+%
+% \iffalse
+%<*blowup>
+% \fi
+%
+% \part{lwarp-blowup.sty}
+%
+% \section{blowup}
+%
+% \DescribePackage{blowup}
+% \pkg{blowup} is ignored.
+%
+% \changes{v0.47}{2018/01/25}{\pkg{blowup}: Added.}
+%
+% \codehtml
+%
+% \begin{macrocode}
+\LWR@ProvidesPackageDrop{blowup}
+% \end{macrocode}
+%
+% \begin{macrocode}
+\newcommand*\blowUp[1]{}
+% \end{macrocode}
+%
+% \iffalse
+%</blowup>
+% \fi
+%
+%
+%
% \iffalse
%<*bookmark>
% \fi
@@ -26457,6 +26684,191 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
%
%
% \iffalse
+%<*caption>
+% \fi
+%
+% \part{lwarp-caption.sty}
+
+% \section{caption}
+%
+% \credits{Axel Sommerfeldt}
+%
+% \DescribePackage{caption}
+% \pkg{caption} is patched for use by \pkg{lwarp}.
+%
+% \changes{v0.47}{2018/01/25}{\pkg{caption}: Added.}
+%
+% \codehtml
+%
+% \begin{macrocode}
+\LWR@ProvidesPackagePass{caption}
+% \end{macrocode}
+
+% \begin{macrocode}
+\renewcommand\caption@ibox[3]{%
+ \@testopt{\caption@iibox{#1}{#2}{#3}}{%
+% \wd\@tempboxa%
+ \linewidth% lwarp
+ }%
+% \LWR@traceinfo{caption@ibox: done}%
+}
+% \end{macrocode}
+%
+% \begin{macrocode}
+\long\def\caption@iibox#1#2#3[#4]{%
+ \@testopt{\caption@iiibox{#1}{#2}{#3}{#4}}\captionbox@hj@default
+}
+% \end{macrocode}
+%
+% \begin{macrocode}
+\long\def\caption@iiibox#1#2#3#4[#5]#6{%
+% \setbox\@tempboxa\hbox{#6}%
+ \begingroup
+ #1*% set \caption@position
+ \caption@iftop{%
+ \LWR@traceinfo{caption@iiibox top}%
+ \endgroup
+ \parbox[t]{#4}{%
+ #1\relax
+ \caption@setposition t%
+% \vbox{\caption#2{#3}}%
+ {\caption#2{#3}}% lwarp
+% \captionbox@hrule
+% \csname caption@hj@#5\endcsname
+% \unhbox\@tempboxa
+ #6% lwarp
+ }%
+ }{%
+ \LWR@traceinfo{caption@iiibox bottom}%
+ \endgroup
+ \parbox[b]{#4}{%
+ #1\relax
+ \caption@setposition b%
+% \csname caption@hj@#5\endcsname
+% \unhbox\@tempboxa
+ #6% lwarp
+% \captionbox@hrule
+% \vtop{\caption#2{#3}}}%
+ {\caption#2{#3}}% lwarp
+ }%
+ }%
+\LWR@traceinfo{caption@iiibox: done}%
+}
+
+\def\caption@caption{%
+ \caption@iftype
+ {%
+ \caption@checkgrouplevel\@empty\caption
+ \caption@star
+ {\caption@refstepcounter\@captype}%
+ {\caption@dblarg{\@caption\@captype}}}%
+ {\caption@Error{\noexpand\caption outside float}%
+ \caption@gobble}%
+}
+
+\long\def\caption@@caption#1[#2]#3{%
+% \end{macrocode}
+% \begin{macrocode}
+ \ifcaption@star \else
+ \caption@prepareanchor{#1}{#2}%
+ \memcaptioninfo{#1}{\csname the#1\endcsname}{#2}{#3}%
+ \@nameuse{nag@hascaptiontrue}%
+ \fi
+% \end{macrocode}
+% \begin{macrocode}
+ \par
+ \caption@beginex{#1}{#2}{#3}%
+ \caption@setfloatcapt{%
+ \caption@boxrestore
+ \if@minipage
+ \@setminipage
+ \fi
+ \caption@normalsize
+ \ifcaption@star
+ \let\caption@makeanchor\@firstofone
+ \fi
+ \@makecaption{\csname fnum@#1\endcsname}%
+ {\ignorespaces\caption@makeanchor{#3}}\par
+ \caption@if@minipage\@minipagetrue\@minipagefalse}%
+ \caption@end%
+}
+% \end{macrocode}
+
+% \begin{noindmacro}{\caption@@@make}
+% \marg{caption label} \marg{caption text}
+% \begin{macrocode}
+\renewcommand\caption@@@make[2]{%
+\LWR@startpars% lwarp
+% \sbox\@tempboxa{#1}%
+% \ifdim\wd\@tempboxa=\z@
+% \let\caption@lsep\relax
+% \fi
+ \caption@ifempty{#2}{%
+ \let\caption@lsep\@empty
+ \let\caption@tfmt\@firstofone
+ }%
+% \@setpar{\@@par\caption@@par}\caption@@par
+ \renewcommand{\@@par}{\LWR@closeparagraph\LWR@orig@@par}% lwarp
+ \caption@applyfont
+ \caption@fmt
+ {\ifcaption@star\else
+ \begingroup
+ \captionlabelfont
+ #1%
+ \endgroup
+ \fi}%
+ {\ifcaption@star\else
+ \begingroup
+ \caption@iflf\captionlabelfont
+ \relax\caption@lsep
+ \endgroup
+ \fi}%
+ {{\captiontextfont
+ \caption@ifstrut
+ {\vrule\@height\ht\strutbox\@width\z@}%
+ {}%
+ \nobreak\hskip\z@skip % enable hyphenation
+ \caption@tfmt{#2}
+ \LWR@ensuredoingapar% lwarp
+ \caption@ifstrut
+ {\ifhmode\@finalstrut\strutbox\fi}%
+ {}%
+ \par}}
+\LWR@stoppars% lwarp
+}
+% \end{macrocode}
+% \end{noindmacro}
+
+% ^^A *8* move to caption itself?
+% \begin{noindmacro}{\caption@@make@} \marg{} \marg{}
+% \begin{macrocode}
+\renewcommand{\caption@@make@}[2]{%
+ \caption@stepthecounter
+ \caption@beginhook
+ \caption@@@make{#1}{#2}%
+ \caption@endhook
+}
+% \end{macrocode}
+% \end{noindmacro}
+
+
+% \begin{macrocode}
+% \DeclareCaptionBox{none}{#2}
+\DeclareCaptionBox{parbox}{%
+#2%
+}
+\DeclareCaptionBox{colorbox}{%
+#2%
+}
+% \end{macrocode}
+
+% \iffalse
+%</caption>
+% \fi
+%
+%
+%
+% \iffalse
%<*caption2>
% \fi
%
@@ -26588,9 +27000,10 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
% \end{macrocode}
% \changes{v0.44}{2017/11/13}{\pkg{changepage}: Additional options.}
+% \changes{v0.47}{2018/01/30}{\pkg{changepage}: Fix for pagecheck macros.}
% \begin{macrocode}
-\DeclareDocumentCommand{\strictpagecheck}{}
-\DeclareDocumentCommand{\easypagecheck}{}
+\DeclareDocumentCommand{\strictpagecheck}{}{}
+\DeclareDocumentCommand{\easypagecheck}{}{}
% \end{macrocode}
% \iffalse
@@ -27217,6 +27630,59 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
%
%
%
+% \iffalse
+%<*endheads>
+% \fi
+%
+% \part{lwarp-endheads.sty}
+%
+% \section{endheads}
+%
+% \DescribePackage{endheads}
+% \pkg{endheads} is ignored.
+%
+% \changes{v0.47}{2018/01/25}{\pkg{endheads}: Added.}
+%
+% \codehtml
+%
+% \begin{macrocode}
+\LWR@ProvidesPackageDrop{endheads}
+% \end{macrocode}
+%
+% \begin{macrocode}
+\newcommand{\changesinglepageabbrev}[1]{}
+\newcommand{\changemultiplepageabbrev}[1]{}
+\newcommand{\changenotesname}[1]{}
+\newcommand{\changenotesheader}[1]{}
+\newcommand{\changenotescontentsname}[1]{}
+\newcommand{\changechapternotesline}[1]{}
+\newcommand{\checknoteheaders}{}
+\newif\ifnotesincontentson \notesincontentsonfalse
+\newcommand{\notesincontents}{\notesincontentsontrue}
+\newif\ifendnoteheaderson \endnoteheadersonfalse
+\newcommand{\setupendnoteheaders}{%
+ \endnoteheadersontrue%
+}
+\newif\iftitleinnotes \titleinnotestrue
+\newcommand{\styleforchapternotebegin}{}
+\newcommand{\styleforchapternoteend}{}
+\newcommand{\setstyleforchapternotebegin}[1]{%
+ \renewcommand{\styleforchapternotebegin}{#1}%
+}
+\newcommand{\setstyleforchapternoteend}[1]{%
+ \renewcommand{\styleforchapternoteend}{#1}%
+}
+\newcommand{\resetendnotes}{}
+\newif\ifnotesbychapteron \notesbychapteronfalse
+\newcommand{\notesbychapter}{\notesbychapterontrue}
+% \end{macrocode}
+%
+% \iffalse
+%</endheads>
+% \fi
+%
+%
+%
%
%
% \iffalse
@@ -27398,16 +27864,17 @@ span style="width:\rndprintlength{\ALG@thistlm}; display:inline-block;"%
}
% \end{macrocode}
+% \changes{v0.47}{2018/01/26}{\pkg{epigraph}: Fix: Line wrap at \HTML\ hyphen.}
% \begin{macrocode}
\DeclareDocumentCommand{\epigraph}{m m}
{
-\begin{LWR@BlockClassWP}{text-align:right}{}{epigraph}
+\begin{LWR@BlockClassWP}{\mbox{text-align:right}}{}{epigraph}
\qitem{#1}{#2}
\end{LWR@BlockClassWP}
}
\DeclareDocumentEnvironment{epigraphs}{}
-{\LWR@BlockClassWP{text-align:right}{}{epigraph}}
+{\LWR@BlockClassWP{\mbox{text-align:right}}{}{epigraph}}
{\endLWR@BlockClassWP}
% \end{macrocode}
%
@@ -30278,18 +30745,18 @@ img src="%
{\LWR@origtilde{} transform-origin: \LWR@originnames{\LWR@igorigin}; \LWR@orignewline}{}%
\ifthenelse{\NOT\equal{\LWR@igangle}{}}%
{%
-\LWR@rotstyle{-ms-}{\LWR@igangle}%
-\LWR@rotstyle{-webkit-}{\LWR@igangle}%
-\LWR@rotstyle{}{\LWR@igangle%
+\LWR@rotstyle{-ms-}{\LWR@igangle} %
+\LWR@rotstyle{-webkit-}{\LWR@igangle} %
+\LWR@rotstyle{}{\LWR@igangle %
}}{}%
\ifthenelse{\NOT\equal{\LWR@igxscale}{1}\OR%
\NOT\equal{\LWR@igyscale}{1}}%
-{\LWR@scalestyle{-ms-}{\LWR@igxscale}{\LWR@igyscale}%
-\LWR@scalestyle{-webkit-}{\LWR@igxscale}{\LWR@igyscale}%
-\LWR@scalestyle{}{\LWR@igxscale}{\LWR@igyscale}}{}%
+{\LWR@scalestyle{-ms-}{\LWR@igxscale}{\LWR@igyscale} %
+\LWR@scalestyle{-webkit-}{\LWR@igxscale}{\LWR@igyscale} %
+\LWR@scalestyle{}{\LWR@igxscale}{\LWR@igyscale}}{} %
%
\ifthenelse{\NOT\equal{\LWR@opacity}{1}}%
-{opacity:\LWR@opacity;}%
+{opacity:\LWR@opacity; }%
{}%
%
" \LWR@orignewline}{}%
@@ -30579,6 +31046,7 @@ img src="%
% \pkg{hang} is emulated.
%
% \changes{v0.44}{2017/11/15}{\pkg{hang}: Added.}
+% \changes{v0.47}{2018/01/26}{\pkg{hang}: Fix: Line wrap at \HTML\ hyphen.}
%
% \codehtml
%
@@ -30602,8 +31070,8 @@ img src="%
\LWR@findhangingleftmargin%
\uselengthunit{PT}%
\BlockClass[%
- margin-left:\rndprintlength{\LWR@templengthone}; %
- text-indent:-\rndprintlength{\hangingindent}%
+ \mbox{margin-left:\rndprintlength{\LWR@templengthone}} ; %
+ \mbox{text-indent:-\rndprintlength{\hangingindent}}%
]%
{hangingpar}%
}
@@ -30615,9 +31083,9 @@ img src="%
\renewcommand*{\LWR@printopenlist}{%
\LWR@findhangingleftmargin%
\uselengthunit{PT}%
- ul style="list-style-type:none; %
- margin-left:\rndprintlength{\LWR@templengthone}; %
- text-indent:-\rndprintlength{\hangingindent}"%
+ ul style="\mbox{list-style-type:none;} %
+ \mbox{margin-left:\rndprintlength{\LWR@templengthone}} ; %
+ \mbox{text-indent:-\rndprintlength{\hangingindent}}"%
}%
\let\item\LWR@itemizeitem%
\list{}{}%
@@ -30636,8 +31104,8 @@ img src="%
\BlockClass[%
\LWR@findhangingleftmargin%
\uselengthunit{PT}%
- margin-left:\rndprintlength{\LWR@templengthone}; %
- text-indent:-\rndprintlength{\hangingindent}%
+ \mbox{margin-left:\rndprintlength{\LWR@templengthone}} ; %
+ \mbox{text-indent:-\rndprintlength{\hangingindent}}%
]{labeledpar}#2%
}
{\endBlockClass}
@@ -30697,13 +31165,14 @@ img src="%
% \end{noindmacro}
% \begin{noindenvironment}{hangparas} \marg{indent} \marg{afternum}
+% \changes{v0.47}{2018/01/26}{\pkg{hanging}: Fix: Line wrap at \HTML\ hyphen.}
% \begin{macrocode}
\newenvironment*{hangparas}[2]
{%
\uselengthunit{PT}%
\BlockClass[%
- margin-left:\rndprintlength{#1}; %
- text-indent:-\rndprintlength{#1}%
+ \mbox{margin-left:\rndprintlength{#1}} ; %
+ \mbox{text-indent:-\rndprintlength{#1}}%
]%
{hangingpar}%
}
@@ -31349,17 +31818,57 @@ img src="%
% ^^A\typeout{*** KFLT@findwidths end}% *8*
% ^^A}
% ^^A% \end{macrocode}
-
-
+%
+%
+% \changes{v0.47}{2018/01/26}{\pkg{keyfloat}: Fix for \SVG\ math in captions.}
% \begin{macrocode}
-\let\KFLT@boxinner\relax
-\let\endKFLT@boxinner\relax
-
-\NewEnviron{KFLT@boxinner}
+\RenewDocumentCommand{\KFLT@onefigureimage}{}
+{%
+\LWR@traceinfo{KFLT@onefigureimage}%
+% \begin{lrbox}{\KFLT@envbox}%
+\ifthenelse{\NOT\equal{\KFLT@lw}{}}%
+{\includegraphics%
+[scale=\KFLT@s,width=\KFLT@imagewidth]{\KFLT@i}}%
+{% not linewidth
+\ifthenelse{\dimtest{\KFLT@w}{>}{0pt}}%
+{% width is given
+\ifthenelse{\dimtest{\KFLT@h}{>}{0pt}}%
+{% w and h
+\includegraphics%
+[scale=\KFLT@s,%
+width=\KFLT@imagewidth,height=\KFLT@h]{\KFLT@i}%
+}% w and h
+{% only w
+\includegraphics%
+[scale=\KFLT@s,width=\KFLT@imagewidth]{\KFLT@i}%
+}% only w
+}% width is given
+{% width is not given
+\ifthenelse{\dimtest{\KFLT@h}{>}{0pt}}%
+{\includegraphics%
+[scale=\KFLT@s,height=\KFLT@h]{\KFLT@i}}%
+{\includegraphics%
+[scale=\KFLT@s]{\KFLT@i}}%
+}% width is not given
+}% not linewidth
+% \end{lrbox}%
+% \unskip%
+% \KFLT@findenvboxwidth%
+% \begin{turn}{\KFLT@r}%
+% \KFLT@frame{\usebox{\KFLT@envbox}}%
+% \unskip%
+% \end{turn}%
+\LWR@traceinfo{KFLT@onefigureimage: done}%
+}
+% \end{macrocode}
+%
+% \begin{macrocode}
+\RenewDocumentEnvironment{KFLT@boxinner}{}
{%
\LWR@traceinfo{KFLT@boxinner}%
\LWR@stoppars%
-\KFLT@frame{\BODY}%
+}
+{
\LWR@startpars%
\LWR@traceinfo{KFLT@boxinner: done}%
}
@@ -32934,8 +33443,8 @@ background:
\begin{mdframed}[#1,frametitle={\strut#4\@temptitle}]}%
{\end{mdframed}}%
}%
- \BeforeBeginEnvironment{#2}{\renewcommand*{\LWR@mdthisenv}{md#2}}% new
- \BeforeBeginEnvironment{#2*}{\renewcommand*{\LWR@mdthisenv}{md#2}}% new
+ \BeforeBeginEnvironment{#2}{\renewcommand*{\LWR@mdthisenv}{md#2}}% lwarp
+ \BeforeBeginEnvironment{#2*}{\renewcommand*{\LWR@mdthisenv}{md#2}}% lwarp
}%
}
% \end{macrocode}
@@ -33154,9 +33663,10 @@ background:
\LWR@ProvidesPackageDrop{midpage}
% \end{macrocode}
%
+% \changes{v0.47}{2018/01/26}{\pkg{midpage}: Fix: Line wrap at \HTML\ hyphen.}
% \begin{macrocode}
\newenvironment{midpage}
-{\begin{BlockClass}[margin-top:6ex ; margin-bottom:6ex]{midpage}}
+{\begin{BlockClass}[\mbox{margin-top:6ex} ; \mbox{margin-bottom:6ex}]{midpage}}
{\end{BlockClass}}
% \end{macrocode}
%
@@ -33482,12 +33992,13 @@ background:
%
% \DescribeMacro{\multirow}
% \oarg{vpos} \marg{numrows} \oarg{bigstruts} \marg{width} \oarg{fixup} \marg{text}
-% \changes{v0.19}{2015/05/28}{Added optional args.}
-% \changes{v0.39}{2017/08/30}{Add: New optional \protect\texttt{vpos} argument.}
-% \changes{v0.39}{2017/08/30}{Add: Supports left/right border for \pkg{bigdelim}.}
-% \changes{v0.39}{2017/08/30}{Fix: Long text argument.}
-% \changes{v0.40}{2017/09/22}{Improved \pkg{bigdelim} borders.}
-% \changes{v0.41}{2017/09/28}{Add: \cs{cmidrule} trims.}
+% \changes{v0.19}{2015/05/28}{\pkg{multirow}: Added optional args.}
+% \changes{v0.39}{2017/08/30}{\pkg{multirow}: Add: New optional \protect\texttt{vpos} argument.}
+% \changes{v0.39}{2017/08/30}{\pkg{multirow}: Add: Supports left/right border for \pkg{bigdelim}.}
+% \changes{v0.39}{2017/08/30}{\pkg{multirow}: Fix: Long text argument.}
+% \changes{v0.40}{2017/09/22}{\pkg{multirow}: Improved \pkg{bigdelim} borders.}
+% \changes{v0.41}{2017/09/28}{\pkg{multirow}: Add: \cs{cmidrule} trims.}
+% \changes{v0.47}{2018/01/26}{\pkg{multirow}: Fix: Line wrap at \HTML\ hyphen.}
% \begin{macrocode}
\RenewDocumentCommand{\multirow}{O{c} m o m o +m}%
{%
@@ -33502,15 +34013,15 @@ background:
% The vertical alignment, if given:
% \begin{macrocode}
\IfValueT{#1}{%
-\ifstrequal{#1}{b}{style="vertical-align:bottom" }{}%
-\ifstrequal{#1}{t}{style="vertical-align:top" }{}%
+\ifstrequal{#1}{b}{style="\mbox{vertical-align:bottom}" }{}%
+\ifstrequal{#1}{t}{style="\mbox{vertical-align:top}" }{}%
}%
% \end{macrocode}
% The left/right border, if given:
% \begin{macrocode}
\ifdefvoid{\LWR@multirowborder}{}{%
-style="border-\LWR@multirowborder: 2px dotted black ; %
-padding-\LWR@multirowborder: 2px" %
+style="\mbox{border-\LWR@multirowborder:} 2px dotted black ; %
+\mbox{padding-\LWR@multirowborder:} 2px" %
}%
% \end{macrocode}
% A class adds the column spec and the rule:
@@ -33611,6 +34122,38 @@ class="td%
%
%
%
+% \iffalse
+%<*multitoc>
+% \fi
+%
+% \part{lwarp-multitoc.sty}
+%
+% \section{multitoc}
+%
+% \DescribePackage{multitoc}
+% \pkg{multitoc} is ignored.
+%
+% \changes{v0.47}{2018/01/25}{\pkg{multitoc}: Added.}
+%
+% \codehtml
+%
+% \begin{macrocode}
+\LWR@ProvidesPackageDrop{multitoc}
+% \end{macrocode}
+%
+% \begin{macrocode}
+\newcommand{\multicolumntoc}{2}
+\newcommand{\multicolumnlot}{2}
+\newcommand{\multicolumnlof}{2}
+\newcommand*{\immediateaddtocontents}[2]{}
+% \end{macrocode}
+%
+% \iffalse
+%</multitoc>
+% \fi
+%
+%
+%
%
% \iffalse
%<*nameref>
@@ -34048,8 +34591,8 @@ class="td%
\fi
\refstepcounter[#1]{#2}% <<< cleveref modification
\theorem@prework
- \LWR@forcenewpage% new
- \BlockClass{theorembody#1}%\LWR@thisthmstyle% new
+ \LWR@forcenewpage% lwarp
+ \BlockClass{theorembody#1}%\LWR@thisthmstyle% lwarp
\trivlist % latex's \trivlist, calling latex's \@trivlist unchanged
\ifuse@newframeskips % cf. latex.ltx for topsepadd: \@trivlist
\ifthm@inframe
@@ -34084,8 +34627,8 @@ class="td%
\fi
\refstepcounter{#2}%
\theorem@prework
- \LWR@forcenewpage% new
- \BlockClass{theorembody#1}%\LWR@thisthmstyle% new
+ \LWR@forcenewpage% lwarp
+ \BlockClass{theorembody#1}%\LWR@thisthmstyle% lwarp
\trivlist % latex's \trivlist, calling latex's \@trivlist unchanged
\ifuse@newframeskips % cf. latex.ltx for topsepadd: \@trivlist
\ifthm@inframe
@@ -34120,11 +34663,11 @@ class="td%
\@ifundefined{th@#1}{\@warning
{Unknown theoremstyle `#1'. Using `plain'}%
\theorem@style{plain}
- \renewcommand{\LWR@newtheoremstyle}{plain}% new
+ \renewcommand{\LWR@newtheoremstyle}{plain}% lwarp
}%
{
\theorem@style{#1}
- \renewcommand{\LWR@newtheoremstyle}{#1}% new
+ \renewcommand{\LWR@newtheoremstyle}{#1}% lwarp
}
}
% \end{macrocode}
@@ -34136,7 +34679,7 @@ class="td%
\gdef\@xnthm#1#2[#3]{%
\ifthm@tempif
- \csedef{LWR@thmstyle#1}{\LWR@newtheoremstyle}% new
+ \csedef{LWR@thmstyle#1}{\LWR@newtheoremstyle}% lwarp
\expandafter\@ifundefined{c@#1}%
{\@definecounter{#1}}{}%
\@newctr{#1}[#3]%
@@ -34148,13 +34691,13 @@ class="td%
\@thm{#1}{#1}{#2}
}%
\global\@namedef{end#1}{\@endtheorem}
- \AtBeginEnvironment{#1}{\edef\LWR@thisthmstyle{\csuse{LWR@thmstyle#1}}}% new
+ \AtBeginEnvironment{#1}{\edef\LWR@thisthmstyle{\csuse{LWR@thmstyle#1}}}% lwarp
\fi
}
\gdef\@ynthm#1#2{%
\ifthm@tempif
- \csedef{LWR@thmstyle#1}{\LWR@newtheoremstyle}% new
+ \csedef{LWR@thmstyle#1}{\LWR@newtheoremstyle}% lwarp
\expandafter\@ifundefined{c@#1}%
{\@definecounter{#1}}{}%
\expandafter\xdef\csname the#1\endcsname
@@ -34164,14 +34707,14 @@ class="td%
\@thm{#1}{#1}{#2}
}%
\global\@namedef{end#1}{\@endtheorem}
- \AtBeginEnvironment{#1}{\edef\LWR@thisthmstyle{\csuse{LWR@thmstyle#1}}}% new
+ \AtBeginEnvironment{#1}{\edef\LWR@thisthmstyle{\csuse{LWR@thmstyle#1}}}% lwarp
\fi
}
\gdef\@othm#1[#2]#3{%
\@ifundefined{c@#2}{\@nocounterr{#2}}%
{\ifthm@tempif
- \csedef{LWR@thmstyle#1}{\LWR@newtheoremstyle}% new
+ \csedef{LWR@thmstyle#1}{\LWR@newtheoremstyle}% lwarp
\global\@namedef{the#1}{\@nameuse{the#2}}%
\expandafter\protected@xdef\csname num@addtheoremline#1\endcsname{%
\noexpand\@num@addtheoremline{#1}{#3}}%
@@ -34185,7 +34728,7 @@ class="td%
\@thm{#1}{#2}{#3}
}%
\global\@namedef{end#1}{\@endtheorem}
- \AtBeginEnvironment{#1}{\edef\LWR@thisthmstyle{\csuse{LWR@thmstyle#1}}}% new
+ \AtBeginEnvironment{#1}{\edef\LWR@thisthmstyle{\csuse{LWR@thmstyle#1}}}% lwarp
\fi}
}
% \end{macrocode}
@@ -34195,11 +34738,12 @@ class="td%
%
% Mimics a float by incrementing the float counter and generating
% an \HTML\ anchor. These are used for list-of-theorem cross-references.
+% \changes{v0.47}{2018/01/26}{\pkg{ntheorem}: Fix: Line wrap at \HTML\ hyphen.}
% \begin{macrocode}
\newcommand{\LWR@inctheorem}{%
\addtocounter{LWR@thisautoid}{1}%
\LWR@stoppars%
-\LWR@htmltag{a id="autoid-\arabic{LWR@thisautoid}"}\LWR@htmltag{/a}%
+\LWR@htmltag{a id="\mbox{autoid-\arabic{LWR@thisautoid}}"}\LWR@htmltag{/a}%
\LWR@startpars%
}
% \end{macrocode}
@@ -34222,10 +34766,10 @@ class="td%
\expandafter\@ifundefined{th@#1}%
{\expandafter\gdef\csname th@#1\endcsname{%
\def\@begintheorem####1####2{%
- \LWR@inctheorem% new
+ \LWR@inctheorem% lwarp
#2}%
\def\@opargbegintheorem####1####2####3{%
- \LWR@inctheorem% new
+ \LWR@inctheorem% lwarp
#3}%
}%
}%
@@ -34400,12 +34944,12 @@ class="td%
\gdef\th@plain{%
\def\theorem@headerfont{\normalfont\bfseries}\itshape%
\def\@begintheorem##1##2{%
- \LWR@inctheorem% new
+ \LWR@inctheorem% lwarp
\item[
\InlineClass{theoremheaderplain}{##1\ ##2.}
]}%
\def\@opargbegintheorem##1##2##3{%
- \LWR@inctheorem% new
+ \LWR@inctheorem% lwarp
\item[
\InlineClass{theoremheaderplain}{##1\ ##2\ (##3).}
]}}
@@ -34413,12 +34957,12 @@ class="td%
\gdef\th@nonumberplain{%
\def\theorem@headerfont{\normalfont\bfseries}\itshape%
\def\@begintheorem##1##2{%
- \LWR@inctheorem% new
+ \LWR@inctheorem% lwarp
\item[
\InlineClass{theoremheaderplain}{##1.}
]}%
\def\@opargbegintheorem##1##2##3{%
- \LWR@inctheorem% new
+ \LWR@inctheorem% lwarp
\item[
\InlineClass{theoremheaderplain}{##1\ (##3).}
]}}
@@ -34426,12 +34970,12 @@ class="td%
\gdef\th@definition{%
\def\theorem@headerfont{\normalfont\bfseries}\normalfont%
\def\@begintheorem##1##2{%
- \LWR@inctheorem% new
+ \LWR@inctheorem% lwarp
\item[
\InlineClass{theoremheaderdefinition}{##1\ ##2.}
]}%
\def\@opargbegintheorem##1##2##3{%
- \LWR@inctheorem% new
+ \LWR@inctheorem% lwarp
\item[
\InlineClass{theoremheaderdefinition}{##1\ ##2\ (##3).}
]}}
@@ -34439,12 +34983,12 @@ class="td%
\gdef\th@nonumberdefinition{%
\def\theorem@headerfont{\normalfont\bfseries}\normalfont%
\def\@begintheorem##1##2{%
- \LWR@inctheorem% new
+ \LWR@inctheorem% lwarp
\item[
\InlineClass{theoremheaderdefinition}{##1.}
]}%
\def\@opargbegintheorem##1##2##3{%
- \LWR@inctheorem% new
+ \LWR@inctheorem% lwarp
\item[
\InlineClass{theoremheaderdefinition}{##1\ (##3).}
]}}
@@ -34452,12 +34996,12 @@ class="td%
\gdef\th@remark{%
\def\theorem@headerfont{\itshape}\normalfont%
\def\@begintheorem##1##2{%
- \LWR@inctheorem% new
+ \LWR@inctheorem% lwarp
\item[
\InlineClass{theoremheaderremark}{##1\ ##2.}
]}%
\def\@opargbegintheorem##1##2##3{%
- \LWR@inctheorem% new
+ \LWR@inctheorem% lwarp
\item[
\InlineClass{theoremheaderremark}{##1\ ##2\ (##3).}
]}}
@@ -34465,12 +35009,12 @@ class="td%
\gdef\th@nonumberremark{%
\def\theorem@headerfont{\itshape}\normalfont%
\def\@begintheorem##1##2{%
- \LWR@inctheorem% new
+ \LWR@inctheorem% lwarp
\item[
\InlineClass{theoremheaderremark}{##1.}
]}%
\def\@opargbegintheorem##1##2##3{%
- \LWR@inctheorem% new
+ \LWR@inctheorem% lwarp
\item[
\InlineClass{theoremheaderremark}{##1\ (##3).}
]}}
@@ -34478,12 +35022,12 @@ class="td%
\gdef\th@proof{%
\def\theorem@headerfont{\normalfont\bfseries}\itshape%
\def\@begintheorem##1##2{%
- \LWR@inctheorem% new
+ \LWR@inctheorem% lwarp
\item[
\InlineClass{theoremheaderproof}{##1.}
]}%
\def\@opargbegintheorem##1##2##3{%
- \LWR@inctheorem% new
+ \LWR@inctheorem% lwarp
\item[
\InlineClass{theoremheaderproof}{##1\ (##3).}
]}}
@@ -35185,6 +35729,7 @@ class="td%
%
% \changes{v0.38}{2017/08/26}{\pkg{realscripts}: Added.}
% \changes{v0.42}{2017/10/16}{\pkg{realscripts}: Fix for subscripts in a \env{lateximage}.}
+% \changes{v0.47}{2018/01/26}{\pkg{realscripts}: Fix: Line wrap at \HTML\ hyphen.}
%
% \codehtml
%
@@ -35205,8 +35750,8 @@ class="td%
\newcommand*{\LWR@setrealscriptsalign}[1]{%
\renewcommand*{\LWR@realscriptsalign}{}%
-\ifthenelse{\equal{#1}{c}}{\renewcommand{\LWR@realscriptsalign}{text-align:center;}}{}%
-\ifthenelse{\equal{#1}{r}}{\renewcommand{\LWR@realscriptsalign}{text-align:right;}}{}%
+\ifthenelse{\equal{#1}{c}}{\renewcommand{\LWR@realscriptsalign}{\mbox{text-align:center} ; }}{}%
+\ifthenelse{\equal{#1}{r}}{\renewcommand{\LWR@realscriptsalign}{\mbox{text-align:right} ; }}{}%
}
\DeclareDocumentCommand \textsubsuperscript {s O{l} mm} {%
@@ -35562,6 +36107,7 @@ class="td%
% \usedbykomascript
%
% \changes{v0.44}{2017/11/20}{\pkg{scrextend}: Added.}
+% \changes{v0.47}{2018/01/26}{\pkg{scrextend}: Fix: Line wrap at \HTML\ hyphen.}
%
% \codehtml
%
@@ -35632,12 +36178,12 @@ class="td%
\DeclareDocumentCommand{\raggedfootnote}{}{}
\DeclareDocumentCommand{\dictum}{o m}{
-\begin{LWR@BlockClassWP}{text-align:right}{}{dictum}
+\begin{LWR@BlockClassWP}{\mbox{text-align:right}}{}{dictum}
#2
\IfValueT{#1}
{
\ifbool{FormatWP}
- {\begin{BlockClass}[border-top:1px solid gray]{dictumauthor}}
+ {\begin{BlockClass}[\mbox{border-top:} 1px solid gray]{dictumauthor}}
{\begin{BlockClass}{dictumauthor}}
\dictumauthorformat{#1}
\end{BlockClass}
@@ -35678,15 +36224,15 @@ class="td%
\ifblank{#2}
{
\begin{BlockClass}[
- margin-left:\rndprintlength{\LWR@templengthtwo} ;
- margin-right:\rndprintlength{\LWR@templengthtwo}
+ \mbox{margin-left:\rndprintlength{\LWR@templengthtwo}} ;
+ \mbox{margin-right:\rndprintlength{\LWR@templengthtwo}}
]{addmargin}
}
{
\setlength{\LWR@templengthone}{#2}
\begin{BlockClass}[
- margin-left:\rndprintlength{\LWR@templengthone} ;
- margin-right:\rndprintlength{\LWR@templengthtwo}
+ \mbox{margin-left:\rndprintlength{\LWR@templengthone}} ;
+ \mbox{margin-right:\rndprintlength{\LWR@templengthtwo}}
]{addmargin}
}
}
@@ -36011,6 +36557,51 @@ class="td%
%
%
%
+%
+%
+% \iffalse
+%<*sectionbreak>
+% \fi
+%
+% \part{lwarp-sectionbreak.sty}
+
+% \section{sectionbreak}
+%
+% \credits{Michal Hoftich}
+%
+% \DescribePackage{sectionbreak}
+% \pkg{sectionbreak} is patched for use by \pkg{lwarp}.
+%
+% \changes{v0.47}{2018/01/25}{\pkg{sectionbreak}: Added.}
+%
+% \codehtml
+%
+% \begin{macrocode}
+\LWR@ProvidesPackagePass{sectionbreak}
+% \end{macrocode}
+
+% \begin{macrocode}
+\renewcommand\asterism{\HTMLunicode{2042}}
+
+\renewcommand\pre@sectionbreak{}
+\renewcommand\post@sectionbreak{}
+
+\renewcommand\print@sectionbreak[1]{%
+\begin{center}
+#1
+\end{center}
+}
+
+% \end{macrocode}
+
+% \iffalse
+%</sectionbreak>
+% \fi
+%
+%
+%
+%
+%
% \iffalse
%<*sectsty>
% \fi
@@ -36328,29 +36919,33 @@ class="td%
%
% The following patch \pkg{sidenotes} for use with \pkg{lwarp}:
%
-% Stop paragraph handling while creating the caption:
+% \begin{noindmacro}{\sidecaption} * \oarg{entry} \oarg{offset} \marg{text}
+% \changes{v0.47}{2018/01/30}{\pkg{sidenotes}: Fix for \SVG\ math in captions.}
% \begin{macrocode}
-\RenewDocumentCommand \sidecaption {s o o m}
+\RenewDocumentCommand \sidecaption {s o o +m}
{
\LWR@stoppars
+ \begingroup
\captionsetup{style=sidecaption}
\IfBooleanTF{#1}
{ % starred
- \IfNoValueOrEmptyTF{#2}
- {\marginnote{\caption*{#4}}}
- {\marginnote{\caption*{#4}}[#2]}
+ \begin{BlockClass}[border:none ; box-shadow:none]{marginblock}
+ \caption*{#4}
+ \end{BlockClass}
}
{ % unstarred
\IfNoValueOrEmptyTF{#2}
{\def\@sidenotes@sidecaption@tof{#4}}
{\def\@sidenotes@sidecaption@tof{#2}}
- \IfNoValueOrEmptyTF{#3}
- {\marginnote{\caption[\@sidenotes@sidecaption@tof]{#4}}}
- {\marginnote{\caption[\@sidenotes@sidecaption@tof]{#4}}[#3]}
+ \begin{BlockClass}[border:none ; box-shadow:none]{marginblock}
+ \caption[\@sidenotes@sidecaption@tof]{#4}
+ \end{BlockClass}
}
+ \endgroup
\LWR@startpars
}
% \end{macrocode}
+% \end{noindmacro}
%
%
%
@@ -36777,8 +37372,18 @@ class="td%
% The outer minipage allows side-by-side subfloats with \cs{hfill} between.
% \begin{macrocode}
\long\def\sf@@@subfloat#1[#2][#3]#4{%
-\begin{minipage}{\linewidth}% new
-\LWR@stoppars% new
+\begin{minipage}{\linewidth}% lwarp
+% \end{macrocode}
+% \changes{v0.47}{2018/01/30}{\pkg{subfig}: Fix: Support \cs{nameref}.}
+% \begin{macrocode}
+\IfValueTF{#2}{%
+ \LWR@setlatestname{#2}%
+}{%
+ \IfValueTF{#3}{%
+ \LWR@setlatestname{#3}%
+ }{}%
+}%
+\LWR@stoppars% lwarp
\@ifundefined{FBsc@max}{}%
{\FB@readaux{\let\FBsuboheight\relax}}%
\@tempcnta=\@ne
@@ -36795,15 +37400,18 @@ class="td%
\sf@bottom=\sf@nearskip
\fi
\leavevmode
- \setbox\@tempboxa \hbox{#4}%
- \@tempdima=\wd\@tempboxa
- \@ifundefined{FBsc@max}{}%
- {\global\advance\Xhsize-\wd\@tempboxa
- \dimen@=\ht\@tempboxa
- \advance\dimen@\dp\@tempboxa
- \ifdim\dimen@>\FBso@max
- \global\FBso@max\dimen@
- \fi}%
+% \end{macrocode}
+% \changes{v0.47}{2018/01/30}{\pkg{subfig}: Fix for \SVG\ math in captions.}
+% \begin{macrocode}
+% \setbox\@tempboxa \hbox{#4}%
+% \@tempdima=\wd\@tempboxa
+% \@ifundefined{FBsc@max}{}%
+% {\global\advance\Xhsize-\wd\@tempboxa
+% \dimen@=\ht\@tempboxa
+% \advance\dimen@\dp\@tempboxa
+% \ifdim\dimen@>\FBso@max
+% \global\FBso@max\dimen@
+% \fi}%
% \end{macrocode}
% Do not use boxes, which interfere with |lateximage|s:
% \changes{v0.45}{2018/01/12}{\pkg{subfig}: Fix: Math in subcaptions.}
@@ -36828,12 +37436,12 @@ class="td%
% \vskip\sf@captopadj
\fi\egroup
% \hrule width0pt height0pt depth0pt
- \LWR@startpars% new
+ \LWR@startpars% lwarp
% \box\@tempboxa
#4
- \LWR@stoppars% new
+ \LWR@stoppars% lwarp
}{%
- \LWR@startpars% new
+ \LWR@startpars% lwarp
\@ifundefined{FBsc@max}%
{
% \box\@tempboxa
@@ -36846,7 +37454,7 @@ class="td%
% \vbox to \FBsuboheight{\FBafil\box\@tempboxa\FBbfil}%
#4
\fi}%
- \LWR@stoppars% new
+ \LWR@stoppars% lwarp
\egroup
\ifx \@empty#3\relax \else
% \vskip\sf@capskip
@@ -36864,8 +37472,8 @@ class="td%
\ifmaincaptiontop\else
\global\advance\@nameuse{c@\@captype}\m@ne
\fi
-\end{minipage}% new
-\LWR@startpars% new
+\end{minipage}% lwarp
+\LWR@startpars% lwarp
\endgroup\ignorespaces%
}%
% \end{macrocode}
@@ -36875,7 +37483,7 @@ class="td%
% \marg{1 type} \marg{2 lof entry} \marg{3 caption}
% \begin{macrocode}
\long\def\sf@subcaption#1#2#3{%
-\LWR@stoppars% new
+\LWR@stoppars% lwarp
\ifx \relax#2\relax \else
\bgroup
\let\label=\@gobble
@@ -36906,8 +37514,8 @@ class="td%
% {\box0}%
{
% \parbox[t]{\the\@tempdima}{%
-\LWR@traceinfo{sfsubcap B1}% new
- \LWR@figcaption% new
+\LWR@traceinfo{sfsubcap B1}% lwarp
+ \LWR@figcaption% lwarp
\caption@make
{\@nameuse{sub\@captype name}}%
{\@nameuse{thesub\@captype}}%
@@ -36915,8 +37523,8 @@ class="td%
% \end{macrocode}
% \changes{v0.45}{2017/12/18}{\pkg{subfig}: Fix for subcaption end tag.}
% \begin{macrocode}
- \endLWR@figcaption% new
-\LWR@traceinfo{sfsubcap B2}% new
+ \endLWR@figcaption% lwarp
+\LWR@traceinfo{sfsubcap B2}% lwarp
% }%
}%
{\dimen@\ht0%
@@ -36939,12 +37547,12 @@ class="td%
% \hss
% \next{%
-\LWR@traceinfo{sfsubcap C1}% new
+\LWR@traceinfo{sfsubcap C1}% lwarp
\caption@make
{\@nameuse{sub\@captype name}}%
{\@nameuse{thesub\@captype}}%
{#3}
-\LWR@traceinfo{sfsubcap C1}% new
+\LWR@traceinfo{sfsubcap C1}% lwarp
% }%
% \hss
@@ -36952,74 +37560,18 @@ class="td%
% }
}%
\egroup
-\LWR@startpars% new
-}
-% \end{macrocode}
-% \end{noindmacro}
-
-% \begin{noindmacro}{\caption@@@make}
-% \marg{caption label} \marg{caption text}
-% \begin{macrocode}
-\renewcommand\caption@@@make[2]{%
-\LWR@startpars% new
- \sbox\@tempboxa{#1}%
- \ifdim\wd\@tempboxa=\z@
- \let\caption@lsep\relax
- \fi
- \caption@ifempty{#2}{%
- \let\caption@lsep\@empty
- \let\caption@tfmt\@firstofone
- }%
-% \@setpar{\@@par\caption@@par}\caption@@par
- \renewcommand{\@@par}{\LWR@closeparagraph\LWR@orig@@par}% new
- \caption@applyfont
- \caption@fmt
- {\ifcaption@star\else
- \begingroup
- \captionlabelfont
- #1%
- \endgroup
- \fi}%
- {\ifcaption@star\else
- \begingroup
- \caption@iflf\captionlabelfont
- \relax\caption@lsep
- \endgroup
- \fi}%
- {{\captiontextfont
- \caption@ifstrut
- {\vrule\@height\ht\strutbox\@width\z@}%
- {}%
- \nobreak\hskip\z@skip % enable hyphenation
- \caption@tfmt{#2}
- \LWR@ensuredoingapar% new
- \caption@ifstrut
- {\ifhmode\@finalstrut\strutbox\fi}%
- {}%
- \par}}
-\LWR@stoppars% new
+\LWR@startpars% lwarp
}
% \end{macrocode}
% \end{noindmacro}
-% ^^A *8* move to caption itself?
-% \begin{noindmacro}{\caption@@make@} \marg{} \marg{}
-% \begin{macrocode}
-\renewcommand{\caption@@make@}[2]{%
- \caption@stepthecounter
- \caption@beginhook
- \caption@@@make{#1}{#2}%
- \caption@endhook
-}
-% \end{macrocode}
-% \end{noindmacro}
% \begin{noindmacro}{\subfloat@label}
% Patches for \cs{sf@sub@label}:
% \begin{macrocode}
\def\subfloat@label{%
-\LWR@ensuredoingapar% new
+\LWR@ensuredoingapar% lwarp
\@ifnextchar(% %) match left parenthesis
{\sf@sub@label}
{\sf@sub@label(Sub\@captype\space
@@ -37797,11 +38349,11 @@ class="td%
\@ifundefined{th@#1}{\@warning
{Unknown theoremstyle `#1'. Using `plain'}%
\theorem@style{plain}%
- \renewcommand{\LWR@newtheoremstyle}{plain}% new
+ \renewcommand{\LWR@newtheoremstyle}{plain}% lwarp
}%
{%
\theorem@style{#1}%
- \renewcommand{\LWR@newtheoremstyle}{#1}% new
+ \renewcommand{\LWR@newtheoremstyle}{#1}% lwarp
}%
\begingroup
\csname th@\the\theorem@style \endcsname
@@ -37814,7 +38366,7 @@ class="td%
\gdef\@xnthm#1#2[#3]{%
\expandafter\@ifdefinable\csname #1\endcsname
{%
- \csedef{LWR@thmstyle#1}{\LWR@newtheoremstyle}% new
+ \csedef{LWR@thmstyle#1}{\LWR@newtheoremstyle}% lwarp
\@definecounter{#1}\@newctr{#1}[#3]%
\expandafter\xdef\csname the#1\endcsname
{\expandafter \noexpand \csname the#3\endcsname
@@ -37825,20 +38377,20 @@ class="td%
\expandafter \endcsname \the \theorem@bodyfont
\@thm{#1}{#2}}%
\global \expandafter \let \csname end#1\endcsname \@endtheorem
- \AtBeginEnvironment{#1}{\edef\LWR@thisthmstyle{\csuse{LWR@thmstyle#1}}}% new
+ \AtBeginEnvironment{#1}{\edef\LWR@thisthmstyle{\csuse{LWR@thmstyle#1}}}% lwarp
}}
\gdef\@ynthm#1#2{%
\expandafter\@ifdefinable\csname #1\endcsname
{
- \csedef{LWR@thmstyle#1}{\LWR@newtheoremstyle}% new
+ \csedef{LWR@thmstyle#1}{\LWR@newtheoremstyle}% lwarp
\@definecounter{#1}%
\expandafter\xdef\csname the#1\endcsname{\@thmcounter{#1}}%
\def\@tempa{\global\@namedef{#1}}\expandafter \@tempa
\expandafter{\csname th@\the \theorem@style \expandafter
\endcsname \the\theorem@bodyfont \@thm{#1}{#2}}%
\global \expandafter \let \csname end#1\endcsname \@endtheorem
- \AtBeginEnvironment{#1}{\edef\LWR@thisthmstyle{\csuse{LWR@thmstyle#1}}}% new
+ \AtBeginEnvironment{#1}{\edef\LWR@thisthmstyle{\csuse{LWR@thmstyle#1}}}% lwarp
}}
\gdef\@othm#1[#2]#3{%
@@ -37847,14 +38399,14 @@ class="td%
\else
\expandafter\@ifdefinable\csname #1\endcsname
{
- \csedef{LWR@thmstyle#1}{\LWR@newtheoremstyle}% new
+ \csedef{LWR@thmstyle#1}{\LWR@newtheoremstyle}% lwarp
\expandafter \xdef \csname the#1\endcsname
{\expandafter \noexpand \csname the#2\endcsname}%
\def\@tempa{\global\@namedef{#1}}\expandafter \@tempa
\expandafter{\csname th@\the \theorem@style \expandafter
\endcsname \the\theorem@bodyfont \@thm{#2}{#3}}%
\global \expandafter \let \csname end#1\endcsname \@endtheorem
- \AtBeginEnvironment{#1}{\edef\LWR@thisthmstyle{\csuse{LWR@thmstyle#1}}}% new
+ \AtBeginEnvironment{#1}{\edef\LWR@thisthmstyle{\csuse{LWR@thmstyle#1}}}% lwarp
}%
\fi}
% \end{macrocode}
@@ -37959,8 +38511,8 @@ class="td%
% \changes{v0.46}{2018/01/22}{\pkg{theorem}: Adapt to \env{trivlist} changes.}
% \begin{macrocode}
\gdef\@thm#1#2{\refstepcounter{#1}%
-\LWR@forcenewpage% new
- \BlockClass{theorembody\LWR@thisthmstyle}% new
+\LWR@forcenewpage% lwarp
+ \BlockClass{theorembody\LWR@thisthmstyle}% lwarp
\trivlist
\@topsep \theorempreskipamount % used by first \item
\@topsepadd \theorempostskipamount % used by \@endparenv
@@ -41330,6 +41882,30 @@ scaling = false
%
%
%
+% \iffalse
+%<*xurl>
+% \fi
+%
+% \part{lwarp-xurl.sty}
+%
+% \section{xurl}
+%
+% \DescribePackage{xurl}
+% \pkg{xurl} is ignored.
+%
+% \changes{v0.47}{2018/01/25}{\pkg{xurl}: Added.}
+%
+% \codehtml
+%
+% \begin{macrocode}
+\LWR@ProvidesPackageDrop{xurl}
+% \end{macrocode}
+%
+% \iffalse
+%</xurl>
+% \fi
+%
+%
%
% \iffalse
%<*zwpagelayout>
diff --git a/Master/texmf-dist/source/latex/lwarp/lwarp.ins b/Master/texmf-dist/source/latex/lwarp/lwarp.ins
index c81bb886800..d58e6544362 100644
--- a/Master/texmf-dist/source/latex/lwarp/lwarp.ins
+++ b/Master/texmf-dist/source/latex/lwarp/lwarp.ins
@@ -20,7 +20,7 @@
%% \usedir{tex/latex/ package }
\preamble
This is a generated file.
-Copyright 2016-2017 Brian Dunn
+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
@@ -54,12 +54,15 @@ version 2005/12/01 or later.
\file{lwarp-balance.sty}{\from{lwarp.dtx}{balance}}
\file{lwarp-bigdelim.sty}{\from{lwarp.dtx}{bigdelim}}
\file{lwarp-bigstrut.sty}{\from{lwarp.dtx}{bigstrut}}
+\file{lwarp-blowup.sty}{\from{lwarp.dtx}{blowup}}
\file{lwarp-bookmark.sty}{\from{lwarp.dtx}{bookmark}}
\file{lwarp-booktabs.sty}{\from{lwarp.dtx}{booktabs}}
\file{lwarp-boxedminipage.sty}{\from{lwarp.dtx}{boxedminipage}}
\file{lwarp-boxedminipage2e.sty}{\from{lwarp.dtx}{boxedminipage2e}}
\file{lwarp-breakurl.sty}{\from{lwarp.dtx}{breakurl}}
\file{lwarp-cancel.sty}{\from{lwarp.dtx}{cancel}}
+\file{lwarp-caption.sty}{\from{lwarp.dtx}{caption}}
+\file{lwarp-caption2.sty}{\from{lwarp.dtx}{caption2}}
\file{lwarp-ccaption.sty}{\from{lwarp.dtx}{ccaption}}
\file{lwarp-changebar.sty}{\from{lwarp.dtx}{changebar}}
\file{lwarp-changepage.sty}{\from{lwarp.dtx}{changepage}}
@@ -79,6 +82,7 @@ version 2005/12/01 or later.
\file{lwarp-ellipsis.sty}{\from{lwarp.dtx}{ellipsis}}
\file{lwarp-emptypage.sty}{\from{lwarp.dtx}{emptypage}}
\file{lwarp-endfloat.sty}{\from{lwarp.dtx}{endfloat}}
+\file{lwarp-endheads.sty}{\from{lwarp.dtx}{endheads}}
\file{lwarp-endnotes.sty}{\from{lwarp.dtx}{endnotes}}
\file{lwarp-enumerate.sty}{\from{lwarp.dtx}{enumerate}}
\file{lwarp-enumitem.sty}{\from{lwarp.dtx}{enumitem}}
@@ -154,6 +158,7 @@ version 2005/12/01 or later.
\file{lwarp-mparhack.sty}{\from{lwarp.dtx}{mparhack}}
\file{lwarp-multicol.sty}{\from{lwarp.dtx}{multicol}}
\file{lwarp-multirow.sty}{\from{lwarp.dtx}{multirow}}
+\file{lwarp-multitoc.sty}{\from{lwarp.dtx}{multitoc}}
\file{lwarp-nameref.sty}{\from{lwarp.dtx}{nameref}}
\file{lwarp-natbib.sty}{\from{lwarp.dtx}{natbib}}
\file{lwarp-needspace.sty}{\from{lwarp.dtx}{needspace}}
@@ -192,6 +197,7 @@ version 2005/12/01 or later.
\file{lwarp-scrlayer-notecolumn.sty}{\from{lwarp.dtx}{scrlayer-notecolumn}}
\file{lwarp-scrlayer-scrpage.sty}{\from{lwarp.dtx}{scrlayer-scrpage}}
\file{lwarp-section.sty}{\from{lwarp.dtx}{section}}
+\file{lwarp-sectionbreak.sty}{\from{lwarp.dtx}{sectionbreak}}
\file{lwarp-sectsty.sty}{\from{lwarp.dtx}{sectsty}}
\file{lwarp-setspace.sty}{\from{lwarp.dtx}{setspace}}
\file{lwarp-shadow.sty}{\from{lwarp.dtx}{shadow}}
@@ -244,6 +250,7 @@ version 2005/12/01 or later.
\file{lwarp-xltxtra.sty}{\from{lwarp.dtx}{xltxtra}}
\file{lwarp-xmpincl.sty}{\from{lwarp.dtx}{xmpincl}}
\file{lwarp-xtab.sty}{\from{lwarp.dtx}{xtab}}
+\file{lwarp-xurl.sty}{\from{lwarp.dtx}{xurl}}
\file{lwarp-zwpagelayout.sty}{\from{lwarp.dtx}{zwpagelayout}}
\file{lwarp-patch-komascript.sty}{\from{lwarp.dtx}{patch-komascript}}
\file{lwarp-patch-memoir.sty}{\from{lwarp.dtx}{patch-memoir}}