Rearranged TwoTerminal generator args beg,type,ang -> beg,ang,type.

[course.git] / asymptote / Circ.asy

diff --git a/asymptote/Circ.asy b/asymptote/Circ.asy
index 191948cb47a47d06bedf390f39fb35f551ec420a..268f39f032a9034f65b3a63ab7692fdb7b021f7f 100644 (file)
--- a/asymptote/Circ.asy
+++ b/asymptote/Circ.asy
@@ -269,7 +269,7 @@ struct TwoTerminal {
 real rstlth=2mm;
 int normal=0, variable=2;
 
-TwoTerminal resistor(pair beg=(0,0), int type=normal, real ang=(0,0),
+TwoTerminal resistor(pair beg=(0,0), real ang=0, int type=normal,
                     string name="", string val="", bool draw=true)
 {
   path pLine, pMisc[]={};
@@ -299,7 +299,7 @@ TwoTerminal resistor(pair beg=(0,0), int type=normal, real ang=(0,0),
 real coil=2mm;
 int Up=0, Down=1;
 
-TwoTerminal inductor(pair beg=(0,0), int type=Up, real ang=0, string name="",
+TwoTerminal inductor(pair beg=(0,0), real ang=0, int type=Up, string name="",
                     string val="", bool draw=true)
 {
   path pLine;
@@ -331,7 +331,7 @@ TwoTerminal inductor(pair beg=(0,0), int type=Up, real ang=0, string name="",
 real platsep=1mm;
 int normal=0, electrolytic=1, variable=2, variant=3;
 
-TwoTerminal capacitor(pair beg=(0,0), int type=normal, real ang=0,
+TwoTerminal capacitor(pair beg=(0,0), real ang=0, int type=normal,
                      string name="", string val="", bool draw=true)
 {
   path pLine[]={}, pMisc[]={};
@@ -373,7 +373,7 @@ int zener=1, LED=2;
 // capacitors) are also polarized.  The positioning method centerto(),
 // provides enough flexibility.
 
-TwoTerminal diode(pair beg=(0,0), int type=normal, real ang=0, string name="",
+TwoTerminal diode(pair beg=(0,0), real ang=0, int type=normal, string name="",
                  string val="", bool draw=true)
 {
   path pLine[]={}, pMisc[]={};
@@ -441,7 +441,7 @@ real ssep=3mm, swt=1.2ssep; // TODO remove swt?
 /* `switch' is a Asymptote keyword (or it should be), so append SPST
  * for Single Pole Single Throw.
  */
-TwoTerminal switchSPST(pair beg=(0,0), int type=NO, real ang=0, string name="",
+TwoTerminal switchSPST(pair beg=(0,0), real ang=0, int type=NO, string name="",
                       string val="", bool draw=true)
 {
   path pLine[]={}, pMisc[]={};
@@ -491,7 +491,7 @@ TwoTerminal current(pair beg=(0,0), real ang=0, string name="", string val="",
 real ssize=6mm;
 int AC=0,DC=1,I=2,V=3;
 
-TwoTerminal source(pair beg=(0,0), int type=AC, real ang=0, string name="",
+TwoTerminal source(pair beg=(0,0), real ang=0, int type=AC, string name="",
                   string val="", bool draw=true)
 {
   path pLine[]={}, pMisc[]={};