Update Giancoli v6 to use Circ.asy v0.2.

[course.git] / latex / problems / Giancoli_6 / problem19.24.tex

diff --git a/latex/problems/Giancoli_6/problem19.24.tex b/latex/problems/Giancoli_6/problem19.24.tex
index 1dc6d584d0eb8d978e92781a83934564b0308aa5..5791ebf2f05c5790f5bdc10cd213965bcb863858 100644 (file)
--- a/latex/problems/Giancoli_6/problem19.24.tex
+++ b/latex/problems/Giancoli_6/problem19.24.tex
@@ -4,17 +4,18 @@ Determine the terminal voltage of each battery in Fig.~19-44.
 \begin{asy}
   import Circ;
   real u = 3cm;
-  TwoTerminal ra = resistor((0,0), ang=0, "$r_1 = 1.0\U{\Ohm}$", "");
-  TwoTerminal Ba = source(
-    ra.end, ang=0, type=DC, "", "$\mathcal{E}_1 = 12\U{V}$");
-  TwoTerminal rb = resistor(ra.beg+(0,-u), ang=0, "$r_2 = 2.0\U{\Ohm}$", "");
-  TwoTerminal Bb = source(
-    rb.end, ang=0, type=DC, "", "$\mathcal{E}_2 = 18\U{V}$");
-  TwoTerminal R = resistor(
-    Bb.end+(0.5u,0.25u), ang=90, "", "$R = 6.6\U{\Ohm}$");
-  wire(rb.beg, ra.beg, rlsq, dist=-24pt);
-  wire(Bb.end, R.beg, rlsq);
-  wire(Ba.end, R.end, rlsq);
+  MultiTerminal ra = resistor(Label("$r_1 = 1.0\U{\Ohm}$", align=S));
+  MultiTerminal Ba = source(
+    ra.terminal[1], type=DC, label="$\mathcal{E}_1 = 12\U{V}$");
+  MultiTerminal rb = resistor(ra.terminal[0]+(0,-u),
+    Label("$r_2 = 2.0\U{\Ohm}$", align=S));
+  MultiTerminal Bb = source(
+    rb.terminal[1], type=DC, label="$\mathcal{E}_2 = 18\U{V}$");
+  MultiTerminal R = resistor(
+    Bb.terminal[1]+(0.5u,0.25u), dir=90, label="$R = 6.6\U{\Ohm}$");
+  wire(rb.terminal[0], ra.terminal[0], rlsq, dist=-24pt);
+  wire(Bb.terminal[1], R.terminal[0], rlsq);
+  wire(Ba.terminal[1], R.terminal[1], rlsq);
 \end{asy}
 \end{center}
 \end{problem*}