--- loncom/xml/londefdef.pm	2006/12/05 02:55:54	1.345
+++ loncom/xml/londefdef.pm	2006/12/18 11:17:46	1.347
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Tags Default Definition Module 
 #
-# $Id: londefdef.pm,v 1.345 2006/12/05 02:55:54 albertel Exp $
+# $Id: londefdef.pm,v 1.347 2006/12/18 11:17:46 foxr Exp $
 # 
 #
 # Copyright Michigan State University Board of Trustees
@@ -2887,6 +2887,9 @@ sub start_img {
 	    } elsif ($align eq "left")   { 
 		if ($latex_rendering eq "parpic") { 
 		    $currentstring = '\parpic[l]{'.$currentstring.'}';
+		} elsif ($latex_rendering eq "parbox") {
+		    $currentstring = '\begin{minipage}[l]{'.$width_param.'mm}'
+			.$currentstring.'\end{minipage}';
 		} else {    	                                 # wrapfig render
 		    $currentstring = '\begin{wrapfigure}{l}{'.$width_param.'mm}'
 			.'\scalebox{1.0}{'.$currentstring.'}\end{wrapfigure}';
@@ -2894,6 +2897,9 @@ sub start_img {
 	    } elsif ($align eq "right")  {   
 		if ($latex_rendering eq "parpic") {
 		    $currentstring = '\parpic[r]{'.$currentstring.'}';
+		} elsif ($latex_rendering eq "parbox") {
+		    $currentstring =  '\begin{minipage}[r]{'.$width_param.'mm}'
+			.$currentstring.'\end{minipage}';
 		} else {	                                 # wrapfig rendering
 		    $currentstring = '\begin{wrapfigure}{r}{'.$width_param.'mm}'
 			.'\scalebox{1.0}{'.$currentstring.'}\end{wrapfigure}';
@@ -2929,7 +2935,7 @@ sub start_img {
 	$currentstring .=&Apache::edit::select_arg('Alignment:','align',
 						   ['','bottom','middle','top','left','right'],$token,5);
 	$currentstring .=&Apache::edit::select_arg('TeXwrap:', 'TeXwrap',
-						   ['', 'parbox', 'parpic'], $token, 2);
+						   ['', 'parbox', 'parpic', 'wrapfigure'], $token, 2);
 	$currentstring .=&Apache::edit::select_arg('Encrypt URL:','encrypturl',
 						   ['no','yes'], $token, 2);
 	$currentstring .=&Apache::edit::end_row().&Apache::edit::start_spanning_row();