From 4ae4c0f7b2ba8723d6be3e162b2b500104b60d69 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 4 Oct 2019 20:48:54 +0000 Subject: multicolrule (4oct19) git-svn-id: svn://tug.org/texlive/trunk@52283 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/multicolrule/README.md | 3 -- .../doc/latex/multicolrule/mcrule-examples.pdf | Bin 48666 -> 50874 bytes .../doc/latex/multicolrule/mcrule-examples.tex | 55 ++++++++++++++++----- .../doc/latex/multicolrule/multicolrule.pdf | Bin 550851 -> 561243 bytes 4 files changed, 44 insertions(+), 14 deletions(-) (limited to 'Master/texmf-dist/doc/latex/multicolrule') diff --git a/Master/texmf-dist/doc/latex/multicolrule/README.md b/Master/texmf-dist/doc/latex/multicolrule/README.md index 09bac078019..c04a36de6ec 100644 --- a/Master/texmf-dist/doc/latex/multicolrule/README.md +++ b/Master/texmf-dist/doc/latex/multicolrule/README.md @@ -26,6 +26,3 @@ and to get the change list, you must issue `makeindex -s gglo.ist -o multicolrule.gls multicolrule.glo`. 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 1db0ac9c584..7a4237a86ec 100644 Binary files a/Master/texmf-dist/doc/latex/multicolrule/mcrule-examples.pdf and b/Master/texmf-dist/doc/latex/multicolrule/mcrule-examples.pdf differ diff --git a/Master/texmf-dist/doc/latex/multicolrule/mcrule-examples.tex b/Master/texmf-dist/doc/latex/multicolrule/mcrule-examples.tex index ea5991c54e5..3796b78e320 100644 --- a/Master/texmf-dist/doc/latex/multicolrule/mcrule-examples.tex +++ b/Master/texmf-dist/doc/latex/multicolrule/mcrule-examples.tex @@ -2,17 +2,19 @@ \documentclass{article} \usepackage[left=1in,right=1in,top=1in,bottom=1in]{geometry} \usepackage{fontspec} -\usepackage[tikz]{multicolrule}[2018/12/31] +\usepackage[tikz]{multicolrule}[2019/10/01] \usepackage{lipsum} +\usepackage{fancyvrb} \usepackage{bbding} \usepackage{pgfornament} \usepackage{bidi} +\usetikzlibrary{calc} \setlength{\columnsep}{24pt} \setlength{\columnseprule}{.5pt} \begin{document} \section*{Style Gallery} -This file gives brief examples covering all the defined line styles and +This file gives brief examples covering all defined line styles and other functions available in \texttt{multicolrule}. See the documentation for instructions on how to set them in your own documents. @@ -157,13 +159,22 @@ for instructions on how to set them in your own documents. \lipsum[1-2] \end{multicols} -\setlength{\columnsep}{50pt} -\begin{multicols}{2}[Custom Line (color gray, 4 repeats), just because we can] +\begin{multicols}{2}[Custom line that is too wide for the separator] \SetMCRule{color=gray,repeat=4,repeat-distance=4pt,width=1pt,custom-line={\path (TOP) to [ornament=88] (BOT);}} \lipsum[1-2] \end{multicols} -\newpage +\begin{multicols}{2}[Custom line with horizontal lines flush with vertical rule] + \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)$); + \coordinate (BOTLEFT) at ($(BOT)-(\columnwidth+.5\columnsep,-\columnseprule)$); + \coordinate (BOTRIGHT) at ($(BOT)+(\columnwidth+.5\columnsep,\columnseprule)$); + \draw[line width=\columnseprule] (TOPLEFT) -- (TOPRIGHT) + (TOP) -- (BOT) (BOTLEFT) -- (BOTRIGHT);}} + \lipsum[1-2] +\end{multicols} + \subsection*{Extended Rules} \setlength{\columnsep}{24pt} @@ -177,16 +188,32 @@ for instructions on how to set them in your own documents. \lipsum[1] \end{multicols} -\begin{multicols}{2}[Dashed -- shrink both 16pt] - \SetMCRule{line-style=dashed,extend-top=-16pt,extend-bot=-16pt} +\begin{multicols}{2}[Dashed -- expand -8pt] + \SetMCRule{line-style=dashed,expand=-8pt} + \lipsum[1] +\end{multicols} + +\begin{multicols}{2}[Dots -- expand 8pt] + \SetMCRule{line-style=dots,expand=8pt} \lipsum[1] \end{multicols} -\begin{multicols}{2}[Extend-Fill with extend-reserve] +\begin{multicols}{2}[Dots -- shift 16pt] + \SetMCRule{line-style=dots,shift=16pt} + \lipsum[1-2] +\end{multicols} + +\begin{multicols}{2}[Extend-fill with extend-reserve] \SetMCRule{line-style=solid,extend-fill,extend-reserve=\baselineskip} - \lipsum[1-5] + \lipsum[1-2] +\end{multicols} +And something at the end to show the reserved space. + +\begin{multicols}{2}[Strut with extend-fill + extend-reserve] + \SetMCRule{line-style=strut,extend-fill,extend-reserve=\baselineskip} + \lipsum[1-3] \end{multicols} -And something at the end to show the reserved space +This text is here to show the effect of the strut used as a separator above. \subsection*{Patterns} @@ -194,7 +221,7 @@ And something at the end to show the reserved space \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}} + \SetMCRule{patterns={left-hand,right-hand}} \lipsum[1-3] \end{multicols} @@ -225,6 +252,12 @@ And something at the end to show the reserved space \lipsum[1-2] \end{multicols} +\DeclareMCRulePattern{invisible}{width=thin,line-style=strut} +\SetMCRule{patterns={left-hand,invisible,right-hand}} +\begin{multicols}{4}[Invisible middle divider with strut] + \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} diff --git a/Master/texmf-dist/doc/latex/multicolrule/multicolrule.pdf b/Master/texmf-dist/doc/latex/multicolrule/multicolrule.pdf index 06380ab826a..9571400c979 100644 Binary files a/Master/texmf-dist/doc/latex/multicolrule/multicolrule.pdf and b/Master/texmf-dist/doc/latex/multicolrule/multicolrule.pdf differ -- cgit v1.2.3