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 --- .../source/latex/venndiagram/venndiagram.dtx | 42 ++++++++++++++++------ .../source/latex/venndiagram/venndiagram.ins | 6 ++-- 2 files changed, 35 insertions(+), 13 deletions(-) (limited to 'Master/texmf-dist/source/latex/venndiagram') diff --git a/Master/texmf-dist/source/latex/venndiagram/venndiagram.dtx b/Master/texmf-dist/source/latex/venndiagram/venndiagram.dtx index 8ca85092e80..ff7607cd286 100644 --- a/Master/texmf-dist/source/latex/venndiagram/venndiagram.dtx +++ b/Master/texmf-dist/source/latex/venndiagram/venndiagram.dtx @@ -1,11 +1,11 @@ %\iffalse -% venndiagram.dtx generated using makedtx version 1.1 (c) Nicola Talbot +% venndiagram.dtx generated using makedtx version 1.2 (c) Nicola Talbot % Command line args: +% -doc "venndiagram-manual.tex" % -author "Nicola Talbot" % -src "venndiagram.sty\Z=>venndiagram.sty" -% -doc "venndiagram-manual.tex" % venndiagram -% Created on 2016/3/16 22:06 +% Created on 2018/6/7 15:50 %\fi %\iffalse %<*package> @@ -28,7 +28,7 @@ %\fi % \iffalse % Doc-Source file to use with LaTeX2e -% Copyright (C) 2016 Nicola Talbot, all rights reserved. +% Copyright (C) 2018 Nicola Talbot, all rights reserved. % \fi % \iffalse %<*driver> @@ -52,7 +52,7 @@ \doxitem{KeyValOption}{keyvaloption}{options} -\CheckSum{2598} +\CheckSum{2612} \begin{document} \DocInput{venndiagram.dtx} @@ -62,11 +62,11 @@ % %\MakeShortVerb{"} % -%\title{venndiagram v1.1: +%\title{venndiagram v1.2: %Drawing Simple Venn Diagrams} %\author{Nicola L. C. Talbot\\\url{http://www.dickimaw-books.com/}} % -%\date{2016-03-16} +%\date{2018-06-07} %\maketitle % %The \styfmt{venndiagram} package is provided to assist generating @@ -158,6 +158,12 @@ % %\item[overlap] The overlap between the sets. (Default: 0.75cm.) % +%\item[showframe] This is a boolean option (default: \texttt{true}). +%If \texttt{true}, the surrounding rectangular frame is drawn. If +%\texttt{false}, the frame isn't drawn but still contributes to the +%total image size as a hidden path. If the value is omitted +%\texttt{true} is assumed. +% %\item[tikzoptions] Any options to pass to \env{tikzpicture}. % %\end{description} @@ -439,7 +445,7 @@ % Package identification: % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{venndiagram}[2016/03/16 v1.1 (NLCT) Venn diagrams] +\ProvidesPackage{venndiagram}[2018/06/07 v1.2 (NLCT) Venn diagrams] % \end{macrocode} % Required packages: % \begin{macrocode} @@ -779,6 +785,14 @@ \define@key{venn}{overlap}{\def\@venn@overlap{#1}} % \end{macrocode} %\end{keyvaloption} +%\begin{keyvaloption}{showframe} +% Draw the frame outline. +%\changes{1.2}{2018-06-07}{added showframe option} +% \begin{macrocode} +\define@boolkey{venn}[venn]{showframe}[true]{} +\vennshowframetrue +% \end{macrocode} +%\end{keyvaloption} % % Finally the option to set the information to pass to the % \env{tikzpicture} environment. @@ -1372,7 +1386,11 @@ % \end{macrocode} % Draw outlines % \begin{macrocode} - \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); @@ -2213,7 +2231,11 @@ % \end{macrocode} % Draw outlines % \begin{macrocode} - \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); % \end{macrocode} diff --git a/Master/texmf-dist/source/latex/venndiagram/venndiagram.ins b/Master/texmf-dist/source/latex/venndiagram/venndiagram.ins index 4fcf10c682e..0a21ed9c21e 100644 --- a/Master/texmf-dist/source/latex/venndiagram/venndiagram.ins +++ b/Master/texmf-dist/source/latex/venndiagram/venndiagram.ins @@ -1,14 +1,14 @@ -% venndiagram.ins generated using makedtx version 1.1 2016/3/16 22:06 +% venndiagram.ins generated using makedtx version 1.2 2018/6/7 15:50 \input docstrip \preamble 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 -- cgit v1.2.3