--- loncom/xml/londefdef.pm 2002/05/23 17:43:07 1.63 +++ loncom/xml/londefdef.pm 2002/07/01 19:58:25 1.67 @@ -2,7 +2,7 @@ # The LearningOnline Network with CAPA # Tags Default Definition Module # -# $Id: londefdef.pm,v 1.63 2002/05/23 17:43:07 sakharuk Exp $ +# $Id: londefdef.pm,v 1.67 2002/07/01 19:58:25 sakharuk Exp $ # # # Copyright Michigan State University Board of Trustees @@ -52,7 +52,7 @@ use Apache::File(); BEGIN { - &Apache::lonxml::register('Apache::londefdef',('m','html','head','map','select','option','input','textarea','form','meta','title','body','center','b','strong','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','allow','frameset','pre','insert','externallink','table','tr','th','td')); + &Apache::lonxml::register('Apache::londefdef',('m','html','head','map','select','option','input','textarea','form','meta','title','body','center','b','strong','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','allow','frameset','pre','insert','externallink','table','tr','th','td','blankspace','bubble','bubbles','bubbleline')); } @@ -122,7 +122,7 @@ sub end_m { $currentstring .= '\documentclass[letterpaper]{article} \newcommand{\keephidden}[1]{} \usepackage[dvips]{graphicx} - \usepackage{epsfig}'; + \usepackage{epsfig}\usepackage{calc}'; } return $currentstring; } @@ -840,7 +840,7 @@ EDITBUTTON if ($target eq 'web') { $currentstring .= $token->[4]; } elsif ($target eq 'tex') { - $currentstring .= '\\\\'; + $currentstring .= '\vskip 0 mm'; } elsif ($target eq 'latexsource') { $currentstring .= '\\'; } @@ -1485,11 +1485,11 @@ EDITBUTTON $file=~s/(\.gif|\.jpg)$/\.eps/i; if (-e $newsrc) { if ($path) { - $currentstring .= '\graphicspath{{'.$path.'}}\fbox{\includegraphics'.$width_param.'{'.$file.'}}'; + $currentstring .= '\noindent\graphicspath{{'.$path.'}}\fbox{\includegraphics'.$width_param.'{'.$file.'}}'; } } else { my $temp_file; - my $filename = "/home/httpd/prtspool/$ENV{'user.name'}$ENV{'user.domain'}temp$ENV{'user.login.time'}.dat"; + 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 .= '\graphicspath{{/home/httpd/prtspool/}}\fbox{\includegraphics'.$width_param.'{'.$file.'}}'; @@ -1679,5 +1679,24 @@ sub start_embed { } return $currentstring; } +#-- + sub start_blankspace { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; + my $currentstring = ''; + if ($target eq 'tex') { + my $howmuch = &Apache::lonxml::get_param('heigth',$parstack,$safeeval); + $currentstring .= '\vskip '.$howmuch.' '; + } + return $currentstring; + } + sub end_blankspace { + my ($target,$token) = @_; + my $currentstring = ''; + if ($target eq 'tex') { + $currentstring .= ''; + } + return $currentstring; + } + 1; __END__