Diff for /loncom/xml/londefdef.pm between versions 1.31 and 1.34

version 1.31, 2001/07/03 20:58:27 version 1.34, 2001/11/29 19:03:58
Line 1 Line 1
 # The LearningOnline Network with CAPA  # The LearningOnline Network with CAPA
 # Tags Default Definition Module   # Tags Default Definition Module 
 #  #
   # $Id$
   #
   # Copyright Michigan State University Board of Trustees
   #
   # This file is part of the LearningOnline Network with CAPA (LON-CAPA).
   #
   # LON-CAPA is free software; you can redistribute it and/or modify
   # it under the terms of the GNU General Public License as published by
   # the Free Software Foundation; either version 2 of the License, or
   # (at your option) any later version.
   #
   # LON-CAPA is distributed in the hope that it will be useful,
   # but WITHOUT ANY WARRANTY; without even the implied warranty of
   # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   # GNU General Public License for more details.
   #
   # You should have received a copy of the GNU General Public License
   # along with LON-CAPA; if not, write to the Free Software
   # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
   #
   # /home/httpd/html/adm/gpl.txt
   #
   # http://www.lon-capa.org/
   #
   # Copyright for TtHfunc and TtMfunc by Ian Hutchinson. 
   # TtHfunc and TtMfunc (the "Code") may be compiled and linked into 
   # binary executable programs or libraries distributed by the 
   # Michigan State University (the "Licensee"), but any binaries so 
   # distributed are hereby licensed only for use in the context
   # of a program or computational system for which the Licensee is the 
   # primary author or distributor, and which performs substantial 
   # additional tasks beyond the translation of (La)TeX into HTML.
   # The C source of the Code may not be distributed by the Licensee
   # to any other parties under any circumstances.
   #
   #
 # last modified 06/26/00 by Alexander Sakharuk  # last modified 06/26/00 by Alexander Sakharuk
 # 11/6,11/30,02/01/01,5/4 Gerd Kortemeyer  # 11/6,11/30,02/01/01,5/4 Gerd Kortemeyer
   
Line 28  sub end_output { Line 64  sub end_output {
   return '';    return '';
 }  }
 #-- <m> tag  #-- <m> tag
         sub start_m {  sub start_m {
     my ($target,$token,$tagstack,$parstack,$parser) = @_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
             my $currentstring = '';    my $currentstring = '';
             if ($target eq 'web') {    if ($target eq 'web') {
  my $inside = &Apache::lonxml::get_all_text("/m",$$parser[$#$parser]);       my $inside = &Apache::lonxml::get_all_text("/m",$$parser[-1]);
                 $inside ='\\documentstyle{article}'.$inside;      $inside ='\\documentstyle{article}'.$inside;
 #          &Apache::lonxml::debug($inside);      #&Apache::lonxml::debug("M is starting with:$inside:");
                 $currentstring = &Apache::lontexconvert::converted(\$inside);      my $eval=&Apache::lonxml::get_param('eval',$parstack,$safeeval);
 #          &Apache::lonxml::debug($currentstring);      if ($eval eq 'on') {
         $inside=&Apache::run::evaluate($inside,$safeeval,$$parstack[-1]);
     } elsif ($target eq 'tex') {        #&Apache::lonxml::debug("M is evaulated to:$inside:");
               $currentstring = "";      }
             }      $currentstring = &Apache::lontexconvert::converted(\$inside);
    return $currentstring;      #&Apache::lonxml::debug("M is ends with:$currentstring:");
  }    } elsif ($target eq 'tex') {
         sub end_m {      $currentstring = "";
     my ($target,$token) = @_;    }
             my $currentstring = '';    return $currentstring;
             if ($target eq 'web') {  }
             } elsif ($target eq 'tex') {  sub end_m {
               $currentstring = "";    my ($target,$token) = @_;
     } elsif ($target eq 'meta') {    my $currentstring = '';
             }    if ($target eq 'web') {
    return $currentstring;    } elsif ($target eq 'tex') {
  }      $currentstring = "";
     } elsif ($target eq 'meta') {
     }
     return $currentstring;
   }
 #-------------------------------------------------------------------------- <html> tag      #-------------------------------------------------------------------------- <html> tag    
       sub start_html {        sub start_html {
     my ($target,$token) = @_;      my ($target,$token) = @_;
Line 264  sub end_output { Line 304  sub end_output {
       if (!$Apache::lonxml::registered) {        if (!$Apache::lonxml::registered) {
  $currentstring.='<head>'.&Apache::lonxml::registerurl().'</head>';   $currentstring.='<head>'.&Apache::lonxml::registerurl().'</head>';
       }        }
       $token->[2]->{'onLoad'}.=&Apache::lonxml::loadevents();        my $onLoad='';
       $token->[2]->{'onUnload'}.=&Apache::lonxml::unloadevents();        foreach my $key (keys(%{$token->[2]})) {
    if ($key =~ /^onload$/i) {
     $onLoad.=$token->[2]->{$key}.';';
     delete($token->[2]->{$key});
    }
         }
         $token->[2]->{'onLoad'}=$onLoad.&Apache::lonxml::loadevents();
         my $onUnload='';
         foreach my $key (keys(%{$token->[2]})) {
    if ($key =~ /^onunload$/i) {
     $onUnload.=$token->[2]->{$key}.';';
     delete($token->[2]->{$key});
    }
         }
         $token->[2]->{'onUnload'}=$onUnload.
    &Apache::lonxml::unloadevents();
   
       $currentstring .= '<'.$token->[1];        $currentstring .= '<'.$token->[1];
       map {        map {

Removed from v.1.31  
changed lines
  Added in v.1.34


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>