summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/circuits
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-01-05 22:40:38 +0000
committerKarl Berry <karl@freefriends.org>2019-01-05 22:40:38 +0000
commit22536bb2b5257046d271b1eaa11b4a275d5ec041 (patch)
tree2500eaf5c26b11e00ebd33a64fccfa332cd5a66c /Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/circuits
parentcf794f0e2db6857972a9d48d4466a4f03a7057a0 (diff)
pgf (5jan19)
git-svn-id: svn://tug.org/texlive/trunk@49607 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/circuits')
-rw-r--r--Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/circuits/tikzlibrarycircuits.code.tex53
-rw-r--r--Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/circuits/tikzlibrarycircuits.ee.IEC.code.tex117
-rw-r--r--Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/circuits/tikzlibrarycircuits.ee.code.tex17
-rw-r--r--Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/circuits/tikzlibrarycircuits.logic.CDH.code.tex7
-rw-r--r--Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/circuits/tikzlibrarycircuits.logic.IEC.code.tex11
-rw-r--r--Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/circuits/tikzlibrarycircuits.logic.US.code.tex11
-rw-r--r--Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/circuits/tikzlibrarycircuits.logic.code.tex7
7 files changed, 107 insertions, 116 deletions
diff --git a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/circuits/tikzlibrarycircuits.code.tex b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/circuits/tikzlibrarycircuits.code.tex
index e8aeabd2468..56a5340f99e 100644
--- a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/circuits/tikzlibrarycircuits.code.tex
+++ b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/circuits/tikzlibrarycircuits.code.tex
@@ -7,7 +7,7 @@
%
% See the file doc/generic/pgf/licenses/LICENSE for more details.
-\usetikzlibrary{decorations.markings,calc}
+\usetikzlibrary{calc,decorations.markings}%
%
@@ -23,7 +23,7 @@
\def\tikz@lib@circ@end{-- (\tikztotarget) \tikztonodes}
}
}
-}
+}%
\newif\iftikz@lib@circ@on@to
@@ -75,10 +75,10 @@
\pgfkeysalso{#1}
\fi
}
-}
+}%
\newcount\tikz@lib@circ@count
-\def\tikz@zero@text{0.0}
-\def\tikz@one@text{1.0}
+\def\tikz@zero@text{0.0}%
+\def\tikz@one@text{1.0}%
\def\tikz@lib@circ@compute@direction#1{%
\tikz@scan@one@point\tikz@lib@circ@save@start(\tikztostart)%
@@ -86,9 +86,9 @@
\pgf@process{\pgfpointnormalised{\pgfpointdiff{\tikz@lib@circ@start}{\tikz@lib@circ@target}}}%
\pgf@ya=-\pgf@y%
\pgftransformcm{\the\pgf@x}{\the\pgf@y}{\the\pgf@ya}{\the\pgf@x}{#1}%
-}
-\def\tikz@lib@circ@save@start#1{\def\tikz@lib@circ@start{#1}}
-\def\tikz@lib@circ@save@target#1{\def\tikz@lib@circ@target{#1}}
+}%
+\def\tikz@lib@circ@save@start#1{\def\tikz@lib@circ@start{#1}}%
+\def\tikz@lib@circ@save@target#1{\def\tikz@lib@circ@target{#1}}%
\tikzset{
circuits/pos grabber/.is family,
@@ -100,7 +100,7 @@
near end/.belongs to family=/tikz/circuits/pos grabber,
very near end/.belongs to family=/tikz/circuits/pos grabber,
at end/.belongs to family=/tikz/circuits/pos grabber
-}
+}%
%
@@ -126,7 +126,7 @@
% node look like the symbol. For instance, for a resistor that is
% rendered as a rectangle, this keys can be set, basically, to
% "rectangle,draw". Set this key to use a different appearance for
- % symbols of kind #1.
+ % symbols of kind #1.
%
% every #1
% This style will be included with every symbols of this kind and
@@ -154,7 +154,7 @@
medium circuit symbols/.style={circuit symbol unit=7pt},
small circuit symbols/.style={circuit symbol unit=6pt},
tiny circuit symbols/.style={circuit symbol unit=5pt},
-}
+}%
\newdimen\tikzcircuitssizeunit
\tikzcircuitssizeunit=7pt
@@ -199,7 +199,7 @@
/utils/exec={\pgfsetarrowoptions{direction ee}{.4*\the\tikzcircuitssizeunit+.3*\the\pgflinewidth}},
>=direction ee
}
-}
+}%
@@ -211,7 +211,7 @@
point down/.style={rotate=-90},
point left/.style={rotate=180},
point right/.style={}
-}
+}%
@@ -225,7 +225,7 @@
circuit symbol filled/.style={draw,fill=black},
circuit symbol lines/.style={draw},
circuit symbol wires/.style={draw},
-}
+}%
@@ -242,28 +242,25 @@
info' sloped/.code={\pgfutil@ifnextchar[\tikz@lib@circ@lab@slopedp@plain{\tikz@lib@circ@lab@slopedp@plain[]}#1\pgf@stop},%}
circuit declare unit/.style 2 args={
%
- % Defines four styles that can be used to add labels to a node.
+ % Defines four styles that can be used to add labels to a node.
%
#1/.code={\pgfutil@ifnextchar[\tikz@lib@circ@lab{\tikz@lib@circ@lab[]}##1\pgf@stop{#2}{#1}},%}
#1 sloped/.code={\pgfutil@ifnextchar[\tikz@lib@circ@lab@sloped{\tikz@lib@circ@lab@sloped[]}##1\pgf@stop{#2}{#1}},%}
- #1'/.code={\pgfutil@ifnextchar[\tikz@lib@circ@labp{\tikz@lib@circ@labp[]}##1\pgf@stop{#2}{#1}},%}
+ #1'/.code={\pgfutil@ifnextchar[\tikz@lib@circ@labp{\tikz@lib@circ@labp[]}##1\pgf@stop{#2}{#1}},%}
#1' sloped/.code={\pgfutil@ifnextchar[\tikz@lib@circ@lab@slopedp{\tikz@lib@circ@lab@slopedp[]}##1\pgf@stop{#2}{#1}}%}
}
-}
+}%
-\def\tikz@lib@circ@lab[#1]#2\pgf@stop#3#4{\tikzset{label={[every info/.try,every #4/.try,#1]$\mathrm{#2#3}$}}}
-\def\tikz@lib@circ@lab@sloped[#1]#2\pgf@stop#3#4{\tikzset{label={[every info/.try,every #4/.try,transform shape,#1]$\mathrm{#2#3}$}}}
-\def\tikz@lib@circ@labp[#1]#2\pgf@stop#3#4{\tikzset{label={[label position=below,every info/.try,every #4/.try,#1]$\mathrm{#2#3}$}}}
-\def\tikz@lib@circ@lab@slopedp[#1]#2\pgf@stop#3#4{\tikzset{label={[label
-position=below,every info/.try,every #4/.try,transform shape,#1]$\mathrm{#2#3}$}}}
+\def\tikz@lib@circ@lab[#1]#2\pgf@stop#3#4{\tikzset{label={[every info/.try,every #4/.try,#1]$\mathrm{#2#3}$}}}%
+\def\tikz@lib@circ@lab@sloped[#1]#2\pgf@stop#3#4{\tikzset{label={[every info/.try,every #4/.try,transform shape,#1]$\mathrm{#2#3}$}}}%
+\def\tikz@lib@circ@labp[#1]#2\pgf@stop#3#4{\tikzset{label={[label position=below,every info/.try,every #4/.try,#1]$\mathrm{#2#3}$}}}%
+\def\tikz@lib@circ@lab@slopedp[#1]#2\pgf@stop#3#4{\tikzset{label={[label position=below,every info/.try,every #4/.try,transform shape,#1]$\mathrm{#2#3}$}}}%
-\def\tikz@lib@circ@lab@plain[#1]#2\pgf@stop{\tikzset{label={[every info/.try,#1]#2}}}
-\def\tikz@lib@circ@lab@sloped@plain[#1]#2\pgf@stop{\tikzset{label={[every info/.try,transform shape,#1]#2}}}
-\def\tikz@lib@circ@labp@plain[#1]#2\pgf@stop{\tikzset{label={[label position=below,every info/.try,#1]#2}}}
-\def\tikz@lib@circ@lab@slopedp@plain[#1]#2\pgf@stop{\tikzset{label={[label
-position=below,every info/.try,transform shape,#1]#2}}}
+\def\tikz@lib@circ@lab@plain[#1]#2\pgf@stop{\tikzset{label={[every info/.try,#1]#2}}}%
+\def\tikz@lib@circ@lab@sloped@plain[#1]#2\pgf@stop{\tikzset{label={[every info/.try,transform shape,#1]#2}}}%
+\def\tikz@lib@circ@labp@plain[#1]#2\pgf@stop{\tikzset{label={[label position=below,every info/.try,#1]#2}}}%
+\def\tikz@lib@circ@lab@slopedp@plain[#1]#2\pgf@stop{\tikzset{label={[label position=below,every info/.try,transform shape,#1]#2}}}%
\endinput
-
diff --git a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/circuits/tikzlibrarycircuits.ee.IEC.code.tex b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/circuits/tikzlibrarycircuits.ee.IEC.code.tex
index 1de9232e63c..75457107643 100644
--- a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/circuits/tikzlibrarycircuits.ee.IEC.code.tex
+++ b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/circuits/tikzlibrarycircuits.ee.IEC.code.tex
@@ -7,10 +7,10 @@
%
% See the file doc/generic/pgf/licenses/LICENSE for more details.
-\usetikzlibrary{circuits.ee}
-\usetikzlibrary{arrows}
+\usetikzlibrary{arrows}%
+\usetikzlibrary{circuits.ee}%
-\usepgflibrary{shapes.gates.ee.IEC}
+\usepgflibrary{shapes.gates.ee.IEC}%
%
@@ -38,8 +38,8 @@
set current source graphic = current source IEC graphic,
set make contact graphic = make contact IEC graphic,
set break contact graphic = break contact IEC graphic,
- }
-}
+ },
+}%
%
@@ -51,7 +51,7 @@
circuit symbol open,
circuit symbol size=width 4 height 1,
shape=rectangle ee,
- transform shape
+ transform shape,
},
var resistor IEC graphic/.style={
circuit symbol lines,
@@ -59,9 +59,9 @@
shape=var resistor IEC,
transform shape,
outer sep=0pt,
- cap=round
- }
-}
+ cap=round,
+ },
+}%
@@ -76,15 +76,15 @@
transform shape,
shape=inductor IEC,
outer sep=0pt,
- cap=round
+ cap=round,
},
var inductor IEC graphic/.style={
circuit symbol filled,
circuit symbol size=width 4 height 1,
transform shape,
- shape=rectangle ee
- }
-}
+ shape=rectangle ee,
+ },
+}%
@@ -97,9 +97,9 @@
circuit symbol lines,
circuit symbol size=width .5 height 2,
transform shape,
- shape=capacitor IEC
- }
-}
+ shape=capacitor IEC,
+ },
+}%
@@ -112,9 +112,9 @@
circuit symbol lines,
circuit symbol size=width .75 height 2,
transform shape,
- shape=ground IEC
- }
-}
+ shape=ground IEC,
+ },
+}%
@@ -129,9 +129,9 @@
circuit symbol size=width .5 height 2.5,
transform shape,
shape=battery IEC,
- transform shape
- }
-}
+ transform shape,
+ },
+}%
@@ -156,9 +156,9 @@
},
var diode IEC graphic/.style={
diode IEC graphic,
- circuit symbol filled
- }
-}
+ circuit symbol filled,
+ },
+}%
\tikzset{
%
@@ -175,9 +175,9 @@
},
var Zener diode IEC graphic/.style={
Zener diode IEC graphic,
- circuit symbol filled
- }
-}
+ circuit symbol filled,
+ },
+}%
\tikzset{
%
@@ -197,9 +197,9 @@
},
var Schottky diode IEC graphic/.style={
Schottky diode IEC graphic,
- circuit symbol filled
- }
-}
+ circuit symbol filled,
+ },
+}%
\tikzset{
%
@@ -217,12 +217,12 @@
},
var tunnel diode IEC graphic/.style={
tunnel diode IEC graphic,
- circuit symbol filled
- }
-}
+ circuit symbol filled,
+ },
+}%
\tikzset{
- %
+ %
% backward diode
%
backward diode IEC graphic/.style={
@@ -239,9 +239,9 @@
},
var backward diode IEC graphic/.style={
backward diode IEC graphic,
- circuit symbol filled
- }
-}
+ circuit symbol filled,
+ },
+}%
\tikzset{
@@ -256,9 +256,9 @@
},
var breakdown diode IEC graphic/.style={
breakdown diode IEC graphic,
- circuit symbol filled
- }
-}
+ circuit symbol filled,
+ },
+}%
@@ -271,15 +271,15 @@
circuit symbol filled,
circuit symbol size=width .5 height .5,
shape=circle ee,
- outer sep=.25\pgflinewidth
+ outer sep=.25\pgflinewidth,
},
% connection IEC graphic/.style={
% circuit symbol open,
% circuit symbol size=width 1 height 1,
% shape=circle ee,
-% outer sep=.25\pgflinewidth
-% }
-}
+% outer sep=.25\pgflinewidth,
+% },
+}%
%
@@ -298,9 +298,9 @@
\pgfpathlineto{\pgfpointpolar{135}{1pt}}
\pgfusepathqstroke
},
- transform shape
- }
-}
+ transform shape,
+ },
+}%
%
@@ -317,7 +317,7 @@
\pgfpathlineto{\pgfqpoint{0pt}{1pt}}
\pgfusepathqstroke
},
- transform shape
+ transform shape,
},
voltage source IEC graphic/.style={
circuit symbol lines,
@@ -328,9 +328,9 @@
\pgfpathlineto{\pgfqpoint{1pt}{0pt}}
\pgfusepathqstroke
},
- transform shape
- }
-}
+ transform shape,
+ },
+}%
@@ -345,7 +345,7 @@
transform shape,
shape=make contact IEC,
outer sep=0pt,
- cap=round
+ cap=round,
},
var make contact IEC graphic/.style={
circuit symbol wires,
@@ -353,9 +353,9 @@
transform shape,
shape=var make contact IEC,
outer sep=0pt,
- cap=round
- }
-}
+ cap=round,
+ },
+}%
\tikzset{
@@ -365,12 +365,11 @@
transform shape,
shape=break contact IEC,
outer sep=0pt,
- cap=round
+ cap=round,
},
-}
+}%
\endinput
-
diff --git a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/circuits/tikzlibrarycircuits.ee.code.tex b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/circuits/tikzlibrarycircuits.ee.code.tex
index d8337acefcd..9a7108aebfb 100644
--- a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/circuits/tikzlibrarycircuits.ee.code.tex
+++ b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/circuits/tikzlibrarycircuits.ee.code.tex
@@ -8,8 +8,8 @@
%
% See the file doc/generic/pgf/licenses/LICENSE for more details.
-\usetikzlibrary{circuits}
-\usepgflibrary{shapes.gates.ee}
+\usetikzlibrary{circuits}%
+\usepgflibrary{shapes.gates.ee}%
%
@@ -20,7 +20,7 @@
circuit,
every circuit ee/.try
}
-}
+}%
%
@@ -50,7 +50,7 @@
%
set current direction graphic = current direction ee graphic,
set current direction' graphic = current direction' ee graphic,
-}
+}%
%
@@ -68,7 +68,7 @@
circuit declare unit={voltampere}{VA},
circuit declare unit={watt}{W},
circuit declare unit={hertz}{Hz},
-}
+}%
@@ -85,7 +85,7 @@
>=direction ee,
direction ee arrow = direction ee,
}
-}
+}%
@@ -103,7 +103,7 @@
current direction ee graphic,
rotate=180
}
-}
+}%
@@ -137,8 +137,7 @@
[shift=(\tikzlastnode.center)]
(-1.5\tikzcircuitssizeunit,1.5\tikzcircuitssizeunit) edge[line to] (1.5\tikzcircuitssizeunit,-1.5\tikzcircuitssizeunit)
}
-}
+}%
\endinput
-
diff --git a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/circuits/tikzlibrarycircuits.logic.CDH.code.tex b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/circuits/tikzlibrarycircuits.logic.CDH.code.tex
index 4fe276ff0a0..c0168992532 100644
--- a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/circuits/tikzlibrarycircuits.logic.CDH.code.tex
+++ b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/circuits/tikzlibrarycircuits.logic.CDH.code.tex
@@ -7,7 +7,7 @@
%
% See the file doc/generic/pgf/licenses/LICENSE for more details.
-\usetikzlibrary{circuits.logic.US}
+\usetikzlibrary{circuits.logic.US}%
\tikzset{
circuit logic CDH/.style =
@@ -16,14 +16,13 @@
set and gate graphic = and gate CDH graphic,
set nand gate graphic = nand gate CDH graphic,
}
-}
+}%
\tikzset{
circuit logic US make graphic=and gate CDH,
circuit logic US make graphic=nand gate CDH,
-}
+}%
\endinput
-
diff --git a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/circuits/tikzlibrarycircuits.logic.IEC.code.tex b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/circuits/tikzlibrarycircuits.logic.IEC.code.tex
index 64d1f764b71..54a1068eb4c 100644
--- a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/circuits/tikzlibrarycircuits.logic.IEC.code.tex
+++ b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/circuits/tikzlibrarycircuits.logic.IEC.code.tex
@@ -7,8 +7,8 @@
%
% See the file doc/generic/pgf/licenses/LICENSE for more details.
-\usetikzlibrary{circuits.logic}
-\usepgflibrary{shapes.gates.logic.IEC}
+\usetikzlibrary{circuits.logic}%
+\usepgflibrary{shapes.gates.logic.IEC}%
%
@@ -37,7 +37,7 @@
not gate IEC symbol = {$\scriptstyle1$},
buffer gate IEC symbol = {$\scriptstyle1$},
},
-}
+}%
%
@@ -54,7 +54,7 @@
inner sep=.5ex
}
}
-}
+}%
\tikzset{
@@ -68,9 +68,8 @@
circuit logic IEC make graphic=buffer gate IEC,
circuit logic IEC make graphic=and gate CDH,
circuit logic IEC make graphic=nand gate CDH,
-}
+}%
\endinput
-
diff --git a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/circuits/tikzlibrarycircuits.logic.US.code.tex b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/circuits/tikzlibrarycircuits.logic.US.code.tex
index 1f724912549..76d48c863ab 100644
--- a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/circuits/tikzlibrarycircuits.logic.US.code.tex
+++ b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/circuits/tikzlibrarycircuits.logic.US.code.tex
@@ -7,8 +7,8 @@
%
% See the file doc/generic/pgf/licenses/LICENSE for more details.
-\usetikzlibrary{circuits.logic}
-\usepgflibrary{shapes.gates.logic.US}
+\usetikzlibrary{circuits.logic}%
+\usepgflibrary{shapes.gates.logic.US}%
%
@@ -28,7 +28,7 @@
set not gate graphic = not gate US graphic,
set buffer gate graphic = buffer gate US graphic
}
-}
+}%
%
@@ -45,7 +45,7 @@
transform shape
}
}
-}
+}%
\tikzset{
@@ -57,9 +57,8 @@
circuit logic US make graphic=xnor gate US,
circuit logic US make graphic=not gate US,
circuit logic US make graphic=buffer gate US,
-}
+}%
\endinput
-
diff --git a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/circuits/tikzlibrarycircuits.logic.code.tex b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/circuits/tikzlibrarycircuits.logic.code.tex
index 0fc662f92c5..fb896e6a065 100644
--- a/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/circuits/tikzlibrarycircuits.logic.code.tex
+++ b/Master/texmf-dist/tex/generic/pgf/frontendlayer/tikz/libraries/circuits/tikzlibrarycircuits.logic.code.tex
@@ -7,7 +7,7 @@
%
% See the file doc/generic/pgf/licenses/LICENSE for more details.
-\usetikzlibrary{circuits}
+\usetikzlibrary{circuits}%
@@ -22,7 +22,7 @@
logic gate inverted radius=.25\tikzcircuitssizeunit,
every circuit logic/.try,
}
-}
+}%
@@ -39,8 +39,7 @@
circuit declare symbol = xnor gate,
circuit declare symbol = not gate,
circuit declare symbol = buffer gate
-}
+}%
\endinput
-