pgf

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

3 files changed, 74 insertions, 4 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 56a5340f99e..ed9644ac87c 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
@@ -53,12 +53,12 @@
             \tikz@lib@circ@end
           }
         }}
-      \ifx\tikz@lib@circ@pos\tikz@zero@text%
+      \ifdim\tikz@lib@circ@pos pt=0pt\relax%
         \def\tikz@lib@circ@start@node{%
           {\pgfextra{\tikz@lib@circ@compute@direction{\tikz@lib@circ@start}}%
           node[alias=tikz@lib@circ@node@start,at={(0,0)},#1,pos=]{}}(tikz@lib@circ@node@start)}%
       \else%
-        \ifx\tikz@lib@circ@pos\tikz@one@text%
+        \ifdim\tikz@lib@circ@pos pt=1pt\relax%
           \def\tikz@lib@circ@end{
             {\pgfextra{\tikz@lib@circ@compute@direction{\tikz@lib@circ@target}}%
               node[alias=tikz@lib@circ@node\the\tikz@lib@circ@count,at={(0,0)},#1,pos=]{}}
@@ -77,8 +77,6 @@
   }
 }%
 \newcount\tikz@lib@circ@count
-\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)%
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 75457107643..6647be07771 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
@@ -38,6 +38,11 @@
     set current source graphic        = current source IEC graphic,
     set make contact graphic          = make contact IEC graphic,
     set break contact graphic         = break contact IEC graphic,
+    set amperemeter graphic           = amperemeter graphic,
+    set voltmeter graphic             = voltmeter graphic,
+    set ohmmeter graphic              = ohmmeter graphic,
+    set ac source graphic             = ac source graphic,
+    set dc source graphic             = dc source graphic,
   },
 }%
 
@@ -371,5 +376,67 @@
 
 
 
+%
+% Measurement devices
+%
+
+\tikzset{
+  amperemeter graphic/.style={
+    circuit symbol open,
+    circuit symbol size=width 2 height 2,
+    transform shape,
+    shape=generic circle IEC,
+    info=center:A,
+  },
+  voltmeter graphic/.style={
+    circuit symbol open,
+    circuit symbol size=width 2 height 2,
+    transform shape,
+    shape=generic circle IEC,
+    info=center:V,
+  },
+  ohmmeter graphic/.style={
+    circuit symbol open,
+    circuit symbol size=width 2 height 2,
+    transform shape,
+    shape=generic circle IEC,
+    info=center:$\Omega$,
+  },
+}%
+
+
+
+%
+% AC/DC
+%
+
+\tikzset{
+  ac source graphic/.style={
+    circuit symbol lines,
+    circuit symbol size=width 2 height 2,
+    shape=generic circle IEC,
+    /pgf/generic circle IEC/before background={
+      \pgfpathmoveto{\pgfqpoint{0.7pt}{0pt}}
+      \pgfpathquadraticcurveto{\pgfqpoint{ 0.35pt}{-0.5pt}}{\pgfqpoint{0pt}{0pt}}
+      \pgfpathquadraticcurveto{\pgfqpoint{-0.35pt}{ 0.5pt}}{\pgfqpoint{-0.7pt}{0pt}}
+      \pgfusepathqstroke
+    },
+    transform shape,
+  },
+  dc source graphic/.style={
+    circuit symbol lines,
+    circuit symbol size=width 2 height 2,
+    shape=generic circle IEC,
+    /pgf/generic circle IEC/before background={
+      \pgfpathmoveto{\pgfqpoint{ 0.7pt}{ 0.2pt}}
+      \pgfpathlineto{\pgfqpoint{-0.7pt}{ 0.2pt}}
+      \pgfusepathqstroke
+      \pgfpathmoveto{\pgfqpoint{ 0.7pt}{-0.2pt}}
+      \pgfpathlineto{\pgfqpoint{-0.7pt}{-0.2pt}}
+      \pgfusepathqstroke
+    },
+    transform shape,
+  },
+}%
 
 \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 9a7108aebfb..21eeec02b64 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
@@ -47,6 +47,11 @@
   circuit declare symbol = current direction',
   circuit declare symbol = make contact,
   circuit declare symbol = break contact,
+  circuit declare symbol = amperemeter,
+  circuit declare symbol = voltmeter,
+  circuit declare symbol = ohmmeter,
+  circuit declare symbol = ac source,
+  circuit declare symbol = dc source,
   %
   set current direction graphic  = current direction ee graphic,
   set current direction' graphic = current direction' ee graphic,