--- loncom/xml/physnet.sty	2003/05/29 14:19:52	1.18
+++ loncom/xml/physnet.sty	2003/06/04 15:13:46	1.28
@@ -162,11 +162,30 @@
 </definetag>
 
 
+<definetag name = "defContents">
+   <meta></meta>
+   <render>
+      <web></web>
+      <tex>\newpage\setlength{\headwidth}{\textwidth} 
+           \lhead{\textit{Contents}}\rhead{}</tex>
+  </render>
+</definetag>
+
+
+<definetag name = "/defContents">
+   <meta></meta>
+   <render>
+      <web></web>
+      <tex></tex>
+  </render>
+</definetag>
+
+
 <definetag name = "defModTitle">
    <meta><output><moduletitle></meta>
    <render>
       <web>Title: <b></web>
-      <tex>\noindent Title: \textbf{\uppercase{</tex>
+      <tex>\noindent Title: \textbf{</tex>
   </render>
 </definetag>
 
@@ -175,7 +194,7 @@
    <meta></moduletitle></output></meta>
    <render>
       <web></b><br /><br /></web>
-      <tex>}}</tex>
+      <tex>}</tex>
   </render>
 </definetag>
 
@@ -417,7 +436,7 @@
    <meta></meta>
    <render>
       <web><hideweboutput></web>
-      <tex></tex>
+      <tex>\keephidden{</tex>
   </render>
 </definetag>
 
@@ -426,7 +445,7 @@
    <meta></meta>
    <render>
       <web></hideweboutput></web>
-      <tex></tex>
+      <tex>}</tex>
   </render>
 </definetag>
 
@@ -435,7 +454,7 @@
    <meta></meta>
    <render>
       <web><hideweboutput></web>
-      <tex></tex>
+      <tex>\keephidden{</tex>
   </render>
 </definetag>
 
@@ -444,7 +463,7 @@
    <meta></meta>
    <render>
       <web></hideweboutput></web>
-      <tex></tex>
+      <tex>}</tex>
   </render>
 </definetag>
 
@@ -633,11 +652,11 @@
    <meta></meta>
    <render>
       <web></web>
-      <tex>\setcounter{bookpage}{\value{page}} 
+      <tex>\newpage\setcounter{bookpage}{\value{page}} 
            \setlength{\headwidth}{\textwidth} 
           \lhead{\textit{MISN-0-$module}}
           \newwrite\tcfile
-          \openout\tcfile=m$module-tc.tex </tex>
+          \openout\tcfile=m$module-tc.tex</tex>
   </render>
 </definetag>
 
@@ -654,7 +673,7 @@
 <definetag name = "SectTitle" parms = "number">
    <meta><output><title></meta>
    <render>
-      <web><h1> Section <a name="Unit.$number"> $number. <a><font color="#009900"></web>
+      <web><h1> Section <a name="Unit.$number"> $number. </a><font color="#009900"></web>
       <tex>\setcounter{bookpage}{\value{page}} 
        \rhead{$number-\doort} 
        \noindent \begin{tabular}[b]{c} 
@@ -1811,7 +1830,7 @@
       <web><p><center><img src="$figure.gif" align=center border=1></web>
       <tex>\parbox[t]{\linewidth-2cm}{\begin{center}
            \graphicspath{{/home/httpd/html/res/physnet/physnet/$module/}}
-           \includegraphics{$figure}\end{center}}
+           \scalebox{0.85}{\includegraphics{$figure}}\end{center}}
            \newline </tex>
   </render>
 </definetag>
@@ -3200,14 +3219,14 @@
 <definetag name = "CaptionAfterLeftFigure" parms="module,figure">
    <meta><output><picture>$figure</picture></output></meta>
    <render>
-      <web><br /><br /><table align=center><tr><td align=center><img src="$figure.gif" align=left border=1></img></td><td align=left></web>
+      <web><br /><br /><table align=center><tr><td align=center><img src="$figure.gif" align=left border=1 /></td><td align=left></web>
       <tex>\begin{center}
            \vskip 1 mm \noindent
            \begin{minipage}[b]{\linewidth}
            \noindent
            \graphicspath{{/home/httpd/html/res/physnet/physnet/$module/}}
-           \fbox{\includegraphics{$figure.eps}}
-           \settowidth{\figwidth}{\fbox{\includegraphics{$figure.eps}}} 
+           \scalebox{0.9}{\fbox{\includegraphics{$figure.eps}}}
+           \settowidth{\figwidth}{\scalebox{0.9}{\fbox{\includegraphics{$figure.eps}}}} 
            \hfill
            \parbox[b]{\linewidth - \figwidth - 0.5 cm}{</tex>
    </render>
@@ -3229,8 +3248,8 @@
       <web><br /><br /><table align=center><tr><td align=center><img src="$figure.gif" align=left border=1></img></td></tr><tr><td align=center></web>
       <tex>\begin{center} \vskip 1 mm \noindent
            \graphicspath{{/home/httpd/html/res/physnet/physnet/$module/}}
-           \fbox{\includegraphics{$figure.eps}}
-           \settowidth{\figwidth}{\fbox{\includegraphics{$figure.eps}}}\\ 
+           \fbox{\scalebox{0.82}{\includegraphics{$figure.eps}}}
+           \settowidth{\figwidth}{\scalebox{0.82}{\fbox{\includegraphics{$figure.eps}}}}\\ 
            \parbox[b]{\figwidth}{\noindent </tex>
    </render>
 </definetag>
@@ -3252,8 +3271,8 @@
       <tex>\vskip 1 mm \noindent
            \noindent
            \graphicspath{{/home/httpd/html/res/physnet/physnet/$module/}}
-           \fbox{\includegraphics{$figure.eps}}
-           \settowidth{\figwidth}{\fbox{\includegraphics{$figure.eps}}}\\ 
+           \fbox{\scalebox{0.9}{\includegraphics{$figure.eps}}}
+           \settowidth{\figwidth}{\fbox{\scalebox{0.9}{\includegraphics{$figure.eps}}}}\\ 
            \noindent </tex>
    </render>
 </definetag>
@@ -3402,15 +3421,15 @@
    <meta><output><picture>$figure1</picture>
                  <picture>$figure2</picture></output></meta>
    <render>
-      <web><table align=center><tr><td><img src="$figure1.gif" align=left border=1></td><td><img src="$figure2.gif" align=left border=1></td></tr><tr><td></web>
+      <web><table align=center><tr><td><img src="$figure1.gif" align=left border=1 /></td><td><img src="$figure2.gif" align=left border=1 /></td></tr><tr></web>
       <tex>\vskip 1 mm \noindent
            \graphicspath{{/home/httpd/html/res/physnet/physnet/$module/}}
            \begin{minipage}[b]{\linewidth}
            \noindent
-           \fbox{\includegraphics{$figure1.eps}}
-           \settowidth{\figwidth}{\fbox{\includegraphics{$figure1.eps}}} 
-           \fbox{\includegraphics{$figure2.eps}}\\
-           \parbox[t]{\figwidth}{</tex>
+           \fbox{\scalebox{0.85}{\includegraphics{$figure1.eps}}}
+           \settowidth{\figwidth}{\scalebox{0.85}{\fbox{\includegraphics{$figure1.eps}}}} 
+           \fbox{\scalebox{0.85}{\includegraphics{$figure2.eps}}}\\
+           \parbox[t]{\figwidth}</tex>
    </render>
 </definetag>
 
@@ -3418,8 +3437,44 @@
 <definetag name = "/TwoFullFigures">
    <meta></meta>
    <render>
-      <web></td></tr></table></web>
-      <tex>}\end{minipage}\vskip 1 mm </tex>
+      <web></tr></table></web>
+      <tex>\end{minipage}\vskip 1 mm </tex>
+   </render>
+</definetag>
+
+
+<definetag name = "TwoFullFiguresFirstCaption">
+   <meta></meta>
+   <render>
+      <web><td></web>
+      <tex>{</tex>
+   </render>
+</definetag>
+
+
+<definetag name = "/TwoFullFiguresFirstCaption">
+   <meta></meta>
+   <render>
+      <web></td></web>
+      <tex>}</tex>
+   </render>
+</definetag>
+
+
+<definetag name = "TwoFullFiguresSecondCaption">
+   <meta></meta>
+   <render>
+      <web><td></web>
+      <tex>\hfill \parbox[t]{\linewidth - \figwidth- 0.5 cm}{</tex>
+   </render>
+</definetag>
+
+
+<definetag name = "/TwoFullFiguresSecondCaption">
+   <meta></meta>
+   <render>
+      <web></td></web>
+      <tex>}</tex>
    </render>
 </definetag>
 
@@ -3618,8 +3673,8 @@
            \begin{minipage}[b]{\linewidth}
            \noindent
            \graphicspath{{/home/httpd/html/res/physnet/physnet/$module/}}
-           \fbox{\includegraphics{$figure.eps}}
-           \settowidth{\figwidth}{\fbox{\includegraphics{$figure.eps}}} 
+           \fbox{\scalebox{0.9}{\includegraphics{$figure.eps}}}
+           \settowidth{\figwidth}{\fbox{\scalebox{0.9}{\includegraphics{$figure.eps}}}} 
            \hfill
            \parbox[b]{\linewidth - \figwidth - 0.5 cm}{</tex>
    </render>
@@ -3661,7 +3716,7 @@
                  <picture>$figure2</picture>
                  <picture>$figure3</picture></output></meta>
    <render>
-      <web><table align=center><tr><td><img src="$figure1.gif" align=left border=1></td><td><img src="$figure2.gif" align=left border=1></td><td><img src="$figure3.gif" align=left border=1></td> </tr><tr><td></web>
+      <web><table align=center><tr><td><img src="$figure1.gif" align=left border=1 /></td><td><img src="$figure2.gif" align=left border=1 /></td><td><img src="$figure3.gif" align=left border=1 /></td> </tr><tr></web>
       <tex>\vskip 1 mm \noindent    
            \begin{minipage}[b]{\linewidth}
            \noindent
@@ -3671,7 +3726,7 @@
            \fbox{\scalebox{0.9}{\includegraphics{$figure2.eps}}}
            \settowidth{\numberwidth}{\fbox{\includegraphics{$figure2.eps}}} 
            \fbox{\scalebox{0.9}{\includegraphics{$figure3.eps}}}\\
-           \parbox[b]{\figwidth}{</tex>
+           \parbox[b]{\figwidth}</tex>
    </render>
 </definetag>
 
@@ -3679,8 +3734,62 @@
 <definetag name = "/ThreeFullFigures">
    <meta></meta>
    <render>
-      <web></td></tr></table></web>
-      <tex>}\end{minipage}\vskip 1 mm </tex>
+      <web></tr></table></web>
+      <tex>\end{minipage}\vskip 1 mm </tex>
+   </render>
+</definetag>
+
+
+<definetag name = "ThreeFullFiguresFirstCaption">
+   <meta></meta>
+   <render>
+      <web><td></web>
+      <tex>{</tex>
+   </render>
+</definetag>
+
+
+<definetag name = "/ThreeFullFiguresFirstCaption">
+   <meta></meta>
+   <render>
+      <web></td></web>
+      <tex>}</tex>
+   </render>
+</definetag>
+
+
+<definetag name = "ThreeFullFiguresSecondCaption">
+   <meta></meta>
+   <render>
+      <web><td></web>
+      <tex>\hfill \parbox[t]{\numberwidth}{</tex>
+   </render>
+</definetag>
+
+
+<definetag name = "/ThreeFullFiguresSecondCaption">
+   <meta></meta>
+   <render>
+      <web></td></web>
+      <tex>}</tex>
+   </render>
+</definetag>
+
+
+<definetag name = "ThreeFullFiguresThirdCaption">
+   <meta></meta>
+   <render>
+      <web><td></web>
+      <tex>\hfill \parbox[t]{\linewidth - \figwidth - \numberwidth - 0.5 cm}{</tex>
+   </render>
+</definetag>
+
+
+<definetag name = "/ThreeFullFiguresThirdCaption">
+   <meta></meta>
+   <render>
+      <web></td></web>
+      <tex>}</tex>
    </render>
 </definetag>
 
@@ -3744,7 +3853,7 @@
    <meta><output><title>Local Guide</title></output></meta>
    <render>
       <web><center><h1>LOCAL GUIDE</h1></center></web>
-      <tex>\setcounter{bookpage}{\value{page}} 
+      <tex>\newpage\setcounter{bookpage}{\value{page}} 
            \setlength{\headwidth}{\textwidth} 
            \lhead{\textit{MISN-0-$module}}
            \rhead{LG-\doort}
@@ -3842,7 +3951,7 @@
       <tex>\noindent
            \parbox[t]{\linewidth}{         
            \graphicspath{{/home/httpd/html/res/physnet/physnet/$module/}}
-           \settowidth{\figwidth}{\fbox{\includegraphics{$figure.eps}}} 
+           \settowidth{\figwidth}{\fbox{\scalebox{0.8}{\includegraphics{$figure.eps}}}} 
            \mbox{}\\ \parbox[b]{\linewidth - \figwidth - 0.5 cm}{</tex>
    </render>
 </definetag>
@@ -3853,7 +3962,7 @@
    <render>
       <web></td></tr></table><br /><br /></web>
       <tex>} \hfill     
-           \fbox{\includegraphics{$figure.eps}}
+           \fbox{\scalebox{0.8}{\includegraphics{$figure.eps}}}
            } \vskip 1 mm \noindent </tex>
    </render>
 </definetag>
@@ -3866,7 +3975,7 @@
       <tex>\noindent
            \parbox[t]{\linewidth}{
            \graphicspath{{/home/httpd/html/res/physnet/physnet/$module/}}        
-           \settowidth{\figwidth}{\fbox{\includegraphics{$figure.eps}}} 
+           \settowidth{\figwidth}{\fbox{\scalebox{0.8}{\includegraphics{$figure.eps}}}} 
            \mbox{}\\ \parbox[b]{\linewidth - \figwidth - 0.5 cm}{</tex>
    </render>
 </definetag>
@@ -3876,7 +3985,7 @@
    <meta></meta>
    <render>
       <web></td></tr></table><br /><br /></web>
-      <tex>} \hfill \fbox{\includegraphics{$figure.eps}}
+      <tex>} \hfill \fbox{\scalebox{0.8}{\includegraphics{$figure.eps}}}
            } \vskip 1 mm \noindent </tex>
    </render>
 </definetag>
@@ -3993,7 +4102,7 @@
 <definetag name = "/element">
    <meta></meta>
    <render>
-      <web></td></tr></web>
+      <web></tr></web>
       <tex></tex>
    </render>
 </definetag>
@@ -4011,12 +4120,29 @@
 <definetag name = "/elementvalue">
    <meta></meta>
    <render>
-      <web></td><td></web>
+      <web></td></web>
       <tex>]</tex>
    </render>
 </definetag>
 
 
+<definetag name = "elementcontent">
+   <meta></meta>
+   <render>
+      <web><td></web>
+      <tex></tex>
+   </render>
+</definetag>
+
+
+<definetag name = "/elementcontent">
+   <meta></meta>
+   <render>
+      <web></td></web>
+      <tex></tex>
+   </render>
+</definetag>
+
 
 <definetag name = "fbox">
    <meta></meta>
@@ -4153,7 +4279,7 @@
    <meta></meta>
    <render>
       <web></web>
-      <tex>\clearpage </tex>
+      <tex></tex>
    </render>
 </definetag>
 
@@ -4718,7 +4844,7 @@
    <meta><output><url></meta>
    <render>
       <web></web>
-      <tex></tex>
+      <tex>\keephidden{</tex>
    </render>
 </definetag>
 
@@ -4727,7 +4853,7 @@
    <meta></url></output></meta>
    <render>
       <web></web>
-      <tex></tex>
+      <tex>}</tex>
    </render>
 </definetag>
 
@@ -5019,8 +5145,8 @@
       <tex>\vskip 1 mm \noindent
            \noindent
            \graphicspath{{/home/httpd/html/res/physnet/physnet/$module/}}
-           \fbox{\includegraphics{$figure.eps}}
-           \settowidth{\figwidth}{\fbox{\includegraphics{$figure.eps}}}\\ 
+           \fbox{\scalebox{0.8}{\includegraphics{$figure.eps}}}
+           \settowidth{\figwidth}{\fbox{\scalebox{0.8}{\includegraphics{$figure.eps}}}}\\ 
            \noindent </tex>
    </render>
 </definetag>
@@ -5207,21 +5333,28 @@
 <definetag name = "ComputerProjectExam">  
    <meta></meta>
    <render>
-      <web><br /><br /><table border="1"><tr><td>
-          <b>Examinee</b>:<br /><br />
-          On your computer output sheet(s):
-          <ol>
-          <li type="i"> Mark page numbers in the upper right 
-                        corners of all sheets.
-          </li><li type="i"> Label all output, including all axes 
-                             on all graphs.
-          </li></ol>
+      <web><br /><br />
+           <table border="1">
+              <tr>
+                 <td>
+                    <b>Examinee</b>:<br /><br />
+                    On your computer output sheet(s):
+                    <ol>
+                     <li type="i"> 
+                          Mark page numbers in the upper right 
+                          corners of all sheets.
+                     </li>
+                     <li type="i"> 
+                          Label all output, including all axes 
+                          on all graphs.
+                     </li>
+                    </ol>
           On your Exam Answer Sheet(s), for each of the following parts of 
           items (below this box), show:
           <ol>
           <li type="i"> a reference to your annotated output; and
           </li><li type="i"> a blank area for grader comments.
-          </li><ol>
+          </li></ol>
           When finished, staple together your sheets as usual, 
           but include the original of your annotated output sheets 
           just behind the Exam Answer Sheet.
@@ -6146,7 +6279,7 @@
    <meta></meta>
    <render>
       <web><br /><br /><table border="1"><tr><td></web>
-      <tex>\begin{center}\fbox{\parbox[t]{4.0in}{</tex>
+      <tex>\begin{center}\fbox{\parbox[t]{3.5in}{</tex>
    </render>
 </definetag>
 
@@ -6483,7 +6616,7 @@
 <definetag name = "/maintitle">
    <meta></meta>
    <render>
-      <web></i><br /></web>
+      <web></i></font><br /></web>
       <tex>}</tex>
    </render>
 </definetag>
@@ -6492,7 +6625,7 @@
 <definetag name = "mainauthor">
    <meta></meta>
    <render>
-      <web><i></web>
+      <web><font text="gray"><i></web>
       <tex>\keephidden{</tex>
    </render>
 </definetag>
@@ -6501,7 +6634,7 @@
 <definetag name = "/mainauthor">
    <meta></meta>
    <render>
-      <web></i><br /><br /></font></web>
+      <web></i></font><br /><br /></web>
       <tex>}</tex>
    </render>
 </definetag>
@@ -6528,7 +6661,7 @@
 <definetag name = "AsSectTitle" parms = "number">
    <meta></meta>
    <render>
-      <web><h1> Section <a name="Unit.$number"> $number. <a> <font color="#009900"></web>
+      <web><h1> Section <a name="Unit.$number"> $number. </a> <font color="#009900"></web>
       <tex>\vskip 2 mm\noindent{\large \MakeUppercase{\textbf{$number. </tex>
    </render>
 </definetag>
@@ -6831,11 +6964,29 @@
 </definetag>
 
 
+<definetag name = "tablecontent">
+   <meta></meta>
+   <render>
+      <web><table></web>
+      <tex>\begin{tabular}{l}</tex>
+   </render>
+</definetag>
+
+
+<definetag name = "/tablecontent">
+   <meta></meta>
+   <render>
+      <web></table></web>
+      <tex>\end{tabular}</tex> 
+   </render>
+</definetag>
+
+
 <definetag name = "tcsc">
    <meta></meta>
    <render>
-      <web></web>
-      <tex>\tcsc</tex>
+      <web><tr></web>
+      <tex></tex>
    </render>
 </definetag>
 
@@ -6843,8 +6994,8 @@
 <definetag name = "/tcsc">
    <meta></meta>
    <render>
-      <web></web>
-      <tex></tex> 
+      <web></tr></web>
+      <tex>\\</tex> 
    </render>
 </definetag>
 
@@ -6852,7 +7003,7 @@
 <definetag name = "tcsccontent">
    <meta></meta>
    <render>
-      <web><tr><td></web>
+      <web><td></web>
       <tex>{</tex>
    </render>
 </definetag>
@@ -6870,8 +7021,8 @@
 <definetag name = "tcpc">
    <meta></meta>
    <render>
-      <web></web>
-      <tex></tex>
+      <web><tr></web>
+      <tex>\hskip 5 mm </tex>
    </render>
 </definetag>
 
@@ -6879,8 +7030,8 @@
 <definetag name = "/tcpc">
    <meta></meta>
    <render>
-      <web></web>
-      <tex></tex> 
+      <web></tr></web>
+      <tex>\\</tex> 
    </render>
 </definetag>
 
@@ -6888,7 +7039,7 @@
 <definetag name = "tcpccontent">
    <meta></meta>
    <render>
-      <web><tr><td>&#160;&#160;&#160; </web>
+      <web><td>&#160;&#160;&#160; </web>
       <tex></tex>
    </render>
 </definetag>
@@ -6907,7 +7058,7 @@
    <meta></meta>
    <render>
       <web><td><hideweboutput></web>
-      <tex>{</tex>
+      <tex>\keephidden{</tex>
    </render>
 </definetag>
 
@@ -6915,7 +7066,7 @@
 <definetag name = "/tcscpage">
    <meta></meta>
    <render>
-      <web></hideweboutput></td></tr></web>
+      <web></hideweboutput></td></web>
       <tex>}</tex> 
    </render>
 </definetag>
@@ -6925,7 +7076,7 @@
    <meta></meta>
    <render>
       <web><td><hideweboutput></web>
-      <tex></tex>
+      <tex>\keephidden{</tex>
    </render>
 </definetag>
 
@@ -6933,8 +7084,8 @@
 <definetag name = "/tcpcpage">
    <meta></meta>
    <render>
-      <web></hideweboutput></td></tr></web>
-      <tex></tex> 
+      <web></hideweboutput></td></web>
+      <tex>}</tex> 
    </render>
 </definetag>
 
@@ -7183,7 +7334,7 @@
    <meta></meta>
    <render>
       <web><table align=center border=1><tr><td><table align=left border=1><tr><td><a name="supl.$number">S-$number</a></td></tr></table></web>
-      <tex>\noindent\fbox{\begin{minipage}[t]{4.3in}\fbox{S-$number}</tex>
+      <tex>\noindent\fbox{\begin{minipage}[t]{\minipagewidth}\fbox{S-$number}</tex>
   </render>
 </definetag>
 
@@ -7549,10 +7700,10 @@
 <definetag name = "CposTableEpsFigure" parms="module,figure">
    <meta><output><picture>$figure</picture></output></meta>
    <render>
-      <web><p><center><img src="$figure.gif" align=center border=1></web>
-      <tex>\parbox[t]{\linewidth-2cm}{\begin{center}
+      <web><p><img src="$figure.gif" align=center border=1></web>
+      <tex>\parbox[t]{\linewidth-2cm}{
            \graphicspath{{/home/httpd/html/res/physnet/physnet/$module/}}
-           \includegraphics{$figure}\end{center}}
+           \includegraphics{$figure}}
            \newline</tex>
   </render>
 </definetag>
@@ -7561,7 +7712,7 @@
 <definetag name = "/CposTableEpsFigure">
    <meta></meta>
    <render>
-      <web></img></center></p></web>
+      <web></img></p></web>
       <tex></tex>
   </render>
 </definetag>