summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2021-05-08 21:07:46 +0000
committerKarl Berry <karl@freefriends.org>2021-05-08 21:07:46 +0000
commit514e219a0e98fc0ed5910a7a9473ea716307a637 (patch)
treeb0401c59e1a296a84d6ea25d70acb3ab2e09f135
parent103c3e6af44d32ddefd0fc887f1462970af82d0c (diff)
mindflow (8may21)
git-svn-id: svn://tug.org/texlive/trunk@59137 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/mindflow/mindflow.pdfbin198276 -> 179867 bytes
-rw-r--r--Master/texmf-dist/source/latex/mindflow/mindflow.dtx89
-rw-r--r--Master/texmf-dist/tex/latex/mindflow/mindflow.sty41
3 files changed, 84 insertions, 46 deletions
diff --git a/Master/texmf-dist/doc/latex/mindflow/mindflow.pdf b/Master/texmf-dist/doc/latex/mindflow/mindflow.pdf
index 753bb680539..e861974e19e 100644
--- a/Master/texmf-dist/doc/latex/mindflow/mindflow.pdf
+++ b/Master/texmf-dist/doc/latex/mindflow/mindflow.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/mindflow/mindflow.dtx b/Master/texmf-dist/source/latex/mindflow/mindflow.dtx
index 8fa703d9383..629ceaaf418 100644
--- a/Master/texmf-dist/source/latex/mindflow/mindflow.dtx
+++ b/Master/texmf-dist/source/latex/mindflow/mindflow.dtx
@@ -18,20 +18,24 @@
%<package>\NeedsTeXFormat{LaTeX2e}
%<package>\ProvidesPackage{mindflow}
%<*package>
- [2021/03/17 Mindflow environment]
+ [2021/05/07 Mindflow environment]
%</package>
%
%<*driver>
\documentclass{article}
\usepackage{doc}
\usepackage[a4paper,top=1.2in,bottom=1.2in,left=1.6in,right=1.2in]{geometry}
+\usepackage{titlesec}
+\titleformat{\section}{\large\scshape\centering}{\thesection.}{.5em}{}
+\titleformat{\subsection}{\large}{\thesubsection}{.5em}{}
\usepackage{titling}
\setlength{\droptitle}{-.5in}
-\PassOptionsToPackage{mathlines}{lineno}
-\usepackage[linenumber,rightmarker]{mindflow}
\usepackage{enumitem}
\setlist{noitemsep}
-\usepackage{newpxtext}
+\usepackage{mathpazo,newpxtext}
+\useosf
+\PassOptionsToPackage{mathlines}{lineno}
+\usepackage[linenumber,rightmarker]{mindflow}
\usepackage{blindtext}
\usepackage{parskip}
\EnableCrossrefs
@@ -43,7 +47,7 @@
%</driver>
% \fi
%
-% \CheckSum{186}
+% \CheckSum{197}
%
% \GetFileInfo{mindflow.dtx}
%
@@ -71,29 +75,38 @@
%
% \section{Usage}
%
+% \subsection{Initialization}
% Simply load the package with
% \begin{verbatim}
% \usepackage{mindflow}
% \end{verbatim}
-% \vspace{-.5\baselineskip}
-% By default, it has no line numbers or markers. You can use the following options:
+%
+% \vspace{-\baselineskip}
+% There are a few options available, which are listed in the next subsection.
+%
+% \subsection{Options}
+% By default, the environment has no line numbers or markers. You can use the following options:
%
% \begin{tabular}{ll}
-% \verb|linenumber| & Enable line numbers\\
+% \verb|linenumber| & 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|off| & Hide all the \verb|mindflow| environments
% \end{tabular}
%
-% \DescribeEnv{mindflow}
+% \DescribeEnv{\{mindflow\}}
% Then you can use the \verb|mindflow| environment as
% \begin{verbatim}
% \begin{mindflow}
% ...
% \end{mindflow}
% \end{verbatim}
+% \vspace{-\baselineskip}
%
+% \subsection{About the line numbers}
% \linenumbers
%
% You can also add line numbers to the other part of your document in the usual
@@ -104,9 +117,10 @@
% Line numbers within the \textsf{mindflow} environments are independent from
% those of the main text.
% \end{mindflow}
-% (\emph{I recommend that you put an empty line before and after the mindflow
-% environments. This way, your paragraph structure won't get changed when you
-% use the }\verb|off|\emph{ option.})
+% (\emph{I recommend that you put an empty line before and after the mindflow
+% environments, i.e.~make the \emph{\textsf{mindflow}} environment a paragraph
+% of its own. This way, your paragraph structure won't get changed when you use
+% the} \verb|off|\emph{ option.})
%
% \nolinenumbers
%
@@ -162,33 +176,35 @@
% 8\% for the line numbers.
%
% \section{An example}
-% With option \verb|linenumber, leftmarker, rightmarker| and the following settings:
+% With option \verb|leftlinenumber, rightlinenumber, leftmarker, rightmarker| and the
+% following settings:
% \begin{verbatim}
% \colorlet{mindflowLine}{green!50!black}
% \colorlet{mindflowText}{blue!50!cyan}
% \colorlet{mindflowNum}{red!50!orange}
% \colorlet{mindflowMarker}{orange}
% \renewcommand{\mindflowTextFont}{\normalfont\footnotesize\sffamily\itshape}
-% \renewcommand{\mindflowNumFont}{\normalfont\small\footnotesize\sffamily}
+% \renewcommand{\mindflowNumFont}{\normalfont\small\footnotesize\ttfamily}
% \renewcommand{\mindflowMarkerFont}{\normalfont\footnotesize\sffamily}
% \renewcommand{\mindflowLeft}{\hspace{1em}\(\succ\)}
-% \renewcommand{\mindflowRight}{\(\prec\)}
+% \renewcommand{\mindflowRight}{\(\prec\)\hspace{1em}}
% \setlength{\mindflowLineHeight}{1pt}
% \end{verbatim}
% \vspace{-.5\baselineskip}
% One gets:
% \makeatletter
% \@mindflow@leftmarkertrue
+% \@mindflow@rightlinenumbertrue
% \makeatother
% \colorlet{mindflowLine}{green!50!black}
% \colorlet{mindflowText}{blue!50!cyan}
% \colorlet{mindflowNum}{red!50!orange}
% \colorlet{mindflowMarker}{orange}
% \renewcommand{\mindflowTextFont}{\normalfont\footnotesize\sffamily\itshape}
-% \renewcommand{\mindflowNumFont}{\normalfont\small\footnotesize\sffamily}
+% \renewcommand{\mindflowNumFont}{\normalfont\small\footnotesize\ttfamily}
% \renewcommand{\mindflowMarkerFont}{\normalfont\footnotesize\sffamily}
% \renewcommand{\mindflowLeft}{\hspace{1em}\(\succ\)}
-% \renewcommand{\mindflowRight}{\(\prec\)}
+% \renewcommand{\mindflowRight}{\(\prec\)\hspace{1em}}
% \setlength{\mindflowLineHeight}{1pt}
% \begin{mindflow}
% \blindtext
@@ -205,18 +221,23 @@
family = @mindflow,
prefix = @mindflow@
}
-\DeclareBoolOption[false]{off} % Turn off mindflow
-\DeclareBoolOption[false]{leftmarker} % Left marker
-\DeclareBoolOption[false]{rightmarker} % Right marker
-\DeclareBoolOption[false]{linenumber} % Line numbers
-\DeclareBoolOption[false]{twocolumn} % Two column
-\DeclareBoolOption[false]{incolumn} % Separation line fits in the column
+\DeclareBoolOption[false]{off} % Turn off mindflow
+\DeclareBoolOption[false]{leftmarker} % Left marker
+\DeclareBoolOption[false]{rightmarker} % Right marker
+\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 the column
\ProcessKeyvalOptions*\relax
\if@mindflow@twocolumn
\@mindflow@incolumntrue
\fi
+\if@mindflow@linenumber
+ \@mindflow@leftlinenumbertrue
+\fi
%%================================
%% Initialization
@@ -242,7 +263,6 @@
%% The mindflow environment
%%================================
\newif\ifLNturnsON
-
\newcommand*{\mfSepLine}{%
\parskip=0pt
\LNturnsONfalse%
@@ -251,7 +271,8 @@
\if@mindflow@incolumn%
\makebox[\linewidth]{\rule{\linewidth}{\mindflowLineHeight}}%
\else%
- \hspace*{-\paperwidth}\makebox[\linewidth]{\rule{4\paperwidth}{\mindflowLineHeight}}%
+ \hspace*{-\paperwidth}%
+ \makebox[\linewidth]{\rule{4\paperwidth}{\mindflowLineHeight}}%
\fi%
\nopagebreak\par%
\ifLNturnsON\linenumbers\fi%
@@ -277,16 +298,22 @@
\linenumbers%
\renewcommand\makeLineNumber{%
\hss%
- \if@mindflow@linenumber%
+ \if@mindflow@leftlinenumber%
\mindflowNumFont\color{mindflowNum}\LineNumber\hspace{1em}%
\fi%
\color{mindflowMarker}%
\if@mindflow@leftmarker%
\mindflowMarkerFont\mindflowLeft\hspace{1em}%
\fi%
- \if@mindflow@rightmarker%
- \rlap{\hskip\textwidth\hspace{1em}\mindflowRight}%
- \fi%
+ \rlap{\hskip\textwidth%
+ \if@mindflow@rightmarker%
+ \hspace{1em}\mindflowRight%
+ \fi%
+ \if@mindflow@rightlinenumber%
+ \hspace{1em}%
+ \mindflowNumFont\color{mindflowNum}\LineNumber%
+ \fi%
+ }%
}%
}
{%
@@ -304,8 +331,8 @@
\newcommand*\linenomathpatch[1]{%
\cspreto{#1}{\linenomath}%
\cspreto{#1*}{\linenomath}%
- \cspreto{end#1}{\endlinenomath}%
- \cspreto{end#1*}{\endlinenomath}%
+ \csappto{end#1}{\endlinenomath}%
+ \csappto{end#1*}{\endlinenomath}%
}
\newcommand*\linenomathpatchAMS[1]{%
\cspreto{#1}{\linenomathAMS}%
diff --git a/Master/texmf-dist/tex/latex/mindflow/mindflow.sty b/Master/texmf-dist/tex/latex/mindflow/mindflow.sty
index e585ae53d9e..de2b7706eba 100644
--- a/Master/texmf-dist/tex/latex/mindflow/mindflow.sty
+++ b/Master/texmf-dist/tex/latex/mindflow/mindflow.sty
@@ -17,24 +17,29 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{mindflow}
- [2021/03/17 Mindflow environment]
+ [2021/05/07 Mindflow environment]
\RequirePackage{kvoptions}
\SetupKeyvalOptions{%
family = @mindflow,
prefix = @mindflow@
}
-\DeclareBoolOption[false]{off} % Turn off mindflow
-\DeclareBoolOption[false]{leftmarker} % Left marker
-\DeclareBoolOption[false]{rightmarker} % Right marker
-\DeclareBoolOption[false]{linenumber} % Line numbers
-\DeclareBoolOption[false]{twocolumn} % Two column
-\DeclareBoolOption[false]{incolumn} % Separation line fits in the column
+\DeclareBoolOption[false]{off} % Turn off mindflow
+\DeclareBoolOption[false]{leftmarker} % Left marker
+\DeclareBoolOption[false]{rightmarker} % Right marker
+\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 the column
\ProcessKeyvalOptions*\relax
\if@mindflow@twocolumn
\@mindflow@incolumntrue
\fi
+\if@mindflow@linenumber
+ \@mindflow@leftlinenumbertrue
+\fi
%%================================
%% Initialization
@@ -60,7 +65,6 @@
%% The mindflow environment
%%================================
\newif\ifLNturnsON
-
\newcommand*{\mfSepLine}{%
\parskip=0pt
\LNturnsONfalse%
@@ -69,7 +73,8 @@
\if@mindflow@incolumn%
\makebox[\linewidth]{\rule{\linewidth}{\mindflowLineHeight}}%
\else%
- \hspace*{-\paperwidth}\makebox[\linewidth]{\rule{4\paperwidth}{\mindflowLineHeight}}%
+ \hspace*{-\paperwidth}%
+ \makebox[\linewidth]{\rule{4\paperwidth}{\mindflowLineHeight}}%
\fi%
\nopagebreak\par%
\ifLNturnsON\linenumbers\fi%
@@ -95,16 +100,22 @@
\linenumbers%
\renewcommand\makeLineNumber{%
\hss%
- \if@mindflow@linenumber%
+ \if@mindflow@leftlinenumber%
\mindflowNumFont\color{mindflowNum}\LineNumber\hspace{1em}%
\fi%
\color{mindflowMarker}%
\if@mindflow@leftmarker%
\mindflowMarkerFont\mindflowLeft\hspace{1em}%
\fi%
- \if@mindflow@rightmarker%
- \rlap{\hskip\textwidth\hspace{1em}\mindflowRight}%
- \fi%
+ \rlap{\hskip\textwidth%
+ \if@mindflow@rightmarker%
+ \hspace{1em}\mindflowRight%
+ \fi%
+ \if@mindflow@rightlinenumber%
+ \hspace{1em}%
+ \mindflowNumFont\color{mindflowNum}\LineNumber%
+ \fi%
+ }%
}%
}
{%
@@ -122,8 +133,8 @@
\newcommand*\linenomathpatch[1]{%
\cspreto{#1}{\linenomath}%
\cspreto{#1*}{\linenomath}%
- \cspreto{end#1}{\endlinenomath}%
- \cspreto{end#1*}{\endlinenomath}%
+ \csappto{end#1}{\endlinenomath}%
+ \csappto{end#1*}{\endlinenomath}%
}
\newcommand*\linenomathpatchAMS[1]{%
\cspreto{#1}{\linenomathAMS}%