tikz-relay (7aug22)

git-svn-id: svn://tug.org/texlive/trunk@64069 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 59 insertions, 13 deletions

diff --git a/Master/texmf-dist/tex/latex/tikz-relay/tikzlibrarycircuits.ee.IEC.relay.code.tex b/Master/texmf-dist/tex/latex/tikz-relay/tikzlibrarycircuits.ee.IEC.relay.code.tex
index 4f78fb77acc..48cc227f27e 100644
--- a/Master/texmf-dist/tex/latex/tikz-relay/tikzlibrarycircuits.ee.IEC.relay.code.tex
+++ b/Master/texmf-dist/tex/latex/tikz-relay/tikzlibrarycircuits.ee.IEC.relay.code.tex
@@ -1,8 +1,8 @@
 %% This is file `tikzlibrarycircuits.ee.IEC.relay.code.tex'
-%% Version: 1.2
-%% Version date: 2018-06-13
+%% Version: 1.3
+%% Version date: 2022-08-07
 %% 
-%% Copyright (C) 2018 by Luis Paulo Laus, laus@utfpr.edu.br
+%% Copyright (C) 2018-2022 by Luis Paulo Laus, laus@utfpr.edu.br
 %%
 %% This package can be redistributed and/or modified under the terms
 %% of the LaTeX Project Public License distributed from CTAN
@@ -44,6 +44,10 @@
 %%                        turn switch, var remanent, thermal,
 %%                        unaffected by alternating current,
 %%                        mechanically resonant
+%% 1.3: 07 August 2022: new anchor for contacts (tip);
+%%                       new annotations: closing momentarily,
+%%                       early or late
+%% 
 %% 
 \usetikzlibrary{circuits.ee.IEC}
 \usepgflibrary{shapes.geometric}
@@ -104,7 +108,7 @@
       }%
       \pgf@marshal%
     \else%
-      % tricky... simpilfy to the origin...
+      % tricky... simplify to the origin...
       \pgf@xc=\pgf@x%
       \pgf@yc=\pgf@y%
       \pgf@process{\northeast}%
@@ -180,7 +184,7 @@
       \pgf@ya=-\pgf@y%
       \pgf@process{\pgfpointborderrectangle{\pgfqpoint{\pgf@xc}{\the\pgf@yc}}{\pgfqpoint{\pgf@xa}{\pgf@ya}}}%
     \else%
-      % tricky... simpilfy to the origin...
+      % tricky... simplify to the origin...
       \pgf@xc=\pgf@x%
       \pgf@yc=\pgf@y%
       \pgf@process{\northeast}%
@@ -225,9 +229,19 @@
       \pgf@y=0.5773503\pgf@ya%
     \fi
   }
+  \savedanchor\tippoint{%
+    \pgfmathsetlength\pgf@xa{\pgfkeysvalueof{/pgf/minimum width}}%
+    \ifcontact@activated
+      \pgf@x=0.8164663\pgf@xa \pgf@y=0pt
+    \else
+    \pgfmathsetlength\pgf@ya{\pgfkeysvalueof{/pgf/minimum height}}%
+      \pgf@x=0.6443375\pgf@xa  \pgf@y=1.321367\pgf@ya
+    \fi
+  }
 
   \anchor{center}{\pgfpointorigin}
   \anchor{mid}{\centerpoint}
+  \anchor{tip}{\tippoint}
   \inheritanchor[from=rectangle ee]{north}
   \inheritanchor[from=rectangle ee]{south}
   \inheritanchor[from=rectangle ee]{east}
@@ -246,7 +260,7 @@
 
   \anchorborder{%
     \ifdim\pgf@y<0pt%
-      % tricky... simpilfy to the origin...
+      % tricky... simplify to the origin...
       \pgf@xc=\pgf@x%
       \pgf@yc=\pgf@y%
       \pgf@process{\southwest}%
@@ -305,9 +319,19 @@
       \pgf@y=-0.333333\pgf@ya%
     \fi
   }
+  \savedanchor\tippoint{%
+    \pgfmathsetlength\pgf@xa{\pgfkeysvalueof{/pgf/minimum width}}%
+    \pgfmathsetlength\pgf@ya{\pgfkeysvalueof{/pgf/minimum height}}%
+    \ifcontact@activated
+      \pgf@x=0.515733\pgf@xa \pgf@y=-1.354311\pgf@ya
+    \else
+      \pgf@x=0.658114\pgf@xa \pgf@y=-0.772076\pgf@ya
+    \fi
+  }
 
   \anchor{center}{\pgfpointorigin}
   \anchor{mid}{\centerpoint}
+  \anchor{tip}{\tippoint}
   \inheritanchor[from=rectangle ee]{north}
   \inheritanchor[from=rectangle ee]{south}
   \inheritanchor[from=rectangle ee]{east}
@@ -333,7 +357,7 @@
       \pgf@ya=1.354311\pgf@y% maximum distance used to prevent jump
       \pgf@process{\pgfpointborderrectangle{\pgfqpoint{\pgf@xc}{\the\pgf@yc}}{\pgfqpoint{-\pgf@xa}{-\pgf@ya}}}%
     \else%
-      % tricky... simpilfy to the origin...
+      % tricky... simplify to the origin...
       \pgf@xc=\pgf@x%
       \pgf@yc=\pgf@y%
       \pgf@process{\southwest}%
@@ -385,9 +409,19 @@
       \pgf@y=0.333333\pgf@ya%
     \fi
   }
+  \savedanchor\tippoint{%
+    \pgfmathsetlength\pgf@xa{\pgfkeysvalueof{/pgf/minimum width}}%
+    \ifcontact@activated
+      \pgf@x=0.868517\pgf@xa \pgf@y=0pt
+    \else
+      \pgfmathsetlength\pgf@ya{\pgfkeysvalueof{/pgf/minimum height}}%
+      \pgf@x=0.638675\pgf@xa \pgf@y=0.759117\pgf@ya
+    \fi
+  }
 
   \anchor{center}{\pgfpointorigin}
   \anchor{mid}{\centerpoint}
+  \anchor{tip}{\tippoint}
   \inheritanchor[from=rectangle ee]{north}
   \inheritanchor[from=rectangle ee]{south}
   \inheritanchor[from=rectangle ee]{east}
@@ -409,11 +443,11 @@
     \pgf@process{\southwest}%
     \pgf@x=\pgf@xa%
   }
-  \anchor{output 1}{\northeast}% the thrird, normaly closed, terminal
+  \anchor{output 1}{\northeast}% the third, normally closed, terminal
 
   \anchorborder{%
     \ifdim\pgf@y<0pt%
-      % tricky... simpilfy to the origin...
+      % tricky... simplify to the origin...
       \pgf@xc=\pgf@x%
       \pgf@yc=\pgf@y%
       \pgf@process{\southwest}%
@@ -637,7 +671,7 @@
   circuit declare annotation={thermal switch}{2.6559833\tikzcircuitssizeunit}
   {
     [transform shape]
-    [annotation arrow,-]
+    [-]
     (\tikzlastnode.mid) edge[circuit symbol lines/.try,to path={--++(0,1.4\tikzcircuitssizeunit)--++(\tikzcircuitssizeunit,0)--++(0,\tikzcircuitssizeunit)--++(-\tikzcircuitssizeunit,0)--++(0,\tikzcircuitssizeunit)}] ()
   },
   % 0.5773503+2.6+0.4-1.321367
@@ -736,11 +770,23 @@
     [-]
     edge[circuit symbol wires/.try,to path={let \p1=(\tikzlastnode.mid), \p2=($(\tikzlastnode.mid) - (\tikzlastnode.input)$), \n2 = {veclen(\x2,\y2)}, \p2= ($0.5*\tikzcircuitssizeunit/\n2*(\p2)$) in ($(\p1)+(\p2)$) -- ++(-\y2,\x2) -- ($(\p1)-(\p2)$)}] ()
   },
+  circuit declare annotation={early or late}{0pt}
+  {
+    [transform shape]
+    [-]
+    edge[cap=round,circuit symbol wires/.try,to path={let \p1=(\tikzlastnode.tip), \p2=($(\tikzlastnode.tip) - (\tikzlastnode.input)$), \n2 = {veclen(\x2,\y2)}, \p2= ($0.5\tikzcircuitssizeunit/\n2*(\p2)$) in (\p1) -- ++(\y2,-\x2)}] ()
+  },
+  circuit declare annotation={closing momentarily}{0pt}
+  {
+    [transform shape]
+    [-]
+    (\tikzlastnode.output) edge[cap=round,circuit symbol lines/.try,to path={-- ++(0.5\tikzcircuitssizeunit,0.3333333\tikzcircuitssizeunit)}] ()
+  },
   circuit declare annotation={circuit breaker}{0pt}
   {
     [transform shape]
     [-]
-    (\tikzlastnode.south west) edge[circuit symbol lines/.try,to path={++(2.4\tikzcircuitssizeunit,0.4\tikzcircuitssizeunit) -- ++(-0.8\tikzcircuitssizeunit,-0.8\tikzcircuitssizeunit) ++(0.8\tikzcircuitssizeunit,0) -- ++(-0.8\tikzcircuitssizeunit,0.8\tikzcircuitssizeunit)}] ()
+    (\tikzlastnode.output) edge[circuit symbol lines/.try,to path={++(0.4\tikzcircuitssizeunit,0.4\tikzcircuitssizeunit) -- ++(-0.8\tikzcircuitssizeunit,-0.8\tikzcircuitssizeunit) ++(0.8\tikzcircuitssizeunit,0) -- ++(-0.8\tikzcircuitssizeunit,0.8\tikzcircuitssizeunit)}] ()
   },
   circuit declare annotation={static switch}{0pt}
   {
@@ -863,7 +909,7 @@
     (\tikzlastnode.south) edge[circuit symbol lines/.try,every relay coil/.try,to path={++(0,.5\pgflinewidth) --++(0,-.6\tikzcircuitssizeunit) ++(0,-.4\tikzcircuitssizeunit) --++(0,-\tikzcircuitssizeunit) ++(0,-.4\tikzcircuitssizeunit)  --++(0,-\tikzcircuitssizeunit)
     (\tikzlastnode.south) ++(0,-1.5\tikzcircuitssizeunit+.5\pgflinewidth) arc [start angle=200, end angle=340, radius=0.5\tikzcircuitssizeunit]
     (\tikzlastnode.south) ++(0,-1.5\tikzcircuitssizeunit+.5\pgflinewidth) arc [start angle=20, end angle=160, radius=0.5\tikzcircuitssizeunit]}] ()
-  },
+  }
 }
 
 \tikzset{
@@ -1017,7 +1063,7 @@
     % modifications
     set resistor graphic                        = resistor IEC relay graphic,
     set bulb graphic                            = bulb IEC relay graphic,
-    % aditions
+    % additions
     set fuse graphic                            = fuse IEC relay graphic,
     set horn graphic                            = horn IEC relay graphic,
     set buzzer graphic                          = buzzer IEC relay graphic,