From 06035cd2a957fc5063b466c181f360a743fc9d0a Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 11 Feb 2015 00:09:15 +0000 Subject: vwcol (9feb15) git-svn-id: svn://tug.org/texlive/trunk@36254 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/vwcol/vwcol.sty | 60 ++++++++++++++++++----------- 1 file changed, 38 insertions(+), 22 deletions(-) (limited to 'Master/texmf-dist/tex/latex/vwcol') diff --git a/Master/texmf-dist/tex/latex/vwcol/vwcol.sty b/Master/texmf-dist/tex/latex/vwcol/vwcol.sty index 3e958054408..c9e2e9f2fde 100644 --- a/Master/texmf-dist/tex/latex/vwcol/vwcol.sty +++ b/Master/texmf-dist/tex/latex/vwcol/vwcol.sty @@ -5,15 +5,27 @@ %% The original source files were: %% %% vwcol.dtx (with options: `package') +%% ___________________________________________________________ %% -%% __________________________________ -%% Copyright (C) 2008 Will Robertson +%% Copyright (C) 2008, 2015 Will Robertson +%% %% -%% License information appended. +%% Distributable under the LaTeX Project Public License, +%% version 1.3c or higher (your choice). The latest version of +%% this license is at: http://www.latex-project.org/lppl.txt +%% +%% This work is "maintained" (as per LPPL maintenance status) +%% by Will Robertson. %% +%% This work consists of the file vwcol.dtx +%% and the derived files vwcol.sty, +%% vwcol.ins, and +%% vwcol.pdf. +%% ___________________________________________________________ \ProvidesPackage{vwcol} - [2008/06/24 v0.1 Variable-width multicolumn text] + [2015/02/10 v0.2 Variable-width multicolumn text] \RequirePackage{calc} +\RequirePackage{color} \RequirePackage{environ}[2008/06/18] \RequirePackage{keyval} \RequirePackage{ragged2e} @@ -220,6 +232,8 @@ \vwcolsetup{justify=ragged} \define@key{vwcol}{indent}{\setlength\vwcol@parindent{#1}} \vwcolsetup{indent=1.5em} +\define@key{vwcol}{rulecolor}{\def\vwcol@rulecol{#1}} +\vwcolsetup{rulecolor=black} \NewEnviron{vwcol}[1][]{% \par\noindent \@vwcol@boxreadyfalse @@ -368,7 +382,10 @@ \noindent\strut#1}% \if@vwcol@presep \if@vwcol@prerule - \vrule width \vwcol@rule + \begingroup + \color{\vwcol@rulecol} + \vrule width \vwcol@rule + \endgroup \fi \hskip\dimexpr (\vwcol@sep-\vwcol@rule)/2 \relax \fi @@ -377,10 +394,20 @@ \advance\@tempcnta 1 \unless\ifnum\@tempcnta=1 \ifdim\vwcol@sep=1sp - \hfill\vrule width \vwcol@rule\hfill + \hfill + \begingroup + \color{\vwcol@rulecol} + \vrule width \vwcol@rule + \endgroup + \hfill \else \@tempdima=\dimexpr (\vwcol@sep-\vwcol@rule)/2 \relax - \hskip\@tempdima\vrule width \vwcol@rule\hskip\@tempdima + \hskip\@tempdima + \begingroup + \color{\vwcol@rulecol} + \vrule width \vwcol@rule + \endgroup + \hskip\@tempdima \fi \fi \vsplit\vwcol@box to \numexpr @@ -389,26 +416,15 @@ \if@vwcol@postsep \hskip\dimexpr (\vwcol@sep-\vwcol@rule)/2 \relax \if@vwcol@postrule - \vrule width \vwcol@rule + \begingroup + \color{\vwcol@rulecol} + \vrule width \vwcol@rule + \endgroup \fi \fi \ifvoid\vwcol@box \global\@vwcol@boxreadytrue \fi} %% -%% Copyright (C) 2008 by Will Robertson -%% -%% Distributable under the LaTeX Project Public License, -%% version 1.3c or higher (your choice). The latest version of -%% this license is at: http://www.latex-project.org/lppl.txt -%% -%% This work is "maintained" (as per LPPL maintenance status) -%% by Will Robertson. -%% -%% This work consists of the file vwcol.dtx -%% and the derived files vwcol.sty, -%% vwcol.ins, and -%% vwcol.pdf. -%% %% %% End of file `vwcol.sty'. -- cgit v1.2.3