--- loncom/xml/londefdef.pm 2001/08/06 20:41:22 1.32 +++ loncom/xml/londefdef.pm 2001/11/29 19:03:58 1.34 @@ -1,6 +1,42 @@ # The LearningOnline Network with CAPA # Tags Default Definition Module # +# $Id: londefdef.pm,v 1.34 2001/11/29 19:03:58 www Exp $ +# +# 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 # 11/6,11/30,02/01/01,5/4 Gerd Kortemeyer @@ -28,31 +64,35 @@ sub end_output { return ''; } #-- tag - sub start_m { - my ($target,$token,$tagstack,$parstack,$parser) = @_; - my $currentstring = ''; - if ($target eq 'web') { - my $inside = &Apache::lonxml::get_all_text("/m",$$parser[$#$parser]); - $inside ='\\documentstyle{article}'.$inside; -# &Apache::lonxml::debug($inside); - $currentstring = &Apache::lontexconvert::converted(\$inside); -# &Apache::lonxml::debug($currentstring); - - } elsif ($target eq 'tex') { - $currentstring = ""; - } - return $currentstring; - } - sub end_m { - my ($target,$token) = @_; - my $currentstring = ''; - if ($target eq 'web') { - } elsif ($target eq 'tex') { - $currentstring = ""; - } elsif ($target eq 'meta') { - } - return $currentstring; - } +sub start_m { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; + my $currentstring = ''; + if ($target eq 'web') { + my $inside = &Apache::lonxml::get_all_text("/m",$$parser[-1]); + $inside ='\\documentstyle{article}'.$inside; + #&Apache::lonxml::debug("M is starting with:$inside:"); + my $eval=&Apache::lonxml::get_param('eval',$parstack,$safeeval); + if ($eval eq 'on') { + $inside=&Apache::run::evaluate($inside,$safeeval,$$parstack[-1]); + #&Apache::lonxml::debug("M is evaulated to:$inside:"); + } + $currentstring = &Apache::lontexconvert::converted(\$inside); + #&Apache::lonxml::debug("M is ends with:$currentstring:"); + } elsif ($target eq 'tex') { + $currentstring = ""; + } + return $currentstring; +} +sub end_m { + my ($target,$token) = @_; + my $currentstring = ''; + if ($target eq 'web') { + } elsif ($target eq 'tex') { + $currentstring = ""; + } elsif ($target eq 'meta') { + } + return $currentstring; +} #-------------------------------------------------------------------------- tag sub start_html { my ($target,$token) = @_; @@ -266,9 +306,7 @@ sub end_output { } my $onLoad=''; foreach my $key (keys(%{$token->[2]})) { - &Apache::lonxml::debug("testing $key"); if ($key =~ /^onload$/i) { - &Apache::lonxml::debug("I like $key"); $onLoad.=$token->[2]->{$key}.';'; delete($token->[2]->{$key}); }