version 1.69, 2005/05/23 11:02:59
|
version 1.73, 2005/12/01 18:46:31
|
Line 347 sub start_foil {
|
Line 347 sub start_foil {
|
if ($target eq 'web' || $target eq 'grade' || $target eq 'tex' || |
if ($target eq 'web' || $target eq 'grade' || $target eq 'tex' || |
$target eq 'analyze') { |
$target eq 'analyze') { |
my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval); |
my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval); |
if (!$name) { |
if ($name eq "") { |
&Apache::lonxml::error("Foils without names exist. This can cause problems to malfunction."); |
&Apache::lonxml::warning("Foils without names exist. This can cause problems to malfunction."); |
$name=$Apache::lonxml::curdepth; |
$name=$Apache::lonxml::curdepth; |
} |
} |
if (defined($Apache::response::foilnames{$name})) { |
if (defined($Apache::response::foilnames{$name})) { |
Line 391 sub start_text {
|
Line 391 sub start_text {
|
if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') { |
if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') { |
&Apache::lonxml::startredirection; |
&Apache::lonxml::startredirection; |
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
my $descr=&Apache::lonxml::get_all_text('/text',$parser); |
my $descr=&Apache::lonxml::get_all_text('/text',$parser,$style); |
$result=&Apache::edit::tag_start($target,$token,'Task Description'). |
$result=&Apache::edit::tag_start($target,$token,'Task Description'). |
&Apache::edit::editfield($token->[1],$descr,'Text',60,2). |
&Apache::edit::editfield($token->[1],$descr,'Text',60,2). |
&Apache::edit::end_row(); |
&Apache::edit::end_row(); |
Line 425 sub start_image {
|
Line 425 sub start_image {
|
if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') { |
if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') { |
&Apache::lonxml::startredirection; |
&Apache::lonxml::startredirection; |
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
my $bgimg=&Apache::lonxml::get_all_text('/image',$parser); |
my $bgimg=&Apache::lonxml::get_all_text('/image',$parser,$style); |
$Apache::edit::bgimgsrc=$bgimg; |
$Apache::edit::bgimgsrc=$bgimg; |
$Apache::edit::bgimgsrcdepth=$Apache::lonxml::curdepth; |
$Apache::edit::bgimgsrcdepth=$Apache::lonxml::curdepth; |
|
|
Line 477 sub end_image {
|
Line 477 sub end_image {
|
# Gnuplot e.g. just generates the latex to put inplace. |
# Gnuplot e.g. just generates the latex to put inplace. |
# |
# |
my $graphinclude; |
my $graphinclude; |
if ($src =~ /^\\graphicspath/) { |
if ($src =~ /^%DYNAMICIMAGE/) { |
|
# This is needed because the newline is not always passed -> tex. |
|
# At present we don't care about the sizing info. |
|
|
|
my ($commentline, $restofstuff) = split(/\n/, $src); |
$graphinclude = $src; |
$graphinclude = $src; |
|
$graphinclude =~ s/^$commentline//; |
} else { |
} else { |
my ($path,$file) = &Apache::londefdef::get_eps_image($src); |
my ($path,$file) = &Apache::londefdef::get_eps_image($src); |
my ($height_param,$width_param)= |
my ($height_param,$width_param)= |
Line 497 sub start_rectangle {
|
Line 502 sub start_rectangle {
|
$target eq 'analyze') { |
$target eq 'analyze') { |
&Apache::lonxml::startredirection; |
&Apache::lonxml::startredirection; |
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
my $coords=&Apache::lonxml::get_all_text('/rectangle',$parser); |
my $coords=&Apache::lonxml::get_all_text('/rectangle',$parser,$style); |
$result=&Apache::edit::tag_start($target,$token,'Rectangle'). |
$result=&Apache::edit::tag_start($target,$token,'Rectangle'). |
&Apache::edit::editline($token->[1],$coords,'Coordinate Pairs',40). |
&Apache::edit::editline($token->[1],$coords,'Coordinate Pairs',40). |
&Apache::edit::entercoord(undef,'textnode',undef,undef,'box'). |
&Apache::edit::entercoord(undef,'textnode',undef,undef,'box'). |
Line 551 sub start_polygon {
|
Line 556 sub start_polygon {
|
$target eq 'analyze') { |
$target eq 'analyze') { |
&Apache::lonxml::startredirection; |
&Apache::lonxml::startredirection; |
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
my $coords=&Apache::lonxml::get_all_text('/polygon',$parser); |
my $coords=&Apache::lonxml::get_all_text('/polygon',$parser,$style); |
$result=&Apache::edit::tag_start($target,$token,'Polygon'). |
$result=&Apache::edit::tag_start($target,$token,'Polygon'). |
&Apache::edit::editline($token->[1],$coords,'Coordinate list',40). |
&Apache::edit::editline($token->[1],$coords,'Coordinate list',40). |
&Apache::edit::entercoord(undef,'textnode',undef,undef,'polygon'). |
&Apache::edit::entercoord(undef,'textnode',undef,undef,'polygon'). |