--- loncom/xml/londefdef.pm	2002/07/30 14:10:51	1.79
+++ loncom/xml/londefdef.pm	2002/11/06 16:50:11	1.97
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Tags Default Definition Module 
 #
-# $Id: londefdef.pm,v 1.79 2002/07/30 14:10:51 sakharuk Exp $
+# $Id: londefdef.pm,v 1.97 2002/11/06 16:50:11 sakharuk Exp $
 # 
 #
 # Copyright Michigan State University Board of Trustees
@@ -52,7 +52,7 @@ use Image::Magick;
 
 BEGIN {
 
-    &Apache::lonxml::register('Apache::londefdef',('m','html','head','map','select','option','input','textarea','form','meta','title','body','center','b','strong','dt','h1','h2','h3','h4','h5','h6','cite','i','address','dd','dl','dir','ol','ul','menu','dfn','kbd','tt','code','em','q','p','br','big','small','basefont','font','s','sub','strike','sup','hr','a','li','u','output','param','applet','img','embed','allow','frameset','pre','insert','externallink','table','tr','th','td','blankspace','bubble','bubbles','bubbleline'));
+    &Apache::lonxml::register('Apache::londefdef',('a','abbr','acronym','address','allow','applet','area','b','base','basefont','bgo','bgsound','big','blink','blockquote','blankspace','body','br','button','caption','center','cite','code','col','colgroup','dd','del','dfn','dir','div','dl','dt','em','embed','externallink','fieldset','font','form','frame','frameset','h1','h2','h3','h4','h5','h6','head','hr','html','i','iframe','img','input','ins','insert','isindex','kbd','keygen','label','layer','legend','li','link','m','map','marquee','menu','meta','multicol','nobr','noembed','noframes','nolayer','noscript','object','ol','optgroup','option','output','p','param','pre','q','s','samp','select','server','small','spacer','span','strike','strong','sub','sup','table','tbody','td','textarea','tfoot','th','thead','title','tr','tt','u','ul','var','wbr'));
 
 }
 
@@ -91,7 +91,7 @@ sub start_m {
     #&Apache::lonxml::debug("M is ends with:$currentstring:");
   } elsif ($target eq 'tex') {
     $currentstring = &Apache::lonxml::get_all_text_unbalanced("/m",$parser);
-    if ($currentstring=~/\s*\\\\\s*/) {$currentstring = ' \vskip 0 mm ';}
+    if ($currentstring=~/^(\s*\\\\\s*)*$/) {$currentstring = ' \vskip 0 mm ';}
   } else {
     my $inside = &Apache::lonxml::get_all_text_unbalanced("/m",$parser);
   }
@@ -126,7 +126,8 @@ sub end_m {
                                  \newcommand{\keephidden}[1]{}
                                  \renewcommand{\deg}{$^{\circ}$}
                                  \usepackage[dvips]{graphicx}
-                                 \usepackage{epsfig}\usepackage{calc}';
+                                 \usepackage{epsfig}\usepackage{calc}
+                                 \newenvironment{choicelist}{\begin{enumerate}}{\end{enumerate}}';
 	    }
 	   return $currentstring;
 	}
@@ -329,7 +330,6 @@ sub end_m {
 #-- <body> tag
         sub start_body {
             my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
-#	    my ($target,$token) = @_;
             my $currentstring = '';
             if ($target eq 'web') {
 	      if (!$Apache::lonxml::registered) {
@@ -466,7 +466,7 @@ EDITBUTTON
             if ($target eq 'web') {
 	       $currentstring .= $token->[4];
 	    } elsif ($target eq 'tex') {
-		$currentstring .= '\large{\textbf{';
+		$currentstring .= '{\large \textbf{';
 	    } elsif ($target eq 'meta') {
 		$currentstring='<subject>';
                 &start_output();
@@ -493,7 +493,7 @@ EDITBUTTON
             if ($target eq 'web') {
 	       $currentstring .= $token->[4];
 	    } elsif ($target eq 'tex') {
-		$currentstring .= '\large{\textbf{';
+		$currentstring .= '{\large \textbf{';
 	    } 
            return $currentstring;
 	}
@@ -514,7 +514,7 @@ EDITBUTTON
             if ($target eq 'web') {
 	       $currentstring .= $token->[4];
 	    } elsif ($target eq 'tex') {
-		$currentstring .= '\large{\textbf{';
+		$currentstring .= '{\large \textbf{';
 	    } 
            return $currentstring;
 	}
@@ -535,7 +535,7 @@ EDITBUTTON
             if ($target eq 'web') {
 	       $currentstring .= $token->[4];
 	    } elsif ($target eq 'tex') {
-		$currentstring .= '\large{\textbf{';
+		$currentstring .= '{\large \textbf{';
 	    } 
            return $currentstring;
 	}
@@ -556,7 +556,7 @@ EDITBUTTON
             if ($target eq 'web') {
 	       $currentstring .= $token->[4];
 	    } elsif ($target eq 'tex') {
-		$currentstring .= '\large{\textbf{';
+		$currentstring .= '{\large \textbf{';
 	    } 
            return $currentstring;
 	}
@@ -577,7 +577,7 @@ EDITBUTTON
             if ($target eq 'web') {
 	       $currentstring .= $token->[4];
 	    } elsif ($target eq 'tex') {
-		$currentstring .= '\large{\textbf{';
+		$currentstring .= '{\large \textbf{';
 	    } 
            return $currentstring;
 	}
@@ -845,7 +845,7 @@ EDITBUTTON
 	       $currentstring .= $token->[4];
 	    } elsif ($target eq 'tex') {
 		if ($$tagstack[-2] ne 'sub' && $$tagstack[-2] ne 'sup') {
-		    $currentstring .= '\vskip 0 mm';
+		    $currentstring .= '\vskip 0.2 mm';
 		}
 	    } elsif ($target eq 'latexsource') {
 		$currentstring .= '\\';
@@ -1039,7 +1039,7 @@ EDITBUTTON
             if ($target eq 'web') {
 	       $currentstring .= $token->[4];
 	    } elsif ($target eq 'tex') {
-		$currentstring .= '\vskip 0 mm \noindent\makebox[\textwidth - 8 mm][b]{\hrulefill}';
+		$currentstring .= '\vskip 0 mm \noindent\makebox[\textwidth/2 ][b]{\hrulefill}\vskip 0 mm ';
 	    } 
            return $currentstring;
 	}
@@ -1052,6 +1052,23 @@ EDITBUTTON
 	    } 
            return $currentstring;
 	}
+#-- <div> tag
+        sub start_div {
+	    my ($target,$token) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+	       $currentstring .= $token->[4];
+	    } 
+           return $currentstring;
+	}
+        sub end_div {
+	    my ($target,$token) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+	       $currentstring .= $token->[2];
+	    } 
+           return $currentstring;
+	}
 #-- <a> tag
         sub start_a {
 	    my ($target,$token) = @_;
@@ -1071,7 +1088,6 @@ EDITBUTTON
                 my  $tempor_var = $stackref->[$#$stackref];
 		if (index($tempor_var,'name') != -1 ) {
 		    $tempor_var =~ s/name=([^,]*),/$1/g;
-#	        $currentstring .= " \\label{$tempor_var}";
 	        } elsif (index($tempor_var,'href') != -1 ) {
 		    $tempor_var =~ s/href=([^,]*),/$1/g;
 	        $currentstring .= " \\ref{$tempor_var}";
@@ -1274,30 +1290,37 @@ EDITBUTTON
 	   return $currentstring;
 	}
 #-- <table> tag
-        sub start_table {
-	    my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
-            my $currentstring = '';
-            if ($target eq 'web') {
-              $currentstring = $token->[4];     
-	    } elsif ($target eq 'tex') {
-		my $aa = {};
-		push @Apache::londefdef::table, $aa; 
-		$Apache::londefdef::table[-1]{'row_number'} = -1;
-		$Apache::londefdef::table[-1]{'output'} = ' \noindent \begin{tabular} ';
-		my $border = &Apache::lonxml::get_param('border',$parstack,$safeeval);
-		unless (defined $border) { $border = 0; }
-		if ($border) { 
-		    $Apache::londefdef::table[-1]{'hinc'} = '\hline '; 
-		    $Apache::londefdef::table[-1]{'vinc'} = '&'; 
-		    $Apache::londefdef::table[-1]{'vvinc'} = '|';
-		} else {
-		    $Apache::londefdef::table[-1]{'hinc'} = ''; 
-		    $Apache::londefdef::table[-1]{'vinc'} = '&'; 
-		    $Apache::londefdef::table[-1]{'vvinc'} = '';
-		}
-	    } 
-	   return $currentstring;
+sub start_table {
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
+    my $currentstring = '';
+    if ($target eq 'web') {
+	$currentstring = $token->[4];     
+    } elsif ($target eq 'tex') {
+	my $aa = {};
+	push @Apache::londefdef::table, $aa; 
+	$Apache::londefdef::table[-1]{'row_number'} = -1;
+	$Apache::londefdef::table[-1]{'output'} = ' \noindent \begin{tabular} ';
+	my $border = &Apache::lonxml::get_param('border',$parstack,$safeeval);
+	unless (defined $border) { $border = 0; }
+	if ($border) { 
+	    $Apache::londefdef::table[-1]{'hinc'} = '\hline '; 
+	    $Apache::londefdef::table[-1]{'vinc'} = '&'; 
+	    $Apache::londefdef::table[-1]{'vvinc'} = '|';
+	} else {
+	    $Apache::londefdef::table[-1]{'hinc'} = ''; 
+	    $Apache::londefdef::table[-1]{'vinc'} = '&'; 
+	    $Apache::londefdef::table[-1]{'vvinc'} = '';
+	}
+	my $width;
+	foreach my $key (keys(%{$token->[2]})) {
+	    if ($key =~ /^width$/i) {
+		$width = &Apache::lonxml::get_param($key,$parstack,$safeeval);
+	    }
 	}
+	if (defined($width)) { $Apache::londefdef::table[-1]{'width'}=$width; }
+    }
+    return $currentstring;
+}
         sub end_table {
 	    my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
             my $currentstring = '';
@@ -1321,26 +1344,9 @@ EDITBUTTON
 		}
                 #define the length of the table cells
 		my @lengthforoutput = split(/,/,$Apache::londefdef::table[-1]{'lengthrow'}[0]);
-		my $how_many_columns = $#lengthforoutput + 1;
-		my $filled_columns = 0;
-		foreach my $tempo_length (@{ $Apache::londefdef::table[-1]{'lengthrow'} }) {
-		    my @length = split(/,/,$tempo_length);
-		    for (my $ico=0;$ico<$how_many_columns;$ico++) {
-			if (not $lengthforoutput[$ico]=~m/\s*0\s*/) {$filled_columns++;}
-		    }
-		}
-		my $temp_file;
-		my $filename = "/home/httpd/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_printout.tbl";
-		if (-e $filename) {
-		    $temp_file = Apache::File->new($filename); 
-		    my @tbl_file_content = <$temp_file>;
-		    my ($one,$two) = split(/,/,$tbl_file_content[0]);
-			$how_many_columns+=$one-1;
-			$filled_columns+=$two;
-		} else {
-		    $temp_file = Apache::File->new('>>'.$filename); 
-		}
-		print $temp_file "$how_many_columns,$filled_columns\n";
+		my $how_many_columns = $#lengthforoutput + 1; #total number of columns in the table 
+		my $filled_columns = 0; #number of columns with information about width
+		my $available_space = ' ';
 		foreach my $tempo_length (@{ $Apache::londefdef::table[-1]{'lengthrow'} }) {
 		    my @length = split(/,/,$tempo_length);
 		    for (my $ico=0;$ico<=$#lengthforoutput;$ico++) {
@@ -1377,34 +1383,50 @@ EDITBUTTON
 			}		 
 		    }
 		}
-                my $parboxlength = '(\textwidth';
-                for (my $io=0; $io<=$#lengthforoutput;$io++) {
-		    $parboxlength .= ' - '.$lengthforoutput[$io].' ';
+		for (my $ico=0;$ico<=$#lengthforoutput;$ico++) {
+		    if (not $lengthforoutput[$ico]=~m/^\s*0\s*\w*\s*$/) {
+			$filled_columns++;
+			$available_space = $available_space.' - '.$lengthforoutput[$ico];
+		    }
 		}
-		$parboxlength .= ')/($GLOBALnumberOFcolumns+1) - 1 mm';
-		$output =~ s/\\parbox{}{}/\\parbox{1 mm}{}/g;
-		$output =~ s/\\parbox{}{(\\textbf{\w?\.?})}/\\parbox{5 mm}{$1}/g; #for stupid tables with empty columns
-		$output =~ s/\\parbox{}/\\parbox{$parboxlength}/g;
-                my ($howmanyatall,$howmanyfilled) = (0,0);
-	     
+		my $temp_file;
+		my $filename = "/home/httpd/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_printout.tbl";
+		if (-e $filename) {
+		    $temp_file = Apache::File->new($filename); 
+		    my @tbl_file_content = <$temp_file>;
+		    my ($one,$two,$three) = split(/,/,$tbl_file_content[0]);
+		        $how_many_columns+=$one-1;
+		        $filled_columns+=$two;
+		    if($three=~/\S/) {$available_space = $available_space.' - '.$three;}
+		} else {
+		    $temp_file = Apache::File->new('>>'.$filename); 
+		}		
+		print $temp_file "$how_many_columns,$filled_columns,$available_space\n";
+		$output =~ s/\\parbox{TOBECHANGEDONNUMBER}{}/\\parbox{1 mm}{}/g;
+		$output =~ s/\\parbox{TOBECHANGEDONNUMBER}/\\parbox{\$SpacePerColumn}/g;
 		my @tagar = @$tagstack;
 		my $signature = 1;
 		for (my $ico=0;$ico<$#tagar;$ico++) {
 		     if ($tagar[$ico] eq 'table') { $signature = 0; }
 		}
 		if ($signature) {
-		    my $totalnumber = $how_many_columns-$filled_columns-1;
-		    $output =~ s/\$GLOBALnumberOFcolumns/$totalnumber/g;
-		}		
+		    my $NumberEmptyLength = $how_many_columns - $filled_columns;		
+		    my $SpacePerColumn = '(\textwidth '.$available_space.')/'.$NumberEmptyLength;
+		    my $shorthand = ($NumberEmptyLength+1)*4;
+		    $output =~ s/\$SpacePerColumn/$SpacePerColumn - $shorthand mm/g;
+		}	
 		$Apache::londefdef::table[-1]{'output'} .= $header_of_table.$output.$Apache::londefdef::table[-1]{'hinc'}.'\end{tabular}\vskip 0 mm ';
 		if ($#Apache::londefdef::table > 0) {
 		    $inmemory = $Apache::londefdef::table[-1]{'output'};
 		    pop @Apache::londefdef::table;
-		    $Apache::londefdef::table[-1]{'rowdata'}[$Apache::londefdef::table[-1]{'row_number'}] .= $inmemory;
+		    $Apache::londefdef::table[-1]{'rowdata'}[$Apache::londefdef::table[-1]{'row_number'}] .= $inmemory
 		} else {
 		    $currentstring = $Apache::londefdef::table[-1]{'output'};
 		    $currentstring =~ s/\\\\\s+\\\\/\\\\/g; 
 		    pop @Apache::londefdef::table;
+		    if (-e $filename) {
+			unlink $filename;
+		    }
 		}
 	    }
 	   return $currentstring;
@@ -1435,7 +1457,6 @@ EDITBUTTON
             if ($target eq 'web') {
 		$currentstring = $token->[2];     
 	    } elsif ($target eq 'tex') {
-#		$currentstring .= ' START ROW '. $Apache::londefdef::table[-1]{'rowdata'}[$Apache::londefdef::table[-1]{'row_number'}].' END ROW ';		
 		push @{ $Apache::londefdef::table[-1]{'lengthrow'} },$Apache::londefdef::table[-1]{'length'};
 
 	    }
@@ -1447,7 +1468,7 @@ EDITBUTTON
             my $currentstring = '';
             if ($target eq 'web') {
               $currentstring = $token->[4];     
-	    } elsif ($target eq 'tex') {
+    } elsif ($target eq 'tex') {
 		my $what_to_push = substr(&Apache::lonxml::get_param('align',$parstack,$safeeval),0,1);
 		if ($what_to_push eq '') {
 		    $what_to_push = substr($Apache::londefdef::table[-1]{'rows'}[0],0,1);;
@@ -1462,17 +1483,25 @@ EDITBUTTON
         sub end_td {
 	    my ($target,$token) = @_;
             my $currentstring = '';
+            my $tempolen = '';
             if ($target eq 'web') {
 		$currentstring = $token->[2];     
 	    } elsif ($target eq 'tex') {
 		my $current_row = $Apache::londefdef::table[-1]{'row_number'};
 		my $data=&Apache::lonxml::endredirection();
-		if ($data=~m/width\s*=\s*(\d+\.*\d*\s*(mm|cm))/) {                 
-                    $Apache::londefdef::table[-1]{'length'} .= $1.',';        
+		if ($data=~m/width\s*=\s*(\d+\.?\d*\s*(mm|cm|in|pc|pt))/) {                 
+                    $Apache::londefdef::table[-1]{'length'} .= $1.',';
+		    $tempolen = $1;         
 		} else {
-		    $Apache::londefdef::table[-1]{'length'} .= '0 mm,'; 
+		    if (length($data)<5) {
+			$Apache::londefdef::table[-1]{'length'} .= '0 mm,';
+			$tempolen = '5 mm';
+		    } else {
+			$Apache::londefdef::table[-1]{'length'} .= '0 mm,';
+			$tempolen = 'TOBECHANGEDONNUMBER';
+		    }
                 }                                        
-		@{ $Apache::londefdef::table[-1]{'rowdata'} }[$current_row] .= '\parbox{'.$1.'}{'.$data.'} '.$Apache::londefdef::table[-1]{'vinc'};
+		@{ $Apache::londefdef::table[-1]{'rowdata'} }[$current_row] .= '\parbox{'.$tempolen.'}{'.$data.'} '.$Apache::londefdef::table[-1]{'vinc'};
 	    }
 	   return $currentstring;
 	}
@@ -1524,73 +1553,73 @@ EDITBUTTON
 	    if ($target eq 'web') {
               $currentstring = $token->[4];     
 	    } elsif ($target eq 'tex') {
-	      my $src = &Apache::lonxml::get_param('src',$parstack,$safeeval);
+		my $src = &Apache::lonxml::get_param('src',$parstack,$safeeval);
+		&image_replication($src);
 	      $src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);
-              my $image = Image::Magick->new;
-              my $current_figure = $image->Read($src);
-              $width_param = $image->Get('width') * $scaling;;
-	      $height_param = $image->Get('height') * $scaling;;
-	      undef $image;
-	      my $epssrc = $src;
-	      $epssrc =~ s/(\.gif|\.jpg)$/\.eps/i;
-	      if (not -e $epssrc) {
-		  my $localfile = $epssrc;
-		  $localfile =~ s/.*(\/res)/$1/;	
+              #if original gif/jpg file exist do following:
+              if (-e $src) {          
+                  #defines the default size of image
+		  my $image = Image::Magick->new;
+		  my $current_figure = $image->Read($src);
+		  $width_param = $image->Get('width') * $scaling;;
+		  $height_param = $image->Get('height') * $scaling;;
+		  undef $image;
+		  #do we have any specified size of the picture?
+		  my $TeXwidth = &Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval); 
+		  my $TeXheight = &Apache::lonxml::get_param('TeXheight',$parstack,$safeeval); 
+		  my $width = &Apache::lonxml::get_param('width',$parstack,$safeeval);
+		  if ($TeXwidth ne '') {  
+		      if ($TeXwidth=~/(\d+)\s*\%/) {
+			  $width_param = $1*$ENV{'form.textwidth'}/100;
+		      } else { 
+			  $width_param = $TeXwidth;
+		      }
+		  } elsif ($TeXheight ne '') {
+			  $width_param = $TeXheight/$height_param*$width_param;
+		  } elsif ($width ne '') {
+		      $width_param = $width*$scaling;      
+		  }
 		  my $file;
 		  my $path;	
-		  if ($localfile =~ m!(.*)/([^/]*)$!) {
-		      $file = $2;
+		  if ($src =~ m!(.*)/([^/]*)$!) {
+		      $file = $2; 
 		      $path = $1.'/'; 
-		  }	
-		  my $signal_eps = 0;
-		  my @content_directory = &Apache::lonnet::dirlist($path);
-		  for (my $iy=0;$iy<=$#content_directory;$iy++) {
-		      my @tempo_array = split(/&/,$content_directory[$iy]);
-		      $content_directory[$iy] = $tempo_array[0];
-		      if ($file eq $tempo_array[0]) {
-			  $signal_eps = 1;
-			  last;
+		  } 
+		  my $newsrc = $src;
+		  $newsrc =~ s/(\.gif|\.jpg)$/\.eps/i;
+		  $file=~s/(\.gif|\.jpg)$/\.eps/i;
+		  #where can we find the picture?
+		  if (-e $newsrc) {
+                      #eps counterpart for image exist 
+		      if ($path) {
+			  $currentstring .= '\vskip 1 mm \noindent\graphicspath{{'.$path.'}}\fbox{\includegraphics[width='.$width_param.' mm]{'.$file.'}} ';
 		      }
-		  }
-		  if ($signal_eps) {
-		      my $eps_file = &Apache::lonnet::getfile($localfile);
 		  } else {
-		      $localfile = $src;
-		      $localfile =~ s/.*(\/res)/$1/;	
-		      my $as = &Apache::lonnet::getfile($src);		      
-		  }
-	      }
-	      my $file;
-	      my $path;	
-              if ($src =~ m!(.*)/([^/]*)$!) {
-		  $file = $2;
-		  $path = $1.'/'; 
-	      }
-	      my $newsrc = $src;
-	      $newsrc =~ s/(\.gif|\.jpg)$/\.eps/i;
-	      $file=~s/(\.gif|\.jpg)$/\.eps/i;
-              #do we have any specified size of the picture?
-	      my $TeXwidth = &Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval); 
-              my $TeXheight = &Apache::lonxml::get_param('TeXheight',$parstack,$safeeval); 
-	      my $width = &Apache::lonxml::get_param('width',$parstack,$safeeval);
-	      if ($TeXwidth ne '') { 
-		  $width_param = $TeXwidth; 
-	      } elsif ($TeXheight ne '') { 
-		  $width_param = $TeXheight/$height_param*$width_param;
-	      } elsif ($width ne '') {
-		  $width_param = $width*$scaling;      
-	      }
-              #where can we find the picture?
-	      if (-e $newsrc) {
-		  if ($path) {
-		      $currentstring .= '\noindent\graphicspath{{'.$path.'}}\fbox{\includegraphics[width='.$width_param.' mm]{'.$file.'}} ';
+                      #there is no eps counterpart for image - check for ps one
+		      $newsrc =~ s/\.eps$/\.ps/;
+		      if (-e $newsrc) {
+			  #ps counterpart for image exist 
+			  $file =~ s/\.eps$/\.ps/;
+			  if ($path) {
+			      $currentstring .= '\vskip 1 mm \noindent\graphicspath{{'.$path.'}}\fbox{\includegraphics[width='.$width_param.' mm]{'.$file.'}} ';
+			  }
+		      } else {
+			  #there aren't eps or ps - so create eps 
+			  my $temp_file;
+			  my $filename = "/home/httpd/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_printout.dat";
+			  $temp_file = Apache::File->new('>>'.$filename); 
+			  print $temp_file "$src\n";
+			  $currentstring .= '\vskip 1 mm \graphicspath{{/home/httpd/prtspool/}}\fbox{\includegraphics[width='.$width_param.' mm]{'.$file.'}} ';
+		      }
 		  }
 	      } else {
-		  my $temp_file;
-		  my $filename = "/home/httpd/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_printout.dat";
-		  $temp_file = Apache::File->new('>>'.$filename); 
-		  print $temp_file "$src\n";
-		  $currentstring .= '\graphicspath{{/home/httpd/prtspool/}}\fbox{\includegraphics[width='.$width_param.' mm]{'.$file.'}} ';
+		  #original image file doesn't exist so check the alt attribute
+		  my $alt = &Apache::lonxml::get_param('alt',$parstack,$safeeval);
+                  if ($alt) {
+		      $currentstring .= ' '.$alt.' ';
+		  } else {
+                     #<allow> tag will care about replication 
+		  }
 	      }
 	    }
 	    return $currentstring;
@@ -1685,16 +1714,14 @@ sub start_embed {
 	    } 
 	   return $currentstring;
 	}
-
 #-- <allow> tag
-
         sub start_allow {
-	    my ($target,$token) = @_;
-
+	    my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	  
             $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=   
                                         $token->[2]->{'src'};
-
-	   return '';
+	    my $src = &Apache::lonxml::get_param('src',$parstack,$safeeval);
+	    &image_replication($src);
+	    return '';
 	}
         sub end_allow {
 	   return '';
@@ -1795,6 +1822,719 @@ sub start_embed {
 	    }
            return $currentstring;
 	}
+#-- <abbr> tag
+      sub start_abbr {
+	    my ($target,$token) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+              $currentstring = $token->[4];     
+	    } 
+	   return $currentstring;
+	}
+        sub end_abbr {
+	    my ($target,$token) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+              $currentstring = $token->[2];    
+            } 
+	   return $currentstring;
+	}
+#-- <acronym> tag
+      sub start_acronym {
+	    my ($target,$token) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+              $currentstring = $token->[4];     
+	    } 
+	   return $currentstring;
+	}
+        sub end_acronym {
+	    my ($target,$token) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+              $currentstring = $token->[2];    
+            } 
+	   return $currentstring;
+	}
+#-- <area> tag
+      sub start_area {
+	    my ($target,$token) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+              $currentstring = $token->[4];     
+	    } 
+	   return $currentstring;
+	}
+        sub end_area {
+	    my ($target,$token) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+              $currentstring = $token->[2];    
+            } 
+	   return $currentstring;
+	}
+#-- <base> tag
+      sub start_base {
+	    my ($target,$token) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+              $currentstring = $token->[4];     
+	    } 
+	   return $currentstring;
+	}
+        sub end_base {
+	    my ($target,$token) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+              $currentstring = $token->[2];    
+            } 
+	   return $currentstring;
+	}
+#-- <bdo> tag
+      sub start_bdo {
+	    my ($target,$token) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+              $currentstring = $token->[4];     
+	    } 
+	   return $currentstring;
+	}
+        sub end_bdo {
+	    my ($target,$token) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+              $currentstring = $token->[2];    
+            } 
+	   return $currentstring;
+	}
+#-- <bgsound> tag
+      sub start_bgsound {
+	    my ($target,$token) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+              $currentstring = $token->[4];     
+	    } 
+	   return $currentstring;
+	}
+        sub end_bgsound {
+	    my ($target,$token) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+              $currentstring = $token->[2];    
+            } 
+	   return $currentstring;
+	}
+#-- <blink> tag
+      sub start_blink {
+	    my ($target,$token) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+              $currentstring = $token->[4];     
+	    } 
+	   return $currentstring;
+	}
+        sub end_blink {
+	    my ($target,$token) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+              $currentstring = $token->[2];    
+            } 
+	   return $currentstring;
+	}
+#-- <blockquote> tag
+      sub start_blockquote {
+	    my ($target,$token) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+              $currentstring = $token->[4];     
+	    } 
+	   return $currentstring;
+	}
+        sub end_blockquote {
+	    my ($target,$token) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+              $currentstring = $token->[2];    
+            } 
+	   return $currentstring;
+	}
+#-- <button> tag
+      sub start_button {
+	    my ($target,$token) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+              $currentstring = $token->[4];     
+	    } 
+	   return $currentstring;
+	}
+        sub end_button {
+	    my ($target,$token) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+              $currentstring = $token->[2];    
+            } 
+	   return $currentstring;
+	}
+#-- <caption> tag
+      sub start_caption {
+	    my ($target,$token) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+              $currentstring = $token->[4];     
+	    } 
+	   return $currentstring;
+	}
+        sub end_caption {
+	    my ($target,$token) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+              $currentstring = $token->[2];    
+            } 
+	   return $currentstring;
+	}
+#-- <col> tag
+      sub start_col {
+	    my ($target,$token) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+              $currentstring = $token->[4];     
+	    } 
+	   return $currentstring;
+	}
+        sub end_col {
+	    my ($target,$token) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+              $currentstring = $token->[2];    
+            } 
+	   return $currentstring;
+	}
+#-- <colgroup> tag
+      sub start_colgroup {
+	    my ($target,$token) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+              $currentstring = $token->[4];     
+	    } 
+	   return $currentstring;
+	}
+        sub end_colgroup {
+	    my ($target,$token) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+              $currentstring = $token->[2];    
+            } 
+	   return $currentstring;
+	}
+#-- <del> tag
+      sub start_del {
+	    my ($target,$token) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+              $currentstring = $token->[4];     
+	    } 
+	   return $currentstring;
+	}
+        sub end_del {
+	    my ($target,$token) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+              $currentstring = $token->[2];    
+            } 
+	   return $currentstring;
+	}
+#-- <fieldset> tag
+      sub start_fieldset {
+	    my ($target,$token) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+              $currentstring = $token->[4];     
+	    } 
+	   return $currentstring;
+	}
+        sub end_fieldset {
+	    my ($target,$token) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+              $currentstring = $token->[2];    
+            } 
+	   return $currentstring;
+	}
+#-- <frame> tag
+      sub start_frame {
+	    my ($target,$token) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+              $currentstring = $token->[4];     
+	    } 
+	   return $currentstring;
+	}
+        sub end_frame {
+	    my ($target,$token) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+              $currentstring = $token->[2];    
+            } 
+	   return $currentstring;
+	}
+#-- <iframe> tag
+      sub start_iframe {
+	    my ($target,$token) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+              $currentstring = $token->[4];     
+	    } 
+	   return $currentstring;
+	}
+        sub end_iframe {
+	    my ($target,$token) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+              $currentstring = $token->[2];    
+            } 
+	   return $currentstring;
+	}
+#-- <ins> tag
+      sub start_ins {
+	    my ($target,$token) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+              $currentstring = $token->[4];     
+	    } 
+	   return $currentstring;
+	}
+        sub end_ins {
+	    my ($target,$token) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+              $currentstring = $token->[2];    
+            } 
+	   return $currentstring;
+	}
+#-- <isindex> tag
+      sub start_isindex {
+	    my ($target,$token) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+              $currentstring = $token->[4];     
+	    } 
+	   return $currentstring;
+	}
+        sub end_isindex {
+	    my ($target,$token) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+              $currentstring = $token->[2];    
+            } 
+	   return $currentstring;
+	}
+#-- <keygen> tag
+      sub start_keygen {
+	    my ($target,$token) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+              $currentstring = $token->[4];     
+	    } 
+	   return $currentstring;
+	}
+        sub end_keygen {
+	    my ($target,$token) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+              $currentstring = $token->[2];    
+            } 
+	   return $currentstring;
+	}
+#-- <label> tag
+      sub start_label {
+	    my ($target,$token) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+              $currentstring = $token->[4];     
+	    } 
+	   return $currentstring;
+	}
+        sub end_label {
+	    my ($target,$token) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+              $currentstring = $token->[2];    
+            } 
+	   return $currentstring;
+	}
+#-- <layer> tag
+      sub start_layer {
+	    my ($target,$token) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+              $currentstring = $token->[4];     
+	    } 
+	   return $currentstring;
+	}
+        sub end_layer {
+	    my ($target,$token) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+              $currentstring = $token->[2];    
+            } 
+	   return $currentstring;
+	}
+#-- <legend> tag
+      sub start_legend {
+	    my ($target,$token) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+              $currentstring = $token->[4];     
+	    } 
+	   return $currentstring;
+	}
+        sub end_legend {
+	    my ($target,$token) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+              $currentstring = $token->[2];    
+            } 
+	   return $currentstring;
+	}
+#-- <link> tag
+      sub start_link {
+	    my ($target,$token) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+              $currentstring = $token->[4];     
+	    } 
+	   return $currentstring;
+	}
+        sub end_link {
+	    my ($target,$token) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+              $currentstring = $token->[2];    
+            } 
+	   return $currentstring;
+	}
+#-- <marquee> tag
+      sub start_marquee {
+	    my ($target,$token) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+              $currentstring = $token->[4];     
+	    } 
+	   return $currentstring;
+	}
+        sub end_marquee {
+	    my ($target,$token) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+              $currentstring = $token->[2];    
+            } 
+	   return $currentstring;
+	}
+#-- <malticol> tag
+      sub start_malticol {
+	    my ($target,$token) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+              $currentstring = $token->[4];     
+	    } 
+	   return $currentstring;
+	}
+        sub end_malticol {
+	    my ($target,$token) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+              $currentstring = $token->[2];    
+            } 
+	   return $currentstring;
+	}
+#-- <nobr> tag
+      sub start_nobr {
+	    my ($target,$token) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+              $currentstring = $token->[4];     
+	    } 
+	   return $currentstring;
+	}
+        sub end_nobr {
+	    my ($target,$token) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+              $currentstring = $token->[2];    
+            } 
+	   return $currentstring;
+	}
+#-- <noembed> tag
+      sub start_noembed {
+	    my ($target,$token) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+              $currentstring = $token->[4];     
+	    } 
+	   return $currentstring;
+	}
+        sub end_noembed {
+	    my ($target,$token) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+              $currentstring = $token->[2];    
+            } 
+	   return $currentstring;
+	}
+#-- <noframes> tag
+      sub start_noframes {
+	    my ($target,$token) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+              $currentstring = $token->[4];     
+	    } 
+	   return $currentstring;
+	}
+        sub end_noframes {
+	    my ($target,$token) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+              $currentstring = $token->[2];    
+            } 
+	   return $currentstring;
+	}
+#-- <nolayer> tag
+      sub start_nolayer {
+	    my ($target,$token) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+              $currentstring = $token->[4];     
+	    } 
+	   return $currentstring;
+	}
+        sub end_nolayer {
+	    my ($target,$token) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+              $currentstring = $token->[2];    
+            } 
+	   return $currentstring;
+	}
+#-- <noscript> tag
+      sub start_noscript {
+	    my ($target,$token) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+              $currentstring = $token->[4];     
+	    } 
+	   return $currentstring;
+	}
+        sub end_noscript {
+	    my ($target,$token) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+              $currentstring = $token->[2];    
+            } 
+	   return $currentstring;
+	}
+#-- <object> tag
+      sub start_object {
+	    my ($target,$token) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+              $currentstring = $token->[4];     
+	    } 
+	   return $currentstring;
+	}
+        sub end_object {
+	    my ($target,$token) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+              $currentstring = $token->[2];    
+            } 
+	   return $currentstring;
+	}
+#-- <optgroup> tag
+      sub start_optgroup {
+	    my ($target,$token) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+              $currentstring = $token->[4];     
+	    } 
+	   return $currentstring;
+	}
+        sub end_optgroup {
+	    my ($target,$token) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+              $currentstring = $token->[2];    
+            } 
+	   return $currentstring;
+	}
+#-- <samp> tag
+      sub start_samp {
+	    my ($target,$token) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+              $currentstring = $token->[4];     
+	    } 
+	   return $currentstring;
+	}
+        sub end_samp {
+	    my ($target,$token) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+              $currentstring = $token->[2];    
+            } 
+	   return $currentstring;
+	}
+#-- <server> tag
+      sub start_server {
+	    my ($target,$token) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+              $currentstring = $token->[4];     
+	    } 
+	   return $currentstring;
+	}
+        sub end_server {
+	    my ($target,$token) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+              $currentstring = $token->[2];    
+            } 
+	   return $currentstring;
+	}
+#-- <spacer> tag
+      sub start_spacer {
+	    my ($target,$token) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+              $currentstring = $token->[4];     
+	    } 
+	   return $currentstring;
+	}
+        sub end_spacer {
+	    my ($target,$token) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+              $currentstring = $token->[2];    
+            } 
+	   return $currentstring;
+	}
+#-- <span> tag
+      sub start_span {
+	    my ($target,$token) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+              $currentstring = $token->[4];     
+	    } 
+	   return $currentstring;
+	}
+        sub end_span {
+	    my ($target,$token) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+              $currentstring = $token->[2];    
+            } 
+	   return $currentstring;
+	}
+#-- <tbody> tag
+      sub start_tbody {
+	    my ($target,$token) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+              $currentstring = $token->[4];     
+	    } 
+	   return $currentstring;
+	}
+        sub end_tbody {
+	    my ($target,$token) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+              $currentstring = $token->[2];    
+            } 
+	   return $currentstring;
+	}
+#-- <tfoot> tag
+      sub start_tfoot {
+	    my ($target,$token) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+              $currentstring = $token->[4];     
+	    } 
+	   return $currentstring;
+	}
+        sub end_tfoot {
+	    my ($target,$token) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+              $currentstring = $token->[2];    
+            } 
+	   return $currentstring;
+	}
+#-- <thead> tag
+      sub start_thead {
+	    my ($target,$token) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+              $currentstring = $token->[4];     
+	    } 
+	   return $currentstring;
+	}
+        sub end_thead {
+	    my ($target,$token) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+              $currentstring = $token->[2];    
+            } 
+	   return $currentstring;
+	}
+#-- <var> tag
+      sub start_var {
+	    my ($target,$token) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+              $currentstring = $token->[4];     
+	    } 
+	   return $currentstring;
+	}
+        sub end_var {
+	    my ($target,$token) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+              $currentstring = $token->[2];    
+            } 
+	   return $currentstring;
+	}
+#-- <wbr> tag
+      sub start_wbr {
+	    my ($target,$token) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+              $currentstring = $token->[4];     
+	    } 
+	   return $currentstring;
+	}
+        sub end_wbr {
+	    my ($target,$token) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+              $currentstring = $token->[2];    
+            } 
+	   return $currentstring;
+	}
+
+sub image_replication {
+    my $src = shift;
+    if (not -e '/home/httpd/html'.$src) {
+	#replicates image itself
+	&Apache::lonnet::repcopy('/home/httpd/html'.$src);
+	#replicates eps or ps 
+	my $newsrc = $src;
+	$newsrc =~ s/(.gif|.jpg)$/.eps/;
+	if (not-e $newsrc && &Apache::lonnet::repcopy('/home/httpd/html'.$newsrc) ne 'OK') {
+	    $newsrc =~ s/\.ps$/\.eps/;
+	    &Apache::lonnet::repcopy('/home/httpd/html'.$newsrc);
+	}
+    }
+    return '';
+}
 
 1;
 __END__