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

[foxr]

foxr		Thu Mar 23 17:34:53 2006 EDT

  Modified files:              
    /loncom/xml	londefdef.pm 
  Log:
  Defect 4701 - use \flushleft \flushright for paragraph
  positioning since that appears to interact with wrapfig much
  better than generating boxes or parboxes.
  
  
Index: loncom/xml/londefdef.pm
diff -u loncom/xml/londefdef.pm:1.322 loncom/xml/londefdef.pm:1.323
--- loncom/xml/londefdef.pm:1.322	Wed Mar 22 14:37:44 2006
+++ loncom/xml/londefdef.pm	Thu Mar 23 17:34:53 2006
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Tags Default Definition Module 
 #
-# $Id: londefdef.pm,v 1.322 2006/03/22 19:37:44 albertel Exp $
+# $Id: londefdef.pm,v 1.323 2006/03/23 22:34:53 foxr Exp $
 # 
 #
 # Copyright Michigan State University Board of Trustees
@@ -1204,11 +1204,13 @@
 		$currentstring = &center_correction().$currentstring;
 	    }
 	} elsif ($align eq 'right') {
-	    $currentstring.='\makebox['.$env{'form.textwidth'}.']{\hfill\llap{';
-	    $closing_string= '}}';
+	    $currentstring.="\n".'{\flushright ';
+#	    $currentstring.='\makebox['.$env{'form.textwidth'}.']{\hfill\llap{';
+	    $closing_string= "}\n";
 	} elsif ($align eq 'left') {
-	    $currentstring.='\noindent\makebox['.$env{'form.textwidth'}.']{\rlap{';
-	    $closing_string = '}\hfill}';
+	    $currentstring.= "\n".'{\flushleft ';
+#	    $currentstring.='\noindent\makebox['.$env{'form.textwidth'}.']{{';
+	    $closing_string = "}\n";
 	} else {
             $currentstring.='\par ';
 	    if (&is_inside_of($tagstack, 'table')) {
@@ -2824,6 +2826,7 @@
 	if (($latex_rendering eq 'texwrap') && &is_inside_of($tagstack, "table")) {
 	    $latex_rendering = 'parpic';
 	}
+
 	# &Apache::lonxml::debug("LaTeX rendering = $latex_rendering image file: $src");
 
 	#if original gif/jpg/png file exist do following: