version 1.429, 2011/04/05 10:33:15
|
version 1.437, 2012/02/05 22:53:42
|
Line 383 sub start_meta {
|
Line 383 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 544 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 2048 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 2067 sub start_table {
|
Line 2068 sub start_table {
|
$table->cell_border(1); # Default for rules is all if rules not defined. |
$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)) { |
if ((defined $cell_border)) { |
if ($cell_border eq 'all') { |
if ($cell_border eq 'all') { |
Line 2076 sub start_table {
|
Line 2076 sub start_table {
|
$table->cell_border(2); |
$table->cell_border(2); |
} elsif ($cell_border eq 'cols') { |
} elsif ($cell_border eq 'cols') { |
$table->cell_border(3); |
$table->cell_border(3); |
|
} elsif($cell_border eq 'groups') { |
|
$table->cell_border(4); |
} else { |
} else { |
$table->cell_border(0); |
$table->cell_border(0); |
} |
} |
Line 2883 sub start_applet {
|
Line 2885 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 2972 sub end_embed {
|
Line 2971 sub end_embed {
|
#-- <param> tag (end tag forbidden) |
#-- <param> tag (end tag forbidden) |
sub start_param { |
sub start_param { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; |
if (&Apache::lonxml::get_param('name',$parstack, |
my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval, |
$safeeval,undef,1)=~/^cabbase$/i) { |
undef,1); |
|
if ($name =~/^cabbase$/i) { |
my $value=&Apache::lonxml::get_param('value',$parstack, |
my $value=&Apache::lonxml::get_param('value',$parstack, |
$safeeval,undef,1); |
$safeeval,undef,1); |
&Apache::lonxml::extlink($value); |
&Apache::lonxml::extlink($value); |
} |
} elsif ($name eq 'flashvars') { |
|
if (lc(&Apache::lonxml::get_param('type',$parstack,$safeeval,-2,1)) |
|
eq 'application/x-shockwave-flash') { |
|
my $launcher = |
|
&Apache::lonxml::get_param('data',$parstack,$safeeval,-2,1); |
|
if ($launcher) { |
|
&Apache::lonxml::extlink($launcher); |
|
} |
|
my $flashvars=&Apache::lonxml::get_param('value',$parstack, |
|
$safeeval,undef,1); |
|
if ($flashvars ne '') { |
|
foreach my $item (split(/\&/,$flashvars)) { |
|
my ($key,$value)=split(/=/,$item,2); |
|
if ($key eq 'content') { |
|
if ($value ne '') { |
|
my ($dir) = ($launcher =~ m{(.+/)[^/]+$}); |
|
&Apache::lonxml::extlink($dir.$value); |
|
} |
|
} elsif ($key eq 'thumb') { |
|
if ($value ne '') { |
|
&Apache::lonxml::extlink($value); |
|
} |
|
} |
|
} |
|
} |
|
} |
|
} |
my $src = &Apache::lonxml::get_param('src',$parstack,$safeeval,undef,1); |
my $src = &Apache::lonxml::get_param('src',$parstack,$safeeval,undef,1); |
&Apache::lonxml::extlink($src); |
if ($src ne '') { |
|
&Apache::lonxml::extlink($src); |
|
} |
my $currentstring = ''; |
my $currentstring = ''; |
if ($target eq 'web' || $target eq 'webgrade') { |
if ($target eq 'web' || $target eq 'webgrade') { |
my %toconvert; |
my %toconvert; |
my $src=&Apache::lonxml::get_param('src',$parstack,$safeeval,undef,1); |
|
if ($src) { $toconvert{'src'}= $src; } |
if ($src) { $toconvert{'src'}= $src; } |
my $name=&Apache::lonxml::get_param('name',$parstack,$safeeval, |
|
undef,1); |
|
if ($name=~/^cabbase$/i) { |
if ($name=~/^cabbase$/i) { |
$toconvert{'value'}=&Apache::lonxml::get_param('value',$parstack, |
$toconvert{'value'}=&Apache::lonxml::get_param('value',$parstack, |
$safeeval,undef,1); |
$safeeval,undef,1); |
Line 3384 sub end_col {
|
Line 3408 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 3884 sub start_tbody {
|
Line 3929 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 3893 sub end_tbody {
|
Line 3944 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 3903 sub start_tfoot {
|
Line 3960 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 3912 sub end_tfoot {
|
Line 3974 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 3922 sub start_thead {
|
Line 3989 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 3931 sub end_thead {
|
Line 4003 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 4141 sub get_eps_image {
|
Line 4219 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 4160 sub get_eps_image {
|
Line 4238 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 4179 sub eps_generation {
|
Line 4257 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/}) { |