--- loncom/xml/londefdef.pm 2002/02/21 04:29:27 1.43 +++ loncom/xml/londefdef.pm 2002/04/05 18:11:11 1.51 @@ -1,7 +1,8 @@ + # The LearningOnline Network with CAPA # Tags Default Definition Module # -# $Id: londefdef.pm,v 1.43 2002/02/21 04:29:27 albertel Exp $ +# $Id: londefdef.pm,v 1.51 2002/04/05 18:11:11 sakharuk Exp $ # # # Copyright Michigan State University Board of Trustees @@ -49,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')); + &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')); } @@ -114,16 +115,9 @@ 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[dvips]{graphicx} + \usepackage{epsfig}'; } return $currentstring; } @@ -148,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; @@ -330,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]})) { @@ -358,7 +353,7 @@ sub end_m { if ($ENV{'request.state'} ne 'published') { $currentstring.=(< - + EDITBUTTON } @@ -1264,12 +1259,25 @@ 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 = ''; + &Apache::lonxml::startredirection; + my $border = &Apache::lonxml::get_param('border',$parstack,$safeeval); + unless (defined $border) { $border = 0; } + @Apache::londefdef::rows = (); + @Apache::londefdef::columns = (); + $Apache::londefdef::counter_columns = 0; + $Apache::londefdef::hinc = ''; + $Apache::londefdef::vinc = ''; + $Apache::londefdef::vvinc = ''; + if ($border) { + $Apache::londefdef::hinc = '\hline '; + $Apache::londefdef::vinc = '&'; + $Apache::londefdef::vvinc = '|'; + } } return $currentstring; } @@ -1279,58 +1287,81 @@ EDITBUTTON if ($target eq 'web') { $currentstring = $token->[2]; } elsif ($target eq 'tex') { - $currentstring = ''; - } + my $output=&Apache::lonxml::endredirection; + $output =~ s/<\/td>\s*]*)>/$Apache::londefdef::vinc/g; + $output =~ s/]*)>//g; + $output =~ s/<\/td>//g; + my $header_of_table = '{'.$Apache::londefdef::vvinc; + my $in; + for ($in=0;$in<$Apache::londefdef::counter_columns;$in++) { + $header_of_table .= $Apache::londefdef::columns[$in].$Apache::londefdef::vvinc; + } + $header_of_table .= '}'; + $currentstring .= '\begin{tabular}'.$header_of_table.$output.$Apache::londefdef::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::rows, substr(&Apache::lonxml::get_param('align',$parstack,$safeeval),0,1); + } else { + push @Apache::londefdef::rows, 'c'; + } + $currentstring = '\hline '; + $Apache::londefdef::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 = ''; - } + $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]; } 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::rows[0],0,1); + } + push @Apache::londefdef::columns, $what_to_push; + $Apache::londefdef::counter_columns++; + $currentstring = $token->[4];; } 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 = ''; - } + $currentstring = $token->[2];; + } return $currentstring; } #-- tag sub start_img { my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; - $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]= + $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]= $token->[2]->{'src'}; my $currentstring = ''; + if ($target eq 'web') { $currentstring = $token->[4]; } elsif ($target eq 'tex') { @@ -1354,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.'}'; } @@ -1365,10 +1396,10 @@ EDITBUTTON my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web') { - $currentstring = $token->[2]; + $currentstring = $token->[2]; } elsif ($target eq 'tex') { - $currentstring = ''; - } + $currentstring = ''; + } return $currentstring; } #-- tag @@ -1377,41 +1408,41 @@ EDITBUTTON my ($target,$token) = @_; $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]= $token->[2]->{'code'}; - $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]= + $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]= $token->[2]->{'archive'}; my $currentstring = ''; if ($target eq 'web') { - $currentstring = $token->[4]; - } elsif ($target eq 'tex') { - $currentstring = " \\begin{figure} "; - } - return $currentstring; - } - sub end_applet { - my ($target,$token) = @_; - my $currentstring = ''; - if ($target eq 'web') { - $currentstring = $token->[2]; + $currentstring = $token->[4]; } elsif ($target eq 'tex') { - $currentstring = " \\end{figure}"; + $currentstring = " \\begin{figure} "; } return $currentstring; } +sub end_applet { + my ($target,$token) = @_; + my $currentstring = ''; + if ($target eq 'web') { + $currentstring = $token->[2]; + } elsif ($target eq 'tex') { + $currentstring = " \\end{figure}"; + } + return $currentstring; +} #-- tag - sub start_embed { - my ($target,$token) = @_; - $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]= - $token->[2]->{'src'}; - my $currentstring = ''; - if ($target eq 'web') { - $currentstring = $token->[4]; - } elsif ($target eq 'tex') { - $currentstring = " \\begin{figure} "; - } - return $currentstring; - } +sub start_embed { + my ($target,$token) = @_; + $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]= + $token->[2]->{'src'}; + my $currentstring = ''; + if ($target eq 'web') { + $currentstring = $token->[4]; + } elsif ($target eq 'tex') { + $currentstring = " \\begin{figure} "; + } + return $currentstring; +} sub end_embed { my ($target,$token) = @_; my $currentstring = ''; @@ -1471,7 +1502,8 @@ EDITBUTTON my $currentstring = ''; if ($target eq 'web') { if (!$Apache::lonxml::registered) { - $currentstring.=''.&Apache::lonxml::registerurl().''; + $currentstring.=''. + &Apache::lonxml::registerurl(undef,$target).''; } $currentstring .= $token->[4]; } @@ -1506,5 +1538,41 @@ EDITBUTTON } return $currentstring; } +#-- + sub start_insert { + 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_insert { + 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; + } 1; __END__