--- loncom/xml/londefdef.pm 2002/03/06 20:27:00 1.47 +++ loncom/xml/londefdef.pm 2002/03/06 20:37:38 1.48 @@ -2,7 +2,7 @@ # The LearningOnline Network with CAPA # Tags Default Definition Module # -# $Id: londefdef.pm,v 1.47 2002/03/06 20:27:00 matthew Exp $ +# $Id: londefdef.pm,v 1.48 2002/03/06 20:37:38 sakharuk 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}'; @@ -1358,7 +1350,7 @@ 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.'}'; } @@ -1525,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;