--- loncom/xml/londefdef.pm 2002/02/26 21:44:45 1.44 +++ loncom/xml/londefdef.pm 2002/03/22 17:52:20 1.49 @@ -2,7 +2,7 @@ # The LearningOnline Network with CAPA # Tags Default Definition Module # -# $Id: londefdef.pm,v 1.44 2002/02/26 21:44:45 sakharuk Exp $ +# $Id: londefdef.pm,v 1.49 2002/03/22 17:52:20 albertel Exp $ # # # Copyright Michigan State University Board of Trustees @@ -50,7 +50,7 @@ use Apache::lonxml; BEGIN { - &Apache::lonxml::register('Apache::londefdef',('m','html','head','map','select','option','input','textarea','form','meta','title','body','center','b','strong','table','dt','h1','h2','h3','h4','h5','h6','cite','i','address','dd','dl','dir','ol','ul','menu','dfn','kbd','tt','code','em','q','p','br','big','small','basefont','font','s','sub','strike','sup','hr','a','li','u','output','param','applet','img','embed','tr','td','allow','frameset','pre','insert')); + &Apache::lonxml::register('Apache::londefdef',('m','html','head','map','select','option','input','textarea','form','meta','title','body','center','b','strong','table','dt','h1','h2','h3','h4','h5','h6','cite','i','address','dd','dl','dir','ol','ul','menu','dfn','kbd','tt','code','em','q','p','br','big','small','basefont','font','s','sub','strike','sup','hr','a','li','u','output','param','applet','img','embed','tr','td','allow','frameset','pre','insert','externallink')); } @@ -115,14 +115,6 @@ sub end_m { &Apache::lonxml::fontsettings(); } elsif ($target eq 'tex') { $currentstring .= '\documentclass[letterpaper]{article} - \setlength{\oddsidemargin}{-40pt} - \setlength{\evensidemargin}{-60pt} - \setlength{\topmargin}{200pt} - \setlength{\textwidth}{4.4in} - \setlength{\textheight}{6.8in} - \setlength{\parindent}{20pt} - \setlength{\marginparwidth}{90pt} - \setlength{\textfloatsep}{8pt plus 2.0pt minus 4.0pt} \newcommand{\keephidden}[1]{} \usepackage[dvips]{graphicx} \usepackage{epsfig}'; @@ -150,7 +142,7 @@ sub end_m { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web') { - $currentstring = &Apache::lonxml::registerurl(). + $currentstring = &Apache::lonxml::registerurl(undef,$target). $token->[2]; } return $currentstring; @@ -332,7 +324,8 @@ sub end_m { my $currentstring = ''; if ($target eq 'web') { if (!$Apache::lonxml::registered) { - $currentstring.=''.&Apache::lonxml::registerurl().''; + $currentstring.=''. + &Apache::lonxml::registerurl(undef,$target).''; } my $onLoad=''; foreach my $key (keys(%{$token->[2]})) { @@ -360,7 +353,7 @@ sub end_m { if ($ENV{'request.state'} ne 'published') { $currentstring.=(< - + EDITBUTTON } @@ -1337,14 +1330,6 @@ EDITBUTTON if ($target eq 'web') { $currentstring = $token->[4]; } elsif ($target eq 'tex') { -#<<<<<<< londefdef.pm -# my $durty = $token->[2]->{'src'}; -# $durty =~ s!(^.*)/(.*)$!$1/!; -# my $durtytwo = $2; -# $currentstring = '\graphicspath{{/home/httpd/html'.$durty.'}}\fbox{\includegraphics{'.$durtytwo.'}}'; -# } -# return $currentstring; -#======= my $src = &Apache::lonxml::get_param('src',$parstack,$safeeval); my $file; my $path; @@ -1365,13 +1350,12 @@ EDITBUTTON } $file=~s/(\.gif|\.jpg)$/\.eps/; if ($path) { - $currentstring = '\graphicspath{{'.$path.'}}\fbox{\includegraphics{'.$file.'}}'; + $currentstring = '\graphicspath{{'.$path.'/}}\fbox{\includegraphics{'.$file.'}}'; } else { $currentstring = 'See the image at \tt{'.$src.'}'; } } return $currentstring; -#>>>>>>> 1.43 } sub end_img { my ($target,$token) = @_; @@ -1412,8 +1396,7 @@ sub end_applet { #-- tag -sub start_embed { - +sub start_embed { my ($target,$token) = @_; $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]= $token->[2]->{'src'}; @@ -1484,7 +1467,8 @@ sub start_embed { my $currentstring = ''; if ($target eq 'web') { if (!$Apache::lonxml::registered) { - $currentstring.=''.&Apache::lonxml::registerurl().''; + $currentstring.=''. + &Apache::lonxml::registerurl(undef,$target).''; } $currentstring .= $token->[4]; } @@ -1521,10 +1505,11 @@ sub start_embed { } #-- sub start_insert { - my ($target,$token) = @_; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; my $currentstring = ''; if ($target eq 'web') { - $currentstring .= ''.$token->[2]->{'display'}.'';; + my $display = &Apache::lonxml::get_param('display',$parstack,$safeeval); + $currentstring .= ''.$display.'';; } return $currentstring; } @@ -1532,6 +1517,24 @@ sub start_embed { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web') { + $currentstring .= ''; + } + return $currentstring; + } +#-- + sub start_externallink { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; + my $currentstring = ''; + if ($target eq 'web') { + my $display = &Apache::lonxml::get_param('display',$parstack,$safeeval); + $currentstring .= ''.$display.'';; + } + return $currentstring; + } + sub end_externallink { + my ($target,$token) = @_; + my $currentstring = ''; + if ($target eq 'web') { $currentstring .= ''; } return $currentstring;