texlive[56366] Master/texmf-dist: multicolrule (17sep20)
commits+karl at tug.org
commits+karl at tug.org
Thu Sep 17 23:19:33 CEST 2020
Revision: 56366
http://tug.org/svn/texlive?view=revision&revision=56366
Author: karl
Date: 2020-09-17 23:19:32 +0200 (Thu, 17 Sep 2020)
Log Message:
-----------
multicolrule (17sep20)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/multicolrule/mcrule-examples.pdf
trunk/Master/texmf-dist/doc/latex/multicolrule/mcrule-examples.tex
trunk/Master/texmf-dist/doc/latex/multicolrule/multicolrule.pdf
trunk/Master/texmf-dist/source/latex/multicolrule/multicolrule.dtx
trunk/Master/texmf-dist/tex/latex/multicolrule/multicolrule.sty
Removed Paths:
-------------
trunk/Master/texmf-dist/source/latex/multicolrule/multicolrule.ins
Modified: trunk/Master/texmf-dist/doc/latex/multicolrule/mcrule-examples.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/multicolrule/mcrule-examples.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/multicolrule/mcrule-examples.tex 2020-09-17 21:19:03 UTC (rev 56365)
+++ trunk/Master/texmf-dist/doc/latex/multicolrule/mcrule-examples.tex 2020-09-17 21:19:32 UTC (rev 56366)
@@ -8,7 +8,7 @@
\usepackage{bbding}
\usepackage{pgfornament}
\usepackage{bidi}
-\usetikzlibrary{calc}
+\usetikzlibrary{math,calc}
\setlength{\columnsep}{24pt}
\setlength{\columnseprule}{.5pt}
\begin{document}
@@ -164,7 +164,7 @@
\lipsum[1-2]
\end{multicols}
-\begin{multicols}{2}[Custom line with horizontal lines flush with vertical rule]
+\begin{multicols}{2}[Custom line with horizontal lines flush with vertical rule\footnote{Based on an answer to tex.stackexchange question 47828}]
\SetMCRule{color=gray,width=0.4pt, expand=2pt, custom-line={
\coordinate (TOPLEFT) at ($(TOP)-(\columnwidth+.5\columnsep,\columnseprule)$);
\coordinate (TOPRIGHT) at ($(TOP)+(\columnwidth+.5\columnsep,-\columnseprule)$);
@@ -175,6 +175,29 @@
\lipsum[1-2]
\end{multicols}
+\setlength{\columnsep}{2in}
+
+\begin{multicols}{2}[Notepad image between two columns\footnote{Based on an answer to tex.stackexchange question 522305}]
+ \SetMCRule{color=blue!10,width=2pt, custom-line={
+ \tikzmath {coordinate \t, \b;
+ \t = (TOP)-(.45\columnsep,0);
+ integer \r, \s;
+ \r = \ty / 16;
+ \s = \ty - \r*16;
+ \t = (\t)-(0,.5*\s);
+ \b = (\t)+(.9\columnsep,-\r*16);
+ }
+ \draw [line width=\columnseprule]
+ (\t) -- ++(.9\columnsep,0) -- (\b) -- ++(-.9\columnsep,0) -- cycle;
+ \foreach \fila in {1,...,\r}
+ {
+ \draw [line width=\columnseprule]
+ ($(\t)-(0,\fila*16pt)$) -- ++(0.90\columnsep,0);
+ }
+ }}
+ \lipsum[1-2]
+\end{multicols}
+
\subsection*{Extended Rules}
\setlength{\columnsep}{24pt}
Modified: trunk/Master/texmf-dist/doc/latex/multicolrule/multicolrule.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/latex/multicolrule/multicolrule.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/multicolrule/multicolrule.dtx 2020-09-17 21:19:03 UTC (rev 56365)
+++ trunk/Master/texmf-dist/source/latex/multicolrule/multicolrule.dtx 2020-09-17 21:19:32 UTC (rev 56366)
@@ -54,7 +54,7 @@
\endpreamble
\postamble
-Copyright (C) 2018-2019 by Karl Hagen <latex at polysyllabic.com>
+Copyright (C) 2018-2020 by Karl Hagen <latex at polysyllabic.com>
This file may be distributed and/or modified under the
conditions of the LaTeX Project Public License (LPPL), either
@@ -276,11 +276,10 @@
% or the \LaTeX{} kernel, depending on the mode of operation. If \pkg{bidi} is
% loaded, it will also patch that. It will have no effect if you use a class or
% package that outputs column text via alternate mechanisms. This includes
-% \pkg{parcolumns}, and probably other classes and packages designed to typeset
-% parallel-column text as well, although I have not done a survey to determine
-% whether this is the case. If you would like support for one of these, please
-% send me an email or file a feature request on github and I'll see what I can
-% do.
+% \pkg{parcolumns}, \pkg{paracol}, and probably any other class that does its
+% own multi-column formatting. If you would like support for one of these,
+% please send me an email or file a feature request on github and I'll see what
+% I can do.
%
% The line styles that work by repeating elements in a tiled pattern may have
% significant gaps at the end of columns, particularly for larger patterns.
@@ -302,7 +301,7 @@
% \begin{multicols}{2}[\subsection{License}]
% \SetMCRule{width=ultra-thick,line-style=dotted}
% The\stydsc{\texttt{line-style=dotted, width=ultra-thick}} \mcrule{}
-% package is copyright 2018--2019 by Karl Hagen. It may be distributed and/or
+% package is copyright 2018--2020 by Karl Hagen. It may be distributed and/or
% modified under the conditions of the \LaTeX{} Project Public License, either
% version 1.3c of this license or (at your option) any later version. The
% latest version of this license is in
@@ -333,12 +332,12 @@
% others look better with it. The default behavior of \mcrule{} depends on the
% status of the \pkg{tikz} package at the time \mcrule{} is loaded. If
% \mcrule{} detects that \pkg{tikz} is already loaded, then tikz support will
-% be enabled by default. Otherwise, you need the \opt{tikz} to enable it. This
-% option also accepts explicit boolean values, so you can pass |tikz=false| if
-% you want to explicitly disable tikz support. If tikz support is not enabled
-% (or if it is explicitly disabled), the line styles marked \emph{tikz only}
-% in section \ref{sec:linestyles} will be unavailable and errors will result
-% if you try to use them.
+% be enabled by default. Otherwise, you need to provide the \opt{tikz} option
+% to enable it. This option also accepts explicit boolean values, so you can
+% pass |tikz=false| if you want to explicitly disable tikz support. If tikz
+% support is not enabled (or if it is explicitly disabled), the line styles
+% marked \emph{tikz only} in section \ref{sec:linestyles} will be unavailable
+% and errors will result if you try to use them.
%
% \subsection{Option `twocolumn'}
% \DescribeOption{twocolumn}
@@ -380,7 +379,7 @@
% a page unless you close out one \env{multicols} environment and begin another.
%
% Table \ref{table:mcrulekeys} summarizes the keys available in \cs{SetMCRule}.
-% The functions of each is described in detail in the sections that follow.
+% The functions of each are described in detail in the sections that follow.
% \end{multicols}
%
% \begin{longtable}{lp{3.5in}}
@@ -569,7 +568,7 @@
%
% The rule in this section uses the \cs{SparkleBold} symbol from
% \pkg{bbding}. Notice that when you use the \kvdesc{custom-tile} parameter,
-% of any of the other custom key commands, you do \emph{not} specify a separate
+% or any of the other custom key commands, you do \emph{not} specify a separate
% \kvdesc{line-style}. If you try to provide both, the last style given in the
% list will be the one that is kept.
% \end{multicols}
@@ -891,7 +890,7 @@
%\subsection{Preliminaries}
%
% \begin{macrocode}
-\ProvidesExplPackage {multicolrule} {2019/10/01} {1.3}
+\ProvidesExplPackage {multicolrule} {2020/09/14} {1.3a}
{Decorative vertical rules between columns}
% \end{macrocode}
%
@@ -922,6 +921,7 @@
% \begin{macrocode}
\bool_new:N \g_@@_twocolumn_bool
\bool_new:N \g_@@_use_tikz_bool
+\bool_new:N \g_@@_paracol_bool
% \end{macrocode}
%\end{variable}
%
@@ -987,8 +987,11 @@
\keys_define:nn {mcrule-opts}
{
twocolumn .bool_gset:N = \g_@@_twocolumn_bool,
+ twocolumn .default:n = true,
tikz .bool_gset:N = \g_@@_use_tikz_bool,
tikz .default:n = true,
+ paracol .bool_gset:N = \g_@@_paracol_bool,
+ paracol .default:n = true,
}
\ProcessKeysOptions{mcrule-opts}
% \end{macrocode}
@@ -1102,9 +1105,10 @@
% after \pkg{xcolor}, \pkg{tikz}, \emph{and} \pkg{multicol}, so it must always
% be loaded after us. We use \cs{AfterPackage} from \pkg{scrlfile} to insert
% the patch if \pkg{bidi} is loaded later on.
+% \changes{v1.3a}{2020/9/14}{Update scrlfile command because of API change in that package.}
%
% \begin{macrocode}
- \AfterPackage!{bidi}
+ \AfterAtEndOfPackage*{bidi}
{
\@@_patch_twocol_output:N \RTL at outputdblcol
\@@_patch_twocol_output:N \LTR at outputdblcol
@@ -1771,6 +1775,10 @@
% \end{macrocode}
%\end{macro}
%
+% \begin{macrocode}
+%</package>
+% \end{macrocode}
+%
%\end{implementation}
%
% \PrintChanges
Deleted: trunk/Master/texmf-dist/source/latex/multicolrule/multicolrule.ins
===================================================================
--- trunk/Master/texmf-dist/source/latex/multicolrule/multicolrule.ins 2020-09-17 21:19:03 UTC (rev 56365)
+++ trunk/Master/texmf-dist/source/latex/multicolrule/multicolrule.ins 2020-09-17 21:19:32 UTC (rev 56366)
@@ -1,71 +0,0 @@
-%%
-%% This is file `multicolrule.ins',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% multicolrule.dtx (with options: `install')
-%% ----------------------------------------------------------------
-%% multicolrule --- Decorative rules between columns
-%% Author: Karl Hagen
-%% Email: latex at polysyllabic.com
-%% Released under the LaTeX Project Public License v1.3c or later
-%% See http://www.latex-project.org/lppl.txt
-%% ----------------------------------------------------------------
-%%
-\input l3docstrip.tex
-\keepsilent
-\askforoverwritefalse
-\preamble
-----------------------------------------------------------------
-multicolrule --- Decorative rules between columns
-Author: Karl Hagen
-Email: latex at polysyllabic.com
-Released under the LaTeX Project Public License v1.3c or later
-See http://www.latex-project.org/lppl.txt
-----------------------------------------------------------------
-
-\endpreamble
-\postamble
-Copyright (C) 2018-2019 by Karl Hagen <latex at polysyllabic.com>
-
-This file may be distributed and/or modified under the
-conditions of the LaTeX Project Public License (LPPL), either
-version 1.3c of this license or (at your option) any later
-version. The latest version of this license is in the file:
- https://www.latex-project.org/lppl.txt
-
-This work is "maintained" (as per LPPL maintenance status) by
- Karl Hagen.
-
-This work consists of the files multicolrule.dtx and
- mcrule-examples.tex,
-and the derived files multicolrule.ins,
- multicolrule.sty,
- multicolrule.pdf, and
- mcrule-examples.pdf.
-\endpostamble
-\usedir{tex/latex/multicolrule}
-\generate{
- \file{\jobname.sty}{\from{\jobname.dtx}{package}}
-}
-\endbatchfile
-%% Copyright (C) 2018-2019 by Karl Hagen <latex at polysyllabic.com>
-%%
-%% This file may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License (LPPL), either
-%% version 1.3c of this license or (at your option) any later
-%% version. The latest version of this license is in the file:
-%% https://www.latex-project.org/lppl.txt
-%%
-%% This work is "maintained" (as per LPPL maintenance status) by
-%% Karl Hagen.
-%%
-%% This work consists of the files multicolrule.dtx and
-%% mcrule-examples.tex,
-%% and the derived files multicolrule.ins,
-%% multicolrule.sty,
-%% multicolrule.pdf, and
-%% mcrule-examples.pdf.
-%%
-%% End of file `multicolrule.ins'.
Modified: trunk/Master/texmf-dist/tex/latex/multicolrule/multicolrule.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/multicolrule/multicolrule.sty 2020-09-17 21:19:03 UTC (rev 56365)
+++ trunk/Master/texmf-dist/tex/latex/multicolrule/multicolrule.sty 2020-09-17 21:19:32 UTC (rev 56366)
@@ -15,7 +15,7 @@
%%
\RequirePackage{expl3}
\RequirePackage{xparse}
-\ProvidesExplPackage {multicolrule} {2019/10/01} {1.3}
+\ProvidesExplPackage {multicolrule} {2020/09/14} {1.3a}
{Decorative vertical rules between columns}
\RequirePackage{l3keys2e}
\RequirePackage{xpatch}
@@ -33,6 +33,7 @@
{The~multicolrule~pattern~'#1'~has~not~been~defined.}
\bool_new:N \g__mcrule_twocolumn_bool
\bool_new:N \g__mcrule_use_tikz_bool
+\bool_new:N \g__mcrule_paracol_bool
\int_new:N \l__mcrule_repeat_int
\int_set:Nn \l__mcrule_repeat_int {1}
\dim_new:N \l__mcrule_repeat_distance_dim
@@ -54,8 +55,11 @@
\keys_define:nn {mcrule-opts}
{
twocolumn .bool_gset:N = \g__mcrule_twocolumn_bool,
+ twocolumn .default:n = true,
tikz .bool_gset:N = \g__mcrule_use_tikz_bool,
tikz .default:n = true,
+ paracol .bool_gset:N = \g__mcrule_paracol_bool,
+ paracol .default:n = true,
}
\ProcessKeysOptions{mcrule-opts}
\cs_new:Npn \__mcrule_column_height: {}
@@ -83,7 +87,7 @@
\cs_gset:Npn \__mcrule_column_height: {\box_ht:N \@outputbox}
\cs_gset:Npn \__mcrule_column_depth: {\box_dp:N \@outputbox}
\__mcrule_patch_twocol_output:N \@outputdblcol
- \AfterPackage!{bidi}
+ \AfterAtEndOfPackage*{bidi}
{
\__mcrule_patch_twocol_output:N \RTL at outputdblcol
\__mcrule_patch_twocol_output:N \LTR at outputdblcol
@@ -433,7 +437,7 @@
{
\prop_gput:Nnn \g__mcrule_patterns_prop {#1} {#2}
}
-%% Copyright (C) 2018-2019 by Karl Hagen <latex at polysyllabic.com>
+%% Copyright (C) 2018-2020 by Karl Hagen <latex at polysyllabic.com>
%%
%% This file may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License (LPPL), either
More information about the tex-live-commits
mailing list.