summaryrefslogtreecommitdiff
path: root/macros
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2021-09-17 03:00:43 +0000
committerNorbert Preining <norbert@preining.info>2021-09-17 03:00:43 +0000
commitaefe346b16163823efeac108a7da42e91e53e5c7 (patch)
treed843b77551dc58ce9e491261306253162af117f5 /macros
parente7ce6275948b3b197682f44f64fdb1daf672109c (diff)
CTAN sync 202109170300
Diffstat (limited to 'macros')
-rw-r--r--macros/latex/contrib/mindflow/mindflow.dtx91
-rw-r--r--macros/latex/contrib/mindflow/mindflow.pdfbin207665 -> 208084 bytes
-rw-r--r--macros/luatex/generic/luamplib/NEWS3
-rw-r--r--macros/luatex/generic/luamplib/luamplib.dtx17
-rw-r--r--macros/luatex/generic/luamplib/luamplib.pdfbin151131 -> 151188 bytes
5 files changed, 64 insertions, 47 deletions
diff --git a/macros/latex/contrib/mindflow/mindflow.dtx b/macros/latex/contrib/mindflow/mindflow.dtx
index 55c6e674a3..b8f60fe220 100644
--- a/macros/latex/contrib/mindflow/mindflow.dtx
+++ b/macros/latex/contrib/mindflow/mindflow.dtx
@@ -18,7 +18,7 @@
%<package>\NeedsTeXFormat{LaTeX2e}
%<package>\ProvidesPackage{mindflow}
%<*package>
- [2021/09/12 mindflow environment]
+ [2021/09/15 mindflow environment]
%</package>
%
%<*driver>
@@ -63,7 +63,7 @@
{linenumbers,nolinenumbers,mindflowLeft,mindflowRight,mindflowTextFont,mindflowNumFont,mindflowMarkerFont,mindflowLineHeight,setlength,colorlet,color,
RequirePackage,SetupKeyvalOptions,DeclareBoolOption,ProcessKeyvalOptions,PassOptionsToPackage,
PackageWarning,MessageBreak,
- if@mindflow@twocolumn,@mindflow@incolumntrue,if@mindflow@linenumber,@mindflow@leftlinenumbertrue,if@mindflow@on,if@mindflow@off,@mindflow@offfalse,if@mindflow@incolumn,if@mindflow@leftlinenumber,if@mindflow@rightlinenumber,if@mindflow@leftmarker,if@mindflow@rightmarker,if@mindflow@nonbreakable,
+ @mindflow@incolumntrue,if@mindflow@linenumber,@mindflow@leftlinenumbertrue,if@mindflow@on,if@mindflow@off,@mindflow@offfalse,if@mindflow@incolumn,if@mindflow@leftlinenumber,if@mindflow@rightlinenumber,if@mindflow@leftmarker,if@mindflow@rightmarker,if@mindflow@nonbreakable,
mindflow@parindent,mindflow@parskip,
ifLNturnsON,LNturnsONtrue,LNturnsONfalse,ifLineNumbers,
mindflowset,
@@ -71,6 +71,9 @@
mindflowON,endmindflowON,mindflowOFF,endmindflowOFF,
mfSepLine,makeLineNumber,LineNumber,
mindflow@makeLineNumber,LocallyStopLineNumbers,ResumeLineNumbers,
+ if@twocolumn,
+ ifICturnsON,ICturnsONtrue,ICturnsONfalse,AutoIncolumn,ResumeIncolumn,
+ newtcolorbox,
ifdefined,linenomathpatch,cspreto,csappto,patchcmd,linenomathpatchAMS,linenomathAMS,linenomathWithnumbers,linenomath,endlinenomath,linenomathNonumbers,linenopenalty,
define@key,setkeys,
nowidow,
@@ -79,7 +82,7 @@
\lstnewenvironment{code*}%
{\setkeys{lst}{columns=fullflexible,keepspaces=true}}{}
\lstnewenvironment{code}%
-{\setkeys{lst}{columns=fullflexible,keepspaces=true,numbers=left,numberstyle=\scriptsize, stepnumber=1, numbersep=5pt,lastline=253}}{}
+{\setkeys{lst}{columns=fullflexible,keepspaces=true,numbers=left,numberstyle=\scriptsize, stepnumber=1, numbersep=5pt,lastline=263}}{}
\EnableCrossrefs
\CodelineIndex
\RecordChanges
@@ -125,7 +128,7 @@
%<*example>
% \fi
\begin{code*}
- \usepackage{mindflow}
+\usepackage{mindflow}
\end{code*}
% \iffalse
%</example>
@@ -136,12 +139,12 @@
% boolean optional, like \verb|off=false|):
%
% \begin{tabular}{ll}
-% \verb|linenumber| & Same as \verb|leftlinenumber|\\
+% \verb|linenumber|\hspace{5em} & Same as \verb|leftlinenumber|\\
% \verb|leftlinenumber| & Enable left line numbers\\
% \verb|rightlinenumber| & Enable right line numbers\\
% \verb|leftmarker| & Enable left marker, by default it is a ``\verb|*|''\\
% \verb|rightmarker| & Enable right marker, by default it is a ``\verb|*|''\\
-% \verb|incolumn| or \verb|twocolumn| & The separation line would fit in the column \\&(\emph{automatically applied in two-column documents})\\
+% \verb|incolumn| & The separation line would fit in the column \\&(\emph{automatically applied in two-column documents})\\
% \verb|off|, \verb|on| & Turn the \verb|mindflow| environments \emph{off} or \emph{on}
% \end{tabular}
%
@@ -154,9 +157,9 @@
%<*example>
% \fi
\begin{code*}
- \begin{mindflow}
- (*{\normalfont\meta{text}}*)
- \end{mindflow}
+\begin{mindflow}
+ (*{\normalfont\meta{text}}*)
+\end{mindflow}
\end{code*}
% \iffalse
%</example>
@@ -254,7 +257,7 @@
%<*example>
% \fi
\begin{code*}
- \PassOptionsToPackage{mathlines}{lineno}
+\PassOptionsToPackage{mathlines}{lineno}
\end{code*}
% \iffalse
%</example>
@@ -353,7 +356,7 @@
%
% \begin{itemize}
% \item There is no absolute guarantee that the separation lines will not fall alone at the top or bottom of the page, though great effort has been made to reduce the occurrence of such situation.
-% \item The \textsf{tcolorbox} version doesn't support line numbering quite well, especially for displayed equations. This is due to the usage of \verb|internallinenumbers|.
+% \item The \textsf{nonbreakable} version doesn't support line numbering quite well, especially for displayed equations. This is due to the usage of \verb|internallinenumbers|.
% \end{itemize}
%
% \StopEventually{}
@@ -375,7 +378,6 @@
\DeclareBoolOption[false]{linenumber} % Left line numbers
\DeclareBoolOption[false]{leftlinenumber} % Left line numbers
\DeclareBoolOption[false]{rightlinenumber} % Right line numbers
-\DeclareBoolOption[false]{twocolumn} % Two column
\DeclareBoolOption[false]{incolumn} % Separation line fits in column
\DeclareBoolOption[false]{nonbreakable} % Use the tcolorbox version
@@ -384,9 +386,6 @@
\if@mindflow@on
\@mindflow@offfalse
\fi
-\if@mindflow@twocolumn
- \@mindflow@incolumntrue
-\fi
\if@mindflow@linenumber
\@mindflow@leftlinenumbertrue
\fi
@@ -423,6 +422,13 @@
\ifLineNumbers\LNturnsONtrue\fi\nolinenumbers}
\def\ResumeLineNumbers{\ifLNturnsON\linenumbers\fi}
+\newif\ifICturnsON
+\def\AutoIncolumn{\ICturnsONfalse%
+ \if@mindflow@incolumn\ICturnsONtrue\fi%
+ \if@twocolumn\@mindflow@incolumntrue\fi%
+}
+\def\ResumeIncolumn{\ifICturnsON\@mindflow@incolumntrue\fi}
+
\newcounter{recordLN}
\newcounter{mfLN}
\setcounter{mfLN}{1}
@@ -471,6 +477,7 @@
\medskip%
\setcounter{recordLN}{\value{linenumber}}%
\setcounter{linenumber}{\value{mfLN}}%
+ \AutoIncolumn%
\mfSepLine%
\normalfont\mindflowTextFont\color{mindflowText}%
\linenumbers%
@@ -482,6 +489,7 @@
\mfSepLine%
\setcounter{mfLN}{\value{linenumber}}%
\setcounter{linenumber}{\value{recordLN}}%
+ \ResumeIncolumn%
\medskip%
}
@@ -492,31 +500,43 @@
\RequirePackage{tcolorbox}
\newlength{\mindflow@parindent}
\newlength{\mindflow@parskip}
+\newtcolorbox{mindflow@nonbreakable}[1]{
+ enhanced jigsaw,
+ colback=mindflowBackground,colframe=mindflowLine,
+ leftrule=0pt, rightrule=0pt, sharp corners,
+ toprule=\mindflowLineHeight, bottomrule=\mindflowLineHeight,
+ boxsep=0pt, top=.3\baselineskip, bottom=.3\baselineskip,
+ fontupper=\mindflowTextFont,extras={colupper={mindflowText}},
+ before upper={
+ \setlength{\parindent}{\mindflow@parindent}%
+ \setlength{\parskip}{\mindflow@parskip}%
+ },#1
+}
\def\mindflowON{%
- \LNturnsONfalse%
- \ifLineNumbers\LNturnsONtrue\fi\nolinenumbers%
+ \LocallyStopLineNumbers%
+ \setcounter{recordLN}{\value{linenumber}}%
+ \setcounter{linenumber}{\value{mfLN}}%
+ \AutoIncolumn%
\setlength{\mindflow@parindent}{\parindent}%
\setlength{\mindflow@parskip}{\parskip}%
- \begin{tcolorbox}[enhanced jigsaw,
- colback=mindflowBackground,colframe=mindflowLine,
- leftrule=0pt, rightrule=0pt, sharp corners,
- toprule=\mindflowLineHeight, bottomrule=\mindflowLineHeight,
- boxsep=0pt, top=.3\baselineskip, bottom=.3\baselineskip,
- grow to left by=\linewidth,left=\linewidth,
- grow to right by=\linewidth,right=\linewidth,
- fontupper=\mindflowTextFont,extras={colupper={mindflowText}},
- before upper={
- \setlength{\parindent}{\mindflow@parindent}%
- \setlength{\parskip}{\mindflow@parskip}%
- }]
+ \if@mindflow@incolumn%
+ \begin{mindflow@nonbreakable}{left=0pt,right=0pt}
+ \else%
+ \begin{mindflow@nonbreakable}{%
+ grow to left by=\linewidth,left=\linewidth,
+ grow to right by=\linewidth,right=\linewidth}
+ \fi
\begin{internallinenumbers}%
\let\makeLineNumber\mindflow@makeLineNumber%
}
\def\endmindflowON{%
\nowidow[3]%
\end{internallinenumbers}%
- \end{tcolorbox}\par%
- \ifLNturnsON\linenumbers\fi%
+ \end{mindflow@nonbreakable}\par%
+ \ResumeLineNumbers%
+ \setcounter{mfLN}{\value{linenumber}}%
+ \setcounter{linenumber}{\value{recordLN}}%
+ \ResumeIncolumn%
}
\fi
@@ -553,10 +573,9 @@
}
\define@key{mindflow}{leftmarker}[true]{\csname @mindflow@leftmarker#1\endcsname}
\define@key{mindflow}{rightmarker}[true]{\csname @mindflow@rightmarker#1\endcsname}
-\define@key{mindflow}{linenumber}[true]{\csname @mindflow@linenumber#1\endcsname}
+\define@key{mindflow}{linenumber}[true]{\csname @mindflow@leftlinenumber#1\endcsname}
\define@key{mindflow}{leftlinenumber}[true]{\csname @mindflow@leftlinenumber#1\endcsname}
\define@key{mindflow}{rightlinenumber}[true]{\csname @mindflow@rightlinenumber#1\endcsname}
-\define@key{mindflow}{twocolumn}[true]{\csname @mindflow@twocolumn#1\endcsname}
\define@key{mindflow}{incolumn}[true]{\csname @mindflow@incolumn#1\endcsname}
\define@key{mindflow}{linecolor}{\colorlet{mindflowLine}{#1}}
\define@key{mindflow}{textcolor}{\colorlet{mindflowText}{#1}}
@@ -577,12 +596,6 @@
\define@key{mindflow}{lineheight}{\setlength{\mindflowLineHeight}{#1}}
\newcommand{\mindflowset}[1]{%
\setkeys{mindflow}{#1}%
- \if@mindflow@twocolumn%
- \@mindflow@incolumntrue%
- \fi%
- \if@mindflow@linenumber%
- \@mindflow@leftlinenumbertrue%
- \fi%
}
%%================================
diff --git a/macros/latex/contrib/mindflow/mindflow.pdf b/macros/latex/contrib/mindflow/mindflow.pdf
index 925f1bf7bf..0da7c9b6c1 100644
--- a/macros/latex/contrib/mindflow/mindflow.pdf
+++ b/macros/latex/contrib/mindflow/mindflow.pdf
Binary files differ
diff --git a/macros/luatex/generic/luamplib/NEWS b/macros/luatex/generic/luamplib/NEWS
index 293da0dc6b..f62f86fd6d 100644
--- a/macros/luatex/generic/luamplib/NEWS
+++ b/macros/luatex/generic/luamplib/NEWS
@@ -1,5 +1,8 @@
History of the luamplib package
+2021/09/16 2.21.0
+ * allow empty string in textext()
+
2021/08/03 2.20.9
* initialize every mplib instance with random integer seed values
diff --git a/macros/luatex/generic/luamplib/luamplib.dtx b/macros/luatex/generic/luamplib/luamplib.dtx
index 7257505dd5..a1ee352b36 100644
--- a/macros/luatex/generic/luamplib/luamplib.dtx
+++ b/macros/luatex/generic/luamplib/luamplib.dtx
@@ -85,7 +85,7 @@ See source file '\inFileName' for licencing and contact information.
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{luamplib.drv}%
- [2021/08/03 v2.20.9 Interface for using the mplib library]%
+ [2021/09/16 v2.21.0 Interface for using the mplib library]%
\documentclass{ltxdoc}
\usepackage{metalogo,multicol,mdwlist,fancyvrb,xspace}
\usepackage[x11names]{xcolor}
@@ -153,7 +153,7 @@ See source file '\inFileName' for licencing and contact information.
% \author{Hans Hagen, Taco Hoekwater, Elie Roux, Philipp Gesang and Kim Dohyun\\
% Maintainer: LuaLaTeX Maintainers ---
% Support: \email{lualatex-dev@tug.org}}
-% \date{2021/08/03 v2.20.9}
+% \date{2021/09/16 v2.21.0}
%
% \maketitle
%
@@ -413,8 +413,8 @@ See source file '\inFileName' for licencing and contact information.
luatexbase.provides_module {
name = "luamplib",
- version = "2.20.9",
- date = "2021/08/03",
+ version = "2.21.0",
+ date = "2021/09/16",
description = "Lua package to typeset Metapost with LuaTeX's MPLib.",
}
@@ -1057,8 +1057,8 @@ local function mpprint(buffer,...)
end
function luamplib.runscript (code)
- local id, str = code:match("(.-){(.+)}")
- if id and str and str ~= "" then
+ local id, str = code:match("(.-){(.*)}")
+ if id and str then
local f = runscript_funcs[id]
if f then
local t = f(str)
@@ -1172,7 +1172,8 @@ extra_beginfig := extra_beginfig & " let VerbatimTeX = normalVerbatimTeX;"&
"runscript(" &ditto& "luamplib.in_the_fig=true" &ditto& ");";
extra_endfig := extra_endfig & " let VerbatimTeX = specialVerbatimTeX;"&
"runscript(" &ditto&
- "luamplib.in_the_fig=false luamplib.figid=luamplib.figid+1" &ditto& ");";
+ "if luamplib.in_the_fig then luamplib.figid=luamplib.figid+1 end "&
+ "luamplib.in_the_fig=false" &ditto& ");";
]]
luamplib.legacyverbatimtexpreamble = legacyverbatimtexpreamble
@@ -2002,7 +2003,7 @@ luamplib.colorconverter = colorconverter
\else
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{luamplib}
- [2021/08/03 v2.20.9 mplib package for LuaTeX]
+ [2021/09/16 v2.21.0 mplib package for LuaTeX]
\ifx\newluafunction\@undefined
\input ltluatex
\fi
diff --git a/macros/luatex/generic/luamplib/luamplib.pdf b/macros/luatex/generic/luamplib/luamplib.pdf
index 9230176d04..c785dbca43 100644
--- a/macros/luatex/generic/luamplib/luamplib.pdf
+++ b/macros/luatex/generic/luamplib/luamplib.pdf
Binary files differ