--- loncom/xml/physnet.sty	2003/05/29 14:19:52	1.18
+++ loncom/xml/physnet.sty	2003/05/30 18:04:27	1.23
@@ -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>
 
@@ -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,13 +673,13 @@
 <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} 
               SECT.\\
               \fbox{\Huge\textbf{$number}}\\
-        \end{tabular}{\textbf{\MakeUppercase{</tex>
+        \end{tabular}\scalebox{0.9}{{\textbf{\MakeUppercase{</tex>
   </render>
 </definetag>
 
@@ -669,7 +688,7 @@
    <meta></title></output></meta>
   <render>
       <web></font></h1></web>
-      <tex>}}}\newline </tex>
+      <tex>}}}}\newline </tex>
   </render>
 </definetag>
 
@@ -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.9}{\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.87}{\includegraphics{$figure.eps}}}
+           \settowidth{\figwidth}{\scalebox{0.87}{\fbox{\includegraphics{$figure.eps}}}}\\ 
            \parbox[b]{\figwidth}{\noindent </tex>
    </render>
 </definetag>
@@ -3402,7 +3421,7 @@
    <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}
@@ -3410,7 +3429,7 @@
            \fbox{\includegraphics{$figure1.eps}}
            \settowidth{\figwidth}{\fbox{\includegraphics{$figure1.eps}}} 
            \fbox{\includegraphics{$figure2.eps}}\\
-           \parbox[t]{\figwidth}{</tex>
+           \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>
 
@@ -3993,7 +4048,7 @@
 <definetag name = "/element">
    <meta></meta>
    <render>
-      <web></td></tr></web>
+      <web></tr></web>
       <tex></tex>
    </render>
 </definetag>
@@ -4011,12 +4066,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 +4225,7 @@
    <meta></meta>
    <render>
       <web></web>
-      <tex>\clearpage </tex>
+      <tex></tex>
    </render>
 </definetag>
 
@@ -6483,7 +6555,7 @@
 <definetag name = "/maintitle">
    <meta></meta>
    <render>
-      <web></i><br /></web>
+      <web></i></font><br /></web>
       <tex>}</tex>
    </render>
 </definetag>
@@ -6492,7 +6564,7 @@
 <definetag name = "mainauthor">
    <meta></meta>
    <render>
-      <web><i></web>
+      <web><font text="gray"><i></web>
       <tex>\keephidden{</tex>
    </render>
 </definetag>
@@ -6501,7 +6573,7 @@
 <definetag name = "/mainauthor">
    <meta></meta>
    <render>
-      <web></i><br /><br /></font></web>
+      <web></i></font><br /><br /></web>
       <tex>}</tex>
    </render>
 </definetag>
@@ -6831,11 +6903,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 +6933,8 @@
 <definetag name = "/tcsc">
    <meta></meta>
    <render>
-      <web></web>
-      <tex></tex> 
+      <web></tr></web>
+      <tex>\\</tex> 
    </render>
 </definetag>
 
@@ -6852,7 +6942,7 @@
 <definetag name = "tcsccontent">
    <meta></meta>
    <render>
-      <web><tr><td></web>
+      <web><td></web>
       <tex>{</tex>
    </render>
 </definetag>
@@ -6870,8 +6960,8 @@
 <definetag name = "tcpc">
    <meta></meta>
    <render>
-      <web></web>
-      <tex></tex>
+      <web><tr></web>
+      <tex>\hskip 5 mm </tex>
    </render>
 </definetag>
 
@@ -6879,8 +6969,8 @@
 <definetag name = "/tcpc">
    <meta></meta>
    <render>
-      <web></web>
-      <tex></tex> 
+      <web></tr></web>
+      <tex>\\</tex> 
    </render>
 </definetag>
 
@@ -6888,7 +6978,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 +6997,7 @@
    <meta></meta>
    <render>
       <web><td><hideweboutput></web>
-      <tex>{</tex>
+      <tex>\keephidden{</tex>
    </render>
 </definetag>
 
@@ -6915,7 +7005,7 @@
 <definetag name = "/tcscpage">
    <meta></meta>
    <render>
-      <web></hideweboutput></td></tr></web>
+      <web></hideweboutput></td></web>
       <tex>}</tex> 
    </render>
 </definetag>
@@ -6925,7 +7015,7 @@
    <meta></meta>
    <render>
       <web><td><hideweboutput></web>
-      <tex></tex>
+      <tex>\keephidden{</tex>
    </render>
 </definetag>
 
@@ -6933,8 +7023,8 @@
 <definetag name = "/tcpcpage">
    <meta></meta>
    <render>
-      <web></hideweboutput></td></tr></web>
-      <tex></tex> 
+      <web></hideweboutput></td></web>
+      <tex>}</tex> 
    </render>
 </definetag>
 
@@ -7183,7 +7273,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>