--- loncom/xml/londefdef.pm	2006/09/02 18:49:37	1.335
+++ loncom/xml/londefdef.pm	2007/03/13 13:35:39	1.358
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Tags Default Definition Module 
 #
-# $Id: londefdef.pm,v 1.335 2006/09/02 18:49:37 albertel Exp $
+# $Id: londefdef.pm,v 1.358 2007/03/13 13:35:39 foxr Exp $
 # 
 #
 # Copyright Michigan State University Board of Trustees
@@ -48,6 +48,7 @@ use Apache::lonmenu();
 use Apache::lonmeta();
 use Apache::Constants qw(:common);
 use File::Basename;
+use LONCAPA();
 # use Data::Dumper;
 
 BEGIN {
@@ -561,8 +562,12 @@ sub end_body {
 }
 
 # \begin{center} causes a new paragprah spacing that looks odd inside 
-# of a table cell
-sub center_correction { return '\vspace*{-6 mm}'; }
+# of a table cell.  Same at the end of a \center but with a slightly
+# larger space .. hence center_correction and center_end_correction.
+#
+sub center_correction { return '\vspace*{-6 mm}'; } 
+sub center_end_correction { return '\vspace*{-7 mm}'; }
+
 #-- <center> tag (end tag required)
 sub start_center {
     my ($target,$token,$tagstack) = @_;
@@ -585,6 +590,9 @@ sub end_center {
 	$currentstring = $token->[2];     
     } elsif ($target eq 'tex') {
 	$currentstring = '\end{center}';  
+	if (&is_inside_of($tagstack, "table")) {
+	    $currentstring .= &center_end_correction();
+	}
     }
     return $currentstring;
 }
@@ -1214,23 +1222,15 @@ sub start_br {
 		$signal=1;
 	    }
 	    if (($tempo[$i] eq 'td') || ($tempo[$i] eq 'th')) {
-		my $colspan = 
-		    &Apache::lonxml::get_param('colspan', $parstack,
-					       $safeeval, $i, 0);
-		if ($colspan) {
-		    $signal = 2;
-		} else {
-		    $signal = 1;
-		}
+		$signal = 1;
 	    }
 	}
 	if ($signal eq 1) {
 	    $currentstring .= ' \vskip 0 mm ';
-	} elsif ($signal eq '2') {
-	    # multicol doesn't like blank lines
-	} elsif ($$tagstack[-2] ne 'sub' && $$tagstack[-2] ne 'sup') {
+	} else {
 	    $currentstring .= '\strut \\\\ \strut ';
 	}
+    
     }
     return $currentstring;
 }
@@ -1412,7 +1412,7 @@ sub start_sub {
     if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring .= $token->[4];
     } elsif ($target eq 'tex') {
-	$currentstring .= '\ensuremath{_{';
+	$currentstring .= '\raisebox{-\smallskipamount}{\scriptsize{';
     } 
     return $currentstring;
 }
@@ -1435,7 +1435,7 @@ sub start_sup {
     if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring .= $token->[4];
     } elsif ($target eq 'tex') {
-	$currentstring .= '\ensuremath{^{';
+	$currentstring .= '\raisebox{\smallskipamount}{\scriptsize{';
     } 
     return $currentstring;
 }
@@ -1558,17 +1558,6 @@ sub start_a {
 	my $href=&Apache::lonxml::get_param('href',$parstack,$safeeval,
 					    undef,1);
 	$currentstring=&Apache::lonenc::encrypt_ref($token,{'href'=>$href});
-    } elsif ($target eq 'tex') {
-	my $a=&Apache::lonxml::get_param('href',$parstack,$safeeval,undef,1);
-	my $b=&Apache::lonxml::get_param('name',$parstack,$safeeval,undef,1);
-	if ($a=~/\S/) {
-	    $a=~s/([^\\])%/$1\\\%/g;
-	    $currentstring .= '\ref{URI: '.$a.'}';
-	} elsif ($b=~/\S/) {
-	    $currentstring .= '\ref{Anchor: '.$b.'}';
-	} else {
-	    $currentstring.='';
-	}
     }
     return $currentstring;
 }
@@ -1579,6 +1568,20 @@ sub end_a {
     if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring .= $token->[2];
     }
+    if ($target eq 'tex') {
+	my $href =
+	    &Apache::lonxml::get_param('href',$parstack,$safeeval,undef,1);
+	my $name =
+	    &Apache::lonxml::get_param('name',$parstack,$safeeval,undef,1);
+	if ($href =~ /\S/) {
+	    $href =~ s/([^\\])%/$1\\\%/g;
+	    $currentstring .= ' ({\tt URI:'.&Apache::lonxml::latex_special_symbols($href).'})';
+	} elsif ($name =~ /\S/) {
+	    $currentstring .= ' ({\tt Anchor:'.&Apache::lonxml::latex_special_symbols($name).'})';
+	} else {
+	    $currentstring.='';
+	}	
+    }
     return $currentstring;
 }
 
@@ -1916,14 +1919,13 @@ sub start_table {
     if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring .= $token->[4];     
     } elsif ($target eq 'tex') {
-	my $aa = {};
-	push @Apache::londefdef::table, $aa; 
+	push(@Apache::londefdef::table, {}); 
 	$Apache::londefdef::table[-1]{'row_number'} = -1;
         #maximum table's width (default coincides with text line length)
 	if ($#Apache::londefdef::table==0) {
 	    $textwidth=&recalc($env{'form.textwidth'}); #result is always in mm
 	    $textwidth=~/(\d+\.?\d*)/;
-	    $textwidth=0.95*$1; #accounts "internal" LaTeX space for table frame
+	    $textwidth=0.85*$1; #accounts "internal" LaTeX space for table frame
 	} else {
 	    if ($Apache::londefdef::table[-2]{'TeXlen'}[$Apache::londefdef::table[-2]{'row_number'}][$Apache::londefdef::table[-2]{'counter_columns'}]=~/\d/) {
 		#the maximum width of nested table is determined by LATeX width of parent cell
@@ -1991,7 +1993,7 @@ sub start_table {
         $Apache::londefdef::table[-1]{'minlen'}=[];
         $Apache::londefdef::table[-1]{'content'}=[];
         $Apache::londefdef::table[-1]{'align'}=[];
-        $currentstring.='\keephidden{NEW TABLE ENTRY}';
+        $currentstring.=' \keephidden{NEW TABLE ENTRY}';
 
 
     }
@@ -2026,10 +2028,14 @@ sub end_table {
 		$available_space=$available_space-$Apache::londefdef::table[-1]{'TeXlen'}[0][$jn];
 	    }
 	}
+
         #boundaries for contents columns
 	my @min_len=();#columns can not be narrower 
 	my @max_len=();#maximum length of column
-	for (my $jn=0;$jn<=$Apache::londefdef::table[-1]{'counter_columns'};$jn++) {
+	my $avg_max;
+	my $avg_min;
+	my $counter_cols = $Apache::londefdef::table[-1]{'counter_columns'};
+	for (my $jn=0;$jn<=$counter_cols; $jn++) {
 		my ($localmin,$localmax)=(0,0);
 		for (my $in=0;$in<=$Apache::londefdef::table[-1]{'row_number'};$in++) {
 		    if ($localmin<$Apache::londefdef::table[-1]{'minlen'}[$in][$jn]) {
@@ -2041,8 +2047,28 @@ sub end_table {
 		}
 		push @min_len, $localmin;
 		push @max_len, $localmax;
+		$avg_max = $localmax + $avg_max;
+		$avg_min = $localmin + $avg_min;
 	}
-	for (my $jn=0;$jn<=$Apache::londefdef::table[-1]{'counter_columns'};$jn++) {
+	# Does not really matter what the average max/min are if there are no cols.
+	# and this prevents div 0 in that case.
+
+	if ($counter_cols != 0) {
+	    $avg_max = $avg_max/$counter_cols;
+	    $avg_min = $avg_min/$counter_cols;
+	}
+
+
+	#  I don't think the below is needed.. but just in case:
+
+	if ($avg_min > $avg_max) {
+	    my $temp = $avg_min;
+	    $avg_min = $avg_max;
+	    $avg_max = $temp;
+	}
+
+
+	for (my $jn=0;$jn<=$counter_cols;$jn++) {
 	    my $localmin=0,;
 	    for (my $in=0;$in<=$Apache::londefdef::table[-1]{'row_number'};$in++) {
 		if ($localmin<$Apache::londefdef::table[-1]{'objectlen'}[$in][$jn]) {
@@ -2061,6 +2087,16 @@ sub end_table {
 		$min_len[$jn]=0;
 		$max_len[$jn]=0;
 	    }
+	    #  Spans seem to be really bothered by max/min = 0.  So if we have one
+	    #  make it an average joe max/min.
+	    
+	    if ($max_len[$jn] == 0) {
+		$max_len[$jn] = $avg_max;
+	    }
+	    if ($min_len[$jn] == 0) {
+		$min_len[$jn] = $avg_min;
+	    }
+
 	}
        #final adjustment of column width
 	my @fwidth=@{$Apache::londefdef::table[-1]{'TeXlen'}[0]};#final width array
@@ -2129,6 +2165,7 @@ sub end_table {
 			$fwidth[$jn]=$max_len[$jn];
 			$acsessive=$acsessive+$adjust[$jn]-$max_len[$jn];
 			$adjust[$jn]=0;
+
 		    }
 		}
 		if ($acsessive>0) {
@@ -2183,12 +2220,23 @@ sub end_table {
 	    $Apache::londefdef::table[-1]{'content'}=\@cleaned_table;
 	    @fwidth=@cleaned_header;
 	}
+	#  At this time we must be sure the table does not overhang the total width
+	#  this can happen due to our 'average width' adjustment.
+        #  Total the column widths and see if they are larger than the avail width;
+	#  If so scale them down in proportion to their percentage of total width.
+
+	my $current_total_width = 0;
+	for (my $col = 0; $col < $#fwidth; $col++) {
+	    $current_total_width = $current_total_width + $fwidth[$col];
+	}
+
 	#construct header of the table
 	my $header_of_table = '{'.$Apache::londefdef::table[-1]{'vvinc'};
 	for (my $in=0;$in<=$#fwidth;$in++) {
 	    $header_of_table.='p{'.$fwidth[$in].' mm}'.$Apache::londefdef::table[-1]{'vvinc'};
 	}
 	$header_of_table .= '}';
+
 	#fill the table
 	for (my $in=0;$in<=$Apache::londefdef::table[-1]{'row_number'};$in++) {
 	    my $have_rowspan = 0;
@@ -2199,45 +2247,104 @@ sub end_table {
 		#   single rowspan, columspan and combined row/colspans will
                 #   work correctly.  LaTeX is delicate here.
 		#    RF.
-
+		
 		# Start a rowspan if necessary:
-
+		
+		my $primary_col_width = $fwidth[$jn]; # Width of primary column.
 		my $rowspan = $Apache::londefdef::table[-1]{'rowspan'}[$in][$jn];
 		my $colspan = $Apache::londefdef::table[-1]{'colspan'}[$in][$jn];
 		#
 		#  Do the appropriate magic if this has a colspan
 		# 
-
+		
+		my $spanwidth = 0;
 		if ($colspan > 1) {
+		    for (my $spancol = $jn; $spancol < $jn + $colspan; $spancol++) {
+			$spanwidth += $fwidth[$spancol];
+		    }
 		    $output .= '\multicolumn{'.
 			$colspan
-			.'}{|l|}{';
+			."}";
+		    if ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'c') {
+			$output .= '{|c|}{';
+		    } elsif ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'r') {
+			$output .= '{|r|}{';
+		    }
+		    else {
+			$output .= "{|p{$spanwidth mm}|}{";
+		    }
+		    
+		} else {
+		    $spanwidth = $primary_col_width; # If no span width will be just colwidth
 		}
 
+		# Rowspan... if colspan is 1, and there's an alignment we'll need
+		# to kick in a multicolumn in order to get the alignment spec.
+		# this must precede the multirow or LaTex gets quite upset.
+		# Naturally if colspan > 1 we've already done that above ^
+		#
+		my $multirow_aligned = 0;
 		if ($rowspan > 1) {
+		    if ($colspan == 1) {
+			if ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'c') {
+			    $output .= '\multicolumn{1}{|c|}{';
+			    $multirow_aligned = 1;
+			} elsif ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'r') {
+			    $output .= '\multicolumn{1}{|r|}{';
+			    $multirow_aligned = 1;
+			}
+		    }
 		    $have_rowspan++;
-		    $output .= '\multirow{'.$rowspan.'}[0]{'.$fwidth[$jn].'mm}{';
+		    if ($multirow_aligned) {
+			$output .= '\multirow{'.$rowspan.'}[0]{*}{';
+		    } else {
+			$output .= '\multirow{'.$rowspan."}[0]{$spanwidth mm}{";
+		    }
+		    
+		    $Apache::londefdef::table[-1]{'content'}[$in][$jn] =~
+			s{^\s*\\par\s*}{};
+		    $Apache::londefdef::table[-1]{'content'}[$in][$jn] =~
+			s{\s*\\vskip\s*0pt\s*$}{};
+			  
+		    #
+		    # If we did not throw in a multicolumn to align, then add 
+		    # an extra {
+		    # so we close correctly without having to keep additional state
+		    # around
+		    #
+		    if (!$multirow_aligned) {
+			$output .= '{';
+		    }
 		}
 		if (($rowspan eq '^') || ($rowspan eq '_')) {
 		    $have_rowspan++;
 		}
-		#--------------------------------------------------------------
+		    #--------------------------------------------------------------
+
 
-		if ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'c') {
-		    $output.=&center_correction().'\begin{center}';
-		} elsif ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'r') {
-		    $output.=' \hfill \llap{'
+		# For right and center alignment of single cells.
+		# we are going to use a multicolumn with a span of 1 to specify alignment.
+		#
+		if ($colspan == 1  && $rowspan == 1) {
+		    if ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'c') {
+			$output .= '\multicolumn{1}{|c|}{';
+		    } elsif ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'r') {
+			$output .= '\multicolumn{1}{|r|}{';
+		    }
 		}
+
 		$output.=$Apache::londefdef::table[-1]{'content'}[$in][$jn];
-		if ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'c') {
-		    $output.='\end{center}';
-		} elsif ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'r') {
-		    $output.='} ';
+
+		if (($colspan == 1 && $rowspan == 1)   &&
+		    (($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'c') ||
+		     ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'r'))) {
+		    $output .= '}';
 		}
+
 		# Close off any open multirow:
 		
 		if ($rowspan > 1) {
-		    $output .= '}';
+		    $output .= '}}';
 		}
 		#  Close off the colspan...
 		#
@@ -2457,9 +2564,11 @@ sub end_td_tex {
 
     my $TeXwidth=&Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval,undef,0);
     if (defined $TeXwidth) {		
-	push @ {$Apache::londefdef::table[-1]{'objectlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';
-	push @ {$Apache::londefdef::table[-1]{'minlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';
-	push @ {$Apache::londefdef::table[-1]{'maxlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';
+	for (my $c = 0; $c < $colspan; $c++) {
+	    push @ {$Apache::londefdef::table[-1]{'objectlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';
+	    push @ {$Apache::londefdef::table[-1]{'minlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';
+	    push @ {$Apache::londefdef::table[-1]{'maxlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';
+	}
     } else {
 	if (($data=~m/width\s*=\s*(\d+\.?\d*\s*(mm|cm|in|pc|pt)*)/) or ($data=~m/\[(\d+\.?\d*)\s*mm\]/)) {
 	    my $garbage_data=$data;
@@ -2475,10 +2584,12 @@ sub end_td_tex {
 		if ($fwidth<$current_length) {$fwidth=$current_length;}
 		$garbage_data=~s/\[(\d+\.?\d*)\s*mm\]//;
 	    }
-	    push @ {$Apache::londefdef::table[-1]{'TeXlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';
-	    push @ {$Apache::londefdef::table[-1]{'objectlen'}[$Apache::londefdef::table[-1]{'row_number'}] },$fwidth;
-	    push @ {$Apache::londefdef::table[-1]{'minlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';
-	    push @ {$Apache::londefdef::table[-1]{'maxlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';
+	    for (my $c = 0; $c < $colspan; $c++) {
+		push @ {$Apache::londefdef::table[-1]{'TeXlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';
+		push @ {$Apache::londefdef::table[-1]{'objectlen'}[$Apache::londefdef::table[-1]{'row_number'}] },$fwidth;
+		push @ {$Apache::londefdef::table[-1]{'minlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';
+		push @ {$Apache::londefdef::table[-1]{'maxlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';
+	    }
 	} elsif ($data=~/\\parbox\{\s*\d+\.?\d*\s*(mm|cm|in|pc|pt)*\s*\}/ or $data=~/\\epsfxsize\s*=\s*\d+\.?\d*\s*(mm|cm|in|pc|pt)*/) {
 	    my $garbage_data=$data;
 	    my $fwidth=0;
@@ -2494,10 +2605,12 @@ sub end_td_tex {
 		if ($fwidth<$1) {$fwidth=$1;}
 		$garbage_data=~s/\\epsfxsize\s*=\s*(\d+\.?\d*\s*(mm|cm|in|pc|pt)*)//;
 	    }
-	    push @ {$Apache::londefdef::table[-1]{'TeXlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';
-	    push @ {$Apache::londefdef::table[-1]{'objectlen'}[$Apache::londefdef::table[-1]{'row_number'}] },$fwidth;
-	    push @ {$Apache::londefdef::table[-1]{'minlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';
-	    push @ {$Apache::londefdef::table[-1]{'maxlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';
+	    for (my $c = 0; $c < $colspan; $c++) {
+		push @ {$Apache::londefdef::table[-1]{'TeXlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';
+		push @ {$Apache::londefdef::table[-1]{'objectlen'}[$Apache::londefdef::table[-1]{'row_number'}] },$fwidth;
+		push @ {$Apache::londefdef::table[-1]{'minlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';
+		push @ {$Apache::londefdef::table[-1]{'maxlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';
+	    }
 	    $data=~s/\\\\\s*$//; 
 	} else {  
 	    $data=~s/^\s+(\S.*)/$1/; 
@@ -2525,10 +2638,12 @@ sub end_td_tex {
 			if ($min_length<$lengthword) {$min_length=$lengthword;}
 		    }
 	    }
-	    push @ {$Apache::londefdef::table[-1]{'TeXlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';
-	    push @ {$Apache::londefdef::table[-1]{'objectlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';
-	    push @ {$Apache::londefdef::table[-1]{'maxlen'}[$Apache::londefdef::table[-1]{'row_number'}] },$current_length;
-	    push @ {$Apache::londefdef::table[-1]{'minlen'}[$Apache::londefdef::table[-1]{'row_number'}] },$min_length;
+	    for (my $c = 0; $c < $colspan; $c++) {
+		push @ {$Apache::londefdef::table[-1]{'TeXlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';
+		push @ {$Apache::londefdef::table[-1]{'objectlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';
+		push @ {$Apache::londefdef::table[-1]{'maxlen'}[$Apache::londefdef::table[-1]{'row_number'}] },$current_length;
+		push @ {$Apache::londefdef::table[-1]{'minlen'}[$Apache::londefdef::table[-1]{'row_number'}] },$min_length;
+	    }
 	}        
     }
     # Substitute all of the tables nested in this cell in their appropriate places.
@@ -2800,55 +2915,32 @@ sub start_img {
 	#if original gif/jpg/png file exist do following:
 	my $origsrc=$src;
 	my ($path,$file) = &get_eps_image($src);
+	# &Apache::lonnet::logthis("Image source: $src result: $path $file");
 	$src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);
 	&Apache::lonxml::debug("path = $path file = $file src = $src");
 	if (-e $src) {
 	    &Apache::lonxml::debug("$src exists");
 	    my ($height_param,$width_param)=
 		&image_size($origsrc,0.3,$parstack,$safeeval);
-	    my $destpath = $path;
-	    $destpath    =~ s/ /\_/g; # Spaces in path cause LaTex to vomit.
-	    my $destfile = $file;
-	    $destfile    =~ s/ /\_/g;
 	    my $size;
 	    if ($width_param)  { $size.='width='.$width_param.' mm,'; }
 	    if ($height_param) { $size.='height='.$height_param.' mm]'; }
+	    # Default size if not able to extract that (e.g. eps image).
+	    
+	    # &Apache::lonnet::logthis("Size = $size");
+	    
 	    $size='['.$size;
 	    $size=~s/,$/]/; 
-	    $currentstring .= '\graphicspath{{'.$destpath.'}}'
-		.'\includegraphics'.$size.'{'.$destfile.'} ';
-
-	    #    If there's an alignment specification we need to honor it here.
-	    #    For the horizontal alignments, we will also honor the
-	    #    value of the latex specfication.  The default is parbox,
-	    #    and that's used for illegal values too.  
-	    #    
-	    #    Even though we set a default alignment value, the user
-	    #    could have given us an illegal value.  In that case we
-	    #    just use the default alignment of bottom..
-	    if      ($align eq "top")    {
-		$currentstring = '\raisebox{-'.$height_param.'mm}{'.$currentstring.'}';
-	    } elsif (($align eq "center") || ($align eq "middle")) { # Being kind
-		my $offset = $height_param/2;
-		$currentstring = '\raisebox{-'.$offset.'mm}{'.$currentstring.'}';
-	    } elsif ($align eq "left")   { 
-		if ($latex_rendering eq "parpic") { 
-		    $currentstring = '\parpic[l]{'.$currentstring.'}';
-		} else {    	                                 # wrapfig render
-		    $currentstring = '\begin{wrapfigure}{l}{'.$width_param.'mm}'
-			.'\scalebox{1.0}{'.$currentstring.'}\end{wrapfigure}';
-		}
-	    } elsif ($align eq "right")  {   
-		if ($latex_rendering eq "parpic") {
-		    $currentstring = '\parpic[r]{'.$currentstring.'}';
-		} else {	                                 # wrapfig rendering
-		    $currentstring = '\begin{wrapfigure}{r}{'.$width_param.'mm}'
-			.'\scalebox{1.0}{'.$currentstring.'}\end{wrapfigure}';
-
-		}
-	    } else {		# Bottom is also default.
-		# $currentstring = '\raisebox{'.$height_param.'mm}{'.$currentstring.'}';
-	    }
+	    $currentstring .= '\graphicspath{{'.$path.'}}'
+		.'\includegraphics'.$size.'{'.$file.'} ';
+	    my $closure;
+	    ($currentstring, $closure) = &align_latex_image($align, 
+							    $latex_rendering, 
+							    $currentstring, 
+							    $width_param, 
+							    $height_param);
+	    $currentstring .= $closure;
+						
 	} else {
 	    &Apache::lonxml::debug("$src does not exist");
 	    #original image file doesn't exist so check the alt attribute
@@ -2876,7 +2968,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);
+						   ['', '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();
@@ -3368,6 +3460,9 @@ sub start_blockquote {
     if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring .= $token->[4];     
     } 
+    if ($target eq 'tex') {
+	$currentstring .= '\begin{quote}';
+    }
     return $currentstring;
 }
 
@@ -3377,6 +3472,9 @@ sub end_blockquote {
     if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[2];    
     } 
+    if ($target eq 'tex') {
+	$currentstring = '\end{quote}';
+    }
     return $currentstring;
 }
 
@@ -4177,7 +4275,7 @@ sub get_eps_image {
 	&Apache::lonnet::repcopy($orig_src); # Failure is not completely fatal.
     }
     &Apache::lonxml::debug("get_eps_image: Original image: $orig_src");
-    my ($spath, $sname, $sext) = fileparse($src, qr/\.(gif|png|jpg|jpeg)/i);
+    my ($spath, $sname, $sext) = &fileparse($src, qr/\.(gif|png|jpg|jpeg)/i);
     $src=~s/\.(gif|png|jpg|jpeg)$/\.eps/i;
     $src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);
     &Apache::lonxml::debug("Filelocation gives: $src");
@@ -4202,17 +4300,33 @@ sub get_eps_image {
 		my $newsrc=$orig_src;
 		$newsrc =~ s|(.*)/res/|/home/httpd/html/res/|;
 		&Apache::lonxml::debug("queueing $newsrc for dynamic eps production.");
-		print FILE "$newsrc\n";
-		close FILE;
+		print FILE ("$newsrc\n");
+		close(FILE);
 		$src=~s|/home/httpd/html/res|/home/httpd/prtspool|;
 		$src=~s|/home/([^/]*)/public_html/|/home/httpd/prtspool/$1/|;
 		if ($sext ne "") {	 # Put the ext. back in to uniquify.
 		    $src =~ s/\.eps$/$sext.eps/;
 		}
+
 	    }
+
 	}
+    } else {
+	# If the postscript file has spaces in its name,
+	# LaTeX will gratuitiously vomit.  Therefore
+	# queue such files for copy with " " replaced by "_".
+	# printout.pm will know them by their .ps  or .eps extensions.
+	my $newsrc = $orig_src;
+	$newsrc    =~  s|(.*)/res/|/home/httpd/html/res/|;
+	open(FILE,">>/home/httpd/prtspool/$env{'user.name'}_$env{'user.domain'}_printout.dat");
+	print FILE "$src\n";
+	close FILE;
+	$src=~s|/home/httpd/html/res|/home/httpd/prtspool|;
+	$src=~s|/home/([^/]*)/public_html/|/home/httpd/prtspool/$1/|;
     }
     my ($path,$file)=($src=~m|(.*)/([^/]*)$|);
+    $path =~ s/ /\_/g;
+    $file =~ s/ /\_/g;
     &Apache::lonxml::debug("get_eps_image returning: $path / $file<BR />");
     return ($path.'/',$file);
 }
@@ -4224,15 +4338,15 @@ sub eps_generation {
     print $temp_file "$src\n";
     my $newsrc = $src;
     $newsrc =~ s/(\.gif|\.jpg|\.jpeg)$/\.eps/i;
-    $newsrc=~s/\/home\/httpd\/html\/res//;
-    $newsrc=~s/\/home\/([^\/]*)\/public_html\//\/$1\//;
-    $newsrc=~s/\/\.\//\//;
-    $newsrc=~s/\/([^\/]+)\.(ps|eps)/\//;
-    if ($newsrc=~/\/home\/httpd\/lonUsers\//) {
-	$newsrc=~s/\/home\/httpd\/lonUsers//;
-	$newsrc=~s/\/([^\/]+)\/(\w)\/(\w)\/(\w)\//\/$1\//;
+    $newsrc=~s{/home/httpd/html/res}{};
+    $newsrc=~s{/home/($LONCAPA::username_re)/public_html/}{/$1/};
+    $newsrc=~s{/\./}{/};
+    $newsrc=~s{/([^/]+)\.(ps|eps)}{/};
+    if ($newsrc=~m{/home/httpd/lonUsers/}) {
+	$newsrc=~s{/home/httpd/lonUsers}{};
+	$newsrc=~s{/($LONCAPA::domain_re)/./././}{/$1/};
     }
-    if ($newsrc=~/\/userfiles\//) {
+    if ($newsrc=~m{/userfiles/}) {
 	return ' \graphicspath{{'.$newsrc.'}}\includegraphics[width='.$width_param.' mm]{'.$file.'} ';
     } else {
 	return ' \graphicspath{{/home/httpd/prtspool'.$newsrc.'}}\includegraphics[width='.$width_param.' mm]{'.$file.'} ';
@@ -4296,6 +4410,78 @@ sub LATEX_length {
     return $value;
 }
 
+#   Wrap image 'stuff' inside of the LaTeX required to implement 
+#   alignment:
+#     align_tex_image(align, latex_rendering, image)
+#   Where:
+#     align   - The HTML alignment specification.
+#     latex_rendering - rendering hint for latex.
+#     image   - The LaTeX needed to insert the image itsef.
+#     width,height - dimensions of the image.
+# Returns:
+#    The 1/2 wrapped image and the stuff required to close the
+#    wrappage.  This allows e.g. randomlabel to insert more stuff
+#    into the closure.
+#
+sub align_latex_image {
+    my ($align, $latex_rendering, $image, $width, $height) = @_;
+    my $currentstring;        # The 1/2 wrapped image.
+    my $closure;              # The closure of the wrappage.
+    #    If there's an alignment specification we need to honor it here.
+    #    For the horizontal alignments, we will also honor the
+    #    value of the latex specfication.  The default is parbox,
+    #    and that's used for illegal values too.  
+    #    
+    #    Even though we set a default alignment value, the user
+    #    could have given us an illegal value.  In that case we
+    #    just use the default alignment of bottom..
+    $currentstring = "\n% figurewrapping \n";
+    if      ($align eq "top")    {
+	$currentstring .= '\raisebox{-'.$height.'mm}{'.$image;
+	$closure = '}';
+    } elsif (($align eq "center") || ($align eq "middle")) { # Being kind
+	my $offset = $height/2;
+	$currentstring .= '\raisebox{-'.$offset.'mm}{'.$image;
+	$closure       = '}';
+    } elsif ($align eq "left")   { 
+	if ($latex_rendering eq "parpic") { 
+	    $currentstring .= '\parpic[l]{'.$image;
+	    $closure       = '}';
+	} elsif ($latex_rendering eq "parbox") {
+	    $currentstring .= '\begin{minipage}[l]{'.$width.'mm}'
+		.$image;
+	    $closure = '\end{minipage}';
+	} elsif ($latex_rendering eq "wrapfigure"
+		 || $latex_rendering ne 'none') {  # wrapfig render
+	    $currentstring .= 
+		'\begin{wrapfigure}{l}{'.$width.'mm}'
+		.'\scalebox{1.0}{'.$image;
+	    $closure = '}\end{wrapfigure}';
+	}
+    } elsif ($align eq "right")  {   
+	if ($latex_rendering eq "parpic") {
+	    $currentstring .= '\parpic[r]{'.$image;
+	    $closure = '}';
+	} elsif ($latex_rendering eq "parbox") {
+	    $currentstring .=  '\begin{minipage}[r]{'.$width.'mm}'
+		.$image;
+	    $closure = '\end{minipage}';
+	} elsif ($latex_rendering eq "wrapfigure"
+		 || $latex_rendering ne 'none') {  # wrapfig render
+	    $currentstring .= 
+		'\begin{wrapfigure}{r}{'.$width.'mm}'
+		.'\scalebox{1.0}{'.$image;
+	    $closure = '}\end{wrapfigure}';
+	}
+    } else {		# Bottom is also default.
+	# $currentstring = '\raisebox{'.$height.'mm}{'.$image.'}';
+	$currentstring .= "{$image";
+	$closure       = '}';
+    }
+    $currentstring .= "\n% end wrappage\n";
+    $closure        = "\n% Begin closure\n".$closure."\n% End closure\n";
+    return ($currentstring, $closure);
+}
 
 # is_inside_of $tagstack $tag
 #    This sub returns true if the current state of Xml processing