--- loncom/xml/physnet.sty	2003/05/29 15:47:00	1.20
+++ loncom/xml/physnet.sty	2003/05/30 20:16:22	1.24
@@ -166,8 +166,8 @@
    <meta></meta>
    <render>
       <web></web>
-      <tex>\setlength{\headwidth}{\textwidth} 
-           \lhead{\textit{Contents}}\rhead{}\newpage</tex>
+      <tex>\newpage\setlength{\headwidth}{\textwidth} 
+           \lhead{\textit{Contents}}\rhead{}</tex>
   </render>
 </definetag>
 
@@ -185,24 +185,7 @@
    <meta><output><moduletitle></meta>
    <render>
       <web>Title: <b></web>
-      <tex>\noindent Title: \textbf{\uppercase{</tex>
-  </render>
-</definetag>
-
-<definetag name = "/defIdItems">
-   <meta></meta>
-   <render>
-      <web></web>
-      <tex>\end{IdItems} </tex>
-  </render>
-</definetag>
-
-
-<definetag name = "defModTitle">
-   <meta><output><moduletitle></meta>
-   <render>
-      <web>Title: <b></web>
-      <tex>\noindent Title: \scalebox{0.9}{\textbf{\uppercase{</tex>
+      <tex>\noindent Title: \textbf{</tex>
   </render>
 </definetag>
 
@@ -211,7 +194,7 @@
    <meta></moduletitle></output></meta>
    <render>
       <web></b><br /><br /></web>
-      <tex>}}}</tex>
+      <tex>}</tex>
   </render>
 </definetag>
 
@@ -669,12 +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 
-          \newpage</tex>
+          \openout\tcfile=m$module-tc.tex</tex>
   </render>
 </definetag>
 
@@ -691,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} 
@@ -1848,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>
@@ -3237,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>
@@ -3267,7 +3249,7 @@
       <tex>\begin{center} \vskip 1 mm \noindent
            \graphicspath{{/home/httpd/html/res/physnet/physnet/$module/}}
            \fbox{\scalebox{0.87}{\includegraphics{$figure.eps}}}
-           \settowidth{\figwidth}{\fbox{\includegraphics{$figure.eps}}}\\ 
+           \settowidth{\figwidth}{\scalebox{0.87}{\fbox{\includegraphics{$figure.eps}}}}\\ 
            \parbox[b]{\figwidth}{\noindent </tex>
    </render>
 </definetag>
@@ -3289,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>
@@ -3439,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>
 
@@ -3455,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>
 
@@ -3698,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
@@ -3708,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>
 
@@ -3716,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>
 
@@ -4030,7 +4102,7 @@
 <definetag name = "/element">
    <meta></meta>
    <render>
-      <web></td></tr></web>
+      <web></tr></web>
       <tex></tex>
    </render>
 </definetag>
@@ -4048,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>
@@ -4190,7 +4279,7 @@
    <meta></meta>
    <render>
       <web></web>
-      <tex>\clearpage </tex>
+      <tex></tex>
    </render>
 </definetag>
 
@@ -6520,7 +6609,7 @@
 <definetag name = "/maintitle">
    <meta></meta>
    <render>
-      <web></i><br /></web>
+      <web></i></font><br /></web>
       <tex>}</tex>
    </render>
 </definetag>
@@ -6529,7 +6618,7 @@
 <definetag name = "mainauthor">
    <meta></meta>
    <render>
-      <web><i></web>
+      <web><font text="gray"><i></web>
       <tex>\keephidden{</tex>
    </render>
 </definetag>
@@ -6538,7 +6627,7 @@
 <definetag name = "/mainauthor">
    <meta></meta>
    <render>
-      <web></i><br /><br /></font></web>
+      <web></i></font><br /><br /></web>
       <tex>}</tex>
    </render>
 </definetag>
@@ -6565,7 +6654,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>
@@ -6889,7 +6978,7 @@
 <definetag name = "tcsc">
    <meta></meta>
    <render>
-      <web></web>
+      <web><tr></web>
       <tex></tex>
    </render>
 </definetag>
@@ -6898,7 +6987,7 @@
 <definetag name = "/tcsc">
    <meta></meta>
    <render>
-      <web></web>
+      <web></tr></web>
       <tex>\\</tex> 
    </render>
 </definetag>
@@ -6907,7 +6996,7 @@
 <definetag name = "tcsccontent">
    <meta></meta>
    <render>
-      <web><tr><td></web>
+      <web><td></web>
       <tex>{</tex>
    </render>
 </definetag>
@@ -6925,7 +7014,7 @@
 <definetag name = "tcpc">
    <meta></meta>
    <render>
-      <web></web>
+      <web><tr></web>
       <tex>\hskip 5 mm </tex>
    </render>
 </definetag>
@@ -6934,7 +7023,7 @@
 <definetag name = "/tcpc">
    <meta></meta>
    <render>
-      <web></web>
+      <web></tr></web>
       <tex>\\</tex> 
    </render>
 </definetag>
@@ -6943,7 +7032,7 @@
 <definetag name = "tcpccontent">
    <meta></meta>
    <render>
-      <web><tr><td>&#160;&#160;&#160; </web>
+      <web><td>&#160;&#160;&#160; </web>
       <tex></tex>
    </render>
 </definetag>
@@ -6970,7 +7059,7 @@
 <definetag name = "/tcscpage">
    <meta></meta>
    <render>
-      <web></hideweboutput></td></tr></web>
+      <web></hideweboutput></td></web>
       <tex>}</tex> 
    </render>
 </definetag>
@@ -6988,7 +7077,7 @@
 <definetag name = "/tcpcpage">
    <meta></meta>
    <render>
-      <web></hideweboutput></td></tr></web>
+      <web></hideweboutput></td></web>
       <tex>}</tex> 
    </render>
 </definetag>
@@ -7604,10 +7693,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>
@@ -7616,7 +7705,7 @@
 <definetag name = "/CposTableEpsFigure">
    <meta></meta>
    <render>
-      <web></img></center></p></web>
+      <web></img></p></web>
       <tex></tex>
   </render>
 </definetag>