Diff for /loncom/xml/londefdef.pm between versions 1.166 and 1.262

version 1.166, 2003/08/26 14:40:03 version 1.262, 2005/03/15 11:20:49
Line 36 Line 36
 # The C source of the Code may not be distributed by the Licensee  # The C source of the Code may not be distributed by the Licensee
 # to any other parties under any circumstances.  # to any other parties under any circumstances.
 #  #
 #  
 # last modified 06/26/00 by Alexander Sakharuk  
 # 11/6,11/30,02/01/01,5/4 Gerd Kortemeyer  
 # 01/18 Alex Sakharuk  
   
 package Apache::londefdef;   package Apache::londefdef; 
   
Line 50  use Apache::File(); Line 46  use Apache::File();
 use Image::Magick;  use Image::Magick;
 use Apache::lonmenu();  use Apache::lonmenu();
 use Apache::lonmeta();  use Apache::lonmeta();
   use Apache::Constants qw(:common);
   
 $Apache::londefdef::TD_redirection=0;  
   
 BEGIN {  BEGIN {
   
Line 59  BEGIN { Line 55  BEGIN {
   
 }  }
   
   sub initialize_londefdef {
       $Apache::londefdef::TD_redirection=0;
       @Apache::londefdef::table = ();
       $Apache::londefdef::select=0;
       undef(@Apache::londefdef::description);
       @Apache::londefdef::DD=(0);
       @Apache::londefdef::DT=(0);
       @Apache::londefdef::seenDT=(0);
       $Apache::londefdef::list_index=0;
   }
   
 #======================= TAG SUBROUTINES =====================  #======================= TAG SUBROUTINES =====================
 #-- <output>  #-- <output>
 sub start_output {  sub start_output {
Line 73  sub end_output { Line 80  sub end_output {
 }  }
 #-- <m> tag  #-- <m> tag
 sub start_m {  sub start_m {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_;
     my $currentstring = '';      my $currentstring = '';
     if ($target eq 'web') {      my $inside = &Apache::lonxml::get_all_text_unbalanced("/m",$parser);
  $Apache::lonxml::prevent_entity_encode++;      if ($target eq 'web' || $target eq 'analyze') {
  my $inside = &Apache::lonxml::get_all_text_unbalanced("/m",$parser);  
  $inside ='\\documentstyle{article}'.$inside;  
  &Apache::lonxml::debug("M is starting with:$inside:");   &Apache::lonxml::debug("M is starting with:$inside:");
  my $eval=&Apache::lonxml::get_param('eval',$parstack,$safeeval);   my $eval=&Apache::lonxml::get_param('eval',$parstack,$safeeval);
  if ($eval eq 'on') {   if ($eval eq 'on') {
Line 92  sub start_m { Line 97  sub start_m {
     $Apache::lontexconvert::errorstring='';      $Apache::lontexconvert::errorstring='';
  }   }
  #&Apache::lonxml::debug("M is ends with:$currentstring:");   #&Apache::lonxml::debug("M is ends with:$currentstring:");
    $Apache::lonxml::post_evaluate=0;
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  $currentstring = &Apache::lonxml::get_all_text_unbalanced("/m",$parser);   $currentstring = $inside;
    my $eval=&Apache::lonxml::get_param('eval',$parstack,$safeeval);
    if ($eval eq 'on') {
       $currentstring=&Apache::run::evaluate($currentstring,$safeeval,$$parstack[-1]);
    }
  if ($currentstring=~/^(\s*\\\\\s*)*$/) {$currentstring = ' \vskip 0 mm ';}   if ($currentstring=~/^(\s*\\\\\s*)*$/) {$currentstring = ' \vskip 0 mm ';}
     } else {   # detect simple math mode entry exits, and convert them
  my $inside = &Apache::lonxml::get_all_text_unbalanced("/m",$parser);          # to use \ensuremath
    if ($currentstring=~/^\s*\$[^\$].*[^\$]\$\s*$/) {
       $currentstring=~s/^\$//;
       $currentstring=~s/\$$//;
       $currentstring='\ensuremath{'.$currentstring.'}';
    }
    $Apache::lonxml::post_evaluate=0;
     }      }
     return $currentstring;      return $currentstring;
 }  }
Line 104  sub start_m { Line 120  sub start_m {
 sub end_m {  sub end_m {
     my ($target,$token) = @_;      my ($target,$token) = @_;
     my $currentstring = '';      my $currentstring = '';
     if ($target eq 'web') {      if ($target eq 'tex') {
  $Apache::lonxml::prevent_entity_encode--;  
     } elsif ($target eq 'tex') {  
  $currentstring = "";   $currentstring = "";
     } elsif ($target eq 'meta') {  
     }      }
     return $currentstring;      return $currentstring;
 }  }
Line 134  sub end_tthoption { Line 147  sub end_tthoption {
     return $result;      return $result;
 }  }
   
 #-- <html> tag      #-- <html> tag (end tag optional)
 sub start_html {  sub start_html {
     my ($target,$token) = @_;      my ($target,$token) = @_;
     my $currentstring = '';      my $currentstring = '';
     if ($ENV{'browser.mathml'}) {      my $options=$ENV{'course.'.$ENV{'request.course.id'}.'.tthoptions'};
  &tth::ttminit();      &Apache::lontexconvert::init_tth();
  if ($ENV{'browser.unicode'}) {      if ($target eq 'web' || $target eq 'edit') {
     &tth::ttmoptions('-L -u1');   $currentstring = &Apache::lonxml::xmlbegin();
  } else {  
     &tth::ttmoptions('-L -u0');  
  }  
     } else {  
  &tth::tthinit();  
  if ($ENV{'browser.unicode'}) {  
     &tth::tthoptions('-L -u1');  
  } else {  
     &tth::tthoptions('-L -u0');  
  }  
     }  
     if ($target eq 'web') {  
  $currentstring = &Apache::lonxml::xmlbegin().  
     &Apache::lonxml::fontsettings();       
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  @Apache::londefdef::table = ();   @Apache::londefdef::table = ();
  $currentstring .= '\documentclass[letterpaper]{article}';   $currentstring .= '\documentclass[letterpaper]{article}';
  if ($ENV{'form.latex_type'}=~'batchmode') {$currentstring .='\batchmode';}    if (($ENV{'form.latex_type'}=~'batchmode') ||
  $currentstring .= '\newcommand{\keephidden}[1]{}              (!$ENV{'request.role.adv'})) {$currentstring .='\batchmode';} 
                            \renewcommand{\deg}{$^{\circ}$}   $currentstring .= '\newcommand{\keephidden}[1]{}'.
                            \usepackage{longtable}                            '\renewcommand{\deg}{$^{\circ}$}'.
                            \usepackage{textcomp}                            '\usepackage{longtable}'.
                            \usepackage{makeidx}                            '\usepackage{textcomp}'.
                            \usepackage[dvips]{graphicx}                            '\usepackage{makeidx}'.
                            \usepackage{epsfig}\usepackage{calc}                            '\usepackage[dvips]{graphicx}'.
 \newenvironment{choicelist}{\begin{list}{}{\setlength{\rightmargin}{0in}\setlength{\leftmargin}{0.13in}\setlength{\topsep}{0.05in}\setlength{\itemsep}{0.022in}\setlength{\parsep}{0in}\setlength{\belowdisplayskip}{0.04in}\setlength{\abovedisplayskip}{0.05in}\setlength{\abovedisplayshortskip}{-0.04in}\setlength{\belowdisplayshortskip}{0.04in}}}{\end{list}}    '\usepackage{picins}'.
 \renewenvironment{theindex}{\begin{list}{}{{\vskip 1mm \noindent \large\textbf{Index}} \newline \setlength{\rightmargin}{0in}\setlength{\leftmargin}{0.13in}\setlength{\topsep}{0.01in}\setlength{\itemsep}{0.1in}\setlength{\parsep}{-0.02in}\setlength{\belowdisplayskip}{0.01in}\setlength{\abovedisplayskip}{0.01in}\setlength{\abovedisplayshortskip}{-0.04in}\setlength{\belowdisplayshortskip}{0.01in}}}{\end{list}}';                            '\usepackage{epsfig}'.
                             '\usepackage{calc}'.
                             '\usepackage{amsmath}'.
                             '\usepackage{amssymb}'.
                             '\usepackage{amsfonts}'.
                             '\usepackage{amsthm}'.
                             '\usepackage{amscd}'.
                             '\newenvironment{choicelist}{\begin{list}{}{\setlength{\rightmargin}{0in}\setlength{\leftmargin}{0.13in}\setlength{\topsep}{0.05in}\setlength{\itemsep}{0.022in}\setlength{\parsep}{0in}\setlength{\belowdisplayskip}{0.04in}\setlength{\abovedisplayskip}{0.05in}\setlength{\abovedisplayshortskip}{-0.04in}\setlength{\belowdisplayshortskip}{0.04in}}}{\end{list}}'.
                             '\renewenvironment{theindex}{\begin{list}{}{{\vskip 1mm \noindent \large\textbf{Index}} \newline \setlength{\rightmargin}{0in}\setlength{\leftmargin}{0.13in}\setlength{\topsep}{0.01in}\setlength{\itemsep}{0.1in}\setlength{\parsep}{-0.02in}\setlength{\belowdisplayskip}{0.01in}\setlength{\abovedisplayskip}{0.01in}\setlength{\abovedisplayshortskip}{-0.04in}\setlength{\belowdisplayshortskip}{0.01in}}}{\end{list}}';
     }      }
     return $currentstring;      return $currentstring;
 }  }
   
 sub end_html {  sub end_html {
     my ($target,$token) = @_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring = '';      my $currentstring = '';
     if ($target eq 'web') {      if ($target eq 'web') {
  $currentstring = &Apache::lonxml::xmlend();   $currentstring = '</html>';
     }      }
     return $currentstring;      return $currentstring;
 }  }
   
 #-- <head> tag  #-- <head> tag (end tag optional)
 sub start_head {  sub start_head {
     my ($target,$token) = @_;      my ($target,$token) = @_;
     my $currentstring = '';      my $currentstring = '';
     if ($target eq 'web') {      if ($target eq 'web') {
  $currentstring = $token->[4];        $currentstring = $token->[4].&Apache::lonxml::fontsettings();
     }       } 
     return $currentstring;      return $currentstring;
 }  }
Line 195  sub start_head { Line 202  sub start_head {
 sub end_head {  sub end_head {
     my ($target,$token) = @_;      my ($target,$token) = @_;
     my $currentstring = '';      my $currentstring = '';
     if ($target eq 'web') {      if ($target eq 'web' && $ENV{'request.state'} eq 'published') {
  $currentstring = &Apache::lonmenu::registerurl(undef,$target).   $currentstring = &Apache::lonmenu::registerurl(undef,$target).
     $token->[2];          $token->[2];    
     }       } 
     return $currentstring;      return $currentstring;
 }  }
   
 #-- <map> tag  #-- <map> tag (end tag required)
 sub start_map {  sub start_map {
     my ($target,$token) = @_;      my ($target,$token) = @_;
     my $currentstring = '';      my $currentstring = '';
Line 221  sub end_map { Line 228  sub end_map {
     return $currentstring;      return $currentstring;
 }  }
   
 #-- <select> tag  #-- <select> tag (end tag required)
 sub start_select {  sub start_select {
     my ($target,$token) = @_;      my ($target,$token) = @_;
     my $currentstring = '';      my $currentstring = '';
     if ($target eq 'web') {      if ($target eq 'web') {
  $currentstring = $token->[4];        $currentstring = $token->[4];     
     }       }  elsif ($target eq 'tex') {
    $Apache::londefdef::select=0;
       }
     return $currentstring;      return $currentstring;
 }  }
   
Line 240  sub end_select { Line 249  sub end_select {
     return $currentstring;      return $currentstring;
 }  }
   
 #-- <option> tag  #-- <option> tag (end tag optional)
 sub start_option {  sub start_option {
     my ($target,$token) = @_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring = '';      my $currentstring = '';
     if ($target eq 'web') {      if ($target eq 'web') {
  $currentstring = $token->[4];        $currentstring = $token->[4];     
     }       } elsif ($target eq 'tex') {
    $Apache::londefdef::select++;
    if ($Apache::londefdef::select == 1) {
       $currentstring='\noindent\fbox{'.&Apache::lonxml::get_param('value',$parstack,$safeeval).'}\keephidden{';
    } else {
       $currentstring='\keephidden{';
    }
       }
     return $currentstring;      return $currentstring;
 }  }
   
Line 255  sub end_option { Line 271  sub end_option {
     my $currentstring = '';      my $currentstring = '';
     if ($target eq 'web') {      if ($target eq 'web') {
  $currentstring = $token->[2];       $currentstring = $token->[2];    
     }       }  elsif ($target eq 'tex') {
    $currentstring='}';
       }
     return $currentstring;      return $currentstring;
 }  }
   
 #-- <input> tag  #-- <input> tag (end tag forbidden)
 sub start_input {  sub start_input {
     my ($target,$token) = @_;      my ($target,$token) = @_;
     my $currentstring = '';      my $currentstring = '';
Line 278  sub end_input { Line 296  sub end_input {
     return $currentstring;      return $currentstring;
 }  }
   
 #-- <textarea> tag  #-- <textarea> tag (end tag required)
 sub start_textarea {  sub start_textarea {
     my ($target,$token) = @_;      my ($target,$token) = @_;
     my $currentstring = '';      my $currentstring = '';
Line 297  sub end_textarea { Line 315  sub end_textarea {
     return $currentstring;      return $currentstring;
 }  }
   
 #-- <form> tag  #-- <form> tag (end tag required)
 sub start_form {  sub start_form {
     my ($target,$token) = @_;      my ($target,$token) = @_;
     my $currentstring = '';      my $currentstring = '';
Line 316  sub end_form { Line 334  sub end_form {
     return $currentstring;      return $currentstring;
 }  }
   
 #-- <title> tag  #-- <title> tag (end tag required)
 sub start_title {  sub start_title {
     my ($target,$token) = @_;      my ($target,$token) = @_;
     my $currentstring = '';      my $currentstring = '';
Line 327  sub start_title { Line 345  sub start_title {
     }      }
     if ($target eq 'meta') {      if ($target eq 'meta') {
  $currentstring='<title>';   $currentstring='<title>';
  &start_output();   &start_output($target);
     }      }
     return $currentstring;      return $currentstring;
 }  }
Line 341  sub end_title { Line 359  sub end_title {
  $currentstring .= '}';   $currentstring .= '}';
     }        }  
     if ($target eq 'meta') {      if ($target eq 'meta') {
  &end_output();   &end_output($target);
  $currentstring='</title>';   $currentstring='</title>';
     }       } 
     return $currentstring;      return $currentstring;
 }  }
   
 #-- <meta> tag  #-- <meta> tag (end tag forbidden)
 sub start_meta {  sub start_meta {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring = '';      my $currentstring = '';
Line 382  sub start_meta { Line 400  sub start_meta {
             my $display=&Apache::lonxml::get_param              my $display=&Apache::lonxml::get_param
  ('display',$parstack,$safeeval,undef,1);   ('display',$parstack,$safeeval,undef,1);
             if ($display) {              if ($display) {
  $display=&HTML::Entities::encode($display);   $display=&HTML::Entities::encode($display,'<>&"');
  $currentstring.='<'.$name.'.display>'.$display.   $currentstring.='<'.$name.'.display>'.$display.
                                '</'.$name.'.display>';                                 '</'.$name.'.display>';
             }              }
Line 410  sub end_meta { Line 428  sub end_meta {
  my $content=&Apache::lonxml::get_param('content',$parstack,$safeeval);   my $content=&Apache::lonxml::get_param('content',$parstack,$safeeval);
  my $name=&Apache::lonxml::get_param('name',$parstack,$safeeval);   my $name=&Apache::lonxml::get_param('name',$parstack,$safeeval);
  if ((not defined $content) && (not defined $name)) {   if ((not defined $content) && (not defined $name)) {
     &Apache::lonxml::startredirection();      &Apache::lonxml::endredirection();
  }   }
     }      }
     return $currentstring;      return $currentstring;
Line 461  sub end_accessrule { Line 479  sub end_accessrule {
     return $currentstring;      return $currentstring;
 }  }
   
 #-- <body> tag  #-- <body> tag (end tag required)
 sub start_body {  sub start_body {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring = '';      my $currentstring = '';
   
     if ($target eq 'web') {      if ($target eq 'web') {
  if (!$Apache::lonxml::registered) {   if ($Apache::lonhomework::parsing_a_problem) {
       &Apache::lonxml::warning("<body> tag found inside of <problem> tag this can cause problems.");
       return '';
    }
    if (!$Apache::lonxml::registered && 
       $ENV{'request.state'} eq 'published') {
     $currentstring.='<head>'.      $currentstring.='<head>'.
  &Apache::lonmenu::registerurl(undef,$target).'</head>';   &Apache::lonmenu::registerurl(undef,$target).'</head>';
  }   }
Line 511  sub start_body { Line 535  sub start_body {
  $token->[2]->{'onunload'}=&Apache::lonmenu::unloadevents().   $token->[2]->{'onunload'}=&Apache::lonmenu::unloadevents().
     ';'.$onUnload;      ';'.$onUnload;
   
  $currentstring .= '<'.$token->[1];   if ($ENV{'request.state'} ne 'construct') {
       $currentstring .= '<'.$token->[1];
    }
  foreach (keys %{$token->[2]}) {   foreach (keys %{$token->[2]}) {
     $currentstring.=' '.$_.'="'.$token->[2]->{$_}.'"';      $currentstring.=' '.$_.'="'.$token->[2]->{$_}.'"';
  }   }
  $currentstring.='>';   if ($ENV{'request.state'} ne 'construct') {
       $currentstring.='>';
    }
  if ($ENV{'request.state'} ne 'published') {   if ($ENV{'request.state'} ne 'published') {
       my $remote=($ENV{'environment.remote'} ne 'off');
       $currentstring=&Apache::loncommon::bodytag(undef,undef,
          $currentstring,$remote);
     $currentstring.=(<<EDITBUTTON);      $currentstring.=(<<EDITBUTTON);
  <form method="post">   <form method="post">
  <input type="submit" name="editmode" value="Edit" />   <input type="submit" name="editmode" accesskey="e" value="Edit" />
  </form>   </form>
 EDITBUTTON  EDITBUTTON
  } else {   } else {
     $currentstring.=&Apache::lonmenu::menubuttons(undef,$target,1);      $currentstring.=&Apache::lonmenu::menubuttons(undef,$target,1);
  }   }
    $currentstring.=&Apache::lonxml::message_location();
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  $currentstring = '\begin{document}';     $currentstring = '\begin{document}';  
     }       } 
Line 532  EDITBUTTON Line 564  EDITBUTTON
 }  }
   
 sub end_body {  sub end_body {
     my ($target,$token) = @_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring = '';      my $currentstring = '';
     if ($target eq 'web') {      if ($target eq 'web') {
  $currentstring = $token->[2];        $currentstring = &Apache::lonxml::xmlend($target,$parser);
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  $currentstring = '\end{document}';     $currentstring = '\strut\newline\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}\newline\noindent \end{document}';  
     }       } 
     return $currentstring;      return $currentstring;
 }  }
   
 #-- <center> tag  #-- <center> tag (end tag required)
 sub start_center {  sub start_center {
     my ($target,$token) = @_;      my ($target,$token) = @_;
     my $currentstring = '';      my $currentstring = '';
Line 565  sub end_center { Line 597  sub end_center {
     return $currentstring;      return $currentstring;
 }  }
   
 #-- <b> tag  #-- <b> tag (end tag required)
 sub start_b {  sub start_b {
     my ($target,$token) = @_;      my ($target,$token) = @_;
     my $currentstring = '';      my $currentstring = '';
Line 588  sub end_b { Line 620  sub end_b {
     return $currentstring;      return $currentstring;
 }  }
   
 #-- <strong> tag  #-- <strong> tag (end tag required)
 sub start_strong {  sub start_strong {
     my ($target,$token) = @_;      my ($target,$token) = @_;
     my $currentstring = '';      my $currentstring = '';
Line 603  sub start_strong { Line 635  sub start_strong {
 sub end_strong {  sub end_strong {
     my ($target,$token) = @_;      my ($target,$token) = @_;
     my $currentstring = '';      my $currentstring = '';
     if ($target eq 'web') {      if ($target eq 'web') {
   
  $currentstring = $token->[2];        $currentstring = $token->[2];     
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  $currentstring = '}';     $currentstring = '}';  
Line 612  sub end_strong { Line 643  sub end_strong {
     return $currentstring;      return $currentstring;
 }  }
   
 #-- <h1> tag  #-- <h1> tag (end tag required)
 sub start_h1 {  sub start_h1 {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring = '';      my $currentstring = '';
Line 620  sub start_h1 { Line 651  sub start_h1 {
  $currentstring .= $token->[4];   $currentstring .= $token->[4];
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  my $pre;   my $pre;
  my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1);   my $align=lc(&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1));
  if (($align eq 'center') || (not defined $align)) {   if ($align eq 'center') {
     $pre='\begin{center}';      $pre='\begin{center}';
  } elsif ($align eq 'left') {   } elsif ($align eq 'left') {
     $pre='\rlap{';      $pre='\rlap{';
Line 633  sub start_h1 { Line 664  sub start_h1 {
  $currentstring .= $pre.'{\\'.$TeXsize.' \textbf{';    $currentstring .= $pre.'{\\'.$TeXsize.' \textbf{'; 
     } elsif ($target eq 'meta') {      } elsif ($target eq 'meta') {
  $currentstring='<subject>';   $currentstring='<subject>';
  &start_output();   &start_output($target);
     }      }
     return $currentstring;      return $currentstring;
 }  }
Line 644  sub end_h1 { Line 675  sub end_h1 {
     if ($target eq 'web') {      if ($target eq 'web') {
  $currentstring .= $token->[2];   $currentstring .= $token->[2];
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  my $post;   my $post='\vskip 0 mm ';
  my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1);   my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1);
  if (($align eq 'center') || (not defined $align)) {   if ($align eq 'center') {
     $post='\end{center}';      $post='\end{center}';
  } elsif ($align eq 'left') {   } elsif ($align eq 'left') {
     $post='} \hfill'.'\vskip 0 mm ';      $post='} \hfill'.'\vskip 0 mm ';
Line 655  sub end_h1 { Line 686  sub end_h1 {
  }   }
  $currentstring .= '}}'.$post;   $currentstring .= '}}'.$post;
     } elsif ($target eq 'meta') {      } elsif ($target eq 'meta') {
  &end_output();   &end_output($target);
  $currentstring='</subject>';   $currentstring='</subject>';
     }       } 
     return $currentstring;      return $currentstring;
Line 670  sub start_h2 { Line 701  sub start_h2 {
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  my $pre;   my $pre;
  my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1);   my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1);
  if (($align eq 'center') || (not defined $align)) {   if ($align eq 'center') {
     $pre='\begin{center}';      $pre='\begin{center}';
  } elsif ($align eq 'left') {   } elsif ($align eq 'left') {
     $pre='\rlap{';      $pre='\rlap{';
Line 690  sub end_h2 { Line 721  sub end_h2 {
     if ($target eq 'web') {      if ($target eq 'web') {
  $currentstring .= $token->[2];   $currentstring .= $token->[2];
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  my $post;   my $post='\vskip 0 mm ';
  my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1);   my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1);
  if (($align eq 'center') || (not defined $align)) {   if ($align eq 'center') {
     $post='\end{center}';      $post='\end{center}';
  } elsif ($align eq 'left') {   } elsif ($align eq 'left') {
     $post='} \hfill'.'\vskip 0 mm ';      $post='} \hfill'.'\vskip 0 mm ';
Line 713  sub start_h3 { Line 744  sub start_h3 {
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  my $pre;   my $pre;
  my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1);   my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1);
  if (($align eq 'center') || (not defined $align)) {   if ($align eq 'center') {
     $pre='\begin{center}';      $pre='\begin{center}';
  } elsif ($align eq 'left') {   } elsif ($align eq 'left') {
     $pre='\rlap{';      $pre='\rlap{';
Line 733  sub end_h3 { Line 764  sub end_h3 {
     if ($target eq 'web') {      if ($target eq 'web') {
  $currentstring .= $token->[2];   $currentstring .= $token->[2];
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  my $post;   my $post='\vskip 0 mm ';
  my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1);   my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1);
  if (($align eq 'center') || (not defined $align)) {   if ($align eq 'center') {
     $post='\end{center}';      $post='\end{center}';
  } elsif ($align eq 'left') {   } elsif ($align eq 'left') {
     $post='} \hfill'.'\vskip 0 mm ';      $post='} \hfill'.'\vskip 0 mm ';
Line 756  sub start_h4 { Line 787  sub start_h4 {
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  my $pre;   my $pre;
  my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1);   my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1);
  if (($align eq 'center') || (not defined $align)) {   if ($align eq 'center') {
     $pre='\begin{center}';      $pre='\begin{center}';
  } elsif ($align eq 'left') {   } elsif ($align eq 'left') {
     $pre='\rlap{';      $pre='\rlap{';
Line 776  sub end_h4 { Line 807  sub end_h4 {
     if ($target eq 'web') {      if ($target eq 'web') {
  $currentstring .= $token->[2];   $currentstring .= $token->[2];
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  my $post;   my $post='\vskip 0 mm ';
  my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1);   my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1);
  if (($align eq 'center') || (not defined $align)) {   if ($align eq 'center') {
     $post='\end{center}';      $post='\end{center}';
  } elsif ($align eq 'left') {   } elsif ($align eq 'left') {
     $post='} \hfill'.'\vskip 0 mm ';      $post='} \hfill'.'\vskip 0 mm ';
Line 799  sub start_h5 { Line 830  sub start_h5 {
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  my $pre;   my $pre;
  my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1);   my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1);
  if (($align eq 'center') || (not defined $align)) {   if ($align eq 'center') {
     $pre='\begin{center}';      $pre='\begin{center}';
  } elsif ($align eq 'left') {   } elsif ($align eq 'left') {
     $pre='\rlap{';      $pre='\rlap{';
Line 819  sub end_h5 { Line 850  sub end_h5 {
     if ($target eq 'web') {      if ($target eq 'web') {
  $currentstring .= $token->[2];   $currentstring .= $token->[2];
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  my $post;   my $post='\vskip 0 mm ';
  my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1);   my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1);
  if (($align eq 'center') || (not defined $align)) {   if ($align eq 'center') {
     $post='\end{center}';      $post='\end{center}';
  } elsif ($align eq 'left') {   } elsif ($align eq 'left') {
     $post='} \hfill'.'\vskip 0 mm ';      $post='} \hfill'.'\vskip 0 mm ';
Line 842  sub start_h6 { Line 873  sub start_h6 {
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  my $pre;   my $pre;
  my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1);   my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1);
  if (($align eq 'center') || (not defined $align)) {   if ($align eq 'center') {
     $pre='\begin{center}';      $pre='\begin{center}';
  } elsif ($align eq 'left') {   } elsif ($align eq 'left') {
     $pre='\rlap{';      $pre='\rlap{';
Line 862  sub end_h6 { Line 893  sub end_h6 {
     if ($target eq 'web') {      if ($target eq 'web') {
  $currentstring .= $token->[2];   $currentstring .= $token->[2];
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  my $post;   my $post='\vskip 0 mm ';
  my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1);   my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1);
  if (($align eq 'center') || (not defined $align)) {   if ($align eq 'center') {
     $post='\end{center}';      $post='\end{center}';
  } elsif ($align eq 'left') {   } elsif ($align eq 'left') {
     $post='} \hfill'.'\vskip 0 mm ';      $post='} \hfill'.'\vskip 0 mm ';
Line 876  sub end_h6 { Line 907  sub end_h6 {
     return $currentstring;      return $currentstring;
 }  }
   
 #--- <cite> tag  #--- <cite> tag (end tag required)
 sub start_cite {  sub start_cite {
     my ($target,$token) = @_;      my ($target,$token) = @_;
     my $currentstring = '';      my $currentstring = '';
     if ($target eq 'web') {      if ($target eq 'web') {
  $currentstring .= $token->[4];   $currentstring .= $token->[4];
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  $currentstring .= "\\textit{";   $currentstring .= '\textit{';
     }      }
     return $currentstring;      return $currentstring;
 }  }
Line 894  sub end_cite { Line 925  sub end_cite {
     if ($target eq 'web') {      if ($target eq 'web') {
  $currentstring .= $token->[2];   $currentstring .= $token->[2];
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  $currentstring .= "}";   $currentstring .= '}';
     }      }
     return $currentstring;      return $currentstring;
 }  }
   
 #-- <i> tag  #-- <i> tag (end tag required)
 sub start_i {  sub start_i {
     my ($target,$token) = @_;      my ($target,$token) = @_;
     my $currentstring = '';      my $currentstring = '';
Line 922  sub end_i { Line 953  sub end_i {
     return $currentstring;      return $currentstring;
 }  }
   
 #-- <address> tag  #-- <address> tag (end tag required)
 sub start_address {  sub start_address {
     my ($target,$token) = @_;      my ($target,$token) = @_;
     my $currentstring = '';      my $currentstring = '';
     if ($target eq 'web') {      if ($target eq 'web') {
  $currentstring .= $token->[4];   $currentstring .= $token->[4];
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  $currentstring .= "\\textit{";   $currentstring .= '\textit{';
     }      }
     return $currentstring;      return $currentstring;
 }  }
Line 940  sub end_address { Line 971  sub end_address {
     if ($target eq 'web') {      if ($target eq 'web') {
  $currentstring .= $token->[2];   $currentstring .= $token->[2];
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  $currentstring .= "}";   $currentstring .= '}';
     }      }
     return $currentstring;      return $currentstring;
 }  }
   
 #-- <dfn> tag  #-- <dfn> tag (end tag required)
 sub start_dfn {  sub start_dfn {
     my ($target,$token) = @_;      my ($target,$token) = @_;
     my $currentstring = '';      my $currentstring = '';
     if ($target eq 'web') {      if ($target eq 'web') {
  $currentstring .= $token->[4];   $currentstring .= $token->[4];
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  $currentstring .= "\\textit{";   $currentstring .= '\textit{';
     }       } 
     return $currentstring;      return $currentstring;
 }  }
Line 963  sub end_dfn { Line 994  sub end_dfn {
     if ($target eq 'web') {      if ($target eq 'web') {
  $currentstring .= $token->[2];   $currentstring .= $token->[2];
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  $currentstring .= "}";   $currentstring .= '}';
     }      }
     return $currentstring;      return $currentstring;
 }  }
   
 #-- <tt> tag  #-- <tt> tag (end tag required)
 sub start_tt {  sub start_tt {
     my ($target,$token) = @_;      my ($target,$token) = @_;
     my $currentstring = '';      my $currentstring = '';
Line 991  sub end_tt { Line 1022  sub end_tt {
     return $currentstring;      return $currentstring;
 }  }
   
 #-- <kbd> tag  #-- <kbd> tag (end tag required)
 sub start_kbd {  sub start_kbd {
     my ($target,$token) = @_;      my ($target,$token) = @_;
     my $currentstring = '';      my $currentstring = '';
     if ($target eq 'web') {      if ($target eq 'web') {
  $currentstring .= $token->[4];   $currentstring .= $token->[4];
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  $currentstring .= "\\texttt";   $currentstring .= '\texttt{';
     }      }
     return $currentstring;      return $currentstring;
 }  }
Line 1009  sub end_kbd { Line 1040  sub end_kbd {
     if ($target eq 'web') {      if ($target eq 'web') {
  $currentstring .= $token->[2];   $currentstring .= $token->[2];
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  $currentstring .= "}";   $currentstring .= '}';
     }      }
     return $currentstring;      return $currentstring;
 }  }
   
 #-- <code> tag  #-- <code> tag (end tag required)
 sub start_code {  sub start_code {
     my ($target,$token) = @_;      my ($target,$token) = @_;
     my $currentstring = '';      my $currentstring = '';
Line 1037  sub end_code { Line 1068  sub end_code {
     return $currentstring;      return $currentstring;
 }  }
   
 #-- <em> tag  #-- <em> tag (end tag required)
 sub start_em {  sub start_em {
     my ($target,$token) = @_;      my ($target,$token) = @_;
     my $currentstring = '';      my $currentstring = '';
Line 1060  sub end_em { Line 1091  sub end_em {
     return $currentstring;      return $currentstring;
 }  }
   
 #-- <q> tag  #-- <q> tag (end tag required)
 sub start_q {  sub start_q {
     my ($target,$token) = @_;      my ($target,$token) = @_;
     my $currentstring = '';      my $currentstring = '';
     if ($target eq 'web') {      if ($target eq 'web') {
  $currentstring .= $token->[4];   $currentstring .= $token->[4];
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  $currentstring .= "\\emph{";   $currentstring .= '\emph{';
     }      }
     return $currentstring;      return $currentstring;
 }  }
Line 1078  sub end_q { Line 1109  sub end_q {
     if ($target eq 'web') {      if ($target eq 'web') {
  $currentstring .= $token->[2];   $currentstring .= $token->[2];
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  $currentstring .= "}";   $currentstring .= '}';
     }       } 
     return $currentstring;      return $currentstring;
 }  }
   
 #-- <p> tag  #-- <p> tag (end tag optional)
   #optional attribute - align="center|left|right"
 sub start_p {  sub start_p {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring = '';      my $currentstring = '';
     if ($target eq 'web') {      if ($target eq 'web') {
  $currentstring .= $token->[4];   $currentstring .= $token->[4];
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  my $signal=1;   my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1);
  foreach my $tag (@$tagstack) {if (lc($tag) eq 'b') {$signal=0;}}   if ($align eq 'center') {
  if ($signal) {$currentstring .= '\par ';}      $currentstring='\begin{center}\par';
    } elsif ($align eq 'right') {
       $currentstring='\makebox['.$ENV{'form.textwidth'}.']{\hfill\llap{';
    } elsif ($align eq 'left') {
       $currentstring='\noindent\makebox['.$ENV{'form.textwidth'}.']{\rlap{';
    } else {
               $currentstring='\par ';
           }
    my $signal=1;#<p> does not work inside <b>...</b> 
    foreach my $tag (@$tagstack) {if (lc($tag) eq 'b') {$signal=0;}
    if (!$signal) {$currentstring = '';}
    }
     }      }
     return $currentstring;      return $currentstring;
 }  }
   
 sub end_p {  sub end_p {
     my ($target,$token) = @_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring = '';      my $currentstring = '';
     if ($target eq 'web') {      if ($target eq 'web') {
  $currentstring .= $token->[2];   $currentstring .= $token->[2];
       } elsif ($target eq 'tex') {
    my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1);
    if (not defined $align) {
       $currentstring.='\strut\\\\\strut ';
    } elsif ($align eq 'center') {
       $currentstring .= '\end{center}';
    } elsif ($align eq 'right') {
       $currentstring .= '}}';
    } elsif ($align eq 'left') {
       $currentstring .= '}\hfill}';
    } 
     }      }
     return $currentstring;      return $currentstring;
 }  }
   
 #-- <br> tag  #-- <br> tag (end tag forbidden)
 sub start_br {  sub start_br {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $currentstring = '';      my $currentstring = '';
     if ($target eq 'web') {      if ($target eq 'web') {
  $currentstring .= $token->[4];   $currentstring .= $token->[4];
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  if ($$tagstack[-2] ne 'sub' && $$tagstack[-2] ne 'sup') {   my @tempo=@$tagstack;
     $currentstring .= '\vskip 0.2 mm ';   my $signal=0;
    for (my $i=$#tempo;$i>=0;$i--) {
       if (($tempo[$i] eq 'b') || ($tempo[$i] eq 'strong') ||
                   ($tempo[$i] eq 'ol') || ($tempo[$i] eq 'ul') ||
                   ($tempo[$i] eq 'td') || ($tempo[$i] eq 'th'))  {
    $signal=1;
    last;
       }
    }
    if ($signal) {
       $currentstring .= ' \vskip 0 mm ';
    } elsif ($$tagstack[-2] ne 'sub' && $$tagstack[-2] ne 'sup') {
       $currentstring .= '\strut \\\\ \strut ';
  }   }
     }      }
     return $currentstring;      return $currentstring;
Line 1129  sub end_br { Line 1195  sub end_br {
     return $currentstring;      return $currentstring;
 }  }
   
 #-- <big> tag  #-- <big> tag (end tag required)
 sub start_big {  sub start_big {
     my ($target,$token) = @_;      my ($target,$token) = @_;
     my $currentstring = '';      my $currentstring = '';
Line 1152  sub end_big { Line 1218  sub end_big {
     return $currentstring;      return $currentstring;
 }  }
   
 #-- <small> tag  #-- <small> tag (end tag required)
 sub start_small {  sub start_small {
     my ($target,$token) = @_;      my ($target,$token) = @_;
     my $currentstring = '';      my $currentstring = '';
Line 1175  sub end_small { Line 1241  sub end_small {
     return $currentstring;      return $currentstring;
 }  }
   
 #-- <basefont> tag  #-- <basefont> tag (end tag forbidden)
 sub start_basefont {  sub start_basefont {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $currentstring = '';      my $currentstring = '';
Line 1204  sub end_basefont { Line 1270  sub end_basefont {
     return $currentstring;      return $currentstring;
 }  }
   
 #-- <font> tag  #-- <font> tag (end tag required)
 sub start_font {  sub start_font {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $currentstring = '';      my $currentstring = '';
     if ($target eq 'web') {      if ($target eq 'web') {
  my $face=&Apache::lonxml::get_param('face',$parstack,$safeeval);   my $face=&Apache::lonxml::get_param('face',$parstack,$safeeval);
  if ($face=~/symbol/i) {   if ($face!~/symbol/i) {
     $Apache::lonxml::prevent_entity_encode++;  
  } else {  
     if (($ENV{'browser.fontenhance'} eq 'on') ||       if (($ENV{'browser.fontenhance'} eq 'on') || 
  ($ENV{'browser.blackwhite'} eq 'on')) { return ''; }   ($ENV{'browser.blackwhite'} eq 'on')) { return ''; }
  }   }
Line 1230  sub end_font { Line 1294  sub end_font {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $currentstring = '';      my $currentstring = '';
     if ($target eq 'web') {      if ($target eq 'web') {
  my $face=&Apache::lonxml::get_param('face',$parstack,$safeeval);  
  if ($face=~/symbol/i) {$Apache::lonxml::prevent_entity_encode--;}  
  $currentstring = $token->[2];       $currentstring = $token->[2];    
     }  elsif ($target eq 'tex') {      }  elsif ($target eq 'tex') {
  my $fontsize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval);   my $fontsize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval);
Line 1242  sub end_font { Line 1304  sub end_font {
     return $currentstring;      return $currentstring;
 }  }
     
 #-- <strike> tag  #-- <strike> tag (end tag required)
 sub start_strike {  sub start_strike {
     my ($target,$token) = @_;      my ($target,$token) = @_;
     my $currentstring = '';      my $currentstring = '';
Line 1268  sub end_strike { Line 1330  sub end_strike {
     return $currentstring;      return $currentstring;
 }  }
   
 #-- <s> tag  #-- <s> tag (end tag required)
 sub start_s {  sub start_s {
     my ($target,$token) = @_;      my ($target,$token) = @_;
     my $currentstring = '';      my $currentstring = '';
Line 1294  sub end_s { Line 1356  sub end_s {
     return $currentstring;      return $currentstring;
 }  }
   
 #-- <sub> tag  #-- <sub> tag (end tag required)
 sub start_sub {  sub start_sub {
     my ($target,$token) = @_;      my ($target,$token) = @_;
     my $currentstring = '';      my $currentstring = '';
     if ($target eq 'web') {      if ($target eq 'web') {
  $currentstring .= $token->[4];   $currentstring .= $token->[4];
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  $currentstring .= "\$_{ ";   $currentstring .= '\ensuremath{_{';
     }       } 
     return $currentstring;      return $currentstring;
 }  }
Line 1312  sub end_sub { Line 1374  sub end_sub {
     if ($target eq 'web') {      if ($target eq 'web') {
  $currentstring .= $token->[2];   $currentstring .= $token->[2];
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  $currentstring .= " }\$";   $currentstring .= '}}';
     }      }
     return $currentstring;      return $currentstring;
 }  }
   
 #-- <sup> tag  #-- <sup> tag (end tag required)
 sub start_sup {  sub start_sup {
     my ($target,$token) = @_;      my ($target,$token) = @_;
     my $currentstring = '';      my $currentstring = '';
     if ($target eq 'web') {      if ($target eq 'web') {
  $currentstring .= $token->[4];   $currentstring .= $token->[4];
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  $currentstring .= "\$^{ ";   $currentstring .= '\ensuremath{^{';
     }       } 
     return $currentstring;      return $currentstring;
 }  }
Line 1335  sub end_sup { Line 1397  sub end_sup {
     if ($target eq 'web') {      if ($target eq 'web') {
  $currentstring .= $token->[2];   $currentstring .= $token->[2];
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  $currentstring .= " }\$";   $currentstring .= '}}';
     }      }
     return $currentstring;      return $currentstring;
 }  }
   
 #-- <hr> tag  #-- <hr> tag (end tag forbidden)
 sub start_hr {  sub start_hr {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring = '';      my $currentstring = '';
Line 1380  sub end_hr { Line 1442  sub end_hr {
     return $currentstring;      return $currentstring;
 }  }
   
 #-- <div> tag  #-- <div> tag (end tag required)
 sub start_div {  sub start_div {
     my ($target,$token) = @_;      my ($target,$token) = @_;
     my $currentstring = '';      my $currentstring = '';
Line 1399  sub end_div { Line 1461  sub end_div {
     return $currentstring;      return $currentstring;
 }  }
   
 #-- <a> tag  #-- <a> tag (end tag required)
 sub start_a {  sub start_a {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring = '';      my $currentstring = '';
     if ($target eq 'web') {      if ($target eq 'web') {
  $currentstring .= $token->[4];   my $href=&Apache::lonxml::get_param('href',$parstack,$safeeval,
       undef,1);
    $currentstring=&Apache::lonenc::encrypt_ref($token,{'href'=>$href});
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  my $a=&Apache::lonxml::get_param('href',$parstack,$safeeval,undef,1);   my $a=&Apache::lonxml::get_param('href',$parstack,$safeeval,undef,1);
  my $b=&Apache::lonxml::get_param('name',$parstack,$safeeval,undef,1);   my $b=&Apache::lonxml::get_param('name',$parstack,$safeeval,undef,1);
Line 1421  sub start_a { Line 1485  sub start_a {
 }  }
   
 sub end_a {  sub end_a {
     my ($target,$token,$tagstack,$parstack,$safeeval) = @_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring = '';      my $currentstring = '';
     if ($target eq 'web') {      if ($target eq 'web') {
  $currentstring .= $token->[2];   $currentstring .= $token->[2];
Line 1429  sub end_a { Line 1493  sub end_a {
     return $currentstring;      return $currentstring;
 }  }
   
 #-- <li> tag  #-- <li> tag (end tag optional)
 sub start_li {  sub start_li {
     my ($target,$token,$tagstack,$parstack,$safeeval) = @_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring = '';      my $currentstring = '';
     if ($target eq 'web') {      if ($target eq 'web') {
  $currentstring = $token->[4];        $currentstring = $token->[4];     
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  my  $type=&Apache::lonxml::get_param('type',$parstack,$safeeval,undef,1);   my $type=&Apache::lonxml::get_param('type',$parstack,$safeeval,undef,0);
  if ($type=~/circle/) {   my $value=&Apache::lonxml::get_param('value',$parstack,$safeeval,undef,0);
     $currentstring .= ' \item[o] ';   #FIXME need to support types i and I 
    if ($type=~/disc/) {
       $currentstring .= ' \item[$\bullet$] ';
    } elsif ($type=~/circle/) {
       $currentstring .= ' \item[$\circ$] ';
  } elsif ($type=~/square/) {   } elsif ($type=~/square/) {
     $currentstring .= ' \item[$\Box$] ';      $currentstring .= ' \item[$\diamond$] ';
  } elsif ($type ne '') {    } elsif ($type eq '1') {
     $currentstring .= ' \item['.$type.'] ';      $currentstring .= ' \item['.($Apache::londefdef::list_index+1).'.]';
    } elsif ($type eq 'A') {
       $currentstring .= ' \item['.('A'..'Z')[$Apache::londefdef::list_index].'.]';
    } elsif ($type eq 'a') {
       $currentstring .= ' \item['.('a'..'z')[$Apache::londefdef::list_index].'.]';
    } elsif ($value ne '') {
       $currentstring .= ' \item['.$value.'] ';
  } else {   } else {
     $currentstring .= ' \item ';      $currentstring .= ' \item ';
  }     }  
     }    $Apache::londefdef::list_index++;
       }
     return $currentstring;      return $currentstring;
 }  }
   
Line 1459  sub end_li { Line 1534  sub end_li {
     return $currentstring;      return $currentstring;
 }  }
   
 #-- <u> tag  #-- <u> tag (end tag required)
 sub start_u {  sub start_u {
     my ($target,$token) = @_;      my ($target,$token) = @_;
     my $currentstring = '';      my $currentstring = '';
Line 1485  sub end_u { Line 1560  sub end_u {
     return $currentstring;      return $currentstring;
 }  }
   
 #-- <ul> tag  #-- <ul> tag (end tag required)
 sub start_ul {  sub start_ul {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring = '';      my $currentstring = '';
Line 1493  sub start_ul { Line 1568  sub start_ul {
  $currentstring = $token->[4];        $currentstring = $token->[4];     
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  my $TeXtype=&Apache::lonxml::get_param('type',$parstack,$safeeval,undef,0);   my $TeXtype=&Apache::lonxml::get_param('type',$parstack,$safeeval,undef,0);
    $Apache::londefdef::list_index=0;
  if ($TeXtype eq 'disc') {   if ($TeXtype eq 'disc') {
     $currentstring .= ' \renewcommand{\labelitemi}{$\bullet$}      $currentstring .= '\renewcommand{\labelitemi}{$\bullet$}'.
                                 \renewcommand{\labelitemii}{$\bullet$}                                 '\renewcommand{\labelitemii}{$\bullet$}'. 
                                 \renewcommand{\labelitemiii}{$\bullet$}                                '\renewcommand{\labelitemiii}{$\bullet$}'.
                                 \renewcommand{\labelitemiv}{$\bullet$}';                                '\renewcommand{\labelitemiv}{$\bullet$}';
  } elsif ($TeXtype eq 'circle') {   } elsif ($TeXtype eq 'circle') {
     $currentstring .= ' \renewcommand{\labelitemi}{$\circ$}      $currentstring .= '\renewcommand{\labelitemi}{$\circ$}'.
                                 \renewcommand{\labelitemii}{$\circ$}                                 '\renewcommand{\labelitemii}{$\circ$}'. 
                                 \renewcommand{\labelitemiii}{$\circ$}                                '\renewcommand{\labelitemiii}{$\circ$}'.
                                 \renewcommand{\labelitemiv}{$\circ$}';                                '\renewcommand{\labelitemiv}{$\circ$}';
  } elsif ($TeXtype eq 'square') {   } elsif ($TeXtype eq 'square') {
     $currentstring .= ' \renewcommand{\labelitemi}{$\diamond$}      $currentstring .= '\renewcommand{\labelitemi}{$\diamond$}'.
                                 \renewcommand{\labelitemii}{$\diamond$}                                 '\renewcommand{\labelitemii}{$\diamond$}'. 
                                 \renewcommand{\labelitemiii}{$\diamond$}                                '\renewcommand{\labelitemiii}{$\diamond$}'.
                                 \renewcommand{\labelitemiv}{$\diamond$}';                                '\renewcommand{\labelitemiv}{$\diamond$}';
  }   }
  $currentstring .= '\begin{itemize}';     $currentstring .= '\strut \begin{itemize}';  
     }       } 
     return $currentstring;      return $currentstring;
 }  }
Line 1520  sub end_ul { Line 1596  sub end_ul {
     if ($target eq 'web') {      if ($target eq 'web') {
  $currentstring = $token->[2];        $currentstring = $token->[2];     
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  $currentstring = '\end{itemize} \renewcommand{\labelitemi}{$\bullet$}   $currentstring = '\end{itemize} \renewcommand{\labelitemi}{$\bullet$}'.
                                 \renewcommand{\labelitemii}{$\bullet$}                                  '\renewcommand{\labelitemii}{$\bullet$}'. 
                                 \renewcommand{\labelitemiii}{$\bullet$}                                 '\renewcommand{\labelitemiii}{$\bullet$}'.
                                 \renewcommand{\labelitemiv}{$\bullet$}';                                   '\renewcommand{\labelitemiv}{$\bullet$}\strut ';  
     }       } 
     return $currentstring;      return $currentstring;
 }  }
   
 #-- <menu> tag  #-- <menu> tag (end tag required)
 sub start_menu {  sub start_menu {
     my ($target,$token) = @_;      my ($target,$token) = @_;
     my $currentstring = '';      my $currentstring = '';
Line 1551  sub end_menu { Line 1627  sub end_menu {
     return $currentstring;      return $currentstring;
 }  }
   
 #-- <dir> tag  #-- <dir> tag (end tag required)
 sub start_dir {  sub start_dir {
     my ($target,$token) = @_;      my ($target,$token) = @_;
     my $currentstring = '';      my $currentstring = '';
Line 1574  sub end_dir { Line 1650  sub end_dir {
     return $currentstring;      return $currentstring;
 }  }
   
 #-- <ol> tag  #-- <ol> tag (end tag required)
 sub start_ol {  sub start_ol {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring = '';      my $currentstring = '';
     if ($target eq 'web') {      if ($target eq 'web') {
  $currentstring = $token->[4];        $currentstring = $token->[4];     
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
    $Apache::londefdef::list_index=0;
  my $type=&Apache::lonxml::get_param('type',$parstack,$safeeval,undef,0);   my $type=&Apache::lonxml::get_param('type',$parstack,$safeeval,undef,0);
  if ($type eq '1') {   if ($type eq '1') {
     $currentstring .= ' \renewcommand{\labelenumi}{\arabic{enumi}.}      $currentstring .= '\renewcommand{\labelenumi}{\arabic{enumi}.}'.
                                 \renewcommand{\labelenumii}{\arabic{enumii}.}                                 '\renewcommand{\labelenumii}{\arabic{enumii}.}'. 
                                 \renewcommand{\labelenumiii}{\arabic{enumiii}.}                                '\renewcommand{\labelenumiii}{\arabic{enumiii}.}'.
                                 \renewcommand{\labelenumiv}{\arabic{enumiv}.}';                                '\renewcommand{\labelenumiv}{\arabic{enumiv}.}';
  } elsif ($type eq 'A') {   } elsif ($type eq 'A') {
     $currentstring .= ' \renewcommand{\labelenumi}{\Alph{enumi}.}      $currentstring .= '\renewcommand{\labelenumi}{\Alph{enumi}.}'.
                                 \renewcommand{\labelenumii}{\Alph{enumii}.}                                 '\renewcommand{\labelenumii}{\Alph{enumii}.}'. 
                                 \renewcommand{\labelenumiii}{\Alph{enumiii}.}                                '\renewcommand{\labelenumiii}{\Alph{enumiii}.}'.
                                 \renewcommand{\labelenumiv}{\Alph{enumiv}.}';                                '\renewcommand{\labelenumiv}{\Alph{enumiv}.}';
  } elsif ($type eq 'a') {   } elsif ($type eq 'a') {
     $currentstring .= ' \renewcommand{\labelenumi}{\alph{enumi}.}      $currentstring .= '\renewcommand{\labelenumi}{\alph{enumi}.}'.
                                 \renewcommand{\labelenumii}{\alph{enumii}.}                                '\renewcommand{\labelenumii}{\alph{enumii}.}'.
                                 \renewcommand{\labelenumiii}{\alph{enumiii}.}                                '\renewcommand{\labelenumiii}{\alph{enumiii}.}'.
                                 \renewcommand{\labelenumiv}{\alph{enumiv}.} ';                                '\renewcommand{\labelenumiv}{\alph{enumiv}.}';
  } elsif ($type eq 'i') {   } elsif ($type eq 'i') {
     $currentstring .= ' \renewcommand{\labelenumi}{\roman{enumi}.}      $currentstring .= '\renewcommand{\labelenumi}{\roman{enumi}.}'.
                                 \renewcommand{\labelenumii}{\roman{enumii}.}                                '\renewcommand{\labelenumii}{\roman{enumii}.}'.
                                 \renewcommand{\labelenumiii}{\roman{enumiii}.}                                '\renewcommand{\labelenumiii}{\roman{enumiii}.}'.
                                 \renewcommand{\labelenumiv}{\roman{enumiv}.} ';                                '\renewcommand{\labelenumiv}{\roman{enumiv}.}';
  } elsif ($type eq 'I') {   } elsif ($type eq 'I') {
     $currentstring .= ' \renewcommand{\labelenumi}{\Roman{enumi}.}      $currentstring .= '\renewcommand{\labelenumi}{\Roman{enumi}.}'.
                                 \renewcommand{\labelenumii}{\Roman{enumii}.}                                '\renewcommand{\labelenumii}{\Roman{enumii}.}'.
                                 \renewcommand{\labelenumiii}{\Roman{enumiii}.}                                '\renewcommand{\labelenumiii}{\Roman{enumiii}.}'.
                                 \renewcommand{\labelenumiv}{\Roman{enumiv}.} ';                                '\renewcommand{\labelenumiv}{\Roman{enumiv}.}';
  }   }
  $currentstring .= '\begin{enumerate}';     $currentstring .= '\strut \begin{enumerate}';  
     }       } 
     return $currentstring;      return $currentstring;
 }  }
Line 1619  sub end_ol { Line 1696  sub end_ol {
     if ($target eq 'web') {      if ($target eq 'web') {
  $currentstring = $token->[2];        $currentstring = $token->[2];     
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  $currentstring = '\end{enumerate} \renewcommand{\labelenumi}{\arabic{enumi}.}   $currentstring = '\end{enumerate}\renewcommand{\labelenumi}{\arabic{enumi}.}'.
                                           \renewcommand{\labelenumii}{\arabic{enumii}.}                                          '\renewcommand{\labelenumii}{\arabic{enumii}.}'.
                                           \renewcommand{\labelenumiii}{\arabic{enumiii}.}                                          '\renewcommand{\labelenumiii}{\arabic{enumiii}.}'.
                                           \renewcommand{\labelenumiv}{\arabic{enumiv}.}';                                            '\renewcommand{\labelenumiv}{\arabic{enumiv}.}\strut ';  
     }       } 
     return $currentstring;      return $currentstring;
 }  }
   
 #-- <dl> tag  #-- <dl> tag (end tag required)
 sub start_dl {  sub start_dl {
     my ($target,$token) = @_;      my ($target,$token) = @_;
     my $currentstring = '';      my $currentstring = '';
     if ($target eq 'web') {      if ($target eq 'web') {
  $currentstring = $token->[4];        $currentstring = $token->[4];     
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  $currentstring = '\begin{description}';     $currentstring = '\begin{description}';
    $Apache::londefdef::DL++;
    push(@Apache::londefdef::description,[]);
    $Apache::londefdef::DD[$Apache::londefdef::DL]=0;
    $Apache::londefdef::DT[$Apache::londefdef::DL]=0;
    $Apache::londefdef::seenDT[$Apache::londefdef::DL]=0;
     }       } 
     return $currentstring;      return $currentstring;
 }  }
   
 sub end_dl {  sub end_dl {
     my ($target,$token) = @_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring = '';      my $currentstring = '';
     if ($target eq 'web') {      if ($target eq 'web') {
  $currentstring = $token->[2];        $currentstring = $token->[2];     
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  $currentstring = '\end{description}';     if ($Apache::londefdef::DT[-1]) { &end_dt(@_); }
    if ($Apache::londefdef::DD[-1]) { &end_dd(@_); }
    foreach my $element (@{$Apache::londefdef::description[-1]}) {
       $currentstring.=' '.$element.' ';
    }
    pop(@Apache::londefdef::description);
    $currentstring.='\end{description}';  
    delete($Apache::londefdef::DD[$Apache::londefdef::DL]);
    delete($Apache::londefdef::DT[$Apache::londefdef::DL]);
    delete($Apache::londefdef::seenDT[$Apache::londefdef::DL]);
    $Apache::londefdef::DL--;
     }       } 
     return $currentstring;      return $currentstring;
 }  }
   
 #-- <dt> tag  #-- <dt> tag (end tag optional)
 sub start_dt {  sub start_dt {
     my ($target,$token) = @_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring = '';      my $currentstring='';
     if ($target eq 'web') {      if ($target eq 'web') {
  $currentstring = $token->[4];        $currentstring = $token->[4];     
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  $currentstring = '\item[';     if ($Apache::londefdef::DT[-1]) { &end_dt(@_); }
    if ($Apache::londefdef::DD[-1]) { &end_dd(@_); }
    &Apache::lonxml::startredirection();
    $Apache::londefdef::DT[-1]++;
    $Apache::londefdef::seenDT[-1]=1;
     }       } 
     return $currentstring;      return $currentstring;
 }  }
   
 sub end_dt {  sub end_dt {
     my ($target,$token) = @_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring = '';      my $currentstring = '';
     if ($target eq 'web') {      if ($target eq 'web') {
  $currentstring = $token->[2];       $currentstring = $token->[2];    
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  $currentstring = ']';     if ($Apache::londefdef::DT[-1]) {
       my $data=&item_cleanup();
       push(@{$Apache::londefdef::description[-1]},'\item['.$data.'] \strut \vskip 0mm');
       $Apache::londefdef::DT[-1]--;
    }
     }       } 
     return $currentstring;      return $currentstring;
 }  }
   
 #-- <dd> tag  sub item_cleanup {
       my $item=&Apache::lonxml::endredirection();
       $item=~s/\\begin{center}//g;
       $item=~s/\\end{center}//g;
       return $item;
   }
   
   #-- <dd> tag (end tag optional)
 sub start_dd {  sub start_dd {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring = '';      my $currentstring = '';
     if ($target eq 'web') {      if ($target eq 'web') {
  $currentstring = $token->[4];        $currentstring = $token->[4];     
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  if ($$tagstack[-2] eq 'dl') {   if ($Apache::londefdef::DT[-1]) { &end_dt(@_); }
     $currentstring = ' \item [] ';     if ($Apache::londefdef::DD[-1]) { &end_dd(@_);}
  } elsif ($$tagstack[-2] eq 'dt') {   if (!$Apache::londefdef::seenDT[-1]) {
     $currentstring = ']';       push(@{$Apache::londefdef::description[-1]},'\item[\strut] \strut \vskip 0mm ');
  }   }
    push(@{$Apache::londefdef::description[-1]},'');
    $Apache::londefdef::description[-1]->[-1].=' \strut ';
    $Apache::londefdef::DD[-1]++;
    &Apache::lonxml::startredirection();
     }       } 
     return $currentstring;      return $currentstring;
 }  }
   
 sub end_dd {  sub end_dd {
     my ($target,$token) = @_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring = '';      my $currentstring = '';
     if ($target eq 'web') {      if ($target eq 'web') {
  $currentstring = $token->[2];       $currentstring = $token->[2];    
     }       }  elsif ($target eq 'tex') {
    $Apache::londefdef::description[-1]->[-1].=
       &Apache::lonxml::endredirection().' \vskip 0mm ';
    $Apache::londefdef::DD[-1]--;
       }
     return $currentstring;      return $currentstring;
 }  }
   
 #-- <table> tag  #-- <table> tag (end tag required)
   #list of supported attributes: border,width,TeXwidth
 sub start_table {  sub start_table {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $textwidth='';      my ($textwidth,$currentstring)=('','');
     if (not defined @Apache::londefdef::table) {  
  $textwidth=&recalc($ENV{'form.textwidth'});  
  $textwidth=~/(\d+\.?\d*)/;  
  $textwidth=0.95*$1;  
     } else {  
  $textwidth=&Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval,undef,0);  
     }  
     my $currentstring = '';  
     if ($target eq 'web') {      if ($target eq 'web') {
  $currentstring = $token->[4];        $currentstring = $token->[4];     
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  my $aa = {};   my $aa = {};
  push @Apache::londefdef::table, $aa;    push @Apache::londefdef::table, $aa; 
  $Apache::londefdef::table[-1]{'row_number'} = -1;   $Apache::londefdef::table[-1]{'row_number'} = -1;
         #table's width          #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
    } 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
    $textwidth=$Apache::londefdef::table[-2]{'TeXlen'}[$Apache::londefdef::table[-2]{'row_number'}][$Apache::londefdef::table[-2]{'counter_columns'}]; 
       } else {
                 #try to use all space not used before (minus 5% for LaTeX table internal) - rather silly
    $textwidth=$Apache::londefdef::table[-2]{'width'};
    for (my $i=0;$i<$Apache::londefdef::table[-2]{'counter_columns'};$i++) {
       $textwidth=$textwidth-$Apache::londefdef::table[-2]{'TeXlen'}[0][$i];
    }
       }
    }
  my $TeXwidth = &Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval,undef,0);   my $TeXwidth = &Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval,undef,0);
  if (not defined $TeXwidth) {   if (not defined $TeXwidth) {
     my $htmlwidth = &Apache::lonxml::get_param('width',$parstack,$safeeval,undef,1);      my $htmlwidth = &Apache::lonxml::get_param('width',$parstack,$safeeval,undef,1);
     if ($htmlwidth=~/%/) {      if ($htmlwidth=~/%/) {
                   $Apache::londefdef::table[-1]{'percent'}=1;
  $htmlwidth=~/(\d+)/;   $htmlwidth=~/(\d+)/;
  my $value=$1*$textwidth/100;   $Apache::londefdef::table[-1]{'width'}=$1*$textwidth/100;;
  $Apache::londefdef::table[-1]{'width'}=$value;  
     } else {      } else {
  $Apache::londefdef::table[-1]{'width'}=$textwidth;   $Apache::londefdef::table[-1]{'width'}=$textwidth;
     }      }
  } elsif ($TeXwidth=~/%/) {   } elsif ($TeXwidth=~/%/) {
       $Apache::londefdef::table[-1]{'percent'}=1;
     $TeXwidth=~/(\d+)/;      $TeXwidth=~/(\d+)/;
     my $value=$1*$textwidth/100;              $Apache::londefdef::table[-1]{'width'}=$1*$textwidth/100;
             $Apache::londefdef::table[-1]{'width'}=$value;  
  } else {   } else {
     $Apache::londefdef::table[-1]{'width'}=$textwidth;      $Apache::londefdef::table[-1]{'forcetablewidth'}=1;
       $Apache::londefdef::table[-1]{'width'}=$TeXwidth;
  }           }        
         #table's border          #table's border
  my $border = &Apache::lonxml::get_param('border',$parstack,$safeeval,undef,1);    my $border = &Apache::lonxml::get_param('border',$parstack,$safeeval); 
           my $permission=&Apache::lonxml::get_param('TeXDropEmptyColumns',$parstack,$safeeval,undef,0);
  unless (defined $border) { $border = 0; }   unless (defined $border) { $border = 0; }
  if ($border) {    if ($border) { 
     $Apache::londefdef::table[-1]{'hinc'} = '\hline ';       $Apache::londefdef::table[-1]{'hinc'} = '\hline '; 
Line 1746  sub start_table { Line 1872  sub start_table {
     $Apache::londefdef::table[-1]{'vinc'} = '&';       $Apache::londefdef::table[-1]{'vinc'} = '&'; 
     $Apache::londefdef::table[-1]{'vvinc'} = '';      $Apache::londefdef::table[-1]{'vvinc'} = '';
  }   }
  $Apache::londefdef::table[-1]{'output'} = ' \noindent \begin{tabular} ';   if ($#Apache::londefdef::table==0) {
  $currentstring = '\keephidden{NEW TABLE ENTRY}';      $Apache::londefdef::table[-1]{'output'}='\strut\newline\strut\setlength{\tabcolsep}{1 mm}';
     }   }
    $Apache::londefdef::table[-1]{'output'}.=' \noindent \begin{tabular} ';
           $Apache::londefdef::table[-1]{'TeXlen'}=[];
           $Apache::londefdef::table[-1]{'objectlen'}=[];
           $Apache::londefdef::table[-1]{'objectsignal'}=[];
           $Apache::londefdef::table[-1]{'maxlen'}=[];
           $Apache::londefdef::table[-1]{'minlen'}=[];
           $Apache::londefdef::table[-1]{'content'}=[];
           $Apache::londefdef::table[-1]{'align'}=[];
           $currentstring='\keephidden{NEW TABLE ENTRY}';
      }
     return $currentstring;      return $currentstring;
 }  }
     
Line 1760  sub end_table { Line 1896  sub end_table {
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  my $inmemory = '';   my $inmemory = '';
  my $output = '';   my $output = '';
  #construct header of the table   my $WARNING='';
  my $header_of_table = '{'.$Apache::londefdef::table[-1]{'vvinc'};          #width of columns from TeXwidth attributes
  for (my $in=0;$in<=$Apache::londefdef::table[-1]{'counter_columns'};$in++) {   for (my $in=0;$in<=$Apache::londefdef::table[-1]{'row_number'};$in++) {
     $header_of_table .= $Apache::londefdef::table[-1]{'columns'}[$in].$Apache::londefdef::table[-1]{'vvinc'};      for (my $jn=0;$jn<=$Apache::londefdef::table[-1]{'counter_columns'};$jn++) {
    if ($Apache::londefdef::table[-1]{'TeXlen'}[0][$jn]<$Apache::londefdef::table[-1]{'TeXlen'}[$in][$jn]) {
       $Apache::londefdef::table[-1]{'TeXlen'}[0][$jn]=$Apache::londefdef::table[-1]{'TeXlen'}[$in][$jn];
    }
       }
  }   }
  $header_of_table .= '}';          #free space and number of empty columns
  #define the length of the table cells   my ($available_space,$empty_columns)=($Apache::londefdef::table[-1]{'width'},0);
  #always starts with TeXwidth (if defined everything else is ignored)   if ($#Apache::londefdef::table ne 0) {$available_space=0.9*$available_space;} 
  my @length_row_final = split(/,/,$Apache::londefdef::table[-1]{'TeXlengthrow'}[0]);   for (my $jn=0;$jn<=$Apache::londefdef::table[-1]{'counter_columns'};$jn++) {
  for (my $in=1;$in<=$Apache::londefdef::table[-1]{'row_number'};$in++) {      if ($Apache::londefdef::table[-1]{'TeXlen'}[0][$jn]==0) {
     my @length_row = split(/,/,$Apache::londefdef::table[-1]{'TeXlengthrow'}[$in]);   $empty_columns++;
     for (my $jn=0;$jn<=$#length_row;$jn++) {      } else {
  if ($length_row_final[$jn]<$length_row[$jn]) {$length_row_final[$jn]=$length_row[$jn];}   $available_space=$available_space-$Apache::londefdef::table[-1]{'TeXlen'}[0][$jn];
     }      }
  }   }
  #continues trying estimate the width of raw data          #boundaries for contents columns
 # $currentstring.=' SSS '.$Apache::londefdef::table[-1]{'lengthrow'}[0].' FFF '; ####for test only   my @min_len=();#columns can not be narrower 
  my @length_raw_row = split(/,/,$Apache::londefdef::table[-1]{'lengthrow'}[0]);   my @max_len=();#maximum length of column
  for (my $in=1;$in<=$Apache::londefdef::table[-1]{'row_number'};$in++) {   for (my $jn=0;$jn<=$Apache::londefdef::table[-1]{'counter_columns'};$jn++) {
     my @length_row = split(/,/,$Apache::londefdef::table[-1]{'lengthrow'}[$in]);   my ($localmin,$localmax)=(0,0);
 #    $currentstring.=' SSS '.$Apache::londefdef::table[-1]{'lengthrow'}[$in].' FFF '; ####for test only   for (my $in=0;$in<=$Apache::londefdef::table[-1]{'row_number'};$in++) {
     for (my $jn=0;$jn<=$#length_row;$jn++) {      if ($localmin<$Apache::londefdef::table[-1]{'minlen'}[$in][$jn]) {
  if ($length_raw_row[$jn]<$length_row[$jn]) {$length_raw_row[$jn]=$length_row[$jn];}   $localmin=$Apache::londefdef::table[-1]{'minlen'}[$in][$jn];
     }      }
  }      if ($localmax<$Apache::londefdef::table[-1]{'maxlen'}[$in][$jn]) {
         #comparing of TeXwidth and raw data width   $localmax=$Apache::londefdef::table[-1]{'maxlen'}[$in][$jn];
  my $available_length=$Apache::londefdef::table[-1]{'width'};      }
  my $needed=0;   }
  for (my $jn=0;$jn<=$#length_row_final;$jn++) {   push @min_len, $localmin;
     if ($length_row_final[$jn]!=0) {   push @max_len, $localmax;
  $available_length=$available_length-$length_row_final[$jn];   }
  $needed++;   for (my $jn=0;$jn<=$Apache::londefdef::table[-1]{'counter_columns'};$jn++) {
     }      my $localmin=0,;
  }      for (my $in=0;$in<=$Apache::londefdef::table[-1]{'row_number'};$in++) {
  $needed=$#length_row_final-$needed+1;   if ($localmin<$Apache::londefdef::table[-1]{'objectlen'}[$in][$jn]) {
  for (my $jn=0;$jn<=$#length_row_final;$jn++) {      $localmin=$Apache::londefdef::table[-1]{'objectlen'}[$in][$jn];
     if ($length_row_final[$jn]==0) {   }
  if ($length_raw_row[$jn]<$available_length/3) {      }
     $length_row_final[$jn]=$length_raw_row[$jn];      if ($max_len[$jn]<$localmin) {
     $available_length=$available_length-$length_raw_row[$jn];   $max_len[$jn]=$localmin;
     $needed--;       $Apache::londefdef::table[-1]{'objectsignal'}[$jn]=1;
       }#object size is bigger
       if ($min_len[$jn]<$localmin) {
    $min_len[$jn]=$localmin;
    $Apache::londefdef::table[-1]{'objectsignal'}[$jn]=1;
       }#object size is bigger
       if ($Apache::londefdef::table[-1]{'TeXlen'}[0][$jn]!=0) {
    $min_len[$jn]=0;
    $max_len[$jn]=0;
       }
    }
          #final adjustment of column width
    my @fwidth=@{$Apache::londefdef::table[-1]{'TeXlen'}[0]};#final width array
    my @adjust=();
           #step 1. adjustment by maximum value
    my $space_neeeded=0;
    for (my $jn=0;$jn<=$#max_len;$jn++) {
       $space_neeeded=$space_neeeded+$max_len[$jn];
    }
    if ($space_neeeded<=$available_space) {
       for (my $jn=0;$jn<=$#max_len;$jn++) {
    if ($fwidth[$jn]==0) {
       $fwidth[$jn]=$max_len[$jn];
    }
       }
    } else {
           #step 2. adjustment by minimum value (estimation)
       $space_neeeded=0;
       for (my $jn=0;$jn<=$#min_len;$jn++) {
    $space_neeeded+=$min_len[$jn];
       }
       if ($space_neeeded>$available_space) {
    $WARNING=' \textbf{NOT ENOUGH SPACE FOR TABLE} ';
    for (my $jn=0;$jn<=$#max_len;$jn++) {
       if ($fwidth[$jn]==0) {
    $fwidth[$jn]=$min_len[$jn];
       }
    }
    #check if we have objects which can be scaled
    my $how_many_to_scale=0;
    my @to_scale=();
    for (my $jn=0;$jn<=$#max_len;$jn++) {
       if ($Apache::londefdef::table[-1]{'objectsignal'}[$jn] eq '1') {
    $how_many_to_scale++;
    push @to_scale, $jn;
       }
    }
    if ($how_many_to_scale>0) {
       my $space_to_adjust=($space_neeeded-$available_space)/$how_many_to_scale;
       foreach my $jn (@to_scale) {
    for (my $in=0;$in<=$Apache::londefdef::table[-1]{'row_number'};$in++) {
       $Apache::londefdef::table[-1]{'content'}[$in][$jn]=~m/width\s*=\s*(\d+\.?\d*\s*(mm|cm|in|pc|pt)*)/;
       if ($1 ne '') {
    my $current_length=&recalc($1);
    $current_length=~/(\d+\.?\d*)/;
    $current_length=$current_length-$space_to_adjust;
    $Apache::londefdef::table[-1]{'content'}[$in][$jn]=~s/width\s*=\s*(\d+\.?\d*\s*(mm|cm|in|pc|pt)*)/width=$current_length mm/;
       }
       $Apache::londefdef::table[-1]{'content'}[$in][$jn]=~m/\[(\d+\.?\d*)\s*mm\]/;
       if ($1 ne '') {
    my $current_length=$1;
    $current_length=$current_length-$space_to_adjust;
    $Apache::londefdef::table[-1]{'content'}[$in][$jn]=~s/\[(\d+\.?\d*)\s*mm\]/\[$current_length mm\]/;
       }
    }
    $fwidth[$jn]=$fwidth[$jn]-$space_to_adjust;
       }
    }
       } else {
         #step 3. adjustment over minimal + corrections
    my $enlarge_coef=$available_space/$space_neeeded;
    my $acsessive=0;
    for (my $jn=0;$jn<=$#min_len;$jn++) {
       $adjust[$jn]=$min_len[$jn]*$enlarge_coef;
       if ($adjust[$jn]>$max_len[$jn]) {
    $fwidth[$jn]=$max_len[$jn];
    $acsessive=$acsessive+$adjust[$jn]-$max_len[$jn];
    $adjust[$jn]=0;
       }
    }
    if ($acsessive>0) {
    #we have an excess of space and can redistribute it
       my $notempty_columns=0;
       for (my $jn=0;$jn<=$#min_len;$jn++) {
    if ($adjust[$jn]!=0) {
       $notempty_columns++;
    }
       }
       my $per_column=$acsessive/$notempty_columns;
       for (my $jn=0;$jn<=$#min_len;$jn++) {
    if ($adjust[$jn]!=0) {
       $adjust[$jn]+=$per_column;
       $fwidth[$jn]=$adjust[$jn];
    }
       }
    } else {
       for (my $jn=0;$jn<=$#min_len;$jn++) {
    $fwidth[$jn]=$adjust[$jn];
       }
  }   }
     }      }
  }   }
  for (my $jn=0;$jn<=$#length_row_final;$jn++) {          #use all available width if it is defined in % or as TeXwidth
     if ($length_row_final[$jn]==0) {          if (($Apache::londefdef::table[-1]{'percent'}==1) || ($Apache::londefdef::table[-1]{'forcetablewidth'}==1)) {
  $length_row_final[$jn]=0.9*$available_length/$needed;      my $current=0; 
       for (my $i=0;$i<=$#fwidth;$i++) {  
    $current+=$fwidth[$i];
       }
       my $coef=$Apache::londefdef::table[-1]{'width'}/$current;
       for (my $i=0;$i<=$#fwidth;$i++) {  
    $fwidth[$i]*=$coef;
       }
    }
           #removing of empty columns if allowed
           my $permission=&Apache::lonxml::get_param('TeXDropEmptyColumns',$parstack,$safeeval,undef,0);
    if ($permission eq 'yes') {
       my @cleaned_table=();
               my @cleaned_header=();
       my $colind=0;
       for (my $jn=0;$jn<=$Apache::londefdef::table[-1]{'counter_columns'};$jn++) {
    if ($fwidth[$jn]!=0) {
       #we need to copy column
       for (my $in=0;$in<=$Apache::londefdef::table[-1]{'row_number'};$in++) {
    $cleaned_table[$in][$colind]=$Apache::londefdef::table[-1]{'content'}[$in][$jn];
    $cleaned_header[$colind]=$fwidth[$jn];
       }
       $colind++;
    }
     }      }
       $Apache::londefdef::table[-1]{'content'}=\@cleaned_table;
       @fwidth=@cleaned_header;
    }
    #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   #fill the table
  for (my $in=0;$in<=$Apache::londefdef::table[-1]{'row_number'};$in++) {   for (my $in=0;$in<=$Apache::londefdef::table[-1]{'row_number'};$in++) {
     for (my $jn=0;$jn<=$#length_row_final;$jn++) {      for (my $jn=0;$jn<=$#fwidth;$jn++) {
  my $substituted=$length_row_final[$jn];   if ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'c') {
  $Apache::londefdef::table[-1]{'rowdata'}[$in]=~s/TOBECHANGEDONNUMBER/$substituted mm/;      $output.='\vspace*{-6 mm}\begin{center}';
     }   } elsif ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'r') {
     $output .=  $Apache::londefdef::table[-1]{'rowdata'}[$in];      $output.=' \hfill \llap{'
     chop $output;   }
     $output .= ' \\\\ ';   $output.=$Apache::londefdef::table[-1]{'content'}[$in][$jn];
    if ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'c') {
       $output.='\end{center}\vspace*{-6 mm}';
    } elsif ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'r') {
       $output.='} ';
    }
                   if ($jn!=$#fwidth) {$output.=' '.$Apache::londefdef::table[-1]{'vinc'};}
       }
       $output.=' \\\\ '.$Apache::londefdef::table[-1]{'hinc'}.' ';
  }   }
  $Apache::londefdef::table[-1]{'output'} .= $header_of_table.$output.$Apache::londefdef::table[-1]{'hinc'}.'\end{tabular}\vskip 0 mm ';   $Apache::londefdef::table[-1]{'output'} .= $header_of_table.$Apache::londefdef::table[-1]{'hinc'}.$output.'\end{tabular}\strut\newline\strut ';
  if ($#Apache::londefdef::table > 0) {       if ($#Apache::londefdef::table > 0) {    
     my $inmemory = $Apache::londefdef::table[-1]{'output'};      my $inmemory = $Apache::londefdef::table[-1]{'output'};
     pop @Apache::londefdef::table;      pop @Apache::londefdef::table;
Line 1841  sub start_tr { Line 2118  sub start_tr {
  $currentstring = $token->[4];        $currentstring = $token->[4];     
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  $Apache::londefdef::table[-1]{'row_number'}++;   $Apache::londefdef::table[-1]{'row_number'}++;
  my $alignchar = substr(&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1),0,1);   my $alignchar=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1);
  if ($alignchar ne '') {   if ($alignchar ne '') {
     push @ {$Apache::londefdef::table[-1]{'rows'} }, $alignchar;      push @ {$Apache::londefdef::table[-1]{'rows'} },substr($alignchar,0,1);
  } else {   } else {
     push @ {$Apache::londefdef::table[-1]{'rows'} }, 'l';      push @ {$Apache::londefdef::table[-1]{'rows'} }, 'l';
  }   }
  push ( @{ $Apache::londefdef::table[-1]{'rowdata'} }, $Apache::londefdef::table[-1]{'hinc'});   push ( @{ $Apache::londefdef::table[-1]{'rowdata'} }, $Apache::londefdef::table[-1]{'hinc'});
  $Apache::londefdef::table[-1]{'counter_columns'} = -1;   $Apache::londefdef::table[-1]{'counter_columns'} = -1;
  $Apache::londefdef::table[-1]{'TeXlength'} = '';   push @ {$Apache::londefdef::table[-1]{'TeXlen'}}, [];
   $Apache::londefdef::table[-1]{'length'} = '';   push @ {$Apache::londefdef::table[-1]{'objectlen'}}, [];
    push @ {$Apache::londefdef::table[-1]{'minlen'}}, [];
    push @ {$Apache::londefdef::table[-1]{'maxlen'}}, [];
    push @ {$Apache::londefdef::table[-1]{'content'}}, [];
     }       } 
     return $currentstring;      return $currentstring;
 }  }
Line 1864  sub end_tr { Line 2144  sub end_tr {
  if ($Apache::londefdef::TD_redirection) {   if ($Apache::londefdef::TD_redirection) {
     &end_td_tex($parstack,$parser,$safeeval);          &end_td_tex($parstack,$parser,$safeeval);    
  }   }
  push @{ $Apache::londefdef::table[-1]{'TeXlengthrow'} },$Apache::londefdef::table[-1]{'TeXlength'};  
  push @{ $Apache::londefdef::table[-1]{'lengthrow'} },$Apache::londefdef::table[-1]{'length'};  
     }      }
     return $currentstring;      return $currentstring;
 }  }
Line 1902  sub tag_check { Line 2180  sub tag_check {
     
 sub start_td_tex {  sub start_td_tex {
     my ($parstack,$parser,$safeeval) = @_;      my ($parstack,$parser,$safeeval) = @_;
     my $what_to_push = substr(&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1),0,1);      my $alignchar = substr(&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1),0,1);
     if ($what_to_push eq '') {      if ($alignchar eq '') {
  $what_to_push = substr($Apache::londefdef::table[-1]{'rows'}[0],0,1);;   $alignchar = $Apache::londefdef::table[-1]{'rows'}[-1];
     }      }
     push @{ $Apache::londefdef::table[-1]{'columns'} }, $what_to_push;      push @{ $Apache::londefdef::table[-1]{'align'}[$Apache::londefdef::table[-1]{'row_number'}] }, $alignchar;
     $Apache::londefdef::table[-1]{'counter_columns'}++;      $Apache::londefdef::table[-1]{'counter_columns'}++;
       my $TeXwidth=&Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval,undef,0);
       if (defined $TeXwidth) {
    my $current_length=&recalc($TeXwidth);
    $current_length=~/(\d+\.?\d*)/;
    push @ {$Apache::londefdef::table[-1]{'TeXlen'}[$Apache::londefdef::table[-1]{'row_number'}] },$1;
       }
     &Apache::lonxml::startredirection();      &Apache::lonxml::startredirection();
     return '';      return '';
 }  }
Line 1918  sub end_td_tex { Line 2202  sub end_td_tex {
     my $data=&Apache::lonxml::endredirection();      my $data=&Apache::lonxml::endredirection();
     my $TeXwidth=&Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval,undef,0);      my $TeXwidth=&Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval,undef,0);
     if (defined $TeXwidth) {      if (defined $TeXwidth) {
  my $current_length=&recalc($TeXwidth);   push @ {$Apache::londefdef::table[-1]{'objectlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';
  $current_length=~/(\d+)/;   push @ {$Apache::londefdef::table[-1]{'minlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';
  $Apache::londefdef::table[-1]{'TeXlength'} .= $1.',';   push @ {$Apache::londefdef::table[-1]{'maxlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';
  $Apache::londefdef::table[-1]{'length'} .= '0,';  
     } else {      } else {
  if ($data=~m/width\s*=\s*(\d+\.?\d*\s*(mm|cm|in|pc|pt)*)/) {   if (($data=~m/width\s*=\s*(\d+\.?\d*\s*(mm|cm|in|pc|pt)*)/) or ($data=~m/\[(\d+\.?\d*)\s*mm\]/)) {
     my $current_length=&recalc($1);      my $garbage_data=$data;
     $current_length=~/(\d+\.?\d*)/;      my $fwidth=0;
     $Apache::londefdef::table[-1]{'TeXlength'} .= $1.',';              while ($garbage_data=~m/width\s*=\s*(\d+\.?\d*\s*(mm|cm|in|pc|pt)*)/) {
     $Apache::londefdef::table[-1]{'length'} .= '0,';   my $current_length=&recalc($1);
    $current_length=~/(\d+\.?\d*)/;
    if ($fwidth<$1) {$fwidth=$1;}
    $garbage_data=~s/width\s*=\s*(\d+\.?\d*\s*(mm|cm|in|pc|pt)*)//;
       }
               while ($garbage_data=~m/\[(\d+\.?\d*)\s*mm\]/) {
    my $current_length=$1;
    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';
    } 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;
               while ($garbage_data=~/\\parbox\{\s*(\d+\.?\d*\s*(mm|cm|in|pc|pt)*)\s*\}/) {
    my $current_length=&recalc($1);
    $current_length=~/(\d+\.?\d*)/;
    if ($fwidth<$1) {$fwidth=$1;}
    $garbage_data=~s/\\parbox\{\s*(\d+\.?\d*\s*(mm|cm|in|pc|pt)*)//;
       }
               while ($garbage_data=~/\\epsfxsize\s*=\s*(\d+\.?\d*\s*(mm|cm|in|pc|pt)*)/) {
    my $current_length=&recalc($1);
    $current_length=~/(\d+\.?\d*)/;
    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';
       $data=~s/\\\\\s*$//; 
  } else {     } else {  
     $data=~s/^\s+(\S.*)/$1/;       $data=~s/^\s+(\S.*)/$1/; 
     $data=~s/(.*\S)\s+$/$1/;      $data=~s/(.*\S)\s+$/$1/;
     $data=~s/(\s)+/$1/;      $data=~s/(\s)+/$1/;
     my $current_length=0;      my ($current_length,$min_length)=(0,0);
     if ($data=~/\\vskip/) {      if ($data=~/\\vskip/) {
                 my $newdata=$data;                  my $newdata=$data;
  $newdata=~s/\\vskip \d*\.?\d*\s*mm/THISISJUSTTEMPORARYSEPARATOR/g;   $newdata=~s/\\vskip \d*\.?\d*\s*mm/THISISJUSTTEMPORARYSEPARATOR/g;
  my @newdata=split(/THISISJUSTTEMPORARYSEPARATOR/,$newdata);   my @newdata=split(/THISISJUSTTEMPORARYSEPARATOR/,$newdata);
  foreach my $elementdata (@newdata) {   foreach my $elementdata (@newdata) {
     $elementdata=~s/^\s+(\S.*)/$1/;       my $lengthnewdata=2.5*&LATEX_length($elementdata);
     $elementdata=~s/(.*\S)\s+$/$1/;  
     $elementdata=~s/(\s)+/$1/;  
     my $lengthnewdata=1.8*length($elementdata);  
     if ($lengthnewdata>$current_length) {$current_length=$lengthnewdata;}      if ($lengthnewdata>$current_length) {$current_length=$lengthnewdata;}
                       my @words=split(/ /,$elementdata);
       foreach my $word (@words) {
    my $lengthword=2.5*&LATEX_length($word);
    if ($min_length<$lengthword) {$min_length=$lengthword;}
       }
  }   }
     } else {      } else {
  $current_length=1.8*length($data);   $current_length=2.5*&LATEX_length($data);
                       my @words=split(/ /,$data);
       foreach my $word (@words) {
    my $lengthword=2*&LATEX_length($word);
    if ($min_length<$lengthword) {$min_length=$lengthword;}
       }
     }      }
     $Apache::londefdef::table[-1]{'length'} .= $current_length.',';      push @ {$Apache::londefdef::table[-1]{'TeXlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';
     $Apache::londefdef::table[-1]{'TeXlength'} .= '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 $in=0; $in<=$#{$Apache::londefdef::table[-1]{'include'}};$in++) {            for (my $in=0; $in<=$#{$Apache::londefdef::table[-1]{'include'}};$in++) {         
     $data=~s/\\keephidden\{NEW TABLE ENTRY\}/$Apache::londefdef::table[-1]{'include'}[$in]/;      $data=~s/\\keephidden\{NEW TABLE ENTRY\}/$Apache::londefdef::table[-1]{'include'}[$in]/;
  }   }
     @{ $Apache::londefdef::table[-1]{'rowdata'} }[$current_row] .= '\parbox{TOBECHANGEDONNUMBER}{'.$data.'} '.$Apache::londefdef::table[-1]{'vinc'};      push @ {$Apache::londefdef::table[-1]{'content'}[-1] },$data;
     return'';      return'';
 }  }
   
Line 1977  sub start_th { Line 2302  sub start_th {
     if ($target eq 'web') {      if ($target eq 'web') {
  $currentstring = $token->[4];        $currentstring = $token->[4];     
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  my $what_to_push = substr(&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1),0,1);   $Apache::londefdef::TD_redirection = 1;
  if ($what_to_push eq '') {   &tagg_check('tr','th',$tagstack,$parstack,$parser,$safeeval);
     $what_to_push = substr($Apache::londefdef::table[-1]{'rows'}[0],0,1);;  
  }  
  push @{ $Apache::londefdef::table[-1]{'columns'} }, $what_to_push;  
  $Apache::londefdef::table[-1]{'counter_columns'}++;  
  &Apache::lonxml::startredirection();  
     }       } 
     return $currentstring;      return $currentstring;
 }     }   
            
   sub tagg_check {
       my ($good_tag,$bad_tag,$tagstack,$parstack,$parser,$safeeval) = @_;
       my @ar=@$parstack; 
       for (my $i=$#ar-1;$i>=0;$i--) {
    if (lc($$tagstack[$i]) eq $good_tag) {
       &start_th_tex($parstack,$parser,$safeeval);
       last;
    } elsif (lc($$tagstack[$i]) eq $bad_tag) {
       splice @ar, $i+1;
       &end_th_tex(\@ar,$parser,$safeeval);
       &start_th_tex($parstack,$parser,$safeeval);
       last;
    }
       }
       return '';
   }
    
   sub start_th_tex {
       my ($parstack,$parser,$safeeval) = @_;
       my $alignchar = substr(&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1),0,1);
       if ($alignchar eq '') {
    $alignchar = $Apache::londefdef::table[-1]{'rows'}[-1];
       }
       push @{ $Apache::londefdef::table[-1]{'align'}[$Apache::londefdef::table[-1]{'row_number'}] }, $alignchar;
       $Apache::londefdef::table[-1]{'counter_columns'}++;
       my $TeXwidth=&Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval,undef,0);
       if (defined $TeXwidth) {
    my $current_length=&recalc($TeXwidth);
    $current_length=~/(\d+\.?\d*)/;
    push @ {$Apache::londefdef::table[-1]{'TeXlen'}[$Apache::londefdef::table[-1]{'row_number'}] },$1;
       }
       &Apache::lonxml::startredirection();
       return '';
   }
   
   sub end_th_tex {
       my ($parstack,$parser,$safeeval) = @_;
       my $current_row = $Apache::londefdef::table[-1]{'row_number'};
       my $data=&Apache::lonxml::endredirection();
       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';
       } 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;
       my $fwidth=0;
               while ($garbage_data=~m/width\s*=\s*(\d+\.?\d*\s*(mm|cm|in|pc|pt)*)/) {
    my $current_length=&recalc($1);
    $current_length=~/(\d+\.?\d*)/;
    if ($fwidth<$1) {$fwidth=$1;}
    $garbage_data=~s/width\s*=\s*(\d+\.?\d*\s*(mm|cm|in|pc|pt)*)//;
       }
               while ($garbage_data=~m/\[(\d+\.?\d*)\s*mm\]/) {
    my $current_length=$1;
    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';
    } else {  
       $data=~s/^\s+(\S.*)/$1/; 
       $data=~s/(.*\S)\s+$/$1/;
       $data=~s/(\s)+/$1/;
       my ($current_length,$min_length)=(0,0);
       if ($data=~/\\vskip/) {
                   my $newdata=$data;
    $newdata=~s/\\vskip \d*\.?\d*\s*mm/THISISJUSTTEMPORARYSEPARATOR/g;
    my @newdata=split(/THISISJUSTTEMPORARYSEPARATOR/,$newdata);
    foreach my $elementdata (@newdata) {
       my $lengthnewdata=2.5*&LATEX_length($elementdata);
       if ($lengthnewdata>$current_length) {$current_length=$lengthnewdata;}
                       my @words=split(/ /,$elementdata);
       foreach my $word (@words) {
    my $lengthword=2.5*&LATEX_length($word);
    if ($min_length<$lengthword) {$min_length=$lengthword;}
       }
    }
       } else {
    $current_length=2.5*&LATEX_length($data);
                       my @words=split(/ /,$data);
       foreach my $word (@words) {
    my $lengthword=2*&LATEX_length($word);
    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 $in=0; $in<=$#{$Apache::londefdef::table[-1]{'include'}};$in++) {         
       $data=~s/\\keephidden\{NEW TABLE ENTRY\}/$Apache::londefdef::table[-1]{'include'}[$in]/;
    }
       #make data bold
       $data='\textbf{'.$data.'}';
       push @ {$Apache::londefdef::table[-1]{'content'}[-1] },$data;
       return'';
   }
   
 sub end_th {  sub end_th {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring = '';      my $currentstring = '';
     if ($target eq 'web') {      if ($target eq 'web') {
  $currentstring = $token->[2];        $currentstring = $token->[2];     
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  my $current_row = $Apache::londefdef::table[-1]{'row_number'};          $Apache::londefdef::TD_redirection =0;
  my $data=&Apache::lonxml::endredirection();   &end_th_tex($parstack,$parser,$safeeval);
  my $TeXwidth=&Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval,undef,0);  
  if (defined $TeXwidth) {  
     my $current_length=&recalc($TeXwidth);  
     $current_length=~/(\d+)/;  
     $Apache::londefdef::table[-1]{'TeXlength'} .= $1.',';  
     $Apache::londefdef::table[-1]{'length'} .= '0,';  
  } else {  
     if ($data=~m/width\s*=\s*(\d+\.?\d*\s*(mm|cm|in|pc|pt)*)/) {  
  my $current_length=&recalc($1);  
  $current_length=~/(\d+)/;  
  $Apache::londefdef::table[-1]{'TeXlength'} .= $1.',';  
  $Apache::londefdef::table[-1]{'length'} .= '0,';  
     } else {       
  $data=~/^\s*(\S.*)/;  
  $data=$1;  
  $data=~/(.*\S)\s*$/;  
  $data=$1;  
  my $current_length=2*length($data);  
  $Apache::londefdef::table[-1]{'length'} .= $current_length.',';  
  $Apache::londefdef::table[-1]{'TeXlength'} .= '0,';  
     }          
  }  
  for (my $in=0; $in<=$#{$Apache::londefdef::table[-1]{'include'}};$in++) {                                  
     $data=~s/\\keephidden\{NEW TABLE ENTRY\}/$Apache::londefdef::table[-1]{'include'}[$in]/;  
  }  
  $data='\textbf{'.$data.'}';  
  @{ $Apache::londefdef::table[-1]{'rowdata'} }[$current_row] .= '\parbox{TOBECHANGEDONNUMBER}{'.$data.'} '.$Apache::londefdef::table[-1]{'vinc'};  
     }      }
     return $currentstring;      return $currentstring;
 }  }
 #-- <img> tag       
   #-- <img> tag (end tag forbidden)
   #
   #  Render the <IMG> tag.
   #     <IMG> has the following attributes (in addition to the 
   #     standard HTML ones:
   #      TeXwrap   - Governs how the tex target will try to wrap text around
   #                  horizontally aligned images.
   #      TeXwidth  - The width of the image when rendered for print (mm).
   #      TeXheight - The height of the image when rendered for print (mm)
   #         (Note there seems to also be support for this as a % of page size)
   #      
 sub start_img {  sub start_img {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $src = &Apache::lonxml::get_param('src',$parstack,$safeeval,      my $src = &Apache::lonxml::get_param('src',$parstack,$safeeval,
  undef,1);   undef,1);
       if (not $src and ($target eq 'web' or $target eq 'tex')) { 
    my $inside = &Apache::lonxml::get_all_text("/img",$parser);
    return '';
       }
     $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=$src;      $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=$src;
     my $currentstring = '';      my $currentstring = '';
     my $width_param = '';  
     my $height_param = '';  
     my $scaling = .3;      my $scaling = .3;
   
      # Render unto browsers that which are the browser's...
   
     if ($target eq 'web') {      if ($target eq 'web') {
  if ($ENV{'browser.imagesuppress'} ne 'on') {   if ($ENV{'browser.imagesuppress'} ne 'on') {
     $currentstring.= $token->[4];      $currentstring.=&Apache::lonenc::encrypt_ref($token,{'src'=>$src});
  } else {   } else {
     my $alttag= &Apache::lonxml::get_param      my $alttag= &Apache::lonxml::get_param
  ('alt',$parstack,$safeeval,undef,1);   ('alt',$parstack,$safeeval,undef,1);
Line 2048  sub start_img { Line 2461  sub start_img {
     }      }
     $currentstring.='[IMAGE: '.$alttag.']';      $currentstring.='[IMAGE: '.$alttag.']';
  }   }
   
    # and render unto TeX that which is LaTeX
   
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  $src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);   #
  &image_replication($src);   #  The alignment will require some superstructure to be put around
    #  the \includegraphics stuff.  At present we can only partially
    #  simulate the alignments offered by html.
    #
    #
    my $align = lc(&Apache::lonxml::get_param('align', 
     $parstack,
     $safeeval,
     undef,1));
    if(!$align) {
       $align = "bottom"; # This is html's default so it's ours too.
    }
    #
    &Apache::lonxml::debug("Alignemnt = $align");
    #  LaTeX's image/text wrapping is really bad since it wants to
    #  make figures float.  
           #   The user has the optional parameter (applicable only to l/r
    # alignment to use the picins/parpic directive to get wrapped text
    # this is also imperfect.. that's why we give them a choice...
    # so they can't yell at us for our choice.
    #
    my $latex_rendering = &Apache::lonxml::get_param('TeXwrap',
       $parstack,
       $safeeval,
       undef,0);
    &Apache::lonxml::debug("LaTeX rendering = $latex_rendering");
    if(!$latex_rendering) {
       $latex_rendering = "parbox";
    }
    &Apache::lonxml::debug("LaTeX rendering = $latex_rendering image file: $src");
   
  #if original gif/jpg/png file exist do following:   #if original gif/jpg/png file exist do following:
  if (-e $src) {             my ($path,$file) = &get_eps_image($src);
     #defines the default size of image   $src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);
     my $image = Image::Magick->new;   &Apache::lonxml::debug("path = $path file = $file src = $src");
     my $current_figure = $image->Read($src);   if (-e $src) {
     $width_param = $image->Get('width') * $scaling;;      &Apache::lonxml::debug("$src exists");
     $height_param = $image->Get('height') * $scaling;;      my ($height_param,$width_param)=
     undef $image;   &image_size($src,0.3,$parstack,$safeeval);
     #do we have any specified size of the picture?      my $destpath = $path;
     my $TeXwidth = &Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval);      $destpath    =~ s/ /\_/; # Spaces in path cause LaTex to vomit.
     my $TeXheight = &Apache::lonxml::get_param('TeXheight',$parstack,$safeeval);      $currentstring .= '\graphicspath{{'.$destpath.'}}'
     my $width = &Apache::lonxml::get_param('width',$parstack,$safeeval,   .'\includegraphics[width='.$width_param.' mm,height='.$height_param.'mm]{'.$file.'} ';
    undef,1);  
     if ($TeXwidth ne '') {        #    If there's an alignment specification we need to honor it here.
  if ($TeXwidth=~/(\d+)\s*\%/) {      #    For the horizontal alignments, we will also honor the
     $width_param = $1*$ENV{'form.textwidth'}/100;      #    value of the latex specfication.  The default is parbox,
  } else {       #    and that's used for illegal values too.  
     $width_param = $TeXwidth;      #    
  }      #    Even though we set a default alignment value, the user
     } elsif ($TeXheight ne '') {      #    could have given us an illegal value.  In that case we
  $width_param = $TeXheight/$height_param*$width_param;      #    just use the default alignment of bottom..
     } elsif ($width ne '') {      if      ($align eq "top")    {
  $width_param = $width*$scaling;         $currentstring = '\raisebox{-'.$height_param.'mm}{'.$currentstring.'}';
     }      } elsif (($align eq "center") || ($align eq "middle")) { # Being kind
     if ($width_param > $ENV{'form.textwidth'}) {$width_param =0.95*$ENV{'form.textwidth'}}   my $offset = $height_param/2;
     my $file;   $currentstring = '\raisebox{-'.$offset.'mm}{'.$currentstring.'}';
     my $path;      } elsif ($align eq "left")   { 
     if ($src =~ m!(.*)/([^/]*)$!) {   if ($latex_rendering eq "parpic") { 
  $file = $2;       $currentstring = '\parpic[l]{'.$currentstring.'}';
  $path = $1.'/';    } else {                                     # parbox rendering
     }       $currentstring = "\\strut\\newline\n".
     my $newsrc = $src;   '\parbox{'.$width_param.'mm}{'.$currentstring.'}';
     $newsrc =~ s/\.(gif|jpg|png)$/.eps/i;  
     $file=~s/\.(gif|jpg|png)$/.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.'}}\includegraphics[width='.$width_param.' mm]{'.$file.'} ';  
  }   }
     } else {      } elsif ($align eq "right")  {   
  #there is no eps counterpart for image - check for ps one   if ($latex_rendering eq "parpic") {
  $newsrc =~ s/\.eps$/\.ps/;      $currentstring = '\parpic[r]{'.$currentstring.'}';
  if (-e $newsrc) {   } else {                                 # parbox rendering. 
     #ps counterpart for image exist       $currentstring = '\parbox{'.$width_param.'mm}{\begin{flushright}'
     $file =~ s/\.eps$/\.ps/;               .$currentstring.'\end{flushright}} \newline'."\n";
     if ($path) {  
  $currentstring .= '\vskip 1 mm \noindent\graphicspath{{'.$path.'}}\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/}}\includegraphics[width='.$width_param.' mm]{'.$file.'} ';  
  }   }
       } else { # Bottom is also default.
    # $currentstring = '\raisebox{'.$height_param.'mm}{'.$currentstring.'}';
     }      }
  } else {   } else {
       &Apache::lonxml::debug("$src does not exist");
     #original image file doesn't exist so check the alt attribute      #original image file doesn't exist so check the alt attribute
     my $alt =       my $alt = 
  &Apache::lonxml::get_param('alt',$parstack,$safeeval,undef,1);   &Apache::lonxml::get_param('alt',$parstack,$safeeval,undef,1);
Line 2117  sub start_img { Line 2549  sub start_img {
  $alt=&Apache::lonmeta::alttag($Apache::lonxml::pwd[-1],$src);   $alt=&Apache::lonmeta::alttag($Apache::lonxml::pwd[-1],$src);
     }      }
   
     if ($alt) {      if ($alt) { $currentstring .= ' '.$alt.' '; }
  $currentstring .= ' '.$alt.' ';   }
     } else {  
  #<allow> tag will care about replication    # And here's where the semi-quote breaks down: allow the user
           # to edit the beast as well by rendering the problem for edit:
       } elsif ($target eq 'edit') {
    $currentstring .=&Apache::edit::tag_start($target,$token);
    $currentstring .=&Apache::edit::text_arg('Image Url:','src',$token,70).
       &Apache::edit::browse('src',undef,'alt').' '.
       &Apache::edit::search('src',undef,'alt').'<br />';
    $currentstring .=&Apache::edit::text_arg('Description:','alt',$token,70).'<br />';
    $currentstring .=&Apache::edit::text_arg('width (pixel):','width',$token,5);
    $currentstring .=&Apache::edit::text_arg('height (pixel):','height',$token,5).'<br />';
    $currentstring .=&Apache::edit::text_arg('TeXwidth (mm):','TeXwidth',$token,5);
    $currentstring .=&Apache::edit::text_arg('TeXheight (mm):','TeXheight',$token,5);
    $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);
    $currentstring .=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
    my $src=    &Apache::lonxml::get_param('src',$parstack,$safeeval);
    my $alt=    &Apache::lonxml::get_param('alt',$parstack,$safeeval);
    my $width=  &Apache::lonxml::get_param('width',$parstack,$safeeval);
    my $height= &Apache::lonxml::get_param('height',$parstack,$safeeval);
   
   
    $currentstring .= '<img src="'.$src.'" alt="'.$alt.'" ';
    if ($width) { $currentstring.=' width="'.$width.'" '; }
    if ($height) { $currentstring.=' height="'.$height.'" '; }
    $currentstring .= ' />';
       } elsif ($target eq 'modified') {
    my ($osrc,$owidth,$oheight)=
       ($token->[2]{'src'},$token->[2]{'width'},$token->[2]{'height'});
    my $ctag=&Apache::edit::get_new_args($token,$parstack,
        $safeeval,'src','alt','align',
        'TeXwidth','TeXheight', 'TeXwrap',
        'width','height');
    my ($nsrc,$nwidth,$nheight)=
       ($token->[2]{'src'},$token->[2]{'width'},$token->[2]{'height'});
    my $loc=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$nsrc);
    &image_replication($loc);
    my ($iwidth,$iheight);
    if (-e $loc) {
       my $image = Image::Magick->new;
       $image->Read($loc);
       ($iwidth, $iheight) = ($image->Get('width'),
      $image->Get('height'));
    }
    if ($osrc ne $nsrc || (!$nwidth && !$nheight)) {
       # changed image or no size specified,
               # if they didn't explicitly change the 
               # width or height use the ones from the image
       if ($iwidth && $iheight) {
    if ($owidth == $nwidth || (!$nwidth && !$nheight)) {
       $token->[2]{'width'} = $iwidth;$ctag=1;
    }
    if ($oheight == $nheight || (!$nwidth && !$nheight)) {
       $token->[2]{'height'}=$iheight;$ctag=1;
    }
     }      }
  }   }
    my ($cwidth,$cheight)=($token->[2]{'width'},$token->[2]{'height'});
    # if we don't have a width or height
    if ($iwidth && $cwidth && !$cheight) {
       $token->[2]{'height'}=int(($cwidth/$iwidth)*$iheight);$ctag=1;
    }
    if ($iheight && $cheight && !$cwidth) {
       $token->[2]{'width'}=int(($cheight/$iheight)*$iwidth);$ctag=1;
    }
    if ($ctag) {$currentstring=&Apache::edit::rebuild_tag($token);}
     }      }
   
     return $currentstring;      return $currentstring;
 }  }
   
Line 2138  sub end_img { Line 2635  sub end_img {
     return $currentstring;      return $currentstring;
 }  }
   
 #-- <applet> tag  #-- <applet> tag (end tag required)
 sub start_applet {  sub start_applet {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
           
Line 2152  sub start_applet { Line 2649  sub start_applet {
     my $currentstring = '';      my $currentstring = '';
     if ($target eq 'web') {      if ($target eq 'web') {
  if ($ENV{'browser.appletsuppress'} ne 'on') {   if ($ENV{'browser.appletsuppress'} ne 'on') {
     $currentstring = $token->[4];      $currentstring = &Apache::lonenc::encrypt_ref($token,
     {'code'=>$code,
      'archive'=>$archive}
     );
  } else {   } else {
     my $alttag= &Apache::lonxml::get_param('alt',$parstack,      my $alttag= &Apache::lonxml::get_param('alt',$parstack,
    $safeeval,undef,1);     $safeeval,undef,1);
Line 2163  sub start_applet { Line 2663  sub start_applet {
     $currentstring='[APPLET: '.$alttag.']';      $currentstring='[APPLET: '.$alttag.']';
  }   }
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  $currentstring = " \\begin{figure} ";   my $alttag= &Apache::lonxml::get_param('alt',$parstack,
          $safeeval,undef,1);
    unless ($alttag) {
       my $code=&Apache::lonxml::get_param('code',$parstack,$safeeval,
    undef,1);
       $alttag=&Apache::lonmeta::alttag($Apache::lonxml::pwd[-1],
        $code);
    }
    $currentstring.='\begin{center} \fbox{Java Applet: '.$alttag.
       '.}\end{center}';
     }       } 
     return $currentstring;      return $currentstring;
 }  }
Line 2174  sub end_applet { Line 2683  sub end_applet {
     if ($target eq 'web') {      if ($target eq 'web') {
  $currentstring = $token->[2];   $currentstring = $token->[2];
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  $currentstring = " \\end{figure}";  
     }       } 
     return $currentstring;      return $currentstring;
 }  }
   
 #-- <embed> tag  #-- <embed> tag (end tag optional/required)
 sub start_embed {      sub start_embed {    
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $src=&Apache::lonxml::get_param('src',$parstack,$safeeval,undef,1);      my $src=&Apache::lonxml::get_param('src',$parstack,$safeeval,undef,1);
Line 2187  sub start_embed { Line 2695  sub start_embed {
     my $currentstring = '';      my $currentstring = '';
     if ($target eq 'web') {      if ($target eq 'web') {
  if ($ENV{'browser.embedsuppress'} ne 'on') {   if ($ENV{'browser.embedsuppress'} ne 'on') {
     $currentstring = $token->[4];      $currentstring=&Apache::lonenc::encrypt_ref($token,{'src'=>$src});
  } else {   } else {
     my $alttag=&Apache::lonxml::get_param      my $alttag=&Apache::lonxml::get_param
  ('alt',$parstack,$safeeval,undef,1);   ('alt',$parstack,$safeeval,undef,1);
Line 2197  sub start_embed { Line 2705  sub start_embed {
     $currentstring='[EMBED: '.$alttag.']';      $currentstring='[EMBED: '.$alttag.']';
  }   }
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  $currentstring = " \\begin{figure} ";    
     }       } 
     return $currentstring;      return $currentstring;
 }  }
Line 2207  sub end_embed { Line 2714  sub end_embed {
     my $currentstring = '';      my $currentstring = '';
     if ($target eq 'web') {      if ($target eq 'web') {
  $currentstring = $token->[2];        $currentstring = $token->[2];     
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {  
  $currentstring = " \\end{figure}";    
     }       } 
     return $currentstring;      return $currentstring;
 }  }
   
 #-- <param> tag  #-- <param> tag (end tag forbidden)
 sub start_param {  sub start_param {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     if (&Apache::lonxml::get_param      if (&Apache::lonxml::get_param
Line 2225  sub start_param { Line 2731  sub start_param {
  &Apache::lonxml::get_param('src',$parstack,$safeeval,undef,1);   &Apache::lonxml::get_param('src',$parstack,$safeeval,undef,1);
     my $currentstring = '';      my $currentstring = '';
     if ($target eq 'web') {      if ($target eq 'web') {
  $currentstring = $token->[4];        my %toconvert;
    my $src=&Apache::lonxml::get_param('src',$parstack,$safeeval,undef,1);
    if ($src) { $toconvert{'src'}= $src; }
    my $name=&Apache::lonxml::get_param('name',$parstack,$safeeval,
       undef,1);
    if ($name=~/^cabbase$/i) {
       $toconvert{'value'}=&Apache::lonxml::get_param('value',$parstack,
      $safeeval,undef,1);
    }
    $currentstring = &Apache::lonenc::encrypt_ref($token,\%toconvert);
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  $currentstring = " \\begin{figure} ";    
     }       } 
     return $currentstring;      return $currentstring;
 }  }
Line 2238  sub end_param { Line 2752  sub end_param {
     if ($target eq 'web') {      if ($target eq 'web') {
  $currentstring = $token->[2];        $currentstring = $token->[2];     
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  $currentstring = " \\end{figure}";    
     }       } 
     return $currentstring;      return $currentstring;
 }  }
Line 2250  sub start_allow { Line 2763  sub start_allow {
     $src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);      $src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);
     $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=      $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=
  &Apache::lonnet::clutter($src);   &Apache::lonnet::clutter($src);
     &image_replication($src);      if ($target eq 'tex') { &image_replication($src); }
     my $result;      my $result;
     if ($target eq 'edit') {      if ($target eq 'edit') {
  $result .=&Apache::edit::tag_start($target,$token);   $result .=&Apache::edit::tag_start($target,$token);
Line 2270  sub end_allow { Line 2783  sub end_allow {
     return '';      return '';
 }  }
   
 #-- Frames  #-- Frames (end tag required)
   #-- <frameset>
 sub start_frameset {  sub start_frameset {
     my ($target,$token) = @_;      my ($target,$token) = @_;
     my $currentstring = '';      my $currentstring = '';
     if ($target eq 'web') {       if ($target eq 'web') { 
  if (!$Apache::lonxml::registered) {   if (!$Apache::lonxml::registered &&
       $ENV{'request.state'} eq 'published') {
     $currentstring.='<head>'.      $currentstring.='<head>'.
  &Apache::lonmenu::registerurl(undef,$target).'</head>';   &Apache::lonmenu::registerurl(undef,$target).'</head>';
  }   }
Line 2315  sub end_frameset { Line 2830  sub end_frameset {
     return $currentstring;      return $currentstring;
 }  }
   
 #-- <xmp>  #-- <xmp> (end tag required)
 sub start_xmp {  sub start_xmp {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring = '';      my $currentstring = '';
Line 2338  sub end_xmp { Line 2853  sub end_xmp {
     return $currentstring;      return $currentstring;
 }  }
   
 #-- <pre>  #-- <pre> (end tag required)
 sub start_pre {  sub start_pre {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring = '';      my $currentstring = '';
Line 2421  sub end_blankspace { Line 2936  sub end_blankspace {
     return $currentstring;      return $currentstring;
 }  }
   
 #-- <abbr> tag  #-- <abbr> tag (end tag required)
 sub start_abbr {  sub start_abbr {
     my ($target,$token) = @_;      my ($target,$token) = @_;
     my $currentstring = '';      my $currentstring = '';
Line 2440  sub end_abbr { Line 2955  sub end_abbr {
     return $currentstring;      return $currentstring;
 }  }
   
 #-- <acronym> tag  #-- <acronym> tag (end tag required)
 sub start_acronym {  sub start_acronym {
     my ($target,$token) = @_;      my ($target,$token) = @_;
     my $currentstring = '';      my $currentstring = '';
Line 2459  sub end_acronym { Line 2974  sub end_acronym {
     return $currentstring;      return $currentstring;
 }  }
   
 #-- <area> tag  #-- <area> tag (end tag forbidden)
 sub start_area {  sub start_area {
     my ($target,$token) = @_;      my ($target,$token) = @_;
     my $currentstring = '';      my $currentstring = '';
Line 2478  sub end_area { Line 2993  sub end_area {
     return $currentstring;      return $currentstring;
 }  }
   
 #-- <base> tag  #-- <base> tag (end tag forbidden)
 sub start_base {  sub start_base {
     my ($target,$token) = @_;      my ($target,$token) = @_;
     my $currentstring = '';      my $currentstring = '';
Line 2497  sub end_base { Line 3012  sub end_base {
     return $currentstring;      return $currentstring;
 }  }
   
 #-- <bdo> tag  #-- <bdo> tag (end tag required)
 sub start_bdo {  sub start_bdo {
     my ($target,$token) = @_;      my ($target,$token) = @_;
     my $currentstring = '';      my $currentstring = '';
Line 2516  sub end_bdo { Line 3031  sub end_bdo {
     return $currentstring;      return $currentstring;
 }  }
   
 #-- <bgsound> tag  #-- <bgsound> tag (end tag optional)
 sub start_bgsound {  sub start_bgsound {
     my ($target,$token) = @_;      my ($target,$token) = @_;
     my $currentstring = '';      my $currentstring = '';
Line 2535  sub end_bgsound { Line 3050  sub end_bgsound {
     return $currentstring;      return $currentstring;
 }  }
   
 #-- <blink> tag  #-- <blink> tag (end tag required)
 sub start_blink {  sub start_blink {
     my ($target,$token) = @_;      my ($target,$token) = @_;
     my $currentstring = '';      my $currentstring = '';
Line 2554  sub end_blink { Line 3069  sub end_blink {
     return $currentstring;      return $currentstring;
 }  }
   
 #-- <blockquote> tag  #-- <blockquote> tag (end tag required)
 sub start_blockquote {  sub start_blockquote {
     my ($target,$token) = @_;      my ($target,$token) = @_;
     my $currentstring = '';      my $currentstring = '';
Line 2573  sub end_blockquote { Line 3088  sub end_blockquote {
     return $currentstring;      return $currentstring;
 }  }
   
 #-- <button> tag  #-- <button> tag (end tag required)
 sub start_button {  sub start_button {
     my ($target,$token) = @_;      my ($target,$token) = @_;
     my $currentstring = '';      my $currentstring = '';
Line 2592  sub end_button { Line 3107  sub end_button {
     return $currentstring;      return $currentstring;
 }  }
   
 #-- <caption> tag  #-- <caption> tag (end tag required)
 sub start_caption {  sub start_caption {
     my ($target,$token) = @_;      my ($target,$token) = @_;
     my $currentstring = '';      my $currentstring = '';
Line 2611  sub end_caption { Line 3126  sub end_caption {
     return $currentstring;      return $currentstring;
 }  }
   
 #-- <col> tag  #-- <col> tag (end tag forbdden)
 sub start_col {  sub start_col {
     my ($target,$token) = @_;      my ($target,$token) = @_;
     my $currentstring = '';      my $currentstring = '';
Line 2630  sub end_col { Line 3145  sub end_col {
     return $currentstring;      return $currentstring;
 }  }
   
 #-- <colgroup> tag  #-- <colgroup> tag (end tag optional)
 sub start_colgroup {  sub start_colgroup {
     my ($target,$token) = @_;      my ($target,$token) = @_;
     my $currentstring = '';      my $currentstring = '';
Line 2649  sub end_colgroup { Line 3164  sub end_colgroup {
     return $currentstring;      return $currentstring;
 }  }
   
 #-- <del> tag  #-- <del> tag (end tag required)
 sub start_del {  sub start_del {
     my ($target,$token) = @_;      my ($target,$token) = @_;
     my $currentstring = '';      my $currentstring = '';
Line 2668  sub end_del { Line 3183  sub end_del {
     return $currentstring;      return $currentstring;
 }  }
   
 #-- <fieldset> tag  #-- <fieldset> tag (end tag required)
 sub start_fieldset {  sub start_fieldset {
     my ($target,$token) = @_;      my ($target,$token) = @_;
     my $currentstring = '';      my $currentstring = '';
Line 2687  sub end_fieldset { Line 3202  sub end_fieldset {
     return $currentstring;      return $currentstring;
 }  }
   
 #-- <frame> tag  #-- <frame> tag (end tag forbidden)
 sub start_frame {  sub start_frame {
     my ($target,$token) = @_;      my ($target,$token) = @_;
     my $currentstring = '';      my $currentstring = '';
Line 2706  sub end_frame { Line 3221  sub end_frame {
     return $currentstring;      return $currentstring;
 }  }
   
 #-- <iframe> tag  #-- <iframe> tag (end tag required)
 sub start_iframe {  sub start_iframe {
     my ($target,$token) = @_;      my ($target,$token) = @_;
     my $currentstring = '';      my $currentstring = '';
Line 2725  sub end_iframe { Line 3240  sub end_iframe {
     return $currentstring;      return $currentstring;
 }  }
   
 #-- <ins> tag  #-- <ins> tag (end tag required)
 sub start_ins {  sub start_ins {
     my ($target,$token) = @_;      my ($target,$token) = @_;
     my $currentstring = '';      my $currentstring = '';
Line 2744  sub end_ins { Line 3259  sub end_ins {
     return $currentstring;      return $currentstring;
 }  }
   
 #-- <isindex> tag  #-- <isindex> tag (end tag forbidden)
 sub start_isindex {  sub start_isindex {
     my ($target,$token) = @_;      my ($target,$token) = @_;
     my $currentstring = '';      my $currentstring = '';
Line 2763  sub end_isindex { Line 3278  sub end_isindex {
     return $currentstring;      return $currentstring;
 }  }
   
 #-- <keygen> tag  #-- <keygen> tag (end tag forbidden)
 sub start_keygen {  sub start_keygen {
     my ($target,$token) = @_;      my ($target,$token) = @_;
     my $currentstring = '';      my $currentstring = '';
Line 2801  sub end_label { Line 3316  sub end_label {
     return $currentstring;      return $currentstring;
 }  }
   
 #-- <layer> tag  #-- <layer> tag (end tag required)
 sub start_layer {  sub start_layer {
     my ($target,$token) = @_;      my ($target,$token) = @_;
     my $currentstring = '';      my $currentstring = '';
Line 2820  sub end_layer { Line 3335  sub end_layer {
     return $currentstring;      return $currentstring;
 }  }
   
 #-- <legend> tag  #-- <legend> tag (end tag required)
 sub start_legend {  sub start_legend {
     my ($target,$token) = @_;      my ($target,$token) = @_;
     my $currentstring = '';      my $currentstring = '';
Line 2839  sub end_legend { Line 3354  sub end_legend {
     return $currentstring;      return $currentstring;
 }  }
   
 #-- <link> tag  #-- <link> tag (end tag forbidden)
 sub start_link {  sub start_link {
     my ($target,$token) = @_;      my ($target,$token) = @_;
     my $currentstring = '';      my $currentstring = '';
Line 2858  sub end_link { Line 3373  sub end_link {
     return $currentstring;      return $currentstring;
 }  }
   
 #-- <marquee> tag  #-- <marquee> tag (end tag optional)
 sub start_marquee {  sub start_marquee {
     my ($target,$token) = @_;      my ($target,$token) = @_;
     my $currentstring = '';      my $currentstring = '';
Line 2877  sub end_marquee { Line 3392  sub end_marquee {
     return $currentstring;      return $currentstring;
 }  }
   
 #-- <malticol> tag  #-- <multicol> tag (end tag required)
 sub start_malticol {  sub start_multicol {
     my ($target,$token) = @_;      my ($target,$token) = @_;
     my $currentstring = '';      my $currentstring = '';
     if ($target eq 'web') {      if ($target eq 'web') {
Line 2887  sub start_malticol { Line 3402  sub start_malticol {
     return $currentstring;      return $currentstring;
 }  }
   
 sub end_malticol {  sub end_multicol {
     my ($target,$token) = @_;      my ($target,$token) = @_;
     my $currentstring = '';      my $currentstring = '';
     if ($target eq 'web') {      if ($target eq 'web') {
Line 2896  sub end_malticol { Line 3411  sub end_malticol {
     return $currentstring;      return $currentstring;
 }  }
   
 #-- <nobr> tag  #-- <nobr> tag (end tag required)
 sub start_nobr {  sub start_nobr {
     my ($target,$token) = @_;      my ($target,$token) = @_;
     my $currentstring = '';      my $currentstring = '';
     if ($target eq 'web') {      if ($target eq 'web') {
  $currentstring = $token->[4];        $currentstring = $token->[4];     
     }       }  elsif ($target eq 'tex') {
    $currentstring='\mbox{';
       }
     return $currentstring;      return $currentstring;
 }  }
   
Line 2911  sub end_nobr { Line 3428  sub end_nobr {
     my $currentstring = '';      my $currentstring = '';
     if ($target eq 'web') {      if ($target eq 'web') {
  $currentstring = $token->[2];       $currentstring = $token->[2];    
     }       }   elsif ($target eq 'tex') {
    $currentstring='}';
       }
     return $currentstring;      return $currentstring;
 }  }
   
 #-- <noembed> tag  #-- <noembed> tag (end tag required)
 sub start_noembed {  sub start_noembed {
     my ($target,$token) = @_;      my ($target,$token) = @_;
     my $currentstring = '';      my $currentstring = '';
Line 2934  sub end_noembed { Line 3453  sub end_noembed {
     return $currentstring;      return $currentstring;
 }  }
   
 #-- <noframes> tag  #-- <noframes> tag (end tag required)
 sub start_noframes {  sub start_noframes {
     my ($target,$token) = @_;      my ($target,$token) = @_;
     my $currentstring = '';      my $currentstring = '';
Line 2953  sub end_noframes { Line 3472  sub end_noframes {
     return $currentstring;      return $currentstring;
 }  }
   
 #-- <nolayer> tag  #-- <nolayer> tag (end tag required)
 sub start_nolayer {  sub start_nolayer {
     my ($target,$token) = @_;      my ($target,$token) = @_;
     my $currentstring = '';      my $currentstring = '';
Line 2972  sub end_nolayer { Line 3491  sub end_nolayer {
     return $currentstring;      return $currentstring;
 }  }
   
 #-- <noscript> tag  #-- <noscript> tag (end tag required)
 sub start_noscript {  sub start_noscript {
     my ($target,$token) = @_;      my ($target,$token) = @_;
     my $currentstring = '';      my $currentstring = '';
Line 2991  sub end_noscript { Line 3510  sub end_noscript {
     return $currentstring;      return $currentstring;
 }  }
   
 #-- <object> tag  #-- <object> tag (end tag required)
 sub start_object {  sub start_object {
     my ($target,$token) = @_;      my ($target,$token) = @_;
     my $currentstring = '';      my $currentstring = '';
Line 3010  sub end_object { Line 3529  sub end_object {
     return $currentstring;      return $currentstring;
 }  }
   
 #-- <optgroup> tag  #-- <optgroup> tag (end tag required)
 sub start_optgroup {  sub start_optgroup {
     my ($target,$token) = @_;      my ($target,$token) = @_;
     my $currentstring = '';      my $currentstring = '';
Line 3029  sub end_optgroup { Line 3548  sub end_optgroup {
     return $currentstring;      return $currentstring;
 }  }
   
 #-- <samp> tag  #-- <samp> tag (end tag required)
 sub start_samp {  sub start_samp {
     my ($target,$token) = @_;      my ($target,$token) = @_;
     my $currentstring = '';      my $currentstring = '';
     if ($target eq 'web') {      if ($target eq 'web') {
  $currentstring = $token->[4];        $currentstring = $token->[4];     
     }       } elsif ($target eq 'tex') {
    $currentstring='\texttt{';
       }
     return $currentstring;      return $currentstring;
 }  }
   
Line 3044  sub end_samp { Line 3565  sub end_samp {
     my $currentstring = '';      my $currentstring = '';
     if ($target eq 'web') {      if ($target eq 'web') {
  $currentstring = $token->[2];       $currentstring = $token->[2];    
     }       } elsif ($target eq 'tex') {
    $currentstring='}';
       }
     return $currentstring;      return $currentstring;
 }  }
   
Line 3067  sub end_server { Line 3590  sub end_server {
     return $currentstring;      return $currentstring;
 }  }
   
 #-- <spacer> tag  #-- <spacer> tag (end tag forbidden)
 sub start_spacer {  sub start_spacer {
     my ($target,$token) = @_;      my ($target,$token) = @_;
     my $currentstring = '';      my $currentstring = '';
Line 3086  sub end_spacer { Line 3609  sub end_spacer {
     return $currentstring;      return $currentstring;
 }  }
   
 #-- <span> tag  #-- <span> tag (end tag required)
 sub start_span {  sub start_span {
     my ($target,$token) = @_;      my ($target,$token) = @_;
     my $currentstring = '';      my $currentstring = '';
Line 3105  sub end_span { Line 3628  sub end_span {
     return $currentstring;      return $currentstring;
 }  }
   
 #-- <tbody> tag  #-- <tbody> tag (end tag optional)
 sub start_tbody {  sub start_tbody {
     my ($target,$token) = @_;      my ($target,$token) = @_;
     my $currentstring = '';      my $currentstring = '';
Line 3225  sub end_hideweboutput { Line 3748  sub end_hideweboutput {
   
 sub image_replication {  sub image_replication {
     my $src = shift;      my $src = shift;
     if (not -e $src) {      if (not -e $src) { &Apache::lonnet::repcopy($src); }
  #replicates image itself      #replicates eps or ps 
  &Apache::lonnet::repcopy($src);      my $epssrc = my $pssrc = $src;
  #replicates eps or ps       $epssrc =~ s/\.(gif|jpg|jpeg|png)$/.eps/i;
  my $newsrc = $src;      $pssrc  =~ s/\.(gif|jpg|jpeg|png)$/.ps/i;
  $newsrc =~ s/\.(gif|jpg|jpeg|png)$/.eps/i;      if (not -e $epssrc && not -e $pssrc) {
  if (not -e $newsrc) {   my $result=&Apache::lonnet::repcopy($epssrc);
     if (&Apache::lonnet::repcopy($newsrc) ne 'OK') {   if ($result ne 'OK') { &Apache::lonnet::repcopy($pssrc); }
  $newsrc =~ s/\.eps$/\.ps/;      }
  &Apache::lonnet::repcopy($newsrc);      return '';
   }
   
   sub image_size {
       my ($src,$scaling,$parstack,$safeeval,$depth,$cis)=@_;
   
       #size of image from gif/jpg/jpeg/png 
       my $ressrc=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);
       if (-e $ressrc) {
    $src = $ressrc;
       }
       my $image = Image::Magick->new;
       my $current_figure = $image->Read($src);
       my $width_param = $image->Get('width') * $scaling;;
       my $height_param = $image->Get('height') * $scaling;
       &Apache::lonxml::debug("Image magick says: $src :  Height = $height_param width = $width_param");
       undef($image);
       #do we have any specified LaTeX size of the picture?
       my $toget='TeXwidth'; 
       if ($cis) { 
    $toget=lc($toget); 
       }
       my $TeXwidth = &Apache::lonxml::get_param($toget,$parstack,
         $safeeval,$depth,$cis);
       $toget='TeXheight'; if ($cis) { $toget=lc($toget); }
       my $TeXheight = &Apache::lonxml::get_param($toget,$parstack,
          $safeeval,$depth,$cis);
       #do we have any specified web size of the picture?
       my $width = &Apache::lonxml::get_param('width',$parstack,$safeeval,
      $depth,1);
       if ($TeXwidth) { 
    my $old_width_param=$width_param;
    if ($TeXwidth=~/(\d+)\s*\%/) {
       $width_param = $1*$ENV{'form.textwidth'}/100;
    } else { 
       $width_param = $TeXwidth;
    }
    $height_param=$TeXwidth/$old_width_param*$height_param;
       } elsif ($TeXheight) {
    $height_param = $TeXheight;
    $width_param  = $TeXheight/$height_param*$width_param;
       } elsif ($width) {
    my $old_width_param=$width_param;
    $width_param = $width*$scaling;
           $height_param=$width_param/$old_width_param*$height_param;
       }
       if ($width_param > $ENV{'form.textwidth'}) {
           my $old_width_param=$width_param;
    $width_param =0.95*$ENV{'form.textwidth'};
           $height_param=$width_param/$old_width_param*$height_param;
       }
       return ($height_param, $width_param);
   }
   
   sub image_width {
       my ($height, $width) = &image_size(@_);
       return $width;
   }
   #  Not yet 100% sure this is correct in all circumstances..
   #  due to my uncertainty about mods to image_size.
   #
   sub image_height {
       my ($height, $width) = &image_size(@_);
       return $height;
   }
   
   sub get_eps_image {
       my ($src)=@_;
       my $orig_src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1], $src);
       &Apache::lonxml::debug("get_eps_image: Original image: $orig_src<BR />");
       $src=~s/\.(gif|png|jpg|jpeg)$/\.eps/i;
       $src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);
       &Apache::lonxml::debug("Filelocation gives; $src <BR />");
       if (! -e $src) {
    &Apache::lonxml::debug("$src does not exist");
    if (&Apache::lonnet::repcopy($src) ne 'OK' ) {
       &Apache::lonxml::debug("Repcopy of $src failed (1)");
       #if replication failed try to find ps file
       $src=~s/\.eps$/\.ps/;
       &Apache::lonxml::debug("Now looking for $src");
       #if no ps file try to replicate it
       if (not -e $src &&
    &Apache::lonnet::repcopy($src) ne 'OK') {
    &Apache::lonxml::debug("Failed to find or replicate $src");
   
    #if replication failed try to produce eps file dynamically
    $src=~s/\.ps$/\.eps/;
    my $temp_file;
    open(FILE,">>/home/httpd/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_printout.dat");
    my $newsrc=$orig_src;
    $newsrc =~ s|(.*)/res/|/home/httpd/html/res/|;
    &Apache::lonxml::debug("queueing $newsrc for dynamic eps production. <BR/>");
    print FILE "$newsrc\n";
    close FILE;
    $src=~s|/home/httpd/html/res|/home/httpd/prtspool|;
    $src=~s|/home/([^/]*)/public_html/|/home/httpd/prtspool/$1/|;
     }      }
  }   }
     }      }
     return '';      my ($path,$file)=($src=~m|(.*)/([^/]*)$|);
       &Apache::lonxml::debug("get_eps_image returning: $path / $file<BR />");
       return ($path.'/',$file);
   }
   
   sub eps_generation {
       my ($src,$file,$width_param) = @_;     
       my $filename = "/home/httpd/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_printout.dat";
       my $temp_file = Apache::File->new('>>'.$filename); 
       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\//;
       }
       if ($newsrc=~/\/userfiles\//) {
    return ' \graphicspath{{'.$newsrc.'}}\includegraphics[width='.$width_param.' mm]{'.$file.'} ';
       } else {
    return ' \graphicspath{{/home/httpd/prtspool'.$newsrc.'}}\includegraphics[width='.$width_param.' mm]{'.$file.'} ';
       }
   }
   
   sub file_path {     
       my $src=shift;
       my ($file,$path); 
       if ($src =~ m!(.*)/([^/]*)$!) {
    $file = $2; 
    $path = $1.'/'; 
       } 
       return $file,$path;
 }  }
   
 sub recalc {  sub recalc {
Line 3259  sub recalc { Line 3911  sub recalc {
     return $value.' mm';      return $value.' mm';
 }  }
   
   sub LATEX_length {
       my $garbage=shift;
       $garbage=~s/^\s+$//;
       $garbage=~s/^\s+(\S.*)/$1/;#space before 
       $garbage=~s/(.*\S)\s+$/$1/;#space after 
       $garbage=~s/(\s)+/$1/;#only one space
       $garbage=~s/(\\begin{([^\}]+)}|\\end{([^\}]+)})//g;#remove LaTeX \begin{...} and \end{...}
       $garbage=~s/(\$\_\{|\$\_|\$\^{|\$\^|\}\$)//g;#remove $_{,$_,$^{,$^,}$
       $garbage=~s/([^\\])\$/$1/g;#$
       $garbage=~s/(\\ensuremath\{\_\{|\\ensuremath\{\_|\\ensuremath\{\^{|\\ensuremath\{\^|\})//g;#remove \ensuremath{...}
      $garbage=~s/(\\alpha|\\beta|\\gamma|\\delta|\\epsilon|\\verepsilon|\\zeta|\\eta|\\theta|\\vartheta|\\iota|\\kappa|\\lambda|\\mu|\\nu|\\xi|\\pi|\\varpi|\\rho|\\varrho|\\sigma|\\varsigma|\\tau|\\upsilon|\\phi|\\varphi|\\chi|\\psi|\\omega|\\Gamma|\\Delta|\\Theta|\\Lambda|\\Xi|\\Pi|\\Sigma|\\Upsilon|\\Phi|\\Psi|\\Omega)/1/g;
       $garbage=~s/(\\pm|\\mp|\\times|\\div|\\cdot|\\ast|\\star|\\dagger|\\ddagger|\\amalg|\\cap|\\cup|\\uplus|\\sqcap|\\sqcup|\\vee|\\wedge|\\oplus|\\ominus|\\otimes|\\circ|\\bullet|\\diamond|\\lhd|\\rhd|\\unlhd|\\unrhd|\\oslash|\\odot|\\bigcirc|\\Box|\\Diamond|\\bigtriangleup|\\bigtriangledown|\\triangleleft|\\triangleright|\\setminus|\\wr)/1/g;
       $garbage=~s/(\\le|\\ll|\\leq|\\ge|\\geq|\\gg|\\neq|\\doreq|\\sim|\\simeq|\\subset|\\subseteq|\\sqsubset|\\sqsubseteq|\\in|\\vdash|\\models|\\supset|\\supseteq|\\sqsupset|\\sqsupseteq|\\ni|\\dash|\\perp|\\approx|\\cong|\\equiv|\\propto|\\prec|\\preceq|\\parallel|\\asymp|\\smile|\\frown|\\bowtie|\\succ|\\succeq|\\mid)/1/g;
       $garbage=~s/(\\not<|\\\\not\\le|\\not\\prec|\\not\\preceq|\\not\\subset|\\not\\subseteq|\\not\\sqsubseteq|\\not\\in|\\not>|\\not\\ge|\\not\\succ|\\notsucceq|\\not\\supset|\\notsupseteq|\\not\\sqsupseteq|\\notin|\\not=|\\not\\equiv|\\not\\sim|\\not\\simeq|\\not\\approx|\\not\\cong|\\not\\asymp)/1/g;
       $garbage=~s/(\\leftarrow|\\gets|\\Leftarrow|\\rightarrow|\\to|\\Rightarrow|\\leftrightarrow|\\Leftrightarrow|\\mapsto|\\hookleftarrow|\\leftharpoonup|\\leftkarpoondown|\\rightleftharpoons|\\longleftarrow|\\Longleftarrow|\\longrightarrow|\\Longrightarrow|\\longleftrightarrow|\\Longleftrightarrow|\\longmapsto|\\hookrightarrow|\\rightharpoonup|\\rightharpoondown|\\uparrow|\\Uparrow|\\downarrow|\\Downarrow|\\updownarrow|\\Updownarrow|\\nearrow|\\searrow|\\swarrow|\\nwarrow)/11/g;
       $garbage=~s/(\\aleph|\\hbar|\\imath|\\jmath|\\ell|\\wp|\\Re|\\Im|\\mho|\\prime|\\emptyset|\\nabla|\\surd|\\partial|\\top|\\bot|\\vdash|\\dashv|\\forall|\\exists|\\neg|\\flat|\\natural|\\sharp|\\\||\\angle|\\backslash|\\Box|\\Diamond|\\triangle|\\clubsuit|\\diamondsuit|\\heartsuit|\\spadesuit|\\Join|\\infty)/11/g;
       $garbage=~s/(\\hat{([^}]+)}|\\check{([^}]+)}|\\dot{([^}]+)}|\\breve{([^}]+)}|\\acute{([^}]+)}|\\ddot{([^}]+)}|\\grave{([^}]+)}|\\tilde{([^}]+)}|\\mathring{([^}]+)}|\\bar{([^}]+)}|\\vec{([^}]+)})/$1/g;
       #remove some other LaTeX command
       $garbage=~s|\\(\w+)\\|\\|g;  
       $garbage=~s|\\(\w+)(\s*)|$2|g;  
       $garbage=~s|\+|11|g;
       my  $value=length($garbage);
       return $value;
   }
   
   
   
   
 1;  1;
 __END__  __END__

Removed from v.1.166  
changed lines
  Added in v.1.262


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>
500 Internal Server Error

Internal Server Error

The server encountered an internal error or misconfiguration and was unable to complete your request.

Please contact the server administrator at root@localhost to inform them of the time this error occurred, and the actions you performed just before this error.

More information about this error may be available in the server error log.