multicolrule (2jan19)

git-svn-id: svn://tug.org/texlive/trunk@49579 c570f23f-e606-0410-a88d-b1316a301751

4 files changed, 75 insertions, 13 deletions

diff --git a/Master/texmf-dist/doc/latex/multicolrule/README.md b/Master/texmf-dist/doc/latex/multicolrule/README.md
index f3413ae2b93..09bac078019 100644
--- a/Master/texmf-dist/doc/latex/multicolrule/README.md
+++ b/Master/texmf-dist/doc/latex/multicolrule/README.md
@@ -25,7 +25,7 @@ and to get the change list, you must issue
 
 `makeindex -s gglo.ist -o multicolrule.gls multicolrule.glo`.
 
-This package requires LaTeX3 support to run, and compiling the
-documentation requires a variety of other packages, all of which
-are available on CTAN and any modern installation (TeX Live,
-MiKTeX, etc.).
+This package requires expl3 and xparse.
+  % |\DeclareMCRulePattern| \marg{name} \marg{key-value list}
+  % \end{syntax}
+
diff --git a/Master/texmf-dist/doc/latex/multicolrule/mcrule-examples.pdf b/Master/texmf-dist/doc/latex/multicolrule/mcrule-examples.pdf
index 9188355ac7c..1db0ac9c584 100644
--- a/Master/texmf-dist/doc/latex/multicolrule/mcrule-examples.pdf
+++ b/Master/texmf-dist/doc/latex/multicolrule/mcrule-examples.pdf
diff --git a/Master/texmf-dist/doc/latex/multicolrule/mcrule-examples.tex b/Master/texmf-dist/doc/latex/multicolrule/mcrule-examples.tex
index 888b63cae46..ea5991c54e5 100644
--- a/Master/texmf-dist/doc/latex/multicolrule/mcrule-examples.tex
+++ b/Master/texmf-dist/doc/latex/multicolrule/mcrule-examples.tex
@@ -1,7 +1,8 @@
 % !TeX program = xelatex
 \documentclass{article}
+\usepackage[left=1in,right=1in,top=1in,bottom=1in]{geometry}
 \usepackage{fontspec}
-\usepackage[tikz]{multicolrule}[2018/12/21]
+\usepackage[tikz]{multicolrule}[2018/12/31]
 \usepackage{lipsum}
 \usepackage{bbding}
 \usepackage{pgfornament}
@@ -152,17 +153,17 @@ for instructions on how to set them in your own documents.
 \end{multicols}
 
 \begin{multicols}{2}[Custom Line]
-  \SetMCRule{width=1pt,custom-line={\draw[line width=\columnseprule] (TOP) to [ornament=88] (BOT);}}
-  \lipsum[1]
+  \SetMCRule{width=1pt,custom-line={\path (TOP) to [ornament=88] (BOT);}}
+  \lipsum[1-2]
 \end{multicols}
 
 \setlength{\columnsep}{50pt}
-
-\begin{multicols}{2}[Custom Line (+ 4 repeats), just because we can]
-  \SetMCRule{repeat=4,repeat-distance=4pt,width=1pt,custom-line={\draw[line width=\columnseprule] (TOP) to [ornament=88] (BOT);}}
-  \lipsum[1]
+\begin{multicols}{2}[Custom Line (color gray, 4 repeats), just because we can]
+  \SetMCRule{color=gray,repeat=4,repeat-distance=4pt,width=1pt,custom-line={\path (TOP) to [ornament=88] (BOT);}}
+  \lipsum[1-2]
 \end{multicols}
 
+\newpage
 \subsection*{Extended Rules}
 \setlength{\columnsep}{24pt}
 
@@ -187,10 +188,71 @@ for instructions on how to set them in your own documents.
 \end{multicols}
 And something at the end to show the reserved space
 
-\subsection*{RTL Test}
+\subsection*{Patterns}
 
-  \RLmulticolcolumns
+\DeclareMCRulePattern{left-hand}{custom-tile={\HandLeft}{8pt}{8pt}}
+\DeclareMCRulePattern{right-hand}{custom-tile={\HandRight}{8pt}{8pt}}
+\DeclareMCRulePattern{shrinking}{line-style=solid,color=blue,extend-top=-16pt}
+\begin{multicols}{3}[Alternating Patterns]
+  \SetMCRule{patterns={right-hand,left-hand}}
+  \lipsum[1-3]
+\end{multicols}
+
+\begin{multicols}{3}[Shrink and color first rule only]
+  \raggedcolumns
+  \SetMCRule{patterns=shrinking,pattern-for=1}
+  \lipsum[1-2]
+\end{multicols}
+
+\begin{multicols}{4}[Shrink and color second and third rules only]
+  \raggedcolumns
+  \SetMCRule{patterns=shrinking,pattern-after=1,pattern-for=2}
+  \lipsum[1-2]
+\end{multicols}
+
+\DeclareMCRulePattern{circlei}{width=3pt,line-style=loose-solid-circles,color=black}
+\DeclareMCRulePattern{circleii}{width=6pt,line-style=loose-solid-circles,color=black!75}
+\DeclareMCRulePattern{circleiii}{width=9pt,line-style=loose-solid-circles,color=black!50}
+\DeclareMCRulePattern{circleiv}{width=12pt,line-style=loose-solid-circles,color=black!25}
+\SetMCRule{patterns={circlei,circleii,circleiii,circleiv}}
+\begin{multicols}{4}[Growing and fading circles]
+  \raggedcolumns
+  \lipsum[1-2]
+\end{multicols}
+
+\begin{multicols}{4}[The same, pattern cycling across environment boundary]
+  \raggedcolumns
+  \lipsum[1-2]
+\end{multicols}
+
+
+\DeclareMCRulePattern{blue-double}{width=thick,line-style=solid,color=blue,double=3pt}
+\DeclareMCRulePattern{orange-triple}{width=thick,line-style=solid,color=orange,triple=3pt}
+\begin{multicols}{2}[Nested multicols environments]
+\SetMCRule{patterns={blue-double,blue-double,orange-triple}}
+
+\lipsum[1][1-5]
+
+\begin{multicols}{2}
+\lipsum[1][1-3]
+\end{multicols}  
+
+\lipsum[1][1-5]
+
+\lipsum[1][1-5]
+
+\begin{multicols}{2}
+\lipsum[1][1-3]
+\end{multicols}  
+
+\lipsum[1][1-5]
+
+\end{multicols}
+
+\subsection*{RTL Test}
 
+\RLmulticolcolumns
+\SetMCRule{patterns={}}
 \begin{multicols}{2}[Reverse Columns Only]
   \SetMCRule{custom-tile={+}{8pt}{8pt}}
   \lipsum[1]
diff --git a/Master/texmf-dist/doc/latex/multicolrule/multicolrule.pdf b/Master/texmf-dist/doc/latex/multicolrule/multicolrule.pdf
index a64af8676eb..06380ab826a 100644
--- a/Master/texmf-dist/doc/latex/multicolrule/multicolrule.pdf
+++ b/Master/texmf-dist/doc/latex/multicolrule/multicolrule.pdf