From 81bbb4ab6438b469e7203dff1897e07f3605bef4 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 7 Jun 2018 21:22:36 +0000 Subject: venndiagram (7jun18) git-svn-id: svn://tug.org/texlive/trunk@47952 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/latex/venndiagram/venndiagram.sty | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) (limited to 'Master/texmf-dist/tex/latex/venndiagram') diff --git a/Master/texmf-dist/tex/latex/venndiagram/venndiagram.sty b/Master/texmf-dist/tex/latex/venndiagram/venndiagram.sty index 9e4b39a460b..d26835e26a5 100644 --- a/Master/texmf-dist/tex/latex/venndiagram/venndiagram.sty +++ b/Master/texmf-dist/tex/latex/venndiagram/venndiagram.sty @@ -7,11 +7,11 @@ %% venndiagram.dtx (with options: `venndiagram.sty,package') %% %% venndiagram.dtx -%% Copyright 2016 Nicola Talbot +%% Copyright 2018 Nicola Talbot %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 -%% of this license of (at your option) any later version. +%% of this license or (at your option) any later version. %% The latest version of this license is in %% http://www.latex-project.org/lppl.txt %% and version 1.3 or later is part of all distributions of LaTeX @@ -39,7 +39,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{venndiagram}[2016/03/16 v1.1 (NLCT) Venn diagrams] +\ProvidesPackage{venndiagram}[2018/06/07 v1.2 (NLCT) Venn diagrams] \RequirePackage{xkeyval} \RequirePackage{tikz} \RequirePackage{etoolbox} @@ -98,6 +98,8 @@ \define@key{venn}{hgap}{\def\@venn@hgap{#1}} \define@key{venn}{vgap}{\def\@venn@vgap{#1}} \define@key{venn}{overlap}{\def\@venn@overlap{#1}} +\define@boolkey{venn}[venn]{showframe}[true]{} +\vennshowframetrue \define@key{venn}{tikzoptions}{\def\@venn@tikzoptions{#1}} \newcommand*{\@venn@computecircleintersects}[4]{% \ifdim#1=#3\relax @@ -367,7 +369,11 @@ (\@venn@w,0) coordinate (venn bottom right); }% {% - \draw (0,0) rectangle (\@venn@w,\@venn@h); + \ifvennshowframe + \draw (0,0) rectangle (\@venn@w,\@venn@h); + \else + \path (0,0) rectangle (\@venn@w,\@venn@h); + \fi \draw (\@venn@Ax,\@venn@Ay) circle (\@venn@radius); \draw (\@venn@Bx,\@venn@By) circle (\@venn@radius); \draw (\@venn@Cx,\@venn@Cy) circle (\@venn@radius); @@ -918,7 +924,11 @@ (\@venn@w,0) coordinate (venn bottom right); }% {% - \draw (venn bottom left) rectangle (\@venn@w,\@venn@h); + \ifvennshowframe + \draw (venn bottom left) rectangle (\@venn@w,\@venn@h); + \else + \path (venn bottom left) rectangle (\@venn@w,\@venn@h); + \fi \draw (\@venn@Ax,\@venn@Ay) circle (\@venn@radius); \draw (\@venn@Bx,\@venn@By) circle (\@venn@radius); \draw (\@venn@Ax,\@venn@Ay) node[above,left] (labelOnlyA) -- cgit v1.2.3