version 1.415.4.3, 2010/12/25 00:10:16
|
version 1.422, 2010/08/27 09:42:48
|
Line 48 use Image::Magick;
|
Line 48 use Image::Magick;
|
use Apache::lonmenu(); |
use Apache::lonmenu(); |
use Apache::lonmeta(); |
use Apache::lonmeta(); |
use Apache::lonlocal; |
use Apache::lonlocal; |
use Apache::loncommon(); |
|
use Apache::Constants qw(:common); |
use Apache::Constants qw(:common); |
use File::Basename; |
use File::Basename; |
use LONCAPA(); |
use LONCAPA(); |
Line 590 sub start_body {
|
Line 589 sub start_body {
|
sub edit_controls { |
sub edit_controls { |
my ($nochgview) = @_; |
my ($nochgview) = @_; |
my $result .= ' |
my $result .= ' |
<form method="post" action=""> |
<form method="post"> |
<div class="LC_edit_problem_header">'; |
<div class="LC_edit_problem_header">'; |
unless ($nochgview) { |
unless ($nochgview) { |
$result .= ' |
$result .= ' |
Line 602 sub edit_controls {
|
Line 601 sub edit_controls {
|
$result .= ' |
$result .= ' |
<div><input type="submit" name="editmode" accesskey="e" value="'.&mt('Edit').'" />'; |
<div><input type="submit" name="editmode" accesskey="e" value="'.&mt('Edit').'" />'; |
if (($env{'request.course.id'}) && ($env{'form.forceedit'})) { |
if (($env{'request.course.id'}) && ($env{'form.forceedit'})) { |
my $viewtext = &mt('Course View'); |
$result .= (' ' x 3).'<input type="button" value="'.&mt('Course View').'" onclick="javascript:location.href=currentURL" />'; |
if (&Apache::loncommon::course_type() eq 'Community') { |
|
$viewtext = &mt('Community View'); |
|
} |
|
$result .= (' ' x 3).'<input type="button" value="'. |
|
$viewtext.'" onclick="javascript:location.href=currentURL" />'; |
|
} |
} |
$result .= '</div> |
$result .= '</div> |
</div> |
</div> |
Line 2054 sub start_table {
|
Line 2048 sub start_table {
|
my $width = &Apache::lonxml::get_param('TeXwidth', $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 $theme = &Apache::lonxml::get_param('TeXtheme', $parstack, $safeeval, undef, 0); |
my $align = &Apache::lonxml::get_param('align', $parstack, $safeeval, undef, 0); |
my $align = &Apache::lonxml::get_param('align', $parstack, $safeeval, undef, 0); |
my $cell_border = &Apache::lonxml::get_param('rules', $parstack, $safeeval, undef, 0); |
my $cell_border = &Apache::lonxml::get_param('rules', $parstack, $safeeval, undef, 0); |
|
|
# The only thing that needs any figuring out is the width.. and then only if it is |
# 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 |
# a percent. If not it's assumed to be some valid TeX measurement unit e.g. 3.0cm |
# |
# |
|
|
my $table = new Apache::lontable(); |
my $table = new Apache::lontable(); |
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 ($cell_border ne 'none') { |
$table->cell_border(1); # html specs that border turns on both...unless rules='none'. |
$table->cell_border(1); # html specs that border turns on both...unless rules='none'. |
} |
} |
} |
} |
# Only all or nothing for cell borders for now: |
# Only all or nothing for cell borders for now: |
|
|
if ((defined $cell_border) && ($cell_border ne 'none')) { |
if ((defined $cell_border) && ($cell_border ne 'none')) { |
# &Apache::lonnet::logthis("Turning on cell borders: $cell_border"); |
# &Apache::lonnet::logthis("Turning on cell borders: $cell_border"); |
$table->cell_border(1); |
$table->cell_border(1); |
} |
} |
if (defined $theme) { |
if (defined $theme) { |
$table->theme($theme); |
$table->theme($theme); |
} |
} |
if (defined $align) { |
if (defined $align) { |
Line 2086 sub start_table {
|
Line 2080 sub start_table {
|
if (!(defined $width)) { |
if (!(defined $width)) { |
$width = '70%'; |
$width = '70%'; |
} |
} |
|
|
# If a percentage, need to calculate what this means in terms of |
# If a percentage, need to calculate what this means in terms of |
# page width: |
# page width: |
|
|
Line 2199 sub end_table {
|
Line 2193 sub end_table {
|
|
|
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"); |
$currentstring = $t->generate_string(); |
$currentstring = $t->generate_string(); |
|
&Apache::lonnet::logthis("Generated: $currentstring"); |
&enable_para(); |
&enable_para(); |
#-------------------------------------------------------------- |
#-------------------------------------------------------------- |
# Old table code: |
# Old table code: |
Line 2738 sub tag_check {
|
Line 2734 sub tag_check {
|
# |
# |
|
|
sub cell_config_hash { |
sub cell_config_hash { |
my ($align, $rowspan, $colspan, $width) = @_; |
my ($align, $rowspan, $colspan) = @_; |
if ($rowspan ne '') { |
|
$rowspan =~ s/^\s+|\s+$//g; |
|
} |
|
if ($colspan ne '') { |
|
$colspan =~ s/^\s+|\s+$//g; |
|
} |
|
my %config; |
my %config; |
if ($align ne '') { |
if ($align ne '') { |
$config{'halign'} = $align; |
$config{'halign'} = $align; |
} |
} |
if (($colspan =~ /^\d+$/) && ($colspan > 0)) { |
if ($colspan ne "") { |
$config{'colspan'} = $colspan; |
$config{'colspan'} = $colspan; |
} |
} |
if (($rowspan =~ /^\d+$/) && ($rowspan > 0)) { |
if ($rowspan ne '') { |
$config{'rowspan'} = $rowspan; |
$config{'rowspan'} = $rowspan; |
} |
} |
if ($width ne '') { |
|
$config{'width'} = $width; |
|
} |
|
return \%config; |
return \%config; |
} |
} |
|
|
Line 2769 sub start_td_tex {
|
Line 2756 sub start_td_tex {
|
# attributes, but empty of text. end_td_tex will |
# attributes, but empty of text. end_td_tex will |
# fetch the contents from the recursive parse and |
# fetch the contents from the recursive parse and |
# fill the cell with them: |
# fill the cell with them: |
my $align = &Apache::lonxml::get_param('align', $parstack, $safeeval); |
my $align = &Apache::lonxml::get_param('align', $parstack, $safeeval, undef, 1); |
my $rowspan = &Apache::lonxml::get_param('rowspan', $parstack, $safeeval); |
my $rowspan = &Apache::lonxml::get_param('rowspan', $parstack, $safeeval, undef, 1); |
my $colspan = &Apache::lonxml::get_param('colspan', $parstack, $safeeval); |
my $colspan = &Apache::lonxml::get_param('colspan', $parstack, $safeeval, undef, 1); |
my $width = &Apache::lonxml::get_param('TeXwidth', $parstack, $safeeval); |
|
my $config = &cell_config_hash($align, $rowspan, $colspan, $width); |
my $config = &cell_config_hash($align, $rowspan, $colspan); |
|
|
my $table = $Apache::londefdef::table[-1]; |
my $table = $Apache::londefdef::table[-1]; |
$table->add_cell('', $config); |
$table->add_cell('', $config); |
Line 3184 sub start_img {
|
Line 3171 sub start_img {
|
# Render unto browsers that which are the browser's... |
# Render unto browsers that which are the browser's... |
|
|
if ($target eq 'web' || $target eq 'webgrade') { |
if ($target eq 'web' || $target eq 'webgrade') { |
if ($env{'browser.imagesuppress'} ne 'on') { |
my $enc = ('yes' eq |
my $enc = ('yes' eq |
lc(&Apache::lonxml::get_param('encrypturl',$parstack, |
lc(&Apache::lonxml::get_param('encrypturl',$parstack, |
$safeeval))); |
$safeeval))); |
$currentstring.=&Apache::lonenc::encrypt_ref($token,{'src'=>$src}, |
$currentstring.=&Apache::lonenc::encrypt_ref($token,{'src'=>$src}, |
$enc); |
$enc); |
|
} else { |
|
my $alttag = &Apache::lonxml::get_param('alt',$parstack,$safeeval, |
|
undef,1); |
|
if (!$alttag) { |
|
$alttag = &Apache::lonmeta::alttag($Apache::lonxml::pwd[-1], |
|
$src); |
|
} |
|
$currentstring.='[IMAGE: '.$alttag.']'; |
|
} |
|
|
|
# and render unto TeX that which is LaTeX |
|
|
|
|
# and render unto TeX that which is LaTeX |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
# |
# |
# The alignment will require some superstructure to be put around |
# The alignment will require some superstructure to be put around |
Line 3302 sub start_img {
|
Line 3278 sub start_img {
|
['', 'none','parbox', 'parpic', 'wrapfigure'], $token, 2); |
['', 'none','parbox', 'parpic', 'wrapfigure'], $token, 2); |
my $alt= &Apache::lonxml::get_param('alt',$parstack,$safeeval); |
my $alt= &Apache::lonxml::get_param('alt',$parstack,$safeeval); |
my $enc= &Apache::lonxml::get_param('encrypturl',$parstack,$safeeval); |
my $enc= &Apache::lonxml::get_param('encrypturl',$parstack,$safeeval); |
|
|
$currentstring .=&Apache::edit::select_arg('Encrypt URL:','encrypturl', |
$currentstring .=&Apache::edit::select_arg('Encrypt URL:','encrypturl', |
['no','yes'], $token, 2); |
['no','yes'], $token, 2); |
if (($alt=~/\S/) && (lc($enc) eq 'yes')) { |
if (($alt=~/\S/) && (lc($enc) eq 'yes')) { |
Line 3316 sub start_img {
|
Line 3292 sub start_img {
|
if ($token->[2]{'src'}=~/\$/) { |
if ($token->[2]{'src'}=~/\$/) { |
$currentstring.=&mt('Variable image source'); |
$currentstring.=&mt('Variable image source'); |
} elsif ($token->[2]{'src'}=~/\S/) { |
} elsif ($token->[2]{'src'}=~/\S/) { |
$currentstring .= '<img src="'.$src.'" alt="'.$alt.'" '; |
$currentstring .= '<img src="'.$src.'" alt="'.$alt.'" '; |
if ($width) { $currentstring.=' width="'.$width.'" '; } |
if ($width) { $currentstring.=' width="'.$width.'" '; } |
if ($height) { $currentstring.=' height="'.$height.'" '; } |
if ($height) { $currentstring.=' height="'.$height.'" '; } |
$currentstring .= ' />'; |
$currentstring .= ' />'; |
} else { |
} else { |
$currentstring.=&mt("No image source specified"); |
$currentstring.=&mt("No image source specified"); |
} |
} |
Line 3390 sub start_applet {
|
Line 3366 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') { |
if ($env{'browser.appletsuppress'} ne 'on') { |
$currentstring = &Apache::lonenc::encrypt_ref($token, |
$currentstring = &Apache::lonenc::encrypt_ref($token, |
{'code'=>$code, |
{'code'=>$code, |
'archive'=>$archive} |
'archive'=>$archive} |
); |
); |
|
} else { |
|
my $alttag= &Apache::lonxml::get_param('alt',$parstack, |
|
$safeeval,undef,1); |
|
unless ($alttag) { |
|
$alttag=&Apache::lonmeta::alttag($Apache::lonxml::pwd[-1], |
|
$code); |
|
} |
|
$currentstring='[APPLET: '.$alttag.']'; |
|
} |
|
} 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 |
|
|
|
|
my $restart_sub = 0; |
my $restart_sub = 0; |
my $restart_sup = 0; |
my $restart_sup = 0; |
Line 3470 sub start_embed {
|
Line 3435 sub start_embed {
|
&Apache::lonxml::extlink($src); |
&Apache::lonxml::extlink($src); |
my $currentstring = ''; |
my $currentstring = ''; |
if ($target eq 'web' || $target eq 'webgrade') { |
if ($target eq 'web' || $target eq 'webgrade') { |
if ($env{'browser.embedsuppress'} ne 'on') { |
$currentstring=&Apache::lonenc::encrypt_ref($token,{'src'=>$src}); |
$currentstring=&Apache::lonenc::encrypt_ref($token,{'src'=>$src}); |
|
} else { |
|
my $alttag=&Apache::lonxml::get_param |
|
('alt',$parstack,$safeeval,undef,1); |
|
unless ($alttag) { |
|
$alttag=&Apache::lonmeta::alttag($Apache::lonxml::pwd[-1],$src); |
|
} |
|
$currentstring='[EMBED: '.$alttag.']'; |
|
} |
|
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
} |
} |
return $currentstring; |
return $currentstring; |
Line 3489 sub end_embed {
|
Line 3445 sub end_embed {
|
my ($target,$token) = @_; |
my ($target,$token) = @_; |
my $currentstring = ''; |
my $currentstring = ''; |
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') { |
} |
# ./. |
|
} |
return $currentstring; |
return $currentstring; |
} |
} |
|
|
Line 3929 sub end_colgroup {
|
Line 3886 sub end_colgroup {
|
return $currentstring; |
return $currentstring; |
} |
} |
|
|
|
|
#-- <del> tag (end tag required) |
#-- <del> tag (end tag required) |
sub start_del { |
sub start_del { |
my ($target,$token) = @_; |
my ($target,$token) = @_; |
my $currentstring = ''; |
my $currentstring = ''; |
if ($target eq 'web' || $target eq 'webgrade') { |
if ($target eq 'web' || $target eq 'webgrade') { |
$currentstring = $token->[4]; |
$currentstring = $token->[4]; |
|
} elsif ($target eq 'tex') { |
|
&disable_para(); |
|
$currentstring .= '\st{'; |
} |
} |
return $currentstring; |
return $currentstring; |
} |
} |
Line 3943 sub end_del {
|
Line 3904 sub end_del {
|
my ($target,$token) = @_; |
my ($target,$token) = @_; |
my $currentstring = ''; |
my $currentstring = ''; |
if ($target eq 'web' || $target eq 'webgrade') { |
if ($target eq 'web' || $target eq 'webgrade') { |
$currentstring = $token->[2]; |
$currentstring = $token->[2]; |
|
} elsif ($target eq 'tex') { |
|
&enable_para(); |
|
$currentstring = '}'; |
} |
} |
return $currentstring; |
return $currentstring; |
} |
} |
Line 4879 sub latex_header {
|
Line 4843 sub latex_header {
|
"\\usepackage{xcolor}\n". |
"\\usepackage{xcolor}\n". |
'\usepackage{calc}'. |
'\usepackage{calc}'. |
'\usepackage{amsmath}'. |
'\usepackage{amsmath}'. |
|
'\usepackage{soul}', |
'\usepackage{amssymb}'. |
'\usepackage{amssymb}'. |
'\usepackage{amsfonts}'. |
'\usepackage{amsfonts}'. |
'\usepackage{amsthm}'. |
'\usepackage{amsthm}'. |