From 8d5625f5e48587e6ca4304739304ed11b17cb26c Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Wed, 9 Oct 2019 03:01:25 +0000 Subject: CTAN sync 201910090301 --- macros/latex/contrib/lwarp/README.txt | 2 +- macros/latex/contrib/lwarp/lwarp.dtx | 177 ++++++++++++++++++++++++++++----- macros/latex/contrib/lwarp/lwarp.pdf | Bin 2488031 -> 2486196 bytes macros/latex/contrib/lwarp/lwarpmk.lua | 2 +- 4 files changed, 154 insertions(+), 27 deletions(-) (limited to 'macros/latex/contrib/lwarp') diff --git a/macros/latex/contrib/lwarp/README.txt b/macros/latex/contrib/lwarp/README.txt index a38ce84fc4..76ba121f6c 100644 --- a/macros/latex/contrib/lwarp/README.txt +++ b/macros/latex/contrib/lwarp/README.txt @@ -1,5 +1,5 @@ -LaTeX lwarp package v0.75 README.txt +LaTeX lwarp package v0.76 README.txt Files included are: diff --git a/macros/latex/contrib/lwarp/lwarp.dtx b/macros/latex/contrib/lwarp/lwarp.dtx index 7bedf7e6dd..f06f7506e0 100644 --- a/macros/latex/contrib/lwarp/lwarp.dtx +++ b/macros/latex/contrib/lwarp/lwarp.dtx @@ -16,7 +16,7 @@ % \iffalse %\NeedsTeXFormat{LaTeX2e}[1999/12/01] %\ProvidesPackage{lwarp} -% [2019/09/23 v0.75 Allows LaTeX to directly produce HTML5 output.] +% [2019/10/08 v0.76 Allows LaTeX to directly produce HTML5 output.] % %<*driver> \documentclass{ltxdoc} @@ -2679,7 +2679,7 @@ This boolean may be tested by the user for later use. %<*package> % \fi % -% \CheckSum{33352} +% \CheckSum{33386} % % \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 @@ -2797,6 +2797,7 @@ This boolean may be tested by the user for later use. % \changes{v0.73}{2019/07/11}{\ 2019/07/11} % \changes{v0.74}{2019/09/02}{\ 2019/09/02} % \changes{v0.75}{2019/09/23}{\ 2019/09/23} +% \changes{v0.76}{2019/10/08}{\ 2019/10/08} @@ -3017,6 +3018,23 @@ This boolean may be tested by the user for later use. % % \begin{description} % \needspace{2\baselineskip} +% \item[v0.76:] \brand{MathJax}, updates for \LaTeX\ 2019/10 release. +% \begin{itemize} +% \item Docs: Expanded documentation regarding the use of multiple projects +% \margintag{docs} +% in the same directory. See \cref{sec:multipleprojects}. +% \item \brand{MathJax}: Updated to v2.7.6. +% \margintag{\brand{MathJax}} +% \item \pkg{xr}: Updated to v5.05. +% \margintag{packages} +% \item \pkg{xr-hyper}: Updated to v6.1. +% \item Verified works as-is with \pkg{xcite}. +% \item \pkg{acro}: Updated to v2.10. +% \item Currently broken by the 2019/10 \LaTeX\ update: +% \watchout[broken] +% \pkg{breqn}, \pkg{grffile}, \pkg{multimedia}, \pkg{movie15}. +% \end{itemize} +% \needspace{2\baselineskip} % \item[v0.75:] \pkg{keyfloat}, \pkg{wrapfig} % \begin{itemize} % \item \cs{minipage}: Fix for \cs{linewidth}. @@ -3149,7 +3167,8 @@ This boolean may be tested by the user for later use. % is used. % \item Fixes for \cs{makebox}. % \item Fixes for \cs{parbox} inside a \element{span}. -% \item MathJax: Updated to v2.7.5. Loads the \filenm{autoload-all.js} extension. +% \item \brand{MathJax}: Updated to v2.7.5. +% Loads the \filenm{autoload-all.js} extension. % Added \cs{MathJaxFilename} to select custom scripts. % \item \pkg{textcomp}, \pkg{xunicode}: Fix for \cs{textinterrobang}. % \margintag{packages} @@ -4795,8 +4814,8 @@ This boolean may be tested by the user for later use. % Cross-references: & % \ipkg{bookmark}, \epkg{breakurl}, \spkg{cleveref}, \epkg{fancyref}, % \ipkg{hypdestopt}, \epkg{hyperref}, \epkg{perpage}, \mpkg{prettyref}, -% \epkg{titleref}, \mpkg{url}, \spkg{varioref}, \mpkg{xr}, \mpkg{xr-hyper}, -% \ipkg{xurl}. \\ +% \epkg{titleref}, \mpkg{url}, \spkg{varioref}, \spkg{xcite}, +% \mpkg{xr}, \mpkg{xr-hyper}, \ipkg{xurl}. \\ % % \midrule % @@ -6180,6 +6199,20 @@ This boolean may be tested by the user for later use. % % % \subsection{Processing multiple projects in the same directory} +% \label{sec:multipleprojects} +% \gindex{multiple projects in a directory} +% \gindex{projects} +% \gindex{xr=\pkg{xr}} +% \gindex{xr-hyper=\pkg{xr-hyper}} +% \gindex{xcite=\pkg{xcite}} +% \trouble{multiple projects in a directory} +% \trouble{projects>multiple} +% \trouble{file>multiple projects in directory} +% \trouble[\pkg{xr}, \pkg{xr-hyper}, \pkg{xcite}]{xr=\pkg{xr}} +% \trouble{xr-hyper=\pkg{xr-hyper}} +% \trouble{xcite=\pkg{xcite}} +% +% \changes{v0.76}{2019/10/08}{Docs expanded: Multiple projects.} % % It is possible to have several projects in the same directory. % \prog{lwarpmk} has an optional parameter which is the document to compile. @@ -6195,8 +6228,25 @@ This boolean may be tested by the user for later use. % % To compile each project with |lwarkmk|: % \userentry{lwarpmk print -p project\_a} +% \userentry{lwarpmk print -p project\_b} +% \userentry{lwarpmk html -p project\_a} % \userentry{lwarpmk html -p project\_b} % +% To generate each project's images: +% \userentry{lwarpmk limages -p project\_a} +% \userentry{lwarpmk limages -p project\_b} +% +% To clean each project's images: +% \userentry{lwarpmk cleanlimages -p project\_a} +% \userentry{lwarpmk cleanlimages -p project\_b} +% +% To clean each project's auxiliary files: +% \userentry{lwarpmk cleanall -p project\_a} +% \userentry{lwarpmk cleanall -p project\_b} +% +% If using \prog{bibtex}, for example, the \HTML\ version must also be processed: +% \userentry{bibtex project\_a\textred{\_html}} +% % % \subsection{Using the \prog{make} utility} % @@ -6210,6 +6260,8 @@ This boolean may be tested by the user for later use. % tags (|project_html.pdf|), then \prog{lwarpmk} may be used to % convert each target to \HTML\ files. % +% \clearpage +% % \subsection{What next?} % \label{sec:whatnext} % @@ -8134,6 +8186,11 @@ This boolean may be tested by the user for later use. % \limitsmanyfootbigfoot % % +% \subsubsection{\pkg{xr}, \pkg{xr-hyper}, and \pkg{xcite} packages} +% +% See \cref{sec:multipleprojects}. +% +% % \subsection{Front and back matter} % \label{sec:frontbackmatter} % @@ -8248,7 +8305,7 @@ This boolean may be tested by the user for later use. % \limitsendnotes % % -% \subsubsection{\brand{BibTeX}} +% \subsubsection{\prog{BibTeX}} % \label{sec:limitsbibtex} % \DescribeMacro{\etalchar} Displays a superscript ``+'' to indicate ``and others''. % \changes{v0.54}{2018/03/09}{Docs: BibTeX.} @@ -8256,6 +8313,11 @@ This boolean may be tested by the user for later use. % \limitsbibtex % % +% \subsubsection{\pkg{xcite} package} +% +% See \cref{sec:multipleprojects}. +% +% % \needspace{6\baselineskip} % \subsubsection{\pkg{gloss} package} % \label{sec:gloss} @@ -13327,6 +13389,10 @@ This boolean may be tested by the user for later use. % % \changes{v0.34}{2017/08/02}{\pkg{filecontents}: Required. Patched for \pkg{morewrites}.} % +% (Recent versions of \LaTeX\ (as of Fall 2019) now include the functionality +% of the \pkg{filecontents} package, but the package will still be used +% for those who still have older installations.) +% % \begin{macrocode} \RequirePackage{filecontents} @@ -15305,6 +15371,7 @@ This boolean may be tested by the user for later use. % \changes{v0.73}{2019/06/30}{\filenm{lwarp.css}: Improved pkg{tocdata} formatting.} % \changes{v0.74}{2019/08/04}{\filenm{lwarp.css}: Added \pkg{lyluatex}.} % \changes{v0.75}{2019/09/22}{\filenm{lwarp.css}: Improved marginblock.} +% \changes{v0.76}{2019/10/02}{\filenm{lwarp.css}: Fix for small caps.} % % ^^A *lwarp.css % @@ -15394,6 +15461,12 @@ span.texteb { font-weight: bolder; } span.textlg { font-weight: lighter; } +span.textup, div.textup { + font-style: normal; + font-variant: normal; + font-variant-numeric: normal ; +} + span.textsc, div.textsc { font-variant: small-caps; font-variant-numeric: oldstyle-nums ; @@ -15406,12 +15479,6 @@ span.textulc, div.textulc { span.textsl, div.textsl { font-style: oblique; } -span.textup, div.textup { - font-style: normal; - font-variant: normal; - font-variant-numeric: normal ; -} - span.textrm, div.textrm { font-family: "DejaVu Serif", "Bitstream Vera Serif", "Lucida Bright", Georgia, serif; @@ -17627,6 +17694,7 @@ page_compositor "." % \changes{v0.62}{2018/11/05}{File: \filenm{lwarp_mathjax.txt}: Removed inoperable \pkg{siunitx} extension.} % \changes{v0.70}{2019/03/24}{File: \filenm{lwarp_mathjax.txt}: Updated to MathJax v2.7.5.} % \changes{v0.70}{2019/03/24}{File: \filenm{lwarp_mathjax.txt}: Loads \filenm{autoload-all.js} extension.} +% \changes{v0.76}{2019/10/05}{File: \filenm{lwarp_mathjax.txt}: Updated to MathJax v2.7.6.} % % ^^A *lwarp_mathjax.txt % @@ -17716,7 +17784,7 @@ MathJax.Hub.Config({ @@ -17872,7 +17940,7 @@ src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX- -- Copyright 2016-2019 Brian Dunn -printversion = "v0.75" +printversion = "v0.76" requiredconfversion = "2" -- also at *lwarpmk.conf function printhelp () @@ -37797,8 +37865,60 @@ color:\LWR@origpound\LWR@tempcolor% % \end{macrocode} % Modified to activate the current font: +% \changes{v0.76}{2019/10/07}{\pkg{acro}: Updated for v2.10.} % \begin{macrocode} \ExplSyntaxOn +\@ifpackagelater{acro}{2019/09/23}% +{% v2.10 or later +\cs_gset_protected:Npn \__acro_typeset:nn #1#2 + { + \mode_if_horizontal:F { \leavevmode } + \group_begin: + \use:x + { + \bool_if:cTF {l__acro_custom_#1_format_bool} + { \exp_not:v {l__acro_custom_#1_format_tl} } + { \exp_not:v {l__acro_#1_format_tl} } + {\exp_not:N\LWR@textcurrentfont{#2}}% lwarp + } + \group_end: + } + +\cs_gset_protected:Npn \__acro_ending_format:nn #1#2 + { + \bool_if:NTF \l__acro_include_endings_format_bool + { + \str_case:nn {#1} + { + {long} + { + \bool_if:NTF \l__acro_custom_long_format_bool + { \l__acro_custom_long_format_tl } + { + \bool_if:NTF \l__acro_first_instance_bool + { \l__acro_first_long_format_tl } + { \l__acro_long_format_tl } + } + } + {short} + { + \bool_if:NTF \l__acro_custom_short_format_bool + { \l__acro_custom_short_format_tl } + { \l__acro_short_format_tl } + } + {alt} + { + \bool_if:NTF \l__acro_custom_alt_format_bool + { \l__acro_custom_alt_format_tl } + { \l__acro_alt_format_tl } + } + } + } + { \use:n } + {\exp_not:N\LWR@textcurrentfont{#2}}% lwarp + } +}% v2.10 or later +{% before v2.10 \cs_gset_protected:Npn \acro_write_short:nn #1#2 { \mode_if_horizontal:F { \leavevmode } @@ -37843,6 +37963,7 @@ color:\LWR@origpound\LWR@tempcolor% } \group_end: } +}% before v2.10 \ExplSyntaxOff % \end{macrocode} @@ -69407,28 +69528,29 @@ height:\LWR@printlength{\LWR@tempheight}% % % \DescribePackage{xr} % \pkg{xr} is patched for use by \pkg{lwarp}. +% The \filenm{*_html.aux} file is used. +% \cs{externaldocument} is modified to also accept the optional +% arguments for \pkg{xr-hyper}, which currently uses \pkg{xr} for \HTML\ output. +% +% See \cref{sec:multipleprojects}. % % \changes{v0.72}{2019/06/05}{\pkg{xr}: Added.} +% \changes{v0.76}{2019/10/08}{\pkg{xr}: Updated for v5.05 and \pkg{xr-hyper} v6.1.} % % \codehtml % -% \pkg{lwarp-xr-hyper} also uses \pkg{lwarp-xr} -% to reuse the following definition. -% Only load \pkg{xr} if \pkg{xr-hyper} has not been loaded: % \begin{macrocode} -\ifdef{\externaldocument}{}{ - \LWR@ProvidesPackagePass{xr}[2019/01/05] -} +\LWR@ProvidesPackagePass{xr}[2019/07/22]% % \end{macrocode} % % \begin{macrocode} \LetLtxMacro\LWR@orig@externaldocument\externaldocument -\renewcommand*{\externaldocument}[2][]{% +\RenewDocumentCommand{\externaldocument}{O{} O{} m O{}}{% \ifblank{#1}{% - \LWR@orig@externaldocument{#2_html}% + \LWR@orig@externaldocument{#3_html}% }{% - \LWR@orig@externaldocument[#1]{#2_html}% + \LWR@orig@externaldocument[#1]{#3_html}% }% } % \end{macrocode} @@ -69452,14 +69574,19 @@ height:\LWR@printlength{\LWR@tempheight}% % \credits{David Carlisle} % % \DescribePackage{xr-hyper} -% \pkg{xr-hyper} is patched for use by \pkg{lwarp}. +% \pkg{xr-hyper} is replaced by \pkg{xr}, which is modified to +% accept the optional arguments for \cs{externaldocument}. +% So far, no hyperlinks are provided for citations. +% +% See \cref{sec:multipleprojects}. % % \changes{v0.72}{2019/06/05}{\pkg{xr-hyper}: Added.} +% \changes{v0.76}{2019/10/08}{\pkg{xr-hyper}: Updated for v6.1.} % % \codehtml % % \begin{macrocode} -\LWR@ProvidesPackagePass{xr-hyper}[2000/03/22] +\LWR@ProvidesPackageDrop{xr-hyper}[2019/10/03]% \LWR@origRequirePackage{lwarp-xr} % \end{macrocode} diff --git a/macros/latex/contrib/lwarp/lwarp.pdf b/macros/latex/contrib/lwarp/lwarp.pdf index 5b3f9d64b1..9f7650452e 100644 Binary files a/macros/latex/contrib/lwarp/lwarp.pdf and b/macros/latex/contrib/lwarp/lwarp.pdf differ diff --git a/macros/latex/contrib/lwarp/lwarpmk.lua b/macros/latex/contrib/lwarp/lwarpmk.lua index 329fa4f3f1..e0477be8a6 100755 --- a/macros/latex/contrib/lwarp/lwarpmk.lua +++ b/macros/latex/contrib/lwarp/lwarpmk.lua @@ -2,7 +2,7 @@ -- Copyright 2016-2019 Brian Dunn -printversion = "v0.75" +printversion = "v0.76" requiredconfversion = "2" -- also at *lwarpmk.conf function printhelp () -- cgit v1.2.3