diff options
| author | Karl Berry <karl@freefriends.org> | 2023-03-11 21:11:43 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2023-03-11 21:11:43 +0000 |
| commit | 6bc45f3087df0ce19bdf3c57a0aec55944ec40ed (patch) | |
| tree | 3faac3b12b92fc4ba09b62c0472a9b3654dada6a /Master/texmf-dist/doc/latex/circuit-macros/examples | |
| parent | 86d58778de06c53c2e0b20f25556b96619a2dc42 (diff) | |
circuit-macros (11mar23)%
git-svn-id: svn://tug.org/texlive/trunk@66549 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/doc/latex/circuit-macros/examples')
116 files changed, 3561 insertions, 12120 deletions
diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/ASME_Y14-5.m4 b/Master/texmf-dist/doc/latex/circuit-macros/examples/ASME_Y14-5.m4def index 00b044b0930..00b044b0930 100644 --- a/Master/texmf-dist/doc/latex/circuit-macros/examples/ASME_Y14-5.m4 +++ b/Master/texmf-dist/doc/latex/circuit-macros/examples/ASME_Y14-5.m4def diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/Autologix.m4 b/Master/texmf-dist/doc/latex/circuit-macros/examples/Autologix.m4 deleted file mode 100644 index 1e4774d9e5c..00000000000 --- a/Master/texmf-dist/doc/latex/circuit-macros/examples/Autologix.m4 +++ /dev/null @@ -1,57 +0,0 @@ -.PS -# `Autologix.m4' -log_init - -A: [ -F: Autologix( - And(Or(x3,x1,~x0),Nor(Or(x3,Not(x2),~x1,x0), - And(Or(x2,x1,~x0),Xor(x2,~x1)))); - ~x0; - And(~x0,Nand(~x1,x3))@ with .nw at 2nd last [].sw+(0,-dimen_*2/3); - Not(x1)) - for_(1,4,1,`"\sl Out`'m4x" at F.Out`'m4x ljust') - Loopover_(`v_', `"\sl In$v_$" at F.In`'v_ above ',x0,x1,x3) -# for_(1,3,1,`"\sl In`'m4x=" at F.In`'m4x+(0,10pt__) above') - "\sl In$x2$" at F.Inx2 +(-10pt__,0) above -# "\sl In4=" at F.In4+(-10pt__,10pt__) above - for_(1,3,1,`"\sl In`'m4x" at F.In`'m4x') - "\sl In17" at F.In17 -G: Autologix( - And(Or(x3,x1,~x0),Nor(Or(x3,Not(x2),~x1,x0), - And(Or(x2,x1,~x0),Xor(x2,~x1)))); - ~x0; - And(~x0,Nand(~x1,x3))@ with .nw at 2nd last [].sw+(0,-dimen_*2/3); - Not(x1), - N) with .Out1 at F.Out1+(6*dimen_,0) - for_(1,4,1,`"\sl Out`'m4x" at G.Out`'m4x ljust') - "\sl In1" at G.In1 rjust - "\sl In2" at G.In2 rjust - "\sl In`'m4nargs" at G.In`'m4nargs rjust - "\tt\ldots ,N)" wid 0.25 at (G.Out2,G.Out4) rjust -] - -S: `"\def\tld{\char126}\shortstack[l]{\tt Autologix(\\\tt - \tt\quad{}And(Or(x3,x1,\tld{}x0),Nor(Or(x3,Not(x2),\tld{}x1,x0), - And(Or(x2,x1,\tld{}x0),Xor(x2,\tld{}x1))));\\ - \tt\quad{}\tld{}x0;\\ - \tt\quad{}And(\tld{}x0,Nand(\tld{}x1,x3))@ - with .nw at 2nd last [].sw+(0,-dimen\_*2/3);\\ - \tt\quad{}Not(x1))}"' \ - ht 58pt__ wid 520pt__ with .nw at A.sw+(0,-15pt__) - -B: [ -F: #utologix( - And(Or(x3,x1,~x0),Nor(Or(x3,Not(x2),~x1,x0), - And(Or(x2,x1,~x0),Xor(x2,~x1)))); - ~x0; - And(~x0,Nand(~x1,x3))@ with .ne at 2nd last [].se+(0,-dimen_*2/3); - Not(x1), - M) - for_(1,4,1,`"\sl Out`'m4x" at F.Out`'m4x rjust') - Loopover_(`v_', `"\sl In$v_$" at F.In`'v_ above ',x0,x1,x3) - "\sl In$x2$" at F.Inx2 +(10pt__,0) above - `"\tt\ldots @ with .ne at 2nd last [].se+(0,-dimen\_*2/3);Not(x1),M)"'\ - wid 200pt__ at F.s below -] with .n at S.s+(0,-0.1) - -.PE diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/Blogix.m4 b/Master/texmf-dist/doc/latex/circuit-macros/examples/Blogix.m4 deleted file mode 100644 index b2d44c5222f..00000000000 --- a/Master/texmf-dist/doc/latex/circuit-macros/examples/Blogix.m4 +++ /dev/null @@ -1,87 +0,0 @@ -.PS -# `Blogix.m4' -log_init - -linewid = 0.4 - -# A more complex expression - F: Autologix(And(Or(x3,x1,~x0),Nor(Or(x3,Not(x2),~x1,x0), - And(x4,Or(x2,x1,~x0),Xor(x2,~x1))))) - - Loopover_(`v_', `"$v_$" at F.In`'v_ above', x0,x1,x2,x3,x4) - "\sl Out" ljust at F.Out - `"{\tt \shortstack[l]{Autologix(And(Or(x3,x1,\~{}x0),\\ - \quad Nor(Or(x3,Not(x2),\~{}x1,x0),And(x4,Or(x2,x1,\~{}x0),%\ - Xor(x2,\~{}x1)))))}}"' wid 440pt__ ht 20pt__ \ - with .w at F.sw+(0,-0.25) -# Inputs on the left with vert offset in L_units -define(`Doff',LV;offset=25) - G: Autologix(And(Or(x3,x1,~x0),Nor(Or(x3,Not(x2),~x1,x0), - And(x4,Or(x2,x1,~x0),Xor(x2,~x1)))), - Doff*L_unit) \ - with .sw at F.Out+(0.2,-0.7) - - Loopover_(`v_', `"$v_$" wid 11pt__ at G.In`'v_ rjust ', x0,x1,x2,x3,x4) - "\sl Out" ljust at G.Out - "{\tt ...,Doff*L\_unit)}" at G.s+(0,-10pt__) - -# A more complex expression -define(`Eoff',R) - E: Autologix(And(Or(x3,x1,~x0),Nor(Or(x3,Not(x2),~x1,x0), - And(x4,Or(x2,x1,~x0),Xor(x2,~x1)))); - And(~x0,Nand(~x1,x3)), - Eoff) \ - with .nw at F.sw+(0,-1.5) - - Loopover_(`v_', `"$v_$" at E.In`'v_ above ', x0,x1,x2,x3,x4) - "\sl Out1" ljust at E.Out1 - "\sl Out2" ljust at E.Out2 - "{\tt ...,Eoff)}" at E.s+(0,-10pt__) - -# Inputs on the left with vert offset in L_units -define(`Foff',LRV;offset=17) - D: Autologix(And(Or(x3,x1,~x0),Nor(Or(x3,Not(x2),~x1,x0), - And(x4,Or(x2,x1,~x0),Xor(x2,~x1)))), - Foff*L_unit) \ - with .sw at E.Out1+(0.2,-0.5) - - Loopover_(`v_', `"$v_$" wid 11pt__ at D.In`'v_ rjust ', x0,x1,x2,x3,x4) - "\sl Out" ljust at D.Out - "{\tt ...,Foff)}" at D.s+(0,-10pt__) - -# Here's how to include an arbitrary circuit -# that isn't one of the standard gates. -# First, define the circuit with a name ending -# in _gate. Make sure its inputs are on the left -# and named In1, In2, ... and the output Out -# is on the right. -define(`SR_gate',`[ - S: NOR_gate - R: NOR_gate at S+(0,-L_unit*(AND_ht+4)) - w = (S.Out.x-R.In1.x)/3 - v = 2*L_unit - line right_ dimen_/2 from S.Out - Out: Here - TR: R.In1-(v,0) - line from S.Out+(v,0) down w*3/2 then left S.Out.x-TR.x+v down w \ - then to TR then to R.In1 - TS: S.In2-(v,0); - line from R.Out right v then up w*3/2 then left R.Out.x-TS.x+v up w \ - then to TS then to S.In2 - In1: S.In1 - In2: R.In2 ]') -# Now define the function by which the circuit -# will be invoked, with a preceding _: -define(`SRff',`_AutoGate(SR,$@)') - -# You're done. Here is an example: - F: Autologix(Or(y,SRff(And(x,y),Nand(x,y)))) \ - with .nw at 2nd last [].sw+(0,-0.5) - - "\sl Out" at F.Out ljust - "$x$" at F.Inx above - "$y$" at F.Iny above - `"{\tt Autologix(Or(y,SRff(And(x,y),Nand(x,y))))}"' wid 267pt__ ht 7pt__ \ - with .w at last [].sw+(0,-10pt__) - -.PE diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/Conn.m4 b/Master/texmf-dist/doc/latex/circuit-macros/examples/Conn.m4 index 7229f0afee8..6ccf5d5709e 100644 --- a/Master/texmf-dist/doc/latex/circuit-macros/examples/Conn.m4 +++ b/Master/texmf-dist/doc/latex/circuit-macros/examples/Conn.m4 @@ -1,3 +1,4 @@ + .PS # `Conn.m4' cct_init @@ -31,38 +32,44 @@ C: [ C1: ccoax `"\tt ccoax\vphantom{(}"' ht 11 pt__ at C1.s below thinlines_ - arrow <- up 0.1 right 0.1 from C1.C.ne; "C" ljust - arrow <- down 0.05 right 0.1 from C1.S.e; "S" wid 0.1 ht 11pt__ ljust + arrow <- down 0.05 left 0.15 from C1.C.w; "\sl C" rjust + arrow <- down 0.05 right 0.1 from C1.S.e; "\sl S" wid 0.1 ht 11pt__ ljust thicklines_ - C2: ccoax(at C1+(0,0.3),F) - `"\tt ccoax(,F)"' ht 11 pt__ wid 0.65 at C2.ne ljust - ] with .C1.sw at T.S2.se+(0.6,0.0) + C2: ccoax(at C1+(0,0.4),F) + `"\tt ccoax(,F)"' ht 11 pt__ at C2.s below + ] with .w at T.e+(0.6,0.0) + +B: [ + tbox(V_2) + { `"\tt tbox(V\_2)"' at last [].s below } + tbox(V_1,,,<) at last []+(0,-0.4) + { `"\tt tbox(V\_1,{,},<)"' at last [].s below } + tbox(V_1,,,<>) at last []+(0,-0.4) + { `"\tt tbox(V\_1,{,},<>)"' at last [].s below } +] with .w at C.e + (0.5,-0.1) Y: [ - tconn(,O) + P1: tconn(,O) {`"\tt tconn(,O)"' at last line.c+(0,-0.2) wid 43 pt__ } move to Here+(0.3,0) - P1: tconn(,>) - {`"\tt (,>)"' at last line.c+(0,-0.2)} - move to P1.end+(0.3,0) - tconn(,>>) - {`"\tt (,>{}>)"' at last line.c+(0,-0.2)} - move to P1.start+(0,linewid) - P3: tconn(,<) - {`"\tt tconn(,<)"' at last line.c+(0,-0.2)} + P2: tconn(,>) + {`"\tt $\ldots$(,>)"' at last line.c+(0,-0.2)} + move to P2.end+(0.3,0) + P3: tconn(,>>) + {`"\tt $\ldots$(,>{}>)"' at last line.c+(0,-0.2)} move to P3.end+(0.3,0) - tconn(,<<) - {`"\tt (,<{}<)"' at last line.c+(0,-0.2)} + P4: tconn(,<) + {`"\tt $\ldots$(,<)"' at last line.c+(0,-0.2)} + move to P4.end+(0.3,0) + P5: tconn(,<<) + {`"\tt $\ldots$(,<{}<)"' at last line.c+(0,-0.2)} + move to P5.end+(0.3,0) + P6: tconn(,A) + {`"\tt $\ldots$(,A)"' at last line.c+(0,-0.2)} + move to P6.end+(0.3,0) + P7: tconn(,M) + {`"\tt $\ldots$(,M)"' at last line.c+(0,-0.2)} -] with .sw at (C.e.x-0.4,T.s.y) - -B: [ - tbox(V_2) - { `"\tt tbox(V\_2)"' at last [].sw below ljust } - tbox(V_1,,,<) with .sw at last [].se+(1.25,0) - { `"\tt tbox(V\_1,{,},<)"' at last [].s below } - tbox(V_1,,,<>) with .sw at last [].se+(1.25,0) - { `"\tt tbox(V\_1,{,},<>)"' at last [].s below } -] with .nw at T.sw+(0,-0.2) +] with .nw at T.sw+(0,-0.35) .PE diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/Flow.m4 b/Master/texmf-dist/doc/latex/circuit-macros/examples/Flow.m4 index f117c082c37..7c514050f0a 100644 --- a/Master/texmf-dist/doc/latex/circuit-macros/examples/Flow.m4 +++ b/Master/texmf-dist/doc/latex/circuit-macros/examples/Flow.m4 @@ -1,7 +1,9 @@ .PS # Flow.m4 gen_init -ifdef(`FlowchartDefs_',,`include(FlowchartDefs.m4)') +ifdef(`FlowchartDefs_',, + `sinclude(FlowchartDefs.m4def) + sinclude(../FlowchartDefs.m4def)') define(`Thistle',`rgbstring(0.85,0.75,0.85)')dnl define(`RubineRed',`rgbstring(0.81,0,0.35)')dnl diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/FlowchartDefs.m4 b/Master/texmf-dist/doc/latex/circuit-macros/examples/FlowchartDefs.m4def index fc3dfca6a07..fc3dfca6a07 100644 --- a/Master/texmf-dist/doc/latex/circuit-macros/examples/FlowchartDefs.m4 +++ b/Master/texmf-dist/doc/latex/circuit-macros/examples/FlowchartDefs.m4def diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/Fuses.m4 b/Master/texmf-dist/doc/latex/circuit-macros/examples/Fuses.m4 index bde24fac3eb..2a01cfa3f2a 100644 --- a/Master/texmf-dist/doc/latex/circuit-macros/examples/Fuses.m4 +++ b/Master/texmf-dist/doc/latex/circuit-macros/examples/Fuses.m4 @@ -19,21 +19,30 @@ movewid = 0.25 } move down; right_ { - cbreaker; {"`{\tt cbreaker}'" at last line.c+(0,-0.25)} + fuse(,HB) ; {"`{\tt fuse(,HB)}'" at last line.c+(0,-0.2)} + move + fuse(,HC,0.5,0.3) ; {"`{\tt $\ldots$(,HC,0.5,0.3)}'" at last line.c+(0,-0.27)} move - cbreaker(,R); {"`{\tt cbreaker(,R)}'" at last line.c+(0,-0.25)} + cbreaker; {"`{\tt cbreaker}'" at last line.c+(0,-0.2)} move - cbreaker(,{,}D); {"`{\tt $\ldots$(,{,}D)}'" at last line.c+(0,-0.25)} + cbreaker(,R,D); {"`{\tt $\ldots$(,R,D)}'" at last line.c+(0,-0.2)} move - cbreaker(,{,}T); {"`{\tt $\ldots$(,{,}T)}'" at last line.c+(0,-0.25)} + cbreaker(,,T); {"`{\tt $\ldots$(,{,}T)}'" at last line.c+(0,-0.2)} move - cbreaker(,{,}TS); {"`{\tt $\ldots$(,{,}TS)}'" at last line.c+(0,-0.25) } + cbreaker(,,TS); {"`{\tt $\ldots$(,{,}TS)}'" at last line.c+(0,-0.2) } } move down; right_ { - fuse(,HB) ; {"`{\tt fuse(,HB)}'" at last line.c+(0,-0.2)} + jumper ; {"`{\tt jumper}'" at last line.c+(0,-0.2) } + move + jumper(,CJBED) ; {"`{\tt $\ldots$(,CJBED)}'" at last line.c+(0,-0.2) } + move + jumper(,body=outlined "gray" shaded "gray";) + {"`\tt $\ldots$(,body=outlined \"gray\" \textbackslash'" wid 172bp__ \ + with .w at (last line.start, last "") + "`\tt \hphantom{$\ldots$(,body=}shaded \"gray\";)'" \ + at last "".sw+(0,-10bp__) ljust } move - fuse(,HC,0.5,0.3) ; {"`{\tt (,HC,0.5,0.3)}'" at last line.c+(0,-0.25)} } .PE diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/IntersectingPlanes.m4 b/Master/texmf-dist/doc/latex/circuit-macros/examples/IntersectingPlanes.m4 deleted file mode 100644 index 3ed9ab3bc34..00000000000 --- a/Master/texmf-dist/doc/latex/circuit-macros/examples/IntersectingPlanes.m4 +++ /dev/null @@ -1,84 +0,0 @@ -.PS -## IntersectingPlanes.m4 -## Projection of an object defined by 4-sided facets -threeD_init -NeedDpicTools - - setview( 10, 45) -# Define the object by its facets: -# size parameters - a = 3/2 - b = 0.4 -# depth - d = -1 -# line ends and intersections - A0: -a,-b - A1: a,-b - B0: Rot_(A0,120) - B1: Rot_(A1,120) - C0: Rot_(A0,240) - C1: Rot_(A1,240) - AB: intersect_(A0,A1,B0,B1) - BC: intersect_(B0,B1,C0,C1) - CA: intersect_(C0,C1,A0,A1) - - "A0" at project(0,A0.x,A0.y) rjust - "A1" at project(0,A1.x,A1.y) ljust - "B0" at project(0,B0.x,B0.y) ljust - "B1" at project(0,B1.x,B1.y) rjust - "C0" at project(0,C0.x,C0.y) ljust - "C1" at project(0,C1.x,C1.y) rjust -# facet location parameters -define(`facet',`$1.x,$1.y, $2.x,$2.y') -array2(ffc,1,facet(A0,CA)) -array2(ffc,2,facet(CA,A0)) -array2(ffc,3,facet(CA,AB)) -array2(ffc,4,facet(AB,CA)) -array2(ffc,5,facet(AB,A1)) -array2(ffc,6,facet(A1,AB)) - -array2(ffc,7,facet(AB,B0)) -array2(ffc,8,facet(B0,AB)) -array2(ffc,9,facet(BC,AB)) -array2(ffc,10,facet(AB,BC)) -array2(ffc,11,facet(B1,BC)) -array2(ffc,12,facet(BC,B1)) - -array2(ffc,13,facet(C0,BC)) -array2(ffc,14,facet(BC,C0)) -array2(ffc,15,facet(BC,CA)) -array2(ffc,16,facet(CA,BC)) -array2(ffc,17,facet(CA,C1)) -array2(ffc,18,facet(C1,CA)) -nfacets = 18 -# facet corners -define(`fSW',`0,ffc[($1,1)],ffc[($1,2)]') -define(`fNW',`d,ffc[($1,1)],ffc[($1,2)]') -define(`fSE',`0,ffc[($1,3)],ffc[($1,4)]') -define(`fNE',`d,ffc[($1,3)],ffc[($1,4)]') -# facet centre and normal -define(`Fcentre',`sprod3D(0.5,sum3D(fSW(i),fNE(i)))') -define(`Fnoarmal',`cross3D(diff3D(fSE($1),fSW($1)),diff3D(fNE($1),fSE($1)))') -# facet drawing routine -define(`drawfacet',` - Loopover_(`X', `X: project(m4xpand(f`'X)(`$1'));', SW,SE,NE,NW) - line from SW to SE then to NE then to NW then to SW shaded ifelse(`$3',, - "white", `rgbstring(`$3',ifelse(`$4',,`$3',`$4'),ifelse(`$5',,`$3',`$5'))') - ifelse(`$2',,,`sprintf("%g",$2) at 1/2 between NW and SE') ') - -# The rest is generic: sort visible facets by -# distance and plot (but with custom colors) - nvis = 0 - smax = 0 - for i=1 to nfacets do { - if dot3D(View3D,Fnoarmal(i)) >= 0 then { - nvis +=1 - s[nvis] = dot3D(View3D,Fcentre(i)) - smax = max(smax,s[nvis]) - ix[nvis] = i - } } - dpquicksort(s,1,nvis,ix) - - for i=1 to nvis do { drawfacet(ix[i],ix[i],sqrt(i/nvis),i/nvis) } - -.PE diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/Lettering.m4def b/Master/texmf-dist/doc/latex/circuit-macros/examples/Lettering.m4def new file mode 100644 index 00000000000..bbc9f0e4ec9 --- /dev/null +++ b/Master/texmf-dist/doc/latex/circuit-macros/examples/Lettering.m4def @@ -0,0 +1,1158 @@ +divert(-1) +% Lettering.defs +% Lettering definitions + +define(`Letter_init', + `# Letter grid parameters + lu = 0.07 + define(`grthick',`0.4') + define(`letterlinethick',`(lu/0.07)*1.2') + define(`ft2',`(linethick/2)pt__') + linethick_(letterlinethick) + + ifelse(m4postprocessor,pstricks, + ` \newgray{gridgray}{0.75} + \newgray{lightgridgray}{0.80} + \newgray{linegray}{0.40}', + m4postprocessor,pgf, + ` \definecolor{gridgray}{rgb}{0.433,0.433,0.433} + \definecolor{lightgridgray}{rgb}{0.8,0.8,0.8} + \definecolor{linegray}{rgb}{0.231,0.231,0.231}', + m4postprocessor,mpost, + ` define(`gridgray',`0.433,0.433,0.433') + define(`lightgridgray',`0.8,0.8,0.8') + define(`linegray',`0.231,0.231,0.231')', +# else + ` define(`gridgray',`0.5 0.5 0.5') + define(`lightgridgray',`0.8 0.8 0.8') + define(`linegray',`0.3 0.3 0.3')') + ifpstricks(`command `"\makeatletter \def\psas@@c{setlinecap 0 0 moveto"' + command `" 0 0.1 L stroke 0 0 moveto } \makeatother"'') +`# Letter_init end' + ') + +# graph coordinate system +define(`gco',`(vscal_(lu,$1,$2))') + +% `Stroke arrow +% stroke(linespec,vert offset,label,<-,linelabel)' +define(`setstroke',`ifmpost( + `setrgb(0,0,0)', + `psset_(linecolor=black,arrows=-)')dnl + linethick_(0.3); arrowwid = 1.6pt__ ; arrowht = 3pt__') + +define(`stroke',`rpoint_(`$1') ; { setstroke + m4lth = linethick + ifelse((`$2'),(),,`if (`$2') != 0 then { move to rvec_(0,`$2') }') + ifelse(`$3',,,`ifelse(index(`$3',"),0,`{$3}',{"`$3'"})') + ifelse(`$5',,,`$5':)line ifelse(`$4',,->,`$4') to rvec_(rp_len,0) dnl + chop 3pt__ chop 0 + linethick_(m4lth) } +') + +# non-normalized line at 90 deg to line argument +define(`perp',`(`$1'.start.y-`$1'.end.y),(`$1'.end.x-`$1'.start.x) ') + +define(`grid', +` lthtmp = linethick; linethick = grthick + ifmpost(`setrgb(gridgray)',`psset_(linecolor=gridgray)') + for i=0 to $1 do { + { line up ($2)*lu from gco(i,0) } } + for j=0 to $2 do { + { line right ($1)*lu from gco(0,j) } } + psset_(`linecolor=black') + linethick = lthtmp ') + +define(`elarrow',`i = ifelse(`$7',,-1,`$7') + for theta = `$1' to `$2' by `$3' do { i = i+1 + V[i]: `$4'+((`$5')*cosd(theta),(`$6')*sind(theta)) } + fitcurve(V,i,->) ') + +define(`charA', +`[Origin: gco(0,0) `#' `charA' + ifelse(`$1',,,`grid(6,6)') + psset_(`arrows=c-c,linecolor=linegray') dnl + L1: line from gco(3,6)+(0,-ft2) to gco(0,0)+(ft2,ft2) + L2: line from gco(3,6)+(0,-ft2) to gco(6,0)+(-ft2,ft2) + L3t: line invis from gco(0,2)+(0,ft2) right lu + L3: line from Intersect_(L1,L3t) to Intersect_(L2,L3t) + ifelse(`$1',,,` + stroke(from L1.start to L1.end chop lu ,-lu*0.75,1) + stroke(from L2.start to L2.end chop lu , lu*0.75,2) + stroke(from L3.start to L3.end chop lu/3,-lu*0.75,3) ') + box invis wid 6*lu ht 6*lu with .sw at Origin]') + +define(`charB', +`[Origin: gco(0,0) `#' `charB' + ifelse(`$1',,,`grid(6,6)') + psset_(`arrows=c-c,linecolor=linegray') dnl + L1: line from gco(0,6)+(ft2,-ft2) to gco(0,0)+(ft2,ft2) + mid = 3.3*lu-ft2 + topht = 6*lu-2*ft2-mid + L2: line right_ 5*lu-2*ft2-mid/2 + L5: arc ccw to Here+(0,mid) with .c at Here+(0,mid/2) + L3: line from (L1,Here) to Here + l4l = 4.5*lu-2*ft2-topht/2 + L4: line from L1.start right_ l4l + L7: arc cw to Here+(0,-topht) with .c at Here+(0,-topht/2) + ifelse(`$1',,,` + stroke(from L1.start to L1.end chop lu/3,-lu*0.75,1) + stroke(from L2.start to L2.end chop lu/3,-lu*0.75,2) + stroke(from L3.start to L3.end chop lu*.75 chop 0,-lu*0.75,3) + move to L4.start+(0,.75*lu) + {"4"}; line right l4l chop 3pt__ chop 0 + arcd(Here-(0,.75*lu+topht/2),.75*lu+topht/2,90,-30) cw -> + "5" below ljust + arcd(L2.end+(0,mid/2),mid/2+0.75*lu,15,-90) cw -> ') + box invis wid 5*lu ht 6*lu with .sw at Origin]') + +define(`charC', +`[Origin: gco(0,0) `#' `charC' + ifelse(`$1',,,`grid(6,6)') + psset_(`arrows=c-c,linecolor=linegray') dnl + ifelse(`$1',,,`circle rad 3*lu-ft2 thick 0.3 dashed at gco(3,3)') + arcr(gco(3,3),3*lu-ft2,atan2(2.5,1.5),atan2(-2,2.0)) + ifelse(`$1',,,` + setstroke + "1" at gco(3,6) above rjust + arcd(gco(3,3),3.75*lu,105,atan2(-2,2.1)*rtod_) -> + "2" at gco(3,6) above ljust + arcd(gco(3,3),3.75*lu,75,atan2(2.5,1.5)*rtod_) cw -> ') + box invis wid 5*lu ht 6*lu with .sw at Origin]') + +define(`charD', +`[Origin: gco(0,0) `#' `charD' + ifelse(`$1',,,`grid(6,6)') + psset_(`arrows=c-c,linecolor=linegray') dnl + L1: line from gco(0,6)+(ft2,-ft2) to gco(0,0)+(ft2,ft2) + lr = 3*lu-ft2 + L2: line right 5*lu-ft2-lr + arcd(Here+(0,lr),lr,-90,90) + line to L1.start + ifelse(`$1',,,` + stroke(from L1.start to L1.end chop lu/3,-lu*0.75,1) + stroke(from L2.start to L2.end chop lu/3 chop lu/8,-lu*0.75,2) + move to L1.start+(0,.75*lu) + {"3"}; line right 5*lu-ft2-lr chop 3pt__ chop 0 + arcd(Here-(0,.75*lu+lr),.75*lu+lr,90,-90) cw -> ') + box invis wid 5*lu ht 6*lu with .sw at Origin]') + +define(`charE', +`[Origin: gco(0,0) `#' `charE' + ifelse(`$1',,,`grid(6,6)') + psset_(`arrows=c-c,linecolor=linegray') dnl + L1: line from gco(0,6)+(ft2,-ft2) to gco(0,0)+(ft2,ft2) + L2: line right 5*lu-2*ft2 + L3: line from L1.start right 4.5*lu-2*ft2 + L4: line from gco(0,3.2)+(ft2,0) right 3*lu-2*ft2 + ifelse(`$1',,,` + stroke(from L1.start to L1.end chop lu/3,-lu*0.75,1) + stroke(from L2.start to L2.end chop lu/2 chop lu/3,-lu*0.75,2) + stroke(from L3.start to L3.end chop lu*.75 chop lu/3,-lu*0.75,3) + stroke(from L4.start to L4.end chop lu*.75 chop lu/3,-lu*0.75,4) ') + box invis wid 5*lu ht 6*lu with .sw at Origin]') + +define(`charF', +`[Origin: gco(0,0) `#' `charF' + ifelse(`$1',,,`grid(6,6)') + psset_(`arrows=c-c,linecolor=linegray') dnl + L1: line from gco(0,6)+(ft2,-ft2) to gco(0,0)+(ft2,ft2) + L2: line from L1.start right 5*lu-2*ft2 + L3: line from gco(0,3.2)+(ft2,0) right 3*lu-2*ft2 + ifelse(`$1',,,` + stroke(from L1.start to L1.end chop lu/3,-lu*0.75,1) + stroke(from L2.start to L2.end chop lu*.75 chop lu/3,-lu*0.75,2) + stroke(from L3.start to L3.end chop lu*.75 chop lu/3,-lu*0.75,3) ') + box invis wid 5*lu ht 6*lu with .sw at Origin]') + +define(`charG', +`[Origin: gco(0,0) `#' `charG' + ifelse(`$1',,,`grid(6,6)') + psset_(`arrows=c-c,linecolor=linegray') dnl + ifelse(`$1',,,`circle rad 3*lu-ft2 thick 0.3 dashed at gco(3,3)') + L3: line from gco(3,3) to gco(5,3) then to gco(5,1) + arcr(gco(3,3),3*lu-ft2,atan2(2.5,1.5),atan2(-2,2.0)) + ifelse(`$1',,,` + setstroke + "1" at gco(3,6) above rjust + arcd(gco(3,3),3.75*lu,105,atan2(-2,2.1)*rtod_) -> + "2" at gco(3,6) above ljust + arcd(gco(3,3),3.75*lu,75,atan2(2.5,1.5)*rtod_) cw -> + line from L3.start+(0,-.75*lu) right 1.2*lu chop .5*lu chop 0 + { "3" at last line.start rjust } + arrow down 1.2*lu ') + box invis wid 5*lu ht 6*lu with .sw at Origin]') + +define(`charH', +`[Origin: gco(0,0) `#' `charH' + ifelse(`$1',,,`grid(6,6)') + psset_(`arrows=c-c,linecolor=linegray') dnl + L1: line from gco(0,6)+(ft2,-ft2) to gco(0,0)+(ft2,ft2) + L2: line from gco(5,6)+(0,-ft2) to gco(5,0)+(0,ft2) + L3: line from gco(0,3.2)+(ft2,0) to gco(5,3.2) + ifelse(`$1',,,` + stroke(from L1.start to L1.end chop lu/3,-lu*0.75,1) + stroke(from L2.start to L2.end chop lu/3, lu*0.75,2) + stroke(from L3.start to L3.end chop lu*.75 chop lu/3,-lu*0.75,3) ') + box invis wid 5*lu ht 6*lu with .sw at Origin]') + +define(`charI', +`[Origin: gco(0,0) `#' `charI' + ifelse(`$1',,,`grid(1,6)') + psset_(`arrows=c-c,linecolor=linegray') dnl + L1: line from gco(0,6)+(ft2,-ft2) to gco(0,0)+(ft2,ft2) + ifelse(`$1',,,` + stroke(from L1.start to L1.end chop lu/3, lu*0.75,1) ') + box invis wid 2*ft2 ht 6*lu with .sw at Origin]') + +define(`charJ', +`[Origin: gco(0,0) `#' `charJ' + ifelse(`$1',,,`grid(6,6)') + psset_(`arrows=c-c,linecolor=linegray') dnl + v = (sqrt(2)-1)*4/3 + al = 2.5*lu-ft2 + bl = 2.0*lu-ft2/2 + CL: gco(2.5,4.0)+(0,-bl) + E: ellipse ht 2*bl wid 2*al thick 0.3 ifelse(`$1',,invis,dashed) at CL + L1: line from (E.e,gco(0,6)+(ft2,-ft2)) to E.e + spline v to (E.e,E.s) then to (E.w,E.s) then to E.w + ifelse(`$1',,,` + stroke(from L1.start to L1.end chop lu/3, lu*0.75,1) + "2" at gco(-.5,1.5) + spline v -> from gco(-0.4,0.75) to gco(-0.2,-0.65) then to gco(5.65,-0.65) \ + then to gco(5.65,2) ') + box invis wid 5*lu ht 6*lu with .sw at Origin]') + +define(`charK', +`[Origin: gco(0,0) `#' `charK' + ifelse(`$1',,,`grid(6,6)') + psset_(`arrows=c-c,linecolor=linegray') dnl + L1: line from gco(0,6)+(ft2,-ft2) to gco(0,0)+(ft2,ft2) + L3t:line ifelse(`$1',,invis,dashed) thick 0.3 from L1.start \ + to gco(5,0)+(-ft2,ft2) + L2: line from gco(4.5,6)+(0,-ft2) to gco(0,2)+(ft2,0) + L3: line from Intersect_(L3t,L2) to L3t.end + ifelse(`$1',,,` + stroke(from L1.start to L1.end chop lu/3,-lu*0.75,1) + stroke(from L2.start to L2.end chop lu*4/3 chop lu,-lu*0.75,2) + stroke(from L3.start to L3.end chop lu*.75 chop lu/3, lu*0.75,3) ') + box invis wid 5*lu ht 6*lu with .sw at Origin]') + +define(`charL', +`[Origin: gco(0,0) `#' `charL' + ifelse(`$1',,,`grid(6,6)') + psset_(`arrows=c-c,linecolor=linegray') dnl + L1: line from gco(0,6)+(ft2,-ft2) to gco(0,0)+(ft2,ft2) + L2: line to gco(5,0)+(-ft2,ft2) + ifelse(`$1',,,` + stroke(from L1.start to L1.end chop lu/3,-lu*0.75,1) + stroke(from L2.start to L2.end chop lu/3,-lu*0.75,2) ') + box invis wid 5*lu ht 6*lu with .sw at Origin]') + +define(`charM', +`[Origin: gco(0,0) `#' `charM' + ifelse(`$1',,,`grid(6,6)') + psset_(`arrows=c-c,linecolor=linegray') dnl + L1: line from gco(0,6)+(ft2,-ft2) to gco(0,0)+(ft2,ft2) + L2: line from gco(6,6)+(-ft2,-ft2) to gco(6,0)+(-ft2,ft2) + L3: line from L1.start to gco(3,0)+(0,ft2) + L4: line from L2.start to gco(3,0)+(0,ft2) + ifelse(`$1',,,` + stroke(from L1.start to L1.end chop lu/3,-lu*0.75,1) + stroke(from L2.start to L2.end chop lu/3, lu*0.75,2) + stroke(from L3.start to L3.end chop lu*.75 chop lu*2, lu*0.75,3) + stroke(from L4.start to L4.end chop lu*.75 chop lu*2,-lu*0.75,4) ') + box invis wid 6*lu ht 6*lu with .sw at Origin]') + +define(`charN', +`[Origin: gco(0,0) `#' `charN' + ifelse(`$1',,,`grid(6,6)') + psset_(`arrows=c-c,linecolor=linegray') dnl + L1: line from gco(0,6)+(ft2,-ft2) to gco(0,0)+(ft2,ft2) + L2: line from gco(5,6)+(0,-ft2) to gco(5,0)+(0,ft2) + L3: line from L1.start to L2.end + ifelse(`$1',,,` + stroke(from L1.start to L1.end chop lu/3,-lu*0.75,1) + stroke(from L2.start to L2.end chop lu/3, lu*0.75,2) + stroke(from L3.start to L3.end chop lu*1.0 chop lu*1.5, lu*0.75,3) ') + box invis wid 5*lu ht 6*lu with .sw at Origin]') + +define(`charO', +`[Origin: gco(0,0) `#' `charO' + ifelse(`$1',,,`grid(6,6)') + psset_(`arrows=c-c,linecolor=linegray') dnl + circle rad 3*lu-ft2 at gco(3,3) + ifelse(`$1',,,` + setstroke + "1" at gco(3,6) above rjust + arcd(gco(3,3),3.75*lu,105,atan2(-2,2.1)*rtod_) -> + "2" at gco(3,6) above ljust + arcd(gco(3,3),3.75*lu,75,atan2(-2,2.1)*rtod_+5) cw -> ') + box invis wid 6*lu ht 6*lu with .sw at Origin]') + +define(`charP', +`[Origin: gco(0,0) `#' `charP' + ifelse(`$1',,,`grid(6,6)') + psset_(`arrows=c-c,linecolor=linegray') dnl + L1: line from gco(0,6)+(ft2,-ft2) to gco(0,0)+(ft2,ft2) + L2: line from gco(0,3)+(ft2,0) right 5*lu-ft2-(3*lu-ft2)/2 + L3: line from L1.start right 5*lu-ft2-(3*lu-ft2)/2 + arcd(Here+(0,-(3*lu-ft2)/2),(3*lu-ft2)/2,-90,90) + ifelse(`$1',,,` + stroke(from L1.start to L1.end chop lu/3,-lu*0.75,1) + stroke(from L2.start to L2.end chop lu*.75 chop lu/3,-lu*0.75,2) + "3" at gco(0,6)+(0,lu*.75) + line to (L3.end,Here) chop lu/2 chop 0 + arcd(Here+(0,-4.5*lu/2),4.5*lu/2,90,-90) cw -> ') + box invis wid 5*lu ht 6*lu with .sw at Origin]') + +define(`charQ', +`[Origin: gco(0,0) `#' `charQ' + ifelse(`$1',,,`grid(6,6)') + psset_(`arrows=c-c,linecolor=linegray') dnl + circle rad 3*lu-ft2 at gco(3,3) + rpoint_(from gco(3,3) to gco(5,0)) + ifelse(`$1',,,`{line dashed dashwid*0.8 thick 0.3 to rvec_(2*lu-ft2,0)}') + L3: line from rvec_(2*lu-ft2,0) to rvec_(4*lu-ft2,0) + ifelse(`$1',,,` + setstroke + "1" at gco(3,6) above rjust + arcd(gco(3,3),3.75*lu,105,atan2(-2,2.1)*rtod_) -> + "2" at gco(3,6) above ljust + arcd(gco(3,3),3.75*lu,75,atan2(-2,2.1)*rtod_+5) cw -> + stroke(from L3.start to L3.end chop -lu/3 chop lu/3,-lu*0.75,3) ') + box invis wid 6*lu ht 6*lu with .sw at Origin]') + +define(`charR', +`[Origin: gco(0,0) `#' `charR' + ifelse(`$1',,,`grid(6,6)') + psset_(`arrows=c-c,linecolor=linegray') dnl + L1: line from gco(0,6)+(ft2,-ft2) to gco(0,0)+(ft2,ft2) + L2: line from gco(0,3)+(ft2,0) right 5*lu-ft2-(3*lu-ft2)/2 + Lt4: line thick 0.3 ifelse(`$1',,invis,dashed) from gco(1,6)+(-ft2,-ft2) \ + to gco(5,0)+(-ft2,ft2) + L4: line from Intersect_(Lt4,L2) to Lt4.end + L3: line from L1.start right 5*lu-ft2-(3*lu-ft2)/2 + arcd(Here+(0,-(3*lu-ft2)/2),(3*lu-ft2)/2,-90,90) + ifelse(`$1',,,` + stroke(from L1.start to L1.end chop lu/3,-lu*0.75,1) + stroke(from L2.start to L2.end chop lu*.75 chop lu,-lu*0.75,2) + stroke(from L4.start to L4.end chop lu chop lu*.5,-lu*0.75,4) + "3" at gco(0,6)+(0,lu*.75) + line to (L3.end,Here) chop lu/2 chop 0 + arcd(Here+(0,-4.5*lu/2),4.5*lu/2,90,-80) cw -> ') + box invis wid 5*lu ht 6*lu with .sw at Origin]') + +define(`charS', +`[Origin: gco(0,0) `#' `charS' + ifelse(`$1',,,`grid(6,6)') + psset_(`arrows=c-c,linecolor=linegray') dnl + ah = 2.0*lu-ft2 + bh = 1.4*lu-ft2/2 + CH: gco(2.5,3.2)+(0,bh) + ifelse(`$1',,,`ellipse ht 2*bh wid 2*ah thick 0.3 dashed at CH') + al = 2.5*lu-ft2 + bl = 1.6*lu-ft2/2 + CL: gco(2.5,3.2)+(0,-bl) + ifelse(`$1',,,`ellipse ht 2*bl wid 2*al thick 0.3 dashed at CL') + i = 0 + V[i]: CH+(ah*cosd(20),bh*sind(20)) + for theta = 30 to 270 by 22.5 do { i = i+1 + V[i]: CH+(ah*cosd(theta),bh*sind(theta)) } + for theta = 90-22.5 to -135 by -22.5 do { i = i+1 + V[i]: CL+(al*cosd(theta),bl*sind(theta)) } + i = i+1 + V[i]: gco(0,1)+(ft2,0) + fitcurve(V,i) + ifelse(`$1',,,` + setstroke + "1" at gco(1,5.5) above rjust + elarrow(120,40,-20,CH,2.75*lu,2.15*lu) + "2" at gco(2.0,4.5) above + i = -1 + for theta = 150 to 270 by 30 do { i = i+1 + V[i]: CH+(1.25*cosd(theta),0.65*sind(theta))*lu } + elarrow(60,-80,-20,CL,3.25*lu,2.35*lu,i) + "3" at gco(0,0) above rjust + elarrow(225,270,15,CL,3.25*lu,2.35*lu) ') + box invis wid 5*lu ht 6*lu with .sw at Origin]') + +define(`charT', +`[Origin: gco(0,0) `#' `charT' + ifelse(`$1',,,`grid(6,6)') + psset_(`arrows=c-c,linecolor=linegray') dnl + L1: line from gco(0,6)+(ft2,-ft2) to gco(6,6)+(-ft2,-ft2) + L2: line from gco(3,6)+(0,-ft2) to gco(3,0)+(0,ft2) + ifelse(`$1',,,` + stroke(from L1.start to L1.end chop lu/3, lu*0.75,1) + stroke(from L2.start to L2.end chop lu*2/3 chop lu/3,-lu*0.75,2) ') + box invis wid 6*lu ht 6*lu with .sw at Origin]') + +define(`charU', +`[Origin: gco(0,0) `#' `charU' + ifelse(`$1',,,`grid(6,6)') + psset_(`arrows=c-c,linecolor=linegray') dnl + v = (sqrt(2)-1)*4/3 + al = 2.5*lu-ft2 + bl = 2.0*lu-ft2/2 + CL: gco(2.5,4.0)+(0,-bl) + E: ellipse ht 2*bl wid 2*al thick 0.3 ifelse(`$1',,invis,dashed) at CL + L1: line from (E.w,gco(0,6)+(ft2,-ft2)) to E.w + L2: line from (E.e,L1.start) to E.e + spline v to (E.e,E.s) then to (E.w,E.s) then to E.w + ifelse(`$1',,,` + stroke(from L2.start to L2.end chop lu/3, lu*0.75,2) + stroke(from L1.start to L1.end chop lu/3,-lu*0.75,1) + "3" at gco(-.5,1.5) + spline v -> from gco(-0.4,0.75) to gco(-0.2,-0.65) then to gco(5.65,-0.65) \ + then to gco(5.65,2) ') + box invis wid 5*lu ht 6*lu with .sw at Origin]') + +define(`charV', +`[Origin: gco(0,0) `#' `charV' + ifelse(`$1',,,`grid(6,6)') + psset_(`arrows=c-c,linecolor=linegray') dnl + L1: line from gco(0,6)+(ft2,-ft2) to gco(3,0)+(0,ft2) + L2: line to gco(6,6)+(-ft2,-ft2) + ifelse(`$1',,,` + stroke(from L1.start to L1.end chop lu,-lu*0.75,1) + stroke(from L2.end to L2.start chop lu, lu*0.75,2) ') + box invis wid 6*lu ht 6*lu with .sw at Origin]') + +define(`charW', +`[Origin: gco(0,0) `#' `charW' + ifelse(`$1',,,`grid(8,6)') + psset_(`arrows=c-c,linecolor=linegray') dnl + L1: line from gco(0,6)+(ft2,-ft2) to gco(2,0)+(0,ft2) + L2: line from gco(4,6)+(0,-ft2) to L1.end + L3: line from L2.start to gco(6,0)+(0,ft2) + L4: line from gco(8,6)+(-ft2,-ft2) to L3.end + ifelse(`$1',,,` + stroke(from L1.start to L1.end chop lu*1.5 chop lu*.5,-lu*0.75,1) + stroke(from L2.start to L2.end chop lu*.75 chop lu*1.5,-lu*0.75,2) + stroke(from L3.start to L3.end chop lu*2 chop lu*.5,-lu*0.75,3) + stroke(from L4.start to L4.end chop lu*.75 chop lu*1.5,-lu*0.75,4) ') + box invis wid 8*lu ht 6*lu with .sw at Origin]') + +define(`charX', +`[Origin: gco(0,0) `#' `charX' + ifelse(`$1',,,`grid(6,6)') + psset_(`arrows=c-c,linecolor=linegray') dnl + L1: line from gco(0.5,6)+(ft2,-ft2) to gco(6,0)+(-ft2,ft2) + L2: line from gco(5.5,6)+(-ft2,-ft2) to gco(0,0)+(ft2,ft2) + ifelse(`$1',,,` + stroke(from L1.start to L1.end chop lu, lu*0.75,1) + stroke(from L2.start to L2.end chop lu,-lu*0.75,2) ') + box invis wid 6*lu ht 6*lu with .sw at Origin]') + +define(`charY', +`[Origin: gco(0,0) `#' `charY' + ifelse(`$1',,,`grid(6,6)') + psset_(`arrows=c-c,linecolor=linegray') dnl + L1: line from gco(0,6)+(ft2,-ft2) to gco(3,3)+(0,ft2) + L2: line from gco(6,6)+(-ft2,-ft2) to L1.end + L3: line to gco(3,0)+(0,ft2) + ifelse(`$1',,,` + stroke(from L1.start to L1.end chop lu, lu*0.75,1) + stroke(from L2.start to L2.end chop lu,-lu*0.75,2) + stroke(from L3.start to L3.end chop lu/3,-lu*0.75,3) ') + box invis wid 6*lu ht 6*lu with .sw at Origin]') + +define(`charZ', +`[Origin: gco(0,0) `#' `charZ' + ifelse(`$1',,,`grid(6,6)') + psset_(`arrows=c-c,linecolor=linegray') dnl + L1: line from gco(0.5,6)+(ft2,-ft2) to gco(5,6)+(-ft2,-ft2) + L2: line to gco(0,0)+(ft2,ft2) + L3: line to gco(5,0)+(-ft2,ft2) + ifelse(`$1',,,` + stroke(from L1.start to L1.end chop lu/3, lu*0.75,1) + stroke(from L2.start to L2.end chop 1.5*lu chop lu,-lu*0.75,2) + stroke(from L3.start to L3.end chop lu/3,-lu*0.75,3) ') + box invis wid 5*lu ht 6*lu with .sw at Origin]') + +define(`char1', +`[Origin: gco(0,0) `#' `char1' + ifelse(`$1',,,`grid(1,6)') + psset_(`arrows=c-c,linecolor=linegray') dnl + L1: line from gco(0,6)+(ft2,-ft2) to gco(0,0)+(ft2,ft2) + ifelse(`$1',,,` + stroke(from L1.start to L1.end chop lu/3, lu*0.75,1) ') + box invis wid 2*ft2 ht 6*lu with .sw at Origin]') + +define(`char2', +`[Origin: gco(0,0) `#' `char2' + ifelse(`$1',,,`grid(6,6)') + psset_(`arrows=c-c,linecolor=linegray') dnl + ah = 2.0*lu-ft2 + bh = 1.4*lu-ft2/2 + CH: gco(2.5,3.2)+(0,bh) + ifelse(`$1',,,`ellipse ht 2*bh wid 2*ah thick 0.3 dashed at CH') + al = 2.5*lu-ft2 + bl = 1.6*lu-ft2/2 + CL: gco(2.5,3.2)+(0,-bl) + ifelse(`$1',,,`ellipse ht 2*bl wid 2*al thick 0.3 dashed at CL') + i = 0 + V[i]: CH+(ah*cosd(160),bh*sind(160)) + for theta = 150 to -90+22.5 by -22.5 do { i = i+1 + V[i]: CH+(ah*cosd(theta),bh*sind(theta)) } + fitcurve(V,i) + v = (sqrt(2)-1)*4/3 + spline v from V[i] to gco(2.8,3.0) then \ + to gco(1.5,2.6) then to gco(0,1.2)+(ft2,0) then to gco(0,0)+(ft2,ft2) + psset_(`arrows=c-c') dnl + L2: line to gco(5,0)+(-ft2,ft2) + ifelse(`$1',,,` + setstroke + "1" at gco(1,5.5) above rjust + i = -1 + for theta = 120 to -60 by -20 do { i = i+1 + V[i]: CH+(2.75*cosd(theta),2.15*sind(theta))*lu } + i=i+1; V[i]: gco(2.6,2.1) + i=i+1; V[i]: gco(1.3,1.6) + i=i+1; V[i]: gco(0.95,0.5) + v = (sqrt(2)-1)*4/3 + spline v -> from V[0] to V[1] + for n = 2 to i do { continue to V[n] } + stroke(from L2.start to L2.end chop lu/3,-lu*0.75,2) ') + box invis wid 5*lu ht 6*lu with .sw at Origin]') + +define(`char3', +`[Origin: gco(0,0) `#' `char3' + ifelse(`$1',,,`grid(6,6)') + psset_(`arrows=c-c,linecolor=linegray') dnl + ah = 2.0*lu-ft2 + bh = 1.4*lu-ft2/2 + CH: gco(2.5,3.2)+(0,bh) + H: ellipse ht 2*bh wid 2*ah thick 0.3 ifelse(`$1',,invis,dashed) at CH + al = 2.5*lu-ft2 + bl = 1.6*lu-ft2/2 + CL: gco(2.5,3.2)+(0,-bl) + L: ellipse ht 2*bl wid 2*al thick 0.3 ifelse(`$1',,invis,dashed) at CL + i = 0 + V[i]: CH+(ah*cosd(160),bh*sind(160)) + for theta = 150 to -90 by -20 do { i = i+1 + V[i]: CH+(ah*cosd(theta),bh*sind(theta)) } + fitcurve(V,i) + line from H.s to (gco(2,3)+(ft2,0),H.s) + i = -1 + for theta = 90 to -135 by -22.5 do { i = i+1 + V[i]: CL+(al*cosd(theta),bl*sind(theta)) } + i = i+1 + V[i]: gco(0,1)+(ft2,0) + fitcurve(V,i) + ifelse(`$1',,,` + setstroke + "1" at gco(1,5.5) above rjust + elarrow(120,-20,-20,CH,2.75*lu,2.15*lu) + "2" at gco(4.6,3.5) + elarrow(40,-80,-10,CL,3.25*lu,2.35*lu) + "3" at gco(0,0) above rjust + i = 0 + V[i]: CL+(3.25*cosd(220),2.35*sind(220))*lu + elarrow(240,270,15,CL,3.25*lu,2.35*lu,0) ') + box invis wid 5*lu ht 6*lu with .sw at Origin]') + +define(`char4', +`[Origin: gco(0,0) `#' `char4' + ifelse(`$1',,,`grid(6,6)') + psset_(`arrows=c-c,linecolor=linegray') dnl + L1: line from gco(4,6)+(-ft2,-ft2) to gco(4,0)+(-ft2,ft2) + L2: line from L1.start to gco(0,1.5)+(ft2,-ft2) + L3: line to (gco(5,1.5)+(-ft2,0),Here) + ifelse(`$1',,,` + stroke(from L1.start to L1.end chop lu/3 chop 0, lu*.75,1) + stroke(from L2.start to L2.end chop lu chop lu/3,-lu*.75,2) + stroke(from L3.start to L3.end chop lu/3 chop lu/2,-lu*.75,3) ') + box invis wid 5*lu ht 6*lu with .sw at Origin]') + +define(`char5', +`[Origin: gco(0,0) `#' `char5' + ifelse(`$1',,,`grid(6,6)') + psset_(`arrows=c-c,linecolor=linegray') dnl + L1: line from gco(.5,6)+(0,-ft2) to gco(.5,3) + L4: line from L1.start to gco(4.5,6)+(-ft2,-ft2) + al = 2.5*lu-ft2 + bl = 2.0*lu-ft2/2 + CL: gco(2.5,4.0)+(0,-bl) + i = 0 + V[i]: L1.end + for theta = 125 to -135 by -25 do { i = i+1 + V[i]: CL+(al*cosd(theta),bl*sind(theta)) } + i = i+1 + V[i]: gco(0,1)+(ft2,0) + fitcurve(V,i) + ifelse(`$1',,,` + stroke(from L1.start to L1.end chop lu/3 chop 0,-lu*.75,1) + stroke(from L4.start to L4.end chop lu/3 chop 0, lu*.75,4) + v = (sqrt(2)-1)*4/3 + "2" at gco(1.0,4.0) above + elarrow(110,-80,-10,CL,al+lu*.75,bl+lu*.75) + "3" at gco(0,0) above rjust + i = 0 + V[i]: CL+((al+0.75*lu)*cosd(220),(bl+.75*lu)*sind(220)) + elarrow(240,270,15,CL,al+lu*.75,bl+lu*.75,0) ') + box invis wid 5*lu ht 6*lu with .sw at Origin]') + +define(`char6', +`[Origin: gco(0,0) `#' `char6' + ifelse(`$1',,,`grid(6,6)') + psset_(`arrows=c-c,linecolor=linegray') dnl + ab = 2.5*lu-ft2 + bb = 3.0*lu-ft2 + Cb: gco(2.5,3.0) + ifelse(`$1',,,`ellipse ht 2*bb wid 2*ab thick 0.3 dashed at Cb') + i = -1 + for theta = -315 to 180-22.5 by 22.5 do { i = i+1 + if (theta<=-90) then {X:Cb; x=ab; y=bb } \ + else {X: gco(2.5,2); x=ab; y=2*lu-ft2 } + V[i]: X+(x*cosd(theta),y*sind(theta)) } + fitcurve(V,i) + v = (sqrt(2)-1)*4/3 + ifelse(`$1',,,` + setstroke + "1" at gco(2,6) above + x = ab+lu*.75; y = bb+lu*.75 + elarrow(90+22.5,270+22.5,22.5,Cb,x,y) + "3" at gco(3,6) above + elarrow(70,45,-12.5,Cb,x,y) + "2" at gco(1.2,3.8) above + elarrow(100,-50,-10,gco(2.5,2),ab+lu*.65,2*lu+lu*.65) ') + box invis wid 5*lu ht 6*lu with .sw at Origin]') + +define(`char7', +`[Origin: gco(0,0) `#' `char7' + ifelse(`$1',,,`grid(6,6)') + psset_(`arrows=c-c,linecolor=linegray') dnl + L1: line from gco(0,6)+(ft2,-ft2) to gco(5,6)+(-ft2,-ft2) + { L1t: line invis to gco(1.3,0) + L2t: line invis up lu from gco(2,0)+(-ft2,0) } + psset_(`arrows=-') dnl + arcto(Intersect_(L1t,L2t),L2t.start,2.5*lu) + line to (Here,gco(2,0)) + ifelse(`$1',,,` + stroke(from L1.start to L1.end chop lu/3, lu*0.75,1) + stroke(from L1t.start to 4th last line.end chop lu/3 chop 0, + lu*.75,2,thick 0.3,L1) + L2: line <- up arrowht from gco(2.75,0)+(-ft2,ft2) + move to L1.end + arcto(Intersect_(L1,L2),L2.start,(2.5-0.75)*lu,thick 0.3) ') + box invis wid 5*lu ht 6*lu with .sw at Origin]') + +define(`char8', +`[Origin: gco(0,0) `#' `char8' + ifelse(`$1',,,`grid(6,6)') + psset_(`arrows=c-c,linecolor=linegray') dnl + ah = 2.0*lu + bh = 1.4*lu + CH: gco(2.5,6)+(0,-bh) + H: ellipse ht 2*bh wid 2*ah at CH + al = 2.5*lu + bl = 1.6*lu+ft2/2 + CL: gco(2.5,3.2)+(0,ft2)+(0,-bl) + L: ellipse ht 2*bl wid 2*al at CL + ifelse(`$1',,,` + setstroke + x = ah+lu*.75; y = bh+lu*.75 + "1" at gco(2,6) above + elarrow(110,205,15,CH,x,y) + "2" at gco(3,6) above + elarrow(70,-25,-15,CH,x,y) + x = al+lu*.75; y = bl+lu*.75 + "3" at gco(0.2,2.6) above + elarrow(150,260,10,CL,x,y) + "4" at gco(4.8,2.6) above + elarrow(30,-80,-10,CL,x,y) ') + box invis wid 5*lu ht 6*lu with .sw at Origin]') + +define(`char9', +`[Origin: gco(0,0) `#' `char9' + ifelse(`$1',,,`grid(6,6)') + psset_(`arrows=c-c,linecolor=linegray') dnl + ab = 2.5*lu-ft2 + bb = 3.0*lu-ft2 + Cb: gco(2.5,3.0) + ifelse(`$1',,,`ellipse ht 2*bb wid 2*ab thick 0.3 dashed at Cb') + i = -1 + for theta = -135 to 360-22.5 by 22.5 do { i = i+1 + if (theta<=90) then {X:Cb; x=ab; y=bb } \ + else {X: gco(2.5,4); x=ab; y=2*lu-ft2 } + V[i]: X+(x*cosd(theta),y*sind(theta)) } + fitcurve(V,i) + ifelse(`$1',,,` + setstroke + "1" at gco(2,6) above + elarrow(90+22.5,270+22.5,22.5,X,3.15*lu-ft2,2.65*lu-ft2) + "2" at gco(3,6) above + elarrow(80,-80,-10,Cb,ab+lu*.65,bb+lu*.65) + "3" at gco(0,1) + elarrow(225,270,15,Cb,3.15*lu,3.65*lu) ') + box invis wid 5*lu ht 6*lu with .sw at Origin]') + +define(`char0', +`[Origin: gco(0,0) `#' `char0' + ifelse(`$1',,,`grid(6,6)') + psset_(`arrows=c-c,linecolor=linegray') dnl + ab = 2.5*lu-ft2 + bb = 3.0*lu-ft2 + Cb: gco(2.5,3.0) + ellipse ht 2*bb wid 2*ab at Cb + ifelse(`$1',,,` + setstroke + "1" at gco(2,6) above + elarrow(90+22.5,270,22.5,Cb,.65*lu+ab,.65*lu+bb) + "2" at gco(3,6) above + elarrow(70,-80,-10,Cb,ab+lu*.65,bb+lu*.65) ') + box invis wid 5*lu ht 6*lu with .sw at Origin]') + +define(`charAnd', +`[Origin: gco(0,0) `#' `fAnd' + ifelse(`$1',,,`grid(5,6)') + psset_(`arrows=c-c,linecolor=linegray') dnl + v = (sqrt(2)-1)*4/3 + spline v from gco(5,0)+(-ft2,ft2) \ + to gco(4.605,0.312) to gco(1.443,4.038) \ + to gco(1.335,4.198) to gco(1.134,4.597) to gco(1.103,4.938) \ + to gco(1.143,5.252) to gco(1.358,5.605) to gco(1.702,5.797) \ + to gco(2.236,5.857) to gco(2.637,5.772) to gco(2.981,5.499) \ + to gco(3.157,5.132) to gco(3.087,4.565) to gco(2.746,4.189) \ + to gco(2.415,3.895) to gco(2.009,3.621) to gco(1.522,3.339) \ + to gco(1.157,3.095) to gco(0.671,2.769) to gco(0.435,2.520) \ + to gco(0.227,2.215) to gco(0.101,1.636) to gco(0.234,1.165) \ + to gco(0.373,0.926) to gco(0.512,0.738) to gco(0.918,0.443) \ + to gco(1.190,0.340) to gco(1.427,0.274) to gco(2.140,0.166) \ + to gco(2.617,0.164) to gco(3.031,0.216) to gco(3.616,0.395) \ + to gco(4.017,0.600) to gco(4.121,0.676) to gco(4.482,1.017) \ + to gco(4.637,1.302) to gco(4.753,1.532) to gco(4.863,1.875) + ifelse(`$1',,,` + setstroke + "1" at gco(1.4,6) above + spline -> from gco(1.0,6.2) to gco(.35,5.5) then to gco(.35,4) \ + then to gco(4.0,0) + "2" at gco(2.6,6) above + spline -> from gco(3.0,6.2) to gco(3.75,5.5) then to gco(3.75,3.9) \ + then to gco(1,2.4) then to gco(1,1.1) then to gco(2,.9) + "3" at gco(4.2,2.4) + spline -> from gco(4.1,1.8) to gco(3.8,1.3) then to gco(3,.9) \ + then to gco(2.2,.9) ') + box invis wid 5*lu ht 6*lu with .sw at Origin]') + +define(`charComma', +` circle fill_(0) rad ft2 at Here+(0,-3*lu+ft2) + move to last circle.c + arc cw from Here+(0,ft2) to Here+(0,-4*ft2) \ + with .c at Here+(-ft2,-1.5*ft2) + move to last circle+(ft2,-ft2+3*lu)') + +define(`charPeriod', +` circle fill_(0) rad ft2 at Here+(0,-3*lu+ft2) + move to last circle+(ft2,-ft2+3*lu)') + +define(`chara', +`[Origin: gco(0,0) `#' `chara' + psset_(`arrows=c-c,linecolor=linegray') dnl + circle rad 2*lu-ft2 with .c at gco(2,2) + L3: line from gco(4,4)+(-ft2,-ft2) to gco(4,0)+(-ft2,ft2) + ifelse(`$1',,,` + setstroke + "1" at gco(1.5,3.0) + arcd(gco(2,2),1.2*lu,130,265) -> + "2" at gco(2.5,3.0) + arcd(gco(2,2),1.2*lu,50,-85) -> cw + stroke(from L3.start to L3.end chop lu/3 chop 0,lu*0.5,3) ') + box invis wid 4*lu ht 4*lu with .sw at Origin]') + +define(`charb', +`[Origin: gco(0,0) `#' `charb' + psset_(`arrows=c-c,linecolor=linegray') dnl + circle rad 2*lu-ft2 with .c at gco(2,2) + L1: line from gco(0,6)+(ft2,-ft2) to gco(0,0)+(ft2,ft2) + ifelse(`$1',,,` + setstroke + stroke(from L1.start to L1.end chop lu/3 chop 0,lu*0.5,1) + "2" at gco(1.5,3.0) + arcd(gco(2,2),1.2*lu,130,265) -> + "3" at gco(2.5,3.0) + arcd(gco(2,2),1.2*lu,50,-85) -> cw ') + box invis wid 4*lu ht 6*lu with .sw at Origin]') + +define(`charc', +`[Origin: gco(0,0) `#' `charc' + ifelse(`$1',,, + `circle outlined "linegray" rad 2*lu-ft2 thick 0.3 dashed lu/2 at gco(2,2)') + psset_(`linecolor=linegray') dnl + arcr(gco(2,2),2*lu-ft2,atan2(1.7,1),atan2(-1,1.6)) + ifelse(`$1',,,` + setstroke + "1" at gco(1.5,3.0) + arcd(gco(2,2),1.2*lu,130,-45) -> + "2" at gco(2.5,3.0) + arcd(gco(2,2),1.2*lu,50,20) -> cw ht 0.75 * arrowht ') + box invis wid 4*lu ht 4*lu with .sw at Origin]') + +define(`chard', +`[Origin: gco(0,0) `#' `chard' + psset_(`arrows=c-c,linecolor=linegray') dnl + circle rad 2*lu-ft2 with .c at gco(2,2) + L3: line from gco(4,6)+(-ft2,-ft2) to gco(4,0)+(-ft2,ft2) + ifelse(`$1',,,` + setstroke + "1" at gco(1.5,3.0) + arcd(gco(2,2),1.2*lu,130,265) -> + "2" at gco(2.5,3.0) + arcd(gco(2,2),1.2*lu,50,-85) -> cw + stroke(from L3.start to L3.end chop lu/3 chop 0,lu*0.5,3) ') + box invis wid 4*lu ht 6*lu with .sw at Origin]') + +define(`chare', +`[Origin: gco(0,0) `#' `chare' + ifelse(`$1',,, + `circle outlined "linegray" rad 2*lu-ft2 thick 0.3 dashed lu/2 at gco(2,2)') + psset_(`linecolor=linegray') dnl + arcr(gco(2,2),2*lu-ft2,atan2(0.2,2),atan2(-1,1.6)) + L3: line from last arc.start to (gco(0.2,0).x, last arc.start.y) + ifelse(`$1',,,` + setstroke + "1" at gco(1.5,3.0) + arcd(gco(2,2),1.2*lu,130,-45) -> + "2" at gco(2.5,3.0) + arcd(gco(2,2),1.2*lu,50,20) -> cw ht 0.75 * arrowht ') + stroke(from L3.end to L3.start chop lu*1.5 chop lu/3,-lu*0.5,3) + box invis wid 4*lu ht 4*lu with .sw at Origin]') + +define(`charf', +`[Origin: gco(0,0) `#' `charf' + psset_(`arrows=c-c,linecolor=linegray') dnl + L3: line from gco(0,4)+(ft2,0) to gco(2,4)+(-ft2,0) + L1: line from gco(1,0)+(0,ft2) to gco(1,4.8) + psset_(`linecolor=linegray') dnl + arc cw to gco(3,5.5)+(0,0) with .c at gco(2.12,4.8) + ifelse(`$1',,,` + setstroke + stroke(from L1.end to L1.start chop -lu/5 chop lu/3,-lu*0.75,1) + "2" at gco(1.5,4.6) + arcd(gco(2.12,4.8),0.6*lu,140,40) -> cw ht 0.75 * arrowht + stroke(from L3.start to L3.end chop lu*.5 chop 0,-lu*0.75,3) ') + box invis wid 3*lu ht 6*lu with .sw at Origin]') + +define(`charg', +`[Origin: gco(0,0) `#' `charg' + ifelse(`$1',,, + `circle outlined "linegray" rad 2*lu-ft2 thick 0.3 dashed lu/2 at gco(2,0) ') + psset_(`arrows=c-c,linecolor=linegray') dnl + circle rad 2*lu-ft2 with .c at gco(2,2) + L3: line from gco(4,4)+(-ft2,-ft2) to gco(4,0)+(-ft2,0) + psset_(`linecolor=linegray') dnl + arcr(gco(2,0),2*lu-ft2,0,atan2(-1,-1.5)) cw + ifelse(`$1',,,` + setstroke + "1" at gco(1.5,3.0) + arcd(gco(2,2),1.2*lu,130,265) -> + "2" at gco(2.5,3.0) + arcd(gco(2,2),1.2*lu,50,-85) -> cw + "4" at gco(0.7,-0.6) + arcd(gco(2,0),1.2*lu,-135,-45) -> ht 0.75 * arrowht + stroke(from L3.start to L3.end chop lu*0 chop 0,lu*0.5,3) ') + box invis wid 4*lu ht 6*lu with .sw at gco(0,-2)]') + +define(`charh', +`[Origin: gco(0,0) `#' `charh' + ifelse(`$1',,, + `circle outlined "linegray" rad 2*lu-ft2 thick 0.3 dashed lu/2 at gco(2,2) ') + psset_(`linecolor=linegray') dnl + arcd(gco(2,2),2*lu-ft2,180,0) cw + psset_(`arrows=c-c,linecolor=linegray') dnl + line to gco(4,0)+(-ft2,ft2) + L1: line from gco(0,6)+(ft2,-ft2) to gco(0,0)+(ft2,ft2) + ifelse(`$1',,,` + setstroke + stroke(from L1.start to L1.end chop lu/3 chop 0,lu*0.5,1) + "2" at gco(1.0,2.4) + arcd(gco(2,2),1.2*lu,130,0) cw + stroke(to (Here,gco(0,0)) chop -3pt__ chop lu/4) ') + box invis wid 4*lu ht 6*lu with .sw at Origin]') + +define(`chari', +`[Origin: gco(0,0) `#' `chari' + psset_(`arrows=c-c,linecolor=linegray') dnl + L1: line from gco(0,0)+(ft2,ft2) to gco(0,4)+(ft2,-ft2) + L2: line from gco(0,6)+(ft2,-ft2) to gco(0,5.5)+(ft2,0) + ifelse(`$1',,,` + setstroke + stroke(from L2.start to L2.end+(0,-lu*.2) chop -lu*.7 chop 0,-lu*0.5,) + "2" at last line.c+(0.1*lu,-0.2*lu) rjust + stroke(from L1.end to L1.start chop lu/3 chop 0,-lu*0.5,1) ') + box invis wid ft2*2 ht 6*lu with .sw at Origin]') + +define(`charj', +`[Origin: gco(0,0) `#' `charj' + psset_(`arrows=c-c,linecolor=linegray') dnl + L2: line from gco(2,6)+(0,-ft2) to gco(2,5.5) + L1: line from gco(2,4)+(0,-ft2) to gco(2,-0.8) + psset_(`linecolor=linegray') dnl + arc cw to gco(0,-1.5) with .c at gco(0.88,-0.8) + ifelse(`$1',,,` + setstroke + stroke(from L1.start to L1.end chop lu/3 chop 0,-lu*0.5,1,solid) + arcd(gco(0.88,-0.8),.62*lu,0,-135) cw -> ht 0.75*arrowht + stroke(from L2.start to L2.end+(0,-lu*.2) chop -lu*.7 chop 0,-lu*0.5,) + "2" at last line.c+(0.1*lu,-0.2*lu) rjust ') + box invis wid 2*lu ht 6*lu with .sw at Origin+(0,-2*lu)]') + +define(`chark', +`[Origin: gco(0,0) `#' `chark' + psset_(`arrows=c-c,linecolor=linegray') dnl + L1: line from gco(0,6)+(ft2,-ft2) to gco(0,0)+(ft2,ft2) + L2: line from gco(3.4,4)+(0,-ft2) to gco(0,1.6)+(ft2,ft2) + L3t:line ifelse(`$1',,invis,dashed lu/2) thick 0.3 from gco(0,4)+(ft2,0) \ + to gco(4,0)+(-ft2,ft2) + L3: line from Intersect_(L2,L3t) to L3t.end + ifelse(`$1',,,` + setstroke + stroke(from L1.start to L1.end chop lu/3 chop 0,-lu*0.5,1) + stroke(from L2.start to L2.end chop lu/2 ,-lu*0.6,2) + stroke(from L3.start to L3.end chop lu/2 ,-lu*0.6,3) ') + box invis wid 4*lu ht 6*lu with .sw at Origin]') + +define(`charl', +`[Origin: gco(0,0) `#' `charl' + psset_(`arrows=c-c,linecolor=linegray') dnl + L1: line from gco(0,6)+(ft2,-ft2) to gco(0,0)+(ft2,ft2) + ifelse(`$1',,,` + setstroke + stroke(from L1.start to L1.end chop lu/3 chop 0,-lu*0.5,1) ') + box invis wid 2*ft2 ht 6*lu with .sw at Origin]') + +define(`charm', +`[Origin: gco(0,0) `#' `charm' + psset_(`arrows=c-c,linecolor=linegray') dnl + L1: line from gco(0,4)+(ft2,-ft2) to gco(0,0)+(ft2,ft2) + ifelse(`$1',,, + `circle outlined "linegray" rad 1.5*lu-ft2/2 thick 0.3 dashed lu/2 \ + at gco(1.5,2.5)+(ft2/2,0) + circle outlined "linegray" rad 1.5*lu-ft2/2 thick 0.3 dashed lu/2 \ + at gco(4.5,2.5)+(-ft2/2,0) ') + psset_(`linecolor=linegray') dnl + arcd(gco(1.5,2.5)+(ft2/2,0),1.5*lu-ft2/2,180,0) cw + arcd(gco(4.5,2.5)+(-ft2/2,0),1.5*lu-ft2/2,180,0) cw + psset_(`arrows=c-c,linecolor=linegray') dnl + line from gco(3,2.5) to gco(3,0)+(0,ft2) + line from gco(6,2.5)+(-ft2,0) to gco(6,0)+(-ft2,ft2) + ifelse(`$1',,,` + setstroke + stroke(from L1.start to L1.end chop lu/3 chop 0,-lu*0.5,1) + "2" at gco(0.9,2.2) + arcd(gco(1.5,2.5)+(ft2/2,0),0.75*lu-ft2/2,160,0) cw + stroke(to (Here,gco(0,0)) chop -3pt__ chop lu/3) + "3" at gco(3.9,2.2) + arcd(gco(4.5,2.5)+(-ft2/2,0),0.75*lu-ft2/2,160,0) cw + stroke(to (Here,gco(0,0)) chop -3pt__ chop lu/3) ') + box invis wid 6*lu ht 4*lu with .sw at Origin]') + +define(`charn', +`[Origin: gco(0,0) `#' `charn' + psset_(`arrows=c-c,linecolor=linegray') dnl + L1: line from gco(0,4)+(ft2,-ft2) to gco(0,0)+(ft2,ft2) + ifelse(`$1',,, + `circle outlined "linegray" rad 2*lu-ft2 thick 0.3 dashed lu/2 at gco(2,2) ') + psset_(`linecolor=linegray') dnl + arcd(gco(2,2),2*lu-ft2,180,0) cw + psset_(`arrows=c-c,linecolor=linegray') dnl + line from gco(4,2)+(-ft2,0) to gco(4,0)+(-ft2,ft2) + ifelse(`$1',,,` + setstroke + stroke(from L1.start to L1.end chop lu/3 chop 0,-lu*0.5,1) + "2" at gco(0.9,2.0) + arcd(gco(2,2),1.25*lu,150,0) cw + stroke(to (Here,gco(0,0)) chop -3pt__ chop lu/3) ') + box invis wid 4*lu ht 4*lu with .sw at Origin]') + +define(`charo', +`[Origin: gco(0,0) `#' `charo' + psset_(`arrows=c-c,linecolor=linegray') dnl + circle rad 2*lu-ft2 with .c at gco(2,2) + ifelse(`$1',,,` + setstroke + "1" at gco(1.5,3.0) + arcd(gco(2,2),1.2*lu,130,265) -> + "2" at gco(2.5,3.0) + arcd(gco(2,2),1.2*lu,50,-85) -> cw ') + box invis wid 4*lu ht 4*lu with .sw at Origin]') + +define(`charp', +`[Origin: gco(0,0) `#' `charp' + psset_(`arrows=c-c,linecolor=linegray') dnl + L1: line from gco(0,4)+(ft2,-ft2) to gco(0,-2)+(ft2,ft2) + circle rad 2*lu-ft2 with .c at gco(2,2) + ifelse(`$1',,,` + setstroke + stroke(from L1.start to L1.end chop lu/3 chop 0,-lu*0.5,1) + "2" at gco(1.5,3.0) + arcd(gco(2,2),1.2*lu,130,265) -> + "3" at gco(2.5,3.0) + arcd(gco(2,2),1.2*lu,50,-85) -> cw ') + box invis wid 4*lu ht 6*lu with .sw at Origin+(0,-2*lu)]') + +define(`charq', +`[Origin: gco(0,0) `#' `charq' + psset_(`arrows=c-c,linecolor=linegray') dnl + L1: line from gco(4,4)+(-ft2,-ft2) to gco(4,-2)+(-ft2,ft2) + circle rad 2*lu-ft2 with .c at gco(2,2) + ifelse(`$1',,,` + setstroke + stroke(from L1.start to L1.end chop lu/3 chop 0,lu*0.5,3) + "1" at gco(1.5,3.0) + arcd(gco(2,2),1.2*lu,130,265) -> + "2" at gco(2.5,3.0) + arcd(gco(2,2),1.2*lu,50,-85) -> cw ') + box invis wid 4*lu ht 6*lu with .sw at Origin+(0,-2*lu)]') + +define(`charr', +`[Origin: gco(0,0) `#' `charr' + psset_(`arrows=c-c,linecolor=linegray') dnl + L1: line from gco(0,4)+(ft2,-ft2) to gco(0,0)+(ft2,ft2) + psset_(`linecolor=linegray') dnl + arc cw from gco(0,3)+(ft2,0) to gco(2,3.85) rad 1.2*lu with .c at gco(1.5,2.5) + ifelse(`$1',,,` + setstroke + stroke(from L1.start to L1.end chop lu/3,-lu*0.5,1) + "2" at gco(.6,2) above + arcd(gco(1.5,2.5),0.75*lu,140,60) -> cw ht 0.75 * arrowht ') + box invis wid 2*lu ht 4*lu with .sw at Origin]') + +define(`chars', +`[Origin: gco(0,0) `#' `chars' + psset_(`arrows=c-c,linecolor=linegray') dnl + ah = 1.6*lu + bh = (4*lu-ft2-2.1*lu)/2 #0.95*lu-ft2/2 + CH: gco(2.0,2.1)+(0,bh) + ifelse(`$1',,,`ellipse ht 2*bh wid 2*ah thick 0.3 dashed lu/2 at CH') + al = 2.0*lu-ft2 + bl = (2.1*lu-ft2)/2 + CL: gco(2.0,2.1)+(0,-bl) + ifelse(`$1',,,`ellipse ht 2*bl wid 2*al thick 0.3 dashed lu/2 at CL') + i = -1 + for theta = 0 to 270 by 22.5 do { i = i+1 + V[i]: CH+(ah*cosd(theta),bh*sind(theta)) } + for theta = 90-22.5 to -180 by -22.5 do { i = i+1 + V[i]: CL+(al*cosd(theta),bl*sind(theta)) } + fitcurve(V,i) + ifelse(`$1',,,` + setstroke + "1" at gco(0.5,3.5) above + elarrow(120,40,-20,CH,(ah+.6*lu),(bh+.6*lu)) + "2" at gco(1.5,3.2) + i = -1 + for theta = 150 to 270 by 30 do { i = i+1 + V[i]: CH+(lu*cosd(theta),lu*0.5*sind(theta)) } + fitcurve(V,i) + r = V[i].y-CL.y + elarrow(60,-80,-20,CL,2.5*lu,r,i) + "3" at gco(-.3,.9) + elarrow(210,270,15,CL,2.5*lu,r) ') + box invis wid 4*lu ht 4*lu with .sw at Origin]') + +define(`chart', +`[Origin: gco(0,0) `#' `chart' + psset_(`arrows=c-c,linecolor=linegray') dnl + L1: line from gco(1,0)+(0,ft2) to gco(1,6)+(0,-ft2) + L2: line from gco(0,4)+(ft2,0) to gco(2,4)+(-ft2,0) + ifelse(`$1',,,` + setstroke + stroke(from L1.end to L1.start chop lu/3,-lu*0.75,1) + stroke(from L2.start to L2.end chop lu*.5 chop 0,-lu*0.75,2) ') + box invis wid 2*lu ht 6*lu with .sw at Origin]') + +define(`charu', +`[Origin: gco(0,0) `#' `charu' + psset_(`arrows=c-c,linecolor=linegray') dnl + L2: line from gco(4,4)+(-ft2,-ft2) to gco(4,0)+(-ft2,ft2) + ifelse(`$1',,, + `circle outlined "linegray" rad 2*lu-ft2 thick 0.3 dashed lu/2 at gco(2,2) ') + line from gco(0,4)+(ft2,-ft2) to gco(0,2)+(ft2,0) + psset_(`linecolor=linegray') dnl + arcd(gco(2,2),2*lu-ft2,180,0) + ifelse(`$1',,,` + setstroke + stroke(from L2.start to L2.end chop lu/3 chop 0,lu*0.5,2) + "1" at gco(.9,2.0) + arcd(gco(2,2),1.25*lu,210,-30) -> ') + box invis wid 4*lu ht 4*lu with .sw at Origin]') + +define(`charv', +`[Origin: gco(0,0) `#' `charv' + psset_(`arrows=c-c,linecolor=linegray') dnl + L1: line from gco(0,4)+(ft2,-ft2) to gco(2,0)+(0,ft2) + L2: line to gco(4,4)+(-ft2,-ft2) + ifelse(`$1',,,` + setstroke + stroke(from L1.start to L1.end chop lu chop lu/3,-lu*0.5,1) + stroke(from L2.end to L2.start chop lu*.6,-lu*0.5,2) ') + box invis wid 4*lu ht 4*lu with .sw at Origin]') + +define(`charw', +`[Origin: gco(0,0) `#' `charw' + psset_(`arrows=c-c,linecolor=linegray') dnl + L1: line from gco(0,4)+(ft2,-ft2) to gco(1.5,0)+(0,ft2) + L2: line to gco(3,4)+(0,-ft2) + L3: line to gco(4.5,0)+(0,ft2) + L4: line to gco(6,4)+(-ft2,-ft2) + ifelse(`$1',,,` + setstroke + stroke(from L1.start to L1.end chop lu chop lu/3,-lu*0.5,1) + stroke(from L2.end to L2.start chop lu*.6 chop lu,-lu*0.5,2) + stroke(from L3.start to L3.end chop lu*1.5 chop lu/3,-lu*0.5,3) + stroke(from L4.end to L4.start chop lu*.6 chop lu,-lu*0.5,4) ') + box invis wid 6*lu ht 4*lu with .sw at Origin]') + +define(`charx', +`[Origin: gco(0,0) `#' `charx' + psset_(`arrows=c-c,linecolor=linegray') dnl + L1: line from gco(0.5,4)+(0,-ft2) to gco(4,0)+(-ft2,ft2) + L2: line from gco(3.5,4)+(0,-ft2) to gco(0,0)+(ft2,ft2) + ifelse(`$1',,,` + setstroke + stroke(from L1.start to L1.end chop lu/3,-lu*0.6,1) + stroke(from L2.start to L2.end chop lu/3,lu*0.6,2) ') + box invis wid 4*lu ht 4*lu with .sw at Origin]') + +define(`chary', +`[Origin: gco(0,0) `#' `chary' + psset_(`arrows=c-c,linecolor=linegray') dnl + L1: line from gco(0,4)+(ft2,-ft2) to gco(2,0)+(0,ft2) + L2x: gco(4,4)+(-ft2,-ft2) + L2: line from L2x to 1.37<L2x,L1.end> + C: Here-(perp(L2))/lin_leng(L2)*lu*1.1 + psset_(`linecolor=linegray') dnl + arcd(C,lu*1.1,-30,-105) cw + ifelse(`$1',,,` + setstroke + stroke(from L1.start to L1.end chop lu chop lu/2,-lu*0.5,1) + stroke(from L2.start to L2.end chop lu*.6 chop 0,-lu*0.5,2,solid) + arcd(C,lu*.6,-30,-110) cw -> ht 0.75*arrowht ') + box invis wid 4*lu ht 6*lu with .sw at Origin+(0,-2*lu)]') + +define(`charz', +`[Origin: gco(0,0) `#' `charz' + psset_(`arrows=c-c,linecolor=linegray') dnl + L1: line from gco(0.5,4)+(ft2,-ft2) to gco(4,4)+(-ft2,-ft2) + L2: line to gco(0,0)+(ft2,ft2) + L3: line to gco(4,0)+(-ft2,ft2) + ifelse(`$1',,,` + setstroke + stroke(from L1.start to L1.end chop lu/3 chop lu,-lu*0.6,1) + stroke(from L2.start to L2.end chop lu,lu*0.6,2) + stroke(from L3.start to L3.end chop lu/3,-lu*0.6,3) ') + box invis wid 4*lu ht 4*lu with .sw at Origin]') + +define(`xpnd',$*) +define(`Letters', + `ifelse(`$1',,,` + ifelse(substr(`$1',0,1),|,`charComma',substr(`$1',0,1),.,`charPeriod', + `xpnd(char`'substr(`$1',0,1))') + ifelse(substr(`$1',1,1),,,`move lu*.75/2*(')ifelse(substr(`$1',1,1),,, + substr(`$1',1,1),8,17,substr(`$1',1,1),6,16,A`'substr(`$1',1,1),A ,3, + substr(`$1',1,1))ifelse(substr(`$1',1,1),,,`-1)') + Letters(substr(`$1',2)) ') ') + +divert(0)dnl diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/Makefile b/Master/texmf-dist/doc/latex/circuit-macros/examples/Makefile index fd8ab4ea497..b6ccbe29426 100644 --- a/Master/texmf-dist/doc/latex/circuit-macros/examples/Makefile +++ b/Master/texmf-dist/doc/latex/circuit-macros/examples/Makefile @@ -15,8 +15,8 @@ # To test the file test.m4, type "make tst" if boxdims is used, otherwise # type "make tst1". In either case the file tst.ps is created. # -# There are a few extra examples in this directory. Process them one -# at a time, or type "make extras.pdf" +# There are more examples in the extras directory. Go to that +# directory and process them one at a time, or type "make". # # To debug a single diagram in a directory other than this examples # directory, copy this makefile and tst.tex to where you want to work, @@ -78,7 +78,8 @@ TEXPICS = \ Quantum.tex quick.tex \ random.tex Rectifiers.tex recycle.tex relaycoil.tex Relay.tex \ Resistors.tex Rotbox.tex \ - Schottky.tex sfg.tex shapes.tex ShiftR.tex Sierpinski.tex Sixpole.tex \ + Schottky.tex sfg.tex shadowed.tex shapes.tex ShiftR.tex Sierpinski.tex \ + Sixpole.tex \ Smithchart.tex Sources.tex SQUID.tex Switches.tex \ Tgate.tex Three.tex thyristor.tex TTLnand.tex Tubediags.tex \ UNO.tex ujt.tex Variable.tex Windings.tex worm.tex Xform.tex XOR.tex @@ -127,6 +128,8 @@ LTXFILE=printf "|documentclass[11pt]{article}\n\ .m4.tex: @touch $(DIMFILE) F_$*.dim $(M4) $(CONF) $(DIMFILE) F_$*.dim $*.m4 | $(PIC) $(MODE) > $*.tex +# $(M4) $(CONF) $(DIMFILE) F_$*.dim $*.m4 > $*.pic +# $(PIC) $(MODE) $*.pic > $*.tex .m4.dvi: @touch $(DIMFILE) F_$*.dim $(M4) pstricks.m4 $(DIMFILE) F_$*.dim $*.m4 | $(PIC) -p > $*.tex @@ -209,16 +212,16 @@ $(DOC).pdf: clean pdfmode $(DOC).tex files.tex header.tex rose.pdf: rose.m4 m4 pdf.m4 rose.m4 | dpic -d > rose.pdf -paletteDPV.svg: paletteDPV.m4 - m4 svg.m4 paletteDPV.m4 | dpic -v > paletteDPV.svg - keyboard.svg: keyboard.m4 m4 svg.m4 keyboard.m4 | dpic -v > keyboard.svg keyboard.pdf: keyboard.svg - convert keyboard.svg keyboard.pdf + -conv=`which convert` ; if test "`basename $$conv`" = "convert" ; then \ + convert keyboard.svg keyboard.pdf ; \ + else printf '.PS\n "keyboard.pdf requires imagemagick convert"\n.PE\n' \ + | dpic -d > keyboard.pdf ; fi -pics: $(TEXPICS) rose.pdf keyboard.pdf +pics: rose.pdf keyboard.pdf $(TEXPICS) touch pics $(DOC).ps: psmode $(DOC).dvi @@ -264,43 +267,6 @@ gpic: echopics: @echo $(TEXPICS) -XTRASRC=printf "|documentclass[11pt]{article}\n\ -|usepackage[dvipsnames]{xcolor}\n\ -|usepackage{times,boxdims,siunitx,amssymb,tikz,geometry}\n\ -|geometry{margin=0.5cm}\n\ -|begin{document}\n" | $(BS) - -extras: - ( for file in `ls *.m4` ; do \ - fbase=`basename $$file .m4` ; \ - if test "`grep -L $$fbase files.tex`" = "files.tex" ; then \ - echo $$fbase ; \ - fi ; \ - done ) | sed -e '/Ball/d' \ - -e '/ASME_Y14-5/d' -e '/FlowchartDefs/d' -e '/tubedefs/d' \ - -e '/debug1/d' -e '/debug2/d' \ - -e '/paletteSVG/d' \ - -e '/Consumption/d' -e '/rotatetext/d' -e '/windows/d' \ - > extras - -XBOXDIMS = Chuck - -extras.pdf: extras - @$(XTRASRC) > extras.tex - touch extras.dim - -for file in `cat extras` ; do \ - $(M4) pgf.m4 extras.dim $$file.m4 | $(PIC) -g > $$file.tex ; \ - printf "\n|input{$$file.tex}\n" | $(BS) >> extras.tex ; \ - printf "\n $$file.m4\n |pagebreak\n" | $(BS) >> extras.tex ; \ - done - printf "\n|end{document}\n" | $(BS) >> extras.tex - pdflatex extras - -for file in $(XBOXDIMS) ; do \ - rm -f $$file.tex ; \ - $(M4) pgf.m4 extras.dim $$file.m4 | $(PIC) -g > $$file.tex ; \ - done - pdflatex extras - testall: (cd mf; make) (cd mpost; make) @@ -321,13 +287,11 @@ clobber: clean for file in `ls *.tex` ; do \ nm=`echo $$file | sed -e "s/\(.*\)\.tex/\1/"` ; \ if test -s $$nm.m4 ; then rm -f $$nm.pic $$nm.tex ; fi ; done + (cd dpv; make clobber) # @if test -f distmakefile ; then make -f distmakefile clobber ; fi clean: @printf "\n\n examples clean:\n\n" - -if test -f extras ; then \ - for file in `cat extras` ; do rm -f $$file.pic $$file.tex ; done ; fi - rm -f extras extras.* rm -f core boxdims.tar.gz pics rm -f *.dvi *.aux *.log *.toc *.blg *.eps *.tif *.epsi eps *-mfpic* *.svg rm -f fig*.tex $(TEXPICS) *.roff *.int *.pic gpic.m4 test.tex xxx* *.fig diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/MoreTable.m4 b/Master/texmf-dist/doc/latex/circuit-macros/examples/MoreTable.m4 index ef8cd718249..3d90b71eb43 100644 --- a/Master/texmf-dist/doc/latex/circuit-macros/examples/MoreTable.m4 +++ b/Master/texmf-dist/doc/latex/circuit-macros/examples/MoreTable.m4 @@ -1,15 +1,44 @@ .PS -# MoreTable.m4 +# heater.m4 cct_init +Heater: [ + movewid = 2 pt__ + hm = 2.05 + right_ +{ + {lamp ; move; "`{\tt lamp}'" ljust} + move right_ 1.5 + {lamp(,T) ; move;"`{\tt lamp(,T)}'" ljust} + move right_ 1.25 + {thermocouple ; move;" `{\tt thermocouple}'" ljust } + move right_ hm + {thermocouple(,,,T) ; move; "`{\tt thermocouple(,{,},T)}'" ljust } + } + move down 0.4; right_ +{ + {heater; move;"`{\tt heater}'" ljust} + move right_ hm + {heater(,,,,E); move;"`{\tt heater(,{,},{,}E)}'" ljust} + move right_ hm+0.4 + {heater(,,,,ET); move;"`{\tt heater(,{,},{,}ET)}'" ljust} + } + ] + +#.PE +#.PS +## MoreTable.m4 +#cct_init + +More: [ movewid = 2 pt__ hm = 2.05 vm = 0.28 -{ right; {lamp ; move;"`{\tt lamp}'" ljust} - move right_ hm - {thermocouple ; move;"`{\tt thermocouple}'" ljust } -} - move down 0.25; right_ +#{ right; {lamp ; move;"`{\tt lamp}'" ljust} +# move right_ hm +# {thermocouple ; move;"`{\tt thermocouple}'" ljust } +#} +# move down 0.25; right_ { {memristor ; move;"`{\tt memristor}'" ljust} move right_ hm {heater; move;"`{\tt heater}'" ljust} @@ -36,4 +65,5 @@ vm = 0.28 {xtal(,type=R;outerdiam=0.2) ; move ;"`{\tt xtal(,type=R)}'" ljust} } +] with .nw at Heater.sw+(0,-0.2) .PE diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/Plate.m4 b/Master/texmf-dist/doc/latex/circuit-macros/examples/Plate.m4 index 14b6bbfbe35..b3a08a24395 100644 --- a/Master/texmf-dist/doc/latex/circuit-macros/examples/Plate.m4 +++ b/Master/texmf-dist/doc/latex/circuit-macros/examples/Plate.m4 @@ -5,7 +5,9 @@ # See the ASME Y14.5 standard, Figure 6-30. scale = 100/3 cct_init -ifdef(`ASME_Y14-5_',,`include(ASME_Y14-5.m4)') +ifdef(`ASME_Y14-5_',, + `sinclude(ASME_Y14-5.m4def) + sinclude(../ASME_Y14-5.m4def) ') ifsvg(`svg_font(sans-serif,10bp__)', `textht = 10bp__*2/3 ifpostscript(,latexcommand({\sf\small))') diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/README-examples b/Master/texmf-dist/doc/latex/circuit-macros/examples/README-examples index bcd3bf37284..0d46f63d20a 100644 --- a/Master/texmf-dist/doc/latex/circuit-macros/examples/README-examples +++ b/Master/texmf-dist/doc/latex/circuit-macros/examples/README-examples @@ -1,9 +1,9 @@ THIS DIRECTORY contains examples.tex, source files for the diagrams - that are imported when examples.tex is LaTeXed, some other example - diagrams, and a subdirectory for producing SVG files without invoking - LaTeX. To generate examples.pdf in a unix-like environment (versions - of unix, linux, cygwin, djgpp, ...): + that are imported when examples.tex is LaTeXed and a subdirectory for + producing SVG files without invoking LaTeX. To generate examples.pdf + in a unix-like environment (versions of unix, linux, cygwin, djgpp, + Mingw, ...): 1. Install the libraries as described in the top-level README file. @@ -30,7 +30,7 @@ SINGLE DIAGRAMS: To test one of the diagrams, say ex01.m4, type one of "make ex01.pdf" (uses pdflatex) "make ex01.png" (requires Imagemagick convert) "make ex01.tif" (requires Imagemagick convert) - "make ex01.svg" (requires Imagemagick convert, but see the svg folder) + "make ex01.svg" (requires Imagemagick convert, but see the dpv folder) DEBUGGING: To test and debug a single diagram, write it into test.m4. Type "make tst" to process the file, creating test.tex, which is imported into @@ -50,14 +50,14 @@ TiKz and PSTricks: By default, the dpic processor is invoked, producing either by LaTeX or PDFlatex, type "make" or "make examplespgf.ps" in the pgf subdirectory. -SVG: Look in the svg directory for examples, and type "make". +SVG: Look in the dpv directory for examples, and type "make". ALTERNATIVES: There are often several methods for producing similar - graphical results, particularly of text labels. Some of the diagrams - in this directory are slightly more complicated than required for Tikz - or PSTricks in order for them to work with other postprocessors. Dpic - output that does not produce LaTeX labels has to be treated separately - as, for example, in the svg directory. + graphical results, particularly of text labels. Some of the diagrams in + this directory are more complicated than required for Tikz or PSTricks + in order for them to work with other postprocessors. Dpic output + that does not produce LaTeX labels has to be treated separately as, + for example, in the dpv directory. METAPOST: To process the diagrams using MetaPost, look in the mpost subdirectory. To accommodate MetaPost, some of these sources use diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/UNO.m4 b/Master/texmf-dist/doc/latex/circuit-macros/examples/UNO.m4 index 02e89ea13a7..5a4e5381b79 100644 --- a/Master/texmf-dist/doc/latex/circuit-macros/examples/UNO.m4 +++ b/Master/texmf-dist/doc/latex/circuit-macros/examples/UNO.m4 @@ -56,18 +56,6 @@ define(`HeaderPin',` `rotbox(m4Hps,m4Hps,fill_(1))', `circle diam m4Hps fill_(1)') at last line.start ') -define(`brdge',`eleminit_(`$1') - define(`m4h',ifelse(`$2',,`sourcerad_',`($2)/2'))dnl - { line to rvec_(rp_len/2-m4h/2,0) - move to rvec_(m4h/2,0) - for m4ng=75 to 255 by 180 do {{ - m4fshade(0, arc cw from rvec_(Rect_(m4h/2,m4ng)) \ - to rvec_(Rect_(m4h/2,-m4ng)) \ - with .c at Here ) }} - line from rvec_(m4h/2,0) to rvec_(rp_len/2,0) } - { [box invis ht_ m4h wid_ m4h] at rvec_(rp_len/2,0) } - line to rvec_(rp_len,0) invis ') - define(`ATMEGA16U2',`[ Chip: box wid 10*lg_pinsep ht 25*lg_pinsep Loopover_(`x', @@ -168,7 +156,7 @@ divert(0)dnl rlabel(16,,"MHz"); dot XT2: dot(at last line.start-(2*del,0)); { "XT2" at last [].n above } - Br1: brdge(left_ from U3.Pin33.end to (XT2,U3.Pin33)) + Br1: jumper(left_ from U3.Pin33.end to (XT2,U3.Pin33)) rlabel(1,,2); llabel(,"GROUND") BRE: dot line to (Here,U3.Pin28) then to U3.Pin28.end @@ -354,7 +342,7 @@ USB: [ K: box invis wid dimen_/2 ht 5*lg_pinsep line from ZU4.Pin1.end to (RN1D-(1.5*del,0),ZU4.Pin1) then up 7*del continue to (ZU4.Chip.w,Here)+(del,0); BRB: dot - { line down_ 2*del; Br2: brdge(right_ dimen_) + { line down_ 2*del; Br2: jumper(right_ dimen_) llabel(1,,2); rlabel(,"RESET\_EN"); line up_ 2*del; dot } line right_ dimen_+del C5: capacitor(right_ dimen_); llabel(,"C5"); rlabel("100n"); dot diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/Views.dms b/Master/texmf-dist/doc/latex/circuit-macros/examples/Views.dms new file mode 100644 index 00000000000..c92e42bac26 --- /dev/null +++ b/Master/texmf-dist/doc/latex/circuit-macros/examples/Views.dms @@ -0,0 +1,5 @@ +w[1]=58.0802 +w[2]=47.6604 +w[3]=46.9552 +w[4]=120.41 +w[5]=114.866 diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/clock.m4 b/Master/texmf-dist/doc/latex/circuit-macros/examples/clock.m4 deleted file mode 100644 index 3431068d9bf..00000000000 --- a/Master/texmf-dist/doc/latex/circuit-macros/examples/clock.m4 +++ /dev/null @@ -1,20 +0,0 @@ -.PS -# clock.m4 -gen_init - - linethick = 1.5 - arrowwid = 5 pt__ - - rgbfill(255/255,250/255,205/255, - Clock: circle rad 0.75 at (0,0) ) - - command "\newcounter{hour}" - for time=1 to 12 do { - sprintf("\setcounter{hour}{%g}\Roman{hour}",time) \ - at Rect_(Clock.rad*0.85,90-time*30) - } - line <-> from Rect_(Clock.rad*0.95,90-8.5*30) to Clock \ - then to Rect_(Clock.rad*0.7,90-3.5*30) - line thick 1 outline "red" from Clock to Rect_(Clock.rad*0.95,90-0.75*30) - -.PE diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/dpv/ByteDPV.svg b/Master/texmf-dist/doc/latex/circuit-macros/examples/dpv/ByteDPV.svg deleted file mode 100644 index 317f9367f33..00000000000 --- a/Master/texmf-dist/doc/latex/circuit-macros/examples/dpv/ByteDPV.svg +++ /dev/null @@ -1,150 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" -"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> -<!-- Creator: dpic version 2022.12.01 option -v for SVG 1.1 --> -<!-- width="460" height="215" --> -<svg - xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" - xml:space="preserve" - style="shape-rendering:geometricPrecision; text-rendering:geometricPrecision; - image-rendering:optimizeQuality; fill-rule:evenodd; clip-rule:evenodd" - width="459.2px" height="214.4px" - viewBox="0 0 459.2 214.4" - font-size="11pt" text-anchor="middle" - stroke="black" stroke-miterlimit="10" stroke-width="1.066667" fill="none"> -<g> -<g style="font-family:sans-serif" -> -<rect x="121.066667" y="58.133333" width="336" height="19.2" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="123.733333" y="72.94">B0STDISBL (reset pin is enabled) </text> -<rect x="121.066667" y="77.333333" width="336" height="19.2" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="123.733333" y="92.14">WDTON (WDT not always on) </text> -<rect x="121.066667" y="96.533333" width="336" height="19.2" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="123.733333" y="111.34">SPIEN (allow serial programming) </text> -<rect x="121.066667" y="115.733333" width="336" height="19.2" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="123.733333" y="130.54">CKOPT (full output swing) </text> -<rect x="121.066667" y="134.933333" width="336" height="19.2" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="123.733333" y="149.74" ->EESAVE (don't preserve EEPB0OM over chip erase) </text> -<rect x="121.066667" y="154.133333" width="336" height="19.2" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="123.733333" y="168.94">BOOTSZ1 </text> -<rect x="121.066667" y="173.333333" width="336" height="19.2" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="123.733333" y="188.14">BOOTSZ0 </text> -<rect x="121.066667" y="192.533333" width="336" height="19.2" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="123.733333" y="207.34">BOOTB0ST (boot reset vector at 0x0000) </text> -<rect x="173.866667" y="0.533333" width="19.2" height="19.2" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="183.466667" y="15.34">1</text> -<rect x="154.666667" y="0.533333" width="19.2" height="19.2" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="164.266667" y="15.34">0</text> -<rect x="135.466667" y="0.533333" width="19.2" height="19.2" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="145.066667" y="15.34">0</text> -<rect x="116.266667" y="0.533333" width="19.2" height="19.2" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="125.866667" y="15.34">1</text> -<rect x="97.066667" y="0.533333" width="19.2" height="19.2" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="106.666667" y="15.34">0</text> -<rect x="77.866667" y="0.533333" width="19.2" height="19.2" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="87.466667" y="15.34">0</text> -<rect x="58.666667" y="0.533333" width="19.2" height="19.2" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="68.266667" y="15.34">1</text> -<rect x="39.466667" y="0.533333" width="19.2" height="19.2" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="49.066667" y="15.34">1</text> -<rect x="1.066667" y="0.533333" width="38.4" height="19.2" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="20.266667" y="15.34">0xc9</text> -<polygon stroke-width="0" fill="black" - points="114.346667,65.333333 121.066667,67.733333 -114.346667,70.133333" /> -<path d="M 183.466667,19.733333 - C 183.466667,20.533333 183.466667,21.333333 183.466667,22.133333 183.466667,23.733333 -171.466667,30.133333 147.466667,41.333333 123.466667,52.533333 -111.466667,59.733333 111.466667,62.933333 111.466667,66.133333 -112.802381,67.733333 115.47381,67.733333 116.809524,67.733333 118.145238,67.733333 -119.480953,67.733333" /> -<polygon stroke-width="0" fill="black" - points="114.346667,84.533333 121.066667,86.933333 -114.346667,89.333333" /> -<path d="M 164.266667,19.733333 - C 164.266667,20.533333 164.266667,21.333333 164.266667,22.133333 164.266667,23.733333 -153.866667,30.133333 133.066667,41.333333 112.266667,52.533333 -101.866667,62.933333 101.866667,72.533333 101.866667,82.133333 -104.802381,86.933333 110.67381,86.933333 113.609524,86.933333 116.545238,86.933333 -119.480953,86.933333" /> -<polygon stroke-width="0" fill="black" - points="114.346667,103.733333 121.066667,106.133333 -114.346667,108.533333" /> -<path d="M 145.066667,19.733333 - C 145.066667,20.533333 145.066667,21.333333 145.066667,22.133333 145.066667,23.733333 -136.266667,30.133333 118.666667,41.333333 101.066667,52.533333 -92.266667,66.133333 92.266667,82.133333 92.266667,98.133333 -96.802381,106.133333 105.87381,106.133333 110.409524,106.133333 114.945238,106.133333 -119.480953,106.133333" /> -<polygon stroke-width="0" fill="black" - points="114.346667,122.933333 121.066667,125.333333 -114.346667,127.733333" /> -<path d="M 125.866667,19.733333 - C 125.866667,20.533333 125.866667,21.333333 125.866667,22.133333 125.866667,23.733333 -118.666667,30.133333 104.266667,41.333333 89.866667,52.533333 -82.666667,69.333333 82.666667,91.733333 82.666667,114.133333 -88.802381,125.333333 101.07381,125.333333 107.209524,125.333333 113.345238,125.333333 -119.480953,125.333333" /> -<polygon stroke-width="0" fill="black" - points="114.346667,142.133333 121.066667,144.533333 -114.346667,146.933333" /> -<path d="M 106.666667,19.733333 - C 106.666667,20.533333 106.666667,21.333333 106.666667,22.133333 106.666667,23.733333 -101.066667,30.133333 89.866667,41.333333 78.666667,52.533333 -73.066667,72.533333 73.066667,101.333333 73.066667,130.133333 -80.802381,144.533333 96.27381,144.533333 104.009524,144.533333 111.745238,144.533333 -119.480953,144.533333" /> -<polygon stroke-width="0" fill="black" - points="114.346667,161.333333 121.066667,163.733333 -114.346667,166.133333" /> -<path d="M 87.466667,19.733333 - C 87.466667,20.533333 87.466667,21.333333 87.466667,22.133333 87.466667,23.733333 -83.466667,30.133333 75.466667,41.333333 67.466667,52.533333 -63.466667,75.733333 63.466667,110.933333 63.466667,146.133333 -72.802381,163.733333 91.47381,163.733333 100.809524,163.733333 110.145238,163.733333 -119.480953,163.733333" /> -<polygon stroke-width="0" fill="black" - points="114.346667,180.533333 121.066667,182.933333 -114.346667,185.333333" /> -<path d="M 68.266667,19.733333 - C 68.266667,20.533333 68.266667,21.333333 68.266667,22.133333 68.266667,23.733333 -65.866667,30.133333 61.066667,41.333333 56.266667,52.533333 -53.866667,78.933333 53.866667,120.533333 53.866667,162.133333 -64.802381,182.933333 86.67381,182.933333 97.609524,182.933333 108.545238,182.933333 -119.480953,182.933333" /> -<polygon stroke-width="0" fill="black" - points="114.346667,199.733333 121.066667,202.133333 -114.346667,204.533333" /> -<path d="M 49.066667,19.733333 - C 49.066667,20.533333 49.066667,21.333333 49.066667,22.133333 49.066667,23.733333 -48.266667,30.133333 46.666667,41.333333 45.066667,52.533333 -44.266667,82.133333 44.266667,130.133333 44.266667,178.133333 -56.802381,202.133333 81.87381,202.133333 94.409524,202.133333 106.945238,202.133333 -119.480953,202.133333" /> -</g> -</g></svg> diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/dpv/ConnDPV.m4 b/Master/texmf-dist/doc/latex/circuit-macros/examples/dpv/ConnDPV.m4 index 9500cd8dd08..dd777f1fe4b 100644 --- a/Master/texmf-dist/doc/latex/circuit-macros/examples/dpv/ConnDPV.m4 +++ b/Master/texmf-dist/doc/latex/circuit-macros/examples/dpv/ConnDPV.m4 @@ -3,65 +3,73 @@ cct_init(svg_font(sans-serif,10.5bp__)) T:[ + ifelse(ifmpost(T)`'ifpostscript(T),,`command "{\sf"') S1: tstrip(U) thinlines_ arrow <- left 0.15 from S1.L1; "L1" rjust arrow <- left 0.15 from S1.L4; "L4" wid 0.2 rjust - "..." at (0.5 between last "" and 2nd last "")+(-0.15,0.02) + ":" at (0.5 between last "" and 2nd last "")+(0,0.02) arrow <- right 0.25 from S1.R1; "R1" ljust arrow <- right 0.25 from S1.R4; "R4" ljust - "..." at (0.5 between last "" and 2nd last "")+(0.15,0.02) + ":" at (0.5 between last "" and 2nd last "")+(0.05,0.02) arrow <- right 0.15 up 0.10 from S1.T1; "T1" ljust arrow <- right 0.15 up 0.10 from S1.T4; "T4" ljust - "..." at (0.5 between last "" and 2nd last "")+(0.15,0.02) + ":" at (0.5 between last "" and 2nd last "")+(0.15,0.02) thicklines_ CS1: "`tstrip(U)'" at S1.s+(0,-0.15) - S2: tstrip(R,5,DO;wid=1.0;ht=0.25) with .sw at S1.se+(0.7,0.15) + S2: tstrip(R,5,DO;wid=1.0;ht=0.25) with .sw at S1.se+(0.8,0.15) thinlines_ arrow <- up 0.2 right 0.1 from S2.T1; "T1" above arrow <- up 0.2 right 0.1 from S2.T5; "T5" above "..." at 0.5 between last "" and 2nd last "" above - CS2: `"tstrip(R,5,"' ljust \ - `" DO;wid=1.0;ht=0.25)"' ljust at S2.sw+(-0.1,-0.2) + CS2: `"tstrip(R,5,"' ht 0.1 ljust \ + `"DO;wid=1.0;ht=0.25)"' ljust at S2.sw+(-0.1,-0.2) + ifelse(ifmpost(T)`'ifpostscript(T),,`command "}"') ] C: [ C1: ccoax - `"ccoax "' at C1.s below + `"ccoax"' at C1.s below thinlines_ - arrow <- up 0.1 right 0.1 from C1.C.ne; "C" ljust - arrow <- down 0.05 right 0.1 from C1.S.e; "S" wid 0.1 ljust + arrow <- down 0.05 left 0.15 from C1.C.w; "svg_it(C)" rjust + arrow <- down 0.05 right 0.1 from C1.S.e; "svg_it(S)" ljust thicklines_ - C2: ccoax(at C1+(0,0.3),F) - `"ccoax(,F)"' wid 0.65 at C2.ne ljust - ] with .C1.sw at T.S2.se+(0.6,0.0) + C2: ccoax(at C1+(0,0.4),F) + `"ccoax(,F)"' at C2.s below + ] with .w at T.e+(0.6,0.0) + +B: [ + tbox(V_2) + { "`tbox'(V`'svg_sub(2))" at last [].s below } + tbox(V_1,,,<) at last []+(0,-0.4) + { "`tbox'(V`'svg_sub(1),,,svg_lt)" at last [].s below } + tbox(V_1,,,<>) at last []+(0,-0.4) + { "`tbox'(V`'svg_sub(1),,,svg_lt`'svg_gt)" at last [].s below } +] with .w at C.e + (0.5,-0.1) Y: [ - tconn(,O) - {`"tconn(,O)"' at last line.c+(0,-0.2) wid 43 pt__ } + P1: tconn(,O) + {"`tconn'(,O)" at last line.c+(0,-0.2) wid 43 pt__ } move to Here+(0.3,0) - P1: tconn(,>) - {`"(,>)"' at last line.c+(0,-0.2)} - move to P1.end+(0.3,0) - tconn(,>>) - {`"(,>>)"' at last line.c+(0,-0.2)} - move to P1.start+(0,linewid) - P3: tconn(,<) - {`"tconn(,<)"' at last line.c+(0,-0.2)} + P2: tconn(,>) + {"...(,svg_gt)" at last line.c+(0,-0.2)} + move to P2.end+(0.3,0) + P3: tconn(,>>) + {"...(,svg_gt`'svg_gt)" at last line.c+(0,-0.2)} move to P3.end+(0.3,0) - tconn(,<<) - {`"(,<<)"' at last line.c+(0,-0.2)} + P4: tconn(,<) + {"...(,svg_lt)" at last line.c+(0,-0.2)} + move to P4.end+(0.3,0) + P5: tconn(,<<) + {"...(,svg_lt`'svg_lt)" at last line.c+(0,-0.2)} + move to P5.end+(0.3,0) + P6: tconn(,A) + {`"...(,A)"' at last line.c+(0,-0.2)} + move to P6.end+(0.3,0) + P7: tconn(,M) + {`"...(,M)"' at last line.c+(0,-0.2)} -] with .sw at (C.e.x-0.3,T.s.y) - -B: [ - tbox(V`'svg_sub(1)) - { `"tbox'(V`'svg_sub(1))" wid 47bp__ with .nw at last [].sw+(0,-4bp__) } - tbox(V`'svg_sub(2),,,<) with .sw at last [].se+(0.75,0) - { `"tbox'(V`'svg_sub(2)`,,,<)"' at last [].s below } - tbox(V`'svg_sub(3),,,<>) with .sw at last [].se+(0.75,0) - { `"tbox'(V`'svg_sub(3)`,,,<>)"' at last [].s below } -] with .nw at T.sw+(0,-0.2) +] with .nw at T.sw+(0,-0.35) command "</g>" # end font .PE diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/dpv/ConnectorsDPV.pic b/Master/texmf-dist/doc/latex/circuit-macros/examples/dpv/ConnectorsDPV.pic deleted file mode 100644 index 1fe2aeabfac..00000000000 --- a/Master/texmf-dist/doc/latex/circuit-macros/examples/dpv/ConnectorsDPV.pic +++ /dev/null @@ -1,368 +0,0 @@ -.PS -# ConnectorsDPV.m4 -# log_init Version 10.1: SVG m4 macro settings. - - # gen_init Version 10.1: SVG m4 macro settings. - - - define rpoint__ { - rp_wid = last line.end.x-last line.start.x - rp_ht = last line.end.y-last line.start.y - rp_len = sqrt(abs((rp_wid)^2+(rp_ht)^2)); move to last line.start - rp_ang = atan2(rp_ht,rp_wid) } - - rtod_ = 57.295779513082323; dtor_ = 0.017453292519943295 - twopi_ = 6.2831853071795862; pi_ = (twopi_/2) - rp_ang = 0; right - - - linethick = 0.8 - arrowwid = 0.05*scale; arrowht = 0.1*scale - - - # gen_init end - - -# log_init end - - - -m4thtmp=textht; dptextratio=0.71; m4thtmp=textht; textht=(8.5*(scale/72))*dptextratio; -command "<g style=\"font-family:sans-serif\" ->" - - -#vg_rot_init(test) - -# svg_rot_init begin - if dpicopt > 0 then { copy "/cygdrive/d/Dwight/lib/dpictools.pic" } - - -# Extract from the .svg file the x= y= coordinates -# that appear after each transform="rotate(.." line - retcode = ( sh "awk -e \"/transform=\\"rotate/ { r=1 }; /x=\\".*y=\\"/ { if(r==1){ print; r=0 } }\" ConnectorsDPV.tmp | sed -e \"s/x=\\"\([0-9.]*\)\\" y=\\"\([0-9.]*\)\\".*/\1 \2/\" > ConnectorsDPV.cor" ) - if retcode != 0 then { print " - Awk failure. - Awk and sed are required by svg_rot to rotate svg text. - " } - svgrot_k = 0 - define svg_rotcoords { if "$1" != "" then { svgrot_k += 1 - svg_rx[svgrot_k] = $1; svg_ry[svgrot_k] = $2 } - } - copythru(svg_rotcoords, ConnectorsDPV.cor) - sh "rm -f ConnectorsDPV.tmp ConnectorsDPV.cor" - svgrot_i = 0 - - -# `svg_rot(degrees,"text",[at position]) -# Rotate text degrees ccw -# Requires svg_rot_init(filename) -# which uses both awk and sed. -# The source must be processed twice by m4 and dpic.' - define svg_rot { if retcode != 0 then {$2} else { - if "$1" != "" then { svg_rang = -($1) } else { svg_rang = -90 } - if svgrot_k != 0 then { svgrot_i +=1 - command sprintf("<g transform=\"rotate(%g %g %g)\">",svg_rang,\ - svg_rx[svgrot_i]+textht/2*sin((svg_rang)*dtor_),\ - svg_ry[svgrot_i]+textht/2*(1-cos((svg_rang)*dtor_))) }\ - else { command sprintf("<g transform=\"rotate(%g)\">",svg_rang) } - if "$3"=="" then { $2 } \ - else { $2 $3 - (sin((svg_rang)*dtor_),(cos((svg_rang)*dtor_)-1))*textht/2 } - command "</g>" } } - - -# svg_rot_init end - - -# ArduinoUno -# "Arduino Uno Rev 3" at last [].Connector.s below - Ar: [ - # - Connector: box wid 24*(linewid/10) ht 20*(3*(linewid/10)) -# - plen = 2*(linewid/10) -# -Pin6: line left plen from Connector.nw-(0,(5+1)*(3*(linewid/10))) - { "IOREF" ljust at last line.start } -Pin7: line left plen from Connector.nw-(0,(5+2)*(3*(linewid/10))) - { "RESET" ljust at last line.start } -Pin8: line left plen from Connector.nw-(0,(5+3)*(3*(linewid/10))) - { "<tspan font-style=\"italic\">+</tspan>3V3" ljust at last line.start } -Pin9: line left plen from Connector.nw-(0,(5+4)*(3*(linewid/10))) - { "<tspan font-style=\"italic\">+</tspan>5V" ljust at last line.start } -Pin10: line left plen from Connector.nw-(0,(5+5)*(3*(linewid/10))) - { "GND" ljust at last line.start } -Pin11: line left plen from Connector.nw-(0,(5+6)*(3*(linewid/10))) - { "GND" ljust at last line.start } -Pin12: line left plen from Connector.nw-(0,(5+7)*(3*(linewid/10))) - { "VIN" ljust at last line.start } - -Pin14: line left plen from Connector.nw-(0,(5+9)*(3*(linewid/10))) - { "A0" ljust at last line.start } -Pin15: line left plen from Connector.nw-(0,(5+10)*(3*(linewid/10))) - { "A1" ljust at last line.start } -Pin16: line left plen from Connector.nw-(0,(5+11)*(3*(linewid/10))) - { "A2" ljust at last line.start } -Pin17: line left plen from Connector.nw-(0,(5+12)*(3*(linewid/10))) - { "A3" ljust at last line.start } -Pin18: line left plen from Connector.nw-(0,(5+13)*(3*(linewid/10))) - { "A4" ljust at last line.start } -Pin19: line left plen from Connector.nw-(0,(5+14)*(3*(linewid/10))) - { "A5" ljust at last line.start } - -# -Pin21: line right plen from Connector.ne-(0,1*(3*(linewid/10))) - { "SCL" rjust at last line.start } -Pin20: line right plen from Connector.ne-(0,2*(3*(linewid/10))) - { "SDA" rjust at last line.start } -Pin19: line right plen from Connector.ne-(0,3*(3*(linewid/10))) - { "AREF" rjust at last line.start } -Pin18: line right plen from Connector.ne-(0,4*(3*(linewid/10))) - { "GND" rjust at last line.start } -Pin17: line right plen from Connector.ne-(0,5*(3*(linewid/10))) - { "~D13" rjust at last line.start } -Pin16: line right plen from Connector.ne-(0,6*(3*(linewid/10))) - { "D12" rjust at last line.start } -Pin15: line right plen from Connector.ne-(0,7*(3*(linewid/10))) - { "~D11" rjust at last line.start } -Pin14: line right plen from Connector.ne-(0,8*(3*(linewid/10))) - { "~D10" rjust at last line.start } -Pin13: line right plen from Connector.ne-(0,9*(3*(linewid/10))) - { "~D9" rjust at last line.start } -Pin12: line right plen from Connector.ne-(0,10*(3*(linewid/10))) - { "D8" rjust at last line.start } - -Pin10: line right plen from Connector.ne-(0,12*(3*(linewid/10))) - { "D7" rjust at last line.start } -Pin9: line right plen from Connector.ne-(0,13*(3*(linewid/10))) - { "~D6" rjust at last line.start } -Pin8: line right plen from Connector.ne-(0,14*(3*(linewid/10))) - { "~D5" rjust at last line.start } -Pin7: line right plen from Connector.ne-(0,15*(3*(linewid/10))) - { "D4" rjust at last line.start } -Pin6: line right plen from Connector.ne-(0,16*(3*(linewid/10))) - { "~D3" rjust at last line.start } -Pin5: line right plen from Connector.ne-(0,17*(3*(linewid/10))) - { "D2" rjust at last line.start } -Pin4: line right plen from Connector.ne-(0,18*(3*(linewid/10))) - { "TX D1" rjust at last line.start } -Pin3: line right plen from Connector.ne-(0,19*(3*(linewid/10))) - { "RX D0" rjust at last line.start } - -# - ] #with .sw at last [].se+(0.25,0) - "Arduino Leonardo" at last [].Connector.s below - - RPI: [ - # - GPIO: box wid 34*(linewid/10) ht 21*(3*(linewid/10)) - plen = 6*(linewid/10) -# -define A_LeftGPIO { - exec sprintf("Pin%g: line left plen from GPIO.nw-(0,%g)",\ - 2*($1)-1,($1)*(3*(linewid/10))) - { "$3" ljust at last line.start } - "$2" at last line.c above } -# -A_LeftGPIO(1,,3V3) -A_LeftGPIO(2,2,SDA1) -A_LeftGPIO(3,3,SCL1) -A_LeftGPIO(4,4,GPIO_GCLK) -A_LeftGPIO(5,,GND) -A_LeftGPIO(6,17,GPIO_GEN0) -A_LeftGPIO(7,27,GPIO_GEN2) -A_LeftGPIO(8,22,GPIO_GEN3) -A_LeftGPIO(9,,3V3) -A_LeftGPIO(10,10,SPI_MOSI) -A_LeftGPIO(11,9,SPI_MISO) -A_LeftGPIO(12,11,SPI_SCLK) -A_LeftGPIO(13,,GND) -A_LeftGPIO(14,,ID_SD) -A_LeftGPIO(15,5,) -A_LeftGPIO(16,6,) -A_LeftGPIO(17,13,) -A_LeftGPIO(18,19,) -A_LeftGPIO(19,26,) -A_LeftGPIO(20,,GND ) - -# -define A_RightGPIO { - exec sprintf("Pin%g: line right plen from GPIO.ne-(0,%g)",\ - 2*($1),($1)*(3*(linewid/10))) - { "$3" rjust at last line.start } - "$2" at last line.c above } -# -A_RightGPIO(1,,5V) -A_RightGPIO(2,,5V) -A_RightGPIO(3,,GND) -A_RightGPIO(4,14,TXD0) -A_RightGPIO(5,15,RXD0) -A_RightGPIO(6,18,GPIO_GEN1) -A_RightGPIO(7,,GND) -A_RightGPIO(8,23,GPIO_GEN4) -A_RightGPIO(9,24,GPIO_GEN5) -A_RightGPIO(10,,GND) -A_RightGPIO(11,25,GPIO_GEN6) -A_RightGPIO(12,8,SPI_CEO_N) -A_RightGPIO(13,7,SPI_CE1_N) -A_RightGPIO(14,,ID_SC) -A_RightGPIO(15,,GND) -A_RightGPIO(16,12,) -A_RightGPIO(17,,GND) -A_RightGPIO(18,16,) -A_RightGPIO(19,20,) -A_RightGPIO(20,21, ) - -# - ] with .sw at last [].se+(0.25,0) - "Raspberry Pi 4 GPIO" at last [].GPIO.s below - - HD: [ - # - Base:[line up 19*(3*(linewid/10))+16*(linewid/10)*2/3/2 then right 16*(linewid/10)*2/3 \ - then right 16*(linewid/10)/3 down 16*(linewid/10)/3 \ - then down 19*(3*(linewid/10))+16*(linewid/10)*2/3-2*16*(linewid/10)/3 then down 16*(linewid/10)/3 left 16*(linewid/10)/3 \ - then left 16*(linewid/10)*2/3 then to Here] - plen = 6*(linewid/10) -# - Pin1: line left plen from Base.nw-(0,16*(linewid/10)/3+(1-1/2)*(3*(linewid/10))) - {"HPD" ljust at last line.start} - "1" at last line.c above -Pin2: line left plen from Base.nw-(0,16*(linewid/10)/3+(2-1/2)*(3*(linewid/10))) - {"UTILITY" ljust at last line.start} - "2" at last line.c above -Pin3: line left plen from Base.nw-(0,16*(linewid/10)/3+(3-1/2)*(3*(linewid/10))) - {"D2<tspan font-style=\"italic\">+</tspan>" ljust at last line.start} - "3" at last line.c above -Pin4: line left plen from Base.nw-(0,16*(linewid/10)/3+(4-1/2)*(3*(linewid/10))) - {"D2_SH" ljust at last line.start} - "4" at last line.c above -Pin5: line left plen from Base.nw-(0,16*(linewid/10)/3+(5-1/2)*(3*(linewid/10))) - {"D2<tspan font-style=\"italic\">-</tspan>" ljust at last line.start} - "5" at last line.c above -Pin6: line left plen from Base.nw-(0,16*(linewid/10)/3+(6-1/2)*(3*(linewid/10))) - {"D1<tspan font-style=\"italic\">+</tspan>" ljust at last line.start} - "6" at last line.c above -Pin7: line left plen from Base.nw-(0,16*(linewid/10)/3+(7-1/2)*(3*(linewid/10))) - {"D1_SH" ljust at last line.start} - "7" at last line.c above -Pin8: line left plen from Base.nw-(0,16*(linewid/10)/3+(8-1/2)*(3*(linewid/10))) - {"D1<tspan font-style=\"italic\">-</tspan>" ljust at last line.start} - "8" at last line.c above -Pin9: line left plen from Base.nw-(0,16*(linewid/10)/3+(9-1/2)*(3*(linewid/10))) - {"D0<tspan font-style=\"italic\">+</tspan>" ljust at last line.start} - "9" at last line.c above -Pin10: line left plen from Base.nw-(0,16*(linewid/10)/3+(10-1/2)*(3*(linewid/10))) - {"D0_SH" ljust at last line.start} - "10" at last line.c above -Pin11: line left plen from Base.nw-(0,16*(linewid/10)/3+(11-1/2)*(3*(linewid/10))) - {"D0<tspan font-style=\"italic\">-</tspan>" ljust at last line.start} - "11" at last line.c above -Pin12: line left plen from Base.nw-(0,16*(linewid/10)/3+(12-1/2)*(3*(linewid/10))) - {"CLK<tspan font-style=\"italic\">+</tspan>" ljust at last line.start} - "12" at last line.c above -Pin13: line left plen from Base.nw-(0,16*(linewid/10)/3+(13-1/2)*(3*(linewid/10))) - {"CLK_SH" ljust at last line.start} - "13" at last line.c above -Pin14: line left plen from Base.nw-(0,16*(linewid/10)/3+(14-1/2)*(3*(linewid/10))) - {"CLK<tspan font-style=\"italic\">-</tspan>" ljust at last line.start} - "14" at last line.c above -Pin15: line left plen from Base.nw-(0,16*(linewid/10)/3+(15-1/2)*(3*(linewid/10))) - {"CEC" ljust at last line.start} - "15" at last line.c above -Pin16: line left plen from Base.nw-(0,16*(linewid/10)/3+(16-1/2)*(3*(linewid/10))) - {"GND" ljust at last line.start} - "16" at last line.c above -Pin17: line left plen from Base.nw-(0,16*(linewid/10)/3+(17-1/2)*(3*(linewid/10))) - {"SCL" ljust at last line.start} - "17" at last line.c above -Pin18: line left plen from Base.nw-(0,16*(linewid/10)/3+(18-1/2)*(3*(linewid/10))) - {"SDA" ljust at last line.start} - "18" at last line.c above -Pin19: line left plen from Base.nw-(0,16*(linewid/10)/3+(19-1/2)*(3*(linewid/10))) - {"<tspan font-style=\"italic\">+</tspan>5V" ljust at last line.start} - "19" at last line.c above - -L1: line from Base.nw+(16*(linewid/10)*2/3-(3*(linewid/10)),0) up plen - svg_rot(90,"21",at last line.c +(-4*(scale/72),0)) - svg_rot(90,"SH2",at last line.start + (4*(scale/72),-8*(scale/72))) - line from Base.nw+(16*(linewid/10)*2/3-2*(3*(linewid/10)),0) up plen - svg_rot(90,"20",at last line.c+(-4*(scale/72),0)) - svg_rot(90,"SH1",at last line.start + (4*(scale/72),-8*(scale/72))) - line from Base.sw+(16*(linewid/10)*2/3-(3*(linewid/10)),0) down plen - svg_rot(90,"23",at last line.c+(-4*(scale/72),0)) - svg_rot(90,"SH4",at last line.start + (4*(scale/72),14*(scale/72))) - line from Base.sw+(16*(linewid/10)*2/3-2*(3*(linewid/10)),0) down plen - svg_rot(90,"22",at last line.c+(-4*(scale/72),0)) - svg_rot(90,"SH3",at last line.start + (4*(scale/72),14*(scale/72))) -# - ] with .nw at last [].ne+(0.25,0.5) - "Micro" rjust at HD.Base.sw "HDMI" rjust - - S: [ - # - Base: box wid 18*(linewid/10) ht 14*(3*(linewid/10)) rad 5/3*(3*(linewid/10)) - plen = 6*(linewid/10) -# - B12: line left plen from Base.n-(18*(linewid/10)/2,(1+0.5)*(3*(linewid/10))) - {"GND" ljust at last line.start} -B11: line left plen from Base.n-(18*(linewid/10)/2,(2+0.5)*(3*(linewid/10))) - {"RX1<tspan font-style=\"italic\">+</tspan>" ljust at last line.start} -B10: line left plen from Base.n-(18*(linewid/10)/2,(3+0.5)*(3*(linewid/10))) - {"RX1<tspan font-style=\"italic\">-</tspan>" ljust at last line.start} -B9: line left plen from Base.n-(18*(linewid/10)/2,(4+0.5)*(3*(linewid/10))) - {"VBUS" ljust at last line.start} -B8: line left plen from Base.n-(18*(linewid/10)/2,(5+0.5)*(3*(linewid/10))) - {"SBU2" ljust at last line.start} -B7: line left plen from Base.n-(18*(linewid/10)/2,(6+0.5)*(3*(linewid/10))) - {"D<tspan font-style=\"italic\">-</tspan>" ljust at last line.start} -B6: line left plen from Base.n-(18*(linewid/10)/2,(7+0.5)*(3*(linewid/10))) - {"D<tspan font-style=\"italic\">+</tspan>" ljust at last line.start} -B5: line left plen from Base.n-(18*(linewid/10)/2,(8+0.5)*(3*(linewid/10))) - {"CC2" ljust at last line.start} -B4: line left plen from Base.n-(18*(linewid/10)/2,(9+0.5)*(3*(linewid/10))) - {"VBUS" ljust at last line.start} -B3: line left plen from Base.n-(18*(linewid/10)/2,(10+0.5)*(3*(linewid/10))) - {"TX2<tspan font-style=\"italic\">-</tspan>" ljust at last line.start} -B2: line left plen from Base.n-(18*(linewid/10)/2,(11+0.5)*(3*(linewid/10))) - {"TX2<tspan font-style=\"italic\">+</tspan>" ljust at last line.start} -B1: line left plen from Base.n-(18*(linewid/10)/2,(12+0.5)*(3*(linewid/10))) - {"GND" ljust at last line.start} - -# - A1: line right plen from Base.n+(18*(linewid/10)/2,-(1+0.5)*(3*(linewid/10))) - {"GND" rjust at last line.start} -A2: line right plen from Base.n+(18*(linewid/10)/2,-(2+0.5)*(3*(linewid/10))) - {"TX1<tspan font-style=\"italic\">+</tspan>" rjust at last line.start} -A3: line right plen from Base.n+(18*(linewid/10)/2,-(3+0.5)*(3*(linewid/10))) - {"TX1<tspan font-style=\"italic\">-</tspan>" rjust at last line.start} -A4: line right plen from Base.n+(18*(linewid/10)/2,-(4+0.5)*(3*(linewid/10))) - {"VBUS" rjust at last line.start} -A5: line right plen from Base.n+(18*(linewid/10)/2,-(5+0.5)*(3*(linewid/10))) - {"CC1" rjust at last line.start} -A6: line right plen from Base.n+(18*(linewid/10)/2,-(6+0.5)*(3*(linewid/10))) - {"D<tspan font-style=\"italic\">+</tspan>" rjust at last line.start} -A7: line right plen from Base.n+(18*(linewid/10)/2,-(7+0.5)*(3*(linewid/10))) - {"D<tspan font-style=\"italic\">-</tspan>" rjust at last line.start} -A8: line right plen from Base.n+(18*(linewid/10)/2,-(8+0.5)*(3*(linewid/10))) - {"SBU1" rjust at last line.start} -A9: line right plen from Base.n+(18*(linewid/10)/2,-(9+0.5)*(3*(linewid/10))) - {"VBUS" rjust at last line.start} -A10: line right plen from Base.n+(18*(linewid/10)/2,-(10+0.5)*(3*(linewid/10))) - {"RX2<tspan font-style=\"italic\">-</tspan>" rjust at last line.start} -A11: line right plen from Base.n+(18*(linewid/10)/2,-(11+0.5)*(3*(linewid/10))) - {"RX2<tspan font-style=\"italic\">+</tspan>" rjust at last line.start} -A12: line right plen from Base.n+(18*(linewid/10)/2,-(12+0.5)*(3*(linewid/10))) - {"GND" rjust at last line.start} - -# - ] with .sw at (HD.e.x+0.25,RPI.s.y) - "USB-C Socket" at S.Base.s below - "B12" at S.B12.end above ljust - "B1" at S.B1.end above ljust - "A1" at S.A1.end above rjust - "A12" at S.A12.end above rjust - - command "</g>" - -.PE diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/dpv/ConnectorsDPV.svg b/Master/texmf-dist/doc/latex/circuit-macros/examples/dpv/ConnectorsDPV.svg deleted file mode 100644 index 4b63a641be0..00000000000 --- a/Master/texmf-dist/doc/latex/circuit-macros/examples/dpv/ConnectorsDPV.svg +++ /dev/null @@ -1,853 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" -"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> -<!-- Creator: dpic version 2022.12.01 option -v for SVG 1.1 --> -<!-- width="681" height="387" --> -<svg - xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" - xml:space="preserve" - style="shape-rendering:geometricPrecision; text-rendering:geometricPrecision; - image-rendering:optimizeQuality; fill-rule:evenodd; clip-rule:evenodd" - width="680px" height="385.6px" - viewBox="0 0 680 385.6" - font-size="11pt" text-anchor="middle" - stroke="black" stroke-miterlimit="10" stroke-width="1.066667" fill="none"> -<g> -<g style="font-family:sans-serif" -> -<rect x="10.666667" y="62.933333" width="115.2" height="288" /> -<line x1="10.666667" y1="149.333333" x2="1.066667" y2="149.333333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="13.333333" y="153.356667">IOREF</text> -<line x1="10.666667" y1="163.733333" x2="1.066667" y2="163.733333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="13.333333" y="167.756667">RESET</text> -<line x1="10.666667" y1="178.133333" x2="1.066667" y2="178.133333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="13.333333" y="182.156667"><tspan font-style="italic">+</tspan>3V3</text> -<line x1="10.666667" y1="192.533333" x2="1.066667" y2="192.533333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="13.333333" y="196.556667"><tspan font-style="italic">+</tspan>5V</text> -<line x1="10.666667" y1="206.933333" x2="1.066667" y2="206.933333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="13.333333" y="210.956667">GND</text> -<line x1="10.666667" y1="221.333333" x2="1.066667" y2="221.333333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="13.333333" y="225.356667">GND</text> -<line x1="10.666667" y1="235.733333" x2="1.066667" y2="235.733333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="13.333333" y="239.756667">VIN</text> -<line x1="10.666667" y1="264.533333" x2="1.066667" y2="264.533333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="13.333333" y="268.556667">A0</text> -<line x1="10.666667" y1="278.933333" x2="1.066667" y2="278.933333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="13.333333" y="282.956667">A1</text> -<line x1="10.666667" y1="293.333333" x2="1.066667" y2="293.333333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="13.333333" y="297.356667">A2</text> -<line x1="10.666667" y1="307.733333" x2="1.066667" y2="307.733333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="13.333333" y="311.756667">A3</text> -<line x1="10.666667" y1="322.133333" x2="1.066667" y2="322.133333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="13.333333" y="326.156667">A4</text> -<line x1="10.666667" y1="336.533333" x2="1.066667" y2="336.533333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="13.333333" y="340.556667">A5</text> -<line x1="125.866667" y1="77.333333" x2="135.466667" y2="77.333333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="123.2" y="81.356667">SCL</text> -<line x1="125.866667" y1="91.733333" x2="135.466667" y2="91.733333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="123.2" y="95.756667">SDA</text> -<line x1="125.866667" y1="106.133333" x2="135.466667" y2="106.133333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="123.2" y="110.156667">AREF</text> -<line x1="125.866667" y1="120.533333" x2="135.466667" y2="120.533333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="123.2" y="124.556667">GND</text> -<line x1="125.866667" y1="134.933333" x2="135.466667" y2="134.933333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="123.2" y="138.956667">~D13</text> -<line x1="125.866667" y1="149.333333" x2="135.466667" y2="149.333333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="123.2" y="153.356667">D12</text> -<line x1="125.866667" y1="163.733333" x2="135.466667" y2="163.733333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="123.2" y="167.756667">~D11</text> -<line x1="125.866667" y1="178.133333" x2="135.466667" y2="178.133333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="123.2" y="182.156667">~D10</text> -<line x1="125.866667" y1="192.533333" x2="135.466667" y2="192.533333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="123.2" y="196.556667">~D9</text> -<line x1="125.866667" y1="206.933333" x2="135.466667" y2="206.933333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="123.2" y="210.956667">D8</text> -<line x1="125.866667" y1="235.733333" x2="135.466667" y2="235.733333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="123.2" y="239.756667">D7</text> -<line x1="125.866667" y1="250.133333" x2="135.466667" y2="250.133333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="123.2" y="254.156667">~D6</text> -<line x1="125.866667" y1="264.533333" x2="135.466667" y2="264.533333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="123.2" y="268.556667">~D5</text> -<line x1="125.866667" y1="278.933333" x2="135.466667" y2="278.933333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="123.2" y="282.956667">D4</text> -<line x1="125.866667" y1="293.333333" x2="135.466667" y2="293.333333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="123.2" y="297.356667">~D3</text> -<line x1="125.866667" y1="307.733333" x2="135.466667" y2="307.733333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="123.2" y="311.756667">D2</text> -<line x1="125.866667" y1="322.133333" x2="135.466667" y2="322.133333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="123.2" y="326.156667">TX D1</text> -<line x1="125.866667" y1="336.533333" x2="135.466667" y2="336.533333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="123.2" y="340.556667">RX D0</text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="68.266667" y="361.646667">Arduino Leonardo</text> -<rect x="188.266667" y="48.533333" width="163.2" height="302.4" /> -<line x1="188.266667" y1="62.933333" x2="159.466667" y2="62.933333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="190.933333" y="66.956667">3V3</text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="173.866667" y="60.266667"></text> -<line x1="188.266667" y1="77.333333" x2="159.466667" y2="77.333333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="190.933333" y="81.356667">SDA1</text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="173.866667" y="74.666667">2</text> -<line x1="188.266667" y1="91.733333" x2="159.466667" y2="91.733333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="190.933333" y="95.756667">SCL1</text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="173.866667" y="89.066667">3</text> -<line x1="188.266667" y1="106.133333" x2="159.466667" y2="106.133333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="190.933333" y="110.156667">GPIO_GCLK</text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="173.866667" y="103.466667">4</text> -<line x1="188.266667" y1="120.533333" x2="159.466667" y2="120.533333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="190.933333" y="124.556667">GND</text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="173.866667" y="117.866667"></text> -<line x1="188.266667" y1="134.933333" x2="159.466667" y2="134.933333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="190.933333" y="138.956667">GPIO_GEN0</text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="173.866667" y="132.266667">17</text> -<line x1="188.266667" y1="149.333333" x2="159.466667" y2="149.333333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="190.933333" y="153.356667">GPIO_GEN2</text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="173.866667" y="146.666667">27</text> -<line x1="188.266667" y1="163.733333" x2="159.466667" y2="163.733333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="190.933333" y="167.756667">GPIO_GEN3</text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="173.866667" y="161.066667">22</text> -<line x1="188.266667" y1="178.133333" x2="159.466667" y2="178.133333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="190.933333" y="182.156667">3V3</text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="173.866667" y="175.466667"></text> -<line x1="188.266667" y1="192.533333" x2="159.466667" y2="192.533333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="190.933333" y="196.556667">SPI_MOSI</text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="173.866667" y="189.866667">10</text> -<line x1="188.266667" y1="206.933333" x2="159.466667" y2="206.933333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="190.933333" y="210.956667">SPI_MISO</text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="173.866667" y="204.266667">9</text> -<line x1="188.266667" y1="221.333333" x2="159.466667" y2="221.333333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="190.933333" y="225.356667">SPI_SCLK</text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="173.866667" y="218.666667">11</text> -<line x1="188.266667" y1="235.733333" x2="159.466667" y2="235.733333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="190.933333" y="239.756667">GND</text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="173.866667" y="233.066667"></text> -<line x1="188.266667" y1="250.133333" x2="159.466667" y2="250.133333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="190.933333" y="254.156667">ID_SD</text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="173.866667" y="247.466667"></text> -<line x1="188.266667" y1="264.533333" x2="159.466667" y2="264.533333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="190.933333" y="268.556667"></text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="173.866667" y="261.866667">5</text> -<line x1="188.266667" y1="278.933333" x2="159.466667" y2="278.933333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="190.933333" y="282.956667"></text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="173.866667" y="276.266667">6</text> -<line x1="188.266667" y1="293.333333" x2="159.466667" y2="293.333333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="190.933333" y="297.356667"></text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="173.866667" y="290.666667">13</text> -<line x1="188.266667" y1="307.733333" x2="159.466667" y2="307.733333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="190.933333" y="311.756667"></text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="173.866667" y="305.066667">19</text> -<line x1="188.266667" y1="322.133333" x2="159.466667" y2="322.133333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="190.933333" y="326.156667"></text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="173.866667" y="319.466667">26</text> -<line x1="188.266667" y1="336.533333" x2="159.466667" y2="336.533333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="190.933333" y="340.556667">GND </text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="173.866667" y="333.866667"></text> -<line x1="351.466667" y1="62.933333" x2="380.266667" y2="62.933333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="348.8" y="66.956667">5V</text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="365.866667" y="60.266667"></text> -<line x1="351.466667" y1="77.333333" x2="380.266667" y2="77.333333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="348.8" y="81.356667">5V</text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="365.866667" y="74.666667"></text> -<line x1="351.466667" y1="91.733333" x2="380.266667" y2="91.733333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="348.8" y="95.756667">GND</text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="365.866667" y="89.066667"></text> -<line x1="351.466667" y1="106.133333" x2="380.266667" y2="106.133333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="348.8" y="110.156667">TXD0</text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="365.866667" y="103.466667">14</text> -<line x1="351.466667" y1="120.533333" x2="380.266667" y2="120.533333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="348.8" y="124.556667">RXD0</text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="365.866667" y="117.866667">15</text> -<line x1="351.466667" y1="134.933333" x2="380.266667" y2="134.933333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="348.8" y="138.956667">GPIO_GEN1</text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="365.866667" y="132.266667">18</text> -<line x1="351.466667" y1="149.333333" x2="380.266667" y2="149.333333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="348.8" y="153.356667">GND</text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="365.866667" y="146.666667"></text> -<line x1="351.466667" y1="163.733333" x2="380.266667" y2="163.733333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="348.8" y="167.756667">GPIO_GEN4</text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="365.866667" y="161.066667">23</text> -<line x1="351.466667" y1="178.133333" x2="380.266667" y2="178.133333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="348.8" y="182.156667">GPIO_GEN5</text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="365.866667" y="175.466667">24</text> -<line x1="351.466667" y1="192.533333" x2="380.266667" y2="192.533333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="348.8" y="196.556667">GND</text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="365.866667" y="189.866667"></text> -<line x1="351.466667" y1="206.933333" x2="380.266667" y2="206.933333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="348.8" y="210.956667">GPIO_GEN6</text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="365.866667" y="204.266667">25</text> -<line x1="351.466667" y1="221.333333" x2="380.266667" y2="221.333333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="348.8" y="225.356667">SPI_CEO_N</text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="365.866667" y="218.666667">8</text> -<line x1="351.466667" y1="235.733333" x2="380.266667" y2="235.733333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="348.8" y="239.756667">SPI_CE1_N</text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="365.866667" y="233.066667">7</text> -<line x1="351.466667" y1="250.133333" x2="380.266667" y2="250.133333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="348.8" y="254.156667">ID_SC</text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="365.866667" y="247.466667"></text> -<line x1="351.466667" y1="264.533333" x2="380.266667" y2="264.533333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="348.8" y="268.556667">GND</text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="365.866667" y="261.866667"></text> -<line x1="351.466667" y1="278.933333" x2="380.266667" y2="278.933333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="348.8" y="282.956667"></text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="365.866667" y="276.266667">12</text> -<line x1="351.466667" y1="293.333333" x2="380.266667" y2="293.333333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="348.8" y="297.356667">GND</text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="365.866667" y="290.666667"></text> -<line x1="351.466667" y1="307.733333" x2="380.266667" y2="307.733333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="348.8" y="311.756667"></text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="365.866667" y="305.066667">16</text> -<line x1="351.466667" y1="322.133333" x2="380.266667" y2="322.133333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="348.8" y="326.156667"></text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="365.866667" y="319.466667">20</text> -<line x1="351.466667" y1="336.533333" x2="380.266667" y2="336.533333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="348.8" y="340.556667"></text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="365.866667" y="333.866667">21</text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="269.866667" y="361.646667">Raspberry Pi 4 GPIO</text> -<polyline points="433.066667,328.533333 433.066667,29.333333 -484.266667,29.333333 -509.866667,54.933333 -509.866667,328.533333 -484.266667,354.133333 -433.066667,354.133333 -433.066667,328.533333" /> -<line x1="433.066667" y1="62.133333" x2="404.266667" y2="62.133333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="435.733333" y="66.156667">HPD</text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="418.666667" y="59.466667">1</text> -<line x1="433.066667" y1="76.533333" x2="404.266667" y2="76.533333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="435.733333" y="80.556667">UTILITY</text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="418.666667" y="73.866667">2</text> -<line x1="433.066667" y1="90.933333" x2="404.266667" y2="90.933333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="435.733333" y="94.956667">D2<tspan font-style="italic">+</tspan></text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="418.666667" y="88.266667">3</text> -<line x1="433.066667" y1="105.333333" x2="404.266667" y2="105.333333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="435.733333" y="109.356667">D2_SH</text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="418.666667" y="102.666667">4</text> -<line x1="433.066667" y1="119.733333" x2="404.266667" y2="119.733333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="435.733333" y="123.756667">D2<tspan font-style="italic">-</tspan></text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="418.666667" y="117.066667">5</text> -<line x1="433.066667" y1="134.133333" x2="404.266667" y2="134.133333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="435.733333" y="138.156667">D1<tspan font-style="italic">+</tspan></text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="418.666667" y="131.466667">6</text> -<line x1="433.066667" y1="148.533333" x2="404.266667" y2="148.533333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="435.733333" y="152.556667">D1_SH</text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="418.666667" y="145.866667">7</text> -<line x1="433.066667" y1="162.933333" x2="404.266667" y2="162.933333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="435.733333" y="166.956667">D1<tspan font-style="italic">-</tspan></text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="418.666667" y="160.266667">8</text> -<line x1="433.066667" y1="177.333333" x2="404.266667" y2="177.333333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="435.733333" y="181.356667">D0<tspan font-style="italic">+</tspan></text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="418.666667" y="174.666667">9</text> -<line x1="433.066667" y1="191.733333" x2="404.266667" y2="191.733333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="435.733333" y="195.756667">D0_SH</text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="418.666667" y="189.066667">10</text> -<line x1="433.066667" y1="206.133333" x2="404.266667" y2="206.133333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="435.733333" y="210.156667">D0<tspan font-style="italic">-</tspan></text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="418.666667" y="203.466667">11</text> -<line x1="433.066667" y1="220.533333" x2="404.266667" y2="220.533333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="435.733333" y="224.556667">CLK<tspan font-style="italic">+</tspan></text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="418.666667" y="217.866667">12</text> -<line x1="433.066667" y1="234.933333" x2="404.266667" y2="234.933333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="435.733333" y="238.956667">CLK_SH</text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="418.666667" y="232.266667">13</text> -<line x1="433.066667" y1="249.333333" x2="404.266667" y2="249.333333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="435.733333" y="253.356667">CLK<tspan font-style="italic">-</tspan></text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="418.666667" y="246.666667">14</text> -<line x1="433.066667" y1="263.733333" x2="404.266667" y2="263.733333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="435.733333" y="267.756667">CEC</text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="418.666667" y="261.066667">15</text> -<line x1="433.066667" y1="278.133333" x2="404.266667" y2="278.133333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="435.733333" y="282.156667">GND</text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="418.666667" y="275.466667">16</text> -<line x1="433.066667" y1="292.533333" x2="404.266667" y2="292.533333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="435.733333" y="296.556667">SCL</text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="418.666667" y="289.866667">17</text> -<line x1="433.066667" y1="306.933333" x2="404.266667" y2="306.933333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="435.733333" y="310.956667">SDA</text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="418.666667" y="304.266667">18</text> -<line x1="433.066667" y1="321.333333" x2="404.266667" y2="321.333333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="435.733333" y="325.356667"><tspan font-style="italic">+</tspan>5V</text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="418.666667" y="318.666667">19</text> -<line x1="469.866667" y1="29.333333" x2="469.866667" y2="0.533333" /> -<g transform="rotate(-90 468.515 14.9752)"> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="468.556667" y="14.933333">21</text> -</g> -<g transform="rotate(-90 479.181 40.0419)"> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="479.223333" y="40">SH2</text> -</g> -<line x1="455.466667" y1="29.333333" x2="455.466667" y2="0.533333" /> -<g transform="rotate(-90 454.115 14.9752)"> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="454.156667" y="14.933333">20</text> -</g> -<g transform="rotate(-90 464.781 40.0419)"> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="464.823333" y="40">SH1</text> -</g> -<line x1="469.866667" y1="354.133333" x2="469.866667" y2="382.933333" /> -<g transform="rotate(-90 468.515 368.575)"> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="468.556667" y="368.533333">23</text> -</g> -<g transform="rotate(-90 479.181 335.509)"> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="479.223333" y="335.466667">SH4</text> -</g> -<line x1="455.466667" y1="354.133333" x2="455.466667" y2="382.933333" /> -<g transform="rotate(-90 454.115 368.575)"> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="454.156667" y="368.533333">22</text> -</g> -<g transform="rotate(-90 464.781 335.509)"> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="464.823333" y="335.466667">SH3</text> -</g> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="430.4" y="352.49">Micro</text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="430.4" y="363.823333">HDMI</text> -<rect x="562.666667" y="149.333333" rx="24" ry="24" width="86.4" height="201.6" /> -<line x1="562.666667" y1="170.933333" x2="533.866667" y2="170.933333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="565.333333" y="174.956667">GND</text> -<line x1="562.666667" y1="185.333333" x2="533.866667" y2="185.333333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="565.333333" y="189.356667">RX1<tspan font-style="italic">+</tspan></text> -<line x1="562.666667" y1="199.733333" x2="533.866667" y2="199.733333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="565.333333" y="203.756667">RX1<tspan font-style="italic">-</tspan></text> -<line x1="562.666667" y1="214.133333" x2="533.866667" y2="214.133333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="565.333333" y="218.156667">VBUS</text> -<line x1="562.666667" y1="228.533333" x2="533.866667" y2="228.533333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="565.333333" y="232.556667">SBU2</text> -<line x1="562.666667" y1="242.933333" x2="533.866667" y2="242.933333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="565.333333" y="246.956667">D<tspan font-style="italic">-</tspan></text> -<line x1="562.666667" y1="257.333333" x2="533.866667" y2="257.333333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="565.333333" y="261.356667">D<tspan font-style="italic">+</tspan></text> -<line x1="562.666667" y1="271.733333" x2="533.866667" y2="271.733333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="565.333333" y="275.756667">CC2</text> -<line x1="562.666667" y1="286.133333" x2="533.866667" y2="286.133333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="565.333333" y="290.156667">VBUS</text> -<line x1="562.666667" y1="300.533333" x2="533.866667" y2="300.533333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="565.333333" y="304.556667">TX2<tspan font-style="italic">-</tspan></text> -<line x1="562.666667" y1="314.933333" x2="533.866667" y2="314.933333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="565.333333" y="318.956667">TX2<tspan font-style="italic">+</tspan></text> -<line x1="562.666667" y1="329.333333" x2="533.866667" y2="329.333333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="565.333333" y="333.356667">GND</text> -<line x1="649.066667" y1="170.933333" x2="677.866667" y2="170.933333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="646.4" y="174.956667">GND</text> -<line x1="649.066667" y1="185.333333" x2="677.866667" y2="185.333333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="646.4" y="189.356667">TX1<tspan font-style="italic">+</tspan></text> -<line x1="649.066667" y1="199.733333" x2="677.866667" y2="199.733333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="646.4" y="203.756667">TX1<tspan font-style="italic">-</tspan></text> -<line x1="649.066667" y1="214.133333" x2="677.866667" y2="214.133333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="646.4" y="218.156667">VBUS</text> -<line x1="649.066667" y1="228.533333" x2="677.866667" y2="228.533333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="646.4" y="232.556667">CC1</text> -<line x1="649.066667" y1="242.933333" x2="677.866667" y2="242.933333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="646.4" y="246.956667">D<tspan font-style="italic">+</tspan></text> -<line x1="649.066667" y1="257.333333" x2="677.866667" y2="257.333333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="646.4" y="261.356667">D<tspan font-style="italic">-</tspan></text> -<line x1="649.066667" y1="271.733333" x2="677.866667" y2="271.733333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="646.4" y="275.756667">SBU1</text> -<line x1="649.066667" y1="286.133333" x2="677.866667" y2="286.133333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="646.4" y="290.156667">VBUS</text> -<line x1="649.066667" y1="300.533333" x2="677.866667" y2="300.533333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="646.4" y="304.556667">RX2<tspan font-style="italic">-</tspan></text> -<line x1="649.066667" y1="314.933333" x2="677.866667" y2="314.933333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="646.4" y="318.956667">RX2<tspan font-style="italic">+</tspan></text> -<line x1="649.066667" y1="329.333333" x2="677.866667" y2="329.333333" /> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="646.4" y="333.356667">GND</text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - x="605.866667" y="361.646667">USB-C Socket</text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="536.533333" y="168.266667">B12</text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="536.533333" y="326.666667">B1</text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="675.2" y="168.266667">A1</text> -<text font-size="8.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="675.2" y="326.666667">A12</text> -</g> -</g></svg> diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/dpv/CsourceDPV.svg b/Master/texmf-dist/doc/latex/circuit-macros/examples/dpv/CsourceDPV.svg deleted file mode 100644 index 81aa8f201dd..00000000000 --- a/Master/texmf-dist/doc/latex/circuit-macros/examples/dpv/CsourceDPV.svg +++ /dev/null @@ -1,1175 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" -"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> -<!-- Creator: dpic version 2022.12.01 option -v for SVG 1.1 --> -<!-- width="797" height="428" --> -<svg - xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" - xml:space="preserve" - style="shape-rendering:geometricPrecision; text-rendering:geometricPrecision; - image-rendering:optimizeQuality; fill-rule:evenodd; clip-rule:evenodd" - width="796.4px" height="426.730667px" - viewBox="0 0 796.4 426.730667" - font-size="11pt" text-anchor="middle" - stroke="black" stroke-miterlimit="10" stroke-width="1.066667" fill="none"> -<g> -<g style="font-family:sans-serif" -> -<polyline points="106.666667,4.698667 106.666667,16.698667 -110.666667,18.698667 -102.666667,22.698667 -110.666667,26.698667 -102.666667,30.698667 -110.666667,34.698667 -102.666667,38.698667 -106.666667,40.698667 -106.666667,52.698667" /> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="112" y="26.616" -><tspan font-style="italic">R<tspan font-size="70%" -dy="0.66ex" dx="">2</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></tspan></text> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="114.666667" y="39.112">150Ω</text> -<circle fill="black" - cx="106.666667" cy="52.698667" r="1.92" /> -<polyline points="106.666667,52.698667 106.666667,62.298667 -107.022222,62.458667" /> -<polyline points="106.666667,100.698667 106.666667,91.098667 -107.022222,90.938667" /> -<line x1="125.866667" y1="67.098667" x2="125.866667" y2="86.298667" /> -<line x1="137.866667" y1="76.698667" x2="125.866667" y2="76.698667" /> -<line x1="106.666667" y1="62.298667" x2="125.866667" y2="70.938667" /> -<polygon stroke-width="0" fill="black" - points="114.8656,63.063959 121.066667,68.778667 -112.676989,67.92754" /> -<line x1="111.466667" y1="64.458667" x2="119.528667" y2="68.086567" /> -<line x1="106.666667" y1="91.098667" x2="125.866667" y2="82.458667" /> -<path d="M 137.866667,76.698667 - A 19.2 19.2 0 0 1 99.466667,76.698667" /> -<line x1="99.466667" y1="76.698667" x2="99.466667" y2="76.698667" /> -<path d="M 99.466667,76.698667 - A 19.2 19.2 0 0 1 137.866667,76.698667" /> -<line x1="137.866667" y1="76.698667" x2="137.866667" y2="76.698667" /> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="100.8" y="74.616" -><tspan font-style="italic">Q<tspan font-size="70%" -dy="0.66ex" dx="">13</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></tspan></text> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="98.133333" y="87.112">2N4236</text> -<line x1="106.666667" y1="100.698667" x2="106.666667" y2="323.898667" /> -<polyline points="106.666667,371.898667 106.666667,362.298667 -107.022222,362.138667" /> -<polyline points="106.666667,323.898667 106.666667,333.498667 -107.022222,333.658667" /> -<line x1="125.866667" y1="357.498667" x2="125.866667" y2="338.298667" /> -<line x1="137.866667" y1="347.898667" x2="125.866667" y2="347.898667" /> -<line x1="106.666667" y1="362.298667" x2="125.866667" y2="353.658667" /> -<polygon stroke-width="0" fill="black" - points="119.856345,359.28754 111.466667,360.138667 -117.667733,354.423959" /> -<line x1="113.004666" y1="359.446567" x2="121.066667" y2="355.818667" /> -<line x1="106.666667" y1="333.498667" x2="125.866667" y2="342.138667" /> -<path d="M 137.866667,347.898667 - A 19.2 19.2 0 0 0 99.466667,347.898667" /> -<line x1="99.466667" y1="347.898667" x2="99.466667" y2="347.898667" /> -<path d="M 99.466667,347.898667 - A 19.2 19.2 0 0 0 137.866667,347.898667" /> -<line x1="137.866667" y1="347.898667" x2="137.866667" y2="347.898667" /> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="100.8" y="345.816" -><tspan font-style="italic">Q<tspan font-size="70%" -dy="0.66ex" dx="">14</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></tspan></text> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="98.133333" y="358.312">2N4239</text> -<circle fill="black" - cx="106.666667" cy="371.898667" r="1.92" /> -<polyline points="106.666667,371.898667 44.266667,371.898667 -44.266667,323.898667" /> -<polyline points="44.266667,323.898667 44.266667,311.898667 -40.266667,309.898667 -48.266667,305.898667 -40.266667,301.898667 -48.266667,297.898667 -40.266667,293.898667 -48.266667,289.898667 -44.266667,287.898667 -44.266667,275.898667" /> -<polygon stroke-width="0" fill="black" - points="34.666667,297.498667 44.266667,299.898667 -34.666667,302.298667" /> -<line x1="24.266667" y1="299.898667" x2="42.067677" y2="299.898667" /> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="49.6" y="297.816" -><tspan font-style="italic">R<tspan font-size="70%" -dy="0.66ex" dx="">1</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></tspan></text> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="52.266667" y="310.312">20kΩ</text> -<line x1="24.266667" y1="299.898667" x2="24.266667" y2="311.898667" /> -<line x1="32.266667" y1="311.898667" x2="16.266667" y2="311.898667" /> -<line x1="29.6" y1="314.898667" x2="18.933333" y2="314.898667" /> -<line x1="27.695238" y1="317.898667" x2="20.838095" y2="317.898667" /> -<polyline points="44.266667,275.898667 44.266667,52.698667 -106.666667,52.698667" /> -<circle fill="black" - cx="106.666667" cy="172.698667" r="1.92" /> -<line x1="106.666667" y1="172.698667" x2="20.266667" y2="172.698667" /> -<line x1="20.266667" y1="172.698667" x2="44.266667" y2="172.698667" /> -<polygon stroke-width="0" fill="black" - points="27.466667,170.298667 37.066667,172.698667 -27.466667,175.098667" /> -<line x1="27.466667" y1="172.698667" x2="34.867677" y2="172.698667" /> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - x="32.266667" y="167.632" ->i<tspan font-size="70%" -dy="0.66ex" dx="">1</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></text> -<circle fill="white" - cx="20.266667" cy="172.698667" r="1.92" /> -<circle fill="white" - cx="20.266667" cy="220.698667" r="1.92" /> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="17.6" y="182.476444">+</text> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="17.6" y="200.864" ->V<tspan font-size="70%" -dy="0.66ex" dx="">1</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></text> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="17.6" y="219.251556">-</text> -<line x1="20.266667" y1="222.618667" x2="20.266667" y2="232.698667" /> -<line x1="28.266667" y1="232.698667" x2="12.266667" y2="232.698667" /> -<line x1="25.6" y1="235.698667" x2="14.933333" y2="235.698667" /> -<line x1="23.695238" y1="238.698667" x2="16.838095" y2="238.698667" /> -<polyline points="106.666667,371.898667 106.666667,383.898667 -110.666667,385.898667 -102.666667,389.898667 -110.666667,393.898667 -102.666667,397.898667 -110.666667,401.898667 -102.666667,405.898667 -106.666667,407.898667 -106.666667,419.898667" /> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="112" y="393.816" -><tspan font-style="italic">R<tspan font-size="70%" -dy="0.66ex" dx="">3</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></tspan></text> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="114.666667" y="406.312">150Ω</text> -<circle fill="black" - cx="106.666667" cy="244.698667" r="1.92" /> -<line x1="106.666667" y1="244.698667" x2="130.666667" y2="244.698667" /> -<polyline points="130.666667,232.698667 130.666667,208.698667 -178.666667,232.698667 -130.666667,256.698667 -130.666667,232.698667" /> -<line x1="178.666667" y1="232.698667" x2="190.666667" y2="232.698667" /> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - x="135.980075" y="224.030933">-</text> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - x="135.980075" y="248.030933">+</text> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - x="154.666667" y="236.864" -><tspan font-style="italic">A<tspan font-size="70%" -dy="0.66ex" dx="">1</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></tspan></text> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="176" y="259.162667">Nexus</text> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="176" y="270.896">SQ-10A</text> -<polyline points="130.666667,220.698667 118.666667,220.698667 -118.666667,196.698667 -166.666667,196.698667" /> -<circle fill="black" - cx="166.666667" cy="196.698667" r="1.92" /> -<polyline points="166.666667,196.698667 166.666667,172.698667 -162.666667,170.698667 -170.666667,166.698667 -162.666667,162.698667 -170.666667,158.698667 -162.666667,154.698667 -170.666667,150.698667 -166.666667,148.698667 -166.666667,124.698667" /> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="161.333333" y="158.616" -><tspan font-style="italic">R<tspan font-size="70%" -dy="0.66ex" dx="">14</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></tspan></text> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="158.666667" y="171.112">19kΩ</text> -<polyline points="166.666667,124.698667 166.666667,52.698667 -106.666667,52.698667" /> -<line x1="166.666667" y1="196.698667" x2="190.666667" y2="196.698667" /> -<circle fill="black" - cx="190.666667" cy="196.698667" r="1.92" /> -<line x1="190.666667" y1="196.698667" x2="190.666667" y2="232.698667" /> -<circle fill="black" - cx="190.666667" cy="232.698667" r="1.92" /> -<polyline points="190.666667,232.698667 190.666667,290.298667 -194.666667,292.298667 -186.666667,296.298667 -194.666667,300.298667 -186.666667,304.298667 -194.666667,308.298667 -186.666667,312.298667 -190.666667,314.298667 -190.666667,371.898667" /> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="196" y="300.216" -><tspan font-style="italic">R<tspan font-size="70%" -dy="0.66ex" dx="">13</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></tspan></text> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="198.666667" y="312.712">91kΩ</text> -<line x1="190.666667" y1="371.898667" x2="106.666667" y2="371.898667" /> -<polyline points="190.666667,196.698667 202.666667,196.698667 -204.666667,192.698667 -208.666667,200.698667 -212.666667,192.698667 -216.666667,200.698667 -220.666667,192.698667 -224.666667,200.698667 -226.666667,196.698667 -238.666667,196.698667" /> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="201.333333" y="211.696" -><tspan font-style="italic">R<tspan font-size="70%" -dy="0.66ex" dx="">6</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></tspan></text> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="204" y="224.192">15kΩ</text> -<circle fill="black" - cx="238.666667" cy="196.698667" r="1.92" /> -<polyline points="238.666667,196.698667 238.666667,220.698667 -250.666667,220.698667" /> -<polyline points="250.666667,232.698667 250.666667,208.698667 -298.666667,232.698667 -250.666667,256.698667 -250.666667,232.698667" /> -<line x1="298.666667" y1="232.698667" x2="310.666667" y2="232.698667" /> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - x="255.980075" y="224.030933">-</text> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - x="255.980075" y="248.030933">+</text> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - x="274.666667" y="236.864" -><tspan font-style="italic">A<tspan font-size="70%" -dy="0.66ex" dx="">2</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></tspan></text> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="296" y="259.162667">Nexus</text> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="296" y="270.896">SQ-10A</text> -<line x1="250.666667" y1="244.698667" x2="238.666667" y2="244.698667" /> -<line x1="238.666667" y1="244.698667" x2="238.666667" y2="256.698667" /> -<line x1="246.666667" y1="256.698667" x2="230.666667" y2="256.698667" /> -<line x1="244" y1="259.698667" x2="233.333333" y2="259.698667" /> -<line x1="242.095238" y1="262.698667" x2="235.238095" y2="262.698667" /> -<circle fill="black" - cx="310.666667" cy="232.698667" r="1.92" /> -<polyline points="357.466667,275.898667 357.466667,290.298667 -356.403985,290.298667" /> -<polyline points="357.466667,323.898667 357.466667,309.498667 -356.403985,309.498667" /> -<line x1="357.466667" y1="309.498667" x2="340.666667" y2="309.498667" /> -<line x1="340.666667" y1="287.898667" x2="340.666667" y2="311.898667" /> -<line x1="340.666667" y1="299.898667" x2="321.466667" y2="299.898667" /> -<polygon stroke-width="0" fill="black" - points="334.266667,302.565333 326.266667,299.898667 -334.266667,297.232" /> -<line x1="334.266667" y1="299.898667" x2="327.953215" y2="299.898667" /> -<line x1="357.466667" y1="290.298667" x2="340.666667" y2="290.298667" /> -<circle cx="340.666667" cy="299.898667" r="19.2" /> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="313.466667" y="267.568" -><tspan font-style="italic">Q<tspan font-size="70%" -dy="0.66ex" dx="">3</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></tspan></text> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="316.133333" y="280.064">2N5464</text> -<line x1="357.466667" y1="323.898667" x2="369.466667" y2="323.898667" /> -<polyline points="400.666667,347.898667 400.666667,338.298667 -400.311111,338.138667" /> -<polyline points="400.666667,299.898667 400.666667,309.498667 -400.311111,309.658667" /> -<line x1="381.466667" y1="333.498667" x2="381.466667" y2="314.298667" /> -<line x1="369.466667" y1="323.898667" x2="381.466667" y2="323.898667" /> -<line x1="400.666667" y1="338.298667" x2="381.466667" y2="329.658667" /> -<polygon stroke-width="0" fill="black" - points="389.6656,330.423959 395.866667,336.138667 -387.476989,335.28754" /> -<line x1="394.328667" y1="335.446567" x2="386.266667" y2="331.818667" /> -<line x1="400.666667" y1="309.498667" x2="381.466667" y2="318.138667" /> -<path d="M 369.466667,323.898667 - A 19.2 19.2 0 0 1 407.866667,323.898667" /> -<line x1="407.866667" y1="323.898667" x2="407.866667" y2="323.898667" /> -<path d="M 407.866667,323.898667 - A 19.2 19.2 0 1 1 369.466667,323.898667" /> -<line x1="369.466667" y1="323.898667" x2="369.466667" y2="323.898667" /> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="406.533333" y="321.816" -><tspan font-style="italic">Q<tspan font-size="70%" -dy="0.66ex" dx="">4</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></tspan></text> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="409.2" y="334.312">2N4239</text> -<circle fill="black" - cx="400.666667" cy="275.898667" r="1.92" /> -<polyline points="357.466667,275.898667 400.666667,275.898667 -400.666667,299.898667" /> -<polyline points="310.666667,232.698667 310.666667,299.898667 -321.466667,299.898667" /> -<line x1="400.666667" y1="347.898667" x2="400.666667" y2="419.898667" /> -<circle fill="black" - cx="400.666667" cy="419.898667" r="1.92" /> -<line x1="400.666667" y1="251.898667" x2="400.666667" y2="260.434565" /> -<polyline stroke-width="0" fill="black" - points="400.666667,260.434565 -404.666667,260.434565 -400.666667,266.831427 -396.666667,260.434565 -400.666667,260.434565" /> -<polyline points="400.666667,260.434565 404.666667,260.434565 -400.666667,266.831427 -396.666667,260.434565 -400.666667,260.434565" /> -<line x1="396.277698" y1="267.362768" x2="405.055635" y2="267.362768" /> -<line x1="400.666667" y1="267.362768" x2="400.666667" y2="275.898667" /> -<line x1="400.666667" y1="235.898667" x2="400.666667" y2="244.434565" /> -<polyline stroke-width="0" fill="black" - points="400.666667,244.434565 -404.666667,244.434565 -400.666667,250.831427 -396.666667,244.434565 -400.666667,244.434565" /> -<polyline points="400.666667,244.434565 404.666667,244.434565 -400.666667,250.831427 -396.666667,244.434565 -400.666667,244.434565" /> -<line x1="396.277698" y1="251.362768" x2="405.055635" y2="251.362768" /> -<line x1="400.666667" y1="251.362768" x2="400.666667" y2="259.898667" /> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="393.079691" y="240.330667">OMC-V</text> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="393.079691" y="252.064" -><tspan font-style="italic">D<tspan font-size="70%" -dy="0.66ex" dx="">4</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></tspan></text> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="393.079691" y="263.797333" -><tspan font-style="italic">D<tspan font-size="70%" -dy="0.66ex" dx="">3</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></tspan></text> -<polyline points="357.466667,100.698667 357.466667,115.098667 -356.403985,115.098667" /> -<polyline points="357.466667,148.698667 357.466667,134.298667 -356.403985,134.298667" /> -<line x1="357.466667" y1="134.298667" x2="340.666667" y2="134.298667" /> -<line x1="340.666667" y1="112.698667" x2="340.666667" y2="136.698667" /> -<polygon stroke-width="0" fill="black" - points="332.666667,122.032 340.666667,124.698667 -332.666667,127.365333" /> -<line x1="321.466667" y1="124.698667" x2="338.980119" y2="124.698667" /> -<line x1="357.466667" y1="115.098667" x2="340.666667" y2="115.098667" /> -<circle cx="340.666667" cy="124.698667" r="19.2" /> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="320.133333" y="151.6144" -><tspan font-style="italic">Q<tspan font-size="70%" -dy="0.66ex" dx="">1</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></tspan></text> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="322.8" y="164.1104">2N3819</text> -<line x1="357.466667" y1="100.698667" x2="369.466667" y2="100.698667" /> -<polyline points="400.666667,76.698667 400.666667,86.298667 -400.311111,86.458667" /> -<polyline points="400.666667,124.698667 400.666667,115.098667 -400.311111,114.938667" /> -<line x1="381.466667" y1="91.098667" x2="381.466667" y2="110.298667" /> -<line x1="369.466667" y1="100.698667" x2="381.466667" y2="100.698667" /> -<line x1="400.666667" y1="86.298667" x2="381.466667" y2="94.938667" /> -<polygon stroke-width="0" fill="black" - points="394.656345,91.92754 386.266667,92.778667 -392.467733,87.063959" /> -<line x1="395.866667" y1="88.458667" x2="387.804666" y2="92.086567" /> -<line x1="400.666667" y1="115.098667" x2="381.466667" y2="106.458667" /> -<path d="M 369.466667,100.698667 - A 19.2 19.2 0 0 0 407.866667,100.698667" /> -<line x1="407.866667" y1="100.698667" x2="407.866667" y2="100.698667" /> -<path d="M 407.866667,100.698667 - A 19.2 19.2 0 0 0 369.466667,100.698667" /> -<line x1="369.466667" y1="100.698667" x2="369.466667" y2="100.698667" /> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="407.866667" y="98.616" -><tspan font-style="italic">Q<tspan font-size="70%" -dy="0.66ex" dx="">2</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></tspan></text> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="410.533333" y="111.112">2N4236</text> -<circle fill="black" - cx="400.666667" cy="148.698667" r="1.92" /> -<polyline points="357.466667,148.698667 400.666667,148.698667 -400.666667,124.698667" /> -<line x1="400.666667" y1="148.698667" x2="400.666667" y2="157.234565" /> -<polyline stroke-width="0" fill="black" - points="400.666667,157.234565 -404.666667,157.234565 -400.666667,163.631427 -396.666667,157.234565 -400.666667,157.234565" /> -<polyline points="400.666667,157.234565 404.666667,157.234565 -400.666667,163.631427 -396.666667,157.234565 -400.666667,157.234565" /> -<line x1="396.277698" y1="164.162768" x2="405.055635" y2="164.162768" /> -<line x1="400.666667" y1="164.162768" x2="400.666667" y2="172.698667" /> -<line x1="400.666667" y1="164.698667" x2="400.666667" y2="173.234565" /> -<polyline stroke-width="0" fill="black" - points="400.666667,173.234565 -404.666667,173.234565 -400.666667,179.631427 -396.666667,173.234565 -400.666667,173.234565" /> -<polyline points="400.666667,173.234565 404.666667,173.234565 -400.666667,179.631427 -396.666667,173.234565 -400.666667,173.234565" /> -<line x1="396.277698" y1="180.162768" x2="405.055635" y2="180.162768" /> -<line x1="400.666667" y1="180.162768" x2="400.666667" y2="188.698667" /> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="393.079691" y="169.130667" -><tspan font-style="italic">D<tspan font-size="70%" -dy="0.66ex" dx="">1</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></tspan></text> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="393.079691" y="180.864" -><tspan font-style="italic">D<tspan font-size="70%" -dy="0.66ex" dx="">2</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></tspan></text> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="393.079691" y="192.597333">OMC-V</text> -<circle fill="black" - cx="400.666667" cy="232.698667" r="1.92" /> -<line x1="400.666667" y1="232.698667" x2="400.666667" y2="188.698667" /> -<polyline points="321.466667,124.698667 310.666667,124.698667 -310.666667,232.698667" /> -<line x1="400.666667" y1="76.698667" x2="400.666667" y2="4.698667" /> -<circle fill="black" - cx="400.666667" cy="4.698667" r="1.92" /> -<circle fill="black" - cx="448.666667" cy="232.698667" r="1.92" /> -<polyline points="496.666667,275.898667 496.666667,290.298667 -495.603985,290.298667" /> -<polyline points="496.666667,323.898667 496.666667,309.498667 -495.603985,309.498667" /> -<line x1="496.666667" y1="309.498667" x2="479.866667" y2="309.498667" /> -<line x1="479.866667" y1="287.898667" x2="479.866667" y2="311.898667" /> -<line x1="479.866667" y1="299.898667" x2="460.666667" y2="299.898667" /> -<polygon stroke-width="0" fill="black" - points="473.466667,302.565333 465.466667,299.898667 -473.466667,297.232" /> -<line x1="473.466667" y1="299.898667" x2="467.153215" y2="299.898667" /> -<line x1="496.666667" y1="290.298667" x2="479.866667" y2="290.298667" /> -<circle cx="479.866667" cy="299.898667" r="19.2" /> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="452.666667" y="267.568" -><tspan font-style="italic">Q<tspan font-size="70%" -dy="0.66ex" dx="">7</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></tspan></text> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="455.333333" y="280.064">2N5464</text> -<line x1="496.666667" y1="323.898667" x2="508.666667" y2="323.898667" /> -<polyline points="539.866667,347.898667 539.866667,338.298667 -539.511111,338.138667" /> -<polyline points="539.866667,299.898667 539.866667,309.498667 -539.511111,309.658667" /> -<line x1="520.666667" y1="333.498667" x2="520.666667" y2="314.298667" /> -<line x1="508.666667" y1="323.898667" x2="520.666667" y2="323.898667" /> -<line x1="539.866667" y1="338.298667" x2="520.666667" y2="329.658667" /> -<polygon stroke-width="0" fill="black" - points="528.8656,330.423959 535.066667,336.138667 -526.676989,335.28754" /> -<line x1="533.528667" y1="335.446567" x2="525.466667" y2="331.818667" /> -<line x1="539.866667" y1="309.498667" x2="520.666667" y2="318.138667" /> -<path d="M 508.666667,323.898667 - A 19.2 19.2 0 0 1 547.066667,323.898667" /> -<line x1="547.066667" y1="323.898667" x2="547.066667" y2="323.898667" /> -<path d="M 547.066667,323.898667 - A 19.2 19.2 0 1 1 508.666667,323.898667" /> -<line x1="508.666667" y1="323.898667" x2="508.666667" y2="323.898667" /> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="545.733333" y="321.816" -><tspan font-style="italic">Q<tspan font-size="70%" -dy="0.66ex" dx="">8</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></tspan></text> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="548.4" y="334.312">2N4239</text> -<circle fill="black" - cx="539.866667" cy="275.898667" r="1.92" /> -<polyline points="496.666667,275.898667 539.866667,275.898667 -539.866667,299.898667" /> -<circle fill="black" - cx="539.866667" cy="347.898667" r="1.92" /> -<line x1="539.866667" y1="347.898667" x2="137.866667" y2="347.898667" /> -<polyline points="496.666667,100.698667 496.666667,115.098667 -495.603985,115.098667" /> -<polyline points="496.666667,148.698667 496.666667,134.298667 -495.603985,134.298667" /> -<line x1="496.666667" y1="134.298667" x2="479.866667" y2="134.298667" /> -<line x1="479.866667" y1="112.698667" x2="479.866667" y2="136.698667" /> -<polygon stroke-width="0" fill="black" - points="471.866667,122.032 479.866667,124.698667 -471.866667,127.365333" /> -<line x1="460.666667" y1="124.698667" x2="478.180119" y2="124.698667" /> -<line x1="496.666667" y1="115.098667" x2="479.866667" y2="115.098667" /> -<circle cx="479.866667" cy="124.698667" r="19.2" /> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="459.333333" y="151.6144" -><tspan font-style="italic">Q<tspan font-size="70%" -dy="0.66ex" dx="">5</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></tspan></text> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="462" y="164.1104">2N3819</text> -<line x1="496.666667" y1="100.698667" x2="508.666667" y2="100.698667" /> -<polyline points="539.866667,76.698667 539.866667,86.298667 -539.511111,86.458667" /> -<polyline points="539.866667,124.698667 539.866667,115.098667 -539.511111,114.938667" /> -<line x1="520.666667" y1="91.098667" x2="520.666667" y2="110.298667" /> -<line x1="508.666667" y1="100.698667" x2="520.666667" y2="100.698667" /> -<line x1="539.866667" y1="86.298667" x2="520.666667" y2="94.938667" /> -<polygon stroke-width="0" fill="black" - points="533.856345,91.92754 525.466667,92.778667 -531.667733,87.063959" /> -<line x1="535.066667" y1="88.458667" x2="527.004666" y2="92.086567" /> -<line x1="539.866667" y1="115.098667" x2="520.666667" y2="106.458667" /> -<path d="M 508.666667,100.698667 - A 19.2 19.2 0 0 0 547.066667,100.698667" /> -<line x1="547.066667" y1="100.698667" x2="547.066667" y2="100.698667" /> -<path d="M 547.066667,100.698667 - A 19.2 19.2 0 0 0 508.666667,100.698667" /> -<line x1="508.666667" y1="100.698667" x2="508.666667" y2="100.698667" /> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="547.066667" y="98.616" -><tspan font-style="italic">Q<tspan font-size="70%" -dy="0.66ex" dx="">6</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></tspan></text> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="549.733333" y="111.112">2N4236</text> -<circle fill="black" - cx="539.866667" cy="148.698667" r="1.92" /> -<polyline points="496.666667,148.698667 539.866667,148.698667 -539.866667,124.698667" /> -<circle fill="black" - cx="539.866667" cy="76.698667" r="1.92" /> -<line x1="539.866667" y1="76.698667" x2="137.866667" y2="76.698667" /> -<polyline points="460.666667,299.898667 448.666667,299.898667 -448.666667,124.698667 -460.666667,124.698667" /> -<polyline points="539.866667,148.698667 539.866667,160.698667 -543.866667,162.698667 -535.866667,166.698667 -543.866667,170.698667 -535.866667,174.698667 -543.866667,178.698667 -535.866667,182.698667 -539.866667,184.698667 -539.866667,196.698667" /> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="534.533333" y="170.616" -><tspan font-style="italic">R<tspan font-size="70%" -dy="0.66ex" dx="">11</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></tspan></text> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="531.866667" y="183.112">20Ω</text> -<line x1="539.866667" y1="275.898667" x2="539.866667" y2="257.762768" /> -<polyline stroke-width="0" fill="black" - points="539.866667,257.762768 -535.866667,257.762768 -539.866667,251.365906 -543.866667,257.762768 -539.866667,257.762768" /> -<polyline points="539.866667,257.762768 535.866667,257.762768 -539.866667,251.365906 -543.866667,257.762768 -539.866667,257.762768" /> -<polyline points="544.255635,252.834565 544.255635,250.834565 -535.477698,250.834565 -535.477698,248.834565" /> -<line x1="539.866667" y1="250.834565" x2="539.866667" y2="232.698667" /> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="533.613024" y="251.48167" -><tspan font-style="italic">D<tspan font-size="70%" -dy="0.66ex" dx="">5</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></tspan></text> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="530.946357" y="263.97767">1N4729</text> -<line x1="539.866667" y1="232.698667" x2="539.866667" y2="196.698667" /> -<line x1="539.866667" y1="275.898667" x2="568.666667" y2="275.898667" /> -<line x1="568.666667" y1="281.898667" x2="568.666667" y2="269.898667" /> -<path d="M 573.466667,281.898667 - A 12 12 0 0 1 573.466667,269.898667" /> -<line x1="571.858972" y1="275.898667" x2="602.266667" y2="275.898667" /> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - x="571.066667" y="267.232" -><tspan font-style="italic">C<tspan font-size="70%" -dy="0.66ex" dx="">4</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></tspan></text> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - x="571.066667" y="292.896">0.68μF</text> -<line x1="539.866667" y1="148.698667" x2="568.666667" y2="148.698667" /> -<line x1="568.666667" y1="154.698667" x2="568.666667" y2="142.698667" /> -<path d="M 573.466667,154.698667 - A 12 12 0 0 1 573.466667,142.698667" /> -<line x1="571.858972" y1="148.698667" x2="602.266667" y2="148.698667" /> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - x="571.066667" y="140.032" -><tspan font-style="italic">C<tspan font-size="70%" -dy="0.66ex" dx="">3</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></tspan></text> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - x="571.066667" y="165.696">0.68μF</text> -<circle fill="black" - cx="602.266667" cy="148.698667" r="1.92" /> -<circle fill="black" - cx="602.266667" cy="196.698667" r="1.92" /> -<line x1="539.866667" y1="196.698667" x2="568.666667" y2="196.698667" /> -<line x1="568.666667" y1="202.698667" x2="568.666667" y2="190.698667" /> -<path d="M 573.466667,202.698667 - A 12 12 0 0 1 573.466667,190.698667" /> -<line x1="571.858972" y1="196.698667" x2="602.266667" y2="196.698667" /> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - x="571.066667" y="188.032" -><tspan font-style="italic">C<tspan font-size="70%" -dy="0.66ex" dx="">2</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></tspan></text> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - x="571.066667" y="213.696">0.1μF</text> -<line x1="539.866667" y1="196.698667" x2="238.666667" y2="196.698667" /> -<polyline points="238.666667,196.698667 238.666667,148.698667 -234.666667,146.698667 -242.666667,142.698667 -234.666667,138.698667 -242.666667,134.698667 -234.666667,130.698667 -242.666667,126.698667 -238.666667,124.698667 -238.666667,76.698667" /> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="244" y="134.616" -><tspan font-style="italic">R<tspan font-size="70%" -dy="0.66ex" dx="">5</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></tspan></text> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="246.666667" y="147.112">100kΩ</text> -<circle fill="black" - cx="238.666667" cy="100.698667" r="1.92" /> -<line x1="238.666667" y1="100.698667" x2="214.666667" y2="100.698667" /> -<line x1="214.666667" y1="100.698667" x2="214.666667" y2="122.298667" /> -<line x1="208.666667" y1="122.298667" x2="220.666667" y2="122.298667" /> -<path d="M 208.666667,127.098667 - A 12 12 0 0 1 220.666667,127.098667" /> -<line x1="214.666667" y1="125.490972" x2="214.666667" y2="148.698667" /> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="207.333333" y="122.616" -><tspan font-style="italic">C<tspan font-size="70%" -dy="0.66ex" dx="">1</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></tspan></text> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="204.666667" y="135.112">1μF</text> -<line x1="222.666667" y1="148.698667" x2="206.666667" y2="148.698667" /> -<line x1="220" y1="151.698667" x2="209.333333" y2="151.698667" /> -<line x1="218.095238" y1="154.698667" x2="211.238095" y2="154.698667" /> -<line x1="539.866667" y1="76.698667" x2="539.866667" y2="52.698667" /> -<polyline points="539.866667,52.698667 539.866667,40.698667 -535.866667,38.698667 -543.866667,34.698667 -535.866667,30.698667 -543.866667,26.698667 -535.866667,22.698667 -543.866667,18.698667 -539.866667,16.698667 -539.866667,4.698667" /> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="545.2" y="26.616" -><tspan font-style="italic">R<tspan font-size="70%" -dy="0.66ex" dx="">9</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></tspan></text> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="547.866667" y="39.112">910Ω</text> -<circle fill="black" - cx="539.866667" cy="4.698667" r="1.92" /> -<polyline points="539.866667,347.898667 539.866667,371.898667 -543.866667,373.898667 -535.866667,377.898667 -543.866667,381.898667 -535.866667,385.898667 -543.866667,389.898667 -535.866667,393.898667 -539.866667,395.898667 -539.866667,419.898667" /> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="545.2" y="381.816" -><tspan font-style="italic">R<tspan font-size="70%" -dy="0.66ex" dx="">10</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></tspan></text> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="547.866667" y="394.312">910Ω</text> -<circle fill="black" - cx="539.866667" cy="419.898667" r="1.92" /> -<line x1="238.666667" y1="76.698667" x2="238.666667" y2="52.698667" /> -<polyline points="238.666667,52.698667 262.666667,52.698667 -264.666667,48.698667 -268.666667,56.698667 -272.666667,48.698667 -276.666667,56.698667 -280.666667,48.698667 -284.666667,56.698667 -286.666667,52.698667 -310.666667,52.698667" /> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="261.333333" y="34.869333" -><tspan font-style="italic">R<tspan font-size="70%" -dy="0.66ex" dx="">4</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></tspan></text> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="264" y="47.365333">100kΩ</text> -<polyline points="310.666667,52.698667 602.266667,52.698667 -602.266667,275.898667" /> -<polyline points="703.066667,275.898667 703.066667,290.298667 -704.129348,290.298667" /> -<polyline points="703.066667,323.898667 703.066667,309.498667 -704.129348,309.498667" /> -<line x1="703.066667" y1="309.498667" x2="719.866667" y2="309.498667" /> -<line x1="719.866667" y1="287.898667" x2="719.866667" y2="311.898667" /> -<line x1="719.866667" y1="299.898667" x2="739.066667" y2="299.898667" /> -<polygon stroke-width="0" fill="black" - points="726.266667,297.232 734.266667,299.898667 -726.266667,302.565333" /> -<line x1="726.266667" y1="299.898667" x2="732.580119" y2="299.898667" /> -<line x1="703.066667" y1="290.298667" x2="719.866667" y2="290.298667" /> -<circle cx="719.866667" cy="299.898667" r="19.2" /> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="706" y="267.568" -><tspan font-style="italic">Q<tspan font-size="70%" -dy="0.66ex" dx="">11</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></tspan></text> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="708.666667" y="280.064">2N5464</text> -<line x1="703.066667" y1="323.898667" x2="691.066667" y2="323.898667" /> -<polyline points="659.866667,347.898667 659.866667,338.298667 -660.222222,338.138667" /> -<polyline points="659.866667,299.898667 659.866667,309.498667 -660.222222,309.658667" /> -<line x1="679.066667" y1="333.498667" x2="679.066667" y2="314.298667" /> -<line x1="691.066667" y1="323.898667" x2="679.066667" y2="323.898667" /> -<line x1="659.866667" y1="338.298667" x2="679.066667" y2="329.658667" /> -<polygon stroke-width="0" fill="black" - points="673.056345,335.28754 664.666667,336.138667 -670.867733,330.423959" /> -<line x1="666.204666" y1="335.446567" x2="674.266667" y2="331.818667" /> -<line x1="659.866667" y1="309.498667" x2="679.066667" y2="318.138667" /> -<path d="M 691.066667,323.898667 - A 19.2 19.2 0 0 0 652.666667,323.898667" /> -<line x1="652.666667" y1="323.898667" x2="652.666667" y2="323.898667" /> -<path d="M 652.666667,323.898667 - A 19.2 19.2 0 0 0 691.066667,323.898667" /> -<line x1="691.066667" y1="323.898667" x2="691.066667" y2="323.898667" /> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="654" y="321.816" -><tspan font-style="italic">Q<tspan font-size="70%" -dy="0.66ex" dx="">10</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></tspan></text> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="651.333333" y="334.312">2N4239</text> -<circle fill="black" - cx="659.866667" cy="275.898667" r="1.92" /> -<polyline points="703.066667,275.898667 659.866667,275.898667 -659.866667,299.898667" /> -<line x1="659.866667" y1="347.898667" x2="659.866667" y2="419.898667" /> -<circle fill="black" - cx="659.866667" cy="419.898667" r="1.92" /> -<line x1="106.666667" y1="419.898667" x2="683.866667" y2="419.898667" /> -<circle fill="white" - cx="683.866667" cy="419.898667" r="1.92" /> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="688.453333" y="424.064" -><tspan font-style="italic">-E<tspan font-size="70%" -dy="0.66ex" dx="">CC</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></tspan></text> -<line x1="659.866667" y1="275.898667" x2="659.866667" y2="257.762768" /> -<polyline stroke-width="0" fill="black" - points="659.866667,257.762768 -655.866667,257.762768 -659.866667,251.365906 -663.866667,257.762768 -659.866667,257.762768" /> -<polyline points="659.866667,257.762768 655.866667,257.762768 -659.866667,251.365906 -663.866667,257.762768 -659.866667,257.762768" /> -<polyline points="664.255635,252.834565 664.255635,250.834565 -655.477698,250.834565 -655.477698,248.834565" /> -<line x1="659.866667" y1="250.834565" x2="659.866667" y2="232.698667" /> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="653.613024" y="251.48167" -><tspan font-style="italic">D<tspan font-size="70%" -dy="0.66ex" dx="">6</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></tspan></text> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="650.946357" y="263.97767">1N4728</text> -<polyline points="703.066667,100.698667 703.066667,115.098667 -704.129348,115.098667" /> -<polyline points="703.066667,148.698667 703.066667,134.298667 -704.129348,134.298667" /> -<line x1="703.066667" y1="134.298667" x2="719.866667" y2="134.298667" /> -<line x1="719.866667" y1="112.698667" x2="719.866667" y2="136.698667" /> -<polygon stroke-width="0" fill="black" - points="727.866667,127.365333 719.866667,124.698667 -727.866667,122.032" /> -<line x1="739.066667" y1="124.698667" x2="721.553215" y2="124.698667" /> -<line x1="703.066667" y1="115.098667" x2="719.866667" y2="115.098667" /> -<circle cx="719.866667" cy="124.698667" r="19.2" /> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="704.666667" y="151.6144" -><tspan font-style="italic">Q<tspan font-size="70%" -dy="0.66ex" dx="">12</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></tspan></text> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="707.333333" y="164.1104">2N3819</text> -<line x1="703.066667" y1="100.698667" x2="691.066667" y2="100.698667" /> -<polyline points="659.866667,76.698667 659.866667,86.298667 -660.222222,86.458667" /> -<polyline points="659.866667,124.698667 659.866667,115.098667 -660.222222,114.938667" /> -<line x1="679.066667" y1="91.098667" x2="679.066667" y2="110.298667" /> -<line x1="691.066667" y1="100.698667" x2="679.066667" y2="100.698667" /> -<line x1="659.866667" y1="86.298667" x2="679.066667" y2="94.938667" /> -<polygon stroke-width="0" fill="black" - points="668.0656,87.063959 674.266667,92.778667 -665.876989,91.92754" /> -<line x1="664.666667" y1="88.458667" x2="672.728667" y2="92.086567" /> -<line x1="659.866667" y1="115.098667" x2="679.066667" y2="106.458667" /> -<path d="M 691.066667,100.698667 - A 19.2 19.2 0 0 1 652.666667,100.698667" /> -<line x1="652.666667" y1="100.698667" x2="652.666667" y2="100.698667" /> -<path d="M 652.666667,100.698667 - A 19.2 19.2 0 0 1 691.066667,100.698667" /> -<line x1="691.066667" y1="100.698667" x2="691.066667" y2="100.698667" /> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="652.666667" y="98.616" -><tspan font-style="italic">Q<tspan font-size="70%" -dy="0.66ex" dx="">9</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></tspan></text> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="650" y="111.112">2N4236</text> -<circle fill="black" - cx="659.866667" cy="148.698667" r="1.92" /> -<polyline points="703.066667,148.698667 659.866667,148.698667 -659.866667,124.698667" /> -<line x1="659.866667" y1="76.698667" x2="659.866667" y2="4.698667" /> -<circle fill="black" - cx="659.866667" cy="4.698667" r="1.92" /> -<line x1="106.666667" y1="4.698667" x2="683.866667" y2="4.698667" /> -<circle fill="white" - cx="683.866667" cy="4.698667" r="1.92" /> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="688.453333" y="8.864" -><tspan font-style="italic">E<tspan font-size="70%" -dy="0.66ex" dx="">CC</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></tspan></text> -<polyline points="659.866667,148.698667 659.866667,160.698667 -663.866667,162.698667 -655.866667,166.698667 -663.866667,170.698667 -655.866667,174.698667 -663.866667,178.698667 -655.866667,182.698667 -659.866667,184.698667 -659.866667,196.698667" /> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="654.533333" y="170.616" -><tspan font-style="italic">R<tspan font-size="70%" -dy="0.66ex" dx="">12</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></tspan></text> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="651.866667" y="183.112">20Ω</text> -<circle fill="black" - cx="659.866667" cy="196.698667" r="1.92" /> -<line x1="659.866667" y1="196.698667" x2="602.266667" y2="196.698667" /> -<line x1="659.866667" y1="196.698667" x2="659.866667" y2="232.698667" /> -<circle fill="black" - cx="751.066667" cy="172.698667" r="1.92" /> -<polyline points="739.066667,124.698667 751.066667,124.698667 -751.066667,299.898667 -739.066667,299.898667" /> -<line x1="775.066667" y1="172.698667" x2="751.066667" y2="172.698667" /> -<polygon stroke-width="0" fill="black" - points="767.866667,175.098667 758.266667,172.698667 -767.866667,170.298667" /> -<line x1="767.866667" y1="172.698667" x2="760.465656" y2="172.698667" /> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - x="763.066667" y="167.632" ->i<tspan font-size="70%" -dy="0.66ex" dx="">2</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></text> -<circle fill="white" - cx="775.066667" cy="172.698667" r="1.92" /> -<circle fill="white" - cx="775.066667" cy="220.698667" r="1.92" /> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="777.733333" y="182.476444">+</text> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="777.733333" y="200.864" ->V<tspan font-size="70%" -dy="0.66ex" dx="">2</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></text> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="777.733333" y="219.251556">-</text> -<line x1="775.066667" y1="222.618667" x2="775.066667" y2="232.698667" /> -<line x1="783.066667" y1="232.698667" x2="767.066667" y2="232.698667" /> -<line x1="780.4" y1="235.698667" x2="769.733333" y2="235.698667" /> -<line x1="778.495238" y1="238.698667" x2="771.638095" y2="238.698667" /> -<circle fill="black" - cx="751.066667" cy="232.698667" r="1.92" /> -<polyline points="751.066667,232.698667 717.466667,232.698667 -715.466667,236.698667 -711.466667,228.698667 -707.466667,236.698667 -703.466667,228.698667 -699.466667,236.698667 -695.466667,228.698667 -693.466667,232.698667 -659.866667,232.698667" /> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="692.133333" y="213.536" -><tspan font-style="italic">R<tspan font-size="70%" -dy="0.66ex" dx="">15</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></tspan></text> -<text font-size="8.8pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="694.8" y="226.032">200Ω</text> -<line x1="659.866667" y1="232.698667" x2="400.666667" y2="232.698667" /> -<circle fill="black" - cx="400.666667" cy="232.698667" r="1.92" /> -</g> -</g></svg> diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/dpv/EEPDPV.svg b/Master/texmf-dist/doc/latex/circuit-macros/examples/dpv/EEPDPV.svg deleted file mode 100644 index 25ca2367dd9..00000000000 --- a/Master/texmf-dist/doc/latex/circuit-macros/examples/dpv/EEPDPV.svg +++ /dev/null @@ -1,662 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" -"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> -<!-- Creator: dpic version 2022.12.01 option -v for SVG 1.1 --> -<!-- width="606" height="592" --> -<svg - xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" - xml:space="preserve" - style="shape-rendering:geometricPrecision; text-rendering:geometricPrecision; - image-rendering:optimizeQuality; fill-rule:evenodd; clip-rule:evenodd" - width="605.2px" height="590.666667px" - viewBox="0 0 605.2 590.666667" - font-size="11pt" text-anchor="middle" - stroke="black" stroke-miterlimit="10" stroke-width="1.066667" fill="none"> -<g> -<g style="font-family:sans-serif" -> -<circle fill="black" - cx="153.466667" cy="84.666667" r="1.92" /> -<line x1="153.466667" y1="84.666667" x2="153.466667" y2="56.666667" /> -<line x1="153.466667" y1="56.666667" x2="141.466667" y2="44.666667" /> -<line x1="153.466667" y1="40.666667" x2="153.466667" y2="12.666667" /> -<text font-size="10pt" stroke-width="0.266667" - fill="black" - x="153.466667" y="10">Public supply</text> -<line stroke-width="2.133333" - x1="33.466667" y1="84.666667" x2="273.466667" y2="84.666667" /> -<circle fill="black" - cx="43.066667" cy="84.666667" r="1.92" /> -<circle fill="black" - cx="87.226667" cy="84.666667" r="1.92" /> -<circle fill="black" - cx="131.386667" cy="84.666667" r="1.92" /> -<circle fill="black" - cx="175.546667" cy="84.666667" r="1.92" /> -<circle fill="black" - cx="219.706667" cy="84.666667" r="1.92" /> -<circle fill="black" - cx="263.866667" cy="84.666667" r="1.92" /> -<text font-size="10pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="36.133333" y="82"><tspan font-size="66%">20 kV</tspan></text> -<line x1="43.066667" y1="156.666667" x2="43.066667" y2="128.666667" /> -<line x1="43.066667" y1="128.666667" x2="31.066667" y2="116.666667" /> -<line x1="43.066667" y1="112.666667" x2="43.066667" y2="84.666667" /> -<line x1="87.226667" y1="156.666667" x2="87.226667" y2="128.666667" /> -<line x1="87.226667" y1="128.666667" x2="75.226667" y2="116.666667" /> -<line x1="87.226667" y1="112.666667" x2="87.226667" y2="84.666667" /> -<line x1="131.386667" y1="84.666667" x2="131.386667" y2="93.366667" /> -<circle cx="131.386667" cy="108.966667" r="15.6" /> -<circle cx="131.386667" cy="132.366667" r="15.6" /> -<line x1="131.386667" y1="147.966667" x2="131.386667" y2="156.666667" /> -<polyline points="131.386667,112.292204 125.626667,112.292204 -131.386667,102.315592 -137.146667,112.292204 -131.386667,112.292204" /> -<line x1="131.386667" y1="139.017742" x2="131.386667" y2="132.366667" /> -<polyline points="125.626667,129.041129 131.386667,132.366667 -137.146667,129.041129" /> -<polygon stroke-width="0" fill="black" - points="133.786667,163.066667 131.386667,172.666667 -128.986667,163.066667" /> -<line x1="131.386667" y1="156.666667" x2="131.386667" y2="170.467677" /> -<line x1="175.546667" y1="84.666667" x2="175.546667" y2="93.366667" /> -<circle cx="175.546667" cy="108.966667" r="15.6" /> -<circle cx="175.546667" cy="132.366667" r="15.6" /> -<line x1="175.546667" y1="147.966667" x2="175.546667" y2="156.666667" /> -<polyline points="175.546667,112.292204 169.786667,112.292204 -175.546667,102.315592 -181.306667,112.292204 -175.546667,112.292204" /> -<line x1="175.546667" y1="139.017742" x2="175.546667" y2="132.366667" /> -<polyline points="169.786667,129.041129 175.546667,132.366667 -181.306667,129.041129" /> -<polygon stroke-width="0" fill="black" - points="177.946667,163.066667 175.546667,172.666667 -173.146667,163.066667" /> -<line x1="175.546667" y1="156.666667" x2="175.546667" y2="170.467677" /> -<line x1="219.706667" y1="84.666667" x2="219.706667" y2="93.366667" /> -<circle cx="219.706667" cy="108.966667" r="15.6" /> -<circle cx="219.706667" cy="132.366667" r="15.6" /> -<line x1="219.706667" y1="147.966667" x2="219.706667" y2="156.666667" /> -<polyline points="219.706667,112.292204 213.946667,112.292204 -219.706667,102.315592 -225.466667,112.292204 -219.706667,112.292204" /> -<line x1="219.706667" y1="139.017742" x2="219.706667" y2="132.366667" /> -<polyline points="213.946667,129.041129 219.706667,132.366667 -225.466667,129.041129" /> -<polygon stroke-width="0" fill="black" - points="222.106667,163.066667 219.706667,172.666667 -217.306667,163.066667" /> -<line x1="219.706667" y1="156.666667" x2="219.706667" y2="170.467677" /> -<line x1="263.866667" y1="156.666667" x2="263.866667" y2="128.666667" /> -<line x1="263.866667" y1="128.666667" x2="251.866667" y2="116.666667" /> -<line x1="263.866667" y1="112.666667" x2="263.866667" y2="84.666667" /> -<line stroke-width="2.133333" - x1="7.066667" y1="228.666667" x2="79.066667" y2="228.666667" /> -<circle fill="black" - cx="16.666667" cy="228.666667" r="1.92" /> -<circle fill="black" - cx="43.066667" cy="228.666667" r="1.92" /> -<circle fill="black" - cx="69.466667" cy="228.666667" r="1.92" /> -<text font-size="10pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="9.733333" y="226"><tspan font-size="66%">20 kV</tspan></text> -<text font-size="10pt" stroke-width="0.266667" - fill="black" - x="43.066667" y="240.8"><tspan font-size="66%">1.25 MVA</tspan></text> -<line x1="43.066667" y1="228.666667" x2="43.066667" y2="200.666667" /> -<line x1="43.066667" y1="200.666667" x2="31.066667" y2="188.666667" /> -<line x1="43.066667" y1="184.666667" x2="43.066667" y2="156.666667" /> -<line x1="16.666667" y1="228.666667" x2="16.666667" y2="237.366667" /> -<circle cx="16.666667" cy="252.966667" r="15.6" /> -<circle cx="16.666667" cy="276.366667" r="15.6" /> -<line x1="16.666667" y1="291.966667" x2="16.666667" y2="300.666667" /> -<polyline points="16.666667,256.292204 10.906667,256.292204 -16.666667,246.315592 -22.426667,256.292204 -16.666667,256.292204" /> -<line x1="16.666667" y1="283.017742" x2="16.666667" y2="276.366667" /> -<polyline points="10.906667,273.041129 16.666667,276.366667 -22.426667,273.041129" /> -<line x1="69.466667" y1="300.666667" x2="69.466667" y2="272.666667" /> -<line x1="69.466667" y1="272.666667" x2="57.466667" y2="260.666667" /> -<line x1="69.466667" y1="256.666667" x2="69.466667" y2="228.666667" /> -<line stroke-width="2.133333" - x1="111.066667" y1="260.666667" x2="111.066667" y2="196.666667" /> -<line x1="111.066667" y1="228.666667" x2="131.766667" y2="228.666667" /> -<circle fill="lightgray" stroke="none" - cx="147.366667" cy="228.666667" r="15.6" /> -<circle fill="lightgray" stroke="none" - cx="170.766667" cy="228.666667" r="15.6" /> -<circle cx="147.366667" cy="228.666667" r="15.6" /> -<circle cx="170.766667" cy="228.666667" r="15.6" /> -<line x1="186.366667" y1="228.666667" x2="207.066667" y2="228.666667" /> -<polygon stroke-width="0" fill="black" - points="176.037229,208.301991 184.522511,203.210823 -179.431342,211.696104" /> -<line x1="133.610823" y1="254.122511" x2="182.96759" y2="204.765743" /> -<line stroke-width="2.133333" - x1="207.066667" y1="260.666667" x2="207.066667" y2="196.666667" /> -<line x1="207.066667" y1="251.066667" x2="183.066667" y2="251.066667" /> -<line x1="183.066667" y1="251.066667" x2="183.066667" y2="260.666667" /> -<line x1="175.066667" y1="260.666667" x2="191.066667" y2="260.666667" /> -<line x1="175.066667" y1="265.466667" x2="191.066667" y2="265.466667" /> -<line x1="183.066667" y1="265.466667" x2="183.066667" y2="275.066667" /> -<line x1="191.066667" y1="275.066667" x2="175.066667" y2="275.066667" /> -<line x1="188.4" y1="278.066667" x2="177.733333" y2="278.066667" /> -<line x1="186.495238" y1="281.066667" x2="179.638095" y2="281.066667" /> -<line x1="207.066667" y1="228.666667" x2="231.066667" y2="228.666667" /> -<line x1="231.066667" y1="228.666667" x2="231.066667" y2="251.066667" /> -<line x1="231.066667" y1="251.066667" x2="231.066667" y2="260.666667" /> -<line x1="223.066667" y1="260.666667" x2="239.066667" y2="260.666667" /> -<line x1="223.066667" y1="265.466667" x2="239.066667" y2="265.466667" /> -<line x1="231.066667" y1="265.466667" x2="231.066667" y2="275.066667" /> -<line x1="239.066667" y1="275.066667" x2="223.066667" y2="275.066667" /> -<line x1="236.4" y1="278.066667" x2="225.733333" y2="278.066667" /> -<line x1="234.495238" y1="281.066667" x2="227.638095" y2="281.066667" /> -<line x1="231.066667" y1="228.666667" x2="255.066667" y2="228.666667" /> -<polyline stroke-width="0" fill="lightgray" - points="375.066667,228.666667 -375.066667,223.866667 -255.066667,223.866667 -255.066667,233.466667 -375.066667,233.466667 -375.066667,228.666667" /> -<polyline points="375.066667,228.666667 375.066667,223.866667 -255.066667,223.866667 -255.066667,233.466667 -375.066667,233.466667 -375.066667,228.666667" /> -<line x1="375.066667" y1="228.666667" x2="399.066667" y2="228.666667" /> -<line x1="399.066667" y1="228.666667" x2="399.066667" y2="251.066667" /> -<line x1="399.066667" y1="251.066667" x2="399.066667" y2="260.666667" /> -<line x1="391.066667" y1="260.666667" x2="407.066667" y2="260.666667" /> -<line x1="391.066667" y1="265.466667" x2="407.066667" y2="265.466667" /> -<line x1="399.066667" y1="265.466667" x2="399.066667" y2="275.066667" /> -<line x1="407.066667" y1="275.066667" x2="391.066667" y2="275.066667" /> -<line x1="404.4" y1="278.066667" x2="393.733333" y2="278.066667" /> -<line x1="402.495238" y1="281.066667" x2="395.638095" y2="281.066667" /> -<line x1="399.066667" y1="228.666667" x2="423.066667" y2="228.666667" /> -<line stroke-width="2.133333" - x1="423.066667" y1="336.666667" x2="423.066667" y2="120.666667" /> -<line x1="423.066667" y1="327.066667" x2="459.066667" y2="327.066667" /> -<rect fill="rgb(217,166,33)" x="459.066667" y="312.666667" width="144" height="28.8" /> -<text font-size="10pt" stroke-width="0.2pt" fill="black" x="531.066667" y="331.8">Static Load</text> -<line x1="423.066667" y1="287.706667" x2="459.066667" y2="287.706667" /> -<rect fill="rgb(201,150,145)" x="459.066667" y="273.306667" width="144" height="28.8" /> -<text font-size="10pt" stroke-width="0.2pt" fill="black" x="531.066667" y="292.44">Electronic Load</text> -<circle fill="rgb(51,204,51)" cx="489.066667" cy="248.346667" r="18" /> -<text font-size="10pt" stroke-width="0.2pt" fill="black" x="489.066667" y="253.08">A/C</text> -<line x1="471.066667" y1="248.346667" x2="423.066667" y2="248.346667" /> -<circle fill="rgb(54,120,219)" cx="489.066667" cy="208.986667" r="18" /> -<text font-size="10pt" stroke-width="0.2pt" fill="black" x="489.066667" y="213.72">M</text> -<line x1="471.066667" y1="208.986667" x2="423.066667" y2="208.986667" /> -<circle fill="rgb(51,153,204)" cx="489.066667" cy="169.626667" r="18" /> -<text font-size="10pt" stroke-width="0.2pt" fill="black" x="489.066667" y="174.36">M</text> -<line x1="471.066667" y1="169.626667" x2="423.066667" y2="169.626667" /> -<circle fill="rgb(51,161,204)" cx="489.066667" cy="130.266667" r="18" /> -<text font-size="10pt" stroke-width="0.2pt" fill="black" x="489.066667" y="135">M</text> -<line x1="471.066667" y1="130.266667" x2="423.066667" y2="130.266667" /> -<circle fill="rgb(199,92,77)" cx="357.066667" cy="307.386667" r="18" /> -<text font-size="10pt" stroke-width="0.2pt" fill="black" x="357.066667" y="312.12"><tspan font-size="66%">DER_A</tspan></text> -<line x1="375.066667" y1="307.386667" x2="423.066667" y2="307.386667" /> -<line x1="87.733333" y1="409.6" x2="96.733333" y2="409.6" /> -<line x1="96.733333" y1="409.6" x2="96.733333" y2="409.6" /> -<polyline stroke-width="0" fill="rgb(99,128,237)" - points="87.733333,409.6 -87.733333,414.1 -96.733333,414.1 -96.733333,405.1 -87.733333,405.1 -87.733333,409.6" /> -<polyline points="87.733333,409.6 87.733333,414.1 -96.733333,414.1 -96.733333,405.1 -87.733333,405.1 -87.733333,409.6" /> -<line x1="87.733333" y1="409.6" x2="87.733333" y2="409.6" /> -<circle fill="rgb(99,128,237)" cx="47.733333" cy="409.6" r="16" /> -<line x1="63.733333" y1="409.6" x2="87.733333" y2="409.6" /> -<polyline points="71.733333,432.528203 63.733333,432.528203 -71.733333,418.671797 -79.733333,432.528203 -71.733333,432.528203" /> -<line x1="87.733333" y1="409.6" x2="117.233333" y2="409.6" /> -<line x1="117.233333" y1="394" x2="117.233333" y2="394" /> -<line x1="117.233333" y1="394" x2="116.7" y2="394" /> -<path d="M 117.233333,394 - A 3.9 3.9 0 0 1 117.233333,401.8" /> -<line x1="117.233333" y1="401.8" x2="116.7" y2="401.8" /> -<path d="M 117.233333,401.8 - A 3.9 3.9 0 0 1 117.233333,409.6" /> -<line x1="117.233333" y1="409.6" x2="116.7" y2="409.6" /> -<path d="M 117.233333,409.6 - A 3.9 3.9 0 1 1 117.233333,417.4" /> -<line x1="117.233333" y1="417.4" x2="116.7" y2="417.4" /> -<path d="M 117.233333,417.4 - A 3.9 3.9 0 1 1 117.233333,425.2" /> -<line x1="117.233333" y1="425.2" x2="116.7" y2="425.2" /> -<line x1="117.233333" y1="425.2" x2="117.233333" y2="425.2" /> -<line x1="130.233333" y1="425.2" x2="130.233333" y2="425.2" /> -<line x1="130.233333" y1="425.2" x2="130.766667" y2="425.2" /> -<path d="M 130.233333,425.2 - A 3.9 3.9 0 0 1 130.233333,417.4" /> -<line x1="130.233333" y1="417.4" x2="130.766667" y2="417.4" /> -<path d="M 130.233333,417.4 - A 3.9 3.9 0 0 1 130.233333,409.6" /> -<line x1="130.233333" y1="409.6" x2="130.766667" y2="409.6" /> -<path d="M 130.233333,409.6 - A 3.9 3.9 0 0 1 130.233333,401.8" /> -<line x1="130.233333" y1="401.8" x2="130.766667" y2="401.8" /> -<path d="M 130.233333,401.8 - A 3.9 3.9 0 0 1 130.233333,394" /> -<line x1="130.233333" y1="394" x2="130.766667" y2="394" /> -<line x1="130.233333" y1="394" x2="130.233333" y2="394" /> -<line x1="130.233333" y1="409.6" x2="159.733333" y2="409.6" /> -<line stroke-width="2.133333" - x1="159.733333" y1="445.6" x2="159.733333" y2="373.6" /> -<line x1="159.733333" y1="383.2" x2="191.233333" y2="383.2" /> -<polyline stroke-width="0" fill="rgb(99,128,237)" - points="200.233333,383.2 -200.233333,378.7 -191.233333,378.7 -191.233333,387.7 -200.233333,387.7 -200.233333,383.2" /> -<polyline points="200.233333,383.2 200.233333,378.7 -191.233333,378.7 -191.233333,387.7 -200.233333,387.7 -200.233333,383.2" /> -<line x1="200.233333" y1="383.2" x2="231.733333" y2="383.2" /> -<line x1="231.733333" y1="383.2" x2="295.733333" y2="383.2" /> -<line x1="159.733333" y1="436" x2="191.233333" y2="436" /> -<polyline stroke-width="0" fill="rgb(99,128,237)" - points="200.233333,436 -200.233333,431.5 -191.233333,431.5 -191.233333,440.5 -200.233333,440.5 -200.233333,436" /> -<polyline points="200.233333,436 200.233333,431.5 -191.233333,431.5 -191.233333,440.5 -200.233333,440.5 -200.233333,436" /> -<line x1="200.233333" y1="436" x2="231.733333" y2="436" /> -<line x1="231.733333" y1="436" x2="231.733333" y2="455.5" /> -<polyline stroke-width="0" fill="rgb(99,128,237)" - points="231.733333,464.5 -236.233333,464.5 -236.233333,455.5 -227.233333,455.5 -227.233333,464.5 -231.733333,464.5" /> -<polyline points="231.733333,464.5 236.233333,464.5 -236.233333,455.5 -227.233333,455.5 -227.233333,464.5 -231.733333,464.5" /> -<line x1="231.733333" y1="464.5" x2="231.733333" y2="484" /> -<line stroke-width="2.133333" - x1="207.733333" y1="484" x2="255.733333" y2="484" /> -<line x1="231.733333" y1="484" x2="231.733333" y2="501.5" /> -<line x1="247.333333" y1="501.5" x2="247.333333" y2="501.5" /> -<line x1="247.333333" y1="501.5" x2="247.333333" y2="500.966667" /> -<path d="M 247.333333,501.5 - A 3.9 3.9 0 0 1 239.533333,501.5" /> -<line x1="239.533333" y1="501.5" x2="239.533333" y2="500.966667" /> -<path d="M 239.533333,501.5 - A 3.9 3.9 0 1 1 231.733333,501.5" /> -<line x1="231.733333" y1="501.5" x2="231.733333" y2="500.966667" /> -<path d="M 231.733333,501.5 - A 3.9 3.9 0 0 1 223.933333,501.5" /> -<line x1="223.933333" y1="501.5" x2="223.933333" y2="500.966667" /> -<path d="M 223.933333,501.5 - A 3.9 3.9 0 1 1 216.133333,501.5" /> -<line x1="216.133333" y1="501.5" x2="216.133333" y2="500.966667" /> -<line x1="216.133333" y1="501.5" x2="216.133333" y2="501.5" /> -<line x1="216.133333" y1="514.5" x2="216.133333" y2="514.5" /> -<line x1="216.133333" y1="514.5" x2="216.133333" y2="515.033333" /> -<path d="M 216.133333,514.5 - A 3.9 3.9 0 0 1 223.933333,514.5" /> -<line x1="223.933333" y1="514.5" x2="223.933333" y2="515.033333" /> -<path d="M 223.933333,514.5 - A 3.9 3.9 0 0 1 231.733333,514.5" /> -<line x1="231.733333" y1="514.5" x2="231.733333" y2="515.033333" /> -<path d="M 231.733333,514.5 - A 3.9 3.9 0 0 1 239.533333,514.5" /> -<line x1="239.533333" y1="514.5" x2="239.533333" y2="515.033333" /> -<path d="M 239.533333,514.5 - A 3.9 3.9 0 0 1 247.333333,514.5" /> -<line x1="247.333333" y1="514.5" x2="247.333333" y2="515.033333" /> -<line x1="247.333333" y1="514.5" x2="247.333333" y2="514.5" /> -<line x1="231.733333" y1="514.5" x2="231.733333" y2="532" /> -<line x1="231.733333" y1="532" x2="231.733333" y2="523" /> -<line x1="231.733333" y1="523" x2="231.733333" y2="523" /> -<polyline stroke-width="0" fill="rgb(99,128,237)" - points="231.733333,532 -236.233333,532 -236.233333,523 -227.233333,523 -227.233333,532 -231.733333,532" /> -<polyline points="231.733333,532 236.233333,532 -236.233333,523 -227.233333,523 -227.233333,532 -231.733333,532" /> -<line x1="231.733333" y1="532" x2="231.733333" y2="532" /> -<circle fill="rgb(99,128,237)" cx="231.733333" cy="572" r="16" /> -<text font-size="10pt" stroke-width="0.2pt" fill="black" x="231.733333" y="576.733333">SM</text> -<line x1="231.733333" y1="556" x2="231.733333" y2="532" /> -<line x1="263.066667" y1="577.547005" x2="263.066667" y2="568.309401" /> -<polyline points="255.066667,563.690599 263.066667,568.309401 -271.066667,563.690599" /> -<line x1="263.066667" y1="568.309401" x2="275.066667" y2="568.309401" /> -<line x1="274.533333" y1="568.309401" x2="275.6" y2="568.309401" /> -<line x1="275.066667" y1="568.309401" x2="275.066667" y2="576.309401" /> -<line x1="280.4" y1="576.309401" x2="269.733333" y2="576.309401" /> -<line x1="278.622222" y1="578.309401" x2="271.511111" y2="578.309401" /> -<line x1="277.352381" y1="580.309401" x2="272.780952" y2="580.309401" /> -<line x1="503.733333" y1="409.6" x2="494.733333" y2="409.6" /> -<line x1="494.733333" y1="409.6" x2="494.733333" y2="409.6" /> -<polyline stroke-width="0" fill="rgb(99,128,237)" - points="503.733333,409.6 -503.733333,405.1 -494.733333,405.1 -494.733333,414.1 -503.733333,414.1 -503.733333,409.6" /> -<polyline points="503.733333,409.6 503.733333,405.1 -494.733333,405.1 -494.733333,414.1 -503.733333,414.1 -503.733333,409.6" /> -<line x1="503.733333" y1="409.6" x2="503.733333" y2="409.6" /> -<circle fill="rgb(99,128,237)" cx="543.733333" cy="409.6" r="16" /> -<line x1="527.733333" y1="409.6" x2="503.733333" y2="409.6" /> -<line x1="519.733333" y1="432.528203" x2="519.733333" y2="423.290599" /> -<polyline points="511.733333,418.671797 519.733333,423.290599 -527.733333,418.671797" /> -<line x1="503.733333" y1="409.6" x2="474.233333" y2="409.6" /> -<line x1="474.233333" y1="425.2" x2="474.233333" y2="425.2" /> -<line x1="474.233333" y1="425.2" x2="474.766667" y2="425.2" /> -<path d="M 474.233333,425.2 - A 3.9 3.9 0 0 1 474.233333,417.4" /> -<line x1="474.233333" y1="417.4" x2="474.766667" y2="417.4" /> -<path d="M 474.233333,417.4 - A 3.9 3.9 0 1 1 474.233333,409.6" /> -<line x1="474.233333" y1="409.6" x2="474.766667" y2="409.6" /> -<path d="M 474.233333,409.6 - A 3.9 3.9 0 0 1 474.233333,401.8" /> -<line x1="474.233333" y1="401.8" x2="474.766667" y2="401.8" /> -<path d="M 474.233333,401.8 - A 3.9 3.9 0 0 1 474.233333,394" /> -<line x1="474.233333" y1="394" x2="474.766667" y2="394" /> -<line x1="474.233333" y1="394" x2="474.233333" y2="394" /> -<line x1="461.233333" y1="394" x2="461.233333" y2="394" /> -<line x1="461.233333" y1="394" x2="460.7" y2="394" /> -<path d="M 461.233333,394 - A 3.9 3.9 0 0 1 461.233333,401.8" /> -<line x1="461.233333" y1="401.8" x2="460.7" y2="401.8" /> -<path d="M 461.233333,401.8 - A 3.9 3.9 0 0 1 461.233333,409.6" /> -<line x1="461.233333" y1="409.6" x2="460.7" y2="409.6" /> -<path d="M 461.233333,409.6 - A 3.9 3.9 0 0 1 461.233333,417.4" /> -<line x1="461.233333" y1="417.4" x2="460.7" y2="417.4" /> -<path d="M 461.233333,417.4 - A 3.9 3.9 0 1 1 461.233333,425.2" /> -<line x1="461.233333" y1="425.2" x2="460.7" y2="425.2" /> -<line x1="461.233333" y1="425.2" x2="461.233333" y2="425.2" /> -<line x1="461.233333" y1="409.6" x2="431.733333" y2="409.6" /> -<line stroke-width="2.133333" - x1="431.733333" y1="445.6" x2="431.733333" y2="373.6" /> -<line x1="431.733333" y1="383.2" x2="400.233333" y2="383.2" /> -<polyline stroke-width="0" fill="rgb(99,128,237)" - points="391.233333,383.2 -391.233333,387.7 -400.233333,387.7 -400.233333,378.7 -391.233333,378.7 -391.233333,383.2" /> -<polyline points="391.233333,383.2 391.233333,387.7 -400.233333,387.7 -400.233333,378.7 -391.233333,378.7 -391.233333,383.2" /> -<line x1="391.233333" y1="383.2" x2="359.733333" y2="383.2" /> -<line x1="359.733333" y1="383.2" x2="295.733333" y2="383.2" /> -<line x1="431.733333" y1="436" x2="400.233333" y2="436" /> -<polyline stroke-width="0" fill="rgb(99,128,237)" - points="391.233333,436 -391.233333,440.5 -400.233333,440.5 -400.233333,431.5 -391.233333,431.5 -391.233333,436" /> -<polyline points="391.233333,436 391.233333,440.5 -400.233333,440.5 -400.233333,431.5 -391.233333,431.5 -391.233333,436" /> -<line x1="391.233333" y1="436" x2="359.733333" y2="436" /> -<line x1="359.733333" y1="436" x2="359.733333" y2="455.5" /> -<polyline stroke-width="0" fill="rgb(99,128,237)" - points="359.733333,464.5 -364.233333,464.5 -364.233333,455.5 -355.233333,455.5 -355.233333,464.5 -359.733333,464.5" /> -<polyline points="359.733333,464.5 364.233333,464.5 -364.233333,455.5 -355.233333,455.5 -355.233333,464.5 -359.733333,464.5" /> -<line x1="359.733333" y1="464.5" x2="359.733333" y2="484" /> -<line stroke-width="2.133333" - x1="383.733333" y1="484" x2="335.733333" y2="484" /> -<line x1="359.733333" y1="484" x2="359.733333" y2="501.5" /> -<line x1="375.333333" y1="501.5" x2="375.333333" y2="501.5" /> -<line x1="375.333333" y1="501.5" x2="375.333333" y2="500.966667" /> -<path d="M 375.333333,501.5 - A 3.9 3.9 0 0 1 367.533333,501.5" /> -<line x1="367.533333" y1="501.5" x2="367.533333" y2="500.966667" /> -<path d="M 367.533333,501.5 - A 3.9 3.9 0 1 1 359.733333,501.5" /> -<line x1="359.733333" y1="501.5" x2="359.733333" y2="500.966667" /> -<path d="M 359.733333,501.5 - A 3.9 3.9 0 0 1 351.933333,501.5" /> -<line x1="351.933333" y1="501.5" x2="351.933333" y2="500.966667" /> -<path d="M 351.933333,501.5 - A 3.9 3.9 0 1 1 344.133333,501.5" /> -<line x1="344.133333" y1="501.5" x2="344.133333" y2="500.966667" /> -<line x1="344.133333" y1="501.5" x2="344.133333" y2="501.5" /> -<line x1="344.133333" y1="514.5" x2="344.133333" y2="514.5" /> -<line x1="344.133333" y1="514.5" x2="344.133333" y2="515.033333" /> -<path d="M 344.133333,514.5 - A 3.9 3.9 0 0 1 351.933333,514.5" /> -<line x1="351.933333" y1="514.5" x2="351.933333" y2="515.033333" /> -<path d="M 351.933333,514.5 - A 3.9 3.9 0 0 1 359.733333,514.5" /> -<line x1="359.733333" y1="514.5" x2="359.733333" y2="515.033333" /> -<path d="M 359.733333,514.5 - A 3.9 3.9 0 0 1 367.533333,514.5" /> -<line x1="367.533333" y1="514.5" x2="367.533333" y2="515.033333" /> -<path d="M 367.533333,514.5 - A 3.9 3.9 0 0 1 375.333333,514.5" /> -<line x1="375.333333" y1="514.5" x2="375.333333" y2="515.033333" /> -<line x1="375.333333" y1="514.5" x2="375.333333" y2="514.5" /> -<line x1="359.733333" y1="514.5" x2="359.733333" y2="532" /> -<line x1="359.733333" y1="532" x2="359.733333" y2="523" /> -<line x1="359.733333" y1="523" x2="359.733333" y2="523" /> -<polyline stroke-width="0" fill="rgb(99,128,237)" - points="359.733333,532 -364.233333,532 -364.233333,523 -355.233333,523 -355.233333,532 -359.733333,532" /> -<polyline points="359.733333,532 364.233333,532 -364.233333,523 -355.233333,523 -355.233333,532 -359.733333,532" /> -<line x1="359.733333" y1="532" x2="359.733333" y2="532" /> -<circle fill="rgb(99,128,237)" cx="359.733333" cy="572" r="16" /> -<text font-size="10pt" stroke-width="0.2pt" fill="black" x="359.733333" y="576.733333">SM</text> -<line x1="359.733333" y1="556" x2="359.733333" y2="532" /> -<line x1="328.4" y1="577.547005" x2="328.4" y2="568.309401" /> -<polyline points="320.4,563.690599 328.4,568.309401 -336.4,563.690599" /> -<line x1="328.4" y1="568.309401" x2="316.4" y2="568.309401" /> -<line x1="316.933333" y1="568.309401" x2="315.866667" y2="568.309401" /> -<line x1="316.4" y1="568.309401" x2="316.4" y2="576.309401" /> -<line x1="321.733333" y1="576.309401" x2="311.066667" y2="576.309401" /> -<line x1="319.955556" y1="578.309401" x2="312.844444" y2="578.309401" /> -<line x1="318.685714" y1="580.309401" x2="314.114286" y2="580.309401" /> -<text font-size="10pt" stroke-width="0.266667" - fill="black" - x="159.733333" y="370.933333">Bus 1</text> -<text font-size="10pt" stroke-width="0.266667" - fill="black" - x="431.733333" y="370.933333">Bus 2</text> -<text font-size="10pt" stroke-width="0.266667" - fill="black" - x="207.733333" y="481.333333">Bus 3</text> -<text font-size="10pt" stroke-width="0.266667" - fill="black" - x="383.733333" y="481.333333">Bus 4</text> -<text font-size="10pt" stroke-width="0.266667" - fill="black" - x="295.733333" y="380.533333" ->TL<tspan font-size="70%" -dy="0.66ex" dx="">1</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan> 50 km 69 kV</text> -<text font-size="10pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="210.4" y="418.066667" ->TL<tspan font-size="70%" -dy="0.66ex" dx="">2</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan> 30 km</text> -<text font-size="10pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="210.4" y="431.4">69 kV</text> -<text font-size="10pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="338.4" y="418.066667" ->TL<tspan font-size="70%" -dy="0.66ex" dx="">2</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan> 20 km</text> -<text font-size="10pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="338.4" y="431.4">69 kV</text> -<text font-size="10pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="1.066667" y="450.333333" ->G<tspan font-size="70%" -dy="0.66ex" dx="">1</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan> 50 MVA</text> -<text font-size="10pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="1.066667" y="463.666667">13.8 kV</text> -<text font-size="10pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="543.733333" y="445" ->G<tspan font-size="70%" -dy="0.66ex" dx="">2</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan> 30 MVA</text> -<text font-size="10pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="543.733333" y="458.333333">13.8 kV</text> -<text font-size="10pt" stroke-width="0.266667" - fill="black" - x="121.066667" y="456.6" ->T<tspan font-size="70%" -dy="0.66ex" dx="">1</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan> 50 MVA</text> -<text font-size="10pt" stroke-width="0.266667" - fill="black" - x="121.066667" y="469.933333">13.8/69 kV Δ/Y</text> -<text font-size="10pt" stroke-width="0.266667" - fill="black" - x="470.4" y="459.266667" ->T<tspan font-size="70%" -dy="0.66ex" dx="">2</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan> 30 MVA</text> -<text font-size="10pt" stroke-width="0.266667" - fill="black" - x="470.4" y="472.6">69/13.8 kV Y/Δ </text> -<text font-size="10pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="208.133333" y="506.066667" ->T<tspan font-size="70%" -dy="0.66ex" dx="">3</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan> 50 MVA</text> -<text font-size="10pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="208.133333" y="519.4">13.8/69 kV Y/Δ </text> -<text font-size="10pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="383.333333" y="506.066667" ->T<tspan font-size="70%" -dy="0.66ex" dx="">4</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan> 20 MVA</text> -<text font-size="10pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="383.333333" y="519.4">69/6.9 kV Y/Δ </text> -<text font-size="10pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="207.733333" y="570.066667" ->SM<tspan font-size="70%" -dy="0.66ex" dx="">1</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan> 30 MVA</text> -<text font-size="10pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="207.733333" y="583.4">13.8 kV</text> -<text font-size="10pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="383.733333" y="570.066667" ->SM<tspan font-size="70%" -dy="0.66ex" dx="">2</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan> 20 MVA</text> -<text font-size="10pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="383.733333" y="583.4">6.9 kV</text> -</g> -</g></svg> diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/dpv/FlowDPV.m4 b/Master/texmf-dist/doc/latex/circuit-macros/examples/dpv/FlowDPV.m4 index e3543ae405b..70fc877618e 100644 --- a/Master/texmf-dist/doc/latex/circuit-macros/examples/dpv/FlowDPV.m4 +++ b/Master/texmf-dist/doc/latex/circuit-macros/examples/dpv/FlowDPV.m4 @@ -1,7 +1,7 @@ .PS # FlowDPV.m4 gen_init(svg_font(sans-serif,11bp__,2.5bp__)) -ifdef(`FlowchartDefs_',,`include(../FlowchartDefs.m4)') +ifdef(`FlowchartDefs_',,`include(../FlowchartDefs.m4def)') define(`Thistle',`rgbstring(0.85,0.75,0.85)')dnl define(`RubineRed',`rgbstring(0.81,0,0.35)')dnl diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/dpv/FlowDPV.svg b/Master/texmf-dist/doc/latex/circuit-macros/examples/dpv/FlowDPV.svg deleted file mode 100644 index cda3c42bee1..00000000000 --- a/Master/texmf-dist/doc/latex/circuit-macros/examples/dpv/FlowDPV.svg +++ /dev/null @@ -1,890 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" -"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> -<!-- Creator: dpic version 2022.12.01 option -v for SVG 1.1 --> -<!-- width="640" height="750" --> -<svg - xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" - xml:space="preserve" - style="shape-rendering:geometricPrecision; text-rendering:geometricPrecision; - image-rendering:optimizeQuality; fill-rule:evenodd; clip-rule:evenodd" - width="639.333333px" height="748.546667px" - viewBox="0 0 639.333333 748.546667" - font-size="11pt" text-anchor="middle" - stroke="black" stroke-miterlimit="10" stroke-width="1.066667" fill="none"> -<g> -<g style="font-family:sans-serif" -> -<rect fill="rgb(230,204,179)" stroke-width="1.333333" - x="10.933333" y="0.666667" width="96" height="36" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="58.933333" y="23.873333" -><tspan font-family="Courier">Fbox</tspan></text> -<polyline stroke-width="0" fill="rgb(230,204,179)" - points="68.533333,73.266667 -87.733333,85.866667 -49.333333,111.066667 -10.933333,85.866667 -49.333333,60.666667 -68.533333,73.266667" /> -<polyline stroke-width="1.333333" - points="68.533333,73.266667 87.733333,85.866667 -49.333333,111.066667 -10.933333,85.866667 -49.333333,60.666667 -68.533333,73.266667" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="49.333333" y="91.073333" -><tspan font-family="Courier">Ftest</tspan></text> -<polyline stroke-width="0" fill="rgb(230,204,179)" - points="64.933333,135.066667 -118.933333,135.066667 -106.933333,171.066667 -10.933333,171.066667 -22.933333,135.066667 -64.933333,135.066667" /> -<polyline stroke-width="1.333333" - points="64.933333,135.066667 118.933333,135.066667 -106.933333,171.066667 -10.933333,171.066667 -22.933333,135.066667 -64.933333,135.066667" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="64.933333" y="158.273333" -><tspan font-family="Courier">Fdata</tspan></text> -<polyline stroke-width="0" fill="rgb(230,230,230)" - points="58.933333,195.066667 -97.933333,195.066667 -106.933333,213.066667 -97.933333,231.066667 -19.933333,231.066667 -10.933333,213.066667 -19.933333,195.066667 -58.933333,195.066667" /> -<polyline stroke-width="1.333333" - points="58.933333,195.066667 97.933333,195.066667 -106.933333,213.066667 -97.933333,231.066667 -19.933333,231.066667 -10.933333,213.066667 -19.933333,195.066667 -58.933333,195.066667" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="58.933333" y="218.273333" -><tspan font-family="Courier">Fprep</tspan></text> -<path stroke-width="1.333333" - d="M 103.430524,291.398755 - A 48 48 0 0 0 103.430524,255.398755" /> -<circle stroke-width="0.666667" - cx="103.430524" cy="255.398755" r="0.332088" /> -<line stroke-width="1.333333" - x1="103.430524" y1="255.398755" x2="14.436142" y2="255.398755" /> -<circle stroke-width="0.666667" - cx="14.436142" cy="255.398755" r="0.332088" /> -<path stroke-width="1.333333" - d="M 14.436142,255.398755 - A 48 48 0 0 0 14.436142,291.398755" /> -<circle stroke-width="0.666667" - cx="14.436142" cy="291.398755" r="0.332088" /> -<line stroke-width="1.333333" - x1="14.436142" y1="291.398755" x2="103.430524" y2="291.398755" /> -<circle stroke-width="0.666667" - cx="103.430524" cy="291.398755" r="0.332088" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="58.933333" y="278.605421" -><tspan font-family="Courier">Fkeying</tspan></text> -<polyline stroke-width="0" fill="rgb(230,230,230)" - points="58.933333,321.730843 -106.933333,315.730843 -106.933333,357.730843 -10.933333,357.730843 -10.933333,327.730843 -58.933333,321.730843" /> -<polyline stroke-width="1.333333" - points="58.933333,321.730843 106.933333,315.730843 -106.933333,357.730843 -10.933333,357.730843 -10.933333,327.730843 -58.933333,321.730843" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="58.933333" y="344.937509" -><tspan font-family="Courier">Fkeyboard</tspan></text> -<polyline stroke-width="0" fill="rgb(230,204,179)" - points="106.933333,426.730843 -106.933333,381.730843 -10.933333,381.730843 -10.933333,426.730843" /> -<polyline stroke-width="1.333333" - points="106.933333,426.730843 106.933333,381.730843 -10.933333,381.730843 -10.933333,426.730843" /> -<path stroke-width="0" fill="rgb(230,204,179)" - d="M 10.933333,426.730843 - A 43.266615 43.266615 0 0 0 58.933333,426.730843" /> -<path stroke-width="1.333333" - d="M 10.933333,426.730843 - A 43.266615 43.266615 0 0 0 58.933333,426.730843" /> -<path stroke-width="0" fill="rgb(255,255,255)" - d="M 58.933333,426.730843 - A 43.266615 43.266615 0 0 1 106.933333,426.730843" /> -<path stroke-width="1.333333" - d="M 58.933333,426.730843 - A 43.266615 43.266615 0 0 1 106.933333,426.730843" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="58.933333" y="404.937509" -><tspan font-family="Courier">Fdocument</tspan></text> -<path stroke-width="0" fill="rgb(189,212,230)" - d="M 88.933333,493.997458 - A 18 18 0 0 0 88.933333,457.997458" /> -<path stroke-width="1.333333" - d="M 88.933333,493.997458 - A 18 18 0 0 0 88.933333,457.997458" /> -<polyline stroke-width="0" fill="rgb(189,212,230)" - points="88.933333,457.997458 -10.933333,457.997458 -10.933333,493.997458 -88.933333,493.997458" /> -<polyline stroke-width="1.333333" - points="88.933333,457.997458 10.933333,457.997458 -10.933333,493.997458 -88.933333,493.997458" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="58.933333" y="481.204125" -><tspan font-family="Courier">Fdelay</tspan></text> -<rect fill="rgb(171,224,176)" stroke-width="1.333333" - stroke="none" - x="28.933333" y="517.997458" width="69" height="36" /> -<polyline stroke-width="0" fill="rgb(171,224,176)" - points="10.933333,535.997458 -28.933333,517.997458 -28.933333,553.997458 -10.933333,535.997458" /> -<path stroke-width="0" fill="rgb(171,224,176)" - d="M 97.933333,553.997458 - A 23.430749 23.430749 0 0 0 97.933333,517.997458" /> -<path stroke-width="1.333333" - d="M 97.933333,553.997458 - A 23.430749 23.430749 0 0 0 97.933333,517.997458" /> -<polyline stroke-width="0" fill="rgb(171,224,176)" - points="97.933333,517.997458 -28.933333,517.997458" /> -<line stroke-width="1.333333" - x1="97.933333" y1="517.997458" x2="28.933333" y2="517.997458" /> -<path stroke-width="0" fill="rgb(171,224,176)" - d="M 28.933333,517.997458 - A 28.460499 28.460499 0 0 0 10.933333,535.997458" /> -<path stroke-width="1.333333" - d="M 28.933333,517.997458 - A 28.460499 28.460499 0 0 0 10.933333,535.997458" /> -<path stroke-width="0" fill="rgb(171,224,176)" - d="M 10.933333,535.997458 - A 28.460499 28.460499 0 0 0 28.933333,553.997458" /> -<path stroke-width="1.333333" - d="M 10.933333,535.997458 - A 28.460499 28.460499 0 0 0 28.933333,553.997458" /> -<polyline stroke-width="0" fill="rgb(171,224,176)" - points="28.933333,553.997458 -97.933333,553.997458" /> -<line stroke-width="1.333333" - x1="28.933333" y1="553.997458" x2="97.933333" y2="553.997458" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="58.933333" y="541.204125" -><tspan font-family="Courier">Fdisplay</tspan></text> -<rect fill="rgb(217,191,217)" stroke-width="1.333333" - stroke="none" - x="16.582801" y="578.329546" width="90.350532" height="36" /> -<path stroke-width="0" fill="rgb(217,191,217)" - d="M 16.582801,578.329546 - A 31.5 31.5 0 0 0 16.582801,614.329546" /> -<path stroke-width="1.333333" - d="M 16.582801,578.329546 - A 31.5 31.5 0 0 0 16.582801,614.329546" /> -<circle stroke-width="0.666667" - cx="16.582801" cy="614.329546" r="0.332088" /> -<line stroke-width="1.333333" - x1="16.582801" y1="614.329546" x2="106.933333" y2="614.329546" /> -<circle stroke-width="0.666667" - cx="106.933333" cy="614.329546" r="0.332088" /> -<path stroke-width="0" fill="white" - d="M 106.933333,614.329546 - A 31.5 31.5 0 0 1 106.933333,578.329546" /> -<path stroke-width="1.333333" - d="M 106.933333,614.329546 - A 31.5 31.5 0 0 1 106.933333,578.329546" /> -<circle stroke-width="0.666667" - cx="106.933333" cy="578.329546" r="0.332088" /> -<polyline stroke-width="0" fill="rgb(217,191,217)" - points="106.933333,578.329546 -16.582801,578.329546" /> -<line stroke-width="1.333333" - x1="106.933333" y1="578.329546" x2="16.582801" y2="578.329546" /> -<circle stroke-width="0.666667" - cx="16.582801" cy="578.329546" r="0.332088" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="58.933333" y="601.536213" -><tspan font-family="Courier">Fstored</tspan></text> -<polyline stroke-width="0" fill="rgb(217,191,217)" - points="19.933333,638.661634 -10.933333,638.661634 -10.933333,674.661634 -28.933333,674.661634 -46.933333,656.661634 -28.933333,638.661634 -19.933333,638.661634" /> -<polyline stroke-width="1.333333" - points="19.933333,638.661634 10.933333,638.661634 -10.933333,674.661634 -28.933333,674.661634 -46.933333,656.661634 -28.933333,638.661634 -19.933333,638.661634" /> -<polyline stroke-width="0" fill="rgb(217,191,217)" - points="59.297294,643.933712 -52.933333,650.297673 -78.389177,675.753517 -91.1171,663.025595 -91.1171,637.569751 -65.661255,637.569751 -59.297294,643.933712" /> -<polyline stroke-width="1.333333" - points="59.297294,643.933712 52.933333,650.297673 -78.389177,675.753517 -91.1171,663.025595 -91.1171,637.569751 -65.661255,637.569751 -59.297294,643.933712" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="75.207197" y="658.68632">45</text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="52.933333" y="634.776418" -><tspan font-family="Courier">Fconnect</tspan></text> -<polyline stroke-width="0" fill="rgb(230,230,230)" - points="202.133333,27.013333 -221.333333,39.613333 -182.933333,64.813333 -144.533333,39.613333 -182.933333,14.413333 -202.133333,27.013333" /> -<polyline stroke-width="1.333333" - points="202.133333,27.013333 221.333333,39.613333 -182.933333,64.813333 -144.533333,39.613333 -182.933333,14.413333 -202.133333,27.013333" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="182.933333" y="44.82">Test 1</text> -<rect fill="rgb(217,191,217)" stroke-width="1.333333" - x="245.333333" y="21.613333" width="96" height="36" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="293.333333" y="44.82">Task 1</text> -<polygon stroke-width="0" fill="black" - points="295.733333,64.013333 293.333333,73.613333 -290.933333,64.013333" /> -<line stroke-width="1.333333" - x1="293.333333" y1="57.613333" x2="293.333333" y2="70.864596" /> -<rect fill="rgb(217,191,217)" stroke-width="1.333333" - x="245.333333" y="73.613333" width="96" height="36" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="293.333333" y="96.82">Task 1.5</text> -<polygon stroke-width="0" fill="black" - points="235.733333,37.213333 245.333333,39.613333 -235.733333,42.013333" /> -<polyline stroke-width="1.333333" - points="221.333333,39.613333 233.333333,39.613333 -233.333333,39.613333 -242.584596,39.613333" /> -<polygon stroke-width="0" fill="black" - points="185.333333,116.013333 182.933333,125.613333 -180.533333,116.013333" /> -<line stroke-width="1.333333" - x1="182.933333" y1="64.813333" x2="182.933333" y2="122.864596" /> -<polyline stroke-width="0" fill="rgb(230,230,230)" - points="202.133333,138.213333 -221.333333,150.813333 -182.933333,176.013333 -144.533333,150.813333 -182.933333,125.613333 -202.133333,138.213333" /> -<polyline stroke-width="1.333333" - points="202.133333,138.213333 221.333333,150.813333 -182.933333,176.013333 -144.533333,150.813333 -182.933333,125.613333 -202.133333,138.213333" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="182.933333" y="156.02">Test 2</text> -<rect fill="rgb(33,179,171)" stroke-width="1.333333" - x="245.333333" y="132.813333" width="115.2" height="54" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="302.933333" y="157.686667">Task 2</text> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="302.933333" y="172.353333">is bigger</text> -<polygon stroke-width="0" fill="black" - points="235.733333,157.413333 245.333333,159.813333 -235.733333,162.213333" /> -<polyline stroke-width="1.333333" - points="221.333333,150.813333 233.333333,150.813333 -233.333333,159.813333 -242.584596,159.813333" /> -<polygon stroke-width="0" fill="black" - points="185.333333,193.213333 182.933333,202.813333 -180.533333,193.213333" /> -<line stroke-width="1.333333" - x1="182.933333" y1="176.013333" x2="182.933333" y2="200.064596" /> -<polyline stroke-width="0" fill="rgb(230,230,230)" - points="202.133333,215.413333 -221.333333,228.013333 -182.933333,253.213333 -144.533333,228.013333 -182.933333,202.813333 -202.133333,215.413333" /> -<polyline stroke-width="1.333333" - points="202.133333,215.413333 221.333333,228.013333 -182.933333,253.213333 -144.533333,228.013333 -182.933333,202.813333 -202.133333,215.413333" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="182.933333" y="233.22">Test 3</text> -<rect fill="rgb(207,0,89)" stroke-width="1.333333" - x="245.333333" y="210.013333" width="96" height="36" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="293.333333" y="233.22">Task 3</text> -<polygon stroke-width="0" fill="black" - points="235.733333,225.613333 245.333333,228.013333 -235.733333,230.413333" /> -<polyline stroke-width="1.333333" - points="221.333333,228.013333 233.333333,228.013333 -233.333333,228.013333 -242.584596,228.013333" /> -<line stroke-width="1.333333" - x1="182.933333" y1="253.213333" x2="182.933333" y2="269.213333" /> -<polygon stroke-width="0" fill="black" - points="374.933333,89.213333 384.533333,91.613333 -374.933333,94.013333" /> -<line stroke-width="1.333333" - x1="341.333333" y1="91.613333" x2="381.784596" y2="91.613333" /> -<polygon stroke-width="0" fill="black" - points="374.933333,157.413333 384.533333,159.813333 -374.933333,162.213333" /> -<line stroke-width="1.333333" - x1="360.533333" y1="159.813333" x2="381.784596" y2="159.813333" /> -<polygon stroke-width="0" fill="black" - points="374.933333,225.613333 384.533333,228.013333 -374.933333,230.413333" /> -<line stroke-width="1.333333" - x1="341.333333" y1="228.013333" x2="381.784596" y2="228.013333" /> -<polygon stroke-width="0" fill="black" - points="192.533333,271.613333 182.933333,269.213333 -192.533333,266.813333" /> -<polyline stroke-width="1.333333" - points="384.533333,91.613333 384.533333,269.213333 -185.68207,269.213333" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="179.6" y="11.08"><tspan font-style="italic">.N</tspan></text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="179.6" y="282.96"><tspan font-style="italic">.S</tspan></text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="387.866667" y="96.82"><tspan font-style="italic">.E</tspan></text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="141.2" y="44.82"><tspan font-style="italic">.W</tspan></text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="265.733333" y="285.36" -><tspan font-family="Courier">Fcase</tspan></text> -<polyline stroke-width="0" fill="rgb(230,230,230)" - points="468.533333,43.813333 -487.733333,56.413333 -449.333333,81.613333 -410.933333,56.413333 -449.333333,31.213333 -468.533333,43.813333" /> -<polyline stroke-width="1.333333" - points="468.533333,43.813333 487.733333,56.413333 -449.333333,81.613333 -410.933333,56.413333 -449.333333,31.213333 -468.533333,43.813333" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="449.333333" y="61.62" -><tspan font-style="italic">i < n</tspan></text> -<polygon stroke-width="0" fill="black" - points="502.133333,54.013333 511.733333,56.413333 -502.133333,58.813333" /> -<line stroke-width="1.333333" - x1="487.733333" y1="56.413333" x2="508.984596" y2="56.413333" /> -<rect fill="rgb(230,230,230)" - stroke-width="1.333333" - x="511.733333" y="38.413333" width="96" height="36" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="559.733333" y="61.62">Task</text> -<polygon stroke-width="0" fill="black" - points="458.933333,19.213333 449.333333,16.813333 -458.933333,14.413333" /> -<polyline stroke-width="1.333333" - points="559.733333,38.413333 559.733333,16.813333 -452.08207,16.813333" /> -<polygon stroke-width="0" fill="black" - points="451.733333,21.613333 449.333333,31.213333 -446.933333,21.613333" /> -<line stroke-width="1.333333" - x1="449.333333" y1="16.813333" x2="449.333333" y2="28.464596" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="491.066667" y="53.08">T</text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="446" y="22.02"><tspan font-style="italic">.N</tspan></text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="446" y="95.36"><tspan font-style="italic">.S</tspan></text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="611.066667" y="61.62"><tspan font-style="italic">.E</tspan></text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="407.6" y="61.62"><tspan font-style="italic">.W</tspan></text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="509.333333" y="95.36" -><tspan font-family="Courier">Fwhiledo</tspan></text> -<rect fill="rgb(230,230,230)" - stroke-width="1.333333" - x="434.933333" y="129.613333" width="96" height="36" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="482.933333" y="152.82">Task</text> -<polygon stroke-width="0" fill="black" - points="485.333333,172.013333 482.933333,181.613333 -480.533333,172.013333" /> -<line stroke-width="1.333333" - x1="482.933333" y1="165.613333" x2="482.933333" y2="178.864596" /> -<polyline stroke-width="0" fill="rgb(230,230,230)" - points="502.133333,194.213333 -521.333333,206.813333 -482.933333,232.013333 -444.533333,206.813333 -482.933333,181.613333 -502.133333,194.213333" /> -<polyline stroke-width="1.333333" - points="502.133333,194.213333 521.333333,206.813333 -482.933333,232.013333 -444.533333,206.813333 -482.933333,181.613333 -502.133333,194.213333" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="482.933333" y="212.02" -><tspan font-style="italic">n > 5</tspan></text> -<polygon stroke-width="0" fill="black" - points="540.533333,150.013333 530.933333,147.613333 -540.533333,145.213333" /> -<polyline stroke-width="1.333333" - points="521.333333,206.813333 554.933333,206.813333 -554.933333,147.613333 -533.68207,147.613333" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="524.666667" y="203.48">T</text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="479.6" y="126.28"><tspan font-style="italic">.N</tspan></text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="479.6" y="245.76"><tspan font-style="italic">.S</tspan></text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="558.266667" y="152.82"><tspan font-style="italic">.E</tspan></text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="431.6" y="152.82"><tspan font-style="italic">.W</tspan></text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="557.333333" y="236.16" -><tspan font-family="Courier">Frepeatuntil</tspan></text> -<polyline stroke-width="0" fill="rgb(230,230,230)" - points="521.333333,273.413333 -540.533333,286.013333 -502.133333,311.213333 -463.733333,286.013333 -502.133333,260.813333 -521.333333,273.413333" /> -<polyline stroke-width="1.333333" - points="521.333333,273.413333 540.533333,286.013333 -502.133333,311.213333 -463.733333,286.013333 -502.133333,260.813333 -521.333333,273.413333" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="502.133333" y="291.22" -><tspan font-style="italic">A < B</tspan></text> -<rect fill="rgb(230,230,230)" - stroke-width="1.333333" - x="386.933333" y="311.213333" width="96" height="36" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="434.933333" y="334.42">False</text> -<polygon stroke-width="0" fill="black" - points="437.333333,301.613333 434.933333,311.213333 -432.533333,301.613333" /> -<polyline stroke-width="1.333333" - points="463.733333,286.013333 434.933333,286.013333 -434.933333,308.464596" /> -<rect fill="rgb(230,230,230)" - stroke-width="1.333333" - x="521.333333" y="311.213333" width="96" height="43.2" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="569.333333" y="338.02">True</text> -<polygon stroke-width="0" fill="black" - points="571.733333,301.613333 569.333333,311.213333 -566.933333,301.613333" /> -<polyline stroke-width="1.333333" - points="540.533333,286.013333 569.333333,286.013333 -569.333333,308.464596" /> -<polygon stroke-width="0" fill="black" - points="437.333333,360.813333 434.933333,370.413333 -432.533333,360.813333" /> -<line stroke-width="1.333333" - x1="434.933333" y1="347.213333" x2="434.933333" y2="367.664596" /> -<polygon stroke-width="0" fill="black" - points="571.733333,360.813333 569.333333,370.413333 -566.933333,360.813333" /> -<line stroke-width="1.333333" - x1="569.333333" y1="354.413333" x2="569.333333" y2="367.664596" /> -<line stroke-width="1.333333" - x1="569.333333" y1="370.413333" x2="434.933333" y2="370.413333" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="498.8" y="257.48"><tspan font-style="italic">.N</tspan></text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="498.8" y="384.16"><tspan font-style="italic">.S</tspan></text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="620.666667" y="338.02"><tspan font-style="italic">.E</tspan></text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="383.6" y="334.42"><tspan font-style="italic">.W</tspan></text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="502.133333" y="398.56" -><tspan font-family="Courier">Fifthenelse</tspan></text> -<ellipse fill="rgb(173,255,46)" stroke-width="1.333333" - cx="164.533333" cy="324.413333" rx="36" ry="24" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="164.533333" y="329.62">Start</text> -<polygon stroke-width="0" fill="black" - points="214.933333,322.013333 224.533333,324.413333 -214.933333,326.813333" /> -<line stroke-width="1.333333" - x1="200.533333" y1="324.413333" x2="221.784596" y2="324.413333" /> -<rect fill="rgb(230,230,230)" - stroke-width="1.333333" - x="224.533333" y="306.413333" width="96" height="36" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="272.533333" y="329.62">First task</text> -<polygon stroke-width="0" fill="black" - points="274.933333,356.813333 272.533333,366.413333 -270.133333,356.813333" /> -<line stroke-width="1.333333" - x1="272.533333" y1="342.413333" x2="272.533333" y2="363.664596" /> -<polyline stroke-width="0" fill="rgb(230,230,230)" - points="291.733333,379.013333 -310.933333,391.613333 -272.533333,416.813333 -234.133333,391.613333 -272.533333,366.413333 -291.733333,379.013333" /> -<polyline stroke-width="1.333333" - points="291.733333,379.013333 310.933333,391.613333 -272.533333,416.813333 -234.133333,391.613333 -272.533333,366.413333 -291.733333,379.013333" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="272.533333" y="396.82">Test 1</text> -<rect fill="rgb(230,230,230)" - stroke-width="1.333333" - x="130.933333" y="416.813333" width="96" height="36" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="178.933333" y="440.02">Task</text> -<polygon stroke-width="0" fill="black" - points="181.333333,459.213333 178.933333,468.813333 -176.533333,459.213333" /> -<line stroke-width="1.333333" - x1="178.933333" y1="452.813333" x2="178.933333" y2="466.064596" /> -<polyline stroke-width="0" fill="rgb(217,166,33)" - points="198.133333,481.413333 -217.333333,494.013333 -178.933333,519.213333 -140.533333,494.013333 -178.933333,468.813333 -198.133333,481.413333" /> -<polyline stroke-width="1.333333" - points="198.133333,481.413333 217.333333,494.013333 -178.933333,519.213333 -140.533333,494.013333 -178.933333,468.813333 -198.133333,481.413333" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="178.933333" y="499.22" -><tspan font-style="italic">i ≥ 5</tspan></text> -<polygon stroke-width="0" fill="black" - points="236.533333,437.213333 226.933333,434.813333 -236.533333,432.413333" /> -<polyline stroke-width="1.333333" - points="217.333333,494.013333 250.933333,494.013333 -250.933333,434.813333 -229.68207,434.813333" /> -<polygon stroke-width="0" fill="black" - points="181.333333,407.213333 178.933333,416.813333 -176.533333,407.213333" /> -<polyline stroke-width="1.333333" - points="234.133333,391.613333 178.933333,391.613333 -178.933333,414.064596" /> -<polyline stroke-width="0" fill="rgb(217,166,33)" - points="426.133333,429.413333 -445.333333,442.013333 -406.933333,467.213333 -368.533333,442.013333 -406.933333,416.813333 -426.133333,429.413333" /> -<polyline stroke-width="1.333333" - points="426.133333,429.413333 445.333333,442.013333 -406.933333,467.213333 -368.533333,442.013333 -406.933333,416.813333 -426.133333,429.413333" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="406.933333" y="447.22" -><tspan font-style="italic">A < B</tspan></text> -<rect fill="rgb(230,230,230)" - stroke-width="1.333333" - x="291.733333" y="467.213333" width="96" height="36" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="339.733333" y="490.42">Left</text> -<polygon stroke-width="0" fill="black" - points="342.133333,457.613333 339.733333,467.213333 -337.333333,457.613333" /> -<polyline stroke-width="1.333333" - points="368.533333,442.013333 339.733333,442.013333 -339.733333,464.464596" /> -<rect fill="rgb(230,230,230)" - stroke-width="1.333333" - x="426.133333" y="467.213333" width="96" height="36" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="474.133333" y="490.42">Right</text> -<polygon stroke-width="0" fill="black" - points="476.533333,457.613333 474.133333,467.213333 -471.733333,457.613333" /> -<polyline stroke-width="1.333333" - points="445.333333,442.013333 474.133333,442.013333 -474.133333,464.464596" /> -<polygon stroke-width="0" fill="black" - points="342.133333,509.613333 339.733333,519.213333 -337.333333,509.613333" /> -<line stroke-width="1.333333" - x1="339.733333" y1="503.213333" x2="339.733333" y2="516.464596" /> -<polygon stroke-width="0" fill="black" - points="476.533333,509.613333 474.133333,519.213333 -471.733333,509.613333" /> -<line stroke-width="1.333333" - x1="474.133333" y1="503.213333" x2="474.133333" y2="516.464596" /> -<line stroke-width="1.333333" - x1="474.133333" y1="519.213333" x2="339.733333" y2="519.213333" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="448.666667" y="438.68">T</text> -<polygon stroke-width="0" fill="black" - points="409.333333,407.213333 406.933333,416.813333 -404.533333,407.213333" /> -<polyline stroke-width="1.333333" - points="310.933333,391.613333 406.933333,391.613333 -406.933333,414.064596" /> -<polygon stroke-width="0" fill="black" - points="181.333333,525.613333 178.933333,535.213333 -176.533333,525.613333" /> -<line stroke-width="1.333333" - x1="178.933333" y1="519.213333" x2="178.933333" y2="532.464596" /> -<polygon stroke-width="0" fill="black" - points="409.333333,525.613333 406.933333,535.213333 -404.533333,525.613333" /> -<line stroke-width="1.333333" - x1="406.933333" y1="519.213333" x2="406.933333" y2="532.464596" /> -<line stroke-width="1.333333" - x1="406.933333" y1="535.213333" x2="178.933333" y2="535.213333" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="314.266667" y="388.28">T</text> -<polygon stroke-width="0" fill="black" - points="274.933333,549.613333 272.533333,559.213333 -270.133333,549.613333" /> -<line stroke-width="1.333333" - x1="272.533333" y1="535.213333" x2="272.533333" y2="556.464596" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="285.466667" y="555.88" -><tspan font-style="italic">Compound statements</tspan></text> -<ellipse fill="green" stroke-width="1.333333" - cx="146.533333" cy="655.213333" rx="18" ry="12" /> -<polygon stroke-width="0" fill="black" - points="178.933333,652.813333 188.533333,655.213333 -178.933333,657.613333" /> -<line stroke-width="1.333333" - x1="164.533333" y1="655.213333" x2="185.784596" y2="655.213333" /> -<rect fill="rgb(230,230,230)" - stroke-width="1.333333" - x="188.533333" y="637.213333" width="96" height="36" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="236.533333" y="660.42">Planejamento</text> -<rect fill="rgb(230,230,230)" - stroke-width="1.333333" - x="356.533333" y="637.213333" width="96" height="36" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="404.533333" y="660.42">Execução</text> -<rect fill="rgb(230,230,230)" - stroke-width="1.333333" - x="524.533333" y="637.213333" width="96" height="36" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="572.533333" y="660.42">Seleção</text> -<polyline stroke-width="0" fill="rgb(173,255,46)" - points="356.533333,583.213333 -392.533333,601.213333 -320.533333,637.213333 -248.533333,601.213333 -320.533333,565.213333 -356.533333,583.213333" /> -<polyline stroke-width="1.333333" - points="356.533333,583.213333 392.533333,601.213333 -320.533333,637.213333 -248.533333,601.213333 -320.533333,565.213333 -356.533333,583.213333" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="320.533333" y="599.086667">Avaliação do</text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="320.533333" y="613.753333">Planejamento</text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="395.866667" y="597.88">Correto</text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="245.2" y="597.88">Incompleto</text> -<polygon stroke-width="0" fill="black" - points="318.133333,646.813333 320.533333,637.213333 -322.933333,646.813333" /> -<polyline stroke-width="1.333333" - points="284.533333,655.213333 320.533333,655.213333 -320.533333,639.96207" /> -<polygon stroke-width="0" fill="black" - points="238.933333,627.613333 236.533333,637.213333 -234.133333,627.613333" /> -<polyline stroke-width="1.333333" - points="248.533333,601.213333 236.533333,601.213333 -236.533333,634.464596" /> -<polygon stroke-width="0" fill="black" - points="406.933333,627.613333 404.533333,637.213333 -402.133333,627.613333" /> -<polyline stroke-width="1.333333" - points="392.533333,601.213333 404.533333,601.213333 -404.533333,634.464596" /> -<polyline stroke-width="0" fill="rgb(173,255,46)" - points="524.533333,691.213333 -560.533333,709.213333 -488.533333,745.213333 -416.533333,709.213333 -488.533333,673.213333 -524.533333,691.213333" /> -<polyline stroke-width="1.333333" - points="524.533333,691.213333 560.533333,709.213333 -488.533333,745.213333 -416.533333,709.213333 -488.533333,673.213333 -524.533333,691.213333" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="488.533333" y="707.086667">Avaliação da</text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="488.533333" y="721.753333">Execução</text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="563.866667" y="722.96">Correto</text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="413.2" y="722.96">Incompleto</text> -<polygon stroke-width="0" fill="black" - points="490.933333,663.613333 488.533333,673.213333 -486.133333,663.613333" /> -<polyline stroke-width="1.333333" - points="452.533333,655.213333 488.533333,655.213333 -488.533333,670.464596" /> -<polygon stroke-width="0" fill="black" - points="402.133333,682.813333 404.533333,673.213333 -406.933333,682.813333" /> -<polyline stroke-width="1.333333" - points="416.533333,709.213333 404.533333,709.213333 -404.533333,675.96207" /> -<polygon stroke-width="0" fill="black" - points="570.133333,682.813333 572.533333,673.213333 -574.933333,682.813333" /> -<polyline stroke-width="1.333333" - points="560.533333,709.213333 572.533333,709.213333 -572.533333,675.96207" /> -<rect fill="rgb(230,230,230)" - stroke-width="1.333333" - x="524.533333" y="577.213333" width="96" height="36" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="572.533333" y="600.42">Extração</text> -<polygon stroke-width="0" fill="black" - points="570.133333,622.813333 572.533333,613.213333 -574.933333,622.813333" /> -<line stroke-width="1.333333" - x1="572.533333" y1="637.213333" x2="572.533333" y2="615.96207" /> -<polygon stroke-width="0" fill="black" - points="570.133333,562.813333 572.533333,553.213333 -574.933333,562.813333" /> -<line stroke-width="1.333333" - x1="572.533333" y1="577.213333" x2="572.533333" y2="555.96207" /> -<rect fill="rgb(230,230,230)" - stroke-width="1.333333" - x="524.533333" y="517.213333" width="96" height="36" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="572.533333" y="540.42">Conclusão</text> -<polygon stroke-width="0" fill="black" - points="570.133333,502.813333 572.533333,493.213333 -574.933333,502.813333" /> -<line stroke-width="1.333333" - x1="572.533333" y1="517.213333" x2="572.533333" y2="495.96207" /> -<ellipse fill="red" stroke-width="1.333333" - cx="572.533333" cy="481.213333" rx="18" ry="12" /> -</g> -</g></svg> diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/dpv/FontsDPV.svg b/Master/texmf-dist/doc/latex/circuit-macros/examples/dpv/FontsDPV.svg deleted file mode 100644 index 52f9d53f63e..00000000000 --- a/Master/texmf-dist/doc/latex/circuit-macros/examples/dpv/FontsDPV.svg +++ /dev/null @@ -1,204 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" -"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> -<!-- Creator: dpic version 2022.12.01 option -v for SVG 1.1 --> -<!-- width="551" height="676" --> -<svg - xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" - xml:space="preserve" - style="shape-rendering:geometricPrecision; text-rendering:geometricPrecision; - image-rendering:optimizeQuality; fill-rule:evenodd; clip-rule:evenodd" - width="550.4px" height="675.2px" - viewBox="0 0 550.4 675.2" - font-size="11pt" text-anchor="middle" - stroke="black" stroke-miterlimit="10" stroke-width="1.066667" fill="none"> -<g> -<rect x="1.066667" y="0.533333" width="547.2" height="672" /> -<g style="font-family:Arial" -> -<text font-size="21.818182pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="51.733333" y="58.133333">Arial</text> -</g> -<g style="font-family:Arial" -> -<text font-size="21.818182pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="243.733333" y="58.133333">ABCDEFG abcdefg</text> -</g> -<g style="font-family:Helvetica" -> -<text font-size="21.818182pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="51.733333" y="106.133333">Helvetica</text> -</g> -<g style="font-family:Helvetica" -> -<text font-size="21.818182pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="243.733333" y="106.133333">ABCDEFG abcdefg</text> -</g> -<g style="font-family:Times" -> -<text font-size="21.818182pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="51.733333" y="154.133333">Times</text> -</g> -<g style="font-family:Times" -> -<text font-size="21.818182pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="243.733333" y="154.133333">ABCDEFG abcdefg</text> -</g> -<g style="font-family:Courier" -> -<text font-size="21.818182pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="51.733333" y="202.133333">Courier</text> -</g> -<g style="font-family:Courier" -> -<text font-size="21.818182pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="243.733333" y="202.133333">ABCDEFG abcdefg</text> -</g> -<g style="font-family:Cursive" -> -<text font-size="21.818182pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="51.733333" y="250.133333">Cursive</text> -</g> -<g style="font-family:Cursive" -> -<text font-size="21.818182pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="243.733333" y="250.133333">ABCDEFG abcdefg</text> -</g> -<g style="font-family:Verdana" -> -<text font-size="21.818182pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="51.733333" y="298.133333">Verdana</text> -</g> -<g style="font-family:Verdana" -> -<text font-size="21.818182pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="243.733333" y="298.133333">ABCDEFG abcdefg</text> -</g> -<g style="font-family:Georgia" -> -<text font-size="21.818182pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="51.733333" y="346.133333">Georgia</text> -</g> -<g style="font-family:Georgia" -> -<text font-size="21.818182pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="243.733333" y="346.133333">ABCDEFG abcdefg</text> -</g> -<g style="font-family:Palatino" -> -<text font-size="21.818182pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="51.733333" y="394.133333">Palatino</text> -</g> -<g style="font-family:Palatino" -> -<text font-size="21.818182pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="243.733333" y="394.133333">ABCDEFG abcdefg</text> -</g> -<g style="font-family:Garamond" -> -<text font-size="21.818182pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="51.733333" y="442.133333">Garamond</text> -</g> -<g style="font-family:Garamond" -> -<text font-size="21.818182pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="243.733333" y="442.133333">ABCDEFG abcdefg</text> -</g> -<g style="font-family:Bookman" -> -<text font-size="21.818182pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="51.733333" y="490.133333">Bookman</text> -</g> -<g style="font-family:Bookman" -> -<text font-size="21.818182pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="243.733333" y="490.133333">ABCDEFG abcdefg</text> -</g> -<g style="font-family:Trebuchet MS" -> -<text font-size="21.818182pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="51.733333" y="538.133333">Trebuchet MS</text> -</g> -<g style="font-family:Trebuchet MS" -> -<text font-size="21.818182pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="243.733333" y="538.133333">ABCDEFG abcdefg</text> -</g> -<g style="font-family:Arial Black" -> -<text font-size="21.818182pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="51.733333" y="586.133333">Arial Black</text> -</g> -<g style="font-family:Arial Black" -> -<text font-size="21.818182pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="243.733333" y="586.133333">ABCDEFG abcdefg</text> -</g> -<g style="font-family:Impact" -> -<text font-size="21.818182pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="51.733333" y="634.133333">Impact</text> -</g> -<g style="font-family:Impact" -> -<text font-size="21.818182pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="243.733333" y="634.133333">ABCDEFG abcdefg</text> -</g> -<text font-size="13.090909pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="3.733333" y="669.866667" ->Available fonts: these may be viewer-dependent</text> -</g></svg> diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/dpv/FusesDPV.m4 b/Master/texmf-dist/doc/latex/circuit-macros/examples/dpv/FusesDPV.m4 index f45d0461beb..008a5cdc92d 100644 --- a/Master/texmf-dist/doc/latex/circuit-macros/examples/dpv/FusesDPV.m4 +++ b/Master/texmf-dist/doc/latex/circuit-macros/examples/dpv/FusesDPV.m4 @@ -4,7 +4,8 @@ cct_init(svg_font(sans-serif,11bp__)) movewid = 0.25 - {fuse ; {"`fuse'" at last line.c+(0,-0.2)} + { + fuse ; {"`fuse'" at last line.c+(0,-0.2)} move fuse(,D) ; {"`fuse(,D)'" at last line.c+(0,-0.2)} move @@ -18,21 +19,28 @@ movewid = 0.25 } move down; right_ { - cbreaker; {"`cbreaker'" at last line.c+(0,-0.25)} + fuse(,HB) ; {"`fuse(,HB)'" at last line.c+(0,-0.2)} + move + fuse(,HC,0.5,0.3) ; {"`...(,HC,0.5,0.3)'" at last line.c+(0,-0.25)} move - cbreaker(,R); {"`cbreaker(,R)'" at last line.c+(0,-0.25)} + cbreaker; {"`cbreaker'" at last line.c+(0,-0.2)} move - cbreaker(,,D); {"`...(,,D)'" at last line.c+(0,-0.25)} + cbreaker(,R,D); {"`...(,R,D)'" at last line.c+(0,-0.2)} move - cbreaker(,,T); {"`...(,,T)'" at last line.c+(0,-0.25)} + cbreaker(,,T); {"`...(,,T)'" at last line.c+(0,-0.2)} move - cbreaker(,,TS); {"`...(,,TS)'" at last line.c+(0,-0.25)} + cbreaker(,,TS); {"`...(,,TS)'" at last line.c+(0,-0.2) } } move down; right_ { - fuse(,HB) ; {"`fuse(,HB)'" at last line.c+(0,-0.2)} + jumper ; {"`jumper'" at last line.c+(0,-0.2) } + move + jumper(,CJBED) ; {"`...(,CJBED)'" at last line.c+(0,-0.2) } move - fuse(,HC,0.5,0.3) ; {"`(,HC,0.5,0.3)'" ljust at last line.start+(0,-0.25)} + jumper(,body=outlined "gray" shaded "gray") + { "`...(,body=outlined \"gray\" 'svg_backsl" wid 122bp__ \ + with .w at (last line.start, last "") + "` shaded \"gray\")'" at last "".sw+(0,-10bp__) ljust } } command "</g>" # end font diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/dpv/HeathkitDPV.svg b/Master/texmf-dist/doc/latex/circuit-macros/examples/dpv/HeathkitDPV.svg deleted file mode 100644 index bafdb74ce67..00000000000 --- a/Master/texmf-dist/doc/latex/circuit-macros/examples/dpv/HeathkitDPV.svg +++ /dev/null @@ -1,2010 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" -"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> -<!-- Creator: dpic version 2022.12.01 option -v for SVG 1.1 --> -<!-- width="852" height="607" --> -<svg - xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" - xml:space="preserve" - style="shape-rendering:geometricPrecision; text-rendering:geometricPrecision; - image-rendering:optimizeQuality; fill-rule:evenodd; clip-rule:evenodd" - width="851.2px" height="605.991072px" - viewBox="0 0 851.2 605.991072" - font-size="11pt" text-anchor="middle" - stroke="black" stroke-miterlimit="10" stroke-width="1.066667" fill="none"> -<g> -<g style="font-family:Helvetica" -> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="594.055829" x2="17.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="25.066667" y1="594.055829" x2="25.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="33.066667" y1="594.055829" x2="33.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="41.066667" y1="594.055829" x2="41.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="49.066667" y1="594.055829" x2="49.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="57.066667" y1="594.055829" x2="57.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="65.066667" y1="594.055829" x2="65.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="73.066667" y1="594.055829" x2="73.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="81.066667" y1="594.055829" x2="81.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="89.066667" y1="594.055829" x2="89.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="97.066667" y1="594.055829" x2="97.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="105.066667" y1="594.055829" x2="105.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="113.066667" y1="594.055829" x2="113.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="121.066667" y1="594.055829" x2="121.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="129.066667" y1="594.055829" x2="129.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="137.066667" y1="594.055829" x2="137.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="145.066667" y1="594.055829" x2="145.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="153.066667" y1="594.055829" x2="153.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="161.066667" y1="594.055829" x2="161.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="169.066667" y1="594.055829" x2="169.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="177.066667" y1="594.055829" x2="177.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="185.066667" y1="594.055829" x2="185.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="193.066667" y1="594.055829" x2="193.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="201.066667" y1="594.055829" x2="201.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="209.066667" y1="594.055829" x2="209.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="217.066667" y1="594.055829" x2="217.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="225.066667" y1="594.055829" x2="225.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="233.066667" y1="594.055829" x2="233.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="241.066667" y1="594.055829" x2="241.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="249.066667" y1="594.055829" x2="249.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="257.066667" y1="594.055829" x2="257.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="265.066667" y1="594.055829" x2="265.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="273.066667" y1="594.055829" x2="273.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="281.066667" y1="594.055829" x2="281.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="289.066667" y1="594.055829" x2="289.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="297.066667" y1="594.055829" x2="297.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="305.066667" y1="594.055829" x2="305.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="313.066667" y1="594.055829" x2="313.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="321.066667" y1="594.055829" x2="321.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="329.066667" y1="594.055829" x2="329.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="337.066667" y1="594.055829" x2="337.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="345.066667" y1="594.055829" x2="345.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="353.066667" y1="594.055829" x2="353.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="361.066667" y1="594.055829" x2="361.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="369.066667" y1="594.055829" x2="369.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="377.066667" y1="594.055829" x2="377.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="385.066667" y1="594.055829" x2="385.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="393.066667" y1="594.055829" x2="393.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="401.066667" y1="594.055829" x2="401.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="409.066667" y1="594.055829" x2="409.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="417.066667" y1="594.055829" x2="417.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="425.066667" y1="594.055829" x2="425.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="433.066667" y1="594.055829" x2="433.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="441.066667" y1="594.055829" x2="441.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="449.066667" y1="594.055829" x2="449.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="457.066667" y1="594.055829" x2="457.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="465.066667" y1="594.055829" x2="465.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="473.066667" y1="594.055829" x2="473.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="481.066667" y1="594.055829" x2="481.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="489.066667" y1="594.055829" x2="489.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="497.066667" y1="594.055829" x2="497.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="505.066667" y1="594.055829" x2="505.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="513.066667" y1="594.055829" x2="513.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="521.066667" y1="594.055829" x2="521.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="529.066667" y1="594.055829" x2="529.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="537.066667" y1="594.055829" x2="537.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="545.066667" y1="594.055829" x2="545.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="553.066667" y1="594.055829" x2="553.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="561.066667" y1="594.055829" x2="561.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="569.066667" y1="594.055829" x2="569.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="577.066667" y1="594.055829" x2="577.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="585.066667" y1="594.055829" x2="585.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="593.066667" y1="594.055829" x2="593.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="601.066667" y1="594.055829" x2="601.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="609.066667" y1="594.055829" x2="609.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="617.066667" y1="594.055829" x2="617.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="625.066667" y1="594.055829" x2="625.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="633.066667" y1="594.055829" x2="633.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="641.066667" y1="594.055829" x2="641.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="649.066667" y1="594.055829" x2="649.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="657.066667" y1="594.055829" x2="657.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="665.066667" y1="594.055829" x2="665.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="673.066667" y1="594.055829" x2="673.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="681.066667" y1="594.055829" x2="681.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="689.066667" y1="594.055829" x2="689.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="697.066667" y1="594.055829" x2="697.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="705.066667" y1="594.055829" x2="705.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="713.066667" y1="594.055829" x2="713.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="721.066667" y1="594.055829" x2="721.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="729.066667" y1="594.055829" x2="729.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="737.066667" y1="594.055829" x2="737.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="745.066667" y1="594.055829" x2="745.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="753.066667" y1="594.055829" x2="753.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="761.066667" y1="594.055829" x2="761.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="769.066667" y1="594.055829" x2="769.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="777.066667" y1="594.055829" x2="777.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="785.066667" y1="594.055829" x2="785.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="793.066667" y1="594.055829" x2="793.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="801.066667" y1="594.055829" x2="801.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="809.066667" y1="594.055829" x2="809.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="817.066667" y1="594.055829" x2="817.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="825.066667" y1="594.055829" x2="825.066667" y2="18.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="833.066667" y1="594.055829" x2="833.066667" y2="18.055829" /> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - x="17.066667" y="603.324405">0</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - x="97.066667" y="603.324405">10</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - x="177.066667" y="603.324405">20</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - x="257.066667" y="603.324405">30</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - x="337.066667" y="603.324405">40</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - x="417.066667" y="603.324405">50</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - x="497.066667" y="603.324405">60</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - x="577.066667" y="603.324405">70</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - x="657.066667" y="603.324405">80</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - x="737.066667" y="603.324405">90</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - x="817.066667" y="603.324405">100</text> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="594.055829" x2="833.066667" y2="594.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="586.055829" x2="833.066667" y2="586.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="578.055829" x2="833.066667" y2="578.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="570.055829" x2="833.066667" y2="570.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="562.055829" x2="833.066667" y2="562.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="554.055829" x2="833.066667" y2="554.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="546.055829" x2="833.066667" y2="546.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="538.055829" x2="833.066667" y2="538.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="530.055829" x2="833.066667" y2="530.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="522.055829" x2="833.066667" y2="522.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="514.055829" x2="833.066667" y2="514.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="506.055829" x2="833.066667" y2="506.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="498.055829" x2="833.066667" y2="498.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="490.055829" x2="833.066667" y2="490.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="482.055829" x2="833.066667" y2="482.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="474.055829" x2="833.066667" y2="474.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="466.055829" x2="833.066667" y2="466.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="458.055829" x2="833.066667" y2="458.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="450.055829" x2="833.066667" y2="450.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="442.055829" x2="833.066667" y2="442.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="434.055829" x2="833.066667" y2="434.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="426.055829" x2="833.066667" y2="426.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="418.055829" x2="833.066667" y2="418.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="410.055829" x2="833.066667" y2="410.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="402.055829" x2="833.066667" y2="402.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="394.055829" x2="833.066667" y2="394.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="386.055829" x2="833.066667" y2="386.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="378.055829" x2="833.066667" y2="378.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="370.055829" x2="833.066667" y2="370.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="362.055829" x2="833.066667" y2="362.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="354.055829" x2="833.066667" y2="354.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="346.055829" x2="833.066667" y2="346.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="338.055829" x2="833.066667" y2="338.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="330.055829" x2="833.066667" y2="330.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="322.055829" x2="833.066667" y2="322.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="314.055829" x2="833.066667" y2="314.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="306.055829" x2="833.066667" y2="306.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="298.055829" x2="833.066667" y2="298.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="290.055829" x2="833.066667" y2="290.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="282.055829" x2="833.066667" y2="282.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="274.055829" x2="833.066667" y2="274.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="266.055829" x2="833.066667" y2="266.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="258.055829" x2="833.066667" y2="258.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="250.055829" x2="833.066667" y2="250.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="242.055829" x2="833.066667" y2="242.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="234.055829" x2="833.066667" y2="234.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="226.055829" x2="833.066667" y2="226.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="218.055829" x2="833.066667" y2="218.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="210.055829" x2="833.066667" y2="210.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="202.055829" x2="833.066667" y2="202.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="194.055829" x2="833.066667" y2="194.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="186.055829" x2="833.066667" y2="186.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="178.055829" x2="833.066667" y2="178.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="170.055829" x2="833.066667" y2="170.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="162.055829" x2="833.066667" y2="162.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="154.055829" x2="833.066667" y2="154.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="146.055829" x2="833.066667" y2="146.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="138.055829" x2="833.066667" y2="138.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="130.055829" x2="833.066667" y2="130.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="122.055829" x2="833.066667" y2="122.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="114.055829" x2="833.066667" y2="114.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="106.055829" x2="833.066667" y2="106.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="98.055829" x2="833.066667" y2="98.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="90.055829" x2="833.066667" y2="90.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="82.055829" x2="833.066667" y2="82.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="74.055829" x2="833.066667" y2="74.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="66.055829" x2="833.066667" y2="66.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="58.055829" x2="833.066667" y2="58.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="50.055829" x2="833.066667" y2="50.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="42.055829" x2="833.066667" y2="42.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="34.055829" x2="833.066667" y2="34.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="26.055829" x2="833.066667" y2="26.055829" /> -<line stroke-width="0.533333" - stroke="lightgray" - x1="17.066667" y1="18.055829" x2="833.066667" y2="18.055829" /> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="14.4" y="597.356784">0</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="14.4" y="517.356784">10</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="14.4" y="437.356784">20</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="14.4" y="357.356784">30</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="14.4" y="277.356784">40</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="14.4" y="197.356784">50</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="14.4" y="117.356784">60</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="14.4" y="37.356784">70</text> -<path stroke-width="0" stroke="white" - fill="white" - d="M 17.066667,10.055829 - C 17.066667,11.389162 17.066667,12.722496 17.066667,14.055829 17.066667,16.722496 -17.066667,37.255829 17.066667,75.655829 17.066667,114.055829 -44.266667,133.255829 98.666667,133.255829 153.066667,133.255829 -180.266667,152.455829 180.266667,190.855829 180.266667,229.255829 -207.466667,248.455829 261.866667,248.455829 316.266667,248.455829 -343.466667,267.655829 343.466667,306.055829 343.466667,344.455829 -370.666667,363.655829 425.066667,363.655829 479.466667,363.655829 -506.666667,382.855829 506.666667,421.255829 506.666667,459.655829 -533.866667,478.855829 588.266667,478.855829 642.666667,478.855829 -669.866667,498.055829 669.866667,536.455829 669.866667,574.855829 -697.066667,594.055829 751.466667,594.055829 805.866667,594.055829 -835.733333,594.055829 841.066667,594.055829 846.4,594.055829 -849.066667,591.389162 849.066667,586.055829 849.066667,580.722496 -849.066667,484.722496 849.066667,298.055829 849.066667,111.389162 -849.066667,16.722496 849.066667,14.055829 849.066667,11.389162 -847.733333,10.055829 845.066667,10.055829 843.733333,10.055829 842.4,10.055829 -841.066667,10.055829" /> -<path stroke="white" - d="M 17.066667,10.055829 - C 17.066667,11.389162 17.066667,12.722496 17.066667,14.055829 17.066667,16.722496 -17.066667,37.255829 17.066667,75.655829 17.066667,114.055829 -44.266667,133.255829 98.666667,133.255829 153.066667,133.255829 -180.266667,152.455829 180.266667,190.855829 180.266667,229.255829 -207.466667,248.455829 261.866667,248.455829 316.266667,248.455829 -343.466667,267.655829 343.466667,306.055829 343.466667,344.455829 -370.666667,363.655829 425.066667,363.655829 479.466667,363.655829 -506.666667,382.855829 506.666667,421.255829 506.666667,459.655829 -533.866667,478.855829 588.266667,478.855829 642.666667,478.855829 -669.866667,498.055829 669.866667,536.455829 669.866667,574.855829 -697.066667,594.055829 751.466667,594.055829 805.866667,594.055829 -835.733333,594.055829 841.066667,594.055829 846.4,594.055829 -849.066667,591.389162 849.066667,586.055829 849.066667,580.722496 -849.066667,484.722496 849.066667,298.055829 849.066667,111.389162 -849.066667,16.722496 849.066667,14.055829 849.066667,11.389162 -847.733333,10.055829 845.066667,10.055829 843.733333,10.055829 842.4,10.055829 -841.066667,10.055829" /> -<line x1="657.066667" y1="418.055829" x2="657.066667" y2="418.055829" /> -<line x1="657.066667" y1="418.055829" x2="656.533333" y2="418.055829" /> -<path d="M 657.066667,418.055829 - A 4 4 0 0 1 657.066667,426.055829" /> -<line x1="657.066667" y1="426.055829" x2="656.533333" y2="426.055829" /> -<path d="M 657.066667,426.055829 - A 4 4 0 1 1 657.066667,434.055829" /> -<line x1="657.066667" y1="434.055829" x2="656.533333" y2="434.055829" /> -<path d="M 657.066667,434.055829 - A 4 4 0 0 1 657.066667,442.055829" /> -<line x1="657.066667" y1="442.055829" x2="656.533333" y2="442.055829" /> -<path d="M 657.066667,442.055829 - A 4 4 0 0 1 657.066667,450.055829" /> -<line x1="657.066667" y1="450.055829" x2="656.533333" y2="450.055829" /> -<path d="M 657.066667,450.055829 - A 4 4 0 0 1 657.066667,458.055829" /> -<line x1="657.066667" y1="458.055829" x2="656.533333" y2="458.055829" /> -<path d="M 657.066667,458.055829 - A 4 4 0 0 1 657.066667,466.055829" /> -<line x1="657.066667" y1="466.055829" x2="656.533333" y2="466.055829" /> -<path d="M 657.066667,466.055829 - A 4 4 0 0 1 657.066667,474.055829" /> -<line x1="657.066667" y1="474.055829" x2="656.533333" y2="474.055829" /> -<path d="M 657.066667,474.055829 - A 4 4 0 1 1 657.066667,482.055829" /> -<line x1="657.066667" y1="482.055829" x2="656.533333" y2="482.055829" /> -<path d="M 657.066667,482.055829 - A 4 4 0 1 1 657.066667,490.055829" /> -<line x1="657.066667" y1="490.055829" x2="656.533333" y2="490.055829" /> -<path d="M 657.066667,490.055829 - A 4 4 0 1 1 657.066667,498.055829" /> -<line x1="657.066667" y1="498.055829" x2="656.533333" y2="498.055829" /> -<path d="M 657.066667,498.055829 - A 4 4 0 1 1 657.066667,506.055829" /> -<line x1="657.066667" y1="506.055829" x2="656.533333" y2="506.055829" /> -<path d="M 657.066667,506.055829 - A 4 4 0 1 1 657.066667,514.055829" /> -<line x1="657.066667" y1="514.055829" x2="656.533333" y2="514.055829" /> -<path d="M 657.066667,514.055829 - A 4 4 0 0 1 657.066667,522.055829" /> -<line x1="657.066667" y1="522.055829" x2="656.533333" y2="522.055829" /> -<line x1="657.066667" y1="522.055829" x2="657.066667" y2="522.055829" /> -<line x1="657.066667" y1="250.055829" x2="657.066667" y2="250.055829" /> -<line x1="657.066667" y1="250.055829" x2="656.533333" y2="250.055829" /> -<path d="M 657.066667,250.055829 - A 4 4 0 0 1 657.066667,258.055829" /> -<line x1="657.066667" y1="258.055829" x2="656.533333" y2="258.055829" /> -<path d="M 657.066667,258.055829 - A 4 4 0 1 1 657.066667,266.055829" /> -<line x1="657.066667" y1="266.055829" x2="656.533333" y2="266.055829" /> -<path d="M 657.066667,266.055829 - A 4 4 0 0 1 657.066667,274.055829" /> -<line x1="657.066667" y1="274.055829" x2="656.533333" y2="274.055829" /> -<path d="M 657.066667,274.055829 - A 4 4 0 0 1 657.066667,282.055829" /> -<line x1="657.066667" y1="282.055829" x2="656.533333" y2="282.055829" /> -<path d="M 657.066667,282.055829 - A 4 4 0 0 1 657.066667,290.055829" /> -<line x1="657.066667" y1="290.055829" x2="656.533333" y2="290.055829" /> -<path d="M 657.066667,290.055829 - A 4 4 0 0 1 657.066667,298.055829" /> -<line x1="657.066667" y1="298.055829" x2="656.533333" y2="298.055829" /> -<path d="M 657.066667,298.055829 - A 4 4 0 0 1 657.066667,306.055829" /> -<line x1="657.066667" y1="306.055829" x2="656.533333" y2="306.055829" /> -<path d="M 657.066667,306.055829 - A 4 4 0 1 1 657.066667,314.055829" /> -<line x1="657.066667" y1="314.055829" x2="656.533333" y2="314.055829" /> -<path d="M 657.066667,314.055829 - A 4 4 0 1 1 657.066667,322.055829" /> -<line x1="657.066667" y1="322.055829" x2="656.533333" y2="322.055829" /> -<path d="M 657.066667,322.055829 - A 4 4 0 1 1 657.066667,330.055829" /> -<line x1="657.066667" y1="330.055829" x2="656.533333" y2="330.055829" /> -<line x1="657.066667" y1="330.055829" x2="657.066667" y2="330.055829" /> -<line x1="657.066667" y1="154.055829" x2="657.066667" y2="154.055829" /> -<line x1="657.066667" y1="154.055829" x2="656.533333" y2="154.055829" /> -<path d="M 657.066667,154.055829 - A 4 4 0 0 1 657.066667,162.055829" /> -<line x1="657.066667" y1="162.055829" x2="656.533333" y2="162.055829" /> -<path d="M 657.066667,162.055829 - A 4 4 0 1 1 657.066667,170.055829" /> -<line x1="657.066667" y1="170.055829" x2="656.533333" y2="170.055829" /> -<path d="M 657.066667,170.055829 - A 4 4 0 0 1 657.066667,178.055829" /> -<line x1="657.066667" y1="178.055829" x2="656.533333" y2="178.055829" /> -<path d="M 657.066667,178.055829 - A 4 4 0 0 1 657.066667,186.055829" /> -<line x1="657.066667" y1="186.055829" x2="656.533333" y2="186.055829" /> -<path d="M 657.066667,186.055829 - A 4 4 0 0 1 657.066667,194.055829" /> -<line x1="657.066667" y1="194.055829" x2="656.533333" y2="194.055829" /> -<path d="M 657.066667,194.055829 - A 4 4 0 0 1 657.066667,202.055829" /> -<line x1="657.066667" y1="202.055829" x2="656.533333" y2="202.055829" /> -<path d="M 657.066667,202.055829 - A 4 4 0 0 1 657.066667,210.055829" /> -<line x1="657.066667" y1="210.055829" x2="656.533333" y2="210.055829" /> -<path d="M 657.066667,210.055829 - A 4 4 0 1 1 657.066667,218.055829" /> -<line x1="657.066667" y1="218.055829" x2="656.533333" y2="218.055829" /> -<path d="M 657.066667,218.055829 - A 4 4 0 1 1 657.066667,226.055829" /> -<line x1="657.066667" y1="226.055829" x2="656.533333" y2="226.055829" /> -<path d="M 657.066667,226.055829 - A 4 4 0 1 1 657.066667,234.055829" /> -<line x1="657.066667" y1="234.055829" x2="656.533333" y2="234.055829" /> -<line x1="663.2" y1="154.055829" x2="663.2" y2="234.055829" /> -<line x1="666.4" y1="154.055829" x2="666.4" y2="234.055829" /> -<line x1="657.066667" y1="234.055829" x2="657.066667" y2="234.055829" /> -<line x1="663.2" y1="234.055829" x2="663.2" y2="522.055829" /> -<line x1="666.4" y1="234.055829" x2="666.4" y2="522.055829" /> -<line stroke-dasharray="5.6,4" - x1="669.6" y1="154.055829" x2="669.6" y2="522.055829" /> -<line x1="669.6" y1="522.055829" x2="669.6" y2="534.855829" /> -<line x1="678.133333" y1="534.855829" x2="661.066667" y2="534.855829" /> -<line x1="675.288889" y1="538.055829" x2="663.911111" y2="538.055829" /> -<line x1="673.257143" y1="541.255829" x2="665.942857" y2="541.255829" /> -<line x1="675.733333" y1="266.055829" x2="675.733333" y2="266.055829" /> -<line x1="675.733333" y1="266.055829" x2="676.266667" y2="266.055829" /> -<path d="M 675.733333,266.055829 - A 4 4 0 0 1 675.733333,258.055829" /> -<line x1="675.733333" y1="258.055829" x2="676.266667" y2="258.055829" /> -<path d="M 675.733333,258.055829 - A 4 4 0 0 1 675.733333,250.055829" /> -<line x1="675.733333" y1="250.055829" x2="676.266667" y2="250.055829" /> -<path d="M 675.733333,250.055829 - A 4 4 0 0 1 675.733333,242.055829" /> -<line x1="675.733333" y1="242.055829" x2="676.266667" y2="242.055829" /> -<path d="M 675.733333,242.055829 - A 4 4 0 0 1 675.733333,234.055829" /> -<line x1="675.733333" y1="234.055829" x2="676.266667" y2="234.055829" /> -<path d="M 675.733333,234.055829 - A 4 4 0 0 1 675.733333,226.055829" /> -<line x1="675.733333" y1="226.055829" x2="676.266667" y2="226.055829" /> -<line x1="675.733333" y1="226.055829" x2="675.733333" y2="226.055829" /> -<line x1="675.733333" y1="322.055829" x2="675.733333" y2="322.055829" /> -<line x1="675.733333" y1="322.055829" x2="676.266667" y2="322.055829" /> -<path d="M 675.733333,322.055829 - A 4 4 0 0 1 675.733333,314.055829" /> -<line x1="675.733333" y1="314.055829" x2="676.266667" y2="314.055829" /> -<path d="M 675.733333,314.055829 - A 4 4 0 0 1 675.733333,306.055829" /> -<line x1="675.733333" y1="306.055829" x2="676.266667" y2="306.055829" /> -<path d="M 675.733333,306.055829 - A 4 4 0 0 1 675.733333,298.055829" /> -<line x1="675.733333" y1="298.055829" x2="676.266667" y2="298.055829" /> -<path d="M 675.733333,298.055829 - A 4 4 0 0 1 675.733333,290.055829" /> -<line x1="675.733333" y1="290.055829" x2="676.266667" y2="290.055829" /> -<path d="M 675.733333,290.055829 - A 4 4 0 0 1 675.733333,282.055829" /> -<line x1="675.733333" y1="282.055829" x2="676.266667" y2="282.055829" /> -<line x1="675.733333" y1="282.055829" x2="675.733333" y2="282.055829" /> -<rect stroke-width="2.666667" - stroke-dasharray="5.6,4" - x="137.066667" y="98.055829" width="464" height="440" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="345.066667" y="520.707552">POWER SUPPLY</text> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="345.066667" y="530.006016">CIRCUIT BOARD</text> -<line stroke-width="2.666667" - stroke-dasharray="5.6,4" - x1="297.066667" y1="538.055829" x2="297.066667" y2="506.055829" /> -<line stroke-width="2.666667" - stroke-dasharray="5.6,4" - x1="297.066667" y1="506.055829" x2="393.066667" y2="506.055829" /> -<line stroke-width="2.666667" - stroke-dasharray="5.6,4" - x1="393.066667" y1="506.055829" x2="393.066667" y2="538.055829" /> -<rect fill="white" - x="593.066667" y="514.055829" width="16" height="16" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="601.066667" y="525.356784">1</text> -<line x1="609.066667" y1="522.055829" x2="657.066667" y2="522.055829" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="633.066667" y="519.389162">RED</text> -<rect fill="white" - x="593.066667" y="410.055829" width="16" height="16" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="601.066667" y="421.356784">2</text> -<line x1="609.066667" y1="418.055829" x2="657.066667" y2="418.055829" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="633.066667" y="415.389162">RED</text> -<rect fill="white" - x="593.066667" y="322.055829" width="16" height="16" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="601.066667" y="333.356784">3</text> -<line x1="657.066667" y1="250.055829" x2="625.066667" y2="250.055829" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="641.066667" y="247.389162">GRN</text> -<line x1="625.066667" y1="250.055829" x2="625.066667" y2="262.855829" /> -<line x1="633.6" y1="262.855829" x2="616.533333" y2="262.855829" /> -<line x1="630.755556" y1="266.055829" x2="619.377778" y2="266.055829" /> -<line x1="628.72381" y1="269.255829" x2="621.409524" y2="269.255829" /> -<line x1="609.066667" y1="330.055829" x2="657.066667" y2="330.055829" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="633.066667" y="327.389162">GRN</text> -<polygon stroke-width="0" fill="black" - points="653.302775,321.112933 649.066667,330.055829 -648.595988,320.171576" /> -<polygon stroke-width="0" fill="black" - points="644.830558,258.998725 649.066667,250.055829 -649.537345,259.940082" /> -<path d="M 649.497924,327.899542 - C 650.092714,324.92559 650.687505,321.951638 651.282295,318.977686 652.471876,313.029781 -651.733333,303.389162 649.066667,290.055829 646.4,276.722496 -645.661457,267.081877 646.851038,261.133972 647.445828,258.16002 648.040619,255.186068 -648.635409,252.212116" /> -<rect fill="white" - stroke="none" - x="629.066667" y="286.055829" width="24" height="8" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="641.066667" y="293.356784">6 VAC</text> -<rect fill="white" - x="593.066667" y="346.055829" width="16" height="16" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="601.066667" y="357.356784">4</text> -<line x1="609.066667" y1="354.055829" x2="633.066667" y2="354.055829" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="621.066667" y="351.389162">BRN</text> -<polygon stroke-width="0" fill="black" - points="635.466667,363.655829 633.066667,370.055829 -630.666667,363.655829" /> -<line x1="633.066667" y1="354.055829" x2="633.066667" y2="368.536895" /> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - x="633.066667" y="376.707552">TO DIAL</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - x="633.066667" y="386.006016">LAMPS</text> -<rect fill="white" - x="593.066667" y="226.055829" width="16" height="16" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="601.066667" y="237.356784">5</text> -<line x1="609.066667" y1="234.055829" x2="657.066667" y2="234.055829" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="633.066667" y="231.389162">BLU</text> -<rect fill="white" - x="593.066667" y="146.055829" width="16" height="16" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="601.066667" y="157.356784">7</text> -<line x1="609.066667" y1="154.055829" x2="657.066667" y2="154.055829" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="633.066667" y="151.389162">BLU</text> -<rect fill="white" - x="593.066667" y="186.055829" width="16" height="16" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="601.066667" y="197.356784">6</text> -<line x1="609.066667" y1="194.055829" x2="657.066667" y2="194.055829" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="633.066667" y="191.389162">BLU-YEL</text> -<line x1="675.733333" y1="226.055829" x2="737.066667" y2="226.055829" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="706.4" y="235.324405">BLK</text> -<circle fill="black" - cx="737.066667" cy="226.055829" r="2.048" /> -<line x1="675.733333" y1="266.055829" x2="737.066667" y2="266.055829" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="706.4" y="263.389162">BLK-YEL</text> -<circle fill="black" - cx="737.066667" cy="266.055829" r="2.048" /> -<line x1="675.733333" y1="282.055829" x2="737.066667" y2="282.055829" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="706.4" y="291.324405">BLK-GRN</text> -<circle fill="black" - cx="737.066667" cy="282.055829" r="2.048" /> -<line x1="675.733333" y1="322.055829" x2="737.066667" y2="322.055829" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="706.4" y="319.389162">BLK-RED</text> -<circle fill="black" - cx="737.066667" cy="322.055829" r="2.048" /> -<line x1="737.066667" y1="322.055829" x2="745.066667" y2="322.055829" /> -<circle fill="black" - cx="745.066667" cy="322.055829" r="2.048" /> -<polyline points="737.066667,266.055829 745.066667,266.055829 -745.066667,330.055829" /> -<line x1="745.066667" y1="330.055829" x2="745.066667" y2="331.815829" /> -<path d="M 745.066667,331.815829 - A 5.12 5.12 0 0 1 745.066667,342.055829" /> -<circle fill="white" - cx="745.066667" cy="331.815829" r="2.048" /> -<path d="M 745.066667,342.055829 - A 5.12 5.12 0 0 0 745.066667,352.295829" /> -<line x1="745.066667" y1="352.295829" x2="745.066667" y2="354.055829" /> -<circle fill="white" - cx="745.066667" cy="352.295829" r="2.048" /> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - x="705.066667" y="340.707552">3 A FUSE</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - x="705.066667" y="350.006016">SLOW BLOW</text> -<line x1="745.066667" y1="354.055829" x2="745.066667" y2="362.055829" /> -<circle fill="black" - cx="745.066667" cy="362.055829" r="2.048" /> -<rect x="768" y="352.455829" width="34.133333" height="19.2" /> -<rect x="774.933333" y="355.655829" width="3.2" height="12.8" /> -<rect x="792" y="355.655829" width="3.2" height="12.8" /> -<line x1="768" y1="362.055829" x2="774.933333" y2="362.055829" /> -<line x1="802.133333" y1="362.055829" x2="795.2" y2="362.055829" /> -<line x1="768" y1="362.055829" x2="745.066667" y2="362.055829" /> -<circle fill="black" - cx="745.066667" cy="362.055829" r="2.048" /> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="742.4" y="365.356784">A</text> -<line x1="802.133333" y1="362.055829" x2="825.066667" y2="362.055829" /> -<circle fill="black" - cx="825.066667" cy="362.055829" r="2.048" /> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="827.733333" y="365.356784">B</text> -<rect x="768" y="464.455829" width="34.133333" height="19.2" /> -<rect x="774.933333" y="467.655829" width="3.2" height="12.8" /> -<rect x="792" y="467.655829" width="3.2" height="12.8" /> -<line x1="768" y1="474.055829" x2="774.933333" y2="474.055829" /> -<line x1="802.133333" y1="474.055829" x2="795.2" y2="474.055829" /> -<line x1="768" y1="474.055829" x2="745.066667" y2="474.055829" /> -<circle fill="black" - cx="745.066667" cy="474.055829" r="2.048" /> -<line x1="802.133333" y1="474.055829" x2="825.066667" y2="474.055829" /> -<circle fill="black" - cx="825.066667" cy="474.055829" r="2.048" /> -<rect x="768" y="496.455829" width="34.133333" height="19.2" /> -<rect x="774.933333" y="499.655829" width="3.2" height="12.8" /> -<rect x="792" y="499.655829" width="3.2" height="12.8" /> -<line x1="768" y1="506.055829" x2="774.933333" y2="506.055829" /> -<line x1="802.133333" y1="506.055829" x2="795.2" y2="506.055829" /> -<line x1="768" y1="506.055829" x2="745.066667" y2="506.055829" /> -<circle fill="black" - cx="745.066667" cy="506.055829" r="2.048" /> -<line x1="802.133333" y1="506.055829" x2="825.066667" y2="506.055829" /> -<circle fill="black" - cx="825.066667" cy="506.055829" r="2.048" /> -<line x1="768" y1="570.055829" x2="802.133333" y2="570.055829" /> -<path d="M 768,570.055829 - A 17.066667 17.066667 0 0 1 802.133333,570.055829" /> -<line x1="776.533333" y1="548.989162" x2="776.533333" y2="586.055829" /> -<line x1="793.6" y1="548.989162" x2="793.6" y2="586.055829" /> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="804.8" y="566.174218">120 VAC</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="804.8" y="575.472683">50/60 Hz</text> -<circle cx="764.066667" cy="394.055829" r="7" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="764.066667" y="397.356784">1</text> -<circle cx="778.066667" cy="394.055829" r="7" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="778.066667" y="397.356784">4</text> -<circle cx="764.066667" cy="415.055829" r="7" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="764.066667" y="418.356784">2</text> -<circle cx="778.066667" cy="415.055829" r="7" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="778.066667" y="418.356784">5</text> -<circle cx="764.066667" cy="436.055829" r="7" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="764.066667" y="439.356784">3</text> -<circle cx="778.066667" cy="436.055829" r="7" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="778.066667" y="439.356784">6</text> -<line stroke-width="0.533333" - x1="785.066667" y1="414.844054" x2="791.854892" y2="408.055829" /> -<line stroke-width="0.533333" - x1="785.066667" y1="421.632279" x2="793.066667" y2="413.632279" /> -<line stroke-width="0.533333" - x1="785.066667" y1="428.420504" x2="793.066667" y2="420.420504" /> -<line stroke-width="0.533333" - x1="785.066667" y1="435.208729" x2="793.066667" y2="427.208729" /> -<line stroke-width="0.533333" - x1="785.066667" y1="441.996955" x2="793.066667" y2="433.996955" /> -<line stroke-width="0.533333" - x1="790.796017" y1="443.055829" x2="793.066667" y2="440.78518" /> -<line stroke-width="0.533333" - x1="785.066667" y1="408.055829" x2="785.066667" y2="408.055829" /> -<rect x="785.066667" y="408.055829" width="8" height="35" /> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="738.4" y="418.356784">POWER</text> -<polygon stroke-width="0" fill="black" - points="802.666667,410.655829 805.066667,401.055829 -807.466667,410.655829" /> -<line x1="805.066667" y1="429.055829" x2="805.066667" y2="403.254819" /> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - x="805.066667" y="398.389162">ON</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - x="805.066667" y="438.324405">OFF</text> -<polyline points="757.066667,394.055829 745.066667,394.055829 -745.066667,362.055829" /> -<polyline points="757.066667,415.055829 745.066667,415.055829 -745.066667,548.989162 -776.533333,548.989162" /> -<polyline points="793.6,548.989162 825.066667,548.989162 -825.066667,226.055829 -675.733333,226.055829" /> -<line x1="737.066667" y1="282.055829" x2="825.066667" y2="282.055829" /> -<circle fill="black" - cx="825.066667" cy="282.055829" r="2.048" /> -<rect fill="white" - x="569.066667" y="530.055829" width="16" height="16" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="577.066667" y="541.356784">25</text> -<polyline points="577.066667,546.055829 577.066667,557.255829 -581.333333,559.389162 -572.8,563.655829 -581.333333,567.922496 -572.8,572.189162 -581.333333,576.455829 -572.8,580.722496 -577.066667,582.855829 -577.066667,594.055829" /> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - x="561.066667" y="568.707552">R516</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - x="561.066667" y="578.006016">22</text> -<line x1="585.6" y1="594.055829" x2="568.533333" y2="594.055829" /> -<line x1="582.755556" y1="597.255829" x2="571.377778" y2="597.255829" /> -<line x1="580.72381" y1="600.455829" x2="573.409524" y2="600.455829" /> -<circle fill="black" - cx="577.066667" cy="554.055829" r="2.048" /> -<line x1="577.066667" y1="554.055829" x2="617.066667" y2="554.055829" /> -<line x1="617.066667" y1="586.055829" x2="617.066667" y2="582.855829" /> -<circle cx="617.066667" cy="570.055829" r="12.8" /> -<line x1="617.066667" y1="582.855829" x2="617.066667" y2="578.589162" /> -<circle stroke-width="0.533333" - cx="617.066667" cy="578.589162" r="0.26567" /> -<path d="M 617.066667,578.589162 - A 6.4 6.4 0 0 0 617.066667,565.789162" /> -<path d="M 617.066667,565.789162 - A 4.266667 4.266667 0 0 0 617.066667,574.322496" /> -<path d="M 617.066667,574.322496 - A 6.4 6.4 0 0 0 617.066667,561.522496" /> -<circle stroke-width="0.533333" - cx="617.066667" cy="561.522496" r="0.26567" /> -<line x1="617.066667" y1="561.522496" x2="617.066667" y2="557.255829" /> -<line x1="617.066667" y1="557.255829" x2="617.066667" y2="554.055829" /> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="635.733333" y="564.05832">#49</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="635.733333" y="573.356784">HI</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="635.733333" y="582.655248">TEMP</text> -<line x1="617.066667" y1="586.055829" x2="577.066667" y2="586.055829" /> -<circle fill="black" - cx="577.066667" cy="586.055829" r="2.048" /> -<polygon stroke-width="0" fill="black" - points="581.978442,550.651196 577.066667,550.055829 -581.680759,548.269729" /> -<line stroke-width="0.533333" - x1="578.157671" y1="549.919454" x2="593.066667" y2="548.055829" /> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="595.733333" y="551.356784">BRN</text> -<rect fill="white" - x="537.066667" y="530.055829" width="16" height="16" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="545.066667" y="541.356784">24</text> -<line x1="545.066667" y1="546.055829" x2="545.066667" y2="594.055829" /> -<line x1="553.6" y1="594.055829" x2="536.533333" y2="594.055829" /> -<line x1="550.755556" y1="597.255829" x2="539.377778" y2="597.255829" /> -<line x1="548.72381" y1="600.455829" x2="541.409524" y2="600.455829" /> -<rect fill="white" - x="225.066667" y="530.055829" width="16" height="16" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="233.066667" y="541.356784">23</text> -<line x1="233.066667" y1="546.055829" x2="233.066667" y2="594.055829" /> -<line x1="241.6" y1="594.055829" x2="224.533333" y2="594.055829" /> -<line x1="238.755556" y1="597.255829" x2="227.377778" y2="597.255829" /> -<line x1="236.72381" y1="600.455829" x2="229.409524" y2="600.455829" /> -<rect fill="white" - x="129.066667" y="506.055829" width="16" height="16" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="137.066667" y="517.356784">22</text> -<polyline points="145.066667,514.055829 164.266667,514.055829 -166.4,509.789162 -170.666667,518.322496 -174.933333,509.789162 -179.2,518.322496 -183.466667,509.789162 -187.733333,518.322496 -189.866667,514.055829 -209.066667,514.055829" /> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - x="177.066667" y="507.122496">R514</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - x="177.066667" y="527.591072">680 K</text> -<circle fill="black" - cx="209.066667" cy="514.055829" r="2.048" /> -<line x1="209.066667" y1="514.055829" x2="209.066667" y2="526.855829" /> -<line x1="217.6" y1="526.855829" x2="200.533333" y2="526.855829" /> -<line x1="214.755556" y1="530.055829" x2="203.377778" y2="530.055829" /> -<line x1="212.72381" y1="533.255829" x2="205.409524" y2="533.255829" /> -<polyline points="209.066667,514.055829 233.066667,514.055829 -233.066667,530.055829" /> -<circle fill="black" - cx="545.066667" cy="470.055829" r="2.048" /> -<line x1="545.066667" y1="470.055829" x2="521.679456" y2="446.668618" /> -<polyline stroke-width="0" fill="black" - points="521.679456,446.668618 -518.662467,449.685607 -516.829592,441.818755 -524.696445,443.651629 -521.679456,446.668618" /> -<polyline points="521.679456,446.668618 518.662467,449.685607 -516.829592,441.818755 -524.696445,443.651629 -521.679456,446.668618" /> -<line x1="519.745909" y1="438.151009" x2="513.161846" y2="444.735071" /> -<line x1="516.453878" y1="441.44304" x2="493.066667" y2="418.055829" /> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="521.733333" y="437.16278">D508</text> -<circle fill="black" - cx="493.066667" cy="418.055829" r="2.048" /> -<line x1="493.066667" y1="418.055829" x2="469.679456" y2="441.44304" /> -<polyline stroke-width="0" fill="black" - points="469.679456,441.44304 -472.696445,444.460029 -464.829592,446.292903 -466.662467,438.426051 -469.679456,441.44304" /> -<polyline points="469.679456,441.44304 472.696445,444.460029 -464.829592,446.292903 -466.662467,438.426051 -469.679456,441.44304" /> -<line x1="461.161846" y1="443.376587" x2="467.745909" y2="449.960649" /> -<line x1="464.453878" y1="446.668618" x2="441.066667" y2="470.055829" /> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="464.4" y="437.16278">D506</text> -<circle fill="black" - cx="441.066667" cy="470.055829" r="2.048" /> -<line x1="545.066667" y1="470.055829" x2="521.679456" y2="493.44304" /> -<polyline stroke-width="0" fill="black" - points="521.679456,493.44304 -524.696445,496.460029 -516.829592,498.292903 -518.662467,490.426051 -521.679456,493.44304" /> -<polyline points="521.679456,493.44304 524.696445,496.460029 -516.829592,498.292903 -518.662467,490.426051 -521.679456,493.44304" /> -<line x1="513.161846" y1="495.376587" x2="519.745909" y2="501.960649" /> -<line x1="516.453878" y1="498.668618" x2="493.066667" y2="522.055829" /> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="521.733333" y="509.550788">D509</text> -<circle fill="black" - cx="493.066667" cy="522.055829" r="2.048" /> -<line x1="493.066667" y1="522.055829" x2="469.679456" y2="498.668618" /> -<polyline stroke-width="0" fill="black" - points="469.679456,498.668618 -466.662467,501.685607 -464.829592,493.818755 -472.696445,495.651629 -469.679456,498.668618" /> -<polyline points="469.679456,498.668618 466.662467,501.685607 -464.829592,493.818755 -472.696445,495.651629 -469.679456,498.668618" /> -<line x1="467.745909" y1="490.151009" x2="461.161846" y2="496.735071" /> -<line x1="464.453878" y1="493.44304" x2="441.066667" y2="470.055829" /> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="464.4" y="509.550788">D507</text> -<line x1="493.066667" y1="418.055829" x2="493.066667" y2="467.495829" /> -<line x1="486.666667" y1="467.495829" x2="499.466667" y2="467.495829" /> -<path d="M 486.666667,472.615829 - A 12.8 12.8 0 0 1 499.466667,472.615829" /> -<line x1="493.066667" y1="470.900954" x2="493.066667" y2="522.055829" /> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="495.733333" y="464.829162">C507</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="495.733333" y="481.884405">.22</text> -<line x1="545.066667" y1="470.055829" x2="545.066667" y2="530.055829" /> -<line x1="493.066667" y1="418.055829" x2="593.066667" y2="418.055829" /> -<line x1="493.066667" y1="522.055829" x2="593.066667" y2="522.055829" /> -<polygon stroke-width="0" fill="black" - points="564.898508,512.932398 561.066667,522.055829 -560.154324,512.202524" /> -<polygon stroke-width="0" fill="black" - points="557.234826,427.17926 561.066667,418.055829 -561.97901,427.909135" /> -<path d="M 561.401039,519.88241 - C 562.011977,515.911313 562.622915,511.940216 563.233853,507.96912 564.455729,500.026926 -563.733333,487.389162 561.066667,470.055829 558.4,452.722496 -557.677605,440.084732 558.899481,432.142539 559.510419,428.171442 560.121357,424.200345 -560.732294,420.229248" /> -<rect fill="white" - stroke="none" - x="553.066667" y="462.055829" width="16" height="16" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="561.066667" y="468.707552">57</text> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="561.066667" y="478.006016">VAC</text> -<rect fill="white" - x="129.066667" y="462.055829" width="16" height="16" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="137.066667" y="473.356784">21</text> -<line x1="145.066667" y1="470.055829" x2="441.066667" y2="470.055829" /> -<rect fill="white" - x="129.066667" y="486.055829" width="16" height="16" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="137.066667" y="497.356784">19</text> -<rect fill="white" - x="129.066667" y="438.055829" width="16" height="16" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="137.066667" y="449.356784">20</text> -<line x1="593.066667" y1="194.055829" x2="577.066667" y2="194.055829" /> -<line x1="577.066667" y1="194.055829" x2="577.066667" y2="206.855829" /> -<line x1="585.6" y1="206.855829" x2="568.533333" y2="206.855829" /> -<line x1="582.755556" y1="210.055829" x2="571.377778" y2="210.055829" /> -<line x1="580.72381" y1="213.255829" x2="573.409524" y2="213.255829" /> -<line x1="593.066667" y1="234.055829" x2="561.066667" y2="234.055829" /> -<circle fill="black" - cx="561.066667" cy="234.055829" r="2.048" /> -<line x1="561.066667" y1="234.055829" x2="561.066667" y2="247.495829" /> -<line x1="554.666667" y1="247.495829" x2="567.466667" y2="247.495829" /> -<path d="M 554.666667,252.615829 - A 12.8 12.8 0 0 1 567.466667,252.615829" /> -<line x1="561.066667" y1="250.900954" x2="561.066667" y2="266.055829" /> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="563.733333" y="244.829162">C504</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="563.733333" y="261.884405">.22</text> -<line x1="569.6" y1="266.055829" x2="552.533333" y2="266.055829" /> -<line x1="566.755556" y1="269.255829" x2="555.377778" y2="269.255829" /> -<line x1="564.72381" y1="272.455829" x2="557.409524" y2="272.455829" /> -<line x1="561.066667" y1="234.055829" x2="544.761708" y2="234.055829" /> -<polyline stroke-width="0" fill="black" - points="544.761708,234.055829 -544.761708,238.322496 -537.902966,234.055829 -544.761708,229.789162 -544.761708,234.055829" /> -<polyline points="544.761708,234.055829 544.761708,238.322496 -537.902966,234.055829 -544.761708,229.789162 -544.761708,234.055829" /> -<line x1="537.371625" y1="229.400194" x2="537.371625" y2="238.711464" /> -<line x1="537.371625" y1="234.055829" x2="521.066667" y2="234.055829" /> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - x="541.066667" y="226.202186">D504</text> -<circle fill="black" - cx="521.066667" cy="234.055829" r="2.048" /> -<line x1="521.066667" y1="234.055829" x2="521.066667" y2="247.495829" /> -<line x1="514.666667" y1="247.495829" x2="527.466667" y2="247.495829" /> -<path d="M 514.666667,252.615829 - A 12.8 12.8 0 0 1 527.466667,252.615829" /> -<line x1="521.066667" y1="250.900954" x2="521.066667" y2="266.055829" /> -<line stroke-width="0.666667" - x1="525.333333" y1="245.362496" x2="525.333333" y2="241.095829" /> -<line stroke-width="0.666667" - x1="527.466667" y1="243.229162" x2="523.2" y2="243.229162" /> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="518.4" y="244.829162">C505</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="512" y="253.356784">100</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="518.4" y="261.884405">75 V</text> -<line x1="529.6" y1="266.055829" x2="512.533333" y2="266.055829" /> -<line x1="526.755556" y1="269.255829" x2="515.377778" y2="269.255829" /> -<line x1="524.72381" y1="272.455829" x2="517.409524" y2="272.455829" /> -<line x1="521.066667" y1="234.055829" x2="521.066667" y2="154.055829" /> -<circle fill="black" - cx="521.066667" cy="154.055829" r="2.048" /> -<line x1="561.066667" y1="154.055829" x2="544.761708" y2="154.055829" /> -<polyline stroke-width="0" fill="black" - points="544.761708,154.055829 -544.761708,158.322496 -537.902966,154.055829 -544.761708,149.789162 -544.761708,154.055829" /> -<polyline points="544.761708,154.055829 544.761708,158.322496 -537.902966,154.055829 -544.761708,149.789162 -544.761708,154.055829" /> -<line x1="537.371625" y1="149.400194" x2="537.371625" y2="158.711464" /> -<line x1="537.371625" y1="154.055829" x2="521.066667" y2="154.055829" /> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - x="541.066667" y="146.202186">D503</text> -<line x1="561.066667" y1="154.055829" x2="593.066667" y2="154.055829" /> -<polygon stroke-width="0" fill="black" - points="568.409992,224.742281 565.066667,234.055829 -563.633813,224.264663" /> -<polygon stroke-width="0" fill="black" - points="561.723342,163.369377 565.066667,154.055829 -566.49952,163.846995" /> -<path d="M 565.285474,231.867753 - C 565.58234,228.899099 565.879205,225.930445 566.17607,222.961791 566.769801,217.024483 -566.4,207.389162 565.066667,194.055829 563.733333,180.722496 -563.363532,171.087175 563.957263,165.149867 564.254128,162.181213 564.550994,159.21256 -564.847859,156.243906" /> -<rect fill="white" - stroke="none" - x="541.066667" y="190.055829" width="32" height="8" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="557.066667" y="197.356784">100 VAC</text> -<line x1="498.297436" y1="338.671214" x2="498.297436" y2="358.363521" /> -<line x1="485.989744" y1="348.517368" x2="498.297436" y2="348.517368" /> -<line x1="517.989744" y1="333.748137" x2="498.297436" y2="342.609675" /> -<polygon stroke-width="0" fill="black" - points="511.825311,339.52134 503.220513,340.394291 -509.580581,334.533052" /> -<line x1="513.066667" y1="335.963521" x2="504.758512" y2="339.702191" /> -<line x1="517.989744" y1="363.286598" x2="498.297436" y2="354.42506" /> -<path d="M 485.989744,348.517368 - A 19.692308 19.692308 0 1 0 525.374359,348.517368" /> -<line x1="525.374359" y1="348.517368" x2="525.374359" y2="348.517368" /> -<path d="M 525.374359,348.517368 - A 19.692308 19.692308 0 0 0 485.989744,348.517368" /> -<line x1="485.989744" y1="348.517368" x2="485.989744" y2="348.517368" /> -<circle cx="521.066667" cy="330.055829" r="4.923077" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="521.066667" y="333.356784">E</text> -<circle cx="481.066667" cy="348.517368" r="4.923077" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="481.066667" y="351.818322">B</text> -<circle cx="521.066667" cy="366.978906" r="4.923077" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="521.066667" y="370.279861">C</text> -<polyline points="525.989744,366.978906 577.066667,366.978906 -577.066667,530.055829" /> -<line x1="481.066667" y1="353.440444" x2="481.066667" y2="362.055829" /> -<polyline points="481.066667,362.055829 481.066667,369.255829 -485.333333,371.389162 -476.8,375.655829 -485.333333,379.922496 -476.8,384.189162 -485.333333,388.455829 -476.8,392.722496 -481.066667,394.855829 -481.066667,402.055829" /> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="488" y="380.707552">R513</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="488" y="390.006016">1500</text> -<line x1="489.6" y1="402.055829" x2="472.533333" y2="402.055829" /> -<line x1="486.755556" y1="405.255829" x2="475.377778" y2="405.255829" /> -<line x1="484.72381" y1="408.455829" x2="477.409524" y2="408.455829" /> -<polyline points="145.066667,494.055829 425.066667,494.055829 -425.066667,314.055829" /> -<polyline points="425.066667,314.055829 432.266667,314.055829 -434.4,309.789162 -438.666667,318.322496 -442.933333,309.789162 -447.2,318.322496 -451.466667,309.789162 -455.733333,318.322496 -457.866667,314.055829 -465.066667,314.055829" /> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - x="445.066667" y="307.122496">R511</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - x="445.066667" y="327.591072">470</text> -<polyline points="465.066667,314.055829 521.066667,314.055829 -521.066667,325.132752" /> -<polyline points="145.066667,446.055829 441.066667,446.055829 -441.066667,402.055829" /> -<polyline points="441.066667,402.055829 441.066667,394.855829 -436.8,392.722496 -445.333333,388.455829 -436.8,384.189162 -445.333333,379.922496 -436.8,375.655829 -445.333333,371.389162 -441.066667,369.255829 -441.066667,362.055829" /> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="448" y="376.05832">R512</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="448" y="385.356784">5600</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="448" y="394.655248">1 W</text> -<polyline points="441.066667,362.055829 441.066667,348.517368 -476.14359,348.517368" /> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - x="533.066667" y="292.05832">Q503</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - x="533.066667" y="301.356784">S2091 HI TEMP</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - x="533.066667" y="310.655248">CONTROL</text> -<line x1="561.066667" y1="330.055829" x2="547.223247" y2="330.055829" /> -<polyline stroke-width="0" fill="black" - points="547.223247,330.055829 -547.223247,334.322496 -540.364504,330.055829 -547.223247,325.789162 -547.223247,330.055829" /> -<polyline points="547.223247,330.055829 547.223247,334.322496 -540.364504,330.055829 -547.223247,325.789162 -547.223247,330.055829" /> -<line x1="539.833163" y1="325.400194" x2="539.833163" y2="334.711464" /> -<line x1="539.833163" y1="330.055829" x2="525.989744" y2="330.055829" /> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - x="543.528205" y="322.202186">D505</text> -<line x1="561.066667" y1="330.055829" x2="593.066667" y2="330.055829" /> -<polyline points="593.066667,354.055829 577.066667,354.055829 -577.066667,330.055829" /> -<circle fill="black" - cx="577.066667" cy="330.055829" r="2.048" /> -<line x1="561.066667" y1="154.055829" x2="481.066667" y2="154.055829" /> -<circle fill="black" - cx="481.066667" cy="154.055829" r="2.048" /> -<rect fill="white" - x="473.066667" y="90.055829" width="16" height="16" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="481.066667" y="101.356784">8</text> -<line x1="481.066667" y1="154.055829" x2="481.066667" y2="106.055829" /> -<polyline points="481.066667,154.055829 481.066667,161.255829 -485.333333,163.389162 -476.8,167.655829 -485.333333,171.922496 -476.8,176.189162 -485.333333,180.455829 -476.8,184.722496 -481.066667,186.855829 -481.066667,194.055829" /> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="488" y="172.707552">R505</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="488" y="182.006016">12 K</text> -<circle fill="black" - cx="481.066667" cy="194.055829" r="2.048" /> -<line x1="481.066667" y1="194.055829" x2="481.066667" y2="227.495829" /> -<line x1="474.666667" y1="227.495829" x2="487.466667" y2="227.495829" /> -<path d="M 474.666667,232.615829 - A 12.8 12.8 0 0 1 487.466667,232.615829" /> -<line x1="481.066667" y1="230.900954" x2="481.066667" y2="266.055829" /> -<line stroke-width="0.666667" - x1="485.333333" y1="225.362496" x2="485.333333" y2="221.095829" /> -<line stroke-width="0.666667" - x1="487.466667" y1="223.229162" x2="483.2" y2="223.229162" /> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="478.4" y="224.829162">C503</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="472" y="233.356784">100</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="478.4" y="241.884405">70 V</text> -<line x1="489.6" y1="266.055829" x2="472.533333" y2="266.055829" /> -<line x1="486.755556" y1="269.255829" x2="475.377778" y2="269.255829" /> -<line x1="484.72381" y1="272.455829" x2="477.409524" y2="272.455829" /> -<line x1="415.220513" y1="176.82506" x2="434.912821" y2="176.82506" /> -<line x1="425.066667" y1="189.132752" x2="425.066667" y2="176.82506" /> -<line x1="410.297436" y1="157.132752" x2="419.158974" y2="176.82506" /> -<polygon stroke-width="0" fill="black" - points="413.385771,170.660627 412.512821,162.055829 -418.37406,168.415897" /> -<line x1="413.20492" y1="163.593829" x2="416.94359" y2="171.901983" /> -<line x1="439.835897" y1="157.132752" x2="430.974359" y2="176.82506" /> -<path d="M 425.066667,189.132752 - A 19.692308 19.692308 0 0 0 425.066667,149.748137" /> -<line x1="425.066667" y1="149.748137" x2="425.066667" y2="149.748137" /> -<path d="M 425.066667,149.748137 - A 19.692308 19.692308 0 0 0 425.066667,189.132752" /> -<line x1="425.066667" y1="189.132752" x2="425.066667" y2="189.132752" /> -<circle cx="406.605128" cy="154.055829" r="4.923077" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="406.605128" y="157.356784">E</text> -<circle cx="425.066667" cy="194.055829" r="4.923077" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="425.066667" y="197.356784">B</text> -<circle cx="443.528205" cy="154.055829" r="4.923077" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="443.528205" y="157.356784">C</text> -<line x1="448.451282" y1="154.055829" x2="481.066667" y2="154.055829" /> -<line x1="429.989744" y1="194.055829" x2="481.066667" y2="194.055829" /> -<polyline points="425.066667,198.978906 425.066667,219.717368 -429.333333,221.850701 -420.8,226.117368 -429.333333,230.384034 -420.8,234.650701 -429.333333,238.917368 -420.8,243.184034 -425.066667,245.317368 -425.066667,266.055829" /> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="432" y="231.16909">R504</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="432" y="240.467554">51 K</text> -<line x1="433.6" y1="266.055829" x2="416.533333" y2="266.055829" /> -<line x1="430.755556" y1="269.255829" x2="419.377778" y2="269.255829" /> -<line x1="428.72381" y1="272.455829" x2="421.409524" y2="272.455829" /> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - x="435.528205" y="119.409088">Q502</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - x="435.528205" y="128.707552">TA7311</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - x="435.528205" y="138.006016">REGULATOR</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - x="435.528205" y="147.30448">CONTROL</text> -<rect fill="white" - x="398.605128" y="90.055829" width="16" height="16" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="406.605128" y="101.356784">9</text> -<line x1="406.605128" y1="149.132752" x2="406.605128" y2="106.055829" /> -<rect fill="white" - x="345.066667" y="90.055829" width="16" height="16" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="353.066667" y="101.356784">10</text> -<polyline points="401.682051,154.055829 390.174359,154.055829 -388.041026,158.322496 -383.774359,149.789162 -379.507692,158.322496 -375.241026,149.789162 -370.974359,158.322496 -366.707692,149.789162 -364.574359,154.055829 -353.066667,154.055829" /> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - x="377.374359" y="147.122496">R502</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - x="377.374359" y="167.591072">150</text> -<circle fill="black" - cx="353.066667" cy="154.055829" r="2.048" /> -<rect fill="white" - x="129.066667" y="146.055829" width="16" height="16" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="137.066667" y="157.356784">11</text> -<rect fill="white" - x="129.066667" y="126.055829" width="16" height="16" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="137.066667" y="137.356784">14</text> -<rect fill="white" - x="129.066667" y="166.055829" width="16" height="16" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="137.066667" y="177.356784">12</text> -<rect fill="white" - x="129.066667" y="186.055829" width="16" height="16" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="137.066667" y="197.356784">13</text> -<polyline points="145.066667,194.055829 161.066667,194.055829 -161.066667,154.055829" /> -<circle fill="black" - cx="161.066667" cy="154.055829" r="2.048" /> -<line x1="145.066667" y1="174.055829" x2="161.066667" y2="174.055829" /> -<circle fill="black" - cx="161.066667" cy="174.055829" r="2.048" /> -<rect fill="white" - x="129.066667" y="210.055829" width="16" height="16" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="137.066667" y="221.356784">15</text> -<line x1="396.758974" y1="56.82506" x2="416.451282" y2="56.82506" /> -<line x1="406.605128" y1="69.132752" x2="406.605128" y2="56.82506" /> -<line x1="391.835897" y1="37.132752" x2="400.697436" y2="56.82506" /> -<polygon stroke-width="0" fill="black" - points="394.924233,50.660627 394.051282,42.055829 -399.912521,48.415897" /> -<line x1="394.743382" y1="43.593829" x2="398.482051" y2="51.901983" /> -<line x1="421.374359" y1="37.132752" x2="412.512821" y2="56.82506" /> -<path d="M 406.605128,69.132752 - A 19.692308 19.692308 0 0 0 406.605128,29.748137" /> -<line x1="406.605128" y1="29.748137" x2="406.605128" y2="29.748137" /> -<path d="M 406.605128,29.748137 - A 19.692308 19.692308 0 0 0 406.605128,69.132752" /> -<line x1="406.605128" y1="69.132752" x2="406.605128" y2="69.132752" /> -<circle cx="388.14359" cy="34.055829" r="4.923077" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="388.14359" y="37.356784">E</text> -<circle cx="406.605128" cy="74.055829" r="4.923077" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="406.605128" y="77.356784">B</text> -<circle cx="425.066667" cy="34.055829" r="4.923077" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="425.066667" y="37.356784">C</text> -<line x1="406.605128" y1="78.978906" x2="406.605128" y2="90.055829" /> -<polyline points="429.989744,34.055829 481.066667,34.055829 -481.066667,90.055829" /> -<polyline points="383.220513,34.055829 353.066667,34.055829 -353.066667,90.055829" /> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - x="406.605128" y="7.135243">Q501</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - x="406.605128" y="16.433707">2N3055</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - x="406.605128" y="25.732171">REGULATOR</text> -<line x1="145.066667" y1="134.055829" x2="353.066667" y2="134.055829" /> -<circle fill="black" - cx="353.066667" cy="134.055829" r="2.048" /> -<rect fill="white" - x="129.066667" y="306.055829" width="16" height="16" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="137.066667" y="317.356784">17</text> -<rect fill="white" - x="129.066667" y="282.055829" width="16" height="16" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="137.066667" y="293.356784">16</text> -<rect fill="white" - x="129.066667" y="330.055829" width="16" height="16" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="137.066667" y="341.356784">18</text> -<polyline points="145.066667,338.055829 161.066667,338.055829 -161.066667,314.055829" /> -<circle fill="black" - cx="161.066667" cy="314.055829" r="2.048" /> -<line x1="324.758974" y1="336.82506" x2="344.451282" y2="336.82506" /> -<line x1="334.605128" y1="349.132752" x2="334.605128" y2="336.82506" /> -<line x1="319.835897" y1="317.132752" x2="328.697436" y2="336.82506" /> -<polygon stroke-width="0" fill="black" - points="322.924233,330.660627 322.051282,322.055829 -327.912521,328.415897" /> -<line x1="322.743382" y1="323.593829" x2="326.482051" y2="331.901983" /> -<line x1="349.374359" y1="317.132752" x2="340.512821" y2="336.82506" /> -<path d="M 334.605128,349.132752 - A 19.692308 19.692308 0 0 0 334.605128,309.748137" /> -<line x1="334.605128" y1="309.748137" x2="334.605128" y2="309.748137" /> -<path d="M 334.605128,309.748137 - A 19.692308 19.692308 0 0 0 334.605128,349.132752" /> -<line x1="334.605128" y1="349.132752" x2="334.605128" y2="349.132752" /> -<circle cx="316.14359" cy="314.055829" r="4.923077" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="316.14359" y="317.356784">E</text> -<circle cx="334.605128" cy="354.055829" r="4.923077" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="334.605128" y="357.356784">B</text> -<circle cx="353.066667" cy="314.055829" r="4.923077" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="353.066667" y="317.356784">C</text> -<line x1="145.066667" y1="314.055829" x2="311.220513" y2="314.055829" /> -<line x1="334.605128" y1="358.978906" x2="334.605128" y2="362.055829" /> -<polyline points="334.605128,362.055829 334.605128,369.255829 -338.871795,371.389162 -330.338462,375.655829 -338.871795,379.922496 -330.338462,384.189162 -338.871795,388.455829 -330.338462,392.722496 -334.605128,394.855829 -334.605128,402.055829" /> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="341.538462" y="380.707552">R508</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="341.538462" y="390.006016">680</text> -<line x1="343.138462" y1="402.055829" x2="326.071795" y2="402.055829" /> -<line x1="340.294017" y1="405.255829" x2="328.916239" y2="405.255829" /> -<line x1="338.262271" y1="408.455829" x2="330.947985" y2="408.455829" /> -<circle fill="black" - cx="353.066667" cy="218.055829" r="2.048" /> -<line x1="353.066667" y1="218.055829" x2="353.066667" y2="106.055829" /> -<polyline points="353.066667,218.055829 353.066667,225.255829 -357.333333,227.389162 -348.8,231.655829 -357.333333,235.922496 -348.8,240.189162 -357.333333,244.455829 -348.8,248.722496 -353.066667,250.855829 -353.066667,258.055829" /> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="360" y="232.05832">225</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="360" y="241.356784">10 W</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="360" y="250.655248">5 %</text> -<line x1="353.066667" y1="258.055829" x2="353.066667" y2="309.132752" /> -<polyline points="353.066667,218.055829 325.866667,218.055829 -323.733333,222.322496 -319.466667,213.789162 -315.2,222.322496 -310.933333,213.789162 -306.666667,222.322496 -302.4,213.789162 -300.266667,218.055829 -273.066667,218.055829" /> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - x="313.066667" y="211.122496">R503</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - x="313.066667" y="231.591072">290 10 W 5%</text> -<circle fill="black" - cx="273.066667" cy="218.055829" r="2.048" /> -<line x1="273.066667" y1="218.055829" x2="273.066667" y2="354.055829" /> -<polyline points="273.066667,354.055829 288.574359,354.055829 -290.707692,349.789162 -294.974359,358.322496 -299.241026,349.789162 -303.507692,358.322496 -307.774359,349.789162 -312.041026,358.322496 -314.174359,354.055829 -329.682051,354.055829" /> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - x="301.374359" y="347.122496">R507</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - x="301.374359" y="367.591072">100</text> -<line x1="145.066667" y1="218.055829" x2="273.066667" y2="218.055829" /> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - x="381.066667" y="284.05832">Q504</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - x="381.066667" y="293.356784">40409</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - x="381.066667" y="302.655248">REGULATOR</text> -<polyline points="353.066667,154.055829 325.866667,154.055829 -323.733333,158.322496 -319.466667,149.789162 -315.2,158.322496 -310.933333,149.789162 -306.666667,158.322496 -302.4,149.789162 -300.266667,154.055829 -273.066667,154.055829" /> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - x="313.066667" y="147.122496">R501</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - x="313.066667" y="167.591072">390 5W 5%</text> -<line x1="273.066667" y1="154.055829" x2="145.066667" y2="154.055829" /> -<polyline points="145.066667,290.055829 164.266667,290.055829 -166.4,285.789162 -170.666667,294.322496 -174.933333,285.789162 -179.2,294.322496 -183.466667,285.789162 -187.733333,294.322496 -189.866667,290.055829 -209.066667,290.055829" /> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - x="177.066667" y="283.122496">R506</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - x="177.066667" y="303.591072">82</text> -<line x1="209.066667" y1="290.055829" x2="209.066667" y2="314.055829" /> -<circle fill="black" - cx="209.066667" cy="314.055829" r="2.048" /> -<circle fill="black" - cx="209.066667" cy="154.055829" r="2.048" /> -<line x1="209.066667" y1="154.055829" x2="209.066667" y2="175.495829" /> -<line x1="202.666667" y1="175.495829" x2="215.466667" y2="175.495829" /> -<path d="M 202.666667,180.615829 - A 12.8 12.8 0 0 1 215.466667,180.615829" /> -<line x1="209.066667" y1="178.900954" x2="209.066667" y2="202.055829" /> -<line stroke-width="0.666667" - x1="204.8" y1="173.362496" x2="204.8" y2="169.095829" /> -<line stroke-width="0.666667" - x1="206.933333" y1="171.229162" x2="202.666667" y2="171.229162" /> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="211.733333" y="172.829162">C501</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="211.733333" y="187.267552">100</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="211.733333" y="196.566016">30 V</text> -<line x1="217.6" y1="202.055829" x2="200.533333" y2="202.055829" /> -<line x1="214.755556" y1="205.255829" x2="203.377778" y2="205.255829" /> -<line x1="212.72381" y1="208.455829" x2="205.409524" y2="208.455829" /> -<circle fill="black" - cx="241.066667" cy="154.055829" r="2.048" /> -<line x1="241.066667" y1="202.055829" x2="241.066667" y2="181.750871" /> -<polyline stroke-width="0" fill="black" - points="241.066667,181.750871 -236.8,181.750871 -241.066667,174.892128 -245.333333,181.750871 -241.066667,181.750871" /> -<polyline points="241.066667,181.750871 236.8,181.750871 -241.066667,174.892128 -245.333333,181.750871 -241.066667,181.750871" /> -<polyline points="245.722302,176.494121 245.722302,174.360787 -236.411032,174.360787 -236.411032,172.227454" /> -<line x1="241.066667" y1="174.360787" x2="241.066667" y2="154.055829" /> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="243.733333" y="169.560787">ZD501</text> -<line x1="249.6" y1="202.055829" x2="232.533333" y2="202.055829" /> -<line x1="246.755556" y1="205.255829" x2="235.377778" y2="205.255829" /> -<line x1="244.72381" y1="208.455829" x2="237.409524" y2="208.455829" /> -<circle fill="black" - cx="209.066667" cy="218.055829" r="2.048" /> -<line x1="209.066667" y1="218.055829" x2="209.066667" y2="239.495829" /> -<line x1="202.666667" y1="239.495829" x2="215.466667" y2="239.495829" /> -<path d="M 202.666667,244.615829 - A 12.8 12.8 0 0 1 215.466667,244.615829" /> -<line x1="209.066667" y1="242.900954" x2="209.066667" y2="266.055829" /> -<line stroke-width="0.666667" - x1="204.8" y1="237.362496" x2="204.8" y2="233.095829" /> -<line stroke-width="0.666667" - x1="206.933333" y1="235.229162" x2="202.666667" y2="235.229162" /> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="211.733333" y="236.829162">C502</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="211.733333" y="251.267552">100</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="211.733333" y="260.566016">30 V</text> -<line x1="217.6" y1="266.055829" x2="200.533333" y2="266.055829" /> -<line x1="214.755556" y1="269.255829" x2="203.377778" y2="269.255829" /> -<line x1="212.72381" y1="272.455829" x2="205.409524" y2="272.455829" /> -<circle fill="black" - cx="241.066667" cy="218.055829" r="2.048" /> -<line x1="241.066667" y1="266.055829" x2="241.066667" y2="245.750871" /> -<polyline stroke-width="0" fill="black" - points="241.066667,245.750871 -236.8,245.750871 -241.066667,238.892128 -245.333333,245.750871 -241.066667,245.750871" /> -<polyline points="241.066667,245.750871 236.8,245.750871 -241.066667,238.892128 -245.333333,245.750871 -241.066667,245.750871" /> -<polyline points="245.722302,240.494121 245.722302,238.360787 -236.411032,238.360787 -236.411032,236.227454" /> -<line x1="241.066667" y1="238.360787" x2="241.066667" y2="218.055829" /> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="243.733333" y="233.560787">ZD502</text> -<line x1="249.6" y1="266.055829" x2="232.533333" y2="266.055829" /> -<line x1="246.755556" y1="269.255829" x2="235.377778" y2="269.255829" /> -<line x1="244.72381" y1="272.455829" x2="237.409524" y2="272.455829" /> -<line x1="209.066667" y1="314.055829" x2="209.066667" y2="354.055829" /> -<line x1="209.066667" y1="354.055829" x2="209.066667" y2="375.495829" /> -<line x1="202.666667" y1="375.495829" x2="215.466667" y2="375.495829" /> -<path d="M 202.666667,380.615829 - A 12.8 12.8 0 0 1 215.466667,380.615829" /> -<line x1="209.066667" y1="378.900954" x2="209.066667" y2="402.055829" /> -<line stroke-width="0.666667" - x1="204.8" y1="373.362496" x2="204.8" y2="369.095829" /> -<line stroke-width="0.666667" - x1="206.933333" y1="371.229162" x2="202.666667" y2="371.229162" /> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="211.733333" y="372.829162">C506</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="211.733333" y="387.267552">100</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="211.733333" y="396.566016">30 V</text> -<line x1="217.6" y1="402.055829" x2="200.533333" y2="402.055829" /> -<line x1="214.755556" y1="405.255829" x2="203.377778" y2="405.255829" /> -<line x1="212.72381" y1="408.455829" x2="205.409524" y2="408.455829" /> -<line x1="129.066667" y1="514.055829" x2="105.066667" y2="514.055829" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="117.066667" y="511.389162">GRY</text> -<line x1="129.066667" y1="494.055829" x2="105.066667" y2="494.055829" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="117.066667" y="491.389162">VIOL</text> -<rect x="25.066667" y="484.055829" width="80" height="40" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="65.066667" y="502.707552">TO SIGNAL</text> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="65.066667" y="512.006016">METER CIRCUIT</text> -<line x1="129.066667" y1="470.055829" x2="65.066667" y2="470.055829" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="97.066667" y="467.389162">RED TO C508</text> -<line x1="129.066667" y1="446.055829" x2="65.066667" y2="446.055829" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="97.066667" y="443.389162">VIOL</text> -<line x1="129.066667" y1="314.055829" x2="105.066667" y2="314.055829" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="117.066667" y="311.389162">RED</text> -<line x1="129.066667" y1="338.055829" x2="105.066667" y2="338.055829" /> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="107.733333" y="328.707552">WHT-</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="107.733333" y="338.006016">RED</text> -<rect x="25.066667" y="306.055829" width="80" height="40" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="65.066667" y="324.707552">12.7 V SOURCE</text> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="65.066667" y="334.006016">TO MULTIPLEX</text> -<line x1="129.066667" y1="290.055829" x2="105.066667" y2="290.055829" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="117.066667" y="287.389162">WHT</text> -<rect x="25.066667" y="258.055829" width="80" height="40" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="65.066667" y="272.05832">12 V SOURCE</text> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="65.066667" y="281.356784">TO FM TUNER</text> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="65.066667" y="290.655248">SOURCE SWITCH</text> -<line x1="129.066667" y1="218.055829" x2="105.066667" y2="218.055829" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="117.066667" y="215.389162">ORG</text> -<rect x="25.066667" y="206.055829" width="80" height="24" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="65.066667" y="216.707552">15 V SOURCE</text> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="65.066667" y="226.006016">TO FM TUNER</text> -<line x1="129.066667" y1="194.055829" x2="105.066667" y2="194.055829" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="117.066667" y="191.389162">BLU</text> -<line x1="129.066667" y1="174.055829" x2="105.066667" y2="174.055829" /> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="107.733333" y="164.707552">WHT-</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="107.733333" y="174.006016">RED</text> -<line x1="129.066667" y1="154.055829" x2="105.066667" y2="154.055829" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="117.066667" y="151.389162">RED</text> -<rect x="25.066667" y="150.055829" width="80" height="48" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="65.066667" y="163.409088">27 V SOURCE</text> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="65.066667" y="172.707552">TO CONTROL</text> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="65.066667" y="182.006016">PREAMP AND</text> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="65.066667" y="191.30448">PWR AMPLIFIER</text> -<line x1="129.066667" y1="134.055829" x2="105.066667" y2="134.055829" /> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="107.733333" y="116.05832">WHT-</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="107.733333" y="125.356784">GRY-</text> -<text font-size="6.973848pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="107.733333" y="134.655248">GRN</text> -<rect x="25.066667" y="102.055829" width="80" height="40" /> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="65.066667" y="116.05832">50 V SOURCE</text> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="65.066667" y="125.356784">TO PHONO</text> -<text font-size="6.973848pt" stroke-width="0.2pt" fill="black" x="65.066667" y="134.655248">PREAMP</text> -</g> -</g></svg> diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/dpv/Makefile b/Master/texmf-dist/doc/latex/circuit-macros/examples/dpv/Makefile index ff4933c4645..30cd0044027 100644 --- a/Master/texmf-dist/doc/latex/circuit-macros/examples/dpv/Makefile +++ b/Master/texmf-dist/doc/latex/circuit-macros/examples/dpv/Makefile @@ -1,8 +1,11 @@ +# +# LIBDIR = $$HOME/lib M4LIBS = svg.m4 DPVconfig.m4 M4LIBS = svg.m4 M4 = m4 # PDFCONVERT = pdf2svg +# The current dvisvgm outputs CRLF line endings PDFCONVERT = dvisvgm # To process a single file, copy it to test.m4 and type "make tst" @@ -32,7 +35,8 @@ DPIC = dpic touch F_$*.dim $(M4) pgf.m4 F_$*.dim $*.m4 > $*.pic $(DPIC) -g $*.pic >> $*.tex - echo "\documentclass[crop,tikz,multi=false]{standalone}" > F_$*.tex +# echo "\documentclass[crop,tikz,multi=false]{standalone}" > F_$*.tex + echo "\documentclass[tikz]{standalone}" > F_$*.tex echo "\usepackage{boxdims,siunitx,amssymb}" >> F_$*.tex echo "\begin{document}" >> F_$*.tex echo "\input $*.tex" >> F_$*.tex @@ -42,9 +46,10 @@ DPIC = dpic $(DPIC) -g $*.pic >> $*.tex pdflatex --quiet F_$* if test "$(PDFCONVERT)" = "pdf2svg" ; then \ - pdf2svg F_$*.pdf $*.xsvg && cp $*.xsvg $*.svg ; \ + pdf2svg F_$*.pdf $*.xsvg && cat $*.xsvg | tr -d '\r' > $*.svg ; \ else \ - dvisvgm --pdf F_$*.pdf && mv F_$**.svg $*.svg ; cp $*.svg $*.xsvg ; \ + dvisvgm --pdf F_$*.pdf && cat F_$**.svg | tr -d '\r' > $*.svg ; \ + cp $*.svg $*.xsvg ; \ fi rm -f F_$** @@ -96,6 +101,7 @@ examplesDPV.html: examplesDPV.htmx Version=`sed -e 's/Version //' $(LIBDIR)/doc/Version.tex` ; \ sed -e 's/Version XXX/Version '$$Version'/' examplesDPV.htmx \ | m4 > examplesDPV.html + rm -f quick.xsvg examplesDPVs.html: examplesDPVs.htmx cp ../quick.m4 . @@ -162,5 +168,4 @@ clean: @printf "\n" clobber: clean -# (cd dev; make clobber) rm -f test.m4 diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/dpv/MoreTableDPV.m4 b/Master/texmf-dist/doc/latex/circuit-macros/examples/dpv/MoreTableDPV.m4 index 833dd21a656..d21555a241c 100644 --- a/Master/texmf-dist/doc/latex/circuit-macros/examples/dpv/MoreTableDPV.m4 +++ b/Master/texmf-dist/doc/latex/circuit-macros/examples/dpv/MoreTableDPV.m4 @@ -1,43 +1,69 @@ .PS # MoreTableDPV.m4 cct_init(svg_font(sans-serif,11pt__)) -textwid = 1.5 -movewid = 2 pt__ -hm = 2.1 -vm = 0.28 -hm = 2.05 -vm = 0.28 +Heater: [ + movewid = 2 pt__ + hm = 2.05 + right_ +{ + {lamp ; move; "`lamp'" ljust} + move right_ 1.5 + {lamp(,T) ; move;"`lamp(,T)'" ljust} + move right_ 1.25 + {thermocouple ; move;" `thermocouple'" ljust } + move right_ hm + {thermocouple(,,,T) ; move; "`thermocouple(,,,T)'" ljust } + } + move down 0.4; right_ +{ + {heater; move;"`heater'" ljust} + move right_ hm + {heater(,,,,E); move;"`heater(,,,,E)'" ljust} + move right_ hm+0.4 + {heater(,,,,ET); move;"`heater(,,,,ET)'" ljust} + } + ] -{ {memristor ; move;"`memristor '" ljust} - move right_ hm - {heater; move;"`heater '" ljust} - move right_ hm - {tline ; move;"`tline '" ljust} -} - move down 0.25; right_ -{ {pvcell ; move;"`pvcell '" ljust} - move right_ hm - {reed ; move ;"`reed '" ljust} - move right_ hm - {reed(,,,fill_(0.9),CR) ; move ; "`reed(,,,fill_(0.9),CR) '" ljust} -} - move down 0.25; right_ -{ {gap ; move ;"`gap '" ljust} - move right_ hm - {gap(,,A) ; move ;"`gap(,,A) '" ljust} - move right_ hm - {arrowline ; move;"`arrowline '" ljust} -} - move down 0.25; right_ -{ move down 0.10; right; {lamp ; move;"`lamp '" ljust} - move right_ hm - {thermocouple ; move;"`thermocouple '" ljust } -# move up 0.10 right_ hm -# {arrester ; move ;"`arrester '" ljust} - move right_ hm - {xtal ; move ;"`xtal '" ljust} -} +More: [ + textwid = 1.5 + movewid = 2 pt__ + hm = 2.1 + vm = 0.28 + + hm = 2.05 + vm = 0.28 + + { {memristor ; move;"`memristor '" ljust} + move right_ hm + {heater; move;"`heater '" ljust} + move right_ hm + {tline ; move;"`tline '" ljust} + } + move down 0.25; right_ + { {pvcell ; move;"`pvcell '" ljust} + move right_ hm + {reed ; move ;"`reed '" ljust} + move right_ hm + {reed(,,,fill_(0.9),CR) ; move ; "`reed(,,,fill_(0.9),CR) '" ljust} + } + move down 0.25; right_ + { {gap ; move ;"`gap '" ljust} + move right_ hm + {gap(,,A) ; move ;"`gap(,,A) '" ljust} + move right_ hm + {arrowline ; move;"`arrowline '" ljust} + } + move down 0.25; right_ + { move down 0.10; right; {lamp ; move;"`lamp '" ljust} + move right_ hm + {thermocouple ; move;"`thermocouple '" ljust } + # move up 0.10 right_ hm + # {arrester ; move ;"`arrester '" ljust} + move right_ hm + {xtal ; move ;"`xtal '" ljust} + } +] with .nw at Heater.sw+(0,-0.2) command "</g>" # end font .PE diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/dpv/NportDPV.svg b/Master/texmf-dist/doc/latex/circuit-macros/examples/dpv/NportDPV.svg deleted file mode 100644 index c6968728c8d..00000000000 --- a/Master/texmf-dist/doc/latex/circuit-macros/examples/dpv/NportDPV.svg +++ /dev/null @@ -1,192 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" -"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> -<!-- Creator: dpic version 2022.12.01 option -v for SVG 1.1 --> -<!-- width="590" height="194" --> -<svg - xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" - xml:space="preserve" - style="shape-rendering:geometricPrecision; text-rendering:geometricPrecision; - image-rendering:optimizeQuality; fill-rule:evenodd; clip-rule:evenodd" - width="589.333333px" height="193.326667px" - viewBox="0 0 589.333333 193.326667" - font-size="11pt" text-anchor="middle" - stroke="black" stroke-miterlimit="10" stroke-width="1.066667" fill="none"> -<g> -<g style="font-family:sans-serif" -> -<rect x="49.333333" y="51.533333" width="72" height="48" /> -<line x1="49.333333" y1="63.533333" x2="37.333333" y2="63.533333" /> -<circle fill="black" - cx="37.333333" cy="63.533333" r="1.92" /> -<line x1="49.333333" y1="87.533333" x2="37.333333" y2="87.533333" /> -<circle fill="black" - cx="37.333333" cy="87.533333" r="1.92" /> -<line x1="121.333333" y1="63.533333" x2="133.333333" y2="63.533333" /> -<circle fill="black" - cx="133.333333" cy="63.533333" r="1.92" /> -<line x1="121.333333" y1="87.533333" x2="133.333333" y2="87.533333" /> -<circle fill="black" - cx="133.333333" cy="87.533333" r="1.92" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="34.666667" y="60.866667">W1a</text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="34.666667" y="100.613333">W1b</text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="136" y="60.866667">E1a</text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="136" y="100.613333">E1b</text> -<rect fill="rgb(230,230,230)" - x="241.333333" y="27.533333" width="168" height="96" /> -<line x1="241.333333" y1="51.533333" x2="229.333333" y2="51.533333" /> -<circle fill="black" - cx="229.333333" cy="51.533333" r="1.92" /> -<line x1="241.333333" y1="99.533333" x2="229.333333" y2="99.533333" /> -<circle fill="black" - cx="229.333333" cy="99.533333" r="1.92" /> -<line x1="265.333333" y1="27.533333" x2="265.333333" y2="15.533333" /> -<circle fill="black" - cx="265.333333" cy="15.533333" r="1.92" /> -<line x1="313.333333" y1="27.533333" x2="313.333333" y2="15.533333" /> -<circle fill="black" - cx="313.333333" cy="15.533333" r="1.92" /> -<line x1="337.333333" y1="27.533333" x2="337.333333" y2="15.533333" /> -<circle fill="black" - cx="337.333333" cy="15.533333" r="1.92" /> -<line x1="385.333333" y1="27.533333" x2="385.333333" y2="15.533333" /> -<circle fill="black" - cx="385.333333" cy="15.533333" r="1.92" /> -<line x1="409.333333" y1="37.133333" x2="421.333333" y2="37.133333" /> -<circle fill="black" - cx="421.333333" cy="37.133333" r="1.92" /> -<line x1="409.333333" y1="56.333333" x2="421.333333" y2="56.333333" /> -<circle fill="black" - cx="421.333333" cy="56.333333" r="1.92" /> -<line x1="409.333333" y1="65.933333" x2="421.333333" y2="65.933333" /> -<circle fill="black" - cx="421.333333" cy="65.933333" r="1.92" /> -<line x1="409.333333" y1="85.133333" x2="421.333333" y2="85.133333" /> -<circle fill="black" - cx="421.333333" cy="85.133333" r="1.92" /> -<line x1="409.333333" y1="94.733333" x2="421.333333" y2="94.733333" /> -<circle fill="black" - cx="421.333333" cy="94.733333" r="1.92" /> -<line x1="409.333333" y1="113.933333" x2="421.333333" y2="113.933333" /> -<circle fill="black" - cx="421.333333" cy="113.933333" r="1.92" /> -<line x1="254.25641" y1="123.533333" x2="254.25641" y2="135.533333" /> -<circle fill="black" - cx="254.25641" cy="135.533333" r="1.92" /> -<line x1="280.102564" y1="123.533333" x2="280.102564" y2="135.533333" /> -<circle fill="black" - cx="280.102564" cy="135.533333" r="1.92" /> -<line x1="293.025641" y1="123.533333" x2="293.025641" y2="135.533333" /> -<circle fill="black" - cx="293.025641" cy="135.533333" r="1.92" /> -<line x1="318.871795" y1="123.533333" x2="318.871795" y2="135.533333" /> -<circle fill="black" - cx="318.871795" cy="135.533333" r="1.92" /> -<line x1="331.794872" y1="123.533333" x2="331.794872" y2="135.533333" /> -<circle fill="black" - cx="331.794872" cy="135.533333" r="1.92" /> -<line x1="357.641026" y1="123.533333" x2="357.641026" y2="135.533333" /> -<circle fill="black" - cx="357.641026" cy="135.533333" r="1.92" /> -<line x1="370.564103" y1="123.533333" x2="370.564103" y2="135.533333" /> -<circle fill="black" - cx="370.564103" cy="135.533333" r="1.92" /> -<line x1="396.410256" y1="123.533333" x2="396.410256" y2="135.533333" /> -<circle fill="black" - cx="396.410256" cy="135.533333" r="1.92" /> -<a xlink:href="Np.svg" > - <g stroke="rgb(0,0,255)"> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="325.333333" y="80.74">n-port</text> -</g></a> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="226.666667" y="56.74">W1a</text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="226.666667" y="104.74">W1b</text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="424" y="42.34">E1a</text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="424" y="119.14">E3b</text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="265.333333" y="10.946667">N1a</text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="313.333333" y="10.946667">N1b </text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="337.333333" y="10.946667"> N2a</text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="385.333333" y="10.946667">N2b</text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="254.25641" y="150.533333">S1a</text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="396.410256" y="150.533333">S4b</text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="325.333333" y="150.34">...</text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="435.733333" y="75.94">...</text> -<rect x="505.333333" y="59.533333" width="48" height="32" /> -<line x1="505.333333" y1="75.533333" x2="493.333333" y2="75.533333" /> -<circle fill="black" - cx="493.333333" cy="75.533333" r="1.92" /> -<line x1="553.333333" y1="75.533333" x2="565.333333" y2="75.533333" /> -<circle fill="black" - cx="565.333333" cy="75.533333" r="1.92" /> -<line x1="529.333333" y1="91.533333" x2="529.333333" y2="103.533333" /> -<circle fill="black" - cx="529.333333" cy="103.533333" r="1.92" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="490.666667" y="80.74">W1</text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="568" y="80.74">E1</text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="529.333333" y="118.533333">S1</text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="85.333333" y="133.54">nport</text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="230.08" y="171.46" ->nport(wid 1.5 ht 1.75 fill_(0.9),1,2,3,4)</text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="230.08" y="190.66">svgLink(Np.svg,"n-port" at Nport,B)</text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="529.333333" y="139.46">nterm</text> -</g> -</g></svg> diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/dpv/PlateDPV.m4 b/Master/texmf-dist/doc/latex/circuit-macros/examples/dpv/PlateDPV.m4 index e54235ebc5a..7602aff2199 100644 --- a/Master/texmf-dist/doc/latex/circuit-macros/examples/dpv/PlateDPV.m4 +++ b/Master/texmf-dist/doc/latex/circuit-macros/examples/dpv/PlateDPV.m4 @@ -4,7 +4,7 @@ # See the ASME Y14.5 standard, Figure 6-30. scale = 100/3 cct_init -include(../ASME_Y14-5.m4) +include(../ASME_Y14-5.m4def) ifsvg(`svg_font(sans-serif,9.5bp__)', `textht = 10bp__*2/3 iflatex(`command "{\sf"')') diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/dpv/UNODPV.m4 b/Master/texmf-dist/doc/latex/circuit-macros/examples/dpv/UNODPV.m4 index 8cd5bf3898b..86b5100f341 100644 --- a/Master/texmf-dist/doc/latex/circuit-macros/examples/dpv/UNODPV.m4 +++ b/Master/texmf-dist/doc/latex/circuit-macros/examples/dpv/UNODPV.m4 @@ -54,18 +54,6 @@ define(`HeaderPin',` `rotbox(m4Hps,m4Hps,fill_(1))', `circle diam m4Hps fill_(1)') at last line.start ') -define(`brdge',`eleminit_(`$1') - define(`m4h',ifelse(`$2',,`sourcerad_',`($2)/2'))dnl - { line to rvec_(rp_len/2-m4h/2,0) - move to rvec_(m4h/2,0) - for m4ng=75 to 255 by 180 do {{ - m4fshade(0, arc cw from rvec_(Rect_(m4h/2,m4ng)) \ - to rvec_(Rect_(m4h/2,-m4ng)) \ - with .c at Here ) }} - line from rvec_(m4h/2,0) to rvec_(rp_len/2,0) } - { [box invis ht_ m4h wid_ m4h] at rvec_(rp_len/2,0) } - line to rvec_(rp_len,0) invis ') - define(`ATMEGA16U2',`[ Chip: box wid 10*lg_pinsep ht 25*lg_pinsep Loopover_(`x', @@ -168,7 +156,7 @@ divert(0)dnl rlabel(16,,MHz); dot XT2: dot(at last line.start-(2*del,0)); { "XT2" at last [].n above } - Br1: brdge(left_ from U3.Pin33.end to (XT2,U3.Pin33)) + Br1: jumper(left_ from U3.Pin33.end to (XT2,U3.Pin33)) rlabel(1,,2); llabel(,GROUND) BRE: dot line to (Here,U3.Pin28) then to U3.Pin28.end @@ -220,7 +208,7 @@ USB: [ K: box invis wid dimen_/2 ht 5*lg_pinsep `Pin`'m4Lx: K.ne-(0,m4Lx/5*K.ht) "x" at Pin`'m4Lx ljust above', 1 XUSB, 2 D`'svg_it(-), 3 D`'svg_it(+), 4 UGND) - P_1: K.sw; {"P$`1'" at P_1 below rjust} + P_1: K.sw; {"P$`1'" wid 15bp__ at P_1 below rjust} P_2: K.s; {"P$`2'" at P_2 below ljust} ] with .Pin2 at Here; "X2" at USB.ne above rjust @@ -358,7 +346,7 @@ USB: [ K: box invis wid dimen_/2 ht 5*lg_pinsep line from ZU4.Pin1.end to (RN1D-(1.5*del,0),ZU4.Pin1) then up 7*del continue to (ZU4.Chip.w,Here)+(del,0); BRB: dot - { line down_ 2*del; Br2: brdge(right_ dimen_) + { line down_ 2*del; Br2: jumper(right_ dimen_) llabel(1,,2); rlabel(,RESET_EN); line up_ 2*del; dot } line right_ dimen_+del C5: capacitor(right_ dimen_); llabel(,C5); rlabel(100n); dot diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/dpv/controlDPV.svg b/Master/texmf-dist/doc/latex/circuit-macros/examples/dpv/controlDPV.svg deleted file mode 100644 index bb24d97319a..00000000000 --- a/Master/texmf-dist/doc/latex/circuit-macros/examples/dpv/controlDPV.svg +++ /dev/null @@ -1,745 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" -"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> -<!-- Creator: dpic version 2022.12.01 option -v for SVG 1.1 --> -<!-- width="512" height="1083" --> -<svg - xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" - xml:space="preserve" - style="shape-rendering:geometricPrecision; text-rendering:geometricPrecision; - image-rendering:optimizeQuality; fill-rule:evenodd; clip-rule:evenodd" - width="510.666667px" height="1081.788427px" - viewBox="0 0 510.666667 1081.788427" - font-size="11pt" text-anchor="middle" - stroke="black" stroke-miterlimit="10" stroke-width="1.066667" fill="none"> -<g> -<g style="font-family:Times" -> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="3.733333" y="48.266667"><tspan font-style="italic">r(s)</tspan></text> -<polygon stroke-width="0" fill="black" - points="29.866667,48.533333 39.466667,50.933333 -29.866667,53.333333" /> -<line x1="1.066667" y1="50.933333" x2="37.267677" y2="50.933333" /> -<circle cx="51.466667" cy="50.933333" r="12" /> -<line x1="63.466667" y1="50.933333" x2="101.866667" y2="50.933333" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="82.666667" y="48.266667"><tspan font-style="italic">e(s)</tspan></text> -<polygon stroke-width="0" fill="black" - points="130.666667,48.533333 140.266667,50.933333 -130.666667,53.333333" /> -<line x1="101.866667" y1="50.933333" x2="138.067677" y2="50.933333" /> -<rect x="140.266667" y="38.933333" width="36" height="24" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="158.266667" y="55.773333" -><tspan font-style="italic">K</tspan><tspan font-size="70%" -dy="0.66ex" dx="">P</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></text> -<polygon stroke-width="0" fill="black" - points="193.066667,48.533333 202.666667,50.933333 -193.066667,53.333333" /> -<line x1="176.266667" y1="50.933333" x2="200.467677" y2="50.933333" /> -<circle cx="214.666667" cy="50.933333" r="12" /> -<line x1="101.866667" y1="50.933333" x2="101.866667" y2="12.533333" /> -<polygon stroke-width="0" fill="black" - points="130.666667,10.133333 140.266667,12.533333 -130.666667,14.933333" /> -<line x1="101.866667" y1="12.533333" x2="138.067677" y2="12.533333" /> -<rect x="140.266667" y="0.533333" width="36" height="24" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="158.266667" y="17.373333" -><tspan font-style="italic">K</tspan><tspan font-size="70%" -dy="0.66ex" dx="">D</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan>s</text> -<line x1="176.266667" y1="12.533333" x2="214.666667" y2="12.533333" /> -<polygon stroke-width="0" fill="black" - points="217.066667,29.333333 214.666667,38.933333 -212.266667,29.333333" /> -<line x1="214.666667" y1="12.533333" x2="214.666667" y2="36.734344" /> -<line x1="101.866667" y1="50.933333" x2="101.866667" y2="89.333333" /> -<polygon stroke-width="0" fill="black" - points="130.666667,86.933333 140.266667,89.333333 -130.666667,91.733333" /> -<line x1="101.866667" y1="89.333333" x2="138.067677" y2="89.333333" /> -<rect x="140.266667" y="77.333333" width="36" height="24" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="158.266667" y="94.173333" -><tspan font-style="italic">K</tspan><tspan font-size="70%" -dy="0.66ex" dx="">I</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan>/s</text> -<line x1="176.266667" y1="89.333333" x2="214.666667" y2="89.333333" /> -<polygon stroke-width="0" fill="black" - points="212.266667,72.533333 214.666667,62.933333 -217.066667,72.533333" /> -<line x1="214.666667" y1="89.333333" x2="214.666667" y2="65.132323" /> -<polygon stroke-width="0" fill="black" - points="255.466667,48.533333 265.066667,50.933333 -255.466667,53.333333" /> -<line x1="226.666667" y1="50.933333" x2="262.867677" y2="50.933333" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="244.767172" y="48.266667"><tspan font-style="italic">u(s)</tspan></text> -<rect x="265.066667" y="26.933333" width="72" height="48" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="301.066667" y="55.773333"><tspan font-style="italic">G(s)</tspan></text> -<polygon stroke-width="0" fill="black" - points="365.866667,48.533333 375.466667,50.933333 -365.866667,53.333333" /> -<line x1="337.066667" y1="50.933333" x2="373.267677" y2="50.933333" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="372.8" y="45.609963"><tspan font-style="italic">y(s)</tspan></text> -<polyline points="356.266667,50.933333 356.266667,122.933333 -51.466667,122.933333" /> -<polygon stroke-width="0" fill="black" - points="49.066667,72.533333 51.466667,62.933333 -53.866667,72.533333" /> -<line x1="51.466667" y1="122.933333" x2="51.466667" y2="65.132323" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="46.133333" y="70.44"><tspan font-style="italic">-</tspan></text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="3.733333" y="141.92176" ->(a) <tspan font-style="italic">PID</tspan> control</text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="15.733333" y="199.466667"><tspan font-style="italic">r</tspan></text> -<polygon stroke-width="0" fill="black" - points="41.866667,199.733333 51.466667,202.133333 -41.866667,204.533333" /> -<line x1="13.066667" y1="202.133333" x2="49.267677" y2="202.133333" /> -<circle fill="rgb(153,153,153)" - cx="61.066667" cy="202.133333" r="9.6" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="63.733333" y="224.08" -> <tspan font-style="italic">-</tspan></text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="51.466667" y="199.466667"><tspan font-style="italic">+</tspan></text> -<rect fill="rgb(230,230,230)" - stroke="none" - x="99.466667" y="173.333333" width="297.6" height="115.2" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="102.133333" y="285.866667"><tspan font-style="italic">Plant</tspan></text> -<polygon stroke-width="0" fill="black" - points="99.466667,199.733333 109.066667,202.133333 -99.466667,204.533333" /> -<line x1="70.666667" y1="202.133333" x2="106.867677" y2="202.133333" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="92.533333" y="199.466667"><tspan font-style="italic">u</tspan></text> -<rect fill="rgb(153,153,153)" - x="109.066667" y="182.933333" width="28.8" height="38.4" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="123.466667" y="206.973333"><tspan font-style="italic">B</tspan></text> -<polygon stroke-width="0" fill="black" - points="166.666667,197.466667 176.266667,202.133333 -166.666667,206.8" /> -<line stroke-width="4" - x1="137.866667" y1="202.133333" x2="171.692025" y2="202.133333" /> -<circle fill="rgb(153,153,153)" - cx="185.866667" cy="202.133333" r="9.6" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="188.533333" y="224.08" -> <tspan font-style="italic">+</tspan></text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="176.266667" y="196.8">+</text> -<polygon stroke-width="0" fill="black" - points="224.266667,197.466667 233.866667,202.133333 -224.266667,206.8" /> -<line stroke-width="4" - x1="195.466667" y1="202.133333" x2="229.292025" y2="202.133333" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="214.666667" y="197.64"><tspan font-style="bold">x</tspan></text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="214.666667" y="190.133333">.</text> -<rect fill="rgb(153,153,153)" - x="233.866667" y="182.933333" width="28.8" height="38.4" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="248.266667" y="206.973333"><tspan font-style="italic">I/s</tspan></text> -<polygon stroke-width="0" fill="black" - points="349.066667,197.466667 358.666667,202.133333 -349.066667,206.8" /> -<line stroke-width="4" - x1="262.666667" y1="202.133333" x2="354.092025" y2="202.133333" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="310.666667" y="197.64"><tspan font-style="bold">x</tspan></text> -<rect fill="rgb(153,153,153)" - x="358.666667" y="182.933333" width="28.8" height="38.4" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="373.066667" y="206.973333"><tspan font-style="italic">C</tspan></text> -<line stroke-width="4" - x1="387.466667" y1="202.133333" x2="425.866667" y2="202.133333" /> -<polygon stroke-width="0" fill="black" - points="454.666667,197.466667 464.266667,202.133333 -454.666667,206.8" /> -<line stroke-width="4" - x1="425.866667" y1="202.133333" x2="459.692025" y2="202.133333" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="445.066667" y="197.64"><tspan font-style="bold">y</tspan></text> -<rect fill="rgb(153,153,153)" - x="233.866667" y="240.533333" width="28.8" height="38.4" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="248.266667" y="264.573333"><tspan font-style="italic">A</tspan></text> -<polygon stroke-width="0" fill="black" - points="272.266667,264.4 262.666667,259.733333 -272.266667,255.066667" /> -<polyline stroke-width="4" - points="267.241308,259.733333 301.066667,259.733333 -301.066667,202.133333" /> -<polygon stroke-width="0" fill="black" - points="181.2,221.333333 185.866667,211.733333 -190.533333,221.333333" /> -<polyline stroke-width="4" - points="233.866667,259.733333 185.866667,259.733333 -185.866667,216.307975" /> -<rect fill="rgb(153,153,153)" - x="233.866667" y="298.133333" width="28.8" height="38.4" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="248.266667" y="322.173333"><tspan font-style="italic">K</tspan></text> -<polygon stroke-width="0" fill="black" - points="58.666667,221.333333 61.066667,211.733333 -63.466667,221.333333" /> -<polyline points="233.866667,317.333333 61.066667,317.333333 -61.066667,213.932323" /> -<rect fill="rgb(230,230,230)" - stroke="none" - x="41.866667" y="346.133333" width="412.8" height="172.8" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="44.533333" y="516.266667" -><tspan font-style="italic">Observer</tspan></text> -<rect fill="rgb(153,153,153)" - x="233.866667" y="355.733333" width="28.8" height="38.4" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="248.266667" y="379.773333"><tspan font-style="italic">I/s</tspan></text> -<polygon stroke-width="0" fill="black" - points="224.266667,370.266667 233.866667,374.933333 -224.266667,379.6" /> -<line stroke-width="4" - x1="229.292025" y1="374.933333" x2="195.466667" y2="374.933333" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="214.666667" y="370.44"><tspan font-style="bold">x</tspan></text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="214.666667" y="370.44">ˆ</text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="214.666667" y="358.093333">.</text> -<circle fill="rgb(153,153,153)" - cx="185.866667" cy="374.933333" r="9.6" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="188.533333" y="396.88" -> <tspan font-style="italic">+</tspan></text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="176.266667" y="369.6"><tspan font-style="italic">+</tspan></text> -<polygon stroke-width="0" fill="black" - points="166.666667,370.266667 176.266667,374.933333 -166.666667,379.6" /> -<line stroke-width="4" - x1="171.692025" y1="374.933333" x2="137.866667" y2="374.933333" /> -<circle fill="rgb(153,153,153)" - cx="128.266667" cy="374.933333" r="9.6" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="130.933333" y="396.88" -> <tspan font-style="italic">+</tspan></text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="118.666667" y="369.6"><tspan font-style="italic">+</tspan></text> -<polygon stroke-width="0" fill="black" - points="109.066667,370.266667 118.666667,374.933333 -109.066667,379.6" /> -<line stroke-width="4" - x1="114.092025" y1="374.933333" x2="80.266667" y2="374.933333" /> -<rect fill="rgb(153,153,153)" - x="51.466667" y="355.733333" width="28.8" height="38.4" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="65.866667" y="379.773333"><tspan font-style="italic">B</tspan></text> -<polygon stroke-width="0" fill="black" - points="41.866667,372.533333 51.466667,374.933333 -41.866667,377.333333" /> -<polyline points="80.266667,202.133333 80.266667,173.333333 -3.466667,173.333333 -3.466667,374.933333 -49.267677,374.933333" /> -<rect fill="rgb(153,153,153)" - x="233.866667" y="413.333333" width="28.8" height="38.4" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="248.266667" y="437.373333"><tspan font-style="italic">A</tspan></text> -<line stroke-width="4" - x1="262.666667" y1="374.933333" x2="301.066667" y2="374.933333" /> -<polygon stroke-width="0" fill="black" - points="272.266667,322 262.666667,317.333333 -272.266667,312.666667" /> -<polygon stroke-width="0" fill="black" - points="272.266667,437.2 262.666667,432.533333 -272.266667,427.866667" /> -<polyline stroke-width="4" - points="267.241308,317.333333 301.066667,317.333333 -301.066667,432.533333 -267.241308,432.533333" /> -<polygon stroke-width="0" fill="black" - points="181.2,394.133333 185.866667,384.533333 -190.533333,394.133333" /> -<polyline stroke-width="4" - points="233.866667,432.533333 185.866667,432.533333 -185.866667,389.107975" /> -<rect fill="rgb(153,153,153)" - x="358.666667" y="355.733333" width="28.8" height="38.4" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="373.066667" y="379.773333"><tspan font-style="italic">C</tspan></text> -<polygon stroke-width="0" fill="black" - points="416.266667,370.266667 425.866667,374.933333 -416.266667,379.6" /> -<line stroke-width="4" - x1="387.466667" y1="374.933333" x2="421.292025" y2="374.933333" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="406.666667" y="370.44"><tspan font-style="bold">y</tspan></text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="406.666667" y="370.44">ˆ</text> -<polygon stroke-width="0" fill="black" - points="349.066667,370.266667 358.666667,374.933333 -349.066667,379.6" /> -<line stroke-width="4" - x1="301.066667" y1="374.933333" x2="354.092025" y2="374.933333" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="329.866667" y="370.44"><tspan font-style="italic">x</tspan></text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="329.866667" y="370.44">ˆ</text> -<circle fill="rgb(153,153,153)" - cx="435.466667" cy="374.933333" r="9.6" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="438.133333" y="362.666667"><tspan font-style="italic">+</tspan></text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="425.866667" y="369.6"><tspan font-style="italic">-</tspan></text> -<polygon stroke-width="0" fill="black" - points="440.133333,355.733333 435.466667,365.333333 -430.8,355.733333" /> -<line stroke-width="4" - x1="435.466667" y1="360.758692" x2="435.466667" y2="202.133333" /> -<rect fill="rgb(153,153,153)" - x="233.866667" y="470.933333" width="28.8" height="38.4" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="248.266667" y="494.973333"><tspan font-style="italic">L</tspan></text> -<polygon stroke-width="0" fill="black" - points="272.266667,494.8 262.666667,490.133333 -272.266667,485.466667" /> -<polyline stroke-width="4" - points="435.466667,384.533333 435.466667,490.133333 -267.241308,490.133333" /> -<polygon stroke-width="0" fill="black" - points="123.6,394.133333 128.266667,384.533333 -132.933333,394.133333" /> -<polyline stroke-width="4" - points="233.866667,490.133333 128.266667,490.133333 -128.266667,389.107975" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="3.733333" y="555.866667"><tspan font-style="italic">r</tspan></text> -<polygon stroke-width="0" fill="black" - points="29.866667,556.133333 39.466667,558.533333 -29.866667,560.933333" /> -<line x1="1.066667" y1="558.533333" x2="37.267677" y2="558.533333" /> -<circle cx="51.466667" cy="558.533333" r="12" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="48.8" y="582.88"><tspan font-style="italic">-</tspan></text> -<polygon stroke-width="0" fill="black" - points="49.066667,580.133333 51.466667,570.533333 -53.866667,580.133333" /> -<line x1="51.466667" y1="572.732323" x2="51.466667" y2="589.733333" /> -<rect x="33.466667" y="589.733333" width="36" height="24" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="51.466667" y="606.573333"><tspan font-style="italic">K</tspan></text> -<polygon stroke-width="0" fill="black" - points="49.066667,623.333333 51.466667,613.733333 -53.866667,623.333333" /> -<line x1="51.466667" y1="615.932323" x2="51.466667" y2="632.933333" /> -<line x1="51.466667" y1="632.933333" x2="89.866667" y2="632.933333" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="70.666667" y="630.266667" -><tspan>ˆ</tspan><tspan dx="-0.9ex"><tspan font-style="bold">x</tspan></tspan></text> -<rect x="89.866667" y="602.933333" width="192" height="60" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="105.466933" y="636.466533" -><tspan dx="0.987654ex"> </tspan><tspan dy="-1.2ex" -dx="0.493827ex"><tspan font-style="italic">d</tspan></tspan><tspan -dy=" 2.6ex" -dx="-1.48148ex"><tspan font-style="italic">dt</tspan></tspan><tspan -dy="-1.4ex" dx="0ex"> </tspan></text> -<line x1="106.693067" y1="632.933333" x2="119.599733" y2="632.933333" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="122.2664" y="636.466533" -><tspan>ˆ</tspan><tspan dx="-0.9ex"><tspan font-style="bold">x</tspan></tspan> <tspan font-style="italic">= (A-LC)</tspan> <tspan>ˆ</tspan><tspan dx="-0.9ex"><tspan font-style="bold">x</tspan></tspan> -<tspan font-style="italic">+ Bu + L</tspan><tspan font-style="bold">y</tspan></text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="92.533333" y="660.266667" -><tspan font-style="italic">Observer</tspan></text> -<polygon stroke-width="0" fill="black" - points="291.466667,620.333333 281.866667,617.933333 -291.466667,615.533333" /> -<line x1="284.065656" y1="617.933333" x2="301.066667" y2="617.933333" /> -<line x1="301.066667" y1="617.933333" x2="301.066667" y2="558.533333" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="320.266667" y="555.866667"><tspan font-style="italic">u</tspan></text> -<polygon stroke-width="0" fill="black" - points="329.866667,556.133333 339.466667,558.533333 -329.866667,560.933333" /> -<line x1="63.466667" y1="558.533333" x2="337.267677" y2="558.533333" /> -<rect x="339.466667" y="528.533333" width="108" height="60" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="346.666933" y="552.595933" -><tspan dx="0.987654ex"> </tspan><tspan dy="-1.2ex" -dx="0.493827ex"><tspan font-style="italic">d</tspan></tspan><tspan -dy=" 2.6ex" -dx="-1.48148ex"><tspan font-style="italic">dt</tspan></tspan><tspan -dy="-1.4ex" dx="0ex"> </tspan></text> -<line x1="347.893067" y1="549.062733" x2="360.799733" y2="549.062733" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="363.4664" y="552.595933" -><tspan font-style="bold">x</tspan> <tspan font-style="italic">= A</tspan> <tspan font-style="bold">x</tspan> <tspan font-style="italic">+ Bu</tspan></text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="366.133067" y="571.955933" -><tspan font-style="bold">y</tspan> <tspan font-style="italic">= C</tspan> <tspan font-style="bold">x</tspan></text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="342.133333" y="585.866667"><tspan font-style="italic">Plant</tspan></text> -<polygon stroke-width="0" fill="black" - points="476.266667,556.133333 485.866667,558.533333 -476.266667,560.933333" /> -<line x1="447.466667" y1="558.533333" x2="483.667677" y2="558.533333" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="483.2" y="553.209963"><tspan font-style="italic">y</tspan></text> -<line x1="466.666667" y1="558.533333" x2="466.666667" y2="647.933333" /> -<polygon stroke-width="0" fill="black" - points="291.466667,650.333333 281.866667,647.933333 -291.466667,645.533333" /> -<line x1="466.666667" y1="647.933333" x2="284.065656" y2="647.933333" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="3.733333" y="681.92176" ->(b) Plant with feedback from a full-order observer</text> -<polygon stroke-width="0" fill="black" - points="29.866667,766.133333 39.466667,768.533333 -29.866667,770.933333" /> -<line x1="1.066667" y1="768.533333" x2="37.267677" y2="768.533333" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="19.167172" y="765.866667" -><tspan font-style="italic">E<tspan font-size="70%" -dy="0.66ex" dx="">1</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></tspan></text> -<circle cx="51.466667" cy="768.533333" r="12" /> -<line x1="42.981385" y1="760.048052" x2="59.951948" y2="777.018615" /> -<line x1="42.981385" y1="777.018615" x2="59.951948" y2="760.048052" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="51.466667" y="766.173333"><tspan font-style="italic"></tspan></text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="51.466667" y="780.573333"><tspan font-style="italic">-</tspan></text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="58.666667" y="773.373333"><tspan font-style="italic"></tspan></text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="44.266667" y="773.373333"><tspan font-style="italic">+</tspan></text> -<polygon stroke-width="0" fill="black" - points="73.066667,766.133333 82.666667,768.533333 -73.066667,770.933333" /> -<line x1="63.466667" y1="768.533333" x2="80.467677" y2="768.533333" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="71.967172" y="765.866667">ε</text> -<rect x="82.666667" y="749.333333" width="38.4" height="38.4" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="101.866667" y="773.373333" -><tspan font-style="italic">H</tspan><tspan font-size="70%" -dy="0.66ex" dx="">1</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></text> -<polygon stroke-width="0" fill="black" - points="130.666667,766.133333 140.266667,768.533333 -130.666667,770.933333" /> -<line x1="121.066667" y1="768.533333" x2="138.067677" y2="768.533333" /> -<rect x="140.266667" y="749.333333" width="38.4" height="38.4" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="159.466667" y="773.373333" -><tspan font-style="italic">H</tspan><tspan font-size="70%" -dy="0.66ex" dx="">2</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></text> -<polygon stroke-width="0" fill="black" - points="188.266667,766.133333 197.866667,768.533333 -188.266667,770.933333" /> -<line x1="178.666667" y1="768.533333" x2="195.667677" y2="768.533333" /> -<circle cx="209.866667" cy="768.533333" r="12" /> -<line x1="201.381385" y1="760.048052" x2="218.351948" y2="777.018615" /> -<line x1="201.381385" y1="777.018615" x2="218.351948" y2="760.048052" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="209.866667" y="766.173333"><tspan font-style="italic">-</tspan></text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="209.866667" y="780.573333"><tspan font-style="italic"></tspan></text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="217.066667" y="773.373333"><tspan font-style="italic"></tspan></text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="202.666667" y="773.373333"><tspan font-style="italic">+</tspan></text> -<polygon stroke-width="0" fill="black" - points="231.466667,766.133333 241.066667,768.533333 -231.466667,770.933333" /> -<line x1="221.866667" y1="768.533333" x2="238.867677" y2="768.533333" /> -<rect x="241.066667" y="749.333333" width="38.4" height="38.4" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="260.266667" y="773.373333" -><tspan font-style="italic">H</tspan><tspan font-size="70%" -dy="0.66ex" dx="">3</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></text> -<polygon stroke-width="0" fill="black" - points="289.066667,766.133333 298.666667,768.533333 -289.066667,770.933333" /> -<line x1="279.466667" y1="768.533333" x2="296.467677" y2="768.533333" /> -<rect x="298.666667" y="749.333333" width="38.4" height="38.4" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="317.866667" y="773.373333" -><tspan font-style="italic">H</tspan><tspan font-size="70%" -dy="0.66ex" dx="">4</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></text> -<line x1="337.066667" y1="768.533333" x2="356.266667" y2="768.533333" /> -<polygon stroke-width="0" fill="black" - points="365.866667,766.133333 375.466667,768.533333 -365.866667,770.933333" /> -<line x1="356.266667" y1="768.533333" x2="373.267677" y2="768.533333" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="375.466667" y="765.866667" -><tspan font-style="italic">S</tspan><tspan font-size="70%" -dy="0.66ex" dx="">1</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></text> -<rect x="269.866667" y="691.733333" width="38.4" height="38.4" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="289.066667" y="715.773333" -><tspan font-style="italic">R</tspan><tspan font-size="70%" -dy="0.66ex" dx="">1</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></text> -<polygon stroke-width="0" fill="black" - points="317.866667,713.333333 308.266667,710.933333 -317.866667,708.533333" /> -<polyline points="356.266667,768.533333 356.266667,710.933333 -310.465656,710.933333" /> -<polygon stroke-width="0" fill="black" - points="212.266667,746.933333 209.866667,756.533333 -207.466667,746.933333" /> -<polyline points="269.866667,710.933333 209.866667,710.933333 -209.866667,754.334344" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="212.533333" y="742.173333" -><tspan font-style="italic">n</tspan><tspan font-size="70%" -dy="0.66ex" dx="">1</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></text> -<rect x="179.866667" y="806.933333" width="38.4" height="38.4" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="199.066667" y="830.973333" -><tspan font-style="italic">R</tspan><tspan font-size="70%" -dy="0.66ex" dx="">2</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></text> -<polygon stroke-width="0" fill="black" - points="170.266667,828.533333 160.666667,826.133333 -170.266667,823.733333" /> -<line x1="179.866667" y1="826.133333" x2="162.865656" y2="826.133333" /> -<rect x="122.266667" y="806.933333" width="38.4" height="38.4" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="141.466667" y="830.973333" -><tspan font-style="italic">R</tspan><tspan font-size="70%" -dy="0.66ex" dx="">3</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></text> -<polygon stroke-width="0" fill="black" - points="227.866667,828.533333 218.266667,826.133333 -227.866667,823.733333" /> -<polyline points="289.066667,768.533333 289.066667,826.133333 -220.465656,826.133333" /> -<polygon stroke-width="0" fill="black" - points="49.066667,790.133333 51.466667,780.533333 -53.866667,790.133333" /> -<polyline points="122.266667,826.133333 51.466667,826.133333 -51.466667,782.732323" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="54.133333" y="804.573333" -><tspan font-style="italic">n</tspan><tspan font-size="70%" -dy="0.66ex" dx="">2</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="3.733333" y="864.32176">(c) A multiblock example</text> -<rect x="19.066667" y="892.133333" width="64.8" height="36" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="51.466667" y="907.64">reference</text> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="51.466667" y="922.306667"><tspan font-style="italic">R</tspan></text> -<polygon stroke-width="0" fill="black" - points="125.466667,907.733333 135.066667,910.133333 -125.466667,912.533333" /> -<line x1="83.866667" y1="910.133333" x2="132.867677" y2="910.133333" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="109.466667" y="904.24" -><tspan font-style="italic">y</tspan><tspan font-size="70%" -dy="0.66ex" dx="">c</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan>[ref]</text> -<rect x="135.066667" y="892.133333" width="64.8" height="36" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="167.466667" y="907.64">"inverse"</text> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="167.466667" y="922.306667">of <tspan font-style="italic">G</tspan></text> -<polygon stroke-width="0" fill="black" - points="169.866667,966.533333 167.466667,976.133333 -165.066667,966.533333" /> -<line x1="167.466667" y1="928.133333" x2="167.466667" y2="973.934344" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" text-anchor="start" - x="170.133333" y="955.873838" -><tspan font-style="italic">y</tspan><tspan font-size="70%" -dy="0.66ex" dx="">m</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan>[ref]</text> -<circle cx="167.466667" cy="988.133333" r="12" /> -<polygon stroke-width="0" fill="black" - points="208.266667,985.733333 217.866667,988.133333 -208.266667,990.533333" /> -<line x1="179.466667" y1="988.133333" x2="215.667677" y2="988.133333" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="197.567172" y="985.466667"><tspan font-style="italic">e</tspan></text> -<rect x="217.866667" y="970.133333" width="64.8" height="36" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="250.266667" y="985.64">stabilizer</text> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="250.266667" y="1000.306667"><tspan font-style="italic">K</tspan></text> -<polygon stroke-width="0" fill="black" - points="311.466667,985.733333 321.066667,988.133333 -311.466667,990.533333" /> -<line x1="282.666667" y1="988.133333" x2="318.867677" y2="988.133333" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="300.767172" y="985.466667">δu</text> -<circle cx="333.066667" cy="988.133333" r="12" /> -<line x1="199.866667" y1="910.133333" x2="333.066667" y2="910.133333" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="266.466667" y="907.466667" -><tspan font-style="italic">u</tspan>[ref]</text> -<polygon stroke-width="0" fill="black" - points="335.466667,966.533333 333.066667,976.133333 -330.666667,966.533333" /> -<line x1="333.066667" y1="910.133333" x2="333.066667" y2="973.934344" /> -<polygon stroke-width="0" fill="black" - points="373.866667,985.733333 383.466667,988.133333 -373.866667,990.533333" /> -<line x1="345.066667" y1="988.133333" x2="381.267677" y2="988.133333" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="363.167172" y="985.466667"><tspan font-style="italic">u</tspan></text> -<rect x="383.466667" y="970.133333" width="64.8" height="36" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="415.866667" y="985.64">plant</text> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="415.866667" y="1000.306667"><tspan font-style="italic">G</tspan></text> -<polygon stroke-width="0" fill="black" - points="418.266667,960.533333 415.866667,970.133333 -413.466667,960.533333" /> -<line x1="415.866667" y1="967.934344" x2="415.866667" y2="952.133333" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="415.866667" y="949.466667" ->disturbance <tspan font-style="italic">z</tspan></text> -<polygon stroke-width="0" fill="black" - points="477.066667,976.733333 486.666667,979.133333 -477.066667,981.533333" /> -<line x1="448.266667" y1="979.133333" x2="484.467677" y2="979.133333" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="489.333333" y="983.973333" -><tspan font-style="italic">y</tspan><tspan font-size="70%" -dy="0.66ex" dx="">c</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></text> -<polygon stroke-width="0" fill="black" - points="477.066667,994.733333 486.666667,997.133333 -477.066667,999.533333" /> -<line x1="448.266667" y1="997.133333" x2="484.467677" y2="997.133333" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="489.333333" y="1001.973333" -><tspan font-style="italic">y</tspan><tspan font-size="70%" -dy="0.66ex" dx="">m</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></text> -<polygon stroke-width="0" fill="black" - points="165.066667,1009.733333 167.466667,1000.133333 -169.866667,1009.733333" /> -<polyline points="467.466667,997.133333 467.466667,1030.133333 -167.466667,1030.133333 -167.466667,1002.332323" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="164.8" y="1012.48"><tspan font-style="italic">-</tspan></text> -<polygon stroke-width="0" fill="black" - points="49.066667,937.733333 51.466667,928.133333 -53.866667,937.733333" /> -<line x1="51.466667" y1="930.332323" x2="51.466667" y2="976.133333" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="51.466667" y="990.573333" -><tspan font-style="italic">W</tspan> control input</text> -<polyline stroke-dasharray="5.6,4" - points="1.066667,874.133333 354.666667,874.133333 -354.666667,1060.133333" /> -<line stroke-dasharray="5.6,4" - x1="354.666667" y1="1060.133333" x2="135.066667" y2="1060.133333" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" x="244.866667" y="1057.466667">Controller</text> -<line stroke-dasharray="5.6,4" - x1="135.066667" y1="1060.133333" x2="135.066667" y2="946.133333" /> -<polyline stroke-dasharray="5.6,4" - points="135.066667,946.133333 1.066667,946.133333 -1.066667,874.133333" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="3.733333" y="1079.12176" ->(d) Nonlinear feedforward (for performance) and small-signal feedback -(for stability)</text> -</g> -</g></svg> diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/dpv/ex01DPV.svg b/Master/texmf-dist/doc/latex/circuit-macros/examples/dpv/ex01DPV.svg deleted file mode 100644 index 52d4f52e466..00000000000 --- a/Master/texmf-dist/doc/latex/circuit-macros/examples/dpv/ex01DPV.svg +++ /dev/null @@ -1,391 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" -"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> -<!-- Creator: dpic version 2022.12.01 option -v for SVG 1.1 --> -<!-- width="656" height="152" --> -<svg - xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" - xml:space="preserve" - style="shape-rendering:geometricPrecision; text-rendering:geometricPrecision; - image-rendering:optimizeQuality; fill-rule:evenodd; clip-rule:evenodd" - width="654.776185px" height="151.04px" - viewBox="0 0 654.776185 151.04" - font-size="11pt" text-anchor="middle" - stroke="black" stroke-miterlimit="10" stroke-width="1.066667" fill="none"> -<g> -<g style="font-family:sans-serif" -> -<circle fill="black" - cx="61.066667" cy="2.453333" r="1.92" /> -<line x1="61.066667" y1="2.453333" x2="61.066667" y2="14.453333" /> -<polyline points="61.066667,38.453333 65.866667,38.453333 -65.866667,14.453333 -56.266667,14.453333 -56.266667,38.453333 -61.066667,38.453333" /> -<line x1="61.066667" y1="38.453333" x2="61.066667" y2="50.453333" /> -<text font-size="10.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="68.533333" y="31.423333" -><tspan font-style="normal">1 MΩ</tspan></text> -<polygon stroke-width="0" fill="black" - points="66.157835,17.968052 74.643117,12.876883 -69.551948,21.362165" /> -<line x1="47.490216" y1="40.029784" x2="73.088196" y2="14.431804" /> -<line x1="61.066667" y1="50.453333" x2="61.066667" y2="62.453333" /> -<polyline points="61.066667,86.453333 65.866667,86.453333 -65.866667,62.453333 -56.266667,62.453333 -56.266667,86.453333 -61.066667,86.453333" /> -<line x1="61.066667" y1="86.453333" x2="61.066667" y2="98.453333" /> -<text font-size="10.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="68.533333" y="79.423333" -><tspan font-style="normal">100 kΩ</tspan></text> -<line x1="61.066667" y1="98.453333" x2="61.066667" y2="117.653333" /> -<polyline stroke-width="0.533333" - points="61.066667,120.653333 65.866667,120.653333 -65.866667,117.653333 -56.266667,117.653333 -56.266667,120.653333 -61.066667,120.653333" /> -<polyline stroke-width="0" fill="black" - points="61.066667,124.253333 -65.866667,124.253333 -65.866667,127.253333 -56.266667,127.253333 -56.266667,124.253333 -61.066667,124.253333" /> -<polyline stroke-width="0.533333" - points="61.066667,124.253333 65.866667,124.253333 -65.866667,127.253333 -56.266667,127.253333 -56.266667,124.253333 -61.066667,124.253333" /> -<line x1="61.066667" y1="127.253333" x2="61.066667" y2="146.453333" /> -<text font-size="10.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="63.733333" y="114.986667" -><tspan font-style="normal">220 μF</tspan></text> -<circle fill="black" - cx="61.066667" cy="146.453333" r="1.92" /> -<circle fill="black" - cx="125.066667" cy="2.453333" r="1.92" /> -<line x1="125.066667" y1="2.453333" x2="125.066667" y2="14.453333" /> -<polyline points="125.066667,38.453333 129.866667,38.453333 -129.866667,14.453333 -120.266667,14.453333 -120.266667,38.453333 -125.066667,38.453333" /> -<line x1="125.066667" y1="38.453333" x2="125.066667" y2="50.453333" /> -<text font-size="10.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="132.533333" y="31.423333" -><tspan font-style="normal">33 kΩ</tspan></text> -<line x1="125.066667" y1="50.453333" x2="125.066667" y2="98.453333" /> -<line x1="125.066667" y1="98.453333" x2="125.066667" y2="120.053333" /> -<line x1="117.066667" y1="120.053333" x2="133.066667" y2="120.053333" /> -<line x1="117.066667" y1="124.853333" x2="133.066667" y2="124.853333" /> -<line x1="125.066667" y1="124.853333" x2="125.066667" y2="146.453333" /> -<text font-size="10.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="127.733333" y="117.386667" -><tspan font-style="normal">0.1 μF</tspan></text> -<circle fill="black" - cx="125.066667" cy="146.453333" r="1.92" /> -<rect x="170.4" y="38.453333" width="72" height="72" /> -<text font-size="10.5pt" stroke-width="0.2pt" fill="black" x="206.4" y="79.423333">555</text> -<text font-size="10.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="173.066667" y="103.423333">7</text> -<text font-size="10.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="173.066667" y="79.423333">6</text> -<text font-size="10.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="173.066667" y="55.423333">2</text> -<text font-size="10.5pt" stroke-width="0.266667" - fill="black" - x="194.4" y="51.06">4</text> -<text font-size="10.5pt" stroke-width="0.266667" - fill="black" - x="218.4" y="51.06">8</text> -<text font-size="10.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="239.733333" y="79.423333">3</text> -<text font-size="10.5pt" stroke-width="0.266667" - fill="black" - x="206.4" y="107.786667">1</text> -<line x1="194.4" y1="46.09" x2="194.4" y2="2.453333" /> -<circle fill="black" - cx="194.4" cy="2.453333" r="1.92" /> -<line x1="218.4" y1="46.09" x2="218.4" y2="2.453333" /> -<circle fill="black" - cx="218.4" cy="2.453333" r="1.92" /> -<line x1="206.4" y1="102.816667" x2="206.4" y2="146.453333" /> -<circle fill="black" - cx="206.4" cy="146.453333" r="1.92" /> -<line x1="173.066667" y1="50.453333" x2="125.066667" y2="50.453333" /> -<circle fill="black" - cx="125.066667" cy="50.453333" r="1.92" /> -<line x1="173.066667" y1="98.453333" x2="128.533333" y2="98.453333" /> -<path d="M 129.066667,98.453333 - A 4 4 0 0 0 121.066667,98.453333" /> -<line x1="121.6" y1="98.453333" x2="61.066667" y2="98.453333" /> -<circle fill="black" - cx="61.066667" cy="98.453333" r="1.92" /> -<polyline points="173.066667,74.453333 149.066667,74.453333 -149.066667,98.453333" /> -<circle fill="black" - cx="149.066667" cy="98.453333" r="1.92" /> -<line x1="239.733333" y1="74.453333" x2="271.733333" y2="74.453333" /> -<circle fill="black" - cx="271.733333" cy="74.453333" r="1.92" /> -<line x1="271.733333" y1="74.453333" x2="287.733333" y2="74.453333" /> -<line x1="302.818278" y1="85.12" x2="302.818278" y2="53.12" /> -<path d="M 302.818278,53.12 - A 16 16 0 0 0 302.818278,85.12" /> -<line x1="287.733333" y1="63.786667" x2="271.733333" y2="63.786667" /> -<line x1="271.733333" y1="2.453333" x2="271.733333" y2="29.655898" /> -<polygon stroke-width="0" fill="black" - points="284.89058,12.806313 291.624931,9.843199 -288.661817,16.57755" /> -<line x1="276.012013" y1="25.456117" x2="290.584435" y2="10.883695" /> -<polygon stroke-width="0" fill="black" - points="289.133221,17.048954 295.867571,14.08584 -292.904457,20.82019" /> -<line x1="280.254654" y1="29.698758" x2="294.827076" y2="15.126335" /> -<polyline stroke-width="0" fill="black" - points="271.733333,29.655898 -275.733333,29.655898 -271.733333,36.052761 -267.733333,29.655898 -271.733333,29.655898" /> -<polyline points="271.733333,29.655898 275.733333,29.655898 -271.733333,36.052761 -267.733333,29.655898 -271.733333,29.655898" /> -<line x1="267.344365" y1="36.584102" x2="276.122302" y2="36.584102" /> -<line x1="271.733333" y1="36.584102" x2="271.733333" y2="63.786667" /> -<text font-size="10.5pt" stroke-width="0.266667" - fill="black" - x="295.733333" y="38.09">red</text> -<line x1="271.733333" y1="74.453333" x2="271.733333" y2="86.453333" /> -<polyline points="271.733333,110.453333 276.533333,110.453333 -276.533333,86.453333 -266.933333,86.453333 -266.933333,110.453333 -271.733333,110.453333" /> -<line x1="271.733333" y1="110.453333" x2="271.733333" y2="122.453333" /> -<text font-size="10.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="279.2" y="103.423333" -><tspan font-style="normal">470 Ω</tspan></text> -<line x1="271.733333" y1="122.453333" x2="271.733333" y2="130.989232" /> -<polygon stroke-width="0" fill="black" - points="284.89058,114.139647 291.624931,111.176533 -288.661817,117.910883" /> -<line x1="276.012013" y1="126.78945" x2="290.584435" y2="112.217028" /> -<polygon stroke-width="0" fill="black" - points="289.133221,118.382287 295.867571,115.419173 -292.904457,122.153524" /> -<line x1="280.254654" y1="131.032091" x2="294.827076" y2="116.459669" /> -<polyline stroke-width="0" fill="black" - points="271.733333,130.989232 -275.733333,130.989232 -271.733333,137.386094 -267.733333,130.989232 -271.733333,130.989232" /> -<polyline points="271.733333,130.989232 275.733333,130.989232 -271.733333,137.386094 -267.733333,130.989232 -271.733333,130.989232" /> -<line x1="267.344365" y1="137.917435" x2="276.122302" y2="137.917435" /> -<line x1="271.733333" y1="137.917435" x2="271.733333" y2="146.453333" /> -<text font-size="10.5pt" stroke-width="0.266667" - fill="black" - x="303.733333" y="139.423333">green</text> -<line x1="271.733333" y1="146.453333" x2="13.066667" y2="146.453333" /> -<line x1="13.066667" y1="146.453333" x2="13.066667" y2="98.453333" /> -<line x1="13.066667" y1="98.453333" x2="13.066667" y2="84.453333" /> -<line x1="7.066667" y1="84.453333" x2="19.066667" y2="84.453333" /> -<line x1="1.066667" y1="80.453333" x2="25.066667" y2="80.453333" /> -<line x1="13.066667" y1="80.453333" x2="13.066667" y2="66.453333" /> -<text font-size="10.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="15.733333" y="77.786667"><tspan font-style="normal">9 V</tspan></text> -<line x1="13.066667" y1="66.453333" x2="13.066667" y2="42.453333" /> -<line x1="13.066667" y1="42.453333" x2="1.066667" y2="30.453333" /> -<line x1="13.066667" y1="26.453333" x2="13.066667" y2="2.453333" /> -<circle fill="white" - cx="13.066667" cy="42.453333" r="1.92" /> -<circle fill="white" - cx="13.066667" cy="26.453333" r="1.92" /> -<line x1="13.066667" y1="2.453333" x2="271.733333" y2="2.453333" /> -<line x1="409.333333" y1="148.373333" x2="409.333333" y2="112.373333" /> -<circle cx="409.333333" cy="94.373333" r="18" /> -<text font-size="10.5pt" stroke-width="0.266667" - fill="black" - x="409.333333" y="107.349333">-</text> -<text font-size="10.5pt" stroke-width="0.266667" - fill="black" - x="409.333333" y="89.349333"><tspan font-size="66%">+</tspan></text> -<line x1="409.333333" y1="76.373333" x2="409.333333" y2="40.373333" /> -<text font-size="10.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="388.666667" y="99.343333" ->v<tspan font-size="70%" -dy="0.66ex" dx="">s</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></text> -<line x1="409.333333" y1="40.373333" x2="433.333333" y2="40.373333" /> -<line x1="433.333333" y1="40.373333" x2="451.333333" y2="22.373333" /> -<path stroke-width="0" fill="black" - d="M 449.470811,37.717006 - L 447.129207,38.399081 - A 34.089485 34.089485 0 0 1 450.719998,45.032076 - A 34.089485 34.089485 0 0 0 451.812415,37.034932 - L 449.470811,37.717006" /> -<path d="M 450.333622,41.684181 - A 34.089485 34.089485 0 0 0 442.333333,24.784876" /> -<line x1="457.333333" y1="40.373333" x2="481.333333" y2="40.373333" /> -<text font-size="10.5pt" stroke-width="0.266667" - fill="black" - x="445.333333" y="56.105667">t = <tspan font-style="normal">0</tspan></text> -<polyline points="481.333333,40.373333 499.333333,40.373333 -502.333333,34.373333 -508.333333,46.373333 -514.333333,34.373333 -520.333333,46.373333 -526.333333,34.373333 -532.333333,46.373333 -535.333333,40.373333 -553.333333,40.373333" /> -<text font-size="10.5pt" stroke-width="0.266667" - fill="black" - x="517.333333" y="31.706667" -><tspan font-style="normal">47 ohm</tspan></text> -<polygon stroke-width="0" fill="black" - points="486.933333,37.973333 496.533333,40.373333 -486.933333,42.773333" /> -<line x1="494.334344" y1="40.373333" x2="486.933333" y2="40.373333" /> -<text font-size="10.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="484.266667" y="33.706667" -><tspan font-style="italic">i<tspan font-size="70%" -dy="0.66ex" dx="">R</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></tspan></text> -<polyline points="553.333333,40.373333 589.333333,40.373333 -589.333333,58.373333" /> -<line x1="625.333333" y1="58.373333" x2="625.333333" y2="73.963705" /> -<circle stroke-width="0.533333" - cx="625.333333" cy="73.963705" r="0.26567" /> -<path d="M 625.333333,73.963705 - A 7.2 7.2 0 1 1 622.860665,85.117192" /> -<circle stroke-width="0.533333" - cx="622.860665" cy="85.117192" r="0.26567" /> -<path d="M 622.860665,85.117192 - A 7.2 7.2 0 1 1 622.860665,94.373333" /> -<circle stroke-width="0.533333" - cx="622.860665" cy="94.373333" r="0.26567" /> -<path d="M 622.860665,94.373333 - A 7.2 7.2 0 1 1 622.860665,103.629475" /> -<circle stroke-width="0.533333" - cx="622.860665" cy="103.629475" r="0.26567" /> -<path d="M 622.860665,103.629475 - A 7.2 7.2 0 1 1 625.333333,114.782962" /> -<circle stroke-width="0.533333" - cx="625.333333" cy="114.782962" r="0.26567" /> -<line x1="625.333333" y1="114.782962" x2="625.333333" y2="130.373333" /> -<text font-size="10.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="638.242851" y="99.343333">L</text> -<polygon stroke-width="0" fill="black" - points="627.733333,61.917192 625.333333,71.517192 -622.933333,61.917192" /> -<line x1="625.333333" y1="69.318202" x2="625.333333" y2="61.917192" /> -<line x1="553.333333" y1="58.373333" x2="553.333333" y2="90.773333" /> -<line x1="544.333333" y1="90.773333" x2="562.333333" y2="90.773333" /> -<path d="M 544.333333,97.973333 - A 18 18 0 0 1 562.333333,97.973333" /> -<line x1="553.333333" y1="95.561791" x2="553.333333" y2="130.373333" /> -<text font-size="10.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="550.666667" y="88.106667">+</text> -<text font-size="10.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="541.666667" y="99.343333" ->v<tspan font-size="70%" -dy="0.66ex" dx="">C</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></text> -<text font-size="10.5pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="550.666667" y="110.58">-</text> -<text font-size="10.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="556" y="110.58">C</text> -<line x1="625.866667" y1="58.373333" x2="552.8" y2="58.373333" /> -<line x1="625.866667" y1="130.373333" x2="552.8" y2="130.373333" /> -<line x1="625.333333" y1="58.373333" x2="625.333333" y2="58.373333" /> -<line x1="625.333333" y1="130.373333" x2="625.333333" y2="130.373333" /> -<line x1="553.333333" y1="58.373333" x2="553.333333" y2="58.373333" /> -<line x1="553.333333" y1="130.373333" x2="553.333333" y2="130.373333" /> -<text font-size="10.5pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="630.666667" y="70.98" -><tspan font-style="italic">i<tspan font-size="70%" -dy="0.66ex" dx="">L</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></tspan></text> -<polyline points="589.333333,130.373333 589.333333,148.373333 -409.333333,148.373333" /> -<path stroke-width="0" fill="black" - d="M 599.872248,78.914248 - L 598.753349,80.767553 - A 18 18 0 0 1 606.127562,85.373333 - A 18 18 0 0 0 600.991148,77.060943 - L 599.872248,78.914248" /> -<path d="M 606.127562,103.373333 - A 18 18 0 1 1 603.502794,81.885629" /> -<text font-size="10.5pt" stroke-width="0.2pt" fill="black" x="590.539105" y="99.343333" -><tspan font-style="italic">i<tspan font-size="70%" -dy="0.66ex" dx="">2</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></tspan></text> -<path stroke-width="0" fill="black" - d="M 509.303623,68.971919 - L 507.672194,70.593306 - A 36 36 0 0 1 514.921791,76.373333 - A 36 36 0 0 0 510.935053,67.350532 - L 509.303623,68.971919" /> -<path d="M 514.921791,112.373333 - A 36 36 0 1 1 512.508946,72.72551" /> -<text font-size="10.5pt" stroke-width="0.2pt" fill="black" x="483.744876" y="99.343333" -><tspan font-style="italic">i<tspan font-size="70%" -dy="0.66ex" dx="">1</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></tspan></text> -</g> -</g></svg> diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/dpv/examplesDPVs.html b/Master/texmf-dist/doc/latex/circuit-macros/examples/dpv/examplesDPVs.html deleted file mode 100644 index 8ce1912911b..00000000000 --- a/Master/texmf-dist/doc/latex/circuit-macros/examples/dpv/examplesDPVs.html +++ /dev/null @@ -1,417 +0,0 @@ -<!doctype html public "-//w3c//dtd html 4.0 transitional//en"> -<HTML> -<HEAD> -<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> -<meta http-equiv="Content-Style-Type" content="text/css"> -<!--meta http-equiv="Content-Script-Type" content="text/javascript"--> -<TITLE>SVG Examples: Circuit_macros Version 10.1</TITLE> -<meta name="keywords" content="HTML" -content='Circuit elements, basic circuits, logic circuits and other diagrams, -electric circuits, resistor, capacitor, inductor, diode, sources, amplifier, -integrator, fuse, switch, antenna, opamp, transformer, relay, contact, jack, -plug, FET, UJT, thyristor, bipolar transistor, nport, windings, timer, -optical isolator, rectifier, bistable, oscillator, CMOS, MOSFET, power supply, -NAND gate, controlled source, synchronous machine, digital circuit, signal-flow -graph, latch, decoder, flipflop, full adder, logic diagram, crossbar switch, -dimensioning, control system, graph, RGB colors, recursion, binary tree, -flowcharts, picture overlay, ASME Y14.5' > - -<style type="text/css"> -</style> -<link rel="shortcut icon" href="../Circuit_macros.ico" type="image/x-icon" /> -</HEAD> - -<!-- m4 macros: ------------------------------------------------------------ - - - - - - - ---------------------------------------------------------------------- --> - -<BODY> -<table cellpadding="0" cellspacing="0" - width="700px" border="0" align="center" ><tr><td> - -<H2>SVG Circuit_macros examples, Version 10.1</H2> - -<A HREF="../../index.html">Home</A> -> -<A HREF="examples.html">Examples</A> -> -<A HREF="examplesDPVs.html">dpv</A> - -<hr> - -<p> - This file shows a few diagrams in .svg format produced without the use of - LaTeX or equivalent. -The diagrams have been adapted from the Circuit_macros -examples in order to test the svg output of dpic. -To generate the equivalent for all the examples, go to the -examples/dpv directory and type "make". Typing "make examplesDPVs.html" -produces the selection shown here. -</p> -<p> -Generating svg line -art is straightforward but formatting text is not because TeX, LaTeX, -and related word processors do not produce svg directly. Either -less-sophisticated text formatting must be employed for svg or an - <A HREF="https://en.wikibooks.org/wiki/LaTeX/Export_To_Other_Formats"> - intermediate format</A> -such as pdf can be -produced, followed by an additional processing step to convert to svg. -Two possibilities for the latter are - <A HREF="https://www.ctan.org/pkg/dvisvgm">dvisvgm --pdf</A> -and - <A HREF="https://github.com/dawbarton/pdf2svg">pdf2svg</A>. -However, many circuit and similar diagrams intended for the web do not -require sophisticated labels; the examples shown below might -be representative. Compare them to those in - <A HREF="examples.html" TARGET="_blank">examples.html</A> -</p> -<p> - Click on the link to view the source of each diagram. -</p> -<hr> -<p> -There are other issues: -<ul> - <li> The default font face is not specified in all of these diagrams but is - inherited from the enclosing document, so the appearance of labels can - differ depending on the browser. Some of these diagrams set the font at - the beginning of the diagram source. - <li> Diagrams such as these contain text labels - that have to be treated differently from the LaTeX-compatible versions; - for example, - apparently there is no direct way to know the bounding box of arbitrary svg - text. - <!-- text, as discussed - <a href="http://www.aditus.nu/jpgraph/jpg_svg.php" TARGET="_blank">here,</a> - for example. --> - Consequently, text placement is approximate and may require - manual adjustment. - <li> Rather than patch the original source files for svg production, - edited copies have been used. The configuration file svg.m4 read by - m4 prior to libcct.m4 contains the following macros defined for svg. - Others could be defined to exercise some of the media capabilties - of svg. They are subject to change: - <ul> - <li> - <g style="font-family:monospace">svg_font(</g>font-face,nominal size[:dptextratio],textoffset, - dpic commands<g style="font-family:monospace">)</g>: - Change font face, size, textratio and dpic textoffset parameters. - Change font face and dpic <g style="font-family:monospace">textht</g>, <g style="font-family:monospace">dptextratio</g>, - and <g style="font-family:monospace">textoffset</g> parameters. - If arg4 is blank, the font is changed and - requires <g style="font-family:monospace">command "</g>"</g> to cancel the font change. - <br> - Note: - Nominal height = text height in drawing units; actual height = - nominal ht x <g style="font-family:monospace">dptextratio</g>. - <br> - Examples: <br> - <g style="font-family:monospace">svg_font(Times)</g><br> - <g style="font-family:monospace">svg_font(Times,14bp__)</g><br> - <g style="font-family:monospace">svg_font(sans-serif,14bp__:0.71)</g><br> - <g style="font-family:monospace">svg_font(Times,11bp__,1bp__,"text" at A)</g><br> - <g style="font-family:monospace">svg_font(font-family="Times")</g><br> - <g style="font-family:monospace">svg_font(font-family="Times" font-style="italic")</g><br> - <g style="font-family:monospace">svg_font(style="font-family:Times; font-style:italic")</g> - <li><g style="font-family:monospace"> svgfontratio(</g>font name<g style="font-family:monospace">)</g>; - Reasonable <g style="font-family:monospace">dptextratio</g> value for common fonts, used - by <g style="font-family:monospace">svg_font</g>. - <li><g style="font-family:monospace"> svg_tspan(</g>text attributes, text<g style="font-family:monospace">)</g>; - e.g. <g style="font-family:monospace">svg_tspan(font-style="italic" font-size="75%",XYZ)</g> - <li><g style="font-family:monospace"> svg_it(</g>text<g style="font-family:monospace">)</g>: for italics - <li><g style="font-family:monospace"> svg_tt(</g>text<g style="font-family:monospace">)</g>: for monospace (courier) - <li><g style="font-family:monospace"> svg_sf(</g>text<g style="font-family:monospace">)</g>: sans-serif (Helvetica) - <li><g style="font-family:monospace"> svg_norm(</g>text<g style="font-family:monospace">)</g>: for normal text - <li><g style="font-family:monospace"> svg_bf(</g>text<g style="font-family:monospace">)</g>: for bold face - <li><g style="font-family:monospace"> svg_small(</g>text, percent<g style="font-family:monospace">)</g>: - to set a smaller text size, default 66 - <li><g style="font-family:monospace"> svg_fsize(</g>text, percent<g style="font-family:monospace">)</g>: - for setting larger or smaller text size, default 100 - <li><g style="font-family:monospace"> svg_sub(</g>text, size percent, y displ, x displ<g style="font-family:monospace">)</g>: - subscript - <li><g style="font-family:monospace"> svg_ul(</g>text<g style="font-family:monospace">)</g>: underlined text - <li><g style="font-family:monospace"> svg_ol(</g>text<g style="font-family:monospace">)</g>: overlined text - <li><g style="font-family:monospace"> svg_sup(</g>text, size percent, y displ, x displ<g style="font-family:monospace">)</g>: - superscript - <li><g style="font-family:monospace"> svg_hat(</g>character<g style="font-family:monospace">)</g>: circumflex-accented character - <li><g style="font-family:monospace"> svg_frac(</g>numerator[:wid], denominator[:wid]<g style="font-family:monospace">)</g>: - basic fraction, wid in drawing units - <li><g style="font-family:monospace"> svg_rot(</g>degrees, "text" [at position]<g style="font-family:monospace">)</g>: - Rotate text degrees (default 90) ccw. - Requires <g style="font-family:monospace">svg_rot_init(</g>filename<g style="font-family:monospace">)</g> and the source - must be processed twice. - <li><g style="font-family:monospace"> svg_rot_init(</g>filename<g style="font-family:monospace">)</g>: - filename is the basename of the output of - <g style="font-family:monospace">dpic -v filename.pic > filename.svg<g style="font-family:monospace"> - <li><g style="font-family:monospace"> svg_symbol(</g>text<g style="font-family:monospace">)</g>: allow quoted pound sign in text, - e.g., <g style="font-family:monospace">svg_symbol(10&`#'176;)</g> produces 10° - <li><g style="font-family:monospace"> svgLink(</g>URL, drawing object, <g style="font-family:monospace">[B])</g>: - link to external file using - <a xlink:href=...>...</a> (default is - <g style="font-family:monospace">target="_blank"</g> unless - arg 3 = B) - <li><g style="font-family:monospace"> svgLinkString</g> as above but for strings attached to objects - <li> Greek and other symbols: - -<!-- - Reference: - https://en.wikipedia.org/wiki/List_of_XML_and_HTML_character_entity_references - and - https://www.toptal.com/designers/htmlarrows/math/ - --> -<table cellpadding="2" cellspacing="0" width="75%" > -<tr> -<td width="10%"> <g style="font-family:monospace"> svg_alpha</g> <td align="left"> α -<td width="10%"> <g style="font-family:monospace"> svg_beta</g> <td align="left"> β -<td width="10%"> <g style="font-family:monospace"> svg_Gamma</g> <td align="left"> Γ -<td width="10%"> <g style="font-family:monospace"> svg_gamma</g> <td align="left"> γ -<td width="10%"> <g style="font-family:monospace"> svg_Delta</g> <td align="left"> Δ -<td width="10%"> <g style="font-family:monospace"> svg_delta</g> <td align="left"> δ -<td width="10%"> <g style="font-family:monospace"> svg_epsilon</g> <td align="left"> ε -<td width="10%"> <g style="font-family:monospace"> svg_zeta</g> <td align="left"> ζ -</tr> -<tr> -<td width="10%"> <g style="font-family:monospace"> svg_eta</g> <td align="left"> η -<td width="10%"> <g style="font-family:monospace"> svg_Theta</g> <td align="left"> Θ -<td width="10%"> <g style="font-family:monospace"> svg_theta</g> <td align="left"> θ -<td width="10%"> <g style="font-family:monospace"> svg_iota</g> <td align="left"> ι -<td width="10%"> <g style="font-family:monospace"> svg_kappa</g> <td align="left"> κ -<td width="10%"> <g style="font-family:monospace"> svg_Lambda</g> <td align="left"> Λ -<td width="10%"> <g style="font-family:monospace"> svg_lambda</g> <td align="left"> λ -<td width="10%"> <g style="font-family:monospace"> svg_mu</g> <td align="left"> μ -</tr> -<tr> -<td width="10%"> <g style="font-family:monospace"> svg_nu</g> <td align="left"> ν -<td width="10%"> <g style="font-family:monospace"> svg_Xi</g> <td align="left"> Ξ -<td width="10%"> <g style="font-family:monospace"> svg_xi</g> <td align="left"> ξ -<td width="10%"> <g style="font-family:monospace"> svg_Pi</g> <td align="left"> Π -<td width="10%"> <g style="font-family:monospace"> svg_pi</g> <td align="left"> π -<td width="10%"> <g style="font-family:monospace"> svg_rho</g> <td align="left"> ρ -<td width="10%"> <g style="font-family:monospace"> svg_Sigma</g> <td align="left"> Σ -<td width="10%"> <g style="font-family:monospace"> svg_sigma</g> <td align="left"> σ -</tr> -<tr> -<td width="10%"> <g style="font-family:monospace"> svg_tau</g> <td align="left"> τ -<td width="10%"> <g style="font-family:monospace"> svg_upsilon</g> <td align="left"> υ -<td width="10%"> <g style="font-family:monospace"> svg_Phi</g> <td align="left"> Φ -<td width="10%"> <g style="font-family:monospace"> svg_phi</g> <td align="left"> φ -<td width="10%"> <g style="font-family:monospace"> svg_chi</g> <td align="left"> χ -<td width="10%"> <g style="font-family:monospace"> svg_Psi</g> <td align="left"> Ψ -<td width="10%"> <g style="font-family:monospace"> svg_psi</g> <td align="left"> ψ -<td width="10%"> <g style="font-family:monospace"> svg_Omega</g> <td align="left"> Ω -</tr> -<tr> -<td width="10%"> <g style="font-family:monospace"> svg_omega</g> <td align="left"> ω -<td width="10%"> <g style="font-family:monospace"> svg_micro</g> <td align="left"> μ -<td width="10%"> <g style="font-family:monospace"> svg_ohm</g> <td align="left"> Ω -<td width="10%"> <g style="font-family:monospace"> svg_lt</g> <td align="left"> < -<td width="10%"> <g style="font-family:monospace"> svg_gt</g> <td align="left"> > -<td width="10%"> <g style="font-family:monospace"> svg_leq</g> <td align="left"> ≤ -<td width="10%"> <g style="font-family:monospace"> svg_geq</g> <td align="left"> ≥ -<td width="10%"> <g style="font-family:monospace"> svg_prime</g> <td align="left"> ′ -</tr> -<tr> -<td width="10%"> <g style="font-family:monospace"> svg_backsl</g> <td align="left"> \ -<td width="10%"> <g style="font-family:monospace"> svg_pound</g> <td align="left"> # -<td width="10%"> <g style="font-family:monospace"> svg_comma</g> <td align="left"> , -<td width="10%"> <g style="font-family:monospace"> svg_lparen</g> <td align="left"> ( -<td width="10%"> <g style="font-family:monospace"> svg_rparen</g> <td align="left"> ) -<td width="10%"> <g style="font-family:monospace"> svg_circ</g> <td align="left"> ˆ -<td width="10%"> <g style="font-family:monospace"> svg_deg</g> <td align="left"> ° -<td width="10%"> <g style="font-family:monospace"> svg_grave</g> <td align="left"> ` -</tr> -</table> -<table cellpadding="2" cellspacing="0" width="75%" > -<tr> -<td width="8%"> <g style="font-family:monospace"> svg_emsp</g> <td width="50px" align="left"> | | -<td width="8%"> <g style="font-family:monospace"> svg_ensp</g> <td width="50px" align="left"> | | -<td width="8%"> <g style="font-family:monospace"> svg_thinsp</g> <td width="50px" align="left"> | | -</tr> -</table> - - </ul> - <li> Inkscape: It may be efficient to define elements by macro and to - place them using a wysiwyg graphics editor. A draft page intended - for Inkscape is included. A reasonable variety of elements is defined - but many more could be added and they should be customized for - particular applications. Adjustments may also have to be made to - obtain the proper snap-to actions. - <li> Link experiments: Click on the resistor or source of quickDPV - to go to external - files in new windows. Click on "n-port" in NportDPV to replace the diagram - and then "back" to return. - <li> Some of the assumptions used to create this draft may be - naïve. - Comments are welcome. -</ul> - -<!-- -<embed pluginspage="http://www.adobe.com/svg/viewer/install/" /> ---> - -<hr> - -<table> -<tr> -<td width="50%"> -<p> -<IMG SRC="quickDPV.svg"> -<br><br> -Fig. 1 (<a href="quickDPV.txt" TYPE="text/plain" TARGET="_blank" - alt="quickDPV">quickDPV.m4</a>): -SVG produced by dpic   -</p> -</td> -<td> -<p> -<IMG SRC="quick.svg"> -<br><br> -(<a href="quick.txt" TYPE="text/plain" TARGET="_blank" - alt="quick">quick.m4</a>): -SVG produced from quick.pdf by dvisvgm   -</p> -</td> -</table> - -<hr> - - - -<p> - <IMG SRC="ConnectorsDPV.svg"> - <br><br> -Fig. 2 (<a - href="ConnectorsDPV.txt" TYPE="text/plain" TARGET="_blank" alt="ConnectorsDPV">ConnectorsDPV.m4</a>): -Some integrated circuits and connectors with simple geometry - and lists of labels   -</p> -<hr> - - - -<p> - <IMG SRC="NportDPV.svg"> - <br><br> -Fig. 3 (<a - href="NportDPV.txt" TYPE="text/plain" TARGET="_blank" alt="NportDPV">NportDPV.m4</a>): -The <g style="font-family:monospace">nport</g> and <g style="font-family:monospace">nterm</g> macros   -</p> -<hr> - - - -<p> - <IMG SRC="ex01DPV.svg"> - <br><br> -Fig. 4 (<a - href="ex01DPV.txt" TYPE="text/plain" TARGET="_blank" alt="ex01DPV">ex01DPV.m4</a>): -Two simple labeled circuits   -</p> -<hr> - - - -<p> - <IMG SRC="CsourceDPV.svg"> - <br><br> -Fig. 5 (<a - href="CsourceDPV.txt" TYPE="text/plain" TARGET="_blank" alt="CsourceDPV">CsourceDPV.m4</a>): -Realization of a controlled source - (illustrating stacked element labels)   -</p> -<hr> - - - -<p> - <IMG SRC="HeathkitDPV.svg"> - <br><br> -Fig. 6 (<a - href="HeathkitDPV.txt" TYPE="text/plain" TARGET="_blank" alt="HeathkitDPV">HeathkitDPV.m4</a>): -The power supply of a Heathkit AR-15 (Now, <i>that</i> - was a receiver!) with custom transformer and other elements, - drawn on a grid (partially shown) to aid in placement   -</p> -<hr> - - - -<p> - <IMG SRC="EEPDPV.svg"> - <br><br> -Fig. 7 (<a - href="EEPDPV.txt" TYPE="text/plain" TARGET="_blank" alt="EEPDPV">EEPDPV.m4</a>): -Part of a single-line diagram of a power distribution system - using draft elements   -</p> -<hr> - - - -<p> - <IMG SRC="controlDPV.svg"> - <br><br> -Fig. 8 (<a - href="controlDPV.txt" TYPE="text/plain" TARGET="_blank" alt="controlDPV">controlDPV.m4</a>): -Control-system block diagrams   -</p> -<hr> - - -<p> - <IMG SRC="ByteDPV.svg"> - <br><br> -Fig. 9 (<a - href="ByteDPV.txt" TYPE="text/plain" TARGET="_blank" alt="ByteDPV">ByteDPV.m4</a>): -Elementary splines   -</p> -<hr> - - - -<p> - <IMG SRC="FlowDPV.svg"> - <br><br> -Fig. 10 (<a - href="FlowDPV.txt" TYPE="text/plain" TARGET="_blank" alt="FlowDPV">FlowDPV.m4</a>): -A flowchart sampler   -</p> -<hr> - <!-- <p> - More flow-chart examples? Try - <a href="https://buraphakit.sourceforge.io/EFI/EFI_2019_S2_W13.shtml" - TARGET="_blank">here.</a> - </p> --> - - - - -<p> - <IMG SRC="paletteDPV.svg"> - <br><br> -Fig. 11 (<a - href="paletteDPV.txt" TYPE="text/plain" TARGET="_blank" alt="paletteDPV">paletteDPV.m4</a>): -A draft palette of a few elements for Inkscape using - a 1 mm grid   -</p> -<hr> - - -<p> - <IMG SRC="FontsDPV.svg"> - -</p> -<hr> - -</td> -</tr> -</table> -</BODY> -</HTML> diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/dpv/paletteDPV.svg b/Master/texmf-dist/doc/latex/circuit-macros/examples/dpv/paletteDPV.svg deleted file mode 100644 index 51ccb1bc2c6..00000000000 --- a/Master/texmf-dist/doc/latex/circuit-macros/examples/dpv/paletteDPV.svg +++ /dev/null @@ -1,2639 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" -"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> -<!-- Creator: dpic version 2022.12.01 option -v for SVG 1.1 --> -<!-- width="768" height="715" --> -<svg - xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" - xml:space="preserve" - style="shape-rendering:geometricPrecision; text-rendering:geometricPrecision; - image-rendering:optimizeQuality; fill-rule:evenodd; clip-rule:evenodd" - width="766.664567px" height="713.751181px" - viewBox="0 0 766.664567 713.751181" - font-size="11pt" text-anchor="middle" - stroke="black" stroke-miterlimit="10" stroke-width="1.066667" fill="none"> -<g> -<g style="font-family:sans-serif" -> -<g> -<polyline points="76.657218,0.533333 76.657218,9.982152 -79.806824,11.556955 -73.507612,14.706562 -79.806824,17.856168 -73.507612,21.005774 -79.806824,24.155381 -73.507612,27.304987 -76.657218,28.87979 -76.657218,38.328609" /> -</g> -<g> -<polyline points="91.775328,9.982152 91.775328,9.982152 -94.924934,11.556955 -88.625722,14.706562 -94.924934,17.856168 -88.625722,21.005774 -94.924934,24.155381 -88.625722,27.304987 -91.775328,28.87979 -91.775328,28.87979" /> -</g> -<g> -<line x1="106.893438" y1="0.533333" x2="106.893438" y2="9.982152" /> -<polyline points="106.893438,28.87979 110.672966,28.87979 -110.672966,9.982152 -103.113911,9.982152 -103.113911,28.87979 -106.893438,28.87979" /> -<line x1="106.893438" y1="28.87979" x2="106.893438" y2="38.328609" /> -</g> -<g> -<polyline points="118.232021,0.533333 118.232021,9.982152 -124.531234,13.131759 -118.232021,16.281365 -124.531234,19.430971 -118.232021,22.580577 -124.531234,25.730184 -118.232021,28.87979 -118.232021,28.87979 -118.232021,38.328609" /> -</g> -<g> -<polyline points="137.129659,0.533333 137.129659,9.982152 -141.539108,9.982152 -141.539108,13.76168 -137.129659,13.76168 -137.129659,17.541207 -141.539108,17.541207 -141.539108,21.320735 -137.129659,21.320735 -137.129659,25.100262 -141.539108,25.100262 -141.539108,28.87979 -137.129659,28.87979 -137.129659,28.87979 -137.129659,38.328609" /> -</g> -<g> -<polyline points="152.247769,0.533333 152.247769,9.982152 -155.397375,11.556955 -149.098163,14.706562 -155.397375,17.856168 -149.098163,21.005774 -155.397375,24.155381 -149.098163,27.304987 -152.247769,28.87979 -152.247769,38.328609" /> -</g> -<g> -<line x1="167.365879" y1="0.533333" x2="167.365879" y2="8.717255" /> -<circle stroke-width="0.533333" - cx="167.365879" cy="8.717255" r="0.26567" /> -<path d="M 167.365879,8.717255 - A 3.779528 3.779528 0 1 1 166.067891,14.572104" /> -<circle stroke-width="0.533333" - cx="166.067891" cy="14.572104" r="0.26567" /> -<path d="M 166.067891,14.572104 - A 3.779528 3.779528 0 1 1 166.067891,19.430971" /> -<circle stroke-width="0.533333" - cx="166.067891" cy="19.430971" r="0.26567" /> -<path d="M 166.067891,19.430971 - A 3.779528 3.779528 0 1 1 166.067891,24.289838" /> -<circle stroke-width="0.533333" - cx="166.067891" cy="24.289838" r="0.26567" /> -<path d="M 166.067891,24.289838 - A 3.779528 3.779528 0 1 1 167.365879,30.144687" /> -<circle stroke-width="0.533333" - cx="167.365879" cy="30.144687" r="0.26567" /> -<line x1="167.365879" y1="30.144687" x2="167.365879" y2="38.328609" /> -</g> -<g> -<line x1="186.263517" y1="0.533333" x2="186.263517" y2="8.717255" /> -<circle stroke-width="0.533333" - cx="186.263517" cy="8.717255" r="0.26567" /> -<path d="M 186.263517,8.717255 - A 3.779528 3.779528 0 1 1 184.965528,14.572104" /> -<circle stroke-width="0.533333" - cx="184.965528" cy="14.572104" r="0.26567" /> -<path d="M 184.965528,14.572104 - A 3.779528 3.779528 0 1 1 184.965528,19.430971" /> -<circle stroke-width="0.533333" - cx="184.965528" cy="19.430971" r="0.26567" /> -<path d="M 184.965528,19.430971 - A 3.779528 3.779528 0 1 1 184.965528,24.289838" /> -<circle stroke-width="0.533333" - cx="184.965528" cy="24.289838" r="0.26567" /> -<path d="M 184.965528,24.289838 - A 3.779528 3.779528 0 1 1 186.263517,30.144687" /> -<circle stroke-width="0.533333" - cx="186.263517" cy="30.144687" r="0.26567" /> -<line x1="193.215145" y1="8.717255" x2="193.215145" y2="30.144687" /> -<line x1="195.57735" y1="8.717255" x2="195.57735" y2="30.144687" /> -<line x1="186.263517" y1="30.144687" x2="186.263517" y2="38.328609" /> -</g> -<g> -<line x1="208.940682" y1="0.533333" x2="208.940682" y2="9.982152" /> -<circle stroke-width="0.533333" - cx="208.940682" cy="9.982152" r="0.26567" /> -<path d="M 208.940682,9.982152 - C 211.539108,9.982152 213.665092,11.087664 213.665092,12.438845 213.665092,13.790026 212.176903,14.895538 210.358005,14.895538 208.539108,14.895538 207.050919,14.385302 207.050919,13.76168 207.050919,13.138058 208.539108,12.627822 210.358005,12.627822 212.176903,12.627822 213.665092,13.988451 213.665092,15.651444 213.665092,17.314436 212.176903,18.675066 210.358005,18.675066 208.539108,18.675066 207.050919,18.164829 207.050919,17.541207 207.050919,16.917585 208.539108,16.407349 210.358005,16.407349 212.176903,16.407349 213.665092,17.767979 213.665092,19.430971 213.665092,21.093963 212.176903,22.454593 210.358005,22.454593 208.539108,22.454593 207.050919,21.944357 207.050919,21.320735 207.050919,20.697113 208.539108,20.186877 210.358005,20.186877 212.176903,20.186877 213.665092,21.547507 213.665092,23.210499 213.665092,24.873491 212.176903,26.234121 210.358005,26.234121 208.539108,26.234121 207.050919,25.723885 207.050919,25.100262 207.050919,24.47664 208.539108,23.966404 210.358005,23.966404 212.176903,23.966404 213.665092,25.071916 213.665092,26.423097 213.665092,27.774278 211.539108,28.87979 208.940682,28.87979" /> -<circle stroke-width="0.533333" - cx="208.940682" cy="28.87979" r="0.26567" /> -<line x1="208.940682" y1="28.87979" x2="208.940682" y2="38.328609" /> -</g> -<g> -<line x1="227.83832" y1="0.533333" x2="227.83832" y2="9.982152" /> -<line x1="227.83832" y1="9.982152" x2="227.304987" y2="9.982152" /> -<path d="M 227.83832,9.982152 - A 2.362205 2.362205 0 0 1 227.83832,14.706562" /> -<line x1="227.83832" y1="14.706562" x2="227.304987" y2="14.706562" /> -<path d="M 227.83832,14.706562 - A 2.362205 2.362205 0 0 1 227.83832,19.430971" /> -<line x1="227.83832" y1="19.430971" x2="227.304987" y2="19.430971" /> -<path d="M 227.83832,19.430971 - A 2.362205 2.362205 0 1 1 227.83832,24.155381" /> -<line x1="227.83832" y1="24.155381" x2="227.304987" y2="24.155381" /> -<path d="M 227.83832,24.155381 - A 2.362205 2.362205 0 1 1 227.83832,28.87979" /> -<line x1="227.83832" y1="28.87979" x2="227.304987" y2="28.87979" /> -<line x1="227.83832" y1="28.87979" x2="227.83832" y2="38.328609" /> -</g> -<g> -<line x1="242.95643" y1="0.533333" x2="242.95643" y2="9.982152" /> -<line x1="242.95643" y1="9.982152" x2="242.423097" y2="9.982152" /> -<path d="M 242.95643,9.982152 - A 2.362205 2.362205 0 0 1 242.95643,14.706562" /> -<line x1="242.95643" y1="14.706562" x2="242.423097" y2="14.706562" /> -<path d="M 242.95643,14.706562 - A 2.362205 2.362205 0 0 1 242.95643,19.430971" /> -<line x1="242.95643" y1="19.430971" x2="242.423097" y2="19.430971" /> -<path d="M 242.95643,19.430971 - A 2.362205 2.362205 0 1 1 242.95643,24.155381" /> -<line x1="242.95643" y1="24.155381" x2="242.423097" y2="24.155381" /> -<path d="M 242.95643,24.155381 - A 2.362205 2.362205 0 1 1 242.95643,28.87979" /> -<line x1="242.95643" y1="28.87979" x2="242.423097" y2="28.87979" /> -<line x1="246.893438" y1="9.982152" x2="246.893438" y2="28.87979" /> -<line x1="249.255643" y1="9.982152" x2="249.255643" y2="28.87979" /> -<line x1="242.95643" y1="28.87979" x2="242.95643" y2="38.328609" /> -</g> -<g> -<line x1="265.633596" y1="0.533333" x2="265.633596" y2="17.541207" /> -<line x1="259.334383" y1="17.541207" x2="271.932808" y2="17.541207" /> -<line x1="259.334383" y1="21.320735" x2="271.932808" y2="21.320735" /> -<line x1="265.633596" y1="21.320735" x2="265.633596" y2="38.328609" /> -</g> -<g> -<line x1="288.310761" y1="0.533333" x2="288.310761" y2="17.541207" /> -<line x1="283.586352" y1="17.541207" x2="293.035171" y2="17.541207" /> -<path d="M 283.586352,21.320735 - A 9.448819 9.448819 0 0 1 293.035171,21.320735" /> -<line x1="288.310761" y1="20.054833" x2="288.310761" y2="38.328609" /> -</g> -<g> -<line x1="310.987927" y1="0.533333" x2="310.987927" y2="17.541207" /> -<polyline points="306.263517,21.320735 306.263517,17.541207 -315.712336,17.541207 -315.712336,21.320735" /> -<line x1="307.444619" y1="20.060892" x2="314.531234" y2="20.060892" /> -<line x1="310.987927" y1="20.060892" x2="310.987927" y2="38.328609" /> -</g> -<g> -<line x1="329.885564" y1="0.533333" x2="329.885564" y2="15.651444" /> -<polyline stroke-width="0.533333" - points="329.885564,18.013648 333.665092,18.013648 -333.665092,15.651444 -326.106037,15.651444 -326.106037,18.013648 -329.885564,18.013648" /> -<polyline stroke-width="0" fill="black" - points="329.885564,20.848294 -333.665092,20.848294 -333.665092,23.210499 -326.106037,23.210499 -326.106037,20.848294 -329.885564,20.848294" /> -<polyline stroke-width="0.533333" - points="329.885564,20.848294 333.665092,20.848294 -333.665092,23.210499 -326.106037,23.210499 -326.106037,20.848294 -329.885564,20.848294" /> -<line x1="329.885564" y1="23.210499" x2="329.885564" y2="38.328609" /> -</g> -<g> -<line x1="345.003675" y1="0.533333" x2="345.003675" y2="15.651444" /> -<polyline stroke-width="0" fill="black" - points="345.003675,18.013648 -348.783202,18.013648 -348.783202,15.651444 -341.224147,15.651444 -341.224147,18.013648 -345.003675,18.013648" /> -<polyline points="345.003675,18.013648 348.783202,18.013648 -348.783202,15.651444 -341.224147,15.651444 -341.224147,18.013648 -345.003675,18.013648" /> -<polyline stroke-width="0" fill="black" - points="345.003675,20.848294 -348.783202,20.848294 -348.783202,23.210499 -341.224147,23.210499 -341.224147,20.848294 -345.003675,20.848294" /> -<polyline points="345.003675,20.848294 348.783202,20.848294 -348.783202,23.210499 -341.224147,23.210499 -341.224147,20.848294 -345.003675,20.848294" /> -<line x1="345.003675" y1="23.210499" x2="345.003675" y2="38.328609" /> -</g> -<g> -<line x1="363.901312" y1="0.533333" x2="363.901312" y2="16.703332" /> -<polyline stroke-width="0" fill="black" - points="363.901312,16.703332 -367.050919,16.703332 -363.901312,21.627269 -360.751706,16.703332 -363.901312,16.703332" /> -<polyline points="363.901312,16.703332 367.050919,16.703332 -363.901312,21.627269 -360.751706,16.703332 -363.901312,16.703332" /> -<line x1="360.362738" y1="22.15861" x2="367.439887" y2="22.15861" /> -<line x1="363.901312" y1="22.15861" x2="363.901312" y2="38.328609" /> -</g> -<g> -<line x1="386.578478" y1="0.533333" x2="386.578478" y2="16.703332" /> -<polyline points="386.578478,16.703332 389.728084,16.703332 -386.578478,21.627269 -383.428871,16.703332 -386.578478,16.703332" /> -<line x1="383.039903" y1="22.15861" x2="390.117052" y2="22.15861" /> -<line x1="386.578478" y1="22.15861" x2="386.578478" y2="38.328609" /> -</g> -<g> -<line x1="409.255643" y1="0.533333" x2="409.255643" y2="16.703332" /> -<polyline stroke-width="0" fill="black" - points="409.255643,16.703332 -412.405249,16.703332 -409.255643,21.627269 -406.106037,16.703332 -409.255643,16.703332" /> -<polyline points="409.255643,16.703332 412.405249,16.703332 -409.255643,21.627269 -406.106037,16.703332 -409.255643,16.703332" /> -<polyline points="405.717068,20.583807 405.717068,22.15861 -412.794218,22.15861 -412.794218,23.733413" /> -<line x1="409.255643" y1="22.15861" x2="409.255643" y2="38.328609" /> -</g> -<g> -<line x1="431.932808" y1="0.533333" x2="431.932808" y2="16.703332" /> -<polyline stroke-width="0" fill="black" - points="431.932808,16.703332 -435.082415,16.703332 -431.932808,21.627269 -428.783202,16.703332 -431.932808,16.703332" /> -<polyline points="431.932808,16.703332 435.082415,16.703332 -431.932808,21.627269 -428.783202,16.703332 -431.932808,16.703332" /> -<polyline points="429.833071,20.583807 428.394234,20.583807 -428.394234,22.15861 -435.471383,22.15861 -435.471383,23.733413 -434.032546,23.733413" /> -<line x1="431.932808" y1="22.15861" x2="431.932808" y2="38.328609" /> -</g> -<g> -<line x1="454.609974" y1="0.533333" x2="454.609974" y2="16.703332" /> -<polyline points="454.609974,16.703332 457.75958,16.703332 -454.609974,21.627269 -451.460367,16.703332 -454.609974,16.703332" /> -<line x1="454.609974" y1="16.703332" x2="454.609974" y2="22.15861" /> -<line x1="451.071399" y1="22.15861" x2="458.148549" y2="22.15861" /> -<line x1="454.609974" y1="22.15861" x2="454.609974" y2="38.328609" /> -</g> -<g> -<line x1="477.287139" y1="0.533333" x2="477.287139" y2="16.703332" /> -<polyline stroke-width="0" fill="black" - points="477.287139,16.703332 -480.436745,16.703332 -477.287139,21.627269 -474.137533,16.703332 -477.287139,16.703332" /> -<polyline points="477.287139,16.703332 480.436745,16.703332 -477.287139,21.627269 -474.137533,16.703332 -477.287139,16.703332" /> -<line x1="473.748564" y1="22.15861" x2="480.825714" y2="22.15861" /> -<line x1="473.748564" y1="23.733413" x2="480.825714" y2="23.733413" /> -<line x1="477.287139" y1="23.733413" x2="477.287139" y2="38.328609" /> -</g> -<g> -<line x1="499.964304" y1="0.533333" x2="499.964304" y2="16.703332" /> -<polyline stroke-width="0" fill="black" - points="499.964304,16.703332 -503.113911,16.703332 -499.964304,21.627269 -496.814698,16.703332 -499.964304,16.703332" /> -<polyline points="499.964304,16.703332 503.113911,16.703332 -499.964304,21.627269 -496.814698,16.703332 -499.964304,16.703332" /> -<line x1="496.42573" y1="22.15861" x2="503.502879" y2="22.15861" /> -<path d="M 496.42573,24.258348 - A 6.502428 6.502428 0 0 1 503.502879,24.258348" /> -<line x1="499.964304" y1="23.211198" x2="499.964304" y2="23.733413" /> -<line x1="499.964304" y1="23.733413" x2="499.964304" y2="38.328609" /> -</g> -<g> -<line x1="522.64147" y1="0.533333" x2="522.64147" y2="16.703332" /> -<polyline stroke-width="0" fill="black" - points="522.64147,16.703332 -525.791076,16.703332 -522.64147,21.627269 -519.491864,16.703332 -522.64147,16.703332" /> -<polyline points="522.64147,16.703332 525.791076,16.703332 -522.64147,21.627269 -519.491864,16.703332 -522.64147,16.703332" /> -<polyline points="519.102895,20.583807 519.102895,22.15861 -526.180045,22.15861 -526.180045,20.583807" /> -<line x1="522.64147" y1="22.15861" x2="522.64147" y2="38.328609" /> -</g> -<g> -<line x1="545.318635" y1="0.533333" x2="545.318635" y2="16.703332" /> -<polyline stroke-width="0" fill="black" - points="545.318635,16.703332 -548.468241,16.703332 -545.318635,21.627269 -542.169029,16.703332 -545.318635,16.703332" /> -<polyline points="545.318635,16.703332 548.468241,16.703332 -545.318635,21.627269 -542.169029,16.703332 -545.318635,16.703332" /> -<line x1="541.78006" y1="22.15861" x2="548.85721" y2="22.15861" /> -<line x1="541.78006" y1="20.583807" x2="541.78006" y2="23.733413" /> -<line x1="548.85721" y1="20.583807" x2="548.85721" y2="23.733413" /> -<line x1="545.318635" y1="22.15861" x2="545.318635" y2="38.328609" /> -</g> -<g> -<line x1="567.995801" y1="0.533333" x2="567.995801" y2="16.703332" /> -<polyline stroke-width="0" fill="black" - points="571.145407,16.703332 -574.295013,16.703332 -571.145407,21.627269 -567.995801,16.703332 -571.145407,16.703332" /> -<polyline points="571.145407,16.703332 574.295013,16.703332 -571.145407,21.627269 -567.995801,16.703332 -571.145407,16.703332" /> -<line x1="561.307619" y1="22.15861" x2="574.683982" y2="22.15861" /> -<line x1="561.307619" y1="16.703332" x2="574.683982" y2="16.703332" /> -<polyline stroke-width="0" fill="black" - points="564.846194,22.15861 -567.995801,22.15861 -564.846194,17.234673 -561.696588,22.15861 -564.846194,22.15861" /> -<polyline points="564.846194,22.15861 567.995801,22.15861 -564.846194,17.234673 -561.696588,22.15861 -564.846194,22.15861" /> -<line x1="567.995801" y1="22.15861" x2="567.995801" y2="38.328609" /> -</g> -<g> -<line x1="590.672966" y1="0.533333" x2="590.672966" y2="13.975693" /> -<polyline stroke-width="0" fill="black" - points="590.672966,13.975693 -593.822572,13.975693 -590.672966,18.89963 -587.52336,13.975693 -590.672966,13.975693" /> -<polyline points="590.672966,13.975693 593.822572,13.975693 -590.672966,18.89963 -587.52336,13.975693 -590.672966,13.975693" /> -<polyline points="587.134391,17.856168 587.134391,19.430971 -594.211541,19.430971 -594.211541,21.005774" /> -<polyline stroke-width="0" fill="black" - points="590.672966,24.886249 -593.822572,24.886249 -590.672966,19.962312 -587.52336,24.886249 -590.672966,24.886249" /> -<polyline points="590.672966,24.886249 593.822572,24.886249 -590.672966,19.962312 -587.52336,24.886249 -590.672966,24.886249" /> -<line x1="590.672966" y1="24.886249" x2="590.672966" y2="38.328609" /> -</g> -<g> -<line x1="613.350131" y1="0.533333" x2="613.350131" y2="16.703332" /> -<polygon stroke-width="0" fill="black" - points="623.710168,3.435942 629.012806,1.102782 -626.679646,6.40542" /> -<line x1="616.71917" y1="13.396418" x2="627.972311" y2="2.143277" /> -<polygon stroke-width="0" fill="black" - points="627.05083,6.776604 632.353468,4.443444 -630.020308,9.746082" /> -<line x1="620.059832" y1="16.73708" x2="631.312973" y2="5.483939" /> -<polyline stroke-width="0" fill="black" - points="613.350131,16.703332 -616.499738,16.703332 -613.350131,21.627269 -610.200525,16.703332 -613.350131,16.703332" /> -<polyline points="613.350131,16.703332 616.499738,16.703332 -613.350131,21.627269 -610.200525,16.703332 -613.350131,16.703332" /> -<line x1="609.811556" y1="22.15861" x2="616.888706" y2="22.15861" /> -<line x1="613.350131" y1="22.15861" x2="613.350131" y2="38.328609" /> -</g> -<g> -<circle cx="654.924934" cy="19.430971" r="13.228346" /> -</g> -<g> -<line x1="685.161155" y1="0.533333" x2="685.161155" y2="16.911286" /> -<line x1="682.011549" y1="16.911286" x2="688.310761" y2="16.911286" /> -<polyline points="685.161155,14.706562 689.885564,14.706562 -689.885564,24.155381 -680.436745,24.155381 -680.436745,14.706562 -685.161155,14.706562" /> -<line x1="682.011549" y1="21.950656" x2="688.310761" y2="21.950656" /> -<line x1="685.161155" y1="21.950656" x2="685.161155" y2="38.328609" /> -</g> -<circle fill="black" - cx="700.279265" cy="19.430971" r="1.511811" /> -<g> -<line x1="76.657218" y1="42.108136" x2="76.657218" y2="51.556955" /> -<circle cx="76.657218" cy="61.005774" r="9.448819" /> -<line x1="76.657218" y1="70.454593" x2="76.657218" y2="79.903412" /> -</g> -<g> -<line x1="106.893438" y1="42.108136" x2="106.893438" y2="51.556955" /> -<circle cx="106.893438" cy="61.005774" r="9.448819" /> -<polygon stroke-width="0" fill="black" - points="109.255643,58.64357 106.893438,68.092388 -104.531234,58.64357" /> -<line x1="106.893438" y1="53.91916" x2="106.893438" y2="65.893399" /> -<line x1="106.893438" y1="70.454593" x2="106.893438" y2="79.903412" /> -</g> -<g> -<line x1="137.129659" y1="42.108136" x2="137.129659" y2="51.556955" /> -<circle cx="137.129659" cy="61.005774" r="9.448819" /> -<line x1="127.68084" y1="61.005774" x2="146.578478" y2="61.005774" /> -<line x1="137.129659" y1="70.454593" x2="137.129659" y2="79.903412" /> -</g> -<g> -<line x1="167.365879" y1="42.108136" x2="167.365879" y2="51.556955" /> -<circle cx="167.365879" cy="61.005774" r="9.448819" /> -<text font-size="11.977376pt" stroke-width="0.266667" - fill="black" - x="167.365879" y="60.816798">-</text> -<text font-size="11.977376pt" stroke-width="0.266667" - fill="black" - x="167.365879" y="70.265617"><tspan font-size="66%">+</tspan></text> -<line x1="167.365879" y1="70.454593" x2="167.365879" y2="79.903412" /> -</g> -<g> -<line x1="197.6021" y1="42.108136" x2="197.6021" y2="51.556955" /> -<circle cx="197.6021" cy="61.005774" r="9.448819" /> -<line x1="197.6021" y1="51.556955" x2="197.6021" y2="70.454593" /> -<line x1="197.6021" y1="70.454593" x2="197.6021" y2="79.903412" /> -</g> -<g> -<line x1="227.83832" y1="42.108136" x2="227.83832" y2="51.556955" /> -<circle cx="227.83832" cy="61.005774" r="9.448819" /> -<path d="M 227.83832,61.005774 - A 3.319977 3.319977 0 0 0 221.539108,61.005774" /> -<path d="M 227.83832,61.005774 - A 3.319977 3.319977 0 0 0 234.137533,61.005774" /> -<line x1="227.83832" y1="70.454593" x2="227.83832" y2="79.903412" /> -</g> -<g> -<line x1="258.074541" y1="42.108136" x2="258.074541" y2="51.556955" /> -<circle cx="258.074541" cy="61.005774" r="9.448819" /> -<path d="M 251.775328,61.005774 - C 251.902222,60.873593 252.125763,60.643252 252.274064,60.491867 252.422366,60.340482 252.662034,60.106921 252.808781,59.970776 252.955528,59.834631 253.201024,59.631077 253.3565,59.516633 253.511975,59.40219 253.747259,59.253116 253.881434,59.18404 254.015609,59.114964 254.218606,59.030815 254.334334,58.996297 254.450062,58.96178 254.629424,58.925463 254.734501,58.915271 254.839579,58.90508 255.010289,58.90508 255.115367,58.915271 255.220445,58.925463 255.399807,58.96178 255.515535,58.996297 255.631263,59.030815 255.83426,59.114964 255.968435,59.18404 256.10261,59.253116 256.337894,59.40219 256.493369,59.516633 256.648845,59.631077 256.916416,59.855111 257.090338,60.016468 257.26426,60.177825 257.555467,60.465072 257.740039,60.657335 257.924612,60.849598 258.22447,61.16195 258.409042,61.354213 258.593615,61.546477 258.884821,61.833724 259.058744,61.995081 259.232666,62.156438 259.500237,62.380472 259.655712,62.494915 259.811188,62.609359 260.046472,62.758433 260.180647,62.827508 260.314822,62.896584 260.517819,62.980734 260.633547,63.015251 260.749275,63.049769 260.928636,63.086086 261.033714,63.096277 261.138792,63.106468 261.309502,63.106468 261.41458,63.096277 261.519658,63.086086 261.699019,63.049769 261.814747,63.015251 261.930475,62.980734 262.133472,62.896584 262.267647,62.827508 262.401822,62.758433 262.637106,62.609359 262.792582,62.494915 262.948057,62.380472 263.193553,62.176918 263.3403,62.040773 263.487047,61.904627 263.726716,61.671066 263.875017,61.519681 264.023318,61.368297 264.24686,61.137955 264.373753,61.005774" /> -<line x1="258.074541" y1="70.454593" x2="258.074541" y2="79.903412" /> -</g> -<g> -<line x1="288.310761" y1="42.108136" x2="288.310761" y2="51.556955" /> -<circle cx="288.310761" cy="61.005774" r="9.448819" /> -<line x1="294.992085" y1="54.32445" x2="281.629437" y2="67.687098" /> -<line x1="281.629437" y1="54.32445" x2="294.992085" y2="67.687098" /> -<line x1="288.310761" y1="70.454593" x2="288.310761" y2="79.903412" /> -</g> -<g> -<line x1="318.546982" y1="42.108136" x2="318.546982" y2="51.556955" /> -<circle cx="318.546982" cy="61.005774" r="9.448819" /> -<line x1="318.546982" y1="51.556955" x2="318.546982" y2="56.281365" /> -<line x1="313.822572" y1="56.281365" x2="323.271391" y2="56.281365" /> -<line x1="313.822572" y1="65.730184" x2="323.271391" y2="65.730184" /> -<line x1="318.546982" y1="70.454593" x2="318.546982" y2="65.730184" /> -<line x1="318.546982" y1="70.454593" x2="318.546982" y2="79.903412" /> -</g> -<g> -<line x1="348.783202" y1="42.108136" x2="348.783202" y2="51.556955" /> -<circle cx="348.783202" cy="61.005774" r="9.448819" /> -<polyline points="344.058793,63.367979 346.420997,63.367979 -346.420997,58.64357 -351.145407,58.64357 -351.145407,63.367979 -353.507612,63.367979" /> -<line x1="348.783202" y1="70.454593" x2="348.783202" y2="79.903412" /> -</g> -<g> -<line x1="379.019423" y1="42.108136" x2="379.019423" y2="51.556955" /> -<circle cx="379.019423" cy="61.005774" r="9.448819" /> -<polyline points="374.295013,61.005774 374.295013,57.856168 -379.019423,57.856168 -379.019423,64.155381 -383.743832,64.155381 -383.743832,61.005774" /> -<line x1="379.019423" y1="70.454593" x2="379.019423" y2="79.903412" /> -</g> -<g> -<line x1="409.255643" y1="42.108136" x2="409.255643" y2="51.556955" /> -<circle cx="409.255643" cy="61.005774" r="9.448819" /> -<polyline points="402.95643,64.155381 412.405249,56.281365 -412.405249,64.155381" /> -<line x1="409.255643" y1="70.454593" x2="409.255643" y2="79.903412" /> -</g> -<g> -<line x1="439.491864" y1="42.108136" x2="439.491864" y2="51.556955" /> -<circle cx="439.491864" cy="61.005774" r="9.448819" /> -<polyline points="432.405249,63.367979 437.129659,58.64357 -441.854068,63.367979 -446.578478,58.64357" /> -<line x1="439.491864" y1="70.454593" x2="439.491864" y2="79.903412" /> -</g> -<g> -<line x1="469.728084" y1="42.108136" x2="469.728084" y2="51.556955" /> -<circle cx="469.728084" cy="61.005774" r="9.448819" /> -<line x1="469.728084" y1="51.556955" x2="469.728084" y2="58.64357" /> -<circle stroke-width="0.533333" - cx="469.728084" cy="58.64357" r="0.26567" /> -<path d="M 469.728084,58.64357 - C 470.777953,58.774803 471.827822,58.906037 472.87769,59.03727 474.977428,59.299738 -476.027297,59.955906 476.027297,61.005774 476.027297,62.055643 -474.977428,62.711811 472.87769,62.974278 471.827822,63.105512 470.777953,63.236745 -469.728084,63.367979" /> -<circle stroke-width="0.533333" - cx="469.728084" cy="63.367979" r="0.26567" /> -<line x1="469.728084" y1="63.367979" x2="469.728084" y2="70.454593" /> -<line x1="469.728084" y1="70.454593" x2="469.728084" y2="79.903412" /> -</g> -<g> -<line x1="496.184777" y1="42.108136" x2="496.184777" y2="51.556955" /> -<path d="M 500.909186,61.005774 - C 500.909186,62.649869 500.413123,65.229396 499.728084,67.147507 499.043045,69.065617 497.554856,70.454593 496.184777,70.454593 494.814698,70.454593 493.326509,69.065617 492.64147,67.147507 491.95643,65.229396 491.460367,62.649869 491.460367,61.005774 491.460367,59.36168 491.95643,56.782152 492.64147,54.864042 493.326509,52.945932 494.814698,51.556955 496.184777,51.556955 497.554856,51.556955 499.043045,52.945932 499.728084,54.864042 500.413123,56.782152 500.909186,59.36168 500.909186,61.005774" /> -<line x1="496.184777" y1="70.454593" x2="496.184777" y2="79.903412" /> -</g> -<g> -<line x1="518.861942" y1="42.108136" x2="518.861942" y2="51.556955" /> -<path d="M 518.861942,61.005774 - C 519.649344,60.218373 520.436745,59.430971 521.224147,58.64357 522.79895,57.068766 -523.586352,55.493963 523.586352,53.91916 523.586352,52.344357 -522.011549,51.556955 518.861942,51.556955 515.712336,51.556955 -514.137533,52.344357 514.137533,53.91916 514.137533,55.493963 -514.924934,57.068766 516.499738,58.64357 517.287139,59.430971 518.074541,60.218373 -518.861942,61.005774" /> -<path d="M 518.861942,61.005774 - C 519.649344,61.793176 520.436745,62.580577 521.224147,63.367979 522.79895,64.942782 -523.586352,66.517585 523.586352,68.092388 523.586352,69.667192 -522.011549,70.454593 518.861942,70.454593 515.712336,70.454593 -514.137533,69.667192 514.137533,68.092388 514.137533,66.517585 -514.924934,64.942782 516.499738,63.367979 517.287139,62.580577 518.074541,61.793176 -518.861942,61.005774" /> -<line x1="518.861942" y1="70.454593" x2="518.861942" y2="79.903412" /> -</g> -<g> -<line x1="545.318635" y1="42.108136" x2="545.318635" y2="49.667192" /> -<polyline points="545.318635,49.667192 556.657218,61.005774 -545.318635,72.344357 -533.980052,61.005774 -545.318635,49.667192" /> -<line x1="545.318635" y1="72.344357" x2="545.318635" y2="79.903412" /> -</g> -<g> -<line x1="575.554856" y1="42.108136" x2="575.554856" y2="49.667192" /> -<polyline points="575.554856,49.667192 586.893438,61.005774 -575.554856,72.344357 -564.216273,61.005774 -575.554856,49.667192" /> -<polygon stroke-width="0" fill="black" - points="577.91706,60.060892 575.554856,69.509711 -573.192651,60.060892" /> -<line x1="575.554856" y1="52.501837" x2="575.554856" y2="67.310722" /> -<line x1="575.554856" y1="72.344357" x2="575.554856" y2="79.903412" /> -</g> -<g> -<line x1="605.791076" y1="42.108136" x2="605.791076" y2="49.667192" /> -<polyline points="605.791076,49.667192 617.129659,61.005774 -605.791076,72.344357 -594.452493,61.005774 -605.791076,49.667192" /> -<line x1="617.129659" y1="61.005774" x2="594.452493" y2="61.005774" /> -<line x1="605.791076" y1="72.344357" x2="605.791076" y2="79.903412" /> -</g> -<g> -<line x1="636.027297" y1="42.108136" x2="636.027297" y2="49.667192" /> -<polyline points="636.027297,49.667192 647.365879,61.005774 -636.027297,72.344357 -624.688714,61.005774 -636.027297,49.667192" /> -<text font-size="11.977376pt" stroke-width="0.266667" - fill="black" - x="636.027297" y="59.871916">-</text> -<text font-size="11.977376pt" stroke-width="0.266667" - fill="black" - x="636.027297" y="71.210499">+</text> -<line x1="636.027297" y1="72.344357" x2="636.027297" y2="79.903412" /> -</g> -<g> -<line x1="666.263517" y1="42.108136" x2="666.263517" y2="49.667192" /> -<polyline points="666.263517,49.667192 677.6021,61.005774 -666.263517,72.344357 -654.924934,61.005774 -666.263517,49.667192" /> -<line x1="666.263517" y1="49.667192" x2="666.263517" y2="72.344357" /> -<line x1="666.263517" y1="72.344357" x2="666.263517" y2="79.903412" /> -</g> -<g> -<line x1="696.499738" y1="42.108136" x2="696.499738" y2="44.470341" /> -<circle cx="696.499738" cy="53.91916" r="9.448819" /> -<path d="M 690.249931,61.005774 - A 9.448819 9.448819 0 1 0 702.749544,61.005774" /> -<line x1="696.499738" y1="77.541207" x2="696.499738" y2="79.903412" /> -</g> -<g> -<line x1="726.735958" y1="42.108136" x2="726.735958" y2="44.470341" /> -<circle cx="726.735958" cy="53.91916" r="9.448819" /> -<circle cx="726.735958" cy="68.092388" r="9.448819" /> -<line x1="726.735958" y1="77.541207" x2="726.735958" y2="79.903412" /> -</g> -<g> -<line x1="76.657218" y1="121.478215" x2="76.657218" y2="104.155381" /> -<line x1="71.932808" y1="104.155381" x2="81.381627" y2="104.155381" /> -<line x1="67.208399" y1="101.005774" x2="86.106037" y2="101.005774" /> -<line x1="76.657218" y1="101.005774" x2="76.657218" y2="83.68294" /> -</g> -<g> -<line x1="106.893438" y1="121.478215" x2="106.893438" y2="110.454593" /> -<line x1="102.169029" y1="110.454593" x2="111.617848" y2="110.454593" /> -<line x1="97.444619" y1="107.304987" x2="116.342257" y2="107.304987" /> -<line x1="102.169029" y1="104.155381" x2="111.617848" y2="104.155381" /> -<line x1="97.444619" y1="101.005774" x2="116.342257" y2="101.005774" /> -<line x1="102.169029" y1="97.856168" x2="111.617848" y2="97.856168" /> -<line x1="97.444619" y1="94.706562" x2="116.342257" y2="94.706562" /> -<line x1="106.893438" y1="94.706562" x2="106.893438" y2="83.68294" /> -</g> -<g> -<line x1="137.129659" y1="83.68294" x2="137.129659" y2="90.769554" /> -<polyline points="139.491864,93.431798 139.491864,90.769554 -134.767454,90.769554 -134.767454,93.431798" /> -<circle cx="137.129659" cy="102.580577" r="9.448819" /> -<polyline points="139.491864,111.729357 139.491864,114.391601 -134.767454,114.391601 -134.767454,111.729357" /> -<line x1="137.129659" y1="114.391601" x2="137.129659" y2="121.478215" /> -</g> -<g> -<line x1="159.806824" y1="83.210499" x2="159.806824" y2="92.659318" /> -<polyline points="159.806824,111.556955 163.586352,111.556955 -163.586352,92.659318 -156.027297,92.659318 -156.027297,111.556955 -159.806824,111.556955" /> -<polyline points="159.806824,92.659318 159.806824,95.68294 -161.696588,95.68294 -161.696588,98.706562 -157.91706,98.706562 -157.91706,101.730184 -161.696588,101.730184 -161.696588,104.753806 -159.806824,104.753806 -159.806824,107.777428" /> -<polyline stroke-width="0" fill="black" - points="159.806824,112.501837 -163.586352,112.501837 -163.586352,107.777428 -156.027297,107.777428 -156.027297,112.501837 -159.806824,112.501837" /> -<polyline points="159.806824,112.501837 163.586352,112.501837 -163.586352,107.777428 -156.027297,107.777428 -156.027297,112.501837 -159.806824,112.501837" /> -<line x1="159.806824" y1="112.501837" x2="159.806824" y2="121.950656" /> -</g> -<g> -<line x1="174.924934" y1="116.753806" x2="174.924934" y2="121.478215" /> -<line x1="174.924934" y1="83.68294" x2="174.924934" y2="89.982152" /> -<circle stroke-width="0.533333" - cx="174.924934" cy="89.982152" r="0.26567" /> -<line x1="171.775328" y1="89.982152" x2="171.775328" y2="115.179003" /> -<path d="M 171.775328,115.179003 - C 171.775328,116.048766 173.185407,116.753806 174.924934,116.753806 176.664462,116.753806 178.074541,116.048766 178.074541,115.179003" /> -<line x1="178.074541" y1="115.179003" x2="178.074541" y2="89.982152" /> -<path d="M 178.074541,89.982152 - C 178.074541,89.112388 176.664462,88.407349 174.924934,88.407349 173.185407,88.407349 171.775328,89.112388 171.775328,89.982152 171.775328,90.851916 173.185407,91.556955 174.924934,91.556955 176.664462,91.556955 178.074541,90.851916 178.074541,89.982152" /> -</g> -<g> -<line x1="190.043045" y1="83.68294" x2="190.043045" y2="95.021522" /> -<path d="M 190.043045,95.021522 - A 3.779528 3.779528 0 0 1 190.043045,102.580577" /> -<path d="M 190.043045,102.580577 - A 3.779528 3.779528 0 1 0 190.043045,110.139633" /> -<line x1="190.043045" y1="110.139633" x2="190.043045" y2="121.478215" /> -</g> -<g> -<line x1="205.161155" y1="83.68294" x2="205.161155" y2="95.021522" /> -<path d="M 205.161155,95.021522 - A 3.779528 3.779528 0 0 1 205.161155,102.580577" /> -<circle fill="white" - cx="205.161155" cy="95.021522" r="1.511811" /> -<path d="M 205.161155,102.580577 - A 3.779528 3.779528 0 1 0 205.161155,110.139633" /> -<line x1="205.161155" y1="110.139633" x2="205.161155" y2="121.478215" /> -<circle fill="white" - cx="205.161155" cy="110.139633" r="1.511811" /> -</g> -<g> -<line x1="220.279265" y1="83.68294" x2="220.279265" y2="95.021522" /> -<polyline points="220.279265,110.139633 224.058793,110.139633 -224.058793,95.021522 -216.499738,95.021522 -216.499738,110.139633 -220.279265,110.139633" /> -<line x1="220.279265" y1="95.021522" x2="220.279265" y2="121.478215" /> -</g> -<g> -<line x1="235.397375" y1="83.68294" x2="235.397375" y2="95.021522" /> -<polyline points="235.397375,110.139633 239.176903,110.139633 -239.176903,95.021522 -231.617848,95.021522 -231.617848,110.139633 -235.397375,110.139633" /> -<line x1="231.617848" y1="98.045144" x2="239.176903" y2="98.045144" /> -<line x1="231.617848" y1="107.11601" x2="239.176903" y2="107.11601" /> -<line x1="235.397375" y1="110.139633" x2="235.397375" y2="121.478215" /> -</g> -<g> -<line x1="250.515486" y1="83.68294" x2="250.515486" y2="95.021522" /> -<polyline points="250.515486,110.139633 254.295013,110.139633 -254.295013,95.021522 -246.735958,95.021522 -246.735958,110.139633 -250.515486,110.139633" /> -<polyline stroke-width="0" fill="black" - points="250.515486,98.045144 -254.295013,98.045144 -254.295013,95.021522 -246.735958,95.021522 -246.735958,98.045144 -250.515486,98.045144" /> -<polyline points="250.515486,98.045144 254.295013,98.045144 -254.295013,95.021522 -246.735958,95.021522 -246.735958,98.045144 -250.515486,98.045144" /> -<line x1="250.515486" y1="110.139633" x2="250.515486" y2="121.478215" /> -</g> -<g> -<line x1="269.413123" y1="83.68294" x2="269.413123" y2="89.982152" /> -<polyline points="269.413123,112.659318 273.192651,112.659318 -273.192651,92.501837 -265.633596,92.501837 -265.633596,112.659318 -269.413123,112.659318" /> -<polyline points="269.413123,115.179003 275.712336,115.179003 -275.712336,89.982152 -263.113911,89.982152 -263.113911,115.179003 -269.413123,115.179003" /> -<line x1="269.413123" y1="89.982152" x2="269.413123" y2="121.478215" /> -</g> -<g> -<line x1="292.090289" y1="83.68294" x2="292.090289" y2="89.982152" /> -<polyline points="292.090289,112.659318 295.869816,112.659318 -295.869816,92.501837 -288.310761,92.501837 -288.310761,112.659318 -292.090289,112.659318" /> -<line x1="295.869816" y1="96.533333" x2="288.310761" y2="96.533333" /> -<line x1="295.869816" y1="108.627822" x2="288.310761" y2="108.627822" /> -<polyline points="292.090289,115.179003 298.389501,115.179003 -298.389501,89.982152 -285.791076,89.982152 -285.791076,115.179003 -292.090289,115.179003" /> -<line x1="292.090289" y1="115.179003" x2="292.090289" y2="121.478215" /> -</g> -<g> -<line x1="307.208399" y1="83.68294" x2="307.208399" y2="96.281365" /> -<path d="M 309.570604,95.100262 - A 9.350394 9.350394 0 0 1 309.570604,110.060892" /> -<line x1="307.208399" y1="108.87979" x2="307.208399" y2="121.478215" /> -</g> -<g> -<line x1="326.106037" y1="83.68294" x2="326.106037" y2="96.281365" /> -<circle fill="white" - cx="326.106037" cy="96.281365" r="1.511811" /> -<path d="M 329.980052,95.100262 - A 9.350394 9.350394 0 0 1 329.980052,110.060892" /> -<line x1="326.106037" y1="108.87979" x2="326.106037" y2="121.478215" /> -<circle fill="white" - cx="326.106037" cy="108.87979" r="1.511811" /> -</g> -<g> -<polygon stroke-width="0" fill="black" - points="358.680721,96.901452 367.032375,91.890459 -362.021383,100.242114" /> -<line x1="345.652139" y1="113.270696" x2="365.477455" y2="93.44538" /> -</g> -<g> -<line x1="378.832721" y1="114.105861" x2="400.212958" y2="92.725625" /> -<line x1="398.542627" y1="91.055294" x2="401.883289" y2="94.395956" /> -</g> -<g> -<line x1="413.683635" y1="113.270696" x2="435.063872" y2="91.890459" /> -</g> -<g> -<polyline points="471.441824,91.890459 450.061588,113.270696 -445.337178,113.270696" /> -</g> -<g> -<polyline points="481.715131,115.6329 503.095368,94.252664 -503.095368,89.528254" /> -</g> -<g> -<line x1="512.855307" y1="104.807685" x2="517.309523" y2="100.353469" /> -</g> -<g> -<polyline points="527.932808,104.848294 527.932808,102.580577 -532.468241,102.580577 -532.468241,100.312861" /> -</g> -<g> -<polygon stroke-width="0" fill="black" - points="547.393702,103.406728 545.060541,98.10409 -550.363179,100.437251" /> -<line x1="557.354177" y1="110.397726" x2="546.101037" y2="99.144586" /> -<polygon stroke-width="0" fill="black" - points="550.734364,100.066066 548.401203,94.763428 -553.703841,97.096589" /> -<line x1="560.694839" y1="107.057064" x2="549.441699" y2="95.803924" /> -</g> -<g> -<polygon stroke-width="0" fill="black" - points="577.629923,103.406728 575.296762,98.10409 -580.5994,100.437251" /> -<line x1="587.590398" y1="110.397726" x2="576.337257" y2="99.144586" /> -<polygon stroke-width="0" fill="black" - points="580.970584,100.066066 578.637424,94.763428 -583.940062,97.096589" /> -<line x1="590.93106" y1="107.057064" x2="579.677919" y2="95.803924" /> -</g> -<g> -<polygon stroke-width="0" fill="black" - points="607.110237,102.650823 604.777077,97.348185 -610.079715,99.681346" /> -<line x1="617.070713" y1="109.641821" x2="605.817572" y2="98.38868" /> -<polygon stroke-width="0" fill="black" - points="610.450899,99.310161 608.117739,94.007523 -613.420377,96.340684" /> -<line x1="620.411375" y1="106.301159" x2="609.158234" y2="95.048018" /> -<circle fill="black" - cx="617.070713" cy="109.641821" r="1.511811" /> -<circle fill="black" - cx="620.411375" cy="106.301159" r="1.511811" /> -</g> -<g> -<path d="M 648.062839,110.090227 - A 2.099738 2.099738 0 0 1 645.093361,107.12075" /> -<path d="M 645.093361,107.12075 - A 2.099738 2.099738 0 0 0 642.123884,104.151272" /> -<path d="M 642.123884,104.151272 - A 2.099738 2.099738 0 1 1 639.154407,101.181795" /> -<circle stroke-width="0.533333" - cx="639.154407" cy="101.181795" r="0.26567" /> -<polygon stroke-width="0" fill="black" - points="637.147889,102.144754 635.769203,97.796591 -640.117366,99.175277" /> -<line x1="639.154407" y1="101.181795" x2="636.588472" y2="98.61586" /> -<path d="M 651.403501,106.749565 - A 2.099738 2.099738 0 0 1 648.434023,103.780088" /> -<path d="M 648.434023,103.780088 - A 2.099738 2.099738 0 1 0 645.464546,100.81061" /> -<path d="M 645.464546,100.81061 - A 2.099738 2.099738 0 0 1 642.495069,97.841133" /> -<circle stroke-width="0.533333" - cx="642.495069" cy="97.841133" r="0.26567" /> -<polygon stroke-width="0" fill="black" - points="640.488551,98.804092 639.109865,94.455929 -643.458028,95.834615" /> -<line x1="642.495069" y1="97.841133" x2="639.929134" y2="95.275198" /> -</g> -<g> -<path d="M 677.543154,109.641821 - A 2.099738 2.099738 0 0 1 674.573676,106.672344" /> -<path d="M 674.573676,106.672344 - A 2.099738 2.099738 0 0 0 671.604199,103.702866" /> -<path d="M 671.604199,103.702866 - A 2.099738 2.099738 0 1 1 668.634722,100.733389" /> -<circle stroke-width="0.533333" - cx="668.634722" cy="100.733389" r="0.26567" /> -<polygon stroke-width="0" fill="black" - points="666.628204,101.696348 665.249518,97.348185 -669.597681,98.726871" /> -<line x1="668.634722" y1="100.733389" x2="666.068787" y2="98.167454" /> -<path d="M 680.883816,106.301159 - A 2.099738 2.099738 0 0 1 677.914338,103.331682" /> -<path d="M 677.914338,103.331682 - A 2.099738 2.099738 0 1 0 674.944861,100.362204" /> -<path d="M 674.944861,100.362204 - A 2.099738 2.099738 0 0 1 671.975384,97.392727" /> -<circle stroke-width="0.533333" - cx="671.975384" cy="97.392727" r="0.26567" /> -<polygon stroke-width="0" fill="black" - points="669.968866,98.355686 668.59018,94.007523 -672.938343,95.386209" /> -<line x1="671.975384" y1="97.392727" x2="669.409449" y2="94.826792" /> -<circle fill="black" - cx="677.543154" cy="109.641821" r="1.511811" /> -<circle fill="black" - cx="680.883816" cy="106.301159" r="1.511811" /> -</g> -<g> -<polyline points="701.949596,107.59157 695.268272,100.910246 -695.268272,103.879724" /> -<polyline points="705.290258,104.250908 698.608934,97.569584 -698.608934,100.539062" /> -</g> -<g> -<polyline points="723.870856,106.835665 717.189532,100.154341 -717.189532,103.123818" /> -<polyline points="727.211518,103.495003 720.530194,96.813679 -720.530194,99.783156" /> -<circle fill="black" - cx="723.870856" cy="106.835665" r="1.511811" /> -<circle fill="black" - cx="727.211518" cy="103.495003" r="1.511811" /> -</g> -<g> -<line x1="76.657218" y1="125.257743" x2="76.657218" y2="134.706562" /> -<line x1="82.95643" y1="134.706562" x2="70.358005" y2="134.706562" /> -<line x1="80.856693" y1="137.068766" x2="72.457743" y2="137.068766" /> -<line x1="79.35688" y1="139.430971" x2="73.957555" y2="139.430971" /> -</g> -<g> -<line x1="105.633596" y1="130.454593" x2="93.035171" y2="130.454593" /> -<line x1="103.533858" y1="132.816798" x2="95.134908" y2="132.816798" /> -<line x1="102.034046" y1="135.179003" x2="96.634721" y2="135.179003" /> -</g> -<g> -<line x1="127.365879" y1="125.730184" x2="127.365879" y2="135.179003" /> -<polyline points="130.515486,139.903412 133.665092,135.179003 -121.066667,135.179003 -117.91706,139.903412" /> -<line x1="127.365879" y1="135.179003" x2="124.216273" y2="139.903412" /> -</g> -<g> -<line x1="152.247769" y1="128.092388" x2="152.247769" y2="137.541207" /> -<line stroke-width="2.133333" - x1="156.447244" y1="137.541207" x2="148.048294" y2="137.541207" /> -</g> -<g> -<line x1="174.924934" y1="123.367979" x2="174.924934" y2="132.816798" /> -<polyline points="174.924934,132.816798 181.224147,132.816798 -174.924934,142.265617 -168.625722,132.816798 -174.924934,132.816798" /> -</g> -<g> -<line x1="201.381627" y1="124.549081" x2="201.381627" y2="133.9979" /> -<path d="M 193.19871,141.084514 - A 9.448819 9.448819 0 1 1 209.564544,141.084514" /> -<line x1="207.68084" y1="133.9979" x2="195.082415" y2="133.9979" /> -<line x1="205.581102" y1="136.360105" x2="197.182152" y2="136.360105" /> -<line x1="204.08129" y1="138.72231" x2="198.681965" y2="138.72231" /> -</g> -<g> -<line x1="231.617848" y1="122.186877" x2="231.617848" y2="131.635696" /> -<circle cx="231.617848" cy="133.9979" r="9.448819" /> -<line x1="237.91706" y1="131.635696" x2="225.318635" y2="131.635696" /> -<line x1="235.817323" y1="133.9979" x2="227.418373" y2="133.9979" /> -<line x1="234.31751" y1="136.360105" x2="228.918185" y2="136.360105" /> -</g> -<g> -<line x1="250.515486" y1="140.690814" x2="252.405249" y2="140.690814" /> -<line x1="252.405249" y1="140.690814" x2="252.405249" y2="141.224147" /> -<path d="M 252.405249,140.690814 - A 2.362205 2.362205 0 0 1 257.129659,140.690814" /> -<line x1="257.129659" y1="140.690814" x2="257.129659" y2="141.224147" /> -<path d="M 257.129659,140.690814 - A 2.362205 2.362205 0 0 1 261.854068,140.690814" /> -<line x1="261.854068" y1="140.690814" x2="261.854068" y2="141.224147" /> -<path d="M 261.854068,140.690814 - A 2.362205 2.362205 0 1 1 266.578478,140.690814" /> -<line x1="266.578478" y1="140.690814" x2="266.578478" y2="141.224147" /> -<path d="M 266.578478,140.690814 - A 2.362205 2.362205 0 1 1 271.302887,140.690814" /> -<line x1="271.302887" y1="140.690814" x2="271.302887" y2="141.224147" /> -<line x1="271.302887" y1="140.690814" x2="273.192651" y2="140.690814" /> -<line x1="252.405249" y1="135.179003" x2="271.302887" y2="135.179003" /> -<line x1="252.405249" y1="130.454593" x2="271.302887" y2="130.454593" /> -<line x1="273.192651" y1="124.942782" x2="271.302887" y2="124.942782" /> -<line x1="271.302887" y1="124.942782" x2="271.302887" y2="124.409449" /> -<path d="M 271.302887,124.942782 - A 2.362205 2.362205 0 0 1 266.578478,124.942782" /> -<line x1="266.578478" y1="124.942782" x2="266.578478" y2="124.409449" /> -<path d="M 266.578478,124.942782 - A 2.362205 2.362205 0 0 1 261.854068,124.942782" /> -<line x1="261.854068" y1="124.942782" x2="261.854068" y2="124.409449" /> -<path d="M 261.854068,124.942782 - A 2.362205 2.362205 0 0 1 257.129659,124.942782" /> -<line x1="257.129659" y1="124.942782" x2="257.129659" y2="124.409449" /> -<path d="M 257.129659,124.942782 - A 2.362205 2.362205 0 0 1 252.405249,124.942782" /> -<line x1="252.405249" y1="124.942782" x2="252.405249" y2="124.409449" /> -<line x1="252.405249" y1="124.942782" x2="250.515486" y2="124.942782" /> -</g> -<g> -<line x1="280.751706" y1="140.690814" x2="291.145407" y2="140.690814" /> -<line x1="291.145407" y1="140.690814" x2="291.145407" y2="141.224147" /> -<path d="M 291.145407,140.690814 - A 2.362205 2.362205 0 0 1 295.869816,140.690814" /> -<line x1="295.869816" y1="140.690814" x2="295.869816" y2="141.224147" /> -<path d="M 295.869816,140.690814 - A 2.362205 2.362205 0 0 1 300.594226,140.690814" /> -<line x1="300.594226" y1="140.690814" x2="300.594226" y2="141.224147" /> -<line x1="300.594226" y1="140.690814" x2="310.987927" y2="140.690814" /> -<line x1="286.420997" y1="135.179003" x2="305.318635" y2="135.179003" /> -<line x1="286.420997" y1="130.454593" x2="305.318635" y2="130.454593" /> -<line x1="310.987927" y1="124.942782" x2="305.318635" y2="124.942782" /> -<line x1="305.318635" y1="124.942782" x2="305.318635" y2="124.409449" /> -<path d="M 305.318635,124.942782 - A 2.362205 2.362205 0 0 1 300.594226,124.942782" /> -<line x1="300.594226" y1="124.942782" x2="300.594226" y2="124.409449" /> -<path d="M 300.594226,124.942782 - A 2.362205 2.362205 0 0 1 295.869816,124.942782" /> -<line x1="295.869816" y1="124.942782" x2="295.869816" y2="124.409449" /> -<path d="M 295.869816,124.942782 - A 2.362205 2.362205 0 0 1 291.145407,124.942782" /> -<line x1="291.145407" y1="124.942782" x2="291.145407" y2="124.409449" /> -<path d="M 291.145407,124.942782 - A 2.362205 2.362205 0 0 1 286.420997,124.942782" /> -<line x1="286.420997" y1="124.942782" x2="286.420997" y2="124.409449" /> -<line x1="286.420997" y1="124.942782" x2="280.751706" y2="124.942782" /> -</g> -<g> -<line x1="320.792697" y1="143.705434" x2="320.792697" y2="143.705434" /> -<circle stroke-width="0.533333" - cx="320.792697" cy="143.705434" r="0.26567" /> -<path d="M 320.792697,143.705434 - A 3.779528 3.779528 0 1 1 326.647546,145.003423" /> -<circle stroke-width="0.533333" - cx="326.647546" cy="145.003423" r="0.26567" /> -<path d="M 326.647546,145.003423 - A 3.779528 3.779528 0 1 1 331.506413,145.003423" /> -<circle stroke-width="0.533333" - cx="331.506413" cy="145.003423" r="0.26567" /> -<path d="M 331.506413,145.003423 - A 3.779528 3.779528 0 1 1 336.36528,145.003423" /> -<circle stroke-width="0.533333" - cx="336.36528" cy="145.003423" r="0.26567" /> -<path d="M 336.36528,145.003423 - A 3.779528 3.779528 0 1 1 341.224147,145.003423" /> -<circle stroke-width="0.533333" - cx="341.224147" cy="145.003423" r="0.26567" /> -<path d="M 341.224147,145.003423 - A 3.779528 3.779528 0 1 1 346.083014,145.003423" /> -<circle stroke-width="0.533333" - cx="346.083014" cy="145.003423" r="0.26567" /> -<path d="M 346.083014,145.003423 - A 3.779528 3.779528 0 1 1 350.941881,145.003423" /> -<circle stroke-width="0.533333" - cx="350.941881" cy="145.003423" r="0.26567" /> -<path d="M 350.941881,145.003423 - A 3.779528 3.779528 0 1 1 355.800748,145.003423" /> -<circle stroke-width="0.533333" - cx="355.800748" cy="145.003423" r="0.26567" /> -<path d="M 355.800748,145.003423 - A 3.779528 3.779528 0 1 1 361.655597,143.705434" /> -<circle stroke-width="0.533333" - cx="361.655597" cy="143.705434" r="0.26567" /> -<line x1="361.655597" y1="143.705434" x2="361.655597" y2="143.705434" /> -<line x1="320.792697" y1="135.179003" x2="361.655597" y2="135.179003" /> -<line x1="320.792697" y1="130.454593" x2="361.655597" y2="130.454593" /> -<line x1="352.291975" y1="121.928162" x2="351.937863" y2="121.928162" /> -<circle stroke-width="0.533333" - cx="351.937863" cy="121.928162" r="0.26567" /> -<path d="M 351.937863,121.928162 - A 3.779528 3.779528 0 1 1 346.083014,120.630173" /> -<circle stroke-width="0.533333" - cx="346.083014" cy="120.630173" r="0.26567" /> -<path d="M 346.083014,120.630173 - A 3.779528 3.779528 0 1 1 341.224147,120.630173" /> -<circle stroke-width="0.533333" - cx="341.224147" cy="120.630173" r="0.26567" /> -<path d="M 341.224147,120.630173 - A 3.779528 3.779528 0 1 1 336.36528,120.630173" /> -<circle stroke-width="0.533333" - cx="336.36528" cy="120.630173" r="0.26567" /> -<path d="M 336.36528,120.630173 - A 3.779528 3.779528 0 1 1 330.510431,121.928162" /> -<circle stroke-width="0.533333" - cx="330.510431" cy="121.928162" r="0.26567" /> -<line x1="330.510431" y1="121.928162" x2="330.156319" y2="121.928162" /> -</g> -<g> -<line x1="372.87769" y1="139.903412" x2="375.239895" y2="139.903412" /> -<circle stroke-width="0.533333" - cx="375.239895" cy="139.903412" r="0.26567" /> -<path d="M 375.239895,139.903412 - C 375.239895,137.304987 376.345407,135.179003 377.696588,135.179003 379.047769,135.179003 380.153281,136.667192 380.153281,138.486089 380.153281,140.304987 379.643045,141.793176 379.019423,141.793176 378.395801,141.793176 377.885564,140.304987 377.885564,138.486089 377.885564,136.667192 379.246194,135.179003 380.909186,135.179003 382.572178,135.179003 383.932808,136.667192 383.932808,138.486089 383.932808,140.304987 383.422572,141.793176 382.79895,141.793176 382.175328,141.793176 381.665092,140.304987 381.665092,138.486089 381.665092,136.667192 383.025722,135.179003 384.688714,135.179003 386.351706,135.179003 387.712336,136.667192 387.712336,138.486089 387.712336,140.304987 387.2021,141.793176 386.578478,141.793176 385.954856,141.793176 385.444619,140.304987 385.444619,138.486089 385.444619,136.667192 386.805249,135.179003 388.468241,135.179003 390.131234,135.179003 391.491864,136.667192 391.491864,138.486089 391.491864,140.304987 390.981627,141.793176 390.358005,141.793176 389.734383,141.793176 389.224147,140.304987 389.224147,138.486089 389.224147,136.667192 390.584777,135.179003 392.247769,135.179003 393.910761,135.179003 395.271391,136.667192 395.271391,138.486089 395.271391,140.304987 394.761155,141.793176 394.137533,141.793176 393.513911,141.793176 393.003675,140.304987 393.003675,138.486089 393.003675,136.667192 394.364304,135.179003 396.027297,135.179003 397.690289,135.179003 399.050919,136.667192 399.050919,138.486089 399.050919,140.304987 398.540682,141.793176 397.91706,141.793176 397.293438,141.793176 396.783202,140.304987 396.783202,138.486089 396.783202,136.667192 398.143832,135.179003 399.806824,135.179003 401.469816,135.179003 402.830446,136.667192 402.830446,138.486089 402.830446,140.304987 402.32021,141.793176 401.696588,141.793176 401.072966,141.793176 400.56273,140.304987 400.56273,138.486089 400.56273,136.667192 401.92336,135.179003 403.586352,135.179003 405.249344,135.179003 406.609974,136.667192 406.609974,138.486089 406.609974,140.304987 406.099738,141.793176 405.476115,141.793176 404.852493,141.793176 404.342257,140.304987 404.342257,138.486089 404.342257,136.667192 405.702887,135.179003 407.365879,135.179003 409.028871,135.179003 410.389501,136.667192 410.389501,138.486089 410.389501,140.304987 409.879265,141.793176 409.255643,141.793176 408.632021,141.793176 408.121785,140.304987 408.121785,138.486089 408.121785,136.667192 409.227297,135.179003 410.578478,135.179003 411.929659,135.179003 413.035171,137.304987 413.035171,139.903412" /> -<circle stroke-width="0.533333" - cx="413.035171" cy="139.903412" r="0.26567" /> -<line x1="413.035171" y1="139.903412" x2="415.397375" y2="139.903412" /> -<line x1="415.397375" y1="125.730184" x2="403.586352" y2="125.730184" /> -<circle stroke-width="0.533333" - cx="403.586352" cy="125.730184" r="0.26567" /> -<path d="M 403.586352,125.730184 - C 403.586352,128.328609 402.48084,130.454593 401.129659,130.454593 399.778478,130.454593 398.672966,128.966404 398.672966,127.147507 398.672966,125.328609 399.183202,123.84042 399.806824,123.84042 400.430446,123.84042 400.940682,125.328609 400.940682,127.147507 400.940682,128.966404 399.580052,130.454593 397.91706,130.454593 396.254068,130.454593 394.893438,128.966404 394.893438,127.147507 394.893438,125.328609 395.403675,123.84042 396.027297,123.84042 396.650919,123.84042 397.161155,125.328609 397.161155,127.147507 397.161155,128.966404 395.800525,130.454593 394.137533,130.454593 392.474541,130.454593 391.113911,128.966404 391.113911,127.147507 391.113911,125.328609 391.624147,123.84042 392.247769,123.84042 392.871391,123.84042 393.381627,125.328609 393.381627,127.147507 393.381627,128.966404 392.020997,130.454593 390.358005,130.454593 388.695013,130.454593 387.334383,128.966404 387.334383,127.147507 387.334383,125.328609 387.844619,123.84042 388.468241,123.84042 389.091864,123.84042 389.6021,125.328609 389.6021,127.147507 389.6021,128.966404 388.496588,130.454593 387.145407,130.454593 385.794226,130.454593 384.688714,128.328609 384.688714,125.730184" /> -<circle stroke-width="0.533333" - cx="384.688714" cy="125.730184" r="0.26567" /> -<line x1="384.688714" y1="125.730184" x2="372.87769" y2="125.730184" /> -</g> -<g> -<line x1="467.482368" y1="124.751561" x2="467.482368" y2="124.751561" /> -<circle stroke-width="0.533333" - cx="467.482368" cy="124.751561" r="0.26567" /> -<path d="M 467.482368,124.751561 - A 3.779528 3.779528 0 1 1 461.62752,123.453572" /> -<circle stroke-width="0.533333" - cx="461.62752" cy="123.453572" r="0.26567" /> -<path d="M 461.62752,123.453572 - A 3.779528 3.779528 0 1 1 456.768653,123.453572" /> -<circle stroke-width="0.533333" - cx="456.768653" cy="123.453572" r="0.26567" /> -<path d="M 456.768653,123.453572 - A 3.779528 3.779528 0 1 1 451.909786,123.453572" /> -<circle stroke-width="0.533333" - cx="451.909786" cy="123.453572" r="0.26567" /> -<path d="M 451.909786,123.453572 - A 3.779528 3.779528 0 1 1 447.050919,123.453572" /> -<circle stroke-width="0.533333" - cx="447.050919" cy="123.453572" r="0.26567" /> -<path d="M 447.050919,123.453572 - A 3.779528 3.779528 0 1 1 442.192052,123.453572" /> -<circle stroke-width="0.533333" - cx="442.192052" cy="123.453572" r="0.26567" /> -<path d="M 442.192052,123.453572 - A 3.779528 3.779528 0 1 1 437.333185,123.453572" /> -<circle stroke-width="0.533333" - cx="437.333185" cy="123.453572" r="0.26567" /> -<path d="M 437.333185,123.453572 - A 3.779528 3.779528 0 1 1 432.474318,123.453572" /> -<circle stroke-width="0.533333" - cx="432.474318" cy="123.453572" r="0.26567" /> -<path d="M 432.474318,123.453572 - A 3.779528 3.779528 0 1 1 426.619469,124.751561" /> -<circle stroke-width="0.533333" - cx="426.619469" cy="124.751561" r="0.26567" /> -<line x1="426.619469" y1="124.751561" x2="426.619469" y2="124.751561" /> -<line x1="426.619469" y1="140.882035" x2="436.337203" y2="140.882035" /> -<circle stroke-width="0.533333" - cx="436.337203" cy="140.882035" r="0.26567" /> -<path d="M 436.337203,140.882035 - A 3.779528 3.779528 0 1 1 442.192052,142.180024" /> -<circle stroke-width="0.533333" - cx="442.192052" cy="142.180024" r="0.26567" /> -<path d="M 442.192052,142.180024 - A 3.779528 3.779528 0 1 1 447.050919,142.180024" /> -<circle stroke-width="0.533333" - cx="447.050919" cy="142.180024" r="0.26567" /> -<path d="M 447.050919,142.180024 - A 3.779528 3.779528 0 1 1 451.909786,142.180024" /> -<circle stroke-width="0.533333" - cx="451.909786" cy="142.180024" r="0.26567" /> -<path d="M 451.909786,142.180024 - A 3.779528 3.779528 0 1 1 457.764634,140.882035" /> -<circle stroke-width="0.533333" - cx="457.764634" cy="140.882035" r="0.26567" /> -<line x1="457.764634" y1="140.882035" x2="467.482368" y2="140.882035" /> -</g> -<g> -<line x1="57.75958" y1="155.493963" x2="70.358005" y2="155.493963" /> -<line x1="70.358005" y1="155.493963" x2="79.806824" y2="146.045144" /> -<line x1="82.95643" y1="155.493963" x2="95.554856" y2="155.493963" /> -</g> -<g> -<line x1="103.113911" y1="155.493963" x2="115.712336" y2="155.493963" /> -<line x1="115.712336" y1="155.493963" x2="125.161155" y2="146.045144" /> -<path stroke-width="0" fill="black" - d="M 121.038343,148.986605 - L 120.07383,149.827001 - A 17.612747 17.612747 0 0 0 118.15787,146.367105 - A 17.612747 17.612747 0 0 1 122.002855,148.146209 - L 121.038343,148.986605" /> -<path d="M 125.017606,157.134733 - A 17.612747 17.612747 0 0 0 120.663154,148.600606" /> -<line x1="128.310761" y1="155.493963" x2="140.909186" y2="155.493963" /> -</g> -<g> -<line x1="148.468241" y1="155.493963" x2="161.066667" y2="155.493963" /> -<line x1="161.066667" y1="155.493963" x2="170.515486" y2="146.045144" /> -<line x1="173.665092" y1="155.493963" x2="186.263517" y2="155.493963" /> -<circle fill="white" - cx="161.066667" cy="155.493963" r="1.511811" /> -<circle fill="white" - cx="173.665092" cy="155.493963" r="1.511811" /> -</g> -<g> -<line x1="193.822572" y1="155.493963" x2="206.420997" y2="155.493963" /> -<line x1="206.420997" y1="155.493963" x2="215.869816" y2="146.045144" /> -<path stroke-width="0" fill="black" - d="M 211.747004,148.986605 - L 210.782491,149.827001 - A 17.612747 17.612747 0 0 0 208.866532,146.367105 - A 17.612747 17.612747 0 0 1 212.711517,148.146209 - L 211.747004,148.986605" /> -<path d="M 215.726267,157.134733 - A 17.612747 17.612747 0 0 0 211.371816,148.600606" /> -<line x1="219.019423" y1="155.493963" x2="231.617848" y2="155.493963" /> -<circle fill="white" - cx="206.420997" cy="155.493963" r="1.511811" /> -<circle fill="white" - cx="219.019423" cy="155.493963" r="1.511811" /> -</g> -<g> -<line x1="239.176903" y1="155.493963" x2="251.775328" y2="155.493963" /> -<line x1="251.775328" y1="155.493963" x2="261.224147" y2="146.045144" /> -<path stroke-width="0" fill="black" - d="M 260.246445,154.099566 - L 259.017256,154.45761 - A 17.894743 17.894743 0 0 1 260.902186,157.939498 - A 17.894743 17.894743 0 0 0 261.475633,153.741522 - L 260.246445,154.099566" /> -<path d="M 260.36947,154.625363 - A 17.894743 17.894743 0 0 0 256.499738,147.311046" /> -<line x1="264.373753" y1="155.493963" x2="276.972178" y2="155.493963" /> -</g> -<g> -<line x1="284.531234" y1="155.493963" x2="297.129659" y2="155.493963" /> -<line x1="297.129659" y1="155.493963" x2="306.578478" y2="146.045144" /> -<line x1="309.728084" y1="155.493963" x2="322.326509" y2="155.493963" /> -</g> -<g> -<line x1="329.885564" y1="155.493963" x2="342.48399" y2="155.493963" /> -<line x1="342.48399" y1="155.493963" x2="351.932808" y2="146.045144" /> -<line x1="355.082415" y1="155.493963" x2="367.68084" y2="155.493963" /> -</g> -<g> -<line x1="400.436745" y1="155.493963" x2="413.035171" y2="155.493963" /> -<line x1="375.239895" y1="155.493963" x2="387.83832" y2="155.493963" /> -<line x1="387.83832" y1="155.493963" x2="402.011549" y2="148.407349" /> -</g> -<g> -<line x1="445.791076" y1="157.383727" x2="458.389501" y2="157.383727" /> -<line x1="420.594226" y1="157.383727" x2="433.192651" y2="157.383727" /> -<line x1="433.192651" y1="157.383727" x2="447.365879" y2="150.297113" /> -<line x1="445.791076" y1="157.383727" x2="445.791076" y2="149.509711" /> -</g> -<g> -<line x1="491.145407" y1="153.604199" x2="503.743832" y2="153.604199" /> -<line x1="465.948556" y1="153.604199" x2="478.546982" y2="153.604199" /> -<line x1="478.546982" y1="153.604199" x2="492.72021" y2="146.517585" /> -<circle fill="white" - cx="491.145407" cy="153.604199" r="1.511811" /> -</g> -<g> -<line x1="536.499738" y1="153.604199" x2="549.098163" y2="153.604199" /> -<line x1="511.302887" y1="153.604199" x2="523.901312" y2="153.604199" /> -<line x1="523.901312" y1="153.604199" x2="538.074541" y2="146.517585" /> -<polyline points="525.672966,152.718373 524.885564,151.14357 -531.972178,147.600262 -533.546982,150.749869 -526.460367,154.293176 -525.672966,152.718373" /> -</g> -<g> -<line x1="581.854068" y1="155.493963" x2="594.452493" y2="155.493963" /> -<line x1="556.657218" y1="155.493963" x2="569.255643" y2="155.493963" /> -<line x1="569.255643" y1="155.493963" x2="583.428871" y2="148.407349" /> -<line x1="581.854068" y1="155.493963" x2="581.854068" y2="147.619948" /> -<polyline points="571.027297,154.608136 570.239895,153.033333 -577.326509,149.490026 -578.901312,152.639633 -571.814698,156.18294 -571.027297,154.608136" /> -</g> -<g> -<line x1="627.208399" y1="157.383727" x2="639.806824" y2="157.383727" /> -<line x1="602.011549" y1="157.383727" x2="614.609974" y2="157.383727" /> -<line x1="614.609974" y1="157.383727" x2="628.783202" y2="150.297113" /> -<polyline points="619.039108,155.16916 622.779265,149.362073 -624.354068,152.51168" /> -</g> -<g> -<line x1="672.56273" y1="157.383727" x2="685.161155" y2="157.383727" /> -<line x1="647.365879" y1="157.383727" x2="659.964304" y2="157.383727" /> -<line x1="659.964304" y1="157.383727" x2="674.137533" y2="150.297113" /> -<line x1="672.56273" y1="157.383727" x2="672.56273" y2="149.509711" /> -<polyline points="664.393438,155.16916 668.133596,149.362073 -669.708399,152.51168" /> -</g> -<g> -<line x1="82.95643" y1="178.171129" x2="95.554856" y2="178.171129" /> -<line x1="57.75958" y1="178.171129" x2="70.358005" y2="178.171129" /> -<line x1="70.358005" y1="178.171129" x2="84.531234" y2="171.084514" /> -</g> -<g> -<line x1="128.310761" y1="178.171129" x2="140.909186" y2="178.171129" /> -<line x1="103.113911" y1="178.171129" x2="115.712336" y2="178.171129" /> -<line x1="115.712336" y1="178.171129" x2="129.885564" y2="185.257743" /> -<line stroke-dasharray="6.614173,4.724409" - x1="122.79895" y1="181.714436" x2="122.79895" y2="162.816798" /> -<line x1="128.310761" y1="178.171129" x2="128.310761" y2="186.045144" /> -</g> -<g> -<line x1="173.665092" y1="185.730184" x2="186.263517" y2="185.730184" /> -<line x1="148.468241" y1="185.730184" x2="161.066667" y2="185.730184" /> -<line x1="161.066667" y1="185.730184" x2="175.239895" y2="178.64357" /> -<line stroke-dasharray="2.755906,1.968504" - x1="168.153281" y1="182.186877" x2="168.153281" y2="175.100262" /> -<polyline points="168.153281,175.100262 163.428871,172.738058 -168.153281,170.375853" /> -<line stroke-dasharray="2.755906,1.968504" - x1="168.153281" y1="170.375853" x2="168.153281" y2="163.289239" /> -</g> -<g> -<line x1="219.019423" y1="185.730184" x2="231.617848" y2="185.730184" /> -<line x1="193.822572" y1="185.730184" x2="206.420997" y2="185.730184" /> -<line x1="206.420997" y1="185.730184" x2="220.594226" y2="178.64357" /> -<line stroke-dasharray="6.614173,4.724409" - x1="213.507612" y1="182.186877" x2="213.507612" y2="163.289239" /> -<line x1="209.570604" y1="163.289239" x2="217.444619" y2="163.289239" /> -</g> -<g> -<line x1="264.373753" y1="185.730184" x2="276.972178" y2="185.730184" /> -<line x1="239.176903" y1="185.730184" x2="251.775328" y2="185.730184" /> -<line x1="251.775328" y1="185.730184" x2="265.948556" y2="178.64357" /> -<line stroke-dasharray="6.614173,4.724409" - x1="258.861942" y1="182.186877" x2="258.861942" y2="163.289239" /> -<line stroke-dasharray="2.755906,1.968504" - x1="258.861942" y1="182.186877" x2="258.861942" y2="175.100262" /> -<polyline points="258.861942,175.100262 254.137533,172.738058 -258.861942,170.375853" /> -<line stroke-dasharray="2.755906,1.968504" - x1="258.861942" y1="170.375853" x2="258.861942" y2="163.289239" /> -<polyline points="254.924934,167.226247 254.924934,163.289239 -262.79895,163.289239 -262.79895,167.226247" /> -</g> -<g> -<line x1="309.728084" y1="187.619948" x2="322.326509" y2="187.619948" /> -<line x1="284.531234" y1="187.619948" x2="297.129659" y2="187.619948" /> -<line x1="297.129659" y1="187.619948" x2="311.302887" y2="180.533333" /> -<line stroke-dasharray="6.614173,4.724409" - x1="304.216273" y1="184.07664" x2="304.216273" y2="165.179003" /> -<polyline points="300.279265,161.241995 300.279265,165.179003 -308.153281,165.179003 -308.153281,161.241995" /> -</g> -<g> -<line x1="355.082415" y1="187.619948" x2="367.68084" y2="187.619948" /> -<line x1="329.885564" y1="187.619948" x2="342.48399" y2="187.619948" /> -<line x1="342.48399" y1="187.619948" x2="356.657218" y2="180.533333" /> -<line stroke-dasharray="6.614173,4.724409" - x1="349.570604" y1="184.07664" x2="349.570604" y2="165.179003" /> -<polyline points="345.633596,169.11601 345.633596,165.179003 -353.507612,165.179003 -353.507612,161.241995" /> -</g> -<g> -<line x1="400.436745" y1="187.619948" x2="413.035171" y2="187.619948" /> -<line x1="375.239895" y1="187.619948" x2="387.83832" y2="187.619948" /> -<line x1="387.83832" y1="187.619948" x2="402.011549" y2="180.533333" /> -<line stroke-dasharray="6.614173,4.724409" - x1="394.924934" y1="184.07664" x2="394.924934" y2="165.179003" /> -<line x1="390.987927" y1="165.179003" x2="398.861942" y2="165.179003" /> -<path d="M 398.861942,165.179003 - A 4.591301 4.591301 0 0 0 390.987927,165.179003" /> -</g> -<g> -<line x1="445.791076" y1="187.619948" x2="458.389501" y2="187.619948" /> -<line x1="420.594226" y1="187.619948" x2="433.192651" y2="187.619948" /> -<line x1="433.192651" y1="187.619948" x2="447.365879" y2="180.533333" /> -<line x1="439.098163" y1="184.667192" x2="439.098163" y2="165.769554" /> -<line x1="441.460367" y1="183.486089" x2="441.460367" y2="165.952271" /> -<path d="M 445.003675,163.498708 - A 6.149803 6.149803 0 0 1 435.554856,163.498708" /> -</g> -<g> -<line x1="491.145407" y1="185.730184" x2="503.743832" y2="185.730184" /> -<line x1="465.948556" y1="185.730184" x2="478.546982" y2="185.730184" /> -<line x1="478.546982" y1="185.730184" x2="492.72021" y2="178.64357" /> -<line x1="484.452493" y1="182.777428" x2="484.452493" y2="163.87979" /> -<line x1="486.814698" y1="181.596325" x2="486.814698" y2="164.062507" /> -<path d="M 490.358005,166.333353 - A 6.149803 6.149803 0 0 0 480.909186,166.333353" /> -</g> -<g> -<line x1="536.499738" y1="187.619948" x2="549.098163" y2="187.619948" /> -<line x1="511.302887" y1="187.619948" x2="523.901312" y2="187.619948" /> -<line x1="523.901312" y1="187.619948" x2="538.074541" y2="180.533333" /> -<line x1="529.806824" y1="184.667192" x2="529.806824" y2="165.769554" /> -<line x1="532.169029" y1="183.486089" x2="532.169029" y2="165.952271" /> -<path d="M 535.712336,163.498708 - A 6.149803 6.149803 0 0 1 526.263517,163.498708" /> -<path d="M 535.712336,168.223117 - A 6.149803 6.149803 0 0 0 526.263517,168.223117" /> -</g> -<g> -<line x1="82.95643" y1="208.407349" x2="95.554856" y2="208.407349" /> -<line x1="57.75958" y1="208.407349" x2="70.358005" y2="208.407349" /> -<line x1="70.358005" y1="208.407349" x2="84.531234" y2="201.320735" /> -<polyline points="86.106037,206.580577 82.95643,208.407349 -86.106037,210.234121" /> -</g> -<g> -<line x1="128.310761" y1="208.407349" x2="140.909186" y2="208.407349" /> -<line x1="103.113911" y1="208.407349" x2="115.712336" y2="208.407349" /> -<line x1="115.712336" y1="208.407349" x2="129.885564" y2="201.320735" /> -<polyline points="129.885564,208.407349 128.310761,208.407349 -131.460367,206.580577" /> -</g> -<g> -<line x1="173.665092" y1="206.517585" x2="186.263517" y2="206.517585" /> -<line x1="148.468241" y1="206.517585" x2="161.066667" y2="206.517585" /> -<line x1="161.066667" y1="206.517585" x2="175.239895" y2="199.430971" /> -<polyline points="175.239895,206.517585 173.665092,206.517585 -176.814698,208.344357" /> -</g> -<g> -<line x1="219.019423" y1="208.407349" x2="231.617848" y2="208.407349" /> -<line x1="193.822572" y1="208.407349" x2="206.420997" y2="208.407349" /> -<line x1="206.420997" y1="208.407349" x2="220.594226" y2="201.320735" /> -<polyline points="220.452493,201.391601 220.594226,201.320735 -222.354909,204.842102" /> -</g> -<g> -<line x1="264.373753" y1="210.297113" x2="276.972178" y2="210.297113" /> -<line x1="239.176903" y1="210.297113" x2="251.775328" y2="210.297113" /> -<line x1="251.775328" y1="210.297113" x2="265.948556" y2="203.210499" /> -<polyline points="265.806824,203.281365 265.948556,203.210499 -264.187873,199.689132" /> -</g> -<g> -<line x1="309.728084" y1="210.297113" x2="322.326509" y2="210.297113" /> -<line x1="284.531234" y1="210.297113" x2="297.129659" y2="210.297113" /> -<line x1="297.129659" y1="210.297113" x2="311.302887" y2="203.210499" /> -<polyline points="311.161155,203.281365 311.302887,203.210499 -313.063571,206.731866" /> -<line x1="309.728084" y1="210.297113" x2="309.728084" y2="202.423097" /> -</g> -<g> -<polyline points="329.885564,195.493963 338.068482,209.667192 -346.251399,195.493963" /> -<line x1="338.068482" y1="195.493963" x2="338.068482" y2="215.966404" /> -</g> -<g> -<polyline points="358.861942,217.856168 358.861942,211.556955 -352.56273,211.556955 -352.56273,195.808924 -368.310761,195.808924 -368.310761,208.407349 -355.712336,208.407349 -355.712336,192.659318 -371.460367,192.659318 -371.460367,211.556955 -365.161155,211.556955 -365.161155,217.856168" /> -</g> -<g> -<polyline points="387.20234,209.667192 379.019423,195.493963 -395.385257,195.493963 -387.20234,209.667192" /> -<line x1="387.20234" y1="195.493963" x2="387.20234" y2="215.966404" /> -</g> -<g> -<polyline points="412.72021,221.635696 412.72021,215.336483 -401.696588,204.312861 -415.869816,190.139633 -430.043045,204.312861 -419.019423,215.336483 -419.019423,221.635696" /> -</g> -<g> -<polyline points="445.791076,214.07664 445.791076,195.179003 -439.491864,195.179003" /> -<polyline points="452.090289,214.07664 452.090289,195.179003 -458.389501,195.179003" /> -</g> -<g> -<line x1="478.546982" y1="208.407349" x2="478.546982" y2="206.307612" /> -<line x1="484.846194" y1="206.307612" x2="472.247769" y2="206.307612" /> -<line x1="491.145407" y1="203.158005" x2="465.948556" y2="203.158005" /> -</g> -<g> -<polyline points="499.964304,195.493963 499.964304,209.667192 -516.330139,209.667192 -516.330139,195.493963" /> -<line x1="508.147222" y1="195.493963" x2="508.147222" y2="215.966404" /> -</g> -<g> -<line x1="53.035171" y1="234.864042" x2="57.75958" y2="234.864042" /> -<polyline points="95.554856,234.864042 57.75958,215.966404 -57.75958,253.76168 -95.554856,234.864042 -100.279265,234.864042" /> -</g> -<g> -<polyline points="116.342257,215.966404 106.893438,215.966404 -106.893438,253.76168 -116.342257,253.76168" /> -<polyline points="154.137533,234.864042 116.342257,215.966404 -116.342257,253.76168 -154.137533,234.864042 -154.137533,234.864042" /> -</g> -<g> -<line x1="163.586352" y1="234.864042" x2="171.460367" y2="234.864042" /> -<polyline points="180.279265,248.092388 171.460367,248.092388 -171.460367,221.635696 -180.279265,221.635696" /> -<path d="M 180.279265,221.635696 - A 13.228346 13.228346 0 0 1 180.279265,248.092388" /> -<line x1="193.507612" y1="234.864042" x2="201.381627" y2="234.864042" /> -</g> -<g> -<polyline points="208.940682,234.864042 208.940682,215.966404 -246.735958,234.864042 -208.940682,253.76168 -208.940682,234.864042" /> -<text font-size="11.977376pt" stroke-width="0.266667" - fill="black" - x="214.25409" y="229.950656">-</text> -<text font-size="11.977376pt" stroke-width="0.266667" - fill="black" - x="214.25409" y="248.848294">+</text> -</g> -<g> -<polyline points="254.295013,234.864042 254.295013,215.966404 -282.64147,230.139633 -282.64147,239.588451 -254.295013,253.76168 -254.295013,234.864042" /> -<line x1="282.64147" y1="234.864042" x2="292.090289" y2="234.864042" /> -<text font-size="11.977376pt" stroke-width="0.266667" - fill="black" - x="259.608421" y="229.950656">-</text> -<text font-size="11.977376pt" stroke-width="0.266667" - fill="black" - x="259.608421" y="248.848294">+</text> -</g> -<g> -<line x1="299.649344" y1="234.864042" x2="309.098163" y2="234.864042" /> -<polyline points="327.995801,234.864042 309.098163,225.415223 -309.098163,244.312861 -327.995801,234.864042 -337.444619,234.864042" /> -</g> -<g> -<polyline points="349.728084,225.415223 345.003675,225.415223 -345.003675,244.312861 -349.728084,244.312861" /> -<polyline points="368.625722,234.864042 349.728084,225.415223 -349.728084,244.312861 -368.625722,234.864042 -382.79895,234.864042" /> -</g> -<g> -<line x1="390.358005" y1="234.864042" x2="403.743832" y2="234.864042" /> -<polyline points="408.153281,241.478215 403.743832,241.478215 -403.743832,228.249869 -408.153281,228.249869" /> -<path d="M 408.153281,228.249869 - A 6.614173 6.614173 0 0 1 408.153281,241.478215" /> -<line x1="414.767454" y1="234.864042" x2="428.153281" y2="234.864042" /> -</g> -<g> -<polyline points="435.712336,235.11601 435.712336,222.517585 -460.909186,235.11601 -435.712336,247.714436 -435.712336,235.11601" /> -<line x1="460.909186" y1="235.11601" x2="467.208399" y2="235.11601" /> -<text font-size="11.977376pt" stroke-width="0.266667" - fill="black" - x="441.025744" y="233.352231">-</text> -<text font-size="11.977376pt" stroke-width="0.266667" - fill="black" - x="441.025744" y="245.950656">+</text> -</g> -<g> -<polyline points="473.507612,235.11601 473.507612,222.517585 -492.405249,231.966404 -492.405249,238.265617 -473.507612,247.714436 -473.507612,235.11601" /> -<line x1="492.405249" y1="235.11601" x2="498.704462" y2="235.11601" /> -<line x1="498.704462" y1="235.11601" x2="505.003675" y2="235.11601" /> -<text font-size="11.977376pt" stroke-width="0.266667" - fill="black" - x="478.82102" y="233.352231">-</text> -<text font-size="11.977376pt" stroke-width="0.266667" - fill="black" - x="478.82102" y="245.950656">+</text> -</g> -<g> -<polyline points="81.381627,336.596325 81.381627,327.147507 -71.932808,327.147507 -71.932808,346.045144 -81.381627,346.045144 -81.381627,336.596325" /> -<line x1="71.932808" y1="336.596325" x2="59.334383" y2="336.596325" /> -<line x1="81.381627" y1="336.596325" x2="93.980052" y2="336.596325" /> -<circle fill="white" - cx="67.52336" cy="305.415223" r="1.511811" /> -<line x1="69.035171" y1="305.415223" x2="86.420997" y2="305.415223" /> -<polygon stroke-width="0" fill="black" - points="86.420997,299.11601 83.271391,305.415223 -80.121785,299.11601" /> -<polyline points="83.271391,304.222654 83.271391,295.966404 -90.830446,295.966404" /> -<polygon stroke-width="0" fill="black" - points="80.121785,316.438845 83.271391,310.139633 -86.420997,316.438845" /> -<polyline points="83.271391,311.332202 83.271391,319.588451 -90.830446,319.588451" /> -<circle fill="white" - cx="67.52336" cy="272.344357" r="1.511811" /> -<line x1="69.035171" y1="272.344357" x2="86.420997" y2="272.344357" /> -<polygon stroke-width="0" fill="black" - points="86.420997,266.045144 83.271391,272.344357 -80.121785,266.045144" /> -<polyline points="83.271391,271.151787 83.271391,262.895538 -90.830446,262.895538" /> -<polygon stroke-width="0" fill="black" - points="80.121785,283.367979 83.271391,277.068766 -86.420997,283.367979" /> -<polyline points="83.271391,278.261336 83.271391,286.517585 -90.830446,286.517585" /> -<line stroke-dasharray="6.614173,4.724409" - x1="77.728084" y1="309.194751" x2="77.728084" y2="268.564829" /> -</g> -<g> -<polyline points="125.161155,327.462467 125.161155,318.013648 -115.712336,318.013648 -115.712336,336.911286 -125.161155,336.911286 -125.161155,327.462467" /> -<line x1="115.712336" y1="327.462467" x2="103.113911" y2="327.462467" /> -<line x1="125.161155" y1="327.462467" x2="137.75958" y2="327.462467" /> -<circle fill="white" - cx="111.302887" cy="296.281365" r="1.511811" /> -<line x1="112.814698" y1="296.281365" x2="130.200525" y2="296.281365" /> -<polygon stroke-width="0" fill="black" - points="123.901312,307.304987 127.050919,301.005774 -130.200525,307.304987" /> -<polyline points="127.050919,302.198344 127.050919,310.454593 -134.609974,310.454593" /> -<circle fill="white" - cx="111.302887" cy="272.659318" r="1.511811" /> -<line x1="112.814698" y1="272.659318" x2="130.200525" y2="272.659318" /> -<polygon stroke-width="0" fill="black" - points="123.901312,283.68294 127.050919,277.383727 -130.200525,283.68294" /> -<polyline points="127.050919,278.576297 127.050919,286.832546 -134.609974,286.832546" /> -<line stroke-dasharray="6.614173,4.724409" - x1="121.507612" y1="300.060892" x2="121.507612" y2="268.87979" /> -</g> -<g> -<polyline points="166.735958,322.423097 166.735958,312.974278 -157.287139,312.974278 -157.287139,331.871916 -166.735958,331.871916 -166.735958,322.423097" /> -<line x1="157.287139" y1="322.423097" x2="144.688714" y2="322.423097" /> -<line x1="166.735958" y1="322.423097" x2="179.334383" y2="322.423097" /> -<circle fill="white" - cx="152.87769" cy="305.415223" r="1.511811" /> -<line x1="154.389501" y1="305.415223" x2="171.775328" y2="305.415223" /> -<polygon stroke-width="0" fill="black" - points="171.775328,299.11601 168.625722,305.415223 -165.476115,299.11601" /> -<polyline points="168.625722,304.222654 168.625722,295.966404 -176.184777,295.966404" /> -<circle fill="white" - cx="152.87769" cy="286.517585" r="1.511811" /> -<line x1="154.389501" y1="286.517585" x2="171.775328" y2="286.517585" /> -<polygon stroke-width="0" fill="black" - points="171.775328,280.218373 168.625722,286.517585 -165.476115,280.218373" /> -<polyline points="168.625722,285.325016 168.625722,277.068766 -176.184777,277.068766" /> -<line stroke-dasharray="6.614173,4.724409" - x1="163.082415" y1="309.194751" x2="163.082415" y2="282.738058" /> -</g> -<g> -<polyline points="208.310761,320.060892 208.310761,310.612073 -198.861942,310.612073 -198.861942,329.509711 -208.310761,329.509711 -208.310761,320.060892" /> -<line x1="198.861942" y1="320.060892" x2="186.263517" y2="320.060892" /> -<line x1="208.310761" y1="320.060892" x2="220.909186" y2="320.060892" /> -<circle fill="white" - cx="194.452493" cy="288.87979" r="1.511811" /> -<line x1="195.964304" y1="288.87979" x2="213.350131" y2="288.87979" /> -<polygon stroke-width="0" fill="black" - points="213.350131,282.580577 210.200525,288.87979 -207.050919,282.580577" /> -<polyline points="210.200525,287.68722 210.200525,279.430971 -217.75958,279.430971" /> -<polygon stroke-width="0" fill="black" - points="207.050919,299.903412 210.200525,293.604199 -213.350131,299.903412" /> -<polyline points="210.200525,294.796769 210.200525,303.053018 -217.75958,303.053018" /> -</g> -<g> -<circle fill="white" - cx="229.350131" cy="300.533333" r="1.511811" /> -<line x1="230.861942" y1="300.533333" x2="248.247769" y2="300.533333" /> -<polygon stroke-width="0" fill="black" - points="248.247769,294.234121 245.098163,300.533333 -241.948556,294.234121" /> -<polyline points="245.098163,299.340764 245.098163,291.084514 -252.657218,291.084514" /> -<polygon stroke-width="0" fill="black" - points="241.948556,311.556955 245.098163,305.257743 -248.247769,311.556955" /> -<polyline points="245.098163,306.450312 245.098163,314.706562 -252.657218,314.706562" /> -</g> -<g> -<circle fill="white" - cx="263.365879" cy="294.990026" r="1.511811" /> -<line x1="264.87769" y1="294.990026" x2="282.263517" y2="294.990026" /> -<polygon stroke-width="0" fill="black" - points="275.964304,306.013648 279.113911,299.714436 -282.263517,306.013648" /> -<polyline points="279.113911,300.907005 279.113911,309.163255 -286.672966,309.163255" /> -</g> -<g> -<circle fill="white" - cx="297.381627" cy="308.438845" r="1.511811" /> -<line x1="298.893438" y1="308.438845" x2="316.279265" y2="308.438845" /> -<polygon stroke-width="0" fill="black" - points="316.279265,302.139633 313.129659,308.438845 -309.980052,302.139633" /> -<polyline points="313.129659,307.246276 313.129659,298.990026 -320.688714,298.990026" /> -</g> -<g> -<circle cx="76.657218" cy="362.990026" r="10.96063" /> -</g> -<g> -<line x1="107.83832" y1="370.927034" x2="107.83832" y2="355.808924" /> -<line x1="98.389501" y1="363.367979" x2="107.83832" y2="363.367979" /> -<line x1="122.95643" y1="374.706562" x2="107.83832" y2="367.903412" /> -<polygon stroke-width="0" fill="black" - points="114.294174,368.506004 119.176903,373.005774 -112.570857,372.335596" /> -<line x1="117.638903" y1="372.313675" x2="111.617848" y2="369.604199" /> -<line x1="122.95643" y1="352.029396" x2="107.83832" y2="358.832546" /> -</g> -<g> -<line x1="151.302887" y1="370.927034" x2="151.302887" y2="355.808924" /> -<line x1="160.751706" y1="363.367979" x2="151.302887" y2="363.367979" /> -<line x1="136.184777" y1="374.706562" x2="151.302887" y2="367.903412" /> -<polygon stroke-width="0" fill="black" - points="146.57035,372.335596 139.964304,373.005774 -144.847034,368.506004" /> -<line x1="141.502304" y1="372.313675" x2="147.52336" y2="369.604199" /> -<line x1="136.184777" y1="352.029396" x2="151.302887" y2="358.832546" /> -</g> -<g> -<line x1="183.428871" y1="370.927034" x2="183.428871" y2="355.808924" /> -<line x1="173.980052" y1="363.367979" x2="183.428871" y2="363.367979" /> -<line x1="198.546982" y1="374.706562" x2="183.428871" y2="367.903412" /> -<polygon stroke-width="0" fill="black" - points="192.091128,374.10397 187.208399,369.604199 -193.814444,370.274378" /> -<line x1="194.767454" y1="373.005774" x2="188.746398" y2="370.296299" /> -<line x1="198.546982" y1="352.029396" x2="183.428871" y2="358.832546" /> -</g> -<g> -<line x1="226.893438" y1="370.927034" x2="226.893438" y2="355.808924" /> -<line x1="236.342257" y1="363.367979" x2="226.893438" y2="363.367979" /> -<line x1="211.775328" y1="374.706562" x2="226.893438" y2="367.903412" /> -<polygon stroke-width="0" fill="black" - points="216.507865,370.274378 223.113911,369.604199 -218.231181,374.10397" /> -<line x1="215.554856" y1="373.005774" x2="221.575911" y2="370.296299" /> -<line x1="211.775328" y1="352.029396" x2="226.893438" y2="358.832546" /> -</g> -<g> -<line x1="275.082415" y1="355.703937" x2="261.854068" y2="355.703937" /> -<line x1="261.854068" y1="372.711811" x2="261.854068" y2="353.814173" /> -<polygon stroke-width="0" fill="black" - points="255.554856,368.72231 261.854068,370.822047 -255.554856,372.921785" /> -<line x1="248.625722" y1="370.822047" x2="260.16752" y2="370.822047" /> -<line x1="275.082415" y1="370.822047" x2="261.854068" y2="370.822047" /> -</g> -<g> -<line x1="286.420997" y1="355.703937" x2="299.649344" y2="355.703937" /> -<line x1="299.649344" y1="372.711811" x2="299.649344" y2="353.814173" /> -<polygon stroke-width="0" fill="black" - points="305.948556,372.921785 299.649344,370.822047 -305.948556,368.72231" /> -<line x1="312.87769" y1="370.822047" x2="301.335892" y2="370.822047" /> -<line x1="286.420997" y1="370.822047" x2="299.649344" y2="370.822047" /> -</g> -<g> -<line x1="350.672966" y1="355.703937" x2="337.444619" y2="355.703937" /> -<line x1="337.444619" y1="372.711811" x2="337.444619" y2="353.814173" /> -<line x1="337.444619" y1="370.822047" x2="324.216273" y2="370.822047" /> -<polygon stroke-width="0" fill="black" - points="332.405249,372.921785 326.106037,370.822047 -332.405249,368.72231" /> -<line x1="332.405249" y1="370.822047" x2="327.792585" y2="370.822047" /> -<line x1="350.672966" y1="370.822047" x2="337.444619" y2="370.822047" /> -</g> -<g> -<line x1="362.011549" y1="355.703937" x2="375.239895" y2="355.703937" /> -<line x1="375.239895" y1="372.711811" x2="375.239895" y2="353.814173" /> -<line x1="375.239895" y1="370.822047" x2="388.468241" y2="370.822047" /> -<polygon stroke-width="0" fill="black" - points="380.279265,368.72231 386.578478,370.822047 -380.279265,372.921785" /> -<line x1="380.279265" y1="370.822047" x2="384.89193" y2="370.822047" /> -<line x1="362.011549" y1="370.822047" x2="375.239895" y2="370.822047" /> -</g> -<g> -<line x1="426.263517" y1="363.367979" x2="413.035171" y2="363.367979" /> -<polygon stroke-width="0" fill="black" - points="422.79895,365.467717 416.499738,363.367979 -422.79895,361.268241" /> -<line x1="422.79895" y1="363.367979" x2="418.186286" y2="363.367979" /> -<line x1="426.263517" y1="355.808924" x2="413.035171" y2="355.808924" /> -<line x1="413.035171" y1="372.816798" x2="413.035171" y2="367.147507" /> -<line x1="413.035171" y1="365.257743" x2="413.035171" y2="361.478215" /> -<line x1="413.035171" y1="359.588451" x2="413.035171" y2="353.91916" /> -<polyline points="409.255643,355.808924 409.255643,370.927034 -399.806824,370.927034" /> -<polyline points="425.200835,363.367979 426.263517,363.367979 -426.263517,370.927034 -425.200835,370.927034" /> -<line x1="426.263517" y1="370.927034" x2="413.035171" y2="370.927034" /> -</g> -<g> -<line x1="437.6021" y1="363.367979" x2="450.830446" y2="363.367979" /> -<polygon stroke-width="0" fill="black" - points="441.066667,361.268241 447.365879,363.367979 -441.066667,365.467717" /> -<line x1="441.066667" y1="363.367979" x2="445.679331" y2="363.367979" /> -<line x1="437.6021" y1="355.808924" x2="450.830446" y2="355.808924" /> -<line x1="450.830446" y1="372.816798" x2="450.830446" y2="367.147507" /> -<line x1="450.830446" y1="365.257743" x2="450.830446" y2="361.478215" /> -<line x1="450.830446" y1="359.588451" x2="450.830446" y2="353.91916" /> -<polyline points="454.609974,355.808924 454.609974,370.927034 -464.058793,370.927034" /> -<polyline points="438.664781,363.367979 437.6021,363.367979 -437.6021,370.927034 -438.664781,370.927034" /> -<line x1="437.6021" y1="370.927034" x2="450.830446" y2="370.927034" /> -</g> -<g> -<line x1="501.854068" y1="363.367979" x2="488.625722" y2="363.367979" /> -<polygon stroke-width="0" fill="black" - points="492.090289,361.268241 498.389501,363.367979 -492.090289,365.467717" /> -<line x1="496.702953" y1="363.367979" x2="492.090289" y2="363.367979" /> -<line x1="501.854068" y1="355.808924" x2="488.625722" y2="355.808924" /> -<line x1="488.625722" y1="372.816798" x2="488.625722" y2="367.147507" /> -<line x1="488.625722" y1="365.257743" x2="488.625722" y2="361.478215" /> -<line x1="488.625722" y1="359.588451" x2="488.625722" y2="353.91916" /> -<polyline points="484.846194,355.808924 484.846194,370.927034 -475.397375,370.927034" /> -<polyline points="500.791387,363.367979 501.854068,363.367979 -501.854068,370.927034 -500.791387,370.927034" /> -<line x1="501.854068" y1="370.927034" x2="488.625722" y2="370.927034" /> -</g> -<g> -<line x1="513.192651" y1="363.367979" x2="526.420997" y2="363.367979" /> -<polygon stroke-width="0" fill="black" - points="522.95643,365.467717 516.657218,363.367979 -522.95643,361.268241" /> -<line x1="518.343766" y1="363.367979" x2="522.95643" y2="363.367979" /> -<line x1="513.192651" y1="355.808924" x2="526.420997" y2="355.808924" /> -<line x1="526.420997" y1="372.816798" x2="526.420997" y2="367.147507" /> -<line x1="526.420997" y1="365.257743" x2="526.420997" y2="361.478215" /> -<line x1="526.420997" y1="359.588451" x2="526.420997" y2="353.91916" /> -<polyline points="530.200525,355.808924 530.200525,370.927034 -539.649344,370.927034" /> -<polyline points="514.255333,363.367979 513.192651,363.367979 -513.192651,370.927034 -514.255333,370.927034" /> -<line x1="513.192651" y1="370.927034" x2="526.420997" y2="370.927034" /> -</g> -<g> -<line x1="577.444619" y1="363.367979" x2="564.216273" y2="363.367979" /> -<polygon stroke-width="0" fill="black" - points="573.980052,365.467717 567.68084,363.367979 -573.980052,361.268241" /> -<line x1="573.980052" y1="363.367979" x2="569.367388" y2="363.367979" /> -<line x1="577.444619" y1="355.808924" x2="564.216273" y2="355.808924" /> -<line x1="564.216273" y1="372.816798" x2="564.216273" y2="353.91916" /> -<polyline points="560.436745,355.808924 560.436745,370.927034 -550.987927,370.927034" /> -<polyline points="576.381938,363.367979 577.444619,363.367979 -577.444619,370.927034 -576.381938,370.927034" /> -<line x1="577.444619" y1="370.927034" x2="564.216273" y2="370.927034" /> -</g> -<g> -<line x1="588.783202" y1="363.367979" x2="602.011549" y2="363.367979" /> -<polygon stroke-width="0" fill="black" - points="592.247769,361.268241 598.546982,363.367979 -592.247769,365.467717" /> -<line x1="592.247769" y1="363.367979" x2="596.860434" y2="363.367979" /> -<line x1="588.783202" y1="355.808924" x2="602.011549" y2="355.808924" /> -<line x1="602.011549" y1="372.816798" x2="602.011549" y2="353.91916" /> -<polyline points="605.791076,355.808924 605.791076,370.927034 -615.239895,370.927034" /> -<polyline points="589.845884,363.367979 588.783202,363.367979 -588.783202,370.927034 -589.845884,370.927034" /> -<line x1="588.783202" y1="370.927034" x2="602.011549" y2="370.927034" /> -</g> -<g> -<line x1="653.035171" y1="363.367979" x2="639.806824" y2="363.367979" /> -<polygon stroke-width="0" fill="black" - points="643.271391,361.268241 649.570604,363.367979 -643.271391,365.467717" /> -<line x1="647.884056" y1="363.367979" x2="643.271391" y2="363.367979" /> -<line x1="653.035171" y1="355.808924" x2="639.806824" y2="355.808924" /> -<line x1="639.806824" y1="372.816798" x2="639.806824" y2="353.91916" /> -<polyline points="636.027297,355.808924 636.027297,370.927034 -626.578478,370.927034" /> -<polyline points="651.972489,363.367979 653.035171,363.367979 -653.035171,370.927034 -651.972489,370.927034" /> -<line x1="653.035171" y1="370.927034" x2="639.806824" y2="370.927034" /> -</g> -<g> -<line x1="664.373753" y1="363.367979" x2="677.6021" y2="363.367979" /> -<polygon stroke-width="0" fill="black" - points="674.137533,365.467717 667.83832,363.367979 -674.137533,361.268241" /> -<line x1="669.524868" y1="363.367979" x2="674.137533" y2="363.367979" /> -<line x1="664.373753" y1="355.808924" x2="677.6021" y2="355.808924" /> -<line x1="677.6021" y1="372.816798" x2="677.6021" y2="353.91916" /> -<polyline points="681.381627,355.808924 681.381627,370.927034 -690.830446,370.927034" /> -<polyline points="665.436435,363.367979 664.373753,363.367979 -664.373753,370.927034 -665.436435,370.927034" /> -<line x1="664.373753" y1="370.927034" x2="677.6021" y2="370.927034" /> -</g> -<g> -<line x1="73.822572" y1="397.383727" x2="73.822572" y2="382.265617" /> -<line x1="88.940682" y1="401.163255" x2="73.822572" y2="394.360105" /> -<polygon stroke-width="0" fill="black" - points="80.278426,394.962697 85.161155,399.462467 -78.555109,398.792289" /> -<line x1="83.623155" y1="398.770367" x2="77.6021" y2="396.060892" /> -<line x1="88.940682" y1="378.486089" x2="73.822572" y2="385.289239" /> -<line x1="64.373753" y1="389.824672" x2="71.176903" y2="389.824672" /> -<line x1="71.176903" y1="397.383727" x2="71.176903" y2="382.265617" /> -</g> -<g> -<line x1="127.68084" y1="397.383727" x2="114.452493" y2="397.383727" /> -<line x1="114.452493" y1="399.273491" x2="114.452493" y2="380.375853" /> -<line x1="114.452493" y1="382.265617" x2="127.68084" y2="382.265617" /> -<line x1="101.224147" y1="382.265617" x2="114.452493" y2="389.824672" /> -<polygon stroke-width="0" fill="black" - points="108.371464,383.931423 112.79895,388.87979 -106.28794,387.577588" /> -<line x1="101.224147" y1="382.265617" x2="111.334616" y2="388.043028" /> -</g> -<g> -<line x1="165.476115" y1="397.383727" x2="152.247769" y2="397.383727" /> -<line x1="152.247769" y1="399.273491" x2="152.247769" y2="380.375853" /> -<line x1="152.247769" y1="382.265617" x2="165.476115" y2="382.265617" /> -<line x1="139.019423" y1="382.265617" x2="152.247769" y2="389.824672" /> -<polygon stroke-width="0" fill="black" - points="145.100452,388.158866 140.672966,383.210499 -147.183976,384.512701" /> -<line x1="152.247769" y1="389.824672" x2="142.1373" y2="384.047261" /> -</g> -<g> -<line x1="181.891072" y1="376.596325" x2="181.891072" y2="387.097033" /> -<polyline stroke-width="0" fill="black" - points="181.891072,387.097033 -185.040678,387.097033 -181.891072,392.02097 -178.741466,387.097033 -181.891072,387.097033" /> -<polyline points="181.891072,387.097033 185.040678,387.097033 -181.891072,392.02097 -178.741466,387.097033 -181.891072,387.097033" /> -<line x1="178.352497" y1="392.552311" x2="185.429647" y2="392.552311" /> -<line x1="183.465875" y1="392.552311" x2="186.615482" y2="398.007589" /> -<line x1="181.891072" y1="392.552311" x2="181.891072" y2="403.053018" /> -</g> -<g> -<line x1="205.161155" y1="376.596325" x2="205.161155" y2="387.097033" /> -<line x1="205.161155" y1="387.097033" x2="209.885564" y2="395.27995" /> -<polyline stroke-width="0" fill="black" - points="208.310761,387.097033 -211.460367,387.097033 -208.310761,392.02097 -205.161155,387.097033 -208.310761,387.097033" /> -<polyline points="208.310761,387.097033 211.460367,387.097033 -208.310761,392.02097 -205.161155,387.097033 -208.310761,387.097033" /> -<line x1="198.472974" y1="392.552311" x2="211.849336" y2="392.552311" /> -<line x1="198.472974" y1="387.097033" x2="211.849336" y2="387.097033" /> -<polyline stroke-width="0" fill="black" - points="202.011549,392.552311 -205.161155,392.552311 -202.011549,387.628374 -198.861942,392.552311 -202.011549,392.552311" /> -<polyline points="202.011549,392.552311 205.161155,392.552311 -202.011549,387.628374 -198.861942,392.552311 -202.011549,392.552311" /> -<line x1="205.161155" y1="392.552311" x2="205.161155" y2="403.053018" /> -</g> -<g> -<line x1="227.83832" y1="376.596325" x2="227.83832" y2="387.097033" /> -<line x1="227.83832" y1="387.097033" x2="232.56273" y2="395.27995" /> -<polyline stroke-width="0" fill="black" - points="230.987927,387.097033 -234.137533,387.097033 -230.987927,392.02097 -227.83832,387.097033 -230.987927,387.097033" /> -<polyline points="230.987927,387.097033 234.137533,387.097033 -230.987927,392.02097 -227.83832,387.097033 -230.987927,387.097033" /> -<line x1="221.150139" y1="392.552311" x2="234.526501" y2="392.552311" /> -<line x1="221.150139" y1="387.097033" x2="234.526501" y2="387.097033" /> -<polyline stroke-width="0" fill="black" - points="224.688714,392.552311 -227.83832,392.552311 -224.688714,387.628374 -221.539108,392.552311 -224.688714,392.552311" /> -<polyline points="224.688714,392.552311 227.83832,392.552311 -224.688714,387.628374 -221.539108,392.552311 -224.688714,392.552311" /> -<line x1="227.83832" y1="392.552311" x2="227.83832" y2="403.053018" /> -</g> -<g> -<line x1="249.922568" y1="376.596325" x2="249.922568" y2="387.097033" /> -<polyline points="249.922568,387.097033 253.072175,387.097033 -249.922568,392.02097 -246.772962,387.097033 -249.922568,387.097033" /> -<line x1="246.383993" y1="392.552311" x2="253.461143" y2="392.552311" /> -<line x1="251.497371" y1="392.552311" x2="254.646978" y2="398.007589" /> -<line x1="249.922568" y1="392.552311" x2="249.922568" y2="403.053018" /> -</g> -<g> -<line x1="272.599734" y1="376.596325" x2="272.599734" y2="387.097033" /> -<polyline stroke-width="0" fill="black" - points="272.599734,387.097033 -275.74934,387.097033 -272.599734,392.02097 -269.450127,387.097033 -272.599734,387.097033" /> -<polyline points="272.599734,387.097033 275.74934,387.097033 -272.599734,392.02097 -269.450127,387.097033 -272.599734,387.097033" /> -<line x1="269.061159" y1="392.552311" x2="276.138308" y2="392.552311" /> -<line x1="274.174537" y1="392.552311" x2="277.324143" y2="398.007589" /> -<line x1="272.599734" y1="392.552311" x2="272.599734" y2="403.053018" /> -</g> -<g> -<line x1="316.657218" y1="382.16063" x2="303.428871" y2="382.16063" /> -<line x1="303.428871" y1="399.168504" x2="303.428871" y2="380.270866" /> -<polygon stroke-width="0" fill="black" - points="297.129659,395.179003 303.428871,397.27874 -297.129659,399.378478" /> -<line x1="290.200525" y1="397.27874" x2="301.742323" y2="397.27874" /> -<line x1="316.657218" y1="397.27874" x2="303.428871" y2="397.27874" /> -</g> -<g> -<line x1="354.452493" y1="389.824672" x2="341.224147" y2="389.824672" /> -<polygon stroke-width="0" fill="black" - points="350.987927,391.924409 344.688714,389.824672 -350.987927,387.724934" /> -<line x1="350.987927" y1="389.824672" x2="346.375262" y2="389.824672" /> -<line x1="354.452493" y1="382.265617" x2="341.224147" y2="382.265617" /> -<line x1="341.224147" y1="399.273491" x2="341.224147" y2="393.604199" /> -<line x1="341.224147" y1="391.714436" x2="341.224147" y2="387.934908" /> -<line x1="341.224147" y1="386.045144" x2="341.224147" y2="380.375853" /> -<polyline points="337.444619,382.265617 337.444619,397.383727 -327.995801,397.383727" /> -<polyline points="353.389812,389.824672 354.452493,389.824672 -354.452493,397.383727 -353.389812,397.383727" /> -<line x1="354.452493" y1="397.383727" x2="341.224147" y2="397.383727" /> -</g> -<g> -<line x1="393.192651" y1="382.16063" x2="379.964304" y2="382.16063" /> -<line x1="379.964304" y1="399.168504" x2="379.964304" y2="380.270866" /> -<line x1="393.192651" y1="397.27874" x2="379.964304" y2="397.27874" /> -<polygon stroke-width="0" fill="black" - points="383.428871,395.179003 389.728084,397.27874 -383.428871,399.378478" /> -<line x1="388.041536" y1="397.27874" x2="383.428871" y2="397.27874" /> -<line x1="376.184777" y1="397.27874" x2="376.184777" y2="382.16063" /> -<line x1="376.184777" y1="389.719685" x2="364.846194" y2="389.719685" /> -</g> -<g> -<line x1="430.043045" y1="389.824672" x2="416.814698" y2="389.824672" /> -<polygon stroke-width="0" fill="black" - points="420.279265,387.724934 426.578478,389.824672 -420.279265,391.924409" /> -<line x1="424.89193" y1="389.824672" x2="420.279265" y2="389.824672" /> -<line x1="430.043045" y1="382.265617" x2="416.814698" y2="382.265617" /> -<line x1="416.814698" y1="399.273491" x2="416.814698" y2="393.604199" /> -<line x1="416.814698" y1="391.714436" x2="416.814698" y2="387.934908" /> -<line x1="416.814698" y1="386.045144" x2="416.814698" y2="380.375853" /> -<polyline points="413.035171,382.265617 413.035171,397.383727 -403.586352,397.383727" /> -<polyline points="428.980363,389.824672 430.043045,389.824672 -430.043045,397.383727 -428.980363,397.383727" /> -<line x1="430.043045" y1="397.383727" x2="416.814698" y2="397.383727" /> -</g> -<g> -<line x1="468.783202" y1="382.16063" x2="455.554856" y2="382.16063" /> -<line x1="455.554856" y1="399.168504" x2="455.554856" y2="380.270866" /> -<line x1="468.783202" y1="397.27874" x2="455.554856" y2="397.27874" /> -<polygon stroke-width="0" fill="black" - points="465.318635,399.378478 459.019423,397.27874 -465.318635,395.179003" /> -<line x1="465.318635" y1="397.27874" x2="460.705971" y2="397.27874" /> -<line x1="451.775328" y1="397.27874" x2="451.775328" y2="382.16063" /> -<line x1="451.775328" y1="389.719685" x2="440.436745" y2="389.719685" /> -</g> -<g> -<line x1="505.633596" y1="389.824672" x2="492.405249" y2="389.824672" /> -<polygon stroke-width="0" fill="black" - points="502.169029,391.924409 495.869816,389.824672 -502.169029,387.724934" /> -<line x1="502.169029" y1="389.824672" x2="497.556364" y2="389.824672" /> -<line x1="505.633596" y1="382.265617" x2="492.405249" y2="382.265617" /> -<line x1="492.405249" y1="399.273491" x2="492.405249" y2="380.375853" /> -<polyline points="488.625722,382.265617 488.625722,397.383727 -479.176903,397.383727" /> -<polyline points="504.570914,389.824672 505.633596,389.824672 -505.633596,397.383727 -504.570914,397.383727" /> -<line x1="505.633596" y1="397.383727" x2="492.405249" y2="397.383727" /> -</g> -<g> -<line x1="544.373753" y1="382.16063" x2="531.145407" y2="382.16063" /> -<line x1="531.145407" y1="399.168504" x2="531.145407" y2="380.270866" /> -<line stroke-width="2.133333" - x1="532.739429" y1="397.27874" x2="532.739429" y2="382.16063" /> -<line x1="544.373753" y1="397.27874" x2="531.145407" y2="397.27874" /> -<polygon stroke-width="0" fill="black" - points="534.609974,395.179003 540.909186,397.27874 -534.609974,399.378478" /> -<line x1="539.222638" y1="397.27874" x2="534.609974" y2="397.27874" /> -<line x1="527.365879" y1="397.27874" x2="527.365879" y2="382.16063" /> -<line x1="527.365879" y1="389.719685" x2="516.027297" y2="389.719685" /> -</g> -<g> -<line x1="581.224147" y1="389.824672" x2="567.995801" y2="389.824672" /> -<polygon stroke-width="0" fill="black" - points="571.460367,387.724934 577.75958,389.824672 -571.460367,391.924409" /> -<line x1="576.073032" y1="389.824672" x2="571.460367" y2="389.824672" /> -<line x1="581.224147" y1="382.265617" x2="567.995801" y2="382.265617" /> -<line x1="567.995801" y1="399.273491" x2="567.995801" y2="380.375853" /> -<polyline points="564.216273,382.265617 564.216273,397.383727 -554.767454,397.383727" /> -<polyline points="580.161465,389.824672 581.224147,389.824672 -581.224147,397.383727 -580.161465,397.383727" /> -<line x1="581.224147" y1="397.383727" x2="567.995801" y2="397.383727" /> -</g> -<g> -<line x1="619.964304" y1="382.16063" x2="606.735958" y2="382.16063" /> -<line x1="606.735958" y1="399.168504" x2="606.735958" y2="380.270866" /> -<line stroke-width="2.133333" - x1="608.32998" y1="397.27874" x2="608.32998" y2="382.16063" /> -<line x1="619.964304" y1="397.27874" x2="606.735958" y2="397.27874" /> -<polygon stroke-width="0" fill="black" - points="616.499738,399.378478 610.200525,397.27874 -616.499738,395.179003" /> -<line x1="616.499738" y1="397.27874" x2="611.887073" y2="397.27874" /> -<line x1="602.95643" y1="397.27874" x2="602.95643" y2="382.16063" /> -<line x1="602.95643" y1="389.719685" x2="591.617848" y2="389.719685" /> -</g> -<g> -<line x1="656.814698" y1="382.16063" x2="643.586352" y2="382.16063" /> -<line x1="643.586352" y1="399.168504" x2="643.586352" y2="380.270866" /> -<polygon stroke-width="0" fill="black" - points="637.287139,395.179003 643.586352,397.27874 -637.287139,399.378478" /> -<line x1="630.358005" y1="397.27874" x2="641.899804" y2="397.27874" /> -<line x1="656.814698" y1="397.27874" x2="643.586352" y2="397.27874" /> -</g> -<g> -<line x1="694.609974" y1="382.16063" x2="681.381627" y2="382.16063" /> -<line x1="681.381627" y1="399.168504" x2="681.381627" y2="380.270866" /> -<line x1="681.381627" y1="397.27874" x2="668.153281" y2="397.27874" /> -<polygon stroke-width="0" fill="black" - points="676.342257,399.378478 670.043045,397.27874 -676.342257,395.179003" /> -<line x1="676.342257" y1="397.27874" x2="671.729593" y2="397.27874" /> -<line x1="694.609974" y1="397.27874" x2="681.381627" y2="397.27874" /> -</g> -<g> -<line x1="733.350131" y1="382.265617" x2="720.121785" y2="382.265617" /> -<line x1="720.121785" y1="399.273491" x2="720.121785" y2="380.375853" /> -<line x1="720.121785" y1="389.824672" x2="705.003675" y2="389.824672" /> -<polygon stroke-width="0" fill="black" - points="715.082415,391.924409 708.783202,389.824672 -715.082415,387.724934" /> -<line x1="715.082415" y1="389.824672" x2="710.46975" y2="389.824672" /> -<line x1="733.350131" y1="397.383727" x2="720.121785" y2="397.383727" /> -</g> -<g> -<line x1="57.75958" y1="421.424712" x2="71.20194" y2="421.424712" /> -<polyline points="71.20194,421.424712 71.20194,418.275106 -76.125877,421.424712 -71.20194,424.574318 -71.20194,421.424712" /> -<polyline points="82.112496,421.424712 82.112496,418.275106 -77.188559,421.424712 -82.112496,424.574318 -82.112496,421.424712" /> -<line x1="82.112496" y1="421.424712" x2="95.554856" y2="421.424712" /> -<circle stroke-width="1.874452" - cx="76.657218" cy="419.606286" r="1.36382" /> -<line x1="76.657218" y1="418.242466" x2="76.657218" y2="413.241795" /> -<line x1="76.657218" y1="421.424712" x2="76.657218" y2="426.87999" /> -</g> -<g> -<line x1="103.113911" y1="416.281365" x2="112.56273" y2="416.281365" /> -<polyline points="131.460367,416.281365 131.460367,412.501837 -112.56273,412.501837 -112.56273,420.060892 -131.460367,420.060892 -131.460367,416.281365" /> -<line x1="131.460367" y1="416.281365" x2="140.909186" y2="416.281365" /> -<line x1="122.011549" y1="420.060892" x2="122.011549" y2="427.619948" /> -</g> -<g> -<line x1="148.468241" y1="421.635696" x2="161.066667" y2="421.635696" /> -<polyline points="161.066667,421.635696 173.665092,415.336483 -173.665092,427.934908 -161.066667,421.635696" /> -<polyline points="173.665092,421.635696 161.066667,415.336483 -161.066667,427.934908 -173.665092,421.635696" /> -<circle stroke-width="1.874452" - cx="167.365879" cy="416.386352" r="1.574803" /> -<line x1="167.365879" y1="414.811549" x2="167.365879" y2="409.03727" /> -<line x1="167.365879" y1="424.785302" x2="167.365879" y2="431.084514" /> -<line x1="173.665092" y1="421.635696" x2="186.263517" y2="421.635696" /> -</g> -<g> -<polyline points="80.436745,484.312861 50.200525,484.312861 -50.200525,438.95853 -80.436745,438.95853" /> -<path d="M 80.436745,438.95853 - A 22.677165 22.677165 0 0 1 80.436745,484.312861" /> -</g> -<g> -<line x1="128.844094" y1="439.062628" x2="110.672966" y2="439.062628" /> -<path d="M 111.106986,438.854432 - A 52.913386 52.913386 0 0 1 111.206299,484.416959" /> -<line x1="110.672966" y1="484.416959" x2="128.844094" y2="484.416959" /> -<path d="M 128.844094,439.062628 - A 38.775153 38.775153 0 0 1 164.119685,461.739794" /> -<path d="M 128.844094,484.416959 - A 38.775153 38.775153 0 0 0 164.119685,461.739794" /> -</g> -<g> -<polyline points="201.381627,484.312861 171.145407,484.312861 -171.145407,438.95853 -201.381627,438.95853" /> -<path d="M 201.381627,438.95853 - A 22.677165 22.677165 0 0 1 201.381627,484.312861" /> -<circle cx="227.83832" cy="461.635696" r="3.779528" /> -</g> -<g> -<line x1="257.348031" y1="439.062628" x2="239.176903" y2="439.062628" /> -<path d="M 239.610923,438.854432 - A 52.913386 52.913386 0 0 1 239.710236,484.416959" /> -<line x1="239.176903" y1="484.416959" x2="257.348031" y2="484.416959" /> -<path d="M 257.348031,439.062628 - A 38.775153 38.775153 0 0 1 292.623622,461.739794" /> -<path d="M 257.348031,484.416959 - A 38.775153 38.775153 0 0 0 292.623622,461.739794" /> -<circle cx="296.40315" cy="461.739794" r="3.779528" /> -</g> -<g> -<path d="M 307.208399,439.062628 - A 52.913386 52.913386 0 0 1 307.208399,484.416959" /> -<line x1="332.405249" y1="439.062628" x2="314.234121" y2="439.062628" /> -<path d="M 314.668141,438.854432 - A 52.913386 52.913386 0 0 1 314.767454,484.416959" /> -<line x1="314.234121" y1="484.416959" x2="332.405249" y2="484.416959" /> -<path d="M 332.405249,439.062628 - A 38.775153 38.775153 0 0 1 367.68084,461.739794" /> -<path d="M 332.405249,484.416959 - A 38.775153 38.775153 0 0 0 367.68084,461.739794" /> -</g> -<g> -<path d="M 375.239895,439.062628 - A 52.913386 52.913386 0 0 1 375.239895,484.416959" /> -<line x1="400.436745" y1="439.062628" x2="382.265617" y2="439.062628" /> -<path d="M 382.699637,438.854432 - A 52.913386 52.913386 0 0 1 382.79895,484.416959" /> -<line x1="382.265617" y1="484.416959" x2="400.436745" y2="484.416959" /> -<path d="M 400.436745,439.062628 - A 38.775153 38.775153 0 0 1 435.712336,461.739794" /> -<path d="M 400.436745,484.416959 - A 38.775153 38.775153 0 0 0 435.712336,461.739794" /> -<circle cx="439.491864" cy="461.739794" r="3.779528" /> -</g> -<g> -<polyline points="477.287139,461.635696 450.830446,476.753806 -450.830446,446.517585 -477.287139,461.635696" /> -</g> -<g> -<polyline points="511.302887,461.635696 484.846194,476.753806 -484.846194,446.517585 -511.302887,461.635696" /> -<circle cx="515.082415" cy="461.635696" r="3.779528" /> -</g> -<g> -<line x1="526.420997" y1="461.635696" x2="531.526721" y2="461.635696" /> -<line x1="526.420997" y1="446.517585" x2="529.321018" y2="446.517585" /> -<line x1="526.420997" y1="476.753806" x2="529.321018" y2="476.753806" /> -<line x1="526.420997" y1="454.07664" x2="530.984005" y2="454.07664" /> -<line x1="526.420997" y1="469.194751" x2="530.984005" y2="469.194751" /> -</g> -<g> -<line x1="537.75958" y1="461.635696" x2="542.865304" y2="461.635696" /> -<line x1="537.75958" y1="446.517585" x2="540.659601" y2="446.517585" /> -<line x1="537.75958" y1="476.753806" x2="540.659601" y2="476.753806" /> -</g> -<g> -<line x1="549.098163" y1="446.517585" x2="551.998184" y2="446.517585" /> -<line x1="549.098163" y1="476.753806" x2="551.998184" y2="476.753806" /> -</g> -<g> -<line x1="560.436745" y1="461.635696" x2="565.542469" y2="461.635696" /> -</g> -<g> -<polyline points="76.657218,501.950656 94.474082,489.352231 -94.474082,539.745932 -76.657218,527.147507" /> -<polyline points="76.657218,514.549081 76.657218,501.950656 -58.840354,501.950656 -58.840354,527.147507 -76.657218,527.147507 -76.657218,514.549081" /> -</g> -<g> -<polyline points="120.930775,508.249869 129.839206,503.525459 -129.839206,525.572703 -120.930775,520.848294" /> -<polyline points="120.930775,514.549081 120.930775,501.950656 -103.113911,501.950656 -103.113911,527.147507 -120.930775,527.147507 -120.930775,514.549081" /> -</g> -<g> -<polyline points="156.027297,514.549081 156.027297,505.100262 -137.129659,505.100262 -137.129659,523.9979 -156.027297,523.9979 -156.027297,514.549081" /> -<circle cx="165.476115" cy="514.549081" r="9.448819" /> -</g> -<g> -<line x1="201.381627" y1="523.9979" x2="201.381627" y2="505.100262" /> -<circle cx="191.932808" cy="514.549081" r="9.448819" /> -</g> -<g> -<polyline points="227.83832,514.549081 227.83832,505.100262 -208.940682,505.100262 -208.940682,523.9979 -227.83832,523.9979 -227.83832,514.549081" /> -<line x1="227.83832" y1="505.100262" x2="232.729389" y2="523.353979" /> -</g> -<g> -<line x1="251.775328" y1="527.147507" x2="251.775328" y2="501.950656" /> -<path d="M 251.775328,501.950656 - A 12.598425 12.598425 0 0 0 251.775328,527.147507" /> -</g> -<g> -<polyline points="270.672966,514.549081 270.672966,505.100262 -258.074541,505.100262 -258.074541,523.9979 -270.672966,523.9979 -270.672966,514.549081" /> -<line stroke-width="2.133333" - x1="271.735647" y1="527.147507" x2="271.735647" y2="501.950656" /> -</g> -<g> -<circle cx="288.310761" cy="520.218373" r="7.559055" /> -<circle cx="326.106037" cy="520.218373" r="7.559055" /> -<path d="M 289.822572,512.812042 - A 18.897638 18.897638 0 0 1 324.594226,512.812042" /> -</g> -<g> -<rect x="352.184777" y="491.871916" width="75.590551" height="45.354331" /> -<line x1="352.184777" y1="503.210499" x2="342.735958" y2="503.210499" /> -<circle fill="black" - cx="342.735958" cy="503.210499" r="1.511811" /> -<line x1="352.184777" y1="525.887664" x2="342.735958" y2="525.887664" /> -<circle fill="black" - cx="342.735958" cy="525.887664" r="1.511811" /> -<line x1="427.775328" y1="503.210499" x2="437.224147" y2="503.210499" /> -<circle fill="black" - cx="437.224147" cy="503.210499" r="1.511811" /> -<line x1="427.775328" y1="525.887664" x2="437.224147" y2="525.887664" /> -<circle fill="black" - cx="437.224147" cy="525.887664" r="1.511811" /> -</g> -<g> -<rect x="458.011549" y="496.470341" width="37.795276" height="25.19685" /> -<line x1="458.011549" y1="509.068766" x2="448.56273" y2="509.068766" /> -<circle fill="black" - cx="448.56273" cy="509.068766" r="1.511811" /> -<line x1="495.806824" y1="509.068766" x2="505.255643" y2="509.068766" /> -<circle fill="black" - cx="505.255643" cy="509.068766" r="1.511811" /> -<line x1="476.909186" y1="521.667192" x2="476.909186" y2="531.11601" /> -<circle fill="black" - cx="476.909186" cy="531.11601" r="1.511811" /> -</g> -<g> -<rect x="31.302887" y="544.785302" width="90.708661" height="136.062992" /> -<text font-size="11.977376pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="35.082415" y="584.470341"><tspan font-size="75%">D</tspan></text> -<line x1="31.302887" y1="578.80105" x2="1.066667" y2="578.80105" /> -<polyline points="31.302887,650.612073 37.849221,646.832546 -31.302887,643.053018" /> -<text font-size="11.977376pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="41.628748" y="652.501837"><tspan font-size="75%">CK</tspan></text> -<line x1="31.302887" y1="646.832546" x2="1.066667" y2="646.832546" /> -<text font-size="11.977376pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="118.232021" y="584.470341"><tspan font-size="75%">Q</tspan></text> -<line x1="122.011549" y1="578.80105" x2="152.247769" y2="578.80105" /> -<text font-size="11.977376pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="118.232021" y="652.501837" -><tspan font-size="75%"><tspan text-decoration="overline">Q</tspan></tspan></text> -<line x1="122.011549" y1="646.832546" x2="152.247769" y2="646.832546" /> -</g> -<g> -<rect x="190.043045" y="544.785302" width="90.708661" height="136.062992" /> -<text font-size="11.977376pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="193.822572" y="584.470341"><tspan font-size="75%">T</tspan></text> -<line x1="190.043045" y1="578.80105" x2="159.806824" y2="578.80105" /> -<polyline points="190.043045,650.612073 196.589378,646.832546 -190.043045,643.053018" /> -<text font-size="11.977376pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="200.368906" y="652.501837"><tspan font-size="75%">CK</tspan></text> -<line x1="190.043045" y1="646.832546" x2="159.806824" y2="646.832546" /> -<text font-size="11.977376pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="276.972178" y="584.470341"><tspan font-size="75%">Q</tspan></text> -<line x1="280.751706" y1="578.80105" x2="310.987927" y2="578.80105" /> -<text font-size="11.977376pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="276.972178" y="652.501837" -><tspan font-size="75%"><tspan text-decoration="overline">Q</tspan></tspan></text> -<line x1="280.751706" y1="646.832546" x2="310.987927" y2="646.832546" /> -</g> -<g> -<rect x="348.783202" y="544.785302" width="90.708661" height="136.062992" /> -<text font-size="11.977376pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="352.56273" y="584.470341"><tspan font-size="75%">R</tspan></text> -<line x1="348.783202" y1="578.80105" x2="318.546982" y2="578.80105" /> -<text font-size="11.977376pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="352.56273" y="652.501837"><tspan font-size="75%">S</tspan></text> -<line x1="348.783202" y1="646.832546" x2="318.546982" y2="646.832546" /> -<text font-size="11.977376pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="435.712336" y="584.470341"><tspan font-size="75%">Q</tspan></text> -<line x1="439.491864" y1="578.80105" x2="469.728084" y2="578.80105" /> -<text font-size="11.977376pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="435.712336" y="652.501837" -><tspan font-size="75%"><tspan text-decoration="overline">Q</tspan></tspan></text> -<line x1="439.491864" y1="646.832546" x2="469.728084" y2="646.832546" /> -</g> -<g> -<rect x="507.52336" y="544.785302" width="90.708661" height="136.062992" /> -<text font-size="11.977376pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="511.302887" y="573.131759"><tspan font-size="75%">J</tspan></text> -<line x1="507.52336" y1="567.462467" x2="477.287139" y2="567.462467" /> -<polyline points="507.52336,616.596325 514.069693,612.816798 -507.52336,609.03727" /> -<text font-size="11.977376pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="517.849221" y="618.486089"><tspan font-size="75%">CK</tspan></text> -<circle cx="503.743832" cy="612.816798" r="3.779528" /> -<line x1="499.964304" y1="612.816798" x2="477.287139" y2="612.816798" /> -<text font-size="11.977376pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="511.302887" y="663.84042"><tspan font-size="75%">K</tspan></text> -<line x1="507.52336" y1="658.171129" x2="477.287139" y2="658.171129" /> -<text font-size="11.977376pt" stroke-width="0.266667" - fill="black" - x="552.87769" y="559.903412"><tspan font-size="75%">CLR</tspan></text> -<circle cx="552.87769" cy="541.005774" r="3.779528" /> -<line x1="552.87769" y1="537.226247" x2="552.87769" y2="514.549081" /> -<text font-size="11.977376pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="594.452493" y="584.470341"><tspan font-size="75%">Q</tspan></text> -<line x1="598.232021" y1="578.80105" x2="628.468241" y2="578.80105" /> -<text font-size="11.977376pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="594.452493" y="652.501837" -><tspan font-size="75%"><tspan text-decoration="overline">Q</tspan></tspan></text> -<line x1="598.232021" y1="646.832546" x2="628.468241" y2="646.832546" /> -<text font-size="11.977376pt" stroke-width="0.266667" - fill="black" - x="552.87769" y="677.068766"><tspan font-size="75%">PR</tspan></text> -<circle cx="552.87769" cy="684.627822" r="3.779528" /> -<line x1="552.87769" y1="688.407349" x2="552.87769" y2="711.084514" /> -</g> -</g> -</g></svg> diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/dpv/quick.m4 b/Master/texmf-dist/doc/latex/circuit-macros/examples/dpv/quick.m4 deleted file mode 100644 index 7de2399601e..00000000000 --- a/Master/texmf-dist/doc/latex/circuit-macros/examples/dpv/quick.m4 +++ /dev/null @@ -1,16 +0,0 @@ -.PS # Pic input begins with .PS -cct_init # Read in macro definitions and set defaults -elen = 0.75 # Variables are allowed; default units are inches -Origin: Here # Position names are capitalized - source(up_ elen); llabel(-,v_s,+) - resistor(right_ elen); rlabel(,R,) - dot - { # Save the current position and direction - capacitor(down_ to (Here,Origin)) #(Here,Origin) = (Here.x,Origin.y) - rlabel(+,v,-); llabel(,C,) - dot - } # Restore position and direction - line right_ elen*2/3 - inductor(down_ Here.y-Origin.y); rlabel(,L,); b_current(i) - line to Origin -.PE # Pic input ends diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/dpv/quick.pic b/Master/texmf-dist/doc/latex/circuit-macros/examples/dpv/quick.pic deleted file mode 100644 index 1f06d07e487..00000000000 --- a/Master/texmf-dist/doc/latex/circuit-macros/examples/dpv/quick.pic +++ /dev/null @@ -1,124 +0,0 @@ -.PS # Pic input begins with .PS -# cct_init Version 10.1: TikZ PGF m4 macro settings. - - # gen_init Version 10.1: TikZ PGF m4 macro settings. - - - define rpoint__ { - rp_wid = last line.end.x-last line.start.x - rp_ht = last line.end.y-last line.start.y - rp_len = sqrt(abs((rp_wid)^2+(rp_ht)^2)); move to last line.start - rp_ang = atan2(rp_ht,rp_wid) } - - rtod_ = 57.295779513082323; dtor_ = 0.017453292519943295 - twopi_ = 6.2831853071795862; pi_ = (twopi_/2) - rp_ang = 0; right - - - linethick = 0.8 - arrowwid = 0.05*scale; arrowht = 0.1*scale - - - # gen_init end - - - -# cct_init end - # Read in macro definitions and set defaults -elen = 0.75 # Variables are allowed; default units are inches -Origin: Here # Position names are capitalized - line invis up elen - rpoint__ - - - { line to Here+(((rp_len/2-(0.25*linewid))*(cos(rp_ang))),((rp_len/2-(0.25*linewid))*(sin(rp_ang)))) - move to Here+((((0.25*linewid))*(cos(rp_ang))),(((0.25*linewid))*(sin(rp_ang)))) - { Src_C: circle rad (0.25*linewid) at Here } - - line from Here+((((0.25*linewid))*(cos(rp_ang))),(((0.25*linewid))*(sin(rp_ang)))) \ - to Here+(((rp_len/2)*(cos(rp_ang))),((rp_len/2)*(sin(rp_ang))))} - {[box invis wid (0.25*linewid)*2 ht (0.25*linewid)*2] at Here+(((rp_len/2)*(cos(rp_ang))),((rp_len/2)*(sin(rp_ang))))} - line to Here+(((rp_len)*(cos(rp_ang))),((rp_len)*(sin(rp_ang)))) invis ; {"$ -$" \ - at last [].s rjust below }; {"$ v_s$" \ - at last [].w rjust }; {"$ +$" \ - at last [].n rjust above }; - line invis right elen - rpoint__ - - - if linewid/6/4*6*2 > rp_len then { line invis to Here+(((linewid/6/4*6*2)*(cos(rp_ang))),((linewid/6/4*6*2)*(sin(rp_ang)))) - rpoint__ - - } - M4_xyO: last line.c - { line from last line.start to M4_xyO+(((((linewid/6/4)*(-6)))*(cos(rp_ang))),((((linewid/6/4)*(-6)))*(sin(rp_ang))))\ - then to M4_xyO+((((((linewid/6/4)*(-5)))*(cos(rp_ang)))+((((linewid/6/4)*((2))))*((-sin(rp_ang))))),(((((linewid/6/4)*(-5)))*(sin(rp_ang)))+((((linewid/6/4)*((2))))*(cos(rp_ang))))) \ - then to M4_xyO+((((((linewid/6/4)*(-3)))*(cos(rp_ang)))+((((linewid/6/4)*((-2))))*((-sin(rp_ang))))),(((((linewid/6/4)*(-3)))*(sin(rp_ang)))+((((linewid/6/4)*((-2))))*(cos(rp_ang))))) \ -then to M4_xyO+(((((-(linewid/6/4)))*(cos(rp_ang)))+((((linewid/6/4)*((2))))*((-sin(rp_ang))))),((((-(linewid/6/4)))*(sin(rp_ang)))+((((linewid/6/4)*((2))))*(cos(rp_ang))))) \ - then to M4_xyO+((((linewid/6/4)*(cos(rp_ang)))+((((linewid/6/4)*((-2))))*((-sin(rp_ang))))),(((linewid/6/4)*(sin(rp_ang)))+((((linewid/6/4)*((-2))))*(cos(rp_ang))))) \ -then to M4_xyO+((((((linewid/6/4)*(3)))*(cos(rp_ang)))+((((linewid/6/4)*((2))))*((-sin(rp_ang))))),(((((linewid/6/4)*(3)))*(sin(rp_ang)))+((((linewid/6/4)*((2))))*(cos(rp_ang))))) \ - then to M4_xyO+((((((linewid/6/4)*(5)))*(cos(rp_ang)))+((((linewid/6/4)*((-2))))*((-sin(rp_ang))))),(((((linewid/6/4)*(5)))*(sin(rp_ang)))+((((linewid/6/4)*((-2))))*(cos(rp_ang))))) \ - then to M4_xyO+(((((linewid/6/4)*(6)))*(cos(rp_ang))),((((linewid/6/4)*(6)))*(sin(rp_ang)))) \ - then to last line.end - [box invis ht linewid/6/4*2*2 wid linewid/6/4*6*2] at 2nd last line.c - } - - - -# - line invis from 2nd last line.start to 2nd last line.end ; {"$ R$" \ - at last [].s below }; - [ circle rad (0.04*linewid) fill 0 ] at Here - move to last [] - { # Save the current position and direction - line invis down to (Here,Origin) - rpoint__ - - - { line to Here+(((rp_len/2-linewid/3*0.3/2)*(cos(rp_ang))),((rp_len/2-linewid/3*0.3/2)*(sin(rp_ang)))) - {line from Here+(((-linewid/3/2)*((-sin(rp_ang)))),((-linewid/3/2)*(cos(rp_ang)))) \ - to Here+(((linewid/3/2)*((-sin(rp_ang)))),((linewid/3/2)*(cos(rp_ang))))} - - move to Here+(((linewid/3*0.3)*(cos(rp_ang))),((linewid/3*0.3)*(sin(rp_ang)))) - {line from Here+(((-linewid/3/2)*((-sin(rp_ang)))),((-linewid/3/2)*(cos(rp_ang)))) \ - to Here+(((linewid/3/2)*((-sin(rp_ang)))),((linewid/3/2)*(cos(rp_ang))))} - line to Here+(((rp_len/2-linewid/3*0.3/2)*(cos(rp_ang))),((rp_len/2-linewid/3*0.3/2)*(sin(rp_ang)))) - - - - - - - - } - - {[box invis wid linewid/3 ht linewid/3*0.3 ] at Here+(((rp_len/2)*(cos(rp_ang))),((rp_len/2)*(sin(rp_ang))))} - line to Here+(((rp_len)*(cos(rp_ang))),((rp_len)*(sin(rp_ang)))) invis #(Here,Origin) = (Here.x,Origin.y) - {"$ +$" \ - at last [].n rjust above }; {"$ v$" \ - at last [].l rjust }; {"$ -$" \ - at last [].s rjust below }; ; {"$ C$" \ - at last [].e ljust }; - [ circle rad (0.04*linewid) fill 0 ] at Here - move to last [] - } # Restore position and direction - line right elen*2/3 - line invis down Here.y-Origin.y - rpoint__ - - - { line to Here+((((rp_len-4*linewid/16*2)/2)*(cos(rp_ang))),(((rp_len-4*linewid/16*2)/2)*(sin(rp_ang)))) - {M4coil: [ S: Here; - {line to Here+(((-(linethick *(scale/72)/2))*((-sin(rp_ang)))),((-(linethick *(scale/72)/2))*(cos(rp_ang))))}; - for m4i=1 to 4 do { - arc cw from Here to Here+(((linewid/16*2)*(cos(rp_ang))),((linewid/16*2)*(sin(rp_ang)))) with .c at Here+(((linewid/16)*(cos(rp_ang))),((linewid/16)*(sin(rp_ang)))) - {line to Here+(((-(linethick *(scale/72)/2))*((-sin(rp_ang)))),((-(linethick *(scale/72)/2))*(cos(rp_ang))))} } ] with .S at Here } - - line from Here+(((4*linewid/16*2)*(cos(rp_ang))),((4*linewid/16*2)*(sin(rp_ang)))) to Here+((((rp_len+4*linewid/16*2)/2)*(cos(rp_ang))),(((rp_len+4*linewid/16*2)/2)*(sin(rp_ang)))) } - line to Here+(((rp_len)*(cos(rp_ang))),((rp_len)*(sin(rp_ang)))) invis ; {"$ L$" \ - at last [].l rjust }; ; - { move to last line.start+(((((rp_len-last [].ht)/2*2/3+arrowht/3))*(cos(rp_ang))),((((rp_len-last [].ht)/2*2/3+arrowht/3))*(sin(rp_ang)))) - arrow <- to Here+(((-arrowht)*(cos(rp_ang))),((-arrowht)*(sin(rp_ang)))) "$ i$" \ - ljust} - line to Origin -.PE # Pic input ends diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/dpv/quick.svg b/Master/texmf-dist/doc/latex/circuit-macros/examples/dpv/quick.svg deleted file mode 100644 index b07cccbda8f..00000000000 --- a/Master/texmf-dist/doc/latex/circuit-macros/examples/dpv/quick.svg +++ /dev/null @@ -1,47 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!-- This file was generated by dvisvgm 2.9.1 --> -<svg version='1.1' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' width='121.2pt' height='59.24pt' viewBox='0 -59.24 121.2 59.24'> -<g id='page1'> -<g transform='matrix(1 0 0 -1 0 0)'> -<path d='M22.929688 1.839844V19.8398' stroke='#000' fill='none' stroke-width='.8' stroke-miterlimit='10'/> -<path d='M31.92578 28.8398C31.92578 33.8125 27.89844 37.8398 22.929688 37.8398C17.95703 37.8398 13.92969 33.8125 13.92969 28.8398C13.92969 23.8711 17.95703 19.8398 22.929688 19.8398C27.89844 19.8398 31.92578 23.8711 31.92578 28.8398Z' stroke='#000' fill='none' stroke-width='.8' stroke-miterlimit='10'/> -<path d='M22.929688 37.8398V55.8398' stroke='#000' fill='none' stroke-width='.8' stroke-miterlimit='10'/> -<path d='M20.2234 14.79893C20.39277 14.79893 20.57215 14.79893 20.57215 14.99831C20.57215 15.19737 20.39277 15.19737 20.2234 15.19737H14.83434C14.66496 15.19737 14.485898 15.19737 14.485898 14.99831C14.485898 14.79893 14.66496 14.79893 14.83434 14.79893H20.2234Z'/> -<path d='M7.98188 31.14761C7.98188 31.68543 7.72282 31.8448 7.54344 31.8448C7.29438 31.8448 7.05532 31.58574 7.05532 31.36668C7.05532 31.2373 7.10532 31.1773 7.21469 31.06793C7.42407 30.86855 7.55344 30.6098 7.55344 30.25105C7.55344 29.83261 6.94594 27.551676 5.78032 27.551676C5.27251 27.551676 5.04344 27.900113 5.04344 28.418238C5.04344 28.97605 5.31219 29.70324 5.62094 30.53011C5.69063 30.69918 5.74063 30.83886 5.74063 31.02793C5.74063 31.47636 5.42188 31.8448 4.92376 31.8448C3.987506 31.8448 3.608756 30.40043 3.608756 30.31074C3.608756 30.21136 3.708444 30.21136 3.728444 30.21136C3.828131 30.21136 3.838131 30.23105 3.887819 30.39043C4.176569 31.39668 4.60501 31.62574 4.89376 31.62574C4.97344 31.62574 5.14282 31.62574 5.14282 31.30699C5.14282 31.05793 5.04344 30.78886 4.97344 30.6098C4.53532 29.45418 4.40563 28.99605 4.40563 28.56761C4.40563 27.491676 5.28251 27.332301 5.74063 27.332301C7.41407 27.332301 7.98188 30.62949 7.98188 31.14761Z'/> -<path d='M11.15622 28.57052C10.97497 28.52865 10.86309 28.3824 10.86309 28.24271C10.86309 28.0824 11.00278 28.01959 11.09341 28.01959C11.16309 28.01959 11.42809 28.06146 11.42809 28.41709C11.42809 28.87052 10.92591 29.02396 10.50059 29.02396C9.41247 29.02396 9.21716 28.22177 9.21716 28.00552C9.21716 27.74771 9.36372 27.58021 9.46122 27.49646C9.64247 27.35709 9.76809 27.32896 10.24934 27.24552C10.39591 27.2174 10.84247 27.13365 10.84247 26.784899C10.84247 26.666462 10.76559 26.401462 10.47278 26.227087C10.20059 26.073649 9.85872 26.073649 9.77528 26.073649C9.49622 26.073649 9.098719 26.136462 8.938094 26.366462C9.16841 26.394274 9.32184 26.568649 9.32184 26.763962C9.32184 26.938337 9.19622 27.02209 9.049656 27.02209C8.847469 27.02209 8.645281 26.861774 8.645281 26.554899C8.645281 26.136462 9.091531 25.878337 9.76809 25.878337C11.05153 25.878337 11.28872 26.757087 11.28872 27.02927C11.28872 27.67084 10.58434 27.79646 10.32622 27.84521C10.26341 27.85927 10.08903 27.88709 10.04716 27.90115C9.78903 27.9499 9.66341 28.09646 9.66341 28.2499C9.66341 28.41021 9.78903 28.59865 9.94247 28.69615C10.13091 28.8149 10.37497 28.82865 10.49372 28.82865C10.63997 28.82865 11.00278 28.80771 11.15622 28.57052Z'/> -<path d='M17.73309 42.48097H20.51246C20.65184 42.48097 20.84121 42.48097 20.84121 42.68034C20.84121 42.8794 20.65184 42.8794 20.51246 42.8794H17.73309V45.66878C17.73309 45.80815 17.73309 45.99753 17.53402 45.99753C17.33465 45.99753 17.33465 45.80815 17.33465 45.66878V42.8794H14.545586C14.406211 42.8794 14.216836 42.8794 14.216836 42.68034C14.216836 42.48097 14.406211 42.48097 14.545586 42.48097H17.33465V39.691903C17.33465 39.552528 17.33465 39.363153 17.53402 39.363153C17.73309 39.363153 17.73309 39.552528 17.73309 39.691903V42.48097Z'/> -<path d='M22.929688 55.8398H40.9297L42.4297 58.8398L45.4297 52.8398L48.4297 58.8398L51.4297 52.8398L54.4297 58.8398L57.4297 52.8398L58.9297 55.8398H76.9297' stroke='#000' fill='none' stroke-width='.8' stroke-miterlimit='10'/> -<path d='M49.84228 50.62824C49.90228 50.86731 49.93197 50.96699 50.12134 50.99668C50.21103 51.00668 50.52978 51.00668 50.72884 51.00668C51.43634 51.00668 52.54197 51.00668 52.54197 50.02043C52.54197 49.68199 52.38259 48.99449 51.99416 48.60606C51.73509 48.34699 51.20697 48.02824 50.31072 48.02824H49.19509L49.84228 50.62824ZM51.27697 47.89887C52.28291 48.11793 53.46822 48.81512 53.46822 49.82137C53.46822 50.67793 52.57166 51.31543 51.26697 51.31543H48.42791C48.22884 51.31543 48.13916 51.31543 48.13916 51.11637C48.13916 51.00668 48.22884 51.00668 48.41791 51.00668C48.43791 51.00668 48.62728 51.00668 48.79634 50.98668C48.97572 50.96699 49.06541 50.95699 49.06541 50.82731C49.06541 50.78762 49.05541 50.75762 49.02572 50.63824L47.69072 45.288869C47.59134 44.900432 47.57134 44.820744 46.784469 44.820744C46.605094 44.820744 46.515407 44.820744 46.515407 44.621682C46.515407 44.511994 46.634782 44.511994 46.654782 44.511994C46.933844 44.511994 47.63103 44.541994 47.91009 44.541994C48.18884 44.541994 48.89603 44.511994 49.17509 44.511994C49.25478 44.511994 49.37416 44.511994 49.37416 44.711369C49.37416 44.820744 49.28447 44.820744 49.09541 44.820744C48.72666 44.820744 48.44791 44.820744 48.44791 45.000119C48.44791 45.059807 48.46791 45.109807 48.47759 45.169494L49.13509 47.80918H50.32072C51.22697 47.80918 51.40634 47.25137 51.40634 46.90262C51.40634 46.75324 51.32666 46.44449 51.26697 46.21543C51.19728 45.93637 51.10759 45.56793 51.10759 45.368557C51.10759 44.292932 52.30291 44.292932 52.43228 44.292932C53.27916 44.292932 53.62759 45.298869 53.62759 45.438244C53.62759 45.55793 53.51822 45.55793 53.50822 45.55793C53.41853 45.55793 53.39853 45.488244 53.37853 45.418557C53.12978 44.681369 52.70134 44.511994 52.47228 44.511994C52.14353 44.511994 52.07384 44.731057 52.07384 45.119494C52.07384 45.428557 52.13353 45.93637 52.17322 46.25512C52.19322 46.39481 52.21322 46.58387 52.21322 46.72324C52.21322 47.49043 51.54572 47.79918 51.27697 47.89887Z'/> -<path d='M78.3672 55.8398C78.3672 56.6367 77.7227 57.2812 76.9297 57.2812C76.1328 57.2812 75.4883 56.6367 75.4883 55.8398C75.4883 55.0469 76.1328 54.4023 76.9297 54.4023C77.7227 54.4023 78.3672 55.0469 78.3672 55.8398Z'/> -<path d='M78.3672 55.8398C78.3672 56.6367 77.7227 57.2812 76.9297 57.2812C76.1328 57.2812 75.4883 56.6367 75.4883 55.8398C75.4883 55.0469 76.1328 54.4023 76.9297 54.4023C77.7227 54.4023 78.3672 55.0469 78.3672 55.8398Z' stroke='#000' fill='none' stroke-width='.8' stroke-miterlimit='10'/> -<path d='M76.9297 55.8398V30.6406' stroke='#000' fill='none' stroke-width='.8' stroke-miterlimit='10'/> -<path d='M70.9297 30.6406H82.9297' stroke='#000' fill='none' stroke-width='.8' stroke-miterlimit='10'/> -<path d='M70.9297 27.0391H82.9297' stroke='#000' fill='none' stroke-width='.8' stroke-miterlimit='10'/> -<path d='M76.9297 27.0391V1.839844' stroke='#000' fill='none' stroke-width='.8' stroke-miterlimit='10'/> -<path d='M71.73309 35.27992H74.51246C74.65184 35.27992 74.84121 35.27992 74.84121 35.4793C74.84121 35.67836 74.65184 35.67836 74.51246 35.67836H71.73309V38.46774C71.73309 38.60711 71.73309 38.79649 71.53402 38.79649C71.33465 38.79649 71.33465 38.60711 71.33465 38.46774V35.67836H68.545586C68.406211 35.67836 68.216836 35.67836 68.216836 35.4793C68.216836 35.27992 68.406211 35.27992 68.545586 35.27992H71.33465V32.490861C71.33465 32.351486 71.33465 32.162111 71.53402 32.162111C71.73309 32.162111 71.73309 32.351486 71.73309 32.490861V35.27992Z'/> -<path d='M68.88389 30.40063C68.88389 30.93844 68.62483 31.09782 68.44545 31.09782C68.19639 31.09782 67.95733 30.83876 67.95733 30.61969C67.95733 30.49032 68.00733 30.43032 68.1167 30.32094C68.32608 30.12157 68.45545 29.86282 68.45545 29.50407C68.45545 29.08563 67.84795 26.804694 66.68233 26.804694C66.17451 26.804694 65.94545 27.153131 65.94545 27.671256C65.94545 28.22907 66.2142 28.95626 66.52295 29.78313C66.59264 29.95219 66.64264 30.09188 66.64264 30.28094C66.64264 30.72938 66.32389 31.09782 65.82576 31.09782C64.889513 31.09782 64.510763 29.65344 64.510763 29.56376C64.510763 29.46438 64.610451 29.46438 64.630451 29.46438C64.730138 29.46438 64.740138 29.48407 64.789826 29.64344C65.078576 30.64969 65.50701 30.87876 65.79576 30.87876C65.87545 30.87876 66.04483 30.87876 66.04483 30.56001C66.04483 30.31094 65.94545 30.04188 65.87545 29.86282C65.43733 28.70719 65.30764 28.24907 65.30764 27.82063C65.30764 26.744694 66.18451 26.585319 66.64264 26.585319C68.31608 26.585319 68.88389 29.88251 68.88389 30.40063Z'/> -<path d='M74.2234 21.99998C74.39277 21.99998 74.57215 21.99998 74.57215 22.19935C74.57215 22.39841 74.39277 22.39841 74.2234 22.39841H68.83434C68.66496 22.39841 68.485898 22.39841 68.485898 22.19935C68.485898 21.99998 68.66496 21.99998 68.83434 21.99998H74.2234Z'/> -<path d='M92.01759 32.35915C92.01759 32.38884 91.99759 32.45884 91.9079 32.45884C91.8779 32.45884 91.86822 32.44884 91.75853 32.33915L91.06134 31.57228C90.97165 31.71165 90.51322 32.45884 89.40759 32.45884C87.18634 32.45884 84.945091 30.25728 84.945091 27.94634C84.945091 26.302592 86.1204 25.216967 87.64447 25.216967C88.51103 25.216967 89.26822 25.615405 89.79603 26.07353C90.72259 26.8904 90.89197 27.79697 90.89197 27.82666C90.89197 27.92634 90.79228 27.92634 90.77228 27.92634C90.71259 27.92634 90.6629 27.90634 90.6429 27.82666C90.55322 27.5379 90.32415 26.83072 89.63665 26.252905C88.94947 25.695092 88.32197 25.525717 87.80384 25.525717C86.90728 25.525717 85.85165 26.04353 85.85165 27.59759C85.85165 28.1654 86.06072 29.77915 87.05665 30.94447C87.66447 31.65197 88.60072 32.14978 89.48728 32.14978C90.50353 32.14978 91.09103 31.38291 91.09103 30.22728C91.09103 29.82884 91.06134 29.81884 91.06134 29.71947C91.06134 29.61978 91.17072 29.61978 91.21072 29.61978C91.34009 29.61978 91.34009 29.63978 91.39009 29.81884L92.01759 32.35915Z'/> -<path d='M78.3672 1.839844C78.3672 2.636719 77.7227 3.28125 76.9297 3.28125C76.1328 3.28125 75.4883 2.636719 75.4883 1.839844C75.4883 1.042969 76.1328 .39844 76.9297 .39844C77.7227 .39844 78.3672 1.042969 78.3672 1.839844Z'/> -<path d='M78.3672 1.839844C78.3672 2.636719 77.7227 3.28125 76.9297 3.28125C76.1328 3.28125 75.4883 2.636719 75.4883 1.839844C75.4883 1.042969 76.1328 .39844 76.9297 .39844C77.7227 .39844 78.3672 1.042969 78.3672 1.839844Z' stroke='#000' fill='none' stroke-width='.8' stroke-miterlimit='10'/> -<path d='M76.9297 55.8398H112.9297' stroke='#000' fill='none' stroke-width='.8' stroke-miterlimit='10'/> -<path d='M112.9297 55.8398V37.8398' stroke='#000' fill='none' stroke-width='.8' stroke-miterlimit='10'/> -<path d='M112.9297 37.8398H112.5273' stroke='#000' fill='none' stroke-width='.8' stroke-miterlimit='10'/> -<path d='M112.9297 37.8398C113.7344 37.8398 114.4766 37.4102 114.8789 36.7148C115.2773 36.0195 115.2773 35.1602 114.8789 34.4648C114.4766 33.7695 113.7344 33.3398 112.9297 33.3398' stroke='#000' fill='none' stroke-width='.8' stroke-miterlimit='10'/> -<path d='M112.9297 33.3398H112.5273' stroke='#000' fill='none' stroke-width='.8' stroke-miterlimit='10'/> -<path d='M112.9297 33.3398C113.7344 33.3398 114.4766 32.9102 114.8789 32.2148C115.2773 31.5195 115.2773 30.6602 114.8789 29.9648C114.4766 29.2695 113.7344 28.8398 112.9297 28.8398' stroke='#000' fill='none' stroke-width='.8' stroke-miterlimit='10'/> -<path d='M112.9297 28.8398H112.5273' stroke='#000' fill='none' stroke-width='.8' stroke-miterlimit='10'/> -<path d='M112.9297 28.8398C113.7344 28.8398 114.4766 28.4102 114.8789 27.7148C115.2773 27.0195 115.2773 26.1602 114.8789 25.4648C114.4766 24.7695 113.7344 24.3398 112.9297 24.3398' stroke='#000' fill='none' stroke-width='.8' stroke-miterlimit='10'/> -<path d='M112.9297 24.3398H112.5273' stroke='#000' fill='none' stroke-width='.8' stroke-miterlimit='10'/> -<path d='M112.9297 24.3398C113.7344 24.3398 114.4766 23.9102 114.8789 23.2148C115.2773 22.5195 115.2773 21.6602 114.8789 20.9648C114.4766 20.2695 113.7344 19.8398 112.9297 19.8398' stroke='#000' fill='none' stroke-width='.8' stroke-miterlimit='10'/> -<path d='M112.9297 19.8398H112.5273' stroke='#000' fill='none' stroke-width='.8' stroke-miterlimit='10'/> -<path d='M112.9297 19.8398V1.839844' stroke='#000' fill='none' stroke-width='.8' stroke-miterlimit='10'/> -<path d='M107.9536 31.46259C108.04297 31.82103 108.07297 31.93072 109.00922 31.93072C109.30828 31.93072 109.38797 31.93072 109.38797 32.12009C109.38797 32.23947 109.27828 32.23947 109.2286 32.23947C108.89985 32.23947 108.08297 32.20978 107.75422 32.20978C107.45547 32.20978 106.72828 32.23947 106.42953 32.23947C106.35953 32.23947 106.24016 32.23947 106.24016 32.0404C106.24016 31.93072 106.32985 31.93072 106.51891 31.93072C106.53891 31.93072 106.72828 31.93072 106.89766 31.91072C107.07703 31.89103 107.16641 31.88103 107.16641 31.75134C107.16641 31.71165 107.15672 31.68166 107.12672 31.56228L105.79203 26.212905C105.69235 25.824467 105.67235 25.74478 104.885471 25.74478C104.716096 25.74478 104.616409 25.74478 104.616409 25.545717C104.616409 25.43603 104.706096 25.43603 104.885471 25.43603H109.49735C109.73641 25.43603 109.74641 25.43603 109.80641 25.605405L110.59328 27.75697C110.63297 27.86666 110.63297 27.88634 110.63297 27.89634C110.63297 27.93634 110.60328 28.00603 110.5136 28.00603C110.42391 28.00603 110.41391 27.95634 110.34422 27.79697C110.00547 26.8804 109.56703 25.74478 107.84391 25.74478H106.90766C106.76797 25.74478 106.74828 25.74478 106.68828 25.75478C106.58891 25.76478 106.55891 25.77478 106.55891 25.854467C106.55891 25.884155 106.55891 25.904155 106.6086 26.08353L107.9536 31.46259Z'/> -<path d='M111.1289 48.6406L112.9297 41.4414L114.7266 48.6406Z'/> -<path d='M111.1289 48.6406L112.9297 41.4414L114.7266 48.6406Z' stroke='#000' fill='none' stroke-width='.5' stroke-miterlimit='10'/> -<path d='M112.9297 43.0898V48.6406' stroke='#000' fill='none' stroke-width='.8' stroke-miterlimit='10'/> -<path d='M117.27603 48.80461C117.27603 49.00398 117.13634 49.16336 116.90728 49.16336C116.63853 49.16336 116.36947 48.90429 116.36947 48.63555C116.36947 48.44617 116.50884 48.27679 116.7479 48.27679C116.97697 48.27679 117.27603 48.50586 117.27603 48.80461ZM116.51884 45.05929C116.63853 45.34836 116.63853 45.36805 116.7379 45.63711C116.81759 45.83617 116.86759 45.97586 116.86759 46.16492C116.86759 46.61336 116.54884 46.98179 116.05072 46.98179C115.114466 46.98179 114.735716 45.53742 114.735716 45.44773C114.735716 45.34836 114.835404 45.34836 114.855404 45.34836C114.955091 45.34836 114.965091 45.36805 115.014779 45.52742C115.283841 46.46398 115.68228 46.76273 116.02072 46.76273C116.1004 46.76273 116.26978 46.76273 116.26978 46.44398C116.26978 46.23461 116.20009 46.02555 116.1604 45.92586C116.08072 45.66711 115.63228 44.51148 115.4729 44.08305C115.373216 43.82398 115.243841 43.495545 115.243841 43.28617C115.243841 42.818045 115.58259 42.469295 116.06072 42.469295C116.99697 42.469295 117.36572 43.91367 117.36572 44.00336C117.36572 44.10304 117.27603 44.10304 117.24603 44.10304C117.14634 44.10304 117.14634 44.07305 117.09665 43.92367C116.91728 43.29617 116.58853 42.68867 116.08072 42.68867C115.91134 42.68867 115.84165 42.788045 115.84165 43.01742C115.84165 43.26617 115.90134 43.405858 116.1304 44.01336L116.51884 45.05929Z'/> -<path d='M112.9297 1.839844H22.929688' stroke='#000' fill='none' stroke-width='.8' stroke-miterlimit='10'/> -</g> -</g> -</svg> diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/dpv/quick.tex b/Master/texmf-dist/doc/latex/circuit-macros/examples/dpv/quick.tex deleted file mode 100644 index e59bd8597f5..00000000000 --- a/Master/texmf-dist/doc/latex/circuit-macros/examples/dpv/quick.tex +++ /dev/null @@ -1,188 +0,0 @@ -\begin{tikzpicture}[scale=2.54]% -% dpic version 2022.12.01 option -g for TikZ and PGF 1.01 -\ifx\dpiclw\undefined\newdimen\dpiclw\fi -\global\def\dpicdraw{\draw[line width=\dpiclw]} -\global\def\dpicstop{;} -\dpiclw=0.8bp -\dpiclw=0.8bp -\dpicdraw (0,0) - --(0,0.25)\dpicstop -\dpicdraw (0,0.375) circle (0.049213in)\dpicstop -\dpicdraw (0,0.5) - --(0,0.75)\dpicstop -\draw (0,0.25) node[below left=-2bp]{$ -$}; -\draw (-0.125,0.375) node[left=-2bp]{$ v_s$}; -\draw (0,0.5) node[above left=-2bp]{$ +$}; -\dpicdraw (0,0.75) - --(0.25,0.75) - --(0.270833,0.791667) - --(0.3125,0.708333) - --(0.354167,0.791667) - --(0.395833,0.708333) - --(0.4375,0.791667) - --(0.479167,0.708333) - --(0.5,0.75) - --(0.75,0.75)\dpicstop -\draw (0.375,0.708333) node[below=-2bp]{$ R$}; -\dpicdraw[fill=black](0.75,0.75) circle (0.007874in)\dpicstop -\dpicdraw (0.75,0.75) - --(0.75,0.4)\dpicstop -\dpicdraw (0.666667,0.4) - --(0.833333,0.4)\dpicstop -\dpicdraw (0.666667,0.35) - --(0.833333,0.35)\dpicstop -\dpicdraw (0.75,0.35) - --(0.75,0)\dpicstop -\draw (0.75,0.4) node[above left=-2bp]{$ +$}; -\draw (0.666667,0.375) node[left=-2bp]{$ v$}; -\draw (0.75,0.35) node[below left=-2bp]{$ -$}; -\draw (0.833333,0.375) node[right=-2bp]{$ C$}; -\dpicdraw[fill=black](0.75,0) circle (0.007874in)\dpicstop -\dpicdraw (0.75,0.75) - --(1.25,0.75)\dpicstop -\dpicdraw (1.25,0.75) - --(1.25,0.5)\dpicstop -\dpicdraw (1.25,0.5) - --(1.244444,0.5)\dpicstop -\dpicdraw (1.25,0.5) - ..controls (1.261165,0.5) and (1.271481,0.494044) - ..(1.277063,0.484375) - ..controls (1.282646,0.474706) and (1.282646,0.462794) - ..(1.277063,0.453125) - ..controls (1.271481,0.443456) and (1.261165,0.4375) - ..(1.25,0.4375)\dpicstop -\dpicdraw (1.25,0.4375) - --(1.244444,0.4375)\dpicstop -\dpicdraw (1.25,0.4375) - ..controls (1.261165,0.4375) and (1.271481,0.431544) - ..(1.277063,0.421875) - ..controls (1.282646,0.412206) and (1.282646,0.400294) - ..(1.277063,0.390625) - ..controls (1.271481,0.380956) and (1.261165,0.375) - ..(1.25,0.375)\dpicstop -\dpicdraw (1.25,0.375) - --(1.244444,0.375)\dpicstop -\dpicdraw (1.25,0.375) - ..controls (1.261165,0.375) and (1.271481,0.369044) - ..(1.277063,0.359375) - ..controls (1.282646,0.349706) and (1.282646,0.337794) - ..(1.277063,0.328125) - ..controls (1.271481,0.318456) and (1.261165,0.3125) - ..(1.25,0.3125)\dpicstop -\dpicdraw (1.25,0.3125) - --(1.244444,0.3125)\dpicstop -\dpicdraw (1.25,0.3125) - ..controls (1.261165,0.3125) and (1.271481,0.306544) - ..(1.277063,0.296875) - ..controls (1.282646,0.287206) and (1.282646,0.275294) - ..(1.277063,0.265625) - ..controls (1.271481,0.255956) and (1.261165,0.25) - ..(1.25,0.25)\dpicstop -\dpicdraw (1.25,0.25) - --(1.244444,0.25)\dpicstop -\dpicdraw (1.25,0.25) - --(1.25,0)\dpicstop -\draw (1.244444,0.375) node[left=-2bp]{$ L$}; -\filldraw[line width=0bp](1.225,0.65) - --(1.25,0.55) - --(1.275,0.65) --cycle\dpicstop -\dpicdraw (1.25,0.572906) - --(1.25,0.65)\dpicstop -\draw (1.25,0.611453) node[right=-2bp]{$ i$}; -\dpicdraw (1.25,0) - --(0,0)\dpicstop -\end{tikzpicture}% -\begin{tikzpicture}[scale=2.54]% -% dpic version 2022.12.01 option -g for TikZ and PGF 1.01 -\ifx\dpiclw\undefined\newdimen\dpiclw\fi -\global\def\dpicdraw{\draw[line width=\dpiclw]} -\global\def\dpicstop{;} -\dpiclw=0.8bp -\dpiclw=0.8bp -\dpicdraw (0,0) - --(0,0.25)\dpicstop -\dpicdraw (0,0.375) circle (0.049213in)\dpicstop -\dpicdraw (0,0.5) - --(0,0.75)\dpicstop -\draw (0,0.25) node[below left=-2bp]{$ -$}; -\draw (-0.125,0.375) node[left=-2bp]{$ v_s$}; -\draw (0,0.5) node[above left=-2bp]{$ +$}; -\dpicdraw (0,0.75) - --(0.25,0.75) - --(0.270833,0.791667) - --(0.3125,0.708333) - --(0.354167,0.791667) - --(0.395833,0.708333) - --(0.4375,0.791667) - --(0.479167,0.708333) - --(0.5,0.75) - --(0.75,0.75)\dpicstop -\draw (0.375,0.708333) node[below=-2bp]{$ R$}; -\dpicdraw[fill=black](0.75,0.75) circle (0.007874in)\dpicstop -\dpicdraw (0.75,0.75) - --(0.75,0.4)\dpicstop -\dpicdraw (0.666667,0.4) - --(0.833333,0.4)\dpicstop -\dpicdraw (0.666667,0.35) - --(0.833333,0.35)\dpicstop -\dpicdraw (0.75,0.35) - --(0.75,0)\dpicstop -\draw (0.75,0.4) node[above left=-2bp]{$ +$}; -\draw (0.666667,0.375) node[left=-2bp]{$ v$}; -\draw (0.75,0.35) node[below left=-2bp]{$ -$}; -\draw (0.833333,0.375) node[right=-2bp]{$ C$}; -\dpicdraw[fill=black](0.75,0) circle (0.007874in)\dpicstop -\dpicdraw (0.75,0.75) - --(1.25,0.75)\dpicstop -\dpicdraw (1.25,0.75) - --(1.25,0.5)\dpicstop -\dpicdraw (1.25,0.5) - --(1.244444,0.5)\dpicstop -\dpicdraw (1.25,0.5) - ..controls (1.261165,0.5) and (1.271481,0.494044) - ..(1.277063,0.484375) - ..controls (1.282646,0.474706) and (1.282646,0.462794) - ..(1.277063,0.453125) - ..controls (1.271481,0.443456) and (1.261165,0.4375) - ..(1.25,0.4375)\dpicstop -\dpicdraw (1.25,0.4375) - --(1.244444,0.4375)\dpicstop -\dpicdraw (1.25,0.4375) - ..controls (1.261165,0.4375) and (1.271481,0.431544) - ..(1.277063,0.421875) - ..controls (1.282646,0.412206) and (1.282646,0.400294) - ..(1.277063,0.390625) - ..controls (1.271481,0.380956) and (1.261165,0.375) - ..(1.25,0.375)\dpicstop -\dpicdraw (1.25,0.375) - --(1.244444,0.375)\dpicstop -\dpicdraw (1.25,0.375) - ..controls (1.261165,0.375) and (1.271481,0.369044) - ..(1.277063,0.359375) - ..controls (1.282646,0.349706) and (1.282646,0.337794) - ..(1.277063,0.328125) - ..controls (1.271481,0.318456) and (1.261165,0.3125) - ..(1.25,0.3125)\dpicstop -\dpicdraw (1.25,0.3125) - --(1.244444,0.3125)\dpicstop -\dpicdraw (1.25,0.3125) - ..controls (1.261165,0.3125) and (1.271481,0.306544) - ..(1.277063,0.296875) - ..controls (1.282646,0.287206) and (1.282646,0.275294) - ..(1.277063,0.265625) - ..controls (1.271481,0.255956) and (1.261165,0.25) - ..(1.25,0.25)\dpicstop -\dpicdraw (1.25,0.25) - --(1.244444,0.25)\dpicstop -\dpicdraw (1.25,0.25) - --(1.25,0)\dpicstop -\draw (1.244444,0.375) node[left=-2bp]{$ L$}; -\filldraw[line width=0bp](1.225,0.65) - --(1.25,0.55) - --(1.275,0.65) --cycle\dpicstop -\dpicdraw (1.25,0.572906) - --(1.25,0.65)\dpicstop -\draw (1.25,0.611453) node[right=-2bp]{$ i$}; -\dpicdraw (1.25,0) - --(0,0)\dpicstop -\end{tikzpicture}% diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/dpv/quick.xsvg b/Master/texmf-dist/doc/latex/circuit-macros/examples/dpv/quick.xsvg deleted file mode 100644 index b07cccbda8f..00000000000 --- a/Master/texmf-dist/doc/latex/circuit-macros/examples/dpv/quick.xsvg +++ /dev/null @@ -1,47 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!-- This file was generated by dvisvgm 2.9.1 --> -<svg version='1.1' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' width='121.2pt' height='59.24pt' viewBox='0 -59.24 121.2 59.24'> -<g id='page1'> -<g transform='matrix(1 0 0 -1 0 0)'> -<path d='M22.929688 1.839844V19.8398' stroke='#000' fill='none' stroke-width='.8' stroke-miterlimit='10'/> -<path d='M31.92578 28.8398C31.92578 33.8125 27.89844 37.8398 22.929688 37.8398C17.95703 37.8398 13.92969 33.8125 13.92969 28.8398C13.92969 23.8711 17.95703 19.8398 22.929688 19.8398C27.89844 19.8398 31.92578 23.8711 31.92578 28.8398Z' stroke='#000' fill='none' stroke-width='.8' stroke-miterlimit='10'/> -<path d='M22.929688 37.8398V55.8398' stroke='#000' fill='none' stroke-width='.8' stroke-miterlimit='10'/> -<path d='M20.2234 14.79893C20.39277 14.79893 20.57215 14.79893 20.57215 14.99831C20.57215 15.19737 20.39277 15.19737 20.2234 15.19737H14.83434C14.66496 15.19737 14.485898 15.19737 14.485898 14.99831C14.485898 14.79893 14.66496 14.79893 14.83434 14.79893H20.2234Z'/> -<path d='M7.98188 31.14761C7.98188 31.68543 7.72282 31.8448 7.54344 31.8448C7.29438 31.8448 7.05532 31.58574 7.05532 31.36668C7.05532 31.2373 7.10532 31.1773 7.21469 31.06793C7.42407 30.86855 7.55344 30.6098 7.55344 30.25105C7.55344 29.83261 6.94594 27.551676 5.78032 27.551676C5.27251 27.551676 5.04344 27.900113 5.04344 28.418238C5.04344 28.97605 5.31219 29.70324 5.62094 30.53011C5.69063 30.69918 5.74063 30.83886 5.74063 31.02793C5.74063 31.47636 5.42188 31.8448 4.92376 31.8448C3.987506 31.8448 3.608756 30.40043 3.608756 30.31074C3.608756 30.21136 3.708444 30.21136 3.728444 30.21136C3.828131 30.21136 3.838131 30.23105 3.887819 30.39043C4.176569 31.39668 4.60501 31.62574 4.89376 31.62574C4.97344 31.62574 5.14282 31.62574 5.14282 31.30699C5.14282 31.05793 5.04344 30.78886 4.97344 30.6098C4.53532 29.45418 4.40563 28.99605 4.40563 28.56761C4.40563 27.491676 5.28251 27.332301 5.74063 27.332301C7.41407 27.332301 7.98188 30.62949 7.98188 31.14761Z'/> -<path d='M11.15622 28.57052C10.97497 28.52865 10.86309 28.3824 10.86309 28.24271C10.86309 28.0824 11.00278 28.01959 11.09341 28.01959C11.16309 28.01959 11.42809 28.06146 11.42809 28.41709C11.42809 28.87052 10.92591 29.02396 10.50059 29.02396C9.41247 29.02396 9.21716 28.22177 9.21716 28.00552C9.21716 27.74771 9.36372 27.58021 9.46122 27.49646C9.64247 27.35709 9.76809 27.32896 10.24934 27.24552C10.39591 27.2174 10.84247 27.13365 10.84247 26.784899C10.84247 26.666462 10.76559 26.401462 10.47278 26.227087C10.20059 26.073649 9.85872 26.073649 9.77528 26.073649C9.49622 26.073649 9.098719 26.136462 8.938094 26.366462C9.16841 26.394274 9.32184 26.568649 9.32184 26.763962C9.32184 26.938337 9.19622 27.02209 9.049656 27.02209C8.847469 27.02209 8.645281 26.861774 8.645281 26.554899C8.645281 26.136462 9.091531 25.878337 9.76809 25.878337C11.05153 25.878337 11.28872 26.757087 11.28872 27.02927C11.28872 27.67084 10.58434 27.79646 10.32622 27.84521C10.26341 27.85927 10.08903 27.88709 10.04716 27.90115C9.78903 27.9499 9.66341 28.09646 9.66341 28.2499C9.66341 28.41021 9.78903 28.59865 9.94247 28.69615C10.13091 28.8149 10.37497 28.82865 10.49372 28.82865C10.63997 28.82865 11.00278 28.80771 11.15622 28.57052Z'/> -<path d='M17.73309 42.48097H20.51246C20.65184 42.48097 20.84121 42.48097 20.84121 42.68034C20.84121 42.8794 20.65184 42.8794 20.51246 42.8794H17.73309V45.66878C17.73309 45.80815 17.73309 45.99753 17.53402 45.99753C17.33465 45.99753 17.33465 45.80815 17.33465 45.66878V42.8794H14.545586C14.406211 42.8794 14.216836 42.8794 14.216836 42.68034C14.216836 42.48097 14.406211 42.48097 14.545586 42.48097H17.33465V39.691903C17.33465 39.552528 17.33465 39.363153 17.53402 39.363153C17.73309 39.363153 17.73309 39.552528 17.73309 39.691903V42.48097Z'/> -<path d='M22.929688 55.8398H40.9297L42.4297 58.8398L45.4297 52.8398L48.4297 58.8398L51.4297 52.8398L54.4297 58.8398L57.4297 52.8398L58.9297 55.8398H76.9297' stroke='#000' fill='none' stroke-width='.8' stroke-miterlimit='10'/> -<path d='M49.84228 50.62824C49.90228 50.86731 49.93197 50.96699 50.12134 50.99668C50.21103 51.00668 50.52978 51.00668 50.72884 51.00668C51.43634 51.00668 52.54197 51.00668 52.54197 50.02043C52.54197 49.68199 52.38259 48.99449 51.99416 48.60606C51.73509 48.34699 51.20697 48.02824 50.31072 48.02824H49.19509L49.84228 50.62824ZM51.27697 47.89887C52.28291 48.11793 53.46822 48.81512 53.46822 49.82137C53.46822 50.67793 52.57166 51.31543 51.26697 51.31543H48.42791C48.22884 51.31543 48.13916 51.31543 48.13916 51.11637C48.13916 51.00668 48.22884 51.00668 48.41791 51.00668C48.43791 51.00668 48.62728 51.00668 48.79634 50.98668C48.97572 50.96699 49.06541 50.95699 49.06541 50.82731C49.06541 50.78762 49.05541 50.75762 49.02572 50.63824L47.69072 45.288869C47.59134 44.900432 47.57134 44.820744 46.784469 44.820744C46.605094 44.820744 46.515407 44.820744 46.515407 44.621682C46.515407 44.511994 46.634782 44.511994 46.654782 44.511994C46.933844 44.511994 47.63103 44.541994 47.91009 44.541994C48.18884 44.541994 48.89603 44.511994 49.17509 44.511994C49.25478 44.511994 49.37416 44.511994 49.37416 44.711369C49.37416 44.820744 49.28447 44.820744 49.09541 44.820744C48.72666 44.820744 48.44791 44.820744 48.44791 45.000119C48.44791 45.059807 48.46791 45.109807 48.47759 45.169494L49.13509 47.80918H50.32072C51.22697 47.80918 51.40634 47.25137 51.40634 46.90262C51.40634 46.75324 51.32666 46.44449 51.26697 46.21543C51.19728 45.93637 51.10759 45.56793 51.10759 45.368557C51.10759 44.292932 52.30291 44.292932 52.43228 44.292932C53.27916 44.292932 53.62759 45.298869 53.62759 45.438244C53.62759 45.55793 53.51822 45.55793 53.50822 45.55793C53.41853 45.55793 53.39853 45.488244 53.37853 45.418557C53.12978 44.681369 52.70134 44.511994 52.47228 44.511994C52.14353 44.511994 52.07384 44.731057 52.07384 45.119494C52.07384 45.428557 52.13353 45.93637 52.17322 46.25512C52.19322 46.39481 52.21322 46.58387 52.21322 46.72324C52.21322 47.49043 51.54572 47.79918 51.27697 47.89887Z'/> -<path d='M78.3672 55.8398C78.3672 56.6367 77.7227 57.2812 76.9297 57.2812C76.1328 57.2812 75.4883 56.6367 75.4883 55.8398C75.4883 55.0469 76.1328 54.4023 76.9297 54.4023C77.7227 54.4023 78.3672 55.0469 78.3672 55.8398Z'/> -<path d='M78.3672 55.8398C78.3672 56.6367 77.7227 57.2812 76.9297 57.2812C76.1328 57.2812 75.4883 56.6367 75.4883 55.8398C75.4883 55.0469 76.1328 54.4023 76.9297 54.4023C77.7227 54.4023 78.3672 55.0469 78.3672 55.8398Z' stroke='#000' fill='none' stroke-width='.8' stroke-miterlimit='10'/> -<path d='M76.9297 55.8398V30.6406' stroke='#000' fill='none' stroke-width='.8' stroke-miterlimit='10'/> -<path d='M70.9297 30.6406H82.9297' stroke='#000' fill='none' stroke-width='.8' stroke-miterlimit='10'/> -<path d='M70.9297 27.0391H82.9297' stroke='#000' fill='none' stroke-width='.8' stroke-miterlimit='10'/> -<path d='M76.9297 27.0391V1.839844' stroke='#000' fill='none' stroke-width='.8' stroke-miterlimit='10'/> -<path d='M71.73309 35.27992H74.51246C74.65184 35.27992 74.84121 35.27992 74.84121 35.4793C74.84121 35.67836 74.65184 35.67836 74.51246 35.67836H71.73309V38.46774C71.73309 38.60711 71.73309 38.79649 71.53402 38.79649C71.33465 38.79649 71.33465 38.60711 71.33465 38.46774V35.67836H68.545586C68.406211 35.67836 68.216836 35.67836 68.216836 35.4793C68.216836 35.27992 68.406211 35.27992 68.545586 35.27992H71.33465V32.490861C71.33465 32.351486 71.33465 32.162111 71.53402 32.162111C71.73309 32.162111 71.73309 32.351486 71.73309 32.490861V35.27992Z'/> -<path d='M68.88389 30.40063C68.88389 30.93844 68.62483 31.09782 68.44545 31.09782C68.19639 31.09782 67.95733 30.83876 67.95733 30.61969C67.95733 30.49032 68.00733 30.43032 68.1167 30.32094C68.32608 30.12157 68.45545 29.86282 68.45545 29.50407C68.45545 29.08563 67.84795 26.804694 66.68233 26.804694C66.17451 26.804694 65.94545 27.153131 65.94545 27.671256C65.94545 28.22907 66.2142 28.95626 66.52295 29.78313C66.59264 29.95219 66.64264 30.09188 66.64264 30.28094C66.64264 30.72938 66.32389 31.09782 65.82576 31.09782C64.889513 31.09782 64.510763 29.65344 64.510763 29.56376C64.510763 29.46438 64.610451 29.46438 64.630451 29.46438C64.730138 29.46438 64.740138 29.48407 64.789826 29.64344C65.078576 30.64969 65.50701 30.87876 65.79576 30.87876C65.87545 30.87876 66.04483 30.87876 66.04483 30.56001C66.04483 30.31094 65.94545 30.04188 65.87545 29.86282C65.43733 28.70719 65.30764 28.24907 65.30764 27.82063C65.30764 26.744694 66.18451 26.585319 66.64264 26.585319C68.31608 26.585319 68.88389 29.88251 68.88389 30.40063Z'/> -<path d='M74.2234 21.99998C74.39277 21.99998 74.57215 21.99998 74.57215 22.19935C74.57215 22.39841 74.39277 22.39841 74.2234 22.39841H68.83434C68.66496 22.39841 68.485898 22.39841 68.485898 22.19935C68.485898 21.99998 68.66496 21.99998 68.83434 21.99998H74.2234Z'/> -<path d='M92.01759 32.35915C92.01759 32.38884 91.99759 32.45884 91.9079 32.45884C91.8779 32.45884 91.86822 32.44884 91.75853 32.33915L91.06134 31.57228C90.97165 31.71165 90.51322 32.45884 89.40759 32.45884C87.18634 32.45884 84.945091 30.25728 84.945091 27.94634C84.945091 26.302592 86.1204 25.216967 87.64447 25.216967C88.51103 25.216967 89.26822 25.615405 89.79603 26.07353C90.72259 26.8904 90.89197 27.79697 90.89197 27.82666C90.89197 27.92634 90.79228 27.92634 90.77228 27.92634C90.71259 27.92634 90.6629 27.90634 90.6429 27.82666C90.55322 27.5379 90.32415 26.83072 89.63665 26.252905C88.94947 25.695092 88.32197 25.525717 87.80384 25.525717C86.90728 25.525717 85.85165 26.04353 85.85165 27.59759C85.85165 28.1654 86.06072 29.77915 87.05665 30.94447C87.66447 31.65197 88.60072 32.14978 89.48728 32.14978C90.50353 32.14978 91.09103 31.38291 91.09103 30.22728C91.09103 29.82884 91.06134 29.81884 91.06134 29.71947C91.06134 29.61978 91.17072 29.61978 91.21072 29.61978C91.34009 29.61978 91.34009 29.63978 91.39009 29.81884L92.01759 32.35915Z'/> -<path d='M78.3672 1.839844C78.3672 2.636719 77.7227 3.28125 76.9297 3.28125C76.1328 3.28125 75.4883 2.636719 75.4883 1.839844C75.4883 1.042969 76.1328 .39844 76.9297 .39844C77.7227 .39844 78.3672 1.042969 78.3672 1.839844Z'/> -<path d='M78.3672 1.839844C78.3672 2.636719 77.7227 3.28125 76.9297 3.28125C76.1328 3.28125 75.4883 2.636719 75.4883 1.839844C75.4883 1.042969 76.1328 .39844 76.9297 .39844C77.7227 .39844 78.3672 1.042969 78.3672 1.839844Z' stroke='#000' fill='none' stroke-width='.8' stroke-miterlimit='10'/> -<path d='M76.9297 55.8398H112.9297' stroke='#000' fill='none' stroke-width='.8' stroke-miterlimit='10'/> -<path d='M112.9297 55.8398V37.8398' stroke='#000' fill='none' stroke-width='.8' stroke-miterlimit='10'/> -<path d='M112.9297 37.8398H112.5273' stroke='#000' fill='none' stroke-width='.8' stroke-miterlimit='10'/> -<path d='M112.9297 37.8398C113.7344 37.8398 114.4766 37.4102 114.8789 36.7148C115.2773 36.0195 115.2773 35.1602 114.8789 34.4648C114.4766 33.7695 113.7344 33.3398 112.9297 33.3398' stroke='#000' fill='none' stroke-width='.8' stroke-miterlimit='10'/> -<path d='M112.9297 33.3398H112.5273' stroke='#000' fill='none' stroke-width='.8' stroke-miterlimit='10'/> -<path d='M112.9297 33.3398C113.7344 33.3398 114.4766 32.9102 114.8789 32.2148C115.2773 31.5195 115.2773 30.6602 114.8789 29.9648C114.4766 29.2695 113.7344 28.8398 112.9297 28.8398' stroke='#000' fill='none' stroke-width='.8' stroke-miterlimit='10'/> -<path d='M112.9297 28.8398H112.5273' stroke='#000' fill='none' stroke-width='.8' stroke-miterlimit='10'/> -<path d='M112.9297 28.8398C113.7344 28.8398 114.4766 28.4102 114.8789 27.7148C115.2773 27.0195 115.2773 26.1602 114.8789 25.4648C114.4766 24.7695 113.7344 24.3398 112.9297 24.3398' stroke='#000' fill='none' stroke-width='.8' stroke-miterlimit='10'/> -<path d='M112.9297 24.3398H112.5273' stroke='#000' fill='none' stroke-width='.8' stroke-miterlimit='10'/> -<path d='M112.9297 24.3398C113.7344 24.3398 114.4766 23.9102 114.8789 23.2148C115.2773 22.5195 115.2773 21.6602 114.8789 20.9648C114.4766 20.2695 113.7344 19.8398 112.9297 19.8398' stroke='#000' fill='none' stroke-width='.8' stroke-miterlimit='10'/> -<path d='M112.9297 19.8398H112.5273' stroke='#000' fill='none' stroke-width='.8' stroke-miterlimit='10'/> -<path d='M112.9297 19.8398V1.839844' stroke='#000' fill='none' stroke-width='.8' stroke-miterlimit='10'/> -<path d='M107.9536 31.46259C108.04297 31.82103 108.07297 31.93072 109.00922 31.93072C109.30828 31.93072 109.38797 31.93072 109.38797 32.12009C109.38797 32.23947 109.27828 32.23947 109.2286 32.23947C108.89985 32.23947 108.08297 32.20978 107.75422 32.20978C107.45547 32.20978 106.72828 32.23947 106.42953 32.23947C106.35953 32.23947 106.24016 32.23947 106.24016 32.0404C106.24016 31.93072 106.32985 31.93072 106.51891 31.93072C106.53891 31.93072 106.72828 31.93072 106.89766 31.91072C107.07703 31.89103 107.16641 31.88103 107.16641 31.75134C107.16641 31.71165 107.15672 31.68166 107.12672 31.56228L105.79203 26.212905C105.69235 25.824467 105.67235 25.74478 104.885471 25.74478C104.716096 25.74478 104.616409 25.74478 104.616409 25.545717C104.616409 25.43603 104.706096 25.43603 104.885471 25.43603H109.49735C109.73641 25.43603 109.74641 25.43603 109.80641 25.605405L110.59328 27.75697C110.63297 27.86666 110.63297 27.88634 110.63297 27.89634C110.63297 27.93634 110.60328 28.00603 110.5136 28.00603C110.42391 28.00603 110.41391 27.95634 110.34422 27.79697C110.00547 26.8804 109.56703 25.74478 107.84391 25.74478H106.90766C106.76797 25.74478 106.74828 25.74478 106.68828 25.75478C106.58891 25.76478 106.55891 25.77478 106.55891 25.854467C106.55891 25.884155 106.55891 25.904155 106.6086 26.08353L107.9536 31.46259Z'/> -<path d='M111.1289 48.6406L112.9297 41.4414L114.7266 48.6406Z'/> -<path d='M111.1289 48.6406L112.9297 41.4414L114.7266 48.6406Z' stroke='#000' fill='none' stroke-width='.5' stroke-miterlimit='10'/> -<path d='M112.9297 43.0898V48.6406' stroke='#000' fill='none' stroke-width='.8' stroke-miterlimit='10'/> -<path d='M117.27603 48.80461C117.27603 49.00398 117.13634 49.16336 116.90728 49.16336C116.63853 49.16336 116.36947 48.90429 116.36947 48.63555C116.36947 48.44617 116.50884 48.27679 116.7479 48.27679C116.97697 48.27679 117.27603 48.50586 117.27603 48.80461ZM116.51884 45.05929C116.63853 45.34836 116.63853 45.36805 116.7379 45.63711C116.81759 45.83617 116.86759 45.97586 116.86759 46.16492C116.86759 46.61336 116.54884 46.98179 116.05072 46.98179C115.114466 46.98179 114.735716 45.53742 114.735716 45.44773C114.735716 45.34836 114.835404 45.34836 114.855404 45.34836C114.955091 45.34836 114.965091 45.36805 115.014779 45.52742C115.283841 46.46398 115.68228 46.76273 116.02072 46.76273C116.1004 46.76273 116.26978 46.76273 116.26978 46.44398C116.26978 46.23461 116.20009 46.02555 116.1604 45.92586C116.08072 45.66711 115.63228 44.51148 115.4729 44.08305C115.373216 43.82398 115.243841 43.495545 115.243841 43.28617C115.243841 42.818045 115.58259 42.469295 116.06072 42.469295C116.99697 42.469295 117.36572 43.91367 117.36572 44.00336C117.36572 44.10304 117.27603 44.10304 117.24603 44.10304C117.14634 44.10304 117.14634 44.07305 117.09665 43.92367C116.91728 43.29617 116.58853 42.68867 116.08072 42.68867C115.91134 42.68867 115.84165 42.788045 115.84165 43.01742C115.84165 43.26617 115.90134 43.405858 116.1304 44.01336L116.51884 45.05929Z'/> -<path d='M112.9297 1.839844H22.929688' stroke='#000' fill='none' stroke-width='.8' stroke-miterlimit='10'/> -</g> -</g> -</svg> diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/dpv/quickDPV.svg b/Master/texmf-dist/doc/latex/circuit-macros/examples/dpv/quickDPV.svg deleted file mode 100644 index c648e2d9988..00000000000 --- a/Master/texmf-dist/doc/latex/circuit-macros/examples/dpv/quickDPV.svg +++ /dev/null @@ -1,104 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" -"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> -<!-- Creator: dpic version 2022.12.01 option -v for SVG 1.1 --> -<!-- width="182" height="82" --> -<svg - xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" - xml:space="preserve" - style="shape-rendering:geometricPrecision; text-rendering:geometricPrecision; - image-rendering:optimizeQuality; fill-rule:evenodd; clip-rule:evenodd" - width="180.8px" height="81.12px" - viewBox="0 0 180.8 81.12" - font-size="11pt" text-anchor="middle" - stroke="black" stroke-miterlimit="10" stroke-width="1.066667" fill="none"> -<g> -<a xlink:href="SourcesDPV.svg" target="_blank"> - <g stroke="rgb(0,0,255)"> -<line x1="39.466667" y1="76.533333" x2="39.466667" y2="52.533333" /> -<circle cx="39.466667" cy="40.533333" r="12" /> -<line x1="39.466667" y1="28.533333" x2="39.466667" y2="4.533333" /> -</g></a> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="36.8" y="64.88">-</text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="24.8" y="45.373333" -><tspan font-style="italic">v<tspan font-size="70%" -dy="0.66ex" dx="">s</tspan><tspan -font-size="70%" dy="-0.66ex" -dx="-0.5ex"> </tspan></tspan></text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="36.8" y="25.866667">+</text> -<a xlink:href="ResistorsDPV.svg" target="_blank"> - <g stroke="rgb(0,0,255)"> -<polyline points="39.466667,4.533333 63.466667,4.533333 -65.466667,0.533333 -69.466667,8.533333 -73.466667,0.533333 -77.466667,8.533333 -81.466667,0.533333 -85.466667,8.533333 -87.466667,4.533333 -111.466667,4.533333" /> -</g></a> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - x="75.466667" y="20.88"><tspan font-style="italic">R</tspan></text> -<circle fill="black" - cx="111.466667" cy="4.533333" r="1.92" /> -<line x1="111.466667" y1="4.533333" x2="111.466667" y2="38.133333" /> -<line x1="103.466667" y1="38.133333" x2="119.466667" y2="38.133333" /> -<line x1="103.466667" y1="42.933333" x2="119.466667" y2="42.933333" /> -<line x1="111.466667" y1="42.933333" x2="111.466667" y2="76.533333" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="108.8" y="35.466667">+</text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="100.8" y="45.373333"><tspan font-style="italic">v</tspan></text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="108.8" y="55.28">-</text> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="start" - x="122.133333" y="45.373333"><tspan font-style="italic">C</tspan></text> -<circle fill="black" - cx="111.466667" cy="76.533333" r="1.92" /> -<line x1="111.466667" y1="4.533333" x2="159.466667" y2="4.533333" /> -<line x1="159.466667" y1="4.533333" x2="159.466667" y2="28.533333" /> -<line x1="159.466667" y1="28.533333" x2="158.933333" y2="28.533333" /> -<path d="M 159.466667,28.533333 - A 3 3 0 1 1 159.466667,34.533333" /> -<line x1="159.466667" y1="34.533333" x2="158.933333" y2="34.533333" /> -<path d="M 159.466667,34.533333 - A 3 3 0 1 1 159.466667,40.533333" /> -<line x1="159.466667" y1="40.533333" x2="158.933333" y2="40.533333" /> -<path d="M 159.466667,40.533333 - A 3 3 0 0 1 159.466667,46.533333" /> -<line x1="159.466667" y1="46.533333" x2="158.933333" y2="46.533333" /> -<path d="M 159.466667,46.533333 - A 3 3 0 1 1 159.466667,52.533333" /> -<line x1="159.466667" y1="52.533333" x2="158.933333" y2="52.533333" /> -<line x1="159.466667" y1="52.533333" x2="159.466667" y2="76.533333" /> -<text font-size="11pt" stroke-width="0.266667" - fill="black" - text-anchor="end" - x="156.266667" y="45.373333"><tspan font-style="italic">L</tspan></text> -<polygon stroke-width="0" fill="black" - points="161.866667,14.133333 159.466667,23.733333 -157.066667,14.133333" /> -<line x1="159.466667" y1="21.534344" x2="159.466667" y2="14.133333" /> -<text font-size="11pt" stroke-width="0.2pt" fill="black" text-anchor="start" - x="162.133333" y="22.673838"><tspan font-style="italic">i</tspan></text> -<line x1="159.466667" y1="76.533333" x2="39.466667" y2="76.533333" /> -</g></svg> diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/examples.pdf b/Master/texmf-dist/doc/latex/circuit-macros/examples/examples.pdf Binary files differindex a567ad90811..ac0892249dd 100644 --- a/Master/texmf-dist/doc/latex/circuit-macros/examples/examples.pdf +++ b/Master/texmf-dist/doc/latex/circuit-macros/examples/examples.pdf diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/ASMEbox.m4 b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/ASMEbox.m4 new file mode 100644 index 00000000000..6dc9d02d8ac --- /dev/null +++ b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/ASMEbox.m4 @@ -0,0 +1,55 @@ +.PS +# ASME_Y14-5.m4 +# https://en.wikipedia.org/wiki/Geometric_dimensioning_and_tolerancing +cct_init +sinclude(ASME_Y14-5.m4def) +sinclude(../ASME_Y14-5.m4def) +ifsvg(`svg_font(sans-serif,12bp__,3bp__)', +`textht = 11bp__*2/3 + iflatex(`command "{\sf"')') + + boxht = 7.5/0.5*textht + boxwid = 15/7.5 * boxht + circlerad = 2.3/0.5*textht*0.5 + thicklines_(1) +# ASME Y14.5 specs: + arrowht = textht*0.8 + arrowwid = textht*0.6 + + Box: box + Circle: circle at Box.c; {CM: move from Circle.se down textht right textht} +thinlines_ +CLU: ctrline( up_ Box.ht with .c at Box.c, Box.ht/2 ) +CLH: ctrline( right Box.ht with .c at Box.c, Box.ht/2 ) + + dimension_(from Box.nw to Box.n,Box.ht/6) + thicklines_(1) + {Y14_frame("10") with .s at AS_C+(0,textht/2)} + thinlines_ + line from 3rd last line.start to CLU.end + dimension_(from Box.w to Box.nw,Box.ht/6) + thicklines_(1) + {Y14_frame("5") with .e at AS_C+(-textht/2,0)} + thinlines_ + line from 4th last line.start to CLH.start + +thicklines_ + DA: Y14_frame("A") at Box.ne+(-textht*1.5,textht*5) + datumarrow(from DA.s to (DA,Box.n)) + DB: Y14_frame("B") at Box.sw+(-textht*5,textht*2) + datumarrow(from DB.e to (Box.w,DB)) + + F: Y14_frame(Y14_pos_, + Y14_dia_;"0.03";"(M)", + "A","B","C") with .w at Box.se+(-textht*4,-textht*2) + G: Y14_frame(Y14_fla_,Y14_cyl_,Y14_lin_, + Y14_sur_,Y14_per_,Y14_ang_, + Y14_par_) with .nw at F.sw+(0,-0.1) + H: Y14_frame(Y14_pos_,Y14_cir_,Y14_tot_,Y14_dia_) \ + with .nw at G.sw+(0,-0.1) + + { CB: move left textht from F.w } + arrow <- from Circle.se to Intersect_(CM,CB) then to F.w + +command iflatex(`"}"',ifsvg(`"</g>"')) +.PE diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/Ant.m4 b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/Ant.m4 new file mode 100644 index 00000000000..f4a22226a20 --- /dev/null +++ b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/Ant.m4 @@ -0,0 +1,30 @@ +.PS +# Ant.m4 (Langton's ant) +# https://tex.stackexchange.com/questions/361838/how-to-create-a-langtons-ant-in-latex/361891 +# https://en.wikipedia.org/wiki/Langton%27s_ant +gen_init +NeedDpicTools + picwid = 5 + D: (0,0); DD: (1,0); t[D] = 0 + minx = 0; miny = 0; maxx = 0; maxy = 0 + for i = 0 to 10500 do { + if (t[D]%2) == 0 then { DD: (-DD.y,DD.x) } else { DD: (DD.y,-DD.x) } + t[D] += 1 + D: D+DD + if D.x > maxx then { maxx = D.x; for y = miny to maxy do { t[maxx,y] = 0 }} \ + else { if D.x < minx then { + minx = D.x; for y = miny to maxy do { t[minx,y] = 0 }}} + if D.y > maxy then { maxy = D.y; for x = minx to maxx do { t[x,maxy] = 0 }} \ + else { if D.y < miny then { + miny = D.y; for x = minx to maxx do { t[x,miny] = 0 }}} + } + boxwid = picwid/(maxx-minx) + boxht = picwid/(maxy-miny) + if boxht > boxwid then { boxht = boxwid } else { boxwid = boxht } + circlerad = boxht/2 + hue = 240; val = 1 + for i = minx to maxx do { for j = miny to maxy do { + if t[i,j]!=0 then { sat = (t[i,j]%20)/20 + hsvtorgb(hue,sat,val,r,g,b) + circle colored rgbstring(r,g,b) at (-i,j)*boxwid } }} +.PE diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/ArrowFn.m4 b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/ArrowFn.m4 index f8ca1527224..f8ca1527224 100644 --- a/Master/texmf-dist/doc/latex/circuit-macros/examples/ArrowFn.m4 +++ b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/ArrowFn.m4 diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/Attention.m4 b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/Attention.m4 index 7f0b7127c7a..7f0b7127c7a 100644 --- a/Master/texmf-dist/doc/latex/circuit-macros/examples/Attention.m4 +++ b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/Attention.m4 diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/Autoencoder.m4 b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/Autoencoder.m4 index 92a81ac9509..92a81ac9509 100644 --- a/Master/texmf-dist/doc/latex/circuit-macros/examples/Autoencoder.m4 +++ b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/Autoencoder.m4 diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/Bridge.m4 b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/Bridge.m4 new file mode 100644 index 00000000000..74717922391 --- /dev/null +++ b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/Bridge.m4 @@ -0,0 +1,35 @@ +.PS +# Bridge.m4 +cct_init +linewid = 1.5 + down_ + AC: source(up_ elen_,S) + line right_ elen_ + dlen = linewid*2/3 +Bridge: [ + N: Here; S: Here+(0,-2*dlen); E: N+(dlen,-dlen); W: N+(-dlen,-dlen) + diode(from N to E) + diode(from S to E) + diode(from W to N) + diode(from W to S) + ] at (Here,AC) + + line from Bridge.N to last line.end + line from Bridge.S to (Bridge.S,AC.start) + Gr: line to AC.start + line from Bridge.E right_ dlen + G: gap(down_ Bridge.ht/2+dimen_/4,1); llabel(+,,-) + line from Bridge.W left_ dlen/4 + crossover(to (Here,G.end),,Gr) + line to G.end chop 0 chop dotrad_ + + [ L: line right_ linewid/3 + sinusoid( linewid/6,twopi_/linewid*4,-pi_/2,0,linewid/8) with .End at L + sinusoid( linewid/6,twopi_/linewid*4,-pi_/2,0,linewid/8) with .Start at L + ] at G + R: resistor(down_ G.len from G.start+(dimen_/2,0)); llabel(,R) + arrow wid arrowwid*2 from R.start to 0.5<R.start,G.start> + arrow wid arrowwid*2 from R.end to 0.5<R.end,G.end> + + +.PE diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/CSlight.m4 b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/CSlight.m4 index 720e74f9e2b..720e74f9e2b 100644 --- a/Master/texmf-dist/doc/latex/circuit-macros/examples/CSlight.m4 +++ b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/CSlight.m4 diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/Ccurve.m4 b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/Ccurve.m4 index 4aed3fb1ab2..6f3b537aac5 100644 --- a/Master/texmf-dist/doc/latex/circuit-macros/examples/Ccurve.m4 +++ b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/Ccurve.m4 @@ -1,6 +1,7 @@ .PS # Ccurve.m4 gen_init +scale = 1.5 # Gosper C curve `define' c_curve {if $3==0 then { continue by ($1,$2) } else { diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/Chuck.m4 b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/Chuck.m4 index 2c5dfb76f32..df83a8ce0e1 100644 --- a/Master/texmf-dist/doc/latex/circuit-macros/examples/Chuck.m4 +++ b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/Chuck.m4 @@ -61,11 +61,6 @@ scale = 25.4*2 tic = 3.6bp__ command "{\sf" -#psset_(linecolor=white) -#command "\color{white}" - -#include(Lettering.m4) -#Letter_init define(`visible_thick',`linethick_(visibleth)') define(`hidden_thick',`linethick_(hiddenth)') diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/AntiqueClock.m4 b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/Clocks.m4 index c77950fe00d..2c8cd097daf 100644 --- a/Master/texmf-dist/doc/latex/circuit-macros/examples/AntiqueClock.m4 +++ b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/Clocks.m4 @@ -140,6 +140,90 @@ ifpgf(\rotatebox{%g}{%g}))",`$'2,`$'3) } ]') Clock1: AntiqueClock - Clock2: AntiqueClock(4,50,07,2) at Clock1.e+(1.5,0) +# Clock2: AntiqueClock(4,50,07,2) at Clock1.e+(1.5,0) + Clock2: AntiqueClock(4,50,07,2) with .nw at Clock1.ne+(0.5,0) + Clock3: [ + linethick = 1.5 + arrowwid = 5 pt__ + + rgbfill(255/255,250/255,205/255, + Clock: circle rad 0.75 at (0,0) ) + + command "\newcounter{hour}" + for time=1 to 12 do { + sprintf("\setcounter{hour}{%g}\Roman{hour}",time) \ + at Rect_(Clock.rad*0.85,90-time*30) + } + line <-> from Rect_(Clock.rad*0.95,90-8.5*30) to Clock \ + then to Rect_(Clock.rad*0.7,90-3.5*30) + line thick 1 outline "red" from Clock to Rect_(Clock.rad*0.95,90-0.75*30) + ] with .s at (Clock2,Clock1.s) + +define(`htod',`(90-(`$1')/12*360)') + +# clock1(h:m[:s],diam,color) +define(`ClockA',`[ + clockdiam = ifelse(`$2',,`40 mm__',`$2') + clockrad = clockdiam/2 + stacksplit_(`HMS',ifelse(`$1',,10:10,`$1'),:) + s = HMS; popdef(`HMS') + m = HMS; popdef(`HMS') + ifdef(`HMS',`h = HMS',`h = m; m = s') + C: circle rad clockrad thick 2 shaded ifelse(`$3',,"cyan",`$3') at (0,0) + for t = 1 to 12 do { + if pmod(t,3)==0 then { ticlen = clockrad/5; ticthk = 2 } \ + else { ticlen = clockrad/10; ticthk = 1 } + line thick ticthk from Rect_(clockrad,htod(t)) \ + to Rect_(clockrad-ticlen,htod(t)) + sprintf("\large\sf %g",t) at Rect_(clockrad*3.5/5,htod(t)) + } + line thick 3 from C to Rect_(clockrad*2/5,htod(h+m/60)) + line thick 3 from C to Rect_(clockrad*3/5,htod(m/60*12)) + round(at C, 3) + ifdef(`HMS',`line thick 0.7 outlined "red" from C \ + to Rect_(clockrad*3.5/5,htod(s/60*12)) chop -5bp__ chop 0') + popdef(`HMS') ]') + +[ +CA: ClockA(11:10:35,,"blue!20") + ClockA(10:10,,"blue!20!black!30") + ClockA(10:10:23,,"blue!20!black!30!green!40") + ClockA(10:10,,rgbstring(0.2,0.2,0.7)) + +# calls DrawRoutineName(frac,r,g,b) +# clock2(h:m[:s],diam,color,rim thickness) +define(`ClockB',`[ + clockdiam = ifelse(`$2',,`60 mm__',`$2') + clockrad = clockdiam/2 + stacksplit_(`HMS',ifelse(`$1',,10:10,`$1'),:) + s = HMS; popdef(`HMS') + m = HMS; popdef(`HMS') + ifdef(`HMS',`h = HMS',`h = m; m = s') + rimwd = ifelse(`$4',,9 pt__,`$4') + rimwid = rimwd/(1 pt__) + n = 4 +C: (0,0) + ClockA(`$1',clockdiam-rimwd*2,"green!20") at C +Q:circle diam clockdiam-rimwd thick rimwid \ + outlined rgbstring(0.7,0.7,0.7) at C + Nx: Q.n+(0,Q.thick pt__/2) + +define rimcirc { +#print sprintf("%g: %g,%g,%g",$`'1,$`'2,$`'3,$`'4) + circle diam clockdiam-rimwd thick rimwid/(n+1) \ + outlined rgbstring($`'2,$`'3,$`'4) with .n at Nx-(0,rimwd/(n+1)/2) + Nx : last circle.n+(0,last circle.thick pt__/2) } + + v = 0.1 + ShadeObject(rimcirc, n, + 0,v,v,v, + 1/(n-1),v,v,v, + 1,1,1,1) at C + popdef(`HMS') ]') + +# ClockA(10:10:35,,"green!20") + w = last [].wid + ClockB(10:10:35,w,) with .nw at CA.sw+(10bp__,-0.2) + ] with .nw at 1st [].sw+(0,-0.2) .PE diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/ControlLoop.m4 b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/ControlLoop.m4 new file mode 100644 index 00000000000..6fd915401b4 --- /dev/null +++ b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/ControlLoop.m4 @@ -0,0 +1,40 @@ +.PS +# ControlLoop.m4 +# https://tex.stackexchange.com/questions/636839/how-to-draw-multi-blocks-block-diagram +gen_init +scale = 25.4 + + boxwid = 18 + boxrad = 3 + define summer { $1: circle diam 10 fill_(0.8) + { line from $1.ne to $1.sw; line from $1.nw to $1.se } + { "$+$" at $1.nw rjust } } + + TPG: box ht 22 shaded "Peach" "Transient" "Profile" "Generator" + arrow <- left_ 8 from TPG.w "r" above + arrow right_ 10 from TPG.e+(0,TPG.ht/4) "$r_1$" above + summer(S1) + line right_ 10 from TPG.e+(0,-TPG.ht/4) "$r_2$" above + arrow right_ S1.diam + summer(S2) + arrow right_ 10 from S2.e "$e_2$" above + arrow from S1.e to (Here,S1) "$e_1$" above + NLSF: box ht 22 "Nonlinear" "State Error" "Feedback" shaded "lime" \ + with .w at (Here,TPG) + arrow right_ 10 "$u_o$" below + summer(S3) + {ESO: box ht 30 shaded "Goldenrod" "Extended" "State" "Observer" \ + with .w at (Here.x+5,NLSF.s.y-15) } + arrow right_ 40 + P: box ht 15 shaded "blue!50!white!50" "Plant" + arrow right_ 10 "$y$" above + arrow <- right_ 10 from ESO.e+(0,-ESO.ht/4) "$y$" above + line to (2nd last arrow,Here) then to 2nd last arrow + arrow <- right_ 10 from ESO.e+(0,ESO.ht/4) "$u$" above; corner + line to (Here,P) + for_(1,3,1, + `arrow from ESO.w+(0,ESO.ht*(m4x-2)/3) left_ ESO.w.x-S`'m4x.x then to S`'m4x.s + "$z_`'m4x$" at last arrow.start-(5,0) above + "$-$" at last arrow.end rjust below ') + +.PE diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/Counting.m4 b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/Counting.m4 index 18002ba99ff..18002ba99ff 100644 --- a/Master/texmf-dist/doc/latex/circuit-macros/examples/Counting.m4 +++ b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/Counting.m4 diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/Cruller.m4 b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/Cruller.m4 index d2c215ae133..d2c215ae133 100644 --- a/Master/texmf-dist/doc/latex/circuit-macros/examples/Cruller.m4 +++ b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/Cruller.m4 diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/Cylinder.m4 b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/Cylinder.m4 new file mode 100644 index 00000000000..abe9a9bac7a --- /dev/null +++ b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/Cylinder.m4 @@ -0,0 +1,43 @@ +.PS +# Cylinder.m4 +gen_init(SIdefaults) # lengths are in mm + +define(`cylinder',`[ angle = ifelse(`$3',,20,`$3') + w = ifelse(`$1',,boxwid,`$1') + h = ifelse(`$2',,boxht,`$2') + B: ellipse wid w ht sind(angle)*w + S: box invis wid w ht h fill_(1) with .s at B + line from S.nw to S.sw + line from S.ne to S.se + T: ellipse wid w ht sind(angle)*w at B+(0,h) + ]') + +define Cylinder { [ dtor = atan2(1,0)/90 + if "$1"=="" then { w = boxwid } else { w = $1 } + if "$2"=="" then { h = boxht } else { h = $2 } + if "$3"=="" then { angle = 20 } else { angle = $3 } + B: ellipse wid w ht sin(angle*dtor)*w + S: box invis wid w ht h fill 1 with .s at B + line from S.nw to S.sw + line from S.ne to S.se + T: ellipse wid w ht sin(angle*dtor)*w at B+(0,h) + ] } + +M4: [ + cylinder + move + cylinder(,,15) + move + cylinder(3,50) + ] +"M4 macro" at last [].s below + +Pic: [ + Cylinder + move + Cylinder(,,15) + move + Cylinder(3,50) + ] with .w at M4.e+(5,0) +"pic macro" at last [].s below +.PE diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/Egg.m4 b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/Egg.m4 new file mode 100644 index 00000000000..3cab249877e --- /dev/null +++ b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/Egg.m4 @@ -0,0 +1,42 @@ +.PS +# Egg.m4 +# https://tex.stackexchange.com/questions/74168/how-can-i-draw-an-egg-using-tikz +threeD_init +NeedDpicTools + +define Eggshape { (0.78*cos(($2)/4)*sin($2),-cos($2))*($1) } # -pi < arg2 < pi + + size = 2 + npts = 41 + + HL: Eggshape(size*0.4,-pi_*3/4) # Highlight + P: Eggshape(size,pi_/4) + d = zabs(P) + nlines = int(d/lthick*1.5) + # This way of blending colors is not the + # simplest for a single postprocessor but it + # works for multiple postprocessors, e.g. SVG +define(`Orange',`1, 0.5, 0') +define(`Gray', `0.5, 0.5, 0.5') +define(`White', `1, 1, 1') +define(`eggblend', + `sum3D(sprod3D($1,Orange), + sum3D(sprod3D($2,White), + sprod3D($3,Gray)))') + +define(`normalize',`($1)/($1+$2+$3), ($2)/($1+$2+$3), ($3)/($1+$2+$3)') + +define EggLine { + for i=0 to npts do { + P[i]: HL*(1-($1))+Eggshape(size*($1),i/npts*twopi_-pi_) } + fitcurve(P,npts,outlined rgbstring($2,$3,$4)) + } + + ShadeObject(EggLine, nlines, + 0, eggblend(normalize(0.3, 1, 0)), + 0.2, eggblend(normalize(0.5, 0.5, 0)), + 0.5, eggblend(normalize(0.5, 0.4, 0.2)), + 1, eggblend(normalize(0.5, 0, 0.7)) + ) + +.PE diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/Euro.m4 b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/Euro.m4 index 26230facbe7..26230facbe7 100644 --- a/Master/texmf-dist/doc/latex/circuit-macros/examples/Euro.m4 +++ b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/Euro.m4 diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/Eye.m4 b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/Eye.m4 index 1251afca095..1251afca095 100644 --- a/Master/texmf-dist/doc/latex/circuit-macros/examples/Eye.m4 +++ b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/Eye.m4 diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/Fefets.m4 b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/Fefets.m4 new file mode 100644 index 00000000000..04d624de356 --- /dev/null +++ b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/Fefets.m4 @@ -0,0 +1,75 @@ +.PS +# https://github.com/circuitikz/circuitikz/issues/515 +# `Fefets.m4' +cct_init + +textht = 0.1 +define(`rmove',0.75) + +Row1: [ + J: Fe_fet(right_ dimen_) + {`"{\tt $\;$ Fe\_fet}"' at J.s+(0,-0.05) below + "$G$" at J.G rjust + "$S$" at J.S rjust + "$D$" at J.D ljust } + move right_ + J: Fe_fet(up_ dimen_) + {`"{\tt (up\_ dimen\_)}"' at J.s+(0,-0.15) below + "$G$" at J.G rjust + "$S$" at J.S rjust + "$D$" at J.D ljust } + move right_ + J: Fe_fet(left_ dimen_) + {`"{\tt (left\_ dimen\_)}"' at J.s+(0,-0.05) below + "$G$" at J.G rjust + "$S$" at J.S ljust + "$D$" at J.D rjust } + move right_ + J: Fe_fet(down_ dimen_) + {`"{\tt (down\_ dimen\_)}"' at J.s+(0,-0.15) below + "$G$" at J.G ljust + "$S$" at J.S rjust + "$D$" at J.D ljust } + ] +Row2: [ + J: Fe_fet(right_ dimen_,R) + {`"{\tt $\;$ Fe\_fet}"' at J.s+(0,-0.05) below + "$G$" at J.G rjust + "$S$" at J.S rjust + "$D$" at J.D ljust } + move right_ + J: Fe_fet(up_ dimen_,R) + {`"{\tt (up\_ dimen\_,R)}"' at J.s+(0,-0.15) below + "$G$" at J.G ljust + "$S$" at J.S rjust + "$D$" at J.D ljust } + move right_ + J: Fe_fet(left_ dimen_,R) + {`"{\tt (left\_ dimen\_,R)}"' at J.s+(0,-0.05) below + "$G$" at J.G rjust + "$S$" at J.S ljust + "$D$" at J.D rjust } + move right_ + J: Fe_fet(down_ dimen_,R) + {`"{\tt (down\_ dimen\_,R)}"' at J.s+(0,-0.15) below + "$G$" at J.G rjust + "$S$" at J.S rjust + "$D$" at J.D ljust } + ] with .nw at last [].sw+(0,-0.5) +Row3: [ + J: Fe_fet(right_ dimen_) + {`"{\tt $\;$ Fe\_fet}"' at J.s+(0,-0.05) below + "$G$" at J.G rjust + "$S$" at J.S rjust + "$D$" at J.D ljust } + move right_ + J: Fe_fet(right_ dimen_,,TEDQSuB) + {`"{\tt $\;$ Fe\_fet(,,TEDSQuB)}"' at J.s+(0,-0.15) below + "$G$" at J.G rjust + "$S$" at J.S rjust + "$D$" at J.D ljust } + ] with .nw at last [].sw+(0,-0.5) +#Row4: [ +# ] with .nw at last [].sw+(0,-0.5) + +.PE diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/FieldLines.m4 b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/FieldLines.m4 new file mode 100644 index 00000000000..0832e20d92a --- /dev/null +++ b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/FieldLines.m4 @@ -0,0 +1,24 @@ +.PS +# https://tex.stackexchange.com/questions/593866/magnetic-field-with-2-coils +cct_init(SIdefaults) + + setdir_(R) + W1: winding(,20,5,8,10) + line dn_ 10 from W1.T1; dot(,,1) + line dn_ 10 from W1.T2; dot(,,1) + W2: winding(,20,5,8,10) with .w_ at W1.e_+vec_(10,0) + line dn_ 10 from W2.T1; dot(,,1) + line dn_ 10 from W2.T2; dot(,,1) + for i=2 to -2 by -1 do { + spline 0.55 \ + from W2.e_+vec_(30,10/4*i*3) \ + to W2.e_+vec_(25,10/4*i*2) \ + then to W2.e_+vec_(0,10/4*i) \ + then to W1.w_+vec_(0,10/4*i) \ + then to W1.w_+vec_(-25,10/4*i*2) \ + then to W1.w_+vec_(-30,10/4*i*3) + arrow wid 2 ht 2 dn_ i*0.66 rt_ 2 at W1.w_+vec_(-25,10/4*i*2.35) + arrow wid 2 ht 2 up__ i*0.66 rt_ 2 at W2.e_+vec_(25,10/4*i*2.35) + } + +.PE diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/Floor.m4 b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/Floor.m4 index 0f3076174a3..0f3076174a3 100644 --- a/Master/texmf-dist/doc/latex/circuit-macros/examples/Floor.m4 +++ b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/Floor.m4 diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/Flow2.m4 b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/Flow2.m4 new file mode 100644 index 00000000000..6f8e2affbf4 --- /dev/null +++ b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/Flow2.m4 @@ -0,0 +1,47 @@ +.PS +# https://tex.stackexchange.com/questions/661461/flowchart-with-overlapping-of-the-rows +sinclude(FlowchartDefs.m4def) +sinclude(../FlowchartDefs.m4def) + +down_ + smallsep = boxht/3 + testw = fboxwid*7/4 + testh = fboxht*9/4 + Start: Fbox("Start",,rad boxht/8 shaded "red!30") + arrow down_ smallsep "False" ljust + Input: Fdata(`"Input: $f(), a, b, \epsilon$"',wid boxwid*5/4,, + shaded "blue!30") + arrow down_ smallsep + Formula1: Fbox(`"$c=(a+b)/2$"',,shaded "orange!30") + arrow down_ smallsep + Test1: Ftest("if:" `"$f(a)*f(b) > 0$" "\vphantom{\vrule height6pt}"', + wid testw ht testh, shaded "green!30") + A2: arrow down_ smallsep "False" ljust + Test2: Ftest("while:" `"$f(c)\neq 0 \;\&$" "$|f(b)-f(a)| > \delta$" \ + "\vphantom{\vrule height6pt}"',wid testw ht testh, shaded "green!30") + arrow down_ smallsep "True" ljust + Formula2: Fbox(`"$c=(a+b)/2$"',,shaded "orange!30") + arrow down_ smallsep + Test3: Ftest("if:" `"$f(a)*f(c) < 0$" "\vphantom{\vrule height6pt}"', + wid testw ht testh, shaded "green!30") + { arrow from Test3.W left_ boxht*2/3 "True" below + Formula3: Fbox(`"$b=c$"',,shaded "orange!30") + arrow from Formula3.N to (Formula3.N,A2) } + arrow down_ smallsep "False" ljust then left Test3.x-Formula3.E.x + Formula4: Fbox(`"$a=c$"',,shaded "orange!30") with .E at Here + { arrow from Formula4.W left_ Formula4.W.x-Formula3.W.x + smallsep \ + then up_ A2.y-Formula4.y then to A2 } + down_ + Output: Fdata(`"Output: $H, v, t$"',wid boxwid*5/4,,shaded "blue!30") \ + with .N at (Test1.E+(3*smallsep,0),Formula4.N) + { arrow from Test1.E right_ Output.N.x-Test1.E.x "True" above \ + then to Output.N + arrow from Test2.E right_ Output.N.x-Test1.E.x "False" above } + arrow down_ smallsep + Plot: Fbox(,wid boxwid*5/4,shaded "orange!30") + { ["Plot:" ljust "H on T and V on T" ljust] with .w at Plot.W+(3bp__,0) } + arrow down_ smallsep + Stop: Fbox("Stop",,rad boxht/8 shaded "red!30") + + +.PE diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/Hexagon.m4 b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/Hexagon.m4 new file mode 100644 index 00000000000..c70e865be36 --- /dev/null +++ b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/Hexagon.m4 @@ -0,0 +1,64 @@ +.PS +# Hexagon.m4 +# https://tex.stackexchange.com/questions/640000/how-to-draw-hexagonal-lattice-with-links-and-string-using-latex?noredirect=1&lq=1 +gen_init + scale = 4 + circlerad = 1/4 + s3 = sqrt(3) + +define cline { line $1 + { if "$2"=="" then { circle thick 0.8 at last line fill_(1) } \ + else { circle thick 0.8 at last line $2 } } } + +define topline { + cline(from $1 up s3 right 1) + cline(right 2) + cline(down s3 right 1) + } + +define botline { + cline(from $1 down s3 right 1) + cline(right 2) + cline(up s3 right 1) + cline(right 2) + } + +define hexagon { line $2 from $1 \ + for_(1,6,1,`to $1+(2,0)+(Rect_(2,180-m4x*60)) \') + move to $1 + (2,0) + for i=1 to 6 do {{circle $3 at Here+(Rect_(s3,210-i*60))}} + if "$4"!="" then {$4 at $1+(2,0)} + } + + + nrows = 4 + ncols = 3 +for i=1 to nrows do { + for j=1 to ncols do { topline((3+(j-1)*6,-s3*(2*i-1))) + topline((0+(j-1)*6,-s3*2*i)) } + cline(from (6*ncols,-2*i*s3) up s3 right 1) + if i != nrows then { cline(from (0,-2*i*s3) down s3 right 1) } \ + else { for j=1 to ncols do { botline(((j-1)*6,-2*nrows*s3)) } } + } + linethick = 2 + cline(from (3,-s3) outlined "red" down_ s3 right_ 1,fill_(0)) + { "$\sigma^x$" at last circle.w rjust } + { "\large $I$" above ljust } + { cline(right_ 2 outlined "red",fill_(0)) + { "$\sigma^x$" at last circle.n above ljust } } + cline(left_ 1 down_ s3 outlined "red",fill_(0)) + { "$\sigma^x$" at last circle.e ljust } + + hexagon((12,-4*s3),thick 2 outlined "blue",shaded "white",) + for a=90 to 360 by 180 do {{ + "\large $\sigma^x\!{=}{-}1$" at (14,-4*s3)+(Rect_(2.25,a)) }} + for a=30 to 360 by 180 do {{ + "\large $\sigma^x\!{=}{-}1$" at (14,-4*s3)+(Rect_(2.75,a)) }} + for a=150 to 360 by 180 do {{ + "\large $\sigma^x\!{=}{-}1$" at (14,-4*s3)+(Rect_(2.75,a)) }} + hexagon(( 3,-7*s3),thick 2 outlined "red" shaded "gray",shaded "black", + "\large $p$") + for a=30 to 360 by 60 do {{ + "\large $\sigma^z$" at (5,-7*s3)+(Rect_(2.5,a)) }} + +.PE diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/Highgain.m4 b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/Highgain.m4 new file mode 100644 index 00000000000..06bc62985ee --- /dev/null +++ b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/Highgain.m4 @@ -0,0 +1,80 @@ +.PS +# Highgain+.m4 +sinclude(tst.dim) +s_init(Highgain) +darrow_init + +fillval = 0.8 +circlerad = 0.35/2 +linewid = linewid*3/4 + +command " +\newcommand{\Ds}{D(s)} +\newcommand{\Gs}{G(s)} +\newcommand{\Hs}{H(s)} +\newcommand{\Ms}{M(s)} +\newcommand{\Ns}{N(s)} +\newcommand{\Ps}{P(s)} +\newcommand{\Qs}{Q(s)} +\newcommand{\Rs}{R(s)} +\newcommand{\Ss}{S(s)} +\newcommand{\Us}{U(s)} +\newcommand{\Ys}{Y(s)} +\newcommand{\Xs}{X(s)} +\newcommand {\mat}[1]{\left[\matrix{#1}\right]} +\newcommand {\adj}{\mathop{\hbox{adj}}\nolimits} +\newcommand {\coldim}{\mathop{\hbox{col dim}}\nolimits} +\newcommand {\colrank}{\mathop{\hbox{column rank}}\nolimits} +\newcommand {\column}{\mathop{\hbox{column}}\nolimits} +\newcommand {\diag}{\mathop{\hbox{diag}}\nolimits} +\newcommand {\trace}{\mathop{\hbox{trace}}\nolimits} +\newcommand {\image}{\mathop{\hbox{image}}\nolimits} +\newcommand {\kernel}{\mathop{\hbox{kernel}}\nolimits} +\newcommand {\opsim}[1]{\mathinner{\raise-.5ex\hbox{\scriptsize #1}\atop% + \raise1.5ex\hbox{$\sim$}}} +\newcommand {\order}{\mathop{\hbox{order}}\nolimits} +\newcommand {\rank}{\mathop{\hbox{rank}}\nolimits} +\newcommand {\rowdim}{\mathop{\hbox{row dim}}\nolimits} +\newcommand {\rowimage}{\mathop{\hbox{row image}}\nolimits} +\newcommand {\row}{\mathop{\hbox{row}}\nolimits} +\newcommand {\rowrank}{\mathop{\hbox{row rank}}\nolimits} +\newcommand {\zeros}{\mathop{\hbox{zeros}}\nolimits} +" + +define(`vectorsize', + `{"$\phantom{\displaystyle `$1'}% + \atop{{\displaystyle /}\atop{\displaystyle `$1'}}$"\ + `$2' }') + +[ +R: darrow(right linewid,,,,,,|-) + { s_box($R$) dabove(at R.start+(5pt__,0)) } +Sum: circle invis "$\sum$" + darrow(right_ linewid*5/4) + { s_box($E$) dabove(at last line) } + vectorsize(p,at 1/4 along_(last line)) +Gain: shadebox(box "$G = \diag\mat{g_i}$" wid boxwid*1.5 ht boxht*0.75 ) + darrow(,,,,,,!-) + { s_box($U^{\prime}$) dabove(at last line) } +Compensator: shadebox(box wid boxwid*1.5 "\sl Compensator" "$K(s)$") + darrow(right_ linewid*5/4,,,,,,!-) + vectorsize(m,at 1/4 along_(last line)) + { s_box($U$) dabove(at last line) } +Plant: shadebox(box "\sl Plant" "$H(s)$" ) + dline(right_ linewid*3/4 from Plant.e,,,,!-) + vectorsize(p,at last line) +Y: dtee(R) + {s_box($Y$) dabove} + darrow(right_ linewid*2/3,t) + + dline(down boxht from Y,t) + dright + dline(to (Sum,Here),,t) + dright + darrow(to Sum.s) + "$-$" at Here+(0.10,-0.05) + + circle at Sum +] +# blockbox(N) +.PE diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/IC10107.m4 b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/IC10107.m4 index 5203f67376f..5203f67376f 100644 --- a/Master/texmf-dist/doc/latex/circuit-macros/examples/IC10107.m4 +++ b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/IC10107.m4 diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/Koch.m4 b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/Koch.m4 index faa46dfff8e..faa46dfff8e 100644 --- a/Master/texmf-dist/doc/latex/circuit-macros/examples/Koch.m4 +++ b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/Koch.m4 diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/Lyap.m4 b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/Lyap.m4 index e01d365fc02..e01d365fc02 100644 --- a/Master/texmf-dist/doc/latex/circuit-macros/examples/Lyap.m4 +++ b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/Lyap.m4 diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/Makefile b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/Makefile new file mode 100644 index 00000000000..5fba20547c6 --- /dev/null +++ b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/Makefile @@ -0,0 +1,211 @@ +# Extras Makefile +# +# Type "make" to generate extras.pdf containing examples. +# The examples are in no particular order (well, they are in ls order). +# Type "make clean; make extras.ps" to invoke latex intead of pdflatex. +# Type "make <diag>.ps" to make a postscript file from <diag>.m4 +# It may be necessary to type "make clean" before this or any of the following: +# Type "make <diag>.eps" to make an .eps file from <diag>.m4 +# Type "make <diag>.svg" to make an .svg file from <diag>.m4 using pdf2svg +# The following require ImageMagick convert: +# Type "make <diag>.png" to make a .png file from <diag>.m4 +# Type "make <diag>.tif" to make a .tif file from <diag>.m4 +# +# To test the file test.m4, type "make tst" if boxdims is used, otherwise +# type "make tst1". In either case the file tst.ps is created. +# +# To debug a single diagram in a directory other than this examples +# directory, copy this makefile and tst.tex to where you want to work, +# redefine LIBDIR (below) appropriately, and type "make <diag>.xxx" +# where xxx is one of ps, eps, png, or pdf + +######################################################################### + +# Circuit_macro directory, change this if necessary: +# LIBDIR = $$HOME/lib +LIBDIR = .. + +# The dpic processor: +PIC = dpic + +#MODE = -p +MODE = -g + +#CONF = pstricks.m4 +CONF = pgf.m4 + +# Convert options +EPSOPTS = +PNGOPTS = -quiet -density 400 -scale 25% -alpha Remove + +# M4 = m4 -I $(LIBDIR) +# If environment variable M4PATH has been set to the installation directory: +M4 = m4 + +DOC = extras + +# Files that have to be processed twice: +BOXDIMS = + +######################################################################### + +DVIPSOPTS = -G0 -t letter +DIMFILE = $(DOC).dim +BS = tr '|' '\134' + +# Might be needed (change latex commands to $(LTX) ) +# LTX = latex --shell-escape +LTX = pdflatex --shell-escape + +XTRASRC=printf "|documentclass[11pt]{article}\n\ +|usepackage[dvipsnames]{xcolor}\n\ +|usepackage{times,boxdims,siunitx,amssymb,tikz}\n\ +|setlength{|textwidth}{8in} |setlength{|textheight}{10.5in}\n\ +|setlength{|hoffset}{-2cm} |setlength{|voffset}{-3cm}\n\ +|begin{document}\n" | $(BS) + +PDFLTXSRC=printf "|documentclass[11pt]{standalone}\n\ +|usepackage{times,boxdims,siunitx,amssymb,tikz,geometry}\n\ +|geometry{paperwidth=15in,paperheight=14in,margin=1in}\n\ +|pagestyle{empty}|thispagestyle{empty}\n\ +|begin{document}|noindent|input{"$*".tex}|end{document}\n" | $(BS) + +LTXFILE=printf "|documentclass[11pt]{article}\n\ +|usepackage[dvipsnames]{xcolor}\n\ +|usepackage{times,boxdims,graphicx,pstricks}\n\ +|usepackage{siunitx}\n\ +|setlength{|textwidth}{28cm}|setlength{|textheight}{28cm}\n\ +|setlength{|oddsidemargin}{0pt}|setlength{|evensidemargin}{0pt}\n\ +|setlength{|hoffset}{-1cm}\n\ +|pagestyle{empty}|thispagestyle{empty}\n\ +|newbox|graph\n\ +|begin{document}\n\ +|noindent|input{"$*".tex}|box|graph\n\ +|end{document}\n" | $(BS) + +.SUFFIXES: .ps .dvi .tex .m4 .pic .eps .png .pdf .svg .tif .gif +.m4.pic: + @touch $(DIMFILE) F_$*.dim + $(M4) $(CONF) $(DIMFILE) F_$*.dim $*.m4 > $*.pic +.m4.tex: + @touch $(DIMFILE) F_$*.dim + $(M4) $(CONF) $(DIMFILE) F_$*.dim $*.m4 | $(PIC) $(MODE) > $*.tex +.m4.dvi: + @touch $(DIMFILE) F_$*.dim + $(M4) pstricks.m4 $(DIMFILE) F_$*.dim $*.m4 | $(PIC) -p > $*.tex + @$(LTXFILE) > F_$*.tex + latex --quiet F_$* + touch F_$*.dim $(DIMFILE) + $(M4) pstricks.m4 $(DIMFILE) F_$*.dim $*.m4 | $(PIC) -p > $*.tex + latex --quiet F_$* + mv F_$*.dvi $*.dvi + rm -f F_* +.dvi.ps: + dvips $(DVIPSOPTS) $* -o $*.ps + chmod 644 $*.ps +.m4.ps: + @touch $(DIMFILE) F_$*.dim + $(M4) pstricks.m4 $(DIMFILE) F_$*.dim $*.m4 | $(PIC) -p > $*.tex + @$(LTXFILE) > F_$*.tex + latex --quiet F_$* + dvips $(DVIPSOPTS) F_$* -o $*.ps + chmod 644 $*.ps + rm -f F_* +.m4.eps: + @touch $(DIMFILE) F_$*.dim + $(M4) pstricks.m4 $(DIMFILE) F_$*.dim $*.m4 | $(PIC) -p > $*.tex + @$(LTXFILE) > F_$*.tex + latex --quiet F_$* + $(M4) pstricks.m4 $(DIMFILE) F_$*.dim $*.m4 | $(PIC) -p > $*.tex + latex --quiet F_$* + dvips F_$* -T128cm,28cm -o $*.ps +# Recent changes to PSTricks(?) have clashed with the use of TeXtoEPS +# so use ps2epsi + ps2epsi $*.ps $*.epsi + sed -e '/%%Pages:/d' -e '/BeginPreview/,$$d' $*.epsi \ + | tr '\015' '\012' > $*.eps + sed -e '1,/EndPreview/d' $*.epsi >> $*.eps + rm -f F_* +.m4.pdf: + @touch $(DIMFILE) F_$*.dim + $(M4) pgf.m4 $(DIMFILE) F_$*.dim $*.m4 | $(PIC) -g > $*.tex + @$(PDFLTXSRC) > F_$*.tex + pdflatex --quiet F_$* + $(M4) pgf.m4 $(DIMFILE) F_$*.dim $*.m4 | $(PIC) -g > $*.tex + pdflatex --quiet F_$* + mv F_$*.pdf $*.pdf + rm -f F_* +.m4.png: + make $*.pdf + convert $(PNGOPTS) $*.pdf $*.png + @if test -f $*.png.0 ; then mv $*.png.0 $*.png ; fi +# rm $*.pdf +.m4.gif: + make $*.pdf + convert $(GIFOPTS) $*.pdf $*.gif +# rm $*.pdf +.m4.tif: + make $*.pdf + convert $(EPSOPTS) $*.pdf $*.tif + @if test -f $*.tif.0 ; then mv $*.tif.0 $*.tif ; fi +# rm $*.pdf +.m4.svg: + make $*.pdf + dvisvgm --pdf $*.pdf $*.svg + chmod 644 $*.svg +# rm $*.pdf + + +######################################################################### + +$(DOC).pdf: + @$(XTRASRC) > extras.tex + touch extras.dim + -for fl in `ls *.m4` ; do \ + file=`basename $$fl .m4` ; \ + echo $$file.m4 ; \ + $(M4) pgf.m4 extras.dim $$file.m4 | $(PIC) -g > $$file.tex ; \ + printf "\n\n|parbox{|textwidth}{\n" | $(BS) >> extras.tex ; \ + printf "|input{$$file.tex}\n" | $(BS) >> extras.tex ; \ + printf "\n $$file.m4\n}\n|vspace{|baselineskip}" \ + | sed -e 's/_/|_/g' | $(BS) >> extras.tex ; \ + done + printf "\n|end{document}\n" | $(BS) >> extras.tex + pdflatex extras + -for file in $(XBOXDIMS) ; do \ + rm -f $$file.tex ; \ + $(M4) pgf.m4 extras.dim $$file.m4 | $(PIC) -g > $$file.tex ; \ + done + pdflatex extras + +$(DOC).ps: psmode $(DOC).dvi + +psmode: + printf "|usepackage{pstricks,pst-grad}\n" | $(BS) > mode.tex + +pdfmode: + printf "|usepackage{tikz}\n" | $(BS) > mode.tex + +$(DOC).dvi: $(DOC).tex files.tex header.tex psmode + touch $(DOC).dim + make CONF=pstricks.m4 MODE=-p DIMFILE=$(DOC).dim pics + cp $(LIBDIR)/doc/Version.tex . + latex $(DOC) + rm -f $(BOXDIMS) ${BOXDIMS:%.tex=%.pic} $(DOC).dvi + make CONF=pstricks.m4 MODE=-p DIMFILE=$(DOC).dim $(BOXDIMS) + latex $(DOC) + +tst: + @$(LTXFILE) | sed -e 's/{\.tex}/{test.tex}/' > tst.tex + make CONF=pstricks.m4 PIC=dpic MODE=-p test.tex; latex --quiet tst + rm -f test.tex test.pic + make CONF=pstricks.m4 PIC=dpic MODE=-p test.tex; latex --quiet tst + dvips $(DVIPSOPTS) tst -o tst.ps + +tst1: + @$(LTXFILE) | sed -e 's/{\.tex}/{test.tex}/' > tst.tex + make CONF=pstricks.m4 PIC=dpic MODE=-p test.tex; latex --quiet tst + dvips $(DVIPSOPTS) tst -o tst.ps + +clean: + rm -f *.ps *.pdf *.tex *.dim *.pic *.log *.dms *.aux diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/Metamodel.m4 b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/Metamodel.m4 index e5d1ba0b1ca..e5d1ba0b1ca 100644 --- a/Master/texmf-dist/doc/latex/circuit-macros/examples/Metamodel.m4 +++ b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/Metamodel.m4 diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/Obliq.m4 b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/Obliq.m4 new file mode 100644 index 00000000000..0c71c6569e0 --- /dev/null +++ b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/Obliq.m4 @@ -0,0 +1,72 @@ +.PS +threeD_init +scale = 2.54 + +divert(-1) + `ProjectObliq(x,y,z,x scale,degrees) + oblique projection + arg4= x scale (default 1/2)' +define(`ProjectObliq',`(`$2'-dnl +(`$1')ifelse(`$4',,/2,*(`$4'))*cosd(ifelse(`$5',,obliqueangle_,(`$5'))),dnl +`$3'-(`$1')ifelse(`$4',,/2,*(`$4'))*sind(ifelse(`$5',,obliqueangle_,(`$5'))))') +define(`obliqueangle_',45) + +divert(0)dnl + +define(`Pr',`ProjectObliq(`$1',`$2',`$3')') + + d = 2 +define(`cube',`[ # w, h, d, scale, degrees + define(`cubewd',ifelse(`$1',,linewid,`$1'))dnl + define(`cubeht',ifelse(`$2',,cubewd,`$2'))dnl + define(`cubedp',ifelse(`$3',,cubewd,`$3'))dnl + for_(0,7,1,`P`'binary_(m4x,3): \ + Pr(ifelse(eval(m4x/4),1,cubedp,0), + ifelse(eval((m4x%4)/2),1,cubewd,0), + ifelse(eval(m4x%2),1,cubeht,0))') +# {command "{\small" +# for_(0,7,1,`"binary_(m4x,3)" at P`'binary_(m4x,3)') +# command "}" +# } + {"000" at P000} + if obliqueangle_ > 0 then { + line dashed from P100 to P000 chop linethick bp__ * 2 chop 0 + line dashed from P010 to P000 chop linethick bp__ * 2 chop 0 + line dashed from P001 to P000 chop linethick bp__ * 2 chop 0 + line from P101 to P001 + line to P011 + line to P111 + line to P101 + line to P100 + line to P110 + line to P010 + line to P011 + line from P110 to P111 + } else { + line dashed from P101 to P001 chop linethick bp__ * 2 chop 0 + line dashed from P011 to P001 chop linethick bp__ * 2 chop 0 + line dashed from P000 to P001 chop linethick bp__ * 2 chop 0 + line from P100 to P101 + line to P111 + line to P110 + line to P100 + line to P000 + line to P010 + line to P011 + line to P111 + line from P010 to P110 + } + ]') + + Cube: cube(1,2,3) +# +##{arrow from Cube.P001 to 3/2 between Cube.P000 and Cube.P001; "$z$" ljust } +##{arrow from Cube.P010 to 3/2 between Cube.P000 and Cube.P010; "$y$" below } +##{arrow from Cube.P100 to 3/2 between Cube.P000 and Cube.P100; "$x$" ljust } + + move define(`obliqueangle_',30); cube(1,2,3) + move define(`obliqueangle_',15); cube(1,2,3) + move define(`obliqueangle_',-15); cube(1,2,3) + move define(`obliqueangle_',-30); cube(1,2,3) + +.PE diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/OneLine.m4 b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/OneLine.m4 new file mode 100644 index 00000000000..7b451b366aa --- /dev/null +++ b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/OneLine.m4 @@ -0,0 +1,67 @@ +.PS +# OneLine.m4 +# https://tex.stackexchange.com/questions/191598/electric-network-one-line-diagrams/325717#325717 +cct_init +include(libSLD.m4) +First: [ + xgap = 0.6 + dim1 = 1; dim2 = 0.75 ; dim3=0.5 + X: box fill_(0.9) wid 1 "Xingu" "\SI{500}{\kV}" + { "$R_0=\SI{1,682}{\ohm}$" at X.sw below ljust } + sl_transformer(right_ dim2,type=S); rlabel(,\SI{18}{\percent},) + {[Ysymbol;Ysymbol(at last []+(last [].wid,0))] with .s at last [].n+(0,2bp__)} + { B1: line thick 3*linethick up 0.4 with .c at Here + "$s$" wid 0.1 ht 0.1 above } + { arrow right 0.2 from last line.c+(0.1,-0.1) } + { "$I^s$" at last line.start below } + line right 3.0 "$l=\SI{2600}{\km}$" wid 0.1 ht 0.1 above + { B2: line thick 3*linethick up 0.4 with .c at Here; "$r$" above } + sl_transformer(right_ dim2,type=S); rlabel(,\SI{18}{\percent},) + {[Ysymbol;Ysymbol(at last []+(last [].wid,0))] with .s at last [].n+(0,2bp__)} + NI: box fill_(0.9) wid 1 "Nova Igua\c{c}u" "\SI{500}{\kV}" + "$Z_0=a+b$" at NI.sw below ljust + RELE: box wid dimen_/2 ht dimen_/2 with .w at B1+(0.6,0.3) + line left 0.15 from 1/4 between RELE.nw and RELE.sw; "$V^s$" rjust + line left 0.15 from 3/4 between RELE.nw and RELE.sw; "$I^s$" rjust + ] +Second: [ + lstem = dimen_*3/4 + asep = dimen_/3 + sl_grid(U,lgth=dimen_;wdth=dimen_) + sl_transformer(down_ dimen_*7/4,type=S;name=Tr) + llabel(,"$\SI{400}{kVA}$" ljust "$\SI{4}{\percent}$" ljust,,,Tr) + Bus: sl_busbar(right_ dimen_*12, 5) with .P3 at Here +# +define(`loadstring',`[ L: line invis down_ dimen_*5 + line from L.start down_ L.len/4; dot + { arrow <-> down_ last line.len at last line+(asep,0) "\sf $5 m" ljust } + { sl_load(left_ lstem); "\sf $1" at Head.w rjust } + { r_text(90,`\sf\scriptsize NAYY 4x150 mm$^2$', at Here+(-7bp__,0)) } + line down_ L.len/4; dot + { arrow <-> down_ last line.len at last line+(asep,0) "\sf $6 m" ljust } + { sl_load(left_ lstem); "\sf $2" at Head.w rjust } + { box wid dimen_/3 ht dimen_/3 at Here } + line down_ L.len/8-3bp__ + { ACsymbol(at Here+(0,-3bp__),,,2:RA) } + line down_ L.len/8+3bp__ from last line.end chop 6bp__ chop 0; dot + ifelse(`$7',,, + `{ arrow <-> up_ L.len/4 from Here+(asep,0) "\sf $7 m" ljust }') + { sl_load(left_ lstem); "\sf $3" at Head.w rjust } + line down_ L.len/4; dot + { arrow <-> down_ last line.len at last line+(asep,0) "\sf $8 m" ljust } + { sl_load(left_ lstem); Q:"\sf $4" at Head.w rjust } + { box wid dimen_/3 ht dimen_/3 at Here } ]') +# + loadstring(1,2,27,28, 21,21,,21) with .L.start at Bus.P1 + move left_ 13bp__ from last [].Q + loadstring(1,2,15,16, 29,29,,29) with .L.start at Bus.P2 + loadstring(1,2, 8, 9, 40,40,,40) with .L.start at Bus.P3 + loadstring(1,2, 3, 4, 64,64,64,64) with .L.start at Bus.P4 + line down_ last [].L.len/2 from Bus.P5; dot + { r_text(90,`\sf\scriptsize NAYY 4x150 mm$^2$', at last line.c+(-7bp__,0)) } + { arrow <-> down_ last line.len at last line+(asep,0) + "\sf 102 m" wid 30.4 bp__ ljust at last arrow } + { sl_load(left_ lstem)} + ] with .nw at First.sw+(0,-dimen_/2) +#showbox_ +.PE diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/OpAmpFilter.m4 b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/OpAmpFilter.m4 index db1ce2778d7..8e8f82c9801 100644 --- a/Master/texmf-dist/doc/latex/circuit-macros/examples/OpAmpFilter.m4 +++ b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/OpAmpFilter.m4 @@ -3,9 +3,6 @@ cct_init command "{\small\sf" -divert(-1) -divert(0)dnl - define(`SpecOpAmp',`$1: [ right_ lwtmp = linewid; linewid = 1*scale H: opamp @@ -14,21 +11,21 @@ divert(0)dnl "$4" at H.E below ljust "V${-}$" at H.E1 below line up_ dimen_/3 from H.E1 "4" rjust; dot(,,1) - "$\hbox{V}_{\hbox{CC}}$" above rjust at last [].n + "$\hbox{V}_{\hbox{CC}}$" rjust at last [].w "V${+}$" at H.E2 above line down_ dimen_/3 from H.E2 "11" ljust; dot(,,1) - "${-}\hbox{V}_{\hbox{CC}}$" below ljust at last [].s + "${-}\hbox{V}_{\hbox{CC}}$" ljust at last [].e linewid = lwtmp ifelse($1,U1,,`line left_ jog from H.In2 then down_ jog/2; zground ') "$1" at H.S below ljust In1: H.In1; In2: H.In2; Out: H.Out D: dot(at Out) - V: circle diam 12bp__ "V" at Out+(dimen_/3,dimen_/3) + V: circle diam 12bp__ "V" at Out+(dimen_/4,dimen_/3) "V$_{\hbox{\scriptsize $5}}$" at V.n above open_arrow(from V to D chop last circle.rad chop dotrad_) ] ') define(`zground',`ground(`$1',,S); "0" at Here+(dimen_/6,-dimen_/2)') - cscale = 3/2 + cscale = 5/4 linewid = linewid*cscale jog = dimen_*0.3 vstep = dimen_*5/4 @@ -39,12 +36,12 @@ divert(0)dnl R2: resistor(right_ elen_*3/4 from U2.Out); llabel(,"R2"); rlabel(,"1`\,'k") dot; line right_ jog SpecOpAmp(U3,9,10,8,lp) with .In1 at Here - SpecOpAmp(U4,13,12,14,n) with .Out at U3.Out+(0,-dimen_*3.0) + SpecOpAmp(U4,13,12,14,n) with .Out at U3.Out+(0,-dimen_*3.05) line up vstep from U4.Out - Rf: resistor(left_); rlabel(,R_f); llabel(,"1`\,'k") + Rf: resistor(left_); rlabel(,"R$_{\hbox{f}}$"); llabel(,"1`\,'k") line to (U4.In1,Here)-(jog,0) then to U4.In1-(jog,0); dot - line from U3.Out down_ vstep then left_ jog - RL: resistor; rlabel(,RL); llabel(,"100") + line from U3.Out down_ vstep+5bp__ then left_ jog + RL: resistor; rlabel(,"RL"); llabel(,"100") line to (U4.In1-(2*jog,0),Here) then to U4.In1-(2*jog,0); dot line from U1.Out to (U1.Out,Here); right_ R42: resistor(to U4.In1); llabel(,"R42"); rlabel(,"1`\,'k") diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/Optics.m4 b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/Optics.m4 new file mode 100644 index 00000000000..d4fadd44652 --- /dev/null +++ b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/Optics.m4 @@ -0,0 +1,31 @@ +.PS +# Optics.m4 +# https://tex.stackexchange.com/questions/623201/geometrical-optics +gen_init +scale = 2.54 + + textoffset = 4pt__ + O: dot(at (0,0)) ; "\Large $O$" below rjust + L: line thick 1 right_ 14 with .c at O + S: dot(at (1.8,0)) ; "\Large $S$" below rjust + r = 7 + C: dot(at (S.x-r,0)) ; "\Large $C$" below + F: dot(at (-1.8,0)) ; "\Large $F$" below + I: dot(at (4,0)) ; "\Large $I$" below + arrow dashed from I up_ 3.2 ; It: Here + AS: C.x+sqrt(r^2-3.7^2),3.7 + Arc: arc thick 1 cw from AS to (AS.x,-AS.y) rad r with .c at C + for y=-AS.y to AS.y+0.001 by 0.1 do { line thick 0.4 right 0.5 up 0.1 \ + from (C.x+sqrt(r^2-y^2),y) } + M: move from C to It + A1: arrow outlined "red" from C to LCintersect(M,C,r,R) chop -2 chop 0 + arrow outlined "red" dashed to It chop 0 chop -3 + N: move from It to F + arrow <- outlined "red" dashed from It to LCintersect(N,C,r) chop -2 chop 0 + P: move down_ 1 from A1.start + arrow outlined "red" from last arrow.end to Intersect_(P,N) + Q: move up 1 from O + arrow from O to Intersect_(Q,M) + arrow outlined "red" to (C.x+sqrt(r^2-Here.y^2),Here.y) + +.PE diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/Orbits.m4 b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/Orbits.m4 index ef85d279353..ef85d279353 100644 --- a/Master/texmf-dist/doc/latex/circuit-macros/examples/Orbits.m4 +++ b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/Orbits.m4 diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/PPA.m4 b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/PPA.m4 index 8d25901310d..8d25901310d 100644 --- a/Master/texmf-dist/doc/latex/circuit-macros/examples/PPA.m4 +++ b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/PPA.m4 diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/PerpTo.m4 b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/PerpTo.m4 new file mode 100644 index 00000000000..410ce9605f4 --- /dev/null +++ b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/PerpTo.m4 @@ -0,0 +1,26 @@ +.PS +# PerpTo.m4 +# https://tex.stackexchange.com/questions/666411/repetitive-perpendiculars-in-a-right-angle-triangle +gen_init + + O: (0,0) + A: (5,0) + B: (0,3) + +define drawperp { #( depth, O, A, B ) +[ d = $1; O[d]: $2; A[d]: $3; B[d]: $4 + P[d]: PerpTo(O[d],A[d],B[d]) + if d > 0 then { + exec sprintf("drawperp(%g,P[%g],O[%g],A[%g]) with .O[%g] at P[%g]",\ + d-1,d,d,d,d-1,d) + exec sprintf("drawperp(%g,P[%g],B[%g],O[%g]) with .O[%g] at P[%g]",\ + d-1,d,d,d,d-1,d) + } + line outlined graystring((depth-d)/depth) from O[d] to P[d] + ] } + + depth = 6 + drawperp(depth,O,A,B) with .O[depth] at O + line from O to A then to B then to O + +.PE diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/Pipe.m4 b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/Pipe.m4 new file mode 100644 index 00000000000..0d6512478c1 --- /dev/null +++ b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/Pipe.m4 @@ -0,0 +1,40 @@ +.PS +# How about ladder diagrams? +gen_init +NeedDpicTools + + { for x=0 to 5 do { line up 5 from (x,0) } } + { for y=0 to 5 do { line right 5 from (0,y) } } + posarray(A, + (1,0.5), + (4,0.5), + (4.5,1), + (4.5,3), + (4,3.5), + (3.5,3), + (3,2.5), + (1,2.5), + (0.5,3), + (0.5,4), + (1,4.5), + (4,4.5)) + P[0]: 1,0.5 + P[1]: 4.5,0.5 + P[2]: 4.5,3.5 + P[3]: 3.5,3.5 + P[4]: 3.5,2.5 + P[5]: 0.5,2.5 + P[6]: 0.5,4.5 + P[7]: 4,4.5 + + r = 0.4 + define(`curve', + ` move to P[0] + for i_c=1 to 6 do { arcto(P[i_c],P[i_c+1],r,`$1') } + line to P[7] `$1'') + + lw = 0.3/(1bp__) + lt = 1.8 + for i=0 to 6 do { + curve(thick lw-lt*i outlined rgbstring(0.1+i/10,0.1+i/10,0.1+i/10))} +.PE diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/Planes.m4 b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/Planes.m4 new file mode 100644 index 00000000000..9344bd2ddad --- /dev/null +++ b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/Planes.m4 @@ -0,0 +1,175 @@ +.PS +# Planes.m4 +threeD_init +NeedDpicTools + +# These 3D diagrams are like many others: define the surface facets, +# use normal vectors to determine visibility, sort and plot the visible +# facets from back to front. + +# Store a point as x_[i], y_[i], z_[i] +define(`mktriple',` + x_[$1] = $2 + y_[$1] = $3 + z_[$1] = $4') +# Recover point coordinates +define(`triple',`x_[$1], y_[$1], z_[$1]') + +define(`facetnormal',`cross3D( + diff3D(triple($1*3+1),triple($1*3)), + diff3D(triple($1*3+2),triple($1*3+1)))') + +define(`facetcenter',`sprod3D(0.5,sum3D(triple($1*3),triple($1*3+2)))') + +# Create npositive, arrays dcosine[1..npositive] +# and index ix[1..npositive] of sorted facets +# Uses macros facetnormal(i) and facetcenter(i) +define(`processfacets',` + npositive = 0 + for i=1 to `$1' do { + mktriple(0,facetnormal(i)) + dx = dot3D(triple(0),View3D) + if dx > 0 then { + dcosine[i] = dx/length3D(triple(0)) # direction cosine normal wrt View3D + npositive +=1 + dist[npositive] = dot3D(facetcenter(i),View3D) # distance + ix[npositive] = i + } + } + dpquicksort(dist,1,npositive,ix) ') + +ifelse(1,1,` +Threeplanes: [ +# Size parameters + a = 3/2 + b = 0.4 + d = 1 +# Define intersecting lines in the plane + A0: -a,-b + A1: a,-b + B0: Rot_(A0,120) + B1: Rot_(A1,120) + C0: Rot_(A0,240) + C1: Rot_(A1,240) + +# Intersections +define(`lintersect',`intersect_(`$1'0,`$1'1,`$2'0,`$2'1)') + AB: lintersect(A,B) + BC: lintersect(B,C) + CA: lintersect(C,A) + +# Facets are rectangles here; store 3 corners +define(`mkfacet',` + mktriple((`$1')*3, 0,`$2'.x,`$2'.y) + mktriple((`$1')*3+1, 0,`$3'.x,`$3'.y) + mktriple((`$1')*3+2,-d,`$3'.x,`$3'.y) + ') +# Define the facets + mkfacet(m4inx,A0,CA) mkfacet(m4inx,CA,A0) + mkfacet(m4inx,CA,AB) mkfacet(m4inx,AB,CA) + mkfacet(m4inx,AB,A1) mkfacet(m4inx,A1,AB) + + mkfacet(m4inx,B0,AB) mkfacet(m4inx,AB,B0) + mkfacet(m4inx,AB,BC) mkfacet(m4inx,BC,AB) + mkfacet(m4inx,BC,B1) mkfacet(m4inx,B1,BC) + + mkfacet(m4inx,C0,BC) mkfacet(m4inx,BC,C0) + mkfacet(m4inx,BC,CA) mkfacet(m4inx,CA,BC) + mkfacet(m4inx,CA,C1) mkfacet(m4inx,C1,CA) + nfacets = m4x + +# Wierd color +define(`colr',`ifelse(`$1',,"white", + `rgbstring(`$1',ifelse(`$2',,`$1',`$2'),ifelse(`$3',,`$1',`$3'))')') + +# Recover the 4th corner and draw +define(`drawfacet',` + NW_facet: project(triple(($1)*3)) + NE_facet: project(triple(($1)*3+1)) + SE_facet: project(triple(($1)*3+2)) + SW_facet: project(x_[($1)*3+2],y_[($1)*3],z_[($1)*3]) + N_facet: 0.5 between NW_facet and NE_facet + line from N_facet to NE_facet then to SE_facet then to SW_facet \ + then to NW_facet then to N_facet shaded colr(`$2',`$3',`$4') +# fill_(ifelse(`$2',,1,`(1-`$2')')) + ') + +# View angles azimuth, elevation, rotation (degrees) + setview( 10, 40 ) + +# Draw facets, shading with view cosines + processfacets(nfacets) + for i=1 to npositive do { drawfacet(ix[i],max(0,1-2*dcosine[ix[i]]), + dcosine[ix[i]], + dcosine[ix[i]]) +# for i=1 to npositive do { drawfacet(ix[i],dcosine[ix[i]]) + } + +] # Threeplanes +') + +# Bowl +# vertx_(facet_no,vertex_no) + define vertx_ { ($1-1)*nvertices + $2 } + +# Normal vector to a facet +define(`facetnormal',`cross3D( + diff3D(triple(vertx_($1,2)),triple(vertx_($1,1))), + diff3D(triple(vertx_($1,4)),triple(vertx_($1,1))))') + +# Facet center +define(`facetcenter',`sprod3D(1/4,sum3D( + sum3D(triple(vertx_(`$1',1)),triple(vertx_(`$1',2))), + sum3D(triple(vertx_(`$1',3)),triple(vertx_(`$1',4)))))') + +define(`drawplane',` + NW_plane: project(triple(vertx_($1,1))) + SW_plane: project(triple(vertx_($1,2))) + SE_plane: project(triple(vertx_($1,3))) + NE_plane: project(triple(vertx_($1,4))) + N_plane: 0.5 between NW_plane and NE_plane + shd = (`$2')^(1/4) + line from N_plane to NE_plane then to SE_plane then to SW_plane \ + then to NW_plane then to N_plane \ + fill_(ifelse(`$2',,1,shd)) outlined rgbstring(shd,shd,shd) +# line from NW_plane to NE_plane + line from SW_plane to SE_plane + ') + +ifelse(1,1,` + nvertices = 4 # vertices per facet +Bowl: [ + elevation = 30 + setview( 0, 30 ) + nplanes = 40 + bigradius = 2 + smallradius = 1 + cupht = 1.5 + thin = smallradius/10 +# Define the facet corners + for i=1 to nplanes do { + mktriple(vertx_(i,1),rot3Dz((i-1)/nplanes*twopi_,bigradius,0,0)) + mktriple(vertx_(i,2),rot3Dz((i-1)/nplanes*twopi_,smallradius,0,-cupht)) + mktriple(vertx_(i,3),rot3Dz((i )/nplanes*twopi_,smallradius,0,-cupht)) + mktriple(vertx_(i,4),rot3Dz((i )/nplanes*twopi_,bigradius,0,0)) + mktriple(vertx_(nplanes+i,1),triple(vertx_(i,4))) + mktriple(vertx_(nplanes+i,2),triple(vertx_(i,3))) + mktriple(vertx_(nplanes+i,3),triple(vertx_(i,2))) + mktriple(vertx_(nplanes+i,4),triple(vertx_(i,1))) + } +# for i=1 to nplanes do { +# mktriple(vertx_(i,1),rot3Dz((i-1)/nplanes*twopi_,bigradius,0,0)) +# mktriple(vertx_(i,2),rot3Dz((i-1)/nplanes*twopi_,smallradius,0,-cupht)) +# mktriple(vertx_(i,3),rot3Dz((i-1)/nplanes*twopi_,smallradius-thin,0,-cupht)) +# mktriple(vertx_(i,4),rot3Dz((i-1)/nplanes*twopi_,bigradius-thin,0,0)) +# } +# Find the visible facets and sort + processfacets(nplanes*2) + + for i=1 to npositive do { drawplane(ix[i],dcosine[ix[i]]) } + ellipse wid 2*bigradius ht 2*bigradius*sin(elevation*dtor_) at project(0,0,0) + +] #with .sw at Threeplanes.se +') + +.PE diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/README_extras b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/README_extras new file mode 100644 index 00000000000..140802fb682 --- /dev/null +++ b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/README_extras @@ -0,0 +1,6 @@ + +THIS DIRECTORY contains a Makefile and .m4 sources for diagrams +not included in the examples files. Type "make" and, to clean up, +"make clean". This directory is assumed to be a subdirectory of +the examples directory in order to include the necessary definition +files. diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/RandomNodes.m4 b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/RandomNodes.m4 new file mode 100644 index 00000000000..f14973204f2 --- /dev/null +++ b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/RandomNodes.m4 @@ -0,0 +1,19 @@ +.PS +# RandomNodes.m4 +gen_init +NeedDpicTools + + scale = 2.54 + n = 300 + msiz = 4.90*2 + maxdist = 1.0 + + box wid msiz ht msiz with .sw at (0,0) + for i=1 to n do { X[i] : (rand(), rand())*msiz } + for i=1 to n-1 do { for j=i+1 to n do { + if distance(X[i],X[j]) <= maxdist then { + line outlined "green" from X[i] to X[j] + } } } + for i=1 to n do { circle rad dotrad_ at X[i] shaded "green" } + +.PE diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/Region.m4 b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/Region.m4 new file mode 100644 index 00000000000..e4cde354917 --- /dev/null +++ b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/Region.m4 @@ -0,0 +1,38 @@ +.PS +# Region.m4 +# https://tex.stackexchange.com/questions/606088/how-can-i-plot-in-latex +gen_init + + grsize = 3.3 + maxaxis = 4.5 + define Grid { (($1+maxaxis)/(2*maxaxis)*grsize-grsize/2,\ + ($2+maxaxis)/(2*maxaxis)*grsize-grsize/2) } + +thinlines_ + box wid grsize ht grsize with .c at (0,0) + tic = 0.05 + for x=-maxaxis to maxaxis by 0.5 do { + line up tic from Grid(x,-maxaxis) + y = abs(x) + { if y/2 == int(y/2+0.5) then { sprintf("%g",x) at last line.start below } } + line down tic from Grid(x,maxaxis) + line right tic from Grid(-maxaxis,x) + { if y/2 == int(y/2+0.5) then { sprintf("%g",x) at last line.start rjust } } + line left tic from Grid(maxaxis,x) + } +thicklines_ + + n = 10 + ylim = 3 + for i=0 to n do { y = i/n*ylim + P[i]: Grid(sqrt(1+y^2),y) + P[-i]:( P[i].x,-P[i].y) + Q[i]: (-P[i].x, P[i].y) + Q[-i]:(-P[i].x,-P[i].y) } + rgbfill(0.6,0.6,0.8, + fitcurve(P,n,,-n) + line to (P[n].x,P[n].x) then to (Q[-n].x,Q[-n].x) then to Q[-n] + fitcurve(Q,n,,-n) + line to (Q[n].x,-Q[n].x) then to (P[-n].x,-P[-n].x) then to P[-n] ) + +.PE diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/Resolver.m4 b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/Resolver.m4 index b6ca93047a7..b6ca93047a7 100644 --- a/Master/texmf-dist/doc/latex/circuit-macros/examples/Resolver.m4 +++ b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/Resolver.m4 diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/SPM.m4 b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/SPM.m4 index 0b3fdb642c4..0b3fdb642c4 100644 --- a/Master/texmf-dist/doc/latex/circuit-macros/examples/SPM.m4 +++ b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/SPM.m4 diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/SampleFlow.m4 b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/SampleFlow.m4 index 077a0ba6e3c..077a0ba6e3c 100644 --- a/Master/texmf-dist/doc/latex/circuit-macros/examples/SampleFlow.m4 +++ b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/SampleFlow.m4 diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/ShadeSector.m4 b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/ShadeSector.m4 index 0632fdb14f4..0632fdb14f4 100644 --- a/Master/texmf-dist/doc/latex/circuit-macros/examples/ShadeSector.m4 +++ b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/ShadeSector.m4 diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/Shadow.m4 b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/Shadow.m4 new file mode 100644 index 00000000000..1ad65d8eb43 --- /dev/null +++ b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/Shadow.m4 @@ -0,0 +1,129 @@ +.PS +# Shadow.m4 +gen_init +NeedDpicTools +s_init(HSV) + +divert(-1) + `shadowellipse(options,text) + Draws a shadowed ellipse + with gradient from white at the top to + hsv-specified color at the bottom + Default is uniform lightgray shade + Arg 2 is a text label written at the center' +define(`shadowellipse',`[ Orig: Here + m4shadow_keys(`$1') + [ + ellipse wid m4wid ht m4ht invis shaded m4shadow ] wid 0 ht 0 \ + at (m4shadowthick+m4thick bp__/2,-(m4shadowthick+m4thick bp__/2)) +# at ((m4shadowthick)/2,-(m4shadowthick)/2) +ifelse(m4hue,,,` + define pElBshade { v = m4ht*($`'1) + if v < m4rad then { h = (m4wid/2-m4rad)+sqrt(m4rad^2-(m4rad-v)^2) } \ + else { if v < m4ht-m4rad then { h = m4wid/2 } \ + else { h = (m4wid/2-m4rad)+sqrt(m4rad^2-(m4rad-(m4ht-v))^2) } } + line from (-h,v) to (h,v) thick m4thick outlined rgbstring($`'2,$`'3,$`'4) + } + nsteps = rnd(m4ht/(m4thick bp__)*1.1) + hsvtorgb(m4hue,m4sat,m4val,r,g,b) + ShadeObject(pElBshade,nsteps, + 0, r, g, b, + 1, 1, 1, 1) with .c at Orig ') + Ellipse: ellipse ht m4ht wid m4wid thick m4thick outline m4outlined \ + at Orig ifelse(m4hue,,shaded m4shaded) + ifelse(`$2',,,`m4lstring(`$2',"`$2'") at Ellipse') + `$3']') + `shadowbox(options,text) Draws a shadowed box + with gradient from white at the top to + hsv-specified color at the bottom + Default is uniform lightgray shade + Arg 2 is a text label written at the center' +define(`shadowbox',`[ Orig: Here + m4shadow_keys(`$1') + [ + box invis rad m4rad ht m4ht wid m4wid shaded m4shadow ] wid 0 ht 0 \ + at (m4shadowthick+m4thick bp__/2,-(m4shadowthick+m4thick bp__/2)) +# box rad m4rad+m4thick bp__/2+m4shadowthick/2 ht m4ht wid m4wid \ +# thick m4shadowthick/(1bp__) outlined m4shadow ] wid 0 ht 0 \ +# at ((m4shadowthick+m4thick bp__)/2,-(m4shadowthick+m4thick bp__)/2) +ifelse(m4hue,,,` + define pBxBshade { v = m4ht*($`'1) + if v < m4rad then { h = (m4wid/2-m4rad)+sqrt(m4rad^2-(m4rad-v)^2) } \ + else { if v < m4ht-m4rad then { h = m4wid/2 } \ + else { h = (m4wid/2-m4rad)+sqrt(m4rad^2-(m4rad-(m4ht-v))^2) } } + line from (-h,v) to (h,v) thick m4thick outlined rgbstring($`'2,$`'3,$`'4) + } + nsteps = rnd(m4ht/(m4thick bp__)*1.1) + hsvtorgb(m4hue,m4sat,m4val,r,g,b) + ShadeObject(pBxBshade,nsteps, + 0, r, g, b, + 1, 1, 1, 1) with .c at Orig ') + Box: box rad m4rad ht m4ht wid m4wid thick m4thick outline m4outlined \ + at Orig ifelse(m4hue,,shaded m4shaded) + ifelse(`$2',,,`m4lstring(`$2',"`$2'") at Box') + `$3']') +define(`m4shadow_keys', +# Box size parameters +`setkey_(`$1',ht,boxht)dnl + setkey_(`$1',wid,boxwid)dnl + setkey_(`$1',rad,boxht/8)dnl + setkey_(`$1',thick,linethick)dnl +# Shadow thickness + setkey_(`$1',shadowthick,2*lthick)dnl +# HSV color for gradient shading + setkey_(`$1',hue)dnl Default is blank for a shade fill; + setkey_(`$1',sat,1)dnl + setkey_(`$1',val,1)dnl +# Named colors + setkey_(`$1',shaded,"lightgray",N)dnl + setkey_(`$1',outlined,"gray",N)dnl + setkey_(`$1',shadow,"lightgray",N)dnl +') + +divert(0)dnl + +w = 0.3 +boxwid = w +dh = 30 +# Hue from 0 to 360 +T:[ for i=0 to 361 by dh do { shadowbox(hue=i) } ] + { s_box(hue=0) at T.w rjust; s_box(hue=360) at T.e ljust } + { for i=0 to 361 by dh do { s_box("%g",i) at T.nw+(w/2+i/dh*w,0) above } } + { s_box(hue) at T.n+(0,12bp__) above } + +# Hue from 0 to 360; sat=0.5; val=0.5 +Ta:[ for i=0 to 361 by dh do { shadowbox(hue=i;sat=0.5;val=0.5) } ] \ + with .nw at last [].sw + { s_box(`\shortstack[r]{sat=0.5\\val=0.5}') at Ta.w rjust } + +# Hue = 0; sat=0 to 1 +U:[ for i=0 to 361 by dh do { shadowbox(hue=0;sat=i/360) } ] \ + with .nw at last [].sw + { s_box(`\shortstack[r]{hue=0\\sat=0}') at U.w rjust + s_box(sat=1) at U.e ljust } + +# Hue = 0; val=0 to 1 +V:[ for i=0 to 361 by dh do { shadowbox(hue=0;val=i/360) } ] \ + with .nw at last [].sw + { s_box(`\shortstack[r]{hue=0\\val=0}') at V.w rjust + s_box(val=1) at V.e ljust } + +# Miscellaneous +W:[ + shadowbox + DefineRGBColor(verylight,0.95,0.95,0.95); shadowbox(shaded=verylight) + shadowbox(hue=0;val=0) + DefineHSVColor(cx,110,0.5,0.5); shadowbox(shaded=cx) + shadowbox(shaded="yellow") + DefineHSVColor(lx,120,0.4,0.5); shadowbox(hue=120;sat=0.3;val=0.2;shadow=lx) + ] with .nw at last [].sw + +ellipsewid = w +#linethick = 5 +X:[ + shadowellipse(shadowthick=lthick) + ellipse thick 5 + ellipse thick 5 shaded "gray" + ] with .nw at last [].sw+(0,-0.1) + +.PE diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/Shaky.m4 b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/Shaky.m4 index 81364cf515e..81364cf515e 100644 --- a/Master/texmf-dist/doc/latex/circuit-macros/examples/Shaky.m4 +++ b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/Shaky.m4 diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/Star.m4 b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/Star.m4 new file mode 100644 index 00000000000..0817236d19f --- /dev/null +++ b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/Star.m4 @@ -0,0 +1,38 @@ +.PS +# Star.m4 +# https://tex.stackexchange.com/questions/605132/how-can-i-insert-a-nine-pointed-star-in-a-latex-document +gen_init + +# star(keys) +# keys: size=expr; +# points=expr; +# angle=expr; last convex vertex ang +# depth=expr; inner vertex fraction +# line=attributes; +define(`star',`[ pushkeys_(`$1', + `size:linewid; points:5; angle:90; depth:1/(m4points-1); line::N') + dang = 360/m4points + T: (Rect_(m4size/2*m4depth,m4angle+dang/2)) # concave inner vertex + S: 1/2 between T and (Rect_(m4size/2,m4angle)) + U: (Rect_(m4size/2,m4angle+dang)) # convex outer vertex + line m4line from S to T then to U + for i=1 to m4points-1 do { + T: (Rect_(m4size/2*m4depth,m4angle+i*dang+dang/2)) + U: (Rect_(m4size/2,m4angle+(i+1)*dang)) + continue to T then to U } + continue to S; popdef(`size',`points',`angle',`depth',`m4line')]') + +linewid = linewid*2 +ifelse(1,1,` +star +star(size=1) +star(points=4) +star(depth=1/4) +star(line=outlined "red") +star(points=8) +star(points=9;line=outlined "red" shaded "magenta") +') +#for_(3,8,1,` +#star(points=m4x;line=outlined "red" shaded "magenta")') + +.PE diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/Stator.m4 b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/Stator.m4 index fc74a111e7d..fc74a111e7d 100644 --- a/Master/texmf-dist/doc/latex/circuit-macros/examples/Stator.m4 +++ b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/Stator.m4 diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/TR_fill.m4 b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/TR_fill.m4 new file mode 100644 index 00000000000..bf3fae888c0 --- /dev/null +++ b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/TR_fill.m4 @@ -0,0 +1,17 @@ +.PS +# TR_fill.m4 +# https://tex.stackexchange.com/questions/654117/fill-parts-of-a-shape +gen_init + + B: (0,0); "B" at B below + C: (5,0); "C" at C below + A: Cintersect(B,4,C,3); "A" at A above + line from B to C then to A then to B + RightAngle(B,A,C,0.25) + + rgbfill(0.5,0.5,0.5, + arc from A to B rad 2 + arc cw to C rad 2.5 + arc to A rad 1.5 ) + +.PE diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/Views.m4 b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/Views.m4 new file mode 100644 index 00000000000..c02c9a48172 --- /dev/null +++ b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/Views.m4 @@ -0,0 +1,304 @@ +.PS +# Views.m4 +threeD_init + +sinclude(Lettering.m4def) +sinclude(../Lettering.m4def) +Letter_init + +define(`textwidth',5.5) + +`# Perspective transformations +# mult4( matrix, vector, vector ) + define mult4 { for i=1 to 4 do { + $3[i] = 0 + for j=1 to 4 do { $3[i] = $3[i] + $1[(j-1)*4+i]*$2[j] }}} +# eye4 make unit matrix + define eye4 { for i=1 to 4 do { for j=1 to 4 do { $1[(j-1)*4+i] = 0 }}} +# rotx4( theta, vector, vector ) + define rotx4 { $3[1] = $2[1] + $3[2] = cos($1)*$2[2]-sin($1)*$2[3] + $3[3] = sin($1)*$2[2]+cos($1)*$2[3] + $3[4] = $2[4] } +# roty4( theta, vector, vector ) + define roty4 { $3[1] = cos($1)*$2[1]-sin($1)*$2[3] + $3[2] = $2[2] + $3[3] = sin($1)*$2[1]+cos($1)*$2[3] + $3[4] = $2[4] } +# rotz4( theta, vector, vector ) + define rotz4 { $3[1] = cos($1)*$2[1]-sin($1)*$2[2] + $3[2] = sin($1)*$2[1]+cos($1)*$2[2] + $3[3] = $2[3] + $3[4] = $2[4] } +# add4( vector, vector, vector ) + define add4 { + if (($1[4]==0) && ($2[4]==0)) then { + for i=1 to 4 do { $3[i] = $1[i]+$2[i] } } \ + else { if $1[4]==0 then { for i=1 to 4 do { $3[i] = $1[i] } } \ + else { if $2[4]==0 then { for i=1 to 4 do { $3[i] = $2[i] } } \ + else { for i=1 to 3 do { $3[i] = $1[i]/$1[4]+$2[i]/$2[4] }; $3[4] = 1 } + } } } + +# vec4( x,y,z, vector ) + define vec4 { $4[1] = $1; $4[2] = $2; $4[3] = $3; $4[4] = 1 } +# copy4( vector, vector ) + define copy4 { $2[1] = $1[1]; $2[2] = $1[2]; $2[3] = $1[3]; $2[4] = $1[4] } +# pr4( vector, label ) + define pr4 { if $1[4]==0 then { print "Divide by zero" } \ + else { $2: pr($1[1]/$1[4],$1[2]/$1[4],$1[3]/$1[4]) }} + + define print4 { print sprintf("%g,%g,%g,%g",$1[1],$1[2],$1[3],$1[4]) } +' +# Basic dimensions + u = 1*27/28.7*0.7 ifdef(`xsnotes',`*1.14') + a = 2*u + b = 1*u + c = 1.2*u + d = c*1/2 + e = c/3 + f = u*1/4 + r = c/3 + + visibleth = 1.2 + dimensionth = 0.4 + hiddenth = dimensionth + linethick_(visibleth) + +# Iso diagram viewing angle +dazim = 45 +delev = -30 +setview(dazim,delev) + +define(`pr',`(project(`$3',`$1',`$2'))') +define(`xpnd',$1) + + define(`X0', `0,0,0') + define(`X1', `0,b,0') + define(`X2', `a,b,0') + define(`X3', `a,0,0') + define(`X4', `0,0,c') + define(`X5', `0,b,c') + define(`X6', `a,b,c') + define(`X7', `a,0,c') + define(`X8', `-e,0,c/2-f/2') + define(`X9', `-e,d,c/2-f/2') + define(`X10',`0,d,c/2-f/2') + define(`X11',`0,0,c/2-f/2') + define(`X12',`-e,0,c/2+f/2') + define(`X13',`-e,d,c/2+f/2') + define(`X14',`0,d,c/2+f/2') + define(`X15',`0,0,c/2+f/2') + define(`X16',`0,b*1.25,c') + define(`X17',`a/4,b*1.25,c') + define(`X18',`a/4,b,c') + define(`X19',`0,b,c/2') + define(`X20',`a/4,b,c/2') + define(`xn',20) + + define(`ncirc',18) + dt = 360/ncirc + tx = a*2/3; ty = b; tz = c/2 + define(`TR',`tx,ty,tz') + +define(`loopX',`ifelse(eval(`$1'>=0),1, + `define(`X'eval(`$1'+xn+1),`tx+r*cosd(`$1'*dt),ty,tz+r*sind(`$1'*dt)') + loopX(eval($1-1))')') + + loopX(ncirc) + +define(`loopTT',`ifelse(eval(`$1'>=0),1, + `TT[`$1']: ifelse(`$3',0,`pr(X$2)',`Y$2') + loopTT(eval(`$1'-1),eval(`$2'-1),`$3')')') + +define(`drawobj',` + line from pr(xpnd(`$1'0)) to pr(xpnd(`$1'1)) to pr(xpnd(`$1'2)) + line to pr(xpnd(`$1'3)) to pr(xpnd(`$1'0)) + line from pr(xpnd(`$1'0)) to pr(xpnd(`$1'11)) to pr(xpnd(`$1'8)) \ + to pr(xpnd(`$1'12)) to pr(xpnd(`$1'13)) + line to pr(xpnd(`$1'9)) to pr(xpnd(`$1'8)) + line from pr(xpnd(`$1'13)) to pr(xpnd(`$1'14)) to pr(xpnd(`$1'10)) + line to pr(xpnd(`$1'9)) + line from pr(xpnd(`$1'10)) to pr(xpnd(`$1'11)) + ifelse(`$2',0, + `shade(0.92,line width 0 from pr(xpnd(`$1'1)) to pr(xpnd(`$1'5)) \ + to pr(xpnd(`$1'6)) to pr(xpnd(`$1'2)) to pr(xpnd(`$1'1))) + perspective(X1,Z) + ellipse fill_(0.7) ht 2*r*tmx[2]/tmx[4]/b wid 2*r at pr(TR) + shade(1,line width 0 from pr(xpnd(`$1'19)) to pr(xpnd(`$1'16)) \ + to pr(xpnd(`$1'17)) to pr(xpnd(`$1'20)) to pr(xpnd(`$1'19))) + shade(0.7,line width 0 from pr(xpnd(`$1'0)) to pr(xpnd(`$1'1)) \ + to pr(xpnd(`$1'2)) to pr(xpnd(`$1'3)) to pr(xpnd(`$1'0))) + shade(0.6,line width 0 from pr(xpnd(`$1'0)) to pr(xpnd(`$1'1)) \ + to pr(xpnd(`$1'19)) to pr(xpnd(`$1'16)) to pr(xpnd(`$1'4)) \ + to pr(xpnd(`$1'0))) + shade(0.9,line width 0 from pr(xpnd(`$1'13)) to pr(xpnd(`$1'14)) \ + to pr(xpnd(`$1'10)) to pr(xpnd(`$1'9)) to pr(xpnd(`$1'13))) + shade(0.7,line width 0 from pr(xpnd(`$1'8)) to pr(xpnd(`$1'9)) \ + to pr(xpnd(`$1'10)) to pr(xpnd(`$1'11)) to pr(xpnd(`$1'8))) + shade(0.6,line width 0 from pr(xpnd(`$1'8)) to pr(xpnd(`$1'9)) \ + to pr(xpnd(`$1'13)) to pr(xpnd(`$1'12)) to pr(xpnd(`$1'8))) + A: line invis from pr(xpnd(`$1'4)) to pr(xpnd(`$1'0)) + B: line invis from pr(xpnd(`$1'12)) to pr(xpnd(`$1'13)) + line from Intersect_(A,B) to pr(xpnd(`$1'4)) + line from pr(xpnd(`$1'4)) to pr(xpnd(`$1'16))', + + `A: line invis from pr(xpnd(`$1'4)) to pr(xpnd(`$1'16)) + B: line invis from pr(xpnd(`$1'14)) to pr(xpnd(`$1'13)) + line from Intersect_(A,B) to pr(xpnd(`$1'16)) + line thick dimensionth from pr(xpnd(`$1'2)) to -0.5 between \ + pr(xpnd(`$1'2)) and pr(xpnd(`$1'1)) chop 0.05 + line thick dimensionth from pr(xpnd(`$1'3)) to -0.5 between \ + pr(xpnd(`$1'3)) and pr(xpnd(`$1'0)) chop 0.05 + line thick dimensionth from pr(xpnd(`$1'5)) to -1.0 between \ + pr(xpnd(`$1'5)) and pr(xpnd(`$1'1)) chop 0.05 + line thick dimensionth from pr(xpnd(`$1'4)) to -1.0 between \ + pr(xpnd(`$1'4)) and pr(xpnd(`$1'0)) chop .1 chop 0.05 + loopTT(ncirc,eval(xn+ncirc+1),`$2') + fitcurve(TT,ncirc) + ') + line from pr(xpnd(`$1'16)) to pr(xpnd(`$1'19)) \ + to pr(xpnd(`$1'20)) to pr(xpnd(`$1'17)) to pr(xpnd(`$1'16)) + line from pr(xpnd(`$1'19)) to pr(xpnd(`$1'1)) + A: line invis from pr(xpnd(`$1'5)) to pr(xpnd(`$1'6)) + B: line invis from pr(xpnd(`$1'17)) to pr(xpnd(`$1'20)) + line from Intersect_(A,B) to pr(xpnd(`$1'6)) + line from pr(xpnd(`$1'6)) to pr(xpnd(`$1'2)) + ') + + dp = 1.0*a + s4f = 1.6 + fth = 180*dtor_ + +# perspective(x,y,z,position) +`define perspective { + vec4($3,$1,$2,tmp) + roty4(180*dtor_,tmp,tmx) + rotz4(90*dtor_,tmx,tmp) + rotx4(-90*dtor_,tmp,tmx) + roty4(-45*dtor_,tmx,tmp) + tmp[4] = tmp[3]/dp+tmp[4] + rotx4(55*dtor_,tmp,tmx) + $4: (tmx[1]/tmx[4],tmx[2]/tmx[4]) + } +' +lu = 0.1/6 * 0.8 + +# Handle forward referencing of lettering guide line lengths + nguides = 0 + sh "touch Views.dms" + for i=1 to 10 do { w[i] = 1 } + copy "Views.dms" + sh "rm -f Views.dms" + +define(`guideletter',`[ nguides += 1 + line thick grthick from (0,0) right w[nguides]*lu outlined "lightgridgray" + line thick grthick from (0,-6*lu) right w[nguides]*lu outlined "lightgridgray" + T: $1 with .nw at (0,0) + print sprintf("w[%g]=%g",nguides,T.wid/lu) >> "Views.dms" +]') + +define(`pfront',`(`$1',`$2')') +define(`ptop',`(`$1',`$3')') +define(`pside',`(-(`$3'),`$2')') + sep = 0.6*u +define(`centreline',`rpoint_(ifelse(`$1',,`to rvec_(linewid,0)',`$1')) + line thick dimensionth to rvec_(rp_len/2-.08,0) + move to rvec_(.03,0) + line thick dimensionth to rvec_(.1,0) + move to rvec_(.03,0) + line thick dimensionth to rvec_(rp_len/2-.08,0)') + +Orthographics: [ +Top: [ + line from ptop(X1) to ptop(X5) to ptop(X6) to ptop(X2) to ptop(X1) + line from ptop(X17) to ptop(X20) to ptop(X19) + line from ptop(X10) to ptop(X9) to ptop(X13) to ptop(X14) + circle rad r at ptop(TR) + centreline(from ptop(TR)+(0,r) down 2*r chop -.1) + centreline(from ptop(TR)+(-r,0) right 2*r chop -.1) + W: ptop(X9) + E: ptop(X2) + ] +Front: [ + line from pfront(X0) to pfront(X1) to pfront(X2) to pfront(X3) to pfront(X0) + line from pfront(X0) to pfront(X8) to pfront(X9) to pfront(X10) + line from pfront(X19) to pfront(X16) to pfront(X17) to pfront(X20) + line thick hiddenth dashed from pfront(TR)+(-r,0) down b + line thick hiddenth dashed from pfront(TR)+( r,0) down b + centreline(from pfront(TR) down b chop -.1) + W: pfront(X9) + E: pfront(X2) + N: pfront(X16) + S: pfront(X8) + ] with .nw at Top.sw+(0,-sep) + +Side: [ + line from pside(X0) to pside(X4) to pside(X16) to pside(X19) to pside(X1) \ + to pside(X0) to pside(X4) + line from pside(X12) to pside(X13) to pside(X9) to pside(X8) + line thick hiddenth dashed from pside(X5) to pside(X19) + line thick hiddenth dashed from pside(TR)+(-r,0) down b + line thick hiddenth dashed from pside(TR)+( r,0) down b + centreline(from pside(TR) down b chop -.1) + N: pside(X16) + S: pside(X0) + ] with .ne at Front.nw+(-sep,0) + +if 1 then { + linethick_(0.8) + guideletter([Letters(`F R O N T8V I5E1W')]) with .n at Front.s+(0,-.05) + guideletter([Letters(`S4I5D4E8V I5E1W')]) with .n at Side.s+(0,-.05) + guideletter([Letters(`T O4P8V I5E1W')]) with .n at Top.s+(0,-.10) + linethick_(visibleth) +} + + line thick dimensionth from Side.N to Front.N chop 0.05 + line thick dimensionth from Side.S to Front.S chop 0.05 + line thick dimensionth from Top.W to Front.W chop 0.05 + line thick dimensionth from Top.E to Front.E chop 0.05 + + ] # End Orthographics + +define(`looppersp',`ifelse(eval(`$1'>=0),1,`perspective(xpnd(X`$1'),Z`$1') + Y`$1': (cos(fth)*Z`$1'.x-sin(fth)*Z`$1'.y,\ + sin(fth)*Z`$1'.x+cos(fth)*Z`$1'.y)*s4f + looppersp(eval($1-1))')') + +if 1 then { +Perspective: [ + pushdef(`pr',`$1') + right_ + looppersp(eval(xn+ncirc+1)) + drawobj(Y,1) + popdef(`pr') +# ] with .sw at Isometric.ne+(-3.5*sep,0) + ] with .se at Orthographics.sw+(-1.5*sep,0) + + linethick_(0.8) + guideletter([[Letters(T2W O)]; move right lu; line right 4*lu; move right lu + [Letters(P O4I5N T8P E R S P E C T I V E)]])\ + with .w at Perspective.s+(.2*u,0) + linethick_(visibleth) +} + +if 1 then { +# Pictorials: +Isometric: [ + drawobj(X,0) +# command "{\small" +# define(`loopprt',`ifelse(eval(`$1'>=0),1,`"`$1'" at pr(X$1) +# loopprt(eval($1-1))')') +# loopprt(xn) +# for i=0 to ncirc do { sprintf("%g",i) at TT[i] } +# command "}%" +#] with .sw at (Orthographics.e+(-textwidth,0),Orthographics.Side.sw+(0,0.1)) +#] at Orthographics.nw + ] with .s at Perspective.n+(0,0.2) + + linethick_(0.8) + guideletter([Letters(`S4H2A2D E D8I S O M5E2T2R5I C8V I5E1W')])\ + with .w at Isometric.s+(.2*u,0) #(0,-.2) + linethick_(visibleth) +} + +.PE diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/Wheat.m4 b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/Wheat.m4 index c70fa8fc74d..c70fa8fc74d 100644 --- a/Master/texmf-dist/doc/latex/circuit-macros/examples/Wheat.m4 +++ b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/Wheat.m4 diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/Wheel.m4 b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/Wheel.m4 new file mode 100644 index 00000000000..934c4c46dbd --- /dev/null +++ b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/Wheel.m4 @@ -0,0 +1,20 @@ +.PS +# Wheel.m4 +# https://tex.stackexchange.com/questions/605178/drawing-a-directed-wheel-graph-with-tikz +gen_init + + linethick = 1.6 + nnodes = 9 + brad = 2 + srad = circlerad/2 + P: circle rad srad at (1,0.5) fill_(0.75) + A: Rect_(brad,90+360/nnodes) + for i=1 to nnodes do { + B: circle invis shaded "lightgray" at Rect_(brad,90-(i-1)/nnodes*360) \ + sprintf("\Huge %g",i) + line from B to P chop circlerad chop srad + line from B to A chop + A: B + } + +.PE diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/Y14-5_example.m4 b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/Y14-5_example.m4 new file mode 100644 index 00000000000..cb4397516c3 --- /dev/null +++ b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/Y14-5_example.m4 @@ -0,0 +1,53 @@ +.PS +# Y14-5_example.m4 +# https://en.wikipedia.org/wiki/Geometric_dimensioning_and_tolerancing +cct_init +textht = 11bp__*2/3 +command "{\sf" +sinclude(ASME_Y14-5.m4def) +sinclude(../ASME_Y14-5.m4def) + + boxht = 7.5/0.5*textht + boxwid = 15/7.5 * boxht + circlerad = 2.3/0.5*textht*0.5 + thicklines_(1) + arrowht = textht*0.8 + arrowwid = textht*0.6 + + Box: box + Circle: circle at Box.c; {CM: move from Circle.se down textht right textht} +thinlines_ +CLV: ctrline( up_ Box.ht with .c at Box.c, Box.ht/2 ) +CLH: ctrline( right Box.ht with .c at Box.c, Box.ht/2 ) + + dimension_(from Box.nw to Box.n,Box.ht/6) + thicklines_(1) + {Y14_frame("10") with .s at AS_C+(0,textht/2)} + thinlines_ + line from 3rd last line.start to CLV.end + dimension_(from Box.w to Box.nw,Box.ht/6) + thicklines_(1) + {Y14_frame("5") with .e at AS_C+(-textht/2,0)} + thinlines_ + line from 4th last line.start to CLH.start + +thicklines_ + DA: Y14_frame("A") at Box.ne+(-textht*1.5,textht*5) + datumarrow(from DA.s to (DA,Box.n)) + DB: Y14_frame("B") at Box.sw+(-textht*5,textht*2) + datumarrow(from DB.e to (Box.w,DB)) + + F: Y14_frame(Y14_pos_, + Y14_dia_;"0.03";"(M)", + "A","B","C") with .w at Box.se+(-textht*4,-textht*2) + G: Y14_frame(Y14_fla_,Y14_cyl_,Y14_lin_, + Y14_sur_,Y14_per_,Y14_ang_, + Y14_par_) with .nw at F.sw+(0,-0.1) + H: Y14_frame(Y14_pos_,Y14_cir_,Y14_tot_,Y14_dia_) \ + with .nw at G.sw+(0,-0.1) + + { CB: move left textht from F.w } + arrow <- from Circle.se to Intersect_(CM,CB) then to F.w + + command "}" +.PE diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/Zcos.m4 b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/Zcos.m4 index cbf63fd8f39..cbf63fd8f39 100644 --- a/Master/texmf-dist/doc/latex/circuit-macros/examples/Zcos.m4 +++ b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/Zcos.m4 diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/birds.m4 b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/birds.m4 index 4b42ea35af6..4b42ea35af6 100644 --- a/Master/texmf-dist/doc/latex/circuit-macros/examples/birds.m4 +++ b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/birds.m4 diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/bistable.m4 b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/bistable.m4 index ac49023863b..ac49023863b 100644 --- a/Master/texmf-dist/doc/latex/circuit-macros/examples/bistable.m4 +++ b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/bistable.m4 diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/brace.m4 b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/brace.m4 index 3cf80f87635..b0089fe96d7 100644 --- a/Master/texmf-dist/doc/latex/circuit-macros/examples/brace.m4 +++ b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/brace.m4 @@ -4,6 +4,33 @@ gen_init NeedDpicTools divert(-1) + `bracket(linespec, end depth, + thickness, end thickness, attributes) + Square bracket along linespec + default depth is linewid/5 + attributes = eg + thick 0.4 outlined "string" shaded "string" + (default black)' +define(`bracket',`rpoint_(ifelse(`$1',,`to rvec_(linewid,0)',`$1')) + M4brS: last line.start; M4brE: last line.end + [ brdepth = ifelse(`$2',,linewid/5,`($2)') + brthick = ifelse(`$3',,brdepth/6,`($3)') + endthick = ifelse(`$4',,brthick/3,`($4)') + define(`m4brackattribs', + `ifelse(`$5',,`thick 0.4 shaded rgbstring(0,0,0)',`$5')')dnl + {line m4brackattribs \ + from M4brS+vec_(0,brdepth) to M4brS+vec_(0,brdepth+brthick) \ + then to M4brE+vec_(0,brdepth+brthick) \ + then to M4brE \ + then to M4brE+vec_(-endthick,0) \ + then to M4brE+vec_(-endthick,brdepth) \ + then to M4brS+vec_( endthick,brdepth) \ + then to M4brS+vec_( endthick,0) \ + then to M4brS \ + then to M4brS+vec_(0,brdepth) } + S: M4brS + ] with .S at Here') + `brace(linespec,depth,arm thickness,attributes) Curly brace along linespec default depth is linewid/5 @@ -57,11 +84,9 @@ R1: [ x = i/n y = minht*(1-x)+maxht*x hsvtorgb(x*hmax,1,1,r,g,b) - brace(from (-i*del,-y/2) up y,,,thick 0.4 \ - shaded rgbstring(r,g,b)) - brace(from ((i+1)*del,y/2) down y,,,thick 0.4 \ - outlined rgbstring(r,g,b) \ - shaded rgbstring(r,g,b)) + brace(from ( -i*del,-y/2) up y,,,thick 0.4 shaded rgbstring(r,g,b)) + brace(from ((i+1)*del, y/2) down y,,,thick 0.4 \ + outlined rgbstring(r,g,b) shaded rgbstring(r,g,b)) } ] R2: [ @@ -69,12 +94,22 @@ R2: [ x = i/n y = minht*(1-x)+maxht*x hsvtorgb(x*hmax,1,1,r,g,b) - brace(from (-i*del,-y/2) up y,5bp__+x*20bp__,2bp__+x*13bp__,thick 0.4 \ - shaded rgbstring(r,g,b)) - brace(from ((i+1)*del,y/2) down y,5bp__+x*20bp__,2bp__+x*13bp__,thick 0.4 \ - outlined rgbstring(r,g,b) \ + brace(from ( -i*del,-y/2) up y,5bp__+x*20bp__,2bp__+x*13bp__,thick 0.4 \ shaded rgbstring(r,g,b)) + brace(from ((i+1)*del, y/2) down y,5bp__+x*20bp__,2bp__+x*13bp__,thick 0.4 \ + outlined rgbstring(r,g,b) shaded rgbstring(r,g,b)) } ] with .n at R1.s+(0,-0.2) +R3: [ + for i=0 to n-1 do { + x = i/n + y = minht*(1-x)+maxht*x + hsvtorgb(x*hmax,1,1,r,g,b) + bracket(from ( -i*del,-y/2) up y, 5bp__+x*20bp__, 2bp__+x*13bp__,, + thick 0.4 shaded rgbstring(r,g,b)) + bracket(from ((i+1)*del, y/2) down y, 5bp__+x*20bp__, 2bp__+x*13bp__,, + thick 0.4 outlined rgbstring(r,g,b) shaded rgbstring(r,g,b)) + } + ] with .n at R2.s+(0,-0.2) .PE diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/chaos.m4 b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/chaos.m4 index 17ae070e58d..17ae070e58d 100644 --- a/Master/texmf-dist/doc/latex/circuit-macros/examples/chaos.m4 +++ b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/chaos.m4 diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/hsv.m4 b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/hsv.m4 new file mode 100644 index 00000000000..662184dd7dd --- /dev/null +++ b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/hsv.m4 @@ -0,0 +1,26 @@ +.PS +# hsv.m4 +gen_init +NeedDpicTools + +define grid { (($2)*boxwid,($1)*boxht) } +r = 0 +g = 0 +b = 1 +rgbtohsv(r,g,b,h,s,v) +nstep = 4 +{ for j=0 to nstep do { + sprintf("%g",j/nstep) at ((0.5+j)*boxwid,-boxht/2) below } } + { "S" at ((0.5+nstep/2)*boxwid, -boxht) } +{ for i=0 to nstep do { sprintf("%g",i/nstep) at (-boxht/3,(i)*boxht) } } + { "V" at (-boxht,(nstep/2)*boxht) \ + "or" \ + "L" } +right_ +for v = 0 to nstep do { + { for s = 0 to nstep do { hsvtorgb(h,s/nstep,v/nstep,r,g,b) + box shaded rgbstring(r,g,b) } } + move up_ boxht; right_ } + + +.PE diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/person.m4 b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/person.m4 index 5f5a9cb8bd5..4fdf09d3878 100644 --- a/Master/texmf-dist/doc/latex/circuit-macros/examples/person.m4 +++ b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/person.m4 @@ -4,14 +4,13 @@ gen_init divert(-1) `person( - height=val;width=val;fill="colorname") - e.g. person(height=1;fill="gray")' -define(`person',`[ setkey_(`$1',height,linewid) - setkey_(`$1',width,m4height*2/5)dnl - setkey_(`$1',fill,"black",N)dnl - bodywid = m4width/2 + hght=expr;wdth=expr;fill="colorname") + e.g. person(hght=1;fill="gray")' +define(`person', + `[ pushkeys_(`$1',hght:linewid;wdth:m4hght*2/5;fill:"black":N)dnl + bodywid = m4wdth/2 bodyrad = bodywid/8 - bodyht = (m4height - bodywid - bodywid/16 + bodyrad*2)/2 + bodyht = (m4hght - bodywid - bodywid/16 + bodyrad*2)/2 tmplth = linethick; linethick = 0 Head: circle diam bodywid colored m4fill Body: box rad bodyrad ht bodyht wid bodywid colored m4fill \ @@ -23,9 +22,7 @@ define(`person',`[ setkey_(`$1',height,linewid) Legleft: box wid bodywid/2.5 rad armwid/2 ht Body.ht colored m4fill \ with .n at (Body.w,Body.s)+(bodywid/5,bodyrad*2) Legright: box same with .n at (Body.e,Body.s)+(-bodywid/5,bodyrad*2) - linethick_(tmplth) - popdef(`m4height',`m4fill')dnl - ]') + linethick_(tmplth) popdef(`m4hght',`m4wdth',`m4fill') ]') divert(0)dnl @@ -35,14 +32,14 @@ divert(0)dnl setrgb(0.54,0.81,0.94,babyblue) person(fill="babyblue") move - person(width=linewid*3/4;fill="babyblue") + person(wdth=linewid*3/4;fill="babyblue") move - person(width=linewid;fill="babyblue") + person(wdth=linewid;fill="babyblue") move person move resetrgb - person(height=1;fill="gray") + person(hght=1;fill="gray") line up linewid with .c at last [].e+(linewid/10,0) .PE diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/rotellipse.m4 b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/rotellipse.m4 index a49ce308b3b..a49ce308b3b 100644 --- a/Master/texmf-dist/doc/latex/circuit-macros/examples/rotellipse.m4 +++ b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/rotellipse.m4 diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/squiggle.m4 b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/squiggle.m4 index 671ae2addd0..671ae2addd0 100644 --- a/Master/texmf-dist/doc/latex/circuit-macros/examples/squiggle.m4 +++ b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/squiggle.m4 diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/venus.m4 b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/venus.m4 index 676cd98143d..676cd98143d 100644 --- a/Master/texmf-dist/doc/latex/circuit-macros/examples/venus.m4 +++ b/Master/texmf-dist/doc/latex/circuit-macros/examples/extras/venus.m4 diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/files.tex b/Master/texmf-dist/doc/latex/circuit-macros/examples/files.tex index 4a90ac0332c..8ca2c08f76f 100644 --- a/Master/texmf-dist/doc/latex/circuit-macros/examples/files.tex +++ b/Master/texmf-dist/doc/latex/circuit-macros/examples/files.tex @@ -179,7 +179,7 @@ \bfig{ \centerline{\getpic{Chips}} - \caption{IC package outlines + \caption{IC package outlines and examples \src{Chips.m4}.} } @@ -565,6 +565,14 @@ \src{Rotbox.m4}.} } +\ifmpost\else\ifpostscript\else\bfig{ + \centerline{\getpic{shadowed}} + \caption{The macro + {\tt shadowed(box|circle|ellipse|line,[at {\sl position}],{\sl keys})} + shadowed object + \src{shadowed.m4}.} + }\fi\fi + \bfig{ \centerline{\getpic{ex06}} \caption{Crosshatching @@ -648,18 +656,20 @@ \src{csc.m4}.} } -\ifpostscript\bfig{% For psfrag - \includegraphics[width=\textwidth]{rose.eps} %\centerline{\getpic{rose}} - \caption{The left object, used for testing {\tt dipic,} is redrawn from - a detail of the set design for the musical {\it Dracula.} This - consumes much \LaTeX\ main memory but can be produced directly - as pdf using \hbox{\tt dpic -d}, as svg using \hbox{\tt dpic -v}, - or as postscript using \hbox{\tt dpic -r} since no text formatting - is required. The right object adjusts the size of dots to produce - a halftone effect +\ifpostscript% +\bfig{% For psfrag +\includegraphics[width=\textwidth]{rose.eps} %\centerline{\getpic{rose}}%ignore% + \caption{The left object, used for testing {\tt dipic,} is redrawn from%ignore% + a detail of the set design for the musical {\it Dracula.} This %ignore% + consumes much \LaTeX\ main memory but can be produced directly %ignore% + as pdf using \hbox{\tt dpic -d}, as svg using \hbox{\tt dpic -v}, %ignore% + or as postscript using \hbox{\tt dpic -r} since no text formatting%ignore% + is required. The right object adjusts the size of dots to produce%ignore% + a halftone effect %ignore% \src{rose.m4}.} - }\else% -\ifmpost\else\bfig{% + } +\else\ifmpost\else% +\bfig{% Not psfrag \includegraphics[width=\textwidth]{rose.pdf} %\centerline{\getpic{rose}} \caption{The left object, used for testing {\tt dipic,} is redrawn from a detail of the set design for the musical {\it Dracula.} This @@ -669,7 +679,8 @@ is required. The right object adjusts the size of dots to produce a halftone effect \src{rose.m4}.} - }\fi\fi + } +\fi\fi \bfig{ \centerline{\getpic{diamond}} diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/heater.m4 b/Master/texmf-dist/doc/latex/circuit-macros/examples/heater.m4 new file mode 100644 index 00000000000..d3f0f8ee331 --- /dev/null +++ b/Master/texmf-dist/doc/latex/circuit-macros/examples/heater.m4 @@ -0,0 +1,26 @@ +.PS +# heater.m4 +cct_init + +movewid = 2 pt__ +hm = 2.05 +right_ +{ + {lamp ; move; "`{\tt lamp}'" ljust} + move right_ 1.5 + {lamp(,T) ; move;"`{\tt lamp(,T)}'" ljust} + move right_ 1.25 + {thermocouple ; move;" `{\tt thermocouple}'" ljust } + move right_ hm + {thermocouple(,,,T) ; move; "`{\tt thermocouple(,{,},T)}'" ljust } + } +move down 0.25; right_ +{ + {heater; move;"`{\tt heater}'" ljust} + move right_ hm + {heater(,,,,E); move;"`{\tt heater(,{,},{,}E)}'" ljust} + move right_ hm+0.4 + {heater(,,,,ET); move;"`{\tt heater(,{,},{,}ET)}'" ljust} + } + +.PE diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/keyboard.pdf b/Master/texmf-dist/doc/latex/circuit-macros/examples/keyboard.pdf Binary files differindex 94548b033a0..0d5fa829b82 100644 --- a/Master/texmf-dist/doc/latex/circuit-macros/examples/keyboard.pdf +++ b/Master/texmf-dist/doc/latex/circuit-macros/examples/keyboard.pdf diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/mf/cct.mf b/Master/texmf-dist/doc/latex/circuit-macros/examples/mf/cct.mf index e134c95c63d..fd626e6be7a 100644 --- a/Master/texmf-dist/doc/latex/circuit-macros/examples/mf/cct.mf +++ b/Master/texmf-dist/doc/latex/circuit-macros/examples/mf/cct.mf @@ -1,5 +1,5 @@ % cct.mf, generated by Mfpic, v1.10 2012/12/03, -% from TeX source "font" on 2022/11/28 at 18:39 +% from TeX source "font" on 2023/03/10 at 23:35 numeric mfpicversion; mfpicversion := 110; if unknown mode: mode := localfont; fi if unknown mag: mag := 1000/1000; fi @@ -2505,10 +2505,10 @@ begingroup; save mfpicnexus; hide(numeric mfpicnexus; path mfpicnexus[]; mfpicnexus = 0) store (mfpicnexus[incr mfpicnexus]) -arcplr ((-0.074188,-0.014308),22.529508,35.422548,0.233002); +arcplr ((-0.075317,-0.012706),21.601282,34.940662,0.233002); store (mfpicnexus[incr mfpicnexus]) -arcplr ((0.043984,-0.100954),72.077452,58.261852,0.233002); +arcplr ((0.043548,-0.100813),71.96482,57.676312,0.233002); mkpoly (false, mfpicnexus) endgroup; @@ -2517,7 +2517,7 @@ resizedrawpen (0.8bp); store (curpath) drawn -arcplr ((-0.022091,-0.067162),11.25,45.13128,0.233002); +arcplr ((-0.022091,-0.067162),11.25,49.625848,0.233002); store (curpath) drawn @@ -2561,10 +2561,10 @@ begingroup; save mfpicnexus; hide(numeric mfpicnexus; path mfpicnexus[]; mfpicnexus = 0) store (mfpicnexus[incr mfpicnexus]) -arcplr ((-0.014308,0.074188),-67.470492,-54.577452,0.233002); +arcplr ((-0.012706,0.075317),-68.398718,-55.059338,0.233002); store (mfpicnexus[incr mfpicnexus]) -arcplr ((-0.100954,-0.043984),-17.922548,-31.738148,0.233002); +arcplr ((-0.100813,-0.043548),-18.03518,-32.323688,0.233002); mkpoly (false, mfpicnexus) endgroup; @@ -2573,7 +2573,7 @@ resizedrawpen (0.8bp); store (curpath) drawn -arcplr ((-0.067162,0.022091),-78.75,-44.86872,0.233002); +arcplr ((-0.067162,0.022091),-78.75,-40.374152,0.233002); store (curpath) drawn @@ -2617,10 +2617,10 @@ begingroup; save mfpicnexus; hide(numeric mfpicnexus; path mfpicnexus[]; mfpicnexus = 0) store (mfpicnexus[incr mfpicnexus]) -arcplr ((0.074188,0.014308),-157.470492,-144.577452,0.233002); +arcplr ((0.075317,0.012706),-158.398718,-145.059338,0.233002); store (mfpicnexus[incr mfpicnexus]) -arcplr ((-0.043984,0.100954),-107.922548,-121.738148,0.233002); +arcplr ((-0.043548,0.100813),-108.03518,-122.323688,0.233002); mkpoly (false, mfpicnexus) endgroup; @@ -2629,7 +2629,7 @@ resizedrawpen (0.8bp); store (curpath) drawn -arcplr ((0.022091,0.067162),-168.75,-134.86872,0.233002); +arcplr ((0.022091,0.067162),-168.75,-130.374152,0.233002); store (curpath) drawn @@ -2673,10 +2673,10 @@ begingroup; save mfpicnexus; hide(numeric mfpicnexus; path mfpicnexus[]; mfpicnexus = 0) store (mfpicnexus[incr mfpicnexus]) -arcplr ((0.014308,-0.074188),112.529508,125.422548,0.233002); +arcplr ((0.012706,-0.075317),111.601282,124.940662,0.233002); store (mfpicnexus[incr mfpicnexus]) -arcplr ((0.100954,0.043984),162.077452,148.261852,0.233002); +arcplr ((0.100813,0.043548),161.96482,147.676312,0.233002); mkpoly (false, mfpicnexus) endgroup; @@ -2685,7 +2685,7 @@ resizedrawpen (0.8bp); store (curpath) drawn -arcplr ((0.067162,-0.022091),101.25,135.13128,0.233002); +arcplr ((0.067162,-0.022091),101.25,139.625848,0.233002); store (curpath) drawn @@ -2729,10 +2729,10 @@ begingroup; save mfpicnexus; hide(numeric mfpicnexus; path mfpicnexus[]; mfpicnexus = 0) store (mfpicnexus[incr mfpicnexus]) -arcplr ((-0.0153,-0.121331),34.780608,22.077452,0.236733); +arcplr ((-0.014561,-0.123133),35.685526,22.548869,0.236733); store (mfpicnexus[incr mfpicnexus]) -arcplr ((-0.025038,0.02723),-14.577452,-0.979566,0.236733); +arcplr ((-0.025156,0.026775),-14.463672,-0.407722,0.236733); mkpoly (false, mfpicnexus) endgroup; @@ -2741,7 +2741,7 @@ resizedrawpen (0.8bp); store (curpath) drawn -arcplr ((-0.032152,-0.047835),12.233526,41.25,0.236733); +arcplr ((-0.032152,-0.047835),7.809161,41.25,0.236733); store (curpath) drawn @@ -2785,10 +2785,10 @@ begingroup; save mfpicnexus; hide(numeric mfpicnexus; path mfpicnexus[]; mfpicnexus = 0) store (mfpicnexus[incr mfpicnexus]) -arcplr ((-0.121331,0.0153),-55.219392,-67.922548,0.236733); +arcplr ((-0.123133,0.014561),-54.314474,-67.451131,0.236733); store (mfpicnexus[incr mfpicnexus]) -arcplr ((0.02723,0.025038),-104.577452,-90.979566,0.236733); +arcplr ((0.026775,0.025156),-104.463672,-90.407722,0.236733); mkpoly (false, mfpicnexus) endgroup; @@ -2797,7 +2797,7 @@ resizedrawpen (0.8bp); store (curpath) drawn -arcplr ((-0.047835,0.032152),-77.766474,-48.75,0.236733); +arcplr ((-0.047835,0.032152),-82.190839,-48.75,0.236733); store (curpath) drawn @@ -2841,10 +2841,10 @@ begingroup; save mfpicnexus; hide(numeric mfpicnexus; path mfpicnexus[]; mfpicnexus = 0) store (mfpicnexus[incr mfpicnexus]) -arcplr ((0.0153,0.121331),-145.219392,-157.922548,0.236733); +arcplr ((0.014561,0.123133),-144.314474,-157.451131,0.236733); store (mfpicnexus[incr mfpicnexus]) -arcplr ((0.025038,-0.02723),165.422548,179.020434,0.236733); +arcplr ((0.025156,-0.026775),165.536328,179.592278,0.236733); mkpoly (false, mfpicnexus) endgroup; @@ -2853,7 +2853,7 @@ resizedrawpen (0.8bp); store (curpath) drawn -arcplr ((0.032152,0.047835),-167.766474,-138.75,0.236733); +arcplr ((0.032152,0.047835),-172.190839,-138.75,0.236733); store (curpath) drawn @@ -2897,10 +2897,10 @@ begingroup; save mfpicnexus; hide(numeric mfpicnexus; path mfpicnexus[]; mfpicnexus = 0) store (mfpicnexus[incr mfpicnexus]) -arcplr ((0.121331,-0.0153),124.780608,112.077452,0.236733); +arcplr ((0.123133,-0.014561),125.685526,112.548869,0.236733); store (mfpicnexus[incr mfpicnexus]) -arcplr ((-0.02723,-0.025038),75.422548,89.020434,0.236733); +arcplr ((-0.026775,-0.025156),75.536328,89.592278,0.236733); mkpoly (false, mfpicnexus) endgroup; @@ -2909,7 +2909,7 @@ resizedrawpen (0.8bp); store (curpath) drawn -arcplr ((0.047835,-0.032152),102.233526,131.25,0.236733); +arcplr ((0.047835,-0.032152),97.809161,131.25,0.236733); store (curpath) drawn diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/mpost/Makefile b/Master/texmf-dist/doc/latex/circuit-macros/examples/mpost/Makefile index bef3268c06e..978e1e35927 100644 --- a/Master/texmf-dist/doc/latex/circuit-macros/examples/mpost/Makefile +++ b/Master/texmf-dist/doc/latex/circuit-macros/examples/mpost/Makefile @@ -96,7 +96,7 @@ $(DOC).ps: $(DOC).dvi EXL = exlinks $(DOC).dvi: $(DOC).tex -if test "$(DOC)" = "examplesmpost" ; then make exlinks dims; fi - make $(FIGS) + make $(FIGS) rose.pdf $(LATEX) $(DOC) -if test -n "$(BOXDIMS)" ; then rm -f dims; \ for box in $(BOXDIMS) ; do rm -f $$box.1; done; \ @@ -109,9 +109,12 @@ dims: figs: $(EXL) $(FIGS) +rose.pdf: ../rose.m4 + m4 pdf.m4 ../rose.m4 | dpic -d > rose.pdf + exlinks: @echo "" - @echo 'Ignore "cannot create ... exists" warnings.' + @echo 'Ignore "cannot create ... exists and file.1 not found" warnings.' -@if test ! -f ex11.m4 ; then \ ls ../*.m4 | sed -e 's/^/ln -s /' -e '/test.m4/d' | sh;\ fi @@ -133,7 +136,7 @@ tst1: test.1 tstmpost.tex dvips tstmpost clean: - rm -f stamp-* $(FIGS) *.pic mp*.tex + rm -f stamp-* $(FIGS) *.pic mp*.tex rose.pdf -if /usr/bin/test -f exlinks ; then \ ls -l *.m4 *.bb *.gz | grep '\->' | \ sed -e 's/^.* \([^ ][^ ]*\) ->.*$$/rm -f \1/' | sh; fi diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/paletteSVG.m4 b/Master/texmf-dist/doc/latex/circuit-macros/examples/paletteSVG.m4 deleted file mode 100644 index 4c5a40f0387..00000000000 --- a/Master/texmf-dist/doc/latex/circuit-macros/examples/paletteSVG.m4 +++ /dev/null @@ -1,336 +0,0 @@ -.PS -# This is the source for a prototype svg library of electric circuit -# elements. Each element is a compound svg object with corners on grid points. -# -# Processing svg.m4 and this file thought dpic -v gives -# output that can be read into Inkscape. -# -define(`SIdefaults',` - scale = 25.4 - arcrad = 5 - arrowht = 2.5 - arrowwid = arrowht/2 - boxht = 12 - boxrad = 0 - boxwid = 20 - circlerad = 5 - dashwid = 1.5 - ellipseht = 12 - ellipsewid = 16 - lineht = 12 - linewid = 12 - moveht = 12 - movewid = 12 - textht = ifsvg(3,0) - textoffset = 1 - textwid = 0 -') - -log_init(svg_font(sans-serif,11bp__)) -SIdefaults - - # Assume dpic scale is in mm -gunit = 1 # Inkscape grid dimension -divert(-1) -define(`elen_',`(10*gunit)') # default 2-terminal element length -define(`dimen_',`(10*gunit)')# reference dimension for element bodies -define(`L_unit',`(2*gunit)') # logic gate grid size -define(`N_diam',1) # L_unit size of `not' circles - - # grid round and chop -define(`g_round',`(int((`$1')/gunit+100000.5 )-100000)*gunit') -define(`g_chop', `(int((`$1')/gunit+100000.9999)-100000)*gunit') - # snap to grid -define(`g_snap',`(g_round((`$1').x),g_round((`$1').y))') - -# Box containing an element. The element must be in a box that is -# intersected by a horizontal or vertical line from entry to exit. -define(`Gridbox',`[ command "<g>" - S: Here; `$1'; F: Here - if S.y == F.y then { - move from (max(S.x,F.x),F.y+g_chop(last[].n.y-F.y)) \ - to (min(S.x,F.x),F.y-g_chop(F.y-last[].s.y)) } \ - else { - move from (F.x+g_chop(last[].e.x-F.x),max(S.y,F.y)) \ - to (F.x-g_chop(F.x-last[].w.x),min(S.y,F.y)) } - command "</g>" ] ') - -# Place compound object corners at grid intersections -define(`Below', - `with .n at g_snap(ifelse(`$1',,`last []',`$1').s)-(0,2*gunit)') -define(`Right', - `with .w at g_snap(ifelse(`$1',,`last []',`$1').e)+(2*gunit,0)') - -# for debug -define(`prpos',`print (`$1').x/gunit,(`$1').y/gunit') -divert(0)dnl - -[ - -rpoint_(down_ elen_) -A:Gridbox( resistor ) - Gridbox( resistor(down_ dimen_*1/2) ) Right - Gridbox( resistor(,,E) ) Right - Gridbox( resistor(,,Q) ) Right - Gridbox( resistor(,,H) ) Right - Gridbox( resistor(,,N) ) Right - Gridbox( inductor(,W) ) Right - Gridbox( inductor(,W,,M) ) Right - Gridbox( inductor(,L) ) Right - Gridbox( inductor ) Right - Gridbox( inductor(,,,M) ) Right - Gridbox( capacitor ) Right - Gridbox( capacitor(,C) ) Right - Gridbox( capacitor(,P) ) Right - Gridbox( capacitor(,E) ) Right - Gridbox( capacitor(,K) ) Right - Gridbox( diode ) Right - Gridbox( diode(,K) ) Right - Gridbox( diode(,Z) ) Right - Gridbox( diode(,S) ) Right - Gridbox( diode(,L) ) Right - Gridbox( diode(,V) ) Right - Gridbox( diode(,v) ) Right - Gridbox( diode(,T) ) Right - Gridbox( diode(,CR) ) Right - Gridbox( diode(,D) ) Right - Gridbox( diode(,B) ) Right - Gridbox( diode(,LE) ) Right - Gridbox( [circle diam dimen_*0.7] ) Right - Gridbox( xtal ) Right - dot(at g_snap(last [].e+(2*gunit,0))) - -A:Gridbox( source ) Below(A) - Gridbox( source(,I) ) Right - Gridbox( source(,i) ) Right - Gridbox( source(,V) ) Right - Gridbox( source(,v) ) Right - Gridbox( source(,AC) ) Right - Gridbox( source(,S) ) Right - Gridbox( source(,X) ) Right - Gridbox( source(,F) ) Right - Gridbox( source(,P) ) Right - Gridbox( source(,U) ) Right - Gridbox( source(,R) ) Right - Gridbox( source(,T) ) Right - Gridbox( source(,L) ) Right - Gridbox( nullator ) Right - Gridbox( norator ) Right - Gridbox( consource ) Right - Gridbox( consource(,I) ) Right - Gridbox( consource(,i) ) Right - Gridbox( consource(,V) ) Right - Gridbox( consource(,v) ) Right - Gridbox( source(,Q) ) Right - Gridbox( source(,G) ) Right - -A:Gridbox( battery(up_ elen_) ) Below(A) - Gridbox( battery(up_ elen_,3) ) Right - Gridbox( ttmotor ) Right - Gridbox( memristor ) Right - Gridbox( tline ) Right - Gridbox( fuse ) Right - Gridbox( fuse(,D) ) Right - Gridbox( fuse(,B) ) Right - Gridbox( fuse(,C) ) Right - Gridbox( fuse(,S) ) Right - Gridbox( fuse(,HB) ) Right - Gridbox( fuse(,HC) ) Right - Gridbox( cbreaker ) Right - Gridbox( cbreaker(,,D) ) Right - Gridbox([variable(`[]',A)]) Right - Gridbox([variable(`[]',P)]) Right - Gridbox([variable(`[]',L)]) Right - Gridbox([variable(`[]',N)]) Right - Gridbox([variable(`[]',uN)]) Right - Gridbox([line to Here+(Rect_(dimen_/6,45))]) Right - Gridbox([line up dimen_*0.06 then right dimen_*0.12 \ - then up dimen_*0.06]) Right - Gridbox([em_arrows]) Right - Gridbox([em_arrows(N)]) Right - Gridbox([em_arrows(ND)]) Right - Gridbox([em_arrows(I)]) Right - Gridbox([em_arrows(ID)]) Right - Gridbox([em_arrows(E)]) Right - Gridbox([em_arrows(ED)]) Right - -A:Gridbox( [right_; ground] ) Below(A) - Gridbox( [right_; ground(,T)] ) Right - Gridbox( [right_; ground(,,F)] ) Right - Gridbox( [right_; ground(,,E)] ) Right - Gridbox( [right_; ground(,,S)] ) Right - Gridbox( [right_; ground(,,L)] ) Right - Gridbox( [right_; ground(,,P)] ) Right - Gridbox( transformer(right_ 6*gunit,L) ) Right - Gridbox( transformer(right_ 8*gunit,,2,8) ) Right - Gridbox( transformer(,,8,W,4) ) Right - Gridbox( transformer(,,9,AL) ) Right - Gridbox( transformer(,R,8,AW) ) Right - - rpoint_(right_) -A:Gridbox( switch ) Below(A) - Gridbox( switch(,,O) ) Right - Gridbox( switch(,,D) ) Right - Gridbox( switch(,,OD) ) Right - Gridbox( switch(,,C) ) Right - Gridbox( switch(,,B) ) Right - Gridbox( switch(,C,B) ) Right - Gridbox( dswitch ) Right - Gridbox( dswitch(,,WBK) ) Right - Gridbox( dswitch(,,WBuD) ) Right - Gridbox( dswitch(,,WBF) ) Right - Gridbox( dswitch(,,WBKF) ) Right - Gridbox( dswitch(,,WBL) ) Right - Gridbox( dswitch(,,WBKL) ) Right - -A:Gridbox( dswitch(,,WBT) ) Below(A) - Gridbox( dswitch(,,WdBKC) ) Right - Gridbox( dswitch(,,WBM) ) Right - Gridbox( dswitch(,,WBCO) ) Right - Gridbox( dswitch(,,WBCMP) ) Right - Gridbox( dswitch(,,WBCY) ) Right - Gridbox( dswitch(,,WBCZ) ) Right - Gridbox( dswitch(,,WBCE) ) Right - Gridbox( dswitch(,,WBRH) ) Right - Gridbox( dswitch(,,WBRdH) ) Right - Gridbox( dswitch(,,WBRHH) ) Right - -A:Gridbox( dswitch(,,WBMMR) ) Below(A) - Gridbox( dswitch(,,WBMM) ) Right - Gridbox( dswitch(,,WBMR) ) Right - Gridbox( dswitch(,,WBEL) ) Right - Gridbox( dswitch(,,WBLE) ) Right - Gridbox( dswitch(,,WBKEL) ) Right - Gridbox( antenna ) Right - Gridbox( antenna(,,L) ) Right - Gridbox( antenna(,,T) ) Right - Gridbox( antenna(,,S) ) Right - Gridbox( antenna(,,D) ) Right - Gridbox( antenna(,,P) ) Right - Gridbox( antenna(,,F) ) Right - -A:Gridbox( amp(right_ elen_*10/8) ) Below(A) -D1:Gridbox( integrator ) Right - Gridbox( delay ) Right - Gridbox( opamp ) Right - Gridbox( opamp(,,,,T) ) Right - Gridbox( amp(,dimen_/2) ) Right - Gridbox( integrator(,dimen_/2) ) Right - Gridbox( delay(,delay_rad_) ) Right - Gridbox( opamp(,,,dimen_*2/3) ) Right - Gridbox( opamp(,,,dimen_*2/3,T) ) Right - -right_ -A:Gridbox( relay(2) ) Below(A) - Gridbox( relay(2,O) ) Right - Gridbox( relay(2,C) ) Right - Gridbox( relay ) Right - Gridbox( contact ) Right - Gridbox( contact(O) ) Right - Gridbox( contact(C) ) Right - -up_ -A:Gridbox( [circle rad 29/10*gunit] ) Below(A) - Gridbox( bi_tr ) Right - Gridbox( bi_tr(,R) ) Right - Gridbox( bi_tr(,,P) ) Right - Gridbox( bi_tr(,R,P) ) Right - - Gridbox( j_fet ) Right - Gridbox( j_fet(,R) ) Right - Gridbox( j_fet(,,P,) ) Right - Gridbox( j_fet(,R,P,) ) Right - Gridbox( e_fet(,,,) ) Right - Gridbox( e_fet(,R,,) ) Right - - Gridbox( e_fet(,,P,) ) Right - Gridbox( e_fet(,R,P,) ) Right - Gridbox( d_fet(,,,) ) Right - Gridbox( d_fet(,R,,) ) Right - Gridbox( d_fet(,,P,) ) Right - Gridbox( d_fet(,R,P,) ) Right - -A:Gridbox( igbt ) Below(A) - Gridbox( ujt ) Right - Gridbox( ujt(,,P) ) Right -rpoint_(down_) - Gridbox( thyristor ) Right - Gridbox( thyristor(,B) ) Right - Gridbox( thyristor(,BG) ) Right - Gridbox( thyristor(,A) ) Right - Gridbox( thyristor(,C) ) Right -rpoint_(up_) - Gridbox( j_fet ) Right - Gridbox( e_fet ) Right - Gridbox( e_fet(,,,S) ) Right - Gridbox( e_fet(,,P) ) Right - Gridbox( e_fet(,,P,S) ) Right - Gridbox( d_fet ) Right - Gridbox( d_fet(,,,S) ) Right - Gridbox( d_fet(,,P,) ) Right - Gridbox( d_fet(,,P,S) ) Right - Gridbox( j_fet ) Right - Gridbox( j_fet(,,P) ) Right - Gridbox( mosfet(,,uHSDF) ) Right - -rpoint_(right_) -A:Gridbox( tgate ) Below(A) - Gridbox( tgate(,B) ) Right - Gridbox( ptrans ) Right - -A:Gridbox( AND_gate ) Below(A) - Gridbox( OR_gate ) Right - Gridbox( NAND_gate ) Right - Gridbox( NOR_gate ) Right - Gridbox( XOR_gate ) Right - Gridbox( NXOR_gate ) Right - Gridbox( BUFFER_gate ) Right - Gridbox( NOT_gate ) Right - -# input lines for OR-like gates. -define(`OR_inlgth',`(-sqrt(OR_rad^2-G_hht^2)+sqrt(OR_rad^2-`$1'^2))*L_unit') - - Gridbox( [ {move right_ gunit} - {move from last move-svec_(0,G_hht) to last move+svec_(0,G_hht)} - {line right_ OR_inlgth(0)} - {line right_ OR_inlgth(2) from Here+svec_(0,2)} - {line same from Here-svec_(0,2)} - {line right_ OR_inlgth(1) from Here+svec_(0,1)} - {line same from Here-svec_(0,1)}] ) Right - Gridbox( [ {move right_ gunit} - {move from last move-svec_(0,G_hht) to last move+svec_(0,G_hht)} - {line right_ OR_inlgth(0)} - {line right_ OR_inlgth(2) from Here+svec_(0,2)} - {line same from Here-svec_(0,2)}] ) Right - Gridbox( [ {move right_ gunit} - {move from last move-svec_(0,G_hht) to last move+svec_(0,G_hht)} - {line right_ OR_inlgth(2) from Here+svec_(0,2)} - {line same from Here-svec_(0,2)}] ) Right - Gridbox( [ {move right_ gunit} - {move from last move-svec_(0,G_hht) to last move+svec_(0,G_hht)} - {line right_ OR_inlgth(0)}] ) Right - -right_ -A:Gridbox( speaker ) Below(A) - Gridbox( speaker(,,H) ) Right - Gridbox( bell ) Right - Gridbox( microphone ) Right - Gridbox( buzzer ) Right - Gridbox( buzzer(,,C) ) Right - Gridbox( earphone ) Right - Gridbox( earphone(,,C) ) Right - Gridbox( nport ) Right - Gridbox( nterm ) Right - -A:Gridbox( FlipFlop(D) ) Below(A) - Gridbox( FlipFlop(T) ) Right - Gridbox( FlipFlop(RS)) Right - Gridbox( FlipFlop(JK)) Right - - ] with .nw at (0,0) - -#"A draft palette of a few elements for Inkscape using a 1 mm grid" \ -# ljust below at last [].sw - - command "</g>" # end font -.PE diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/shadowed.m4 b/Master/texmf-dist/doc/latex/circuit-macros/examples/shadowed.m4 new file mode 100644 index 00000000000..b0bf0afa154 --- /dev/null +++ b/Master/texmf-dist/doc/latex/circuit-macros/examples/shadowed.m4 @@ -0,0 +1,49 @@ +.PS +gen_init +divert(-1) + +divert(0)dnl + +Boxes: [ +shadebox(box "s{}hadebox",lthick*4/(1bp__)) + +move +#{print "B"} +B: shadowed(,, + shadowthick=lthick*4;attrib=fill_(0.95) "box") + +move +#{print "B1"} +B1: shadowed(,, + rad=0bp__; shadowthick=lthick*4; shadowcolor="lightgray"; shadowangle=-60; \ + attrib=fill_(0.85) "box") + +move +#{print "R"} +R: shadowed(box,, rad=6bp__; shadowthick=lthick*4; \ + attrib=wid boxht*2 shaded "orange" outlined "red" thick 2 \ + `"\tt box\char44\char44" "\tt rad=6bp\_\_"') +] + +Others:[ +#{print "C"} +C: shadowed(circle,, + shadowthick=lthick*4;shadowcolor="blue";\ + attrib=outlined "green" shaded "green" diam 0.75 "circle") + +move +#{print "E"} + E: shadowed(ellipse,, + shadowthick=lthick*4; attrib=ht boxwid wid boxht shaded "yellow" \ + dashed "ellipse") + +move right movewid*3/2 then down moveht/2; right_ + b = boxht + F: shadowed(line,, + attrib=left b then up b right b then down b right b then to Here \ + shaded "orange" outlined "red" thick 3;shadowthick=4.5bp__;\ + shadowangle=45) + "line" at F.n+(0,-0.3) +] with .nw at Boxes.sw+(0,-moveht) + +.PE diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/snake.m4 b/Master/texmf-dist/doc/latex/circuit-macros/examples/snake.m4 deleted file mode 100644 index 39f2b7d1d1f..00000000000 --- a/Master/texmf-dist/doc/latex/circuit-macros/examples/snake.m4 +++ /dev/null @@ -1,21 +0,0 @@ -.PS -# snake.m4 -gen_init -scale = 2 -rmax = 0.8 -rmin = 0.2 -fact = 0.75 -wd = 0.15 -[ -shade(0.8, - for r = rmax to rmin by *fact do { - arc cw rad r to Here+(r+r,0) - arc ccw rad r-wd to Here+(2*(r-wd),0) } - line right wd - for r = r to rmax by *1/fact do { - arc cw rad r to Here-(r+r,0) - arc ccw rad r-wd to Here-(2*(r-wd),0) } - line to (0,0) - ) -] with .sw at 2,2 -.PE diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/xfig/xfiglib.fig b/Master/texmf-dist/doc/latex/circuit-macros/examples/xfig/xfiglib.fig index ce3f289160c..53db089ade2 100644 --- a/Master/texmf-dist/doc/latex/circuit-macros/examples/xfig/xfiglib.fig +++ b/Master/texmf-dist/doc/latex/circuit-macros/examples/xfig/xfiglib.fig @@ -6,7 +6,7 @@ Letter 100.00 Single -2 -# dpic version 2022.12.01 option -x for Fig 3.2 +# dpic version 2023.03.01 option -x for Fig 3.2 1200 2 6 0 0 3975 5025 6 0 0 3975 5025 @@ -195,9 +195,11 @@ Single 1125 1425 1125 1275 1 3 0 1 0 -1 0 -1 -1 0 1 0.0 1125 1125 150 150 1275 1125 1275 1125 6 1025 1089 1225 1161 +6 1025 1089 1225 1161 5 1 0 1 0 -1 0 -1 -1 0 0 1 0 0 1075 1142 1125 1125 1075 1089 1025 1125 5 1 0 1 0 -1 0 -1 -1 0 0 1 0 0 1175 1108 1125 1125 1175 1161 1225 1125 -6 +-6 2 1 0 1 0 -1 0 -1 -1 0 0 0 0 0 0 2 1125 975 1125 825 -6 diff --git a/Master/texmf-dist/doc/latex/circuit-macros/examples/xtras b/Master/texmf-dist/doc/latex/circuit-macros/examples/xtras new file mode 100644 index 00000000000..d2211aa5f50 --- /dev/null +++ b/Master/texmf-dist/doc/latex/circuit-macros/examples/xtras @@ -0,0 +1,61 @@ +mv ASMEbox.m4 extras +mv Ant.m4 extras +mv ArrowFn.m4 extras +mv Attention.m4 extras +mv Autoencoder.m4 extras +mv Bridge.m4 extras +mv CSlight.m4 extras +mv Ccurve.m4 extras +mv Chuck.m4 extras +mv Clocks.m4 extras +mv ControlLoop.m4 extras +mv Counting.m4 extras +mv Cruller.m4 extras +mv Cylinder.m4 extras +mv Egg.m4 extras +mv Euro.m4 extras +mv Eye.m4 extras +mv Fefets.m4 extras +mv FieldLines.m4 extras +mv Floor.m4 extras +mv Flow2.m4 extras +mv Hexagon.m4 extras +mv Highgain.m4 extras +mv IC10107.m4 extras +mv Koch.m4 extras +mv Lyap.m4 extras +mv Metamodel.m4 extras +mv Obliq.m4 extras +mv OneLine.m4 extras +mv OpAmpFilter.m4 extras +mv Optics.m4 extras +mv Orbits.m4 extras +mv PPA.m4 extras +mv PerpTo.m4 extras +mv Pipe.m4 extras +mv Planes.m4 extras +mv RandomNodes.m4 extras +mv Region.m4 extras +mv Resolver.m4 extras +mv SPM.m4 extras +mv SampleFlow.m4 extras +mv ShadeSector.m4 extras +mv Shadow.m4 extras +mv Shaky.m4 extras +mv Star.m4 extras +mv Stator.m4 extras +mv TR_fill.m4 extras +mv Views.m4 extras +mv Wheat.m4 extras +mv Wheel.m4 extras +mv Y14-5_example.m4 extras +mv Zcos.m4 extras +mv birds.m4 extras +mv bistable.m4 extras +mv brace.m4 extras +mv chaos.m4 extras +mv hsv.m4 extras +mv person.m4 extras +mv rotellipse.m4 extras +mv squiggle.m4 extras +mv venus.m4 extras |
