summaryrefslogtreecommitdiff
path: root/graphics/circuit_macros/examples
diff options
context:
space:
mode:
Diffstat (limited to 'graphics/circuit_macros/examples')
-rw-r--r--graphics/circuit_macros/examples/Alogix.m418
-rw-r--r--graphics/circuit_macros/examples/Smithchart.m428
-rw-r--r--graphics/circuit_macros/examples/Sources.m44
-rw-r--r--graphics/circuit_macros/examples/dpv/SourcesDPV.m46
-rw-r--r--graphics/circuit_macros/examples/ex05.m47
-rw-r--r--graphics/circuit_macros/examples/examples.pdfbin1902473 -> 1902836 bytes
-rw-r--r--graphics/circuit_macros/examples/extras/Koch.m45
-rw-r--r--graphics/circuit_macros/examples/extras/Makefile4
-rw-r--r--graphics/circuit_macros/examples/extras/README_extras14
-rw-r--r--graphics/circuit_macros/examples/extras/TR_fill.m441
-rw-r--r--graphics/circuit_macros/examples/extras/Views.m44
-rw-r--r--graphics/circuit_macros/examples/mf/cct.mf2
12 files changed, 89 insertions, 44 deletions
diff --git a/graphics/circuit_macros/examples/Alogix.m4 b/graphics/circuit_macros/examples/Alogix.m4
index fd586869b7..4e5abd837c 100644
--- a/graphics/circuit_macros/examples/Alogix.m4
+++ b/graphics/circuit_macros/examples/Alogix.m4
@@ -9,7 +9,7 @@ A: Autologix(
move left 10bp__ from A.InCk
"\sl Out1" at A.Out1 ljust
"\sl Out2" at A.Out2 ljust
- Loopover_(`v_', `"$v_$" at A.In`'v_ above ', A,B,C,Ck)
+ foreach_(`v_', `"$v_$" at A.In`'v_ above ', A,B,C,Ck)
`"\shortstack[l]{
\tt Autologix( \\ \tt \quad
Nand(And(Or(A,C),Or(B,\~{}C),Or(\~{}A,B,C)),Ck);\\ \tt \quad
@@ -67,7 +67,7 @@ undefine(`extras')
ifdef(`extras',`
Q1: Autologix(Nor(Nor(A,And(B,C)),Nand(Not(B),D))) \
with .nw at A.sw+(0,-61bp__)
- Loopover_(`x',`"\sf x" at last [].In`'x above',A,B,C,D)
+ foreach_(`x',`"\sf x" at last [].In`'x above',A,B,C,D)
`"\shortstack[l]{%
\tt Q1: Autologix(Nor(Nor(A,And(B,C)),Nand(Not(B),D)),<options>)\\
@@ -76,37 +76,37 @@ ifdef(`extras',`
Q2: Autologix(Nor(Nor(A,And(B,~C)),Nand(Not(B),D)),V) \
with .nw at last "".sw+(0,-14bp__)
- Loopover_(`x',`"\sf x" at last [].In`'x above',A,B,C,D)
+ foreach_(`x',`"\sf x" at last [].In`'x above',A,B,C,D)
"\sf V" at last [].se above rjust
Q3: Autologix(Nor(Nor(A,And(B,C)),Nand(Not(B),D)),R) \
with .nw at last [].sw+(0,-0.2)
- Loopover_(`x',`"\sf x" at last [].In`'x above',A,B,C,D)
+ foreach_(`x',`"\sf x" at last [].In`'x above',A,B,C,D)
"\sf R" at last [].se above rjust
Q4: Autologix(Nor(Nor(A,And(B,C)),Nand(Not(B),D)),RV) \
with .nw at last [].sw+(0,-0.2)
- Loopover_(`x',`"\sf x" at last [].In`'x above',A,B,C,D)
+ foreach_(`x',`"\sf x" at last [].In`'x above',A,B,C,D)
"\sf RV" at last [].se above rjust
Autologix(Nor(Nor(A,And(B,C)),Nand(Not(B),D)),LRV) \
with .Out at Q4.Out+(3.5,0)
- Loopover_(`x',`"\sf x" at last [].In`'x rjust',A,B,C,D)
+ foreach_(`x',`"\sf x" at last [].In`'x rjust',A,B,C,D)
"\sf LRV" at last [].se above rjust
Autologix(Nor(Nor(A,And(B,C)),Nand(Not(B),D)),LR;offset=-L_unit*1.5) \
with .Out at Q3.Out+(3.5,0)
- Loopover_(`x',`"\sf x" at last [].In`'x rjust',A,B,C,D)
+ foreach_(`x',`"\sf x" at last [].In`'x rjust',A,B,C,D)
"\sf LR" at last [].se above rjust
Autologix(Nor(Nor(A,And(B,~C)),Nand(Not(B),D)),LV;offset=L_unit*2) \
with .Out at Q2.Out+(3.5,0)
- Loopover_(`x',`"\sf x" at last [].In`'x rjust',A,B,C,D)
+ foreach_(`x',`"\sf x" at last [].In`'x rjust',A,B,C,D)
"\sf LV" at last [].se above rjust
Autologix(Nor(Nor(A,And(B,C)),Nand(Not(B),D)),L) \
with .Out at Q1.Out+(3.5,0)
- Loopover_(`x',`"\sf x" at last [].In`'x rjust',A,B,C,D)
+ foreach_(`x',`"\sf x" at last [].In`'x rjust',A,B,C,D)
"\sf L" at last [].se above rjust
')
diff --git a/graphics/circuit_macros/examples/Smithchart.m4 b/graphics/circuit_macros/examples/Smithchart.m4
index fc6b5590db..8607339a7b 100644
--- a/graphics/circuit_macros/examples/Smithchart.m4
+++ b/graphics/circuit_macros/examples/Smithchart.m4
@@ -56,7 +56,7 @@ C: circle thick thk rad rar(0) at (0,0)
line thick thk grayline(thkg) from C.w to C.e
Rc(50): circle thick thk grayline(thkg) rad rar(50) at Rac(50)
-Loopover_(`term',`RaArc1(patsubst(term,:,`,'))',
+foreach_(`term',`RaArc1(patsubst(term,:,`,'))',
20:thn:50,
30 to 40 by 10:thn:50,
20:thk:20,
@@ -86,7 +86,7 @@ Loopover_(`term',`RaArc1(patsubst(term,:,`,'))',
0.01 to 0.191 by 0.01:thn:0.2,
0.05 to 0.151 by 0.1:thk:0.2)
-Loopover_(`term',`RaArc2(patsubst(term,:,`,'))',
+foreach_(`term',`RaArc2(patsubst(term,:,`,'))',
0.05 to 0.451 by 0.1:thn:1:0.5,
0.02 to 0.181 by 0.02:thn:0.5:0.1)
@@ -95,7 +95,7 @@ Xc(50): arct(thk) cw grayline(thkg) from C.e \
Xc(-50): arct(thk) grayline(thkg) from C.e \
to SGamma(0,-50) with .c at Xac(-50)
-Loopover_(`term',`XaArc2(patsubst(term,:,`,'))',
+foreach_(`term',`XaArc2(patsubst(term,:,`,'))',
10 to 20 by 10:thn:0:50,
7 to 9 by 2:thn:0:10,
2 to 18 by 2:thn:0:20,
@@ -112,7 +112,7 @@ Loopover_(`term',`XaArc2(patsubst(term,:,`,'))',
0.2 to 0.81 by 0.2:thk:0:2,
0.1 to 0.91 by 0.2:thk:0:1)
-Loopover_(`term',`XaArc2(patsubst(term,:,`,'))',
+foreach_(`term',`XaArc2(patsubst(term,:,`,'))',
0.05 to 0.451 by 0.1:thn:0.5:1,
0.02 to 0.181 by 0.02:thn:0:0.5,
0.02 to 0.191 by 0.01:thn:0:0.2, dnl 0.02 should be 0.01
@@ -125,12 +125,12 @@ dnl these avoid TeX arithmetic overflow:
dnl Internal labels start here
textht = C.wid/120
# Horizontal axis
-Loopover_(`t',`box wid textht ht textht*1.5 colored "white" \
+foreach_(`t',`box wid textht ht textht*1.5 colored "white" \
with .se at Rc(t).w+(-2bp__,2bp__)
r_text(90,"t",at Rc(t).w+(-textht/3,textht*1.5))',
0.1,0.2,0.3,0.4,0.5,0.6,0.7,0.8,0.9, 1,1.2,1.4,1.6,1.8, 2,3,4,5,10,20,50)
# Xc=1 labels
-Loopover_(`tt',
+foreach_(`tt',
`define(`m4ta',patsubst(tt,:.*))define(`m4vl',patsubst(tt,.*:))dnl
X: SGamma(m4vl,1)
M: move from Rc(m4vl) to X; ax = lin_ang(M)*rtod_-90 #; print ax
@@ -139,7 +139,7 @@ Loopover_(`tt',
r_text(-m4ta,m4vl,at X+(Rect_(textht*1.7,-(ax+30)))) ',
10:0.2, 19:0.4, 26:0.6, 32:0.8, 37:1)
# right-side circumference
-Loopover_(`tt',
+foreach_(`tt',
`define(`m4ta',patsubst(tt,:.*))define(`m4vl',patsubst(tt,.*:))dnl
X: Xc(m4vl).start; ax = atan2(X.y,X.x)*rtod_ ; # print round_(ax)
r_text(m4ta,m4vl,at X+(Rect_(textht*2,ax-120)))
@@ -148,13 +148,13 @@ Loopover_(`tt',
else { r_text(-m4ta,m4vl,at (X.x,-X.y)+(Rect_(textht*2,-ax+150))) } ',
6:20, 11:10, 23:5, 28:4, 37:3, 53:2, 58:1.8, 64:1.6, 71:1.4, 80:1.2, 90:1)
# left-side circumference
-Loopover_(`tt',
+foreach_(`tt',
`X: Xc(m4Lx*0.1).start; # print round_(atan2(X.y,X.x)*rtod_-180)
r_text(-patsubst(tt,:,`,'),at X+(Rect_(textht*1.7,-m4Lx*11+40)))
r_text( patsubst(tt,:,`,'),at (X.x,-X.y)+(Rect_(textht*2.1,m4Lx*11-30))) ',
11:0.1, 23:0.2, 33:0.3, 44:0.4, 53:0.5, 62:0.6, 70:0.7, 77:0.8, 84:0.9)
# Ra=1 labels
-Loopover_(`tt',`X: SGamma(1,m4Lx*0.2)
+foreach_(`tt',`X: SGamma(1,m4Lx*0.2)
M: move from Rac(1) to X; # print round_(lin_ang(M)*rtod_-180)
r_text(-eval(m4Lx*11),ifelse(m4Lx,5,1,0.eval(m4Lx*2)),
at X+(Rect_(textht*1.5,-m4Lx*11+40)))
@@ -188,7 +188,7 @@ for_(20,170,10,
r_text(eval( 90-m4x),-m4x,at A+(Rect_(A.rad+textht*1.2,-m4x)))
')
r_text(90,180,at A-(A.rad+textht/2,0))
-Loopover_(`rca',
+foreach_(`rca',
`r_text(eval(90-(180-rca/10)),eval(m4Lx*5+5),
at A+(Rect_(A.rad-textht*0.7,rca/10)))
r_text(eval(-90+(180-rca/10)),eval(-m4Lx*5-5),
@@ -199,16 +199,16 @@ Loopover_(`rca',
# Internal labels
setrgb(thng,thng,thkg)
"RESISTANCE R/Zo OR CONDUCTANCE G/Yo" at C+SGamma(0.5,0)-(0,C.rad/40)
- Loopover_(`Lttr',`ifelse(Lttr,*,,`r_text(eval(87-m4Lx*86/100),Lttr,
+ foreach_(`Lttr',`ifelse(Lttr,*,,`r_text(eval(87-m4Lx*86/100),Lttr,
at W+(Rect_(W.rad+wltic/2+textht*0.5, 177-m4Lx*0.86))) ')',
W,A,V,E,L,E,N,G,T,H,S,*,T,O,W,A,R,D,*,G,E,N,E,R,A,T,O,R)
- Loopover_(`Lttr',`ifelse(Lttr,*,,`r_text(eval(115-m4Lx*86/100),Lttr,
+ foreach_(`Lttr',`ifelse(Lttr,*,,`r_text(eval(115-m4Lx*86/100),Lttr,
at W+(Rect_(W.rad-wltic/2-textht*1.0, 204-m4Lx*0.86))) ')',
W,A,V,E,L,E,N,G,T,H,S,*,T,O,W,A,R,D,*,L,O,A,D)
- Loopover_(`Lttr',`ifelse(Lttr,*,,`define(`xa','13-m4Lx*86/100`)
+ foreach_(`Lttr',`ifelse(Lttr,*,,`define(`xa','13-m4Lx*86/100`)
r_text(eval(xa-90),Lttr,at A+(Rect_(A.rad+textht*0.7, xa))) ')',
R,E,F,L,E,C,T,I,O,N,*,C,O,E,F,F,I,C,I,E,N,T,*,A,N,G,L,E)
- Loopover_(`Lttr',`ifelse(Lttr,*,,`define(`xa','14-m4Lx*86/100`)
+ foreach_(`Lttr',`ifelse(Lttr,*,,`define(`xa','14-m4Lx*86/100`)
r_text(eval(xa-90),Lttr,at A+(Rect_(A.rad-textht*0.7, xa))) ')',
T,R,A,N,S,M,I,S,S,I,O,N,*,C,O,E,F,F,I,C,I,E,N,T,*,A,N,G,L,E)
resetrgb
diff --git a/graphics/circuit_macros/examples/Sources.m4 b/graphics/circuit_macros/examples/Sources.m4
index 8a4bab9bc6..53c732b75d 100644
--- a/graphics/circuit_macros/examples/Sources.m4
+++ b/graphics/circuit_macros/examples/Sources.m4
@@ -14,6 +14,7 @@ define(`NL',`; move down $1; right_')
{source ; move ; "`source'" ljust} NL
{source(,I) ; move ; "`source(,I)'" ljust} NL
{source(,i) ; move ; "`source(,i)'" ljust} NL
+ {source(,ii) ; move ; "`source(,ii)'" ljust} NL
{source(,V) ; move ; "`source(,V)'" ljust} NL
{source(,v) ; move ; "`source(,v)'" ljust} NL
{source(,SC) ; move ; "`source(,SC)'" ljust} NL
@@ -51,7 +52,8 @@ define(`NL',`; move down $1; right_')
{consource(,V) ; move ; "`consource(,V)'" ljust} NL(0.32)
{consource(,v) ; move ; "`consource(,v)'" ljust} NL(0.3)
{battery ; move ; "`battery'" ljust} NL(0.3)
- {battery(,3,R) ; move ; "`battery(,3,R)'" ljust}
+ {battery(,3,R) ; move ; "`battery(,3,R)'" ljust} NL(0.35)
+ {ttmotor(,G) ; move ; "`ttmotor(,G)'" ljust}
iflatex(`ifpsfrag(,`latexcommand(})')')
.PE
diff --git a/graphics/circuit_macros/examples/dpv/SourcesDPV.m4 b/graphics/circuit_macros/examples/dpv/SourcesDPV.m4
index 91e2edeba6..6c09030183 100644
--- a/graphics/circuit_macros/examples/dpv/SourcesDPV.m4
+++ b/graphics/circuit_macros/examples/dpv/SourcesDPV.m4
@@ -9,6 +9,7 @@ define(`NL',`; move down $1; right_')
{source ; move ; "`source'" ljust} NL
{source(,I) ; move ; "`source(,I)'" ljust} NL
{source(,i) ; move ; "`source(,i)'" ljust} NL
+ {source(,i) ; move ; "`source(,ii)'" ljust} NL
{source(,V) ; move ; "`source(,V)'" ljust} NL
{source(,v) ; move ; "`source(,v)'" ljust} NL
{source(,AC); move ; "`source(,AC)'" ljust} NL
@@ -41,8 +42,9 @@ define(`NL',`; move down $1; right_')
{consource(,i) ; move ; "`consource(,i)'" ljust} NL(0.32)
{consource(,V) ; move ; "`consource(,V)'" ljust} NL(0.32)
{consource(,v) ; move ; "`consource(,v)'" ljust} NL(0.3)
- {battery ; move ; "`battery'" ljust} NL
- {battery(,3,R) ; move ; "`battery(,3,R)'" ljust}
+ {battery ; move ; "`battery'" ljust} NL(0.3)
+ {battery(,3,R) ; move ; "`battery(,3,R)'" ljust} NL(0.35)
+ {ttmotor(,G) ; move ; "`ttmotor(,G)'" ljust}
command "</g>" # end font
.PE
diff --git a/graphics/circuit_macros/examples/ex05.m4 b/graphics/circuit_macros/examples/ex05.m4
index 748a48ebe9..07a5c27fa9 100644
--- a/graphics/circuit_macros/examples/ex05.m4
+++ b/graphics/circuit_macros/examples/ex05.m4
@@ -5,6 +5,7 @@ ifelse(ifpstricks(T)`'ifpgf(T)`'ifsvg(T)`'ifmpost(T),T,`
Kalman: [
fillval = 0.8 # environmental variable
+ linethick = 1 # slightly thicker for better screen pdf
dx = boxht/5 # diagram parameters wrt scaled env variables
circlerad = boxht*3/8
@@ -96,8 +97,10 @@ Coxeter: [
define(`customarc',
`pushdef(`dfillcolor',`0.7,0.7,0.7') linethick_(0.4); dnl
- Darc(`$1',linewid, (`$2')*dtor_, (`$3')*dtor_,
- thick=linewid/6; wid=linewid*0.3; ht=linewid/6; ends=<->)dnl
+# Darc(`$1',linewid, (`$2')*dtor_, (`$3')*dtor_,
+# thick=linewid/6; wid=linewid*0.3; ht=linewid/6; ends=<->)dnl
+ Darc(,centre=`$1';rad=linewid;startdeg= (`$2');enddeg=(`$3');
+ thick=linewid/6; wid=linewid*0.3; ht=linewid/6; ends=<->)
linethick_(customlinethick); popdef(`dfillcolor')')
customarc((linewid,-linewid/3), 25,155)
diff --git a/graphics/circuit_macros/examples/examples.pdf b/graphics/circuit_macros/examples/examples.pdf
index 1ca1e0ca2d..1b001ac9ad 100644
--- a/graphics/circuit_macros/examples/examples.pdf
+++ b/graphics/circuit_macros/examples/examples.pdf
Binary files differ
diff --git a/graphics/circuit_macros/examples/extras/Koch.m4 b/graphics/circuit_macros/examples/extras/Koch.m4
index faa46dfff8..cb122c10b6 100644
--- a/graphics/circuit_macros/examples/extras/Koch.m4
+++ b/graphics/circuit_macros/examples/extras/Koch.m4
@@ -25,8 +25,9 @@ gen_init
line from X to X
for i=1 to nsides do {
a += rot[i]
- X: X+(Rect_(leng,a))
- continue to X
+# X: X+(Rect_(leng,a))
+# continue to X
+ continue by (Rect_(leng,a))
}
.PE
diff --git a/graphics/circuit_macros/examples/extras/Makefile b/graphics/circuit_macros/examples/extras/Makefile
index 5fba20547c..efc8a2b23e 100644
--- a/graphics/circuit_macros/examples/extras/Makefile
+++ b/graphics/circuit_macros/examples/extras/Makefile
@@ -165,7 +165,7 @@ $(DOC).pdf:
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 "\n\n|noindent|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 ; \
@@ -208,4 +208,4 @@ tst1:
dvips $(DVIPSOPTS) tst -o tst.ps
clean:
- rm -f *.ps *.pdf *.tex *.dim *.pic *.log *.dms *.aux
+ rm -f *.ps *.pdf *.tex *.dim *.pic *.log *.dms *.aux *.svg
diff --git a/graphics/circuit_macros/examples/extras/README_extras b/graphics/circuit_macros/examples/extras/README_extras
index 1c18266a6a..45074a49b2 100644
--- a/graphics/circuit_macros/examples/extras/README_extras
+++ b/graphics/circuit_macros/examples/extras/README_extras
@@ -1,11 +1,11 @@
-THIS DIRECTORY contains a Makefile and m4 sources for diagrams not
-included in the examples files. Many of these correspond to questions
-asked on stackexchange, of the form "How do I draw ... with tikz?"
-Producing drawings like these can be satisfying, as shown by the alacrity
-with which knowledgable people assist when questions are asked. Often,
-the question has more to do with geometry than drawing language, and
-the examples here using m4 with dpic merely confirm that the coding can
+THIS DIRECTORY contains a Makefile and m4 sources for some diagrams
+not included in the main examples files. Many of these correspond to
+questions asked on stackexchange, of the form "How do I draw ... with
+tikz?" Producing drawings like these can be satisfying, as shown by the
+alacrity with which knowledgable people assist when questions are asked.
+The questions often have more to do with geometry than drawing language,
+and the examples here using m4 with dpic confirm that the coding can
often be done reasonably in several possible languages.
This directory is assumed to be a subdirectory of the examples directory
diff --git a/graphics/circuit_macros/examples/extras/TR_fill.m4 b/graphics/circuit_macros/examples/extras/TR_fill.m4
index bf3fae888c..9a93dbe551 100644
--- a/graphics/circuit_macros/examples/extras/TR_fill.m4
+++ b/graphics/circuit_macros/examples/extras/TR_fill.m4
@@ -1,8 +1,8 @@
.PS
+gen_init
+[
# 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
@@ -13,5 +13,42 @@ gen_init
arc from A to B rad 2
arc cw to C rad 2.5
arc to A rad 1.5 )
+ ]
+[
+# Fillbetween
+# https://tex.stackexchange.com/questions/688273/polar-curve-shading-error-with-fillbetween
+NeedDpicTools
+
+ sc = 0.5
+ define coord {(($1,$2)*sc)}
+ define X1 {coord(Rect_(6*sind($1),$1))}
+ define X2 {coord(Rect_(2+2*sind($1),$1))}
+ define interp {$1+($2-($1))*($3)}
+ define axes {
+ arrow from coord(-6,0) to coord(6,0)
+ "$x$" rjust above
+ for x=-5 to 5 do {line up_ 0.1 at coord(x,0)}
+ "${-}5$" at coord(-5,-0.05/sc) below
+ "${}5$" at coord(5,-0.05/sc) below
+ arrow from coord(0,-2) to coord(0,7)
+ "$y$" at Here+(8bp__,-10bp__)
+ for y=-1 to 5 do {line right 0.1 at coord(0,y)}
+ "${}5$" at coord(-0.05/sc,5) rjust
+ }
+
+ n = 36
+ for i=0 to n do { t = interp(30,150,i/n); C3[i]: X1(t) }
+ for i=0 to n do { t = interp(150,150-360,i/n); C4[i]: X2(t) }
+ for i=0 to n do { t = interp(150,210,i/n); C5[i]: X1(t) }
+ rgbfill(0.9,0.9,0.9,
+ fitcurve(C3,n)
+ fitcurve(C4,n)
+ fitcurve(C5,n) )
+ fitcurve(C3,n,outlined "orange" )
+ fitcurve(C4,n,outlined "red" )
+ fitcurve(C5,n,outlined "orange" )
+
+ axes
+ ] with .nw at last [].sw+(0,-0.2)
.PE
diff --git a/graphics/circuit_macros/examples/extras/Views.m4 b/graphics/circuit_macros/examples/extras/Views.m4
index c02c9a4817..e33c656682 100644
--- a/graphics/circuit_macros/examples/extras/Views.m4
+++ b/graphics/circuit_macros/examples/extras/Views.m4
@@ -43,9 +43,9 @@ define(`textwidth',5.5)
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 )
+# pr4( vector, label ) # projected vector (see pr below)
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]) }}
+ 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]) }
'
diff --git a/graphics/circuit_macros/examples/mf/cct.mf b/graphics/circuit_macros/examples/mf/cct.mf
index 776d8f4183..a511d1f0d9 100644
--- a/graphics/circuit_macros/examples/mf/cct.mf
+++ b/graphics/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 2023/05/31 at 20:45
+% from TeX source "font" on 2023/09/11 at 22:43
numeric mfpicversion; mfpicversion := 110;
if unknown mode: mode := localfont; fi
if unknown mag: mag := 1000/1000; fi