diff options
author | Karl Berry <karl@freefriends.org> | 2018-06-07 21:22:36 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2018-06-07 21:22:36 +0000 |
commit | 81bbb4ab6438b469e7203dff1897e07f3605bef4 (patch) | |
tree | 942bb47d6cb3c1a066479001b7294579fbe60080 | |
parent | b8781ffe3cc542dd43f26fb4d70eb78dce77a05e (diff) |
venndiagram (7jun18)
git-svn-id: svn://tug.org/texlive/trunk@47952 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r-- | Master/texmf-dist/doc/latex/venndiagram/CHANGES | 4 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/venndiagram/INSTALL | 64 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/venndiagram/README | 4 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/venndiagram/samples/venn-sample.pdf | bin | 36551 -> 37093 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/venndiagram/samples/venn-sample.tex | 7 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/venndiagram/venndiagram.pdf | bin | 302189 -> 303316 bytes | |||
-rw-r--r-- | Master/texmf-dist/source/latex/venndiagram/venndiagram.dtx | 42 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/venndiagram/venndiagram.ins | 6 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/venndiagram/venndiagram.sty | 20 |
9 files changed, 63 insertions, 84 deletions
diff --git a/Master/texmf-dist/doc/latex/venndiagram/CHANGES b/Master/texmf-dist/doc/latex/venndiagram/CHANGES index 676c7b40cbd..ca455745b8f 100644 --- a/Master/texmf-dist/doc/latex/venndiagram/CHANGES +++ b/Master/texmf-dist/doc/latex/venndiagram/CHANGES @@ -1,3 +1,7 @@ +v1.2 (2018-06-07): + + * Added boolean option showframe + v1.1 (2016-03-15): * Fixed issue with pgf 3.0 change in syntax for atan2 diff --git a/Master/texmf-dist/doc/latex/venndiagram/INSTALL b/Master/texmf-dist/doc/latex/venndiagram/INSTALL deleted file mode 100644 index fcc7305bcb1..00000000000 --- a/Master/texmf-dist/doc/latex/venndiagram/INSTALL +++ /dev/null @@ -1,64 +0,0 @@ -INSTALLATION - -If you have downloaded the venndiagram package using the TeX -Directory Structure (TDS), that is you have downloaded the archive -venndiagram.tds.zip containing doc, tex, scripts and source -directories, you need to follow the "Installing from TDS" -instructions below. - -If you have downloaded the following files: - -venndiagram.dtx -venndiagram.ins - -You need to follow the "Installing from DTX and INS" instructions -below. - -For further information on installing LaTeX packages see: - -http://www.tex.ac.uk/cgi-bin/texfaq2html?label=installthings - -INSTALLING FROM TDS -=================== - -Files in tex and doc directories should go in the corresponding -TEXMF directories (for example, /usr/share/texmf-local/ or -C:\localtexmf\). - -*Remember to refresh TeX's database* - -Example (on UNIX like systems): - -unzip venndiagram.tds.zip -d ~/texmf/ -texhash ~/texmf/ - -INSTALLING FROM DTX AND INS -=========================== - -Run LaTeX on venndiagram.ins to generate the package style file: - -latex venndiagram.ins - -To create the package documentation (venndiagram.pdf): - -pdflatex venndiagram.dtx -makeindex -s gind.ist venndiagram.idx -pdflatex venndiagram.dtx -pdflatex venndiagram.dtx - -If TEXMF denotes the base directory of your local TeX installation (e.g. -/usr/share/texmf-local/ or C:\localtexmf\) then create the following -directories (if they don't already exist): - -TEXMF/doc/latex/venndiagram -TEXMF/doc/latex/venndiagram/samples -TEXMF/tex/latex/venndiagram - -Move the sample file (*.tex) to TEXMF/doc/latex/venndiagram/sample/ - -Move the documentation (*.pdf) to TEXMF/doc/latex/venndiagram/ - -Move style file (*.sty) to TEXMF/tex/latex/venndiagram/ - -*Remember to refresh TeX's database* - diff --git a/Master/texmf-dist/doc/latex/venndiagram/README b/Master/texmf-dist/doc/latex/venndiagram/README index 433a5b7861a..ba9ac5b8456 100644 --- a/Master/texmf-dist/doc/latex/venndiagram/README +++ b/Master/texmf-dist/doc/latex/venndiagram/README @@ -1,6 +1,6 @@ -LaTeX Bundle : venndiagram v1.1 +LaTeX Bundle : venndiagram v1.2 -Last Modified : 2016-03-16 +Last Modified : 2018-06-07 Author : Nicola Talbot diff --git a/Master/texmf-dist/doc/latex/venndiagram/samples/venn-sample.pdf b/Master/texmf-dist/doc/latex/venndiagram/samples/venn-sample.pdf Binary files differindex bd1a2408745..92f29db7fa9 100644 --- a/Master/texmf-dist/doc/latex/venndiagram/samples/venn-sample.pdf +++ b/Master/texmf-dist/doc/latex/venndiagram/samples/venn-sample.pdf diff --git a/Master/texmf-dist/doc/latex/venndiagram/samples/venn-sample.tex b/Master/texmf-dist/doc/latex/venndiagram/samples/venn-sample.tex index cfaa3a39aaa..344525c8e4b 100644 --- a/Master/texmf-dist/doc/latex/venndiagram/samples/venn-sample.tex +++ b/Master/texmf-dist/doc/latex/venndiagram/samples/venn-sample.tex @@ -17,6 +17,13 @@ $ \mathcal{B} \setminus \mathcal{A} $ \fillOnlyB \end{venndiagram2sets} +No frame: + +\begin{venndiagram2sets}[showframe=false] +\fillOnlyB +\end{venndiagram2sets} + + Using the labels: \begin{venndiagram3sets}[labelOnlyA={1},labelOnlyB={2},labelOnlyC={3}, diff --git a/Master/texmf-dist/doc/latex/venndiagram/venndiagram.pdf b/Master/texmf-dist/doc/latex/venndiagram/venndiagram.pdf Binary files differindex b0d38eddd92..d531646fb9a 100644 --- a/Master/texmf-dist/doc/latex/venndiagram/venndiagram.pdf +++ b/Master/texmf-dist/doc/latex/venndiagram/venndiagram.pdf 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 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) |