circuitikz (24apr16)

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

1 files changed, 106 insertions, 67 deletions

diff --git a/Master/texmf-dist/tex/latex/circuitikz/circuitikz.sty b/Master/texmf-dist/tex/latex/circuitikz/circuitikz.sty
index 6565fb9668e..610a5767d17 100644
--- a/Master/texmf-dist/tex/latex/circuitikz/circuitikz.sty
+++ b/Master/texmf-dist/tex/latex/circuitikz/circuitikz.sty
@@ -1,4 +1,4 @@
-% Copyright 2007-2009 by Massimo Redaelli
+% Copyright 2007-2016 by Massimo Redaelli
 %
 % This file may be distributed and/or modified
 %
@@ -11,22 +11,78 @@
 %%%%%
 %%%%%
 %%%%%
-%%%%% Se c'è l'opzione symbol, fallback to siunitx con warning
+%%%%% Se c'è l'opzione symbol, fallback to siunitx with warning
 %%%%%
 %%%%%
 
 \NeedsTeXFormat{LaTeX2e}
 
-\def\pgfcircversion{0.4}
+\def\pgfcircversion{0.5}
+\def\pgfcircversiondate{2016/04/24}
 
 \ProvidesPackage{circuitikz}%
-        [2015/05/15 The CircuiTikz circuit drawing package version \pgfcircversion]
+        [\pgfcircversiondate{} The CircuiTikz circuit drawing package version \pgfcircversion]
 
 %% Version 2.0 of pgf/TikZ is required
 \RequirePackage{tikz}
 \usetikzlibrary{calc}
 \usepgflibrary{arrows}
 
+
+% The options are listed in the manual in this order
+
+\DeclareOption{europeanvoltage}{
+	\ctikzset{voltage=european}
+}
+
+\DeclareOption{americanvoltage}{
+	\ctikzset{voltage=american}
+}
+
+\DeclareOption{europeancurrent}{
+	\ctikzset{current = european}
+}
+
+\DeclareOption{americancurrent}{
+	\ctikzset{current = american}
+}
+
+\DeclareOption{europeanvoltage}{
+	\ctikzset{voltage = european}
+}
+
+\DeclareOption{americanresistor}{
+	\ctikzset{resistor = american}
+}
+
+\DeclareOption{europeanresistor}{
+	\ctikzset{resistor = european}
+}
+
+\DeclareOption{americaninductor}{
+	\ctikzset{inductor = american}
+}
+
+\DeclareOption{europeaninductor}{
+	\ctikzset{inductor = european}
+}
+
+\DeclareOption{cuteinductor}{
+	\ctikzset{inductor = cute}
+}
+
+\DeclareOption{americanport}{
+	\ctikzset{logic ports = american}
+}
+
+\DeclareOption{europeanport}{
+	\ctikzset{logic ports = european}
+}
+
+\DeclareOption{europeanport}{
+	\ctikzset{logic ports = european}
+}
+
 \DeclareOption{european}{
 	\ctikzset{voltage=european} \ctikzset{current=european} \ctikzset{inductor=european}
 	 \ctikzset{resistor=european} \ctikzset{logic ports=european} \ctikzset{gas filled surge arrester = european} 
@@ -101,7 +157,6 @@
 	\ctikzset{gas filled surge arrester = european}
 }
 
-
 \DeclareOption{siunitx}{
 	\pgf@circ@siunitxtrue
 }
@@ -110,28 +165,6 @@
 	\pgf@circ@siunitxfalse
 }
 
-\DeclareOption{arrowmos}{
-	\pgf@circuit@mos@arrowstrue
-}
-
-\DeclareOption{noarrowmos}{
-	\pgf@circuit@mos@arrowsfalse
-}
-
-\DeclareOption{straightlabels}{
-	\ctikzset{label/align = straight}
-}
-
-\DeclareOption{rotatelabels}{
-	\ctikzset{label/align = rotate}
-}
-
-\DeclareOption{smartlabels}{
-	\ctikzset{label/align = smart}
-}
-
-
-
 \DeclareOption{fulldiode}{
 	\ctikzset{diode = full}
 }
@@ -140,62 +173,76 @@
 	\ctikzset{diode = empty}
 }
 
-\DeclareOption{europeanvoltage}{
-	\ctikzset{voltage=european}
+\DeclareOption{arrowmos}{
+	\pgf@circuit@mos@arrowstrue
 }
 
-\DeclareOption{americanvoltage}{
-	\ctikzset{voltage=american}
+\DeclareOption{noarrowmos}{
+	\pgf@circuit@mos@arrowsfalse
 }
 
-\DeclareOption{europeancurrent}{
-	\ctikzset{current = european}
+\DeclareOption{fetbodydiode}{
+	\pgf@circuit@fet@bodydiodetrue
 }
 
-\DeclareOption{americancurrent}{
-	\ctikzset{current = american}
+\DeclareOption{nofetbodydiode}{
+	\pgf@circuit@fet@bodydiodefalse
 }
 
-\DeclareOption{europeanvoltage}{
-	\ctikzset{voltage = european}
+\DeclareOption{fetsolderdot}{
+	\pgf@circuit@fet@solderdottrue
 }
 
-\DeclareOption{americanresistor}{
-	\ctikzset{resistor = american}
+\DeclareOption{nofetsolderdot}{
+	\pgf@circuit@fet@solderdotfalse
 }
 
-\DeclareOption{europeanresistor}{
-	\ctikzset{resistor = european}
+\DeclareOption{emptypmoscircle}{
+	\pgf@circuit@pmos@emptycircletrue
 }
 
-\DeclareOption{americaninductor}{
-	\ctikzset{inductor = american}
-}
-
-\DeclareOption{europeaninductor}{
-	\ctikzset{inductor = european}
-}
 
-\DeclareOption{cuteinductor}{
-	\ctikzset{inductor = cute}
+\DeclareOption{lazymos}{
+	\ctikzset{tripoles/nmos/width=.5}
+	\ctikzset{tripoles/nmos/gate height=.35}
+	\ctikzset{tripoles/nmos/base height=.35}
+	\ctikzset{tripoles/nmos/height/.initial=1.2}
+	\ctikzset{tripoles/nmos/base width=.5}
+	\ctikzset{tripoles/nmos/gate width=.65}
+	
+	\ctikzset{tripoles/pmos/width=.5}
+	\ctikzset{tripoles/pmos/gate height=.35}
+	\ctikzset{tripoles/pmos/base height=.35}
+	\ctikzset{tripoles/pmos/height/.initial=1.2}
+	\ctikzset{tripoles/pmos/base width=.5}
+	\ctikzset{tripoles/pmos/gate width=.65}
+	
+	\pgf@circuit@pmos@emptycircletrue
 }
 
-\DeclareOption{americanport}{
-	\ctikzset{logic ports = american}
+\DeclareOption{straightlabels}{
+	\ctikzset{label/align = straight}
 }
 
-\DeclareOption{europeanport}{
-	\ctikzset{logic ports = european}
+\DeclareOption{rotatelabels}{
+	\ctikzset{label/align = rotate}
 }
 
-\DeclareOption{europeanport}{
-	\ctikzset{logic ports = european}
+\DeclareOption{smartlabels}{
+	\ctikzset{label/align = smart}
 }
 
 \DeclareOption{compatibility}{
 	\pgf@circuit@compattrue
 }
 
+\DeclareOption{oldvoltagedirection}{
+	\pgf@circ@oldvoltagedirectiontrue
+}
+\DeclareOption{nooldvoltagedirection}{
+	\pgf@circ@oldvoltagedirectionfalse
+}
+
 \DeclareOption{betterproportions}{
 	\ctikzset{monopoles/ground/width/.initial=.15}
 
@@ -257,15 +304,9 @@
 }
 
 %%%%%%%%%
+\input pgfcirc.defines.tex
 
-
-
-\input circuitikz.code.tex
-
-% Latex specific
-\ctikzset{tripoles/op amp/font/.initial=\scriptsize}
-
-\ExecuteOptions{europeancurrents,europeanvoltages,americanports,americanresistors,cuteinductors,europeangfsurgearrester,nosiunitx,noarrowmos,smartlabels,nocompatibility}
+\ExecuteOptions{nofetbodydiode,nofetsolderdot,nooldvoltagedirection,europeancurrents,europeanvoltages,americanports,americanresistors,cuteinductors,europeangfsurgearrester,nosiunitx,noarrowmos,smartlabels,nocompatibility}
 
 \ProcessOptions\relax
 
@@ -275,13 +316,11 @@
 	\RequirePackage{siunitx}
 \fi
 
-\input circuitikz1.code.tex
+\input pgfcircbasic.tex
 
 \newenvironment{circuitikz}{\begin{tikzpicture}}{\end{tikzpicture}}
 %override (unused) circuitikz environment for compability to externalization)
 \let\circuitikz\tikzpicture
 \let\endcircuitikz\endtikzpicture
 
-
 \endinput
-