From ba3d555da29f2da7ca04bf225218e22c8d12d7f8 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Sun, 18 Jul 2021 03:00:52 +0000 Subject: CTAN sync 202107180300 --- macros/latex/contrib/easybook/easybook.dtx | 26 +-- macros/latex/contrib/easybook/easybook.pdf | Bin 591476 -> 591248 bytes macros/latex/contrib/longdivision/README.md | 3 + macros/latex/contrib/longdivision/longdivision.sty | 15 +- .../contrib/longdivision/longdivision_manual.pdf | Bin 155728 -> 152721 bytes .../contrib/longdivision/longdivision_manual.tex | 2 +- macros/latex/contrib/lwarp/README.txt | 2 +- macros/latex/contrib/lwarp/lwarp.dtx | 176 ++++++++++++++++----- macros/latex/contrib/lwarp/lwarp.ins | 1 + macros/latex/contrib/lwarp/lwarp.pdf | Bin 3210245 -> 3118198 bytes macros/latex/contrib/lwarp/lwarpmk.lua | 4 +- macros/latex/contrib/macrolist/README.md | 2 +- macros/latex/contrib/macrolist/macrolist.dtx | 64 ++++---- macros/latex/contrib/macrolist/macrolist.pdf | Bin 183759 -> 188569 bytes 14 files changed, 202 insertions(+), 93 deletions(-) (limited to 'macros/latex') diff --git a/macros/latex/contrib/easybook/easybook.dtx b/macros/latex/contrib/easybook/easybook.dtx index 7bcb369515..80b435a4e2 100644 --- a/macros/latex/contrib/easybook/easybook.dtx +++ b/macros/latex/contrib/easybook/easybook.dtx @@ -28,7 +28,7 @@ % % \title{\sffamily easybook 文档类手册} % \author{瞿毅} -% \date{2021/07/16\hskip\ccwd\relax v1.27g\thanks{\url{https://gitee.com/texl3/easybook}}} +% \date{2021/07/16\hskip\ccwd\relax v1.27h\thanks{\url{https://gitee.com/texl3/easybook}}} % % \maketitle % \begin{abstract} @@ -148,7 +148,7 @@ % cjkfont = % \end{syntax} % 中文字体采用 \CTeX 宏集包含的字库并与其一致,具体配置方案可以查看 \CTeX 使用手册。它与 \opt{fontset} 选项是等效的,如果没有指定 \opt{cjkfont} 的值,将会自动检测用户的操作系统并选择相应的字体。 -% \changes{v1.27g}{2021/07/12}{新增 \opt{cjkfont} 选项设置中文字体,原 \opt{font} 选项设置英文字体,中文字体使用 \CTeX 的字库。} +% \changes{v1.27h}{2021/07/12}{新增 \opt{cjkfont} 选项设置中文字体,原 \opt{font} 选项设置英文字体,中文字体使用 \CTeX 的字库。} % \end{function} % % 如果需要使用其它中文字体,可以在启用选项 \opt{cjkfont = none} 后,再使用 \pkg{xeCJK} 宏包的相关命令设置字体以及声明字体族: @@ -592,12 +592,12 @@ % \item[style] 用 \tn{declaretheoremstyle} 定义的定理样式的名称,定理将使用这种样式的设置。 % \end{optdesc} % \item[\tn{DeclareTheorem}] \tn{DeclareTheorem} 是更便捷的定理命令,它定义一个新的定理环境,\meta{键值列表} 支持的选项与 \tn{declaretheorem} 相同,但它们的区别有: -% \begin{itemize} -% \item 中英文模式下标题不同,英文标题为可选项,默认为首字母大写的环境名。 -% \item 自动定义交叉引用的格式,引用标签前缀为定理名称。 -% \item 定理盒子选项 \opt{thmbox} 仍然生效,盒子样式选项是用于设置定理盒子样式的名称,它需要 \pkg{tcolorbox} 的 \tn{tcbset} 接口命令设定,默认为 \opt{tc-theorem}。 -% \item 默认使用 \opt{easy-theorem} 定理样式,可在最后一个选项使用 \opt{style} 更改样式。 -% \end{itemize} +% \begin{itemize} +% \item 中英文模式下标题不同,英文标题为可选项,默认为首字母大写的环境名。 +% \item 自动定义交叉引用的格式,引用标签前缀为定理名称。 +% \item 定理盒子选项 \opt{thmbox} 仍然生效,盒子样式选项是用于设置定理盒子样式的名称,它需要 \pkg{tcolorbox} 的 \tn{tcbset} 接口命令设定,默认为 \opt{tc-theorem}。 +% \item 默认使用 \opt{easy-theorem} 定理样式,可在最后一个选项使用 \opt{style} 更改样式。 +% \end{itemize} % \item[\tn{declaretheoremstyle}] 定义新的定理样式,\meta{键值列表} 中包括上述定理样式以及 \tn{declaretheorem} 的所有选项。 % \end{optdesc} % @@ -717,7 +717,7 @@ % \end{syntax} % \ding{229} 以上选项路径为 \opt{hdrset/...} \\ % \changes{v1.25}{2021/05/12}{增加脚注样式设置选项。} -% \changes{v1.27g}{2021/07/14}{增加脚注内容格式选项 \opt{fntext-form} 和脚注类型选项 \opt{footnotetype}。} +% \changes{v1.27h}{2021/07/14}{增加脚注内容格式选项 \opt{fntext-form} 和脚注类型选项 \opt{footnotetype}。} % \end{function} % % \begin{optdesc} @@ -905,7 +905,7 @@ % \tn{end}\{hangparas\} % \end{syntax} % \tn{hangpara} 命令使其后的一个段落保持悬挂缩进,\env{hangparas} 环境使其中的段落均保持悬挂缩进。缩进将以 \meta{缩进长度} 从每个段落的 \meta{缩进开始行数} 开始。 -% \changes{v1.27g}{2021/07/11}{增加悬挂缩进段落命令 \tn{hangpara} 和环境 \env{hangparas}。} +% \changes{v1.27h}{2021/07/11}{增加悬挂缩进段落命令 \tn{hangpara} 和环境 \env{hangparas}。} % \end{function} % % \subsection{代码} @@ -1290,7 +1290,7 @@ %<*class> \NeedsTeXFormat{LaTeX2e}[2020/10/01] \RequirePackage{l3keys2e} -\ProvidesExplClass{easybook}{2021/07/16}{1.27g} +\ProvidesExplClass{easybook}{2021/07/16}{1.27h} {Typeset Chinese theses or books} \bool_set_false:N \l__eb_compile_draft_bool @@ -1584,7 +1584,7 @@ %<*package> \NeedsTeXFormat{LaTeX2e}[2020/10/01] \RequirePackage{l3keys2e,etoolbox} -\ProvidesExplPackage{easybase}{2021/07/16}{1.27g} +\ProvidesExplPackage{easybase}{2021/07/16}{1.27h} {Typeset Chinese theses or books} \cs_generate_variant:Nn \int_to_arabic:n { v } @@ -3457,7 +3457,7 @@ } % %<*tcolorbox> -\ProvidesExplFile{eb-tcolorbox.cfg}{2021/07/16}{1.27g} +\ProvidesExplFile{eb-tcolorbox.cfg}{2021/07/16}{1.27h} {Customization of tcolorbox for easybook} \cs_new_protected:Npn \eb_tcb_theorem_set:n #1 diff --git a/macros/latex/contrib/easybook/easybook.pdf b/macros/latex/contrib/easybook/easybook.pdf index 53edf8c283..788290ec5e 100644 Binary files a/macros/latex/contrib/easybook/easybook.pdf and b/macros/latex/contrib/easybook/easybook.pdf differ diff --git a/macros/latex/contrib/longdivision/README.md b/macros/latex/contrib/longdivision/README.md index db6a6469aa..b25cec2d36 100644 --- a/macros/latex/contrib/longdivision/README.md +++ b/macros/latex/contrib/longdivision/README.md @@ -41,6 +41,9 @@ The current development copy is hosted at https://github.com/hoodmane/longdivisi Changelog: ========== +## [1.2.1](2021-07-17) +### Fixed: +- The stage option works again. ## [1.2.0] (2020-05-09) ### Added: diff --git a/macros/latex/contrib/longdivision/longdivision.sty b/macros/latex/contrib/longdivision/longdivision.sty index d749bab70e..114417fd62 100644 --- a/macros/latex/contrib/longdivision/longdivision.sty +++ b/macros/latex/contrib/longdivision/longdivision.sty @@ -1,7 +1,7 @@ -%% Package: longdivision.sty version 1.2.0 +%% Package: longdivision.sty version 1.2.1 %% Author: Hood Chatham %% Email: hood@mit.edu -%% Date: 2020-05-09 +%% Date: 2021-07-17 %% License: Latex Project Public License @@ -17,7 +17,6 @@ \bool_new:N \l__longdiv_added_point_bool \bool_new:N \l__longdiv_seen_point_bool \bool_new:N \l__longdiv_seen_digit_bool -\bool_new:N \l__longdiv_stopped_early_stage_bool \int_new:N \l__longdiv_quotient_int \int_new:N \l__longdiv_position_int \int_new:N \l__longdiv_point_digit_dividend_int @@ -437,11 +436,8 @@ % the length of the bar, but we need it to always be at least as long as the dividend. % Also, we need to delete the extra digit that has been carried down \cs_new:Nn \longdiv_divide_end_early:nnn { - % For some reason we need to shift the typeset work over by half a digit if we quit early due to "stage" option - % so we need to set a flag so that the work typesetter can know to do this. - \bool_set_true:N \l__longdiv_stopped_early_stage_bool \tl_put_right:Nn \l__longdiv_quotient_tl { {\longdiv_hphantom:n { #3 0 }} } - \tl_set:Nf \l__longdiv_remainer { \tl_range:nnn { #1 } { 1 } { -2 } } + \tl_set:Nf \l__longdiv_remainder_tl { \tl_range:nnn { #1 } { 1 } { -2 } } \longdiv_typeset: } @@ -863,8 +859,6 @@ \cs_new:Nn \longdiv_typeset_setwidth:n { \settowidth \l__longdiv_tempwidth_dim {\tl_range:Nnn \l__longdiv_dividend_tl { 1 } { #1 } \relax } \dim_gset:Nn \g__longdiv_temp_dim { \l__longdiv_tempwidth_dim } - % For some reason we need to shift everything over by half a digit if we quit early due to "stage" option - \bool_if:NT \l__longdiv_stopped_early_stage_bool {\dim_gadd:Nn \g__longdiv_temp_dim { -0.5\c__longdiv_digitwidth_dim } } } % #2 is the distance to the right endpoint of the token list #1. @@ -947,8 +941,7 @@ } -% Certainly the pretiest of my three styles. I think I got it from a tex stack exchange post, -% but I apparently didn't credit it when I copied it and I cannot find teh post now. +% Stolen from the following tex stack exchange answer: https://tex.stackexchange.com/a/131137 \longdiv_define_style:nn { tikz }{ \bool_if:NTF \l__longdiv_is_tikz_loaded_bool { \longdiv@typeset@main@tikz diff --git a/macros/latex/contrib/longdivision/longdivision_manual.pdf b/macros/latex/contrib/longdivision/longdivision_manual.pdf index f64df8e2f9..21e6b7a06c 100644 Binary files a/macros/latex/contrib/longdivision/longdivision_manual.pdf and b/macros/latex/contrib/longdivision/longdivision_manual.pdf differ diff --git a/macros/latex/contrib/longdivision/longdivision_manual.tex b/macros/latex/contrib/longdivision/longdivision_manual.tex index 24e3928248..325e2b993a 100644 --- a/macros/latex/contrib/longdivision/longdivision_manual.tex +++ b/macros/latex/contrib/longdivision/longdivision_manual.tex @@ -1,5 +1,5 @@ \documentclass{ltxdoc} -\def\version{Version 1.2.0} +\def\version{Version 1.2.1} \let\ifluatex\relax \usepackage{ifluatex} diff --git a/macros/latex/contrib/lwarp/README.txt b/macros/latex/contrib/lwarp/README.txt index f89d6b4dd8..84c75558b6 100644 --- a/macros/latex/contrib/lwarp/README.txt +++ b/macros/latex/contrib/lwarp/README.txt @@ -1,5 +1,5 @@ -LaTeX lwarp package v0.899 README.txt +LaTeX lwarp package v0.900 README.txt Files included are: diff --git a/macros/latex/contrib/lwarp/lwarp.dtx b/macros/latex/contrib/lwarp/lwarp.dtx index 54b4857907..fce36d1771 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} -% [2021/06/29 v0.899 Allows LaTeX to directly produce HTML5 output.] +% [2021/07/17 v0.900 Allows LaTeX to directly produce HTML5 output.] % %<*driver> \documentclass{ltxdoc} @@ -24,8 +24,8 @@ \PassOptionsToPackage{quiet}{textcomp}% Not all chars supported in TT font. \usepackage{lmodern} -\usepackage{libertine} -% *88* \usepackage[space]{erewhon} +% \usepackage{libertine} +\usepackage[space]{erewhon} \usepackage[varqu,varl]{inconsolata} % typewriter % \usepackage{roboto}% conflicts with \textsc inside a float % \usepackage{sourcecodepro} @@ -3100,7 +3100,7 @@ This boolean may be tested by the user for later use. %<*package> % \fi % -% \CheckSum{54297} +% \CheckSum{54342} % % \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 @@ -3241,6 +3241,7 @@ This boolean may be tested by the user for later use. % \changes{v0.897}{2021/05/24}{\ 2021/05/24} % \changes{v0.898}{2021/05/29}{\ 2021/05/29} % \changes{v0.899}{2021/06/29}{\ 2021/06/29} +% \changes{v0.900}{2021/07/17}{\ 2021/07/17} @@ -3466,9 +3467,21 @@ This boolean may be tested by the user for later use. % % \begin{description} % \needspace{2\baselineskip} +% \item[v0.900:] Package updates. +% \begin{itemize} +% \item Fix for detecting |\usepackage{lwarp}|. +% \margintag{core} +% \item \pkg{amsmath}: Fixed \env{alignat} with \brand{MathJax}. +% \margintag{packages} +% \item \pkg{changes}: Updated to v4.2.1. +% \item \pkg{froufrou}: Updated to v1.4.0. +% \item \pkg{lipsum}: Updated to v2.3. +% \end{itemize} +% \needspace{2\baselineskip} % \item[v0.899:] Minor updates. % \begin{itemize} % \item \prog{lwarpmk}: Warns if |\usepackage{lwarp}| is not detected. +% \margintag{core} % \item \pkg{graphics}: Added support for \optn{keepaspectratio}. % \margintag{packages} % \item \pkg{keyfloat}: Fix: \optn{lw} with \optn{h}. @@ -3483,8 +3496,8 @@ This boolean may be tested by the user for later use. % \item[v0.897:] \pkg{siunitx} rollback. % \begin{itemize} % \item Added a table of file extensions to use with \cs{includegraphics}. -% See \cref{tab:includegraphicsfilenames}. % \margintag{docs} +% See \cref{tab:includegraphicsfilenames}. % \item Added tests for additional incompatible packages. % \margintag{core} % \item \pkg{siunitx}: Supports rollback to v2. Does not yet support v3. @@ -6019,7 +6032,7 @@ This boolean may be tested by the user for later use. % % Package handling: & \spkg{catoptions}. \\ % -% Debug: & \ipkg{chkfloat}, \ipkg{cmdtrack}, \ipkg{dprogress}, +% Debug: & \ipkg{chkfloat}, \ipkg{cmdtrack}, \ipkg{dprogress}, \mpkg{lipsum}, % \ipkg{lua-visual-debug}, \ipkg{refcheck}, % \ipkg{srcltx}, \ipkg{srctex}, \ipkg{vpe}, \ipkg{xbmks}. \\ % @@ -20565,7 +20578,7 @@ MathJax = { -- Copyright 2016-2021 Brian Dunn -printversion = "v0.899" +printversion = "v0.900" requiredconfversion = "2" -- also at *lwarpmk.conf function printhelp () @@ -20658,7 +20671,7 @@ if ( usinglwarp == false ) then print ("lwarpmk: \\usepackage{lwarp} was not detected.") print ("lwarpmk: The HTML output will not be correct.") print ("lwarpmk: Ensured that \\usepackage{lwarp} is enabled,") - print ("lwarpmk: then lwarpmk print and lwarpmk HTML again.") + print ("lwarpmk: then lwarpmk print and lwarpmk html again.") print ("lwarpmk: ===") end end -- function @@ -26933,11 +26946,11 @@ end -- not --version % Remove extra material: % \changes{v0.84}{2020/04/12}{Improved \HTML\ title.} % \begin{macrocode} -\StrSubstitute{\theHTMLSection}{\protect}{\detokenize{-}}[\theHTMLSection] -\StrSubstitute{\theHTMLSection}{\detokenize{-----}}{\detokenize{-}}[\theHTMLSection] -\StrSubstitute{\theHTMLSection}{\detokenize{----}}{\detokenize{-}}[\theHTMLSection] -\StrSubstitute{\theHTMLSection}{\detokenize{---}}{\detokenize{-}}[\theHTMLSection] -\StrSubstitute{\theHTMLSection}{\detokenize{--}}{\detokenize{-}}[\theHTMLSection] +\StrSubstitute{\theHTMLSection}{\protect}{\detokenize{-}}[\theHTMLSection]% +\StrSubstitute{\theHTMLSection}{\detokenize{-----}}{\detokenize{-}}[\theHTMLSection]% +\StrSubstitute{\theHTMLSection}{\detokenize{----}}{\detokenize{-}}[\theHTMLSection]% +\StrSubstitute{\theHTMLSection}{\detokenize{---}}{\detokenize{-}}[\theHTMLSection]% +\StrSubstitute{\theHTMLSection}{\detokenize{--}}{\detokenize{-}}[\theHTMLSection]% % \end{macrocode} % % If starts with a dash, remove the leading dash: @@ -27107,8 +27120,11 @@ end -- not --version % Start of the body: % \begin{macrocode} \LWR@htmltag{body}\LWR@orignewline -\endgroup -\LWR@traceinfo{LWR@filestart: done} +% \end{macrocode} +% \changes{v0.900}{2021/06/14}{Spurrious space.} +% \begin{macrocode} +\endgroup% +\LWR@traceinfo{LWR@filestart: done}% } % \end{macrocode} % \end{macro} @@ -27231,7 +27247,7 @@ end -- not --version % Start a new \HTML\ file and a header: % \begin{macrocode} \LWR@traceinfo{LWR@lwarpStart: Starting new file.} -\LWR@filestart +\LWR@filestart% % \end{macrocode} % Tell \prog{lwarpmk} that the \pkg{lwarp} package is in use. % This allows \prog{lwarpmk} to warn if |usepackage{lwarp}| was somehow @@ -37674,7 +37690,7 @@ end -- not --version % \end{macro} -% \begin{macro}{\LWR@addmathjax} \marg{environment} \marg{contents} +% \begin{macro}{\LWR@addmathjax} \marg{environment name} \marg{contents} % % Given the name of a math environment and its contents, % create a \brand{MathJax} instance. @@ -37682,16 +37698,32 @@ end -- not --version % \begin{macrocode} \NewDocumentCommand{\LWR@addmathjax}{m +m}{% % \end{macrocode} -% Enclose the \brand{MathJax} environment inside printed ``\cs{(}'' and ``\cs{)}'' characters. % \begin{macrocode} \LWR@origtilde\LWR@orignewline % \end{macrocode} +% Enclose the \brand{MathJax} environment inside printed ``\cs{(}'' and ``\cs{)}'' characters. % Print the environment name and contents, sanitizing for \HTML\ special characters. % \changes{v0.89}{2020/08/01}{TT font for \brand{MathJax}.} % \begin{macrocode} {% \LWR@print@ttfamily% \textbackslash{}begin\{#1\} +% \end{macrocode} +% +% The \env{alignat} environment takes a mandatory argument, which must +% be replicated here. +% \changes{v0.900}{2021/07/11}{Fix: \env{alignat} with \brand{MathJax}.} +% \begin{macrocode} + \ifboolexpr{ + test {\ifstrequal{#1}{alignat}} or + test {\ifstrequal{#1}{alignat*}} or + test {\ifstrequal{#1}{alignat+}} + }% + {\{\arabic{LWR@maxfields@}\}}% + {}% +% \end{macrocode} +% The environment contents and \cs{end}: +% \begin{macrocode} \LWR@orignewline% \LWR@HTMLsanitizeexpand{\detokenize\expandafter{#2}}% \LWR@orignewline% @@ -44057,6 +44089,25 @@ color:\LWR@origpound\LWR@tempcolor% % \changes{v0.73}{2019/06/25}{AMS environments: Fix: \attribute{alt} tags.} % \changes{v0.73}{2019/06/25}{AMS environments: Fix: Paragraph tags.} % +% +% \DescribeCounter{LWR@maxfields@} A copy of \ctr{maxfields@} as it was passed. +% This is used to generate the mandatory argument for \env{alignat} and \env{alignat*} +% when using \brand{MathJax}. +% \changes{v0.900}{2021/07/11}{Fix: \env{alignat} with \brand{MathJax}.} +% \begin{macrocode} +\newcounter{LWR@maxfields@} + +\xpatchcmd{\start@align} + {\maxfields@#3\relax} + {% + \maxfields@#3\relax% + \setcounter{LWR@maxfields@}{#3}% + } + {} + {\LWR@patcherror{amsmath}{start@align}} +% \end{macrocode} +% +% % \begin{noindmacro}{\LWR@amsmathenv@@before}* \marg{environment name} % % |*| if the environment was starred. @@ -45551,8 +45602,7 @@ color:\LWR@origpound\LWR@tempcolor% % \pkg{autonum} is ignored. % % All equations are numbered in \HTML\ output. -% \trouble[numbering]{autonum=\pkg{autonum}} -% +% \trouble[numbering, \texttt{+}]{autonum=\pkg{autonum}} % \brand{MathJax} does not support the ``+'' environments. % % \changes{v0.70}{2019/03/28}{\pkg{autonum}: Added.} @@ -45582,11 +45632,13 @@ color:\LWR@origpound\LWR@tempcolor% \BeforeBeginEnvironment{multline+}{\LWR@amsmathenv@@before{multline+}} \AfterEndEnvironment{multline+}{\LWR@amsmathenv@@after} - - +% \end{macrocode} +% +% \changes{v0.900}{2021/07/11}{Fix: \env{flalign} name.} +% \begin{macrocode} \newenvironment{flalign+}{\flalign}{\endflalign} -\BeforeBeginEnvironment{flalign+}{\LWR@amsmathenv@@before{flaline+}} +\BeforeBeginEnvironment{flalign+}{\LWR@amsmathenv@@before{flalign+}} \AfterEndEnvironment{flalign+}{\LWR@amsmathenv@@after} @@ -48382,11 +48434,12 @@ s% % \changes{v0.67}{2019/02/15}{\pkg{changes}: Added.} % \changes{v0.70}{2019/03/24}{\pkg{changes}: Updated to v3.1.2.} % \changes{v0.895}{2021/01/30}{\pkg{changes}: Updated to v4.0.1.} +% \changes{v0.900}{2021/06/14}{\pkg{changes}: Updated to v4.2.1.} % % \codehtml % % \begin{macrocode} -\LWR@ProvidesPackagePass{changes}[2021/02/14] +\LWR@ProvidesPackagePass{changes}[2021/07/15] % \end{macrocode} % % \cs{BaseJobname} is added to the label in case \pkg{xr} or \pkg{xr-hyper} are used. @@ -48596,7 +48649,7 @@ test {\ifnumgreater{\csuse{Changes@In########1}}{0}}% {\color{authorcolor}}% {}% \LWR@textcurrentcolor{% lwarp -\Changes@Markup@author{\Changes@output@author{#2}{left}}% +\Changes@Markup@author{\Changes@output@author@position{#2}{left}}% }% lwarp }}% }{}% @@ -48623,7 +48676,7 @@ test {\ifnumgreater{\csuse{Changes@In########1}}{0}}% {\color{authorcolor}}% {}% \LWR@textcurrentcolor{% lwarp -\Changes@Markup@author{\Changes@output@author{#2}{right}}% +\Changes@Markup@author{\Changes@output@author@position{#2}{right}}% }% lwarp }}% }{}% @@ -48637,7 +48690,7 @@ test {\ifnumgreater{\csuse{Changes@In########1}}{0}}% \Changes@Markup@comment% {#5}% {#2}% -{\Changes@output@author{#2}{left}\Changes@output@author{#2}{right}}% +{\Changes@output@author{#2}}% }% }% \IfIsEmpty{#2}% @@ -57669,6 +57722,7 @@ solid {\FancyVerbRuleColor{\LWR@origpound\LWR@tempcolor}} ; % space % \pkg{froufrou} is patched for use by \pkg{lwarp}. % % \changes{v0.897}{2021/05/02}{\pkg{froufrou}: Added.} +% \changes{v0.900}{2021/06/14}{\pkg{froufrou}: Updated to v1.4.0.} % % \codehtml % @@ -57684,17 +57738,35 @@ solid {\FancyVerbRuleColor{\LWR@origpound\LWR@tempcolor}} ; % space {\LWR@patcherror{froufrou}{setfroufrou}} \ExplSyntaxOff -\xpatchcmd{\@realfroufrou} - {\@froufrouOrnament} - {% - \begin{center} - \begin{lateximage}*[froufrou][\LWR@latestfroufrou]% +\RenewDocumentCommand{\froufrou}{s O{}}{% + \nopagebreak[4]\par + + \IfBooleanTF{#1}{\@afterindenttrue}{\@afterindentfalse} + + \nopagebreak[4]\@froufrouspacebefore\nopagebreak[4] + + \bgroup + \setfroufrou{#2}% + \normalsize + \ifdefvoid{\setstretch}{}{\setstretch{\setspace@singlespace}}% normally 1 + \setlength{\parskip}{0pt} + \noindent\centering\bgroup% + \begin{center}% lwarp + \begin{lateximage}*[froufrou][\LWR@latestfroufrou]% lwarp \@froufrouOrnament% - \end{lateximage} - \end{center} - } - {} - {\LWR@patcherror{froufrou}{@realfroufrou}} + \end{lateximage}% lwarp + \end{center}% lwarp + \egroup\par + \egroup + + \nopagebreak[4]\@froufrouspaceafter\nopagebreak[4] + + \@froufrouFixSpacingAfter + + \nopagebreak[3] + + \@afterheading +} % \end{macrocode} % % \iffalse @@ -63574,6 +63646,36 @@ do not attempt to patch lwarp's version of `hyperref'.)\MessageBreak} % % % +% \iffalse +%<*lipsum> +% \fi +% +% \part{lwarp-lipsum.sty} +% +% \section{lipsum} +% +% \credits{Patrick Happel} +% +% \DescribePackage{lipsum} +% \pkg{lipsum} is patched for use by \pkg{lwarp}. +% +% \changes{v0.900}{2021/06/15}{\pkg{lipsum}: Added.} +% +% \codehtml +% +% \begin{macrocode} +\LWR@ProvidesPackagePass{lipsum}[2021-03-03] +% \end{macrocode} +% +% \begin{macrocode} +\SetLipsumParListItemEnd{\LWR@closeparagraph} +% \end{macrocode} +% +% \iffalse +% +% \fi +% +% % % \iffalse %<*listings> diff --git a/macros/latex/contrib/lwarp/lwarp.ins b/macros/latex/contrib/lwarp/lwarp.ins index 498f83ae47..143e4ba4f1 100644 --- a/macros/latex/contrib/lwarp/lwarp.ins +++ b/macros/latex/contrib/lwarp/lwarp.ins @@ -281,6 +281,7 @@ version 2005/12/01 or later. \file{lwarp-libertinust1math.sty}{\from{lwarp.dtx}{libertinust1math}} \file{lwarp-lineno.sty}{\from{lwarp.dtx}{lineno}} \file{lwarp-lips.sty}{\from{lwarp.dtx}{lips}} +\file{lwarp-lipsum.sty}{\from{lwarp.dtx}{lipsum}} \file{lwarp-listings.sty}{\from{lwarp.dtx}{listings}} \file{lwarp-listliketab.sty}{\from{lwarp.dtx}{listliketab}} \file{lwarp-lltjext.sty}{\from{lwarp.dtx}{lltjext}} diff --git a/macros/latex/contrib/lwarp/lwarp.pdf b/macros/latex/contrib/lwarp/lwarp.pdf index 387f0601f7..aafbad9edd 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 cb684409a3..6206329a3b 100755 --- a/macros/latex/contrib/lwarp/lwarpmk.lua +++ b/macros/latex/contrib/lwarp/lwarpmk.lua @@ -2,7 +2,7 @@ -- Copyright 2016-2021 Brian Dunn -printversion = "v0.899" +printversion = "v0.900" requiredconfversion = "2" -- also at *lwarpmk.conf function printhelp () @@ -92,7 +92,7 @@ if ( usinglwarp == false ) then print ("lwarpmk: \\usepackage{lwarp} was not detected.") print ("lwarpmk: The HTML output will not be correct.") print ("lwarpmk: Ensured that \\usepackage{lwarp} is enabled,") - print ("lwarpmk: then lwarpmk print and lwarpmk HTML again.") + print ("lwarpmk: then lwarpmk print and lwarpmk html again.") print ("lwarpmk: ===") end end -- function diff --git a/macros/latex/contrib/macrolist/README.md b/macros/latex/contrib/macrolist/README.md index ee73093939..61ac3d679d 100644 --- a/macros/latex/contrib/macrolist/README.md +++ b/macros/latex/contrib/macrolist/README.md @@ -1,4 +1,4 @@ -# The LaTeX package macrolist - version 1.0.0 (2021/07/12) +# The LaTeX package macrolist - version 1.0.2 (2021/07/17) > Copyright (C) 2021 Dennis Chen > diff --git a/macros/latex/contrib/macrolist/macrolist.dtx b/macros/latex/contrib/macrolist/macrolist.dtx index 9c0ee6eb62..7a564fc448 100644 --- a/macros/latex/contrib/macrolist/macrolist.dtx +++ b/macros/latex/contrib/macrolist/macrolist.dtx @@ -16,7 +16,7 @@ %<*package> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{macrolist}[2021/07/09 v1.0.0 Create lists of macros and perform operations on them] +\ProvidesPackage{macrolist}[2021/07/16 v1.0.1 Create lists of macros and perform operations on them] \RequirePackage{pgffor} % @@ -30,16 +30,24 @@ \begin{document} \DocInput{macrolist.dtx} \PrintIndex + \PrintChanges \end{document} % % \fi -% \changes{v1.0.0}{2021/07/01}{Initial version} +% +% \changes{v1.0.2}{2021/07/17}{Print changelog in documentation} +% \changes{v1.0.2}{2021/07/17}{Added comment markers to remove pars and fix spacing in listforeach} +% \changes{v1.0.1}{2021/07/16}{Make a couple of defs and lets global to prevent scoping issues} +% \changes{v1.0.1}{2021/07/16}{Add ``scope is always global'' to documentation} +% \changes{v1.0.1}{2021/07/16}{Fix date in initial version changes entry} +% \changes{v1.0.1}{2021/07/16}{Fix v. appearing in front of date in document title} +% \changes{v1.0.0}{2021/07/12}{Initial version} % % \GetFileInfo{macrolist.sty} % % \title{\textsf{macrolist} -- Create lists of macros and manipulate them} % \author{Dennis Chen \\ proofprogram@gmail.com} -% \date{\fileversion, v. \filedate\thanks{\url{https://github/com/chennisden/macrolist}}} +% \date{\fileversion, \filedate\thanks{\url{https://github/com/chennisden/macrolist}}} % % \maketitle % @@ -49,6 +57,8 @@ % % \section{Usage} % +% The scope of lists is always global. This seems to provide the most +% % \DescribeMacro{\newlist} % To create a list, pass in |\newlist{listname}| to create a list with the name \textsf{listname}. % @@ -93,16 +103,16 @@ \stepcounter{macrolist@list@\macrolist@currlist} \if\relax\detokenize{#1}\relax - \expandafter\def\csname macrolist@list@\macrolist@currlist\listsize{\macrolist@currlist}\endcsname{#2} + \expandafter\gdef\csname macrolist@list@\macrolist@currlist\listsize{\macrolist@currlist}\endcsname{#2} \else \expandafter\ifnum\csname themacrolist@list@\macrolist@currlist\endcsname=#1 - \expandafter\def\csname macrolist@list@\macrolist@currlist\listsize{\macrolist@currlist}\endcsname{#2} + \expandafter\gdef\csname macrolist@list@\macrolist@currlist\listsize{\macrolist@currlist}\endcsname{#2} \else \macrolist@inbounds{\macrolist@currlist}{#1} \foreach \macrolist@index in {\listsize{\macrolist@currlist}, ...,\the\numexpr #1+1\relax} { \global\expandafter\let\csname macrolist@list@\macrolist@currlist\macrolist@index\expandafter\endcsname\csname macrolist@list@\macrolist@currlist\the\numexpr\macrolist@index-1\relax\endcsname } - \expandafter\def\csname macrolist@list@\macrolist@currlist#1\endcsname{#2} + \expandafter\gdef\csname macrolist@list@\macrolist@currlist#1\endcsname{#2} \fi \fi } @@ -123,7 +133,7 @@ } \fi - \expandafter\let\csname macrolist@list@#1\listsize{#1}\endcsname\relax + \global\expandafter\let\csname macrolist@list@#1\listsize{#1}\endcsname\relax \addtocounter{macrolist@list@#1}{-1} } % \fi @@ -135,7 +145,7 @@ % \iffalse \newcommand{\listremovelast}[1]{ \macrolist@exists{#1} - \expandafter\let\csname macrolist@list@#1\listsize{#1}\endcsname\relax + \global\expandafter\let\csname macrolist@list@#1\listsize{#1}\endcsname\relax \addtocounter{macrolist@list@#1}{-1} } % \fi @@ -149,7 +159,7 @@ \macrolist@inbounds{#1}{#2} \foreach \macrolist@index in {1, ..., \listsize{#1}} { - \expandafter\let\csname \macrolist@list@#1\macrolist@index\endcsname\relax + \global\expandafter\let\csname \macrolist@list@#1\macrolist@index\endcsname\relax } \setcounter{macrolist@list@#1}{0} @@ -179,49 +189,49 @@ % % \iffalse \newcommand{\listforeach}[2] -{ - \def\macrolist@foreachstart{0} % Reset +{% + \def\macrolist@foreachstart{0}% Reset % This is used to make optional arguments line up correctly - - \def\macrolist@start{1} - \def\macrolist@end{\listsize{#1}} - \def\macrolist@listname{#1} - \def\macrolist@element{#2} +% + \def\macrolist@start{1}% + \def\macrolist@end{\listsize{#1}}% + \def\macrolist@listname{#1}% + \def\macrolist@element{#2}% \macrolist@listforeachi } -\newcommand{\macrolist@listforeachi}[1][]{ +\newcommand{\macrolist@listforeachi}[1][]{% \if\relax\detokenize{#1}\relax \else - \def\macrolist@start{#1} - \def\macrolist@foreachstart{1} + \def\macrolist@start{#1}% + \def\macrolist@foreachstart{1}% \fi \macrolist@listforeachii } -\newcommand{\macrolist@listforeachii}[1][]{ +\newcommand{\macrolist@listforeachii}[1][]{% \if\relax\detokenize{#1}\relax \ifnum\macrolist@foreachstart=1 \PackageError{macrolist}{You must either pass in both a starting and ending position or neither}{} \fi \else - \def\macrolist@end{#1} + \def\macrolist@end{#1}% \fi \macrolist@listforeachaction } -\newcommand{\macrolist@listforeachaction}[1]{ - - \macrolist@exists{\macrolist@listname} - +\newcommand{\macrolist@listforeachaction}[1]{% +% + \macrolist@exists{\macrolist@listname}% +% \ifnum\numexpr\macrolist@start\relax>\listsize{\macrolist@listname}% \PackageError{macrolist}{The starting index of the loop is out of the bounds of list '\macrolist@listname'}{} \fi - +% \ifnum\numexpr\macrolist@end\relax>\listsize{\macrolist@listname} \PackageError{macrolist}{The ending index of the loop is out of the bounds of list '\macrolist@listname'}{} \fi - +% \foreach \macrolist@index in {\the\numexpr\macrolist@start\relax, ..., \the\numexpr\macrolist@end\relax} {% \expandafter\expandafter\expandafter\let\expandafter\expandafter\macrolist@element\csname macrolist@list@\macrolist@listname\macrolist@index\endcsname #1% diff --git a/macros/latex/contrib/macrolist/macrolist.pdf b/macros/latex/contrib/macrolist/macrolist.pdf index c3e16e2634..1f5be69f8b 100644 Binary files a/macros/latex/contrib/macrolist/macrolist.pdf and b/macros/latex/contrib/macrolist/macrolist.pdf differ -- cgit v1.2.3