[LON-CAPA-cvs] cvs: loncom /xml londefdef.pm

[albertel]

albertel		Tue Dec 19 17:30:52 2006 EDT

  Modified files:              
    /loncom/xml	londefdef.pm 
  Log:
  - bug 5096 - add ability to specify no figure wrapping att all (default to wrapfigure though)
  
  
Index: loncom/xml/londefdef.pm
diff -u loncom/xml/londefdef.pm:1.347 loncom/xml/londefdef.pm:1.348
--- loncom/xml/londefdef.pm:1.347	Mon Dec 18 06:17:46 2006
+++ loncom/xml/londefdef.pm	Tue Dec 19 17:30:52 2006
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Tags Default Definition Module 
 #
-# $Id: londefdef.pm,v 1.347 2006/12/18 11:17:46 foxr Exp $
+# $Id: londefdef.pm,v 1.348 2006/12/19 22:30:52 albertel Exp $
 # 
 #
 # Copyright Michigan State University Board of Trustees
@@ -2890,8 +2890,10 @@
 		} 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}'
+		} elsif ($latex_rendering eq "wrapfigure"
+			 || $latexrendering ne 'none') {  # wrapfig render
+		    $currentstring = 
+			'\begin{wrapfigure}{l}{'.$width_param.'mm}'
 			.'\scalebox{1.0}{'.$currentstring.'}\end{wrapfigure}';
 		}
 	    } elsif ($align eq "right")  {   
@@ -2900,10 +2902,11 @@
 		} 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}'
+		} elsif ($latex_rendering eq "wrapfigure"
+			 || $latexrendering ne 'none') {  # wrapfig render
+		    $currentstring = 
+			'\begin{wrapfigure}{r}{'.$width_param.'mm}'
 			.'\scalebox{1.0}{'.$currentstring.'}\end{wrapfigure}';
-
 		}
 	    } else {		# Bottom is also default.
 		# $currentstring = '\raisebox{'.$height_param.'mm}{'.$currentstring.'}';
@@ -2935,7 +2938,7 @@
 	$currentstring .=&Apache::edit::select_arg('Alignment:','align',
 						   ['','bottom','middle','top','left','right'],$token,5);
 	$currentstring .=&Apache::edit::select_arg('TeXwrap:', 'TeXwrap',
-						   ['', 'parbox', 'parpic', 'wrapfigure'], $token, 2);
+						   ['', 'none','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();