--- loncom/xml/londefdef.pm 2002/02/26 22:20:43 1.45 +++ loncom/xml/londefdef.pm 2002/04/08 15:17:01 1.52 @@ -2,7 +2,7 @@ # The LearningOnline Network with CAPA # Tags Default Definition Module # -# $Id: londefdef.pm,v 1.45 2002/02/26 22:20:43 sakharuk Exp $ +# $Id: londefdef.pm,v 1.52 2002/04/08 15:17:01 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','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','td')); } @@ -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 } @@ -1266,12 +1259,22 @@ EDITBUTTON } #-- tag sub start_table { - my ($target,$token) = @_; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; my $currentstring = ''; if ($target eq 'web') { $currentstring = $token->[4]; } elsif ($target eq 'tex') { - $currentstring = ''; + my $border = &Apache::lonxml::get_param('border',$parstack,$safeeval); + unless (defined $border) { $border = 0; } + if ($border) { + $Apache::londefdef::table{'hinc'} = '\hline '; + $Apache::londefdef::table{'vinc'} = '&'; + $Apache::londefdef::table{'vvinc'} = '|'; + } else { + $Apache::londefdef::table{'hinc'} = ''; + $Apache::londefdef::table{'vinc'} = ''; + $Apache::londefdef::table{'vvinc'} = ''; + } } return $currentstring; } @@ -1281,49 +1284,74 @@ EDITBUTTON if ($target eq 'web') { $currentstring = $token->[2]; } elsif ($target eq 'tex') { - $currentstring = ''; - } + my $output = ''; + my $header_of_table = '{'.$Apache::londefdef::table{'vvinc'}; + my $in; + for ($in=0;$in<$Apache::londefdef::table{'counter_columns'};$in++) { + $header_of_table .= @{ $Apache::londefdef::table{'columns'} }[$in].$Apache::londefdef::table{'vvinc'}; + $output .= $Apache::londefdef::table{'rowdata'}[$in]; + chop $output; + $output .= ' \\\\ '; + } + $header_of_table .= '}'; + $currentstring .= '\begin{tabular}'.$header_of_table.$output.$Apache::londefdef::table{'hinc'}.'\end{tabular}'; + } return $currentstring; } #-- tag sub start_tr { - my ($target,$token) = @_; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; my $currentstring = ''; if ($target eq 'web') { $currentstring = $token->[4]; } elsif ($target eq 'tex') { - $currentstring = ''; + if (substr(&Apache::lonxml::get_param('align',$parstack,$safeeval),0,1) ne '') { + push @ {$Apache::londefdef::table{'rows'} }, substr(&Apache::lonxml::get_param('align',$parstack,$safeeval),0,1); + } else { + push @ {$Apache::londefdef::table{'rows'} }, 'c'; + } + push ( @{ $Apache::londefdef::table{'rowdata'} }, $Apache::londefdef::table{'hinc'}); + $Apache::londefdef::table{'counter_columns'} = 0; + } return $currentstring; - } + } sub end_tr { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web') { - $currentstring = $token->[2]; + $currentstring = $token->[2]; } elsif ($target eq 'tex') { - $currentstring = ''; - } + } return $currentstring; } #--
tag sub start_td { - my ($target,$token) = @_; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; my $currentstring = ''; if ($target eq 'web') { - $currentstring = $token->[4]; + $currentstring = $token->[4]; } elsif ($target eq 'tex') { - $currentstring = ''; + my $what_to_push = substr(&Apache::lonxml::get_param('align',$parstack,$safeeval),0,1); + if ($what_to_push eq '') { + $what_to_push = substr($Apache::londefdef::table{'rows'}[0],0,1);; + } + push @{ $Apache::londefdef::table{'columns'} }, $what_to_push; + $Apache::londefdef::table{'counter_columns'}++; + &Apache::lonxml::startredirection(); +; } return $currentstring; - } + } sub end_td { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web') { - $currentstring = $token->[2]; + $currentstring = $token->[2]; } elsif ($target eq 'tex') { - $currentstring = ''; + my $current_row = $#{ $Apache::londedef::table{'rows'} }; + my $data=&Apache::lonxml::endredirection(); + @{ $Apache::londefdef::table{'rowdata'} }[$current_row] .= $data.' '.$Apache::londefdef::table{'vinc'}; } return $currentstring; } @@ -1357,7 +1385,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.'}'; } @@ -1474,7 +1502,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]; } @@ -1511,10 +1540,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; } @@ -1522,6 +1552,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;