version 1.395, 2008/10/27 19:15:35
|
version 1.398, 2009/01/20 12:01:00
|
Line 42 package Apache::londefdef;
|
Line 42 package Apache::londefdef;
|
use Apache::lonnet; |
use Apache::lonnet; |
use strict; |
use strict; |
use Apache::lonxml; |
use Apache::lonxml; |
|
use Apache::lontable; |
use Apache::File(); |
use Apache::File(); |
use Image::Magick; |
use Image::Magick; |
use Apache::lonmenu(); |
use Apache::lonmenu(); |
Line 58 BEGIN {
|
Line 59 BEGIN {
|
|
|
} |
} |
|
|
# |
|
# Dumps all elements of the table structure. |
|
# Need this 'cause evidently when given an array, Data::Dumper only seems |
|
# to dump element 0. |
|
# |
|
#sub debug_dump_table { |
|
# my $lastrow = $#Apache::londefdef::table; |
|
# &Apache::lonnet::logthis("Dumping table: Last row index: $lastrow"); |
|
# my $row; |
|
# for ($row =0; $row <= $lastrow; $row++ ) { |
|
# my $text = Dumper($Apache::londefdef::table[$row]); |
|
# &Apache::lonnet::logthis("table [ $row ]".$text); |
|
# } |
|
#} |
|
sub initialize_londefdef { |
sub initialize_londefdef { |
$Apache::londefdef::TD_redirection=0; |
$Apache::londefdef::TD_redirection=0; |
@Apache::londefdef::table = (); |
@Apache::londefdef::table = (); |
Line 208 sub start_html {
|
Line 196 sub start_html {
|
'\usepackage{pifont}' ."\n". |
'\usepackage{pifont}' ."\n". |
'\usepackage{latexsym}'."\n". |
'\usepackage{latexsym}'."\n". |
'\usepackage{epsfig}'. |
'\usepackage{epsfig}'. |
|
"\\usepackage{xtab}\n". |
|
"\\usepackage{tabularx}\n". |
|
"\\usepackage{booktabs}\n". |
|
"\\usepackage{array}\n". |
|
"\\usepackage{colortbl}\n". |
|
"\\usepackage{xcolor}\n". |
'\usepackage{calc}'. |
'\usepackage{calc}'. |
'\usepackage{amsmath}'. |
'\usepackage{amsmath}'. |
'\usepackage{amssymb}'. |
'\usepackage{amssymb}'. |
Line 2018 sub end_dd {
|
Line 2012 sub end_dd {
|
# only way I could think of to allow <p> in |
# only way I could think of to allow <p> in |
# <tr> <th> bodies |
# <tr> <th> bodies |
# |
# |
#list of supported attributes: border,width,TeXwidth |
#list of supported attributes: border,width,TeXwidth,TeXtheme |
|
# align |
sub start_table { |
sub start_table { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; |
my $textwidth = ''; |
my $textwidth = ''; |
Line 2026 sub start_table {
|
Line 2021 sub start_table {
|
if ($target eq 'web' || $target eq 'webgrade') { |
if ($target eq 'web' || $target eq 'webgrade') { |
$currentstring .= $token->[4]; |
$currentstring .= $token->[4]; |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
|
&disable_para(); # Can't have paras in a table. |
|
|
|
|
|
# New table code: |
|
|
|
# Get the parameters that we can do something about: |
|
|
|
my $border = &Apache::lonxml::get_param('border', $parstack, $safeeval, undef, 0); |
|
my $width = &Apache::lonxml::get_param('TeXwidth', $parstack, $safeeval, undef, 0); |
|
my $theme = &Apache::lonxml::get_param('TeXtheme', $parstack, $safeeval, undef, 0); |
|
my $align = &Apache::lonxml::get_param('align', $parstack, $safeeval, undef, 0); |
|
|
|
# The only thing that needs any figuring out is the width.. and then only if it is |
|
# a percent. If not it's assumed to be some valid TeX measurement unit e.g. 3.0cm |
|
# |
|
|
|
my $table = new Apache::lontable(); |
|
if ($border ne '') { |
|
$table->table_border(1); |
|
$table->cell_border(1); |
|
} |
|
if ($theme ne '') { |
|
$table->theme($theme); |
|
} |
|
if ($align ne '') { |
|
$table->alignment($align); |
|
} |
|
|
|
# Missing width is most of page width |
|
|
|
if ($width eq "") { |
|
$width = '70%'; |
|
} |
|
|
|
# If a percentage, need to calculate what this means in terms of |
|
# page width: |
|
|
|
if ($width =~ /%$/) { |
|
my $textwidth = &recalc($env{'form.textwidth'}); # Page width in mm. |
|
$width =~ s/%//; |
|
$width = $width * $textwidth / 100.0; |
|
$width .= " mm"; |
|
$table->width($width); |
|
} |
|
|
|
push(@Apache::londefdef::table, $table); |
|
$currentstring.=' \keephidden{NEW TABLE ENTRY}'; |
|
|
|
#-------------------------------------------------------- |
|
# Old table code here. |
|
#-------------------------------------------------------- |
|
|
|
|
|
if (0) { |
push(@Apache::londefdef::table, {}); |
push(@Apache::londefdef::table, {}); |
$Apache::londefdef::table[-1]{'row_number'} = -1; |
$Apache::londefdef::table[-1]{'row_number'} = -1; |
#maximum table's width (default coincides with text line length) |
#maximum table's width (default coincides with text line length) |
Line 2100 sub start_table {
|
Line 2149 sub start_table {
|
$Apache::londefdef::table[-1]{'content'}=[]; |
$Apache::londefdef::table[-1]{'content'}=[]; |
$Apache::londefdef::table[-1]{'align'}=[]; |
$Apache::londefdef::table[-1]{'align'}=[]; |
$currentstring.=' \keephidden{NEW TABLE ENTRY}'; |
$currentstring.=' \keephidden{NEW TABLE ENTRY}'; |
|
} |
|
|
} |
} |
return $currentstring; |
return $currentstring; |
Line 2112 sub end_table {
|
Line 2161 sub end_table {
|
if ($target eq 'web' || $target eq 'webgrade') { |
if ($target eq 'web' || $target eq 'webgrade') { |
$currentstring = $token->[2]; |
$currentstring = $token->[2]; |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
|
|
|
|
|
# New table code: |
|
|
|
my $table = pop(@Apache::londefdef::table); |
|
my $t = $table->generate(); |
|
$currentstring = $t->generate_string(); |
|
&enable_para(); |
|
#-------------------------------------------------------------- |
|
# Old table code: |
|
#-------------------------------------------------------------- |
|
|
|
if (0) { |
|
|
my $border = &Apache::lonxml::get_param('border',$parstack,$safeeval); |
my $border = &Apache::lonxml::get_param('border',$parstack,$safeeval); |
my $inmemory = ''; |
my $inmemory = ''; |
my $output = ''; |
my $output = ''; |
Line 2524 sub end_table {
|
Line 2587 sub end_table {
|
pop @Apache::londefdef::table; |
pop @Apache::londefdef::table; |
undef @Apache::londefdef::table; |
undef @Apache::londefdef::table; |
} |
} |
|
} |
|
&enable_para(); |
} |
} |
} |
} |
return $currentstring; |
return $currentstring; |
Line 2536 sub start_tr {
|
Line 2601 sub start_tr {
|
if ($target eq 'web' || $target eq 'webgrade') { |
if ($target eq 'web' || $target eq 'webgrade') { |
$currentstring = $token->[4]; |
$currentstring = $token->[4]; |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
|
|
|
my $align = &Apache::lonxml::get_param('align', $parstack, $safeeval, undef, 1); |
|
$Apache::londefdef::table[-1]->start_row(); |
|
|
|
if ($align ne '') { |
|
$Apache::londefdef::table[-1]->configure_row({default_halign => $align}); |
|
} |
|
|
|
#--------------------------------------------------------------- |
|
# Old table code. |
|
#--------------------------------------------------------------- |
|
|
|
if (0) { |
$Apache::londefdef::table[-1]{'row_number'}++; |
$Apache::londefdef::table[-1]{'row_number'}++; |
my $alignchar=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1); |
my $alignchar=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1); |
if ($alignchar ne '') { |
if ($alignchar ne '') { |
Line 2554 sub start_tr {
|
Line 2632 sub start_tr {
|
push @ {$Apache::londefdef::table[-1]{'minlen'}}, []; |
push @ {$Apache::londefdef::table[-1]{'minlen'}}, []; |
push @ {$Apache::londefdef::table[-1]{'maxlen'}}, []; |
push @ {$Apache::londefdef::table[-1]{'maxlen'}}, []; |
push @ {$Apache::londefdef::table[-1]{'content'}}, []; |
push @ {$Apache::londefdef::table[-1]{'content'}}, []; |
|
} |
} |
} |
return $currentstring; |
return $currentstring; |
} |
} |
Line 2564 sub end_tr {
|
Line 2643 sub end_tr {
|
if ($target eq 'web' || $target eq 'webgrade') { |
if ($target eq 'web' || $target eq 'webgrade') { |
$currentstring .= $token->[2]; |
$currentstring .= $token->[2]; |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
|
|
|
# In case the user is missing a </td> or </th> tag: |
|
|
|
if ($Apache::londefdef::TD_redirection) { |
|
&end_td_tex($parstack,$parser,$safeeval); |
|
} |
|
$Apache::londefdef::table[-1]->end_row(); |
|
|
|
#----------------------------------------------- |
|
# Old table code |
|
#----------------------------------------------- |
|
|
|
if (0) { |
if ($Apache::londefdef::TD_redirection) { |
if ($Apache::londefdef::TD_redirection) { |
&end_td_tex($parstack,$parser,$safeeval); |
&end_td_tex($parstack,$parser,$safeeval); |
} |
} |
Line 2572 sub end_tr {
|
Line 2664 sub end_tr {
|
if ($Apache::londefdef::table[-1]{'prior_columns'} > $Apache::londefdef::table[-1]{'counter_columns'}) { |
if ($Apache::londefdef::table[-1]{'prior_columns'} > $Apache::londefdef::table[-1]{'counter_columns'}) { |
$Apache::londefdef::table[-1]{'counter_columns'} = $Apache::londefdef::table[-1]{'prior_columns'}; |
$Apache::londefdef::table[-1]{'counter_columns'} = $Apache::londefdef::table[-1]{'prior_columns'}; |
} |
} |
|
} |
|
|
|
|
} |
} |
Line 2608 sub tag_check {
|
Line 2700 sub tag_check {
|
} |
} |
return ''; |
return ''; |
} |
} |
|
|
|
# |
|
# Factor out cell configuration hash generation: |
|
# |
|
|
|
sub cell_config_hash { |
|
my ($align, $rowspan, $colspan) = @_; |
|
my %config; |
|
if ($align ne '') { |
|
$config{'halign'} = $align; |
|
} |
|
if ($colspan ne "") { |
|
$config{'colspan'} = $colspan; |
|
} |
|
if ($rowspan ne '') { |
|
$config{'rowspan'} = $rowspan; |
|
} |
|
return \%config; |
|
} |
|
|
sub start_td_tex { |
sub start_td_tex { |
my ($parstack,$parser,$safeeval) = @_; |
my ($parstack,$parser,$safeeval) = @_; |
|
|
|
# At this stage, an empty cell is created with the |
|
# appropriate rowspan/colspan and alignment |
|
# attributes, but empty of text. end_td_tex will |
|
# fetch the contents from the recursive parse and |
|
# fill the cell with them: |
|
my $align = &Apache::lonxml::get_param('align', $parstack, $safeeval, undef, 1); |
|
my $rowspan = &Apache::lonxml::get_param('rowspan', $parstack, $safeeval, undef, 1); |
|
my $colspan = &Apache::lonxml::get_param('colspan', $parstack, $safeeval, undef, 1); |
|
|
|
my $config = &cell_config_hash($align, $rowspan, $colspan); |
|
|
|
my $table = $Apache::londefdef::table[-1]; |
|
$table->add_cell('', $config); |
|
|
|
|
|
#------------------------------------------------ |
|
# Old table code. |
|
#------------------------------------------------ |
|
|
|
if (0) { |
|
|
my $alignchar = substr(&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1),0,1); |
my $alignchar = substr(&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1),0,1); |
if ($alignchar eq '') { |
if ($alignchar eq '') { |
$alignchar = $Apache::londefdef::table[-1]{'rows'}[-1]; |
$alignchar = $Apache::londefdef::table[-1]{'rows'}[-1]; |
Line 2623 sub start_td_tex {
|
Line 2756 sub start_td_tex {
|
$current_length=~/(\d+\.?\d*)/; |
$current_length=~/(\d+\.?\d*)/; |
push @ {$Apache::londefdef::table[-1]{'TeXlen'}[$Apache::londefdef::table[-1]{'row_number'}] },$1; |
push @ {$Apache::londefdef::table[-1]{'TeXlen'}[$Apache::londefdef::table[-1]{'row_number'}] },$1; |
} |
} |
|
} |
&Apache::lonxml::startredirection(); |
&Apache::lonxml::startredirection(); |
return ''; |
return ''; |
} |
} |
|
|
sub end_td_tex { |
sub end_td_tex { |
|
|
|
my $text = &Apache::lonxml::endredirection(); |
|
my $table = $Apache::londefdef::table[-1]; |
|
$table->append_cell_text($text); |
|
|
|
#------------------------------------------------- |
|
# Old table code |
|
#------------------------------------------------- |
|
|
|
if (0) { |
my ($parstack,$parser,$safeeval) = @_; |
my ($parstack,$parser,$safeeval) = @_; |
my $current_row = $Apache::londefdef::table[-1]{'row_number'}; |
my $current_row = $Apache::londefdef::table[-1]{'row_number'}; |
my $current_column = $Apache::londefdef::table[-1]{'counter_columns'}; |
my $current_column = $Apache::londefdef::table[-1]{'counter_columns'}; |
Line 2792 sub end_td_tex {
|
Line 2936 sub end_td_tex {
|
|
|
} |
} |
|
|
|
} |
|
|
return ''; |
return ''; |
} |
} |
Line 2841 sub tagg_check {
|
Line 2985 sub tagg_check {
|
|
|
sub start_th_tex { |
sub start_th_tex { |
my ($parstack,$parser,$safeeval) = @_; |
my ($parstack,$parser,$safeeval) = @_; |
|
|
|
my $alignment = &Apache::lonxml::get_param('align', $parstack, $safeeval, undef,1); |
|
my $rowspan = &Apache::lonxml::get_param('rowspan', $parstack, $safeeval, undef, 1); |
|
my $colspan = &Apache::lonxml::get_param('colspan', $parstack, $safeeval, undef, 1); |
|
|
|
my $config = cell_config_hash($alignment, $rowspan, $colspan); |
|
my $table = $Apache::londefdef::table[-1]; |
|
$table->add_cell('\textbf{', $config); |
|
|
|
#------------------------------------------------------------------------------------- |
|
# |
|
# Old table code. |
|
# |
|
#-------------------------------------------------------------------------------------- |
|
|
|
if (0) { |
|
|
|
|
my $alignchar = substr(&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1),0,1); |
my $alignchar = substr(&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1),0,1); |
if ($alignchar eq '') { |
if ($alignchar eq '') { |
$alignchar = $Apache::londefdef::table[-1]{'rows'}[-1]; |
$alignchar = $Apache::londefdef::table[-1]{'rows'}[-1]; |
Line 2853 sub start_th_tex {
|
Line 3015 sub start_th_tex {
|
$current_length=~/(\d+\.?\d*)/; |
$current_length=~/(\d+\.?\d*)/; |
push @ {$Apache::londefdef::table[-1]{'TeXlen'}[$Apache::londefdef::table[-1]{'row_number'}] },$1; |
push @ {$Apache::londefdef::table[-1]{'TeXlen'}[$Apache::londefdef::table[-1]{'row_number'}] },$1; |
} |
} |
|
} |
|
|
|
# Accept xml until the </th> tag. |
|
|
&Apache::lonxml::startredirection(); |
&Apache::lonxml::startredirection(); |
return ''; |
return ''; |
} |
} |
|
|
sub end_th_tex { |
sub end_th_tex { |
my ($parstack,$parser,$safeeval) = @_; |
my ($parstack,$parser,$safeeval) = @_; |
|
|
|
my $table = $Apache::londefdef::table[-1]; |
|
my $text = &Apache::lonxml::endredirection(); |
|
$table->append_cell_text($text.'}'); |
|
|
|
#----------------------------------------------------------------------------- |
|
# Old table code: |
|
#----------------------------------------------------------------------------- |
|
|
|
if (0) { |
my $current_row = $Apache::londefdef::table[-1]{'row_number'}; |
my $current_row = $Apache::londefdef::table[-1]{'row_number'}; |
my $data=&Apache::lonxml::endredirection(); |
my $data=&Apache::lonxml::endredirection(); |
my $TeXwidth=&Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval,undef,0); |
my $TeXwidth=&Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval,undef,0); |
Line 2923 sub end_th_tex {
|
Line 3099 sub end_th_tex {
|
#make data bold |
#make data bold |
$data='\textbf{'.$data.'}'; |
$data='\textbf{'.$data.'}'; |
push @ {$Apache::londefdef::table[-1]{'content'}[-1] },$data; |
push @ {$Apache::londefdef::table[-1]{'content'}[-1] },$data; |
|
} |
return''; |
return''; |
} |
} |
|
|
Line 4302 sub image_replication {
|
Line 4479 sub image_replication {
|
} |
} |
return ''; |
return ''; |
} |
} |
# |
|
# Get correct sizing parameter for an image given |
|
# it's initial ht. and wid. This allows sizing of |
|
# images that are generated on-the-fly (e.g. gnuplot) |
|
# as well as serving as a utility for image_size. |
|
# |
|
# Parameter: |
|
# height_param |
|
# width_param - Initial picture dimensions. |
|
# scaling - A scale factor. |
|
# parstack, - the current stack of tag attributes |
|
# from the xml parser |
|
# safeeval, - pointer to the safespace |
|
# depth, - from what level in the stack to look for attributes |
|
# (assumes -1 if unspecified) |
|
# cis - look for attrubutes case insensitively |
|
# (assumes false) |
|
# |
|
# Returns: |
|
# height, width - new dimensions. |
|
# |
|
sub resize_image { |
sub resize_image { |
my ($height_param, $width_param, $scaling, |
my ($height_param, $width_param, $scaling, |
$parstack, $safeeval, $depth, $cis) = @_; |
$parstack, $safeeval, $depth, $cis) = @_; |
Line 4512 sub file_path {
|
Line 4671 sub file_path {
|
} |
} |
return $file,$path; |
return $file,$path; |
} |
} |
# Converts a measurement in to mm from any of |
|
# the other valid LaTeX units of measure. |
|
# If the units of measure are missing from the |
|
# parameter, it is assumed to be in and returned |
|
# with mm units of measure |
|
sub recalc { |
sub recalc { |
my $argument = shift; |
my $argument = shift; |
if (not $argument=~/(mm|cm|in|pc|pt)/) {return $argument.' mm';} |
if (not $argument=~/(mm|cm|in|pc|pt)/) {return $argument.' mm';} |
Line 4560 sub LATEX_length {
|
Line 4716 sub LATEX_length {
|
return $value; |
return $value; |
} |
} |
|
|
# Wrap image 'stuff' inside of the LaTeX required to implement |
|
# alignment: |
|
# align_tex_image(align, latex_rendering, image) |
|
# Where: |
|
# align - The HTML alignment specification. |
|
# latex_rendering - rendering hint for latex. |
|
# image - The LaTeX needed to insert the image itsef. |
|
# width,height - dimensions of the image. |
|
# Returns: |
|
# The 1/2 wrapped image and the stuff required to close the |
|
# wrappage. This allows e.g. randomlabel to insert more stuff |
|
# into the closure. |
|
# |
|
sub align_latex_image { |
sub align_latex_image { |
my ($align, $latex_rendering, $image, $width, $height) = @_; |
my ($align, $latex_rendering, $image, $width, $height) = @_; |
my $currentstring; # The 1/2 wrapped image. |
my $currentstring; # The 1/2 wrapped image. |
Line 4639 sub align_latex_image {
|
Line 4783 sub align_latex_image {
|
return ($currentstring, $closure); |
return ($currentstring, $closure); |
} |
} |
|
|
# is_inside_of $tagstack $tag |
|
# This sub returns true if the current state of Xml processing |
|
# is inside of the tag. |
|
# Parameters: |
|
# tagstack - The tagstack from the parser. |
|
# tag - The tag (without the <>'s.). |
|
# Sample usage: |
|
# if (is_inside_of($tagstack "table")) { |
|
# # I'm in a table.... |
|
# } |
|
sub is_inside_of { |
sub is_inside_of { |
my ($tagstack, $tag) = @_; |
my ($tagstack, $tag) = @_; |
my @stack = @$tagstack; |
my @stack = @$tagstack; |
Line 4661 sub is_inside_of {
|
Line 4796 sub is_inside_of {
|
} |
} |
|
|
|
|
|
=pod |
|
|
|
=head1 NAME |
|
|
|
Apache::londefdef.pm |
|
|
|
=head1 SYNOPSIS |
|
|
|
Tags Default Definition Module |
|
|
|
This is part of the LearningOnline Network with CAPA project |
|
described at http://www.lon-capa.org. |
|
|
|
|
|
=head1 NOTABLE SUBROUTINES |
|
|
|
=over |
|
|
|
=item start_hideweboutput() |
|
|
|
=item end_hideweboutput() |
|
|
|
=item image_replication() |
|
|
|
=item resize_image() |
|
|
|
Get correct sizing parameter for an image given |
|
it's initial ht. and wid. This allows sizing of |
|
images that are generated on-the-fly (e.g. gnuplot) |
|
as well as serving as a utility for image_size. |
|
|
|
Parameter: |
|
height_param |
|
width_param - Initial picture dimensions. |
|
scaling - A scale factor. |
|
parstack, - the current stack of tag attributes |
|
from the xml parser |
|
safeeval, - pointer to the safespace |
|
depth, - from what level in the stack to look for attributes |
|
(assumes -1 if unspecified) |
|
cis - look for attrubutes case insensitively |
|
(assumes false) |
|
|
|
Returns: |
|
height, width - new dimensions. |
|
|
|
=item image_size() |
|
|
|
=item image_width() |
|
|
|
=item image_height() |
|
|
|
=item get_eps_image() |
|
|
|
=item eps_generation() |
|
|
|
=item file_path() |
|
|
|
=item recalc() |
|
|
|
Converts a measurement in to mm from any of |
|
the other valid LaTeX units of measure. |
|
If the units of measure are missing from the |
|
parameter, it is assumed to be in and returned |
|
with mm units of measure |
|
|
|
=item LATEX_length() |
|
|
|
=item align_latex_image() |
|
|
|
Wrap image 'stuff' inside of the LaTeX required to implement |
|
alignment: |
|
align_tex_image(align, latex_rendering, image) |
|
Where: |
|
align - The HTML alignment specification. |
|
latex_rendering - rendering hint for latex. |
|
image - The LaTeX needed to insert the image itsef. |
|
width,height - dimensions of the image. |
|
Returns: |
|
The 1/2 wrapped image and the stuff required to close the |
|
wrappage. This allows e.g. randomlabel to insert more stuff |
|
into the closure. |
|
|
|
|
|
=item is_inside_of($tagstack, $tag) |
|
This sub returns true if the current state of Xml processing is inside of the tag. |
|
Parameters: |
|
tagstack - The tagstack from the parser. |
|
tag - The tag (without the <>'s.). |
|
Sample usage: |
|
if (is_inside_of($tagstack "table")) { |
|
I'm in a table.... |
|
} |
|
|
|
|
|
|
|
=back |
|
|
|
=cut |
|
|
|
|
1; |
1; |
__END__ |
__END__ |