--- loncom/xml/physnet.sty 2003/05/30 15:04:20 1.22 +++ loncom/xml/physnet.sty 2003/05/30 20:16:22 1.24 @@ -673,7 +673,7 @@ </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} @@ -1830,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> @@ -3219,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> @@ -3271,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> @@ -3421,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> @@ -3437,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> @@ -3680,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 @@ -3690,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> @@ -3698,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> @@ -6564,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> @@ -7603,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> @@ -7615,7 +7705,7 @@ <definetag name = "/CposTableEpsFigure"> <meta></meta> <render> - <web></img></center></p></web> + <web></img></p></web> <tex></tex> </render> </definetag>