From fe9161926cc6d454312c3f3e8ab3730a12e5e0fc Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 13 Aug 2014 22:20:16 +0000 Subject: reotex (13aug14) git-svn-id: svn://tug.org/texlive/trunk@34924 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/reotex/README | 12 +++- Master/texmf-dist/doc/latex/reotex/reotex.pdf | Bin 127644 -> 194864 bytes Master/texmf-dist/tex/latex/reotex/reotex.sty | 86 +++++++++++++++----------- 3 files changed, 60 insertions(+), 38 deletions(-) diff --git a/Master/texmf-dist/doc/latex/reotex/README b/Master/texmf-dist/doc/latex/reotex/README index 000a5eedb5d..cf952ec7022 100644 --- a/Master/texmf-dist/doc/latex/reotex/README +++ b/Master/texmf-dist/doc/latex/reotex/README @@ -11,7 +11,7 @@ Description: This package provides a set of macros to create reo channels and circuits. -Iis an extension of the PGF/Tikz package, thoroughly documented +It is an extension of the PGF/Tikz package, thoroughly documented in the manual ``Tikz \& PGF Manual for Version~2.10''. For a good usage of this package, LaTeX2e version is required. @@ -22,3 +22,13 @@ You need to have an installation of the following packages: - ifthen; - tikz (with arrows, decorations.pathmorphing, decorations.shapes, calc); - verbatim; + + + +VERSION HISTORY + +2014/08/13 - version 1.1 +- arrow tips used in drain/spout were corrected. The update to tikz3.0 caused a problem concerning the size of such arrows. + +2012/01/05 - version 1.0 +- first published at CTAN. \ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/reotex/reotex.pdf b/Master/texmf-dist/doc/latex/reotex/reotex.pdf index 0a5a2943e5d..f0a59c100a6 100644 Binary files a/Master/texmf-dist/doc/latex/reotex/reotex.pdf and b/Master/texmf-dist/doc/latex/reotex/reotex.pdf differ diff --git a/Master/texmf-dist/tex/latex/reotex/reotex.sty b/Master/texmf-dist/tex/latex/reotex/reotex.sty index f8ebfa1ad75..b46206943b7 100644 --- a/Master/texmf-dist/tex/latex/reotex/reotex.sty +++ b/Master/texmf-dist/tex/latex/reotex/reotex.sty @@ -13,7 +13,14 @@ \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reotex}[2012/01/05 A Tex way to draw reo circuits!] +\ProvidesPackage{reotex}[2014/08/13 A Tex way to draw reo circuits!] + +%releases: +%2014/08/13 - version 1.1 +%WHAT HAS CHANGED: +% - arrow tips used in drain/spout were corrected. The update to tikz3.0 caused a problem concerning the size of such arrows. + +%2012/01/05 - version 1, first published at CTAN. \RequirePackage{ifthen} \RequirePackage{tikz} @@ -29,7 +36,7 @@ %%%%%% VARIABLES %%%%%%%%%%% -\newdimen\rt@arrowsize +\newdimen\rt@thearrowsize \newdimen\rt@width \newdimen\rt@xa \newdimen\rt@xb @@ -277,25 +284,6 @@ } -%\newcommand{\asyncdrain@noarrow}[3]{% - -%\coordinate (rt@p1) at ($#1!.47!#2$); -%\coordinate (rt@p2) at ($(rt@p1)!6pt!90:#1$); -%\coordinate (rt@p3) at ($(rt@p1)!6pt!-90:#1$); - -%\coordinate (rt@p4) at ($#1!.53!#2$); -%\coordinate (rt@p5) at ($(rt@p4)!6pt!90:#1$); -%\coordinate (rt@p6) at ($(rt@p4)!6pt!-90:#1$); - -%\draw[inwards-inwards, thin] -% #1 to #3 #2; -%\draw[thin] (rt@p1) -- (rt@p2); -%\draw[thin] (rt@p1) -- (rt@p3); -%\draw[thin] (rt@p4) -- (rt@p5); -%\draw[thin] (rt@p4) -- (rt@p6); -%} - - %AsyncSpout @@ -846,17 +834,17 @@ %outwards \pgfarrowsdeclare{outwards}{outwards} { - \rt@arrowsize=0.2pt - \advance\rt@arrowsize by .5\pgflinewidth + \rt@thearrowsize=1.4pt + \advance\rt@thearrowsize by .5\pgflinewidth \pgfarrowsleftextend{-.5\pgflinewidth} - \pgfarrowsrightextend{3\rt@arrowsize+.5\pgflinewidth} + \pgfarrowsrightextend{3\rt@thearrowsize+.5\pgflinewidth} } { - \advance\rt@arrowsize by .5\pgflinewidth - \pgfpathmoveto{\pgfpoint{-45\rt@arrowsize}{12\rt@arrowsize}} - \pgfpathlineto{\pgfpoint{-45\rt@arrowsize}{-12\rt@arrowsize}} - \pgfpathlineto{\pgfpoint{-20\rt@arrowsize}{0pt}} - \pgfpathlineto{\pgfpoint{-45\rt@arrowsize}{12\rt@arrowsize}} + \advance\rt@thearrowsize by .5\pgflinewidth + \pgfpathmoveto{\pgfpoint{-4.5\rt@thearrowsize}{1.2\rt@thearrowsize}} + \pgfpathlineto{\pgfpoint{-4.5\rt@thearrowsize}{-1.2\rt@thearrowsize}} + \pgfpathlineto{\pgfpoint{-2.0\rt@thearrowsize}{0pt}} + \pgfpathlineto{\pgfpoint{-4.5\rt@thearrowsize}{1.2\rt@thearrowsize}} \pgfusepathqfill } @@ -870,17 +858,17 @@ %inwards \pgfarrowsdeclare{inwards}{inwards} { - \rt@arrowsize=0.2pt - \advance\rt@arrowsize by .5\pgflinewidth + \rt@thearrowsize=1.4pt + \advance\rt@thearrowsize by .5\pgflinewidth \pgfarrowsleftextend{-.5\pgflinewidth} - \pgfarrowsrightextend{3\rt@arrowsize+.5\pgflinewidth} + \pgfarrowsrightextend{3\rt@thearrowsize+.5\pgflinewidth} } { - \advance\rt@arrowsize by .5\pgflinewidth - \pgfpathmoveto{\pgfpoint{-20\rt@arrowsize}{12\rt@arrowsize}} - \pgfpathlineto{\pgfpoint{-20\rt@arrowsize}{-12\rt@arrowsize}} - \pgfpathlineto{\pgfpoint{-45\rt@arrowsize}{0pt}} - \pgfpathlineto{\pgfpoint{-20\rt@arrowsize}{12\rt@arrowsize}} + \advance\rt@thearrowsize by .5\pgflinewidth + \pgfpathmoveto{\pgfpoint{-2\rt@thearrowsize}{1.2\rt@thearrowsize}} + \pgfpathlineto{\pgfpoint{-2\rt@thearrowsize}{-1.2\rt@thearrowsize}} + \pgfpathlineto{\pgfpoint{-4.5\rt@thearrowsize}{0pt}} + \pgfpathlineto{\pgfpoint{-2\rt@thearrowsize}{1.2\rt@thearrowsize}} \pgfusepathqfill } @@ -909,6 +897,17 @@ } +\newcommand{\reader}[3]{% + \node[outer sep=0mm] #1 at #2 {} ; + \draw[fill=white, minimum size=3pt] ($#2 + (-0.15,0.15)$) rectangle ($ #2 + (0.15,-0.15) $) #3 ; +} + +\newcommand{\writer}[3]{% + \node[outer sep=0mm] #1 at #2 {} ; + \draw[fill=black, minimum size=3pt] ($#2 + (-0.15,0.15)$) rectangle ($ #2 + (0.15,-0.15) $) #3 ; +} + + \newcommand{\xrouter}[3]{% \node[outer sep=0.35mm] #1 at #2 {} ; @@ -932,6 +931,19 @@ } + + +%% added on: 2012/07/27 %% + +%%%%%%%%%%% COMPONENTS (BLACK BOXES)%%%%% +% arg1: corner 1 +% arg2: corner 2 +% arg3: text node +\newcommand{\component}[3]{% + \draw[rounded corners=1ex] #1 rectangle #2 #3; +} + + \makeatother -- cgit v1.2.3