texlive[60520] Master/texmf-dist: mindflow (16sep21)
commits+karl at tug.org
commits+karl at tug.org
Thu Sep 16 22:16:48 CEST 2021
Revision: 60520
http://tug.org/svn/texlive?view=revision&revision=60520
Author: karl
Date: 2021-09-16 22:16:48 +0200 (Thu, 16 Sep 2021)
Log Message:
-----------
mindflow (16sep21)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/mindflow/mindflow.pdf
trunk/Master/texmf-dist/source/latex/mindflow/mindflow.dtx
trunk/Master/texmf-dist/tex/latex/mindflow/mindflow.sty
Modified: trunk/Master/texmf-dist/doc/latex/mindflow/mindflow.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/latex/mindflow/mindflow.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/mindflow/mindflow.dtx 2021-09-16 11:13:15 UTC (rev 60519)
+++ trunk/Master/texmf-dist/source/latex/mindflow/mindflow.dtx 2021-09-16 20:16:48 UTC (rev 60520)
@@ -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 at mindflow@twocolumn, at mindflow@incolumntrue,if at mindflow@linenumber, at mindflow@leftlinenumbertrue,if at mindflow@on,if at mindflow@off, at mindflow@offfalse,if at mindflow@incolumn,if at mindflow@leftlinenumber,if at mindflow@rightlinenumber,if at mindflow@leftmarker,if at mindflow@rightmarker,if at mindflow@nonbreakable,
+ @mindflow at incolumntrue,if at mindflow@linenumber, at mindflow@leftlinenumbertrue,if at mindflow@on,if at mindflow@off, at mindflow@offfalse,if at mindflow@incolumn,if at mindflow@leftlinenumber,if at mindflow@rightlinenumber,if at mindflow@leftmarker,if at mindflow@rightmarker,if at mindflow@nonbreakable,
mindflow at parindent,mindflow at parskip,
ifLNturnsON,LNturnsONtrue,LNturnsONfalse,ifLineNumbers,
mindflowset,
@@ -71,6 +71,9 @@
mindflowON,endmindflowON,mindflowOFF,endmindflowOFF,
mfSepLine,makeLineNumber,LineNumber,
mindflow at makeLineNumber,LocallyStopLineNumbers,ResumeLineNumbers,
+ if at twocolumn,
+ ifICturnsON,ICturnsONtrue,ICturnsONfalse,AutoIncolumn,ResumeIncolumn,
+ newtcolorbox,
ifdefined,linenomathpatch,cspreto,csappto,patchcmd,linenomathpatchAMS,linenomathAMS,linenomathWithnumbers,linenomath,endlinenomath,linenomathNonumbers,linenopenalty,
define at 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 at mindflow@on
\@mindflow at offfalse
\fi
-\if at mindflow@twocolumn
- \@mindflow at incolumntrue
-\fi
\if at mindflow@linenumber
\@mindflow at leftlinenumbertrue
\fi
@@ -423,6 +422,13 @@
\ifLineNumbers\LNturnsONtrue\fi\nolinenumbers}
\def\ResumeLineNumbers{\ifLNturnsON\linenumbers\fi}
+\newif\ifICturnsON
+\def\AutoIncolumn{\ICturnsONfalse%
+ \if at mindflow@incolumn\ICturnsONtrue\fi%
+ \if at twocolumn\@mindflow at incolumntrue\fi%
+}
+\def\ResumeIncolumn{\ifICturnsON\@mindflow at 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,23 +500,32 @@
\RequirePackage{tcolorbox}
\newlength{\mindflow at parindent}
\newlength{\mindflow at parskip}
+\newtcolorbox{mindflow at 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 at parindent}%
+ \setlength{\parskip}{\mindflow at parskip}%
+ },#1
+}
\def\mindflowON{%
- \LNturnsONfalse%
- \ifLineNumbers\LNturnsONtrue\fi\nolinenumbers%
+ \LocallyStopLineNumbers%
+ \setcounter{recordLN}{\value{linenumber}}%
+ \setcounter{linenumber}{\value{mfLN}}%
+ \AutoIncolumn%
\setlength{\mindflow at parindent}{\parindent}%
\setlength{\mindflow at 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 at parindent}%
- \setlength{\parskip}{\mindflow at parskip}%
- }]
+ \if at mindflow@incolumn%
+ \begin{mindflow at nonbreakable}{left=0pt,right=0pt}
+ \else%
+ \begin{mindflow at nonbreakable}{%
+ grow to left by=\linewidth,left=\linewidth,
+ grow to right by=\linewidth,right=\linewidth}
+ \fi
\begin{internallinenumbers}%
\let\makeLineNumber\mindflow at makeLineNumber%
}
@@ -515,8 +532,11 @@
\def\endmindflowON{%
\nowidow[3]%
\end{internallinenumbers}%
- \end{tcolorbox}\par%
- \ifLNturnsON\linenumbers\fi%
+ \end{mindflow at nonbreakable}\par%
+ \ResumeLineNumbers%
+ \setcounter{mfLN}{\value{linenumber}}%
+ \setcounter{linenumber}{\value{recordLN}}%
+ \ResumeIncolumn%
}
\fi
@@ -553,10 +573,9 @@
}
\define at key{mindflow}{leftmarker}[true]{\csname @mindflow at leftmarker#1\endcsname}
\define at key{mindflow}{rightmarker}[true]{\csname @mindflow at rightmarker#1\endcsname}
-\define at key{mindflow}{linenumber}[true]{\csname @mindflow at linenumber#1\endcsname}
+\define at key{mindflow}{linenumber}[true]{\csname @mindflow at leftlinenumber#1\endcsname}
\define at key{mindflow}{leftlinenumber}[true]{\csname @mindflow at leftlinenumber#1\endcsname}
\define at key{mindflow}{rightlinenumber}[true]{\csname @mindflow at rightlinenumber#1\endcsname}
-\define at key{mindflow}{twocolumn}[true]{\csname @mindflow at twocolumn#1\endcsname}
\define at key{mindflow}{incolumn}[true]{\csname @mindflow at incolumn#1\endcsname}
\define at key{mindflow}{linecolor}{\colorlet{mindflowLine}{#1}}
\define at key{mindflow}{textcolor}{\colorlet{mindflowText}{#1}}
@@ -577,12 +596,6 @@
\define at key{mindflow}{lineheight}{\setlength{\mindflowLineHeight}{#1}}
\newcommand{\mindflowset}[1]{%
\setkeys{mindflow}{#1}%
- \if at mindflow@twocolumn%
- \@mindflow at incolumntrue%
- \fi%
- \if at mindflow@linenumber%
- \@mindflow at leftlinenumbertrue%
- \fi%
}
%%================================
Modified: trunk/Master/texmf-dist/tex/latex/mindflow/mindflow.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/mindflow/mindflow.sty 2021-09-16 11:13:15 UTC (rev 60519)
+++ trunk/Master/texmf-dist/tex/latex/mindflow/mindflow.sty 2021-09-16 20:16:48 UTC (rev 60520)
@@ -17,7 +17,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{mindflow}
- [2021/09/12 mindflow environment]
+ [2021/09/15 mindflow environment]
\RequirePackage{kvoptions}
\SetupKeyvalOptions{%
family = @mindflow,
@@ -30,7 +30,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
@@ -39,9 +38,6 @@
\if at mindflow@on
\@mindflow at offfalse
\fi
-\if at mindflow@twocolumn
- \@mindflow at incolumntrue
-\fi
\if at mindflow@linenumber
\@mindflow at leftlinenumbertrue
\fi
@@ -78,6 +74,13 @@
\ifLineNumbers\LNturnsONtrue\fi\nolinenumbers}
\def\ResumeLineNumbers{\ifLNturnsON\linenumbers\fi}
+\newif\ifICturnsON
+\def\AutoIncolumn{\ICturnsONfalse%
+ \if at mindflow@incolumn\ICturnsONtrue\fi%
+ \if at twocolumn\@mindflow at incolumntrue\fi%
+}
+\def\ResumeIncolumn{\ifICturnsON\@mindflow at incolumntrue\fi}
+
\newcounter{recordLN}
\newcounter{mfLN}
\setcounter{mfLN}{1}
@@ -126,6 +129,7 @@
\medskip%
\setcounter{recordLN}{\value{linenumber}}%
\setcounter{linenumber}{\value{mfLN}}%
+ \AutoIncolumn%
\mfSepLine%
\normalfont\mindflowTextFont\color{mindflowText}%
\linenumbers%
@@ -137,6 +141,7 @@
\mfSepLine%
\setcounter{mfLN}{\value{linenumber}}%
\setcounter{linenumber}{\value{recordLN}}%
+ \ResumeIncolumn%
\medskip%
}
@@ -147,23 +152,32 @@
\RequirePackage{tcolorbox}
\newlength{\mindflow at parindent}
\newlength{\mindflow at parskip}
+\newtcolorbox{mindflow at 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 at parindent}%
+ \setlength{\parskip}{\mindflow at parskip}%
+ },#1
+}
\def\mindflowON{%
- \LNturnsONfalse%
- \ifLineNumbers\LNturnsONtrue\fi\nolinenumbers%
+ \LocallyStopLineNumbers%
+ \setcounter{recordLN}{\value{linenumber}}%
+ \setcounter{linenumber}{\value{mfLN}}%
+ \AutoIncolumn%
\setlength{\mindflow at parindent}{\parindent}%
\setlength{\mindflow at 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 at parindent}%
- \setlength{\parskip}{\mindflow at parskip}%
- }]
+ \if at mindflow@incolumn%
+ \begin{mindflow at nonbreakable}{left=0pt,right=0pt}
+ \else%
+ \begin{mindflow at nonbreakable}{%
+ grow to left by=\linewidth,left=\linewidth,
+ grow to right by=\linewidth,right=\linewidth}
+ \fi
\begin{internallinenumbers}%
\let\makeLineNumber\mindflow at makeLineNumber%
}
@@ -170,8 +184,11 @@
\def\endmindflowON{%
\nowidow[3]%
\end{internallinenumbers}%
- \end{tcolorbox}\par%
- \ifLNturnsON\linenumbers\fi%
+ \end{mindflow at nonbreakable}\par%
+ \ResumeLineNumbers%
+ \setcounter{mfLN}{\value{linenumber}}%
+ \setcounter{linenumber}{\value{recordLN}}%
+ \ResumeIncolumn%
}
\fi
@@ -208,10 +225,9 @@
}
\define at key{mindflow}{leftmarker}[true]{\csname @mindflow at leftmarker#1\endcsname}
\define at key{mindflow}{rightmarker}[true]{\csname @mindflow at rightmarker#1\endcsname}
-\define at key{mindflow}{linenumber}[true]{\csname @mindflow at linenumber#1\endcsname}
+\define at key{mindflow}{linenumber}[true]{\csname @mindflow at leftlinenumber#1\endcsname}
\define at key{mindflow}{leftlinenumber}[true]{\csname @mindflow at leftlinenumber#1\endcsname}
\define at key{mindflow}{rightlinenumber}[true]{\csname @mindflow at rightlinenumber#1\endcsname}
-\define at key{mindflow}{twocolumn}[true]{\csname @mindflow at twocolumn#1\endcsname}
\define at key{mindflow}{incolumn}[true]{\csname @mindflow at incolumn#1\endcsname}
\define at key{mindflow}{linecolor}{\colorlet{mindflowLine}{#1}}
\define at key{mindflow}{textcolor}{\colorlet{mindflowText}{#1}}
@@ -232,12 +248,6 @@
\define at key{mindflow}{lineheight}{\setlength{\mindflowLineHeight}{#1}}
\newcommand{\mindflowset}[1]{%
\setkeys{mindflow}{#1}%
- \if at mindflow@twocolumn%
- \@mindflow at incolumntrue%
- \fi%
- \if at mindflow@linenumber%
- \@mindflow at leftlinenumbertrue%
- \fi%
}
%%================================
More information about the tex-live-commits
mailing list.