--- loncom/xml/physnet.sty	2003/05/27 14:41:18	1.16
+++ loncom/xml/physnet.sty	2003/05/30 18:04:27	1.23
@@ -38,7 +38,7 @@
           <m>\renewcommand{\bincoeff}[2]{\begin{array}{c}\left(\begin{array}{c}#1\\#2\end{array}\right)\end{array}}</m>
       </web>
       <tex>
-           \documentclass[letterpaper,twoside]{article}
+           \documentclass{article}
            \usepackage{fancyhdr}
            \usepackage[dvips]{graphicx}
            \usepackage{latexsym}
@@ -46,14 +46,6 @@
            \usepackage{ifthen}
            \usepackage{calc}
            \usepackage{listings}
-           \setlength{\oddsidemargin}{-40pt}
-           \setlength{\evensidemargin}{-60pt}
-           \setlength{\topmargin}{200pt}
-           \setlength{\textwidth}{4.4in}
-           \setlength{\textheight}{6.8in}
-           \setlength{\parindent}{20pt}
-           \setlength{\marginparwidth}{90pt}
-           \setlength{\textfloatsep}{8pt plus 2.0pt minus 4.0pt}
            \setcounter{topnumber}{1} 
            \clubpenalty 10000
            \pagestyle{fancy}
@@ -101,7 +93,7 @@
            \newcommand{\keephidden}[1]{}
            \newcommand{\bincoeff}[2]{\begin{array}{c}\left(\begin{array}{c}#1\\#2\end{array}\right)\end{array}}
            \makeatletter
-	   \newcommand{\startsection}[6]{\@startsection{#1}{#2}{0pt}{#3}{#4}{#5}*{#6}{}}
+	   \newcommand{\startsection}[6]{\vskip 1 mm \@startsection{#1}{#2}{0pt}{#3}{#4}{#5}*{#6}{}}
 	   \newcommand{\pcap}[3]{\startsection{pcap}{4}{0pt}{0pt}{\bf }{#1#2. #3.\hspace*{1pc}\write\tcfile{\protect\tcpc{#2. #3}{\the\value{relpage}}}}}
 	   \newcommand{\spcap}[2]{\mathversion{bold}\startsection{scap}{3}{12pt}{1pt}{\large\bf }{\hspace*{\fill}\ifthenelse{\equal{#1}{}}{\uppercase{#2}\write\tcfile{\protect\tcsc{\uppercase{#2}}{\the\value{relpage}}}}{#1. \uppercase{#2}\write\tcfile{\protect\tcsc{\uppercase{#1. #2}}{\the\value{relpage}}}}\hspace*{\fill}}\mathversion{normal}}
            \newcommand{\scap}[2]{\mathversion{bold}\startsection{scap}{3}{12pt}{1pt}{\large\bf }{\hspace*{\fill}\ifthenelse{\equal{#1}{}}{\uppercase{#2}\write\tcfile{\protect\tcsc{\uppercase{#2}}{}}}{#1. \uppercase{#2}\write\tcfile{\protect\tcsc{\uppercase{#1. #2}}{}}}\hspace*{\fill}}\mathversion{normal}}
@@ -153,7 +145,8 @@
    <meta></meta>
    <render>
       <web></web>
-      <tex>\setcounter{bookpage}{\value{page}} 
+      <tex>\setcounter{bookpage}{\value{page}}
+           \setlength{\headwidth}{\textwidth} 
          \lhead{\textit{ID Sheet: MISN-0-$module}}
          \begin{IdItems}</tex>
   </render>
@@ -164,7 +157,26 @@
    <meta></meta>
    <render>
       <web></web>
-      <tex>\end{IdItems}\newpage </tex>
+      <tex>\end{IdItems} </tex>
+  </render>
+</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>
 
@@ -173,7 +185,7 @@
    <meta><output><moduletitle></meta>
    <render>
       <web>Title: <b></web>
-      <tex>\noindent Title: \textbf{\uppercase{</tex>
+      <tex>\noindent Title: \textbf{</tex>
   </render>
 </definetag>
 
@@ -182,7 +194,7 @@
    <meta></moduletitle></output></meta>
    <render>
       <web></b><br /><br /></web>
-      <tex>}}</tex>
+      <tex>}</tex>
   </render>
 </definetag>
 
@@ -640,10 +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>
 
@@ -660,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>
 
@@ -675,7 +688,7 @@
    <meta></title></output></meta>
   <render>
       <web></font></h1></web>
-      <tex>}}}\newline </tex>
+      <tex>}}}}\newline </tex>
   </render>
 </definetag>
 
@@ -778,7 +791,8 @@
 <definetag name = "TuSuppl" parms="module,letter">
    <meta><output><tutorial>$letter</tutorial></output><render>
       <web><center><h1>TUTORIAL FOR $letter</h1></center></web>
-      <tex>\setcounter{bookpage}{\value{page}} 
+      <tex>\setcounter{bookpage}{\value{page}}
+           \setlength{\headwidth}{\textwidth} 
            \lhead{\textit{MISN-0-$module}}     
            \rhead{$letter-tu-\doort}
            \chead{Tutorial Supplement}</tex>
@@ -853,7 +867,7 @@
    <meta></meta>
    <render>
       <web><br /><br /></web>
-      <tex>\\</tex>
+      <tex>\vskip 0 mm \noindent </tex>
    </render>
 </definetag>
 
@@ -944,6 +958,7 @@
    <render>
       <web><center><h1>PRACTICE PROBLEMS</h1></center></web>
       <tex>\newpage\setcounter{bookpage}{\value{page}} 
+           \setlength{\headwidth}{\textwidth}  
            \lhead{\textit{MISN-0-$module}}
            \rhead{pp-\doort}
            \chead{Additional Problems Supplement}
@@ -1002,6 +1017,7 @@
    <render>
       <web><center><h1>SUGGESTIONS</h1></center></web>
       <tex>\newpage\setcounter{bookpage}{\value{page}} 
+           \setlength{\headwidth}{\textwidth} 
            \lhead{\textit{MISN-0-$module}}
            \rhead{su-\doort}
            \chead{Suggestions Supplement}
@@ -1042,6 +1058,7 @@
    <render>
       <web><center><h1> ANSWERS TO PROBLEMS </h1></center></web>
       <tex>\newpage\setcounter{bookpage}{\value{page}} 
+            \setlength{\headwidth}{\textwidth} 
            \lhead{\textit{MISN-0-$module}}
            \rhead{an-\doort}
            \chead{Answerss Supplement}
@@ -1064,6 +1081,7 @@
    <render>
       <web><center><h1> MODEL EXAM </h1></center></web>
       <tex>\newpage\setcounter{bookpage}{\value{page}} 
+            \setlength{\headwidth}{\textwidth} 
            \lhead{\textit{MISN-0-$module}}
            \rhead{ME-\doort}
            \chead{Model Exam}
@@ -1691,6 +1709,7 @@
    <render>
       <web></web>
       <tex>\setcounter{bookpage}{\value{page}} 
+           \setlength{\headwidth}{\textwidth} 
            \lhead{\textit{MISN-0-$module}}     
            \rhead{$number-tu-\doort}
            \chead{Tutorial Supplement}</tex>
@@ -1711,7 +1730,8 @@
    <meta></meta>
    <render>
       <web><center><h1> PRACTICE PROBLEMS </web>
-      <tex>\setcounter{bookpage}{\value{page}} 
+      <tex>\setcounter{bookpage}{\value{page}}
+           \setlength{\headwidth}{\textwidth} 
            \lhead{\textit{MISN-0-$module}}
            \rhead{pp-\doort}
            \chead{Additional Problems Supplement}
@@ -1810,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>
@@ -1830,6 +1850,7 @@
    <render>
       <web><center><h1> SUGGESTIONS </web>
       <tex>\setcounter{bookpage}{\value{page}} 
+           \setlength{\headwidth}{\textwidth} 
            \lhead{\textit{MISN-0-$module}}
            \rhead{su-\doort}
            \chead{Suggestions Supplement}
@@ -1981,7 +2002,8 @@
    <meta></meta>
    <render>
       <web><center><h1> ANSWERS TO PROBLEMS </h1></center></web>
-      <tex>\setcounter{bookpage}{\value{page}} 
+      <tex>\setcounter{bookpage}{\value{page}}
+           \setlength{\headwidth}{\textwidth} 
            \lhead{\textit{MISN-0-$module}}
            \rhead{an-\doort}
            \chead{Answerss Supplement}
@@ -2022,6 +2044,7 @@
    <render>
       <web><center> <h1> MODEL EXAM </h1> </center></web>
       <tex>\newpage\setcounter{bookpage}{\value{page}} 
+           \setlength{\headwidth}{\textwidth} 
            \lhead{\textit{MISN-0-$module}}
            \rhead{ME-\doort}
            \chead{Model Exam}
@@ -2240,6 +2263,7 @@
    <render>
       <web></web>
       <tex>\setcounter{bookpage}{\value{page}} 
+           \setlength{\headwidth}{\textwidth} 
            \lhead{\textit{MISN-0-$module}}
            \rhead{\doort} 
            \newwrite\tcfile
@@ -2297,7 +2321,7 @@
    <meta></meta>
    <render>
       <web><br /><br /><i><font color="#CC6633"></web>
-      <tex>{\hspace*{-\the\parindent}\noindent           
+      <tex>{\vskip 0 mm \hspace*{-\the\parindent}\noindent           
            \begin{picture}(4,4)
            \thicklines
            \put(3,3){\vector(1,0){0}}
@@ -3195,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>
@@ -3224,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>
@@ -3352,6 +3376,7 @@
    <render>
       <web><center><h1> <font color="#009900"> PROBLEM SUPPLEMENT </web>
       <tex>\newpage\setcounter{bookpage}{\value{page}} 
+           \setlength{\headwidth}{\textwidth} 
            \lhead{\textit{MISN-0-$module}}
            \rhead{PS-\doort}
            \chead{Problems Supplement}
@@ -3374,6 +3399,7 @@
    <render>
       <web><center><h1> <font color="#009900"> SPECIAL ASSISTANCE SUPPLEMENT </font></h1></web>
       <tex>\newpage\setcounter{bookpage}{\value{page}} 
+           \setlength{\headwidth}{\textwidth} 
            \lhead{\textit{MISN-0-$module}}
            \rhead{AS-\doort}
            \chead{Special Assistance Supplement}
@@ -3395,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}
@@ -3403,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>
 
@@ -3411,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>
 
@@ -3659,11 +3721,11 @@
            \begin{minipage}[b]{\linewidth}
            \noindent
            \graphicspath{{/home/httpd/html/res/physnet/physnet/$module/}}
-           \fbox{\includegraphics{$figure1.eps}}
+           \fbox{\scalebox{0.9}{\includegraphics{$figure1.eps}}}
            \settowidth{\figwidth}{\fbox{\includegraphics{$figure1.eps}}} 
-           \fbox{\includegraphics{$figure2.eps}}
+           \fbox{\scalebox{0.9}{\includegraphics{$figure2.eps}}}
            \settowidth{\numberwidth}{\fbox{\includegraphics{$figure2.eps}}} 
-           \fbox{\includegraphics{$figure3.eps}}\\
+           \fbox{\scalebox{0.9}{\includegraphics{$figure3.eps}}}\\
            \parbox[b]{\figwidth}{</tex>
    </render>
 </definetag>
@@ -3738,6 +3800,7 @@
    <render>
       <web><center><h1>LOCAL GUIDE</h1></center></web>
       <tex>\setcounter{bookpage}{\value{page}} 
+           \setlength{\headwidth}{\textwidth} 
            \lhead{\textit{MISN-0-$module}}
            \rhead{LG-\doort}
            \chead{Local Guide}
@@ -3985,7 +4048,7 @@
 <definetag name = "/element">
    <meta></meta>
    <render>
-      <web></td></tr></web>
+      <web></tr></web>
       <tex></tex>
    </render>
 </definetag>
@@ -4003,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>
@@ -4145,7 +4225,7 @@
    <meta></meta>
    <render>
       <web></web>
-      <tex>\clearpage </tex>
+      <tex></tex>
    </render>
 </definetag>
 
@@ -6466,7 +6546,7 @@
 <definetag name = "maintitle">
    <meta></meta>
    <render>
-      <web></center><font text="gray"><i></web>
+      <web><font text="gray"><i></web>
       <tex>\keephidden{</tex>
    </render>
 </definetag>
@@ -6475,7 +6555,7 @@
 <definetag name = "/maintitle">
    <meta></meta>
    <render>
-      <web></i><br /></web>
+      <web></i></font><br /></web>
       <tex>}</tex>
    </render>
 </definetag>
@@ -6484,7 +6564,7 @@
 <definetag name = "mainauthor">
    <meta></meta>
    <render>
-      <web><i></web>
+      <web><font text="gray"><i></web>
       <tex>\keephidden{</tex>
    </render>
 </definetag>
@@ -6493,7 +6573,7 @@
 <definetag name = "/mainauthor">
    <meta></meta>
    <render>
-      <web></i><br /><br /></font><center></web>
+      <web></i></font><br /><br /></web>
       <tex>}</tex>
    </render>
 </definetag>
@@ -6823,10 +6903,28 @@
 </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>
+      <web><tr></web>
       <tex></tex>
    </render>
 </definetag>
@@ -6835,8 +6933,8 @@
 <definetag name = "/tcsc">
    <meta></meta>
    <render>
-      <web></web>
-      <tex></tex> 
+      <web></tr></web>
+      <tex>\\</tex> 
    </render>
 </definetag>
 
@@ -6844,8 +6942,8 @@
 <definetag name = "tcsccontent">
    <meta></meta>
    <render>
-      <web><tr><td></web>
-      <tex></tex>
+      <web><td></web>
+      <tex>{</tex>
    </render>
 </definetag>
 
@@ -6854,7 +6952,7 @@
    <meta></meta>
    <render>
       <web></td></web>
-      <tex></tex> 
+      <tex>}</tex> 
    </render>
 </definetag>
 
@@ -6862,8 +6960,8 @@
 <definetag name = "tcpc">
    <meta></meta>
    <render>
-      <web></web>
-      <tex></tex>
+      <web><tr></web>
+      <tex>\hskip 5 mm </tex>
    </render>
 </definetag>
 
@@ -6871,8 +6969,8 @@
 <definetag name = "/tcpc">
    <meta></meta>
    <render>
-      <web></web>
-      <tex></tex> 
+      <web></tr></web>
+      <tex>\\</tex> 
    </render>
 </definetag>
 
@@ -6880,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>
@@ -6899,7 +6997,7 @@
    <meta></meta>
    <render>
       <web><td><hideweboutput></web>
-      <tex></tex>
+      <tex>\keephidden{</tex>
    </render>
 </definetag>
 
@@ -6907,8 +7005,8 @@
 <definetag name = "/tcscpage">
    <meta></meta>
    <render>
-      <web></hideweboutput></td></tr></web>
-      <tex></tex> 
+      <web></hideweboutput></td></web>
+      <tex>}</tex> 
    </render>
 </definetag>
 
@@ -6917,7 +7015,7 @@
    <meta></meta>
    <render>
       <web><td><hideweboutput></web>
-      <tex></tex>
+      <tex>\keephidden{</tex>
    </render>
 </definetag>
 
@@ -6925,8 +7023,8 @@
 <definetag name = "/tcpcpage">
    <meta></meta>
    <render>
-      <web></hideweboutput></td></tr></web>
-      <tex></tex> 
+      <web></hideweboutput></td></web>
+      <tex>}</tex> 
    </render>
 </definetag>
 
@@ -7009,6 +7107,7 @@
    <render>
       <web><br /><br /><center><h1>SUGGESTIONS FOR READING</h1></center><br /><br /></web>
       <tex>\newpage\setcounter{bookpage}{\value{page}} 
+         \setlength{\headwidth}{\textwidth} 
          \lhead{\textit{MISN-0-$module}}
          \rhead{rd-\doort}
          \chead{Suggestions for Reading}
@@ -7174,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>
 
@@ -7350,6 +7449,7 @@
    <render>
       <web></web>
       <tex>\setcounter{bookpage}{\value{page}} 
+           \setlength{\headwidth}{\textwidth} 
           \lhead{\textit{MISN-0-$module}}
           \rhead{\doort}</tex>  
   </render>
@@ -7453,8 +7553,8 @@
 <definetag name = "/SubSubSect">  
    <meta></meta>
    <render>
-      <web></web>
-      <tex></tex>
+      <web><br /><br /></web>
+      <tex>\vskip 0 mm \noindent </tex>
   </render>
 </definetag>