version 1.427, 2010/11/28 02:46:23
|
version 1.436, 2011/11/14 00:20:42
|
Line 1
|
Line 1
|
|
|
# The LearningOnline Network with CAPA |
# The LearningOnline Network with CAPA |
# Tags Default Definition Module |
# Tags Default Definition Module |
# |
# |
Line 383 sub start_meta {
|
Line 384 sub start_meta {
|
} else { |
} else { |
$currentstring = $token->[4]; |
$currentstring = $token->[4]; |
} |
} |
|
if ($env{'form.grade_imsexport'}) { |
|
$currentstring = ''; |
|
} |
} elsif ($target eq 'meta') { |
} elsif ($target eq 'meta') { |
unless (&Apache::lonxml::get_param |
unless (&Apache::lonxml::get_param |
('http-equiv',$parstack,$safeeval,undef,1)) { |
('http-equiv',$parstack,$safeeval,undef,1)) { |
Line 541 sub start_body {
|
Line 545 sub start_body {
|
# Breadcrumbs |
# Breadcrumbs |
&Apache::lonhtmlcommon::clear_breadcrumbs(); |
&Apache::lonhtmlcommon::clear_breadcrumbs(); |
if ($env{'request.state'} eq 'construct') { |
if ($env{'request.state'} eq 'construct') { |
|
my $url=&Apache::lonnet::hreflocation('',$env{'request.filename'}); |
&Apache::lonhtmlcommon::add_breadcrumb({ |
&Apache::lonhtmlcommon::add_breadcrumb({ |
'text' => 'Construction Space', |
'text' => 'Construction Space', |
'href' => &Apache::loncommon::authorspace(), |
'href' => &Apache::loncommon::authorspace($url), |
}); |
}); |
&Apache::lonhtmlcommon::add_breadcrumb({ |
&Apache::lonhtmlcommon::add_breadcrumb({ |
'text' => 'HTML Editor', |
'text' => 'HTML Editor', |
Line 2044 sub start_table {
|
Line 2049 sub start_table {
|
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
&disable_para(); # Can't have paras in a table. |
&disable_para(); # Can't have paras in a table. |
|
|
|
|
# New table code: |
|
|
|
# Get the parameters that we can do something about: |
# Get the parameters that we can do something about: |
|
|
my $border = &Apache::lonxml::get_param('border', $parstack, $safeeval, undef, 0); |
my $border = &Apache::lonxml::get_param('border', $parstack, $safeeval, undef, 0); |
Line 2063 sub start_table {
|
Line 2065 sub start_table {
|
if ((defined $border) && ($border > 0)) { |
if ((defined $border) && ($border > 0)) { |
# &Apache::lonnet::logthis("Turning on table borders: $border"); |
# &Apache::lonnet::logthis("Turning on table borders: $border"); |
$table->table_border(1); |
$table->table_border(1); |
if ($cell_border ne 'none') { |
if (!defined $cell_border) { |
$table->cell_border(1); # html specs that border turns on both...unless rules='none'. |
$table->cell_border(1); # Default for rules is all if rules not defined. |
} |
} |
} |
} |
# Only all or nothing for cell borders for now: |
|
|
|
if ((defined $cell_border) && ($cell_border ne 'none')) { |
if ((defined $cell_border)) { |
# &Apache::lonnet::logthis("Turning on cell borders: $cell_border"); |
if ($cell_border eq 'all') { |
$table->cell_border(1); |
$table->cell_border(1); |
|
} elsif ($cell_border eq 'rows') { |
|
$table->cell_border(2); |
|
} elsif ($cell_border eq 'cols') { |
|
$table->cell_border(3); |
|
} elsif($cell_border eq 'groups') { |
|
$table->cell_border(4); |
|
} else { |
|
$table->cell_border(0); |
|
} |
} |
} |
if (defined $theme) { |
if (defined $theme) { |
$table->theme($theme); |
$table->theme($theme); |
Line 2100 sub start_table {
|
Line 2110 sub start_table {
|
push(@Apache::londefdef::table, $table); |
push(@Apache::londefdef::table, $table); |
$currentstring.=' \keephidden{NEW TABLE ENTRY}'; |
$currentstring.=' \keephidden{NEW TABLE ENTRY}'; |
|
|
#-------------------------------------------------------- |
|
# Old table code here. |
|
#-------------------------------------------------------- |
|
|
|
|
|
if (0) { |
|
push(@Apache::londefdef::table, {}); |
|
$Apache::londefdef::table[-1]{'row_number'} = -1; |
|
#maximum table's width (default coincides with text line length) |
|
if ($#Apache::londefdef::table==0) { |
|
$textwidth=&recalc($env{'form.textwidth'}); #result is always in mm |
|
$textwidth=~/(\d+\.?\d*)/; |
|
$textwidth=0.85*$1; #accounts "internal" LaTeX space for table frame |
|
} else { |
|
if ($Apache::londefdef::table[-2]{'TeXlen'}[$Apache::londefdef::table[-2]{'row_number'}][$Apache::londefdef::table[-2]{'counter_columns'}]=~/\d/) { |
|
#the maximum width of nested table is determined by LATeX width of parent cell |
|
$textwidth=$Apache::londefdef::table[-2]{'TeXlen'}[$Apache::londefdef::table[-2]{'row_number'}][$Apache::londefdef::table[-2]{'counter_columns'}]; |
|
} else { |
|
#try to use all space not used before (minus 5% for LaTeX table internal) - rather silly |
|
$textwidth=$Apache::londefdef::table[-2]{'width'}; |
|
for (my $i=0;$i<$Apache::londefdef::table[-2]{'counter_columns'};$i++) { |
|
$textwidth=$textwidth-$Apache::londefdef::table[-2]{'TeXlen'}[0][$i]; |
|
} |
|
} |
|
} |
|
|
|
# width either comes forced from the TeXwidth or the width parameters. |
|
# in either case it can be a percentage or absolute width. |
|
# in the width case we ignore absolute width |
|
my $TeXwidth = &Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval,undef,0); |
|
if (!defined($TeXwidth)) { |
|
my $htmlwidth = &Apache::lonxml::get_param('width',$parstack, |
|
$safeeval,undef,1); |
|
if ($htmlwidth =~ /%/) { |
|
$TeXwidth = $htmlwidth; |
|
} else { |
|
$TeXwidth = $textwidth; |
|
} |
|
} |
|
# if the width is specified as a % it is converted to an absolute width. |
|
# otherwise.. just plugged right in the hash |
|
|
|
if ($TeXwidth=~/%/) { |
|
$TeXwidth=~/(\d+)/; |
|
$Apache::londefdef::table[-1]{'width'}=$1*$textwidth/100; |
|
} else { |
|
$Apache::londefdef::table[-1]{'width'}=$TeXwidth; |
|
} |
|
# In the end, however the table width cannot be wider than $textwidth... |
|
|
|
if ($Apache::londefdef::table[-1]{'width'} > $textwidth) { |
|
$Apache::londefdef::table[-1]{'width'} = $textwidth; |
|
} |
|
#table's border |
|
my $border = &Apache::lonxml::get_param('border',$parstack,$safeeval); |
|
my $permission=&Apache::lonxml::get_param('TeXDropEmptyColumns',$parstack,$safeeval,undef,0); |
|
unless (defined $border) { $border = 0; } |
|
if ($border) { |
|
$Apache::londefdef::table[-1]{'hinc'} = '\hline '; |
|
$Apache::londefdef::table[-1]{'vinc'} = '&'; |
|
$Apache::londefdef::table[-1]{'vvinc'} = '|'; |
|
} else { |
|
$Apache::londefdef::table[-1]{'hinc'} = ''; |
|
$Apache::londefdef::table[-1]{'vinc'} = '&'; |
|
$Apache::londefdef::table[-1]{'vvinc'} = ''; |
|
} |
|
if ($#Apache::londefdef::table==0) { |
|
# Note that \newline seems to destroy the alignment envs. |
|
# $Apache::londefdef::table[-1]{'output'}='\strut\newline\strut\setlength{\tabcolsep}{1 mm}'; |
|
$Apache::londefdef::table[-1]{'output'}='\strut'.'\\\\'."\n".'\strut\setlength{\tabcolsep}{1 mm}'; |
|
} |
|
$Apache::londefdef::table[-1]{'output'}.=' \noindent \begin{tabular} '; |
|
$Apache::londefdef::table[-1]{'TeXlen'}=[]; |
|
$Apache::londefdef::table[-1]{'objectlen'}=[]; |
|
$Apache::londefdef::table[-1]{'objectsignal'}=[]; |
|
$Apache::londefdef::table[-1]{'maxlen'}=[]; |
|
$Apache::londefdef::table[-1]{'minlen'}=[]; |
|
$Apache::londefdef::table[-1]{'content'}=[]; |
|
$Apache::londefdef::table[-1]{'align'}=[]; |
|
$currentstring.=' \keephidden{NEW TABLE ENTRY}'; |
|
} |
|
|
|
} |
} |
return $currentstring; |
return $currentstring; |
} |
} |
Line 2194 sub end_table {
|
Line 2122 sub end_table {
|
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
|
|
|
|
# New table code: |
|
|
|
my $table = pop(@Apache::londefdef::table); |
my $table = pop(@Apache::londefdef::table); |
my $t = $table->generate(); |
my $t = $table->generate(); |
# &Apache::lonnet::logthis("Generating string"); |
# &Apache::lonnet::logthis("Generating string"); |
Line 2960 sub start_applet {
|
Line 2886 sub start_applet {
|
&Apache::lonxml::extlink($archive); |
&Apache::lonxml::extlink($archive); |
my $currentstring = ''; |
my $currentstring = ''; |
if ($target eq 'web' || $target eq 'webgrade') { |
if ($target eq 'web' || $target eq 'webgrade') { |
$currentstring = &Apache::lonenc::encrypt_ref($token, |
$currentstring = $token->[4]; |
{'code'=>$code, |
|
'archive'=>$archive} |
|
); |
|
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
# Turn off some stuff we can't be inside thank you LaTeX |
# Turn off some stuff we can't be inside thank you LaTeX |
|
|
Line 3461 sub end_col {
|
Line 3384 sub end_col {
|
return $currentstring; |
return $currentstring; |
} |
} |
|
|
#-- <colgroup> tag (end tag optional) |
#-- <colgroup tag (end tag optional) |
sub start_colgroup { |
sub start_colgroup { |
my ($target,$token) = @_; |
my ($target,$token,$tagstack, $parstack, $parser, $safeeval, $style) = @_; |
my $currentstring = ''; |
my $currentstring = ''; |
if ($target eq 'web' || $target eq 'webgrade') { |
if ($target eq 'web' || $target eq 'webgrade') { |
$currentstring = $token->[4]; |
$currentstring = $token->[4]; |
} |
} |
|
if ($target eq 'tex') { |
|
# TODO: Ensure this tag is in a table: |
|
|
|
# Fetch the attributes and build the hash for the |
|
# call to define_colgroup. |
|
|
|
my $span = &Apache::lonxml::get_param('span', $parstack, $safeeval); |
|
my $halign = &Apache::lonxml::get_param('halign', $parstack, $safeeval); |
|
|
|
my %colgroup_params; |
|
if ($span ne '') { |
|
$colgroup_params{'span'} = $span; |
|
} |
|
if ($halign ne '') { |
|
$colgroup_params{'halign'} = $halign; |
|
} |
|
|
|
my $table = $Apache::londefdef::table[-1]; |
|
$table->define_colgroup(\%colgroup_params); |
|
|
|
} |
return $currentstring; |
return $currentstring; |
} |
} |
|
|
Line 3961 sub start_tbody {
|
Line 3905 sub start_tbody {
|
if ($target eq 'web' || $target eq 'webgrade') { |
if ($target eq 'web' || $target eq 'webgrade') { |
$currentstring = $token->[4]; |
$currentstring = $token->[4]; |
} |
} |
|
if ($target eq 'tex') { |
|
# TODO: Ensure this tag is within a table: |
|
|
|
my $table = $Apache::londefdef::table[-1]; |
|
$table->start_body(); |
|
} |
return $currentstring; |
return $currentstring; |
} |
} |
|
|
Line 3970 sub end_tbody {
|
Line 3920 sub end_tbody {
|
if ($target eq 'web' || $target eq 'webgrade') { |
if ($target eq 'web' || $target eq 'webgrade') { |
$currentstring = $token->[2]; |
$currentstring = $token->[2]; |
} |
} |
|
if($target eq 'tex') { |
|
# TODO: Ensure this tag is within a table: |
|
|
|
my $table = $Apache::londefdef::table[-1]; |
|
$table->end_body(); |
|
} |
return $currentstring; |
return $currentstring; |
} |
} |
|
|
Line 3980 sub start_tfoot {
|
Line 3936 sub start_tfoot {
|
if ($target eq 'web' || $target eq 'webgrade') { |
if ($target eq 'web' || $target eq 'webgrade') { |
$currentstring = $token->[4]; |
$currentstring = $token->[4]; |
} |
} |
|
if ($target eq 'tex') { |
|
# TODO: ensure this is within a table tag. |
|
my $table = $Apache::londefdef::table[-1]; |
|
$table->start_foot(); |
|
} |
return $currentstring; |
return $currentstring; |
} |
} |
|
|
Line 3989 sub end_tfoot {
|
Line 3950 sub end_tfoot {
|
if ($target eq 'web' || $target eq 'webgrade') { |
if ($target eq 'web' || $target eq 'webgrade') { |
$currentstring = $token->[2]; |
$currentstring = $token->[2]; |
} |
} |
|
if ($target eq 'tex') { |
|
# TODO: Ensure this is in side a table |
|
my $table = $Apache::londefdef::table[-1]; |
|
$table->end_foot(); |
|
} |
return $currentstring; |
return $currentstring; |
} |
} |
|
|
Line 3999 sub start_thead {
|
Line 3965 sub start_thead {
|
if ($target eq 'web' || $target eq 'webgrade') { |
if ($target eq 'web' || $target eq 'webgrade') { |
$currentstring = $token->[4]; |
$currentstring = $token->[4]; |
} |
} |
|
if ($target eq 'tex') { |
|
# Assume we're in a table... TODO: Verify that and ignore tag if not. |
|
my $table = $Apache::londefdef::table[-1]; |
|
$table->start_head(); |
|
} |
return $currentstring; |
return $currentstring; |
} |
} |
|
|
Line 4008 sub end_thead {
|
Line 3979 sub end_thead {
|
if ($target eq 'web' || $target eq 'webgrade') { |
if ($target eq 'web' || $target eq 'webgrade') { |
$currentstring = $token->[2]; |
$currentstring = $token->[2]; |
} |
} |
|
if ($target eq 'tex') { |
|
# TODO: Verify we are in a table and ignore tag if not. |
|
|
|
my $table = $Apache::londefdef::table[-1]; |
|
$table->end_head(); |
|
} |
return $currentstring; |
return $currentstring; |
} |
} |
|
|
Line 4218 sub get_eps_image {
|
Line 4195 sub get_eps_image {
|
close(FILE); |
close(FILE); |
} |
} |
$src=~s|/home/httpd/html/res|/home/httpd/prtspool|; |
$src=~s|/home/httpd/html/res|/home/httpd/prtspool|; |
$src=~s|/home/([^/]*)/public_html/|/home/httpd/prtspool/$1/|; |
$src=~s|/home/httpd/html/priv/[^/]+/([^/]*)/|/home/httpd/prtspool/$1/|; |
if ($sext ne "") { # Put the ext. back in to uniquify. |
if ($sext ne "") { # Put the ext. back in to uniquify. |
$src =~ s/\.eps$/$sext.eps/; |
$src =~ s/\.eps$/$sext.eps/; |
} |
} |
Line 4237 sub get_eps_image {
|
Line 4214 sub get_eps_image {
|
print FILE "$src\n"; |
print FILE "$src\n"; |
close FILE; |
close FILE; |
$src=~s|/home/httpd/html/res|/home/httpd/prtspool|; |
$src=~s|/home/httpd/html/res|/home/httpd/prtspool|; |
$src=~s|/home/([^/]*)/public_html/|/home/httpd/prtspool/$1/|; |
$src=~s|/home/httpd/html/priv/[^/]+/([^/]*)/|/home/httpd/prtspool/$1/|; |
} |
} |
my ($path,$file)=($src=~m|(.*)/([^/]*)$|); |
my ($path,$file)=($src=~m|(.*)/([^/]*)$|); |
$path =~ s/ /\_/g; |
$path =~ s/ /\_/g; |
Line 4256 sub eps_generation {
|
Line 4233 sub eps_generation {
|
my $newsrc = $src; |
my $newsrc = $src; |
$newsrc =~ s/(\.bmp|\.gif|\.jpg|\.jpeg)$/\.eps/i; |
$newsrc =~ s/(\.bmp|\.gif|\.jpg|\.jpeg)$/\.eps/i; |
$newsrc=~s{/home/httpd/html/res}{}; |
$newsrc=~s{/home/httpd/html/res}{}; |
$newsrc=~s{/home/($LONCAPA::username_re)/public_html/}{/$1/}; |
$newsrc=~s{/home/httpd/html/priv/[^/]+/($LONCAPA::username_re)/}{/$1/}; |
$newsrc=~s{/\./}{/}; |
$newsrc=~s{/\./}{/}; |
$newsrc=~s{/([^/]+)\.(ps|eps)}{/}; |
$newsrc=~s{/([^/]+)\.(ps|eps)}{/}; |
if ($newsrc=~m{/home/httpd/lonUsers/}) { |
if ($newsrc=~m{/home/httpd/lonUsers/}) { |