--- loncom/xml/lonxml.pm	2001/06/12 21:10:22	1.91
+++ loncom/xml/lonxml.pm	2001/06/16 16:09:09	1.95
@@ -10,6 +10,8 @@
 # 5/26 Gerd Kortemeyer
 # 5/27 H. K. Ng
 # 6/2,6/3,6/8,6/9 Gerd Kortemeyer
+# 6/12,6/13 H. K. Ng
+# 6/16 Gerd Kortemeyer
 
 package Apache::lonxml; 
 use vars 
@@ -146,6 +148,12 @@ ENDPARM
        (2,1,'back.gif','backward','','gopost("/adm/flip","back:"+currentURL)');
           menu.switchbutton
      (2,3,'forw.gif','forward','','gopost("/adm/flip","forward:"+currentURL)');
+          menu.switchbutton
+                            (9,1,'sbkm.gif','set','bookmark','set_bookmark()');
+          menu.switchbutton
+                         (9,2,'vbkm.gif','view','bookmark','edit_bookmarks()');
+          menu.switchbutton
+                               (9,3,'anot.gif','anno-','tations','annotate()');
           $hwkadd
     }
 
@@ -158,7 +166,8 @@ ENDPARM
           menu.clearbut(7,2);
           menu.clearbut(7,3);
           menu.menucltim=menu.setTimeout(
- 'clearbut(2,1);clearbut(2,3);clearbut(8,1);clearbut(8,2);clearbut(8,3);',
+ 'clearbut(2,1);clearbut(2,3);clearbut(8,1);clearbut(8,2);clearbut(8,3);'+
+ 'clearbut(9,1);clearbut(9,2);clearbut(9,3);',
 			  2000);
 
       }
@@ -215,7 +224,6 @@ sub printalltags {
 }
 
 sub xmlparse {
-#    $Apache::lonxml::debug=1;
  my ($target,$content_file_string,$safeinit,%style_for_target) = @_;
  if ($target eq 'meta') {
    $Apache::lonxml::redirection = 0;
@@ -417,11 +425,6 @@ sub callsub {
   {
     my $sub1;
     no strict 'refs';
-    if ($target eq 'edit' && $token->[0] eq 'S') {
-      $currentstring = &Apache::edit::tag_start($target,$token,$tagstack,
-						$parstack,$parser,
-						$safeeval,$style);
-    }
     my $tag=$token->[1];
     my $space=$Apache::lonxml::alltags{$tag};
     if (!$space) {
@@ -507,7 +510,7 @@ sub init_safespace {
   $safehole->wrap(\&Math::Random::random_noncentral_f,$safeeval,'&math_random_noncentral_f');
   $safehole->wrap(\&Math::Random::random_normal,$safeeval,'&math_random_normal');
   $safehole->wrap(\&Math::Random::random_permutation,$safeeval,'&math_random_permutation');
-#  $safehole->wrap(\&Math::Random::random_permuted_index,$safeeval,'&math_random_permuted_index');
+  $safehole->wrap(\&Math::Random::random_permuted_index,$safeeval,'&math_random_permuted_index');
   $safehole->wrap(\&Math::Random::random_uniform,$safeeval,'&math_random_uniform');
   $safehole->wrap(\&Math::Random::random_poisson,$safeeval,'&math_random_poisson');
   $safehole->wrap(\&Math::Random::random_uniform_integer,$safeeval,'&math_random_uniform_integer');
@@ -855,11 +858,13 @@ sub register_insert {
     my $line = $data[$i];
     if ( $line =~ /^\#/ || $line =~ /^\s*\n/) { next; }
     if ( $line =~ /TABLE/ ) { last; }
-    my ($tag,$descrip,$function,$show) = split(/,/, $line);
+    my ($tag,$descrip,$color,$function,$show) = split(/,/, $line);
     $insertlist{"$tagnum.tag"} = $tag;
     $insertlist{"$tagnum.description"} = $descrip;
+    $insertlist{"$tagnum.color"} = $color;
     $insertlist{"$tagnum.function"} = $function;
     $insertlist{"$tagnum.show"}= $show;
+    $insertlist{"$tag.num"}=$tagnum;
     $tagnum++;
   }
   $i++; #skipping TABLE line