--- loncom/xml/scripttag.pm	2002/11/14 16:47:41	1.83
+++ loncom/xml/scripttag.pm	2014/07/27 11:39:29	1.170
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # <script> definiton
 #
-# $Id: scripttag.pm,v 1.83 2002/11/14 16:47:41 matthew Exp $
+# $Id: scripttag.pm,v 1.170 2014/07/27 11:39:29 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -25,14 +25,15 @@
 #
 # http://www.lon-capa.org/
 #
-# 2/21 Guy
-# 8/20 Gerd Kortemeyer
 
 package Apache::scripttag;
 
 use strict;
 use Apache::lonnet;
-use Apache::style;
+use Apache::lonlocal;
+use Apache::lonxml();
+use Apache::londefdef();
+use Apache::style();
 
 #Globals
 # this used to pass around the standard callsub arguments to a tag func
@@ -42,17 +43,42 @@ use Apache::style;
 BEGIN {
   &Apache::lonxml::register('Apache::scripttag',
 			    ('script','scriptlib','parserlib','import',
-			     'window','display','storetc','physnet',
-			     'standalone','comment',
-			     'LONCAPA_INTERNAL_TURN_STYLE_ON'));
+			     'window','windowlink','togglebox','display','storetc','physnet',
+			     'standalone','comment','num','parse','algebra',
+			     'LONCAPA_INTERNAL_TURN_STYLE_ON',
+			     'LONCAPA_INTERNAL_TURN_STYLE_OFF'));
 }
 
 sub start_LONCAPA_INTERNAL_TURN_STYLE_ON {
     $Apache::lonxml::usestyle=1;
+    $Apache::lonxml::style_values='';
     return ('','no');
 }
 
 sub end_LONCAPA_INTERNAL_TURN_STYLE_ON {
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+    my $end=&Apache::lonxml::get_param('end',$parstack,$safeeval);
+    if (defined($end)) {
+	&Apache::lonxml::end_tag($tagstack,$parstack,$token);
+    }
+    return ('','no');
+}
+
+sub start_LONCAPA_INTERNAL_TURN_STYLE_OFF {
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+    $Apache::lonxml::usestyle=0;
+    my $end=&Apache::lonxml::get_param('end',$parstack,$safeeval);
+    if (!$end) {
+	$Apache::lonxml::style_values=$$parstack[-1];
+	$Apache::lonxml::style_end_values=$$parstack[-1];
+    } else {
+	$Apache::lonxml::style_values=$Apache::lonxml::style_end_values;
+	$Apache::lonxml::style_end_values='';
+    }
+    return ('','no');
+}
+
+sub end_LONCAPA_INTERNAL_TURN_STYLE_OFF {
     return ('','no');
 }
 
@@ -63,36 +89,145 @@ sub start_script {
   my $type= &Apache::lonxml::get_param('type',$parstack,$safeeval);
   &Apache::lonxml::debug("found type of $type");
   if ($type eq "loncapa/perl") {
-    my $bodytext=&Apache::lonxml::get_all_text("/script",$$parser[$#$parser]);
     if ( $target eq "modified" ) {
-      $result=$token->[4].&Apache::edit::modifiedfield();
+	$result=$token->[4].&Apache::edit::modifiedfield('/script',$parser);
     } elsif ( $target eq 'web' || $target eq 'tex' ||
-	      $target eq 'grade' || $target eq 'answer' ||
-	      $target eq 'analyze' ) {
+	      $target eq 'grade' || $target eq 'webgrade' ||
+	      $target eq 'answer' || $target eq 'analyze' ) {
+	my $bodytext=&Apache::lonxml::get_all_text_unbalanced("/script",$parser);
 	if (!$Apache::lonxml::default_homework_loaded) {
 	    &Apache::lonxml::default_homework_load($safeeval);
 	}
 	&Apache::run::run($bodytext,$safeeval);
-	if (($target eq 'answer') && ($Apache::lonhomework::viewgrades == 'F')) {
+	if (($target eq 'answer') &&
+	    ($env{'form.answer_output_mode'} ne 'tex') &&
+	    ($Apache::lonhomework::viewgrades == 'F')) {
 	    $Apache::lonxml::evaluate--;
-	    $result.="<a href=\"javascript:newWindow=open(\'\',\'new_W\',\'width=500,height=200,scrollbars=1\');newWindow.document.open(\'text/html\',\'replace\');newWindow.document.writeln(\'&lt;html&gt;&lt;head&gt;&lt;title&gt;newwindow&lt;/title&gt;&lt;/head&gt;&lt;body bgcolor=&quot;#FFFFFF&quot;&gt;&lt;pre&gt;";
-	    my $listing= &HTML::Entities::encode(&Apache::run::dump($target,$safeeval));
-
-	    $result.=$listing;
-	    $result.= "&lt;/pre&gt;&lt;/body&gt;&lt;/html&gt;\');newWindow.document.close();void(0);\">Script Vars</a><br />";
+	    my (undef,undef,$udom,$uname)=&Apache::lonnet::whichuser();
+	    $uname =~s/\W//g;
+	    $udom  =~s/\W//g;
+	    my $function_name = 
+		join('_','LONCAPA_scriptvars',$uname,$udom,
+		     $env{'form.counter'},$Apache::lonxml::curdepth);
+            &Apache::lonxml::add_script_result(
+	             &Apache::loncommon::modal_adhoc_window($function_name,500,500,
+                            '<pre style="background-color:#ffffff;">'.
+                            &Apache::run::dump($target,$safeeval).'</pre>',
+                            &mt('Script Vars'))."<br />");
 	}
     } elsif ($target eq "edit" ) {
       #&Apache::run::run($bodytext,$safeeval);
       #$result="<br /> &lt;$token->[1]&gt; output: <br />$bodytext<br />Source:<br />";
-      $result=&Apache::edit::tag_start($target,$token,'Script');
-      $result.=&Apache::edit::editfield($token->[1],$bodytext,'',80,4);
+	my $bodytext=&Apache::lonxml::get_all_text_unbalanced("/script",$parser);
+	$result=&Apache::edit::tag_start($target,$token,'Script');
+	$result.=&Apache::edit::editfield($token->[1],$bodytext,'',80,4);
+    } elsif ($target eq 'meta') {
+	my $bodytext=&Apache::lonxml::get_all_text_unbalanced("/script",$parser);
     }
   } else {
-    if ($target ne "meta") {
-      $result = $token->[4];
-      my $bodytext=&Apache::lonxml::get_all_text("/script",$$parser[$#$parser]);
-      $result.=$bodytext;
-    }
+      my $bodytext=&Apache::lonxml::get_all_text_unbalanced("/script",$parser);
+      if ($target ne "meta" && $target ne 'tex' && $target ne 'answer') {
+	  $result = $token->[4];
+	  $result.=$bodytext;
+          my $src=&Apache::lonxml::get_param('src',$parstack,$safeeval,undef,1);
+          my $url=&Apache::lonnet::hreflocation('',$env{'request.filename'});
+          my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+          my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+          if ($src ne '') {
+              if ($src !~ m{^(/|https?://)}) {
+                  my $cleanhref = &Apache::londefdef::clean_docs_httpref($src,$url,$cdom,$cnum);
+                  if ($cleanhref) {
+                      &Apache::lonxml::extlink($cleanhref);
+                  }
+              }
+          } elsif (($type eq 'text/javascript') && ($bodytext ne '')) {
+              if ($url =~ m{^\Q/uploaded/$cdom/$cnum/docs/\E}) {
+                  if ($bodytext =~ m{\.addMediaSrc\((["'])(?:(?!\1).)+\1\)}) {
+                      my $quote = $1;
+                      if ($bodytext =~ m{\Q.addMediaSrc($quote\E([^$quote]+)\Q$quote)\E}) {
+                          my $fname = $1;
+                          my $cleanhref =
+                              &Apache::londefdef::clean_docs_httpref($fname,$url,$cdom,$cnum);
+                          if ($cleanhref) {
+                              &Apache::lonxml::extlink($cleanhref);
+                          }
+                      }
+                  }
+                  if ($bodytext =~ m{\.set\w+(Src|Swf)\(["']}i) {
+                      my @srcs = split(/\.set/,$bodytext);
+                      if (scalar(@srcs) > 1) {
+                          foreach my $item (@srcs) {
+                              if ($item =~ m{^(FlashPlayerSwf|MediaSrc|XMPSrc|ConfigurationSrc|PosterImageSrc)\((['"])(?:(?!\2).)+\2\)}is) {
+                                  my $srctype = $1;
+                                  my $quote = $2;
+                                  my ($fname) = ($item =~ m{^\Q$srctype($quote\E([^$quote]+)\Q$quote)\E}); 
+                                  my $cleanhref =
+                                      &Apache::londefdef::clean_docs_httpref($fname,$url,$cdom,$cnum);
+                                  if ($cleanhref) {
+                                      &Apache::lonxml::extlink($cleanhref);
+                                      if ($srctype eq 'ConfigurationSrc') {
+                                          if ($cleanhref =~ m{^(.+/)configuration_express\.xml$}) {
+#
+# Camtasia 8.1: express_show/spritesheet.png needed, and included in zip archive.
+# Not referenced directly in <main>.html or <main>_player.html files,
+# so call lonxml::extlink() here to include httpref for the uploaded file.
+# (where <main> is name user gave to file/archive).
+#
+
+                                              my $spritesheet = $1.'express_show/spritesheet.png';
+                                              if (&Apache::lonnet::repcopy_userfile($spritesheet) eq 'ok') {
+                                                  &Apache::lonxml::extlink($spritesheet);
+                                              }
+                                          }
+#
+# Camtasia 8.4: express_show/spritesheet.min.css needed, and included in zip archive.
+# Not referenced directly in <main>.html or <main>_player.html files,
+# so call lonxml::extlink() here to include httpref for the uploaded file.
+# (where <main> is name user gave to file/archive).
+#
+                                          my $spritesheet_css = $1.'express_show/spritesheet.min.css';
+                                          if (&Apache::lonnet::repcopy_userfile($spritesheet_css) eq 'ok') {
+                                              &Apache::lonxml::extlink($spritesheet_css);
+                                          }
+                                      } elsif ($srctype eq 'PosterImageSrc') {
+                                          if ($fname =~ m{^(.+)_First_Frame\.png$}) {
+                                              my $prefix = $1;
+                                              my ($path) = ($cleanhref =~ m{^(.+/)\Q$fname\E});
+#
+# Camtasia 8.1: <main>_Thumbnails.png needed, and included in zip archive.
+# Not referenced directly in <main>.html or <main>_player.html files,
+# so call lonxml::extlink() here to include httpref for the uploaded file
+# (where <main> is name user gave to file/archive).
+#
+                                              my $thumbnail = $path.$prefix.'_Thumbnails.png';
+                                              if (&Apache::lonnet::repcopy_userfile($thumbnail) eq 'ok') {
+                                                  &Apache::lonxml::extlink($thumbnail);
+                                              }
+                                          }
+                                      }
+                                  }
+                              }
+                          }
+                      }
+                  }
+                  if ($bodytext =~ /\(document,\s*(['"])script\1,\s*\[([^\]]+)\]\);/s) {
+                      my $scriptslist = $2;
+                      my @srcs = split(/\s*,\s*/,$scriptslist);
+                      foreach my $src (@srcs) {
+                          if ($src =~ /(["'])(?:(?!\1).)+\.js\1/) {
+                              my $quote = $1;
+                              my ($fname) = ($src =~ m/\Q$quote\E([^$quote]+)\Q$quote\E/);
+                              my $cleanhref =
+                                  &Apache::londefdef::clean_docs_httpref($fname,$url,$cdom,$cnum);
+                              if ($cleanhref) {
+                                  &Apache::lonxml::extlink($cleanhref);
+                              }
+                          }
+                      }
+                  }
+              }
+          }
+      }
   }
   return $result;
 }
@@ -103,7 +238,7 @@ sub end_script {
   my $type = &Apache::lonxml::get_param('type',$parstack,$safeeval);
   my $result='';
   #other script blocks need to survive
-  if ($type ne "loncapa/perl") {
+  if ($type ne "loncapa/perl" && $target ne 'tex') {
     return $token->[2];
   } elsif ($target eq 'edit' ) {
     return &Apache::edit::end_table();
@@ -115,29 +250,36 @@ sub end_script {
 
 sub start_display {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
-
+  @Apache::scripttag::parser_env = @_;
   my $result;
-  my $bodytext=&Apache::lonxml::get_all_text("/display",$$parser[$#$parser]);
 
   if ( $target eq "modified" ) {
-    $result=$token->[4].&Apache::edit::modifiedfield();
+      $result=$token->[4].&Apache::edit::modifiedfield("/display",$parser);
   } elsif ( $target eq 'web' || $target eq 'tex' ||
-	    $target eq 'grade' || $target eq 'answer' ||
-	      $target eq 'analyze') {
+	    $target eq 'grade' || $target eq 'webgrade' ||
+	    $target eq 'answer' || $target eq 'analyze') {
+      my $bodytext=&Apache::lonxml::get_all_text_unbalanced("/display",$parser);
       if (!$Apache::lonxml::default_homework_loaded) {
 	  &Apache::lonxml::default_homework_load($safeeval);
       }
       $result=&Apache::run::run($bodytext,$safeeval);
       if ($target eq 'grade' || $target eq 'answer' ||
 	  $target eq 'analyze') {
-	  $result=''; # grade should produce no output
+	  # grade/answer/analyxe should produce no output but if we
+	  # are redirecting, the redirecter should know what to do
+	  # with the output
+	  if (!$Apache::lonxml::redirection) { $result=''; }
       }
+      $Apache::lonxml::post_evaluate=0;
   } elsif ($target eq "edit" ) {
+    my $bodytext=&Apache::lonxml::get_all_text_unbalanced("/display",$parser);
     #$result = 
     #  "<br /> &lt;$token->[1]&gt; output: <br />$bodytext<br />Source:<br />";
     #$result.=&Apache::edit::editfield($token->[1],$bodytext,'',40,1);
     $result=&Apache::edit::tag_start($target,$token,'Script With Display');
     $result.=&Apache::edit::editfield($token->[1],$bodytext,'',80,1)
+  } elsif ($target eq 'meta') {
+      my $bodytext=&Apache::lonxml::get_all_text_unbalanced("/display",$parser);
   }
   return $result;
 }
@@ -154,8 +296,9 @@ sub start_scriptlib {
   my $result ='';
   my $error='';
 
-  if ($target eq 'web' || $target eq 'grade' || $target eq 'meta' || 
-      $target eq 'edit' || $target eq 'answer' || $target eq 'analyze') {
+  if ($target eq 'web' || $target eq 'tex' || $target eq 'grade' ||
+      $target eq 'meta' || $target eq 'edit' || $target eq 'answer' ||
+      $target eq 'analyze' || $target eq 'webgrade') {
     $bodytext=$$parser[$#$parser]->get_text("/scriptlib");
     $bodytext=&Apache::run::evaluate($bodytext,$safeeval,
 				     $$parstack[$#$parstack]);
@@ -164,7 +307,7 @@ sub start_scriptlib {
     my $script=&Apache::lonnet::getfile($location);
     if ($script == -1) {
       if ($target eq 'edit') {
-        $error='</tr><tr><td>Errors</td><td colspan="2"><b> Unable to find <i>'.$location.'</i></b></td>'."\n";
+        $error='</tr><tr><td>'.&mt('Errors').'</td><td colspan="2"><b>'.&mt(' Unable to find [_1]','<span class="LC_filename">'.$location.'</span>').'</b></td>'."\n";
       } else {
 	&Apache::lonxml::error("<b> Unable to find <i>$location</i> for scriptlib</b>");
 	return "";
@@ -182,9 +325,7 @@ sub start_scriptlib {
 	    &Apache::edit::end_table();
   }
   if ($target eq "modified" ) {
-    $bodytext=$$parser[$#$parser]->get_text("/scriptlib");
-    $result=$token->[4].&Apache::edit::modifiedfield($token);
-    &Apache::lonxml::debug($result);
+      $result=$token->[4].&Apache::edit::modifiedfield("/scriptlib",$parser);
   }
   return $result;
 }
@@ -201,8 +342,9 @@ sub start_parserlib {
   my $bodytext;
   my $result ="";
   my $error='';
-  if ($target eq 'web' || $target eq 'grade' || $target eq 'meta' ||
-      $target eq 'edit' || $target eq 'answer' || $target eq 'analyze') {
+  if ($target eq 'web' || $target eq 'tex' || $target eq 'grade' ||
+      $target eq 'meta' || $target eq 'edit' || $target eq 'answer' ||
+      $target eq 'analyze' || $target eq 'webgrade') {
     $bodytext=$$parser[$#$parser]->get_text("/parserlib");
     $bodytext=&Apache::run::evaluate($bodytext,$safeeval,
 				     $$parstack[$#$parstack]);
@@ -228,9 +370,7 @@ sub start_parserlib {
 	    &Apache::edit::end_table();
   }
   if ($target eq "modified" ) {
-    $bodytext=$$parser[$#$parser]->get_text("/parserlib");
-    $result=$token->[4].&Apache::edit::modifiedfield($token);
-    &Apache::lonxml::debug($result);
+      $result=$token->[4].&Apache::edit::modifiedfield("/parserlib",$parser);
   }
   return $result;
 }
@@ -243,40 +383,159 @@ sub end_parserlib {
 }
 
 sub start_window {
-  my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
-  my $result = '';
-  if ($target eq 'web') {
-    &Apache::lonxml::startredirection;
-  }  elsif ($target eq 'tex') {
-       $result = '\unskip\footnote{';
-   }
-  return $result;  
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+    my $result = '';
+    if ($target eq 'web' || $target eq 'webgrade') {
+	&Apache::lonxml::startredirection;
+    } elsif ($target eq 'tex') {
+        my $printtext=&Apache::lonxml::get_param('printtext',$parstack,$safeeval);
+        if ($printtext=~/\w/) {
+# If printtext is given, do not output any intervening information
+           &Apache::lonxml::startredirection;
+        } else {
+           $result = '\unskip\footnote{';
+        }
+    } elsif ($target eq 'edit') {
+	$result.=&Apache::edit::tag_start($target,$token);
+	$result.=&Apache::edit::text_arg('Text of Link:','linktext',$token,70);
+	$result.=&Apache::edit::text_arg('Height:','height',$token,5);
+	$result.=&Apache::edit::text_arg('Width:','width',$token,5);
+        $result.=&Apache::edit::text_arg('Printed text (optional):','printtext',$token,20);
+	$result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
+    } elsif ($target eq 'modified') {
+	my $constructtag=&Apache::edit::get_new_args($token,$parstack,
+						     $safeeval,'linktext',
+						     'width','height');
+	if ($constructtag) { $result=&Apache::edit::rebuild_tag($token); }
+    }
+    return $result;  
 }
 
 sub end_window {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   my $result;
-  if ($target eq 'web') {
+  if ($target eq 'web' || $target eq 'webgrade') {
     my $output=&Apache::lonxml::endredirection;
-    $output =~ s/\"/\&quot\;/g;
-    $result = "<a href=\"javascript:newWindow=open(\'\',\'new_W\',\'width=500,height=200,scrollbars=1\');newWindow.document.open(\'text/html\',\'replace\');newWindow.document.writeln(\'<html><head><title>newwindow</title></head><body bgcolor=&quot;#FFFFFF&quot;> $output </body></html>\');newWindow.document.close();void(0);\"><sup>*</sup></a>";
+    my $linktext= &Apache::lonxml::get_param('linktext',$parstack,$safeeval);
+    if (!$linktext) { $linktext='<sup>*</sup>'; }
+    my $width= &Apache::lonxml::get_param('width',$parstack,$safeeval);
+    if (!$width) { $width='500'; }
+    my $height= &Apache::lonxml::get_param('height',$parstack,$safeeval);
+    if (!$height) { $height='200'; }
+    $result=&Apache::loncommon::modal_adhoc_window
+           ("LONCAPA_newwindow_$Apache::lonxml::curdepth",$width,$height,$output,$linktext);
   } elsif ($target eq 'tex') {
-      $result = '}';
+      my $printtext=&Apache::lonxml::get_param('printtext',$parstack,$safeeval);
+      if ($printtext=~/\w/) {
+# If a "printtext" is given, proceed to retrieve all intervening information and trash it
+         my $output=&Apache::lonxml::endredirection;
+# Use printtext instead
+         $result=$printtext;
+      } else {
+         $result='}';
+      }
   } else {
       $result = '';
   }
   return $result; 
 }
 
+
+sub start_windowlink {
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+    my $result = '';
+    if ($target eq 'web' || $target eq 'webgrade') {
+        &Apache::lonxml::startredirection;
+    } elsif ($target eq 'edit') {
+        $result.=&Apache::edit::tag_start($target,$token);
+        $result.=&Apache::edit::text_arg('Link:','href',$token,70);
+        $result.=&Apache::edit::text_arg('Height:','height',$token,5);
+        $result.=&Apache::edit::text_arg('Width:','width',$token,5);
+        $result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
+    } elsif ($target eq 'modified') {
+        my $constructtag=&Apache::edit::get_new_args($token,$parstack,
+                                                     $safeeval,'href',
+                                                     'width','height');
+        if ($constructtag) { $result=&Apache::edit::rebuild_tag($token); }
+    }
+    return $result;
+}
+
+sub end_windowlink {
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+  my $result;
+  if ($target eq 'web' || $target eq 'webgrade') {
+    my $output=&Apache::lonxml::endredirection;
+    my $href= &Apache::lonxml::get_param('href',$parstack,$safeeval);
+    if (!$href) { $href='/adm/rat/empty.html'; }
+    my $width= &Apache::lonxml::get_param('width',$parstack,$safeeval);
+    if (!$width) { $width='500'; }
+    my $height= &Apache::lonxml::get_param('height',$parstack,$safeeval);
+    if (!$height) { $height='200'; }
+    $result=&Apache::loncommon::modal_link($href,$output,$width,$height);
+  } else {
+      $result = '';
+  }
+  return $result;
+}
+
+
+sub start_togglebox {
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+    my $result = '';
+    if ($target eq 'web' || $target eq 'webgrade') {
+        my $id="LONCAPA_togglebox_$Apache::lonxml::curdepth";
+        my $heading=&Apache::lonxml::get_param('heading',$parstack,$safeeval);
+        unless ($heading) { $heading=''; } else { $heading.=' '; }
+        my $showtext=&Apache::lonxml::get_param('showtext',$parstack,$safeeval);
+        my $hidetext=&Apache::lonxml::get_param('hidetext',$parstack,$safeeval);
+        my $headerbg=&Apache::lonxml::get_param('headerbg',$parstack,$safeeval);
+        $result=&Apache::loncommon::start_togglebox($id,$heading,$headerbg,$hidetext,$showtext);
+    } elsif ($target eq 'tex') {
+        my $heading=&Apache::lonxml::get_param('heading',$parstack,$safeeval);
+        unless ($heading) { $heading=''; } else { $heading.=' '; }
+        $result = "\n\n".'\fbox{{\bf '.$heading.'} \qquad '."\n";
+    } elsif ($target eq 'edit') {
+        $result.=&Apache::edit::tag_start($target,$token);
+        $result.=&Apache::edit::text_arg('Heading:','heading',$token,70);
+        $result.=&Apache::edit::text_arg('Header Background:','headerbg',$token,7);
+        $result.=&Apache::edit::text_arg('Show text:','showtext',$token,10);
+        $result.=&Apache::edit::text_arg('Hide text:','hidetext',$token,10);
+        $result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
+    } elsif ($target eq 'modified') {
+        my $constructtag=&Apache::edit::get_new_args($token,$parstack,
+                                                     $safeeval,'heading',
+                                                     'showtext','hidetext',
+                                                     'headerbg','textbg');
+        if ($constructtag) { $result=&Apache::edit::rebuild_tag($token); }
+    }
+    return $result;
+}
+
+sub end_togglebox {
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+  my $result;
+  if ($target eq 'web' || $target eq 'webgrade') {
+    $result=&Apache::loncommon::end_togglebox();
+  } elsif ($target eq 'tex') {
+      $result = "}\n\n";
+  } else {
+      $result = '';
+  }
+  return $result;
+}
+
+
+
 sub start_import {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   my $bodytext=$$parser[$#$parser]->get_text("/import");
   my $result ="";
 
-  $bodytext=Apache::run::evaluate($bodytext,$safeeval,$$parstack[$#$parstack]);
+  $bodytext=&Apache::run::evaluate($bodytext,$safeeval,$$parstack[$#$parstack]);
 
-  if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
-      $target eq 'tex' || $target eq 'analyze' ) {
+  if ($target eq 'web' ||  $target eq 'webgrade' || $target eq 'grade' 
+      || $target eq 'answer' || $target eq 'tex' || $target eq 'analyze' ) {
     # FIXME this probably needs to be smart about construction vs.
     # non construction space.
     my $location=&Apache::lonnet::filelocation($Apache::lonxml::pwd['-1'],$bodytext);
@@ -285,32 +544,63 @@ sub start_import {
       &Apache::lonxml::error("<b> Unable to find <i>$bodytext as $location</i> for import</b>");
       return "";
     }
-
+    my $importmode=&Apache::lonxml::get_param('importmode',$parstack,$safeeval);
+    if (($importmode eq 'problem') || ($importmode eq 'part')) {
+# We are using import to import published problems
+       if (($importmode eq 'problem') || ($file=~/<part[^<]*>/s)) {
+# We explicitly don't want this to be a separate part or the problem already has parts
+          $file=~s/^\s*<problem>/<library>/s;
+	  $file=~s/<\/problem>\s*$/<\/library>/s;
+       } else {
+# We want this to be a separate part, but it currently is not
+          $file=~s/^\s*<problem>/<library><part>/s;
+	  $file=~s/<\/problem>\s*$/<\/part><\/library>/s;
+       }
+    }
     my $dir=$location;
     $dir=~s:/[^/]*$::;
     #  &Apache::lonxml::debug("directory $dir $location file $file \n<b>END</b>\n");
-    my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval);
+    my $id= &Apache::lonxml::get_id($parstack,$safeeval);
     if (!$id) { $id=$Apache::lonxml::curdepth; }
     push(@Apache::inputtags::import,$id);
+    push(@Apache::inputtags::importlist,$id);
+
     &Apache::lonxml::newparser($parser,\$file,$dir);
+
   } elsif ($target eq "edit" ) {
     $result.=&Apache::edit::tag_start($target,$token);
-    $result.=&Apache::edit::editline($token->[1],$bodytext,'',40);
+    my $location=$token->[1];
+    $location=~s/^\s*//s;
+    $location=~s/\s*$//s;
+    $result.=&Apache::edit::editline($location,$bodytext,'',40);
     $result.=&Apache::edit::browse(undef,'textnode');
+    $result.= '&nbsp;<label>'.&mt('Import as:').
+              '<select name="importmode_'.$Apache::lonxml::curdepth.'">';
+    my %options=&Apache::lonlocal::texthash(''        => 'as standard library',
+                                            'problem' => 'as problem',
+                                            'part'    => 'as problem part(s)');
+    foreach my $option (sort(keys(%options))) {
+       $result.='<option value="'.$option.'"';
+       if ($option eq &Apache::lonxml::get_param('importmode',$parstack,$safeeval)) {
+          $result.=' selected="selected"';
+       }
+       $result.='>'.$options{$option}.'</option>';
+    }
+    $result.='</select></label>';
     #FIXME this need to convert $bodytext to be a contruction space reference
     #my $location=&Apache::lonnet::filelocation($Apache::lonxml::pwd['-1'],$bodytext);
     #$result.="Click<a href=\"$location\">here</a> to edit<br />"
   } elsif ($target eq 'modified') {
-    $bodytext=$$parser[$#$parser]->get_text("/import");
-    $result=$token->[4].&Apache::edit::modifiedfield($token);
-    &Apache::lonxml::debug($result);
+      &Apache::edit::get_new_args($token,$parstack,$safeeval,'importmode');
+      $result='<import id="'.$token->[2]{'id'}.'" importmode="'.$token->[2]{'importmode'}.'">';
+      $result.=&Apache::edit::modifiedfield("/import",$parser);
   } elsif ($target eq 'meta') {
-    my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval);
+    my $id= &Apache::lonxml::get_id($parstack,$safeeval);
     $result.='<import part="'.$Apache::inputtags::part;
     if ($id) {
       $result.='" id="'.$id;
     }
-    $result.='">';
+    $result.='" importmode="'.$token->[2]{'importmode'}.'">';
     $result.=$bodytext;
     $result.='</import>';
   }
@@ -321,7 +611,8 @@ sub end_import {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   pop(@Apache::inputtags::import);
   my $result;
-  if ($target eq 'edit' ) { $result=&Apache::edit::end_table(); }
+  if ($target eq 'edit' ) { $result=&Apache::edit::end_row.
+				&Apache::edit::end_table(); }
   return $result;
 }
 
@@ -363,9 +654,9 @@ sub end_physnet {
 sub start_standalone {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   my $result='';
-  if ($target eq 'web' ) {
-    if ( $ENV{'request.course.id'} ) {
-      my $inside = &Apache::lonxml::get_all_text("/standalone",$$parser[-1]);
+  if ($target eq 'web' || $target eq 'webgrade') {
+    if ( $env{'request.course.id'} ) {
+      my $inside = &Apache::lonxml::get_all_text("/standalone",$parser,$style);
     } else {
       $result='<table bgcolor="#E1E1E1" border="2"><tr><td>';
     }
@@ -376,8 +667,8 @@ sub start_standalone {
 sub end_standalone {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   my $result='';
-  if ($target eq 'web' ) {
-    if ( $ENV{'request.course.id'} ) {
+  if ($target eq 'web' || $target eq 'webgrade' ) {
+    if ( $env{'request.course.id'} ) {
     } else {
       $result='</td></tr></table>';
     }
@@ -390,14 +681,15 @@ sub start_comment {
   my $result='';
   if ($target eq 'edit') {
     $result=&Apache::edit::tag_start($target,$token);
-    my $bodytext=&Apache::lonxml::get_all_text("/comment",$$parser[$#$parser]);
+    my $bodytext=&Apache::lonxml::get_all_text("/comment",$parser,$style);
     $result.=&Apache::edit::editfield($token->[1],$bodytext,'',80,4)
   } elsif ( $target eq 'modified') {
-    $result=$token->[4].&Apache::edit::modifiedfield($token);
-  } elsif ( $target eq 'web' || $target eq 'tex' || $target eq 'grade' ||
-	    $target eq 'answer' || $target eq 'meta' || $target eq 'analyze') {
+    $result=$token->[4].&Apache::edit::modifiedfield("/comment",$parser);
+  } elsif ( $target eq 'web'    || $target eq 'tex'  || $target eq 'grade'   ||
+	    $target eq 'answer' || $target eq 'meta' || $target eq 'analyze' ||
+	    $target eq 'webgrade') {
     #normally throw away comments
-    my $bodytext=&Apache::lonxml::get_all_text("/comment",$$parser[$#$parser]);
+    my $bodytext=&Apache::lonxml::get_all_text("/comment",$parser,$style);
   }
   return $result;
 }
@@ -411,16 +703,119 @@ sub end_comment {
 
 sub xmlparse {
   my ($string) = @_;
-  &Apache::lonxml::debug("Got $string");
+  &Apache::lonxml::debug("xmlparse recursion starting with $string");
+  # Apache::run::evaluate does an 'eval' on the name of the subroutine
+  # if it detects something that looks like a subroutine, this ends up calling
+  # things without any arguments and since perl is nice enough to pass
+  # along the default arguments when you don't explicitly say no arguments
+  # if you call &xmlparse, it gets &xmlparse passed as it argument.
+  # Same thing soccurs with &chemparse.
+  if ($string eq '&xmlparse') { return '&xmlparse'; }
+  if ($string eq '&chemparse') { return '&chemparse'; }
   my ($target,$token,$tagstack,$parstack,$oldparser,$safeeval,$style)=
     @Apache::scripttag::parser_env;
   my @parser;
   &Apache::lonxml::newparser(\@parser,\$string);
+  &Apache::lonxml::startredirection();
   my $result=&Apache::lonxml::inner_xmlparse($target,$tagstack,
 					     $parstack,\@parser,
 					     $safeeval,$style);
+  $result.=&Apache::lonxml::endredirection();
+  &Apache::lonxml::debug("target is $target xmlparse recursion ending with $result");
   return $result;
 }
 
+sub start_num {
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_;
+    my $result = '';
+    my $inside = &Apache::lonxml::get_all_text_unbalanced("/num",$parser);
+    if ($target eq 'tex' || $target eq 'web' || $target eq 'webgrade') {
+	$inside=&Apache::run::evaluate($inside,$safeeval,$$parstack[-1]);
+	if (!$Apache::lonxml::default_homework_loaded) {
+	    &Apache::lonxml::default_homework_load($safeeval);
+	}
+	@Apache::scripttag::parser_env = @_;
+	my $format=&Apache::lonxml::get_param('format',$parstack,$safeeval);
+	$result=&Apache::run::run("return &prettyprint(q\0$inside\0,q\0$format\0);",$safeeval);
+    }    
+    return $result;
+}
+
+sub end_num {
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_;
+    my $result = '';
+    return $result;
+}
+
+sub start_parse {
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_;
+    my $result = '';
+    if ( $target eq 'web'    || $target eq 'tex'    ||
+	 $target eq 'grade'  || $target eq 'answer' ||
+	 $target eq 'analyze'|| $target eq 'webgrade') {
+	my $inside = &Apache::lonxml::get_all_text_unbalanced("/parse",$parser);
+	$inside=&Apache::run::evaluate($inside,$safeeval,$$parstack[-1]);
+	if (!$Apache::lonxml::default_homework_loaded) {
+	    &Apache::lonxml::default_homework_load($safeeval);
+	}
+	@Apache::scripttag::parser_env = @_;
+	$result=&Apache::run::run("return &xmlparse(q\0$inside\0);",$safeeval);
+	if ($target eq 'grade' || $target eq 'answer' ||
+	    $target eq 'analyze') {
+	    # grade/answer/analyxe should produce no output but if we
+	    # are redirecting, the redirecter should know what to do
+	    # with the output
+	    if (!$Apache::lonxml::redirection) { $result=''; }
+	}
+    }
+    return $result;
+}
+
+sub end_parse {
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_;
+    my $result = '';
+    return $result;
+}
+
+sub start_algebra {
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_;
+    my $result = '';
+    if ( $target eq 'web'     || $target eq 'tex'    ||
+	 $target eq 'grade'   || $target eq 'answer' ||
+	 $target eq 'analyze' || $target eq 'webgrade') {
+	my $inside = &Apache::lonxml::get_all_text_unbalanced("/algebra",$parser);
+	$inside = &Apache::run::evaluate($inside,$safeeval,$$parstack[-1]);
+	if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') {
+	    my $style=&Apache::lonxml::get_param('style',$parstack,$safeeval);
+	    $result=&Apache::lontexconvert::algebra($inside,$target,$style,$parstack,$safeeval);
+	}
+	$Apache::lonxml::post_evaluate=0;
+    }
+    return $result;
+}
+
+sub end_algebra {
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_;
+    my $result = '';
+    return $result;
+}
+
 1;
 __END__
+
+=pod
+
+=head1 NAME
+
+Apache::scripttag.pm
+
+=head1 SYNOPSIS
+
+implements <script>, <scriptlib>, <parserlib>,
+and <import>
+
+This is part of the LearningOnline Network with CAPA project
+described at http://www.lon-capa.org.
+
+=cut
+