From e7b3f647ec980bfd9f57df1f95212403093993f6 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 16 Sep 2021 20:16:48 +0000 Subject: mindflow (16sep21) git-svn-id: svn://tug.org/texlive/trunk@60520 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/mindflow/mindflow.sty | 68 +++++++++++++---------- 1 file changed, 39 insertions(+), 29 deletions(-) (limited to 'Master/texmf-dist/tex/latex/mindflow') diff --git a/Master/texmf-dist/tex/latex/mindflow/mindflow.sty b/Master/texmf-dist/tex/latex/mindflow/mindflow.sty index 82db944cf8f..94a9cf656e7 100644 --- a/Master/texmf-dist/tex/latex/mindflow/mindflow.sty +++ b/Master/texmf-dist/tex/latex/mindflow/mindflow.sty @@ -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@mindflow@on \@mindflow@offfalse \fi -\if@mindflow@twocolumn - \@mindflow@incolumntrue -\fi \if@mindflow@linenumber \@mindflow@leftlinenumbertrue \fi @@ -78,6 +74,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} @@ -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,31 +152,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 @@ -208,10 +225,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}} @@ -232,12 +248,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% } %%================================ -- cgit v1.2.3